[PR PATCH] New package: q5go-2.12

[PR PATCH] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35809

New package: q5go-2.12
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/35809.patch is attached

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

From 162c96f5f6717220a3cd06b028163765445bcfe6 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 19 Jan 2022 10:49:27 -0600
Subject: [PATCH] New package: q5go-2.12

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

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..123aacb84842
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,21 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+archs="i686 x86_64"
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+makedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35809

New package: q5go-2.12
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/35809.patch is attached

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

From 162c96f5f6717220a3cd06b028163765445bcfe6 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 19 Jan 2022 10:49:27 -0600
Subject: [PATCH] New package: q5go-2.12

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

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..123aacb84842
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,21 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+archs="i686 x86_64"
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+makedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

Re: [PR REVIEW] New package: q5go-2.12

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/35809#discussion_r813300406

Comment:
Nope, figure out cross build. dropping `archs=` is first step.

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35809

New package: q5go-2.12
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/35809.patch is attached

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

From 162c96f5f6717220a3cd06b028163765445bcfe6 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 19 Jan 2022 10:49:27 -0600
Subject: [PATCH] New package: q5go-2.12

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

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..123aacb84842
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,21 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+archs="i686 x86_64"
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+makedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35809

New package: q5go-2.12
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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/35809.patch is attached

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

From 162c96f5f6717220a3cd06b028163765445bcfe6 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 19 Jan 2022 10:49:27 -0600
Subject: [PATCH 1/3] New package: q5go-2.12

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

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..123aacb84842
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,21 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+archs="i686 x86_64"
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+makedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

From c53e816f780b30f4e5d04b93365352a1a6b5f422 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 23 Feb 2022 14:57:28 -0600
Subject: [PATCH 2/3] New package: q5go-2.12

---
 srcpkgs/q5go/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
index 123aacb84842..fa9790b5c29c 100644
--- a/srcpkgs/q5go/template
+++ b/srcpkgs/q5go/template
@@ -2,7 +2,6 @@
 pkgname=q5go
 version=2.1.2
 revision=1
-archs="i686 x86_64"
 wrksrc="q5Go-${pkgname}-${version}"
 build_style=qmake
 configure_args="src/q5go.pro"

From fa37c9b692beaad91c6def7f913c74855e6ce199 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 23 Feb 2022 14:57:28 -0600
Subject: [PATCH 3/3] New package: q5go-2.12

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

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
index fa9790b5c29c..c93918af8299 100644
--- a/srcpkgs/q5go/template
+++ b/srcpkgs/q5go/template
@@ -5,6 +5,7 @@ revision=1
 wrksrc="q5Go-${pkgname}-${version}"
 build_style=qmake
 configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake"
 makedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel"
 short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
 maintainer="Jason Manley <jason@jasondavid.tv>"

Re: [PR REVIEW] New package: q5go-2.12

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/35809#discussion_r813363815

Comment:
It's getting better :) You can check locally with `./xbps-src -a aarch64 pkg q5go`

Re: [PR REVIEW] New package: q5go-2.12

[jason1987d]

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

New review comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/35809#discussion_r813366019

Comment:
The package itself shows no documentation on which archs etc... what's the best next step as to figuring out how to get this to run on other archs? That local check is useful too.

Re: [PR REVIEW] New package: q5go-2.12

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/35809#discussion_r813372226

Comment:
Usually one adds necessary deps/flags/whatever until it compiles. At that point we assume it runs as well if build system is common. qmake is.
If you hit something you can't figure out, push that and ask.

```
$ xlocate bin/uic
qt5-host-tools-5.15.3+20211001_2        /usr/lib/qt5/bin/uic
```

Re: [PR REVIEW] New package: q5go-2.12

[jason1987d]

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

New review comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/35809#discussion_r813375546

Comment:
Testing locally using aarch64. Change working so far is I copied the depends to hostmakedepends and now it's compiling. Though I will likely include that qt5-host-tools as a hostmakedepends as well.

Re: New package: q5go-2.12

[jason1987d]

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

New comment by jason1987d on void-packages repository

https://github.com/void-linux/void-packages/pull/35809#issuecomment-1049294411

Comment:
I've set pull default to rebase so I won't have the issues with multiple commits. I will close this, create new as now mine builds on the other archs.

Re: [PR PATCH] [Closed]: New package: q5go-2.12

[jason1987d]

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

There's a closed pull request on the void-packages repository

New package: q5go-2.12
https://github.com/void-linux/void-packages/pull/35809

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- 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
-->

Re: New package: q5go-2.12

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/35809#issuecomment-1049295356

Comment:
in the future, no need to close/open PRs, just use `git push --force`

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

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

From 70917ae8850e1bd6c9a5da5ff80b3b93e504507b Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Mon, 16 May 2022 16:14:16 -0500
Subject: [PATCH] New package: q5go-2.13

---
 srcpkgs/q5go/patches/qgo.desktop.patch | 18 ++++++++++++++++++
 srcpkgs/q5go/template                  | 20 ++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/q5go/patches/qgo.desktop.patch
 create mode 100644 srcpkgs/q5go/template

diff --git a/srcpkgs/q5go/patches/qgo.desktop.patch b/srcpkgs/q5go/patches/qgo.desktop.patch
new file mode 100644
index 000000000000..f74d79da566f
--- /dev/null
+++ b/srcpkgs/q5go/patches/qgo.desktop.patch
@@ -0,0 +1,18 @@
+--- a/templates/qgo.desktop	2022-04-27 13:03:23.000000000 -0500
++++ b/templates/qgo.desktop	2022-05-16 18:26:45.485870905 -0500
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Comment=qgo
+-Exec=qgo
+-Icon=/usr/share/qGo/pics/Bowl.png
+-MimeType=text/plain;text/sfg;Application
+-Name=qgo
++Comment=q5go
++Exec=q5go
++Icon=/usr/share/q5go/pics/Bowl.ico
++MimeType=application/x-go-sgf;
++Name=q5go
+ GenericName=Go
+ Name[fr]=qgo
+ GenericName[ar]=??
diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..aff9ab94fb0d
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,20 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.3
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=bffab6641acedf20b73f3429c60ef560942ffea27527aaa3a9a9c722b41f0791
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/Bowl.ico" "${DESTDIR}/usr/share/q5go/pics/Bowl.ico"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

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

From 84e9ff37ea212b6dc335fd6796f8f542447ab63c Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Mon, 16 May 2022 16:14:16 -0500
Subject: [PATCH] New package: q5go-2.12

---
 srcpkgs/q5go/patches/qgo.desktop.patch | 18 ++++++++++++++++++
 srcpkgs/q5go/template                  | 20 ++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/q5go/patches/qgo.desktop.patch
 create mode 100644 srcpkgs/q5go/template

diff --git a/srcpkgs/q5go/patches/qgo.desktop.patch b/srcpkgs/q5go/patches/qgo.desktop.patch
new file mode 100644
index 000000000000..f74d79da566f
--- /dev/null
+++ b/srcpkgs/q5go/patches/qgo.desktop.patch
@@ -0,0 +1,18 @@
+--- a/templates/qgo.desktop	2022-04-27 13:03:23.000000000 -0500
++++ b/templates/qgo.desktop	2022-05-16 18:26:45.485870905 -0500
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Comment=qgo
+-Exec=qgo
+-Icon=/usr/share/qGo/pics/Bowl.png
+-MimeType=text/plain;text/sfg;Application
+-Name=qgo
++Comment=q5go
++Exec=q5go
++Icon=/usr/share/q5go/pics/Bowl.ico
++MimeType=application/x-go-sgf;
++Name=q5go
+ GenericName=Go
+ Name[fr]=qgo
+ GenericName[ar]=??
diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..aff9ab94fb0d
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,20 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.3
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=bffab6641acedf20b73f3429c60ef560942ffea27527aaa3a9a9c722b41f0791
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/Bowl.ico" "${DESTDIR}/usr/share/q5go/pics/Bowl.ico"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

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

From 33cad6514379db9207f72baf5fe6fdb605b363ce Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Mon, 16 May 2022 16:14:16 -0500
Subject: [PATCH] New package: q5go-2.12

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

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..a2cc898854f6
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,21 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

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

From abd3ad3b347ffedc0252f69390193d35044ab274 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Mon, 16 May 2022 16:14:16 -0500
Subject: [PATCH] New package: q5go-2.12

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

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..41c4abd23e8f
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,20 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

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

From 653438777616abbc1d27009a15f6a7d4b6214937 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Mon, 16 May 2022 16:14:16 -0500
Subject: [PATCH 1/2] New package: q5go-2.12

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

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..41c4abd23e8f
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,20 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"

From f48a87a4507d7005c846f01d08328103d5dc958d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 15 May 2022 19:14:45 +0300
Subject: [PATCH 2/2] supertux2: update to 0.6.3.

---
 srcpkgs/supertux2/patches/locale.patch | 36 --------------------------
 srcpkgs/supertux2/template             |  8 +++---
 2 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/supertux2/patches/locale.patch

diff --git a/srcpkgs/supertux2/patches/locale.patch b/srcpkgs/supertux2/patches/locale.patch
deleted file mode 100644
index ffe38ae8a266..000000000000
--- a/srcpkgs/supertux2/patches/locale.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 4380f504fbd51aa9ef7eb222b0bced481402fa7d
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Wed Dec 9 16:22:22 2020 -0300
-
-    supertux/main: add try-catch for locale initialization.
-    
-    Fixes #1564.
-
-diff --git src/supertux/main.cpp src/supertux/main.cpp
-index ad5e3fde6..c33627e18 100644
---- a/src/supertux/main.cpp
-+++ b/src/supertux/main.cpp
-@@ -563,10 +563,19 @@ Main::run(int argc, char** argv)
- 	_wfreopen(w_errpath.c_str(), L"a", stderr);
- #endif
- 
--  // Create and install global locale
--  std::locale::global(boost::locale::generator().generate(""));
--  // Make boost.filesystem use it
--  boost::filesystem::path::imbue(std::locale());
-+  // Create and install global locale - this can fail on some setups:
-+  // - with bad LANG values
-+  // - targets where libstdc++ uses its generic locales code (https://gcc.gnu.org/legacy-ml/libstdc++/2003-02/msg00345.html)
-+  try
-+  {
-+    std::locale::global(boost::locale::generator().generate(""));
-+    // Make boost.filesystem use it
-+    boost::filesystem::path::imbue(std::locale());
-+  }
-+  catch(const std::runtime_error& err)
-+  {
-+    std::cout << "Warning: " << err.what() << std::endl;
-+  }
- 
-   int result = 0;
- 
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4c39b458dad4..56057f5837d5 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
 # Template file for 'supertux2'
 pkgname=supertux2
-version=0.6.2
-revision=3
+version=0.6.3
+revision=1
 wrksrc="SuperTux-v${version}-Source"
 build_style=cmake
 configure_args="
@@ -12,13 +12,13 @@ configure_args="
 make_cmd=make
 hostmakedepends="pkg-config"
 makedepends="SDL2_image-devel boost-devel glew-devel libcurl-devel
- libopenal-devel libraqm-devel physfs-devel"
+ libopenal-devel libraqm-devel physfs-devel glm"
 short_desc="Side-scrolling platform game, milestone 2"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
 license="GPL-3.0-or-later, GPL-2.0-or-later, CC-BY-SA-3.0, CC-BY-SA-4.0, CC-BY-3.0"
 homepage="https://supertux.github.io/"
 distfiles="https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"
-checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
+checksum=f7940e6009c40226eb34ebab8ffb0e3a894892d891a07b35d0e5762dd41c79f6
 replaces="supertux2-data>=0"
 
 export CMAKE_GENERATOR="Unix Makefiles"

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

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

From 653438777616abbc1d27009a15f6a7d4b6214937 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Mon, 16 May 2022 16:14:16 -0500
Subject: [PATCH 1/2] New package: q5go-2.12

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

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..41c4abd23e8f
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,20 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"

From f48a87a4507d7005c846f01d08328103d5dc958d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 15 May 2022 19:14:45 +0300
Subject: [PATCH 2/2] supertux2: update to 0.6.3.

---
 srcpkgs/supertux2/patches/locale.patch | 36 --------------------------
 srcpkgs/supertux2/template             |  8 +++---
 2 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/supertux2/patches/locale.patch

diff --git a/srcpkgs/supertux2/patches/locale.patch b/srcpkgs/supertux2/patches/locale.patch
deleted file mode 100644
index ffe38ae8a266..000000000000
--- a/srcpkgs/supertux2/patches/locale.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 4380f504fbd51aa9ef7eb222b0bced481402fa7d
-Author: Érico Rolim <erico.erc@gmail.com>
-Date:   Wed Dec 9 16:22:22 2020 -0300
-
-    supertux/main: add try-catch for locale initialization.
-    
-    Fixes #1564.
-
-diff --git src/supertux/main.cpp src/supertux/main.cpp
-index ad5e3fde6..c33627e18 100644
---- a/src/supertux/main.cpp
-+++ b/src/supertux/main.cpp
-@@ -563,10 +563,19 @@ Main::run(int argc, char** argv)
- 	_wfreopen(w_errpath.c_str(), L"a", stderr);
- #endif
- 
--  // Create and install global locale
--  std::locale::global(boost::locale::generator().generate(""));
--  // Make boost.filesystem use it
--  boost::filesystem::path::imbue(std::locale());
-+  // Create and install global locale - this can fail on some setups:
-+  // - with bad LANG values
-+  // - targets where libstdc++ uses its generic locales code (https://gcc.gnu.org/legacy-ml/libstdc++/2003-02/msg00345.html)
-+  try
-+  {
-+    std::locale::global(boost::locale::generator().generate(""));
-+    // Make boost.filesystem use it
-+    boost::filesystem::path::imbue(std::locale());
-+  }
-+  catch(const std::runtime_error& err)
-+  {
-+    std::cout << "Warning: " << err.what() << std::endl;
-+  }
- 
-   int result = 0;
- 
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 4c39b458dad4..56057f5837d5 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
 # Template file for 'supertux2'
 pkgname=supertux2
-version=0.6.2
-revision=3
+version=0.6.3
+revision=1
 wrksrc="SuperTux-v${version}-Source"
 build_style=cmake
 configure_args="
@@ -12,13 +12,13 @@ configure_args="
 make_cmd=make
 hostmakedepends="pkg-config"
 makedepends="SDL2_image-devel boost-devel glew-devel libcurl-devel
- libopenal-devel libraqm-devel physfs-devel"
+ libopenal-devel libraqm-devel physfs-devel glm"
 short_desc="Side-scrolling platform game, milestone 2"
 maintainer="beefcurtains <beefcurtains@voidlinux.org>"
 license="GPL-3.0-or-later, GPL-2.0-or-later, CC-BY-SA-3.0, CC-BY-SA-4.0, CC-BY-3.0"
 homepage="https://supertux.github.io/"
 distfiles="https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"
-checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598
+checksum=f7940e6009c40226eb34ebab8ffb0e3a894892d891a07b35d0e5762dd41c79f6
 replaces="supertux2-data>=0"
 
 export CMAKE_GENERATOR="Unix Makefiles"

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

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

From 653438777616abbc1d27009a15f6a7d4b6214937 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Mon, 16 May 2022 16:14:16 -0500
Subject: [PATCH] New package: q5go-2.12

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

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..41c4abd23e8f
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,20 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

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

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

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

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

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

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

From 39bb9e3fc7219db6a95bf0cfcf1ae91c1c6d83b8 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 23 Feb 2022 16:55:57 -0600
Subject: [PATCH 0001/2561] New package: q5go-2.12

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

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..a2cc898854f6
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,21 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

From 1b430d6d9f2e4a0a010b3af9a74ecc0e28e8d598 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Thu, 3 Mar 2022 08:14:29 +0100
Subject: [PATCH 0002/2561] gitea: update to 1.16.3

---
 srcpkgs/gitea/files/gitea/run | 14 ++++++++------
 srcpkgs/gitea/template        |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/gitea/files/gitea/run b/srcpkgs/gitea/files/gitea/run
index d24ce523bba7..6a621804bdd0 100755
--- a/srcpkgs/gitea/files/gitea/run
+++ b/srcpkgs/gitea/files/gitea/run
@@ -1,9 +1,11 @@
 #!/bin/sh
 
-# We cd here, because builtin SSH won't run without.
-cd /var/lib/gitea || exit 1
+# USER and HOME are needed because gitea doesn't actually check the user it
+# runs as, but instead just grabs the variables from the variables.
+export USER=_gitea
+export HOME=/var/lib/gitea
 
-# The USER variable is needed here because gitea doesn't actually
-# check what user its running as, it instead grabs the USER variable
-# from the environment.  HOME is set for the same reasons.
-USER=_gitea HOME=/var/lib/gitea GITEA_WORK_DIR=$HOME exec chpst -u _gitea:_gitea gitea web --config /etc/gitea.conf
+# gitea needs to run from its home for SSH to work properly
+export GITEA_WORK_DIR="${HOME}"
+
+exec chpst -u _gitea:_gitea gitea web --config /etc/gitea.conf
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index e8843a9f1a37..75d8c4290fe4 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.16.1
+version=1.16.3
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -32,7 +32,7 @@ license="MIT"
 homepage="https://gitea.io"
 changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
 distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=09a27a06bf12cbef06ba823c516c6c9f7a06129e91dd7e64be5f6f0ca641d5b7
+checksum=913f3b095fcfd4c5012d17adcd8748b081950e3a7d17ace60f6a2f99c9b2e18b
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From f21811bc64350371c7d36f632c63e7d1218ee489 Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Tue, 8 Mar 2022 22:02:30 +0100
Subject: [PATCH 0003/2561] yt-dlp: update to 2022.03.08.1.

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

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 4bf37918a58a..967cb7e75b0d 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2022.02.04
+version=2022.03.08.1
 revision=1
 wrksrc="$pkgname"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=c8dd119c28a5d256322ddb3a2fff72bc02ace43fc5880c0065d97f7a48d7a8e3
+checksum=135fd7bbf81c2639419b191d8e5abb80cd8a9801b7ed8e92a331a4107e820ab2
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 2acc3caf125b6adc8fe6c0ed91c394b2f9fcc3c1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 12:16:17 +0100
Subject: [PATCH 0004/2561] cflow: update to 1.7.

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

diff --git a/srcpkgs/cflow/template b/srcpkgs/cflow/template
index 974c82619b65..fef756128a24 100644
--- a/srcpkgs/cflow/template
+++ b/srcpkgs/cflow/template
@@ -1,6 +1,6 @@
 # Template file for 'cflow'
 pkgname=cflow
-version=1.6
+version=1.7
 revision=1
 build_style=gnu-configure
 short_desc="C source files control analyzer and grapher"
@@ -8,4 +8,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/cflow/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=34487b4116e9b7ecde142b24480ce036887921ed5defb2958068bb069c1fedd7
+checksum=d01146caf9001e266133417c2a8258a64b5fc16fcb082a14f6528204d0c97086

From b4838205c241a170bdb6c4e78088b647d56b3e75 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Tue, 22 Feb 2022 22:41:45 +0100
Subject: [PATCH 0005/2561] sqlite: update to 3.38.0.

Also remove -DSQLITE_ENABLE_JSON1 as JSON is now on by default,
and revbump sqlite common/shlibs entry.
---
 common/shlibs           | 2 +-
 srcpkgs/sqlite/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 250e1e0b8cb5..d60e60a87534 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -352,7 +352,7 @@ libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
 libtcl8.6.so tcl-8.6.0_1
 libtk8.6.so tk-8.6.1_3
-libsqlite3.so.0 sqlite-3.31.1_3
+libsqlite3.so.0 sqlite-3.38.0_1
 libIDL-2.so.0 libIDL-0.8.13_1
 libnspr4.so nspr-4.8_1
 libplc4.so nspr-4.8_1
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index a2cb06763b8d..8760d30aee97 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.37.2
+version=3.38.0
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,10 +13,10 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8
+checksum=1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \
+ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \
  -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 \
  -DSQLITE_ENABLE_FTS3_TOKENIZER=1 -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE=1 \
  -DSQLITE_ENABLE_DESERIALIZE"

From 26f8a4565ee70308d54e91f9b2c851d5b1052a41 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 5 Mar 2022 21:26:06 +0100
Subject: [PATCH 0006/2561] fossil: update to 2.18.

Also, add --with-sqlite to configure_args in order to
use the system-provided sqlite.
---
 srcpkgs/fossil/patches/cross.patch | 2 +-
 srcpkgs/fossil/template            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fossil/patches/cross.patch b/srcpkgs/fossil/patches/cross.patch
index 79ce61fcdcd7..2e5cc092a67a 100644
--- a/srcpkgs/fossil/patches/cross.patch
+++ b/srcpkgs/fossil/patches/cross.patch
@@ -8,6 +8,6 @@ index 9818cbd..1c248b8 100644
  
 -XBCC = $(BCC) $(BCCFLAGS)
 +XBCC = $(BCC) -Os
- XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
+ XTCC = $(TCC) $(CFLAGS_INCLUDE) -I$(OBJDIR) $(TCCFLAGS)
  
  TESTFLAGS := -quiet
diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index 63323b9f1f02..7e266eb29fe2 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,9 +1,9 @@
 # Template file for 'fossil'
 pkgname=fossil
-version=2.17
+version=2.18
 revision=1
 build_style=configure
-configure_args="--disable-internal-sqlite --prefix=/usr"
+configure_args="--disable-internal-sqlite --prefix=/usr --with-sqlite=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="tcl"
 makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://www.fossil-scm.org"
 changelog="https://www.fossil-scm.org/home/doc/trunk/www/changes.wiki"
 distfiles="https://fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"
-checksum=21d6ee5187775113f74e55ab5ebcb1764f7226a8e59be1b2c7896cbe9dce6914
+checksum=e89cb9c726348bb14e7736e031d2b08574408c5d4db98e7d3fc814dadc6f3546
 
 post_extract() {
 	vsed -i 's/test_system_sqlite$/# &/' auto.def  # failing on cross

From 041d9aab4b5e542a40c123f33f48bec8990cf0c1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Mar 2022 18:24:31 +0200
Subject: [PATCH 0007/2561] bc-gh: update to 5.2.2.

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

diff --git a/srcpkgs/bc-gh/template b/srcpkgs/bc-gh/template
index 8804980eb9c9..3ae95d694e9c 100644
--- a/srcpkgs/bc-gh/template
+++ b/srcpkgs/bc-gh/template
@@ -1,6 +1,6 @@
 # Template file for 'bc-gh'
 pkgname=bc-gh
-version=5.2.1
+version=5.2.2
 revision=1
 wrksrc="bc-${version}"
 short_desc="Implementation of POSIX bc with GNU extensions"
@@ -9,7 +9,7 @@ license="BSD-2-Clause"
 homepage="https://git.yzena.com/gavin/bc"
 changelog="https://git.yzena.com/gavin/bc/raw/branch/master/NEWS.md"
 distfiles="https://github.com/gavinhoward/bc/releases/download/${version}/bc-${version}.tar.xz"
-checksum=bc031b68e5eafef37305697b76f6261abac4a94286e260fa339771f2484f1ecd
+checksum=480249fc0e6a54cb2dc0059734ce433bff344d27b40b8591ae410068e1573352
 alternatives="
  bc:bc:/usr/bin/bc-gh
  bc:bc.1:/usr/share/man/man1/bc-gh.1

From 2249be3f073be29d3e28b11b77e260e090f3de6e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 22:09:23 +0100
Subject: [PATCH 0008/2561] xosview: update to 1.23.

---
 srcpkgs/xosview/patches/musl-fix.patch | 22 ++++++++++------------
 srcpkgs/xosview/template               |  6 +++---
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/xosview/patches/musl-fix.patch b/srcpkgs/xosview/patches/musl-fix.patch
index 879008fe051f..26c5160162bc 100644
--- a/srcpkgs/xosview/patches/musl-fix.patch
+++ b/srcpkgs/xosview/patches/musl-fix.patch
@@ -1,14 +1,12 @@
---- a/linux/serialmeter.cc	2016-01-02 10:39:10.279496776 +0100
-+++ b/linux/serialmeter.cc	2016-01-02 10:37:54.667491325 +0100
-@@ -39,9 +39,11 @@
+diff --git a/linux/serialmeter.cc b/linux/serialmeter.cc
+index 8211316..50de182 100644
+--- a/linux/serialmeter.cc
++++ b/linux/serialmeter.cc
+@@ -25,7 +25,6 @@
+  */
+ #if defined(__i386__) || defined(__ia64__) || defined(__amd64__)
+ #include <sys/io.h>
+-#include <sys/perm.h>
+ #define HAVE_IOPERM
  #endif
- #else
- #if !defined(__alpha__) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__ia64__) && !defined(__m68k__)
-+#if defined(HAVE_ASM_IO_H)
- #include <asm/io.h>
- #endif
- #endif
-+#endif
- #include <linux/serial.h>
- 
  
diff --git a/srcpkgs/xosview/template b/srcpkgs/xosview/template
index 3d6c3ab6c1f9..69715f530985 100644
--- a/srcpkgs/xosview/template
+++ b/srcpkgs/xosview/template
@@ -1,15 +1,15 @@
 # Template file for 'xosview'
 pkgname=xosview
-version=1.22
+version=1.23
 revision=1
 build_style=gnu-makefile
 makedepends="libXpm-devel"
-short_desc="A classic system monitoring tool"
+short_desc="Classic system monitoring tool"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.pogo.org.uk/~mark/xosview"
 distfiles="http://www.pogo.org.uk/~mark/xosview/releases/xosview-${version}.tar.gz"
-checksum=901b75af2676b11b28b88f0c79c5bd0f4f01de4790c0c5385edf6d71aee1f83a
+checksum=960acb68a8668e936e8dc71cc4e3926d879f47559b4a5f64555bdcc676c6739d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# does not have asm/io.h

From fd34f7b5db9933727811cfd1f260670cd3bc5777 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 2 Mar 2022 20:49:50 +1100
Subject: [PATCH 0009/2561] MoarVM: update to 2022.02.

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

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index f2e7dd6dc664..f437404bd76c 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2021.12
+version=2022.02
 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=d49bbeb10d9616c2d87a7fadd1c6bb7a5ce11c19c7c44bbb8bef76f25b505c4f
+checksum=4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96
 nocross=yes
 shlib_provides="libmoar.so"

From 88a02c8d6d1feb47b5cb4641f731e93776fc3b03 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 2 Mar 2022 20:51:19 +1100
Subject: [PATCH 0010/2561] nqp: update to 2022.02.

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

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index 392da8ee3e64..e80e23f80ee6 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2021.12
+version=2022.02
 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=0e1d534fd1ee61a4c8072309bafbc04660e9ae72d88618daa0e8f15022f0d913
+checksum=25d3c99745cd84f4049a9bd9cf26bb5dc817925abaafe71c9bdb68841cdb18b1
 nocross=yes

From 8ae5d84c1fe30a1e909b9d9716635c6c87ebc828 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 2 Mar 2022 20:52:51 +1100
Subject: [PATCH 0011/2561] rakudo: update to 2022.02.

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

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index ab23fedcaa48..979c33def794 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2021.12
+version=2022.02
 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=7f53d2c7138d13ab01692d5bd7dbc28f3f29ed86bd96d5280856f55a1ab05406
+checksum=6a6e9dbcc6d9a1610a34c6ec67e2d3f694d7b33e9e0a0f224543089fa7f71332
 nocross=yes
 provides="raku-${version}_${revision}"
 

From dff90fdda89b655b1d3b6c23d1bec77fb990d252 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Feb 2022 02:33:26 +0100
Subject: [PATCH 0012/2561] libjpeg-turbo: update to 2.1.3.

---
 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 935b5088f210..4f7f43cf1204 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.2
+version=2.1.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -11,7 +11,7 @@ license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 changelog="https://raw.githubusercontent.com/libjpeg-turbo/libjpeg-turbo/main/ChangeLog.md"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5
+checksum=467b310903832b033fe56cd37720d1b73a6a3bd0171dbf6ff0b620385f4f76d0
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"

From 6643ad794bb09be57a2d7e2e4e8eed0e1846c4c4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Feb 2022 02:12:43 +0100
Subject: [PATCH 0013/2561] mplayer: update to 1.5.

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

diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template
index 6bf5f3d1b08d..e4ee92dee1dd 100644
--- a/srcpkgs/mplayer/template
+++ b/srcpkgs/mplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'mplayer'
 pkgname=mplayer
-version=1.4
-revision=6
+version=1.5
+revision=1
 wrksrc="MPlayer-${version}"
 build_style=configure
 hostmakedepends="pkg-config yasm"
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.mplayerhq.hu/"
 distfiles="http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz"
-checksum=82596ed558478d28248c7bc3828eb09e6948c099bbd76bb7ee745a0e3275b548
+checksum=650cd55bb3cb44c9b39ce36dac488428559799c5f18d16d98edb2b7256cbbf85
 
 nocross=yes
 
@@ -30,8 +30,6 @@ conf_files="
 	/etc/mplayer/codecs.conf"
 
 do_configure() {
-	sed 's|-march=i486||g' -i configure
-
 	# we tried runtime cpudetection for ppc32 but stuff's broken
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|x86_64*|ppc64*) configure_args+=" --enable-vdpau --enable-runtime-cpudetection";;

From 324c84b8abae289d55bf362a02f5317135db6b86 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 26 Feb 2022 11:48:49 +0100
Subject: [PATCH 0014/2561] cpuid: update to 20220224.

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

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 61d6868aaf8b..4c651ab451cd 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20211210
+version=20220224
 revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
@@ -10,4 +10,4 @@ maintainer="Gerardo Di Iorio  <arete74@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.etallen.com/cpuid.html"
 distfiles="http://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=e029895700de1a6f83360252804892cd58b54d1f5ff3af44b7bb6afe410e5f44
+checksum=4a19de2a118aee44f856cd1becfa5a192574b5957795372a86e37dca24da1f9d

From 3fe62c82c3fc388f77a5d088119be2873e5e87a8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 25 Feb 2022 21:36:09 +0200
Subject: [PATCH 0015/2561] mercurial: update to 6.0.3.

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

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 87d80c12555a..778d60757cf6 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.9.3
+version=6.0.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-devel gettext"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=3b43f68977ad0fa75aa7f1e5c8f0a83ba935621ab2396129abb498e56d1be08e
+checksum=67f13647a46517a2b567cdcb73c98721d75d36a0432debb15022b77f9c138333
 
 pre_check() {
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then

From 9d102b10ef0b9825fbdb133fd0af427205172566 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 19 Feb 2022 14:04:14 +0200
Subject: [PATCH 0016/2561] python3-distro: update to 1.7.0.

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

diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index d573bc5b60c8..12554d77cfb4 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=2
+version=1.7.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,5 +12,6 @@ short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
+changelog="https://raw.githubusercontent.com/python-distro/distro/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39

From 9e3a5db3dbcfddca48348637b57d9772187f8812 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Feb 2022 15:06:09 +0100
Subject: [PATCH 0017/2561] sigil: update to 1.9.0.

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

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index ce12835e5a53..8e6fdb0c959e 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.8.0
+version=1.9.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -18,8 +18,9 @@ short_desc="Multi-platform EPUB ebook editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
+changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=33d84331f259ab8d92fc2c5fed6f05fd5f011695c48f83537423635a7afdd2ec
+checksum=c44b0cf2472ef59c4d76178883a7795af39febf32496fb7af1e34f7a3977791f
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From cac513090b4d94c29c11c6e329698b126d8d6340 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Mar 2022 11:50:18 +0100
Subject: [PATCH 0018/2561] Komikku: update to 0.37.0.

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

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 91de9f9e4f0c..89da2026f68e 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.35.2
+version=0.37.0
 revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -16,4 +16,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
 distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=b349c67a5b4ddf49b6edf87e5fb4a8f41a1f10a0967ff7d4fe4db40eb0b4eb72
+checksum=f126d91a21663d60c502a45ad9171bad933255839bc17a20b2f6c83500dfc4bf

From efb3e8ba81e13801a2f9d57b44dc968599d52c2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Mar 2022 12:04:35 +0100
Subject: [PATCH 0019/2561] Minder: update to 1.14.0.

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

diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index 2022aca4548d..da4f9b751c20 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,17 +1,17 @@
 # Template file for 'Minder'
 pkgname=Minder
-version=1.13.1
+version=1.14.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
 makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
- libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel"
+ libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel json-glib-devel"
 short_desc="Mind-mapping application designed for Pantheon"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/phase1geo/Minder"
 distfiles="https://github.com/phase1geo/Minder/archive/${version}.tar.gz"
-checksum=f319501e40e53e7721864d73e8c071960acc40a4f32dd84e85646a2031be215a
+checksum=7561084a0ee51b51a1e25753dbdd34f48632cc340c89cd78c591a539d8cef653
 
 post_install() {
 	vinstall data/com.github.phase1geo.minder.desktop 644 /usr/share/applications/

From 0b72691c69b78ecfd92dc84cfd4b1368ce3e6ccc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Mar 2022 14:33:18 +0100
Subject: [PATCH 0020/2561] blanket: update to 0.5.0.

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

diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 7bde1ef9e8fe..57d75b5ba8d1 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -1,7 +1,7 @@
 # Template file for 'blanket'
 pkgname=blanket
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"
 depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libhandy1"
@@ -10,5 +10,5 @@ maintainer="Reback00 <reback00@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rafaelmardojai/blanket"
 distfiles="https://github.com/rafaelmardojai/blanket/archive/refs/tags/${version}.tar.gz"
-checksum=fbb5f34a704840c50bb5b29f6fae69a2f37677d88db717b79e6bf6fdd625d9eb
+checksum=5af1d417d31bafff7c13a48e26bc4daae58a537f312b4ffb6911ae1b8b09a1d1
 python_version=3

From 183ced720f95bbcf9e9aa6526b106fd31963e2d4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 8 Mar 2022 16:24:43 +0100
Subject: [PATCH 0021/2561] python3-py7zr: remove importlib_metadata dependency

* only required until Python 3.8
---
 srcpkgs/python3-py7zr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
index ecd53ab39117..7dcdc642f601 100644
--- a/srcpkgs/python3-py7zr/template
+++ b/srcpkgs/python3-py7zr/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-py7zr'
 pkgname=python3-py7zr
 version=0.16.4
-revision=1
+revision=2
 wrksrc="py7zr-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+depends="python3-texttable python3-pycryptodomex
  python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj
  python3-multivolumefile"
 short_desc="7zip in python3 with various compressions, and AES encryption"

From 2e8aa48a9b109e4691f5aeb07094a54967081ad5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 8 Mar 2022 21:51:57 +0100
Subject: [PATCH 0022/2561] avahi: remove intltool build dep

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

diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 080d04537e75..c6cbd3860135 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -28,7 +28,7 @@ checksum="060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
  83edd888ccc464ab032134a45b7ded3bc43cb1dda2cd921ff47b01949d98ed7c"
 skip_extraction="build-db.txt"
 
-hostmakedepends="pkg-config intltool python3"
+hostmakedepends="pkg-config gettext python3"
 makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
 conf_files="
 	/etc/avahi/services/ssh.service

From 342ff1f3cd04b6b7ad31dd4fbbf4fd2dd8b5656e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 9 Mar 2022 15:25:13 +0100
Subject: [PATCH 0023/2561] fontforge: update to 20220308.

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

diff --git a/srcpkgs/fontforge/template b/srcpkgs/fontforge/template
index 7c116429856d..f768483ba14c 100644
--- a/srcpkgs/fontforge/template
+++ b/srcpkgs/fontforge/template
@@ -1,14 +1,13 @@
 # Template file for 'fontforge'
 pkgname=fontforge
-version=20201107
-revision=2
+version=20220308
+revision=1
 build_style=cmake
 hostmakedepends="automake ca-certificates gettext libltdl-devel libtool m4
  pkg-config python3"
-makedepends="libltdl-devel python3-devel zlib-devel pango-devel readline-devel
- giflib-devel libpng-devel libjpeg-turbo-devel tiff-devel libxml2-devel
- libspiro-devel hicolor-icon-theme desktop-file-utils libuninameslist-devel
- gtk+3-devel"
+makedepends="desktop-file-utils giflib-devel gtk+3-devel hicolor-icon-theme
+ libjpeg-turbo-devel libltdl-devel libpng-devel libspiro-devel libxml2-devel
+ pango-devel python3-devel readline-devel tiff-devel woff2-devel zlib-devel"
 depends="desktop-files-utils"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Create and modify PostScript, TrueType and SVG fonts"
@@ -16,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://fontforge.github.io/en-US/"
 distfiles="https://github.com/fontforge/fontforge/archive/${version}.tar.gz"
-checksum=274f8c8cbd7b6a1c77d2a1c03d4d6cd3c9319db62be8b8c88fabbf597f7e863c
+checksum=58bbc759eb102263be835e6c006b1c16b508ba3d0252acd5389062826764f7a5
 
 post_extract() {
 	# Disable unused #include <execinfo.h>

From 544106603a8d05db63c101cf4ea2b8b486ed303f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 20:42:22 +0100
Subject: [PATCH 0024/2561] freshplayerplugin: remove.

---
 .../patches/addvoidpepper.patch               | 11 ----------
 .../freshplayerplugin/patches/ffmpeg4.patch   | 16 --------------
 srcpkgs/freshplayerplugin/template            | 21 -------------------
 srcpkgs/removed-packages/template             |  3 ++-
 4 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/freshplayerplugin/patches/addvoidpepper.patch
 delete mode 100644 srcpkgs/freshplayerplugin/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/freshplayerplugin/template

diff --git a/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch b/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch
deleted file mode 100644
index 8dacb2570781..000000000000
--- a/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/config_pepperflash.c
-+++ b/src/config_pepperflash.c
-@@ -80,6 +80,9 @@
-     // Chrome component update
-     "~/.config/google-chrome/PepperFlash/*/libpepflashplayer.so",
-
-+    // chromium-pepper-flash (Void Linux)
-+    "/usr/lib/chromium-pepper-flash",
-+
-     NULL,
- };
diff --git a/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch b/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch
deleted file mode 100644
index 53fd1a31acdd..000000000000
--- a/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/ppb_video_decoder.c.orig        2018-05-03 22:08:33.026677145 +0200
-+++ b/src/ppb_video_decoder.c     2018-05-03 22:09:26.176206079 +0200
-@@ -542,9 +542,9 @@
-         goto err;
-     }
-
--    if (vd->avcodec->capabilities & CODEC_CAP_TRUNCATED) {
--        trace_info("%s, codec have CODEC_CAP_TRUNCATED\n", __func__);
--        vd->avctx->flags |= CODEC_FLAG_TRUNCATED;
-+    if (vd->avcodec->capabilities & AV_CODEC_CAP_TRUNCATED) {
-+        trace_info("%s, codec have AV_CODEC_CAP_TRUNCATED\n", __func__);
-+        vd->avctx->flags |= AV_CODEC_FLAG_TRUNCATED;
-     }
-
-     vd->avctx->opaque = vd;
-
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
deleted file mode 100644
index f24272ef708f..000000000000
--- a/srcpkgs/freshplayerplugin/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'freshplayerplugin'
-pkgname=freshplayerplugin
-version=0.3.9
-revision=9
-build_style=cmake
-hostmakedepends="pkg-config ragel"
-makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
- libvdpau-devel libva-devel ffmpeg-devel v4l-utils-devel libdrm-devel MesaLib-devel"
-short_desc="PPAPI2NPAPI compatibility layer for Pepper Flash"
-maintainer="Emanuel Serpa <emanuel@openmailbox.org>"
-license="MIT"
-homepage="https://github.com/i-rinat/freshplayerplugin"
-changelog="https://raw.githubusercontent.com/i-rinat/freshplayerplugin/master/ChangeLog"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4fa4fe07e812f6e10784ff984e1389b9b444ca44b84101999c6fad8f55db59d9
-
-do_install() {
-	vinstall build/libfreshwrapper-flashplayer.so 755 usr/lib/mozilla/plugins
-	vsconf data/freshwrapper.conf.example
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bd67947de02f..a7a19630a01a 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=63
+revision=64
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -70,6 +70,7 @@ replaces="
  enventor<=1.0.0_2
  epstopdf<=2.27_3
  fontmatrix<=0.6.0.20171228_2
+ freshplayerplugin<=0.3.9_9
  fuse-usmb<=20130204_7
  gconf-editor<=3.0.1_3
  gegl3<=0.3.28_2

From e3872b0f411da0aa88d2269f8cc490a9460098df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:12:21 +0100
Subject: [PATCH 0025/2561] girara: fix distfiles location

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

diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template
index c45def53b929..6bcbe95b8076 100644
--- a/srcpkgs/girara/template
+++ b/srcpkgs/girara/template
@@ -10,8 +10,8 @@ short_desc="Library implementing a user interface that focuses on minimalism"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://pwmt.org/projects/girara/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=77132e9bd652f1c9e4260de046768ea449a7d977c4cd3d6d817d2d72b6f946e0
+distfiles="https://git.pwmt.org/pwmt/girara/-/archive/${version}/girara-${version}.tar.gz"
+checksum=41342213f8e745258f1db28cbb6ccc27a63009a5e001bf791bbe01ce436d4db7
 
 build_options="notify"
 build_options_default="notify"

From aedf0020bc498e6687e8c6cd65caf598a473726e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:07:53 +0100
Subject: [PATCH 0026/2561] fractal: fix cross

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

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index cd5ea935a87f..37461c7272bc 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -16,6 +16,11 @@ homepage="https://wiki.gnome.org/Apps/Fractal"
 distfiles="https://gitlab.gnome.org/World/fractal/-/archive/$version/$pkgname-$version.tar.gz"
 checksum=3c3ea4e67e6d8fbc2e7b220fef188dcde5229e83c2cfeeadee42137718b34e56
 
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
+
 post_patch() {
 	[ -z "$CROSS_BUILD" ] && return 0
 

From 1c780b126448195057b42ff6027ccab31b232860 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 9 Mar 2022 11:57:37 +0100
Subject: [PATCH 0027/2561] miniflux: update to 2.0.36.

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

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 41757c6201bf..886d40df8a9f 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.35
+version=2.0.36
 revision=1
 wrksrc="v2-${version}"
 build_style=go
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/v2/master/ChangeLog"
 distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=8f9693380754072d1a74671c6b645abe7ddb0c8d22651ebc867b1af6dfcc4229
+checksum=15ac4ad4ab6f87de2143a85f52252e80d7c216a69aab334363e1972b81f231fd
 system_accounts="_miniflux"
 
 post_install() {

From 298e43cd18e1616b4e9b848b49c5d0e968f5db91 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 18:59:31 +0100
Subject: [PATCH 0028/2561] warzone2100: update to 4.2.7.

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

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index af3746aaffc1..9ef2297baeb7 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.2.6
+version=4.2.7
 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=b1d1dcfe2d5f7db4c063b7a13ba2ec21afa597e2c792e5c8c1cc13204398dbc8
+checksum=7f527ce00eda44099b1a7e3c303ede276f835f6d6ad945b0600a175ddabb00b0
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 6abb0bba570774c825f201715b29b1cd813ee42c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 19:42:39 +0100
Subject: [PATCH 0029/2561] vlc: update to 3.0.17.

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

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 2cd761b3ddb4..309477a2f775 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.16
-revision=6
+version=3.0.17
+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=ffae35fc64f625c175571d2346bc5f6207be99762517f15423e74f18399410f6
+checksum=48bd9bf337aa107a1524eba57c52dc4a91e29f5a97fbdee92f6a4dba90383cd0
 
 lib32disabled=yes
 

From 0d83ad81126aab7d0eed0c477bf8a0522cd8deb0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 19:46:14 +0100
Subject: [PATCH 0030/2561] linux5.4: update to 5.4.183.

---
 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 bc25dbd847b2..439a5538b1c1 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.182
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d
+checksum=2d4b0b77644835410b2a5f599b2893fe199d5542615684207f579753020cc99c
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 91aaeac67c3b85bb344ebe3bcbcefea230354492 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 19:49:11 +0100
Subject: [PATCH 0031/2561] linux4.19: update to 4.19.233.

---
 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 b38210b714e2..5a274df27b39 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.232
+version=4.19.233
 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=4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c
+checksum=b8f665f020c2724a9f1e0368fdc0ea451b0b7d915ffae7ef4b9ec27a550fce37
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From ae2b035ae8d18ad00a85801750f4005ccd5f469d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:22:37 -0500
Subject: [PATCH 0032/2561] python3-numpy: update to 1.22.3.

Fixes #36062.
---
 srcpkgs/python3-numpy/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 51bd23a1ec97..957551b64d91 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.22.2
+version=1.22.3
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=3428c3bd846beca1cd4417ebee6eab8bb62e987fc3101e5858d74c92b312d096
+checksum=c8f3ec591e3f17b939220f2b9eabb4c5e2db330f8af62c0a3aeee8a4d1a6c0db
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
@@ -69,13 +69,8 @@ pre_build() {
 }
 
 post_install() {
-	# create compat symlinks for .h files
-	vmkdir ${py3_inc}
-	ln -sfr ${DESTDIR}/${py3_sitelib}/numpy/core/include/numpy \
-		${DESTDIR}/${py3_inc}
+	rm ${DESTDIR}/usr/bin/f2py
 
-	rm -f ${DESTDIR}/usr/bin/f2py
-
-	rm -f ${DESTDIR}/usr/lib/python*/site-packages/numpy/LICENSE.txt
+	rm ${DESTDIR}/${py3_sitelib}/numpy/LICENSE.txt
 	vlicense LICENSE.txt LICENSE
 }

From ad5dc1f2d8c3ff025e1f420264b7d512351237b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:54:45 -0500
Subject: [PATCH 0033/2561] maturin: update to 0.12.10.

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

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index d3c387fdfaa7..a7de61b7704a 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,15 +1,15 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.9
+version=0.12.10
 revision=1
 build_style=cargo
 build_helper=qemu
 # 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 log,upload,human-panic"
-hostmakedepends="python3-setuptools python3-toml"
+hostmakedepends="python3-setuptools python3-tomli"
 makedepends="openssl-devel"
-depends="python3-toml"
+depends="python3-tomli"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="26b094c20c9939cc9df5632b4b8d8921c4086b27a4867b439297e616f5781716
+checksum="764d91bb35a41d0fa389f3e8179353c0a7e173fbb52c6d434e2877951f15e4a4
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From a1bf0516bb193721458bf4a9131518852653d2c1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:56:54 -0500
Subject: [PATCH 0034/2561] python3-ipython: update to 8.1.1.

---
 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 387bd59fbc55..07bdc201821d 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.1.0
+version=8.1.1
 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=42c23e90b2deaae631266885de1656a517a1673d7e1db57e8eb3a4bb6cd5ce1b
+checksum=8138762243c9b3a3ffcf70b37151a2a35c23d3a29f9743878c33624f4207be3d
 conflicts="python-ipython<=5.8.0_2"
 
 do_check() {

From bce3e8b0909ef318c5dfe6e1ddeb8c119adcd8e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:57:11 -0500
Subject: [PATCH 0035/2561] python3-pip: update to 22.0.4.

---
 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 4ba92b54262e..51b892eb0596 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=22.0.3
+version=22.0.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=f29d589df8c8ab99c060e68ad294c4a9ed896624f6368c5349d70aa581b333d0
+checksum=b3a9de2c6ef801e9247d1527a4b16f92f2cc141cd1489f3fffaf6a9e96729764
 # Tests have unpackaged dependencies
 make_check=no
 

From f6764072e705d2dcc57b84deafb8c9d6d468d600 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:57:22 -0500
Subject: [PATCH 0036/2561] python3-pylru: update to 1.2.1.

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

diff --git a/srcpkgs/python3-pylru/template b/srcpkgs/python3-pylru/template
index a44b59ad2714..91c93a98d8d1 100644
--- a/srcpkgs/python3-pylru/template
+++ b/srcpkgs/python3-pylru/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pylru'
 pkgname=python3-pylru
-version=1.2.0
-revision=3
+version=1.2.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/jlhutch/pylru"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c4dcf175f6317539199434db13ffea0f642a52fac1e547e2e5f0866686fc9292
+checksum=8d8d5ac67c5567137c53cf505a851a0c125666bd64402a111f141ae35db00859

From 13ab6857c81e6485277ef9612709a6b6a82f4312 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:57:48 -0500
Subject: [PATCH 0037/2561] python3-pytools: update to 2022.1.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 25c3394ed9fb..3280c48dfb07 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1
+version=2022.1.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=197aacf6e1f5d60c715b92438792acb7702aed59ebbfb147fa84eda780e54fee
+checksum=3eebcc11923bf36fc42a9102d6e417a94817efb1aeb24d3149686dd5e3ec54d4
 
 post_install() {
 	vlicense LICENSE

From 1139b85622fd818fb68d220a40748076e6bf2b7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Mar 2022 22:34:15 +0100
Subject: [PATCH 0038/2561] libvirt: fix virsh undefine

closes #36061
closes #35996
---
 srcpkgs/libvirt/patches/823a62ec.patch | 48 ++++++++++++++++++++++++++
 srcpkgs/libvirt/template               |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libvirt/patches/823a62ec.patch

diff --git a/srcpkgs/libvirt/patches/823a62ec.patch b/srcpkgs/libvirt/patches/823a62ec.patch
new file mode 100644
index 000000000000..5fcc644d3e5a
--- /dev/null
+++ b/srcpkgs/libvirt/patches/823a62ec.patch
@@ -0,0 +1,48 @@
+From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
+From: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Date: Tue, 1 Mar 2022 18:47:59 +0100
+Subject: [PATCH] qemu: segmentation fault in virtqemud executing
+ qemuDomainUndefineFlags
+
+Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
+
+Stack trace of thread 664419:
+ #0  0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
+ #1  0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
+ #2  0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
+        at src/remote/remote_daemon_dispatch_stubs.h:13080
+ #3  remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
+        at src/remote/remote_daemon_dispatch_stubs.h:13059
+ #4  0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
+        at ../src/rpc/virnetserverprogram.c:428
+ #5  virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
+ #6  0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
+ #7  virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
+ #8  0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
+ #9  0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
+ #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
+ #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
+
+Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Reviewed-by: Jim Fehlig <jfehlig@suse.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index bcd9bdb436..8337eed510 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
+         }
+     }
+ 
+-    if (vm->def->os.loader->nvram) {
++    if (vm->def->os.loader && vm->def->os.loader->nvram) {
+         nvram_path = g_strdup(vm->def->os.loader->nvram);
+     } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
+         qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
+-- 
+GitLab
+
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 1568aa905a56..bf08aa899e00 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
 version=8.1.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
  -Dpolkit=enabled"

From 0383be72ab9b818eec1ad65cbea2957e2102979f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 23:06:26 +0100
Subject: [PATCH 0039/2561] jwm: remove faulty fix_dvorak.patch

was causing segfault when running `jwm -p`.
---
 srcpkgs/jwm/patches/fix_dvorak.patch | 31 ----------------------------
 srcpkgs/jwm/template                 |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 srcpkgs/jwm/patches/fix_dvorak.patch

diff --git a/srcpkgs/jwm/patches/fix_dvorak.patch b/srcpkgs/jwm/patches/fix_dvorak.patch
deleted file mode 100644
index a8c1a02a9c5b..000000000000
--- a/srcpkgs/jwm/patches/fix_dvorak.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1aa74e96e32b4012ee0e13ada22b64811b519bab Mon Sep 17 00:00:00 2001
-From: Olga Ustuzhanina <me@laserbat.pw>
-Date: Thu, 24 Jan 2019 15:07:31 +0700
-Subject: [PATCH] fix desktop switching on dvorak layouts
-
----
- src/binding.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/binding.c b/src/binding.c
-index dc23b640..8c238717 100644
---- a/src/binding.c
-+++ b/src/binding.c
-@@ -18,6 +18,8 @@
- #include "root.h"
- #include "tray.h"
- 
-+#include <X11/XKBlib.h>
-+
- #define MASK_NONE    0
- #define MASK_SHIFT   (1 << ShiftMapIndex)
- #define MASK_LOCK    (1 << LockMapIndex)
-@@ -418,7 +420,7 @@ void InsertBinding(ActionType action, const char *modifiers,
- 
-             for(temp[offset] = '1'; temp[offset] <= '9'; temp[offset]++) {
- 
--               sym = ParseKeyString(temp);
-+               sym = XkbKeycodeToKeysym(display, temp[offset] - '1' + 10, 0, 0);
-                if(sym == NoSymbol) {
-                   Release(temp);
-                   return;
diff --git a/srcpkgs/jwm/template b/srcpkgs/jwm/template
index 3d052853912c..6595c27e2d6a 100644
--- a/srcpkgs/jwm/template
+++ b/srcpkgs/jwm/template
@@ -1,7 +1,7 @@
 # Template file for 'jwm'
 pkgname=jwm
 version=2.4.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config which"
 makedepends="

From c46a04dba7186b37ac5f040fd336c9fd6b6cf966 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 2 Mar 2022 10:29:49 -0500
Subject: [PATCH 0040/2561] python3-phonenumbers: update to 8.12.44.

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

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index f84326ecff0f..9cb6d6a351f6 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.43
+version=8.12.44
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=1c8270a2e257d6c65458a42283f82d3eca7f7b9d925454a6966e2f04df75e1cf
+checksum=26cfd0257d1704fe2f88caff2caabb70d16a877b1e65b6aae51f9fbbe10aa8ce

From 856a1d32b3fabdce329308650dd988662d5e089a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 4 Mar 2022 21:03:26 -0500
Subject: [PATCH 0041/2561] python3-saml2: update to 7.1.2.

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

diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 673cfd1edac5..ce87ae737d8d 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-saml2'
 pkgname=python3-saml2
-version=7.1.1
+version=7.1.2
 revision=1
 wrksrc="pysaml2-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://github.com/IdentityPython/pysaml2"
 changelog="https://raw.githubusercontent.com/IdentityPython/pysaml2/master/CHANGELOG.md"
 distfiles="https://github.com/IdentityPython/pysaml2/archive/v${version}.tar.gz"
-checksum=ef271ad65d82dcb18f20b380003600f74e0b4c938596002befd79d63e09d87ec
+checksum=308934d5cd5f22a3ea7bd8d4fb5423ab0f5b0f08bf541e7c6b2cb0eb7302a3ab
 
 do_check() {
 	# Ignore tests that depend on unpackaged python dependency 'pymongo'

From bddd0775a5559e4542715c22a77d760c0e7b20e1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 4 Mar 2022 21:06:29 -0500
Subject: [PATCH 0042/2561] python3-canonicaljson: update to 1.6.0.

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

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index 7dbdf1adb9d0..b9535436442b 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
-version=1.5.0
+version=1.6.0
 revision=1
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=5ebddcd74c5b066ee68ecca56465338e9b1380467e0a906f4797697c9fb381e2
+checksum=8739d5fd91aca7281d425660ae65af7663808c8177778965f67e90b16a2b2427

From f07008a5bc62a0d64c8b547ab1fe7a1be4115a8f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Mar 2022 10:37:47 -0500
Subject: [PATCH 0043/2561] synapse: update to 1.54.0.

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

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 19153bc23bc3..f28f1313dcd0 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.53.0
+version=1.54.0
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -12,7 +12,8 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-phonenumbers python3-prometheus_client python3-attrs python3-netaddr
  python3-setuptools python3-bleach python3-Jinja2 python3-psycopg2 python3-lxml
  python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
- python3-typing_extensions python3-ijson python3-matrix-common"
+ python3-typing_extensions python3-ijson python3-matrix-common
+ python3-packaging"
 checkdepends="$depends python3-parameterized python3-pytest"
 short_desc="Matrix reference homeserver"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
@@ -20,7 +21,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=e9fb5c8d1178996e677f6ce8f44c11d9294da0a06297fffa34706879870f9bf4
+checksum=6e9ee5f0657fe01c5d141101b11c2c2da147003f7f8e684ef44d4f462125b7a1
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From b082ec0a720cce9297ba5924f1151bf4a8925a15 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 9 Mar 2022 15:20:44 -0600
Subject: [PATCH 0044/2561] New package: terraform-docs-0.16.0

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

diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
new file mode 100644
index 000000000000..cc03309e372b
--- /dev/null
+++ b/srcpkgs/terraform-docs/template
@@ -0,0 +1,16 @@
+# Template file for 'terraform-docs'
+pkgname=terraform-docs
+version=0.16.0
+revision=1
+build_style=go
+go_import_path="github.com/$pkgname/$pkgname"
+short_desc="Utility to generate documentation from Terraform modules"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="MIT"
+homepage="https://terraform-docs.io/"
+distfiles="https://$go_import_path/archive/v$version.tar.gz"
+checksum=e370fd106ca74caebc8632834cc28412a3a6a160952392da71f213515bba2085
+
+post_install() {
+	vlicense LICENSE
+}

From fa8b6ff5aaaac79299e5c19f41e45af2536c5b08 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 8 Mar 2022 20:51:53 -0500
Subject: [PATCH 0045/2561] delta: update to 0.12.1, restore cross

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

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 32984c557cb7..dd9809f3f7e1 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.11.3
+version=0.12.1
 revision=1
 build_style=cargo
 checkdepends="git"
@@ -9,9 +9,12 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=cf68f43d4d26c10551c0137a7e718719958e52267d83f29a8f7794af12095b9e
-make_check=no  # TODO: Re-enable checks when Rust gets updated
-nocross=yes # fails with current rust
+checksum=1b97998841305909638008bd9fa3fca597907cb23830046fd2e610632cdabba3
+
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
 
 post_install() {
 	vlicense LICENSE

From c26798f5b7eecaa0db8ca6842300f71a297e5315 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 9 Mar 2022 01:20:54 +0100
Subject: [PATCH 0046/2561] sigil: update to 1.9.1.

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

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 8e6fdb0c959e..47b8b14dd330 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.9.0
+version=1.9.1
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c44b0cf2472ef59c4d76178883a7795af39febf32496fb7af1e34f7a3977791f
+checksum=08a6c52a9043ecb5fa8314783191b81aa21346bd6b937a522ee417e7bb0dc773
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 7bca3f0764210c01ae077e9702b12e11ea526b16 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 8 Mar 2022 15:19:04 +0100
Subject: [PATCH 0047/2561] dbeaver: update to 22.0.0.

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

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index d6c1958bbb3e..d20837b230c8 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.3.5
+version=22.0.0
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -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=c6f822f4e88bffd37ba0b2525625bbd83156ec36725c2d29101c97f12e280d03
+checksum=c4e995ce3c46723f071faefe8dc68df54f001c634e757a9bf89c594fe3a55613
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

From 2ba10af44f02eb1cffb2795e55adb7031c9b2ec7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 20:01:58 +0100
Subject: [PATCH 0048/2561] libgsf: update to 1.14.48.

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

diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template
index a0d675a3de49..132ac53261b5 100644
--- a/srcpkgs/libgsf/template
+++ b/srcpkgs/libgsf/template
@@ -1,6 +1,6 @@
 # Template file for 'libgsf'
 pkgname=libgsf
-version=1.14.47
+version=1.14.48
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -12,8 +12,9 @@ short_desc="Structured File Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnome.org/"
+changelog="https://gitlab.gnome.org/GNOME/libgsf/-/raw/master/ChangeLog"
 distfiles="${GNOME_SITE}/libgsf/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d188ebd3787b5375a8fd38ee6f761a2007de5e98fa0cf5623f271daa67ba774d
+checksum=ff86d7f1d46dd0ebefb7bd830a74a41db64362b987bf8853fff6ab4c1132b837
 
 pre_configure() {
 	autoreconf -fi

From 7704d801e4cdf6465f621e6b7e9e87b557392d34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 19:49:10 +0100
Subject: [PATCH 0049/2561] libidn2: update to 2.3.2.

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

diff --git a/srcpkgs/libidn2/template b/srcpkgs/libidn2/template
index c3c2ce9e6a26..e7f490959388 100644
--- a/srcpkgs/libidn2/template
+++ b/srcpkgs/libidn2/template
@@ -1,6 +1,6 @@
 # Template file for 'libidn2'
 pkgname=libidn2
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake gettext-devel libtool pkg-config"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://www.gnu.org/software/libidn/#libidn2"
 changelog="https://gitlab.com/libidn/libidn2/-/raw/master/NEWS"
 distfiles="${GNU_SITE}/libidn/libidn2-${version}.tar.gz"
-checksum=8af684943836b8b53965d5f5b6714ef13c26c91eaa36ce7d242e3d21f5d40f2d
+checksum=76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91
 
 pre_configure() {
 	autoreconf -if

From 340c2b55686bf003b388d273d9e39ed6c22ddfaa Mon Sep 17 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, 10 Mar 2022 07:28:31 +0700
Subject: [PATCH 0050/2561] spotify-adblock-linux: clean-up

---
 .../files/spotify-adblock.desktop                     | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop

diff --git a/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop b/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
deleted file mode 100644
index 074ba5775a5b..000000000000
--- a/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Spotify (adblock)
-GenericName=Music Player
-Icon=spotify-client
-TryExec=spotify
-Exec=env LD_PRELOAD=/usr/lib/spotify-adblock.so spotify %U
-Terminal=false
-MimeType=x-scheme-handler/spotify;
-Categories=Audio;Music;Player;AudioVideo;
-StartupWMClass=spotify

From 5b2219d7d408aaf7832f9f9de3ec505a388e26e2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 9 Mar 2022 15:38:47 +0100
Subject: [PATCH 0051/2561] firefox: update to 98.0.

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

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 0f1d1933c03e..8d4e8b1ecb2a 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=97.0.2
+version=98.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=c9f127741beabde78b021dc95b1740259d01677d461400682cb30e072126f075
+checksum=fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd
 
 lib32disabled=yes
 

From 7563325fd5add7a990e7335ae8c329a826d6b8eb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 9 Mar 2022 15:38:55 +0100
Subject: [PATCH 0052/2561] firefox-i18n: update to 98.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 bfdb1893da22..713c5914d0ab 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=97.0.2
+version=98.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="711d38544847e9ea74ec6c1adc2a87359f6114f7538a19a08aa9b39af6d86af2
- 8805946b3e3a76175bb6a32c7dd3a0525274b076afcf19f786362299aad282d3
- da191476f0f624a47bba2bc1382333dca67fd256cb3a541d97642304afd17fd6
- dc12c37abd5747e84aae8e4d942e721015813cea6da9fb2da398c8b88317ecae
- c83f1458f8003ea1e746a2bc0e7c33a9bfe1b61827b8ef48b7940e7dcb7266d8
- b6ddab275ccdd04881834a185e11c3b2a6e85b44b054d98c00e67d2044213fef
- ddd33119b4e0e80493d6fadb1bf0cd1275b469ded565da0303e78e46b591b4bb
- d6f9f5fbd5579631b0d824bc4d0654e5862ad62bebcbeec63edae3550773500e
- 39e4bf91ca90d77dcb97f3642dcdf04e12fc297f5e33969f557ce9d35f8a095b
- d1a126bfbf375114b12716b3b68e59458f4189ae87feda89c3d0f33ab80e66d2
- 2a823e92ea4a24a751040a6651b53dc3909353db84748d03d413e982d0d5b09c
- 1215642aad0c49fa4ce33fd55a92fc9948f50193ffcc0f705b69024c76c3e554
- 9f207a5a7ab721971251b00732ddc4af52937626719f561298bdf958b44b3b08
- 91eec747e15c744f199a829c9f04c3f88c32cb4edd084ae928d1bbaad62e3b79
- 07db181ed390bb6b77f816e4b5277ecf113b5648a132be0ba810f139e9237449
- a056a7d25c9e7b931f0195bd88e5e10df63a2f9bcbf6b3b6712e6f0b01a16806
- fac5ca4b7254bb78ea66c802105f6d501fcf373c058fe8af9a2182ff2ca8f03f
- 38b88252d9c2d8ee248c82d2191ee85b8702d46c3abc5b357dc688501bee1e34
- c0f3663bf61d61433541222eedd1cd37ca83ac01aeb5749a0cd5fb3193b0afa3
- 6de41349be51985aa19de40f9d09cbadbce5e333da3e0b7b54e32da522db5cda
- 8950a2c95e19913c5244d7639d80a74e4ba98d7c83ef7d1249af9d8b30b855ab
- d4867cdc49f6d53f45bbbeccb6fcbec4fb0acded1c946025a491756243f56001
- 1e531ade63594207d98e8720cee2d5cd34d8734cbd133ad646ea5f5459308b4f
- e5779b7142b9bf7b533e47e7fd47fc30068f2d7db979671c190518b9a306bca8
- ca51dbf1af8da13176b22d90feeade8c3eaead1f115b7da1be34a2e53ab1e937
- fd4bb194dbbca5c9f6537fccbe3856da41fc8c0e6c33b81bd037053bfed3e5a3
- abcb4ea5b585eb4a78781692ca80b75c73955a3b4526b30df707d7146e1a2107
- f9e1a0222c41dccb742309be1fb6cb22e217e117ca9460121ec898672bca9e2a
- 9c57c19591de2803766b9e9847745378c224b907b026d9a9146be1e6134274e4
- 457e512d642c7f80ad8638421019ae2fd371b528167e2be0cfe0becca911fc2b
- da11d9b3451f917aa388b342c829f00d6f81e219cfbd06605a8d922513849214
- da8d02366543bd36a29336fb203fba5011980b71847889fd24657626b61a8cbe
- ea49c349b6be0ff747fea4d08debdb0e4507307792ecd51c05f1929c646d5992
- 5015f52f2a061bd891d905b4d929915b57dd7440ddac59b62ee1389528523e09
- 661beeb7d220ad86e108be57cb032ec619fcfe735f78b6f96eb0f8d8b14d4ba2
- 1e80bdb89d96aa719363622f0a5960dae95b002a34d56f40f73817e50c9266a8
- be4f0af6b55af753315171b508c7aaca165ebbaaaf748cb6af36998b31df64b8
- 484dff3ca854329ef248c83df4413f4a41e1783f9e3ab44cb2b41e99b9788b0b
- 5a35b1184dadb6027960d1e0cd3acac6286f7ee3b67aecb93e0fe986803cf59f
- 61520b9337e75ea00b0c7e126fc36c4dcaf24564c5ee31f28a1209da75c7ec8a
- 775ccaacd49132212816313f4e881852374dd249dea2c7715935ef01f6123ccb
- db405bbe804d98b55d2aa526d7079c8702f0548d46ff83793ba238d2bf220d5f
- dd212faf00b2f48bf850f62c1f3615bb9ac6a3143217edad56b5812ae19ec15a
- 1aac0dbe4123b4fc88cf87255e7eb3b042e0415f49cd53e5fc910632ab614ccd
- f0faa8713a4ddd92d89ead3e202768c2ec448e060f18dc00fde87a7bc25dd76a
- b54474b2322b0845952e0a924a5f6e77195bebb5822c44c33622cf1061610b6a
- 2b6172294f78ee15a1c5fd751150132fe31cd8eb430e1f52d9e044a183473a92
- 00aaf9744109b74815042c5b1c8de65dbf6fe343dcb053567f4272c594da4257
- 71244a451478cda2dec27f8ec90890083ef735881f2c9704b98a9b6aefd84ce2
- 21434b8de86fe5248298e08722f11402f7840e68c019c93a6d215cb17dede252
- bb58afe4b2786da68441e919988b2203ab38ba25304d2d2223417655d0343c0b
- 91f9df67ed7b312cecd979d18041f6d395607a8564daa2bdeb16e74d2f60c1ae
- b8af6da30f2765375124fa213363c347590e11e5b7438605c1e0e0a9c347031d
- 1bd2f00d73573b568f1314a94246af52b5afd8dc509d620a9bc3021eaba75d37
- 200d15e3239f79fbec8a39e35f1f4139dcf434a9a1e9138a71d5c77535215b6a
- 4f4071649cf9b6e972bd3f7be36cea1939eefb4338aa5fa24cd9c6304fe74a62
- 7b9d7947fdd50a3ae7e49a26008c9fc8fafb443303ef4bfeb54e615483631989
- 2d9183491e5c460b8e662c495403e210e03a55a65cc3e57cb2d80c990e420d09
- b6655c5a9e2fb070508d70dd21d1a8da707d703335438ee8eccb76518d5273c8
- 3e4a696d97aa99c62f24bdf326c7cc628335f4b99e11aa242616509dd86ed50b
- dce0d2f0ced7865adb3cb34ce8295cfd23df5d796f7cce1da95ea084aed7063a
- a6fc74a8eeadb00237c21a0135681908a74b0a7dbc0a226f245bd4156cd2ec5b
- 0a1380c3993a7a275d8ef0a778784dbeeda62291010876378417e9511b47f982
- 0fdbd02fe36abeb72ed4aa728ab0e2c937d0224e583e464272d86f44d4609cbc
- f973ffbd380fce49db9edf64b5386ca57813b63d7a6f0435794f31f8c4a161fd
- 2ca75e3517ecd64125004806c98222dbc868c7a5ef8aef34ae5e81019b4591b5
- b228a9dc1a2e5b7b5fe78ce191d1c51e9db0013d05f580b80bc511d2618cf2ec
- 0ef7b62babd9ef2808490ee95dd6001d8a62c3106804c58757fb884fdf900410
- d985b8e7a677b694e64293f767f976ff4024763550e5b4150857724a7d5e36ee
- 8576c3c2d81f118f956a311fe54d5e4a45cf77c28d2aee30b62da7d27a266309
- cab9dc8fc76c26c82cd3c1a818e56f97524d413d6baaddb5fbfbc6446b0593f2
- c87bc1ae8c9c41cc61563f098fa88835bc67b947b7d8b8d8b2d2dc2fc941de1a
- 6bd7e96b564b99061f0f468d4b30ae77e72ef44909a5fee99ff5b2b2dd4f8706
- 81c4c1e7b9c9f315b8a3048bf784b990b0a71b38be837c1b73bf63945402d8c4
- f5ac4343c8bed58b9e018aac8964192a2b04cd10ebc95a6b1f37c306a47b85f7
- d8e0129850e4c1e312ffb9fdb3c42a2d671559387bc94e0668e93cf934273ba7
- 1264002195853450cdee6c7333775ed13fd26479d7fcb4e579113946fc97756a
- efe3fca2293b84d6b3eb28266677e0521fe7fc9e2985fcd5f6e0a3f6d6a46eeb
- ca496799f27d1566c3385e6f047f336fbf773bd9a6fa7e27bac97e853d17bed8
- a25e2715b447f329ccd749225a6155ae51b504908fed590f7e127ff6b5eb705f
- 0af4c3134d6c4362137406dfba47f3807ce582663a68362b32fb928a92f98580
- 1a4ad144cd1ba9773806bf8bf39b4b7bef26f35fc276e473c753d21a910a79d2
- 9c5bbe7d92835cb6b9ce9925352a74e95f22915930a39d17221e421cd0c1b948
- 92ebb48617b264736e1ea5b86b80dfc3f4fc3c517b29fe51fcfcb0f6bd5d10ed
- 0f1b1651f04f039d9fc55e183125a97b2806e7ab2654ad84fd0df050111f5bd9
- bb86e3d7e91f6102a4efbaff6f52ef24b277273185c46860fd7077017ac3dc8b
- 85e614958e4e9a59e88cb76ae1ff26c45e0f2aae1ac4545180e8bebeeb687327
- 4a3f9d8aaae340064bcf588455413387d9afee07737c9d62c65bae99004d5283
- 06fd12aade8ca116b7e33efdfd96d29701571bc9a966dd62ffcdb9243c155a7a
- 2038f234ba78e9a6ec5b97cabc445713369ac3ef14d9de7b152284a5c0b94ff4
- 4bb6828f28b425ccf1c73e08fef35db1ac065f062f64a8d2d6213b70554b2801
- bb51fd7d53e5ffd4b44967c0d1381a32777218be5cf4e1135cec05b8e07fdace
- ca95135eb63eb5bd9c4d63d92e9aae6af8ab44aea3730ac52b9382f65d7d1d90
- 54236cc83d40a305d35669c45ea670f6e07b2e3b0bacb01fb0f9f37149cb1478
- 1b18c0255e1f73ebad87795cea2bb8cffa62641c75476e4d9466088407bb66b5
- abb80985d3c25c6bd22d42643a74a5d585d77c7ff0c5264660a8bc06edbbf9d8"
+checksum="dff169f590c9ba54034df42a131d067a30e6ed967fc0e5142705df22d8ea977f
+ b73f738bae53b0afbe28d087a889ab7c98e3b325cfd5122cc60eea59a7db8616
+ 4f13f00bda1aafc6a2d97041fcb3740a4e8c1c049bba151b3791924d73d3ef06
+ 02ab060f05a1a2af373c2a3fe48ef891fa6d1835ddee77ba9678f22bb4782e86
+ b02d91316af55caf87abd7650b286f9c181eb7added7d021446ae2976ff69bbd
+ dfb07ae1cfc143166fdada9e378cb4f22e4ddda92d0e2c66e6a1d2742c51d0c0
+ 4a0409fdc266d1e819a178d558d90b3209c8423cf2794ca0fce3eedea947faa6
+ 567e77ed85bacaafbf82fbc90dfabae6e31be8acec5a2db8cfd28197d5bd1815
+ b92173bf696785e4f64f74871996c75c9fe96854e3194ebf7ff1dcc9f817b0d8
+ bbd223abe4457a1e7425f0cf035c7b6de33e26440d30af8655320ff9c68b124b
+ 8e98b9083a77a97886affbbf089e842b0286539fd93df18b031c8d7e8ac92d30
+ d4a94e6f5753e5f4d2a777830a0cb23ac94298278328bd3579606ceb47d949eb
+ 360dc9fd3a91eac883ca28efd02c218d7365d889146278129ea27424ba452a58
+ cd9bc801f9807b0b8f1dcb3ff8bed985cbe291ee95f25963617845d1d7de57b2
+ fd5b0f3d1d81c74ebd53b4e2f221cc79dbe9c2a936e73b6a983cb666d6c8f7a6
+ e2b37b8fa911c4bca068b0fce10db9fa28490c939c15fb8ffda785d396e6f33b
+ 2a0993286c9e5f1350a660636ec2b43c9c7d974ac9d1c2c979df888f81a90141
+ 2fc6465bc4dd66c23deacfa7d055a2bf50eb2db9a0a10c20f6f3b5321879e33e
+ b88cd11ed43a4f67897434281a4ebd7ef7cb3f4c4d041822fb672d0812d98a2d
+ 9d3de3237d2e12e72f9244151ff9c24caccbd7e1a560718f8f41a0bb7e96e2c9
+ 1cb6d182af78f237d0d01edba2263b01173377ddc0c9b1e7f5db1cf593765da8
+ 52a7d3401c0d333fcf98b33bff2fddc88ae017476e0be74c73359c01d9f7eaee
+ 661374e104b98180fba058d4ab6574246d4d9244739decdfcece493338f1ed3f
+ ba74a4dba80b8cde6a4105cd6179a72005123d1c92898496a2793479c1921676
+ c6259edeb1da7d3ca05ca4b3565408d02e48e3c7f7a254d56b41fdb3639cb56f
+ fddfbe98c0d309323981b685b134f000cc9c69518efc365c5c559ffd2c05b602
+ bee9c9a60147bcf86f55bccace7fe63316fb79af7cd45b8ffe43abba980db8b9
+ 8a4536988167922619e06721229fc91d087d56177ce2ad1a417dd52bc218814f
+ 1c11f7b7d2349d8bf0cbd3f6133d1f93b70b6d0176555d538e0bfb7774ea0de9
+ 52bc04a4c244de19b4e02a60b79fd760df35a2b825363a1e94c5becd535413ec
+ d19315771ccaf194add0459e85a44a8a11dc04f2d9b426201fd4c7000e4defe0
+ 3e0df7a54beb78791adfb9f56cc62c5cd01126e964fa90cc1bb65331b2d572f6
+ 49b38e6fe6746b2c3e4bcf8a1b7bc828ac8c5784dbe5b1039edde51d2e942dd3
+ 97751019d9f01120a0acf4153b3b06c2e476b83d5da8561bac349cdcba5fe095
+ bb222cce7ff359eeef5cbaad871aa42214ab5b62872deead6cc57068d0f1fd8b
+ fcff68e01cbf4740e7816fb61a15853f9be14034b3fdde1a67b22f80dd43ff33
+ bc7c2beadf026cd535635b540c2a8ca7953662b154b9e128378b6ab51ac62953
+ b1f207489d09eec55d486b467ceb88bd289b7238ff506a01318d797811121f95
+ 08dacf388f2a04796450d37c2a7db5270b3515c38ef0f0426ecc59915ae6b812
+ cc7e4230277d9b54f114048f951880aaf4ed88af03a5791e0dc091ecb947e956
+ cd6024b8bc6780265146720559fb1f828e36688eeec919044a62d365b440ba97
+ 33c1d05921e6041db7d09279da354e2d406798ffd14c67b9cf204e339fc1caee
+ 0264439a560fef95488a5aa05783b24e39d16acbed6f1b389a75864ac60f3267
+ f174f19aacd50078adceb236e9432feccaf0edc8aae9632191a4c38dab22b206
+ 596b84ba309ed661429c8fe5a13baa38e773f40b3b17c997d61834afec92b535
+ 6e2e243496089c084844868744ed2a736e621fc14fe95cdf3b5b7507d56b022e
+ 91449d6929c9c3068d0c724315e00d412f25c7ca72fddba53ac97c24f4214189
+ 138ca2aaf0f0a2decba98db228ac835b1299c841932bf683deb635a8cf226616
+ 299bacaffa3b2f8bc359b7bd33a9e4b5588546f7b75ea323ab63b6a25152ace1
+ c9eaa1d9e843a07eed355db514c10f8df0e898f9f177dc96eb721643218c6314
+ 5231901059f7a9d7b5bd7ff15168c469f2f7813c85c7266b70c20661e2eeb838
+ c2d0f151ffd2e9daf33bbffc2d069fd65c258d7c69b29f38785e2e395d8ff6c0
+ c2edbea7c2037a57524c4899a888eb0a3007593f0b39e8686a049b5dda10a768
+ 95acf4112f5b67f22f8df330e53e6cf764e1648f6fbbebc7feb316dc3eb6cf8f
+ 22224ae5b1818b86a5ce7b5872ebcea1c071009a6fe1abcfcf26cfe36b53c6b8
+ 035658f37f5a9c025db1386a89f5c05b72895b73c1a6826656055117afbd5239
+ 627d5f227d5e39c98802dabf68096f2588ee988afcdb13b95470457bb1f1c44c
+ 7d5f86ab7a0f47947ccfebf496e7e8164d433ee7560c39661a0f3d88995d72c4
+ 9623353017b1f980f43eae284662dbd2cd0b1ea1d8864e4fa6f86c83d78e7c06
+ 1fb1f82cbaca4a5463b8375709dc2e865dae4492ef294c7c39324fb867e58272
+ ad7df8473b55cc460476e05f265e7c496f711dbd6635b594e3d1cdd435ff6504
+ 38416b1b2ca89bec7e71e2143ba27e64b2c3319ef45499346b47dc30fbca793c
+ b55d6775b6bb9254b87692e244fd7078ec93c031efa51b6d205cff98a1651484
+ 66318b8528b59acba6be065989e51b5187a8735cc1be87fb25c835d9f5ae37af
+ 423f5a30c7174d2b41f5fcd38beaa232967990f66aec84769ce501402f5881a3
+ 7933dfd5d65816c54c8ab3da1455d6810c4d1532790d95c54b0bc4adc055ff40
+ a44392970b81bbc639822aaa9f73f7da4e64e39b91a402483d5bf98538fd88e4
+ 0cf1c29300b3fee8659c630bd37867323c42422b50bd429e9ca196025fbf090c
+ ff56285588b4bcc927db05ac856e2bf69d4f6b31c63d254242551c0315719854
+ cc1de1d246c39e1214186cbe88932b70e8e60121739faf9c88f24446e74445b8
+ b97123397c9f1419bd6ce9c62a7be178c35683b64fe3c20046ee4aeeadd2f83b
+ b09681f50489150130ae682139d6427f1fc77c2cb2a9debdd5db9fc4ae307a1c
+ 84f5dc461c256fd058522acf368c5d83a4560a8a478be5f5d551a1a194598374
+ 336a044de2b47ee875f27627059bef2dea0862908b2bd937416a2765ec91eeda
+ 3154deee82fe4fa24df33713a2a9688c1028c39df791732af097419dca83e3f6
+ 973e3de5de51533ebd699879ec1679525e7b35a0a74218f68c29a1b4d2280c2d
+ 18344197c44ed32c4cf31df5c4424d0128b6791a57fb910ce42e1f68d282e13d
+ 87c4014428af7f4303f9accc16951be16dc7122a191d1465d0a5e0b60486ef80
+ 6ca8549d8c1c91ca2136e49458b935974354640aa6bab2a8d2255868d56d87ed
+ 2a18628d8955170725121f5f5a2b4262e39456e9fd4a007bd387f2a14e235a50
+ 96cbf50ad97ada93a6e0156557911911e46c7963b34951cfe5abd0be3dbfaade
+ ba6fd1a48128dfa48a1f3c70b28181e658abbbf549e104d08df3f27197475dcc
+ 7bb5c17d1f1e25cfc735867f005563ead7de99c19e27f05a0efeced067ab50be
+ b3712f4146b50e243a6b2056d062045a14c9d8057ba1430f5c2662dac06ac34e
+ 8f1c167582e3d46cf2d24887b47dd4830f0dd084aefd7371b61ef716932db352
+ 29563c43673308e83437984ebe46e650a56e11be5fe2e1298946bc232287e121
+ 9badcf85535fc5b2282bdaea3fc6ac15d0f9f560524015321f0ed5c075fe7e5b
+ 1b6c1b1374e257cb5f699f71dbd1d2d1a287588548610272598a85b8133fcaef
+ 3aed734f122676a568c68a98a3243570dea7b06cf5a65f1be1ce060da2fe6804
+ a365cac889289ede9cf61a0fb73b8efe7cccf758167354ff43b29b3845777c82
+ 20c519b8cf6f16eac1fbc00b93178eb78c076f10518faf4c43f9606de6fbab83
+ 138ef57dc8947ef1580ee7fb0edc3459cd49a16ec296edabcfa913c784ee7320
+ 1b4fd65008d7780b9af4857ef91b9d4eccb97cb3469d90a982713812ab7c1b11
+ 1930509ac41ac78987f50332f9e44b66d0e27ad59fea56e933e05d4475012196
+ d6c16dec9ea82842f64e11ff7f6b4194f9b513f904423291ec8e7782ab7024f8
+ 54af90457d760ea7ac38b1b6d7b532996542192d0541004f9da9386fb5ea91ea"

From e217897ce8bcb170345bb9053096975f3211856f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 17:57:12 -0600
Subject: [PATCH 0053/2561] Amass: update to 3.17.1.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 4f2e6ce8db16..271551b6b159 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.17.0
+version=3.17.1
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ 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=e1217f5a62f87bbde467bb772f7cdf8583db3de68cc7c1693402f450486b4c93
+checksum=5d11de26ce62dad9ddc4f36032a1192c2c126c4e23a31e1e04cb2d08098d5dfd
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From b5b518647a3c89d79980378fb8fbffd78e835ffc Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 17:58:17 -0600
Subject: [PATCH 0054/2561] eggdrop: update to 1.9.2.

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

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index a2ec4f5e291c..fa8b5a4b163f 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,6 +1,6 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
-version=1.9.1
+version=1.9.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
@@ -10,7 +10,7 @@ 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=72916ff3b34d86b11c53317f8c91531c5ff5b64138b4f39aa10ee43aae01e884
+checksum=7e3667f31f9770708aa52a4dd6c7aa1f61b29cf62b90f7e13769aed28f7c5e39
 conf_files="/etc/eggdrop/text/banner /etc/eggdrop/text/motd"
 
 pre_build() {

From 812f686247b0822bf581ac917759bb5e417d54a9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 17:59:05 -0600
Subject: [PATCH 0055/2561] sqlmap: update to 1.6.3.

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

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

From 7de9db1114e3544d8198f097e74f172ab8b8b63d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 18:01:22 -0600
Subject: [PATCH 0056/2561] python3-waitress: update to 2.1.0.

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

diff --git a/srcpkgs/python3-waitress/template b/srcpkgs/python3-waitress/template
index d3cc687e412e..ae3ee23f6934 100644
--- a/srcpkgs/python3-waitress/template
+++ b/srcpkgs/python3-waitress/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-waitress'
 pkgname=python3-waitress
-version=2.0.0
+version=2.1.0
 revision=1
 wrksrc="waitress-${version}"
 build_style=python3-module
@@ -11,5 +11,5 @@ short_desc="Pure-Python WSGI server"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="ZPL-2.1"
 homepage="https://github.com/Pylons/waitress"
-distfiles="${PYPI_SITE}/w/waitress/waitress-2.0.0.tar.gz"
-checksum=69e1f242c7f80273490d3403c3976f3ac3b26e289856936d1f620ed48f321897
+distfiles="${PYPI_SITE}/w/waitress/waitress-${version}.tar.gz"
+checksum=ec8a8d9b6b15f3bb2c1a82b8f3929a029c333c35fcafb08c185a9e562d8cc9c2

From 7867d4289073b60bb4c51cada2ed99372dc06b02 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 18:02:43 -0600
Subject: [PATCH 0057/2561] python3-ytmusicapi: update to 0.21.0.

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

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index 4c7faa119848..b791bcb33c0b 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=0.20.0
+version=0.21.0
 revision=1
 wrksrc="ytmusicapi-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
-checksum=16b986f687379f3e2411dac413316b789fb61a25df3209ed70e6b09d28908c6d
+checksum=338941fb2fb52078a69fa47a34456574e4e9998caead56d27e440bacacdb917c
 
 post_install() {
 	vlicense LICENSE

From 2930547bdef7cb878958b049ddda94ab1bee55ad Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 9 Mar 2022 19:46:43 -0500
Subject: [PATCH 0058/2561] just: update to 1.0.1, adopt.

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

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 0e9a5efa9f4f..156d04e3120d 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,15 +1,15 @@
 # Template file for 'just'
 pkgname=just
-version=1.0.0
+version=1.0.1
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
-maintainer="Wilson Birney <wpb@360scada.com>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 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/refs/tags/${version}.tar.gz"
-checksum=19134e517976678a8f2e8fbff0eef79667c608ca09c0b7d3f96dd4197d9bb98b
+checksum=261532a3b72b34a79df01bb0c4a366bcc3fd870c5706340fec260faebddb42c6
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 9873ad8c43afdb8e3b888f2ad417bf4b97f1b998 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 9 Mar 2022 19:44:28 -0500
Subject: [PATCH 0059/2561] chezmoi: update to 2.14.0.

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

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 286f3e1fb1ac..464d7ccc07ca 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.13.1
+version=2.14.0
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=52fba493bb9f987a7971bcc187e7af9c01277b00daa91e4113e2e1f68c634ae2
+checksum=4d7a1baf7e3caa8f6976b1ea5e6ba81c75273b1dd1f0fc946134a82454720397
 
 export CGO_ENABLED=1
 

From 982b0ee6d4aef27bf805c59bdf0a71a7f275dad4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 9 Mar 2022 19:11:23 -0500
Subject: [PATCH 0060/2561] mdcat: update to 0.26.1, restore cross, adopt.

---
 srcpkgs/mdcat/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index 9a3ea193604c..c07dbd3b3913 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,21 +1,20 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.25.0
+version=0.26.1
 revision=1
-wrksrc="${pkgname}-${pkgname}-${version}"
+wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config ruby-asciidoctor"
 makedepends="openssl-devel"
 short_desc="Cat for markdown"
-maintainer="Wilson Birney <wpb@360scada.com>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MPL-2.0"
-homepage="https://github.com/lunaryorn/mdcat"
-changelog="https://raw.githubusercontent.com/lunaryorn/mdcat/main/CHANGELOG.md"
-distfiles="https://github.com/lunaryorn/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=92fddabab24f2e7d673b06c1f31a7746abbb547c5581faaed17a8e3e1e5b17a5
+homepage="https://codeberg.org/flausch/mdcat/"
+changelog="https://codeberg.org/flausch/mdcat/raw/branch/main/CHANGELOG.md"
+distfiles="https://codeberg.org/flausch/mdcat/archive/mdcat-${version}.tar.gz"
+checksum=1120c4f3b5b517075b6347dbfe76a2211a91837b4d0242c0b72cdbc19e6886dd
 
 case "$XBPS_TARGET_MACHINE" in
-	armv6l|armv7l) broken="https://build.voidlinux.org/builders/armv7l_builder/builds/36158/steps/shell_3/logs/stdio" ;;
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac

From b9ba38019a387198ff4d7a148028777ca6f65571 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 10 Mar 2022 13:24:44 +0100
Subject: [PATCH 0061/2561] nncp: update to 8.7.1.

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

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 43de7495a654..e6d62ac2f55f 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=8.7.0
+version=8.7.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=ed488ffd7d88028bdd64386bec4ad9116f7da0881fb1e628493d2f2bbbd1e868
+checksum=ceb4d197af5a8d9e93b749d5c0f50b53e6746a318af47b364bf5cb323d6c4ebd
 
 do_build() {
 	make

From fdd9356a23cab0d35d3f4b0b6e4ffc5b84b90bb3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 10 Mar 2022 13:25:22 +0100
Subject: [PATCH 0062/2561] mcomix: update to 2.0.1.

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

diff --git a/srcpkgs/mcomix/template b/srcpkgs/mcomix/template
index 3f26682f077e..6baf097d98dd 100644
--- a/srcpkgs/mcomix/template
+++ b/srcpkgs/mcomix/template
@@ -1,6 +1,6 @@
 # Template file for 'mcomix'
 pkgname=mcomix
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://sourceforge.net/projects/mcomix/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/MComix-${version}/${pkgname}-${version}.tar.gz"
-checksum=a3ef3d76ee34a82b67e91d3ea0e2b19b88179421698c73453829eceaca895d89
+checksum=57f97ebac913f8b9021b4cb52e135b205ef58353d16d9f838d62f55d0252eca0
 
 post_install() {
 	cp -r mcomix/images ${DESTDIR}/usr/lib/python3.*/site-packages/mcomix

From 5e3dcc63a071e7ecef3a57053d10ceef7ab13e02 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Wed, 9 Mar 2022 00:02:11 -0500
Subject: [PATCH 0063/2561] ghostscript: update to 9.55.0.

Remove patch for CVE-2021-3781 as it is included in the current release.

Include a patch for a typo in the current release:
https://bugs.ghostscript.com/show_bug.cgi?id=704501
---
 .../ghostscript/patches/CVE-2021-3781.patch   | 233 ------------------
 .../fix_gscms_transform_color_typo.patch      |  11 +
 srcpkgs/ghostscript/template                  |   7 +-
 3 files changed, 15 insertions(+), 236 deletions(-)
 delete mode 100644 srcpkgs/ghostscript/patches/CVE-2021-3781.patch
 create mode 100644 srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch

diff --git a/srcpkgs/ghostscript/patches/CVE-2021-3781.patch b/srcpkgs/ghostscript/patches/CVE-2021-3781.patch
deleted file mode 100644
index e9c34ee05b51..000000000000
--- a/srcpkgs/ghostscript/patches/CVE-2021-3781.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=a9bd3dec9fde
-
-From a9bd3dec9fde03327a4a2c69dad1036bf9632e20 Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Tue, 7 Sep 2021 20:36:12 +0100
-Subject: [PATCH] Bug 704342: Include device specifier strings in access
- validation
-
-for the "%pipe%", %handle%" and %printer% io devices.
-
-We previously validated only the part after the "%pipe%" Postscript device
-specifier, but this proved insufficient.
-
-This rebuilds the original file name string, and validates it complete. The
-slight complication for "%pipe%" is it can be reached implicitly using
-"|" so we have to check both prefixes.
-
-Addresses CVE-2021-3781
----
- base/gdevpipe.c | 22 +++++++++++++++-
- base/gp_mshdl.c | 11 +++++++-
- base/gp_msprn.c | 10 ++++++-
- base/gp_os2pr.c | 13 +++++++++-
- base/gslibctx.c | 69 ++++++++++---------------------------------------
- 5 files changed, 65 insertions(+), 60 deletions(-)
-
-diff --git a/base/gdevpipe.c b/base/gdevpipe.c
-index 96d71f5d8..5bdc485be 100644
---- a/base/gdevpipe.c
-+++ b/base/gdevpipe.c
-@@ -72,8 +72,28 @@ pipe_fopen(gx_io_device * iodev, const char *fname, const char *access,
- #else
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    /* The pipe device can be reached in two ways, explicltly with %pipe%
-+       or implicitly with "|", so we have to check for both
-+     */
-+    char f[gp_file_name_sizeof];
-+    const char *pipestr = "|";
-+    const size_t pipestrlen = strlen(pipestr);
-+    const size_t preflen = strlen(iodev->dname);
-+    const size_t nlen = strlen(fname);
-+    int code1;
-+
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(f, iodev->dname, preflen);
-+    memcpy(f + preflen, fname, nlen + 1);
-+
-+    code1 = gp_validate_path(mem, f, access);
-+
-+    memcpy(f, pipestr, pipestrlen);
-+    memcpy(f + pipestrlen, fname, nlen + 1);
- 
--    if (gp_validate_path(mem, fname, access) != 0)
-+    if (code1 != 0 && gp_validate_path(mem, f, access) != 0 )
-         return gs_error_invalidfileaccess;
- 
-     /*
-diff --git a/base/gp_mshdl.c b/base/gp_mshdl.c
-index 2b964ed74..8d87ceadc 100644
---- a/base/gp_mshdl.c
-+++ b/base/gp_mshdl.c
-@@ -95,8 +95,17 @@ mswin_handle_fopen(gx_io_device * iodev, const char *fname, const char *access,
-     long hfile;	/* Correct for Win32, may be wrong for Win64 */
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    char f[gp_file_name_sizeof];
-+    const size_t preflen = strlen(iodev->dname);
-+    const size_t nlen = strlen(fname);
- 
--    if (gp_validate_path(mem, fname, access) != 0)
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(f, iodev->dname, preflen);
-+    memcpy(f + preflen, fname, nlen + 1);
-+
-+    if (gp_validate_path(mem, f, access) != 0)
-         return gs_error_invalidfileaccess;
- 
-     /* First we try the open_handle method. */
-diff --git a/base/gp_msprn.c b/base/gp_msprn.c
-index ed4827968..746a974f7 100644
---- a/base/gp_msprn.c
-+++ b/base/gp_msprn.c
-@@ -168,8 +168,16 @@ mswin_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
-     uintptr_t *ptid = &((tid_t *)(iodev->state))->tid;
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    const size_t preflen = strlen(iodev->dname);
-+    const size_t nlen = strlen(fname);
- 
--    if (gp_validate_path(mem, fname, access) != 0)
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(pname, iodev->dname, preflen);
-+    memcpy(pname + preflen, fname, nlen + 1);
-+
-+    if (gp_validate_path(mem, pname, access) != 0)
-         return gs_error_invalidfileaccess;
- 
-     /* First we try the open_printer method. */
-diff --git a/base/gp_os2pr.c b/base/gp_os2pr.c
-index f852c71fc..ba54cde66 100644
---- a/base/gp_os2pr.c
-+++ b/base/gp_os2pr.c
-@@ -107,9 +107,20 @@ os2_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
-            FILE ** pfile, char *rfname, uint rnamelen)
- {
-     os2_printer_t *pr = (os2_printer_t *)iodev->state;
--    char driver_name[256];
-+    char driver_name[gp_file_name_sizeof];
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    const size_t preflen = strlen(iodev->dname);
-+    const int size_t = strlen(fname);
-+
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(driver_name, iodev->dname, preflen);
-+    memcpy(driver_name + preflen, fname, nlen + 1);
-+
-+    if (gp_validate_path(mem, driver_name, access) != 0)
-+        return gs_error_invalidfileaccess;
- 
-     /* First we try the open_printer method. */
-     /* Note that the loop condition here ensures we don't
-diff --git a/base/gslibctx.c b/base/gslibctx.c
-index 6dfed6cd5..318039fad 100644
---- a/base/gslibctx.c
-+++ b/base/gslibctx.c
-@@ -655,82 +655,39 @@ rewrite_percent_specifiers(char *s)
- int
- gs_add_outputfile_control_path(gs_memory_t *mem, const char *fname)
- {
--    char *fp, f[gp_file_name_sizeof];
--    const int pipe = 124; /* ASCII code for '|' */
--    const int len = strlen(fname);
--    int i, code;
-+    char f[gp_file_name_sizeof];
-+    int code;
- 
-     /* Be sure the string copy will fit */
--    if (len >= gp_file_name_sizeof)
-+    if (strlen(fname) >= gp_file_name_sizeof)
-         return gs_error_rangecheck;
-     strcpy(f, fname);
--    fp = f;
-     /* Try to rewrite any %d (or similar) in the string */
-     rewrite_percent_specifiers(f);
--    for (i = 0; i < len; i++) {
--        if (f[i] == pipe) {
--           fp = &f[i + 1];
--           /* Because we potentially have to check file permissions at two levels
--              for the output file (gx_device_open_output_file and the low level
--              fopen API, if we're using a pipe, we have to add both the full string,
--              (including the '|', and just the command to which we pipe - since at
--              the pipe_fopen(), the leading '|' has been stripped.
--            */
--           code = gs_add_control_path(mem, gs_permit_file_writing, f);
--           if (code < 0)
--               return code;
--           code = gs_add_control_path(mem, gs_permit_file_control, f);
--           if (code < 0)
--               return code;
--           break;
--        }
--        if (!IS_WHITESPACE(f[i]))
--            break;
--    }
--    code = gs_add_control_path(mem, gs_permit_file_control, fp);
-+
-+    code = gs_add_control_path(mem, gs_permit_file_control, f);
-     if (code < 0)
-         return code;
--    return gs_add_control_path(mem, gs_permit_file_writing, fp);
-+    return gs_add_control_path(mem, gs_permit_file_writing, f);
- }
- 
- int
- gs_remove_outputfile_control_path(gs_memory_t *mem, const char *fname)
- {
--    char *fp, f[gp_file_name_sizeof];
--    const int pipe = 124; /* ASCII code for '|' */
--    const int len = strlen(fname);
--    int i, code;
-+    char f[gp_file_name_sizeof];
-+    int code;
- 
-     /* Be sure the string copy will fit */
--    if (len >= gp_file_name_sizeof)
-+    if (strlen(fname) >= gp_file_name_sizeof)
-         return gs_error_rangecheck;
-     strcpy(f, fname);
--    fp = f;
-     /* Try to rewrite any %d (or similar) in the string */
--    for (i = 0; i < len; i++) {
--        if (f[i] == pipe) {
--           fp = &f[i + 1];
--           /* Because we potentially have to check file permissions at two levels
--              for the output file (gx_device_open_output_file and the low level
--              fopen API, if we're using a pipe, we have to add both the full string,
--              (including the '|', and just the command to which we pipe - since at
--              the pipe_fopen(), the leading '|' has been stripped.
--            */
--           code = gs_remove_control_path(mem, gs_permit_file_writing, f);
--           if (code < 0)
--               return code;
--           code = gs_remove_control_path(mem, gs_permit_file_control, f);
--           if (code < 0)
--               return code;
--           break;
--        }
--        if (!IS_WHITESPACE(f[i]))
--            break;
--    }
--    code = gs_remove_control_path(mem, gs_permit_file_control, fp);
-+    rewrite_percent_specifiers(f);
-+
-+    code = gs_remove_control_path(mem, gs_permit_file_control, f);
-     if (code < 0)
-         return code;
--    return gs_remove_control_path(mem, gs_permit_file_writing, fp);
-+    return gs_remove_control_path(mem, gs_permit_file_writing, f);
- }
- 
- int
--- 
-2.17.1
diff --git a/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch b/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
new file mode 100644
index 000000000000..9ffa2e09ba66
--- /dev/null
+++ b/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
@@ -0,0 +1,11 @@
+--- ./base/gsicc_lcms2.c.jlg	2021-09-27 03:44:02.000000000 -0400
++++ ./base/gsicc_lcms2.c	2021-10-05 10:50:03.428000000 -0400
+@@ -462,7 +462,7 @@
+ gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor,
+                              void *outputcolor, int num_bytes)
+ {
+-    return gscms_transformm_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
++    return gscms_transform_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
+ }
+ 
+ int
diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 5d9e1aa9d410..8bce83846ad8 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,7 +1,7 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
-version=9.54.0
-revision=2
+version=9.55.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"
@@ -10,8 +10,9 @@ short_desc="Interpreter for the PostScript language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later, CPL-1.0"
 homepage="https://www.ghostscript.com/"
+changelog="https://www.ghostscript.com/doc/${version}/News.htm"
 distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${version//./}/ghostscript-${version}.tar.xz"
-checksum=c2b7b43cde600f4e70efb2cd95865f6d884a67315c3de235914697d8ccde6e3b
+checksum=6ee3057773646d6a2c6d117eb53a17d6752feadc513828e4322f68b7b7789ff6
 
 build_options="cups"
 build_options_default="cups"

From 2a7dd8964f11bffa8cf1e4ee0e582e8cc643d716 Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Thu, 10 Mar 2022 13:44:18 +0100
Subject: [PATCH 0064/2561] jless: update to 0.8.0

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

diff --git a/srcpkgs/jless/template b/srcpkgs/jless/template
index 2d4cfa1f1865..0de4ebf061dc 100644
--- a/srcpkgs/jless/template
+++ b/srcpkgs/jless/template
@@ -1,14 +1,16 @@
 # Template file for 'jless'
 pkgname=jless
-version=0.7.2
+version=0.8.0
 revision=1
 build_style=cargo
+hostmakedepends="python3"
+makedepends="xcb-util-devel"
 short_desc="Pager for JSON data"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/PaulJuliusMartinez/jless"
 distfiles="https://github.com/PaulJuliusMartinez/jless/archive/refs/tags/v${version}.tar.gz"
-checksum=5d776cb6488743ccdaeeffb4bfc54d84862028170cee852a8bb5c156526ed263
+checksum=3f1168c9b2432f7f4fa9dd3c31b55e371ef9d6f822dc98a8cdce5318a112bf2d
 
 post_install() {
 	vlicense LICENSE

From 68e970f5642cd34905acef0f5c8bdce442f28656 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 10 Mar 2022 21:51:21 +0100
Subject: [PATCH 0065/2561] firefox: mark broken for armv7l*

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

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8d4e8b1ecb2a..6c1596b19e06 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -32,6 +32,7 @@ build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 
 case $XBPS_TARGET_MACHINE in
 	armv[56]*) broken="required NEON extensions are not supported on armv6" ;;
+	armv7*) broken="currently broken" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
 esac

From cf8e09bed0e5849aab80ea9becb609ebecc601c1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 9 Mar 2022 18:50:46 -0600
Subject: [PATCH 0066/2561] bzflag: update to 2.4.24.

---
 srcpkgs/bzflag/patches/NetHandler-musl.patch | 11 -----------
 srcpkgs/bzflag/template                      |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/bzflag/patches/NetHandler-musl.patch

diff --git a/srcpkgs/bzflag/patches/NetHandler-musl.patch b/srcpkgs/bzflag/patches/NetHandler-musl.patch
deleted file mode 100644
index 75385ce3ca86..000000000000
--- a/srcpkgs/bzflag/patches/NetHandler-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/game/NetHandler.cxx	2018-01-22 12:28:31.043278572 -0600
-+++ b/src/game/NetHandler.cxx	2018-01-22 12:28:07.889568033 -0600
-@@ -135,7 +135,7 @@
-   uint16_t code;
-   while (true) {
-     n = recvfrom(udpSocket, buffer, MaxUDPPacketLen, 0, (struct sockaddr *) uaddr,
--		 &recvlen);
-+		 (socklen_t*)&recvlen);
-     if ((n < 0) || (n >= 4))
-       break;
-   }
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index d58270495975..59f664f1c059 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,6 +1,6 @@
 # Template file for 'bzflag'
 pkgname=bzflag
-version=2.4.22
+version=2.4.24
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="LGPL-2.1-only, MPL-2.0"
 homepage="https://www.bzflag.org"
 changelog="https://raw.githubusercontent.com/BZFlag-Dev/bzflag/2.4/ChangeLog"
 distfiles="https://download.bzflag.org/bzflag/source/${version}/bzflag-${version}.tar.bz2"
-checksum=9e64653302b657bd8b5f96fe1150a9ff80a1d53a6d7e8a35138c6b1b02006a4d
+checksum=5f8131beb7fc8ba51e323a06ecd7d8eab91537c342ce87a113e5eb6ea98ce3c4

From 80982d5347fa002966fe159240218b1b40b841f4 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Thu, 10 Mar 2022 02:02:43 +0200
Subject: [PATCH 0067/2561] spotify: update to 1.1.80.

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

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 185d59ecdb5c..32d439d290f8 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,8 +1,8 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.1.72
+version=1.1.80
 revision=1
-_ver="${version}.439.gc253025e_amd64"
+_ver="${version}.699.gc3dac750_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=c211a16b6ed6627c4b7d8ca6997376f8345dca638938696933c5495405ce9e16
+checksum=19f80255b89d768969ff9d6a05d90091a30c05f65eabdd968592d47a7754b80e
 _license_checksum=4465d0bba5deb87866184b04ba76604cd93561c0dc9cd21cacdf5b0295bdae3a
 repository=nonfree
 restricted=yes

From 9587b57212400294d8dc121c7c04bcb9972123fe Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 10 Mar 2022 16:26:06 -0600
Subject: [PATCH 0068/2561] xlockmore: update to 5.69.

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

diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template
index b79c581190bd..c520c4d7b4c6 100644
--- a/srcpkgs/xlockmore/template
+++ b/srcpkgs/xlockmore/template
@@ -1,6 +1,6 @@
 # Template file for 'xlockmore'
 pkgname=xlockmore
-version=5.68
+version=5.69
 revision=1
 build_style=gnu-configure
 configure_args="--with-xinerama $(vopt_if opengl '--with-opengl --with-mesa')"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="http://sillycycle.com/xlockmore.html"
 changelog="http://sillycycle.com/xlock/xlockmore.README"
 distfiles="http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"
-checksum=30731fdcb203f16eb5c1c43c05d42e452ad0eb4555c97c55566a6ecb1877cd6e
+checksum=ea92654c001226848765a251a73bcbc473ccef17b721cc18d5361f59dbd6d3b9
 CFLAGS="-D_DEFAULT_SOURCE"
 
 build_options="opengl"

From 5ca79ac0877db93e4821490e87e8127ca805e814 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 11 Mar 2022 00:18:57 +0100
Subject: [PATCH 0069/2561] plank: add dependencies to -devel subpkg

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

diff --git a/srcpkgs/plank/template b/srcpkgs/plank/template
index 71793ba1429a..232f336c0d93 100644
--- a/srcpkgs/plank/template
+++ b/srcpkgs/plank/template
@@ -1,7 +1,7 @@
 # Template file for 'plank'
 pkgname=plank
 version=0.11.89
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable dbusmenu) --disable-apport"
 hostmakedepends="intltool libgee08-devel glib-devel pkg-config libxml2 vala
@@ -21,7 +21,8 @@ build_options_default="dbusmenu"
 
 plank-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} cairo-devel libgee08-devel
+	 libglib-devel gtk+3-devel gdk-pixbuf-devel bamf-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From d3ea27e31a24a13d08f1d3a90dafe6a01d259bd5 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:07:35 -0800
Subject: [PATCH 0070/2561] podman: update to 4.0.2

---
 srcpkgs/podman/patches/musl.patch | 47 -------------------------------
 srcpkgs/podman/template           | 11 +++++---
 2 files changed, 7 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/podman/patches/musl.patch

diff --git a/srcpkgs/podman/patches/musl.patch b/srcpkgs/podman/patches/musl.patch
deleted file mode 100644
index 2732d190233c..000000000000
--- a/srcpkgs/podman/patches/musl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1d781ccbeab3364ac18c487f66893847fe5e102f Mon Sep 17 00:00:00 2001
-From: Marc Nguyen <nguyen_marc@live.fr>
-Date: Fri, 10 Dec 2021 03:07:20 +0100
-Subject: [PATCH] [NO NEW TESTS NEEDED] rootless: declare TEMP_FAILURE_RETRY
- before usage (Fixes: #12563)
-
-Signed-off-by: Nguyen Marc <nguyen_marc@live.fr>
----
- pkg/rootless/rootless_linux.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
-index e71d5d999fe..92f331ce493 100644
---- a/pkg/rootless/rootless_linux.c
-+++ b/pkg/rootless/rootless_linux.c
-@@ -19,6 +19,15 @@
- #include <sys/select.h>
- #include <stdio.h>
- 
-+#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
-+
- #define cleanup_free __attribute__ ((cleanup (cleanup_freep)))
- #define cleanup_close __attribute__ ((cleanup (cleanup_closep)))
- #define cleanup_dir __attribute__ ((cleanup (cleanup_dirp)))
-@@ -72,15 +81,6 @@ int rename_noreplace (int olddirfd, const char *oldpath, int newdirfd, const cha
-   return rename (oldpath, newpath);
- }
- 
--#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 const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces";
- static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone";
- 
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 8558180f3a4b..e83467c87f7c 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,9 +1,9 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.4.4
+version=4.0.2
 revision=1
 build_style=go
-go_import_path="github.com/containers/podman/v3"
+go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman"
 go_build_tags="seccomp apparmor containers_image_ostree_stub"
 hostmakedepends="pkg-config go-md2man"
@@ -15,15 +15,18 @@ license="Apache-2.0"
 homepage="https://podman.io/"
 changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=718c9e1e734c2d374fcf3c59e4cc7c1755acb954fc7565093e1d636c04b72e3a
+checksum=cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
 fi
 
+post_build() {
+	make docs
+}
+
 post_install() {
 	make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
-	make install.completions DESTDIR="${DESTDIR}" PREFIX="/usr"
 	sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
 		vendor/github.com/containers/common/pkg/config/containers.conf \
 		>containers.cgfs.conf

From 2040e40a4cf65e82ad934736a8c62b2dad615b8c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:15:51 -0800
Subject: [PATCH 0071/2561] fuse-overlayfs: update to 1.8.2

---
 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 ebf055c49202..0fb2a3a56503 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.8.1
+version=1.8.2
 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=99cc7fac93716527c054f90c86eea508b7b87ca2132776c30544660e5365aba2
+checksum=dfcadb2d7e1d109db42cca250fbe3341bbd463ac25f5950b2b56bd7618c0fc0f
 
 pre_configure() {
 	./autogen.sh

From 0c5e93c6b76b495558ca1b87d9f8fbf7d1811d7e Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:26:50 -0800
Subject: [PATCH 0072/2561] conmon: update to 2.1.0

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

diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index a165b519932c..6d26aed4983c 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -1,6 +1,6 @@
 # Template file for 'conmon'
 pkgname=conmon
-version=2.0.32
+version=2.1.0
 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=0ffd17a185322779d14d9a64c39120900f1e0cc3297b18679a933f5f6ba06a75
+checksum=874909d831feac75e452562087f6ea0eb39848ef144397bdd8f0daf579c5ee85
 
 do_install() {
 	vbin bin/conmon

From cceb3ab52c5c4a9843c8883f5d693715909b8a7a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 10 Mar 2022 11:37:49 +0100
Subject: [PATCH 0073/2561] revive: update to 1.1.4.

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

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index e6895a6daf1c..55a011447362 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,6 +1,6 @@
 # Template file for 'revive'
 pkgname=revive
-version=1.1.2
+version=1.1.4
 revision=1
 build_style=go
 go_ldflags="-X main.version=$version -X main.builtBy=xbps"
@@ -10,7 +10,7 @@ maintainer="Roberto Ricci <ricci@disroot.org>"
 license="MIT"
 homepage="https://revive.run/"
 distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz"
-checksum=b2dd477895e11de93ef076a7ad8186003c5ccc87416909e281eed63d8e26d1db
+checksum=afe0d11a614d5ca706485b7f6ca1e53b374b45017ea75f14149a4434d3ef74b5
 
 do_check() {
 	go test -v ./...

From e2c2e6d2985682e3fc2acfd588561dbd32346c4f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 0074/2561] ghc: update to 8.10.7

Closes https://github.com/void-linux/void-packages/pull/33850
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch |  9 ---------
 srcpkgs/ghc/patches/sphinx-unicode.patch | 17 -----------------
 srcpkgs/ghc/template                     |  4 ++--
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index 41ad0ceb3463..275444e828b7 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -128,15 +128,6 @@ index d360cfe..ab7ede7 100644
                    STG_UNUSED
  #endif
                )
-@@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
-         }
-     }
-
--#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
-+#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-
- #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
- #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
     return;
   }
diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch
deleted file mode 100644
index 5a09de43bc0c..000000000000
--- a/srcpkgs/ghc/patches/sphinx-unicode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py
---- ghc-8.8.4-orig/docs/users_guide/conf.py	2020-07-08 16:43:03.000000000 +0000
-+++ ghc-8.8.4/docs/users_guide/conf.py	2021-07-10 20:25:33.536928487 +0000
-@@ -101,5 +101,5 @@ latex_elements = {
-     'inputenc': '',
-     'utf8extra': '',
--    'preamble': '''
-+    'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
-@@ -107,5 +107,5 @@ latex_elements = {
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"
 _bindir="/usr/lib/${pkgname}-${version}/bin"

From d53f93b5cda22e8b08323c5fcfa093e5f2efd8cb Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 0075/2561] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From d940f0b7dad54a19f083a15b001dce73b53bf641 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 0076/2561] stack: update to 2.7.5

---
 srcpkgs/stack/patches/aeson.patch | 46 +++++++++++++++++++++++++++++++
 srcpkgs/stack/template            |  8 +++---
 2 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/stack/patches/aeson.patch

diff --git a/srcpkgs/stack/patches/aeson.patch b/srcpkgs/stack/patches/aeson.patch
new file mode 100644
index 000000000000..68f267c30cc8
--- /dev/null
+++ b/srcpkgs/stack/patches/aeson.patch
@@ -0,0 +1,46 @@
+commit 09e233ed73aa3335642f97c080ef27e42047c527
+Author: q66 <daniel@octaforge.org>
+Date:   Fri Mar 11 04:37:15 2022 +0100
+
+    constrain aeson to prevent build failures
+
+diff --git a/stack.cabal b/stack.cabal
+index dba5bf0..0195f2c 100644
+--- a/stack.cabal
++++ b/stack.cabal
+@@ -231,7 +231,7 @@ library
+ 
+     build-depends:
+         Cabal >=3.2.1.0,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
+@@ -357,7 +357,7 @@ executable stack
+ 
+     build-depends:
+         Cabal >=3.2.1.0,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
+@@ -485,7 +485,7 @@ executable stack-integration-test
+ 
+     build-depends:
+         Cabal >=3.2.1.0,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
+@@ -621,7 +621,7 @@ test-suite stack-test
+     build-depends:
+         Cabal >=3.2.1.0,
+         QuickCheck >=2.14.2,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..9e53b95ca633 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.7.3
+version=2.7.5
 revision=1
-_stackage="lts-18.5"
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -12,8 +12,8 @@ license="BSD-3-Clause"
 homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+checksum="9ddd44c2a62e9404194d69e7dc1c94e707910620316b66d6ac0b3201a8f37e80
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From b5edf4997b5b3738f8f22762a883942395fa11c1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 0077/2561] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..3949ee3fa1aa 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
-archs="i686 x86_64* ppc64le*"
+archs="i686 x86_64* ppc64le* ppc64"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
@@ -16,26 +16,31 @@ conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"
-	checksum=81065f401c5fc88d44be08db1cc0bdad473af4750bb0a19e54c9d15a5981406b
+	checksum=4662c88bc642941d9d463fd4878fc799e081c6fc5b10d2df5fa48e0cadea888c
 	;;
 ppc64le-musl)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux-musl.tar.xz"
-	checksum=3a62e73a1a099a38e5e86f9eacc565db5393905b74af7e29a8790d6197e5ccd4
+	checksum=c01b2d9d4c7b05a62f79b24e374413ac524116cbe5fb7c20673d62b8c3eebf10
 	;;
-*) broken="No distfiles available for this target"
+ppc64)
+	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz"
+	checksum=b8578e602abd4b453845303fb9cfed0b2186f86f60e3aa45869026ea833726c8
+	;;
+*)
+	broken="No distfiles available for this target"
 	;;
 esac
 

From fc3579d1f96f41a16dbf5a664323a98692bdebd8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 11 Mar 2022 14:34:56 +0100
Subject: [PATCH 0078/2561] srcpkgs/*: enable pandoc-using stuff for ppc64

---
 srcpkgs/amsynth/template       | 2 +-
 srcpkgs/bird_exporter/template | 2 +-
 srcpkgs/earlyoom/template      | 2 +-
 srcpkgs/growlight/template     | 2 +-
 srcpkgs/notcurses/template     | 2 +-
 srcpkgs/pelican/template       | 2 +-
 srcpkgs/vimpager/template      | 2 +-
 srcpkgs/xpra/template          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/amsynth/template b/srcpkgs/amsynth/template
index 8a762ee4981f..dd936a7d784b 100644
--- a/srcpkgs/amsynth/template
+++ b/srcpkgs/amsynth/template
@@ -18,5 +18,5 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 0143b41cd58d..897de17d226f 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -17,7 +17,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 post_build() {
diff --git a/srcpkgs/earlyoom/template b/srcpkgs/earlyoom/template
index deb392a098c9..1b93ee045982 100644
--- a/srcpkgs/earlyoom/template
+++ b/srcpkgs/earlyoom/template
@@ -18,7 +18,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 do_install() {
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 3703defbdfef..876eb479b662 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -22,7 +22,7 @@ desc_option_man="Use pandoc for manpages"
 desc_option_zfs="Build with ZFS Support"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 pre_configure() {
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 633896bf5515..9581a8e3de89 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -20,7 +20,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 notcurses-devel_package() {
diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index 70c34c55e834..6bca8b41203d 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -21,7 +21,7 @@ distfiles="https://github.com/getpelican/pelican/archive/${version}.tar.gz"
 checksum=b47c65f663bf6f2513b8ebc1f096e51f4d7865c17b36c370f83eadd80b6ba702
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) checkdepends+=" pandoc";;
+	x86_64*|i686|ppc64le*|ppc64) checkdepends+=" pandoc";;
 esac
 
 post_extract() {
diff --git a/srcpkgs/vimpager/template b/srcpkgs/vimpager/template
index 71ea5ec5e7ab..eb8697af94bb 100644
--- a/srcpkgs/vimpager/template
+++ b/srcpkgs/vimpager/template
@@ -15,7 +15,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 post_install() {
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 296cbb9834b5..5bc9ea89fdff 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -26,7 +26,7 @@ build_options="docs"
 desc_option_docs="Enable documentation"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686*|ppc64le*) build_options_default="docs" ;;
+	x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
 esac
 
 if [ -z "$CROSS_BUILD" ]; then

From 6f136277779eccc4176479dd66ec90034e6d8318 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 0079/2561] kmonad: bump for ghc 8.10.7

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

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 8c34a920ba7d..c93d2bee4c4f 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=2
+revision=3
 build_style=haskell-stack
-stackage=lts-17.5
+stackage=lts-18.14
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From f16c33cedb44f74e7a386cc74b93b88ab62c6fa0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 0080/2561] haskell-language-server: update to 1.4.0

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

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 5a7064dfc6a9b0ab6d282b09e209cd626d21f470 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 0081/2561] xmobar: bump for ghc 8.10.7

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 20014b3d482539479e41b4b49743ff5274de72f7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 0082/2561] hledger: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index 3feab3fe200c..fdcab180a6de 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.23
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From 7e6441b5168f667230b37e485fe0400b93608d40 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 0083/2561] hoogle: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 6bc425b0d002..4c3e80186494 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.2
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 734157092d226217efda3b0cf2a96b745b87653c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 0084/2561] hlint: bump for ghc 8.10.7

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

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 2e6bec6894ba1782a7ce688b45f9cabe6514dd6d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 0085/2561] darcs: bump for ghc 8.10.7

---
 srcpkgs/darcs/files/stack.yaml | 4 +++-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index ddf0cdbb0d1b..f9fcac534d46 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.5
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 6cc914138f9a2525d7f2171201a48cb4044b0dc4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 2 Nov 2021 08:57:33 +0100
Subject: [PATCH 0086/2561] shellcheck: bump for ghc 8.10.7

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

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 08e64456eda9..70eee6c2854b 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.8.0
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 71649f051003e955df8786aaa8c797155306f94d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 08:35:15 +0100
Subject: [PATCH 0087/2561] pandoc: bump for ghc 8.10.7

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

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 0e487510497e..8628b1d1f3c2 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,14 +2,14 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.14.0.3
-revision=2
+revision=3
 _sidenote_version=0.20.0.0
 _monad_gen_version=0.3.0.1
 _crossref_version=0.3.12.2
 _roman_numerals_version=0.5.1.5
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-18.14"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"

From 3dbf9fd62fbb23950c7ba568fd16eb733f60d670 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 19:17:39 +0100
Subject: [PATCH 0088/2561] cgrep: bump for ghc 8.10.7

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

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index c987e67725b0..e57106f3fa26 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.7.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-18.6"
+stackage="lts-18.15"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

From 19d2833a7c24bdaead8b891453232cef0414fc5c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 21:11:14 +0100
Subject: [PATCH 0089/2561] git-mediate: bump for ghc 8.10.7

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

diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index 971a6236224f..0c9ec10241e5 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,9 +1,9 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
 version=1.0.8.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From 6ccfdcdbc3e275073d3c7cbab85a77fbf03aaa94 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 4 Nov 2021 09:34:26 +0100
Subject: [PATCH 0090/2561] debug-me: bump for ghc 8.10.7

---
 srcpkgs/debug-me/files/stack.yaml | 2 +-
 srcpkgs/debug-me/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index ecff9d9d18f2..ad8b055bb33e 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-17.5
+resolver: lts-18.14
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 797c52f1f479..86ac0037311a 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=2
+revision=3
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From a2e833443ae71cd528081cbbe17c561de827da9c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 5 Nov 2021 07:22:52 +0100
Subject: [PATCH 0091/2561] git-annex: update to 8.20211028

---
 srcpkgs/git-annex/files/stack.yaml       | 32 ------------------------
 srcpkgs/git-annex/patches/ghc8.8.3.patch | 18 -------------
 srcpkgs/git-annex/template               |  6 ++---
 3 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/git-annex/files/stack.yaml
 delete mode 100644 srcpkgs/git-annex/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
deleted file mode 100644
index 5d457bebde83..000000000000
--- a/srcpkgs/git-annex/files/stack.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-flags:
-  git-annex:
-    production: true
-    assistant: true
-    pairing: true
-    torrentparser: true
-    webapp: true
-    magicmime: false
-    dbus: false
-    debuglocks: false
-    benchmark: false
-    networkbsd: false
-    gitlfs: true
-    httpclientrestricted: true
-packages:
-- '.'
-extra-deps:
- - IfElse-0.85
- - aws-0.22
- - bloomfilter-2.0.1.0
- - filepath-bytestring-1.4.2.1.6
- - git-lfs-1.1.0
- - http-client-restricted-0.0.3
- - network-multicast-0.3.2
- - sandi-0.5
- - torrent-10000.1.1
- - bencode-0.6.1.1
- - network-3.1.0.1
-explicit-setup-deps:
-  git-annex: true
-resolver: lts-17.5
-allow-newer: true
diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch
deleted file mode 100644
index 27a1739c1119..000000000000
--- a/srcpkgs/git-annex/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
-+++ b/git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
-@@ -304,6 +304,7 @@
-   Build-Depends:
-    base (>= 4.11.1.0 && < 5.0),
-    network-uri (>= 2.6),
-+   network-bsd,
-    optparse-applicative (>= 0.14.1),
-    containers (>= 0.5.8),
-    exceptions (>= 0.6),
-@@ -404,3 +404,3 @@ if flag(NetworkBSD)
-     Build-Depends: network-bsd, network (>= 3.0.0.0)
-   else
--    Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
-+    Build-Depends: network (< 3.2.0.0), network (>= 2.6.3.0)
-
-   if flag(S3)
-     Build-Depends: aws (>= 0.20)
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index cdcd6bb0f83c..1cf2ab14789f 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,10 +1,10 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210330
+version=8.20211028
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
- lsof rsync git"
+ lsof rsync git ncurses-devel"
 # depends are utilities required by git-annex
 depends="git rsync curl lsof gnupg2"
 short_desc="Git addon for managing large files"
@@ -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=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d
+checksum=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From ae2a21f271d303823dac6fc7f2f975921e82b0da Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 11 Mar 2022 19:21:25 +0100
Subject: [PATCH 0092/2561] cfitsio: enable reentrant multithreading

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

diff --git a/srcpkgs/cfitsio/template b/srcpkgs/cfitsio/template
index 3545bb4299bd..55ff7d14e61d 100644
--- a/srcpkgs/cfitsio/template
+++ b/srcpkgs/cfitsio/template
@@ -1,8 +1,9 @@
 # Template file for 'cfitsio'
 pkgname=cfitsio
 version=4.0.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--enable-reentrant"
 makedepends="libcurl-devel"
 short_desc="Library for reading and writing data files in FITS data format"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"

From 19f3503eb8681371d1ce32e607d616c3211e3b6c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 11 Mar 2022 10:44:13 -0800
Subject: [PATCH 0093/2561] podman: install rootlessport and completions

Fixes #36095
---
 srcpkgs/podman/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index e83467c87f7c..c719e4ca6057 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,10 +1,10 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.0.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
-go_package="${go_import_path}/cmd/podman"
+go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
 go_build_tags="seccomp apparmor containers_image_ostree_stub"
 hostmakedepends="pkg-config go-md2man"
 makedepends="gpgme-devel libseccomp-devel device-mapper-devel libbtrfs-devel"
@@ -26,7 +26,10 @@ post_build() {
 }
 
 post_install() {
+	vmkdir usr/libexec/podman
+	mv "${DESTDIR}/usr/bin/rootlessport" "${DESTDIR}/usr/libexec/podman/rootlessport"
 	make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
+	make install.completions DESTDIR="${DESTDIR}" PREFIX="/usr"
 	sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
 		vendor/github.com/containers/common/pkg/config/containers.conf \
 		>containers.cgfs.conf

From 50ddd3f969e48fe5b6ee4126018fd9a01268d9d7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 12 Mar 2022 09:34:10 +0100
Subject: [PATCH 0094/2561] wine: update to 7.4.

---
 srcpkgs/wine/patches/musl-limits.patch |  4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  |  8 ++++----
 srcpkgs/wine/patches/musl-uid-t.patch  |  4 ++--
 srcpkgs/wine/template                  | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index a791710f0c77..b13cbe9ea48c 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.3/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.3/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index 8607cbe9929a..82f45cc1d171 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.3/configure
-+++ b/wine-7.3/configure
+--- a/wine-7.4/configure
++++ b/wine-7.4/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
---- a/wine-7.3/configure.ac
-+++ b/wine-7.3/configure.ac
+--- a/wine-7.4/configure.ac
++++ b/wine-7.4/configure.ac
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 9ee5a79e1637..2fe1c18c553b 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.3/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.3/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/wine-7.4/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/wine-7.4/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index f82741c2741d..8dfb8df9f6be 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.3
+version=7.4
 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="71fdffed747bd176ba414ebc49027df75aa2d45580a0338a7a36d974cd147a96
- 6175e8929e4594dcf23ef28f556cde87b122dbf2e2476006660d920cc121cc98"
+checksum="728e866d6e49ce92a2a0c514333e9ff08bdbf6c86f5ef4e6180143b8d2b7d416
+ c1688af87737f47337a8f7e24d501d99582a691a2a08ba8e71b9911abbfd8554"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"
@@ -43,8 +43,8 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  libldap-devel alsa-lib-devel libgphoto2-devel glib-devel
  freetype-devel pulseaudio-devel libopenal-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
- libpcap-devel cups-devel ocl-icd-devel vulkan-loader vkd3d-devel
- gst-plugins-base1-devel SDL2-devel"
+ libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
+ SDL2-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}"

From 22bebebfd34aaf5a460492c3ff0fca8da9141473 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 12 Mar 2022 09:36:33 +0100
Subject: [PATCH 0095/2561] linux5.4: update to 5.4.184.

---
 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 439a5538b1c1..983e18bdc0ba 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.183
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=2d4b0b77644835410b2a5f599b2893fe199d5542615684207f579753020cc99c
+checksum=8694ca39e6c665cac5a78c7f80acef83ad9b5b13f9688e94bfe39b3c71541489
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 0ee3846d76909a67dc121042d5403074339a7fed Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 12 Mar 2022 09:41:51 +0100
Subject: [PATCH 0096/2561] linux4.19: update to 4.19.234.

---
 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 5a274df27b39..64351dd2d235 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.233
+version=4.19.234
 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=b8f665f020c2724a9f1e0368fdc0ea451b0b7d915ffae7ef4b9ec27a550fce37
+checksum=0082966be4a476c42ed59996e072e7e9fa5282b742efe4ffabadd6cd91212d8b
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 90cfdaab2092208babf1dd741ee321464d6e144b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:27:59 +0100
Subject: [PATCH 0097/2561] flannel: update to 0.17.0.

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

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 7a65a2143779..14fdf5fbbda4 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,6 +1,6 @@
 # Template file for 'flannel'
 pkgname=flannel
-version=0.16.3
+version=0.17.0
 revision=1
 build_style=go
 short_desc="Etcd backed network fabric for containers"
@@ -10,7 +10,7 @@ license="Apache-2.0"
 go_import_path="github.com/coreos/flannel"
 homepage="https://$go_import_path"
 distfiles="$homepage/archive/v${version}.tar.gz"
-checksum=d78043adbd3933606ec728068369d0c5596c82309246ff36c3fcadb99561c5bb
+checksum=5a52113cfee3d54b6b906ab16ef64114efd1a3533ed79ab5e46d008bab669a07
 
 post_extract() {
 	ln -s $wrksrc vendor/$go_import_path

From 5602d4882728ce5ac59f93cc680dab6448abc8f4 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:29:26 +0100
Subject: [PATCH 0098/2561] hugo: update to 0.94.2.

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

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 6732e2725b69..477c90d66393 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.92.2
+version=0.94.2
 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=00d61205f426587dcfc4e2844a6f9fb451c825b828c00f0b46e3d0930c132751
+checksum=315bc0d22977e84ba25125b1d23333648e36194a46a4d6ae4f4c6c683dc8979c
 
 post_install() {
 	vdoc README.md

From 966077d66e3c4aece8de5f17bcd64ddcab631517 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:39:16 +0100
Subject: [PATCH 0099/2561] python-b2sdk: update to 1.14.1.

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

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index d7ccc8eb440f..7b0578b60926 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'python-b2sdk'
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
-version=1.14.0
+version=1.14.1
 revision=1
 wrksrc="b2sdk-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://pypi.org/project/b2sdk"
 distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=900da60f9e569e02405b85db35541a79e1cac776ace5d054498b107982ea443c
+checksum=7d839eca12a6f66453eb535c41569714a7910bc012f657c864c3bfb3a88569e8
 
 post_install() {
 	vlicense LICENSE

From 04ccfe5253ac8dcdb4ab61b51533b34bb8d07881 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:40:19 +0100
Subject: [PATCH 0100/2561] supermin: update to 5.2.2.

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

diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 09b45ddd429f..357fc3f255f8 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
-version=5.2.1
-revision=3
+version=5.2.2
+revision=1
 _release_series=5.2-stable
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://people.redhat.com/~rjones/supermin/"
 distfiles="http://download.libguestfs.org/supermin/${_release_series}/supermin-${version}.tar.gz"
-checksum=c45d8479b6da8ea55ca2c4b82b2c8bc7c2e6f724cf59c980df1dec93fb578ffb
+checksum=ce3921d3635c8168cfb7ca0c5a82b9d5cef5b2b271f84b776d63b8bbbeec358e
 nocross=yes

From 7ffbdb32121548f575bc7f0bb41ecd17e935d6e5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 15:00:14 +0100
Subject: [PATCH 0101/2561] ruby: update to 3.1.1.

---
 common/shlibs         |  2 +-
 srcpkgs/ruby/template | 34 ++++++++++++----------------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d60e60a87534..f26b9bab58fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -440,7 +440,7 @@ libKScreenLocker.so.5 kscreenlocker-5.8.4_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.89 ntfs-3g-2021.8.22_1
-libruby.so.3.0 ruby-3.0.2_1
+libruby.so.3.1 ruby-3.1.0_1
 librw.so.0 rankwidth-0.9_1
 libprocessui.so.9 libksysguard-5.18.90_1
 libksignalplotter.so.9 libksysguard-5.18.90_1
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index f9fb36a74dda..85524a7796b2 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -1,12 +1,12 @@
 # Template file for 'ruby'
-_ruby_abiver=3.0.0
+_ruby_abiver=3.1.0
 
 pkgname=ruby
-version=3.0.3
+version=3.1.1
 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"
+ PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
 makedepends="zlib-devel readline-devel libffi-devel openssl-devel
@@ -16,7 +16,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.xz"
-checksum=88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c
+checksum=7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally
@@ -48,6 +48,12 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 post_patch() {
+	# https://bugs.ruby-lang.org/issues/18373#note-8
+	find .bundle -name extconf.rb -exec \
+		sed -i \
+			-e '/create_makefile/i \$arch_hdrdir = "$(hdrdir)/../.ext/include/$(arch)"' \
+			-e '/create_makefile/i \$DLDFLAGS << " -L#{$top_srcdir}"' {} \;
+
 	[ "$XBPS_TARGET_LIBC" = "glibc" ] && return 0
 
 	echo "Patching out using binary gems for non-glibc..."
@@ -55,29 +61,16 @@ post_patch() {
 }
 
 pre_configure() {
-	# this allows the test suite to pass without crashing
-	export CFLAGS+=" -fno-omit-frame-pointer -fno-strict-aliasing"
-	export CPPFLAGS+=" -fno-omit-frame-pointer -fno-strict-aliasing"
-
 	case "$XBPS_TARGET_MACHINE" in
 		ppc64le*) ;;
 		ppc*)
 			# Random segfaults otherwise
 			export CFLAGS+=" -Os"
-			export CPPFLAGS+=" -Os"
 			;;
 	esac
-
-	# force this to pass on systems with these as macros (musl)
-	export ac_cv_func_isnan=yes
-	export ac_cv_func_isinf=yes
 }
 
 pre_build() {
-	# Force getaddrinfo detection.
-	sed -e 's,\(checking_for("wide getaddrinfo") {try_\)run,\1link,' -i ext/socket/extconf.rb
-	# Hack for cross-builds.
-	touch ext/ripper/check
 	# Set -fno-stack-protector for i686* or otherwise linking fails with
 	# ...: undefined reference to '__stack_chk_fail_local'
 	case "$XBPS_TARGET_MACHINE" in
@@ -91,13 +84,10 @@ pre_build() {
 post_install() {
 	# Remove references to the cross compiler
 	if [ "$CROSS_BUILD" ]; then
-		sed -e "s,${XBPS_CROSS_TRIPLET}-,,g" -i ${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
+		vsed -e "s,${XBPS_CROSS_TRIPLET}-,,g" -i ${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
 	fi
 	# Replace reference to the install(1) wrapper
-	sed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
-		${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
-	# Remove references to hardening -specs.
-	sed -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" -i \
+	vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
 		${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
 	vlicense COPYING
 }

From 2a3eb4022bc85a59fba494d19d22579b8cebef7b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:57:04 +0100
Subject: [PATCH 0102/2561] ruby-clocale: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-clocale/template b/srcpkgs/ruby-clocale/template
index a921bc084bc0..61691785300f 100644
--- a/srcpkgs/ruby-clocale/template
+++ b/srcpkgs/ruby-clocale/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-clocale'
 pkgname=ruby-clocale
 version=0.0.4
-revision=4
+revision=5
 build_style=gemspec
 short_desc="Ruby gem that wraps C locale functions"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 30a7e83648d14b6ccf9b7df9009be75bfc1bd357 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:57:23 +0100
Subject: [PATCH 0103/2561] ruby-ffi: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-ffi/template b/srcpkgs/ruby-ffi/template
index efe3ca4f3f5f..11a8d58499ed 100644
--- a/srcpkgs/ruby-ffi/template
+++ b/srcpkgs/ruby-ffi/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-ffi'
 pkgname=ruby-ffi
 version=1.11.3
-revision=5
+revision=6
 wrksrc="ffi-${version}"
 build_style=gemspec
 hostmakedepends="libffi-devel"

From 38dad3fea5740d4f8d5d75dbc4bf473b74b087be Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:57:45 +0100
Subject: [PATCH 0104/2561] ruby-hpricot: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-hpricot/template b/srcpkgs/ruby-hpricot/template
index 1013a395fa57..40cdaabc73ff 100644
--- a/srcpkgs/ruby-hpricot/template
+++ b/srcpkgs/ruby-hpricot/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-hpricot'
 pkgname=ruby-hpricot
 version=0.8.6
-revision=6
+revision=7
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"

From cd4a5858de81e927119f48fda9e3f1367951cbd3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:58:19 +0100
Subject: [PATCH 0105/2561] ruby-rdiscount: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-rdiscount/template b/srcpkgs/ruby-rdiscount/template
index b784e7283e13..acd6dc4a494a 100644
--- a/srcpkgs/ruby-rdiscount/template
+++ b/srcpkgs/ruby-rdiscount/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rdiscount'
 pkgname=ruby-rdiscount
 version=2.2.0.1
-revision=7
+revision=8
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"

From 3c1a8994c2e579116f0779a34925af2edeff19b7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:58:57 +0100
Subject: [PATCH 0106/2561] vim: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index bd919ebdf9b7..252c84c21b18 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
 version=8.2.4221
-revision=1
+revision=2
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="acl-devel ncurses-devel
  $(vopt_if x11 libXt-devel)

From 071d4aa3b48b2a1eabb6023ce0c912ff05d2987b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:59:22 +0100
Subject: [PATCH 0107/2561] ruby-asciidoctor: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-asciidoctor/template b/srcpkgs/ruby-asciidoctor/template
index 8b0417bb3623..e9e7669f0f6c 100644
--- a/srcpkgs/ruby-asciidoctor/template
+++ b/srcpkgs/ruby-asciidoctor/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-asciidoctor'
 pkgname=ruby-asciidoctor
 version=2.0.15
-revision=2
+revision=3
 build_style=gem
 short_desc="Ruby implementation of AsciiDoc"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e882c298af5f04c7426c68211de331a19f865dfe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:01:12 +0100
Subject: [PATCH 0108/2561] weechat: rebuild for ruby-3.1.0.

---
 srcpkgs/weechat/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 9395e73319cf..a496a6412e85 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
 version=3.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
@@ -32,6 +32,10 @@ if [ "$CROSS_BUILD" ]; then
 	 -DPERL_LFLAGS=-L$_perlpath"
 fi
 
+post_extract() {
+	vsed -i '/pkg_search_module/s/ruby-3.0/ruby-3.1 &/' cmake/FindRuby.cmake
+}
+
 weechat-aspell_package() {
 	lib32disabled=yes
 	depends="${sourcepkg}>=${version}_${revision}"

From 820eefa3b618b13fa9ed1bba45342bec1cbd0e0b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:02:18 +0100
Subject: [PATCH 0109/2561] ruby-sync: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-sync/template b/srcpkgs/ruby-sync/template
index a76352acfaab..77569174612f 100644
--- a/srcpkgs/ruby-sync/template
+++ b/srcpkgs/ruby-sync/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-sync'
 pkgname=ruby-sync
 version=0.5.0
-revision=3
+revision=4
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 hostmakedepends="ruby"

From 6690229c4ab2405a140f25656a6150b06108fa6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:02:39 +0100
Subject: [PATCH 0110/2561] ruby-concurrent-ruby: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-concurrent-ruby/template b/srcpkgs/ruby-concurrent-ruby/template
index cb58198062a2..8117a8fef1c8 100644
--- a/srcpkgs/ruby-concurrent-ruby/template
+++ b/srcpkgs/ruby-concurrent-ruby/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-concurrent-ruby'
 pkgname=ruby-concurrent-ruby
 version=1.1.7
-revision=2
+revision=3
 build_style=gem
 hostmakedepends="ruby"
 depends="ruby"

From 56f4fb69b8fb8a2f121f6a41a15f322043817521 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:02:53 +0100
Subject: [PATCH 0111/2561] ruby-rubysl-singleton: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rubysl-singleton/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rubysl-singleton/template b/srcpkgs/ruby-rubysl-singleton/template
index d119521708b2..36945b5cf4f5 100644
--- a/srcpkgs/ruby-rubysl-singleton/template
+++ b/srcpkgs/ruby-rubysl-singleton/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rubysl-singleton'
 pkgname=ruby-rubysl-singleton
 version=2.0.0
-revision=4
+revision=5
 build_style=gemspec
 hostmakedepends="ruby"
 depends="ruby"

From 10a85aaa340b7269fd60592987280ab95d5d13b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:04:11 +0100
Subject: [PATCH 0112/2561] ruby-deep_merge: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-deep_merge/template b/srcpkgs/ruby-deep_merge/template
index 858e491f0a99..2f38c05c30ea 100644
--- a/srcpkgs/ruby-deep_merge/template
+++ b/srcpkgs/ruby-deep_merge/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-deep_merge'
 pkgname=ruby-deep_merge
 version=1.2.1
-revision=4
+revision=5
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 hostmakedepends="ruby"

From 7572ee22a6abf1eb843823f40ad27c11a846b097 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:04:46 +0100
Subject: [PATCH 0113/2561] ruby-addressable: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-addressable/template b/srcpkgs/ruby-addressable/template
index 89ee94646ec5..13097fcfe0be 100644
--- a/srcpkgs/ruby-addressable/template
+++ b/srcpkgs/ruby-addressable/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-addressable'
 pkgname=ruby-addressable
 version=2.7.0
-revision=5
+revision=6
 build_style=gem
 depends="ruby-public_suffix>=2.0.2 ruby-public_suffix<5.0"
 short_desc="Replacement for Ruby's standard library URI implementation"

From 77fd225a19273a85be53094ca4116f036ed39517 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:04:55 +0100
Subject: [PATCH 0114/2561] ruby-backports: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-backports/template b/srcpkgs/ruby-backports/template
index adcf4bfdde06..355a40cfad75 100644
--- a/srcpkgs/ruby-backports/template
+++ b/srcpkgs/ruby-backports/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-backports'
 pkgname=ruby-backports
 version=3.15.0
-revision=4
+revision=5
 build_style=gem
 short_desc="Essential backports that enable many of the nice features of Ruby"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fb053355b3526d9f7ca78422f8399a26815585c6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:11 +0100
Subject: [PATCH 0115/2561] ruby-connection_pool: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-connection_pool/template b/srcpkgs/ruby-connection_pool/template
index 6e0dc024cce7..a83d37b84ed5 100644
--- a/srcpkgs/ruby-connection_pool/template
+++ b/srcpkgs/ruby-connection_pool/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-connection_pool'
 pkgname=ruby-connection_pool
 version=2.2.2
-revision=5
+revision=6
 build_style=gem
 short_desc="Generic connection pool for Ruby"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ae79af67907882772be38cb0bc1ffb980d17aca1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:23 +0100
Subject: [PATCH 0116/2561] ruby-erubis: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-erubis/template b/srcpkgs/ruby-erubis/template
index b79aff3062b8..5cc96909679e 100644
--- a/srcpkgs/ruby-erubis/template
+++ b/srcpkgs/ruby-erubis/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-erubis'
 pkgname=ruby-erubis
 version=2.7.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Erubis is an implementation of eRuby"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fd3c8303ab5e95a4b145aa74900fc9fd1c4705a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:29 +0100
Subject: [PATCH 0117/2561] ruby-ethon: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-ethon/template b/srcpkgs/ruby-ethon/template
index d6bbf0958c52..a3184cb3fc47 100644
--- a/srcpkgs/ruby-ethon/template
+++ b/srcpkgs/ruby-ethon/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-ethon'
 pkgname=ruby-ethon
 version=0.12.0
-revision=4
+revision=5
 build_style=gem
 depends="ruby-ffi>=1.3.0"
 short_desc="Lightweight wrapper around libcurl"

From 11dbb39a091b7e9d2566ca465bdc2d342d37f6d5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:44 +0100
Subject: [PATCH 0118/2561] ruby-faraday: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-faraday/template b/srcpkgs/ruby-faraday/template
index 5d8de2ac9e1c..6b8997a6425d 100644
--- a/srcpkgs/ruby-faraday/template
+++ b/srcpkgs/ruby-faraday/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-faraday'
 pkgname=ruby-faraday
 version=1.0.1
-revision=3
+revision=4
 build_style=gem
 depends="ruby-multipart-post>=1.2 ruby-multipart-post<3"
 short_desc="HTTP/REST API client library"

From 657f2f943ef6e31db60a99781150f3b23c65a6ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:51 +0100
Subject: [PATCH 0119/2561] ruby-faraday_middleware: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-faraday_middleware/template b/srcpkgs/ruby-faraday_middleware/template
index 6f6eadeb60af..b819c537ba5f 100644
--- a/srcpkgs/ruby-faraday_middleware/template
+++ b/srcpkgs/ruby-faraday_middleware/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-faraday_middleware'
 pkgname=ruby-faraday_middleware
 version=1.0.0
-revision=3
+revision=4
 build_style=gem
 depends="ruby-faraday>=1.0"
 short_desc="Various middleware for Faraday"

From 8b127773dda371a9cbffde76dad03ac488b2a7cb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:58 +0100
Subject: [PATCH 0120/2561] ruby-filesize: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-filesize/template b/srcpkgs/ruby-filesize/template
index 0d2c06a995d1..1a9939136b77 100644
--- a/srcpkgs/ruby-filesize/template
+++ b/srcpkgs/ruby-filesize/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-filesize'
 pkgname=ruby-filesize
 version=0.2.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Small class for handling filesizes"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d3fecbe945e3a4846f0dad7cacd5766255cf98a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:07 +0100
Subject: [PATCH 0121/2561] ruby-gh: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-gh/template b/srcpkgs/ruby-gh/template
index fa43ad84d5f0..5758f646973d 100644
--- a/srcpkgs/ruby-gh/template
+++ b/srcpkgs/ruby-gh/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-gh'
 pkgname=ruby-gh
 version=0.15.1
-revision=5
+revision=6
 build_style=gem
 depends="ruby-addressable>=2.4.0 ruby-backports ruby-faraday>=0.8
  ruby-multi_json>=1.0 ruby-net-http-persistent>=2.9 ruby-net-http-pipeline"

From cfcba061ca5be1de65fea963a5830374d52dcdf4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:15 +0100
Subject: [PATCH 0122/2561] ruby-highline: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-highline/template b/srcpkgs/ruby-highline/template
index aa00cf9b5bde..7e7e9bdd80ea 100644
--- a/srcpkgs/ruby-highline/template
+++ b/srcpkgs/ruby-highline/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-highline'
 pkgname=ruby-highline
 version=2.0.3
-revision=4
+revision=5
 build_style=gem
 short_desc="High-level IO library for comamndline interfaces"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5330c08eadfa38eaa053ff95fd8047e0fb90ddf8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:23 +0100
Subject: [PATCH 0123/2561] ruby-httparty: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-httparty/template b/srcpkgs/ruby-httparty/template
index 2df74d93b219..4b286f65f329 100644
--- a/srcpkgs/ruby-httparty/template
+++ b/srcpkgs/ruby-httparty/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-httparty'
 pkgname=ruby-httparty
 version=0.17.1
-revision=4
+revision=5
 build_style=gem
 depends="ruby-mime-types>=3.0 ruby-multi_xml>=0.5.2"
 short_desc="Makes http fun! Also, makes consuming restful web services dead easy"

From 59b5b9321827cdcca9ab0cf9cf2d23fb75640f0e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:33 +0100
Subject: [PATCH 0124/2561] ruby-launchy: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-launchy/template b/srcpkgs/ruby-launchy/template
index 0e2f076b4977..f8890626158c 100644
--- a/srcpkgs/ruby-launchy/template
+++ b/srcpkgs/ruby-launchy/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-launchy'
 pkgname=ruby-launchy
 version=2.4.3
-revision=5
+revision=6
 build_style=gem
 depends="ruby-addressable>=2.3 ruby-addressable<3.0"
 short_desc="Helper class for launching cross-platform applications"

From 0d0e28f77aa74f4146225f1a699f5b80014872c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:47 +0100
Subject: [PATCH 0125/2561] ruby-manpages: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-manpages/template b/srcpkgs/ruby-manpages/template
index 4fbc854f82f6..927f16b7068c 100644
--- a/srcpkgs/ruby-manpages/template
+++ b/srcpkgs/ruby-manpages/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-manpages'
 pkgname=ruby-manpages
 version=0.6.1
-revision=5
+revision=6
 build_style=gem
 short_desc="Gem to add man pages support to ruby gems"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 05f173bd57d1105beb56f149fcca0cd2c955bd47 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:56 +0100
Subject: [PATCH 0126/2561] ruby-mime-types: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-mime-types/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-mime-types/template b/srcpkgs/ruby-mime-types/template
index 4323b3617da1..94fa4f592d2a 100644
--- a/srcpkgs/ruby-mime-types/template
+++ b/srcpkgs/ruby-mime-types/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mime-types'
 pkgname=ruby-mime-types
 version=3.3
-revision=4
+revision=5
 build_style=gem
 depends="ruby-mime-types-data>=3.2015"
 short_desc="Library for registry and information about MIME types"

From 930f6834e7e638dc06dedc0d03258d05cbba940b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:01 +0100
Subject: [PATCH 0127/2561] ruby-mime-types-data: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-mime-types-data/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-mime-types-data/template b/srcpkgs/ruby-mime-types-data/template
index 8f4b85acebc1..64d444528873 100644
--- a/srcpkgs/ruby-mime-types-data/template
+++ b/srcpkgs/ruby-mime-types-data/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mime-types-data'
 pkgname=ruby-mime-types-data
 version=3.2019.1009
-revision=4
+revision=5
 build_style=gem
 short_desc="Registry for MIME media type definitions"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c72dbe711ff78ae60d998c4ec26baea4138213fa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:07 +0100
Subject: [PATCH 0128/2561] ruby-mini_portile2: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-mini_portile2/template b/srcpkgs/ruby-mini_portile2/template
index aacfb695d15c..f7c225545dc9 100644
--- a/srcpkgs/ruby-mini_portile2/template
+++ b/srcpkgs/ruby-mini_portile2/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mini_portile2'
 pkgname=ruby-mini_portile2
 version=2.4.0
-revision=4
+revision=5
 build_style=gem
 short_desc="Simplistic port-like solution for developers"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e58aa7603325a8863fc7f9c44c88c664d42574b4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:17 +0100
Subject: [PATCH 0129/2561] ruby-multi_json: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-multi_json/template b/srcpkgs/ruby-multi_json/template
index 72d7a67451c9..006d7d578a16 100644
--- a/srcpkgs/ruby-multi_json/template
+++ b/srcpkgs/ruby-multi_json/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-multi_json'
 pkgname=ruby-multi_json
 version=1.14.1
-revision=4
+revision=5
 build_style=gem
 short_desc="Common interface for multiple JSON parsing libraries"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9bf053abb28d9db11849f165220eabefbe087d53 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:26 +0100
Subject: [PATCH 0130/2561] ruby-multi_xml: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-multi_xml/template b/srcpkgs/ruby-multi_xml/template
index 9df407b1c57e..fd23fbc227f5 100644
--- a/srcpkgs/ruby-multi_xml/template
+++ b/srcpkgs/ruby-multi_xml/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-multi_xml'
 pkgname=ruby-multi_xml
 version=0.6.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Swappable XML backends utilizing LibXML, Nokogiri, Ox, or REXML"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c6852ce5d150302fb9fd43521bd4b7424a26e35c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:35 +0100
Subject: [PATCH 0131/2561] ruby-multipart-post: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-multipart-post/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-multipart-post/template b/srcpkgs/ruby-multipart-post/template
index 616e52195daf..c6baa24adf70 100644
--- a/srcpkgs/ruby-multipart-post/template
+++ b/srcpkgs/ruby-multipart-post/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-multipart-post'
 pkgname=ruby-multipart-post
 version=2.1.1
-revision=4
+revision=5
 build_style=gem
 short_desc="Use with Net::HTTP to do multipart form posts"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3bdb09b57c852917b1f0a8474d76bad48908b787 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:45 +0100
Subject: [PATCH 0132/2561] ruby-mustache: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-mustache/template b/srcpkgs/ruby-mustache/template
index ce9b567d0dd5..cf10ae6f107f 100644
--- a/srcpkgs/ruby-mustache/template
+++ b/srcpkgs/ruby-mustache/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mustache'
 pkgname=ruby-mustache
 version=1.1.1
-revision=4
+revision=5
 build_style=gem
 short_desc="Framework-agnostic way to render logic-free views"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8441d3b204652762730846f7d4c4303a1693e940 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:56 +0100
Subject: [PATCH 0133/2561] ruby-net-http-persistent: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-net-http-persistent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-net-http-persistent/template b/srcpkgs/ruby-net-http-persistent/template
index a0f35fc709ae..943562acf325 100644
--- a/srcpkgs/ruby-net-http-persistent/template
+++ b/srcpkgs/ruby-net-http-persistent/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-net-http-persistent'
 pkgname=ruby-net-http-persistent
 version=4.0.1
-revision=1
+revision=2
 build_style=gem
 depends="ruby-connection_pool>=2.2 ruby-connection_pool<3.0"
 short_desc="Manages persistent connections using Net::HTTP"

From 92462d0a48fab9d63b263a881c625e3e124c3797 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:04 +0100
Subject: [PATCH 0134/2561] ruby-net-http-pipeline: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-net-http-pipeline/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-net-http-pipeline/template b/srcpkgs/ruby-net-http-pipeline/template
index c976e9b00208..a071ee510449 100644
--- a/srcpkgs/ruby-net-http-pipeline/template
+++ b/srcpkgs/ruby-net-http-pipeline/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-net-http-pipeline'
 pkgname=ruby-net-http-pipeline
 version=1.0.1
-revision=5
+revision=6
 build_style=gem
 short_desc="HTTP/1.1 pipelining implementation atop Net::HTTP"
 maintainer="Orphaned <orphan@voidlinux.org>"

From acfc4f5b76dabcfd234301de2f1c2e5e2e7f661b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:16 +0100
Subject: [PATCH 0135/2561] ruby-pkg-config: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-pkg-config/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-pkg-config/template b/srcpkgs/ruby-pkg-config/template
index cdfa408875dd..8c53cce12f49 100644
--- a/srcpkgs/ruby-pkg-config/template
+++ b/srcpkgs/ruby-pkg-config/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-pkg-config'
 pkgname=ruby-pkg-config
 version=1.4.0
-revision=4
+revision=5
 build_style=gem
 short_desc="Properly detect need libraries for compiling Ruby native extensions"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ac9bd1f84cc00b4fde588c464c552bf927b82d84 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:26 +0100
Subject: [PATCH 0136/2561] ruby-public_suffix: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-public_suffix/template b/srcpkgs/ruby-public_suffix/template
index c68fd046d502..0e4eed0e0f02 100644
--- a/srcpkgs/ruby-public_suffix/template
+++ b/srcpkgs/ruby-public_suffix/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-public_suffix'
 pkgname=ruby-public_suffix
 version=4.0.2
-revision=4
+revision=5
 build_style=gem
 short_desc="Parse domain names into top level domain, domain and subdomains"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1f204722a0e65c87a3a589da112288165d5bb09f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:34 +0100
Subject: [PATCH 0137/2561] ruby-pusher-client: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-pusher-client/template b/srcpkgs/ruby-pusher-client/template
index 90f0c3249f71..2d4e3c021e57 100644
--- a/srcpkgs/ruby-pusher-client/template
+++ b/srcpkgs/ruby-pusher-client/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-pusher-client'
 pkgname=ruby-pusher-client
 version=0.6.2
-revision=5
+revision=6
 build_style=gem
 depends="ruby-websocket>=1.0 ruby-websocket<2.0"
 short_desc="Client for consuming WebSockets from http://pusher.com"

From a49702f99655439b8d1a479e205b9d41a4627a3b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:47 +0100
Subject: [PATCH 0138/2561] ruby-rainbow: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-rainbow/template b/srcpkgs/ruby-rainbow/template
index 6bc1fb209420..e9a41a7cf61f 100644
--- a/srcpkgs/ruby-rainbow/template
+++ b/srcpkgs/ruby-rainbow/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rainbow'
 pkgname=ruby-rainbow
 version=3.0.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Colorize printed text on ANSI terminals"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ac6ad09a42054ea6909ad695154405305e0ceed2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:51 +0100
Subject: [PATCH 0139/2561] ruby-rb-readline: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rb-readline/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rb-readline/template b/srcpkgs/ruby-rb-readline/template
index 9b35afe5be12..15beb60005a5 100644
--- a/srcpkgs/ruby-rb-readline/template
+++ b/srcpkgs/ruby-rb-readline/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rb-readline'
 pkgname=ruby-rb-readline
 version=0.5.5
-revision=5
+revision=6
 build_style=gem
 depends="ruby"
 short_desc="Pure Ruby implementation of GNU readline library"

From dd1d3cd493f173a7c1d6268c0eab02f906303083 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:11 +0100
Subject: [PATCH 0140/2561] ruby-rdiscount: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-rdiscount/template b/srcpkgs/ruby-rdiscount/template
index acd6dc4a494a..526af9a6dc2d 100644
--- a/srcpkgs/ruby-rdiscount/template
+++ b/srcpkgs/ruby-rdiscount/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rdiscount'
 pkgname=ruby-rdiscount
 version=2.2.0.1
-revision=8
+revision=9
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"

From ca4c785bcad1f6a6097ff18ea5378fa682cd5d69 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:29 +0100
Subject: [PATCH 0141/2561] ruby-ronn: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-ronn/template b/srcpkgs/ruby-ronn/template
index 83516fe69653..d6a74ac864b6 100644
--- a/srcpkgs/ruby-ronn/template
+++ b/srcpkgs/ruby-ronn/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-ronn'
 pkgname=ruby-ronn
 version=0.7.3
-revision=5
+revision=6
 build_style=gem
 depends="ruby-hpricot ruby-mustache ruby-rdiscount groff"
 short_desc="Strick markdown-like format for manpages"

From 4d9b635c0d2cbdaae7a2890e83eac60824683eb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:37 +0100
Subject: [PATCH 0142/2561] ruby-thor: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-thor/template b/srcpkgs/ruby-thor/template
index b7aefd3626c2..241ea78068e6 100644
--- a/srcpkgs/ruby-thor/template
+++ b/srcpkgs/ruby-thor/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-thor'
 pkgname=ruby-thor
 version=0.20.3
-revision=5
+revision=6
 build_style=gem
 short_desc="Toolkit for building powerful command-line interfaces"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3b1344eed45bfcb88f7247a5417c1f7e1580f09d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:46 +0100
Subject: [PATCH 0143/2561] ruby-tmuxinator: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-tmuxinator/template b/srcpkgs/ruby-tmuxinator/template
index 57342385cb77..7d11374018a5 100644
--- a/srcpkgs/ruby-tmuxinator/template
+++ b/srcpkgs/ruby-tmuxinator/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-tmuxinator'
 pkgname=ruby-tmuxinator
 version=0.16.0
-revision=4
+revision=5
 build_style=gem
 depends="ruby-erubis>=2.6 ruby-thor>=0.15.0 ruby-xdg>=2.2.3 tmux"
 short_desc="Create and manage complex tmux sessions easily"

From a11e7b25a80ef223d9ddf1448cbf73371891e37c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:53 +0100
Subject: [PATCH 0144/2561] ruby-travis: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-travis/template b/srcpkgs/ruby-travis/template
index 847c706a36b9..3743358bb37f 100644
--- a/srcpkgs/ruby-travis/template
+++ b/srcpkgs/ruby-travis/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-travis'
 pkgname=ruby-travis
 version=1.9.0
-revision=3
+revision=4
 build_style=gem
 depends="ruby-backports ruby-faraday>=1.0 ruby-faraday_middleware>=1.0
  ruby-gh>=0.13 ruby-highline>=2.0 ruby-launchy>=2.1 ruby-pusher-client>=0.4

From 82389afdda3842320fa6f660443eae2b42fbab05 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:10:39 +0100
Subject: [PATCH 0145/2561] ruby-typhoeus: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-typhoeus/template b/srcpkgs/ruby-typhoeus/template
index cd0057c1ca20..4b4bd3a2ccfc 100644
--- a/srcpkgs/ruby-typhoeus/template
+++ b/srcpkgs/ruby-typhoeus/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-typhoeus'
 pkgname=ruby-typhoeus
 version=1.3.1
-revision=5
+revision=6
 build_style=gem
 depends="ruby-ethon>=0.9.0"
 short_desc="Parallel HTTP requests runner"

From b811356b073c6259735e229b1f76f587abe78b0f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:10:48 +0100
Subject: [PATCH 0146/2561] ruby-websocket: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-websocket/template b/srcpkgs/ruby-websocket/template
index c2e971d9b5c5..95d7cd3f07f4 100644
--- a/srcpkgs/ruby-websocket/template
+++ b/srcpkgs/ruby-websocket/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-websocket'
 pkgname=ruby-websocket
 version=1.2.8
-revision=5
+revision=6
 build_style=gem
 short_desc="Universal Ruby library to handle WebSocket protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e966515378d4a7c62c036c89abe49f42f9fea2b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:10:57 +0100
Subject: [PATCH 0147/2561] ruby-xdg: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/ruby-xdg/template b/srcpkgs/ruby-xdg/template
index 389d17c7c32a..e04194374ce9 100644
--- a/srcpkgs/ruby-xdg/template
+++ b/srcpkgs/ruby-xdg/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-xdg'
 pkgname=ruby-xdg
 version=5.1.1
-revision=1
+revision=2
 build_style=gem
 short_desc="Module for supporting the XDG Base Directory Standard"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a9d42f8ae58f1c9d13d455c091193e3cfa183a64 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:11:08 +0100
Subject: [PATCH 0148/2561] subtle: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index 0a9d2684a2ca..4db67b872bce 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
 # Template file for 'subtle'
 pkgname=subtle
 version=0.11.6579
-revision=2
+revision=3
 wrksrc="${pkgname}-${version#*.*.}"
 hostmakedepends="python3 mercurial ruby-devel pkg-config"
 makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://hg.unexist.dev/subtle/"
 distfiles="https://hg.unexist.dev/subtle/archive/${version#*.*.}.tar.gz"
-checksum=82fead3b4ced4d9985410e1dfd912fc8f78ce5c1b77448862da5a5bea1a33a96
+checksum=58b4bf85ae348f120a77001042f036570c239cd3327802b012506ea0158d8d86
 conf_files="/etc/xdg/subtle/subtle.rb"
 
 if [ "$CROSS_BUILD" ]; then
@@ -19,7 +19,7 @@ if [ "$CROSS_BUILD" ]; then
 		broken="Word size must match"
 	fi
 	hostmakedepends+=" $makedepends"
-	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/ruby-3.0.0/"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/ruby-3.1.0/"
 	export CFLAGS
 fi
 

From 319ea8de564c9cb697f2b1fb851c29b336048b37 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:11:54 +0100
Subject: [PATCH 0149/2561] rrdtool: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index 53d8b08aef1a..b1bd0e4e50e9 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
 # Template file for 'rrdtool'
 pkgname=rrdtool
 version=1.7.2
-revision=10
+revision=11
 build_style=gnu-configure
 # configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
 # until this is fixed upstream, manually define am_cv_python_version to circumvent

From 6d67bcb5dfc0cab70100c0cff88bea34c52a076e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:12:53 +0100
Subject: [PATCH 0150/2561] notmuch: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index c7a25199498a..841645d19fe9 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,7 +1,7 @@
 # Template file for 'notmuch'
 pkgname=notmuch
 version=0.32.2
-revision=3
+revision=4
 build_style=configure
 configure_args="--prefix=/usr
  --emacslispdir=/usr/share/emacs/site-lisp/notmuch

From 08c98c92d52c938ed9480ec2069f39ec0d85b8a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:15:22 +0100
Subject: [PATCH 0151/2561] hivex: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 613e708f1fa3..448c06ddc9fa 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.21
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"

From c9c3602bad687f6d4d2888b51e91ab534eeefaaf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:13:57 +0100
Subject: [PATCH 0152/2561] libguestfs: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 24a4c3bd4d74..5ac1d1d2b8ee 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.46.2
-revision=1
+revision=2
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"

From c50054a8f068463a900bdddebb5b4daf95b1e03c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:21:25 +0100
Subject: [PATCH 0153/2561] vagrant: rebuild for ruby-3.1.0.

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

diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 05139891c1b4..f15d85850d03 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,7 +1,7 @@
 # Template file for 'vagrant'
 pkgname=vagrant
 version=2.2.19
-revision=1
+revision=2
 archs="i686 x86_64*"
 hostmakedepends="ruby"
 makedepends="ruby-devel zlib-devel"
@@ -15,7 +15,7 @@ checksum=4f0e6b1d466e26dead682c4d4843e8f64a012eba4be91506ae6c6d34d3d9c8f9
 nocross=yes
 
 post_extract() {
-	sed -i 's|\,\ "<\ 2\.7"||g' $pkgname.gemspec
+	sed -i 's|, "< 3\.1"||g' $pkgname.gemspec
 }
 
 do_build() {

From 5206b90fd5cbc35853bc48e54611bd7322059e5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 12 Mar 2022 17:59:27 +0100
Subject: [PATCH 0154/2561] cloud-hypervisor: update to 22.1.

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

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index 37f949e6e6c0..3ecf069b2b07 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=22.0
+version=22.1
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=5c5440435f78d4acdbb3ea91abe17d6704da6c18b6f52fe77f15835cfc60d17a
+checksum=73675ed730b5f23c4ce585918acff7496dcb585a4b91a672981c485bc7d94c37
 
 post_install() {
 	vlicense LICENSE-APACHE

From 03df720f0440fc3b818822db9122f529678fc0d1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 12 Mar 2022 18:12:49 +0100
Subject: [PATCH 0155/2561] python3-ropgadget: update to 6.7.

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

diff --git a/srcpkgs/python3-ropgadget/template b/srcpkgs/python3-ropgadget/template
index 6ff8980ab2b0..df108c7351ab 100644
--- a/srcpkgs/python3-ropgadget/template
+++ b/srcpkgs/python3-ropgadget/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ropgadget'
 pkgname=python3-ropgadget
-version=6.6
-revision=2
+version=6.7
+revision=1
 wrksrc="ROPGadget-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/JonathanSalwan/ROPgadget"
 distfiles="${PYPI_SITE}/R/ROPGadget/ROPGadget-${version}.tar.gz"
-checksum=dc61186e0114ec67ec7ce374df8fd2ddc2a7cba129a1242338e900a7483fba22
+checksum=a048f2e51c397b902e4586997bd4fe62af97984e207567cb63e67d86e8e09c8e

From 9bdd69cd97c6bdbebbeff4f64c8e30d5bfda4216 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 23:18:41 +0100
Subject: [PATCH 0156/2561] kup: update to 0.9.1.

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

diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 461bbcd45f97..15196942dbba 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,9 +1,10 @@
 # Template file for 'kup'
 pkgname=kup
-version=0.8.0
+version=0.9.1
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
+hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
+ kpackage 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"
@@ -13,4 +14,4 @@ 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"
+checksum=5597d215b025bfc76aa290efbe187fb6f92313fbdc40628b851180c535610976

From 825cb152642a5676fb96477f0d13d6791a8e619d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 12 Mar 2022 16:44:34 +0100
Subject: [PATCH 0157/2561] whois: update to 5.5.12.

---
 srcpkgs/whois/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index f46219419be0..46bb8347a810 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,8 +1,12 @@
 # Template file for 'whois'
 pkgname=whois
-version=5.5.11
+version=5.5.12
 revision=1
 wrksrc=whois
+build_style=gnu-makefile
+make_build_args="prefix=/usr HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf"
+make_install_args="prefix=/usr BASEDIR=\${DESTDIR}"
+make_install_target="install-whois"
 hostmakedepends="perl pkg-config gettext"
 makedepends="libidn2-devel"
 short_desc="Improved whois client"
@@ -11,18 +15,13 @@ 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=966281eb8301c14a1acc17e46c70061f73179d80e370aef43065c22f0947fb87
+checksum=f1c5bab781b7f2357dab1039e8875d41ff7b5d03a78c27443fa26351952a0822
 
 alternatives="
  whois:whois:/usr/bin/gwhois
  whois:whois.1:/usr/share/man/man1/gwhois.1"
 
-do_build() {
-	make CC=$CC prefix=/usr HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf
-}
-
-do_install() {
-	make prefix=/usr BASEDIR=${DESTDIR} install-whois
+post_install() {
 	mv ${DESTDIR}/usr/bin/{whois,gwhois}
 	mv ${DESTDIR}/usr/share/man/man1/{whois,gwhois}.1
 }

From 0f47608acf86080a0a66f8289168ab1d28f77f4c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 12 Mar 2022 23:46:58 +0100
Subject: [PATCH 0158/2561] New package: adjtimex-1.29

---
 srcpkgs/adjtimex/patches/destdir.patch | 17 +++++++++++++++++
 srcpkgs/adjtimex/template              | 12 ++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 srcpkgs/adjtimex/patches/destdir.patch
 create mode 100644 srcpkgs/adjtimex/template

diff --git a/srcpkgs/adjtimex/patches/destdir.patch b/srcpkgs/adjtimex/patches/destdir.patch
new file mode 100644
index 000000000000..5fba7fdfad59
--- /dev/null
+++ b/srcpkgs/adjtimex/patches/destdir.patch
@@ -0,0 +1,17 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -42,10 +42,11 @@
+ 	$(CC) $(CFLAGS) -c mat.c
+ 
+ install: all
+-	$(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex
+-	$(INSTALL) -d -g root -m 755 -o root $(mandir)
++	$(INSTALL) -d -g root -m 755 -o root $(DESTDIR)$(bindir)
++	$(INSTALL) -g bin -m 755 -o root adjtimex $(DESTDIR)$(bindir)/adjtimex
++	$(INSTALL) -d -g root -m 755 -o root $(DESTDIR)$(mandir)
+ 	-$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \
+-		$(mandir)/adjtimex.$(manext)
++		$(DESTDIR)$(mandir)/adjtimex.$(manext)
+ 
+ uninstall:
+ 	rm -f $(bindir)/adjtimex $(mandir)/adjtimex.$(manext)
diff --git a/srcpkgs/adjtimex/template b/srcpkgs/adjtimex/template
new file mode 100644
index 000000000000..7a50e751d531
--- /dev/null
+++ b/srcpkgs/adjtimex/template
@@ -0,0 +1,12 @@
+# Template file for 'adjtimex'
+pkgname=adjtimex
+version=1.29
+revision=1
+build_style=gnu-configure
+make_install_args="bindir=/usr/bin"
+short_desc="Kernel time variables configuration utility"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/rogers0/adjtimex"
+distfiles="${DEBIAN_SITE}/main/a/adjtimex/adjtimex_${version}.orig.tar.gz"
+checksum=04b9e8b66e77276ed07e78de89af37fd1aa12725923de853480827c4fafd176a

From b60b1ecab5c68b2db68740d18f2141f44f85f100 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 13 Mar 2022 00:05:37 +0100
Subject: [PATCH 0159/2561] kup: fix build on musl

---
 srcpkgs/kup/patches/musl.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/kup/patches/musl.patch

diff --git a/srcpkgs/kup/patches/musl.patch b/srcpkgs/kup/patches/musl.patch
new file mode 100644
index 000000000000..b62cdd945d9b
--- /dev/null
+++ b/srcpkgs/kup/patches/musl.patch
@@ -0,0 +1,10 @@
+--- a/daemon/fsexecutor.cpp
++++ b/daemon/fsexecutor.cpp
+@@ -15,6 +15,7 @@
+ 
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#include <sys/select.h>
+ 
+ namespace {
+ 

From fd21b66c6fb5f0339e100619e5f5729341fe5750 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sat, 12 Mar 2022 09:57:21 -0600
Subject: [PATCH 0160/2561] zfs: update to 2.1.3.

---
 ...1-only-build-the-module-in-dkms.conf.patch |  43 +++
 srcpkgs/zfs/patches/12975.patch               | 276 ------------------
 srcpkgs/zfs/patches/dkms.patch                |  39 ---
 srcpkgs/zfs/patches/musl-seek-constants.patch |  58 ----
 srcpkgs/zfs/template                          |   6 +-
 5 files changed, 46 insertions(+), 376 deletions(-)
 create mode 100644 srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
 delete mode 100644 srcpkgs/zfs/patches/12975.patch
 delete mode 100644 srcpkgs/zfs/patches/dkms.patch
 delete mode 100644 srcpkgs/zfs/patches/musl-seek-constants.patch

diff --git a/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch b/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
new file mode 100644
index 000000000000..cd9e890ab76e
--- /dev/null
+++ b/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
@@ -0,0 +1,43 @@
+# Patch from https://aur.archlinux.org/cgit/aur.git/tree/0001-only-build-the-module-in-dkms.conf.patch?h=zfs-dkms
+# Avoids recompiling ZFS userland utilities with DKMS rebuilds
+From b4a2c0b184c9c9599421b15a430fb88deb5dbd17 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Sun, 28 Oct 2018 15:01:58 -0400
+Subject: [PATCH] only build the module in dkms.conf
+
+---
+ scripts/dkms.mkconf | 19 ++-----------------
+ 1 file changed, 2 insertions(+), 17 deletions(-)
+
+diff --git a/scripts/dkms.mkconf b/scripts/dkms.mkconf
+index 88c289383..5a859a0e0 100755
+--- a/scripts/dkms.mkconf
++++ b/scripts/dkms.mkconf
+@@ -28,14 +28,7 @@ PACKAGE_CONFIG="${pkgcfg}"
+ PRE_BUILD="configure
+   --prefix=/usr
+   --with-config=kernel
+-  --with-linux=\$(
+-    if [ -e "\${kernel_source_dir/%build/source}" ]
+-    then
+-      echo "\${kernel_source_dir/%build/source}"
+-    else
+-      echo "\${kernel_source_dir}"
+-    fi
+-  )
++  --with-linux="\${kernel_source_dir}"
+   --with-linux-obj="\${kernel_source_dir}"
+   \$(
+     [[ -n \"\${ICP_ROOT}\" ]] && \\
+@@ -69,7 +54,7 @@ POST_BUILD="scripts/dkms.postbuild
+ "
+ AUTOINSTALL="yes"
+ REMAKE_INITRD="no"
+-MAKE[0]="make"
++MAKE[0]="make -C module/"
+ STRIP[0]="\$(
+   [[ -r \${PACKAGE_CONFIG} ]] \\
+   && source \${PACKAGE_CONFIG} \\
+-- 
+2.19.1
+
diff --git a/srcpkgs/zfs/patches/12975.patch b/srcpkgs/zfs/patches/12975.patch
deleted file mode 100644
index 13d08e98d8bb..000000000000
--- a/srcpkgs/zfs/patches/12975.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-From 7b926912e9a968341c2140f7b887261fea86c706 Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Fri, 14 Jan 2022 05:09:08 -0500
-Subject: [PATCH 1/4] Linux 5.16 compat: Check slab.h for kvmalloc
-
-As it says on the tin - the folio work moved a bunch out of mm.h.
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-kmem.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/kernel-kmem.m4 b/config/kernel-kmem.m4
-index 43f9e72f88d..03c2a41fbdb 100644
---- a/config/kernel-kmem.m4
-+++ b/config/kernel-kmem.m4
-@@ -64,6 +64,7 @@ dnl #
- AC_DEFUN([ZFS_AC_KERNEL_SRC_KVMALLOC], [
- 	ZFS_LINUX_TEST_SRC([kvmalloc], [
- 		#include <linux/mm.h>
-+		#include <linux/slab.h>
- 	],[
- 		void *p __attribute__ ((unused));
- 
-
-From 1ca38ed9280ce80e7a12813b54dc5ade5e78f61b Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Fri, 14 Jan 2022 05:08:33 -0500
-Subject: [PATCH 2/4] Linux 5.16 compat: Added add_disk check for return
-
-add_disk went from void to must-check int return.
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-add-disk.m4     | 27 +++++++++++++++++++++++++++
- config/kernel.m4              |  2 ++
- module/os/linux/zfs/zvol_os.c |  4 ++++
- 3 files changed, 33 insertions(+)
- create mode 100644 config/kernel-add-disk.m4
-
-diff --git a/config/kernel-add-disk.m4 b/config/kernel-add-disk.m4
-new file mode 100644
-index 00000000000..3bc40f1e7d2
---- /dev/null
-+++ b/config/kernel-add-disk.m4
-@@ -0,0 +1,27 @@
-+dnl #
-+dnl # 5.16 API change
-+dnl # add_disk grew a must-check return code
-+dnl #
-+AC_DEFUN([ZFS_AC_KERNEL_SRC_ADD_DISK], [
-+
-+	ZFS_LINUX_TEST_SRC([add_disk_ret], [
-+		#include <linux/genhd.h>
-+	], [
-+		struct gendisk *disk = NULL;
-+		int err = add_disk(disk);
-+		err = err;
-+	])
-+
-+])
-+
-+AC_DEFUN([ZFS_AC_KERNEL_ADD_DISK], [
-+	AC_MSG_CHECKING([whether add_disk() returns int])
-+	ZFS_LINUX_TEST_RESULT([add_disk_ret],
-+	[
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_ADD_DISK_RET, 1,
-+		    [add_disk() returns int])
-+	], [
-+		AC_MSG_RESULT(no)
-+	])
-+])
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index bdd3caed2b3..b3ed966b726 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -135,6 +135,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
- 	ZFS_AC_KERNEL_SRC_VFS_SET_PAGE_DIRTY_NOBUFFERS
- 	ZFS_AC_KERNEL_SRC_STANDALONE_LINUX_STDARG
- 	ZFS_AC_KERNEL_SRC_PAGEMAP_FOLIO_WAIT_BIT
-+	ZFS_AC_KERNEL_SRC_ADD_DISK
- 
- 	AC_MSG_CHECKING([for available kernel interfaces])
- 	ZFS_LINUX_TEST_COMPILE_ALL([kabi])
-@@ -243,6 +244,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
- 	ZFS_AC_KERNEL_VFS_SET_PAGE_DIRTY_NOBUFFERS
- 	ZFS_AC_KERNEL_STANDALONE_LINUX_STDARG
- 	ZFS_AC_KERNEL_PAGEMAP_FOLIO_WAIT_BIT
-+	ZFS_AC_KERNEL_ADD_DISK
- ])
- 
- dnl #
-diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c
-index cef52e22483..e26d4db4977 100644
---- a/module/os/linux/zfs/zvol_os.c
-+++ b/module/os/linux/zfs/zvol_os.c
-@@ -1110,7 +1110,11 @@ zvol_os_create_minor(const char *name)
- 		rw_enter(&zvol_state_lock, RW_WRITER);
- 		zvol_insert(zv);
- 		rw_exit(&zvol_state_lock);
-+#ifdef HAVE_ADD_DISK_RET
-+		error = add_disk(zv->zv_zso->zvo_disk);
-+#else
- 		add_disk(zv->zv_zso->zvo_disk);
-+#endif
- 	} else {
- 		ida_simple_remove(&zvol_ida, idx);
- 	}
-
-From a0b11a8996b55a0bb3c1c100fa6f392ca90d74b0 Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Fri, 14 Jan 2022 05:07:33 -0500
-Subject: [PATCH 3/4] Linux 5.16 compat: Added mapping for
- iov_iter_fault_in_readable
-
-Linux decided to rename this for some reason. At some point, we
-should probably invert this mapping, but for now...
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-add-disk.m4      |  1 -
- config/kernel-vfs-iov_iter.m4  | 22 ++++++++++++++++++++--
- include/os/linux/spl/sys/uio.h |  4 ++++
- 3 files changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/config/kernel-add-disk.m4 b/config/kernel-add-disk.m4
-index 3bc40f1e7d2..5d1779eb432 100644
---- a/config/kernel-add-disk.m4
-+++ b/config/kernel-add-disk.m4
-@@ -13,7 +13,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_ADD_DISK], [
- 	])
- 
- ])
--
- AC_DEFUN([ZFS_AC_KERNEL_ADD_DISK], [
- 	AC_MSG_CHECKING([whether add_disk() returns int])
- 	ZFS_LINUX_TEST_RESULT([add_disk_ret],
-diff --git a/config/kernel-vfs-iov_iter.m4 b/config/kernel-vfs-iov_iter.m4
-index ecdda939f1c..57f78745a24 100644
---- a/config/kernel-vfs-iov_iter.m4
-+++ b/config/kernel-vfs-iov_iter.m4
-@@ -41,6 +41,17 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_IOV_ITER], [
- 		error = iov_iter_fault_in_readable(&iter, size);
- 	])
- 
-+	ZFS_LINUX_TEST_SRC([fault_in_iov_iter_readable], [
-+		#include <linux/fs.h>
-+		#include <linux/uio.h>
-+	],[
-+		struct iov_iter iter = { 0 };
-+		size_t size = 512;
-+		int error __attribute__ ((unused));
-+
-+		error = fault_in_iov_iter_readable(&iter, size);
-+	])
-+
- 	ZFS_LINUX_TEST_SRC([iov_iter_count], [
- 		#include <linux/fs.h>
- 		#include <linux/uio.h>
-@@ -123,8 +134,15 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_IOV_ITER], [
- 		AC_DEFINE(HAVE_IOV_ITER_FAULT_IN_READABLE, 1,
- 		    [iov_iter_fault_in_readable() is available])
- 	],[
--		AC_MSG_RESULT(no)
--		enable_vfs_iov_iter="no"
-+		AC_MSG_CHECKING([whether fault_in_iov_iter_readable() is available])
-+		ZFS_LINUX_TEST_RESULT([fault_in_iov_iter_readable], [
-+			AC_MSG_RESULT(yes)
-+			AC_DEFINE(HAVE_FAULT_IN_IOV_ITER_READABLE, 1,
-+			    [fault_in_iov_iter_readable() is available])
-+		],[
-+			AC_MSG_RESULT(no)
-+			enable_vfs_iov_iter="no"
-+		])
- 	])
- 
- 	AC_MSG_CHECKING([whether iov_iter_count() is available])
-diff --git a/include/os/linux/spl/sys/uio.h b/include/os/linux/spl/sys/uio.h
-index 66af2b0b534..439eec98623 100644
---- a/include/os/linux/spl/sys/uio.h
-+++ b/include/os/linux/spl/sys/uio.h
-@@ -34,6 +34,10 @@
- #include <asm/uaccess.h>
- #include <sys/types.h>
- 
-+#if defined(HAVE_VFS_IOV_ITER) && defined(HAVE_FAULT_IN_IOV_ITER_READABLE)
-+#define	iov_iter_fault_in_readable(a, b)	fault_in_iov_iter_readable(a, b)
-+#endif
-+
- typedef struct iovec iovec_t;
- 
- typedef enum zfs_uio_rw {
-
-From 700bb88b595d0e73ad3c19767cec68cb8081be2d Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Wed, 19 Jan 2022 00:12:15 -0500
-Subject: [PATCH 4/4] Add support for FALLOC_FL_ZERO_RANGE
-
-For us, I think it's always just FALLOC_FL_PUNCH_HOLE with a fake
-mustache on.
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-fallocate.m4     | 17 +++++++++++++++++
- module/os/linux/zfs/zpl_file.c |  9 +++++++--
- 2 files changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/config/kernel-fallocate.m4 b/config/kernel-fallocate.m4
-index 7a8550f7e76..815602d3e2c 100644
---- a/config/kernel-fallocate.m4
-+++ b/config/kernel-fallocate.m4
-@@ -3,6 +3,10 @@ dnl # Linux 2.6.38 - 3.x API
- dnl # The fallocate callback was moved from the inode_operations
- dnl # structure to the file_operations structure.
- dnl #
-+dnl #
-+dnl # Linux 3.15+
-+dnl # fallocate learned a new flag, FALLOC_FL_ZERO_RANGE
-+dnl #
- AC_DEFUN([ZFS_AC_KERNEL_SRC_FALLOCATE], [
- 	ZFS_LINUX_TEST_SRC([file_fallocate], [
- 		#include <linux/fs.h>
-@@ -15,12 +19,25 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FALLOCATE], [
- 			.fallocate = test_fallocate,
- 		};
- 	], [])
-+	ZFS_LINUX_TEST_SRC([falloc_fl_zero_range], [
-+		#include <linux/falloc.h>
-+	],[
-+		int flags __attribute__ ((unused));
-+		flags = FALLOC_FL_ZERO_RANGE;
-+	])
- ])
- 
- AC_DEFUN([ZFS_AC_KERNEL_FALLOCATE], [
- 	AC_MSG_CHECKING([whether fops->fallocate() exists])
- 	ZFS_LINUX_TEST_RESULT([file_fallocate], [
- 		AC_MSG_RESULT(yes)
-+		AC_MSG_CHECKING([whether FALLOC_FL_ZERO_RANGE exists])
-+		ZFS_LINUX_TEST_RESULT([falloc_fl_zero_range], [
-+			AC_MSG_RESULT(yes)
-+			AC_DEFINE(HAVE_FALLOC_FL_ZERO_RANGE, 1, [FALLOC_FL_ZERO_RANGE is defined])
-+		],[
-+			AC_MSG_RESULT(no)
-+		])
- 	],[
- 		ZFS_LINUX_TEST_ERROR([file_fallocate])
- 	])
-diff --git a/module/os/linux/zfs/zpl_file.c b/module/os/linux/zfs/zpl_file.c
-index 21926f170c5..a3af1804f6a 100644
---- a/module/os/linux/zfs/zpl_file.c
-+++ b/module/os/linux/zfs/zpl_file.c
-@@ -745,7 +745,12 @@ zpl_fallocate_common(struct inode *ip, int mode, loff_t offset, loff_t len)
- 	fstrans_cookie_t cookie;
- 	int error = 0;
- 
--	if ((mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) != 0)
-+	int test_mode = FALLOC_FL_PUNCH_HOLE;
-+#ifdef HAVE_FALLOC_FL_ZERO_RANGE
-+	test_mode |= FALLOC_FL_ZERO_RANGE;
-+#endif
-+
-+	if ((mode & ~(FALLOC_FL_KEEP_SIZE | test_mode)) != 0)
- 		return (-EOPNOTSUPP);
- 
- 	if (offset < 0 || len <= 0)
-@@ -756,7 +761,7 @@ zpl_fallocate_common(struct inode *ip, int mode, loff_t offset, loff_t len)
- 
- 	crhold(cr);
- 	cookie = spl_fstrans_mark();
--	if (mode & FALLOC_FL_PUNCH_HOLE) {
-+	if (mode & (test_mode)) {
- 		flock64_t bf;
- 
- 		if (offset > olen)
diff --git a/srcpkgs/zfs/patches/dkms.patch b/srcpkgs/zfs/patches/dkms.patch
deleted file mode 100644
index 850a976534d4..000000000000
--- a/srcpkgs/zfs/patches/dkms.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-# Patch from https://aur.archlinux.org/packages/zfs-dkms/
-# Avoids recompiling ZFS userland utilities with DKMS rebuilds
-# Also short-circuits a useless test for Debian in the DKMS source
-
---- a/scripts/dkms.mkconf	2021-01-19 19:19:08.000000000 -0500
-+++ b/scripts/dkms.mkconf	2021-02-02 19:03:02.045984881 -0500
-@@ -26,22 +26,7 @@
- PRE_BUILD="configure
-   --prefix=/usr
-   --with-config=kernel
--  --with-linux=\$(
--    case \`lsb_release -is\` in
--      (Debian|Devuan)
--        if [[ -e \${kernel_source_dir/%build/source} ]]
--        then
--          echo \${kernel_source_dir/%build/source}
--        else
--          # A kpkg exception for Proxmox 2.0
--          echo \${kernel_source_dir}
--        fi
--      ;;
--      (*)
--        echo \${kernel_source_dir}
--      ;;
--    esac
--  )
-+  --with-linux=\${kernel_source_dir}
-   --with-linux-obj=\${kernel_source_dir}
-   \$(
-     [[ -n \"\${ICP_ROOT}\" ]] && \\
-@@ -75,7 +60,7 @@
- "
- AUTOINSTALL="yes"
- REMAKE_INITRD="no"
--MAKE[0]="make"
-+MAKE[0]="make -C module/"
- STRIP[0]="\$(
-   [[ -r \${PACKAGE_CONFIG} ]] \\
-   && source \${PACKAGE_CONFIG} \\
diff --git a/srcpkgs/zfs/patches/musl-seek-constants.patch b/srcpkgs/zfs/patches/musl-seek-constants.patch
deleted file mode 100644
index 3d2c563f8c51..000000000000
--- a/srcpkgs/zfs/patches/musl-seek-constants.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 123c87b3c2d75636da79f57a4b0ed60d2a3133a8 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Mon, 20 Dec 2021 12:25:11 -0800
-Subject: [PATCH] zfs-test/mmap_seek: fix build on musl
-
-it needs linux/fs.h for SEEK_DATA and friends
-
-without linux/fs.h:
-
-```
-mmap_seek.c
-mmap_seek.c: In function 'seek_data':
-mmap_seek.c:37:40: error: 'SEEK_DATA' undeclared (first use in this function);
-did you mean 'SEEK_SET'?
-   37 |  off_t data_offset = lseek(fd, offset, SEEK_DATA);
-```
-
-also it needs sys/sysmacros.h for P2ROUNDUP
-without it:
-
-```
-mmap_seek.c: In function 'main':
-mmap_seek.c:122:19: warning:
-implicit declaration of function 'P2ROUNDUP' [-Wimplicit-function-declaration]
-  122 |  seek_hole(fd, 0, P2ROUNDUP(file_size / 2, block_size));
-      |                   ^~~~~~~~~
-powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.o: in function `main':
-mmap_seek.c:(.text.startup+0x1b8): undefined reference to `P2ROUNDUP'
-powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.c:(.text.startup+0x1d8):
-	undefined reference to `P2ROUNDUP'
-powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.c:(.text.startup+0x21c):
-	undefined reference to `P2ROUNDUP'
-collect2: error: ld returned 1 exit status
-make[5]: *** [Makefile:754: mmap_seek] Error 1
-```
-
-Closes: https://github.com/openzfs/zfs/pull/12891
-Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
----
- tests/zfs-tests/cmd/mmap_seek/mmap_seek.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
-index f476e1dba9a..bb36527aafe 100644
---- a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
-+++ b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
-@@ -29,7 +29,11 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/mman.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
-+#ifdef __linux__
-+#include <linux/fs.h>
-+#endif
- 
- static void
- seek_data(int fd, off_t offset, off_t expected)
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 0b0c490a5843..477c39614cd0 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.1.2
-revision=2
+version=2.1.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=258cf1d17a1f668a3b99b61eaf14be06c614df42503db0319bef1b9fc4c8b9e7
+checksum=b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

From 62c022ad7a1e55d20a48245716a739892089eefb Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 11 Mar 2022 23:17:55 +0200
Subject: [PATCH 0161/2561] R: update to 4.1.3.

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

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 8190ac146535..d506d02764b0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
-version=4.1.2
-revision=2
+version=4.1.3
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
@@ -22,7 +22,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
 distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
-checksum=2036225e9f7207d4ce097e54972aecdaa8b40d7d9911cd26491fac5a0fab38af
+checksum=15ff5b333c61094060b2a52e9c1d8ec55cc42dd029e39ca22abdaa909526fed6
 nocross=yes
 shlib_provides="libR.so"
 make_check=extended

From c85522fc4eed021296a4fa23291db1e4760dc7ee Mon Sep 17 00:00:00 2001
From: TROUVERIE Joachim <jtrouverie@joakode.fr>
Date: Fri, 4 Mar 2022 17:59:30 +0100
Subject: [PATCH 0162/2561] notmuch: update to 0.35.

---
 ...mime-session-key-extraction-support-.patch | 43 +++++++-------
 ...mime-x509-certificate-validity-check.patch | 56 +++++++++----------
 ...-gmime-verify-with-session-key-check.patch | 39 +++++++------
 srcpkgs/notmuch/template                      | 10 ++--
 4 files changed, 72 insertions(+), 76 deletions(-)

diff --git a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
index 581c6be15590..b6445729af6f 100644
--- a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
+++ b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
@@ -17,13 +17,13 @@ Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
  1 file changed, 58 deletions(-)
 
 diff --git a/configure b/configure
-index 7dae745c..99b0c328 100755
+index 36f3f606..1bf2097d 100755
 --- a/configure
 +++ b/configure
-@@ -467,65 +467,7 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
- 
+@@ -492,65 +492,7 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+
      printf "Checking for GMime session key extraction support... "
- 
+
 -    cat > _check_session_keys.c <<EOF
 -#include <gmime/gmime.h>
 -#include <stdio.h>
@@ -54,16 +54,16 @@ index 7dae745c..99b0c328 100755
 -}
 -EOF
 -    if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
--        printf 'No.\nCould not make tempdir for testing session-key support.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nCould not make tempdir for testing session-key support.\n'
+-	errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
--           && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
--           && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
--           && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+-	   && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+-	   && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+-	   && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
 -    then
-         printf "OK.\n"
+ 	printf "OK.\n"
 -    else
--        cat <<EOF
+-	cat <<EOF
 -No.
 -*** Error: Could not extract session keys from encrypted message.
 -
@@ -73,19 +73,18 @@ index 7dae745c..99b0c328 100755
 -Please try to rebuild your version of GMime against a more recent
 -version of GPGME (at least GPGME 1.8.0).
 -EOF
--        if command -v gpgme-config >/dev/null; then
--            printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
--        else
--            printf 'You do not have the GPGME development libraries installed.\n'
--        fi
--        errors=$((errors + 1))
+-	if command -v gpgme-config >/dev/null; then
+-	    printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+-	else
+-	    printf 'You do not have the GPGME development libraries installed.\n'
+-	fi
+-	errors=$((errors + 1))
 -    fi
 -    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
--        rm -rf "$TEMP_GPG"
+-	rm -rf "$TEMP_GPG"
 -    fi
- 
+
      # see https://github.com/jstedfast/gmime/pull/90
      # should be fixed in GMime in 3.2.7, but some distros might patch
--- 
-2.28.0.rc2.21.g5c06d60fc5
-
+--
+2.35.1
diff --git a/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
index 49b5b3a0795d..c7e5addc0784 100644
--- a/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
+++ b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
@@ -11,18 +11,17 @@ The problem has been fixed with gmime 3.2.7 already.
 
 Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
 ---
- configure | 70 -------------------------------------------------------
- 1 file changed, 70 deletions(-)
+ configure | 69 -------------------------------------------------------
+ 1 file changed, 69 deletions(-)
 
 diff --git a/configure b/configure
-index 99b0c328..ef602d10 100755
+index 36f3f606..fd23aa67 100755
 --- a/configure
 +++ b/configure
-@@ -472,78 +472,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
-     # see https://github.com/jstedfast/gmime/pull/90
+@@ -556,77 +556,8 @@ EOF
      # should be fixed in GMime in 3.2.7, but some distros might patch
      printf "Checking for GMime X.509 certificate validity... "
--
+
 -    cat > _check_x509_validity.c <<EOF
 -#include <stdio.h>
 -#include <gmime/gmime.h>
@@ -63,40 +62,39 @@ index 99b0c328..ef602d10 100755
 -}
 -EOF
 -    if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
--        printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n'
+-	errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \
--            && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \
--            && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \
--            && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt
+-	    && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \
+-	    && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \
+-	    && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt
 -    then
--        if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then
-             gmime_x509_cert_validity=1
-             printf "Yes.\n"
--        else
--            gmime_x509_cert_validity=0
--            printf "No.\n"
--            if pkg-config --exists "gmime-3.0 >= 3.2.7"; then
--                cat <<EOF
+-	if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then
+ 	    gmime_x509_cert_validity=1
+ 	    printf "Yes.\n"
+-	else
+-	    gmime_x509_cert_validity=0
+-	    printf "No.\n"
+-	    if pkg-config --exists "gmime-3.0 >= 3.2.7"; then
+-		cat <<EOF
 -*** Error: GMime fails to calculate X.509 certificate validity, and
 -is later than 3.2.7, which should have fixed this issue.
 -
 -Please follow up on https://github.com/jstedfast/gmime/pull/90 with
 -more details.
 -EOF
--                errors=$((errors + 1))
--            fi
--        fi
+-		errors=$((errors + 1))
+-	    fi
+-	fi
 -    else
--        printf 'No.\nFailed to set up gpgsm for testing X.509 certificate validity support.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nFailed to set up gpgsm for testing X.509 certificate validity support.\n'
+-	errors=$((errors + 1))
 -    fi
 -    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
--        rm -rf "$TEMP_GPG"
+-	rm -rf "$TEMP_GPG"
 -    fi
- 
+
      # see https://dev.gnupg.org/T3464
      # there are problems verifying signatures when decrypting with session keys with GPGME 1.13.0 and 1.13.1
--- 
-2.28.0.rc2.21.g5c06d60fc5
-
+--
+2.35.1
diff --git a/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch b/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch
index 5de4f6ff5ce4..5ca5b506eaca 100644
--- a/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch
+++ b/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch
@@ -18,10 +18,10 @@ Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
  1 file changed, 66 deletions(-)
 
 diff --git a/configure b/configure
-index ef602d10..204d46d9 100755
+index 36f3f606..cd99bf4a 100755
 --- a/configure
 +++ b/configure
-@@ -478,74 +478,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+@@ -631,74 +631,8 @@ EOF
      # see https://dev.gnupg.org/T3464
      # there are problems verifying signatures when decrypting with session keys with GPGME 1.13.0 and 1.13.1
      printf "Checking signature verification when decrypting using session keys... "
@@ -67,35 +67,34 @@ index ef602d10..204d46d9 100755
 -}
 -EOF
 -    if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
--        printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
+-	errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \
--            && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
--            && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
+-	    && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+-	    && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
 -    then
--        if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
-             gmime_verify_with_session_key=1
-             printf "Yes.\n"
--        else
--            gmime_verify_with_session_key=0
--            printf "No.\n"
--            cat <<EOF
+-	if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
+ 	    gmime_verify_with_session_key=1
+ 	    printf "Yes.\n"
+-	else
+-	    gmime_verify_with_session_key=0
+-	    printf "No.\n"
+-	    cat <<EOF
 -*** Error: GMime fails to verify signatures when decrypting with a session key.
 -
 -This is most likely due to a buggy version of GPGME, which should be fixed in 1.13.2 or later.
 -See https://dev.gnupg.org/T3464 for more details.
 -EOF
--        fi
+-	fi
 -    else
--        printf 'No.\nFailed to set up gpg for testing signature verification while decrypting with a session key.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nFailed to set up gpg for testing signature verification while decrypting with a session key.\n'
+-	errors=$((errors + 1))
 -    fi
 -    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
--        rm -rf "$TEMP_GPG"
+-	rm -rf "$TEMP_GPG"
 -    fi
  else
      have_gmime=0
      printf "No.\n"
--- 
-2.28.0.rc2.21.g5c06d60fc5
-
+--
+2.35.1
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 841645d19fe9..b33a09fbddcf 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,7 +1,7 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.32.2
-revision=4
+version=0.35
+revision=1
 build_style=configure
 configure_args="--prefix=/usr
  --emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -14,12 +14,12 @@ depends="gmime3>=3.2.7"
 checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core
  openssl"
 short_desc="Thread-based email index, search, and tagging"
-maintainer="Jan S. <jan.schreib@gmail.com>"
+maintainer="Joachim T. <jtrouverie@joakode.fr>"
 license="GPL-3.0-or-later"
 homepage="https://notmuchmail.org"
 distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
  https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7
+checksum="a831c414c4f20a6cae3a580793c855102d3295080f000eb3832b77226a40ac39
  4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
 skip_extraction="database-v1.tar.xz"
 replaces="notmuch-emacs>=0"
@@ -56,7 +56,7 @@ do_check() {
 	# we don't ship python-cffi
 	NOTMUCH_SKIP_TESTS+=" libconfig python-cffi"
 	if [ $(id -u) = 0 ]; then
-		NOTMUCH_SKIP_TESTS+=" new.36 tagging.25"
+		NOTMUCH_SKIP_TESTS+=" new.36 new.39 tagging.25"
 	fi
 	export NOTMUCH_SKIP_TESTS
 	make test

From 28d7a5bfdf3e3dda4c56bfacbad5d11fc1ef7c75 Mon Sep 17 00:00:00 2001
From: Neel <neel@chot.ai>
Date: Sun, 19 Dec 2021 21:54:53 +0000
Subject: [PATCH 0163/2561] hstr: update to 2.5

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

diff --git a/srcpkgs/hstr/template b/srcpkgs/hstr/template
index ee259a9eac03..3f2d95c854ec 100644
--- a/srcpkgs/hstr/template
+++ b/srcpkgs/hstr/template
@@ -1,6 +1,6 @@
 # Template file for 'hstr'
 pkgname=hstr
-version=2.3
+version=2.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
@@ -11,12 +11,9 @@ license="Apache-2.0"
 homepage="https://github.com/dvorka/hstr"
 changelog="https://raw.githubusercontent.com/dvorka/hstr/master/Changelog"
 distfiles="https://github.com/dvorka/hstr/archive/${version}.tar.gz"
-checksum=c7e7408671757b3f4be9c5a59b4e2d56e7a7b601ace2a94eb6b2b61f20ee890b
+checksum=7f5933fc07d55d09d5f7f9a6fbfdfc556d8a7d8575c3890ac1e672adabd2bec4
 
 pre_configure() {
-	vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h
-	vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr_curses.h
-	aclocal
-	automake --force-missing --add-missing
-	autoconf
+	vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h src/include/hstr_curses.h
+	autoreconf -fi
 }

From c70838be96f64a070d3df572d3cb6b9421f1947f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sat, 12 Mar 2022 16:15:07 +0200
Subject: [PATCH 0164/2561] dbus-glib: update to 0.112.

Additionally fix xlint and tests.
---
 srcpkgs/dbus-glib/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dbus-glib/template b/srcpkgs/dbus-glib/template
index ee905b75bfe6..3da4c3010605 100644
--- a/srcpkgs/dbus-glib/template
+++ b/srcpkgs/dbus-glib/template
@@ -1,18 +1,19 @@
 # Template file for 'dbus-glib'
 pkgname=dbus-glib
-version=0.110
+version=0.112
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-bash-completion"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel dbus-devel"
 depends="dbus"
+checkdepends="dbus glib-devel"
 short_desc="GLib bindings for D-Bus"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.freedesktop.org/wiki/Software/DBusBindings"
 distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
-checksum=7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825
+checksum=7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-dbus-binding-tool=dbus-binding-tool"

From 1df2896a5c15877cfc7363b95c1e5b8f95868754 Mon Sep 17 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, 13 Mar 2022 19:11:18 +0700
Subject: [PATCH 0165/2561] mutt: no needs libidn2-devel in hostmakedepends

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

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 42039d5d78f4..7ae82f76bd8c 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -8,7 +8,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --sysconfdir=/etc/$pkgname
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
-hostmakedepends="libidn2-devel perl pkg-config"
+hostmakedepends="perl pkg-config"
 makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"

From f7b58f45fdcb14d8532e45c7ed52c9ae3d85e4fd Mon Sep 17 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, 13 Mar 2022 19:14:36 +0700
Subject: [PATCH 0166/2561] fcitx5: update to 5.0.15.

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

diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template
index 3f55cd914dc9..ffc3011295f8 100644
--- a/srcpkgs/fcitx5/template
+++ b/srcpkgs/fcitx5/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5'
 pkgname=fcitx5
-version=5.0.14
+version=5.0.15
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,7 @@ 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="d30658323f6620c43e306af233980b2dbd765ee2240ac7db865c00052d1c313b
+checksum="343df0f278dc6db4afebc778664ee477d9bd6c011c8446e5aa89c20bb1786e41
  c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
 skip_extraction=en_dict-${_en_dict_ver}.tar.gz
 lib32disabled=yes

From cf8d12b30198d8da817954b4351f768907b2d05a Mon Sep 17 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, 13 Mar 2022 19:14:41 +0700
Subject: [PATCH 0167/2561] fcitx5-anthy: update to 5.0.10.

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

diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template
index 3077b0796431..f2003e8be2c6 100644
--- a/srcpkgs/fcitx5-anthy/template
+++ b/srcpkgs/fcitx5-anthy/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-anthy'
 pkgname=fcitx5-anthy
-version=5.0.9
+version=5.0.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ 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=73f96564d003ecc4160ceb311b2416547dcdf1a7cb6996d7d00cc01dae834a44
+checksum=1dab20b65c65059f707d64cbf1cd0f98a88016161240ad514b811a161bfed7fd
 
 fcitx5-anthy-icons_package() {
 	short_desc+=" - icons"

From 59fadfba8c4782affefc9e17c0533a077a684df1 Mon Sep 17 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, 13 Mar 2022 19:14:44 +0700
Subject: [PATCH 0168/2561] fcitx5-chewing: update to 5.0.10.

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

diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template
index 5bdde29ffaa0..ab4df7c374dd 100644
--- a/srcpkgs/fcitx5-chewing/template
+++ b/srcpkgs/fcitx5-chewing/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-chewing'
 pkgname=fcitx5-chewing
-version=5.0.8
+version=5.0.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext doxygen extra-cmake-modules"
@@ -10,7 +10,7 @@ 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=993acad34d3490c1903827e6ee6de4b946419b14c970e7b02154eaba28971eba
+checksum=70843186dfa571eef674dde049abf2cbf16fbc9434dfb3060986bcc92cc4dadd
 lib32disabled=yes
 
 fcitx5-chewing-icons_package() {

From f0e4da152e6c2d6136c1443efeaa0bdd5bd9459b Mon Sep 17 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, 13 Mar 2022 19:14:51 +0700
Subject: [PATCH 0169/2561] fcitx5-chinese-addons: update to 5.0.12.

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

diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index 97e8ef4c575e..519e91a0dd44 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-chinese-addons'
 pkgname=fcitx5-chinese-addons
-version=5.0.11
+version=5.0.12
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
@@ -17,7 +17,7 @@ _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="1fdc6749e5b3e6bfd5b30921008fd037cbf2f0e10e66904b79ba02fce8f71b0a
+checksum="f872c755290ca8610ebfd22e1492bde065028c6e75b59555b4a82b0377b79005
  42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
  8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248"
 skip_extraction="

From 81f4aebdfb3cbb4d842b0577c6db168333c4a07e Mon Sep 17 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, 13 Mar 2022 19:14:55 +0700
Subject: [PATCH 0170/2561] fcitx5-configtool: update to 5.0.12.

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

diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
index f4c554c85e48..136a79694953 100644
--- a/srcpkgs/fcitx5-configtool/template
+++ b/srcpkgs/fcitx5-configtool/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-configtool'
 pkgname=fcitx5-configtool
-version=5.0.11
+version=5.0.12
 revision=1
 build_style=cmake
 hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
@@ -17,7 +17,7 @@ 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=bf005d01220343d24c488f6559675da694ec64354592451c7c38ce959dce8803
+checksum=293da52dbac987a3c4880433a4a93bf8b3b45e2ac3d77cb025f76dc859302a1b
 lib32disabled=yes
 
 post_install() {

From 862c38ba3064b78adc79921f60df5d99489ed7b8 Mon Sep 17 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, 13 Mar 2022 19:15:00 +0700
Subject: [PATCH 0171/2561] fcitx5-gtk: update to 5.0.13.

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

diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
index 430209846b81..c6d4efe52f10 100644
--- a/srcpkgs/fcitx5-gtk/template
+++ b/srcpkgs/fcitx5-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-gtk'
 pkgname=fcitx5-gtk
-version=5.0.12
+version=5.0.13
 revision=1
 build_style=cmake
 build_helper=gir
@@ -14,7 +14,7 @@ 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=5a2ca9629695fe7500e0574b6f942a0a93d386cb6a12734f506a521537d6d11d
+checksum=a38053806b23c097e8fca5a6c405326c14e5e0bc26595d144553006ed90c32d4
 lib32disabled=yes
 
 build_options="gir"

From 116f7124c13b544748bda6bed11feaf49cad2720 Mon Sep 17 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, 13 Mar 2022 19:15:04 +0700
Subject: [PATCH 0172/2561] fcitx5-hangul: update to 5.0.8.

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

diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template
index d51f9b3a99d5..2e6dc2e0b4e8 100644
--- a/srcpkgs/fcitx5-hangul/template
+++ b/srcpkgs/fcitx5-hangul/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-hangul'
 pkgname=fcitx5-hangul
-version=5.0.7
+version=5.0.8
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ 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=281f44c9d024b6a9984aad0f51a3840fc3873d7e3a629aeed77025f00b08bb27
+checksum=a784d80761b16269ebe6e780aac23fb1bfb6c06e9aa03bcca442bc3a62ec6220
 lib32disabled=yes
 
 fcitx5-hangul-icons_package() {

From 282fc89943050fd86273995d9230d67ddee8cd38 Mon Sep 17 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, 13 Mar 2022 19:15:08 +0700
Subject: [PATCH 0173/2561] fcitx5-qt: update to 5.0.11.

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

diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template
index d72af31d0adf..d36f9369b1cf 100644
--- a/srcpkgs/fcitx5-qt/template
+++ b/srcpkgs/fcitx5-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-qt'
 pkgname=fcitx5-qt
-version=5.0.10
+version=5.0.11
 revision=1
 build_style=cmake
 configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DENABLE_QT6=ON
@@ -14,7 +14,7 @@ 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=29daa4454825e316aa89b6c2610078e4cc9924e288ccd45b38e47db9df721f85
+checksum=7196798d4c6f9305c028dab30a31eb64566b9b47b1cb916518d33f3a0f053d62
 lib32disabled=yes
 
 if [ "$XBPS_TARGET_NOATOMIC8" ]; then

From eeea3a6edcc6e6087110af3949fbdefa3eb343b4 Mon Sep 17 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, 13 Mar 2022 19:15:12 +0700
Subject: [PATCH 0174/2561] fcitx5-rime: update to 5.0.12.

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

diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
index a557cec20a0f..d76a1b3f01a3 100644
--- a/srcpkgs/fcitx5-rime/template
+++ b/srcpkgs/fcitx5-rime/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-rime'
 pkgname=fcitx5-rime
-version=5.0.11
+version=5.0.12
 revision=1
 build_style=cmake
 configure_args="-DRIME_DATA_DIR=/usr/share/rime-data"
@@ -13,7 +13,7 @@ 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=f00fd7d53bf22d7f14c66946dbd84f70d22334ad72198e2213e8f13447168cb4
+checksum=8b7e4945fc43c2815af2e2229ce71e19959ce24cdeffe92b42ae18522410eb12
 lib32disabled=yes
 
 fcitx5-rime-icons_package() {

From dc3a10a15ade7f3954a46f2402ba741fe3668715 Mon Sep 17 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, 13 Mar 2022 19:15:18 +0700
Subject: [PATCH 0175/2561] fcitx5-table-extra: update to 5.0.9.

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

diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template
index 8d2545d40a5e..0cd1610e4ad9 100644
--- a/srcpkgs/fcitx5-table-extra/template
+++ b/srcpkgs/fcitx5-table-extra/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-table-extra'
 pkgname=fcitx5-table-extra
-version=5.0.8
+version=5.0.9
 revision=1
 build_style=cmake
 hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ 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=9ca4ab67b65efdd1b4462f20982f54c644ae822746e5c8cb02216686024c28aa
+checksum=cf791178f5871f58bf008042359ffd55e8cf11fbc4c74e77e33debe7f3ddbce4

From e1f2be35ad8777a27652f6143082c41d64fc0dd6 Mon Sep 17 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, 13 Mar 2022 19:15:22 +0700
Subject: [PATCH 0176/2561] fcitx5-lua: update to 5.0.7.

---
 srcpkgs/fcitx5-lua/template | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template
index 1952c78ae475..1c1ab31f1683 100644
--- a/srcpkgs/fcitx5-lua/template
+++ b/srcpkgs/fcitx5-lua/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-lua'
 pkgname=fcitx5-lua
-version=5.0.6
+version=5.0.7
 revision=1
 build_style=cmake
 configure_args="-DUSE_DLOPEN=No"
@@ -14,16 +14,9 @@ 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=bd55815df13cfee8b0ac90dab1dec0aca6b1b3943f80543b04a0cf2e8f03c8a9
+checksum=bff8e5143912b212726b2bab8cf62bbd11ca4f3837b65cb8ce94a7c56fc15f2d
 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"

From bfbe1ce608250d674225367b284dae2d1725387b Mon Sep 17 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, 13 Mar 2022 19:15:26 +0700
Subject: [PATCH 0177/2561] fcitx5-table-other: update to 5.0.8.

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

diff --git a/srcpkgs/fcitx5-table-other/template b/srcpkgs/fcitx5-table-other/template
index 00ebafb93cdb..febce6577128 100644
--- a/srcpkgs/fcitx5-table-other/template
+++ b/srcpkgs/fcitx5-table-other/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-table-other'
 pkgname=fcitx5-table-other
-version=5.0.7
+version=5.0.8
 revision=1
 build_style=cmake
 hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ 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=7df2445a93f2117f315a0b26d738876d205ae83d2b3e8a898ac64c3860abac70
+checksum=f741f42c72d415dccab3d1e699fa582046e4f8a64bd8d21ce6da4dc557594fac

From 3c204e9b993e65becd2a76882f2f417607460e36 Mon Sep 17 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, 13 Mar 2022 19:15:30 +0700
Subject: [PATCH 0178/2561] fcitx5-unikey: update to 5.0.9.

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

diff --git a/srcpkgs/fcitx5-unikey/template b/srcpkgs/fcitx5-unikey/template
index 81c35b310d5b..f054cb3b5360 100644
--- a/srcpkgs/fcitx5-unikey/template
+++ b/srcpkgs/fcitx5-unikey/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-unikey'
 pkgname=fcitx5-unikey
-version=5.0.8
+version=5.0.9
 revision=1
 build_style=cmake
 #configure_args=""
@@ -16,7 +16,7 @@ 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-unikey/fcitx5-unikey-${version}.tar.xz"
-checksum=7505d9f937512272baf348ba38c72bef7f27fd2df9ae5dbc99cf738c5fcef8d0
+checksum=a72d59e21ddde6ccfa5f66accd9d763ded7c8210dbb19a99435aa35b4ac7d5ed
 conflicts="fcitx-unikey>=0"
 
 fcitx5-unikey-macro-editor_package() {

From 0916f5eacf85261d23e70949ea49713763a2536b Mon Sep 17 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, 13 Mar 2022 20:09:35 +0700
Subject: [PATCH 0179/2561] libchewing: cross-compiling

---
 srcpkgs/libchewing-data                       |  1 -
 .../libchewing/patches/cross-compile.patch    | 23 +++++++++++++++++++
 srcpkgs/libchewing/template                   | 13 +++--------
 3 files changed, 26 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/libchewing-data
 create mode 100644 srcpkgs/libchewing/patches/cross-compile.patch

diff --git a/srcpkgs/libchewing-data b/srcpkgs/libchewing-data
deleted file mode 120000
index 5ea20a615bbb..000000000000
--- a/srcpkgs/libchewing-data
+++ /dev/null
@@ -1 +0,0 @@
-libchewing
\ No newline at end of file
diff --git a/srcpkgs/libchewing/patches/cross-compile.patch b/srcpkgs/libchewing/patches/cross-compile.patch
new file mode 100644
index 000000000000..d127a83589f7
--- /dev/null
+++ b/srcpkgs/libchewing/patches/cross-compile.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07112b0..597a764 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -229,15 +229,16 @@ set_target_properties(${ALL_TOOLS} PROPERTIES
+ )
+ 
+ # tools command
++file(MAKE_DIRECTORY ${DATA_BIN_DIR})
+ add_custom_command(
+     OUTPUT
+         ${ALL_DATA}
+-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DATA_BIN_DIR}
+-    COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_BIN_DIR} ${TOOLS_BIN_DIR}/init_database ${DATA_SRC_DIR}/phone.cin ${DATA_SRC_DIR}/tsi.src
++    COMMAND init_database ${DATA_SRC_DIR}/phone.cin ${DATA_SRC_DIR}/tsi.src
+     DEPENDS
+         ${ALL_TOOLS}
+         ${DATA_SRC_DIR}/phone.cin
+         ${DATA_SRC_DIR}/tsi.src
++    WORKING_DIRECTORY ${DATA_BIN_DIR}
+ )
+ 
+ # test
diff --git a/srcpkgs/libchewing/template b/srcpkgs/libchewing/template
index 7e1acca89dcc..9345a70fe6ff 100644
--- a/srcpkgs/libchewing/template
+++ b/srcpkgs/libchewing/template
@@ -1,18 +1,18 @@
 # Template file for 'libchewing'
 pkgname=libchewing
 version=0.5.1
-revision=4
+revision=5
 build_style=cmake
+build_helper="qemu"
 hostmakedepends="texinfo"
 makedepends="sqlite-devel"
-depends="libchewing-data-${version}_${revision}"
 short_desc="Intelligent phonetic (Zhuyin/Bopomofo) input method"
 maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
 license="LGPL-2.1-only"
 homepage="http://chewing.im/"
 distfiles="https://github.com/chewing/libchewing/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
 checksum=9708c63415fa6034435c0f38100e7d30d0e1bac927f67bec6dfeb3fef016172b
-nocross="/builddir/libchewing-0.5.1/build/src/tools/init_database: cannot execute binary file"
+replaces="libchewing-data>=0"
 
 libchewing-devel_package() {
 	depends="libchewing>=${version}_${revision}"
@@ -25,10 +25,3 @@ libchewing-devel_package() {
 		vmove usr/share/info
 	}
 }
-
-libchewing-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/libchewing
-	}
-}

From 8a70cf3ada53a9e8d477bef7935d8937378d3739 Mon Sep 17 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, 13 Mar 2022 20:23:48 +0700
Subject: [PATCH 0180/2561] fcitx-chewing: need libfcitx in hostmakedepends

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

diff --git a/srcpkgs/fcitx-chewing/template b/srcpkgs/fcitx-chewing/template
index 8f2c9c4ce432..67d01e039272 100644
--- a/srcpkgs/fcitx-chewing/template
+++ b/srcpkgs/fcitx-chewing/template
@@ -3,7 +3,7 @@ pkgname=fcitx-chewing
 version=0.2.3
 revision=2
 build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config libfcitx"
 makedepends="fcitx-devel libchewing-devel"
 depends="fcitx5-chewing-icons"
 short_desc="Fcitx wrapper for Chewing IM engine"

From 93d341685d6fe4bf36fec477fed6abb3d55e65a3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 13 Mar 2022 15:40:18 +0100
Subject: [PATCH 0181/2561] linux5.15: update to 5.15.28.

---
 srcpkgs/linux5.15/files/arm64-dotconfig | 4 ++--
 srcpkgs/linux5.15/template              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index a90de90be07d..f2091f4a8972 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.22 Kernel Configuration
+# Linux/arm64 5.15.28 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -424,6 +424,7 @@ CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -2643,7 +2644,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 387e8abc54dc..d314a6f8a251 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.26
+version=5.15.28
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 5ceba1332b26e735342a76dd85a5b1b53cc4873e202e58b99a25da0cf6e20992"
+ 1019709aa85b87904e901aca141f8ade27b3719333be8a3e9d3b2cb0e05ad345"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From b64607a3de57b5dba61d5c9caaeb716c8010a5c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 13 Mar 2022 15:42:25 +0100
Subject: [PATCH 0182/2561] linux5.10: update to 5.10.105.

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

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index 5294c39d31d5..f5587464698f 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.99 Kernel Configuration
+# Linux/arm64 5.10.105 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -419,6 +419,7 @@ CONFIG_CRASH_DUMP=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index d12ac8cfdb27..305d9822a51c 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.103
+version=5.10.105
 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=4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a
+checksum=3ddc0e0ab2b9cadb64df43141e0a1e5432b5963ed50f34d586c065ac8d4fcb85
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 1209bf5d9a6bbb1c002b6daaee46ef69be930cbf Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 29 Jan 2022 14:37:43 +0100
Subject: [PATCH 0183/2561] praat: update to 6.2.09

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

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index b64c721ab717..ac2777a445cc 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.2.04
+version=6.2.09
 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=65c8a70d02760fdf36e04d892412441d8d338867db30d593aea1c202aa937c24
+checksum=3c38b8af267b152a3fda1af78fe8cc26a1717f70a886387e657c55746f666af1
 
 # 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
@@ -34,13 +34,11 @@ do_build() {
 
 		cp makefiles/makefile.defs.linux.${_variant} ./makefile.defs
 		sed -i -e 's/$(LIBS)/& $(LDFLAGS)/' Makefile
-		sed -i -e 's/CC = gcc/CC = "${CC}"/' \
-		 -e 's/CXX = g++/CXX = "${CXX}"/' \
-		 -e 's/LINK = g++/LINK = "${CXX}"/' \
-		 -e 's/AR = ar/AR = "${AR}"/' \
+		sed -i -e 's/AR = ar/AR = "${AR}"/' \
 		 -e 's/-O\(1\|3\)//' \
 		 -e 's/CFLAGS =/CFLAGS +=/' \
 		 -e 's/CXXFLAGS =/CXXFLAGS +=/' \
+		 -e 's/-no-pie//' \
 		 makefile.defs
 
 		if [ $XBPS_TARGET_ENDIAN == "le" ]; then

From d6150319bff3b89e651b82940b5accba5d8cc6c2 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 3 Jan 2022 09:48:03 +0100
Subject: [PATCH 0184/2561] dhcpcd: update to 9.4.1.

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

diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index e651bd019067..12be60c1efcf 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,6 +1,6 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=9.4.0
+version=9.4.1
 revision=1
 build_style=configure
 make_check_target=test
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/dhcpcd"
 distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz"
-checksum=41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513
+checksum=819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c
 lib32disabled=yes
 conf_files=/etc/dhcpcd.conf
 

From 0ab56de207750e665913bce87d93f196afa5fb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 11 Mar 2022 17:27:59 +0100
Subject: [PATCH 0185/2561] kopia: update to 0.10.6.

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

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index e366eb0282b5..056235ef545f 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,6 +1,6 @@
 # Template file for 'kopia'
 pkgname=kopia
-version=0.10.5
+version=0.10.6
 revision=1
 build_style=go
 build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="Apache-2.0"
 homepage="https://kopia.io/"
 distfiles="https://github.com/kopia/kopia/archive/v${version}.tar.gz"
-checksum=3d6418e6909050204078e389fe2ecb3e6080e3185378eba243c4101cc873c770
+checksum=07df866ff4a2662f503a1348fe02bb62e6cf195260217d7e1234b03ff7b27797
 
 post_install() {
 	for shell in bash zsh; do

From 3f8ab64d9e8aeb64b5b52882a4949be69152b51e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Mar 2022 12:23:13 +0400
Subject: [PATCH 0186/2561] python3-curl: update to 7.45.0, adopt.

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

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 9bba5853691b..ea7831c2f087 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
-version=7.44.1
+version=7.45.0
 revision=1
 wrksrc="pycurl-${version}"
 build_style=python3-module
@@ -8,12 +8,12 @@ hostmakedepends="python3-devel"
 makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 depends="python3"
 short_desc="Python3 interface to cURL library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later, MIT"
 homepage="http://pycurl.io/"
 changelog="https://raw.githubusercontent.com/pycurl/pycurl/master/ChangeLog"
 distfiles="${PYPI_SITE}/p/pycurl/pycurl-${version}.tar.gz"
-checksum=5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8
+checksum=5036c53c6f4106e9160d053a4baa3433a0215fb3386073e211273c56a3a95f3d
 
 pre_build() {
 	vsed -i "/setup_args\['data_files'\] = /d" setup.py

From 35e45ba1712b94998e16613cfdd69131aaeebac2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 11 Mar 2022 20:56:32 -0500
Subject: [PATCH 0187/2561] procs: update to 0.12.1.

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

diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index 309ff8c6f5c9..84e47b23614b 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,6 +1,6 @@
 # Template file for 'procs'
 pkgname=procs
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/dalance/procs"
 changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md"
 distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz"
-checksum=04dbb3ddc734a9d1305b26b546a913e3e04d556b5863212a2675d29268aebed3
+checksum=ce84e98dd85cb8d5afda871ad2ddceb4faec077d9e019469aa668a75821e4fc2
 
 post_build() {
 	PROCS="target/${RUST_TARGET}/release/procs"

From 99c8a5c4bd2aa00d86ae66e6b3bc08c47f5a74ea Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Thu, 10 Mar 2022 11:21:59 -0600
Subject: [PATCH 0188/2561] Signal-Desktop: update to 5.35

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

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 97cac6378e09..038af9b6e175 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.34.0
+version=5.35.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=54d81b6fa1be05d60a840b9ffcf3f8fc1642863c0a5a6ec2cfa3e02ff6e9e31d
+checksum=12d4766356d50f4eaff907a738860be91bf4c012fd2db62d00757078923dca67
 nostrip_files="signal-desktop"
 
 post_extract() {

From 98576fa34f377e4c4dd4ab10ad51600ce87c84a0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 11 Mar 2022 10:44:50 -0500
Subject: [PATCH 0189/2561] texlab: update to 3.3.2, restore cross.

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

diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
index 6e60a74ebf9f..8891cb68bf1c 100644
--- a/srcpkgs/texlab/template
+++ b/srcpkgs/texlab/template
@@ -1,6 +1,6 @@
 # Template file for 'texlab'
 pkgname=texlab
-version=3.3.1
+version=3.3.2
 revision=1
 build_style=cargo
 short_desc="Implementation of the Language Server Protocol for LaTeX"
@@ -9,8 +9,7 @@ license="GPL-3.0-or-later"
 homepage="https://texlab.netlify.app/"
 changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md"
 distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz"
-checksum="a39766f497dfb2cf9e370ddc430b7d275cb055b4d8a0751d718a86072747a75c"
-nocross=yes # https://github.com/void-linux/void-packages/issues/34889
+checksum=380395a37ee2ece590c0db04ac4898f5f430ee37d0ab0fa0801805167fff066a
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="smartstring fails to compile"

From c559fdef7d694d6432fd4546051ab027d1c11f99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 11 Mar 2022 19:22:20 -0500
Subject: [PATCH 0190/2561] just: update to 1.1.0.

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

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 156d04e3120d..436ea6d5d455 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.0.1
+version=1.1.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/refs/tags/${version}.tar.gz"
-checksum=261532a3b72b34a79df01bb0c4a366bcc3fd870c5706340fec260faebddb42c6
+checksum=b0eaf3c7da507be9ad8e0ce050a10459eeead72b94d50bc3261e3dcda516b03a
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 23458584c645eabecd09d54d7cf1ef2021169e9f Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Thu, 10 Mar 2022 17:40:25 -0600
Subject: [PATCH 0191/2561] kubernetes-kind: update to 0.12.0.

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

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 810e9935e3dd..c40e1a1f98f2 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
-version=0.11.1
+version=0.12.0
 revision=1
 wrksrc="kind-${version}"
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
 license="Apache-2.0"
 homepage="https://kind.sigs.k8s.io/"
 distfiles="https://github.com/kubernetes-sigs/kind/archive/v${version}.tar.gz"
-checksum=95ce0e7b01c00be149e5bd777936cef3f79ba7f1f3e5872e7ed60595858a2491
+checksum=cd1d09921b3c8a0f58c6423e5706be0c6e556f0c3d2b9e62f42be59263b209bb
 _completions="bash zsh fish"
 
 post_build() {

From 80c268226d25abf4ed6b5c9007c8b2eabca2e370 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 28 Feb 2022 20:32:26 -0600
Subject: [PATCH 0192/2561] gns3-server: update to 2.2.31.

---
 srcpkgs/gns3-server/patches/requirements.patch | 17 ++++++++++-------
 srcpkgs/gns3-server/template                   |  6 +++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch
index 1c61d2dd6ae1..4cfa85b16ba2 100644
--- a/srcpkgs/gns3-server/patches/requirements.patch
+++ b/srcpkgs/gns3-server/patches/requirements.patch
@@ -1,18 +1,21 @@
 diff --git a/requirements.txt b/requirements.txt
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,9 +1,8 @@
+@@ -1,12 +1,11 @@
 -jsonschema==3.2.0
 +jsonschema>=3.2.0
 -aiohttp==3.7.4.post0
 +aiohttp>=3.7.4
  aiohttp-cors==0.7.0
--aiofiles==0.7.0
-+aiofiles>=0.8.0
--Jinja2==3.0.1
-+Jinja2>=3.0.1
--sentry-sdk==1.3.1
--psutil==5.8.0
+ aiofiles==0.8.0
+-Jinja2==3.0.3
++Jinja2>=3.0.3
+-sentry-sdk==1.5.4
+-psutil==5.9.0
 +psutil>=5.9.0
  async-timeout==3.0.1
  distro==1.6.0
+ py-cpuinfo==8.0.0
+-setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
++setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
+ setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 1845cc2e3fcf..038457a27a3b 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.29
-revision=2
+version=2.2.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=34237771bb743ac9142569e67284123b6090f78cfd802a729e2f11b9d5d48929
+checksum=10a530866a156cea6b544be9b557f61ca0baa7e58c3064d79a1d523b70301edc
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From 193490e2963f774490df6a6c45fd35dd1b43da91 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 28 Feb 2022 20:32:36 -0600
Subject: [PATCH 0193/2561] gns3-gui: update to 2.2.31.

---
 srcpkgs/gns3-gui/patches/requirements.patch | 9 ++++++---
 srcpkgs/gns3-gui/template                   | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch
index d594ea77de5b..ab3d55dea830 100644
--- a/srcpkgs/gns3-gui/patches/requirements.patch
+++ b/srcpkgs/gns3-gui/patches/requirements.patch
@@ -1,10 +1,13 @@
 diff --git a/requirements.txt b/requirements.txt
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,4 +1,3 @@
+@@ -1,6 +1,5 @@
 -jsonschema==3.2.0
 +jsonschema>=3.2.0
--sentry-sdk==1.3.1
--psutil==5.8.0
+-sentry-sdk==1.5.4
+-psutil==5.9.0
 +psutil>=5.9.0
  distro==1.6.0
+-setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
++setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
+ setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index a4d9d410e3fc..175eab41080c 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.29
-revision=2
+version=2.2.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=5b9b6db1917af66d0e4bf32c41ff17d6a03a487a2a870d18b04e68e7b572bf28
+checksum=7b6f041f88a63dc44e33680ea489556abc7d96d1c3d4bb5d85dd15b15db6d036
 
 post_install() {
 	vinstall gns3-gui.desktop 644 usr/share/applications

From 56ed1528f535f3e10f78bf0b58e8839229950952 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 12 Mar 2022 21:24:39 +0100
Subject: [PATCH 0194/2561] sqlite: update to 3.38.1.

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

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 8760d30aee97..0ef5405dfa66 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.0
+version=3.38.1
 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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68
+checksum=8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From 8fc968f39ed101e1ab45964c4fc1fe32c2e0379a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 26 Feb 2022 14:52:18 +0100
Subject: [PATCH 0195/2561] xterm: update to 372.

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

diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 0af0328c6f96..ed4be0755e8f 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=370
+version=372
 revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -17,11 +17,10 @@ makedepends="libXaw-devel libXft-devel libutempter-devel libxkbfile-devel
 short_desc="X Terminal Emulator"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT, X11"
-homepage="http://invisible-island.net/xterm/"
-changelog="http://invisible-island.net/xterm/xterm.log.html"
-# using HTTP TEMPORARILY due to cert issues
-distfiles="http://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=963c5d840a0f0f4c077ff284586e8b1f83f3f983dca6f74f4b361975b5388c82
+homepage="https://invisible-island.net/xterm/"
+changelog="https://invisible-island.net/xterm/xterm.log.html"
+distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
+checksum=c6d08127cb2409c3a04bcae559b7025196ed770bb7bf26630abcb45d95f60ab1
 
 post_install() {
 	for f in {u,}xterm.desktop; do

From 0e547aa0d6aacee369f470be4394419c5b80280b Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 10 Mar 2022 12:39:11 +0100
Subject: [PATCH 0196/2561] fscrypt: update to 0.3.3.

---
 srcpkgs/fscrypt/template | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index 87799d6b9c14..50849c9f7070 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,10 +1,11 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
-version=0.2.9
+version=0.3.3
 revision=1
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"
+go_ldflags="-X main.version=v${version}"
 hostmakedepends="m4"
 makedepends="pam-devel"
 short_desc="Tool for managing Linux filesystem encryption"
@@ -12,9 +13,13 @@ maintainer="Andrea Brancaleoni <abc@pomel.me>"
 license="Apache-2.0"
 homepage="https://github.com/google/fscrypt"
 distfiles="https://github.com/google/fscrypt/archive/v${version}.tar.gz"
-checksum=36f1166d9886548b0d72beeeffb9ca8fb5b28b63a42b369923bc3f0bea78bb3d
+checksum=7485232dc4c48d8db262e0280b34b3c869e7b6f41f8ee8601ebfe04297796410
 conf_files="/etc/pam.d/fscrypt"
 
+do_check() {
+	make test
+}
+
 post_install() {
 	# build and install the PAM module
 	LDFLAGS= make PREFIX=/usr DESTDIR=${DESTDIR} install-pam
@@ -22,4 +27,8 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/share/pam-configs/
 	# add PAM config file
 	vinstall ${FILESDIR}/pam_config 644 etc/pam.d fscrypt
+
+	vcompletion cmd/fscrypt/fscrypt_bash_completion bash
+
+	vdoc README.md
 }

From a7c1c226b06216533734789b549c9d1194a5b316 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 22:43:50 +0100
Subject: [PATCH 0197/2561] libgusb: update to 0.3.10.

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

diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 0064f3f07e51..6860869a82c9 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -1,6 +1,6 @@
 # Template file for 'libgusb'
 pkgname=libgusb
-version=0.3.7
+version=0.3.10
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ 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=da5f25d6873622689b3351486cbe028efc254403f646dd81225dfe8542d8c67d
+checksum=0eb0b9ab0f8bba0c59631c809c37b616ef34eb3c8e000b0b9b71cf11e4931bdc
 # requires access to USB devices, not available on CI
 make_check=ci-skip
 

From ea8e4bfe0e31195c9c28a0adaf206379e5cfcc38 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:02 +0200
Subject: [PATCH 0198/2561] skalibs: update to 2.11.2.0.

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

diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index 8b6b7b79227c..bac3772b161c 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,6 +1,6 @@
 # Template file for 'skalibs'
 pkgname=skalibs
-version=2.11.1.0
+version=2.11.2.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --enable-static --enable-shared
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/skalibs/"
 changelog="https://skarnet.org/software/skalibs/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=400180b4d5b651e4fafaf0297b933f5f863b467d357f5b36a6545cf6eb14eab9
+checksum=649cf3236fe3103f45366b6196b1bcd0457c9c17ca86f2b80007696a2baa7b77
 
 post_install() {
 	vlicense COPYING LICENSE

From 46a780352c93d645d0364dbbdce684da81494e4f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:08 +0200
Subject: [PATCH 0199/2561] execline: update to 2.8.3.0.

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

diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index b938a86b8018..f27c5a33e5fb 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,6 +1,6 @@
 # Template file for 'execline'
 pkgname=execline
-version=2.8.2.0
+version=2.8.3.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/execline/"
 changelog="https://skarnet.org/software/execline/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=2fdf7607f306e94fe42ebe2b49872d0f654aa2297a576d5a2d8037d4d9583341
+checksum=235dbecd594c82e0523c87c2eacf04c48781b39264158f57049f1a1ff8b4ad80
 
 CFLAGS="-fPIC"
 

From 347b6229d8cbf8078e7a69c906e7338081aa6f1d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:12 +0200
Subject: [PATCH 0200/2561] s6: update to 2.11.1.0.

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

diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index 863800141414..5812c18784b0 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,6 +1,6 @@
 # Template file for 's6'
 pkgname=s6
-version=2.11.0.1
+version=2.11.1.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -15,7 +15,7 @@ license="ISC"
 homepage="http://skarnet.org/software/s6/"
 changelog="https://skarnet.org/software/s6/upgrade.html"
 distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=ad7f204587634eeb20ef8f7a7beb6dd63ba3080a46a3a650448ca7cc0826f90a
+checksum=ae64dc2ba208ff80e4ac4792ce90dd526b42bf19c966dc7d8eb9a6870e4bc23a
 
 build_options="static"
 

From aaf08da24fe0fa36f18cda760a322669efb60683 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:18 +0200
Subject: [PATCH 0201/2561] s6-portable-utils: update to 2.2.4.0.

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

diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index 4f775e6459e8..e7de2cf69b93 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,6 +1,6 @@
 # Template file for 's6-portable-utils'
 pkgname=s6-portable-utils
-version=2.2.3.4
+version=2.2.4.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-portable-utils/"
 changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=37ba98f727a9e382bf742af32ddbd8464c226a13a0a51bef586c28d57c8ac912
+checksum=cb1eea89f0311006f0132aa45324ff96fa7756d11a5f4366c68d084839e5a56f
 
 build_options="static"
 

From b0f0f83c799557500c1404e2456e29746cd9b755 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 8 Mar 2022 19:33:53 +0100
Subject: [PATCH 0202/2561] pass-git-helper: update to 1.2.0.

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

diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template
index eaf7d1f49ab0..863a14a28137 100644
--- a/srcpkgs/pass-git-helper/template
+++ b/srcpkgs/pass-git-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'pass-git-helper'
 pkgname=pass-git-helper
-version=1.1.2
-revision=2
+version=1.2.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pass python3-xdg"
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/languitar/pass-git-helper"
 distfiles="https://github.com/languitar/${pkgname}/archive/v${version}.tar.gz"
-checksum=4acfb486d0873014376383167792ee2b46926386718eb2331a1b4564576a2076
+checksum=d9ab12d81e283411a65285a0030cbfef2548dc580631d2337628e57f10e463aa

From f28a100d7776dae8c3ab9a03d0e63fa69ccc32c4 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 8 Mar 2022 19:29:11 +0100
Subject: [PATCH 0203/2561] py3status: update to 3.41.

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

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 092ccfbe2bd9..13a91c28109b 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.40
+version=3.41
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=84885ec8a43626dcd7576b9cad029406c98675ca00ba66ff124d7607290d2b66
+checksum=9728ff6913a13087201c73f682f67afcd8dc73a71b044d6833737ee227ad5fba
 
 post_install() {
 	vlicense LICENSE

From e884d14036a7ae925eb64a8dc7759ce54befc06e Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 10:03:27 +0100
Subject: [PATCH 0204/2561] openimagedenoise: update to 1.4.3.

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

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 59bbde5bf3ab..15c98835c051 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.2
-revision=3
+version=1.4.3
+revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
 build_style=cmake
@@ -11,8 +11,9 @@ short_desc="Intel(R) Open Image Denoise library"
 maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
+changelog="https://github.com/OpenImageDenoise/oidn/blob/master/CHANGELOG.md"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=e70d27ce24b41364782376c1b3b4f074f77310ccfe5f8ffec4a13a347e48a0ea
+checksum=3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a
 
 do_check() {
 	build/oidnTest

From f86f73a82c98cd246178b756bd6f17a2f5386362 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Sun, 6 Mar 2022 16:24:32 +0530
Subject: [PATCH 0205/2561] touchegg: update to 2.0.13

---
 srcpkgs/touchegg/patches/musl.patch       | 24 -------------------
 srcpkgs/touchegg/patches/no-systemd.patch | 28 -----------------------
 srcpkgs/touchegg/template                 |  6 +++--
 3 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/touchegg/patches/musl.patch
 delete mode 100644 srcpkgs/touchegg/patches/no-systemd.patch

diff --git a/srcpkgs/touchegg/patches/musl.patch b/srcpkgs/touchegg/patches/musl.patch
deleted file mode 100644
index 8504cfa2f8c0..000000000000
--- a/srcpkgs/touchegg/patches/musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From da9a3a95cfe9965ff6e15e3a0e1a98f8840a34d7 Mon Sep 17 00:00:00 2001
-From: Alexander Gehrke <void@qwertyuiop.de>
-Date: Tue, 25 May 2021 23:47:51 +0000
-Subject: [PATCH] Fix missing header for musl
-
----
- src/utils/client-lock.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/utils/client-lock.cpp b/src/utils/client-lock.cpp
-index fb1e67b..27c6c6a 100644
---- a/src/utils/client-lock.cpp
-+++ b/src/utils/client-lock.cpp
-@@ -19,6 +19,7 @@
- 
- #include <sys/file.h>
- #include <unistd.h>
-+#include <fcntl.h>
- 
- #include <exception>
- #include <stdexcept>
--- 
-2.31.1
-
diff --git a/srcpkgs/touchegg/patches/no-systemd.patch b/srcpkgs/touchegg/patches/no-systemd.patch
deleted file mode 100644
index efd2ca83347d..000000000000
--- a/srcpkgs/touchegg/patches/no-systemd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 938167799926ad70849d8088bdef023b5e8a0700 Mon Sep 17 00:00:00 2001
-From: Alexander Gehrke <void@qwertyuiop.de>
-Date: Tue, 25 May 2021 20:11:29 +0000
-Subject: [PATCH] Fix CMake failing because of missing Systemd service dir
-
----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dee220d..13b773f 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,11 +76,6 @@ include(GNUInstallDirs)
- set(SYSTEM_CONFIG_FILE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/touchegg/touchegg.conf")
- target_compile_definitions(touchegg PUBLIC SYSTEM_CONFIG_FILE_PATH=\"${SYSTEM_CONFIG_FILE_PATH}\")
- 
--# configure systemd service unit to use the right path, e.g. @CMAKE_INSTALL_BINDIR@/touchegg
--configure_file(${PROJECT_SOURCE_DIR}/installation/touchegg.service.in ${PROJECT_SOURCE_DIR}/installation/touchegg.service @ONLY)
--pkg_get_variable(SYSTEMD_SERVICE_DIR systemd systemdsystemunitdir)
--
- install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.conf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/touchegg) # /usr/share/touchegg/touchegg.conf
--install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.service DESTINATION ${SYSTEMD_SERVICE_DIR})
- install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.desktop DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart)
- install(PROGRAMS ${PROJECT_BINARY_DIR}/touchegg DESTINATION ${CMAKE_INSTALL_BINDIR}) # /usr/bin/touchegg
--- 
-2.31.1
-
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index 538277a2c683..a8526763517f 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,8 +1,9 @@
 # Template file for 'touchegg'
 pkgname=touchegg
-version=2.0.9
+version=2.0.13
 revision=1
 build_style=cmake
+configure_args="-DUSE_SYSTEMD=false"
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel
  libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel"
@@ -10,8 +11,9 @@ short_desc="Multitouch gesture recognizer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/JoseExposito/touchegg"
+changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
 distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=efff0f2011078cea15f2f130d1501714f8e3f82b7e883e81eccf956ac7966d0e
+checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
 system_accounts="_touchegg"
 
 post_install() {

From 920e8dc24087d595896def72a92d254a776c198f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Mar 2022 12:39:20 +0200
Subject: [PATCH 0206/2561] LGOGDownloader: update to 3.9.

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

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 208d25192c4e..6e7e5c685f83 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,6 +1,6 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
-version=3.8
+version=3.9
 revision=1
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"
 homepage="https://github.com/Sude-/lgogdownloader"
 distfiles="https://github.com/Sude-/lgogdownloader/archive/v${version}.tar.gz"
-checksum=8e4cf5268cee76bb2addf5e7720b230b43b21d6e995d24407da9ca0fcd02df35
+checksum=4ab9fe89b47bde7744d5100663c7822de74bb161e2790baddede8146056430b1
 
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 2ab3f9e79e2a7d8e6627a39cb10a184221daa205 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Mar 2022 12:32:25 +0200
Subject: [PATCH 0207/2561] rage-player: update to 0.4.0.

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

diff --git a/srcpkgs/rage-player/template b/srcpkgs/rage-player/template
index c81765b0b5e5..656227dbf3ed 100644
--- a/srcpkgs/rage-player/template
+++ b/srcpkgs/rage-player/template
@@ -1,7 +1,7 @@
 # Template file for 'rage-player'
 pkgname=rage-player
-version=0.3.1
-revision=2
+version=0.4.0
+revision=1
 wrksrc="rage-${version}"
 build_style=meson
 hostmakedepends="pkg-config efl-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.enlightenment.org/about-rage"
 distfiles="https://download.enlightenment.org/rel/apps/rage/rage-${version}.tar.xz"
-checksum=e5c434ef415ec1dd268399c527f582baeef39a25dee52f828876bfb58698cd11
+checksum=7ce58419aa5197aa6c33f2e3f9eb9d78ff379cae863d5fa114fd1428d5a1ca0f
 
 post_install() {
 	vlicense COPYING

From ed07c5ba07a2c6698176dbb9404ce84cb3bc481b Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:34:45 -0800
Subject: [PATCH 0208/2561] gammastep: update to 2.0.8

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

diff --git a/srcpkgs/gammastep/template b/srcpkgs/gammastep/template
index 1a12e16e3a97..1f24e8383904 100644
--- a/srcpkgs/gammastep/template
+++ b/srcpkgs/gammastep/template
@@ -1,11 +1,11 @@
 # Template file for 'gammastep'
 pkgname=gammastep
-version=2.0.7
-revision=2
+version=2.0.8
+revision=1
 wrksrc="${pkgname}-v$version"
 build_style=gnu-configure
 configure_args="--enable-gui --enable-drm --enable-vidmode --enable-randr
- --enable-wayland --enable-apparmor --with-systemdunitdir=no
+ --enable-wayland --enable-apparmor --with-systemduserunitdir=no
  $(vopt_enable geoclue2)"
 hostmakedepends=" tar automake libtool gettext-devel intltool pkg-config
  python3-devel wayland-devel"
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.com/chinstrap/gammastep"
 changelog="https://gitlab.com/chinstrap/gammastep/raw/master/NEWS.md"
 distfiles="${homepage}/-/archive/v$version/${pkgname}-v$version.tar.gz"
-checksum=b3dc1d515088ef5578da009c4b70b22f9702397a6a21bbba79f1c01793a90e73
+checksum=46535cbeba2ec0e6e18a33f7c1bdec3f520230441e7cdff318d3cf612160bd76
 build_options="geoclue2"
 build_options_default="geoclue2"
 

From b51348097128686f9268d6a4e157fd79b2777d96 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 14 Mar 2022 02:36:47 +0100
Subject: [PATCH 0209/2561] abcm2ps: update to 8.14.13.

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

diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template
index 31a97e4daec5..1199fa010fd2 100644
--- a/srcpkgs/abcm2ps/template
+++ b/srcpkgs/abcm2ps/template
@@ -1,6 +1,6 @@
 # Template file for 'abcm2ps'
 pkgname=abcm2ps
-version=8.14.12
+version=8.14.13
 revision=1
 build_style=configure
 hostmakedepends="pkg-config python3-docutils which"
@@ -10,7 +10,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-or-later"
 homepage="http://moinejf.free.fr/"
 distfiles="https://github.com/leesavide/abcm2ps/archive/v${version}.tar.gz"
-checksum=f98701bc25f52e98a9283d0cef04591351b62ff8dc80fa54bb21467d60886feb
+checksum=8db29e33f30fce609ddffeb641c3bfe60ae5d16c3305402157ddc88bcaaf0c5b
 
 pre_configure() {
 	echo CC=${CC} >> custom

From 8bdd3cf2f7489363f12b0e51415829488bc9dcb6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 23 Feb 2022 23:55:47 -0500
Subject: [PATCH 0210/2561] common/build-helper/rust.sh: fix cross for bindgen

When using a build.rs script to dynamically generate bindgen bindings
at build-time, it will run on the host, and by default bindgen will
generate bindings for the host arch/libc instead of the target.
To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS
to specify the proper sysroot and include path for the target.
These arguments are not used for anything other than bindgen's clang
invocation.
---
 common/build-helper/rust.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 431cb5f0fd43..798083709c3e 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then
 	# innocuous flags are used here just to disable its defaults
 	export HOST_CC="gcc"
 	export HOST_CFLAGS="-O2"
+
+	# Crates that use bindgen via build.rs are not cross-aware unless these are set
+	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
 else
 	unset CARGO_BUILD_TARGET
 fi

From aa7ba36500127d7ad481df03cc466ef1fb74576f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 24 Feb 2022 00:07:36 -0500
Subject: [PATCH 0211/2561] New package: helvum-0.3.4

---
 srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++
 srcpkgs/helvum/template                    | 46 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
 create mode 100644 srcpkgs/helvum/template

diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..17f0f17f8875
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/helvum-0.3.4/pipewire/src/loop_.rs b/helvum-0.3.4/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/helvum-0.3.4/pipewire/src/loop_.rs
++++ b/helvum-0.3.4/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+         fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+             spa_sys::timespec {
+                 tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+-                tv_nsec: duration.subsec_nanos().into(),
++                tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+             }
+         }
+ 
+-- 
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..49ad2dd6013a
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,46 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+_pipewire_rs_version=0.4.1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+license="GPL-3.0-only"
+homepage="https://gitlab.freedesktop.org/pipewire/helvum"
+distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/archive/v${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+	pushd $build_wrksrc
+	echo "[patch.crates-io]" >> Cargo.toml
+	for crate in pipewire pipewire-sys libspa libspa-sys; do
+		mv ../pipewire-rs-*/$crate $crate
+		echo "$crate = { path = './$crate' }" >> Cargo.toml
+	done
+	popd
+}
+
+post_install() {
+	# Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
+	# This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
+	# On update, all meson.build files should be checked for changes
+	_app_id='org.pipewire.Helvum'
+	vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+	vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+	vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+	vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+	vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+	vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}

From 0aa55b61ee21b9dfebbee43e84db4cbedb5da804 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 14 Mar 2022 09:41:16 +0100
Subject: [PATCH 0212/2561] vale: update to 2.15.2

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

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

From 2c5785c6126fa59c049e57d10952032dcca1fcaf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 14 Mar 2022 12:52:21 +0100
Subject: [PATCH 0213/2561] weechat: update to 3.4.1.

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

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index a496a6412e85..c5898cbf3091 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=3.4
-revision=2
+version=3.4.1
+revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=7cd3dcc7029e888de49e13ebbcc3749586ff59c9d97f89f5eeb611067c7bb94c
+checksum=7e088109ad5dfbcb08a9a6b1dd70ea8236093fed8a13ee9d9c98881d7b1aeae7
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"

From fab87feb50eed34505e3f80ce332f1bed6113fd7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 14 Mar 2022 12:55:55 +0100
Subject: [PATCH 0214/2561] ugrep: update to 3.7.5.

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

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

From 29aaea52b3ff0cd052f1ff3f9d6a661c55897483 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 14 Mar 2022 12:55:58 +0100
Subject: [PATCH 0215/2561] nncp: update to 8.7.2.

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

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index e6d62ac2f55f..9dd39f4ee3af 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=8.7.1
+version=8.7.2
 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=ceb4d197af5a8d9e93b749d5c0f50b53e6746a318af47b364bf5cb323d6c4ebd
+checksum=a0eec9b0f33059de33f13084599805d0f4a1c8c379e925bacfe8dc94d1ddc23d
 
 do_build() {
 	make

From c042eee926da06698776267bf8a13bd1fe9d7fbc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 14 Mar 2022 15:32:20 +0100
Subject: [PATCH 0216/2561] zchunk: update to 1.2.1.

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

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 07c43561ec28..e8679bcbabc4 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,6 +1,6 @@
 # Template file for 'zchunk'
 pkgname=zchunk
-version=1.2.0
+version=1.2.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -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=8c9eca82845b656ccae5c0e9dc097cd7a6830981e2529677ce9a5617a1f50321
+checksum=9639942cf36f4f36d3b635d36d5164682249cc0240015569ac948db1584499b5
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"

From 351351e37f8181c6195cdc6eaaafce359567916a Mon Sep 17 00:00:00 2001
From: Christopher Brannon <chris@the-brannons.com>
Date: Mon, 14 Mar 2022 09:41:00 -0700
Subject: [PATCH 0217/2561] tinyssh: update to 20220305.

This release contains a fix for
https://github.com/janmojzis/tinyssh/issues/63
---
 srcpkgs/tinyssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index a2e1012a9c0e..05245c35db62 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,6 +1,6 @@
 # Template file for 'tinyssh'
 pkgname=tinyssh
-version=20220101
+version=20220305
 revision=1
 build_style=gnu-makefile
 make_dirs="/etc/tinyssh 0755 root root"
@@ -10,7 +10,7 @@ maintainer="Christopher Brannon <chris@the-brannons.com>"
 license="Public Domain"
 homepage="https://tinyssh.org"
 distfiles="https://github.com/janmojzis/tinyssh/archive/${version}.tar.gz"
-checksum=b68e5b8d1f72304d70b25b53dd221cdc0a25730695bf4e8e08e27ece9dcb499d
+checksum=26e1f14ee865fc48c173f51efa03aeeb72c44f102a0084ff267693406bd7aebe
 
 if [ -n "${CROSS_BUILD}" ] ; then
 	make_build_target=cross-compile

From 8675a9577c7405980611524b13f80387adde8499 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 14 Mar 2022 09:20:08 +0100
Subject: [PATCH 0218/2561] nbd: update to 3.24

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

diff --git a/srcpkgs/nbd/template b/srcpkgs/nbd/template
index 79c9bdf8c315..a36cb448e89c 100644
--- a/srcpkgs/nbd/template
+++ b/srcpkgs/nbd/template
@@ -1,6 +1,6 @@
 # Template file for 'nbd'
 pkgname=nbd
-version=3.23
+version=3.24
 revision=1
 build_style=gnu-configure
 configure_args="--enable-syslog"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://nbd.sourceforge.io/"
 distfiles="${SOURCEFORGE_SITE}/nbd/nbd-${version}.tar.gz"
-checksum=3c969cd9cf83dae9276f999b7ff8e31e32411c8cc751221e698861bc05b8f76c
+checksum=a771022599525fd4f5c17c7b1c88696a91927c227e770425a55f67a7384441b6
 
 system_accounts="nbd"
 nbd_homedir="/var/chroot"

From 9633fa8ee393388dae97889c701639946c2c89b7 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 21 Feb 2022 18:48:26 +0300
Subject: [PATCH 0219/2561] nodejs-lts: update to 12.22.10.

---
 srcpkgs/nodejs-lts/template | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 5155f8ef1489..7ef99575a323 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -46,11 +46,6 @@ esac
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
-post_patch() {
-	# XXX Drop after c-ares 1.17.3 has been released.
-	vsed -i -e 's:<ares_nameser.h>:<arpa/nameser.h>:g' src/cares_wrap.cc
-}
-
 do_configure() {
 	local _args
 

From 05873892855c2dafb54eae1ae99d85f26cba1b60 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Fri, 11 Mar 2022 00:36:25 +1100
Subject: [PATCH 0220/2561] Ice: orphan package(s)

---
 srcpkgs/Ice/template        | 2 +-
 srcpkgs/zeroc-mcpp/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index f85b38df28d6..31b15fbb4d92 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -10,7 +10,7 @@ make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
  openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
-maintainer="a dinosaur <nick@a-dinosaur.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, custom:ICE"
 homepage="https://www.zeroc.com"
 distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz"
diff --git a/srcpkgs/zeroc-mcpp/template b/srcpkgs/zeroc-mcpp/template
index db9b9cc8e12b..048d464ab2ce 100644
--- a/srcpkgs/zeroc-mcpp/template
+++ b/srcpkgs/zeroc-mcpp/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="LIBDIR=lib"
 make_install_args="LIBDIR=lib"
 short_desc="Simplified fork of mcpp from ZeroC, for building ICE"
-maintainer="a dinosaur <nick@a-dinosaur.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/zeroc-ice/mcpp"
 distfiles="https://github.com/zeroc-ice/mcpp/archive/v${version}.tar.gz"

From 833359d12d651b1fe75d9d225173fd1ce489e725 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 14:13:24 +0100
Subject: [PATCH 0221/2561] nlopt: update to 2.7.1.

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

diff --git a/srcpkgs/nlopt/template b/srcpkgs/nlopt/template
index d43d4a4f287c..38c5ab972a87 100644
--- a/srcpkgs/nlopt/template
+++ b/srcpkgs/nlopt/template
@@ -1,14 +1,14 @@
 # Template file for 'nlopt'
 pkgname=nlopt
-version=2.6.2
+version=2.7.1
 revision=1
 build_style=cmake
 short_desc="FOSS library for nonlinear optimization"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://ab-initio.mit.edu/wiki/index.php/NLopt"
+homepage="https://nlopt.readthedocs.io"
 distfiles="https://github.com/stevengj/nlopt/archive/v${version}.tar.gz"
-checksum=cfa5981736dd60d0109c534984c4e13c615314d3584cf1c392a155bfe1a3b17e
+checksum=db88232fa5cef0ff6e39943fc63ab6074208831dc0031cf1545f6ecd31ae2a1a
 
 post_install() {
 	vlicense COPYING

From 39a0708b600f5890758ed5d410d56365445c0863 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Mon, 14 Mar 2022 21:37:11 +0100
Subject: [PATCH 0222/2561] slack-desktop: update to 4.24.0

Closes: #36141 [via git-merge-pr]
---
 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 8750d2687f69..b90525004d6c 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.23.0
+version=4.24.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://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=3a823be14d9aaea2ef565ac6c3fc62580a10775bcc1eadcc62c3256999ea59f3
+checksum=b557d264ae68cafe383d647dfd26f366ee94315f77132f64bff8f9ef44635197
 restricted=yes
 repository="nonfree"
 nopie=yes

From 69ff4ef67357114399aaff26d942593336ac8eda Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 15 Mar 2022 14:14:22 +0100
Subject: [PATCH 0223/2561] python3-boto3: update to 1.21.19.

---
 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 dce13428ee55..b96fa86eb165 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.21.8
+version=1.21.19
 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=00a0df9ee9ff1cca084d99004f67cdfb3ec63102b1e554077791698c4f10b4e0
+checksum=fb04acb6eb998652eb52381a580d3624490982a7b17d6080b0d78163874962b7
 
 post_install() {
 	vlicense LICENSE

From f54cf9b026ae9d5e7deeac1ddc6e828ab81abcc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 14 Mar 2022 23:06:17 +0100
Subject: [PATCH 0224/2561] mpd: update to 0.23.6.

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

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index eeb298abfa1e..b34c78c11815 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.23.5
-revision=2
+version=0.23.6
+revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
@@ -39,7 +39,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299
+checksum=cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From d74d93282242287ecf66b045b10c236353046c96 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Mon, 25 Oct 2021 19:42:25 +0200
Subject: [PATCH 0225/2561] New package: qrcp-0.9.1

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

diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
new file mode 100644
index 000000000000..0e690a7073be
--- /dev/null
+++ b/srcpkgs/qrcp/template
@@ -0,0 +1,18 @@
+# Template file for 'qrcp'
+pkgname=qrcp
+version=0.9.1
+revision=1
+build_style=go
+go_import_path=github.com/claudiodangelis/qrcp
+go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}
+ -X github.com/claudiodangelis/qrcp/version.date=$(date -d@$SOURCE_DATE_EPOCH +%Y-%m-%dT%H:%M:%SZ)"
+short_desc="Transfer files over wifi to mobile devices by scanning a QR code"
+maintainer="meator <meator.dev@gmail.com>"
+license="MIT"
+homepage="https://claudiodangelis.com/qrcp/"
+distfiles="https://github.com/claudiodangelis/qrcp/archive/refs/tags/${version}.tar.gz"
+checksum=1ee0d1b04222fb2a559d412b144a49051c3315cbc99c7ea1f281bdd4f13f07bf
+
+post_install() {
+	vlicense LICENSE
+}

From df059a88661509027c167cf800bab24d08bd49be Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 14 Mar 2022 02:31:24 +0100
Subject: [PATCH 0226/2561] flickcurl: remove package

unused since 2019
---
 common/shlibs                     |  1 -
 srcpkgs/flickcurl-devel           |  1 -
 srcpkgs/flickcurl-doc             |  1 -
 srcpkgs/flickcurl/template        | 33 -------------------------------
 srcpkgs/removed-packages/template |  5 ++++-
 5 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 120000 srcpkgs/flickcurl-devel
 delete mode 120000 srcpkgs/flickcurl-doc
 delete mode 100644 srcpkgs/flickcurl/template

diff --git a/common/shlibs b/common/shlibs
index f26b9bab58fd..230fc6a994c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2580,7 +2580,6 @@ libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
 libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1
 libtspi.so.1 trousers-0.3.14_11
-libflickcurl.so.0 flickcurl-1.26_1
 libpsiconv.so.6 psiconv-0.9.9_1
 libshout.so.3 libshout-2.4.1_1
 libfirm.so.1.22 libfirm-1.22.0_1
diff --git a/srcpkgs/flickcurl-devel b/srcpkgs/flickcurl-devel
deleted file mode 120000
index 0c0d78612042..000000000000
--- a/srcpkgs/flickcurl-devel
+++ /dev/null
@@ -1 +0,0 @@
-flickcurl
\ No newline at end of file
diff --git a/srcpkgs/flickcurl-doc b/srcpkgs/flickcurl-doc
deleted file mode 120000
index 0c0d78612042..000000000000
--- a/srcpkgs/flickcurl-doc
+++ /dev/null
@@ -1 +0,0 @@
-flickcurl
\ No newline at end of file
diff --git a/srcpkgs/flickcurl/template b/srcpkgs/flickcurl/template
deleted file mode 100644
index 7756752110e9..000000000000
--- a/srcpkgs/flickcurl/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'flickcurl'
-pkgname=flickcurl
-version=1.26
-revision=4
-build_style=gnu-configure
-makedepends="libcurl-devel libxml2-devel raptor-devel"
-short_desc="C library for the Flickr API"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
-homepage="http://librdf.org/flickcurl/"
-distfiles="http://download.dajobe.org/flickcurl/flickcurl-${version}.tar.gz"
-checksum=ff42a36c7c1c7d368246f6bc9b7d792ed298348e5f0f5d432e49f6803562f5a3
-
-flickcurl-doc_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - Documentation (HTML Version)"
-	pkg_install() {
-		vmove usr/share/gtk-doc
-	}
-}
-
-flickcurl-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/flickcurl-config
-		vmove usr/share/man/man1/flickcurl-config.1
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a7a19630a01a..6a744198712d 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=64
+revision=65
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -69,6 +69,9 @@ replaces="
  electron9<=9.4.1_1
  enventor<=1.0.0_2
  epstopdf<=2.27_3
+ flickcurl-devel<=1.26_4
+ flickcurl-doc<=1.26_4
+ flickcurl<=1.26_4
  fontmatrix<=0.6.0.20171228_2
  freshplayerplugin<=0.3.9_9
  fuse-usmb<=20130204_7

From 6e3a74a440b081317ec064f0baafdc89d660edb3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Mar 2022 20:51:03 -0400
Subject: [PATCH 0227/2561] common/build-helper/rust.sh: link to libsodium
 dynamically

without this envvar, libsodium-sys will attempt to link to libsodium
staticly, and may fail.
---
 common/build-helper/rust.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 798083709c3e..272d03f52607 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -44,6 +44,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
 # sodium-sys
 export SODIUM_LIB_DIR="${XBPS_CROSS_BASE}/usr/include"
 export SODIUM_INC_DIR="${XBPS_CROSS_BASE}/usr/lib"
+export SODIUM_SHARED=1
 
 # openssl-sys
 export OPENSSL_NO_VENDOR=1

From 4de1d826cb39c8f4605f1fde2f50198402411136 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Mar 2022 20:53:07 -0400
Subject: [PATCH 0228/2561] rdedup: update to 3.2.1.

removes the need for patched/backported bindgen
---
 srcpkgs/rdedup/patches/bindgen-cross.patch | 12 ------------
 srcpkgs/rdedup/template                    | 21 +++++----------------
 2 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/rdedup/patches/bindgen-cross.patch

diff --git a/srcpkgs/rdedup/patches/bindgen-cross.patch b/srcpkgs/rdedup/patches/bindgen-cross.patch
deleted file mode 100644
index 7eab10fd3d56..000000000000
--- a/srcpkgs/rdedup/patches/bindgen-cross.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
-https://github.com/jnbr/rust-bindgen/tree/0.37.4-clang_args
-
---- a/Cargo.toml	2019-06-15 13:18:05.509893680 +0200
-+++ b/Cargo.toml	2019-06-15 13:19:48.854887006 +0200
-@@ -53,3 +53,6 @@
- slog-term = "2"
- slog-async = "2"
- url = "1"
-+
-+[patch.crates-io]
-+bindgen = {git = 'https://github.com/jnbr/rust-bindgen', rev = '4afb05213b3e7e0ec928b84ea85d9f2b99477586'}
diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index c392e3c0e2fc..6bd71cacfc46 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,25 +1,14 @@
 # Template file for 'rdedup'
 pkgname=rdedup
-version=3.1.1
-revision=6
-wrksrc=rdedup-rdedup-v${version}
+version=3.2.1
+revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="pkg-config clang"
 makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/dpc/rdedup"
-distfiles="https://github.com/dpc/rdedup/archive/rdedup-v${version}.tar.gz"
-checksum=5e7c09c40897cd2f2635e8c213c2ff0f5c4d7ceccbd22980cd4cb0a16f3dfc28
-
-if [ "$CROSS_BUILD" ]; then
-	export HOST_CC="$BUILD_CC"
-	export HOST_CFLAGS="$BUILD_CFLAGS"
-	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE}"
-fi
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-	cargo update --package openssl --precise 0.10.22
-}
+distfiles="https://github.com/dpc/rdedup/archive/v${version}.tar.gz"
+checksum=023b5576f30ebf75c1740dd244ac13b6ef3ad7f6d4a6ab6654e12130201eb923

From ac2a2fbac4cfc803c762b33c2ad211d496e0ff31 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Mar 2022 20:54:55 -0400
Subject: [PATCH 0229/2561] pijul: remove unnecessary bindgen workarounds

---
 srcpkgs/pijul/patches/bindgen.patch | 3 +--
 srcpkgs/pijul/template              | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
index 2457f1434d94..04ccc8381aae 100644
--- a/srcpkgs/pijul/patches/bindgen.patch
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -1,10 +1,9 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -133,3 +133,7 @@
+@@ -133,3 +133,6 @@
  version = "2.0"
  [target."cfg(unix)".dependencies.tokio-uds]
  version = "0.2"
 +
 +[patch.crates-io]
-+"bindgen" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"}
 +"sequoia-rfc2822" = {path = '/builddir/sequoia-v0.9.0/rfc2822'}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 40df186b9387..581d77789c9c 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,8 +1,9 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=4
+revision=5
 build_style=cargo
+build_helper=rust
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
 makedepends="libsodium-devel openssl-devel nettle-devel"
@@ -15,12 +16,6 @@ distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${ver
 checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889
  71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b"
 
-if [ "$CROSS_BUILD" ]; then
-	export HOST_CC="$BUILD_CC"
-	export HOST_CFLAGS="$BUILD_CFLAGS"
-	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE"
-fi
-
 # We only want to install the binary, so don't run cargo install
 do_install() {
 	vbin target/${RUST_TARGET}/release/pijul

From b05d4de88c7029b63f2db950e6062d5ca595768b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 15 Mar 2022 16:19:41 +0100
Subject: [PATCH 0230/2561] less: use last stable release for update-check.

---
 srcpkgs/less/update | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/less/update b/srcpkgs/less/update
index 8ccb86344234..50cae37e4fa6 100644
--- a/srcpkgs/less/update
+++ b/srcpkgs/less/update
@@ -1 +1,2 @@
-site="${homepage}/download.html"
+site='https://greenwoodsoftware.com/less/release.txt'
+pattern='\d+'

From 45a3f301b15cfd156c75db4dd13e9aaed7d72922 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 3 Mar 2022 02:20:38 -0500
Subject: [PATCH 0231/2561] void-artwork: update to 20220303.

Adds an svg version of the logo, a script to generate icons from it,
and generated icon files for the logo (with and without the VOID text)
at various sizes, which are installed to the hicolor (fallback) icon
theme.

The logo files are pre-generated to avoid makedep on librsvg-utils,
and they are small enough and change so rarely that it is not a big
deal to include them in git.

The source svg is slightly different than the one on alpha.de; it has
a small white border added to help with legibility on dark backgrounds.

This is a follow-up to #35604
---
 srcpkgs/void-artwork/files/generate-icons.sh  |  29 ++++++++
 .../files/icons/void-logo-128.png             | Bin 0 -> 8406 bytes
 .../void-artwork/files/icons/void-logo-16.png | Bin 0 -> 655 bytes
 .../void-artwork/files/icons/void-logo-22.png | Bin 0 -> 932 bytes
 .../files/icons/void-logo-256.png             | Bin 0 -> 18160 bytes
 .../void-artwork/files/icons/void-logo-32.png | Bin 0 -> 1287 bytes
 .../void-artwork/files/icons/void-logo-48.png | Bin 0 -> 1864 bytes
 .../files/icons/void-logo-512.png             | Bin 0 -> 39176 bytes
 .../void-artwork/files/icons/void-logo-64.png | Bin 0 -> 4013 bytes
 .../files/icons/void-logo-notext-128.png      | Bin 0 -> 5156 bytes
 .../files/icons/void-logo-notext-16.png       | Bin 0 -> 655 bytes
 .../files/icons/void-logo-notext-22.png       | Bin 0 -> 932 bytes
 .../files/icons/void-logo-notext-256.png      | Bin 0 -> 10660 bytes
 .../files/icons/void-logo-notext-32.png       | Bin 0 -> 1287 bytes
 .../files/icons/void-logo-notext-48.png       | Bin 0 -> 1864 bytes
 .../files/icons/void-logo-notext-512.png      | Bin 0 -> 22310 bytes
 .../files/icons/void-logo-notext-64.png       | Bin 0 -> 2534 bytes
 .../files/icons/void-logo-notext.svg          |   8 +++
 .../void-artwork/files/icons/void-logo.svg    |  19 ++++++
 srcpkgs/void-artwork/files/void-logo.svg      |  64 ++++++++++++++++++
 srcpkgs/void-artwork/template                 |  13 +++-
 21 files changed, 130 insertions(+), 3 deletions(-)
 create mode 100755 srcpkgs/void-artwork/files/generate-icons.sh
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-128.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-16.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-22.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-256.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-32.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-48.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-512.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-64.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-128.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-16.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-22.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-256.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-32.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-48.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-512.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-64.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext.svg
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo.svg
 create mode 100644 srcpkgs/void-artwork/files/void-logo.svg

diff --git a/srcpkgs/void-artwork/files/generate-icons.sh b/srcpkgs/void-artwork/files/generate-icons.sh
new file mode 100755
index 000000000000..6c03e973acd3
--- /dev/null
+++ b/srcpkgs/void-artwork/files/generate-icons.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# regenerates the files in icons/ from void-logo.svg
+# run with ./generate-icons.sh
+# only needed when the logo changes
+
+if ! command -v rsvg-convert >/dev/null; then
+    echo "Please install librsvg-utils"
+    exit 1
+fi
+
+[ -d "./icons" ] && rm -r ./icons
+mkdir ./icons
+
+RESOLUTIONS="16 22 32 48 64 128 256 512"
+
+for res in $RESOLUTIONS; do
+	# at low resolutions, the text is too small to read, so the text is left out
+	if [ "$res" -lt 64 ]; then
+		rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -i circlearcs -o ./icons/void-logo-$res.png
+	else
+		rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -o ./icons/void-logo-$res.png
+	fi
+	rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -i circlearcs -o ./icons/void-logo-notext-$res.png
+done
+
+# scalable
+rsvg-convert void-logo.svg --format svg -o ./icons/void-logo.svg
+rsvg-convert void-logo.svg --format svg -i circlearcs -o ./icons/void-logo-notext.svg
+
diff --git a/srcpkgs/void-artwork/files/icons/void-logo-128.png b/srcpkgs/void-artwork/files/icons/void-logo-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..adf9a1f1a647b8b71a967c35364e85972ad14534
GIT binary patch
literal 8406
zcmZu%WmuHY*WRThL_q1(Md=cxTb33UmhLWTSXi0`R2ozo1e7l6&Q&Crlx~n%x;x+f
zy`TTrb3HR3p1IDPIdkSd=ef^BYN#s`6Veg_003fTB`_4zBmR5w@i1+tlm!aY;aRFG
zf&mZzJ>T03699nc0A;YOw$Hb{Ogo=(ok?V{9e>)X0<E%={R;w|w**Q8usr;7&}OK<
zE^I=_Ob^yY*qq$;iH*{nyR?xDbdIG2$$OS3_xv*s{>vYE7imog;c3qWuOI{jUzbh>
z!Ut{-nuI-v=RNjC(Qlury%`1n&nDO{?+2ZR8C!k;qFl!4d;S>(?j`UZ0X(diG6f_W
znsp(Smq{y0l(7GT^A0`gA3To2H39kB;^x#NbepzsXsifTh+thdU5R?hT85e`1~xQ0
z-5fD2%q%qoH8YP9i}LZ&(L{ckjCyUHcx^ye64wBUz{8`;R^zkso{&1Eig{ARu485J
zWTbHw;rB!jARd-5Rws%BHM_BfcB?*oiTetdJcTMZ(Zev15sxJFHWdGe<i)f!wJZF<
zN<VQ$)x0V~Tl{A=s+Xb=pi&%%+(SASMne?oC4CdWjfs*cQJ746`!xGLr6pC-b|aU)
zmu1B<00gjrjCdU7=+~k&0Qrf4Tm)-B2daFqfAF8%qD2%cny%RaAy1R@Hpiak?^7m7
z_5yMTdCO^`Z9k6D@vqfY-NP#EXzScTaZJSfn3@nxyf?%$&70cTEAkfmtw4xg2n3v0
z9g^XtO#2gyEnfjxvA%(>U-Gx+WhH_L!4jN6NLIx8mpuZK$I^JMI0Iy4o^lO40koNz
z!D83~gsMc3_IjsfU4mTXg!^9Hw%%^e7YMw#e_@2^i0s|?<T5t%h89;tg$7~AS<0C`
zpVWjB6c8ROF1`H3!Y}f5$XP67fq35&VF!NM@na4r77R>;E+8P)5L?#U<a;`b2@2wc
zJilKPT}e;4#Yq_$Gnqlp<gMl98j62W$goprIhQQfogsCnm|5fAz&v?~eg*w9eg=>2
z>s&tKKZKCI7SuL^5$hZoe4A|9Jb^WLk0hcxBY!{RT56tu#VT#bQTdLYVp7A|;gAf#
zWow*2zRi8p@WF1~Mi3*6E|ipxMl}F+Nl!-e0yM`HOh-$gQtVAw`gF}yQUyRd$rWR|
z=TFhJY3xG&MJJ_ZUm+LZra++UJk#;&-+Qf4TdBcDq5D~mu+kN8G6SEcZD(ylfZm1D
z^3IkjwC80)ct%ek=y-I!sAiNMVBF@21>lAA;=vfrkNJG&IY4F;@W5Co5P7AtytNV8
z5H5`Isd?i4#%&X_s@ofd1hU*drMjy0zx~iCR8(=%dl91#6)C*fPw}*APd|~JwXxXO
z5(3USLn25w>69YO@G+*j^uJjxflG#Vb)u==$fMEmWGMLZ$1d?Ani1NFpF%p}RLSID
z^-_BxL!W))kn-vdS@R%WqXR<=^FUOYC;-{j&-QJHaY8^nyKJQyAGe&*(@Cy(O-;?t
zSjpIqh(Qq4+^Vfz21HqyAghpYl)kGqQyzZuBq1dmZlM0MGyUUep<FgSnKJnot20f-
zTs=UM34t+;r`BaLy?({{=;&|;F90Wi88oBrA}6psjNDt-S#SGWGbZYD`&=PmG;P9I
z#@L#k!N|*)_;E2wv_%^m0?NTC!VT)lWILgMHL?W*hbumt15NI3Y}e!aXn}=9OWVa}
z{{mB?Hf8Cbvogz<vfDZq$z@5ey?0el5F5Nvz1nCLoL{Aw@fAhBqvT`8LK9fCEU3CC
zvU-j^U-w{mk!cZBgloEQ8eRFVY!9x>AXHx{c=*m&=gQ2Re)dOcMa^SjJ>gF<I?HoD
zpU2O>tPdsbX=D7o30TY<d=(^tOw2eyP3#zdE5|`T0Ey&Zb{Tju$g+D8AIh4_nl@m(
zO+(jU<5Ua-7Mn}O!Q~M!(l28}Uw3w&r8<<tons&~H6IftjeO2ZMSm#NIOKcv!U#bg
zGGIm*u1pg1Ouur1BNE>L`-UGnWU^%H6|2@O%75eY!?7wvw93a6FyPmaQ~fnIIPk$B
zP<HEpv00g+c?zX8qOYmq^@uW$LCvv+(<(&^PUJ@=+1X4Y;7=`a9o36x*9+Ug=UZJu
zwTl#<0HNnjD|Hp<Pw4};g>g8s6s1N!@za!5oc?tOAESr59I9hkn8ly$jQ|e}S3&gM
z>=@i>KGN9#a*t}LXxT*fwFnE`mCpR9e$qt614-<}f}=H9<4;PU*s1J64m^Dqb9g`N
zeNMrjM?dy`!ikvhx>+X)Hqb96$@WqswS1GIYy3(@gWy*5&GXZxwz&%h)*(8l28P*B
zZzW3;J>c5O0)}4bjnhnqdd683blBw9^FP)?yd5e9*aB|B_A;9(l9v9@)eSu;k|^DG
z$E*03T@-CZ^8hOB42PGYiA;hiqK;yXhLbq9=9boOYrG6b;;zeca33Zld8u&Sf`}N_
z{O9CMvWA;OU<P4koqQ{1s1EXH6}P3pZ|u%YkU+=F>~FW<*vvzjJ?M21J?)ogtSy9D
zbu5jB1z}jr!wYj>700j>SkyqE;yF-aCE{_*f6$d}<aRuJ=5U^^oz);8Q)4tj5gOsd
z-$<La&p5WgeymQJl~+_&)Hd<dfhsNr056-bT3p%8TwBO6_<U@|_T>FB#UCRK&SrqZ
zm@`4Um{@>_JWp<L40|v5cD~-S$IpM~t_{fJhX-rLGjH$wy^U<P-!l)a!wD#3qQEvl
zGMYmI@!X>#4A{@y&_bD0=r#0aNo<__XS;P<vL*hYR_OL?|KFo~bsCT7Qv%ukZ5Gpu
zM?Va0GGa&KJKeX{K$_lHZctKV%>!fDI5-KpIJk3as}s|Cmvj!IQZlI8P1`U1uCt&j
z+;|&66!_0p789sinf*+;<<L9foZfpt%+yq82!q73m^CmX4xG7ND=>Dho;!N37q*z>
z9;lceQpiB*O_m51#vVpfq2U9)gUi!>R$ko<%`MH3K0W#fablSDvqV6UJo)29pz0#V
z^a~Fd_%!pT=3<B8?3IYeKYWbr)y5b?K1<bW9`We=Aup5i{IrH8I0)K6(TA4^T|p{h
zVs<CodiQz7bBO0m)HdN02I)UPR>Luodn<KBY(+JH9BTempe+XcQjT4)!&!e${BK-=
z=t~ssTj}1cY9U^%B<Lt>^l@&Dy2!mrOuH>9GUEx67*W1<aQ=9GCXIM_#dQ7ef+6Yb
z)=&vuC!=3OF`1o-&<^(eYw@aLz*sJGj!rDRx-C&BSrcmd)MZ$`Kg$GJIk+Xh%jV5<
zq`7BLLtmu|o)qI6h=RV?uB-A>J|0?IuFZ8&@8kWR2->r!?GsN3D~+8{#aK$@M=>Cx
z*OVlzr<?SFG~6bWO#<j0gXOnlG2|sf6l>$sFmVijjmLTlylkwuD<f)Ll%Y@F>c{62
zU6PwjCqIsRZ*^wm=w0s4%~sV1)PKfG2&uH~p}n{#xa-hRA*T8wIC*Y@4Vz@^#<}GH
zIZQGrn>}adcv+H?o2GG0cx=DWdiFAZyo-`tUf=j%Lv}|IMgDlaY6=fST2fNJFa34E
z8GJ2;f^3?F9xlzBLB|Oi$d-`9^|`5g`lXY~Ux9ssBDKbOuAZ^DxH$D4i-e?Pnuxn)
zNd!z!r4F|nTR15(5vH!D=4DW2f$Ph<$8-#wmza-mqEJR{CL251KRG8VFe?mV1?O?P
zU6h-&+&8%_bjAM~Rs=V$CmX5U-QMOPFp`Vo^9l+qg)(Ncsu*nQga7>9IeS^F-neOJ
zYHIrO<;#&`t-@8LBeDf#i9?#ur~Q<id@U*4)xZ1cu&vZ-pxa|HsyW-Q=iIZ$lX-Sf
z`8BMBR4;J4$M$$}F^S~qXNzB<xPVQVSb<tb_js|^6tKtB)6+FwI=J0s<@ZOYnQGkJ
z(I(TTLFRPNxxj`|N0|yDshZ~Z6@A0Q2Xpn#Ms1S^Lt|qJxr*`WSXfwi^r9XwMTLZP
z`%$RO+5K7jrFKcz_A3@<g&2Lj7_u)<Gt~=kme%?b_MYl{H>d9YtQTMNc3EIt4n1Yl
z4IfT43%Xj*AIcQZ-nuO+VoT;V8^Y)mzqYn^>bLnL+{I<0B+2D?t<Pz?^4C@-$>)U3
z&J3-kwVMZ%#u^pzbOl*u*#}Y24g387M9Y42Gy;LB2vM%F9c(VkB&mcSm@355c7-zq
ziI86k>lYvnkB^VB_h#!(28QYbZ4Ne8mH$30#6*{#GpwVYF)>#;-zt$AJht1o_D7*m
zO997ytZjCK>0Y)#VV8Lk+u<yei86zlTZq)v%hReJ#?GwKep4`O>+vs6a6`Nl`p$N7
zu<_)RxTxQ0k&q~8ccv!1v9WQqtE($ICnsl~knmfF?r7*QbMu}!hCkiiEL-wxsnG3A
zyDZ<0zK**+S0SQOE}qri<Tr+AaZ|=DVqApgL<ne!=-~k|ols2k$&mO=#}a?e<;~5>
zqW{5bi{Br@C@3giB(SIv-d(O5PQ}>SkCx!(y3oj@>bZ}OPDIfHH8bz_tBf~>(;(d;
zF=96CHUDmKmjtdpdMft0c3kUvqOoHbCDSol4$4%-OW#iy3^7T(=Mz?I-O9<<(b26E
z@M6twd!S*-tw;VSDdAWQx^Z3%ez^00A5>p~(V^{PC|!`#?O?GjolaLyq5p{?EL!$p
z!w_8qTnxJOy<UsxCCDFd+}_?MF~#gNGR4%7AffM=<S}MF|4m2F$apXB>w6XP+N%4K
z%b*&pWn?Md&42c@n0lUPkCki^6jS|`f6?!rTa6#?v={>2{wBW?PgE!V3m|d5nF}~b
zeOHj?+HqIE;gR#~{>=*H!>4f5<Fww%FJ&fG$#*SvkRDVrH@4E>ko7Xdim8t4-$cCj
zlx{*gHWb#*<F;dQ_LPKf8tj6u7yAoD{^z?imzV+O{Aq`WhvpjtX<VkQA_5W;w-A+L
zsfGpbjE>165`4ntNWHA0x)aA<>HI)ic5e3kveOImcoQSI1FhtHB_$<uBm!uFIA~Z3
zqD%eqqs__k0Q}o<JX3D_RC&%)zPh?vL*-+3TR^s;_wICOoBu_<vIcS5j<=?XDO_dV
zyu&tiaHAZvrt?34{(ysS2LC}uYV08O&U4+&@e=$Huoy6*0Fu3UoZ;F&I{(QX9@{y!
zq&HSmyaN?PNirD)-#uLRNCOsu_paSBG(t%XUZ^6mY|(G-sR>Qq`G4;gbacQR;I*r*
zvBEiKd@Fg1w4H4!CcYHi*KW%)!yONI2im&2Ia51nLe8{~Q{{uvk&#WB;C;Z?^Zf<?
z)mn$KH&aZsjQ!ug%s#ddoe|xgExF_BT((7`<}43Hg4RTggq<dgg(M`t8M!p&Q}-@b
zTF8~@W&mY&ynjX>7+%c2pMcb(KjS}nq5wV~T0#a-R+x2|bcT~O7(ADm?3UC{GWK)y
zbn+MDoxdRYnveiQwZl3;5lcMWo=CSeHp0lh9F)bkUtX@pYnlAK^YK6Znd?647@eel
zJ7JkI@MqM$;{XtJ`R`H2V<8ghTRyxn3m&(J4A)uj-PhZb&B1p`6iH>K)w3*3fXK*5
zK+CWu!14BKtfKvz<NT$|8yy<aT5mM&fnHK#%~>#N=1Pq)X`LbhKlpCPY^K&hOWD%$
zUm(aMP>rn#S~Arhc=MEs*R-t3l$VJYFNXU2)=c$ZeqHYRJ*u&MJ1T%ml#0^*D+5na
z2n4d<c47Lgl0`tk6Tv-ZAfo{Y#5*rOY0`<-(}Zg07`PD2g+Ia7cbDaj?j<20Am~s}
zHP5cu`Z9P^#Kt9g0w3Cc7ZmtFr=Dl<wh&t`%%D9019}4nt9yG3n&6ErR?C4_-xH_n
zk56bMafIQ*YQyEX4zJepXNmdz^dzwrpWvAH39A;BjbvRv?6(}S@bS5kx$O+32@LOg
z)bd#l;GcR;>n1|Eu2kl*uAKghYJ3)<WS7TK=@WL|_Dhh9%WV62&1*U}dX<^Ds+_0=
z=`yREl+q%engEBvRimTZ-6`rf_9KMmpCgR9(5Ub0s5<dSk?Pdmt9)w1x_WwZtq3|1
z%jfrlx5ee<wp+rgf+=HLFp1L<Ilu`K5s~ZY`%ZwHC)}!+SZ+JOWi>t4nyG%l=K_gM
zLP|~Ds06O&DX|1qtFxc&-CZmN=W_c`(#G9;BU)>jwJDA2)yuP7{={#~*@x>!$dXjH
zP<FJ`*H44Qymr8DC+2FyJU1>hg~#d+$$P6iotGVPkDjlmkQ1sq3NOyPbrNHcxE%Ky
z6M?4c8uf3^gzmyGdU~b`C+!Ao1&E{!zZ=*R4`v9Xo6uRMfUJ+Rcfc&)^BFs}_V(F&
z9lP9j8v>b3(?X$A7fVW*`2mSKx`_3~b|Mt}x}m1#iXAE?>CGGEG0%0I^#I8O$3YKy
zR*B2gFgr2JBfZ(Fmu}sMCn2NutrrXMr3upteCD3GvXdqX>GJ2|sCu&w(+c#-uyhY5
z@MeQNNZ)G$$Y!3Alb>eyFa^&SsJwS`_j=*t18Ih|K7lVSVZZP=h9K7Yd!jAgP(N0n
zqT2g1T*Y81D0#7B!~{*PxZCeJx`<(|f`9;XLe9(rl3JcK7>Kz(+esn7;Wn&gTRvQg
z&hjx!ESGF~N~Yr<8aZ(KPAc$1YmnbD^|cjV*dvmAGL(se%mSmV7Aqvnn3B@gNXWAz
z!rX5un3>z(tMNH**B7lGAkVBLC<i8HqVVor%tmwiBcX~j&xF1|tOo&akD+^|7a0eQ
zSM+l?5F+R3pz5shc5Df!(iQZzQF+DLiB)*~(d<~oOf5C8&)wOS@8wFkF!0%MR*<8K
ztszO2t>neLr&cXJd8E2xsnk&|-86C2hj<xH0|NQ=SF$R_GGtBDA6hL>H%DI^P5~eM
z&dpBS%Z2wD(F!VhdU~F>o9;qoi^$P;&f!Ak<>l}EU{AvoiKR{!S7JJymRe1;d=U{5
z_}y^~MmTHvd3m)9tp+U@wG9=*uex59nR!{X%DZd6rnwPNGDx=6Li_vp9F8h7y$-s)
z^g^DY%|eU{sXjydm+apZz_-WQ-Im%_my)+Bb|Jsj?hc7b%4#&n4t&1x{1lHN{X%rk
zr&4^m+7o{e5g$KgGGw(R^xE0SydS&v{nYli3u&J-Y~A}>Xw5eaP7B!dCr*V(2`|93
zmN0=~vWd7ZL@Mx_558~wZ*^4~i?Mb3%*)HrA7hp}rI`GSwp>9kDdhRUn@a2DR{g-1
z&fmXHAO1!29-hL~No|}zD110ZCO-198RDdZ1z7~WU`N%WbB<3>*RuTgUt>9rjg8#|
zJ+uwFT&us3lFITu+4%DH>sJOQCTRume$)8EN5eLeMFvbp)G1&$6l2_Rf3ecXj10dV
z4J2@~nxnPw?>43O8Iz|#_6uM@?QEgi289igJR^^$;w>mC=`Rp_&)n$CcVzN!OFWO4
zVBr~$!<q5f2}en3ZALDW@7fpIPRK)(C)#v!{x>EE6}Y}0ofldW!ni5i7;Fouk<Zf=
z_+hK4kw5+!lT~FywX}#I4Buqr^g{zWu|^$gJF;U<(Z8u6tyae#ClRDyRGT|F@;_li
zFsb>esM|8)e!N)qU?mB<+dnTK)Ynx=oT(n(5HB3^B7{mL(l|<sRo$d=;`rjcP^(m(
zN+ib5*VlbeaLT&5vGEj7!PeS30Cu=6t9C{mt1x*`BRQgrw!F#?eH)5TL~NyhVIi-7
zjC-3Ss6J8<f#Zm^Ua@p}-uWv<1wTJY(e;w3vzbMb10*0gIrkKQ<L{VmPsw(PUIP3T
z-F7E8J#q<^jrol!#c;V0EHslJIkwUJ<153kH?@tk59|WMCqKAv7+O5VFr;LbyJQFH
z7wI|ZP{9Zv89P)ZaI{IsKb*q+>fGz`PC86nqYx`XiHs^}g(^Z@g#p9cJmj4DPqm0Y
zC4;?wdn>oO&<_7tx_CxOcJ-qiEpN?4X?BaDo7*;GGBhzf55VckR6Q%dy$yOY4(&0W
zRG0lNG+`kTYC=zGD-RCxm}q&Tww;<dCslnXe|Nq2S^1{-{H52selN_2iN9BdRckst
zTkm7H-6KX28VEBdZo3++h~8hM9mujufb;o<>JN>826q}{!V>~960$2DaC3J<)Pt|m
z)C)ng7?TfpANccjNdFmiJ#c|c<k$3Ag(#MfPIqD9A1{3_m-qHFUx9?gVY3-8tZf?V
zXWJ0GUBktWY;4@LrHOxShbJN;=&8Q!+_m1iyxUH#4Ro9Oh2h**Ee?xn%EEtzZ64a=
z!5Q8`d-C>zOoN28_9~XS5}~h?CX$5h*6c4xTFG@^O$BNDQl5Vb=cOMnzAy`#t)3nF
zN6ArIdTHCq%M(l^aV|=)<mtf<UK7tBzW^=*!?0ShS-c(QY^>dV-IXjHUf59BXwz^T
zsfH~g3R_r%vVtysuGfHq1R&i>#ZY`s-a-a7&(~=T9oRYY8bp=M!hq>CE<^V9oJ28?
zi?YJsacJ@SY5q;(fxyF86Z6tV!GU&w2E6aJJzqfu6zGD8zCT|<wyu)iern?7+&|gW
zOw*gS>FX$bn*3kq^h6kcmse}e=AIVBjfhYNZ;+^04u@SjmBi=_m^8~END`qKUQGlM
z!A3U242lM?5tF6a2DVuQx<Ufs?MX+95Js=Y6QJRzTAWl@2s+Hl;P(dc{`?&K7G!E~
zuD|<kZnepe|KngpWQ3^go<s}ThoTWS#PDvCMFVD!&npq1mzwL{)#G{^f-gy~^5us)
z^J{&5jDJP+%97EHNY>v}CI2|*l+`z<Uff@#>k3gVWEdpBzW%9Pmu=>_4pV+HMm0E@
zk>uMB<>+O9OZOT>C4L4jST)<tmEyeSwnRQXa21Z@K>i;3`R^Pa5mSDnOzbo~-*dah
zWC)Pv$afl+aQ|qb6B@E$<-|mge)WdASD20AvV17q@z)F7%GowEhHPy(AWZkZ<=Q{_
zKKbvnR97|1qwtLZrIGR$HOEj))uGZj2|Xh9m*xU@V25#G%MF%lMU+lU9t97&O(ec)
zSO5eBOt6L6sC{=3!#^itk>I-}J&ert5-$UQpxhwddFg=GF&;2q+F<MPx|7iUQjqvz
z612qS*&@Y|!I*5O%I6Ul;Bus@sPA-W&Hn2vNKaAfnVi@ZLw{ZphZO}cS8CVSpMAmr
z)ry>tE6CY`u%gdw7zdlgnhl(H{KZaae#YPC`gg=#!4;1FxiHW_Fee?*A3PP1ZLK!$
z^K<NjFmx#W36DN?^R~&>cyj`Q&$s~|XW@eNOOW_oTfkC_;~}+OBo3EjsBdY<da<u-
zt%wP<QHA|%oGH-6ZIbec{?+DeJtrexd>ZJVPtHbq^S4*{Tv_5O#S6m$Qn??KRr8!)
zjr3%9#J5K??mhK3Kl1Q8KPod}%fGg4GPsp2Wsay>tJl)!87MC)&v6Y{x|5+Ib2s#>
zx^9#ZWACW7Uk|G(+=8Uo$N#DNDCNG;7<}nN@sH}#Y+2r+5tVC&Nbw+2k27g=Oo-VN
zkZ5Sf$idM5n1TUtNcZ}>S?YdkFYU%OXuC$3uk`vT#tZJX3Xu%wE4c7tk%naRhHQay
zBtttfMH)#&4-qP=C#cE0YX3%!vxr}JjJN%fR`<LflL{%}hX^GT7k42oGs5rKLH7ZJ
z@J=bSz0W^N)aQ+fW8Uo!tF@Ig|Ka7MK#AUm&bG$x$+A-bV}ScZQb}X$H-nr8)q-jL
z+nx&(JE{cR(SDi$43QlH<v2@{uQAHob)QXN{~CeMkZVc(w~1uRd(#CIi<EG6u}TqY
zmQ8i40xHF}`cGw9fnm}8Dt={<8?^=uAL?yeFyY63nv{ogRsb+3I4KdLNyxrAFdD44
zna&CxF+CNdvSgkeY4V~sF>EMQJ7H^GkUXjM*<!>w4tctRdfbRLh|u6FpLg$C&tG{I
zXIG8kgT1Zytu9tz83i?*@&wyDKxFk>o>DHe^FM_ZzIjaW`MVj@+qQtn$M4nkW$+nY
z_I;@5k6<-8iL`1gDxCejyxjk+HKk?>Jw$bOeT@GleaAT~2beeYzUZjk%;=H6Pm#K*
z)hgUjfLQ5ap-mi2h(O1f4LmS$oxe*QH3(PGBaFQ(UqkU@jek$1)iKq%>QW_II(sL%
z86c-=#ZoK>FPIN7%Q8jt>x1b#+)>KLy0`#TI?|s1{%}_K;fa#>?+H)6r@F6tF$D_R
zL73YN1we*<Vzg`^8eMVqqYHEDw+HpdsU4ggL-8~LmD2=>VYu}^o!DKe=y=LZ<7<ye
zrICplGR1li1IiF8Iq)%Jh2ZDEtiXeIw3>;baPygFn}u#vR7sS~_g{hZv`#o8botuS
z`Qx`t4P{Z6u=S}#?ZgR_O~OCJW8se!)$_~(;unw$pz7iubK`8}7+uyMwWgXGo;JiM
zbHfa(0t0_;OmY&Ctu*sYd0c$1QowlR6e3uxGZRIFDKZxQ@-th$5wAJFNN=;2dgNKl
zYTy(Db9^=|IkoUMW29FHX{{J4vK^*S2yokYbL5ggK8~STnIBSavHj!UqZ-EaH^=!u
zNwda+s+@ZQ_31@2ll6b6y-~p}l4Z96xID_5Pp%U7lkJB%q3jPc$6k?<l{;tmPD?RI
z#M-w#LUm1N&(Jmciel=n8e!0W+(rr?P{pA(dZI<B+S-x7M_pW)<a1jszS9sQPLgK6
ziNpf<s}D(sj89?zJN=>@A6JCVQT>N_B6RhFUfH$X1MOGOI3JelOX!rZqlB}NEAH-m
z1O8`ND@k}ug{o*fdZJ0S5~YQp9cn%cpyw08Otp3%6X=ARMh%s{IVP-IBGRA|8zrNl
zS7@o!g*nm4S<c1bT;b6pzb3DXbESdHl{_~nN&)EH#3(#G3uW24hSn0$ac>`eHDujw
zZOy$Jg4Wd5eP>`Jx~`L?t*tXTZ-Tg`sw~Ca4ha75E`V%B&)@{2FyoOFqbbgfAoDnH
z1nGke2usdkPNIKpe>)j3&r-RoUK{*Ga9Vl?e9uSdCZ)p8^c+w1{j~@eoE!&xaWaL9
z)I6{irw9;*z*^?}Y!jG|J-4mWH2c5H|Nnn4AU5&g(f4(#^)Ned4@MP$vb;LD{H=ND
F{{h|)kP-j@

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-16.png b/srcpkgs/void-artwork/files/icons/void-logo-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bdb5f3314c1c012d5568cc2f3c8868ccd225482
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0z^qfK~y-6b&}6ZR8bViKj*&3fJ8!}f{PdzEkaAB!YHL2OU>=1lQ5N;
z;3nGm7rflNYGYBj(TL|X%Y>3<l629=iJWN_87)N9%|M9u-a9RPqtk=Ft9$SHe$V}$
zA3_A~2lt#2Gp?dHP~t!Utc%E^@yzpNBDq%0mx%bbh`a<$G;s(YVOme>M5-mVPn1|6
z)W1f^04TbQ@DzBW=n~)q7Rp1}kp;Kt#sF-9KIi`MK24cKBH`t7x%8&lbcU}DfBnbZ
zlG`lE4A24em>n|(Jd&Hvy;j9q1u}cY(|O17{$n3^#jO!f@?jERjI`N`84pWI)$rpn
zPy)y<XB)i0y8~bwdp6mb+)7<Z?Pfk^9%!JS0ZRiNGax<T2P+HC%%Rx#{eq}WiOQ7k
z`-SXswgF(UYp{s00-&P3Mxp7TX?!_swddaj8mrtlR@`tvE&zy1+z5C80)GzUMm1W$
zs02qBVwIBteulEvO58T~EU;0f-%xa}%0X*b!ny(8g~>VxoY7{0WM^{AvaEJNCIp$V
zEUP_rHT4S)#tB>okU-u`pEGt=2nv7&`l+_|clZ3n{BE>_3Uaxey=`yLq1+N9ZRV}>
zVhwaUbkR{RAItYoj<iID1I}o3x8vA}M8d1{>e8y39_$({3c!#v6f1N54e0fd?*l7>
z6aq9R&>GryqswLil=3D2eD~>Bd&Euv7sB^Aa7o}Ia4O`Vu_>3n<yVVG1Bsx2a->B9
pGp5kX!HyW<JFsZrS!LNO_zMBG;mT&TE3N<l002ovPDHLkV1jLwGlT#D

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-22.png b/srcpkgs/void-artwork/files/icons/void-logo-22.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc749c3b63fc6170b5f2e183b3c2dcdc72c204b8
GIT binary patch
literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x16fH#K~y-6m6cCuR96(nf9Jku5`r<bR@*o&G3cViO+gpMc8CFEklJQ3
z=0P$bjY=(rZVIKOq%Z|bgPTI3B8Z08mI-eN_@@@?wA4gXT*PJU%0$t`rUZ-Ww4IsE
zd#8&eGdGV>)3dtgJKz28ckbhzD?BDHT))sz&_a(OohUnjO@IRT75z;_E*2@CPsWpf
zR@*O8z@PMMc*uvM@)6MRxPzDD5pY6X{leSr{c9IYlo`wi&l@#I*B}be2z(}sGUos4
z$DZgIU}SuxISj&IfEHjLVN6tRqZBc;sA>mGS7XP0b@f$mw>MK3-v8zMwZTGe^Ob?2
zdlB&tb@jVwo4)Tm(j-ZgL7=HzP$qI=F5cJPmluG}PY-{B>d^pc|0#8LY7JKaK>B)m
ziyOF?5nd^4tM+?s-k|JHB{ziB%mC|wJC1Ai{4j9l?*9@G-J8G*%h02u6kFVo+FsE0
z%iz`^2=)P|?ajmE!`qyavlqY^lTE}E<*s^O@0s<-{C+`(mZ8RVx~|KBc32wo8yf!p
z))w_g{Uc7`Od^~@I2CF*nYotfTV?xq&H?i)si?eVfSnd)Eb~F8{Go=&hqsByS3s@B
zsY5yGkNPbufaiGukS#NWR->?aC0F#eZNv@Sj)-Vk+=$s5!KSTs%m@UPgUq7MR8_4a
zx?&<)tFhK%KxQk#VYAIN#$<tf72Uk5{v0`IyOsW7fLoQK?CbWsos~QhPfQ`a7ZJ~k
z%DY~hS8n~%#HD&c;udGZAbQaPHZ9z0NZL-i<K06>%nlVjrlQAGwe?`z!LMyj;h#bh
z*jVXYveKD4@+^c?EDaPuAB31)+0@xt))*t>Bh4D<RYkV~3mRz5{FplP5cEWaCQSyt
z+>tuGWv#-A*AjO_6Se_Uz@XRe<pf|)>g~EZ<eI{+3SA!v=HrIezs_a6OkfMWnR=(b
z$YQVKnymf%r$^H-InOzB-VU!=9-9Y_ABruOoEyN45kvDp7Gzq`8b!8)#(|BX(~j%3
zSDP)X=JA2!hhn9YbAGk+r-e?dD{c13g~$u?{lGUfc{Hv_KTFTf(_%qHPB)fvb5C?^
z#~YvbJ`)t`x)i!VUuNlw4CtI7H&ygXLF?03QzvuP_WuWs+f=9_lj|D*0000<MNUMn
GLSTY6Dah~u

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-256.png b/srcpkgs/void-artwork/files/icons/void-logo-256.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ff992021329630c281308f09bd190cab7f91572
GIT binary patch
literal 18160
zcmcG0^;=YJ)b-5J-3ZbkCEZ;^4-L`{0@5JegMyTR%1C!ehlDhY4+7FiH%NDPzQ^~w
z-ap}kA7<d1bIu)muf5m4*Pa+{O=Udn=hz?+2v1c-K^Fu918>0~OmyJI>}`oX@Pclm
zrmO&Z`uCgLUYrC1(SuYK<X-t_?q~V=ztX?GmT_Q7S_;Da1PUiqdGk&s1wWthvKr0D
z=b*j%(c8zz&`+P#Q%9#_rp8JxeN671$`K6|g0<5=G<fsixn<8(=y158+LW`E#+sB7
zbQF*@7;q%!j)wC8=VzM!oE(W1Q(>2a56f1pksVw=hoFLgCR|Cw8`t>b)|`dt!y&y_
zWU^IjUr}C5EIELB;cL)nY>hAmloTsAxbO$W7~MABIrvLBt*i)r_LIh&p>B|79^3o(
zNKGq=8a>R<8;q2=neaT&0!6Q0I{`0h6Nus?|Ez{XwsVSa|I2>1YR=-evdq{r?Edop
z(z2@jIRlNa4Y5wnLIxT7V#{v5_Kn~b>q}Y8a6(Aj>^nk;RvfDZt%bjd<jMK*uYqwK
zOD)Ub_K=ga%PtrGX;xqI8oX;fBLWvvC_?m#$99Di7i~pJg<V5d#_Hpm5b<$&NWzd?
zK}mh|yD<p18V)-*&$s$E#8|&>A%Z(;a(<l3lE)Gff`WC5Qx*_l+%_yZiM|h-f~bY-
zL!<dqu$)HeKR`w)d%uJ-da!#C5n7xHyy!0KUMJuBVv10+@TBdw>sB!n`I8aXSS-Tu
z$Pj_{fryquQ$_Z7T6rY4l~4`pwK1lr_A@y=kUV(%9fF^*3AYKI0%t-}IBp<T%-lbH
z9Id#I`}englcJPV&7UvSBTyp<iAd$V-w0ZRtuarE6Bm80q<JkdJyqz~N6dlQF%}}S
zk<7>o<ZJ3=|JM2>z0|J0g`~`W2}MW6(rg>2gzhfrD-Y5?d4GOI^kg>M%|L>&f^8^B
z%-`pM1eIWEs0-NY7>v}tzhC}dRk*~`+{`YVGpQ{97|0Mo&&c*plPD`1FRpuhwe+#%
z`8AP0!L=f$^|Z!s-vr=tS(qdGH^>!A!NgiXcL4Q>xMrZH_}9s=Eqz-Fm<-X_35?t?
z6J~0R)W1Df?&VuCUomG;=x~Gl&;!P;P>28{EyIJtxk36<FUK^CJq6F$B8wth`lk(!
zYyF9yktwH?aHC$Mmqe+-3E(0Tgvu95RUy`FAXfS!T*ZL7<wRmvWgTOpD1Lm;`}33M
zVXbm!F_^KrK`wqa|Je}s_fDb*<J_xZemA$=nUnqid4rY^^F-l6KnVKuHK+UW{2`ND
zw6fggARd$hYU%Z5<$kH@!vR~NS`lOTMH^D&+)9C+i>AW<0LRc~3FAcqi@GoMJ>}lU
zHlvK$f}H2yC3*4?T6+SJ#4*}&8<E~<FfQ6CE_F}4Y511T7gy1*ezE4gzLa-C&(`ct
z7{BW=F50w|a=dd|;aZ`CM!)+|Ev(H)DogTNHvzPyfHlcn%o~-}>kAlCd9~G+=u-C5
z3m;g%v$~-Wl8wrr++PdRn!@t=Pi;^<ebGm-eXhbm%$HN*A9S<BrEPlRYWCV0vdgl!
zz6WZrR1kr0Fg#KSS4C*L-v;5LX%pzezzg_oxTvPC2Ka?^R$;fHU1di-3h2sX)uu9l
zy~}+k7(~w|hLY}aqy^cq!Nou6vg9k|#e-BvR2}C3y1sfvDa1PmVX<cXZp$boarNo|
zg%#c!Nr>Y^K6JoKD$7N!^$-Mq0!fqUletK>ef^k;o5d{f2J3O@5qDb}{(D8`Vze09
z4vl66M#KT^zATIqZ4m7nh+51if=1bIf^?MkO{;hO4h)t;%4v^-^juM5_+^sS{T2ro
z4Wz=}3MrLUu=8OKqrUFqJ#7#OZVwidISKyn{eR#JWGDPt1mRZw2N6;beNiyEzjPy8
z%JSvC{fpgty$C{J5gALpzU=awVVH46h&nVp7&mMT>s*3S?=Z@zY~TAvBfdyE1{pQj
zel_v47OgRciJ3Y4@$NDLi+<7_h8#A`x>hW=FGX*-Zy61eqch{@%Nt>6=VQ_lK?lc-
zIa6%eKp6N0NX`{nd8|x{7ryE*n$>F49k2O3S_$)Ar>&jQKR`+%<*^1)59@$i%{L_M
z|L4-)%|Du&I!ZCDB}o?-g@(}GOu=G!>rFnuOo6?EJNydL16x_39~JrZx3BBu;uK93
z)y$jw^|R;Lx%eLskj*gwx^x8+F#VE2MWC}j!(n(FHRjX+j7f@uBixIGpble;HM{yb
zh8nyS8cil1S40VzKfKNb(mMUw+-e4OP6CQKycbG)qH_YWLvBE$i*8{>c)({+Z6!Po
z#~Ph20qe#nL9HT!-sje-X!dG@G?3bmE$;T!z(3_)JlZyBRZi|OB=GNbb!ICUjA5EU
zpF_p!CX3t(RBkdT=eY5UVrw?Iy;TM3u=$s@q@CGPRyN^q)dS{?QEkvrp;QIxAdA<~
zz-#`=dX_r1*3XX%pof+VCcvR&iFkiVHDThRjY1ZTv91H|h_<Oza^2|xf4C03Sv}Z^
zPfQ`mrp<O@KM4FjfAGqL<6qdwFMC(p&;Ku=RB{%TR7B_3GVWh`HR>-TX;Ji#WXX98
zEB)B{No8?7F_>4@cH|X2Q2&Pi6-xUUui=3h7FT2wJ8{aA3?EyTeK6tCg~blUv9qz$
zH;Se#{AY$efc;tb$7!P@6($447eR%1k{KLa=K(1kV2s#im8gKd0_ds`sX#<an$X!8
zW?oE#;tOsK_eKQz7gHbAJ?Hp(upL6U>E8`HNia0b6&b}jt_X>rwBPXl>BxU3&^I_x
zSW#Qi-Dzuz?ArfXB3&>M{Zk+L>qolmYc{w+egiRphkqC<P`+D#2V8dQFdYYmci(_?
zvLdN5-3#>7h2ea{#6|r8mJfg76p{>tHPsQ#Ernq$Sif35sj^6$R6FIk`^R*N;~2tK
zmUcTQtPc<m$glwfikUB;zw><j>-MKN4S{%U9ot`#S_#!b5ri$(?L~;sNK~uZHRq<=
zy8AD|33jwhToRQ%Gcy*L=XkHZm;X4C|9uaQP755EFasR=MP?pqa9i*;@nR&mj`{J)
zsSZI3iW>X~p0gOzxibSb!!*M)OOU5Day1z98WT(PtTAuUiNlJwesh$EsUQ^VkgL&*
zfd_;IlQL9DFhpe^p|bURI8|YYIE)qM{!VM&sak@)2*ZQ#*wBhNf!N#l#+drIsH{O~
za`viNyvd(;X~+O*bdq@7#A{$QuhR=q-`&642F#9zNxY2Au}oWhv4bf>#V2i)TNXA;
zS+w=vfv6-N5ViKDJ6eZ0AmLU<N7f2aN+|c}W^55}Nba(P3qXa4b{+AvLzK-HueIJD
z1RSuuzLUORian)K{n~-VZHy73f8U0iM<e(_8&B7mqeS$@Y*94IzMl*;i_2Xqe~x!0
zeShd(-8#TH)?)beG;aFs+b9bu9Knx2)AJNOaR$$r|3Ylk86?%L*!;p<h5jE-RrAR2
zh~Bplu4cxvC+h|lRG>e8D3}Zc0;@#A{+l|tUxZJDN>^0zs;Mr>?H^VI9zkgIMS@@s
zxQ=P!eqK<N|9yK%9^T9FvfY=HO{_ZWVKB_kRmC3znTpQQXwkD#?<<5kg2paAc-O2l
zaJgZ-nF>cuOS#_kyIY5s89zp!tuR=<a`Tjay1#YJzP^?rO-X?)fP&X+#9Nv1pDl(U
zGwhR$v+no8e?p^owr<xk2%!ip1`CB4uGB5-%TFOK=hkLVo=&+M88()4(hZ+nsE;kP
zx*bUyEx@9e4;e)Wi;>_*^f2l<EZN5G;Wo(!K1lF=E?xyHu-G9W9)@3lfqFU=A_~IA
zWZ#+3&3XkB+>Ku~mQKQ}Q+U=eJ{qo}aC>b%hq$#uJUAbgG1@|}AEwj$2s}gu;)}P2
zatrfu=a4XvEavyF)cbg*2qUa>@S`m;i|N~7{%4oX+Co(gSp6>tW<0&4ZV$qW5ORV2
z<AiSIAb4vyj^?w?)05bv;oHCANy_sRzR27iOoskQLM@OjyuJp>+k;0@%(7CCm0(Y+
z@2vO>!n4Pz+1^wH`K0R$vOv8)$`3#oPA*oQdDuVK3O$9nG9NcHUH{6Zp^q>^IY;aG
zp2~%LAcR10vpWq&%-3y<lDqg)ArEx>i2?`op1GBRw9RbgIDEg=o**yLwIt=S%<zKW
zRG`ig;B(wgA`9R`K<s_?!W=%k{`j;Cg#OEK2WWQL?FR`2tc`jg-F`kKS<%;xLE~Gy
zq^i;`765zah@hD45&n1-1na*(^zxUDu(feo1jbFVVT=)IzcN6Dy}Y0ikMkmTD*{m`
zUE;w<3?5|V9LEJrM{2NuNa7n!XhX(}DoXgAus=1_cDFocMR=wti$>WA_uYsZyZi-W
zOML+b&VBP6K_XUseR8!i)X{{W0k@`balmB2&zqn(+S@wljSS&=@q5HIejg+hsjD4Z
zac}P6`4}<J24XLgImSh17FpUfG!9m}yI{=8K%>p97;Apbk7s;lXIiwta*?T}X{|?D
zU@lUhFr_7H)B&;m&DD`eJaW+E$_Z2B{ef~o$Dkm_OJ=lUcVhFpUj;~JF38I*000+z
zyNd}&^VhU=e2g*$9%d&B^QG_#d+1@m5;TiApi`#lC@(Gg2R7%x1;AqJ4^&xl6{-I*
zrS%{|14)8WtL9tNLUy9EeD%5%XC8^5M&ZukIqd+NW=m4L$2Bh5OsWDoNt6~1y4{jg
zakU_J3kUER3Xdqn7cIlkqw_l|;qc2uTV@Y3{H~Rnb!!dw#3~%Xn#;@Kj=KHez=48R
z2#6LH5<1@)xi(9gj{7e(%iw1q?U0Xvmjk)R+kxnxfFtAEQ=>8y9XV!o|1kusu%m<r
zfjdmD>b}`h{(Ar+BS9+Ub?=AnFB4*_?w@zpt$O5q$awW(X}QImfz_Zx&^r;DxxVnE
zUO~G3j|cGY#BZX2?LjewOcgf0uz}j1lkaerRp?X8gis?t>K;Kwy!Ai{#Ya-0<qFIF
zTF-dS|1J}mVzxcQt+ZF^8v>$Cb;?)&4B_*na&I?7nsB2fe8u0>^j@}lTiHsC0_)U<
zKX`S1{MuvWXG2DL6B_ddbLOBF)(Xx-X$p1VOZXj_ypUUd_11~!L)>xZitmcQkrjoM
z#KnYZa-HZWPuY;5R*M`da{wo6S$XrD+7MqQM0Ob<R!x}m63}QU;;Edg)QkA%Bc8Cd
zuNZ)wr0iJkS=!JH^8^bHcqfE&`GiW}AS9z~>MvvPvd+--|2iN>n+-7w`US<S*0V3B
z9)f!%x0ls{ACFEu0SZgfL}WEP<x@r5p*cK*zku3gcR~K1{7lk={x?tb;rGRh<P9xg
zam*^8dw)laZE)jAP5dpA{nhc2iMsD?4vT1SotEx-r@<7tlpUW3H^7fcQ|k7~rUxq9
zAo`Q~uh(CL{BtFP&0=Y>SH$6#Kbm{TEjMa^u0`X;LuO*f0$UdWY);bsk@dE<5~-uU
zu2<Km{x-OFY4sjUSslbChR5AqgwCV9zWh34arm~~)J)9#J?ahmaTpViPG^V;K*#iG
z9sbU^nS*dq14S(s;UN0LsQ}Q8ES3kR=!*XX7+}K_=3g5QPDEBthd*aMBxZ_3HFXk}
zPC*_mD}n%D^EYn0g|P==Gh8-1xfq(Z6@!;d6ZYK<nt3Xl9R~&P5mi#lSPTYxTw2bb
zbbBCA80w%8dDm$p(gdmv`i@r4e5QoZh+MWvP2{#oak3hF7)mnOvVLQ;2#CnK{VDLU
zZ{Dib8@^XY+p6q+zx#3lQlpLg=gDJorpf?hh*B|o(Ha+3nUi4sNBuc3aW1jHnS-ZE
z1Y+#nX=6K9QF6zuXXd*vkhigK*#N%YRFMjRA7HO#e@oHp`aS~u7On+9J;kHv<oyV^
z4IRTTBP-71FNn9y$9%_MnQ*ErPsBa6jI4~JfIJ7tw=R+~;3TuGuh2a34s^hxu+aF1
zIaimN&Pn|);r_`k9$j;JFKW+qS9Im5Mbq$J?Z7|Q4aR-Hhv=DD-|zpopI#hnJF_qB
zqA&ci?B&FgFUUxeGXmqoIA1;!kf5;;)J2uyKC%}Dqxmm?j+tfw;-iECxGu2w%9jf5
zlU}NPfWDY?wsbp?TSO2BnekO|7=n^O)#kld<>4YNBt#VbsR$fUS@^U!d2yfUDrptU
zBZ@bOjg5U}rSCmpOC@Rcnt5|3LjdUmNPf4$nSo80jcT+8{V$n964=v+;zC3s${F>L
z_B`YWoEUi><?WlI4_A2m@(R&{-Gu281Mw(&wqgUHc)%06^<Xx{%cvkvxK_aQZ2Nw;
z2xhk<uAwescZyobH=8=J=&d#l+wh<AEY^G!_&!$wI6>xyX-b{jwD@E+IbJZN;;o>U
zPY|`zkRdqGdq1yE@QH~-MlD35Pv5ph0WA7F!~(VE1SxEYJIf~50R}b~f<(VJb?{7&
zK%8n?;qbNqdAr7)$oIE*u!i+|wZ6fT*OQm}0N=_6vU&Jtwyew}&t_h(H57Ute$g+Z
zpewe?9Q{v42KcmpXZW2H$_+pv;n5!#)HOF8L;`C$QfI<Y0cwzI^hmJFr6ms_Wf8&>
z;*PQurAceEL#O6^m*}(hYKcAB)uJaaDGJmEZ!APuwt6X>ffy9nkMU(2@fW?5m3}(a
zeKAeNS&6Y3oTN5nhkpl|CLa3y@xWsuRHxP^Ik>CJt`+=%;D2s}XQt;`&f??#avtBk
zU~WoqEt{ieuEIs4E&if)T2J2`4JMbcT!_f>Ca>hPNBNQPmu505{BWXHx#@-2Z+&bl
zL8PyU4k)DcMX64hvd3D9jB<0yg>2`4W6;pWQ;r?6oxnJKp5jx@lf5ZRfRKQ;(JFji
zhqf?7qj9Z1&%XYqR~WSYQd!N@Lq|Gx6C3$?OA-p}yDZ?w@o@U2`V@3K;yGO+)4Oho
z<2}SNY<n?0i7-Iyav2mL^pn3k^}d|UCBvxjbYKPzq5+A!qPrMiXI$EN%|P<c5TCVd
zV)h-P0)~veeMGnvP<2>H<En`hkWMcv-@^1nbo*6S9O%Ubc#<Y149eB^gu^H8?H;l(
zoVqhGSDvxkIb?O0CFX>W{|x=<_QzNSrV3QY*u2glmAz*kxakqZ>SI(Mz9F@;@OIV(
zrXG8b#113i*4PXR2DV!w5nZjG%&~EG7_hV6IoO5hvCy%bEeD=5!<W~HgRy0Jbla+=
z?p0AXS;I7W&HO>(p@!YR^gU9+2Q@TV7vGO`2jmpGwWpK6+>%StnW@Th%yFDYxN21C
z8KP5*Qk)wh9fabId-OY7Fr{gk>IG0R07?|_kwV0cM$-#AQM`2!E8G%(0gYC|Q>4}H
z*I^5Lq4ECRrTF(XEoX|kx^K_A-c2ni!ve@)ekm4snNwtT&^wU8Zj-Vfg5b%>icmW#
z&Ctl?_nf)2(8Zo}y!lI*)vIM4)H^g*l%oQ{V{MYJ9bj(9ZQ9C04jAiSszL-x1Yu;t
z<-!2`Y*@0{HX?`(ZlVfv3RUt7z-CL<eFU|!MU*sdfBU5C2EH9h<$JFseG{>|x=Q|W
zT2xH&=9Pr>AUT~DV~bz@-tUgo!KygL)AO3+Nn7{TwH-SQn@GYT-&~30t)qNWA-k)?
z#lcLmq@fHEJ#FpdVlNB=+QF@yF#H;0OukXi5L{SVnRCenL;d{0{%l>;#Kfx~F0=n-
zcLlNi=E-d;NgcBZxqP&+u(-y!A)%mF>1|3lr<q7OY;Uy{7O4)-0<v`5yTtB+RWy%8
zLYp6mQ>>MZj~{Vq{a3)g`!nG~n+snxwY3TB?1yY-YOFy(*&`Gvv!FfJdTnXa2JQ3V
z(})+^%R^%E3NEh#=_B443_&a{E&uE4iuw5Qg_u~HY7&d*Qoxoqe;TNQE!-qg?3U#|
zfRo+MM^P~{Dkq1|x7GQ;dQs_;+4|#N3zPY$nZ&KCb~?nypW{sno}x_bK`^72msh}c
zUext|-N^1ktJLH5+Wp<~6Z$nokwXT5;hk+?T1Liz$Z~MkJ2V_%j3|nVhe-^^bdTYW
zX5QV3>dk@J9ibXepOm7M1lq1Vw7*n+D3FYl|A0r;<KFr3ExraBOU6MV6)4EY@tp+u
zczXKQ%f^P0RkMEfSC3LmLc-=rFWpvE>*0U%^HhlQLw0Die8Y$Un6<sVy?F&Pbb#mJ
z$>}4a&s;UYL^;~PqI=Q1X|{#=>jrd98*SF+&&STr9(=n~?4udV!^2|{a-nY#dSj=}
zh$pY}2=+6sG&thvxPI4{#7aU!(v{`6)Hhb7HvelKgN^;A^<&go^HzG$Ow+d=G;@J7
zerF7v5UdDJ%MP>gzMRz5-z7Q)pjhpNQUcIsqReBHxmGBAa8R8#^x8V`eETObL)q^-
zuAg)-%R{oUlm!uMsvEj4`UVLV^M7kkZhx_sxf=>yJZIl{V};?N77!ptAbAYZ`=<VP
zqEyc(J0~+!-O1@?qU0$i6q72p(b~q&uE=gUQ|tu`%iBet>F=-mh|9_sSyPLf5u{&_
z=jy6Yy0&BlZ_<Gps*Z&|K1_$$eo%CPbM+N%z&eo+rR1|?3^$+v)OONCm7cJtnJMb|
zj?cD-H|#N38~1*B%9ke{E&@OQ+ZE;2$80iZyGwMO`0$F<sk0aF{DPI6kvx}zIlDuy
z5U~VgC_1=>o~5Ow=LhpCz{b}NOXc^yUVXef+5(m#*RnGdw80i|vy>Bh%f8s+vz8!n
zxbpim)9`(Rx8fZ0*-~0>S$BE5cLxA~cSOvTE>DjSoW`{Z0<(;aj7@((P{|sHw?~dK
zA;bRu7rDQDG^ZpOsHdaz^J3a^Bwff^mhWR|$>ZSq?~PER6`7|S0$SRtN+O%aIng$y
zJKUd$CWQux!9ZoLo50Vymtfs+*0S<)jS;CU>aHk)t(BiGdg!ZbYsTMg&;%TYe+>+%
z<x^M$Cs2$1_bY}ZO*%xJl5);l+81Lf<Al~xc|6_QEznn7Oi`@ua?Uw@F7vSC&Mi0?
z@luN|=qU(n5%%CS)Z^_?VZbqM5yUk+JDV%WOoRV)X52}ze=u9eDzfBXFc3K~6ZmN?
z^S>S~7qoVXX~cUA{bey-7(tXzAjzm7057<-lBocqbXeeA#EUHbPN0!+Iub%#Ihitb
z|NQ04f3<c4nK#Z&%=%yTgD)NpHKb*Hf?l3&4vnkR0v3JPR`+dwYLAUJCBgKEi}hrg
zetP`gVWzlG+2xNtc8}}FNJ3%u4FRMGPunrXGUS5H&aR4Mj^V&Jp<-6Ee}hSgs=(A+
zgMN<Ar=Q-=kkqe_w{>y2!nn?VHHNjMqN0`7{`Kn@UYmo~yA!3md7SiR`T6f8j@pud
zot|m#gul=IL_bUwNE_1^gBpoyed5ygE<iB=?MCdzWw}19lB&_B(l^xQ=eLUt6`5qs
z-s^<;?7N+)99@g5tdpw`RBrU*;?J#;2yNaYPPs;xHa#Y}4F3oe1?Y@S>Q9oAk$!iW
zrxmVRR0$~kp>#4^=WzCmM2nD`T2d7@yP-wnLETLkC3!hx+jhHKo{s&N1&aA$A%GpM
zGq-LZb}^&=E*J%r@2m_GFWb8(W7h6H+Wu3p5PUYY8(ON#qLn?k(Cifx69Z;L9SdLD
z+1W7*z1eV?tMA)6y}Q2QeK_1P6WxJIa&j$yqnY!Ib~p-2-hH`6MPJ=^1FO0j5W>sW
zGdCYvG+fk>vygkg)$rk9zHz)*i%xs@g*^(#`1ttFTtm72hiPDimL4}<Ig^tc5x@KT
z|Mt!26!KcmPad}goHae(?t$GT1hBVM;l<g3v7_44<f@-^-}-+Q?uJ6|-%s>~-G1z&
zL*Z1w+CRBlPtw{3p3t5o!^`{0Z#g7IF^;@6>FJpj)#%;z$=XK>K4?-O9TCk>j-$^1
zn$&t4oK8_*oU2<Q(dK?x?9bJf|M8mQG%wg$&k^;^7r#j?PzaL7<#nFo)M)1>;mMdO
z>mwkfB^y5W9KzRf6y`9f&|XfsNrHHs>syi%6aQzMDD|zG-r-Bbm1rd8Fb@SW9c6jP
zVrhqG#OWb~yT8AGbxe(C<6DMXeqrHZL=l7hhnj#hd$-O9Uv18N0x%h}<ow*b=Obm;
zciY}f?jUUy!jYligpwJytwn)X874GQm$Xi!HLOLiPa5NdC`~u=qG)xOhZQ_UGyx3%
z+kUk)?xG%79Ep{p;nCmz4q9Jb@FhLHtV5%e1OG}D`MC0)V5~H0&#REYu?Bma)MEUt
zYa@am3cKOrrNex<-K*YNY!#7tIM>UXHsK_He7x$c^F1&jCME_6=f4ugM(6Gu9DF^P
z%9q}B6`|_!BydGSNwPC>x0yZcv-|L>V$uK>yE}5d@WYd;m%!PuyTtEkNj;SpOlo+9
zfqW0&=^~JMA=Ak&Cd6gC9`RW-qe;woPK2Xxup$PYD5?g=WblRL1Ox@00b$gMdoXRC
zTAlSM)ysJy5@YI@)O9}REDsMGo7L_4j#<dX<of266hq+E;ZRRJRls5M7H`Io0fHr|
z3x0?cn4Fw6^O@AYXu&WYD0EEP7N|+oJ7Pch^3Ym;_Ws$ksT{Rhk4NZG58B4gk;lcb
z+|H5cqJ5p?^J}IEtA2gGOyABBiH7R5&pA1XlTK)u<vb)?l)0zLrfzwL)gQhr*8d&F
z-ui)uLs0SEVFBIS=!c832AjJ%CPUNH<K1jqfWX7u6-JT5nH9q?FIi<oY}>b9+Mtg<
zd-Xe>+jQF_lZ|Ev=XZw-wRJy>y`4)(no@lQ<FhjSrfvir2q`H`pZ{<{hJ~}E5Wf9C
zEr0}gnJ)BNZhWO&8s%=ZG|tPQpLJaG?P|#-L%%L;lGdhF4`7|IM}#wm+OAjQ(s8_5
zZXAu*X{C4S?;<f!QF1?=YNiXuoS(O-Id^w=e}B8tKPM;U1($<j>T|T?M-1l3<fI8W
zh->r+r1^FU-lJq$Qe39cg?ZjeIj<e;nQxusblj_sbGEh~b(m@d-k^(OEuhS`K5}>5
z+7vH3cjuFF_bCWw3^{#zr6}Lr^aQ~!*2wtwO|J!kG9dCk>5<$zoT2dBx3Ox=&OrG9
za8=9h%O9@u-_S1#!M2fven3eSsMW58JKo&fECe034--}4-=jQGhVA$lFE`Rx!!`CY
zkBYR3poGM}zPEwa77TkS)zdBu0+6sJS;utZcE@p+sp@IB1x<7DKUeo1n$0Og_O?S~
zx8@_mzlfN?pUkTvgwS<RHOR>zLycWLt!oEG1Bb^I)3NSsnbMs<_}T-XT2y;WjEIPc
z)2If1bGAi7O^pj9%L#=>r@zZfcnlH%X9pdM2^H#+uvqd@(pl0KFZ*?maMTz#lyj33
z)4oe-oHp)#7SgDa)P(YNXS|q%j0_Fdv#dl)5Wo4I^O<?TXD6>WLZ*6+UvkQ`@@j?6
zTYdGHX&oz`_u^8=K%ZIew-ssXi8TeQl_x7O7vrdegfZ|uoLOG{zl{T6(`(i)1xyMO
z!DOf+hi2X^H-S~=>Kq7w{LnYf&IvcJ`@dhM!_}Csb#q3S?|)eLVX0y{(3Dq{tf$b`
zFZxcH#JA&r#L!KklNkn3v3NE${Ac*b%$2s^lZwlnZ|B;d+pZwPcjp)JUV@bKM`h%4
z6!N}|-@HDQp4#6lL{Mujc6|_&(e*BK!wHj>1s!$VamPL5F?b)C4DN$QkL)%dwC74b
zG~lvP@>xf)gx=zn3%}WX)Ki72ito+rGM7`G<JKnwiFRqYOt1E?kR&dz*QWa9SS1$8
zH%;XDfEY9GctW8Ndvw3?MA^gVIYgk@5jZI6%a@6BSjyWs8|1GAYJ2)|VApGF%=@Ob
zL_tymi~q3GZXg-3V**GLwa@AZ6edPW;c>dI+5vc>{S*Gs-+T_9vGop_u!lO9tIDAO
z`6n}bEm-MIQl-Jl2$d``Z(d1BG=cQBY#kpLISxs&nEThuvuT;u3f#1A8y#Eb7d5py
zXe(?^C!EMQo{ka|0&^u}HzL+Xk;>fdzJn+unY+8dHOyVC-5u75)L9jW`5^F8=$)%Z
z&SMDrB}0{I=J-*o`<68Rfz-rxOeKAu1B5Tj=F!{b%srz|Wt<yN93USjYrXHkMBXs;
zFIl!-Ed`O1J3Z5qaarJfC;vX{ZS{Zm(5c7TDfTNT?6uxR!vizZNWvYB%HKC!H4MVS
z$^X1jVrTd7@viHI^boiV)<1jO{nnS;D6W#$R*yzb>Iq#5lVSG<E^zpM3rd-D5nc*=
zdN8;rk6%+y(RDRDInN2+Sg%WXIM-kN^L02MSe8~cAM)xtlghT6%?uz19z^EYE%S^|
z$Of_i3zd6&$@Ip?maupH#1USc6FRpM1KmJlE_5#q%C<k0?rE9D5pD0JO$^WN$jxTW
z&=sL6QY}~pl6<EqZSgGpEQ!&h`_TBD8TDF$y4iXIiD^1n6(dY}WrBzC?@Sm8H4YiR
z%s-fzn3@k;_GH;RPRaXU4&Cilcd~F*UMv;d0x(W+f_0+VZ0O_Du=!zj?gcBWfZKwo
z_Qyp!sDL<%n3+wSJQV7G{ztjta}7A5VllkZfVQ<EKXy^(q35#NP}khRZ@5FNMn?YW
z?f2&sC=M7Gf|1ss&injI=AizsdW0-nO$etmzy>7R7cSG((}i~`IJ<K?CN6ivfb_T|
zT*k7X@O}wv&hXxIb3E*zwjteKDO<IYY&-}WP5dU*xu!EuFJIfvlhU!1V@T19Am{bN
z{*mgkS(ti|_mTgH1-`Gy;m>8^MJ>MCS^^ZPHJ-NP94o@l=w#@WG`&Ol5Ws$iKI|9*
zpeOv9@3UF(P);Lvz-)kvQG;9^Uwd0y6F?Lu+#Mhy5F+QPia#%COqsvw;XYto`SrK&
z`${Z_RaMG03y0jETLVE7q|e5|lADGN99+>{FZA|CIb;X)G!qMl7wq}fI{bCNKiScJ
z8N18<Vs~dt<H@;q?5gaKQLyA^U0nlxu$5<hgcCOwDCqJ{V<wG|C+U*3Pt@p-50Pij
zbd7bcc7Gc$ynW(wXzn5pX;m4A7i74#sN&rlW85b&9V_n@KQT|6t=8+$wOCGh?kX&P
zEy{`q=nudhbr!FyF&UgLRk$1n&TzGFQabOu0V|rc`<i)O@K_w`59O3U$^=50%vB!e
z%kmR>k@BOwf-B47-CZY*xWI&T(f*w)&fgqXJMW4#JKbIXCDtfWc=zMq`(t6rJZ4q1
zsZh*+rGbn2X`S1<3rX*7LLd#V@Ff^xq~}FChRXoCLGZ($X~2r~{w*g3|7%P(MO}-s
zhdO%>kaALY<B+`oKm^|Dp}KI{$6-jZ;%&C=v96GLT*`OURIuDtHpgp)fV@0CzuS|!
zFxfKhOx0zKAKi5aS!!E+GY@I5iRL{FT&=20;IV8n8+Yjfcyl>Hb^($=H2V?YQxo<5
z$JeE6d$?Y1SU8;~D)t|I(KqH^Ff&gc-gp868!ff1WZ}&_R&D>AjT8az?NKGIsV^%D
zM7Zr<FFl`~>+YUR$;qi|OlPIGjFddnlGR%d>pZ&?<H|PMIPU1GFl(zlAu)}P>V6;f
zbaHI0$P1W7T!)Y2iWW963lC2sfy{l)W1LA0@B!6v7O@SB*|gc<t5RQv{st^u+}A(f
zp`oIpf(FT;nfeK(ia`C3?fm6-5*sT0AWMt+Oyb!SKiYE5hr1RBvZ+_bG47kZk#MdT
zh0J&+8A@+EUl%V`*XDl_u?!}0oaV0GPrh@@Q$C_~pm_=zI(ltaU$z$b{-4kK?i*<@
z7}2d@-i2&s`LS_LRy7aSeDA`<a({3@+Si?I;<)STSo}pTeXfN06N4^T7N~Zx*&Xhw
zTe@mEFHOTg5-}<9+QpukF=_mi;ZMbJYfX*7xfAJQOVZaSL7`jD^o$_%r5_m|PeLL;
zd{tN5S!xejV-+G|XZEtl=;{;Pn$#6dDtBuxTe|f#0erdM6s0?h3e`+cU%wluPzljY
z8&`FXEI%wTlZ8bP{)0j@&u%hMaX3c=p^sA*IR|_$2FlZZu3KlS)QD*M*-r8Ht_Za!
zLg*%a@IHNFu?jECkbrV!A;u)*7`~a#yt`FkOy`)cCw=h2@xp*zy#DCZx1t_K0O$b9
zEQfV}!_!YPbXH#7F*YGP-x}uL;(au>dv||)LvVjx<f{ZDV?cFpzerAJFplNF+2azJ
zNGAh{5=ZLl>I!O+o?=}(jA|rpiv{qqByO^2kcbH#CMQ=kPJ_+-|3-2()q9TN7h9ja
zF&Enz`=V>{5LWG!?k{lBQflUR=X3FR-^)|~;IRxO1x_m?!Sv6XP!>8@6C39G7eqGs
zk7y3W8A?;tS?ou$D?jX|<kzFP*VvnvS864k&YcPH^KUP;x3bV!<_GnT@2y%J1)C&?
zIuf&x-@6K1kZVa0`hR1tXDCD%f|h~mMMPiHNP?d`myV9kz4K-#=KknCmy)p~WjT4Z
z&CfQpbVY<QC%IeDwQ!F*rQVSkV3-S6VONgip4)3{@+KzF|Ni|8dLMokZv2mRxkAzj
z$N4^_o!S5RePyX{+<oL6wzZeoG3BlHjhK}57Z9Dwgs-{e((dEAF|t0dJmGzMPDK^;
z)7)=y<5m1VfOyq$QN&*-T5!c$>%AoJUPy`m%79z2DSiG{OU;(WYyHkLkydKA^5ukX
zZEbDS#hmHRL=lM&O+JFN4qe(^xIBLKKbyCjTc3PIHT0$p-zcypb{w-U1_`x2{1IQc
z1{j_$>(g_@lv_^trB)a~$;1RU1s@<-ijj(>>*OBiNS&01FfABt_3o&%SUHh4x4xv+
z4D-ZPugWL(NfjoBZS*xKN2}3oF;n-wlq5s)dTH0*`CelL26uBzABqxqfhpom@}vsv
zM*MgM@DOBW<I*l^z(N)dcN=`3wypBd>Wht{jfH@XEW}r*aW!4cpNEUBsxTNN^}}h}
zgWGaP$ocN%fL*}(VKm`8Q@7?wpbjJNbMcT+yH(w~>Pk~Tg`SID``l>tqe5QKyFiov
zB@!VaG!xyw-ssvsXG0?8-K29|Kl6S{o+c{$uhS(8mh%7Mk$K3UUB^h}w~GasGeqXE
z$HP!6-&$t&Jr))gr|FN6&0bq&Nlz$Nuf14gL><upZQVYK3l|TM$OTY!SgM`JBU<2l
zhj3(~x&UT6Q}bqX>5d0(3yrqV@F_wNfCV&jq=%5<C}N(_yW4}RU%k^&0MT7JrQ+$G
zu6B%_wy*O%YPfQm8?wJS-S|i;fW9J)U|s0h-**A(+JXnX`&AK<ktd__1Si`CiDi^k
zl*kZhG#XcPj-CMs1dXOaKI2j)CI0pe<Dwps)ND-pQVe{e+n-E9wgl=(1Zu@XLi&|l
zqnjruXMbz=cx*54XBRxS@HDdTK~x5Aqu!^*g@wF<=WpP_2nadB`?1wqvyA(H#{O^=
zwsrisOY-4-+&>^-R;Tthu)+KEJ&7R*kXUddr89;$(|{rt08&)#Ju-}`hyi8cf$C-5
z?6y^WZgpB*k7B~r#ecPCTv@(AO}3XWSAlvjAnI;TC(oIHB=sqr!e1+?Q~X@{{NB{;
z-Mzcty~en%EnUbtk;tMq3EO0b1qk~k2Zt1}3cvfuxK~Hbk1sDb^W(Tz=bWoIfP#d6
z&b2RsI{I0L@pQgsrbReV5I{dh{uhbUd_JbOw^*FUMf;0D<J(@e^w8yABf>Kz>U7(#
z5gg1DkvjDy=%3cRQD^SsclTv!i+~L>axRlX$L`!IVlpa4=m=`yxAWJ>B|m+HkKf=c
zqA4x}minUq2}i-GweCWfl$3m_qgyKhqMEL@96A0w*El+b0!#=v0(fx_Tlv7@z7ji7
zT|yIXf)@;K<BWK7-#4dFuMM(hvuk8b;jtX<|H|>*q>^*4E%r++zwF90aut7Qg<gEH
z2Ez=`Cmz}W8U_VELWYPpp0#a=Q^plLL<DIe!ezN5ODgE{Q&N(=udi?1qO5OgmaTDb
z$&ZHpKzBO#dzAYVf^$~37tu`-q7Vp*iFfsFjj=1|qZ?o3P5iUvbKW3AI<mys2|-0V
zpddaZvaAjqKOohh(ZE6J3G&aocaZ<30kNU57f}NEwn=ja+PWtvCqHFI>7MArpk2@y
zwdk(iX$%>685V-F7%^iEKtBx#Ne^5oGcDi8rt{A&qY&+WPw5DVnrsc5wrR3IxvkVn
zn)ptIw1Y;|nRxLix5J&a7xdOZ#ddgPU&;R+yaA`z!!1SJz{#=M%og<Befr{_Eaa%5
zux1XR)^#PUrQMXTHyvu-QiO*rGUNdvTxO2HG?I}a;#-Vxy7w(1^nSAjLmkZxz2|B-
zbA=q+>flhL4AO*c$1`a|-3PS<S*oxPAwh`4pMTi;tC`iPwN_eWJCP-ToYc6^3(vrG
zzLu{fH6n&VRUW9wJ!gg&vp+w0Q8V_ZtOK3lSBP%EpLWZW!gPS$KohRY;O{@&#kpb;
z=o6%ilibDg;r5lG)PH~EsIe!4*MfY+TU`;f6|;3QotjO+#YMU>I%QqGa!<)3;XiF`
zUE-g0J5Vcd@GuWN<wk(>6h9Q<R_ElR;s0Ft1)8?37~eC2H9=j^VKB#+(C9_v;nb3{
zB8(DsfwgG;Rh2W$TS$ou?Nix>k){`lFw#CZ-}#k8uw<5=PLa?$=|&yL0lh59qj`9B
zB8HHWstNP=NBnsES2;TV#^+D-LS%pvRz3)?=$~RY`+hBx??z}f5Gf)clN9T8aCT1B
z)wM5I6UNKNQ8Z+dSlkTppqP8)%}{^QBi?zguV&QJz@ohBE4A?kli`=Om8gfPAU#5d
zz2Nxla@@2+3FtYn1!R!Gp=0=1b@iW34skCk<e$NUzyYwVzm+J9HAKZ{YPX&NI79_0
z!(5lSrOXA*x+-QLFqp}TKum>*7(n(#htJH5J43wv>~|A*ZJYG(+}r)3JYcvzmvrTa
zH-2lINtQ4%%xy~@eL4H=pe7F*Qx-T`6~zc}cFc~<jUau7H_Z#k=aY|SK(Wu(r2(ZK
zA%g-rFLtT}pDD$H7cUAidVR|WxB#F%JJ;GC8MTlH`X*4jU4;spJ$J-CFxa%hS|_;6
zYsKmf(Q0VfcF7mhw8OR<JKV6Aiy!kJ$K5@DaW`=Re2L*#JlnwJX%(M&n*Wl*Dr45N
zN_{iXQNa7ycH$kkgRUJ;Y<CluV1&~M>>kd7Rf=z;@neu_8<y^-G8SyjWXKZ`9-Ob-
z>0|y3Sj;p<tt-mxAF=Q1sLXBJ9j<ae_<+f<33-59{*zZBM5Fm0dI(A87HoPeSy==>
z0DtjTT=4>`Z@B=Q3wPD%22Dw9|18mvceSvCTFMN0bt7CT){rqvgoi398c+p*)IjLI
zeu=IiWFwW+a|cQKqVs9J<ZpmplRkoizznA_3O#}!xML3ig;ww@N%A^hQxw2fJas%j
z?#U!rw?~y8mf^0514<Hxh)Xh_EVymAUxq@hjCrg0hoPcm#_10KT$G_z(5@99{m9Xh
zvVWjaNo`9N^V^VpG0$jM<*U(ZwQ7%*&=pHS9{VbS&{CDX6T=NmOK^&_%U{zgd&_#h
z_4-g1P{IPu9&SD_@`|HaiR6d?ksdJ>t*J!jl_>1XFh(U-=~PS<_z6(c$M(lQmzpI@
z)v)(@a!09mt<uKPfQIkM!<uO+Ztqj-W@^I9IijjkEV77GPg06yRmBb%BRoPsHTQ@T
zBdSo{pfO(r-V@JT80o5L>fkHdDIyRl+GZB&4Gp&y+fZQY<aKCamSKPx4)Yj`UXm@-
zs&i#7Ud@G#c}yC-De}F&#gw6FA4Cnh4_&<FKx3}j8=fZw<Sw{7La0_*gf<c7Jw6-Q
zAVh4Hyz(XOx-hoYNQ}ITczu!_7CQq{4@vS*CLBR%Kss=jqT5e_xR1bs@G;KF%q$Zb
zy(Qn>MXp-wTxI*{#IE+3qX)A`jCTB2^y8l7SWO~pQ#gq(SMPOv&=rSa!rm^KEaxW!
z3w_6y&94{>EPsl;6fl-L&gfD#zQO2?G4ss7wBmf$HPL>#osDsh8kl>ogsJ3Mkv9i_
z0c*^Hu3+|)yp@5ym{T&OEUZ_8%@WMG)Xl4_JsIr^_s9UtkYeV6WuG*Q{!84fvx;(F
z9|fp$^A{raLL}RjGMA+yeS(A%y<LbMXIYKg?1Y{XP#;8&o$m9u+r33kV7?9P-Q%P_
z7*q7>FKqO*z)%NdmQ6$J7|if~Yg6OD{e1*g7m$)*EZ)4%fgfTTt4UvRCbp5Ky8Wer
z18dk3gmzo~>nXbUAnuBivK85uAT(Crm@;;qo3!%YDS2=(J_1i&g@ylj$f|p6KkRyC
z+I_<PY410&z#ExY?`@7Su|}(AoxK29Vv-c4&c!TR$W-%e21==<pk)B+PaaHk^Gqek
z-7UI)6a;~6bj-}q4^Wj|!;S5e(g2H}#BZMb%KgXu70P}}U`5Zl5g0zE_bKK<dBT@(
zCqaRKZ!4h8^VFBU$a$WY>dg?!gf0ZI*m#RvW}qvCyNo6CF2wxxsI9hg*MCx<<*eP3
z=nKDm&gcso*nGdra0B#v6xFGqYeF#@bP!0Fy1v2V^}j7usNzcAzk0_ptjY=VCnH~*
zytCi{!Tmtobo@HXM7#EXzkMyFok1tW3SKXHa2Un+U<(iOe19MdjY@xM?7qzix_t?6
zmUZjoR`rfMtSF#xVER0Gf5LPM!v?c}M|L<qhYN^#G3Q1RW8&cId9m|*dLC=J0^&xX
zm&*ztNhZ&_!>rW4o<e@|pP_pxL!FiyJI^0e7L+X=XJ%egf(+TKne>E#qwO@cysI%^
za&57)s~fis;#ad7p{ZA)X$1Ytj@gK@c3g7w%GJRGc)1G%+yMrB7=i!~?Y=s2@zw{P
zq=($HPm1AK^dJKrclB7_*v$vRWmg=O`D5fH<Pr~LM>M7Mr<bXf!A6UtL1-YDAI+ZP
zRy-pNE80WC{_&g$5aOY4qjCzqi<o=nLy6unhY$2bl={$=>p+uy6#amb=X0?Uplv{?
zYjOO*tzrIp>wcDcWEiwf!0E<;rhuFNq1-H@UHnS7{4ta*LdEMAG^7ArwL&L58S&T^
zgY`#5v_KlhF%WRNW~eeUgh~Mk<|#U#GUh~K&2Na~1$s~b$)H?m)^+~4+XD6i6mW<H
z2wh<6pqWg6$eG8fTAY925^inWDX1sk1!JMps8cTK&lt-m>YNItj>l>9=S5AC5RYR<
zZRsB)gn{1C)27LReJ_9i?Mt*Qtwc?J4k%b7$%VrKd3A%HF2k|zUXeGxTLFk#Xx)+s
z>M^~(M^&a>AVC>mEP47<Ept!;54M)@^@Cq-$Y1pgxa?@Pv&_YO7!JeRtQYp>o>aiZ
zWMl(%d)+>&OIx}dKVSE@=1vSbf9u+1RYt@*+EKz`RKg6Smln6skdww8^r%8qc2$zX
znP^T`;ikRjF)7`84l&PJ8k^wC(*CL%42P%{NxBvlbw=o#g$?uIxTwhW>vRhWf>u*B
zyGC6QzBGog0(zw9dnzhaeb~$X>#&@59SNgt4EBvPC5X;lp3r<a;+nLf?u-YDnKF6j
z{?hG=!RP+_5u}WVj{ox^--)=|gs4Hr*XhvIfeaj(9;do=xPwkU`eMOugj~5}OdKze
zb8z#SgI?;~YBtfh6@x$#g!AEsLo6f&8trI_PeKJA&g8BZLnJwEx)O1K^!Su9tDE10
zc*v6|Jt8Jt3cajnKdi}l`bFa_5dI^Wdi(igjH5iuHkVq`Y?kk**5w-sDgqabXlM*s
zDpwKigs~tB>*xgMe}%)UsJG~leN+q2N`ywQD;b<HAJRngNyI|*>oAdP?|^}}$uBR<
zw!Z!D938t#Vm8zCMJ1T$nhN`!Dm%t5m$H0jDe7=NR>XDGrx|u4B=*AQFb!hC0O+P=
zFhHr3l9CMA?QcCkAFVnms{5=GdLJU@HyCPgLF|nhiqPc-B=zIQl8y4PS!LJ_P7T@2
zi=ulK*v^lj&Reqx0I<%2va5UUI$uOwn_H?<^@J3-Qme3sz-8bT%dSTKnRYE?T8?~>
zpX+BzrzxI>e~%7uVs*Ch5Cke2dy3oYg@`{$95xNjA+#bz|5T}o&T+{Vdxi)NElMgV
zj2+$xZ*}#hnvI-Qh*EezrtcUnA@h)j#|8q#-Ii7bh_Sudk!7p#ysW^u2}YoMp(%8t
z$c+CDr+pF@JwXx4A5I2^n2xb#a^<)~3^+zOsC=mZKN*A5o&KX3toZdJDmrFlFTq>_
zaVpxvn&>NZTw>_{AFZ-)e^^LCaKx$gN<-Th=wZl}*yPv}%MS76XTUDIkx%*x!%BU4
zVak}Ft8-q@tzo8xqIP$z@f5ut%GL-z-V=FEwmy+LT_FGL(Pxdx)t(vP>zN6}WVfY+
zHgQX*f{{N8L8!+9ya9f5a{u}|j1Jr$0^T5&vRVW}1_f_>u3iy*1<`@ru^8}oS<}uw
z>*7Px&P5;=y0Cxhbe`$Q!Jm4)yKUdNUWWfr%Fy{ohPACoMlYh`J5Mjaj9ifSv7a9<
zWN}1kuD+vvnDExYs!(zyKdJ0u8r$@Et!hDVPqvL=RX1<k!11+uii?q}^+a>+1Mz6G
za1ki?Tlbked?c(RqboM6G%#*m(55RtP1v8h0MNgT3@A&Pq27ZAF_N2u%H4VkJ1J7p
z%}}r5UqrsU%!>o@Y-s1dP3A62n5@KHCIp_|KGpkmQeX1%q;odM^OgJO%-EFfq|fc>
ze2z$!Kp$AiqI4zUHJK5F)3Z=}FV@yM8TBKCTdwr;3Ko#GK8n`Ib!Ql!-Tge6*}o)D
zv}FUkzDdFc$^IkRvZ0Pd1np0ZX$`n42Qj~Md6mwe|NgzSHC`ZppVm%FfU-wZt%0Pi
ztQ(>xitj@PuqB0}!Z4U+`{HJNy?OSo+^oAED@hULVy-UoSfV*UDnNrsKV*@kSh2tV
zVJBPZo8`(w`G@xush|EsMv&h6XfTd$RkRcutbl58L?P5D2@uwBGx}n_&U(Zc3Ufp=
z6Cs|r(oXUMmECG@PJo8J9R9z?h`qmy_n{sD$*|*kVy6134H+&PdI<t4OLa^l1LhMC
z)^-8}CN!lFXv1^$6mZ)me2NW=QCpP!7`gLNXzdewxVa!MY_u5ql&BzDSryx7DTewU
z_ulBrwVE{m+mc8;FdQgo#swyjC|n5w=qjJ=%h7<vrJ=U-q4~-==O1>G>h{3??NI*-
zFInNumuHN|#%2<vPn8AI%aD62u3B9aV@*dz%2~yLb+TulOwD99b)<L1(x@e}G!5jq
ziFfjsOG0s(SE%ROARs_&1~tZt-~lxK)uA%a*e{+wwJ?#_MVaJ6EP32rd?kRbe)Y=m
zNAqM-9;%5}tM)&`1S8+l`|nIOw4JOeyPXvBk0wW?HVKmn@4Gem2wQo1L|ABoVJw$)
zKMzQ%efIkQLm&P-TDm4F<^I9RzYXlM#|iZ-SR5i`-=IKzvOZGGFcjF^(gOM}#s05l
z$(DIkeJ<<Y=n@oTvd>H#oSCXQ{f{z*aI@7YU_=`EF~AoE#Q*zVfZUsUH8hY=AFCRC
z)F(*f?6mRdhZs|e+?iMxuP9xU1*Y}=+Fsrwus`f}VOH#f-|v3OWk0<oSG3!DHTNLa
zN67(}#}brnH2`U^F`D6eOQ-pzJ4gp*eQe|W*F#DHG+YSIwF6dfl}8sIu4u<B`Lx05
zoAbtS=Mvoq=m2`Ym8lKVCK0|D^Ki8DA*+76W+?Y{oiOD@iRW{H;CT(Rfl5^A15t|7
zIpTz??Jx5KTsvw%$#qf8hu?}7lfq*Wr}itZ$RGeU9&ax8h0Se8b3KQ(AvyVM;a*E3
z!J02YC0I0%<k2Hs+$&$vj=mpkTl^c?CxIU*e%K64lcp@~jv{%;p>85^NkSuXa>7A1
z5$S%{wQ4t*c%>W_Gm}W2??p*AURF?*$8Z(s6}4*{9oPa@GBIm-Wy5`WW5#i@+?7)F
zGXPX)+x4a~STU$Y^>dgE3iB?!e-(xU&~h1z)Rj(%3tt%+o}Bcf1?Sx2_y!ESlgtY)
zk@L9G28rp7&=n`^&4bjRL8-@#1sj2`)dt{%6;ciM1FZtBS^{CW(I~8mI~=KUaoZ%z
zN&kwrGox(UbKj*<+UzNw9;5O=yU5Qv*W911fb{CJkvaIsEo)hYoB8K?q+E?9eWO-e
zG9UZ1k|^EqPHYC>9kygspoKcnLy-AFA~pocRLqt`kP<c!OGEV$%H$Rs)i;QcD@c<L
zOrJB%qws%zU41f9O(hQ&e8-fx?P|q~tg1(8t6Rsx&l0bywn7iHv4UdzskbF-{^i@v
zJAz|G60&-e4jcg8z9b%kolRhWtmv=0rvsN4z_5B{gz5!7q+-6CH`(ofJ>UCMNIQon
z3G|=k6&Sgq1J6KFmj1a6j{?&HLFr4S^Ud1>=-b#iA3e)PCT_;$odO=)HzVLO9~mlt
zTL0<j3wLp#DHyEV|35o-;6HO7n@;GpEMQyX==ImrCq(CHFzLRO6F&dHch3yP&c9bX
z<9i<MoT=ENaV>n;HeirNHBQ+i{XxfzJ!Ug-UF6ku_kZRc4(dyhjP_4g6!`Lb))7%>
zH6sH>SKFATM=O7B7f_0}e|gIcv@<p6)I5#o=Ila~V|R*D%<uo(HbvLHOxo2mx&zot
zPX5i4`07F75%*)O+PNDd56pJrILvU_3%KVKc%Z<>1Ah;^buiGV{X8u%_VlK;uY2A)
z3U~JRq+V*6*z?kON!kCy$-u=rmQEbcOJ!`28;Ufr0rv<rL^oPDx&%a}{s$JDr?;(p
z-0y6?a+BGO#h>RWUpPMh;a)bQh5rkxj+L$byLjsXp9j^-?e~95a5*^3ygMuiJi<Vm
zLB3(rsiL6o`N?13-M?8=@!c|d?TzREx0mbN`?3bg9N)kF#-$)Fky~C%ShzSZt+4T#
z@*_gR{FuFi@ZbA)b{0H!3eW4YUVKpC;-&>hl};?4<{o{E>1AtSq5cv>wPQ!Nu-4Ci
zvLyCQ(xqj~cc!PE`|;<F%<M<+re?0|jd?cb`4hW--#Ny={dG@!ndY~p&lhrNmPkHy
zK=^@S0r&UK`tQSkPMDXhW_$ejQIVssZtA7PzvwftwL19ag^IBA^jH1y@(;EY*0b%|
zqT~I0owNhz0?r;o<^#?T1PhqIR~sCg5Eq}M_PO=u`p-IRQY}}^eRtncLm;Ilqvxc{
zq?0b2>Xyq{T%Ww3bsn?6&S@=^<i7vLstsz!$9S0d@9bco6SDWsVrQe*_h-bPoDk)=
zdBZH#_*;3`LjIpfuIzCC<#EhiqMLtmPrrf0Tl={6_S;%7FZ(O{;npUduSwZTstsaE
zJs%%l;d#egUSK6w`TF>j@7gKFt9AbV@H5+fsHkpkuhYD>cbyJTlfG>umlP|g_w5MC
z&?Ap{zViZ2Tz>cU@6rm^<rBUi>y4B>lPT-PpnJx4VukFE-eB_?Ouy>Qui0%mDZ2fH
zsM$&J?V2H8Q&y#VRi~D%76p=7+s@X#W%zyJ*$D})-_;C1YVG#C+g#yZ-LPPPa{`dG
zchC?}DcaXwkS>1lb7GZqV$$8cUs-ooxjV2`ygz20;1^vSJzeO4W^&I<#$%1E^Lm(^
z9b_`DY`tMRr}U?*0&fkQ9i!&yO<KIOn*T6+F{HN`9^>X=;GC0kf!n2F#cw;FmOBsU
zTJ($MTJ$FNo2!a2-mblS@Mh_D<~5Ac2UbaI{|Xleu6`mG{FJt5oT)YOXT!ZTA>a`<
N44$rjF6*2UngG4xc&q>b

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-32.png b/srcpkgs/void-artwork/files/icons/void-logo-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d345a61b2669c8ece2d5e4d30754882fa7082ba
GIT binary patch
literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x1iVQ^K~z|UrI%Z5R8<&-zkkn7T2KO^iuxcAh@pv!frKcO)<6rzfshUp
z18FU2C_%(a!i$7@z(_)T0gNK3fk*&D2S}}?ib#>7$R&758ZjisTL_2&gfhc0bLRH}
z&~nb63wAxOz4pJ>IcJ}}|1Fe=j^iC=sZ^>?RH{^Uyb*JsqC<fYa8c1;1o;lwA2#7V
zGbhZvTuNOjCfMG!{ee(0^pdJR0}L)PZ&F0IlVf#kQtZ_K3b3PRN0{?06_sVcfD(<p
z$Oy9LvU|C8Ud_C#Hi5}I^)v%SCE5>jfRLg~%T0OL&VxIL+XMwa!S1fzgEN85UO~q7
zBg9SoA;|PtRqTh716V>Nfp!(`G-6H|G3U~n4hA$ZT#!nXC@>8u&lf^n9T%^OpYa8l
zw(f;U>ip#a2b|3pZ6UHIyI4gx#H-@x3I*Qv)vgLR=eDA>0737#s(v%@%E0RS`ug-O
z0qR!FUykZ5Fq1!XJ~&_ay%a}VcUv_|0vPHY6J%wqD)!pH0cu}=ZUnB|Bi9$)u{2t1
zdlR>d#FvSYDtg!wqE}rV8Lx?-F#yKRy)6H&_Hhwpf1UH}kp2dUO^Tf|IWrr`dWHs?
zfN2FVwQn|-E86H0j6wAIVg?<@JIXqaca#;<G*mZqp=|W>iZ-<$Y9ACdR|0kF-{F#~
znGLprjyk6DP~}3DC0CPIM**~Tx1AJ~wG9&+Hi(FN=VUUOm7#E`8R#3fJng3IjUrVR
zpZ2}ZmOriL-IZHW-UdeXd7Ot7U7zSqY*AI;uRUk-oU;g@dU=C+(g5Rq_M)A(r>{Iz
zxe$2THg*GZ69*FuYy*;$kG-6VK4Jj>7AbndT14f=0_HbFEV1$ddMxY+qcF_NhI5g#
zUatL6`yfRhEE)ht+ZJYq%xR1EE+Y`|ve!a{yj(hy_ARb_NL@?$w0c!ti!^J1OFpri
zzSqmeYvR4YPbK*G#2=5RyksyGtgvYRGN3<uSy35nEiJ4o=B}bvjln!-p-&qy-&+FA
zuodZ<(DN>^y@3DL*%M~JmnYbCpAT}_D7pPUF-)s<8hx+K5hoX$7@Mo;B7~ED3jL^}
zEwPEQM%zZTZQr)Lfu}6Fx`Wp!`y@i@3b&r&<wBqpSnNxE-C#Yi{^n|rj*TX5Pkj@?
zaIgh`XLTV`7TIeKIPdf-`jLN{ESTyvR~ITA9UDy+GY25eTHuI>-5eboO&S0Vuo}pC
z1R+Hd^-fbM|9(Nlr^Npby1}W69=ky$O~9;$8%^ow%Qv4=bd6>1P?x~hbt~rA^f$z;
znpqb~GX*%JqN^I7X!sTSbVSuo^BrNNOKfKYWEI)yhRn(@mc8%WCHtb*X{-<lwWKxo
zR=)Nwl8U5!Eg3-F8w-Y$$s7gl&r?4M+NmNPs?r0T&V`H{akCX}&Wr)ASD0}-ot5wC
zoa!_^tOWKH2yr_o8p7I^Pg^x_Snir8u=fhLi*E}xy4IUf=c}8}nIVH}ftA3OewZgk
zXuFe3z4-)1FDCU)^F1!o3N(@b!r?7@0ode{UAxcu@VA1>(h5SgvuI#gQqxgt1Re!O
xaJ`qz0_T9=L5?DN@XkTKd)r=V^PPw``~wqC*;EtrvwZ*n002ovPDHLkV1iGNSrY&N

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-48.png b/srcpkgs/void-artwork/files/icons/void-logo-48.png
new file mode 100644
index 0000000000000000000000000000000000000000..d394f47213edab1f6f5cb59a2614657364428911
GIT binary patch
literal 1864
zcmV-O2e<f%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x2K`AyK~!jgy_tV(Rc9H;KhHV0ZAM!*U}MFgU_uCL+z;yzF)dtWEkpl+
zOYdQ9jI@PNm*|3V#%LrtWzlGcL!Cc{AQD(MdTwd9WY)pd(pK5RMi75wGb4@(6J*e_
zwYRbDJ?HU{wyfYi?>V<z_Wkdk_xn80_qp$RpYy)YD-;3G{_)w$kziyoN{xzED>_q<
zn}M5w5?}zh2>cV}HL>KSAQyBwN$1?P#+Jz%c6N4_4OR@M6>R}N3)qGFQ1oR%_SwVs
zQ>kUCi<8k&Z~|VBcZ;Ze9bp5b|8Oyo1$Jsew>gWQw+b<goq*?gw%jV45w-v~7OF5N
zvcT59DSg{pKHV}B$H0o~S*m0|!Zxm-cz|-?2h+3DkM8f?KR=E^>;%-;Zvkf}tE?ah
zci3vb;`Mr~qNuSGaFWi+oS&-^<kU5Zi;qfC$+Y*hf7wJTd=Ynf^Td`eV0H*)2snXo
zMv!+1@YT|rQ04*)fT@MXRM8fv#`$Hwu}PKDJV~4f+SF2yX&iMv;SA@s^E{g>ss&jM
ztOGt2Go&v_Lql!DGet=NE+^p$vajFo|3y=>>AwZp|J^I4k48~x1*&40^ovS$!;*&A
zCqBG70jYPJp7w3K^><r#y;_K%$-;ZVyHUzyJJ1w^e!Oo=-)AP4*ee!so!i(1tg(In
z56d3e_^~2u%?syl=iPK|x>;2>0=WqKozn)VZJzkx@(k3w8>U0>8gR?lqjSD(fBu7-
z34r#V_LYiefP{fIU}4Q)UAy`$TrmT|H+f$?K$Y$Lhw9x8^R9>3d>C7#4@S@`6n%L7
zhXCC3ldqNqeFLYtGJ$b?;4_iw$?V3wCbIUhJtws+b<qL{`m$@tFCIo`;^|_GG-0T8
zXfyC{1EoAD3GRilcTHfEnmmf^D?~thcl(_xx?GSC0|XlUiv-U*pL6~k$9~<Sb?;@m
zGg}d!2;->edf;brk9+^rfYLs~_w(n6&^d?QJ&|?3qqpOBAOCTbnh;92AP+UvHvA>Z
zS7&EuS+*kk1~4lu2ivx*tbmfm2Jr~e7Ds%hH}fT5{UZkP0811-;`Ml6jPkc)#fl+8
zo-|M-m&+wBuuK8*Ex#=)SVwQi?I>-)lqfDxE=Zf#?R_$mDI72ki!8E$PZ>BvHwA+)
zN5%2g{}J)TkE0ynr%|LCxf#cRegkEJMR@fA^hCzZ<lUH!!|U~`fu&Jmu7)7B?LF<c
znK;R0G6$H-_dE-9rh#xeQiw`j6ekP;L4Blu<PF2{G)s*Kb9pB+fXdt`&NbO8?;1uc
zEHPFff=K_C8b2XMSVY<?YT6g&EJmA7A;vKd@XDK!oG??>NLv-19yTV(+ZJGYP3A@g
z5S8bnIH6D?ZAB&Q=!&8jE#RcV{^Lts*EEGRENM8dqFqr!@}S#U;{4S_=<Mt)LkO=_
z%6UuS9|j+lWt=vBCjdy0_!=-6#hZYv?b~08A`MI(xC<x^C0HD@Ea4@y8%;$8O4X!J
zAgp1uvlfM{qH9vg)Ze0r;>%hiA)wc?RJ*`b4fKJun-2dM#*nT_KPSjyMSBdi!?tfP
za%!F5MEUcMcsC$821>5fE`3n|>fNTJz+GWXMOqHIyYu#C@&^BtcZUR0Prye25Z<)K
zKA5UWorvor)17%3;n7fn(3`GF*Cqf|bf2h%CLrk6rEa5l*xhp}PVljPf2_T~0rwk6
z19rgJnb<E0p2Gb8-dct{c8!7xLN3UyGPE%-3<LuQU@U>(e|zsm(47%Jo0hjWZz!Th
zBi1I@o(lZnZt^sgMP%1_Bkgimq9hS)Bch6^>JxQt<H}--4MRvn`O<K1_=n>^E+_EZ
zclN#oY>n`l5F}IYHf=1f)Nouq6Ds=1eaZVSjE`T@nY%EnWIJ#?!e;{5S?@OOUiSS>
z*YmRDGMuDyQhiM#ba0j*PaONd=I#o2{d^z$6`(SP?{gx!GOc3IZy$Pms1Q-<$I>_S
zzgPaCBJ03%4!XZGZD~T0w>!POwRx4QW{7?BsAm<P#F7KU!JK1<T{mx!Gwr5J`>9;0
z=o;W&-am_+0V_F~BtqNkb#C(}L3b4D5a<Ve737q_r2w@BYlfh+6>cMZZ!@VRjQ0b}
z-R4FeEw9EMX%SIy5|I}ib#CKILG}`FO%wwKB@ubacgWrIOkis@(bcI~m<>T|Tym^i
z$``imd3}gE3lZInxlePg=u@QSp!@4}aSaN-Bdh=JrdcvF@(qPej9yF^1Lr|@4G}yV
zcf&Z2Nni4P;d|?6B!=y^jNUdboP@6&=n-JYRI=?+4YV*!I)RC(b03(AB$A@K2&@I5
zA7!-TS1~G-3&4LA-WK$j3cbTR<;BD9&qF&Raq&N_T8iT?Zq@Jr0000<MNUMnLSTXr
Cnt?a~

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-512.png b/srcpkgs/void-artwork/files/icons/void-logo-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c2771f85e66ac1d08cd1ba29e6f0f87baf3137
GIT binary patch
literal 39176
zcmdp7g;$hcw4EWP1w>k4q|>20WK^W3k!A=1>245_8bG>BI;5m?Xe0!rdz9{yuJ`d<
z@BI^Rxe(UkoA2Ix?m7GHv(F(+Rrw78E)^~a1R{7V2U7!q(10J&K##D1Z~r_du7Gb?
zrV4Lhp!<h^*{y|fAP_z1ElftkBYk(#-9vw}_VCa0vs3HYYO`6V1ibx*o*85O0%1l5
z>6Z!)0cq0oIT&a{@$u9RI5<Ai9~c;F6j<NVf0ky=p`cDPMN$aOHVjsqm+A~}yH1_=
zQL^RczM~sXsb1O`dp;s*X_2@W^Gme3j6j|(KVI$s<$q|y!n6TuB?mA@a6iWHKz`%U
z4UXY6iP@8QR{F^urr#GMBmQ`*dza1<qo~W1cSwR7G|f!7d1i$gN^TwwSIjWF|0G{5
zQ-~9wCi5Eh1&uTi2gy1zEjOY)pA{ndG~0gZrwooNXczlf+~_*6tCyl)_J}S2BR^Pm
z01V;9NRD#N$=bb?{CSeFZ~P&s7)KcCPx9#&`OKK3a-L%Rua24gD|#hRJQWN=LV&=u
z0G(8EU-1Q4ZH{EsTNn#f63h^O1l3W(&qSya)Jzop!E9?RkiTdJXb}NDNb#}=-}Lt7
z(#HIhs{*go)U*$FwgrtnSJu|H-}3W=3lf=A^-`@I>rrlct^0P4<8yO!PdSFa4}-d4
zea0^+;Gt3BSo8yAui`mMx{i`JDNNy}VG&`^1+S!*;qWpZKH+v{`2eoW3Y7q&NN5Pw
zN@RREe=3M|QUwx=MuV3Q;_PVJBx<;BD{c%+{X%8EZBt}lQkYX5c=dY3ePl(;eMfq^
z_u#*mMm^_dj>@}WBv~Q-e&9HD{<#4|zjrOVo*hFHB-y>qcF|2Sz8g)h#UA?sEn9;p
zOpe`w#DU!b_eGrF9e!<1ovNnxD@_BkT7ue%2|e-~V6{}e&Xe~R2nGhhz`TpRGYkd+
zXad7qS-B{c-ekXf(GoOCEXhuJ{Hd)HjC`*G;Pwm-5zBOV>Fby8al6k>UANP=i_3~@
zxG!ooH6}Dv4YVWa{i1|j8W9nzpUu876EO*}B}{Z{Jp3dn*e1m@9gy&-3`2_wE_flJ
zli&H786@vX95aSYLFyuZO20J9G@90VqpL}|Hn|qBnc!G+_CeKcIwbsJ#^Vbkfr-w*
zi{I+wZ&lv1FpCyc@Wf%?P<xQ-m?Mf$y|d+m0SC~4krJa1VYWrNj%6wE_;bHs{H~#)
zt*T}4+EY`+eA1ksU*O*jY|<V})>^G30Y9&RPux}b?a^Cb&#>1h-?GmrGWgJv430+e
z<7}LOaN*3^D;Dqud~q*&Ywe_{s5rZ!I{A6R8`e_x@#bs#$8^*qhZBGD3Jc;=5`TWp
zWAOF7!a`x9FyTXYfHN1<=L7GcfbgO>%$x|62#tum_l}PpAdzQRV3l}3*XE*(S@C%W
z<2635%v2@k>%7R#!LJ=|r~@S59A7phkQu~Y7S>OL(nAI#FAURFbX_Si-{1=CyCpZh
z&QN?dfPm&P<;MUE_y3Clws2lx7zo-4*a##Cd<<JcHJ=7J0j?N?7p(!~f?KPn)lNWA
zNKM1A`_FOL6YVGCze~uhx-@-0itEb$ph%DmFU!$w(3hBEazH--MT75ud!e(Z15VWW
zDHH}C3>>Ut{^vS>Fh4pWEn@}7%*O;ShvA#TF+@qx1wZ#oq^V2q2jC!MX^>Yv$gIG=
zNN6**)XRLVB;XWzVg15oVz&olU1n|Ti57%ObOk6ma1U8e!z-Zz^+ZW#bhNULZ8DFa
z6uAmg8gjoeq=RWjez&e6U6DzF-2Qs?HFXXRyDzY#X(l4twi6nXg{#MZP{u*OAZieq
z$~@Sa;AaB8AL(v3<B#b859og!!&pXnBlRt$>NY$T_Zas?*kLswYOB;wAymQmW3LW#
zRH~e*zNvd5?%`913aEv-@i%pAV*qJnRA8^sw9%$Vhb_d0xrS*tCHmXCu8YdP<Lmga
z-%#RHT2Zbdh8V;onhSmL>Oe&3Dm#Y(xE86PqHHDzUO-x)bHHZ#FOFhPh6>hbS@V#&
z`Zi7LO2%F$UcYXSUdzaXV(n~@$D@ll==uj>&64wnHQ&GzK~m_yHn-EY+&M0LE_X#*
zLQ0xSkeG$>AssJFHy<%aroyHw%l4JOV?D!u_M&$cn_2X~P{gHzIEhXL-{+P8vie|c
zZ1hL+?8$ykaU+{U2is&M5Pr;2>2kmNX};;dGsu|wBw%vrU%Ok0iv>VWUs%5tvLfJ>
zL5BJ}^^Qzg?*|i=&uYtX0QeI2oQ2nFg3%P-v>?(%c|m=s09Q0b0sDOp04yA4CUQt^
z?5Dl)B$52MCy<A=f}2R+Se`)DMT39kH3IH*W)`~=*DU%Sd_n3^2rXcB7-KUZ!;r>I
z52eArd8)I1BHWqtTXt8tQr7aM^sB`S1eIiXac&_mzxfC4!by|wR2Tle$-j}W3LzPQ
z^BBX-s2s4T%I=i2TI=xc&u;cat5kwBhH4Zol#+W!SGh?8tx;gqGXsHaG#OHmz$VO$
z(}8*lOCrNUF6_~D#QBdE6rnY>H9Bpk8d$*V;zL1nnzFU2wRT}VND4cXzqba9o0rTA
zxQU?GFp@x<D!-IVnnzrmJdE!C+;417zr1-x7{uW1A;{M|LeIpIUpn3f^81MJ<Os+q
ze)J6|;8;xM`yF0D^Ok8)CJ@_o>$dsd3Lx24Y-EaaB!MX_ma*xhYi1q(AgM7j^nqny
z9X}?Bb7e0y=}Oel&_H?rP9MMnH0oqEnIUt1z`aba8n(J$U+YWGV2GpLbW-G!n#CId
zfq3&0_65Bii@UE+*xy!`OYgYOq3E9~60Xj!(cRn43*W_edcE#ayDZIcsE!)xrQiz9
z!GZw>q0ijEJ1})UC;CBW?^<7df>L&Sx|=uo{UjxRJ2L+Blc-^lx@M9tn?Mc(R1BRW
z5tk3}XFt-IpE|*cKII!coIGYLnUNC$Q<#D;@;hM`@0p#Me{EU!NTX|E4mU?ahXW%O
zgVBMw%L<djKO{wwOSjy5m@6@*o!Nb>k+(@@6;QQ3LAOAp$tb!YD%9&hN!0KuY+-(~
zzkn@#ArR-lzQcEI^~L#N3oZJ`;m40%Jk;3y!z030X42u5X(Ch8CPGtDK|)k;Yc%Q<
zTuoqihDT*v_XJZ-eo40;CY}sg2Y2aL1y=!m1saS$sZx7dexAr76#lsi6I}#C*Y`jn
z`7ggRgG$~&j+sza#wE8pzUmUd?tahS%44d=bA)fL6!0;5%WIcnW}=mkGX<510c&uF
z$?;Fc<{E*<XrmZb$=0gOm!H0WuSXN6QY@F0nBM#8C!U;w@(HkrjtN4S995|iI*K8E
z$p|5>+`meiiKhK7G4N%P+9kp;|5LzVL$as^yLz8u&)PP>=rr0wgr>BdHf|9iV1kU$
zekPsyIJY7t_D9XQZdF|V)OPjrDX4fg$$aL5YU2U4FZnL)ec(ejEqi1paF|cYz+o~%
zyTSflbLI6xO}(O12l^v1xo^<ulGRGI5m3dSnVpCuK8F<LR<I_rwl}$u_K^}M18_xR
z#Eqm4vrC4m?~xnLQia9&KLd;6)qDjw%_;Drb!R5AWc|_oJ|K$m9dy|H0iO#vi*3vI
zNI0?mXt#Q@nB`ogXnDawX8kSqTS^9BT6!6cQOHT)Nv(&f**JzYm>$BWWANEFTDQ@W
z>5WaaC`E#rb#|{A!elAWv#sQjAlftq{FysFCm9BC>^)fC;}6Tec};Dp0(w)UqZ24&
z4f*0gd4$5MLZ43<f`PJ)P%275NZNn&xniL%g#DWY>J|vV;QSwnBy{7&3+-y`p8>C|
za@%=dw_$&-S#a%S{5|xd3|iKibOtJNgOCK*p4~$Z-1cx(*?r9N%qu@^L;jln-3^fs
zw5NnGxzcm4fdHFeXELJh10q`I1s<LQz`ELF&h$$Gel49frXRsg1@v`<?`IL<L6$kv
zY>kTur&mzRzckEdN{6l&bjbYP<T>C@(Bw!#YjI~7tYnl<)lSKLR#6q5GHHQ)kx)#+
z&-rN5q@YPACA9c(eA&2=YL6>ZBRzaNv^ERG?5?zq^;avj?50Ug5`dib%yHRReVAgD
zE_QfKM>_ItD}o|ZbiuEPssTxHQh;t!ER%;5upRT?Li*g~c+5P;A1w;W0=bZry~%HA
zA1M%!06VStK$5Monk?xiI^L&r?z$<1@`5WCnxe7)1MbvINgJD$Or$rOVgv{jA0<K`
zs*5)0Yj<osN5JhR$AGo_A6Ug-s|eq{=anSFZ<27n2m)`-+Hwd`i+K+4IVQfui}wtb
z&xE@u)c2)z28e+By#4m};kS~4nWPr!$kA2h1azrBd9*0u$B9%AysUkTL?$2d21pVt
zic*1y8f7tDKXAGoLSz-N00?*i`Zo!%{42tw!Jco$5da|>@M9$s9;Wy)5?HAr1y~46
zF%Fau2^nnA5q4$B4T-L!6Aehf*ma}loFoD=TKnka!^h$HCoChDH=##ovcWoC;CVE<
zgl!HWZ7n~T#4Lr+kudJHQngSL+8_ejNccJL3b>jzZBd$sUrLw=s=rpL5=sKGP{Q4W
zAIEMpJ$%yY;gcd3|DZ#uF9w(NLFpe5vve1s8ul(FM@19Tl<@a~2Wb9Bb}Db>{^ZTF
z5Ytf~C>jH$PSp=%mid$V`Ls9a2ci9P*e}&u0Y*mk1n@T!e!$ltAEhcYGBCyVhT|$@
z1C+h-IW``S8L3TjsD0oDcnhwI-br0`y+cK-C)QzND83^-<0OF+Xd?TV5lo&7n48!H
zKxP1&X45vn_MvjI=nTc&n~c(Ak2AvpM?lMGcGJ}zL4y>siW>OPF=zuKVzX%T49=aD
zaNoRW2TIjTBPND@PMmtW@V6kpwkM`R^8;V+LzGm9Sk4o*;`wOSlMoUDP7yH1h?GJ=
z8M~RkQY6W#`H<i^;&k`*l9H3Y@lh0ata9vr-A6)7D;v*YEq$=|R7h!9iC;iyZ07d|
zUwgZ}s>YbBUN38En_}Cd{PG;a`i9$oLK=UN=K3^Jw;t7B%x8%t@bpa)#Mqr`hJYi0
z^WRDz^t|qiO^uhAe~HV6!<NTf5SyN?XsQq4Ce_b%|1>%}Gn)BWV_H*PSMRN+EtzYi
zt8z#o4ar)#=}!bxo8aTC1n9bddg$BR5P(6T_;EHl0a|0i)&(Fo{KK*8@7Qslz4m9Z
zsqa&T-+R~GmbNsdm&~zaw1N>BWADb&#jnkPM_SS_FEXL)Y?j~DfO~V2%VPl-zb(dB
zp;h*>7TsdoVq{??n$pt*2}ld564iLzeM|z?4EHNyehYxn(}o_os{#}<UNh;PmgZ|K
zO*XPgGSOvv1XDM2<;P#V-fHvsK0OpC<+3KP#2;7{gbfGCS&V#Kam2E3zNRF;)mL1Q
zHY~>xezfZCON$j=wOvV$&eTg`M1Cbn8lypvP7#&xI1l}Kz!4Io;s6KTgNWURovoa+
zpr|FZdYczk6GESk|CXxrXJ4kGqDF{MHHpr*G;9%Bz}t%)l+X}R;2gjDO`cPxNXEv0
zj=yVBB&(#nK%3b*^=*eTZ(1yb^*<_u8S}ot6P`M09Z5g|74Upq;NNglpy0cuE_3P*
z&3P_t(u;E@!g+~=z!hVFlW+njS?OfL2?a3HX+{okBR+t?n&!f<kN;7j)Qu$$MJkDB
zND2A!B{WfUv4NOK5@UTM!`$kE*q}FrYO3$0ZDsf9VZ~_XFQ+ipRWj}E@9>3ZDRS={
z!2s;x;u<i4JK6%j4z8KP<{rJaL@)zPyi4@@*%P$VKv!f4@~O&LUMM|e7I}ok$vkil
zG`wBWoYZ{hkQaddhEP@Ah%fYANe8d<jbcGminaY6i-VmoV{6V!QV<#c%VHLK34x5G
z=e>LYM>PHBE%2rs%Y#S<r)&Z`5+zRdR~g)fmL4b&Kbl)z!h5W6ETZG|b$x2R1OMIS
ztfP7~T(OtJ`$Q!Y+U^R;lzZ4Mdq+A35HT<8x`lfqDW>P4x8f)Pl%{c{meh^}u?Q9i
z<ppkK{C%0~VR3$K@TcEs0QUjvN<3JobpQbE3YOgF7heglF=|b}<9qbwR6@c5U*5#f
zBl!wt3<}F-=4JQQu*W_00gDsebWy~KU5o`wjj(_I5r`MCCS4!LQL<gq&oS`4T{x@Y
z>2TvGU42EG!eNQX&kclla`J(gy~#cyo#7NfbZ4)+kUR!LXCc&4kxC?NB5xv7c^U79
zz@vlWhq)?xgaafND;-_`QM$a404`8Z@A52-?8`R0mP<dTPUJ<zS!OM?2?h6Im8}JK
z@a>a-0YX@2Ff1(45$dQ&BN78_^{hs#oyvpQ1J}cdg&Q-|(zT-pxrY45JtE7>&SQF>
zvly?Dh`}j2=`HfyIa$amv-R>G0bO<m44DHM(mHS(M=o6DZ}M0lV9bV0!O=?!4-AiY
zNt~EO#3JAeNe4+SOxdh~(!p8X%DArlklH7XUv*!YgIC@l>V@us#L0r)8TRPmq(aFO
z;4sH9MOv{0;HKS$+Kh;9$UJ5!PCVO}6$wO%DbdP6<=_HWS3^J~0kB(L_5I_@8I5zG
zf=c(<{fV#iY<qFxQMwu8vOA};GZnZH#*1badN#>0D|jJP(D|b~`Q1yD4C)<R(Nn5Z
zi;$QY-G{7!SZ8X|lT3i@<H)kIiKhwDRNX)UpgA>-g~Zh3CYc*D#!+|pS6R%UAQ&Kw
z<pu=xCbJi=;9%d$p#gj)S<sCNuuD_(p*{9KICDJTJ4Xe!4rfB!7=KljbG+^3biT1o
z6G;D1Dkcu;e1g()tME|4f4Q?4H~{)XmS+>aKamgKPLk5|DOeRX0@?(<0-Xx|7o<$y
zxaz%%Rras{+M+v%9i}R8<4HkypEgk1{LUW9|NM&V)yJj!lx@-W-Q2t@tGQ&WAquIk
zr5g$O(7gz;O2cmqWVASWp?hGQ4~-v@usTZ=LHfq>B^yd?X%C21IA0&HO(!RbY4bvv
z9p0f$Su=j?VTcGZCHjq!1JkHgafsf+u0%@`51~(vD+Z0}3(kzzc!2mV4c8*Y;X~XZ
zowxuKzlaIFdD4)ZrY?yramtT~#V!&eMIVp-oy_ML)%rWRULRGsN$U?Ii3vmA8!J)m
z*8Ix_YKgte`B}XN?RsW6>6ahT3P+?C+lr@HbWXwVX>d8pKA@pkAiUT+U9)#q-|emG
z8S2zA$InMILG7D%!rA{mu#r|X&-4+`KLNF4+|j(HK4e{nnXx;tXw`Nomspq1R9Xfl
zQn(>E|K#fO+s3qBPWL7o2?GY%swywuP64R7%8Kg|&-W74@$x-F$<t^?MT*ix9TtmD
zZsKvQ-@?=T{@XM+Ahe~&h_rFvO(MS|pTLLWypFU%y~(t_$<6`eRbIiOa!T^%vsHu1
zLY{{1CvPU`Sy{P^{g3>-PrgH{y8|6MqnJT=M|x$gzrc@)_dPEi2TC|D){N*56EHZz
zci-P4k)BN8ku!&F8zeq_D5E#|sv}x4m<m25kJ3S@Wsf@r00cgfM@QMs%MA&SFncK2
zn%cVZhFDQNnF(4Cq>O@|SQkrwWASVxdfBdhQ%F$AH3_3-dlpNRAb<tuf(L~|7b1kl
zLIrOFh#bWzQllT*+Ykv=L07M`mUh`>k`GlfKKj?gnOav=s5UmB0u)deE`5a!J$sAd
zSUdM`2m*eADL^B!?Ze21x;pgyVEvQAd9mSVQ4wKlXZA*Y={OnTaa-NeQY0~P0Tm_$
zeP!Uge1qGPc9<FXkm5z3Ul~9y2%3cedB_2U9w9y6s|@dLP*y;1w?KGyg?V%WA{sh9
zL<O{$rdiXV*Z3!FxpK!LbL6D?E!vVS3l=+BJdBa5fyyRWrSMs^Z}9a@i#^|WyJ0?T
zKwScWP0`D`$^8UuTmXHIC-g6f5d1GLG#$-nx_K{UlE>ZiD8w!VT^Y-8{0}JqQ#7;y
zNa&!cn*jH{KIhl#4s$Kzy8^ojSz(W|_O6C9KScJF{K>hJAr0_59J=zSsCX7ni|KuN
z9df^a)EGIev~V_!JzMP`ay$BSa~pVHBGiIsN<OeOfKXFHokUI8{1=-domgvWe&GO7
z$xi9zU+F^XA{&@l73tAuQ6<pTMv_k4XV3@NX3x!2%iTDQrisyoex5t0_Hsg1_HGJz
zH^s>tW68tDJqn;Gu-qET7nN~%yvI57)?6vyJr2*~w==u|V8a2DBr&r(=CJwJ!;YO@
zF457#=`ny=2Xn)R2#ukK_W^_{{;%I-75<V)$YB#@d_e*GOyDgzQ_82@Gq)jg3K-m%
z9>R@^mi89-D!bNmb9y^{b?PNCgfseJq-1EpPYP!~2P!SspKbsWKTs{8lyYEhc%l8y
zpku$Qd2d*XG-gY=o3w-<yqRVburmKF^bt|(8NL$N@U36RGcPn3Vd-LeON4HufJ|i<
zV>YYylLyMbwCcHNEAjoxYW~i4g5O0)f)-DFyYZcRYxccrD<dSga#+yUdmQ`Yz`P`C
zdY=L3p<KWefh&qQFduSc%PzYpYY{3~?zDjXZ2*<Tapbl4362NXu-4)@M)vtWn%dkm
zjR~!znR%Xzy&k}OlwXFR$K!fsvVXb{sx4Lx(Y5YU4{;tySC@M$cXVqu$pgrnt4XW#
zX$OZ-tkfk&F|x_U6%@5R>Lt#mmW!+o?H4oc5+7{?6%|7##R>Z%lW~N*H^8h1qYQcv
zC%EeiwQef`#ld@RQW3R57)+`LSR>F<e9Nz8>c(EGA!JfdiZcFuoavK%uq1rwS=r^w
z`+s)PkzwXrW%-C<njJ-BlcK7|F>Tuby0CsTmcKYmsi1$mYQ`q>=)`|wgzm##Xx2|S
zGJuM9^CbRElBi*%d2!9D>M%K2k(O`roK!Pw4?yOUCia5@9n`asP8`Zqkc%u#t#aGH
z-rIR)&TjDbD&iMV#r*SJ$6NsEgKIqK(nS22e=rXn-@+zY>>Phs9WZ;J=t7Rofz`=?
zPah;9`|Ge>BTvO!uhs%u8@Y)!*u?=w0KE;zC0W>IXcG?P{%5bx&8aH^AuW6$Vt4r5
zOVC+O@&no^CUFXe{?6jrkT;L|J7@lE$4$U;e>(U?4jHp&nk6jF2#rM76`Dc<=swQX
z|1^yC#d64({evN)1Zq0tD05^45yn3~-YzVq!GS&88&PjE0a6W>?S4HoRK=NDN0Fr9
z&qM@M@+I&lI;a)8mxulK&7j-*H@+TJxO9)XWE<UjE6zo@f4&&O^r;D{Q~cN%F^if0
zX!ppD4yaV+(Q2$w0T1O|@A~V5f*hn0aAOny;@0O4JZ|S#pUw1KE$TIiNWAdUfn0oH
z2BHZIt|+NRQaRb|yIL8;nck!tf{v99w4ZD*=XZyvy-FI{c~U_$q5Wzo{DV3c?Y2!-
z{){bd;Igsdio_1=qdA#-56S0+d7v^rO+d>xaR3oo(?~`Q1C#+r*{xq9l3Z#G+rvJ0
zaV>xD1!a-;2FgirZ}M{_+e~bLW6H{dM8PK$3?@F(q}h}wrrd*xcgT~1cpy%Kb&GeI
zhPNYjnSav%H`*SXAc`>((P^)~vqYu$SBdnAl4?*00|Yp?mR8HQ2VKgQH9Z^Pydj0F
z2Nf;zON-S}zCGB@9$!u#V)f7%!PY}XIJ31VDdJtNg}=+vVabDBgT$@?Ys!%Z++Q${
z8YY(ZEDku^7&^X4Um63DqB96uKp{*!bFe50@bzBvC}+k3Rc)X`Ft-hfq=W}#i9Asr
z9m7CL*&X>Eu744DqDAA#o+!Cx5|&K}$Quv@6uT-m;N`*DrTRM1oY_)TWw7(UbMqe0
zhd3cft1zgQKp^5vsu%5hjuFiX<dQe_LByvS|GA`x8_5lo>iE<;FZWX=J(&EbJBstk
zKh<6F+DYC*uX5%w(NjS+Tcb?>_Sd6XMc%J#aNZU;1Lg&sDiT>AaJCJv8mr<=Y5WW{
zDmKvY-bs3a+rH0Z+Mophxr5Wrd-th(|KhFpxCr0}*zlnpBvI>p?B6(HzpJD7ybaOe
z?BT4X+YajFnED5*!ZNZ_uj-ob&z+>!RCNn!^IwMl?;eR;rklBdibX`^{qyV!H=14k
zH`_p3Yyi#{5vmM=tqPYxXl$cB{{&6bBKrLw1c#3c7&l$b3_!2|^hWrJ@&|TKp1hLs
zfo3*hJtBp?uuTlm{Lp>0o6oPiSXt$szwV+e(#4~e2uJiJP+IH!hGKfxXnf8u46<)-
zbaS@$P48iUGeVgtU?0)wAuE9u-u1V8w}%ba=TpNZG7rcS`l5FNY>B>yKKrhm^{I+p
zSsdCmeLG{;mjbMV0%BwjVem>rs1hiE&O`|VY&>{JyUV?Bpz|W=ZPFulvMX`1M}E{5
z2@iaoQ~b3%(Joj0{P0p|>)ATBM1t{iW!PQ*D@MwTO!xW0tTGqYROCZ~d6@-Wr~Sw@
z_y(W0V`A(*cSHS|?3Gf>|IGqCTT)Q4iEtl>BDHC8``!_!fI!QbUuq<PYwYb46B40N
zHr@nes?N@PG+H;dG)X(rF10U!r+u)pwt}<^FE9Dzl2!?G{UrerLy?n9wmkmTB=rrn
z;jEP|t^sN}!xYbv=16db;8SG-ITwu@=fL2v1|e<?kR>ISi2j@MUqsr(Ng!j_)0*kP
za(nC5?<3Qq6w0UvfeBDvG>nxDZL)~I(qxs*W1p)58h^+j;e1+!1LP^oD^oOw@8?18
zg1*wW@K*II;ny30);NcN+5|SY%mW$J_}}3e;j1U_&uEt5_D!t6?ff9@;KwmII%2l9
z66=$vr8J0s-G}@9>P~%F?A`@Pf1%NlGx>Y1ZmXNb|Di{0ARY~FA2D$P$awh1{$9+#
z&0Y*!0k2s^;$};$^ML^<@;MNX`Y}aBMw#z-H~zvTdwE8_S1)9+FHI2@mW&|{`xbD2
zZ0BtQH;cS=&kqp=Kj><Y`FeLT{dN}<CB)Nq|9uRB;L-wJt}`4|1k5Z^{RrcIHzNq>
z^PP26m0VFx?agc&3wPv){0Z>)B4N$fc+A@?4sO|76m<Ws4+sf>srmW&g;aH>iphmd
zy}%GQ@aADwlher?es@kR;-e-YGxu#<Xvkw$(4o2768(j*q=@(x1pWE^1prC!@t&A!
zDQOrZ2<VCmk2mjSDA5T&QF7Q}#<>V5Jz~xG>ZABUbdm3_2XxJN$9W%C16rl((>fcA
z{7;0Za~#mvAta!(j2hFqXS=L33Wkn>L4Ppnd)JwrPTXhHTpvjnqul8ZQ{21K!<-#b
z<SsRr-9KHV;$Qe;zr<;fyVUTRzV2v$UUsNrWKQ^Y<Azjp@vwbEnpM77@<nfrsX@zJ
zpO8AKdWx|1H)omPfR?}F-sZ^sO!E~Ju3b_PvB=Zpsk4T*;+Wd`DKUz7hu0mH%go#b
zU8_0bC_tuqCx03YwIDqVaG$TK8h4pT*-Z#dsq4SnT{H^~NClZ>fsAdlX6+V#MNYUc
z5WV+IN#n~{Dg5<AXxSJM*5VXqA_t3wnH6nt^qmL{oe0lvUBoZn;IdkIKc=P~{O34M
zi_daFEABM9^yCajTIYb~&+Ns<%Y(YwdC9%MAIa97j=K0nmClT;5T3JP9vaJ`a`;n{
z<a_}*NDpAngMRU3a&Omy*a~An+~^h3Z$$f9CGABg#W???KO9oLy)<MoS?JMqwQFW;
zl@$(j|Md@a4@EWHLOu6AVU2TzV#7dBsyBI2xmO^$Qxpt(YI2K)kzJ4zMd0m}5y9N=
z>$x9>7^YZTocL^efI&th{&NrdAOs=BjYVIK1}{4T<0eTJpIC<>)#w*A7mqI<&Fs(S
zC}SqER0=lef~KMZ`_^d&=e~<#4<rGaXgEhWWx~=QcN8X)mN1xqvr_`R>2QAkhn(7F
z&z~G{#l{a?x@YSlk<bil3=YdsIjl+=o44yu^j(23Oe;x(bb))T<0baQ_8|2br%+#*
zjMGF>z!xA+5{Hsg$$}|XDP{zN--=rLXHlOfI-X+-fFEH411Y~w?7Vr-NkhKj_-#D9
zH~&&dcxqR|h>*I-c?sjKnqoA1l->_o-wS;Nh>QI7g6Jr>X5zfoK|WFT)R|2k1k~4e
z%LS#E$x|O%hHeNl<nMKvbJoO+g09OFUt$}!<5@<f72`;g;|}6kS=lm(mfZdp)`JyL
z!|TK-r;TyuF+ioCZM~tp19R*~)Jv@N0??F`XrScx0UEhOVIGi-P#B!7{7O;_XUA~T
z`0)d9JPb8#Us-QcZ5P>=<>yod0vssyy_b*+9iRvUq7zOP4r4D%?2{}QAm+-FgnUg;
zUKmexBA@!&jf3=sRO5Q!d+2Tu3a@LSK8n{qXtNK~2wmo>X|oRlD;n?2menqOP;MbF
zsWkqigM7xXJLYV6tX!L$MTNd)G+*G8tdO*%;RayS;<A`}vTGSeYSwv~sccLOO{!~Y
zPTjfIoUwl2p91%dE&Nt=R^Ssj6);ZY0g^i~Pr?8s(0>yyfR$NtRxAs<wvbkt70)5Z
zjE7&L>!Sfd8m&N!<~c+KJ*l>Km_{hBv-%}QMw5xQLmtqH^TAUBy;KeX@158C0|E~*
z7htR(PcyCU+YFL!F{45i(d{tWf&_3XN>5n7v*!cC?6+{p8w=;=9;H`Gn1CJxbo#L?
zafbmvfY^L^N-4|RMD?;CWQXO)3GqkYhxUFX&|f7!&_?!nFozW|=f`HmD0L8j54GNa
zQy7<o4)OPXUc^7HR0N6l`1jUHl$TeSUw2d*{DjhP(E4NHRMD1;Tn9*rJyC`c1I^sp
z`F15C_;vmp1rd)``Ve`du~8Zy0Zu?AEGj8A)$ZU1q^5r55es0BgZDS@3m17T(<*sq
z|2{rJU%iH?3M^8%Vq2(qV6Dkx5MS>wN_C6D8?z;JdfP6)vgIq365f(F0_F!lBDVCF
z(rNdOaJ#>L!3Yhm@Gl-;yayx=3zolOPav_uu5ZqaT#oo=CVs<!ITCNey_}MA_OE{k
z<lxTFufxx(Dn8Hw4g*v$gWc~)-y#%hvbH;^^dz)lnV5bhvgkqOdwfZtud!b{0s8Ap
zh79uv86cb`4d4qf5_|G18)q5=wX;MtwYRXUK_j!5zM}kN`St)i)0H{(kOkt1JVmMm
zY8Y+M0KM6zF7KZ_KhFm}+Ts93`$0K0z-;cPO6&oklOmCK$S)PI^bJa%xDn6hgLFt1
zRv@%M6?XUeloG>uJGmH;rBv14eG2s;vZQ5!$VNiRlzZ3gO|)@!V6VX^^Ur{hl}Z!)
znbQS)9eqVkBfZL@r5lcnVhLfG8CxZ011TN(Js=}5jreA{OZtcSzPf&S_xC{QF%Xuz
zwN_*{b!C70$DX$-E1=zx_mjnpqf?u}8mUW><RIDDFPm;1lKi#&?+gw07oQM(Ufkf_
z1#;4w`kvMN`mI>8%>*@WGtY=b%tSX~{xVUn`@J6vq!@DiXv!{JeYcOpn*D<Q99_%a
z&~_QY$Vn^W^%>~DRsvnrffAo`-eK?(Nz6TIjPfF;wXwJ><=x*!L8j*MJ~i+wvJ7h`
zm-igB+nrGG=IHJHPwu_DdS^=VWt|DO6kq9syITcdlqD^YBWLAf129J?xqK^9Dp-De
z8o|7qppjVVbz&{KaK-@4o}G1J*_3%jgr<`mqB@sb53^4Fb-Su5V)?r}96rTGo4z$V
ziboMrn<Rij<v2%kjIQCd_Xn#N#m<x>HL~?a0)}Z{iUNsaJ`i7$O&Q#K%tPI17CQ8@
zT6@~Q`4YDiHUl16FVr%8hCc78P#D%Uixh)6)o)npT?Sf;%<C=L#{FOsd!lq$QdXRo
zv+}D-7g<FZ%*Wcv4o1%1uoUlg1pa<0A7u>{6QkR?qXUSUD6v8Vam*iNdtes46y**8
zN~z#?2rwVQ)x`3u85r9Eq~epaFZI5|L=ND40v}cgTue&ubX;PIsMi9)Bw05f33(nx
z|3ur3DiN>LB)~xdB<ezLH&-|qu?IY0I@JJ#&-=h-AXasVV}g;d%Ld$+_C5|S_YOpI
z6c^!?zU}tYR5$7Zn!~fH^^@B6NHi4bh?%^AbZ@eIm75C&a?J?}j2La8;i^fluYEv!
z+%38=XE$)&SuFf%N*7P1R@>Se=n-sai2r#B;|5KEXstu1CZ->*q)qrR_^JLDrpycw
z0-9-B?+mnUrP6~17#)hE3rpI(`>#7bm*KSG3cacUnm^Ygdq)rwK~m;UW`JEX0&)Vp
zz5!6J3WJC-vp&ywC}*_JEZtO+R(&QVZX~?m7|kK71#ZJ#sMW?uInOHx==3B|Yge~>
zwBM?79>#}?Kei*Sra5$Paq|Wwe#rCTFxrA3ZMbu8>ohmkqcp>!%D14(JM}ph+&wmN
zX{C+X9^$>c6uh^a!oTXVfv$+d%gj&;;zqg#x{53&Vg}$!=<Ke)u0Q1}nKAmluO&Hu
zN||<Udp7BP{2cXeq;9!{4gsyz3A1U&(Iuq`XZ8U6awaXx9TL^?SXoM(w(tJL<!0IL
zGM(wHK#CGx^V&(uV_%XEqx{6q-pbZwk$h*yQMEqvENL;s?Zj{Yx-GVNFmMCL*c({c
z*#lo90y<u#<l}388pJ=}w1$(Whr(ZcwneMd?YkEPu+?;KGi*tT>%*TczoP|LNlg8f
z#ih{+WGa`9OV+83s+w-+Hdkq}P1z5+tEY!T#5mK{>p=q)Cn8I6;K+!ol%|<ZJuA&(
z-^TryD!K<>$)Dl`gyx}YC4T_zqXqP)>#X`UXXQhIOP*u)QT(qPzwS-Su1@#1sdhZ<
z2falH{U2*iYE@Z}vm2#7_a(h34TW8Lq;Aiy06rQ?u>rtkaby0hB!d89@`kFgAK6nJ
z(9~-C8Qq=4E9?&+r@pz_BB1HNJ&&{OF6X7r!BU5IMYcue!-)bD6Vt*^)K)+2m;+2;
z!f#U?MVvt~!{ZO0<5+qaP)yx)t|$rBe6MM3zs;XX72e4N)>*wZzV47v?jer1K%^+X
zwhpP@&PUn+qDeJum1U;)W<K%qlGU;l>n)HKZ0fEQ(YUeg-0AbaS|CKiHCsvy&JI5U
z3`yBM18*R>M?64z#RB4lujR%^Sc<S>jSt!W8o9?hvjd!I3viY_B_1rjMStRy@YDNb
zbbRdJULNx3U$I-v5VPX_Rg`5BgBeSEKnuAg>$<H~zX&&=V4Zo&&S3EE50&cW?|1sJ
zGfH^o_MT0c9PiXKNL-bqf0!SEn?pk&i81-1zENE<Sqx2C#-39ERA)LcW@!UKDfxwm
za8tZQP|^$Z>v0VE&5dA!^pA~ehO)icb1*P66;v(p!5b)=Ndw<hYC`c|iQ%4!(7qgf
z(d%$Cq1>f;cZWKQ2u1YGv2Lh+Y!A3XkwcClhd|RM;2I@Cdb4h-nVE(@bnK&YELj0e
z3D@dPZD+IxQKeCPN}c;A(l#Ty8_sO%I^I7^22|4V#S;lk13Qdzte2h}9b&Im{oq3*
z&0=q11@MF-Njf?q|0T6JwYN%&rvl3m$fV%JZ(tP1fLnxcXBqmq<khM=>Umk_{An*m
zy9Qarm$T*ymBT6(&my)8k&@H<)}d$a_*-nWb_EduwS>Xw0ikBbi%R$8=yYFrb)-UT
zk?z-&BTtM)rsQMeHvgE8ZriQp?$Ny)&xYSAm)e(Y1T7Hhxb5<qew)`u?*)xS^rOKQ
z11mNjdd~!oohHsnj3`Tpnk}Mna2hAmfXoOS>q~oX4p5Z3jUA_LL32%WWrD~&W6eeh
zvJ1?wERYd6*UFOAS8}&7Iq^er6Ne-0i<dy`37gFMc#kh*mx>j$WOj-yW4oa(ceOjK
z-YLL-?V8hY6YDZU+{63HGd-T6waE~X`^#LI^|8EP<O$W7)I2(hir%}%Mu6`2Z5k6p
z&Cuu`KO^_IZ$JGgvltkfPS~PM$9)F^22%Df^B(<$Qy|$$1M~tGA;;;VL;DAKuh50i
zX$?_pNk$f@+movs8|r%0?+wyJ1|rysYfeEFp-KoAZl;(&an+Q9CV9SZ^=IA-=Z_yW
zB&CPS!d{zl30;*`tn~Eslo__BMoZl#$HtNj3=B9lH<!PQkB{#bnAY#IDs-i&dao=L
zNBzo-SF56nX~z2Od=(jpP9y9P;F?wO++CYHzbBtxKwwODTH3~j<Fxj4v6tHJ+qc|M
zl~5Kz?!@jq7;iOiKSfMOQB^L5gdab*w($lzx%QJE0`?qz>n;~9JZSsKIi=D0MI__F
z7lUTEqt!T-YMW{9l2Wlfna3{Qa&sy9EbxUE9MIJZm2GVVkx5mt)Y+}DE7F;Dr`F5$
zw3{8Hdx(@&RzX2|A$o#l!q~RksvpB<H>~Fczxif%i<`baO;}hMBNG$Utp72yVlwjL
zXeC9`S2T{ry;0Md-+|a6CsZ8wW`Sb7P%Q4lN7qRE#<i#WO@o#^YC1Fb@3>|AqEIt<
ziNs0iC>P-%Yaa_iU8}CvH1<FublMQh+;l0>))}16{|0)#;7nA}a*WHx<vS0lFDmNK
z1S!^Ltu&(FJe^`}BhB7eR6agA(QWk-pcedSJebJ!ake^mKz@;{v7RKBBw5^+*Eu?E
z@UMBq+mYRW%aW{s7^d`IE!CIyngDWK4qaacWs0pvw5nXJ(B1dfP8%xN*lZeX*4Zr%
zG`a4yq&=Ngz7&~)Nr6&RQ+29LF?rf9OzAt-{l3P;bo}j!5V_v{A+nL~Od(jN&SL)L
zP!{DweAxzFUt4OcBaXop=POT3O_h85c1!R%KKYi&b6tlc%GL&&&*gYYK9L8RUghrN
zMv+i*%<bD(W~@_MT^UP1YHH%s?3%&~GrdZdn^$jlEu~hb+wW@K$Kk!n9O4HOG&Zew
zlRC})uEhlfUxb!@;@p=!Lo`dZsw|@kpI=5mzgYb!JeoXdALwMlgO+#P21Z1Mug8lN
z&S+!NU|CSZ2VkpQWtk9=*7x^4R)rZ)tHlJk_39A78$5+t%@HE#bN+XPe+2?hd#UYL
z-P^AXjDs}%NU5m@Q!F!o`rn`X|L|}uoZ|+4sulV<+?)JN2m<|k`cum1;>GN2%#S<g
z{d#34XX}f^)|PYcdS19<$bN1F0_wlF?c+}pvxbb5E+m@Rsc8QN#F+BCclUV2h8}-{
z#Q{6Q-nb_Z`A|-It!H`NEtr$5SXr^%-)u;Et|e%DoG-dteHhL639^NqJ>qWq3yCrk
zZ1675W6pQlPFD|ea%IK8;CCRZq*R&Xfed9zq%ABg$V6JckN{p>rc>3~yaga>G#Iw}
z6jg7F?Y1}9gP`QQS{N_*H2ynZ;d1f7ukYqEW8D+nLg3RyF<$IeCq%C0hL0?Imzyl+
zUhbcZZ|be(|ExO2UxmbUMTA+bueq4aX6huHB!-dLlfr{^zNfvZDV3wV;S=A8_>X0B
ze_%9@KxhHA^Vk2e&CjK0WmLBr+;?1DTrF4IrRm=Ljb@gX&OKz>hgUllJ3Ug;;Y4K4
z%RC1wbvt&so1-Yrobr<Irh0dR-X}~tIMUwa-GI%W{U*QP-TnAWs(oC(W&;Fcd^&GP
z23RJ`@TRMOuGU7k!GS^Bz%`+w(Q7c!-+N%y{U@f&rqtE2z2C|*YmknsBj&3{PvsCO
z>$+m{YnMK;>{H(i`rq1+>PIt=^n-03%om$nhq9!y`kr|YZ8&?wcW0`~^c!Qn4_c@F
zj_f;AjT|H-!y5o3bGY8C=d&21_$9i-Y3Q|;A4;)~t2HlZw^A@@|2J2Yj$qDvmwRT<
zX6kHfiRfi3$IYBg1(TrQRI^npbe(S`i>I3d%)`U80r(V-nFl*)!A{8kW`!<A%3o5i
z-maF;5clRs^CGVSlCG8dm+%U{vc##z{Tr&hvzB^doUYk<XXk?Xv?a>2bCMVx;zo3v
zGsh5U$ojg4UGtuxviK3q?O^{NOKBs^Uy@qL&TO{Y{7lx4{wW>#-QIk?^W|C+pWT8m
z@N6BJK!o+aq~iNV+x-4Yj}*}_Gk%$wN}C{GEN^eMCiB6kOTgJ>JP)Mh6ctyG2YKp+
zye;{q&Lj^HyNE&-!nr5C#oYJJj{f$vT<<rZ$rhTDU7Y+hM_fKCm4-Eo9klS7CjOjE
z&~*HuexY=A90PK>GP?*09qML>oT|47nxXX%51aq#3|{cN-n-2-$w*A>{V^grh{w}{
zvN_|pC}OGvKwGO!r=v{whsWPAmYN8uP>K8Q6Y=xH4Xm}=(w)*-Plv)0xcjoNyByKI
zf!nNkUZJ~=!8_0mx-=}&MDqtmc2!l3)Xg8FKmt`veOp^D%M9129NOhIbXS?7`dd39
zw(a8fy>oQW0x<EOIxKl^5GcpXd^ku|YS4RWkE5#ng^9>y=#VhM)h00d_VQWgH_2&m
zmPx{Z?eyH-fPwpB&nHa0nHnqg_GS3x@!IP8`W%ahYjJjVz#w-s5MdUFN$odG-=@|=
zs*|$3Q-lnC;Hrk+mL0#8*HVe-B!}>LFkT7l`Z+f0-)z2-suq$$3G7_IK0qIlI8Q(G
zdllN$B-(a4Y=3pt>RnMtD38qzf)6Q|=~nOUH>?nvnl{mhKH?yFW5agglQeE}F^s6n
zxXY4y(aV3eb1ETlqiw<^w54jr#lsVAKA7k@$W=c&Gt*wLC?|)yyFS<$7Fyn&EQv2D
zVBT-q;Vw{0>y1;9EGEr(Ihy5vZz<^4GImfgzinr3W7t<UhE3=5B5xxg-S=!(F?Av*
z>YadA%=fzL{k@(#*yrnmcBx7*`x{Md?UU0A|BUBvqCA9Hz|nIfr~8t(blJW?k*h!B
zd?TU3-+gU_#^-3Bkw<O8MVUZ;X|_y|B#>S}ob8_Y)n@Jka-A>xw=Y-tFF5v9S&cK7
zH}5wY63BiB!f^J7r895_RrTE3OWB0^y>%k@yTI+-yNXVr)ix^0P+49c)ko*QaBx5@
zCv|rey{Du?0iR>nG>D$o52;`Fo1b2NLAH*Ii+gc*-fnL%sS9h{Uj)WzDBy%9WVTlB
z^S1RdvA_4&KUI$DsE-7ybiuC&x8TgPX;}KVDlpzxtLCT?oiz0t4tDmxWj}uX9pI?g
zJ%1%EDw>*R-<ASwJBv-d;Gc(|k`lp#$LY5Dh={pgJ=@UC$**pSWufzMQZ*D48hO8e
z-c72as`a!fEqE9J8&VbVF#t?Q4s2D9N)=j&wio?Zy#UO=m|woLu)q5rS~D_Pt&)Ak
zHQJ`Z$;TH50HNO@1fSQF&MrT{s_*Yx87@K5#4z3es&W<V<5Y+fcO`-Fyx;DD|GgNW
z<*(J+=_byO<y@=rf}^88I_HfH_cQAmtKn3E2Xnu9=E<1H;#B-g(&t?EZ1?a!Z{c@|
z8qm=8IPAc_y_*YkS&0;yOS`i|%<f#C5FM5H$E2kV>e&-`Z4r@m+qIr*U90Zmqd07d
zL>WPuc6o%<;02d)B{K^PLJNdUZew}OjcW#O=;!#i&-+MdCru)6wBU;ESDLTPLPKwG
zJcu_Nilxn&$c=oU<oXUW?FU5&sJ>$lna|m*Wm}1^Yg08a{rexRiL5<2KJNVCC!0q~
ze0Q~pdQ$4MTio}uX~@~lt*+wd?77T!Cb_mZUBms|wSY{N!}a;Wxu$pituu+O6q<Ob
zri?Ydw38EW{gPK{g=1l5{P{a>cpHDhOx{JN3gOGR*HJ%&z8{S2g!WtM<ooo^M7N$!
z>FEQALL=%@B*jC3?2mcw31HC0fOgy89S6Rt%>6xid3k^o1y?X}GcY-uF~gY=3?c$4
ztMO*B>T!FoBCpD-a$*t_pIVpNh^YB|mc0xSR&&YQV8JT>PF<%~*&Z;qa@$P1XLNT%
z-ri=I4Zw-(*|X}?O!Ea0M`fKfR@tIJmbaZlqBhn`H7AmdGGWWn<-)pxMBtSJ3IlB1
zoEG<)w>4kJ!e3M}w;KAMPA)l@Bu4am0DsV@-0q2h5<r~9GIjGoKu#oUzrQ`0ZFaA?
z{Z~0YH!*Y<?Udqlg;prLl@z9%aVEGqK4DG#7UYL>gP}+C&cJ{cFcSxn#J|yiea>G}
z_dd@&S7XYjPK8YMbSwRCy?%*o&=Ar|?(W=VCnm@Dcjn`z)PH!UZmDFxdDt<lJh3k~
zM*QGUOBa3A8u3~fs}i@bU>-Yb^$ojMgEwcX-tN2ReTlSw-mTIK^74PH2Ssna7tp6-
z^*;vt-yMcXeRjExP;d9MmL>r;f4RaEtXLkR_V*9kORLAexyA0<Uu^aSyjZ8L#g~Ya
z+=0-+UpviBDp+70Pe<(WqT9S}5G7ny<Z#Q4s-$UAmf^$YCitSIeuOM0SO=$Tc!vA#
zfmu7R5B=%DrrSO5X%G1(xu$c9E2@8E<h8}5EP1*5wfTaDnW_5k0Gar4^qYpOsZ!mR
zkB&&7cB0g!O#kthX8-!ccgWz0*R^+<UMr#Fb;b3Sk^gnlvf&_3l96BIttB&^$Ip|E
zHRMno`swNE%~3QhZp)YWq9WEduYGNANyo?CEZxovzgHUeI_7m8%@4MtKYs!e_R^Be
z(~F{SSjGq|OuzL-x3O2`Q2V788657J8o~P5^FL1uyEcDp7JcY7M;zN(gT3_886jg3
zCq6B<Wq3<;ZNjlZwb{=A`O7oa2}=Skk!8k%-sXe0w3893tfr<>`QCM|)V|x1r4bR1
zUknUYg9JF}5H_YTy8GikGc$8xsy9Zo--QRt_wI^^9rHFHWtCla^Hi*T2KHUvdiLJ?
z1Q_?Ma~%}&pz~NyvD~#m$_{*sBag{USvm;|>Zj-e-umZ49m{=VK-zP!c6v8>EHPBh
zR9gZ7S;G#S%jChezfofQ6y1-56gn)$iYpH9Q&&6UB|d)kMMITm)&)I@+0xNOJLneN
z&je7$v5!_LTdhsv$!Rf~ANmk_Y%9?Nwmf_>Xb&HxlWjN*X4JpnmvC^umUt^CkE-EQ
zaTY~L&i}KzFO~E1UZJ!9cYQ*Q|4Z`vBeQb)=As6HICw9=VO~fCH>6X_($Jw`oT27=
zpiy#zH8>q8Rt4>LUr^DY5AE=R4;zRpW@ln*-hFMJ9Bw<8EhRS|I^^_LPYTk>RBO{V
zRwCJbfw{crc7jAFsx<CEyACN(dCINd-y2EY%)Wg>>>%lYY3Pax`%HJc`DVfQeDT)L
zs4(4q%d@P(3A2~X=lX+U8sG5N<ExJ&<mg#dMn>8rCDU4`KBkXPpx|pq_|TXN%k7K*
zn+2%r@*unO1d#aRZ^Y<#OJ3J04Q8bsjlOQEx`krL+V&PNC6(lD&A9bp@Z#Mt0-6P?
z@T$K(t8b4?j{HPuJEvs3HI}J@Pf~Yv50d0q4F&$jbvW?uvn_dRom$(pk-u-d!et%V
z=_M+NNO(ONz8gXf$N~|S%&B!eJWq)I4uj|pM`ejlcYHJc4M(*93{EoGbfGYir%qjW
zdE{Gn9ucS_>UTcrUR+A>oq^FF?<uG8&se4<rKMp1>Pn0Idc0GvsCKuG>2$&z^rXR8
zPS#E%EMEdncf`0JrA?+y6m-3oF}nJl1hL4acf|9az9^*Tef-*eAG{e43hlo{GG~vs
zHK|D5^8c_LvDlldy^S)NtFbE6t1mD8CfSIDpiEFkGl>*;t1MD~#@>h}loEQeWcopt
z@9yd|2y^vv8puAnY6=Kw-trvmx;0;(E8L&KVSyXDha(ET$-bFVM#0m0vs`+0m0qXY
z(!uNQK#X&WJLZg=xX?o;rl-VczZhL4cL|jDVIV1f1U*_}En*dl-u`wBSQIUHT<jE7
zQ{jEgzIKf^`p2!Zp&|LlFVP4Ep4OV>e4qL7t1_eZOiVmct{fNmWKwdp0NW9zaossi
zJ3#Cj&X>HePnVRbM7$W6+jG>1_p;RuNvN_+nt%WO?I(4<axPhrSJ@pshB37{mMa2?
z0ei!?!Tuzb?Dw_J8=2lOn+``($kQoZ7WXvCH2H->++1e_FE2083aVOfr}qKpjTR_2
zc?+94$-H-GqsG^j4Vh1KlO4(Tu^dY7D6MF-mYTReA0GG%RQ@X}{#T@L-@ZNTx(+n&
zP2NF3m5}$Q-(_qc=*r<q)_u$J!9n~?gO1(JWF#Y_h}d|$5aGVmrpu#SHMhKb*K4Eu
z>m5G?<6#r)&5vIv8w!V1l43p=l@<Ah49}r#G3G{F6Kq=zH@+F%sSG=Zf4a^vpg**6
z0xWa0Lt5wU+HcQ7XIYEP`oK|7G0v+~FOr47FuGmb3*$C4bF6v)WJ<y>is#XJ<y&Vv
z->coe?Yy|phvbA0y$6jbYe=0+ngD)r1Edc8pJGX5+U3Rz-O8@ypVaoh=oiXvCVjcO
zBl|I1Wscok7rg&;nT?ID%?;j4Ee+GxX}+uV-pmPk=@qe}J|Zr_O1foBE!)iBQa?4N
zwY?*TZ|TyCKN_-ZJkPq>v{Qbf{ZWQz#v9B#F8V!<tB1<Dz0(i1SHEmARi-O`GQ@Z5
z*IrY@pXs@tQXYO453;0&b3=P4fYy+pmerp#$~=ITY_y#G!u!cxx9d3TbD7Q~M*F&g
zUr6AGv)+gO<e8b#_OPOg*3tXn;!hpsNd~XqzYmFN@<C-~O8FBc&$(sS)d@0g{Hh5H
z567KbbNdqyk}hnNe%GoD5~s$zl{)wzn!Ylsj;?9;;4VRfb8sgR+}+(>gS)#02s~(l
zySuwP3GVI^g1bB1;r-VA!CL&_%$eQ0cXxGF&Cn#ZLQ~>82_Ct}<tCCymMCyLdYkO!
z7_RE-$~vxUkNG;m75x4CcmM9i!{Y3Tg-YGW36HLw;|p29b}i>~$Ub=&AJAKln+ITN
zAdBh0AtmW~-xi9AOMX<QrJF;lv~&^XVaO+SxV(azkXw=)8>FZlbZqQD0JmrA;NMez
zp%~^Cq{x4ZwY!_kJqTsAJrgRdT~Y=h;PusK!xx6n%g4qyZUcXygr1E|WMmLO@EA!S
zB1*faog+^OlUad#8`61=#w<ypFD3>?%k>1W*Y!9j9)H`c1fzOSBH%ZVX1Pn%Z3fA9
z5&**iPm}#=t(37+TC=5rRN|uk^&UR3-^~vpT@E9+D@d7TS)mCIzB>e6i0^y|q+~9a
zI=wsY?Tr_cq>q;KlHgbFD@yLx{y2$4RY;)ag6!|@+mFi1hlYnQMJ;=)uY?c^eV)3Z
zHjMC-_<mcod(dv`w?7F|t!T{c@1;B3v8&#b8)dN+sR|Z^%R%srUHH5`?t8sl4xSeO
zfZk!%^PT^r5H@YoIN#{oRkgS(44v6U1!`n(tnepyP3{Yt>=TUj#(q0gy1P%*G(b3H
zjG>m#{GEWOnt|G1jHcng<qGc)Ow;ctnI4{4>i2_!oSi>Igh=Ov4k*|PrK{=0(N8)%
z=`?EY&(75iv9Wn^#L$I>#1G{Ub6laJ3qnwXlte^CR$gCg)46!t58HXaw%=d#d5vYH
zp7{6Hxa@7XbcKb(!>uM?V;{DDjwL}ueA;imWulrVP@I?A|2}57+N8cR(i~MJz#odP
zP{nvhYnBZqp8XfdVT<44pRi|4V0rFOPVQJ5v%c;AO-!n&rJ-QR^F`?CGsMwoahyVS
zJz4ryrBC#-e_e}fw0dkwxK^|g@a}j1-!(|op3tNLI+>8)b&gRX!JLebPw)LAN%;)A
zM}TH%`@b_Fx_fz%74;N4cr&pDPQGD}I-(|I`H@}B4Oe!XU4DfXzPb&T%4wyFxZvOK
zC*7D;Ekv2yQ~hXyW6SjmPMULHU-q^oWNE&t$n3pv4O-$Ql2sL{+R4`b+u!|qzVAh>
zw&RuM`4_>@vJKrN`}H|&dhA%M*`8=LnfX46tywi+0|i){Z3A*LLrQH=T&6VTwh7K?
zDPk)VJlK3|F!;OsdsnY(H({;1ErJk`#(vLtl?jOsxuuf;Zz{ujdq^5Wvp}URgZE#h
zOF=j=7^;mp^jI>r{UgI?Z=P^pEE42!^6chrt{4#!5)x{~2u$p*q+o3P%UCHfn<ETW
z)pkVZ_W%W=HN$o#;y>?tu1Zeu`VpjwM)76JH?)Bp*IA3z;lF9tH3busJb{L4)+X6W
zOEg$iLMb3N^q0;HVDek!!KO3%R}p3mY~tY%1We2IHg?%$jgEtIfchNE;I3yV5-2po
zjfD_j2(g&RaB6I}qW!UHl35%O$UR&6dSlpW?)LqAuuS*V#M<FP(<>3TGlj4)YQRRK
zNI3i5`8g;;LXMcnH9Xt@X*lv|P1aM4>$U33zESHgQnKdA_mzqkDbSq;7X-RUg%Bsr
zL1pvCRl2Znd%$M+7^h^YrGf+wxqWxLibj{w*W2YbH~L_>cETZ+PnN2dN5B&VBWXSH
zD@(v&JzQ(LXP3_qjbo=XRTu3>bwnh?{d=!5JvvF5_K1p$Q5$D;AzF92v%k%!Nm*IB
zYE2!<E&ys8@7))eUz4g%55AV5efssO(9jZuWX|wK=ewlk%x|j^lR^y;C`*KsW+>F7
zQPKHLjVFwg;62F2Ru_?8;5GHpg}&<^4->N=2wVz}8{K?4FCJncWdBK#!2ZZX+++^k
zrO(5KvB2BI4&w1wDAB5~7PTr)V_6)luB&Rhg<kZ<d9x;|x516k0cWlI#3m+$JYFh+
zcz5Svkm7zp`xBY<wzw!uP42Mzr!(Ahj!h0L6C3(IvfWePU61~;Sz7rNVt}4=Na1+7
z1MsmLEDos<ujn-N4YjZ8T$VUou+xiQ70w<bPH&-Z&Ns6wb(@`!E17gx_aIM0(7O|E
zZwnIUL1Bkn0F6YrKdI|MVH2&xelWFOiqqHdt-zuNc!DXiAJJ-|%=Xk+5{=lbAOE<C
z2No9g3V?q{{UnwVHbgq_T`yO%vbZzuCmX*W+AbwV9siprqKG7?p$We`U9}O#c$g*1
zPc{(yN>id;Z|?t<h6cdcVGBN+4t#c#pEUe=f<=$%?ay^AkG=-Hy~N4+!6JZTlCBF$
zAS2eO+|M`03#8-eDrS+9yWDFIixLulf5$_jv(2@^frNy#oSCs2o}sKSnh?R!@@U*S
zDz9Du$Zn`jkQ6O1#5$59piEs4Q)e5Qjak3Md$T3pmXF!oY2d9i*_Brxu26=QXyFFp
zXa;`=xLHa~m~R5ZS!U@&_i^La{`LaxIF+Wa9!Nt9)epY+F+{v|#{ED3%K2$Po$9AP
zCH(LcD-8}i1h`98V>HOG=)|8CvW553RWt}6y&lKj&AO&p>Et697)Kf;Gk#_D&O9!-
z@jxdJ2%3hXAKsmlEM`3beRZjQu}yX^T9>UzJRRpF^XiMo@3{B7MZE9ND$y#xU+F^N
zhV|#<0G##p5P58ZW9#|P_|)+rK@ZOtzX@WV-lIv28izlI*c+?!X-^H7+c&XaaMMRk
z(ZFKjkpxu`5ptceB!UK|L89h4o7k^%x)uK-5+gO8k3!u1wvi5(@=a5#(t%PhTkY<8
zx{@f%)G9_W0wn<ZQ-uRW_yoD>bI$)!gU$V(CP&8p-nTBe|77@&zS=bnx*KaP0ki}M
z)0rR5|9UeEY^&vY1miz5A9JkYF=nItxab!ad%zEPSoki)!e%`ePAQvov7qbl2?HZf
zuoLBgBE+*0S~a`QG5Kx_U=ycfvm3A=ARvk|fdJMQPjcvd*F9M3yn!a=<XpVMUS-O9
zD@FjLE_IV2VBNx00VE&0&B8%-GxEH(TE6T#6OeVodD@XfBMoO3>e6b}2ANFygl`+y
zLCafR*q|Cb4K8FvZ(tCWX<73a8l3=}ML!Qpm=|Ojk89R1)qhhBz2`!b_iM6U7HPI$
zzbU5VP|d!h1a=vQ)(kU8bKA+^UtrVsTHefH#*xSUTxxt}LE5C*VPj$=b3vb&sX+N!
z;`btLr<CoVKI{wy-cuOytXv>lkO?^CNQj|G3!`Aq7P4yEPS1PFVbh$yn+pp=xCAsb
zg^5Wc6Y<O?cK?=kG=(%G!MaJ~xC4&X(|Ar!g8J&vuxmVAYsjljQ~gt<p|qfmlf_rg
zw5Np7)hRjB48Z{ZLJ8D#h<YYXoWYaQuFIQE2ghY(lL~uRAl@{uaM#Y@-y}f&g@}0R
zygywX1Zd_Ox?JPj8v+xBoovCRx8DCu7YJnyaLzie75qvLaEI3m$2UQ%NN4~U@C3;J
z^%tBy3PI}R1a)2dR~~H(R;}k#J@>Kad=<tYW^A`k7Pkq(@*6EqJ8KU!8^u5jiWoJV
z|6Gy}YBxJ)ex$#p7R@^Islkz3`l3CRnMcGvj8`~75NMK&g$@V`FZsT|^IyI_CovVB
z0<~9pdID;6EU>!i4WhwzIqqzo=#76DVipl?Ee+IykL3z5x(`5HUIT2Yc{~5Uo=I|?
zo6lQ(<w{g>8th0(`8*Iqq#IW{dEpF1C?cWm(^T077r=sYyHvconl~1|bI<NSh{3od
zZ|IMxxmvmHWCMzYro#*1jGljcWfuzW!vvaJ?TvdHJUVj6NJb-@kNb)7BFA~Nvri--
zS}2}R@an=VH?SSw?U{prPaeR+yl%d~X18w+Bw+p9t#|m7<ovD&G%EsX=Dq6d<am$V
zzl@=wMFPO&R$V>|{F0?5Nm$0ORbv!X82N6pV<P`?8Y`~5RD1ajR%VF)qMq?uTBYx>
zetzd_Q1ZL{gPU0Qz>#*RzoJT=8#B$S_jgqBorQ&E4WO-_F0@XAir3_`=82K<*@hfo
zVTg3P<11#(0$K#R_(K!3CrI7)gJzhSe)Qz@%*gq@sR{#UjaA6!0w9HPJTfUid(QVb
zqvW!r{rQUfECzG^N1utRwsf`!gW6m^(+s!^o2pg`!IWL(FQ`H?%P2Hy0GFF?<416M
zJZ_cmcl4W9gIU|I0Xg;(81|JLt<~*lU>v_7TuMQbhG@lPqaxA`F&j<R&15SeR{C<v
zzh-7!V>1&+l@dsHD|058AMMnlc+nOLT?fH5K?;>)VBm|q=e`1s+8mImQ=j7<)V`p#
zFPD;S{0Ec*osGSvP{|Qok?=lAU%1sxfSq=_*b;udO#;_ikx8G%MI~*=aSKj>H%aL|
z6fyDeh5;?|X8S$_9rZaR>xR<}AM2mV0?@j@UE8xN;+)TCHZ@;qbdiw;{ywWbbX_#+
zD{p0}0^atfsBHy-RharQcpWG!GO~GQoxQfFH)#!H)8kfC+*+1>q;xu}-3XhV)5hfW
z&~4mx5%s}BWjg&%wj!t?;lIFO(@560OJux5JcfrqE5sO-PMd!B%J~u~b_ZNrY{Da^
z2!Vb|Qywcz1P&eBxWV7Q1$_ewrNSi{{pNp(^;amd(Rn*WP?ihbP!K^7|MqzONQ>Hg
z=ZY)1_+E9FOQ5%|jFSl%bH|1thneF?_=<-c!a=>`_v?B`Zmry{3@>K6xL97OxC4T!
z>;r<akmAu-vPlfauinSrvx5VFW*Qwd^UYem-Q6q;)Y|PuSkISTp43ks_2&baJ-|p&
zk;@B@MrYH0p#l%!mo*WRpHTr^xU*Ipz^Fa>(Q0bD)ka2ea}1vMT-)DeOfcWrWrmq)
zNUM9c4M;S$IcWs#8sKaet8V}5wkMkpk6X^I@pNI^BvozqbVV%2q=arjdC!(;9|oMu
z?lEqkSRE_$(*Jp&#&JAAYIvIM*0!;#W3BgHdDy>QG+guuB!UxgajTTX1o@aBEA?Ih
zn&LBX`qyPS$dC}1n*TDtJ(w%}w+dPKNrf^a(&0$)>Sq=753cIG4Bm4kN<tG4jB8lb
zc{yHpPk*NG#Vx)qp;>Q*|BBE3S#=}|{|k@W8fbT5xaFaxtS{DHJvjI!Neuon)r;Ve
zivCye`TjmHHLn$r6wN1_&aye#80H!p*<AcHME6=Fs(aE>|NZ->sc*z=Z7oN5F%UJ&
zS*zX(*(5B?6oKg*H%A1g^>~Qv&ZrYMR_z(<UinX~O^_=CfBXp7N8USW_T7*g6NI+?
z6LhlLJSppNYykLG4rT^<Dg%x+E2($0vGUE-($Xc@<ZSh9OBe0*>VNe=qxlH`vIvif
zVH$p*{tWD|#+};%drmT~jTO^3!x~>QZ9<@R`T`TBx5u#j60e-zTU4<)0$2g!eRcp~
z81TCBu+&nE-*Rfu<HB4EPa8WCP|+AKS8lEq5QOwXH(PwMC_ySRDk>@+H%(`SF6R?T
zrHa2`;tn?zIDu$cEf-NHqjomPEl#``n;+t)rhFooKqoq_p=pi{;4Q3zJHpA5l9e^>
z3qdeY+cyY7M{X-}6@(*CVRysXpJ*G08dr<LXO}sDg1gX?ZZz7^f&i`dq~_i5)6qo~
zXZx?nI@rmVahAz9KZhw-`(3l@pOZmcJRk-puwq3UJ|4~%a|d+&RS1`usjQyOp_r|+
z?Pa|?Su$;ilKF&>GvcSX9tKa-$?geA9JZ?mZ^pVCWB~LGBleae@mIX=J(+sCU$)5B
zzT5n?^g?(<HOB}{I`Qsg(b?V4%a(Y=U>25N0I#V}@}>c=oF|&1i2(xt_Oi9J66d>_
z5(RKg2_G~x%uGc9+{&gmw=s)Zbt0F|7-C?sMY;O=NSQ{t^@@QRKW-iKm&fv9iO~`^
zkLb4Yu`|bRg~$1s0l`HBA4UWOgq0~PBfh|dIy9w!iT>MtFaobPs?|p>oWa#@+yTEG
zsr-3<AuXS!_?R<&4-S3=MAzF!H_2MJ#Dwr>4NwmUO-YH!ST-z7Vq(dI7E|j!B1U^N
zQ?u0!x2ZLV(0`}mY0g>tTvjiYCN&OkbCMJo4>8Hcg_`}>4|rQ_Cvu7vv&`om%K0jW
z>RU>@@O3jTCjk}G!HOh0<TtdA{#w}$Qs-C<BQL|dj~byv$K{U=UC1qAuvlq*UFTgX
zb;uA@*6e^iU`zsV=sqJtQQ_3wew<Gj2DV|PNVOBktd(K8Mqy}TOh2NKc@aCk&8n-V
z>XSGXDI<Gys%k|iu0gwjodh3C-q_;gqZ6uEs}}%uRlIKwg!d;<HSk({ia{zPdx8Dt
zk0~ss9n=$0$gRfVhlGYmfCBpzT+P@Sp+*P=hx!lDBp1WF8z=wKVpj{?Es0|n8o#m8
zlyLQ#<{x-IcNYm@Q{Gn0sv7r?9MF-YnvJyKP|K1+hENW?$<RJtbuu${hTwg|>z#EF
zkoWxNnOfET(=Q0<e?D4?7EZ=5*TLv{Q>*u%*s^<(aGAbcn;)ZcNBkF^s~d1VKQorX
z)<2V<ADQp8Ga#42rJU_}3d*38#}4~+ob@qJqY<BQ27kYqvszs;Kbj@&x`~wCe!we+
z&bcY2OB^&F7v$@(B{?xC1GDrdoXU9bO{PpfsV}&NVnTfX#T-*$A6$nU_A0RNF;S@7
zY{CnqWUgo!FknGS(e8l4l<hP)-|!sgL9=c%CmXftrJHi>IzLwbi;39-B&2DAw{H-O
zNZ^qUtmE7Nu_DH>JHR|_)n-Pni1EMbc%pc`&99&Kq!waop>QCIvVPS^x$_gGR;p6i
zax5o1`fuiSKYDMgD_HKuH4o@=f9%lKB%Z5IM}0dPYPv2b^J4|d46${|LTDOBI?%>(
zfbnUSfnSWCiz`JoETOV+RySjkZ}OSB``iU801^r+mCuWHczF0pl{^%EH%-z(ZFja_
zX!<=-A(My2_rWo^z%%)w;D@V^(P#EFT!$moPZMTlabCT>N8AQ7hgPG1fIm)i_4V!8
zZGv!}UoIl&q)uk3jt1|G#7wKujZG1RCHc^dtzg@5yFa9aVR>bhsh1~xd%=vbPrVC9
z6R5c%cAFga!BAx!u*5@+^0TN=L>`$T3)uo_Y?CQc>g>?i5Ojrpf0_QD&_eLF*y}kt
zfIUq0+~}VwbSP{*UjhAT)v>5lh(*Pd>SV@T7{2Gf=o5G_g%Vpi8&Fwz+(s5w%y7~u
zI9PN<YNco&Uot0`yDhqbTa!D7=xp8X(j9qq0Y*}~S2E16CcoidBbEeT+ONDY)5zB6
z=G3~LC$@K{RN%pKoVN~Fn(=;hNAK$%o4bJAH5In6{3A(F^Yila4PO&KQcp7+jJktb
zx;+{)bA73zIQL!#$TJ_cXZvgpu#zx$6h4PXMw64V<pJk6Dk1KYB-&#6#Y{rB^o#zJ
z>-L+)8T0+!Mi!CJgU{$DvC6I&P+Pn%go}A9&_d8*RAhqA`k#Q=3(U)_8_;QHxmwD2
zi@)$yN8*!9(d2e9!a{a@?uYl|U+p0AY*@4L>V5T;K$tN?Ao|}gckU@7241_^+4xv$
z%BtBB&L<73kW*tj4%W{w40(Rfb?4V<K>)vfG>|&lC?_-A!U8;-?f0>La`$iRc(*ep
zh>!GI>v#76Q=aed7sl8%+tYk^&J3f2n>92su~$E-hiYAqY|i?o&F1oHM-bnk0l692
zLV!RArns!>>=h_Ist~E_0~>-<|0}~BOY<sb6vT*#*xk5xdh;Vy<-2T0{G`9pupVKL
z-9)_ZH+{Nov5hv1D&0SPj#=nLHOz6&`QA~l{nIQO5)fy7j2wvlx3>}Jg9|dHOvh)~
ziIsNwC1MCm(fo=^$J{+b(!Ur(QY&y_U+DaJ`tR0iwYGAa^`{D}=?rq$=hx6e8`>La
zSXfr~6Rj-YE9uu#QK10v?_VPwUBH`u)=Llc?M_OIvu2t(v=Bd$zOmnys<Qwwt2=)X
z_A3F*No!*~r@{ao$EXg^<*>o`Erx=pPj@yx(qgempU-b{wnD$Q=_XQsB*zB!vS$`e
zZAshdZf-fLYUOOc95<84ZRUq_?W9SvN)sd#Js-I6A8-aPs)RVdKCJZq@Ng{5mfk<z
z-!Pw9k{*KGY<&z13Hf3*L-D~jy_W7Q*}u^y`l01(f<OX2N#h`NfXV`_RW>;p5vE^n
z@wBXf8;y(e*2;dRlBMO>(WVVqf*_>ft1{^10sOMJ|8(0DZ*E*AqVdIp(}*jR8GZqX
z{c87s+3T_wm)m<NjiV+gDClK>`rUDVh<B82YY<y|zg~-PbU!M93JHuTxJe8X@#efY
zkvX~vyb^Z-+-A+j&wOmP^o)yzRdcZz%ICeBU!mJtbwg5vK3}eBF`Xx_7w~%fqzV_9
zB@&)_=1I~&dKQYVtunG0R2y0wM&h3W=zj^FKKJ+~6}~_{PATZsUt3r-{KWKc&+(rt
zom)9J9#SZTJcMGv$e7sdg6lZ@VvX;kGg^1ya|)XkMrvv*a)%k|ytTK*yoAi~MyAiB
z-Gl=}X7k(?YCvq)6U`})`ox0IWyPP2$%Z{Xgc`heJ*QAr_7^yyiFw-2zl&?FKkU~T
zCx5c-*<ZixAJp#l=KnZQ55IN{0s<6g^Td(N$J4}j2BL3^-64~$GbrezY1cdo5`ubg
zax5uU0Rz%;*?O;Qh#CU5mz1V82dAXqBhn(j)O`|as3%b9`K&`J3p=p1lstX+#_*07
zDs5V~g@A#9qER|ed=+O-zC_kl{oWQyik92sj&Oe>i~LoN=lTBRBb_q%{T3Lj9Vk%n
zIkzqsiHqG|R}#H5zki36*kGHPAvqxNyZHt9fzCz3yMX0r1|=gZ+HQ0#U%4nrbaBO{
zXieU|Sy-6G1B6zpss)$t)|XWdTk_M8#xUc=-`JXZy#Nau9vwZOt%HV)A<{Cx)Pscp
z3QV}7+ZycK0lsCW*<lj!k0Gn6vtCN0NVnxh4n956_c3->{Y%==v=)8G7U|d;zE4nr
z1+`B%5XF3E`3@L~`{EtSzoZBRKRMp#dthSVs~j%s+&<H71U&k2mazU<TGB!#<jOgJ
zC7}yRp)EunTwv18zxWN5iV5I$Iv7=rRRAH&^FwesEKJs$pBw|()5iXB&}I=u0f9uq
zvulQONF7q1)Dk);LIX4P^!F8j@@U!Q2+9h0^XlsxyY<L-{Gf*U9@c{SF2<njTOWff
zA0|hzOkY$V!rHLM$KL_Zk6bG2pU5LDb1E=6=!5J6Twg71kKIsur~jo3rqDpt>;PCr
zF<U^w%1L@YB+V7isc=x<k8WfW&f{1#^Hi51YmYvsgoGUo7Vai2yMS16wd_B*%s=GM
zX<jvO88qZwYP3sUHJDt5hJ*X?5*+lO<66921E45A-c;YlBJ{cCZpG#d=TqDN_W~?8
zSYfWWamy=@L7riW@R<elT)`K~fKGzH6B5I0cpo$NugYy1s%9&AppxaKc@+<4PRQ*a
zScP@{wd|Ner3sM|U7UIRSO(oUWv!nVLyl+uH}(dfUm=|?o$USW$^~ByfurcXldUSW
z{q#nfW4YmKZcb%7$it9C`|>j+1bS~WdvdN+RsZz<9GV9SJm8}fR*C`QEh51B7E-Ec
zw&Z_7;y0u#+O`Q7LDeEAA;IeZ;+dUwxrOF>zM08_Iq3L!F}nWtoDC4Sg30fP3yU`#
zyDV>bg8qEP3Yjy8)fbpRN5cc;2EYruTQ|z&;x>FQ1PA_YxG`ng2Ho=p$N49R6by~R
zLyc#0q>9%><hTNRA!FKwP6pLtNN~K-*}l7)`H~1!bg#$YWS}e2nCxU^sjT&#Sk=?g
zTr43L4<4?!H*dVM;yw@pJP7K6u4f+L*<>*t@YKxdV*|LCa6tQF0Svx*c^MkNW&_hh
z&^cEHB|E<#0_#)={;n6ba6_}LUOsgh1JUq#X&GHLd!%N)6}3l~9t7w^IkH>C{tw0<
zKMvALYH>PlHkTJjXkVYwryJT@5(hV^zmmsqn!oSWF5bg3MFn&%etzex;=cq~oU2Je
zg>n}}l44-wX3%K}2TYH+oD6mxQxfnj%cC=6v#=$SGTiv%SIfW1B`sGPN;SPl$Blp}
zgrLj$9Ep~Na3hn-I2H$qNlVe12F?q~%13>;nXeX#yW~#28}Zz)zj&h@>|*oo<HehQ
zu{xoM?T#%5u0zY~eln$LZ%7fcL{V4)bpjQ!LIJoT{?wT*WS*7KkgT_R>;sndqJa0e
zKl;w_o@=uLjFiTElB=A7WW@<QZbzQJN=j1SKI5)0#V+*w=-ln0HKm_!!rdSAGjV3{
z1)=|C_yWCJr(qoRVUz@lq3%3%N)#aKT>J~j{x;@edceEHTTgg(eU*A&?*>N<!FM%8
z{*?Z10v5}48t%8We>+~R*5nKjBqb#c{IHoP(recFK3@H`f5Q#r48oDvc<KF34+5&&
zevLdb^w!C8J)8YnN(0+HukfE{TcMesRYk|g)inJ)h9iDZ_H#dqkib>9MX<DHxJFD{
zMz{b+%xd5DXpTz6^X~}`o0yu9HN*b3ZTdapjm>`hRUsNswXV01NxWbE*2QgY8Q{=}
z=VF;j$U;)g9NPI&vE<p?4~x=M_?D09I}n+t0SOOqG`OF2J=^<9h9^PVntMzlfHUr_
zqI*sdgrGS@qj^GWr}HJR0dGaiDgSqoU@L!Z$=SPG&4jjjo6B2K2TRdIp$v4g#dMy6
z1fsylKvC@7R+oLx4`V1`z8)SOy)L5YrUZgf;4XcGKNZQ;*^Z8nW1W&@apw1fpEpCJ
zl;NY}j}ka=y*#fVP%Qhr>*l0(I~`1c@!74#?5i~24{7=2<m8Yw4ZJ9U4dDfvE0Yyu
z(eJ&z`v`QC$a}1$m{Lp-h<3NrQg5%WzTRrNjuJ3VB>JCP|JP{cX6DgXu0i{1f^;=L
z)LcTOt4eTWb+2<lr!qpZMcqR?3JjIF4xP6+09Tgz6nFy??iHqJmfefnNS-Q{q;4MP
zEI|gE*iIGL1CKGk?}OXV<n=fjOxk1)p{aQ5hM@6YBN6oPSd2`;&H{I7@by;_4gjtZ
zfH*({gDH88_aJ8jJ=k<bi~11LYYm}djhJbWkdQt+`^dz6Eq#hHVD&z$g=&7cRrW?9
zL^Y>{^NkT~qGxMSC{Q&u&>v1!Mq-xU40&ut*=!b~fC2ClFzK_HjbME^p|b;Y+L_m+
z`uh4U=Q=(CY^0QRx>)@`^B)3-?I!OVuM)B)U%+5+6rjQcTnqMf4+!S4yg@9rxs`Jk
z0MCBj;?G-cv~drg#z|Wz{|@HlmvS^Jy)`ZlWDblCMGxbzuKTO?_l~-d5b~ugno+Oi
zXR?9!e*lh+%g#0&Q+$&ZG6Ja|FH#6_|7tr;!}xrH;-P1HxK_bfy>Xz#)v65dRIBWr
zbMU@PEmTWjR$5vL_~U;7Fsk0~*&U#JfCp~C{QR9QB$ot$m=+%K9~l+LkCrqiwMv7;
z2cFA0#R^4{d}!;1Dl6~$vZxzm1HT(}l{aY?9hp>s)5rxXPsiKSvFrJUe!vqBSWKBW
zIN{2it+EEN=nw#$3O}`C)=iv_xHbYJDj6M5gf)BFCtdy|;0xxe4AVmf5ZG+je$q|9
zSD|Vml=lV3Kt=eJLfU33Vg^cQU7dMw?!6UEkrrkkujRz<@9*=jeHO@gWE^d(c6oZ-
za=b@oti>?y&6V?cBL5B*iQ`Q%r3CNPBcv@wn;(Q*n+hwQ<lG8{hllsW9{Yr^B|bCE
z-TOTnMofct(J=9Fm?v9Yxa(OiFm29CL?yUjhPeVXJw5%$O_E`NBVQi}7NB!`3{J&W
zWF|7WcRtx=kueL#dL8d+uauN>0kMLQMP^={q?nV-QFSR^wzjFozLTGM5Y&RDw}rsE
zLZ5;@$Uy;gQXWs*W}A(O`DZzG3**nrt+-1K=MFp^wD>TjHH^Kn917U*;F%!m!i4w!
zrcM`<w1~sFDS5qXo=j6-@?gp^#WZiTNsJK5gmb7C3hO@$c{a|P4%Pk)P(Q33-hj;X
zQyH18eKo)x(DUj_PwTe|8}*C7F)I`2Ztd-&4DnomXFTg069Azug^k|~B-vrhs)%4#
zAJig_HdoGvRdI@h(TAW@hoUos8f)gMqo88&%geq&e^(giRpxJ#dyMEq5|fmeZ56k0
z*m$`HUdfw-VXI3b(rjnN9+SZbm@-tA`9}^nUwp}3TQEl{KA@Bw_&2){f$j5902Jyw
zh~N)3I<ZMr9yPgkqbXGDBkG?xqQZnC{Aqwu!W0?96?u__SB8^<wjba?^1-h`)iu0b
z#xNMLfrf>iVK1du@AIqo`7I+BA~BV(j`ls6&wkAfcJ+L_cnMkWjKL~f6aE*P9+V#3
z%a6)0W32yh|GE52kO3hgAj4A>MFeL`3p8!Q$(j~229ljX1xNfCm!(~V!i54ZKGk7Q
z&T;zO-a>Lu&ssNGZ#>Dt!)a5FVhHszNh)1P79s_qQX@a$EFyyk>*-^6<!l?O9|X$n
z&AqV(-jt@B^fT4&KW~z3ayG66;!1CH;=dQ=q(N|jBx?^Ek9T(E&c^p^Ddz9Mr%_Yp
ztxlwE<Fz2T+@C(TdX+IY|6HQ0g@zB?-|g<;ZWvV6Vuf(*bv{7=38}nN(Lqer*skjM
zK|1nNDS%`|;eVlg1E!B+DOwvS@qCni(f-5fGC0|021<JB@(>dBmh?Vo2D(10vX#-$
z*9UXp??cUpQd57bpw1JM@EEsxbHu7Ju2{XlqX9caAZrJa&?9py?EHQ7KUx3LG9rSZ
z;nC?IOmQktNw>MU=pr3x9p%yL2-U#LZ#w@&zOF>{`-+J}C^5Of|6hzNEBh1SgCG=z
zHh#OLq%$Ch3JXXornX@X9=Fhd^h`rgJ$B*|gd)A8<u`#xlk1%8w3}Clqr|l1)uW07
zCmVu>YNWgy4-2g!JA}k6p*vUasHj*a0*-jMg#E<3^5nRDaRB2(c!#gqWaS_6>2vFk
zJI<B@g`i8;oZ>;D<KZjxr@2LAeiOm5Gblt`2NyP+4T%QVY#I^wX}}nW0oU|fy`yB}
znLyWn6O#Le419xoqNO|>0DK<|`rE>47iYO1$_oe;StO#Q|BDG<SWL|Tx#Lj`Rz8S9
z8Vx!T<aDjTPF)RF$roh0d?EV}?gx%bYaa9oXIeWb%*h?x3%;>kkAGs1VCPm-`w9Ht
z9`EK;c`?h7x4HYCXc73^Asv<<5aO^f`^*{p|L}ITN(#*ZMSkkMt8V6BJ%W&m-!5DZ
zWp_@Xc)I3MzXw6?AKaP%5a0JIst=f=z{v9};b%xq%ydzyl|eQ4dVG8PmC-w4i~9Nt
z{U5)T;DjAoDc`>vdmMTcpvdT{Z3JHq2+Kt&KhSY%voW3u&&y7ioXm0$4ZnsYJUA3x
z(L@$HA}Jf@djYJptL&MC)X#TqrS{029#SSNFN8`=-D4YXii<Mzzy6IUhE6A{JU-Sj
z(%eZV8KjtGA*4(LR=SFmAgXWlKXp8nDrJ!WySznCFcpZ&66oDaAX-rZU62I-dq5Tm
zXIbjNp0L?zESt}J|MRNv7f2%mZjxbmWjd1V<SGv6$F1SN?f&bhE-(mXxz|g`@0M_l
zJCW?z`mW4gS0?Zu(7=~W6No)_z9Iy^O84}p)%JH2KOpkDa5Bt>Ni3nrU?mE{Uw&;W
zrVZ0>{*?Ra<M;t9D*IZ93=g(c?uPMOxdqd$l@7kcPigXcDJruRBq;Y(t}JEc3%D4%
z5HKaZ2YeL?E51mD?wQ~_6&@@CPFVfX`EAC8>lgO&|Hj=lm8C<_kAv<GFqFa2(g@Nw
z-6h@S{wATBDMO#18cs#ae^lO7*%*C&J|Ycqw6;)I3+D|YBM*%_K~_;LPI7Dw_&fUi
zzU70^<7-Pi4x*TMkoi{P-7+7So;^4wnCTxz60cG=sLE+XqQm~#6Jd2Kg$&Wb(GI`S
zNquUs85#z5y3CmVNq=rq{d)phN6_i8Ve4!Q1g#nRMG8mL{g8qBOEEdkm!bK)bquHi
zPvmT1b|dK$hr)-1g0x&5`g+}4IX2eV{VUT)n7|qVnN=!g5*#vwE7E~_BgBbo054qM
zHvW0ZiB$fG?ef_!$lK|*rQ+4Bp=7gfUiBR!Cma2*m-^wkMio><M1ae+%d&@Wc98R!
z^mrLNP($Z_a3Fzwtx;QmRB$J3g5Y7ZGD|?6b!MWE7f;X7fh6G+iDV`Z(SmA#5|Egs
z1aV9Tx<{{0pXd3{RcWlE`$=Gs5GZcC`?VJAQdW6CQ(j<CX~5UcJs<gIQ8&Q(#Ga`K
z2k0pkdlUIt7JcI3`;VCl<kAR7l-{6x8p!nEbnA;)(9d5Qn^4!O?CpyU{>=^k-M^#(
z)pR_m8C@aM{LlWzZZTP>wy}eGYILqbCw{}uXEt9w_U{q+t+#0{AQt^^R5=nBwxo;~
zx1;j56X3XLM?2?G`o;YTUh|z;9nuJ50a9E;!)dyft>iFa_>o^yG23W-LjLLETEg-Y
z?&OcnX-#DV*ZNYKxO%=%`5E%Tmq04Fw1Z?~#%Lj>b{)H?rej&4Hb&OV3WV7a+S!1A
zV^kyFFdIw}pD3<ZQ)#!6a?mB!poa~QOV+OI`XXk_f=*5Yks4}a<X1lz46Ml+vMZ9{
zn`a{zT>za^5B%Fl=&LQ0yTWmmdSCfel@l+l2l3b+d1iO^n*r93CfH%%0_%=11uXp!
z|K&c^PT-zMcykCkuAY8D3Ey4u`&pW)JJA(_tWUFQd)sW&8iQf&`}|)Qgg~M&UfpIK
zT!O;>Ia|S&bQGUvD^W<#Wm0bcVD!HsKo!V=xnNA2NE8wIE@G)x{wdkOm)39PF4t<k
z=qZSzh=PGDYQPPDwq4!<)(v0m`1eB9-9xVi<|Y46hLDHYvWt5}W-Bz*EUux}3Kt10
z7IwEX?n?YgR^a4a4v#z0nz3(vMz<B*i$TlYYr%Kk7OUq$!E?Efe6qf&5`oYD>|q5{
zkT70jhq4A6g6%^Tr+Qe-<$Xjms6etK_k+7>$dt^q1Y0*!XWse~E|I2=ML&!Y#upv<
zZ8gl?3uIv3UTLN{6^1z&AY8E@;;c10LUuGr;g}*18S;6GR3C%hvZc;ymk!tbd|Wf6
z=V_7T!M_&yIsh!DDto_R)0)ZK-c{U#3UR9RhB|wOZ{iCw<#)b4Nl%z(QFixOvGi5~
zkO6}TPhQWJa6Z2r6PKuXlb$hVXDR7PP(|^1LtF+g(C)p>lJ-XE2;yz+vDhh3PVU-!
z+$!_Hh>TMfp5-?Ue-_1%B?R#|x-{q<3uo#?5LSQ4W<ZfCW>^q?vJ9;cA~?f07&{AS
z;D{Y$g)f3eq)lQ*q<>y`QBY6|?Qh%WDh+^AI&b#P!ja>eVZUy|N#L0;bvgB${ty{8
za~M*q*{T5=0xFn|CgEbrkxYa<966GLjxXY1$TF`le`H7hXY6>!v5ip?y2x!BUcWpr
zB&*2030yP-$2~gIX=65OY8%DZ3x*VbRaJ6&XIP(vzyFu&$k_}wv;I4}K9LP22Z(6C
zf!*|%iUwR2WEGq@RH8K+03X22f@rjbl_+W}5}%=<;b1TcvGkUkmLYAMIt4+3EAjZD
z!cw%Nf!#q8p|zco_jShiusdR@DJ2&)Oy`cR90@3M7$O<$QgM=(^JGFH=!ZQbb`_Fw
zbdJn12;GxYv4~xtTmF!8Bl3!bvw?pni-f-|?QyIHRytm2i5oCe(EQ#m6`&)F0I&sF
zKN$i7V(G!SAoc_5s@#8`U@-^qZ;PWn2Sj2qm+Q&VNz-Qtb#G<DTN@t!*U8)YbioHl
zNF$4~yBv!;8Bhc{<t;iAM<rn2Z>lb!kpm=-1oXcElSCvEzOuA}a1QGF-DI*8jnhVG
zgn5C|q&&kIihd~)t{aNJi3C<Ftdy>)Cg%3^IpOJuJjt*P#!4l@-6^If$nDpCa7F?3
zR4*kt_JQyhWk|tQ9B>L{_!OGH^$(J5)NWI#N)d2bA{NAXU*JT-18TVU{gA{(4bmWn
zg~+C+-qZ<7?BAW2<BP#aQuP5uP%0;e&w+M53XRDQcpE);?}Rnj(Pdrle@pST6Au7b
znTc%FB<$SrUGZaZb*0_aGx9X9@KJ&5GTd{CiLu|7Gv`rFn*1yHT0Q@RBw59uGDM0+
zDk(2&32x7JFm%@utTOT?=SzQiL?!A$!z-6Ae6H=bFEH7QFKJjtETz>YcKEWZmU8Ja
zyiZ>ISrBCG>Vg5a*##O@^57NrV~lClD;d(@!FHJbBn(aeB=QXjtgzaBhXB5_j+r0d
zgsX|Yd;2WkdvF*vTR<qwA{W056yy1K!OyvW(jP=2zaY_!{KcOukp*BRN`k4q^Y!(E
zbI|PhE4#`FebiLG63xiCnUJQP(RJ3il<&mwf*tVhT8@e6XQ#ABp2-BV0Y;5A@Ni|R
zC(;MMU;w{jqxDy`Po~DNK^fXg8@Xzw2Q<G1xM$US7gqgw^CYo;9hBQ#X_0V3ptoWJ
z4xSU=QvQSaGR#l8d-v*`aj_PP6x5U3_uZ%$hQa@6up;VqYNibt%XGBY@n7S9ZlP;#
zyc+^QZuLR@!}Sz2jtmu8v!&$Sd}NzLcJ1;o=S0QmMwirKD6>2c&yN_IH#Rm;EEXy`
zT`td@2#qD$|L{ZHT+4j{5#02-a4;RXiqSs(X>ZS+H9-zrQFYqrS^jflE@;cfhq6^9
z_X}7gJn=x_Tn$5s4`qkoNYt>kWsLf=7}^LDKR=<Ukzl649SUkUCHv(&<i@iZp;ru)
zd0IXJeVG!C+@RlqoUIzhmfY>Z(bLAeoKXajA~Bm3Aos93yp<)8I<gj>Pb|r|fwa)4
zi&>QsfvPG^8ms~GkRdqxKjzbVVrrgP{JQrP3|f>Bp#K^%ZgWfB3B0;{8~~0J^-rLm
zj-iN_V~Mg3L;r8euUx)IEgV=NU-H5V>z@>%BFcz&6kDjS(n79cY@I7*iGe?J&@~sj
z{gq!d!@DU#-4N|aXk?=O^S*(sj$qEP=71-WZtN+LzDS`G%~&WEg3>Ak5B|Kpm{LwK
z-Wi9_Yslsn@GKCz2;@#f?RK)B&hllkfA2*9b4tUFrr!fTZDHEy5~Y-sxF)C<b_8^h
zsS<Z`KhLO7I#Iu?f!p0QO1Fd+GV%3Wp=$b~6yugs=ZmAO;(pMdEk&EjF@uE|>P2JE
z+hZ6X2%x2#iGbpubCfvK&;H3kZpGw2llZwMkD{oUG8QCsyj~}N`(|O?KixB_GBQ&%
zMvH|Ar7Ydk%~rXpM)ITw|LgEb$8g{r_|p7sL(>yfd7arD34N$tt+4pRV!W@{x_&K;
z7oiZ&Scu}>O6(Bmx|B)Q%JU7tOHaQB|N9(aNClkWN=sONcyLSEs2MC>9nNTTwdvcy
z?$gD%%E)u{|IR~9_abzQ=hHjD^i07sO6(*f1ZGaJ1b5lBDOE<Kxv6RhWbyyfm%Kad
zH!Vn5|G&>DNUuV4onWGW!WZtuSEvl|*95j=^W*D6d-nQvwt7f^xE@*LklFkKVC=D=
zZ{PCue#5qrQA7gk2B|iX$Wd6$L|dZ*5aUPe<U(AJZ`B+!vC|KBK>qTd_F@w~p%dpt
z1&xgScca?D{pxasgxIj%)`Lu2h~EtC3}L_uDm)UZ%kIm)AbCRyOn@SY3QF8ZP<i{;
zjYIj5^~5mw=eNDpP5+rNW(X=7+Sk{6+1xMuZ!<(w4F;+J@@>o|>Y0QcW`Xg4g<uRB
zf)Q94s5;~kI!7&}3ALi%ultywAFQ_+p+3&6^WS4>AxEVz(bn8}?;YR}8b`Oz?yW^2
zO3Z<I(I*dOPI~^o%1r6eFoxT|c9}f)u0N?NmQ8>{`|ux}BaLQx<PlI27k=F3KD#`T
z`+roJ2@r{uDd#PrjFeKia72Z)f&o*t+?$dh8~heI?XD6z8!cAE)pjI1gm92BTh*)<
z$y+u$*(5x_dEYrEi1*y6{yTJzx0*U^lV<++QCV*dSZ3e*uCA}7=qU_^Y5}>3p)ePX
zIK2an1eix$x3{0S{+aK^mOuyQsRyDp)DpCzQL$-NLM9~V7pr=`hA9q>dq`E02d1iw
zpu!HT&|vNMXi6Z!!NJS|VA1cv4lLI6$$RXF4Crl_e@kpz*f#O=57!f$9Kz$e+a4x~
z$&d5GL5MPzsM5qLl_Zi&1J|X5`2jRV2uc3M<lBx$Dgp2jEC$PC7<k-<Mz#jo{m=Z{
z@Pgoj(VnLt209!=l1kZSByiI;&hkQ*jx@liF&$=jKbR}{Cl>=GDbSY$hD0Ya2sO@p
zCZHKy8QW~hsJ$*e=w}alR2hMVmHN2l-(`&7rBUK;7}sfgk_SpysDUZXXcCzyBe&{|
zCy>tg7c6a^z}GjeArIMr=`hT|LKT_f8@*hm6tr?XH~{jsIluZS!~Zf3A+FEE09gn?
zp<)xOAw+IHodpA9t6!Jy6_Q|8Ry7(YNJENt^)sn-u2KRfy&W6{r__Sa+dGV}!%xCl
z;FCmmM^l`QwZ_SMGN(&vu(VewT{>S9wQT}s!**)tp&K}b;(!QIrzHmdx6+cT16?km
zQRqMZ^mI}GcJ{Q7m<VdwlQpu~7Irj3zt?lm405iB6}uYFkp2Mr0cAB`lu(S7Xcz+d
z5n3?yF^rOMdYhtG$<SA(5W&A~^KVk{fD7~pkZ(EJRoFyET5WPIlZtl*iCxY2l}72Z
z=?Bok>KbneL45=A%Q;UPQcfLHiMfiH-Nf2b6vJ}?odrjT67<Jt@-q=fm870Oc@V@=
zbw!<=K6jYnzQRm1yaZ&o46Wp63Rz(FQ1bGDv+jYPq=k%xNI&R+enEJ!hNpUXsFFv0
zoEO#*BcD`>au@_Iy`-+k#c_7zqvf3#u-(wUOofE`5(xBId&MoMAo94tz1uX*!=>6p
z7``2L2ploLp(Fr0Ic&Muoiqvbmtx=;|0LTqnRue?xV}#IUNs8*wX_HK*-*JaiAF{&
z9-2#S+2<<)JQ_-|cBlE%g|0~WD{+7eQa(oDj2Da)Jzw~L;eU$^tXqKh;ht8r^Sz#~
z7GzIOWw)W~IvJth3KjvqEd&TBO0Wjx3Psa&`Wqqi#_d7+6NnCi1_u0_cFWAp*0R`t
zuH0Z0h~?m2aJ$z_Iw!aHQ^=c|rcr*v6~_OCQ)$LMkXjdd$K-E`VSnlAISb$bjP1xp
z%f$$+W5HR{@I=Q#A1VPiAM46vC2nmE=SMwVxit|zNCuQK)riS>RYTN$RPhV<NTWdb
zt-n;b$NltyB<oKS0ueHxkwA1ZG+kk%Pn860nlM53RQ&Y87Su83e>RVAi$#KJRYt1S
z^aDkV?K`wFr}F%f^2qZVfhHgf4q@1n#KKpDRFVimN1DFv*zj9+Q;UsYm-^)p7oXf8
zQ0za_B0fv|Q(-{=9U`e*SOhV&^-@A!2<X=1$DE5{g6JZ)r8kk!2tYJQ$b<5tkA|ik
z&qzGugPeUa|NC|{!p-+}TYutP(XpZjs7Z>}fkh|{NO1Bj`%ku;75qUEK`T@KTk|rV
zCD}kAoJm8t5co=?-5i#)su(lwa<J@;WJgem-~O_@6K@m?Vx!0<s3`nYk!XKV4izzm
z<ZC4Q=)HgQc5b#miNF`TlZjuJK<8w@gS%jGEKSi+y40hQ@6f4d6fb{sI<PwQvuYMQ
z{At3U>L2|GCZ5y1yO5UD=SuvhnXqn55w2)L^@J!H5Z!>EkomT7BOS}y{5w9>?gK~b
zqnGa&7ryt*J3PGQ)TddLz|De$YAM=al%K^wn)PNfe#d2R4F_O{9SzF*36A)(5`qv6
zy2y#>KFXJizgZ2ka;#Fn0&0Apb%-Bcu$zdN3I(x4PTvOs$<N}PUX=!`P<hQ=$V&&B
zV9r)({mAWhdoTpO)E@IlvP9wz(d53&5W<x<iikULB-qrDihlpQQ{PKqPaw$tggb=5
z2ib`|qZIUj=qUp4H1T`{EDaD`p@I+sMPY7%d6{9oE&-Srk_B;zF(wL6ndb#xnW339
z?E<hxDM5*V=8U6-gvH1|2^7xzfY$*oWq&b%DduyV@0=?;QbUIR3At8$2ZNm`EVE3~
zLbysd>(ImCR$s~ofGz@m<4qqB=ySBRn6R3y8=rVW0`!gLd@w*>+8r<eI<ZqvypA7G
zcGNIvcaM9JfT!qY1uYJn1W{D}8HT`yIl5Hm>dm@=Ao_M=7QSs+fqx4#%c^R9rZuDA
z63vM{o73CU0f(rvMCAD<SWxBwY(azFoW?swGXj|EC^(`HIL0z$g~*UeP~!f#c+2}<
zTi40b{OKAmXmo2bJ30t_JU0qybMA+qT!|mx9|Y&A3TO~$&D3qlzmdR*M6}w%e37za
zQO~NYfEE)Mn|{xGd&+vp6A9nmm^+Frf$l+(qD_Y+2&4<G?Y=wzd+4y~zH455fi4UY
zq&L6oY=8PS%4l%dD3lO73%01lOfMA22X1(MDeBt@YmhVT7p+QYwXC?fz}*1G{kWuL
zCC0L}J2ko~9qc!CVxSNs(C+H@EUqjqMi#Ny?dk<%Ju=_!Sbx2WShZa58K!FZslF5e
zt?8qj)E6Q}3*(4=0lUSfL~OL&)TkC6l_%ei^Q20L;E4Ih4({LX{^8&YB=RSbv8yBw
zLkUWdy_gI)QA^teS2bz&;9%$W$gsjT3?M*^0&;VnyKOC+t4m-q;82_m!|DR~FU||9
zv{PP2I7Q;!Yp;0iZVUR{UT}x^4$TT>)0|;Z9EekSO(rmgIRu@&gJO7J86l9M_MF5X
z76Z}r<1@L;2D>8mF+fhH{LC?`I&<b;bR&`Tl(KY6X6)0TY3Yre!GZ-Bp2UoE=5?1}
z@7J-WwtR!FUwl>Y@9oz01QfOo_gNZEdWbTr9(k;03?mENDTDdT7BnDAc(i7Qww<No
zl!s;PQ=Vm#>bn#Ei&NF|xFL>@HijU%K@FORWRH2;j-Z4(k_(J2=NJzFE_J`PrqGUB
zv^!@&%g8~_$pog?P(xIMVvWkn<9hhEh{3;&p$Z=f=^!ou?xuMf1?9<T@8R#u3ARCj
zQzf+h@z;!r@eG}ah6?Dnu%pK&KKK5r-X0gM`Z?ypZ_|6~au2T-3I*A8x9syWfgV6X
z0{z#6pnkEBrv|wNQIG)cvCgrSGXm~I(f1msJ*LDP^mQuFo*YP+jJxP~**06uFZd6_
z@V}0U%n&_D3o9Vkf+{nsm019n*fUR;;T=6~>8?+W8a)J}A<%J&MPyRpE1)8tG=cB@
zn_FA$eAnSE^aY9Wn0@cAt6w&K#}WPk>j5}yW4t3+*upZY(0qZFKgV`UENLkNUg}f-
z>z*{4tc^$?D(w>rod<Rg?w1NG$UMIkZmGe6cT(P0@ewK|iUUR0(QXmK)pDk-1s@_%
z&j_bU8|wPBUmgpVybu}c2gE&OC+(gKBcM`J>b`%}c0w+v-;C##8jx5TK+X|M$UKr=
zq;YV#?Gg?!rrG}_6PKQ=#F_l5;D<NYmF#~Io)z4~Wm^vU+?lVCD=xE)u*&+5B4q2d
zXtw+9Yru}PzaD$HoX^XycqKGV1<=*_qB`NNV84iA?z|WIjf`}wKeuZCSBcS|nEAxg
zB1)3iM=sl@X7Uv$4N(qPq-B3vWgCOm%w>zmmh%<k-YzCf!E9k=^FzEy#jWEjll{1A
zxD2QxaGhjJF~`c7fu1`3mtogLZ@gqQW)V%|)E2rorH4t+AAaew&4Pweq#E__xKvPs
z{7h45z{86D<~45oN+!<|+i!0bjotPBlNtp#2AE+o!0LfIY9J!BjIV1UG`;gLx51R}
z={A5nxljPNLMRyD4bRa@@u~4t#MLu#hG`P+t%rl(p14LBJ{M7NB(M{$gVzz}OM(f5
zcO#*oOI&EWW}VRvqG*_7DTR<RC6H0#1qqyxn>MBar<=nrn3D17*%m+P#Jvzuk@Iv%
z@AOux2u?BL;gKD=e`qPv)qr$GY5?M~FQ1I@ho4n<_G>vB<;fwgGcfpK2UMH(4q)3Z
zch8n9K2zq#fkM>*@SXfir7NtGvo*YM_3dBfq3N%b9Vj_v_p%W2nO1FGZwikb(f9>u
z?idC}RD_cr4c;0^Ey|FkUFl5ozPFHUWLKy*qxS7Z`q9a~f4g<Y=Nw56x`Q9m-^^GP
zCuZ3fC1V(15oRYO{$Fbt9dKB@mgTx$UoA|<XxBvMhb-HgZ51c~#ZXYQ(I1ZpflHS#
zzO(lj_85wU2WL$k%Ad^M;X~mrck_TUX^SK`v9-CED^@!b=Xp75y!WYQH*RiA5<#KM
zKvF|U(URBt!8a@pYy#v2z_fjlNa(BlK<RlB!$4L?0OPSLf0?zo!5&);3=k!lC4>{G
zn3VD0o{iHPkY&v2VHfulhNURC{axtCP6)m)_oZbLEXUQ&*6DtuLs0s_&!0mQ>NuK;
zJM)HvykH(XxDNd|&erWSzJ#uRg2&i7p3arFS>d!2k8F#EM`4;a&0%w{c|<<}NVRu<
z#De8+1swnL7;RXUk<U4>O0#e3qi^%*tLF|-wz3b{Z=!`3W;I@$s2r!O6Gfc?E)NOk
zY)U0S7HFtJ8j-4uXe`|Ynj)G4>FnvdMzDKFrKuH`6DX86Xa6DX0uiJv^~W?R|DEs_
zyekRlb2F!dhf8gkSD;RkMi62$Em;taZTu1+*~wCBysh8`+A7+q@pDkX(*G;&%KxGI
z{{J1jv1f~>Wt1&%S<1dPQOG((WC_W>M3%xBnIR%dw(R?o<sD^TCPXA7WNR^IvX)&;
z*6*3m`;YiO9{0y{&g;Hjujf7I^?aUt&rN&y;gW7xj<zTaei4wAsAuSH<~isc{`F{`
zI}OSDYQa6qj_?|Esg04%sHb5eb@yD)xVT*VsW0lud?DGO*>BC}+_qlM+Pw)((8(XY
z<?(e_KW?bfV#bjIr2};@d&0}*$wUNM*5v8Y>Baer?C4_ImkW>2Uy3t1BiDX`!(+7A
z(hISE!_)L^iH&s&N9$Gl%bMbYIb^>nx$Ru#&iv$F<&X`DJrjhbrl7FJu{>Gc^DtRf
z@J=pP@a^mG*LF6y8hk^)^;kGc)9FB9%ca{Yq0sV+GWd_pW6m1XecZB?m`MM2ct}eB
zm~c``KqRP$26KocpjMV%9P}64M7YWm{Y4Hg^%Aqr{V^1FpC2rPS-I$dnA8E?Kl!$A
z+AdS0-HB<8pAyjsVHC8&=!}#6$4JkV1$p@$j)9S1l%6MlhT$;;K2898TW7?T1hI71
zguiUoKLz>x4pE93lk+J`_!v`tY$rRYEp#R{=t`h*H%jLA!Kdrf5!%M~)pDIc9r|i^
z_cFXtGR-`;vu+}^#ka?j@1{;mcWP@`m);}#sCXX0Nxlu@zai{%)T4orF_yc;I8eWb
zm*6`E<{>el@JD$wl7hWk!zp)injY#r_&y6pjWq*y^+vyU<5-Zj{~BGsRh1CzIhk`U
z<_DhJWBzLX8b2+j@IY}nxgh5H_Y40-MeKQU6uO4#Vj?S=EhWP6$2{mPA$mM_h4{@G
z8X*0PUfd%b^EzD8rKzAwCE<6i6Yt|uGx1<X{GlTX31}NwGv9LY<Mj?(*18oEzEt}2
z=j`#bhWVzAC%>G`TN5}B`<G?=+-;tER!`miw-Mqp;aWZNXVLs{-9-TU84h3r2@Vgy
zHff7{hmAiAS3mk5+V6iOe+@YrgzX#wF?7<Cd_`9mSv^I~ab^zjA-fIcjB`Bz<+P<P
z$eRhkGMkex+pbWf#ffPEJ)&{QxQuv}BwxD$YyCR_P7A=OZ}LgHNGN_KIZlO4HI1}x
z9UR|AsNIg21)c<f!l9EF*y*J0Fsx!d->z3?dHqP=7V-=}a`~?bh?<`g@I-kVhH@y(
z6iIh5C5Q*KI|D)*y#S<#l~UZf+pK>0B~H^9%qb8R+BWN~fypcoKT(~L&hsXh4HU+J
zON_K}1VKFlJPw8&pm$T$jb+aV^Yb;M%8vNXYe1re2Ll|QzG5)RmCkALrKjQaw@*^$
zn&%E$cWq52!eA*366c>7Kw;dHF7k>sSf(i|SlAu}_FqF7sNMbFy;@p4$t#ct?p%9@
z9%I5Vs=86YY}&f>Q90Gu!S%l;z~h1f&?M&d2__?^=mqlr#=J<o?OK$uWThz;qQ#5>
zc%i(l`0g`7;-E=dQY|E4cRp*-aHpLXGE0kKY(Xm+z$6L%gC&er$Acn1VzRkAnmG9&
zB=<jjn@YjrHh?c$V98{nvbt3!%+JlQ_hqf7H#lbe*F?fa^!C5p<kp=Vk^^AP-e;F|
z`A3%Lc%_z->j7FbS1BW_6|u?&675rnTfxfUxp#!~^&K_AIuiq!4^}WT4GS$d(TgW;
zbe!(3a0ImVz2sfdGt6a@IMcIN_(7aqi(W*%u43x;pwP%2*eJo+w?VPB+?EoR20+4U
zf4IN_B;&U;L8!-{uDYYsX}MED_xDU>(SKbedQUZE2V)Ljz6mI8lL3gfh)ew=yxG0h
zQhrO?{=^`&2lz5l_}q0z5evFJZ37{AE35jWm0*#xd+Mh@<$M^fia1_i1VoZVFnjwf
z++$SwBaFhb4CUsC;Ti{7?BJU~*wW=e_g|0njhxyIc%oQCPFCUV>u(~3I|6ak@KTvs
zT4{B2OwZe6w%PUxRczYQi;_?ZBypeiK;*)d7KkT})p|lZ!n*3CjzS#L0q0JIcnDwY
zWafcr0xE~$+`+E9Oxw@7QE#adai9q36h-%c#hPHxH!Fj}e6aDomj59tRgMhEBoC{?
zlB~yv<#Xe{OG{h!Bt>Mmfy_trO`5?tP{$$C8QzTNs-@gZHJK0Vjq4Z>r5QXUaVF_i
zv+ZD2cy!alr8Gh>VFbmJQZ8i+o=V+Vz?~zlBE?~)CK(DXitC>%V=K(H^VdZB{$$G2
zOpTUNmbQ?j3&?I1%@jK@)sK6z;Y5-mi5xV=|K0?8RYKFRG|6e8qekgOM+bQ3I@(T_
zYoQwVsX35(0sMf^<+3OgCl6{@x>F2?PkhR_C&K78vlJrFmZICLjq=w5ABqLv>7G?W
zYgAOc8rj3{;kh^4{<-ex2$CkDgzgt3+{~*vv<2%>-PmDI_q1zLc^m_OoIx_TRVEL;
zPf<9<vf6kawn|@9hSZANp!tPQLc>YMB)j{TozSASkfF`4)WxIy1UhR{U^pEAB^I9e
zbI$&X&{TP@)RoiNKLicb;{^NEk~JP+vWySiZv+0t{<eB>RV4^ZoDU~D>;*rtN=G@G
z0ZqDbzu?rjA3NurL<(%}p2vD8jmMxKtFKm=Q;(g8nKm*?&YmG@<Tbt8{8(Q#`wDLk
zXz-jJKnvb&S~(;1LQ7<{!mnmk>B!UAQXDsP+bhEvz;Lx^6n{%c1v^O{iyz4)_I;e`
zy|J0m?0*5w3-;rsrs*kjfxJz1(+azv+iVo+3US;Y+a#{fP-q>4Xw&~Mf`)e9VHl8@
zI}Tr`pSB`e#bP^a%B|W28g@<^@1&lL^Zca-YlXr@ai;Gt!5ct~@V!asdP2Rl?9i9L
zb@Rk^O2yv+sxyzugZ={B8Le*JUVn39zAeU#i;mt_fI17KVCTOq*yBrS7^Ub*#?Y@q
z33l098JL%SA6?}mDDaJq8%D{U!R3~s(Vop5KjS#VSy<sgfw2r2274gEY*nk`JHYdV
zw@N}s({VvWNWso7`JrM0;D>U6b!@PWdX#nsmkF6?1Gx6&ZMT8$k}I|E33aH)Z|z@{
ztT}_^&|W3hBO$%&7%N(u=hn(8h7Kx;?{8T?OHTWB1Ef}s=JWW@al_oPG;ThU1*iE3
zz(WpoL4Q*aEk|~AzXZu_FYUVT$VkTGz<z)nz?AVr%V?`Vl6)!ofOJ-`YNnske=o2D
z``v9x+9~8laeOunISGKz{yv9A9a3lOZfq7)(n>78b@VfazfL7&qm0(sMVI9=s19r=
zo3yes>!lZaIygd3P!Es3wlqvvuc|(!5M?yd>bJDn@ID%5UMi{H?BB%nY!wT9tew7P
z$C`n&Whl8Me8a<*JL^3<yu9k{3SKj30$Ac-50l;SspyA!L-fVPjJxaPy;qjMSr=-0
z=g<C~+cVnzi-}mZ4|kXznP1k?v@v9Yq*-H4m?I1jOoug}O`X_XU&{FZ9FV(U3(iW~
zEn2)&?CR$>kNGiq#6+x-$#!2*A*;wg4S8QvOn~x40X%dNbQl(|bRS#uP_}D>2nr<v
z(@)=l7!sLC@5pJ`X&cN8ZSS0lugr+fVZhui)s$8MCiRgxLy{UH5j(Zm!@<dQ?>E`~
zaDP$1dM`v<Kebs5-=@%_yx$4i9{ZhDt<ObJUW2U#xUP<%U7(@o0;rqxVf0ivKfjXK
zpR%hE8WE2YHIHz6Tvr7P)T@qVvMK%Vh9@?KMSqp-hq!dwk-|xWW_$`VdiRFS<sr98
z7Gx{KJ_A)CN%ec<%x9jb4!g{!v$Tw_yMBH2r8GrULm?sj)~~<2PngSVDl-?0HL;!q
znaG_23E`XR@M2eIXsDJK1-3)D!no3Fy{B-ggNjcbRJ;0m>ViZ@E74<>`R)EE9KOF!
zv|6%HU!KH3#@r2Ehv9s>i2_A>?m5SyH(q#d^y5ADeJoY(-J4)WXv!zhuVNi>8gnR@
z9o`^Npd-zzP|P3Zy_2TWc;Eu}FWDCkti3?8>bBamdhU?@0>K1Tu^@3qgy7g!c8gE)
zsXg0wjTLidEk;y!qg$O@rgU^hy(&nA?KZ@>b@}%X@O8@@EXwd!=6%UHk<zl!T32W&
z?s<s&8uvXZaxgYNqbD)up72z)-|ohPK}DsZ$?-aF7Z0AI(vrH;il-nLlMR7Nx=rTB
z+J74b$Z5Mj5(~=CmNOc#4M2JPQn(}&1l<otd*%|a4n=F%X=#8Ra_1MZ!MB%W<%6^)
zUCzhSj+|<75!~x|lbKfk`<#?Uz=f7Tu)&M*c0N^g2Y3TV;^;`yq_2d`0VI382BI*3
z8Sa{SLV0|cknq*6?}9l|;-Yj^_Ux@mJL}$@3U3SV5TE*n9q}z#1OtW*5g2D*#RP^?
zMdF;uCalwpoX|+UduHXUjx=Jm;^&aIjFN2u)s_3=b%viVFTLdR_*hY1Q&HGn`*f;y
zDWiEsqdJCKbfiYA(HtN5012)TKuxf;av;PohDmDU;d?6_{!MN8>#^EH{&gua6bx&s
z;a|_qGU-<Z)s-)sYdz|Hs?S~Y?ip7<70gP#;-tc>`#A&+Pf3N*V_$Hi^yuwHIq72}
zznjz^O?1h%FSr%2@A9`VH1@n*32NT+<^6Z{<A|P#QDH$*JQxhz92mLeO&(RB>moc$
z<lb;%!NOFl;CX3tCdgeFi91GKjG3luXXR60l)Kuq5<m$O^wv;vU-6pVt;)1r_HeyT
zT~W7cY2}}*ENs1Vktpa}Q1a%{#&aW!7cZWr%2P%;&4s`*@THL*u!z_KH^25@DVB8f
z*h|bvoCQgj#7|Nnt1*rQNo5%k3EnoLs&30om#rLRz8|#R|FbhZGTq|Ta$@ezU2_}L
z&XUe!25i?Qq$Nr!-OkR6X7=?BU{bF*Flo|hGCaLzHmW4UcwH(Brv1<$wlBthwj=U3
zm#lYaqspmdwJQg-(Y_1DJX-1YcXh+IbX{S8%D(Ov=C09fY+_U@p_JSCEwGX(ohKW7
zQn!hbZ+6by=6LSbX087mr8FA*gz$hYwa;tDr}7|bi;o=|R%b=>@k}EpO!f~6oO$X(
z9f7|0agm|HLI@!zKjqi)><8j!aNNgFwGj)~@AY&kcNLz6;x&&`-gQwqyM_)N&m^Vf
z=o^qf{T<k1N1KzEE4K{M=I9T719!de2DJ`;5D6U)@)@&%2W;m4fn!viwRzX24@|Hf
z^hSeCGM~6Ws&$Y!^*p8t<9!y#6Q*314g<}pd79+pgTLLwESIjD{WLU0KR*r?F$$m_
zW8t?2{}p|0r{bRd;^U$yNpY>FdsyB*TqUkR?TK~z8(|@+NK|b7&pVwnWqMv(%zWah
zB00C)A2ALye>40iJ9+G+_KBfmx@Je@6!FD-02e}VWDzfOqzJi}Rd?T4`2&O4%gK2j
zVo>_?iD>GDu5NZ!SbCWMN~qVKJ$aQrd5rgKFg8ab?&{oXNAfxS=l|cAO~xUIumAY2
U$3`4@F%N?Db&YkZQMVucA4q>^y8r+H

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-64.png b/srcpkgs/void-artwork/files/icons/void-logo-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..c20179a3185183681679210a8a068fe24274e9b1
GIT binary patch
literal 4013
zcmV;e4^r@nP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x4`N9~K~#90?OS<NmDjcZ?K@wl%j_kJDB!>l1Qo;qBhg^$6hspfEr~UG
zjW17=yr!*5SF6;t+L#y3&@_2QyP8;I;y{QJL(wP+qBtPRtinYG6&Wv=>0a)z-yeb%
z?ucIf=lNUfF4lL3-`RV!&v(w==X}6JJj6ph#Q$T^gB*;Ry#b5|5ClNc_hSHR0G$A;
z0bC-Y)(0iieKkOz!t+`*Eib4$)$#4!?Q(Uen!9z~0=+>mU}k^-AqiO^6tJt*)ueD$
zkiu1=^KkPx<?rFY2f#rhYPw%C-WLNf^AnA2jel%tYly9Ft`%r?TEX4$NX1eP^b0f&
z_ZeR3=jr!0fJ`D{XUghS12FUa`sVuWmDei$n>EcMXL5VGdK$+Bj%g0^3wjm6K4%%i
zDF$HXkjA#g^wQeWh!#zY&>5W8pm0?fqeewt9_BslX(B4USH62TfKI1dcIo=1FD}<z
zmN1;^oz_7>$gmJYL{P+fiA3_3d+~<5nwxh*B9XM~^?G_>$^!rcRSi|5<3-2+)Y8#%
zf|=d!mdaUEVBz`7^9NKnRAOiF4Fy7h5b<I0R|C8Q;_ha(aN0|dnHQeFa{hp-;lUe0
zKmx>#i)$R=HzIPVMsV7jnurcD^AZ47jUboFO}=ivCT|aKgGeaShy)^yiA*K}x#)Uz
zzM3A5xUsDf-P&&9P^OfLO*nJujK5eUKF!QgMAYf9+zyZ8AO?GaL@eQ8Ww1f%rOfkH
z_<jN)pNML$^z{KSv!%0TWn)X@&nj<JigbFN!!n9QBAyXB<D{><Z-S#QMu*AUJ3E(4
zMWS|@O!l3<w#>ZnV%5cTsYGfVHEh%tnMC$KM5J+atUeA`lgYGNbwjnWw5C+9H|iad
z)m`pxN{mYUy;LgQ>_~fuNSQfw$C0ngT01rL#-deEi$tOf2l`9^P)kH@j*MZ0$D>2r
z@qSTNQR<D>8xBp`5M_uVW=u@9Bl`r02n$su>FKAk#U^HmgrdDVo$eW_RBF=*M0C*+
zZhPqSoK?)cue_%Go6_1+sl7f`H>*UC_&&0inIr8@1-ttIW?uNk@q^(ezQvPWm@9t&
zyU+LObh;Erm2d`#==-psu-NF(=q|gB87QhQ8V6vhy{2|OAh-1Fr{(pP1GcxvicX0{
zLeW=_c!D!QM8(WJRo|;WYtIwfyV`|yO?4kK^L|@iVABJbIq5)t_ApCz*@d~{4{muv
zvSZ>q2SijH78I5e;2mJF*Y;A~B|iWQY_+lJ0fp7&X%+QVR)d=#icX2#<Su)eIgW@f
z*b~TEAfm&X9?d_S+nZmowK}M~)WSw}<L?0+vew3`2Qahuxys^Ld%`GOJQ#q*b=?ZD
z7c-|ewKpBCZLBS>ZLBSB(lmX`%&E-m<tUH4%>A{9pokuO?XI_6pUBL9*6M9}z`UH|
ze4A6mO)ls8lV-l>ND7OYCAwbS#<H5S|5n{pi3TM}BIQ!~f?#E^p-0!VRVI;bAfjGd
zd_<(t>2-fBuPgtHt<6$hQ=Kq6Bzh5motEmYDp*=qncC8!wrPO*lO8uJToqevwE=E<
zQ<J9YLiYLW-<H*uNi1cEdUQR4(wb7q(ZZwaZnodN(6=kJ35iJZap)tVHs1w0y^b0+
zjn7%D7Zny3Zo78v+7p8-zCZe}upV_M<et_e&55Dm`9!4de`e;#a&mIgbUK}4?%cU6
z0ki{Ha-sCXhNGvCdYDWmt6V;QK2UfopzYOCUU6R7^hc-XGV@cpxw+dl8qEL~W@h7z
z88iM+QBg6ernaW1y0%(uD|TQtCuU}5mH>cQELO+G#U1nX^!$*BnnkBipMGie>eUvt
z6pDqIv33b$9<F9}z8>DD2|-~W_X#AgsHpfPIXU^~Sy@@aO`A69<#PGwyLRo0+_Pto
zsH@BV(hUIN6T<P@`q$v?=Z&)!XU8i=$|JL8%?cW9IDdbCR;g68)~#E&_Ta&Tj%?-x
z03!Myq*Ceh_uhN&SIitkTCH|<czF27DwWEjy9Z7lkMIRk&B|v*PBFZ><mFHR{`>ar
z`)<veHNGAm9{B9D&uUMcIH62SOOqOn#@p@1VliS9V&SLs0}(;pqDKCY`Ox-g2k^!v
z#Nju8{tW=&o1Nd_%g?_w8++r%jlD@pNqN(zO-meX94}ulJT~{S+s`-ZZs1Jr888p@
z5P?8|?Ck7(kyI-EEG;eV?dP9=-q(@=>I*Mp)U-&rc)JfM9}^H{tgo+MwQ=Ldw|4B<
zA%5wlm-Jh<Z29N9b?bh<ef#zS;jmaNM%ssI7#lHm07qv>C(h-a8&G!f>_xDN(cRsR
z^u6h3@<^pptXQ#P-`1^Lmsy%p3!YwpMb9m|{mdrDFBbj+T^$3x&}1^9prBx)fQXE#
zsi`l=#>N^4lK}u5O{n_Oe2K5Wd{sPs`t(0!W@d^qGBU1j-@bk3?%lhe9jrV6%vm(Y
zO!;12FUpI`&3JozdtqV|j(mH>%sT*J<;s-?p-_mOJ9nD7zDzE|?1i%jlvP$#nknB8
zy<RUA000rCZ`iP*+F~mJH;Sv!)pYA!$3_z>a|-dR7ynBT8yjoP%gg)QqD6~FH#9Un
zxqkh6+2FoHp%70!_mmlD?vY%Jf{h9p1u&5HO_o_55g|1-_2ll|yO(OU=Eg~!mk3w4
zf$ythhmToP3nNF4Y`8t|=g*)2Vp39)#U+JJjLMusbT+DyzatZMXDhJzgLjSl_wP>#
z4h~*JM7^1rnQL2HTg}$vDKn?Q$KS_{FLQ6EMWN<BJr5_3pF~Szi&<S#Qj#G$I{L!4
zZQCS+>jVM;<}aN;piHCIAU8YLn)0T_ix+RcZ2%(r>8-ckDijDTFZ~UrS8?ipzlGe>
z4bxv)jF^NejYO0W0L)DF_4S^X`aQnjakH|#V|l2*T5nb!8WxI~Ni%VH-(ia~tX{pk
z=F2a?T-n^*Y-Z@m(<fut@PT2=fiDg~r`4J95D~U)+0yFf=C*x+wzFo<dU5&k<rcj_
zBo!lUUOb|gJr0Sh3>{q^-ggkPtE;QtQor!X@By#iYqi(#_YeMV*3Lh`A8&4c6Xh4n
zQCU%GRzGgsIAd~ha{9Jy+sxNw0P~+2_}@R1dj?tQ=F<oOHgDeCvuxS21R^pIBnk=&
z4#mgEFVO4%t&eA*KOSA202gnM+htEqoN0W0;mUyiENpIW?$N}=#MuVJK>Ljj84cw~
zB><qOy9Z?#%FwGDxXYb5bs}DQ^A#w(6nN*Ycg$7>0NAl(hsN96yE!E#C3tY1P$)#)
z%(&an?XB%7FDf@%`dnOG_@j?L(yUswYBmuS02WeW%pCN_8*fx@-MUpIl!y>ID+WPR
zBS18;snXNe_>b4NJWE9T`}zg$+O_NAtFON5saC7)rrP8#a)d{RV{Y<XL{EtZ5#i>w
zn^?PIE!Z?raHUeoDwXQ}<;$19o{^C;q(rVjAV9$I0IXWMO22gJ(*03UQU6Iq?fvx@
z$<%7~vOWLG*nQyQQK3*`In7TXeE1*hGsg}ewXnae?}R3`u&^+pt*y-+0Emdha`DWP
zx)OJz>DEdslgps+QkZe-^?I~6wL&NmA~G<tL*JwSiJ5uCh!NFe$BupX%$YOqb#`{j
z@9ZOX5l=0uDY6(h2m}In`FJ5NJWd;|3|8K$ct0#|BRxGmzb>n<d?BO!$Ddi$9sq-J
zy7IzYW_Ih(!}tCDr0@6dw#?q+!^i)WU!EVX?bTZS4~oTN1dR&f_^|jgUk~4z7NX2&
z2Jw27TrFuHrni{0xeYfLw>(SA12&?;u;C$lz1<YnqZa@NPyZn5=<Ql#b94Yi)avWu
z8#8CpoK4{)!+T{CnHjH4Dl>(T4DX#YY0f5J58oI^LTqiX_SdQgmCaZ{CY71|J^a70
zDx0+mX7>5)$litnC$nr0@bcW}x);Yk@rX4GTj2EsFu$#{ZE0suXD9%;$=xcw+`RS!
z`0mc=(jL#Hx=RhkSBq`t2FDB^W0(*;K}kgB8w=P-h!9cBc~#lj11Gc0BcVI+c}}`~
zQfTB~0i-%2c%Op1`+oO=5!zm@-Ma_@UIAyVDG%65ipGo%dwc97qb<e={m|-kv_1Q)
zXPMb%^3mBKqLK+A6H<Z$f-UYp0Kmt?$Kdbfzrhxdy>o%ArPH3gX-}AQSBgcuax(V!
zod!KH5YeHDp%a$`D=ix#ba-eJ5goC`VRL>H5i|4JuTLD_Th&lw)7^Iecu49lcRk6>
z)0}lG<OupsrIVTY+v=OuxApOI_c8|h2L94sf4e6`M3nyG6HCemZ-mUj_%!P)mt8p-
zr<r-7oyJZD5gnd1c2Y{eClCmcL6PM|WI5uxv#%oqF!T7oeZRZt;F%vBy8JMC%%g^1
z&VBZ)kv;)y99<o3jO__vlq2U3{YUd6kqA+vqaujtioHG#9gY%Fg{E8cy9=uFcWRrj
z+x41rSBga?wU<}CFe@cRqw9RzUE=!Jp<G%30A^OSc52@EI`{BzTf5qYI-Txm2M%Np
zG4mq5Uhn6K^1u-82QV|0*Q;`Vx9i=6o?gc<EqJ)N@uIldhS;%>9vK%9{0{&*)~>NI
za}a>|qN|r*DX1!*_FchoVP{V_0YFkrf_}}DE1Z57Ii$dXnOzI2N-n1D`5;7Zw7EK3
z7>MAf@HR~hiQthwN`t$rd#gkw>;RLXyH}^^)OLAPUat|B)l~|bG_4lB?0y(w$X8^T
z+2=$>LCHJ&KUEIZ2+n}BjWFa(Qbg3k%#rfvUeEv2zK=tCbk>8L`+@AjT(QAu*yqSQ
z!4cfG@XYLb=~{K>)`L3}Y8tQK*XyyC@I=fE!<xA(k{!9TWD9qFO^%4V03>R<HNW1K
zb8yq4v&Y1PGcflH0wQ?1xU<e+u$YG&3Y>LQbbO(zWbck62g2>`81EI~fuY9K#FUbl
z(c_m8QPsWjIs3YNN^a@dkM^F-8g}J+wbKkiAViEDV@RGdr(s6;<d=!aa@zQ=xSb4U
zCIC;KzgoWj+~uOl$BXg>ZC&kmbt&7&-P4p9HPsX!5|tl0dR!V2{orJA@B1e+J^&V$
z)?Im4)lfU5rt!M0>P9W!Y;O^0^;+uH8wkV@2}SHCb74P)k1<pkC<yW!-Zfeocq$@r
z%ohN%?&mi|5Bj4iF92f!jKZxCraS-$0kq-Phf_5GF5m0r%7=J}hj@sGa1j3oN`j`O
T7)vOF00000NkvXXu0mjflT-0;

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-128.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..82cbd153ab2061058cb84c9a7959fcd27a3b3559
GIT binary patch
literal 5156
zcmV+<6x-{GP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00006VoOIv0RI60
z0RN!9r;`8x6WK{bK~#90?VWpkl+~HXzt5RW!cCN$Xsw7_ixzBmt+$p-U=$L-qJ@wt
zP%nVDYS*fDtyU?%(%M#OtGjLeh^v5NqfSEn6f1WPL9w`kZC9y6Z3SE{Dxe4m$;|sc
z`$rNCBq1}Cb7m%(?_Xptzvqzmm-C+Yoaa18I0A`P#g4-;5TT!_^cRtn6zzx76QMiM
z8R!Ib2SUJJpcdG#qB}%o2k^ciZ!5Z4(SL*_^!kLM6W$UL&EEgaK9cPQw3XP3*wNBS
zh5=`yd==$PgcBTv+YP)bA}=etCLxJ6lZQ@z*HNsD(C!SNs#5uU<rx9NXhn+!84ToQ
zu}K?&C4wyNvZu?cv17;9WU(zN({2n9TNC>?@#Rur5^#LB+tUKOP=2qXu@Ad^xcus~
zu8wEBL9LO~1}Ixu);AmuUxIKc@a1f`Cq=fQJfeX<6pcjR%ywg1A}0;-#F{6*5K4r;
zhj1lz1GaXJqHBzpyGw?a{2|u{kvV06^6K)z2tNSE0Vdn+v5lgy2r_Hpu!)Ou#RxfJ
zfG4V-_)<th_W<9>c3U!nvQ9*1Oe~zZEZa@VssSojR`&A4{!D~x$?ix#D=4}$&(FJY
zLS({g*=j>p4B)9}2Cg1>oruh$ZZhVxOdPmZ^VEwDj_%8J@QfRvqPpUXDmoV!n(5d%
z&YP-wb#!?2xl9Jlm;qE(%3mnIQdE8gbj?)Uc7}?|e;0HuxN+QB<37nmz>FE7a%E*N
zKi{tg24yN{JLXj}GI`?Ai5px8%GjgUgpm_=C>jA?%~Z^G%$GILmn*6(E^{3y<70rz
zHI>KuzW*E@Jwb8^zuYi%!w)?10ypwmAhtTzN04V}f783!L3wIVuxHA&$h7^orL#5<
z&|!kqP|>Q|aP2oQ{@TSK+tkhKL{NtbQf7T96dF5W$b|Q831)pNxMNI^GJi|>iK5Ao
z$(wD6W!(VK(G#SKAb$`1U}!WF-PU%k9Km5vuvO95MCDC{cLaGikYIa=Py(M_fdpYy
z?J6NT2I!`Nb{AxTiViTCQx!eYa(isCKHua=E*g5#?zV{Ji~+!k34BG@8a1mFU9GkH
zQgl>wS6kW?tBQ4#ken+j5fwcTIGfyAxO!H5>DcI?Xl=RzIb{Gy%LEBvnTS-@CTbT=
ziA>q<uzAF)V%;!YAR?Cl#bntGf;{=!u-B%fJ5P{v27u&DAjsxGf`@$Z=VdE1w`^ru
z-*A3-vLM$eIv^WusOO&2!qQvP`C?8Q01i7a+<<UT??msiNF<WTM%xa>Q_r0K!s!=i
zpfeH9%0d$q7++dg`ukMBn6n0eCOyFx;MR%5CO(-f=~RcJs#3nXe4H4$8|AbNhu@LV
z#2J%^PkuX<FQsIF5uTTK6z?AMwD+LX`)p$>*Hj)G_`$b>yx@UsBuu13Y(p$xcF0Y@
z44_K}L%+DQ%gzz0q@$-~fYEnO`=KhA5)PlY?Dhx$nR@#^TP$3&@T9;GehXZX!LTWf
z2a+~GkvH`;LH<PDp1L<WOpqL^Dhr=qc!Q!p2l6u#5{*O)qt(fLIH`Pq(pYIo;1TLB
zKEP?j<Ife}bycqJ(8(D@L?;$byjMjB3-b4jghcM2vu;i}nGYvrfRF#$?Iw_O4te=B
z;_($l-X+JT+{Diy(P7c`HBxi7qN_6yZeWj3dfbrA2V1=bjPj;`&Y+uUIghX7c8~&#
z7cVZ@+imXxpww}wPfW-REE!U=<!~QrwFfZhk2!o2XUFXz1;&mYTcg`_GQu3kp}GWq
z@Qc<ybl4tXw0G%Ol+Y{G6;Wu7j-DU|R8=aTub2Z|={VHL(!$bbTY9sV9>B~dxr+~V
zJwa7RPmmlUqPk750V*7answNAwDiW9S<{9G0jtsoxFHb^o&W6Z551ShcRzE)HpKGT
z!83x4bQUC_uyjP}^Ub~0Vh<1mq_wyJ49bi9)g3)SazqD3YvU4+3bNT*5W|d?-fFf7
zDDo~pT?qcSrT3F$BjIqQV@!}73s)^XJ21fuIGQXnfjOsSM9IrdUT^NhLU1!}Unn}Y
zV@!}dB_m2+7UWh}`o8gRYwq<X7rFkq|1In}v13e-B=t`QPvd6oK>d*a#YsaZ9W)!+
zqz4FzUWVOnsAEi!BqE|}^jhlb7Fw4N`Jw5DzSzV7s$A?K_^FaexX?Y~hz^ZzRneb0
zlAnI)8o@yZ80Aer3m9lSs=_-#m-zj*b&ptjG8^Fy2g=9w*w^Fy#xER{&?x974uWFf
z)}=QuaM7)$Ol(E$XbL#hi0P}UT>(U7ulTZUU#EQ=ZEw9whv=YaZN=(}A1eBkZEd6G
zTfowWpAQTIJ<l_LWXroiU&}Gy_&O&I@;o=YTU%q!x;fz<dwYyA#$2eX5#V21`O2F>
z6~dyOop&zFR<XzW0pVY;zggxZ?WKJiQppb(VDzl1XKNt;V>uWgmo4+=K5Ae0@YENi
zxE}Zp&?ilq_Yv;bkp4P4IJ(nf^OB<C`HIP^T4r0<h#6HftYjrL8Uv`B(Y6BtTelyd
z_qYSy7MZhdPPn|f{3bu&e+&2#>0f++V^KUw$UkD$vFod<sxrC<Aoynx1O8@PS5?O}
z{M$5o)xH5l9$J6(gBj~WV^y(JdVJDjEy6E=qby1vEh6`A4{cu)tB##)QTMP!qfsBV
zzih00daVt>1wWh812{C}r>*!J()pG(Tco_YyhuW_UXZUk40Dc%ys~iB!id8d2N93Q
zAER#flT8LLT)psks5gLL(`gv?w>T|dK4V@=IqK;WTOFH-@HCmJIe1K9f+ZEJE54b5
zSWFo?<vn1fZCynNL%ji%!1`_$5m{(kvpLFFm!B`lV`L`dwt)ggpDeE~FUmwPRb60R
z6CDBv3?OG(*7qf>i!5t4AyyST1*ilHT*qpLe1s=6F(#-jsQm+$Zv%>+1N8<FuzlZr
zX~}K#KCrBL5Odbe2@~Q;vRi8Q7!i3q7K<gDHI)|ilT+($Y6^0?s*3r>PcA(HIL@Xx
z$SS*fP3iGTj~g5h_>$#ZIZm#19YjQ`EK43;`C?^16HnxQ$+9p3B(*CgUCOG;dJ8hs
zWsDS=^;FeU$G8j-_<{8r!hr?@jS}>;EgUCsFr)Y>;k@wmKsT2$QskIKC~=+300nsk
zYpL4?ZV%;TBgjcsMd9sL-u#a&YaSrBA(oHw9as8kqkPxpOksU3Agk$hqSD`hTI~VU
zaV=o8!;A%byNr<*Lf`G-?V}t=vARU8q9+;b_W({$$Wrt|m-=l%0vYEx#3q|!iuN&T
z`L9Xf9h-Vh^(AA|u&JWxc~133tu73SN-rapD_E$AGXun4jP+EszbkzU42V_5oDEJ5
z#_rfk>19A|moRa+ZeGi&&a~|yp-{+KwJ=57R1~raLKg#K)c{5VcXfP1wkNFY6PUnu
zM%4kV8vqInmTv(9)@#}~BA1^1n?-$fHZ>j6kP`z~JvPQij<^#)a|J)}ZRb@6Mj`Dw
zv(2H1yFri|+kXMpk&rmcDi&k+b`9(`V%Y#jtfpcegcxaad34u^@2-s^mJOinHCWz;
zB<jupzVWS2gg8KhAh4dq*+8H{FPnNIve#hwu}#6*s#tVzbf?pO^lfKTG!ot8OkFs^
zrktXC4Pd$KYjBEPy@OHJj2^9;5=x7;cx+(QSTz8`b|cmeVB8i-7M!P=rHdMU+Nr*%
z-9Ij6i&12&RZ+)v^R<^Q!MbU!u&qy`kM-=`gHY?+#I_phib2@q^CP@#ojnRh2SsZU
z9&n|fHp*{Zo?lQ_Rn{BJse7Wb)hKMXDGEp@*?X>K&4UQlgzf`!X-?pyyddv4E(7F+
z@~r<(MP;iAkiXg%Ry9tSY$uGIumj~zmoZX7RA!8ijCYm=1z<44ZEO1Kziw7~bKe4N
z&t5rSv+o`B{!f&3uHz)ZAA|P-=eHz93oT3jUo;ZkW~fUve9f}>*%#hD-Pwc?KqL}L
z_<8;$piRfZwUM1BWF|+WQQu{dvXy0h!R}c^imroC7lNA9k8300{rh#SWz8l`8Zznc
zCNSfH8rQL!q1K4`R%_L`ZIGXzKc3`E_9lg>tcQl3L85DHiq{2jQ*P!^N=B4a3G!_$
zuW7WxejwUVWWhBmI>EN4Ag@5f?qD_64FFO+)|;A<1dfS?6BimW7m%6T!G{QA(mA3n
z9UiZK{6rMnxrT|LHdq7o23X<EeHX;`LQ9^HnPgeBMM{R1tTbZ2s;KST*#T5_tqGYk
zN{5xMauwrH!V<m$%iX`CFE$*h+bDTMm)Hza&o!m7Ql}dy8&fi@<R5+fK7)Z9vHN86
zk)qe}9z!#6&u<{MA(pRblj4qTMUZ6;|2|*<5gZsm2kd&i+eG`iEfa}E5~YQu_i3J<
zTt8Qk{w`(ZJw@-x^Yc!Q7Dj*LdbEEiW~aFr_`G#p%z-j-2evXvk8Z1U=bl}_(KdsL
z>TN&_+xyyDp}wk@H)q|PyL#^HSuBB!t3UnwunQ`JY*O?&QF*#o&}(_Nj;D>qVj(o`
zlKqEc+pEJ~{d2<)2NjDh_NF}oTxvU_AQvt5=H|pI-eYSY>)t8RX@II8ht?&TD!LnC
zTY(g8s^5c`bt<YWE>m$*W9h!q!qOWXemKYgqrItP6?w*fOxa|5cKynd@BKO(&+F}u
z*o(2wCSf)zdZKM@4e1%tA<+Xpz(E<j`{}<NaBvj64$u$xeBZwAk%`3RyDlz1@M`0W
z4~H0FmFFb{byC$cP<~YO<0~>&W3N4<qL1KWm$lO5+BPj0Pv~JB4A=xZi=X&4Ieuh)
zE)Xq@eh><UMgkiw%GSi=@g~*Aniyc2_wbvbi!BCjgj`VUO~2la_L0SeArszLG=jaJ
z;L-Y;g9p+4E*>$zv=p=%^q$ePrhna?{*gnpF#3U_=hJo*sIUIL&ArjA0hZk{w+h5+
zS+YiiH3)uJU!JyuR<LA(MU#e4dcC<fTHMDct(-X7Hss`ZO~K-E-c`1@IvtU;bxfc}
zTRcO!MFZ4N+`N=dz+@2kTAcV3BRnsoCD_|5Z5R_g6CE0Tp`|wuyOTF?T#HX(Tmf6}
zr{l>WDblzd_+sR+)5)#=;)}hhe*kfDj$I>kehvMvT;+LLnRjn*#8$`p2=XkgA1Cub
zX<_L#hx<Shd-+2*;5_9@rWUYeVd<|*JG+f@WRPS}ut$AuHFLUE1Jun6$bG3aFikG}
z_~WiiJDv`bqqTvdATy(pXscV*ld9&?z5DJvaa{ke4k=936#Ti!n>N^etoBb!14C6^
z8*B^yD;bTX3{d|4@_mS0MP}CY`w3JP-8t<>ItGWW(#-9k2I2B#lUGvu1s8i$?*+Lb
z)kda|J|pn&OTGD<GZ(Xc(l9VobV0N*Iy>3#rDT8+-qcP7@Dj*ZQg33~d;)q`clQ3G
z+$+yy>UY|d{;IU|uHD_f<L8CSGI?rxSyfr@ybtm|OeJ+K<u0~()@6eT%vv&EvTY;6
zEz9nhw}=d<mnDnmdFDmgI$2bI2Al}|H4zS-mq`<(N?P~W(RWTCuc`~v{eByH4P<r=
z{mOD>-r&qRSA~23Gcg(TR^ZSBI5rXvN0#0Gpw&|Ewn+N|j`pU_R`?H_jY*Ne3HpG6
zvc=x~tW*yh<6ZIj0Dn4g1$BS%EwLdH4xOKiJwe(As6TAF4EUDC_N0RkEEi#cXzepg
zyx%!J{d>$$r}YVHxd@~LbQH;N+Q>;0w5ba(^-A+UrrR^XNK5T$D+yq|!gGjLb?Ri+
zF1lrIo3eb1y~}&5=($FNLPdsCcfxAAn_Y6w1Z}>DUwHTQqiXh11#0{3K`SV{V_>7A
zo4{-oVK)RH`)YOxx<@bx(C&y7pxR4BPeA2(MF%LHF4!&2Mvj@l${=o>cUA9N;x9nX
zmvhe*a%Ny?rLgnU-h<mid8QZ#N1Y#`oJu^t;{3a=a8_DAS*%s|UOeOBEnvQ;u-2C5
z5ze5zxWB6SuB(pEW+SXW#~01Mq^s-=SJ3E;`VJ1u8-&B>W$Siey|(}In-}cu&hCp8
zdBV2#5z1-A<IiQQCvbAOL%CO8JD7go2DzIYowm&}P9q*)QRH26Y^DP{pUN%vrjG=D
z49NO`ryY>-+d)R=@{4{l?L?E1#}yrtiFoat4T*ez__Mb?x+4?8GIGAp@)`5q-cP>~
zg4_w%KKJH`L17=F3woZi&uP`s#$<dougJT+Pzde^24y;SZlkLqba`D4X6DHF317>-
zhgWYuK75A4&49bpHQEomfa|_a|461UK4dxPZj?9ua|V76nJFrnW5fmK#lxYQ*<2UM
ziKNRSZ`yf+-T`8}AabtqdkM)cOMf(XW40TT69#CYc-GWm1ado2ob9$aAOL+zjm%y?
zbDpz3m#LCd256vo*7ScR;3m*1Sgw+p1!_QIO7PR=-uySR-IznkNdq)6=Es+P!S~JO
zf=&g=>Y_;+{0Zbyldr#9a@)N0i&Z)%rw!1+2+zwaVDm_jC@>y}XA`!C`s9<xjnPLJ
z&zx_+$dd!wg#j8<mxgv!Vf||37+_!)n-d4tAi6YAmaXvS|Alt8_R;PPa42KFsmBE{
z7-T5OIf|Z+<#M-;cpGHBpz9S~SJ2t4X=~15wrTeUXpYg|)c%2(FBuI^4xqmv{eWXZ
zdnwXOkS?Hkz)?T~WH;zu>IQ5df$mgvtBBcxvc(wP;s=S>mwOA|&+h-sKK~Ch3Q803
SsiesO0000<MNUMnLSTYGGS)8u

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-16.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bdb5f3314c1c012d5568cc2f3c8868ccd225482
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0z^qfK~y-6b&}6ZR8bViKj*&3fJ8!}f{PdzEkaAB!YHL2OU>=1lQ5N;
z;3nGm7rflNYGYBj(TL|X%Y>3<l629=iJWN_87)N9%|M9u-a9RPqtk=Ft9$SHe$V}$
zA3_A~2lt#2Gp?dHP~t!Utc%E^@yzpNBDq%0mx%bbh`a<$G;s(YVOme>M5-mVPn1|6
z)W1f^04TbQ@DzBW=n~)q7Rp1}kp;Kt#sF-9KIi`MK24cKBH`t7x%8&lbcU}DfBnbZ
zlG`lE4A24em>n|(Jd&Hvy;j9q1u}cY(|O17{$n3^#jO!f@?jERjI`N`84pWI)$rpn
zPy)y<XB)i0y8~bwdp6mb+)7<Z?Pfk^9%!JS0ZRiNGax<T2P+HC%%Rx#{eq}WiOQ7k
z`-SXswgF(UYp{s00-&P3Mxp7TX?!_swddaj8mrtlR@`tvE&zy1+z5C80)GzUMm1W$
zs02qBVwIBteulEvO58T~EU;0f-%xa}%0X*b!ny(8g~>VxoY7{0WM^{AvaEJNCIp$V
zEUP_rHT4S)#tB>okU-u`pEGt=2nv7&`l+_|clZ3n{BE>_3Uaxey=`yLq1+N9ZRV}>
zVhwaUbkR{RAItYoj<iID1I}o3x8vA}M8d1{>e8y39_$({3c!#v6f1N54e0fd?*l7>
z6aq9R&>GryqswLil=3D2eD~>Bd&Euv7sB^Aa7o}Ia4O`Vu_>3n<yVVG1Bsx2a->B9
pGp5kX!HyW<JFsZrS!LNO_zMBG;mT&TE3N<l002ovPDHLkV1jLwGlT#D

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-22.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-22.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc749c3b63fc6170b5f2e183b3c2dcdc72c204b8
GIT binary patch
literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x16fH#K~y-6m6cCuR96(nf9Jku5`r<bR@*o&G3cViO+gpMc8CFEklJQ3
z=0P$bjY=(rZVIKOq%Z|bgPTI3B8Z08mI-eN_@@@?wA4gXT*PJU%0$t`rUZ-Ww4IsE
zd#8&eGdGV>)3dtgJKz28ckbhzD?BDHT))sz&_a(OohUnjO@IRT75z;_E*2@CPsWpf
zR@*O8z@PMMc*uvM@)6MRxPzDD5pY6X{leSr{c9IYlo`wi&l@#I*B}be2z(}sGUos4
z$DZgIU}SuxISj&IfEHjLVN6tRqZBc;sA>mGS7XP0b@f$mw>MK3-v8zMwZTGe^Ob?2
zdlB&tb@jVwo4)Tm(j-ZgL7=HzP$qI=F5cJPmluG}PY-{B>d^pc|0#8LY7JKaK>B)m
ziyOF?5nd^4tM+?s-k|JHB{ziB%mC|wJC1Ai{4j9l?*9@G-J8G*%h02u6kFVo+FsE0
z%iz`^2=)P|?ajmE!`qyavlqY^lTE}E<*s^O@0s<-{C+`(mZ8RVx~|KBc32wo8yf!p
z))w_g{Uc7`Od^~@I2CF*nYotfTV?xq&H?i)si?eVfSnd)Eb~F8{Go=&hqsByS3s@B
zsY5yGkNPbufaiGukS#NWR->?aC0F#eZNv@Sj)-Vk+=$s5!KSTs%m@UPgUq7MR8_4a
zx?&<)tFhK%KxQk#VYAIN#$<tf72Uk5{v0`IyOsW7fLoQK?CbWsos~QhPfQ`a7ZJ~k
z%DY~hS8n~%#HD&c;udGZAbQaPHZ9z0NZL-i<K06>%nlVjrlQAGwe?`z!LMyj;h#bh
z*jVXYveKD4@+^c?EDaPuAB31)+0@xt))*t>Bh4D<RYkV~3mRz5{FplP5cEWaCQSyt
z+>tuGWv#-A*AjO_6Se_Uz@XRe<pf|)>g~EZ<eI{+3SA!v=HrIezs_a6OkfMWnR=(b
z$YQVKnymf%r$^H-InOzB-VU!=9-9Y_ABruOoEyN45kvDp7Gzq`8b!8)#(|BX(~j%3
zSDP)X=JA2!hhn9YbAGk+r-e?dD{c13g~$u?{lGUfc{Hv_KTFTf(_%qHPB)fvb5C?^
z#~YvbJ`)t`x)i!VUuNlw4CtI7H&ygXLF?03QzvuP_WuWs+f=9_lj|D*0000<MNUMn
GLSTY6Dah~u

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-256.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-256.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe3a6acbedf9bdac4491cf0a952b9f192f641a9
GIT binary patch
literal 10660
zcmX9^bzGC*_uoc?w8RI=At9XtqZI^cq(LcZQEEuTMo39XNH?RqyIXRkw16-=rQtWe
zzt{eFp6xl$z4x5E`#$gUzBg1uO@R=f1|I+b5WZEEdj|jj(YHVVE;jn|-nqaEeZe+Y
zR*(ZcJbp4;^J4)3M!;J+S#9^!{UwjYr_-$u#~1aUl)560Q8$$G{9j1n|511Qu45zf
zWa4`FfA(%HC%$iGop_bg*Mq)Ie5QxXlXw8Ee?}r_ohbVpFZ4}NPf&<ccZmO9wYHC+
zA0Ksx86v;ASY2n#Ly~w*@C@qeW7E{;volrbg2_4acQnnYt?lBvTPa`?V`?Hm$JH-z
zEL152X385Vsrm1z1+OWujG@RrUR>>c3!aVLod-9JF(S+t(>w4aCd4~;n}*cjb;pj3
zzfRl{LVSGb-GE<tyvgLTRtbBej`;4;<d4Z%?Q{248wyE7?MM(&=f*?M2|U{&Y=C1`
zmDFS2*2(z3;v%@**yB2Wq|e#lze+4db8Q`~*%2uoMNAC2%_p>KuTaE$wh$vW;j9vp
zn4dc5EO9HJl6b1Qzu8n`byQ59Xd9TTn#-(W>R_gZ@&V=+pk>iQK)+Y|V2<#V<mB`W
zKKm{l#A{c}I>6J!qM^O(c@x~{)Y#r{qdV=z84iDFpHXOf;JYi`*aR$$eco|o=5(+J
zvcno(wh|onS}T>bM={!-c#lF6A-{1Ym<P0E-yY?PkNeC*GtI3DWE2szYKJq!C}Hei
z0?j@^tBQ445<nl6OPiYP6u-VKLRUaN4~kZ(t*vGGq%`}ae+wLV3YS!|<{$%Vl-m^L
z7CsmLIyV=kg2O>s2iWK=k*_9t;iSZx=}jm)1x*Lf;!3QAxLnM2e#{^x6{ce!wFeGN
zei%OBSh7BqT89n8IrhA4yPn}*ycBskR-s2;^-;PeEv`s?Kin~>0Nus_l%4=)wOXG%
zp3xMrNTnJaN^S%YKpUj3hMa!ZNyCK-ruEyUWD}73Cex;-I;ayvtO#Uq>?o&G$rO(y
zWqAO!NRN_V1>2lztBcEQ+ou{jIy&Jf2~A6ajxV`8@2o?aS1|faSMuk`HiUIrojf*A
z4AR}<XoHW^bIpp=`D!FR7)6zb>Juaz<s8>Jn*l$iZ3sHs=ZM{lr?RI=BSn!<(?UM)
zQ1NccuO@FqZ-9`R*_p#suqkArWM0ZGV3XtC)vrZoL;L(K&eqNj({y>tsQJ5}+<+nu
z;qXs9ZyE_jJD~K#Ay#n@)2yw_bO*lXkneaOssK|$Q>lgUd$Khs(x61~GC$;YwxM$!
z;a000{GkXS(YQBAZzS@$m3~cJrVC2XX&#7e8^c*tT=ZZCQObfQfi$WMtiFfc<BR@+
zQgTk#W!~!F>~McD`{JL?3n*kM^vRX?#rrOj)*BX2MVmU@rxSTojbb$8*a7i1oBgYh
z2|&%^iI(iuWG<F4Y^#>-UL(2#v)Bn_?A{hN3k?(EuJjrs>z#9pl*!f1|1^X-`H7^l
ztc0DcI(l2{e^M~fyuT^wB8vgSvHg^0^LYgxA68)jq7CDc8Nq^;t#`UoF9e&<_x?@0
zs7YH_qu8%BYOnyAR+<sT*~CB=M76&BCX4i1RIAOnJf|woppK?UOmVPwzMLi4)B&gV
zq|mQR{Z?!`x~T&i{hq>=z*KyJtm0KRyR@-!<84#Jve_I9K44A?$f>PvKVN0p#lp-x
zZvj!Xc1;2S>R3#Jc3Aq|?mxeuZg5k<L4D6Yz?h5QC$D%lCGF^+SGe`ggpV#)ut^&T
zFv2V$!NUpXJumz=#g5bznBK$(*mHu4Ab9LUYiS9Zt@4}44NquxeqaGQ=>AA?agbMV
z134dtU^rUg?|vo|O~&vT0Xou&^s|&g1|)^gg&)iyie637|Fx_Unk}u&tMo7cjb1{X
zU;zxnVFN6WgMQK_jJiIHKzyvpQ;xvc4xwW+4ccq6usqR4GJUlm=-`<oL_Htso&%c(
z$zG{BE1u*dKH8%f^D{ddyT0Nbj2^E!NAe28iFzy#b?up=ZL7F9fvUKw9oX_l8vmY>
z;`G|yc@WEAU|oZJ=IZdB8Dbw2!P#JE16TR;J467C8_-M<3nl^hDR}(1MiKaPdSce7
zuBJuWY%Y-aq%o(TN_u(0;U6)9l0UOX<eTk$c>4Eo;_dV?A6KB%Q9OE>q)1tNpp61%
zct>#9jQF3aaNaQoyTzKWGeY)4ZH~3QUD|-|Bn}8JH70G;oxN-BTOEbw*NfJw-zpy7
z((%2=oWVFH-I24HXpmjk?J-*moBA;&RpVI4JjzZ8ecIKD5R{*S$m2A|AK+^N(SRZY
zM|afmQB>l$i_e&K|M&lp`Y@kwMTj;;d-fKP3UsHk6-p+ni{<N>V6<8Gvf7W6nTZPS
zic4H*mpskIGxMSVXh%7FhLqubYT=))kTgn;6?R|g6?O1h^_QRxfehP5GcNmeYRF<K
zo@z7368Dw+NP~t>p>2VfQS>l{Bm=uh+Te3}1|!W%^Y>ZSlvP-nu_qd6CoVWWqXu2t
z**zNmt+lbJ4O)VoDHeFdzP=4xUe#^FqT@%mO<6_DRfD}b%9@YbBIjf+Bjhwn%}dB1
z+W07@uG7vr@E_uonj~aMZ2EQ47NuQq9l+wndIIc(r)%G+&c3n#jHMYpl()0_W3mmJ
z(XpyqFDhyyMf0ibD8NPl=W$umOOj5c&)ITW#gIL<whr1&?Hu<GJjChK?<eN<=}XuY
z*;?bvgoyz=VLJw3XMXV&`8mwRvItL=D)1Gj*O9floRC3`%C6l$?||O?*U*|vJQJJ6
zMR#knua=wk!BX)2+rWpz-U@S-r;>&@+s52#!?m~%YE%t&j9~I2&LZoerYJrW@42Y5
zIpq9r?b?o%WBtUNP=EA{b{@!Fd_amd`D^>^V6J|V#ZDR}t8(4h9y~C;U@+TfoC5Jp
zra;J{plq$bD}3v4z6(oN?jjCUFKSqRldXduaT@r>X8fX-qomU;>m2y~h&6-QlRsL<
z@_N8FmY3+0iS8^jct^Lvt=?uhG>k_mjZH`?h?eo;znS6SNf7nghn5VD6M>2qBI27z
zM3B|VL$v)}z!lL-^}!e+8ik?L-+k&K6;U1*<MRXStpJ9)dd!wV@~*l3Y1hyY*5K!U
z$<aMYGW?NcT!gp>rKP1KH(WX%ynq~p>VL#14$W7tAPa;fT}2mPo%x>0)T|)ZRVj*#
zNz_u+e5C&LF55#AiyHNzi5Qa;b|>y$gtmMYZ>RWyiK87;N!5BVhkNIfU;U5|vk7nF
z7Nv}%I32^SsW^6NbR)&VQV|579dX0cq}8=llw8ky(9$|SV5?QE;e&`RM+F!QtfU+}
zwmIw1MB3SXk}Ai$qjStfab1DIKmUGuH_`GGmX)seuFuGiQuIam$UX{2Q6xsNb#^>_
z+YjqRRBsGQ*J?(&1~+GHT)*-V!`kjMG8sNu#qole2HEdbR5I9xM#>~vLzL6^*fvk@
zyjwIzxnVPr?Xv?u%kGab9B-J;5gWC^l=&N)AYpUTD~-wy3pXC#lz09DWbfqOu%5tu
zG~4{=k^-$Yem?L7X>gMH3omuS#V01!5RmgF*)#R}8vp9Uo8dal5)F?Xu{)aUJM7Ca
z6j$S<j6%cfrTpq8seDSA)!ot!KSIg>H5N*>ZI|}`3C6dcm<-PyOCMV6*0q9XY#B_B
zzI6+39hB%)fX-qJ=a<{&t8Qo~w{v~Z@2aGTs(Ao3qV;44`#p8I`dLjUXPhaua<N5C
zQ_zI>1v$v7&sY|<6SxjT^O+_?RtsuXA|wV`&Nxj*hW-gIuvzp(B^0F2m1kw7jMN!W
z0N^d}1Aaxf!UyoD1B>uJ-3Cf0yN`*ve|+gi@U;o>{U0kapa|0ZA#(3A=;7EOY9{eg
z3E-4SgDU8+U>1hR!@W0YJOH4xk9GYZIXd}hL_C9(QEnO{#hi~a(pohOwAATQs$vxS
zGxPf=zm{bzf;g6<@41z9x26zy0!2+#p1z2&LwkZ%@x%<J#eaDES(B8l+R^RFqcMaO
ztxbYsW0$7%2da_-vMZQFkTee3uRWO*$zruGYG>s44Dc_AYAD(tL&@ChAeHnKCxQ;y
z_BT)>-wGd)Zb+YQgb&sx4#LGk{xV7>BUuwj?bENb*|BMWgCE5W(zQv@<9RTk&8O8n
z%MPZJN*(<5K8XTw=Z<uj5+8QZp6h(2%Pw&YS~+F|imA6~n&#zM=EVwlm|I~1BL37r
zMB4XfQiL4`^tb2RFyXXq1~KYcIKQpv2J!763j2Z9n=CpFk6{a=py2e)+jc>?K)+=x
z<UN~=r;{x224%JxM_wuWB`IYJ`1Gj$q%(tr=t!Wu>vt-{Ojfl<J&}djH`W^gei&Ch
z30V-?@yC*GxKKqhmHc@p+2ASWn2(}O6XL0TUaRh<Zc`7i&%9vIUbvb~ptN2vWf>l7
zCTq8#Ic_p5ND)%5YGtc20)V#9MzFr!d8UiBQqO*?2Cw=T5zK@(dYM%*?-ScDe+G*7
zH)jWDnvD8okC$-fK$B4<x=sYTI2S$kiAT}@`Y`wY-LJi|l~RZ^Ub7gImUZx)Z1##k
z(P|31-2Y0KY&sWx$tX&>CQ3T5uI<V3TWg{fh-tt%z-pRP<jXklDRRB#_YWJ75xVU!
z{I}{MPiI~4(1cWo)T0NQ@PuVZX}D-!^`ZBGjYNaz38yBm)OKq>;z5`WjQ_5-5aT)1
zYj`!*f7#poVPW>|(K(syfU54^wEZZi1>b+u3Wjn>LX@6-p04~So!Ze-=sJ{$Hq63O
zApVQu!%s%Gl+hodGN7MJPhl^44_W*Y_S$@X%7ta3_yRT~wrfuv5}i^|)Ch_9H;yZl
zawvCsUdoN{ByM>f@8lV568<W%>Z))df<(kw(DY44`)}fCOqPuDnTA{D%|ThaO*OG;
z_w{mj=x`@-#^t7E`%Aj6z<Jl|;>mMVzY=-gA<!+*`>4B)_j@(wl}=JZYetd!bS`Cn
zm}P6LniJ=u0>xc8iuOO}T!Y_xW1p%4?4D{39w$3n1m&&bUq05l2t2Y|sE_B{Rm?Ha
z7BCOnJdQv>4P=X^`joS1${jmqS-dVI=lccn8ler<Hj485EB)(KV#{OMlS-8FOuKPm
zBhIO(Wf$QVdOC?7*Vqx=!zjobX)QmorIfp|`;oJ+Z!?9Tt@ION8Hh+IjRoVG*O$F{
zw_l0;5#mypNt7M$tfy^z)>jo`R-i!v4->x?E|kz5P{PrFE64K)16N=`&(FY9^LmSz
z$H$Qv>CyEU4U;gF$0!-2o1(4R4akth()dp|TGS)jal;t-Usr;iVuYQO;r+KGRYo(2
zI<^u?o58Yv8+a+2-VUNNmwflv3)V-JK@E%)%@8BJQ~_$lzv8-#!MP6hm|gifQKR6b
zZDeHh!#M7r+@>4uf2s#0FS<I}36SBF#vJisuh)i#9<dC@rm{64$Jn|3fnlK#@V#xl
z$XOnTlII=I20aq5OJJ)}?56Z>NuhiLT!L%uiw0;7n`pH#n1=rM0yJ@)z0xK$Y$&ww
z_mo=xg}6_He{BjjK9twKq{N=<kp3b5!-7EZ*O@gqgAhR8#X~jP%+j#VeJ0x=IB}Hh
z+h+VQ6{xZSWBRQq#@Fi`wRRmk!vVheSOfL<E)Uqq7bm4wPO9x>`4*Mg{mG+b{^Uxz
z7PfYpJI|4_CnMy%B=PzsT3Op_bnxbvyz6|Y#9-eEpPMn;M3*Y;Ch9d)q`@m_bclqJ
zmeHvP`VBS3q{!&3Is(|12hmZle?O`vs&0ogTqSrQf1a>9>TEg#XU`I%3_P0-lu9#9
zg-k)Cy^G39eDOlMOSkj$5^|*^M;>YbTx<K}Fv$qHou@ukqo;qGVC&YoJ6bo`G{0Er
z1Kyr&x{wVlMp_kz(y@Goyuu#B75#i;BE=1O#h1Cir4YU<VF!8LR>QM(%kG$p;=(>7
zH=#eC3P06}OcVXn^T#>!()sVd3^(`F^P0MJTK;EVhm~u#NTw6Zi0Z$={@zwl-Je-c
z4)s<JAxQocOZ(nAD%geU)_}~zzVx03AlJ`m>^oUdK5|8ksuz>uv9<|3Odd5$<>UU4
z5jnV8{Vy~GM4+;@9esp~r`|#augVG93T(-wp`Kht8~*sMpzZs*1?Orb9OIX}_wjlw
zx<HG~SHT(Rz;oknE`Dk#4a;#zhCU|=ND;Y(An{IQy&HqvN9t(n#)NH=goxK00oh|6
z|4{MZ;+C-)ss2}=fJZ)|-K*cDa2z){(T|I)oJLSK&#4TBm9J(}zll{Qnior!Y9U&!
zAPNdX<FT2w08wy%N<?f7_Sh*1$>f|>lnuY9SvYf04lVb!XPvY8Np@w~BeyAMbH`ZZ
zTr)446pbE-b9|Y421d`CUHFUFXoaRsfDWwpM{$Dy7DkV^Kmee%e5uyovvz?H+)$D$
z<4<GS0kK`Cqn<S43+bb0LqYo-_fk(wXonjRpXt<yB56!q;`5>=i8U&XxSmAIGRO4K
zDwFl#iY8^0G2Ot_&zu0K=y_4P37ylH;F%P)m~fc@hon&wsxV_q$ZMYWv*#2M*E_N|
z(vPLQ8nbFJ+0|zIrX_lq{Eur1$gH{*LLfipRr7B`e}$T5;^CLl`nSH<bfj!VB3W{G
zBldc$IOP0-u5RyLKfSHdP9cgRkGQwiRX)d6U|zY!k^ks(XEG74Y8{f&&~Cl6y`pNp
z9a2EMok?>?3Ck%@iHt5a2)CxgOf`onEaD2V&z#~yCNjV(IyVr1xi&x?=1G$9$RBW4
zXm-OyFHEj6fta5T{3#{J1OSsFvN1uvfQ;YD6FuakNao4n=ZNk3<#j&ZEH`#9slya`
z(>cICwAs>x(>MGKAc-j`tl^!)*vm8~Dh?V{!lz7G28A4HLjBy8o_{qwQLcd~S|=8c
z{;@Ri`bB7@edv$^La;_5x-C+!1&fiN2e4HC^)O7!XH(1EXY5=dnJ9)^el~G*9NtQo
zy#l(NgTm|!bI{^bft-^04LxK>t_ceeCoV&beDOPnltF7L9sFT6C)50n9x`!%LYBJ-
z3_ZgYmi=f1AQ9hHA2q+F=V+RSe*0HomxMus0%a=N6TldI1;*0&$$Bm&wUbp8Y<}8{
zV}(G0B%uyKTz|$khUE~AiMh65j^8$r*ErcG0PT<7_^ac?&_FQB0%#RejSF9<#+q;G
z<!qB>uNtFlk3%(%Lg+t_uxv|&par*S4hmPEv2M5{Tu~kQA7p$(v4;TG(*O{SBwrwQ
z&<;`ZUg?G%&`A##u;PSVdW4ZLfHG~orCUg|)V{C0MhlE?N+L+oDn!pep1y&QV=s2a
zT%38}NTf_P>ghg#dGogx#uyVOR%~NoI!2=+nsZRapk~OK4U6M-qFOXJ-t#(!<pL7v
zzQZh%{jsvDQPSs=v6MZgT|bt7PkvTL_cO7IbAuI=VdPLB7oduE{wS3E&WKX@w@wY6
z$$v-j=Op2US=n|$3u6&yIz?aKKEVf&92-%xoK#cRD;EmWF_p<}7$E<vidV`blk>s5
zgt-!t98&^(##%qy*#`%Ng>VB5-c4V&xn-;a(CO+8j?{Nq0zloDm~Iv80o`gO?Scb;
z_bsb!kq8~wC=?-gW>nT?r||suX#$YZ*M4jInY8<@SJ?eLG?Lm-qSD;FN4&sojOu|J
z9ZE3Ap_t848;X&R)D_(B?cs&#(E<I|pgFDIZXLOvYJpzF{&Gj@%mW-qSqLJ=PjDet
z@i{%~2}T*%@{_FwWC0rTzTnM+V9I!pms+{x%eJ>Y4tSK?4(R3DM?`a@ZrX<ar!oz!
zQ)z#w7==dC%C`bAmqeg`vv2*xTd^+3p~?R+$9a>K-n1&zGCzET$h<Gup+mz7_#A4d
zzDj}=gB<-!<o`&MHq$QWSrI04p{{%O-8)~&>qq>cHH-z}BA1p;5c~Q^rEdn=W+*wl
zKpne^%+w30Z^@%zMVkuzA2Ru(-Ixj;7(svG7+>Z3pW6-{`B*Z#$xmYOg5c=i?G{&^
z9)hcWK_hXCm35!*qH|Y#c0585DkuLi4I-J)`_(rXNF<QPs0Yse5nT>yLvfK#fd}dz
z?ef!^!4zn2t*8$y#bVUhvaGfhaK2SMoSYjatoU%gx?|ZPi5}?qgSMV-y9Gq9Osz!v
z*aF<P%nA!@!z{(h41In7X382HB>Sh?_%<>*7X=A9R1vvi9az}e6+()g$jYOWdNka1
zP<F6Bs}?ZjVN7tOmlGq9N%I|z5DaK`_`Wzh7S;hxz&*ksWNp^@Qu!<M5krXZc$Igd
zH={(v3T;;`eBZWBj0Z!E)}&a#(l67PL1k{i4f0OiQ?bM8d%!1xY0MZI^t&09fFSBK
zi~)E~i*mM97sp2*!|Pi>RwtB5>uFkhi@C?ddzz&t+g*0XolihU_^s2;82S~bvkR*~
z&`7004|Fh<(TcIMi}I;{V0+T&I~$H`rD~z5iyqE&B%@gg3O5OttaEZ-+RqS>+UofL
z-*&_F-@!zZp4h&c4ix5=9mbViewmgBTRz6{Q%QBWSekxRzbzMD*iDrx6Dj#ZjL!41
zOqWIcCJK)HlT^}9u3|*gcB~<CQV|RS_n%jXWfmP^gFV4J+Z8i@E)#RsyHee-R#kLr
zK55yjSpFNC2E&!myOcA)-FSuWwX~_~n#IY2?<f*2HFzp}7eaBGdqs?#WhSA4Dh1n<
zbPsJVXdF`j%CKrY*TeX#jjnw>!dKqOey8fT=?|m)Tv$+6#M5*i`6%)|`=beXKIaiR
zl!h;pIl}(}Kr3wbJGWXj7`OYf=(zZ4sfJM9=~}IsY^aGq0h(qm2xCW>06mjNW8fo_
zA{V#ak;Hr207`e_TXKElaYci7t~?@XOk7{`ZkUS2o>|fy({pX)s2CYndP7N7jwaHF
z(G)`C4!uCW?rgh#_4(G((zQ7_h?V1zR8@{5F?0Gbt4{RRlRZaMiZ6|g;E??~ZzDQa
zPy6TfSIz2%zff5<;WTFQFkh>VX={7{nS@TXP$TDQ%Emh+Q&$4*kM|m6ao+TsM1P#9
z%m{|)A}k~B7M0v$P<&=u(+%D?>jl-0v;9)Yn1r(*mb<80?2vAA+Qa?MKITbdNZYW2
z>#HIr*W`jlyi{9=veDC0g{yDkJrSJ+lZzt;qWMuKf6Kx2TMvgidfI+p`juhhZwNBa
zO~Z!6xNv;Ht$is(n(SYKZt^WGona6|pu|VW*w-*AHt<$c{6Tb?^AX0S<^43eD!_3!
zpABI64Z#9vhYZ^Svb}@BEzjrZ-71<z4U%XP+Zyr=7%DX|8aPdy?3X<8hNkT6w;2C@
zw@te|Ek+mSO4`3~A8e}uaV)oNA?k;xp*byuTZu$w{zfPsXU-)8GS$!kxy@%Chj?yb
z7XbZ|Y`vFnk?_GG3xNZ2cPr(g4Gwd@V};_8P08Wi-`Blg+Qk$+wP;|SW-LQ&K|gVv
z=cpvg-Mvx-g&!FT7I&wH>zRFAR!619$}4<K4;`IP@*4*EgN4t;?d{Kg{veqDbtUNa
z^>F!4m62XAD^P4OY@?yhSEs7^v$hZmM<qJ|#Ks-3vkt34aUp7XUj4AUdyU>-5Fc_<
z3wJ5W?g#Jn*PYH7haGT(!>WiZF)B#cFyu{K9E}%N9o#=FO~;jDKZwOlwR&BYlm86x
zOHufG5x!Ip_|o=ACOKurOe7zVw8lJ&{N+FOW|ZiAj%srbos8dl(X((#v}`ku%{_6q
z1V2cq^KD!R@VdV^@MQ==I!=+#ly85i$-yYKA=!BI$K{B5;A6A+WmbTLTm0vdfy?of
zaI?RroXL-ZF|$;+FAx{kcVYQ(fg9jkm;w3&C2EKw@m_)A7K_?u)+5#04K~;rO7<(i
z%6h5W)&nG5mVQOS6i#V4Ebv#T_f^HvKvdlDt0>J?ln+gP)RLVxQF?XFTt2~c-uM@P
zdDUg(upQgCJe*K1HRh(?)0aB9>yK)Y01N!r_O=)u{d0mARBgxZ6|T07wG{6|$Ot<(
zC;bnKL7^_pKbn}7mI7BwtSdi?2JSp?we^eYBQMwD3d$$G^rGe6B+3}&kju0r4o?%-
zvEhQGy`K;y{OcGCxS+mfP7A$>@hIQQ-$GY2QVd^O3bFI#1gs|=F5SRiHUA_B+s(bx
zy=z8G8pok0C|I_e6~td~-9Z88fi2K0=PmowM#~0~D*}XzelJ_Ld?sl|v!IW2AJ*y%
zhrh~l+w^B@>~7J)-#ksihkX`wzsr^4;tC9xI_p_q->RiE?5c}DV+X6Te;ih6nri{-
zn#mP>)W9J0ok=2u=m7qD38sVYCkquxnH)RO!rb&@CojNs0qW4NZxCu1(ZxqAX-lje
zm|y7DR9_68V{)CUWDwb8*1LX9QKN!MMy*^j9)D;=$eE7f9!`?0;#7vkR)QHN_K93G
z4)?6k@|&&5e(`{6+7i#Je@}1O+MuVFHz`Es6l~-^pdwF~mkXA{idLEQknqG3#;KQL
z;E6rygj<8EX4G?CCl1Gq4z2mJ&S)Lrkp!>CQPuoQ4ovJ4la<}$3Agt;Um)Q+srXPx
zCei3c)spD0SrvNzs^L^<ITQR1hrz+qqF}3ci{61#7heO@SG>%5F{64(^rzDa4dd)a
zg^%3!)#h#YvY=@YYY%uF+@><TiRFAfF1^3hE|ZB%88{xEu~mxmS-AsWnOa^(?%>x(
z!pgsm+fugBRq44pC6&d9!#*RIZ=SKuNoaraC8*$0X>ZuJik-x$U>?$!BTB138{5>L
zvZrcA{;Jf&DXG{f#buw}{1}tal6sNg_S06TPlQo!ar=DNYi8aFq^pnK=1908ytWcr
zQ@9qYs{sJ;R3Fa*D4e_lq&NJ%Ck(Ulc>(s^2+te2|Dh?ODme-zD;C}4(^tg1v_q#=
z<7={$nbX#e6#leJF3x49Am-^=7Uq1_Qh~Hy4z>9wlw|Q<KVHWYUJXT$DVxwdKT`@?
zDtkrt`X=-G3@!4PcP=a02W7_QV-!D2>-%)t_|W24px~}mPH{Hl-Tnnr;=qkFt>)-=
zvot?l4~G=$8<cF*?6*+`m1<M`7gec?l#5PYRa#H+qgQPvBA`)a`_I11YP?oKOaW5x
z{!^c$*SJ`jqo;;*b-sp+R-~gn$3#`ojhaHekLq|O5})$bO(U+aAG+qOZ5aN<EN|?}
zR5i)-vr^jOX;FFmT`wR4^m{F5k#N4``-PyF_jg=G52W%?olL^++@SV|)R$Mu792@@
zbbTE3&Cn<JtR(>quebo|TUb)}7N#HcZ$e=71-CYLVaDgo4yjXP(8RJo!_qAqrjL40
zi6R2)tzC{U=dZg!UwZMbly}_G6C5o3vtUQR7kMjQ{}U4VdTkQj2D9*#d~qSbi5F;D
z?ihwrang&9EYVz!`wu@Bzp@-xALArIQf<yr{kLjLI%^aAlXKQXok(wn27LBUK65y&
z7HuNyW&soC<&0RXw1;8zszSU#HJ+Y(@Sk$VWdmBnbq`}xhzf1QqZ;J5|BX{_(=*fI
znR=x>qXJfQobay{PYX~2{NO`@&zpd@T*q#ZL*IIjqpdJGdhPE{M~vvPI}1B%;HcNj
zGvZ*iCP<q9-dM{PAl?pZ{aeoLxkcY9vXplJwJGtN^43UWz3To_gK%QlP;Cb=ZEmXG
z2Q>fU(ljAvIc^u8ir^0u@iCF}Wy)I=KWsuVB&(5QJw{F)V+$WX*g<d5_Wd)SMb;`-
z$N$v4WQ<h3Z65^{@}tDCWpNE+KSc34dFuLyiJT-#y@_Es+{4qr2oo|m;5b7n-Pn*{
zU6`x31|`3VqW2-+FzZyWE$ez8_oL9l{LaKnFB?uEKtCrKxHJbI$Ls5>jyh&#SY;l=
z2u>Ly(e$Hup0`bY+KS>OIgRXoL;?DeC5b15eW0z$uMWO#^WbQv9Fdyu{}8Dp9WEWl
ztS)kMcJM1WAFt+6H9tx)nqNdsYJ%7zq=O`g)WXj=gTM$=!1Ok<j&wP$8td<IIgozl
zpcS7>*2Xbz#bK>t*6^@R=<nhJ;@_8LvNHllY`|+7PM8#{;C=@soQRqi0ANO_HfqEL
zZzuo6ajB%xXF75Ql*8JxDwLYzTa(5@l_kbp(s_Lx9x@v@O_@Y#a@%F3$75xP*uWV%
zOBM2&bTL;^&%{0tJ&n5w(LlJz)@B}Zct2mbFPZop_4!Q=DTR(j8g3rR*}HAl9VpKJ
z3k}MSwhnj)6X*sxsv^w48t!<kC8CmH2~nJq+c8DAv@@&89VU!jGEf;1^qZuR^<t=r
z>fT*@`o%8Ro8(b*3ObyP#gE_8PcB4ujJbX*m!?q^f&dj&2fcX;#FD+hZ;Ai25j{*S
z(lYkTIq20>2@dripa8()U3q8dKAZ=YGNNnC%CJa`R0ku_f?O2<P*UP`+?W%behuXN
z7ILnmUs+$uVj3<3B>;4wJ5Qj~aotgxf9cOvgBmX38KeY)jR64NnbxBdO`ZIf8AD8P
z#%x$T&k7q!3gZ0e85^N9Xp0|TFkx}W&>KFe?tx?wqRSmON0#_rU$02uj2d+8J|1ac
z%i{YOC$h<j2zY8}j}PeZK5P>iVy9ytaCv;1uS^M_OVeuCy~rQwCzf1~q4X!mj1)=h
z=ivBIrq1}%2k<#M2Fd!s#vwx9{mM$-@F$8q<Q!g&4#ZYu8Kf3SO?W1Rwx;>;m&`2H
z2#`T@-2Eb0k)Rqb_~^aTL_MbY5@_zrW;Jh_^!egPdV6~=aa_?}D1EWbQ=beO%^JX0
zp~;jTQ2T)=L9{;83B{<%s_KI@S`+2g{RtH0Uul-kWAPNwutsOGr`oGho^?+*-(ASh
zg681g(Rh|pa7!(|k{O>i9pW;7`|RK*4Sk^G#a|GhWBVDeBnz&;7hFr#y7JHKwNBQv
zB8WpD1ZmKveTD@vE!c{W8!jr(IeDG=6D6SwebGX29f7s{y<f%pMIetRpl+e=RpmVm
zH9CD#h`~ErEtfXM|6ltx!_QNufawZ2|Bf4Eudn)CXH*=nrC&6lqwaOVE0~ry9(KSX
zgAKhWMCN}QOUS`Y>Z@x!FXef=qPH;wr+rz#Nq;*oYy=Sh5B0%Q2($j99_N7)4c6UZ
z=~+YL=*{#Sq?yXj36^Pd%<`03X1!TC<x@e1MAW($L2J?j9~~>cJ#bF`6VoOCS4F2v
zgAnGGB)_{mKYqIBO6c<s0b3rUWV((1ivaIs^a-6$_!4-dBd4u5_h`g?Iu9C;MC1Ql
zMfR+_d^^G93fkf$Fq-n#DE-8W@_fIgu?mY(P+&0yA|dNo3+}EwG}8X8>z;}EVC~YH
zRGvgcj`J^I@h!Tnz2*!phKE;NP|Ni$ge-@$9-v9uMJ0;Q$(%qY;f*`h;g%xmxegD8
z<P0>Ohn)m!23th-m_<!{7>A=|oGb`r=)X5OP1>rhzR%(#6&E%rc)ConA<J-JyuI|`
zhV=L|N(qy=t~X-aTUwmsezEFLl&5I*UO;_@qmxzvIs=f*o;hvlfM%PUp%0V&k1PFr
zS^u4YL@(37Ol%KAwM&t-+rc%Tzjf=eax0&MlIb0wgn_8hdytB&!<jjl-+-;E)?o!Y
z9S?=u<X$@nd0XBk3y4N#HCASaTJvt$WLvQjb`As|s!hdUQUTP@?W$(UCfG8TUbjTT
zn`n#xPoDV<$N2<UVHfQ%%3=faftv`IppDn?yf7Y}+_KQ_dsDB&5p*!kA9;^!w-}v2
zum72zDBiZhZCF=-hY9Q_X2Ofn$*W}_heRUF{a=(YYU&*i7M4)ANGDLc^iU{B0TdiS
z4|LA#w2|7DmeKWZ%NkI^`M?y{A~e=~K^M?i@?;)F;_|w6aA|1Ou}AFHIEFTgS<!@L
zn^V+B<_6$Ja0bwr!*~ufRNB1_!8gL3Z`!wB;;O*fARn&<?Sjt8I}Mn(y?`zGYDaB~
mC@-(;jFwO0JAd{cFd6~coi;O)o#<nifVc8$a%Hbf{r?XoV0mHy

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-32.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d345a61b2669c8ece2d5e4d30754882fa7082ba
GIT binary patch
literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x1iVQ^K~z|UrI%Z5R8<&-zkkn7T2KO^iuxcAh@pv!frKcO)<6rzfshUp
z18FU2C_%(a!i$7@z(_)T0gNK3fk*&D2S}}?ib#>7$R&758ZjisTL_2&gfhc0bLRH}
z&~nb63wAxOz4pJ>IcJ}}|1Fe=j^iC=sZ^>?RH{^Uyb*JsqC<fYa8c1;1o;lwA2#7V
zGbhZvTuNOjCfMG!{ee(0^pdJR0}L)PZ&F0IlVf#kQtZ_K3b3PRN0{?06_sVcfD(<p
z$Oy9LvU|C8Ud_C#Hi5}I^)v%SCE5>jfRLg~%T0OL&VxIL+XMwa!S1fzgEN85UO~q7
zBg9SoA;|PtRqTh716V>Nfp!(`G-6H|G3U~n4hA$ZT#!nXC@>8u&lf^n9T%^OpYa8l
zw(f;U>ip#a2b|3pZ6UHIyI4gx#H-@x3I*Qv)vgLR=eDA>0737#s(v%@%E0RS`ug-O
z0qR!FUykZ5Fq1!XJ~&_ay%a}VcUv_|0vPHY6J%wqD)!pH0cu}=ZUnB|Bi9$)u{2t1
zdlR>d#FvSYDtg!wqE}rV8Lx?-F#yKRy)6H&_Hhwpf1UH}kp2dUO^Tf|IWrr`dWHs?
zfN2FVwQn|-E86H0j6wAIVg?<@JIXqaca#;<G*mZqp=|W>iZ-<$Y9ACdR|0kF-{F#~
znGLprjyk6DP~}3DC0CPIM**~Tx1AJ~wG9&+Hi(FN=VUUOm7#E`8R#3fJng3IjUrVR
zpZ2}ZmOriL-IZHW-UdeXd7Ot7U7zSqY*AI;uRUk-oU;g@dU=C+(g5Rq_M)A(r>{Iz
zxe$2THg*GZ69*FuYy*;$kG-6VK4Jj>7AbndT14f=0_HbFEV1$ddMxY+qcF_NhI5g#
zUatL6`yfRhEE)ht+ZJYq%xR1EE+Y`|ve!a{yj(hy_ARb_NL@?$w0c!ti!^J1OFpri
zzSqmeYvR4YPbK*G#2=5RyksyGtgvYRGN3<uSy35nEiJ4o=B}bvjln!-p-&qy-&+FA
zuodZ<(DN>^y@3DL*%M~JmnYbCpAT}_D7pPUF-)s<8hx+K5hoX$7@Mo;B7~ED3jL^}
zEwPEQM%zZTZQr)Lfu}6Fx`Wp!`y@i@3b&r&<wBqpSnNxE-C#Yi{^n|rj*TX5Pkj@?
zaIgh`XLTV`7TIeKIPdf-`jLN{ESTyvR~ITA9UDy+GY25eTHuI>-5eboO&S0Vuo}pC
z1R+Hd^-fbM|9(Nlr^Npby1}W69=ky$O~9;$8%^ow%Qv4=bd6>1P?x~hbt~rA^f$z;
znpqb~GX*%JqN^I7X!sTSbVSuo^BrNNOKfKYWEI)yhRn(@mc8%WCHtb*X{-<lwWKxo
zR=)Nwl8U5!Eg3-F8w-Y$$s7gl&r?4M+NmNPs?r0T&V`H{akCX}&Wr)ASD0}-ot5wC
zoa!_^tOWKH2yr_o8p7I^Pg^x_Snir8u=fhLi*E}xy4IUf=c}8}nIVH}ftA3OewZgk
zXuFe3z4-)1FDCU)^F1!o3N(@b!r?7@0ode{UAxcu@VA1>(h5SgvuI#gQqxgt1Re!O
xaJ`qz0_T9=L5?DN@XkTKd)r=V^PPw``~wqC*;EtrvwZ*n002ovPDHLkV1iGNSrY&N

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-48.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-48.png
new file mode 100644
index 0000000000000000000000000000000000000000..d394f47213edab1f6f5cb59a2614657364428911
GIT binary patch
literal 1864
zcmV-O2e<f%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x2K`AyK~!jgy_tV(Rc9H;KhHV0ZAM!*U}MFgU_uCL+z;yzF)dtWEkpl+
zOYdQ9jI@PNm*|3V#%LrtWzlGcL!Cc{AQD(MdTwd9WY)pd(pK5RMi75wGb4@(6J*e_
zwYRbDJ?HU{wyfYi?>V<z_Wkdk_xn80_qp$RpYy)YD-;3G{_)w$kziyoN{xzED>_q<
zn}M5w5?}zh2>cV}HL>KSAQyBwN$1?P#+Jz%c6N4_4OR@M6>R}N3)qGFQ1oR%_SwVs
zQ>kUCi<8k&Z~|VBcZ;Ze9bp5b|8Oyo1$Jsew>gWQw+b<goq*?gw%jV45w-v~7OF5N
zvcT59DSg{pKHV}B$H0o~S*m0|!Zxm-cz|-?2h+3DkM8f?KR=E^>;%-;Zvkf}tE?ah
zci3vb;`Mr~qNuSGaFWi+oS&-^<kU5Zi;qfC$+Y*hf7wJTd=Ynf^Td`eV0H*)2snXo
zMv!+1@YT|rQ04*)fT@MXRM8fv#`$Hwu}PKDJV~4f+SF2yX&iMv;SA@s^E{g>ss&jM
ztOGt2Go&v_Lql!DGet=NE+^p$vajFo|3y=>>AwZp|J^I4k48~x1*&40^ovS$!;*&A
zCqBG70jYPJp7w3K^><r#y;_K%$-;ZVyHUzyJJ1w^e!Oo=-)AP4*ee!so!i(1tg(In
z56d3e_^~2u%?syl=iPK|x>;2>0=WqKozn)VZJzkx@(k3w8>U0>8gR?lqjSD(fBu7-
z34r#V_LYiefP{fIU}4Q)UAy`$TrmT|H+f$?K$Y$Lhw9x8^R9>3d>C7#4@S@`6n%L7
zhXCC3ldqNqeFLYtGJ$b?;4_iw$?V3wCbIUhJtws+b<qL{`m$@tFCIo`;^|_GG-0T8
zXfyC{1EoAD3GRilcTHfEnmmf^D?~thcl(_xx?GSC0|XlUiv-U*pL6~k$9~<Sb?;@m
zGg}d!2;->edf;brk9+^rfYLs~_w(n6&^d?QJ&|?3qqpOBAOCTbnh;92AP+UvHvA>Z
zS7&EuS+*kk1~4lu2ivx*tbmfm2Jr~e7Ds%hH}fT5{UZkP0811-;`Ml6jPkc)#fl+8
zo-|M-m&+wBuuK8*Ex#=)SVwQi?I>-)lqfDxE=Zf#?R_$mDI72ki!8E$PZ>BvHwA+)
zN5%2g{}J)TkE0ynr%|LCxf#cRegkEJMR@fA^hCzZ<lUH!!|U~`fu&Jmu7)7B?LF<c
znK;R0G6$H-_dE-9rh#xeQiw`j6ekP;L4Blu<PF2{G)s*Kb9pB+fXdt`&NbO8?;1uc
zEHPFff=K_C8b2XMSVY<?YT6g&EJmA7A;vKd@XDK!oG??>NLv-19yTV(+ZJGYP3A@g
z5S8bnIH6D?ZAB&Q=!&8jE#RcV{^Lts*EEGRENM8dqFqr!@}S#U;{4S_=<Mt)LkO=_
z%6UuS9|j+lWt=vBCjdy0_!=-6#hZYv?b~08A`MI(xC<x^C0HD@Ea4@y8%;$8O4X!J
zAgp1uvlfM{qH9vg)Ze0r;>%hiA)wc?RJ*`b4fKJun-2dM#*nT_KPSjyMSBdi!?tfP
za%!F5MEUcMcsC$821>5fE`3n|>fNTJz+GWXMOqHIyYu#C@&^BtcZUR0Prye25Z<)K
zKA5UWorvor)17%3;n7fn(3`GF*Cqf|bf2h%CLrk6rEa5l*xhp}PVljPf2_T~0rwk6
z19rgJnb<E0p2Gb8-dct{c8!7xLN3UyGPE%-3<LuQU@U>(e|zsm(47%Jo0hjWZz!Th
zBi1I@o(lZnZt^sgMP%1_Bkgimq9hS)Bch6^>JxQt<H}--4MRvn`O<K1_=n>^E+_EZ
zclN#oY>n`l5F}IYHf=1f)Nouq6Ds=1eaZVSjE`T@nY%EnWIJ#?!e;{5S?@OOUiSS>
z*YmRDGMuDyQhiM#ba0j*PaONd=I#o2{d^z$6`(SP?{gx!GOc3IZy$Pms1Q-<$I>_S
zzgPaCBJ03%4!XZGZD~T0w>!POwRx4QW{7?BsAm<P#F7KU!JK1<T{mx!Gwr5J`>9;0
z=o;W&-am_+0V_F~BtqNkb#C(}L3b4D5a<Ve737q_r2w@BYlfh+6>cMZZ!@VRjQ0b}
z-R4FeEw9EMX%SIy5|I}ib#CKILG}`FO%wwKB@ubacgWrIOkis@(bcI~m<>T|Tym^i
z$``imd3}gE3lZInxlePg=u@QSp!@4}aSaN-Bdh=JrdcvF@(qPej9yF^1Lr|@4G}yV
zcf&Z2Nni4P;d|?6B!=y^jNUdboP@6&=n-JYRI=?+4YV*!I)RC(b03(AB$A@K2&@I5
zA7!-TS1~G-3&4LA-WK$j3cbTR<;BD9&qF&Raq&N_T8iT?Zq@Jr0000<MNUMnLSTXr
Cnt?a~

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-512.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5286e8872efc4d13bf2073b4a86dd54662924e4
GIT binary patch
literal 22310
zcmX_ocRUr||Npty9@(Q|??fsUu61!G*&%zRL}Yifxk5&T5|S-DGkX&vl@XDBGcs;A
zk@-Eh_viO}^oJhqxo5o2Ydl}C*Yk+b)mA$}eVQ5oa6<h$<|Y70_+KQTB!@q?yaxB+
z4{{p~H4Hc={!4GnjRk-QsAH52ypn%U_$C`*4;9yj_rH{m>p6SB8@#N6D5|(=?KwhP
z%kt)T4;A8t>cG<e*F6W@k?PYDiK87APcwufGcT9pLzUORA!+OnFMp<Sm@6s?r516w
z^X&0HJ^~V5miO#>zWDaYl+4fc^PAl3@jl!3#Zh72LxCH?XxLEu)x-D1bvkJVE^^<s
zKXD<y&x!8ut?gh3N7Ohc*dzT7u-tBUtwi<!4*kb4@3(?xAow(KJWhe`^-Re;(Gu^O
zrqAOddYJ;R1&XLAL}Q#l74_Y>%2LQ5d6{R(HlFy@T}-^*RHgr@c&yp!cz9`P$vykP
zMH$oaqL^D5lbu=c-n!%QjxbY1u<9HL;z)1eqQnDMd0id~AkEN%p2-U}rodND93Nj|
zIlk4O!0BeW!Fhb_UR0Zq`(4Y-CHaL&l`#mvAr|{dpp;vIvg4<#YfU%@dB;ycN8x%B
zXZev)+{vhaK7BVAeRMWv9y6O(R67)?Ap2`1Fk5ihj6xt%lnrF!vaT$1RQ}GRm!X<J
z3Dn*#Q8J#&=~Dp)r#flgE`wA=DS3-N())B|?t#(ayv6YLvvS5zE*hYR_*MOd+c>n~
zPWnlNH7V{6pe5-WzG@=&fMQJ=*J-d-7LwrgAlBI@v#i)H40|E-!fgc4lCp<~hkJ1O
z?GTg?($CKn6J@l(I8<v-FZ28K+1>I2h2*W+Kp(#^Gmc(VL3ww?0A}^Y{hr?vRDUnC
z2%}x)a5F6~e{NS$wH!0Yg<Z*bSD;(D@v1-fK^2{<!C7M<@`tU+bW5RkQ-K68iTwLa
znZCRSBluHk{UoV)K^?7p={L^BCTGsbE@~Rk(PMFLb!n=gs8TnX5|06Gt<5xUvn0D`
zaQmEYD^st=Dqe0<ifHfVsJ%$|beAdOkh$~S5{C7V7N;|vLgp4e`JNN~RGAw$ZCO3!
z{{h9IceV`Z3fSJV^N~%JWK&Sc&5T8GSf@lN&kO3A6htYM`j7n)l<e#sci;>cxh@7+
zP9=U%3{Fm#G%?h9l1{g7X&v^s(lBG^Y1hP?zItg-TqceTr|hKk`7uA!n_VPMANV2t
zwDcF}c<i4<hdMbqd1{}LT{a}3F`@V*!BFjcw!ebc*2#cA*#;Fsj>WM_*$CMs#Qf>Y
zD?NS7ayrZ_2{u3-s!A_*`uFyh!n=Z8npw<RrAAz*{z4nW7suuPI_r<?l2=VA_?Bp=
zF!?qUduv4`K9$=JYu^>Mc(8zJC^3Aa!h*+hf6b-!Tup*6yRM)OB0Vzp{wEH?ZqJA)
z>I7PmAcs*krBS_w2^iBISgXOF%&aa2x~j$%4*mNL$)0uL$@zW!MVkz9T@JwG`v949
zN__{4w&M&9NK|(mJyqu3Zs)h%`?1*MVEj_Tv`u;5_=<E-Nv?s;-z4nGNMSZ0TK^^T
zi!NmkTU<H9uMb84qAX7LAZK-`Nh?-JYxF+nlj&eGT(?lUoa6_$<dXcQhpsQUGIvZV
zS~=8GtcHgNODgG9`a6+m!R_MPM<s||vE4WPOE=Ep>IaA4jbB_*8M-Y}w|h@h(2dYm
zO_w)n@_iwE)6ls@!{B6Su{+*;`|ftEXBIS``3(Eph;+2LdD$AUI@rwE<-;L{yu&lm
zJb^|F(fiJezBKbxy1Gy$84}|X=_7^bRn}BNBRsn5%V|T<tiJatEzQ((=^8<r#aRp(
zyvmu=;=a|t3SJ}9!?0YLuYZWdI6ms`Nz*AwJ$iyYNliR^SLQF(w!@HP@z7Lqp8F|b
zA~{v)^>fP^M($5-md>+*rFh~jI~~VOXl;a*A|}p85@#h~%B+}l=}|X1;Q|YtA4zV5
zn0e)z_1DEvQ6Hh2v-En|qgVL)3KZQtYh6skGP*w^(J9@9U9_xmo4mUyTq-=2h{PG5
z-SznK_;+Urr#+3~pmrpB`OVa&K<hXwEP~XEtgjPA&&WD!#pnK_d8j$jjA_8P4D@la
zDZa1ijars%qV6CA<fikynSe4i2;VTcFepEym*-vz7;qLEf9R}a{Nf8Nsqp}+j{!1L
zwjpchYyR6D1v}2r-(`T|&8@4PxlNWNcv6BG#=zZ4*Zf`4p1(HBGbuLQNwXT8pNN7t
zxBAP0G~8=m;nln)K`++k*#n%H4I(^4Ci=_bMOQ*gNqAQW-sccgmebcPaCu#EyK?(n
zVY#k%8EF6VAwKku;r8iJuKOvW;iBEEhTG=Qrdv^zaTGLY&Aah-bgW$^Jg@DEpAJ0=
zJ+jV|+A654t4qe76cuN~g*!SsYZrSA9VUdEQ>Uk4x%dkFs1MCP==hZdXdWJy_b6w#
zAsKEzHD%+B9T?w6{>{R&@lmI6uryCL-PsTQ&nG;2+=*mRf-Yh5n-DwNmA6J!f{}IJ
zTP@jR=^cT)luo%7p62zJNX;UWc~mIZZMYXc6*BjC14{?=o@buX!EG3CwPdzh#_f0j
z$-;65y}ON>eI<2QoMW*JqFgj+(z~XYm@#wLT&b-1M5F6Dq^*ie@~s>>L#W}xHuWXj
zR!zR03P&bPdNNL=YjXx#4ngpXw2GINMa%g%&jx)VS!0CqXR$)ocI+IK)L>WG2x5cs
zVt{vGd_37a%{)+nB>^XS5RrGOA-zf4v$KZYgd*dh41{z+`EqXzCJD#r4Vi?8Px4cA
z&~F<yh9uF1lF*>9-(Bhb&2P9NM!Iie$IG`A9(h&RJtA=%yDed6m(k-!^CQL;>Sn=G
zKDhedfV{!KRL7sbY<#&4Hy{%QLNxE0{33OmwRAmW1w{}2iieC+=_R-_g9cy>?JA$X
z?%%fXB)2fQFV%~RCxmF{O9aw2cfe@a6rEQ>Z+q+RY2t^{P!JqcJedr7A^{iMx!nUS
zEG&9Zv~VIW;zVCIs)nj0H2-;B9ycg8gct(Da!KOpbrltCTUudo`>A<=0rR8`dR+}x
zh6z$d_IsJw80i^Gbcm|}F8sqap6XroV-C-(`U#ZAcqzbWKJtDfK)Qnygdfi6EG^DY
zpmtaZJZ>N0a<K(kMZe|%A9bS6Q~v0?w`>*eaSCV~1HNz%WVpyfQi=%SbMMcUGZ(#W
zC!;}Q%HXP$+hNi5<)6#vjVU5XdJy5#+Oz_hx;M=SpfAQU>JdcrI*<$`#7*BE5uc1t
ze2#rCTNsRCgi2ltzka>Qd2>`d@s^ZRBQ_@QHX@uc9xk6B7}=fmWb{cOoRmo$`Ha!?
z***gcb8AEphUI+NxeCF7moh`B>#s^dJMAzOo-WgGVbRZQ=go}mI0Z$aymP!{aN)`h
zXIOG`9Q1cgD5zwkKsyU@Xv`8x>$IlEF9QP4Z79w=|8{1W`SNSUUF~W*rh8)GVkZ+C
z!yCsCSDQGOC|ML7!b$^(Cp8wt%<lb;{5=eR#Yh7X)^N5yCSYW1_Fl1+j_GOx4en1%
zJxRDo1&dLZgZ@-i6eAl4B3+(%4ayp>N{>|k*bq+MZe;`x>}pV)g$CQQ&PBep*r*#Y
zIB?p)=}K?*Z%#Pu*bT{uo}vNRNO(ueH^|(zRkYf+hm=I&Mz9gY-*q#;7&udK#<`mA
zW(0Ki5+idXFBry2;&B&zm~r&hlDKg*MT3QFK>~=avBS3tz-Q%X-oJH+BJ#;q#(bAN
zXX6K)S>M(qr01Rsrt>|3I1e*t8&pVA+7osh`L@Rq47IkBTOEF-k|_K1**j^%Z6&EA
zxv;iYrk2fdN9)gZIyN2hr~JYG+Z0c`8Qkt(z-2V;1(Uh+;8Z|E$!?%(X3Mf`d!o6O
z#W4;WbK?UNJ@J7_mpn31WsR1lS9y(|)&FcpL_(IK<(q#o!Yd`Q`l02Ng8x28W<glN
z5-*>7cmWp@uN&mYQh)7KxYz?M{#glh9JZWUH(_Y6E+ZxVbpiw;)?P;{q^>dbK3J_h
z968n58$NrQHc?aPCpVt^SDr@&I_lN}We~>+yzW|Kc=wDJt9*aaBkoGNn^e0AQPdxp
z`kaz@y-r4k8E##an3sQKI&ojZG^~Ksv#8-+;JaazG7q;=KQnkn?plgHA1TuDj#|F8
z2y0auW%Ha2NBxnh?_y9xUSAx8+$*$=p|jJ9`Y=|WV1E0BNs3I@eUEFct=G4)ETr5d
zF%><k{X8+bp4~lq1MhO1Z>MxH(E!#^LA(=zclT|c91kD;kkPQB3#Z79U*ajl)kY<j
zX>2dbfDqU{xqGDAVUiP!ZIJ!qR7qzO8W@yke^DI4g$v`^ZQOOAioK$9Brbk`3T0p}
z_8%^w0z&AEbS-FtCW`{HHoK|rh!&cm7#k55Ts(_N0%C^!9ku2wsrRu1LuM427O^zU
z`@&H>9ciHB6Nswn!TjWnd3wg-v`uZ?1sXsmlqrZm0Xz%r$%EHArRmw9bUdD;iPDs&
zVy9+r(Hrv4o6gU>e0A{ZIMk_exQH&J$yKj2IK}WT@gttVvx-}7@9x_UT-d%$Mq!1U
zeha@~Qz<j889An`1OaJHOcbdXSTXvZRJCWe>QLx7ew#D=ahyrq-`8H3I9oJbJCsMq
zu7yUqJC0u&QtA#R!`<M+@FRMa%XsGJou~c(uE%(b>d!T-JTv+}fY3z5l=fialz1fe
zQUf2G%{SSkWOEpUyt|L0Nyll@o3Zgb_GG2HoQIXNqZSaj{U*j)EIv6u^Esfa=uu()
zspDV0Rg`l1{x@v`Pd3CQf`+#R@wOtrDk>{26rFxo7!|eY&e{JLd$pKeNRXVQZ<6|$
zWUXC*+7=|7%>KwO6K78L3Kyqqeg%4SPw35y31Rxl;trOV$2Gj>5wD+kR;lIGFn-ZC
z%>8BBDIy3l7EQ1WLIEeJdmv(%WNMM)aWh2Bv~t1UvS*)~^!S8zDV9sLo^$#-76ufx
z!r)ghk%-euyoRhIsWFj1%r~1qDi4{@c-?i`ZcknLG{TRwC9H5$*QD{4y%vYr;+QLY
zB!s60A%fOta577aac+sN8gp?ly^sb29N2*LzBV{Ik#c3Y5_K^$34#;d5i&m+>)gEY
z@p$|Cg^K>%Lt)$uBUZHNzTJ=R+uNBN{A@u#cJ&H`uo>9!^fC|=0j?n*A!}~QH$I-)
z{iOUWUo)=Zyj^Q&C<Djcl&~8&$S!4P<otvZRkA_wNRq_^E1pe3-l=!ohQ~Ma-!slR
zI&Y3!9x@#^k#<z`{^&)~$9)mPZt1Vs@0h^vz!Xk@;w*yNB9gReIm-Rm^oc!Y;=S*C
zd?+}gKuZwh4451T2XyL*;DATT8o}e?{R-EKNKPnFmpA@sj3G1m@qSGu)yIfBYZ65h
zhnxOr;IyPkI0=WQNA|V0w>&R+!?i?z$jZK!QTnOsZf8rUA%ou+6b+e%VQyXJ%4(qp
z%TqF(=*RjS=)j=yC4poY%~MzAt`N*Ip`-qtEwsBeFE>f}Y~P}Mp2?0LCSYT1LYhGG
zZd>^u-?e%vSBsr+dx!gbmq{&O8BJyG*1r84<?r!nd`>s{Ic38tQ+noC$7?00lHw~|
zQnGb30(hh9cc1A+t%|vEB>VO5%%89BQNau*e(C;V-|1PbzwlznM1+Ao%i*SxX_$zC
zJxz<cqC#WI1Fa+0mY<*sMW^r?hOap19)1rW+EIlCIg#_^y0$4{k>7Iq`kkNe+Yxv|
zT?<KAZd3`Cv=-9`f(63<Zd?1)GmhetjEva1<e8rP@Z80^-)F$VClozvb{P7X-5bfn
z!eAD@S7g@8K7T%ed(HEm#K3vlxoAJ6Df2C<JJ+LSTcw{5YXs(mhj^(O>ofqfgd@jN
z^)yv_+o{S14m2j?+u-<?p5o75_AX%vf?E~R3e+cTIWuKp@d97HRJpL*#*M!YA&;ht
zMVsWwXUyP$6m4%8*ExQI#z;)A1%>epDFB)^_J0z)T(IIqn851!dhAVsy1%|*C&Ft4
zMUNe0;6B<O;;rMqoB*`zW(!q1Hjg4#oOtU^f~a<~=Znu9p6AO<pXm4NY^ueq3<GV5
zlP9uXzbMf9S{?Nwy6+hXpZ}_~vlG24(c(`;Wfx>BR|cQwzZtv?tVl~I;1a?3r7^A=
zah7)qPclLBL%o?(;3MnqLrXe{LT-G|a=w0jniTXx6xncMMeq9zioozUZ&w2dTVC~W
zeSc;BGA=`vE7Fq!!o7dVZh`4LXSS~SqH^5;mN(GJ2@yC_@^=|=Ttz+KMUMU_k-=v(
zb`NeC=H{T+oYu|<=`zGw^|&M|_Mz15MC+hP^4uDfb11y76J;XE*l&Pcq7F@^#h)O^
z4U)A67@A@evCn!8ehcD0Etc<BWG=gbusHnMzf1XE(XiOoG$X+j_jAZ3PhWxMd;X|_
z>SV;NGJa5GUw<<D?;3?P5f2UNj;+zpx*~Ck#&#LnGD{1|#4P7FXO=vx3HWFww|^4M
z$M0SyYK1AxuvM-4^-0}}uxv}O^Juv%{QJCzWJdMf62P~`ip>j_d$GvQxW!lIV&UP+
z;^lIiPK>p*th=e&0OzFrL8c(U;80^oX|ibg8sK`#-YYf}rr6T)I9z0Q+;qo1D62&^
zSk#cacQe3&bGlKqKwMi>ha3NP$pq}5Nls-Zi4YlND>nCPSl##Je{Gg~)*6}Er#nzO
zi0U*Gbs%j~i+*ao`IFvN8|s?*;lf^+{Q5PLyu6HiK4XS)mw8KVs9Sz$^q`nxjxR;E
z!lP$gt@K%%`rdyU9GCVe``%o5K~hbBP=Jl9Hqb;|_d4nY2Fj8|^rq{fR)2g`$I)O*
zogh{rtoK(bN9N9zZ;fG*B7pf@xeocm$Ji*(+y6!q#*Ie%Zjs=1hD_|~Nd$P=&BB1F
zHIubyO2KHzkq+<)!Nxywwc%k5HO-M3pjRIk7sU>lEI6eW1dJD9(@JS?D<Ic|_R@?p
zxQ_r4P0o&^JT+D)8x<+=3IwsOs*v!5aa716Wy|c=h>B_d9}XNMUS^}^1yqqrVi9s%
zYs*3`rVK96P8dUKse#eHN4%oP|I;}0I~Frhlm0$wnSHFpWsR;#NeLHeJKq8do{L|C
z{qP#M<|P0zK^dK$5pr=Xa!8@=;D?h9I|UJ92|CrNW)p<{XTkGq>DAx=(zO2*<IL`<
zq?ZBi9Jo%HDgsrXPcH@K#kHMo0-<a>E`)VXM=ePUao{6|iTpFn5$&XusbxLNyZEZ3
zv7R#NGIhin-kiMUcbytAh6f(ZdG==GO{~X9gjXxfZ1R_mCo4CKkLDCyMrc}Uwtmlm
z#G5Od@&7hy>ThxQIr9=%iw{BUqEy9qmqVXg9n(KZJV<zpWaFWxB%Z`n#i>n^LpqJ3
zv<;>4B_+)y<&;4Wb9^N<u!U#L2>G()d9mQ8rsxjg>@#Yn6uf+*7=NupQObMBwW9L&
z9||vH-$x-|Rf0T}qR9N;?!0EO<3`NDL=98A3zj^KJle;H|CKL`W8;cI@+*aMax}KK
z#}1bObA~~pW{U(krSN|wH~4F4b#C}m_btHT<z^pGG%1I@g4A~fPvIQ#c*5LiG7$~L
z$u#GK5ao|?Gv=(sTu%8j)}o}+jz9}?WWRU(P#_K(rfk_^Oi4Wc`!7{_<96^&OGd);
z67Iy1iH*9eGgPdS!Q8Xnh}W;3<)~X`Z>HrUiHVMV$}P{)rwm_^tF)yT`qWY78vZX|
zvIF{!M)%}g<$oix3-p^Q)>H@_Wm&svH&<DVztR7SNJw^jjn>bWQ==qicJ}gyhX$q@
z8igM1&z0#-V6N_PwpZ^P67Sm+3Yg%i>#k)yeAL+$S%+8eC-KJ27nZj_F9;}q)hRL3
z-VpmOw^=8~j|yFKGlf5d7}k9M#X>q|%pj-Mxi=8ntAIUYy9ie9EBP1m<8N}*-Q@>#
zK7M2eYk?B~ys<;xeJ>952wQ%}1V^$}fl9(%QtRm}R?CacO>?SXKVf>8@t-+lKhXH&
zsarE7V}p_3exg;BviGo$;`}E{+|I}Ne0*4-9nt?~3`Pz~Aa)b5Q72!72=s_|1Zms^
z936oP(>083#Lp!gefG{!&-DaBU{FQjJSMRaOl}FZZ={*LZE;iLmdYgR?8EWXo-(*J
zllkx$mhwJ-c5n7koM-@)e%efnTtw&1$yqo>w)Pqu^+VUsmS`Tqa(C0otiM6~pvBMf
zM4w_NDud|Ch3fD6E-0K6yvJ$(u|1b0rdb4uIH*nDu>v>h9^MXdBZ@XIzfwPqt?Sry
zKAa{rK&ESk>=wAWXb^|KM}}>9z4X5jSL*eC@6$Vk+}#v@HkR*C->{#cUvdp%#YtsP
z<%1{W*oKoc#EQW4iY$Lac?xtAHePy-X>vq~^IR#CCsHyP#YWT!ubRpg=1li&Y}D)5
zGA@e^O-dXhF-X^M+0VJbS|U%Bs>>bd_xgVPc4=a1DTlJQPJ`}+;yu$H9x}AMG|l*S
z2@6p|ET>_)PkJf&1RB~D`VIrd**cJQDW4Qct+KpC*f*B@IXxn542^F|)8FZknzFdO
zhtWH738EvlNO{eEGW^%v{WMZMNe5RL>bsSHAUA;lgRxNm^>T`Q?F}|6kJ;)ToA0ws
z8eCrQr@-uL`}=!2zC|hw5cmw%=}Q$X>=b%nQm3D33h57K?_@%wfZh}QHNV)I-gCCp
zf;qy)c%Fx^d-zSiqcd2`!$w_a=9vAx`b_*6gDNZT*8LPZp1#V6MR`m~&8n|dgEePx
zxQNw#^?io5ry3Dwx3+9jt;PjG+(4v{0(Q<yzH+H^h&MdE?wnzYDS0a&frD}9uck+i
zRff*_8VD{vnS>#C4KjLjiz61K*m6r|uARZK+*l$=f#0P)jJN$$vLtK!gxSqO`{xvL
zG_}71R`u9#mEPImy|xm@Km^tk5iN#8GMSo&xvYERHs=w38R7Fc*;zI?U6oGoQP+y*
zE~)7@IHd4@_$c9H-H%sJHP%H)pOq)P#c^14d7PDKZkCYWi6(9_65G9?e^td5Rx2n8
zKaKw8E2q8|n^i}$$jzcHHduN*3srP?zd}$_8n)$?=5@)K<J9kWiYFh7uG@lS`Gl2Q
z_GfV7QLDcV)THuq&m4p_^A7XxbQ5vSr9Gqc@E_Aof3=!1&6|jZDU=4w-|2b~FfcLC
z`tU@cpU<Ci9G6~~NB%jVfp1${=B9}oFHKSwmv?(Eh(z7`4m(dIu3am~Cny&#y8ti7
zNOoQ?y2rxp3Bm`wNBYoIuB3bDwqFr<*^^*Bg!&o2!4%ORq<>9oaftfa1Q$YjaauAe
zw3q&vY5jood^w#`oVuay&-bC+N=*FUhxPc}AOG5-42}2UFAf6a%4_QuN-%eS5MvI@
zIrqUkgNImTgyHu0?cM}wn$TB@?ah`~yZ!>Y${r>qs@_d)a#t14)WKy&-1_3jbHMLi
zeec_bFBWf7WyesYhEZd0T+ZB#D?ClnfeDSGSW_TqT6mpmX++izPc16qqdcZ6=rD2o
z^?bf;I6{#JX0Q<=(e@R&3>>oMCvm?aT;9h!&U;~4hWFV0?lJn`8S<z7wk?7<qSu@&
zQ%FiVA|E78Rk@l@RBR6gb=?w*RhQnEb$pe^o86bAJ~0IwQ>m-Wb%x+$Zm%52+Fyj>
zX{qyCy>lOLT*MA{*Y8#Tb<#K7dMI*@7x%nQRFkfSo6P<5Jr@uCI~M%xVG;QcG#&}D
zNSV!t3$&ifUm9%i<DP7kI@PaV#~HryVv|R)f=+2}xZ?d{4Xm1BivkGEtUjD9-@_-v
z6iXeO`qil$v#m0x0^ffwH<BQx$0(M#wBql7K~1wdRo>F432#3sHE>UyA}h!Dg$RAM
zxK?k9Gw0)Oewc^ucK=M<{;p`mqq_Wy^%1qjT)2lSgmP0)DcPGMBXZ(%JPfxTpgC1!
zuf{j22x+~kkW8bPw;&#rgLJnfv!#+GPrnnM_3$Z{Qncucexj&du%ubWJc;x;N+;A?
zna60aWVgD$m|zl?@y+z0Yg$3JYI&C(_xM)n+o=2!;o3Xn`<vbmj#Qpc`?DRaNrdkI
z{mJcgUrTl*{z3N$zEE$W5{3@nYa&~0GU(JVRd?;~T}mv~_REsfRB+z73Wi|};1mAo
zcXhS%m%o9yUnlR<>qz(dDaz01d$msuUHW}W<Px>~7nDwiz8_0ul5OB$je92dlCd13
zDX<{?t~CWol3U;%cxxU@h5sRAw{!A+l@lk<pITdWxvw)J$7Szi&7#h%m~j)nD?}iG
z-1;##{(}Aj326E?RO1NKueCR~E`K##5F>Et&E$Iy4vyyQcy8A;Tm$6I-%#WSYxK!2
zwbTb|(XY(7o3Q9A!Trx60;xdp;Hgkd8PZz}s-($1Y)&<ni#mQrMv-iagd`!Reb<jG
z!3e>C-Mz-vuq}(1D5X<sy>B{sIp5B)S2%rFBE)k&^@af%URJxun-5Nr342UEuj<a~
zAdR6Da%T~q+borv2O`Jc$g~6M#r&B|0##cM;{TGApL<`OzrYP(_f5xOIaS3i5L(};
zx5oT-Wsgd$?svx`NlaAwBVxp?_c2Z&!?%CFM@N2vFGhEZ&5F5)gTP?W@O$HTmuQg>
zOUr#2HT{5~=KtdYC<DKI&(%qty9st`up2dfVms_SVvQSW&w!n8+Ooyb;lg_$U=}O<
zYg4*A4FnQByQ^R!1F-{hFTqYCES+q8;>(8&2C>gocO`VcKd!ox+pTM4ltAJd3nR`t
zXY=QJ`?>>bqXoOi5h^b0s?xKpHi@i>83bm+YA7CA%3-#I=$O+I*Lpe+yW94hPpESX
zq`(?9_{hv%Bo8P#rnnvyxau+cYroJ#_cpOLB^+~1anzV6kXH1qK+!JV&MW^?7DSL_
zp-25FwJb^nH?>X9{YQUdv|)K5;c5UduN2coj=#c|n=f4sc`rVaxI_>I6fjF|<T%gw
zu3UVi7xqm)NH3YYr107#n_rTu8=!c2^x$W8GEQCDxvU30@wVWl(<e*Nq4fi+aoR8^
zKzBUR;>BSBmSIUDFg#EgHw*)3g#CQd4%QU-O&+mV#O(yEezYr6(LMSlcPUqGATlQ@
zy@q3ATs~G)0GJO{WG?0=bDTU69W*O4K#4j=*->`?u=p1kBzrCR2Qw=~pncU0?Xo~=
zj6xh|odYvTuF%xs!EX;WJUk?&F3>QlrHmCyV!jBkn0gx>M+KC(AulX`lcZ<Er+>Q}
z$xT-EbmfcbeENY{z+E@)5uT?RuWeF7sjvF`yB{9>m%4^*=v(O@vlG)gM&3`iO14A(
z&4Tw;U>~83K_`sIrZ#^<QDB{REax<E2k`@0)H$vcPG?@(Qc=?DeKNKSXHg1cM#zeR
zg58JrzqQ9w2H2$p)y2btWF>68i{Z3OQuOkYFWK*>lQnQKFd^A+JXBGu3)QG3lD?m@
zd1F<7{Tl>_c=J49(VF+n?5!Zp_dUu8eNB@z<3JVD0rQ&t4_5{+%hBP+6e(2K7o#k9
zmXBPC5S9vmNALtIKXvVXlgs4$?{JTrh8-hQi8MU6DWNxhJ-dA_43;+^Z=~b>^6|7M
zn;dpuEFWImciP?l%1zNXr>*>oJ50rt)#di*4;9Kf)jdjrIns)-<2E&PG0$U~ruqhb
z%<A9esD)}Xz=9`j!HJYMh6&Y9VaXgF?xVCarpkMi=6GY$?2PW}l=UcaI_5cgT~ke~
z=wW2#`?iwYL`RL@r_Who#vgSo5~@t*)Bo5)+bUSn!t*J*y#%g~1Kl~dhm`W}WV%;l
zpXBK-<c{upt1;W48eC%P)VFqq81wwA<z2@Dz$N@fliQ$<e<Qy~;5}{v&me+($5btx
zI*2xDOs;y^H?YYFA-x`Ew@iU2u~ldFUwXGmL13t;CSLH1!W;K^%zul1RCp#j{y{MK
z+yDdT1_SQ-kPIK+h}4K@31dkkH99)EbL1Goi0|JYkUHu_Q7k+4RVgJ<p{7KFGj%XR
zu%CvSg1;>)E<R6zM?iPUE6N?X+WSWoG(GlpplF|83si-@>p`S+FN(sDvelL*LHr;K
zOFNoWuyF~k%VNO}X*L$Am;2|#J<_n`qXV2@J%68z@m}!Z7mJMMT3Yz}l-p#y6Ggdv
zmN!BW45HKou5*zAT{fKc1Iucw4MupJTxgIKEfhr_y0&@?FJ!A$@q9|GIZZhM;y7Vw
zcJ2ME7L2aZR?pNS!AZe%=z9Nlr&@1q@mCaSBmdaTLk^Z=EM0+aq=enAd#G{g&@XG3
z&=>ZijAf={JddrTk-DMB`yw?+YaW9wB?9eM6w&1amSJc-k-x$vq$)h?Sw`I2Yo|~u
z1|komWf6Zw05ZDm7_purU{`W0Ce=y4gmf){z+tei@J+G*Sayhafzzzo$)6J4gHmG=
z*~;@g9v#_~vi0(w!Ne8&<9(&%oKhY?f{|g%O{B>_CHR9<##GN`J36R{^<Ov?J>DsE
zSNAYdDWJ{+5Owy>D@u=Bro!o-yVJ)U$=f=A-zg&#%)-(=DeuN%pM)>e0LqF9aguyr
zgDqYHZH2}??_V_LYhiU7Jll!3iEcwO_UwkX2+GI!JkKerwLgkk-||J#UcLr^LoW&#
z;E1Zi%cuChN9m_P)Is=XQloG#ysyKBJ-@phYLk{n2g}G(nf_zl-=l(0Bhy>{932fc
zo6PfAuT{0$A*BaV6rn?9G-hn>V|Z$O)WhQwctNNny4i*<y)NGKOt^XOdoP82j*_+P
z%!*XnCteC__#kWg;J1<_js#aN<U${WyK<o!2KyUna1z!CN*oA$--B)$3NY)vCE{6`
zl^Nc>_Ve5mDVTSlTfKpjZiPNb|1f5W<c&5J4zJe~iUn&}0td^9rd<y80#bz|2TopU
zmc2g-ho1CKWq`CrXE)l!E?joR>LyUQn-ZL<#M3EeUR4UOX53J)AQecFQ-7G`2S`gK
zWlN6UByX=t7*D`{uJzxjz$WaI8d=+|vq^{s`xO4)r0?e`(WsP1fWwAWMENLQJJ+AU
z;1+L@%1MPE7?Kfj7ZSHOaSg#zB8^DJESvv|Z&D!ZX<FL6)`RgvXr<k!SlkchWGBub
zKJ}Mx<UXTF;r245d;%GMSb+8y!A>)n;BeO|2bIKq$$fAgx()lA_A@JE8lNI@t7WkG
z;}76K1GjXiWc#&t-;XGj!tM4&SOn-y?>hZHdn*3Z5bw06`@u`r7|&~f<pYudDCUcS
zC#3FmSn|lLO&=fpB^(5TANPny+32AJ2J{!Sm`@P68eAvI;X$yzo6BKfHw#M_*+Au@
zm7clbVKE#$y*ecGLECW35CAq@=HkE*)wEdR^*T`FMiXahsM9<TSG8FoBLGHM(1K(*
z8RWV<_0oNVJ1#78qw=154I3K#Au$HXw}2g7dI@=D^sQx3R#&yn54vo$uU57(;-(wv
zy>fvolXd^BDuL8ZP(6{7?pXit)@Utu{v_O(;D?=2K<f<Q1}b*IZU=Fp1*NsSu6qC4
z#eNjB<7uRJX%B;ucF#{r^m;PZSgL*Gg}r<iN}WZ-)T*L~L9O2N=!|1ZuuT|QOIQ4m
zxEMfO7mD4Np~5~fhJA6es;Pt~+Z1e+F^ZBOtW}ALR?|;4Z9K9>UAf?K@TCas2ABzi
z(qRX8cFO3O9w8e@o%Qd3_$2eTP*PV;@Sy!Vfz~a%kG)7TBqevUDGIr7N)dreC?aW(
zCuyRJr3xzbJI%=2G|#5avyY0RR0EL$eMUu+?QsRE)+s?YPv-_Aaqo)R)H6spL)}T!
z?Kj?FA4}H}TO<e$8@Or5_7(L!gL{1MCs8UtWR`x<<iSzK3N$#Xsr6{`)nj4VMmHY1
zYC1->rE_rdtiGTqS2}b*#*3=uv9g-6UAh-@+*`Qb%Qg+r!KC&F3tUOluV;z@A=0)&
ze%*$MZdZ5!0lXm2Cf~tol8k}0)4L6&%yD+>0)dvrh59fC`$T$L5C<stq(9i=p8nc@
zKY~)x<aFS~*{m`UfLj(7REx7dvS812o>G?EDXCBrma(XD^v3h)ul3_~X+CkPTOvhX
zD(_1JA1Ls84h}ZlC9_h8Rs`^YI{uoOqx9~lm#IS+r*n)POT>pxebB~0eMwh|9_`iu
zwnJ@%G8i}bKu^4XwX0&>r6g%Ln{zb>K5maJkbR;A4&Lf3gnRN(P57f|t9sC+0BV9`
z*%u53QDHJqSvyI`!+{X#c?7pQ`>xl;!hmtt^zwiMC(rE522$P2UrmI=`9s}ltP3bP
zo?j{-K%u(?jX|Uk$CLN{y(qv4!X^CSiCCa)V;=%2S~p`LMrl=Tzze70WrzYSVf>H^
zfw;h<Fkh@|yY_SQD*6mukZvBZXqbQpYi8_*lzO)j7t;GUhfXP<|A`yRXH(ssiVhF|
zpvDOr!Wu<BxMZ@uY6~<tW$<b^Q{0uM)VN3tsLm+gU>nr4^vQ_Cx4^ISbbF&!9qu4R
z-fZlpkwpRBY`kNCh_VTYBpT2<6OPfDT$#0%J@6g&$!i;gh;|YQrP2FybTl}G8s`dy
zHmee*=1S2CHr#Xt%DlVEzJb&lt!e`D`0{#(Gha*&A(V^1BU*gVJ{=%wU@iT9xmC)d
zfY$QE43y-hL`@_}us;77J<5TuNwRPgh|_ixDfl9{ZCMWG-7;l2pdbb>>JfSjtUWc-
z^V=<=OCKu?4w)brHtw6*g(pE?SuvSfN!J^j<t+7BuQS$(+wMLmpw&Lg{Pqi2BSdb}
zOME(P`K*aC;5mkY=%O$zX)AMh%S4l<8$T{;AY}kk`YRO9=nM%{qDE7~Qw6yWR(iRh
zAZtg}1K#ij9#}w?)NROL+8jDHeVyZHLb1)+tEg@=!^oTujDSXTFAF+BDMs%PC>4(U
zr2u#rI%_#3)^D*<rTS!WK34y66iG+&;}WGatL1bIh%=nFP}n3<z}Q}^N`Vdy!N&uq
z9jk3`XjqT=LC4L8MM@fU|0@rm`9(V5qY#jQc;Sc7IM!k%+Xf9aI8xASK#w@Y7|<3~
z(V^D`VhrKdy4lkb;Ab2N%J9H+?Bkl7B2yusLPV{6Z*gGh-b0ZrEnZXW2y8=L-~E&U
zoo#neo7C+~Kf^bPhIrFZZ-JuFBP2Cgiqo(Vmi`bbomtJ_dQlh-d6UE0SYQbu#5!M0
z^FP*Q52M<M?Z{zE3V51pJTEO@U|HG2NG6|B1QVa|x3Hc`$yEx6XBO<3+J&DJUR-Ou
zN-4h<Szf-}f(3pAv5eeLDuw*eRZZT3u1W~O2F@wKbL~8l{Wh^8rjhG`XK+{_oR<UV
zxK_x9Nzyk)`rjFq%)uxG4@s8p<%nn*Iiy)BvJ^m=<+E1z_^W0_L$C0|%XPyowl*x1
zG05)+^lE3f6kBA;aGTJ3=|+K*OmWZPO;NBOra%YH>^F!~{t?m5MTRRkdHT@|AwCzg
z&*^mvcf&>a5#E`=P?jV84W&%lu+M}$NV9z@qKoe`5Q>8djZyCR)IWg*d%_SKI8irt
za?Us1PvI|SlP|Tu0E!z-1wxzN0ZMor0rcwE-am@tD7EAW{%Ytk?LF}04k^4n4OyPA
zuunu7<}DHc#snaL?yH%pg-cFkY$9CU+2Wo|e?Q@W6-K)l=?{csgs%56B~BWuDyiW!
zsM&V)VfSE}S0s~ED$QeD#tFJNP1WeK9tN`1`9{*;=Rwh@s=$$t5!62^aaTI9LyRIX
z2bou^VJy{IcOy_Tmd=d4u{%Bi2hv+gyO2mfJPm9S7vdp5?bi1&sEe})w;i?zo6W+)
z%PVp?fnT)v<R+}Mw#Zf^kS&|nZu4R25?`k(w4hYSWn7CPqUz7=OM@9({m;)&xDmLd
zVpes-G+#m*jO(*$Y`6KY$r+r0QN;7;-H~#T-0(Jk#74STdy!l1R>{Swb;a8$ywsS<
zzlDMIfbta?58(UYXz<Z|csm_00?3qAOG<mtIR2han2!eK{gy|jAADq?{r+Nzk#a3;
zcbEo-bq*G1(Y@I>OIMy2dNAPI=6xN3U#Ckh2=7HQJkuLOP`ZZI7B%hugP}sA$NNJe
zXWy3-;{p;A-P8nTOLqi;Gz=t^A6uCR>>8&~qzIR-fIH`<YvZW1y|Oauf@qEnaN_<|
zen?1(;9$i6^!M7YI<BT^xxRWRakg|qNWa20ui#QL@iG|v#vlNVjSNu1)U+CqF)%je
zlFtajX8PWc#N>If_;8dRe=13{KU3F|JdYuN$$$;mx$1k`%4{}guE}3HsnfL2zG_JU
zkQVxrV*LUPO~&WKg|-Ml4j%Kgth?ok*$^)T-K>-lnJ_YPvI8<0&@wuosRxGA+%ll_
ze6?=`hRx>FV|2~k{;{q)(=AqvA9Y>;`>>dZ)cZSDAGrMcZ~caW$pFUaJ@uHPE$8FO
zvT}!cGGJNNqr|#8B7PMAxk#l?)?IrAL!f=}b7tN1*gYB<qr1AekrPo-HiTH<l#EI%
zQ_rx14wdz*ky`J6<f4#25T!liJVG6FuO78>k)^Ndjir%Dkx_>L<|4_y)bZ0h^bB`l
zoh6jXoDlWM$h0%v^D=CHs%F7^z{t(jt#El{zzoPlih%ISEPRnkc<r`0LSY(~E-&cu
z$pg6VJB|jUQ&+y%vkM;?zTWQH(?Q_L9b3H)8Wmmt1Uyr?6(w+yhYBx1%<J?C+7k<T
z9w;v((0E6fWk8r)D)DVv+{adF0;L{rOk>mdsv%&Zqd}utx<3Qfyr!xEGF%#TwB6~M
z?2vP{=3j!$U-~q3DpNVbA{vOSC2X`ukeredO3^mWO>aE0{=|>noF^PtfAg*WxXgPb
zd?`T3<m&l7ebx}X4Bk^fq!)=r@aa(8`YAX`XB<R)E#g$<WCdJKJQEK(u<%?uWxi5<
zNk+!*5-5W=*;{{QrEcfQwFK$fTig7DO2mbNHXOvlxU--0JmpWp-V)M&d83u(N|OI>
zZr#kdR8g?*zTa*vtj>jo%Z*R=jwO;(f{po`Pa>GfyiUA(46CSNAQ^$1Le8}5e?R5?
z{BxYnxxt3)%{}T_Ntmb4>MS3YP9XdA%+gnwt=rol&gc!v<lTW)a3tk<c&~H3qE;S`
z7S5Yytv)-8@>JtTQWu)`{zijc(d8;K(Pzr$1lqycC;cbbX<$K#!@%7L3hkg9MT*rn
zY_?9}ReofB;b?TyrNRtcn<jAtYoo?!7Qc%|C`P?w)?+bXLJ%{!Bqe1a1r3H2>%6me
zObU~`j6SuA+s^fy$)n;#TcMbJ@$F+|T(owb*AOLvVNeG0067aKS?bz}6rv28ZC3eM
z$)j^tC6<lah`wQzn!&?I>dnFGIFO!9!H}NZ`x)HE(|MTr?kuJtONqQAl?>0O{`uzv
zll62cLm|c{Bl5yFjXh2_z-nUnMr>UGmM~9=D8@!7H53`8S*DS>mSEXLqtF36*V3fM
zJ)&g89Fs!OzmC2rfRE6gm{^ws5DVXF&LL)Ryc9{LOY&MzH2*FtAjB=@okTaJ&r;Wi
zqG5$RVcI|By|8HQB`wd%o_xril`zro9F~-ZH3ln9_>W&7|FNUHd3$gt*TgRUptfy%
zC}XlOAN(@4%UEITiYB}x^ya;LH<R!hwtnBjyxhCAeCqdII*=a2+IlZSitL_N!>@Pp
z&~+aX)eK(Y1H(fUn1Ym=Pt0-0&UyED*@O>5KR=EqQv=eI#46^|j}aG7Q^3=WWGLj_
z`*^RI_M|c-%wA!UMEtJkQRW=w6BXW6ICj0U8!>_(Jq~hr*JdO`r?9P=>7*OXJsmog
zcOidt(2t_$dJxQCL;q|<ha^a6WK;!JyFSr{y%4l(9c%}AS2Yzk4SelEi35#+W`E9>
zDdcm^9brrNkGElI?!xw!?ZErnri%G}6out|=L_nj7X=lsWIK1qLcYv}9z>4-pnwfl
zrl5y=%iIeNq}B=hBwfm@3{xJ`{etZ|@X?gw;29KSOEg%UbeApC^^-J=Mg40w!dml(
z{3Rn8GjwyAK~MuVt`v~2ez`NBJkf?CWp&<}ZK3%->;TC`^AVh_l61+;H!JhgT;E&O
zh#ObpF92cKLO9v{-O*z5dvKi?ko{R=VC{P$(Z2dHtoW-|1)Wld2js&GHqMsuxx=pQ
zYuzC8v3H&&cL<J4$2Oc#A`{k_t*!;U?SCa4dW0pmh%DrbKOZlA{wB5Tnl9ejo>?sd
zE7h#ILn(D-8FjZ&9Gb|rm)O)irY?^HR23xjog-@CS4a_)C`S#Pi8O(o#*aY*b8E-N
zopUN2+FsO?yX)+|3LjCVWWrZaSe-ciE65g!mRf|;C{=5AQsdXQ3DfG&5n3!<)1M4L
zFsye!FA1>x{CeIH_{I4~K2=%XI4m(!OSewBwD;;O)R@}oPp%@nJ2_s>J4}<Mkmlt3
zk4@gD+v1n($jSS7((mo+8Sm$#^NkB1cDD-W5i%8PnuAeSDI(}6Vw*Ase6O5sfPD{t
zt`=5m`41?KJdq>nR;im;@*AF9I_pOyw*L$!TqRxoW1uBkVmn`dab5XH*Z%a9E<HWh
zJQ8CJY1k<`w-mhvNYCQ}jpwO?t}rC88+_I8+-OrAHP}vqe)u|uZGQiUGYdp3B8VWr
z`<i>_4q-4^gztB93-m{Z_Zt*wTiD4qJPDd{*D?Z`U)<L*RJ_7xnDQne{<0Cz^U|C+
zt<H!WFdwJvUT*JcsJ^K4YaeZ=dwlPBTRaJ|B_YCwMN|Cw@Mi=RmuV|!SNfWbp858s
z$?gAl#O@S%nA}_tRZBj1`kK^1>ds~-Me||8lgKJf_^RhxQ}pW4N1B;|@>Q_4IT5Xz
zGQdvGQMuh_BK0|O<|6T3)wvi6Ww+DBmqp!oNpNN?K8<EG#btCVbN{GfqI;KdkeZaI
z_a9OHuY$rVBLEEe^TZG@9Oi5~5QxHg52@!hj63Y;f#@DH)arqP|DK<cp$>)a^Myv4
zDukCV=GXSfxLrR?hHBo~Xyz|?GByr-s=E3KuM&>Yu<7?P%Wip$c|#Oe;GCW5Cs%!h
z<5E-b>A^Y;DRte-kttVXvS(mqk9<M7nq+&1^mBR_d~oEcc}mtc7|Zj%()#=3HYUsI
zQx7*k3(qO7X%?WccRf?T6)A?;E+$=#(vdn(aiQ3(RfIe2gvr<=a@?81;23cT&&gUO
z5C@maQIeESC+EW@l`@#YZx@b|a}p8VH>cKDm(R*`OB1VMMI?H2*S#WEgSd~fGivJV
zbry#x0g;Bc&S7|vL+tP#d_Fa}8t&V3NEW7+Z$V?q#_=;x@*AUF1+2H>`Ag66+LNqR
zpl{_bi3%?k7IGW*X2;}P9Q?5|&D@B9&mKDKHj|x?l_~_8J%z>^tauyRUdH_n-rM^n
zi8vTVQ5xptf7d^z!><BoB<?>h*B?&u4)}($xF9T|o0oxu+ByxVy^q4Nv+QM}Q<=M%
zqoj3a$>&lZL6C_^3FbThLc@>y18jMFSJiVLp%MH5Tu_jAl;OD&Dwj}~=}1BQ!^ikf
zgP5mvRwnVO%*@Wlj)$CGsleUR-Ag|_4^pQ!0;R7jzX0hByP4mXo;Dlu$Qoc(KBzy?
z)sfn5Y91=`s5U;X*R8RQx4RbJbqCMh`AygSRe@G^{eA^<?DbtlDR>paQF>qh*aJYG
z8dYeLY>z*4OVW@`IA-?7T3hp7gUk9|o7AJhBl#az!7R1+`8kzl{|(miT09eDsO3G?
z9JUr1iy8kIXAthQ7=V>p*A*1HM%8uk_i)`rb03P7QSYLGAqLV>W%!(xGIYf9;A`Oa
z<|6$3%>)+r$r_D&{y$I@jCvVwOy4wtR#+zH(@Y83tXEDmcSZCmO!5IU8c3+f?_QsE
zCvr$ay9#@@*t()&y**Lch~0zW)JldYc3)UqR^h-o+irFCuhW?t7#0+KOeM0#0D*!~
z%;V-mk`8nDEZNQZ?9$&sLA_cBP1ILky9klX&Q<~Y6g>E-!0hh@eUD3yNmSWjt-`sE
zz2$QUM{wQc!i0v0Iao@*Oh3Vt*<QpJ1Yq|c%TAp3w73{1QULBw6bkp5J(VHHYOy9f
zQ|}!eCZ5LV(r3xEAe%^RRM+PEm<_!iWSaoGgIZAWV@5ak$*mw}WP}JQ%NW9yIq#d#
zV*Z=l$R^h21!Sp!{OT&;68$4RD1+!xI6JX>iok)vq`1Kdl3y}|c<{c5$&kA7qWJyh
zA2Tc#0H86>wA0dqXBoRH?|duwF(EQ?zN|1^fX|b%@ogiOr;N*xXMt?R@M??V!lgcb
zALXNA6dBy0G4ckcY>;#L=v=r8*-a3i9oVSKn@nrW#je?~`z6{ejE8TDS_8d?$y)dn
z=t7kRmqPBnOOH}bxv|%zC>*EmW+%>9;3b9#GM%#1NNZuk(-Z>OsjDY%=}wPQOWB+K
zb;ZB=9_Qn55$=_fJG>%7k3A_^R58x4A*sJ7J&N5J0RZb?t(eZYQD<kvV$Y{u`9PGM
z0t~L-8)VZ(YOgjg4=Zt9=tIVw{83GX);q_nH|gWu^d-sbtC25}_t#A!LBW!}STQ<q
zB+*4eZVFapcGzVRb0X-!ewtQO?)m?2t&EiAqg(Pj62*Ic6qx7&M??jAfVo2ga{jqa
zFBh!GLSm2@Vj{~cE8yW_n-cfcHDu{l{cw>X5A&8=z6xEsRGQbwm)0Sr@bHZerWi%H
zS-Wg$=QU`lq%{RBo!NApuODblTElbZ$r>X!Hn;<0noC(I&Z{Gg-=yxd2NjBTl;!j9
z{at7O3Lk_~^JT7BQ!RWe8NcnUe*RrT7Wh4#aJTC*Do51FBM!|+eI_19x2!3^BzR^*
z+yo)b6*f+VU%bhg_D2ZqGPSe%I$6Ot9KImTT*2EY`7*~P<wEkMX?~Q|dt?l30{{*(
zk>+5t{ztM2)Iyo1KjD})zo}!lvpTx4K!uacn-T{{`rRJ7^&gvRbF4;**6F$K-f|vU
z`?bj9*reOzRRtLLSdn-X+10DzP3MpXrcz>3uXGS^#<PqR&DmS~eo*-AeFVT2Sni&{
zJ<nF4Ush#tA0RSyzo97MsE%4vk%#?6HbMNJoS+2ov~r!f2Zmqm$qg1CQT2Y-gd|~W
z&XDlD`e{=nM`vw=*!<Z}^+(Dj3yJe(u(;nw{JQ{1HAErpjvm$y@^If1xrP>H=Ma&;
zFp|pMjM9(G24Wgh6^tz<-EQX{j3$J(>W7F&;hi=>Ud~8}BbeKs1@$`Hl50oW8s);~
zgS(vnTt~P%mGKJ9CF2QqZO{EfnHE7-@dUpLDZ>L-<vO<~SUSE;WsH9rPp9X3QNrJD
z?@J}!`)B#~DA<`YTecy0Sj`OTohT-Rou;ljK-1qtM#p#vxrPtjyqdS5^VwT_R6`<k
zQs%7uCMAIf`l@jJ9KhoJs>g-J9ihl>EpO@rL9?;f8<&2lOt(@knuHN4bfTE{8!f9#
z5Dwm4iH&cBXFK+JO5N=q&5vC=q^=D#_xTe<)IVy*7fdnCI^90Y$KtjU0F*{M|7A^=
zFiuYT<61*<I1`~L=cxGKx@fAJjEv%+r=Bt=vEUw{#tK@p+2(T^{RBpSi68!s&N)#5
zg=!Gakbql`nm_1UniV1g;E#+0;VVwT85=O#cF{@J_x!2YqZ|KCNO^~f;l(=wVackB
z$SCfrGtuEaz5@rwg3g`xDA~>|yKUGrhf~JH;hqP4I4-jV<<Q+ivj34@kgS+wU;Sc)
zVT`X%lg*<*f&df^r3Mv4SI5fr9qeb?9Jsh&*FQF$Qaz<^y+^%*w1WRH9{A)G4pgGr
z%~kv%HO1Z80OVqt*1gfiu=e1)D}bL;Tz~&D<DY2s`UP8BYl(zRg==IBBWDyz9~NQh
zM%#oBZiyX_XG_u(wa6fxS{%`=^IUu44kt1X(js@rq?~Wz1B*QRETbNLmJz=*P_B5F
zsGAI|w~(gt>pj(U>+z5^4lXc-jgzMT*5JKqG}}kI6+JEs3B?7EZ?yF0-qJa&cY9K8
z2s!Av15HRPvUEtlmZ0#xE_Zo-`lIQ;`?w&1h&00HTHbSCp@U>~fZPA(VMNje3kZ)+
zZ1{`GFJ_Jm6a_OdvVM3^nzv9*eCP-H({`c-(ChLo`q8vpC2$NDr)K(m4taXI`Od!`
z{^wMYKg>T49C>SPzwx$}v$AYQp?yE*o@pk-Q^RlM*AnO#+<M;5n-AanXK|N4UxICh
z9pp*fY5h4!v99{DQhkn93SN|~+gdO1hFw%_fm_#TmEau-MPJzG$6zK5t3D$l({4?N
zDe7jBS(~6zJUIUH;gTT_Wbj9OR8`!}`NZwp|BYN?;)!9eUi}fEem06TBvK3j*WR7L
z{gXtdZTk5Wo^sv~m3@X-{u|uQgx^0JAwGaUz2z2svkdA0Iqi>^<ZC)`=h;Wp_fMy#
z`g@DU-Y^b>F)fNI4wp1>ape%fCE<G9+$c-`zMx_A!qGub<HXmYaFO$FPv2hS)y}+m
zQBM-d=o4|8`D^w)P29>Y^-O;Cu9M{_<tAzb&$GI9Q(-a?DFR#eg3f(4KVQ)Zy{Qp+
z{fzIlR;J#oq7KWIzhAj8T&Yo-S{XZ>oZHXOj6^=*(yg`9PTNm?%mtjv$Er>T(4o$x
zpFFu6nl$vRrd}wu%4p#v;|udyZ_+}~gU51y$q2(f5@4-5Ue~=InjxDtEOctIbIJ6y
z0wW585n%T|gXkH~O_koRJTN$s{Foa?K|@GRC<$4Kv6SUe{~a{?>xqYQSa|qsW;1`w
z`v0|X<$+AUfBZ9ZH_OOvXo#hdGv}6TqaqcO9EA{unp-m|G*?8C+=LFHFV=`jh{6!@
zoioK;b97Ly-^aJ#zk8nN{eC^K=k>gw*XP*h*T>r*yTf}V1-ZiE^vw!i!h0&ShJj31
z+4NMLyFo}5Ym}jxnU&Q4E8}e-<IZ&^w-r-|wlbGBn7*y)B3)h?b(o?804k~kf9R$s
z3*MO--IU0l_^hQn7_W*z%)J1^x8{W%)w{%}Uhmkp_GQ1h766pv^Y^g=(%ZZOZZsFG
z5*lkr<G<|+-ObD*<U4G5w&oLso2X$0IcpW=+}O=^u`Pk=MFz58DXq0xF~BdpQ8jO;
znsE$;deip-v2rogVcmiI8QPUHBSS_Gwk3Z@UX5elYYG~coD#E3U7*(aUvttSrY5|v
zT>LQt>5<6h%XZ>vei}`g=cn&h6nx2{%bJGbC&XdFi}R;_Ee!1kG~A<DGKe(ik<LuA
z6lJwdmhyui!1|Ad!B%+BNYKpxly*!-#H~jKeB(N~@7McN2t-(KCOJ6M_FIR|<`19P
z-`-P==q`|!rPZPd{g5CQe6IeVmLm&zjN@m+>5@I@2CrH($pR_5q6>+b1FIqc`FKh(
zE^JlC?JP^Qb6@BM#+_&{yHVOfViLZ|Z}YrEhKrt8UvZ(60_MS3vtNG2{U@S7A;IQG
z0AT&v;}2=fs6r{m$fO=W-WU`9;e9o7w=##bG;6TkD>)=RQJ@Dpo`SM=G4|?%7B-j_
zaB>4!=g~l#dp#(M#z^j{kjPOQikN^`J=7jVOULL+kkD1L@QJ}fgxsAX1+cgOC{@rK
zHg*vDW#~vqi_z-aS=0E0#jXr$#i6$^xl^{tvNa=x1kXm+RLi1JczwDAAUu5ocfR_k
zt=lD*sDxmy8>UjStF+#kTIC%;OY5)Q&b7pF9$Nnr@5_k~RMZ53`57G~+i_QWIrL0y
z2Bo<nsEsh_MC#XR@b_hjr#*V@CF?h`s7S}$XBs@y;!r40mjr;|?$fS;>rToot~rgZ
zt}!2q`{YTqsG;E8LidubPcHg5T$kB9DJ>4<CgW)ndF(B8r&#AB>Z(TUGANJ}t3opl
zxCVz^GgB<L>1jiMwc;yv)30E0GgGGX?O47d1s?2G$3wL~-3j058H}SE$6<LkNe@&p
ztQotYQDGX+syBl=XBy|~&CD~^Q0SF)ap3S^WPSyJ<Jx(zy~M^+Av|{oX(xVi%wX6*
zF6&lOUQP(<TTmwIA`>@6H?-Dv-!{u90}|&I4FKTDI{}=;ufROj0n4C~uMDe4&+J|P
zVU;qDosGJ7@oG}N!q4Cp&6rPe+yDF_l3|b1WdJ}s$n^eYU2r09G#E+Lob=QA#>IR%
zQvQzr73s2Pi@jyp-%oeg@MaXMKs1!CNC5EZT{32bR92ax#$$hF3s)vfEMp7bLk{lo
zL~G~`%JQjlWyxr9cnD^+0p<CjB)hft2Rvk(I6|7qWOS^zttjEs+%3=U`7d#NDK`Z+
zIL;vSS<Ya8Y-Sq(Z1{~<*@!wN6ZkWBXXA_>)6>T+2rf@!?{u}IAD)_cX&`k|qW%@R
z)nt9~7Mt%L<eUx^D5&#n$5|Hf#Ml-(l}t7gs<iH==Q#8@ZiTVLJ70d(&MuVFb;u{M
zHOcqiFTHDG5EZf9W{v^?`OkxPK1&mWo0!)pttJxT&6KJ-k=3_6rXBc+PrU}shc{<t
zB)=;|Ns?_h&8U@}`0>m!u;?V_NJ_invv>X|Dn)a+T6}Hx&VRMBztG)dc78V3HM8;e
zkcVM5|6}e&Q5rfG%(eE^&lT{UZoleg&4Qy3M+Z^`ibR~HSE|M>&xl(md$C7+#*}b9
zXm~9)nDqowf{+V8R|f^E{-ye?{u+2=cD)v{B~v9LGPk&9pn7rbA>+h1RLV39;bO@D
z9X-=mkrGX5F(@w+^yb97WPAtYguM>y9xFm-iPOv}xfrgxx82JU8VVP0GVkoujaNOa
zcy2~VTGX@nJ`B@&S*QxfdP3LYD4FPr0D#9)zq1?GiS|aENdjXiMfrV(p2M+xovrBp
z{i>+}VS2>#)mh>lbBA5FvU2j>2py1oZaD9l9T^<&+O;Q*k4BqrAFj$me!;=v3%&GM
zy1Zq^mTK+~!#9Ra;pbT8ChB_N`{x-!T5Oz@^lab}brjJdjlp}*cmNnCFk>-Ak?0o<
zais;n^{dKa%3AWeo)ncu)@)*&p6ZHOCrMe@S%gsara%71#TUmEGhRz?mm=hD7D1|F
z(ML6{6Vl6(;xaVzt|2B}w#9|~m8*3~ab{uV6HWE0i}DYg^k>(h<4?*yz^&4xv$BvL
zJ(uZ-NgR1eiuUrh4=27y3m7leAv}VS44|8%0clMU$O}AMA{X{IvR58SEOh(d)ak0M
ze>YTi*nc~r@~9N^OI;;t>r%+tH?NfW#ZwMtsAnlc&#aHs#=lOrbd!}IVY(%`M?z&e
zjA5{a^_OS<Sjl6r7eQ8xuRW5o)~<I_Zj6sj_;DxJe|TrmI<~$pdiqe+kqu?$j#tdI
z=|M>jml)&yu1O%bpS1wvzlF9L=r43KGrL~k9$V@_nTrvRy=Fcd@l47KYRM8sq)EeU
zgxJpmd>#wxoAEp8<>qC+s(qFhw#KmRc+O)iMKd>3;K^ir7_Vg)%Yxr{P;!BR``i-h
zCN@<0XDk4o8}`wnK$V!7fQN(Iu}lkyxV-dq;)Sutmp-3ZVbgl>tjEe@jqh<|)m}LN
ze77BMtv~Ny)%h0@LT>paRF22j!Dy9HD4aUZe~NDmg-VAe1L6Ax$kP5&kdDT#Iw|N+
z9V-M{R1&fVkAN%`Kbm=>mK~|0uY@(DB=+zLVxa}D*QTFTOzIX2L(NO5-kb^C*yur>
z{NS3%{;TR*{|DFgm>Vnesb0$(FGS#Z`hR2vNj|_=OXriVN`}=UbQa?%3Z=*3RX!&P
zgr5h`;zq^3T>AK5uw}dt4jRFfQ|-YbK`lGm0qMO>Kp;9#)V5d|Vapp?{B+>>?={WP
z<+<lHuB-$95%-6PmFN>8Ljq?*cfWV1`Bgw4{5L2@M)8sbk;~1^(Rq|uJ$-|*T$^xU
zzcZgQG{RPrQ@cA^^P?khJ`RjOr<hC@DubxwuYGCn6(8kD;s+V(KPd@OJOy<V9PCJ*
z7NQDo1n#Y*OFyr&EsZZw@Mx;o3(Khvz31SL0{gb!zs>ah(mrh(k0<#6u$qQ1Lk?$)
zai@q`Vj#$pheT^EUw;|E@ibAYc~M<fTy*bOu^)3}p(2Rja0Yd%oR`35aD0zOHE+%g
zUI8-rrz_8ab$n<kf&1DXkw0!(VEGt;va~&Obj5#E)pY%80)A?MSNXam!1d%1!LZE@
zt*?eP<IlIiA_f3u?B8;-WIy?SkMV{A#F-Le#cN<}J9fy+Kq5lAN*&DhUX}Hjj4D+D
zxGGf%$H%I<=rVgN5dwYyjFQBSMU<!Zj!$%|hHRYLn|<y^q!MZ4DK*%XB{-rjK>l*M
zwp-v;;3gvCX+gpP>F6%}lNSjO4Mk{X5x8~W!2W<{>d%WxlFKW^J&U^(K_?wgPqAUO
zHB(vqSVY&Q`x3OEfdmy;4{jH3t{@mY+j8}Jf|xN_Ag`B+rK0RVk6u`?R;jW9bE8!V
zD+Bcse_q(F{&X?{4+3xC!0Ufcda-@S#=ax1!Lo=d?VVCf3mT#%iq*yw(sud)WrQ~9
zAT-u}`<Ptj9&XeYA*DxSG7}pXEb%#v09oj)unqG=Ih8-^;$8wIcdu9V%Q2+dCC~z{
z;h+VagYS}EwW#nhDLK^k0Q8dP^{)@8{vpgE#<6r)NkH-1nuum-;y9ad?D&5C9X2AZ
z=)2ji+#8{dE7gpH8tPhr)uq!Pl2#v-%*3Yd2l1It9sTHJk+MX6`k!M>f=LUIHPlHv
zA1OwzbB~gl(ry<(TZ%qU0`FSrFIOfKqK*;o!VJMq*Si!4))&~8uAu8P|LU9<ob^V-
zg@|JbN*IFgQ<T@e_7P%#C(DB}!Jk3KIeQkzyEgsxNgjbdKt{#gpvRRpVm+-dB!-WI
zP8oKXrvYugwzMZwkV<hd2K!Y|tFdE|=*poV1V~!?Y?VGGYKWruq8Tg}mwf<UKzr2@
zC)sI-^#`ev5L9#DdGjmLDS*R}m~^`gBDZ`-O7}E(Gyg^y*xZ?@tG?U!em*5!|06D>
z1Z+)nd|>GxarGVXvG{Ry5Wo*hp5fYD1&2zClkV-5w710&Ia%es<MHg6TbQQ4{e_YX
zM5!Zd6bf~FbKj1rz6Jk7Zt~*U?#zKWrc*_9+mZpjoMD7oYm#1UrZ;^Cm-G@#933SI
z^!wJXIu;+?6sU4!y@*BKK|x5C9!HmMh#E_P)-0Zz{B`jL#_uUR%0N#nRh4tXh?t7c
zwxSd6u7rg*dY=Y^7=uB)gs0<dO%s}?)K8jXJs3pD$)fYu+ty@{xJZFfKqx<)_Mi;d
zt}3>ALF41u2()c3cjA4mhtC_m`%Z%Hbi)V0k9$1uJe!j*L83L>+_&Mul1US)hWIrN
z-0bcOo0|Z=%p3!_2eJLH0#>|?&A*!>E;^SutKM8Vko|If^#gXV*$xxhesIK3>%*kq
zo;uP@yoOCLT=)MuoZ`fMQs-&9j-TrX?wzoWcAU=gtIzi(%yLA6Qbel<=p8xTVmQ{P
z7Hba0a@%b;et(v(tCJ7;WjC2`vYv4J+k*PcbVYt$hi(&sX3>?%P3AnOTR#`r+s{ja
ztLqa}-^<N$Hgq3#q%nt68i?7hCVjxY$vUL=<2=d$Z<OSAD7tiRJ!^t-E^U;!y#C<%
zex!U6#=ErOR7#m_Rt?KFaP#oW6u3y+Q&odi24t?K)whvg;zc|Z%YXK-@m@i@4Uh-O
zQ-wKZ5fwbt&&m10zZp*UZJz`9kP2%gEudu5v$7L5Mh)Na`0g#a;e+*L9ZCzeghjqP
z>a$>37EM}S4+zsH-g{r^4d89{=4$35OB(tmS~cOqjDw~^8Ad6qnl`^Rki9Bx7Emn3
ze%mwIJ)N*?D3c2(37tXEEUoflw?(HNKrgh#mi@<AN*`bH5=^V`f5QdW6G`ul83YCk
zb4s-Q8q#`~HD56YDi)EUm;U*x2EtxD0mWKb@686hg%SiWBS*u<rD&Fvo&~oL-RVq~
zcrz73L*Ud5;{@vW6NsE*z}o1m4hze=p2ukVT^5pS&1H;U95<F@*0i<pwP501(Bs=F
zLK1jM;H>>$&pHy+*kE(ljnaAydw_P5+nK}ACotejh-@ouHxj%$H88>5g&h(A(7t<;
z&1}b*6O{BxsNrK+ed0q{0tT|KH~R3!$MKf~8zrMYK*FNil_++?!MdNEp%}>GIeImn
zP}rd0mD566+K{Ig+ns;jWaP3E!BS2$DT2t=2nR{yQq30HBd+9Y71_kd?n^QSb)~?!
zf^*ZJd3LUSehNo?-e($O7Ge#>D&VGPd!G+~AM8oJSJG}^Z2Y#}fOLTNI#At@dsEg;
z;DKQZF1lP{`}R(VTDpM%kY<=LeLO;|mObfrWg6B#r2}6qp2QVgW{Bm|^<yUt43{>}
z@%5csf4A>5L`L7b<bXGj06UT+ZG(|R1(#>b-eMNg3+V@$%}KmDV&{2Qq^m^3da7$D
zdrJrU{&kOphgk-+3QJs&1W=H@>tr3;x(yyFKE-orc!v(*-h@O#-0Pyzb-NC(P#3O9
ziF60)$dO6A4%d_-)}XTG(3nVllaT(|lE)%U*~2JLrB_Gp&tK4tI%QHLcGaD3VUVOz
zWXn$a_gAnimkuoI_GMFK955JHhGcH%%Jw}ApLIeuwA5j0h8hIwfDQNrdqXr<fNl{l
z5Eq~|Og5JiUQdqmUs2w?s&CcImXCi^vsbU7y9V;8?bYTTOuu*X4$}dA)CE|YTbosy
HxZV06xm0HE

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-64.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..21445440acb8199ad2fca6c0689eeb263bee41b7
GIT binary patch
literal 2534
zcmV<C2^sc@P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x37bhoK~#90&6{g*Rn-;8e`}u`FyYY-NgZuftWXf~N!5PH17eE-TLvY$
zR{|E2V1u<|tyZhdC>&^+QA=BGJJaG6f>@IDhBzu31#JT)*jBK@h=8`XBBC=WpcC@W
zJ*yu=G9iRy@B480f66)M|6gm}b$9kzd+&9H6eC(6J<o*9b&5_Al}U<T1dIjJfzdz!
zoB%#k^td4JD0;wP-Zq|Tn3Fx{NGju#R2Yr!h+b_1bE^hA1L3L!{HTh)ZPaYRP*s#u
zv@4l$LJ||OY1gKV)|S>XLCS$El4Z9a_Mub^^M<XSoin>B83q$h!1~SWN2H&Veh<Rk
zKvoiBvcYkb-*%XeC+6qQKc0x8xD%kNQoFr&fubuBzLrQ33E&fi2a0lv)`^J5V<4^s
zRBfxeFeITTff@1WlMO|81YWRkZuZ>wT(u@1hn{$s0J-sKQvpG;y_ok#O+!uCT^lEA
z8fvDYya0@d*G4KJ$glV2?!Dg^Kd|E`fM{bhM*?{X7@3HjWJ5$MkES0jS$yr{&LO#p
zIy+lO0`TIojAOS9m4u|!0TxM6V80-*tLRPw{$tb}?@a4FmKLOGEQpQp)XNGan1C=D
zm<C*)g!ncT<raN^us1}~3ZVg$ARHiIgQ6QEQzQR#u@|k6o@YE$tY`^vWdfnC3g?CI
zKhwjcmcl(r5afe^U}-ovTpREE`4qd2H8TlV27D_Xy`terUS#7y&jw7uO}|()R)gT;
zmzGv+b9Gj|qk5b<Y~GJVA~9F(U{F=5ZLBR-)yIHLNBQSQ%#_01!vFSvFi--dz%P9X
z$W@rN#jp5VJOQT)we__Z1fif3b*w{#hN7IJsr^UfX@yY1^3oEZ0LTz{euiH%ErEEG
zj>7!H53{<mZa`V<Bvf*1x7RM{fBTdXFwMVn<ZxQv1v$UZ?Uu7~B&e#?Hq@?C^j-(q
zkx(o&@s|8sKI^%0$_N-v>%ILxJe;K?K}57Lx9~m@S>qr(x6|wVao-!g37F-VX8?Dd
zK{!H@7jN`SZ-^t-ltDx^vn%rsMR!<hkh`C2d~Q_Fb#DUNrDG9;ujkLok&vIC-xbqX
zF>usUGNxVIf6#N$n*dQMw-Ap|<b|0(UpUS&&Xl5fYVjdKme}$|Wl_)H2B5$%okDl%
zX(K<}8vFV|#~4q;rd^vdqV>`7)jO)kMPG}iCu(nR?%p-P>z4G(Hg4N^4M3>-S|Z)$
z`p^&w9@@Ih?}{Tvs_LsQ4w=v$2sgL2v`rLG@M0bSH4QZf1bJ4B{IM{*&^f`r_(61g
zbcG-<*zi?!9`L3B6!;~3Ky2#mcQ*SKld#R!Nz~QV4R0RRyb|RuVAv4!cHjxk)Q2OJ
zBONY&R8=-MY}|vzrmUiSB6*RkO~K0Y^Fi!(aYZ)Z_~9$-E3;0FJn>hQpEC4^2N(|g
zjHA5r%&X5hmAoRNC{I~&kt-|fE3*t;o!4WzC<;ta?Gn)HU8~d5ytIviWV`522ACHc
z7JIg?u5P%CuFLDH!tP6wG?SKRP^MVg-v7$O>;CN$OlC{wBfwM_O+Vx`k8EDyA}G!&
z{s`D-MHVI-kV%%d|KSoyRejaPivGw&a|ZmRwxRYCCxx)pk~z`PeO5OlRM_bfL&yvL
zknaEIL@_MT;C2^*s=jT-Lnj!83+#-F)1JE^H@onMz-%YB@{SEnkSrrGYG^8miP@H#
zMC+p?6`f$qx4>mC#gY;8sU>xk0WxfuLEu@R!5L%vuP76S7xS!b1{&BNoQ^VdpU)48
z5P=mBAP9nl_W}DO7R2mr26&cCW9V*9u(4@<_>n#;{UckhCA2wc{@9xBF~*YFYyhj_
zBBEch^*`&{SuJ2U5m{n?X?|&&HCyZwAV`w|v6?W%eNubQk)JeMqVf$Jo}z~g=(|={
zRVKRx(G~0Z1KkUoMA2qEv)V-<$aR*~4~&Xh4OJy@Drt-Ji{D51y^H1yj-PN{9;>KT
z0u<eE1hd!9tXy%EUvi#HAji^=EdiVlSNfn)vvjG8AX*<Ck22AQYt-yAs+|p3uAaI?
zid}+PeC^`S&RAy=(CDHAP;|T3;oa=ICm=>{!)|q}fdo6v7XRrZ3Ra^)R7)(4_hMfD
zyiYY#zYVOyZcb=Nd6Z11&-u<A>*^E0SKo-pZI<-ik-W$!2Ef3pb{e_z#^q(seL<1Q
zk&bX)`2Ma~*QF?rA{-ciwogPJF`k(io*I78^_vH{yz%l|6}8>4eHl*f3C560gWhAK
z64hlV#m?1Uaendpz=Obp(buBsfd*d%Xzge{?DU==0MTgFQ|#vpPrScCpW$5Km%fGV
z&ahCnd09n;Ymli#^^WRsUd-ErMW;&7ejxNY7f|f>(oT|pIn%%0Y8m}SVQ%)^_Yl4Z
zG+WSn>x$k4oRcoAL2OrinE|oNX}%wFj5DPO=Z3ec(HRWBzB$^~+P1#uqBjB0Kd`n5
z^mh*aa))uSf)q7e$BRf#q!D2jXBY`8`kMs>3wocOaylFu-u^i7iLEn%+Y0=$Rh(r>
zIO9lA4!5<mJ>K`$X@M6kFD-R$K7fjL#+GmO<2x}*6;5m15*CJY!|VHU25ga;;g>Zi
z>a>?H$c`YS#akY#I23opDL|iQ&VLr=7EK?rMFvpuVhe%KT^uQzEnVy`@Jny^eLt=q
z<iQY*hP`-BrF-TC<C#SRb*!E7e|N_6lCY{oT^)8qUq`$Zo0qMrBaVWpFMQuOf9HcD
z(B;5If`0d9f8EwZZ1%;VlUIRX_AA_aaQb7fpcOGp^(+2br){zVf6;iA*nCl$5A@yO
zXh~)g22DVB_76S{%uCRZ0{cL>g4wI+yJF;METG9l3@`>_V?f4(Tn~C3aOoiSl9q%a
zUtix`U7nWtap$uFHzn#U$w*2PhMcV4So~yX2V-Z0^Q$q{$Vf)xmP-L6GyKxW6z)sJ
zVG5AYNN}#;3YM1@qPhn7Qalb*gt(L7{J!42Y;A1}nF2JpYEy`9LCEd!wg-vS@N(nw
z(gmVC2ArFKokZ}Vz>=5!ia*C|!1fGnK)kng_nr%<UHzvJ(h6Kf_wRwf2pkb%<>=8T
z=0Cq=!@m+Sl(bdcH2=<#=g?BFNEzUCh~j|VAgf1@ZhETb-kR2A7);4BcIJvj*Ju#T
zQ<zS7%UZl^g8<}BV6$g}>bj-t-b!AS-AMU5ewJUJ)k#Ml$YlzX1SSAu6uwON&+QCI
w6KInlhZH@C$N`02!!@*XlmDb`vqN0?KO)hHGlEV{y#N3J07*qoM6N<$f{!NG{r~^~

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext.svg b/srcpkgs/void-artwork/files/icons/void-logo-notext.svg
new file mode 100644
index 000000000000..772d80a775fd
--- /dev/null
+++ b/srcpkgs/void-artwork/files/icons/void-logo-notext.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="210.46875" height="210.46875" viewBox="0 0 210.46875 210.46875" version="1.1">
+<g id="surface2">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 105.234375 0 C 83.203125 0.046875 61.742188 7.007812 43.875 19.898438 L 67.777344 43.804688 C 79.054688 36.902344 92.015625 33.242188 105.234375 33.21875 C 145.007812 33.21875 177.25 65.460938 177.25 105.234375 C 177.21875 118.449219 173.550781 131.402344 166.648438 142.671875 L 190.597656 166.621094 C 203.484375 148.742188 210.4375 127.273438 210.46875 105.234375 C 210.46875 47.117188 163.355469 0 105.234375 0 Z M 105.234375 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.843139%,50.196081%,38.039216%);fill-opacity:1;" d="M 166.59375 190.570312 L 142.691406 166.667969 C 131.414062 173.566406 118.457031 177.226562 105.234375 177.25 C 65.464844 177.25 33.222656 145.007812 33.222656 105.234375 C 33.253906 92.019531 36.921875 79.066406 43.824219 67.796875 L 19.875 43.851562 C 6.984375 61.726562 0.0351562 83.195312 0 105.234375 C 0 163.355469 47.117188 210.46875 105.234375 210.46875 C 127.265625 210.421875 148.730469 203.460938 166.59375 190.570312 Z M 166.59375 190.570312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 138.722656 105.234375 C 138.722656 123.738281 123.722656 138.738281 105.21875 138.738281 C 86.714844 138.738281 71.714844 123.738281 71.714844 105.234375 C 71.714844 86.730469 86.714844 71.730469 105.21875 71.730469 C 123.722656 71.730469 138.722656 86.730469 138.722656 105.234375 Z M 138.722656 105.234375 "/>
+</g>
+</svg>
diff --git a/srcpkgs/void-artwork/files/icons/void-logo.svg b/srcpkgs/void-artwork/files/icons/void-logo.svg
new file mode 100644
index 000000000000..5c1130adf9aa
--- /dev/null
+++ b/srcpkgs/void-artwork/files/icons/void-logo.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256" viewBox="0 0 256 256" version="1.1">
+<g id="surface1">
+<path style="fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 128.01879 0.000438608 C 105.983867 0.0479021 84.522461 7.009213 66.656415 19.899504 L 90.56219 43.801324 C 101.838723 36.903298 114.796254 33.244654 128.01879 33.220922 C 167.789234 33.220922 200.032761 65.464449 200.032761 105.234894 C 200.001119 118.449519 196.330609 131.403095 189.428628 142.671717 L 213.377911 166.621 C 226.268202 148.743088 233.217647 127.273772 233.253245 105.234894 C 233.253245 47.115857 186.137826 0.000438608 128.01879 0.000438608 Z M 128.01879 0.000438608 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(27.843139%,50.196081%,38.039216%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 189.377209 190.570283 L 165.471434 166.668464 C 154.194901 173.56649 141.23737 177.225134 128.01879 177.248865 C 88.24439 177.248865 56.000863 145.005338 56.000863 105.234894 C 56.032505 92.020269 59.703014 79.066693 66.604996 67.798071 L 42.655713 43.848787 C 29.765422 61.7267 22.815977 83.196016 22.780379 105.234894 C 22.780379 163.35393 69.895798 210.469349 128.01879 210.469349 C 150.049757 210.421886 171.511162 203.460575 189.377209 190.570283 Z M 189.377209 190.570283 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 161.504278 105.234894 C 161.504278 123.737742 146.501861 138.740158 127.999013 138.740158 C 109.496165 138.740158 94.497704 123.737742 94.497704 105.234894 C 94.497704 86.732046 109.496165 71.729629 127.999013 71.729629 C 146.501861 71.729629 161.504278 86.732046 161.504278 105.234894 Z M 161.504278 105.234894 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 30.592077 124.809626 C 29.445043 125.628371 28.400847 126.039721 27.455532 126.039721 L 23.397404 126.039721 C 22.823887 126.039721 22.372984 125.936884 22.04865 125.731208 C 21.720361 125.529489 21.451401 125.220976 21.245726 124.809626 L 0.468586 86.202037 C 0.385525 86.122931 0.345972 86.020093 0.345972 85.897479 L 0.345972 85.525682 C 0.345972 85.118287 0.488363 84.789998 0.777099 84.54477 C 1.105388 84.256034 1.61562 84.113643 2.311751 84.113643 L 27.578146 84.113643 C 28.930856 84.113643 29.812885 84.521038 30.224235 85.343739 L 43.011689 109.993108 L 78.850575 85.343739 C 80.041118 84.521038 81.290989 84.113643 82.60019 84.113643 L 86.595034 84.113643 C 87.128998 84.113643 87.397958 84.339095 87.397958 84.789998 C 87.397958 85.15784 87.069668 85.608743 86.41309 86.142707 Z M 30.592077 124.809626 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 86.353761 126.039721 C 84.221859 126.039721 82.335186 125.711432 80.697696 125.054854 C 79.05625 124.358723 77.683764 123.417364 76.576283 122.226821 C 75.472757 121.040234 74.63028 119.647972 74.056763 118.046079 C 73.483246 116.408589 73.198465 114.64453 73.198465 112.761811 C 73.198465 110.341174 73.60586 107.964044 74.42856 105.630423 C 75.247306 103.292846 76.374563 101.058107 77.806378 98.930161 C 79.281702 96.798259 81.006208 94.828525 82.971988 93.028868 C 84.981275 91.225255 87.15273 89.666871 89.490306 88.353715 C 91.86348 87.044513 94.367179 86.020093 96.989537 85.280454 C 99.611894 84.501262 102.297536 84.113643 105.042508 84.113643 L 135.165999 84.113643 C 137.337454 84.113643 139.243904 84.441932 140.881394 85.098511 C 142.562392 85.751134 143.954654 86.672716 145.062136 87.863259 C 146.169617 89.010293 147.008139 90.382779 147.581656 91.980716 C 148.159128 93.578653 148.443909 95.322936 148.443909 97.205654 C 148.443909 99.626292 148.012782 102.023198 147.154484 104.400328 C 146.331784 106.737904 145.18475 108.968688 143.709426 111.100589 C 142.234103 113.232491 140.493775 115.222002 138.484488 117.065167 C 136.4752 118.86878 134.283969 120.446941 131.90684 121.79965 C 129.52971 123.108851 127.029967 124.153048 124.407609 124.93224 C 121.785252 125.671879 119.139163 126.039721 116.477252 126.039721 Z M 123.363413 100.89594 C 124.716122 98.028355 125.392477 95.876677 125.392477 94.440906 C 125.392477 93.254319 124.96135 92.431619 124.099097 91.980716 C 123.280352 91.529813 122.050256 91.304361 120.412766 91.304361 L 112.051282 91.304361 C 110.86074 91.304361 109.753259 91.470483 108.728838 91.798772 C 107.747926 92.083553 106.826344 92.597741 105.964091 93.333425 C 105.101837 94.073064 104.263316 95.053976 103.444571 96.284072 C 102.665378 97.514167 101.86641 99.052775 101.047665 100.89594 L 98.093063 107.596202 C 96.538634 111.080813 95.759441 113.70317 95.759441 115.46723 C 95.759441 116.653817 96.107507 117.51607 96.803638 118.046079 C 97.499769 118.540491 98.504413 118.785719 99.817569 118.785719 L 108.238382 118.785719 C 109.508031 118.785719 110.678797 118.59982 111.74277 118.231978 C 112.806743 117.820628 113.831163 117.187781 114.81603 116.325528 C 115.800898 115.46723 116.742257 114.320196 117.644063 112.884425 C 118.545869 111.448655 119.467452 109.688551 120.412766 107.596202 Z M 123.363413 100.89594 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 144.120777 126.039721 C 143.385093 126.039721 143.017251 125.794493 143.017251 125.304037 C 143.017251 125.054854 143.07658 124.750296 143.199194 124.378499 L 160.475902 85.711581 C 160.966358 84.647608 161.74555 84.113643 162.813479 84.113643 L 183.958461 84.113643 C 184.737653 84.113643 185.129227 84.378648 185.129227 84.912612 C 185.129227 85.15784 185.046166 85.422844 184.880044 85.711581 L 167.66662 124.378499 C 167.176164 125.48598 166.396972 126.039721 165.332999 126.039721 Z M 144.120777 126.039721 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 174.347105 126.039721 C 173.611421 126.039721 173.243579 125.794493 173.243579 125.304037 C 173.243579 125.054854 173.302909 124.750296 173.425523 124.378499 L 190.702231 85.711581 C 191.192687 84.647608 191.971879 84.113643 193.035852 84.113643 L 242.465116 84.113643 C 244.597017 84.113643 246.479736 84.441932 248.121181 85.098511 C 249.758671 85.751134 251.131157 86.672716 252.238638 87.863259 C 253.34612 89.010293 254.184641 90.382779 254.762114 91.980716 C 255.335631 93.578653 255.620412 95.322936 255.620412 97.205654 C 255.620412 99.709353 255.189285 102.165589 254.330987 104.586226 C 253.468734 106.963356 252.282147 109.213916 250.763315 111.345817 C 249.287992 113.477719 247.527888 115.443498 245.479047 117.247111 C 243.46976 119.050723 241.274574 120.609107 238.897444 121.922264 C 236.563823 123.191912 234.103632 124.196556 231.520828 124.93224 C 228.941978 125.671879 226.359174 126.039721 223.776369 126.039721 Z M 227.834497 100.89594 C 229.143698 97.945294 229.800276 95.793616 229.800276 94.440906 C 229.800276 93.254319 229.392881 92.431619 228.570181 91.980716 C 227.751436 91.529813 226.564849 91.304361 225.006464 91.304361 L 212.527523 91.304361 L 200.35314 118.785719 L 212.772751 118.785719 C 214.002847 118.785719 215.149881 118.59982 216.213854 118.231978 C 217.281782 117.820628 218.282471 117.187781 219.227785 116.325528 C 220.208697 115.423722 221.154012 114.276688 222.055818 112.884425 C 222.997177 111.448655 223.938536 109.688551 224.88385 107.596202 Z M 227.834497 100.89594 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 128.035156 24.070312 C 106.273438 24.117188 85.078125 30.992188 67.433594 43.722656 L 91.042969 67.328125 C 102.179688 60.515625 114.976562 56.902344 128.035156 56.878906 C 167.3125 56.878906 199.15625 88.722656 199.15625 128 C 199.125 141.050781 195.5 153.84375 188.683594 164.972656 L 212.335938 188.625 C 225.066406 170.96875 231.929688 149.765625 231.964844 128 C 231.964844 70.601562 185.433594 24.070312 128.035156 24.070312 Z M 128.035156 24.070312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.843139%,50.196081%,38.039216%);fill-opacity:1;" d="M 188.632812 212.277344 L 165.023438 188.671875 C 153.886719 195.484375 141.089844 199.097656 128.035156 199.121094 C 88.753906 199.121094 56.910156 167.277344 56.910156 128 C 56.941406 114.949219 60.566406 102.15625 67.382812 91.027344 L 43.730469 67.375 C 31 85.03125 24.136719 106.234375 24.101562 128 C 24.101562 185.398438 70.632812 231.929688 128.035156 231.929688 C 149.792969 231.882812 170.988281 225.007812 188.632812 212.277344 Z M 188.632812 212.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 161.105469 128 C 161.105469 146.273438 146.289062 161.089844 128.015625 161.089844 C 109.742188 161.089844 94.929688 146.273438 94.929688 128 C 94.929688 109.726562 109.742188 94.910156 128.015625 94.910156 C 146.289062 94.910156 161.105469 109.726562 161.105469 128 Z M 161.105469 128 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 31.816406 147.332031 C 30.683594 148.140625 29.652344 148.546875 28.71875 148.546875 L 24.710938 148.546875 C 24.144531 148.546875 23.699219 148.445312 23.378906 148.242188 C 23.054688 148.042969 22.789062 147.738281 22.585938 147.332031 L 2.066406 109.203125 C 1.984375 109.125 1.945312 109.023438 1.945312 108.902344 L 1.945312 108.535156 C 1.945312 108.132812 2.085938 107.808594 2.371094 107.566406 C 2.695312 107.28125 3.199219 107.140625 3.886719 107.140625 L 28.839844 107.140625 C 30.175781 107.140625 31.046875 107.542969 31.453125 108.355469 L 44.082031 132.699219 L 79.476562 108.355469 C 80.652344 107.542969 81.886719 107.140625 83.179688 107.140625 L 87.125 107.140625 C 87.652344 107.140625 87.917969 107.363281 87.917969 107.808594 C 87.917969 108.171875 87.59375 108.617188 86.945312 109.144531 Z M 31.816406 147.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 86.886719 148.546875 C 84.78125 148.546875 82.917969 148.222656 81.300781 147.574219 C 79.679688 146.886719 78.324219 145.957031 77.230469 144.78125 C 76.140625 143.609375 75.308594 142.234375 74.742188 140.652344 C 74.175781 139.035156 73.894531 137.292969 73.894531 135.433594 C 73.894531 133.042969 74.296875 130.695312 75.109375 128.390625 C 75.917969 126.082031 77.03125 123.875 78.445312 121.773438 C 79.902344 119.667969 81.605469 117.722656 83.546875 115.945312 C 85.53125 114.164062 87.675781 112.625 89.984375 111.328125 C 92.328125 110.035156 94.800781 109.023438 97.390625 108.292969 C 99.980469 107.523438 102.632812 107.140625 105.34375 107.140625 L 135.09375 107.140625 C 137.238281 107.140625 139.121094 107.464844 140.738281 108.113281 C 142.398438 108.757812 143.773438 109.667969 144.867188 110.84375 C 145.960938 111.976562 146.789062 113.332031 147.355469 114.910156 C 147.925781 116.488281 148.207031 118.210938 148.207031 120.070312 C 148.207031 122.460938 147.78125 124.828125 146.933594 127.175781 C 146.121094 129.484375 144.988281 131.6875 143.53125 133.792969 C 142.074219 135.898438 140.355469 137.863281 138.371094 139.683594 C 136.386719 141.464844 134.222656 143.023438 131.875 144.359375 C 129.527344 145.652344 127.058594 146.683594 124.46875 147.453125 C 121.878906 148.183594 119.265625 148.546875 116.636719 148.546875 Z M 123.4375 123.714844 C 124.773438 120.882812 125.441406 118.757812 125.441406 117.339844 C 125.441406 116.167969 125.015625 115.355469 124.164062 114.910156 C 123.355469 114.464844 122.140625 114.242188 120.523438 114.242188 L 112.265625 114.242188 C 111.089844 114.242188 109.996094 114.40625 108.984375 114.730469 C 108.015625 115.011719 107.105469 115.519531 106.253906 116.246094 C 105.402344 116.976562 104.574219 117.945312 103.765625 119.160156 C 102.996094 120.375 102.207031 121.894531 101.398438 123.714844 L 98.480469 130.332031 C 96.945312 133.773438 96.175781 136.363281 96.175781 138.105469 C 96.175781 139.277344 96.519531 140.128906 97.207031 140.652344 C 97.894531 141.140625 98.886719 141.382812 100.183594 141.382812 L 108.5 141.382812 C 109.753906 141.382812 110.910156 141.199219 111.960938 140.835938 C 113.011719 140.429688 114.023438 139.804688 114.996094 138.953125 C 115.96875 138.105469 116.898438 136.972656 117.789062 135.554688 C 118.679688 134.136719 119.589844 132.398438 120.523438 130.332031 Z M 123.4375 123.714844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 143.9375 148.546875 C 143.210938 148.546875 142.847656 148.304688 142.847656 147.820312 C 142.847656 147.574219 142.90625 147.273438 143.027344 146.90625 L 160.089844 108.71875 C 160.574219 107.667969 161.34375 107.140625 162.398438 107.140625 L 183.28125 107.140625 C 184.050781 107.140625 184.4375 107.402344 184.4375 107.929688 C 184.4375 108.171875 184.355469 108.433594 184.191406 108.71875 L 167.191406 146.90625 C 166.707031 148 165.9375 148.546875 164.886719 148.546875 Z M 143.9375 148.546875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 173.789062 148.546875 C 173.0625 148.546875 172.699219 148.304688 172.699219 147.820312 C 172.699219 147.574219 172.757812 147.273438 172.878906 146.90625 L 189.941406 108.71875 C 190.425781 107.667969 191.195312 107.140625 192.246094 107.140625 L 241.0625 107.140625 C 243.167969 107.140625 245.027344 107.464844 246.648438 108.113281 C 248.265625 108.757812 249.621094 109.667969 250.714844 110.84375 C 251.808594 111.976562 252.636719 113.332031 253.207031 114.910156 C 253.773438 116.488281 254.054688 118.210938 254.054688 120.070312 C 254.054688 122.542969 253.628906 124.96875 252.78125 127.359375 C 251.929688 129.707031 250.757812 131.929688 249.257812 134.035156 C 247.800781 136.140625 246.0625 138.082031 244.039062 139.863281 C 242.054688 141.644531 239.886719 143.183594 237.539062 144.480469 C 235.234375 145.734375 232.804688 146.726562 230.253906 147.453125 C 227.707031 148.183594 225.15625 148.546875 222.605469 148.546875 Z M 226.613281 123.714844 C 227.90625 120.800781 228.554688 118.675781 228.554688 117.339844 C 228.554688 116.167969 228.152344 115.355469 227.339844 114.910156 C 226.53125 114.464844 225.359375 114.242188 223.820312 114.242188 L 211.496094 114.242188 L 199.472656 141.382812 L 211.738281 141.382812 C 212.953125 141.382812 214.085938 141.199219 215.136719 140.835938 C 216.191406 140.429688 217.179688 139.804688 218.113281 138.953125 C 219.082031 138.0625 220.015625 136.929688 220.90625 135.554688 C 221.835938 134.136719 222.765625 132.398438 223.699219 130.332031 Z M 226.613281 123.714844 "/>
+</g>
+</svg>
diff --git a/srcpkgs/void-artwork/files/void-logo.svg b/srcpkgs/void-artwork/files/void-logo.svg
new file mode 100644
index 000000000000..35e8a7c2c2af
--- /dev/null
+++ b/srcpkgs/void-artwork/files/void-logo.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="256"
+   height="256"
+   viewBox="0 0 252.06154 252.06153"
+   version="1.1"
+   preserveAspectRatio="xMidYMid"
+   id="voidlogo"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#logo"
+     id="border"
+     style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     width="100%"
+     height="100%" />
+  <g
+     id="logo"
+     transform="matrix(0.97240747,0,0,0.97240747,1.5789588,23.699565)"
+     style="display:inline">
+    <g
+       id="circlearcs"
+       style="display:inline">
+      <path
+         id="toparc"
+         fill="#abc2ab"
+         d="M 128.01682,0 C 105.98494,0.04678314 84.523372,7.0072685 66.657757,19.900168 l 23.902685,23.902684 c 11.277448,-6.898594 24.236288,-10.559734 37.456378,-10.582214 39.77241,-7.9e-5 72.01434,32.241846 72.01426,72.014262 -0.0318,13.21538 -3.69956,26.16719 -10.60151,37.43708 l 23.94799,23.94799 c 12.8888,-17.87595 19.8404,-39.34715 19.87417,-61.38507 C 233.25173,47.115274 186.13644,0 128.01682,0 Z" />
+      <path
+         id="bottomarc"
+         fill="#478061"
+         d="m 189.37588,190.56963 -23.90269,-23.90268 c -11.27745,6.89859 -24.23629,10.55974 -37.45637,10.58221 -39.772417,8e-5 -72.014343,-32.24185 -72.014264,-72.01426 0.03183,-13.215382 3.699547,-26.167196 10.60151,-37.437081 L 42.656067,43.849832 C 29.76725,61.725769 22.815686,83.196977 22.781918,105.2349 c 0,58.11962 47.115274,105.2349 105.234902,105.2349 22.03188,-0.0468 43.49344,-7.00726 61.35906,-19.90017 z" />
+      <circle
+         id="circle"
+         fill="#abc2ab"
+         cx="128"
+         cy="105.2349"
+         r="33.503357" />
+    </g>
+    <g
+       id="letters"
+       style="display:inline">
+      <path
+         id="letterv"
+         fill="#000000"
+         d="m 30.591915,124.81039 c -1.147564,0.81968 -2.192665,1.22952 -3.135303,1.22952 h -4.057453 c -0.573782,0 -1.024609,-0.10245 -1.352481,-0.30737 -0.327871,-0.20493 -0.59427,-0.51231 -0.799195,-0.92215 L 0.46842244,86.203138 C 0.38645233,86.121168 0.34546728,86.01871 0.34546728,85.895763 v -0.368865 c 0,-0.409842 0.14344762,-0.737718 0.43034287,-0.983628 C 1.1036817,84.256383 1.615986,84.11294 2.3127229,84.11294 H 27.579567 c 1.35248,0 2.233641,0.409841 2.643482,1.229525 L 43.010172,109.99455 78.85096,85.342465 c 1.188548,-0.819684 2.438574,-1.229525 3.750078,-1.229525 h 3.995963 c 0.532806,0 0.799208,0.225413 0.799208,0.67624 0,0.368856 -0.327871,0.819683 -0.983614,1.35248 z" />
+      <path
+         id="lettero"
+         fill="#000000"
+         d="m 86.35303,126.03991 c -2.131187,0 -4.016463,-0.32787 -5.65583,-0.98362 -1.639384,-0.69673 -3.012366,-1.63937 -4.118944,-2.82792 -1.106579,-1.18855 -1.946755,-2.58201 -2.520528,-4.18039 -0.573773,-1.63938 -0.860659,-3.40171 -0.860659,-5.287 0,-2.41807 0.409842,-4.79516 1.229525,-7.13126 0.819683,-2.33611 1.946754,-4.56976 3.381213,-6.70095 1.475427,-2.131187 3.196763,-4.098434 5.16401,-5.901741 2.008232,-1.803315 4.180404,-3.360721 6.516517,-4.672216 2.377097,-1.311495 4.877141,-2.336103 7.500131,-3.073825 2.623008,-0.778698 5.307485,-1.168047 8.053425,-1.168047 h 30.12348 c 2.17218,0 4.07795,0.327871 5.71734,0.983614 1.68035,0.655752 3.07381,1.577903 4.18039,2.766451 1.10658,1.147555 1.94676,2.520527 2.52053,4.118918 0.57379,1.59839 0.86069,3.340224 0.86069,5.2255 0,2.418083 -0.43034,4.815666 -1.29101,7.192756 -0.8197,2.33611 -1.96726,4.56976 -3.44269,6.70094 -1.47544,2.13118 -3.21728,4.11893 -5.22551,5.96323 -2.00823,1.80331 -4.2009,3.3812 -6.57799,4.73368 -2.37708,1.3115 -4.87713,2.35661 -7.50013,3.13531 -2.62299,0.73772 -5.26649,1.10657 -7.93048,1.10657 z m 37.00886,-25.1439 c 1.35249,-2.868898 2.02874,-5.020573 2.02874,-6.455023 0,-1.188549 -0.43035,-2.008237 -1.29103,-2.459063 -0.81969,-0.450827 -2.04921,-0.67624 -3.68858,-0.67624 h -8.36081 c -1.18854,0 -2.29512,0.163935 -3.31974,0.491807 -0.98363,0.286895 -1.90577,0.7992 -2.76644,1.536913 -0.86067,0.737722 -1.70084,1.72135 -2.52053,2.950883 -0.77869,1.229526 -1.57788,2.766434 -2.39757,4.610723 l -2.950895,6.70095 c -1.557397,3.48367 -2.336095,6.10667 -2.336095,7.869 0,1.18854 0.348364,2.04921 1.045092,2.582 0.696746,0.49181 1.700862,0.73772 3.012348,0.73772 h 8.42229 c 1.27052,0 2.43858,-0.18443 3.50417,-0.55328 1.0656,-0.40985 2.09021,-1.04511 3.07383,-1.90578 0.98362,-0.86067 1.92626,-2.00823 2.82791,-3.44268 0.90166,-1.43445 1.8238,-3.19678 2.76644,-5.28698 z" />
+      <path
+         id="letteri"
+         fill="#000000"
+         d="m 144.12269,126.03991 c -0.73771,0 -1.10657,-0.2459 -1.10657,-0.73771 0,-0.2459 0.0615,-0.55329 0.18444,-0.92215 l 17.27487,-38.668719 c 0.49183,-1.065594 1.27053,-1.59839 2.33613,-1.59839 h 21.14791 c 0.7787,0 1.16805,0.266394 1.16805,0.799182 0,0.24591 -0.082,0.512313 -0.24589,0.799208 L 167.6682,124.38005 c -0.49182,1.10658 -1.27052,1.65986 -2.33612,1.65986 z" />
+      <path
+         id="letterd"
+         fill="#000000"
+         d="m 174.34897,126.03991 c -0.73772,0 -1.10657,-0.2459 -1.10657,-0.73771 0,-0.2459 0.0615,-0.55329 0.18443,-0.92215 l 17.27488,-38.668719 c 0.49182,-1.065594 1.27053,-1.59839 2.33612,-1.59839 h 49.42712 c 2.13119,0 4.01646,0.327871 5.65583,0.983614 1.63937,0.655752 3.01234,1.577903 4.11892,2.766451 1.10657,1.147555 1.94676,2.520527 2.52055,4.118918 0.57377,1.59839 0.86066,3.340224 0.86066,5.2255 0,2.500053 -0.43033,4.959116 -1.291,7.377186 -0.86067,2.37709 -2.04922,4.63123 -3.56565,6.76242 -1.47543,2.13118 -3.23775,4.09843 -5.28696,5.90174 -2.00824,1.80331 -4.2009,3.36072 -6.578,4.67221 -2.33611,1.27052 -4.79517,2.27464 -7.37717,3.01235 -2.58203,0.73772 -5.16404,1.10658 -7.74605,1.10658 z m 53.48456,-25.1439 c 1.3115,-2.950868 1.96725,-5.102543 1.96725,-6.455023 0,-1.188549 -0.40984,-2.008237 -1.22952,-2.459063 -0.81969,-0.450827 -2.00824,-0.67624 -3.56565,-0.67624 h -12.47973 l -12.17235,27.479996 h 12.41826 c 1.22953,0 2.37709,-0.18443 3.44269,-0.55328 1.06559,-0.40985 2.06971,-1.0451 3.01234,-1.90578 0.98363,-0.90166 1.92627,-2.04921 2.82792,-3.44268 0.94264,-1.43445 1.88528,-3.19678 2.82791,-5.28698 z" />
+    </g>
+  </g>
+</svg>
diff --git a/srcpkgs/void-artwork/template b/srcpkgs/void-artwork/template
index d02a5a0fa3b1..6685641fe4e2 100644
--- a/srcpkgs/void-artwork/template
+++ b/srcpkgs/void-artwork/template
@@ -1,10 +1,10 @@
 # Template file for 'void-artwork'
 pkgname=void-artwork
-version=20170517
-revision=3
+version=20220303
+revision=1
 short_desc="Void Linux artwork"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="custom:Public Domain"
+license="custom:Public Domain" #no vlicense check
 homepage="http://www.voidlinux.org"
 
 do_install() {
@@ -12,4 +12,11 @@ do_install() {
 	vinstall ${FILESDIR}/splashwhite.png 644 usr/share/void-artwork
 	vinstall ${FILESDIR}/void-logo.png 644 usr/share/void-artwork
 	vinstall ${FILESDIR}/void-transparent.png 644 usr/share/void-artwork
+	vinstall ${FILESDIR}/void-logo.svg 644 usr/share/void-artwork
+	for size in 16 22 32 48 64 128 256 512; do
+		vinstall ${FILESDIR}/icons/void-logo-${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps void-logo.png
+		vinstall ${FILESDIR}/icons/void-logo-notext-${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps void-logo-notext.png
+	done
+	vinstall ${FILESDIR}/icons/void-logo.svg 644 usr/share/icons/hicolor/scalable/apps
+	vinstall ${FILESDIR}/icons/void-logo-notext.svg 644 usr/share/icons/hicolor/scalable/apps
 }

From 936267a31604138a5bdb15669e9104a2040a1f77 Mon Sep 17 00:00:00 2001
From: David Wildasin <dragonmaus@posteo.net>
Date: Sun, 13 Feb 2022 23:05:53 -0500
Subject: [PATCH 0232/2561] runit-void: Standardise/improve os-release

---
 srcpkgs/runit-void/files/os-release | 9 +++++++--
 srcpkgs/runit-void/template         | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e6..e652642b5571 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,9 @@
-NAME="void"
+NAME="Void"
 ID="void"
+PRETTY_NAME="Void Linux"
+HOME_URL="https://voidlinux.org/"
+DOCUMENTATION_URL="https://docs.voidlinux.org/"
+LOGO="void-logo"
+ANSI_COLOR="0;38;2;71;128;97"
+
 DISTRIB_ID="void"
-PRETTY_NAME="void"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 0c98cadc9e18..a0aef0484c0b 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20210314
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
@@ -32,10 +32,12 @@ post_install() {
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/
+	vmkdir usr/lib
+	vinstall ${FILESDIR}/os-release 644 /usr/lib/
+	ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release
 	# Enable services at post-install time instead.
 	rm -f ${DESTDIR}/etc/runit/runsvdir/current
 	rm -rf ${DESTDIR}/etc/runit/runsvdir/default

From c869a8955f9d6d7c6a38f98e12fc27dfba75d009 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 09:58:36 +0100
Subject: [PATCH 0233/2561] gjs: ignore development versions in update-check

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

diff --git a/srcpkgs/gjs/update b/srcpkgs/gjs/update
new file mode 100644
index 000000000000..12132d5fa5b4
--- /dev/null
+++ b/srcpkgs/gjs/update
@@ -0,0 +1 @@
+pattern="gjs-[0-9]+\.[0-9]*[02468]\.[0-9]+"

From 2c17243be6a3ddd874e22baa16f6f0ce0fa7ef2d Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Fri, 11 Mar 2022 16:07:49 +0100
Subject: [PATCH 0234/2561] zellij: update to 0.26.0

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

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 2be522145138..e2ada810e570 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,6 +1,6 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.25.0
+version=0.26.0
 revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://zellij.dev"
 changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz"
-checksum=5bd4e6a726cf32e096f9c90d7dc414e63dee0613a56f5b665f4bfc6376dcf20a
+checksum=f0b0cfe7b72ce842de80d5c32cc2abe624b3286fab16f313a4e43e226e95e87b
 
 post_build() {
 	ZELLIJ="target/${RUST_TARGET}/release/zellij"

From 6270aa2a99669735ace0cb9829e04dc99e49d5ac Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 15 Mar 2022 01:12:19 +0700
Subject: [PATCH 0235/2561] Converseen: update 0.9.9.5

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

diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template
index b457a0b6b8fa..bb8790332271 100644
--- a/srcpkgs/Converseen/template
+++ b/srcpkgs/Converseen/template
@@ -1,6 +1,6 @@
 # Template file for 'Converseen'
 pkgname=Converseen
-version=0.9.9.4
+version=0.9.9.5
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ 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=c96642b0120ba8aabe02d52210f1c8ff921d97a57851d44561b89d10bc569a88
+checksum=30d731968e61ab3fb701976f05b2f5b372e9760c05665d6183921fb94f8cfa44

From 91856677ebeaaa0c5983ba574876cf5ae2d74700 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 17:32:36 +0100
Subject: [PATCH 0236/2561] New package: python3-listparser-0.18

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

diff --git a/srcpkgs/python3-listparser/template b/srcpkgs/python3-listparser/template
new file mode 100644
index 000000000000..dfe7ba100839
--- /dev/null
+++ b/srcpkgs/python3-listparser/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-listparser'
+pkgname=python3-listparser
+version=0.18
+revision=1
+wrksrc="listparser-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Parse subscription lists in Python"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/kurtmckee/listparser"
+changelog="https://raw.githubusercontent.com/kurtmckee/listparser/develop/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/l/listparser/listparser-${version}.tar.gz"
+checksum=4be0cc459b9f3d9f24726f0f448ac67ff8d4c87a7010453dca817b556bd0b841

From 16c235b76737130ff9034d18e5fa7ac14c8b2133 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 3 Oct 2021 01:08:10 +0200
Subject: [PATCH 0237/2561] New package: gfeeds-0.16.2

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

diff --git a/srcpkgs/gfeeds/template b/srcpkgs/gfeeds/template
new file mode 100644
index 000000000000..b6ae09f74fc5
--- /dev/null
+++ b/srcpkgs/gfeeds/template
@@ -0,0 +1,16 @@
+# Template file for 'gfeeds'
+pkgname=gfeeds
+version=0.16.2
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gobject-introspection glib-devel gettext"
+makedepends="libglib-devel gtk+3-devel libhandy1-devel"
+depends="python3-gobject python3-feedparser python3-readability-lxml
+ python3-listparser python3-pytz python3-dateutil python3-requests
+ python3-html5lib gtk+3 webkit2gtk libhandy1"
+short_desc="RSS/Atom feed reader for GNOME"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://gfeeds.gabmus.org/"
+distfiles="https://gitlab.gnome.org/World/gfeeds/-/archive/$version/gfeeds-$version.tar.gz"
+checksum=f061e89a1962a5ac544ea98239c2503af8da817ded0a5bfd8094ddf43e9dd00e

From f8cc56325462bb4e434325cfdcaf755e169e1c26 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 14 Mar 2022 18:53:16 -0500
Subject: [PATCH 0238/2561] ghostwriter: update to 2.1.2.

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

diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
index 71f5f14aad66..86e4b10c4533 100644
--- a/srcpkgs/ghostwriter/template
+++ b/srcpkgs/ghostwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'ghostwriter'
 pkgname=ghostwriter
-version=2.1.1
+version=2.1.2
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://wereturtle.github.io/ghostwriter"
 distfiles="https://github.com/wereturtle/ghostwriter/archive/${version}.tar.gz"
-checksum=a9add6202dc1c9bb3f591fd4ec5d70e0fbd49d55f4921dc217923debc4d02f06
+checksum=65aa523a9c3d4f4c68f2cb6f5ab600cf24c98b4f0673a622d757a8e28eab120f
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5tel*) broken="qtwebengine not built for this platform";;

From e7845b22339734a76cf4f14aa40dabeb75de1800 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:21:55 +0100
Subject: [PATCH 0239/2561] libhandy: fix checksum

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

diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template
index 796cd46e7359..5a46045b7173 100644
--- a/srcpkgs/libhandy/template
+++ b/srcpkgs/libhandy/template
@@ -12,11 +12,11 @@ hostmakedepends="glib-devel pkg-config $(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"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy"
 distfiles="https://gitlab.gnome.org/GNOME/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz"
-checksum=645355a009f23f254eaec7752b9489c3c2f5832397fcec75433a7e00efbfe52f
+checksum=138bec94e66d15a7a19350b65845d4529bcd969ea913ab3eb438f56fe47d5d37
 
 build_options="gir glade"
 desc_option_glade="Generate glade modules and catalog files"

From ed3d84fb944857f67490fec6a87c1b672ec386f1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 15 Mar 2022 14:21:19 -0500
Subject: [PATCH 0240/2561] melonDS: update to 0.9.4.

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

diff --git a/srcpkgs/melonDS/template b/srcpkgs/melonDS/template
index 58602c65746a..9594c3b3294b 100644
--- a/srcpkgs/melonDS/template
+++ b/srcpkgs/melonDS/template
@@ -1,7 +1,7 @@
 # Template file for 'melonDS'
 pkgname=melonDS
-version=0.9.3
-revision=2
+version=0.9.4
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="qt5-devel libslirp-devel SDL2-devel libepoxy-devel
@@ -11,4 +11,4 @@ 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=c50a3855c1f77f58a2b15045687dc399b845224a970fe68ff95919c939ac634f
+checksum=8022c8798a723f8ffae6ffdad2e7637cf9046e88f86b55b5f9ad3fa3b2e6d398

From 192c3d7f75396c077d14775728671b02e0fa450c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 15 Mar 2022 21:05:47 +0100
Subject: [PATCH 0241/2561] openssl: update to 1.1.1n.

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

diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 06d83aa0d81d..b77267e3d098 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,6 +1,6 @@
 # Template file for 'openssl'
 pkgname=openssl
-version=1.1.1l
+version=1.1.1n
 revision=1
 bootstrap=yes
 build_style=configure
@@ -17,7 +17,7 @@ maintainer="John <johnz@posteo.net>"
 license="OpenSSL"
 homepage="https://www.openssl.org"
 distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
-checksum=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
+checksum=40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a
 conf_files="/etc/ssl/openssl.cnf"
 replaces="libressl>=0"
 

From c23efe670eb7c90a7da33eb44caf54ef0e7c1946 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 15:24:34 -0400
Subject: [PATCH 0242/2561] sublime-text3: replace with empty meta package

---
 srcpkgs/sublime-text3/INSTALL.msg |  4 ++++
 srcpkgs/sublime-text3/template    | 33 ++++++-------------------------
 2 files changed, 10 insertions(+), 27 deletions(-)
 create mode 100644 srcpkgs/sublime-text3/INSTALL.msg

diff --git a/srcpkgs/sublime-text3/INSTALL.msg b/srcpkgs/sublime-text3/INSTALL.msg
new file mode 100644
index 000000000000..cf4c4e70a7a9
--- /dev/null
+++ b/srcpkgs/sublime-text3/INSTALL.msg
@@ -0,0 +1,4 @@
+sublime-text3 is replaced with the restricted sublime-text3-bin
+package, due to its license that restricts redistribution.
+In order to install it you have to build it with xbps-src, please see:
+https://docs.voidlinux.org/xbps/repositories/restricted.html
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index c693768e6e4e..c077963863d3 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,36 +1,15 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=2
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="Sophisticated text editor for code, markup and prose"
+revision=3
+archs="i686 x86_64"
+build_style=meta
+short_desc="Empty meta-package for sublime-text3"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:Proprietary"
+license="custom:EULA" #no vlicense check
 homepage="http://www.sublimetext.com/3dev"
-
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
-	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
-else
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
-	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
-fi
-
 repository="nonfree"
-archs="i686 x86_64"
-wrksrc="sublime_text_3"
-nopie=yes
 
 do_install() {
-	vmkdir "usr/bin"
-	vmkdir "usr/lib/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
-	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
-	for size in 128 16 256 32 48; do
-		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
-		 "usr/share/icons/hicolor/${size}x${size}/apps/"
-	done
-	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
-	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg"  README.voidlinux
 }

From e66ba2adff53aef4a1300c940c556d60d719315b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 15:25:10 -0400
Subject: [PATCH 0243/2561] New package: sublime-text3-bin-3211

replaces sublime-text3
---
 srcpkgs/sublime-text3-bin/template | 55 ++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 srcpkgs/sublime-text3-bin/template

diff --git a/srcpkgs/sublime-text3-bin/template b/srcpkgs/sublime-text3-bin/template
new file mode 100644
index 000000000000..73d67ea9c631
--- /dev/null
+++ b/srcpkgs/sublime-text3-bin/template
@@ -0,0 +1,55 @@
+# Template file for 'sublime-text3-bin'
+pkgname=sublime-text3-bin
+version=3211
+revision=1
+archs="i686 x86_64"
+wrksrc="sublime_text_3"
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="Sophisticated text editor for code, markup and prose"
+maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
+license="custom:EULA"
+homepage="http://www.sublimetext.com/3dev"
+_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
+repository="nonfree"
+restricted=yes
+nopie=yes
+replaces="sublime-text3>0"
+
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
+	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+else
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
+	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
+fi
+
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+
+do_install() {
+	vmkdir "usr/bin"
+	vmkdir "usr/lib/sublime_text"
+	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
+	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+	for size in 128 16 256 32 48; do
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
+		 "usr/share/icons/hicolor/${size}x${size}/apps/"
+	done
+	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
+	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
+	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vlicense EULA
+}

From f6643c0fdbbe10e437dc7bdf7454b1847bc2071f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 4 Sep 2021 23:06:20 +0200
Subject: [PATCH 0244/2561] New package: gtksourceview5-5.2.0

---
 common/shlibs                   |  1 +
 srcpkgs/gtksourceview5-devel    |  1 +
 srcpkgs/gtksourceview5/template | 52 +++++++++++++++++++++++++++++++++
 srcpkgs/gtksourceview5/update   |  3 ++
 4 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/gtksourceview5-devel
 create mode 100644 srcpkgs/gtksourceview5/template
 create mode 100644 srcpkgs/gtksourceview5/update

diff --git a/common/shlibs b/common/shlibs
index 230fc6a994c0..83b5783cb026 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3497,6 +3497,7 @@ liblqr-1.so.0 liblqr-0.4.2_1
 libmozjs-78.so.0 mozjs78-78.1.0_1
 libebur128.so.1 libebur128-1.2.4_1
 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1
+libgtksourceview-5.so.0 gtksourceview5-5.2.0_1
 libwx_gtk3u_propgrid-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_qa-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_core-3.0.so.0 wxWidgets-gtk3-3.0.4_1
diff --git a/srcpkgs/gtksourceview5-devel b/srcpkgs/gtksourceview5-devel
new file mode 120000
index 000000000000..1aac62393079
--- /dev/null
+++ b/srcpkgs/gtksourceview5-devel
@@ -0,0 +1 @@
+gtksourceview5
\ No newline at end of file
diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
new file mode 100644
index 000000000000..c4c7d94f51e8
--- /dev/null
+++ b/srcpkgs/gtksourceview5/template
@@ -0,0 +1,52 @@
+# Template file for 'gtksourceview5'
+pkgname=gtksourceview5
+version=5.2.0
+revision=1
+wrksrc="gtksourceview-${version}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
+ $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala)
+ pcre2-devel"
+checkdepends="xvfb-run cantarell-fonts"
+short_desc="Text widget that extends GTK4 GtkTextView widget"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/GtkSourceView"
+changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-2/NEWS"
+distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
+checksum=c9b34fa02654f56ce22fa08827d89db4ba81631b2e6d7d31ea65d13c729430e9
+
+# Package build options
+build_options="gir gtk_doc"
+desc_option_gtk_doc="Build API docs via gtk-doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+gtksourceview5-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel libglib-devel
+	 libxml2-devel pcre2-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+	}
+}
diff --git a/srcpkgs/gtksourceview5/update b/srcpkgs/gtksourceview5/update
new file mode 100644
index 000000000000..4617ff233267
--- /dev/null
+++ b/srcpkgs/gtksourceview5/update
@@ -0,0 +1,3 @@
+pkgname="gtksourceview"
+pattern="$pkgname-\K5\.[0-9]*[02468]\.[0-9]*(?=)"
+ignore="*.99"

From bff8ff5c0e0fbc477e28cc4356a2fe8722fef88f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 6 Dec 2021 11:07:59 +0100
Subject: [PATCH 0245/2561] New package: gnome-text-editor-41.1

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

diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template
new file mode 100644
index 000000000000..f1e474fca5ff
--- /dev/null
+++ b/srcpkgs/gnome-text-editor/template
@@ -0,0 +1,16 @@
+# Template file for 'gnome-text-editor'
+pkgname=gnome-text-editor
+version=41.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext itstool glib-devel"
+makedepends="libglib-devel gtk4-devel gtksourceview5-devel enchant2-devel
+ icu-devel libadwaita-devel pcre2-devel"
+short_desc="Simple text editor"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/gnome-text-editor"
+changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/gnome-41/NEWS"
+distfiles="${GNOME_SITE}/gnome-text-editor/${version%.*}/gnome-text-editor-$version.tar.xz"
+checksum=619ec520d6e0905d431167024e43dce0dbf6a345f2d48693501d70dc7626f861
+make_check=no # Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting.

From f7fcff8c60587bae99a37c2179eaac22d0b867ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:05:48 +0100
Subject: [PATCH 0246/2561] NetworkManager: update to 1.36.2.

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

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 5483f5c8b35b..5502f41159d3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.34.0
+version=1.36.2
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ configure_args="-Dsystemd_journal=false
  -Dsuspend_resume=$(vopt_if elogind elogind upower)
  -Dconfig_dhcp_default=internal"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel docbook-xsl gtk-doc
+ intltool dbus-glib-devel docbook-xsl gtk-doc
  $(vopt_if gir 'vala python3-gobject')"
 makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
@@ -33,8 +33,9 @@ short_desc="Network Management daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd
+checksum=ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -58,6 +59,9 @@ post_patch() {
 			-e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" \
 			-e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \
 			src/libnm-client-impl/meson.build
+		# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/955
+		vsed -e "s#jansson_dep.get_pkgconfig_variable('libdir')#'${XBPS_CROSS_BASE}/usr/lib'#" \
+			-i meson.build
 	fi
 }
 

From a23f016d95d0027a7bec21f264616bfdfa07169d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 15 Mar 2022 23:11:07 +0100
Subject: [PATCH 0247/2561] google-chrome: update to 99.0.4844.74

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

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index f50d9caa3464..5516594f44f9 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,7 +1,7 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.51
-revision=2
+version=99.0.4844.74
+revision=1
 _channel=stable
 archs="x86_64"
 hostmakedepends="curl tar xz python3 python3-html2text python3-setuptools"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=a19354b3f8eee069cec49cdc44bea43d7f0cbddf6a94bb49c1e221a4ee757812
+checksum=0444893153d4b3b628c6465c48e7c49f06649b101ce5ab066d59b14c363ef9f7
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 123935a962481d4ac0a1798eae8d3960cc691dad Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Tue, 8 Mar 2022 10:50:56 +0100
Subject: [PATCH 0248/2561] nwg-launchers: add gtk-layer-shell to makedepends

This dependancy makes nwg-launchers work better under wayland compositors,
by enabling layer-shell support.
---
 srcpkgs/nwg-launchers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nwg-launchers/template b/srcpkgs/nwg-launchers/template
index 0f394bff2582..acf5bfc58349 100644
--- a/srcpkgs/nwg-launchers/template
+++ b/srcpkgs/nwg-launchers/template
@@ -1,10 +1,10 @@
 # Template file for 'nwg-launchers'
 pkgname=nwg-launchers
 version=0.6.3
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel json-c++"
+makedepends="gtkmm-devel gtk-layer-shell-devel json-c++"
 short_desc="GTK-based launchers for window managers"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"

From c14ca21c49480cff014cd49da97f1d69cf3d15fe Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 22 Feb 2022 09:15:54 +0100
Subject: [PATCH 0249/2561] vscode: update to 1.65.2

---
 .../patches/disable-crash-reporter.patch      | 14 -------
 srcpkgs/vscode/patches/product.patch          |  9 ++--
 srcpkgs/vscode/patches/ripgrep.patch          | 42 +++++++++----------
 srcpkgs/vscode/template                       | 15 ++++---
 4 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch
index d91f6895969c..dac81e3341c4 100644
--- a/srcpkgs/vscode/patches/disable-crash-reporter.patch
+++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch
@@ -13,20 +13,6 @@ So, disable it entirely. No cookies for you, Visual Studio Code team.
  src/vs/code/electron-main/app.ts |  2 +-
  3 files changed, 1 insertion(+), 20 deletions(-)
 
-diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js
-index f7b07e49255..576c82f23e8 100644
---- a/src/bootstrap-fork.js
-+++ b/src/bootstrap-fork.js
-@@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) {
- 	terminateWhenParentTerminates();
- }
- 
--// Configure Crash Reporter
--configureCrashReporter();
--
- // Load AMD entry point
- require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']);
- 
 diff --git a/src/main.js b/src/main.js
 index ad838aa245e..e6319e100b9 100644
 --- a/src/main.js
diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index edeebf5d1439..a7e2b79925bf 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,19 +1,18 @@
 diff --git a/product.json b/product.json
-index 22e93d4b7c3..335cddd4c7c 100644
+index 9d630f23cd7..eea95dce319 100644
 --- a/product.json
 +++ b/product.json
-@@ -25,13 +25,22 @@
+@@ -27,6 +27,9 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
 +	"quality": "stable",
 +	"documentationUrl": "https://github.com/microsoft/vscode-docs",
 +	"requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/c42793d0357ff9c6589cce79a847177fd42852ee/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/",
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
- 		"ms-vscode.vscode-js-profile-table",
-+		"ms-python.python",
+@@ -34,6 +37,11 @@
  		"GitHub.remotehub",
  		"GitHub.remotehub-insiders"
  	],
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index 6e81145a1cb1..ff0dfc233e41 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -1,32 +1,32 @@
-Ping q66 if this needs updating.
+Ping atk if this needs updating.
 
 This prevents vscode from fetching prebuilt ripgrep from Microsoft
 during build, which unbreaks build on platforms where MS deos not
 ship a prebuilt ripgrep.
 
 diff --git a/package.json b/package.json
-index 6d1fb7cca0c..057ed39ac31 100644
+index 5d6022a2a40..f66ee44eef0 100644
 --- a/package.json
 +++ b/package.json
-@@ -83,7 +83,7 @@
-     "vscode-oniguruma": "1.6.1",
-     "vscode-proxy-agent": "^0.11.0",
-     "vscode-regexpp": "^3.1.0",
--    "vscode-ripgrep": "^1.12.1",
-+    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.5.0",
-     "xterm": "4.16.0-beta.2",
-     "xterm-addon-search": "0.9.0-beta.6",
+@@ -63,7 +63,7 @@
+     "@parcel/watcher": "2.0.5",
+     "@vscode/debugprotocol": "1.51.0",
+     "@vscode/iconv-lite-umd": "0.7.0",
+-    "@vscode/ripgrep": "^1.14.1",
++    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
+     "@vscode/sqlite3": "4.0.12",
+     "@vscode/sudo-prompt": "9.3.1",
+     "@vscode/vscode-languagedetection": "1.0.21",
 diff --git a/remote/package.json b/remote/package.json
-index 662ce3568ab..a79fe3764d9 100644
+index 4bc40998093..9d22d408c02 100644
 --- a/remote/package.json
 +++ b/remote/package.json
-@@ -22,7 +22,7 @@
-     "vscode-oniguruma": "1.6.1",
-     "vscode-proxy-agent": "^0.11.0",
-     "vscode-regexpp": "^3.1.0",
--    "vscode-ripgrep": "^1.12.1",
-+    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.5.0",
-     "xterm": "4.16.0-beta.2",
-     "xterm-addon-search": "0.9.0-beta.6",
+@@ -6,7 +6,7 @@
+     "@microsoft/applicationinsights-web": "^2.6.4",
+     "@parcel/watcher": "2.0.5",
+     "@vscode/iconv-lite-umd": "0.7.0",
+-    "@vscode/ripgrep": "^1.14.1",
++    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
+     "@vscode/vscode-languagedetection": "1.0.21",
+     "applicationinsights": "1.4.2",
+     "cookie": "^0.4.0",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 97f1a142a814..620c9a6928aa 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,17 +1,17 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.63.2
+version=1.65.2
 revision=1
-_electronver=13.6.1
-hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
-makedepends="libxkbfile-devel libsecret-devel electron13"
-depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
+_electronver=13.6.7
+hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep"
+makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13"
+depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
 short_desc="Microsoft Code for Linux"
-maintainer="shizonic <realtiaz@gmail.com>"
+maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=21fc9bc17ba4cf480b1e006f298363d86215c339c480f8d781cabcfedad2d624
+checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -61,7 +61,6 @@ do_install() {
 	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop
 	vmkdir usr/share/pixmaps
 	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png
-	ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
 	vsed \
 	-e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
 	-e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \

From 744da894729460ad3eb848d97c71ae29c7f89ae6 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 09:40:04 +0100
Subject: [PATCH 0250/2561] geonkick: update to 2.9.0.

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

diff --git a/srcpkgs/geonkick/template b/srcpkgs/geonkick/template
index 79f8ba451959..af8ea0fa8190 100644
--- a/srcpkgs/geonkick/template
+++ b/srcpkgs/geonkick/template
@@ -1,6 +1,6 @@
 # Template file for 'geonkick'
 pkgname=geonkick
-version=2.8.1
+version=2.9.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config tar xz"
@@ -10,9 +10,9 @@ short_desc="Free software percussion synthesizer"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/free-sm/geonkick"
-changelog="https://github.com/free-sm/geonkick/blob/main/NEWS.md"
+changelog="https://raw.githubusercontent.com/free-sm/geonkick/main/NEWS.md"
 distfiles="https://github.com/free-sm/geonkick/archive/refs/tags/v${version}.tar.gz"
-checksum=813fb10709136ed79403c8baf3d847fce9fbf717fea3c194ad2952e0172e6d45
+checksum=54968894e3fab1ad1b7a92e12cdb5041ca39a22842c8e815a443f50cbcc4dc5b
 
 if [ ${CROSS_BUILD} ]; then
 	configure_args+=" -DGKICK_ARCHITECTURE=$XBPS_TARGET_MACHINE"

From d8e21d8188b9764965a7a6402ddb4ca7fd4c26e0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 16 Mar 2022 14:55:31 +0100
Subject: [PATCH 0251/2561] libtls: update to 3.4.3.

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

diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 42f33db208a6..f8217c020c65 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,6 +1,6 @@
 # Template file for 'libtls'
 pkgname=libtls
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="libressl-${version}"
 build_style=gnu-configure
@@ -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=cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce
+checksum=ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d
 _lssl_asm_ver="1.2.0"
 replaces="libtls20>0"
 

From b33dbf437325b26e8ba5021766b20b6e27ca2515 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 16 Mar 2022 18:34:42 +0100
Subject: [PATCH 0252/2561] flatpak: update to 1.12.7.

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

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 2682c5ce96c8..7820788874be 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak'
 pkgname=flatpak
-version=1.12.6
+version=1.12.7
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -23,7 +23,7 @@ license="LGPL-2.1-or-later"
 homepage="https://flatpak.org/"
 changelog="https://github.com/flatpak/flatpak/raw/main/NEWS"
 distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=ef02cb505b91cce5173099b5485768eef1899ebcf39edf827c4254163a811627
+checksum=6db52a531ce278282ac7ebfb99f66a0bb3eccaf44e864844c2c95c1ee5ba9316
 
 build_options="gir"
 build_options_default="gir"

From 7978fdc1cfac91d90ecf0bfeb3d18137c8d5f2fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:51:15 +0100
Subject: [PATCH 0253/2561] tali: update to 40.5.

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

diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index bfd640177d27..3e50e64f96fc 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -1,14 +1,13 @@
 # Template file for 'tali'
 pkgname=tali
-version=3.38.3
+version=40.5
 revision=1
 build_style=meson
-hostmakedepends="cmake pkg-config gettext glib-devel appstream-glib
- desktop-file-utils itstool"
+hostmakedepends="pkg-config gettext glib-devel itstool"
 makedepends="gtk+3-devel libgnome-games-support-devel"
 short_desc="GNOME sort of poker game with dice"
 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"
-checksum=0215428b50c4a0827fb0de2e4e6ba6e56678f9ba76d8d25b7eeca85215f25a39
+checksum=63a09c55e46a1a19756bf5e0957caf994300fadabdba6bda602e668dfcdf7122

From 226dab218f59260f9a013893fde4cdd119de1a06 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:20:44 +0100
Subject: [PATCH 0254/2561] pangomm2.48: update to 2.50.0.

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

diff --git a/srcpkgs/pangomm2.48/template b/srcpkgs/pangomm2.48/template
index 291837c42612..d46d232ea53f 100644
--- a/srcpkgs/pangomm2.48/template
+++ b/srcpkgs/pangomm2.48/template
@@ -1,6 +1,6 @@
 # Template file for 'pangomm2.48'
 pkgname=pangomm2.48
-version=2.48.1
+version=2.50.0
 revision=1
 wrksrc="pangomm-$version"
 build_style=meson
@@ -10,8 +10,9 @@ short_desc="C++ bindings for the pango library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
+changelog="https://gitlab.gnome.org/GNOME/pangomm/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/pangomm/${version%.*}/pangomm-${version}.tar.xz"
-checksum=776ad53e791e43106b7f40ff0834bee6e4eb1c6ad7cb6d215546f7a3df0edc4d
+checksum=a27aa77e017b9afce9e751d85bd1cf890abbb3a58bf59d0fac917eef82db3b5b
 
 pangomm2.48-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From e3ab7a02b2fe8efc8fc08c2105cbc0def6eef277 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:25:52 +0100
Subject: [PATCH 0255/2561] zathura: fix distfiles 404

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

diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index 3f456aa370ff..c93fbc062cee 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -12,9 +12,9 @@ checkdepends="gettext-devel check-devel"
 short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="https://pwmt.org/projects/zathura"
-distfiles="${homepage}/download/zathura-${version}.tar.xz"
-checksum=fc30c42cd660d993bce8758e22e4ba8078761d51f1e29494e7a0d37a8a3e5e57
+homepage="https://git.pwmt.org/pwmt/zathura/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=82235cbc89899421fca98477265626f2149df7d072740f0360550cc8d4e449d6
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=enabled"

From 41b898a473b884e8ee0c5250fbe456480fe50757 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:25:54 +0100
Subject: [PATCH 0256/2561] zathura-ps: fix distfiles 404

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

diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..e17da900762c 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -9,9 +9,9 @@ depends="zathura ghostscript"
 short_desc="PostScript support for zathura"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-ps/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+homepage="https://git.pwmt.org/pwmt/zathura-ps/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=e7092c831e345002edc87321911faa27c5dc3210dd6e3939dfbc49192a54d35e
 
 post_install() {
 	vlicense LICENSE

From ef3225cbc3d11b688a7842e1fd91bbc757672560 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:25:57 +0100
Subject: [PATCH 0257/2561] zathura-djvu: fix distfiles 404

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

diff --git a/srcpkgs/zathura-djvu/template b/srcpkgs/zathura-djvu/template
index 80ce14959c2a..733475923712 100644
--- a/srcpkgs/zathura-djvu/template
+++ b/srcpkgs/zathura-djvu/template
@@ -9,9 +9,9 @@ depends="zathura"
 short_desc="DjVu support for zathura"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-djvu/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=96e6f8a6ee53231073b2f7003264872f84501e63c3da7bf0598d046286b0c200
+homepage="https://git.pwmt.org/pwmt/zathura-djvu/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=84fae6da42e7cdc2e49ed4cd4f0315ac09716e95358b9c7487803a2cff47dbca
 
 post_install() {
 	vlicense LICENSE

From 95bc60b7af51e4d94c28f50a4b7929be299666b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:26:05 +0100
Subject: [PATCH 0258/2561] zathura-cb: fix distfiles 404

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

diff --git a/srcpkgs/zathura-cb/template b/srcpkgs/zathura-cb/template
index 80d700895c54..4cfed7b4d6f0 100644
--- a/srcpkgs/zathura-cb/template
+++ b/srcpkgs/zathura-cb/template
@@ -9,9 +9,9 @@ depends="zathura"
 short_desc="Comic book support for zathura"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-cb/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=3ad7619449987fd2e0203644f7487e073000b022a8b80bdd1df52147424b40d6
+homepage="https://git.pwmt.org/pwmt/zathura-cb/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=30d2cea3b1eb65e7386eb66ec305e455b2bed272c35530faaec541b47217fdcd
 
 post_install() {
 	vlicense LICENSE

From 1167133920819c6e5cc0c7097226407a0efe1553 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:26:15 +0100
Subject: [PATCH 0259/2561] zathura-pdf-mupdf: fix distfiles 404

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

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index e2afbf966505..9f973214cf83 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -12,9 +12,9 @@ depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+homepage="https://git.pwmt.org/pwmt/zathura-pdf-mupdf/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=3f2d341dfe3bdbfb7a51a33aee81f3763a684d0ea503dd20c726311125d7c08a
 conflicts="zathura-pdf-poppler>=0"
 
 post_install() {

From 4c7ab4aa3c81779752b35e36a01c71d2f4b3db0f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:26:18 +0100
Subject: [PATCH 0260/2561] zathura-pdf-poppler: fix distfiles 404

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

diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template
index 9c174c61fab0..d638f659a507 100644
--- a/srcpkgs/zathura-pdf-poppler/template
+++ b/srcpkgs/zathura-pdf-poppler/template
@@ -9,9 +9,9 @@ depends="zathura"
 short_desc="PDF support for zathura (using poppler)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-pdf-poppler/"
-distfiles="https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${version}.tar.xz"
-checksum=d5cc3a7dae49471b85b503bbb9049c6f8d10903f4a611d721a2e0fefe726d4ed
+homepage="https://git.pwmt.org/pwmt/zathura-pdf-poppler/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=2034f70a936d458ddc9276f769e77ff308ba3bb1b7a7cdc87bab8b9ef7ade84a
 
 conflicts="zathura-pdf-mupdf>=0"
 

From 4c4bbe6472d1982caae5d9dbcd4480952c974857 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:48:52 +0100
Subject: [PATCH 0261/2561] certbot: update to 1.25.0.

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

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 63432609805f..aa8de157d59b 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.24.0
+version=1.25.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=ba19713ff22c4ac0939c7863986d673d0a45209340f80b1bc6a301d278580be3
+checksum=9633d21051fe7fd076d64cb41963de61d300d7c30f4b491c8d18cb8306357509

From 059e8e663658266418e58476e819787d6ad8d489 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:48:56 +0100
Subject: [PATCH 0262/2561] certbot-apache: update to 1.25.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 cf9eb1c6fd70..1f5c098c802d 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.24.0
+version=1.25.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=d432e6b748ae3d12a794da2a90d3a40a054bcc36c4ff63c303766a685f48b324
+checksum=91dbd326c5ee4fe7a2ef5f1c3c525863a7f4ed5f228e1c7c10048d18fe18d0a1

From c16b388f15dbbe6ff992aa26de3458bc53a420a6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:48:58 +0100
Subject: [PATCH 0263/2561] certbot-nginx: update to 1.25.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 3cd8fb59c303..b635785e5d0a 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.24.0
+version=1.25.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=192843768cf50e07c133efd79c4cae8b689d986c2f952173875fa0717a0cbaf7
+checksum=433a7237e841c462a67f9195fb7d7711ac6ed6d27bedb981c71238ef5348d62b

From 7658d93d402147aba174692805523138ec2a0e6c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:49:03 +0100
Subject: [PATCH 0264/2561] python3-acme: update to 1.25.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 20fbf978b912..19e374d105a8 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.24.0
+version=1.25.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=63161f442d7c995313305663ad2eef6b3f770899c3f635e1c1f1d0141696b298
+checksum=e3fbe36fcfa27ec46f450369498f3486370ab53a0fd7db91557a23d58b3969fa

From d0eee7901ba711990d9cfc01f6a6a101a7b2d0f8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:49:06 +0100
Subject: [PATCH 0265/2561] python3-josepy: update to 1.13.0.

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

diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index 4130d629dc3b..6df2673629f2 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
-version=1.12.0
+version=1.13.0
 revision=1
 wrksrc="josepy-${version}"
 build_style=python3-module
@@ -11,8 +11,9 @@ short_desc="JOSE protocol implementation in Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/josepy"
+changelog="https://raw.githubusercontent.com/certbot/josepy/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/j/josepy/josepy-${version}.tar.gz"
-checksum=267004a64f08c016cd54b7aaf7c323fa3ef3679fb62f4b086cd56448d0fecb25
+checksum=8931daf38f8a4c85274a0e8b7cb25addfd8d1f28f9fb8fbed053dd51aec75dc9
 
 pre_check() {
 	vsed -e '/addopts/d' -i pytest.ini

From c879624975dc0289e22f6b9700ab6df11ace984f Mon Sep 17 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, 10 Mar 2022 21:30:02 +0700
Subject: [PATCH 0266/2561] nss: update to 3.76.

---
 srcpkgs/nss/patches/D136289.patch            | 43 --------------------
 srcpkgs/nss/patches/cpputil-databuffer.patch | 20 +++++++++
 srcpkgs/nss/template                         |  4 +-
 3 files changed, 22 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/nss/patches/D136289.patch
 create mode 100644 srcpkgs/nss/patches/cpputil-databuffer.patch

diff --git a/srcpkgs/nss/patches/D136289.patch b/srcpkgs/nss/patches/D136289.patch
deleted file mode 100644
index a6d380515504..000000000000
--- a/srcpkgs/nss/patches/D136289.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1750624
-diff --git a/nss/tests/chains/chains.sh b/nss/tests/chains/chains.sh
---- a/nss/tests/chains/chains.sh
-+++ b/nss/tests/chains/chains.sh
-@@ -917,7 +917,7 @@
-     done
- 
-     VFY_OPTS_TNAME="${DB_OPT} ${ENGINE} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${TRUST_OPT}"
--    VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
-+    VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${VFY_TIME_OPT} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
- 
-     TESTNAME="Verifying certificate(s) ${VFY_LIST} with flags ${VFY_OPTS_TNAME}"
-     echo "${SCRIPTNAME}: ${TESTNAME}"
-@@ -1118,6 +1118,7 @@
-             ;;
-         "verify")
-             VERIFY="${VALUE}"
-+            VFY_TIME_OPT=
-             TRUST=
-             TRUST_AND_DB=
-             POLICY=
-@@ -1126,6 +1127,9 @@
-             REV_OPTS=
-             USAGE_OPT=
-             ;;
-+        "at_time")
-+            VFY_TIME_OPT="-b ${VALUE}"
-+            ;;
-         "cert")
-             VERIFY="${VERIFY} ${VALUE}"
-             ;;
-diff --git a/nss/tests/chains/scenarios/realcerts.cfg b/nss/tests/chains/scenarios/realcerts.cfg
---- a/nss/tests/chains/scenarios/realcerts.cfg
-+++ b/nss/tests/chains/scenarios/realcerts.cfg
-@@ -22,6 +22,7 @@
- 
- verify PayPalEE:x
-   policy OID.2.16.840.1.114412.2.1 
-+  at_time 2201010000Z
-   result pass
- 
- verify BrAirWaysBadSig:x
-
diff --git a/srcpkgs/nss/patches/cpputil-databuffer.patch b/srcpkgs/nss/patches/cpputil-databuffer.patch
new file mode 100644
index 000000000000..44dd3f467882
--- /dev/null
+++ b/srcpkgs/nss/patches/cpputil-databuffer.patch
@@ -0,0 +1,20 @@
+Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1758478
+diff --git a/nss/cpputil/databuffer.h b/nss/cpputil/databuffer.h
+index 8d34e1a..6aee509 100644
+--- a/nss/cpputil/databuffer.h
++++ b/nss/cpputil/databuffer.h
+@@ -33,11 +33,9 @@ class DataBuffer {
+     return *this;
+   }
+   DataBuffer& operator=(DataBuffer&& other) {
+-    if (this == &other) {
+-      data_ = other.data_;
+-      len_ = other.len_;
+-      other.data_ = nullptr;
+-      other.len_ = 0;
++    if (this != &other) {
++      std::swap(data_, other.data_);
++      std::swap(len_, other.len_);
+     }
+     return *this;
+   }
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 52ce1074b303..f85cfe79a868 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.75
+version=3.76
 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=fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582
+checksum=1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From da358ef4f77a4b4a2a878ae63e48edbace7cf7a5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 16 Mar 2022 15:26:02 +0200
Subject: [PATCH 0267/2561] skype: update to 8.82.0.403.

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

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index b0cfc9ea66c1..7760c535079c 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.81.0.268
+version=8.82.0.403
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=0a701bee1be8b2b0872696f3fea1c429635b6dfd738b86978f9b81d238f35118
+checksum=df903a805c3db301d8846e5fcfe2ec5acbea720c49f3031edb50d416f5a52a24
 repository="nonfree"
 nostrip="yes"
 

From a05a8c5a6c81e941f5445d9e5f6b87c5da9f574e Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Wed, 9 Mar 2022 18:50:40 +0100
Subject: [PATCH 0268/2561] python3-docutils: update to 0.18.1.

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

diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
index 0600a65a729b..13bc5f4d7c33 100644
--- a/srcpkgs/python3-docutils/template
+++ b/srcpkgs/python3-docutils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-docutils'
 pkgname=python3-docutils
-version=0.17.1
-revision=2
+version=0.18.1
+revision=1
 wrksrc="docutils-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
 homepage="http://docutils.sourceforge.net"
 distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+checksum=679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06
 
 alternatives="
  docutils:rst2html:/usr/bin/rst2html.py

From f0e620db7ec794e89e5c483f8c1445a026edbcc0 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 15 Mar 2022 21:12:07 +0400
Subject: [PATCH 0269/2561] python3-curl: update to 7.45.1.

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

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index ea7831c2f087..7a728a5ff62d 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
-version=7.45.0
+version=7.45.1
 revision=1
 wrksrc="pycurl-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="LGPL-2.1-or-later, MIT"
 homepage="http://pycurl.io/"
 changelog="https://raw.githubusercontent.com/pycurl/pycurl/master/ChangeLog"
 distfiles="${PYPI_SITE}/p/pycurl/pycurl-${version}.tar.gz"
-checksum=5036c53c6f4106e9160d053a4baa3433a0215fb3386073e211273c56a3a95f3d
+checksum=a863ad18ff478f5545924057887cdae422e1b2746e41674615f687498ea5b88a
 
 pre_build() {
 	vsed -i "/setup_args\['data_files'\] = /d" setup.py

From 6c6f5e64c6e0ff33a0b47830334e68229b7ff138 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 16 Mar 2022 19:45:56 +0400
Subject: [PATCH 0270/2561] python3-regex: update to 2022.3.15.

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

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 6e31d60343e8..57e5b7f4fb02 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2022.3.2
+version=2022.3.15
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=79e5af1ff258bc0fe0bdd6f69bc4ae33935a898e3cbefbbccf22e88a27fa053b
+checksum=0a7b75cc7bb4cc0334380053e4671c560e31272c9d2d5a6c4b8e9ae2c9bd0f82
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 13d992cd9f52506ed795309a5403dd9dad407e24 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Thu, 17 Feb 2022 16:13:22 +0100
Subject: [PATCH 0271/2561] python3-pikepdf: update to 5.0.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 bc4dc5911630..ae0b2ee09ba5 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=4.4.1
+version=5.0.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -14,7 +14,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=c25d4c7673f9588d1f98bca498db98ba675070dc89ffffe50b3b124d4a005df9
+checksum=5fae9eeb7a0120d466fb219aea643a94a1423d68ee9171639a44cf0329ebe7aa
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 88f3b2e567fd0ec6bc4d22c64a82eb543867c718 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:53:29 -0400
Subject: [PATCH 0272/2561] python3: update to 3.10.3.

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

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 85cd88971a4d..df408f9ed74d 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.10.2
+version=3.10.3
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -22,7 +22,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=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7
+checksum=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From 3ae77052ef66c1800ed09d73e4d0c4cfaf3c9539 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:54:49 -0400
Subject: [PATCH 0273/2561] python3-tkinter: update to 3.10.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 3c7ecb8cfd82..bfe219597ff5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.10.2
+version=3.10.3
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -29,7 +29,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=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7
+checksum=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"

From ec05d4869fb3196438737c18793c26e7cf8ac0c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:55:04 -0400
Subject: [PATCH 0274/2561] python3-MarkupSafe: update to 2.1.1.

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

diff --git a/srcpkgs/python3-MarkupSafe/template b/srcpkgs/python3-MarkupSafe/template
index d298c3f318bd..3f1b6a839d0f 100644
--- a/srcpkgs/python3-MarkupSafe/template
+++ b/srcpkgs/python3-MarkupSafe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-MarkupSafe'
 pkgname=python3-MarkupSafe
-version=2.1.0
+version=2.1.1
 revision=1
 wrksrc="MarkupSafe-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://palletsprojects.com/p/markupsafe/"
 distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
-checksum=80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f
+checksum=7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b
 
 post_install() {
 	vlicense LICENSE.rst

From 8d1532d53b34c0bbe28917770b30c61f8792245c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:55:14 -0400
Subject: [PATCH 0275/2561] python3-cppy: update to 1.2.0.

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

diff --git a/srcpkgs/python3-cppy/template b/srcpkgs/python3-cppy/template
index de7943af84f5..3afd8399c77a 100644
--- a/srcpkgs/python3-cppy/template
+++ b/srcpkgs/python3-cppy/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-cppy'
 pkgname=python3-cppy
-version=1.1.0
-revision=2
+version=1.2.0
+revision=1
 wrksrc="cppy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="C++ headers to make it easier to write Python C extensions"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://cppy.readthedocs.io"
 changelog="https://raw.githubusercontent.com/nucleic/cppy/master/releasenotes.rst"
 distfiles="${PYPI_SITE}/c/cppy/cppy-${version}.tar.gz"
-checksum=4eda6f1952054a270f32dc11df7c5e24b259a09fddf7bfaa5f33df9fb4a29642
+checksum=95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc
 
 post_install() {
 	vlicense LICENSE

From 8ccea11f84be6ce5349eac49aaeb1ee5309d9eb2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:55:45 -0400
Subject: [PATCH 0276/2561] python3-cryptography_vectors: update to 36.0.2.

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

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 152ad12ebdde..c31863f52ad7 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
-version=36.0.0
-revision=2
+version=36.0.2
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,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=c6b7e53ec701f47497297cfcfbafdf81a3f76f6f9d684721ef3dea254301faa5
+checksum=2a7924449a03025faf7f8754a6f4200001cab210734a6ce6ac1f6bdacd3a68e4
 
 post_install() {
 	vlicense LICENSE

From 4e53138ccacc603845c5c4ae2504d1142af0ea09 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:57:51 -0400
Subject: [PATCH 0277/2561] python3-cryptography: update to 36.0.2.

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

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 40c226de9f8c..278446d27efb 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=36.0.0
+version=36.0.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=52f769ecb4ef39865719aedc67b4b7eae167bafa48dbc2a26dd36fa56460507f
+checksum=70f8f4f7bb2ac9f340655cbac89d68c527af5bb4387522a8413e841e3e6628c9
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 525e4d9f25a600cc688a36822826722c3395db0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:00:01 -0400
Subject: [PATCH 0278/2561] python3-pywt: update to 1.3.0.

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

diff --git a/srcpkgs/python3-pywt/template b/srcpkgs/python3-pywt/template
index 3fdb9e576558..cb3cad5d80d6 100644
--- a/srcpkgs/python3-pywt/template
+++ b/srcpkgs/python3-pywt/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pywt'
 pkgname=python3-pywt
-version=1.2.0
+version=1.3.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/PyWavelets/pywt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ad88e5745eeaccaf759287f11b63539353df31324fe7498d9f8121e01e4106ed
+checksum=6dc7e55a2d7c415262eb212a2fbbb0e3aa19572fecd5cebcef72b810ac11d4ae
 
 do_check() {
 	(cd build/lib* && python3 -m pytest pywt/tests)

From ac3e12f657de03aa04b91a27c1f13cee63fda9e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:00:13 -0400
Subject: [PATCH 0279/2561] python3-tifffile: update to 2022.3.16.

---
 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 d7a735438e5b..00d4c6c3f391 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.2.9
+version=2022.3.16
 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=901f11169c2aa94c6b3cd9af2998de4b169d33210f78ae08a9acd21a231ebb7e
+checksum=2e51c805be3a77f472c0cca3f0c13e60eb110fbfc305a20e278dad3d4e4fe4bf
 # Tests require unpackaged fsspec
 make_check=no
 

From e94ae669e265d6bd500e644f50ee0eda39ab7615 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:02:25 -0400
Subject: [PATCH 0280/2561] maturin: update to 0.12.11.

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

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index a7de61b7704a..a6c1cbdd3d71 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.10
+version=0.12.11
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="764d91bb35a41d0fa389f3e8179353c0a7e173fbb52c6d434e2877951f15e4a4
+checksum="4d39f15fae9c01f2f23a544fc26b20c68693ec03f820b30ca5f505647c452be1
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From a7fd2b219ca5779ef7279cc100a11c586df1d36d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:06:09 -0400
Subject: [PATCH 0281/2561] python3-pyzmq: ignore beta releases

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

diff --git a/srcpkgs/python3-pyzmq/update b/srcpkgs/python3-pyzmq/update
new file mode 100644
index 000000000000..e9b0a0a5ea4c
--- /dev/null
+++ b/srcpkgs/python3-pyzmq/update
@@ -0,0 +1 @@
+ignore="*b*"

From 4585ae49ce73ba1ab436cfce29811a0726286fd1 Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Wed, 9 Mar 2022 18:44:49 +0100
Subject: [PATCH 0282/2561] python3-setuptools: update to 60.9.3.

Closes: #36067 [via git-merge-pr]
---
 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 a17da25edcac..1c21c918978d 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=60.5.0
+version=60.9.3
 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=2404879cda71495fc4d5cbc445ed52fdaddf352b36e40be8dcc63147cb4edabe
+checksum=2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;

From d64a2361b1a15d21247703b859d5b81edd0d5281 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 22 Feb 2022 01:59:54 +0100
Subject: [PATCH 0283/2561] python3-pulsectl: update to 22.1.3.

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

diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template
index 006363a1c5d4..2c2a985b0b39 100644
--- a/srcpkgs/python3-pulsectl/template
+++ b/srcpkgs/python3-pulsectl/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-pulsectl'
 pkgname=python3-pulsectl
-version=20.5.1
-revision=2
+version=22.1.3
+revision=1
 wrksrc="pulsectl-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"
+checkdepends="pulseaudio"
 short_desc="Python3 high-level interfaces and ctypes bindings for libpulse"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mk-fg/python-pulse-control"
 changelog="https://github.com/mk-fg/python-pulse-control/raw/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/pulsectl/pulsectl-${version}.tar.gz"
-checksum=39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db
+checksum=f28fe4b881dd2cc144d2d94f83ec60d8c59a52642a0ad3635cc4d0f8406f4858
 
 post_install() {
 	vlicense COPYING

From 45021ff4d74ab399db09d66269ae7be6412d91cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 18:01:31 +0100
Subject: [PATCH 0284/2561] doctl: update to 1.71.0.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 8dd3efe61c68..0580a504f27e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.70.0
+version=1.71.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=527a0d02acb303ca3e55c28db162acbc018fb77ca9e77d9298fece2124774c32
+checksum=62a14c05bd4b8442f0a610f9eba7237fe67e1afc397750893cdf2b741aebfd54

From 1983d76ca7819bc48a611e90cba4de170ab8af69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:28:55 +0100
Subject: [PATCH 0285/2561] qpdf: update to 10.6.3.

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

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 83b293d0ac77..324de5aefaa2 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=10.6.2
+version=10.6.3
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://github.com/qpdf/qpdf"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/stable/manual/release-notes.rst"
 distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
-checksum=e8f8f7f09fe3b9d1f98907e4a0cb7fddb4f0f9b8084e7e3201a571334e686c8c
+checksum=64bbb654ec19b6812284ef1bc40c57b091de5281f265f1c3c83dd8ccf6bedcf5
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 25ab3c4abdafaf48ef7eae0ca8176de58d70afac Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 17 Mar 2022 16:06:11 +0100
Subject: [PATCH 0286/2561] libguestfs: update to 1.48.0.

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

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 5ac1d1d2b8ee..8d669017077e 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
-version=1.46.2
-revision=2
+version=1.48.0
+revision=1
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"
@@ -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=e6ea69ca521d60f0c54bd6d3daf1f591cc62e1105dc253897152489aa348006b
+checksum=1681fddedfcf484ca6deec54230330a32defbd30c2ab1f81788e252cb5d04829
 
 conf_files="etc/libguestfs-tools.conf"
 

From a452ec2e579bf79cccaff74fc475f2c2450686da Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 1 Mar 2022 13:38:42 +0100
Subject: [PATCH 0287/2561] lrzip: update to 0.650.

* enable ASM for x86
* liblrzip is deprecated
---
 srcpkgs/liblrzip                  |  1 -
 srcpkgs/lrzip-devel               |  1 -
 srcpkgs/lrzip/template            | 27 ++++++++++-----------------
 srcpkgs/removed-packages/template |  4 +++-
 4 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/liblrzip
 delete mode 120000 srcpkgs/lrzip-devel

diff --git a/srcpkgs/liblrzip b/srcpkgs/liblrzip
deleted file mode 120000
index ce2559e2110e..000000000000
--- a/srcpkgs/liblrzip
+++ /dev/null
@@ -1 +0,0 @@
-lrzip
\ No newline at end of file
diff --git a/srcpkgs/lrzip-devel b/srcpkgs/lrzip-devel
deleted file mode 120000
index ce2559e2110e..000000000000
--- a/srcpkgs/lrzip-devel
+++ /dev/null
@@ -1 +0,0 @@
-lrzip
\ No newline at end of file
diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template
index 2ec52997c8e8..1b492e9e6c6c 100644
--- a/srcpkgs/lrzip/template
+++ b/srcpkgs/lrzip/template
@@ -1,6 +1,6 @@
 # Template file for 'lrzip'
 pkgname=lrzip
-version=0.641
+version=0.650
 revision=1
 build_style="gnu-configure"
 hostmakedepends="perl automake libtool"
@@ -10,25 +10,18 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lrzip.kolivas.org/"
 distfiles="https://github.com/ckolivas/lrzip/archive/v${version}.tar.gz"
-checksum=9b6b4bb1ae76dafbaab96ec9d50d41af5fed45a6c4f2e06feea828c2cd8025c0
+checksum=e07b2b3511689e4aaf7404d289feba5d9d6e1170c448f85e393a11249502dd66
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*) hostmakedepends+=" nasm";;
+esac
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
 
-lrzip-devel_package() {
-	short_desc+=" - development files"
-	depends="liblrzip-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
-liblrzip_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-	}
+# The library is deprecated as of lrzip 0.650.
+post_install() {
+	rm -f ${DESTDIR}/usr/include/Lrzip.h
+	rm -f ${DESTDIR}/usr/lib/pkgconfig/lrzip.pc
 }
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6a744198712d..c23125bb0cb4 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=65
+revision=66
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -211,6 +211,7 @@ replaces="
  libgksu<=2.0.12_5
  libglib-static<=2.58.3_5
  libgtkhtml<=4.10.0_1
+ liblrzip<=0.641_1
  libmagick6-devel<=6.9.12.12_2
  libmagick6-perl<=6.9.12.12_2
  libmagick6<=6.9.12.12_2
@@ -228,6 +229,7 @@ replaces="
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  lprng<=3.8.C_1
+ lrzip-devel<=0.641_1
  ls++-git<=20140919_3
  luxmark<=3.1_9
  luxrays-devel<=3.1_18

From 132808d7291d906ed1793754744b0264320ad697 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Mar 2022 20:13:45 +0100
Subject: [PATCH 0288/2561] sigil: update to 1.9.2.

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

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 47b8b14dd330..5e0adb74c86c 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.9.1
+version=1.9.2
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=08a6c52a9043ecb5fa8314783191b81aa21346bd6b937a522ee417e7bb0dc773
+checksum=d1a16f33fe93cda88442c798e0c53f700fa8e2ef792dd78566392d7ad11d997f
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From bba9814a529f1c14665772e31117ff497997786e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 9 Mar 2022 01:52:18 +0100
Subject: [PATCH 0289/2561] mercurial: update to 6.1.

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

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 778d60757cf6..26795f34512d 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=6.0.3
+version=6.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-devel gettext"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=67f13647a46517a2b567cdcb73c98721d75d36a0432debb15022b77f9c138333
+checksum=86f98645e4565a9256991dcde22b77b8e7d22ca6fbb60c1f4cdbd8469a38cc1f
 
 pre_check() {
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then

From 04b20c181dbf62514851fc159ca82d93f4ac898b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 15 Mar 2022 11:35:30 +0100
Subject: [PATCH 0290/2561] ansible-core: update to 2.12.3.

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

diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index fc3df299249c..80236532b369 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
-version=2.12.2
+version=2.12.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ 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-core/ansible-core-${version}.tar.gz"
-checksum=bc79e1723a5a92cbc105d581b25b66840d15bb5f4c98925c936ef5a71f92e7c3
+checksum=8a135a9f74c97cab67759293744ad34350f719523e8bd9bb9008df4cf953af20
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
 # Tests are currently broken for ansible on python 3.10

From b2690d66287963c2b02df963c7b970738b073349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 15 Mar 2022 11:35:33 +0100
Subject: [PATCH 0291/2561] ansible: update to 5.4.0.

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

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 70de17aec1f3..eb132fa68380 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=5.3.0
+version=5.4.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ 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=50020dab43f6c59debdeb57f45c90ec6db78d4fa574edc6d75bc52e05cbd3639
+checksum=2f0ecbd8a3232e520bf3e3bc23f40dda60b9ce7924ca194bd35f4de4027100fc
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660

From bcd3f13c0254b719726e0a9032796d85cc1adfe3 Mon Sep 17 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, 17 Mar 2022 22:57:58 +0700
Subject: [PATCH 0292/2561] python3-pkgconfig: depends on pkg-config

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

diff --git a/srcpkgs/python3-pkgconfig/template b/srcpkgs/python3-pkgconfig/template
index 8b015d19b57f..05d37a5d5ee1 100644
--- a/srcpkgs/python3-pkgconfig/template
+++ b/srcpkgs/python3-pkgconfig/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-pkgconfig'
 pkgname=python3-pkgconfig
 version=1.5.1
-revision=5
+revision=6
 wrksrc="pkgconfig-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3"
+depends="python3 pkg-config"
 short_desc="Python3 module to interface with pkg-config"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From ae384f9468e13dde5852163e6551d0328504ddae Mon Sep 17 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, 17 Mar 2022 23:07:00 +0700
Subject: [PATCH 0293/2561] xob: fix crash

When building xob without any arguments, xob will be built with
SYSCONFDIR points to /usr/local/etc. Thus, crash at runtime.

Reported-by: Urs Schulz <voidpkgs@ursschulz.de>
Close #35009
---
 srcpkgs/xob/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template
index f2d1701f523e..dfac3851302c 100644
--- a/srcpkgs/xob/template
+++ b/srcpkgs/xob/template
@@ -1,9 +1,10 @@
 # Template file for 'xob'
 pkgname=xob
 version=0.3
-revision=1
+revision=2
 build_style=gnu-makefile
-make_install_args="prefix=/usr sysconfdir=/etc"
+make_build_args="prefix=/usr sysconfdir=/etc"
+make_install_args="$make_build_args"
 make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libconfig-devel libXrender-devel"

From 4357e9542157d9c2d58ab5589edc71bd33c29293 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 6 Mar 2022 18:22:18 -0700
Subject: [PATCH 0294/2561] python3-identify: update to 2.4.11.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/python3-identify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-identify/template b/srcpkgs/python3-identify/template
index 6af581162d2f..65fd70ec42c6 100644
--- a/srcpkgs/python3-identify/template
+++ b/srcpkgs/python3-identify/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-identify'
 pkgname=python3-identify
-version=2.3.1
+version=2.4.11
 revision=1
 wrksrc="identify-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://github.com/chriskuehl/identify"
 distfiles="${PYPI_SITE}/i/identify/identify-${version}.tar.gz"
-checksum=8a92c56893e9a4ce951f09a50489986615e3eba7b4c60610e0b25f93ca4487ba
+checksum=2986942d3974c8f2e5019a190523b0b0e2a07cb8e89bf236727fb4b26f27f8fd
 
 post_install() {
 	vlicense LICENSE

From bb8f8e5458901758d9644adad7885cc3f46e7fbc Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 6 Mar 2022 18:22:53 -0700
Subject: [PATCH 0295/2561] pre-commit: update to 2.17.0.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/pre-commit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 855dff84d13f..3eecb71e1136 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
 # Template file for 'pre-commit'
 pkgname=pre-commit
-version=2.15.0
+version=2.17.0
 revision=1
 wrksrc="pre_commit-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://pre-commit.com/"
 distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=3c25add78dbdfb6a28a651780d5c311ac40dd17f160eb3954a0c59da40a505a7
+checksum=c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a
 make_check=no   # No tests available
 
 post_install() {

From 74620c9099d501a866a65b081b00d06b273a5c9e Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Wed, 16 Mar 2022 14:31:06 +0100
Subject: [PATCH 0296/2561] pyradio: update to 0.8.9.14

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

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index a86b57d7bd61..1c2670682351 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,17 +1,17 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.8.9.9
-revision=2
+version=0.8.9.14
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-requests python3-dnspython"
+depends="python3-requests python3-dnspython python3-psutil"
 short_desc="Curses based internet radio player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.coderholic.com/pyradio/"
-changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=9114254088e294bf06399f892c08056d86172bd32c40869474347eb846a965f3
+checksum=76e06934926a1acfd7bba3735d8e0b387d7985dd38a398376877b6fd7da71940
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 1a7edfdf402b3c8969b7d9766d99db65693f2a01 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 27 Feb 2022 10:15:07 -0700
Subject: [PATCH 0297/2561] nyxt: remove runtime deps on *-devel

Signed-off-by: Joseph Benden <joe@benden.us>
Close: #35877
---
 srcpkgs/nyxt/patches/001-libfixposix.patch | 12 ++++++++++++
 srcpkgs/nyxt/patches/002-webkit2gtk.patch  | 14 ++++++++++++++
 srcpkgs/nyxt/template                      |  7 ++++---
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/nyxt/patches/001-libfixposix.patch
 create mode 100644 srcpkgs/nyxt/patches/002-webkit2gtk.patch

diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch
new file mode 100644
index 000000000000..23ef9da26442
--- /dev/null
+++ b/srcpkgs/nyxt/patches/001-libfixposix.patch
@@ -0,0 +1,12 @@
+--- a/_build/iolib/src/syscalls/ffi-functions-unix.lisp.orig	2022-02-27 09:44:00.327307802 -0700
++++ b/_build/iolib/src/syscalls/ffi-functions-unix.lisp	2022-02-27 09:48:30.875539336 -0700
+@@ -12,7 +12,8 @@
+ (eval-when (:compile-toplevel :load-toplevel :execute)
+   (define-foreign-library
+       (libfixposix :canary "lfp_buildinfo")
+-    (t (:default "libfixposix")))
++    (:unix "libfixposix.so.3")
++    (t (:default "libfixposix")))
+   (load-foreign-library 'libfixposix))
+ \f
+ 
diff --git a/srcpkgs/nyxt/patches/002-webkit2gtk.patch b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
new file mode 100644
index 000000000000..5a0fe2e923d3
--- /dev/null
+++ b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
@@ -0,0 +1,14 @@
+--- a/_build/cl-webkit/webkit2/webkit2.init.lisp	2022-01-14 03:22:05.000000000 -0700
++++ b/_build/cl-webkit/webkit2/webkit2.init.lisp	2022-02-27 09:59:29.175938024 -0700
+@@ -18,9 +18,9 @@
+               "libwebkit2gtk-4.0.37.dylib"
+               "libwebkit2gtk-4.0.dylib"))
+     (:unix (:or "libwebkit2gtk-4.1.so"
+-                "libwebkit2gtk-4.0.so"
+                 ;; Fedora only has this one?
+-                "libwebkit2gtk-4.0.so.37")))
++                "libwebkit2gtk-4.0.so.37"
++                "libwebkit2gtk-4.0.so")))
+   (use-foreign-library libwebkit2))
+ 
+ (defcfun "webkit_get_major_version" :int)
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index 8332e1286d2c..a0da399fb2da 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,13 +1,13 @@
 # Template file for 'nyxt'
 pkgname=nyxt
 version=2.2.4
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target=all
 hostmakedepends="sbcl git"
-makedepends="webkit2gtk-devel libfixposix-devel libgirepository-devel"
-depends="dbus xclip enchant2 webkit2gtk-devel libfixposix-devel libgirepository-devel"
+makedepends="webkit2gtk libfixposix-devel libgirepository-devel"
+depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"
@@ -19,6 +19,7 @@ make_check=no
 nostrip=yes
 nopie=yes
 nocross="Cross-compilation fails due to package iolib/syscalls setting incorrect compiler flags"
+shlib_requires="libwebkit2gtk-4.0.so.37 libfixposix.so.3 libgirepository-1.0.so.1"
 
 do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} install

From a438616b62f8240e426281cd66667a7eb0b11d48 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Fri, 18 Mar 2022 19:43:51 +0530
Subject: [PATCH 0298/2561] alacritty: update to 0.10.1

- fix cross-compiling
- fix distfiles URL
---
 srcpkgs/alacritty/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 9fb9ccfdb36d..94bf361be18d 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,6 +1,6 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.10.0
+version=0.10.1
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
@@ -12,9 +12,13 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5dee9c94f944b742b0189dd87c43c87175ffadde8049abb4668ca5a3e68fd65a
-nocross="IndexMap/autocfg/rust issues - #34889"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=e48d4b10762c2707bb17fd8f89bd98f0dcccc450d223cade706fdd9cfaefb308
+
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From d60922057c517fed3eaa6f87dd36155931da2f50 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 18 Mar 2022 20:16:43 +0100
Subject: [PATCH 0299/2561] scite: update to 5.2.1.

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

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 02f66bdc7b1f..4943d99f3fcf 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.2.0
+version=5.2.1
 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=a63e0f340bf90df8c1ec9abe8d9c5db0a3aee5663c8b325117155456364f52ff
+checksum=0e7a1daca03d9eea20b2857b722ffd57788799235803bb7b84694af5a1707e07
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile

From 34c390511160d7be38472b2eebb3d44feedf3156 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Mar 2022 16:48:30 +0100
Subject: [PATCH 0300/2561] lrzip: update to 0.651.

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

diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template
index 1b492e9e6c6c..afc7475bf96d 100644
--- a/srcpkgs/lrzip/template
+++ b/srcpkgs/lrzip/template
@@ -1,6 +1,6 @@
 # Template file for 'lrzip'
 pkgname=lrzip
-version=0.650
+version=0.651
 revision=1
 build_style="gnu-configure"
 hostmakedepends="perl automake libtool"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lrzip.kolivas.org/"
 distfiles="https://github.com/ckolivas/lrzip/archive/v${version}.tar.gz"
-checksum=e07b2b3511689e4aaf7404d289feba5d9d6e1170c448f85e393a11249502dd66
+checksum=f4c84de778a059123040681fd47c17565fcc4fec0ccc68fcf32d97fad16cd892
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) hostmakedepends+=" nasm";;
@@ -19,9 +19,3 @@ esac
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
-
-# The library is deprecated as of lrzip 0.650.
-post_install() {
-	rm -f ${DESTDIR}/usr/include/Lrzip.h
-	rm -f ${DESTDIR}/usr/lib/pkgconfig/lrzip.pc
-}

From 72ea28aadcfeac0292c7acb1ea507c9233782fb0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 18 Mar 2022 20:13:07 +0100
Subject: [PATCH 0301/2561] perl: update to 5.34.1.

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

diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index da223660988a..54ce2298d139 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,8 +1,8 @@
 # Template file for 'perl'
 pkgname=perl
-version=5.34.0
+version=5.34.1
 revision=1
-_perl_cross_version=1.3.6
+_perl_cross_version=1.3.7
 build_style=gnu-configure
 hostmakedepends="less"
 makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
@@ -14,8 +14,8 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://www.perl.org"
 distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
  https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
-checksum="551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a
- 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5"
+checksum="357951a491b0ba1ce3611263922feec78ccd581dddc24a446b033e25acf242a1
+ 77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335"
 
 # Before updating this package to a new major version, run ${FILESDIR}/provides.pl
 # against ${wrksrc} to find the list of built in packages.
@@ -39,7 +39,7 @@ provides="perl-Archive-Tar-2.38_1
  perl-Digest-MD5-2.58_1
  perl-Digest-SHA-6.02_1
  perl-Dumpvalue-1.21_1
- perl-Encode-3.08_1
+ perl-Encode-3.08.01_1
  perl-Env-1.05_1
  perl-Exporter-5.76_1
  perl-ExtUtils-CBuilder-0.280236_1
@@ -74,7 +74,7 @@ provides="perl-Archive-Tar-2.38_1
  perl-Math-BigRat-0.2614_1
  perl-Math-Complex-1.59.02_1
  perl-Memoize-1.03.01_1
- perl-Module-CoreList-5.20210520_1
+ perl-Module-CoreList-5.20220313_1
  perl-Module-Load-0.36_1
  perl-Module-Load-Conditional-0.74_1
  perl-Module-Loaded-0.08_1

From 5d47f1ee20bed6e85e20a8d3889cded5371b4b2c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 08:24:09 +0100
Subject: [PATCH 0302/2561] cfitsio: update to 4.1.0.

---
 srcpkgs/cfitsio/template  |  6 +++---
 srcpkgs/cfitsio/templateo | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cfitsio/templateo

diff --git a/srcpkgs/cfitsio/template b/srcpkgs/cfitsio/template
index 55ff7d14e61d..4ce6d6d138bc 100644
--- a/srcpkgs/cfitsio/template
+++ b/srcpkgs/cfitsio/template
@@ -1,7 +1,7 @@
 # Template file for 'cfitsio'
 pkgname=cfitsio
-version=4.0.0
-revision=2
+version=4.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-reentrant"
 makedepends="libcurl-devel"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="custom:NASA license"
 homepage="https://heasarc.gsfc.nasa.gov/fitsio/"
 distfiles="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${pkgname}-${version}.tar.gz"
-checksum=b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e
+checksum=b367c695d2831958e7166921c3b356d5dfa51b1ecee505b97416ba39d1b6c17a
 
 post_install() {
 	vlicense License.txt
diff --git a/srcpkgs/cfitsio/templateo b/srcpkgs/cfitsio/templateo
new file mode 100644
index 000000000000..2df3d6385012
--- /dev/null
+++ b/srcpkgs/cfitsio/templateo
@@ -0,0 +1,27 @@
+# Template file for 'cfitsio'
+pkgname=cfitsio
+version=4.1.0
+revision=1
+build_style=gnu-configure
+configure_args="--enable-reentrant"
+makedepends="libcurl-devel"
+short_desc="Library for reading and writing data files in FITS data format"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="custom:NASA license"
+homepage="https://heasarc.gsfc.nasa.gov/fitsio/"
+distfiles="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${pkgname}-${version}.tar.gz"
+checksum=b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e
+
+post_install() {
+	vlicense License.txt
+}
+
+cfitsio-devel_package() {
+	depends="cfitsio-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From ce4b054f4ce097c185ccb2170af97816d736ea76 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 08:28:30 +0100
Subject: [PATCH 0303/2561] obconf-qt: update to 0.16.2.

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

diff --git a/srcpkgs/obconf-qt/template b/srcpkgs/obconf-qt/template
index 40f4e2f54866..793399f3e499 100644
--- a/srcpkgs/obconf-qt/template
+++ b/srcpkgs/obconf-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'obconf-qt'
 pkgname=obconf-qt
-version=0.16.1
+version=0.16.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -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=458d96b63dca8a09a4f477d42030d829e8090aae0ea39b3994fcf0b8da8e8b42
+checksum=7328da1606b289280e2ce0f2279ab30d06f584e4c2d6fc5f01c0f3d9ce714960

From 8f6b15141f02657f0eebd0f526aff6aee2b04946 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 09:14:49 +0100
Subject: [PATCH 0304/2561] vlc: update to 3.0.17.3.

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

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 309477a2f775..318e7ac12ce1 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.17
+version=3.0.17.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
@@ -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=48bd9bf337aa107a1524eba57c52dc4a91e29f5a97fbdee92f6a4dba90383cd0
+checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014
 
 lib32disabled=yes
 

From 71035bf2d614da6bcf8b37b77d3972cf1abecf27 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 09:18:01 +0100
Subject: [PATCH 0305/2561] linux5.4: update to 5.4.185.

---
 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 983e18bdc0ba..771796079797 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.184
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=8694ca39e6c665cac5a78c7f80acef83ad9b5b13f9688e94bfe39b3c71541489
+checksum=d15fe9da679bfb624f35f127a17559f6d037ad37a313cf5fd22ce155401f3787
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 71a4cb4f76d7b191788461fcb888dc497fb82142 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 09:20:12 +0100
Subject: [PATCH 0306/2561] linux4.19: update to 4.19.235.

---
 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 64351dd2d235..840a4516d83e 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.234
+version=4.19.235
 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=0082966be4a476c42ed59996e072e7e9fa5282b742efe4ffabadd6cd91212d8b
+checksum=530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 681c1e8c2470f23f3d88c80d1c9dccf38e3fc648 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 18 Mar 2022 20:56:11 -0500
Subject: [PATCH 0307/2561] gns3-server: loosen requirements for new
 python3-distro package

---
 srcpkgs/gns3-server/patches/requirements.patch | 3 ++-
 srcpkgs/gns3-server/template                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch
index 4cfa85b16ba2..27cd2441e53c 100644
--- a/srcpkgs/gns3-server/patches/requirements.patch
+++ b/srcpkgs/gns3-server/patches/requirements.patch
@@ -14,7 +14,8 @@ diff --git a/requirements.txt b/requirements.txt
 -psutil==5.9.0
 +psutil>=5.9.0
  async-timeout==3.0.1
- distro==1.6.0
+-distro==1.6.0
++distro>=1.6.0
  py-cpuinfo==8.0.0
 -setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
 +setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 038457a27a3b..c45f0a8f8b82 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
 version=2.2.31
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl

From 05402b59827205aec4d82eded8decee56c387f20 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 18 Mar 2022 20:57:06 -0500
Subject: [PATCH 0308/2561] gns3-gui: loosen requirements for new
 python3-distro package

---
 srcpkgs/gns3-gui/patches/requirements.patch | 3 ++-
 srcpkgs/gns3-gui/template                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch
index ab3d55dea830..6cf6d68d94cc 100644
--- a/srcpkgs/gns3-gui/patches/requirements.patch
+++ b/srcpkgs/gns3-gui/patches/requirements.patch
@@ -7,7 +7,8 @@ diff --git a/requirements.txt b/requirements.txt
 -sentry-sdk==1.5.4
 -psutil==5.9.0
 +psutil>=5.9.0
- distro==1.6.0
+-distro==1.6.0
++distro>=1.6.0
 -setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
 +setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
  setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 175eab41080c..348325010d73 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
 version=2.2.31
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema

From a5a73fc2e1338ebc13aba2823348cb63eab9a285 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Fri, 4 Mar 2022 19:16:42 -0500
Subject: [PATCH 0309/2561] New package: tea-0.8.0

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

diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
new file mode 100644
index 000000000000..5b01c790341f
--- /dev/null
+++ b/srcpkgs/tea/template
@@ -0,0 +1,19 @@
+# Template file for 'tea'
+pkgname=tea
+version=0.8.0
+revision=1
+wrksrc=$pkgname
+build_style=go
+go_import_path=code.gitea.io/tea
+depends="git"
+short_desc="Command line tool to interact with Gitea"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="MIT"
+homepage="https://gitea.com/gitea/tea"
+changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
+distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
+checksum=6c73c0a7b66cdfd1e5a302257d54df06a3a41eb9bdbfeb547966db431ae23b23
+
+post_install() {
+	vlicense LICENSE
+}

From 79a13c090ea82434f3cfb9c63085ae4075079498 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 16:14:15 +0100
Subject: [PATCH 0310/2561] linux5.15: update to 5.15.30.

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

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index d314a6f8a251..9b43d8ebf3e3 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.28
+version=5.15.30
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 1019709aa85b87904e901aca141f8ade27b3719333be8a3e9d3b2cb0e05ad345"
+ 18059d8e3f01ab38b22ddf4c2e0a0a9db50926f6535649f51ee7a86a8542aff1"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 2049d765c3d4e36c0c0b69a0195fd9bcebd443a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 16:18:09 +0100
Subject: [PATCH 0311/2561] linux5.10: update to 5.10.107.

---
 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 305d9822a51c..a3ccac15e158 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.105
+version=5.10.107
 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=3ddc0e0ab2b9cadb64df43141e0a1e5432b5963ed50f34d586c065ac8d4fcb85
+checksum=c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From e8e3c62c953f29b8fe2f7ac8e12ed436bd2ae949 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 16:22:26 +0100
Subject: [PATCH 0312/2561] linux5.16: update to 5.16.16.

---
 srcpkgs/linux5.16/files/arm64-dotconfig | 5 +++--
 srcpkgs/linux5.16/template              | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig
index d928e0d07a04..23f03c1e5630 100644
--- a/srcpkgs/linux5.16/files/arm64-dotconfig
+++ b/srcpkgs/linux5.16/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.16.11 Kernel Configuration
+# Linux/arm64 5.16.16 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -376,6 +376,7 @@ CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_1508412=y
 CONFIG_ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE=y
 CONFIG_ARM64_ERRATUM_2051678=y
+CONFIG_ARM64_ERRATUM_2077057=y
 CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
@@ -429,7 +430,6 @@ CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -439,6 +439,7 @@ CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template
index a4d787e19716..5775997c8c58 100644
--- a/srcpkgs/linux5.16/template
+++ b/srcpkgs/linux5.16/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.16'
 pkgname=linux5.16
-version=5.16.11
+version=5.16.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="027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb
- ef7b5e4f1b043a58fcece6e3f5d9e5425db7fb2a1abddc64c5094b93931bab37"
+ 9e7af5007d3596c1efee8556aaa1b1a2e40ddded107448b583624a1f305376db"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 519e06c2765f9eba1ade3a4d30aef745eefe9ec2 Mon Sep 17 00:00:00 2001
From: Eduard Ganiukov <ed+git@gnkv.io>
Date: Sat, 19 Feb 2022 23:05:21 +0100
Subject: [PATCH 0313/2561] himalaya: update to 0.5.9

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

diff --git a/srcpkgs/himalaya/template b/srcpkgs/himalaya/template
index 5ad5316f8c08..6869ca90cc20 100644
--- a/srcpkgs/himalaya/template
+++ b/srcpkgs/himalaya/template
@@ -1,8 +1,9 @@
 # Template file for 'himalaya'
 pkgname=himalaya
-version=0.5.1
+version=0.5.9
 revision=1
 build_style=cargo
+make_check_args="--lib"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
 short_desc="CLI email client"
@@ -11,7 +12,12 @@ license="BSD-3-Clause"
 homepage="https://github.com/soywod/himalaya"
 changelog="https://raw.githubusercontent.com/soywod/himalaya/master/CHANGELOG.md"
 distfiles="https://github.com/soywod/himalaya/archive/v${version}.tar.gz"
-checksum=13567726903243f04a4aa64e96b88e0d0fd5c3ccbe4953357f3a8ef1c569dad9
+checksum=70da5d75354e47b47315938b9cbeca2ec167b8e6bd8ce133eff68ef1638d8c59
+
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
 
 post_install() {
 	vlicense LICENSE

From 83b97abff5ee84f36ef353ba81e9ea9eb2e26451 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 17:29:07 +0100
Subject: [PATCH 0314/2561] babashka: update to 0.7.8.

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

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 64fd2b0b1cfe..5a2292af27bf 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.7.6
+version=0.7.8
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -10,14 +10,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
 changelog="https://github.com/babashka/babashka/blob/master/CHANGELOG.md"
-_sci_commit=582aa8fa0bac2251e9d4acb93d042bf9d99282c7
+_sci_commit=4eb8e99e18942ba9c3b7ec3c4707d8237f970035
 _babashka_curl_commit=3d3d117ea0f8a143a06e3cace92e4e8b6a5782df
-_babashka_nrepl_commit=e8e2273a8de6e8c45371e8ee8d5fa49e5d7dea02
+_babashka_nrepl_commit=d3fce67198b042707f01d841c032f841cc57ab7f
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=2343393d3266026097a61b8fced6f1b1beaefad0
+_process_commit=5db9560eab698f9773537acb0167f38d6fd0d322
 _pods_commit=538fc6f4147badf3a457b3eb8f9f95dd3bc947b1
-_deps_clj_commit=e6fb7918b5898549084fc82d006ed8857bf49ccd
-_fs_commit=ec037054668d3fd31d858de97ce125462d357da6
+_deps_clj_commit=6636890388cdf779708806a93110b165577cd226
+_fs_commit=2bf527f797d69b3f14247940958e0d7b509f3ce2
 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
@@ -29,15 +29,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
  https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="97e61e9138cf614cf1e2d92083a4504eb97fccc0bacfba4853f1417230d6b679
- e39d038aa0ff3f058a41a962fae6cc1e87192cfa26b27c218fe2333245692e41
+checksum="23a08adcc9237be9f24c1781cb646514434dbcb651aac00c3eedca763ca25086
+ 0766f0a8be23e94efefbfc16c5987f1dab4520da3294f1bccef402f97898c490
  45abdaa5e4effd3bcfea777d02844d4634f1f80a592843eca9ec7d3544b7e16d
- bc6a65c9bad2ced362636fca54ee5105e12706bd7c4412edd64c0bb18af15b3e
+ b56a06bf113bcd85084d48f595541447014308860d9c45efcde5b02e859c934c
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 99ffaf99eccccb78001f2fd85527d41461f645d65f4cd839295fcba07f85eb8b
+ b6671246a1f0742bd4ae4d1f7b0afe4101d6c8907060455e0473c2ef966e370c
  7fea6762ecbb31d454e0b5c194d12e1e6d4ec301972aa33daf617b571e097678
- 2f1824c0a525481489ecfa0f2fa4c9e6b5a0e4e00676d0dcecfc7107ceebe979
- 9c98895e85e2566d0db7f5f85815a83e0839525bb7599e6a22778dbdd1ce2a3b
+ fee3f84f935d141cf7343d7bab19c3eef56fdb2f3dac4a950db71c9b083e0d17
+ e5b92a25221b735941861968a5570a4169da1aee7f2a7545975afe930cb8574f
  bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"

From de9cec7ab7bb1e16a2000332da7081cdce896e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sat, 19 Mar 2022 21:15:33 +0100
Subject: [PATCH 0315/2561] tailscale: bump to 1.22.2

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

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 4684014fffd7..27a3611b7296 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.22.0
+version=1.22.2
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -13,7 +13,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=79c240a3d623a304c908a8b4035f1f775014e9dff6ae076c06279c2829a7d746
+checksum=3e7b5b8073a7b94d84ff6677a9f110070b808c8d35c5b7da0c6e6fe639444e58
 
 post_install() {
 	vlicense LICENSE

From a5ece0c4ba9e10d0195791bb579c543ab1e4d042 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:17:39 -0500
Subject: [PATCH 0316/2561] nomad: update to 1.2.6.

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

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 0e6f169d0118..8707ada37bf9 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.2.3
-revision=2
+version=1.2.6
+revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=55e5c49b99a6fd2bf925e7fd98d95829776c331f
+_git_commit=95514d569610f15ce49b4a7a1a6bfd3e7b3e7b4f
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=36e074f34091043a2b5d115496f371fb9df048134f402bb5943e17bcb2f911ff
+checksum=c69ec89ae5f76704d4b3ecb842b130f3d90e579bfd31191721b5f2da99f95a93
 
 post_install() {
 	vlicense LICENSE

From 84006692b426c20f0588a1c33a6a01b7789c7753 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:20:47 -0500
Subject: [PATCH 0317/2561] consul: update to 1.11.4.

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

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index e7a39388514f..fc0e80502879 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.11.1
+version=1.11.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=2c56447e427c0dd4bdbcabe6cc39bd0802aaf897
+_git_commit=944e8ce64201ab2bbe923b207883d08a4dcff73a
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=e548902d6a9c92bcc07fc1af33049078fb34a371e9853be6b0d6a69cf2a2c208
+checksum=253200fbf79aefee632c5cde9f90e6df6eddcb2766f2909b0d347c4438065126
 
 post_install() {
 	vlicense LICENSE

From d350911ed5a02598b05c8995cffd839664d44c51 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:27:30 -0500
Subject: [PATCH 0318/2561] vault: update to 1.9.4.

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

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 1ba3566e77c7..4746d4974195 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.9.2
+version=1.9.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=aca76f63357041a43b49f3e8c11d67358496959f
+_git_commit=fcbe948b2542a13ee8036ad07dd8ebf8554f56cb
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 depends="libcap-progs"
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=84a2506d8d0e0757a3229012328904b5e1e13c39c7766d431ffa9c32bce51fae
+checksum=7ebae46e12ff353c3a9e861c4991410679a3c890d36c7c6fb17b43e9ea6f6115
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0750 root _vault"

From fd3b90494ae173718bacd76e4d03d9746f5a46af Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:37:39 -0500
Subject: [PATCH 0319/2561] terraform: update to 1.1.7.

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

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 4f03771b4775..14fb8b368a9a 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.1.6
+version=1.1.7
 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=4dd037773928b93ba98c7885c9f2f500db96c407555459a744f8316ab9b16d34
+checksum=7651b69a2196de4393195cef4a03171c83aa50581f1019bca3f17cf05db5335b

From d7bbe882842fcb71e809466b2a9be812c5b25dfb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 00:09:37 +0100
Subject: [PATCH 0320/2561] zimg: update to 3.0.3.

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

diff --git a/srcpkgs/zimg/template b/srcpkgs/zimg/template
index a0b0ff763198..3f2f7291d0aa 100644
--- a/srcpkgs/zimg/template
+++ b/srcpkgs/zimg/template
@@ -1,6 +1,6 @@
 # Template file for 'zimg'
 pkgname=zimg
-version=2.9.3
+version=3.0.3
 revision=1
 wrksrc=zimg-release-${version}
 build_style=gnu-configure
@@ -9,8 +9,13 @@ short_desc="Image processing library"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="WTFPL"
 homepage="https://github.com/sekrit-twc/zimg"
+changelog="https://raw.githubusercontent.com/sekrit-twc/zimg/master/ChangeLog"
 distfiles="https://github.com/sekrit-twc/zimg/archive/release-${version}.tar.gz"
-checksum=a15c0483fbe945ffe695a1a989bc43b3381c8bf33e2d1760464ec21d32cdf30b
+checksum=5e002992bfe8b9d2867fdc9266dc84faca46f0bfd931acc2ae0124972b6170a7
+
+case "$XBPS_TARGET_MACHINE" in
+	armv7*) configure_args+=" --disable-simd";;
+esac
 
 pre_configure() {
 	./autogen.sh

From b1b08640247a39806f45ff0469845048cd3da047 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 00:09:41 +0100
Subject: [PATCH 0321/2561] vapoursynth: update to R57.

---
 srcpkgs/vapoursynth/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index c4de1d5712a0..63a2043fe522 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -1,21 +1,22 @@
 # Template file for 'vapoursynth'
 pkgname=vapoursynth
-version=R52
-revision=4
+version=R57
+revision=1
 build_style=gnu-configure
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
-configure_args="am_cv_python_version=${py3_ver}"
 hostmakedepends="automake libtool nasm pkg-config python3-Cython"
-makedepends="ffmpeg-devel python3-devel zimg-devel libass-devel libmagick-devel
- libxml2-devel"
+makedepends="python3-devel zimg-devel"
 short_desc="Application for video manipulation"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="LGPL-2.1-or-later, OFL-1.1"
 homepage="http://www.vapoursynth.com"
 changelog="https://raw.githubusercontent.com/vapoursynth/vapoursynth/master/ChangeLog"
 distfiles="https://github.com/vapoursynth/vapoursynth/archive/${version}.tar.gz"
-checksum=4d5dc7950f4357da695d29708bc98013bc3e0bd72fc5d697f8c91ce3c4a4b2ac
+checksum=9bed2ab1823050cfcbdbb1a57414e39507fd6c73f07ee4b5986fcbf0f6cb2d07
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS="-latomic"
+fi
 
 pre_configure() {
 	./autogen.sh

From 9aacdeba579c0510fb14b85527126a89092396eb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:54:08 +0100
Subject: [PATCH 0322/2561] common/environment/setup/misc.sh: add
 ${VIDEOLAN_SITE}

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

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index d22a7388d689..177b1e5622a2 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -17,5 +17,6 @@ MOZILLA_SITE="https://ftp.mozilla.org/pub"
 GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
+VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
 
 set +a

From b594110ae27b32d40079e8c53fe92c46cebf09b9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:53:17 +0100
Subject: [PATCH 0323/2561] Manual.md: document ${VIDEOLAN_SITE}

---
 Manual.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Manual.md b/Manual.md
index 40b2321f7a25..af5f698debae 100644
--- a/Manual.md
+++ b/Manual.md
@@ -529,6 +529,7 @@ Example:
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
   | XORG_SITE        | https://www.x.org/releases/individual            |
   | KDE_SITE         | https://download.kde.org/stable                 |
+  | VIDEOLAN_SITE    | https://download.videolan.org/pub/videolan      |
 
 - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be
 separated by blanks. Please note that the order must be the same than

From b569e3111a00d1d219c609a2410e4ae3d0d3dd0d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:42:29 +0100
Subject: [PATCH 0324/2561] vlc: use ${VIDEOLAN_SITE}

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

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 318e7ac12ce1..14a00043a651 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -16,7 +16,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 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"
+distfiles="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz"
 checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014
 
 lib32disabled=yes

From 2d5a016b45a237e2d40b900d0305c4e65dc9f613 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:42:38 +0100
Subject: [PATCH 0325/2561] x264: use ${VIDEOLAN_SITE}

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

diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index 1ed803645ba6..a33dede30ccb 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -10,7 +10,7 @@ short_desc="Free library for encoding H264/AVC video streams"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.videolan.org/developers/x264.html"
-distfiles="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${version//./-}-stable.tar.bz2"
+distfiles="${VIDEOLAN_SITE}/x264/snapshots/x264-snapshot-${version//./-}-stable.tar.bz2"
 checksum=b2495c8f2930167d470994b1ce02b0f4bfb24b3317ba36ba7f112e9809264160
 
 pre_configure() {

From e95da374d84dd62e57de328867be02a8eba7bb31 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:42:51 +0100
Subject: [PATCH 0326/2561] libdvdnav: use ${VIDEOLAN_SITE}

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

diff --git a/srcpkgs/libdvdnav/template b/srcpkgs/libdvdnav/template
index 5a7a859c4c0b..9ff884a90b37 100644
--- a/srcpkgs/libdvdnav/template
+++ b/srcpkgs/libdvdnav/template
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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"
+distfiles="${VIDEOLAN_SITE}/libdvdnav/${version}/libdvdnav-${version}.tar.bz2"
 checksum=c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48
 
 libdvdnav-devel_package() {

From 9ac51da482c0efad15671dcb4e9adcb7130d0960 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:04 +0100
Subject: [PATCH 0327/2561] libdvdcss: use ${VIDEOLAN_SITE}

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

diff --git a/srcpkgs/libdvdcss/template b/srcpkgs/libdvdcss/template
index ca9d26cd31cd..c77443b8e055 100644
--- a/srcpkgs/libdvdcss/template
+++ b/srcpkgs/libdvdcss/template
@@ -7,7 +7,7 @@ short_desc="Simple library designed for accessing DVDs"
 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"
+distfiles="${VIDEOLAN_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
 checksum=233cc92f5dc01c5d3a96f5b3582be7d5cee5a35a52d3a08158745d3d86070079
 
 libdvdcss-devel_package() {

From 9b69fa15bdbce1b624dda6c7bda15f23ea6a97bf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:17 +0100
Subject: [PATCH 0328/2561] libdvbpsi: use ${VIDEOLAN_SITE}

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

diff --git a/srcpkgs/libdvbpsi/template b/srcpkgs/libdvbpsi/template
index c8aa475b2de5..5aac623a13ae 100644
--- a/srcpkgs/libdvbpsi/template
+++ b/srcpkgs/libdvbpsi/template
@@ -7,7 +7,7 @@ short_desc="PSI decoder and generator library for MPEG2 and DVB streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.videolan.org/developers/libdvbpsi.html"
-distfiles="https://download.videolan.org/pub/libdvbpsi/${version}/${pkgname}-${version}.tar.bz2"
+distfiles="${VIDEOLAN_SITE}/libdvbpsi/${version}/${pkgname}-${version}.tar.bz2"
 checksum=02b5998bcf289cdfbd8757bedd5987e681309b0a25b3ffe6cebae599f7a00112
 
 libdvbpsi-devel_package() {

From 7ac272cf9351446e912a61b91fad0e7f22e0f169 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:28 +0100
Subject: [PATCH 0329/2561] libdca: use ${VIDEOLAN_SITE}

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

diff --git a/srcpkgs/libdca/template b/srcpkgs/libdca/template
index a9007df8387c..a144e80ad73b 100644
--- a/srcpkgs/libdca/template
+++ b/srcpkgs/libdca/template
@@ -8,7 +8,7 @@ short_desc="DTS Coherent Acoustics decoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.videolan.org/developers/libdca.html"
-distfiles="https://download.videolan.org/pub/videolan/libdca/${version}/libdca-${version}.tar.bz2"
+distfiles="${VIDEOLAN_SITE}/libdca/${version}/libdca-${version}.tar.bz2"
 checksum=3a0b13815f582c661d2388ffcabc2f1ea82f471783c400f765f2ec6c81065f6a
 
 pre_configure() {

From 50b58cb6b43e054adc078baa1a4db85deb7b8e3e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:39 +0100
Subject: [PATCH 0330/2561] libbluray: use ${VIDEOLAN_SITE}

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

diff --git a/srcpkgs/libbluray/template b/srcpkgs/libbluray/template
index b81a8ee351de..070c351ee279 100644
--- a/srcpkgs/libbluray/template
+++ b/srcpkgs/libbluray/template
@@ -10,7 +10,7 @@ short_desc="Library to access Blu-Ray disks for video playback"
 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"
+distfiles="${VIDEOLAN_SITE}/libbluray/${version}/libbluray-${version}.tar.bz2"
 checksum=e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9
 
 pre_build() {

From fc14f4d7111ec6650435196c34cef16c811b97f3 Mon Sep 17 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, 4 Mar 2022 10:17:47 +0700
Subject: [PATCH 0331/2561] dnsmasq: configurable services

Close: #35826
---
 srcpkgs/dnsmasq/files/dnsmasq/run | 3 ++-
 srcpkgs/dnsmasq/template          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dnsmasq/files/dnsmasq/run b/srcpkgs/dnsmasq/files/dnsmasq/run
index 2b740a49d8f5..f3504f9e6ece 100644
--- a/srcpkgs/dnsmasq/files/dnsmasq/run
+++ b/srcpkgs/dnsmasq/files/dnsmasq/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 mkdir -p /var/lib/misc
-exec dnsmasq -k --enable-dbus -u dnsmasq -g dnsmasq 2>&1
+[ -r ./conf ] && . ./conf
+exec dnsmasq -k ${OPTS:---enable-dbus -u dnsmasq -g dnsmasq} 2>&1
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index 731594e8a9de..b59608c47912 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,7 +1,7 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
 version=2.86
-revision=1
+revision=2
 conf_files="/etc/dnsmasq.conf"
 hostmakedepends="pkg-config"
 makedepends="dbus-devel libcap-devel libidn2-devel $(vopt_if dnssec nettle-devel)"

From 91ca6488d54592bd616f49091c9818122c661c51 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 20 Mar 2022 19:45:01 +0100
Subject: [PATCH 0332/2561] ugrep: update to 3.7.6.

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

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

From c80c7e0a593e1d05e610781056c54a0742f56fef Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 19 Mar 2022 16:00:40 -0400
Subject: [PATCH 0333/2561] octoxbps: fix detection of Void Linux

Without this change, OctoXBPS fails to detect that it is running on Void
Linux which causes a password prompt to be shown every time OctoXBPS is
opened.
---
 ...tion-of-Void-Linux-in-getLinuxDistro.patch | 42 +++++++++++++++++++
 srcpkgs/octoxbps/template                     |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch

diff --git a/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch b/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
new file mode 100644
index 000000000000..9941fc6da8c2
--- /dev/null
+++ b/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
@@ -0,0 +1,42 @@
+From 41e0ba546e85f812d89899a3034d67256ec5f23c Mon Sep 17 00:00:00 2001
+From: chili-b <dexter.gaonshatford@gmail.com>
+Date: Sat, 19 Mar 2022 15:33:41 -0400
+Subject: [PATCH] Fix detection of Void Linux in getLinuxDistro
+
+Before this change, OctoXBPS detects Void Linux based on whether or not
+the string, `PRETTY_NAME="void"`, occurs in the file, `/etc/os-release`.
+As of March 15 2022, the contents of `/etc/os-release` have been changed
+and `PRETTY_NAME="Void Linux"` replaces the previous value.
+(see https://github.com/void-linux/void-packages/commit/1dfc401d1237120e8e936627e7e28d2441916e80)
+
+With this change, Void Linux is detected based on the value of `ID` in
+`/etc/os-release` which is less subject to change.
+
+This change is important because OctoXBPS only checks for the existence
+of the local package db if it detects that it is running on either Void
+Linux or Trident Linux. If OctoXBPS does not detect that it is running
+on either distribution (which it doesn't without this change), it will
+prompt for elevated privileges in order to synchronize the local package
+database with the remote database using `xbps-install -Syy` every time
+it is started, regardless of whether or not there are remote changes
+that need to be synced.
+---
+ src/unixcommand.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/unixcommand.cpp b/src/unixcommand.cpp
+index 8a88a2f..1762c4b 100644
+--- a/src/unixcommand.cpp
++++ b/src/unixcommand.cpp
+@@ -709,7 +709,7 @@ LinuxDistro UnixCommand::getLinuxDistro()
+ 
+       QString contents = file.readAll();
+ 
+-      if (contents.contains("PRETTY_NAME=\"void\""))
++      if (contents.contains("ID=\"void\""))
+       {
+         ret = ectn_VOID;
+       }
+-- 
+2.35.1
+
diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index fef8bb3ab323..8315f57ff0d8 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -1,7 +1,7 @@
 # Template file for 'octoxbps'
 pkgname=octoxbps
 version=0.3.0
-revision=2
+revision=3
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="qt5-declarative-devel qtermwidget-devel"

From 45991cb56205e2eac1e9da55a6911007e7ef7f3e Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 6 Nov 2021 15:51:38 +0100
Subject: [PATCH 0334/2561] cups: update to 2.4.1.

Closes: #33939 [via git-merge-pr]
---
 .../cups/patches/cups-no-export-ssllibs.patch | 11 -----
 srcpkgs/cups/template                         | 48 ++++++-------------
 2 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/cups/patches/cups-no-export-ssllibs.patch

diff --git a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch b/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
deleted file mode 100644
index bf618ce330bd..000000000000
--- a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
-+++ b/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
-@@ -180,7 +180,7 @@
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
- 
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
- 
- dnl
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 66204733fa86..772f73ca4a76 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,22 +1,20 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.3.3op2
+version=2.4.1
 revision=1
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
-hostmakedepends="automake $(vopt_if avahi avahi-libs-devel)
- gnutls-devel perl pkg-config poppler-utils"
-makedepends="acl-devel gnutls-devel libpaper-devel libpng-devel
- libusb-devel pam-devel poppler-devel tiff-devel
- $(vopt_if avahi avahi-libs-devel)
- $(vopt_if gssapi 'mit-krb5-devel')"
+hostmakedepends="gnutls-devel pkg-config
+ $(vopt_if avahi avahi-libs-devel)"
+makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel
+ zlib-devel $(vopt_if avahi avahi-libs-devel) $(vopt_if gssapi mit-krb5-devel)"
 depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/OpenPrinting/cups"
 distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df
+checksum=c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="
@@ -34,40 +32,24 @@ system_groups=lpadmin
 cups_pgroup=lp
 cups_homedir=/var/spool/cups
 
-pre_configure() {
-	aclocal -I config-scripts
-	autoconf -I config-scripts
-}
-
 do_configure() {
 	./configure ${configure_args} --sbindir=/usr/bin --libdir=/usr/lib \
-		--enable-acl --enable-dbus --enable-raw-printing \
-		--enable-threads --with-logdir=/var/log/cups \
-		--with-docdir=/usr/share/cups/doc --with-rundir=/run/cups \
-		--with-cups-user=cups --with-cups-group=lp --with-system-groups="lpadmin sys root" --enable-relro \
-		--enable-libpaper --enable-pam --enable-ssl \
-		--with-menudir=/usr/share/applications --with-xinetd=/etc/xinetd.d \
-		--with-optim="${CFLAGS}" --disable-systemd --disable-launchd \
-		--without-rcdir --without-java --without-perl --without-php \
-		--without-python \
-		$(vopt_enable avahi) $(vopt_enable gssapi)
+		--enable-acl --with-logdir=/var/log/cups \
+		--docdir=/usr/share/cups/doc --with-rundir=/run/cups \
+		--with-cups-user=cups --with-cups-group=lp \
+		--with-system-groups="lpadmin sys root" --enable-relro \
+		--enable-libpaper --with-menudir=/usr/share/applications \
+		--with-xinetd=/etc/xinetd.d --with-optim="${CFLAGS}" \
+		--with-rcdir=no \
+		$(vopt_if avahi '--with-dnssd=avahi') $(vopt_enable gssapi)
 }
 
 post_install() {
-	# compress some driver files, adopted from Fedora
-	find ${DESTDIR}/usr/share/cups/model -name "*.ppd"|xargs gzip -n9f
 	# install some more configuration files that will get filled by cupsd
 	for f in printers classes client subscriptions; do
 		touch ${DESTDIR}/etc/cups/${f}.conf
 	done
 
-	# Remove files provided by cups-filters.
-	rm -f ${DESTDIR}/usr/share/cups/banners/*
-	rm -f ${DESTDIR}/usr/share/cups/data/testprint
-	# comment out all conversion rules which use any of the removed filters
-	perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' \
-		${DESTDIR}/usr/share/cups/mime/mime.convs
-
 	# remove unnecessary PageLogFormat entry
 	vsed -i -e 's:PageLogFormat:#PageLogFormat:' ${DESTDIR}/etc/cups/cupsd.conf*
 
@@ -92,7 +74,7 @@ libcups_package() {
 }
 
 cups-devel_package() {
-	depends="zlib-devel libcups>=${version}_${revision}"
+	depends="libcups>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 5045f7bc2bf03507a52e1ddd7d16bf42a898f96f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 20 Mar 2022 22:25:04 +0100
Subject: [PATCH 0335/2561] tumbler: fix homepage and ignore development
 releases

tumbler-4.17 autoconf explicity requires libxfce4util-4.17.1 which is a
development release, so i assume the same 'odd mindor release is dev
release' policy that most xfce components adhere to is implied for
tumbler as well
---
 srcpkgs/tumbler/template | 4 ++--
 srcpkgs/tumbler/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/tumbler/update

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index dcdd7cfd40e9..9b4de6a28c82 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,7 +1,7 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
@@ -10,7 +10,7 @@ makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
 short_desc="D-Bus Thumbnailer service"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://xfce.org/"
+homepage="https://docs.xfce.org/xfce/tumbler/start"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66
 
diff --git a/srcpkgs/tumbler/update b/srcpkgs/tumbler/update
new file mode 100644
index 000000000000..5636324afbce
--- /dev/null
+++ b/srcpkgs/tumbler/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"

From aa81b7da713c8eb559d790f67943579693c1e929 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 22:30:27 +0100
Subject: [PATCH 0336/2561] libreoffice: fix KDE Headers include check

---
 srcpkgs/libreoffice/patches/kde-inc.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/libreoffice/patches/kde-inc.patch

diff --git a/srcpkgs/libreoffice/patches/kde-inc.patch b/srcpkgs/libreoffice/patches/kde-inc.patch
new file mode 100644
index 000000000000..d01aba1e34cf
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/kde-inc.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac	2021-11-18 12:33:09.000000000 +0100
++++ -	2022-03-20 22:27:09.688261731 +0100
+@@ -12788,7 +12788,7 @@
+         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
+     fi
+ 
+-    kf5_test_include="KF5/kcoreaddons_version.h"
++    kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h"
+     kf5_test_library="libKF5CoreAddons.so"
+     kf5_libdirs="$qt5_libdir $kf5_libdirs"
+ 
+--- a/configure	2021-11-18 12:36:47.000000000 +0100
++++ -	2022-03-20 22:27:22.080024887 +0100
+@@ -41089,7 +41089,7 @@
+         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
+     fi
+ 
+-    kf5_test_include="KF5/kcoreaddons_version.h"
++    kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h"
+     kf5_test_library="libKF5CoreAddons.so"
+     kf5_libdirs="$qt5_libdir $kf5_libdirs"
+ 

From c025faa24edefe133fb0b172fd168c9333210091 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <withercubes@protonmail.com>
Date: Thu, 3 Mar 2022 19:11:30 +0530
Subject: [PATCH 0337/2561] nsxiv: update to 29

---
 srcpkgs/nsxiv/patches/no-rebuild-options.patch | 12 ++++++++++++
 srcpkgs/nsxiv/template                         |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/nsxiv/patches/no-rebuild-options.patch

diff --git a/srcpkgs/nsxiv/patches/no-rebuild-options.patch b/srcpkgs/nsxiv/patches/no-rebuild-options.patch
new file mode 100644
index 000000000000..455884f0b1a1
--- /dev/null
+++ b/srcpkgs/nsxiv/patches/no-rebuild-options.patch
@@ -0,0 +1,12 @@
+Preventing rebuild of options.o when installing
+--- a/Makefile
++++ b/Makefile
+@@ -106,7 +106,7 @@
+ 		rm -f "$$dir/nsxiv.png"; \
+ 	done
+
+-install: all
++install:
+ 	@echo "INSTALL bin/nsxiv"
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	cp nsxiv $(DESTDIR)$(PREFIX)/bin/
diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index 6ef4a1e207d2..a52cc2bb03f2 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -1,17 +1,17 @@
 # Template file for 'nsxiv'
 pkgname=nsxiv
-version=28
+version=29
 revision=1
 build_style=gnu-makefile
 make_install_target=install-all
 makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel
- libwebp-devel"
+ libwebp-devel freetype-devel fontconfig-devel"
 short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
-maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
+maintainer="Sanjay Pavan <withercubes@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/nsxiv/nsxiv"
 distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
-checksum=38047f60e51854363dd98fb7b3bc9f1cfa9b7d6f9e8788508b6f1e317328dd75
+checksum="564a17d921172336f7cd463bf313e39f84e4bcf4fdc789326f4112f848aad039"
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
 
 pre_build() {

From cbb829a45dbe28591fe127039b5a2ae8ff5cc515 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Mar 2022 12:38:42 +0100
Subject: [PATCH 0338/2561] syncthing: update to 1.19.1.

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

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index d0792f1961fd..6c2d860909cb 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.19.0
+version=1.19.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -14,10 +14,10 @@ hostmakedepends="git"
 short_desc="Open Source Continuous File Synchronization"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0"
-homepage="http://syncthing.net/"
+homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=9d7f020ee151512b5a121c08e2b07f7a2ce5bd4a749ca91e60803d21eb1aca02
+checksum=46319031c0805374baa382ee2b21290fb9dc595b70e905b97eb9a5643a78edc4
 
 pre_build() {
 	GOARCH= go generate \

From fc4d9e340d91eda2ae83927701d11bf094ee1b94 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 23 Jan 2022 17:57:27 +0200
Subject: [PATCH 0339/2561] deluge: update to 2.0.5.

---
 .../0001-Fix-warning-related-to-gettext.patch | 25 ------------
 srcpkgs/deluge/patches/drop-priv.patch        | 40 -------------------
 srcpkgs/deluge/template                       | 23 ++++++-----
 3 files changed, 13 insertions(+), 75 deletions(-)
 delete mode 100644 srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch

diff --git a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch b/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
deleted file mode 100644
index 565cd4f952d0..000000000000
--- a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
-From: neeshy <neeshy@tfwno.gf>
-Date: Sat, 18 Apr 2020 23:23:51 -0400
-Subject: Fix warning related to gettext
-
----
- deluge/i18n/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
-index bd002f7a2..90568fc5b 100644
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@ def setup_translation():
-         # Workaround for Python 2 unicode gettext (keyword removed in Py3).
-         kwargs = {} if not deluge.common.PY2 else {'unicode': True}
- 
--        gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+        gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
-         builtins.__dict__['_n'] = builtins.__dict__['ngettext']
- 
-         libintl = None
--- 
-2.27.0
-
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 180e473235fd..bdb186148072 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,20 +1,22 @@
 # Template file for 'deluge'
 pkgname=deluge
-version=2.0.3
-revision=15
+version=2.0.5
+revision=1
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
 depends="python3-setuptools python3-chardet python3-Twisted python3-Mako
  python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3
- python3-Pillow"
-checkdepends="python3-pytest $depends"
+ python3-Pillow python3-pyasn1 python3-openssl python3-six python3-zope.interface"
+checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3
+ python3-gobject xvfb-run cantarell-fonts"
 short_desc="Fully-featured cross-platform BitTorrent client"
 maintainer="Alexey Rochev <equeim@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://deluge-torrent.org/"
+changelog="https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md"
 distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
-checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
+checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
 
 system_accounts="deluge"
 deluge_homedir="/var/lib/deluge"
@@ -25,18 +27,19 @@ make_dirs="
  /var/lib/deluge/.config/deluge 0755 deluge deluge
  "
 
-post_install() {
-	vsv deluged
+do_check() {
+	rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
+	xvfb-run python3 -m pytest
 }
 
-do_check() {
-	python3 -m pytest || : # fails
+post_install() {
+	vsv deluged
 }
 
 deluge-gtk_package() {
 	replaces="deluge<1.3.14_1"
 	short_desc+=" - GTK+ frontend"
-	depends="${sourcepkg}-${version}_${revision} python3-gobject"
+	depends="${sourcepkg}-${version}_${revision} python3-gobject gtk+3"
 	pkg_install() {
 		vmove usr/bin/deluge
 		vmove usr/bin/deluge-gtk

From b4904c7b8eea3886ec55c53745c7197daa8d0d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:05:24 +0100
Subject: [PATCH 0340/2561] devedeng: update to 4.17.0.

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

diff --git a/srcpkgs/devedeng/template b/srcpkgs/devedeng/template
index f3229ed60680..e99cf74e0356 100644
--- a/srcpkgs/devedeng/template
+++ b/srcpkgs/devedeng/template
@@ -1,15 +1,14 @@
 # Template file for 'devedeng'
 pkgname=devedeng
-version=4.16.0
-revision=4
+version=4.17.0
+revision=1
 build_style=python3-module
-pycompile_module="devedeng"
 hostmakedepends="gettext python3"
 depends="cdrtools desktop-file-utils dvdauthor ffmpeg gtk+3
  hicolor-icon-theme python3-gobject python3-setuptools vcdimager"
 short_desc="Create video DVDs and CDs"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://www.rastersoft.com/programas/devede.html"
+homepage="https://www.rastersoft.com/programas/devede.html"
 distfiles="https://gitlab.com/rastersoft/devedeng/-/archive/${version}/${pkgname}-${version}.tar.bz2"
-checksum=fe2715aa8f73133fc2d809d840fd662dcf9776fcedfb68169984af2e762b5164
+checksum=c0f22037972dcfd70b3cbe92668c98e6853e20055913dbacf862684cebf3809b

From 35355a195cf5839f950d72ab6bce7d47d9bb7a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:39:56 +0100
Subject: [PATCH 0341/2561] doomretro: update to 4.4.9.

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

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 75e937546567..5367dc8680ce 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.4.8
+version=4.4.9
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 changelog="https://raw.githubusercontent.com/bradharding/doomretro/master/releasenotes.md"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=a680eecee1e8929774c340a2db8de24cb4d6e17e1f36d9e7c755656e12cac22c
+checksum=02f2f3ec9d8d4db5ad1d00fcb5a5161113d3caa6dc108f14af8760535f00ce9e

From 3cc383f5234f6f3085aa5ed9b66e93d25ffbfc2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:52:46 +0100
Subject: [PATCH 0342/2561] lux: update to 0.14.0.

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

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index ac88c0efaaa5..c09f51778e30 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,6 +1,6 @@
 # Template file for 'lux'
 pkgname=lux
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=go
 go_import_path=github.com/iawia002/lux
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/iawia002/lux"
 distfiles="https://github.com/iawia002/lux/archive/v${version}.tar.gz"
-checksum=4fe99247a718dc1038cb6b9b1808c8e836bbf6a8464afefddf4bf8a161b08236
+checksum=3d485c9703851f3fb5cdee9b029b5b6855f84bfd29b44cae310a031a6fa8c00f
 
 post_install() {
 	vlicense LICENSE

From 3f4ad7560afb5511ab715b144e8a30398e4ea197 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 5 Mar 2022 13:19:13 -0500
Subject: [PATCH 0343/2561] menumaker: update to 0.99.14, move to python3.

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

diff --git a/srcpkgs/menumaker/template b/srcpkgs/menumaker/template
index 7a057147d0cd..db15e5a366f6 100644
--- a/srcpkgs/menumaker/template
+++ b/srcpkgs/menumaker/template
@@ -1,19 +1,19 @@
 # Template file for 'menumaker'
 pkgname=menumaker
-version=0.99.12
-revision=2
+version=0.99.14
+revision=1
 build_style=gnu-configure
 pycompile_dirs="/usr/share/menumaker"
-hostmakedepends="python"
-makedepends="python"
-depends="python"
+hostmakedepends="python3"
+makedepends="python3"
+depends="python3"
 short_desc="Menu generation utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://menumaker.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=e3a3566186a5a9ed4d721c1e7788a5af243c8c8a45b96fe6fff3e94580289b0c
-python_version=2
+checksum=11e95d0e76a3b850f57df81bc5560222bd60141c5751b6e9bd05c3cd5560d65a
+python_version=3
 
 post_install() {
 	vlicense COPYING

From 797e9aababcb346994b62f8b3e481f45c39a2092 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 8 Mar 2022 15:35:49 -0500
Subject: [PATCH 0344/2561] soju: update to 0.4.0.

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

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 733636d4a288..04bca21ab088 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
-version=0.3.0
-revision=2
+version=0.4.0
+revision=1
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/soju ./cmd/sojuctl"
@@ -12,7 +12,7 @@ license="AGPL-3.0-or-later"
 homepage="https://soju.im"
 changelog="https://git.sr.ht/~emersion/soju/refs/v${version}"
 distfiles="https://git.sr.ht/~emersion/soju/refs/download/v${version}/soju-${version}.tar.gz"
-checksum=c1b77e87e42eb12bdc57a8c308b0d0f2b3dd367a2a8f9093a3983fa692c6aa01
+checksum=91a78d8f038fb3319042961ff38d9a54a9bf897942804c0a690628dc6c959118
 conf_files="/etc/soju/config"
 system_accounts="_soju"
 make_dirs="/var/db/soju 0750 _soju _soju

From bc79277b10e6bd586e22d1d52fcf93df14d70721 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 03:34:41 -0400
Subject: [PATCH 0345/2561] python3-language-server: update to 0.36.2, add
 missing dependency.

fixes #36129
---
 srcpkgs/python3-language-server/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template
index 83332ba10f94..a443ec3fb514 100644
--- a/srcpkgs/python3-language-server/template
+++ b/srcpkgs/python3-language-server/template
@@ -1,11 +1,12 @@
 # Template file for 'python3-language-server'
 pkgname=python3-language-server
-version=0.36.1
-revision=3
+version=0.36.2
+revision=1
 wrksrc="${pkgname/3}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson"
+depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson
+ python3-setuptools"
 checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib
  python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle
  python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov
@@ -15,7 +16,7 @@ maintainer="k4leg <d0xi@inbox.ru>"
 license="MIT"
 homepage="https://github.com/palantir/python-language-server"
 distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
-checksum=c85d718ef6860319ad59fd6f2acb1166e9349b782ee8e8908e08ecf241615f52
+checksum=9984c84a67ee2c5102c8e703215f407fcfa5e62b0ae86c9572d0ada8c4b417b0
 # Needs unpackaged rope and versioneer
 # https://github.com/palantir/python-language-server/blob/develop/setup.py#L51
 make_check=no

From ed32352002e2cf1cb6fce4fdc7d09aeb5060371d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 03:39:12 -0400
Subject: [PATCH 0346/2561] protontricks: update to 1.8.0, add missing
 dependency.

fixes #36072
---
 srcpkgs/protontricks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 30b450cd3532..208a55032a36 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,17 +1,17 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.1
+version=1.8.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3-vdf winetricks"
+depends="python3-vdf winetricks python3-setuptools"
 short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
 changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7fe1bcc4cf029947850d8032b8a389e07ffb4e60e2d25a9c7535fa6e845b3ad8
+checksum=d56b53c4ea4286ae20588072433c30193143a75654ea216db389503a63661b09
 make_check=no # no tests in pypi tarball
 
 post_install() {

From a10413f94c26f76caee98e8820b82e50e3f4148f Mon Sep 17 00:00:00 2001
From: hechos <martin.damian.fernandez@gmail.com>
Date: Sun, 20 Mar 2022 15:38:45 -0300
Subject: [PATCH 0347/2561] i3status-rust: update to 0.21.8

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

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 62c33ae48c9d..6973e02571b4 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.21.7
+version=0.21.8
 revision=1
 build_style=cargo
 make_check_args="--bins"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=6085e261b2040110dd2043096d69e02c1f7d8c88651f2129b37f5a770c0a30ac
+checksum=259fdcb3ce067c6f9089fc0d7e60b856d838fff3dfb7e7e4dc5c96742c1a1be1
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From 5d6043dc71f53b824b45ee8d0a556be52d9ff898 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 19 Mar 2022 18:20:53 +0530
Subject: [PATCH 0348/2561] linux-firmware: update to 20220310

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

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 7c55a94b343c..018f08f95099 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20220209
+version=20220310
 revision=1
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=1ff936dc3946affa2695f31024b22e117b3faf9aa7b8857aba1d0473cd277897
+checksum=f4c34a7ba8144b52fd7f6dd0b1dea2998f140ab1139372f8fbdb76f4557ff228
 python_version=3
 nostrip=yes
 

From 1f8e8a4107b1ed688d6fb39594a0bc5284ffeadc Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 20 Mar 2022 05:19:39 -0400
Subject: [PATCH 0349/2561] font-iosevka: update to 15.0.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 3b89fa15109a..4f1c061d5764 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=15.0.2
+version=15.0.3
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- 39e5c01184547c47d8dd4eb14897e045f5d4b39a71939f31f5ba410876aa0322
- eaa972a710765849339e17b44f1214e0b080f78cf88eaca21ae61609517301e5"
+ 7c6a4d8e003cab1a46f86fdf43f8c49e4b9d6ce932961572476266ad9f351608
+ 629dd3cf957f7ef255e7dccc3286c5a3b54c0a6a7cde8b93b3a7fdc9dffc4cbd"
 
 font_dirs="/usr/share/fonts/TTF"
 

From a247da2405881d6610a35b968037ebc9feec958f Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 19 Mar 2022 21:10:43 -0400
Subject: [PATCH 0350/2561] Ice: update to 3.7.7.

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

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index 31b15fbb4d92..90ede78d19ad 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,7 +1,7 @@
 # Template file for 'Ice'
 pkgname=Ice
-version=3.7.5
-revision=2
+version=3.7.7
+revision=1
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, custom:ICE"
 homepage="https://www.zeroc.com"
 distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz"
-checksum=36bf45591a95e6ee7216153d45d8eca05ff00c1da35608f0c400e6ddc8049da9
+checksum=3aef143a44a664f3101cfe02fd13356c739c922e353ef0c186895b5843a312ae
 
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp

From dc29bd4bdc112ec0b226a7aa741c9be19b993c59 Mon Sep 17 00:00:00 2001
From: gary <28818063+garylaski@users.noreply.github.com>
Date: Sat, 19 Mar 2022 17:43:17 -0400
Subject: [PATCH 0351/2561] nicotine+: update to 3.2.2

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

diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template
index 4dbf467d42b3..fc00ddb36446 100644
--- a/srcpkgs/nicotine+/template
+++ b/srcpkgs/nicotine+/template
@@ -1,6 +1,6 @@
 # Template file for 'nicotine+'
 pkgname=nicotine+
-version=3.2.1
+version=3.2.2
 revision=1
 wrksrc="nicotine-plus-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://nicotine-plus.org"
 changelog="https://raw.githubusercontent.com/nicotine-plus/nicotine-plus/master/NEWS.md"
 distfiles="https://github.com/Nicotine-Plus/nicotine-plus/archive/${version}.tar.gz"
-checksum=fa9301fe816e3a753948325ae193b58750c2e1e80c92aee3e049309ad47ee80b
+checksum=f58286f4dec6febfeab075cdfe2d2fc35c58349a504f7d393ec129df132ad40f

From 7efbb9477f91a7fdd04d4b36937cc5c033a42a0c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 14:50:28 +0100
Subject: [PATCH 0352/2561] tali: update to 40.6.

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

diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index 3e50e64f96fc..659f5257ae2e 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -1,6 +1,6 @@
 # Template file for 'tali'
 pkgname=tali
-version=40.5
+version=40.6
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel itstool"
@@ -9,5 +9,6 @@ short_desc="GNOME sort of poker game with dice"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tali"
+changelog="https://gitlab.gnome.org/GNOME/tali/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz"
-checksum=63a09c55e46a1a19756bf5e0957caf994300fadabdba6bda602e668dfcdf7122
+checksum=83fba047edecd196d30719a70e2f4d0986bb26cc2bd5f955a0a9200ea63f0612

From 44a97735dcd95fe2983ae7df2383000dc1bfe39c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 21:05:01 +0100
Subject: [PATCH 0353/2561] xfce4-diskperf-plugin: update to 2.7.0, adopt.

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

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index d57de65ca808..d7b6f822491a 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,17 +1,18 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
-version=2.6.3
+version=2.7.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
+checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9
 
 post_install() {
 	vlicense COPYING

From 90cdaaded05344f6a9f12e99a38a211ee4242ecb Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sat, 19 Mar 2022 16:37:20 +0100
Subject: [PATCH 0354/2561] mkvtoolnix: update to 66.0.0

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

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0b007bb865d0..98317332f361 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=65.0.0
+version=66.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ 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=0dddc9cc1bae26ceaac3a184482c50e6bb8add2d62e06ef08b55f9f0108bb92e
+checksum=73a3f6c39b3580f28233f93555d282d07d5f51a8bbeb8b0bee09b820de80692c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From c8997089f2c4a93a15c0cffa4ef88bfea9cd5473 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 8 Mar 2022 02:57:59 -0500
Subject: [PATCH 0355/2561] autofs: add log service, fix patch

---
 srcpkgs/autofs/files/autofs/log/run |  2 ++
 srcpkgs/autofs/files/autofs/run     |  1 +
 srcpkgs/autofs/patches/musl.patch   | 22 +++++++++++-----------
 srcpkgs/autofs/template             |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/autofs/files/autofs/log/run

diff --git a/srcpkgs/autofs/files/autofs/log/run b/srcpkgs/autofs/files/autofs/log/run
new file mode 100644
index 000000000000..a2abfe61e846
--- /dev/null
+++ b/srcpkgs/autofs/files/autofs/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -p daemon.info -t autofs
diff --git a/srcpkgs/autofs/files/autofs/run b/srcpkgs/autofs/files/autofs/run
index 14ee8daad0c8..6da6f9c3d404 100644
--- a/srcpkgs/autofs/files/autofs/run
+++ b/srcpkgs/autofs/files/autofs/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec automount -f
diff --git a/srcpkgs/autofs/patches/musl.patch b/srcpkgs/autofs/patches/musl.patch
index 5cd45dd184ab..f81228ad740a 100644
--- a/srcpkgs/autofs/patches/musl.patch
+++ b/srcpkgs/autofs/patches/musl.patch
@@ -30,18 +30,18 @@
  #include <dlfcn.h>
 --- a/lib/log.c.orig     2019-03-30 10:49:52.965336128 +0100
 +++ b/lib/log.c  2019-03-30 10:50:43.232710045 +0100
-@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons
-       char buffer[ATTEMPT_ID_SIZE + 1];
-       char *prefixed_msg = NULL;
+@@ -38,7 +38,11 @@
+ 	char buffer[ATTEMPT_ID_SIZE + 1];
+ 	char *prefixed_msg = NULL;
  
--      attempt_id = pthread_getspecific(key_thread_attempt_id);
-+      if (key_thread_attempt_id) {
-+              attempt_id = pthread_getspecific(key_thread_attempt_id);
-+      } else {
-+              attempt_id = 0;
-+      }
-       if (attempt_id) {
-               int len = sizeof(buffer) + 1 + strlen(msg) + 1;
+-	attempt_id = pthread_getspecific(key_thread_attempt_id);
++	if (key_thread_attempt_id) {
++		attempt_id = pthread_getspecific(key_thread_attempt_id);
++	} else {
++		attempt_id = 0;
++	}
+ 	if (attempt_id) {
+ 		int len = sizeof(buffer) + 1 + strlen(msg) + 1;
  
 --- a/include/hash.h	2021-01-31 09:22:19.668222263 +0100
 +++ b/include/hash.h	2021-01-31 09:22:41.390327622 +0100
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 6ec782cccbb9..a9abc60e64e8 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
 # Template file for 'autofs'
 pkgname=autofs
 version=5.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_args="DONTSTRIP=1"
 configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"

From 7d4d71ec48ca5621b308e107409fcfd36dcbc748 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Fri, 11 Mar 2022 21:13:50 +0100
Subject: [PATCH 0356/2561] nheko: update to 0.9.2.

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

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 50f5f543b500..846f2e381b17 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,22 +1,22 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.9.1
-revision=2
+version=0.9.2
+revision=1
 build_style=cmake
-hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
+hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
  spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
  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 gst-plugins-good1 gst-plugins-good1-qt5"
-short_desc="Desktop client for Matrix using Qt and C++14"
+short_desc="Desktop client for Matrix using Qt and C++"
 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"
+homepage="https://nheko-reborn.github.io"
+changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=f8261131ed10816bdae568e5d88f6f41adc6cc2564f2f57b07266103a4972776
+checksum=207243e1c0d0e879066233488b766e30d1902a24fd8f848850567d88408ce8ce
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*-musl)

From 7f6094a62d2b3d3cee8e4e7a633f460c48c4c448 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Fri, 11 Mar 2022 21:33:23 +0100
Subject: [PATCH 0357/2561] mtxclient: update to 0.7.0.

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

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..315841c47bae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -421,7 +421,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.6.2 mtxclient-0.6.2_1
+libmatrix_client.so.0.7.0 mtxclient-0.7.0_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 c58ff20762d0..952926c7df99 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,6 +1,6 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.6.2
+version=0.7.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
@@ -10,8 +10,9 @@ short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
+changelog="https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=97e41340c3f03db8a7625dcd54f6c6a3c8726c7b7226630727fea7d2bb2213bf
+checksum=dd8ad5725c391b7c5b18564074e50bfc667fb3047e681561e5e42aec99c25b12
 
 post_install() {
 	vlicense LICENSE

From 8db6bf45e8b90cd2893bc6fef693cb75b85ce313 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 16 Mar 2022 11:27:47 +0100
Subject: [PATCH 0358/2561] py3status: update to 3.42.

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

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

From 41cb5edbbabe6c2601a17db975a82228add65cf0 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Mon, 14 Mar 2022 23:28:42 +0100
Subject: [PATCH 0359/2561] gitea: update to 1.16.4

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

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 75d8c4290fe4..f9eaa1b18732 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.16.3
+version=1.16.4
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -32,7 +32,7 @@ license="MIT"
 homepage="https://gitea.io"
 changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
 distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=913f3b095fcfd4c5012d17adcd8748b081950e3a7d17ace60f6a2f99c9b2e18b
+checksum=ef396b797d39a64867dfcd4532043c363dce3fe054afaa37bb97f8a2ea3f2a18
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From 2cf1dbfa6c2b7f29d0dac1fc08a3f919aac415df Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 20 Mar 2022 21:22:09 -0500
Subject: [PATCH 0360/2561] yara: update to 4.2.0.

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

diff --git a/common/shlibs b/common/shlibs
index 315841c47bae..2d8a8b8b0df3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3044,7 +3044,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.8 libyara-4.1.0_1
+libyara.so.9 libyara-4.2.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 f4dcddc35692..fe171d75b35d 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.1.3
+version=4.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
@@ -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=3610ddd0c3645b8b9cfa7cfbafc0146f2df751ad8d6cd261a638bfff81efbc32
+checksum=6f567d4e4b79a210cd57a820f59f19ee69b024188ef4645b1fc11488a4660951
 
 pre_configure() {
 	autoreconf -fi

From 3ebad3bf941e2d6c988d7e7e63fcdc0a56c83c21 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 20 Mar 2022 21:22:11 -0500
Subject: [PATCH 0361/2561] python3-yara: update to 4.2.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 fcbbb46b64a7..3f4c5925636a 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.1.3
+version=4.2.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=009273c362d2f552ae784a297e4f0bd21ec5c51abd7e07fedb408156ffa2da8b
+checksum=eb2df7d4b4b2631a9fa09b7fe7e41eea19a03d2f7204eff10a7341f8a443f550

From b80c99191a0e39dc6cfa188a1ba9cd3a73819c33 Mon Sep 17 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, 21 Mar 2022 09:54:31 +0700
Subject: [PATCH 0362/2561] python3-Sphinx: update to 4.4.0.

---
 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 8b0493c1f92c..ec36f57837af 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Sphinx'
 pkgname=python3-Sphinx
-version=4.2.0
+version=4.4.0
 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=94078db9184491e15bce0a56d9186e0aec95f16ac20b12d00e06d4e36f1058a6
+checksum=6caad9786055cb1fa22b4a365c1775816b876f91966481765d7d50e9f0dd35cc
 conflicts="python-Sphinx>=0"
 
 post_install() {

From 974ac90282b422d611f47f8bba8eba655b0f2962 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 10 Sep 2021 21:24:56 +0400
Subject: [PATCH 0363/2561] libssh: update to 0.9.6.

---
 srcpkgs/libssh/patches/fix-includes.patch | 10 ----------
 srcpkgs/libssh/template                   |  9 +++++----
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/libssh/patches/fix-includes.patch

diff --git a/srcpkgs/libssh/patches/fix-includes.patch b/srcpkgs/libssh/patches/fix-includes.patch
deleted file mode 100644
index 39122128a307..000000000000
--- a/srcpkgs/libssh/patches/fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/libssh/libssh.h
-+++ b/include/libssh/libssh.h
-@@ -57,6 +57,7 @@
-   typedef unsigned long long uint64_t;
-   typedef int mode_t;
- #else /* _MSC_VER */
-+  #include <sys/types.h>
-   #include <unistd.h>
-   #include <inttypes.h>
- #endif /* _MSC_VER */
diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 9b57379bfc88..3732311abb24 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,9 +1,8 @@
 # Template file for 'libssh'
 pkgname=libssh
-version=0.9.5
-revision=2
+version=0.9.6
+revision=1
 build_style=cmake
-configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
 makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
@@ -11,8 +10,10 @@ short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.libssh.org/"
+changelog="https://git.libssh.org/projects/libssh.git/plain/ChangeLog?h=stable-${version%.*}"
 distfiles="https://git.libssh.org/projects/libssh.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=df65d6054554e8ff5458628808ce8d68b928175f4fefa1c833582b9568491e64
+checksum=63ddcb340e0898eb5c874418c1ff421cf90236fcb3fe5166675e79fa8a7511e4
+make_check=ci-skip # some tests fail when running as root
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="-DHAVE_GLOB=0" ;;

From 4d0d6782c738a2f68bfeceeaaa236d8e365fff2c Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Mon, 21 Mar 2022 09:33:41 +0100
Subject: [PATCH 0364/2561] google-chrome: update to 99.0.4844.82

---
 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 5516594f44f9..e12c57deeb5c 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.74
+version=99.0.4844.82
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=0444893153d4b3b628c6465c48e7c49f06649b101ce5ab066d59b14c363ef9f7
+checksum=b9c181ddc15760795a7c30b950d90a8ef78487825fb12b1e171d1f71fe8a107e
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 49f5e29c90208df1c492473dfa887db6b209633c Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Sun, 20 Mar 2022 19:51:34 -0600
Subject: [PATCH 0365/2561] dolphin-emu: update to 5.0.16101.

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

diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 4f00d57388e1..2b3a783943b8 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,8 +1,8 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.15993
+version=5.0.16101
 revision=1
-_dolphin_commit=5e595616379a694789fe749e40a27ef069f0090e
+_dolphin_commit=8ecfa537a242de74d2e372e30d9d79b14584b2fb
 _mgba_commit=40d4c430fc36caeb7ea32fd39624947ed487d2f2
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
 distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
  https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="d25e597356d410d71a825d881432ab40d66f65a5116412ec7d1661f414c72191
+checksum="a7bff69fce6466668c36e6c7ac3838434d64bb315cd2ad22817c943a9887f6e5
  3cabf00a97cf4fb15fe8524b3d02190acdd003f25967cdbbf8de958649b8061b"
 nopie=yes
 

From 30d2010798d02607d3b9c8602e2db7decf360805 Mon Sep 17 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, 21 Mar 2022 17:04:55 +0700
Subject: [PATCH 0366/2561] nyxt: fix musl runtime

While we're at it, load versioned libgi-repository.

Fix: #35877
Fix: #36243
Close: #36251
---
 srcpkgs/nyxt/patches/001-libfixposix.patch | 16 +++++++++-------
 srcpkgs/nyxt/patches/gir.patch             | 13 +++++++++++++
 srcpkgs/nyxt/template                      |  4 ++--
 3 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/nyxt/patches/gir.patch

diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch
index 23ef9da26442..7339c30acbe8 100644
--- a/srcpkgs/nyxt/patches/001-libfixposix.patch
+++ b/srcpkgs/nyxt/patches/001-libfixposix.patch
@@ -1,12 +1,14 @@
---- a/_build/iolib/src/syscalls/ffi-functions-unix.lisp.orig	2022-02-27 09:44:00.327307802 -0700
-+++ b/_build/iolib/src/syscalls/ffi-functions-unix.lisp	2022-02-27 09:48:30.875539336 -0700
-@@ -12,7 +12,8 @@
+Index: nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp
+===================================================================
+--- nyxt-2.2.4.orig/_build/iolib/src/syscalls/ffi-functions-unix.lisp
++++ nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp
+@@ -11,7 +11,8 @@
+ ;; FIXME: move this into an ASDF operation
  (eval-when (:compile-toplevel :load-toplevel :execute)
    (define-foreign-library
-       (libfixposix :canary "lfp_buildinfo")
--    (t (:default "libfixposix")))
+-      (libfixposix :canary "lfp_buildinfo")
++      (libfixposix :canary "lfp_buildinfo_not_exist")
 +    (:unix "libfixposix.so.3")
-+    (t (:default "libfixposix")))
+     (t (:default "libfixposix")))
    (load-foreign-library 'libfixposix))
  \f
- 
diff --git a/srcpkgs/nyxt/patches/gir.patch b/srcpkgs/nyxt/patches/gir.patch
new file mode 100644
index 000000000000..39f94a1d4dde
--- /dev/null
+++ b/srcpkgs/nyxt/patches/gir.patch
@@ -0,0 +1,13 @@
+Index: nyxt-2.2.4/_build/cl-gobject-introspection/src/init.lisp
+===================================================================
+--- nyxt-2.2.4.orig/_build/cl-gobject-introspection/src/init.lisp
++++ nyxt-2.2.4/_build/cl-gobject-introspection/src/init.lisp
+@@ -10,7 +10,7 @@
+     (t "libgobject-2.0"))
+   (cffi:define-foreign-library girepository
+     (:darwin "libgirepository-1.0.dylib")
+-    (:unix (:or "libgirepository-1.0.so" "libgirepository-1.0.so.1"))
++    (:unix (:or "libgirepository-1.0.so.1"))
+     (:windows (:or "libgirepository-1.0.dll" "libgirepository-1.0.0.dll"
+                    "libgirepository-1.0-1.dll"))
+     (t "libgirepository-1.0")))
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index a0da399fb2da..8fdd7215cd90 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,12 +1,12 @@
 # Template file for 'nyxt'
 pkgname=nyxt
 version=2.2.4
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target=all
 hostmakedepends="sbcl git"
-makedepends="webkit2gtk libfixposix-devel libgirepository-devel"
+makedepends="webkit2gtk libfixposix-devel libgirepository"
 depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"

From 3cb3a61c8cac0a76e775285a0bae9d4e98331a7b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 21 Mar 2022 14:06:08 +0100
Subject: [PATCH 0367/2561] z3: update to 4.8.15.

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

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index a907482b751d..2d5bf7a80954 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,6 +1,6 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.14
+version=4.8.15
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
 distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=96a1f49a7701120cc38bfa63c02ff93be4d64c7926cea41977dedec7d87a1364
+checksum=2abe7f5ecb7c8023b712ffba959c55b4515f4978522a6882391de289310795ac
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"

From e49cbb974d78ef45b5e31ebf69ecb50081b237db Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 21 Mar 2022 16:12:29 +0100
Subject: [PATCH 0368/2561] knot-resolver: update to 5.5.0.

---
 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 2f03d4420f03..f40c2f1646ee 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.4.4
+version=5.5.0
 revision=1
 build_style=meson
 configure_args="
@@ -19,7 +19,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=588964319e943679d391cc9c886d40ef858ecd9b33ae160023b4e2b5182b2cea
+checksum=4e6f48c74d955f143d603f6072670cb41ab9acdd95d4455d6e74b6908562c55a
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From 8bd3bff5dd269a47c61bbb313e95755763908f0a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 25 May 2021 12:08:54 +1100
Subject: [PATCH 0369/2561] patchelf: update to 0.14.5.

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

diff --git a/srcpkgs/patchelf/template b/srcpkgs/patchelf/template
index fe2dc3ccee4e..e0071fcf0b1b 100644
--- a/srcpkgs/patchelf/template
+++ b/srcpkgs/patchelf/template
@@ -1,11 +1,11 @@
 # Template file for 'patchelf'
 pkgname=patchelf
-version=0.10
+version=0.14.5
 revision=1
 build_style=gnu-configure
 short_desc="Utility for modifing existing ELF executables and libraries"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://nixos.org/patchelf.html"
-distfiles="https://nixos.org/releases/patchelf/patchelf-${version}/patchelf-${version}.tar.bz2"
-checksum=f670cd462ac7161588c28f45349bc20fb9bd842805e3f71387a320e7a9ddfcf3
+homepage="https://github.com/NixOS/patchelf"
+distfiles="${homepage}/releases/download/${version}/patchelf-${version}.tar.bz2"
+checksum=b9a46f2989322eb89fa4f6237e20836c57b455aa43a32545ea093b431d982f5c
diff --git a/srcpkgs/patchelf/update b/srcpkgs/patchelf/update
deleted file mode 100644
index dd90721fd90a..000000000000
--- a/srcpkgs/patchelf/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site='https://nixos.org/releases/patchelf/'
-pattern='patchelf-\K[\d.]+(?=/</a>)'

From 7c142518c4131c36edf42ac27d514dd9fe556d56 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 22 Mar 2022 11:51:31 +0100
Subject: [PATCH 0370/2561] warzone2100: don't install /usr/bin/.portable

it tricks keepassxc into portable mode

Closes: #36277
---
 srcpkgs/warzone2100/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 9ef2297baeb7..9c691626703f 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
 version=4.2.7
-revision=1
+revision=3
 wrksrc="warzone2100"
 build_style=cmake
 configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -28,6 +28,12 @@ post_extract() {
 	fi
 }
 
+post_install() {
+	# .portable has side-effect with keepassxc
+	# https://github.com/Warzone2100/warzone2100/issues/2645
+	rm "$DESTDIR"/usr/bin/.portable
+}
+
 warzone2100-data_package() {
 	short_desc+=" - data files"
 	pkg_install() {

From 2328d1e5c7fae68ba16ab7132259c00020d9b744 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 22 Mar 2022 16:19:05 +0100
Subject: [PATCH 0371/2561] skaffold: update to 1.37.0.

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

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index fa05e329472f..4f54c6c05e98 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.36.1
+version=1.37.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=b30361c02963d2374f2636f0181808f868834024f99ace74282c9f7416c1646a
+checksum=a97a6f6cbf571f342183e5cf65c30932ade282b182fc92f108cb2a160a46779b

From 1ce214704e975a34b3a32bf588528108069b7592 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Mon, 21 Mar 2022 20:11:35 +0700
Subject: [PATCH 0372/2561] vivaldi: update to 5.1.2567.66

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index e3421bb8539c..d36738824694 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.1.2567.57
+version=5.1.2567.66
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=ffb1f9ea4fc7eb9e99274f13a771999682ab1eef078641df6fcd48c1357ffd7a
+checksum=e2631cfabdd2d916fd8ab05004afd86efeec4e47d50a86b8be4cd3b59f6430ed
 repository=nonfree
 restricted=yes
 nostrip=yes

From 26fac6fbf5692c32c4e880b63d77b2ac5177ebdb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 22 Mar 2022 17:56:15 +0100
Subject: [PATCH 0373/2561] lollypop: update to 1.4.30.

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

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 2c2d8c329e63..569c4e291772 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,10 +1,11 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.29
+version=1.4.30
 revision=1
 build_style=meson
 hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config"
-makedepends="gtk+3-devel libsoup-devel python3-gobject-devel python3-devel"
+makedepends="gtk+3-devel libsoup-devel python3-gobject-devel python3-devel
+ libhandy1-devel"
 depends="dconf gst-libav gst-plugins-good1 libnotify libsecret
  python3-Pillow totem-pl-parser python3-BeautifulSoup4 libhandy1
  python3-gobject python3-pylast youtube-dl gnome-keyring"
@@ -13,4 +14,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/lollypop-${version}.tar.xz"
-checksum=f6975923315adc57ebe693e7cae9e2668d1d3f7f9a0e3209eda4b67f270761ee
+checksum=393c3ed6431026b3214f380b7aa74ee31b054203855f7f5c928b1d25ad1b8ef5

From 9e00bae32e1315e228df9d3208afd7ee9544081f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 22 Mar 2022 17:58:04 +0100
Subject: [PATCH 0374/2561] squashfs-tools: update to 4.5.1.

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

diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index 04b0bef6df6a..8b22de823ade 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'squashfs-tools'
 pkgname=squashfs-tools
-version=4.5
-revision=2
+version=4.5.1
+revision=1
 build_wrksrc="squashfs-tools"
 build_style=gnu-makefile
 make_use_env=yes
@@ -11,8 +11,9 @@ short_desc="Tool to create and append to squashfs filesystems"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/plougher/squashfs-tools"
+changelog="https://github.com/plougher/squashfs-tools/raw/master/CHANGES"
 distfiles="https://github.com/plougher/squashfs-tools/archive/refs/tags/${version}.tar.gz"
-checksum=b9e16188e6dc1857fe312633920f7d71cc36b0162eb50f3ecb1f0040f02edddd
+checksum=277b6e7f75a4a57f72191295ae62766a10d627a4f5e5f19eadfbc861378deea7
 
 do_install() {
 	vbin mksquashfs

From b510a4388fd310bf8f452cca2994fe962f243b4f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 21 Mar 2022 10:02:40 -0400
Subject: [PATCH 0375/2561] python-dbus: include egg-info metadata

Also drop python-dbus-devel, there is no value in carrying the metapkg.
---
 srcpkgs/python-dbus-devel    |  1 -
 srcpkgs/python-dbus/template | 64 ++++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 26 deletions(-)
 delete mode 120000 srcpkgs/python-dbus-devel

diff --git a/srcpkgs/python-dbus-devel b/srcpkgs/python-dbus-devel
deleted file mode 120000
index 082b5c2fc193..000000000000
--- a/srcpkgs/python-dbus-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-dbus
\ No newline at end of file
diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index 19ac9e7cbf0b..64c1ae021798 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -1,11 +1,11 @@
 # Template file for 'python-dbus'
 pkgname=python-dbus
 version=1.2.18
-revision=1
+revision=2
 wrksrc="dbus-python-${version}"
 build_style=gnu-configure
-hostmakedepends="pkg-config python-devel python3-devel"
-makedepends="libglib-devel ${hostmakedepends/pkg-config/}"
+hostmakedepends="pkg-config python python3"
+makedepends="libglib-devel python3-devel python-devel"
 depends="python dbus"
 short_desc="D-Bus Python2 bindings"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,35 +20,55 @@ pre_configure() {
 	mv * dbus-${py2_ver} || true
 	cp -a dbus-${py2_ver} dbus-${py3_ver}
 }
+
 do_configure() {
-	local py_abiver=
+	local py_abiver py_inc pyver
 	for pyver in $py2_ver $py3_ver; do
-		if [ "$pyver" != "$py2_ver" ]; then
-			py_inc="$py3_inc"
-			py_abiver="$py3_abiver"
-		else
-			py_inc="$py2_inc"
-		fi
+		case "${pyver}" in
+			"${py2_ver}")
+				py_inc="$py2_inc"
+				;;
+			*)
+				py_inc="$py3_inc"
+				py_abiver="$py3_abiver"
+				;;
+		esac
 
-		cd ${wrksrc}/dbus-${pyver}
 		export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py_inc}"
 		export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${py_abiver}"
 		export PYTHON_VERSION="${pyver}"
-		./configure ${configure_args}
+
+		( cd dbus-${pyver} && ./configure ${configure_args} )
+
 	done
+
+	unset PYTHON_CPPFLAGS PYTHON_EXTRA_LIBS PYTHON_VERSION
 }
+
 do_build() {
+	local pyver
 	for pyver in $py2_ver $py3_ver; do
-		cd ${wrksrc}/dbus-${pyver}
-		make ${makejobs}
+		( cd dbus-${pyver} && make ${makejobs} )
 	done
 }
+
 do_install() {
+	local pyver pysite eggver
 	for pyver in $py2_ver $py3_ver; do
-		cd ${wrksrc}/dbus-${pyver}
-		make DESTDIR=${DESTDIR} install
-		vlicense COPYING
+		case "${pyver}" in
+			"${py2_ver}") pysite="${py2_sitelib}" ;;
+			*) pysite="${py3_sitelib}" ;;
+		esac
+
+		eggver="dbus_python-${version}-py${pyver}"
+		(
+			cd dbus-${pyver}
+			make DESTDIR=${DESTDIR} install
+			vcopy dbus_python.egg-info "${pysite}/${eggver}.egg-info"
+		)
 	done
+
+	vlicense dbus-${py2_ver}/COPYING
 }
 
 python3-dbus_package() {
@@ -57,16 +77,10 @@ python3-dbus_package() {
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*
+		vlicense dbus-${py3_ver}/COPYING
 	}
 }
-# This package used to provide both Python 2 and Python 3 development files
-# Those files are now in python3-dbus-devel
-python-dbus-devel_package() {
-	depends="python-devel python-dbus>=${version}_${revision}
-	 python3-dbus-devel>=${version}_${revision}"
-	build_style=meta
-	short_desc+=" - development files (Python 2 meta)"
-}
+
 python3-dbus-devel_package() {
 	depends="python3-devel python3-dbus>=${version}_${revision}"
 	short_desc="${short_desc/Python2/Python3} - development files"

From 4c8c59f7985813cec1056e7b4445d91a54ffecb4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 21 Mar 2022 23:58:07 -0400
Subject: [PATCH 0376/2561] libusb: fix segfault

libusb/libusb#1073
---
 .../libusb/patches/late-transfer-free.patch   | 136 ++++++++++++++++++
 srcpkgs/libusb/template                       |   2 +-
 2 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libusb/patches/late-transfer-free.patch

diff --git a/srcpkgs/libusb/patches/late-transfer-free.patch b/srcpkgs/libusb/patches/late-transfer-free.patch
new file mode 100644
index 000000000000..f4d913bbbd84
--- /dev/null
+++ b/srcpkgs/libusb/patches/late-transfer-free.patch
@@ -0,0 +1,136 @@
+From 010691ff6fdf9fcfaa7f76c1417dfc1f7df124ca Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Tue, 15 Feb 2022 11:13:41 +0100
+Subject: [PATCH] io: Track device in usbi_transfer
+
+transfer->dev_handle currently has the behaviour that it will be unset
+if the device is closed. The sync API uses this fact to catch an error
+case.
+
+In other cases, transfer->dev_handle will keep its value, which means
+that if the transfer lives longer than the device handle, the pointer
+becomes invalid.
+
+The transfer does however keep a reference to the device, which owns the
+pointer to the context. As such, we can track this reference internal to
+the transfer, and it is set while the transfer is in-flight.
+
+With this, switch the logging infrastructure to use itransfer->dev->ctx
+while checking that itransfer->dev is non-NULL.
+
+Note that this was a regression caused by 6cae9c6dbd74 ("core: update
+usbi_dbg to take the context as an argument"), specifically when
+resolving the context while freeing a transfer after closing a device.
+
+Note that the transfer will now keep a reference to the device until it
+is free'ed. This allows it to use the correct context for logging even
+in libusb_free_transfer.
+
+The alternative to all this would be to just explicitly pass NULL to the
+log handler in libusb_free_transfer.
+
+Closes: #1038
+---
+ libusb/io.c      | 20 ++++++++++++--------
+ libusb/libusbi.h | 11 ++++++++---
+ 2 files changed, 20 insertions(+), 11 deletions(-)
+
+diff --git a/libusb/io.c b/libusb/io.c
+index 0d2ac9ea..b919e9d9 100644
+--- a/libusb/io.c
++++ b/libusb/io.c
+@@ -1344,6 +1344,8 @@ void API_EXPORTED libusb_free_transfer(struct libusb_transfer *transfer)
+ 
+ 	itransfer = LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
+ 	usbi_mutex_destroy(&itransfer->lock);
++	if (itransfer->dev)
++		libusb_unref_device(itransfer->dev);
+ 
+ 	priv_size = PTR_ALIGN(usbi_backend.transfer_priv_size);
+ 	ptr = (unsigned char *)itransfer - priv_size;
+@@ -1489,9 +1491,15 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
+ {
+ 	struct usbi_transfer *itransfer =
+ 		LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
+-	struct libusb_context *ctx = TRANSFER_CTX(transfer);
++	struct libusb_context *ctx;
+ 	int r;
+ 
++	assert(transfer->dev_handle);
++	if (itransfer->dev)
++		libusb_unref_device(itransfer->dev);
++	itransfer->dev = libusb_ref_device(transfer->dev_handle->dev);
++
++	ctx = HANDLE_CTX(transfer->dev_handle);
+ 	usbi_dbg(ctx, "transfer %p", transfer);
+ 
+ 	/*
+@@ -1551,8 +1559,6 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
+ 	r = usbi_backend.submit_transfer(itransfer);
+ 	if (r == LIBUSB_SUCCESS) {
+ 		itransfer->state_flags |= USBI_TRANSFER_IN_FLIGHT;
+-		/* keep a reference to this device */
+-		libusb_ref_device(transfer->dev_handle->dev);
+ 	}
+ 	usbi_mutex_unlock(&itransfer->lock);
+ 
+@@ -1659,7 +1665,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
+ {
+ 	struct libusb_transfer *transfer =
+ 		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+-	struct libusb_device_handle *dev_handle = transfer->dev_handle;
+ 	struct libusb_context *ctx = ITRANSFER_CTX(itransfer);
+ 	uint8_t flags;
+ 	int r;
+@@ -1693,7 +1698,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
+ 	 * this point. */
+ 	if (flags & LIBUSB_TRANSFER_FREE_TRANSFER)
+ 		libusb_free_transfer(transfer);
+-	libusb_unref_device(dev_handle->dev);
+ 	return r;
+ }
+ 
+@@ -1727,10 +1731,10 @@ int usbi_handle_transfer_cancellation(struct usbi_transfer *itransfer)
+  * function will be called the next time an event handler runs. */
+ void usbi_signal_transfer_completion(struct usbi_transfer *itransfer)
+ {
+-	libusb_device_handle *dev_handle = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)->dev_handle;
++	struct libusb_device *dev = itransfer->dev;
+ 
+-	if (dev_handle) {
+-		struct libusb_context *ctx = HANDLE_CTX(dev_handle);
++	if (dev) {
++		struct libusb_context *ctx = DEVICE_CTX(dev);
+ 		unsigned int event_flags;
+ 
+ 		usbi_mutex_lock(&ctx->event_data_lock);
+diff --git a/libusb/libusbi.h b/libusb/libusbi.h
+index 158a9af5..7618236f 100644
+--- a/libusb/libusbi.h
++++ b/libusb/libusbi.h
+@@ -329,10 +329,11 @@ void usbi_log(struct libusb_context *ctx, enum libusb_log_level level,
+ #endif /* ENABLE_LOGGING */
+ 
+ #define DEVICE_CTX(dev)		((dev)->ctx)
+-#define HANDLE_CTX(handle)	(DEVICE_CTX((handle)->dev))
+-#define TRANSFER_CTX(transfer)	(HANDLE_CTX((transfer)->dev_handle))
++#define HANDLE_CTX(handle)	((handle) ? DEVICE_CTX((handle)->dev) : NULL)
+ #define ITRANSFER_CTX(itransfer) \
+-	(TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)))
++	((itransfer)->dev ? DEVICE_CTX((itransfer)->dev) : NULL)
++#define TRANSFER_CTX(transfer) \
++	(ITRANSFER_CTX(LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer)))
+ 
+ #define IS_EPIN(ep)		(0 != ((ep) & LIBUSB_ENDPOINT_IN))
+ #define IS_EPOUT(ep)		(!IS_EPIN(ep))
+@@ -562,6 +563,10 @@ struct usbi_transfer {
+ 	uint32_t state_flags;   /* Protected by usbi_transfer->lock */
+ 	uint32_t timeout_flags; /* Protected by the flying_stransfers_lock */
+ 
++	/* The device reference is held until destruction for logging
++	 * even after dev_handle is set to NULL.  */
++	struct libusb_device *dev;
++
+ 	/* this lock is held during libusb_submit_transfer() and
+ 	 * libusb_cancel_transfer() (allowing the OS backend to prevent duplicate
+ 	 * cancellation, submission-during-cancellation, etc). the OS backend
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 7b63b401f2a6..4f192264d4bc 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,7 +1,7 @@
 # Template file for 'libusb'
 pkgname=libusb
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel"

From b2edcc1379ed369586f6a97c2e31cb8fa227a0d9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 22 Mar 2022 19:54:46 +0100
Subject: [PATCH 0377/2561] vim: update to 8.2.4609.

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

diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 252c84c21b18..f5ff0d9066a7 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
-version=8.2.4221
-revision=2
+version=8.2.4609
+revision=1
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="acl-devel ncurses-devel
  $(vopt_if x11 libXt-devel)
@@ -13,7 +13,7 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="Vim"
 homepage="https://www.vim.org"
 distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=4b81c03d54a5df697d74bc1eccc5939d6836b8fb58291eda5344c6ddb757ae57
+checksum=a9b150ed68cf41931e1af2f9fe8b958cf36ed1a14d00378ac8cebf7d8617afb1
 python_version=3
 
 build_options="x11 gtk3 huge"

From e9966dbdb4108342b828ecdb6c1b7cedd887aba3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 22 Mar 2022 20:24:14 +0100
Subject: [PATCH 0378/2561] fwupd: fix -devel dependencies

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

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 005880d7bcbf..9f15e0a43ddc 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,7 +1,7 @@
 # Template file for 'fwupd'
 pkgname=fwupd
 version=1.7.5
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true
@@ -60,7 +60,9 @@ pre_build() {
 }
 
 fwupd-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
+	depends="${sourcepkg}>=${version}_${revision} libglib-devel libcurl-devel
+	 libjcat-devel libgusb-devel libxmlb-devel libarchive-devel gcab-devel
+	 json-glib-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From da293199193e8192c42d7151d32d6800c0bf4cd6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:37:09 +0100
Subject: [PATCH 0379/2561] nautilus-sendto: remove package

---
 srcpkgs/nautilus-sendto/template  | 14 --------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/nautilus-sendto/template

diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template
deleted file mode 100644
index c357b9efae65..000000000000
--- a/srcpkgs/nautilus-sendto/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'nautilus-sendto'
-pkgname=nautilus-sendto
-version=3.8.6
-revision=2
-build_style=meson
-# XXX: add pidgin and gajim depends for plugins to work.
-hostmakedepends="pkg-config intltool"
-makedepends="evolution-data-server-devel nautilus-devel gupnp-devel appstream-glib-devel"
-short_desc="Nautilus context menu for sending files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://download.gnome.org/sources/nautilus-sendto/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c23125bb0cb4..30fa0d2cce34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -243,6 +243,7 @@ replaces="
  mongroup<=0.4.1_2
  mozjs68<=68.11.0_1
  mutagen<=1.43.0_3
+ nautilus-sendto<=3.8.6_2
  ncdns<=0.0.2_12
  newt-python<=0.52.21_5
  nodejs-lts-10<=10.24.0_2

From 045d2c0ab3af8088cb47a59a092a047a103f75c3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Mar 2022 13:55:28 +1100
Subject: [PATCH 0380/2561] jadx: update to 1.3.4.

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

diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template
index d5e2f69ab770..71467e34044c 100644
--- a/srcpkgs/jadx/template
+++ b/srcpkgs/jadx/template
@@ -1,6 +1,6 @@
 # Template file for 'jadx'
 pkgname=jadx
-version=1.3.3
+version=1.3.4
 revision=1
 hostmakedepends="openjdk8 gradle"
 short_desc="Decompiler for Dalvik bytecode"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/skylot/jadx"
 distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz"
-checksum=c423176c0b0675db6a9969133af3ec71d2568897155362fe50b0288e76bfe78d
+checksum=9f7f05c647a287fe4a572d85f14715559513e864d27f6bf6b19852529da8efdc
 
 do_build() {
 	gradle copyArtifacts

From 8baabab2ddb52d60d61eb8d201973e3644dbba4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 11:12:24 +0100
Subject: [PATCH 0381/2561] tau: update to 0.12.0.

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

diff --git a/srcpkgs/tau/template b/srcpkgs/tau/template
index d81968c76ac8..d1f9e9624997 100644
--- a/srcpkgs/tau/template
+++ b/srcpkgs/tau/template
@@ -1,11 +1,10 @@
 # Template file for 'tau'
 pkgname=tau
-version=0.11.3
+version=0.12.0
 revision=1
 build_style=meson
 build_helper=rust
-configure_args=" -Dxi-core=system"
-hostmakedepends="cargo gettext pkg-config rust glib-devel xi-editor"
+hostmakedepends="cargo gettext pkg-config glib-devel"
 makedepends="libhandy-devel rust-std vte3-devel"
 depends="xi-editor"
 checkdepends="appstream-glib desktop-file-utils"
@@ -13,8 +12,8 @@ short_desc="GTK frontend for the Xi text editor, written in Rust"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.gnome.org/World/Tau"
-distfiles="https://gitlab.gnome.org/World/Tau/uploads/b5f24cd692ec0c2a2c2be460fffaf505/tau-${version}.tar.xz"
-checksum=36e915de4ca906599b4ad176d4e2d625b454801a09ca0d4b0a1fbaf14915e60e
+distfiles="https://gitlab.gnome.org/World/Tau/uploads/14037a7f98f475d2497b74bd74a0430e/tau-${version}.tar.xz"
+checksum=a14e4c3511fa51cc051c33ad04a3989b93c6aa2405e8b0f5ac05970fe5d95449
 
 # this sometimes builds and sometimes doesn't, do not
 # reenable unless you can reliably build it every time

From 9c2ff6b767873bdb5577e8acbe6c009810eb2e63 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:02:00 -0500
Subject: [PATCH 0382/2561] Amass: update to 3.18.2.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 271551b6b159..c11b52a04657 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.17.1
+version=3.18.2
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ 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=5d11de26ce62dad9ddc4f36032a1192c2c126c4e23a31e1e04cb2d08098d5dfd
+checksum=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From 243ee06ce6a5feb23c6f4371f69a82e0efbe95be Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:04:08 -0500
Subject: [PATCH 0383/2561] QMPlay2: update to 22.03.19.

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

diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 463afde3a834..1c8571de2591 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=21.12.24
+version=22.03.19
 revision=1
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=92e5fa7f7df43a83f72bf9e87366ebae71148bc683db0556447981f0dd8e5f2d
+checksum=d6cde1cec25729d32a8cc1ba925b711b98d18961941f9764a7db8a75b255004e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a7a3e3ac22e0419b3d5453bd032ca965ed08b508 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:05:38 -0500
Subject: [PATCH 0384/2561] python3-rich: update to 12.0.1.

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

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 942d44da3fa2..c394edfbeade 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=11.2.0
+version=12.0.1
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,8 @@ 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=1a6266a5738115017bb64a66c59c717e7aa047b3ae49a011ede4abdeffc6536e
+checksum=3fba9dd15ebe048e2795a02ac19baee79dc12cc50b074ef70f2958cd651b59a9
+make_check=extended # some checks only work on windows
 
 post_install() {
 	vlicense LICENSE

From 7b6f31c76eb9486d8b9d41371352015b6c3e8388 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:08:55 -0500
Subject: [PATCH 0385/2561] python3-waitress: update to 2.1.1.

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

diff --git a/srcpkgs/python3-waitress/template b/srcpkgs/python3-waitress/template
index ae3ee23f6934..5e40d71a3d46 100644
--- a/srcpkgs/python3-waitress/template
+++ b/srcpkgs/python3-waitress/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-waitress'
 pkgname=python3-waitress
-version=2.1.0
+version=2.1.1
 revision=1
 wrksrc="waitress-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="ZPL-2.1"
 homepage="https://github.com/Pylons/waitress"
 distfiles="${PYPI_SITE}/w/waitress/waitress-${version}.tar.gz"
-checksum=ec8a8d9b6b15f3bb2c1a82b8f3929a029c333c35fcafb08c185a9e562d8cc9c2
+checksum=e2e60576cf14a1539da79f7b7ee1e79a71e64f366a0b47db54a15e971f57bb16

From 30499e948c736042f68bf7bd0d4bda0d2bc874f9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:09:04 -0500
Subject: [PATCH 0386/2561] ytmdl: update to 2022.03.16.

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

diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index dd28541cea49..5dfe4a7636a8 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,6 +1,6 @@
 # Template file for 'ytmdl'
 pkgname=ytmdl
-version=2021.11.07
+version=2022.03.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -16,7 +16,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/deepjyoti30/ytmdl"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=1de4cdd9f256acac5518637d533c0737e8f3ab13a4990e171f2ffd16d1bdfd8f
+checksum=cb2271e7e2e2db107848699dd7e56a7d9479b6ce20e5ddef8710bd7078543430
 # There is no test to run
 make_check=no
 

From 0d822cebd283b85fa70690f4f856e23cd08027af Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 14:49:45 +0100
Subject: [PATCH 0387/2561] pianobar: fix build

Close: #36316
---
 srcpkgs/pianobar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index 652db15ba46b..b7d991fef5a4 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_build_args="V=1"
 hostmakedepends="pkg-config"
 makedepends="faad2-devel ffmpeg-devel gnutls-devel json-c-devel libao-devel
- libcurl-devel"
+ libcurl-devel libgcrypt-devel"
 short_desc="Free/open-source, console-based client for Pandora radio"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"

From 9233f5b696f2c21fb8e2041959f5a2402a6fae3e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 23 Mar 2022 14:33:28 +0100
Subject: [PATCH 0388/2561] netpbm: update to 10.97.06.

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

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index db6f8708eb8d..d72721bd9eb3 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.97.05
+version=10.97.06
 revision=1
-_githash=9f95511f291ecc492e283932064857717678bb19
-_githash_guide=4571e910b4cc98268539768c98d9303dc052847b
+_githash=f336dfc59346a26a045f7e0df0ecba32d904c55e
+_githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79
 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="8d42d131931141d79848bf9320b63b8858c51651c0f1ebb2fc2da7e2bcd8c78d
- b782b5092a3da5fe804084f7e8eb2452e777dcbe73bc0f9634671eafe6a07392"
+checksum="9cd658ec9081b980a98fb44f02aa5289ba9ca17ad7e9a699627bf6f2a85c5612
+ 30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde"
 
 post_extract() {
 	cd $build_wrksrc

From c97bba169dd656892cb3eaa556c6cfa3c4c54d9f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 23 Mar 2022 14:35:23 +0100
Subject: [PATCH 0389/2561] tab: update to 9.1.

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

diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index 987ae0a0e9ec..b0e7720b1d23 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,15 +1,15 @@
 # Template file for 'tab'
 pkgname=tab
-version=9.0
+version=9.1
 revision=1
-wrksrc="tkatchev-tab-95a2e7a0d12d"
+wrksrc="tkatchev-tab-457574615bf4"
 checkdepends="python3"
 short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
 distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=1df7244af5db044fc4a6a38f2aa22e040246580bddd89bccb64d3967699d01d1
+checksum=ccc72e4c8a5f0d7786a8c4a4c8b8dd5599ad867c876605b2cacad7f32c30651a
 
 do_build() {
 	${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm

From 2e00ed66df28ee9aeab1a8b0a58e1f74636d67d3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 24 Mar 2022 15:52:34 +0100
Subject: [PATCH 0390/2561] parallel: update to 20220322.

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

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index dd16940a024d..030875ae0ffd 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20220122
+version=20220322
 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=b8221a21412bca572ad8445b7981dfd625a3c6d48772cda468dfb5b886337e00
+checksum=df93ccf6a9f529ad2126b7042aef0486603e938c77b405939c41702d38a4e6d8
 
 pre_configure() {
 	# no html and pdf doc

From 976470a20d34847ed2960bb1688f5a4a9a8789d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 22 Mar 2022 09:28:37 +0100
Subject: [PATCH 0391/2561] doomretro: update to 4.4.10.

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

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 5367dc8680ce..aa3010c9a7db 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.4.9
+version=4.4.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 changelog="https://raw.githubusercontent.com/bradharding/doomretro/master/releasenotes.md"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=02f2f3ec9d8d4db5ad1d00fcb5a5161113d3caa6dc108f14af8760535f00ce9e
+checksum=4f16113b576c6c76a1961b143437be67e149f1c24262f44dde0b81407c01e466

From bf182aaf9a5b98590e5b7ff7459bcf63b02b74af Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 17 Mar 2022 21:27:57 -0700
Subject: [PATCH 0392/2561] CLion: update to 2021.3.4.

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

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 7bcdc3545a25..65e76c206e6c 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.3.3
+version=2021.3.4
 revision=1
 archs="x86_64 aarch64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d
+checksum=f3b0b9e0dd0cd4aebef5d424e7a22868c732daad47d6c94f73630cef449ccf78
 repository=nonfree
 restricted=yes
 nopie=yes

From 2ef31401be271cd94b9c7db1d20b688a2f16ab35 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 17 Mar 2022 21:28:52 -0700
Subject: [PATCH 0393/2561] intellij-idea-ultimate-edition: update to 2021.3.3.

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

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 3340f9c0f0f2..92ad9135f3a9 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.3.2
+version=2021.3.3
 revision=1
 archs="i686 x86_64"
 create_wrksrc="true"
@@ -11,7 +11,7 @@ license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 _filename="ideaIU-${version}-no-jbr.tar.gz"
 distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=face5d154a2c9244b278bfc6dca37218ae3344090526a0679086eff9b0c56670
+checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
 repository=nonfree
 restricted=yes
 nopie=yes

From ae38670ae9ba3bf668d71da906d5fb75044ed3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 19 Mar 2022 22:50:25 +0100
Subject: [PATCH 0394/2561] New package: rootlesskit-0.14.6

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

diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
new file mode 100644
index 000000000000..15fbeba58f75
--- /dev/null
+++ b/srcpkgs/rootlesskit/template
@@ -0,0 +1,14 @@
+# Template file for 'rootlesskit'
+pkgname=rootlesskit
+version=0.14.6
+revision=1
+build_style=go
+go_import_path="github.com/rootless-containers/rootlesskit"
+go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl
+ ${go_import_path}/cmd/rootlesskit-docker-proxy"
+short_desc="Linux-native \"fake root\" for implementing rootless containers"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="Apache-2.0"
+homepage="https://github.com/rootless-containers/rootlesskit"
+distfiles="https://github.com/rootless-containers/rootlesskit/archive/v${version}.tar.gz"
+checksum=e27e4249f12cca44fc6e15a27f214f30fcb5f15646c813a90b6788bd9f0cfd4b

From c598b24e9bd9ce92628f13049fa08a5378812b55 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 18 Mar 2022 20:41:30 +0400
Subject: [PATCH 0395/2561] calibre: update to 5.39.0.

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

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index af47d8993ee0..9f59df3a0350 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.38.0
+version=5.39.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=82b46b2c9d0ba2c82d95940e285b1fa168d55998613d216fa6d60da7d68fc550
+checksum=2fbe45ec9d4dea481772cc290e27567efdba60cd9d2fe736713d9b1eb020582e
 python_version=3
 lib32disabled=yes
 nocross=yes

From 5bf24c06a49e78025b34cf860bd35ae12d63c8da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 24 Mar 2022 21:42:57 +0100
Subject: [PATCH 0396/2561] Amass: fix build

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index c11b52a04657..ea6584b868d1 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -10,7 +10,3 @@ 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=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb
-
-post_install() {
-	rm ${DESTDIR}/usr/bin/examples
-}

From 10e9529f675ecd4af796f45b8f72cebe3f20111f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 15:02:10 -0700
Subject: [PATCH 0397/2561] libadwaita: update to 1.1.0

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

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 37abdc5a2e5e..aef0032bfb7c 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091
+checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 3a3e7733450f41dc670ccd01829779686bebca92 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 13:48:28 +0100
Subject: [PATCH 0398/2561] New package: budgie-control-center-1.0.1

---
 srcpkgs/budgie-control-center-devel    |  1 +
 srcpkgs/budgie-control-center/template | 30 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/budgie-control-center-devel
 create mode 100644 srcpkgs/budgie-control-center/template

diff --git a/srcpkgs/budgie-control-center-devel b/srcpkgs/budgie-control-center-devel
new file mode 120000
index 000000000000..ff5de5ddf18f
--- /dev/null
+++ b/srcpkgs/budgie-control-center-devel
@@ -0,0 +1 @@
+budgie-control-center
\ No newline at end of file
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
new file mode 100644
index 000000000000..15d7ee0dca87
--- /dev/null
+++ b/srcpkgs/budgie-control-center/template
@@ -0,0 +1,30 @@
+# Template file for 'budgie-control-center'
+pkgname=budgie-control-center
+version=1.0.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
+ polkit python3 libxml2"
+makedepends="ModemManager-devel NetworkManager-devel accountsservice-devel
+ colord-devel colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel
+ gnome-online-accounts-devel gnome-settings-daemon-devel ibus-devel
+ libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel libnma-devel
+ polkit-devel pulseaudio-devel samba-devel upower-devel libxml2-devel
+ libX11-devel libXi-devel libepoxy-devel gdk-pixbuf-devel gtk+3-devel
+ libglib-devel cups-devel libgudev-devel libwacom-devel libsecret-devel
+ udisks2-devel gsound-devel libsoup-devel gcr-devel cheese-devel"
+depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
+ gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
+short_desc="Budgie Control Center"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/BuddiesOfBudgie/budgie-control-center"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-control-center/releases/download/v${version}/budgie-control-center-${version}.tar.xz"
+checksum=6c049d02600f6650238b4376a7eac77d8fcd786e9c603c4e4ec87cad0022028a
+
+budgie-control-center-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/pkgconfig
+	}
+}

From 49ad82f68d23ecb2547257856cb31e12711fd5f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 14:04:46 +0100
Subject: [PATCH 0399/2561] New package: budgie-desktop-view-1.2

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

diff --git a/srcpkgs/budgie-desktop-view/template b/srcpkgs/budgie-desktop-view/template
new file mode 100644
index 000000000000..57ec2a5790ad
--- /dev/null
+++ b/srcpkgs/budgie-desktop-view/template
@@ -0,0 +1,13 @@
+# Template file for 'budgie-desktop-view'
+pkgname=budgie-desktop-view
+version=1.2
+revision=1
+build_style=meson
+hostmakedepends="pkg-config intltool vala glib-devel"
+makedepends="libglib-devel gtk+3-devel vala-devel"
+short_desc="Budgie desktop icons application"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://github.com/BuddiesOfBudgie/budgie-desktop-view"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop-view/releases/download/v${version}/budgie-desktop-view-v${version}.tar.xz"
+checksum=8399fae4326e5a21dda889bd89cb16ed8201f2854dc5cbc12394b90420d4cf2e

From 01bcd3ee036ac7eb8b200a55c53ff2a29f84e735 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 01:27:41 +0100
Subject: [PATCH 0400/2561] budgie-screensaver: update to 5.0.

---
 srcpkgs/budgie-screensaver/patches/musl.patch | 12 ++++++++++++
 srcpkgs/budgie-screensaver/template           | 17 ++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/budgie-screensaver/patches/musl.patch

diff --git a/srcpkgs/budgie-screensaver/patches/musl.patch b/srcpkgs/budgie-screensaver/patches/musl.patch
new file mode 100644
index 000000000000..6f5c265f83ae
--- /dev/null
+++ b/srcpkgs/budgie-screensaver/patches/musl.patch
@@ -0,0 +1,12 @@
+diff --git a/src/subprocs.c b/src/subprocs.c
+index a378658..ba37650 100644
+--- a/src/subprocs.c
++++ b/src/subprocs.c
+@@ -36,6 +36,7 @@
+ # define fork  vfork
+ #endif /* VMS */
+ 
++#define _POSIX_SOURCE
+ #include <signal.h>		/* for the signal names */
+ 
+ #include <glib.h>
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index 971ebcdb4c28..b877543d33a0 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,14 +1,13 @@
 # Template file for 'budgie-screensaver'
 pkgname=budgie-screensaver
-version=4.0
-revision=2
-wrksrc=budgie-screensaver-v${version}
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool glib"
+version=5.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config intltool glib-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>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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
+homepage="https://github.com/BuddiesOfBudgie/budgie-screensaver"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-screensaver/releases/download/v${version}/budgie-screensaver-v${version}.tar.xz"
+checksum=611969a9f53e5d3148cad7445e95c94bfff6ea61c2f339969ecb5d9b51f6b871

From 74f37e84207e4eb09cc81f417563b73d785f35dc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 01:27:36 +0100
Subject: [PATCH 0401/2561] budgie-desktop: update to 10.6.

---
 srcpkgs/budgie-desktop/template | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 6d7dc6d139be..a65c395c994b 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,9 +1,7 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
-version=10.5.3
-revision=2
-create_wrksrc=yes
-build_wrksrc="$pkgname-$version"
+version=10.6
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false"
@@ -13,20 +11,14 @@ 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 budgie-screensaver"
+depends="gnome-session gnome-settings-daemon budgie-control-center elogind
+ gnome-themes-extra budgie-screensaver budgie-desktop-view"
 short_desc="Modern desktop environment from the Solus Project"
-maintainer="Lorem <notloremipsum@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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
- ${homepage}/commit/7a2835f2fa247e7201bb9e4a434bade8f4bfe86e.patch>mutter41.patch"
-checksum="878f4e6460c29740bf633c3b11ba97bcb788068c1460f82569938af2f1633b25
- 65430e84e33b1529aebae169ad8e0392abf1b5c4bb1b454d46f17dc37469d763"
-
-post_patch() {
-	patch -Np1 < ../mutter41.patch
-}
+homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
+checksum=ba297a10b547e6d7bf164406750b5c5dae98a7524978b30b4ad3cba9624def9e
 
 budgie-desktop-devel_package() {
 	short_desc+=" - development files"

From 3de95a703fc295d70f7314f8e8c0084538089f35 Mon Sep 17 00:00:00 2001
From: Barbaross <cullenrss@gmail.com>
Date: Thu, 17 Mar 2022 07:31:50 -0400
Subject: [PATCH 0402/2561] herbstluftwm: update to 0.9.4

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

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

From 56065c9b9c7890b23f0b2049bbd9cbc60fc71b73 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 25 Mar 2022 00:26:43 +0100
Subject: [PATCH 0403/2561] thermald: update to 2.4.9.

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

diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 8a3625e5c194..633a5a498121 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.8
+version=2.4.9
 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=3e5a5033339c021de41ed4f946dd39e13f79f722fb5bd98d798e83658184c39b
+checksum=fb793a2bfaae2e544ef62801075419587b0c045041c69eeafbf61959cce07fdb
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then

From 1e8e2d970f7ad049c2d7f545b8aec32fe51cda39 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 25 Mar 2022 15:01:20 +0100
Subject: [PATCH 0404/2561] kore: update to 4.2.1.

---
 srcpkgs/kore/patches/platform.patch | 11 -----------
 srcpkgs/kore/template               |  8 +++++---
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/kore/patches/platform.patch

diff --git a/srcpkgs/kore/patches/platform.patch b/srcpkgs/kore/patches/platform.patch
deleted file mode 100644
index cbacde0591b1..000000000000
--- a/srcpkgs/kore/patches/platform.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/misc/linux-platform.sh	2020-09-02 14:26:51.393112635 +0200
-+++ b/misc/linux-platform.sh	2020-09-02 14:28:26.281114976 +0200
-@@ -2,7 +2,7 @@
- #
- # Linux specific defines and system call maps.
- 
--PLATFORM=$(uname -m)
-+PLATFORM=${XBPS_TARGET_MACHINE}
- BASE=$(dirname $0)
- 
- case "$PLATFORM" in
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index 6c6e2d1378c2..52b7dbe718a2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,7 +1,7 @@
 # Template file for 'kore'
 pkgname=kore
-version=4.1.0
-revision=2
+version=4.2.1
+revision=1
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
@@ -14,9 +14,11 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"
 homepage="https://kore.io"
 distfiles="https://kore.io/releases/kore-${version}.tar.gz"
-checksum=b7d73b005fde0ea01c356a54e4bbd8a209a4dff9cf315802a127ce7267efbe61
+checksum=f76b108a4eefa27c89123f5d6a36b493b171e429be7a85d3dd1466ac87e7f15a
 disable_parallel_build=yes
 
+export TARGET_PLATFORM=${XBPS_TARGET_MACHINE}
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi

From 2041c184ddab4947c0ac57c8f2b6aa45dd0a64ca Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 25 Mar 2022 09:04:13 -0500
Subject: [PATCH 0405/2561] Amass: update to 3.18.3.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index ea6584b868d1..a33e92ce1d2c 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.18.2
+version=3.18.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=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb
+checksum=66eee8ffd300e67a540e9962d2526377677df04b1a3b436471e0a930dd422a9f

From 91ed36133206788ced2e97aebfd9980a542cce09 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 22:26:51 -0500
Subject: [PATCH 0406/2561] nvidia: update to 510.60.02.

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

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 43a6ba6821f0..3707accdab6e 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=510.47.03
+version=510.60.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=f2a421dae836318d3c0d96459ccb3af27e90e50c95b0faa4288af76279e5d690
+checksum=a800dfc0549078fd8c6e8e6780efb8eee87872e6055c7f5f386a4768ce07e003
 # 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 d51e9174b031598da984e04014ed0af989d26fec Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 25 Mar 2022 15:10:32 +0100
Subject: [PATCH 0407/2561] linux5.4: update to 5.4.187.

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

diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index a6dd16191de4..2b70d687ce1a 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.180 Kernel Configuration
+# Linux/arm64 5.4.187 Kernel Configuration
 #
 
 #
@@ -394,6 +394,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 771796079797..46c8f5c5c751 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.185
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=d15fe9da679bfb624f35f127a17559f6d037ad37a313cf5fd22ce155401f3787
+checksum=189e3db3f2af8578037f9c8b4710e1002bdd56f318c5f8589b40de889be9a7b8
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 4e16c16c91c2a866f4e34512b0c9f11a97704926 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 25 Mar 2022 15:15:24 +0100
Subject: [PATCH 0408/2561] linux4.19: update to 4.19.236.

---
 srcpkgs/linux4.19/files/arm64-dotconfig | 3 ++-
 srcpkgs/linux4.19/template              | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux4.19/files/arm64-dotconfig b/srcpkgs/linux4.19/files/arm64-dotconfig
index a2bf3cb34ad9..8268b16af7fc 100644
--- a/srcpkgs/linux4.19/files/arm64-dotconfig
+++ b/srcpkgs/linux4.19/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.230 Kernel Configuration
+# Linux/arm64 4.19.236 Kernel Configuration
 #
 
 #
@@ -449,6 +449,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 # CONFIG_ARMV8_DEPRECATED is not set
 CONFIG_ARM64_SW_TTBR0_PAN=y
 
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 840a4516d83e..f2fb29a3cf0c 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.235
+version=4.19.236
 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=530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598
+checksum=002ef6adcafe8d90571f8882280a9bef28d1aa7cc9a3f35a50afc4cb2ebe31c0
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 37111e9c7989e5cfd2c9e11859f7eea44d43872d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 25 Mar 2022 10:42:45 -0500
Subject: [PATCH 0409/2561] python3-youtubesearch: update to 1.6.3.

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

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 2e1c6fc13226..3d88fc1126aa 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
-version=1.6.2
+version=1.6.3
 revision=1
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/alexmercerind/youtube-search-python"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=d3d4081c319e839f8843f8e361c0b461d420fcd4d7aa4fcbdadf744af8208a8e
+checksum=bdb34757c5e390c4d20989d04317acbceffa94293693cbeecb493b079440dbd3
 make_check=no # no tests defined
 
 post_install() {

From bce8fbbe9f3f5a60da6dc41f1f66ae336b261955 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 25 Mar 2022 20:09:54 +0100
Subject: [PATCH 0410/2561] grml-rescueboot: update to 0.5.2.

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

diff --git a/srcpkgs/grml-rescueboot/template b/srcpkgs/grml-rescueboot/template
index dd08b8fa0402..41eb267a7806 100644
--- a/srcpkgs/grml-rescueboot/template
+++ b/srcpkgs/grml-rescueboot/template
@@ -1,6 +1,6 @@
 # Template file for 'grml-rescueboot'
 pkgname=grml-rescueboot
-version=0.5.1
+version=0.5.2
 revision=1
 archs="i686 x86_64"
 build_style="gnu-makefile"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://wiki.grml.org/doku.php?id=rescueboot"
 distfiles="https://github.com/grml/${pkgname}/archive/v${version}.tar.gz"
-checksum=03a2196f3b8cac67d16ba7a87e2a1a57d435a75712492a15ab98a2cd34543098
+checksum=14d37a44c7ef9b0d73cf4e3d3e2698e4a3683e719e02203ff69472b282582f9d
 
 do_build() {
 	:

From 30058265e7dd30ae71222a0e3f3ef04c1afca5ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:16:55 -0400
Subject: [PATCH 0411/2561] python3: update to 3.10.4.

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

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index df408f9ed74d..ed15b88359ff 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.10.3
+version=3.10.4
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -22,7 +22,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=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
+checksum=80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From f6846388acb33188153d42d6cd542487db136d52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:18:20 -0400
Subject: [PATCH 0412/2561] python3-tkinter: update to 3.10.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 bfe219597ff5..4aa0a732d032 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.10.3
+version=3.10.4
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -29,7 +29,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=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
+checksum=80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"

From 40f012be82ad97fc064d6b3fa19e02100290eb28 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:18:42 -0400
Subject: [PATCH 0413/2561] python3-pytools: update to 2022.1.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 3280c48dfb07..1cbf56dc08dd 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.1
+version=2022.1.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=3eebcc11923bf36fc42a9102d6e417a94817efb1aeb24d3149686dd5e3ec54d4
+checksum=5e824101880a246354756365880a65bb416f6a8cab6513b68fcbb48fba090fcb
 
 post_install() {
 	vlicense LICENSE

From 0ddd7d04a6f542c40eae65824487edfed36246e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:18:57 -0400
Subject: [PATCH 0414/2561] python3-pytz: update to 2022.1.

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

diff --git a/srcpkgs/python3-pytz/template b/srcpkgs/python3-pytz/template
index 7bddbf1ddfd3..9f9136df52fb 100644
--- a/srcpkgs/python3-pytz/template
+++ b/srcpkgs/python3-pytz/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytz'
 pkgname=python3-pytz
-version=2021.3
-revision=2
+version=2022.1
+revision=1
 wrksrc="pytz-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://pythonhosted.org/pytz/"
 distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.tar.gz"
-checksum=acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326
+checksum=1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7
 
 post_install() {
 	# use system tz database

From 65d68d9584a00eda771a8ab75bcbca805a59df80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:19:10 -0400
Subject: [PATCH 0415/2561] python3-setuptools-rust: update to 1.2.0.

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

diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index 9cd1c497793f..c2a506773cae 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-setuptools-rust'
 pkgname=python3-setuptools-rust
-version=1.1.2
+version=1.2.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3-semanticversion python3-tomli
- python3-setuptools python3-typing_extensions"
+depends="python3-semanticversion python3-setuptools python3-typing_extensions"
 short_desc="Setuptools plugin for Rust support"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/PyO3/setuptools-rust"
 changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1
+checksum=0a4ada479e8c7e3d8bd7cb56e1a29acc2b2bb98c2325051b0cdcb57d7f056de8
 # Tests have unpackaged dependencies
 make_check=no
 

From c13f66093cefe5b270c8cd2b0015c65740b3846d Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 25 Mar 2022 09:56:17 -0500
Subject: [PATCH 0416/2561] zfs: update to 2.1.4.

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

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 477c39614cd0..6c7b69345fd3 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.1.3
+version=2.1.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd
+checksum=3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

From c91e77151247cdd4b4960452384fbc7d95567528 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 15:08:23 -0700
Subject: [PATCH 0417/2561] libhandy1: update to 1.6.1

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

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 95803645bb70..fbbe35856b2f 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.5.0
+version=1.6.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 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 gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config gettext $(vopt_if gtk_doc gi-docgen) $(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"
@@ -17,15 +17,11 @@ 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=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
+checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4
 
 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
+build_options_default="gir glade gtk_doc"
 
 do_check() {
 	xvfb-run ninja -C build test
@@ -47,7 +43,7 @@ libhandy1-devel_package() {
 			vmove usr/share/vala
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 	}
 }

From 985455ea9eb94d35a99ce3b12a9315addbafdc0c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Mar 2022 17:14:32 +0100
Subject: [PATCH 0418/2561] mutter: update to 41.5.

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

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 5efabfea13b1..e3f7f7bf1ca8 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=41.4
+version=41.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55882695064aa6f0385cd1f7f7fab2c2a2ed2c9aec78f578faa07f5209ca529c
+checksum=2233e52528451620be8578ea1dc7ff30d7eb6701eb316e9d17c219df57a08ea7
 shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
  libmutter-cogl-pango-9.so"
 make_check=no # needs a full graphical session

From ed5d7c04377869fbcfe7e73ae66cc83dc1338a12 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Mar 2022 17:13:34 +0100
Subject: [PATCH 0419/2561] gnome-shell: update to 41.5.

* restore optional build dependencies

They were removed with GNOME 41, but are required for recorder and
bluetooth indicator

Closes #36291
---
 srcpkgs/gnome-shell/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 9cca8add22c7..ff60caafa4ec 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=41.4
+version=41.5
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,7 +10,8 @@ hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
 makedepends="gnome-control-center-devel at-spi2-atk-devel
  evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
- NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel"
+ NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel"
 depends="elogind gnome-control-center gsettings-desktop-schemas upower"
 checkdepends="xvfb-run mesa-dri $depends"
 short_desc="GNOME core user interface"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4
+checksum=efbe8d1179983d5c2e68b1035f073fefe01b15fbdaf68f48adff96fa355b0bc5
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From d44cb87a43b9f03630f02f4ed5a93dbaff6ca2a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:17:29 +0100
Subject: [PATCH 0420/2561] gnome-nibbles: fix build with recent vala

---
 srcpkgs/gnome-nibbles/patches/vala.patch | 178 +++++++++++++++++++++++
 1 file changed, 178 insertions(+)
 create mode 100644 srcpkgs/gnome-nibbles/patches/vala.patch

diff --git a/srcpkgs/gnome-nibbles/patches/vala.patch b/srcpkgs/gnome-nibbles/patches/vala.patch
new file mode 100644
index 000000000000..48c565303196
--- /dev/null
+++ b/srcpkgs/gnome-nibbles/patches/vala.patch
@@ -0,0 +1,178 @@
+From 62964e9256fcac616109af874dbb2bd8342a9853 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 17 Mar 2021 11:25:05 +0100
+Subject: [PATCH] Reference of [GtkChild] fields is handled by GtkBuilder, type
+ must be unowned
+
+---
+ src/controls.vala           | 20 ++++++++++----------
+ src/nibbles-window.vala     | 26 +++++++++++++-------------
+ src/players.vala            |  6 +++---
+ src/preferences-dialog.vala | 30 +++++++++++++++---------------
+ src/scoreboard.vala         |  6 +++---
+ 5 files changed, 44 insertions(+), 44 deletions(-)
+
+diff --git a/src/controls.vala b/src/controls.vala
+index 584c9ff..f95d210 100644
+--- a/src/controls.vala
++++ b/src/controls.vala
+@@ -22,7 +22,7 @@ using Gtk;
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls.ui")]
+ private class Controls : Box
+ {
+-    [GtkChild] private Box grids_box;
++    [GtkChild] private unowned Box grids_box;
+     private Gee.LinkedList<ControlsGrid> grids = new Gee.LinkedList<ControlsGrid> ();
+ 
+     private Gdk.Pixbuf arrow_pixbuf;
+@@ -100,15 +100,15 @@ private class Controls : Box
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls-grid.ui")]
+ private class ControlsGrid : Button
+ {
+-    [GtkChild] private Label name_label;
+-    [GtkChild] private Image arrow_up;
+-    [GtkChild] private Image arrow_down;
+-    [GtkChild] private Image arrow_left;
+-    [GtkChild] private Image arrow_right;
+-    [GtkChild] private Label move_up_label;
+-    [GtkChild] private Label move_down_label;
+-    [GtkChild] private Label move_left_label;
+-    [GtkChild] private Label move_right_label;
++    [GtkChild] private unowned Label name_label;
++    [GtkChild] private unowned Image arrow_up;
++    [GtkChild] private unowned Image arrow_down;
++    [GtkChild] private unowned Image arrow_left;
++    [GtkChild] private unowned Image arrow_right;
++    [GtkChild] private unowned Label move_up_label;
++    [GtkChild] private unowned Label move_down_label;
++    [GtkChild] private unowned Label move_left_label;
++    [GtkChild] private unowned Label move_right_label;
+ 
+     internal WormProperties worm_props;
+     internal ulong external_handler;
+diff --git a/src/nibbles-window.vala b/src/nibbles-window.vala
+index 6961326..6bfb74a 100644
+--- a/src/nibbles-window.vala
++++ b/src/nibbles-window.vala
+@@ -40,30 +40,30 @@ private class NibblesWindow : ApplicationWindow
+     private int window_height;
+ 
+     /* Main widgets */
+-    [GtkChild] private Stack main_stack;
+-    [GtkChild] private Overlay overlay;
++    [GtkChild] private unowned Stack main_stack;
++    [GtkChild] private unowned Overlay overlay;
+ 
+     /* HeaderBar */
+-    [GtkChild] private HeaderBar headerbar;
+-    [GtkChild] private MenuButton hamburger_menu;
+-    [GtkChild] private Button new_game_button;
+-    [GtkChild] private Button pause_button;
++    [GtkChild] private unowned HeaderBar headerbar;
++    [GtkChild] private unowned MenuButton hamburger_menu;
++    [GtkChild] private unowned Button new_game_button;
++    [GtkChild] private unowned Button pause_button;
+ 
+     /* Pre-game screen widgets */
+-    [GtkChild] private Players players;
+-    [GtkChild] private Speed speed;
+-    [GtkChild] private Controls controls;
++    [GtkChild] private unowned Players players;
++    [GtkChild] private unowned Speed speed;
++    [GtkChild] private unowned Controls controls;
+ 
+     /* Statusbar widgets */
+-    [GtkChild] private Stack statusbar_stack;
+-    [GtkChild] private Label countdown;
+-    [GtkChild] private Scoreboard scoreboard;
++    [GtkChild] private unowned Stack statusbar_stack;
++    [GtkChild] private unowned Label countdown;
++    [GtkChild] private unowned Scoreboard scoreboard;
+     private Gdk.Pixbuf scoreboard_life;
+ 
+     /* Rendering of the game */
+     private NibblesView? view;
+ 
+-    [GtkChild] private Box game_box;
++    [GtkChild] private unowned Box game_box;
+     private Games.GridFrame frame;
+ 
+     /* Game being played */
+diff --git a/src/players.vala b/src/players.vala
+index 9198412..4bde18e 100644
+--- a/src/players.vala
++++ b/src/players.vala
+@@ -21,9 +21,9 @@ using Gtk;
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/players.ui")]
+ private class Players : Box
+ {
+-    [GtkChild] private ToggleButton worms4;
+-    [GtkChild] private ToggleButton worms5;
+-    [GtkChild] private ToggleButton worms6;
++    [GtkChild] private unowned ToggleButton worms4;
++    [GtkChild] private unowned ToggleButton worms5;
++    [GtkChild] private unowned ToggleButton worms6;
+ 
+     private SimpleAction nibbles_number_action;
+     private SimpleAction players_number_action;
+diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
+index 216a1e2..2d3a7bf 100644
+--- a/src/preferences-dialog.vala
++++ b/src/preferences-dialog.vala
+@@ -24,21 +24,21 @@ private class PreferencesDialog : Window
+     private GLib.Settings settings;
+     private Gee.ArrayList<GLib.Settings> worm_settings;
+ 
+-    [GtkChild] private Stack            stack;
+-    [GtkChild] private Stack            headerbar_stack;
+-    [GtkChild] private ComboBoxText     worm_combobox;
+-    [GtkChild] private Gtk.ListStore    list_store_1;
+-    [GtkChild] private Gtk.ListStore    list_store_2;
+-    [GtkChild] private Gtk.ListStore    list_store_3;
+-    [GtkChild] private Gtk.ListStore    list_store_4;
+-    [GtkChild] private TreeView         tree_view_1;
+-    [GtkChild] private TreeView         tree_view_2;
+-    [GtkChild] private TreeView         tree_view_3;
+-    [GtkChild] private TreeView         tree_view_4;
+-    [GtkChild] private ComboBoxText     combo_box_1;
+-    [GtkChild] private ComboBoxText     combo_box_2;
+-    [GtkChild] private ComboBoxText     combo_box_3;
+-    [GtkChild] private ComboBoxText     combo_box_4;
++    [GtkChild] private unowned Stack            stack;
++    [GtkChild] private unowned Stack            headerbar_stack;
++    [GtkChild] private unowned ComboBoxText     worm_combobox;
++    [GtkChild] private unowned Gtk.ListStore    list_store_1;
++    [GtkChild] private unowned Gtk.ListStore    list_store_2;
++    [GtkChild] private unowned Gtk.ListStore    list_store_3;
++    [GtkChild] private unowned Gtk.ListStore    list_store_4;
++    [GtkChild] private unowned TreeView         tree_view_1;
++    [GtkChild] private unowned TreeView         tree_view_2;
++    [GtkChild] private unowned TreeView         tree_view_3;
++    [GtkChild] private unowned TreeView         tree_view_4;
++    [GtkChild] private unowned ComboBoxText     combo_box_1;
++    [GtkChild] private unowned ComboBoxText     combo_box_2;
++    [GtkChild] private unowned ComboBoxText     combo_box_3;
++    [GtkChild] private unowned ComboBoxText     combo_box_4;
+ 
+     private Gee.ArrayList<Gtk.ListStore>    list_stores;
+     private Gee.ArrayList<TreeView>         tree_views;
+diff --git a/src/scoreboard.vala b/src/scoreboard.vala
+index a41aee1..aebc1cc 100644
+--- a/src/scoreboard.vala
++++ b/src/scoreboard.vala
+@@ -59,9 +59,9 @@ private class Scoreboard : Box
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/player-score-box.ui")]
+ private class PlayerScoreBox : Box
+ {
+-    [GtkChild] private Label name_label;
+-    [GtkChild] private Label score_label;
+-    [GtkChild] private Grid lives_grid;
++    [GtkChild] private unowned Label name_label;
++    [GtkChild] private unowned Label score_label;
++    [GtkChild] private unowned Grid lives_grid;
+ 
+     private Gee.LinkedList<Image> life_images = new Gee.LinkedList<Image> ();
+ 
+-- 
+GitLab
+

From 5b844bdee6a594abf50ce0d32137b9e6b84a658a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 22:43:33 +0100
Subject: [PATCH 0421/2561] gnome-nibbles: fix build with recent vala (part2)

---
 srcpkgs/gnome-nibbles/patches/vala2.patch | 66 +++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 srcpkgs/gnome-nibbles/patches/vala2.patch

diff --git a/srcpkgs/gnome-nibbles/patches/vala2.patch b/srcpkgs/gnome-nibbles/patches/vala2.patch
new file mode 100644
index 000000000000..c7a86316925e
--- /dev/null
+++ b/srcpkgs/gnome-nibbles/patches/vala2.patch
@@ -0,0 +1,66 @@
+From 1b48446068608aff9b5edf1fdbd4b8c0d9f0be94 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 16 Jan 2021 13:56:10 +0100
+Subject: [PATCH] Don't alter or try to write [GtkChild] fields
+
+See https://gitlab.gnome.org/GNOME/vala/issues/1121
+---
+ src/controls.vala | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/src/controls.vala b/src/controls.vala
+index 4f07358..584c9ff 100644
+--- a/src/controls.vala
++++ b/src/controls.vala
+@@ -140,25 +140,25 @@ private class ControlsGrid : Button
+         arrow_left.set_from_pixbuf  (arrow.rotate_simple (Gdk.PixbufRotation.COUNTERCLOCKWISE));
+         arrow_right.set_from_pixbuf (arrow.rotate_simple (Gdk.PixbufRotation.CLOCKWISE));
+ 
+-           up_handler = worm_props.notify ["up"].connect    (() => configure_label (worm_props.up,    ref move_up_label));
+-         down_handler = worm_props.notify ["down"].connect  (() => configure_label (worm_props.down,  ref move_down_label));
+-         left_handler = worm_props.notify ["left"].connect  (() => configure_label (worm_props.left,  ref move_left_label));
+-        right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, ref move_right_label));
+-
+-        configure_label (worm_props.up,    ref move_up_label);
+-        configure_label (worm_props.down,  ref move_down_label);
+-        configure_label (worm_props.left,  ref move_left_label);
+-        configure_label (worm_props.right, ref move_right_label);
++           up_handler = worm_props.notify ["up"].connect    (() => configure_label (worm_props.up,    move_up_label));
++         down_handler = worm_props.notify ["down"].connect  (() => configure_label (worm_props.down,  move_down_label));
++         left_handler = worm_props.notify ["left"].connect  (() => configure_label (worm_props.left,  move_left_label));
++        right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, move_right_label));
++
++        configure_label (worm_props.up,    move_up_label);
++        configure_label (worm_props.down,  move_down_label);
++        configure_label (worm_props.left,  move_left_label);
++        configure_label (worm_props.right, move_right_label);
+     }
+ 
+     internal void mark_duplicated_keys (GenericSet<uint> duplicate_keys)
+     {
+-        set_duplicate_class (worm_props.up    in duplicate_keys, ref move_up_label);
+-        set_duplicate_class (worm_props.down  in duplicate_keys, ref move_down_label);
+-        set_duplicate_class (worm_props.left  in duplicate_keys, ref move_left_label);
+-        set_duplicate_class (worm_props.right in duplicate_keys, ref move_right_label);
++        set_duplicate_class (worm_props.up    in duplicate_keys, move_up_label);
++        set_duplicate_class (worm_props.down  in duplicate_keys, move_down_label);
++        set_duplicate_class (worm_props.left  in duplicate_keys, move_left_label);
++        set_duplicate_class (worm_props.right in duplicate_keys, move_right_label);
+     }
+-    private static void set_duplicate_class (bool new_value, ref Label label)
++    private static void set_duplicate_class (bool new_value, Label label)
+     {
+         if (new_value)
+             label.get_style_context ().add_class ("duplicate");
+@@ -175,7 +175,7 @@ private class ControlsGrid : Button
+         worm_props.disconnect (color_handler);
+     }
+ 
+-    private static void configure_label (uint key_value, ref Label label)
++    private static void configure_label (uint key_value, Label label)
+     {
+         string? key_name = Gdk.keyval_name (key_value);
+         if (key_name == "Up")
+-- 
+GitLab
+

From 1d614d4af22d0ab5800085ed4c9c7ea5504af364 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 12:37:45 +0100
Subject: [PATCH 0422/2561] aisleriot: update to 3.22.21.

---
 srcpkgs/aisleriot/patches/guile-2.2.patch | 36 +++++++++++++++++++++++
 srcpkgs/aisleriot/template                |  4 +--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/aisleriot/patches/guile-2.2.patch

diff --git a/srcpkgs/aisleriot/patches/guile-2.2.patch b/srcpkgs/aisleriot/patches/guile-2.2.patch
new file mode 100644
index 000000000000..eb2ce5610b44
--- /dev/null
+++ b/srcpkgs/aisleriot/patches/guile-2.2.patch
@@ -0,0 +1,36 @@
+From 5e9b538db5304ccfed6c0d048a94d8c47dd27e31 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Thu, 17 Feb 2022 23:51:15 +0100
+Subject: [PATCH] games: Only use -Ono-letrectify with guile 3.0
+
+This fixes a build failure on guile 2.2 where this flag is unknown.
+
+Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/925
+---
+ games/meson.build | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/games/meson.build b/games/meson.build
+index e552beab..56819b4d 100644
+--- a/games/meson.build
++++ b/games/meson.build
+@@ -122,9 +122,13 @@ guile_warnings = [
+   '-W1',
+ ]
+ 
+-guile_flags = [
+-  '-Ono-letrectify',
+-]
++guile_flags = []
++
++if guile_version.version_compare('>= 3.0')
++  guile_flags += [
++    '-Ono-letrectify',
++  ]
++endif
+ 
+ # FIXME: this should use files('...') (allowed as per docs),
+ # but that crashes meson, see https://gitlab.gnome.org/chpe/meson/issues/2
+-- 
+GitLab
+
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 6655dbb76606..d4d178b13c9e 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.20
+version=3.22.21
 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=e5f4d00156060a8ecf410ed5d4e485b0f19177c554009c2b0ea6ee6579af549a
+checksum=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655
 replaces="aisleriot-data>=0"

From 761d41c1a3700249a62d0c1661a5dc601f8ad3d8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 25 Mar 2022 11:15:28 -0400
Subject: [PATCH 0423/2561] dendrite: update to 0.7.0.

add MAX_OPEN_FILES variable with default set to value recommended by
upstream (65535).
---
 srcpkgs/dendrite/files/dendrite-monolith-server/run | 1 +
 srcpkgs/dendrite/template                           | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dendrite/files/dendrite-monolith-server/run b/srcpkgs/dendrite/files/dendrite-monolith-server/run
index 2fab17797c4d..66400fe89c54 100755
--- a/srcpkgs/dendrite/files/dendrite-monolith-server/run
+++ b/srcpkgs/dendrite/files/dendrite-monolith-server/run
@@ -1,5 +1,6 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
+ulimit -n ${MAX_OPEN_FILES:-65535}
 cd /var/lib/dendrite || exit 1
 exec 2>&1
 exec chpst -u _dendrite:_dendrite dendrite-monolith-server \
diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 7589a7944cec..1bef12b95642 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.6.5
+version=0.7.0
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=b74170bd3f81e2f22ff4673bc632e37afeef1121fa90acb03ed2eed17a387133
+checksum=26c378bff1738b0e8422c7bd425be4763f22225f422ae1854c78644e4ca8bc42
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"

From 7dcf3c80979da3c5ec21e495737e70568a64c227 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Fri, 25 Mar 2022 21:19:05 +0100
Subject: [PATCH 0424/2561] google-chrome: update to 99.0.4844.84

---
 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 e12c57deeb5c..e6a568ca685d 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.82
+version=99.0.4844.84
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=b9c181ddc15760795a7c30b950d90a8ef78487825fb12b1e171d1f71fe8a107e
+checksum=96f260f798f1adb471a3a5b8e68702ef88237884e32f0e43baf15a78aed5b669
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 5dcc16f257f115da7c83c3d98f601e07c0c3310f Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 22 Mar 2022 12:25:49 +0100
Subject: [PATCH 0425/2561] volta: update to 1.0.6

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

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index b8fc160cdda0..7874993281ec 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,6 +1,6 @@
 # Template file for 'volta'
 pkgname=volta
-version=1.0.5
+version=1.0.6
 revision=1
 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=8b3741376e639d0e2d2eec7a7b628ac1d70af7a2c459d9b01c05c4853f5680ae
+checksum=0f66edcb2639bee2c1668efd119c2937a77fbbe564c9d63827e8eaf37dbee4b9
 
 post_install() {
 	vlicense LICENSE

From 9b12b869b165a9a229d6e6ac50cbddfe09234520 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH 0426/2561] aerc: update to 0.9.0

---
 .../aerc/patches/makefile-only-install.patch  | 18 +++++++++++++++
 srcpkgs/aerc/template                         | 22 ++++++-------------
 2 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/aerc/patches/makefile-only-install.patch

diff --git a/srcpkgs/aerc/patches/makefile-only-install.patch b/srcpkgs/aerc/patches/makefile-only-install.patch
new file mode 100644
index 000000000000..696832fe736c
--- /dev/null
+++ b/srcpkgs/aerc/patches/makefile-only-install.patch
@@ -0,0 +1,18 @@
+Build style handles building and installing aerc binary.
+Makefile should only install remaining files.
+
+--- ./Makefile
++++ ./Makefile
+@@ -82,11 +82,10 @@
+ clean:
+ 	$(RM) $(DOCS) aerc
+ 
+-install: $(DOCS) aerc
++install: $(DOCS)
+ 	mkdir -m755 -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man7 \
+ 		$(DESTDIR)$(SHAREDIR) $(DESTDIR)$(SHAREDIR)/filters $(DESTDIR)$(SHAREDIR)/templates $(DESTDIR)$(SHAREDIR)/stylesets \
+ 		$(DESTDIR)$(PREFIX)/share/applications
+-	install -m755 aerc $(DESTDIR)$(BINDIR)/aerc
+ 	install -m644 aerc.1 $(DESTDIR)$(MANDIR)/man1/aerc.1
+ 	install -m644 aerc-search.1 $(DESTDIR)$(MANDIR)/man1/aerc-search.1
+ 	install -m644 aerc-config.5 $(DESTDIR)$(MANDIR)/man5/aerc-config.5
diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..30a431484026 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,29 +1,21 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.9.0
 revision=1
 build_style=go
-hostmakedepends="scdoc git"
+go_import_path="git.sr.ht/~rjarry/aerc"
+go_build_tags=notmuch
+go_ldflags="-X main.Version=${version}"
+hostmakedepends="scdoc"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
-
-do_configure() {
-	:
-}
-
-do_build() {
-	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
-}
-
-do_install() {
-	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
-}
+checksum=b5901feb37a55edd1f713e76c1012ac3fc0757202ddacd7d388cc7ce60638023
 
 post_install() {
+ 	make PREFIX=/usr DESTDIR=${DESTDIR} install
 	vlicense LICENSE
 }

From 87b9a19026fb87590ca11fdb2b5dc9d6a409314a Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@cold-front.org>
Date: Fri, 25 Mar 2022 10:33:02 -0400
Subject: [PATCH 0427/2561] pipewire: update to 0.3.48.

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

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 0924ae71ba1f..5ed1ee1d3bd6 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.47
+version=0.3.48
 revision=1
 _pms_version=0.4.1
 build_style=meson
@@ -32,7 +32,7 @@ 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
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="8d70170a91ecba73746c1d83f95d54eee8ca71d0c3521926f05ed830d8b5a84e
+checksum="0d218be86b3d2b548c06259c47ad8d110ee1c09f071e17c4393eeef5c880fa6f
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

From a1a70c04a0007f8764eea04354c08b50ba258671 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 17:16:45 +0100
Subject: [PATCH 0428/2561] retroarch: update to 1.10.2.

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

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index ed8e9da4394f..6b89a54d89a2 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.10.0
+version=1.10.2
 revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=ff9c31abae19528275e40fbe49ef40be9410b4108513ae7dbf325e210e5b5bec
+checksum=e426b8d30c25806e54c61f21d0d742695fa4f6bc6a271def4459db5460d28e8e
 
 build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"

From ae50898ce6655c7e3ac1897ec0454047d64f8b0c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 17 Mar 2022 08:55:25 -0400
Subject: [PATCH 0429/2561] python3-phonenumbers: update to 8.12.45.

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

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 9cb6d6a351f6..c4dd9b71d037 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.44
+version=8.12.45
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=26cfd0257d1704fe2f88caff2caabb70d16a877b1e65b6aae51f9fbbe10aa8ce
+checksum=94e30f59b2be6c4310a90f3d5da53d49900bdb440484506f3333c694ebb0cdab

From 71af5c6594f9441976b8e4ac8171089a86d6dcd7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 17 Mar 2022 08:53:53 -0400
Subject: [PATCH 0430/2561] synapse: update to 1.55.2.

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

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index f28f1313dcd0..1c07111f4247 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.54.0
+version=1.55.2
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -21,7 +21,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=6e9ee5f0657fe01c5d141101b11c2c2da147003f7f8e684ef44d4f462125b7a1
+checksum=8e06cb264d1631d2518f2f726c89d62c5ed7148b73fbb8190a9c120d3166e7c4
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 9cca298f23effffe5a0d66689a7e69fe900cdb27 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 6 Feb 2022 18:45:45 -0500
Subject: [PATCH 0431/2561] New package: conduit-0.3.0

---
 srcpkgs/conduit/files/conduit/log/run |  1 +
 srcpkgs/conduit/files/conduit/run     |  6 ++++++
 srcpkgs/conduit/template              | 29 +++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 120000 srcpkgs/conduit/files/conduit/log/run
 create mode 100644 srcpkgs/conduit/files/conduit/run
 create mode 100644 srcpkgs/conduit/template

diff --git a/srcpkgs/conduit/files/conduit/log/run b/srcpkgs/conduit/files/conduit/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/conduit/files/conduit/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/conduit/files/conduit/run b/srcpkgs/conduit/files/conduit/run
new file mode 100644
index 000000000000..a3a42e323623
--- /dev/null
+++ b/srcpkgs/conduit/files/conduit/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+ulimit -n ${MAX_OPEN_FILES:-8192}
+export CONDUIT_CONFIG=${CONDUIT_CONFIG:-/etc/conduit/conduit.toml}
+
+exec chpst -u _conduit:_conduit conduit
diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template
new file mode 100644
index 000000000000..c2e423e79891
--- /dev/null
+++ b/srcpkgs/conduit/template
@@ -0,0 +1,29 @@
+# Template file for 'conduit'
+pkgname=conduit
+version=0.3.0
+revision=1
+wrksrc="conduit-v${version}"
+build_style=cargo
+hostmakedepends="clang"
+short_desc="Simple, fast and reliable chat server powered by Matrix"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://conduit.rs/"
+distfiles="https://gitlab.com/famedly/conduit/-/archive/v${version}/conduit-v${version}.tar.gz"
+checksum=9e750ed2b8d0e986b1cdc02278124b39c11fa785f2763914836978a5a79863e3
+
+system_accounts="_conduit"
+_conduit_homedir="/var/lib/conduit"
+
+make_dirs="/var/lib/conduit 0700 _conduit _conduit
+ /etc/conduit 755 _conduit _conduit"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	XBPS_CROSS_RUSTFLAGS+=" -latomic"
+fi
+
+post_install() {
+	vsconf conduit-example.toml conduit.toml
+	vsv conduit
+}

From 71dd8042f4045c73138a2a1e11be3c6efcff9564 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 12:35:01 +0100
Subject: [PATCH 0432/2561] Venom: remove package

* not maintained, doesn't build with recent vala versions
---
 srcpkgs/Venom/template            | 16 ----------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 srcpkgs/Venom/template

diff --git a/srcpkgs/Venom/template b/srcpkgs/Venom/template
deleted file mode 100644
index deb714982db1..000000000000
--- a/srcpkgs/Venom/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'Venom'
-pkgname=Venom
-version=0.5.5
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config glib-devel"
-makedepends="gtk+3-devel libgee08-devel gspell-devel
- libcanberra-devel sqlcipher-devel json-glib-devel
- libsoup-devel toxcore-devel libsodium-devel
- opus-devel libvpx-devel gstreamer1-devel"
-short_desc="Modern Tox client for the desktop"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/naxuroqa/Venom/"
-distfiles="https://github.com/naxuroqa/Venom/archive/${version}.tar.gz"
-checksum=0348e26d70b0614b6ee3d50fb6c086ae1f696ed250d8ea80eec28299bee23562
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 30fa0d2cce34..5003333859c9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -12,6 +12,7 @@ replaces="
  ImageMagick6<=6.9.12.12_2
  MoinMoin<=1.9.11_1
  Platinum9-theme<=0.0.0.20170720_3
+ Venom<=0.5.5_1
  XorCurses<=0.2.2_1
  acme-client<=0.1.16_5
  albert<=0.16.1_4

From dcbf80e5921254072403e7e317144648c8329664 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:09:02 +0100
Subject: [PATCH 0433/2561] granite: update to 6.2.0.

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

diff --git a/common/shlibs b/common/shlibs
index 2d8a8b8b0df3..dd26ddee444b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1190,7 +1190,7 @@ libconfig.so.11 libconfig-1.7.1_1
 libopusfile.so.0 opusfile-0.12_2
 libopusurl.so.0 opusfile-0.12_2
 libopusenc.so.0 libopusenc-0.2_1
-libgranite.so.5 granite-0.5.0_1
+libgranite.so.6 granite-6.2.0_1
 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
 librlog.so.5 librlog-1.4_1
 libtinyxml.so.0 tinyxml-2.6.2_1
diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template
index 2ae77d6ee66c..f3a53c4165bb 100644
--- a/srcpkgs/granite/template
+++ b/srcpkgs/granite/template
@@ -1,10 +1,10 @@
 # Template file for 'granite'
 pkgname=granite
-version=5.5.0
+version=6.2.0
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config gettext vala"
 makedepends="gtk+3-devel libgee08-devel"
 depends="hicolor-icon-theme"
 short_desc="GTK3 widget library for elementary OS"
@@ -12,7 +12,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/elementary/granite"
 distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz"
-checksum=0c376520c7d462fca05213a14970ee1075fea4a78062a33b47529e2647cd5557
+checksum=067d31445da9808a802fca523630c3e4b84d2d7c78ae547ced017cb7f3b9c6b5
 
 granite-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 0dca9520aae987f40a3f1819b9edff6ce3574796 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:02 +0100
Subject: [PATCH 0434/2561] Minder: revbump for granite 6, build translations

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

diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index da4f9b751c20..8ee716a6f9f3 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,9 +1,9 @@
 # Template file for 'Minder'
 pkgname=Minder
 version=1.14.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config glib-devel vala"
+hostmakedepends="pkg-config gettext glib-devel vala"
 makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
  libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel json-glib-devel"
 short_desc="Mind-mapping application designed for Pantheon"

From 0b5478dfc38fd23f47e9fd01391ce6aaff24f234 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:02 +0100
Subject: [PATCH 0435/2561] bookworm: revbump for granite 6, build translations

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

diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 3e319fb786d9..0205a6e62427 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -1,9 +1,9 @@
 # Template file for 'bookworm'
 pkgname=bookworm
 version=1.1.2
-revision=4
+revision=5
 build_style=meson
-hostmakedepends="pkg-config glib-devel vala"
+hostmakedepends="pkg-config glib-devel gettext vala"
 makedepends="gtk+3-devel libgee08-devel granite-devel
  webkit2gtk-devel sqlite-devel poppler-glib-devel
  libxml2-devel glib-devel libsoup-devel"

From 8346bc9887546c6ce04f5fedcb6a5148d3f09e04 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 0436/2561] notes-up: update to 2.0.6.

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

diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template
index 481a214cfbc2..55db14d47b32 100644
--- a/srcpkgs/notes-up/template
+++ b/srcpkgs/notes-up/template
@@ -1,6 +1,6 @@
 # Template file for 'notes-up'
 pkgname=notes-up
-version=2.0.5
+version=2.0.6
 revision=1
 wrksrc=Notes-up-${version}
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="https://github.com/Philip-Scott/Notes-up"
 distfiles="https://github.com/Philip-Scott/Notes-up/archive/${version}.tar.gz"
-checksum=56ddf5ab3468c3bbb806106c41b485b020ade3c7f48d271bda1e78ddce5e1664
+checksum=6e7b6ac4a3a917867a1555db0a6e03e40ccd9955b5d76e980a26fa8e40744f07
 
 post_install() {
 	ln -s com.github.philip_scott.notes-up ${DESTDIR}/usr/bin/notes-up

From 9af70956f10a11310738a2f506ec0737fe3ed66f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 0437/2561] nutty: revbump for granite 6, build translations

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

diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index 37396577835b..eb263a89af4d 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -1,18 +1,18 @@
 # Template file for 'nutty'
 pkgname=nutty
 version=1.1.1
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config vala glib-devel"
+hostmakedepends="pkg-config gettext vala glib-devel"
 makedepends="gtk+3-devel libgee08-devel libnotify-devel granite-devel
  sqlite-devel"
 short_desc="Network Utility"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/babluboy/nutty"
-distfiles="${homepage}/archive/${version}.tar.gz"
+distfiles="https://github.com/babluboy/nutty/archive/${version}.tar.gz"
 checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
-python_version=2 #unverified
+python_version=2
 
 post_install() {
 	vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications

From cf9ee116541112c6f3be39b853397764d7248b4f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 0438/2561] pantheon-agent-polkit: revbump for granite 6

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

diff --git a/srcpkgs/pantheon-agent-polkit/template b/srcpkgs/pantheon-agent-polkit/template
index c2ae95b313e4..4285532c67b5 100644
--- a/srcpkgs/pantheon-agent-polkit/template
+++ b/srcpkgs/pantheon-agent-polkit/template
@@ -1,13 +1,13 @@
 # Template file for 'pantheon-agent-polkit'
 pkgname=pantheon-agent-polkit
 version=1.0.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="intltool pkg-config vala gobject-introspection"
+hostmakedepends="gettext pkg-config vala gobject-introspection"
 makedepends="gtk+3-devel polkit-devel granite-devel"
 short_desc="Pantheon Polkit Agent"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
+homepage="https://github.com/elementary/pantheon-agent-polkit"
+distfiles="https://github.com/elementary/pantheon-agent-polkit/archive/${version}.tar.gz"
 checksum=8e730f335545a4ca2717e1c9ccad61c329c1f19ea51f76ae4783da9e0416d484

From 33267a80630161741425f360f3ef7d0260e30f14 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0439/2561] pantheon-screenshot: update to 6.0.2.

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

diff --git a/srcpkgs/pantheon-screenshot/template b/srcpkgs/pantheon-screenshot/template
index 3492b0c0d49e..fb2ee8e7b095 100644
--- a/srcpkgs/pantheon-screenshot/template
+++ b/srcpkgs/pantheon-screenshot/template
@@ -1,18 +1,18 @@
 # Template file for 'pantheon-screenshot'
 pkgname=pantheon-screenshot
-version=1.7.1
+version=6.0.2
 revision=1
 wrksrc="screenshot-${version}"
 build_style=meson
-hostmakedepends="desktop-file-utils glib-devel intltool pkgconf vala"
-makedepends="granite-devel libcanberra-devel"
-depends="desktop-file-utils gdk-pixbuf gtk+3 hicolor-icon-theme"
+hostmakedepends="desktop-file-utils glib-devel gettext pkg-config vala"
+makedepends="granite-devel libcanberra-devel libhandy1-devel"
+depends="desktop-file-utils gdk-pixbuf hicolor-icon-theme"
 short_desc="Screenshot tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-only"
 homepage="https://github.com/elementary/screenshot-tool"
 distfiles="https://github.com/elementary/screenshot-tool/archive/${version}.tar.gz"
-checksum=2789abf01b9b41ae62e39eea4d5765dd606898435e1723939a06301922c431e2
+checksum=af1d67b196a22af529190f593183ff2eebad51a1329be7279cddb7dc0ce406f4
 
 post_install() {
 	ln -s io.elementary.screenshot-tool "$DESTDIR"/usr/bin/"$pkgname"

From dbeed3a28755a0dbe0b1cb82b478bb2e02656a94 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0440/2561] planner: update to 3.0.6.

---
 srcpkgs/planner/template | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index 7be79ab4c6ba..b55a40f9306f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,32 +1,19 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.7
+version=3.0.6
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel curl"
-makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel libpeas-devel libhandy1-devel"
+makedepends="libgee08-devel granite-devel webkit2gtk-devel libsoup-devel
+ libhandy1-devel json-glib-devel"
 depends="io.elementary.icons io.elementary.stylesheet curl"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=cd34953867a91b2992aa4eafddc5093a695d1e6096571ade75640dddcc425d69
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" evolution-data-server-devel"
-fi
-pre_configure() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		# In musl libc there is no _NL_TIME_FIRST_WEEKDAY in langinfo.h
-		# thus replace Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
-		# with 0; (sunday)
-		vsed -i src/Services/Calendar/CalendarModel.vala \
-			-e "s#\(int week_start =\) Posix.*#\1 0;#"
-	fi
-}
+checksum=345a9ad2220820f08f583321e874528eee9f7e009236127efacee72d071c7ea5
 
 post_install() {
 	vinstall data/com.github.alainm23.planner.desktop.in 644 \

From 4a0bbf67604e7b951167a86ea18a07a4c964ffbc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0441/2561] quickDocs: revbump for granite 6

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

diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template
index 940ad376d9c7..c4a22e6bbe7d 100644
--- a/srcpkgs/quickDocs/template
+++ b/srcpkgs/quickDocs/template
@@ -1,7 +1,7 @@
 # Template file for 'quickDocs'
 pkgname=quickDocs
 version=2.2.6
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="vala pkg-config"
 makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel"

From 80a6caf402fa109b4af14b238dc8cf5be05e8c3d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0442/2561] sequeler: revbump for granite 6

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

diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..32f127dc5c6e 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,7 +1,7 @@
 # Template file for 'sequeler'
 pkgname=sequeler
 version=0.8.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
 makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel

From 1ed05ba5da3bfb4c89d41ec0b20eb60c1e20b756 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0443/2561] switchboard: update to 6.0.0.

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

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index ebb706e5d9e5..9397fea8cdeb 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -1,16 +1,16 @@
 # Template file for 'switchboard'
 pkgname=switchboard
-version=2.3.7
-revision=2
+version=6.0.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config vala gettext"
-makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
+makedepends="granite-devel gtk+3-devel libhandy1-devel"
 short_desc="Extensible System Settings app designed for elementary OS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/elementary/switchboard"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=373db840b254897b2a59f6f421508f8f1361adc5d4d35b7963ba024e5c8234c9
+distfiles="https://github.com/elementary/switchboard/archive/${version}.tar.gz"
+checksum=40c2fd17535cba239b7c78b62d93a3f5ef7e990b31a7c4ecf04cba0c2b60d792
 
 switchboard-devel_package() {
 	short_desc+=" - development files"

From 7f207024023d15349fe51ab9f8fb4b5f31a04ffa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 0444/2561] switchboard-plug-bluetooth: update to 2.3.6.

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

diff --git a/srcpkgs/switchboard-plug-bluetooth/template b/srcpkgs/switchboard-plug-bluetooth/template
index 373368918159..b1b6977a5269 100644
--- a/srcpkgs/switchboard-plug-bluetooth/template
+++ b/srcpkgs/switchboard-plug-bluetooth/template
@@ -1,13 +1,13 @@
 # Template file for 'switchboard-plug-bluetooth'
 pkgname=switchboard-plug-bluetooth
-version=2.3.0
+version=2.3.6
 revision=1
 build_style=meson
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
 makedepends="switchboard-devel granite-devel gtk+3-devel"
 short_desc="Switchboard Bluetooth Plug"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ffeb4cdb53696b241e203f4e0920bb90c05fd77b99a05bd9483cb4c8367f1000
+homepage="https://github.com/elementary/switchboard-plug-bluetooth"
+distfiles="https://github.com/elementary/switchboard-plug-bluetooth/archive/${version}.tar.gz"
+checksum=fec5d135dc17c3ab1396cbe78f255e767f1834dfc4db8ec30579ff0ef29836b9

From f40ac2d0a3156afc3e3327f3bd32befe96dedb25 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 0445/2561] switchboard-plug-network: update to 2.4.2.

* build translations
* enable cross builds
---
 srcpkgs/switchboard-plug-network/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index 31f640cf25df..382aea7559a0 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,15 +1,14 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.3.3
+version=2.4.2
 revision=1
 build_style=meson
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
 makedepends="switchboard-devel granite-devel gtk+3-devel
  libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/switchboard-plug-network"
-distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
-checksum=a2f29b3054c187f2be9688bb04b6800cf4c2d3dd74cdd4fa37626f0b2ac5df50
-nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"
+distfiles="https://github.com/elementary/switchboard-plug-network/archive/${version}.tar.gz"
+checksum=190b1f9123bc9ee4120a624ad3de91c0e40a141cb19b8eb7ec74d3c39f008971

From f4135e0d46954dd611dcff0c5854b28e56fa7744 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 0446/2561] switchboard-plug-printers: update to 2.1.10.

---
 .../patches/fix-signal_subscribe.patch        | 11 ---------
 .../patches/ftbfs.patch                       | 23 -------------------
 srcpkgs/switchboard-plug-printers/template    | 10 ++++----
 3 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
 delete mode 100644 srcpkgs/switchboard-plug-printers/patches/ftbfs.patch

diff --git a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
deleted file mode 100644
index 48eb8948a642..000000000000
--- a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/CUPSNotifier.vala	2018-11-28 12:34:33.000000000 +0100
-+++ b/src/CUPSNotifier.vala	2021-01-29 19:26:11.191992396 +0100
-@@ -63,7 +63,7 @@
-         Bus.get_proxy.begin<NotifierDBus> (BusType.SYSTEM, "org.cups.cupsd.Notifier", "/org/cups/cupsd/Notifier", GLib.DBusProxyFlags.NONE, null, (obj, res) => {
-             try {
-                 dbus_notifier = Bus.get_proxy.end (res);
--                ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, subscription_callback);
-+                ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, (GLib.DBusSignalCallback)subscription_callback);
-             } catch (IOError e) {
-                 critical (e.message);
-             }
diff --git a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch b/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
deleted file mode 100644
index e8e21e2c4841..000000000000
--- a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3175c2ebf106145a95355d2571e0a2aa4834e884 Mon Sep 17 00:00:00 2001
-From: Enerccio <admin@en-circle.com>
-Date: Tue, 17 Sep 2019 15:31:37 +0200
-Subject: [PATCH] Update cups.vapi (#118)
-
-Fixed bug with compilation
----
- vapi/cups.vapi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vapi/cups.vapi b/vapi/cups.vapi
-index 7f1b795..5dcdba6 100644
---- a/vapi/cups.vapi
-+++ b/vapi/cups.vapi
-@@ -605,7 +605,7 @@ namespace CUPS {
- 			[CCode (cname = "ippAddBooleans")]
- 			private unowned Attribute _add_booleans (Tag group, string name, [CCode (array_length_pos = 0.9)] char[] values);
- 			public unowned Attribute add_booleans (Tag group, string name, bool[] values) {
--				char[] char_values;
-+				char[] char_values = {};
- 				foreach (var val in values) {
- 					char_values += val ? 1 : 0;
- 				}
diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template
index caecd10c886c..05f3c86abd79 100644
--- a/srcpkgs/switchboard-plug-printers/template
+++ b/srcpkgs/switchboard-plug-printers/template
@@ -1,14 +1,14 @@
 # Template file for 'switchboard-plug-printers'
 pkgname=switchboard-plug-printers
-version=2.1.6
+version=2.1.10
 revision=1
 build_style=meson
-hostmakedepends="pkg-config vala intltool"
+hostmakedepends="pkg-config vala gettext"
 makedepends="switchboard-devel granite-devel gtk+3-devel cups-devel"
 depends="cups-pk-helper"
 short_desc="Switchboard Printers Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=fe2c748e3737c3304ea8613d43d5ba8596f95499a65b8d13f93c4f702901f442
+homepage="https://github.com/elementary/switchboard-plug-printers"
+distfiles="https://github.com/elementary/switchboard-plug-printers/archive/${version}.tar.gz"
+checksum=448f6ae28fc4dacc2c329532e21aacc4ec7aa4af7d93bd6d7013002253faef3d

From 430d844a9cde0be1332588ea2a0046f51e1d52ed Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:59:08 +0100
Subject: [PATCH 0447/2561] io.elementary.calculator: update to 1.7.2.

---
 srcpkgs/io.elementary.calculator/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index 56abf698403b..35a363c7ae9a 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,17 +1,17 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
-version=1.6.0
-revision=2
+version=1.7.2
+revision=1
 wrksrc="calculator-${version}"
 build_style=meson
-hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"
-makedepends="granite-devel gtk+3-devel"
+hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream"
+makedepends="granite-devel gtk+3-devel libhandy1-devel"
 short_desc="Calculator app designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/elementary/calculator"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c650d5ff7d2df2d122ade0cbd35be50927f22b0d260f28e374b1112114f24540
+checksum=d296d06b36a0c7dd84e7e91e9801989e83312612d6ee6f0479030c1b340d397b
 
 pantheon-calculator_package() {
 	depends="io.elementary.calculator>=${version}_${revision}"

From 9a3a5cefb6074fc2edfc4708b7a0ce65871824e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:06 +0100
Subject: [PATCH 0448/2561] io.elementary.calendar: update to 6.1.0.

---
 .../patches/00-musl.patch                     | 65 ++++++++++---------
 .../01-fix-build-without-locale-command.patch | 32 +++++++++
 srcpkgs/io.elementary.calendar/template       | 18 ++---
 3 files changed, 76 insertions(+), 39 deletions(-)
 create mode 100644 srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch

diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch
index f85beca403fa..9b50a7e6e259 100644
--- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch
+++ b/srcpkgs/io.elementary.calendar/patches/00-musl.patch
@@ -1,44 +1,49 @@
-commit c9ba80af072819261a9e24a04a0859b93b5db810
-Author: Cameron Nemo <camerontnorman@gmail.com>
-Date:   Thu Oct 18 11:33:15 2018 -0700
-
-    Check for _NL_TIME_FIRST_WEEKDAY declaration
-
-diff --git core/Model/CalendarModel.vala core/Model/CalendarModel.vala
-index 3e3b8cbd..b33f75f8 100644
---- a/core/Model/CalendarModel.vala
-+++ b/core/Model/CalendarModel.vala
-@@ -68,7 +68,11 @@ public class Maya.Model.CalendarModel : Object {
-     }
- 
-     private CalendarModel () {
+--- a/core/Services/Calendar/EventStore.vala
++++ b/core/Services/Calendar/EventStore.vala
+@@ -304,6 +304,7 @@ public class Calendar.EventStore : Object {
+         // number we want, so we convert the pointer address to a uint to get
+         // the data. Since the pointer address is actually data, using it as a
+         // pointer will segfault.
++#if HAVE_NL_TIME_WEEK_1STDAY
+         uint week_day1 = (uint) Posix.NLTime.WEEK_1STDAY.to_string ();
+         var week_1stday = 0; // Default to 0 if unrecognized data
+         if (week_day1 == 19971130) { // Sunday
+@@ -313,6 +314,9 @@ public class Calendar.EventStore : Object {
+         } else {
+             warning ("Unknown value of _NL_TIME_WEEK_1STDAY: %u", week_day1);
+         }
++#else
++        var week_1stday = 0;
++#endif
+         /* The offset between GLib and local POSIX numbering.
+          * If week_1stday is Monday, data is correct for GLib: Monday=1 through Sunday=7,
+          * so offset is 0.
+@@ -323,7 +327,11 @@ public class Calendar.EventStore : Object {
+         // Get the start of week
+         // HACK This line produces a string of 3 bytes. It takes the raw value
+         // of the first one and uses that as the value of week_start.
 +#if HAVE_NL_TIME_FIRST_WEEKDAY
-         int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
+         int week_start_posix = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
 +#else
-+        int week_start = 0;
++        int week_start_posix = 0;
 +#endif
-         if (week_start >= 1 && week_start <= 7) {
-             week_starts_on = (Maya.Settings.Weekday)week_start-1;
-         }
-diff --git meson.build meson.build
-index a0cd2dd7..02b4e1d1 100644
+ 
+         var week_start = week_start_posix + glib_offset;
+         if (week_start == 0) { // Sunday special case
 --- a/meson.build
 +++ b/meson.build
-@@ -31,7 +31,17 @@ folks_dep = dependency('folks')
- geocode_glib_dep = dependency('geocode-glib-1.0')
- gclue_dep = dependency('libgeoclue-2.0')
+@@ -48,7 +48,14 @@ else
+     add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala')
+ endif
  
 -m_dep = meson.get_compiler('c').find_library('m', required : false)
 +cc = meson.get_compiler('c')
 +m_dep = cc.find_library('m', required : false)
-+libnotify_dep = dependency('libnotify', required: false)
-+
-+if libnotify_dep.found()
-+    add_project_arguments('--define=HAVE_LIBNOTIFY', language: 'vala')
-+endif
-+
 +if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY')
 +    add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala')
++endif
++if cc.has_header_symbol('langinfo.h', '_NL_TIME_WEEK_1STDAY')
++    add_project_arguments('--define=HAVE_NL_TIME_WEEK_1STDAY', language: 'vala')
 +endif
  
  gresource_calendar = gnome.compile_resources(
diff --git a/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch b/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch
new file mode 100644
index 000000000000..6513e4c5422b
--- /dev/null
+++ b/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch
@@ -0,0 +1,32 @@
+--- a/core/Tests/meson.build
++++ b/core/Tests/meson.build
+@@ -18,15 +18,20 @@ util_tests = executable(
+ )
+ test('Utils Tests', util_tests, suite: 'core', is_parallel: false)
+ 
++locale_prog = find_program('locale', required: false)
+ # We need these three locales to run the tests
+-locales = run_command('locale', '-a').stdout().split('\n')
+-if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8')
+-    eventstore_tests = executable(
+-      tests_name + '-eventstore',
+-      'eventstore-tests.vala',
+-      dependencies: tests_deps
+-    )
+-    test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false)
++if locale_prog.found()
++  locales = run_command(locale_prog, '-a').stdout().split('\n')
++  if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8')
++      eventstore_tests = executable(
++        tests_name + '-eventstore',
++        'eventstore-tests.vala',
++        dependencies: tests_deps
++      )
++      test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false)
++  else
++    message('EventStore Tests have been disabled, a locale is missing in the system.')
++  endif
+ else
+-message('EventStore Tests have been disabled, a locale is missing in the system.')
++    message('EventStore Tests have been disabled, the locale command is missing in the system.')
+ endif
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index a5ea019353a0..bf87c7599001 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,22 +1,21 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
-version=5.0
-revision=6
-_git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
-wrksrc="calendar-${_git_commit}"
+version=6.1.0
+revision=1
+wrksrc="calendar-${version}"
 build_style=meson
 build_helper="gir"
-hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream
+hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
  glib-devel evolution-data-server-devel"
 makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
- libchamplain-devel clutter-devel evolution-data-server-devel
+ libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
  folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
 short_desc="Desktop calendar app designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/elementary/calendar"
-distfiles="${homepage}/archive/${_git_commit}.tar.gz"
-checksum=3be3851baeed67144e5cbed209b2c1b982fe9830db13372e3051423295dee345
+distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz"
+checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d
 
 libio.elementary.calendar_package() {
 	short_desc+=" - library"
@@ -28,7 +27,8 @@ libio.elementary.calendar_package() {
 libio.elementary.calendar-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.calendar>=${version} evolution-data-server-devel
-	 granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel"
+	 granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel
+	 libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From 9278fef1fd70ea02b4979b04b26007d336573d43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:04 +0100
Subject: [PATCH 0449/2561] io.elementary.code: update to 6.1.0.

---
 .../io.elementary.code/patches/vala050.patch  | 25 -------------------
 srcpkgs/io.elementary.code/template           | 18 ++++++-------
 2 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/io.elementary.code/patches/vala050.patch

diff --git a/srcpkgs/io.elementary.code/patches/vala050.patch b/srcpkgs/io.elementary.code/patches/vala050.patch
deleted file mode 100644
index ec3abb8fd9f0..000000000000
--- a/srcpkgs/io.elementary.code/patches/vala050.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a185de0e7716aa2de2bf21de96e6c9af1dca81aa Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 20:43:07 +0200
-Subject: [PATCH] fix with vala-0.50
-
----
- plugins/outline/Vala/ValaSymbolOutline.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git plugins/outline/Vala/ValaSymbolOutline.vala plugins/outline/Vala/ValaSymbolOutline.vala
-index c8db339..31386a6 100644
---- a/plugins/outline/Vala/ValaSymbolOutline.vala
-+++ b/plugins/outline/Vala/ValaSymbolOutline.vala
-@@ -61,7 +61,7 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline
- 
-     public void parse_symbols () {
-         var context = new Vala.CodeContext ();
--        context.profile = Vala.Profile.GOBJECT;
-+        context.set_target_profile(Vala.Profile.GOBJECT);
-         context.add_source_filename (doc.file.get_path ());
-         context.report = new Report ();
-         if (cancellable != null)
--- 
-2.28.0
-
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 05d84cc39c9f..c47d667b8a96 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,19 +1,19 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
-version=3.4.1
-revision=5
+version=6.1.0
+revision=1
 wrksrc="code-${version}"
 build_style=meson
-hostmakedepends="pkg-config vala intltool glib-devel"
+hostmakedepends="pkg-config vala gettext polkit glib-devel"
 makedepends="editorconfig-devel libgee08-devel granite-devel libpeas-devel
- gtksourceview-devel vte3-devel gtkspell3-devel zeitgeist-devel libsoup-devel
- webkit2gtk-devel gtk+3-devel libgit2-glib-devel"
+ gtksourceview4-devel vte3-devel gtkspell3-devel libsoup-devel
+ gtk+3-devel libgit2-glib-devel polkit-devel libhandy1-devel"
 short_desc="Code editor designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/code"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=d84b38193b72cd93995aae604358c83c5b6976d8472ce985027b947cfed990bf
+distfiles="https://github.com/elementary/code/archive/${version}.tar.gz"
+checksum=d44851eb827dc9a069ab81b6a9cfe255795e3319a6882ca344152781968ce3ce
 
 libio.elementary.code_package() {
 	short_desc+=" - library"
@@ -25,8 +25,8 @@ libio.elementary.code_package() {
 libio.elementary.code-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.code>=${version} fontconfig-devel granite-devel
-	 gtk+3-devel gtksourceview-devel libgee08-devel libgit2-glib-devel
-	 libglib-devel libpeas-devel pango-devel zeitgeist-devel"
+	 gtk+3-devel gtksourceview4-devel libgee08-devel libgit2-glib-devel
+	 libglib-devel libpeas-devel pango-devel polkit-devel libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From 1f9e7f010dc7343bd57594d0cb18ea5091c33b5e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:07 +0100
Subject: [PATCH 0450/2561] io.elementary.files: update to 6.1.2.

---
 common/shlibs                        |  4 ++--
 srcpkgs/io.elementary.files/template | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dd26ddee444b..ffcc843af85c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,8 +3524,8 @@ libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
-libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1
-libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1
+libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1
+libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1
 libwlroots.so.9 wlroots0.14-0.14.1_1
 libwlroots.so.10 wlroots-0.15.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template
index cb0643a02449..0e8d5fb177d6 100644
--- a/srcpkgs/io.elementary.files/template
+++ b/srcpkgs/io.elementary.files/template
@@ -1,20 +1,20 @@
 # Template file for 'io.elementary.files'
 pkgname=io.elementary.files
-version=4.5.0
+version=6.1.2
 revision=1
 wrksrc="files-${version}"
 build_style=meson
-configure_args="-Dwith-unity=disabled"
-hostmakedepends="vala glib-devel pkg-config intltool"
+configure_args="-Dsystemduserunitdir=no"
+hostmakedepends="vala glib-devel pkg-config gettext"
 makedepends="gtk+3-devel libglib-devel libgee08-devel sqlite-devel plank-devel
  libcanberra-devel granite-devel pango-devel zeitgeist-devel dbus-glib-devel
- libnotify-devel libcloudproviders-devel libgit2-glib-devel"
+ libnotify-devel libcloudproviders-devel libgit2-glib-devel libhandy1-devel"
 short_desc="File browser designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/files"
 distfiles="https://github.com/elementary/files/archive/${version}.tar.gz"
-checksum=987f87df2a74c97cb866b34a20ea395ae1f67d03c9517185494860653fbc065c
+checksum=2a328d8df901186bb700c835064c9a526e5694545b668df512282773cfaa7b08
 
 CFLAGS="-fcommon"
 
@@ -28,7 +28,7 @@ libio.elementary.files_package() {
 libio.elementary.files-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.files>=${version} libgee08-devel gtk+3-devel
-	 libcanberra-devel libglib-devel zeitgeist-devel"
+	 libcanberra-devel libglib-devel zeitgeist-devel libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From aebab20e0f2cd0d8a3218c9e7fe974ae083dc15d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:04 +0100
Subject: [PATCH 0451/2561] io.elementary.icons: update to 6.1.0.

---
 srcpkgs/io.elementary.icons/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index fb3a6c06cc84..95dbc0ca3ddb 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -1,6 +1,6 @@
 # Template file for 'io.elementary.icons'
 pkgname=io.elementary.icons
-version=5.3.1
+version=6.1.0
 revision=1
 wrksrc="icons-${version}"
 build_style=meson
@@ -11,8 +11,8 @@ short_desc="Named, vector icons for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/icons"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=67b349453f8990e399521bb8d96f4caf4c23a27cf22cbc18ddacf0e817c59e12
+distfiles="https://github.com/elementary/icons/archive/${version}.tar.gz"
+checksum=bab0f638a60d7a28bf269f4a11346b28495a819e3f516403a7e0bb880c441c2f
 
 post_install() {
 	# How did that get there?

From 13c0b451fb649ec22bcd5bc2fd1df12999964c1e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:07 +0100
Subject: [PATCH 0452/2561] io.elementary.music: update to 5.1.1.

---
 .../io.elementary.music/patches/vala-array-size.patch | 11 -----------
 srcpkgs/io.elementary.music/template                  | 11 ++++++-----
 2 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/io.elementary.music/patches/vala-array-size.patch

diff --git a/srcpkgs/io.elementary.music/patches/vala-array-size.patch b/srcpkgs/io.elementary.music/patches/vala-array-size.patch
deleted file mode 100644
index 2cc268cdae64..000000000000
--- a/srcpkgs/io.elementary.music/patches/vala-array-size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/core/GStrewamer/Equalizer.vala	2020-03-04 23:50:04.000000000 +0100
-+++ b/core/GStreamer/Equalizer.vala	2020-12-14 15:53:22.359597220 +0100
-@@ -31,7 +31,7 @@
-     construct {
-         element = Gst.ElementFactory.make ("equalizer-10bands", "equalizer");
- 
--        int[10] freqs = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000};
-+        int freqs[10] = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000};
- 
-         float last_freq = 0;
-         for (int index = 0; index < 10; index++) {
diff --git a/srcpkgs/io.elementary.music/template b/srcpkgs/io.elementary.music/template
index de6ae0f94d90..3ef8c1568630 100644
--- a/srcpkgs/io.elementary.music/template
+++ b/srcpkgs/io.elementary.music/template
@@ -1,20 +1,21 @@
 # Template file for 'io.elementary.music'
 pkgname=io.elementary.music
-version=5.0.5
+version=5.1.1
 revision=1
 wrksrc="music-${version}"
 build_style=meson
 configure_args="-Dbuild-plugins=true -Dplugins=audioplayer,cdrom,ipod"
-hostmakedepends="vala desktop-file-utils intltool pkg-config AppStream glib-devel"
+hostmakedepends="vala desktop-file-utils gettext pkg-config AppStream glib-devel"
 makedepends="taglib-devel granite-devel vala-devel gtk+3-devel libgee08-devel
  clutter-gtk-devel dbus-glib-devel libgda-devel libgpod-devel libxml2-devel
- json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel"
+ json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel
+ libhandy1-devel"
 short_desc="Music player and library designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/music"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ed7cba3b07189273890b321b21cda198f18b102e4466eb7207c0b5f27b31dfc9
+checksum=35e97ec496327b4eb388308168711bf9f8e976a857eb97bca21805f83abf9d15
 
 libio.elementary.music_package() {
 	short_desc+=" - library"
@@ -26,7 +27,7 @@ libio.elementary.music-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.music>=${version} granite-devel
 	 gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libglib-devel
-	 libpeas-devel"
+	 libpeas-devel libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From 95221a431c05027d3174590198f5d3b9bff71874 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:05 +0100
Subject: [PATCH 0453/2561] io.elementary.photos: update to 2.7.4.

---
 .../patches/fix-meson.patch                   | 95 -------------------
 srcpkgs/io.elementary.photos/template         | 11 +--
 2 files changed, 5 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/io.elementary.photos/patches/fix-meson.patch

diff --git a/srcpkgs/io.elementary.photos/patches/fix-meson.patch b/srcpkgs/io.elementary.photos/patches/fix-meson.patch
deleted file mode 100644
index 820e3b8ef96d..000000000000
--- a/srcpkgs/io.elementary.photos/patches/fix-meson.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 27e529fc96da828982563e2e19a6f0cef883a29e Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 22 Jul 2020 19:35:53 +0200
-Subject: [PATCH] meson: Properly include config.vapi and config.h (#578)
-
----
- meson.build     | 21 +++++++++++++++++++--
- src/meson.build | 13 -------------
- 2 files changed, 19 insertions(+), 15 deletions(-)
-
-diff --git meson.build meson.build
-index 5edb5314..9bebaca0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -11,14 +11,33 @@ add_project_arguments([
-         '-Wno-unused',
-         '-Wl,--enable-new-dtags',
- 
-+        '-include', 'config.h',
-         '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name())
-     ],
-     language: 'c',
- )
-+add_project_arguments([
-+        '--vapidir', join_paths(meson.current_source_dir(), 'vapi'),
-+        '--pkg', 'config',
-+    ],
-+    language: 'vala',
-+)
- 
- libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), meson.project_name())
- pluginsdir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
- 
-+conf_data = configuration_data()
-+conf_data.set_quoted('PROJECT_NAME', meson.project_name())
-+conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-+conf_data.set_quoted('_VERSION', meson.project_version())
-+conf_data.set_quoted('_PREFIX', get_option('prefix'))
-+conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
-+conf_data.set_quoted('_LIBEXECDIR', libexecdir)
-+config_header = configure_file(
-+    output : 'config.h',
-+    configuration : conf_data
-+)
-+
- gnome = import('gnome')
- i18n = import('i18n')
- 
-@@ -52,7 +71,6 @@ gstreamer_plugins_base_vapi = meson.get_compiler('vala').find_library('gstreamer
- gstreamer_plugins_base_dep = declare_dependency(dependencies: [gstreamer_plugins_base_vapi])
- lconv_dep = meson.get_compiler('vala').find_library('LConv', dirs: join_paths(meson.current_source_dir(), 'vapi'))
- linux_dep = meson.get_compiler('vala').find_library('linux')
--config_dep = meson.get_compiler('vala').find_library('config', dirs: join_paths(meson.current_source_dir(), 'vapi'))
- 
- vapi_include = include_directories('./vapi')
- 
-@@ -82,7 +100,6 @@ dependencies = [
-     webkit2gtk_dep,
-     lconv_dep,
-     linux_dep,
--    config_dep
- ]
- 
- add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi')], language: 'vala')
-diff --git src/meson.build src/meson.build
-index 45bf4c1b..1215d778 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -4,18 +4,6 @@ library_files = files(
-     'plugins/TransitionsInterfaces.vala'
- )
- 
--conf_data = configuration_data()
--conf_data.set_quoted('PROJECT_NAME', meson.project_name())
--conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
--conf_data.set_quoted('_VERSION', meson.project_version())
--conf_data.set_quoted('_PREFIX', get_option('prefix'))
--conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
--conf_data.set_quoted('_LIBEXECDIR', libexecdir)
--config_header = configure_file(
--    output : 'config.h',
--    configuration : conf_data
--)
--
- photos_files = files(
-     'AppDirs.vala',
-     'Application.vala',
-@@ -233,7 +221,6 @@ photos_exe = executable(
-     meson.project_name(),
-     photos_files,
-     library_files,
--    config_header,
-     icons_gresource,
-     global_gresource,
-     dependencies: dependencies,
diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 81c1734164ba..d0f69169be3b 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,22 +1,21 @@
 # Template file for 'io.elementary.photos'
 pkgname=io.elementary.photos
-version=2.7.0
-revision=2
+version=2.7.4
+revision=1
 wrksrc="photos-${version}"
 build_style=meson
-configure_args="-Dlibunity=false"
-hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream
+hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
  glib-devel python3-scour"
 makedepends="libaccounts-glib-devel libexif-devel libgee08-devel
  geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel
  gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel
  json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel
  webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel
- vte3-devel"
+ vte3-devel libhandy1-devel"
 depends="desktop-file-utils gsettings-desktop-schemas"
 short_desc="Photo viewer and organizer designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/elementary/photos"
 distfiles="https://github.com/elementary/photos/archive/${version}.tar.gz"
-checksum=9f6ad409d053e3239b9ec7fc59429afe9ce89e40878697a73c2c3f215556a074
+checksum=3227f498e483b150f0a1407f4cf244d69f1c7453fc9bcba164fe3ab944283315

From 82b610c4b9916acb0a243d27130fbfd4219bbbfe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:05 +0100
Subject: [PATCH 0454/2561] io.elementary.stylesheet: update to 6.1.1.

---
 srcpkgs/io.elementary.stylesheet/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template
index 791bca04709c..618ac82dda0c 100644
--- a/srcpkgs/io.elementary.stylesheet/template
+++ b/srcpkgs/io.elementary.stylesheet/template
@@ -1,12 +1,13 @@
 # Template file for 'io.elementary.stylesheet'
 pkgname=io.elementary.stylesheet
-version=5.4.2
-revision=2
+version=6.1.1
+revision=1
 wrksrc="stylesheet-${version}"
 build_style=meson
+hostmakedepends="sassc gettext"
 short_desc="GTK Stylesheet for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/stylesheet"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec
+checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e

From 4986d24af0aea6b33ef798bea09ca3552a580db8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:08 +0100
Subject: [PATCH 0455/2561] io.elementary.terminal: update to 6.0.1.

---
 srcpkgs/io.elementary.terminal/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/io.elementary.terminal/template b/srcpkgs/io.elementary.terminal/template
index 2aba6a5b563f..f3e0972cdfe3 100644
--- a/srcpkgs/io.elementary.terminal/template
+++ b/srcpkgs/io.elementary.terminal/template
@@ -1,19 +1,19 @@
 # Template file for 'io.elementary.terminal'
 pkgname=io.elementary.terminal
-version=5.5.2
+version=6.0.1
 revision=1
 wrksrc="terminal-${version}"
 build_style=meson
 configure_args="-Dubuntu-bionic-patched-vte=false"
-hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream glib-devel"
-makedepends="granite-devel libnotify-devel vte3-devel"
+hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel"
+makedepends="granite-devel libnotify-devel vte3-devel libhandy1-devel"
 depends="desktop-file-utils gsettings-desktop-schemas"
 short_desc="Terminal from elementary OS for the 21st century"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-3.0-only"
 homepage="https://github.com/elementary/terminal"
 distfiles="https://github.com/elementary/terminal/archive/${version}.tar.gz"
-checksum=589ad0225e3a45700d95c8ead1b646f22a22c7688f647876a5329b3b4bd923cd
+checksum=de741ad5deadb927243a7007be0f5d3bb4070f780362d59ded600692064b0eca
 
 pantheon-terminal_package() {
 	depends="io.elementary.terminal>=${version}_${revision}"

From 446b36bb6e50913723a1e3ac15fc915abead6e5d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:06 +0100
Subject: [PATCH 0456/2561] io.elementary.videos: update to 2.8.3.

---
 srcpkgs/io.elementary.videos/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template
index c989ccaf6954..eaca37a83723 100644
--- a/srcpkgs/io.elementary.videos/template
+++ b/srcpkgs/io.elementary.videos/template
@@ -1,15 +1,15 @@
 # Template file for 'io.elementary.videos'
 pkgname=io.elementary.videos
-version=2.7.2
+version=2.8.3
 revision=1
 wrksrc="videos-${version}"
 build_style=meson
-hostmakedepends="intltool pkg-config vala AppStream"
+hostmakedepends="gettext pkg-config vala AppStream"
 makedepends="granite-devel clutter-gst3-devel clutter-gtk-devel
- gstreamer1-devel gst-plugins-base1-devel"
+ gstreamer1-devel gst-plugins-base1-devel libhandy1-devel"
 short_desc="Video player and library app designed for elementary OS"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/videos"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a
+checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6

From fcd7f08c01bad8fad5c52a3b4ba1ecb5edc327e9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:49:31 +0100
Subject: [PATCH 0457/2561] giti: remove package

* doesn't build with recent vala
---
 srcpkgs/giti/template             | 13 -------------
 srcpkgs/removed-packages/template |  3 ++-
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/giti/template

diff --git a/srcpkgs/giti/template b/srcpkgs/giti/template
deleted file mode 100644
index e3c8663fa536..000000000000
--- a/srcpkgs/giti/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'giti'
-pkgname=giti
-version=1.0.0
-revision=1
-build_style=meson
-hostmakedepends="pkg-config vala gettext"
-makedepends="gtk+3-devel libgit2-glib-devel libgee08-devel granite-devel"
-short_desc="Permanent observer of your git directories"
-maintainer="linarcx <linarcx@riseup.net>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/LinArcX/giti"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=8054581f9eddf226a3e16e404ef062ebaba0ea1223255d8b0c3eeac301cf6872
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5003333859c9..df264c9d7501 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=66
+revision=67
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -81,6 +81,7 @@ replaces="
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
  gespeaker<=0.8.6_3
+ giti<=1.0.0_1
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9

From 3f9de2ef837a6519371cb81492b8fe1f6afc99ec Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 12:22:51 +0100
Subject: [PATCH 0458/2561] colord-gtk: update to 0.3.0.

---
 common/shlibs               |  1 +
 srcpkgs/colord-gtk/template | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ffcc843af85c..7d323593a120 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1133,6 +1133,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1
 libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libcolord-gtk4.so.1 colord-gtk-0.3.0_1
 libgdm.so.1 libgdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1
diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 634a9322dae3..843320e63089 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,26 +1,27 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 build_helper=gir
-configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
- -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)"
-hostmakedepends="pkg-config intltool glib-devel libxslt
+configure_args="-Dtests=false $(vopt_bool vala vapi) $(vopt_bool docs docs)
+ $(vopt_bool man man)"
+hostmakedepends="pkg-config gettext glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
  $(vopt_if man docbook-xsl-ns)"
-makedepends="colord-devel gtk+3-devel"
+makedepends="colord-devel gtk+3-devel gtk4-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/colord-gtk"
+changelog="https://raw.githubusercontent.com/hughsie/colord-gtk/main/NEWS"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
-checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
+checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0
 
 build_options="vala docs man"
-build_options_default="vala"
-desc_option_docs="Generate documents"
-desc_option_man="Generate manpage"
+build_options_default="vala man docs"
+desc_option_docs="Generate documentation"
+desc_option_man="Generate man pages"
 
 colord-gtk-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -33,5 +34,8 @@ colord-gtk-devel_package() {
 		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
+		if [ "$build_option_docs" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 4334f5580b8197c93d5f764c2817938159c8f7e7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 16:47:44 +0100
Subject: [PATCH 0459/2561] timg: update to 1.4.4.

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

diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template
index 7774d007cf01..91f1516b2597 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -1,6 +1,6 @@
 # Template file for 'timg'
 pkgname=timg
-version=1.4.2
+version=1.4.4
 revision=1
 build_style=cmake
 configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev"
@@ -10,5 +10,5 @@ short_desc="24-bit color image & video viewer for terminal"
 maintainer="33KK <g33kk@pm.me>"
 license="GPL-2.0-only"
 homepage="https://github.com/hzeller/timg"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7607efaffbed0b65b3c824956de421b155a4f14243e7a752b19454f88bf9d563
+distfiles="https://github.com/hzeller/timg/archive/v${version}.tar.gz"
+checksum=66d2e00b50068fd6638bb8be1859c50ca4f24caef751f9dc95b303f37fb07b1e

From 2163993c17d922cf6ee80ccd1769bc63d2337982 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 26 Mar 2022 08:51:52 +0100
Subject: [PATCH 0460/2561] wine: update to 7.5.

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  | 8 ++++----
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index b13cbe9ea48c..45cb7cbd5106 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index 82f45cc1d171..4ed5e2642d9f 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.4/configure
-+++ b/wine-7.4/configure
+--- a/wine-7.5/configure
++++ b/wine-7.5/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
---- a/wine-7.4/configure.ac
-+++ b/wine-7.4/configure.ac
+--- a/wine-7.5/configure.ac
++++ b/wine-7.5/configure.ac
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 2fe1c18c553b..a358997c3963 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.4/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.4/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/wine-7.5/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/wine-7.5/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 8dfb8df9f6be..e9598ba932a0 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.4
+version=7.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="728e866d6e49ce92a2a0c514333e9ff08bdbf6c86f5ef4e6180143b8d2b7d416
- c1688af87737f47337a8f7e24d501d99582a691a2a08ba8e71b9911abbfd8554"
+checksum="462c3185aedeec851067a5165d648f5499fb93c1b655f46b825f4bc11914e281
+ 3b3a10654c90b210ab8dbf9d0aa2d2e3f4179a73e56e7c2101008e77903afead"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 86ce9d15cebc3ed0b1ae380da6221c236da1c66d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 00:52:47 +0100
Subject: [PATCH 0461/2561] apostrophe: update to 2.6.1.

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

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 127919d611a3..d130b8694cd4 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,7 +1,7 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.5
-revision=2
+version=2.6.1
+revision=1
 wrksrc="$pkgname-v$version"
 build_style=meson
 build_helper=gir
@@ -14,4 +14,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/World/apostrophe"
 distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz"
-checksum=366b239ea7bb720c11fc7344827b6739e4983132c9932aa4705a3b88533d75e4
+checksum=f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c

From 739594745a9f585dbd932514a2a44d0ff8b99427 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Mar 2022 13:09:45 +1100
Subject: [PATCH 0462/2561] openvpn: update to 2.5.6.

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

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 04bead136a49..bb874a247ab1 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openvpn'
 pkgname=openvpn
-version=2.5.5
+version=2.5.6
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
@@ -12,8 +12,9 @@ short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.openvpn.net"
+changelog="https://raw.githubusercontent.com/OpenVPN/openvpn/release/${version%.*}/Changes.rst"
 distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz"
-checksum=119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b
+checksum=13c7c3dc399d1b571cabf189c4d34ae34656ee72b6bde2a8059c1e9bc61574ed
 
 build_options="mbedtls pkcs11"
 build_options_default="pkcs11"

From 8d443d241169b734449a5ee1d648a2a88d3b7332 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:02 +0100
Subject: [PATCH 0463/2561] meson: update to 0.61.4.

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

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 67fa3514289f..2f9ccaaa4691 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.60.3
+version=0.61.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e
+checksum=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 586a6bd46df155aa2b063c98b3530335b7039b7e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 0464/2561] Marker: fix for meson 0.61

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

diff --git a/srcpkgs/Marker/template b/srcpkgs/Marker/template
index be02723dc4ed..eed5bddc36c3 100644
--- a/srcpkgs/Marker/template
+++ b/srcpkgs/Marker/template
@@ -4,7 +4,7 @@ version=2020.04.04
 revision=1
 wrksrc=marker
 build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config itstool gettext"
 makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel
  webkit2gtk-devel"
 depends="iso-codes"

From 1044bb37a76b9eede8a0437460ee9f81ffe75e4c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 0465/2561] accountsservice: fix for meson 0.61

---
 .../accountsservice/patches/meson-0.61.patch  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch

diff --git a/srcpkgs/accountsservice/patches/meson-0.61.patch b/srcpkgs/accountsservice/patches/meson-0.61.patch
new file mode 100644
index 000000000000..9245afdd47d2
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/meson-0.61.patch
@@ -0,0 +1,29 @@
+From ac9b14f1c1bbca413987d0bbfeaad05804107e9a Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Sun, 31 Oct 2021 12:29:14 +0000
+Subject: Fix build with meson 0.60
+
+Positional parameters to merge_file() were never allowed and always
+ignored, so just drop it.
+See: https://github.com/mesonbuild/meson/issues/9441
+
+Fixes #97
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 70edf89..9e80299 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -33,7 +33,6 @@ configure_file(
+ policy = act_namespace.to_lower() + '.policy'
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy + '.in',
+   output: policy,
+   po_dir: po_dir,
+-- 
+cgit v1.2.1
+

From bb017bdaf955a1f4febc22334276537487affe01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0466/2561] bijiben: fix for meson 0.61

---
 srcpkgs/bijiben/patches/meson-0.61.patch | 46 ++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 srcpkgs/bijiben/patches/meson-0.61.patch

diff --git a/srcpkgs/bijiben/patches/meson-0.61.patch b/srcpkgs/bijiben/patches/meson-0.61.patch
new file mode 100644
index 000000000000..7576536953a1
--- /dev/null
+++ b/srcpkgs/bijiben/patches/meson-0.61.patch
@@ -0,0 +1,46 @@
+From 01ccae2ccb640b2d33fd09c3dfb7d605830b5b0f Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 22 Jan 2022 23:16:37 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build         | 2 --
+ 2 files changed, 3 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 48a31e3..d78d052 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ info = 'org.gnome.Notes.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
+diff --git a/data/meson.build b/data/meson.build
+index d00d98f..556d564 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ subdir('appdata')
+ mime = 'org.gnome.Notes.xml'
+ 
+ i18n.merge_file(
+-  mime,
+   input: mime + '.in',
+   output: mime,
+   po_dir: po_dir,
+@@ -18,7 +17,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set ('icon', application_id)
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: files (desktop + '.in'),
+-- 
+2.34.1
+

From bc6d8263ead14f84e80ba04799b32d770a80f9a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0467/2561] cinnamon: fix for meson 0.61

---
 srcpkgs/cinnamon/patches/meson-0.61.patch | 53 +++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 srcpkgs/cinnamon/patches/meson-0.61.patch

diff --git a/srcpkgs/cinnamon/patches/meson-0.61.patch b/srcpkgs/cinnamon/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f0937a355f92
--- /dev/null
+++ b/srcpkgs/cinnamon/patches/meson-0.61.patch
@@ -0,0 +1,53 @@
+From 37de1aaae1edd1fbcd3c2ef2ac5f4baa4c8e2751 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 18:14:35 -0500
+Subject: [PATCH] Revert "build: disable gir install via list to pacify meson
+ >= 0.60.2 (#10489)"
+
+This reverts commit 8fc2df08b40aa3e1958ed2fde853c50676d8cf48.
+
+This commit was wrong, because it tried to work around a bug in a single
+version of meson by using something that isn't, wasn't, and won't be a
+valid value.
+
+The fixed version of meson 0.60.x has been out for a while now, which
+once again accepts `false`, and 0.61.0 also accepts `false` but was
+known at the time of this workaround to not work in meson-git master
+(now meson 0.61.0).
+
+Using `false` is acceptable and the failure to accept it has been
+qualified as a meson regression. Using `[false]` is just... trying to
+fuzz meson with random objects until you get something that slips its
+way through the argument checker and produces desired effects on the
+python implementation level.
+---
+ src/meson.build    | 2 +-
+ src/st/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 7999c0a67b..34b130d50f 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -196,7 +196,7 @@ cinnamon_gir = gnome.generate_gir(
+     includes: cinnamon_gir_includes,
+     install: true,
+     install_dir_typelib: pkglibdir,
+-    install_dir_gir: [false],
++    install_dir_gir: false,
+     extra_args: [
+         '-DST_COMPILATION',
+         '--quiet',
+diff --git a/src/st/meson.build b/src/st/meson.build
+index d299727d06..ec7d7b30a1 100644
+--- a/src/st/meson.build
++++ b/src/st/meson.build
+@@ -213,7 +213,7 @@ st_gir = gnome.generate_gir(
+     includes: st_gir_includes,
+     install: true,
+     install_dir_typelib: pkglibdir,
+-    install_dir_gir: [false],
++    install_dir_gir: false,
+     extra_args: [
+         '-DST_COMPILATION',
+         '--quiet',

From 2a33d26399b52aad1f9ca697736856e76a1a7802 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0468/2561] d-feet: fix for meson 0.61

---
 srcpkgs/d-feet/patches/meson-0.61.patch | 33 +++++++++++++++++++++++++
 srcpkgs/d-feet/x                        |  1 -
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/d-feet/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/d-feet/x

diff --git a/srcpkgs/d-feet/patches/meson-0.61.patch b/srcpkgs/d-feet/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f8e7f64a60c0
--- /dev/null
+++ b/srcpkgs/d-feet/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From b5a99f86395fd71dc08907ac3c5f2d757384c49f Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 23 Jan 2022 12:35:26 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 026bd80..3b03b94 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+@@ -25,7 +24,6 @@ i18n.merge_file(
+ appdata = df_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+2.34.1
+
diff --git a/srcpkgs/d-feet/x b/srcpkgs/d-feet/x
deleted file mode 100644
index 166f7a957085..000000000000
--- a/srcpkgs/d-feet/x
+++ /dev/null
@@ -1 +0,0 @@
-xbps-query: option requires an argument -- 's'

From 494d933e35b41e18ec8757fac4248f49fba0582b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0469/2561] dconf-editor: fix for meson 0.61

---
 srcpkgs/dconf-editor/patches/meson-0.61.patch | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/dconf-editor/patches/meson-0.61.patch

diff --git a/srcpkgs/dconf-editor/patches/meson-0.61.patch b/srcpkgs/dconf-editor/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b6f06606e882
--- /dev/null
+++ b/srcpkgs/dconf-editor/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:22:58 +0100
+Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ editor/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/editor/meson.build b/editor/meson.build
+index 4c89ab99..0eb3bb1a 100644
+--- a/editor/meson.build
++++ b/editor/meson.build
+@@ -1,7 +1,6 @@
+ desktop = dconf_editor_namespace + '.desktop'
+ 
+ i18n.merge_file (
+-  desktop,
+   type: 'desktop',
+   input: desktop + '.in',
+   output: desktop,
+@@ -26,7 +25,6 @@ configure_file(
+ appdata = dconf_editor_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 75f7589f0eed70366bd517517117c596ac664866 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0470/2561] devhelp: fix for meson 0.61

---
 srcpkgs/devhelp/patches/meson-0.61.patch | 48 ++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch

diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
new file mode 100644
index 000000000000..dfea339688e3
--- /dev/null
+++ b/srcpkgs/devhelp/patches/meson-0.61.patch
@@ -0,0 +1,48 @@
+From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:02:20 +0800
+Subject: [PATCH] Remove incorrect arg for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments and
+explicitly rejects with error "ERROR: Function does not take
+positional arguments" since meson 0.60.0
+---
+ data/meson.build                 | 2 --
+ plugins/gedit-plugin/meson.build | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c6aeffb4..0bc531a2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', APPLICATION_ID)
+ appdata = APPLICATION_ID + '.appdata.xml'
+ appdata_file = I18N.merge_file(
+-  appdata,
+   input: configure_file(
+     input: 'org.gnome.Devhelp.appdata.xml.in.in',
+     output: APPLICATION_ID + '.appdata.xml.in',
+@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('application_id', APPLICATION_ID)
+ desktop = APPLICATION_ID + '.desktop'
+ desktop_file = I18N.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Devhelp.desktop.in.in',
+diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
+index 4f779886..877a01ff 100644
+--- a/plugins/gedit-plugin/meson.build
++++ b/plugins/gedit-plugin/meson.build
+@@ -7,7 +7,6 @@ install_data(
+ 
+ plugin_info_file = 'devhelp.plugin'
+ I18N.merge_file(
+-  plugin_info_file,
+   type: 'desktop',
+   input: plugin_info_file + '.desktop.in',
+   output: plugin_info_file,
+-- 
+GitLab
+

From 2e10c4109bf2d74f06a73b065c52af9b57214d4a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0471/2561] epiphany: fix for meson 0.61

---
 srcpkgs/epiphany/patches/meson-0.61.patch | 33 +++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/epiphany/patches/meson-0.61.patch

diff --git a/srcpkgs/epiphany/patches/meson-0.61.patch b/srcpkgs/epiphany/patches/meson-0.61.patch
new file mode 100644
index 000000000000..1584627ca2d9
--- /dev/null
+++ b/srcpkgs/epiphany/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Wed, 24 Nov 2021 04:52:42 +0000
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 46df3fd80..eac6b8224 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -16,7 +16,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop = i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+     input: files('org.gnome.Epiphany.desktop.in.in'),
+     output: 'org.gnome.Epiphany.desktop.in',
+@@ -32,7 +31,6 @@ desktop = i18n.merge_file(
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: files('org.gnome.Epiphany.appdata.xml.in.in'),
+     output: 'org.gnome.Epiphany.appdata.xml.in',
+-- 
+GitLab
+

From 3999695c97f3b540a499d35fe2e3b988ce159fa6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0472/2561] evince: fix for meson 0.61

---
 srcpkgs/evince/patches/meson-0.61.patch | 52 +++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 srcpkgs/evince/patches/meson-0.61.patch

diff --git a/srcpkgs/evince/patches/meson-0.61.patch b/srcpkgs/evince/patches/meson-0.61.patch
new file mode 100644
index 000000000000..baed9dc1af8f
--- /dev/null
+++ b/srcpkgs/evince/patches/meson-0.61.patch
@@ -0,0 +1,52 @@
+From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:22:45 +0800
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for
+a time and explicitly rejects with error since meson 0.60.0
+---
+ backend/meson.build | 1 -
+ data/meson.build    | 1 -
+ meson.build         | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/backend/meson.build b/backend/meson.build
+index e44c1d6d7..ab3df9acf 100644
+--- a/backend/meson.build
++++ b/backend/meson.build
+@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends
+   )
+ 
+   i18n.merge_file(
+-    appstream,
+     input: appstream_in,
+     output: appstream,
+     po_dir: po_dir,
+diff --git a/data/meson.build b/data/meson.build
+index 8a308b853..afc302098 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -15,7 +15,6 @@ foreach desktop: desktops
+   )
+ 
+   i18n.merge_file(
+-    desktop,
+     type: 'desktop',
+     input: desktop_in,
+     output: desktop,
+diff --git a/meson.build b/meson.build
+index 34c86661f..f74efb3c4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -492,7 +492,6 @@ install_headers(
+ appdata = ev_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 86af67026738ecc716c4652e4654ccdaf89b0c48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0473/2561] fprintd: fix for meson 0.61

---
 srcpkgs/fprintd/patches/meson-0.61.patch | 146 +++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 srcpkgs/fprintd/patches/meson-0.61.patch

diff --git a/srcpkgs/fprintd/patches/meson-0.61.patch b/srcpkgs/fprintd/patches/meson-0.61.patch
new file mode 100644
index 000000000000..836c7e036054
--- /dev/null
+++ b/srcpkgs/fprintd/patches/meson-0.61.patch
@@ -0,0 +1,146 @@
+From 50943b1bd4f18d103c35233f0446ce7a31d1817e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 27 Oct 2021 15:44:31 +0200
+Subject: [PATCH] build: Do not use positional arguments in i18n.merge_file
+
+This was never really used and it's breaking meson 60.
+While this may just become a warning in 60.1, it's just better to avoid
+using it.
+
+See: https://github.com/mesonbuild/meson/issues/9441
+---
+ data/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 92bfa2e..ece5fc6 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -24,7 +24,7 @@ if get_option('systemd')
+ endif
+ 
+ polkit_policy = 'net.reactivated.fprint.device.policy'
+-polkit_policy_target = i18n.merge_file(polkit_policy,
++polkit_policy_target = i18n.merge_file(
+     input: '@0@.in'.format(polkit_policy),
+     output: polkit_policy,
+     po_dir: meson.source_root() / 'po',
+-- 
+GitLab
+
+From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 21:06:35 -0500
+Subject: [PATCH] use more idiomatic/correct embedded shell scripting
+
+Formatting arguments into code is fragile, and meson natively knows how
+to pass files as arguments via argv. So pass them as arguments to the
+shell.
+---
+ doc/dbus/meson.build | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build
+index 802938e..861da64 100644
+--- a/doc/dbus/meson.build
++++ b/doc/dbus/meson.build
+@@ -19,11 +19,10 @@ foreach interface_file: dbus_interfaces_files
+         capture: true,
+         command: [
+             bash, '-c',
+-            'cat @INPUT@;' +
+-            xsltproc.path() + ' @0@/@1@ '.format(
+-                meson.source_root(),
+-                files('spec-to-docbook.xsl')[0]) +
+-            interface_file.full_path() + '| tail -n +2;',
++            'cat "$1"; "$2" "$3" "$4" | tail -n +2',
++            '_', # argv0 ignored
++            '@INPUT@',
++            xsltproc, files('spec-to-docbook.xsl')[0], interface_file
+         ],
+     )
+ endforeach
+-- 
+GitLab
+
+From 2c34cef5ef2004d8479475db5523c572eb409a6b Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 20:46:29 -0500
+Subject: [PATCH] remove pointless copying of files into build directory
+
+I'm not entirely sure what this did, but it seems to be obsoleted by
+commit 93bad825406d13ed5eb2cf27541dc58194bef8f3.
+---
+ doc/dbus/meson.build                          |  6 +++---
+ src/meson.build                               | 20 ++++++-------------
+ ....xml => net.reactivated.Fprint.Device.xml} |  0
+ ...xml => net.reactivated.Fprint.Manager.xml} |  0
+ 4 files changed, 9 insertions(+), 17 deletions(-)
+ rename src/{device.xml => net.reactivated.Fprint.Device.xml} (100%)
+ rename src/{manager.xml => net.reactivated.Fprint.Manager.xml} (100%)
+
+diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build
+index 861da64..431127d 100644
+--- a/doc/dbus/meson.build
++++ b/doc/dbus/meson.build
+@@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header',
+ )
+ 
+ dbus_interfaces_refs = []
+-foreach interface_file: dbus_interfaces_files
+-    basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip()
++foreach interface_file: dbus_interfaces
++    basename = run_command('basename', interface_file, '.xml').stdout().strip()
+     dbus_interfaces_refs += custom_target(basename + '_ref',
+         input: docbook_xml_header,
+         output: basename + '.ref.xml',
+         build_by_default: true,
+-        depends: interface_file,
++        depend_files: interface_file,
+         capture: true,
+         command: [
+             bash, '-c',
+diff --git a/src/meson.build b/src/meson.build
+index 1df6216..a7ce3fe 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,22 +1,14 @@
+ bash = find_program('bash')
+-dbus_interfaces = ['Manager', 'Device']
+-dbus_interfaces_files = []
++dbus_interfaces = files(
++    'net.reactivated.Fprint.Manager.xml',
++    'net.reactivated.Fprint.Device.xml',
++)
+ 
+-foreach interface_name: dbus_interfaces
+-    interface = interface_name.to_lower()
+-    interface_file = interface + '.xml'
+-    dbus_interfaces_files += custom_target('dbus_interface_' + interface,
+-        input: interface_file,
+-        output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name),
+-        command: ['cp', '@INPUT@', '@OUTPUT@'],
+-        install: true,
+-        install_dir: dbus_interfaces_dir,
+-    )
+-endforeach
++install_data(dbus_interfaces, install_dir: dbus_interfaces_dir)
+ 
+ # NOTE: We should pass "--glib-min-required 2.64" but cannot
+ fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus',
+-    sources: dbus_interfaces_files,
++    sources: dbus_interfaces,
+     autocleanup: 'all',
+     interface_prefix: 'net.reactivated.Fprint.',
+     namespace: 'FprintDBus',
+diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml
+similarity index 100%
+rename from src/device.xml
+rename to src/net.reactivated.Fprint.Device.xml
+diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml
+similarity index 100%
+rename from src/manager.xml
+rename to src/net.reactivated.Fprint.Manager.xml
+-- 
+GitLab
+

From 81fc22f28080c5082c640292918162f2e28e2f59 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0474/2561] fractal: fix for meson 0.61

---
 srcpkgs/fractal/patches/meson-0.61.patch | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/fractal/patches/meson-0.61.patch

diff --git a/srcpkgs/fractal/patches/meson-0.61.patch b/srcpkgs/fractal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..79197803abf5
--- /dev/null
+++ b/srcpkgs/fractal/patches/meson-0.61.patch
@@ -0,0 +1,35 @@
+From 6fa1a23596d65d94aa889efe725174e6cd2903f0 Mon Sep 17 00:00:00 2001
+From: Jonas Platte <jplatte+git@posteo.de>
+Date: Sun, 31 Oct 2021 15:23:31 +0100
+Subject: [PATCH] Remove deprecated positional argument to i18n.merge_file
+
+See https://github.com/mesonbuild/meson/issues/9441
+---
+ fractal-gtk/res/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fractal-gtk/res/meson.build b/fractal-gtk/res/meson.build
+index 7a7a7d65..a176787c 100644
+--- a/fractal-gtk/res/meson.build
++++ b/fractal-gtk/res/meson.build
+@@ -2,7 +2,7 @@ subdir('icons')
+ 
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Fractal.desktop.in.in'),
+@@ -28,7 +28,7 @@ endif
+ 
+ metainfo_conf = configuration_data()
+ metainfo_conf.set('appid', application_id)
+-metainfo_file = i18n.merge_file ('metainfo-file',
++metainfo_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Fractal.metainfo.xml.in.in'),
+     output: 'org.gnome.Fractal.metainfo.xml.in',
+-- 
+GitLab
+

From 99022a5136f200215a8f1f2869604758c7c9fc48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0475/2561] gcr: fix for meson 0.61

---
 srcpkgs/gcr/patches/meson-0.61.patch | 59 ++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 srcpkgs/gcr/patches/meson-0.61.patch

diff --git a/srcpkgs/gcr/patches/meson-0.61.patch b/srcpkgs/gcr/patches/meson-0.61.patch
new file mode 100644
index 000000000000..21c1c3610226
--- /dev/null
+++ b/srcpkgs/gcr/patches/meson-0.61.patch
@@ -0,0 +1,59 @@
+From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 12 Jan 2022 00:24:20 +0100
+Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
+
+This argument has been removed in Meson 0.61.0:
+
+    gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
+
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
+
+> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
+
+Fixes #89
+---
+ gck/meson.build | 1 -
+ gcr/meson.build | 1 -
+ ui/meson.build  | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/gck/meson.build b/gck/meson.build
+index 756b486..a21a1e9 100644
+--- a/gck/meson.build
++++ b/gck/meson.build
+@@ -131,7 +131,6 @@ if get_option('introspection')
+     sources: gck_gir_sources,
+     namespace: 'Gck',
+     nsversion: '@0@'.format(gck_major_version),
+-    packages: gck_deps,
+     export_packages: 'gck-@0@'.format(gck_major_version),
+     includes: [ 'GObject-2.0', 'Gio-2.0' ],
+     header: 'gck/gck.h',
+diff --git a/gcr/meson.build b/gcr/meson.build
+index 2233a44..c83641b 100644
+--- a/gcr/meson.build
++++ b/gcr/meson.build
+@@ -190,7 +190,6 @@ if get_option('introspection')
+     sources: [ gcr_base_public_sources, gcr_base_headers ],
+     namespace: 'Gcr',
+     nsversion: '@0@'.format(gcr_major_version),
+-    packages: gcr_base_deps,
+     export_packages: 'gcr-base-@0@'.format(gcr_major_version),
+     includes: [
+       'GObject-2.0',
+diff --git a/ui/meson.build b/ui/meson.build
+index e656ea2..32ee057 100644
+--- a/ui/meson.build
++++ b/ui/meson.build
+@@ -152,7 +152,6 @@ if get_option('introspection')
+     export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+     identifier_prefix: 'Gcr',
+     symbol_prefix: 'gcr',
+-    packages: gcr_ui_deps,
+     includes: [
+       'GObject-2.0',
+       'Gio-2.0',
+-- 
+GitLab
+

From 486164b8c5d3915bf2f25ee99742a435fefd380e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0476/2561] gitg: fix for meson 0.61

---
 srcpkgs/gitg/patches/meson-0.61.patch | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/gitg/patches/meson-0.61.patch

diff --git a/srcpkgs/gitg/patches/meson-0.61.patch b/srcpkgs/gitg/patches/meson-0.61.patch
new file mode 100644
index 000000000000..330d45fc5ad8
--- /dev/null
+++ b/srcpkgs/gitg/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From c81e1579afe7f221371b6866c25f388f48747728 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 23 Jan 2022 14:54:31 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index a8b90fd1..2413531d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -6,7 +6,6 @@ desktop_config = configuration_data()
+ desktop_config.set('icon', application_id)
+ desktop_config.set('binary', gitg_name)
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: desktop + '.in.in',
+@@ -42,7 +41,6 @@ appdata_config = configuration_data()
+ appdata_config.set('app-id', application_id)
+ appdata_config.set('gettext', gitg_name)
+ i18n.merge_file(
+-  appdata,
+   type: 'xml',
+   input: configure_file(
+     input: appdata + '.in.in',
+-- 
+2.34.1
+

From 5a2af4372b797e9d897a9232792bddc1b907ab84 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:20:40 +0100
Subject: [PATCH 0477/2561] glade3: fix for meson 0.61

---
 srcpkgs/glade3/patches/meson-0.61.patch | 57 +++++++++++++++++++++++++
 srcpkgs/glade3/template                 |  2 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/glade3/patches/meson-0.61.patch

diff --git a/srcpkgs/glade3/patches/meson-0.61.patch b/srcpkgs/glade3/patches/meson-0.61.patch
new file mode 100644
index 000000000000..72f9c0e509ba
--- /dev/null
+++ b/srcpkgs/glade3/patches/meson-0.61.patch
@@ -0,0 +1,57 @@
+From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:18:09 -0500
+Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
+ argument
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 9f244566..bfbc514c 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', glade_version)
+ 
+ i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Glade.desktop.in.in',
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ appdata = glade_name + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Glade.appdata.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+GitLab
+
+
+From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:19:03 -0500
+Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index fc3cd4c3..d67e42c8 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -1,6 +1,5 @@
+ # please keep this list sorted alphabetically
+ #
+-da
+ bg
+ ca
+ cs
+-- 
+GitLab
+
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 763632c1e712..a0235c1faef9 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -4,7 +4,7 @@ version=3.38.2
 revision=1
 wrksrc="glade-${version}"
 build_style=meson
-build_helper="gir"
+build_helper="gir qemu"
 configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection)"
 hostmakedepends="glib-devel intltool itstool pkg-config
  gjs-devel yelp-tools gettext-devel gtk-doc"

From e1747edc5f73f3f81c658e7bed4cf0d360f2ebfa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:19:02 +0100
Subject: [PATCH 0478/2561] gnome-2048: fix for meson 0.61

---
 srcpkgs/gnome-2048/patches/meson-0.61.patch | 36 +++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnome-2048/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-2048/patches/meson-0.61.patch b/srcpkgs/gnome-2048/patches/meson-0.61.patch
new file mode 100644
index 000000000000..912759654d73
--- /dev/null
+++ b/srcpkgs/gnome-2048/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sun, 23 Jan 2022 10:49:07 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:19:0: ERROR: Function does not take positional arguments.
+data/meson.build:39:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 33f73ca..8974a63 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,7 +17,6 @@ install_data(
+ 
+ # Desktop file
+ desktop_file = i18n.merge_file(
+-  'desktop-file',
+   input: 'org.gnome.TwentyFortyEight.desktop.in',
+   output: 'org.gnome.TwentyFortyEight.desktop',
+   install: true,
+@@ -37,7 +36,6 @@ endif
+ 
+ # AppData file
+ appdata_file = i18n.merge_file(
+-  'appdata-file',
+   input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
+   output: 'org.gnome.TwentyFortyEight.appdata.xml',
+   install: true,
+-- 
+GitLab
+

From 145b48fd7e5b6399a681f73f3075b6afaecb6c74 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:37:12 +0100
Subject: [PATCH 0479/2561] gnome-authenticator: fix for meson 0.61

---
 .../patches/meson-0.61.patch                   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..eade2e1241b5
--- /dev/null
+++ b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -63,7 +63,6 @@ configure_file(
+ desktop_conf = configuration_data()
+ desktop_conf.set('APP_ID', application_id)
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+     input: meson.project_name() + '.desktop.in.in',
+     output: '@BASENAME@',
+@@ -90,7 +89,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('APP_ID', application_id)
+ appdata_conf.set('GETTEXT_PACKAGE', gettext_package)
+ appdata_file = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: meson.project_name() + '.appdata.xml.in.in',
+     output: '@BASENAME@',

From 338732390abb5895cc722923200ce38bbe27e907 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 16:44:19 +0100
Subject: [PATCH 0480/2561] gnome-bluetooth: fix for meson 0.61

---
 .../gnome-bluetooth/patches/meson-0.61.patch  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c6962edd4f05
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
@@ -0,0 +1,25 @@
+From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jan 2022 12:51:22 +0100
+Subject: [PATCH] build: Fix build for newer versions of meson
+
+sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
+---
+ sendto/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sendto/meson.build b/sendto/meson.build
+index 24a4e394..3e233a03 100644
+--- a/sendto/meson.build
++++ b/sendto/meson.build
+@@ -22,7 +22,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file (
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: desktop,
+-- 
+GitLab
+

From 6df2194bfb294d55c4655c73da804244ef81c7b7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:47:14 +0100
Subject: [PATCH 0481/2561] gnome-books: fix for meson 0.61

---
 srcpkgs/gnome-books/patches/meson-0.61.patch | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0e6ba9befd96
--- /dev/null
+++ b/srcpkgs/gnome-books/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Wed, 9 Mar 2022 17:46:00 +0100
+Subject: [PATCH] meson: remove positional args from i18n.merge_file
+
+This causes the build to fail with meson 0.61+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bc6edfb4..5061554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -54,7 +54,6 @@ sources += gnome.compile_resources(
+ appdata = 'org.gnome.Books.appdata.xml'
+ 
+ appdata_file = i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+@@ -74,7 +73,6 @@ if appstream_util.found()
+ desktop = 'org.gnome.Books.desktop'
+ 
+ desktop_file = i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop + '.in',
+   output: desktop,
+-- 
+2.35.1
+

From 0d72818f84bb350ac613c06a856fc4ff35162c15 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0482/2561] gnome-boxes: fix for meson 0.61

---
 srcpkgs/gnome-boxes/patches/meson-0.61.patch | 36 ++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnome-boxes/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-boxes/patches/meson-0.61.patch b/srcpkgs/gnome-boxes/patches/meson-0.61.patch
new file mode 100644
index 000000000000..3d9c56f5841c
--- /dev/null
+++ b/srcpkgs/gnome-boxes/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From fd0acfbe79444687c73dea182c2d1a5fa1c77324 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 15 Jan 2022 00:07:31 +0100
+Subject: [PATCH] build: remove positional i18n.merge_file arguments
+
+otherwise building with meson 0.61+ fails:
+
+    ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index d32638a8..2dc1798b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes',
+ desktop_conf = configuration_data ()
+ desktop_conf.set ('icon', application_id)
+ desktop = i18n.merge_file (
+-  'desktop',
+   input: configure_file (
+     input: files ('org.gnome.Boxes.desktop.in'),
+     output: 'org.gnome.Boxes.desktop.in',
+@@ -65,7 +64,7 @@ configure_file (
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file (
+     input: files ('org.gnome.Boxes.appdata.xml.in'),
+     output: 'org.gnome.Boxes.appdata.xml.in',
+-- 
+2.34.1
+

From 9e72c87263c39eb639b12d78392f5157df57a247 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0483/2561] gnome-calendar: fix for meson 0.61

---
 srcpkgs/gnome-calendar/patches/meson-0.61.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/gnome-calendar/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-calendar/patches/meson-0.61.patch b/srcpkgs/gnome-calendar/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e2df31e0760e
--- /dev/null
+++ b/srcpkgs/gnome-calendar/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: files('org.gnome.Calendar.appdata.xml.in.in'),
+     output: 'org.gnome.Calendar.appdata.xml.in',

From b1f9258b8744535b0567875492137244afd0e5af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0484/2561] gnome-characters: fix for meson 0.61

---
 .../gnome-characters/patches/meson-0.61.patch  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/gnome-characters/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-characters/patches/meson-0.61.patch b/srcpkgs/gnome-characters/patches/meson-0.61.patch
new file mode 100644
index 000000000000..248f8d5dced7
--- /dev/null
+++ b/srcpkgs/gnome-characters/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -47,7 +47,6 @@ desktop_conf.set('appid', characters_application_id)
+ desktop_conf.set('bindir', characters_bindir)
+ 
+ i18n.merge_file(
+-  'desktop-file',
+   type: 'desktop',
+   input: configure_file (
+     input: characters_name + '.desktop.in',
+@@ -61,7 +60,6 @@ i18n.merge_file(
+ )
+ 
+ appdata_file = i18n.merge_file(
+-  'appdata-file',
+   input: characters_name + '.appdata.xml.in',
+   output: characters_application_id + '.appdata.xml',
+   po_dir: po_dir,

From 805d72c7d982a519019fe52a70e23e1e8b6d24fe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:34:03 +0100
Subject: [PATCH 0485/2561] gnome-dictionary: fix for meson 0.61

---
 .../gnome-dictionary/patches/meson-0.61.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/gnome-dictionary/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-dictionary/patches/meson-0.61.patch b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
new file mode 100644
index 000000000000..768494e2a8cf
--- /dev/null
+++ b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,6 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', application_id)
+-i18n.merge_file('appdata',
++i18n.merge_file(
+   input: configure_file(
+     input: 'org.gnome.Dictionary.appdata.xml.in.in',
+     output: 'org.gnome.Dictionary.appdata.xml.in',
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,7 @@ subdir('appdata')
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('application_id', application_id)
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+     input: 'org.gnome.Dictionary.desktop.in.in',
+     output: 'org.gnome.Dictionary.desktop.in',
+@@ -45,7 +45,7 @@ sources = [
+ ]
+ 
+ foreach s: sources
+-  i18n.merge_file('sources',
++  i18n.merge_file(
+     input: '@0@.in'.format(s),
+     output: s,
+     install: true,

From a8e702839ef8c64e7856994aaf5fae2e7dbd7138 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0486/2561] gnome-disk-utility: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 srcpkgs/gnome-disk-utility/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
new file mode 100644
index 000000000000..09e0c33d0798
--- /dev/null
+++ b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
@@ -0,0 +1,34 @@
+From 46ed7d26873b9741dff61f9df8e7778a8dc6f5cc Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Fri, 17 Dec 2021 12:29:30 +0000
+Subject: [PATCH] build: fix arguments of i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for a time
+and explicitly rejects with error since meson 0.60.0
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index e38a1d8e..38fb5207 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -11,7 +11,6 @@ desktops = [
+ 
+ foreach desktop: desktops
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -38,7 +37,6 @@ install_data(
+ info = 'org.gnome.DiskUtility.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
+-- 
+GitLab
+

From d4e174320b64b876dd5dc918dcef762a0e537f2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:45:53 +0100
Subject: [PATCH 0487/2561] gnome-documents: fix for meson 0.61

---
 .../gnome-documents/patches/meson-0.61.patch   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch
new file mode 100644
index 000000000000..131d34509406
--- /dev/null
+++ b/srcpkgs/gnome-documents/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -56,7 +56,6 @@ foreach app: documents_apps
+   appdata = app + '.appdata.xml'
+ 
+   appdata_file = i18n.merge_file(
+-    appdata,
+     input: appdata + '.in',
+     output: appdata,
+     po_dir: po_dir,
+@@ -76,7 +75,6 @@ foreach app: documents_apps
+   desktop = app + '.desktop'
+ 
+   desktop_file = i18n.merge_file(
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,

From 7b9865f682e1ec5a6ce0fd30fd188b1f07faca23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0488/2561] gnome-font-viewer: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/gnome-font-viewer/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..072ce27fd0d2
--- /dev/null
+++ b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
@@ -0,0 +1,40 @@
+From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Thu, 30 Dec 2021 17:14:47 +0800
+Subject: [PATCH] Fix meson build with meson 0.60.0+
+
+`i18n.merge_file` has been ignoring positional arguments for a time
+and explicitly rejects with error since meson 0.60.0
+---
+ data/meson.build | 2 +-
+ src/meson.build  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bfc9caa..8e42134 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ appdatadir = join_paths(datadir, 'metainfo')
+ appdata_file = 'org.gnome.font-viewer.appdata.xml'
+-merged_appdata = i18n.merge_file(appdata_file,
++merged_appdata = i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
+diff --git a/src/meson.build b/src/meson.build
+index f863d45..826c59b 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop'
+ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', meson.project_version())
+ desktop_conf.set('APPLICATION_ID', application_id)
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: configure_file(input: desktop_file + '.in.in',
+     output: desktop_file + '.in',
+     configuration: desktop_conf),
+-- 
+GitLab
+

From 7ad3c667db1a2152854c50503558479e27890cee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:45:56 +0100
Subject: [PATCH 0489/2561] gnome-games: fix for meson 0.61

---
 srcpkgs/gnome-games/patches/meson-0.61.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0a3b006b227b
--- /dev/null
+++ b/srcpkgs/gnome-games/patches/meson-0.61.patch
@@ -0,0 +1,20 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -44,7 +44,7 @@ mime_types = [
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Games.desktop.in.in'),
+@@ -70,7 +70,7 @@ endif
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Games.appdata.xml.in.in'),
+     output: 'org.gnome.Games.appdata.xml.in',

From dc5c9bd21286eefdd928383adb2a06d2e0d30d23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:14:37 +0100
Subject: [PATCH 0490/2561] gnome-mahjongg: fix for meson 0.61

---
 .../gnome-mahjongg/patches/meson-0.61.patch   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 srcpkgs/gnome-mahjongg/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
new file mode 100644
index 000000000000..2a17ad713752
--- /dev/null
+++ b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:22:48 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+data/meson.build:45:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 8740503..edb8583 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ 
+ desktop_file = i18n.merge_file (
+-  'desktop-file',
+   input:       'org.gnome.Mahjongg.desktop.in',
+   output:      'org.gnome.Mahjongg.desktop',
+   install:     true,
+@@ -41,7 +40,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+                  input: 'org.gnome.Mahjongg.appdata.xml.in',
+                  output: 'org.gnome.Mahjongg.appdata.xml',
+                  install: true,
+-- 
+GitLab
+

From 459889a6af774864ca531c229c4b2b1ea6e8127b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0491/2561] gnome-music: fix for meson 0.61

---
 srcpkgs/gnome-music/patches/meson-0.61.patch | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/gnome-music/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-music/patches/meson-0.61.patch b/srcpkgs/gnome-music/patches/meson-0.61.patch
new file mode 100644
index 000000000000..aca43b5608a2
--- /dev/null
+++ b/srcpkgs/gnome-music/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+From d9f35b542adbf6b0e1114c7c077df04212a98fc7 Mon Sep 17 00:00:00 2001
+From: Jean Felder <jfelder@src.gnome.org>
+Date: Thu, 18 Nov 2021 12:09:26 +0100
+Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0
+where it returns a deprecation message:
+"DEPRECATION: i18n.merge_file does not take any positional
+arguments. This will become a hard error in the next Meson release."
+
+See: https://github.com/mesonbuild/meson/issues/9441
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 25ff1e102..145ee5221 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID)
+ appdata_conf.set('package_url', PACKAGE_URL)
+ appdata_conf.set('package_url_bug', PACKAGE_URL_BUG)
+ i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     output: PROJECT_RDNN_NAME + '.appdata.xml.in',
+     input: PROJECT_RDNN_NAME + '.appdata.xml.in.in',
+-- 
+GitLab
+

From 1bfa2d897093e6f42cba7378f8471c7c7c1f650f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:23:31 +0100
Subject: [PATCH 0492/2561] gnome-photos: fix for meson 0.61

---
 srcpkgs/gnome-photos/patches/meson-0.61.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/gnome-photos/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-photos/patches/meson-0.61.patch b/srcpkgs/gnome-photos/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f406b1c494c0
--- /dev/null
+++ b/srcpkgs/gnome-photos/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From a0ac868a19d55dc52100e54fe4b2d29041bc6752 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Fri, 21 Jan 2022 12:36:02 +0000
+Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 6e7192e0..94271de2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,6 @@ subdir('icons')
+ appdata = photos_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+@@ -23,7 +22,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: desktop,
+-- 
+GitLab
+

From d9401be1bae1af3dfde6da16d7db484ec14dfcd4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:25:42 +0100
Subject: [PATCH 0493/2561] gnome-podcasts: fix for meson 0.61

---
 .../gnome-podcasts/patches/meson-0.61.patch   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/gnome-podcasts/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-podcasts/patches/meson-0.61.patch b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b5ad823b70cf
--- /dev/null
+++ b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 6614bb62ecbec7c3b18ea7fe44beb50fe7942b27 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Thu, 20 Jan 2022 01:27:48 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments.
+podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments.
+---
+ podcasts-gtk/resources/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/podcasts-gtk/resources/meson.build b/podcasts-gtk/resources/meson.build
+index c1f1ee9f..87148087 100644
+--- a/podcasts-gtk/resources/meson.build
++++ b/podcasts-gtk/resources/meson.build
+@@ -2,7 +2,7 @@ subdir('icons')
+ 
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Podcasts.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Podcasts.appdata.xml.in.in'),
+     output: 'org.gnome.Podcasts.appdata.xml.in',
+-- 
+GitLab
+

From f21cb8d1e342053d0b79127465294b035aff38de Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:27:03 +0100
Subject: [PATCH 0494/2561] gnome-screenshot: fix for meson 0.61

---
 .../gnome-screenshot/patches/meson-0.61.patch | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnome-screenshot/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-screenshot/patches/meson-0.61.patch b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b21aa0490d49
--- /dev/null
+++ b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001
+From: Jack Hill <jackhill@jackhill.us>
+Date: Thu, 18 Nov 2021 00:46:58 -0500
+Subject: [PATCH] meson: remove extraneous positional argument
+
+* data/meson.build (desktop_file)
+  (metainfo_file): Remove extraneous positional argument.
+
+Closes #186
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd570b3..4e2e2e8 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,7 +1,6 @@
+ gnome = import('gnome')
+ 
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: 'org.gnome.Screenshot.desktop.in',
+   output: 'org.gnome.Screenshot.desktop',
+@@ -23,7 +22,6 @@ if desktop_file_validate.found()
+ endif
+ 
+ metainfo_file = i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Screenshot.metainfo.xml.in',
+   output: 'org.gnome.Screenshot.metainfo.xml',
+   po_dir: join_paths(meson.current_source_dir(), '../po'),
+-- 
+GitLab
+

From 3998dc805abe005ac2708220617ed3b75e64fdda Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:28:32 +0100
Subject: [PATCH 0495/2561] gnome-settings-daemon: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b7c03ca2da63
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Wed, 26 Jan 2022 23:08:58 +0100
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+---
+ plugins/power/meson.build | 1 -
+ plugins/wacom/meson.build | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/plugins/power/meson.build b/plugins/power/meson.build
+index 69e619f2..014bb6da 100644
+--- a/plugins/power/meson.build
++++ b/plugins/power/meson.build
+@@ -76,7 +76,6 @@ if host_is_linux
+   )
+ 
+   i18n.merge_file(
+-    policy,
+     input: policy_in,
+     output: policy,
+     po_dir: po_dir,
+diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
+index d8dd0ec7..c00323d4 100644
+--- a/plugins/wacom/meson.build
++++ b/plugins/wacom/meson.build
+@@ -7,7 +7,6 @@ policy_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy_in,
+   output: policy,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 976f3b9dfbd8012c1db71f79c1b1133b440439b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:30:02 +0100
Subject: [PATCH 0496/2561] gnome-shell: fix for meson 0.61

---
 srcpkgs/gnome-shell/patches/meson-0.61.patch | 82 ++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 srcpkgs/gnome-shell/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-shell/patches/meson-0.61.patch b/srcpkgs/gnome-shell/patches/meson-0.61.patch
new file mode 100644
index 000000000000..ad3b7ef3923a
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/meson-0.61.patch
@@ -0,0 +1,82 @@
+From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 23 Dec 2021 17:18:16 +0100
+Subject: [PATCH] build: Drop incorrect positional arg
+
+Unlike other targets that take a name, i18n.merge_file() does not.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
+---
+ data/meson.build                                      | 2 +-
+ src/calendar-server/meson.build                       | 2 +-
+ subprojects/extensions-app/data/meson.build           | 2 +-
+ subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
+ subprojects/extensions-tool/src/templates/meson.build | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f924fdf806..76ae45c93a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+ 
+ foreach desktop_file : desktop_files
+-  i18n.merge_file('desktop',
++  i18n.merge_file(
+     input: configure_file(
+       input: desktop_file + '.in.in',
+       output: desktop_file + '.in',
+diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
+index 7363282a59..8b4ef411c8 100644
+--- a/src/calendar-server/meson.build
++++ b/src/calendar-server/meson.build
+@@ -27,7 +27,7 @@ configure_file(
+   install_dir: servicedir
+ )
+ 
+-i18n.merge_file('evolution-calendar.desktop',
++i18n.merge_file(
+   input: 'evolution-calendar.desktop.in',
+   output: 'evolution-calendar.desktop',
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
+index d7e7d4001c..4b601e8bd1 100644
+--- a/subprojects/extensions-app/data/meson.build
++++ b/subprojects/extensions-app/data/meson.build
+@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('app_id', app_id)
+ desktopconf.set('prgname', prgname)
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+     input: base_id + '.desktop.in.in',
+     output: desktop_file + '.in',
+diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build
+index c4962c0576..a19bfa80a4 100644
+--- a/subprojects/extensions-app/data/metainfo/meson.build
++++ b/subprojects/extensions-app/data/metainfo/meson.build
+@@ -1,5 +1,5 @@
+ metainfo = app_id + '.metainfo.xml'
+-i18n.merge_file(metainfo,
++i18n.merge_file(
+   input: base_id + '.metainfo.xml.in',
+   output: metainfo,
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build
+index 670e2bf448..d693bfaddb 100644
+--- a/subprojects/extensions-tool/src/templates/meson.build
++++ b/subprojects/extensions-tool/src/templates/meson.build
+@@ -4,7 +4,7 @@ template_metas = [
+ ]
+ template_deps = []
+ foreach template : template_metas
+-  template_deps += i18n.merge_file(template,
++  template_deps += i18n.merge_file(
+     input: template + '.in',
+     output: template,
+     po_dir: po_dir,
+-- 
+GitLab
+

From f1c04a218ac84dfed7b6fda27e13b224e9de958b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:31:24 +0100
Subject: [PATCH 0497/2561] gnome-sound-recorder: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
new file mode 100644
index 000000000000..40392e6a9fe8
--- /dev/null
+++ b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From 1335b1b1aff61167f8648f7cb3c569764031960d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:37:06 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:16:0: ERROR: Function does not take positional arguments.
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build         | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 1f5744e..d2c2c3a 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
+ metainfo_conf.set('gettext-package', gettext_package)
+ 
+ metainfo_file = i18n.merge_file(
+-  'metainfo-file',
+   input: configure_file(
+   	input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
+   	output: '@BASENAME@',
+diff --git a/data/meson.build b/data/meson.build
+index 44117ad..0ff8fa5 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -14,7 +14,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('app-id', application_id)
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+   	input: 'org.gnome.SoundRecorder.desktop.in.in',
+   	output: '@BASENAME@',
+-- 
+GitLab
+

From 93c3d535d7c3486a2782ffe1bbb289a39cc747ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:05:16 +0100
Subject: [PATCH 0498/2561] gnome-sudoku: fix for meson 0.61

---
 srcpkgs/gnome-sudoku/patches/meson-0.61.patch | 38 +++++++++++++++++++
 srcpkgs/gnome-sudoku/template                 |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-sudoku/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-sudoku/patches/meson-0.61.patch b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
new file mode 100644
index 000000000000..93549d0158d5
--- /dev/null
+++ b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:44:06 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f18f247..9c95e02 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml')
+ 
+ resources = gnome.compile_resources('gnome-sudoku', resource_files)
+ 
+-desktop_file = i18n.merge_file('desktop',
++desktop_file = i18n.merge_file(
+   input: '@0@.desktop.in'.format(application_id),
+   output: '@0@.desktop'.format(application_id),
+   install: true,
+@@ -21,7 +21,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file('appdata',
++appdata_file = i18n.merge_file(
+   input: '@0@.appdata.xml.in'.format(application_id),
+   output: '@0@.appdata.xml'.format(application_id),
+   install: true,
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index ed1759478ab5..6e0af45248ff 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -5,7 +5,7 @@ revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk4-devel libgee08-devel json-glib-devel qqwing-devel"
+makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel"
 short_desc="GNOME Sudoku Japanese logic game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From fe658aacb89b107c16cc147fd937362909ceec8e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:56:48 +0100
Subject: [PATCH 0499/2561] gnome-taquin: fix for meson 0.61

---
 srcpkgs/gnome-taquin/patches/meson-0.61.patch | 134 ++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 srcpkgs/gnome-taquin/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-taquin/patches/meson-0.61.patch b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e14267675ecb
--- /dev/null
+++ b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
@@ -0,0 +1,134 @@
+From 99dea5e7863e112f33f16e59898c56a4f1a547b3 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 16 Jan 2021 14:00:15 +0100
+Subject: [PATCH] Don't alter or try to write [GtkChild] fields
+
+See https://gitlab.gnome.org/GNOME/vala/issues/1121
+---
+ src/overlayed-list.vala | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/src/overlayed-list.vala b/src/overlayed-list.vala
+index 3fbb1c3..eb2404a 100644
+--- a/src/overlayed-list.vala
++++ b/src/overlayed-list.vala
+@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+     internal void set_window_size (AdaptativeWidget.WindowSize new_size)
+     {
+         if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size))
+-            set_horizontal (ref main_context, ref edit_mode_box);
++            set_horizontal (ref main_context, edit_mode_box);
+         else
+-            set_vertical (ref main_context, ref edit_mode_box);
++            set_vertical (ref main_context, edit_mode_box);
+     }
+-    private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box)
++    private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box)
+     {
+         main_context.remove_class ("vertical");
+         edit_mode_box.halign = Align.END;
+@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+         edit_mode_box.width_request = 160;
+         main_context.add_class ("horizontal");
+     }
+-    private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box)
++    private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box)
+     {
+         main_context.remove_class ("horizontal");
+         edit_mode_box.halign = Align.CENTER;
+@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool next_match ()
+     {
+-        return _next_match (ref main_list_box);
++        return _next_match (main_list_box);
+     }
+-    private static inline bool _next_match (ref ListBox main_list_box)
++    private static inline bool _next_match (ListBox main_list_box)
+     {
+         ListBoxRow? row = main_list_box.get_selected_row ();    // TODO multiple rows and focus-only lists
+         if (row == null)
+@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+         if (row == null)
+         {
+-            _scroll_bottom (ref main_list_box);
++            _scroll_bottom (main_list_box);
+             return false;
+         }
+         main_list_box.select_row ((!) row);
+@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool previous_match ()
+     {
+-        return _previous_match (ref main_list_box);
++        return _previous_match (main_list_box);
+     }
+-    private static inline bool _previous_match (ref ListBox main_list_box)
++    private static inline bool _previous_match (ListBox main_list_box)
+     {
+         uint n_items = main_list_box.get_children ().length ();  // FIXME OverlayedList.n_items is unreliable
+         if (n_items == 0)
+@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected int [] get_selected_rows_indices ()
+     {
+-        return _get_selected_rows_indices (ref main_list_box);
++        return _get_selected_rows_indices (main_list_box);
+     }
+-    private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box)
++    private static inline int [] _get_selected_rows_indices (ListBox main_list_box)
+     {
+         int [] indices = new int [0];
+         main_list_box.selected_foreach ((_list_box, selected_row) => {
+@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected void scroll_top ()
+     {
+-        _scroll_top (ref main_list_box);
++        _scroll_top (main_list_box);
+     }
+-    private static inline void _scroll_top (ref ListBox main_list_box)
++    private static inline void _scroll_top (ListBox main_list_box)
+     {
+         Adjustment adjustment = main_list_box.get_adjustment ();
+         adjustment.set_value (adjustment.get_lower ());
+@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected void scroll_bottom ()
+     {
+-        _scroll_bottom (ref main_list_box);
++        _scroll_bottom (main_list_box);
+     }
+-    private static inline void _scroll_bottom (ref ListBox main_list_box)
++    private static inline void _scroll_bottom (ListBox main_list_box)
+     {
+         Adjustment adjustment = main_list_box.get_adjustment ();
+         adjustment.set_value (adjustment.get_upper ());
+@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool handle_copy_text (out string copy_text)
+     {
+-        return _handle_copy_text (out copy_text, ref main_list_box);
++        return _handle_copy_text (out copy_text, main_list_box);
+     }
+-    private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box)
++    private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box)
+     {
+         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+         OverlayedListRow row;
+@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal SelectionState get_selection_state ()
+     {
+-        return _get_selection_state (ref main_list_box, ref main_list_store);
++        return _get_selection_state (main_list_box, ref main_list_store);
+     }
+-    private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store)
++    private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store)
+     {
+         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+         uint n_selected_rows = selected_rows.length ();
+-- 
+GitLab
+

From ef4ee1ed7b43b55195e0663f0c278f5a24690ef5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0500/2561] gnome-terminal: fix for meson 0.61

---
 .../gnome-terminal/patches/meson-0.61.patch   | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 srcpkgs/gnome-terminal/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-terminal/patches/meson-0.61.patch b/srcpkgs/gnome-terminal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8b6edbb923a2
--- /dev/null
+++ b/srcpkgs/gnome-terminal/patches/meson-0.61.patch
@@ -0,0 +1,47 @@
+From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@src.gnome.org>
+Date: Fri, 14 Jan 2022 11:33:32 +0100
+Subject: [PATCH] build: Fix for newer meson
+
+---
+ data/meson.build | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 79d97e5b..e0bcbb91 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -18,7 +18,6 @@
+ metainfodir = gt_datadir / 'metainfo'
+ 
+ i18n.merge_file(
+-  gt_dns_name + '.metainfo.xml',
+   input: gt_dns_name + '.metainfo.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+@@ -27,7 +26,6 @@ i18n.merge_file(
+ )
+ 
+ i18n.merge_file(
+-  gt_dns_name + '.Nautilus.metainfo.xml',
+   input: gt_dns_name + '.Nautilus.metainfo.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+@@ -40,7 +38,6 @@ i18n.merge_file(
+ desktopdatadir = gt_datadir / 'applications'
+ 
+ i18n.merge_file(
+-  gt_dns_name + '.desktop',
+   input: gt_dns_name + '.desktop.in',
+   output: '@BASENAME@',
+   type: 'desktop',
+@@ -57,4 +54,4 @@ meson.add_install_script(
+ 
+ # Subdirs
+ 
+-subdir('icons')
+\ No newline at end of file
++subdir('icons')
+-- 
+GitLab
+

From 7859be92cc6d3336b1e15a744f895e6cfe2cc73a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:30:05 +0100
Subject: [PATCH 0501/2561] gnome-tetravex: fix for meson 0.61

---
 .../gnome-tetravex/patches/meson-0.61.patch   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/gnome-tetravex/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-tetravex/patches/meson-0.61.patch b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
new file mode 100644
index 000000000000..12e0eab64ef0
--- /dev/null
+++ b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:48:22 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+data/meson.build:59:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bb77248..b881e8a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -34,7 +34,7 @@ endif
+ 
+ # Desktop file
+ if get_option('build_gui')
+-  desktop_file = i18n.merge_file ('desktop-file',
++  desktop_file = i18n.merge_file (
+                            input: project_id + '.desktop.in',
+                           output: project_id + '.desktop',
+                          install: true,
+@@ -56,7 +56,7 @@ endif
+ 
+ # AppData file
+ if get_option('build_gui')
+-  appdata_file = i18n.merge_file ('appdata-file',
++  appdata_file = i18n.merge_file (
+                            input: project_id + '.appdata.xml.in',
+                           output: project_id + '.appdata.xml',
+                          install: true,
+-- 
+GitLab
+

From 615677f2437cc47f88e116a12267e3a03aabeaaa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:27:12 +0100
Subject: [PATCH 0502/2561] gnome-tweaks: fix for meson 0.61

---
 srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
new file mode 100644
index 000000000000..80efde38735e
--- /dev/null
+++ b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001
+From: Mae Dartmann <hello@maedartmann.name>
+Date: Wed, 16 Feb 2022 06:08:41 +0000
+Subject: [PATCH] meson: fix invalid positional argument
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd6d5da..74f7e82 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ appdata_file = 'org.gnome.tweaks.appdata.xml'
+-i18n.merge_file(appdata_file,
++i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
+@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
+ )
+ 
+ desktop_file = 'org.gnome.tweaks.desktop'
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: desktop_file + '.in',
+   output: desktop_file,
+   po_dir: '../po',
+-- 
+GitLab
+

From ad77c6788a257479ca7f3ea559595b032781925d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0503/2561] gnome-weather: fix for meson 0.61

---
 srcpkgs/gnome-weather/patches/meson-0.61.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/gnome-weather/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-weather/patches/meson-0.61.patch b/srcpkgs/gnome-weather/patches/meson-0.61.patch
new file mode 100644
index 000000000000..a305b8c54dc4
--- /dev/null
+++ b/srcpkgs/gnome-weather/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -59,7 +59,6 @@ endif
+ appdata_conf = configuration_data()
+ appdata_conf.set('app_id', weather_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: '@0@.appdata.xml.in.in'.format(default_id),
+     output: '@0@.appdata.xml.in'.format(default_id),

From 700a785ce31610fe6093015964cb0c758ca11a95 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:31:37 +0100
Subject: [PATCH 0504/2561] gnote: fix for meson 0.61

---
 srcpkgs/gnote/patches/meson-0.61.patch | 36 ++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnote/patches/meson-0.61.patch

diff --git a/srcpkgs/gnote/patches/meson-0.61.patch b/srcpkgs/gnote/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e5575c0fa3f7
--- /dev/null
+++ b/srcpkgs/gnote/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:53:17 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:4:0: ERROR: Function does not take positional arguments.
+data/meson.build:41:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index a6138165..8d16368a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ install_man('gnote.1')
+ 
+ desktop_file = 'org.gnome.Gnote.desktop'
+ gnote_desktop_file = i18n.merge_file(
+-  desktop_file,
+   type: 'desktop',
+   input: desktop_file + '.in',
+   output: desktop_file,
+@@ -39,7 +38,6 @@ configure_file(
+ 
+ gnote_appdata = 'org.gnome.Gnote.appdata.xml'
+ appdata_file = i18n.merge_file(
+-  gnote_appdata,
+   input: gnote_appdata + '.in',
+   output: gnote_appdata,
+   po_dir: '../po',
+-- 
+GitLab
+

From 764925f29e53eeb54c0d335694fa4a765e651650 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0505/2561] gobject-introspection: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 294 ++++++++++++++++++
 1 file changed, 294 insertions(+)
 create mode 100644 srcpkgs/gobject-introspection/patches/meson-0.61.patch

diff --git a/srcpkgs/gobject-introspection/patches/meson-0.61.patch b/srcpkgs/gobject-introspection/patches/meson-0.61.patch
new file mode 100644
index 000000000000..44bf409b1164
--- /dev/null
+++ b/srcpkgs/gobject-introspection/patches/meson-0.61.patch
@@ -0,0 +1,294 @@
+From 827494d6415b696a98fa195cbd883b50cc893bfc Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Tue, 11 Jan 2022 15:47:50 +0000
+Subject: [PATCH] doctool: Add templates_dir CLI argument
+
+We can find the templates directory using the module file once
+installed, but when running uninstalled we need to have a way to specify
+where the templates can be found in the sources directory.
+---
+ giscanner/docmain.py   |  4 +++-
+ giscanner/docwriter.py | 14 ++++++++------
+ 2 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/giscanner/docmain.py b/giscanner/docmain.py
+index dab063ef..88430f05 100644
+--- a/giscanner/docmain.py
++++ b/giscanner/docmain.py
+@@ -51,6 +51,8 @@ def doc_main(args):
+     parser.add_argument("-s", "--write-sections-file",
+                         action="store_const", dest="format", const="sections",
+                         help="Backwards-compatible equivalent to -f sections")
++    parser.add_argument("--templates-dir",
++                        action="store")
+ 
+     args = parser.parse_args(args[1:])
+     if not args.output:
+@@ -74,7 +76,7 @@ def doc_main(args):
+         with open(args.output, 'w', encoding='utf-8') as fp:
+             write_sections_file(fp, sections_file)
+     else:
+-        writer = DocWriter(transformer, args.language, args.format)
++        writer = DocWriter(transformer, args.language, args.format, args.templates_dir)
+         writer.write(args.output)
+ 
+     return 0
+diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
+index d0cd610f..b72ab2ac 100644
+--- a/giscanner/docwriter.py
++++ b/giscanner/docwriter.py
+@@ -1288,7 +1288,7 @@ LANGUAGES = {
+ 
+ 
+ class DocWriter(object):
+-    def __init__(self, transformer, language, output_format):
++    def __init__(self, transformer, language, output_format, templates_dir=None):
+         self._transformer = transformer
+ 
+         try:
+@@ -1300,18 +1300,20 @@ class DocWriter(object):
+         self._formatter = formatter_class(self._transformer)
+         self._language = self._formatter.language
+         self._output_format = output_format
++        self._templates_dir = templates_dir
+ 
+         self._lookup = self._get_template_lookup()
+ 
+     def _get_template_lookup(self):
+-        if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
++        if self._templates_dir is not None:
++            srcdir = self._templates_dir
++        elif 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
+             top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR']
+-            srcdir = os.path.join(top_srcdir, 'giscanner')
++            srcdir = os.path.join(top_srcdir, 'giscanner', 'doctemplates')
+         else:
+-            srcdir = os.path.dirname(__file__)
++            srcdir = os.path.join(os.path.dirname(__file__), 'doctemplates')
+ 
+-        template_dir = os.path.join(srcdir, 'doctemplates',
+-                                    self._formatter.output_format)
++        template_dir = os.path.join(srcdir, self._formatter.output_format)
+ 
+         return TemplateLookup(directories=[template_dir],
+                               module_directory=tempfile.mkdtemp(),
+-- 
+GitLab
+
+From effb1e09dee263cdac4ec593e8caf316e6f01fe2 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Tue, 11 Jan 2022 15:51:10 +0000
+Subject: [PATCH] build: Avoid the doctemplates hack
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The hack that copies the doctemplates directory into the build
+directory has stopped working with newer versions of Meson; while it's
+possible to copy files, custom_target() cannot depend on a directory.
+Additionally, the dependency has always been broken.
+
+Instead, we enumerate the template files—after all, it's not like they
+change a lot—and then we list them as dependencies for the test targets.
+
+Fixes: #414
+---
+ giscanner/doctemplates/devdocs/meson.build | 19 +++++++
+ giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++
+ giscanner/meson.build                      | 14 ++---
+ tests/scanner/meson.build                  | 24 +++++----
+ 4 files changed, 98 insertions(+), 22 deletions(-)
+ create mode 100644 giscanner/doctemplates/devdocs/meson.build
+ create mode 100644 giscanner/doctemplates/mallard/meson.build
+
+diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build
+new file mode 100644
+index 00000000..2037182a
+--- /dev/null
++++ b/giscanner/doctemplates/devdocs/meson.build
+@@ -0,0 +1,19 @@
++doc_templates += files([
++  'Gjs/_doc.tmpl',
++  'Gjs/_index.tmpl',
++  'Gjs/_method.tmpl',
++  'Gjs/_methods.tmpl',
++  'Gjs/_properties.tmpl',
++  'Gjs/_signals.tmpl',
++  'Gjs/_staticmethods.tmpl',
++  'Gjs/_vfuncs.tmpl',
++  'Gjs/base.tmpl',
++  'Gjs/callback.tmpl',
++  'Gjs/class.tmpl',
++  'Gjs/default.tmpl',
++  'Gjs/enum.tmpl',
++  'Gjs/function.tmpl',
++  'Gjs/interface.tmpl',
++  'Gjs/method.tmpl',
++  'Gjs/namespace.tmpl',
++])
+diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build
+new file mode 100644
+index 00000000..5fe4e2af
+--- /dev/null
++++ b/giscanner/doctemplates/mallard/meson.build
+@@ -0,0 +1,63 @@
++base_templates = files([
++  'base.tmpl',
++  'class.tmpl',
++  'namespace.tmpl',
++])
++
++c_templates = files([
++  'C/callback.tmpl',
++  'C/class.tmpl',
++  'C/constructor.tmpl',
++  'C/default.tmpl',
++  'C/enum.tmpl',
++  'C/field.tmpl',
++  'C/function.tmpl',
++  'C/interface.tmpl',
++  'C/method.tmpl',
++  'C/namespace.tmpl',
++  'C/property.tmpl',
++  'C/record.tmpl',
++  'C/signal.tmpl',
++  'C/vfunc.tmpl',
++])
++
++gjs_templates = files([
++  'Gjs/callback.tmpl',
++  'Gjs/class.tmpl',
++  'Gjs/constructor.tmpl',
++  'Gjs/default.tmpl',
++  'Gjs/enum.tmpl',
++  'Gjs/field.tmpl',
++  'Gjs/function.tmpl',
++  'Gjs/interface.tmpl',
++  'Gjs/method.tmpl',
++  'Gjs/namespace.tmpl',
++  'Gjs/property.tmpl',
++  'Gjs/record.tmpl',
++  'Gjs/signal.tmpl',
++  'Gjs/vfunc.tmpl',
++])
++
++py_templates = files([
++  'Python/callback.tmpl',
++  'Python/class.tmpl',
++  'Python/constructor.tmpl',
++  'Python/default.tmpl',
++  'Python/enum.tmpl',
++  'Python/field.tmpl',
++  'Python/function.tmpl',
++  'Python/interface.tmpl',
++  'Python/method.tmpl',
++  'Python/namespace.tmpl',
++  'Python/property.tmpl',
++  'Python/record.tmpl',
++  'Python/signal.tmpl',
++  'Python/vfunc.tmpl',
++])
++
++doc_templates += [
++  base_templates,
++  c_templates,
++  gjs_templates,
++  py_templates,
++]
+diff --git a/giscanner/meson.build b/giscanner/meson.build
+index 41edcd44..3d7dc678 100644
+--- a/giscanner/meson.build
++++ b/giscanner/meson.build
+@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c',
+ 
+ install_subdir('doctemplates', install_dir: giscannerdir)
+ 
+-# XXX: this doesn't track the input, but there is nothing to copy many files
+-# in meson.
+-doc_templates = custom_target('copy-templates',
+-  input : 'doctemplates',
+-  output : 'doctemplates',
+-  command : [
+-    python, '-c',
+-      'import sys, shutil;' +
+-      'shutil.rmtree(sys.argv[2], ignore_errors=True);' +
+-      'shutil.copytree(sys.argv[1], sys.argv[2])',
+-    '@INPUT@', '@OUTPUT@'])
++doc_templates = []
++subdir('doctemplates/devdocs')
++subdir('doctemplates/mallard')
+ 
+ flex = find_program('flex', 'win_flex')
+ bison = find_program('bison', 'win_bison')
+diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build
+index 5176b957..b81b3fd5 100644
+--- a/tests/scanner/meson.build
++++ b/tests/scanner/meson.build
+@@ -525,19 +525,26 @@ foreach gir : test_girs
+ endforeach
+ 
+ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
++  doctool_env = environment()
++  doctool_env.set('srcdir', meson.current_source_dir())
++  doctool_env.set('builddir', meson.current_build_dir())
++
+   foreach language : ['C', 'Python', 'Gjs']
+     regress_docs = custom_target(
+       'generate-docs-' + language,
+       input: regress_gir,
+-      depends: [doc_templates],
++      depend_files: doc_templates,
+       build_by_default: not cairo_deps_found,
++      env: doctool_env,
+       output: 'Regress-1.0-' + language,
+       command: [
+         python, girdoctool,
+         '--add-include-path=' + join_paths(build_root, 'gir'),
+         '--add-include-path=' + meson.current_build_dir(),
+         '--language', language,
+-        '@INPUT@', '-o', '@OUTPUT@'],
++        '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'),
++        '@INPUT@', '-o', '@OUTPUT@',
++      ],
+     )
+ 
+     if cairo_deps_found
+@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+         python,
+         args: [gi_tester, 'Regress-1.0-' + language],
+         depends: [regress_docs],
+-        env: [
+-          'srcdir=' + meson.current_source_dir(),
+-          'builddir=' + meson.current_build_dir(),
+-        ],
++        env: doctool_env,
+       )
+     endif
+   endforeach
+@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+   regress_sections = custom_target(
+     'generate-docs-sections',
+     input: regress_gir,
+-    depends: [doc_templates],
++    depend_files: [doc_templates],
+     build_by_default: not cairo_deps_found,
+     output: 'Regress-1.0-sections.txt',
++    env: doctool_env,
+     command: [
+       python, girdoctool,
+       '--add-include-path=' + join_paths(build_root, 'gir'),
+@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+       python,
+       args: [gi_tester, 'Regress-1.0-sections.txt'],
+       depends: [regress_sections],
+-      env: [
+-        'srcdir=' + meson.current_source_dir(),
+-        'builddir=' + meson.current_build_dir(),
+-      ],
++      env: doctool_env,
+     )
+   endif
+ endif
+-- 
+GitLab
+

From 26e21357afad3848ca08915e882b90554108b21c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0506/2561] gthumb: fix for meson 0.61

---
 .../patches/linguas-remove-duplicate.patch    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/gthumb/patches/linguas-remove-duplicate.patch

diff --git a/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch
new file mode 100644
index 000000000000..00e9dde84669
--- /dev/null
+++ b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch
@@ -0,0 +1,24 @@
+From daef485dffd67319c114cf1bda453bf6157e11ff Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Tue, 11 Jan 2022 12:30:44 +0100
+Subject: [PATCH] LINGUAS: removed duplicated entry
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index b615195e..aabf71ac 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -9,7 +9,6 @@ eu
+ fr
+ hu
+ id
+-id
+ nl
+ oc
+ sl
+-- 
+GitLab
+

From d68bf8be05ab7d96c76c2bbc1e6ac0389e689d9b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:45:46 +0100
Subject: [PATCH 0507/2561] gtranslator: fix for meson 0.61

---
 srcpkgs/gtranslator/patches/meson-0.61.patch | 36 ++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch

diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..54063041fe16
--- /dev/null
+++ b/srcpkgs/gtranslator/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:57:43 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2ca0be0b..2ebbfb12 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@0@.desktop'.format(gtr_app_id),
+@@ -35,7 +34,6 @@ appdata_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata_in,
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 981232f57424bc5f2346c142a1d5e546dc3b0c30 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:19 +0100
Subject: [PATCH 0508/2561] gvfs: fix for meson 0.61

---
 srcpkgs/gvfs/patches/meson-0.61.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/gvfs/patches/meson-0.61.patch

diff --git a/srcpkgs/gvfs/patches/meson-0.61.patch b/srcpkgs/gvfs/patches/meson-0.61.patch
new file mode 100644
index 000000000000..38f04b2e894c
--- /dev/null
+++ b/srcpkgs/gvfs/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -366,7 +366,6 @@ if enable_admin
+   )
+ 
+   i18n.merge_file(
+-    policy,
+     input: policy_in,
+     output: '@BASENAME@',
+     po_dir: po_dir,

From 4a9855f980bd2a8f580ebe6b121ce88e3591b711 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 22 Mar 2022 22:42:58 +0100
Subject: [PATCH 0509/2561] harfbuzz: fix for meson 0.61

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

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 894a1b7bf9fe..d5c501aa5413 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -3,7 +3,7 @@ pkgname=harfbuzz
 version=3.3.1
 revision=1
 build_style=meson
-build_helper=gir
+build_helper="gir qemu"
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"

From bf81c67f6aec7282a2e8c324090ed45c016d4d97 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:05 +0100
Subject: [PATCH 0510/2561] hitori: fix for meson 0.61

---
 srcpkgs/hitori/patches/meson-0.61.patch | 41 +++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 srcpkgs/hitori/patches/meson-0.61.patch

diff --git a/srcpkgs/hitori/patches/meson-0.61.patch b/srcpkgs/hitori/patches/meson-0.61.patch
new file mode 100644
index 000000000000..37adaa0116e6
--- /dev/null
+++ b/srcpkgs/hitori/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 2 Nov 2021 12:04:29 +0000
+Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Meson never took positional arguments in this function, but didn’t warn
+about it until Meson 0.60. Drop the unnecessary arguments to fix the
+warning.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 97b8e68..c66a233 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ subdir('icons')
+ 
+-desktop_file = i18n.merge_file('desktop-file',
++desktop_file = i18n.merge_file(
+   type: 'desktop',
+   input: '@0@.desktop.in'.format(application_id),
+   output: '@0@.desktop'.format(application_id),
+@@ -20,7 +20,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file('appdata-file',
++appdata_file = i18n.merge_file(
+   input: '@0@.appdata.xml.in'.format(application_id),
+   output: '@0@.appdata.xml'.format(application_id),
+   po_dir: join_paths(meson.source_root(), 'po'),
+-- 
+GitLab
+

From 80324346663e2b8129d050d8e7d9bfeab6b9a338 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 21:07:42 +0100
Subject: [PATCH 0511/2561] io.elementary.code: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/io.elementary.code/patches/meson-0.61.patch

diff --git a/srcpkgs/io.elementary.code/patches/meson-0.61.patch b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
new file mode 100644
index 000000000000..87a88aabff47
--- /dev/null
+++ b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
@@ -0,0 +1,22 @@
+From a2607cce3a6b1bb62d02456456d3cbc3c6530bb0 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:25 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#1165)
+
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c2ff0c2881..1f3940d481 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -64,7 +64,6 @@ if get_option ('have_pkexec')
+     )
+ 
+     i18n.merge_file(
+-        'policy',
+         input: policy_in,
+         output: meson.project_name() + '.policy',
+         po_dir: join_paths(meson.source_root (), 'po', 'extra'),

From 121dc8a3d278b70612de8d30bcf60488955d19ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 22:54:07 +0100
Subject: [PATCH 0512/2561] io.elementary.music: fix for meson 0.61

---
 .../patches/meson-0.61.patch                   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/io.elementary.music/patches/meson-0.61.patch

diff --git a/srcpkgs/io.elementary.music/patches/meson-0.61.patch b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
new file mode 100644
index 000000000000..17393cc5aa07
--- /dev/null
+++ b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -27,7 +27,6 @@ install_data(
+ 
+ i18n = import('i18n')
+ desktop_file = i18n.merge_file(
+-    'desktop',
+     input: meson.project_name() + '.desktop.in',
+     output: meson.project_name() + '.desktop',
+     install: true,
+@@ -37,7 +36,6 @@ desktop_file = i18n.merge_file(
+ )
+ 
+ appdata_file = i18n.merge_file(
+-    'appdata',
+     input: meson.project_name() + '.appdata.xml.in',
+     output: meson.project_name() + '.appdata.xml',
+     install: true,

From 88230ebd113ead4a2cd2e775433dcc5075b712cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 20:24:34 +0100
Subject: [PATCH 0513/2561] io.elementary.terminal: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/io.elementary.terminal/patches/meson-0.61.patch

diff --git a/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..7fd1fb455335
--- /dev/null
+++ b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 15e3ace08cb25e53941249fa1ee680a1e2f871b4 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:28 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#649)
+
+---
+ data/meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 435b84172..a64fc120e 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ install_data(
+ )
+ 
+ i18n.merge_file (
+-    'desktop',
+     input: meson.project_name() + '.desktop.in',
+     output: meson.project_name() + '.desktop',
+     install: true,
+@@ -14,7 +13,6 @@ i18n.merge_file (
+ )
+ 
+ i18n.merge_file (
+-    'desktop',
+     input: 'open-pantheon-terminal-here.desktop.in',
+     output: 'open-pantheon-terminal-here.desktop',
+     install: true,
+@@ -24,7 +22,6 @@ i18n.merge_file (
+ )
+ 
+ i18n.merge_file (
+-    'appdata',
+     input: meson.project_name() + '.appdata.xml.in',
+     output: meson.project_name() + '.appdata.xml',
+     install: true,

From 79dc00a609a16250381b39532621f2c31b0a866b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:07:09 +0100
Subject: [PATCH 0514/2561] libaccounts-glib: fix for meson 0.61

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

diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template
index ad3a6e0621a9..9b86ed45ed91 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -17,9 +17,9 @@ checksum=eebb1c6debfcf929efb388a0f28d8cc8ec9b32f273e4abe4224a33e5d299cd73
 if [ "$CROSS_BUILD" ]; then
 	# Remove docs. During install of package, it will try
 	# to run target binary with host, which causes exec error
-		pre_build() {
-			vsed -e '/docs/d' -i meson.build
-		}
+	post_patch() {
+		vsed -e '/docs/d' -i meson.build
+	}
 fi
 
 libaccounts-glib-devel_package() {

From 68601e0dd2c9da50059aac809e18bb083207ceda Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:44:04 +0100
Subject: [PATCH 0515/2561] network-manager-applet: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch

diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
new file mode 100644
index 000000000000..1060e15b364a
--- /dev/null
+++ b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:34:09 +0100
+Subject: [PATCH] meson.build: address meson 0.61 failures
+
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 33adb632..6178c0eb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
+ 
+ foreach desktop: desktop_files
+   i18n.merge_file(
+-    desktop + '-desktop',
+     input: desktop + '.desktop.in',
+     output: desktop + '.desktop',
+     install: true,
+@@ -275,7 +274,6 @@ endforeach
+ appdata = 'nm-connection-editor.appdata.xml'
+ 
+ i18n.merge_file(
+-  'desktop',
+   input: appdata + '.in',
+   output: appdata,
+   install: true,
+-- 
+GitLab
+

From b58f07500e08720ee0756af905d3a9290856ccd3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:46:01 +0100
Subject: [PATCH 0516/2561] newsflash: fix for meson 0.61

---
 srcpkgs/newsflash/patches/meson-0.61.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/newsflash/patches/meson-0.61.patch

diff --git a/srcpkgs/newsflash/patches/meson-0.61.patch b/srcpkgs/newsflash/patches/meson-0.61.patch
new file mode 100644
index 000000000000..bfc8a67d0aa8
--- /dev/null
+++ b/srcpkgs/newsflash/patches/meson-0.61.patch
@@ -0,0 +1,20 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ subdir('icons')
+ 
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('com.gitlab.newsflash.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('com.gitlab.newsflash.appdata.xml.in.in'),
+     output: '@BASENAME@',

From b613a1b9c8aeafb05e1479cc863d3291f0066bf2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 11:35:35 +0100
Subject: [PATCH 0517/2561] orc: fix for meson 0.61

---
 srcpkgs/orc/template | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template
index 36311464556b..10f306289ddf 100644
--- a/srcpkgs/orc/template
+++ b/srcpkgs/orc/template
@@ -3,8 +3,9 @@ pkgname=orc
 version=0.4.32
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled -Dtests=disabled"
-hostmakedepends="pkg-config gtk-doc"
+build_helper="gir"
+configure_args="-Dexamples=disabled -Dtests=disabled -Dgtk_doc=$(vopt_if gtk_doc enabled disabled)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
 short_desc="Oild Runtime Compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
@@ -12,6 +13,12 @@ homepage="https://cgit.freedesktop.org/gstreamer/orc"
 distfiles="http://gstreamer.freedesktop.org/src/orc/orc-${version}.tar.xz"
 checksum=a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0
 
+build_options="gtk_doc"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
 post_install() {
 	vlicense COPYING
 }
@@ -25,6 +32,8 @@ orc-devel_package() {
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove usr/share/aclocal
-		vmove usr/share/gtk-doc
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 53f98fae795ab04647db233e8452c47971c33e45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:06:25 +0100
Subject: [PATCH 0518/2561] p11-kit: fix for meson 0.61

---
 srcpkgs/p11-kit/patches/meson-0.61.patch | 42 ++++++++++++++++++++++++
 srcpkgs/p11-kit/template                 | 14 ++++++--
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/p11-kit/patches/meson-0.61.patch

diff --git a/srcpkgs/p11-kit/patches/meson-0.61.patch b/srcpkgs/p11-kit/patches/meson-0.61.patch
new file mode 100644
index 000000000000..43e75620c40e
--- /dev/null
+++ b/srcpkgs/p11-kit/patches/meson-0.61.patch
@@ -0,0 +1,42 @@
+From 9f01a8a45ba913a9b65894cef9369b6010005096 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 23:25:05 -0500
+Subject: [PATCH] gtkdoc: remove dependencies on custom target files
+
+Sadly, the `dependencies` kwarg does not actually do what it seems to be
+trying to be used for, here. It is for listing dependency or library
+objects whose compiler flags should be added to gtkdoc-scangobj.
+
+It will not actually add ninja target dependencies. The similar kwarg in
+other meson functions (e.g. genmarshal and compile_schemas) that *do*
+allow adding target dependencies, is `depend_files`.
+
+Older versions of meson simply did nothing in an if/elif/elif block
+where these custom_targets never matched anything, and were thus
+silently ignored.
+
+Meson 0.61 type-validates the arguments and rejects CustomTarget as
+invalid:
+
+```
+doc/manual/meson.build:72:8: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget | PkgConfigDependency] but should have been array[Dependency | SharedLibrary | StaticLibrary]
+```
+
+Fixes #406
+---
+ doc/manual/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/manual/meson.build b/doc/manual/meson.build
+index cf8758db..560df8db 100644
+--- a/doc/manual/meson.build
++++ b/doc/manual/meson.build
+@@ -73,7 +73,7 @@ if get_option('gtk_doc')
+               main_xml: 'p11-kit-docs.xml',
+               namespace: 'p11_kit',
+               src_dir: 'p11-kit',
+-              dependencies: libffi_deps + dlopen_deps + xml_deps,
++              dependencies: libffi_deps + dlopen_deps,
+               scan_args: [
+                 '--ignore-headers=' + ' '.join(ignore_headers),
+                 '--rebuild-types',
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index cc0b11eb720f..63cdebc7563f 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -3,8 +3,9 @@ pkgname=p11-kit
 version=0.23.22
 revision=3
 build_style=meson
+build_helper="qemu"
 configure_args="-Dlibffi=enabled -Dsystemd=disabled -Dbash_completion=disabled
- -Dgtk_doc=true -Dman=true -Dnls=true -Dtrust_module=enabled
+ -Dman=true $(vopt_bool gtk_doc gtk_doc) -Dnls=true -Dtrust_module=enabled
  -Dtrust_paths=/etc/ssl/certs/ca-certificates.crt"
 hostmakedepends="pkg-config gettext gtk-doc libxslt libtasn1-tools"
 makedepends="libtasn1-devel libffi-devel"
@@ -22,6 +23,13 @@ else
 	configure_args+=" -Dtest=false"
 fi
 
+build_options="gtk_doc"
+build_options_default=""
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
 post_install() {
 	mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example \
 		${DESTDIR}/etc/pkcs11/pkcs11.conf
@@ -38,6 +46,8 @@ p11-kit-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gtk-doc
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 6464bd756a81ba1f33f7f91cddd61f4475b06b7a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:30:51 +0100
Subject: [PATCH 0519/2561] pantheon-screenshot: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/pantheon-screenshot/patches/meson-0.61.patch

diff --git a/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8a64e9f14a5f
--- /dev/null
+++ b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,29 @@
+From 80a5d942e813dd098e1ef0f6629b81d2ccef05ae Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Thu, 13 Jan 2022 13:51:48 +0800
+Subject: [PATCH] Fix data/meson.build (#241)
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index cb2adc80..76dad525 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,7 +20,6 @@ install_data(
+ )
+ 
+ i18n.merge_file (
+-    'desktop',
+     input: 'screenshot.desktop.in',
+     output: meson.project_name() + '.desktop',
+     install: true,
+@@ -30,7 +29,6 @@ i18n.merge_file (
+ )
+ 
+ i18n.merge_file (
+-    'appdata',
+     input: 'screenshot.appdata.xml.in',
+     output: meson.project_name() + '.appdata.xml',
+     install: true,

From d6e569617424d255da3b178e5d7214275f012a38 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:33:07 +0100
Subject: [PATCH 0520/2561] polari: fix for meson 0.61

---
 srcpkgs/polari/patches/meson-0.61.patch | 43 +++++++++++++++++++++++++
 srcpkgs/polari/template                 |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/polari/patches/meson-0.61.patch

diff --git a/srcpkgs/polari/patches/meson-0.61.patch b/srcpkgs/polari/patches/meson-0.61.patch
new file mode 100644
index 000000000000..a9ed3bc58032
--- /dev/null
+++ b/srcpkgs/polari/patches/meson-0.61.patch
@@ -0,0 +1,43 @@
+From 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:32:00 +0000
+Subject: [PATCH] meson: Drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/appdata/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+
+Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/242>
+---
+ data/appdata/meson.build | 2 +-
+ data/meson.build         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 88b4a0be..781ba22f 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,5 +1,5 @@
+ appdata_name = app_id + '.appdata.xml'
+-appdata = i18n.merge_file(appdata_name,
++appdata = i18n.merge_file(
+   input: appdata_name + '.in',
+   output: appdata_name,
+   po_dir: '../../po',
+diff --git a/data/meson.build b/data/meson.build
+index cedfd57b..655ae700 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ subdir('appdata')
+ subdir('icons')
+ 
+ desktop_filename = app_id + '.desktop'
+-desktop_file = i18n.merge_file(desktop_filename,
++desktop_file = i18n.merge_file(
+   input: desktop_filename + '.in',
+   output: desktop_filename,
+   po_dir: '../po',
+-- 
+GitLab
+
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index fda5f1945375..eb7c9d2dd3df 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -12,6 +12,7 @@ short_desc="GNOME IRC client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Polari"
+changelog="https://gitlab.gnome.org/GNOME/polari/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a3b05f81660370c67c942b6f44b298c7b78816feb38c926ec2212bde22ea40eb
 

From bf7bdaf21b22f97cbfc0a95baa13b73f2bf7f28c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:35:12 +0100
Subject: [PATCH 0521/2561] shotwell: fix for meson 0.61

---
 srcpkgs/shotwell/patches/meson-0.61.patch | 27 +++++++++++++++++++++++
 srcpkgs/shotwell/template                 |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/shotwell/patches/meson-0.61.patch

diff --git a/srcpkgs/shotwell/patches/meson-0.61.patch b/srcpkgs/shotwell/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f33fa2af1637
--- /dev/null
+++ b/srcpkgs/shotwell/patches/meson-0.61.patch
@@ -0,0 +1,27 @@
+From cc328b43ebb9a54a256ec73a86fb18381b2038e6 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 21:57:26 -0500
+Subject: [PATCH] fix duplicate languages causing meson 0.61 to error out
+
+It tried to create multiple targets with the same name and generating
+the same file. On older versions of meson, this was a run_target and
+just ran twice, but was still wrong.
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index 68f089c4..5352eecd 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -6,7 +6,6 @@ es
+ fr
+ hu
+ id
+-id
+ lv
+ pt_BR
+ sv
+-- 
+GitLab
+
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index b0c1878e31bb..386644d4939e 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -14,6 +14,7 @@ short_desc="Open source photo manager for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, CC-BY-SA-3.0"
 homepage="https://wiki.gnome.org/Apps/Shotwell"
+changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
 checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2
 lib32disabled=yes

From ce0d7ada224278ba863a273ad626fded813a1398 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:36:48 +0100
Subject: [PATCH 0522/2561] simple-scan: fix for meson 0.61

---
 srcpkgs/simple-scan/patches/meson-0.61.patch | 37 ++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 srcpkgs/simple-scan/patches/meson-0.61.patch

diff --git a/srcpkgs/simple-scan/patches/meson-0.61.patch b/srcpkgs/simple-scan/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e193747322c0
--- /dev/null
+++ b/srcpkgs/simple-scan/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Tue, 16 Nov 2021 02:43:11 +0800
+Subject: [PATCH] Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0 where
+it fails with "ERROR: Function does not take positional arguments".
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2b5a0ee3..cf6e4ae1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
+               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
+ meson.add_install_script ('meson_compile_gschema.py')
+ 
+-i18n.merge_file ('desktop-file',
+-                 input: 'simple-scan.desktop.in',
++i18n.merge_file (input: 'simple-scan.desktop.in',
+                  output: 'simple-scan.desktop',
+                  install: true,
+                  install_dir: join_paths (datadir, 'applications'),
+                  po_dir: '../po',
+                  type: 'desktop')
+ 
+-i18n.merge_file ('appdata-file',
+-                 input: 'simple-scan.appdata.xml.in',
++i18n.merge_file (input: 'simple-scan.appdata.xml.in',
+                  output: 'simple-scan.appdata.xml',
+                  install: true,
+                  install_dir: join_paths (datadir, 'metainfo'),
+-- 
+GitLab
+

From 0660cfa3c5cd23b589bc7f95523498dabbdf7168 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:39:25 +0100
Subject: [PATCH 0523/2561] sound-juicer: fix for meson 0.61

---
 srcpkgs/sound-juicer/patches/meson-0.61.patch | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/sound-juicer/patches/meson-0.61.patch

diff --git a/srcpkgs/sound-juicer/patches/meson-0.61.patch b/srcpkgs/sound-juicer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..662b7d631f61
--- /dev/null
+++ b/srcpkgs/sound-juicer/patches/meson-0.61.patch
@@ -0,0 +1,35 @@
+From 9f97ca1faca396099f52264a9729aa355f8d122e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 25 Jan 2022 12:15:31 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:31:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index ccff2d80..4dac8166 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,5 @@
+ # Desktop file
+ i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+     input: 'org.gnome.SoundJuicer.desktop.in.in',
+     output: 'org.gnome.SoundJuicer.desktop.in',
+@@ -29,7 +28,6 @@ configure_file(
+ 
+ # Metainfo
+ metainfo_file = i18n.merge_file(
+-  'metainfo',
+   input: files(join_paths('metainfo', 'org.gnome.SoundJuicer.metainfo.xml.in')),
+   output: 'org.gnome.SoundJuicer.metainfo.xml',
+   po_dir: po_dir,
+-- 
+GitLab
+

From b7d208a52dde3917d5915c33862e05b249693852 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:40:28 +0100
Subject: [PATCH 0524/2561] switchboard: fix for meson 0.61

---
 srcpkgs/switchboard/patches/meson-0.61.patch | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/switchboard/patches/meson-0.61.patch

diff --git a/srcpkgs/switchboard/patches/meson-0.61.patch b/srcpkgs/switchboard/patches/meson-0.61.patch
new file mode 100644
index 000000000000..cf29004ec332
--- /dev/null
+++ b/srcpkgs/switchboard/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+From ecf2a6c42122946cc84150f6927ef69c1f67c909 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 01:58:44 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#226)
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c456813..109554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ po_extra_dir = join_paths(meson.source_root(), 'po', 'extra')
+-i18n.merge_file('desktop',
++i18n.merge_file(
+     input: 'io.elementary.switchboard.desktop.in',
+     output: 'io.elementary.switchboard.desktop',
+     install: true,
+@@ -8,7 +8,7 @@ i18n.merge_file('desktop',
+     type: 'desktop'
+ )
+ 
+-i18n.merge_file('appdata',
++i18n.merge_file(
+     input: 'io.elementary.switchboard.appdata.xml.in',
+     output: 'io.elementary.switchboard.appdata.xml',
+     install: true,

From 7152f9055ad5b83a5a2e62508dcfeebcc833c6e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:05:03 +0100
Subject: [PATCH 0525/2561] tau: fix for meson 0.61

---
 srcpkgs/tau/patches/meson-0.61.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/tau/patches/meson-0.61.patch

diff --git a/srcpkgs/tau/patches/meson-0.61.patch b/srcpkgs/tau/patches/meson-0.61.patch
new file mode 100644
index 000000000000..d7ec3e3365bb
--- /dev/null
+++ b/srcpkgs/tau/patches/meson-0.61.patch
@@ -0,0 +1,17 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,4 +1,4 @@
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Tau.desktop.in.in'),
+@@ -22,7 +22,7 @@ if desktop_file_validate.found()
+     )
+ endif
+ 
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Tau.appdata.xml.in.in'),
+     output: 'org.gnome.Tau.appdata.xml.in',

From 8ce6fb7ff5ad7a152e588b8ced87641415909efc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 14:28:48 +0100
Subject: [PATCH 0526/2561] tilix: fix for meson 0.61

---
 srcpkgs/tilix/patches/meson-0.61.patch | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/tilix/patches/meson-0.61.patch

diff --git a/srcpkgs/tilix/patches/meson-0.61.patch b/srcpkgs/tilix/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c35c8d08ad05
--- /dev/null
+++ b/srcpkgs/tilix/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 7cb2c59a31891f6463d1b181f1ec461c9352d782 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 22 Feb 2022 12:06:23 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file() (#2081)
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:13:0: ERROR: Function does not take positional arguments.
+data/meson.build:46:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 81e9b410..c8b23e1b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -11,7 +11,6 @@ install_data(
+ 
+ # Install the desktop file
+ desktop_file = i18n.merge_file(
+-    '@0@.desktop'.format(project_id),
+     output: '@BASENAME@',
+     input: 'pkg/desktop/@0@.desktop.in'.format(project_id),
+     po_dir: meson.source_root() / 'po',
+@@ -44,7 +43,6 @@ metainfo_with_releases = custom_target('metainfo-news-merge',
+ 
+ # Install the MetaInfo file
+ metainfo_file = i18n.merge_file(
+-    tilix_metainfo_name,
+     output: tilix_metainfo_name,
+     input: metainfo_with_releases,
+     po_dir: meson.source_root() / 'po',

From 20b512e7f9b9c82ae000c067331a8952f6de0b47 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:09:00 +0100
Subject: [PATCH 0527/2561] totem: fix for meson 0.61

---
 srcpkgs/totem/patches/meson-0.61.patch | 39 ++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 srcpkgs/totem/patches/meson-0.61.patch

diff --git a/srcpkgs/totem/patches/meson-0.61.patch b/srcpkgs/totem/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8f05c5c7a015
--- /dev/null
+++ b/srcpkgs/totem/patches/meson-0.61.patch
@@ -0,0 +1,39 @@
+From 61e3a957cb7339c6614e764fcf1120d967d687e9 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 6 Jan 2022 17:21:28 +0100
+Subject: [PATCH] build: Remove unused i18n.merge_file() "name"
+
+data/meson.build:78:0: ERROR: Function does not take positional arguments.
+data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments.
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build         | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index c4d17e927..c2e646327 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ appdata = 'org.gnome.Totem.appdata.xml'
+ 
+ appdata_file = i18n.merge_file (
+-    'appdata',
+     input: appdata + '.in',
+     output: appdata,
+     install: true,
+diff --git a/data/meson.build b/data/meson.build
+index b31ce755c..8eebe3db1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -76,7 +76,6 @@ desktop_in = configure_file(
+ )
+ 
+ desktop_file = i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop_in,
+     output: desktop,
+-- 
+GitLab
+

From 8ff24b774c18a43930ea31840dc9cc983b501d31 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:14:03 +0100
Subject: [PATCH 0528/2561] virt-viewer: fix for meson 0.61

---
 srcpkgs/virt-viewer/patches/meson-0.61.patch | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/virt-viewer/patches/meson-0.61.patch

diff --git a/srcpkgs/virt-viewer/patches/meson-0.61.patch b/srcpkgs/virt-viewer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0b900e1f2128
--- /dev/null
+++ b/srcpkgs/virt-viewer/patches/meson-0.61.patch
@@ -0,0 +1,26 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ if host_machine.system() != 'windows'
+   desktop = 'remote-viewer.desktop'
+ 
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -14,7 +13,6 @@ if host_machine.system() != 'windows'
+   mimetypes = 'virt-viewer-mime.xml'
+ 
+   i18n.merge_file (
+-    mimetypes,
+     type: 'xml',
+     input: mimetypes + '.in',
+     output: mimetypes,
+@@ -27,7 +25,6 @@ if host_machine.system() != 'windows'
+   metainfo = 'remote-viewer.appdata.xml'
+ 
+   i18n.merge_file (
+-    metainfo,
+     type: 'xml',
+     input: metainfo + '.in',
+     output: metainfo,

From 27a3ca00a56c79147a36530db7cdff6fe5f32e7a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:45:18 +0100
Subject: [PATCH 0529/2561] janet: update to 1.21.0.

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

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index d7a6b871124f..30c4dc43db48 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.20.0
+version=1.21.0
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=cc2e617e2bdffaeca0fc330c890c73a83e2211b4ff65555d58973c47376bf5b1
+checksum=8e53efcdeda9b7519248bef5f0e744ad947e013b14960c66ba75967c5fb0a7fd
 
 post_install() {
 	vlicense LICENSE

From ea9b96920b641bfe3b04e5d0ab1b9b5e6d5446bb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:50:01 +0100
Subject: [PATCH 0530/2561] stress-ng: update to 0.13.12.

---
 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 5f94f17799ca..d13629b279bc 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.13.11
+version=0.13.12
 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="https://github.com/ColinIanKing/stress-ng/"
 distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=b7327cd0d01e331541648a545ec5a69c33202659afc26a8602042399e1fd4fdd
+checksum=16540d9cfa80d6a274fc0238d7251675ee38df6d5be805d14a67ce9efcb59ce9

From 237ea5dd655c3168da60723652f3587e62540e6d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:50:45 +0100
Subject: [PATCH 0531/2561] iana-etc: update to 20220325.

---
 srcpkgs/iana-etc/files/services | 7 +++++--
 srcpkgs/iana-etc/template       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index 511b3346bea4..94b9380da4f7 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -7628,6 +7628,7 @@ dsmipv6          4191/udp
 azeti            4192/tcp
 azeti-bd         4192/udp
 pvxplusio        4193/tcp
+spdm             4194/tcp
 aws-wsp          4195/tcp
 aws-wsp          4195/udp
 aws-wsp          4195/sctp
@@ -7664,6 +7665,8 @@ perrla           4313/tcp
 choiceview-agt   4314/tcp
 choiceview-clt   4316/tcp
 opentelemetry    4317/tcp
+fox-skytale      4319/tcp
+fox-skytale      4319/udp
 fdt-rcatp        4320/tcp
 fdt-rcatp        4320/udp
 rwhois           4321/tcp
@@ -8249,8 +8252,6 @@ strexec-s        5027/udp
 qvr              5028/tcp
 infobright       5029/tcp
 infobright       5029/udp
-surfpass         5030/tcp
-surfpass         5030/udp
 dmp              5031/udp
 signacert-agent  5032/tcp
 jtnetd-server    5033/tcp
@@ -9973,6 +9974,7 @@ espeech          8416/udp
 espeech-rtp      8417/tcp
 espeech-rtp      8417/udp
 aritts           8423/tcp
+pgbackrest       8432/tcp
 cybro-a-bus      8442/tcp
 cybro-a-bus      8442/udp
 pcsync-https     8443/tcp
@@ -11329,6 +11331,7 @@ ng-control      38412/sctp
 xn-control      38422/sctp
 e1-interface    38462/sctp
 f1-control      38472/sctp
+psqlmws         38638/tcp
 sruth           38800/tcp
 secrmmsafecopya 38865/tcp
 vroa            39063/tcp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index aca09e0e1e4b..e4d7a60c37cb 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=20211229
+version=20220325
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"

From 17e46d07e1642fd75ece91fa5b3ca38aaca321a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:54:12 +0100
Subject: [PATCH 0532/2561] coq: update to 8.15.1.

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

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index b7ddbfe70a39..fcfbc92cb2f6 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,14 +1,14 @@
 # Template file for 'coq'
 pkgname=coq
-version=8.15.0
-revision=2
+version=8.15.1
+revision=1
 hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
 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=73466e61f229b23b4daffdd964be72bd7a110963b9d84bd4a86bb05c5dc19ef3
+checksum=513e953b7183d478acb75fd6e80e4dc32ac1a918cf4343ac31a859cfb4e9aad2
 nopie=yes
 nocross=yes
 

From ba7ce118edf45f4f71471808355654a6e993cffe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 14:04:06 +0100
Subject: [PATCH 0533/2561] erlang: update to 24.3.2.

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

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index fc8bd893714e..d59eeb464e74 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.2.2
+version=24.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=b6adfc0bf14d94348146ae26cc38d09dca545f8e14ebab7ddcf9482a6e8d1162
+checksum=cdc9cf788d28a492eb6b24881fbd06a0a5c785dc374ad415b3be1db96326583c
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 8d8dec12ac11f1239652664ae03a6b4f01bbd585 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 15:38:16 +0100
Subject: [PATCH 0534/2561] python3-pipenv: update to 2022.3.24.

---
 srcpkgs/python3-pipenv/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index cae723465c04..4d0f0ec7e283 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.1.8
+version=2022.3.24
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -10,8 +10,9 @@ short_desc="Python Development Workflow for Humans"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/pypa/pipenv"
+changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=f84d7119239b22ab2ac2b8fbc7d619d83cf41135206d72a17c4f151cda529fd0
+checksum=800198d430e724f899e6db319cc640d5fd6da2acdbc301ceb1a1f967e990428b
 conflicts="python-pipenv>=0"
 
 post_extract() {
@@ -20,7 +21,4 @@ post_extract() {
 
 post_install() {
 	vlicense LICENSE
-	# remove files only valid for Python 2
-	rm -rf ${DESTDIR}/${py3_sitelib}/pipenv/patched/yaml2
-	rm -f ${DESTDIR}/${py3_sitelib}/pipenv/vendor/importlib_resources/_py2.py
 }

From 5bcdc745b69d6300e9ae03c654d6359c5ae34b3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 15:23:00 +0100
Subject: [PATCH 0535/2561] .github: improve the PR template

* avoid confusion with [skip CI] and [ci skip]
---
 .github/pull_request_template.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index cc4b5721590e..ef2a5d7637aa 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,7 +8,8 @@
 - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
 -->
 
-<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
+<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
+https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
 and test at least one native build and, if supported, at least one cross build.
 Ignore this section if this PR is not skipping CI.
 -->

From 1873930d24aaa3bcb9e81df12141a2b0c1265385 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 21:58:04 +0100
Subject: [PATCH 0536/2561] glib: update to 2.72.0.

---
 .../glib/patches/disable-broken-tests.patch   | 54 ++++++------
 srcpkgs/glib/patches/fix-formatd.patch        | 86 -------------------
 srcpkgs/glib/template                         |  6 +-
 3 files changed, 29 insertions(+), 117 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index c6bb8d96fadf..2a5263007503 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
+@@ -56,7 +56,6 @@ gio_tests = {
+     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
+     'should_fail' : host_system == 'darwin',
+   },
 -  'converter-stream' : {},
    'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+@@ -91,7 +90,6 @@ gio_tests = {
    'network-monitor' : {},
    'network-monitor-race' : {},
    'permission' : {},
@@ -16,15 +16,15 @@
    'power-profile-monitor' : {},
    'proxy-test' : {},
    'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
+@@ -174,7 +172,6 @@ endif
  #  Test programs buildable on UNIX only
  if host_machine.system() != 'windows'
    gio_tests += {
 -    'file' : {},
      'gdbus-peer' : {
        'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+       'install_rpath' : installed_tests_execdir,
+@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
        test_resources_binary2,
      ]
    endif
@@ -32,6 +32,8 @@
 -  gio_tests += {
 -    'resources' : {
 -      'extra_sources' : resources_extra_sources,
+-      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+-      'should_fail' : host_system == 'darwin',
 -    },
 -  }
  endif
@@ -39,29 +41,33 @@
  foreach test_name, extra_args : gio_tests
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,25 +11,17 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
+   'completion' : {},
    'cond' : {},
 -  'convert' : {},
    'cxx' : {
      'source' : ['cxx.cpp'],
    },
    'dataset' : {},
--  'date' : {},
+-  'date' : {
+-    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+-    'should_fail' : host_system == 'darwin',
+-  },
    'dir' : {},
-   'environment' : {},
+   'environment' : {
+     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+     'should_fail' : host_system == 'darwin',
+   },
 -  'error' : {},
-   'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
+-  'fileutils' : {},
+   'gdatetime' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+   },
+@@ -65,7 +57,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -69,11 +75,3 @@
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
-   'thread' : {},
-   'thread-pool' : {},
-   'timeout' : {},
--  'timer' : {},
-   'tree' : {},
-   'utf8-performance' : {},
-   'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
- 
- const guint16 * const g_ascii_table = ascii_table_data;
- 
--#if defined (HAVE_NEWLOCALE) && \
--    defined (HAVE_USELOCALE) && \
--    defined (HAVE_STRTOD_L) && \
--    defined (HAVE_STRTOULL_L) && \
--    defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+    defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
- 
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
-                 gchar      **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
- 
-   g_return_val_if_fail (nptr != NULL, 0);
- 
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
- #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
- 
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
- 
- static guint64
- g_parse_long_long (const gchar  *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
-     }
-   return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
- 
- /**
-  * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
-                   gchar      **endptr,
-                   guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
-   return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
-                  gchar      **endptr,
-                  guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
-   return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
--- 
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..d301dadb8990 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.2
+version=2.72.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -15,9 +15,9 @@ 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/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 9f1ee5def4372c7c1388054d7076d64c53bd13b5 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Thu, 3 Mar 2022 10:48:23 +0700
Subject: [PATCH 0537/2561] New package: upterm-0.7.6

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

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
new file mode 100644
index 000000000000..362f919c40ef
--- /dev/null
+++ b/srcpkgs/upterm/template
@@ -0,0 +1,21 @@
+# Template file for 'upterm'
+pkgname=upterm
+version=0.7.6
+revision=1
+build_style=go
+go_import_path="github.com/owenthereal/upterm"
+go_package="${go_import_path}/cmd/upterm"
+short_desc="Secure Terminal Sharing"
+maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
+license="Apache-2.0"
+homepage="https://github.com/owenthereal/upterm/"
+distfiles="https://github.com/owenthereal/upterm/archive/refs/tags/v$version.tar.gz"
+checksum=26ceb5eee035d4e1a08240aced75a20f2e54b1e192eef0bf5eb51d0195997f8c
+
+post_install() {
+	vcompletion etc/completion/upterm.zsh_completion zsh
+	vcompletion etc/completion/upterm.bash_completion.sh bash
+	for man in etc/man/man1/*.1; do
+		vman "${man}"
+	done
+}

From c7771ed62bb28849ea546867e348e747b4e93501 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Mar 2022 19:00:12 +0100
Subject: [PATCH 0538/2561] brasero: update to 3.12.3.

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

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index 9083a2ccb689..da86c9a66699 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
-version=3.12.2
-revision=6
+version=3.12.3
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -13,9 +13,10 @@ depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-
 short_desc="Application to burn CD/DVD for the Gnome Desktop"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/projects/brasero"
+homepage="https://wiki.gnome.org/Apps/Brasero"
+changelog="https://gitlab.gnome.org/GNOME/brasero/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
+checksum=87749eae33a141207d1b00be233b6d8045982ed3249ed4b98dae1f3a975fea15
 
 # Package build options
 build_options="gir"

From 539d964d8922993e5294b12f04f7ebec99c3ce3f Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sat, 26 Mar 2022 00:58:53 +0100
Subject: [PATCH 0539/2561] gitea: update to 1.16.5

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

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index f9eaa1b18732..c8b9b361ce2d 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.16.4
+version=1.16.5
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -30,9 +30,9 @@ short_desc="Git with a cup of Tea"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://gitea.io"
-changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
-distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=ef396b797d39a64867dfcd4532043c363dce3fe054afaa37bb97f8a2ea3f2a18
+changelog="https://raw.githubusercontent.com/go-gitea/gitea/main/CHANGELOG.md"
+distfiles="https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"
+checksum=d9aab2e8357ca1a22eaffb328356e4e355a8f851a4de6fb4e7eb54ca80f0187b
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From 01299f7549ff8adbceea65388954c26baebbb5c8 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 22 Mar 2022 11:44:40 -0400
Subject: [PATCH 0540/2561] helvum: clean up patch/template

upstream released pipewire-rs v0.5.0 that fixes the underlying issue,
but the Cargo.toml version requirement didn't allow it to be updated.
---
 srcpkgs/helvum/patches/i686-pipewire.patch | 33 +++++++---------------
 srcpkgs/helvum/template                    | 23 ++-------------
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
index 17f0f17f8875..bd08b0e217b3 100644
--- a/srcpkgs/helvum/patches/i686-pipewire.patch
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -1,24 +1,11 @@
-From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
-From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
-Date: Thu, 11 Nov 2021 11:41:09 +0000
-Subject: A possible fix for issue #27
-
----
- pipewire/src/loop_.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/helvum-0.3.4/pipewire/src/loop_.rs b/helvum-0.3.4/pipewire/src/loop_.rs
-index 3e0d9bd..353025f 100644
---- a/helvum-0.3.4/pipewire/src/loop_.rs
-+++ b/helvum-0.3.4/pipewire/src/loop_.rs
-@@ -411,7 +411,7 @@ where
-         fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
-             spa_sys::timespec {
-                 tv_sec: duration.as_secs().try_into().expect("Duration too long"),
--                tv_nsec: duration.subsec_nanos().into(),
-+                tv_nsec: duration.subsec_nanos().try_into().unwrap(),
-             }
-         }
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -14,7 +14,7 @@
+ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+ 
+ [dependencies]
+-pipewire = "0.4"
++pipewire = "0.5"
+ gtk = { version = "0.4.1", package = "gtk4" }
+ glib = { version = "0.15.1", features = ["log"] }
  
--- 
-
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 49ad2dd6013a..5a694dc43c29 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -1,12 +1,8 @@
 # Template file for 'helvum'
 pkgname=helvum
 version=0.3.4
-revision=1
-create_wrksrc=yes
-build_wrksrc="${pkgname}-${version}"
-_pipewire_rs_version=0.4.1
+revision=2
 build_style=cargo
-build_helper=rust
 hostmakedepends="pkg-config clang libclang"
 makedepends="gtk4-devel pipewire-devel glib-devel"
 depends="pipewire"
@@ -14,21 +10,8 @@ short_desc="GTK patchbay for pipewire"
 maintainer="classabbyamp <dev@kb6.ee>"
 license="GPL-3.0-only"
 homepage="https://gitlab.freedesktop.org/pipewire/helvum"
-distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz
- https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/archive/v${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
-checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
- 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
-
-# XXX: this should not be necessary once the next version of the pipewire crate has been released
-post_extract() {
-	pushd $build_wrksrc
-	echo "[patch.crates-io]" >> Cargo.toml
-	for crate in pipewire pipewire-sys libspa libspa-sys; do
-		mv ../pipewire-rs-*/$crate $crate
-		echo "$crate = { path = './$crate' }" >> Cargo.toml
-	done
-	popd
-}
+distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02"
 
 post_install() {
 	# Normally, meson would do this, but it's simpler to use the cargo build style and do this manually

From 3b75ee1aba87d9bfc0b5961a832cf74a58beb1ca Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 26 Mar 2022 14:28:28 -0400
Subject: [PATCH 0541/2561] pijul: remove unnecessary build_helper

---
 srcpkgs/pijul/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 581d77789c9c..53fb1c83ebe5 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -3,7 +3,6 @@ pkgname=pijul
 version=0.12.2
 revision=5
 build_style=cargo
-build_helper=rust
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
 makedepends="libsodium-devel openssl-devel nettle-devel"

From a85dda2b3ea474155b9fcdcfb573b4abcc6a8054 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 26 Mar 2022 14:29:26 -0400
Subject: [PATCH 0542/2561] rdedup: remove unnecessary build_helper

---
 srcpkgs/rdedup/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 6bd71cacfc46..0e67d278ca06 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -3,7 +3,6 @@ pkgname=rdedup
 version=3.2.1
 revision=1
 build_style=cargo
-build_helper=rust
 hostmakedepends="pkg-config clang"
 makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"

From 20908c2bc94515ffb23b4d58a15cbd40f42fa851 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sat, 19 Mar 2022 18:33:15 +0700
Subject: [PATCH 0543/2561] New package: v2ray-4.44.0

---
 srcpkgs/v2ray/files/v2ray/run                 |  3 ++
 ...equest-API-changed-since-go1.17-1370.patch | 47 +++++++++++++++++
 srcpkgs/v2ray/template                        | 52 +++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..3b1ac46ab240
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch b/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch
new file mode 100644
index 000000000000..2a35b075f0a0
--- /dev/null
+++ b/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch
@@ -0,0 +1,47 @@
+From 77b88171d6bd837b76a5ad6e6b23689391530ed6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E6=9C=B1=E8=81=96=E9=BB=8E=20=28Zhu=20Sheng=20Li=29?=
+ <digglife@gmail.com>
+Date: Sat, 6 Nov 2021 22:09:26 +0800
+Subject: [PATCH] fix: readRequest API changed since go1.17 (#1370)
+
+fixed: #1265
+---
+ transport/internet/headers/http/http.go              | 4 ++--
+ transport/internet/headers/http/linkedreadRequest.go | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/transport/internet/headers/http/http.go b/transport/internet/headers/http/http.go
+index c73f7a63..54611889 100644
+--- a/transport/internet/headers/http/http.go
++++ b/transport/internet/headers/http/http.go
+@@ -90,7 +90,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) {
+ 			buffer.Clear()
+ 			copy(buffer.Extend(lenEnding), leftover)
+ 
+-			if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != io.ErrUnexpectedEOF {
++			if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != io.ErrUnexpectedEOF {
+ 				return nil, err
+ 			}
+ 		}
+@@ -110,7 +110,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) {
+ 	}
+ 
+ 	// Parse the request
+-	if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != nil {
++	if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != nil {
+ 		return nil, err
+ 	} else { // nolint: golint
+ 		h.req = req
+diff --git a/transport/internet/headers/http/linkedreadRequest.go b/transport/internet/headers/http/linkedreadRequest.go
+index 35154b87..45773312 100644
+--- a/transport/internet/headers/http/linkedreadRequest.go
++++ b/transport/internet/headers/http/linkedreadRequest.go
+@@ -9,4 +9,4 @@ import (
+ )
+ 
+ //go:linkname readRequest net/http.readRequest
+-func readRequest(b *bufio.Reader, deleteHostHeader bool) (req *http.Request, err error)
++func readRequest(b *bufio.Reader) (req *http.Request, err error)
+-- 
+2.33.1
+
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..cf6cd28a534a
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,52 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.44.0
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-X github.com/v2fly/v2ray-core/v4.codename=$pkgname -X github.com/v2fly/v2ray-core/v4.version=$version -X github.com/v2fly/v2ray-core/v4.build=$SOURCE_DATE_EPOCH -s -w -buildid="
+short_desc="Platform for building proxies to bypass network restrictions"
+maintainer="ipkalm <ipkalm@outlook.com>"
+license="MIT"
+homepage="https://github.com/v2fly/v2ray-core"
+distfiles="https://github.com/v2fly/v2ray-core/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=d9973bafd3020f60a51fa3495b24ab417b08b3c8f9539a3748d00da6c68d0103
+conf_files="/etc/v2ray/config.json"
+
+system_accounts="_v2ray"
+
+export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+export CGO_ENABLED=0
+
+do_build() {
+	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
+	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ctl" -tags "confonly" ./infra/control/main
+}
+
+do_check() {
+	local pkgs=$(go list ./... | grep -v \
+		-e 'app/dns$' \
+		-e 'app/stats$' \
+		-e 'app/router$' \
+		-e 'app/router/command$' \
+		-e 'common/task$' \
+		-e 'common/signal$' \
+		-e 'testing/scenarios$' \
+		-e 'proxy/vmess$' \
+		-e 'transport/pipe$' \
+		-e 'transport/internet/websocket$' \
+		-e 'transport/internet/quic$' \
+		-e 'v4/infra/conf/rule$' \
+		-e 'v4/infra/conf/geodata/memconservative$' \
+		-e 'v4/transport/internet/kcp$' \
+		)
+	go test $pkgs
+}
+
+post_install() {
+	vlicense LICENSE
+	vmkdir etc/v2ray
+	vcopy release/config/*.json etc/v2ray/
+	vsv v2ray
+}

From 00d9d5adc7ecbf1a8de1fdd16bfdce8fb44de08c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 20:54:02 +0100
Subject: [PATCH 0544/2561] nq: update to 0.5.

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

diff --git a/srcpkgs/nq/template b/srcpkgs/nq/template
index 67e1d96222a6..7dcc1c03af98 100644
--- a/srcpkgs/nq/template
+++ b/srcpkgs/nq/template
@@ -1,6 +1,6 @@
 # Template file for 'nq'
 pkgname=nq
-version=0.4
+version=0.5
 revision=1
 build_style=gnu-makefile
 short_desc="Unix command line queue utility"
@@ -8,4 +8,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/leahneukirchen/nq"
 distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
-checksum=287d6700063b64cfa9db51df95e2a046736eb38c0d3b6e0af0a8e7da6df8880b
+checksum=3f01aaf0b8eee4f5080ed1cd71887cb6485d366257d4cf5470878da2b734b030

From 0fd79e6fb17c82f5c6c9a8dc36bd8f6c64b2b566 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 20:58:32 +0100
Subject: [PATCH 0545/2561] ii: update to 1.9.

Adopted.
---
 srcpkgs/ii/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ii/template b/srcpkgs/ii/template
index 13a7ef62682e..5ef7a1d6b9e7 100644
--- a/srcpkgs/ii/template
+++ b/srcpkgs/ii/template
@@ -1,20 +1,21 @@
 # Template file for 'ii'
 pkgname=ii
-version=1.8
-revision=4
+version=1.9
+revision=1
 build_style=gnu-makefile
 make_build_args="INCLUDES=-I. LIBS="
 short_desc="Minimalist FIFO IRC client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
-distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
-checksum=b9d9e1eae25e63071960e921af8b217ab1abe64210bd290994aca178a8dc68d2
+homepage="https://tools.suckless.org/ii"
+distfiles="https://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
+checksum=850cb323b583d261b51bda9993ee733334352a8e6ca1e2f02b57c154bf568c17
 
 pre_build() {
 	sed -i 's| -O0||g' config.mk
 	sed -i 's|^CFLAGS *=|override CFLAGS +=|g' config.mk
 	sed -i 's|^LDFLAGS *=|override LDFLAGS +=|g' config.mk
+	sed -i 's|^LIBS *=|override LIBS +=|g' config.mk
 }
 
 post_install() {

From 1cd3de4f8d7c6c9c24f7be8c4ae3d05aa9ddef0a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 26 Mar 2022 22:02:47 +0100
Subject: [PATCH 0546/2561] chromium: update to 99.0.4844.84.

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

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 2708747046d7..f6154e223751 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=99.0.4844.51
+version=99.0.4844.84
 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="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=97c52e57eca0dc8b752d274047f38c88aaa86036c0587b26b056efbd3fb2bae3
+checksum=20ec184ed34bdc7e660ccf6c007b2db37007de423b3a5a51698a96aa29527515
 
 lib32disabled=yes
 

From a46c2f90b79167a0b0762e73d55bcc4bc7432c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 5 Oct 2021 23:05:33 +0200
Subject: [PATCH 0547/2561] New package: bees-0.7

---
 .../0001-don-t-run-tests-unless-asked.patch   | 44 +++++++++++++++
 .../patches/0002-move-sbin-into-bin.patch     | 37 +++++++++++++
 ...0003-start-work-on-cross-compilation.patch | 54 +++++++++++++++++++
 srcpkgs/bees/patches/series                   |  2 +
 srcpkgs/bees/template                         | 28 ++++++++++
 5 files changed, 165 insertions(+)
 create mode 100644 srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
 create mode 100644 srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
 create mode 100644 srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
 create mode 100644 srcpkgs/bees/patches/series
 create mode 100644 srcpkgs/bees/template

diff --git a/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
new file mode 100644
index 000000000000..4b1431b45873
--- /dev/null
+++ b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
@@ -0,0 +1,44 @@
+From e139a679d7cc3f04ad001054a6b1815b7afc92e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:04:15 +0200
+Subject: [PATCH 1/3] don't run tests unless asked
+
+---
+ Makefile | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9c840c4..d4c241e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,16 +14,12 @@ BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN)
+ 
+ DEFAULT_MAKE_TARGET ?= reallyall
+ 
+-ifeq ($(DEFAULT_MAKE_TARGET),reallyall)
+-	RUN_INSTALL_TESTS = test
+-endif
+-
+ include Defines.mk
+ 
+ default: $(DEFAULT_MAKE_TARGET)
+ 
+ all: lib src scripts
+-reallyall: all doc test
++reallyall: all doc
+ 
+ clean: ## Cleanup
+ 	git clean -dfx -e localconf
+@@ -55,7 +51,7 @@ install_tools: src
+ 	install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
+ 
+ install_bees: ## Install bees + libs
+-install_bees: src $(RUN_INSTALL_TESTS)
++install_bees: src
+ 	install -Dm755 bin/bees	$(DESTDIR)$(LIBEXEC_PREFIX)/bees
+ 
+ install_scripts: ## Install scipts
+-- 
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
new file mode 100644
index 000000000000..3d3b7fe22291
--- /dev/null
+++ b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
@@ -0,0 +1,37 @@
+From fc133aa8647fe34a41c70bd5915c7f7f655d3160 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:05:15 +0200
+Subject: [PATCH 2/3] move sbin/* into bin/*
+
+Void does not distinguis between bin and sbin, but this patch will
+likely not be upstreamable.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d4c241e..2694e78 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@ scripts: scripts/beesd scripts/beesd@.service
+ install_tools: ## Install support tools + libs
+ install_tools: src
+ 	install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
+-	install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
++	install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/bin/fiewalk
+ 
+ install_bees: ## Install bees + libs
+ install_bees: src
+@@ -56,7 +56,7 @@ install_bees: src
+ 
+ install_scripts: ## Install scipts
+ install_scripts: scripts
+-	install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd
++	install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd
+ 	install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample
+ ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),)
+ 	install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service
+-- 
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
new file mode 100644
index 000000000000..30f758460754
--- /dev/null
+++ b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
@@ -0,0 +1,54 @@
+From be64a6e50987dba582d8704d62cb1f9a3577645d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:06:54 +0200
+Subject: [PATCH 3/3] start work on cross compilation
+
+The tests have to be run on the host, so these shouldn't be cross
+compiled. This patch is not done yet, but it's included here anyway, so
+that whoever wants to continue on it doesn't have to start from scratch.
+---
+ makeflags     | 3 +++
+ test/Makefile | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/makeflags b/makeflags
+index c5b6951..29e0430 100644
+--- a/makeflags
++++ b/makeflags
+@@ -11,3 +11,6 @@ CCFLAGS += -I../include -D_FILE_OFFSET_BITS=64
+ 
+ BEES_CFLAGS   = $(CCFLAGS) -std=c99 $(CFLAGS)
+ BEES_CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast $(CXXFLAGS)
++
++BEES_CFLAGS_FOR_BUILD   = $(CCFLAGS_FOR_BUILD) -std=c99 $(CFLAGS_FOR_BUILD)
++BEES_CXXFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c++11 -Wold-style-cast $(CXXFLAGS_FOR_BUILD)
+diff --git a/test/Makefile b/test/Makefile
+index ae66a7c..3c70244 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -24,7 +24,7 @@ BEES_LDFLAGS = -L../lib $(LDFLAGS)
+ 	mkdir -p $@
+ 
+ .depends/%.dep: %.cc tests.h Makefile | .depends
+-	$(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
++	$(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) -M -MF $@ -MT $(<:.cc=.o) $<
+ 
+ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ 	cat $^ > $@.new
+@@ -33,10 +33,10 @@ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ include depends.mk
+ 
+ $(PROGRAMS:%=%.o): %.o: %.cc ../makeflags Makefile
+-	$(CXX) $(BEES_CXXFLAGS) -o $@ -c $<
++	$(CXX_FOR_BUILD) $(BEES_CXXFLAG_FOR_BUILDS) -o $@ -c $<
+ 
+ $(PROGRAMS): %: %.o ../makeflags Makefile ../lib/libcrucible.a
+-	$(CXX) $(BEES_CXXFLAGS) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
++	$(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
+ 
+ %.txt: % Makefile FORCE
+ 	./$< >$@ 2>&1 || (RC=$$?; cat $@; exit $$RC)
+-- 
+2.35.1
+
diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series
new file mode 100644
index 000000000000..d9a2837128f2
--- /dev/null
+++ b/srcpkgs/bees/patches/series
@@ -0,0 +1,2 @@
+0001-don-t-run-tests-unless-asked.patch
+0002-move-sbin-into-bin.patch
diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
new file mode 100644
index 000000000000..c9184f593e87
--- /dev/null
+++ b/srcpkgs/bees/template
@@ -0,0 +1,28 @@
+# Template file for 'bees'
+pkgname=bees
+version=0.7
+revision=1
+archs="~*-musl"
+build_style=gnu-makefile
+make_check_target="test"
+hostmakedepends="pkg-config"
+depends="btrfs-progs"
+short_desc="Best-Effort Extent-Same, a btrfs deduplication agent"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Zygo/bees"
+distfiles="https://github.com/Zygo/bees/archive/refs/tags/v${version}.tar.gz"
+checksum=2e67422b9f0d9ef665523b474fb27055efffceb263f8ccfdfda2a3aac9c6bdb1
+
+if [ "$CROSS_BUILD" ]; then
+# Tests don't work properly with cross compilation, because it doesn't
+# differentiate between host and target compilers correctly.
+#
+# There is a patch included which starts working on this, but I couldn't get it
+# to work properly, so it's not being applied right now.
+	make_check="no"
+fi
+
+pre_build() {
+	export BEES_VERSION="${version}"
+}

From b81deff4a68b0297a51a6177e4ca1d29ab108a3e Mon Sep 17 00:00:00 2001
From: KushBlazingJudah <59340248+KushBlazingJudah@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:34:01 -0300
Subject: [PATCH 0548/2561] wob: update to 0.13.

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

diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..6b68df4a5eff 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.13
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=555965ba2b4e5fa67c8342e42f7ccd5eea7c9aeb762684e2ea52ccff40cc7f56
 
 post_install() {
 	vlicense LICENSE

From 03b8c65a45bc1dd5c88d895b9d7a5126cef5def0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 22 Mar 2022 22:53:24 +0100
Subject: [PATCH 0549/2561] newsboat: update to 2.27.

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

diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index 39c8eac9a7e0..09f30180a19c 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -1,6 +1,6 @@
 # Template file for 'newsboat'
 pkgname=newsboat
-version=2.26
+version=2.27
 revision=1
 build_style=configure
 build_helper="rust"
@@ -17,7 +17,7 @@ license="MIT"
 homepage="https://newsboat.org/"
 changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
 distfiles="https://newsboat.org/releases/${version}/newsboat-${version}.tar.xz"
-checksum=34a4834e00f06c0151c700d6af065f5b8776872227d9d4484d247ae7a4413c18
+checksum=fd5a40096689d4fc0f18441319197769fa377709821b1a3f1b2ba1f006625285
 
 # tests fail when run by superuser
 # they always fail on musl, see https://github.com/newsboat/newsboat/issues/1216

From a3c372befbe6caabfff5c2abd488ab03556311b8 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Sat, 26 Mar 2022 11:09:59 +0700
Subject: [PATCH 0550/2561] SweetHome3D: update to 6.6

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

diff --git a/srcpkgs/SweetHome3D/template b/srcpkgs/SweetHome3D/template
index 344aa9e903e6..169fe188e518 100644
--- a/srcpkgs/SweetHome3D/template
+++ b/srcpkgs/SweetHome3D/template
@@ -1,6 +1,6 @@
 # Template file for 'SweetHome3D'
 pkgname=SweetHome3D
-version=6.5.2
+version=6.6
 revision=1
 archs="i686 x86_64"
 wrksrc="SweetHome3D-${version}-src"
@@ -12,7 +12,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="www.sweethome3d.com"
 distfiles="${SOURCEFORGE_SITE}/sweethome3d/SweetHome3D-${version}-src.zip"
-checksum=e3323f078e49c72e575e2e771f1586a7c18475b42ea32982abb27756b7a81dc8
+checksum=0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b
 
 do_build() {
 	ant application textures furniture examples help java3dLibraries

From 44f9d8bc40e4a16f83342df722762a704da50a14 Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Fri, 25 Mar 2022 21:49:59 +0100
Subject: [PATCH 0551/2561] kirc: update to 0.3.1.

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

diff --git a/srcpkgs/kirc/template b/srcpkgs/kirc/template
index fd25076500db..e49f4b1f2531 100644
--- a/srcpkgs/kirc/template
+++ b/srcpkgs/kirc/template
@@ -1,6 +1,6 @@
 # Template file for 'kirc'
 pkgname=kirc
-version=0.3.0
+version=0.3.1
 revision=1
 build_style=gnu-makefile
 short_desc="Tiny IRC client written in POSIX C99"
@@ -8,7 +8,7 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
 license="MIT"
 homepage="http://kirc.io"
 distfiles="https://github.com/mcpcpc/${pkgname}/archive/refs/tags/${version}.tar.gz"
-checksum=1b35c77f46466106b0fde52c0933866ccf5fd7c97569465297dcae018c4b4a16
+checksum=19bb058a9845eb5b2febe6e8d658dcd06c194b58669f37837dbdf37627c7d7dd
 
 post_install() {
 	vlicense LICENSE

From d6fb0aa7820af11ed390cbe129cf4757bfecd7e3 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Mon, 25 May 2020 03:17:12 -0700
Subject: [PATCH 0552/2561] New package: netris-0.1.8

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

diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
new file mode 100644
index 000000000000..0eb9abeb5b52
--- /dev/null
+++ b/srcpkgs/netris/template
@@ -0,0 +1,13 @@
+# Template file for 'netris'
+pkgname=netris
+version=0.1.8
+revision=1
+wrksrc=$pkgname-v$version
+build_style=go
+go_import_path=gitlab.com/tslocum/netris/cmd/netris
+short_desc="Multiplayer Tetris clone"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/tslocum/netris"
+distfiles="https://gitlab.com/tslocum/netris/-/archive/v${version}/netris-v${version}.tar.gz"
+checksum=3638d7bfce544fde9ab1dd15376586e12513187f7c3b51baf223846cce60a33e

From 8c949b8cbda899a2691b8d4c79b80ee050776b02 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Fri, 25 Mar 2022 11:47:50 +1000
Subject: [PATCH 0553/2561] kops: update to 1.23.0

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

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index d044b28cad1a..4ba82a05a2a3 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,6 +1,6 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.22.2
+version=1.23.0
 revision=1
 archs="x86_64*"
 build_wrksrc=src/k8s.io/kops

From 6d48a1b5c38d201f0d8abb9d0c0cc827971b228b Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Wed, 23 Mar 2022 17:56:44 -0500
Subject: [PATCH 0554/2561] Signal-Desktop: update to 5.36.0.

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

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 038af9b6e175..55591ea4c82f 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.35.0
+version=5.36.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=12d4766356d50f4eaff907a738860be91bf4c012fd2db62d00757078923dca67
+checksum=de158a8f4b19e3f8b849abf07fbb3d1b2207a3a08fde31aac328635e66a8a956
 nostrip_files="signal-desktop"
 
 post_extract() {

From db62846d01a4d813e700a46ecaef7158e452c45b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 21 Mar 2022 10:56:40 +0100
Subject: [PATCH 0555/2561] dbeaver: update to 22.0.1.

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

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index d20837b230c8..276af8802424 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=22.0.0
+version=22.0.1
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -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=c4e995ce3c46723f071faefe8dc68df54f001c634e757a9bf89c594fe3a55613
+checksum=2258f77b6e68fc0784dd7d92fc1297695b57e6ca22e3d454f21f328bf61e2bf0
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

From 55493c300314a815c2dd2c4b400d0708058e36ca Mon Sep 17 00:00:00 2001
From: Kyle Nusbaum <KyleJNusbaum@gmail.com>
Date: Sat, 19 Mar 2022 01:51:59 -0500
Subject: [PATCH 0556/2561] apache-kafka: update to 3.1.0.

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

diff --git a/srcpkgs/apache-kafka/template b/srcpkgs/apache-kafka/template
index 0e75af73152e..453b09923566 100644
--- a/srcpkgs/apache-kafka/template
+++ b/srcpkgs/apache-kafka/template
@@ -1,6 +1,6 @@
 # Template file for 'apache-kafka'
 pkgname=apache-kafka
-version=3.0.0
+version=3.1.0
 revision=1
 wrksrc="kafka-${version}-src"
 hostmakedepends="curl which tar openjdk8"
@@ -10,7 +10,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://kafka.apache.org"
 distfiles="https://dlcdn.apache.org/kafka/${version}/kafka-${version}-src.tgz"
-checksum=66a9efddcc2ce88984941020db012178efd51eb47c359c7fd1bab791416e39cd
+checksum=75265c6b103b73fa9c8a9897963bee6587f968309ec827ad795e48dea1a61aaf
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 2660110cf2dac08c3b01b6f6938310d2187d246d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Fri, 18 Mar 2022 11:59:16 +0100
Subject: [PATCH 0557/2561] zoom: update to 5.9.6.2225.

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

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 3ec023975ed8..aa16c7503ed4 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.9.3.1911
+version=5.9.6.2225
 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=6cbb3d72b6d84c2527e75b577959af5ea1992111fdaf37c56fd1fcc8725fcc87
+checksum=1e43ae0e43168586f5dd05ace1e646afe1455825b62b760e2dab0a3564da35e3
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 755b2c1fdd4fec0af90b281dd57ef7eb59d19d31 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 27 Mar 2022 11:08:07 -0400
Subject: [PATCH 0558/2561] libnma: update to 1.8.36.

---
 common/shlibs           | 1 +
 srcpkgs/libnma/template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7d323593a120..bba46e1678dc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.36_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c0a9791e5736..148ae51d6de9 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,12 +1,12 @@
 # Template file for 'libnma'
 pkgname=libnma
-version=1.8.34
+version=1.8.36
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dlibnma_gtk4=false"
+configure_args="-Dlibnma_gtk4=true"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
-makedepends="gcr-devel gtk+3-devel iso-codes
+makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes
  mobile-broadband-provider-info NetworkManager-devel"
 depends="NetworkManager iso-codes"
 short_desc="NetworkManager panel applet for GNOME - runtime library"
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libnma"
 changelog="https://gitlab.gnome.org/GNOME/libnma/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f5e2e738e0fca7f2a549079290b2d8017511d485a83220c36df380a3b4753304
+checksum=d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a
 replaces="libnm-gtk>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 150ba6617b2eca733bf0caeab8cec0d9af3e9fe0 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 27 Mar 2022 05:42:05 -0400
Subject: [PATCH 0559/2561] font-iosevka: update to 15.1.0.

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

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 4f1c061d5764..e293af01166b 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=15.0.3
+version=15.1.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- 7c6a4d8e003cab1a46f86fdf43f8c49e4b9d6ce932961572476266ad9f351608
- 629dd3cf957f7ef255e7dccc3286c5a3b54c0a6a7cde8b93b3a7fdc9dffc4cbd"
+ 4bb10d12681546fa129f9105706d6f55c346b75418a19793fb300f0bd4e5991d
+ e05995a4b66592d5868b7e667bba8a5f1822499fc53c6cd7a8abf3e40f8b8895"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 7e8eeb5f1d3e3cfb2603d762206518a945705658 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Sun, 27 Mar 2022 18:24:31 +0700
Subject: [PATCH 0560/2561] vivaldi: update to 5.1.2567.73

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index d36738824694..9108f67a4d29 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.1.2567.66
+version=5.1.2567.73
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=e2631cfabdd2d916fd8ab05004afd86efeec4e47d50a86b8be4cd3b59f6430ed
+checksum=efc4a4d39724840cbcc78317ef1a0e5e300cb8b9d655defee8e746626f845f12
 repository=nonfree
 restricted=yes
 nostrip=yes

From 7457a8682a020d3249426a51dabbc4b5c8d261ea Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 12:45:16 +0100
Subject: [PATCH 0561/2561] freerdp: update to 2.6.1.

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

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index c4796b8c73c0..da6703547a83 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=b9eb850f27bed4362b9a1017d37f6e271f43428948f995e7815e039306cb6ddd
+checksum=2ff86a839c1cf678a24d9bf435c83745aafbd5f0d19b637b733e306acede96e3
 CFLAGS="-Wno-dev"
 
 case "$XBPS_TARGET_MACHINE" in

From 6b3156f047dd61b93fd8a908d860cfaad501b6c5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 27 Mar 2022 17:42:39 +0200
Subject: [PATCH 0562/2561] dxa: update to 0.1.5.

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

diff --git a/srcpkgs/dxa/template b/srcpkgs/dxa/template
index 4d4e05f1c450..9eeb0175f96a 100644
--- a/srcpkgs/dxa/template
+++ b/srcpkgs/dxa/template
@@ -1,14 +1,16 @@
 # Template file for 'dxa'
 pkgname=dxa
-version=0.1.4
+version=0.1.5
 revision=1
 build_style=gnu-makefile
+make_check_target="test"
+checkdepends="xa"
 short_desc="6502/R65C02 disassembler"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.floodgap.com/retrotech/xa/#dxa"
 distfiles="https://www.floodgap.com/retrotech/xa/dists/dxa-${version}.tar.gz"
-checksum=0b4ae0c0ae75223f446429bd19e8959d6224124b1ed1deb4a24f06f619b66b95
+checksum=8e40ed77816581f9ad95acac2ed69a2fb2ac7850e433d19cd684193a45826799
 
 do_install() {
 	vbin dxa

From 7393de55159c2dfd152d093604faa99310a178b7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 27 Mar 2022 17:43:28 +0200
Subject: [PATCH 0563/2561] xa: update to 2.3.13.

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

diff --git a/srcpkgs/xa/template b/srcpkgs/xa/template
index 913275ab347a..b6df10d76645 100644
--- a/srcpkgs/xa/template
+++ b/srcpkgs/xa/template
@@ -1,6 +1,6 @@
 # Template file for 'xa'
 pkgname=xa
-version=2.3.12
+version=2.3.13
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.floodgap.com/retrotech/xa/"
 distfiles="https://www.floodgap.com/retrotech/xa/dists/xa-${version}.tar.gz"
-checksum=f8fd1536012d676fc6cbfcdd6a91793e564c89b6ef747f8db8f467c178fb0704
+checksum=a9477af150b6c8a91cd3d41e1cf8c9df552d383326495576830271ca4467bd86
 
 post_extract() {
 	vsed -i 's/${LD}/${CC}/' src/Makefile

From 1e25d67496678a054080c714fd7a0ba6bacac921 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 27 Mar 2022 20:25:40 +0200
Subject: [PATCH 0564/2561] monit: update to 5.32.0.

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

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 3616fa0ee29b..b10596c639d6 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.31.0
+version=5.32.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=eae71f28941fb663eec74c1a59b69546c659529796550bd9c0c544e9b52ac055
+checksum=1077052d4c4e848ac47d14f9b37754d46419aecbe8c9a07e1f869c914faf3216
 
 pre_configure() {
 	./bootstrap

From c14fdc7a442e5866c1e2d4715d49036150b15a01 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Mon, 7 Mar 2022 21:29:14 +1000
Subject: [PATCH 0565/2561] kubernetes-helm: update to 3.8.1

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

diff --git a/srcpkgs/kubernetes-helm/template b/srcpkgs/kubernetes-helm/template
index 18c05630ce41..8e7eab5eea58 100644
--- a/srcpkgs/kubernetes-helm/template
+++ b/srcpkgs/kubernetes-helm/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes-helm'
 pkgname=kubernetes-helm
-version=3.7.2
+version=3.8.1
 revision=1
 wrksrc="helm-${version}"
 hostmakedepends="go make git mercurial tar"
@@ -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=d04175807c2948261517b58120a0810ec20b92c0058acb040e973d0b9de7b08d
+checksum=fed90e57113a6b6e50db03ee711358b04733bc2a50797e1b103a300b1f8a4b16
 conflicts="helm"
 nopie=true
 

From 74c61a7334ea0711a29a0498464d1b787835f555 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 28 Feb 2022 09:42:47 +0000
Subject: [PATCH 0566/2561] libuv: update to 1.43.0.

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

diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template
index 76a36863f4b9..2575d92da2ad 100644
--- a/srcpkgs/libuv/template
+++ b/srcpkgs/libuv/template
@@ -1,6 +1,6 @@
 # Template file for 'libuv'
 pkgname=libuv
-version=1.41.0
+version=1.43.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,7 @@ 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=6cfeb5f4bab271462b4a2cc77d4ecec847fdbdc26b72019c27ae21509e6f94fa
+checksum=9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d
 # the tests fail when run as root and as such break in the CI containers
 make_check="extended"
 

From afd2e9796211b688cde9620048182729d3fcc4ae Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 22 Feb 2022 12:51:36 -0500
Subject: [PATCH 0567/2561] micro: adopt.

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

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..4848d9338e90 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -9,7 +9,7 @@ go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
 short_desc="Modern and intuitive terminal-based text editor"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="0x5c <dev@0x5c.io>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"

From 46e4da677e57a006fcd0b2e64fd5d5b52f14aae6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 27 Mar 2022 22:27:59 +0200
Subject: [PATCH 0568/2561] janet: update to 1.21.1.

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

diff --git a/common/shlibs b/common/shlibs
index bba46e1678dc..d3c9ab101c39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3899,7 +3899,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.9 libcbor-0.9.0_1
 libfido2.so.1 libfido2-1.6.0_2
-libjanet.so.1.20 janet-1.20.0_1
+libjanet.so.1.21 janet-1.21.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 30c4dc43db48..4301ab90c751 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.21.0
+version=1.21.1
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=8e53efcdeda9b7519248bef5f0e744ad947e013b14960c66ba75967c5fb0a7fd
+checksum=8c6eeabbc0c00ac901b66763676fa4bfdac96e5b6a3def85025b45126227c4e0
 
 post_install() {
 	vlicense LICENSE

From 459461c0763ca5299d5ed3e53058d9047754d8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 24 Feb 2022 22:26:49 +0100
Subject: [PATCH 0569/2561] bfs: update to 2.5.

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

diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index c4d8b40be69b..799cd1d86bb6 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,9 +1,9 @@
 # Template file for 'bfs'
 pkgname=bfs
-version=2.3.1
+version=2.5
 revision=1
 build_style=gnu-makefile
-makedepends="acl-devel libcap-devel"
+makedepends="acl-devel libcap-devel oniguruma-devel"
 checkdepends="acl-progs libcap-progs"
 short_desc="Breadth-first version of the UNIX find command"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
@@ -11,7 +11,7 @@ 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=c3ed60001804ca79a3794935ab6b9927bd14df42dc34e475b34d62929fcc5a98
+checksum=410be5de74bfc5dece213731d3a8462310789118d299fb14f02bd9b0fdd66875
 
 post_install() {
 	vlicense LICENSE

From 07a3df4881e9ac3ebef9291c435421ac8b1fb54f Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sun, 27 Mar 2022 16:44:25 +0200
Subject: [PATCH 0570/2561] sqlite: update to 3.38.2.

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

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 0ef5405dfa66..e0be13546327 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.1
+version=3.38.2
 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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4
+checksum=e7974aa1430bad690a5e9f79a6ee5c8492ada8269dc675875ad0fb747d7cada4
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From 0a3de8f3c9776cad00ce49948001b2071810d68a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 26 Mar 2022 17:12:48 -0400
Subject: [PATCH 0571/2561] just: update to 1.1.1.

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

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 436ea6d5d455..7dc9fe4fbeb7 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.1.0
+version=1.1.1
 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/refs/tags/${version}.tar.gz"
-checksum=b0eaf3c7da507be9ad8e0ce050a10459eeead72b94d50bc3261e3dcda516b03a
+checksum=b985def8260965773422fc6c665fa37aeb7304280560dbf8f641479ba00e2da0
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 95fcb7ec42ecbb36b4dbf7b400282730b5c9a45d Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Fri, 25 Mar 2022 22:02:02 +0100
Subject: [PATCH 0572/2561] sfeed: update to 1.3.

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

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 47ca1fd14112..46b4d83e558b 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.2
+version=1.3
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -11,7 +11,7 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=7d3cdaf8dcc6582f6655330f82f8a57ca37c4b9c84ff995b09b7b7fb9fe58b58
+checksum=49d32e98a47a80a2a6cbd5d816938057d4ca3910e0a6a814b2c2a6520fbda9ba
 
 post_install() {
 	vlicense LICENSE

From 6e0292db3f766df264a829dcd2081bc45f2d0973 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 24 Mar 2022 19:38:45 +1100
Subject: [PATCH 0573/2561] MoarVM: update to 2022.03.

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

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index f437404bd76c..9386751ab79a 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2022.02
+version=2022.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=4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96
+checksum=fb71cd13912464482b99b33f0c06e9fd7c51a151c6e632a9220cf93c5855fdaf
 nocross=yes
 shlib_provides="libmoar.so"

From 96391b37baaef517e2d95de0f71003db41a912c6 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 24 Mar 2022 19:40:33 +1100
Subject: [PATCH 0574/2561] nqp: update to 2022.03.

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

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index e80e23f80ee6..52ec0153fe05 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2022.02
+version=2022.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=25d3c99745cd84f4049a9bd9cf26bb5dc817925abaafe71c9bdb68841cdb18b1
+checksum=a95e778970c4d09c091d2aa299c05036208ce4b4b0d3a7af373198c12258b306
 nocross=yes

From 24d4c7fb3f5878a0ecc32bdbc8de7261d739f06e Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 24 Mar 2022 19:42:26 +1100
Subject: [PATCH 0575/2561] rakudo: update to 2022.03.

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

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 979c33def794..6a0345b57907 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2022.02
+version=2022.03
 revision=1
 build_style=configure
 make_check_target=test
@@ -32,10 +32,10 @@ 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=6a6e9dbcc6d9a1610a34c6ec67e2d3f694d7b33e9e0a0f224543089fa7f71332
+checksum=03e215b001a879747618d6fc18eb7f89c0b812f5e543a43ed66c13439ea8a227
 nocross=yes
 provides="raku-${version}_${revision}"
 
 post_install() {
-	vbin tools/install-dist.p6 raku-install-dist
+	vbin tools/install-dist.raku raku-install-dist
 }

From 8132d47fa88984c7218f05926c05949eb7336110 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 00:13:18 +0100
Subject: [PATCH 0576/2561] nwipe: update to 0.33.

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

diff --git a/srcpkgs/nwipe/template b/srcpkgs/nwipe/template
index acc1307e5f1e..5a82401a9d40 100644
--- a/srcpkgs/nwipe/template
+++ b/srcpkgs/nwipe/template
@@ -1,17 +1,18 @@
 # Template file for 'nwipe'
 pkgname=nwipe
-version=0.32
+version=0.33
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="libuuid-devel libparted-devel ncurses-devel"
+depends="smartmontools"
 short_desc="Utility to securely erase disks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/martijnvanbrummelen/nwipe"
 changelog="https://raw.githubusercontent.com/martijnvanbrummelen/nwipe/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=40b7a3833d60a28834ccc190174c97a28141fdd43d93652ae93bb4928f567a5c
+checksum=e771a6d36a6800a5cf0ad460591bfd7fe4c04a908afe3da5fd169c921195e489
 
 CFLAGS="-D_FILE_OFFSET_BITS=64"
 

From e20c23cb4d24e26b319ac148133c309890cf56ac Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 00:18:32 +0100
Subject: [PATCH 0577/2561] partclone: update to 0.3.19.

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

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index f7187bbff910..941c9e4bd529 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,6 +1,6 @@
 # Template file for 'partclone'
 pkgname=partclone
-version=0.3.18
+version=0.3.19
 revision=1
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
@@ -13,8 +13,8 @@ short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://partclone.org/"
-distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz"
-checksum=50070e29c2e00e991a3784f13339347acb46d2a293f43531d1f4f4f0dcb42311
+distfiles="https://github.com/Thomas-Tsai/partclone/archive/refs/tags/${version}.tar.gz"
+checksum=e15e399297b8efd74a4fd19f3caca28e5c1772b051acf7fc311f3c86296bcda4
 CFLAGS="-DBTRFS_DISABLE_BACKTRACE"
 
 pre_configure() {

From c7d8b46e58f20271e73ba083a223c0b2c068b4d4 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 22 Mar 2022 03:15:35 -0400
Subject: [PATCH 0578/2561] New package: ircdog-0.3.0

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

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
new file mode 100644
index 000000000000..e26b035a1382
--- /dev/null
+++ b/srcpkgs/ircdog/template
@@ -0,0 +1,16 @@
+# Template file for 'ircdog'
+pkgname=ircdog
+version=0.3.0
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ircdog"
+short_desc="Simple wrapper over the raw IRC protocol"
+maintainer="0x5c <dev@0x5c.io>"
+license="ISC"
+homepage="https://github.com/ergochat/ircdog"
+distfiles="https://github.com/ergochat/ircdog/archive/refs/tags/v${version}.tar.gz"
+checksum=ea58a3fb081e438eae834ed7a812cc7640e7d3440c3615b814b880fef0eab5f6
+
+post_install() {
+	vlicense LICENSE
+}

From 5095bc73f7d492db5311116e7006f291276be37a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 02:34:28 +0100
Subject: [PATCH 0579/2561] stagit: update to 1.0.

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

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 7078a4f6c946..f5828d25ed5c 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,6 +1,6 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=0.9.6
+version=1.0
 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=d072f386f3a546ed0341e20f9c2dfd7756a761fab1c40316a96690cb2b3066d0
+checksum=10a0e31bb57d6da0dea84728cabed95b8f7d83fde13bb76e0ce18ef71ab68d8f
 LDFLAGS="-lgit2"
 
 post_install() {

From 935f9582e14ce4443a163fbcb2e4b8f0263c7383 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 22:06:02 +0100
Subject: [PATCH 0580/2561] imlib2: update to 1.8.1, adopt.

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

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index dd9ac63e7cc8..b560ef27489c 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.8.0
+version=1.8.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -9,11 +9,11 @@ makedepends="freetype-devel libjpeg-turbo-devel libpng-devel libwebp-devel
  tiff-devel libid3tag-devel giflib-devel libXext-devel libSM-devel
  libheif-devel librsvg-devel"
 short_desc="Image manipulation library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
-distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=6f881c9a1eee040484d2f13070fefbf1d88270a75042e2d5de63fa22ea6e1c88
+distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.xz"
+checksum=522e1e70e65bc0eddfe207617d15c9a395662a7c090661daaa2c294fb7d9fdaa
 
 post_install() {
 	vlicense COPYING

From 8f20d19c6324d3edebc46e11f45d3aafacc6a60b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 19 May 2021 16:09:01 +0200
Subject: [PATCH 0581/2561] New package: perl-Math-Int64-0.54

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

diff --git a/srcpkgs/perl-Math-Int64/template b/srcpkgs/perl-Math-Int64/template
new file mode 100644
index 000000000000..f5554054e6f5
--- /dev/null
+++ b/srcpkgs/perl-Math-Int64/template
@@ -0,0 +1,15 @@
+# Template file for 'perl-Math-Int64'
+pkgname=perl-Math-Int64
+version=0.54
+revision=1
+wrksrc="${pkgname#perl-}-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="perl"
+depends="perl"
+short_desc="Add support for 64 bit integers, signed and unsigned, to Perl"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Math-Int64"
+distfiles="${CPAN_SITE}/Math/Math-Int64-${version}.tar.gz"
+checksum=dcfc51e698437ea6b9cefe0276215c56cdb6a7f85e3e24a2b6b4189f1960d351

From cd569924bc0ca5fe40145c349088f7bf283f7e0b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 19 May 2021 16:09:28 +0200
Subject: [PATCH 0582/2561] New package: perl-Math-Int128-0.22

---
 srcpkgs/perl-Math-Int128/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/perl-Math-Int128/template

diff --git a/srcpkgs/perl-Math-Int128/template b/srcpkgs/perl-Math-Int128/template
new file mode 100644
index 000000000000..eb4fb2e68fdc
--- /dev/null
+++ b/srcpkgs/perl-Math-Int128/template
@@ -0,0 +1,20 @@
+# Template file for 'perl-Math-Int128'
+pkgname=perl-Math-Int128
+version=0.22
+revision=1
+wrksrc="${pkgname#perl-}-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="perl"
+depends="perl perl-Math-Int64"
+checkdepends="perl-Math-Int64"
+short_desc="Add support for 128 bit integers, signed and unsigned, to Perl"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Math-Int64"
+distfiles="${CPAN_SITE}/Math/Math-Int128-${version}.tar.gz"
+checksum=a630ca401753866955f1173848ab5b4ac4ad5ca6ad9087f11cdf91dde85119bc
+
+if [ "$XBPS_TARGET_WORDSIZE" == "32" ]; then
+	broken="not supported on 32-bit architectures"
+fi

From b2b085e68231800daa48123a6db1dcdb18eba89d Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 19 May 2021 16:10:55 +0200
Subject: [PATCH 0583/2561] perl-Crypt-CBC: update to 3.04

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

diff --git a/srcpkgs/perl-Crypt-CBC/template b/srcpkgs/perl-Crypt-CBC/template
index 5ddc77f0674e..f15cfc6013cb 100644
--- a/srcpkgs/perl-Crypt-CBC/template
+++ b/srcpkgs/perl-Crypt-CBC/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Crypt-CBC'
 pkgname=perl-Crypt-CBC
-version=3.01
+version=3.04
 revision=1
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
@@ -12,6 +12,6 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Crypt-CBC"
 distfiles="${CPAN_SITE}/Crypt/Crypt-CBC-${version}.tar.gz"
-checksum=de259c1c94fc1fd2731dfd276e8b05e31edfd2150848afdff09ac6ae9a03e624
+checksum=4026c57d0dbf6496c0d561a26f161b763d3b8edf351139c073492e21b5fbce07
 # check requires a lot of new cascading dependencies
 make_check=no

From f2c0d39b343c62d54bf853cf2f08846342b59f99 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 11 Feb 2022 19:40:45 +0100
Subject: [PATCH 0584/2561] lilypond: update to 2.23.6

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

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 66d452bd7771..0cc74759a100 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.5
+version=2.23.6
 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=53fd289eac318356003bf19b2d9e8ec43cb32e2ea926363145c1b26482bd1678
+checksum=a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then

From 10ad50ccfd9d1072e937df776abd1e10e4554ffc Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 11 Feb 2022 19:41:08 +0100
Subject: [PATCH 0585/2561] lilypond-doc: update to 2.23.6

---
 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 89aa80f23fe4..f0ee3b262e90 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.5
+version=2.23.6
 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="https://lilypond.org/"
 distfiles="https://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=e2b528b3ce70058b634fd76b097f975760c0ad86148d9ec63b66c73a941b0afd
+checksum=1fada73c22dbcfa6224744a8ad87e10cced784f98fd9243768c96ee5bc0ee45d
 
 do_install() {
 	vmkdir usr

From 2a79cff956121263a32e241e145d3ab36a45fdda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 13:37:41 +0100
Subject: [PATCH 0586/2561] slop: update to 7.6.

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

diff --git a/common/shlibs b/common/shlibs
index d3c9ab101c39..1b072c738a2e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2985,7 +2985,7 @@ libmutter-cogl-9.so.0 mutter-41.0_1
 libmutter-cogl-pango-9.so.0 mutter-41.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
+libslopy.so.7.6 slop-7.6_1
 libbcunit.so.1 bcunit-3.0_1
 libzbar.so.0 libzbar-0.10_1
 libzbargtk.so.0 libzbar-0.10_1
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bae6088a418a..9659f2818c1e 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
-version=7.5
-revision=5
+version=7.6
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
@@ -10,7 +10,7 @@ maintainer="Felipe Nogueira <contato.fnog@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/naelstrof/slop"
 distfiles="https://github.com/naelstrof/slop/archive/v${version}.tar.gz"
-checksum=94d8b6270217cd7f56ce7d4a9a75069025262830a2f91c3239b7fc07da5ea8da
+checksum=ec45f9a69d7a24df621f5c634d202451ddca987d550cf588c5c427b99106fb6b
 
 slop-devel_package() {
 	short_desc+=" - developments files"

From d1ae76f79dd12b79b440525ed0eda9b1442930c0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 13:38:14 +0100
Subject: [PATCH 0587/2561] maim: rebuild against slop-7.6

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

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

From 00ba982a7fe02664121d98f6a8f2be37b387d16c Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Sun, 6 Mar 2022 19:08:14 +0100
Subject: [PATCH 0588/2561] dumb_runtime_dir: update to 1.0.4.

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

diff --git a/srcpkgs/dumb_runtime_dir/template b/srcpkgs/dumb_runtime_dir/template
index 756fc018a264..f2b18817be65 100644
--- a/srcpkgs/dumb_runtime_dir/template
+++ b/srcpkgs/dumb_runtime_dir/template
@@ -1,6 +1,6 @@
 # Template file for 'dumb_runtime_dir'
 pkgname=dumb_runtime_dir
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="0BSD"
 homepage="https://github.com/ifreund/dumb_runtime_dir"
 distfiles="${homepage}/releases/download/v${version}/dumb_runtime_dir-${version}.tar.gz"
-checksum=92fe5c4b6a69eb9e1845b067aa7f71303a6faabea3be8110776b6072c1652718
+checksum=451e680ee2ad4bd268a2cc21571fd843eefde5ffd7a6847221f9a1449924acc0
 
 post_install() {
 	vlicense LICENSE

From 3d767321044fd2eba6416be55d6af3bcbbe5d6c6 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Mar 2022 12:14:35 +0100
Subject: [PATCH 0589/2561] skopeo: update to 1.6.1.

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

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index cd069e30431a..b568744c4b25 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.5.2
+version=1.6.1
 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=e15c189a8134dec62259e6fea2786e9fb55b34e55d26a8924de0d438fd3677c4
+checksum=304016ec4eb802bf1e1b350854db50bdc99a93dcbcc71f9d531dbb916dc146f3
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From 69e56be98ad31e9115f5d624f3622a10ef0e1c7f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 19:44:21 +0100
Subject: [PATCH 0590/2561] allegro5: update to 5.2.7.0.

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

diff --git a/srcpkgs/allegro5/template b/srcpkgs/allegro5/template
index f55a7eb6c144..e63d90e3e3fc 100644
--- a/srcpkgs/allegro5/template
+++ b/srcpkgs/allegro5/template
@@ -1,6 +1,6 @@
 # Template file for 'allegro5'
 pkgname=allegro5
-version=5.2.6.0
+version=5.2.7.0
 revision=1
 wrksrc="allegro-${version}"
 build_style=cmake
@@ -9,14 +9,14 @@ hostmakedepends="pkg-config"
 makedepends="zlib-devel alsa-lib-devel jack-devel libXpm-devel libXxf86vm-devel
  libXxf86dga-devel libXcursor-devel libvorbis-devel libpng-devel glu-devel
  libjpeg-turbo-devel libtheora-devel freetype-devel libflac-devel physfs-devel
- libopenal-devel gtk+-devel opus-devel opusfile-devel"
+ libopenal-devel gtk+3-devel opus-devel opusfile-devel"
 depends="virtual?libGL"
 short_desc="Portable library mainly aimed at video game and multimedia programming"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="Allegro License (MIT alike)"
 homepage="https://liballeg.org/"
 distfiles="https://github.com/liballeg/allegro5/releases/download/${version}/allegro-${version}.tar.gz"
-checksum=5de8189ec051e1865f359654f86ec68e2a12a94edd00ad06d1106caa5ff27763
+checksum=c1e3b319d99cb453b39d393572ba2b9f3de42a96de424aee7d4a1abceaaa970c
 
 post_install() {
 	vlicense LICENSE.txt

From dfe03d21928cce4328c3e11c686afcff0e37c87b Mon Sep 17 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, 18 Jan 2021 21:02:52 +0700
Subject: [PATCH 0591/2561] GitHub Action: build on push to branches designated
 for CI

---
 .github/workflows/build.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..503f1e1f4b68 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,6 +1,10 @@
-name: Check PR
+name: Check build
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - 'ci-**'
 
 jobs:
   # Lint changed templates.

From 8af71d9bbcd8611b21c58a39618a8637b609b200 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 14 Mar 2022 16:27:20 -0400
Subject: [PATCH 0592/2561] New package: aravis-0.8.21

---
 common/shlibs             |  1 +
 srcpkgs/aravis/template   | 47 +++++++++++++++++++++++++++++++++++++++
 srcpkgs/gstreamer1-aravis |  1 +
 srcpkgs/libaravis         |  1 +
 srcpkgs/libaravis-devel   |  1 +
 5 files changed, 51 insertions(+)
 create mode 100644 srcpkgs/aravis/template
 create mode 120000 srcpkgs/gstreamer1-aravis
 create mode 120000 srcpkgs/libaravis
 create mode 120000 srcpkgs/libaravis-devel

diff --git a/common/shlibs b/common/shlibs
index 1b072c738a2e..ccc55a1b3772 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4144,3 +4144,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
 librz_lang.so.0.3.4 rizin-0.3.4_1
 librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
+libaravis-0.8.so.0 libaravis-0.8.21_1
diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template
new file mode 100644
index 000000000000..2c67a954144a
--- /dev/null
+++ b/srcpkgs/aravis/template
@@ -0,0 +1,47 @@
+# Template file for 'aravis'
+pkgname=aravis
+version=0.8.21
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gobject-introspection gi-docgen gettext"
+makedepends="gtk+3-devel glib-devel libusb-devel zlib-devel libxml2-devel
+ gstreamer1-devel gst-plugins-base1-devel"
+checkdepends="python3-gobject"
+short_desc="Vision utilities for genicam based cameras"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/AravisProject/aravis"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=a53ce93cb082ac1c4215aed48aa9e05d5342d58811938065e9f503b07838dfb3
+# Network test causes timeout in CI
+make_check=ci-skip
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" glib-devel prelink-cross qemu-user-static"
+fi
+
+libaravis_package() {
+	short_desc="Vision library for genicam-based cameras"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vmove usr/lib/girepository-1.0
+	}
+}
+
+libaravis-devel_package() {
+	depends="libaravis>=${version}_${revision}"
+	short_desc="Vision library for genicam-based cameras - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+	}
+}
+
+gstreamer1-aravis_package() {
+	short_desc+=" - gstreamer plugin"
+	pkg_install() {
+		vmove usr/lib/gstreamer-1.0
+	}
+}
diff --git a/srcpkgs/gstreamer1-aravis b/srcpkgs/gstreamer1-aravis
new file mode 120000
index 000000000000..4309a30c365f
--- /dev/null
+++ b/srcpkgs/gstreamer1-aravis
@@ -0,0 +1 @@
+aravis
\ No newline at end of file
diff --git a/srcpkgs/libaravis b/srcpkgs/libaravis
new file mode 120000
index 000000000000..4309a30c365f
--- /dev/null
+++ b/srcpkgs/libaravis
@@ -0,0 +1 @@
+aravis
\ No newline at end of file
diff --git a/srcpkgs/libaravis-devel b/srcpkgs/libaravis-devel
new file mode 120000
index 000000000000..4309a30c365f
--- /dev/null
+++ b/srcpkgs/libaravis-devel
@@ -0,0 +1 @@
+aravis
\ No newline at end of file

From 00e64d969ea319822fa7f5dc5f2fcb39131c73e4 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 26 Mar 2022 21:18:06 +0530
Subject: [PATCH 0593/2561] New package: spotify-adblock-1.0.1

---
 srcpkgs/spotify-adblock/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/spotify-adblock/template

diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
new file mode 100644
index 000000000000..8d64a84df72f
--- /dev/null
+++ b/srcpkgs/spotify-adblock/template
@@ -0,0 +1,25 @@
+# Template file for 'spotify-adblock'
+pkgname=spotify-adblock
+version=1.0.1
+revision=1
+build_style=cargo
+conf_files="/etc/spotify-adblock/config.toml"
+short_desc="Adblocker for Spotify"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/abba23/spotify-adblock"
+distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${version}.tar.gz"
+checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360
+
+pre_install() {
+	{ sed -n '/<summary>Debian/q'
+	  sed -n '/^```$/q'
+	  sed -n '/^```$/q;s-/usr/local/lib/-/usr/lib/-;p'
+	} <README.md >spotify-adblock.desktop
+}
+
+do_install() {
+	vinstall config.toml 644 etc/spotify-adblock
+	vinstall spotify-adblock.desktop 644 usr/share/applications
+	vinstall "target/${RUST_TARGET}/release/libspotifyadblock.so" 644 usr/lib spotify-adblock.so
+}

From 9c0ae8074a7738186d884b96cdc2742da3177529 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 14 Mar 2022 21:18:11 -0500
Subject: [PATCH 0594/2561] kaffeine: plugins are not detected shlibs

---
 srcpkgs/kaffeine/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kaffeine/template b/srcpkgs/kaffeine/template
index 6b9f2ac96c99..e0356c9ad552 100644
--- a/srcpkgs/kaffeine/template
+++ b/srcpkgs/kaffeine/template
@@ -1,7 +1,7 @@
 # Template file for 'kaffeine'
 pkgname=kaffeine
 version=2.0.18
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config kcoreaddons"
@@ -9,6 +9,8 @@ makedepends="kidletime-devel kio-devel ksolid-devel vlc-devel
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
  qt5-plugin-sqlite qt5-plugin-tds
  $(vopt_if dvb 'v4l-utils-devel eudev-libudev-devel')"
+depends="qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
+ qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="KDE media player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 28b906488dfc4a78378cf6303586d9d59e807118 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 1 Oct 2021 18:23:28 -0500
Subject: [PATCH 0595/2561] enchant2: update to 2.3.2.

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

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 8a48e4d61b8c..2d7a2e67e125 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
-version=2.2.15
-revision=5
+version=2.3.2
+revision=1
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -22,7 +22,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://abiword.github.io/enchant/"
 distfiles="https://github.com/AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz"
-checksum=3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03
+checksum=ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e
+make_check=no # tests broken
 
 enchant2-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 37a21660dbeaeb1e364141d3b809e350435f25f0 Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Mon, 21 Mar 2022 12:19:12 -0600
Subject: [PATCH 0596/2561] New package: qt6ct-0.5

---
 srcpkgs/qt6ct/files/qt6ct.sh |  6 ++++++
 srcpkgs/qt6ct/template       | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/qt6ct/files/qt6ct.sh
 create mode 100644 srcpkgs/qt6ct/template

diff --git a/srcpkgs/qt6ct/files/qt6ct.sh b/srcpkgs/qt6ct/files/qt6ct.sh
new file mode 100644
index 000000000000..e4e7708d8a29
--- /dev/null
+++ b/srcpkgs/qt6ct/files/qt6ct.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+export QT_QPA_PLATFORMTHEME=qt5ct
+if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+	export QT_QPA_PLATFORM=wayland
+fi
diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
new file mode 100644
index 000000000000..1e443df1dc20
--- /dev/null
+++ b/srcpkgs/qt6ct/template
@@ -0,0 +1,20 @@
+# Template file for 'qt6ct'
+pkgname=qt6ct
+version=0.5
+revision=1
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+depends="qt6-base qt6-svg"
+short_desc="Qt6 Configuration Tool"
+maintainer="Adam Pschorr <adampschorr13@aol.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/trialuser02/qt6ct"
+distfiles="https://github.com/trialuser02/qt6ct/archive/refs/tags/${version}.tar.gz"
+checksum=0fea8e5295e4ebebfae36f4862aaa67859238312d7a055b252cc53b281d69e0d
+
+post_install() {
+	vlicense COPYING
+	vinstall ${FILESDIR}/qt6ct.sh 644 etc/profile.d
+}

From 6d17376e0e44b3010283b62eb2897bac6c05f7ad Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 27 Mar 2022 22:52:23 -0500
Subject: [PATCH 0597/2561] berry: 0.1.11

---
 srcpkgs/berry/patches/fix-cross.patch | 48 +++++----------------------
 srcpkgs/berry/template                |  9 ++---
 2 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/srcpkgs/berry/patches/fix-cross.patch b/srcpkgs/berry/patches/fix-cross.patch
index 3756ccfa40c5..eace39b7a1ff 100644
--- a/srcpkgs/berry/patches/fix-cross.patch
+++ b/srcpkgs/berry/patches/fix-cross.patch
@@ -1,41 +1,11 @@
---- a/config.mk
-+++ b/config.mk
-@@ -9,11 +9,11 @@
- # Customize below to fit your system
+--- a/configure
++++ b/configure
+@@ -26,7 +26,7 @@
+ progs="CC=gcc CC=clang CC=cc INSTALL=install"
  
- # paths
--PREFIX = /usr/local
-+PREFIX = /usr
- MANPREFIX = ${PREFIX}/share/man
+ # Required dependencies
+-pkgs="x11 xinerama fontconfig xft"
++pkgs="x11 xinerama fontconfig xft freetype2"
  
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = $(XBPS_CROSS_BASE)/usr/include
-+X11LIB = $(XBPS_CROSS_BASE)/usr/lib
- 
- # Xinerama, comment if you don't want it
- XINERAMALIBS  = -lXinerama
-@@ -21,7 +21,7 @@
- 
- # freetype
- FREETYPELIBS = -lfontconfig -lXft
--FREETYPEINC = /usr/include/freetype2
-+FREETYPEINC = $(XBPS_CROSS_BASE)/usr/include/freetype2
- # OpenBSD (uncomment)
- #FREETYPEINC = ${X11INC}/freetype2
- 
-@@ -36,7 +36,7 @@
- # flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${DEBUG_CPPFLAGS}
- #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS}
--CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
-+CFLAGS   += -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
- LDFLAGS  = ${LIBS}
- 
- # Solaris
-@@ -44,4 +44,4 @@
- #LDFLAGS = ${LIBS}
- 
- # compiler and linker
--CC = cc
-+#CC = cc
+ # Default pkg flags to substitute when pkg-config is not found
+ pkg_libs="-lX11 -lXinerama -lfontconfig -lfreetype -lXft"
diff --git a/srcpkgs/berry/template b/srcpkgs/berry/template
index 05256589af24..7e2f79c09641 100644
--- a/srcpkgs/berry/template
+++ b/srcpkgs/berry/template
@@ -1,16 +1,17 @@
 # Template file for 'berry'
 pkgname=berry
-version=0.1.7
+version=0.1.11
 revision=1
-build_style=gnu-makefile
-make_use_env=yes
+build_style=configure
+configure_args="--prefix=/usr"
+hostmakedepends="pkg-config which"
 makedepends="libX11-devel libXinerama-devel libXft-devel freetype-devel"
 short_desc="Healthy, bite-sized window manager"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/JLErvin/berry"
 distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz"
-checksum=1d6de883a0cd96ceb167c5ad2e855b0b15fa84872d41a22e05d0fdf0cf4be6b8
+checksum=9beab0c1458fba7cf304dd45b710829640342bc42cfe61f0ae8c2b5391163142
 
 post_install() {
 	vlicense LICENSE

From f38096b3f4d0d8f0e8f1f8f1edfb50c3d6a9f55a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 27 Mar 2022 23:03:37 -0500
Subject: [PATCH 0598/2561] downloader-cli: update to 0.3.3.

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

diff --git a/srcpkgs/downloader-cli/template b/srcpkgs/downloader-cli/template
index e390e31ed7b4..a7be8744ea34 100644
--- a/srcpkgs/downloader-cli/template
+++ b/srcpkgs/downloader-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'downloader-cli'
 pkgname=downloader-cli
-version=0.3.2
-revision=2
+version=0.3.3
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-urllib3 python3-downloader-cli"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/deepjyoti30/downloader-cli"
 distfiles="https://github.com/deepjyoti30/downloader-cli/archive/${version}.tar.gz"
-checksum=ad00b5ab905e57b8c275465c2b8bbeb187068ceff6614e68cf0b86de635acfe5
+checksum=212f87443574f4be7df750223ae15912e3a8f28470cd90aecc40701d109576f4
 
 post_install() {
 	vlicense LICENSE

From b08f7005cad017618b398bda9079037442bb6226 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 27 Mar 2022 23:05:43 -0500
Subject: [PATCH 0599/2561] ffuf: update to 1.4.0.

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

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 5430e121a532..6ceffafb0e55 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
 # Template file for 'ffuf'
 pkgname=ffuf
-version=1.3.1
+version=1.4.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=136df36154f17668fb726120f0c93059f696786a34e3c2047d61efc3a065c4ec
+checksum=cc741088f15b5cfdeb596f1630a015cce0b4b112dc6daf857cd9878e7a1734c1
 
 post_install() {
 	vlicense LICENSE

From b0af7625db0a47a3c3c65b80948b88776de059eb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 14:21:14 +0200
Subject: [PATCH 0600/2561] s-nail: update to 14.9.24.

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

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 2ba9e33f361c..7a171cea0d27 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,6 +1,6 @@
 # Template file for 's-nail'
 pkgname=s-nail
-version=14.9.23
+version=14.9.24
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-4-Clause, BSD-3-Clause, BSD-2-Clause, ISC"
 homepage="https://git.sdaoden.eu/cgit/s-nail.git"
 distfiles="https://www.sdaoden.eu/downloads/s-nail-${version}.tar.xz"
-checksum=2c717b22f4cd8719b82b6618640da6031382d2bf8eb51283bca2c6266957bca8
+checksum=2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c
 
 provides="mail-${version}_${revision}"
 

From 9704f6b283fd586b52f5473f716a164a699949e7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 14:22:18 +0200
Subject: [PATCH 0601/2561] weechat: update to 3.5.

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

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index c5898cbf3091..ebd25fa21547 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,6 +1,6 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=3.4.1
+version=3.5
 revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=7e088109ad5dfbcb08a9a6b1dd70ea8236093fed8a13ee9d9c98881d7b1aeae7
+checksum=ea904e4cec8edd0bd24f3ea17f6d6dff97ca00ee0571ee972e79e54c8c08170c
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"
@@ -32,10 +32,6 @@ if [ "$CROSS_BUILD" ]; then
 	 -DPERL_LFLAGS=-L$_perlpath"
 fi
 
-post_extract() {
-	vsed -i '/pkg_search_module/s/ruby-3.0/ruby-3.1 &/' cmake/FindRuby.cmake
-}
-
 weechat-aspell_package() {
 	lib32disabled=yes
 	depends="${sourcepkg}>=${version}_${revision}"

From c222254558023d05d52c5da17a91feb2db34fe25 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 14:22:29 +0200
Subject: [PATCH 0602/2561] python3-pyinfra: update to 1.7.2.

---
 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 7e633ebc3fe3..c4935c5e16b9 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.6.3
+version=1.7.2
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -14,7 +14,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=0db96b12a5dde2ca464a83b7dbbff74207775ad16de9162313a823320ec12488
+checksum=c7a2464ab50c5de865f0984e1978a9af37fbeca2260c4bf642db37fd0aed910d
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 47f150b25136b4a00257b071cc438a7486a42942 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 08:23:49 -0500
Subject: [PATCH 0603/2561] nfdump: update to 1.6.24.

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

diff --git a/srcpkgs/nfdump/template b/srcpkgs/nfdump/template
index 1bdf3de252f2..348db854dbf4 100644
--- a/srcpkgs/nfdump/template
+++ b/srcpkgs/nfdump/template
@@ -1,6 +1,6 @@
 # Template file for 'nfdump'
 pkgname=nfdump
-version=1.6.23
+version=1.6.24
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake flex libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/phaag/nfdump"
 distfiles="https://github.com/phaag/nfdump/archive/v${version}.tar.gz"
-checksum=8c5a7959e66bb90fcbd8ad508933a14ebde4ccf7f4ae638d8f18c9473c63af33
+checksum=11ea7ecba405d57076c321f6f77491f1c64538062630131c98ac62dc4870545e
 configure_args+="--enable-sflow --enable-readpcap --enable-nfcapd"
 
 pre_configure() {

From 812d9329a805d303733909cd156124853fcd155c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 08:26:12 -0500
Subject: [PATCH 0604/2561] python3-simber: update to 0.2.4.

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

diff --git a/srcpkgs/python3-simber/template b/srcpkgs/python3-simber/template
index 27bd0df0d1f4..20d06df337b7 100644
--- a/srcpkgs/python3-simber/template
+++ b/srcpkgs/python3-simber/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-simber'
 pkgname=python3-simber
-version=0.2.3
-revision=2
+version=0.2.4
+revision=1
 wrksrc="simber-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://simber.deepjyoti30.dev/"
 distfiles="https://github.com/deepjyoti30/simber/archive/${version}.tar.gz"
-checksum=bf588394e26dcd45f4dba5f0c7b3cff8de3d66e22a5cd862979828295ea7f32a
+checksum=75c9e2fc915d470a4d9d36e5e5d003479d06af5d3a7e21b7ec30745f1845f8b9
 
 post_install() {
 	vlicense LICENSE

From bc0bc9cfbedd443b14e389868e5dcbef7404ecba Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 08:42:18 -0500
Subject: [PATCH 0605/2561] stellarium: update to 0.22.0.

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

diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template
index 0cfc788cdefa..c2a87b2847ad 100644
--- a/srcpkgs/stellarium/template
+++ b/srcpkgs/stellarium/template
@@ -1,16 +1,16 @@
 # Template file for 'stellarium'
 pkgname=stellarium
-version=0.21.3
+version=0.22.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"
+ qt5-serialport-devel qt5-tools-devel qt5-charts-devel"
 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=8ac6c054d12f136fe0d5c0deaaa8d7b69dd2a462be1711a187364574aef97e7f
+checksum=0b4dc23cf9054b5e76cd9bc5ad68e172eb221999e90af37e93667d04fe78c885
 replaces="stellarium-data>=0"

From dbdab73201148b11dc440e6159a15b81e8be2442 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 16:01:20 +0200
Subject: [PATCH 0606/2561] linux5.10: update to 5.10.109.

Enable
CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RANDOM_TRUST_BOOTLOADER=y
---
 srcpkgs/linux5.10/files/arm64-dotconfig   | 2 +-
 srcpkgs/linux5.10/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.10/files/ppc-dotconfig     | 2 +-
 srcpkgs/linux5.10/files/ppc64-dotconfig   | 4 ++--
 srcpkgs/linux5.10/files/ppc64le-dotconfig | 4 ++--
 srcpkgs/linux5.10/files/x86_64-dotconfig  | 4 ++--
 srcpkgs/linux5.10/template                | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index f5587464698f..acfc37c03510 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -4519,7 +4519,7 @@ CONFIG_XILLYBUS_OF=m
 # end of Character devices
 
 CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 3226507db584..e3ea24162dc7 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -4034,8 +4034,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index df90c0513f42..078ffac9ee09 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -3549,7 +3549,7 @@ CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index 0545b9d79c77..5d973825057c 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -4148,8 +4148,8 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index 5ae9914dc5bd..a5158c12dd3f 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -3969,8 +3969,8 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 6f07a461b3ab..fa04bb81b4dc 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -4104,8 +4104,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a3ccac15e158..0912977245d4 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.107
+version=5.10.109
 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=c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea
+checksum=18fb22ecb249669ea775474aee614dcb0697cab299068074fd9f0bafa32113dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 57cc31efe4bc28641c6009fa9a1cbfe810465148 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Fri, 11 Mar 2022 22:37:26 +0100
Subject: [PATCH 0607/2561] podman: add runit service

---
 srcpkgs/podman/files/podman-docker/finish | 3 +++
 srcpkgs/podman/files/podman-docker/run    | 4 ++++
 srcpkgs/podman/files/podman/log/run       | 1 +
 srcpkgs/podman/files/podman/run           | 4 ++++
 srcpkgs/podman/template                   | 4 +++-
 5 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/podman/files/podman-docker/finish
 create mode 100755 srcpkgs/podman/files/podman-docker/run
 create mode 120000 srcpkgs/podman/files/podman/log/run
 create mode 100755 srcpkgs/podman/files/podman/run

diff --git a/srcpkgs/podman/files/podman-docker/finish b/srcpkgs/podman/files/podman-docker/finish
new file mode 100755
index 000000000000..884b37f53b63
--- /dev/null
+++ b/srcpkgs/podman/files/podman-docker/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+[ "$(realpath /run/docker.sock)" = "/run/podman/podman.sock" ] && rm /run/docker.sock
diff --git a/srcpkgs/podman/files/podman-docker/run b/srcpkgs/podman/files/podman-docker/run
new file mode 100755
index 000000000000..3125a4f89ed9
--- /dev/null
+++ b/srcpkgs/podman/files/podman-docker/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+ln -sf /run/podman/podman.sock /run/docker.sock
+exec chpst -b podman-docker pause
diff --git a/srcpkgs/podman/files/podman/log/run b/srcpkgs/podman/files/podman/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/podman/files/podman/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/podman/files/podman/run b/srcpkgs/podman/files/podman/run
new file mode 100755
index 000000000000..8eb8f41752e4
--- /dev/null
+++ b/srcpkgs/podman/files/podman/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec podman --log-level info system service ${OPTS:---time=0} 2>&1
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index c719e4ca6057..95e0531abad8 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
@@ -34,4 +34,6 @@ post_install() {
 		vendor/github.com/containers/common/pkg/config/containers.conf \
 		>containers.cgfs.conf
 	vinstall containers.cgfs.conf 644 usr/share/containers containers.conf
+	vsv podman
+	vsv podman-docker
 }

From 557e0f3206195a26f7896e324420eaa45a18f26a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 16:33:53 +0200
Subject: [PATCH 0608/2561] linux5.15: update to 5.15.32.

Enable
CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RANDOM_TRUST_BOOTLOADER=y
---
 srcpkgs/linux5.15/files/arm64-dotconfig   | 2 +-
 srcpkgs/linux5.15/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.15/files/ppc-dotconfig     | 2 +-
 srcpkgs/linux5.15/files/ppc64-dotconfig   | 4 ++--
 srcpkgs/linux5.15/files/ppc64le-dotconfig | 4 ++--
 srcpkgs/linux5.15/files/x86_64-dotconfig  | 4 ++--
 srcpkgs/linux5.15/template                | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index f2091f4a8972..d086ed216153 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -4677,7 +4677,7 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
 CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 33ac63d097c5..db7fdf4d3bbd 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -4136,8 +4136,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig
index 3c19e95fb938..6ca79da60447 100644
--- a/srcpkgs/linux5.15/files/ppc-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc-dotconfig
@@ -3629,7 +3629,7 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS_CLASS=m
 # CONFIG_XILLYBUS is not set
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig
index 0261e73e9d87..355ff2fa768c 100644
--- a/srcpkgs/linux5.15/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64-dotconfig
@@ -4261,8 +4261,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig
index 59108825538b..5148c4e5cf55 100644
--- a/srcpkgs/linux5.15/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig
@@ -4078,8 +4078,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index b7655fcc219a..225e5c5022ee 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -4208,8 +4208,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 9b43d8ebf3e3..236c406a512b 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.30
+version=5.15.32
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 18059d8e3f01ab38b22ddf4c2e0a0a9db50926f6535649f51ee7a86a8542aff1"
+ eacc8609dfcecb637f813ef4d2e13f48bdeb6143be929358f3b3cb4254f9c563"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 0c302dc49cd3c688b43ad378f124fa6e29a098c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 16:36:50 +0200
Subject: [PATCH 0609/2561] linux5.16: update to 5.16.18.

Enable
CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RANDOM_TRUST_BOOTLOADER=y
---
 srcpkgs/linux5.16/files/arm64-dotconfig   | 2 +-
 srcpkgs/linux5.16/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.16/files/ppc-dotconfig     | 2 +-
 srcpkgs/linux5.16/files/ppc64-dotconfig   | 4 ++--
 srcpkgs/linux5.16/files/ppc64le-dotconfig | 4 ++--
 srcpkgs/linux5.16/files/x86_64-dotconfig  | 4 ++--
 srcpkgs/linux5.16/template                | 6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig
index 23f03c1e5630..e4b9d7a609af 100644
--- a/srcpkgs/linux5.16/files/arm64-dotconfig
+++ b/srcpkgs/linux5.16/files/arm64-dotconfig
@@ -4720,7 +4720,7 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
 CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/i386-dotconfig b/srcpkgs/linux5.16/files/i386-dotconfig
index 9356aea01812..a7c014b0984b 100644
--- a/srcpkgs/linux5.16/files/i386-dotconfig
+++ b/srcpkgs/linux5.16/files/i386-dotconfig
@@ -4167,8 +4167,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/ppc-dotconfig b/srcpkgs/linux5.16/files/ppc-dotconfig
index 50f83d578977..19463b4a9729 100644
--- a/srcpkgs/linux5.16/files/ppc-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc-dotconfig
@@ -3652,7 +3652,7 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS_CLASS=m
 # CONFIG_XILLYBUS is not set
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/ppc64-dotconfig b/srcpkgs/linux5.16/files/ppc64-dotconfig
index f030f728a84c..b204dc8f8a72 100644
--- a/srcpkgs/linux5.16/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64-dotconfig
@@ -4287,8 +4287,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/ppc64le-dotconfig b/srcpkgs/linux5.16/files/ppc64le-dotconfig
index 65d4298a56f0..564de8e60967 100644
--- a/srcpkgs/linux5.16/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64le-dotconfig
@@ -4104,8 +4104,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/x86_64-dotconfig b/srcpkgs/linux5.16/files/x86_64-dotconfig
index 8cc965f22722..dbffc48dfc42 100644
--- a/srcpkgs/linux5.16/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.16/files/x86_64-dotconfig
@@ -4240,8 +4240,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template
index 5775997c8c58..3f8c094faf24 100644
--- a/srcpkgs/linux5.16/template
+++ b/srcpkgs/linux5.16/template
@@ -1,6 +1,6 @@
-# Template file for 'linux5.16'
+# Template file for 'linux4.16'
 pkgname=linux5.16
-version=5.16.16
+version=5.16.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="027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb
- 9e7af5007d3596c1efee8556aaa1b1a2e40ddded107448b583624a1f305376db"
+ 3bb88aa87c3f7788ad84ca5cbf3946ed9fbb3fddb9fca2458944fba5ebd2ab16"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From d8b758998ef07074b94dc04f5d32a211649805e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 18:18:51 +0200
Subject: [PATCH 0610/2561] xtools: update to 0.64.

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

diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index a9e48dc39cba..5392fb9a0602 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,6 +1,6 @@
 # Template file for 'xtools'
 pkgname=xtools
-version=0.63
+version=0.64
 revision=1
 build_style=gnu-makefile
 depends="bash curl findutils git make spdx-licenses-list xbps"
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://git.vuxu.org/xtools"
 distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
-checksum=6bc49a536488f3e911317a31f916df9f6778d34685db6aa2d7bd75be07f12995
+checksum=a49140066744d4aaaf856fb40d92df26d6d3f80b2aa03da1746c513e7eab40be

From 2e39697a117e7d0365e544e9412e5ab5cfde524b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 18:42:31 +0200
Subject: [PATCH 0611/2561] musl-obstack: update to 1.2.3.

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

diff --git a/srcpkgs/musl-obstack/template b/srcpkgs/musl-obstack/template
index 7da24d223970..a808f53c121e 100644
--- a/srcpkgs/musl-obstack/template
+++ b/srcpkgs/musl-obstack/template
@@ -1,6 +1,6 @@
 # Template file for 'musl-obstack'
 pkgname=musl-obstack
-version=1.2.2
+version=1.2.3
 revision=1
 archs="*-musl"
 build_style=gnu-configure
@@ -10,7 +10,7 @@ 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"
-checksum=6eac88961c58a53f31cccd719b97d1b33c65436c51664e760a9582e2659c1314
+checksum=9ffb3479b15df0170eba4480e51723c3961dbe0b461ec289744622db03a69395
 
 CFLAGS="-fPIC"
 pre_configure() {

From c9698cf57b0ebbe5b44a87abdf5b3cb743ae1928 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:53 +0100
Subject: [PATCH 0612/2561] attica: update to 5.92.0.

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

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 126c96c5cc71..1222f0cc9a60 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c05ee119f66d6dc60ecff5b7c6e883d4bc478aca547811b4edbc45eaf0f17b6b
+checksum=bf647c7736acbbb99ff1557339f71b5efd5a7591b2af83b482d37d35516bc933
 
 do_check() {
 	cd build

From 36269e49d152cbc96d5638371e2a7c0cb10c5f83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:54 +0100
Subject: [PATCH 0613/2561] baloo5: update to 5.92.0.

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

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 6f14edf7a725..9f6d3c93f69a 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.91.0
+version=5.92.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=7574d63379c41d8cb0e6579a0d73ab4257967ecbfaa7affa01472dcca35a12b3
+checksum=283570583da0f85b2001ca600b9657e3a3fb9c2dcdd3ea8728553e212e50a475
 
 do_check() {
 	cd build

From 6370d0fcc5a469aa2466bc0dadadba4ef7bcccad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:56 +0100
Subject: [PATCH 0614/2561] bluez-qt5: update to 5.92.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 397fd96f10f0..2893e694f79c 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=595a9ebf11845b2a3f7da4b9db596f485760bbe1930fac368150f17b6b96675c
+checksum=f58d2483ed2db9cb77621bce3b3c6babd8d1153954030c0dc52ce399c6d28ab6
 
 do_check() {
 	cd build

From 9f33e7adeb12d5d59e95bf89376c806ed4c45068 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:58 +0100
Subject: [PATCH 0615/2561] breeze-icons: update to 5.92.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 6f8860791ca9..017805c60580 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.91.0
+version=5.92.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=c17db793b931a640f9db4466e1fee917127809f80ac8fc65b2273044ec23422a
+checksum=49e09663989fd3498d61cb7518c741c87a702689b6d6074097d628264a064366
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From 4e90c9a8090585551b9527e6c94318fceea3986f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:59 +0100
Subject: [PATCH 0616/2561] extra-cmake-modules: update to 5.92.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 b96991061327..9c034a06303f 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9717885e30aadf184fa71511930409cabbf08eb6627ea8b051de8804fbcec54c
+checksum=f89a238bc5f28738db25e29296b75b4f795e3e9bfe3a8f1f9390648749d303ef
 python_version=3
 
 do_check() {

From 1982a395aeee3a90d803d15bca5bef6d4f662329 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:01 +0100
Subject: [PATCH 0617/2561] frameworkintegration: update to 5.92.0.

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

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 861978967fd4..9840b077f5cb 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7fbc8c3b949849d22161f78df453d759389319a91b4925ff235799e410c5e684
+checksum=bd8ef6f6656c9756a56fbfa1dc91273426ef3ea5fae3e7a4c7dbeddfbbe3ec5d
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 59aa681e1cff19f8e476519a72ebf450c1784b5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:03 +0100
Subject: [PATCH 0618/2561] kactivities5-stats: update to 5.92.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 32d213d3787e..8957274d1f85 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=98fdea4517529df0b1b733425a040a80df680d44bb7d27db10070828a9c3c420
+checksum=2206132e0edbb8271f77bb6c45e794b8d3baa3d9b4f94aba005556f9fa3ff751
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 9bd6ecf9e73a924250d9cd36394a43150aade1c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:04 +0100
Subject: [PATCH 0619/2561] kactivities5: update to 5.92.0.

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

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 98ae1f92c4c5..75438b590eef 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=c0c811b91ff79cb23b99ec85b390ae331107a010f522ed45600ae6274f87c40f
+checksum=fc06b6fc111f5ed8450c1c1c96f36188328b2292001ca3bf3293d0f68678dbcd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From b48897809988a04ac90e753fe83f5f656f92b5cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:05 +0100
Subject: [PATCH 0620/2561] kapidox: update to 5.92.0.

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

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 0bdfa70566af..164a36aa99a3 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,9 +1,9 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.91.0
+version=5.92.0
 revision=1
-build_style=cmake
-hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
+build_style=python3-module
+hostmakedepends="python3 python3-setuptools"
 makedepends="python3-Jinja2 python3-yaml"
 depends="python3-Jinja2 python3-yaml doxygen"
 short_desc="API documentation generation tool for KDE framework"
@@ -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=434daaf49056471af72a97043c054d0104f1341f92a4464f66a2256233a2b7f7
+checksum=4f5201de5878bc3fb24f9e2ebd387c0a12d7a27c407636bc878bab5a3999a56d
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 756930e30e162590a5225e9a4c6df1ba079e1563 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:07 +0100
Subject: [PATCH 0621/2561] karchive: update to 5.92.0.

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

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 73aa932596b0..109cc7a0ec29 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a3602cbed2aaf4d446ff7af78b626042aa6fbce1df60eb2b8332b5f6ff214cce
+checksum=5076a28c3a10ab755454c752fa563a4be7ad890f391c43aaa2ee4ee4b6a99fae
 
 karchive-devel_package() {
 	short_desc+=" - development"

From bbc1bb559915203efb662edeffc75afc949ac628 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:09 +0100
Subject: [PATCH 0622/2561] kauth: update to 5.92.0.

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

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index e8ec33646919..05ea13c55c39 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f865cb134cf4013496940d48f397eae6cf6bc5013dadf911340c23bd7ddb3a00
+checksum=44824bf68ee510d8aa0189a9d4b44568b0fe20d17ba45e3b739db1927bfa4728
 
 do_check() {
 	cd build

From 61ea87df4f5cf407580f73fb56502e16fd59c6ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:10 +0100
Subject: [PATCH 0623/2561] kbookmarks: update to 5.92.0.

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

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index b8e10942ed96..c845e8909a62 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a42233135dc255a0ff0147f22f9446c2b5932e6b11198aa099fdadbbf5b30e47
+checksum=99504e761621b56e07a561e1caea196fe4623c9334b889f081e3da8e4a19d543
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 94aadf47acb507c138653c3b79db8a015bab5b93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:12 +0100
Subject: [PATCH 0624/2561] kcalendarcore: update to 5.92.0.

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

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 1011f4c91672..3359712d3db9 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.91.0
+version=5.92.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=37f6975c0ebc8d1983f7c8bef96104dbad705a6a0fc59be53548fd317f05763e
+checksum=6ff2e68dfb8b92e0f181f3f19d20991bfd589b4a047b313af908c41391560b3a
 replaces="kcalcore>=0"
 
 do_check() {

From deaf7d0651e3e11ac3f2fee09d20113e95c980d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:13 +0100
Subject: [PATCH 0625/2561] kcmutils: update to 5.92.0.

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

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 5e53a48e1b94..bf26425f364f 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a195d83a092c493f10f372e245107277c275a418563cbc443a884ef4e4e3901
+checksum=dd49e658fc85c215442a7fa9d2435819f0bef13c997a6c2a51557b82e1bc8d3a
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From f399c6ad993a5088cb06c8a91baa8a5fb170a196 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:15 +0100
Subject: [PATCH 0626/2561] kcodecs: update to 5.92.0.

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

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index d2c0c19513e4..3ccc8f79b638 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3ec08377a1b2cbc30401ae9e43e1394c61635ab7537a37dc297cdc4deeda7c62
+checksum=d6e5b7a453948d5fa0482715eaf4a0c9abe5b902a0aca15540a04b1a1b60d275
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 4c649a38fb456a980df820b564fd241767d5142d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:16 +0100
Subject: [PATCH 0627/2561] kcompletion: update to 5.92.0.

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

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 5273d19526cf..8514a8625df8 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,20 +1,18 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-hostmakedepends="kcoreaddons extra-cmake-modules"
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
+hostmakedepends="kcoreaddons extra-cmake-modules
+ qt5-host-tools qt5-qmake qt5-tools-devel"
 makedepends="kconfig-devel kwidgetsaddons-devel"
 short_desc="KDE Powerful completion framework"
 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=2422485b10de631583b7e92e0778e5cf0c0ceec677bcd289cb7bc04c5441dfd0
-
-if [ "CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
-fi
+checksum=08f1525c6cee8babe399c941bb85d04be9dade0341d1d85c6beccd2e93dc7ceb
 
 kcompletion-devel_package() {
 	short_desc+=" - development"

From ee5895d5f9bea1456a925debd95b737e0a3c47ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:17 +0100
Subject: [PATCH 0628/2561] kconfig: update to 5.92.0.

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

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ea135ef30580..44dc8ae429da 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a63c3feadc7b6b94d8e06ead5430289742f62da59dfa4f0ceaaf237523b6ad2b
+checksum=7801b641b88368a0c021272073c692337b42ee28f0025d106942c8ce873b0523
 
 do_check() {
 	cd build

From 7e8ec08d3ecc77cc6641b7aeb45e1526ed283b6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:19 +0100
Subject: [PATCH 0629/2561] kconfigwidgets: update to 5.92.0.

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

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index d599b5212dcf..f14d66ae93ef 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,8 +1,9 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
  kconfig gettext kcoreaddons kdoctools"
 makedepends="qt5-devel kauth-devel kcodecs-devel kconfig-devel kguiaddons-devel
@@ -12,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=028493a1515a6c965ea0eecabc362340af1d2e8463760465539c980d03d8bb06
+checksum=4259eed35d9ac307ecc30e64833bad7a89ef58fc7125054eb39716d27a4a274a
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 0a8d97ecebea626a658e4ab61573021946d1312a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:20 +0100
Subject: [PATCH 0630/2561] kcontacts: update to 5.92.0.

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

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index caba0dd7ac70..544ae3c7f4cd 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.91.0
+version=5.92.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=1b067820de0370a0da43b069f4c9cafb411bb201fcbb112b9743fb9d134b03b1
+checksum=1276006e50f507216a8241ca4b26b02c67c42e5bee26a6b391db6ae4f72533ce
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 7527c4319ab602b28df7d049da0d8f28818bf8a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:22 +0100
Subject: [PATCH 0631/2561] kcoreaddons: update to 5.92.0.

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

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 78ba65403249..4838e315b9d0 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b
+checksum=df5f718f324aa2b58191438c8aa5f7498a7997eff990d16ffbc9f19efd1a6667
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 8b07d10a51a90208b1f768a5ab76b9de0612de1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:23 +0100
Subject: [PATCH 0632/2561] kcrash: update to 5.92.0.

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

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index c29cb5cf7b89..b9fadfc544d0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=544996a31f616a274961c12023fc0650deeeb9ef50125dffbed10c556eb5b33d
+checksum=9bc5605b5026f55d9c2c1ca32c79842c3ad0f5c042e480fe1e7027b2692526c7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From e75059782dcbcdb650d56c28b4ac6fb1f8d2537f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:24 +0100
Subject: [PATCH 0633/2561] kdav: update to 5.92.0.

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

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 5e01417e90cf..caa894c1356c 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.91.0
+version=5.92.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=5b8cdae0d401dc24bf0cd98cdf35de30501111968923953fa687552ae61adc08
+checksum=f3b16c473b104f83f6124f96f2b06a6c72a447eb19ba31a90e3f4725e732b1c4
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 204c9704d7b617e0b89246cabc627b93ba82c719 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:26 +0100
Subject: [PATCH 0634/2561] kdbusaddons: update to 5.92.0.

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

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index f5048739ac11..741652529177 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3a726a9ba053c2e484b5d1d2e53b361bcfb039414df488d6bc7e29a281bc10a3
+checksum=7c03f33cc49ffa80e509f654f410cb142e917bceb2f35f08836dc46ed268ae54
 
 do_check() {
 	cd build

From 17fe35c99ecd93e0d4656685cbd5f703e0d804b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:27 +0100
Subject: [PATCH 0635/2561] kdeclarative: update to 5.92.0.

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

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 6e7faaf667aa..2c6a351f34f3 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ffb8fb0edb1036aa310f1a80344e5a7209cfc9dc1bff086ed458fa0e58716da0
+checksum=fe964d77fea37c04eee3863d2b4227b76e33f16583906c284b532a461982d5b3
 
 do_check() {
 	cd build

From 93e0e1d785358f96ee7672b926256c9aba80f317 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:28 +0100
Subject: [PATCH 0636/2561] kded: update to 5.92.0.

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

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index ab0aba43e07d..15d1ebbf684e 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e59e6d0fbdad184b2e0d59dccedd1e5be53ea21959d0e828e1bbab4f7bd420fe
+checksum=8335531b856cb361ab2e5b390b333eb3405bac4e2bc7c0305994704bd0540e6c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 5c0414b5ade7f078826d1966412ba83f3fccf8a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:30 +0100
Subject: [PATCH 0637/2561] kdelibs4support: update to 5.92.0.

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

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index cf84ec928b38..5e8bc71495b1 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,9 +1,9 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-configure_args="
+configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="kcoreaddons extra-cmake-modules perl-URI pkg-config
  gettext qt5-host-tools qt5-qmake python kdoctools kgendesignerplugin kded"
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=4f6448fc6d03801b8f0e440aecd12e299631ae375c5390b343719eb85374e38c
+checksum=292e5e84ad8d7de90f0666b51f085a25b7a9faf521c58379d470d2994004ede0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From bd14a9e3c34786bad72e3df8a8d79668c2308de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:31 +0100
Subject: [PATCH 0638/2561] kdesignerplugin: update to 5.92.0.

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

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 4ebda348f4e7..8b811b777580 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d89cfb46171bb467de99bb22a56328cc881621a6ad1d091a4481ccc17cde9b1e
+checksum=066859b345da224f5edb601a5f448540330c9a286980b0c34169646c26a22a4e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 03acda9dd39e05b56e2baf7215e6cb6876814c1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:33 +0100
Subject: [PATCH 0639/2561] kdesu: update to 5.92.0.

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

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index fdd9dd503c85..0ba31e7e1a34 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55da7ee8c24e49dfd8ae49e1d006e67f541d35d111df412c5eaa8180784a40f2
+checksum=4687dc87a9ada0675801e0c575467bb5f7f7fe21b67ae2ffd1fed80736f95efa
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From a122e73214dea2c6e4951be5e9d93fbefae5ca23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:34 +0100
Subject: [PATCH 0640/2561] kdewebkit: update to 5.92.0.

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

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 8d09be212334..df9fd862a13f 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=18f361573109e95f39ca1fda04f973d9f64eb4f6ecba3dcea877e5df020796d6
+checksum=4d0a773cad86a642cb90d9844757569f2e2e9d1e96ccf78f73bee885c908d1b6
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From ba35b1a65a6cebccd2637c9752a024900e182be1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:35 +0100
Subject: [PATCH 0641/2561] kdnssd: update to 5.92.0.

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

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index f1c7e00db25e..a48bf7f3e254 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f58dcaf51b7188cde16f3b0a9ccf5e7550fe09ca2d9defc3e0ffd4d0fe4bfea
+checksum=5f36af49faab84d8ae7ec46f1ba3300c9cdd3d8820dd1e7e48c5c37bcdd844d4
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From fd8415ece5d893bddc1dc0fab099f465215ae2d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:37 +0100
Subject: [PATCH 0642/2561] kdoctools: update to 5.92.0.

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

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 3bb244a5efc3..5e38783fc1b3 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7620010ddfaec988715be343af4e35f8bac75b5e14d1fa9d3bdbbe620925990a
+checksum=86a3aeb8b91dec0e1cd81b646654ebd750a8aedfac9b4d53b9b0019a91720870
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From e4ac1bceea87c8aeb55a4ac4db978130946ea6ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:38 +0100
Subject: [PATCH 0643/2561] kemoticons: update to 5.92.0.

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

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 49efd8397fd6..2a4fa32fee02 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10287a304fbe0bd6992afe29313c156883591639c9e80ec26e76e683709cf6cb
+checksum=fdcfe30941c18a9cb29b58459fbb2ae54a55fd5a0e8688f0c59a7cc7ebf09f07
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 1779f85b9cebdfa76b479bfdf960c4bcc0b31c70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:40 +0100
Subject: [PATCH 0644/2561] kfilemetadata5: update to 5.92.0.

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

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 46d898853023..ab36e2d86496 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=380335d7f08653d0d85bdcde5b93e72d94c6101cd3719bc4c0b26ef6730403fc
+checksum=d624d3551094cf73d802b6e95bcd78577ce9eb1e9cbb9a8f340dcad066ea15ce
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From a1b1b624e5a229470a4ec001f98f18a16c85e0b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:41 +0100
Subject: [PATCH 0645/2561] kglobalaccel: update to 5.92.0.

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

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index a5c99e6e1fca..2405d1b174d6 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c0610c5dfe078827594e0f32793f0fae87dcee21b75fee491850a7e0cc639a27
+checksum=be7b1e279b63678ec4042f896b159d11c115d05e9831cde6cd67ef4b8e581452
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From f9865931cfec3cfd310a2c912b2d5feff7d87123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:42 +0100
Subject: [PATCH 0646/2561] kguiaddons: update to 5.92.0.

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

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index fb6041e3b4c7..ea01d37e9ab4 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.91.0
+version=5.92.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=7e56c2d826973632ee90b091c50aac53feb88409f5d2ad76d1214452efa6c83e
+checksum=0f6775a565f22900b0de53daa5fe73f7d7e592663e0bb442a8e26ffab27fdf5f
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From 6d19d945c47805ed2a35f5aae4163f5df4889c2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:44 +0100
Subject: [PATCH 0647/2561] kholidays: update to 5.92.0.

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

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 42b08406e942..163b2dad1ca3 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.91.0
+version=5.92.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=b55535746cd3b56270fd19bf377f7256bea00b4f8690449e0580225f6275bb98
+checksum=0ed382c49fb10af87bfa3845a3919ed097c9f808f3a5dbb631ef4e68c86b4b10
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 45ed0918871b3f76207e9434c3fda3f2acad79e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:45 +0100
Subject: [PATCH 0648/2561] khtml: update to 5.92.0.

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

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index d3e481756f67..7415d7e78a24 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.91.0
+version=5.92.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=a40056d988fd77bc4bd3749465ed5452701b7e4948e10dc67fb592925c98b3d1
+checksum=91a1d79ea382a25614810cd59f800f0a34c6e86c69ef6d0a08d2655f2a93171a
 
 khtml-devel_package() {
 	short_desc+=" - development"

From 2817324b17c988579671073b835632c57f287c41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:47 +0100
Subject: [PATCH 0649/2561] ki18n: update to 5.92.0.

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

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 8d57346febf5..8b0d17610f56 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -13,7 +13,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=9e1a8be4e1c0b7bbae262dfb0fffb75c6ec9efe2bd2fbc3fcae3ebbf9f68ed85
+checksum=058032e8e9556f1dadcf0c2bd633da6cfc9673e966dd113388e2b8aee2395777
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 72d29b1a6e8a5f39f441e8e6824888ee491675dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:48 +0100
Subject: [PATCH 0650/2561] kiconthemes: update to 5.92.0.

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

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index a1901117962c..65250bdb3ac6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,8 +1,9 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
  gettext python3"
 makedepends="kitemviews-devel qt5-svg-devel karchive-devel kconfigwidgets-devel"
@@ -11,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=820d592beab1547265fcc2a61f6262535b85d444a05fd67b4eb2f11d9f2510ce
+checksum=2128710ff8bf0a7bbb699fe3a45b231c6b4607ba3e3a3a5d03c25c809233cb23
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 641eb340a7b1f1b45d588d574d54ffb2fa27b3c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:50 +0100
Subject: [PATCH 0651/2561] kidletime: update to 5.92.0.

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

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 4c57030015fc..e9ed68131b14 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1b23a2503defae1fca23bb1574439dcc24a2856c3603587c903f8e8b188f158b
+checksum=e12f14229f7ee587becb5a693374045c460d38c55d61e21eefd78b8db39280d7
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 42b92b51fcaa22e6ba64709f93dfd763606749d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:52 +0100
Subject: [PATCH 0652/2561] kimageformats: update to 5.92.0.

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

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..ebd6e81db298 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
@@ -12,4 +12,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=aba371cbb11afba36c394beac443f1e8d3ab9d84801f44bcc252f13e868dc835
+checksum=ce049989125a49dc9bf8d2a2f2f5a2fec79e25a6343087b024fefd0131eca369

From 1f6ca315e22a5e273461f986d1e592dcd109667d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:53 +0100
Subject: [PATCH 0653/2561] kinit: update to 5.92.0.

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

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index d84e3c0262cf..a0b0aaee9112 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=71c3d83e2303f01bfd936351260ee3a7e0e78de568c90dd9236f7d5e8998c2f8
+checksum=cb517912bf17d4b4f015cb1ab935eebadc52ece050f21b33fcb4e799b0c5f3ce
 
 kinit-devel_package() {
 	short_desc+=" - development"

From ba526da14acaf81c4889308855f289a8b7eced41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:55 +0100
Subject: [PATCH 0654/2561] kio: update to 5.92.0.

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

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 8062a9a9958d..ba96fa5e727d 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,9 +1,9 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-configure_args="
+configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="kcoreaddons extra-cmake-modules kauth gettext
  qt5-host-tools qt5-qmake python kdoctools libxml2 kcoreaddons"
@@ -16,7 +16,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=f2ddea299f3dc98835df445dd1d622d90233115ad0200e75da5e954523466293
+checksum=d4433f9890f71afe3d7d268e978e0ade96f506a38e41f7d57ffe832d96d44cb3
 
 do_check() {
 	: # Pain to get working in limited enviroment, excpects e.g. real disks

From df749d6d4909d49f6a9031b15eba82655f6e0fac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:58 +0100
Subject: [PATCH 0655/2561] kirigami2: update to 5.92.0.

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

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 2022a2ec1501..1b85d94048f0 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.91.0
+version=5.92.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=8cd3675c5ba2c656648a7e54b6ad4d89f1dbc0d0ff36e59acd2252681497d445
+checksum=0adaff98ea70c577c9e6d7a688e5c52529a59f56a7d0c8ffce295f342e203d5c
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 99cd423fd6574bc773436fcac33c5c57eec7a5cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:00 +0100
Subject: [PATCH 0656/2561] kitemmodels: update to 5.92.0.

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

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 4018125a9f3c..beaa9faddb9e 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=081c7fcf4ed9ec4034720bf87c9592b67603b6168e645c8f0129cb2d787e33a1
+checksum=e65c7f58d602b4b8160b34a3a841d1c7aac77695b73e53aa715765cf42a8e89b
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From c35b8c12061b7a228ccf1586dae916700df2f13f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:03 +0100
Subject: [PATCH 0657/2561] kitemviews: update to 5.92.0.

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

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index a0b0e70424b3..ab3405ab8350 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,20 +1,18 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-hostmakedepends="kcoreaddons extra-cmake-modules"
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
+hostmakedepends="kcoreaddons extra-cmake-modules
+ qt5-qmake qt5-host-tools qt5-tools-devel"
 makedepends="qt5-devel qt5-tools-devel"
 short_desc="Set of item views extending the Qt model-view framework"
 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=68883dbd26401dbde559ca60fe1163e881d679d9cb83697cd5f9d9b0eb279599
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
-fi
+checksum=058b4d4228387558b03aceb0ed286cbbe89ea07bb6fed968beba0b51678886d6
 
 kitemviews-devel_package() {
 	short_desc+=" - development"

From 7475d532c80f953698f2509b4ddcd177cbfcd68b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:05 +0100
Subject: [PATCH 0658/2561] kjobwidgets: update to 5.92.0.

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

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 052dbf157349..cbe04600c928 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -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=5b909845e5707689e010d636cd36fb9b3b11fdddd37561b27d71a2234df3f392
+checksum=df24b96f77ddbd2f63a6c2a3c54c4e712ef11a63b93c0b02d949d85af2fb8526
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From c635c972150a783c60c2de2db5fb109b4eef407c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:07 +0100
Subject: [PATCH 0659/2561] kjs: update to 5.92.0.

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

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index d919fb3c55d5..6990b50f3feb 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=322309164f54bcc7b0a8c338f8088160cf61ad6e5bdb95a77c1f72e4aaa57c49
+checksum=04072d527501c92f1e0144e9dcc114e108bfb5a2b50bed8a9b037474aaa6f118
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 1e70f0dea9980e899e6bf424a27d2f9e6f4d3694 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:09 +0100
Subject: [PATCH 0660/2561] kjsembed: update to 5.92.0.

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

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 5d411c05ac57..f606b2123fb1 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=c0d07cba5fc4173279335f8bf696eb6e013696a19eadd3851f4f428942399e88
+checksum=d7c26538a0b7ac804565840d61df2681ea4b729abb6ecfbfcae3c20536ca6035
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 752f4997eed27126dfa4678f03b6ec1328dd4f92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:11 +0100
Subject: [PATCH 0661/2561] kmediaplayer: update to 5.92.0.

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

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index cdd6be6a66e9..5c9a97d7230a 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=018aea7a06b09b9ebf7dcd6c1cf50caed144b91d0e449bfc31354c24f357c966
+checksum=fe38eb2ed593e2e68909129a042d52121b12b9350524a7a1463c24c9c58a97a6
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From aaf1b27aa632a36ae0bd829d382c692d218e6689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:14 +0100
Subject: [PATCH 0662/2561] knewstuff: update to 5.92.0.

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

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index ab225ccd0e87..ba2a38d746ca 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5dd9fb32fe7e99b64f8dc4b8801bbdba5dc5ba2eda9bec2fb1fc563a53ec6a2a
+checksum=4b14aee55d7701c72d05030fad508a5cb89fee34656d4d84c2d977a3c2a66c3f
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 66c41b5297d79f250bfcf586f6fca6fcc130ddc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:16 +0100
Subject: [PATCH 0663/2561] knotifications: update to 5.92.0.

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

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 0d5472d38369..27a83bf27de8 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f5f78ae7ca381524f990ead138ea68796a185418e608646dff216a846bcc0788
+checksum=8c4e095e3d96140f19e9f2e2dbc74df174e29416455671fc6680828038ea94b7
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From ca79d7c8488f65eb80e0ace388e6a81fbf3faca8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:18 +0100
Subject: [PATCH 0664/2561] knotifyconfig: update to 5.92.0.

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

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 291c1b38c0d3..f33e7ca63304 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cedb0993e813f063a14b91b3db13d986a4501a5b8d52dc74992a57d4e0ada51e
+checksum=f7f452e3197886a2afdfaa5a2954d412eb0ae2bc47ce742902765c053239313a
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From a2cafbb91eb0e546971fff74d58f0c6bd2d16b9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:20 +0100
Subject: [PATCH 0665/2561] kpackage: update to 5.92.0.

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

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 290c11ae3c2b..7488611aa6d5 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.91.0
+version=5.92.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/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=51309ab8fbb5774f04ef989b15674df63348cef97f349a293f202817b9a3888b
+checksum=361f75fb4e3dff46e6dab42d858488af58fd40f3af1f7a39881ea9240cd866ab
 
 post_install() {
 	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \

From 989812f67ecc6cebe24ec6677c11369bdf24259c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:22 +0100
Subject: [PATCH 0666/2561] kparts: update to 5.92.0.

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

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 9e64fcbea098..681aec459145 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.91.0
+version=5.92.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=f2ff8a873ae20899233d7ff8936204814d1ccbe1786fa872b5922912c232d182
+checksum=094e18b2e9119f1c197c625235e639204ab5aa1910b13ae4317c8145b4fe3318
 
 do_check() {
 	: # test can not find packages assets?!

From 7d7448c24f50ded85abb165c282aa76ada5b7f4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:25 +0100
Subject: [PATCH 0667/2561] kpeople: update to 5.92.0.

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

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 5dd2667bd74e..717d2756b92d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77bf43f6714e2b82029b7a45d9a72779e28540375dd6d0e63f0fddf418c28226
+checksum=b313729131bfbdb0ffd24ded926a2c6604dd06a18bd612c2ead6aa886f29c571
 
 do_check() {
 	cd build

From b9fa925c3460f3b5c19d52c89bfa1b8697493ce5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:27 +0100
Subject: [PATCH 0668/2561] kplotting: update to 5.92.0.

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

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 1117f4d380fd..6b6fa4db6f88 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,8 +1,9 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
 makedepends="qt5-devel qt5-tools-devel"
 short_desc="QWidget-derived class for easy data-plotting"
@@ -10,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=46eb996698946d7b0dc60d69674b26a06278a7f8f8eb588504d1b1c423adf565
+checksum=c95d63e2e4c4abbf625ec1cfe749314c1a90dc5be4a90a1ea1617bc969071ed1
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 64cfdbea8d24d26feff180066ad4c8e97b28b676 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:29 +0100
Subject: [PATCH 0669/2561] kpty: update to 5.92.0.

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

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index a9e42a08709e..28f4d371f530 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0da072117ddcded5de1d9befd2c1cf0b471711607902d03cb57bcf384d9ac1fb
+checksum=cb1dac5f8f7ba059ef967a2cf3d1580a29a8d7b373ef67e82e0ac4f0285ee052
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 3c8d987e5b6d88565193b36fb895b4b0451dee86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:31 +0100
Subject: [PATCH 0670/2561] kquickcharts: update to 5.92.0.

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

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 8d60b9b72a24..d2d5278ba25c 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=930178d092b6e04394d739bf6ce11f1d89c5d7d167ad38ebeb689d226af511be
+checksum=1a430e2909b137466cf41c334a60ebc01e4cde82e71acbb167cd64d1f13e8678
 
 do_check() {
 	cd build

From 7a4df1365a5833ac25537fee4433c64637c2a68c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:33 +0100
Subject: [PATCH 0671/2561] kross: update to 5.92.0.

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

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 55fc9c207165..14c6ba42f541 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=54e17773868cc6ecd91a5927ee475cce49ce225f5ee429ff725aee2a8110c819
+checksum=129e2840eb1f33c95d50cde79a82f784cf735c3f1ae636f15dcf695c0b0c1ebf
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f7c7a3173a717eddbfefd32772b58960a42fd834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:35 +0100
Subject: [PATCH 0672/2561] krunner: update to 5.92.0.

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

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 48e0ed1e077e..4fab48018a19 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0677f9409d1d60e53608632cdbc04aa7454ed4355609bee6bbceff994be12a9e
+checksum=3fc80c5d66359e4593115b58fcd055ca9cab8f23376123094e13c5d4bdc48fed
 
 do_check() {
 	cd build

From 6d446ebc0249360680d1114cdd2dcddfbcf7d911 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:38 +0100
Subject: [PATCH 0673/2561] kservice: update to 5.92.0.

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

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f5fe49932018..adda7f1fe8b9 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=779d11c436887c5300c6f3bf477ba334673444b3e9d3212a0cf12a1f653b9254
+checksum=52e2d9654bbade7db91c647192b78bc3ac1feedc0c279e9c371142aa5ec82ef8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 225b593cd19e8553e02b6e73e56ee197d1ccf095 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:40 +0100
Subject: [PATCH 0674/2561] ksolid: update to 5.92.0.

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

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 840ffdae067a..d954a2e1318d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=4f561eaa048a6c0e35c3bb14b8bc1f637708afff689f464576bba2e7ab0293a8
+checksum=8926c859af4b6b14e0967fc3b76ca0e76de27d0ab544087eefdffe40518b5a9c
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From f25c18c5c4618718d4edc0e771b0f0d078a39112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:42 +0100
Subject: [PATCH 0675/2561] ktexteditor: update to 5.92.0.

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

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3b5fdaee2411..3dcd6b5a7433 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,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=f532a1e0621d8a257387758fa616c43729dc2811c22894c656ddefe2c3367fae
+checksum=bcd01c3ca07d02106de1c68156e568ded7686ca9557b30a04f7b4e24cf43fb8c
 
 do_check() {
 	cd build

From 3de8627164ffa9323d1a6a79bc800c1b07787123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:45 +0100
Subject: [PATCH 0676/2561] ktextwidgets: update to 5.92.0.

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

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 0e36a76dab5c..2768b6f1ddcb 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c41a6ae85345c33188c251e011a43672641fe489243c3436a1e1f15aa6cabf76
+checksum=fe867bf498a5170a9fba91dff652b68fa5cae2af8864dbe89a6e54638ff90b0c
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 8cd31cd13548e66491963dace77958d0824fdf1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:47 +0100
Subject: [PATCH 0677/2561] kunitconversion: update to 5.92.0.

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

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 45b3b894cbc4..73f122a4fc6b 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.91.0
+version=5.92.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=57456b649efe2488f403e7b3cae73a734b3b459d32100b6b143f1c8d80035b58
+checksum=47e2b4c4b329562044954a67edda4d5ade953bd2a9760f6214c5f8f17239f09e
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 8e7817b0d3bbfd153e611e84af679ef0a3b7b9e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:49 +0100
Subject: [PATCH 0678/2561] kwallet: update to 5.92.0.

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

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 3133eb1e48fc..6d2b98d6a7a3 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.91.0
+version=5.92.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=3736051cfc42598368704b36c36f41482f778c45ba22a4e591389725945938fc
+checksum=71aca76cb0edbf569827709b073bff2edb5c129a85638df4bc666d70786740e5
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 1518795002703bf6dfa23ad6edb623bbd9d38bb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:51 +0100
Subject: [PATCH 0679/2561] kwayland: update to 5.92.0.

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

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index b23c3b67f2c3..41c3aee75184 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.91.0
+version=5.92.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=3efdfa6539fb0c053092ef5f178d0ea776a93a35754eefb1be348dcbd46403a8
+checksum=95e097cefbe4e260129d77ab9fe3013818b85b9aee6e4744acfa1ada96fed195
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From de8859745ec532b170c7fd831bbfc9fc7cd03c93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:53 +0100
Subject: [PATCH 0680/2561] kwidgetsaddons: update to 5.92.0.

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

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 7fe825d363ed..324be77968b3 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e3b4dc3db4d608b2a725e9087ca3add1105e4027e7e47d10f96c2eff344af20e
+checksum=d0e3558d6a7ed550f31d319e6b52d6ed61d693a1aa50e6dd4f430a1324111f2c
 
 do_check() {
 	cd build

From fd883aa7861521f5795b14f477398ba93a72e8f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:55 +0100
Subject: [PATCH 0681/2561] kwindowsystem: update to 5.92.0.

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

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 71e5dcbd752c..dd6ffc7afaab 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=257990566f0ef96ca23e84eaad7a66a28dd67493b6cd5c6fdb3a2fe5b613c0fb
+checksum=dcdbbd2b4f2372fc225141361a7d9ae4a8f28ed77a266dc22c20be473fdc7d80
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From ccbf59ed414962c68a020c390be5fe5c85f307e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:56 +0100
Subject: [PATCH 0682/2561] kxmlgui: update to 5.92.0.

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

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 79b5b2b3e0f9..4f30b9703ae8 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2f68b187570e22c7037fdbcff83ebaad8b5c77fe1bec166c059da6d475149ce3
+checksum=e08b4c0d3cc39f788d918bd2ba331966a8af5208233c38a27f029f93a597b743
 
 do_check() {
 	cd build

From e8fa2a86d6aa7ee2b23cd8d40192516859243a20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:58 +0100
Subject: [PATCH 0683/2561] kxmlrpcclient: update to 5.92.0.

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

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index e658982b3b62..619fe8a1d3e6 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=f0c2a92910283997c21c4f49b2bb074c1edede63706da89f965711cc8babdeae
+checksum=0e32dca201f8b3d241e985c8dd8854774569d08167a9f3f060a141551e19beab
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 782c5f85c7ffcd0c7827a82dfd1eddde7a180cd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:59 +0100
Subject: [PATCH 0684/2561] modemmanager-qt5: update to 5.92.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 c9a8158b6bfd..920b6b1f5705 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a2673f18c7866d39c9cedca2f86540c56baf966a2491a86ca06a5a0427358496
+checksum=7ed0b4f48a781fa9166e0446ac14fc21036195cb3d800ce21a546cac02fe5898
 
 do_check() {
 	cd build

From 7fcda432f4f43bf5620f8fc6eb4257df2af1fdb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:00 +0100
Subject: [PATCH 0685/2561] networkmanager-qt5: update to 5.92.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 1b0b32a2346e..bc475ea12153 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=2e20ffd995ce64a90b1133b594bab2b2292be54e538f62633e78e8296cc44738
+checksum=51ddc8ec0ea60c87c49d5a6709eed86fe1e066d57d059a7f9e774c97b81bfa64
 
 do_check() {
 	cd build

From 9794112eed51c28e826d727593ff9401617905f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:35 +0100
Subject: [PATCH 0686/2561] oxygen-icons5: update to 5.92.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 30893cc109ae..94d05f08582d 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=51713501fe067cd34d3c296bc2b891d62ed2e3c4f26ead36323f8adc3d157248
+checksum=ca88b03fdd961f9f8bfa449e1fe74e3ce66e11937be9a8f6d1569a46f6429ef1
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 670a9643a707472bc6a757ce223e3bf62e6a7bf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:37 +0100
Subject: [PATCH 0687/2561] plasma-framework: update to 5.92.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 fd74fc2a4057..2ab058fb3036 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f4471872b4f279e2979f661f2792f0afa8af5f15896bd9e6a08e1ec7ed85b079
+checksum=c6c2bc624564c74fd80bce170a1c763803d5207ef86108b5724fcba73c3506f7
 
 do_check() {
 	cd build

From f0ae5bbde0a0eadc19dac33d51ee7219a892d498 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:38 +0100
Subject: [PATCH 0688/2561] prison: update to 5.92.0.

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

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index fa4b89d45a38..5f1e84c53f7d 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=8f61c6c351e018df29a837a2d276d088b61fc844af406ea2d4f221f8e5b83f4c
+checksum=7e6fee9fd56be6c4589c106a3c16a28a4aa5832a24dcefe88302a9ad113ee41e
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 6858410d8edf6d478f7d20433a107dc680f24375 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:40 +0100
Subject: [PATCH 0689/2561] purpose: update to 5.92.0.

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

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index c4dbc383d75a..dc71877ba34b 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=952c012d347f0ca6f1dc1aaad7e0ab538699bcaf9099fe8b25ddafd4cebfdcfc
+checksum=94613e180550f9d15443ced1f2d93b566350d9a981205b4f98923714dc4f400a
 
 do_check() {
 	cd build

From 0345ad3f84c1598eff2c7fd21bb747c26b758ee3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:41 +0100
Subject: [PATCH 0690/2561] qqc2-desktop-style: update to 5.92.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 3ac4ebda2d10..5af0197811cd 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.91.0
+version=5.92.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=11d52dfd9f576ee4933b32c6dd2458c5e25836935d9dcc27f3c845e8dccea965
+checksum=97530813b9a80505b5484175a55be49cc020244fbe3b1bdaeef15845c3c9bdac
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 29e3471aacdaf12ca8fe9fe032bc2eac1eb69c56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:43 +0100
Subject: [PATCH 0691/2561] sonnet: update to 5.92.0.

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

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 8270d62a11ef..b7d08f3d959b 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.91.0
+version=5.92.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/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bda19e339d19ffcfa6bfa74eb6f0cdaf75e2537450d2deed03f45f4a6b91fd18
+checksum=31fc1dda3db582337529922d38b6eac72b1551c4a0d86fb9307363e061d05722
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sonnet"

From 1d1ac939f94e41304e7c4111103b9602e135f1e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:44 +0100
Subject: [PATCH 0692/2561] syndication: update to 5.92.0.

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

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 1fda9ff348ec..3a35ebf2c174 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.91.0
+version=5.92.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=fe05fc898c8e5adf23b977138e8b595448805fc2d48c62579881f500ab5953b8
+checksum=1c9ab9772103c001e56afbe0356ede04f953b07be8d2c2e2f2fff3e7b5bd5d46
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 4f20bd5a334d442b12a9a02a7178ef863102da3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:46 +0100
Subject: [PATCH 0693/2561] syntax-highlighting: update to 5.92.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 d390c1ae40ab..5ad6ec877834 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=370a45b274db90e8d2d34d61d3f665a3f1f9f552d4503ce5805a47f445c4f93a
+checksum=99347eaf9b2249f875cacd8319c77f2f8e110d0e7834f51f296ed911dcc7e50e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From a92cccf73057f145f17998307a31b7890fc8b2f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:47 +0100
Subject: [PATCH 0694/2561] threadweaver: update to 5.92.0.

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

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index da71b23a4849..9d65ff2b49da 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=22485000cf28d4b28a46e7856532339df5e3e49180ee4a0493f3f3491f9e00a4
+checksum=48b0cf3d969437eaeb0839cbb16a35209336fc6e78c1540920f91bbab8b01101
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 1af1b237b1e35ce12dbfb55e075f73c3d5ae765b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 23:18:45 +0100
Subject: [PATCH 0695/2561] bluedevil: update to 5.24.3.

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

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index d504a731df32..a3eb6e450432 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.24.2
+version=5.24.3
 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=24d7501e65149093e17c8545199d1bcae27fe828ded65d6a20446c8fffe1fa2a
+checksum=9dd1566eae8bb793330f2f54ab34cd75ed79e7f3924bf78149077b122cc49ec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 63bfaf2d78731b20289bddfd9601f3525de24c98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:42 +0100
Subject: [PATCH 0696/2561] breeze-gtk: update to 5.24.3.

---
 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 067afa6ce666..8e1a152f177e 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.24.2
+version=5.24.3
 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=2c1f02be02bac5d9098e90901b047ba587f57dc3827dd89b5a868ca80a2f2dc8
+checksum=2911bb2f99ad42ec820cc2adcbf1f8a6f18ba437f72ce216562e12584fd042a4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 4c1597747f7054d14aa6024bbb67fb86bf8af3b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:50 +0100
Subject: [PATCH 0697/2561] breeze: update to 5.24.3.

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

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 9efe5daf780f..0317ba5620d4 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.24.2
+version=5.24.3
 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=5fee72b7bc88fe8d97b575f46de62037ac2f898c7a5ff024e62f1082d60984b9
+checksum=4b8f92e55c72ed59b7bdfe4be6044fcb0a0816fb6f1ea2bdd9884b58b9a92940
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From e44ec0acfea2f3a278561b95451e71cab2419f0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:52 +0100
Subject: [PATCH 0698/2561] kactivitymanagerd: update to 5.24.3.

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

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index ddfa1727d026..879d45275ce3 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ 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=a14714645797114b45c4bd0d87fe2559f4c4b5d4625e100045b25c66fd25a958
+checksum=9cae3e136ee6743474fd96a573b235b6ca8653d4f61f412d9d3ec866861cae63

From 40175115adb77098c9f21e4e9e46d3ce50a00968 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:53 +0100
Subject: [PATCH 0699/2561] kde-cli-tools: update to 5.24.3.

---
 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 15d12bab1ed4..847a7213209e 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.24.2
+version=5.24.3
 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=9549c0474695df4855b66ee2196caa14a0bc3e0179920ae564d149bc5ecf6984
+checksum=fe64da7ce3ad7e7b2d743e06aec0f6666e1909d3ad08867a0173c5c262f7e803
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From ed74cc76fe647fa84bcfca5c9a61d328a794f81a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:55 +0100
Subject: [PATCH 0700/2561] kde-gtk-config5: update to 5.24.3.

---
 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 17151ae771cc..a68d66dbb124 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.24.2
+version=5.24.3
 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=eab1d06c3e3f5c02b3a6608f6b2bc8d20d82f7e2f3ea4c666d4d2f69f476776d
+checksum=fb4bcd30c93e15962153e81ca218f03465f02d1d2d011f267bb96946869ba05c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From c5cea2808e51b4f88d2f5f9c21d4beb4e5fc816f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:56 +0100
Subject: [PATCH 0701/2561] kdecoration: update to 5.24.3.

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

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 5e422f52cb3f..a358d713d04a 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.24.2
+version=5.24.3
 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/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ac5f02324a5d64e81408c30f3c9d077da460b77278eed7f195344d3f5acc8d87
+checksum=bbfc3d83f76dc8d2568bbe2f5395af5887eaba79094fcb901930585f8b53f636
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 1825621146346276a677b9a2190b385a8972563e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:58 +0100
Subject: [PATCH 0702/2561] kdeplasma-addons5: update to 5.24.3.

---
 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 c083d1b0b01a..065f0fede44b 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.24.2
+version=5.24.3
 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=13e62f9091f26eeff7d4bf4a51569c2af561dd051d1c1d94b98071a7465d6cf3
+checksum=86fe08a744e31ce22124bca4337633f6a2523fbc87d915d3ffd42e65da66f23c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f0d099dd92926468fd868e506854d258c6138578 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:00 +0100
Subject: [PATCH 0703/2561] kgamma5: update to 5.24.3.

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

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index a6345f6366eb..30fa3d8e6577 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.24.2
+version=5.24.3
 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/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a31bc51521cdfc55bbb29aee2f713378ba34fcee08326dbb10a2d6486a7a4957
+checksum=66da3bdfaaddb70c6bbf5739eaa970c8a7f67fd8295872ee201a1445c2df9867

From 5b210342d4b4d5a2024f5595c74d6210091235c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:02 +0100
Subject: [PATCH 0704/2561] khotkeys: update to 5.24.3.

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

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 1fef1d71c1a8..1a59a447a853 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.24.2
+version=5.24.3
 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=05ef66dd409b7de9ce6711b2b8931e68cc9eb7978adcb7ed17576a788e5870b2
+checksum=17f45fa898147b7bd9e1bd4850aef10d03c25dbfe088ef46803a817f7348afcb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From a9f6f0a76e06d1d734fc5a398ca73a9b2efc3ac8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:03 +0100
Subject: [PATCH 0705/2561] kinfocenter: update to 5.24.3.

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

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 338b9ec75c01..eac578309f8d 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.24.2
+version=5.24.3
 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-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af5dd1af07e308c42f55d5c2ec472ab5b4ab67bef03d29545f9bc5e6d03ebeda
+checksum=d2f5acb7a52434e6b539dc52d23cf09754e313411b32d169f36403ba0801e223
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 6736fbdc257b2a544c8a124f6a26966f5a634584 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:05 +0100
Subject: [PATCH 0706/2561] kmenuedit: update to 5.24.3.

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

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 0b852ac0c1e5..02793528e9ee 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.24.2
+version=5.24.3
 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/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5e0eb1979bcfe4b66ff010197d8bcb0bcc3f9eab4c5d95c454c7b145d228a672
+checksum=8bc5d0dfef18e4e1f561cd86f2d023b8d5f951ffd7bcc497633e4ad263cb3bfa

From 7c8e51d49513cd23b426199b919126190b4b019b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:07 +0100
Subject: [PATCH 0707/2561] kscreen: update to 5.24.3.

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

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index fcfff4f8cf80..00eb087ad0a1 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.24.2
+version=5.24.3
 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=f8549747eaaca0a7172e57d404207a684ef659ee107c2b2815526d5d5180f489
+checksum=0e814b3db2c952857bc399e9d3bc349b80ad7367ac755c22dae31004c7684bf2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 55c36676413595fccbee0fe010a12c261b557783 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:09 +0100
Subject: [PATCH 0708/2561] kscreenlocker: update to 5.24.3.

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

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 26e5ea06f440..29b2b0c4f678 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.24.2
+version=5.24.3
 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/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcd9d5be26409819903b445d2ebe888ea2e7cba289304b80462e9d701e06d3e5
+checksum=03157ca122085fd6d8eeabb369c363ef706a773ad509eb5c08722a0e4bf903b6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From d90a2feaeb92d4054b479499207a1cea7094e457 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:10 +0100
Subject: [PATCH 0709/2561] ksshaskpass: update to 5.24.3.

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

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 4c8ee2c30d3c..18b7a81583c3 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.24.2
+version=5.24.3
 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=3073957d9e0a18119466db2be4d9d066f3c8f594fa0459031040852c94c3950b
+checksum=3bbe16721dabd7fbae659be3f21b4a386d8ca0a6d288c94ccd3954ecbd4d7847
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 91f67039a8c9ec2a2b17625ef79d2370bcb9ef7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:12 +0100
Subject: [PATCH 0710/2561] ksystemstats: update to 5.24.3.

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

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index f53ab6a923ce..65541c9fde51 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -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-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ff6befbea33add48a7a6fec574576cccbfc6eea6e28018fef06b16cbea2d2057
+checksum=4c303bd73bafb254ca8bb5dee0de3b7a2ec4123e719827d26268625047bb330e

From ddc7c52865edbcad794ddffe56c2be0860082931 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:13 +0100
Subject: [PATCH 0711/2561] kwallet-pam: update to 5.24.3.

---
 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 39d3bbcbe4d5..c32def9d2ba6 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.24.2
+version=5.24.3
 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=afa0dea0d9faaa25f1bb75901cb5d0f031ab55bd6287d75fcd26521f9e92586a
+checksum=33dd50c4d9258d1e3326980192e2523490754cd1724ff704c7e36984e5cdad7f

From 24d91daffddd4a4999cdb1e4edc8c68c522612e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:15 +0100
Subject: [PATCH 0712/2561] kwayland-integration: update to 5.24.3.

---
 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 22e58dc16ea5..95e908c22286 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.24.2
+version=5.24.3
 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"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fb8cab0a35b6fee268243481707613f6cea9715cda96d124a0a508e3b2a1ba93
+checksum=9f6f167fd16aebf550ae9bda176237ea80efae4a08826050ccbd2d7a73de05cf

From 472550825159890870ed569e85cf700c84c725d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:16 +0100
Subject: [PATCH 0713/2561] kwayland-server: update to 5.24.3.

---
 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 162db2394880..7bf6ed477fa5 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,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=147b0312fe456ca5018da641fb5758d94d55eca136d075729d322829634ee247
+checksum=560b20a15b459c5a1e8d0b38e9d53c3a75660bc798fa544e7a9d5c36260e063b
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f09f0027cbead1b21352e2a00ce85b474112075f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:19 +0100
Subject: [PATCH 0714/2561] kwin: update to 5.24.3.

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

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 3630868e413e..435bcc4eb3af 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,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=2aabb59ef884cb2fb3f53b9577d651a1c39977a482bca93d6634ed3593054411
+checksum=d84db7e32a13177a0bd030e6c65907cc37c28efad51ee17c518e402235cbf46b
 
 build_options="pipewire"
 build_options_default="pipewire"

From cb77fc8861e46abe7f557369616f29325ca864cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:20 +0100
Subject: [PATCH 0715/2561] kwrited: update to 5.24.3.

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

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 0b3ccbfeb3b5..5a556a8be1d2 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.24.2
+version=5.24.3
 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=9d88edeacece79f2a8a1cc989b36896c2ad911b31d1c8ba78b4c3406a9b97205
+checksum=2d768547e131aed99d165b0aee7b080e512a2a5ffab292bff8f71033631cede9

From a85318ee38e7891082e7504bc86515b01e24ae1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:22 +0100
Subject: [PATCH 0716/2561] layer-shell-qt: update to 5.24.3.

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

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index a9786a4e56e9..3642d9819344 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=eefee96cf04cb1dbaede72b50354ddc7129915f1b88c340ff206724c29620f2c
+checksum=5de105ece2d7e6ca2d65305186462b0f9240930276adf7d5eedf77ffeaa67d40
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c00d64189eec051a9c97c2ae30844b9865d8ceef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:23 +0100
Subject: [PATCH 0717/2561] libkscreen: update to 5.24.3.

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

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 5b3ab7883fad..5b76a89d08d8 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.24.2
+version=5.24.3
 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/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a64c2263a0de898a4a0e73f85949b4d3868aef87aa221d597e8c16f412103b04
+checksum=a6874f0f4066e16ea191341d4d7d73deaf304e117ab64306d311c862393de7a0
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From a34a928db74a13cfe3faf6251f2d8fcd43df2528 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:25 +0100
Subject: [PATCH 0718/2561] libksysguard: update to 5.24.3.

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

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 4fe82b36bbfd..2fac80ddba4c 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ 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=13983f626906db864eda20bfa2e994ccbe4ddc534af7a052675b3475b7e9472f
+checksum=148651cf33c7400d7a0df507d0bb75a6924e1ae80f5a46eefeaeb44c848ff1a2
 
 build_options="webengine"
 

From 28bb7791f8e027eb60daf663ce4e8988d84f507b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:27 +0100
Subject: [PATCH 0719/2561] milou: update to 5.24.3.

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

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index abe6af2c8b0c..05ef7d33c83c 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.24.2
+version=5.24.3
 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=9a8c4b0561ce85f37ccd4500b715c73b9ed77aec79aa46eb2b0e04d9b94381e4
+checksum=31d70b760653e0fe4b9c1b59d7601bb52d307a3d3be3b8f67550a4ea9d22bd1b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 37e4fac44c08279bff390b400e6ffaeace6732b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:29 +0100
Subject: [PATCH 0720/2561] oxygen: update to 5.24.3.

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

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 521ae7f336b0..afd58f630f81 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.24.2
+version=5.24.3
 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=73d821a412a86df1511e6979d985de496d226ecc4201fe64e43b9400e1860cda
+checksum=018dbd3c276707bbcc8515424ae45a0133cd9a2e31ffd7a0bbc25522586e400a

From 3a37117353f6be908b8e555ca05508caec26136a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:31 +0100
Subject: [PATCH 0721/2561] plasma-browser-integration: update to 5.24.3.

---
 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 41d3d104a688..e7e64687c577 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e8a48296d1a713d8b8f002d559a4cd12cd7f4892c591ed985c5ce49f7bffe738
+checksum=40b07a0065bf24a78997fb210b0550642872ba8c41ba1df6c2cb6785d85851d7

From 78dbe028428abf6ba57c08ca4840a4956504bccd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:33 +0100
Subject: [PATCH 0722/2561] plasma-desktop: update to 5.24.3.

---
 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 fbef3a8d3997..58edbeb7f5d3 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ 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=524193c24c95f67137410786f94c70d3c96827bae133a48bb53226f32c33fa10
+checksum=583e7ecfd2e2b766d645284cf13605851d96e2ad7cf2e657b4665aa3f3fd91d3
 replaces="user-manager>=0"
 python_version=3

From 471889fc9af5580ec532200af25aa12e2800d2ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:35 +0100
Subject: [PATCH 0723/2561] plasma-disks: update to 5.24.3.

---
 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 bd58a31096c7..9498075cb52d 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.24.2
+version=5.24.3
 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=e2135701903316f46df042f8b0eade162a1f1412644d9f4d9fa0512856b81522
+checksum=9e71a018eb875dd70d7b30f23937098ae8d6d9eab2306b541f916ddf6b64745a

From ea2fb9d6111ea421f7ab3fd59a7b0a1046f9e139 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:36 +0100
Subject: [PATCH 0724/2561] plasma-firewall: update to 5.24.3.

---
 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 051b5af7faa0..474ae2d9cf17 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcmutils
@@ -11,4 +11,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=7ac775e652570c704d6d3e1b0809e10e3718c630f89fe4c2b11dd3f91f5c85d3
+checksum=bff36b7a922a6d0e5e20df539c6995d775f62a1d63c970b55bb430abd580ef64

From f0ac07d04c63f1054bd9d043e0ddbba97ff5dd30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:38 +0100
Subject: [PATCH 0725/2561] plasma-integration: update to 5.24.3.

---
 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 493d73cfbbd8..59c8998026ba 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.24.2
+version=5.24.3
 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=b6408b32e13b9713cd34f499c7aae216218a04b6c9655f37689d95f8b323f947
+checksum=7aef8f3b6234b402b978d12e72d9c5eb2b82cbe587afa32f288e2e160b103c0c

From b1dd6cb3c95cbb9e333695a466361ec833b3188e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:40 +0100
Subject: [PATCH 0726/2561] plasma-nm: update to 5.24.3.

---
 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 1404adc97bb3..cc71c9f54926 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.24.2
+version=5.24.3
 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=114ead32c90d521ae0504baee971da71a2c0f1a37d25bbf1868012ed030048cb
+checksum=2cf64e94ed921546bc0be44f50e3490033a353bf3f0ad7a5a513ef5585fc3bfd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 57e9b90e3fc721ae06d474d5aa3858bae6cd60cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:41 +0100
Subject: [PATCH 0727/2561] plasma-pa: update to 5.24.3.

---
 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 5285d7534394..dd3e8e33c8ac 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.24.2
+version=5.24.3
 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=015dff4f7561a0fdca28a0d49e98df3bb112300c9e29588f685e58ae037603e6
+checksum=e18fbe9cf9f2948c2d3567ba0bb71126ffef8d7c4df8084a8fa0fd48c0ca0759
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 6b8c8351b9f8994b33e666f3aa596af8c448fd2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:43 +0100
Subject: [PATCH 0728/2561] plasma-sdk: update to 5.24.3.

---
 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 3bf3208853f7..4d713043e9dc 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.24.2
+version=5.24.3
 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=83486883400fb837df6541f462df390b28df5d9a174a04e55e971ffe483c777b
+checksum=f9bad013598b8d4e8b0be4ceaa5ad5f1a3326911f7b41e754d57d7a5f1f5d63c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From be8c9f66f4c95d55a97699253baaefd598c7dbc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:45 +0100
Subject: [PATCH 0729/2561] plasma-systemmonitor: update to 5.24.3.

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

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index e81d4b72595e..4cdb8fc83b47 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -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=16902047b659cbe7e3452e527699aa8891546323a54efc60d0fdcfac8fe0ccd4
+checksum=904c0cbf56469b4b021559cc898aef57917cbe36526317c5bc7d34f255c0439d

From 05c74fa16bbd570ec930be34ceb5ee220d476202 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:47 +0100
Subject: [PATCH 0730/2561] plasma-thunderbolt: update to 5.24.3.

---
 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 a8a79a05ae4b..7fbd11daa1a5 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.24.2
+version=5.24.3
 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=7111626252470f7c1de5b3c261b29db3ac9bdac5e1453b6853cda8aaaa5681be
+checksum=52bec310386158c7f85cd6a8a7db5bedabdb8494f4c6818d8466aa33a6dba5df
 
 do_check() {
 	: # Requires running dbus and bolt services

From ca9a6b14bb73f2ba03c57fc2295e9c1a511769c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:49 +0100
Subject: [PATCH 0731/2561] plasma-vault: update to 5.24.3.

---
 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 3c971780ddc0..980ab7d44e7e 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -14,4 +14,4 @@ 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=be8e517dff5e3fcfaeade1d9a992c5d44c52b3efbdeb345a79dad94141722e52
+checksum=8d4998fd105073ce8ae6012426c0bd024529e0ae67c3c3ea9178918fcf87be38

From dde02ab62c7035d08933a99a9bbd2613fda26554 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:05 +0100
Subject: [PATCH 0732/2561] plasma-workspace-wallpapers: update to 5.24.3.

---
 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 9522d47d2215..4d21268470de 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.24.2
+version=5.24.3
 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=3664b2cd1005f2632475e2024fcec623090407d4398e0bc70dcfe45dfbb8bf67
+checksum=da252edb70b3373c38fb30318a44f52f047d4f31cbbd26c01c30bf2398c43848

From 05333e50d70dd56e7e3054bfafeb262b889c5aac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:09 +0100
Subject: [PATCH 0733/2561] plasma-workspace: update to 5.24.3.

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

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index e6609778d1ae..a8ae6f591b0a 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,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=e7fd2ad7c067710401f7322789ce796c3ad5e02a3813bdfb84ebd5dbd8787d11
+checksum=104c5c0ebb000f48c749a6bafdde4cbb1b06d188e1a23ef95a2d035cce442ab4
 
 build_options="pipewire"
 build_options_default="pipewire"

From de76946034cfc36028e548d2978d58b19a4125fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:11 +0100
Subject: [PATCH 0734/2561] polkit-kde-agent: update to 5.24.3.

---
 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 2dc1f55fbcfb..53ebff5a685c 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.24.2
+version=5.24.3
 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=43685eccd228edf74c7fee80f6cafb217159b540b487cda067c18e3ec6b7ba7d
+checksum=788d392c811ee7c8098d294ccc9fff7f7a695977689a66cb4a1cb52d6f4779d5

From 45dca5eef119b8ffb43a3156805e047608e6e742 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:13 +0100
Subject: [PATCH 0735/2561] powerdevil: update to 5.24.3.

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

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 5bd44767528c..3eb123d13d50 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.24.2
+version=5.24.3
 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=8c742e057f19e3852ed6403e7a3f86fa70a478ae0c6c30a492491a5b02b7cd8d
+checksum=495275be84a96572d2e2a7ee343e1ab98c79e7c8eef402a7f26d86863e25f010

From 1e03b9d34a4e8d863e3caaa1c679ace4db93b686 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:14 +0100
Subject: [PATCH 0736/2561] sddm-kcm: update to 5.24.3.

---
 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 b44457380eb9..95d916cf3e1d 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.24.2
+version=5.24.3
 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=af95a174536c7deb01d4274c1e0efa71a06a8728dbafa144dc37a37b803c3e22
+checksum=d0d01ceda262734e87f0cfc28138a1b5478651722a703a55ac744c4e676ec696

From 059ac791abdefbef41cea2ac3bd10bc5d470d254 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:16 +0100
Subject: [PATCH 0737/2561] systemsettings: update to 5.24.3.

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

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 1574038368cb..57c764dcde4e 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.24.2
+version=5.24.3
 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-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b31e3bbd0ed6c69718341e7290f8a8888e972ca3c1eae10f2a5da912b17d2e5c
+checksum=6200618137f9a1411007a78f9b50eaf78048ce9819428d997a44816d6093d585

From d698eb748765da2040ce4035f32753b6e6f24211 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:18 +0100
Subject: [PATCH 0738/2561] xdg-desktop-portal-kde: update to 5.24.3.

---
 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 10169eb0f394..23aaba046f68 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.24.2
+version=5.24.3
 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=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3
+checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b

From ca87c55165507db2905912ea3ae453b04614054e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:36:54 +0200
Subject: [PATCH 0739/2561] kcompletion: add cross patch

---
 srcpkgs/kcompletion/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kcompletion/patches/cross.patch

diff --git a/srcpkgs/kcompletion/patches/cross.patch b/srcpkgs/kcompletion/patches/cross.patch
new file mode 100644
index 000000000000..fdfcab160c0d
--- /dev/null
+++ b/srcpkgs/kcompletion/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 13:56:56.000000000 +0100
++++ -	2022-03-28 22:30:11.749301510 +0200
+@@ -45,7 +45,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)

From a5c8f257315cc565ea64a7efccd617d36a84ee69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:37:21 +0200
Subject: [PATCH 0740/2561] kconfigwidgets: add cross patch

---
 srcpkgs/kconfigwidgets/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kconfigwidgets/patches/cross.patch

diff --git a/srcpkgs/kconfigwidgets/patches/cross.patch b/srcpkgs/kconfigwidgets/patches/cross.patch
new file mode 100644
index 000000000000..cf9d7d54a873
--- /dev/null
+++ b/srcpkgs/kconfigwidgets/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 13:57:20.000000000 +0100
++++ -	2022-03-28 22:35:00.337296905 +0200
+@@ -41,7 +41,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ if (NOT ANDROID AND NOT WIN32)

From d00a2eccaa704737f03666f999f65243e1c79cd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:37:38 +0200
Subject: [PATCH 0741/2561] kiconthemes: add cross patch

---
 srcpkgs/kiconthemes/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kiconthemes/patches/cross.patch

diff --git a/srcpkgs/kiconthemes/patches/cross.patch b/srcpkgs/kiconthemes/patches/cross.patch
new file mode 100644
index 000000000000..48eb81784cdf
--- /dev/null
+++ b/srcpkgs/kiconthemes/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 14:01:35.000000000 +0100
++++ -	2022-03-28 22:31:40.368478068 +0200
+@@ -30,7 +30,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ ecm_setup_version(PROJECT

From cc3e6a2b5959c1f71c3f664f7cde87ee8e7345ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:38:04 +0200
Subject: [PATCH 0742/2561] kitemviews: add cross patch

---
 srcpkgs/kitemviews/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kitemviews/patches/cross.patch

diff --git a/srcpkgs/kitemviews/patches/cross.patch b/srcpkgs/kitemviews/patches/cross.patch
new file mode 100644
index 000000000000..4abaf14f3519
--- /dev/null
+++ b/srcpkgs/kitemviews/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 12:17:35.000000000 +0100
++++ -	2022-03-28 22:29:14.364077451 +0200
+@@ -30,7 +30,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ ecm_setup_version(PROJECT VARIABLE_PREFIX KPLOTTING

From af78a34532095c931bfecc4750953a008af729b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:38:17 +0200
Subject: [PATCH 0743/2561] kplotting: add cross patch

---
 srcpkgs/kplotting/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kplotting/patches/cross.patch

diff --git a/srcpkgs/kplotting/patches/cross.patch b/srcpkgs/kplotting/patches/cross.patch
new file mode 100644
index 000000000000..61e1c12c761d
--- /dev/null
+++ b/srcpkgs/kplotting/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 12:17:35.000000000 +0100
++++ -	2022-03-28 22:33:55.042066950 +0200
+@@ -30,7 +30,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ ecm_setup_version(PROJECT VARIABLE_PREFIX KPLOTTING

From b7a41c4e4ef9df7375da3e9c50de20f20a375436 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 15:52:15 -0500
Subject: [PATCH 0744/2561] New package: jc-1.18.6

Clsoes #35804.
---
 srcpkgs/jc/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/jc/template

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
new file mode 100644
index 000000000000..8f510a980bc2
--- /dev/null
+++ b/srcpkgs/jc/template
@@ -0,0 +1,14 @@
+# Template file for 'jc'
+pkgname=jc
+version=1.18.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments"
+checkdepends="python3-pytest $depends"
+short_desc="Convert to JSON"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/kellyjonbrazil/jc"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=5347188ed55762a0325d5d8f6a1ff3ec221b4ad548dee085fadc5fe10366af93

From b4f4dcd9f4b300d6a21adff9df4a45a3606285f3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 27 Mar 2022 21:19:56 +0200
Subject: [PATCH 0745/2561] zlib: backport upstream fix for CVE-2018-25032.

---
 srcpkgs/zlib/patches/CVE-2018-25032.patch | 343 ++++++++++++++++++++++
 srcpkgs/zlib/template                     |   2 +-
 2 files changed, 344 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/zlib/patches/CVE-2018-25032.patch

diff --git a/srcpkgs/zlib/patches/CVE-2018-25032.patch b/srcpkgs/zlib/patches/CVE-2018-25032.patch
new file mode 100644
index 000000000000..9f37ba5c583e
--- /dev/null
+++ b/srcpkgs/zlib/patches/CVE-2018-25032.patch
@@ -0,0 +1,343 @@
+From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Tue, 17 Apr 2018 22:09:22 -0700
+Subject: [PATCH] Fix a bug that can crash deflate on some input when using
+ Z_FIXED.
+
+This bug was reported by Danilo Ramos of Eideticom, Inc. It has
+lain in wait 13 years before being found! The bug was introduced
+in zlib 1.2.2.2, with the addition of the Z_FIXED option. That
+option forces the use of fixed Huffman codes. For rare inputs with
+a large number of distant matches, the pending buffer into which
+the compressed data is written can overwrite the distance symbol
+table which it overlays. That results in corrupted output due to
+invalid distances, and can result in out-of-bound accesses,
+crashing the application.
+
+The fix here combines the distance buffer and literal/length
+buffers into a single symbol buffer. Now three bytes of pending
+buffer space are opened up for each literal or length/distance
+pair consumed, instead of the previous two bytes. This assures
+that the pending buffer cannot overwrite the symbol table, since
+the maximum fixed code compressed length/distance is 31 bits, and
+since there are four bytes of pending space for every three bytes
+of symbol space.
+---
+ deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++---------------
+ deflate.h | 25 +++++++++----------
+ trees.c   | 50 +++++++++++--------------------------
+ 3 files changed, 79 insertions(+), 70 deletions(-)
+
+diff --git a/deflate.c b/deflate.c
+index 425babc00..19cba873a 100644
+--- a/deflate.c
++++ b/deflate.c
+@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+     int wrap = 1;
+     static const char my_version[] = ZLIB_VERSION;
+ 
+-    ushf *overlay;
+-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
+-     * output size for (length,distance) codes is <= 24 bits.
+-     */
+-
+     if (version == Z_NULL || version[0] != my_version[0] ||
+         stream_size != sizeof(z_stream)) {
+         return Z_VERSION_ERROR;
+@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+ 
+     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+ 
+-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+-    s->pending_buf = (uchf *) overlay;
+-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
++    /* We overlay pending_buf and sym_buf. This works since the average size
++     * for length/distance pairs over any compressed block is assured to be 31
++     * bits or less.
++     *
++     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
++     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
++     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
++     * possible fixed-codes length/distance pair is then 31 bits total.
++     *
++     * sym_buf starts one-fourth of the way into pending_buf. So there are
++     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
++     * in sym_buf is three bytes -- two for the distance and one for the
++     * literal/length. As each symbol is consumed, the pointer to the next
++     * sym_buf value to read moves forward three bytes. From that symbol, up to
++     * 31 bits are written to pending_buf. The closest the written pending_buf
++     * bits gets to the next sym_buf symbol to read is just before the last
++     * code is written. At that time, 31*(n-2) bits have been written, just
++     * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
++     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
++     * symbols are written.) The closest the writing gets to what is unread is
++     * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
++     * can range from 128 to 32768.
++     *
++     * Therefore, at a minimum, there are 142 bits of space between what is
++     * written and what is read in the overlain buffers, so the symbols cannot
++     * be overwritten by the compressed data. That space is actually 139 bits,
++     * due to the three-bit fixed-code block header.
++     *
++     * That covers the case where either Z_FIXED is specified, forcing fixed
++     * codes, or when the use of fixed codes is chosen, because that choice
++     * results in a smaller compressed block than dynamic codes. That latter
++     * condition then assures that the above analysis also covers all dynamic
++     * blocks. A dynamic-code block will only be chosen to be emitted if it has
++     * fewer bits than a fixed-code block would for the same set of symbols.
++     * Therefore its average symbol length is assured to be less than 31. So
++     * the compressed data for a dynamic block also cannot overwrite the
++     * symbols from which it is being constructed.
++     */
++
++    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
++    s->pending_buf_size = (ulg)s->lit_bufsize * 4;
+ 
+     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+         s->pending_buf == Z_NULL) {
+@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+         deflateEnd (strm);
+         return Z_MEM_ERROR;
+     }
+-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
++    s->sym_buf = s->pending_buf + s->lit_bufsize;
++    s->sym_end = (s->lit_bufsize - 1) * 3;
++    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
++     * on 16 bit machines and because stored blocks are restricted to
++     * 64K-1 bytes.
++     */
+ 
+     s->level = level;
+     s->strategy = strategy;
+@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
+ 
+     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+     s = strm->state;
+-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
++    if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
+         return Z_BUF_ERROR;
+     do {
+         put = Buf_size - s->bi_valid;
+@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source)
+ #else
+     deflate_state *ds;
+     deflate_state *ss;
+-    ushf *overlay;
+ 
+ 
+     if (deflateStateCheck(source) || dest == Z_NULL) {
+@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source)
+     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+-    ds->pending_buf = (uchf *) overlay;
++    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
+ 
+     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+         ds->pending_buf == Z_NULL) {
+@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source)
+     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+ 
+     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
++    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
+ 
+     ds->l_desc.dyn_tree = ds->dyn_ltree;
+     ds->d_desc.dyn_tree = ds->dyn_dtree;
+@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+diff --git a/deflate.h b/deflate.h
+index 23ecdd312..d4cf1a98b 100644
+--- a/deflate.h
++++ b/deflate.h
+@@ -217,7 +217,7 @@ typedef struct internal_state {
+     /* Depth of each subtree used as tie breaker for trees of equal frequency
+      */
+ 
+-    uchf *l_buf;          /* buffer for literals or lengths */
++    uchf *sym_buf;        /* buffer for distances and literals/lengths */
+ 
+     uInt  lit_bufsize;
+     /* Size of match buffer for literals/lengths.  There are 4 reasons for
+@@ -239,13 +239,8 @@ typedef struct internal_state {
+      *   - I can't count above 4
+      */
+ 
+-    uInt last_lit;      /* running index in l_buf */
+-
+-    ushf *d_buf;
+-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
+-     * the same number of elements. To use different lengths, an extra flag
+-     * array would be necessary.
+-     */
++    uInt sym_next;      /* running index in sym_buf */
++    uInt sym_end;       /* symbol table full when sym_next reaches this */
+ 
+     ulg opt_len;        /* bit length of current block with optimal trees */
+     ulg static_len;     /* bit length of current block with static trees */
+@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+ 
+ # define _tr_tally_lit(s, c, flush) \
+   { uch cc = (c); \
+-    s->d_buf[s->last_lit] = 0; \
+-    s->l_buf[s->last_lit++] = cc; \
++    s->sym_buf[s->sym_next++] = 0; \
++    s->sym_buf[s->sym_next++] = 0; \
++    s->sym_buf[s->sym_next++] = cc; \
+     s->dyn_ltree[cc].Freq++; \
+-    flush = (s->last_lit == s->lit_bufsize-1); \
++    flush = (s->sym_next == s->sym_end); \
+    }
+ # define _tr_tally_dist(s, distance, length, flush) \
+   { uch len = (uch)(length); \
+     ush dist = (ush)(distance); \
+-    s->d_buf[s->last_lit] = dist; \
+-    s->l_buf[s->last_lit++] = len; \
++    s->sym_buf[s->sym_next++] = dist; \
++    s->sym_buf[s->sym_next++] = dist >> 8; \
++    s->sym_buf[s->sym_next++] = len; \
+     dist--; \
+     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+     s->dyn_dtree[d_code(dist)].Freq++; \
+-    flush = (s->last_lit == s->lit_bufsize-1); \
++    flush = (s->sym_next == s->sym_end); \
+   }
+ #else
+ # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+diff --git a/trees.c b/trees.c
+index 4f4a65011..decaeb7c3 100644
+--- a/trees.c
++++ b/trees.c
+@@ -416,7 +416,7 @@ local void init_block(s)
+ 
+     s->dyn_ltree[END_BLOCK].Freq = 1;
+     s->opt_len = s->static_len = 0L;
+-    s->last_lit = s->matches = 0;
++    s->sym_next = s->matches = 0;
+ }
+ 
+ #define SMALLEST 1
+@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
+ 
+         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+-                s->last_lit));
++                s->sym_next / 3));
+ 
+         if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+ 
+@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+     unsigned dist;  /* distance of matched string */
+     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+ {
+-    s->d_buf[s->last_lit] = (ush)dist;
+-    s->l_buf[s->last_lit++] = (uch)lc;
++    s->sym_buf[s->sym_next++] = dist;
++    s->sym_buf[s->sym_next++] = dist >> 8;
++    s->sym_buf[s->sym_next++] = lc;
+     if (dist == 0) {
+         /* lc is the unmatched char */
+         s->dyn_ltree[lc].Freq++;
+@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+         s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+         s->dyn_dtree[d_code(dist)].Freq++;
+     }
+-
+-#ifdef TRUNCATE_BLOCK
+-    /* Try to guess if it is profitable to stop the current block here */
+-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
+-        /* Compute an upper bound for the compressed length */
+-        ulg out_length = (ulg)s->last_lit*8L;
+-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
+-        int dcode;
+-        for (dcode = 0; dcode < D_CODES; dcode++) {
+-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
+-                (5L+extra_dbits[dcode]);
+-        }
+-        out_length >>= 3;
+-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+-               s->last_lit, in_length, out_length,
+-               100L - out_length*100L/in_length));
+-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+-    }
+-#endif
+-    return (s->last_lit == s->lit_bufsize-1);
+-    /* We avoid equality with lit_bufsize because of wraparound at 64K
+-     * on 16 bit machines and because stored blocks are restricted to
+-     * 64K-1 bytes.
+-     */
++    return (s->sym_next == s->sym_end);
+ }
+ 
+ /* ===========================================================================
+@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree)
+ {
+     unsigned dist;      /* distance of matched string */
+     int lc;             /* match length or unmatched char (if dist == 0) */
+-    unsigned lx = 0;    /* running index in l_buf */
++    unsigned sx = 0;    /* running index in sym_buf */
+     unsigned code;      /* the code to send */
+     int extra;          /* number of extra bits to send */
+ 
+-    if (s->last_lit != 0) do {
+-        dist = s->d_buf[lx];
+-        lc = s->l_buf[lx++];
++    if (s->sym_next != 0) do {
++        dist = s->sym_buf[sx++] & 0xff;
++        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
++        lc = s->sym_buf[sx++];
+         if (dist == 0) {
+             send_code(s, lc, ltree); /* send a literal byte */
+             Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree)
+             }
+         } /* literal or match pair ? */
+ 
+-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
+-               "pendingBuf overflow");
++        /* Check that the overlay between pending_buf and sym_buf is ok: */
++        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
+ 
+-    } while (lx < s->last_lit);
++    } while (sx < s->sym_next);
+ 
+     send_code(s, END_BLOCK, ltree);
+ }
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index e8c44f9bdb8b..0a3cd6a4a30a 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
 # Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
-revision=4
+revision=5
 bootstrap=yes
 build_style=configure
 configure_args="--prefix=/usr --shared"

From f5a918dc4507e264a718e388ca6dd15d4d503928 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 16:40:22 -0500
Subject: [PATCH 0746/2561] proxychains-ng: update to 4.16.

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

diff --git a/srcpkgs/proxychains-ng/template b/srcpkgs/proxychains-ng/template
index 3cbb9a335e93..2473f4d45e35 100644
--- a/srcpkgs/proxychains-ng/template
+++ b/srcpkgs/proxychains-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'proxychains-ng'
 pkgname=proxychains-ng
-version=4.15
+version=4.16
 revision=1
 build_style=gnu-configure
 make_install_target="install install-config"
@@ -10,4 +10,4 @@ maintainer="David <kalichakra@zoho.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/rofl0r/proxychains-ng"
 distfiles="http://ftp.barfooze.de/pub/sabotage/tarballs/${pkgname}-${version}.tar.xz"
-checksum=3207ab7f1f053c3fdcdf5ac158bcdef0683e3b7d8427b602ce9c0abe6a369081
+checksum=37a9983d995857cc398cfeefb96739827b3d86a71e03a5193b99f1b097046812

From afc39903e6813561b96314fb0900dd99ef7ef5ed Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 28 Mar 2022 16:17:49 +0200
Subject: [PATCH 0747/2561] restic: update to 0.13.0.

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

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..18e2a8b1f406 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.13.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=b3c09137b462548f44d764f98909534bef6e85fe029d4daf60545642cdefd3dd
 
 post_install() {
 	vlicense LICENSE

From a462001c6a4e15252205a065fb960f3227baf259 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 05:50:52 +0200
Subject: [PATCH 0748/2561] bees: fix build

---
 srcpkgs/bees/patches/fix-build.patch | 12 ++++++++++++
 srcpkgs/bees/patches/series          |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 srcpkgs/bees/patches/fix-build.patch

diff --git a/srcpkgs/bees/patches/fix-build.patch b/srcpkgs/bees/patches/fix-build.patch
new file mode 100644
index 000000000000..3799e27e32ae
--- /dev/null
+++ b/srcpkgs/bees/patches/fix-build.patch
@@ -0,0 +1,12 @@
+--- a/src/fiemap.cc
++++ b/src/fiemap.cc
+@@ -28,7 +28,8 @@ main(int argc, char **argv)
+ 		if (argc > 2) { fm.fm_start = stoull(argv[2], nullptr, 0); }
+ 		if (argc > 3) { fm.fm_length = stoull(argv[3], nullptr, 0); }
+ 		if (argc > 4) { fm.fm_flags = stoull(argv[4], nullptr, 0); }
+-		fm.fm_length = min(fm.fm_length, FIEMAP_MAX_OFFSET - fm.fm_start);
++		using FU = decltype(fm.fm_length);
++		fm.fm_length = min(FU(fm.fm_length), FU(FIEMAP_MAX_OFFSET - fm.fm_start));
+ 		uint64_t stop_at = fm.fm_start + fm.fm_length;
+ 		uint64_t last_byte = fm.fm_start;
+ 		do {
diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series
index d9a2837128f2..068ccfc2db81 100644
--- a/srcpkgs/bees/patches/series
+++ b/srcpkgs/bees/patches/series
@@ -1,2 +1,3 @@
 0001-don-t-run-tests-unless-asked.patch
 0002-move-sbin-into-bin.patch
+fix-build.patch

From 4c3166028b9b2cf62bdbed0b0b918e0508fdff67 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 05:52:59 +0200
Subject: [PATCH 0749/2561] bees: also disable on platforms without 64-bit
 atomics

---
 srcpkgs/bees/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
index c9184f593e87..6f8783ea65fc 100644
--- a/srcpkgs/bees/template
+++ b/srcpkgs/bees/template
@@ -23,6 +23,10 @@ if [ "$CROSS_BUILD" ]; then
 	make_check="no"
 fi
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	broken="undefined reference to __atomic_fetch_add_8"
+fi
+
 pre_build() {
 	export BEES_VERSION="${version}"
 }

From 70f8aaea6e3989f0e15ca6f053ac7f2d2d5c91a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 29 Mar 2022 08:06:54 +0200
Subject: [PATCH 0750/2561] kpty: fix cross

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

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 28f4d371f530..47612b152d68 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -3,6 +3,7 @@ pkgname=kpty
 version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter"
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
 makedepends="kcoreaddons-devel ki18n-devel libutempter-devel"
 short_desc="KDE Interfacing with pseudo terminal devices"

From afd261aa9447e5c4aacf5752d5f21f4f43f9133e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 14:25:13 +0200
Subject: [PATCH 0751/2561] conduit: restrict archs (ring dependency)

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

diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template
index c2e423e79891..cf972b13e25c 100644
--- a/srcpkgs/conduit/template
+++ b/srcpkgs/conduit/template
@@ -2,6 +2,8 @@
 pkgname=conduit
 version=0.3.0
 revision=1
+# needs ring/rustls
+archs="x86_64* i686* aarch64* armv[67]*"
 wrksrc="conduit-v${version}"
 build_style=cargo
 hostmakedepends="clang"

From 111521dce46ebcd583959d4bbdb12ea9e29fa8f1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 14:27:56 +0200
Subject: [PATCH 0752/2561] retroarch: fix checksum

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

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 6b89a54d89a2..bafac5d513a0 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=e426b8d30c25806e54c61f21d0d742695fa4f6bc6a271def4459db5460d28e8e
+checksum=c7d371208292aa58b295d639e550efbe412671e09a3d609540796709b17b9b8b
 
 build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"

From 275179dfc37debbfbef7a4cffc90cc62bcdf237d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 23:46:33 +0200
Subject: [PATCH 0753/2561] crash: use system readline, zlib.

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

diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index 82d9a3968c11..7f158c9ed635 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,11 +1,11 @@
 # Template file for 'crash'
 pkgname=crash
 version=8.0.0
-revision=1
+revision=2
 archs="i686 x86_64"  # broken on musl
 build_style=gnu-makefile
 hostmakedepends="flex tar wget texinfo"
-makedepends="lzo-devel ncurses-devel zlib-devel"
+makedepends="lzo-devel ncurses-devel zlib-devel readline-devel"
 depends="binutils"
 short_desc="Kernel crash dump debugger and live inspector"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -25,7 +25,7 @@ post_extract() {
 }
 
 do_build() {
-	make ${makejobs} lzo
+	make ${makejobs} lzo GDB_CONF_FLAGS="--with-system-readline --with-system-zlib"
 	make ${makejobs} extensions
 }
 

From b6c57bab0e0d7b2dba2219e53b8b362d7a894343 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 29 Mar 2022 14:08:01 +0200
Subject: [PATCH 0754/2561] expat: update to 2.4.8.

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

diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index ccab77dad179..126ea7b3f474 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -1,6 +1,6 @@
 # Template file for 'expat'
 pkgname=expat
-version=2.4.7
+version=2.4.8
 revision=1
 build_style=gnu-configure
 short_desc="XML parser library written in C"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://libexpat.github.io/"
 distfiles="https://github.com/libexpat/libexpat/releases/download/R_${version//./_}/expat-${version}.tar.xz"
-checksum=9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d
+checksum=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25
 
 post_install() {
 	vlicense COPYING

From 86782b8be118b2c92c7f03732e14647c035177c4 Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lauri@hacktheplanet.fi>
Date: Thu, 20 Jan 2022 19:52:59 +0200
Subject: [PATCH 0755/2561] New package: acme-client-1.3.0

portable acme-client existed previously with a different upstream, which
was unmaintained - switch to one that is maintained.
---
 srcpkgs/acme-client/files/acme-client.conf | 31 ++++++++++++++++++++++
 srcpkgs/acme-client/template               | 23 ++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/acme-client/files/acme-client.conf
 create mode 100644 srcpkgs/acme-client/template

diff --git a/srcpkgs/acme-client/files/acme-client.conf b/srcpkgs/acme-client/files/acme-client.conf
new file mode 100644
index 000000000000..31dd96f00886
--- /dev/null
+++ b/srcpkgs/acme-client/files/acme-client.conf
@@ -0,0 +1,31 @@
+#
+# $OpenBSD: acme-client.conf,v 1.4 2020/09/17 09:13:06 florian Exp $
+#
+authority letsencrypt {
+	api url "https://acme-v02.api.letsencrypt.org/directory"
+	account key "/etc/acme/letsencrypt-privkey.pem"
+}
+
+authority letsencrypt-staging {
+	api url "https://acme-staging-v02.api.letsencrypt.org/directory"
+	account key "/etc/acme/letsencrypt-staging-privkey.pem"
+}
+
+authority buypass {
+	api url "https://api.buypass.com/acme/directory"
+	account key "/etc/acme/buypass-privkey.pem"
+	contact "mailto:me@example.com"
+}
+
+authority buypass-test {
+	api url "https://api.test4.buypass.no/acme/directory"
+	account key "/etc/acme/buypass-test-privkey.pem"
+	contact "mailto:me@example.com"
+}
+
+domain example.com {
+	alternative names { secure.example.com }
+	domain key "/etc/ssl/private/example.com.key"
+	domain full chain certificate "/etc/ssl/example.com.fullchain.pem"
+	sign with letsencrypt
+}
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
new file mode 100644
index 000000000000..da8fd65f1f4c
--- /dev/null
+++ b/srcpkgs/acme-client/template
@@ -0,0 +1,23 @@
+# Template file for 'acme-client'
+pkgname=acme-client
+version=1.3.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config sed"
+makedepends="openssl-devel"
+checkdepends="nginx curl"
+short_desc="Portable version of OpenBSD's acme-client"
+maintainer="Lauri Tirkkonen <lauri@hacktheplanet.fi>"
+license="GPL-2.0-only"
+homepage="https://git.sr.ht/~graywolf/acme-client-portable/"
+distfiles="https://data.wolfsden.cz/sources/acme-client-${version}.tar.gz"
+checksum=ac8796652393fa73f32dfda60ed3a437fc260867df1b81fa3c241bd95c5bc719
+make_check=no # requires https://github.com/letsencrypt/pebble which isn't packaged
+
+pre_install() {
+	sed -i 's,/etc/examples/,/usr/share/examples/acme-client/,g' usr.sbin/acme-client/acme-client.conf.5
+}
+
+post_install() {
+	vsconf ${FILESDIR}/acme-client.conf
+}

From 9d3e7b562af895349b29d58ca17420d16f8515f6 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 23:59:55 -0400
Subject: [PATCH 0756/2561] cura-fdm-materials: update to 4.13.0.

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

diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template
index 2383b2c697a3..fb701a7510f0 100644
--- a/srcpkgs/cura-fdm-materials/template
+++ b/srcpkgs/cura-fdm-materials/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-fdm-materials'
 pkgname=cura-fdm-materials
 reverts="2019.08.21_1"
-version=4.12.0
+version=4.13.0
 revision=1
 wrksrc="fdm_materials-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="CC0-1.0"
 homepage="https://github.com/Ultimaker/fdm_materials"
 distfiles="https://github.com/Ultimaker/fdm_materials/archive/${version}.tar.gz"
-checksum=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From 488e180855df955ddc477e242f8d303fbb2bce8f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:00:21 -0400
Subject: [PATCH 0757/2561] libArcus: update to 4.13.1.

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

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index d560ee19b81d..21176dfdbcbe 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
-revision=2
+version=4.13.1
+revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libArcus"
 distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=51e865cb648750ad9ea315fa7632ee7016890273f911270f60d28c8a4bc50240
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6fc160b9e28ad6e40d862b84921952c3f7db6707 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 11:23:27 -0400
Subject: [PATCH 0758/2561] Uranium: update to 4.13.1.

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

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.1
 revision=1
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
@@ -15,7 +15,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Uranium"
 distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
-checksum=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From fa378224a57ffafc918a2884759d52edba485aca Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 11:23:57 -0400
Subject: [PATCH 0759/2561] cura-engine: update to 4.13.1.

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

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 8c2822f73c0d..5cded6271dea 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.12.1
-revision=2
+version=4.13.1
+revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/CuraEngine"
 distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
 
 post_install() {
 	vlicense LICENSE

From f60cec5d6e34c6be1bb2d7a14bcca6c3728ca80a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 0760/2561] libSavitar: update to 4.13.1.

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

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..eaffe92be8ce 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.1
 revision=1
 build_style=cmake
 hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libSavitar"
 distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz"
-checksum=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=0bd50f54d557bed70f2c8420405c690b819b287156e81e10b6f51651cebce2e9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From a844d48ae409331911f549236ac08b4075650696 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:18:57 -0400
Subject: [PATCH 0761/2561] New package: libCharon-4.13.0

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

diff --git a/srcpkgs/libCharon/template b/srcpkgs/libCharon/template
new file mode 100644
index 000000000000..b33e995d9dbe
--- /dev/null
+++ b/srcpkgs/libCharon/template
@@ -0,0 +1,14 @@
+# Template file for 'libCharon'
+pkgname=libCharon
+version=4.13.0
+revision=1
+build_style=cmake
+configure_args="INSTALL_SERVICE=OFF"
+hostmakedepends="python3"
+checkdepends="python3-pytest python3-mypy"
+short_desc="File metadata and streaming library"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Ultimaker/libCharon"
+distfiles="https://github.com/Ultimaker/libCharon/archive/${version}.tar.gz"
+checksum=efccb04a84b9a80fe4e154aa4b44c56b59061aeba25937be804277a5f21259ec

From a90b362b616abf8327f67b693873fe12c3e3854e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 0762/2561] cura: update to 4.13.1.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py
-index c29a0648d..dad67ba16 100644
---- a/cura/Arranging/Nest2DArrange.py
-+++ b/cura/Arranging/Nest2DArrange.py
-@@ -91,7 +91,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV
- 
-         if hull_polygon is not None and hull_polygon.getPoints() is not None and len(hull_polygon.getPoints()) > 2:  # numpy array has to be explicitly checked against None
-             for point in hull_polygon.getPoints():
--                converted_points.append(Point(point[0] * factor, point[1] * factor))
-+                converted_points.append(Point(int(point[0] * factor), int(point[1] * factor)))
-             item = Item(converted_points)
-             item.markAsFixedInBin(0)
-             node_items.append(item)
diff --git a/srcpkgs/cura/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cura/PickingPass.py b/cura/PickingPass.py
-index 54e886fe6..4d6ef671d 100644
---- a/cura/PickingPass.py
-+++ b/cura/PickingPass.py
-@@ -72,8 +72,8 @@ class PickingPass(RenderPass):
- 
-         window_size = self._renderer.getWindowSize()
- 
--        px = (0.5 + x / 2.0) * window_size[0]
--        py = (0.5 + y / 2.0) * window_size[1]
-+        px = int((0.5 + x / 2.0) * window_size[0])
-+        py = int((0.5 + y / 2.0) * window_size[1])
- 
-         if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1):
-             return -1
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index aa06dcd98b85..8e0cc09ab8d3 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry libCharon"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Cura"
 distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c

From 7ed6bbdbd7f7a589bb4a3d65dd4351137d5f32f5 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 17 Mar 2022 21:43:41 -0700
Subject: [PATCH 0763/2561] jetbrains-jdk-bin: update to 11.0.14.1b2043.17.

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

diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index b2f4fe780d19..1f428e05bd3a 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'jetbrains-jdk-bin'
 pkgname=jetbrains-jdk-bin
-version=11.0.13b1890.3
+version=11.0.14.1b2043.17
 revision=1
 archs="x86_64"
 wrksrc="jbr"
@@ -11,7 +11,7 @@ homepage="https://github.com/JetBrains/JetBrainsRuntime"
 _jdk_ver=${version%b*}
 _jdk_build=${version#*b}
 distfiles="https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
-checksum=6dc1208c486ed023ddd9f79f66f099304cd6785895d4e782aaefe0603f47e621
+checksum=2c5b7398acb2b718cbdd8327e4c77e52b131fdf3424fee03d0c51afb3b315c10
 # This JDK appears to link to libs that do not exist, but functions well even in their absence.
 # Best guess is that they are optional. ¯\_(ツ)_/¯
 noverifyrdeps=yes

From c802180c2846d1fccd26b5f0289300570d104eb2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 13 Mar 2022 13:53:20 +0300
Subject: [PATCH 0764/2561] fish-shell: update to 3.4.1.

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

diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 657e5604c3d6..0fc86db7e7b0 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=3.3.1
+version=3.4.1
 revision=1
 wrksrc="fish-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 changelog="https://github.com/fish-shell/fish-shell/raw/master/CHANGELOG.rst"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=b5b4ee1a5269762cbbe993a4bd6507e675e4100ce9bbe84214a5eeb2b19fae89
+checksum=b6f23b3843b04db6b0a90fea1f6f0d0e40cc027b4a732098200863f2864a94ea
 register_shell="/bin/fish /usr/bin/fish"
 # tests don't work as root
 make_check=ci-skip

From f63dc314ed696e2756bbe4109bac854436619ab4 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 29 Mar 2022 20:05:35 +0200
Subject: [PATCH 0765/2561] linux5.4: update to 5.4.188.

---
 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 46c8f5c5c751..ac636bc1d2ff 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.187
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=189e3db3f2af8578037f9c8b4710e1002bdd56f318c5f8589b40de889be9a7b8
+checksum=9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 6bc4667fbf405f5a526805842e5494e9cd7bbd39 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 29 Mar 2022 20:08:57 +0200
Subject: [PATCH 0766/2561] linux4.19: update to 4.19.237.

---
 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 f2fb29a3cf0c..cb61654da418 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.236
+version=4.19.237
 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=002ef6adcafe8d90571f8882280a9bef28d1aa7cc9a3f35a50afc4cb2ebe31c0
+checksum=bafff35102cc486ec2bf94c6d908be8e24017b2e4a1873f52f24c855eb220cd8
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 630dc15af579962fa46ebe21ad18b5cd65006a92 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Mon, 28 Mar 2022 20:48:50 -0500
Subject: [PATCH 0767/2561] .github/workflows: Add a workflow for dealing with
 stale issues/prs

---
 .github/workflows/stale.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 000000000000..c759ef9459e0
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,20 @@
+---
+name: Stale Cleanup
+
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v4
+        with:
+          stale-issue-message: 'Issues become stale 90 days after last activity and are closed 7 days after that.  If this issue is still relevant bump it or assign it.'
+          stale-pr-message: 'Pull Requests become stale 90 days after last activity and are closed 7 days after that.  If this pull request is still relevant bump it or assign it.'
+          days-before-stale: 90
+          days-before-close: 7
+          debug-only: true
+          exempt-all-assignees: true
+          operations-per-run: 1000

From 27c6f695d62667df817255d31fafbb05a88c56c5 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Tue, 29 Mar 2022 21:49:29 -0500
Subject: [PATCH 0768/2561] .github/workflows: make stale comments workflow
 dispatchable

---
 .github/workflows/stale.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index c759ef9459e0..abdc83c9d383 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -2,6 +2,7 @@
 name: Stale Cleanup
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '30 1 * * *'
 

From 5fe6c61fbda87abef4f44877d309102aef08af64 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Tue, 29 Mar 2022 23:43:32 -0500
Subject: [PATCH 0769/2561] runit-void: update to 20220329.

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

diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index a0aef0484c0b..42eeab9a2929 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
-version=20210314
-revision=3
+version=20220329
+revision=1
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="CC0-1.0"
 homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
-checksum=9ac95a14b5e1aedfcf0b093b8992b08316448ac1afb7fd26501ac43c4ebf3847
+checksum=43037b1cbf177a3ee6d690cc652eedf819ca37f44636311b55aa716e159a4718
 
 depends="virtual?awk procps-ng runit"
 conf_files="

From 686c5cb93a34ca8c989a0f36f0c58521a181044b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 13:36:14 +0100
Subject: [PATCH 0770/2561] New package: yass-0.1.0

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

diff --git a/srcpkgs/yass/template b/srcpkgs/yass/template
new file mode 100644
index 000000000000..7b4577941ec3
--- /dev/null
+++ b/srcpkgs/yass/template
@@ -0,0 +1,20 @@
+# Template file for 'yass'
+pkgname=yass
+version=0.1.0
+revision=1
+build_wrksrc=source
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="clthreads-devel clxclient-devel freetype-devel jack-devel
+ libX11-devel libXft-devel"
+short_desc="Yet Another Scrolling Scope"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
+distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
+checksum=d247798b708303bc7622c3b6b96fb8190f3b3a07424a3b53c95d21ab8fc6d34a
+
+pre_build() {
+	# change pkgconf to pkg-config
+	vsed -i 's/pkgconf/pkg-config/' Makefile
+}

From 238238712da0c14067e8077adc792d718aace265 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 29 Mar 2022 14:27:58 +0200
Subject: [PATCH 0771/2561] zlib: update to 1.2.12.

---
 srcpkgs/zlib/patches/CVE-2018-25032.patch | 343 ----------------------
 srcpkgs/zlib/patches/cc.patch             |  24 ++
 srcpkgs/zlib/template                     |   6 +-
 3 files changed, 27 insertions(+), 346 deletions(-)
 delete mode 100644 srcpkgs/zlib/patches/CVE-2018-25032.patch
 create mode 100644 srcpkgs/zlib/patches/cc.patch

diff --git a/srcpkgs/zlib/patches/CVE-2018-25032.patch b/srcpkgs/zlib/patches/CVE-2018-25032.patch
deleted file mode 100644
index 9f37ba5c583e..000000000000
--- a/srcpkgs/zlib/patches/CVE-2018-25032.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Tue, 17 Apr 2018 22:09:22 -0700
-Subject: [PATCH] Fix a bug that can crash deflate on some input when using
- Z_FIXED.
-
-This bug was reported by Danilo Ramos of Eideticom, Inc. It has
-lain in wait 13 years before being found! The bug was introduced
-in zlib 1.2.2.2, with the addition of the Z_FIXED option. That
-option forces the use of fixed Huffman codes. For rare inputs with
-a large number of distant matches, the pending buffer into which
-the compressed data is written can overwrite the distance symbol
-table which it overlays. That results in corrupted output due to
-invalid distances, and can result in out-of-bound accesses,
-crashing the application.
-
-The fix here combines the distance buffer and literal/length
-buffers into a single symbol buffer. Now three bytes of pending
-buffer space are opened up for each literal or length/distance
-pair consumed, instead of the previous two bytes. This assures
-that the pending buffer cannot overwrite the symbol table, since
-the maximum fixed code compressed length/distance is 31 bits, and
-since there are four bytes of pending space for every three bytes
-of symbol space.
----
- deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++---------------
- deflate.h | 25 +++++++++----------
- trees.c   | 50 +++++++++++--------------------------
- 3 files changed, 79 insertions(+), 70 deletions(-)
-
-diff --git a/deflate.c b/deflate.c
-index 425babc00..19cba873a 100644
---- a/deflate.c
-+++ b/deflate.c
-@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-     int wrap = 1;
-     static const char my_version[] = ZLIB_VERSION;
- 
--    ushf *overlay;
--    /* We overlay pending_buf and d_buf+l_buf. This works since the average
--     * output size for (length,distance) codes is <= 24 bits.
--     */
--
-     if (version == Z_NULL || version[0] != my_version[0] ||
-         stream_size != sizeof(z_stream)) {
-         return Z_VERSION_ERROR;
-@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
- 
-     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
- 
--    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
--    s->pending_buf = (uchf *) overlay;
--    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-+    /* We overlay pending_buf and sym_buf. This works since the average size
-+     * for length/distance pairs over any compressed block is assured to be 31
-+     * bits or less.
-+     *
-+     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
-+     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
-+     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
-+     * possible fixed-codes length/distance pair is then 31 bits total.
-+     *
-+     * sym_buf starts one-fourth of the way into pending_buf. So there are
-+     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
-+     * in sym_buf is three bytes -- two for the distance and one for the
-+     * literal/length. As each symbol is consumed, the pointer to the next
-+     * sym_buf value to read moves forward three bytes. From that symbol, up to
-+     * 31 bits are written to pending_buf. The closest the written pending_buf
-+     * bits gets to the next sym_buf symbol to read is just before the last
-+     * code is written. At that time, 31*(n-2) bits have been written, just
-+     * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
-+     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
-+     * symbols are written.) The closest the writing gets to what is unread is
-+     * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
-+     * can range from 128 to 32768.
-+     *
-+     * Therefore, at a minimum, there are 142 bits of space between what is
-+     * written and what is read in the overlain buffers, so the symbols cannot
-+     * be overwritten by the compressed data. That space is actually 139 bits,
-+     * due to the three-bit fixed-code block header.
-+     *
-+     * That covers the case where either Z_FIXED is specified, forcing fixed
-+     * codes, or when the use of fixed codes is chosen, because that choice
-+     * results in a smaller compressed block than dynamic codes. That latter
-+     * condition then assures that the above analysis also covers all dynamic
-+     * blocks. A dynamic-code block will only be chosen to be emitted if it has
-+     * fewer bits than a fixed-code block would for the same set of symbols.
-+     * Therefore its average symbol length is assured to be less than 31. So
-+     * the compressed data for a dynamic block also cannot overwrite the
-+     * symbols from which it is being constructed.
-+     */
-+
-+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
-+    s->pending_buf_size = (ulg)s->lit_bufsize * 4;
- 
-     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-         s->pending_buf == Z_NULL) {
-@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-         deflateEnd (strm);
-         return Z_MEM_ERROR;
-     }
--    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
--    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-+    s->sym_buf = s->pending_buf + s->lit_bufsize;
-+    s->sym_end = (s->lit_bufsize - 1) * 3;
-+    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
-+     * on 16 bit machines and because stored blocks are restricted to
-+     * 64K-1 bytes.
-+     */
- 
-     s->level = level;
-     s->strategy = strategy;
-@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
- 
-     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-     s = strm->state;
--    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
-+    if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
-         return Z_BUF_ERROR;
-     do {
-         put = Buf_size - s->bi_valid;
-@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source)
- #else
-     deflate_state *ds;
-     deflate_state *ss;
--    ushf *overlay;
- 
- 
-     if (deflateStateCheck(source) || dest == Z_NULL) {
-@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source)
-     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
--    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
--    ds->pending_buf = (uchf *) overlay;
-+    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
- 
-     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-         ds->pending_buf == Z_NULL) {
-@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source)
-     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
- 
-     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
--    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
--    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-+    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
- 
-     ds->l_desc.dyn_tree = ds->dyn_ltree;
-     ds->d_desc.dyn_tree = ds->dyn_dtree;
-@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-diff --git a/deflate.h b/deflate.h
-index 23ecdd312..d4cf1a98b 100644
---- a/deflate.h
-+++ b/deflate.h
-@@ -217,7 +217,7 @@ typedef struct internal_state {
-     /* Depth of each subtree used as tie breaker for trees of equal frequency
-      */
- 
--    uchf *l_buf;          /* buffer for literals or lengths */
-+    uchf *sym_buf;        /* buffer for distances and literals/lengths */
- 
-     uInt  lit_bufsize;
-     /* Size of match buffer for literals/lengths.  There are 4 reasons for
-@@ -239,13 +239,8 @@ typedef struct internal_state {
-      *   - I can't count above 4
-      */
- 
--    uInt last_lit;      /* running index in l_buf */
--
--    ushf *d_buf;
--    /* Buffer for distances. To simplify the code, d_buf and l_buf have
--     * the same number of elements. To use different lengths, an extra flag
--     * array would be necessary.
--     */
-+    uInt sym_next;      /* running index in sym_buf */
-+    uInt sym_end;       /* symbol table full when sym_next reaches this */
- 
-     ulg opt_len;        /* bit length of current block with optimal trees */
-     ulg static_len;     /* bit length of current block with static trees */
-@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
- 
- # define _tr_tally_lit(s, c, flush) \
-   { uch cc = (c); \
--    s->d_buf[s->last_lit] = 0; \
--    s->l_buf[s->last_lit++] = cc; \
-+    s->sym_buf[s->sym_next++] = 0; \
-+    s->sym_buf[s->sym_next++] = 0; \
-+    s->sym_buf[s->sym_next++] = cc; \
-     s->dyn_ltree[cc].Freq++; \
--    flush = (s->last_lit == s->lit_bufsize-1); \
-+    flush = (s->sym_next == s->sym_end); \
-    }
- # define _tr_tally_dist(s, distance, length, flush) \
-   { uch len = (uch)(length); \
-     ush dist = (ush)(distance); \
--    s->d_buf[s->last_lit] = dist; \
--    s->l_buf[s->last_lit++] = len; \
-+    s->sym_buf[s->sym_next++] = dist; \
-+    s->sym_buf[s->sym_next++] = dist >> 8; \
-+    s->sym_buf[s->sym_next++] = len; \
-     dist--; \
-     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-     s->dyn_dtree[d_code(dist)].Freq++; \
--    flush = (s->last_lit == s->lit_bufsize-1); \
-+    flush = (s->sym_next == s->sym_end); \
-   }
- #else
- # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-diff --git a/trees.c b/trees.c
-index 4f4a65011..decaeb7c3 100644
---- a/trees.c
-+++ b/trees.c
-@@ -416,7 +416,7 @@ local void init_block(s)
- 
-     s->dyn_ltree[END_BLOCK].Freq = 1;
-     s->opt_len = s->static_len = 0L;
--    s->last_lit = s->matches = 0;
-+    s->sym_next = s->matches = 0;
- }
- 
- #define SMALLEST 1
-@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
- 
-         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
--                s->last_lit));
-+                s->sym_next / 3));
- 
-         if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
- 
-@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-     unsigned dist;  /* distance of matched string */
-     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
- {
--    s->d_buf[s->last_lit] = (ush)dist;
--    s->l_buf[s->last_lit++] = (uch)lc;
-+    s->sym_buf[s->sym_next++] = dist;
-+    s->sym_buf[s->sym_next++] = dist >> 8;
-+    s->sym_buf[s->sym_next++] = lc;
-     if (dist == 0) {
-         /* lc is the unmatched char */
-         s->dyn_ltree[lc].Freq++;
-@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-         s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-         s->dyn_dtree[d_code(dist)].Freq++;
-     }
--
--#ifdef TRUNCATE_BLOCK
--    /* Try to guess if it is profitable to stop the current block here */
--    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
--        /* Compute an upper bound for the compressed length */
--        ulg out_length = (ulg)s->last_lit*8L;
--        ulg in_length = (ulg)((long)s->strstart - s->block_start);
--        int dcode;
--        for (dcode = 0; dcode < D_CODES; dcode++) {
--            out_length += (ulg)s->dyn_dtree[dcode].Freq *
--                (5L+extra_dbits[dcode]);
--        }
--        out_length >>= 3;
--        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
--               s->last_lit, in_length, out_length,
--               100L - out_length*100L/in_length));
--        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
--    }
--#endif
--    return (s->last_lit == s->lit_bufsize-1);
--    /* We avoid equality with lit_bufsize because of wraparound at 64K
--     * on 16 bit machines and because stored blocks are restricted to
--     * 64K-1 bytes.
--     */
-+    return (s->sym_next == s->sym_end);
- }
- 
- /* ===========================================================================
-@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree)
- {
-     unsigned dist;      /* distance of matched string */
-     int lc;             /* match length or unmatched char (if dist == 0) */
--    unsigned lx = 0;    /* running index in l_buf */
-+    unsigned sx = 0;    /* running index in sym_buf */
-     unsigned code;      /* the code to send */
-     int extra;          /* number of extra bits to send */
- 
--    if (s->last_lit != 0) do {
--        dist = s->d_buf[lx];
--        lc = s->l_buf[lx++];
-+    if (s->sym_next != 0) do {
-+        dist = s->sym_buf[sx++] & 0xff;
-+        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
-+        lc = s->sym_buf[sx++];
-         if (dist == 0) {
-             send_code(s, lc, ltree); /* send a literal byte */
-             Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree)
-             }
-         } /* literal or match pair ? */
- 
--        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
--        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
--               "pendingBuf overflow");
-+        /* Check that the overlay between pending_buf and sym_buf is ok: */
-+        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
- 
--    } while (lx < s->last_lit);
-+    } while (sx < s->sym_next);
- 
-     send_code(s, END_BLOCK, ltree);
- }
diff --git a/srcpkgs/zlib/patches/cc.patch b/srcpkgs/zlib/patches/cc.patch
new file mode 100644
index 000000000000..0136071eabe7
--- /dev/null
+++ b/srcpkgs/zlib/patches/cc.patch
@@ -0,0 +1,24 @@
+From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Mon, 28 Mar 2022 18:34:10 -0700
+Subject: [PATCH] Fix configure issue that discarded provided CC definition.
+
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 52ff4a04e..3fa3e8618 100755
+--- a/configure
++++ b/configure
+@@ -174,7 +174,10 @@ if test -z "$CC"; then
+   else
+     cc=${CROSS_PREFIX}cc
+   fi
++else
++  cc=${CC}
+ fi
++
+ cflags=${CFLAGS-"-O3"}
+ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+ case "$cc" in
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 0a3cd6a4a30a..6dbe30032202 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
 # Template file for 'zlib'
 pkgname=zlib
-version=1.2.11
-revision=5
+version=1.2.12
+revision=1
 bootstrap=yes
 build_style=configure
 configure_args="--prefix=/usr --shared"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
-checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+checksum=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
 
 zlib-devel_package() {
 	depends="zlib>=${version}_${revision}"

From 789a4a78213c5b1b3f1004b4347e4f2cfd418eda Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 30 Mar 2022 14:18:27 +0200
Subject: [PATCH 0772/2561] sbcl: update to 2.2.3.

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

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 7bcf793ec931..edd3cb36bf30 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.2.2
+version=2.2.3
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc texinfo"
@@ -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=8790dbbe97711dce14bb823125ce5b185b0073cf2f3cbf37bdd1ad380e7950f6
+checksum=de7f49e1f7750fd2cd89111ef70641cc5471355f621b737392ac68aa95f37f9f
 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+=" 77b7cfd4be60b6efa9b4166100f5e451d764e3751c1f1365ee83b3a9f220d5c8"
+	checksum+=" 8745f9358b686819209e188a93fb8cf5b4227a3f623af20504a68d129a314256"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From 283c746680f65bde85293062ebc2107e914dd346 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 30 Mar 2022 14:30:49 +0200
Subject: [PATCH 0773/2561] python3-pipenv: update to 2022.3.28.

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

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 4d0f0ec7e283..707476ccc36d 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.3.24
+version=2022.3.28
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=800198d430e724f899e6db319cc640d5fd6da2acdbc301ceb1a1f967e990428b
+checksum=4e7aae62dad7679ce81b54cc3451be19fb2c469e269335b36b14132fe5ceecb3
 conflicts="python-pipenv>=0"
 
 post_extract() {

From f20a81ff86251a0b58f034622d54c12f33c39f31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 11:07:26 -0400
Subject: [PATCH 0774/2561] unison: update to 2.52.0.

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

diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 67c424a3b8af..783573c120ea 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,14 +1,14 @@
 # Template file for 'unison'
 pkgname=unison
-version=2.51.4
-revision=2
+version=2.52.0
+revision=1
 hostmakedepends="ocaml"
 short_desc="File-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.cis.upenn.edu/~bcpierce/unison/"
 distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
-checksum=d1ecc7581aaf2ed0f3403d4960f468acd7b9f1d92838a17c96e6d1df79b802d5
+checksum=a11389971212915328fe69101c92737b17664595c4318ebcb8da367e5ba63540
 nocross="OCaml does not cross compile"
 
 do_build() {

From c25b4ecb650e033b2b85088284c8defafe520eff Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 27 Mar 2022 14:55:32 +0200
Subject: [PATCH 0775/2561] praat: update to 6.2.10

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

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index ac2777a445cc..142f0d2661ae 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.2.09
+version=6.2.10
 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=3c38b8af267b152a3fda1af78fe8cc26a1717f70a886387e657c55746f666af1
+checksum=f6358b2c6a967afe89882720d503c74221b364c563e1e4316a2d73c9f0c22bcd
 
 # 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 704e8dc4d0b6a2c599a1719ae7786efdf056a0a4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 30 Mar 2022 18:18:45 +0200
Subject: [PATCH 0776/2561] sbcl: use clisp on i686.

---
 srcpkgs/sbcl/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index edd3cb36bf30..b78c25202981 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -22,10 +22,6 @@ x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
 	checksum+=" 8745f9358b686819209e188a93fb8cf5b4227a3f623af20504a68d129a314256"
 	;;
-i686)
-	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
-	checksum+=" 6bed7e31bb28e841da7bfc48c75adb8bef19e5e07d1d6f0fc7487f022c32f92c"
-	;;
 arm*)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"
 	checksum+=" a5fbf1d596a909a7719bc4a958f00e8537bf399fa051f83736baee950b21e56a"
@@ -34,7 +30,7 @@ aarch64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.3.9-arm64-linux-binary.tar.bz2"
 	checksum+=" 14c8fc0f3a03416b5d23763156e2bb28b690fb665af1e6f6112201fd0ddcd512"
 	;;
-ppc*|*-musl)
+i686*|ppc*|*-musl)
 	# ecl bootstrap is broken since 2.2.0:
 	# https://build.voidlinux.org/builders/x86_64-musl_builder/builds/39694/steps/shell_3/logs/stdio
 	makedepends+=" clisp"

From 22fbc679fc820ea36ebc981d190c14695550f647 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Wed, 30 Mar 2022 13:01:35 -0500
Subject: [PATCH 0777/2561] consul-template: update to 0.28.0.

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

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index 00cd77f34169..4faeaf1c9ae5 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,6 +1,6 @@
 # Template file for 'consul-template'
 pkgname=consul-template
-version=0.25.1
+version=0.28.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
@@ -10,4 +10,4 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="MPL-2.0"
 homepage="https://github.com/hashicorp/consul-template"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=f8d214733961ef3333493ce912180c5c0311c87e4b1a116308f31283b6c77419
+checksum=61ce1b818ae9f555440a5a3a7a81590051c4871acfccd73001b4b087c66357e9

From 8801a042a0c2f8208f94509ebbbb303171d98431 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Tue, 29 Mar 2022 04:23:34 -0300
Subject: [PATCH 0778/2561] oil: update to 0.9.9

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

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index cf1cbccfefe5..7def1be36587 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.9.8
+version=0.9.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=3acaf17c9e5d17d027a60d6be878fe683d7de25f7d5fd621e2f219f91f9a1fc1
+checksum=6f6b4c4b9cf8a1e8e1dc2ff7bf39c85a11b871ddda9e9e51b9f7e1a0e46b2824
 register_shell="/usr/bin/osh"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From 9eba4120ccde3e636b500194e18bb13d7e775d69 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 28 Mar 2022 00:42:05 +0300
Subject: [PATCH 0779/2561] font-material-design-icons-ttf: merge with
 ttf-material-icons, rev bump

---
 srcpkgs/font-material-design-icons-ttf/template |  8 +++++++-
 srcpkgs/ttf-material-icons                      |  1 +
 srcpkgs/ttf-material-icons/template             | 16 ----------------
 3 files changed, 8 insertions(+), 17 deletions(-)
 create mode 120000 srcpkgs/ttf-material-icons
 delete mode 100644 srcpkgs/ttf-material-icons/template

diff --git a/srcpkgs/font-material-design-icons-ttf/template b/srcpkgs/font-material-design-icons-ttf/template
index fe3da363cc1e..d05b3c8a0a49 100644
--- a/srcpkgs/font-material-design-icons-ttf/template
+++ b/srcpkgs/font-material-design-icons-ttf/template
@@ -1,7 +1,7 @@
 # Template file for 'font-material-design-icons-ttf'
 pkgname=font-material-design-icons-ttf
 version=4.0.0
-revision=1
+revision=2
 wrksrc="material-design-icons-${version}"
 depends="font-util xbps-triggers"
 short_desc="Material Design icons by Google"
@@ -16,3 +16,9 @@ font_dirs="/usr/share/fonts/TTF"
 do_install() {
 	vinstall font/MaterialIcons-Regular.ttf 644 usr/share/fonts/TTF
 }
+
+ttf-material-icons_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
diff --git a/srcpkgs/ttf-material-icons b/srcpkgs/ttf-material-icons
new file mode 120000
index 000000000000..4d1e4bb1d94e
--- /dev/null
+++ b/srcpkgs/ttf-material-icons
@@ -0,0 +1 @@
+font-material-design-icons-ttf
\ No newline at end of file
diff --git a/srcpkgs/ttf-material-icons/template b/srcpkgs/ttf-material-icons/template
deleted file mode 100644
index b429c563c477..000000000000
--- a/srcpkgs/ttf-material-icons/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'ttf-material-icons'
-pkgname=ttf-material-icons
-version=4.0.0
-revision=1
-wrksrc=material-design-icons-${version}
-short_desc="Material Design icons by Google"
-maintainer="Michael Carlberg <c@rlberg.se>"
-license=CC
-homepage=http://google.github.io/material-design-icons/
-distfiles=https://github.com/google/material-design-icons/archive/${version}.tar.gz
-checksum=b1b068d625d5e15d6ec0059209cec67bc4c46e39c4611b859d6f6680dbf23934
-
-do_install() {
-	vinstall font/MaterialIcons-Regular.ttf  644 usr/share/fonts/TTF
-	vlicense LICENSE
-}

From 5bd8350335507fa0c3ba66e1ff181ca4462fdad3 Mon Sep 17 00:00:00 2001
From: Bas Ploeger <5904333+basploeger@users.noreply.github.com>
Date: Thu, 24 Mar 2022 23:09:10 +0100
Subject: [PATCH 0780/2561] html-xml-utils: update to 8.3.

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

diff --git a/srcpkgs/html-xml-utils/template b/srcpkgs/html-xml-utils/template
index ff073e7a740e..81fda5d90a25 100644
--- a/srcpkgs/html-xml-utils/template
+++ b/srcpkgs/html-xml-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'html-xml-utils'
 pkgname=html-xml-utils
-version=8.0
+version=8.3
 revision=1
 build_style=gnu-configure
 makedepends="libidn-devel"
@@ -9,4 +9,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="W3C"
 homepage="https://www.w3.org/Tools/HTML-XML-utils/README"
 distfiles="https://www.w3.org/Tools/HTML-XML-utils/${pkgname}-${version}.tar.gz"
-checksum=749059906c331c2c7fbaceee02466245a237b91bd408dff8f396d0734a060ae2
+checksum=a50c4d16dad660ad6792ef53bc77efa9d5729797623771a3fce52d8e23d3d08c

From 7d0536208bc4c4ddde671752c04ae4f29e2acc64 Mon Sep 17 00:00:00 2001
From: Vasteel <48246459+Vast-eel@users.noreply.github.com>
Date: Wed, 30 Mar 2022 12:56:17 +0200
Subject: [PATCH 0781/2561] font-sarasa-gothic: update to 0.36.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 534a4bf861fc..167c56b75ce8 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.34.3
+version=0.36.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=6938707af097f5bf899f570c886063860973193db9524468da0c27af4a36ce94
+checksum=cdc65aed713b5a991919755c712e0961e4388a7c3c636eed8e06b93bedf9a6f8
 
 font_dirs="/usr/share/fonts/TTF"
 

From b428b2a4621b664a4ca20a40a4abb98dc0558da1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 30 Mar 2022 16:39:24 -0500
Subject: [PATCH 0782/2561] fortune-mod: don't install offensive fortunes

Closes #36417.
---
 srcpkgs/fortune-mod/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fortune-mod/template b/srcpkgs/fortune-mod/template
index 59f0aa805009..e08c7d162d7f 100644
--- a/srcpkgs/fortune-mod/template
+++ b/srcpkgs/fortune-mod/template
@@ -1,7 +1,7 @@
 # Template file for 'fortune-mod'
 pkgname=fortune-mod
 version=1.99.1
-revision=6
+revision=7
 hostmakedepends="recode"
 makedepends="recode-devel"
 short_desc="Implementation of the BSDGames 'fortune' program"
@@ -11,6 +11,9 @@ homepage="http://www.redellipse.net/code/fortune"
 distfiles="${DEBIAN_SITE}/main/f/fortune-mod/${pkgname}_${version}.orig.tar.gz"
 checksum=fc51aee1f73c936c885f4e0f8b6b48f4f68103e3896eaddc6a45d2b71e14eace
 
+desc_option_offensive="Enable offensive fortunes"
+build_options="offensive"
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" fortune-mod"
 	_strfile="STRFILE=/usr/bin/strfile"
@@ -30,7 +33,7 @@ do_build() {
 }
 do_install() {
 	make prefix=${DESTDIR} FORTDIR=${DESTDIR}/usr/bin \
-		COOKIEDIR=$DESTDIR/usr/share/fortunes \
+		COOKIEDIR=$DESTDIR/usr/share/fortunes OFFENSIVE=$(vopt_if offensive 1 0) \
 		install
 	vlicense LICENSE
 }

From 470241ac32b364663f0992691bfb4b5f5c27a312 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:09:04 -0400
Subject: [PATCH 0783/2561] python3-Jinja2: update to 3.1.1.

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

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index caea80866dcc..d43e75d50b60 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-version=3.0.3
+version=3.1.1
 revision=1
 wrksrc="Jinja2-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
+checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
 
 post_install() {
 	vlicense LICENSE.rst

From d9411abe2c0fb7c48bbf4d186a4f702fa16a5db7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:09:19 -0400
Subject: [PATCH 0784/2561] python3-cppy: update to 1.2.1.

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

diff --git a/srcpkgs/python3-cppy/template b/srcpkgs/python3-cppy/template
index 3afd8399c77a..d94c660c25cc 100644
--- a/srcpkgs/python3-cppy/template
+++ b/srcpkgs/python3-cppy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cppy'
 pkgname=python3-cppy
-version=1.2.0
+version=1.2.1
 revision=1
 wrksrc="cppy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://cppy.readthedocs.io"
 changelog="https://raw.githubusercontent.com/nucleic/cppy/master/releasenotes.rst"
 distfiles="${PYPI_SITE}/c/cppy/cppy-${version}.tar.gz"
-checksum=95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc
+checksum=83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b
 
 post_install() {
 	vlicense LICENSE

From a4717861f7d3e10385990110413305ddcc5321aa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:11:12 -0400
Subject: [PATCH 0785/2561] python3-ipython: update to 8.2.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 07bdc201821d..dfaae66b583d 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.1.1
+version=8.2.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=8138762243c9b3a3ffcf70b37151a2a35c23d3a29f9743878c33624f4207be3d
+checksum=70e5eb132cac594a34b5f799bd252589009905f05104728aea6a403ec2519dc1
 conflicts="python-ipython<=5.8.0_2"
 
 do_check() {

From d2671c1c3d50af8fafa484c3186b44c3d2ee4b8d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:19:08 -0400
Subject: [PATCH 0786/2561] python3-hypothesis: update to 6.40.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 15b9d0f9b0cf..df2addcb45d0 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.39.0
+version=6.40.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=09f2077d400640a936392edbf068f5dfe182b48f70ab3c8592d8274b4ee13e36
+checksum=e68589666b903461e7437ea49043a7bd09a6e2cfd1cc32970b4ee19ffe2ed434
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From f4e8411b6a6052bf3e1d34cc2e15a35ea2a4a438 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:19:42 -0400
Subject: [PATCH 0787/2561] python3-quart: update to 0.17.0.

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

diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template
index 5e3114877ce4..1033468c7c82 100644
--- a/srcpkgs/python3-quart/template
+++ b/srcpkgs/python3-quart/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-quart'
 pkgname=python3-quart
-version=0.16.3
+version=0.17.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-pep517
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://gitlab.com/pgjones/quart"
 changelog="https://gitlab.com/pgjones/quart/-/blob/master/CHANGELOG.rst"
 distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz"
-checksum=84eabcb0da8b84eebcec31c27c59396425c6727ea6f7e524e8f1afc1aa161bb8
+checksum=1f879256b09daa4f7e9a141e90746f11103ce1f3a386f9480709e1d982768a9a
 
 do_check() {
 	# Tests require dist-info on the package, which is only in the wheel.

From 913835a81a9d5275aaec9c8080ff97a33794a2f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:19:55 -0400
Subject: [PATCH 0788/2561] python3-tifffile: update to 2022.3.25.

---
 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 00d4c6c3f391..65b0d119adef 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.3.16
+version=2022.3.25
 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=2e51c805be3a77f472c0cca3f0c13e60eb110fbfc305a20e278dad3d4e4fe4bf
+checksum=620c68f3eeb2b1923e1b3a8bf8a8b7f79498bcd9cd34051ad567c44f0a404353
 # Tests require unpackaged fsspec
 make_check=no
 

From e031028c6c650f4eafcc15e8ef58f89fa2a3c1f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:22:51 -0400
Subject: [PATCH 0789/2561] vkQuake: update to 1.13.0.

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

diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 6ae764cb6298..8c0174565c73 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
 # Template file for 'vkQuake'
 pkgname=vkQuake
-version=1.12.2
+version=1.13.0
 revision=1
 build_wrksrc="Quake"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Novum/vkQuake"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=6ce6d44dbc13d8d9b689efa32b19b2765257f3b859becf34cb2e894751ea046e
+checksum=baeab4fbea17bb41064b56a7e6e745f2856634c88d57ad86de97990399c24b3b
 
 do_install() {
 	vbin vkquake

From d2c46ca9e7c308ed230a2c2f70147768609410be Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Tue, 29 Mar 2022 23:59:51 +0530
Subject: [PATCH 0790/2561] wireplumber: add runit service

ahesford: add log sub-service, redirect stderr in run script
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>

Closes: #36416 [via git-merge-pr]
---
 srcpkgs/wireplumber/files/wireplumber/control/t |  2 ++
 srcpkgs/wireplumber/files/wireplumber/log/run   |  3 +++
 srcpkgs/wireplumber/files/wireplumber/run       | 10 ++++++++++
 srcpkgs/wireplumber/template                    |  3 ++-
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/wireplumber/files/wireplumber/control/t
 create mode 100644 srcpkgs/wireplumber/files/wireplumber/log/run
 create mode 100644 srcpkgs/wireplumber/files/wireplumber/run

diff --git a/srcpkgs/wireplumber/files/wireplumber/control/t b/srcpkgs/wireplumber/files/wireplumber/control/t
new file mode 100755
index 000000000000..a095b7bc777a
--- /dev/null
+++ b/srcpkgs/wireplumber/files/wireplumber/control/t
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid)
diff --git a/srcpkgs/wireplumber/files/wireplumber/log/run b/srcpkgs/wireplumber/files/wireplumber/log/run
new file mode 100644
index 000000000000..4dd58318870e
--- /dev/null
+++ b/srcpkgs/wireplumber/files/wireplumber/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -t wireplumber -p daemon.info
diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
new file mode 100644
index 000000000000..ae0cf99e200b
--- /dev/null
+++ b/srcpkgs/wireplumber/files/wireplumber/run
@@ -0,0 +1,10 @@
+#!/bin/sh
+# this service is experimental and most setups should start pipewire and wireplumber as a user,
+# for further information, please refer to the handbook
+
+sv check dbus >/dev/null 2>&1 || exit 1
+
+exec 2>&1
+
+export HOME=/var/run/pipewire
+exec chpst -u _pipewire:_pipewire:audio:video -P dbus-run-session wireplumber
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index e94c35b3eea5..dadbf62647fb 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.8
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -18,6 +18,7 @@ checksum=a7a84c21230c339a905704a9495dda10a4dec41a96bc115a9b33d24310a3f605
 
 post_install() {
 	vlicense LICENSE
+	vsv wireplumber
 }
 
 wireplumber-devel_package() {

From 4ae389fbd09b1840ba372e3d21653e0ac652c9a6 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 28 Mar 2022 19:49:52 +0530
Subject: [PATCH 0791/2561] mongoose: update to 7.6

Closes: #36395 [via git-merge-pr]
---
 srcpkgs/mongoose/patches/add-makefile.patch | 50 -----------------
 srcpkgs/mongoose/patches/fix-makefile.patch | 59 +++++++++++++++++++++
 srcpkgs/mongoose/patches/fix-tests.patch    | 17 ++++++
 srcpkgs/mongoose/template                   | 40 +++++++++++---
 4 files changed, 108 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/mongoose/patches/add-makefile.patch
 create mode 100644 srcpkgs/mongoose/patches/fix-makefile.patch
 create mode 100644 srcpkgs/mongoose/patches/fix-tests.patch

diff --git a/srcpkgs/mongoose/patches/add-makefile.patch b/srcpkgs/mongoose/patches/add-makefile.patch
deleted file mode 100644
index fd0b21095472..000000000000
--- a/srcpkgs/mongoose/patches/add-makefile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,47 @@
-+PROG		= mongoose
-+LIB         = lib$(PROG).so.0
-+
-+ifndef PREFIX
-+  PREFIX=/usr/local
-+endif
-+
-+ifndef DOCDIR
-+	DOCDIR=$(PREFIX)/share/$(PROG)/doc
-+endif
-+
-+CPPFLAGS+=-DMONGOOSE_ENABLE_THREADS -DMG_ENABLE_SSL
-+CFLAGS+=-fPIC -c -Wall
-+LDFLAGS+=-shared -lssl -pthread -lcrypto
-+
-+SRCS=mongoose.c
-+OBJS=mongoose.o
-+INCLUDE=.
-+
-+all: $(LIB)
-+
-+$(LIB): $(OBJS)
-+	$(CC) $(OBJS) $(LDFLAGS) -o $(LIB)
-+
-+$(OBJS): $(SRCS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDE) $(SRCS) -o $(OBJS)
-+
-+install: 
-+	install -d $(DESTDIR)$(PREFIX)/include
-+	install -m644 mongoose.h $(DESTDIR)$(PREFIX)/include
-+	install -d $(DESTDIR)$(PREFIX)/lib
-+	ln -sf $(LIB) $(LIB).0; cp -a $(LIB).0 $(DESTDIR)$(PREFIX)/lib
-+	ln -sf $(LIB) libmongoose.so; cp -a libmongoose.so $(DESTDIR)$(PREFIX)/lib
-+	install -m755 $(LIB) $(DESTDIR)$(PREFIX)/lib
-+	install -dm755 $(DESTDIR)$(DOCDIR)
-+	cp -a examples $(DESTDIR)$(DOCDIR)
-+	cp -a docs/* $(DESTDIR)$(DOCDIR)/
-+
-+	
-+test:
-+	$(MAKE) -C test/
-+clean:
-+	rm -f $(OBJS) $(LIB)
-+	$(MAKE) -C test/ clean
-+
-+.PHONY: clean test all
-+
diff --git a/srcpkgs/mongoose/patches/fix-makefile.patch b/srcpkgs/mongoose/patches/fix-makefile.patch
new file mode 100644
index 000000000000..d829ea8adc8c
--- /dev/null
+++ b/srcpkgs/mongoose/patches/fix-makefile.patch
@@ -0,0 +1,59 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,5 +5,5 @@ SRCS = mongoose.c test/unit_test.c test/packed_fs.c
+ OPTS ?= -O3 -g3
+ INCS ?= -Isrc -I.
+-CFLAGS ?= $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) $(EXTRA)
++CFLAGS := $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) $(CFLAGS)
+ SSL ?= MBEDTLS
+ CWD ?= $(realpath $(CURDIR))
+@@ -10,6 +10,9 @@ CWD ?= $(realpath $(CURDIR))
+ DOCKER ?= docker run --rm -e Tmp=. -e WINEDEBUG=-all -v $(CWD):$(CWD) -w $(CWD)
+ VCFLAGS = /nologo /W3 /O2 /I. $(DEFS) $(TFLAGS)
+ IPV6 ?= 1
++ifneq "$(NO_SANITIZE)" "1"
++SANITIZE = -fsanitize=address,undefined
++endif
+ ASAN_OPTIONS ?=
+ EXAMPLES := $(wildcard examples/*)
+ PREFIX ?= /usr/local
+@@ -19,12 +22,12 @@ VERSION ?= $(shell cut -d'"' -f2 src/version.h)
+ ifeq "$(SSL)" "MBEDTLS"
+ MBEDTLS ?= /usr
+ CFLAGS  += -DMG_ENABLE_MBEDTLS=1 -I$(MBEDTLS)/include -I/usr/include
+-LDFLAGS ?= -L$(MBEDTLS)/lib -lmbedtls -lmbedcrypto -lmbedx509
++LDFLAGS += -L$(MBEDTLS)/lib -lmbedtls -lmbedcrypto -lmbedx509
+ endif
+ ifeq "$(SSL)" "OPENSSL"
+ OPENSSL ?= /usr
+ CFLAGS  += -DMG_ENABLE_OPENSSL=1 -I$(OPENSSL)/include
+-LDFLAGS ?= -L$(OPENSSL)/lib -lssl -lcrypto
++LDFLAGS += -L$(OPENSSL)/lib -lssl -lcrypto
+ endif
+ 
+ all: mg_prefix unamalgamated unpacked test test++ arm examples vc98 vc2017 mingw mingw++ linux linux++ fuzz
+@@ -59,7 +62,7 @@ fuzz: fuzzer
+ 	$(RUN) ./fuzzer
+ 
+ # make CC=/usr/local/opt/llvm\@8/bin/clang ASAN_OPTIONS=detect_leaks=1
+-test: CFLAGS += -DMG_ENABLE_IPV6=$(IPV6) -fsanitize=address,undefined
++test: CFLAGS += -DMG_ENABLE_IPV6=$(IPV6) $(SANITIZE)
+ test: mongoose.h  Makefile $(SRCS)
+ 	$(CC) $(SRCS) $(CFLAGS) -coverage $(LDFLAGS) -g -o unit_test
+ 	ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./unit_test
+@@ -108,10 +111,12 @@ linux++: CC = g++
+ linux++: WARN += -Wno-missing-field-initializers
+ linux++: linux
+ 
+-linux-libs: CFLAGS += -fPIC
+-linux-libs: mongoose.o
+-	$(CC) mongoose.o $(LDFLAGS) -shared -o libmongoose.so.$(VERSION)
++.PHONY: linux-libs
++linux-libs: libmongoose.a libmongoose.so.$(VERSION)
++libmongoose.a: mongoose.o
+ 	$(AR) rcs libmongoose.a mongoose.o
++libmongoose.so.$(VERSION): mongoose.o
++	$(CC) mongoose.o $(LDFLAGS) -shared -o libmongoose.so.$(VERSION)
+ 
+ install: linux-libs
+ 	install -Dm644 libmongoose.a libmongoose.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib
diff --git a/srcpkgs/mongoose/patches/fix-tests.patch b/srcpkgs/mongoose/patches/fix-tests.patch
new file mode 100644
index 000000000000..8b25527492d5
--- /dev/null
+++ b/srcpkgs/mongoose/patches/fix-tests.patch
@@ -0,0 +1,17 @@
+Skip tests that want to connect to the internet
+
+--- a/test/unit_test.c
++++ b/test/unit_test.c
+@@ -1680,11 +1562,9 @@ int main(void) {
+   test_ws();
+   test_ws_fragmentation();
+   test_http_server();
+-  test_http_client();
+   test_http_no_content_length();
+   test_http_pipeline();
+   test_http_range();
+-  test_mqtt();
+   printf("SUCCESS. Total tests: %d\n", s_num_tests);
+   return EXIT_SUCCESS;
+ }
+
diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index eddadc647333..a81658710d7b 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,22 +1,44 @@
 # Template file for 'mongoose'
 pkgname=mongoose
-version=6.18
-revision=4
+version=7.6
+revision=1
 build_style=gnu-makefile
-make_use_env=compliant
+make_use_env=yes
+make_check_target=test
+make_build_target=linux-libs
 makedepends="openssl-devel"
-short_desc="Easy to use Web server"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="openssl-devel"
+short_desc="Embedded HTTP/WebSocket/MQTT library for C/C++"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
-homepage="https://cesanta.com/"
+homepage="https://mongoose.ws/"
 distfiles="https://github.com/cesanta/mongoose/archive/${version}.tar.gz"
-checksum=f5c10346abc9c72f7cac7885d853ca064fb09aad57580433941a8fd7a3543769
+checksum=1ef09d971b6de1a6317c109980d6fb5a9c19b39efef2506d6b76869644b3dafa
+
+# -Wno-error=unused-function: patched tests leave some functions unused
+# -Wno-error=sign-conversion: GCC falsely flags musl FD_{SET,ISSET,CLR}
+CFLAGS="-fPIC -Wno-error=sign-conversion -Wno-error=unused-function"
+
+export SSL=OPENSSL
+
+# libsanitizer-devel is currenly not available on musl
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	make_check_args+=" NO_SANITIZE=1"
+else
+	checkdepends+=" libsanitizer-devel"
+fi
+
+# GitHub CI runner doesn't support IPv6, causing tests to fail
+if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+	make_check_args+=" IPV6=0"
+fi
 
 mongoose-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
@@ -24,6 +46,8 @@ mongoose-devel_package() {
 mongoose-doc_package() {
 	short_desc+=" - documentation"
 	pkg_install() {
-		vmove usr/share
+		vmkdir "usr/share/${sourcepkg}/doc"
+		vcopy examples "usr/share/${sourcepkg}/doc"
+		vcopy "docs/*" "usr/share/${sourcepkg}/doc"
 	}
 }

From 5482c0476f4062afbe436ca9fecb1aa2eedfb8a3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 31 Mar 2022 02:59:29 +0200
Subject: [PATCH 0792/2561] qbittorrent: update to 4.4.2.

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

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index b7c236909ae5..b80695e80958 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.4.1
+version=4.4.2
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1386f000ce1d791469c3ea03e3951ca25f67f534e66896592bd12357dda9a8ec
+checksum=efa580924e96605bae916b9a8ae1f3fce82a5130647ae41d74d689761262463d
 
 do_extract() {
 	local n=${pkgname}-${version}

From 651e7a06fa587bf84a611655ef02f42563aacf40 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Mar 2022 13:45:35 +1100
Subject: [PATCH 0793/2561] iwd: update to 1.26.

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

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index c03b430976ed..66f55599c5e0 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.24
+version=1.26
 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=61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224
+checksum=0ff4541c2b7f14ec010c3cbd1f02350f1b58cb0c103412db22550e90d8040d6b
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From 3b67c089f69a6fb9671bb4cd34983569fbebeebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 31 Mar 2022 09:43:16 -0300
Subject: [PATCH 0794/2561] doxygen: update to 1.9.3.

---
 ...-Fix-memory-corruption-in-TextStream.patch | 40 -------------------
 srcpkgs/doxygen/template                      |  4 +-
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch

diff --git a/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch b/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch
deleted file mode 100644
index 80c7ff16d17e..000000000000
--- a/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-upstream PR: https://github.com/doxygen/doxygen/pull/8739
-
-What was happening is that the TextStream object is reused for multiple
-different files. Therefore, when one calls setStream(nullptr) or
-setFile(nullptr), m_f or m_s will, respectively, still contain a pointer
-to the previous member, which is used when one calls setFile() or
-setStream() again, since these methods will call flush().
-
-For example, a program doing
-
-   s.setFile(f1);
-   s.setStream(nullptr);
-   fclose(f1);
-   s.setFile(f2);
-
-will call fwrite(f1, ...). This pattern can be observed in many parts of
-Doxygen, so fixing it in TextStream itself by always zeroing the other
-pointer is the simplest fix.
-
-diff --git a/src/textstream.h b/src/textstream.h
-index 161ce7fe..38027ec0 100644
---- a/src/textstream.h
-+++ b/src/textstream.h
-@@ -67,11 +67,13 @@ class TextStream final
-     {
-       flush();
-       m_s = s;
-+      m_f = nullptr;
-     }
- 
-     void setFile(FILE *f)
-     {
-       flush();
-+      m_s = nullptr;
-       m_f = f;
-     }
- 
--- 
-2.33.0
-
diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index 8f5b986ceaf4..946ceeebcc11 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'doxygen'
 pkgname=doxygen
-version=1.9.2
+version=1.9.3
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="http://www.doxygen.org/"
 changelog="https://www.doxygen.nl/manual/changelog.html"
 distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz"
-checksum=060f254bcef48673cc7ccf542736b7455b67c110b30fdaa33512a5b09bbecee5
+checksum=f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0
 
 build_options="wizard"
 desc_option_wizard="build Qt5 GUI configuration tool, doxywizard"

From b85a05b00de5d2061db0e88854876d0030cca43a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 31 Mar 2022 09:43:28 -0300
Subject: [PATCH 0795/2561] libvarlink: update to 23.

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

diff --git a/srcpkgs/libvarlink/template b/srcpkgs/libvarlink/template
index 0633adbb17b4..43eb3ab89812 100644
--- a/srcpkgs/libvarlink/template
+++ b/srcpkgs/libvarlink/template
@@ -1,6 +1,6 @@
 # Template file for 'libvarlink'
 pkgname=libvarlink
-version=22
+version=23
 revision=1
 build_style=meson
 short_desc="C implementation of the Varlink protocol and command line tool"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="Apache-2.0"
 homepage="https://varlink.org/"
 distfiles="https://github.com/varlink/libvarlink/archive/refs/tags/${version}.tar.gz"
-checksum=932c0d7c3d2d8acdf5878d8fd8006887c5855189688d19eb09125682740b99bb
+checksum=a5575e070e446e7c4486d424393950e6cb7a3b376ee20d517b0c13a876659a8d
 
 libvarlink-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From be78bff36442f16f10b5a4f166d20690a9aef7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 31 Mar 2022 09:43:31 -0300
Subject: [PATCH 0796/2561] kstars: update to 3.5.8.

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

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index 11ab05b13b06..0b14040aff2e 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,6 +1,6 @@
 # Template file for 'kstars'
 pkgname=kstars
-version=3.5.5
+version=3.5.8
 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=703df56050672af10fc8142296ceaa27134a6a00e8222f3f6677f18ff1ac6b43
+checksum=660d902837b7abf3810d6e24f72fd84f0444a29bd7d43e1896b19fece1c88c3f

From 29d8ed6e20570db507c40a0e7ead1d6888549a2e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 31 Mar 2022 14:21:35 +0200
Subject: [PATCH 0797/2561] libX11: update to 1.7.4.

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

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 83d21c86ad17..53bd34be6e08 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.7.3.1
-revision=2
+version=1.7.4
+revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
-checksum=2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989
+checksum=0e7d48bfa0b0ee5705d14fe140cf4310744ed131f0a6241b7cf03db06000fe51
 
 do_configure() {
 	./configure ${configure_args}

From 700abf1ce4feec05d6ec41df314016577017487a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 31 Mar 2022 10:12:26 -0400
Subject: [PATCH 0798/2561] Revert "python3-Jinja2: update to 3.1.1."

python3-jupyter_nbconvert-6.0.7 is incompatible with Jinja >= 3.1.0, so
hold back until that package can be updated.

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

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index d43e75d50b60..6a4c28214cca 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,7 +1,8 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-version=3.1.1
-revision=1
+reverts="3.1.1_1"
+version=3.0.3
+revision=2
 wrksrc="Jinja2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +14,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
+checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
 
 post_install() {
 	vlicense LICENSE.rst

From 1f752268f523ceaab143115e0846b137406aab92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 19 Mar 2022 21:55:20 -0300
Subject: [PATCH 0799/2561] python3-sympy: update to 1.10.1.

Also fix integer_nthroot(2, 10**10) in 32 bit, reported upstream.
---
 .../patches/fix_integer_nthroot.patch         | 26 +++++++++++++++++++
 srcpkgs/python3-sympy/template                |  4 +--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch

diff --git a/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch b/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch
new file mode 100644
index 000000000000..0f4860a6c9e1
--- /dev/null
+++ b/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch
@@ -0,0 +1,26 @@
+Fix integer_nthroot(2, 10**10) in 32 bit.
+
+See: https://github.com/sympy/sympy/issues/18374#issuecomment-1081196879
+
+diff --git a/sympy/core/power.py b/sympy/core/power.py
+index 59ab7c53a4..ae3ee25c93 100644
+--- a/sympy/core/power.py
++++ b/sympy/core/power.py
+@@ -21,6 +21,8 @@
+
+ from mpmath.libmp import sqrtrem as mpmath_sqrtrem
+
++from ctypes import c_ulong
++ULONG_MAX = c_ulong(-1).value
+
+
+ def isqrt(n):
+@@ -74,7 +76,7 @@ def integer_nthroot(y, n):
+         raise ValueError("y must be nonnegative")
+     if n < 1:
+         raise ValueError("n must be positive")
+-    if HAS_GMPY and n < 2**63:
++    if HAS_GMPY and n <= ULONG_MAX:
+         # Currently it works only for n < 2**63, else it produces TypeError
+         # sympy issue: https://github.com/sympy/sympy/issues/18374
+         # gmpy2 issue: https://github.com/aleaxit/gmpy/issues/257
diff --git a/srcpkgs/python3-sympy/template b/srcpkgs/python3-sympy/template
index 807f0db5f1a2..3bb4df3bffdf 100644
--- a/srcpkgs/python3-sympy/template
+++ b/srcpkgs/python3-sympy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-sympy'
 pkgname=python3-sympy
-version=1.9
+version=1.10.1
 revision=1
 wrksrc="sympy-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://sympy.org/"
 distfiles="${PYPI_SITE}/s/sympy/sympy-${version}.tar.gz"
-checksum=c7a880e229df96759f955d4f3970d4cabce79f60f5b18830c08b90ce77cd5fdc
+checksum=5939eeffdf9e152172601463626c022a2c27e75cf6278de8d401d50c9d58787b
 
 post_install() {
 	vman doc/man/isympy.1

From 899939937c76f7084335ead47b63c7b112f10bb7 Mon Sep 17 00:00:00 2001
From: Petr Cizmar <xgt0322@xpc.ovh>
Date: Thu, 31 Mar 2022 16:40:10 +0200
Subject: [PATCH 0800/2561] New package: ctzcls-cups-1.5

---
 srcpkgs/ctzcls-cups/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/ctzcls-cups/template

diff --git a/srcpkgs/ctzcls-cups/template b/srcpkgs/ctzcls-cups/template
new file mode 100644
index 000000000000..38572c0fcbff
--- /dev/null
+++ b/srcpkgs/ctzcls-cups/template
@@ -0,0 +1,21 @@
+# Template file for 'ctzcls-cups'
+pkgname=ctzcls-cups
+version=1.5
+revision=1
+create_wrksrc=yes
+makedepends="cups-devel"
+short_desc="Citizen Sticker Printers driver for CUPS"
+maintainer="Petr Cizmar <xxb0322@xpc.ovh>"
+license="GPL-2.0-or-later"
+homepage="https://www.citizen-systems.co.jp/en/printer/download/driver-cups-source/"
+distfiles="https://www.citizen-systems.co.jp/en/printer/download/driver-cups-source/cups-ctzcls.tar.bz2"
+checksum=d3fe19aa253044c383df3a3869c9dac88b0ced374fe42eb24aabfe6a1ff72ff4
+
+do_build() {
+	$CC $CFLAGS -fPIC -o rastertocls rastertocls.c -lcupsimage -lcups $LDFLAGS
+}
+
+do_install() {
+	vinstall ctzcls.ppd 644 /usr/share/cups/model/
+	vinstall rastertocls 755 /usr/lib/cups/filter/
+}

From 6ade01013ba7ccc60c172b697138b5b027b4c783 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 20:44:27 +0200
Subject: [PATCH 0801/2561] meson: patch gtk-update-icon-cache detection

---
 ...me-fallback-to-gtk-update-icon-cache.patch | 26 +++++++++++++++++++
 srcpkgs/meson/template                        |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch

diff --git a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
new file mode 100644
index 000000000000..56a3f7cf3410
--- /dev/null
+++ b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
@@ -0,0 +1,26 @@
+From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Wed, 23 Mar 2022 22:15:11 +0100
+Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache
+
+Commit a0cade8f introduced a typo and wrongly check for
+gtk4-update-icon-cache twice.
+If gtk4-update-icon-cache (gtk4) is not found, look for
+gtk-update-icon-cache (gtk3) instead.
+---
+ mesonbuild/modules/gnome.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index 673a781a41d..501be9ae4da 100644
+--- a/mesonbuild/modules/gnome.py
++++ b/mesonbuild/modules/gnome.py
+@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: '
+             prog = state.find_program('gtk4-update-icon-cache', required=False)
+             found = isinstance(prog, build.Executable) or prog.found()
+             if not found:
+-                prog = state.find_program('gtk4-update-icon-cache')
++                prog = state.find_program('gtk-update-icon-cache')
+             icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
+             script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir])
+             script.skip_if_destdir = True
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 2f9ccaaa4691..adfa2d52f7ab 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
 version=0.61.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"

From a4a5ee77d2b470d28c7ee63001c2b1a362d43a36 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 31 Mar 2022 06:11:14 +0200
Subject: [PATCH 0802/2561] New package: helix-22.03

---
 srcpkgs/helix/files/hx                        |   2 +
 ...g-the-format-ident-Rust-feature-1881.patch | 104 ++++++++++++++++++
 srcpkgs/helix/template                        |  32 ++++++
 3 files changed, 138 insertions(+)
 create mode 100644 srcpkgs/helix/files/hx
 create mode 100644 srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch
 create mode 100644 srcpkgs/helix/template

diff --git a/srcpkgs/helix/files/hx b/srcpkgs/helix/files/hx
new file mode 100644
index 000000000000..a43e49fadc5b
--- /dev/null
+++ b/srcpkgs/helix/files/hx
@@ -0,0 +1,2 @@
+#!/bin/sh
+HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/hx "$@"
diff --git a/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch b/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch
new file mode 100644
index 000000000000..73eafa91cc1b
--- /dev/null
+++ b/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch
@@ -0,0 +1,104 @@
+From f2dd3d446914ec0953cd7e056d430fc3b959e75d Mon Sep 17 00:00:00 2001
+From: Marcin Puc <tranzystorek.io@protonmail.com>
+Date: Wed, 30 Mar 2022 02:08:30 +0200
+Subject: [PATCH] Avoid using the format ident Rust feature (#1881)
+
+---
+ helix-loader/src/grammar.rs      | 14 +++++++++-----
+ helix-term/src/commands/typed.rs |  4 ++--
+ helix-term/src/health.rs         |  9 +++++----
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
+index 299a06bf..f0c5ea28 100644
+--- a/helix-loader/src/grammar.rs
++++ b/helix-loader/src/grammar.rs
+@@ -63,12 +63,12 @@ pub fn get_language(name: &str) -> Result<Language> {
+     library_path.set_extension(DYLIB_EXTENSION);
+ 
+     let library = unsafe { Library::new(&library_path) }
+-        .with_context(|| format!("Error opening dynamic library {library_path:?}"))?;
++        .with_context(|| format!("Error opening dynamic library {:?}", library_path))?;
+     let language_fn_name = format!("tree_sitter_{}", name.replace('-', "_"));
+     let language = unsafe {
+         let language_fn: Symbol<unsafe extern "C" fn() -> Language> = library
+             .get(language_fn_name.as_bytes())
+-            .with_context(|| format!("Failed to load symbol {language_fn_name}"))?;
++            .with_context(|| format!("Failed to load symbol {}", language_fn_name))?;
+         language_fn()
+     };
+     std::mem::forget(library);
+@@ -133,7 +133,7 @@ where
+     // TODO: print all failures instead of the first one found.
+     rx.iter()
+         .find(|result| result.is_err())
+-        .map(|err| err.with_context(|| format!("Failed to {action} some grammar(s)")))
++        .map(|err| err.with_context(|| format!("Failed to {} some grammar(s)", action)))
+         .unwrap_or(Ok(()))
+ }
+ 
+@@ -238,12 +238,16 @@ fn build_grammar(grammar: GrammarConfiguration) -> Result<()> {
+     };
+ 
+     let grammar_dir_entries = grammar_dir.read_dir().with_context(|| {
+-        format!("Failed to read directory {grammar_dir:?}. Did you use 'hx --grammar fetch'?")
++        format!(
++            "Failed to read directory {:?}. Did you use 'hx --grammar fetch'?",
++            grammar_dir
++        )
+     })?;
+ 
+     if grammar_dir_entries.count() == 0 {
+         return Err(anyhow!(
+-            "Directory {grammar_dir:?} is empty. Did you use 'hx --grammar fetch'?"
++            "Directory {:?} is empty. Did you use 'hx --grammar fetch'?",
++            grammar_dir
+         ));
+     };
+ 
+diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
+index 8b7f481b..c921f85b 100644
+--- a/helix-term/src/commands/typed.rs
++++ b/helix-term/src/commands/typed.rs
+@@ -891,8 +891,8 @@ fn setting(
+     }
+     let (key, arg) = (&args[0].to_lowercase(), &args[1]);
+ 
+-    let key_error = || anyhow::anyhow!("Unknown key `{key}`");
+-    let field_error = |_| anyhow::anyhow!("Could not parse field `{arg}`");
++    let key_error = || anyhow::anyhow!("Unknown key `{}`", key);
++    let field_error = |_| anyhow::anyhow!("Could not parse field `{}`", arg);
+ 
+     let mut config = serde_json::to_value(&cx.editor.config().clone()).unwrap();
+     let pointer = format!("/{}", key.replace('.', "/"));
+diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs
+index f13d35f0..2a02e118 100644
+--- a/helix-term/src/health.rs
++++ b/helix-term/src/health.rs
+@@ -89,10 +89,11 @@ pub fn languages_all() {
+ 
+     let column = |item: &str, color: Color| {
+         let data = format!(
+-            "{:column_width$}",
++            "{:width$}",
+             item.get(..column_width - 2)
+-                .map(|s| format!("{s}…"))
+-                .unwrap_or_else(|| item.to_string())
++                .map(|s| format!("{}…", s))
++                .unwrap_or_else(|| item.to_string()),
++            width = column_width,
+         )
+         .stylize()
+         .with(color);
+@@ -158,7 +159,7 @@ pub fn language(lang_str: String) {
+     {
+         Some(l) => l,
+         None => {
+-            let msg = format!("Language '{lang_str}' not found");
++            let msg = format!("Language '{}' not found", lang_str);
+             println!("{}", msg.red());
+             let suggestions: Vec<&str> = syn_loader_conf
+                 .language
+-- 
+2.35.1
+
diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
new file mode 100644
index 000000000000..961a894092b7
--- /dev/null
+++ b/srcpkgs/helix/template
@@ -0,0 +1,32 @@
+# Template file for 'helix'
+pkgname=helix
+version=22.03
+revision=1
+build_style=cargo
+make_install_args="--path helix-term"
+hostmakedepends="git"
+short_desc="Post-modern modal text editor"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MPL-2.0"
+homepage="https://helix-editor.com/"
+changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md"
+distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz"
+checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4
+conflicts="hex>=0"
+
+# skip problematic doctests on i686
+case "$XBPS_TARGET_MACHINE" in
+	i686*) make_check_args="-- --skip src/";;
+	*) ;;
+esac
+
+post_install() {
+	rm runtime/grammars/.gitkeep
+	rm runtime/themes/README.md
+	rm -rf runtime/grammars/sources
+
+	vmkdir usr/lib/helix
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/
+	vcopy runtime usr/lib/helix
+	vbin ${FILESDIR}/hx
+}

From f6613f4d6d628b32858a22bb04d010a0b1da8e23 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 20:45:21 -0700
Subject: [PATCH 0803/2561] gtksourceview5: update to 5.4.0

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

diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index c4c7d94f51e8..81be2e5248da 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
 # Template file for 'gtksourceview5'
 pkgname=gtksourceview5
-version=5.2.0
+version=5.4.0
 revision=1
 wrksrc="gtksourceview-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
- $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
 makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala)
  pcre2-devel"
 checkdepends="xvfb-run cantarell-fonts"
@@ -16,9 +16,10 @@ short_desc="Text widget that extends GTK4 GtkTextView widget"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GtkSourceView"
-changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-2/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS"
 distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=c9b34fa02654f56ce22fa08827d89db4ba81631b2e6d7d31ea65d13c729430e9
+checksum=003bc217e670a8ec8aa3aece994b70e70b7d6b8074938adda21718555d84e637
 
 # Package build options
 build_options="gir gtk_doc"
@@ -42,7 +43,7 @@ gtksourceview5-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0

From 303abe31123a778c9ca29a0fcf8ddf08593b3b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 31 Mar 2022 21:58:28 +0200
Subject: [PATCH 0804/2561] python3-libarchive-c: update to 4.0.

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

diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index 1a4d1de77f2b..e84524799bda 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.2
+version=4.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=e09bd195f72646472f7514145f8f65fd371444d9c98123cd6ec7555048d57045
+checksum=5266797302af2707b6b61bce3b4ce417fe8a583fbeaaab5712dc6dcbf0de3c2b

From 18bd21c774ac3bcacc589cec95658daf262c433a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 31 Mar 2022 21:58:29 +0200
Subject: [PATCH 0805/2561] diffoscope: update to 209.

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

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 17a9cfd447be..9ce203fb8ff3 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=203
+version=209
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,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=d048dbbef81c6a77985f76b9a358e014461ac5c7b36920449fdc999e314654e7
+checksum=e845a0b6cd56c116fee670ae8497512489504dc911201bd77b7d65b8550618f6

From f68baba2eec0f52b68cc3baf6fc0566ca2b5a5d2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 18 Mar 2022 07:51:01 -0400
Subject: [PATCH 0806/2561] swaykbdd: update to 1.1.

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

diff --git a/srcpkgs/swaykbdd/template b/srcpkgs/swaykbdd/template
index 195b04475bc1..1434199c5f27 100644
--- a/srcpkgs/swaykbdd/template
+++ b/srcpkgs/swaykbdd/template
@@ -1,6 +1,6 @@
 # Template file for 'swaykbdd'
 pkgname=swaykbdd
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="MIT"
 homepage="https://github.com/artemsen/swaykbdd"
 distfiles="https://github.com/artemsen/swaykbdd/archive/v${version}.tar.gz"
-checksum=9de46256cafb2b002d4632e1a2f4ca2383e69b69de4d19d3d2d6f4825ef9fca2
+checksum=b1b0fa9ca43e177345a7761d0f9b705ff7d338fea48c1877a44767cf527b131c
 
 post_install() {
 	vlicense LICENSE

From d5f27a990383b93d5d299a144de43b9448edd978 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 21:09:07 +0200
Subject: [PATCH 0807/2561] gfbgraph: update to 0.2.5.

---
 srcpkgs/gfbgraph/template | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 85a7d27af6e8..63c6376122a2 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,51 +1,42 @@
 # Template file for 'gfbgraph'
 pkgname=gfbgraph
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool automake libtool gtk-doc which"
+configure_args="--disable-static $(vopt_enable gtk_doc gtk-doc)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
 makedepends="rest-devel json-glib-devel gnome-online-accounts-devel"
 short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GFBGraph"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379
+checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
+make_check=no # needs facebook credentials
 
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --disable-gtk-doc"
-else
-	configure_args+=" --enable-gtk-doc"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
 fi
 
-do_check() {
-	:
-}
-
-pre_configure() {
-	NOCONFIGURE=1 sh autogen.sh
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }
 
 gfbgraph-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ -z "$CROSS_BUILD" ]; then
+		if [ "$build_option_gtk_doc" ]; then
 			vmove usr/share/gtk-doc
 		fi
 		vmove "usr/lib/*.so"
-		if [ -z "$CROSS_BUILD" ]; then
+		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
 	}

From 518a04d7a4f9c0f86bee4e1c401ae89e293c911a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 31 Mar 2022 16:22:00 -0500
Subject: [PATCH 0808/2561] Amass: update to 3.19.0.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index a33e92ce1d2c..993c17d52c1c 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.18.3
+version=3.19.0
 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=66eee8ffd300e67a540e9962d2526377677df04b1a3b436471e0a930dd422a9f
+checksum=539c2207f844c81cc9a6286e436f26a1fc0690bf424ea1885844dd33002b7ef6

From b699d4f9f00743ca9c8cea2195c32197f0a4fdd1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 1 Apr 2022 00:09:11 +0200
Subject: [PATCH 0809/2561] libvirt-glib: remove unnecessary build deps

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

diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 032188df7f73..7ec4d9898239 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -6,9 +6,9 @@ build_helper="gir"
 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"
+hostmakedepends="pkg-config gettext glib-devel
+ $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
+makedepends="libglib-devel libvirt-devel libxml2-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 45a28a9085f1d58095eeb8b1c2388b82d41f3667 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 31 Mar 2022 17:18:12 -0500
Subject: [PATCH 0810/2561] jc: add missing depends

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

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index 8f510a980bc2..20a7438da19d 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,10 +1,10 @@
 # Template file for 'jc'
 pkgname=jc
 version=1.18.6
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-Pygments"
+depends="python3-Pygments python3-ruamel.yaml python3-xmltodict"
 checkdepends="python3-pytest $depends"
 short_desc="Convert to JSON"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 1e04633a6892b271f95ee2e6892fde63cb2de73c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 23:35:26 +0200
Subject: [PATCH 0811/2561] gnome-ssh-askpass: use gtk+3

---
 srcpkgs/gnome-ssh-askpass/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index fbd9174fae2f..558193ab2a19 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,10 +1,13 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
 version=8.9p1
-revision=1
+revision=2
 wrksrc="openssh-${version}"
+build_wrksrc="contrib"
+build_style=gnu-makefile
+make_build_target="gnome-ssh-askpass3"
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel"
+makedepends="gtk+3-devel"
 short_desc="GTK SSH passphrase grabber (from OpenSSH)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, BSD-2-Clause"
@@ -16,12 +19,7 @@ alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
 "
 
-do_build() {
-	cd contrib
-	${CC} ${CFLAGS} $(pkg-config --cflags gtk+-2.0) ${pkgname}2.c -o ${pkgname} $(pkg-config --libs gtk+-2.0) ${LDFLAGS} -lX11
-}
-
 do_install() {
-	vbin contrib/${pkgname}
-	vlicense LICENCE
+	vbin gnome-ssh-askpass3 gnome-ssh-askpass
+	vlicense ../LICENCE
 }

From c5c044cd7d41ea64814c02dc0f308a0ab8142de3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 16 Mar 2022 14:30:12 +0100
Subject: [PATCH 0812/2561] zellij: update to 0.27.0

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

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index e2ada810e570..72a9ab9e6e76 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,6 +1,6 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.26.0
+version=0.27.0
 revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
@@ -9,12 +9,12 @@ build_style=cargo
 build_helper=qemu
 checkdepends="openssl-devel pkg-config"
 short_desc="Terminal workspace with batteries included"
-maintainer="Marcin Puc <marcin.e.puc@gmail.com>"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="MIT"
 homepage="https://zellij.dev"
 changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz"
-checksum=f0b0cfe7b72ce842de80d5c32cc2abe624b3286fab16f313a4e43e226e95e87b
+checksum=6159482c25d3cb55b04d23230812f4450e88ff0975161594297a7deef8979a38
 
 post_build() {
 	ZELLIJ="target/${RUST_TARGET}/release/zellij"

From a5aec3609bdb8975a5733ac405c74f313cd37439 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 22:43:18 +0200
Subject: [PATCH 0813/2561] gtk4: update to 4.6.2.

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

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index a689633bf4d5..ed86ad7bab4c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.6.1
+version=4.6.2
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -13,7 +13,7 @@ configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
  -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+hostmakedepends="gettext-devel glib-devel gi-docgen perl
  pkg-config sassc gettext libxslt docbook-xsl python3-docutils
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
@@ -29,7 +29,7 @@ license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-6/NEWS"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=d85508d21cbbcd63d568a7862af5ecd63b978d7d5799cbe404c91d2389d0ec5f
+checksum=ff263af609a50eb76056653592d929459aef4819a444c436f6d52c6f63c1faec
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11"

From 830ca9c569302d06214fc1fa117500063b2b25da Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 26 Mar 2022 20:51:35 -0400
Subject: [PATCH 0814/2561] network-manager-applet: update to 1.26.0.

---
 .../patches/meson-0.61.patch                  | 33 -------------------
 srcpkgs/network-manager-applet/template       |  4 +--
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch

diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
deleted file mode 100644
index 1060e15b364a..000000000000
--- a/srcpkgs/network-manager-applet/patches/meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 21 Jan 2022 22:34:09 +0100
-Subject: [PATCH] meson.build: address meson 0.61 failures
-
-https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
----
- meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 33adb632..6178c0eb 100644
---- a/meson.build
-+++ b/meson.build
-@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
- 
- foreach desktop: desktop_files
-   i18n.merge_file(
--    desktop + '-desktop',
-     input: desktop + '.desktop.in',
-     output: desktop + '.desktop',
-     install: true,
-@@ -275,7 +274,6 @@ endforeach
- appdata = 'nm-connection-editor.appdata.xml'
- 
- i18n.merge_file(
--  'desktop',
-   input: appdata + '.in',
-   output: appdata,
-   install: true,
--- 
-GitLab
-
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 958d5b228960..8a8915bef3ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,6 +1,6 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.24.0
+version=1.26.0
 revision=1
 build_style=meson
 configure_args="-Dselinux=false"
@@ -16,5 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58
+checksum=69611b29064adbd57395fe3e51a9ebde1ea794615f776900453a2bbe3d8cddfd
 lib32disabled=yes

From dd73edde66c6a2bc69bcf1c036fad6ef98c88569 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 1 Apr 2022 01:31:30 +0200
Subject: [PATCH 0815/2561] glib-networking: update to 2.72.0.

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

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 5adca78241c4..fc1cbf840354 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.70.1
+version=2.72.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,11 +13,8 @@ short_desc="Network-related giomodules for glib"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-72/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
+checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
 lib32disabled=yes
-make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/lib/systemd
-}

From 71610584c77f07c6c3f31d487dfbd698509c6d75 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Apr 2022 03:14:51 +0200
Subject: [PATCH 0816/2561] helix: broken on ppc32

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

diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index 961a894092b7..17a819728ef2 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -20,6 +20,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) ;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="no AtomicU64 in sync::atomic";;
+esac
+
 post_install() {
 	rm runtime/grammars/.gitkeep
 	rm runtime/themes/README.md

From 10c0dfc40fd7dd9791162d302d91c37fb9474522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:41:50 -0300
Subject: [PATCH 0817/2561] giac: update to 1.7.0.53.

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

diff --git a/srcpkgs/giac/patches/micropy.patch b/srcpkgs/giac/patches/micropy.patch
new file mode 100644
index 000000000000..0e417a5a8ecb
--- /dev/null
+++ b/srcpkgs/giac/patches/micropy.patch
@@ -0,0 +1,18 @@
+--- a/src/icas.cc	2021-03-02 04:52:40.000000000 -0300
++++ b/src/icas.cc	2022-03-30 10:00:39.154056068 -0300
+@@ -1810,6 +1810,7 @@
+     cerr << "// Setting tex log" << '\n';
+     show_tex=true;
+   }
++#ifdef HAVE_LIBMICROPYTHON
+   if (getenv("GIAC_MICROPY")){
+     cerr << "Micropython mode\n";
+     python_compat(4 | python_compat(contextptr),contextptr);
+@@ -1821,6 +1822,7 @@
+       return 0;
+     }
+   }
++#endif
+ #ifdef HAVE_LIBREADLINE
+   if (ARGC==1){
+     int taillemax=1000;
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 2c192c2b858f..fbdadc31dde7 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,6 +1,6 @@
 # Template file for 'giac'
 pkgname=giac
-version=1.7.0.45
+version=1.7.0.53
 revision=1
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
@@ -12,8 +12,9 @@ short_desc="Free computer algebra system"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
+changelog="https://www-fourier.ujf-grenoble.fr/~parisse/install_en#new"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
-checksum=028b9e323d81a261a243c0768d5e12f3d76371eff05fd24cf2eb177b445f1da6
+checksum=74e5f98f63147c0197e4ce309601ae745312761be61c1a99c8a6bab4862e4a9f
 
 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"

From c3ca8565fe219c00589d971e2765bc45fbbb3361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:41:28 -0300
Subject: [PATCH 0818/2561] gp2c: update to 0.0.12pl1.

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

diff --git a/srcpkgs/gp2c/template b/srcpkgs/gp2c/template
index da996ed0972d..f82cf95c2d90 100644
--- a/srcpkgs/gp2c/template
+++ b/srcpkgs/gp2c/template
@@ -1,6 +1,6 @@
 # Template file for 'gp2c'
 pkgname=gp2c
-version=0.0.12
+version=0.0.12pl1
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl"
@@ -10,5 +10,6 @@ short_desc="PARI/GP Computer Algebra System - gp2c compiler"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="http://pari.math.u-bordeaux.fr/"
+changelog="http://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=gp2c.git;a=blob_plain;f=ChangeLog;hb=HEAD"
 distfiles="${homepage}pub/pari/GP2C/${pkgname}-${version}.tar.gz"
-checksum=ee9ff63979670408d8c293902ce7ff6a825145f0e7e7c6323764733ef1b9310d
+checksum=79a8c46f7ad3331e4d8ae6af6b496c4742fd73a73b996b3ca7ead61452ca6e8d

From ebcd9ef66e0476c2762ae1eac978f868cba6c48f Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Thu, 31 Mar 2022 17:12:18 -0500
Subject: [PATCH 0819/2561] Signal-Desktop: update to 5.37.0.

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

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 55591ea4c82f..a0b15428b926 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.36.0
+version=5.37.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=de158a8f4b19e3f8b849abf07fbb3d1b2207a3a08fde31aac328635e66a8a956
+checksum=bd674ea6ba0582862f26a8fed1557d21f68161ef05891e67ca4cb653bf0f8d1a
 nostrip_files="signal-desktop"
 
 post_extract() {

From ce927664c5959b7581c52b4e4d730bb6cfb5ecdb Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 31 Mar 2022 16:39:31 -0700
Subject: [PATCH 0820/2561] vte3: update to 0.68.0

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

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index f88f797740b9..d75cd4edef2f 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.66.2
+version=0.68.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=e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976
+checksum=13e7d4789ca216a33780030d246c9b13ddbfd04094c6316eea7ff92284dd1749
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From 38171d59cbbbe85455c675163c653ca92c3ac590 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 13:40:10 -0500
Subject: [PATCH 0821/2561] podman: update to 4.0.3.

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

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 95e0531abad8..a12ca2c32440 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
-version=4.0.2
-revision=3
+version=4.0.3
+revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://podman.io/"
 changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95
+checksum=e3b53fc9142d4f2dc085f17a377d92ffb8bfe7756c4f47b8128b38bcc3540cbc
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 8ebd46b4563c5064ad18338f5eab3d16d98fffcc Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 29 Mar 2022 05:26:18 -0400
Subject: [PATCH 0822/2561] onboard: fix SyntaxWarnings and disable tests

- A missing % operator was breaking a c-style format string, causing a
    SyntaxWarning to be trown twice at package install time (during
    byte-compilation).
- The tests were failing since they try to run 'killall' before executing
    onboard in xautomation(7), both not being possible in xbps-src.
---
 srcpkgs/onboard/patches/fix-brokenformat.patch | 15 +++++++++++++++
 srcpkgs/onboard/template                       |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/onboard/patches/fix-brokenformat.patch

diff --git a/srcpkgs/onboard/patches/fix-brokenformat.patch b/srcpkgs/onboard/patches/fix-brokenformat.patch
new file mode 100644
index 000000000000..e5d200208a93
--- /dev/null
+++ b/srcpkgs/onboard/patches/fix-brokenformat.patch
@@ -0,0 +1,15 @@
+Fix for https://bugs.launchpad.net/onboard/+bug/1948723
+
+
+--
+--- a/Onboard/LayoutLoaderSVG.py
++++ b/Onboard/LayoutLoaderSVG.py
+@@ -445,7 +445,7 @@
+             except KeyError as ex:
+                 (strerror) = ex
+                 raise Exceptions.LayoutFileError("Unrecognized modifier %s in" \
+-                    "definition of %s" (strerror, full_id))
++                    "definition of %s" % (strerror, full_id))
+ 
+         value = attributes.get("action")
+         if value:
diff --git a/srcpkgs/onboard/template b/srcpkgs/onboard/template
index c147bf58a65c..b138fae61897 100644
--- a/srcpkgs/onboard/template
+++ b/srcpkgs/onboard/template
@@ -1,7 +1,7 @@
 # Template file for 'onboard'
 pkgname=onboard
 version=1.4.1
-revision=9
+revision=10
 build_style=python3-module
 hostmakedepends="intltool pkg-config python3-distutils-extra"
 makedepends="dconf-devel eudev-libudev-devel gtk+3-devel hunspell-devel
@@ -14,3 +14,5 @@ license="GPL-3.0-or-later"
 homepage="https://launchpad.net/onboard"
 distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865
+# Tries to run onboard in tests, using xautomation(7)
+make_check=no

From ce907a5c949d2a005be14743a7f2bf87ca709b22 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 6 Mar 2022 15:12:54 -0500
Subject: [PATCH 0823/2561] go: update to 1.18.

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

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 990a575b7ae5..58f0b0fc2485 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.17.6
+version=1.18
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8
+checksum=38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6
 nostrip=yes
 noverifyrdeps=yes
 

From d24f7731917f6fbf617c7cd08d3f23cb2dc98bb9 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Wed, 30 Mar 2022 09:47:27 +0200
Subject: [PATCH 0824/2561] google-chrome: update to 100.0.4896.60

Closes: #36413 [via git-merge-pr]
---
 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 e6a568ca685d..a630fcdae463 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.84
+version=100.0.4896.60
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=96f260f798f1adb471a3a5b8e68702ef88237884e32f0e43baf15a78aed5b669
+checksum=05ba6d17d2704ffff1e1d554b40aaddabca9256b7e63ff73e99c469393de8a1f
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From ab23d76f5ce2f4917497a22a69ead7f906bfeeed Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:17:28 -0500
Subject: [PATCH 0825/2561] chronograf: update to 1.9.4.

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

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 50a08abafebb..db97744b814a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,6 +1,6 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.1
+version=1.9.4
 revision=1
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://www.influxdata.com/time-series-platform/chronograf/"
 distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz"
-checksum=df5600b2bd0b5ed0d3a3c548e5d72038b62fdda1501ad616eb1c1d82b054793a
+checksum=ff294f25a9de57140024b9953992c1a4d79ec88167ad28435645d888a0096c27
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"

From 5689e87546da0080620dd300666259799fadd314 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:23:58 -0500
Subject: [PATCH 0826/2561] libnss-cache: update to 0.20.

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

diff --git a/srcpkgs/libnss-cache/template b/srcpkgs/libnss-cache/template
index 49b1cc767801..da8d918e3a75 100644
--- a/srcpkgs/libnss-cache/template
+++ b/srcpkgs/libnss-cache/template
@@ -1,6 +1,6 @@
 # Template file for 'libnss-cache'
 pkgname=libnss-cache
-version=0.17
+version=0.20
 revision=1
 wrksrc=$pkgname-version-$version
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="LGPL-3.0"
 homepage="https://github.com/google/libnss-cache"
 distfiles="https://github.com/google/libnss-cache/archive/version/$version.tar.gz"
-checksum=3777cbc46dc8d08144b99321d1f039718cd347d3be8ed66a8cb3722d3e6692f5
+checksum=71324b6035674028a0f39c98aedfbaed94adbcddd72dc1c4ab81308b135dd586
 
 case "$XBPS_TARGET_MACHINE" in
 	*musl)

From 7de394d922581f33b2b41712909da1f3747f613c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:35:20 -0500
Subject: [PATCH 0827/2561] libpam-policycache: update to 0.11.

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

diff --git a/srcpkgs/libpam-policycache/template b/srcpkgs/libpam-policycache/template
index d40385708fe6..6777b0856dd6 100644
--- a/srcpkgs/libpam-policycache/template
+++ b/srcpkgs/libpam-policycache/template
@@ -1,7 +1,7 @@
 # Template file for 'libpam-policycache'
 pkgname=libpam-policycache
-version=0.10
-revision=2
+version=0.11
+revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="glib-devel libscrypt-devel pam-devel"
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/libpam-policycache"
 distfiles="https://github.com/google/libpam-policycache/archive/v$version.tar.gz"
-checksum=7a8210d4a64980af11ff770578e724f2eae2aca56b4cc5977902290468f5aaf0
+checksum=d1a074493d3a4076094a79093ec02c8fdd886069b9624d8b6765f7a1e840fae6
 CFLAGS="-Wno-error=deprecated-declarations"
 
 make_dirs="/etc/libpam-policycache.d 0755 root root

From e2c808123078519fceb98b420f8c31dcd5348e12 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:45:34 -0500
Subject: [PATCH 0828/2561] yarn-bin: update to 1.22.18.

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

diff --git a/srcpkgs/yarn-bin/template b/srcpkgs/yarn-bin/template
index 111cdd494574..01ce68263ade 100644
--- a/srcpkgs/yarn-bin/template
+++ b/srcpkgs/yarn-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'yarn-bin'
 pkgname=yarn-bin
-version=1.22.10
+version=1.22.18
 revision=1
 depends="virtual?nodejs-runtime"
 short_desc="Fast, reliable, and secure dependency management - precompiled binaries"
@@ -8,7 +8,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"
-checksum=7e433d4a77e2c79e6a7ae4866782608a8e8bcad3ec6783580577c59538381a6e
+checksum=816e5c073b3d35936a398d1fe769ebbcd517298e3510b649e8fc67cd3a62e113
 conflicts="yarn>=0"
 
 do_extract() {

From aaf18708d60b47f3ac57a2821aa8571d41ec970c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:51:16 -0500
Subject: [PATCH 0829/2561] yarn: update to 1.22.18.

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

diff --git a/srcpkgs/yarn/template b/srcpkgs/yarn/template
index aa9f68e53c4c..834d72024cc7 100644
--- a/srcpkgs/yarn/template
+++ b/srcpkgs/yarn/template
@@ -1,6 +1,6 @@
 # Template file for 'yarn'
 pkgname=yarn
-version=1.22.10
+version=1.22.18
 revision=1
 hostmakedepends="yarn-bin nodejs tar"
 depends="virtual?nodejs-runtime"
@@ -9,7 +9,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/${pkgname}/archive/v${version}.tar.gz"
-checksum=66153f5fdd3078ce320c775990e4b4f03d5b596186f0e1fbceb34225abe3cd3e
+checksum=accb0911b05329220a6fe7fd14d091add3b62535811ea97503e8579ae5812c2e
 
 conflicts="yarn-bin>=0"
 

From c1355a72f324ff2d46e66317a46dad17d64f5b43 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:58:48 -0500
Subject: [PATCH 0830/2561] .github/workflows: clean up cycle check

---
 .github/workflows/{cron.yml => cycles.yml} | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
 rename .github/workflows/{cron.yml => cycles.yml} (84%)

diff --git a/.github/workflows/cron.yml b/.github/workflows/cycles.yml
similarity index 84%
rename from .github/workflows/cron.yml
rename to .github/workflows/cycles.yml
index 1b53808a7588..e75297ac937d 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cycles.yml
@@ -1,18 +1,10 @@
-name: 'Scheduled tasks'
+name: 'Cycle Check'
 
 on:
   schedule:
     - cron: '0 18 * * *'
 
 jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v2
-        with:
-          github-token: ${{ github.token }}
-          pr-lock-inactive-days: '90'
-          process-only: 'prs'
   cycles:
     runs-on: ubuntu-latest
     container:

From 0764d7d82d42bb857789491582ec4a8e182ebd44 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 11:44:15 +0100
Subject: [PATCH 0831/2561] kodi-addon-pvr-zattoo: update to 19.7.11.

---
 srcpkgs/kodi-addon-pvr-zattoo/template | 7 +++----
 srcpkgs/kodi-addon-pvr-zattoo/update   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index 79ebdc6c30a5..e532a1bfdbe5 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-pvr-zattoo'
 pkgname=kodi-addon-pvr-zattoo
-version=19.7.8.1
-revision=3
+version=19.7.11
+revision=1
 _kodi_release=Matrix
 wrksrc="pvr.zattoo-${version}-${_kodi_release}"
 build_style=cmake
@@ -14,8 +14,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://github.com/rbuehlma/pvr.zattoo"
 distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz"
-checksum=25dc4ea72b5315a65286ba606e6e26d281fb8eb830d5e0164b66b8d7ae90319a
-make_check=no # No target to "make test"
+checksum=07d96b1b0c3b464c0bf02279fa8cab9ccdf675344129f3a970b14bafce225fb4
 
 if [ -n "${CROSS_BUILD}" ]; then
 	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/update b/srcpkgs/kodi-addon-pvr-zattoo/update
index 86efd6c4989a..b7c348dae80a 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/update
+++ b/srcpkgs/kodi-addon-pvr-zattoo/update
@@ -1,2 +1,2 @@
-ignore="19.* 512"
+ignore="20* 512"
 pattern='\K[\d\.]+(?=-[A-Z][a-z])'

From 0ddab417bbdfb402f38e1fa88c21cd1f05de3f0c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 20:14:50 +0200
Subject: [PATCH 0832/2561] emacs-gtk2: remove package

---
 srcpkgs/emacs-gtk2                |  1 -
 srcpkgs/emacs/template            | 20 +-------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/emacs-gtk2

diff --git a/srcpkgs/emacs-gtk2 b/srcpkgs/emacs-gtk2
deleted file mode 120000
index a7642dd168d6..000000000000
--- a/srcpkgs/emacs-gtk2
+++ /dev/null
@@ -1 +0,0 @@
-emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 1cd4d18bd6aa..9c4405ffc88e 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -9,7 +9,7 @@ configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)
  $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)"
 hostmakedepends="pkg-config tar"
-makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel
+makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
  dbus-devel acl-devel
  $(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel)
  $(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel)
@@ -41,7 +41,6 @@ pre_configure() {
 	mkdir -p nox
 	mv * nox || true
 	cp -a nox x11
-	cp -a nox gtk2
 	cp -a nox gtk3
 }
 
@@ -54,9 +53,6 @@ do_configure() {
 		$(vopt_with dbus) --without-gconf --without-gsettings \
 		${configure_args}
 
-	cd $wrksrc/gtk2
-	./configure --with-x-toolkit=gtk2 ${configure_args}
-
 	cd $wrksrc/gtk3
 	./configure --with-x-toolkit=gtk3 --with-xwidgets ${configure_args}
 }
@@ -64,7 +60,6 @@ do_configure() {
 do_build() {
 	make ${makejobs} -C nox
 	make ${makejobs} -C x11
-	make ${makejobs} -C gtk2
 	make ${makejobs} -C gtk3
 }
 
@@ -101,19 +96,6 @@ emacs-x11_package() {
 	}
 }
 
-emacs-gtk2_package() {
-	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
-	provides="emacs-${version}_${revision}"
-	replaces="emacs>=0"
-	short_desc+=" - GTK+2 version"
-	pkg_install() {
-		make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk2 install
-		rm -f ${PKGDESTDIR}/usr/bin/ctags
-		rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info}
-		rm -rf ${PKGDESTDIR}/usr/lib
-	}
-}
-
 emacs-gtk3_package() {
 	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
 	provides="emacs-${version}_${revision}"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df264c9d7501..d5a5e66b8b1a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -68,6 +68,7 @@ replaces="
  eclipse-ecj<=4.9_3
  electron7<=7.3.3_1
  electron9<=9.4.1_1
+ emacs-gtk2<=27.2_1
  enventor<=1.0.0_2
  epstopdf<=2.27_3
  flickcurl-devel<=1.26_4

From e93be9a166b32715117dca75e17ecb8e833e2ada Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 12:11:22 +0200
Subject: [PATCH 0833/2561] glib: bump shlibs

---
 common/shlibs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ccc55a1b3772..9f5333c203da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -84,11 +84,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.70.0_1
-libglib-2.0.so.0 glib-2.70.0_1
-libgmodule-2.0.so.0 glib-2.70.0_1
-libgio-2.0.so.0 glib-2.70.0_1
-libgobject-2.0.so.0 glib-2.70.0_1
+libgthread-2.0.so.0 glib-2.72.0_1
+libglib-2.0.so.0 glib-2.72.0_1
+libgmodule-2.0.so.0 glib-2.72.0_1
+libgio-2.0.so.0 glib-2.72.0_1
+libgobject-2.0.so.0 glib-2.72.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

From ba97e4a7bce062528304558e727b1de6f0400f1d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 12:12:16 +0200
Subject: [PATCH 0834/2561] vte3: bump shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 9f5333c203da..7079375524fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -821,7 +821,7 @@ libvpx.so.6 libvpx6-1.8.0_1
 libXevie.so.1 libXevie-1.0.2_1
 libatspi.so.0 at-spi2-core-1.91.91_1
 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
-libvte-2.91.so.0 vte3-0.52.2_1
+libvte-2.91.so.0 vte3-0.68.0_1
 libpipeline.so.1 libpipeline-1.2.0_1
 libosp.so.5 opensp-1.5.2_1
 libogrove.so.0 openjade-1.3.2_1

From fcf4205b6b32639fd12df267728a3f61b08ed5a8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 31 Mar 2022 20:36:55 -0400
Subject: [PATCH 0835/2561] hex: change binary name to avoid conflict

---
 srcpkgs/helix/template | 3 +--
 srcpkgs/hex/template   | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index 17a819728ef2..b454cc8fa87c 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -1,7 +1,7 @@
 # Template file for 'helix'
 pkgname=helix
 version=22.03
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path helix-term"
 hostmakedepends="git"
@@ -12,7 +12,6 @@ homepage="https://helix-editor.com/"
 changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md"
 distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz"
 checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4
-conflicts="hex>=0"
 
 # skip problematic doctests on i686
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/hex/template b/srcpkgs/hex/template
index 6295e03ddffe..07bf3c269d26 100644
--- a/srcpkgs/hex/template
+++ b/srcpkgs/hex/template
@@ -1,7 +1,7 @@
 # Template file for 'hex'
 pkgname=hex
 version=0.4.2
-revision=1
+revision=2
 build_style=cargo
 short_desc="Futuristic take on hexdump"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -11,5 +11,7 @@ distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=a7cc1ece337fc19e77fbbbca145001bc5d447bde4118eb6de2c99407eb1a3b74
 
 post_install() {
+	# avoid conflict with helix
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/bin/hex
 	vlicense LICENSE
 }

From 1196b8f205bcac14c9984709b4c22e70673c6d96 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 10:17:21 +0100
Subject: [PATCH 0836/2561] radicale: update to 3.1.5.

- remove conf file entry, because it changes filerights after updates
---
 srcpkgs/radicale/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 8d81e3b61304..65eb085022c0 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,6 +1,6 @@
 # Template file for 'radicale'
 pkgname=radicale
-version=3.1.4
+version=3.1.5
 revision=1
 wrksrc="Radicale-${version}"
 build_style=python3-module
@@ -14,11 +14,10 @@ license="GPL-3.0-or-later"
 homepage="https://radicale.org"
 changelog="https://github.com/Kozea/Radicale/blob/master/CHANGELOG.md"
 distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.gz"
-checksum=7658db3bb78ddb5934b573a875d1ef3ca6cfe932a4a15dc0c781126bea7f41c1
+checksum=1d631d0c0efd049c05fb32876d8e4f5662df4fa91f8aa6f52a994608d9a3e12d
 conf_files="
  /etc/radicale/config
  /etc/radicale/rights
- /etc/radicale/users
  /etc/sv/radicale/log/run"
 make_dirs="
  /etc/radicale 755 root root
@@ -33,7 +32,6 @@ replaces="radicale2<3.0.6"
 post_install() {
 	vinstall config 644 etc/radicale/
 	vinstall rights 640 etc/radicale/
-	vinstall /dev/null 640 etc/radicale users
 	vinstall config 644 usr/share/examples/radicale
 	vinstall radicale.wsgi 644 usr/share/radicale
 	vsv radicale

From cc1084958289361c50e8ec7aa9e19094d16fce22 Mon Sep 17 00:00:00 2001
From: Wesley Chan <wesley.chan@posteo.org>
Date: Tue, 19 Oct 2021 16:03:13 +0800
Subject: [PATCH 0837/2561] New package: acme.sh-3.0.2

---
 srcpkgs/acme.sh/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/acme.sh/template

diff --git a/srcpkgs/acme.sh/template b/srcpkgs/acme.sh/template
new file mode 100644
index 000000000000..92092c41e3b5
--- /dev/null
+++ b/srcpkgs/acme.sh/template
@@ -0,0 +1,24 @@
+# Template file for 'acme.sh'
+pkgname=acme.sh
+version=3.0.2
+revision=1
+short_desc="Pure Unix shell script implementing ACME client protocol"
+maintainer="Wesley Chan <wesley.chan@posteo.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/acmesh-official/acme.sh"
+distfiles="https://github.com/acmesh-official/acme.sh/archive/refs/tags/${version}.tar.gz"
+checksum=d6cda672697fe02cfa2a61bf74ec1b472aa797b03baead6deec625158965cee0
+
+do_install() {
+	vmkdir usr/share/acme.sh/deploy
+	vmkdir usr/share/acme.sh/dnsapi
+	vmkdir usr/share/acme.sh/notify
+	vmkdir usr/bin
+
+	vinstall acme.sh 755 usr/share/acme.sh/
+	vcopy deploy/*.sh usr/share/acme.sh/deploy/
+	vcopy dnsapi/*.sh usr/share/acme.sh/dnsapi/
+	vcopy notify/*.sh usr/share/acme.sh/notify/
+
+	ln -sf /usr/share/acme.sh/acme.sh ${DESTDIR}/usr/bin/acme.sh
+}

From 55d49169d350cd4b82e8afa5cac828c36ab1dddf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 29 Mar 2022 23:12:55 +0200
Subject: [PATCH 0838/2561] gawk: fix tests

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

diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template
index 0a79c2ca2c5e..b922097b01f7 100644
--- a/srcpkgs/gawk/template
+++ b/srcpkgs/gawk/template
@@ -21,6 +21,11 @@ alternatives="
 pre_check() {
 	vsed -i 's/done | more/done/g' test/Makefile
 
+	# This fixes tests on glibc, relevant tests on musl are disabled
+	# because the locale command doesn't exist.
+	vsed -i 's/en_US.ISO-8859-1//' test/localenl.sh
+	vsed -i '/^LC_ALL=en_US.ISO-8859-1 passed$/d' test/localenl.ok
+
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
 			vsed -i '/testext/d' test/Makefile

From 7205956db755d31dfd4b6403b86f0570f19a02fc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:16:03 +0200
Subject: [PATCH 0839/2561] snixembed: fix checksum

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

diff --git a/srcpkgs/snixembed/template b/srcpkgs/snixembed/template
index bc8c37948a8d..aa6dedb561e6 100644
--- a/srcpkgs/snixembed/template
+++ b/srcpkgs/snixembed/template
@@ -11,7 +11,7 @@ maintainer="projectmoon <projectmoon@agnos.is>"
 license="ISC"
 homepage="https://git.sr.ht/~steef/snixembed"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=7f49fcd891ffa58be8b7e387a73cfd5b98a354aad3af1c76d9960a07cd92340e
+checksum=1e735384a3edd80dcdc8a6d2cac39c1f7fd48543ab9488820e72851e62b0880b
 
 post_install() {
 	vlicense LICENSE

From 484fbbfcaba5dfaf451c69e4f509ad2cadfcf5b2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 2 Apr 2022 18:15:57 +0300
Subject: [PATCH 0840/2561] mousepad: update to 0.5.9.

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

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 1a85167aeb8e..a471702954e6 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,6 +1,6 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.8
+version=0.5.9
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=921ebbcfdfd5e2e56f31a5177a2d26f46c758cc972595017bca9e0a6a3c3a721
+checksum=f108a8c167ec5727266ab67666f10dbd60e972d56ea03944302fdabb2167f473

From c6195aa0fbba1b2af872b5441e92c42b34d573f7 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 30 Mar 2022 02:05:43 -0400
Subject: [PATCH 0841/2561] Manual.md: document the check functions

The pre_/do_/post_check functions were not listed in the list of building
phase functions, and were not mentioned elsewhere (do_check was mentioned
once). This documents their existence.
---
 Manual.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Manual.md b/Manual.md
index af5f698debae..8ec755499bbe 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1101,7 +1101,13 @@ still be passed in if it's a GNU configure script.
 
 - `post_build()` Actions to execute after `do_build()`.
 
-- `pre_install()` Actions to execute after `post_build()`.
+- `pre_check()` Actions to execute after `post_build()`.
+
+- `do_check()` Actions to execute to run checks for the package.
+
+- `post_check()` Actions to execute after `do_check()`.
+
+- `pre_install()` Actions to execute after `post_check()`.
 
 - `do_install()` Actions to execute to install the package files into the `fake destdir`.
 

From 9a69e20a0891e1a8bbdb0030a99b7f4db88973ca Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 2 Apr 2022 18:12:35 +0300
Subject: [PATCH 0842/2561] eclipse: update to 4.23.

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

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index cb4c8cfff427..d365b6ff06e5 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,9 +1,9 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.22
+version=4.23
 revision=1
 #code name of version
-_release=2021-12
+_release=2022-03
 archs="x86_64"
 wrksrc="eclipse"
 depends="openjdk11 gtk+3 webkit2gtk libXtst
@@ -19,7 +19,7 @@ _patch=R
 _edition=java
 _mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
 distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
-checksum=6d70a896ad70ef79f527447e5b0d1b373ca00179653ab2361aa9550d0a87068d
+checksum=2905e74afac8ecbaaf2563d4c14a1a28100a7a03cb4b73b540df3607ee5bfa6f
 python_version=2
 
 do_install() {

From 682479b94c51a433d029594367badadc13d1de73 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:12:13 +0200
Subject: [PATCH 0843/2561] gupnp-dlna: add missing build dependency

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

diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template
index 6286c09fb117..d88090126ee3 100644
--- a/srcpkgs/gupnp-dlna/template
+++ b/srcpkgs/gupnp-dlna/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)"
 hostmakedepends="automake libtool pkg-config $(vopt_if vala vala)"
-makedepends="gst-plugins-base1-devel $(vopt_if vala vala)"
+makedepends="gst-plugins-base1-devel libxml2-devel $(vopt_if vala vala)"
 short_desc="GUPnP DLNA"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From a41dd6d3ca97ba51c65caa05c8459d73f7b88d87 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 13 Feb 2022 23:08:59 -0500
Subject: [PATCH 0844/2561] New Package: python3-jq-1.2.2

---
 srcpkgs/python3-jq/patches/jq-py-setup.patch | 143 +++++++++++++++++++
 srcpkgs/python3-jq/template                  |  23 +++
 2 files changed, 166 insertions(+)
 create mode 100644 srcpkgs/python3-jq/patches/jq-py-setup.patch
 create mode 100644 srcpkgs/python3-jq/template

diff --git a/srcpkgs/python3-jq/patches/jq-py-setup.patch b/srcpkgs/python3-jq/patches/jq-py-setup.patch
new file mode 100644
index 000000000000..1eb4f28e7aa9
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/jq-py-setup.patch
@@ -0,0 +1,143 @@
+From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
+From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
+Date: Fri, 7 May 2021 19:14:20 -0400
+Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
+
+---
+ setup.py | 98 +-------------------------------------------------------
+ 1 file changed, 1 insertion(+), 97 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 663792c..3ebcabe 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,113 +1,19 @@
+ #!/usr/bin/env python
+ 
+ import os
+-import subprocess
+-import tarfile
+-import shutil
+-import sysconfig
+ 
+-import requests
+ from setuptools import setup
+-from setuptools.command.build_ext import build_ext
+ from setuptools.extension import Extension
+ 
+ 
+-def urlretrieve(source_url, destination_path):
+-    response = requests.get(source_url, stream=True)
+-    if response.status_code != 200:
+-        raise Exception("status code was: {}".format(response.status_code))
+-
+-    with open(destination_path, "wb") as fileobj:
+-        for chunk in response.iter_content(chunk_size=128):
+-            fileobj.write(chunk)
+-
+-def path_in_dir(relative_path):
+-    return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path))
+-
+-def dependency_path(relative_path):
+-    return os.path.join(path_in_dir("_deps"), relative_path)
+-
+ def read(fname):
+     return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ 
+ 
+-jq_lib_tarball_path = dependency_path("jq-lib-1.6.tar.gz")
+-jq_lib_dir = dependency_path("jq-1.6")
+-
+-oniguruma_version = "6.9.4"
+-oniguruma_lib_tarball_path = dependency_path("onig-{}.tar.gz".format(oniguruma_version))
+-oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version))
+-oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version))
+-
+-class jq_build_ext(build_ext):
+-    def run(self):
+-        if not os.path.exists(dependency_path(".")):
+-            os.makedirs(dependency_path("."))
+-        self._build_oniguruma()
+-        self._build_libjq()
+-        build_ext.run(self)
+-
+-    def _build_oniguruma(self):
+-        self._build_lib(
+-            source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version),
+-            tarball_path=oniguruma_lib_tarball_path,
+-            lib_dir=oniguruma_lib_build_dir,
+-            commands=[
+-                ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir],
+-                ["make"],
+-                ["make", "install"],
+-            ])
+-
+-
+-    def _build_libjq(self):
+-        self._build_lib(
+-            source_url="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz",
+-            tarball_path=jq_lib_tarball_path,
+-            lib_dir=jq_lib_dir,
+-            commands=[
+-                ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
+-                ["make"],
+-            ])
+-
+-    def _build_lib(self, source_url, tarball_path, lib_dir, commands):
+-        self._download_tarball(
+-            source_url=source_url,
+-            tarball_path=tarball_path,
+-            lib_dir=lib_dir,
+-        )
+-
+-        macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
+-        if macosx_deployment_target:
+-            os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
+-
+-        def run_command(args):
+-            print("Executing: %s" % ' '.join(args))
+-            subprocess.check_call(args, cwd=lib_dir)
+-
+-        for command in commands:
+-            run_command(command)
+-
+-    def _download_tarball(self, source_url, tarball_path, lib_dir):
+-        if os.path.exists(tarball_path):
+-            os.unlink(tarball_path)
+-        print("Downloading {}".format(source_url))
+-        urlretrieve(source_url, tarball_path)
+-        print("Downloaded {}".format(source_url))
+-
+-        if os.path.exists(lib_dir):
+-            shutil.rmtree(lib_dir)
+-        tarfile.open(tarball_path, "r:gz").extractall(dependency_path("."))
+-
+-
+ jq_extension = Extension(
+     "jq",
+     sources=["jq.c"],
+-    include_dirs=[os.path.join(jq_lib_dir, "src")],
+-    extra_link_args=["-lm"],
+-    extra_objects=[
+-        os.path.join(jq_lib_dir, ".libs/libjq.a"),
+-        os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
+-    ],
++    libraries=["jq"]
+ )
+ 
+ setup(
+@@ -120,7 +26,6 @@ setup(
+     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+     license='BSD 2-Clause',
+     ext_modules = [jq_extension],
+-    cmdclass={"build_ext": jq_build_ext},
+     classifiers=[
+         'Development Status :: 5 - Production/Stable',
+         'Intended Audience :: Developers',
+@@ -137,4 +42,3 @@ setup(
+         'Programming Language :: Python :: 3.9',
+     ],
+ )
+-
+-- 
+2.29.3
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
new file mode 100644
index 000000000000..52702247c217
--- /dev/null
+++ b/srcpkgs/python3-jq/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-jq'
+pkgname=python3-jq
+version=1.2.2
+revision=1
+wrksrc="${pkgname#*-}.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel jq-devel"
+depends="python3"
+short_desc="Python bindings for jq"
+maintainer="RunningDroid <runningdroid@zoho.com>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/jq/"
+distfiles="https://github.com/mwilliamson/jq.py/archive/${version}.tar.gz"
+checksum=0b926078855b6daee6e8ae5366ebf11c06911195abae643a7cdd37fce087fa0e
+
+pre_build() {
+	cython jq.pyx
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 6fd23298459d697a8b04c3a3599fd788c5904621 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 27 Mar 2022 00:46:22 -0400
Subject: [PATCH 0845/2561] python3-minidb: update to 2.0.6.

And remove pycompile_module so xlint passes
---
 srcpkgs/python3-minidb/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-minidb/template b/srcpkgs/python3-minidb/template
index 7c63ae3ef621..f901265dbc39 100644
--- a/srcpkgs/python3-minidb/template
+++ b/srcpkgs/python3-minidb/template
@@ -1,10 +1,9 @@
 # Template file for 'python3-minidb'
 pkgname=python3-minidb
-version=2.0.2
-revision=5
+version=2.0.6
+revision=1
 wrksrc="minidb-${version}"
 build_style=python3-module
-pycompile_module="minidb.py"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Simple SQLite3 store for Python objects"
@@ -12,7 +11,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="ISC"
 homepage="https://thp.io/2010/minidb/"
 distfiles="https://github.com/thp/minidb/archive/${version}.tar.gz"
-checksum=40a1992281dbfb63a90616db328c1babc3aabadd8844fdd676369e8df09d3b9f
+checksum=7e4ef07d858d6e6118dfd000031e7698fb29b44bd8fe38e713d241fcaec6ee1e
 
 post_install() {
 	sed -n '/# Copyright/,/OF THIS SOFTWARE./p' minidb.py > COPYING

From 02cc445b84139aed7820a690dd9eb66dfe626356 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 13 Feb 2022 23:09:28 -0500
Subject: [PATCH 0846/2561] urlwatch: update to 2.25.

---
 srcpkgs/urlwatch/patches/test_handler.patch | 14 ++++++++++++++
 srcpkgs/urlwatch/template                   | 10 +++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/urlwatch/patches/test_handler.patch

diff --git a/srcpkgs/urlwatch/patches/test_handler.patch b/srcpkgs/urlwatch/patches/test_handler.patch
new file mode 100644
index 000000000000..73f301e49f9f
--- /dev/null
+++ b/srcpkgs/urlwatch/patches/test_handler.patch
@@ -0,0 +1,14 @@
+Work around https://github.com/thp/urlwatch/issues/677
+
+diff --git a/lib/urlwatch/tests/test_handler.py b/lib/urlwatch/tests/test_handler.py
+index 736536a..fac9449 100644
+--- a/lib/urlwatch/tests/test_handler.py
++++ b/lib/urlwatch/tests/test_handler.py
+@@ -89,6 +89,7 @@ def test_pep8_conformance():
+ 
+ class ConfigForTest(CommandConfig):
+     def __init__(self, config, urls, cache, hooks, verbose):
++        sys.argv = sys.argv[:1]
+         (prefix, bindir) = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))
+         super().__init__('urlwatch', os.path.dirname(__file__), bindir, prefix, config, urls, hooks, cache, verbose)
+ 
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index a10260a19af1..0d15244c6acb 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,7 +1,7 @@
 # Template file for 'urlwatch'
 pkgname=urlwatch
-version=2.23
-revision=2
+version=2.25
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-appdirs python3-keyring python3-minidb python3-requests
@@ -9,18 +9,18 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests
 # Check the Docs for optional packages:
 # https://urlwatch.readthedocs.io/en/latest/dependencies.html#optional-packages
 checkdepends="python3-pytest python3-pycodestyle python3-docutils
- python3-Pygments ${depends}"
+ python3-Pygments python3-jq ${depends}"
 short_desc="Tool for monitoring webpages for updates"
 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=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842
+checksum=6802297d3318286e7f3d36b9a4567a2fb09b0ae779d4b76811dd29a7281c1f8a
 
 do_check() {
 	# skip the tests that require python modules that aren't packaged
 	# (pdftotext & pytesseract)
-	pytest -k "not (pdf or ocr or json)" -v
+	pytest -k 'not (pdf or ocr)' -v
 }
 
 post_install() {

From 4752d5b560412ab8583ebef3f30b242de3d3a77d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 2 Apr 2022 19:44:02 +0200
Subject: [PATCH 0847/2561] knot: update to 3.1.7.

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

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index bf1f6107ab5d..a8f43d8d92ae 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.6
+version=3.1.7
 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=e9ba1305d750dc08fb08687aec7ac55737ca073deaa0b867c884e0c0f2fdb753
+checksum=ffb6887e238ce4c7df0cc76bb55a5093465275201ac12156a3390782dc49857b
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From df39001d00ad0a12246ad010b3b09eed3d68959c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 2 Apr 2022 19:44:27 +0200
Subject: [PATCH 0848/2561] poke: update to 2.3.

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

diff --git a/srcpkgs/poke/template b/srcpkgs/poke/template
index b562e96c8a4c..126a3fd67bbe 100644
--- a/srcpkgs/poke/template
+++ b/srcpkgs/poke/template
@@ -1,6 +1,6 @@
 # Template file for 'poke'
 pkgname=poke
-version=2.1
+version=2.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.jemarch.net/poke.html"
 changelog="https://www.jemarch.net/poke-${version}-relnotes.html"
 distfiles="${GNU_SITE}/poke/poke-${version}.tar.gz"
-checksum=cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670
+checksum=3690cf1116da7cb3a9ec6b4f7003e253e268b510212a288fd38aafed0ebcc766
 
 poke-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From b0dade0488953eace0c75baedf0e1273c9d2d595 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 2 Apr 2022 21:38:24 +0200
Subject: [PATCH 0849/2561] obs: update to 27.2.4.

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

diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index f8599214a122..df6ee22e52ee 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
 # Template file for 'obs'
 pkgname=obs
-version=27.2.0
+version=27.2.4
 revision=1
 archs="i686* x86_64* ppc64le* aarch64*"
 wrksrc="obs-studio-${version}"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://obsproject.com"
 changelog="https://github.com/obsproject/obs-studio/releases"
 distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=c52d99cba6c536cb805e3e0f54663c33cfc43a1b7521bec97d241019499f9789
+checksum=f7297a7421cbfe2bb4bc6bf83659bb873bc8f1186667c35c34bdbaac3f0fd5fd
 
 obs-devel_package() {
 	short_desc+=" - development files"

From 530c405fb98acee5f464fc70b2274e220f5a3fac Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 18:09:45 -0400
Subject: [PATCH 0850/2561] python3-shapely: update to 1.8.1.

---
 srcpkgs/python3-shapely/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index 8a1cf7158476..7ca8f0ddd041 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-shapely'
 pkgname=python3-shapely
-version=1.8.0
-revision=2
-wrksrc="Shapely-${version}"
+version=1.8.1
+revision=1
+wrksrc="shapely-${version}"
 build_style=python3-module
 build_helper=numpy
+make_check_target=tests
 hostmakedepends="python3-setuptools python3-Cython geos"
 makedepends="python3-devel python3-numpy geos-devel"
 depends="python3"
@@ -12,9 +13,9 @@ checkdepends="python3-pytest"
 short_desc="Library for manipulation and analysis of geometric objects for Python3"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
-homepage="https://github.com/Toblerity/Shapely"
-distfiles="https://github.com/Toblerity/Shapely/archive/${version}.tar.gz"
-checksum=492d4207b20541e3d0f31c238e07d2f55fe5e00afcfd12390bf55737901fce91
+homepage="https://github.com/shapely/shapely"
+distfiles="https://github.com/shapely/shapely/archive/${version}.tar.gz"
+checksum=daf4d5ceae7d1e4053d96af760377b843787cae0b42e6d9d19eb832204c7c8a4
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -29,7 +30,3 @@ pre_configure() {
 post_install() {
 	vlicense LICENSE.txt LICENSE
 }
-
-do_check() {
-	python3 -m pytest tests/
-}

From 1e45dbc1d7d66f86ab3cb942aaf9fa4322682abe Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 13:16:51 -0400
Subject: [PATCH 0851/2561] python3-pycollada: update to 0.7.2.

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

diff --git a/srcpkgs/python3-pycollada/template b/srcpkgs/python3-pycollada/template
index 7aae12006353..89e7c15a05b1 100644
--- a/srcpkgs/python3-pycollada/template
+++ b/srcpkgs/python3-pycollada/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycollada'
 pkgname=python3-pycollada
-version=0.7.1
-revision=3
+version=0.7.2
+revision=1
 wrksrc="pycollada-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://pycollada.readthedocs.io/en/latest/"
 distfiles="https://github.com/pycollada/pycollada/archive/v${version}.tar.gz"
-checksum=b0b8e1fd17e3e5a7c1befcb5ec4fa0ead1318c5ca340bb930f62f9809fbce8a1
+checksum=e3c29857a65b3dd9c0375c1074195195fc3dada95d6b5c78d246b005f2e85c93
 
 post_install() {
 	vlicense COPYING

From 42bdfe86987e4a4d6b6037ba9e6a9caf7cf03e1f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 14 Dec 2021 14:45:51 -0500
Subject: [PATCH 0852/2561] python3-trimesh: update to 3.10.7.

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

diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index e716da771676..e51b6eb62f9d 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.34
+version=3.10.7
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -10,14 +10,13 @@ depends="python3-numpy python3-scipy python3-networkx python3-lxml
  python3-pyglet python3-shapely python3-rtree python3-Pillow python3-svg.path
  python3-jsonschema python3-psutil python3-chardet python3-sympy python3-msgpack
  python3-pycollada python3-requests"
-# unit tests fail on x86 https://github.com/mikedh/trimesh/issues/690
 checkdepends="$depends python3-pytest"
 short_desc="Python3 library for loading and using triangular meshes"
 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=713a959be0f93c049d0735f573b814cfa704c5bbfaf0c607facb61ede5a8ab2e
+checksum=e98fd2dff632729fc6fb963653b91d9f4a5a6a9a1f79493dd885e3e4d1f9c4da
 
 post_install() {
 	vlicense LICENSE.md
@@ -29,3 +28,8 @@ do_check() {
 	vsed -i 's/coveralls//' setup.py
 	python3 -m pytest
 }
+
+# disable tests for i686
+if [ "$XBPS_WORDSIZE" -eq "32" ]; then
+	make_check=no # https://github.com/mikedh/trimesh/issues/690;
+fi

From e8936df40068222f37f53a508495d0642e190958 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 00:12:43 +0300
Subject: [PATCH 0853/2561] gopls: update to 0.8.2.

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

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 434fc7fd0de8..963253e7b4ee 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.4
+version=0.8.2
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=7ce445846ffb0a33faed244206b142f9d307f326a35d09d18c6267538203bcf7
+checksum=761aa768e82a958e6f803db39215c995fe0f263df825ed1cbb9f6b2989f0cd00
 
 post_install() {
 	vlicense ../LICENSE

From 2509f911c02fd8c6eb0a5d3e3b90e2a48df9b164 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 1 Apr 2022 19:40:47 +0400
Subject: [PATCH 0854/2561] calibre: update to 5.40.0.

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

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 9f59df3a0350..036b195ac996 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.39.0
+version=5.40.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=2fbe45ec9d4dea481772cc290e27567efdba60cd9d2fe736713d9b1eb020582e
+checksum=e0ec0e2352926f165f4b9cbe67666ea2bd181f7cb702e98487391168a099d794
 python_version=3
 lib32disabled=yes
 nocross=yes

From dcf745ab28549db4668ebbf4216da608c66e9124 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sat, 2 Apr 2022 11:09:17 -0400
Subject: [PATCH 0855/2561] python3-svg.path: update to 5.1.

---
 srcpkgs/python3-svg.path/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template
index 6abf6ff8ca83..0d92697a0a9a 100644
--- a/srcpkgs/python3-svg.path/template
+++ b/srcpkgs/python3-svg.path/template
@@ -1,17 +1,20 @@
 # Template file for 'python3-svg.path'
 pkgname=python3-svg.path
-version=4.1
-revision=3
+version=5.1
+revision=1
 wrksrc="svg.path-${version}"
 build_style=python3-module
+# disable failing test
+make_check_args="-k not(ImageTest)"
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest-cov python3-Pillow"
 short_desc="Python3 SVG path parser"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://github.com/regebro/svg.path"
 distfiles="https://github.com/regebro/svg.path/archive/${version}.tar.gz"
-checksum=8fe78a5ff8f379c78dac4a3ba623068a8a2af434dace24103a053e06525d400d
+checksum=2ea5351a5886f8c55ae8fddb2f7182dca3d5760c03abade9cb256b91e4bb9bb4
 
 post_install() {
 	vlicense LICENSE.txt

From 3b7e2c547d28cefc3612f8887a6e88eb5c76df03 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 2 Apr 2022 16:07:02 +0300
Subject: [PATCH 0856/2561] qutebrowser: update to 2.5.0.

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

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 5dc61ab30aa9..4368870992a4 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.4.0
+version=2.5.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=f2cd9abb14ebabf9630573b2fb8447be192877787dc4e3964e1b55f72a8592ec
+checksum=e18442a230570f25918a2e89ad4d073ace46c4f59b5fdda2e80ab3c4764451fd
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures

From d2f0e8570532a144f0125de4c5c1a54a1efe0398 Mon Sep 17 00:00:00 2001
From: Bas Ploeger <5904333+basploeger@users.noreply.github.com>
Date: Fri, 1 Apr 2022 20:59:18 +0200
Subject: [PATCH 0857/2561] html-xml-utils: update to 8.4.

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

diff --git a/srcpkgs/html-xml-utils/template b/srcpkgs/html-xml-utils/template
index 81fda5d90a25..8086cc668499 100644
--- a/srcpkgs/html-xml-utils/template
+++ b/srcpkgs/html-xml-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'html-xml-utils'
 pkgname=html-xml-utils
-version=8.3
+version=8.4
 revision=1
 build_style=gnu-configure
 makedepends="libidn-devel"
@@ -9,4 +9,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="W3C"
 homepage="https://www.w3.org/Tools/HTML-XML-utils/README"
 distfiles="https://www.w3.org/Tools/HTML-XML-utils/${pkgname}-${version}.tar.gz"
-checksum=a50c4d16dad660ad6792ef53bc77efa9d5729797623771a3fce52d8e23d3d08c
+checksum=41bb9b14e1f4cd6102e3f8dfb79e7146a24c09693869873165c421769a57d137

From f74de9841cf86c158d4a6a886cfa377bbe50934f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 1 Apr 2022 20:08:19 +0400
Subject: [PATCH 0858/2561] libgcrypt: update to 1.10.1.

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

diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index b3285e6f8edf..52cae3478601 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -1,6 +1,6 @@
 # Template file for 'libgcrypt'
 pkgname=libgcrypt
-version=1.10.0
+version=1.10.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-static --without-capabilities"
@@ -10,7 +10,7 @@ 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=6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81
+checksum=ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_sys_symbol_underscore=no"

From 23392c167181c06254ca06e10806337202373494 Mon Sep 17 00:00:00 2001
From: Ricardo Steijn <ricardo.steijn97@gmail.com>
Date: Sat, 2 Apr 2022 19:06:32 +0200
Subject: [PATCH 0859/2561] lutris: update to 0.5.10

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

diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 431fcf6c59a2..a59268c0c167 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,6 +1,6 @@
 # Template file for 'lutris'
 pkgname=lutris
-version=0.5.9.1
+version=0.5.10
 revision=1
 build_style=meson
 hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
@@ -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=c140ec6ac62b4f9eeaa7065229dfa1c4fb08194bc0fb118c831d894c43914f88
+checksum=f174fdbff15bb26c4bdf531d4e75b9e3954f858297f811cb478f46a9d183f2d0

From 7add5479816c4b50d727a3fccd96bf2daf57cd7d Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 1 Apr 2022 16:00:59 +0200
Subject: [PATCH 0860/2561] qpwgraph: update to 0.2.4.

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

diff --git a/srcpkgs/qpwgraph/template b/srcpkgs/qpwgraph/template
index cb19601bbb89..5e83972a7062 100644
--- a/srcpkgs/qpwgraph/template
+++ b/srcpkgs/qpwgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'qpwgraph'
 pkgname=qpwgraph
-version=0.2.2
+version=0.2.4
 revision=1
 wrksrc="qpwgraph-v${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.freedesktop.org/rncbc/qpwgraph"
 changelog="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/ChangeLog"
 distfiles="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/archive/v${version}/qpwgraph-v${version}.tar.gz"
-checksum=622592c7fab8be3281eefee8979706ea8a063c98eb0f48a0c4c87655c3de7abf
+checksum=5e2ad77e794367e3e1e6df5214e8770135941092ffac49bbbaaf7619decb54b5

From c675105503e4fc74cffd6926bf3ad292e67a4897 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 31 Mar 2022 02:49:32 +0200
Subject: [PATCH 0861/2561] shared-mime-info: update to 2.2.

---
 .../shared-mime-info/patches/meson-0.60.patch | 100 ------------------
 srcpkgs/shared-mime-info/template             |   8 +-
 2 files changed, 4 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/shared-mime-info/patches/meson-0.60.patch

diff --git a/srcpkgs/shared-mime-info/patches/meson-0.60.patch b/srcpkgs/shared-mime-info/patches/meson-0.60.patch
deleted file mode 100644
index 2faa59925845..000000000000
--- a/srcpkgs/shared-mime-info/patches/meson-0.60.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Mon, 8 Nov 2021 18:22:47 -0500
-Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating
- translated XML
-
-gettext upstream has supported this for a very long time (since 0.19.7
-via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015),
-and itstool is (mostly) a legacy of the time before gettext had proper
-support for these sorts of use cases.
-
-This is similar to the state of intltool, which is described at
-https://wiki.gnome.org/MigratingFromIntltoolToGettext
-
-During the port from autotools to meson, the legacy use of itstool was
-faithfully translated to meson in the only way possible: by jumping
-through hoops to run ninja inside ninja in order to generate the .mo
-files for itstool, because meson's i18n module used a flawed design and
-there was no "real" target to create those files, only a .PHONY
-run_target which other rules cannot depend on.
-
-Although meson 0.60.0 added support for real targets for the built .mo
-files, this changed the rules for output filenames, breaking the script.
-
-But msgfmt does not care, and anyways comes with builtin meson functions
-for convenient use with XML files. So let's take this opportunity to
-drop legacy dependencies and use the modern, builtin tooling, which
-fixes this bug as a side effect.
-
-Fixes #170
----
- .gitlab-ci.yml               |  2 --
- README.md                    |  2 +-
- data/freedesktop_generate.sh | 12 ------------
- data/meson.build             | 16 +++++-----------
- meson.build                  |  1 -
- 5 files changed, 6 insertions(+), 27 deletions(-)
- delete mode 100755 data/freedesktop_generate.sh
-
-diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh
-deleted file mode 100755
-index 62ccffa..0000000
---- a/data/freedesktop_generate.sh
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#!/bin/sh -e
--
--src_root="$1"
--build_root="$2"
--
--ninja -C "${build_root}" shared-mime-info-gmo
--
--itstool \
--    --its "${src_root}/data/its/shared-mime-info.its" \
--    --join "${src_root}/data/freedesktop.org.xml.in" \
--    -o "${build_root}/data/freedesktop.org.xml" \
--    "${build_root}/po/"*".gmo"
-diff --git a/data/meson.build b/data/meson.build
-index 24361c9..09ed7a9 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,18 +1,12 @@
- 
- install_man('update-mime-database.1')
- 
--freedesktop_org_xml = custom_target('freedesktop.org.xml',
--    input : files(
--        'freedesktop.org.xml.in',
--        'its/shared-mime-info.its',
--        'its/shared-mime-info.loc',
--    ),
-+freedesktop_org_xml = i18n.merge_file(
-+    input: 'freedesktop.org.xml.in',
-     output: 'freedesktop.org.xml',
--    command: [
--        find_program('freedesktop_generate.sh'),
--        meson.source_root(),
--        meson.build_root()
--    ],
-+    data_dirs: '.',
-+    po_dir: '../po',
-+    type: 'xml',
-     install: true,
-     install_dir: get_option('datadir') / 'mime' / 'packages',
- )
-diff --git a/meson.build b/meson.build
-index 0d08c8a..60f17ae 100644
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ config.set_quoted('VERSION', meson.project_version())
- ###############################################################################
- # Find tools
- 
--itstool = find_program('itstool')
- xmllint = find_program('xmllint')
- xmlto   = find_program('xmlto', required: false)
- 
--- 
-GitLab
-
diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template
index f5afb2dd54c9..0fd71959fff0 100644
--- a/srcpkgs/shared-mime-info/template
+++ b/srcpkgs/shared-mime-info/template
@@ -1,7 +1,7 @@
 # Template file for 'shared-mime-info'
 pkgname=shared-mime-info
-version=2.1
-revision=2
+version=2.2
+revision=1
 build_style=meson
 configure_args="-Dupdate-mimedb=false"
 hostmakedepends="pkg-config gettext xmlto"
@@ -11,5 +11,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://freedesktop.org/Software/shared-mime-info"
 changelog="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-${version}.tar.xz"
-checksum=b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563
+distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${version}/shared-mime-info-${version}.tar.gz"
+checksum=bcf5d552318136cf7b3ae259975f414fbcdc9ebce000c87cf1f0901ff14e619f

From 06393c7ba7219ccbd6f43477930ca9f3cfd76a18 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Mar 2022 19:28:16 +0200
Subject: [PATCH 0862/2561] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 -------------
 srcpkgs/chatterino2/patches/cmake.patch       | 36 ++++++++
 srcpkgs/chatterino2/template                  | 84 ++++++++++---------
 4 files changed, 92 insertions(+), 99 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch
 create mode 100644 srcpkgs/chatterino2/patches/cmake.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..9f41d03190b7
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- a/chatterino2/resources/com.chatterino.chatterino.desktop
++++ b/chatterino2/resources/com.chatterino.chatterino.desktop
+@@ -4,7 +4,7 @@ Version=1.0
+ Name=Chatterino
+ Comment=Chat client for Twitch
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
new file mode 100644
index 000000000000..a59d0a4eb9f0
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -0,0 +1,36 @@
+diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
+index 82905436..b0b89a4e 100644
+--- a/chatterino2/cmake/FindLRUCache.cmake
++++ b/chatterino2/cmake/FindLRUCache.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache)
++find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
+index 4671874c..119284c2 100644
+--- a/chatterino2/cmake/FindPajladaSerialize.cmake
++++ b/chatterino2/cmake/FindPajladaSerialize.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include)
++find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
+index f4c964ec..75efba20 100644
+--- a/chatterino2/cmake/FindPajladaSignals.cmake
++++ b/chatterino2/cmake/FindPajladaSignals.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include)
++find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR)
+ 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..e1f99ac9e9fc 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,57 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+create_wrksrc=yes
+build_wrksrc="chatterino2"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
+	LIBS="-latomic"
 fi
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	mv "chatterino2-${version}" "${build_wrksrc}"
+	rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \
+	      ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \
+	      ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \
+	      ${build_wrksrc}/lib/qtkeychain ${build_wrksrc}/cmake/sanitizers-cmake
+	mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni"
+	mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize"
+	mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings"
+	mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals"
+	mv "qtkeychain-${_qtkeychain_commit}" "${build_wrksrc}/lib/qtkeychain"
+	mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake"
 }
 
 post_install() {

From 546885448dfd2eb98e3af2fcd677710f2ab92ea5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 1 Apr 2022 21:45:08 +0200
Subject: [PATCH 0863/2561] sonic-visualiser: update to 4.5

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

diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index fbc1ea3067c2..a61f4cf5721e 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,7 +1,7 @@
 # Template file for 'sonic-visualiser'
 pkgname=sonic-visualiser
-version=4.4
-revision=2
+version=4.5
+revision=1
 build_style=meson
 hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
 makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.sonicvisualiser.org/"
 changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
 distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
-checksum=762d95cfceff5f2ba31bb632596f6c822ca5b4ee21f3e3615add20bfc24ae16e
+checksum=c57b8277b51e7b0accdc6c3b5a575d3961b43ed9e5e0661e053a6ac388ab82a3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 50224705238d257f8ef792465e1781519c5ebd34 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 Apr 2022 02:32:24 +0200
Subject: [PATCH 0864/2561] go: fix build on ppc64le-musl

---
 .../fix-ppc64le-startup-detection.patch       | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 srcpkgs/go/patches/fix-ppc64le-startup-detection.patch

diff --git a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
new file mode 100644
index 000000000000..6cc2ab337249
--- /dev/null
+++ b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
@@ -0,0 +1,81 @@
+From 946167906ed8646c433c257b074a10e01f0a7dab Mon Sep 17 00:00:00 2001
+From: "Paul E. Murphy" <murp@ibm.com>
+Date: Tue, 22 Mar 2022 11:52:02 -0500
+Subject: [PATCH] runtime: make static/dynamic startup detection work with musl
+ on ppc64le
+
+The glibc loader explicitly sets the first doubleword on the stack (R1)
+to $0 to indicate it was dynamically loaded.
+
+An ELFv2 ABI compliant loader will set R3/R4 to argc/argv when starting
+the process, and R13 to TLS. musl is not compliant. Instead it passes
+argc/argv like the kernel, but R3/R4 are in an undefined state and R13
+is valid.
+
+With the knowledge above, the startup code can be modified to
+dynamically handle all three cases when linked internally.
+
+Fixes #51787
+
+Change-Id: I5de33862c161900d9161817388bbc13a65fdc69c
+Reviewed-on: https://go-review.googlesource.com/c/go/+/394654
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Run-TryBot: Paul Murphy <murp@ibm.com>
+TryBot-Result: Gopher Robot <gobot@golang.org>
+Trust: Paul Murphy <murp@ibm.com>
+Trust: Lynn Boger <laboger@linux.vnet.ibm.com>
+---
+ src/runtime/rt0_linux_ppc64le.s | 32 +++++++++++++++++++++-----------
+ 1 file changed, 21 insertions(+), 11 deletions(-)
+
+diff --git a/src/runtime/rt0_linux_ppc64le.s b/src/runtime/rt0_linux_ppc64le.s
+index 4f7c6e6c99f6..66f7e7b22a41 100644
+--- a/go/src/runtime/rt0_linux_ppc64le.s
++++ b/go/src/runtime/rt0_linux_ppc64le.s
+@@ -147,25 +147,35 @@ TEXT _main<>(SB),NOSPLIT,$-8
+ 	// In a statically linked binary, the stack contains argc,
+ 	// argv as argc string pointers followed by a NULL, envv as a
+ 	// sequence of string pointers followed by a NULL, and auxv.
+-	// There is no TLS base pointer.
++	// The TLS pointer should be initialized to 0.
+ 	//
+-	// In a dynamically linked binary, r3 contains argc, r4
+-	// contains argv, r5 contains envp, r6 contains auxv, and r13
++	// In an ELFv2 compliant dynamically linked binary, R3 contains argc,
++	// R4 contains argv, R5 contains envp, R6 contains auxv, and R13
+ 	// contains the TLS pointer.
+ 	//
+-	// Figure out which case this is by looking at r4: if it's 0,
+-	// we're statically linked; otherwise we're dynamically
+-	// linked.
+-	CMP	R0, R4
+-	BNE	dlink
+-
+-	// Statically linked
++	// When loading via glibc, the first doubleword on the stack points
++	// to NULL a value. (that is *(uintptr)(R1) == 0). This is used to
++	// differentiate static vs dynamicly linked binaries.
++	//
++	// If loading with the musl loader, it doesn't follow the ELFv2 ABI. It
++	// passes argc/argv similar to the linux kernel, R13 (TLS) is
++	// initialized, and R3/R4 are undefined.
++	MOVD	(R1), R12
++	CMP	R0, R12
++	BEQ	tls_and_argcv_in_reg
++
++	// Arguments are passed via the stack (musl loader or a static binary)
+ 	MOVD	0(R1), R3 // argc
+ 	ADD	$8, R1, R4 // argv
++
++	// Did the TLS pointer get set? If so, don't change it (e.g musl).
++	CMP	R0, R13
++	BNE	tls_and_argcv_in_reg
++
+ 	MOVD	$runtime·m0+m_tls(SB), R13 // TLS
+ 	ADD	$0x7000, R13
+ 
+-dlink:
++tls_and_argcv_in_reg:
+ 	BR	main(SB)
+ 
+ TEXT main(SB),NOSPLIT,$-8

From 0d94d7ebc34f7d008754180077875b97c2f13a93 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 31 Mar 2022 02:45:46 +0200
Subject: [PATCH 0865/2561] chromium: update to 100.0.4896.60.

Closes https://github.com/void-linux/void-packages/pull/36433
---
 ...romium-100-SCTHashdanceMetadata-move.patch | 35 +++++++++
 .../disable-aarch64-memory-tagging.patch      | 16 -----
 ...x-aarch64-musl-memory-tagging-macros.patch | 29 ++++++++
 .../fix-build-break-with-system-libdrm.patch  | 62 ----------------
 .../patches/fix-stack-utils-with-musl.patch   | 12 ++--
 ...ne_MM_Var-in-CFX_Font-AdjustMMParams.patch | 71 -------------------
 .../patches/xxx-ppc64le-support.patch         | 12 ++--
 srcpkgs/chromium/template                     |  4 +-
 8 files changed, 78 insertions(+), 163 deletions(-)
 create mode 100644 srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
 delete mode 100644 srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch
 create mode 100644 srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch
 delete mode 100644 srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch
 delete mode 100644 srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch

diff --git a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
new file mode 100644
index 000000000000..903942906c7d
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
@@ -0,0 +1,35 @@
+From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 23 Feb 2022 12:18:57 +0100
+Subject: [PATCH] GCC: explicitely move return value of SCTHashdanceMetadata::ToValue
+
+GCC rejects to do Return Value Optimization in
+SCTHashdanceMetadata::ToValue, because the copy constructor is
+deleted, and in that scenario RVO is rejected in GCC:
+    ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ‘base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const’:
+    ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ‘base::Value::Value(const base::Value&)’
+      191 |   return value;
+          |          ^~~~~
+    In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14,
+                     from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5:
+    ../../base/values.h:254:3: note: declared here
+      254 |   Value(const Value&) = delete;
+          |   ^~~~~
+
+Bug: 819294
+Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166
+---
+
+diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc
+index a057e8e..365527b 100644
+--- a/services/network/sct_auditing/sct_auditing_reporter.cc
++++ b/services/network/sct_auditing/sct_auditing_reporter.cc
+@@ -188,7 +188,7 @@
+       kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id))));
+   value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd));
+   value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry));
+-  return value;
++  return std::move(value);
+ }
+ 
+ // static
diff --git a/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch b/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch
deleted file mode 100644
index 0596c6364a68..000000000000
--- a/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This is broken in the current release and would require a lot of patches to be
-backported. Remove this patch for the next release.
-
---- a/base/memory/tagging.h
-+++ b/base/memory/tagging.h
-@@ -14,10 +14,6 @@
- #include "base/compiler_specific.h"
- #include "build/build_config.h"
- 
--#if defined(ARCH_CPU_ARM64) && defined(__clang__) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID))
--#define HAS_MEMORY_TAGGING 1
--#endif
- 
- constexpr int kMemTagGranuleSize = 16u;
- #if defined(HAS_MEMORY_TAGGING)
diff --git a/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch b/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch
new file mode 100644
index 000000000000..afcdae179850
--- /dev/null
+++ b/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch
@@ -0,0 +1,29 @@
+--- a/base/allocator/partition_allocator/tagging.cc
++++ b/base/allocator/partition_allocator/tagging.cc
+@@ -28,13 +28,25 @@
+ #endif
+ #endif
+ 
+-#ifndef HAS_PR_MTE_MACROS
++#ifndef PR_MTE_TCF_SHIFT
+ #define PR_MTE_TCF_SHIFT 1
++#endif
++#ifndef PR_MTE_TCF_NONE
+ #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_SYNC
+ #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_ASYNC
+ #define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_MASK
+ #define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TAG_SHIFT
+ #define PR_MTE_TAG_SHIFT 3
++#endif
++#ifndef PR_MTE_TAG_MASK
+ #define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)
+ #endif
+ #endif
diff --git a/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch b/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch
deleted file mode 100644
index fe8eee6d1e94..000000000000
--- a/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 5b287e0be8d8d8475ec6ef81b16eaa61e19db078 Mon Sep 17 00:00:00 2001
-From: "Steinar H. Gunderson" <sesse@chromium.org>
-Date: Tue, 25 Jan 2022 19:14:53 +0000
-Subject: [PATCH] Fix build break with system libdrm.
-
-This patch is submitted on behalf of Andres Salomon
-<dilinger@queued.net> (on Cc). Also adding him to src/AUTHORS
-per policy, as he has signed the CLA.
-
-Original patch:
-https://salsa.debian.org/dilinger/chromium/-/commit/2333c2fb985ac1ef3d7331776a7833d965c63302
-
-Change-Id: I18bd60e2e80f2b9181e74ee7972c3f457ab33b10
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3401704
-Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
-Commit-Queue: Steinar H Gunderson <sesse@chromium.org>
-Auto-Submit: Steinar H Gunderson <sesse@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#963119}
----
- AUTHORS                                      | 1 +
- media/gpu/chromeos/BUILD.gn                  | 1 +
- media/gpu/chromeos/video_decoder_pipeline.cc | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/AUTHORS b/AUTHORS
-index 0eba3de5065..50edd3f6b38 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -93,6 +93,7 @@ Andreas Papacharalampous <andreas@apap04.com>
- Andrei Borza <andrei.borza@gmail.com>
- Andrei Parvu <andrei.prv@gmail.com>
- Andrei Parvu <parvu@adobe.com>
-+Andres Salomon <dilinger@queued.net>
- Andreu Botella <andreu@andreubotella.com>
- Andrew Boyarshin <andrew.boyarshin@gmail.com>
- Andrew Brampton <me@bramp.net>
-diff --git a/media/gpu/chromeos/BUILD.gn b/media/gpu/chromeos/BUILD.gn
-index 7cb4c3ea39a..6fe21c15ecc 100644
---- a/media/gpu/chromeos/BUILD.gn
-+++ b/media/gpu/chromeos/BUILD.gn
-@@ -25,6 +25,7 @@ source_set("chromeos") {
- 
-   deps = [
-     "//base",
-+    "//build/config/linux/libdrm",
-     "//media",
-     "//media/gpu:buildflags",
-     "//media/gpu:command_buffer_helper",
-diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc
-index d2f154ea0d8..416b9434a8d 100644
---- a/media/gpu/chromeos/video_decoder_pipeline.cc
-+++ b/media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -28,8 +28,8 @@
- #include "third_party/abseil-cpp/absl/types/optional.h"
- 
- #if BUILDFLAG(USE_VAAPI)
-+#include <drm_fourcc.h>
- #include "media/gpu/vaapi/vaapi_video_decoder.h"
--#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
- #elif BUILDFLAG(USE_V4L2_CODEC)
- #include "media/gpu/v4l2/v4l2_video_decoder.h"
- #else
diff --git a/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch b/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch
index bb48d95312b3..7936aa6e0db4 100644
--- a/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch
+++ b/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch
@@ -4,17 +4,17 @@
  // 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)
+-#elif defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
+     BUILDFLAG(IS_FUCHSIA)
    // pthread_getattr_np() can fail if the thread is not invoked by
    // pthread_create() (e.g., the main thread of blink_unittests).
 @@ -97,7 +97,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)
+-#if defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
+     BUILDFLAG(IS_FUCHSIA)
    pthread_attr_t attr;
    int error;
diff --git a/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch b/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch
deleted file mode 100644
index 2cdbd02a8269..000000000000
--- a/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From ffeb67faf715475f6e463d65c368f556780adf19 Mon Sep 17 00:00:00 2001
-From: Lei Zhang <thestig@chromium.org>
-Date: Mon, 31 Jan 2022 22:42:35 +0000
-Subject: [PATCH] Use FT_Done_MM_Var() in CFX_Font::AdjustMMParams() when
- possible.
-
-When FreeType has FT_Done_MM_Var(), use that to free memory in
-CFX_Font::AdjustMMParams() to avoid mismatched alloc/free functions.
-
-Bug: pdfium:1400
-Change-Id: I044540893103921fc64cdd53fcd628cfebf2c9db
-Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/90130
-Reviewed-by: Nigi <nigi@chromium.org>
-Commit-Queue: Lei Zhang <thestig@chromium.org>
----
- core/fxge/cfx_font.cpp | 28 ++++++++++++++++++++++++++--
- 1 file changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp
-index c08fe9608..8b3a72700 100644
---- a/third_party/pdfium/core/fxge/cfx_font.cpp
-+++ b/third_party/pdfium/core/fxge/cfx_font.cpp
-@@ -44,6 +44,30 @@ struct OUTLINE_PARAMS {
-   float m_CoordUnit;
- };
- 
-+// TODO(crbug.com/pdfium/1400): When FT_Done_MM_Var() is more likely to be
-+// available to all users in the future, remove FreeMMVar() and use
-+// FT_Done_MM_Var() directly.
-+//
-+// Use weak symbols to check if FT_Done_MM_Var() is available at runtime.
-+#if !BUILDFLAG(IS_WIN)
-+extern "C" __attribute__((weak)) decltype(FT_Done_MM_Var) FT_Done_MM_Var;
-+#endif
-+
-+void FreeMMVar(FXFT_FaceRec* rec, FXFT_MM_VarPtr variation_desc) {
-+#if BUILDFLAG(IS_WIN)
-+  // Assume `use_system_freetype` GN var is never set on Windows.
-+  constexpr bool has_ft_done_mm_var_func = true;
-+#else
-+  static const bool has_ft_done_mm_var_func = !!FT_Done_MM_Var;
-+#endif
-+  if (has_ft_done_mm_var_func) {
-+    FT_Done_MM_Var(CFX_GEModule::Get()->GetFontMgr()->GetFTLibrary(),
-+                   variation_desc);
-+  } else {
-+    FXFT_Free(rec, variation_desc);
-+  }
-+}
-+
- FX_RECT FXRectFromFTPos(FT_Pos left, FT_Pos top, FT_Pos right, FT_Pos bottom) {
-   return FX_RECT(pdfium::base::checked_cast<int32_t>(left),
-                  pdfium::base::checked_cast<int32_t>(top),
-@@ -645,7 +669,7 @@ void CFX_Font::AdjustMMParams(int glyph_index,
-     FT_Pos max_width = FXFT_Get_Glyph_HoriAdvance(m_Face->GetRec()) * 1000 /
-                        FXFT_Get_Face_UnitsPerEM(m_Face->GetRec());
-     if (max_width == min_width) {
--      FXFT_Free(m_Face->GetRec(), pMasters);
-+      FreeMMVar(m_Face->GetRec(), pMasters);
-       return;
-     }
-     FT_Pos param = min_param + (max_param - min_param) *
-@@ -653,7 +677,7 @@ void CFX_Font::AdjustMMParams(int glyph_index,
-                                    (max_width - min_width);
-     coords[1] = param;
-   }
--  FXFT_Free(m_Face->GetRec(), pMasters);
-+  FreeMMVar(m_Face->GetRec(), pMasters);
-   FT_Set_MM_Design_Coordinates(m_Face->GetRec(), 2, coords);
- }
- 
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index b95e58c834b1..0be29c1a4eec 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3403,10 +3403,10 @@ index 9ab5e00b8..ad3feffee 100755
    template_sources = _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
+diff --git a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
 index 0b4bd72f0..a0caa5e71 100644
---- a/third_party/dav1d/libdav1d/src/ppc/types.h
-+++ b/third_party/dav1d/libdav1d/src/ppc/types.h
+--- a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
++++ b/third_party/dav1d/libdav1d/src/ppc/dav1d_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))
@@ -3520,17 +3520,17 @@ diff --git a/third_party/skia/src/sksl/SkSLString.cpp b/third_party/skia/src/sks
 index ec3e56964..4cf8999a2 100644
 --- a/third_party/skia/src/sksl/SkSLString.cpp
 +++ b/third_party/skia/src/sksl/SkSLString.cpp
-@@ -234,7 +234,12 @@ String to_string(double value) {
+@@ -37,7 +37,12 @@ String to_string(double value) {
      if (needsDotZero) {
          buffer << ".0";
      }
--    return String(buffer.str().c_str());
+-    return buffer.str();
 +
 +    std::string ret(buffer.str());
 +    if (signbit(value) && ret[0] == '.') {
 +        ret[0] = '-';
 +    }
-+    return String(ret.c_str());
++    return ret;
  }
  
  bool stod(const StringFragment& s, SKSL_FLOAT* value) {
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index f6154e223751..96b34227a323 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=99.0.4844.84
+version=100.0.4896.60
 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="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=20ec184ed34bdc7e660ccf6c007b2db37007de423b3a5a51698a96aa29527515
+checksum=0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc
 
 lib32disabled=yes
 

From 34e38ea463b4e796ff049da1322cc4b42b2522e7 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Wed, 18 Aug 2021 23:10:00 -0400
Subject: [PATCH 0866/2561] New package: LimeSuite-20.10.0

---
 common/shlibs              |  1 +
 srcpkgs/LimeSuite-devel    |  1 +
 srcpkgs/LimeSuite-doc      |  1 +
 srcpkgs/LimeSuite/template | 87 ++++++++++++++++++++++++++++++++++++++
 srcpkgs/SoapyLMS7          |  1 +
 5 files changed, 91 insertions(+)
 create mode 120000 srcpkgs/LimeSuite-devel
 create mode 120000 srcpkgs/LimeSuite-doc
 create mode 100644 srcpkgs/LimeSuite/template
 create mode 120000 srcpkgs/SoapyLMS7

diff --git a/common/shlibs b/common/shlibs
index 7079375524fc..b0c6fe696e5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4145,3 +4145,4 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
 librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
+libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
diff --git a/srcpkgs/LimeSuite-devel b/srcpkgs/LimeSuite-devel
new file mode 120000
index 000000000000..4431f3d5064a
--- /dev/null
+++ b/srcpkgs/LimeSuite-devel
@@ -0,0 +1 @@
+LimeSuite
\ No newline at end of file
diff --git a/srcpkgs/LimeSuite-doc b/srcpkgs/LimeSuite-doc
new file mode 120000
index 000000000000..4431f3d5064a
--- /dev/null
+++ b/srcpkgs/LimeSuite-doc
@@ -0,0 +1 @@
+LimeSuite
\ No newline at end of file
diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template
new file mode 100644
index 000000000000..44f119784ffd
--- /dev/null
+++ b/srcpkgs/LimeSuite/template
@@ -0,0 +1,87 @@
+# Template file for 'LimeSuite'
+pkgname=LimeSuite
+version=20.10.0
+revision=1
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+configure_args="
+ -DENABLE_SIMD_FLAGS=none
+ -DENABLE_UTILITIES=True
+ -DENABLE_LIME_UTIL=True
+ -DCMAKE_SKIP_RPATH=True
+ -DENABLE_DESKTOP=False
+ -DENABLE_SOAPY_LMS7=True
+ -DENABLE_PCIE_XILLYBUS=True
+ -DENABLE_QUICKTEST=True
+ -DENABLE_MCU_TESTBENCH=True
+ -DENABLE_FTDI=True
+ -DENABLE_FX3=True
+ -DENABLE_STREAM_UNITE=True
+ -DENABLE_EXAMPLES=True
+ -DENABLE_HEADERS=True
+ -DENABLE_GUI=True
+ -DENABLE_API_DOXYGEN=True
+ $(vopt_bool octave ENABLE_OCTAVE)
+ -DLIME_SUITE_EXTVER=${version}_${revision}"
+hostmakedepends="doxygen"
+makedepends="gnuplot wxWidgets-gtk3-devel libusb-devel SoapySDR-devel libfreeglut-devel
+ fltk-devel glew-devel sqlite-devel libgomp-devel $(vopt_if octave octave)"
+depends="wget"
+short_desc="Driver and GUI for LimeSDR/LMS7002M-based SDR platforms"
+maintainer="classabbyamp <dev@kb6.ee>"
+license="Apache-2.0"
+homepage="https://myriadrf.org/projects/lime-suite/"
+distfiles="https://github.com/myriadrf/LimeSuite/archive/refs/tags/v${version}.tar.gz"
+checksum=f6d79dc67cb52a5aea839d1dc00e65f85367cb2c275d77f149833d32cf79b467
+shlib_provides="libLimeSuite.so.20.10-1"
+
+build_options="octave"
+desc_option_octave="Enable the LimeSuite Octave plugin"
+
+# Octave is not built on arm, so don't enable the build option by default on those archs
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch64*) build_options_default="" ;;
+	*) build_options_default="octave" ;;
+esac
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+post_install() {
+	vinstall udev-rules/64-limesuite.rules 644 usr/lib/udev/rules.d
+
+	for res in 16 22 32 48 64 128; do
+		_icon_dir="usr/share/icons/hicolor/${res}x${res}/apps"
+		vmkdir $_icon_dir
+		vinstall Desktop/lime-suite-$res.png 644 $_icon_dir lime-suite.png
+	done
+	vinstall Desktop/lime-suite.desktop 755 usr/share/applications
+}
+
+LimeSuite-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"
+	}
+}
+
+LimeSuite-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vdoc docs/lms7_api_quick_start_guide.pdf
+		vdoc docs/StreamProtocol.pdf
+		vcopy docs/LMS_API_Documentation usr/share/doc/$pkgname
+	}
+}
+
+SoapyLMS7_package() {
+	short_desc="SoapySDR module for LimeSDR/LMS7002M"
+	pkg_install() {
+		vmove usr/lib/SoapySDR/modules0.7/libLMS7Support.so
+	}
+}
diff --git a/srcpkgs/SoapyLMS7 b/srcpkgs/SoapyLMS7
new file mode 120000
index 000000000000..4431f3d5064a
--- /dev/null
+++ b/srcpkgs/SoapyLMS7
@@ -0,0 +1 @@
+LimeSuite
\ No newline at end of file

From 01175cd988503f46da0d130d1b596b870b7496db Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 4 Jan 2022 19:19:19 -0600
Subject: [PATCH 0867/2561] wireshark: update to 3.6.3.

---
 common/shlibs                                 |  6 ++--
 .../patches/HAVE_C99_VSNPRINTF.patch          | 35 +++++++++++++++++++
 srcpkgs/wireshark/patches/cross.patch         |  2 +-
 srcpkgs/wireshark/template                    | 29 ++++++++++++---
 4 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch

diff --git a/common/shlibs b/common/shlibs
index b0c6fe696e5e..1007c400288a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1573,9 +1573,9 @@ 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
+libwiretap.so.12 libwireshark-3.6.3_1
+libwireshark.so.15 libwireshark-3.6.3_1
+libwsutil.so.13 libwireshark-3.6.3_1
 libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1
 libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1
 libKF5Prison.so.5 prison-5.43.0_1
diff --git a/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch b/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch
new file mode 100644
index 000000000000..b500598fd360
--- /dev/null
+++ b/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch
@@ -0,0 +1,35 @@
+--- a/ConfigureChecks.cmake	2021-12-29 13:12:48.000000000 -0600
++++ b/ConfigureChecks.cmake	2022-01-06 06:45:07.907628761 -0600
+@@ -104,32 +104,6 @@
+ check_symbol_exists(tzname "time.h" HAVE_TZNAME)
+ 
+ #
+-# Check if the libc vsnprintf() conforms to C99. If this fails we may
+-# need to fall-back on GLib I/O.
+-#
+-check_c_source_runs("
+-	#include <stdio.h>
+-	int main(void)
+-	{
+-		/* Check that snprintf() and vsnprintf() don't return
+-		 * -1 if the buffer is too small. C99 says this value
+-		 * is the length that would be written not including
+-		 * the nul byte. */
+-		char buf[3];
+-		return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1;
+-	}"
+-	HAVE_C99_VSNPRINTF
+-)
+-if (NOT HAVE_C99_VSNPRINTF)
+-	message(FATAL_ERROR
+-"Building Wireshark requires a C99 compliant vsnprintf() and this \
+-target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \
+-using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \
+-developers at wireshark-dev@wireshark.org."
+-	)
+-endif()
+-
+-#
+ # *If* we found libnl, check if we can use nl80211 stuff with it.
+ #
+ if (NL_FOUND)
diff --git a/srcpkgs/wireshark/patches/cross.patch b/srcpkgs/wireshark/patches/cross.patch
index 46dcc949c72e..d454505b8279 100644
--- a/srcpkgs/wireshark/patches/cross.patch
+++ b/srcpkgs/wireshark/patches/cross.patch
@@ -33,7 +33,7 @@ Upstream: no
            # These files are generated as side-effect
            ${_out}.h
            ${_out}.out
--         COMMAND lemon
+-         COMMAND $<TARGET_FILE:lemon>
 +         COMMAND ${EXECUTABLE_OUTPUT_PATH}/lemon
             -T${_lemonpardir}/lempar.c
             -d.
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index fae420888bfe..4d0d23c7ed50 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,11 +1,10 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=3.4.5
+version=3.6.3
 revision=1
 build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=None"
 hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
-qt5-tools qt5-host-tools qt5-qmake"
+qt5-tools qt5-host-tools qt5-qmake ruby-asciidoctor"
 makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel
  libmaxminddb-devel libgcrypt-devel libcap-devel sbc-devel c-ares-devel libxml2-devel
  libssh-devel libnl3-devel spandsp-devel tiff-devel libcap-progs liblz4-devel
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.wireshark.org"
 distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"
-checksum=de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333
+checksum=b60364a4c0068a10811ab3fd075ca6c1eb0e75d44600271b88a20ed93a2ef631
 system_groups="wireshark"
 
 CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2"
@@ -33,6 +32,26 @@ pre_check() {
 	ninja -C build test-programs
 }
 
+if [ "${XBPS_ALLOW_CHROOT_BREAKOUT}" = "yes" ]; then
+do_check() {
+	# Many tests fail when run as root (i.e. in CI)
+	test/test.py --disable-capture -p build/run \
+		suite_decryption \
+		suite_dissectors.group_asterix \
+		suite_extcaps \
+		suite_fileformats \
+		suite_follow \
+		suite_follow_dccp \
+		suite_follow_multistream \
+		suite_io \
+		suite_mergecap \
+		suite_netperfmeter \
+		suite_release \
+		suite_text2pcap \
+		suite_unittests
+}
+fi
+
 post_install() {
 	rm -f -- "${DESTDIR}/usr/bin/lemon"
 	rm -f -- "${DESTDIR}/usr/lib/wireshark/cmake/UseLemon.cmake"
@@ -77,6 +96,6 @@ wireshark-qt_package() {
 	pkg_install() {
 		vmove usr/bin/wireshark
 		vmove usr/share/man/man1/wireshark.1
-		vmove usr/share/applications/wireshark.desktop
+		vmove usr/share/applications/org.wireshark.Wireshark.desktop
 	}
 }

From f9e58902da019dd0d21526e534cf1757f4568e49 Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Fri, 1 Apr 2022 07:58:16 +0200
Subject: [PATCH 0868/2561] emptty: update to 0.7.1.

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

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 6fccd5d53e14..2bbbbf4a11e5 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.2
+version=0.7.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=a750c5cbaeda6b4d0367d18cedf27d884e6fb9a0c7b20819dc878cf7d5a5013b
+checksum=1d86dc0623773d43f9ced8c699ee82c812065ba18ecf277061210392fb2ec56a
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From f92e0c9588d97899f2be0e8a97198e35c08fc54b Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Thu, 31 Mar 2022 23:21:56 +0100
Subject: [PATCH 0869/2561] StyLua: update to 0.13.0.

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

diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index ab22a3c92973..b6dc22c3875d 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
 # Template file for 'StyLua'
 pkgname=StyLua
-version=0.12.4
+version=0.13.0
 revision=1
 build_style=cargo
 configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')"
@@ -10,7 +10,7 @@ license="MPL-2.0"
 homepage="https://github.com/JohnnyMorganz/StyLua"
 changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md"
 distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
-checksum=ce6b4a6767b17f8d609e8c9d666c5f6f5c2863edd0638e70392bfe55f99b4fd0
+checksum=ad74d1f47b0337810459dab9b49694bd5bd6c8c7381a35dcab7866752652988b
 
 build_options="lua52 luau"
 build_options_default="lua52 luau"

From 1204eeeab547e165c5947ec246101f41ce07718c Mon Sep 17 00:00:00 2001
From: Savoy <git@liberation.red>
Date: Mon, 7 Feb 2022 12:29:38 -0600
Subject: [PATCH 0870/2561] New package: mandown-0.1.2

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

diff --git a/srcpkgs/mandown/template b/srcpkgs/mandown/template
new file mode 100644
index 000000000000..5ae9b32020dd
--- /dev/null
+++ b/srcpkgs/mandown/template
@@ -0,0 +1,11 @@
+# Template file for 'mandown'
+pkgname=mandown
+version=0.1.2
+revision=1
+build_style=cargo
+short_desc="Create man pages from markdown markup"
+maintainer="Savoy <git@liberation.red>"
+license="Apache-2.0"
+homepage="https://gitlab.com/kornelski/mandown"
+distfiles="https://gitlab.com/kornelski/mandown/-/archive/$version/mandown-$version.tar.gz"
+checksum=ea26e2bf0ab1ebf4bea858072aa582b11d667a07e05b61bc50cfe5c2b382894a

From 01ee7a79a43a675f39ef2dbaeb92d7634a062d14 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 2 Apr 2022 23:06:14 -0400
Subject: [PATCH 0871/2561] vpsm: update upstream, clean suid bit

- The suid permission bit was incorrectly being set. It is now gone. See #32156
- The upstream README indicates a move to a new GH account.
---
 srcpkgs/vpsm/patches/setuid-fix.patch | 19 +++++++++++++++++++
 srcpkgs/vpsm/template                 |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vpsm/patches/setuid-fix.patch

diff --git a/srcpkgs/vpsm/patches/setuid-fix.patch b/srcpkgs/vpsm/patches/setuid-fix.patch
new file mode 100644
index 000000000000..3a2ec1a1c405
--- /dev/null
+++ b/srcpkgs/vpsm/patches/setuid-fix.patch
@@ -0,0 +1,19 @@
+Do not apply the setuid permission bit on the vpsm script
+
+See https://github.com/void-linux/void-packages/issues/32156
+see https://github.com/sineto/vpsm/pull/2
+
+
+--
+
+--- a/Makefile
++++ b/Makefile
+@@ -16,7 +16,7 @@
+ 
+ .PHONY: install
+ install:
+-	install -Dm4755 vpsm $(DESTDIR)$(PREFIX)/bin/vpsm
++	install -Dm755 vpsm $(DESTDIR)$(PREFIX)/bin/vpsm
+ 	install -Dm644 man/vpsm.1 $(DESTDIR)/$(PREFIX)/share/man/man1/vpsm.1
+ 
+ .PHONY: uninstall
diff --git a/srcpkgs/vpsm/template b/srcpkgs/vpsm/template
index 62805298d065..ead8e89e6ba8 100644
--- a/srcpkgs/vpsm/template
+++ b/srcpkgs/vpsm/template
@@ -1,13 +1,13 @@
 # Template file for 'vpsm'
 pkgname=vpsm
 version=0.1.2
-revision=1
+revision=2
 build_style=gnu-makefile
 depends="bash xtools ripgrep hub"
 short_desc="Void-Packages Sources Management wrapper for XBPS-SRC"
 maintainer="Sinésio Neto <sinetoami@gmail.com>"
 license="MIT"
-homepage="https://github.com/sinetoami/vpsm"
+homepage="https://github.com/sineto/vpsm"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=7317439096f56371397eb1250a81ff83e53740c14163993cf6668e9f0c4bdc2f
 

From bb7a6a534ada27ab0b0a4ae3e545a30fa41f2b89 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 0872/2561] vala: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 1007c400288a..20fd11e04231 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 shlib_provides="libvalaccodegen.so"
 make_check=extended
 

From b52d3a282d7e0a99f23c470f30abc08e7e724d75 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 0873/2561] valadoc: update to 0.56.0

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

diff --git a/common/shlibs b/common/shlibs
index 20fd11e04231..307cb13347fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3128,7 +3128,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 
 pre_configure() {
 	autoreconf -if

From 3df461a130cbbc3402e3626852b7980f9cee2550 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:30 +0200
Subject: [PATCH 0874/2561] io.elementary.code: revbump for vala 0.56.0

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

diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index c47d667b8a96..80be5d38c501 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=6.1.0
-revision=1
+revision=2
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala gettext polkit glib-devel"

From e7342286d5f974416c56459d9c8f82db7c5388fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:30 +0200
Subject: [PATCH 0875/2561] valabind: revbump for vala 0.56.0

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

diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index c7b8bf305d27..a9a7765a9bd6 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,7 +1,7 @@
 # Template file for 'valabind'
 pkgname=valabind
 version=1.8.0
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
 makedepends="vala-devel glib-devel"

From 8b289e7adce8a08de34166e86ad9db6b05ec76f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:31 +0200
Subject: [PATCH 0876/2561] vala-language-server: revbump for vala 0.56.0

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

diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 1693c8fc0b7f..037fa94852da 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
 version=0.48.4
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"

From df837cf19c4a4b08b30f4fe1ddd40d32c27bf1f6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:19:54 +0200
Subject: [PATCH 0877/2561] five-or-more: update to 3.32.3.

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

diff --git a/srcpkgs/five-or-more/template b/srcpkgs/five-or-more/template
index bb137c32d42c..8f871a5ddb8f 100644
--- a/srcpkgs/five-or-more/template
+++ b/srcpkgs/five-or-more/template
@@ -1,6 +1,6 @@
 # Template file for 'five-or-more'
 pkgname=five-or-more
-version=3.32.2
+version=3.32.3
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -9,5 +9,6 @@ short_desc="GNOME align five or more objects game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Five%20or%20more"
+changelog="https://gitlab.gnome.org/GNOME/five-or-more/-/raw/gnome-3-32/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=311a2693dd04226d32b6d7a02e4c739341bf5bd3492e3285c3910db73e47eea6
+checksum=2d10d72eefdeb324b447d632af0c32496e25fc15a3c01db7d2f00c9b51d09ef4

From 95c2d51508b4e34550fecc4f54ad9284f5e63efa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:41:45 +0200
Subject: [PATCH 0878/2561] folks: update to 0.15.5.

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

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 90fdec6fff48..fbc56862bde7 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,11 +1,11 @@
 # Template file for 'folks'
 pkgname=folks
-version=0.15.4
+version=0.15.5
 revision=1
 build_style=meson
-build_helper="gir qemu"
+build_helper="gir"
 configure_args="-Db_lto=false"
-hostmakedepends="pkg-config intltool glib-devel python3 python3-dbusmock
+hostmakedepends="pkg-config gettext glib-devel python3-dbusmock
  evolution-data-server-devel $(vopt_if gir vala)"
 makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
  libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
@@ -14,8 +14,9 @@ short_desc="GObject Library to aggregate people into metacontacts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Folks"
+changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e71099afc9e88fad4e757ae134bc3fd63e12b901ad62b0ed5536afb79124af5f
+checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
 
 build_options="gir"
 build_options_default="gir"

From a6b3bafe5b491777a1c22b8e72501ba807e86870 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:50:33 +0200
Subject: [PATCH 0879/2561] go-for-it: fix for vala 0.56

---
 srcpkgs/go-for-it/patches/vala-0.56.patch | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/go-for-it/patches/vala-0.56.patch

diff --git a/srcpkgs/go-for-it/patches/vala-0.56.patch b/srcpkgs/go-for-it/patches/vala-0.56.patch
new file mode 100644
index 000000000000..76929f6cfa5f
--- /dev/null
+++ b/srcpkgs/go-for-it/patches/vala-0.56.patch
@@ -0,0 +1,30 @@
+From 4be5ff4ff5ef7db9ab320945cd78a2b2e853695c Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 2 Apr 2022 18:53:20 +0200
+Subject: [PATCH] Fix build with vala 0.56
+
+~/Go-For-It-1.9.6/src/Services/TaskTimer.vala:35.42-35.50: error: value is less accessible than constant `GOFI.TaskTimer.UPDATE_INTERVAL'
+   35 |     public const int64 UPDATE_INTERVAL = 60 * US_C;
+      |                                          ^~~~~~~~~
+
+Closes #172
+---
+ src/Services/TaskTimer.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Services/TaskTimer.vala b/src/Services/TaskTimer.vala
+index 8f14f25..2231dc9 100644
+--- a/src/Services/TaskTimer.vala
++++ b/src/Services/TaskTimer.vala
+@@ -32,7 +32,7 @@ public class GOFI.TaskTimer {
+ 
+     private const int64 US_C = 1000000; // μs<->s conversion
+ 
+-    public const int64 UPDATE_INTERVAL = 60 * US_C;
++    private const int64 UPDATE_INTERVAL = 60 * US_C;
+ 
+     /**
+      * A proxy attribute, that does not store any data itself, but provides
+-- 
+2.35.1
+

From 0d43596ce9210450208fa3035f43eb7b8973fcce Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:01:07 +0200
Subject: [PATCH 0880/2561] gradio: remove package

---
 srcpkgs/gradio/template | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 srcpkgs/gradio/template

diff --git a/srcpkgs/gradio/template b/srcpkgs/gradio/template
deleted file mode 100644
index a1c4db39151e..000000000000
--- a/srcpkgs/gradio/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'gradio'
-pkgname=gradio
-version=7.2
-revision=1
-wrksrc="Gradio-${version}"
-build_style=meson
-hostmakedepends="automake intltool itstool yelp-tools glib-devel
- pkg-config gettext gettext-devel vala"
-makedepends="gtk+3-devel gettext-devel vala-devel
- gst-plugins-base1-devel json-glib-devel libsoup-devel
- appstream-glib-devel"
-depends="desktop-file-utils gst-plugins-bad1 gst-plugins-good1
- gst-plugins-ugly1"
-short_desc="GTK3 app for finding and listening to internet radio stations"
-maintainer="Logen Kain <logen@sudotask.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/haecker-felix/gradio"
-distfiles="https://github.com/haecker-felix/${pkgname}/archive/v${version}.tar.gz"
-checksum=5a85d7d4afb1424e46c935114b268e4a65de2629d60f48eccd75d67ff4b113d2

From e9fc152df0ed8e6f014ba3fe9604a7f7ab780d21 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:19:08 +0200
Subject: [PATCH 0881/2561] io.elementary.photos: fix for vala 0.56

---
 .../patches/vala-0.56.patch                   | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 srcpkgs/io.elementary.photos/patches/vala-0.56.patch

diff --git a/srcpkgs/io.elementary.photos/patches/vala-0.56.patch b/srcpkgs/io.elementary.photos/patches/vala-0.56.patch
new file mode 100644
index 000000000000..08d7d6feaaa8
--- /dev/null
+++ b/srcpkgs/io.elementary.photos/patches/vala-0.56.patch
@@ -0,0 +1,51 @@
+From 6594f1323726fb0d38519a7bdafe16f9170353cb Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Mon, 14 Mar 2022 19:50:16 +0800
+Subject: [PATCH] Fix build with vala 0.56 (#711)
+
+---
+ src/main.vala    |  2 +-
+ vapi/config.vapi | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/main.vala b/src/main.vala
+index 875d35ec7..57c88cf9c 100644
+--- a/src/main.vala
++++ b/src/main.vala
+@@ -273,7 +273,7 @@ namespace CommandlineOptions {
+     bool show_version = false;
+     bool debug_enabled = false;
+ 
+-    public const OptionEntry[] APP_OPTIONS = {
++    const OptionEntry[] APP_OPTIONS = {
+         { "datadir", 'd', 0, OptionArg.FILENAME, out data_dir, N_("Path to Photos' private data"), N_("DIRECTORY")},
+         { "no-runtime-monitoring", 0, 0, OptionArg.NONE, out no_runtime_monitoring, N_("Do not monitor library directory at runtime for changes"), null},
+         { "no-startup-progress", 0, 0, OptionArg.NONE, out no_startup_progress, N_("Don't display startup progress meter"), null},
+diff --git a/vapi/config.vapi b/vapi/config.vapi
+index 15c8d8b12..36f0acb78 100644
+--- a/vapi/config.vapi
++++ b/vapi/config.vapi
+@@ -5,16 +5,16 @@
+  */
+ 
+ [CCode (cheader_filename="config.h")]
+-extern const string _PREFIX;
++public const string _PREFIX;
+ [CCode (cheader_filename="config.h")]
+-extern const string _VERSION;
++public const string _VERSION;
+ [CCode (cheader_filename="config.h")]
+-extern const string GETTEXT_PACKAGE;
++public const string GETTEXT_PACKAGE;
+ [CCode (cheader_filename="config.h")]
+-extern const string LOCALEDIR;
++public const string LOCALEDIR;
+ [CCode (cheader_filename="config.h")]
+-extern const string _LIB;
++public const string _LIB;
+ [CCode (cheader_filename="config.h")]
+-extern const string _LIBEXECDIR;
++public const string _LIBEXECDIR;
+ [CCode (cheader_filename="config.h")]
+-extern const string PROJECT_NAME;
++public const string PROJECT_NAME;

From 2aa9152f9059c9af7b5b2e7fba4392cce17710cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:24:17 +0200
Subject: [PATCH 0882/2561] libgnome-games-support: update to 1.8.2.

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

diff --git a/srcpkgs/libgnome-games-support/template b/srcpkgs/libgnome-games-support/template
index 60a1aba20271..92db8d92bc3d 100644
--- a/srcpkgs/libgnome-games-support/template
+++ b/srcpkgs/libgnome-games-support/template
@@ -1,16 +1,17 @@
 # Template file for 'libgnome-games-support'
 pkgname=libgnome-games-support
-version=1.8.0
+version=1.8.2
 revision=1
 build_style=meson
-hostmakedepends="intltool pkg-config gobject-introspection vala"
+hostmakedepends="gettext pkg-config gobject-introspection vala"
 makedepends="gtk+3-devel libgee08-devel"
 short_desc="GNOME games shared code"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://git.gnome.org/browse/libgnome-games-support/"
+homepage="https://gitlab.gnome.org/GNOME/libgnome-games-support/"
+changelog="https://gitlab.gnome.org/GNOME/libgnome-games-support/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=abdde538a14fd6078fe6b7e6e93f38a33491d9bec711a116d8b47530184cb3dd
+checksum=28434604a7b038731ac0231731388ff104f565bb2330cc24e78cda04cfd3ef7d
 
 libgnome-games-support-devel_package() {
 	short_desc+=" - development files"

From 7e892d25e9b1b7077f662e3cad13b4eb4d440230 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:43:48 -0700
Subject: [PATCH 0883/2561] shotwell: fix build with vala 0.56.0

---
 .../patches/shotwell-0.54.1-vapi_fixes.patch  | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch

diff --git a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
new file mode 100644
index 000000000000..f39f988f9645
--- /dev/null
+++ b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
@@ -0,0 +1,67 @@
+From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 30 Nov 2021 15:09:17 +0100
+Subject: [PATCH] Fix accessibility issues with initializer of constants
+
+---
+ src/International.vala |  2 --
+ src/Resources.vala     |  7 -------
+ vapi/version.vapi      | 17 ++++++++++++++---
+ 3 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/src/International.vala b/src/International.vala
+index 555a91f8..73f07639 100644
+--- a/src/International.vala
++++ b/src/International.vala
+@@ -4,8 +4,6 @@
+  * See the COPYING file in this distribution.
+  */
+ 
+-extern const string _LANG_SUPPORT_DIR;
+-
+ public const string TRANSLATABLE = "translatable";
+ 
+ namespace InternationalSupport {
+diff --git a/src/Resources.vala b/src/Resources.vala
+index 6d2b8851..86f0eb65 100644
+--- a/src/Resources.vala
++++ b/src/Resources.vala
+@@ -4,13 +4,6 @@
+  * See the COPYING file in this distribution.
+  */
+ 
+-// defined by ./configure or Makefile and included by gcc -D
+-extern const string _PREFIX;
+-extern const string _VERSION;
+-extern const string GETTEXT_PACKAGE;
+-extern const string _LIB;
+-extern const string _LIBEXECDIR;
+-
+ namespace Resources {
+     public const string APP_TITLE = "Shotwell";
+     public const string APP_LIBRARY_ROLE = _("Photo Manager");
+diff --git a/vapi/version.vapi b/vapi/version.vapi
+index 06974c84..e191f2f7 100644
+--- a/vapi/version.vapi
++++ b/vapi/version.vapi
+@@ -1,3 +1,14 @@
+-[CCode (cheader_filename="version.h")]
+-extern const string? _GIT_VERSION;
+-
++[CCode (cheader_filename = "version.h")]
++public const string? _GIT_VERSION;
++[CCode (cheader_filename = "config.h")]
++public const string _PREFIX;
++[CCode (cheader_filename = "config.h")]
++public const string _VERSION;
++[CCode (cheader_filename = "config.h")]
++public const string GETTEXT_PACKAGE;
++[CCode (cheader_filename = "config.h")]
++public const string _LIB;
++[CCode (cheader_filename = "config.h")]
++public const string _LIBEXECDIR;
++[CCode (cheader_filename = "config.h")]
++public const string _LANG_SUPPORT_DIR;
+-- 
+GitLab
+

From de04eb138e3fa3d30435cd18adf17ff6f0050d28 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:28:08 +0200
Subject: [PATCH 0884/2561] planner: fix for vala 0.56

---
 srcpkgs/planner/patches/vala-0.56.patch | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/planner/patches/vala-0.56.patch

diff --git a/srcpkgs/planner/patches/vala-0.56.patch b/srcpkgs/planner/patches/vala-0.56.patch
new file mode 100644
index 000000000000..bff39d43cc1b
--- /dev/null
+++ b/srcpkgs/planner/patches/vala-0.56.patch
@@ -0,0 +1,25 @@
+From 87be3e27ccc8f9a1ef7fbeec9600459eb4569200 Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Mon, 14 Mar 2022 23:36:21 +0800
+Subject: [PATCH] Fix build with vala 0.56
+
+Otherwise build fails with
+
+../src/Application.vala:45.50-55.5: error: value is less accessible than constant `Planner.PLANNER_OPTIONS'
+---
+ src/Application.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Application.vala b/src/Application.vala
+index 8c1c9ddb..ebd8f726 100644
+--- a/src/Application.vala
++++ b/src/Application.vala
+@@ -42,7 +42,7 @@ public class Planner : Gtk.Application {
+     private static bool clear_database = false;
+     private static string lang = "";
+ 
+-    public const OptionEntry[] PLANNER_OPTIONS = {
++    private const OptionEntry[] PLANNER_OPTIONS = {
+         { "version", 'v', 0, OptionArg.NONE, ref version,
+         "Display version number", null },
+         { "reset", 'r', 0, OptionArg.NONE, ref clear_database,

From 35cc0ed9ebb28c502ce07f8aa7bd85e1d2db4011 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:35:16 +0200
Subject: [PATCH 0885/2561] tootle: fix for vala 0.56

---
 srcpkgs/tootle/patches/vala-0.56.patch | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/tootle/patches/vala-0.56.patch

diff --git a/srcpkgs/tootle/patches/vala-0.56.patch b/srcpkgs/tootle/patches/vala-0.56.patch
new file mode 100644
index 000000000000..38adf0ff0930
--- /dev/null
+++ b/srcpkgs/tootle/patches/vala-0.56.patch
@@ -0,0 +1,23 @@
+From 11d94c05d4c4a2350801294f155230e899048ab5 Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Sat, 19 Mar 2022 16:59:31 +0800
+Subject: [PATCH] Application: make app_entries private
+
+Fixes compilation with latest valac.
+---
+ src/Application.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Application.vala b/src/Application.vala
+index 57d0fd7..b48cb53 100644
+--- a/src/Application.vala
++++ b/src/Application.vala
+@@ -43,7 +43,7 @@ namespace Tootle {
+ 			{ null }
+ 		};
+ 
+-		public const GLib.ActionEntry[] app_entries = {
++		private const GLib.ActionEntry[] app_entries = {
+ 			{ "about", about_activated },
+ 			{ "compose", compose_activated },
+ 			{ "back", back_activated },

From e9f97b22319c2f83df2123116852616cd2dbba8b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:44:54 +0200
Subject: [PATCH 0886/2561] simple-scan: fix for vala 0.56

---
 srcpkgs/simple-scan/patches/vala-0.56.patch | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/simple-scan/patches/vala-0.56.patch

diff --git a/srcpkgs/simple-scan/patches/vala-0.56.patch b/srcpkgs/simple-scan/patches/vala-0.56.patch
new file mode 100644
index 000000000000..0820cee20e40
--- /dev/null
+++ b/srcpkgs/simple-scan/patches/vala-0.56.patch
@@ -0,0 +1,25 @@
+From c50802b213c325cfa957d66955f6de96908710d9 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 6 Nov 2021 19:46:07 +0100
+Subject: [PATCH] Fix accessibility conflict of constant and its value
+
+---
+ src/simple-scan.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/simple-scan.vala b/src/simple-scan.vala
+index c15a5418..71f32de9 100644
+--- a/src/simple-scan.vala
++++ b/src/simple-scan.vala
+@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Application
+     static bool show_version;
+     static bool debug_enabled;
+     static string? fix_pdf_filename = null;
+-    public const OptionEntry[] options =
++    const OptionEntry[] options =
+     {
+         { "version", 'v', 0, OptionArg.NONE, ref show_version,
+           /* Help string for command line --version flag */
+-- 
+GitLab
+

From 58504546dda0dc74237ab10dde5144100b61d623 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 22:59:04 +0200
Subject: [PATCH 0887/2561] geary: fix for vala 0.56

---
 srcpkgs/geary/patches/vala-0.56a.patch | 25 ++++++++++++++++
 srcpkgs/geary/patches/vala-0.56b.patch | 40 ++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 srcpkgs/geary/patches/vala-0.56a.patch
 create mode 100644 srcpkgs/geary/patches/vala-0.56b.patch

diff --git a/srcpkgs/geary/patches/vala-0.56a.patch b/srcpkgs/geary/patches/vala-0.56a.patch
new file mode 100644
index 000000000000..df2c3902db14
--- /dev/null
+++ b/srcpkgs/geary/patches/vala-0.56a.patch
@@ -0,0 +1,25 @@
+From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 30 Jan 2022 19:54:11 +0100
+Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument
+
+---
+ src/client/util/util-cache.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
+index f054e32e5..ecc275e84 100644
+--- a/src/client/util/util-cache.vala
++++ b/src/client/util/util-cache.vala
+@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
+     private class CacheEntry<T> {
+ 
+ 
+-        public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
++        public static int lru_compare(CacheEntry a, CacheEntry b) {
+             if (a.key == b.key) {
+                 return 0;
+             }
+-- 
+GitLab
+
diff --git a/srcpkgs/geary/patches/vala-0.56b.patch b/srcpkgs/geary/patches/vala-0.56b.patch
new file mode 100644
index 000000000000..2d071a133751
--- /dev/null
+++ b/srcpkgs/geary/patches/vala-0.56b.patch
@@ -0,0 +1,40 @@
+From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 30 Nov 2021 15:31:31 +0100
+Subject: [PATCH] Fix accessibility issues with initializer of constants
+
+---
+ src/client/application/application-client.vala | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
+index 6ce19ce2a..e6ba85331 100644
+--- a/src/client/application/application-client.vala
++++ b/src/client/application/application-client.vala
+@@ -8,16 +8,16 @@
+ 
+ // Defined by CMake build script.
+ extern const string GETTEXT_PACKAGE;
+-extern const string _APP_ID;
+-extern const string _BUILD_ROOT_DIR;
+-extern const string _GSETTINGS_DIR;
+-extern const string _INSTALL_PREFIX;
+-extern const string _NAME_SUFFIX;
++public extern const string _APP_ID;
++public extern const string _BUILD_ROOT_DIR;
++public extern const string _GSETTINGS_DIR;
++public extern const string _INSTALL_PREFIX;
++public extern const string _NAME_SUFFIX;
+ extern const string _PLUGINS_DIR;
+ extern const string _PROFILE;
+ extern const string _REVNO;
+-extern const string _SOURCE_ROOT_DIR;
+-extern const string _VERSION;
++public extern const string _SOURCE_ROOT_DIR;
++public extern const string _VERSION;
+ extern const string _WEB_EXTENSIONS_DIR;
+ 
+ 
+-- 
+GitLab
+

From d45def79b56aee694e077422d747957ff4476b1e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 3 Apr 2022 15:19:05 +0200
Subject: [PATCH 0888/2561] zellij: build manpage

---
 srcpkgs/zellij/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 72a9ab9e6e76..911ba18464eb 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,12 +1,13 @@
 # Template file for 'zellij'
 pkgname=zellij
 version=0.27.0
-revision=1
+revision=2
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
 archs="x86_64* aarch64* i686*"
 build_style=cargo
 build_helper=qemu
+hostmakedepends="mandown"
 checkdepends="openssl-devel pkg-config"
 short_desc="Terminal workspace with batteries included"
 maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
@@ -21,6 +22,8 @@ post_build() {
 	vtargetrun ${ZELLIJ} setup --generate-completion bash > zellij.bash
 	vtargetrun ${ZELLIJ} setup --generate-completion zsh > zellij.zsh
 	vtargetrun ${ZELLIJ} setup --generate-completion fish > zellij.fish
+
+	mandown docs/MANPAGE.md > zellij.1
 }
 
 post_install() {
@@ -30,4 +33,5 @@ post_install() {
 
 	vlicense LICENSE.md
 	vdoc README.md
+	vman zellij.1
 }

From 6ab7740de60834be4d9bd5a292be644a9500bd44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 3 Apr 2022 12:56:10 +0200
Subject: [PATCH 0889/2561] lf: update to r27.

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

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 896673e297d6..00a4cbec79fb 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,6 +1,6 @@
 # Template file for 'lf'
 pkgname=lf
-version=r26
+version=r27
 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=dccd1ad67d2639e47fe0cbc93d74f202d6d6f0c3759fb0237affb7b1a2b1379e
+checksum=cdd132e33387423ef9f9448e21d3f1e5c9a5319b34fdfb53cb5f49351ebac005
 
 post_install() {
 	vlicense LICENSE

From 4f1837d1e4d4751f59a2679ec5aa7af2a3922fd6 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:34:52 +0300
Subject: [PATCH 0890/2561] skopeo: update to 1.6.2.

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

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index b568744c4b25..d8015fbcd92c 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.6.1
+version=1.6.2
 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=304016ec4eb802bf1e1b350854db50bdc99a93dcbcc71f9d531dbb916dc146f3
+checksum=48a1b3d18bde9d7af94756d546b0472e90416f05926281f7e533badfb5fcbd7b
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From 3d0847d936e159cd927233542f63753b0809907e Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:39:57 +0300
Subject: [PATCH 0891/2561] crun: update to 1.4.4.

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

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 5b36ee6226bf..f08f3920334b 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=1.4
+version=1.4.4
 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=fbdf93c31e215c61a9cb97490527ec69c9993e369955e56b0d82cfedc32090ef
+checksum=49eeb7ed921428f06094ab02233bb2f95ddfc4bf59a40bcabe8a2823085a0c12
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"

From 13f8f8cd6251355b82d126b5341475635680a729 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:44:01 +0300
Subject: [PATCH 0892/2561] buildah: update to 1.24.3.

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

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index f3854fe931e7..b56a4ea1dff4 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,6 +1,6 @@
 # Template file for 'buildah'
 pkgname=buildah
-version=1.23.1
+version=1.24.3
 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="https://github.com/containers/buildah/archive/refs/tags/v${version}.tar.gz"
-checksum=a19eac2762afb0f83b9d5eec3c00e6ecd95d8d8083da599e894c712d9fb6af26
+checksum=664e2aec0e07df9668c6d41de540e84dc2447950cf952851ca9717a10cc46124
 
 post_build() {
 	make -C docs GOMD2MAN=go-md2man

From 12e3a9a6a13a7b2874d1997dfb1324ac31e78b3e Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:57:58 +0300
Subject: [PATCH 0893/2561] packer: update to 1.8.0.

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

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 09f3bc8a6a6a..5e39d679ec43 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,6 +1,6 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.7.10
+version=1.8.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/packer"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="http://www.packer.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=80ed60c492f6765265223f715f26529c8eeb5ce4cee9c4bd7372fd83a9e10493
+checksum=3df688cb488e746df529474f08a430adf0c7c839c4ed3de2022a094eadc515fd
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From 376c3f7d52f6dafb3d8ee593aa786e5a16669ee4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 26 Mar 2022 17:21:04 -0400
Subject: [PATCH 0894/2561] pango: update to 1.50.6.

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

diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index ff2978731c8c..4d410dbc72b0 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,6 +1,6 @@
 # Template file for 'pango'
 pkgname=pango
-version=1.50.3
+version=1.50.6
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,8 @@ license="LGPL-2.1-or-later"
 homepage="https://www.pango.org/"
 changelog="https://gitlab.gnome.org/GNOME/pango/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c
+checksum=a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a
+make_check=no  # doesn't pass its own tests
 
 # Package build options
 build_options="gir"

From 87c72c6f541b0a7ebd1a3830240b70f4b16d3343 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:46:51 +0200
Subject: [PATCH 0895/2561] libbsd: update to 0.11.6.

---
 srcpkgs/libbsd/patches/tests-musl.patch | 18 ------------------
 srcpkgs/libbsd/template                 |  4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/libbsd/patches/tests-musl.patch

diff --git a/srcpkgs/libbsd/patches/tests-musl.patch b/srcpkgs/libbsd/patches/tests-musl.patch
deleted file mode 100644
index ada3a923c879..000000000000
--- a/srcpkgs/libbsd/patches/tests-musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/test/fpurge.c
-+++ b/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 769256c0b9ae..6363215e4457 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -1,6 +1,6 @@
 # Template file for 'libbsd'
 pkgname=libbsd
-version=0.11.5
+version=0.11.6
 revision=1
 build_style=gnu-configure
 makedepends="libmd-devel"
@@ -9,7 +9,7 @@ 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=1a9c952525635c1bb6770cb22e969b938d8e6a9d7912362b98ee8370599b0efd
+checksum=19b38f3172eaf693e6e1c68714636190c7e48851e45224d720b3b5bc0499b5df
 
 post_install() {
 	vlicense COPYING

From 5767c78aa0de133c7db29857ba4068ac47e11f22 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:48:37 +0200
Subject: [PATCH 0896/2561] openfortivpn: update to 1.17.2.

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

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 46e3fb7900f8..64cbf60f2916 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=c674c59cf3201a55d56cb503053982752fb641b13a85ea406b8a7e7df301e30f
+checksum=0f3f3c767cb8bf81418a0fc7c6ab7636c574840c3b6a95c50901c3e1a09c079a
 
 conf_files="/etc/openfortivpn/config"
 

From 52275bcfd57e09c69d34b511e3cc040d15ad1bd6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:51:43 +0200
Subject: [PATCH 0897/2561] squashfs-tools-ng: update to 1.1.4.

---
 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 3a6e48497035..e05075284fc9 100644
--- a/srcpkgs/squashfs-tools-ng/template
+++ b/srcpkgs/squashfs-tools-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'squashfs-tools-ng'
 pkgname=squashfs-tools-ng
-version=1.1.3
+version=1.1.4
 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=abce0fcf9a8ae1c3352e4e5e87e1b077f54411da517332ea83b5e7ce948dd70d
+checksum=6f3f7864f17b250453df31fe3925ce7d1430cf6b1d514112641d734fe3c8f61a
 
 squashfs-tools-ng-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 768b19e142f62b6573a171eb7da6204fa2fe94cf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:53:42 +0200
Subject: [PATCH 0898/2561] youtube-viewer: update to 3.9.9.

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

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index bdf304f9de86..af6941e45319 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.7
+version=3.9.9
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=0b7ccf18e7aa71b2b82214e3a5614e3036bc98d94951b9bd7aba8da952486257
+checksum=29a326b6496bc6e96840d3c854d79a3ffb9e6006a033f11478c1633c1ac48a8b
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 42c066667a6a90fb8def1296741c8fec46100faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 2 Apr 2022 22:57:04 +0200
Subject: [PATCH 0899/2561] peshming: update to 0.5.0.

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

diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template
index 299d243509fe..0b07235208a9 100644
--- a/srcpkgs/peshming/template
+++ b/srcpkgs/peshming/template
@@ -1,6 +1,6 @@
 # Template file for 'peshming'
 pkgname=peshming
-version=0.4.0
+version=0.5.0
 revision=1
 wrksrc="peshming"
 build_style=cargo
@@ -10,15 +10,26 @@ 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=fd2d3eae35746f513006a34757d00e50d15042df54187f886c553e748985319d
+checksum=9b737124e38d4dc6ac91f0e8bc07aab4d5acbbb019c544feb1aa92d6ab0ea8c5
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	ppc*) broken="missing AtomicU64";;
 esac
 
+pre_build() {
+	export PESHMING_MAN_DIR=man
+	export PESHMING_COMPLETIONS_DIR=completions
+}
+
 post_install() {
 	vlicense LICENSE
 	vdoc README.md
 	vsconf config.toml.sample
+
+	vcompletion "completions/_peshming" zsh
+	vcompletion "completions/peshming.fish" fish
+	vcompletion "completions/peshming.bash" bash
+
+	vman "man/peshming.1"
 }

From ac3d8054c83dc5b13e8a25687a8cc06270ab0526 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH 0900/2561] New package: dsda-doom-0.24.3

---
 srcpkgs/dsda-doom/patches/affinity-hack.patch | 165 ++++++++++++++++++
 srcpkgs/dsda-doom/template                    |  20 +++
 2 files changed, 185 insertions(+)
 create mode 100644 srcpkgs/dsda-doom/patches/affinity-hack.patch
 create mode 100644 srcpkgs/dsda-doom/template

diff --git a/srcpkgs/dsda-doom/patches/affinity-hack.patch b/srcpkgs/dsda-doom/patches/affinity-hack.patch
new file mode 100644
index 000000000000..2155ab116b82
--- /dev/null
+++ b/srcpkgs/dsda-doom/patches/affinity-hack.patch
@@ -0,0 +1,165 @@
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index d317ddec..c86f76b0 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -53,6 +53,15 @@ endif()
+ check_symbol_exists(getopt "unistd.h" HAVE_GETOPT)
+ check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
+ check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING)
++if(NOT WIN32)
++    set(CMAKE_REQUIRED_DEFINITIONS_PREV ${CMAKE_REQUIRED_DEFINITIONS})
++    set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE)
++    check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
++    set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_PREV})
++    if(HAVE_SCHED_SETAFFINITY)
++        add_definitions(-D_GNU_SOURCE)
++    endif()
++endif()
+ check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL)
+ check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+ 
+diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin
+index f92f3d88..2ad70033 100644
+--- a/prboom2/cmake/config.h.cin
++++ b/prboom2/cmake/config.h.cin
+@@ -11,6 +11,7 @@
+ #cmakedefine HAVE_GETOPT
+ #cmakedefine HAVE_MMAP
+ #cmakedefine HAVE_CREATE_FILE_MAPPING
++#cmakedefine HAVE_SCHED_SETAFFINITY
+ #cmakedefine HAVE_STRSIGNAL
+ #cmakedefine HAVE_MKSTEMP
+ 
+diff --git a/prboom2/src/SDL/i_main.c b/prboom2/src/SDL/i_main.c
+index 7537c53f..670f3dbd 100644
+--- a/prboom2/src/SDL/i_main.c
++++ b/prboom2/src/SDL/i_main.c
+@@ -45,6 +45,9 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask);
++#else
++#include <sched.h>
+ #endif
+ 
+ #include <errno.h>
+@@ -373,6 +376,83 @@ static void I_Quit (void)
+ uid_t stored_euid = -1;
+ #endif
+ 
++//
++// Ability to use only the allowed CPUs
++//
++
++static void I_SetAffinityMask(void)
++{
++  // This was only set for the sdl music backend,
++  //   but now the backend changes based on the music type.
++  // Not sure what the consequences are for this...
++  process_affinity_mask = 1;
++
++  // Set the process affinity mask so that all threads
++  // run on the same processor.  This is a workaround for a bug in
++  // SDL_mixer that causes occasional crashes.
++  if (process_affinity_mask)
++  {
++    const char *errbuf = NULL;
++#ifdef _WIN32
++    HMODULE kernel32_dll;
++    SetAffinityFunc SetAffinity = NULL;
++    int ok = false;
++
++    // Find the kernel interface DLL.
++    kernel32_dll = LoadLibrary("kernel32.dll");
++
++    if (kernel32_dll)
++    {
++      // Find the SetProcessAffinityMask function.
++      SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask");
++
++      // If the function was not found, we are on an old (Win9x) system
++      // that doesn't have this function.  That's no problem, because
++      // those systems don't support SMP anyway.
++
++      if (SetAffinity)
++      {
++        ok = SetAffinity(GetCurrentProcess(), process_affinity_mask);
++      }
++    }
++
++    if (!ok)
++    {
++      errbuf = WINError();
++    }
++#elif defined(HAVE_SCHED_SETAFFINITY)
++    // POSIX version:
++    int i;
++    {
++      cpu_set_t set;
++
++      CPU_ZERO(&set);
++
++      for(i = 0; i < 16; i++)
++      {
++        CPU_SET((process_affinity_mask>>i)&1, &set);
++      }
++
++      if (sched_setaffinity(getpid(), sizeof(set), &set) == -1)
++      {
++        errbuf = strerror(errno);
++      }
++    }
++#else
++    return;
++#endif
++
++    if (errbuf == NULL)
++    {
++      lprintf(LO_INFO, "I_SetAffinityMask: manual affinity mask is %d\n", process_affinity_mask);
++    }
++    else
++    {
++      lprintf(LO_ERROR, "I_SetAffinityMask: failed to set process affinity mask (%s)\n", errbuf);
++    }
++  }
++}
++
+ //
+ // Sets the priority class for the prboom-plus process
+ //
+@@ -482,6 +562,9 @@ int main(int argc, char **argv)
+   signal(SIGABRT, I_SignalHandler);
+ #endif
+ 
++  // Ability to use only the allowed CPUs
++  I_SetAffinityMask();
++
+   // Priority class for the prboom-plus process
+   I_SetProcessPriority();
+ 
+diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c
+index 5a564a5a..9b68aee7 100644
+--- a/prboom2/src/SDL/i_video.c
++++ b/prboom2/src/SDL/i_video.c
+@@ -895,6 +895,7 @@ static void I_ClosestResolution (int *width, int *height)
+   }
+ }
+ 
++int process_affinity_mask;
+ int process_priority;
+ 
+ // e6y
+diff --git a/prboom2/src/i_video.h b/prboom2/src/i_video.h
+index 46f0fb71..c39a197e 100644
+--- a/prboom2/src/i_video.h
++++ b/prboom2/src/i_video.h
+@@ -109,6 +109,8 @@ void I_UpdateRenderSize(void);	// Handle potential
+ extern int renderW;		// resolution scaling
+ extern int renderH;		// - DTIED
+ 
++// Set the process affinity mask so that all threads
++extern int process_affinity_mask;
+ // Priority class for the prboom-plus process
+ extern int process_priority;
+ // Use vanilla keybaord mapping
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..51dcbbf26d34
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,20 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=d4cfc82eea029068329d6b6a2dcbe0b316b31a60af12e6dc5ad3e1d2c359d913
+nocross=yes
+
+post_install() {
+	vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+	vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}

From 9bb15e4e9b7b00541b7cf2659b363cfc5dbe08ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Sun, 3 Apr 2022 04:24:39 +0200
Subject: [PATCH 0901/2561] wireplumber: update to 0.4.9

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

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index dadbf62647fb..acbffa27fd8c 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
-version=0.4.8
-revision=2
+version=0.4.9
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://pipewire.pages.freedesktop.org/wireplumber"
 changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
-checksum=a7a84c21230c339a905704a9495dda10a4dec41a96bc115a9b33d24310a3f605
+checksum=0b25774a2821286a1fa31afb7db8db0573f493b35c40a7031b6e5a30cec0bbe3
 
 post_install() {
 	vlicense LICENSE

From 17c524017aa74074d3f4700c267941f7a759564a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 Apr 2022 20:30:06 +0200
Subject: [PATCH 0902/2561] dhcpcd: fix privsep on ppc64le

---
 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch

diff --git a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
new file mode 100644
index 000000000000..38a4264a59cd
--- /dev/null
+++ b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
@@ -0,0 +1,23 @@
+commit 156383a2ff84c01b347579ec8651a0a21384adf4
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Sun Apr 3 20:18:51 2022 +0200
+
+    use correct SECCOMP_AUDIT_ARCH
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index 9534fb0..b866bce 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -213,7 +213,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
+ #elif defined(__or1k__)
+ #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
+ #elif defined(__powerpc64__)
+-#  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
++#  ifdef __LITTLE_ENDIAN__
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
++#  else
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
++#  endif
+ #elif defined(__powerpc__)
+ #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
+ #elif defined(__riscv)

From 9452711b98c739d9882b7673d1c69a01884b286a Mon Sep 17 00:00:00 2001
From: governorgoat <governorgoat@fastmail.com>
Date: Sat, 2 Apr 2022 22:04:52 -0400
Subject: [PATCH 0903/2561] cronie: update to 1.6.0

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

diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template
index 6c1c7adb523d..526f59b4d835 100644
--- a/srcpkgs/cronie/template
+++ b/srcpkgs/cronie/template
@@ -1,6 +1,6 @@
 # Template file for 'cronie'
 pkgname=cronie
-version=1.5.7
+version=1.6.0
 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=538bcfaf2e986e5ae1edf6d1472a77ea8271d6a9005aee2497a9ed6e13320eb3
+checksum=3f7cc263d21838b53a9943eb2a26b862059e2ae36c3f11789ac33cd6818e3628
 make_dirs="
 	/etc/cron.d 0755 root root
 	/etc/cron.hourly 0755 root root

From b9702ab78bdd9574d37063b79c3c9bd4484999d7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:31:30 +0200
Subject: [PATCH 0904/2561] janet: update to 1.21.2.

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

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 4301ab90c751..8c3612e4dd77 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.21.1
+version=1.21.2
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=8c6eeabbc0c00ac901b66763676fa4bfdac96e5b6a3def85025b45126227c4e0
+checksum=52db8d18f93351256d0731810e8bea95516db8142f51eeb31664f7884bf63088
 
 post_install() {
 	vlicense LICENSE

From 417c6ee429f0143b514a265e62baa31c98de2ec5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:35:28 +0200
Subject: [PATCH 0905/2561] ugrep: update to 3.7.7.

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

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

From b53fba7fd7c22764c397cf7694747c103fe7ca54 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:35:30 +0200
Subject: [PATCH 0906/2561] netpbm: update to 10.98.0.0.

---
 .../netpbm/files/netpbm-security-code.patch   |  94 -------
 .../files/netpbm-security-scripts.patch       | 266 ------------------
 srcpkgs/netpbm/template                       |   6 +-
 3 files changed, 3 insertions(+), 363 deletions(-)
 delete mode 100644 srcpkgs/netpbm/files/netpbm-security-scripts.patch

diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch
index 408b566ef412..6f7c4976114b 100644
--- a/srcpkgs/netpbm/files/netpbm-security-code.patch
+++ b/srcpkgs/netpbm/files/netpbm-security-code.patch
@@ -804,65 +804,6 @@ diff -up netpbm-10.58.01/other/pnmcolormap.c.security-code netpbm-10.58.01/other
      }
      {
          unsigned int const intQuotient = colormap.size / pamP->width;
-diff -up netpbm-10.58.01/urt/README.security-code netpbm-10.58.01/urt/README
---- netpbm-10.58.01/urt/README.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/urt/README	2012-04-09 15:40:03.231619438 +0200
-@@ -18,3 +18,8 @@ in its initializer in the original.  But
- defines stdout as a variable, so that wouldn't compile.  So I changed
- it to NULL and added a line to rle_hdr_init to set that field to
- 'stdout' dynamically.  2000.06.02 BJH.
-+
-+Redid the code to check for maths overflows and other crawly horrors.
-+Removed pipe through and compress support (unsafe)
-+
-+Alan Cox <alan@redhat.com>
-diff -up netpbm-10.58.01/urt/rle_addhist.c.security-code netpbm-10.58.01/urt/rle_addhist.c
---- netpbm-10.58.01/urt/rle_addhist.c.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/urt/rle_addhist.c	2012-04-09 15:40:03.231619438 +0200
-@@ -14,6 +14,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_addhist.c - Add to the HISTORY comment in header
-@@ -71,13 +73,19 @@ rle_addhist(char *          argv[],
-         return;
-     
-     length = 0;
--    for (i = 0; argv[i]; ++i)
-+    for (i = 0; argv[i]; ++i) {
-+	overflow_add(length, strlen(argv[i]));
-+	overflow_add(length+1, strlen(argv[i]));
-         length += strlen(argv[i]) +1;   /* length of each arg plus space. */
-+    }
- 
-     time(&temp);
-     timedate = ctime(&temp);
-     length += strlen(timedate);        /* length of date and time in ASCII. */
- 
-+    overflow_add(strlen(padding), 4);
-+    overflow_add(strlen(histoire), strlen(padding) + 4);
-+    overflow_add(length, strlen(histoire) + strlen(padding) + 4);
-     length += strlen(padding) + 3 + strlen(histoire) + 1;
-         /* length of padding, "on "  and length of history name plus "="*/
-     if (in_hdr) /* if we are interested in the old comments... */
-@@ -85,9 +93,12 @@ rle_addhist(char *          argv[],
-     else
-         old = NULL;
-     
--    if (old && *old)
-+    if (old && *old) {
-+	overflow_add(length, strlen(old));
-         length += strlen(old);       /* add length if there. */
-+    }
- 
-+    overflow_add(length, 1);
-     ++length;                               /*Cater for the null. */
- 
-     MALLOCARRAY(newc, length);
 diff -up netpbm-10.58.01/urt/rle.h.security-code netpbm-10.58.01/urt/rle.h
 --- netpbm-10.58.01/urt/rle.h.security-code	2012-04-09 15:31:45.000000000 +0200
 +++ netpbm-10.58.01/urt/rle.h	2012-04-09 15:40:03.233619414 +0200
@@ -922,41 +863,6 @@ diff -up netpbm-9.58.01/urt/rle_putcom.c.security-code netpbm-10.58.01/urt/rle_p
          /* Not found */
          /* Can't realloc because somebody else might be pointing to this
           * comments block.  Of course, if this were true, then the
-diff -up netpbm-10.58.01/urt/Runput.c.security-code netpbm-10.58.01/urt/Runput.c
---- netpbm-10.58.01/urt/Runput.c.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/urt/Runput.c	2012-04-09 15:40:03.235619390 +0200
-@@ -17,6 +17,8 @@
-  *
-  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
-  *  to have all "void" functions so declared.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * Runput.c - General purpose Run Length Encoding.
-@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr)
-     if ( the_hdr->background != 0 )
-     {
- 	register int i;
--	register rle_pixel *background =
--	    (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
-+	register rle_pixel *background;
- 	register int *bg_color;
-+
-+	overflow_add(the_hdr->ncolors,1);
-+	background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
- 	/* 
- 	 * If even number of bg color bytes, put out one more to get to 
- 	 * 16 bit boundary.
-@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr)
- 	/* Big-endian machines are harder */
- 	register int i, nmap = (1 << the_hdr->cmaplen) *
- 			       the_hdr->ncmap;
--	register char *h_cmap = (char *)malloc( nmap * 2 );
-+	register char *h_cmap = (char *)malloc2( nmap, 2 );
- 	if ( h_cmap == NULL )
- 	{
- 	    fprintf( stderr,
 --- netpbm-10.58.01/lib/libpbm1.c.orig	2014-06-16 21:12:28.499230631 -0400
 +++ netpbm-10.58.01/lib/libpbm1.c	2014-06-16 21:12:55.932519324 -0400
 @@ -78,6 +78,7 @@
diff --git a/srcpkgs/netpbm/files/netpbm-security-scripts.patch b/srcpkgs/netpbm/files/netpbm-security-scripts.patch
deleted file mode 100644
index b26f1d4eac10..000000000000
--- a/srcpkgs/netpbm/files/netpbm-security-scripts.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ppmfade
---- netpbm-10.47.05/editor/ppmfade.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmfade	2010-03-16 21:28:09.000000000 +0100
-@@ -14,6 +14,7 @@
- #
- #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
- use strict;
-+use File::Temp "tempdir";
- 
- my $SPREAD =  1;
- my $SHIFT =   2;
-@@ -111,20 +112,26 @@ if ($first_file ne "undefined") {
- 
- print("Frames are " . $width . "W x " . $height . "H\n");
- 
-+#
-+# We create a tmp-directory right here
-+#
-+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
-+
-+
- if ($first_file eq "undefined") {
-     print "Fading from black to ";
--    system("ppmmake \\#000 $width $height >junk1$$.ppm");
-+    system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
- } else {
-     print "Fading from $first_file to ";
--    system("cp", $first_file, "junk1$$.ppm");
-+    system("cp", $first_file, "$tmpdir/junk1$$.ppm");
- }
- 
- if ($last_file eq "undefined") {
-     print "black.\n";
--    system("ppmmake \\#000 $width $height >junk2$$.ppm");
-+    system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
- } else {
-     print "$last_file\n";
--    system("cp", $last_file, "junk2$$.ppm");
-+    system("cp", $last_file, "$tmpdir/junk2$$.ppm");
- }
- 
- #
-@@ -132,14 +139,14 @@ if ($last_file eq "undefined") {
- #
- 
- # Here's what our temporary files are:
--#   junk1$$.ppm: The original (fade-from) image
--#   junk2$$.ppm: The target (fade-from) image
--#   junk3$$.ppm: The frame of the fade for the current iteration of the 
--#                the for loop.
--#   junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
--#                 image to another, this is the first frame of that 
--#                 sequence.
--#   junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
-+#   $tmpdir/junk1$$.ppm: The original (fade-from) image
-+#   $tmpdir/junk2$$.ppm: The target (fade-from) image
-+#   $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the 
-+#                	 the for loop.
-+#   $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
-+#                         image to another, this is the first frame of that 
-+#                         sequence.
-+#   $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
- 
- my $i;    # Frame number
- for ($i = 1; $i <= $nframes; $i++) {
-@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) {
-     if ($mode eq $SPREAD) {
-         if ($i <= 10) {
-             my $n = $spline20[$i] * 100;
--            system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
-+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n;
-             $n = $spline20[$i] * 100;
--            system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
-+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
-             $n = (1-$spline20[$i-10]) * 100;
--            system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
-+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
-             $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = (1-$spline20[$i-10])*100;
--            system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
-+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-     } elsif ($mode eq $SHIFT) {
-         if ($i <= 10) {
-             my $n = $spline20[$i] * 100;
--            system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
-+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n;
-             $n = $spline20[$i] * 100;
--            system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
-+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
-             $n = (1-$spline20[$i-10])*100;
--            system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
-+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
-             $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = (1-$spline20[$i-10]) * 100;
--            system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
-+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-     } elsif ($mode eq $RELIEF) {
-         if ($i == 1) {
--            system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
-+            system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
-+            system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
-         }
-     } elsif ($mode eq $OIL) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         }
-     } elsif ($mode eq $EDGE) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         } 
-     } elsif ($mode eq $BENTLEY) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         }
-     } elsif ($mode eq $BLOCK) {
-         if ($i <= 10) {
-             my $n = 1 - 1.9*$spline20[$i];
--            system("pamscale $n junk1$$.ppm | " .
--                   "pamscale -width $width -height $height >junk3$$.ppm");
-+            system("pamscale $n $tmpdir/junk1$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = 1 - 1.9*$spline20[31-$i];
--            system("pamscale $n junk2$$.ppm | " .
--                   "pamscale -width $width -height $height >junk3$$.ppm");
-+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("cp", "junk3$$.ppm", "junk1a$$.ppm");
--            system("pamscale $n junk2$$.ppm | " .
--                   "pamscale -width $width -height $height >junk2a$$.ppm");
-+            system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
-+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
-         }    
-     } elsif ($mode eq $MIX) {
-         my $fade_factor = sqrt(1/($nframes-$i+1));
--        system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
-+        system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-     } else {
-         print("Internal error: impossible mode value '$mode'\n");
-     }
- 
-     my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
--    system("cp", "junk3$$.ppm", $outfile);
-+    system("cp", "$tmpdir/junk3$$.ppm", $outfile);
- }
- 
- #
- #  Clean up shop.
- #
--system("rm junk*$$.ppm");
-+system("rm $tmpdir/junk*$$.ppm");
- 
- exit(0);
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index d72721bd9eb3..61728c4c7d28 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.97.06
+version=10.98.0.0
 revision=1
-_githash=f336dfc59346a26a045f7e0df0ecba32d904c55e
+_githash=772c4792d998deb70f1719c1a2ad82f2defde5f0
 _githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79
 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="9cd658ec9081b980a98fb44f02aa5289ba9ca17ad7e9a699627bf6f2a85c5612
+checksum="f53f8e57e1dec64edddec971f13a1cdcbc17d07110e4699b3090de7a79e3f75a
  30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde"
 
 post_extract() {

From d1f4d38ccb05d84962dfafbf910a759bc96d551c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:36:46 +0200
Subject: [PATCH 0907/2561] collectl: update to 4.3.3.

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

diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template
index 9ade016be223..ebc778450bc6 100644
--- a/srcpkgs/collectl/template
+++ b/srcpkgs/collectl/template
@@ -1,6 +1,6 @@
 # Template file for 'collectl'
 pkgname=collectl
-version=4.3.2
+version=4.3.3
 revision=1
 wrksrc="${pkgname}"
 conf_files="/etc/collectl.conf"
@@ -11,7 +11,7 @@ license="Artistic-1.0-Perl, GPL-2.0-only"
 homepage="http://collectl.sourceforge.net/"
 changelog="http://collectl.sourceforge.net/Releases.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.src.tar.gz"
-checksum=9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750
+checksum=3e87f9aa6cf1b585ce7cec6ee0e2cde652397fdf871b03b9609c56678f8b4dba
 
 do_install() {
 	export DESTDIR

From f5caa52d899cf6b3f2a244394a96ff9fa306281d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:37:24 +0200
Subject: [PATCH 0908/2561] skaffold: update to 1.37.1.

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

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 4f54c6c05e98..faa9823d1cc6 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.37.0
+version=1.37.1
 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=a97a6f6cbf571f342183e5cf65c30932ade282b182fc92f108cb2a160a46779b
+checksum=8dfea015256761525d8c0e54713642bcd7ead3e3c96ff58e301d0b77b9ef3bd5

From 15c6a5c8166537510538fdae4cae80e4ee58046c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 19:11:39 +0200
Subject: [PATCH 0909/2561] twm: update to 1.0.12.

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

diff --git a/srcpkgs/twm/template b/srcpkgs/twm/template
index 32a2efeeb004..94cbd1e4f511 100644
--- a/srcpkgs/twm/template
+++ b/srcpkgs/twm/template
@@ -1,6 +1,6 @@
 # Template file for 'twm'
 pkgname=twm
-version=1.0.11
+version=1.0.12
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros bison"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/twm.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
-checksum=f4e8a842dec410e79741f25ed4dfac09df080835d0bba2e3983b5914569b68c7
+checksum=aaf201d4de04c1bb11eed93de4bee0147217b7bdf61b7b761a56b2fdc276afe4
 
 post_install() {
 	vlicense COPYING

From 19e5c63ebfb530c2db28397032444bdc480fc94c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 3 Apr 2022 19:53:32 -0400
Subject: [PATCH 0910/2561] python3-progress: update to 1.6.

---
 srcpkgs/python3-progress/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-progress/template b/srcpkgs/python3-progress/template
index 4a4ec6e0a5a2..8883c784127f 100644
--- a/srcpkgs/python3-progress/template
+++ b/srcpkgs/python3-progress/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-progress'
 pkgname=python3-progress
-version=1.5
-revision=5
+version=1.6
+revision=1
 wrksrc="progress-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/verigak/progress"
 distfiles="${PYPI_SITE}/p/progress/progress-${version}.tar.gz"
-checksum=69ecedd1d1bbe71bf6313d88d1e6c4d2957b7f1d4f71312c211257f7dae64372
+checksum=c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd
+# Tests are only useful on interactive terminals
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 5ce3de8cd21767474fc91cb2d77190b370d74f55 Mon Sep 17 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, 3 Apr 2022 14:51:11 +0700
Subject: [PATCH 0911/2561] nss: update to 3.77.

---
 srcpkgs/nss/patches/cpputil-databuffer.patch | 20 --------------------
 srcpkgs/nss/template                         |  6 +++---
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/nss/patches/cpputil-databuffer.patch

diff --git a/srcpkgs/nss/patches/cpputil-databuffer.patch b/srcpkgs/nss/patches/cpputil-databuffer.patch
deleted file mode 100644
index 44dd3f467882..000000000000
--- a/srcpkgs/nss/patches/cpputil-databuffer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1758478
-diff --git a/nss/cpputil/databuffer.h b/nss/cpputil/databuffer.h
-index 8d34e1a..6aee509 100644
---- a/nss/cpputil/databuffer.h
-+++ b/nss/cpputil/databuffer.h
-@@ -33,11 +33,9 @@ class DataBuffer {
-     return *this;
-   }
-   DataBuffer& operator=(DataBuffer&& other) {
--    if (this == &other) {
--      data_ = other.data_;
--      len_ = other.len_;
--      other.data_ = nullptr;
--      other.len_ = 0;
-+    if (this != &other) {
-+      std::swap(data_, other.data_);
-+      std::swap(len_, other.len_);
-     }
-     return *this;
-   }
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index f85cfe79a868..5cc04daf52c2 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,9 +3,9 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.76
+version=3.77
 revision=1
-hostmakedepends="perl"
+hostmakedepends="perl which"
 makedepends="nspr-devel sqlite-devel zlib-devel"
 depends="nspr>=${_nsprver}"
 short_desc="Mozilla Network Security Services"
@@ -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=1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630
+checksum=825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 142c1bc67243fba677f952a75d4a67dc922de322 Mon Sep 17 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, 3 Apr 2022 18:16:39 +0700
Subject: [PATCH 0912/2561] ca-certificates: update to 20211016+3.77.

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

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 450772d160e2..eaa70fc7a22b 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,6 +1,6 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
-version=20211016+3.74
+version=20211016+3.77
 revision=1
 _nss_version=${version#*+}
 bootstrap=yes
@@ -16,7 +16,7 @@ homepage="https://wiki.mozilla.org/NSS:Root_certs"
 distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz
  ${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz"
 checksum="2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88
- 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056"
+ 825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd"
 
 post_extract() {
 	cp ${FILESDIR}/* $build_wrksrc/mozilla

From 1e82e3150f1a92909828fc34767a8a91ab96c276 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 15:45:11 +0200
Subject: [PATCH 0913/2561] texlive2021-bin: use historic texlive repository.

As texlive2022 has been released the default repository no longer
contains the 2021 version. Make the installer use the frozen
historic one.
---
 srcpkgs/texlive2021-bin/INSTALL  | 4 ++--
 srcpkgs/texlive2021-bin/template | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive2021-bin/INSTALL b/srcpkgs/texlive2021-bin/INSTALL
index 9a5b1df97deb..bc296786a54e 100644
--- a/srcpkgs/texlive2021-bin/INSTALL
+++ b/srcpkgs/texlive2021-bin/INSTALL
@@ -5,10 +5,10 @@ post)
 		cd opt/texlive2021-installer
 		case "${ARCH}" in
 			x86_64-musl)
-			./install-tl -profile void.profile -force-platform x86_64-linuxmusl
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile -force-platform x86_64-linuxmusl
 			;;
 			*)
-			./install-tl -profile void.profile
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile
 			;;
 		esac
 	esac
diff --git a/srcpkgs/texlive2021-bin/template b/srcpkgs/texlive2021-bin/template
index 5c9e334c788e..c7bbe1f9fdb8 100644
--- a/srcpkgs/texlive2021-bin/template
+++ b/srcpkgs/texlive2021-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive2021-bin'
 pkgname=texlive2021-bin
 version=2021
-revision=1
+revision=2
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv

From 62a93144f49705bac558d5f9450c4bfd15e04a93 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 15:45:46 +0200
Subject: [PATCH 0914/2561] New package: texlive2022-bin-2022

---
 srcpkgs/texlive2022-bin/INSTALL            | 15 ++++++++
 srcpkgs/texlive2022-bin/INSTALL.msg        | 25 ++++++++++++
 srcpkgs/texlive2022-bin/REMOVE             |  8 ++++
 srcpkgs/texlive2022-bin/files/void.profile |  8 ++++
 srcpkgs/texlive2022-bin/template           | 45 ++++++++++++++++++++++
 5 files changed, 101 insertions(+)
 create mode 100644 srcpkgs/texlive2022-bin/INSTALL
 create mode 100644 srcpkgs/texlive2022-bin/INSTALL.msg
 create mode 100644 srcpkgs/texlive2022-bin/REMOVE
 create mode 100644 srcpkgs/texlive2022-bin/files/void.profile
 create mode 100644 srcpkgs/texlive2022-bin/template

diff --git a/srcpkgs/texlive2022-bin/INSTALL b/srcpkgs/texlive2022-bin/INSTALL
new file mode 100644
index 000000000000..890ae6709c6e
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/INSTALL
@@ -0,0 +1,15 @@
+case "${ACTION}" in
+post)
+	case "${UPDATE}" in
+	no)
+		cd opt/texlive2022-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/texlive2022-bin/INSTALL.msg b/srcpkgs/texlive2022-bin/INSTALL.msg
new file mode 100644
index 000000000000..05a58d965c72
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/INSTALL.msg
@@ -0,0 +1,25 @@
+- TeXLive is free software see the files:
+
+  /usr/share/licenses/texlive2022-bin/LICENSE.TL
+  /usr/share/licenses/texlive2022-bin/LICENSE.CTAN
+
+=====================================================================
+
+  To update you TeXLive installation use only the program 
+
+  /opt/texlive/2022/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/texlive2022-bin/REMOVE b/srcpkgs/texlive2022-bin/REMOVE
new file mode 100644
index 000000000000..82df92619ea7
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/REMOVE
@@ -0,0 +1,8 @@
+# This script will clear the TeXLive directory  
+#
+case "${ACTION}" in
+post)
+	rm -rf opt/texlive/2022
+	rm -r opt/texlive2022-installer
+	;;
+esac
diff --git a/srcpkgs/texlive2022-bin/files/void.profile b/srcpkgs/texlive2022-bin/files/void.profile
new file mode 100644
index 000000000000..17ad30ed523d
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/files/void.profile
@@ -0,0 +1,8 @@
+# texlive.profile written for voidlinux
+TEXDIR ../texlive/2022
+TEXMFCONFIG ~/.texlive2022/texmf-config
+TEXMFHOME ~/texmf
+TEXMFLOCAL ../texlive/texmf-local
+TEXMFSYSCONFIG ../texlive/2022/texmf-config
+TEXMFSYSVAR ../texlive/2022/texmf-var
+TEXMFVAR ~/.texlive2022/texmf-var
diff --git a/srcpkgs/texlive2022-bin/template b/srcpkgs/texlive2022-bin/template
new file mode 100644
index 000000000000..902d4dc245d7
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/template
@@ -0,0 +1,45 @@
+# Template file for 'texlive2022-bin'
+pkgname=texlive2022-bin
+version=2022
+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="https://tug.org/texlive/"
+distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
+checksum=e67edec49df6b7c4a987a7d5a9b31bcf41258220f9ac841c7a836080cd334fb5
+
+# 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 28c4cf8c981d13b79323a05961dcecff89925dff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:25:10 +0200
Subject: [PATCH 0915/2561] xcalc: update to 1.1.1.

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

diff --git a/srcpkgs/xcalc/template b/srcpkgs/xcalc/template
index d73849df763e..90be0b7c5028 100644
--- a/srcpkgs/xcalc/template
+++ b/srcpkgs/xcalc/template
@@ -1,6 +1,6 @@
 # Template file for 'xcalc'
 pkgname=xcalc
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -9,8 +9,8 @@ short_desc="Scientific calculator for X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xcalc.1.html"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=d5d746954465afc3da1f355d721882806568fb04b4d059c027702c0d16a3b5eb
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=8cb08212c5322e8043f39b28699e13a43f000976c90b3c7fadd4fae2766326b4
 
 post_install() {
 	vlicense COPYING

From 0f2cf4348d1f464de5792095d1e8a2283cf52384 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:26:24 +0200
Subject: [PATCH 0916/2561] xclock: update to 1.1.0.

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

diff --git a/srcpkgs/xclock/template b/srcpkgs/xclock/template
index 68650d8d3ce1..6d214076f834 100644
--- a/srcpkgs/xclock/template
+++ b/srcpkgs/xclock/template
@@ -1,6 +1,6 @@
 # Template file for 'xclock'
 pkgname=xclock
-version=1.0.9
+version=1.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -9,8 +9,8 @@ short_desc="Analog and digital clock for X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xclock.1.html"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=00d1be08b3471a16b1239acad11e26b80545c49c34d9d20deab0ce14515e098f
 
 post_install() {
 	vlicense COPYING

From 3fd421bae3205168eb4ba8d114ef79e0640f202e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:27:47 +0200
Subject: [PATCH 0917/2561] xdm: update to 1.1.13.

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

diff --git a/srcpkgs/xdm/template b/srcpkgs/xdm/template
index 8eb910bf6c8b..3a53a7ae30cf 100644
--- a/srcpkgs/xdm/template
+++ b/srcpkgs/xdm/template
@@ -1,7 +1,7 @@
 # Template file for 'xdm'
 pkgname=xdm
-version=1.1.12
-revision=5
+version=1.1.13
+revision=1
 build_style=gnu-configure
 configure_args="--with-random-device=/dev/urandom
  --with-utmp-file=/var/run/utmp
@@ -21,8 +21,8 @@ short_desc="X Display Manager"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=e58267e8f1478f2f5cd57cbcf2367a36973860c3131a450a3e0816585af03264
 
 post_install() {
 	vsv xdm

From 6992e535c71bf4c4256c5d06af3c4d8dee09adb3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:30:19 +0200
Subject: [PATCH 0918/2561] xedit: update to 1.2.3.

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

diff --git a/srcpkgs/xedit/template b/srcpkgs/xedit/template
index 99f2001b1611..5cdfccdeb594 100644
--- a/srcpkgs/xedit/template
+++ b/srcpkgs/xedit/template
@@ -1,7 +1,7 @@
 # Template build file for 'xedit'.
 pkgname=xedit
-version=1.2.2
-revision=3
+version=1.2.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXaw-devel"
@@ -9,8 +9,8 @@ short_desc="Simple text editor for X"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=69aa42885dfc06332ca22eb01cc7187e49206e6d65b74113a8ee4cc345fc2927
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=bdd33afeeca881622e55d2cf28f07b4a98f083d0a2573c0b9048f25bdd62db2f
 
 post_install() {
 	vlicense COPYING

From 70176e41c511d7d0a49164a927964de32dfdd87b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:31:06 +0200
Subject: [PATCH 0919/2561] xload: update to 1.1.4.

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

diff --git a/srcpkgs/xload/template b/srcpkgs/xload/template
index 74cbd8bbf5ed..ea85f0afcc45 100644
--- a/srcpkgs/xload/template
+++ b/srcpkgs/xload/template
@@ -1,6 +1,6 @@
 # Template file for 'xload'
 pkgname=xload
-version=1.1.3
+version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config xorg-util-macros"
@@ -9,8 +9,8 @@ short_desc="System load average display for X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11, MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xload.1.html"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f34e4803871d771325cfe52bebd98cc5b6040d3f065184ec73de436f9a375907
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=8346b99120db24e0f42920f7f12e23e9b1b407d3a66ce419990387b608373031
 
 post_install() {
 	vlicense COPYING

From 9390a38f11624205c410188bbeae915b9c329c78 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:32:57 +0200
Subject: [PATCH 0920/2561] xlsfonts: update to 1.0.7.

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

diff --git a/srcpkgs/xlsfonts/template b/srcpkgs/xlsfonts/template
index 27caf717e52d..830ae67c26f0 100644
--- a/srcpkgs/xlsfonts/template
+++ b/srcpkgs/xlsfonts/template
@@ -1,16 +1,16 @@
-# Template build file for 'xlsfonts'.
+# Template file for 'xlsfonts'
 pkgname=xlsfonts
-version=1.0.6
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel"
 short_desc="Server font list displayer for X"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-checksum=89b80b3a030006ab6cef717be286c12f2477894b227158b1e6133274f6ebd368
+homepage="http://xorg.freedesktop.org"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=7b726945a967b44c35cddee5edd74802907a239ce2e2e515730b8a32c8e50465
 
 post_install() {
 	vlicense COPYING

From 14b284c2a91e6407ccc3dd36aaa3ad8faadebdfa Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 13 Oct 2021 08:31:15 -0400
Subject: [PATCH 0921/2561] python3-zeroconf: update to 0.38.4.

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

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index a08bf018db1d..acae59ecd99f 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,20 +1,21 @@
 # Template file for 'python3-zeroconf'
 pkgname=python3-zeroconf
-version=0.30.0
-revision=2
+version=0.38.4
+revision=1
 wrksrc="python-zeroconf-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-ifaddr"
-checkdepends="python3-pytest python3-mypy $depends"
+checkdepends="python3-pytest python3-pytest-cov python3-mypy
+ python3-pytest-asyncio $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=bbb5e15625a96ac4dc4fba33519227ea8a6d1991000af51e976d01d2917a8d82
+checksum=74ead61490a7573d1cab1e9e9ea6fe846be0843c4ddd55633788d4670837c0eb
 
 do_check() {
 	# IPv6 doesn't work on github CI
-	SKIP_IPV6=1 python3 -m pytest zeroconf/test.py
+	SKIP_IPV6=1 python3 -m pytest tests/
 }

From a4862d5a3b9bfb35f838d70704263af5bab2b37a Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 00:04:32 -0400
Subject: [PATCH 0922/2561] chezmoi: update to 2.15.0.

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

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 464d7ccc07ca..abf8ff70d40f 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.14.0
+version=2.15.0
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=4d7a1baf7e3caa8f6976b1ea5e6ba81c75273b1dd1f0fc946134a82454720397
+checksum=d33a5df53bde7b94962c39788e44af41e52a7836bc6d43168c9b324da966996e
 
 export CGO_ENABLED=1
 

From 6d760371d59b152b34861a06507dbfdf759e1908 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:29:38 +0200
Subject: [PATCH 0923/2561] apostrophe: update to 2.6.2.

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

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index d130b8694cd4..54a80188bdae 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,6 +1,6 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.6.1
+version=2.6.2
 revision=1
 wrksrc="$pkgname-v$version"
 build_style=meson
@@ -9,9 +9,10 @@ hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext sassc"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
 depends="python3-gobject python3-chardet python3-setuptools python3-pypandoc
  gspell iso-codes libhandy1 webkit2gtk"
-short_desc="GTK+ based distraction free Markdown editor"
+short_desc="GTK based distraction free Markdown editor"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/World/apostrophe"
+changelog="https://gitlab.gnome.org/World/apostrophe/-/raw/main/NEWS"
 distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz"
-checksum=f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c
+checksum=b06ca4593ceb21bcd7f9734e41ba3fb69f632b5ab24afcdc66500d18d242c068

From 01b6783c11bd4396336651435ce25d187b83ff19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:45:19 +0200
Subject: [PATCH 0924/2561] streamlink: update to 3.2.0.

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

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index 3d168cc74c79..5b8427c56e96 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=3.1.1
+version=3.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
 distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz"
-checksum=855cd31e900e3ae1d5328a37123bfffe2aec501a1d74bcdd12f0d2a2758060e4
+checksum=9770d2d83844c5378a73e14130dcb760abc856566caa0a41fc5b97a0ded5d926
 make_check=ci-skip # some tests fail when running as root
 
 post_install() {

From d1d000a28a7c2addf106e72c0c8e432032b44dbd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:48:10 +0200
Subject: [PATCH 0925/2561] xorg-server-xwayland: update to 22.1.1.

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

diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index 0506654b4ca5..9cb01b318ddb 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=22.1.0
+version=22.1.1
 revision=1
 wrksrc="xserver-xwayland-$version"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=972d5456445049855a669c1418f20ecbc290c85b1b59602a01c6afa199203389
+checksum=42837e7b90e0d92aff4d7846f0609f8d3c0c6641bdd6add6e4e0c5c214371149
 make_check=no # needs xtest repository
 
 post_install() {

From a479197456f6aeb6274f38a624c9d607985da97d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:48:34 +0200
Subject: [PATCH 0926/2561] lagrange: update to 1.11.2.

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

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0da2bdd614fd..41a9f935f8eb 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.11.1
+version=1.11.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=a303f62b6e7372396d334f25eeaaa745827c28ac926dc12305b2b41596d748e8
+checksum=4e9a9ed38bcfc7b04856f0e2667d7afd535a8e06e367e2e4368ef5fb9105791f
 
 post_install() {
 	vlicense LICENSE.md

From dee6c4167e973b148d29a367a156edfba031bab3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:51:01 +0200
Subject: [PATCH 0927/2561] python3-charset-normalizer: update to 2.0.12.

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

diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template
index 16fbe97b2ef2..7c8809724b1b 100644
--- a/srcpkgs/python3-charset-normalizer/template
+++ b/srcpkgs/python3-charset-normalizer/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-charset-normalizer'
 pkgname=python3-charset-normalizer
-version=2.0.11
+version=2.0.12
 revision=1
 wrksrc="charset_normalizer-$version"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://charset-normalizer.readthedocs.io/"
 changelog="https://raw.githubusercontent.com/Ousret/charset_normalizer/master/CHANGELOG.md"
 distfiles="https://github.com/Ousret/charset_normalizer/archive/refs/tags/$version.tar.gz"
-checksum=d7188036dd61de0e626717d0b5fe6365beac7ea03c77b354e874a1098ed2b18a
+checksum=8dd3a1a5444741208d627993344516cb62909c8c3f5c55deaa5bee6a305ead7a
 
 pre_check() {
 	vsed -i "s/--cov=charset_normalizer --cov-report=term-missing//" setup.cfg

From 7e3ec1f9e1c31d0dd412f7505f97ff2f998135b6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:51:06 +0200
Subject: [PATCH 0928/2561] easyeffects: update to 6.2.4.

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

diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index bc1aaffed675..ac84ce15b068 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,6 +1,6 @@
 # Template file for 'easyeffects'
 pkgname=easyeffects
-version=6.2.3
+version=6.2.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/wwmm/easyeffects"
 changelog="https://raw.githubusercontent.com/wwmm/easyeffects/master/CHANGELOG.md"
 distfiles="https://github.com/wwmm/easyeffects/archive/v${version}.tar.gz"
-checksum=525cb56847c5d85589a2351e012712ff7f66c951f530ba50f5acb86a988584aa
+checksum=2d4e5638f209a887acb73b3d2bbea4bc5f83ded866bba40c1935ec40fb17658b
 
 pulseeffects_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f2e8c6c1e8cc7a63d60a7b14479f4fff31b821d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 3 Apr 2022 12:00:11 -0300
Subject: [PATCH 0929/2561] New package: threejs-sage-r122

---
 srcpkgs/threejs-sage/template | 16 ++++++++++++++++
 srcpkgs/threejs-sage/update   |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/threejs-sage/template
 create mode 100644 srcpkgs/threejs-sage/update

diff --git a/srcpkgs/threejs-sage/template b/srcpkgs/threejs-sage/template
new file mode 100644
index 000000000000..cb5c87a19c12
--- /dev/null
+++ b/srcpkgs/threejs-sage/template
@@ -0,0 +1,16 @@
+# Template file for 'threejs-sage'
+pkgname=threejs-sage
+version=r122
+revision=1
+short_desc="Custom build of three.js for sagemath"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/sagemath/threejs-sage/"
+distfiles="https://github.com/sagemath/threejs-sage/archive/refs/tags/${version}.tar.gz"
+checksum=718767ab55876a3e957d1cfe89a322c6d9fa680fc737b9ca668aee6a3eac3bb8
+
+do_install() {
+	vlicense LICENSE
+	vinstall version 644 usr/share/sagemath/threejs-sage
+	vinstall build/three.min.js 644 usr/share/sagemath/threejs-sage/$version
+}
diff --git a/srcpkgs/threejs-sage/update b/srcpkgs/threejs-sage/update
new file mode 100644
index 000000000000..05c0c7ecebe1
--- /dev/null
+++ b/srcpkgs/threejs-sage/update
@@ -0,0 +1 @@
+site=https://mirrors.mit.edu/sage/spkg/upstream/threejs/

From 7c6e100bed78f75d5975d68d6fa99b0029cf6d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 28 Feb 2022 12:03:22 -0300
Subject: [PATCH 0930/2561] lrcalc: update to 2.1.

---
 common/shlibs                         |  2 +-
 srcpkgs/lrcalc/patches/includes.patch | 90 ---------------------------
 srcpkgs/lrcalc/template               |  6 +-
 3 files changed, 4 insertions(+), 94 deletions(-)
 delete mode 100644 srcpkgs/lrcalc/patches/includes.patch

diff --git a/common/shlibs b/common/shlibs
index 307cb13347fc..e7af88140d1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4040,7 +4040,7 @@ libarb.so.2 arb-2.20.0_1
 libec.so.8 eclib-20210625_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
-liblrcalc.so.1 lrcalc-1.2_1
+liblrcalc.so.2 lrcalc-2.1_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/lrcalc/patches/includes.patch b/srcpkgs/lrcalc/patches/includes.patch
deleted file mode 100644
index 707da176a60f..000000000000
--- a/srcpkgs/lrcalc/patches/includes.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 4a5e1c8c3c11efdb1cbb4239825a6bf4bf1c52f8 Mon Sep 17 00:00:00 2001
-From: Anders Skovsted Buch <asbuch@math.rutgers.edu>
-Date: Sun, 29 Nov 2015 16:25:56 -0500
-Subject: [PATCH] Patch by Jeroen Demeyer to change include <vector.h> to
- "vector.h", plus similar cases.
-
----
- src/lrcalc.c   | 2 +-
- src/maple.c    | 4 ++--
- src/schublib.h | 2 +-
- src/symfcn.c   | 6 +++---
- src/symfcn.h   | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/lrcalc.c b/src/lrcalc.c
-index aff3f75..60df49e 100644
---- a/src/lrcalc.c
-+++ b/src/lrcalc.c
-@@ -8,7 +8,7 @@
- #include <stdlib.h>
- extern char *optarg;
- 
--#include <vectarg.h>
-+#include "vectarg.h"
- 
- #include "symfcn.h"
- #include "maple.h"
-diff --git a/src/maple.c b/src/maple.c
-index fdc0768..a5f4d14 100644
---- a/src/maple.c
-+++ b/src/maple.c
-@@ -4,8 +4,8 @@
-  */
- 
- #include <stdio.h>
--#include <vector.h>
--#include <hashtab.h>
-+#include "vector.h"
-+#include "hashtab.h"
- #include "maple.h"
- 
- 
-diff --git a/src/schublib.h b/src/schublib.h
-index a8e8511..864850c 100644
---- a/src/schublib.h
-+++ b/src/schublib.h
-@@ -1,7 +1,7 @@
- #ifndef _SCHUBLIB_H
- #define _SCHUBLIB_H
- 
--#include <hashtab.h>
-+#include "hashtab.h"
- 
- hashtab *trans(vector *w, int vars, hashtab *res);
- hashtab *monk(int i, hashtab *slc, int rank);
-diff --git a/src/symfcn.c b/src/symfcn.c
-index 4ffbe4b..fd5df5d 100644
---- a/src/symfcn.c
-+++ b/src/symfcn.c
-@@ -5,9 +5,9 @@
- 
- #include <stdio.h>
- 
--#include <alloc.h>
--#include <vector.h>
--#include <hashtab.h>
-+#include "alloc.h"
-+#include "vector.h"
-+#include "hashtab.h"
- 
- #include "symfcn.h"
- 
-diff --git a/src/symfcn.h b/src/symfcn.h
-index b8543b1..29bb00d 100644
---- a/src/symfcn.h
-+++ b/src/symfcn.h
-@@ -1,8 +1,8 @@
- #ifndef _SYMFCN_H
- #define _SYMFCN_H
- 
--#include <hashtab.h>
--#include <vector.h>
-+#include "hashtab.h"
-+#include "vector.h"
- 
- int part_itr_sz(vector *part);
- int part_itr_sub(vector *part, vector *outer);
--- 
-2.1.1.1.g1fb337f
-
diff --git a/srcpkgs/lrcalc/template b/srcpkgs/lrcalc/template
index 8b33c3cba6c8..afa889b6d6ad 100644
--- a/srcpkgs/lrcalc/template
+++ b/srcpkgs/lrcalc/template
@@ -1,14 +1,14 @@
 # Template file for 'lrcalc'
 pkgname=lrcalc
-version=1.2
-revision=2
+version=2.1
+revision=1
 build_style=gnu-configure
 short_desc="Littlewood-Richardson Calculator"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-or-later"
 homepage="https://sites.math.rutgers.edu/~asbuch/lrcalc/"
 distfiles="https://sites.math.rutgers.edu/~asbuch/lrcalc/lrcalc-$version.tar.gz"
-checksum=792dd538a0d19698be2c5b8c138730bbb4820e8a44e03b001ae14bd5f1d7040b
+checksum=996ac00e6ea8321ef09b34478f5379f613933c3254aeba624b6419b8afa5df57
 
 lrcalc-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 0fc4b2913662b329e75323bc4aa2cae64d2703b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 28 Feb 2022 14:06:21 -0300
Subject: [PATCH 0931/2561] New package: python3-lrcalc-2.1

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

diff --git a/srcpkgs/python3-lrcalc/template b/srcpkgs/python3-lrcalc/template
new file mode 100644
index 000000000000..9f335dac35dd
--- /dev/null
+++ b/srcpkgs/python3-lrcalc/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-lrcalc'
+pkgname=python3-lrcalc
+version=2.1
+revision=1
+wrksrc=lrcalc-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel lrcalc-devel"
+short_desc="Python bindings for the Littlewood-Richardson Calculator library"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-or-later"
+homepage="https://math.rutgers.edu/~asbuch/lrcalc"
+distfiles="${PYPI_SITE}/l/lrcalc/lrcalc-${version}.tar.gz"
+checksum=e3a0509aeda487b412b391a52e817ca36b5c063a8305e09fd54d53259dd6aaa9

From 430a5b0eb620eeaae7a4ca35cf3cd8c0e06dc9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 22 Jan 2022 16:35:34 -0300
Subject: [PATCH 0932/2561] lcalc: ignore a version irrelevant for us

---
 srcpkgs/lcalc/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/lcalc/update

diff --git a/srcpkgs/lcalc/update b/srcpkgs/lcalc/update
new file mode 100644
index 000000000000..4cfe261c03b8
--- /dev/null
+++ b/srcpkgs/lcalc/update
@@ -0,0 +1,2 @@
+# this version only adds a fix for cygwin
+ignore=2.0.5

From ceb44152a82c802f432c873fbdad749bb77e3042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 22 Jan 2022 16:35:20 -0300
Subject: [PATCH 0933/2561] python3-gmpy2: ignore a version irrelevant for us

---
 srcpkgs/python3-gmpy2/update | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/python3-gmpy2/update b/srcpkgs/python3-gmpy2/update
index b5703618d280..0d9a7f7d2018 100644
--- a/srcpkgs/python3-gmpy2/update
+++ b/srcpkgs/python3-gmpy2/update
@@ -1 +1,3 @@
 ignore="*a[1-9] *b[1-9] *rc[1-9]"
+# this version only adds binary wheels for apple silicon
+ignore="$ignore 2.1.2"

From fb88da191774b937be7923ef452fb4f68bbce14a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 28 Feb 2022 14:06:28 -0300
Subject: [PATCH 0934/2561] sagemath: rebuild for package updates

 - compatibility with lrcalc 2.1 (trac #31355)
 - fix doctests for ipython-8.1 (trac #33170)
 - fix doctests for scipy-1.8 (trac #33336)
 - fix doctests for sympy-1.10 (trac #33398)
 - fix doctests when sphinx is installed (trac #33585)
 - use new package threejs-sage for 3d plots
---
 .../trac-31355-upgrade_lrcalc_to_2.1.patch    | 670 ++++++++++++++++++
 .../trac-33170-fix_doctest_ipython_8.patch    |  40 ++
 .../trac-33170b-fix_doctest_ipython_8.1.patch |  13 +
 .../trac-33336-fix_doctest_scipy_1.8.patch    |  19 +
 ...d9deaeaa6380ab2f0d50276d911233c00a04.patch |  99 +++
 ...ff347454ac7f07e5918470b20e97b8f2357e.patch |  29 +
 ...0a0b14f67f4804e7113c3db41bbcf8a58296.patch |  26 +
 .../patches/zzz-skip_doctest_no_threejs.patch |  13 -
 srcpkgs/sagemath/template                     |   9 +-
 9 files changed, 901 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch
 delete mode 100644 srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch

diff --git a/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch b/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch
new file mode 100644
index 000000000000..4bd6f4f4e2dc
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch
@@ -0,0 +1,670 @@
+As produced by `git diff 9.5 9.6.beta3 -- src/sage/libs/lrcalc`
+
+diff --git a/src/sage/libs/lrcalc/lrcalc.pxd b/src/sage/libs/lrcalc/lrcalc.pxd
+deleted file mode 100644
+index 10b88db93f2..00000000000
+--- a/src/sage/libs/lrcalc/lrcalc.pxd
++++ /dev/null
+@@ -1,77 +0,0 @@
+-# distutils: libraries = lrcalc
+-
+-cdef extern from "lrcalc/hashtab.h":
+-    ctypedef struct hashtab:
+-        pass
+-
+-    ctypedef struct hash_itr:
+-        pass
+-
+-    ctypedef unsigned long hashkey_t
+-    ctypedef int (*cmp_t) (void* a, void* b)
+-    ctypedef hashkey_t (*hash_t) (void* a)
+-
+-    hashtab* hash_new(cmp_t cm, hash_t hsh)
+-    void hash_free(hashtab *ht)
+-
+-    void* hash_lookup(hashtab *ht, void *key)
+-    void* hash_insert(hashtab *ht, void *key, void *value)
+-
+-    bint hash_good(hash_itr)
+-    void hash_first(hashtab* s, hash_itr itr)
+-    void hash_next(hash_itr itr)
+-    void* hash_key(hash_itr itr)
+-    void* hash_value(hash_itr itr)
+-    int hash_intvalue(hash_itr itr)
+-
+-cdef extern from "lrcalc/vector.h":
+-    ctypedef struct vector:
+-        size_t length
+-        int* array
+-
+-    vector* v_new(int length)
+-    void v_free(vector* v)
+-    void v_print(vector *v)
+-    int v_length(vector* v)
+-    int v_elem(vector* v, int i)
+-
+-    ctypedef struct vecpair:
+-        vector *first
+-        vector *second
+-
+-    vector* vp_first(vecpair* vp)
+-    vector* vp_second(vecpair* vp)
+-
+-cdef extern from "lrcalc/list.h":
+-    cdef struct _list:
+-        void **array
+-        size_t allocated
+-        size_t length
+-    void l_free(_list *lst)
+-
+-cdef extern from "lrcalc/symfcn.h":
+-    long long lrcoef_c "lrcoef"(vector* outer, vector* inner1, vector* inner2)
+-    hashtab* mult_c "mult"(vector *sh1, vector *sh2, int maxrows)
+-    hashtab* skew_c "skew"(vector *outer, vector *inner, int maxrows)
+-    hashtab* coprod_c "coprod"(vector *part, int all)
+-    void fusion_reduce_c "fusion_reduce"(hashtab* ht, int rows, int cols, int opt_zero)
+-    _list *quantum_reduce_c "quantum_reduce"(hashtab* ht, int rows, int col)
+-
+-    ctypedef struct skewtab:
+-        vector *outer
+-        vector *inner
+-        vector *conts
+-        int maxrows
+-        vector *conjugate
+-        int rows
+-        int cols
+-        int matrix[1]
+-
+-    skewtab *st_new(vector *outer, vector *inner, vector *conts, int maxrows)
+-    int st_next(skewtab *st)
+-    void st_print(skewtab *st)
+-    void st_free(skewtab *st)
+-
+-
+-cdef extern from "lrcalc/schublib.h":
+-    hashtab* mult_schubert_c "mult_schubert"(vector *sh1, vector *sh2, int rank)
+diff --git a/src/sage/libs/lrcalc/lrcalc.pyx b/src/sage/libs/lrcalc/lrcalc.py
+similarity index 60%
+rename from src/sage/libs/lrcalc/lrcalc.pyx
+rename to src/sage/libs/lrcalc/lrcalc.py
+index b591081ec4c..b541bfacd89 100644
+--- a/src/sage/libs/lrcalc/lrcalc.pyx
++++ b/src/sage/libs/lrcalc/lrcalc.py
+@@ -10,7 +10,8 @@ fusion products. All of the above are achieved by counting LR
+ appropriate shape and content by iterating through them.
+ Additionally, ``lrcalc`` handles products of Schubert polynomials.
+ 
+-The web page of ``lrcalc`` is `<http://sites.math.rutgers.edu/~asbuch/lrcalc/>`_.
++The web page of ``lrcalc`` is
++`<http://sites.math.rutgers.edu/~asbuch/lrcalc/>`_.
+ 
+ The following describes the Sage interface to this library.
+ 
+@@ -36,12 +37,13 @@ Schur expansion::
+      [4, 2]: 1}
+ 
+ Same product, but include only partitions with at most 3 rows.  This
+-corresponds to computing in the representation ring of gl(3)::
++corresponds to computing in the representation ring of `\mathfrak{gl}(3)`::
+ 
+     sage: lrcalc.mult([2,1], [2,1], 3)
+     {[2, 2, 2]: 1, [3, 2, 1]: 2, [3, 3]: 1, [4, 1, 1]: 1, [4, 2]: 1}
+ 
+-We can also compute the fusion product, here for sl(3) and level 2::
++We can also compute the fusion product, here for `\mathfrak{sl}(3)`
++and level 2::
+ 
+     sage: lrcalc.mult([3,2,1], [3,2,1], 3,2)
+     {[4, 4, 4]: 1, [5, 4, 3]: 1}
+@@ -77,42 +79,38 @@ Multiply two Schubert polynomials::
+      [6, 2, 1, 4, 3, 5]: 1}
+ 
+ Same product, but include only permutations of 5 elements in the result.
+-This corresponds to computing in the cohomology ring of Fl(5)::
++This corresponds to computing in the cohomology ring of `Fl(5)`::
+ 
+     sage: lrcalc.mult_schubert([4,2,1,3], [1,4,2,5,3], 5)
+     {[4, 5, 1, 3, 2]: 1, [5, 3, 1, 4, 2]: 1, [5, 4, 1, 2, 3]: 1}
+ 
+ List all Littlewood-Richardson tableaux of skew shape `\mu/\nu`; in
+ this example `\mu=[3,2,1]` and `\nu=[2,1]`. Specifying a third entry
+-`maxrows` restricts the alphabet to `\{1,2,\ldots,maxrows\}`::
++`M' = ``maxrows`` restricts the alphabet to `\{1,2,\ldots,M\}`::
+ 
+     sage: list(lrcalc.lrskew([3,2,1],[2,1]))
+     [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]],
+     [[None, None, 1], [None, 2], [1]], [[None, None, 1], [None, 2], [3]]]
+ 
+     sage: list(lrcalc.lrskew([3,2,1],[2,1],maxrows=2))
+-    [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]], [[None, None, 1], [None, 2], [1]]]
++    [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]],
++     [[None, None, 1], [None, 2], [1]]]
+ 
+ .. TODO::
+ 
+-    use this library in the :class:`SymmetricFunctions` code, to
++    Use this library in the :class:`SymmetricFunctions` code, to
+     make it easy to apply it to linear combinations of Schur functions.
+ 
+ .. SEEALSO::
+ 
+     - :func:`lrcoef`
+-
+     - :func:`mult`
+-
+     - :func:`coprod`
+-
+     - :func:`skew`
+-
+     - :func:`lrskew`
+-
+     - :func:`mult_schubert`
+ 
+-.. rubric:: Underlying algorithmic in lrcalc
++.. RUBRIC:: Underlying algorithmic in lrcalc
+ 
+ Here is some additional information regarding the main low-level
+ C-functions in `lrcalc`. Given two partitions ``outer`` and ``inner``
+@@ -187,180 +185,24 @@ AUTHORS:
+ #                  https://www.gnu.org/licenses/
+ # ****************************************************************************
+ 
+-from sage.rings.integer cimport Integer
+-from sage.structure.parent cimport Parent
+ from sage.combinat.partition import _Partitions
+ from sage.combinat.permutation import Permutation
+-from sage.combinat.skew_tableau import SkewTableau
+-
+-
+-cdef vector* iterable_to_vector(it):
+-    """
+-    Return an lrcalc vector (which is a list of integers) from a Python iterable.
+-
+-    TESTS::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector
+-        sage: x = test_iterable_to_vector(Partition([3,2,1])); x   #indirect doctest
+-        [3, 2, 1]
+-    """
+-    cdef vector* v
+-    cdef list itr = list(it)
+-    cdef int n = len(itr)
+-    cdef int i
+-    v = v_new(n)
+-    for i in range(n):
+-        v.array[i] = int(itr[i])
+-    return v
+-
+-
+-cdef list vector_to_list(vector *v):
+-    """
+-    Converts a lrcalc vector to Python list.
+-
+-    TESTS::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector
+-        sage: x = test_iterable_to_vector([]); x         #indirect doctest
+-        []
+-    """
+-    cdef int i, n
+-    n = v_length(v)
+-    cdef list result = [None]*n
+-    for i in range(n):
+-        result[i] = Integer(v_elem(v, i))
+-    return result
+-
+-
+-def test_iterable_to_vector(it):
+-    """
+-    A wrapper function for the cdef function ``iterable_to_vector``
+-    and ``vector_to_list``, to test that they are working correctly.
++from sage.combinat.skew_tableau import SemistandardSkewTableaux
++from sage.combinat.skew_partition import SkewPartition
++from sage.rings.integer import Integer
++import lrcalc
+ 
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector
+-        sage: x = test_iterable_to_vector([3,2,1]); x
+-        [3, 2, 1]
+-    """
+-    cdef vector *v = iterable_to_vector(it)
+-    result = vector_to_list(v)
+-    v_free(v)
+-    return result
+-
+-
+-cdef skewtab_to_SkewTableau(skewtab *st):
+-    """
+-    A wrapper function which transforms the data set ``st`` used in
+-    ``lrcalc`` to a ``SkewTableau`` in Sage.
++def _lrcalc_dict_to_sage(result):
++    r"""
++    Translate from lrcalc output format to Sage expected format.
+ 
+     TESTS::
+ 
+-        sage: from sage.libs.lrcalc.lrcalc import test_skewtab_to_SkewTableau
+-        sage: test_skewtab_to_SkewTableau([],[])
+-        []
+-    """
+-    inner = vector_to_list(st.inner)
+-    outer = vector_to_list(st.outer)
+-    return SkewTableau(expr=[[inner[y] for y in range(len(outer))],
+-                             [[st.matrix[x + y * st.cols] + 1
+-                                for x in range(inner[y], outer[y])]
+-                              for y in range(len(outer) - 1, -1, -1)]])
+-
+-
+-def test_skewtab_to_SkewTableau(outer, inner):
+-    """
+-    A wrapper function for the cdef function ``skewtab_to_SkewTableau``
+-    for testing purposes.
+-
+-    It constructs the first LR skew tableau of shape ``outer/inner``
+-    as an ``lrcalc`` ``skewtab``, and converts it to a
+-    :class:`SkewTableau`.
+-
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_skewtab_to_SkewTableau
+-        sage: test_skewtab_to_SkewTableau([3,2,1],[])
+-        [[1, 1, 1], [2, 2], [3]]
+-        sage: test_skewtab_to_SkewTableau([4,3,2,1],[1,1]).pp()
+-        .  1  1  1
+-        .  2  2
+-        1  3
+-        2
+-    """
+-    cdef vector* o = iterable_to_vector(outer)
+-    cdef vector* i = iterable_to_vector(inner+[0]*(len(outer)-len(inner)))
+-    cdef skewtab* st = st_new(o, i, NULL, 0)
+-    return skewtab_to_SkewTableau(st)
+-
+-
+-cdef dict sf_hashtab_to_dict(hashtab *ht):
+-    """
+-    Return a dictionary representing a Schur function. The keys are
+-    partitions and the values are integers <class 'sage.rings.integer.Integer'>.
+-
+-    EXAMPLES::
+-
+         sage: from sage.libs.lrcalc.lrcalc import mult
+-        sage: sorted(mult([1],[1]).items())        #indirect doctest
+-        [([1, 1], 1), ([2], 1)]
+-        sage: assert isinstance(mult([1],[1]),dict)#indirect doctest
+-    """
+-    cdef hash_itr itr
+-    cdef dict result = {}
+-    cdef list p
+-    hash_first(ht, itr)
+-    while hash_good(itr):
+-        p = vector_to_list(<vector*> hash_key(itr))
+-        result[_Partitions(p)] = Integer(hash_intvalue(itr))
+-        hash_next(itr)
+-    return result
+-
+-
+-cdef dict schubert_hashtab_to_dict(hashtab *ht):
+-    """
+-    Return a dictionary corresponding to a Schubert polynomial whose keys
+-    are permutations and whose values are integers <class 'sage.rings.integer.Integer'>.
+-
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import mult_schubert
+-        sage: mult_schubert([3,2,1], [1,2,3])      #indirect doctest
+-        {[3, 2, 1]: 1}
+-    """
+-    cdef hash_itr itr
+-    cdef dict result = {}
+-    hash_first(ht, itr)
+-    while hash_good(itr):
+-        p = vector_to_list(<vector*> hash_key(itr))
+-        result[Permutation(p)] = Integer(hash_intvalue(itr))
+-        hash_next(itr)
+-    return result
+-
+-
+-cdef dict vp_hashtab_to_dict(hashtab *ht):
+-    """
+-    Return a dictionary corresponding to the coproduct of a Schur function whose keys are
+-    pairs of partitions and whose values are integers <class 'sage.rings.integer.Integer'>.
+-
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import coprod
+-        sage: coprod([1])      #indirect doctest
+-        {([1], []): 1}
++        sage: mult([2,1],[3,2,1],3) # indirect doctest
++        {[3, 3, 3]: 1, [4, 3, 2]: 2, [4, 4, 1]: 1, [5, 2, 2]: 1, [5, 3, 1]: 1}
+     """
+-    cdef hash_itr itr
+-    cdef vecpair* vp
+-    cdef dict result = {}
+-    hash_first(ht, itr)
+-    while hash_good(itr):
+-        vp = <vecpair*> hash_key(itr)
+-        p1 = _Partitions(vector_to_list(vp_first(vp)))
+-        p2 = _Partitions(vector_to_list(vp_second(vp)))
+-        result[(p1, p2)] = Integer(hash_intvalue(itr))
+-        hash_next(itr)
+-    return result
+-
++    return {_Partitions(la): Integer(k) for la, k in result.items()}
+ 
+ def lrcoef_unsafe(outer, inner1, inner2):
+     r"""
+@@ -371,13 +213,11 @@ def lrcoef_unsafe(outer, inner1, inner2):
+ 
+     INPUT:
+ 
+-    - ``outer`` -- a partition (weakly decreasing list of non-negative integers).
+-
+-    - ``inner1`` -- a partition.
++    - ``outer`` -- a partition (weakly decreasing list of non-negative integers)
++    - ``inner1`` -- a partition
++    - ``inner2`` -- a partition
+ 
+-    - ``inner2`` -- a partition.
+-
+-    .. warning::
++    .. WARNING::
+ 
+        This function does not do any check on its input.  If you want
+        to use a safer version, use :func:`lrcoef`.
+@@ -392,18 +232,7 @@ def lrcoef_unsafe(outer, inner1, inner2):
+         sage: lrcoef_unsafe([2,1,1,1,1], [2,1], [2,1])
+         0
+     """
+-    cdef long long result
+-    cdef vector *o
+-    cdef vector *i1
+-    cdef vector *i2
+-    o = iterable_to_vector(outer)
+-    i1 = iterable_to_vector(inner1)
+-    i2 = iterable_to_vector(inner2)
+-    result = lrcoef_c(o, i1, i2)
+-    v_free(o)
+-    v_free(i1)
+-    v_free(i2)
+-    return Integer(result)
++    return Integer(lrcalc.lrcoef(outer, inner1, inner2))
+ 
+ 
+ def lrcoef(outer, inner1, inner2):
+@@ -415,11 +244,9 @@ def lrcoef(outer, inner1, inner2):
+ 
+     INPUT:
+ 
+-    - ``outer`` -- a partition (weakly decreasing list of non-negative integers).
+-
+-    - ``inner1`` -- a partition.
+-
+-    - ``inner2`` -- a partition.
++    - ``outer`` -- a partition (weakly decreasing list of non-negative integers)
++    - ``inner1`` -- a partition
++    - ``inner2`` -- a partition
+ 
+     .. NOTE::
+ 
+@@ -436,7 +263,6 @@ def lrcoef(outer, inner1, inner2):
+         1
+         sage: lrcoef([2,1,1,1,1], [2,1], [2,1])
+         0
+-
+     """
+     return lrcoef_unsafe(_Partitions(outer), _Partitions(inner1), _Partitions(inner2))
+ 
+@@ -451,13 +277,9 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None):
+     INPUT:
+ 
+     - ``part1`` -- a partition
+-
+     - ``part2`` -- a partition
+-
+     - ``maxrows`` -- (optional) an integer
+-
+     - ``level`` -- (optional) an integer
+-
+     - ``quantum`` -- (optional) an element of a ring
+ 
+     If ``maxrows`` is specified, then only partitions with at most
+@@ -479,7 +301,8 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None):
+         sage: sorted(mult([2],[2]).items())
+         [([2, 2], 1), ([3, 1], 1), ([4], 1)]
+         sage: sorted(mult([2,1],[2,1]).items())
+-        [([2, 2, 1, 1], 1), ([2, 2, 2], 1), ([3, 1, 1, 1], 1), ([3, 2, 1], 2), ([3, 3], 1), ([4, 1, 1], 1), ([4, 2], 1)]
++        [([2, 2, 1, 1], 1), ([2, 2, 2], 1), ([3, 1, 1, 1], 1),
++         ([3, 2, 1], 2), ([3, 3], 1), ([4, 1, 1], 1), ([4, 2], 1)]
+         sage: sorted(mult([2,1],[2,1],maxrows=2).items())
+         [([3, 3], 1), ([4, 2], 1)]
+         sage: mult([2,1],[3,2,1],3)
+@@ -510,44 +333,24 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None):
+     if quantum is not None and (level is None or maxrows is None):
+         raise ValueError('missing parameters maxrows or level')
+ 
+-    cdef vector* v1 = iterable_to_vector(part1)
+-    cdef vector* v2 = iterable_to_vector(part2)
+-    if maxrows is None:
+-        maxrows = 0
+-    cdef hashtab* ht = mult_c(v1, v2, int(maxrows))
+-    cdef hashtab* tab
+-    cdef dict result
+-
+     if quantum is None:
+         if level is not None:
+-            fusion_reduce_c(ht, int(maxrows), int(level), int(0))
+-        result = sf_hashtab_to_dict(ht)
+-        v_free(v1)
+-        v_free(v2)
+-        hash_free(ht)
+-        return result
++            return _lrcalc_dict_to_sage(lrcalc.mult_fusion(part1, part2, maxrows, level))
++        if maxrows is None:
++            maxrows = -1
++        return _lrcalc_dict_to_sage(lrcalc.mult(part1, part2, maxrows))
+ 
+     # Otherwise do quantum multiplication
+-    cdef _list *qlist
+-    cdef dict temp
+-    qlist = quantum_reduce_c(ht, int(maxrows), int(level))
+-    # The above call frees the memory associated with ht
+-    v_free(v1)
+-    v_free(v2)
+-
+-    cdef Parent P = quantum.parent()
+-    result = {}
+-    for i in range(qlist.length):
+-        tab = <hashtab*>(qlist.array[i])
+-        temp = sf_hashtab_to_dict(tab)
+-        for k in temp:
+-            result[k] = result.get(k, P.zero()) + quantum**i * temp[k]
+-        hash_free(tab)
+-    l_free(qlist)
+-    return result
+-
+-
+-def skew(outer, inner, maxrows=0):
++    result = lrcalc.mult_quantum(part1, part2, maxrows, level, degrees=True)
++    P = quantum.parent()
++    output = {}
++    for i,k in result.items():
++        la = _Partitions(i[0])
++        output[la] = output.get(la, P.zero()) + k * quantum**(i[1])
++    return output
++
++
++def skew(outer, inner, maxrows=-1):
+     """
+     Compute the Schur expansion of a skew Schur function.
+ 
+@@ -557,11 +360,9 @@ def skew(outer, inner, maxrows=0):
+ 
+     INPUT:
+ 
+-    - ``outer`` -- a partition.
+-
+-    - ``inner`` -- a partition.
+-
+-    - ``maxrows`` -- an integer or ``None``.
++    - ``outer`` -- a partition
++    - ``inner`` -- a partition
++    - ``maxrows`` -- an integer or ``None``
+ 
+     If ``maxrows`` is specified, then only partitions with at most
+     this number of rows are included in the result.
+@@ -572,14 +373,7 @@ def skew(outer, inner, maxrows=0):
+         sage: sorted(skew([2,1],[1]).items())
+         [([1, 1], 1), ([2], 1)]
+     """
+-    cdef vector* v1 = iterable_to_vector(outer)
+-    cdef vector* v2 = iterable_to_vector(inner)
+-    cdef hashtab* ht = skew_c(v1, v2, int(maxrows))
+-    result = sf_hashtab_to_dict(ht)
+-    v_free(v1)
+-    v_free(v2)
+-    hash_free(ht)
+-    return result
++    return _lrcalc_dict_to_sage(lrcalc.skew(outer, inner, maxrows))
+ 
+ 
+ def coprod(part, all=0):
+@@ -592,9 +386,8 @@ def coprod(part, all=0):
+ 
+     INPUT:
+ 
+-    - ``part`` -- a partition.
+-
+-    - ``all`` -- an integer.
++    - ``part`` -- a partition
++    - ``all`` -- an integer
+ 
+     If ``all`` is non-zero then all terms are included in the result.
+     If ``all`` is zero, then only pairs of partitions ``(part1,
+@@ -609,12 +402,9 @@ def coprod(part, all=0):
+         sage: sorted(coprod([2,1]).items())
+         [(([1, 1], [1]), 1), (([2], [1]), 1), (([2, 1], []), 1)]
+     """
+-    cdef vector* v1 = iterable_to_vector(part)
+-    cdef hashtab* ht = coprod_c(v1, int(all))
+-    result = vp_hashtab_to_dict(ht)
+-    v_free(v1)
+-    hash_free(ht)
+-    return result
++    result = lrcalc.coprod(part, all)
++    return {tuple([_Partitions(mu) for mu in la]): Integer(k)
++            for la, k in result.items()}
+ 
+ 
+ def mult_schubert(w1, w2, rank=0):
+@@ -627,11 +417,9 @@ def mult_schubert(w1, w2, rank=0):
+ 
+     INPUT:
+ 
+-    - ``w1`` -- a permutation.
+-
+-    - ``w2`` -- a permutation.
+-
+-    - ``rank`` -- an integer.
++    - ``w1`` -- a permutation
++    - ``w2`` -- a permutation
++    - ``rank`` -- an integer
+ 
+     If ``rank`` is non-zero, then only permutations from the symmetric
+     group `S(\mathrm{rank})` are included in the result.
+@@ -646,33 +434,24 @@ def mult_schubert(w1, w2, rank=0):
+          ([6, 4, 3, 1, 2, 5], 1), ([6, 5, 2, 1, 3, 4], 1),
+          ([7, 3, 4, 1, 2, 5, 6], 1), ([7, 4, 2, 1, 3, 5, 6], 1)]
+     """
+-    cdef vector* v1 = iterable_to_vector(w1)
+-    cdef vector* v2 = iterable_to_vector(w2)
+-    cdef hashtab* ht = mult_schubert_c(v1, v2, int(rank))
+-    result = schubert_hashtab_to_dict(ht)
+-    v_free(v1)
+-    v_free(v2)
+-    hash_free(ht)
+-    return result
++    result = lrcalc.schubmult(w1, w2, rank)
++    return {Permutation(list(la)):Integer(k) for la,k in result.items()}
+ 
+ 
+-def lrskew(outer, inner, weight=None, maxrows=0):
++def lrskew(outer, inner, weight=None, maxrows=-1):
+     r"""
+     Iterate over the skew LR tableaux of shape ``outer / inner``.
+ 
+     INPUT:
+ 
+     - ``outer`` -- a partition
+-
+     - ``inner`` -- a partition
+-
+     - ``weight`` -- a partition (optional)
+-
+-    - ``maxrows`` -- an integer (optional)
++    - ``maxrows`` -- a positive integer (optional)
+ 
+     OUTPUT: an iterator of :class:`SkewTableau`
+ 
+-    Specifying ``maxrows`` restricts the alphabet to `\{1,2,\ldots,maxrows\}`.
++    Specifying ``maxrows`` = `M` restricts the alphabet to `\{1,2,\ldots,M\}`.
+ 
+     Specifying ``weight`` returns only those tableaux of given content/weight.
+ 
+@@ -702,22 +481,40 @@ def lrskew(outer, inner, weight=None, maxrows=0):
+ 
+         sage: list(lrskew([3,2,1],[2], weight=[3,1]))
+         [[[None, None, 1], [1, 1], [2]]]
++
++    TESTS::
++
++        sage: from sage.libs.lrcalc.lrcalc import lrskew
++        sage: list(lrskew([3,2,1],[2], weight=[]))
++        []
++        sage: list(lrskew([3,2,1],[2], weight=[0]))
++        []
++        sage: list(lrskew([3,2,1],[3,2,1], weight=[]))
++        [[[None, None, None], [None, None], [None]]]
++        sage: list(lrskew([3,2,1],[3,2,1], weight=[0]))
++        [[[None, None, None], [None, None], [None]]]
++        sage: list(lrskew([3,2,1],[3,2,1], weight=[1]))
++        []
+     """
+-    cdef vector* o = iterable_to_vector(outer)
+-    cdef vector* i = iterable_to_vector(inner + [0]*(len(outer) - len(inner)))
+-    cdef skewtab* st = st_new(o, i, NULL, int(maxrows))
++    iterator = lrcalc.lr_iterator(outer, inner, maxrows)
++    shape = SkewPartition([outer, inner])
+ 
+     if weight is None:
+-        yield skewtab_to_SkewTableau(st)
+-        while st_next(st):
+-            yield skewtab_to_SkewTableau(st)
++        ST = SemistandardSkewTableaux(shape)
++        for data in iterator:
++            yield ST.from_shape_and_word(shape, [i+1 for i in data])
+     else:
+         wt = _Partitions(weight)
+-        r = skewtab_to_SkewTableau(st)
+-        if r.weight() == wt:
+-            yield r
+-        while st_next(st):
+-            r = skewtab_to_SkewTableau(st)
+-            if r.weight() == wt:
+-                yield r
+-    st_free(st)
++        ST = SemistandardSkewTableaux(shape, wt)
++        m = len(wt)
++        for data in iterator:
++            w = [0] * m
++            for j in data:
++                if j >= m:
++                    # We know they are not equal, so make the check below quick
++                    w = None
++                    break
++                w[j] += 1
++            if w == wt:
++                yield ST.from_shape_and_word(shape, [i+1 for i in data])
++
diff --git a/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch b/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch
new file mode 100644
index 000000000000..1e2e0ba90742
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch
@@ -0,0 +1,40 @@
+As produced by `git diff a90a3146{^^,}`
+
+diff --git a/src/sage/repl/interface_magic.py b/src/sage/repl/interface_magic.py
+index 8a455b69b0e..a93e1c9e04c 100644
+--- a/src/sage/repl/interface_magic.py
++++ b/src/sage/repl/interface_magic.py
+@@ -260,7 +260,7 @@ class InterfaceMagic(object):
+             2
+             120
+             sage: shell.run_cell('%%gap foo\n1+1;\n')
+-            ...File "<string>", line unknown
++            ...File...<string>...
+             SyntaxError: Interface magics have no options, got "foo"
+             <BLANKLINE>
+             sage: shell.run_cell('%%gap?')
+diff --git a/src/sage/repl/interpreter.py b/src/sage/repl/interpreter.py
+index 7468afe52d7..06c47b7374a 100644
+--- a/src/sage/repl/interpreter.py
++++ b/src/sage/repl/interpreter.py
+@@ -78,9 +78,9 @@ Check that Cython source code appears in tracebacks::
+     dummy line
+     ...
+     ZeroDivisionError...Traceback (most recent call last)
+-    <ipython-input-...> in <module>...
++    ...in <module>...
+     ----> 1 Integer(1)/Integer(0)
+-    .../sage/rings/integer.pyx in sage.rings.integer.Integer...div...
++    .../sage/rings/integer.pyx... in sage.rings.integer.Integer...div...
+     ...
+     -> ...                  raise ZeroDivisionError("rational division by zero")
+        ....:            x = <Rational> Rational.__new__(Rational)
+@@ -423,7 +423,7 @@ def SagePreparseTransformer(lines):
+         sage: from sage.repl.interpreter import get_test_shell
+         sage: shell = get_test_shell()
+         sage: shell.run_cell(bad_syntax)
+-          File "<string>", line unknown
++          File...<string>...
+         SyntaxError: Mismatched ']'
+         <BLANKLINE>
+         sage: shell.quit()
diff --git a/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch b/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch
new file mode 100644
index 000000000000..853813b0f5bd
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch
@@ -0,0 +1,13 @@
+Fix for ipython 8.1
+
+--- a/src/sage/repl/interpreter.py
++++ b/src/sage/repl/interpreter.py
+@@ -78,7 +78,7 @@ Check that Cython source code appears in tracebacks::
+     dummy line
+     ...
+     ZeroDivisionError...Traceback (most recent call last)
+-    ...in <module>...
++    ...
+     ----> 1 Integer(1)/Integer(0)
+     .../sage/rings/integer.pyx... in sage.rings.integer.Integer...div...
+     ...
diff --git a/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch b/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch
new file mode 100644
index 000000000000..19b69700a4f6
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch
@@ -0,0 +1,19 @@
+commit 9c8235e44ffb509efa8a3ca6cdb55154e2b5066d
+Author: Antonio Rojas <arojas@archlinux.org>
+Date:   Sun Feb 13 19:53:14 2022 +0100
+
+    Fix deprecation warning with scipy 1.8
+
+diff --git a/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py b/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py
+index e9b60dae5ec..7932167b41d 100644
+--- a/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py
++++ b/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py
+@@ -356,7 +356,7 @@ Sage example in ./linsolve.tex, line 2230::
+ 
+ Sage example in ./linsolve.tex, line 2609::
+ 
+-  sage: from scipy.sparse.linalg.dsolve import *
++  sage: from scipy.sparse.linalg import factorized
+   sage: from scipy.sparse import lil_matrix
+   sage: from numpy import array
+   sage: n = 200
diff --git a/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch
new file mode 100644
index 000000000000..9ba7ca5a6b7d
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch
@@ -0,0 +1,99 @@
+From 609dd9deaeaa6380ab2f0d50276d911233c00a04 Mon Sep 17 00:00:00 2001
+From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
+Date: Fri, 4 Mar 2022 16:07:09 -0800
+Subject: sage.manifolds: Update doctests for SymPy 1.10
+
+---
+ src/sage/manifolds/continuous_map.py              | 3 +--
+ src/sage/manifolds/differentiable/diff_form.py    | 4 ++--
+ src/sage/manifolds/differentiable/tensorfield.py  | 8 ++++----
+ src/sage/manifolds/vector_bundle_fiber_element.py | 2 +-
+ 4 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/src/sage/manifolds/continuous_map.py b/src/sage/manifolds/continuous_map.py
+index a6356e7..f6f9b6d 100644
+--- a/src/sage/manifolds/continuous_map.py
++++ b/src/sage/manifolds/continuous_map.py
+@@ -1357,8 +1357,7 @@ class ContinuousMap(Morphism):
+             sage: Phi.coord_functions(c_uv, c_xyz)
+             Coordinate functions (u*v, u/v, u + v) on the Chart (M, (u, v))
+             sage: Phi.coord_functions(c_UV, c_xyz)
+-            Coordinate functions (-U**2/4 + V**2/4, -(U + V)/(U - V), V)
+-             on the Chart (M, (U, V))
++            Coordinate functions (-U**2/4 + V**2/4, (-U - V)/(U - V), V) on the Chart (M, (U, V))
+             sage: Phi.coord_functions(c_UV, c_XYZ)
+             Coordinate functions ((-U**3 + U**2*V + U*V**2 + 2*U*V + 6*U - V**3
+              - 2*V**2 + 6*V)/(2*(U - V)), (U**3/4 - U**2*V/4 - U*V**2/4 + U*V
+diff --git a/src/sage/manifolds/differentiable/diff_form.py b/src/sage/manifolds/differentiable/diff_form.py
+index 70dd8fb..0aa3469 100644
+--- a/src/sage/manifolds/differentiable/diff_form.py
++++ b/src/sage/manifolds/differentiable/diff_form.py
+@@ -266,7 +266,7 @@ class DiffForm(TensorField):
+ 
+         sage: s = a.wedge(b)
+         sage: s.display(eU)
+-        a∧b = -x*(2*x*y + 1) dx∧dy
++        a∧b = x*(-2*x*y - 1) dx∧dy
+         sage: s.display(eV)
+         a∧b = (u**3/8 + u**2*v/8 - u*v**2/8 + u/4 - v**3/8 + v/4) du∧dv
+ 
+@@ -275,7 +275,7 @@ class DiffForm(TensorField):
+         sage: f = M.scalar_field({c_xy: (x+y)^2, c_uv: u^2}, name='f')
+         sage: s = f*a
+         sage: s.display(eU)
+-        f*a = -y*(x**2 + 2*x*y + y**2) dx + x*(x**2 + 2*x*y + y**2) dy
++        f*a = y*(-x**2 - 2*x*y - y**2) dx + x*(x**2 + 2*x*y + y**2) dy
+         sage: s.display(eV)
+         f*a = u**2*v/2 du - u**3/2 dv
+ 
+diff --git a/src/sage/manifolds/differentiable/tensorfield.py b/src/sage/manifolds/differentiable/tensorfield.py
+index 2775be9..6bc5c50 100644
+--- a/src/sage/manifolds/differentiable/tensorfield.py
++++ b/src/sage/manifolds/differentiable/tensorfield.py
+@@ -334,7 +334,7 @@ class TensorField(ModuleElementWithMutability):
+         sage: f.display()  # long time
+         t(a,b): S^2 → ℝ
+         on U: (x, y) ↦ -2*x*y - 3*x - y**2
+-        on V: (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++        on V: (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+ 
+     The vectors can be defined only on subsets of `S^2`, the domain of the
+     result is then the common subset::
+@@ -343,12 +343,12 @@ class TensorField(ModuleElementWithMutability):
+         sage: s.display()  # long time
+         t(a,b): U → ℝ
+            (x, y) ↦ -2*x*y - 3*x - y**2
+-        on W: (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++        on W: (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+         sage: s = t(a.restrict(U), b.restrict(W))  # long time
+         sage: s.display()  # long time
+         t(a,b): W → ℝ
+            (x, y) ↦ -2*x*y - 3*x - y**2
+-           (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++           (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+ 
+     The tensor itself can be defined only on some open subset of `S^2`,
+     yielding a result whose domain is this subset::
+@@ -356,7 +356,7 @@ class TensorField(ModuleElementWithMutability):
+         sage: s = t.restrict(V)(a,b)  # long time
+         sage: s.display()  # long time
+         t(a,b): V → ℝ
+-           (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++           (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+         on W: (x, y) ↦ -2*x*y - 3*x - y**2
+ 
+     Tests regarding the multiplication by a scalar field::
+diff --git a/src/sage/manifolds/vector_bundle_fiber_element.py b/src/sage/manifolds/vector_bundle_fiber_element.py
+index 29ee81d..048275a 100644
+--- a/src/sage/manifolds/vector_bundle_fiber_element.py
++++ b/src/sage/manifolds/vector_bundle_fiber_element.py
+@@ -110,4 +110,4 @@ class VectorBundleFiberElement(FiniteRankFreeModuleElement):
+             desc += str(self._name) + " "
+         desc += "in the fiber of {} at {}".format(self._vbundle._name,
+                                                   self._point)
+-        return desc
+\ No newline at end of file
++        return desc
+-- 
+cgit v1.0-1-gd88e
+
diff --git a/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch
new file mode 100644
index 000000000000..f5ac180baa90
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch
@@ -0,0 +1,29 @@
+From c49eff347454ac7f07e5918470b20e97b8f2357e Mon Sep 17 00:00:00 2001
+From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
+Date: Fri, 4 Mar 2022 15:14:43 -0800
+Subject: src/sage/calculus/calculus.py: Update laplace doctest for sympy 1.10
+
+---
+ src/sage/calculus/calculus.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py
+index 9c2f226..b335093 100644
+--- a/src/sage/calculus/calculus.py
++++ b/src/sage/calculus/calculus.py
+@@ -1639,9 +1639,9 @@ def laplace(ex, t, s, algorithm='maxima'):
+         sage: laplace(dirac_delta(t), t, s)
+         1
+         sage: F, a, cond = laplace(dirac_delta(t), t, s, algorithm='sympy')
+-        sage: a, cond
+-        (-oo, True)
+-        sage: F       # random - sympy <1.9 includes undefined heaviside(0) in answer
++        sage: a, cond  # random - sympy <1.10 gives (-oo, True)
++        (0, True)
++        sage: F        # random - sympy <1.9 includes undefined heaviside(0) in answer
+         1
+         sage: laplace(dirac_delta(t), t, s, algorithm='giac')
+         1
+-- 
+cgit v1.0-1-gd88e
+
diff --git a/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch b/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch
new file mode 100644
index 000000000000..8e7bb64f5b01
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch
@@ -0,0 +1,26 @@
+From a04a0a0b14f67f4804e7113c3db41bbcf8a58296 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
+Date: Mon, 28 Mar 2022 20:39:59 -0300
+Subject: Trac #33585: fix doctest when dochtml is missing...
+
+...but sphinx is available in PYTHONPATH.
+---
+ src/sage/misc/sagedoc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py
+index 4b3853f..08c4225 100644
+--- a/src/sage/misc/sagedoc.py
++++ b/src/sage/misc/sagedoc.py
+@@ -1401,7 +1401,7 @@ class _sage_doc:
+             "...**File:**...**Type:**...**Definition:** identity_matrix..."
+             sage: identity_matrix.__doc__ in browse_sage_doc(identity_matrix, 'rst')
+             True
+-            sage: browse_sage_doc(identity_matrix, 'html', False)             # optional - sphinx
++            sage: browse_sage_doc(identity_matrix, 'html', False)             # optional - sphinx sagemath_doc_html
+             '...div...File:...Type:...Definition:...identity_matrix...'
+ 
+         In the 'text' version, double colons have been replaced with
+-- 
+cgit v1.0-1-gd88e
+
diff --git a/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch b/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch
deleted file mode 100644
index 5cb62f56e902..000000000000
--- a/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
- - we don't have threejs in void
-
---- a/src/sage/repl/ipython_kernel/install.py
-+++ b/src/sage/repl/ipython_kernel/install.py
-@@ -124,7 +124,7 @@ class SageKernelSpec(object):
-             sage: spec = SageKernelSpec(prefix=tmp_dir())
-             sage: spec.use_local_threejs()
-             sage: threejs = os.path.join(spec.nbextensions_dir, 'threejs-sage')
--            sage: os.path.isdir(threejs)
-+            sage: os.path.isdir(threejs)    # optional - threejs
-             True
-         """
-         src = THREEJS_DIR
diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 710a9e80c052..0d793262d572 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
 version=9.5
-revision=1
+revision=2
 wrksrc=sage-$version
 build_wrksrc=pkgs/sagemath-standard
 build_style=python3-module
@@ -12,7 +12,7 @@ hostmakedepends="m4 pkg-config python3-Cython python3-Jinja2 python3-pkgconfig
 makedepends="arb-devel boost-devel brial-devel cliquer-devel ecl eclib-devel
  ecm-devel fflas-ffpack flintlib-devel gap-devel gd-devel giac-devel glpk-devel
  gsl-devel iml-devel lcalc-devel libbraiding-devel libhomfly-devel libmpc-devel
- libpng-devel linbox-devel lrcalc-devel m4ri-devel m4rie-devel mpfi-devel
+ libpng-devel linbox-devel m4ri-devel m4rie-devel mpfi-devel
  mpfr-devel ntl-devel openblas-devel pari-devel planarity-devel python3-cypari2
  python3-cysignals python3-devel python3-gmpy2 python3-memory_allocator
  python3-numpy rankwidth-devel singular symmetrica-devel zn_poly"
@@ -20,13 +20,13 @@ depends="FlintQS eclib-devel fflas-ffpack flintlib-devel gcc-fortran gd-devel
  gfan giac gsl-devel gzip libpng-devel linbox-devel m4ri-devel maxima-ecl
  mpfr-devel nauty ntl-devel palp pari-devel pari-elldata-small pari-galdata
  pari-galpol-small pari-seadata-small pkg-config python3-Cython python3-cypari2
- python3-cysignals python3-devel python3-fpylll python3-ipython
+ python3-cysignals python3-devel python3-fpylll python3-ipython python3-lrcalc
  python3-ipython_ipykernel python3-jupyter_ipywidgets python3-matplotlib
  python3-memory_allocator python3-networkx python3-pip python3-pkgconfig
  python3-pplpy python3-primecountpy python3-requests python3-scipy
  python3-sympy python3-traitlets sage-data-combinatorial_designs
  sage-data-conway_polynomials sage-data-elliptic_curves sage-data-graphs
- sage-data-polytopes_db sympow tachyon"
+ sage-data-polytopes_db sympow tachyon threejs-sage"
 checkdepends="$depends"
 short_desc="Open source mathematics software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -55,6 +55,7 @@ do_configure() {
 	COMBINATORIAL_DESIGN_DATA_DIR = "/usr/share/sagemath/combinatorial_designs"
 	CREMONA_MINI_DATA_DIR = "/usr/share/sagemath/cremona"
 	CREMONA_LARGE_DATA_DIR = "/usr/share/sagemath/cremona"
+	THREEJS_DIR = "/usr/share/sagemath/threejs-sage"
 	EOF
 
 	# don't install sage-venv-config: it is used to set SAGE_VENV=/usr and

From dee544fe197d170cb30e53f69210f0d5d4c17840 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:37 +0200
Subject: [PATCH 0935/2561] wike: update to 1.7.2.

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

diff --git a/srcpkgs/wike/template b/srcpkgs/wike/template
index 32aa723af076..98faaf360b00 100644
--- a/srcpkgs/wike/template
+++ b/srcpkgs/wike/template
@@ -1,6 +1,6 @@
 # Template file for 'wike'
 pkgname=wike
-version=1.7.1
+version=1.7.2
 revision=1
 wrksrc="Wike-$version"
 build_style=meson
@@ -11,4 +11,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/hugolabe/Wike"
 distfiles="https://github.com/hugolabe/Wike/archive/refs/tags/$version.tar.gz"
-checksum=b3fa3c0600e7234f77465fd7052136de3b397e66ad5c636f8282556aa60a2742
+checksum=8434cec2ca44392fd96fa9ed1594be40c74d91490039405996aa4c6fa64bd26c

From 4db708380c53cecadf2d53e356c93536cc935958 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:24 +0200
Subject: [PATCH 0936/2561] python3-astroid: update to 2.11.2.

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

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4cfef4e92fd9..ca5db18ccc79 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.9.3
+version=2.11.2
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ 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="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=07234423c3722df6aa067c15f5fa60adf4f1d6ae659d2ab147acb40a8a1904f7
+checksum=4a275523e2600c928ac95cda3ed7c1307dff2e6fbe24ef95ed867bda0fcaeab8

From 21477cd30d4d5fe0fcc681658f43ac0060180c51 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:20 +0200
Subject: [PATCH 0937/2561] New package: python3-dill-0.3.4

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

diff --git a/srcpkgs/python3-dill/template b/srcpkgs/python3-dill/template
new file mode 100644
index 000000000000..d40ce208e06d
--- /dev/null
+++ b/srcpkgs/python3-dill/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-dill'
+pkgname=python3-dill
+version=0.3.4
+revision=1
+wrksrc="dill-$version"
+build_style=python3-module
+depends="python3"
+short_desc="Serialize all of Python"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://dill.rtfd.io/"
+distfiles="${PYPI_SITE}/d/dill/dill-${version}.zip"
+checksum=9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675

From 9a28595272ac1889cf0bcb103e8bd44f7d9251e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:28 +0200
Subject: [PATCH 0938/2561] pylint: update to 2.13.4.

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

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index f052f05f08b7..54af1e2f085d 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,12 +1,12 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.12.2
-revision=2
+version=2.13.4
+revision=1
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml
- python3-platformdirs"
+depends="python3-astroid python3-isort python3-mccabe python3-tomli
+ python3-platformdirs python3-dill"
 checkdepends="$depends python3-pytest python3-tkinter python3-six
  python3-GitPython git"
 short_desc="Python code static checker"
@@ -15,11 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=411308682f3d4578bb769e7fa549c8f34edf1033871d2e8cd5c3ce16a5741c59
-
-post_patch() {
-	vsed -e 's/mccabe>=0.6,<0.7/mccabe>=0.6,<=0.7/' -i setup.cfg
-}
+checksum=34a5550bfe94f4ba04eee95367572224bc16dbd2456b3ece5fb92e15399f6cd8
 
 post_install() {
 	# install example config and emacs files

From 62abc44b6dc87fe237e69061810ff4c811e9cf3e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:17:56 +0200
Subject: [PATCH 0939/2561] python3-mypy: update to 0.942.

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

diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index 663127eedbc0..a92e1c803e48 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
-version=0.931
+version=0.942
 revision=1
 wrksrc="mypy-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/python/mypy"
 distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=0038b21890867793581e4cb0d810829f5fd4441aa75796b53033af3aa30430ce
+checksum=17e44649fec92e9f82102b48a3bf7b4a5510ad0cd22fa21a104826b5db4903e2
 make_check=no # needs pytest-xdist and many tests fail
 
 post_install() {

From 0ee0f75c445413ab3319fafdd68e0ade95d6b787 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Mar 2022 12:52:26 +1100
Subject: [PATCH 0940/2561] bluez: update to 5.64.

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

diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index e0a96039b6fb..e9827e8e1d95 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.63
+version=5.64
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
@@ -15,7 +15,7 @@ maintainer="Érico Nogueira <ericonr@disroot.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=9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76
+checksum=ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
 

From 613632034d27e006429f91304164aa03f95d36e7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 11:50:25 +0200
Subject: [PATCH 0941/2561] New package: d-spy-1.2.0

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

diff --git a/srcpkgs/d-spy/template b/srcpkgs/d-spy/template
new file mode 100644
index 000000000000..3d78d4d011c1
--- /dev/null
+++ b/srcpkgs/d-spy/template
@@ -0,0 +1,14 @@
+# Template file for 'd-spy'
+pkgname=d-spy
+version=1.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext glib-devel"
+makedepends="libadwaita-devel"
+short_desc="Like d-feet, but written in C and blisteringly fast"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/d-spy"
+changelog="https://gitlab.gnome.org/GNOME/d-spy/-/raw/main/NEWS"
+distfiles="https://gitlab.gnome.org/GNOME/d-spy/-/archive/$version/d-spy-$version.tar.gz"
+checksum=8be0a493e4a127f2c6052dd962162ba5f91c6da702f9b4cb77a9cbd6a1dbb4bc

From 97937530007de2b173404cd942b7c71a17100d96 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 4 Apr 2022 23:12:16 +0200
Subject: [PATCH 0942/2561] kodi: update to 19.4

---
 .../kodi/patches/add-missing-includes.patch   |  4 +-
 .../disable-static-texturepacker-build.patch  |  2 +-
 srcpkgs/kodi/patches/fix-fileemu.patch        | 16 ++++----
 srcpkgs/kodi/patches/fix-musl.patch           |  2 +-
 srcpkgs/kodi/patches/fmt8-support.patch       |  7 ----
 srcpkgs/kodi/patches/ppc64.patch              |  8 ++--
 srcpkgs/kodi/template                         | 38 +++++--------------
 7 files changed, 25 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch

diff --git a/srcpkgs/kodi/patches/add-missing-includes.patch b/srcpkgs/kodi/patches/add-missing-includes.patch
index 236bfa6fd0e1..1b9a4509744c 100644
--- a/srcpkgs/kodi/patches/add-missing-includes.patch
+++ b/srcpkgs/kodi/patches/add-missing-includes.patch
@@ -1,10 +1,10 @@
 --- a/xbmc/filesystem/ZipManager.h.orig
 +++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
+@@ -22,6 +22,7 @@
  #include <string>
  #include <vector>
  #include <map>
-+#include <stdint.h>
++#include <cstdint>
  
  class CURL;
  
diff --git a/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
index 369f1b24d76d..766cae2005c8 100644
--- a/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
+++ b/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
@@ -1,6 +1,6 @@
 --- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
 +++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
+@@ -38,7 +38,7 @@
  	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
  	cd $(PLATFORM); cp -a $(SOURCE)/* .
  	cd $(PLATFORM); ./autogen.sh
diff --git a/srcpkgs/kodi/patches/fix-fileemu.patch b/srcpkgs/kodi/patches/fix-fileemu.patch
index 6cce7a4d3524..a16fcb9ffa29 100644
--- a/srcpkgs/kodi/patches/fix-fileemu.patch
+++ b/srcpkgs/kodi/patches/fix-fileemu.patch
@@ -1,6 +1,6 @@
 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
 +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
+@@ -17,7 +17,7 @@
  #define _onexit_t void*
  #endif
  
@@ -11,8 +11,8 @@
  typedef off64_t __off64_t;
 --- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
 +++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
+@@ -23,7 +23,7 @@
+ #include <dirent.h>
  #include <dlfcn.h>
  
 -#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
@@ -29,8 +29,8 @@
 +#include <paths.h>
  #ifdef TARGET_POSIX
  #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
+ #endif
+@@ -1479,7 +1480,7 @@ extern "C"
      int ret;
  
      ret = dll_fgetpos64(stream, &tmpPos);
@@ -39,7 +39,7 @@
      *pos = (fpos_t)tmpPos;
  #else
      pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
+@@ -1492,8 +1493,9 @@ extern "C"
      CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
      if (pFile != NULL)
      {
@@ -51,7 +51,7 @@
  #else
        pos->__pos = pFile->GetPosition();
  #endif
-@@ -1509,8 +1511,9 @@
+@@ -1508,8 +1510,9 @@ extern "C"
      int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
      if (fd >= 0)
      {
@@ -63,7 +63,7 @@
  #else
        if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
  #endif
-@@ -1532,7 +1535,7 @@
+@@ -1531,7 +1534,7 @@ extern "C"
      if (fd >= 0)
      {
        fpos64_t tmpPos;
diff --git a/srcpkgs/kodi/patches/fix-musl.patch b/srcpkgs/kodi/patches/fix-musl.patch
index c2eb622c98a4..891204118411 100644
--- a/srcpkgs/kodi/patches/fix-musl.patch
+++ b/srcpkgs/kodi/patches/fix-musl.patch
@@ -1,6 +1,6 @@
 --- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
 +++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
+@@ -53,7 +53,7 @@
  #ifdef  __cplusplus
  extern "C" {
  #endif
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/patches/ppc64.patch b/srcpkgs/kodi/patches/ppc64.patch
index ab008d445a99..8bd3e7661ca4 100644
--- a/srcpkgs/kodi/patches/ppc64.patch
+++ b/srcpkgs/kodi/patches/ppc64.patch
@@ -1,9 +1,9 @@
 --- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
 +++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
+@@ -35,6 +35,12 @@
+   elseif(CPU MATCHES riscv64)
+     set(ARCH riscv64)
+     set(NEON False)
 +  elseif(CPU MATCHES ppc64le)
 +    set(ARCH ppc64le-linux)
 +    set(NEON False)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index a31240ff2766..da81c7e2d0a5 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
-version=19.0
-revision=4
+version=19.4
+revision=1
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kodi.tv"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=f7ef8a6f45862ae3b7ebfce4950d74f534be3cb4a0e67ce640963746b3f668f2
+checksum=cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da
 # Add CrossGUID dependency
 distfiles+=" http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz"
 checksum+=" 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10"
@@ -94,6 +94,8 @@ if [ -z "$CROSS_BUILD" ]; then
 else
 	hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel
 	 libwaylandpp-devel"
+	configure_args+=" -DWITH_JSONSCHEMABUILDER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/JsonSchemaBuilder
+	 -DWITH_TEXTUREPACKER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/TexturePacker"
 fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -111,35 +113,13 @@ pre_configure() {
 
 	. /etc/profile.d/10_openjdk11.sh
 
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
+	# Build tools needed to run on the host
 	if [ "$CROSS_BUILD" ]; then
 		for i in JsonSchemaBuilder TexturePacker; do
 			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+				make -C tools/depends/native/$i native/$i
+			mv tools/depends/native/$i/native/$i tools/$i
+			make -C tools/depends/native/$i distclean
 		done
 	fi
 }

From eaf6168d7efa8573990a870279afd034ba7e025e Mon Sep 17 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, 5 Apr 2022 07:50:05 +0700
Subject: [PATCH 0943/2561] python3-dill: fix build

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

diff --git a/srcpkgs/python3-dill/template b/srcpkgs/python3-dill/template
index d40ce208e06d..e27236c340df 100644
--- a/srcpkgs/python3-dill/template
+++ b/srcpkgs/python3-dill/template
@@ -4,6 +4,7 @@ version=0.3.4
 revision=1
 wrksrc="dill-$version"
 build_style=python3-module
+hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Serialize all of Python"
 maintainer="Michal Vasilek <michal@vasilek.cz>"

From 5abe3fd031a4f86d6193e6159d03c21e1b8dc7ac Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 04:35:38 +0200
Subject: [PATCH 0944/2561] keepalived: update to 2.2.7.

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

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index c8dea3862abf..1d2ef18ca470 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,6 +1,6 @@
 # Template file for 'keepalived'
 pkgname=keepalived
-version=2.2.4
+version=2.2.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-sha1"
@@ -10,8 +10,9 @@ short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.keepalived.org/"
+changelog="https://www.keepalived.org/release-notes/Release-${version}.html"
 distfiles="https://www.keepalived.org/software/keepalived-${version}.tar.gz"
-checksum=0138d69087d44beaaa589527f0cfa6885958b320a837147d02b6b7df73ebc1df
+checksum=c61940d874154a560a54627ecf7ef47adebdf832164368d10bf242a4d9b7d49d
 
 conf_files="/etc/keepalived/keepalived.conf"
 
@@ -20,4 +21,5 @@ post_install() {
 	rm -rf ${DESTDIR}/etc/rc.d ${DESTDIR}/etc/sysconfig
 	vmkdir usr/share/examples/$pkgname
 	mv ${DESTDIR}/etc/$pkgname/samples/* ${DESTDIR}/usr/share/examples/$pkgname
+	mv ${DESTDIR}/etc/keepalived/keepalived.conf{.sample,}
 }

From aa1e7229f3e56918eb3675ecfe3d7e471b3e7543 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 04:40:25 +0200
Subject: [PATCH 0945/2561] mc: update to 4.8.28.

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

diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 646125d12851..1c293a9c6a26 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -1,6 +1,6 @@
 # Template file for 'mc'
 pkgname=mc
-version=4.8.27
+version=4.8.28
 revision=1
 build_style=gnu-configure
 configure_args="--with-screen=slang --without-x"
@@ -10,9 +10,10 @@ short_desc="User-friendly file manager and visual shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://midnight-commander.org/"
+changelog="https://midnight-commander.org/wiki/NEWS-${version}"
 distfiles="https://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
 #distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
-checksum=31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4
+checksum=e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803
 python_version=2
 
 conf_files="

From e45af29f0420d489b95704558b68d7ce9c66e95a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 28 Mar 2022 11:02:57 +0200
Subject: [PATCH 0946/2561] mutt: update to 2.2.2, build with zlib

also remove --with-regex (not recognized since 1.13, and was wrong even before)
---
 srcpkgs/mutt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 7ae82f76bd8c..6c0f0d04798b 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,16 +1,16 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.2.1
+version=2.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
- --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
+ --enable-gpgme --with-idn2 --with-ssl --with-sasl --enable-sidebar
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --sysconfdir=/etc/$pkgname
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="perl pkg-config"
 makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
- ncurses-devel"
+ ncurses-devel zlib-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -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=b76d30d42b6c90aa9abf9f330e41800934eedf7b858a32c120ee3ae63587abb5
+checksum=10de870cf37646c0b3f5bcf579c3cc2fd9285bda1d04be9ad7c33ec2ee820fcc
 
 post_install() {
 	# provided by mime-types

From 51c844a232fa9716f6c82565b9d03b5e623eaa17 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 16:55:26 +0200
Subject: [PATCH 0947/2561] syncthing: update to 1.19.2.

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

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 6c2d860909cb..6a2673395275 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.19.1
+version=1.19.2
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=46319031c0805374baa382ee2b21290fb9dc595b70e905b97eb9a5643a78edc4
+checksum=81be2d3b22fa7282eee9cc1dc7569975fa62e7149700dcedaf03d372fb012a1e
 
 pre_build() {
 	GOARCH= go generate \

From e1ce278d79c1601d0a3aabfce48f434591f90c03 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:03:40 +0200
Subject: [PATCH 0948/2561] python3-boto3: update to 1.21.33.

---
 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 b96fa86eb165..c57a02f2fc2f 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.21.19
+version=1.21.33
 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=fb04acb6eb998652eb52381a580d3624490982a7b17d6080b0d78163874962b7
+checksum=873369a6b11334756f38ca0f310104e83c793c64a95d3b75581f2792582650d3
 
 post_install() {
 	vlicense LICENSE

From e8d932780ca138bd79853c8f18ada9369ce4238f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:03:43 +0200
Subject: [PATCH 0949/2561] python3-botocore: update to 1.24.33.

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

diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
index 0271e9204c19..63ae178c40d6 100644
--- a/srcpkgs/python3-botocore/template
+++ b/srcpkgs/python3-botocore/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-botocore'
 pkgname=python3-botocore
-version=1.23.23
+version=1.24.33
 revision=1
 wrksrc="botocore-${version}"
 build_style=python3-module

From 6800b13f6ec17c3ddb41aed3995b40772692a554 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:03:46 +0200
Subject: [PATCH 0950/2561] aws-cli: update to 1.22.88.

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

diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index 0448d39f5a61..6e543f674359 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
-version=1.22.23
+version=1.22.88
 revision=1
 wrksrc="aws-cli-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aws/aws-cli"
 distfiles="https://github.com/aws/aws-cli/archive/${version}.tar.gz"
-checksum=d5424e05c87963547d6c98440391c6729e4e4f8eb7a4c64520ff7eefeffe41f3
+checksum=cc0961786a5020fbe4708506e8aa39c90a07199f625e9ac62c1f2d8db7e8bd69
 
 do_check() {
 	# integration tests want aws credentials, have some other issues not worth fixing

From b6b127c5c91d0ba4fea10bc5d0d3e0947170069b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:05:20 +0200
Subject: [PATCH 0951/2561] python3-botocore: fix hash.

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

diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
index 63ae178c40d6..f28f9298954a 100644
--- a/srcpkgs/python3-botocore/template
+++ b/srcpkgs/python3-botocore/template
@@ -14,7 +14,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/boto/botocore"
 distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
-checksum=6b23a1e91387c1a461f10b17bde9ace15b3c128ed385646ab058644dfedd2c47
+checksum=df97ad5dd13847d2684597798214bc35603c1bd9df7fef04ba5d583cb4229629
 
 pre_check() {
 	rm -r tests/functional/leak # these 6 tests fail, probably fixable

From 33811506f2eb9cb5021ef7123c0199da9f443aa2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 17:42:18 +0200
Subject: [PATCH 0952/2561] emacs: update to 28.1.

Enable cairo and harfbuzz by default, as recommended by upstream.
---
 srcpkgs/emacs/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 9c4405ffc88e..644e44cf4d06 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,6 +1,6 @@
 # Template file for 'emacs'
 pkgname=emacs
-version=27.2
+version=28.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
@@ -24,7 +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=b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9
+checksum=28b1b3d099037a088f0a4ca251d7e7262eab5ea1677aabffa6c4426961ad75e1
 nocross=yes
 nopie=yes
 
@@ -33,7 +33,8 @@ build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus
 desc_option_xpm="Enable support for XPM images"
 desc_option_sound="Enable support for sound"
 desc_option_m17n="Enable support for m17n multilingual text processing"
-build_options_default="jpeg tiff gif png xpm svg xml gnutls sound m17n json gmp"
+build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n png sound
+ svg tiff xml xpm"
 
 pre_configure() {
 	# Just configuring in different directories results in

From f9b819b3c5d081b9f6c4da96f769e9831afffb85 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:28:08 +0200
Subject: [PATCH 0953/2561] xorg-cf-files: update to 1.0.7.

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

diff --git a/srcpkgs/xorg-cf-files/template b/srcpkgs/xorg-cf-files/template
index b7b8a7c1dac2..4bec7c2ac82e 100644
--- a/srcpkgs/xorg-cf-files/template
+++ b/srcpkgs/xorg-cf-files/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-cf-files'
 pkgname=xorg-cf-files
-version=1.0.6
-revision=4
+version=1.0.7
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake xorg-util-macros font-util"
 short_desc="X.Org imake program and related utilities"
@@ -9,7 +9,7 @@ maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
 license="X11"
 homepage="https://www.x.org/wiki/"
 distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2"
-checksum=4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d
+checksum=74a771d5bb2189020399998dfa2329c3e038aa2e14dd3d4056144ed9a5976308
 
 pre_configure() {
 	autoreconf -fi

From 797cf1a0a9355e766b37aac49b3b1d304173257e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:29:48 +0200
Subject: [PATCH 0954/2561] msmtp: update to 1.8.20.

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

diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 5f6d611259b3..eb687ece82c7 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'msmtp'
 pkgname=msmtp
-version=1.8.18
+version=1.8.20
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/msmtp/"
 distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=14fc62af37ebdcc5ed19a245a05eb8376efe7016118f00c9c594bc999d5560a5
+checksum=d93ae2aafc0f48af7dc9d0b394df1bb800588b8b4e8d096d8b3cf225344eb111
 
 build_options="idn sasl gnome msmtpd"
 build_options_default="idn sasl msmtpd"

From 4976b04254774dd779fd3f35f02190f041d8db65 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:30:37 +0200
Subject: [PATCH 0955/2561] xauth: update to 1.1.1.

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

diff --git a/srcpkgs/xauth/template b/srcpkgs/xauth/template
index 8569efad4d80..8cf9d80c6069 100644
--- a/srcpkgs/xauth/template
+++ b/srcpkgs/xauth/template
@@ -1,16 +1,16 @@
 # Template file for 'xauth'
 pkgname=xauth
-version=1.1
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xtrans libXau-devel libXext-devel libXmu-devel"
 short_desc="X authentication utility"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=6d1dd1b79dd185107c5b0fdd22d1d791ad749ad6e288d0cdf80964c4ffa7530c
+checksum=164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92
 
 post_install() {
 	vlicense COPYING

From a44267ed0210d2d431b6977c3497ecc71397f5a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:37:17 +0200
Subject: [PATCH 0956/2561] gnutls: update to 3.7.4.

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

diff --git a/common/shlibs b/common/shlibs
index e7af88140d1a..836cacc49b89 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -224,7 +224,7 @@ libgpg-error.so.0 libgpg-error-1.6_1
 liblzo2.so.2 lzo-2.03_1
 libgcrypt.so.20 libgcrypt-1.6.1_1
 libgnutls.so.30 gnutls-3.4.13_1
-libgnutlsxx.so.28 gnutls-3.2.13_1
+libgnutlsxx.so.30 gnutls-3.7.4_1
 libgnutls-dane.so.0 gnutls-3.6.12_1
 libdevmapper.so.1.02 device-mapper-2.02.110_1
 libdevmapper-event.so.1.02 device-mapper-2.02.110_1
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 960a133cf248..9f2d7f905b7b 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,6 +1,6 @@
 # Template file for 'gnutls'
 pkgname=gnutls
-version=3.7.3
+version=3.7.4
 revision=1
 build_style=gnu-configure
 configure_args="--disable-guile --disable-static
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-2.1-or-later"
 homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
-checksum=fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a
+checksum=e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f
 
 pre_check() {
 	# same as $PASS in tests/cert-tests/certtool.sh

From 0e7bea73110d45729d3d1cee620932128b8aa8b1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:40:25 +0200
Subject: [PATCH 0957/2561] appres: update to 1.0.6.

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

diff --git a/srcpkgs/appres/template b/srcpkgs/appres/template
index 0d85dea763af..83e4b39f1bbc 100644
--- a/srcpkgs/appres/template
+++ b/srcpkgs/appres/template
@@ -1,6 +1,6 @@
 # Template build file for 'appres'.
 pkgname=appres
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="List X application resource database"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=ffad893712c81943b919e3cbfe46fc65259cc0d9eb96d5e658670e3fbb265928
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=8b2257e2a0a1ad8330323aec23f07c333075d7fe4e6efd88e0c18fba8223590b
 
 post_install() {
 	vlicense COPYING

From 1b5b7716ee1eb33b0aa0a4dfae7fd39267d8f307 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:41:04 +0200
Subject: [PATCH 0958/2561] editres: update to 1.0.8.

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

diff --git a/srcpkgs/editres/template b/srcpkgs/editres/template
index 4890cbd590ed..502eba67c066 100644
--- a/srcpkgs/editres/template
+++ b/srcpkgs/editres/template
@@ -1,6 +1,6 @@
 # Template build file for 'editres'.
 pkgname=editres
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Dynamic resource editor for X Toolkit applications"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=089ad34628e55a779b97e369f55fb12caefc96d684b508d9022eb9e12b775c11
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=83cf5dffb1883635fd9c6a8dc48ff9e560f6c6d8ce1a0e929d5f409cba18b6f9
 
 post_install() {
 	vlicense COPYING

From 1ac5dcef9ab6d2f0e18186c3686fee4bdc09a103 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:41:59 +0200
Subject: [PATCH 0959/2561] discount: update to 2.2.7b.

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

diff --git a/srcpkgs/discount/template b/srcpkgs/discount/template
index d47f46518415..a075e4ad5a3f 100644
--- a/srcpkgs/discount/template
+++ b/srcpkgs/discount/template
@@ -1,6 +1,6 @@
 # Template file for 'discount'
 pkgname=discount
-version=2.2.7
+version=2.2.7b
 revision=1
 build_style=configure
 configure_script="./configure.sh"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="http://www.pell.portland.or.us/~orc/Code/discount"
 distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz"
-checksum=72c1325ddfc40871d6810f1e272cf2d45b361f26357eb38f170fd04d737bb9f2
+checksum=48343272aa93ae913187ff678b3e52efa722f133e1efcaddc20cf775e8a517ec
 disable_parallel_build=yes
 
 do_install() {

From c6caea544d0073e86c1589b8cce66dee3bce8f16 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:42:38 +0200
Subject: [PATCH 0960/2561] fzf: update to 0.30.0.

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

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 4b881ee7a6a6..ec60af9ddc64 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.29.0
+version=0.30.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=a287a8806ce56d764100c5a6551721e16649fd98325f6bf112e96fb09fe3031b
+checksum=a3428f510b7136e39104a002f19b2e563090496cb5205fa2e4c5967d34a20124
 
 post_install() {
 	cd ${wrksrc}

From 9b887b9c1f9012fa7a3d1a8a84eae81e2aef36e6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:44:11 +0200
Subject: [PATCH 0961/2561] libX11: update to 1.7.5.

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

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 53bd34be6e08..e47acb6ecf69 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.7.4
+version=1.7.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
-checksum=0e7d48bfa0b0ee5705d14fe140cf4310744ed131f0a6241b7cf03db06000fe51
+checksum=5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151
 
 do_configure() {
 	./configure ${configure_args}

From 65dceebabcf4014ea8bf04cf75de7f6d5f7b328c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:45:44 +0200
Subject: [PATCH 0962/2561] listres: update to 1.0.5.

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

diff --git a/srcpkgs/listres/template b/srcpkgs/listres/template
index e1b1866ddcf3..00d1e32c60fc 100644
--- a/srcpkgs/listres/template
+++ b/srcpkgs/listres/template
@@ -1,6 +1,6 @@
 # Template build file for 'listres'.
 pkgname=listres
-version=1.0.4
+version=1.0.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="List resources in Xaw widgets"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=6a1229f478796e141d6658762f432ebbe1f6083b27550847d52239b3f7ec2b10
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=ce2a00bbe7d2eb8d75177006f343c80443a22d52570c48a43c6fe70ea074dc9d
 
 post_install() {
 	vlicense COPYING

From c618ec195c9dcb60d9c5124fe97cfd5dff6fe477 Mon Sep 17 00:00:00 2001
From: Florian Wagner <florian@wagner-flo.net>
Date: Mon, 4 Apr 2022 23:07:36 +0200
Subject: [PATCH 0963/2561] claws-mail: update to 4.1.0

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

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..118b7d607108 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=4.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -16,8 +16,9 @@ short_desc="GTK+ based, user-friendly, lightweight, and fast email client"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
+changelog="https://claws-mail.org/NEWS"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=0e1a9ca0db8d2a9e058ae30cdc7fc919779214ec3c56ee0c8a7f88cc23817a8e
 
 claws-mail-devel_package() {
 	depends="${makedepends}"

From 3dc3eba754eff4caa412f62fe1bfd5b9dfbb07aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Tue, 5 Apr 2022 21:24:30 +0200
Subject: [PATCH 0964/2561] glfw: update to 3.3.7

Also add changelog url and update download URL to github project.
---
 srcpkgs/glfw/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glfw/template b/srcpkgs/glfw/template
index a9168faffc67..968accbe50d2 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.6
+version=3.3.7
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -11,8 +11,9 @@ short_desc="Multi-platform library for creating windows with OpenGL contexts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=4e08897813668584b252065dc8bcb5a3cbcdd19918ede4dbc847fad7e35db7ec
+changelog="https://www.glfw.org/changelog.html"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=fd21a5f65bcc0fc3c76e0f8865776e852de09ef6fbc3620e09ce96d2b2807e04
 
 glfw-devel_package() {
 	depends="glfw>=${version}_${revision} $makedepends"

From 284e7077af61dc521a1d4f3a02a05303950598a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Tue, 5 Apr 2022 21:25:52 +0200
Subject: [PATCH 0965/2561] glfw-wayland: update to 3.3.7

Also add changelog url and update download URL to github project.
---
 srcpkgs/glfw-wayland/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glfw-wayland/template b/srcpkgs/glfw-wayland/template
index 720899cf56f7..f2abe3a8a608 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.6
+version=3.3.7
 revision=1
 wrksrc=glfw-${version}
 build_style=cmake
@@ -12,8 +12,9 @@ short_desc="Multi-platform library for creating windows with OpenGL contexts"
 maintainer="q66 <daniel@octaforge.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
-distfiles="${SOURCEFORGE_SITE}/glfw/glfw-${version}.tar.bz2"
-checksum=4e08897813668584b252065dc8bcb5a3cbcdd19918ede4dbc847fad7e35db7ec
+changelog="https://www.glfw.org/changelog.html"
+distfiles="https://github.com/glfw/glfw/archive/${version}.tar.gz"
+checksum=fd21a5f65bcc0fc3c76e0f8865776e852de09ef6fbc3620e09ce96d2b2807e04
 provides="glfw-${version}_${revision}"
 replaces="glfw>=0"
 

From 8e2626cd8bd6cbd60372624bc32fdb00ad89450a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 10:15:05 -0400
Subject: [PATCH 0966/2561] python3-phonenumbers: update to 8.12.46.

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

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index c4dd9b71d037..0a952e920922 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.45
+version=8.12.46
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=94e30f59b2be6c4310a90f3d5da53d49900bdb440484506f3333c694ebb0cdab
+checksum=1c440f6336cb49893ff1a8326c70b4df693802ae981f210f545cd4215ac48133

From 988c6a8b7fe42e9b2a928b81c5b8b1d36fbf9376 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 10:17:04 -0400
Subject: [PATCH 0967/2561] python3-frozendict: update to 2.3.1.

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

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index a212fa1c7c89..3946c2ee05b1 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.3.0
+version=2.3.1
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=da4231adefc5928e7810da2732269d3ad7b5616295b3e693746392a8205ea0b5
+checksum=bc91c69233eb916bb6ebc40988b6d849735770240efc9c60be45b4ab919c1bde
 
 do_check() {
 	PYTHONPATH="$(cd build/lib* && pwd)" pytest3

From 461e245ebd39538d8492cd8e7509678fc790e054 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 10:13:41 -0400
Subject: [PATCH 0968/2561] synapse: update to 1.56.0.

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

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 1c07111f4247..984ad56e0a8a 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.55.2
+version=1.56.0
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -21,7 +21,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=8e06cb264d1631d2518f2f726c89d62c5ed7148b73fbb8190a9c120d3166e7c4
+checksum=7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 5be411cf625f0786111cfc36dd1f434f045290f4 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 5 Apr 2022 11:25:36 +0200
Subject: [PATCH 0969/2561] slack-desktop: 4.25.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 b90525004d6c..ae1b738b622f 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.24.0
+version=4.25.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://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=b557d264ae68cafe383d647dfd26f366ee94315f77132f64bff8f9ef44635197
+checksum=e88160a02ca489f0d54afca5bba1aeb17c886b6458eadcad73bffd959c85422c
 restricted=yes
 repository="nonfree"
 nopie=yes

From 4665dab3dc06cfbde98de4889dbde2784183ca66 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 5 Apr 2022 10:22:19 +0200
Subject: [PATCH 0970/2561] google-chrome: update to 100.0.4896.75

---
 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 a630fcdae463..5f9e67c864f2 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=100.0.4896.60
+version=100.0.4896.75
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=05ba6d17d2704ffff1e1d554b40aaddabca9256b7e63ff73e99c469393de8a1f
+checksum=856934272783e5a48fa63e30eb896040f5b46d6f394c1b3aa2e461cbf89b395b
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 44bffdcc28ce8ec3fc9b31c873381253d12adcd1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Apr 2022 08:31:56 +0200
Subject: [PATCH 0971/2561] libvirt: update to 8.2.0.

---
 srcpkgs/libvirt/patches/823a62ec.patch | 48 --------------------------
 srcpkgs/libvirt/template               |  6 ++--
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/libvirt/patches/823a62ec.patch

diff --git a/srcpkgs/libvirt/patches/823a62ec.patch b/srcpkgs/libvirt/patches/823a62ec.patch
deleted file mode 100644
index 5fcc644d3e5a..000000000000
--- a/srcpkgs/libvirt/patches/823a62ec.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Tue, 1 Mar 2022 18:47:59 +0100
-Subject: [PATCH] qemu: segmentation fault in virtqemud executing
- qemuDomainUndefineFlags
-
-Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
-
-Stack trace of thread 664419:
- #0  0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
- #1  0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
- #2  0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
-        at src/remote/remote_daemon_dispatch_stubs.h:13080
- #3  remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
-        at src/remote/remote_daemon_dispatch_stubs.h:13059
- #4  0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
-        at ../src/rpc/virnetserverprogram.c:428
- #5  virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
- #6  0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
- #7  virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
- #8  0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
- #9  0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
- #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
- #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index bcd9bdb436..8337eed510 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
-         }
-     }
- 
--    if (vm->def->os.loader->nvram) {
-+    if (vm->def->os.loader && vm->def->os.loader->nvram) {
-         nvram_path = g_strdup(vm->def->os.loader->nvram);
-     } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
-         qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
--- 
-GitLab
-
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index bf08aa899e00..e73c337822e7 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=8.1.0
-revision=2
+version=8.2.0
+revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
  -Dpolkit=enabled"
@@ -20,7 +20,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=3c6c43becffeb34a3f397c616206aa69a893ff8bf5e8208393c84e8e75352934
+checksum=0ecd9c7dd52db7a2d124155ffa5e11de2fbd05014eceffbd1972b022d21becba
 # At least one test times out on CI but works locally
 make_check=ci-skip
 

From ef31a7f55eb7412fed16590a1462a158f45bb01f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Apr 2022 08:34:02 +0200
Subject: [PATCH 0972/2561] libvirt-python3: update to 8.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 f74de9d9c8f0..2aea5df86fec 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=8.1.0
+version=8.2.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ 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=a21ecfab6d29ac1bdd1bfd4aa3ef58447f9f70919aefecd03774613f65914e43
+checksum=f8b8cea67ff0d64d63029cc3410a4656e04ee9f26837a856bc0c287da55d053a
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest

From 24931ba2329d26bf0e90673c79db3cc2ec507a2b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 6 Apr 2022 16:57:59 +0200
Subject: [PATCH 0973/2561] gscan2pdf: update to 2.12.6.

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

diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template
index 295488de54ba..c6486bd905f9 100644
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'.
 pkgname=gscan2pdf
-version=2.12.5
+version=2.12.6
 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=305596f434c9fecbed80dddf6f0fb3786a60837a602280bd8d9d47906e69eac7
+checksum=f67b695043376ee4f71219de5f3f46f1b89bbf33a710ae97b748c9713bcb293d
 nocross=yes
 
 do_check() {

From 58ac31433988f27799c57e5f7e6f29dae1dd10a3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 6 Apr 2022 16:58:52 +0200
Subject: [PATCH 0974/2561] wine-mono: update to 7.2.0.

---
 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 06f2e20dd7ea..ec9fa01077c7 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=7.1.1
+version=7.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 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=9dc8e5603b7bc64354eb94ae4ea0f6821424767a3ff44ff0d19e346a490c11ea
+checksum=5f06eafbae3a49ecc31dfcea777075bd44f0cc126e4fb4e28ecefa06eb436323
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever

From 5b83c62e881f4138c36abfa577e8391757091fb4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 17:15:45 +0200
Subject: [PATCH 0975/2561] firefox: update to 99.0.

---
 ...ktop-icon-path.patch => fix-firefox-desktop.patch} | 11 ++++++++---
 srcpkgs/firefox/template                              |  7 ++++---
 2 files changed, 12 insertions(+), 6 deletions(-)
 rename srcpkgs/firefox/patches/{fix-desktop-icon-path.patch => fix-firefox-desktop.patch} (64%)

diff --git a/srcpkgs/firefox/patches/fix-desktop-icon-path.patch b/srcpkgs/firefox/patches/fix-firefox-desktop.patch
similarity index 64%
rename from srcpkgs/firefox/patches/fix-desktop-icon-path.patch
rename to srcpkgs/firefox/patches/fix-firefox-desktop.patch
index c4664d3da7ce..3f0273cba366 100644
--- a/srcpkgs/firefox/patches/fix-desktop-icon-path.patch
+++ b/srcpkgs/firefox/patches/fix-firefox-desktop.patch
@@ -1,6 +1,6 @@
---- a/taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:31:39.428839442 +0100
-+++ b/taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:32:20.689063456 +0100
-@@ -154,7 +154,7 @@
+--- a/taskcluster/docker/firefox-snap/firefox.desktop
++++ b/taskcluster/docker/firefox-snap/firefox.desktop
+@@ -154,11 +154,12 @@
  Terminal=false
  X-MultipleArgs=false
  Type=Application
@@ -9,3 +9,8 @@
  Categories=GNOME;GTK;Network;WebBrowser;
  MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
  StartupNotify=true
+ Actions=NewWindow;NewPrivateWindow;
++StartupWMClass=Firefox
+ 
+ [Desktop Action NewWindow]
+ Name=Open a New Window
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 6c1596b19e06..8ee3b78f809b 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=98.0
+version=99.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd
+checksum=513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327
 
 lib32disabled=yes
 
@@ -32,7 +32,6 @@ build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 
 case $XBPS_TARGET_MACHINE in
 	armv[56]*) broken="required NEON extensions are not supported on armv6" ;;
-	armv7*) broken="currently broken" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
 esac
@@ -73,6 +72,8 @@ post_patch() {
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
+	echo "MOZ_APP_REMOTINGNAME=Firefox" >>.mozconfig
+
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		echo "ac_add_options --disable-jemalloc" >>.mozconfig

From 82c081cd53554ae1f3ea836a2e4d8df7aad8d00b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 17:15:53 +0200
Subject: [PATCH 0976/2561] firefox-i18n: update to 99.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 713c5914d0ab..0e98d438bd21 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=98.0
+version=99.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="dff169f590c9ba54034df42a131d067a30e6ed967fc0e5142705df22d8ea977f
- b73f738bae53b0afbe28d087a889ab7c98e3b325cfd5122cc60eea59a7db8616
- 4f13f00bda1aafc6a2d97041fcb3740a4e8c1c049bba151b3791924d73d3ef06
- 02ab060f05a1a2af373c2a3fe48ef891fa6d1835ddee77ba9678f22bb4782e86
- b02d91316af55caf87abd7650b286f9c181eb7added7d021446ae2976ff69bbd
- dfb07ae1cfc143166fdada9e378cb4f22e4ddda92d0e2c66e6a1d2742c51d0c0
- 4a0409fdc266d1e819a178d558d90b3209c8423cf2794ca0fce3eedea947faa6
- 567e77ed85bacaafbf82fbc90dfabae6e31be8acec5a2db8cfd28197d5bd1815
- b92173bf696785e4f64f74871996c75c9fe96854e3194ebf7ff1dcc9f817b0d8
- bbd223abe4457a1e7425f0cf035c7b6de33e26440d30af8655320ff9c68b124b
- 8e98b9083a77a97886affbbf089e842b0286539fd93df18b031c8d7e8ac92d30
- d4a94e6f5753e5f4d2a777830a0cb23ac94298278328bd3579606ceb47d949eb
- 360dc9fd3a91eac883ca28efd02c218d7365d889146278129ea27424ba452a58
- cd9bc801f9807b0b8f1dcb3ff8bed985cbe291ee95f25963617845d1d7de57b2
- fd5b0f3d1d81c74ebd53b4e2f221cc79dbe9c2a936e73b6a983cb666d6c8f7a6
- e2b37b8fa911c4bca068b0fce10db9fa28490c939c15fb8ffda785d396e6f33b
- 2a0993286c9e5f1350a660636ec2b43c9c7d974ac9d1c2c979df888f81a90141
- 2fc6465bc4dd66c23deacfa7d055a2bf50eb2db9a0a10c20f6f3b5321879e33e
- b88cd11ed43a4f67897434281a4ebd7ef7cb3f4c4d041822fb672d0812d98a2d
- 9d3de3237d2e12e72f9244151ff9c24caccbd7e1a560718f8f41a0bb7e96e2c9
- 1cb6d182af78f237d0d01edba2263b01173377ddc0c9b1e7f5db1cf593765da8
- 52a7d3401c0d333fcf98b33bff2fddc88ae017476e0be74c73359c01d9f7eaee
- 661374e104b98180fba058d4ab6574246d4d9244739decdfcece493338f1ed3f
- ba74a4dba80b8cde6a4105cd6179a72005123d1c92898496a2793479c1921676
- c6259edeb1da7d3ca05ca4b3565408d02e48e3c7f7a254d56b41fdb3639cb56f
- fddfbe98c0d309323981b685b134f000cc9c69518efc365c5c559ffd2c05b602
- bee9c9a60147bcf86f55bccace7fe63316fb79af7cd45b8ffe43abba980db8b9
- 8a4536988167922619e06721229fc91d087d56177ce2ad1a417dd52bc218814f
- 1c11f7b7d2349d8bf0cbd3f6133d1f93b70b6d0176555d538e0bfb7774ea0de9
- 52bc04a4c244de19b4e02a60b79fd760df35a2b825363a1e94c5becd535413ec
- d19315771ccaf194add0459e85a44a8a11dc04f2d9b426201fd4c7000e4defe0
- 3e0df7a54beb78791adfb9f56cc62c5cd01126e964fa90cc1bb65331b2d572f6
- 49b38e6fe6746b2c3e4bcf8a1b7bc828ac8c5784dbe5b1039edde51d2e942dd3
- 97751019d9f01120a0acf4153b3b06c2e476b83d5da8561bac349cdcba5fe095
- bb222cce7ff359eeef5cbaad871aa42214ab5b62872deead6cc57068d0f1fd8b
- fcff68e01cbf4740e7816fb61a15853f9be14034b3fdde1a67b22f80dd43ff33
- bc7c2beadf026cd535635b540c2a8ca7953662b154b9e128378b6ab51ac62953
- b1f207489d09eec55d486b467ceb88bd289b7238ff506a01318d797811121f95
- 08dacf388f2a04796450d37c2a7db5270b3515c38ef0f0426ecc59915ae6b812
- cc7e4230277d9b54f114048f951880aaf4ed88af03a5791e0dc091ecb947e956
- cd6024b8bc6780265146720559fb1f828e36688eeec919044a62d365b440ba97
- 33c1d05921e6041db7d09279da354e2d406798ffd14c67b9cf204e339fc1caee
- 0264439a560fef95488a5aa05783b24e39d16acbed6f1b389a75864ac60f3267
- f174f19aacd50078adceb236e9432feccaf0edc8aae9632191a4c38dab22b206
- 596b84ba309ed661429c8fe5a13baa38e773f40b3b17c997d61834afec92b535
- 6e2e243496089c084844868744ed2a736e621fc14fe95cdf3b5b7507d56b022e
- 91449d6929c9c3068d0c724315e00d412f25c7ca72fddba53ac97c24f4214189
- 138ca2aaf0f0a2decba98db228ac835b1299c841932bf683deb635a8cf226616
- 299bacaffa3b2f8bc359b7bd33a9e4b5588546f7b75ea323ab63b6a25152ace1
- c9eaa1d9e843a07eed355db514c10f8df0e898f9f177dc96eb721643218c6314
- 5231901059f7a9d7b5bd7ff15168c469f2f7813c85c7266b70c20661e2eeb838
- c2d0f151ffd2e9daf33bbffc2d069fd65c258d7c69b29f38785e2e395d8ff6c0
- c2edbea7c2037a57524c4899a888eb0a3007593f0b39e8686a049b5dda10a768
- 95acf4112f5b67f22f8df330e53e6cf764e1648f6fbbebc7feb316dc3eb6cf8f
- 22224ae5b1818b86a5ce7b5872ebcea1c071009a6fe1abcfcf26cfe36b53c6b8
- 035658f37f5a9c025db1386a89f5c05b72895b73c1a6826656055117afbd5239
- 627d5f227d5e39c98802dabf68096f2588ee988afcdb13b95470457bb1f1c44c
- 7d5f86ab7a0f47947ccfebf496e7e8164d433ee7560c39661a0f3d88995d72c4
- 9623353017b1f980f43eae284662dbd2cd0b1ea1d8864e4fa6f86c83d78e7c06
- 1fb1f82cbaca4a5463b8375709dc2e865dae4492ef294c7c39324fb867e58272
- ad7df8473b55cc460476e05f265e7c496f711dbd6635b594e3d1cdd435ff6504
- 38416b1b2ca89bec7e71e2143ba27e64b2c3319ef45499346b47dc30fbca793c
- b55d6775b6bb9254b87692e244fd7078ec93c031efa51b6d205cff98a1651484
- 66318b8528b59acba6be065989e51b5187a8735cc1be87fb25c835d9f5ae37af
- 423f5a30c7174d2b41f5fcd38beaa232967990f66aec84769ce501402f5881a3
- 7933dfd5d65816c54c8ab3da1455d6810c4d1532790d95c54b0bc4adc055ff40
- a44392970b81bbc639822aaa9f73f7da4e64e39b91a402483d5bf98538fd88e4
- 0cf1c29300b3fee8659c630bd37867323c42422b50bd429e9ca196025fbf090c
- ff56285588b4bcc927db05ac856e2bf69d4f6b31c63d254242551c0315719854
- cc1de1d246c39e1214186cbe88932b70e8e60121739faf9c88f24446e74445b8
- b97123397c9f1419bd6ce9c62a7be178c35683b64fe3c20046ee4aeeadd2f83b
- b09681f50489150130ae682139d6427f1fc77c2cb2a9debdd5db9fc4ae307a1c
- 84f5dc461c256fd058522acf368c5d83a4560a8a478be5f5d551a1a194598374
- 336a044de2b47ee875f27627059bef2dea0862908b2bd937416a2765ec91eeda
- 3154deee82fe4fa24df33713a2a9688c1028c39df791732af097419dca83e3f6
- 973e3de5de51533ebd699879ec1679525e7b35a0a74218f68c29a1b4d2280c2d
- 18344197c44ed32c4cf31df5c4424d0128b6791a57fb910ce42e1f68d282e13d
- 87c4014428af7f4303f9accc16951be16dc7122a191d1465d0a5e0b60486ef80
- 6ca8549d8c1c91ca2136e49458b935974354640aa6bab2a8d2255868d56d87ed
- 2a18628d8955170725121f5f5a2b4262e39456e9fd4a007bd387f2a14e235a50
- 96cbf50ad97ada93a6e0156557911911e46c7963b34951cfe5abd0be3dbfaade
- ba6fd1a48128dfa48a1f3c70b28181e658abbbf549e104d08df3f27197475dcc
- 7bb5c17d1f1e25cfc735867f005563ead7de99c19e27f05a0efeced067ab50be
- b3712f4146b50e243a6b2056d062045a14c9d8057ba1430f5c2662dac06ac34e
- 8f1c167582e3d46cf2d24887b47dd4830f0dd084aefd7371b61ef716932db352
- 29563c43673308e83437984ebe46e650a56e11be5fe2e1298946bc232287e121
- 9badcf85535fc5b2282bdaea3fc6ac15d0f9f560524015321f0ed5c075fe7e5b
- 1b6c1b1374e257cb5f699f71dbd1d2d1a287588548610272598a85b8133fcaef
- 3aed734f122676a568c68a98a3243570dea7b06cf5a65f1be1ce060da2fe6804
- a365cac889289ede9cf61a0fb73b8efe7cccf758167354ff43b29b3845777c82
- 20c519b8cf6f16eac1fbc00b93178eb78c076f10518faf4c43f9606de6fbab83
- 138ef57dc8947ef1580ee7fb0edc3459cd49a16ec296edabcfa913c784ee7320
- 1b4fd65008d7780b9af4857ef91b9d4eccb97cb3469d90a982713812ab7c1b11
- 1930509ac41ac78987f50332f9e44b66d0e27ad59fea56e933e05d4475012196
- d6c16dec9ea82842f64e11ff7f6b4194f9b513f904423291ec8e7782ab7024f8
- 54af90457d760ea7ac38b1b6d7b532996542192d0541004f9da9386fb5ea91ea"
+checksum="e398f1b14ae79fcd74639a81b27c4cd38b09282ca625d1b72c69df09fc4ec1fc
+ a8cbef3ba5c35e33c0f1e02dcd2781cc362315d5b63e9e6065a22afbe460581f
+ 35b4f32eabd40875d518cb174858bb6d8ecff272f4ee677e0c108d8395707960
+ 4f1a97c404347121c53799efd2a986860e030b7789e66e252d92b6a78012b681
+ 580e9e9fde913ce410774d366bad95af3a67df52c688a6ad64ad59e8d33eab47
+ 91236c6ecd7ee99927d5b69566cc30f4b1de6e7caca3336386f3e7bb995c96e2
+ fa36e967b14e530993e3a50fcdc5f32e686f5b110f6cdee59b8c555c82294517
+ c88a65b1f3c10085b0d5236a3e687b70cd9a620803393caf81b4ee0677330ef0
+ c12d138948d4e5cebce1051f0cc750f8f9bfb23f733417e7e7b9596ee74a6980
+ e4b9cdcb7c08beceecfef7d8b94d70a24e3f24404c73cd7cf5aed6572e293bf6
+ 75d09dfb5c0b55b670c912feecd48bfdc7f936f31c41d8e4b2ede0e46d16f749
+ 8780f97e115fbe8f156412757d1980517b85dc409fbbc8e0266bdcc7d0568c83
+ 815c9a81efce33b19b9bcabd46093ea92bd062698575c83ea127f20a3495c984
+ 76e9a327a69960f4ebd857b5b204d435d60461b7129aa70db90ebb28411ffaee
+ 8fdd5adfec75310172819a959a2b68ad3ecb614c94298be315804e730b43a160
+ 8947c35c94f08bbb61a3beb8b106a776d0f0a3b2f247b9e49619ab9b9416bb19
+ 7851a711a8de28c6e6c3c07814ef995263f4c3a48981742f1aa481389dab3897
+ 8bb525f9045c91b3f539103eb398da1d1f71a580971a1adcc780198da36a2623
+ 04cfc4a69fba8f3838d385179511954277cf1f6d8243663f338941c1e86a49ca
+ cd9f142ac06d16919b5f1102ae53f1241574057c75012198fe1dbdb7a8d63a8c
+ 8ff53385252becfbc2f15354ea57b873251584444129c137350e974dc488318c
+ 9a58559be92950e33051625e49dd3f5bae36c225b9a7030bec9a6aa78d45ba93
+ 6e0f538d93f8b2d189c667c2aac37c6d1eb50fb802c4ee2ff310db15da57de56
+ 2c051ea90460cda20296b1a69037e037b82258fe382c9031594974e75cbc10eb
+ 053dfbb9ad0feb3b54cab94bd8f5ac544ec598f9b819a7d163496f838104b8a5
+ faa25b7302f249b9aaea768a7cf61f78f67e3637e9a62906361a1fae257d0161
+ 54f02a1e948d2944b3889152b093200a0d31358df28f7309e5fb5d490616d317
+ 7c104e3c70024163fc0fe7597df0a995b2e813319dc23268fe36e04f09f2ced7
+ 2cf6b8e82042208407bfdbad01a3d5113c87f0bd37acb082452f1f6c22bf1485
+ da05a0fe7a65ce243f0ec69ad60d93a3bc988383f983343a66b399a2de1a10a0
+ 13da03264b7d522bcbb77cfb1fece6606f9efe742822325ced7627fe28add070
+ 0d835b249070428d8d5e1c251ab46b19df71cc2858b69843a41eee897c27b396
+ 5dbbe35e45b15dca15ba5de15aa55b4fce44d33fb456ca8184270c0f162567d7
+ 9e6b2c13f0c2347fe27e189dea6dd8a3c5b23aaac668010213258bd26e0d3da7
+ 1aa07979f8bb7d6039a11f64b3c93b3c70332def967af6fb426897b7c65fdba2
+ c21b99ea6049d498bb446770801e3c9f8041bd11e0ae8164bd16a016f14f5578
+ ed537abf79efa484fc920902d59ea1b840c6acf6fa540f435722f5c75a1bca90
+ e9517bb3330ec5cb2a743dd56a69c912a35b6dafe6a7abeadfe1532a17963549
+ cf97f81502f30c807fde8127c6f8ac1a9ea58508ba8d243ea0d6fbabe2ddc8b1
+ 85b90f53e79bc2961b3f0c702ba5762ba7559c366d7682bc66b20514769c2a92
+ bd31d635b44f039ad2f89e4ad1cd0f7fcbcec7e0d6d381f8bf89e17bb74aa952
+ 10d597d44d8261cd0eebe024de51ba803c94792d13c5732d43ed9bec4db72783
+ 33da29355095f9ae0383e21ae0c6d300d6a7f298c7e126e8747c71277b1175be
+ 84ff5d1b88c4205eba0f04e89daf4d91e9f25da4590367050917a6d34c629147
+ 4de39e8b907391f197fe5d138f87985d74d3a34796c3963f2e33142164696f84
+ 47e8c5ece6643d5c6cac713799c841e73c0bda691243ccd346b5e85b0a4810d1
+ c196be8854dded19c2a85c5bb7f3ff3123da0d91852da7b16f844cb44e9d11fa
+ 7f97921badcf0c7ffeb92c6f1d1d2ada3afd0069e8e80a524ad3b7c0c1220f0a
+ 79d845fccaa1916f07dfd821c3ed95dd5647b70bd9a39e485caa66cc65a077f7
+ 40ce23e0cc6e4fa5192e987bc835c1408d958a2fcfb8875370db517ff64c92a4
+ 8f6f739077a383884d400c3062925e0e848be4942e3be0e378e589bfa3941c9c
+ 9f014d8807130a01ae008997393deb4c865c70482a4fe75f3cee0e9f8071246a
+ 240aa4b7091065ef0495c8f52eeb91b5a0cae03676c6ea4cedee9260e204dd6f
+ 788f7ab9bfbb7b692d4d28efad9ae3de964ef7bfa4e30f6f50a3bd178ac004ee
+ 04a7fbbc1b0769a5b66bb068385482e50c5f70298eba250235d259bc4aa3ea99
+ 30a1707f4a57a2ba738eb27f5525daa12f0713e3bb7b1a3ebe2c710ac6e37a27
+ bdc752daf3b4e8f8ea3980d98a01d7249f38dddf183909eb55a8c50ad30368e1
+ 48332123774a79eed86d1e826021a05a3921ac5f95ca54e086f173c8e1e72fd1
+ 31f2f1c2adabe35fd353d3720eb8458716f926e57c9d782518f943533cd1a72d
+ 4756150d141a8ce3e2bdca7fdb1b343466b19cb9a19adbfa25d86c39d0f7c933
+ 024f3b186772c5381a458dda4a6b914fb2695f8c16e648c58d463072f10f5b57
+ 8160d89f88b3c7d9e967377e513b8fc18e4a19faa55f95371db3553564db65bf
+ 6d2816247894f2e73ecb0258ee5a9b85b650542bac46a8587d547c8824e2d280
+ d3e017f003c34a6768670ae2c8bbd5e3500f452647e36193614810ced595b2b3
+ 7ceafc2a330620665c51e8b394d296ddb190d97f4cebcd0a247d0278d3a54274
+ 6b6992a92df788fbd119446aabd9329b7edd1643a8dd1e3ca7b60dc7976b3b60
+ 8dee92aa771ca1b0deb233b974f844b8025d4b25f2ff8be41d91c636565eb7f0
+ b4fc00a30204c8c5b19c92bd3164b98955d9591366f89c194fe248bdbc0ce580
+ 406335d53b11c42f34446adc68d6836a6841fc34af3c2f1fa621ddc2026017b4
+ 7ac66cef872878f6e5568266d9c807da1cc4041ae51723cf387590954f73cf7d
+ 74c5306c711a4150cb6f89289067533a5438495a251d63cb06f586d27eafbeb4
+ f3e67b76944280de1eb8df059bec0f0eafd06a4bc4e7c93e98c434a17192c084
+ e13b87e04ee3fbf7ea0c02e4b176d6dc66dbd234b59cb245dfd225e65c5cdcd3
+ bfab113c2dde187aaabfd89957c7dc840bbbb25c4f27b31fb422c9817035eaa8
+ 7bde7feb01a40d3b89b78928154fcfc0eff8c77b086e360b940f61d45d7eadb0
+ 18f2267d16b30aecfd2b6f9437cc79bca68084680b2770820323a968fd20c93e
+ 5bd5138456fae929520bbd821beddd1f934d156e3c99916e47df31b7bedaa32a
+ eb4db96ab4b78dede2d92db7c0c3dd4084971178f101a342655348a4b90a6487
+ 07a06be606d6adacf1cb57cbf448ff18a7c13c90df9e11768ac3fe3e200569a2
+ 090e6759314eb16b2169bd1f89387963ba81a0e565f1d77143f2da0e6d267e28
+ 38cf5fa44116bc15f12db4506db386b147762838f25d991a0c39cdcd236533f6
+ 448a4ab5be3d9f246f961705a02f31abcaa8c616351c4d05857c3db41ba83154
+ 3fcfcc54f9ec4762b4b78ce0db9351ac59a717e4931d6267cacafa16d3d41057
+ 7349863f4edfd79321be9b214384138596cbe16ecd2107cee58501e2511c438a
+ 4a50c82c68898c25dfdfcb95079750a455ba2e4d1397d5e51cc2991dce1be60b
+ 275ab1a945003153a10fd5bbebf8ce9af346e5ad2068c83eebdcd60ecf0ce99e
+ cce68831a20669468b108e3dd58dbc34cd981c874bdd299b715df838ba5ca0f9
+ d6cdb55b0f8d7f3c9c4f3bc7906feb123f84243bfbd719eab75a6894cf455582
+ 74012d5c8c22cc2f5780ae55020cdbe3c74f21671a2769fde907dbd63e0281bb
+ 14a02938f76ce51767746ecc104ff571f2da0429144ee981cd28af8b4eda3518
+ dc05af8f59bdbf1c77d6d45dc1bf6bba634b782533e245993d852e39f145cfc9
+ 557444ed827906476ec3385ffae1e1952acc5b3234840fc645ff892c9753b2f3
+ 9925d116300b43f82061e1c04deae6c241cfb121d46364aa1f206e0d8bd9732a
+ aaf3249f295362530f04f23c00e309baa5a7a89c70bbf1a3a763b8ef66631ac8
+ d289624c73955ff377057be150ff8d52118810a4adaf861fe51b7f0a0b80dbbf
+ 2f07d98e74625892478c321161f62db8c790d978dd4e5c3633c5cf5ef5d8d6b4"

From c2728dc35a475d2c603ebb270fe525864200f45b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 14:45:55 +0100
Subject: [PATCH 0977/2561] meson: update to 0.62.0.

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

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index adfa2d52f7ab..2a4453076e8f 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.61.4
-revision=2
+version=0.62.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
+checksum=06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -40,8 +40,6 @@ post_install() {
 	vmkdir usr/share/vim/vimfiles
 	cp -rt ${DESTDIR}/usr/share/vim/vimfiles data/syntax-highlighting/vim/*/
 
-	vinstall data/syntax-highlighting/emacs/meson.el 644 usr/share/emacs/site-lisp
-
 	vcompletion data/shell-completions/bash/meson bash
 	vcompletion data/shell-completions/zsh/_meson zsh
 }

From d1cc9e3fece55696fdefc94834b3605e010a63ff Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:07:16 +0100
Subject: [PATCH 0978/2561] accountsservice: fix for meson 0.62

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

diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index c00a4077d8f7..804d57e9e421 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -6,7 +6,7 @@ build_style=meson
 build_helper="gir"
 configure_args="-Dsystemdsystemunitdir=no
  $(vopt_bool gir introspection) $(vopt_bool elogind elogind)"
-hostmakedepends="glib-devel pkg-config polkit"
+hostmakedepends="glib-devel pkg-config polkit gettext"
 makedepends="polkit-devel $(vopt_if elogind elogind-devel)"
 short_desc="D-Bus interfaces for querying and manipulating user account information"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 6bb59c1a622ce95cc0d8d78fd44012efac86b755 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:12:33 +0100
Subject: [PATCH 0979/2561] atomix: fix for meson 0.62

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

diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index a59e134ebd91..31f34e1efc59 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -3,7 +3,7 @@ pkgname=atomix
 version=3.34.0
 revision=1
 build_style=meson
-hostmakedepends="glib-devel itstool pkg-config"
+hostmakedepends="glib-devel itstool pkg-config gettext"
 makedepends="libgnome-games-support-devel"
 short_desc="GNOME puzzle game where you build molecules"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f19e4dfdcff73ca65578d3d583affd7000859c58 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:21:38 +0100
Subject: [PATCH 0980/2561] babl: fix for meson 0.62

---
 srcpkgs/babl/patches/meson-0.62.patch | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/babl/patches/meson-0.62.patch

diff --git a/srcpkgs/babl/patches/meson-0.62.patch b/srcpkgs/babl/patches/meson-0.62.patch
new file mode 100644
index 000000000000..a105c98cb0db
--- /dev/null
+++ b/srcpkgs/babl/patches/meson-0.62.patch
@@ -0,0 +1,33 @@
+From b05b2826365a7dbc6ca1bf0977b848055cd0cbb6 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Sun, 13 Mar 2022 20:26:05 -0400
+Subject: [PATCH] meson: fix misspelled kwarg name
+
+set10 doesn't have a `Description` kwarg, it does have a `description`
+kwarg though.
+
+This caused the conf variable to not have a description when it should
+have one, and newer versions of Meson with better argument validation
+error out with:
+
+meson.build:58:5: ERROR: configuration_data.set10 got unknown keyword arguments "Description"
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 55054f441..8c93be9d1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -55,7 +55,7 @@ lib_name    = meson.project_name() + '-' + api_version
+ stability_version_number = (major_version != 0 ? minor_version : micro_version)
+ stable = (stability_version_number % 2 == 0)
+ 
+-conf.set10('BABL_UNSTABLE', not stable, Description:
++conf.set10('BABL_UNSTABLE', not stable, description:
+   'Define to 1 if this is an unstable version of BABL.')
+ 
+ conf.set       ('BABL_MAJOR_VERSION',    '@0@'.format(major_version))
+-- 
+GitLab
+

From a67e6fa4a29cd9059b596bd6a9be0027923152d1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:33:02 +0100
Subject: [PATCH 0981/2561] cawbird: fix for meson 0.62

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

diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
index a307ed212e54..85c5d621bcc0 100644
--- a/srcpkgs/cawbird/template
+++ b/srcpkgs/cawbird/template
@@ -3,7 +3,7 @@ pkgname=cawbird
 version=1.3.2
 revision=2
 build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
 makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
  json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel
  sqlite-devel"

From be6e613ee9c7189fb52279a62fa317e1d496a60b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:54:30 +0100
Subject: [PATCH 0982/2561] clipped: fix for meson 0.62

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

diff --git a/srcpkgs/clipped/template b/srcpkgs/clipped/template
index 3ced5834bfc8..9386038b3f42 100644
--- a/srcpkgs/clipped/template
+++ b/srcpkgs/clipped/template
@@ -3,7 +3,7 @@ pkgname=clipped
 version=1.1.1
 revision=1
 build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
 makedepends="libgee08-devel libXtst-devel sqlite-devel gtk+3-devel"
 short_desc="Clipboard manager"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From b572237bbe43eb2b9f312c35cf480727da9d7dca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 18:01:30 +0100
Subject: [PATCH 0983/2561] eolie: fix for meson 0.62

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

diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template
index 52c0f08d2f45..d709b2c7cfce 100644
--- a/srcpkgs/eolie/template
+++ b/srcpkgs/eolie/template
@@ -6,7 +6,7 @@ _eolie_hash=bb4aad19272cc636bd17f2f6602127fe
 build_style=meson
 pycompile_module="eolie"
 hostmakedepends="appstream-glib desktop-file-utils glib-devel pkg-config
- gobject-introspection python3-MarkupSafe"
+ gobject-introspection python3-MarkupSafe gettext"
 makedepends="gtk+3-devel libglib-devel python3-gobject-devel webkit2gtk-devel"
 depends="gtkspell3 python3-dateutil python3-gobject webkit2gtk python3-PyFxA"
 short_desc="Web browser for GNOME"

From e42fcdc81bc74c0ef6b8fc10fb3c6d475a8f7ee4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 19:03:54 +0100
Subject: [PATCH 0984/2561] gamehub: fix for meson 0.62

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

diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index e8f110b3eb8d..7e8b35ef9af0 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -4,7 +4,7 @@ version=0.16.1
 revision=1
 wrksrc="GameHub-${version}-2-master"
 build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
 makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
  libgee08-devel libsoup-devel sqlite-devel libxml2-devel polkit-devel
  libmanette-devel libX11-devel libXtst-devel"

From 00459c9ba5afbcfa6f9cd612500d275293db089f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:24 +0200
Subject: [PATCH 0985/2561] gnome-multi-writer: fix for meson 0.62

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

diff --git a/srcpkgs/gnome-multi-writer/template b/srcpkgs/gnome-multi-writer/template
index 7d0e5085a6ab..cc21737d0601 100644
--- a/srcpkgs/gnome-multi-writer/template
+++ b/srcpkgs/gnome-multi-writer/template
@@ -4,7 +4,7 @@ version=3.32.1
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="docbook2mdoc glib-devel pkg-config polkit"
+hostmakedepends="docbook2mdoc glib-devel pkg-config polkit gettext"
 makedepends="gtk+3-devel libgusb-devel udisks2-devel polkit-devel libcanberra-devel"
 short_desc="Writes ISO files to multiple USB devices at once"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 25f3426d46b407f724b322c8779e85b0f14bf38c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 10:46:12 +0200
Subject: [PATCH 0986/2561] gnome-passbook: fix for meson 0.62

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

diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template
index 7348a1944502..30cd8e93b721 100644
--- a/srcpkgs/gnome-passbook/template
+++ b/srcpkgs/gnome-passbook/template
@@ -5,7 +5,7 @@ revision=3
 _release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9
 wrksrc="passbook-${version}"
 build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
 makedepends="gobject-introspection gtk+3-devel libglib-devel"
 depends="python3-pykeepass python3-gobject gtk+3"
 short_desc="Password manager for GNOME"

From 9e4b8f4294226aa0d91e0ba62be2f3d5c13e62ff Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:42 +0200
Subject: [PATCH 0987/2561] gnome-power-manager: fix for meson 0.62

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

diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template
index 58422cd9da3b..0c3c1ff4306c 100644
--- a/srcpkgs/gnome-power-manager/template
+++ b/srcpkgs/gnome-power-manager/template
@@ -3,7 +3,7 @@ pkgname=gnome-power-manager
 version=3.32.0
 revision=1
 build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
 makedepends="gtk+3-devel upower-devel"
 depends="desktop-file-utils hicolor-icon-theme upower"
 short_desc="GNOME power management tool"

From f8608807a757e8ae675ced72d574ee7f02ec36ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 14:17:00 +0200
Subject: [PATCH 0988/2561] gupnp-tools: fix for meson 0.62

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

diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template
index 09507922f46c..cad194d50f86 100644
--- a/srcpkgs/gupnp-tools/template
+++ b/srcpkgs/gupnp-tools/template
@@ -3,7 +3,7 @@ pkgname=gupnp-tools
 version=0.10.0
 revision=2
 build_style=meson
-hostmakedepends="pkg-config glib-devel gobject-introspection"
+hostmakedepends="pkg-config glib-devel gobject-introspection gettext"
 makedepends="gupnp-av-devel gtk+3-devel gtksourceview4-devel
  libxml2-devel libsoup-devel"
 short_desc="Free replacements of Intel UPnP tools that use GUPnP"

From ef86c89358ee93b5a708cf3dd5f24f392ad05f03 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:58 +0200
Subject: [PATCH 0989/2561] io.elementary.icons: fix for meson 0.62

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

diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index 95dbc0ca3ddb..1e1945d0bb73 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -4,7 +4,7 @@ version=6.1.0
 revision=1
 wrksrc="icons-${version}"
 build_style=meson
-hostmakedepends="xcursorgen librsvg-utils"
+hostmakedepends="xcursorgen librsvg-utils gettext"
 # gdk-pixbuf needs librsvg to render SVG icons
 depends="librsvg"
 short_desc="Named, vector icons for elementary OS"

From a54eb25d5e8772c7b2ef5d5504d5ae1729223d2e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:34:06 +0200
Subject: [PATCH 0990/2561] quickDocs: fix for meson 0.62

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

diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template
index c4a22e6bbe7d..b2cbb667c8d1 100644
--- a/srcpkgs/quickDocs/template
+++ b/srcpkgs/quickDocs/template
@@ -3,7 +3,7 @@ pkgname=quickDocs
 version=2.2.6
 revision=2
 build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
 makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel"
 short_desc="Fast developer docs reader"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From 379405b8e0494725037f23df0a132ec92b6a73eb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:51 +0200
Subject: [PATCH 0991/2561] rygel: fix for meson 0.62

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

diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 06c85e2bcf4e..1493b825a564 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -6,7 +6,7 @@ build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=false -Dtests=false
  -Dsystemd-user-units-dir=none"
-hostmakedepends="pkg-config glib-devel vala docbook2x"
+hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
 makedepends="sqlite-devel gtk+3-devel libsoup-devel libgee08-devel
  gupnp-av-devel gupnp-dlna-devel tracker3-devel
  libmediaart-devel gssdp-devel gst1-editing-services-devel"

From 09b8be7a740f5877e7f1e3fc7b0837e93a06cd2c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:31 -0400
Subject: [PATCH 0992/2561] LimeSuite: update maintainer email

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

diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template
index 44f119784ffd..11e0af2aa637 100644
--- a/srcpkgs/LimeSuite/template
+++ b/srcpkgs/LimeSuite/template
@@ -28,7 +28,7 @@ makedepends="gnuplot wxWidgets-gtk3-devel libusb-devel SoapySDR-devel libfreeglu
  fltk-devel glew-devel sqlite-devel libgomp-devel $(vopt_if octave octave)"
 depends="wget"
 short_desc="Driver and GUI for LimeSDR/LMS7002M-based SDR platforms"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="Apache-2.0"
 homepage="https://myriadrf.org/projects/lime-suite/"
 distfiles="https://github.com/myriadrf/LimeSuite/archive/refs/tags/v${version}.tar.gz"

From 6b9d3f8db839717d1fef83b509f92a93b07762e9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:32 -0400
Subject: [PATCH 0993/2561] chezmoi: update maintainer email

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

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index abf8ff70d40f..2f0fb2f144bc 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -8,7 +8,7 @@ go_build_tags="noembeddocs noupgrade"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}
  -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps"
 short_desc="Manage your dotfiles across multiple machines, securely"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"

From dbc27859ee847e83328bcd084315ac1dca455975 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:33 -0400
Subject: [PATCH 0994/2561] helvum: update maintainer email

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

diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 5a694dc43c29..6c5e27bfefc1 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config clang libclang"
 makedepends="gtk4-devel pipewire-devel glib-devel"
 depends="pipewire"
 short_desc="GTK patchbay for pipewire"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-3.0-only"
 homepage="https://gitlab.freedesktop.org/pipewire/helvum"
 distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"

From d337b298148bbcd5e2581c8e04e58aa65fd6b017 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:34 -0400
Subject: [PATCH 0995/2561] hobbits: update maintainer email

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

diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index 42f5c20ce132..fe6c7f5adda7 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake python3"
 makedepends="fftw-devel libusb-devel libpcap-devel python3-devel qt5-devel"
 short_desc="Multi-platform GUI for bit-based analysis, processing and visualization"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT, GPL-2.0-or-later"
 homepage="https://mahlet-inc.github.io"
 changelog="https://raw.githubusercontent.com/Mahlet-Inc/hobbits/master/CHANGELOG.md"

From d6b3cadb62a2c6a7d86191633453f2089390c60c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:34 -0400
Subject: [PATCH 0996/2561] mininet: update maintainer email

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

diff --git a/srcpkgs/mininet/template b/srcpkgs/mininet/template
index 18862aeebdf8..2ea62ca31ead 100644
--- a/srcpkgs/mininet/template
+++ b/srcpkgs/mininet/template
@@ -7,7 +7,7 @@ hostmakedepends="help2man python3-setuptools"
 depends="bash ethtool inetutils-telnet iperf iproute2 iputils libcgroup-utils
  net-tools openssh openvswitch psmisc python3-tkinter socat xbitmaps xhost xterm"
 short_desc="Emulator for rapid prototyping of Software Defined Networks"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="custom:MIT-like"
 homepage="http://mininet.org/"
 changelog="http://mininet.org/blog/categories/releases/"

From 0cc06967e30a73d9c559c45d1ebc5ab5e46f3780 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:35 -0400
Subject: [PATCH 0997/2561] openjdk12-bootstrap: update maintainer email

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

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 770fce5bb07e..4861ad1efc40 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 12)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"

From 24830ace107bdfe1b539bf7f54fdfbf2a3b19632 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:35 -0400
Subject: [PATCH 0998/2561] openjdk13-bootstrap: update maintainer email

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

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index ccbafa367962..82c34b7999f3 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 13)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"

From efb828c879c283f27df6377e0d1fbc357c0fd37f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:36 -0400
Subject: [PATCH 0999/2561] openjdk14-bootstrap: update maintainer email

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

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 62011285f35d..5c15ca3f32c0 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel openjdk13-bootstrap"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 14)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"

From e896731b15a6ec628de85dd10a47a7ec48ce0280 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:37 -0400
Subject: [PATCH 1000/2561] openjdk15-bootstrap: update maintainer email

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

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 70b38621be25..efbc69f9429e 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk14-bootstrap"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 15)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz

From be5bed693018c91183c7414ab2c29f6f34b95edf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:37 -0400
Subject: [PATCH 1001/2561] openjdk16-bootstrap: update maintainer email

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

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 876bfe6de81b..9bea476c6836 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk15-bootstrap"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 16)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz

From 6a9e1efb05d2b01ce4f1510aa7f78d7abccfbe6c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:38 -0400
Subject: [PATCH 1002/2561] openjdk17: update maintainer email

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

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 43f72e4d65c0..19fa38707f00 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 depends="${pkgname}-jre-${version}_${revision}"
 provides="java-environment-${version}_1"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz

From f53a6740157ac0dd41c8d5499fb2f7a3731cb6e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:38 -0400
Subject: [PATCH 1003/2561] webhook: update maintainer email

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

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index fb8b2168566a..cf79527f9377 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -5,7 +5,7 @@ revision=1
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"
-maintainer="Abigail G <dev@kb6.ee>"
+maintainer="Abigail G <void@placeviolette.net>"
 license="MIT"
 homepage="https://github.com/adnanh/webhook"
 distfiles="https://github.com/adnanh/webhook/archive/${version}.tar.gz"

From abe3eebfec95a8392be0592ffc27a43b96833510 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Wed, 6 Apr 2022 18:39:31 +0700
Subject: [PATCH 1004/2561] vivaldi: update to 5.2.2623.24

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

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 9108f67a4d29..b7a701c92dde 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.1.2567.73
+version=5.2.2623.24
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=efc4a4d39724840cbcc78317ef1a0e5e300cb8b9d655defee8e746626f845f12
+checksum=a97eb6f3cfc9b80fd5a2f742b8d0c5af093ab6f5346552c7821129689e2485c0
 repository=nonfree
 restricted=yes
 nostrip=yes

From 6307881c42571034fb4e15793f37bfb9c6304729 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 1 Apr 2022 16:18:49 +0200
Subject: [PATCH 1005/2561] yq-go: update to 4.23.1.

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

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 67a2a5c478c3..9342a11e5deb 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.21.1
+version=4.23.1
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -11,14 +11,14 @@ license="MIT"
 homepage="https://github.com/mikefarah/yq"
 changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=27ba049e24a2f40db4010ad6574ce866fa1d43f4cb064de286e344e3c7911ef0
+checksum=f55ffb9c6d7926b06d5862eb6a9e9ea942ec2883286df8e2e3d6f0716cc36eed
 
 do_check() {
 	go test -v
 }
 
 post_install() {
-	# this came after yq 'the jq wrapper for yaml' so yq has the right tp
+	# this came after yq 'the jq wrapper for yaml' so yq has the right to
 	# /usr/bin/yq, rename it to yq-go
 	mv -v "${DESTDIR}"/usr/bin/{yq,yq-go}
 

From 2c61996c416c5a587b54701497373cfd09099aa5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 2 Apr 2022 21:55:59 -0400
Subject: [PATCH 1006/2561] arduino: update to 1.8.19.

---
 .../patches/disable-dependency-build.patch    | 225 ------------------
 srcpkgs/arduino/template                      |   4 +-
 2 files changed, 2 insertions(+), 227 deletions(-)
 delete mode 100644 srcpkgs/arduino/patches/disable-dependency-build.patch

diff --git a/srcpkgs/arduino/patches/disable-dependency-build.patch b/srcpkgs/arduino/patches/disable-dependency-build.patch
deleted file mode 100644
index 6a7144c906c4..000000000000
--- a/srcpkgs/arduino/patches/disable-dependency-build.patch
+++ /dev/null
@@ -1,225 +0,0 @@
---- Arduino-1.8.13/build/build.xml.orig	2020-12-27 20:34:41.813419495 +0100
-+++ Arduino-1.8.13/build/build.xml	2020-12-27 20:32:58.075425211 +0100
-@@ -345,7 +345,7 @@
- 
-     <!-- figure out the IDE version number in base.java -->
-     <loadfile srcfile="../arduino-core/src/processing/app/BaseNoGui.java"
--        property="revision.base">
-+	      property="revision.base">
-       <filterchain>
-         <tokenfilter>
-           <linetokenizer />
-@@ -659,14 +659,6 @@
-   </target>
- 
-   <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-5.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
--      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
--      <param name="dest_folder" value="${staging_folder}" />
--    </antcall>
--    <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
--    <chmod perm="755" file="linux/work/lib/libastylej.so" />
- 
-     <antcall target="portable-${portable}">
-       <param name="parentdir" value="linux/work" />
-@@ -684,14 +676,6 @@
-   </target>
- 
-   <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-5.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
--      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
--      <param name="dest_folder" value="${staging_folder}" />
--    </antcall>
--    <copy file="linux/libastylej-2.05.1/libastylej_arm.so" tofile="linux/work/lib/libastylej.so" />
--    <chmod perm="755" file="linux/work/lib/libastylej.so" />
- 
-     <antcall target="portable-${portable}">
-       <param name="parentdir" value="linux/work" />
-@@ -715,26 +699,9 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-arm-linux-gnueabihf.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_arm.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux-libastyle-aarch64" depends="linux-build" description="Download libastyle.so for AArch64">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-5.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
--      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
--      <param name="dest_folder" value="${staging_folder}" />
--    </antcall>
--    <copy file="linux/libastylej-2.05.1/libastylej_aarch64.so" tofile="linux/work/lib/libastylej.so" />
--    <chmod perm="755" file="linux/work/lib/libastylej.so" />
- 
-     <antcall target="portable-${portable}">
-       <param name="parentdir" value="linux/work" />
-@@ -757,15 +724,6 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_aarch64.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
-@@ -775,15 +733,6 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_386.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
-@@ -793,15 +742,6 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_amd64.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux-jvm-noop"/>
-@@ -936,7 +876,7 @@
-   </target>
- 
-   <target name="linux-dist" depends="build"
--    description="Build .tar.xz of linux version">
-+	  description="Build .tar.xz of linux version">
- 
-     <move file="linux/work" tofile="linux/arduino-${version}" />
- 
-@@ -960,23 +900,23 @@
-   </target>
- 
-   <target name="linux32-dist" depends="linux-dist"
--    description="Build .tar.xz of linux x86_32 version" />
-+	  description="Build .tar.xz of linux x86_32 version" />
- 
-   <target name="linux64-dist" depends="linux-dist"
--    description="Build .tar.xz of linux x86_64 version" />
-+	  description="Build .tar.xz of linux x86_64 version" />
- 
-   <target name="linuxarm-dist" depends="linux-dist"
--    description="Build .tar.xz of linux armhf version" />
-+	  description="Build .tar.xz of linux armhf version" />
- 
-   <target name="linuxaarch64-dist" depends="linux-dist"
--    description="Build .tar.xz of linux aarch64 version" />
-+	  description="Build .tar.xz of linux aarch64 version" />
- 
-   <!-- - - - - - - - -->
-   <!-- Windows       -->
-   <!-- - - - - - - - -->
- 
-   <target name="windows-clean" depends="subprojects-clean"
--    description="Clean windows version">
-+	  description="Clean windows version">
-     <delete dir="windows/work" />
-     <delete>
-       <fileset dir="windows" includes="arduino-*windows*.zip"/>
-@@ -1014,8 +954,8 @@
-   </target>
- 
-   <target name="windows-build"
--    depends="revision-check, windows-checkos, subprojects-build"
--    description="Build windows version">
-+	  depends="revision-check, windows-checkos, subprojects-build"
-+	  description="Build windows version">
-     <mkdir dir="windows/work" />
-     <mkdir dir="windows/work/${staging_hardware_folder}" />
- 
-@@ -1130,12 +1070,12 @@
- 
-     <property name="launch4j.dir" value="windows/launcher/launch4j/" />
-     <taskdef name="launch4j"
--       classname="net.sf.launch4j.ant.Launch4jTask"
--       classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
-+	     classname="net.sf.launch4j.ant.Launch4jTask"
-+	     classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
- 
-     <copy todir="windows/work">
-       <fileset dir="windows/launcher"
--         includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini, wrapper-manifest.xml"/>
-+	       includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini, wrapper-manifest.xml"/>
-     </copy>
-     <launch4j configFile="windows/work/config.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
-     <launch4j configFile="windows/work/config_debug.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
-@@ -1206,22 +1146,22 @@
-   <!-- - - - - - - - -->
- 
-    <target name="source-dist" depends="revision-check"
--    description="Build .tar.gz of source code">
-+	  description="Build .tar.gz of source code">
-     <input message="Enter version number:"
--     addproperty="version"
--     defaultvalue="${revision}" />
-+	   addproperty="version"
-+	   defaultvalue="${revision}" />
- 
-     <tar compression="gzip" destfile="arduino-${version}-src.tar.gz">
-       <tarfileset dir="../"
--      prefix="arduino-${version}"
--      excludes="**/*.tgz,
--           **/*.bz2,
--           **/build/macosx/,
--           **/build/windows/,
--           **/work/,
--           **/.git/,
--           **/*.class"
--      />
-+		  prefix="arduino-${version}"
-+		  excludes="**/*.tgz,
-+			     **/*.bz2,
-+			     **/build/macosx/,
-+			     **/build/windows/,
-+			     **/work/,
-+			     **/.git/,
-+			     **/*.class"
-+		  />
-     </tar>
- 
-     <echo>
-@@ -1239,7 +1179,7 @@
-   <!-- - - - - - - - -->
- 
-   <target name="clean" description="Perform a spring cleaning"
--    depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
-+	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
-   </target>
- 
-   <target name="avr-toolchain-bundle" unless="light_bundle">
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index 5d6531ec93fc..19daa0c1b1e8 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -1,6 +1,6 @@
 # Template file for 'arduino'
 pkgname=arduino
-version=1.8.13
+version=1.8.19
 revision=1
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=$pkgname-$version
@@ -15,7 +15,7 @@ homepage="http://arduino.cc/"
 distfiles="
  https://github.com/arduino/Arduino/archive/${version}.tar.gz
  ${SOURCEFORGE_SITE}/astyle/astyle_3.0.1_linux.tar.gz"
-checksum="2a2a7bf0a93d36dff2e27f50e490529f10ff73337d6a0b7b222fa6b1a529c9f7
+checksum="17839eb2a9bc7aeed3bb2a315898efdb3075ed605f98210b4a2d3b54199cc571
  6c3ab029e0e4a75e2e603d449014374aa8269218fdd03a4aaa46ab743b1912fd"
 nostrip=yes
 nocross="cross build lacks essential libraries"

From 637b3a173b7f31a4f59af5bf6c825b31581c83b9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 2 Apr 2022 21:46:52 -0400
Subject: [PATCH 1007/2561] apache-storm: update to 2.4.0.

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

diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index bcb06f4ee08b..7167174dd079 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -1,14 +1,14 @@
 # Template file for 'apache-storm'
 pkgname=apache-storm
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 depends="virtual?java-runtime python3 bash"
 short_desc="Distributed realtime computation system"
 maintainer="bougyman <bougyman@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://storm.apache.org/"
 distfiles="http://apache.osuosl.org/storm/apache-storm-${version}/apache-storm-${version}.tar.gz"
-checksum=f621163f349a8e85130bc3d2fbb34e3b08f9c039ccac5474f3724e47a3a38675
+checksum=54535c68848f05130647997f3fafe91a72bb9470a50d6d80997274d20cf1c0c6
 python_version=3
 system_accounts="storm"
 storm_homedir="/var/lib/apache-storm"

From 7ca443f1053696e161b6012d8d6d79475a0f5ad6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 22 Mar 2022 02:07:12 -0400
Subject: [PATCH 1008/2561] sunxi-tools: update to 1.4.2, adopt.

---
 srcpkgs/sunxi-tools/template | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/sunxi-tools/template b/srcpkgs/sunxi-tools/template
index f4f547c7947d..001d83851248 100644
--- a/srcpkgs/sunxi-tools/template
+++ b/srcpkgs/sunxi-tools/template
@@ -1,31 +1,17 @@
 # Template file for 'sunxi-tools'
 pkgname=sunxi-tools
-reverts=20150526_1
-version=20150226
-revision=3
-_commit=b80e7ce7bd5c2015465c2fd0e5990d47c05c7f8e
-wrksrc="$pkgname-$_commit"
-hostmakedepends="pkg-config git"
+reverts="20140125_1 20150226_1 20150226_2 20150226_3 20150526_1"
+version=1.4.2
+revision=1
+build_style="gnu-makefile"
+make_build_target="tools misc"
+make_install_target="install-tools install-misc"
+hostmakedepends="pkg-config"
 makedepends="libusb-devel"
 short_desc="Tools to help hacking Allwinner AXX (aka sunxi) based devices"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linux-sunxi/sunxi-tools"
-distfiles="$homepage/archive/$_commit.tar.gz"
-checksum=93922d654df5153d468b0f7900f96fe858fe457894ff2dd0f5dfb5c94b65475b
-
-CFLAGS="-std=c99 -I./include"
-
-do_build() {
-	make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-}
-do_install() {
-	vinstall README 644 usr/share/doc/${pkgname}
-
-	for f in fexc bootinfo fel usb-boot fel-gpio pio nand-part; do
-		vbin ${f}
-	done
-	cd ${DESTDIR}/usr/bin
-	ln -s fexc fex2bin
-	ln -s fexc bin2fex
-}
+distfiles="https://github.com/linux-sunxi/sunxi-tools/archive/refs/tags/v${version}.tar.gz"
+checksum=81f48014a520cb83cac4e17f5ae627a637c4d6a422b60c693c5a705c92e43822
+make_check=no # it's a mess

From 00cc0fe527edf4f8ef324e20a6596e109d995771 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Apr 2022 19:46:43 +0200
Subject: [PATCH 1009/2561] u-boot-tools: update to 2022.04.

---
 srcpkgs/u-boot-tools/template | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index a25b02b4e512..d6aea6282b47 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,19 +1,19 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
-version=2022.01
+version=2022.04
 revision=1
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
-make_build_args="HOSTSTRIP=: STRIP=:"
-make_build_target="tools envtools"
-hostmakedepends="bison flex"
-makedepends="openssl-devel"
+make_build_args="HOSTSTRIP=: STRIP=: NO_SDL=1"
+make_build_target="tools-all tools-only envtools"
+hostmakedepends="bison flex which"
+makedepends="openssl-devel libuuid-devel gnutls-devel ncurses-libtinfo-devel"
 short_desc="Das U-Boot tools"
 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=81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413
+checksum=68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
@@ -39,12 +39,14 @@ do_check() {
 
 do_install() {
 	ln -sf fw_printenv tools/env/fw_setenv
-	for x in dumpimage fdtgrep fit_check_sign fit_info gen_eth_addr \
-		gen_ethaddr_crc ifwitool img2srec mkenvimage mkimage proftool \
-		spl_size_limit env/fw_printenv env/fw_setenv; do
+	for x in bmp_logo dumpimage fdtgrep fit_check_sign fit_info gen_eth_addr \
+		gen_ethaddr_crc ifwitool img2srec kwboot mkeficapsule mkenvimage mkimage \
+		proftool spl_size_limit env/fw_printenv env/fw_setenv; do
 		vbin "tools/$x"
+		if [ -r "doc/${x}.1" ]; then
+			vman "doc/${x}.1"
+		fi
 	done
-	vman doc/mkimage.1
 }
 
 uboot-mkimage_package() {

From 349fd1626e029a64e64b5ff3730c9623d67775b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:09:12 -0400
Subject: [PATCH 1010/2561] cpp-utilities: update to 5.14.0.

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

diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 80d9c3228558..e4b44dd0bafc 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.13.0
+version=5.14.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=6ddca61b4ff38785a927eb5e2491e2edbf00eb8d003360f46f247cbb18eab970
+checksum=7a173bb2355a9b5fef17d3fe6795f026f58afe63b1295f8567c042422e2cde0e
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From 8fc4c52dc002b553e425dcc485c110fb23395680 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:09:45 -0400
Subject: [PATCH 1011/2561] qtutilities: update to 6.6.0.

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

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 8a7a238bc5b4..d0e2622414d5 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.3
+version=6.6.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=17b5bf0db407ff1408ba1d2be6be3fc80de5dbd3fab78f6a66f55b6c4c0b6e22
+checksum=2dda37fd6e1cd957f0a2b395ce424ca23cfc893310c0cebc82d89dc960239d13
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From ded765a10452524df6cee32ebf06f9ca859d8871 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:10:02 -0400
Subject: [PATCH 1012/2561] tagparser: update to 11.1.0.

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

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

From 603d3783f73292685e987abe807e67c6b6dba238 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:10:45 -0400
Subject: [PATCH 1013/2561] tageditor: update to 3.7.0.

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

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 52b5fc0057b1..0f9ad2024a6d 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.6.1
+version=3.7.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/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=98ad461669e4528f6eb74d3b0c7a29401a0bb90a68bc63a4b60060ec02889b09
+checksum=e3814efdb9ca9bc386b51c602f8f4f507e8698ecdaf39a5849ed1795ddaa5c38
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 96a975812efbc42f148c14bd10f0dd7738aeb430 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:18:38 -0400
Subject: [PATCH 1014/2561] openmpi: update to 4.1.3.

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

diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index 1ed46e523216..08dc6cface80 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -1,6 +1,6 @@
 # Template file for 'openmpi'
 pkgname=openmpi
-version=4.1.2
+version=4.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr
@@ -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=9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527
+checksum=3d81d04c54efb55d3871a465ffb098d8d72c1f48ff1cbaf2580eb058567c0a3b
 nocross="configure attempts to run target binaries"
 lib32disabled=yes
 

From 5c87c98ed3f18cf3810ff60e9edfad9824310014 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:19:52 -0400
Subject: [PATCH 1015/2561] python3-Pillow: update to 9.1.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 7fb866d05e78..f0df1881e241 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pillow'
 pkgname=python3-Pillow
-version=9.0.1
+version=9.1.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=6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa
+checksum=f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97
 
 post_install() {
 	vlicense LICENSE

From b60c61b527fed958d13735edf042bd945915fb31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:24:10 -0400
Subject: [PATCH 1016/2561] python3-aioamqp: update to 0.15.0.

---
 .../patches/01-python-3.10.patch              | 345 -------------
 .../patches/02-pamqp-3.1.0.patch              | 469 ------------------
 srcpkgs/python3-aioamqp/template              |   6 +-
 3 files changed, 3 insertions(+), 817 deletions(-)
 delete mode 100644 srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
 delete mode 100644 srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch

diff --git a/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch b/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
deleted file mode 100644
index 8d369bf7a6db..000000000000
--- a/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-From a3ab4768a13540e8c8f566bca990a98f96cb3802 Mon Sep 17 00:00:00 2001
-From: dzen <benoit.calvez@polyconseil.fr>
-Date: Thu, 5 Mar 2020 14:40:50 +0100
-Subject: [PATCH 1/2] Support newer Python
-
-Combines upstream commits to suppress asyncio deprecations:
-- f004c52
-- 388d38f
-- 0cdfe91
-- b4f0120
-- 23d84ca
----
- .travis.yml                            |  6 ++---
- Dockerfile                             |  2 +-
- aioamqp/__init__.py                    |  4 ++--
- aioamqp/channel.py                     |  4 ++--
- aioamqp/protocol.py                    | 33 ++++++++++++++------------
- aioamqp/tests/test_basic.py            |  2 +-
- aioamqp/tests/test_connection_close.py |  2 +-
- aioamqp/tests/test_connection_lost.py  |  2 +-
- aioamqp/tests/test_protocol.py         |  4 ++--
- docs/changelog.rst                     |  4 ++++
- docs/introduction.rst                  |  2 +-
- setup.cfg                              |  2 +-
- setup.py                               |  2 +-
- tox.ini                                |  2 +-
- 14 files changed, 39 insertions(+), 32 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index 1069e7c..9d6e4ef 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -1,10 +1,10 @@
- language: python
--dist: bionic
-+dist: focal
- python:
--- 3.5
- - 3.6
--- 3.7-dev
-+- 3.7
- - 3.8
-+- 3.9
- services:
- - rabbitmq
- env:
-diff --git a/Dockerfile b/Dockerfile
-index 7ec4545..1ea92f1 100644
---- a/Dockerfile
-+++ b/Dockerfile
-@@ -1,4 +1,4 @@
--FROM python:3.5
-+FROM python:3.9
- 
- WORKDIR /usr/src/app
- 
-diff --git a/aioamqp/__init__.py b/aioamqp/__init__.py
-index 3e67936..030e7db 100644
---- a/aioamqp/__init__.py
-+++ b/aioamqp/__init__.py
-@@ -10,7 +10,7 @@ from .version import __packagename__
- 
- 
- async def connect(host='localhost', port=None, login='guest', password='guest',
--            virtualhost='/', ssl=None, login_method='AMQPLAIN', insist=False,
-+            virtualhost='/', ssl=None, login_method='PLAIN', insist=False,
-             protocol_factory=AmqpProtocol, *, loop=None, **kwargs):
-     """Convenient method to connect to an AMQP broker
- 
-@@ -69,7 +69,7 @@ async def connect(host='localhost', port=None, login='guest', password='guest',
- 
- 
- async def from_url(
--        url, login_method='AMQPLAIN', insist=False, protocol_factory=AmqpProtocol, **kwargs):
-+        url, login_method='PLAIN', insist=False, protocol_factory=AmqpProtocol, **kwargs):
-     """ Connect to the AMQP using a single url parameter and return the client.
- 
-         For instance:
-diff --git a/aioamqp/channel.py b/aioamqp/channel.py
-index 7f0f402..b58bd5a 100644
---- a/aioamqp/channel.py
-+++ b/aioamqp/channel.py
-@@ -31,7 +31,7 @@ class Channel:
-         self.cancellation_callbacks = []
-         self.return_callback = return_callback
-         self.response_future = None
--        self.close_event = asyncio.Event(loop=self._loop)
-+        self.close_event = asyncio.Event()
-         self.cancelled_consumers = set()
-         self.last_consumer_tag = None
-         self.publisher_confirms = False
-@@ -518,7 +518,7 @@ class Channel:
-         }
-         future = self._get_waiter('basic_consume' + ctag)
-         future.set_result(results)
--        self._ctag_events[ctag] = asyncio.Event(loop=self._loop)
-+        self._ctag_events[ctag] = asyncio.Event()
- 
-     async def basic_deliver(self, frame):
-         consumer_tag = frame.consumer_tag
-diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py
-index ddf1285..4938833 100644
---- a/aioamqp/protocol.py
-+++ b/aioamqp/protocol.py
-@@ -79,8 +79,8 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             self.connection_tunning['heartbeat'] = kwargs.get('heartbeat')
- 
-         self.connecting = asyncio.Future(loop=self._loop)
--        self.connection_closed = asyncio.Event(loop=self._loop)
--        self.stop_now = asyncio.Future(loop=self._loop)
-+        self.connection_closed = asyncio.Event()
-+        self.stop_now = asyncio.Event()
-         self.state = CONNECTING
-         self.version_major = None
-         self.version_minor = None
-@@ -91,14 +91,14 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         self.server_heartbeat = None
-         self._heartbeat_timer_recv = None
-         self._heartbeat_timer_send = None
--        self._heartbeat_trigger_send = asyncio.Event(loop=self._loop)
-+        self._heartbeat_trigger_send = asyncio.Event()
-         self._heartbeat_worker = None
-         self.channels = {}
-         self.server_frame_max = None
-         self.server_channel_max = None
-         self.channels_ids_ceil = 0
-         self.channels_ids_free = set()
--        self._drain_lock = asyncio.Lock(loop=self._loop)
-+        self._drain_lock = asyncio.Lock()
- 
-     def connection_made(self, transport):
-         super().connection_made(transport)
-@@ -171,16 +171,13 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             await self.wait_closed(timeout=timeout)
- 
-     async def wait_closed(self, timeout=None):
--        await asyncio.wait_for(self.connection_closed.wait(), timeout=timeout, loop=self._loop)
-+        await asyncio.wait_for(self.connection_closed.wait(), timeout=timeout)
-         if self._heartbeat_worker is not None:
-             try:
--                await asyncio.wait_for(self._heartbeat_worker, timeout=timeout, loop=self._loop)
-+                await asyncio.wait_for(self._heartbeat_worker, timeout=timeout)
-             except asyncio.CancelledError:
-                 pass
- 
--    async def close_ok(self, frame):
--        self._stream_writer.close()
--
-     async def start_connection(self, host, port, login, password, virtualhost, ssl=False,
-             login_method='PLAIN', insist=False):
-         """Initiate a connection at the protocol level
-@@ -188,7 +185,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         """
- 
-         if login_method != 'PLAIN':
--            logger.warning('only PLAIN login_method is supported, falling back to AMQPLAIN')
-+            logger.warning('login_method %s is not supported, falling back to PLAIN', login_method)
- 
-         self._stream_writer.write(amqp_constants.PROTOCOL_HEADER)
- 
-@@ -311,12 +308,12 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             channel.connection_closed(reply_code, reply_text, exception)
- 
-     async def run(self):
--        while not self.stop_now.done():
-+        while not self.stop_now.is_set():
-             try:
-                 await self.dispatch_frame()
-             except exceptions.AmqpClosedConnection as exc:
-                 logger.info("Close connection")
--                self.stop_now.set_result(None)
-+                self.stop_now.set()
- 
-                 self._close_channels(exception=exc)
-             except Exception:  # pylint: disable=broad-except
-@@ -329,7 +326,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         the rest of the AmqpProtocol class.  This is kept around for backwards
-         compatibility purposes only.
-         """
--        await self.stop_now
-+        await self.stop_now.wait()
- 
-     async def send_heartbeat(self):
-         """Sends an heartbeat message.
-@@ -403,6 +400,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         )
-         await self._write_frame(0, request)
- 
-+    async def close_ok(self, frame):
-+        """In response to server close confirmation"""
-+        self.stop_now.set()
-+        self._stream_writer.close()
-+
-     async def server_close(self, frame):
-         """The server is closing the connection"""
-         self.state = CLOSING
-@@ -414,6 +416,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             reply_text, reply_code, class_id, method_id)
-         self._close_channels(reply_code, reply_text)
-         await self._close_ok()
-+        self.stop_now.set()
-         self._stream_writer.close()
- 
-     async def _close_ok(self):
-@@ -456,11 +459,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         await self.ensure_open()
-         try:
-             channel_id = self.channels_ids_free.pop()
--        except KeyError:
-+        except KeyError as ex:
-             assert self.server_channel_max is not None, 'connection channel-max tuning not performed'
-             # channel-max = 0 means no limit
-             if self.server_channel_max and self.channels_ids_ceil > self.server_channel_max:
--                raise exceptions.NoChannelAvailable()
-+                raise exceptions.NoChannelAvailable() from ex
-             self.channels_ids_ceil += 1
-             channel_id = self.channels_ids_ceil
-         channel = self.CHANNEL_FACTORY(self, channel_id, **kwargs)
-diff --git a/aioamqp/tests/test_basic.py b/aioamqp/tests/test_basic.py
-index d59ce19..00ec880 100644
---- a/aioamqp/tests/test_basic.py
-+++ b/aioamqp/tests/test_basic.py
-@@ -58,7 +58,7 @@ class BasicCancelTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
- 
-         result = await self.channel.publish("payload", exchange_name, routing_key='')
- 
--        await asyncio.sleep(5, loop=self.loop)
-+        await asyncio.sleep(5)
- 
-         result = await self.channel.queue_declare(queue_name, passive=True)
-         self.assertEqual(result['message_count'], 1)
-diff --git a/aioamqp/tests/test_connection_close.py b/aioamqp/tests/test_connection_close.py
-index 9491548..c5d4188 100644
---- a/aioamqp/tests/test_connection_close.py
-+++ b/aioamqp/tests/test_connection_close.py
-@@ -22,7 +22,7 @@ class CloseTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-             # TODO: remove with python <3.4.4 support
-             self.assertTrue(transport._closing)
-         # make sure those 2 tasks/futures are properly set as finished
--        await amqp.stop_now
-+        await amqp.stop_now.wait()
-         await amqp.worker
- 
-     async def test_multiple_close(self):
-diff --git a/aioamqp/tests/test_connection_lost.py b/aioamqp/tests/test_connection_lost.py
-index 21c7819..d16d51b 100644
---- a/aioamqp/tests/test_connection_lost.py
-+++ b/aioamqp/tests/test_connection_lost.py
-@@ -24,7 +24,7 @@ class ConnectionLostTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-         self.assertEqual(amqp.state, OPEN)
-         self.assertTrue(channel.is_open)
-         amqp._stream_reader._transport.close()  # this should have the same effect as the tcp connection being lost
--        await asyncio.wait_for(amqp.worker, 1, loop=self.loop)
-+        await asyncio.wait_for(amqp.worker, 1)
-         self.assertEqual(amqp.state, CLOSED)
-         self.assertFalse(channel.is_open)
-         self.assertTrue(self.callback_called)
-diff --git a/aioamqp/tests/test_protocol.py b/aioamqp/tests/test_protocol.py
-index 766a5d9..80d4187 100644
---- a/aioamqp/tests/test_protocol.py
-+++ b/aioamqp/tests/test_protocol.py
-@@ -55,7 +55,7 @@ class ProtocolTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-             connect.assert_called_once_with(
-                 insist=False,
-                 password='pass',
--                login_method='AMQPLAIN',
-+                login_method='PLAIN',
-                 login='tom',
-                 host='example.com',
-                 protocol_factory=AmqpProtocol,
-@@ -74,7 +74,7 @@ class ProtocolTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-             connect.assert_called_once_with(
-                 insist=False,
-                 password='pass',
--                login_method='AMQPLAIN',
-+                login_method='PLAIN',
-                 ssl=ssl_context,
-                 login='tom',
-                 host='example.com',
-diff --git a/docs/changelog.rst b/docs/changelog.rst
-index 0939ca4..8ac4f7b 100644
---- a/docs/changelog.rst
-+++ b/docs/changelog.rst
-@@ -4,6 +4,10 @@ Changelog
- Next release
- ------------
- 
-+ * Add support for Python 3.9.
-+ * Drop support for Python 3.5.
-+ * Fix annoying auth method warning because of a wrong defined default argument (closes #214).
-+
- Aioamqp 0.14.0
- --------------
- 
-diff --git a/docs/introduction.rst b/docs/introduction.rst
-index ec86f61..d0e183a 100644
---- a/docs/introduction.rst
-+++ b/docs/introduction.rst
-@@ -7,7 +7,7 @@ Aioamqp library is a pure-Python implementation of the AMQP 0.9.1 protocol using
- Prerequisites
- -------------
- 
--Aioamqp works only with python >= 3.5 using asyncio library.
-+Aioamqp works only with python >= 3.6 using asyncio library.
- 
- Installation
- ------------
-diff --git a/setup.cfg b/setup.cfg
-index 0ab7d0b..9a9f5ab 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,2 +1,2 @@
- [bdist_wheel]
--python-tag = py35.py36.py37.py38
-+python-tag = py36.py37.py38.py39
-diff --git a/setup.py b/setup.py
-index a740243..ea0e79f 100644
---- a/setup.py
-+++ b/setup.py
-@@ -34,10 +34,10 @@ setuptools.setup(
-         "Operating System :: OS Independent",
-         "Programming Language :: Python",
-         "Programming Language :: Python :: 3",
--        "Programming Language :: Python :: 3.5",
-         "Programming Language :: Python :: 3.6",
-         "Programming Language :: Python :: 3.7",
-         "Programming Language :: Python :: 3.8",
-+        "Programming Language :: Python :: 3.9",
-     ],
-     platforms='all',
-     license='BSD'
-diff --git a/tox.ini b/tox.ini
-index 127cc7b..a1f5fcd 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -1,5 +1,5 @@
- [tox]
--envlist = py35, py36, py37, py38
-+envlist = py36, py37, py38, py39
- skipsdist = true
- skip_missing_interpreters = true
- 
--- 
-2.34.1
-
diff --git a/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch b/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch
deleted file mode 100644
index 6f604f6746e4..000000000000
--- a/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch
+++ /dev/null
@@ -1,469 +0,0 @@
-From bb59736dc0127f3bd5b632d0531058f7d98384f1 Mon Sep 17 00:00:00 2001
-From: dzen <benoit.calvez@polyconseil.fr>
-Date: Thu, 12 Mar 2020 08:32:29 +0100
-Subject: [PATCH 2/2] Require pamqp 3.1.0
-
-Combines upstream commits:
-- 6de2e1a
-- 95cb160
-- 9f08434
----
- aioamqp/channel.py        | 114 +++++++++++++++++++-------------------
- aioamqp/frame.py          |   1 -
- aioamqp/properties.py     |   6 +-
- aioamqp/protocol.py       |  22 ++++----
- aioamqp/tests/testcase.py |   2 +-
- setup.py                  |   3 +-
- 6 files changed, 76 insertions(+), 72 deletions(-)
-
-diff --git a/aioamqp/channel.py b/aioamqp/channel.py
-index b58bd5a..b87392d 100644
---- a/aioamqp/channel.py
-+++ b/aioamqp/channel.py
-@@ -9,7 +9,7 @@ import io
- from itertools import count
- import warnings
- 
--import pamqp.specification
-+import pamqp.commands
- 
- from . import frame as amqp_frame
- from . import exceptions
-@@ -78,35 +78,35 @@ class Channel:
- 
-     async def dispatch_frame(self, frame):
-         methods = {
--            pamqp.specification.Channel.OpenOk.name: self.open_ok,
--            pamqp.specification.Channel.FlowOk.name: self.flow_ok,
--            pamqp.specification.Channel.CloseOk.name: self.close_ok,
--            pamqp.specification.Channel.Close.name: self.server_channel_close,
--
--            pamqp.specification.Exchange.DeclareOk.name: self.exchange_declare_ok,
--            pamqp.specification.Exchange.BindOk.name: self.exchange_bind_ok,
--            pamqp.specification.Exchange.UnbindOk.name: self.exchange_unbind_ok,
--            pamqp.specification.Exchange.DeleteOk.name: self.exchange_delete_ok,
--
--            pamqp.specification.Queue.DeclareOk.name: self.queue_declare_ok,
--            pamqp.specification.Queue.DeleteOk.name: self.queue_delete_ok,
--            pamqp.specification.Queue.BindOk.name: self.queue_bind_ok,
--            pamqp.specification.Queue.UnbindOk.name: self.queue_unbind_ok,
--            pamqp.specification.Queue.PurgeOk.name: self.queue_purge_ok,
--
--            pamqp.specification.Basic.QosOk.name: self.basic_qos_ok,
--            pamqp.specification.Basic.ConsumeOk.name: self.basic_consume_ok,
--            pamqp.specification.Basic.CancelOk.name: self.basic_cancel_ok,
--            pamqp.specification.Basic.GetOk.name: self.basic_get_ok,
--            pamqp.specification.Basic.GetEmpty.name: self.basic_get_empty,
--            pamqp.specification.Basic.Deliver.name: self.basic_deliver,
--            pamqp.specification.Basic.Cancel.name: self.server_basic_cancel,
--            pamqp.specification.Basic.Ack.name: self.basic_server_ack,
--            pamqp.specification.Basic.Nack.name: self.basic_server_nack,
--            pamqp.specification.Basic.RecoverOk.name: self.basic_recover_ok,
--            pamqp.specification.Basic.Return.name: self.basic_return,
--
--            pamqp.specification.Confirm.SelectOk.name: self.confirm_select_ok,
-+            pamqp.commands.Channel.OpenOk.name: self.open_ok,
-+            pamqp.commands.Channel.FlowOk.name: self.flow_ok,
-+            pamqp.commands.Channel.CloseOk.name: self.close_ok,
-+            pamqp.commands.Channel.Close.name: self.server_channel_close,
-+
-+            pamqp.commands.Exchange.DeclareOk.name: self.exchange_declare_ok,
-+            pamqp.commands.Exchange.BindOk.name: self.exchange_bind_ok,
-+            pamqp.commands.Exchange.UnbindOk.name: self.exchange_unbind_ok,
-+            pamqp.commands.Exchange.DeleteOk.name: self.exchange_delete_ok,
-+
-+            pamqp.commands.Queue.DeclareOk.name: self.queue_declare_ok,
-+            pamqp.commands.Queue.DeleteOk.name: self.queue_delete_ok,
-+            pamqp.commands.Queue.BindOk.name: self.queue_bind_ok,
-+            pamqp.commands.Queue.UnbindOk.name: self.queue_unbind_ok,
-+            pamqp.commands.Queue.PurgeOk.name: self.queue_purge_ok,
-+
-+            pamqp.commands.Basic.QosOk.name: self.basic_qos_ok,
-+            pamqp.commands.Basic.ConsumeOk.name: self.basic_consume_ok,
-+            pamqp.commands.Basic.CancelOk.name: self.basic_cancel_ok,
-+            pamqp.commands.Basic.GetOk.name: self.basic_get_ok,
-+            pamqp.commands.Basic.GetEmpty.name: self.basic_get_empty,
-+            pamqp.commands.Basic.Deliver.name: self.basic_deliver,
-+            pamqp.commands.Basic.Cancel.name: self.server_basic_cancel,
-+            pamqp.commands.Basic.Ack.name: self.basic_server_ack,
-+            pamqp.commands.Basic.Nack.name: self.basic_server_nack,
-+            pamqp.commands.Basic.RecoverOk.name: self.basic_recover_ok,
-+            pamqp.commands.Basic.Return.name: self.basic_return,
-+
-+            pamqp.commands.Confirm.SelectOk.name: self.confirm_select_ok,
-         }
- 
-         if frame.name not in methods:
-@@ -144,7 +144,7 @@ class Channel:
- 
-     async def open(self):
-         """Open the channel on the server."""
--        request = pamqp.specification.Channel.Open()
-+        request = pamqp.commands.Channel.Open()
-         return (await self._write_frame_awaiting_response(
-             'open', self.channel_id, request, no_wait=False, check_open=False))
- 
-@@ -159,7 +159,7 @@ class Channel:
-         if not self.is_open:
-             raise exceptions.ChannelClosed("channel already closed or closing")
-         self.close_event.set()
--        request = pamqp.specification.Channel.Close(reply_code, reply_text, class_id=0, method_id=0)
-+        request = pamqp.commands.Channel.Close(reply_code, reply_text, class_id=0, method_id=0)
-         return (await self._write_frame_awaiting_response(
-             'close', self.channel_id, request, no_wait=False, check_open=False))
- 
-@@ -169,7 +169,7 @@ class Channel:
-         self.protocol.release_channel_id(self.channel_id)
- 
-     async def _send_channel_close_ok(self):
--        request = pamqp.specification.Channel.CloseOk()
-+        request = pamqp.commands.Channel.CloseOk()
-         await self._write_frame(self.channel_id, request)
- 
-     async def server_channel_close(self, frame):
-@@ -183,7 +183,7 @@ class Channel:
-         self.connection_closed(results['reply_code'], results['reply_text'])
- 
-     async def flow(self, active):
--        request = pamqp.specification.Channel.Flow(active)
-+        request = pamqp.commands.Channel.Flow(active)
-         return (await self._write_frame_awaiting_response(
-             'flow', self.channel_id, request, no_wait=False,
-             check_open=False))
-@@ -201,7 +201,7 @@ class Channel:
- 
-     async def exchange_declare(self, exchange_name, type_name, passive=False, durable=False,
-                          auto_delete=False, no_wait=False, arguments=None):
--        request = pamqp.specification.Exchange.Declare(
-+        request = pamqp.commands.Exchange.Declare(
-             exchange=exchange_name,
-             exchange_type=type_name,
-             passive=passive,
-@@ -222,7 +222,7 @@ class Channel:
-         return future
- 
-     async def exchange_delete(self, exchange_name, if_unused=False, no_wait=False):
--        request = pamqp.specification.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait)
-+        request = pamqp.commands.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait)
-         return await self._write_frame_awaiting_response(
-             'exchange_delete', self.channel_id, request, no_wait)
- 
-@@ -235,7 +235,7 @@ class Channel:
-                       no_wait=False, arguments=None):
-         if arguments is None:
-             arguments = {}
--        request = pamqp.specification.Exchange.Bind(
-+        request = pamqp.commands.Exchange.Bind(
-             destination=exchange_destination,
-             source=exchange_source,
-             routing_key=routing_key,
-@@ -255,7 +255,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Exchange.Unbind(
-+        request = pamqp.commands.Exchange.Unbind(
-             destination=exchange_destination,
-             source=exchange_source,
-             routing_key=routing_key,
-@@ -297,7 +297,7 @@ class Channel:
- 
-         if not queue_name:
-             queue_name = 'aioamqp.gen-' + str(uuid.uuid4())
--        request = pamqp.specification.Queue.Declare(
-+        request = pamqp.commands.Queue.Declare(
-             queue=queue_name,
-             passive=passive,
-             durable=durable,
-@@ -327,7 +327,7 @@ class Channel:
-                if_empty:       bool, the queue is deleted if it has no messages. Raise if not.
-                no_wait:        bool, if set, the server will not respond to the method
-         """
--        request = pamqp.specification.Queue.Delete(
-+        request = pamqp.commands.Queue.Delete(
-             queue=queue_name,
-             if_unused=if_unused,
-             if_empty=if_empty,
-@@ -346,7 +346,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Queue.Bind(
-+        request = pamqp.commands.Queue.Bind(
-             queue=queue_name,
-             exchange=exchange_name,
-             routing_key=routing_key,
-@@ -367,7 +367,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Queue.Unbind(
-+        request = pamqp.commands.Queue.Unbind(
-             queue=queue_name,
-             exchange=exchange_name,
-             routing_key=routing_key,
-@@ -383,7 +383,7 @@ class Channel:
-         logger.debug("Queue unbound")
- 
-     async def queue_purge(self, queue_name, no_wait=False):
--        request = pamqp.specification.Queue.Purge(
-+        request = pamqp.commands.Queue.Purge(
-             queue=queue_name, nowait=no_wait
-         )
-         return (await self._write_frame_awaiting_response(
-@@ -406,7 +406,7 @@ class Channel:
-         if properties is None:
-             properties = {}
- 
--        method_request = pamqp.specification.Basic.Publish(
-+        method_request = pamqp.commands.Basic.Publish(
-             exchange=exchange_name,
-             routing_key=routing_key,
-             mandatory=mandatory,
-@@ -417,7 +417,7 @@ class Channel:
- 
-         header_request = pamqp.header.ContentHeader(
-             body_size=len(payload),
--            properties=pamqp.specification.Basic.Properties(**properties)
-+            properties=pamqp.commands.Basic.Properties(**properties)
-         )
-         await self._write_frame(self.channel_id, header_request, drain=False)
- 
-@@ -446,7 +446,7 @@ class Channel:
-                                 settings should apply per-consumer channel; and global=true to mean
-                                 that the QoS settings should apply per-channel.
-         """
--        request = pamqp.specification.Basic.Qos(
-+        request = pamqp.commands.Basic.Qos(
-             prefetch_size, prefetch_count, connection_global
-         )
-         return (await self._write_frame_awaiting_response(
-@@ -490,7 +490,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Basic.Consume(
-+        request = pamqp.commands.Basic.Consume(
-             queue=queue_name,
-             consumer_tag=consumer_tag,
-             no_local=no_local,
-@@ -561,7 +561,7 @@ class Channel:
-                              callback, error)
- 
-     async def basic_cancel(self, consumer_tag, no_wait=False):
--        request = pamqp.specification.Basic.Cancel(consumer_tag, no_wait)
-+        request = pamqp.commands.Basic.Cancel(consumer_tag, no_wait)
-         return (await self._write_frame_awaiting_response(
-             'basic_cancel', self.channel_id, request, no_wait=no_wait)
-         )
-@@ -575,7 +575,7 @@ class Channel:
-         logger.debug("Cancel ok")
- 
-     async def basic_get(self, queue_name='', no_ack=False):
--        request = pamqp.specification.Basic.Get(queue=queue_name, no_ack=no_ack)
-+        request = pamqp.commands.Basic.Get(queue=queue_name, no_ack=no_ack)
-         return (await self._write_frame_awaiting_response(
-             'basic_get', self.channel_id, request, no_wait=False)
-         )
-@@ -606,11 +606,11 @@ class Channel:
-         future.set_exception(exceptions.EmptyQueue)
- 
-     async def basic_client_ack(self, delivery_tag, multiple=False):
--        request = pamqp.specification.Basic.Ack(delivery_tag, multiple)
-+        request = pamqp.commands.Basic.Ack(delivery_tag, multiple)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_client_nack(self, delivery_tag, multiple=False, requeue=True):
--        request = pamqp.specification.Basic.Nack(delivery_tag, multiple, requeue)
-+        request = pamqp.commands.Basic.Nack(delivery_tag, multiple, requeue)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_server_ack(self, frame):
-@@ -620,15 +620,15 @@ class Channel:
-         fut.set_result(True)
- 
-     async def basic_reject(self, delivery_tag, requeue=False):
--        request = pamqp.specification.Basic.Reject(delivery_tag, requeue)
-+        request = pamqp.commands.Basic.Reject(delivery_tag, requeue)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_recover_async(self, requeue=True):
--        request = pamqp.specification.Basic.RecoverAsync(requeue)
-+        request = pamqp.commands.Basic.RecoverAsync(requeue)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_recover(self, requeue=True):
--        request = pamqp.specification.Basic.Recover(requeue)
-+        request = pamqp.commands.Basic.Recover(requeue)
-         return (await self._write_frame_awaiting_response(
-             'basic_recover', self.channel_id, request, no_wait=False)
-         )
-@@ -681,7 +681,7 @@ class Channel:
-             delivery_tag = next(self.delivery_tag_iter)  # pylint: disable=stop-iteration-return
-             fut = self._set_waiter('basic_server_ack_{}'.format(delivery_tag))
- 
--        method_request = pamqp.specification.Basic.Publish(
-+        method_request = pamqp.commands.Basic.Publish(
-             exchange=exchange_name,
-             routing_key=routing_key,
-             mandatory=mandatory,
-@@ -689,7 +689,7 @@ class Channel:
-         )
-         await self._write_frame(self.channel_id, method_request, drain=False)
- 
--        properties = pamqp.specification.Basic.Properties(**properties)
-+        properties = pamqp.commands.Basic.Properties(**properties)
-         header_request = pamqp.header.ContentHeader(
-             body_size=len(payload), properties=properties
-         )
-@@ -710,7 +710,7 @@ class Channel:
-     async def confirm_select(self, *, no_wait=False):
-         if self.publisher_confirms:
-             raise ValueError('publisher confirms already enabled')
--        request = pamqp.specification.Confirm.Select(nowait=no_wait)
-+        request = pamqp.commands.Confirm.Select(nowait=no_wait)
- 
-         return (await self._write_frame_awaiting_response(
-             'confirm_select', self.channel_id, request, no_wait)
-diff --git a/aioamqp/frame.py b/aioamqp/frame.py
-index d70cfd7..af27ab5 100644
---- a/aioamqp/frame.py
-+++ b/aioamqp/frame.py
-@@ -42,7 +42,6 @@ import asyncio
- import socket
- 
- import pamqp.encode
--import pamqp.specification
- import pamqp.frame
- 
- from . import exceptions
-diff --git a/aioamqp/properties.py b/aioamqp/properties.py
-index 56a3484..4232040 100644
---- a/aioamqp/properties.py
-+++ b/aioamqp/properties.py
-@@ -1,4 +1,6 @@
- # pylint: disable=redefined-builtin
-+import datetime
-+
- from .constants import MESSAGE_PROPERTIES
- 
- 
-@@ -37,7 +39,9 @@ def from_pamqp(instance):
-     props.reply_to = instance.reply_to
-     props.expiration = instance.expiration
-     props.message_id = instance.message_id
--    props.timestamp = instance.timestamp
-+    if instance.timestamp is not None:
-+        # pamqp uses naive datetimes representing UTC, let's use TZ-aware datetimes
-+        props.timestamp = instance.timestamp.replace(tzinfo=datetime.timezone.utc)
-     props.message_type = instance.message_type
-     props.user_id = instance.user_id
-     props.app_id = instance.app_id
-diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py
-index 4938833..6465400 100644
---- a/aioamqp/protocol.py
-+++ b/aioamqp/protocol.py
-@@ -5,9 +5,9 @@
- import asyncio
- import logging
- 
-+import pamqp.commands
- import pamqp.frame
- import pamqp.heartbeat
--import pamqp.specification
- 
- from . import channel as amqp_channel
- from . import constants as amqp_constants
-@@ -159,7 +159,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         """Close connection (and all channels)"""
-         await self.ensure_open()
-         self.state = CLOSING
--        request = pamqp.specification.Connection.Close(
-+        request = pamqp.commands.Connection.Close(
-             reply_code=0,
-             reply_text='',
-             class_id=0,
-@@ -251,11 +251,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         """Dispatch the received frame to the corresponding handler"""
- 
-         method_dispatch = {
--            pamqp.specification.Connection.Close.name: self.server_close,
--            pamqp.specification.Connection.CloseOk.name: self.close_ok,
--            pamqp.specification.Connection.Tune.name: self.tune,
--            pamqp.specification.Connection.Start.name: self.start,
--            pamqp.specification.Connection.OpenOk.name: self.open_ok,
-+            pamqp.commands.Connection.Close.name: self.server_close,
-+            pamqp.commands.Connection.CloseOk.name: self.close_ok,
-+            pamqp.commands.Connection.Tune.name: self.tune,
-+            pamqp.commands.Connection.Start.name: self.start,
-+            pamqp.commands.Connection.OpenOk.name: self.open_ok,
-         }
-         if frame_channel is None and frame is None:
-             frame_channel, frame = await self.get_frame()
-@@ -392,7 +392,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         def credentials():
-             return '\0{LOGIN}\0{PASSWORD}'.format(**auth)
- 
--        request = pamqp.specification.Connection.StartOk(
-+        request = pamqp.commands.Connection.StartOk(
-             client_properties=client_properties,
-             mechanism=mechanism,
-             locale=locale,
-@@ -420,7 +420,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         self._stream_writer.close()
- 
-     async def _close_ok(self):
--        request = pamqp.specification.Connection.CloseOk()
-+        request = pamqp.commands.Connection.CloseOk()
-         await self._write_frame(0, request)
- 
-     async def tune(self, frame):
-@@ -429,7 +429,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         self.server_heartbeat = frame.heartbeat
- 
-     async def tune_ok(self, channel_max, frame_max, heartbeat):
--        request = pamqp.specification.Connection.TuneOk(
-+        request = pamqp.commands.Connection.TuneOk(
-             channel_max, frame_max, heartbeat
-         )
-         await self._write_frame(0, request)
-@@ -439,7 +439,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
- 
-     async def open(self, virtual_host, capabilities='', insist=False):
-         """Open connection to virtual host."""
--        request = pamqp.specification.Connection.Open(
-+        request = pamqp.commands.Connection.Open(
-             virtual_host, capabilities, insist
-         )
-         await self._write_frame(0, request)
-diff --git a/aioamqp/tests/testcase.py b/aioamqp/tests/testcase.py
-index 120104b..d6d702b 100644
---- a/aioamqp/tests/testcase.py
-+++ b/aioamqp/tests/testcase.py
-@@ -147,7 +147,7 @@ class RabbitTestCaseMixin:
-         if amqp is None:
-             amqp = self.amqp
- 
--        server_version = tuple(int(x) for x in amqp.server_properties['version'].decode().split('.'))
-+        server_version = tuple(int(x) for x in amqp.server_properties['version'].split('.'))
-         return server_version
- 
-     async def check_exchange_exists(self, exchange_name):
-diff --git a/setup.py b/setup.py
-index ea0e79f..1d0e923 100644
---- a/setup.py
-+++ b/setup.py
-@@ -25,8 +25,9 @@ setuptools.setup(
-         'aioamqp',
-     ],
-     install_requires=[
--        'pamqp>=2.2.0,<3',
-+        'pamqp>=3.1.0',
-     ],
-+    python_requires=">=3.6",
-     classifiers=[
-         "Development Status :: 4 - Beta",
-         "Intended Audience :: Developers",
--- 
-2.34.1
-
diff --git a/srcpkgs/python3-aioamqp/template b/srcpkgs/python3-aioamqp/template
index e85e1bcdf143..63f195e85343 100644
--- a/srcpkgs/python3-aioamqp/template
+++ b/srcpkgs/python3-aioamqp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aioamqp'
 pkgname=python3-aioamqp
-version=0.14.0
-revision=4
+version=0.15.0
+revision=1
 wrksrc="aioamqp-aioamqp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/polyconseil/aioamqp"
 distfiles="${homepage}/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=9fce69be1ed9bcc06b74683094f738556305215a1affd0fd7789c23a01c53ecd
+checksum=4d30fe210c742496b5b78de0337f49524571240701eb6c2dc348b1b9d8f819a9
 # Tests require unpackaged asynctest package
 make_check=no
 

From cc955012e9cefdcbd916dcff508158950c9c90bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:32:20 -0400
Subject: [PATCH 1017/2561] python3-hypothesis: update to 6.41.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 df2addcb45d0..d214e0ec6b62 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.40.0
+version=6.41.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=e68589666b903461e7437ea49043a7bd09a6e2cfd1cc32970b4ee19ffe2ed434
+checksum=0fa002e65956bedead5149d2ffa5875cbcb5ca1a3f95301fcf2ad5a241829d91
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From f0a13b809b08f3878ccc1c2f62ce6b66524738c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 22:43:05 -0400
Subject: [PATCH 1018/2561] python3-pandas: update to 1.4.2.

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

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index c538445fc056..b1f2f60e6da7 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.4.1
+version=1.4.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=123bf45a5d7fbd2980d2e4c348f6913406970f1558658e7f221324234c6c4825
+checksum=e2d97255e7cd13b3d3931b49f7be50055e02ca6dff60a68e403b125f8f85c4d2
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
@@ -26,8 +26,8 @@ do_check() {
 	# S3 tests seem to require python3-pytest-xdist
 	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest pandas \
 		--skip-slow --skip-network --skip-db -x -r EX \
-		--ignore pandas/tests/io/parser/test_network.py \
-		-m 'not single' -k 'not test_raw_roundtrip and not _s3'
+		--ignore pandas/tests/io/parser/test_network.py -m 'not single' \
+		-k 'not test_raw_roundtrip and not _s3 and not test_show_versions'
 }
 
 post_install() {

From 72190eb452963f2a6b74ecced8fe22a614683b01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 22:45:13 -0400
Subject: [PATCH 1019/2561] python3-pybind11: update to 2.9.2.

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

diff --git a/srcpkgs/python3-pybind11/template b/srcpkgs/python3-pybind11/template
index 9d757b052b81..b0d551b293e4 100644
--- a/srcpkgs/python3-pybind11/template
+++ b/srcpkgs/python3-pybind11/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pybind11'
 pkgname=python3-pybind11
-version=2.9.1
+version=2.9.2
 revision=1
 wrksrc="pybind11-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pybind/pybind11"
 distfiles="https://github.com/pybind/pybind11/archive/v${version}.tar.gz"
-checksum=c6160321dc98e6e1184cc791fbeadd2907bb4a0ce0e447f2ea4ff8ab56550913
+checksum=6bd528c4dbe2276635dc787b6b1f2e5316cf6b49ee3e150264e455a0d68d19c1
 
 post_patch() {
 	# These dependencies are not packaged and don't affect the man page

From 3c3c85fb1f9215db8583269d3a9e549bf9718981 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Apr 2022 11:45:56 -0400
Subject: [PATCH 1020/2561] python3-prompt_toolkit: update to 3.0.29.

---
 .../patches/dont-handle-sigint.patch          | 51 +++++++++++++++++--
 srcpkgs/python3-prompt_toolkit/template       |  6 +--
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch b/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch
index 60ce287a63d1..4bcca9d16921 100644
--- a/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch
+++ b/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch
@@ -5,9 +5,10 @@ See:
  - https://github.com/prompt-toolkit/python-prompt-toolkit/issues/1576
  - https://trac.sagemath.org/ticket/33360#comment:3
 
---- a/prompt_toolkit/application/application.py	2022-02-11 05:06:37.000000000 -0300
-+++ b/prompt_toolkit/application/application.py	2022-02-21 10:43:13.828058001 -0300
-@@ -634,7 +634,7 @@
+diff -ur a/src/prompt_toolkit/application/application.py b/src/prompt_toolkit/application/application.py
+--- a/src/prompt_toolkit/application/application.py
++++ b/src/prompt_toolkit/application/application.py
+@@ -633,7 +633,7 @@
          self,
          pre_run: Optional[Callable[[], None]] = None,
          set_exception_handler: bool = True,
@@ -16,7 +17,7 @@ See:
          slow_callback_duration: float = 0.5,
      ) -> _AppResult:
          """
-@@ -859,7 +859,7 @@
+@@ -858,7 +858,7 @@
          self,
          pre_run: Optional[Callable[[], None]] = None,
          set_exception_handler: bool = True,
@@ -25,3 +26,45 @@ See:
          in_thread: bool = False,
      ) -> _AppResult:
          """
+diff -ur a/src/prompt_toolkit/application/dummy.py b/src/prompt_toolkit/application/dummy.py
+--- a/src/prompt_toolkit/application/dummy.py
++++ b/src/prompt_toolkit/application/dummy.py
+@@ -24,7 +24,7 @@
+         self,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+         in_thread: bool = False,
+     ) -> None:
+         raise NotImplementedError("A DummyApplication is not supposed to run.")
+@@ -33,7 +33,7 @@
+         self,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+         slow_callback_duration: float = 0.5,
+     ) -> None:
+         raise NotImplementedError("A DummyApplication is not supposed to run.")
+diff -ur a/src/prompt_toolkit/shortcuts/prompt.py b/src/prompt_toolkit/shortcuts/prompt.py
+--- a/src/prompt_toolkit/shortcuts/prompt.py
++++ b/src/prompt_toolkit/shortcuts/prompt.py
+@@ -900,7 +900,7 @@
+         accept_default: bool = False,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+         in_thread: bool = False,
+     ) -> _T:
+         """
+@@ -1135,7 +1135,7 @@
+         accept_default: bool = False,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+     ) -> _T:
+ 
+         if message is not None:
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 26bcb33e82bc..27fdeb83dab2 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.28
-revision=2
+version=3.0.29
+revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=9f1cd16b1e86c2968f2519d7fb31dd9d669916f515612c269d14e9ed52b51650
+checksum=bd640f60e8cecd74f0dc249713d433ace2ddc62b65ee07f96d358e0b152b6ea7
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From b4ed39ac8bbe150967c39646ebca93df26c87234 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Apr 2022 11:50:08 -0400
Subject: [PATCH 1021/2561] python3-ultrajson: update to 5.2.0.

---
 .../python3-ultrajson/patches/no-strip.patch    | 17 -----------------
 srcpkgs/python3-ultrajson/template              |  6 ++++--
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/python3-ultrajson/patches/no-strip.patch

diff --git a/srcpkgs/python3-ultrajson/patches/no-strip.patch b/srcpkgs/python3-ultrajson/patches/no-strip.patch
deleted file mode 100644
index 50fb8f8339c3..000000000000
--- a/srcpkgs/python3-ultrajson/patches/no-strip.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Effectively reverts
-
-    https://github.com/ultrajson/ultrajson/commit/682c6601569980e9a8a05378d3c1478db30384bc
-
-to preserve a meaningful debug package.
-
---- a/setup.py
-+++ b/setup.py
-@@ -20,7 +20,7 @@
-     ],
-     include_dirs=["./python", "./lib", "./deps/double-conversion/double-conversion"],
-     extra_compile_args=["-D_GNU_SOURCE"],
--    extra_link_args=["-lstdc++", "-lm"] + strip_flags,
-+    extra_link_args=["-lstdc++", "-lm"],
- )
- 
- with open("python/version_template.h") as f:
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 848f27d41e56..e7b0dd021f5a 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=5.1.0
+version=5.2.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,9 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=a88944d2f99db71a3ca0c63d81f37e55b660edde0b07216fb65a3e46403ef004
+checksum=163191b88842d874e081707d35de2e205e0e396e70fd068d1038879bca8b17ad
+
+export UJSON_BUILD_NO_STRIP=1
 
 post_install() {
 	vlicense LICENSE.txt

From a3f0e9e8013030a40fda4d93637b37f9d81505db Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Apr 2022 20:58:09 +0200
Subject: [PATCH 1022/2561] u-boot-tools: fix cross and musl builds

---
 srcpkgs/u-boot-tools/patches/musl.patch | 10 ++++++++++
 srcpkgs/u-boot-tools/template           |  5 +++++
 2 files changed, 15 insertions(+)
 create mode 100644 srcpkgs/u-boot-tools/patches/musl.patch

diff --git a/srcpkgs/u-boot-tools/patches/musl.patch b/srcpkgs/u-boot-tools/patches/musl.patch
new file mode 100644
index 000000000000..7cf89c52b8fb
--- /dev/null
+++ b/srcpkgs/u-boot-tools/patches/musl.patch
@@ -0,0 +1,10 @@
+--- a/tools/termios_linux.h
++++ b/tools/termios_linux.h
+@@ -30,6 +30,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <asm/termbits.h>
++#include <asm/ioctls.h>
+ 
+ #if defined(BOTHER) && defined(TCGETS2)
+ #define termios termios2
diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index d6aea6282b47..e7efda468852 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -17,6 +17,7 @@ checksum=68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	hostmakedepends+=" u-boot-tools"
 fi
 
 post_extract() {
@@ -25,6 +26,10 @@ post_extract() {
 		-i include/env.h \
 		-i tools/mkimage.h \
 		-i tools/proftool.c
+
+	if [ "$CROSS_BUILD" ]; then
+		vsed -e 's;^\t$(obj)/bmp_logo;\tbmp_logo;g' -i tools/Makefile
+	fi
 }
 
 do_configure() {

From 3fa723207af0a95050b4e9e9ba96af3602e08288 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Apr 2022 21:29:45 +0200
Subject: [PATCH 1023/2561] u-boot-tools: fix parallel build issues

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

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index e7efda468852..e3908d65dfc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -36,6 +36,12 @@ do_configure() {
 	make ${makejobs} ${make_build_args} tools-only_defconfig
 }
 
+do_build() {
+	make ${makejobs} ${make_build_args} tools-all
+	make ${makejobs} ${make_build_args} tools-only
+	make ${makejobs} ${make_build_args} envtools
+}
+
 do_check() {
 	# skip tests for now. requires some gymnastics to make the python scripts
 	# find libfdt. the most useful target appears to be "make tcheck"

From 6f8d78ccfc4e4f43d8d4307f49abe361dd1e0674 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Apr 2022 22:12:49 +0200
Subject: [PATCH 1024/2561] pylint: update to 2.13.5.

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

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 54af1e2f085d..2d53ba7420f1 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,6 +1,6 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.13.4
+version=2.13.5
 revision=1
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=34a5550bfe94f4ba04eee95367572224bc16dbd2456b3ece5fb92e15399f6cd8
+checksum=5450fd8014baf1663fb4860b7e1dc4f4c4eb9649598a210d68e97be0973c783f
 
 post_install() {
 	# install example config and emacs files

From b61b6e5e586ed08b025a4c4a264d668194343a3e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Apr 2022 22:17:27 +0200
Subject: [PATCH 1025/2561] lagrange: update to 1.12.1.

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

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 41a9f935f8eb..16787f411ee0 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.11.2
+version=1.12.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=4e9a9ed38bcfc7b04856f0e2667d7afd535a8e06e367e2e4368ef5fb9105791f
+checksum=8a342d9b7e980cd6d9771d72215dd543d411721685fb60fc2202e300cb5d6483
 
 post_install() {
 	vlicense LICENSE.md

From 9ecc0d2323fc8c367736ed59c1e62837da4cdb1f Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 31 Mar 2022 18:41:05 +0200
Subject: [PATCH 1026/2561] instaloader: update to 4.9.

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

diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 2252042b2091..9c5bed15f2ea 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8.4
+version=4.9
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=9615a12a5a01a8b6c9d99a2a047b21d81b341cfd77656b9261bda30ece0cd562
+checksum=7fa6147810eedcc1dedcdec8cfa1f220c9379ab8faeab6a336a7c181d944e2e4
 
 post_install() {
 	vlicense LICENSE

From 9c69aa04946bd2ca958ceef43ba5356cfd98d1e7 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 3 Apr 2022 16:22:31 +0200
Subject: [PATCH 1027/2561] pipe-viewer: update to 0.2.0.

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

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index 3797428bc415..670d4181ab17 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.1.8
+version=0.2.0
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,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=b8f722cdddf0686bb75676b5baa850c1101b54f9c32f562eaac04a6e1863fb8d
+checksum=3913ecfaa3006f645603fb76df9962829138ca62d4b0acaf8b8d4d2e58902f64
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From c8d81af562aef6bfa6b2e3a0e05c3179812d88bf Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Mon, 4 Apr 2022 20:44:14 -0700
Subject: [PATCH 1028/2561] runc: update to 1.1.1

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

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 2e40b2647d20..182e20b99857 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,6 +1,6 @@
 # Template file for 'runc'
 pkgname=runc
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=go
 go_import_path=github.com/opencontainers/runc
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/opencontainers/runc"
 distfiles="https://github.com/opencontainers/runc/releases/download/v${version}/runc.tar.xz"
-checksum=152e8975793aa45a6717e367bd1652f8147728d25adad339d2f70c4fd2ddc623
+checksum=75c1f0bb19b209412c52599e24b33ac306cf7caf772c97577b7ebe964837a54b
 
 post_build() {
 	make man

From 1f43bcfff0848dbe095476c4a8ad748466bd6375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 3 Apr 2022 21:57:24 +0200
Subject: [PATCH 1029/2561] sslscan: update to 2.0.13.

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

diff --git a/srcpkgs/sslscan/template b/srcpkgs/sslscan/template
index 6d9ceca254a2..2c19a8a0dc7d 100644
--- a/srcpkgs/sslscan/template
+++ b/srcpkgs/sslscan/template
@@ -1,6 +1,6 @@
 # Template file for 'sslscan'
 pkgname=sslscan
-version=2.0.12
+version=2.0.13
 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=6eeda19f564635818d6dd20a1e93174484d62acb24eca8944df07496d32b9c65
+checksum=34549613e16ba5dbfca3d988672041b7b0ece6f408515d6ba8819e2d804b5833
 # No test suite
 make_check=no

From 9d54979e6e938e3b43add100f076e2391be1b0f3 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 14:40:04 -0700
Subject: [PATCH 1030/2561] python3-pluggy: update to 1.0.0

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

diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template
index efaa7e25d2a7..fa49c9826db0 100644
--- a/srcpkgs/python3-pluggy/template
+++ b/srcpkgs/python3-pluggy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pluggy'
 pkgname=python3-pluggy
-version=0.13.1
-revision=7
+version=1.0.0
+revision=1
 wrksrc="pluggy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -12,9 +12,12 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://github.com/pytest-dev/pluggy"
 distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
+checksum=4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159
 
 do_check() {
+	# Must export PYTHONPATH so subprocesses see the variable
+	local _pypath="${PYTHONPATH}"
+	export PYTHONPATH="${PWD}/src:${PYTHONPATH}"
 	python3 -m pytest
 }
 

From e03135123b9baec2a127e4ca4e315ed9d466d4fb Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:54:44 -0700
Subject: [PATCH 1031/2561] New package: python3-lsp-jsonrpc-1.0.0

---
 srcpkgs/python3-lsp-jsonrpc/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-lsp-jsonrpc/template

diff --git a/srcpkgs/python3-lsp-jsonrpc/template b/srcpkgs/python3-lsp-jsonrpc/template
new file mode 100644
index 000000000000..1455aa108797
--- /dev/null
+++ b/srcpkgs/python3-lsp-jsonrpc/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-lsp-jsonrpc'
+pkgname=python3-lsp-jsonrpc
+version=1.0.0
+revision=1
+wrksrc="${pkgname/3}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-ultrajson"
+checkdepends="python3-pytest python3-pytest-cov"
+short_desc="Python server implementation of the JSON RPC 2.0 protocol"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="MIT"
+homepage="https://github.com/python-lsp/python-lsp-jsonrpc"
+distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
+checksum=7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd
+
+post_install() {
+	vlicense LICENSE
+}
+
+do_check() {
+	python3 -m pytest --ignore=test/test_streams.py
+}

From b486f7aba837c8a9ef801b99a521eeadaa891a81 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:53:38 -0700
Subject: [PATCH 1032/2561] New package: python3-lsp-server-1.4.1

Substitute for python3-language-server

Fixes #34192
---
 srcpkgs/python3-language-server               |  1 +
 .../patches/jedi_compat.patch                 | 37 -----------------
 srcpkgs/python3-language-server/template      | 30 --------------
 srcpkgs/python3-lsp-server/template           | 40 +++++++++++++++++++
 4 files changed, 41 insertions(+), 67 deletions(-)
 create mode 120000 srcpkgs/python3-language-server
 delete mode 100644 srcpkgs/python3-language-server/patches/jedi_compat.patch
 delete mode 100644 srcpkgs/python3-language-server/template
 create mode 100644 srcpkgs/python3-lsp-server/template

diff --git a/srcpkgs/python3-language-server b/srcpkgs/python3-language-server
new file mode 120000
index 000000000000..9054a5e99f7e
--- /dev/null
+++ b/srcpkgs/python3-language-server
@@ -0,0 +1 @@
+python3-lsp-server
\ No newline at end of file
diff --git a/srcpkgs/python3-language-server/patches/jedi_compat.patch b/srcpkgs/python3-language-server/patches/jedi_compat.patch
deleted file mode 100644
index 52e7e3c59abe..000000000000
--- a/srcpkgs/python3-language-server/patches/jedi_compat.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/palantir/python-language-server/pull/901
-
-From: bnavigator <code@bnavigator.de>
-Date: Tue, 5 Jan 2021 01:17:33 +0100
-Subject: [PATCH] bump jedi compatibility: compare to Path-like object
-
----
- pyls/plugins/symbols.py | 2 +-
- setup.py                | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pyls/plugins/symbols.py b/pyls/plugins/symbols.py
-index 6468dd83..69a09fe9 100644
---- a/pyls/plugins/symbols.py
-+++ b/pyls/plugins/symbols.py
-@@ -37,7 +37,7 @@ def pyls_document_symbols(config, document):
-                         not sym_full_name.startswith('__main__')):
-                     continue
-
--        if _include_def(d) and document.path == d.module_path:
-+        if _include_def(d) and os.path.samefile(document.path, d.module_path):
-             tuple_range = _tuple_range(d)
-             if tuple_range in exclude:
-                 continue
-diff --git a/setup.py b/setup.py
-index 12782990..99d2b312 100755
---- a/setup.py
-+++ b/setup.py
-@@ -10,7 +10,7 @@
-         'configparser; python_version<"3.0"',
-         'future>=0.14.0; python_version<"3"',
-         'backports.functools_lru_cache; python_version<"3.2"',
--        'jedi>=0.17.2,<0.18.0',
-+        'jedi>=0.17.2,<0.19.0',
-         'python-jsonrpc-server>=0.4.0',
-         'pluggy',
-         'ujson<=2.0.3 ; platform_system!="Windows" and python_version<"3.0"',
diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template
deleted file mode 100644
index a443ec3fb514..000000000000
--- a/srcpkgs/python3-language-server/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python3-language-server'
-pkgname=python3-language-server
-version=0.36.2
-revision=1
-wrksrc="${pkgname/3}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson
- python3-setuptools"
-checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib
- python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle
- python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov
- python3-yapf"
-short_desc="Python implementation of the Language Server Protocol"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://github.com/palantir/python-language-server"
-distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
-checksum=9984c84a67ee2c5102c8e703215f407fcfa5e62b0ae86c9572d0ada8c4b417b0
-# Needs unpackaged rope and versioneer
-# https://github.com/palantir/python-language-server/blob/develop/setup.py#L51
-make_check=no
-
-post_patch() {
-	vsed -i setup.py -e 's/\bujson<=1.35\b/ujson/'
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-lsp-server/template b/srcpkgs/python3-lsp-server/template
new file mode 100644
index 000000000000..cda7c928052a
--- /dev/null
+++ b/srcpkgs/python3-lsp-server/template
@@ -0,0 +1,40 @@
+# Template file for 'python3-lsp-server'
+pkgname=python3-lsp-server
+version=1.4.1
+revision=1
+wrksrc="${pkgname/3}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel"
+depends="python3-jedi python3-pluggy python3-lsp-jsonrpc python3-ultrajson
+ python3-setuptools"
+checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib
+ python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle
+ python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov
+ python3-yapf flake8"
+short_desc="Python implementation of the Language Server Protocol"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="MIT"
+homepage="https://github.com/python-lsp/python-lsp-server"
+distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
+checksum=be7f83298af9f0951a93972cafc9db04fd7cf5c05f20812515275f0ba70e342f
+
+do_check() {
+	python3 -m pytest \
+		--ignore=test/plugins/test_completion.py \
+		--ignore=test/plugins/test_pydocstyle_lint.py \
+		--ignore=test/plugins/test_rope_rename.py
+}
+
+post_install() {
+	vlicense LICENSE
+	ln -s pylsp "${DESTDIR}/usr/bin/pyls"
+}
+
+python3-language-server_package() {
+	build_style=meta
+	depends="python3-lsp-server>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	pkg_install() {
+		vmove usr/bin/pyls
+	}
+}

From d80ea0bdf27ff87f722bf476dc15345c3af85c34 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:52:16 -0700
Subject: [PATCH 1033/2561] python3-jsonrpc-server: remove package

---
 srcpkgs/python3-jsonrpc-server/template | 22 ----------------------
 srcpkgs/removed-packages/template       |  3 ++-
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python3-jsonrpc-server/template

diff --git a/srcpkgs/python3-jsonrpc-server/template b/srcpkgs/python3-jsonrpc-server/template
deleted file mode 100644
index de96976ad0a2..000000000000
--- a/srcpkgs/python3-jsonrpc-server/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python3-jsonrpc-server'
-pkgname=python3-jsonrpc-server
-version=0.4.0
-revision=2
-wrksrc="${pkgname/3}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-ultrajson"
-short_desc="Python library implementing asynchronous JSON RPC server"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://github.com/palantir/python-jsonrpc-server"
-distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
-checksum=62c543e541f101ec5b57dc654efc212d2c2e3ea47ff6f54b2e7dcb36ecf20595
-
-post_patch() {
-	vsed -i setup.py -e 's/\bujson<=1\.35\b/ujson/'
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d5a5e66b8b1a..a76ad553cbf3 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=67
+revision=68
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -325,6 +325,7 @@ replaces="
  python3-docker-pycreds<=0.4.0_4
  python3-grako<=3.99.9_7
  python3-idna-ssl<=1.1.0_3
+ python3-jsonrpc-server<=0.4.0_2
  python3-keepalive<=0.5_6
  python3-pgpdump<=1.5_10
  python3-lockfile<=0.12.2_7

From 9472cf06801a94781dc9ac08d3e769ce263fb446 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 22 Mar 2022 20:47:59 +0100
Subject: [PATCH 1034/2561] dhcpcd: fix 'dhcpcd_open: Bad File Descriptor' with
 dhcpcd-qt.

---
 srcpkgs/dhcpcd/patches/revert-eloop.patch | 150 ++++++++++++++++++++++
 srcpkgs/dhcpcd/template                   |   2 +-
 2 files changed, 151 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dhcpcd/patches/revert-eloop.patch

diff --git a/srcpkgs/dhcpcd/patches/revert-eloop.patch b/srcpkgs/dhcpcd/patches/revert-eloop.patch
new file mode 100644
index 000000000000..e41beb84b62b
--- /dev/null
+++ b/srcpkgs/dhcpcd/patches/revert-eloop.patch
@@ -0,0 +1,150 @@
+From 2b4fe4c12b5d4366ff21fabf3a6c3799f8e4fa53 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 12 Nov 2021 16:24:32 +0000
+Subject: [PATCH] Revert "eloop: Allow eloop to process all fds returned from
+ poll(2)"
+
+This stops dumping leases when privsep is compiled out.
+This change works fine on master, but we also have eloop using
+more of a native poll(2) style interface.
+Easier for now to just revert this on the dhcpcd-9 branch.
+
+This reverts commit fe2b82eec25da908c3a1a71c2dc2402d9ff70e31.
+---
+ src/eloop.c | 56 ++++++++++++++++-------------------------------------
+ 1 file changed, 17 insertions(+), 39 deletions(-)
+
+diff --git a/src/eloop.c b/src/eloop.c
+index a6ab43fb..c3330817 100644
+--- a/src/eloop.c
++++ b/src/eloop.c
+@@ -32,7 +32,6 @@
+ #include <errno.h>
+ #include <limits.h>
+ #include <poll.h>
+-#include <stdbool.h>
+ #include <signal.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+@@ -137,7 +136,6 @@ struct eloop {
+ 	TAILQ_HEAD (event_head, eloop_event) events;
+ 	size_t nevents;
+ 	struct event_head free_events;
+-	bool events_need_setup;
+ 
+ 	struct timespec now;
+ 	TAILQ_HEAD (timeout_head, eloop_timeout) timeouts;
+@@ -284,16 +282,11 @@ eloop_reduce_timers(struct eloop *eloop)
+ static void
+ eloop_event_setup_fds(struct eloop *eloop)
+ {
+-	struct eloop_event *e, *ne;
++	struct eloop_event *e;
+ 	struct pollfd *pfd;
+ 
+ 	pfd = eloop->fds;
+-	TAILQ_FOREACH_SAFE(e, &eloop->events, next, ne) {
+-		if (e->fd == -1) {
+-			TAILQ_REMOVE(&eloop->events, e, next);
+-			TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
+-			continue;
+-		}
++	TAILQ_FOREACH(e, &eloop->events, next) {
+ #ifdef ELOOP_DEBUG
+ 		fprintf(stderr, "%s(%d) fd=%d, rcb=%p, wcb=%p\n",
+ 		    __func__, getpid(), e->fd, e->read_cb, e->write_cb);
+@@ -308,7 +301,6 @@ eloop_event_setup_fds(struct eloop *eloop)
+ 		pfd->revents = 0;
+ 		pfd++;
+ 	}
+-	eloop->events_need_setup = false;
+ }
+ 
+ size_t
+@@ -376,8 +368,7 @@ eloop_event_add_rw(struct eloop *eloop, int fd,
+ 	}
+ 
+ setup:
+-	e->pollfd = NULL;
+-	eloop->events_need_setup = true;
++	eloop_event_setup_fds(eloop);
+ 	return 0;
+ }
+ 
+@@ -403,10 +394,6 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
+ 	struct eloop_event *e;
+ 
+ 	assert(eloop != NULL);
+-	if (fd == -1) {
+-		errno = EINVAL;
+-		return -1;
+-	}
+ 
+ 	TAILQ_FOREACH(e, &eloop->events, next) {
+ 		if (e->fd == fd)
+@@ -422,17 +409,16 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
+ 			goto remove;
+ 		e->write_cb = NULL;
+ 		e->write_cb_arg = NULL;
+-		if (e->pollfd != NULL) {
+-			e->pollfd->events &= ~POLLOUT;
+-			e->pollfd->revents &= ~POLLOUT;
+-		}
+-		return 1;
++		goto done;
+ 	}
+ 
+ remove:
+-	e->fd = -1;
++	TAILQ_REMOVE(&eloop->events, e, next);
++	TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
+ 	eloop->nevents--;
+-	eloop->events_need_setup = true;
++
++done:
++	eloop_event_setup_fds(eloop);
+ 	return 1;
+ }
+ 
+@@ -750,9 +736,6 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
+ 		} else
+ 			tsp = NULL;
+ 
+-		if (eloop->events_need_setup)
+-			eloop_event_setup_fds(eloop);
+-
+ 		n = ppoll(eloop->fds, (nfds_t)eloop->nevents, tsp, signals);
+ 		if (n == -1) {
+ 			if (errno == EINTR)
+@@ -763,23 +746,18 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
+ 			continue;
+ 
+ 		TAILQ_FOREACH(e, &eloop->events, next) {
+-			/* Skip freshly added events */
+-			if (e->pollfd == NULL)
+-				continue;
+-			if (e->pollfd->revents)
+-				n--;
+-			if (e->fd != -1 && e->pollfd->revents & POLLOUT) {
+-				if (e->write_cb != NULL)
++			if (e->pollfd->revents & POLLOUT) {
++				if (e->write_cb != NULL) {
+ 					e->write_cb(e->write_cb_arg);
++					break;
++				}
+ 			}
+-			if (e->fd != -1 &&
+-			    e->pollfd != NULL && e->pollfd->revents)
+-			{
+-				if (e->read_cb != NULL)
++			if (e->pollfd->revents) {
++				if (e->read_cb != NULL) {
+ 					e->read_cb(e->read_cb_arg);
++					break;
++				}
+ 			}
+-			if (n == 0)
+-				break;
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 12be60c1efcf..0d26c1abfa5a 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
 version=9.4.1
-revision=1
+revision=2
 build_style=configure
 make_check_target=test
 configure_args="

From c7bd86639f11669bc358ce2712985079435b4c90 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Apr 2022 23:33:07 +0200
Subject: [PATCH 1035/2561] hwloc: update to 2.7.1.

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

diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
index e96886b6cf50..52e01d23fb13 100644
--- a/srcpkgs/hwloc/template
+++ b/srcpkgs/hwloc/template
@@ -1,6 +1,6 @@
 # Template file for 'hwloc'
 pkgname=hwloc
-version=2.6.0
+version=2.7.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=e1f073e44e28c296ff848dead5e9bd6e2426b77f95ead1792358958e859fa83a
+checksum=0d4e1d36c3a72c5d61901bfd477337f5a4c7e0a975da57165237d00e35ef528d
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";;

From 62f785798a85386722907f14ac8ddcfbed329ec2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Apr 2022 23:35:26 +0200
Subject: [PATCH 1036/2561] bmake: update to 20220330.

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

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 19c6c5aa3505..5eac7a6f158f 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20220303
+version=20220330
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=793754b93fec97a0cf6cade0b0ad597bb7ea5057fd24311d4a562432df3e91cb
+checksum=4b46d95b6ae4b3311ba805ff7d5a19b9e37ac0e86880e296e2111f565b545092
 python_version=3
 
 do_configure() {

From 964dcf80ad5b161afb56a35d26935616aedf3337 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:40:06 -0500
Subject: [PATCH 1037/2561] Amass: update to 3.19.1.

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

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 993c17d52c1c..9293dab01c93 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.19.0
+version=3.19.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=539c2207f844c81cc9a6286e436f26a1fc0690bf424ea1885844dd33002b7ef6
+checksum=259dbef81ca63ceb85113c0f741c9212bacbac653bca2cd3e8022b256d08d426

From 46dd62dabf90acdd210f559a6391f112f5caa5cf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:41:08 -0500
Subject: [PATCH 1038/2561] python3-rich: update to 12.2.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 c394edfbeade..c3de71a5749a 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=12.0.1
+version=12.2.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=3fba9dd15ebe048e2795a02ac19baee79dc12cc50b074ef70f2958cd651b59a9
+checksum=ea74bc9dad9589d8eea3e3fd0b136d8bf6e428888955f215824c2894f0da8b47
 make_check=extended # some checks only work on windows
 
 post_install() {

From 7c755f6ffb4056a376d6776e3282dbb01f740178 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:43:25 -0500
Subject: [PATCH 1039/2561] ffuf: update to 1.4.1.

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

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 6ceffafb0e55..26f037749914 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
 # Template file for 'ffuf'
 pkgname=ffuf
-version=1.4.0
+version=1.4.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=cc741088f15b5cfdeb596f1630a015cce0b4b112dc6daf857cd9878e7a1734c1
+checksum=89b4bd4b3bbad7402d9c81d0d9f21b679c80d0a19bb9a190e45e395736058889
 
 post_install() {
 	vlicense LICENSE

From d37bb77b525a2d7cebd01e03a9f4e110a962dc11 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:54:30 -0500
Subject: [PATCH 1040/2561] python3-youtubesearch: update to 1.6.4.

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

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 3d88fc1126aa..822d7eb70ee4 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
-version=1.6.3
+version=1.6.4
 revision=1
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/alexmercerind/youtube-search-python"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=bdb34757c5e390c4d20989d04317acbceffa94293693cbeecb493b079440dbd3
+checksum=a9dcc4536fd839beb29b12d93e59fb92b294a0d83b94b882b16a445158d1f8da
 make_check=no # no tests defined
 
 post_install() {

From eebeef9b769fd109bf428c7554039511309b569d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:55:41 -0500
Subject: [PATCH 1041/2561] sqlmap: update to 1.6.4.

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

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index c77f23f03939..74ce3a2ca71e 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.3
+version=1.6.4
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a099cde73f57ba9e70ad7dd2f7473202a02929766471fc5701f64f2c16b304c2
+checksum=14585e4fc95006467e52685c4838f024654d7e23cbd84eb12762a55918b8d561
 python_version=3
 
 do_install() {

From a9c2379fabdb528304ca9ab9afec6d7af60dcc91 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 18:54:35 -0400
Subject: [PATCH 1042/2561] base-files: add plugdev group

Plugdev is used by many packages' udev rules for pluggable devices.
Currently, some of those packages use the system_groups trigger to add it,
some forget to add it, and others patch it to "users" or "uaccess"
(which breaks the packages on systems that don't use logind).

By adding plugdev to the default groups, we get rid of those problems.
---
 srcpkgs/base-files/files/group | 1 +
 srcpkgs/base-files/template    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/base-files/files/group b/srcpkgs/base-files/files/group
index 0797f31c14d9..b4e61903105c 100644
--- a/srcpkgs/base-files/files/group
+++ b/srcpkgs/base-files/files/group
@@ -22,6 +22,7 @@ scanner:x:20:
 network:x:21:
 kvm:x:24:
 input:x:25:
+plugdev:x:26:
 nogroup:x:99:
 users:x:100:
 xbuilder:x:101:
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 758cd54ad147..bf7b7ef242b0 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.142
-revision=11
+revision=12
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
@@ -29,7 +29,7 @@ conf_files="
 
 replaces="base-directories>=0"
 # New system groups
-system_groups="kvm:24"
+system_groups="kvm:24 plugdev:26"
 
 do_install() {
 	# Create bin and lib dirs and symlinks.

From f524358fb1f4dba048b8b30a67fcf162def89d01 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 19:17:56 -0400
Subject: [PATCH 1043/2561] openocd: drop system_groups

Now that we have plugdev as a system group, we don't need to create it here.
---
 srcpkgs/openocd/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/openocd/template b/srcpkgs/openocd/template
index 3c45ba54dd59..5537a78575c3 100644
--- a/srcpkgs/openocd/template
+++ b/srcpkgs/openocd/template
@@ -1,7 +1,7 @@
 # Template file for 'openocd'
 pkgname=openocd
 version=0.11.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --disable-werror
@@ -49,8 +49,6 @@ homepage="http://openocd.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d
 
-system_groups="plugdev"
-
 CFLAGS="-fcommon"
 
 post_install() {

From ed6b07111ae6a958d97b9fa627a9a889546680f4 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 19:23:15 -0400
Subject: [PATCH 1044/2561] wally-udev-rules: drop system_groups trigger

Now that we have plugdev as a system group, we don't need to create it here.
We also no longer need that INSTALL.msg
---
 srcpkgs/wally-udev-rules/INSTALL.msg | 3 ---
 srcpkgs/wally-udev-rules/template    | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 srcpkgs/wally-udev-rules/INSTALL.msg

diff --git a/srcpkgs/wally-udev-rules/INSTALL.msg b/srcpkgs/wally-udev-rules/INSTALL.msg
deleted file mode 100644
index 6313b5615bad..000000000000
--- a/srcpkgs/wally-udev-rules/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-Please add your user to the group 'plugdev' by executing the following:
-
-usermod -aG plugdev "$USER"
diff --git a/srcpkgs/wally-udev-rules/template b/srcpkgs/wally-udev-rules/template
index 83f37457047b..173a99733c56 100644
--- a/srcpkgs/wally-udev-rules/template
+++ b/srcpkgs/wally-udev-rules/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-udev-rules'
 pkgname=wally-udev-rules
 version=2.1.1
-revision=1
+revision=2
 build_style=fetch
 short_desc="Set of udev rules for ZSA keyboards, for usage with wally and oryx"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
@@ -14,7 +14,6 @@ checksum="6c7d4d27745080269115c58c4c5d863b23c534635975f3bca581c52687721c52
  269c9196bc65b2e62be549e3d34e56768fe702ff099b7780a1661ca4c92a0143
  d2841d63f4e0bdfda102390ab1ca09136230d22f88538863b24b0c7fc68e548e"
 conf_files="/usr/lib/udev/rules.d/50-wally.rules /usr/lib/udev/rules.d/50-oryx.rules"
-system_groups="plugdev"
 
 do_install() {
 	vlicense license.md

From 55533ec8395055d80ac33a5fbb91f1ba26adc6bd Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 19:30:36 -0400
Subject: [PATCH 1045/2561] openrazer-meta: drop system_groups trigger

Now that we have plugdev as a system group, we don't need to create it here.
---
 srcpkgs/openrazer-meta/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template
index 5713a84bbd15..3cd401cb9878 100644
--- a/srcpkgs/openrazer-meta/template
+++ b/srcpkgs/openrazer-meta/template
@@ -1,7 +1,7 @@
 # Template file for 'openrazer-meta'
 pkgname=openrazer-meta
 version=3.0.1
-revision=2
+revision=3
 wrksrc="openrazer-${version}"
 build_style=gnu-makefile
 make_install_target="setup_dkms udev_install daemon_install xdg_install
@@ -36,7 +36,6 @@ openrazer-driver-dkms_package() {
 	short_desc="Kernel driver for Razer devices (DKMS-variant)"
 	depends="dkms"
 	dkms_modules="openrazer-driver $version"
-	system_groups="plugdev"
 	pkg_install() {
 		vmove usr/lib/udev
 		vmove usr/src

From f334e2ccaef6b99001fce5be9a925fff4d3a7295 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 14:03:21 -0400
Subject: [PATCH 1046/2561] elasticsearch: remove package

- last updated in 2017
- contained vulnerable log4j
- licence is a mess
---
 srcpkgs/elasticsearch/INSTALL                 | 14 -----
 srcpkgs/elasticsearch/files/elasticsearch/run |  3 --
 srcpkgs/elasticsearch/template                | 52 -------------------
 srcpkgs/elasticsearch/update                  |  1 -
 srcpkgs/removed-packages/template             |  1 +
 5 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 srcpkgs/elasticsearch/INSTALL
 delete mode 100755 srcpkgs/elasticsearch/files/elasticsearch/run
 delete mode 100644 srcpkgs/elasticsearch/template
 delete mode 100644 srcpkgs/elasticsearch/update

diff --git a/srcpkgs/elasticsearch/INSTALL b/srcpkgs/elasticsearch/INSTALL
deleted file mode 100644
index 622fb85bda9a..000000000000
--- a/srcpkgs/elasticsearch/INSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-# INSTALL
-case "$ACTION" in
-post)
-    if [ "$UPDATE" != "yes" ]; then
-        # actions to execute if package is being installed.
-        install -d usr/share/elasticsearch/plugins
-        install -d -m0750 var/log/elasticsearch
-        install -d -m0750 var/lib/elasticsearch/data
-        chown -R elastic etc/elasticsearch
-        chown -R elastic var/lib/elasticsearch/data
-        chown -R elastic var/log/elasticsearch
-    fi
-    ;;
-esac
diff --git a/srcpkgs/elasticsearch/files/elasticsearch/run b/srcpkgs/elasticsearch/files/elasticsearch/run
deleted file mode 100755
index 6b04b1770817..000000000000
--- a/srcpkgs/elasticsearch/files/elasticsearch/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. /etc/profile # to pull in java path
-exec chpst -u elastic elasticsearch 2>&1
diff --git a/srcpkgs/elasticsearch/template b/srcpkgs/elasticsearch/template
deleted file mode 100644
index a149578d682c..000000000000
--- a/srcpkgs/elasticsearch/template
+++ /dev/null
@@ -1,52 +0,0 @@
-# Template file for 'elasticsearch'
-pkgname=elasticsearch
-version=5.1.2
-revision=2
-wrksrc="elasticsearch-${version}"
-# The only native part is libjnidispatch.so inside jna-*.jar, which is supplied
-# only for a few archs, namely arm (armv6l and better), aarch64, ppc64le, x86,
-# and x86_64; ppc64 is also supplied but elfv1 only, and all only for glibc.
-# We could recompile this, but someone would need to add code to do that.
-archs="i686 x86_64 aarch64 armv6l armv7l ppc64le"
-depends="virtual?java-runtime"
-short_desc="A distributed, open source search and analytics engine"
-maintainer="dota? =op <rogi@skylittlesystem.org>"
-license="Apache-2.0"
-homepage="http://www.elastic.co"
-distfiles="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${version}.tar.gz"
-checksum=74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42
-system_accounts="elastic"
-conf_files="/etc/elasticsearch/elasticsearch.yml /etc/elasticsearch/jvm.options /etc/elasticsearch/log4j2.properties"
-
-do_install() {
-	ES="usr/share/elasticsearch"
-
-	rm -f bin/*.{bat,exe}
-	vmkdir $ES
-
-	vcopy bin $ES
-	vcopy lib $ES
-	vcopy modules $ES
-	vcopy plugins $ES
-
-	vmkdir usr/bin
-
-	ln -sf /$ES/bin/elasticsearch "$DESTDIR/usr/bin"
-
-	vmkdir etc/elasticsearch
-	vcopy config/* etc/elasticsearch
-
-	ln -sf /etc/elasticsearch "$DESTDIR/$ES/config"
-
-	vmkdir var/lib/elasticsearch/data
-	ln -sf /var/lib/elasticsearch/data "$DESTDIR/$ES/data"
-
-	vmkdir var/log/elasticsearch
-	ln -sf /var/log/elasticsearch "$DESTDIR/$ES/logs"
-
-	vlicense LICENSE.txt
-	vlicense NOTICE.txt
-	vdoc README.textile
-
-	vsv elasticsearch
-}
diff --git a/srcpkgs/elasticsearch/update b/srcpkgs/elasticsearch/update
deleted file mode 100644
index 32de96485c8f..000000000000
--- a/srcpkgs/elasticsearch/update
+++ /dev/null
@@ -1 +0,0 @@
-site="https://www.elastic.co/downloads/elasticsearch"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a76ad553cbf3..240f1282f54c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -66,6 +66,7 @@ replaces="
  dtkwm<=2.0.12_1
  ebtables<=2.0.10.4_8
  eclipse-ecj<=4.9_3
+ elasticsearch<=5.1.2_2
  electron7<=7.3.3_1
  electron9<=9.4.1_1
  emacs-gtk2<=27.2_1

From 7fa81ab1f24e566f4a0e08e349d1378fb032bf46 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sun, 20 Mar 2022 00:41:04 -0400
Subject: [PATCH 1047/2561] libsigrok: fix on systems without logind

Fixes #23580
Closes #23581 (obsoletes the PR)
---
 srcpkgs/libsigrok/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libsigrok/template b/srcpkgs/libsigrok/template
index 87939ce82fa8..0243925a7312 100644
--- a/srcpkgs/libsigrok/template
+++ b/srcpkgs/libsigrok/template
@@ -1,7 +1,7 @@
 # Template file for 'libsigrok'
 pkgname=libsigrok
 version=0.5.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config doxygen python3"
 makedepends="glib-devel libzip-devel glibmm-devel libserialport-devel
@@ -20,6 +20,7 @@ esac
 post_install() {
 	vinstall contrib/60-libsigrok.rules 0644 /usr/lib/udev/rules.d
 	vinstall contrib/61-libsigrok-uaccess.rules 0644 /usr/lib/udev/rules.d
+	vinstall contrib/61-libsigrok-plugdev.rules 0644 /usr/lib/udev/rules.d
 }
 
 libsigrok-devel_package() {

From f06cdeaa605b228673ece7783b31cddd19926ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?=
 =?UTF-8?q?=EF=BD=94=EF=BD=89?= <hiljusti@so.dang.cool>
Date: Wed, 9 Mar 2022 01:07:08 -0800
Subject: [PATCH 1048/2561] New package: sigi-3.1.0

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

diff --git a/srcpkgs/sigi/template b/srcpkgs/sigi/template
new file mode 100644
index 000000000000..d9fc482b8207
--- /dev/null
+++ b/srcpkgs/sigi/template
@@ -0,0 +1,22 @@
+# Template file for 'sigi'
+pkgname=sigi
+version=3.1.0
+revision=1
+build_style=cargo
+short_desc="Organization tool for people who hate organization"
+maintainer="J.R. Hill <hiljusti@so.dang.cool>"
+license="GPL-2.0-only"
+homepage="https://github.com/hiljusti/sigi"
+distfiles="https://crates.io/api/v1/crates/sigi/${version}/download>sigi-${version}.tar.gz"
+checksum=967e492a89f05c3a373929a48e0a1a7712d4742b150216228feff4a7869297e3
+
+pre_check() {
+	# CLI tests in the project rely on BATS (more than just bats-core) through
+	# git submodules. We skip those tests here until the other bats components
+	# are imported in Void or https://github.com/hiljusti/sigi/issues/19
+	export SKIP_BATS_TESTS=1
+}
+
+post_install() {
+	vman sigi.1
+}

From 80130c457008b3c34eef1668adea539919e83715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 5 Apr 2022 21:46:03 -0300
Subject: [PATCH 1049/2561] pari: update to 2.13.4.

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

diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 9543739472ac..8bac1e0343f8 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,6 +1,6 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.3
+version=2.13.4
 revision=1
 build_style=configure
 build_helper=qemu
@@ -16,8 +16,9 @@ short_desc="Fast computations library in number theory"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
+changelog="https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=blob_plain;f=CHANGES;hb=refs/heads/pari-${version%.*}"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=ccba7f1606c6854f1443637bb57ad0958d41c7f4753f8ae8459f1d64c267a1ca
+checksum=bcde9eceae1592814381c1697cdb7063567b6504201b1be47bb58920f3bce185
 
 build_options="x11 pthreads"
 build_options_default="x11 pthreads"

From 52a48462cc316550f4a5f3925b3e29a08a3c9ac1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 13:30:28 +0200
Subject: [PATCH 1050/2561] virt-manager: update to 4.0.0

Closes #35955
---
 ...le-compile-schemas-update-icon-cache.patch | 20 +++++++++++++++++++
 srcpkgs/virt-manager/template                 | 13 ++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch

diff --git a/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch b/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch
new file mode 100644
index 000000000000..ad8f6f798b20
--- /dev/null
+++ b/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch
@@ -0,0 +1,20 @@
+--- a/setup.py
++++ b/setup.py
+@@ -264,17 +264,6 @@ class my_install(setuptools.command.install.install):
+         setuptools.command.install.install.finalize_options(self)
+ 
+     def run(self):
+-        if not self.distribution.no_update_icon_cache:
+-            print("running gtk-update-icon-cache")
+-            icon_path = os.path.join(self.install_data, "share/icons/hicolor")
+-            self.spawn(["gtk-update-icon-cache", "-q", "-t", icon_path])
+-
+-        if not self.distribution.no_compile_schemas:
+-            print("compiling gsettings schemas")
+-            gschema_install = os.path.join(self.install_data,
+-                "share/glib-2.0/schemas")
+-            self.spawn(["glib-compile-schemas", gschema_install])
+-
+         setuptools.command.install.install.run(self)
+ 
+ 
diff --git a/srcpkgs/virt-manager/template b/srcpkgs/virt-manager/template
index f3f6a7424a1b..3b66b6fd8a90 100644
--- a/srcpkgs/virt-manager/template
+++ b/srcpkgs/virt-manager/template
@@ -1,10 +1,10 @@
 # Template file for 'virt-manager'
 pkgname=virt-manager
-version=3.2.0
-revision=2
+version=4.0.0
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/share/${pkgname}/virtManager"
-hostmakedepends="gettext python3-docutils gtk-update-icon-cache"
+hostmakedepends="gettext python3-docutils python3-setuptools"
 depends="virt-manager-tools>=${version}_${revision} libvirt-glib
  gtk-vnc spice-gtk gtksourceview4 dconf vte3 gir-freedesktop"
 _coredeps="python3-gobject libvirt-python3 libosinfo
@@ -16,14 +16,9 @@ license="GPL-2.0-or-later"
 homepage="https://virt-manager.org"
 changelog="https://raw.githubusercontent.com/virt-manager/virt-manager/master/NEWS.md"
 distfiles="https://virt-manager.org/download/sources/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86
+checksum=515aaa2021a4bf352b0573098fe6958319b1ba8ec508ea37e064803f97f17086
 python_version=3
 
-post_install() {
-	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
-		$DESTDIR/usr/share/icons/hicolor/icon-theme.cache
-}
-
 virt-manager-tools_package() {
 	short_desc="Programs to create and clone virtual machines"
 	depends="${_coredeps} python3-argcomplete"

From 7a6f0d9a8eab7ec0d29a9495f7ce4ce6abb4f105 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 7 Apr 2022 09:28:02 -0400
Subject: [PATCH 1051/2561] peek: undo compression of manual page

---
 srcpkgs/peek/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/peek/template b/srcpkgs/peek/template
index f5bd1845c83c..cc6ffed27c4d 100644
--- a/srcpkgs/peek/template
+++ b/srcpkgs/peek/template
@@ -1,7 +1,7 @@
 # Template file for 'peek'
 pkgname=peek
 version=1.5.1
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="glib-devel libxml2 gettext pkg-config txt2man vala"
 makedepends="gtk+3-devel libkeybinder3-devel"
@@ -12,3 +12,8 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/phw/peek"
 distfiles="https://github.com/phw/peek/archive/${version}.tar.gz"
 checksum=d2b52297d3941db2f10ad4dd00a6d5606728c0fee6af5f1594a036f88e478237
+
+post_install() {
+	# Manual page is actually compressed; make sure the post-install hook finds it
+	mv ${DESTDIR}/usr/share/man/man1/peek.{1,1.gz}
+}

From a73a1c8e28f2077f05fc178b573f9e2b52c68f6b Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 15:24:56 -0500
Subject: [PATCH 1052/2561] python3-utils: update to 3.1.0.

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

diff --git a/srcpkgs/python3-utils/template b/srcpkgs/python3-utils/template
index 44f31ded5733..a4db83649ac7 100644
--- a/srcpkgs/python3-utils/template
+++ b/srcpkgs/python3-utils/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-utils'
 pkgname=python3-utils
-version=2.5.6
-revision=2
+version=3.1.0
+revision=1
 wrksrc="python-utils-${version}"
 build_style=python3-module
+# skip coverage and mypy tests https://github.com/WoLpH/python-utils/issues/29
+make_check_args="-o addopts=--doctest-modules"
 hostmakedepends="python3-setuptools"
-depends="python3-six"
+checkdepends="python3-pytest python3-pytest-asyncio"
 short_desc="Convenient utilities not included with the standard Python3 install"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/WoLpH/python-utils"
 distfiles="https://github.com/WoLpH/python-utils/archive/v${version}.tar.gz"
-checksum=e35044706c5c7863110ac31afc9fac66f5dc47d6450ebe26a6ac26473ce09d90
+checksum=6f20e784af79dd0f2c330c88496b3d08fa29e27bcfba398ba78f73d8ae85f670
 
 post_install() {
 	vlicense LICENSE

From fd2a4b4d8053c5cf03ece257da2799f52895573a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 6 Apr 2022 19:27:08 -0400
Subject: [PATCH 1053/2561] python3-rtree: update to 1.0.0.

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

diff --git a/srcpkgs/python3-rtree/template b/srcpkgs/python3-rtree/template
index 8fce4b16e21e..26812e0af5f9 100644
--- a/srcpkgs/python3-rtree/template
+++ b/srcpkgs/python3-rtree/template
@@ -1,9 +1,10 @@
 # Template file for 'python3-rtree'
 pkgname=python3-rtree
-version=0.9.5
-revision=4
+version=1.0.0
+revision=1
 wrksrc="rtree-${version}"
 build_style=python3-module
+make_check_target="tests"
 hostmakedepends="python3-setuptools libspatialindex-devel python3-wheel"
 makedepends="python3-devel libspatialindex-devel"
 depends="python3 libspatialindex"
@@ -13,12 +14,8 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://toblerity.org/rtree/"
 distfiles="https://github.com/Toblerity/rtree/archive/${version}.tar.gz"
-checksum=8d6eebab672d4ac58d10a8f13a200d47502ce70153d43700ddbbde145a217e01
+checksum=b9cc215197cffeb3c7b8becfc6833d382f431381942e5529bcf276a874028fec
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
 }
-
-do_check() {
-	python3 -m pytest tests/
-}

From 8dcbf93ed58a6c4c5040a96e3c8293b0aa48f5c4 Mon Sep 17 00:00:00 2001
From: *1is7ac3* Isaac Quiroz <isaac.qa13@gmail.com>
Date: Sun, 27 Mar 2022 19:33:22 -0300
Subject: [PATCH 1054/2561] python3-chromecast: update to 10.3.0.

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

diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index cd54fcaf8977..72f891be6a1f 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-chromecast'
 pkgname=python3-chromecast
-version=8.1.0
-revision=2
+version=10.3.0
+revision=1
 wrksrc="pychromecast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-protobuf python3-zeroconf python3-casttube"
@@ -12,7 +12,7 @@ maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"
 homepage="https://github.com/home-assistant-libs/pychromecast"
 distfiles="https://github.com/home-assistant-libs/pychromecast/archive/${version}.tar.gz"
-checksum=f11d73cffa84b25417192c30e6ea46df470b65055e229c568f677372c4ded1de
+checksum=325d8cfa686b7127de1783221f7ef3e81988c0631619bbacf3679ce647b1db1f
 
 post_install() {
 	vlicense LICENSE

From ee679dcdf215e39eeded97e149eee9d098c1c300 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Fri, 25 Mar 2022 16:58:59 +0100
Subject: [PATCH 1055/2561] python3-Werkzeug: update to 2.0.3.

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

diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template
index e2b947031bb4..ed6980da99ea 100644
--- a/srcpkgs/python3-Werkzeug/template
+++ b/srcpkgs/python3-Werkzeug/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Werkzeug'
 pkgname=python3-Werkzeug
-version=2.0.2
+version=2.0.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Markus Berger <pulux@pf4sh.de>"
 license="BSD-3-Clause"
 homepage="https://palletsprojects.com/p/werkzeug/"
 distfiles="${PYPI_SITE}/W/Werkzeug/Werkzeug-${version}.tar.gz"
-checksum=aa2bb6fc8dee8d6c504c0ac1e7f5f7dc5810a9903e793b6f715a9f015bdadb9a
+checksum=b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c
 
 do_check() {
 	# Tests depend on xprocess and pytest-timeout, which aren't packaged

From 1886e1b8be0c5d8fc9d06e4aa51c8fa2d7411f75 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Fri, 25 Mar 2022 16:55:44 +0100
Subject: [PATCH 1056/2561] python3-itsdangerous: update to 2.1.2.

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

diff --git a/srcpkgs/python3-itsdangerous/template b/srcpkgs/python3-itsdangerous/template
index 6fa31a0342fd..b770f01eef0c 100644
--- a/srcpkgs/python3-itsdangerous/template
+++ b/srcpkgs/python3-itsdangerous/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-itsdangerous'
 pkgname=python3-itsdangerous
-version=2.0.1
-revision=2
+version=2.1.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Markus Berger <pulux@pf4sh.de>"
 license="BSD-3-Clause"
 homepage="http://github.com/mitsuhiko/itsdangerous"
 distfiles="${PYPI_SITE}/i/itsdangerous/itsdangerous-${version}.tar.gz"
-checksum=9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0
+checksum=5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a
 
 post_install() {
 	vlicense LICENSE.rst

From 08bf2902b64234321317f06dea4f64d9f5904713 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 19:11:32 +0100
Subject: [PATCH 1057/2561] python3-keyring: update to 23.5.0.

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

diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 2fbc05352aed..298460551bfd 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-keyring'
 pkgname=python3-keyring
-version=23.1.0
-revision=2
+version=23.5.0
+revision=1
 wrksrc="keyring-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+build_style=python3-pep517
+hostmakedepends="python3-wheel python3-setuptools_scm"
 depends="python3-SecretStorage python3-importlib_metadata"
 checkdepends="python3-importlib_metadata python3-pytest
  python3-pytest-flake8 python3-pytest-cov"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/jaraco/keyring"
 changelog="https://raw.githubusercontent.com/jaraco/keyring/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz"
-checksum=b7e0156667f5dcc73c1f63a518005cd18a4eb23fe77321194fefcc03748b21a4
+checksum=9012508e141a80bd1c0b6778d5c610dd9f8c464d75ac6774248500503f972fb9
 
 post_install() {
 	vlicense LICENSE

From 80d44846af3e975a0c37b0f9641129ba529c9f3c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 14:16:57 +0200
Subject: [PATCH 1058/2561] perl-LWP: update to 6.62.

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

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index d3136bc16c9a..b878123cf002 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.61
+version=6.62
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=2f69069bd0df0ee222e25d41093bcc42e58d0a45885fba400356454c25621a5f
+checksum=569ac15eb69d54b2a8d932403610690b89c68d6a987eab2f627c0639bae7de18

From c3a421816c847938a223f6ca853b2ad47c5ab4d9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 14:21:11 +0200
Subject: [PATCH 1059/2561] tgt: update to 1.0.82.

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

diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template
index 5bf3d09a7070..653ebf2dc358 100644
--- a/srcpkgs/tgt/template
+++ b/srcpkgs/tgt/template
@@ -1,6 +1,6 @@
 # Template file for 'tgt'
 pkgname=tgt
-version=1.0.81
+version=1.0.82
 revision=1
 build_style=gnu-makefile
 make_install_args="sbindir=/usr/bin"
@@ -13,17 +13,12 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/fujita/tgt"
 distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz"
-checksum=f8a285549456f13fecf628131a73934ffcbb701bacb7d5802acee7b515ab5452
+checksum=35156277465e0ced5f3ca7e301110a937a7a2b90bbb5aecbca1349b91ada1c2c
 
 post_extract() {
 	sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile
-	sed -i '/^LDFLAGS/d; /CC.*-o/s/$/ $(LDFLAGS)/' usr/Makefile
-	sed -i '1i#include <sys/user.h>' usr/tgtd.h usr/util.h
-	sed -i '1i#include <fcntl.h>' usr/libssc.c
-	sed -i '1i#include <sys/sysmacros.h>' usr/bs_sg.c
-	sed -i 's/__always_inline/inline/g' usr/util.h
-
 }
+
 post_install() {
 	for f in ${DESTDIR}/etc/tgt/examples/*; do
 		vsconf $f

From 12cf5d181646d4b00bfef0219e72134620abacc1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 14:21:50 +0200
Subject: [PATCH 1060/2561] ugrep: update to 3.7.8.

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

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

From a56ef84094e04a228497b19930e7bd3ccc63e089 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 17:10:09 +0200
Subject: [PATCH 1061/2561] texlive2021-bin: fix repo url.

---
 srcpkgs/texlive2021-bin/INSTALL  | 4 ++--
 srcpkgs/texlive2021-bin/template | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive2021-bin/INSTALL b/srcpkgs/texlive2021-bin/INSTALL
index bc296786a54e..9b4952b0cc6d 100644
--- a/srcpkgs/texlive2021-bin/INSTALL
+++ b/srcpkgs/texlive2021-bin/INSTALL
@@ -5,10 +5,10 @@ post)
 		cd opt/texlive2021-installer
 		case "${ARCH}" in
 			x86_64-musl)
-			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile -force-platform x86_64-linuxmusl
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/tlnet-final/ -profile void.profile -force-platform x86_64-linuxmusl
 			;;
 			*)
-			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/tlnet-final/ -profile void.profile
 			;;
 		esac
 	esac
diff --git a/srcpkgs/texlive2021-bin/template b/srcpkgs/texlive2021-bin/template
index c7bbe1f9fdb8..3212ec2a5ff5 100644
--- a/srcpkgs/texlive2021-bin/template
+++ b/srcpkgs/texlive2021-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive2021-bin'
 pkgname=texlive2021-bin
 version=2021
-revision=2
+revision=3
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv

From 6a98c7b52b5235fa97bb94f7c57fcf9b7eb75ef8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 17:10:35 +0200
Subject: [PATCH 1062/2561] texlive-bin: update to 2022.

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

diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template
index af5517c46ebd..26866c5e5841 100644
--- a/srcpkgs/texlive-bin/template
+++ b/srcpkgs/texlive-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'texlive-bin'
 pkgname=texlive-bin
-version=2021
+version=2022
 revision=1
 depends="texlive${version}-bin"
 short_desc="TeX Live Binary distribution through tl-install (newest version)"

From 063e2e65b604232e497968f819872727286a3424 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 18:08:58 +0200
Subject: [PATCH 1063/2561] cronie: backport upstream regression fix.

https://github.com/cronie-crond/cronie/commit/62e53f1cdb9c1e12a01ee7814c92cd937d50328d

Closes #36554.
---
 srcpkgs/cronie/patches/62e53f1.patch | 21 +++++++++++++++++++++
 srcpkgs/cronie/template              |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cronie/patches/62e53f1.patch

diff --git a/srcpkgs/cronie/patches/62e53f1.patch b/srcpkgs/cronie/patches/62e53f1.patch
new file mode 100644
index 000000000000..160c03116415
--- /dev/null
+++ b/srcpkgs/cronie/patches/62e53f1.patch
@@ -0,0 +1,21 @@
+From 62e53f1cdb9c1e12a01ee7814c92cd937d50328d Mon Sep 17 00:00:00 2001
+From: w30023233 <wangyuhang27@huawei.com>
+Date: Wed, 23 Mar 2022 15:40:01 +0800
+Subject: [PATCH] Fix regression in handling 1-5 crontab entries
+
+---
+ src/entry.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/entry.c b/src/entry.c
+index e9e258b..bb7cb62 100644
+--- a/src/entry.c
++++ b/src/entry.c
+@@ -595,6 +595,7 @@ get_range(bitstr_t * bits, int low, int high, const char *names[],
+ 				return (EOF);
+ 
+ 			case R_RANGE:
++				unget_char(ch, file);
+ 				if (get_number(&num2, low, names, file) != EOF) {
+ 					state = R_RANGE_NUM2;
+ 					break;
diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template
index 526f59b4d835..e8f45b3ff904 100644
--- a/srcpkgs/cronie/template
+++ b/srcpkgs/cronie/template
@@ -1,7 +1,7 @@
 # Template file for 'cronie'
 pkgname=cronie
 version=1.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-inotify --without-selinux --with-pam
  --enable-anacron --enable-pie --enable-relro"

From 5f702ed8c2b51bea3574ee3e0b67e616b2c273cf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 18:37:58 +0200
Subject: [PATCH 1064/2561] zlib: backport crc32 fix.

https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2

Closes #36537.
---
 srcpkgs/zlib/patches/crc32.patch | 51 ++++++++++++++++++++++++++++++++
 srcpkgs/zlib/template            |  2 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/zlib/patches/crc32.patch

diff --git a/srcpkgs/zlib/patches/crc32.patch b/srcpkgs/zlib/patches/crc32.patch
new file mode 100644
index 000000000000..85a6a7e3ab41
--- /dev/null
+++ b/srcpkgs/zlib/patches/crc32.patch
@@ -0,0 +1,51 @@
+From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Wed, 30 Mar 2022 11:14:53 -0700
+Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
+
+The previous releases of zlib were not sensitive to incorrect CRC
+inputs with bits set above the low 32. This commit restores that
+behavior, so that applications with such bugs will continue to
+operate as before.
+---
+ crc32.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crc32.c b/crc32.c
+index a1bdce5c2..451887bc7 100644
+--- a/crc32.c
++++ b/crc32.c
+@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+ 
+     /* Pre-condition the CRC */
+-    crc ^= 0xffffffff;
++    crc = (~crc) & 0xffffffff;
+ 
+     /* Compute the CRC up to a word boundary. */
+     while (len && ((z_size_t)buf & 7) != 0) {
+@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+ 
+     /* Pre-condition the CRC */
+-    crc ^= 0xffffffff;
++    crc = (~crc) & 0xffffffff;
+ 
+ #ifdef W
+ 
+@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+ #ifdef DYNAMIC_CRC_TABLE
+     once(&made, make_crc_table);
+ #endif /* DYNAMIC_CRC_TABLE */
+-    return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
++    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
+ }
+ 
+ /* ========================================================================= */
+@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
+     uLong crc2;
+     uLong op;
+ {
+-    return multmodp(op, crc1) ^ crc2;
++    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
+ }
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 6dbe30032202..d142f283fb0a 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
 # Template file for 'zlib'
 pkgname=zlib
 version=1.2.12
-revision=1
+revision=2
 bootstrap=yes
 build_style=configure
 configure_args="--prefix=/usr --shared"

From 7d71ba14bc360f2e09744dd4cd48bf3c3e6bc3fa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 17 Mar 2022 15:17:16 +0100
Subject: [PATCH 1065/2561] notion: update to 4.0.2.

- Fix homepage
- Fix musl (backport upstream patch)
- Fix nonfree, upstream should be proper LGPL-2.1-or-later now
- Use Lua 5.4
---
 srcpkgs/notion/patches/stdout.patch | 89 +++++++++++++++++++++++++++++
 srcpkgs/notion/template             | 18 +++---
 2 files changed, 97 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/notion/patches/stdout.patch

diff --git a/srcpkgs/notion/patches/stdout.patch b/srcpkgs/notion/patches/stdout.patch
new file mode 100644
index 000000000000..b4200f680d2e
--- /dev/null
+++ b/srcpkgs/notion/patches/stdout.patch
@@ -0,0 +1,89 @@
+From de9e19940c2c88c848b7f849fb014fafd77d7d93 Mon Sep 17 00:00:00 2001
+From: c0dev0id <sh+github@codevoid.de>
+Date: Sat, 10 Apr 2021 02:03:44 +0200
+Subject: [PATCH] Fix compilation on OpenBSD
+
+The variable name "stdout" is defined in stdio.h on OpenBSD already.
+---
+ mod_notionflux/mod_notionflux.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/mod_notionflux/mod_notionflux.c b/mod_notionflux/mod_notionflux.c
+index f2bd4427..51949e07 100644
+--- a/mod_notionflux/mod_notionflux.c
++++ b/mod_notionflux/mod_notionflux.c
+@@ -36,7 +36,7 @@
+ 
+ typedef struct{
+     int fd;
+-    FILE *stdout;
++    FILE *stdoutput;
+     int ndata;
+     char *data;
+ } Buf;
+@@ -64,9 +64,9 @@ static void close_conn(Buf *buf)
+     close(buf->fd);
+     buf->fd=-1;
+     buf->ndata=0;
+-    if(buf->stdout!=NULL){
+-        fclose(buf->stdout);
+-        buf->stdout=NULL;
++    if(buf->stdoutput!=NULL){
++        fclose(buf->stdoutput);
++        buf->stdoutput=NULL;
+     }
+     if(buf->data!=NULL){
+         free(buf->data);
+@@ -147,11 +147,11 @@ static void receive_data(int fd, void *buf_)
+     bool success=FALSE;
+     int idx=buf-bufs;
+ 
+-    if(buf->stdout==NULL){ /* no fd received yet, must be the very beginning */
+-        int stdout_fd=unix_recv_fd(fd);
+-        if(stdout_fd==-2)
++    if(buf->stdoutput==NULL){ /* no fd received yet, must be the very beginning */
++        int stdoutput_fd=unix_recv_fd(fd);
++        if(stdoutput_fd==-2)
+             goto closefd;
+-        if(stdout_fd==-3){
++        if(stdoutput_fd==-3){
+             char const *err="Magic number mismatch on notionflux socket - "
+                 "is notionflux the same version as notion?";
+             writes(fd, "E");
+@@ -160,13 +160,13 @@ static void receive_data(int fd, void *buf_)
+             goto closefd;
+         }
+ 
+-        if(stdout_fd==-1) {
++        if(stdoutput_fd==-1) {
+             if(errno==EWOULDBLOCK || errno==EAGAIN)
+                 return; /* try again later */
+             warn("No file descriptor received from notionflux, closing.");
+             goto closefd;
+         }
+-        if((buf->stdout=fdopen(stdout_fd, "w"))==NULL) {
++        if((buf->stdoutput=fdopen(stdoutput_fd, "w"))==NULL) {
+             warn("fdopen() failed on fd from notionflux");
+             goto closefd;
+         }
+@@ -239,9 +239,9 @@ EXTL_SAFE
+ EXTL_EXPORT
+ bool mod_notionflux_xwrite(int idx, const char *str)
+ {
+-    if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdout==NULL)
++    if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdoutput==NULL)
+         return FALSE;
+-    return fputs(str, bufs[idx].stdout)!=EOF;
++    return fputs(str, bufs[idx].stdoutput)!=EOF;
+ }
+ 
+ static void connection_attempt(int lfd, void *UNUSED(data))
+@@ -410,7 +410,7 @@ bool mod_notionflux_init()
+ 
+     for(i=0; i<MAX_SERVED; i++){
+         bufs[i].fd=-1;
+-        bufs[i].stdout=NULL;
++        bufs[i].stdoutput=NULL;
+         bufs[i].data=NULL;
+         bufs[i].ndata=0;
+     }
diff --git a/srcpkgs/notion/template b/srcpkgs/notion/template
index b0746f9b1c02..1246e0e9c6cd 100644
--- a/srcpkgs/notion/template
+++ b/srcpkgs/notion/template
@@ -1,17 +1,16 @@
 # Template file for 'notion'
-pkgname="notion"
-version=4.0.0
-revision=2
-archs="~*-musl"
+pkgname=notion
+version=4.0.2
+revision=1
+hostmakedepends="pkg-config gettext groff lua54"
+makedepends="libSM-devel libXext-devel libXft-devel libXinerama-devel
+ libXrandr-devel lua54-devel readline-devel"
 short_desc="Tabbed, tiling window manager"
-hostmakedepends="pkg-config gettext groff lua53"
-makedepends="lua53-devel libXext-devel libXft-devel libSM-devel libXinerama-devel libXrandr-devel"
 maintainer="Julian Wiesener <jw@vtoc.de>"
 license="LGPL-2.1-or-later"
-repository="nonfree"
-homepage="https://notionnm.net/"
+homepage="https://notionwm.net/"
 distfiles="https://github.com/raboof/notion/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=13ce5867667ad7a864c79f4cb1e322fa33ebcd872dfce6472026e4d69d1f4138
+checksum=dcefd620d028f6541c15879c3db218de081df7ce8d2e9cb4fc7ddd9b9253b698
 
 do_build() {
 	make CC=$CC PREFIX=/usr ETCDIR=/etc/notion
@@ -21,5 +20,4 @@ do_install() {
 	make DESTDIR=${DESTDIR} PREFIX=/usr ETCDIR=/etc/notion install
 	vman man/notion.1
 	vman man/notionflux.1
-	vlicense LICENSE
 }

From 9a36f4679c8cc935959766f856d7e3469444144d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 11 Mar 2022 16:00:18 +0100
Subject: [PATCH 1066/2561] xinit: remove skel files.

We shipped two skeleton files for ~/.xinitrc and ~/.xsession, but the
default behavior of xinit/startx is more useful than an .xinitrc that
doesn't start a window manager, and the .xsession had a bug calling
bash -i which resulted in appending the .xinitrc into the user history...
drop this unnecessary stuff.

Users can copy /etc/X11/xinit/xinitrc as a starting point.
---
 srcpkgs/xinit/files/xinitrc  | 17 -----------------
 srcpkgs/xinit/files/xsession | 10 ----------
 srcpkgs/xinit/template       |  8 ++------
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/xinit/files/xinitrc
 delete mode 100644 srcpkgs/xinit/files/xsession

diff --git a/srcpkgs/xinit/files/xinitrc b/srcpkgs/xinit/files/xinitrc
deleted file mode 100644
index dbd080d00361..000000000000
--- a/srcpkgs/xinit/files/xinitrc
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
diff --git a/srcpkgs/xinit/files/xsession b/srcpkgs/xinit/files/xsession
deleted file mode 100644
index a16dc0b8421f..000000000000
--- a/srcpkgs/xinit/files/xsession
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/bash --login -i ~/.xinitrc
-
diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template
index be836ebc94ad..b687c0ccd2c4 100644
--- a/srcpkgs/xinit/template
+++ b/srcpkgs/xinit/template
@@ -1,7 +1,7 @@
 # Template file for 'xinit'
 pkgname=xinit
 version=1.4.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-xinitdir=/etc/X11/xinit"
 hostmakedepends="pkg-config"
@@ -15,13 +15,9 @@ checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9
 
 conf_files="
 	/etc/X11/xinit/xinitrc
-	/etc/X11/xinit/xserverrc
-	/etc/skel/.xinitrc
-	/etc/skel/.xsession"
+	/etc/X11/xinit/xserverrc"
 
 post_install() {
-	vinstall ${FILESDIR}/xinitrc 644 etc/skel .xinitrc
-	vinstall ${FILESDIR}/xsession 644 etc/skel .xsession
 	vinstall ${FILESDIR}/xserverrc 644 etc/X11/xinit
 	vlicense COPYING
 }

From 1e74b8aa9925a4a81e924b759511c1d6d458e2d7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 19:10:10 +0100
Subject: [PATCH 1067/2561] xine-lib: update to 1.2.12.

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

diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template
index 51cbd363f7ba..f713eff49b07 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'xine-lib'
 pkgname=xine-lib
-version=1.2.11
+version=1.2.12
 revision=1
 build_style=gnu-configure
 configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.xine-project.org"
 changelog="https://sourceforge.net/projects/xine/files/xine-lib/${version}/README.txt/view"
 distfiles="${SOURCEFORGE_SITE}/xine/${pkgname}-${version}.tar.xz"
-checksum=ef51b21d10dda1045fa7d711bd9171cfdaf0a5a2874233bcf16ffdf28ec07005
+checksum=d606270468e1540c2a89c0d7f5fdf11e17ecc0c2698cc0bcb1065ff26abee098
 
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl)

From 499af9f9eaa687a96d4ce0671d9497dc43483854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 14 Mar 2022 08:37:19 +0100
Subject: [PATCH 1068/2561] New package: python3-subprocess-tee-0.3.5

---
 srcpkgs/python3-subprocess-tee/template | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/python3-subprocess-tee/template

diff --git a/srcpkgs/python3-subprocess-tee/template b/srcpkgs/python3-subprocess-tee/template
new file mode 100644
index 000000000000..39a0233dad70
--- /dev/null
+++ b/srcpkgs/python3-subprocess-tee/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-subprocess-tee'
+pkgname=python3-subprocess-tee
+version=0.3.5
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-pep517
+make_install_target="subprocess_tee-${version}-py3-none-any.whl"
+hostmakedepends="python3-wheel python3-toml"
+depends="python3"
+short_desc="Replacement for subprocess.run capturing output while still printing it"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/pycontribs/subprocess-tee"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577
+# requires molecule, which isn't packaged yet
+make_check=no
+
+post_patch() {
+	# scm versioning is broken in this release
+	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 17f7cdcd32c0bf48b4fdcbf7bba34035f95f5335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 14 Mar 2022 08:38:01 +0100
Subject: [PATCH 1069/2561] New package: python3-ansible-compat-2.0.0

---
 srcpkgs/python3-ansible-compat/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/python3-ansible-compat/template

diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
new file mode 100644
index 000000000000..bf03fe221d0a
--- /dev/null
+++ b/srcpkgs/python3-ansible-compat/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-ansible-compat'
+pkgname=python3-ansible-compat
+version=2.0.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-pep517
+make_install_target="ansible_compat-${version}-py3-none-any.whl"
+hostmakedepends="python3-wheel python3-toml"
+depends="python3-subprocess-tee"
+short_desc="Python package for working with various version of ansible"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/ansible-community/ansible-compat"
+distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=4027da4ec2b524c263a801cc2dc6da2b98c2996cec258cef118a30c790467ed2
+
+post_patch() {
+	# scm versioning is broken in this release
+	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 272402874dd69c8160f33b5dd7866f2c45cdc933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 14 Mar 2022 08:38:12 +0100
Subject: [PATCH 1070/2561] python3-ansible-lint: update to 6.0.2.

---
 srcpkgs/python3-ansible-lint/template | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index 78d31ea90639..00d8dc40f6a6 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,18 +1,25 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
-version=5.4.0
+version=6.0.2
 revision=1
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
 make_install_target="ansible_lint-${version}-py3-none-any.whl"
 hostmakedepends="python3-wheel python3-toml"
-depends="ansible-core python3-yamllint python3-six python3-yaml python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch"
+depends="ansible-core python3-yamllint python3-six python3-yaml
+ python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch
+ python3-ansible-compat"
 short_desc="Linter for Ansible files"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
-license="MIT"
+# Note about licensing from upstream:
+# The ansible-lint project is distributed as GPLv3 due to use of GPLv3 runtime
+# dependencies, like ansible and yamllint. For historical reasons, its own
+# code-base remains licensed under a more liberal MIT license and any
+# contributions made are accepted as being made under original MIT license.
+license="GPL-3.0-only"
 homepage="https://github.com/ansible-community/ansible-lint"
 distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=2160a60b4ab034c04006d701a1779340ffb0f6e28f030ff8de958e1062a88962
+checksum=b539bc22d13e6de0cc2e25758e1d28b2bc01561a414ae37ceda3708b5a2a79ed
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660
@@ -22,7 +29,3 @@ post_patch() {
 	# scm versioning is broken in this release
 	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
 }
-
-post_install() {
-	vlicense LICENSE
-}

From 2f891034ebf2c3e390f66bbb96381a16d4397118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 26 Mar 2022 12:20:51 +0100
Subject: [PATCH 1071/2561] ansible: update to 5.5.0.

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

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index eb132fa68380..063e24d1684a 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=5.4.0
+version=5.5.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ 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=2f0ecbd8a3232e520bf3e3bc23f40dda60b9ce7924ca194bd35f4de4027100fc
+checksum=b8a76d737889c9bfd0e6b0f2276dcf8d836da667067a355776f3504d7a66d518
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660

From 85c54a2c83e7f498c01817493146a054affadcb4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:25 -0400
Subject: [PATCH 1072/2561] openjdk12-bootstrap: fix version, xlint

---
 srcpkgs/openjdk12-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 4861ad1efc40..2b5d421a52f0 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk12-bootstrap'
-_java_ver=12
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=10
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk12-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=12.0.2+10
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 12)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
 

From e24c034e994ce1693e52bed84eab1bd0f70e8249 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:26 -0400
Subject: [PATCH 1073/2561] openjdk13-bootstrap: fix version, xlint

---
 srcpkgs/openjdk13-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 82c34b7999f3..4a61e102381d 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk13-bootstrap'
-_java_ver=13
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=8
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk13-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=13.0.2+8
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 13)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
 

From 550cb6940d2f51c572de0c36efa3aa2139abd887 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:27 -0400
Subject: [PATCH 1074/2561] openjdk14-bootstrap: fix version, xlint

---
 srcpkgs/openjdk14-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 5c15ca3f32c0..768b94633196 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk14-bootstrap'
-_java_ver=14
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=12
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk14-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=14.0.2+12
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel openjdk13-bootstrap"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 14)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
 
 # Build is still parallel, but don't use -jN.

From 19d077a8113365b4ad4764241b8b0a9430a57c7f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:28 -0400
Subject: [PATCH 1075/2561] openjdk15-bootstrap: fix version, xlint

---
 srcpkgs/openjdk15-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index efbc69f9429e..7608f4dd2658 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk15-bootstrap'
-_java_ver=15
-_java_min_ver=0
-_java_sec_ver=3
-_jdk_update=3
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk15-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=15.0.3+3
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -38,7 +35,6 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk14-bootstrap"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 15)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
@@ -47,6 +43,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
  https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
 checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
 
 # Build is still parallel, but don't use -jN.

From 8e3e1b093592b37fb94e49b749ce70a56542cafd Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:29 -0400
Subject: [PATCH 1076/2561] openjdk16-bootstrap: fix version, xlint

---
 srcpkgs/openjdk16-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 9bea476c6836..28e70a17fd2b 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk16-bootstrap'
-_java_ver=16
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=7
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk16-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=16.0.2+7
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --enable-unlimited-crypto
@@ -38,7 +35,6 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk15-bootstrap"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 16)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
@@ -47,6 +43,7 @@ distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.ta
  https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
 checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
 
 # Build is still parallel, but don't use -jN.

From 5b9d3ad0f2159d3ac92788a02edfc01f4b0fe9da Mon Sep 17 00:00:00 2001
From: Mizuno Jan Yuta <mjy@8x9.space>
Date: Fri, 8 Apr 2022 01:05:47 +0900
Subject: [PATCH 1077/2561] mdocml: fix readability issues in void-man-cgi.

Fix: #36557
---
 srcpkgs/mdocml/files/void.css | 37 +++++++++++++++++++++++++----------
 srcpkgs/mdocml/template       |  2 +-
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/mdocml/files/void.css b/srcpkgs/mdocml/files/void.css
index 289145066991..4e2f75357213 100644
--- a/srcpkgs/mdocml/files/void.css
+++ b/srcpkgs/mdocml/files/void.css
@@ -1,8 +1,24 @@
 
 /** Void style **/
-body { color: #333; }
-a { color: #478061; }
-a:hover { color: #000; }
+html {
+	--fg: #333;
+	--bg: #fff;
+	--fg-accent: #478061;
+	--nav-fg: #fff;
+	--nav-bg: #478061;
+}
+@media (prefers-color-scheme: dark) {
+	html {
+		--fg: #ccc;
+		--bg: #222;
+		--fg-accent: #62b086;
+		--nav-fg: #fff;
+		--nav-bg: #295340;
+	}
+}
+
+a, :link, :visited { color: var(--fg-accent); }
+a:hover { color: var(--fg); }
 
 html { max-width: 100% }
 body { margin: 0 }
@@ -11,29 +27,30 @@ body { margin: 0 }
 nav#void-nav {
 	width:100%;
 	min-height:50px;
-	background:#478061;
+	color:var(--nav-fg);
+	background-color:var(--nav-bg);
 	z-index:110;
 	font-size:14px
 }
 nav#void-nav ul {
-	float:right;
+	display:block;
 	list-style:none;
 	margin:0
 }
 nav#void-nav ul li {
-	float:left;
+	display:inline-block;
 	margin:0;
-	clear:initial
 }
 nav#void-nav ul li a {
-	display:block;
+	display:inline-block;
 	padding:15px;
 	line-height:20px;
 	font-size:1.2em;
-	color:#fff;
+	color:var(--nav-fg);
 	text-decoration: none
 }
 nav#void-nav ul li a:hover,nav#void-nav ul li a:focus {
-	background:#000;
+	color:#fff;
+	background-color:#000;
 	text-decoration:none
 }
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index 41e07f089ab2..e8aa98cdb158 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.14.6
-revision=1
+revision=2
 wrksrc="mandoc-${version}"
 build_style=configure
 make_build_args="all man.cgi"

From 4857bba691a580f07602ee009550b7b05d7d06e4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 19:01:04 +0200
Subject: [PATCH 1078/2561] mdocml: add padding to void-mang-cgi, limit line
 length.

---
 srcpkgs/mdocml/files/void.css | 2 +-
 srcpkgs/mdocml/template       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdocml/files/void.css b/srcpkgs/mdocml/files/void.css
index 4e2f75357213..89a9fb4b3211 100644
--- a/srcpkgs/mdocml/files/void.css
+++ b/srcpkgs/mdocml/files/void.css
@@ -22,7 +22,7 @@ a:hover { color: var(--fg); }
 
 html { max-width: 100% }
 body { margin: 0 }
-#mandoc { max-width: 65em; margin: 0.8em }
+.manual-text { max-width: 65em; padding: 0 1em; }
 
 nav#void-nav {
 	width:100%;
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index e8aa98cdb158..e18de8b7adf2 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.14.6
-revision=2
+revision=3
 wrksrc="mandoc-${version}"
 build_style=configure
 make_build_args="all man.cgi"

From 3bf85b998900a904482796646034e53eea8a6e51 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 7 Apr 2022 11:44:33 -0500
Subject: [PATCH 1079/2561] xmandump: update to 0.2.2.

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

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index ae17bbcefa49..b05027396eaf 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,6 +1,6 @@
 # Template file for 'xmandump'
 pkgname=xmandump
-version=0.2.1
+version=0.2.2
 revision=1
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="ISC"
 homepage="https://github.com/void-linux/xmandump"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ca261e075940c97cb3ad639e4c8b746fa93bc7559032bc1ada3858c63658d014
+checksum=c664b84b9eb26e6cf6d7bc0aceca9a2ccfcfb1c0a4e0611544117489941c00ca
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 8f4fadc49e05b654a298ced8b313dea0c73afc74 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sat, 2 Apr 2022 23:59:42 +0300
Subject: [PATCH 1080/2561] vault: update to 1.10.0.

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

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 4746d4974195..49f6a4b405b9 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,6 +1,6 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.9.4
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=7ebae46e12ff353c3a9e861c4991410679a3c890d36c7c6fb17b43e9ea6f6115
+checksum=4b3303af72b9383369d6219dc88beaef3b343b262625e5d7c6a309ae9286d8c2
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0750 root _vault"

From 324e91944db82f636e5873c7f2f540eb73faccb7 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 2 Apr 2022 16:22:04 +0530
Subject: [PATCH 1081/2561] avrdude: update to 6.4, adopt

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

diff --git a/srcpkgs/avrdude/template b/srcpkgs/avrdude/template
index ec6866e05bab..5ebe45ae47e4 100644
--- a/srcpkgs/avrdude/template
+++ b/srcpkgs/avrdude/template
@@ -1,15 +1,21 @@
 # Template file for 'avrdude'
 pkgname=avrdude
-version=6.3
-revision=3
+version=6.4
+revision=1
 build_style=gnu-configure
+configure_args="$(vopt_enable gpio linuxgpio) $(vopt_enable spi linuxspi)"
 hostmakedepends="flex"
-makedepends="elfutils-devel libusb-devel libusb-compat-devel libftdi1-devel"
+makedepends="elfutils-devel libusb-devel libusb-compat-devel libftdi1-devel
+ hidapi-devel"
 depends="avr-libc"
 short_desc="Utility to manipulate ROM and EEPROM of AVR microcontrollers"
-maintainer="allan <mail@may.mooo.com>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://www.nongnu.org/avrdude/"
 distfiles="$NONGNU_SITE/$pkgname/${pkgname}-$version.tar.gz"
-checksum=0f9f731b6394ca7795b88359689a7fa1fba818c6e1d962513eb28da670e0a196
+checksum=a9be7066f70a9dcf4bf0736fcf531db6a3250aed1a24cc643add27641b7110f9
 conf_files="/etc/avrdude.conf"
+build_options="gpio spi"
+desc_option_spi="Enable LINUXSPI support"
+desc_option_gpio="Enable LINUXGPIO support"
+build_options_default="${build_options}"

From 74fdb4bb6bcbddc978ef99336fc8eb02a4cdfeb1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Mar 2022 12:08:58 +0200
Subject: [PATCH 1082/2561] exa: adopt and adjust dependencies

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

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index d2eb81a34ec0..660f997c809e 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -3,10 +3,10 @@ pkgname=exa
 version=0.10.1
 revision=1
 build_style=cargo
-hostmakedepends="pkg-config libgit2-devel"
+hostmakedepends="pkg-config"
 makedepends="libgit2-devel"
 short_desc="Modern replacement for ls"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="MIT"
 homepage="https://the.exa.website/"
 distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz

From 9e7b6410827fc1f9aff6993c499661d5c81f0702 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 12:47:25 +0100
Subject: [PATCH 1083/2561] muffin: update to 5.2.1.

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

diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 830922739b4f..cb8032a75d21 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
 # Template file for 'muffin'
 pkgname=muffin
-version=5.2.0
+version=5.2.1
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -15,8 +15,9 @@ short_desc="Cinnamon window manager based on Mutter"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/muffin"
+changelog="https://raw.githubusercontent.com/linuxmint/muffin/master/debian/changelog"
 distfiles="https://github.com/linuxmint/muffin/archive/${version}.tar.gz"
-checksum=8366569f27a62913dade9935e0688b3636ca11b8ee00a061c9fdcbb6b27f3e2f
+checksum=356a9fce1f4e9f39a6e0156c5dcab1e4190113a191cf1422d1ea08dbea4bfda4
 shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
  libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
 

From aeb0dbef0189a8802673577156da94bc46af439d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 16:12:00 +0100
Subject: [PATCH 1084/2561] libvdpau: update to 1.5.

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

diff --git a/srcpkgs/libvdpau/template b/srcpkgs/libvdpau/template
index 8b1c817cfd07..fcc2b6fcfd58 100644
--- a/srcpkgs/libvdpau/template
+++ b/srcpkgs/libvdpau/template
@@ -1,6 +1,6 @@
 # Template file for 'libvdpau'
 pkgname=libvdpau
-version=1.4
+version=1.5
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://freedesktop.org/wiki/Software/VDPAU/"
 distfiles="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/libvdpau-${version}.tar.gz"
-checksum=240dd8f9ec08de707529917677827ba12e13b9fc299eeb3af13ea05e7fc74aba
+checksum=66490802f30426d30ff9e8af35263bbbbaa23b52d0a2d797d06959c3d19638fd
 
 post_install() {
 	vlicense COPYING

From b41da0dd2106574a41850f2a38d7f701b7745484 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 16:12:04 +0100
Subject: [PATCH 1085/2561] vdpauinfo: update to 1.4.

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

diff --git a/srcpkgs/vdpauinfo/template b/srcpkgs/vdpauinfo/template
index 611b5d864010..9b71a655a935 100644
--- a/srcpkgs/vdpauinfo/template
+++ b/srcpkgs/vdpauinfo/template
@@ -1,16 +1,17 @@
 # Template file for 'vdpauinfo'
 pkgname=vdpauinfo
-version=1.0
-revision=3
+_glhash=8f047eac351672cc4316724edb6ad2b2
+version=1.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libvdpau-devel"
 short_desc="Command line utility for querying the capabilities of a VDPAU device"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://cgit.freedesktop.org/~aplattner/vdpauinfo"
-distfiles="http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${version}.tar.gz"
-checksum=4054960b7ae618c351ff1ce3e7831b5cbda964ae1fbf9969b7146404d3044bc4
+homepage="https://freedesktop.org/wiki/Software/VDPAU/"
+distfiles="https://gitlab.freedesktop.org/vdpau/vdpauinfo/uploads/${_glhash}/vdpauinfo-${version}.tar.gz"
+checksum=40188bc5671c139e58330dbcac2a6ced0064485cb4cdf368558feca17d7922a0
 
 post_install() {
 	vlicense COPYING

From 941d96f12c7405a78b8ff2e2758863ec33d3b905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 9 Feb 2022 17:53:05 +0100
Subject: [PATCH 1086/2561] cargo-deny: update to 0.11.3.

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

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 6adc1fdd9cf2..4045e5a8c568 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.10.1
+version=0.11.3
 revision=1
 build_style=cargo
 configure_args="--no-default-features"
@@ -10,13 +10,18 @@ short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
+changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=136764d16b6d60fc9ddec4989ab4cb2bdcee9a096d0f3cd40b1c574bcc1b7f44
+checksum=d9e6adc8342d69b84b4c4e6b1d34eaaf0750b4680a9c675c8c74659a8c27cfc8
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"
 fi
 
+post_patch() {
+ 	cargo update --package autocfg --precise 1.1.0
+}
+
 post_install() {
 	vlicense LICENSE-APACHE
 	vlicense LICENSE-MIT

From 05e16fc4b8c207617ccc81ea89b228bc3e11c4bf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 16:11:31 +0100
Subject: [PATCH 1087/2561] libva: update to 2.14.0.

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

diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index bcf4c8003d75..093f7b86355b 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.13.0
+version=2.14.0
 revision=1
 build_style=meson
 configure_args="-Dwith_glx=no"
@@ -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=6b7ec7d4fa204dad3f266450981f1f0892400c03afd3e00ac11f8ccade5aaaa1
+checksum=f21152a2170edda9d1c4dd463d52eaf62b553e83e553c0a946654523cca86d5e
 
 build_options="wayland"
 build_options_default="wayland"

From 406058153fe75d2ef786f02f316c4f21bde532ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 16:11:35 +0100
Subject: [PATCH 1088/2561] libva-glx: update to 2.14.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 268daeda3f3e..b8411bcb09fb 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.13.0
+version=2.14.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=6b7ec7d4fa204dad3f266450981f1f0892400c03afd3e00ac11f8ccade5aaaa1
+checksum=f21152a2170edda9d1c4dd463d52eaf62b553e83e553c0a946654523cca86d5e
 
 post_install() {
 	# We are only interested in the glx component, remove everything else.

From 5ab306f5e972a03a03f6bd4d7b651a19bf562973 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 16:11:39 +0100
Subject: [PATCH 1089/2561] libva-utils: update to 2.14.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 0cf9bd48088c..b98e3e9f73a3 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.13.0
+version=2.14.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=128333faa9792a3b87586a80bfb70859dcdd81847ec9a722f785a601a48e1731
+checksum=0ad6410aaa27d7b15dadee0f4d775d54d6394b582bf315353a4657b49c78ac31
 
 post_install() {
 	vlicense COPYING

From 02ca1680af73fb0b6e57ca00c3804ae28358b871 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 13 Feb 2022 08:58:24 +0000
Subject: [PATCH 1090/2561] iproute2: update to 5.16.0.

---
 ...0001-lib-fix-ax25.h-include-for-musl.patch | 36 +++++++++++++++++++
 srcpkgs/iproute2/template                     |  4 +--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch

diff --git a/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch b/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
new file mode 100644
index 000000000000..401965b0a348
--- /dev/null
+++ b/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
@@ -0,0 +1,36 @@
+From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 13 Jan 2022 08:14:13 +0000
+Subject: [PATCH] lib: fix ax25.h include for musl
+
+ax25.h isn't guaranteed to be avilable in netax25/*;
+it's dependent on our choice of libc (it's not available
+on musl at least) [0].
+
+Let's use the version from linux-headers.
+
+[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers
+Bug: https://bugs.gentoo.org/831102
+
+Signed-off-by: Sam James <sam@gentoo.org>
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+---
+ lib/ax25_ntop.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c
+index cfd0e04b06f9..3a72a43e9b77 100644
+--- a/lib/ax25_ntop.c
++++ b/lib/ax25_ntop.c
+@@ -2,7 +2,7 @@
+ 
+ #include <errno.h>
+ #include <sys/socket.h>
+-#include <netax25/ax25.h>
++#include <linux/ax25.h>
+ 
+ #include "utils.h"
+ 
+-- 
+2.35.1
+
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 8f517150839a..9dbba00b6fe0 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=5.12.0
+version=5.16.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
 distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9d268db98a36ee2a0e3ff3b92b2efff66fc1138a51e409bdef6ab3cfe15f326f
+checksum=c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f
 
 conf_files="
  /etc/iproute2/ematch_map

From 7181bc3704bea6402682d7ae34b039895b18baa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 6 Feb 2022 12:01:07 -0300
Subject: [PATCH 1091/2561] findutils: update to 4.9.0.

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

diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index b35980a49d9c..aae4919f2ee5 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -1,6 +1,6 @@
 # Template file for 'findutils'
 pkgname=findutils
-version=4.8.0
+version=4.9.0
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/findutils"
 changelog="https://git.savannah.gnu.org/cgit/findutils.git/plain/NEWS"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164
+checksum=a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From 32e93608261c8f5a3d8a7c0f6ad0e1208941c246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 1 Feb 2022 23:06:24 +0100
Subject: [PATCH 1092/2561] ethtool: update to 5.16.

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

diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index 66add241d5e2..26ea94680d6b 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
 # Template file for 'ethtool'
 pkgname=ethtool
-version=5.14
+version=5.16
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,6 +8,6 @@ makedepends="libmnl-devel"
 short_desc="Utility for controlling network drivers and hardware"
 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=bb13db91915cacd7a492b65b65df07a67e4b974ddbeaf76205b1945a23d27686
+homepage="https://www.kernel.org/pub/software/network/ethtool/"
+distfiles="https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=aa2fef1936dd4a11755dfa0bdb93f0ec5bea45208d27c9754bc3abe1aa42c1cb

From a57d04e13a6fd7643edff95b6bad11622cd5049c Mon Sep 17 00:00:00 2001
From: Bleznudd <bleznudd@pm.me>
Date: Thu, 17 Feb 2022 17:38:13 +0100
Subject: [PATCH 1093/2561] setzer: update to 0.4.4.

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

diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index dbf10bb07705..ab0d86c3ec3b 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,14 +1,14 @@
 # Template file for 'setzer'
 pkgname=setzer
-version=0.4.2
+version=0.4.4
 revision=1
 wrksrc=Setzer-${version}
 build_style=meson
 hostmakedepends="gettext"
-depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-pdfminer.six python3-pexpect"
+depends="poppler-glib virtual?tex gspell python3-gobject gtksourceview4 python3-pdfminer.six python3-pexpect"
 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=50b5d273120f81b1f0a7efbcc0ce1fb1623518fe18b23ded45a82e8166003d3b
+checksum=2b380c2d100970e25f851f42c354ed10e0c51de86c7b28ec1252173c22c393ce

From 46cf48ca18a7391d667813c296530798de5cf7ae Mon Sep 17 00:00:00 2001
From: Erica Z <zerica@tilde.team>
Date: Mon, 20 Dec 2021 19:57:16 +0100
Subject: [PATCH 1094/2561] font-ibm-plex-ttf: update to 6.0.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When there’s a choice between hinted and unhinted variants for a font
family, this template chooses the former. This is more or less an
arbitrary choice, since I’m unaware of any specific guidelines of this
sort. It’s impossible to include both, as the files themselves overlap,
and including neither (where applicable) would completely remove support
for some languages.
---
 srcpkgs/font-ibm-plex-ttf/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-ibm-plex-ttf/template b/srcpkgs/font-ibm-plex-ttf/template
index c5226d6761fd..b1717b8831c0 100644
--- a/srcpkgs/font-ibm-plex-ttf/template
+++ b/srcpkgs/font-ibm-plex-ttf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-ibm-plex-ttf'
 pkgname=font-ibm-plex-ttf
-version=5.2.1
+version=6.0.0
 revision=1
 wrksrc="plex-${version}"
 depends="font-util"
@@ -9,13 +9,14 @@ maintainer="Felipe Nogueira <contato.fnog@gmail.com>"
 license="OFL-1.1"
 homepage="https://github.com/IBM/plex"
 distfiles="https://github.com/IBM/plex/archive/v${version}.tar.gz"
-checksum=6b43a97a116a4beba474b9a9c646fb6ded8ba255fa8d3b252e669f67cbeb9d7f
+checksum=e78cc68cb40ccca0318facade727a0deb32f73e931a2e31bb2fcaf8a6d386dff
 
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
 	vmkdir usr/share/fonts/TTF
 	vcopy "IBM-Plex-*/fonts/complete/ttf/*.ttf" usr/share/fonts/TTF
+	vcopy "IBM-Plex-*/fonts/complete/ttf/hinted/*.ttf" usr/share/fonts/TTF
 }
 
 font-ibm-plex-otf_package() {
@@ -25,5 +26,6 @@ font-ibm-plex-otf_package() {
 	pkg_install() {
 		vmkdir usr/share/fonts/OTF
 		vcopy "IBM-Plex-*/fonts/complete/otf/*.otf" usr/share/fonts/OTF
+		vcopy "IBM-Plex-*/fonts/complete/otf/hinted/*.otf" usr/share/fonts/OTF
 	}
 }

From 2bb75a9cee21379846fe0295f5970df373d27920 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 19:21:41 +0200
Subject: [PATCH 1095/2561] e2fsprogs: update to 1.46.5.

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

diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index f58472ff7a8d..a32c50b823b5 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
-version=1.46.4
+version=1.46.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-elf-shlibs --disable-fsck
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://e2fsprogs.sourceforge.net/"
 distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
-checksum=b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713
+checksum=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e
 conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
 
 do_check() {

From a3a3d111777b52f120344371f0eeb4caf90de83b Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH 1096/2561] musikcube: update to 0.97.0, adopt

- Added patch to fix MPRIS support detection
- Moved openmpt plugin to a separate package `musikcube-openmpt`
---
 srcpkgs/musikcube-openmpt                     |  1 +
 .../patches/fix-install-locations.patch       | 26 ++++++-------
 .../patches/fix-mpris-detection.patch         | 25 ++++++++++++
 srcpkgs/musikcube/template                    | 39 +++++++++++--------
 4 files changed, 62 insertions(+), 29 deletions(-)
 create mode 120000 srcpkgs/musikcube-openmpt
 create mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch

diff --git a/srcpkgs/musikcube-openmpt b/srcpkgs/musikcube-openmpt
new file mode 120000
index 000000000000..b3cc8e74bf48
--- /dev/null
+++ b/srcpkgs/musikcube-openmpt
@@ -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 63537349f450..590f27bf1a7d 100644
--- a/srcpkgs/musikcube/patches/fix-install-locations.patch
+++ b/srcpkgs/musikcube/patches/fix-install-locations.patch
@@ -1,11 +1,11 @@
 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 CMakeLists.txt CMakeLists.txt
-index d685695f..5ac43f1f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -208,7 +208,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+diff --git a/.cmake/InstallFiles.cmake b/.cmake/InstallFiles.cmake
+index 62d3c003..01ef58ac 100644
+--- a/.cmake/InstallFiles.cmake
++++ b/.cmake/InstallFiles.cmake
+@@ -4,7 +4,7 @@ if (APPLE)
    install(FILES ${plugins} DESTINATION share/musikcube/plugins)
  else ()
    file(GLOB plugins "bin/plugins/*.so")
@@ -13,9 +13,9 @@ index d685695f..5ac43f1f 100644
 +  install(FILES ${plugins} DESTINATION lib/musikcube/plugins)
  endif ()
  
- file(GLOB sdk_headers "src/musikcore/sdk/*.h")
-@@ -237,20 +237,12 @@ endif()
- if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ if (${BUILD_STANDALONE} MATCHES "true")
+@@ -43,20 +43,12 @@ endif()
+ if (APPLE)
    install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube)
  else()
 -  install(FILES "bin/libmusikcore.so" DESTINATION share/musikcube)
@@ -36,7 +36,7 @@ index d685695f..5ac43f1f 100644
    DESTINATION bin/
    PERMISSIONS
      OWNER_EXECUTE OWNER_READ OWNER_WRITE
-@@ -260,14 +252,6 @@ install(
+@@ -66,14 +58,6 @@ install(
  # executable and shell script for daemon
  install(
    FILES bin/musikcubed
@@ -51,12 +51,12 @@ index d685695f..5ac43f1f 100644
    DESTINATION bin/
    PERMISSIONS
      OWNER_EXECUTE OWNER_READ OWNER_WRITE
-diff --git src/musikcore/support/Common.cpp src/musikcore/support/Common.cpp
-index 58bc4d2f..1670c2f7 100644
+diff --git a/src/musikcore/support/Common.cpp b/src/musikcore/support/Common.cpp
+index 31703117..53aa8a88 100644
 --- a/src/musikcore/support/Common.cpp
 +++ b/src/musikcore/support/Common.cpp
-@@ -90,65 +90,11 @@ namespace musik { namespace core {
-     }
+@@ -82,65 +82,11 @@ static inline void silentDelete(const std::string fn) {
+ namespace musik { namespace core {
  
      std::string GetPluginDirectory() {
 -        std::string path(GetApplicationDirectory());
diff --git a/srcpkgs/musikcube/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
new file mode 100644
index 000000000000..dc7035d06693
--- /dev/null
+++ b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
@@ -0,0 +1,25 @@
+In Void linux, elogind provides libsystemd
+
+diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake
+index ce0eea9b..5b067671 100644
+--- a/.cmake/AddOsSpecificPlugins.cmake
++++ b/.cmake/AddOsSpecificPlugins.cmake
+@@ -6,7 +6,7 @@ endif()
+ 
+ # systemd / MPRIS detection
+ if (NOT ENABLE_MPRIS MATCHES "false")
+-  find_library(LIB_SYSTEMD NAMES systemd)
++  find_library(LIB_SYSTEMD NAMES elogind)
+   if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND")
+     message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD})
+     message(STATUS "[mpris] setting ENABLE_MPRIS=true")
+diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt
+index fdee62d2..7a941d08 100644
+--- a/src/plugins/mpris/CMakeLists.txt
++++ b/src/plugins/mpris/CMakeLists.txt
+@@ -6,4 +6,4 @@ find_package(PkgConfig)
+ pkg_check_modules (SYSTEMD REQUIRED libsystemd)
+ 
+ add_library(mpris SHARED ${mpris_SOURCES})
+-target_link_libraries(mpris systemd)
++target_link_libraries(mpris elogind)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index d8d4e73d6b4b..01afa616123a 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,40 +1,39 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.96.10
+version=0.97.0
 revision=1
 build_style=cmake
 make_cmd=make
-configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true
- -DENABLE_PIPEWIRE=true -DENABLE_BUNDLED_TAGLIB=false"
+configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=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 pipewire-devel"
+ sndio-devel pipewire-devel ncurses-libtinfo-devel libopenmpt-devel
+ $(vopt_if elogind elogind-devel)"
 short_desc="Terminal-based music player in c++"
-maintainer="eater <=@eater.me>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://musikcube.com/"
 distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=91fd984e68b6ef66f1be1ecdf0c84607453ec6ec80632ece688ac745c7719ea5
+checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5
+build_options="elogind"
+desc_option_elogind="Support MPRIS interface via elogind"
+build_options_default="elogind"
+
+export CMAKE_GENERATOR="Unix Makefiles"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'"
 fi
 
-export CMAKE_GENERATOR="Unix Makefiles"
-
-#XXX: Otherwise xbps-install ffmpeg-devel will complain about unresolving shlibs
-# SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
-makedepends+=" libglvnd"
-
 post_install() {
 	vlicense LICENSE.txt
 }
 
 musikcube-devel_package() {
-	depends="musikcube-${version}_${revision}"
+	depends="${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -42,7 +41,7 @@ musikcube-devel_package() {
 }
 
 musikcube-sndio_package() {
-	depends="musikcube>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - sndio output plugin"
 	pkg_install() {
 		vmove usr/lib/musikcube/plugins/libsndioout.so
@@ -50,9 +49,17 @@ musikcube-sndio_package() {
 }
 
 musikcube-pipewire_package() {
-	depends="musikcube>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - pipewire output plugin"
 	pkg_install() {
 		vmove usr/lib/musikcube/plugins/libpipewireout.so
 	}
 }
+
+musikcube-openmpt_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - openmpt decoder plugin"
+	pkg_install() {
+		vmove usr/lib/musikcube/plugins/libopenmptdecoder.so
+	}
+}

From b111a396d89bafab41d083e6629a6e943cb9dee4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Wed, 23 Mar 2022 11:54:41 +0100
Subject: [PATCH 1097/2561] btrbk: update depends from pv to mbuffer

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

diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template
index 5bc9c8d0ca3b..e4fa9196d218 100644
--- a/srcpkgs/btrbk/template
+++ b/srcpkgs/btrbk/template
@@ -1,11 +1,11 @@
 # Template file for 'btrbk'
 pkgname=btrbk
 version=0.31.3
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="BINDIR=/usr/bin"
 hostmakedepends="ruby-asciidoctor"
-depends="perl btrfs-progs openssh pv"
+depends="perl btrfs-progs mbuffer openssh"
 short_desc="Backup tool for btrfs subvolumes"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -14,7 +14,3 @@ changelog=https://github.com/digint/btrbk/blob/master/ChangeLog
 distfiles="http://digint.ch/download/btrbk/releases/${pkgname}-${version}.tar.xz"
 checksum=62f5494965dd594f81065e1ba17f9978d60343f72ee75ed18cda1a349cdda7d3
 conf_files="/etc/btrbk/*"
-
-post_install() {
-	rm -r $DESTDIR/usr/lib/systemd
-}

From 17e9533f67077627f0b829813231c8d8547780cf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Mar 2022 00:39:05 +0100
Subject: [PATCH 1098/2561] rspamd: remove gmime-devel build dependency

* not used since 1.5.0
---
 srcpkgs/rspamd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index e8df21abe54d..9d57ca1906c9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -7,8 +7,8 @@ build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
  -DDBDIR=/var/lib/rspamd"
 hostmakedepends="perl pkg-config ragel"
-makedepends="LuaJIT-devel fann-devel file-devel gd-devel gmime-devel
- hiredis-devel icu-devel libevent-devel sqlite-devel"
+makedepends="LuaJIT-devel fann-devel file-devel gd-devel
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
 short_desc="Fast, free and open-source spam filtering system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 5f91c65aec41cd0fc8bf6faec1a5cab0a09b6ec1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Mar 2022 00:40:02 +0100
Subject: [PATCH 1099/2561] grilo-plugins: remove useless build dependencies

* replace intltool with gettext
* remove gupnp-av-devel build dep, not used since 2014
* remove gmime-devel build dep, not used since 0.3.8
---
 srcpkgs/grilo-plugins/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 1cab3d09af26..65d0eb1640df 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,10 +3,10 @@ pkgname=grilo-plugins
 version=0.3.14
 revision=1
 build_style=meson
-hostmakedepends="pkg-config intltool itstool glib-devel gperf tracker3"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker3"
 # XXX missing plugins: fakemetadata.
-makedepends="grilo-devel gom-devel gupnp-av-devel json-glib-devel
- libquvi-devel rest-devel sqlite-devel libgcrypt-devel gmime-devel
+makedepends="grilo-devel gom-devel json-glib-devel
+ libquvi-devel rest-devel sqlite-devel libgcrypt-devel
  tracker3-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
  gstreamer1-devel libdmapsharing-devel lua53-devel gnome-online-accounts-devel
  avahi-glib-libs-devel"

From 84a5606a3bed33fc1da56f63a53020f85907064f Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 6 Apr 2022 11:55:29 -0700
Subject: [PATCH 1100/2561] python3-identify: update to 2.4.12

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/python3-identify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-identify/template b/srcpkgs/python3-identify/template
index 65fd70ec42c6..7d2c231b6727 100644
--- a/srcpkgs/python3-identify/template
+++ b/srcpkgs/python3-identify/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-identify'
 pkgname=python3-identify
-version=2.4.11
+version=2.4.12
 revision=1
 wrksrc="identify-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://github.com/chriskuehl/identify"
 distfiles="${PYPI_SITE}/i/identify/identify-${version}.tar.gz"
-checksum=2986942d3974c8f2e5019a190523b0b0e2a07cb8e89bf236727fb4b26f27f8fd
+checksum=3f3244a559290e7d3deb9e9adc7b33594c1bc85a9dd82e0f1be519bf12a1ec17
 
 post_install() {
 	vlicense LICENSE

From a494d40930259b56ced4049c2b6dcda8b4f41b1c Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 6 Apr 2022 11:56:29 -0700
Subject: [PATCH 1101/2561] pre-commit: fix update checks

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/pre-commit/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/pre-commit/update

diff --git a/srcpkgs/pre-commit/update b/srcpkgs/pre-commit/update
new file mode 100644
index 000000000000..c44d58c699eb
--- /dev/null
+++ b/srcpkgs/pre-commit/update
@@ -0,0 +1 @@
+pattern="pre_commit-\K[0-9.]+(?=.tar.gz)"

From 095b563c9931ae614c19836a9bfd6484883e6433 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 6 Apr 2022 11:56:57 -0700
Subject: [PATCH 1102/2561] pre-commit: update to 2.18.1

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/pre-commit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 3eecb71e1136..58e2730dde1f 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
 # Template file for 'pre-commit'
 pkgname=pre-commit
-version=2.17.0
+version=2.18.1
 revision=1
 wrksrc="pre_commit-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://pre-commit.com/"
 distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a
+checksum=5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10
 make_check=no   # No tests available
 
 post_install() {

From ee739fbd752b602e38267cb5548872c6c493f1be Mon Sep 17 00:00:00 2001
From: Anton Baranov <abaranov@linuxfoundation.org>
Date: Tue, 5 Apr 2022 12:37:54 -0400
Subject: [PATCH 1103/2561] New package: vcsh-2.0.4

Signed-off-by: Anton Baranov <abaranov@linuxfoundation.org>
---
 srcpkgs/vcsh/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/vcsh/template

diff --git a/srcpkgs/vcsh/template b/srcpkgs/vcsh/template
new file mode 100644
index 000000000000..59a8186aa754
--- /dev/null
+++ b/srcpkgs/vcsh/template
@@ -0,0 +1,14 @@
+# Template file for 'vcsh'
+pkgname=vcsh
+version=2.0.4
+revision=1
+build_style=gnu-configure
+hostmakedepends="git"
+depends="git"
+short_desc="Version Control System for home directory"
+maintainer="Anton Baranov <abaranov.anton@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/RichiH/vcsh"
+changelog="https://raw.githubusercontent.com/RichiH/vcsh/main/changelog"
+distfiles="${homepage}/releases/download/v${version}/vcsh-${version}.tar.xz"
+checksum=5bf425d89f474c340fbb47a5df8987573a9ef3928658b3e9876b07cae1333cf2

From 39758470d19566f5939f63b912ebd13a13605b4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 22:12:40 +0100
Subject: [PATCH 1104/2561] xbps-src: add strict mode

---
 common/environment/setup/vsed.sh |  7 ++++++-
 common/travis/build.sh           |  2 +-
 xbps-src                         | 11 ++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/common/environment/setup/vsed.sh b/common/environment/setup/vsed.sh
index 5b5bf427c239..c74c086a4ce8 100644
--- a/common/environment/setup/vsed.sh
+++ b/common/environment/setup/vsed.sh
@@ -57,8 +57,13 @@ vsed() {
 			newdigest="$($XBPS_DIGEST_CMD "$f")"
 			newdigest="${newdigest%% *}"
 
+			msgfunc=msg_warn
+			if [ -n "$XBPS_STRICT" ]; then
+				msgfunc=msg_error
+			fi
+
 			if [ "$olddigest" = "$newdigest" ]; then
-				msg_warn "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n"
+				$msgfunc "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n"
 			fi
 			olddigest="${newdigest}"
 		done
diff --git a/common/travis/build.sh b/common/travis/build.sh
index f5cf9cffc064..007a61f994d7 100755
--- a/common/travis/build.sh
+++ b/common/travis/build.sh
@@ -13,7 +13,7 @@ fi
 PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates))
 
 for pkg in ${PKGS}; do
-	/hostrepo/xbps-src -j$(nproc) -H "$HOME"/hostdir $arch $test pkg "$pkg"
+	/hostrepo/xbps-src -j$(nproc) -s -H "$HOME"/hostdir $arch $test pkg "$pkg"
 	[ $? -eq 1 ] && exit 1
 done
 
diff --git a/xbps-src b/xbps-src
index ff249015ed02..8488c5a3a49c 100755
--- a/xbps-src
+++ b/xbps-src
@@ -216,6 +216,9 @@ $(print_cross_targets)
     This alternative repository will also be used to resolve dependencies
     with highest priority order than others.
 
+-s
+    Make vsed warnings errors.
+
 -t  Create a temporary masterdir to not pollute the current one. Note that
     the existing masterdir must be fully populated with binary-bootstrap first.
     Once the target has finished, this temporary masterdir will be removed.
@@ -357,7 +360,7 @@ readonly XBPS_SRC_VERSION="113"
 export XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch)
 
 XBPS_OPTIONS=
-XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qQKr:tV"
+XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qsQKr:tV"
 
 # Preprocess arguments in order to allow options before and after XBPS_TARGET.
 eval set -- $(getopt "$XBPS_OPTSTRING" "$@");
@@ -389,6 +392,7 @@ while getopts "$XBPS_OPTSTRING" opt; do
         Q) XBPS_ARG_CHECK_PKGS=yes; XBPS_OPTIONS+=" -Q";;
         K) XBPS_ARG_CHECK_PKGS=full; XBPS_OPTIONS+=" -K";;
         r) XBPS_ARG_ALT_REPOSITORY="$OPTARG"; XBPS_OPTIONS+=" -r $OPTARG";;
+        s) XBPS_ARG_STRICT=yes; XBPS_OPTIONS+=" -s";;
         t) XBPS_ARG_TEMP_MASTERDIR=1; XBPS_OPTIONS+=" -t -C";;
         V) echo "xbps-src-$XBPS_SRC_VERSION $(xbps-uhelper -V)" && exit 0;;
         --) shift; break;;
@@ -471,6 +475,7 @@ fi
 [ -n "$XBPS_ARG_QUIET" ] && XBPS_QUIET=1
 [ -n "$XBPS_ARG_PRINT_VARIABLES" ] && XBPS_PRINT_VARIABLES="$XBPS_ARG_PRINT_VARIABLES"
 [ -n "$XBPS_ARG_ALT_REPOSITORY" ] && XBPS_ALT_REPOSITORY="$XBPS_ARG_ALT_REPOSITORY"
+[ -n "$XBPS_ARG_STRICT" ] && XBPS_STRICT="$XBPS_ARG_STRICT"
 [ -n "$XBPS_ARG_CROSS_BUILD" ] && XBPS_CROSS_BUILD="$XBPS_ARG_CROSS_BUILD"
 [ -n "$XBPS_ARG_CHECK_PKGS" ] && XBPS_CHECK_PKGS="$XBPS_ARG_CHECK_PKGS"
 [ -n "$XBPS_ARG_MAKEJOBS" ] && XBPS_MAKEJOBS="$XBPS_ARG_MAKEJOBS"
@@ -478,7 +483,7 @@ fi
 export XBPS_BUILD_ONLY_ONE_PKG XBPS_SKIP_REMOTEREPOS XBPS_BUILD_FORCEMODE \
        XBPS_INFORMATIVE_RUN XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \
        XBPS_USE_GIT_REVS XBPS_CHECK_PKGS XBPS_DEBUG_PKGS XBPS_SKIP_DEPS \
-       XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_CROSS_BUILD \
+       XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_CROSS_BUILD \
        XBPS_MAKEJOBS XBPS_PRINT_VARIABLES
 
 # The masterdir/hostdir variables are forced and readonly in chroot
@@ -626,7 +631,7 @@ readonly XBPS_CMPVER_CMD="xbps-uhelper cmpver"
 
 export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \
     XBPS_SRCPKGDIR XBPS_COMMONDIR XBPS_BUILDDIR \
-    XBPS_REPOSITORY XBPS_ALT_REPOSITORY XBPS_SRCDISTDIR XBPS_DIGEST_CMD \
+    XBPS_REPOSITORY XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_SRCDISTDIR XBPS_DIGEST_CMD \
     XBPS_UHELPER_CMD XBPS_INSTALL_CMD XBPS_QUERY_CMD XBPS_BUILD_ONLY_ONE_PKG \
     XBPS_RINDEX_CMD XBPS_RECONFIGURE_CMD XBPS_REMOVE_CMD XBPS_CHECKVERS_CMD \
     XBPS_CMPVER_CMD XBPS_FETCH_CMD XBPS_VERSION XBPS_BUILDSTYLEDIR \

From 0e71b46b8450599376838a3bebef7882b169b738 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 7 Mar 2022 10:48:07 +0200
Subject: [PATCH 1105/2561] CopyQ: update to 6.1.0.

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

diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template
index c7fa15c9d05c..1c7e3e041f9e 100644
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=6.0.1
+version=6.1.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-tools-devel extra-cmake-modules pkg-config
@@ -14,4 +14,4 @@ license="GPL-3.0-or-later"
 homepage="https://hluk.github.io/CopyQ/"
 changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES.md"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=8d0b0fa840993fa100e888a5a1098e2769e3c234cd44236d75039e5c6e517645
+checksum=d235b31224264e7fa463020f1a934143aa287a4d9cb9bbb6883563ad66e84099

From 3d5bdfb97f61c7a945ac197ea05b6d7f5b75bfd6 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Thu, 17 Feb 2022 11:37:42 -0700
Subject: [PATCH 1106/2561] protonmail-bridge: update to 2.1.1.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/protonmail-bridge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index 05cb9f62a13a..056676f69b84 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,6 +1,6 @@
 # Template file for 'protonmail-bridge'
 pkgname=protonmail-bridge
-version=1.8.12
+version=2.1.1
 revision=1
 archs="x86_64"
 build_style=fetch
@@ -10,7 +10,7 @@ maintainer="Rich G <rich@richgannon.net>"
 license="GPL-3.0-or-later"
 homepage="https://protonmail.com/bridge"
 distfiles="https://protonmail.com/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=90eff7d27e4835e3a204019cafa7062467ec45688a1a6d407896976bdeb1f8ea
+checksum=9c6c1daa0dac1835e72c886064b0e9a38749f96bdf47719f08eaac787d43bca7
 
 restricted=yes
 noverifyrdeps=yes

From d1a41aec867bbd94bf878c2a89bc215b0df4e1ef Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 7 Apr 2022 21:20:06 +0200
Subject: [PATCH 1107/2561] New package: mokutil-0.5.0

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

diff --git a/srcpkgs/mokutil/template b/srcpkgs/mokutil/template
new file mode 100644
index 000000000000..06225c575530
--- /dev/null
+++ b/srcpkgs/mokutil/template
@@ -0,0 +1,17 @@
+# Template file for 'mokutil'
+pkgname=mokutil
+version=0.5.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="autoconf automake pkg-config"
+makedepends="keyutils-devel libefivar-devel openssl-devel"
+short_desc="Utility to manipulate machine owner keys"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/lcp/mokutil"
+distfiles="https://github.com/lcp/mokutil/archive/refs/tags/${version}.tar.gz"
+checksum=af7616855f817e7eb54043071e51c8651bc8cc479ac455fbfe35203d98de8181
+
+pre_configure() {
+	autoreconf -fi
+}

From 8467ad56a6a08a50a5dcb10574e445de33f64753 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 19:18:14 +0200
Subject: [PATCH 1108/2561] printrun: remove package

---
 srcpkgs/printrun/template         | 20 --------------------
 srcpkgs/printrun/update           |  1 -
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 srcpkgs/printrun/template
 delete mode 100644 srcpkgs/printrun/update

diff --git a/srcpkgs/printrun/template b/srcpkgs/printrun/template
deleted file mode 100644
index d18d21df3e69..000000000000
--- a/srcpkgs/printrun/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'printrun'
-pkgname=printrun
-version=1.6.0
-revision=4
-wrksrc="Printrun-printrun-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools python-pyserial"
-depends="python wxPython python-pyserial python-pyglet python-numpy"
-short_desc="3D printing host suite"
-maintainer="Jasper Chan <jasperchan515@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="http://www.pronterface.com"
-distfiles="https://github.com/kliment/Printrun/archive/printrun-${version}.tar.gz"
-checksum=fefcb4c5793fc77205a14263bc915616cde0523cd60704f356191b9ae34ba65d
-
-post_install() {
-	for file in ${DESTDIR}/usr/bin/*.py; do
-		mv -- "$file" "${file%%.py}"
-	done
-}
diff --git a/srcpkgs/printrun/update b/srcpkgs/printrun/update
deleted file mode 100644
index 091ee4faee75..000000000000
--- a/srcpkgs/printrun/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[12][0-9][0-9][0-9][01][0-9][0-3][0-9]"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 240f1282f54c..9940f101c83b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -266,6 +266,7 @@ replaces="
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3
  polkit-qt<=0.112.0_5
+ printrun<=1.6.0_4
  pritunl-client<=1.0.1865.25_2
  profile-sync-daemon<=5.75_4
  profont<=1.0_2

From fc58e184a49b226ae3dc634ca7507affba72c486 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 19:26:06 +0200
Subject: [PATCH 1109/2561] python-pyglet: remove package

---
 srcpkgs/python3-pyglet                        |  1 -
 .../template                                  | 22 ++++++-------------
 .../{python-pyglet => python3-pyglet}/update  |  0
 srcpkgs/removed-packages/template             |  1 +
 4 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/python3-pyglet
 rename srcpkgs/{python-pyglet => python3-pyglet}/template (54%)
 rename srcpkgs/{python-pyglet => python3-pyglet}/update (100%)

diff --git a/srcpkgs/python3-pyglet b/srcpkgs/python3-pyglet
deleted file mode 120000
index 0da9a8d712fa..000000000000
--- a/srcpkgs/python3-pyglet
+++ /dev/null
@@ -1 +0,0 @@
-python-pyglet
\ No newline at end of file
diff --git a/srcpkgs/python-pyglet/template b/srcpkgs/python3-pyglet/template
similarity index 54%
rename from srcpkgs/python-pyglet/template
rename to srcpkgs/python3-pyglet/template
index e5444022ba3e..cb8333021997 100644
--- a/srcpkgs/python-pyglet/template
+++ b/srcpkgs/python3-pyglet/template
@@ -1,27 +1,19 @@
-# Template file for 'python-pyglet'
-pkgname=python-pyglet
+# Template file for 'python3-pyglet'
+pkgname=python3-pyglet
 version=1.4.10
 revision=4
 wrksrc="pyglet-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools unzip"
-depends="python"
-short_desc="Cross-platform windowing and multimedia library for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools unzip"
+depends="python3"
+short_desc="Cross-platform windowing and multimedia library for Python3"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.pyglet.org"
 distfiles="${PYPI_SITE}/p/pyglet/pyglet-${version}.zip"
 checksum=c57e3e18246f45e4d6bb3d29e39d128d6e72b05f4212b10353adc3ba260ceb65
+make_check=no # pyglet requires an X server with GLX
 
 post_install() {
 	vlicense LICENSE
 }
-
-python3-pyglet_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python-pyglet/update b/srcpkgs/python3-pyglet/update
similarity index 100%
rename from srcpkgs/python-pyglet/update
rename to srcpkgs/python3-pyglet/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9940f101c83b..222727ba8e70 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,7 @@ replaces="
  python-pycryptodome<=3.9.7_3
  python-pydns<=2.3.6_4
  python-pyenet<=1.3.13.post7_2
+ python-pyglet<=1.4.10_4
  python-pyside<=1.2.2_7
  python-pystache<=0.5.4_6
  python-pytest-relaxed<=1.1.2_2

From 80722324054a1410cfc1869dc121f56a804a590f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:01:07 +0200
Subject: [PATCH 1110/2561] gradio: remove package

archived repository, doesn't build with vala 0.56

Closes: #32470
---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 222727ba8e70..e4808ef3d798 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -95,6 +95,7 @@ replaces="
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
  goproxy<=7.0_1
+ gradio<=7.2_1
  grv<=0.3.1_3
  gsettings-qt<=0.1+17.10.20170824_3
  gst1-python<=1.18.3_1

From d2ed0004ae8a665a926ae4332c29f0d53b4611e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 1 Apr 2022 01:03:42 +0200
Subject: [PATCH 1111/2561] vala-panel-appmenu: remove gtk2 subpackage

---
 common/shlibs                       |  1 -
 srcpkgs/appmenu-gtk-module          |  1 -
 srcpkgs/removed-packages/template   |  1 +
 srcpkgs/vala-panel-appmenu/template | 18 ++++--------------
 4 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/appmenu-gtk-module

diff --git a/common/shlibs b/common/shlibs
index 836cacc49b89..848b488bb2d0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3631,7 +3631,6 @@ libibverbs.so.1 rdma-core-22.1_1
 librdmacm.so.1 rdma-core-22.1_1
 libdvdcss.so.2 libdvdcss-1.4.2_1
 libvalapanel.so.0 vala-panel-0.4.87_1
-libappmenu-gtk2-parser.so.0 appmenu-gtk-module-0.7.1_1
 libappmenu-gtk3-parser.so.0 appmenu-gtk3-module-0.7.1_1
 libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
diff --git a/srcpkgs/appmenu-gtk-module b/srcpkgs/appmenu-gtk-module
deleted file mode 120000
index ae1083c7375d..000000000000
--- a/srcpkgs/appmenu-gtk-module
+++ /dev/null
@@ -1 +0,0 @@
-vala-panel-appmenu
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e4808ef3d798..57df15daae2b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -18,6 +18,7 @@ replaces="
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2
+ appmenu-gtk-module<=0.7.6_1
  arm-mem-git<=20131108_2
  arptables<=0.0.4_3
  atom<=1.44.0_1
diff --git a/srcpkgs/vala-panel-appmenu/template b/srcpkgs/vala-panel-appmenu/template
index 198254fdf474..b32b9c6d15c2 100644
--- a/srcpkgs/vala-panel-appmenu/template
+++ b/srcpkgs/vala-panel-appmenu/template
@@ -2,10 +2,10 @@
 pkgname=vala-panel-appmenu
 _glhash=18896e602f40b03fcb0a8437a2e197d4
 version=0.7.6
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config vala bamf glib-devel gettext"
-makedepends="vala-devel bamf-devel gtk+-devel gtk+3-devel
+makedepends="vala-devel bamf-devel gtk+3-devel
  libxkbcommon-devel libpeas-devel libdbusmenu-glib-devel
  xfce4-panel-devel xfconf-devel libmate-panel-devel libXt-devel
  vala-panel-devel"
@@ -19,26 +19,16 @@ checksum=2856added014bb6e5238aacda1016e2520d9a58d4ba6d7b33b2707ea48e1c592
 
 appmenu-gtk-module-devel_package() {
 	short_desc="GTK module for exposing menus - development files"
-	depends="appmenu-gtk-module-${version}_${revision}
-	 appmenu-gtk3-module-${version}_${revision}"
+	depends="appmenu-gtk3-module-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/libappmenu-gtk2*.so"
 		vmove "usr/lib/libappmenu-gtk3*.so"
 	}
 }
 
-appmenu-gtk-module_package() {
-	short_desc="GTK module for exposing menus"
-	pkg_install() {
-		vmove usr/lib/gtk-2.0
-		vmove "usr/lib/libappmenu-gtk2*.so.*"
-	}
-}
-
 appmenu-gtk3-module_package() {
-	short_desc="GTK3 module for exposing menus"
+	short_desc="GTK module for exposing menus"
 	pkg_install() {
 		vmove usr/lib/gtk-3.0
 		vmove "usr/lib/libappmenu-gtk3*.so.*"

From 3745d8620b2ec2c210197d34dad70d4561890c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 9 Feb 2022 18:08:48 +0100
Subject: [PATCH 1112/2561] gitui: update to 0.20.1.

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

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 929eca8cd19e..c2466612dd95 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,6 +1,6 @@
 # Template file for 'gitui'
 pkgname=gitui
-version=0.19.0
+version=0.20.1
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
@@ -11,7 +11,11 @@ license="MIT"
 homepage="https://github.com/extrawurst/gitui"
 changelog="https://github.com/extrawurst/gitui/blob/master/CHANGELOG.md"
 distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz"
-checksum=bcbffb592a5ae49658c79ac7b0daefe4bac3d2b988fdbaf0e868b8c308962f0d
+checksum=eccec120dfd4c5c33a74d331a53f3d0c6cb7200e26b0c4c7873278eb951bc379
+
+post_patch() {
+	cargo update --package autocfg --precise 1.1.0
+}
 
 post_install() {
 	vlicense LICENSE.md

From b7f2be86be6882f42ef72d9f2bd3181b07f1418f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:12:52 +0200
Subject: [PATCH 1113/2561] nemo: remove unused tracker build dependency

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

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index 4f9acf52fab9..4144c409f778 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -7,7 +7,7 @@ build_helper=gir
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
 hostmakedepends="gettext-devel glib-devel intltool pkg-config"
 makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel tracker-devel xapps-devel libgsf-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel"
 depends="cinnamon-translations dconf gvfs"
 short_desc="Cinnamon file manager (nautilus fork)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7e3035dfe72e5020cb3c468f8b1aca776b7e52c5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 26 Dec 2021 18:21:26 +0100
Subject: [PATCH 1114/2561] New package: kalendar-0.4.0

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

diff --git a/srcpkgs/kalendar/template b/srcpkgs/kalendar/template
new file mode 100644
index 000000000000..0cdfbd27c3e4
--- /dev/null
+++ b/srcpkgs/kalendar/template
@@ -0,0 +1,19 @@
+# Template file for 'kalendar'
+pkgname=kalendar
+version=0.4.0
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
+ kcoreaddons kconfig"
+makedepends="qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel
+ qt5-svg-devel qt5-location-devel kirigami2-devel kdbusaddons-devel ki18n-devel
+ kcalendarcore-devel kconfigwidgets-devel kwindowsystem-devel kcoreaddons-devel
+ kcontacts-devel kitemmodels-devel kxmlgui-devel knotifications-devel
+ kiconthemes-devel kservice-devel akonadi5-devel akonadi-contacts-devel
+ calendarsupport-devel eventviews-devel"
+short_desc="Calendar application using Akonadi"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://invent.kde.org/pim/kalendar"
+distfiles="${KDE_SITE}/kalendar/kalendar-${version}.tar.xz"
+checksum=d64b19caab3e1365cce58ae27b76417b515cf3a07777ed1905f82cfbf0d1947a

From 96210e638add87a371e2baab1471507cd85e1250 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 01:07:40 +0200
Subject: [PATCH 1115/2561] gzip: update to 1.12.

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

diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template
index d2cf4853c9ff..037dd3b27a4c 100644
--- a/srcpkgs/gzip/template
+++ b/srcpkgs/gzip/template
@@ -1,6 +1,6 @@
 # Template file for 'gzip'
 pkgname=gzip
-version=1.11
+version=1.12
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gzip/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907
+checksum=ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" DEFS=NO_ASM gl_cv_func_fflush_stdin=yes" ;;

From dfc8ae79f60a057a4b72ca0c6eab6946c7e4e06b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 8 Apr 2022 12:58:50 +0200
Subject: [PATCH 1116/2561] yt-dlp: update to 2022.04.08.

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

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 967cb7e75b0d..95c9db3e951c 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2022.03.08.1
+version=2022.04.08
 revision=1
 wrksrc="$pkgname"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=135fd7bbf81c2639419b191d8e5abb80cd8a9801b7ed8e92a331a4107e820ab2
+checksum=a9ea3753977dd82f051f0674fbdc3eb5ff49a67246f4bd3cac5745702828d1db
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 8860089295476baa345a15a791517acb1c956c1f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 8 Apr 2022 13:00:01 +0200
Subject: [PATCH 1117/2561] nemo: fix build

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

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index 4144c409f778..75938f0d5c6c 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -7,7 +7,7 @@ build_helper=gir
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
 hostmakedepends="gettext-devel glib-devel intltool pkg-config"
 makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
 depends="cinnamon-translations dconf gvfs"
 short_desc="Cinnamon file manager (nautilus fork)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 625ad1fe0f34b262acbf42381f4ffeede79129ff Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 8 Apr 2022 14:20:31 +0200
Subject: [PATCH 1118/2561] whois: update to 5.5.13.

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

diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index 46bb8347a810..ecc647d81960 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,6 +1,6 @@
 # Template file for 'whois'
 pkgname=whois
-version=5.5.12
+version=5.5.13
 revision=1
 wrksrc=whois
 build_style=gnu-makefile
@@ -15,7 +15,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=f1c5bab781b7f2357dab1039e8875d41ff7b5d03a78c27443fa26351952a0822
+checksum=62e613f116d5635aea6684238db00b030a6602ffc79462e4a0a8e62cb184b5d7
 
 alternatives="
  whois:whois:/usr/bin/gwhois

From a8e7a8399844512d7775dbcca6f51e52735575aa Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 8 Apr 2022 17:03:17 +0200
Subject: [PATCH 1119/2561] nm-tray: update to 0.5.0.

---
 srcpkgs/nm-tray/patches/ftbfs.patch | 10 ----------
 srcpkgs/nm-tray/template            |  6 +++---
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/nm-tray/patches/ftbfs.patch

diff --git a/srcpkgs/nm-tray/patches/ftbfs.patch b/srcpkgs/nm-tray/patches/ftbfs.patch
deleted file mode 100644
index 1458bb63a9a0..000000000000
--- a/srcpkgs/nm-tray/patches/ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/nmmodel.cpp
-+++ b/src/nmmodel.cpp
-@@ -45,6 +45,7 @@ COPYRIGHT_HEADER*/
- #include <NetworkManagerQt/ConnectionSettings>
- #include <QDBusPendingCallWatcher>
- #include <QInputDialog>
-+#include <QMetaEnum>
- 
- namespace
- {
diff --git a/srcpkgs/nm-tray/template b/srcpkgs/nm-tray/template
index bda727cc43b9..03b6cd85e1be 100644
--- a/srcpkgs/nm-tray/template
+++ b/srcpkgs/nm-tray/template
@@ -1,7 +1,7 @@
 # Template file for 'nm-tray'
 pkgname=nm-tray
-version=0.4.3
-revision=2
+version=0.5.0
+revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-tools-devel networkmanager-qt5-devel"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/palinek/nm-tray"
 distfiles="https://github.com/palinek/nm-tray/archive/${version}.tar.gz"
-checksum=1611c053582189091efa74c2f26277afc872a57cfd4ec9e54463f68c25ad284b
+checksum=3db9fdfcf274392f040ee2e7370be41aaae5d700277979f661718e6d893c5ff5

From 9c7c71e6d60fb915559c8a9a208e9f1c086ac20c Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Mon, 10 Jan 2022 11:32:22 +0100
Subject: [PATCH 1120/2561] New package: PolyMC-1.1.1

---
 srcpkgs/PolyMC/files/README.voidlinux |  6 ++++++
 srcpkgs/PolyMC/template               | 30 +++++++++++++++++++++++++++
 srcpkgs/PolyMC/update                 |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/PolyMC/files/README.voidlinux
 create mode 100644 srcpkgs/PolyMC/template
 create mode 100644 srcpkgs/PolyMC/update

diff --git a/srcpkgs/PolyMC/files/README.voidlinux b/srcpkgs/PolyMC/files/README.voidlinux
new file mode 100644
index 000000000000..16ee7f91717b
--- /dev/null
+++ b/srcpkgs/PolyMC/files/README.voidlinux
@@ -0,0 +1,6 @@
+Void-specific instructions:
+============================
+
+You may not have the correct version of java installed for running specific
+versions of Minecraft. For Minecraft version 1.17 and up install openjdk17-jre
+and for older ones openjdk8-jre.
diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template
new file mode 100644
index 000000000000..3b3b0deb3466
--- /dev/null
+++ b/srcpkgs/PolyMC/template
@@ -0,0 +1,30 @@
+# Template file for 'PolyMC'
+pkgname=PolyMC
+version=1.1.1
+revision=1
+build_style=cmake
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_PORTABLE=0
+ -DLauncher_VERSION_BUILD=${revision}"
+hostmakedepends="openjdk8 qt5-host-tools qt5-qmake"
+makedepends="qt5-devel"
+depends="virtual?java-runtime qt5-imageformats xrandr"
+short_desc="Custom launcher for Minecraft"
+maintainer="Philipp David <pd@3b.pm>"
+license="GPL-3.0-only"
+homepage="https://polymc.org/"
+distfiles="https://github.com/PolyMC/PolyMC/releases/download/${version}/PolyMC-${version}.tar.gz"
+checksum=7ade9abc3a6f61ed27a129c10084c783cc9a3266484a53e29dabcc1cbb0ba5c4
+
+case "$XBPS_TARGET_MACHINE" in
+	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
+esac
+
+post_patch() {
+	vsed -i buildconfig/BuildConfig.cpp.in \
+		-e 's/"-" + QString/"_" + QString/'
+	rm -rf .git
+}
+
+post_install() {
+	vdoc ${FILESDIR}/README.voidlinux
+}
diff --git a/srcpkgs/PolyMC/update b/srcpkgs/PolyMC/update
new file mode 100644
index 000000000000..7517baa7a2f7
--- /dev/null
+++ b/srcpkgs/PolyMC/update
@@ -0,0 +1,2 @@
+site=https://github.com/PolyMC/PolyMC/tags
+pattern='tag/\K[\d]+\.[\d]+(\.[\d]+)?'

From 3cdf5c06c6b1c908bbfc9d72819641e77d27f798 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 9 Apr 2022 09:47:49 +0200
Subject: [PATCH 1121/2561] wine: update to 7.6.

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  | 8 ++++----
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 45cb7cbd5106..7546d45c7609 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index 4ed5e2642d9f..e0b6f8626637 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.5/configure
-+++ b/wine-7.5/configure
+--- a/wine-7.6/configure
++++ b/wine-7.6/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
---- a/wine-7.5/configure.ac
-+++ b/wine-7.5/configure.ac
+--- a/wine-7.6/configure.ac
++++ b/wine-7.6/configure.ac
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index a358997c3963..a95011e3cca0 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.5/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.5/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/wine-7.6/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/wine-7.6/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index e9598ba932a0..86d0acf0883b 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.5
+version=7.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="462c3185aedeec851067a5165d648f5499fb93c1b655f46b825f4bc11914e281
- 3b3a10654c90b210ab8dbf9d0aa2d2e3f4179a73e56e7c2101008e77903afead"
+checksum="eeab772f091328a3fb9db89aacab6be087c3d59c168ef2b41af5ec5010cf0328
+ bdd1a095b9c4cddce4663825e2ad331c5bf1ac8b2288b0b380a665d0ca987a23"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From fcf4dcb47a90cc481943e0a27e63a761fdfc79f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 10:56:14 +0200
Subject: [PATCH 1122/2561] peshming: update to 0.5.1.

---
 srcpkgs/peshming/template | 4 ++--
 srcpkgs/peshming/update   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/peshming/update

diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template
index 0b07235208a9..7db23fad88be 100644
--- a/srcpkgs/peshming/template
+++ b/srcpkgs/peshming/template
@@ -1,6 +1,6 @@
 # Template file for 'peshming'
 pkgname=peshming
-version=0.5.0
+version=0.5.1
 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=9b737124e38d4dc6ac91f0e8bc07aab4d5acbbb019c544feb1aa92d6ab0ea8c5
+checksum=b7b2999dbb75eb8915244cd7959a8f38f3e00f7f6e38f6c406a4d5e44aa372b4
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/peshming/update b/srcpkgs/peshming/update
new file mode 100644
index 000000000000..b0e921863949
--- /dev/null
+++ b/srcpkgs/peshming/update
@@ -0,0 +1,2 @@
+site=https://git.jcg.re/jcgruenhage/peshming/tags
+pattern='<a class="df ac" href="/jcgruenhage/peshming/src/tag/v\d.\d.\d" rel="nofollow">v\K\d.\d.\d(?=</a>)'

From dc897aafc453e5a338f9bfd54dd6391e5eb0d650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 12:22:33 +0200
Subject: [PATCH 1123/2561] topgrade: update to 8.3.0.

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

diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 461b88685248..f560ee845734 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=8.2.0
+version=8.3.0
 revision=1
 build_style=cargo
 short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else"
@@ -8,7 +8,7 @@ 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=54fe60ef70b21b34c50c0d342ec120aff3a9522ef44a9737f42d5700aed7a1c3
+checksum=a818cbdc64aafe77a589299d5717988fd5e5403af0998a9945b9d17a5b6f499b
 
 post_install() {
 	vman topgrade.8

From 4516c43a17b3b3576e4f9a135a9c51a27b33e3b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 12:29:59 +0200
Subject: [PATCH 1124/2561] cargo-about: update to 0.5.1.

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

diff --git a/srcpkgs/cargo-about/template b/srcpkgs/cargo-about/template
index 048f21085fa3..2bfdb47d5c60 100644
--- a/srcpkgs/cargo-about/template
+++ b/srcpkgs/cargo-about/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-about'
 pkgname=cargo-about
-version=0.4.7
+version=0.5.1
 revision=1
 # depends on rustls/ring
 archs="x86_64* aarch64* i686* arm*"
@@ -11,7 +11,7 @@ license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-about"
 changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-about/main/CHANGELOG.md"
 distfiles="https://github.com/EmbarkStudios/cargo-about/archive/${version}.tar.gz"
-checksum=186e44af7edde48e682b2670ef52ef21687629900f5220bbd3742cb2d665bb49
+checksum=11808327e3702643b7d3f1756e6b28a49c1a963295a480818b3520d6c331b339
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	broken="broken on architectures without atomic8"

From 3d97db0169a9a08e2f88cc5631bd859ee247df76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 12:53:10 +0200
Subject: [PATCH 1125/2561] cargo-geiger: update to 0.11.2.

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

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index ffe49404187e..d88a94ef7cdd 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
-version=0.11.1
+version=0.11.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
@@ -12,10 +12,14 @@ 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=d3c88fc3bdb574108504a1a49ae7b8ee5b55b1744a47d58214d0f088d2b2ef00
+checksum=425638232f4c617a1dde1071f865c5140546bf9b6b61b9a9a186d0a5c146ac03
 
 post_install() {
 	vlicense LICENSE-MIT
 	vlicense LICENSE-APACHE
 	vdoc README.md
 }
+
+post_patch() {
+	cargo update -p autocfg:1.0.1 --precise 1.1.0
+}

From a207cc897556ab236d211216581356fa04628957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:27:32 +0200
Subject: [PATCH 1126/2561] ruplacer: update to 0.6.4.

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

diff --git a/srcpkgs/ruplacer/template b/srcpkgs/ruplacer/template
index 2a48b9af8196..226155a2452a 100644
--- a/srcpkgs/ruplacer/template
+++ b/srcpkgs/ruplacer/template
@@ -1,6 +1,6 @@
 # Template file for 'ruplacer'
 pkgname=ruplacer
-version=0.6.2
+version=0.6.4
 revision=1
 build_style=cargo
 short_desc="Find and replace text in source files"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="BSD-3-Clause"
 homepage="https://github.com/dmerejkowsky/ruplacer"
 distfiles="https://github.com/dmerejkowsky/ruplacer/archive/refs/tags/v${version}.tar.gz"
-checksum=54533bb5ee33a5580f6d1160e92f4adf436350937dd2705de14ed9af185ee875
+checksum=4f66e8970942e55dc287c585eef7a21394aefa49df746cef429f9e5bc6714c7a
 
 post_install() {
 	vlicense LICENSE

From 2031652713988d4b5d32123ba0d00383896c2c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:39:06 +0200
Subject: [PATCH 1127/2561] i3status-rust: update to 0.21.9.

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

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 6973e02571b4..9c358e111e57 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.21.8
+version=0.21.9
 revision=1
 build_style=cargo
 make_check_args="--bins"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=259fdcb3ce067c6f9089fc0d7e60b856d838fff3dfb7e7e4dc5c96742c1a1be1
+checksum=579d3479c3cbbc6c95e277a708cda6f72d906e269dda83409bb23c7cecb10d0e
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From 14fc3594a143fe1cf031fb72da3b38d99354d554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:46:19 +0200
Subject: [PATCH 1128/2561] onefetch: update to 2.12.0.

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

diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index 88f21bc3b351..1eda291b053f 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -1,6 +1,6 @@
 # Template file for 'onefetch'
 pkgname=onefetch
-version=2.11.0
+version=2.12.0
 revision=1
 build_style=cargo
 short_desc="Git repository summary on your terminal"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/o2sh/onefetch"
 distfiles="https://github.com/o2sh/onefetch/archive/v${version}.tar.gz"
-checksum=ffd3cc3bd24e299ede1fada2b2da8bf066d59219da167477e1997c860650c192
+checksum=f57b16dfa2bb95dd1fb805257a1761baa20d69eb9ce7c311d369609894c53897
 
 post_install() {
 	vlicense LICENSE.md

From 8072498f4da4e48b1958add3986a90c025f63058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:51:45 +0200
Subject: [PATCH 1129/2561] dua-cli: update to 2.17.1.

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

diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template
index 6db14e89464e..ea5c1c27dad2 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'dua-cli'
 pkgname=dua-cli
-version=2.17.0
+version=2.17.1
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/Byron/dua-cli"
 changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=f10bd2c7b69c7bed1f94554d92732d54c803677a6957d986701164989a8227b1
+checksum=d9af81b30f83d080472e91da3e07b42294904827ad5274d9aaf51d346072d2f1
 
 post_install() {
 	vlicense LICENSE

From 44d6a992f2159104cdfddc711a2f10141ad65456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:56:21 +0200
Subject: [PATCH 1130/2561] eva: update to 0.3.0.

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

diff --git a/srcpkgs/eva/template b/srcpkgs/eva/template
index 08157fddc9bf..d364c98f9516 100644
--- a/srcpkgs/eva/template
+++ b/srcpkgs/eva/template
@@ -1,6 +1,6 @@
 # Template file for 'eva'
 pkgname=eva
-version=0.2.7
+version=0.3.0
 revision=1
 build_style=cargo
 short_desc="Simple calculator REPL, similar to bc(1)"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/NerdyPepper/eva"
 distfiles="https://github.com/NerdyPepper/eva/archive/v${version}.tar.gz"
-checksum=72b2e47e987102d67c9dcbb60e26c4ff0b20e6f844d0d2b9d91c3f073374aee0
+checksum=05e2cdcfd91e6abef91cb01ad3074583b8289f6e74054e070bfbf6a4e684865e
 
 post_install() {
 	vlicense LICENSE

From 562c1e0e054adc0b554faa149b4919db8ee7798b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 8 Apr 2022 13:51:25 +0200
Subject: [PATCH 1131/2561] exiftool: update to 12.41.

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

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 5a0a83e5e79a..6cf6714bf0a7 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.40
+version=12.41
 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=7ae3f6e1183926aff8a0440eb8071bb5b2a335fc1522597f109780ab16617f5f
+checksum=654f401daab0045a8364fa59d3f69b6f9bf23bcef157a3c928e373884a6f9370

From f992099129bfb9b8ae4c77cdbd69d43336c778c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 8 Apr 2022 13:35:48 +0200
Subject: [PATCH 1132/2561] croc: update to 9.5.3.

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

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 7e851d9af755..4ff52c773d40 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.5.2
+version=9.5.3
 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=9fcbb82fa78122b0a2279fe9b4c4c7ff6af7b0599f275c04481ad5ed162d2952
+checksum=7f8ac260c786bc3f1e3c577e6ac3d3e27d0d8cffa90d7a8d21cec85fe6f22abc
 
 post_install() {
 	vlicense LICENSE

From a7894835da5f1da979b37803150e7e47f703d5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 11:03:02 +0200
Subject: [PATCH 1133/2561] ansible-core: update to 2.12.4.

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

diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index 80236532b369..600682ca6939 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
-version=2.12.3
+version=2.12.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ 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-core/ansible-core-${version}.tar.gz"
-checksum=8a135a9f74c97cab67759293744ad34350f719523e8bd9bb9008df4cf953af20
+checksum=827af75985a6f04b980bd371027bf038cb187640628557298acb9983a8f2c2da
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
 # Tests are currently broken for ansible on python 3.10

From 30756f7f74eb7d5157058bf04d7a20eeefcf3753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 11:03:06 +0200
Subject: [PATCH 1134/2561] ansible: update to 5.6.0.

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

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 063e24d1684a..50439199bcdf 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=5.5.0
+version=5.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ 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=b8a76d737889c9bfd0e6b0f2276dcf8d836da667067a355776f3504d7a66d518
+checksum=acd30731434154da376ceeeb416ee1541cdfb8ea3c648023a55a34cb3ecaf9f3
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660

From e57bfd5f0ee0347dc5bd7f0a3acc9177ed56e06f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 3 Apr 2022 18:48:38 +0200
Subject: [PATCH 1135/2561] dust: update to 0.8.0.

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

diff --git a/srcpkgs/dust/template b/srcpkgs/dust/template
index 02468de2d8d6..b6f611ecc655 100644
--- a/srcpkgs/dust/template
+++ b/srcpkgs/dust/template
@@ -1,6 +1,6 @@
 # Template file for 'dust'
 pkgname=dust
-version=0.7.5
+version=0.8.0
 revision=1
 build_style=cargo
 short_desc="More intuitive version of du"
@@ -8,7 +8,7 @@ maintainer="Neel <neel@chot.ai>"
 license="Apache-2.0"
 homepage="https://github.com/bootandy/dust"
 distfiles="https://github.com/bootandy/dust/archive/v${version}.tar.gz"
-checksum=f892aaf7a0a7852e12d01b2ced6c2484fb6dc5fe7562abdf0c44a2d08aa52618
+checksum=dc033a6fb4f31520ab1bb403dd910aed04037964ab1406363cce2185a8bd3d3b
 
 post_install() {
 	vdoc README.md

From dcc911a110745f486191542b81c5624bc4d2d5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 11:38:45 +0200
Subject: [PATCH 1136/2561] python3-ansible-compat: update to 2.0.2.

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

diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
index bf03fe221d0a..919455b7e64b 100644
--- a/srcpkgs/python3-ansible-compat/template
+++ b/srcpkgs/python3-ansible-compat/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ansible-compat'
 pkgname=python3-ansible-compat
-version=2.0.0
+version=2.0.2
 revision=1
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
@@ -12,11 +12,11 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/ansible-community/ansible-compat"
 distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=4027da4ec2b524c263a801cc2dc6da2b98c2996cec258cef118a30c790467ed2
+checksum=c651995dc323ef145bab857fee6540febc881fb71b7feafe8163d49e273163a5
 
 post_patch() {
 	# scm versioning is broken in this release
-	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+	vsed -e "/name =/a version = ${version}" -i setup.cfg
 }
 
 post_install() {

From 732268f4f723e83349627c136768faebb937abed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 9 Apr 2022 11:24:41 +0200
Subject: [PATCH 1137/2561] gip: update to 0.7.1.

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

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 83ebc476bc84..239695acc77a 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,7 +1,7 @@
 # Template file for 'gip'
 pkgname=gip
-version=0.7.0
-revision=2
+version=0.7.1
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/dalance/gip"
 distfiles="https://github.com/dalance/gip/archive/v${version}.tar.gz"
-checksum=69a23f438279a570293fab165f94a7e251a49b9b8de96703a0ab2542facffcb9
+checksum=b0cc949cbd25d6dc1e61d08092a78f95f65fb600601d03a407878774385a4060
 
 post_install() {
 	vlicense LICENSE-MIT

From 68168235ac5696fcd8026d1ad69580ec1948b2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 14:26:19 +0200
Subject: [PATCH 1138/2561] git-cliff: update to 0.6.1.

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

diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 0d14d547541e..4d87260c9d27 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,8 +1,9 @@
 # Template file for 'git-cliff'
 pkgname=git-cliff
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=cargo
+build_helper=qemu
 make_install_args="--path git-cliff"
 make_check_args="-- --skip repo::test::git_log" # This test fails without a git repo
 short_desc="Changelog generator based on conventional commits"
@@ -11,8 +12,14 @@ license="GPL-3.0-only"
 homepage="https://github.com/orhun/git-cliff"
 changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
 distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
-checksum=451db5e7ce904f33cf5772cd67400015829e5b7b3d18955bc3e8f88977b63793
+checksum=045fb10ad0ee340172397f2bb6521c7ee0a83dca2c9f9d177300601f6c60184f
 
 post_install() {
 	vdoc README.md
+
+	OUT_DIR=${PWD} vtargetrun ${DESTDIR}/usr/bin/git-cliff-completions
+
+	vcompletion "_git-cliff" zsh
+	vcompletion "git-cliff.fish" fish
+	vcompletion "git-cliff.bash" bash
 }

From 6568b616afe10ab44263ce1386d86d06ba514b45 Mon Sep 17 00:00:00 2001
From: toluschr <toluschr@protonmail.com>
Date: Mon, 25 May 2020 19:49:29 +0200
Subject: [PATCH 1139/2561] New package: gamemode-1.6.1

---
 common/shlibs                               |  2 ++
 srcpkgs/gamemode/patches/001-fix-musl.patch | 10 ++++++
 srcpkgs/gamemode/template                   | 39 +++++++++++++++++++++
 srcpkgs/libgamemode                         |  1 +
 srcpkgs/libgamemode-devel                   |  1 +
 5 files changed, 53 insertions(+)
 create mode 100644 srcpkgs/gamemode/patches/001-fix-musl.patch
 create mode 100644 srcpkgs/gamemode/template
 create mode 120000 srcpkgs/libgamemode
 create mode 120000 srcpkgs/libgamemode-devel

diff --git a/common/shlibs b/common/shlibs
index 848b488bb2d0..673c62085f5b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3597,6 +3597,8 @@ libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
 libvkd3d-utils.so.1 vkd3d-1.1_1
 libvkd3d-shader.so.1 vkd3d-1.3_1
 libvkd3d.so.1 vkd3d-1.1_1
+libgamemode.so.0 libgamemode-1.6.1_1
+libgamemodeauto.so.0 libgamemode-1.6.1_1
 libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
diff --git a/srcpkgs/gamemode/patches/001-fix-musl.patch b/srcpkgs/gamemode/patches/001-fix-musl.patch
new file mode 100644
index 000000000000..c54c0bad41fe
--- /dev/null
+++ b/srcpkgs/gamemode/patches/001-fix-musl.patch
@@ -0,0 +1,10 @@
+--- a/daemon/gamemode-context.c
++++ b/daemon/gamemode-context.c
+@@ -50,6 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
+ #include <sys/time.h>
+ #include <systemd/sd-daemon.h> /* TODO: Move usage to gamemode-dbus.c */
+ #include <unistd.h>
++#include <signal.h>
+ 
+ /**
+  * The GameModeClient encapsulates the remote connection, providing a list
diff --git a/srcpkgs/gamemode/template b/srcpkgs/gamemode/template
new file mode 100644
index 000000000000..0bf9bea530ec
--- /dev/null
+++ b/srcpkgs/gamemode/template
@@ -0,0 +1,39 @@
+# Template file for 'gamemode'
+pkgname=gamemode
+version=1.6.1
+revision=1
+build_style=meson
+configure_args="-Dwith-sd-bus-provider=elogind"
+hostmakedepends="pkg-config"
+makedepends="inih-devel dbus-devel elogind-devel"
+depends="lib${pkgname}>=${version}_${revision}"
+short_desc="Optimise Linux system performance on demand"
+maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/FeralInteractive/gamemode"
+distfiles="https://github.com/FeralInteractive/gamemode/archive/${version}.tar.gz"
+checksum=4377b88b5147ebf8d3f9a7a1f94c6d00f1e9624cd171d5af942ce9766be3747f
+
+post_install() {
+	vsconf example/gamemode.ini
+	vlicense LICENSE.txt
+	vdoc README.md
+}
+
+libgamemode_package() {
+	short_desc+=" - shared libraries"
+	pkg_install() {
+		# For compatibility reasons, all shlibs should go in libgamemode
+		vmove "usr/lib/*.so*"
+	}
+}
+
+libgamemode-devel_package() {
+	short_desc+=" - development files"
+	depends="lib${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/libgamemode b/srcpkgs/libgamemode
new file mode 120000
index 000000000000..d1810c733eb8
--- /dev/null
+++ b/srcpkgs/libgamemode
@@ -0,0 +1 @@
+gamemode
\ No newline at end of file
diff --git a/srcpkgs/libgamemode-devel b/srcpkgs/libgamemode-devel
new file mode 120000
index 000000000000..d1810c733eb8
--- /dev/null
+++ b/srcpkgs/libgamemode-devel
@@ -0,0 +1 @@
+gamemode
\ No newline at end of file

From 783aac96242da0c4811a1208ed2e4126a5a499c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 22 Mar 2022 09:14:19 +0100
Subject: [PATCH 1140/2561] doctl: update to 1.73.0.

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

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 0580a504f27e..e42f75c749fd 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,13 +1,17 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.71.0
+version=1.73.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
-go_build_tags="v${version}"
+_maj_min=${version%*.*}
+_major=${_maj_min%.*}
+_minor=${_maj_min#*.}
+_patch=${version#*.*.*}
+go_ldflags="-X github.com/digitalocean/doctl.Major=$_major -X github.com/digitalocean/doctl.Minor=$_minor -X github.com/digitalocean/doctl.Patch=$_patch -X github.com/digitalocean/doctl.Label=voidlinux"
 short_desc="Command line tool for DigitalOcean services"
 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=62a14c05bd4b8442f0a610f9eba7237fe67e1afc397750893cdf2b741aebfd54
+checksum=cc7a6f91febf4d40f8afca0fe4ddfa7aa9be3572e3a0124fca2865e35b52ef00

From 6b1f3dcfba264c64655248d670d80c52d692eee4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 9 Apr 2022 12:37:47 +0200
Subject: [PATCH 1141/2561] libxmlb: update to 0.3.8.

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

diff --git a/srcpkgs/libxmlb/template b/srcpkgs/libxmlb/template
index 6d8a900ae0aa..78b2d76bfdee 100644
--- a/srcpkgs/libxmlb/template
+++ b/srcpkgs/libxmlb/template
@@ -1,6 +1,6 @@
 # Template file for 'libxmlb'
 pkgname=libxmlb
-version=0.2.1
+version=0.3.8
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libxmlb"
 distfiles="https://github.com/hughsie/libxmlb/archive/${version}.tar.gz"
-checksum=2bf0cae179f1a9b6a63d294c06d324ea97266fc34656589b2865535ab2322529
+checksum=83b94d04b4bdff4f94abc9f078d1372422276cf47590cfd1935948d48021deda
 
 build_options="gir"
 build_options_default="gir"
@@ -23,13 +23,13 @@ post_install() {
 }
 
 libxmlb-devel_package() {
-	depends="libxmlb>=${version}_${revision} ${makedepends}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		if [ "$build_options_gir" ]; then
+		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
 	}

From b57bdb2c820a044063fa11d0f04bb560737252a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 9 Apr 2022 12:34:53 +0200
Subject: [PATCH 1142/2561] AppStream: update to 0.15.2.

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

diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index 9cba83f64c24..b2d920729249 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,6 +1,6 @@
 # Template file for 'AppStream'
 pkgname=AppStream
-version=0.14.6
+version=0.15.2
 revision=1
 wrksrc="appstream-${version}"
 build_style=meson
@@ -8,16 +8,16 @@ build_helper="gir qemu"
 configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi)
  -Dstemming=false -Dapidocs=false -Dqt=true"
 hostmakedepends="docbook-xsl gettext glib-devel gperf libxslt pkg-config
- qt5-host-tools $(vopt_if vala vala)"
-makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel lmdb-devel
+ qt5-host-tools $(vopt_if vala vala) itstool"
+makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel libxmlb-devel
  libsoup-devel libcurl-devel"
 short_desc="Tools and libraries to work with AppStream metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
 distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=fd71649aeefe1cb561f1921193b253033d21566bdcce849c93e37fdb21113560
+checksum=70c95545ac2cde87c9ba4a292648ed64ed1211fb24d792b5b9e84f870a83fe9d
 conf_files="/etc/appstream.conf"
 triggers="appstream-cache"
 

From b55efbf7a75c8a4ba8adee7cec8f59b8b7c48040 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 22:57:19 +0200
Subject: [PATCH 1143/2561] gnome: remove gnome-documents from gnome-apps

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

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 0984bf8205a6..0b2910094713 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
 version=41.0
-revision=1
+revision=2
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -58,7 +58,6 @@ _apps_depends="
  gnome-clocks>=40.0
  gnome-dictionary>=40.0
  gnome-disk-utility>=${version}
- gnome-documents>=3.34.0
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
  gnome-music>=${version}

From 775dad9d892aff3a8cfb705b9e16f3452902bfd5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:11 +0100
Subject: [PATCH 1144/2561] gnome-games: remove package

* archived project, uses tracker2
---
 srcpkgs/gnome-games/patches/meson-0.61.patch | 20 --------------------
 srcpkgs/gnome-games/template                 | 15 ---------------
 srcpkgs/removed-packages/template            |  1 +
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-games/template

diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch
deleted file mode 100644
index 0a3b006b227b..000000000000
--- a/srcpkgs/gnome-games/patches/meson-0.61.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -44,7 +44,7 @@ mime_types = [
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
- desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
--desktop_file = i18n.merge_file ('desktop-file',
-+desktop_file = i18n.merge_file (
-   type: 'desktop',
-   input: configure_file(
-     input: files('org.gnome.Games.desktop.in.in'),
-@@ -70,7 +70,7 @@ endif
- 
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
-   input: configure_file(
-     input: files('org.gnome.Games.appdata.xml.in.in'),
-     output: 'org.gnome.Games.appdata.xml.in',
diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template
deleted file mode 100644
index 61df4a3bc7f1..000000000000
--- a/srcpkgs/gnome-games/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gnome-games'
-pkgname=gnome-games
-version=40.0
-revision=1
-build_style=meson
-hostmakedepends="gettext glib-devel pkg-config vala-devel"
-makedepends="libarchive-devel grilo-devel gtk+3-devel libglib-devel
- libmanette-devel librsvg-devel libsoup-devel libxml2-devel retro-gtk-devel
- sqlite-devel tracker-devel libhandy1-devel"
-short_desc="Browse and play your games"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Games"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=32cd413f89292a74b0a84a5a30d0f4878ce42caea36374b1fb4dce3b4f6adf0f
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 57df15daae2b..6511980ca218 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2
  gnome-twitch<=0.4.2_1

From 58e49f35421cfb0838db5de1381ed7c33756c683 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:35 +0100
Subject: [PATCH 1145/2561] gnome-documents: remove package

* archived project, uses tracker2
---
 .../gnome-documents/patches/meson-0.61.patch  | 18 ---------------
 srcpkgs/gnome-documents/template              | 23 -------------------
 srcpkgs/removed-packages/template             |  1 +
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-documents/template

diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch
deleted file mode 100644
index 131d34509406..000000000000
--- a/srcpkgs/gnome-documents/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -56,7 +56,6 @@ foreach app: documents_apps
-   appdata = app + '.appdata.xml'
- 
-   appdata_file = i18n.merge_file(
--    appdata,
-     input: appdata + '.in',
-     output: appdata,
-     po_dir: po_dir,
-@@ -76,7 +75,6 @@ foreach app: documents_apps
-   desktop = app + '.desktop'
- 
-   desktop_file = i18n.merge_file(
--    desktop,
-     type: 'desktop',
-     input: desktop + '.in',
-     output: desktop,
diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template
deleted file mode 100644
index 7e45b825e712..000000000000
--- a/srcpkgs/gnome-documents/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-documents'
-pkgname=gnome-documents
-version=3.34.0
-revision=2
-build_helper="gir"
-build_style=meson
-hostmakedepends="docbook-xsl gettext itstool pkg-config glib-devel libxslt gdk-pixbuf
- librsvg"
-makedepends="clutter-gtk-devel evince-devel gjs-devel gnome-desktop-devel
- libgdata-devel libgepub-devel librsvg-devel libzapojit-devel tracker-devel
- vala-devel webkit2gtk-devel"
-depends="desktop-file-utils hicolor-icon-theme libgepub tracker tracker-miners
- gjs gnome-online-miners evince"
-short_desc="Documents Manager for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Documents"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d8a90e84aef3a78fcaa91dc12a24a473a5778a47eb4c2354d0e35d558f29f0e2
-lib32disabled=yes
-
-build_options="gir"
-build_options_default="gir"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6511980ca218..f1dcebc2b8cc 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-documents<=3.34.0_2
  gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2

From 736346765b4b429fdca20252b7d7b292c751493c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:29:56 +0200
Subject: [PATCH 1146/2561] gnome-online-miners: import a patch for tracker3

---
 .../patches/tracker3.patch                    | 1554 +++++++++++++++++
 srcpkgs/gnome-online-miners/template          |   11 +-
 2 files changed, 1562 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/gnome-online-miners/patches/tracker3.patch

diff --git a/srcpkgs/gnome-online-miners/patches/tracker3.patch b/srcpkgs/gnome-online-miners/patches/tracker3.patch
new file mode 100644
index 000000000000..c948f65c7953
--- /dev/null
+++ b/srcpkgs/gnome-online-miners/patches/tracker3.patch
@@ -0,0 +1,1554 @@
+From 53869ebc2783c9d08bb32d59c543ab692770c121 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:11:24 +0200
+Subject: [PATCH 1/5] Use GInitable interface for GomMiner class
+
+This allows for better error reporting.
+---
+ src/gom-application.c |  7 +++++-
+ src/gom-miner.c       | 58 +++++++++++++++++++++++++++++--------------
+ 2 files changed, 45 insertions(+), 20 deletions(-)
+
+diff --git a/src/gom-application.c b/src/gom-application.c
+index fadd388..bfa99ec 100644
+--- a/src/gom-application.c
++++ b/src/gom-application.c
+@@ -229,10 +229,15 @@ gom_application_constructed (GObject *object)
+ {
+   GomApplication *self = GOM_APPLICATION (object);
+   const gchar *display_name;
++  GError *error = NULL;
+ 
+   G_OBJECT_CLASS (gom_application_parent_class)->constructed (object);
+ 
+-  self->miner = g_object_new (self->miner_type, NULL);
++  self->miner = g_initable_new (self->miner_type, NULL, &error, NULL);
++
++  if (self->miner == NULL)
++    g_error ("%s", error->message);
++
+   display_name = gom_miner_get_display_name (self->miner);
+   gom_dbus_set_display_name (self->skeleton, display_name);
+ }
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 7147b33..1dd9bb8 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -28,7 +28,11 @@
+ 
+ #include "gom-miner.h"
+ 
+-G_DEFINE_TYPE (GomMiner, gom_miner, G_TYPE_OBJECT)
++static void gom_miner_initable_interface_init (GInitableIface *iface);
++
++G_DEFINE_TYPE_WITH_CODE (GomMiner, gom_miner, G_TYPE_OBJECT,
++                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gom_miner_initable_interface_init))
++
+ 
+ struct _GomMinerPrivate {
+   GoaClient *client;
+@@ -132,20 +136,21 @@ gom_miner_dispose (GObject *object)
+ }
+ 
+ static void
+-gom_miner_init_goa (GomMiner *self)
++gom_miner_init_goa (GomMiner  *self,
++                    GError   **error)
+ {
+   GoaAccount *account;
+   GoaObject *object;
+   const gchar *provider_type;
+   GList *accounts, *l;
+   GomMinerClass *miner_class = GOM_MINER_GET_CLASS (self);
++  GError *inner_error = NULL;
+ 
+-  self->priv->client = goa_client_new_sync (NULL, &self->priv->client_error);
++  self->priv->client = goa_client_new_sync (NULL, &inner_error);
+ 
+-  if (self->priv->client_error != NULL)
++  if (inner_error)
+     {
+-      g_critical ("Unable to create GoaClient: %s - indexing for %s will not work",
+-                  self->priv->client_error->message, miner_class->goa_provider_type);
++      g_propagate_error (error, inner_error);
+       return;
+     }
+ 
+@@ -170,16 +175,34 @@ gom_miner_init_goa (GomMiner *self)
+   g_list_free_full (accounts, g_object_unref);
+ }
+ 
+-static void
+-gom_miner_constructed (GObject *obj)
++static gboolean
++gom_miner_initable_init (GInitable     *initable,
++                         GCancellable  *cancellable,
++                         GError       **error)
+ {
+-  GomMiner *self = GOM_MINER (obj);
++  GError *inner_error = NULL;
++  GomMiner *self;
+ 
+-  G_OBJECT_CLASS (gom_miner_parent_class)->constructed (obj);
++  self = GOM_MINER (initable);
+ 
+-  gom_miner_init_goa (self);
++  self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error);
++  if (inner_error)
++    {
++      g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: ");
++      return FALSE;
++    }
++
++  gom_miner_init_goa (self, &inner_error);
++  if (inner_error)
++    {
++      g_propagate_prefixed_error (error, inner_error, "Unable to connect to GNOME Online Accounts: ");
++      return FALSE;
++    }
++
++  return TRUE;
+ }
+ 
++
+ static void
+ gom_miner_init (GomMiner *self)
+ {
+@@ -187,14 +210,12 @@ gom_miner_init (GomMiner *self)
+ 
+   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GOM_TYPE_MINER, GomMinerPrivate);
+   self->priv->display_name = g_strdup ("");
++}
+ 
+-  self->priv->connection = tracker_sparql_connection_get (NULL, &self->priv->connection_error);
+-  if (self->priv->connection_error != NULL)
+-    {
+-      g_critical ("Unable to create TrackerSparqlConnection: %s - indexing for %s will not work",
+-                  self->priv->connection_error->message,
+-                  klass->goa_provider_type);
+-    }
++static void
++gom_miner_initable_interface_init (GInitableIface *iface)
++{
++  iface->init = gom_miner_initable_init;
+ }
+ 
+ static void
+@@ -202,7 +223,6 @@ gom_miner_class_init (GomMinerClass *klass)
+ {
+   GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ 
+-  oclass->constructed = gom_miner_constructed;
+   oclass->dispose = gom_miner_dispose;
+ 
+   cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL);
+-- 
+GitLab
+
+
+From a2b53970e1c1486a61a1522010e345732ed6ca54 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:19:58 +0200
+Subject: [PATCH 2/5] Initial port to Tracker 3
+
+Each miner now stores its data in a private Tracker database, under
+the $XDG_CACHE_HOME/gnome-online-miners/$busname directory.
+
+Each miner now supports the org.freedesktop.Tracker3.Endpoint D-Bus
+interface which apps can use to query data directly from the miners.
+---
+ configure.ac          |   4 +-
+ src/gom-application.c |   4 +-
+ src/gom-miner.c       | 120 +++++++++++++++++++++++++++++++++++++++++-
+ src/gom-miner.h       |   1 +
+ src/gom-tracker.c     |   2 +-
+ 5 files changed, 125 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e91e4af..8ee6315 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,7 @@ AC_HEADER_STDC
+ 
+ GDATA_MIN_VERSION=0.15.2
+ GFBGRAPH_MIN_VERSION=0.2.2
+-GLIB_MIN_VERSION=2.35.1
++GLIB_MIN_VERSION=2.56.0
+ GOA_MIN_VERSION=3.13.3
+ GRILO_MIN_VERSION=0.3.0
+ ZAPOJIT_MIN_VERSION=0.0.2
+@@ -36,7 +36,7 @@ PKG_CHECK_MODULES(GIO, [gio-2.0 gio-unix-2.0])
+ PKG_CHECK_MODULES(GOA, [goa-1.0 >= $GOA_MIN_VERSION])
+ AC_DEFINE([GOA_API_IS_SUBJECT_TO_CHANGE], [], [We are aware that GOA's API can change])
+ 
+-PKG_CHECK_MODULES(TRACKER, [tracker-miner-2.0 tracker-sparql-2.0])
++PKG_CHECK_MODULES(TRACKER, [tracker-sparql-3.0])
+ 
+ # Facebook
+ AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook], [Enable Facebook miner])], [], [enable_facebook=yes])
+diff --git a/src/gom-application.c b/src/gom-application.c
+index bfa99ec..86546ed 100644
+--- a/src/gom-application.c
++++ b/src/gom-application.c
+@@ -233,7 +233,9 @@ gom_application_constructed (GObject *object)
+ 
+   G_OBJECT_CLASS (gom_application_parent_class)->constructed (object);
+ 
+-  self->miner = g_initable_new (self->miner_type, NULL, &error, NULL);
++  self->miner = g_initable_new (self->miner_type, NULL, &error,
++                                "bus-name", g_application_get_application_id (G_APPLICATION (self)),
++                                NULL);
+ 
+   if (self->miner == NULL)
+     g_error ("%s", error->message);
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 1dd9bb8..f349d01 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -38,7 +38,9 @@ struct _GomMinerPrivate {
+   GoaClient *client;
+   GError *client_error;
+ 
++  gchar *bus_name;
+   TrackerSparqlConnection *connection;
++  TrackerEndpointDBus *endpoint;
+   GError *connection_error;
+ 
+   gchar *display_name;
+@@ -62,6 +64,14 @@ typedef struct {
+   gpointer service;
+ } InsertSharedContentData;
+ 
++typedef enum
++{
++  PROP_BUS_NAME = 1,
++  N_PROPERTIES
++} GomMinerProperty;
++
++static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
++
+ static GThreadPool *cleanup_pool;
+ 
+ static void cleanup_job (gpointer data, gpointer user_data);
+@@ -135,6 +145,58 @@ gom_miner_dispose (GObject *object)
+   G_OBJECT_CLASS (gom_miner_parent_class)->dispose (object);
+ }
+ 
++static void
++gom_miner_init_database (GomMiner      *self,
++                         GCancellable  *cancellable,
++                         GError       **error)
++{
++  TrackerSparqlConnectionFlags flags;
++  g_autoptr (GFile) store_path = NULL;
++  g_autoptr (GDBusConnection) bus = NULL;
++  GError *inner_error = NULL;
++
++  flags = TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STEMMER |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_UNACCENT |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STOP_WORDS |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_IGNORE_NUMBERS;
++
++  store_path = g_file_new_build_filename (g_get_user_cache_dir (),
++                                          "gnome-online-miners",
++                                          self->priv->bus_name,
++                                          NULL);
++
++  self->priv->connection = tracker_sparql_connection_new (flags,
++                                                          store_path,
++                                                          tracker_sparql_get_ontology_nepomuk (),
++                                                          cancellable,
++                                                          &inner_error);
++
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++
++  bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &inner_error);
++
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++
++  self->priv->endpoint = tracker_endpoint_dbus_new (self->priv->connection,
++                                                    bus,
++                                                    NULL, /* object path */
++                                                    cancellable,
++                                                    &inner_error);
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++}
++
+ static void
+ gom_miner_init_goa (GomMiner  *self,
+                     GError   **error)
+@@ -185,10 +247,10 @@ gom_miner_initable_init (GInitable     *initable,
+ 
+   self = GOM_MINER (initable);
+ 
+-  self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error);
++  gom_miner_init_database (self, cancellable, &inner_error);
+   if (inner_error)
+     {
+-      g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: ");
++      g_propagate_prefixed_error (error, inner_error, "Unable to set up Tracker database: ");
+       return FALSE;
+     }
+ 
+@@ -212,6 +274,47 @@ gom_miner_init (GomMiner *self)
+   self->priv->display_name = g_strdup ("");
+ }
+ 
++static void
++gom_miner_set_property (GObject      *object,
++                        guint         property_id,
++                        const GValue *value,
++                        GParamSpec   *pspec)
++{
++  GomMiner *self = GOM_MINER (object);
++
++  switch ((GomMinerProperty) property_id)
++    {
++      case PROP_BUS_NAME:
++        g_free (self->priv->bus_name);
++        self->priv->bus_name = g_value_dup_string (value);
++        break;
++
++      default:
++        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++        break;
++    }
++}
++
++static void
++gom_miner_get_property (GObject    *object,
++                        guint       property_id,
++                        GValue     *value,
++                        GParamSpec *pspec)
++{
++  GomMiner *self = GOM_MINER (object);
++
++  switch ((GomMinerProperty) property_id)
++    {
++       case PROP_BUS_NAME:
++         g_value_set_string (value, self->priv->bus_name);
++         break;
++
++       default:
++         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++         break;
++    }
++}
++
+ static void
+ gom_miner_initable_interface_init (GInitableIface *iface)
+ {
+@@ -224,6 +327,19 @@ gom_miner_class_init (GomMinerClass *klass)
+   GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ 
+   oclass->dispose = gom_miner_dispose;
++  oclass->set_property = gom_miner_set_property;
++  oclass->get_property = gom_miner_get_property;
++
++  obj_properties[PROP_BUS_NAME] = g_param_spec_string ("bus-name",
++                                                       "Bus Name",
++                                                       "D-Bus name of the miner",
++                                                       NULL  /* default value */,
++                                                       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
++                                                       G_PARAM_STATIC_STRINGS);
++
++  g_object_class_install_properties (oclass,
++                                     N_PROPERTIES,
++                                     obj_properties);
+ 
+   cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL);
+ 
+diff --git a/src/gom-miner.h b/src/gom-miner.h
+index 8f83139..5dcfc8d 100644
+--- a/src/gom-miner.h
++++ b/src/gom-miner.h
+@@ -61,6 +61,7 @@ typedef struct _GomMinerPrivate GomMinerPrivate;
+ typedef struct {
+   GomMiner *miner;
+   TrackerSparqlConnection *connection;
++  gchar *bus_name;
+ 
+   GoaAccount *account;
+   GHashTable *services;
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 68818c4..5666c16 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -408,7 +408,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+   gchar *retval = NULL;
+   gchar *select = NULL;
+ 
+-  g_return_val_if_fail (TRACKER_SPARQL_IS_CONNECTION (connection), NULL);
++  g_return_val_if_fail (TRACKER_IS_SPARQL_CONNECTION (connection), NULL);
+   g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
+   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+   g_return_val_if_fail (make != NULL || model != NULL, NULL);
+-- 
+GitLab
+
+
+From 3e77eff8a677c1ecd9aa129094ed857da802d787 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:37:28 +0200
+Subject: [PATCH 3/5] Add DataObject class to our resources
+
+We need this to set nie:dataSource property. I don't understand
+how this worked in the past.
+---
+ src/gom-tracker.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 5666c16..63a4c29 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -208,7 +208,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   insert = g_string_new (NULL);
+   g_string_append_printf
+     (insert,
+-     "INSERT OR REPLACE %s { <%s> a nie:InformationElement ; %s %s }",
++     "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
+      graph_str, resource, property_name, quoted);
+   g_free (quoted);
+ 
+-- 
+GitLab
+
+
+From e742a60cf9dea1391d1ff409ce5696d21f423bed Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 02:13:11 +0200
+Subject: [PATCH 4/5] Organize data into content-based graphs
+
+Previously GOM used a graph per account and per resource but this
+cannot be done in Tracker 3.
+
+In Tracker 3, each graph is stored as a separate SQLite database
+and currently a maximum of ten graphs can be included in a single
+query due to SQLite's limitations.
+
+The new layout is modelled after how tracker-miner-fs uses graphs:
+we use a graph per content type (Contacts, Documents, Pictures),
+plus an extra graph to store accounts and folders/collections.
+---
+ src/gom-facebook-miner.c     | 12 ++---
+ src/gom-flickr-miner.c       | 24 +++++-----
+ src/gom-gdata-miner.c        | 31 ++++++------
+ src/gom-media-server-miner.c | 10 ++--
+ src/gom-miner.c              | 40 ++++++++++++----
+ src/gom-miner.h              |  1 -
+ src/gom-owncloud-miner.c     | 22 +++++----
+ src/gom-tracker.c            | 93 +++++++++++++++++-------------------
+ src/gom-tracker.h            | 14 +++++-
+ src/gom-zpj-miner.c          | 22 ++++-----
+ 10 files changed, 150 insertions(+), 119 deletions(-)
+
+diff --git a/src/gom-facebook-miner.c b/src/gom-facebook-miner.c
+index ff42ca5..fc89096 100644
+--- a/src/gom-facebook-miner.c
++++ b/src/gom-facebook-miner.c
+@@ -70,7 +70,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+@@ -239,7 +239,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", album_link);
+ 
+   if (*error != NULL)
+@@ -248,7 +248,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", album_description);
+ 
+   if (*error != NULL)
+@@ -257,7 +257,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", album_name);
+ 
+   if (*error != NULL)
+@@ -274,7 +274,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -284,7 +284,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", album_created_time);
+ 
+   if (*error != NULL)
+diff --git a/src/gom-flickr-miner.c b/src/gom-flickr-miner.c
+index 9ac338e..dc7349e 100644
+--- a/src/gom-flickr-miner.c
++++ b/src/gom-flickr-miner.c
+@@ -143,14 +143,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -166,7 +166,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_identifier,
++         TRACKER_PICTURES_GRAPH, parent_identifier,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_identifier);
+ 
+@@ -176,7 +176,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:isPartOf", parent_resource_urn);
+       g_free (parent_resource_urn);
+ 
+@@ -187,7 +187,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", grl_media_get_title (entry->media));
+ 
+   if (*error != NULL)
+@@ -202,7 +202,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   created_time = modification_date = grl_media_get_creation_date (entry->media);
+   new_mtime = g_date_time_to_unix (modification_date);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -221,7 +221,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:contentCreated", date);
+       g_free (date);
+     }
+@@ -233,7 +233,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", url);
+ 
+   if (*error != NULL)
+@@ -242,7 +242,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", grl_media_get_description (entry->media));
+ 
+   if (*error != NULL)
+@@ -254,7 +254,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:mimeType", mime);
+       g_free (mime);
+ 
+@@ -265,7 +265,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   contact_resource = gom_tracker_utils_ensure_contact_resource
+     (connection,
+      cancellable, error,
+-     datasource_urn, grl_media_get_author (entry->media));
++     TRACKER_PICTURES_GRAPH, grl_media_get_author (entry->media));
+ 
+   if (*error != NULL)
+     goto out;
+@@ -273,7 +273,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+diff --git a/src/gom-gdata-miner.c b/src/gom-gdata-miner.c
+index 7872431..d0deb80 100644
+--- a/src/gom-gdata-miner.c
++++ b/src/gom-gdata-miner.c
+@@ -120,7 +120,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_DOCUMENTS_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+@@ -187,7 +187,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_resource_id,
++         GOM_GRAPH, parent_resource_id,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_resource_id);
+ 
+@@ -219,7 +219,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_toggle_favorite
+     (connection,
+      cancellable, error,
+-     resource, starred);
++     TRACKER_PICTURES_GRAPH, resource, starred);
+ 
+   if (*error != NULL)
+     goto out;
+@@ -400,14 +400,14 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", "nmm:Photo", NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+   if (*error != NULL)
+     goto out;
+@@ -566,6 +566,7 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection,
+       equipment_resource = gom_tracker_utils_ensure_equipment_resource (connection,
+                                                                         cancellable,
+                                                                         error,
++                                                                        TRACKER_PICTURES_GRAPH,
+                                                                         make,
+                                                                         model);
+ 
+@@ -665,7 +666,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", "nfo:DataContainer",
+      NULL);
+ 
+@@ -674,7 +675,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+ 
+   gom_tracker_update_datasource
+     (connection, datasource_urn,
+-     resource_exists, identifier, resource,
++     resource_exists, TRACKER_PICTURES_GRAPH, resource,
+      cancellable, error);
+ 
+   if (*error != NULL)
+@@ -685,7 +686,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+    */
+   new_mtime = gdata_entry_get_updated (GDATA_ENTRY (album));
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -703,7 +704,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", alternate_uri);
+ 
+   if (*error != NULL)
+@@ -713,7 +714,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", summary);
+ 
+   if (*error != NULL)
+@@ -723,7 +724,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", title);
+ 
+   if (*error != NULL)
+@@ -743,7 +744,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -755,7 +756,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", date);
+   g_free (date);
+ 
+@@ -865,7 +866,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection,
+   if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection,
+                                                                cancellable,
+                                                                &local_error,
+-                                                               datasource_urn,
++                                                               TRACKER_PICTURES_GRAPH,
+                                                                source_urn,
+                                                                "nie:relatedTo",
+                                                                photo_resource_urn))
+@@ -878,7 +879,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection,
+   if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection,
+                                                                cancellable,
+                                                                &local_error,
+-                                                               datasource_urn,
++                                                               TRACKER_PICTURES_GRAPH,
+                                                                photo_resource_urn,
+                                                                "nie:links",
+                                                                source_urn))
+diff --git a/src/gom-media-server-miner.c b/src/gom-media-server-miner.c
+index 490869e..32e08c6 100644
+--- a/src/gom-media-server-miner.c
++++ b/src/gom-media-server-miner.c
+@@ -65,14 +65,14 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+   if (*error != NULL)
+     goto out;
+@@ -81,7 +81,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", photo->url);
+ 
+   if (*error != NULL)
+@@ -90,7 +90,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:mimeType", photo->mimetype);
+ 
+   if (*error != NULL)
+@@ -99,7 +99,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", photo->name);
+ 
+   if (*error != NULL)
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index f349d01..32892fa 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -376,7 +376,7 @@ gom_miner_ensure_datasource (GomMiner *self,
+                           "  <%s> a nie:DataSource ; nao:identifier \"%s\" . "
+                           "  <%s> a nie:InformationElement ; nie:rootElementOf <%s> ; nie:version \"%d\""
+                           "}",
+-                          datasource_urn,
++                          GOM_GRAPH,
+                           datasource_urn, klass->miner_identifier,
+                           root_element_urn, datasource_urn, klass->version);
+ 
+@@ -401,8 +401,8 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job,
+ 
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn nao:identifier(?urn) WHERE { ?urn nie:dataSource <%s> }",
+-                          job->datasource_urn);
++                          "SELECT ?urn ?id WHERE { GRAPH <%s> { ?urn nie:dataSource <%s> ; nao:identifier ?id . } }",
++                          GOM_GRAPH, job->datasource_urn);
+ 
+   cursor = tracker_sparql_connection_query (job->connection,
+                                             select->str,
+@@ -415,9 +415,21 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job,
+ 
+   while (tracker_sparql_cursor_next (cursor, cancellable, error))
+     {
+-      g_hash_table_insert (job->previous_resources,
+-                           g_strdup (tracker_sparql_cursor_get_string (cursor, 1, NULL)),
+-                           g_strdup (tracker_sparql_cursor_get_string (cursor, 0, NULL)));
++      const gchar *urn, *identifier;
++
++      urn = tracker_sparql_cursor_get_string (cursor, 0, NULL);
++      identifier = tracker_sparql_cursor_get_string (cursor, 1, NULL);
++
++      if (identifier != NULL)
++        {
++          g_hash_table_insert (job->previous_resources,
++                               g_strdup (identifier),
++                               g_strdup (urn));
++        }
++      else
++        {
++          g_warning ("Missing identifier for urn %s", urn);
++        }
+     }
+ 
+   g_object_unref (cursor);
+@@ -489,16 +501,19 @@ gom_account_miner_job (GTask *task,
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Querying existing accounts stored in database");
+   gom_account_miner_job_query_existing (job, &error);
+ 
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Querying remote server");
+   gom_account_miner_job_query (job, &error);
+ 
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Removing stale accounts");
+   gom_account_miner_job_cleanup_previous (job, &error);
+ 
+   if (error != NULL)
+@@ -752,10 +767,15 @@ cleanup_job (gpointer data,
+ 
+   /* find all our datasources in the tracker DB */
+   select = g_string_new (NULL);
+-  g_string_append_printf (select, "SELECT ?datasource nie:version(?root) WHERE { "
+-                          "?datasource a nie:DataSource . "
+-                          "?datasource nao:identifier \"%s\" . "
+-                          "OPTIONAL { ?root nie:rootElementOf ?datasource } }",
++  g_string_append_printf (select,
++                          "SELECT ?datasource nie:version(?root) WHERE { "
++                          "  GRAPH <%s> { "
++                          "    ?datasource a nie:DataSource . "
++                          "    ?datasource nao:identifier \"%s\" . "
++                          "    OPTIONAL { ?root nie:rootElementOf ?datasource } "
++                          "  }"
++                          "}",
++                          GOM_GRAPH,
+                           klass->miner_identifier);
+ 
+   cursor = tracker_sparql_connection_query (self->priv->connection,
+diff --git a/src/gom-miner.h b/src/gom-miner.h
+index 5dcfc8d..8f83139 100644
+--- a/src/gom-miner.h
++++ b/src/gom-miner.h
+@@ -61,7 +61,6 @@ typedef struct _GomMinerPrivate GomMinerPrivate;
+ typedef struct {
+   GomMiner *miner;
+   TrackerSparqlConnection *connection;
+-  gchar *bus_name;
+ 
+   GoaAccount *account;
+   GHashTable *services;
+diff --git a/src/gom-owncloud-miner.c b/src/gom-owncloud-miner.c
+index 34d303b..623f2e1 100644
+--- a/src/gom-owncloud-miner.c
++++ b/src/gom-owncloud-miner.c
+@@ -100,14 +100,14 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_DOCUMENTS_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_DOCUMENTS_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -117,7 +117,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   modification_time = g_date_time_new_from_timeval_local (&tv);
+   new_mtime = g_date_time_to_unix (modification_time);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_DOCUMENTS_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -133,7 +133,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_DOCUMENTS_GRAPH, resource,
+      "nie:url", uri);
+ 
+   if (*error != NULL)
+@@ -156,7 +156,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+             (connection, cancellable, error,
+              NULL,
+-             datasource_urn, parent_identifier,
++             GOM_GRAPH, parent_identifier,
+              "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+           g_checksum_reset (checksum);
+           g_free (parent_identifier);
+@@ -168,7 +168,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_DOCUMENTS_GRAPH, resource,
+              "nie:isPartOf", parent_resource_urn);
+           g_free (parent_resource_urn);
+ 
+@@ -182,7 +182,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_DOCUMENTS_GRAPH, resource,
+              "nie:mimeType", mime);
+ 
+           if (*error != NULL)
+@@ -194,7 +194,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_DOCUMENTS_GRAPH, resource,
+      "nfo:fileName", display_name);
+ 
+   if (*error != NULL)
+@@ -416,6 +416,11 @@ query_owncloud (GomAccountMinerJob *job,
+   mount = g_volume_get_mount (volume);
+   if (mount == NULL)
+     {
++      g_autofree gchar *volume_name;
++
++      volume_name = g_volume_get_name (volume);
++      g_debug ("Mounting Online Account volume %s", volume_name);
++
+       data.error = error;
+ 
+       context = g_main_context_new ();
+@@ -436,6 +441,7 @@ query_owncloud (GomAccountMinerJob *job,
+     }
+ 
+   root = g_mount_get_root (mount);
++  g_debug ("Got volume from gnome-online-accounts: root is %s", g_file_peek_path (root));
+   account_miner_job_traverse_dir (job, connection, previous_resources, datasource_urn, root, TRUE, cancellable, error);
+ 
+   g_object_unref (root);
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 63a4c29..0d1766c 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -26,16 +26,11 @@
+ #include "gom-tracker.h"
+ #include "gom-utils.h"
+ 
+-static gchar *
+-_tracker_utils_format_into_graph (const gchar *graph)
+-{
+-  return (graph != NULL) ? g_strdup_printf ("INTO <%s> ", graph) : g_strdup ("");
+-}
+-
+ static gboolean
+ gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *connection,
+                                                     GCancellable *cancellable,
+                                                     GError **error,
++                                                    const gchar *graph,
+                                                     const gchar *resource,
+                                                     const gchar *attribute,
+                                                     gchar **value)
+@@ -45,8 +40,8 @@ gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *con
+   const gchar *string_value = NULL;
+   gboolean res;
+ 
+-  g_string_append_printf (select, "SELECT ?val { <%s> %s ?val }",
+-                          resource, attribute);
++  g_string_append_printf (select, "SELECT ?val { GRAPH <%s> { <%s> %s ?val } }",
++                          graph, resource, attribute);
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+                                             cancellable, error);
+@@ -86,7 +81,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+                                                const gchar *class,
+                                                ...)
+ {
+-  GString *select, *insert, *inner;
++  GString *select, *inner;
++  gchar *insert;
+   va_list args;
+   const gchar *arg;
+   TrackerSparqlCursor *cursor;
+@@ -98,6 +94,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   gchar *key = NULL, *val = NULL;
+   gboolean exists = FALSE;
+ 
++  g_return_val_if_fail (graph != NULL, NULL);
++
+   /* build the inner query with all the classes */
+   va_start (args, class);
+   inner = g_string_new (NULL);
+@@ -112,7 +110,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   /* query if such a resource is already in the DB */
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn WHERE { ?urn %s }", inner->str);
++                          "SELECT ?urn WHERE { GRAPH <%s> { ?urn %s } }", graph, inner->str);
+ 
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+@@ -138,19 +136,12 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+     }
+ 
+   /* not found, create the resource */
+-  insert = g_string_new (NULL);
+-  graph_str = _tracker_utils_format_into_graph (graph);
+-
+-  g_string_append_printf (insert, "INSERT %s { _:res %s }",
+-                          graph_str, inner->str);
+-  g_free (graph_str);
+-  g_string_free (inner, TRUE);
+-
++  insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }",
++                            graph, inner->str);
+   insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert->str,
++    tracker_sparql_connection_update_blank (connection, insert,
+                                             G_PRIORITY_DEFAULT, NULL, error);
+-
+-  g_string_free (insert, TRUE);
++  g_free (insert);
+ 
+   if (*error != NULL)
+     goto out;
+@@ -194,10 +185,10 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+                                                         const gchar *property_value)
+ {
+   GString *insert;
+-  gchar *graph_str, *quoted;
++  gchar *quoted;
+   gboolean retval = TRUE;
+ 
+-  graph_str = _tracker_utils_format_into_graph (graph);
++  g_return_val_if_fail (graph != NULL, FALSE);
+ 
+   /* the "null" value must not be quoted */
+   if (property_value == NULL)
+@@ -208,8 +199,8 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   insert = g_string_new (NULL);
+   g_string_append_printf
+     (insert,
+-     "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
+-     graph_str, resource, property_name, quoted);
++     "INSERT OR REPLACE INTO <%s> { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
++     graph, resource, property_name, quoted);
+   g_free (quoted);
+ 
+   g_debug ("Insert or replace triple: query %s", insert->str);
+@@ -223,8 +214,6 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   if (*error != NULL)
+     retval = FALSE;
+ 
+-  g_free (graph_str);
+-
+   return retval;
+ }
+ 
+@@ -271,6 +260,7 @@ gboolean
+ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection,
+                                                GCancellable *cancellable,
+                                                GError **error,
++                                               const gchar *graph,
+                                                const gchar *resource,
+                                                gboolean favorite)
+ {
+@@ -279,15 +269,15 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti
+   gboolean retval = TRUE;
+ 
+   if (favorite)
+-    op_str = "INSERT OR REPLACE";
++    op_str = "INSERT OR REPLACE INTO";
+   else
+-    op_str = "DELETE";
++    op_str = "DELETE FROM";
+ 
+   update = g_string_new (NULL);
+   g_string_append_printf
+     (update,
+-     "%s { <%s> nao:hasTag nao:predefined-tag-favorite }",
+-     op_str, resource);
++     "%s <%s> { <%s> nao:hasTag nao:predefined-tag-favorite }",
++     op_str, graph, resource);
+ 
+   g_debug ("Toggle favorite: query %s", update->str);
+ 
+@@ -321,9 +311,13 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+   mail_uri = g_strconcat ("mailto:", email, NULL);
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn WHERE { ?urn a nco:Contact . "
+-                          "?urn nco:hasEmailAddress ?mail . "
+-                          "FILTER (fn:contains(?mail, \"%s\" )) }", mail_uri);
++                          "SELECT ?urn WHERE { "
++                          "  GRAPH <%s> { "
++                          "    ?urn a nco:Contact . "
++                          "    ?urn nco:hasEmailAddress ?mail . "
++                          "    FILTER (fn:contains(?mail, \"%s\" )) "
++                          "  }"
++                          "}", TRACKER_CONTACTS_GRAPH, mail_uri);
+ 
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+@@ -351,8 +345,9 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+   insert = g_string_new (NULL);
+ 
+   g_string_append_printf (insert,
+-                          "INSERT { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . "
++                          "INSERT INTO <%s> { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . "
+                           "_:res a nco:Contact ; nco:hasEmailAddress <%s> ; nco:fullname \"%s\" . }",
++                          TRACKER_CONTACTS_GRAPH,
+                           mail_uri, email,
+                           mail_uri, fullname);
+ 
+@@ -397,6 +392,7 @@ gchar *
+ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection,
+                                              GCancellable *cancellable,
+                                              GError **error,
++                                             const gchar *graph,
+                                              const gchar *make,
+                                              const gchar *model)
+ {
+@@ -416,7 +412,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+   equip_uri = tracker_sparql_escape_uri_printf ("urn:equipment:%s:%s:",
+                                                 make != NULL ? make : "",
+                                                 model != NULL ? model : "");
+-  select = g_strdup_printf ("SELECT <%s> WHERE { }", equip_uri);
++  select = g_strdup_printf ("ASK { GRAPH <%s> { <%s> a nfo:Equipment } }", graph, equip_uri);
+ 
+   local_error = NULL;
+   cursor = tracker_sparql_connection_query (connection, select, cancellable, &local_error);
+@@ -436,20 +432,19 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+ 
+   if (res)
+     {
+-      const gchar *cursor_uri;
+-
+-      cursor_uri = tracker_sparql_cursor_get_string (cursor, 0, NULL);
+-      if (g_strcmp0 (cursor_uri, equip_uri) == 0)
++      if (tracker_sparql_cursor_get_boolean (cursor, 0))
+         {
+-          /* return the found resource */
+-          retval = g_strdup (cursor_uri);
++          /* The resource exists */
++          retval = equip_uri;
++          equip_uri = NULL;
+           g_debug ("Found resource in the store: %s", retval);
+           goto out;
+         }
+     }
+ 
+   /* not found, create the resource */
+-  insert = g_strdup_printf ("INSERT { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }",
++  insert = g_strdup_printf ("INSERT INTO <%s> { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }",
++                            graph,
+                             equip_uri,
+                             make,
+                             model);
+@@ -480,7 +475,7 @@ void
+ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+                                const gchar              *datasource_urn,
+                                gboolean                  resource_exists,
+-                               const gchar              *identifier,
++                               const gchar              *graph,
+                                const gchar              *resource,
+                                GCancellable             *cancellable,
+                                GError                  **error)
+@@ -498,7 +493,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+ 
+       res = gom_tracker_sparql_connection_get_string_attribute
+         (connection, cancellable, error,
+-         resource, "nie:dataSource", &old_value);
++         graph, resource, "nie:dataSource", &old_value);
+       g_clear_error (error);
+ 
+       if (res)
+@@ -514,7 +509,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+   if (set_datasource)
+     gom_tracker_sparql_connection_set_triple
+       (connection, cancellable, error,
+-       identifier, resource,
++       graph, resource,
+        "nie:dataSource", datasource_urn);
+ }
+ 
+@@ -522,7 +517,7 @@ gboolean
+ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+                           gint64                    new_mtime,
+                           gboolean                  resource_exists,
+-                          const gchar              *identifier,
++                          const gchar              *graph,
+                           const gchar              *resource,
+                           GCancellable             *cancellable,
+                           GError                  **error)
+@@ -536,7 +531,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+     {
+       res = gom_tracker_sparql_connection_get_string_attribute
+         (connection, cancellable, error,
+-         resource, "nie:contentLastModified", &old_value);
++         graph, resource, "nie:contentLastModified", &old_value);
+       g_clear_error (error);
+ 
+       if (res)
+@@ -552,7 +547,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+   date = gom_iso8601_from_timestamp (new_mtime);
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection, cancellable, error,
+-     identifier, resource,
++     graph, resource,
+      "nie:contentLastModified", date);
+   g_free (date);
+ 
+diff --git a/src/gom-tracker.h b/src/gom-tracker.h
+index 94a39e8..a5ae6fd 100644
+--- a/src/gom-tracker.h
++++ b/src/gom-tracker.h
+@@ -29,6 +29,14 @@
+ 
+ G_BEGIN_DECLS
+ 
++/* The graph where we store account meta information */
++#define GOM_GRAPH "tracker.api.gnome.org/ontology/v3/gnome-online-miners"
++
++/* Graphs where we store content information */
++#define TRACKER_CONTACTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Contacts"
++#define TRACKER_DOCUMENTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Documents"
++#define TRACKER_PICTURES_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Pictures"
++
+ gchar *gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connection,
+                                                       GCancellable *cancellable,
+                                                       GError **error,
+@@ -57,6 +65,7 @@ gboolean gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *conn
+ gboolean gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection,
+                                                         GCancellable *cancellable,
+                                                         GError **error,
++                                                        const gchar *graph,
+                                                         const gchar *resource,
+                                                         gboolean favorite);
+ 
+@@ -69,20 +78,21 @@ gchar* gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *conne
+ gchar *gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection,
+                                                     GCancellable *cancellable,
+                                                     GError **error,
++                                                    const gchar *graph,
+                                                     const gchar *make,
+                                                     const gchar *model);
+ 
+ void gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+                                     const gchar              *datasource_urn,
+                                     gboolean                  resource_exists,
+-                                    const gchar              *identifier,
++                                    const gchar              *graph,
+                                     const gchar              *resource,
+                                     GCancellable             *cancellable,
+                                     GError                  **error);
+ gboolean gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+                                    gint64                    new_mtime,
+                                    gboolean                  resource_exists,
+-                                   const gchar              *identifier,
++                                   const gchar              *graph,
+                                    const gchar              *resource,
+                                    GCancellable             *cancellable,
+                                    GError                  **error);
+diff --git a/src/gom-zpj-miner.c b/src/gom-zpj-miner.c
+index 6dff947..1372de5 100644
+--- a/src/gom-zpj-miner.c
++++ b/src/gom-zpj-miner.c
+@@ -70,14 +70,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -86,7 +86,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   updated_time = zpj_skydrive_entry_get_updated_time (entry);
+   new_mtime = g_date_time_to_unix (updated_time);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -102,7 +102,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", identifier);
+ 
+   if (*error != NULL)
+@@ -119,7 +119,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_identifier,
++         TRACKER_PICTURES_GRAPH, parent_identifier,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_identifier);
+ 
+@@ -129,7 +129,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:isPartOf", parent_resource_urn);
+       g_free (parent_resource_urn);
+ 
+@@ -142,7 +142,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_PICTURES_GRAPH, resource,
+              "nie:mimeType", mime);
+           g_free (mime);
+ 
+@@ -154,7 +154,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", zpj_skydrive_entry_get_description (entry));
+ 
+   if (*error != NULL)
+@@ -163,7 +163,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nfo:fileName", name);
+ 
+   if (*error != NULL)
+@@ -180,7 +180,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -192,7 +192,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", date);
+   g_free (date);
+ 
+-- 
+GitLab
+
+
+From 34259944dd9e6e167663c97080142f6e8b7f00f2 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Mon, 27 Jul 2020 23:48:49 +0200
+Subject: [PATCH 5/5] Update for API changes in Tracker 2.99
+
+---
+ src/gom-miner.c   |  3 ---
+ src/gom-tracker.c | 22 ++++++----------------
+ 2 files changed, 6 insertions(+), 19 deletions(-)
+
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 32892fa..d9ccf67 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -382,7 +382,6 @@ gom_miner_ensure_datasource (GomMiner *self,
+ 
+   tracker_sparql_connection_update (self->priv->connection,
+                                     datasource_insert->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     error);
+ 
+@@ -469,7 +468,6 @@ gom_account_miner_job_cleanup_previous (GomAccountMinerJob *job,
+ 
+   tracker_sparql_connection_update (job->connection,
+                                     delete->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     error);
+ 
+@@ -709,7 +707,6 @@ cleanup_job_do_cleanup (CleanupJob *job, GCancellable *cancellable)
+ 
+   tracker_sparql_connection_update (self->priv->connection,
+                                     update->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     &error);
+   g_string_free (update, TRUE);
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 0d1766c..5f49f73 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -138,9 +138,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   /* not found, create the resource */
+   insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }",
+                             graph, inner->str);
+-  insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert,
+-                                            G_PRIORITY_DEFAULT, NULL, error);
++  insert_res = tracker_sparql_connection_update_blank (connection, insert, NULL, error);
+   g_free (insert);
+ 
+   if (*error != NULL)
+@@ -205,9 +203,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+ 
+   g_debug ("Insert or replace triple: query %s", insert->str);
+ 
+-  tracker_sparql_connection_update (connection, insert->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, insert->str, cancellable, error);
+ 
+   g_string_free (insert, TRUE);
+ 
+@@ -235,9 +231,7 @@ gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *connection,
+      "DELETE { <%s> %s ?val } WHERE { <%s> %s ?val }", resource,
+      property_name, resource, property_name);
+ 
+-  tracker_sparql_connection_update (connection, delete->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, delete->str, cancellable, error);
+ 
+   g_string_free (delete, TRUE);
+   if (*error != NULL)
+@@ -281,9 +275,7 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti
+ 
+   g_debug ("Toggle favorite: query %s", update->str);
+ 
+-  tracker_sparql_connection_update (connection, update->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, update->str, cancellable, error);
+ 
+   g_string_free (update, TRUE);
+ 
+@@ -351,9 +343,7 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+                           mail_uri, email,
+                           mail_uri, fullname);
+ 
+-  insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert->str,
+-                                            G_PRIORITY_DEFAULT, cancellable, error);
++  insert_res = tracker_sparql_connection_update_blank (connection, insert->str, cancellable, error);
+ 
+   g_string_free (insert, TRUE);
+ 
+@@ -450,7 +440,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+                             model);
+ 
+   local_error = NULL;
+-  tracker_sparql_connection_update (connection, insert, G_PRIORITY_DEFAULT, cancellable, &local_error);
++  tracker_sparql_connection_update (connection, insert, cancellable, &local_error);
+   if (local_error != NULL)
+     {
+       g_propagate_error (error, local_error);
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template
index 644ac3558c9f..a9b2f37d69a5 100644
--- a/srcpkgs/gnome-online-miners/template
+++ b/srcpkgs/gnome-online-miners/template
@@ -1,12 +1,13 @@
 # Template file for 'gnome-online-miners'
 pkgname=gnome-online-miners
 version=3.34.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel autoconf
+ automake libtool autoconf-archive"
 makedepends="libzapojit-devel libgdata-devel grilo-devel
- tracker-devel gfbgraph-devel gnome-online-accounts-devel"
+ tracker3-devel gfbgraph-devel gnome-online-accounts-devel"
 depends="libzapojit>=0.0.3_3"
 short_desc="GNOME service that crawls through your online content"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8
 lib32disabled=yes
+
+pre_configure() {
+	autoreconf -fi
+}

From 8c3513663bfbb187656e7d8d5915b00e579e54f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 9 Apr 2022 13:10:44 +0200
Subject: [PATCH 1147/2561] removed-packages: revbump

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

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f1dcebc2b8cc..5d6d2c153348 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=68
+revision=69
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From aa001007ae377006e5d8cb48a70e52a487dd1d1e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:46:34 +0200
Subject: [PATCH 1148/2561] fio: update to 3.30.

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

diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index e5b15d2b6908..9bbb31a85740 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -1,6 +1,6 @@
 # Template file for 'fio'
 pkgname=fio
-version=3.29
+version=3.30
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/axboe/fio"
 distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=3ad22ee9c545afae914f399886e9637a43d1b3aa5dfcf6966ed83e633759acb7
+checksum=305647377527a2827223065582dd8a9269e69866426b341699d55bb4e4d3cc71
 python_version=3
 
 case "$XBPS_TARGET_MACHINE" in
@@ -30,7 +30,7 @@ do_configure() {
 }
 
 post_install() {
-	vdoc HOWTO
+	vdoc HOWTO.rst
 	for f in examples/*; do
 		vsconf "$f"
 	done

From fc6cb9ee78f40a8afb51716231fd245babd40979 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:48:06 +0200
Subject: [PATCH 1149/2561] xclock: update to 1.1.1.

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

diff --git a/srcpkgs/xclock/template b/srcpkgs/xclock/template
index 6d214076f834..83dbebfea74e 100644
--- a/srcpkgs/xclock/template
+++ b/srcpkgs/xclock/template
@@ -1,6 +1,6 @@
 # Template file for 'xclock'
 pkgname=xclock
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xclock.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
-checksum=00d1be08b3471a16b1239acad11e26b80545c49c34d9d20deab0ce14515e098f
+checksum=df7ceabf8f07044a2fde4924d794554996811640a45de40cb12c2cf1f90f742c
 
 post_install() {
 	vlicense COPYING

From 59d92ed9900bafef185cd8907c1f8b0ab246dc97 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:50:53 +0200
Subject: [PATCH 1150/2561] scite: update to 5.2.2.

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

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 4943d99f3fcf..e48c6adadb41 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.2.1
+version=5.2.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=0e7a1daca03d9eea20b2857b722ffd57788799235803bb7b84694af5a1707e07
+checksum=ad33019fdcf001ed441e88169593c3efebe77542f10bbc3e5a20a34e196586e0
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile

From c4cfb4b5609efcacf70dd1545a86d4cbebd4e540 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Apr 2022 16:04:20 +0200
Subject: [PATCH 1151/2561] python3-pipenv: update to 2022.4.8.

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

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 707476ccc36d..ea94ef51e087 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.3.28
+version=2022.4.8
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=4e7aae62dad7679ce81b54cc3451be19fb2c469e269335b36b14132fe5ceecb3
+checksum=53562bf69d9e5238f99a1e2101c356746b1c0aefa5dceb9b8a84a5a3e201de0d
 conflicts="python-pipenv>=0"
 
 post_extract() {

From fce0138c9bf9fcca83416170009629ee136e17e3 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 9 Apr 2022 10:02:29 -0500
Subject: [PATCH 1152/2561] xmandump: update to 0.2.3.

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

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index b05027396eaf..8ca5f3a280db 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,6 +1,6 @@
 # Template file for 'xmandump'
 pkgname=xmandump
-version=0.2.2
+version=0.2.3
 revision=1
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="ISC"
 homepage="https://github.com/void-linux/xmandump"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c664b84b9eb26e6cf6d7bc0aceca9a2ccfcfb1c0a4e0611544117489941c00ca
+checksum=d8c356bd2722558e9bfe1e55aefc0c44f6aecb52e998f4e7608e544a90cd6d89
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 19d5089044c83ed6cb9392315a55471a30cf58f9 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 2 Apr 2022 00:02:47 -0500
Subject: [PATCH 1153/2561] .github/workflows: Enable actions/stale

---
 .github/workflows/stale.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index abdc83c9d383..91ac19e4f638 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,10 +12,8 @@ jobs:
     steps:
       - uses: actions/stale@v4
         with:
-          stale-issue-message: 'Issues become stale 90 days after last activity and are closed 7 days after that.  If this issue is still relevant bump it or assign it.'
-          stale-pr-message: 'Pull Requests become stale 90 days after last activity and are closed 7 days after that.  If this pull request is still relevant bump it or assign it.'
+          stale-issue-message: 'Issues become stale 90 days after last activity and are closed 14 days after that.  If this issue is still relevant bump it or assign it.'
+          stale-pr-message: '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.'
           days-before-stale: 90
-          days-before-close: 7
-          debug-only: true
+          days-before-close: 14
           exempt-all-assignees: true
-          operations-per-run: 1000

From ac383c65dc65aa372692867205a1442dec0abd07 Mon Sep 17 00:00:00 2001
From: Erich Ericson <fakefakefans@gmail.com>
Date: Sun, 19 Dec 2021 18:41:33 +0100
Subject: [PATCH 1154/2561] MultiMC: remove package

---
 srcpkgs/MultiMC/files/MultiMC.sh  |  2 --
 srcpkgs/MultiMC/template          | 50 -------------------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/MultiMC/files/MultiMC.sh
 delete mode 100644 srcpkgs/MultiMC/template

diff --git a/srcpkgs/MultiMC/files/MultiMC.sh b/srcpkgs/MultiMC/files/MultiMC.sh
deleted file mode 100644
index 271794952e82..000000000000
--- a/srcpkgs/MultiMC/files/MultiMC.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/libexec/multimc/multimc -d ~/.multimc
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
deleted file mode 100644
index a842a76ac798..000000000000
--- a/srcpkgs/MultiMC/template
+++ /dev/null
@@ -1,50 +0,0 @@
-# Template file for 'MultiMC'
-pkgname=MultiMC
-version=0.6.13
-revision=1
-wrksrc="Launcher-${version}"
-_commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
-_nbtversion="multimc-0.6.1"
-_quazipversion="multimc-3"
-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 qt5-svg"
-short_desc="Instanced Minecraft client"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="http://multimc.org"
-distfiles="https://github.com/MultiMC/Launcher/archive/${version}.tar.gz
- https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
- https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="d77d07e77754875a8a4abd5a2f4d0e01593aa7ffb4860efe993eb2755e8a3164
- 36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
- ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
-skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"
-
-# Restricted since we don't have permissions to ship builds with the
-# MultiMC name, artwork or the API endpoints.
-restricted=yes
-
-case "$XBPS_TARGET_MACHINE" in
-	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
-esac
-
-pre_configure() {
-	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
-	export PATH=$PATH:$JAVA_HOME/bin
-	tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_nbtversion}.tar.gz" -C "${wrksrc}/libraries/libnbtplusplus" --strip-components 1
-	tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quazipversion}.tar.gz" -C "${wrksrc}/libraries/quazip" --strip-components 1
-}
-
-post_install() {
-	vmkdir usr/libexec/multimc
-	mv "${DESTDIR}/usr/bin/multimc" "${DESTDIR}/usr/libexec/multimc"
-	vbin "${FILESDIR}/MultiMC.sh" MultiMC
-	vinstall build/libMultiMC_nbt++.so 755 /usr/lib
-	vinstall build/libMultiMC_quazip.so 755 /usr/lib
-	vinstall launcher/package/linux/multimc.desktop 644 /usr/share/applications
-	vsed -i "${DESTDIR}/usr/share/applications/multimc.desktop" -e 's/Exec=multimc/Exec=MultiMC/'
-	vinstall launcher/resources/multimc/scalable/multimc.svg 644 /usr/share/pixmaps
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5d6d2c153348..6859fe29da93 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  ImageMagick6<=6.9.12.12_2
  MoinMoin<=1.9.11_1
+ MultiMC<=0.6.13_1
  Platinum9-theme<=0.0.0.20170720_3
  Venom<=0.5.5_1
  XorCurses<=0.2.2_1

From 193b256742a9ac3ae8adea7a12bc789f8b8af240 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:51:34 +0200
Subject: [PATCH 1155/2561] icdiff: update to 2.0.5.

---
 .../icdiff/patches/tests-disable-format-and-lint.patch | 10 ++++++++++
 srcpkgs/icdiff/template                                |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch

diff --git a/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch b/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch
new file mode 100644
index 000000000000..6e3daa16d903
--- /dev/null
+++ b/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch
@@ -0,0 +1,10 @@
+--- a/test.sh
++++ b/test.sh
+@@ -204,6 +204,7 @@
+   fi
+ }
+ 
++exit 0
+ ensure_installed "black"
+ echo 'Running black formatter...'
+ if ! black icdiff --line-length 79 --check; then
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 35e1d87c683c..14f656a597bf 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
-revision=2
+version=2.0.5
+revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=e1c278222891acde5d5b47e31b89f765fdf022b8908057f583032530982fe5b4
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"

From 46e615d25f4b73ff7d5812a09fc8cc6aa9b6c708 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:27 +0200
Subject: [PATCH 1156/2561] drumkv1: update to 0.9.25.

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

diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template
index ff9633954f94..d26d6962543e 100644
--- a/srcpkgs/drumkv1/template
+++ b/srcpkgs/drumkv1/template
@@ -1,6 +1,6 @@
 # Template file for 'drumkv1'
 pkgname=drumkv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://drumkv1.sourceforge.io/"
 changelog="https://github.com/rncbc/drumkv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz"
-checksum=b3d7a4105e94c3b29235d2d00ae74d0be6a00d62e791c968056aa64ff7ac6012
+checksum=cc89d3aaf617ec86fba448b61bb5376445bc5a65b102dd797caad14f2659a05c

From 1091c88fb95ca37f9d36f707becf3bc869e7ec9f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:34 +0200
Subject: [PATCH 1157/2561] padthv1: update to 0.9.25.

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

diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template
index 59ab088017c8..c5f6158d1a2d 100644
--- a/srcpkgs/padthv1/template
+++ b/srcpkgs/padthv1/template
@@ -1,6 +1,6 @@
 # Template file for 'padthv1'
 pkgname=padthv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://padthv1.sourceforge.io/"
 changelog="https://github.com/rncbc/padthv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/padthv1/padthv1-${version}.tar.gz"
-checksum=abdbad3bae84f665bada488f0e41d2e75b810e88fa63b64e884856f8a9b8785c
+checksum=6acabd7a9ffa45a0ebab48715c6342bc7530491599936378d4b89d47d211ca85

From 5c9ad4583e2591ba16a4cd0df044b8a379cd579f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:39 +0200
Subject: [PATCH 1158/2561] samplv1: update to 0.9.25.

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

diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template
index c694da880baf..5e7a8ecec542 100644
--- a/srcpkgs/samplv1/template
+++ b/srcpkgs/samplv1/template
@@ -1,6 +1,6 @@
 # Template file for 'samplv1'
 pkgname=samplv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://samplv1.sourceforge.io/"
 changelog="https://github.com/rncbc/samplv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/samplv1/samplv1-${version}.tar.gz"
-checksum=ff0bfbaacfb514cb1a0194b0a43ca121f7679640a293f907fb1bbb2640d373b0
+checksum=acf035da8c0f38ccd0a9bd0327d250c6338d8af56c824bf20f90673b07580534

From ad7d21d886da99b9ab153a9d78179717a5c77fa7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:42 +0200
Subject: [PATCH 1159/2561] synthv1: update to 0.9.25.

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

diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template
index e835002bd2fc..6d8775be3be2 100644
--- a/srcpkgs/synthv1/template
+++ b/srcpkgs/synthv1/template
@@ -1,6 +1,6 @@
 # Template file for 'synthv1'
 pkgname=synthv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://synthv1.sourceforge.io/"
 changelog="https://github.com/rncbc/synthv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/synthv1/synthv1-${version}.tar.gz"
-checksum=74857bf2497023dd0ebe59222e548d870598312b18a5826c54f4033c0fbd3d55
+checksum=02f05fcd45c896d6194fb10cb8ec64329193e3c194ce7e0b13a5f2e4cc0026c4

From 0896f11df74290f8ad9c29d45e930e5720b9a5d4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 9 Apr 2022 09:02:28 -0700
Subject: [PATCH 1160/2561] eudev: add udev_dir pkg-config variable

---
 ...80239647d37e5cfe320c422cce879c2e0d2c.patch | 20 +++++++++++++++++++
 srcpkgs/eudev/template                        |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch

diff --git a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
new file mode 100644
index 000000000000..b36b84f75496
--- /dev/null
+++ b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
@@ -0,0 +1,20 @@
+From 9d9e80239647d37e5cfe320c422cce879c2e0d2c Mon Sep 17 00:00:00 2001
+From: oreo639 <31916379+Oreo639@users.noreply.github.com>
+Date: Sat, 9 Apr 2022 05:39:56 -0700
+Subject: [PATCH] udev: add udev_dir as synonym of udevdir
+
+---
+ src/udev/udev.pc.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in
+index 4a9d867b8..cccebb245 100644
+--- a/src/udev/udev.pc.in
++++ b/src/udev/udev.pc.in
+@@ -3,4 +3,5 @@ Description: eudev
+ Version: @UDEV_VERSION@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-udevdir=@udevlibexecdir@
++udev_dir=@udevlibexecdir@
++udevdir=${udev_dir}
diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
index df783c562bca..68c50149e028 100644
--- a/srcpkgs/eudev/template
+++ b/srcpkgs/eudev/template
@@ -4,7 +4,7 @@ _UDEV_VERSION="243" # compatible udev version provided
 
 pkgname=eudev
 version=3.2.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-hwdb --enable-manpages --disable-introspection"
 hostmakedepends="pkg-config gperf"

From 7fdb532dfc271c9d7b99a6549bc2654416f5cdea Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 10 Apr 2022 01:40:24 +0200
Subject: [PATCH 1161/2561] firefox: fix build on platforms like ppc*

---
 srcpkgs/firefox/patches/fix-build-tier3.patch | 366 ++++++++++++++++++
 1 file changed, 366 insertions(+)
 create mode 100644 srcpkgs/firefox/patches/fix-build-tier3.patch

diff --git a/srcpkgs/firefox/patches/fix-build-tier3.patch b/srcpkgs/firefox/patches/fix-build-tier3.patch
new file mode 100644
index 000000000000..c7f5b7ea1f7b
--- /dev/null
+++ b/srcpkgs/firefox/patches/fix-build-tier3.patch
@@ -0,0 +1,366 @@
+commit 8a0c895dee94b3c15e56557eb1dd0114477a6056
+Author: q66 <daniel@octaforge.org>
+Date:   Sun Apr 10 00:38:30 2022 +0200
+
+    fix build on tier 3 platforms
+    
+    https://bugzilla.mozilla.org/show_bug.cgi?id=1758610
+
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
+index 0fa127b..78c8961 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
+@@ -814,7 +814,7 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
+ #  ifdef MOZ_WAYLAND_USE_VAAPI
+     // Create VideoFramePool in case we need it.
+     if (!mVideoFramePool && mEnableHardwareDecoding) {
+-      mVideoFramePool = MakeUnique<VideoFramePool>();
++      mVideoFramePool = MakeUnique<VideoFramePool<LIBAV_VER>>();
+     }
+ 
+     // Release unused VA-API surfaces before avcodec_receive_frame() as
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
+index b1a2f73..c77d76f 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
+@@ -16,6 +16,9 @@
+ #if LIBAVCODEC_VERSION_MAJOR >= 57 && LIBAVUTIL_VERSION_MAJOR >= 56
+ #  include "mozilla/layers/TextureClient.h"
+ #endif
++#ifdef MOZ_WAYLAND_USE_VAAPI
++#  include "FFmpegVideoFramePool.h"
++#endif
+ 
+ struct _VADRMPRIMESurfaceDescriptor;
+ typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor;
+@@ -23,7 +26,6 @@ typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor;
+ namespace mozilla {
+ 
+ class ImageBufferWrapper;
+-class VideoFramePool;
+ 
+ template <int V>
+ class FFmpegVideoDecoder : public FFmpegDataDecoder<V> {};
+@@ -138,7 +140,7 @@ class FFmpegVideoDecoder<LIBAV_VER>
+   AVBufferRef* mVAAPIDeviceContext;
+   bool mEnableHardwareDecoding;
+   VADisplay mDisplay;
+-  UniquePtr<VideoFramePool> mVideoFramePool;
++  UniquePtr<VideoFramePool<LIBAV_VER>> mVideoFramePool;
+   static nsTArray<AVCodecID> mAcceleratedFormats;
+ #endif
+   RefPtr<KnowsCompositor> mImageAllocator;
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
+index 7943e09..673b3fc 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
+@@ -5,6 +5,7 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+ #include "FFmpegVideoFramePool.h"
++#include "PlatformDecoderModule.h"
+ #include "FFmpegLog.h"
+ #include "mozilla/widget/DMABufLibWrapper.h"
+ #include "libavutil/pixfmt.h"
+@@ -15,11 +16,11 @@
+ 
+ namespace mozilla {
+ 
+-RefPtr<layers::Image> VideoFrameSurfaceVAAPI::GetAsImage() {
++RefPtr<layers::Image> VideoFrameSurface<LIBAV_VER>::GetAsImage() {
+   return new layers::DMABUFSurfaceImage(mSurface);
+ }
+ 
+-VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface)
++VideoFrameSurface<LIBAV_VER>::VideoFrameSurface(DMABufSurface* aSurface)
+     : mSurface(aSurface),
+       mLib(nullptr),
+       mAVHWFramesContext(nullptr),
+@@ -30,22 +31,22 @@ VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface)
+   MOZ_ASSERT(mSurface);
+   MOZ_RELEASE_ASSERT(mSurface->GetAsDMABufSurfaceYUV());
+   mSurface->GlobalRefCountCreate();
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: creating surface UID = %d",
++  FFMPEG_LOG("VideoFrameSurface: creating surface UID = %d",
+              mSurface->GetUID());
+ }
+ 
+-void VideoFrameSurfaceVAAPI::LockVAAPIData(AVCodecContext* aAVCodecContext,
+-                                           AVFrame* aAVFrame,
+-                                           FFmpegLibWrapper* aLib) {
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI locking dmabuf surface UID = %d",
++void VideoFrameSurface<LIBAV_VER>::LockVAAPIData(AVCodecContext* aAVCodecContext,
++                                                 AVFrame* aAVFrame,
++                                                 FFmpegLibWrapper* aLib) {
++  FFMPEG_LOG("VideoFrameSurface: VAAPI locking dmabuf surface UID = %d",
+              mSurface->GetUID());
+   mLib = aLib;
+   mAVHWFramesContext = aLib->av_buffer_ref(aAVCodecContext->hw_frames_ctx);
+   mHWAVBuffer = aLib->av_buffer_ref(aAVFrame->buf[0]);
+ }
+ 
+-void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) {
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI releasing dmabuf surface UID = %d",
++void VideoFrameSurface<LIBAV_VER>::ReleaseVAAPIData(bool aForFrameRecycle) {
++  FFMPEG_LOG("VideoFrameSurface: VAAPI releasing dmabuf surface UID = %d",
+              mSurface->GetUID());
+ 
+   // It's possible to unref GPU data while IsUsed() is still set.
+@@ -67,43 +68,43 @@ void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) {
+   }
+ }
+ 
+-VideoFrameSurfaceVAAPI::~VideoFrameSurfaceVAAPI() {
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: deleting dmabuf surface UID = %d",
++VideoFrameSurface<LIBAV_VER>::~VideoFrameSurface() {
++  FFMPEG_LOG("VideoFrameSurface: deleting dmabuf surface UID = %d",
+              mSurface->GetUID());
+   // We're about to quit, no need to recycle the frames.
+   ReleaseVAAPIData(/* aForFrameRecycle */ false);
+ }
+ 
+-VideoFramePool::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {}
++VideoFramePool<LIBAV_VER>::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {}
+ 
+-VideoFramePool::~VideoFramePool() {
++VideoFramePool<LIBAV_VER>::~VideoFramePool() {
+   MutexAutoLock lock(mSurfaceLock);
+   mDMABufSurfaces.Clear();
+ }
+ 
+-void VideoFramePool::ReleaseUnusedVAAPIFrames() {
++void VideoFramePool<LIBAV_VER>::ReleaseUnusedVAAPIFrames() {
+   MutexAutoLock lock(mSurfaceLock);
+   for (const auto& surface : mDMABufSurfaces) {
+-    auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI();
+-    if (!vaapiSurface->IsUsed()) {
+-      vaapiSurface->ReleaseVAAPIData();
++    if (!surface->IsUsed()) {
++      surface->ReleaseVAAPIData();
+     }
+   }
+ }
+ 
+-RefPtr<VideoFrameSurface> VideoFramePool::GetFreeVideoFrameSurface() {
++RefPtr<VideoFrameSurface<LIBAV_VER>>
++VideoFramePool<LIBAV_VER>::GetFreeVideoFrameSurface() {
+   for (auto& surface : mDMABufSurfaces) {
+     if (surface->IsUsed()) {
+       continue;
+     }
+-    auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI();
+-    vaapiSurface->ReleaseVAAPIData();
++    surface->ReleaseVAAPIData();
+     return surface;
+   }
+   return nullptr;
+ }
+ 
+-RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
++RefPtr<VideoFrameSurface<LIBAV_VER>>
++VideoFramePool<LIBAV_VER>::GetVideoFrameSurface(
+     VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext,
+     AVFrame* aAVFrame, FFmpegLibWrapper* aLib) {
+   if (aVaDesc.fourcc != VA_FOURCC_NV12 && aVaDesc.fourcc != VA_FOURCC_YV12 &&
+@@ -113,7 +114,7 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
+   }
+ 
+   MutexAutoLock lock(mSurfaceLock);
+-  RefPtr<VideoFrameSurface> videoSurface = GetFreeVideoFrameSurface();
++  RefPtr<VideoFrameSurface<LIBAV_VER>> videoSurface = GetFreeVideoFrameSurface();
+   if (!videoSurface) {
+     RefPtr<DMABufSurfaceYUV> surface =
+         DMABufSurfaceYUV::CreateYUVSurface(aVaDesc);
+@@ -121,7 +122,7 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
+       return nullptr;
+     }
+     FFMPEG_LOG("Created new VA-API DMABufSurface UID = %d", surface->GetUID());
+-    RefPtr<VideoFrameSurfaceVAAPI> surf = new VideoFrameSurfaceVAAPI(surface);
++    RefPtr<VideoFrameSurface<LIBAV_VER>> surf = new VideoFrameSurface<LIBAV_VER>(surface);
+     if (!mTextureCreationWorks) {
+       mTextureCreationWorks = Some(surface->VerifyTextureCreation());
+     }
+@@ -138,11 +139,8 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
+     }
+     FFMPEG_LOG("Reusing VA-API DMABufSurface UID = %d", surface->GetUID());
+   }
+-
+-  auto* vaapiSurface = videoSurface->AsVideoFrameSurfaceVAAPI();
+-  vaapiSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
+-  vaapiSurface->MarkAsUsed();
+-
++  videoSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
++  videoSurface->MarkAsUsed();
+   return videoSurface;
+ }
+ 
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
+index c506d22..c89b418 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
+@@ -7,8 +7,9 @@
+ #ifndef __FFmpegVideoFramePool_h__
+ #define __FFmpegVideoFramePool_h__
+ 
+-#include "FFmpegVideoDecoder.h"
+ #include "FFmpegLibWrapper.h"
++#include "FFmpegLibs.h"
++#include "FFmpegLog.h"
+ 
+ #include "mozilla/layers/DMABUFSurfaceImage.h"
+ #include "mozilla/widget/DMABufLibWrapper.h"
+@@ -16,43 +17,16 @@
+ 
+ namespace mozilla {
+ 
+-class VideoFramePool;
+-class VideoFrameSurfaceVAAPI;
+-
+-class VideoFrameSurface {
+- public:
+-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface)
+-
+-  VideoFrameSurface() = default;
+-
+-  virtual VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() { return nullptr; }
+-
+-  virtual void SetYUVColorSpace(gfx::YUVColorSpace aColorSpace) = 0;
+-  virtual void SetColorRange(gfx::ColorRange aColorRange) = 0;
+-
+-  virtual RefPtr<DMABufSurfaceYUV> GetDMABufSurface() { return nullptr; };
+-  virtual RefPtr<layers::Image> GetAsImage() = 0;
+-
+-  // Don't allow VideoFrameSurface plain copy as it leads to
+-  // unexpected DMABufSurface/HW buffer releases and we don't want to
+-  // deep copy them.
+-  VideoFrameSurface(const VideoFrameSurface&) = delete;
+-  const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete;
+-
+- protected:
+-  virtual ~VideoFrameSurface(){};
+-};
+-
+-// VideoFrameSurfaceVAAPI holds a reference to GPU data with a video frame.
++// VideoFrameSurface holds a reference to GPU data with a video frame.
+ //
+ // Actual GPU pixel data are stored at DMABufSurface and
+ // DMABufSurface is passed to gecko GL rendering pipeline via.
+ // DMABUFSurfaceImage.
+ //
+-// VideoFrameSurfaceVAAPI can optionally hold VA-API ffmpeg related data to keep
++// VideoFrameSurface can optionally hold VA-API ffmpeg related data to keep
+ // GPU data locked untill we need them.
+ //
+-// VideoFrameSurfaceVAAPI is used for both HW accelerated video decoding
++// VideoFrameSurface is used for both HW accelerated video decoding
+ // (VA-API) and ffmpeg SW decoding.
+ //
+ // VA-API scenario
+@@ -72,13 +46,24 @@ class VideoFrameSurface {
+ // Unfortunately there isn't any obvious way how to mark particular VASurface
+ // as used. The best we can do is to hold a reference to particular AVBuffer
+ // from decoded AVFrame and AVHWFramesContext which owns the AVBuffer.
+-class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+-  friend class VideoFramePool;
++template <int V>
++class VideoFrameSurface {};
++template <>
++class VideoFrameSurface<LIBAV_VER>;
++
++template <int V>
++class VideoFramePool {};
++template <>
++class VideoFramePool<LIBAV_VER>;
++
++template <>
++class VideoFrameSurface<LIBAV_VER> {
++  friend class VideoFramePool<LIBAV_VER>;
+ 
+  public:
+-  explicit VideoFrameSurfaceVAAPI(DMABufSurface* aSurface);
++  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface)
+ 
+-  VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() final { return this; }
++  explicit VideoFrameSurface(DMABufSurface* aSurface);
+ 
+   void SetYUVColorSpace(mozilla::gfx::YUVColorSpace aColorSpace) {
+     mSurface->GetAsDMABufSurfaceYUV()->SetYUVColorSpace(aColorSpace);
+@@ -93,6 +78,12 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+ 
+   RefPtr<layers::Image> GetAsImage();
+ 
++  // Don't allow VideoFrameSurface plain copy as it leads to
++  // unexpected DMABufSurface/HW buffer releases and we don't want to
++  // deep copy them.
++  VideoFrameSurface(const VideoFrameSurface&) = delete;
++  const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete;
++
+  protected:
+   // Lock VAAPI related data
+   void LockVAAPIData(AVCodecContext* aAVCodecContext, AVFrame* aAVFrame,
+@@ -107,7 +98,7 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+   void MarkAsUsed() { mSurface->GlobalRefAdd(); }
+ 
+  private:
+-  virtual ~VideoFrameSurfaceVAAPI();
++  virtual ~VideoFrameSurface();
+ 
+   const RefPtr<DMABufSurface> mSurface;
+   const FFmpegLibWrapper* mLib;
+@@ -116,23 +107,24 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+ };
+ 
+ // VideoFramePool class is thread-safe.
+-class VideoFramePool final {
++template <>
++class VideoFramePool<LIBAV_VER> {
+  public:
+   VideoFramePool();
+   ~VideoFramePool();
+ 
+-  RefPtr<VideoFrameSurface> GetVideoFrameSurface(
++  RefPtr<VideoFrameSurface<LIBAV_VER>> GetVideoFrameSurface(
+       VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext,
+       AVFrame* aAVFrame, FFmpegLibWrapper* aLib);
+   void ReleaseUnusedVAAPIFrames();
+ 
+  private:
+-  RefPtr<VideoFrameSurface> GetFreeVideoFrameSurface();
++  RefPtr<VideoFrameSurface<LIBAV_VER>> GetFreeVideoFrameSurface();
+ 
+  private:
+   // Protect mDMABufSurfaces pool access
+   Mutex mSurfaceLock;
+-  nsTArray<RefPtr<VideoFrameSurfaceVAAPI>> mDMABufSurfaces;
++  nsTArray<RefPtr<VideoFrameSurface<LIBAV_VER>>> mDMABufSurfaces;
+   // We may fail to create texture over DMABuf memory due to driver bugs so
+   // check that before we export first DMABuf video frame.
+   Maybe<bool> mTextureCreationWorks;
+diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
+index de2611e..8ffdaae 100644
+--- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
++++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
+@@ -30,6 +30,9 @@ if CONFIG['MOZ_WAYLAND']:
+   CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
+   DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
+   USE_LIBS += ['mozva']
++  UNIFIED_SOURCES += [
++    '../FFmpegVideoFramePool.cpp',
++  ]
+ 
+ include("/ipc/chromium/chromium-config.mozbuild")
+ 
+diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
+index 7d28420..1da28a1 100644
+--- a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
++++ b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
+@@ -30,6 +30,9 @@ if CONFIG["MOZ_WAYLAND"]:
+     CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+     DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1
+     USE_LIBS += ["mozva"]
++    UNIFIED_SOURCES += [
++        "../FFmpegVideoFramePool.cpp",
++    ]
+ 
+ include("/ipc/chromium/chromium-config.mozbuild")
+ 

From 0645356ce48a5235f9bb779ea7ba57293a43ca95 Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 5 Jan 2022 13:08:39 -0800
Subject: [PATCH 1162/2561] ruby-build: update to 20211227.

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

diff --git a/srcpkgs/ruby-build/template b/srcpkgs/ruby-build/template
index 8ba698addb76..778d5e716505 100644
--- a/srcpkgs/ruby-build/template
+++ b/srcpkgs/ruby-build/template
@@ -1,6 +1,6 @@
 # Template file for 'ruby-build'
 pkgname=ruby-build
-version=20211203
+version=20211227
 revision=1
 depends="bash"
 short_desc="Compile and install Ruby"
@@ -8,7 +8,7 @@ maintainer="b-l-a-i-n-e <blaine.gilbreth@gmail.com>"
 license="MIT"
 homepage="https://github.com/rbenv/ruby-build"
 distfiles="https://github.com/rbenv/ruby-build/archive/refs/tags/v${version}.tar.gz"
-checksum=f6a9149b24c7452a512395bc43d9837171de5f43ef0cf191a4a24b013f6a2eed
+checksum=7a07eae6d6948f79a8ffecd7a493fb887e10326c429fe55cfe1bda65146db824
 
 do_install() {
 	vbin bin/ruby-build

From ec987378382c0eaed6abaff4ec6b510a53afdb3f Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 10 Apr 2022 01:26:47 -0400
Subject: [PATCH 1163/2561] neomutt: update to 20220408.

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

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 3e9e433395f9..3e703630df81 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20211029
+version=20220408
 revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
@@ -19,11 +19,11 @@ short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://neomutt.org/"
-_test_files_hash=8e4fc46e731da0863c04b005885f92aa925b6367
+_test_files_hash=dc9fb32a701eb9dce4fda93c27da1d9b5be23231
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="08245cfa7aec80b895771fd1adcbb7b86e9c0434dfa64574e3c8c4d692aaa078
- 818ff9642ac396e18854486078320ce03a58c8aa8f7d6af44d1b0b5de822ccc3"
+checksum="bb138adb09b1f164fe690749e991a5505bf4f50b6ad478ffb085c609d5617cc7
+ bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947"
 python_version=3
 
 # fix:

From 1945c59126245041615c77e9ae8be16739ae3a8d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH 1164/2561] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 38 ++++++------
 2 files changed, 77 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..654c901f129e 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,39 +1,36 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="gettext glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+homepage="https://gitlab.freedesktop.org/upower/upower"
+changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS"
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
@@ -49,9 +46,12 @@ upower-devel_package() {
 	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/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 7ed60c8ef7039a6bd0ae5fdcd5746eda71a83e9c Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 1 Apr 2022 11:00:05 +0200
Subject: [PATCH 1165/2561] vscode: update to 1.66.0.

---
 srcpkgs/vscode/patches/product.patch | 12 +++---------
 srcpkgs/vscode/patches/ripgrep.patch | 14 +++++++-------
 srcpkgs/vscode/template              | 10 +++++++---
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index a7e2b79925bf..624ca63afcbe 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,21 +1,15 @@
 diff --git a/product.json b/product.json
-index 9d630f23cd7..eea95dce319 100644
+index df18127dcc67..d3006752bd98 100644
 --- a/product.json
 +++ b/product.json
-@@ -27,6 +27,9 @@
+@@ -27,7 +27,15 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
 +	"quality": "stable",
 +	"documentationUrl": "https://github.com/microsoft/vscode-docs",
 +	"requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/",
- 	"extensionAllowedProposedApi": [
- 		"ms-vscode.vscode-js-profile-flame",
-@@ -34,6 +37,11 @@
- 		"GitHub.remotehub",
- 		"GitHub.remotehub-insiders"
- 	],
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/",
 +	"extensionsGallery": {
 +		"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
 +		"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index ff0dfc233e41..3fdc568a9e54 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -5,27 +5,27 @@ during build, which unbreaks build on platforms where MS deos not
 ship a prebuilt ripgrep.
 
 diff --git a/package.json b/package.json
-index 5d6022a2a40..f66ee44eef0 100644
+index de2cf9e04a9b..1995e3bb9a7e 100644
 --- a/package.json
 +++ b/package.json
-@@ -63,7 +63,7 @@
+@@ -62,7 +62,7 @@
+     "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
-     "@vscode/debugprotocol": "1.51.0",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
-     "@vscode/sqlite3": "4.0.12",
+     "@vscode/sqlite3": "5.0.7",
      "@vscode/sudo-prompt": "9.3.1",
      "@vscode/vscode-languagedetection": "1.0.21",
 diff --git a/remote/package.json b/remote/package.json
-index 4bc40998093..9d22d408c02 100644
+index c7fc7a2e931f..8842b784df2c 100644
 --- a/remote/package.json
 +++ b/remote/package.json
 @@ -6,7 +6,7 @@
      "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
      "@vscode/vscode-languagedetection": "1.0.21",
      "applicationinsights": "1.4.2",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 620c9a6928aa..0b9efda224d0 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,8 +1,9 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.65.2
+version=1.66.0
 revision=1
 _electronver=13.6.7
+_npmver=8.6.0
 hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep"
 makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13"
 depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
@@ -11,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
+checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -46,7 +47,10 @@ do_build() {
 	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
 	--target=$_electronver \
 	--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
-	yarn install --ignore-engines --arch=x64
+
+	npm install -g npm@${_npmver} && \
+		yarn install --ignore-engines --arch=x64
+
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min
 }

From c1be3d7768ebc5cc991f7c7c3ec539941f147873 Mon Sep 17 00:00:00 2001
From: octeep <octeep@pm.me>
Date: Fri, 1 Apr 2022 17:55:08 +0100
Subject: [PATCH 1166/2561] New package: wireproxy-1.0.1

---
 srcpkgs/wireproxy/files/wireproxy/run |  7 +++++++
 srcpkgs/wireproxy/template            | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 srcpkgs/wireproxy/files/wireproxy/run
 create mode 100644 srcpkgs/wireproxy/template

diff --git a/srcpkgs/wireproxy/files/wireproxy/run b/srcpkgs/wireproxy/files/wireproxy/run
new file mode 100644
index 000000000000..7ba16434072e
--- /dev/null
+++ b/srcpkgs/wireproxy/files/wireproxy/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+export HOME=/var/lib/wireproxy
+
+exec chpst -u _wireproxy wireproxy --config ${CONFFILE:-/etc/wireproxy/config}
diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
new file mode 100644
index 000000000000..984027a4f69e
--- /dev/null
+++ b/srcpkgs/wireproxy/template
@@ -0,0 +1,24 @@
+# Template file for 'wireproxy'
+pkgname=wireproxy
+version=1.0.1
+revision=1
+build_style=go
+go_import_path="github.com/octeep/wireproxy"
+go_package="${go_import_path}/cmd/wireproxy"
+short_desc="Wireguard client that exposes itself as a socks5 proxy"
+maintainer="Wind Wong <octeep@pm.me>"
+license="ISC"
+homepage="https://github.com/octeep/wireproxy"
+distfiles="https://github.com/octeep/wireproxy/archive/v${version}.tar.gz"
+checksum=e21eac22ef1b12dc2d7b3e5b58dcff183af9c1547be3e55a7e6c71394f053e1e
+make_dirs="
+ /etc/wireproxy 0750 root _wireproxy
+ /var/lib/wireproxy 0700 _wireproxy _wireproxy"
+
+system_accounts="_wireproxy"
+_wireproxy_homedir="/var/lib/wireproxy"
+
+post_install() {
+	vsv wireproxy
+	vlicense LICENSE
+}

From 1a52dd83016ed92d6f925b90a5862d0d158a0c38 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Mar 2022 00:38:27 +0200
Subject: [PATCH 1167/2561] patch_args: allow use of --directory parameter

patch(1) has a -d/--directory parameter which allows us to specify a directory
where the patch will be applied. This is especially useful when we have
multiple distfiles and want to patch in $build_wrksrc because that's where the
patch is usually applied.

Problem is, that the -i parameter is also relative to the the -d parameter and
thus fails to find the patch, when -d is set. We solve that by using standard
input instead of -i.
---
 common/hooks/do-patch/00-patches.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hooks/do-patch/00-patches.sh b/common/hooks/do-patch/00-patches.sh
index 9f7e21f017dc..64659dc30280 100644
--- a/common/hooks/do-patch/00-patches.sh
+++ b/common/hooks/do-patch/00-patches.sh
@@ -31,7 +31,7 @@ _process_patch() {
 
 	cd "$wrksrc"
 	msg_normal "$pkgver: patching: ${_patch}.\n"
-	patch -s ${_args} -i ${_patch} 2>/dev/null
+	patch -s ${_args} <${_patch} 2>/dev/null
 }
 
 hook() {

From 4c8c6b32766d891e81c4fdc63ff1821ca94db12b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Mar 2022 00:57:00 +0200
Subject: [PATCH 1168/2561] wine: patch into $build_wrksrc

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  | 9 +++++++--
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 3 +++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 7546d45c7609..6a46158221b4 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index e0b6f8626637..f522f7ecea2d 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.6/configure
-+++ b/wine-7.6/configure
+--- a/configure
++++ b/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,13 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
+<<<<<<< HEAD
 --- a/wine-7.6/configure.ac
 +++ b/wine-7.6/configure.ac
+=======
+--- a/configure.ac
++++ b/configure.ac
+>>>>>>> 6dccb4ef9c (wine: patch into $build_wrksrc)
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index a95011e3cca0..ac8dfca3bb2f 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.6/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.6/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 86d0acf0883b..beb10898af92 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -25,6 +25,8 @@ desc_option_xshm="Enable support for the X Shared Memory Extension"
 lib32mode=full
 archs="i686* x86_64*"
 
+patch_args="-Np1 --directory=${build_wrksrc}"
+
 _nopie=no
 if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 	# build system adds -fno-PIC for 32bit builds, which,
@@ -48,6 +50,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}"
+# This testsuite might hang indefinitely
 make_check=extended
 
 case $XBPS_TARGET_MACHINE in

From 8b15d675bc5512f6086e5c67b0b516713c4d3db7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 9 Apr 2022 13:38:04 +0200
Subject: [PATCH 1169/2561] chatterino2: patch into $build_wrksrc

---
 .../patches/0001-fix-desktop-icon-name.patch         |  4 ++--
 srcpkgs/chatterino2/patches/cmake.patch              | 12 ++++++------
 srcpkgs/chatterino2/template                         |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
index 9f41d03190b7..1b0a6d6140e4 100644
--- a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -1,7 +1,7 @@
 diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
 index 6ee45354..ece81f5c 100644
---- a/chatterino2/resources/com.chatterino.chatterino.desktop
-+++ b/chatterino2/resources/com.chatterino.chatterino.desktop
+--- a/resources/com.chatterino.chatterino.desktop
++++ b/resources/com.chatterino.chatterino.desktop
 @@ -4,7 +4,7 @@ Version=1.0
  Name=Chatterino
  Comment=Chat client for Twitch
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
index a59d0a4eb9f0..8a5643566957 100644
--- a/srcpkgs/chatterino2/patches/cmake.patch
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -1,7 +1,7 @@
 diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
 index 82905436..b0b89a4e 100644
---- a/chatterino2/cmake/FindLRUCache.cmake
-+++ b/chatterino2/cmake/FindLRUCache.cmake
+--- a/cmake/FindLRUCache.cmake
++++ b/cmake/FindLRUCache.cmake
 @@ -1,6 +1,6 @@
  include(FindPackageHandleStandardArgs)
  
@@ -12,8 +12,8 @@ index 82905436..b0b89a4e 100644
  
 diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
 index 4671874c..119284c2 100644
---- a/chatterino2/cmake/FindPajladaSerialize.cmake
-+++ b/chatterino2/cmake/FindPajladaSerialize.cmake
+--- a/cmake/FindPajladaSerialize.cmake
++++ b/cmake/FindPajladaSerialize.cmake
 @@ -1,6 +1,6 @@
  include(FindPackageHandleStandardArgs)
  
@@ -24,8 +24,8 @@ index 4671874c..119284c2 100644
  
 diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
 index f4c964ec..75efba20 100644
---- a/chatterino2/cmake/FindPajladaSignals.cmake
-+++ b/chatterino2/cmake/FindPajladaSignals.cmake
+--- a/cmake/FindPajladaSignals.cmake
++++ b/cmake/FindPajladaSignals.cmake
 @@ -1,6 +1,6 @@
  include(FindPackageHandleStandardArgs)
  
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index e1f99ac9e9fc..7bf7d6a37d04 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -9,7 +9,7 @@ _signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
 _qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
 _sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
 create_wrksrc=yes
-build_wrksrc="chatterino2"
+build_wrksrc="chatterino2-${version}"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
@@ -40,8 +40,9 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LIBS="-latomic"
 fi
 
+patch_args="-Np1 --directory=${build_wrksrc}"
+
 post_extract() {
-	mv "chatterino2-${version}" "${build_wrksrc}"
 	rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \
 	      ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \
 	      ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \

From f8621b9e658f888c0f7bbe2285bb93d7d1bd7275 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 16 Mar 2022 15:29:25 +0200
Subject: [PATCH 1170/2561] goodvibes: update to 0.7.3.

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

diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index 1a73cd225234..97c1ae97171f 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,6 +1,6 @@
 # Template file for 'goodvibes'
 pkgname=goodvibes
-version=0.7.2
+version=0.7.4
 revision=1
 wrksrc="goodvibes-v${version}"
 build_style=meson
@@ -14,7 +14,7 @@ license="GPL-3.0-only"
 homepage="https://gitlab.com/goodvibes/goodvibes"
 changelog="https://gitlab.com/goodvibes/goodvibes/-/raw/master/NEWS"
 distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=5f96ba7b8654f331181c8ee0e697d042a195406712a547e7954159e5d66795ba
+checksum=9940c56cb18064f966c2f881fbc7876004eba06f1ea249e01c652477853017cf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"

From 9f7eb6665a441ce30a01b2704b91cdc5c3c0909d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 02:50:03 +0100
Subject: [PATCH 1171/2561] screenkey: update to 1.5.

---
 srcpkgs/screenkey/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/screenkey/template b/srcpkgs/screenkey/template
index 4541a207058c..f199b36bc9ef 100644
--- a/srcpkgs/screenkey/template
+++ b/srcpkgs/screenkey/template
@@ -1,15 +1,15 @@
 # Template file for 'screenkey'
 pkgname=screenkey
-version=1.4
-revision=2
+version=1.5
+revision=1
 build_style=python3-module
-hostmakedepends="intltool python3-setuptools python3-distutils-extra
- python3-Babel"
-depends="gtk+3 libX11 python3-gobject"
-checkdepends="${depends} libXtst"
+hostmakedepends="python3-setuptools python3-Babel"
+depends="gtk+3 libX11 python3-gobject python3-cairo python3-dbus"
+checkdepends="$depends"
 short_desc="Screencast tool to display your keys"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://www.thregr.org/~wavexx/software/screenkey"
+homepage="https://www.thregr.org/~wavexx/software/screenkey"
+changelog="https://www.thregr.org/~wavexx/software/screenkey/NEWS.html"
 distfiles="${homepage}/releases/screenkey-${version}.tar.gz"
-checksum=d7347e31fab4a5b18da431e3fc26f39700e99a505eb0c0168295adc12c8dd4f7
+checksum=cc8471b83f7ba7a754e1da0631cfa9c32b9217da93597afc1c3283e3a1ae4112

From 1f11e2ecfb87a382ae5c30fdd312622a7c8a87bc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 27 Mar 2022 22:35:11 +0200
Subject: [PATCH 1172/2561] New package: orage-4.16.0

---
 srcpkgs/orage/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/orage/template

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
new file mode 100644
index 000000000000..0cfc8994c78c
--- /dev/null
+++ b/srcpkgs/orage/template
@@ -0,0 +1,17 @@
+# Template file for 'orage'
+pkgname=orage
+version=4.16.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool flex glib-devel dbus-glib-devel"
+makedepends="libical-devel libnotify-devel gtk+3-devel popt-devel
+ libxfce4util-devel libxfce4ui-devel xfce4-panel-devel"
+depends="hicolor-icon-theme desktop-file-utils"
+short_desc="Simple calendar application for Xfce"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://docs.xfce.org/apps/orage/start"
+changelog="https://gitlab.xfce.org/apps/orage/-/raw/master/NEWS"
+distfiles="https://archive.xfce.org/src/apps/orage/${version%.*}/orage-$version.tar.bz2"
+checksum=26111a3b6a2007c82f1e0a1e0591b774a0b132f3a7f1cde53d9be661b2f11700

From ad0bbdea9da8f494555a8b020227edf7987c2bb1 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Fri, 8 Apr 2022 10:47:59 +0700
Subject: [PATCH 1173/2561] upterm: update to 0.8.2

---
 srcpkgs/upterm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 362f919c40ef..fd99190dedb9 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,6 +1,6 @@
 # Template file for 'upterm'
 pkgname=upterm
-version=0.7.6
+version=0.8.2
 revision=1
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
@@ -10,7 +10,7 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="Apache-2.0"
 homepage="https://github.com/owenthereal/upterm/"
 distfiles="https://github.com/owenthereal/upterm/archive/refs/tags/v$version.tar.gz"
-checksum=26ceb5eee035d4e1a08240aced75a20f2e54b1e192eef0bf5eb51d0195997f8c
+checksum=4b85cf8207ffce051f2c391905fd58514c98c3fd5ff890d7340fcfd3a0ea7b8e
 
 post_install() {
 	vcompletion etc/completion/upterm.zsh_completion zsh

From b8e1ed4fd17015eb3cd016a6f151a155ac970926 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 7 Apr 2022 18:42:16 -0400
Subject: [PATCH 1174/2561] dendrite: update to 0.8.1.

---
 srcpkgs/dendrite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 1bef12b95642..fffd933f62c1 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.7.0
+version=0.8.1
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=26c378bff1738b0e8422c7bd425be4763f22225f422ae1854c78644e4ca8bc42
+checksum=e26d306b008c9a88da31449e51df4c97e991d99b7954ab130f4fcf00371aa503
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"

From 930ffa322a2b2a6cc4925ad16d0723b914077236 Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Thu, 7 Apr 2022 16:43:47 -0500
Subject: [PATCH 1175/2561] Signal-Desktop: update to 5.38.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index a0b15428b926..05be4f346a92 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.37.0
+version=5.38.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=bd674ea6ba0582862f26a8fed1557d21f68161ef05891e67ca4cb653bf0f8d1a
+checksum=da693cf3fd7535f8569bbdc6f64387e274daab49c2798cacc804c784e401115d
 nostrip_files="signal-desktop"
 
 post_extract() {

From 7ae6d1f50fe2108f437d632f389ff6c4070ba7c0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 6 Apr 2022 22:31:09 -0400
Subject: [PATCH 1176/2561] just: update to 1.1.2.

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 7dc9fe4fbeb7..f3857ec4f01f 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.1.1
+version=1.1.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/refs/tags/${version}.tar.gz"
-checksum=b985def8260965773422fc6c665fa37aeb7304280560dbf8f641479ba00e2da0
+checksum=5f04ce85dc2de7609d68c336a7c51f477f8ff079d8b209a0d72183615e3f1e55
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 2e39b91734a96a55962ae0e025fa632059161db8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 4 Apr 2022 12:40:05 +0200
Subject: [PATCH 1177/2561] qjackctl: update to 0.9.7.

---
 srcpkgs/qjackctl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index 4e746124bdd0..8fb8a4ad5350 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -1,6 +1,6 @@
 # Template file for 'qjackctl'
 pkgname=qjackctl
-version=0.9.6
+version=0.9.7
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool jack_session CONFIG_JACK_SESSION)"
@@ -11,8 +11,9 @@ short_desc="JACK Audio Connection Kit - Qt GUI Interface"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://qjackctl.sourceforge.io"
+changelog="https://qjackctl.sourceforge.io/qjackctl-downloads.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=39ca2b9d83acfdd16a4c9b3eccd80e1483e1f9a446626f5d00ac297e6f8a166b
+checksum=524843618152070c90a40a18d0e9a16e784424ce54231aff5c0ced12f2769080
 
 build_options="jack_session"
 build_options_default="jack_session"

From dd5839408b8b6c656a15a385577ddc62ba8d0cd8 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 2 Apr 2022 21:39:14 +0530
Subject: [PATCH 1178/2561] CPU-X: update to 4.3.0, adopt

---
 .../CPU-X/patches/musl-ctrl-not-defined.patch | 15 --------
 srcpkgs/CPU-X/template                        | 36 ++++++++++---------
 2 files changed, 19 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch

diff --git a/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch b/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch
deleted file mode 100644
index 77b7abec77bc..000000000000
--- a/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/tui_ncurses.c	2021-10-07 14:38:03.886862860 -0400
-+++ b/src/tui_ncurses.c	2021-10-07 14:49:43.258142532 -0400
-@@ -262,6 +262,12 @@
- /* Convert keys when an alternative mapping is used */
- #define ALT_CODE 27
- #define ALT(x)   (x & ALT_CODE)
-+
-+/* glibc's term.h pulls in sys/ttydefaults.h which has it, but musl's does not. */
-+#ifndef CTRL
-+#define CTRL(x)	(x&037)
-+#endif
-+
- static int convert_char(int ch)
- {
- 	int i = 0;
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 19a01be5978c..36246fc521f9 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,30 +1,32 @@
 # Template file for 'CPU-X'
 pkgname=CPU-X
-version=4.2.0
+version=4.3.0
 revision=1
 archs="x86_64* i686*"
 build_style=cmake
-hostmakedepends="nasm pkg-config gettext"
-makedepends="libcpuid-devel ncurses-devel pciutils-devel
- procps-ng-devel glfw-devel $(vopt_if gtk3 'gtk+3-devel')"
+hostmakedepends="pkg-config nasm"
+makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
+ glfw-devel ocl-icd-devel procps-ng-devel libstatgrab
+ $(vopt_if gtk3 gtk+3-devel)"
+checkdepends="mawk nawk grep"
 short_desc="Free software that gathers information on CPU, motherboard and more"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://x0rg.github.io/CPU-X/"
 changelog="https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog.md"
 distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
-checksum=3bd8aabe98273012adc6fa25f31cf0f631f0a34c2ec39392fb5f6885551cee1f
-# tests depend on:
-# having mawk and nawk installed which breaks chroot-gawk
-# grep -P, which `chroot-grep` is compiled without
-make_check=no
-
+checksum=6ad7a8ac2d6c687a38a895fbbfbf2de690311676ac374d5857588bb983839433
 build_options="gtk3"
 build_options_default="gtk3"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		makedepends+=" libexecinfo-devel"
-		LDFLAGS="-lexecinfo"
-	;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	LDFLAGS="-lexecinfo"
+fi
+
+# Tests depend on the -P flag of grep, which is not available in chroot-grep
+# and installing grep as checkdepends breaks base-chroot.
+# So, only run tests in CI, where the masterdir is ephemeral anyway.
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+	make_check=no	# breaks base-chroot
+fi

From f7f966609d6626319b37211031212d5dd6134a2c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 25 Mar 2022 10:31:24 +0100
Subject: [PATCH 1179/2561] fluidsynth: update to 2.2.6.

---
 srcpkgs/fluidsynth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 146a550f658c..3f65b393d92b 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.2.5
+version=2.2.6
 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=9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8
+checksum=ca90fe675cacd9a7b442662783c4e7fa0e1fd638b28d64105a4e3fe0f618d20f
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From f5080a42775fc81920aa97264b18e84b69e132ce Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 2 Apr 2022 19:23:11 +0200
Subject: [PATCH 1180/2561] gotop: update to 4.1.3.

---
 srcpkgs/gotop/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..c8c7a842b4bb 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,19 +1,21 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.3
 revision=1
 build_style=go
+build_helper=qemu
 go_ldflags="-X main.Version=v${version}"
 go_import_path="github.com/xxxserxxx/gotop/v4"
 go_package="$go_import_path/cmd/gotop"
-hostmakedepends="git"
 short_desc="Terminal based graphical activity monitor"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=c0a02276e718b988d1220dc452063759c8634d42e1c01a04c021486c1e61612d
 
 post_install() {
 	vlicense LICENSE
+	vtargetrun ${DESTDIR}/usr/bin/gotop --create-manpage > gotop.1
+	vman gotop.1
 }

From 5b61fdb60def5431ab8171c345c2d7413550352c Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Thu, 31 Mar 2022 21:17:01 +0200
Subject: [PATCH 1181/2561] pgweb: update to 0.11.11.

---
 srcpkgs/pgweb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 9144e3d93eb2..2e511d41844a 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,6 +1,6 @@
 # Template file for 'pgweb'
 pkgname=pgweb
-version=0.11.10
+version=0.11.11
 revision=1
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
@@ -9,7 +9,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://sosedoff.github.io/pgweb"
 distfiles="https://github.com/sosedoff/pgweb/archive/v${version}.tar.gz"
-checksum=df2d16daa6f8fa9735b713199691ef74136f19fbbee14778248e41e247a1b93b
+checksum=4d8c64db7ec463a9366d404cbaf12215db855a5bdbf09253494d79dedd92db98
 
 post_install() {
 	vdoc README.md

From b58734b37ce223ed885e05585105f6e3fdc77cfc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 27 Mar 2022 20:44:36 +0200
Subject: [PATCH 1182/2561] x42-plugins: update to 20220327.

---
 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 8df0ec803309..328c03b09dec 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20220107
+version=20220327
 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/x42-plugins/x42-plugins-${version}.tar.xz"
-checksum=fa5ce09114077ba9a889dde1e9acff8aab765cbe6f6f2334063493c0c06f7772
+checksum=221b8fa939426c2c44c53e41f40bb8d91410978b0312fcfaf8786cb93d36295b
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

From 066951f749016de87a14891df846ec22dbf535b6 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Thu, 31 Mar 2022 11:13:14 +0700
Subject: [PATCH 1183/2561] mdBook: update to 0.4.17

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 465ff1a1bbbc..d2aa033512fa 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.14
+version=0.4.17
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=59fd3e417e9d09deac89e20467194dd9f93854c2f1a87e845816c5cec676765c
+checksum=9523d0bed63ce35eec5a8259eb963651cd7e37ec5644ef551134068a2fb72f89
 
 post_install() {
 	vlicense LICENSE

From 39b827937d126f00ea8ad47c31698c06fa46ebe6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Apr 2022 22:42:33 +0200
Subject: [PATCH 1184/2561] ugrep: update to 3.7.9.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 2c25a04aa898..5025d63a7ebd 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.8
+version=3.7.9
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=b2e03615890b92df4487a2891bf47675429c469b1825d5d05600ed3a729b92c7
+checksum=016e771756574a2a0b026ec50f7e7f3898d39cb61771ce98bc225c34d86a03be
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From ebe3b1305368d46d87d1cec1a6fca75a92c65052 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Apr 2022 14:30:56 +0200
Subject: [PATCH 1185/2561] libmnl: update to 1.0.5.

---
 srcpkgs/libmnl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libmnl/template b/srcpkgs/libmnl/template
index 9c624e2a3584..7ecb5b44a35d 100644
--- a/srcpkgs/libmnl/template
+++ b/srcpkgs/libmnl/template
@@ -1,14 +1,14 @@
 # Template file for 'libmnl'
 pkgname=libmnl
-version=1.0.4
-revision=2
+version=1.0.5
+revision=1
 build_style=gnu-configure
 short_desc="Minimalistic user-space library oriented to Netlink developers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.netfilter.org/projects/libmnl/"
 distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81
+checksum=274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525
 
 libmnl-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 758ff9707d0e82851e1224960806b0005a94c16a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Apr 2022 14:35:40 +0200
Subject: [PATCH 1186/2561] skaffold: update to 1.38.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index faa9823d1cc6..af2d37f0aeb6 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.37.1
+version=1.38.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=8dfea015256761525d8c0e54713642bcd7ead3e3c96ff58e301d0b77b9ef3bd5
+checksum=42f8f8a6f8f55f8031c87de3c3d35334f2e1f71c2a2120d3cc1a15f8ed71ba31

From b270af78002aa9d91b1e74d6eaef4917a634a045 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 8 Apr 2022 01:03:06 +0200
Subject: [PATCH 1187/2561] revive: update to 1.2.1.

---
 srcpkgs/revive/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index 55a011447362..38f2018570e8 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,16 +1,16 @@
 # Template file for 'revive'
 pkgname=revive
-version=1.1.4
+version=1.2.1
 revision=1
 build_style=go
-go_ldflags="-X main.version=$version -X main.builtBy=xbps"
+go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"
 short_desc="Drop-in replacement for golint"
 maintainer="Roberto Ricci <ricci@disroot.org>"
 license="MIT"
 homepage="https://revive.run/"
 distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz"
-checksum=afe0d11a614d5ca706485b7f6ca1e53b374b45017ea75f14149a4434d3ef74b5
+checksum=47e9f371e934fe4dfce44098fd54a0aaeaa47079184a14ad263990a24fab1b35
 
 do_check() {
 	go test -v ./...

From 87318dd5f7b6415bd6c0109ee371edc5b4289cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 7 Apr 2022 22:26:45 -0300
Subject: [PATCH 1188/2561] New package: python3-fastjsonschema-2.15.3

---
 srcpkgs/python3-fastjsonschema/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-fastjsonschema/template

diff --git a/srcpkgs/python3-fastjsonschema/template b/srcpkgs/python3-fastjsonschema/template
new file mode 100644
index 000000000000..290431fadfc1
--- /dev/null
+++ b/srcpkgs/python3-fastjsonschema/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-fastjsonschema'
+pkgname=python3-fastjsonschema
+version=2.15.3
+revision=1
+wrksrc=python-fastjsonschema-${version}
+build_style=python3-module
+make_check_args="--deselect tests/benchmarks/test_benchmark.py"
+hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest"
+short_desc="Fastest Python implementation of JSON schema"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/seznam/python-fastjsonschema"
+changelog="https://raw.githubusercontent.com/horejsek/python-fastjsonschema/master/CHANGELOG.txt"
+distfiles="https://github.com/horejsek/python-fastjsonschema/archive/refs/tags/v${version}.tar.gz"
+checksum=94e59a36c0efbf75a1a790fed15b51c9876b81204a5184c0c89075c68b10e7ec
+
+post_install() {
+	vlicense LICENSE
+}

From 094416a8ffb6523faa8e890ab11c766a47f9fc73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:34 -0300
Subject: [PATCH 1189/2561] python3-jupyter_nbformat: update to 5.3.0.

---
 srcpkgs/python3-jupyter_nbformat/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
index 4bea7989e2a2..27f3267b4594 100644
--- a/srcpkgs/python3-jupyter_nbformat/template
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -1,26 +1,22 @@
 # Template file for 'python3-jupyter_nbformat'
 pkgname=python3-jupyter_nbformat
-version=5.1.3
-revision=2
+version=5.3.0
+revision=1
 wrksrc="nbformat-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jsonschema python3-traitlets
- python3-ipython_genutils python3-jupyter_core"
+ python3-ipython_genutils python3-jupyter_core
+ python3-fastjsonschema"
 checkdepends="python3-pytest python3-testpath $depends"
 short_desc="Jupyter notebook format"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/nbformat"
 distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz"
-checksum=b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8
+checksum=fcc5ab8cb74e20b19570b5be809e2dba9b82836fd2761a89066ad43394ba29f5
 conflicts="python-jupyter_nbformat<=4.4.0_3"
 
-do_check() {
-	# Tests require a non-existent notebook file
-	python3 -m pytest -k 'not test_upgrade_v4_to_4_dot_5 and not test_sample_notebook'
-}
-
 post_install() {
 	vlicense COPYING.md LICENSE
 }

From 4b522bc57841b319d9ca2359ab242a9409bdd64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:37 -0300
Subject: [PATCH 1190/2561] python3-jupyter_nbconvert: update to 6.4.5.

---
 srcpkgs/python3-jupyter_nbconvert/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index ee8f7f8ba368..baebe44c04ca 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,13 +1,16 @@
 # Template file for 'python3-jupyter_nbconvert'
 pkgname=python3-jupyter_nbconvert
-version=6.0.7
-revision=2
+version=6.4.5
+revision=1
 wrksrc="nbconvert-${version}"
 build_style=python3-module
+# WebPDF export depends on unpackaged pyppeteer
+make_check_args="-m not(network) -k not(test_webpdf_without_chromium)"
 hostmakedepends="python3-setuptools"
 depends="python3-mistune python3-Jinja2 python3-jupyterlab_pygments
  python3-nbclient python3-jupyter_core python3-entrypoints python3-testpath
- python3-bleach python3-pandocfilters python3-defusedxml"
+ python3-bleach python3-pandocfilters python3-defusedxml
+ python3-BeautifulSoup4"
 checkdepends="python3-pytest python3-ipython_ipykernel
  python3-jupyter_ipywidgets python3-Pebble pandoc inkscape $depends"
 short_desc="Converting Jupyter notebooks"
@@ -15,14 +18,9 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/nbconvert"
 distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz"
-checksum=cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002
+checksum=21163a8e2073c07109ca8f398836e45efdba2aacea68d6f75a8a545fef070d4e
 conflicts="python-jupyter_nbconvert<=5.4.1_2"
 
-do_check() {
-	# WebPDF export depends on unpackaged pyppeteer
-	python3 -m pytest -k 'not TestWebPDFExporter and not test_webpdf_with_chromium'
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 992bfcfd962ff98113c4890eb852c2d1125c08bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:41 -0300
Subject: [PATCH 1191/2561] python3-jupyter_notebook: update to 6.4.10.

---
 srcpkgs/python3-jupyter_notebook/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
index ca9e1d43df21..d7e7230fdf93 100644
--- a/srcpkgs/python3-jupyter_notebook/template
+++ b/srcpkgs/python3-jupyter_notebook/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_notebook'
 pkgname=python3-jupyter_notebook
-version=6.3.0
-revision=2
+version=6.4.10
+revision=1
 wrksrc="notebook-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -15,7 +15,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org/"
 distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz"
-checksum=cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d
+checksum=2408a76bc6289283a8eecfca67e298ec83c67db51a4c2e1b713dd180bb39e90e
 conflicts="python-jupyter_notebook<=5.7.0_2"
 # Tests require unpackaged selenium
 make_check=no

From 3c14b79c3d326c5d843bfd1c6419873648e0ac6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:57:15 -0300
Subject: [PATCH 1192/2561] python3-Jinja2: update to 3.1.1.

This update was reverted earlier (3d6eb58) because of an incompatibility
with nbconvert-6.0.7 which is fixed in current nbconvert-6.4.5.
---
 srcpkgs/python3-Jinja2/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index 6a4c28214cca..5fbc7ee2fa87 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,7 +1,6 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-reverts="3.1.1_1"
-version=3.0.3
+version=3.1.1
 revision=2
 wrksrc="Jinja2-${version}"
 build_style=python3-module
@@ -14,7 +13,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
+checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
 
 post_install() {
 	vlicense LICENSE.rst

From 1fd79929b6b650d11b1d65f837a60f01cda13a69 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 10 Apr 2022 17:32:13 -0400
Subject: [PATCH 1193/2561] qwt: update to 6.2.0.

---
 common/shlibs        | 2 +-
 srcpkgs/qwt/template | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 673c62085f5b..0ac24701898d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1981,7 +1981,7 @@ libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
 libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
-libqwt.so.6 qwt-6.1.3_1
+libqwt.so.6.2 qwt-6.2.0_1
 liblxqt-qt5.so.0 liblxqt-0.8.0_1
 liblxqt-globalkeys-qt5.so.0 lxqt-globalkeys-0.8.0_1
 liblxqt-globalkeys-ui-qt5.so.0 lxqt-globalkeys-0.8.0_1
diff --git a/srcpkgs/qwt/template b/srcpkgs/qwt/template
index f03bbd1af605..b5fdae7aa7fd 100644
--- a/srcpkgs/qwt/template
+++ b/srcpkgs/qwt/template
@@ -1,6 +1,6 @@
 # Template file for 'qwt'
 pkgname=qwt
-version=6.1.5
+version=6.2.0
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="LGPL-2.1-only, Qwt-exception-1.0"
 homepage="https://qwt.sourceforge.io/"
 distfiles="https://sourceforge.net/projects/${pkgname}/files/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=4076de63ec2b5e84379ddfebf27c7b29b8dc9074f3db7e2ca61d11a1d8adc041
+checksum=9194f6513955d0fd7300f67158175064460197abab1a92fa127a67a4b0b71530
 
 post_patch() {
 	vsed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \
@@ -31,6 +31,8 @@ qwt-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
+		vmove usr/lib/qt5
+		vmove usr/lib/pkgconfig
 	}
 }
 
@@ -39,5 +41,6 @@ qwt-doc_package() {
 	short_desc+=" - doc files"
 	pkg_install() {
 		vmove usr/share/doc
+		mv "${PKGDESTDIR}/usr/share/doc/qwt/man" "${PKGDESTDIR}/usr/share"
 	}
 }

From f220cad984d3c4abb1589ea42569796f7548f69e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 10 Apr 2022 17:35:00 -0400
Subject: [PATCH 1194/2561] linssid: rebuild for qwt

---
 srcpkgs/linssid/patches/project.patch |  6 ++++--
 srcpkgs/linssid/patches/qwt-6.2.patch | 28 +++++++++++++++++++++++++++
 srcpkgs/linssid/template              |  2 +-
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/linssid/patches/qwt-6.2.patch

diff --git a/srcpkgs/linssid/patches/project.patch b/srcpkgs/linssid/patches/project.patch
index dd03c910c7b1..8adc2028ec41 100644
--- a/srcpkgs/linssid/patches/project.patch
+++ b/srcpkgs/linssid/patches/project.patch
@@ -1,8 +1,10 @@
 --- a/linssid-app/linssid-app.pro
 +++ b/linssid-app/linssid-app.pro
-@@ -5,7 +5,7 @@
+@@ -3,9 +3,9 @@
+ TARGET = linssid
+ VERSION = 3.6
  CONFIG -= debug_and_release app_bundle lib_bundle
--CONFIG += release
+-CONFIG += release 
 +CONFIG += release qwt
  PKGCONFIG +=
 -QT = core gui widgets svg
diff --git a/srcpkgs/linssid/patches/qwt-6.2.patch b/srcpkgs/linssid/patches/qwt-6.2.patch
new file mode 100644
index 000000000000..c05221ea6e1a
--- /dev/null
+++ b/srcpkgs/linssid/patches/qwt-6.2.patch
@@ -0,0 +1,28 @@
+--- a/linssid-app/MainForm.cpp
++++ b/linssid-app/MainForm.cpp
+@@ -31,6 +31,7 @@
+ #include <qwt_plot_marker.h>
+ #include <QPointF>
+ #include <qwt_scale_draw.h>
++#include <qwt_text.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+@@ -1036,7 +1037,7 @@
+                     MainForm::cellDataRay[tbi].signal ) );
+             }
+         } else {
+-            MainForm::cellDataRay[tbi].pBandCurve->setSamples(0, 0, 0);
++            MainForm::cellDataRay[tbi].pBandCurve->setSamples(static_cast<double *>(NULL), static_cast<double *>(NULL), 0);
+         }
+         // now the signal history plot
+         int ixStart;
+@@ -1055,7 +1056,7 @@
+                     &(MainForm::cellDataRay[tbi].pHistory->signal[ixStart]), ixLength);
+         } else {
+ 
+-            MainForm::cellDataRay[tbi].pTimeCurve->setSamples(0, 0, 0);
++            MainForm::cellDataRay[tbi].pTimeCurve->setSamples(static_cast<double *>(NULL), static_cast<double *>(NULL), 0);
+         }
+     }
+     MainForm::mainFormWidget.chan24Plot->replot();
diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template
index 3347f193c3e7..937c8a0745e0 100644
--- a/srcpkgs/linssid/template
+++ b/srcpkgs/linssid/template
@@ -1,7 +1,7 @@
 # Template file for 'linssid'
 pkgname=linssid
 version=3.6
-revision=3
+revision=4
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="boost-devel qwt-devel"

From f39f61a1c0b673ecfbd60f501cb3d0fac73797f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 29 Dec 2021 18:36:58 -0300
Subject: [PATCH 1195/2561] libmtp: update to 1.1.19.

Also: use group `plugdev` to grant r/w permission to mtp devices.
---
 srcpkgs/libmtp/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template
index 5bf05cd6bbe3..1114a4d7bb85 100644
--- a/srcpkgs/libmtp/template
+++ b/srcpkgs/libmtp/template
@@ -1,9 +1,10 @@
 # Template file for 'libmtp'
 pkgname=libmtp
-version=1.1.18
+version=1.1.19
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static --with-udev=/usr/lib/udev"
+configure_args="--disable-static --with-udev=/usr/lib/udev
+ --with-udev-group=plugdev"
 hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel libusb-devel"
 short_desc="Library for Microsoft's Media Transfer Protocol (MTP)"
@@ -11,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://libmtp.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0
+checksum=deb4af6f63f5e71215cfa7fb961795262920b4ec6cb4b627f55b30b18aa33228
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX needs host mtp-hotplug

From 51991963b37a6d447a5439b946342c30f87e009f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 10 Apr 2022 21:36:20 -0400
Subject: [PATCH 1196/2561] Revert "python3-Jinja2: update to 3.1.1."

Removal of jinja2.Markup still breaks salt; back to 3.0.3 *again*.

This reverts commit 5369dc2b4869326e36a8c6ba6e3c36f8c8ba2c6a.
---
 srcpkgs/python3-Jinja2/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index 5fbc7ee2fa87..fb6d7e585a92 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,7 +1,8 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-version=3.1.1
-revision=2
+reverts="3.1.1_1 3.1.1_2"
+version=3.0.3
+revision=3
 wrksrc="Jinja2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +14,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
+checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
 
 post_install() {
 	vlicense LICENSE.rst

From ebf46365c64b6ccf1008fcaf4b916c388f3217f3 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Mon, 11 Apr 2022 09:40:43 +0200
Subject: [PATCH 1197/2561] vscode: update to 1.66.1

+ fix issue with node-gyp compilation, which may also depend on npm
---
 srcpkgs/vscode/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 0b9efda224d0..3e3956fa5644 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.66.0
+version=1.66.1
 revision=1
 _electronver=13.6.7
 _npmver=8.6.0
@@ -11,8 +11,8 @@ short_desc="Microsoft Code for Linux"
 maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
-distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7
+distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz"
+checksum=243a25d7214ceba5abf510dc890c64a8cc36ccacd97f4b8c666b8b7bab9c5a28
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -38,6 +38,9 @@ do_configure() {
 }
 
 do_build() {
+	# Update to a more recent npm version to fix some issues
+	npm install -g npm@${_npmver}
+
 	# The default memory limit may be too low for current versions of node
 	# to successfully build vscode.  This sets it to 4GB, but
 	# change this number if it still doesn't work for your system.
@@ -48,8 +51,7 @@ do_build() {
 	--target=$_electronver \
 	--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
 
-	npm install -g npm@${_npmver} && \
-		yarn install --ignore-engines --arch=x64
+	yarn install --ignore-engines --arch=x64
 
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min

From bc54b168f6d4e7f4bcba98ffdff46bef38ea62b4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 19 Feb 2022 10:51:01 +0100
Subject: [PATCH 1198/2561] New package: cocogitto-5.0.1

---
 srcpkgs/cocogitto/template | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 srcpkgs/cocogitto/template

diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
new file mode 100644
index 000000000000..79a78e4b5971
--- /dev/null
+++ b/srcpkgs/cocogitto/template
@@ -0,0 +1,34 @@
+# Template file for 'cocogitto'
+pkgname=cocogitto
+version=5.0.1
+revision=1
+build_style=cargo
+build_helper=qemu
+hostmakedepends="pkg-config"
+makedepends="libgit2-devel"
+short_desc="Conventional Commits toolbox"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MIT"
+homepage="https://github.com/cocogitto/cocogitto"
+changelog="https://github.com/cocogitto/cocogitto/blob/main/CHANGELOG.md"
+distfiles="https://github.com/cocogitto/cocogitto/archive/${version}.tar.gz"
+checksum=fee00736ec4b8ce72c8d8f904d0b734372b11ce7c3711166814eca38bf0cda8f
+# Test suite is not atomic, relies on user environment such as git user configuration
+make_check=no
+
+post_build() {
+	TARGET_DIR="target/${RUST_TARGET}/release"
+
+	for shell in bash zsh fish; do
+		vtargetrun ${TARGET_DIR}/cog generate-completions ${shell} > cog.${shell}
+	done
+}
+
+post_install() {
+	vlicense LICENSE
+	vdoc README.md
+
+	for shell in bash zsh fish; do
+		vcompletion cog.${shell} ${shell} cog
+	done
+}

From 0d5220540225d801d9f83459375e442b74284e3f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:31 +0200
Subject: [PATCH 1199/2561] certbot: update to 1.26.0.

---
 srcpkgs/certbot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index aa8de157d59b..a6eea0f1837f 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.25.0
+version=1.26.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=9633d21051fe7fd076d64cb41963de61d300d7c30f4b491c8d18cb8306357509
+checksum=9d136fab6968829db9774a264a96a7923a5482d0c90894b009253f374d480693

From b2602837cd301e28ca7f282126e348ba1492e331 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:33 +0200
Subject: [PATCH 1200/2561] certbot-apache: update to 1.26.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 1f5c098c802d..50396f46779e 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.25.0
+version=1.26.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=91dbd326c5ee4fe7a2ef5f1c3c525863a7f4ed5f228e1c7c10048d18fe18d0a1
+checksum=efb573a1fd926ecf74618286d21ac3f7539b2be426face7f1364dcca8b0e316e

From 4ee5c82adf0572faaeb163c90f3e18ea73076dc4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:36 +0200
Subject: [PATCH 1201/2561] certbot-nginx: update to 1.26.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 b635785e5d0a..b9df8e8b1c90 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.25.0
+version=1.26.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=433a7237e841c462a67f9195fb7d7711ac6ed6d27bedb981c71238ef5348d62b
+checksum=c9f2ee27dfb98525e507f516f8c1cd37a5b61f3090bcf64284fee95cfcf6ab10

From 42ce65eec05a522836f38dbdb3221627a418feda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:40 +0200
Subject: [PATCH 1202/2561] python3-acme: update to 1.26.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 19e374d105a8..ab158b8dccc8 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.25.0
+version=1.26.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=e3fbe36fcfa27ec46f450369498f3486370ab53a0fd7db91557a23d58b3969fa
+checksum=7269209192189c5b0bd5bc69388229737e23e52e8422315e2fcd3aff4c8e13c8

From 35513d2d0f15e5186507279ff2c0c5c518189c1c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Apr 2022 16:38:22 +0200
Subject: [PATCH 1203/2561] minify: update to 2.11.1.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 198a6c4ab9e8..7131527fa009 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.10.0
+version=2.11.1
 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=a26c531d5071c6bd5d2300b4906fd2c7e227a19c23549219ccfae2c20114c60e
+checksum=f238ffcb9ed6ff3c413442e3c5bfe9409809cc3de67db29ebc541d83168a09ea
 
 post_install() {
 	vlicense LICENSE

From 6e4b6b82b59e0507c498ef99d254d7066ae4293a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Apr 2022 16:47:02 +0200
Subject: [PATCH 1204/2561] perl-Config-General: update to 2.65.

---
 srcpkgs/perl-Config-General/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/perl-Config-General/template b/srcpkgs/perl-Config-General/template
index b1162c8191c0..97eacd23613b 100644
--- a/srcpkgs/perl-Config-General/template
+++ b/srcpkgs/perl-Config-General/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Config-General'
 pkgname=perl-Config-General
-version=2.63
-revision=3
+version=2.65
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Config::General - Generic Config Module"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Artistic-1.0-Perl, GPL-1.0-or-later"
+license="Artistic-2.0"
 homepage="https://metacpan.org/release/Config-General"
 distfiles="${CPAN_SITE}/Config/${pkgname/perl-/}-$version.tar.gz"
-checksum=0a9bf977b8aabe76343e88095d2296c8a422410fd2a05a1901f2b20e2e1f6fad
+checksum=4d6d5754be3a9f30906836f0cc10e554c8832e14e7a1341efb15b05d706fc58f

From 64984f7633d012fd1d2054ffc6e017fe4addd629 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 11 Apr 2022 10:01:49 -0400
Subject: [PATCH 1205/2561] greetd: set shell for agreety, change default vt

---
 srcpkgs/greetd/patches/change-default-vt.patch | 13 +++++++++++++
 srcpkgs/greetd/patches/fix-shell.patch         | 17 +++++++++++++++++
 srcpkgs/greetd/template                        |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/greetd/patches/change-default-vt.patch
 create mode 100644 srcpkgs/greetd/patches/fix-shell.patch

diff --git a/srcpkgs/greetd/patches/change-default-vt.patch b/srcpkgs/greetd/patches/change-default-vt.patch
new file mode 100644
index 000000000000..3dad61740587
--- /dev/null
+++ b/srcpkgs/greetd/patches/change-default-vt.patch
@@ -0,0 +1,13 @@
+diff --git a/config.toml b/config.toml
+index 3768a6e315..2a933309b4 100644
+--- a/config.toml
++++ b/config.toml
+@@ -1,7 +1,7 @@
+ [terminal]
+ # The VT to run the greeter on. Can be "next", "current" or a number
+ # designating the VT.
+-vt = 1
++vt = 7
+ 
+ # The default session, also known as the greeter.
+ [default_session]
diff --git a/srcpkgs/greetd/patches/fix-shell.patch b/srcpkgs/greetd/patches/fix-shell.patch
new file mode 100644
index 000000000000..fbe416cbed8d
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-shell.patch
@@ -0,0 +1,17 @@
+# $SHELL is not set, use /bin/sh because it's available
+diff --git a/config.toml b/config.toml
+index 3768a6e..c323af2 100644
+--- a/config.toml
++++ b/config.toml
+@@ -6,9 +6,9 @@ vt = 1
+ # The default session, also known as the greeter.
+ [default_session]
+ 
+-# `agreety` is the bundled agetty/login-lookalike. You can replace `$SHELL`
++# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh`
+ # with whatever you want started, such as `sway`.
+-command = "agreety --cmd $SHELL"
++command = "agreety --cmd /bin/sh"
+ 
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
index cf5f3c400b0c..0f5e9c88f501 100644
--- a/srcpkgs/greetd/template
+++ b/srcpkgs/greetd/template
@@ -1,7 +1,7 @@
 # Template file for 'greetd'
 pkgname=greetd
 version=0.8.0
-revision=1
+revision=2
 build_style=cargo
 conf_files="/etc/greetd/config.toml"
 hostmakedepends="pkg-config scdoc"

From 9f519c8b6386f67d55deee6d7e5766aecdf4a5d9 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 3 Apr 2022 22:33:58 +0530
Subject: [PATCH 1206/2561] Waybar: update to 0.9.12

---
 srcpkgs/Waybar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index c6470c6d330d..fd4fb7928d0d 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,6 +1,6 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.9
+version=0.9.12
 revision=1
 _date_version=3.0.0
 build_style=meson
@@ -29,7 +29,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="23a94538538f43a6db4c1c5f7e09e75ab743ded1ccfc737e1f3e0971fe4cdd87
+checksum="1f3f6692de99567c43939e7ad2e96f8c6a5ef83f760ad6f77865e46a3c6811d6
  87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
  6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
 

From 0118fa23389af7cdbd0310894e6a441529eac619 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:40:10 +0200
Subject: [PATCH 1207/2561] chatterino2: update to 2.3.5.

---
 srcpkgs/chatterino2/template | 25 +++++++++++--------------
 srcpkgs/chatterino2/update   |  2 ++
 2 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/chatterino2/update

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 7bf7d6a37d04..977fa9771498 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,19 +1,19 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.3.4
+version=2.3.5
 revision=1
-_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_libcommuni_commit="a7b32cd6fa0640721b6114b31d37d79ebf832411"
 _serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
-_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
-_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
-_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_settings_commit="04792d853c7f83c9d7ab4df00279442a658d3be3"
+_signals_commit="25e4ec3b8d6ea94a5e65a26e7cfcbbce3b87c5d6"
 _sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
 create_wrksrc=yes
 build_wrksrc="chatterino2-${version}"
 build_style=cmake
+configure_args="-DUSE_SYSTEM_QTKEYCHAIN=ON"
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
- boost-devel openssl-devel rapidjson websocketpp"
+ qtkeychain-qt5-devel boost-devel openssl-devel rapidjson websocketpp"
 depends="qt5-imageformats qt5-svg"
 short_desc="Chat client for twitch.tv"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -25,14 +25,12 @@ distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${versio
  https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
  https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
- https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
  https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
-checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
- ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+checksum="f1fff3523f5a3f633430d44f7ca6c6c718a515258d50004a855e69e4aa989b4e
+ d6fd560851357d1e52f93604314215c75b291104e054c84a16c34d7d83d40f14
  d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
- 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
- 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
- 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ 702e97d8f2fcaec65256e6f691c3ed055924430ce64b29ebe74f3769a9d50d71
+ ae098841b0f33079366eff8bc44fe3f2f2f65e70259c1cc9ff8d727c4edf974c
  f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -46,12 +44,11 @@ post_extract() {
 	rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \
 	      ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \
 	      ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \
-	      ${build_wrksrc}/lib/qtkeychain ${build_wrksrc}/cmake/sanitizers-cmake
+	      ${build_wrksrc}/cmake/sanitizers-cmake
 	mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni"
 	mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize"
 	mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings"
 	mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals"
-	mv "qtkeychain-${_qtkeychain_commit}" "${build_wrksrc}/lib/qtkeychain"
 	mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake"
 }
 
diff --git a/srcpkgs/chatterino2/update b/srcpkgs/chatterino2/update
new file mode 100644
index 000000000000..16563536cb32
--- /dev/null
+++ b/srcpkgs/chatterino2/update
@@ -0,0 +1,2 @@
+site="https://github.com/Chatterino/chatterino2/releases"
+pattern="v\K[0-9.]+(?=\.tar\.gz)"

From 0571862809b92ddfa40a8483fe9db26ae86a7809 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:22:52 +0200
Subject: [PATCH 1208/2561] arc-theme: update to 20220405.

---
 srcpkgs/arc-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template
index 4839b87942fe..86b487ffa9aa 100644
--- a/srcpkgs/arc-theme/template
+++ b/srcpkgs/arc-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'arc-theme'
 pkgname=arc-theme
-version=20220223
+version=20220405
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config gnome-shell sassc inkscape cinnamon"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jnsh/arc-theme"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b9a58efc296c3036905b9f8d19518c5c815e5140dd399ad9b81cc17d319a9093
+checksum=657d6cc743facba0f7f56939653b3d0ed4c55b2ce17fef0d050ed32c1aae5f1e

From 60cd63efee050231744c8311122ccda73d63d9d8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 11:38:40 +0100
Subject: [PATCH 1209/2561] protontricks: update to 1.8.1.

---
 srcpkgs/protontricks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 208a55032a36..f7d7182b65ca 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,18 +1,18 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.8.0
+version=1.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-vdf winetricks python3-setuptools"
+checkdepends="$depends"
 short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
 changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d56b53c4ea4286ae20588072433c30193143a75654ea216db389503a63661b09
-make_check=no # no tests in pypi tarball
+checksum=2a2f1349fd7263b4a82b8443f9c423f79ce104697a87e9a53fb2fae21d7ce5ac
 
 post_install() {
 	# Remove `protontricks-desktop-install`, since we

From d6cf680c8286295f63bd84608ddef14ff5553d98 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 10 Apr 2022 14:49:44 -0400
Subject: [PATCH 1210/2561] chezmoi: update to 2.15.1.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 2f0fb2f144bc..bacfc8c9b294 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.15.0
+version=2.15.1
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=d33a5df53bde7b94962c39788e44af41e52a7836bc6d43168c9b324da966996e
+checksum=0100dcf8b70774595f56859e5d1b635319ba584ad7b280946352be328f36d679
 
 export CGO_ENABLED=1
 

From 8d1a54fadf36729f120162d39f8fc37bb9ea38d8 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Thu, 31 Mar 2022 21:48:32 +0200
Subject: [PATCH 1211/2561] aml: update to 0.2.1

---
 srcpkgs/aml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template
index 5c1754fc6d7b..cc0598dfe914 100644
--- a/srcpkgs/aml/template
+++ b/srcpkgs/aml/template
@@ -1,6 +1,6 @@
 # Template file for 'aml'
 pkgname=aml
-version=0.1.0
+version=0.2.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="ISC"
 homepage="https://github.com/any1/aml"
 distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz"
-checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+checksum=c5af3f690b64a7f4dc7141b11f23a4bef190a921f9d71ce70ce0698b5ec58eb0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 2926d37a7364e3bdf41e72b56c6de6bfbc837b05 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Thu, 31 Mar 2022 21:48:50 +0200
Subject: [PATCH 1212/2561] neatvnc: update to 0.4.0

---
 srcpkgs/neatvnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template
index a861c8e63569..8dd902a8cb4c 100644
--- a/srcpkgs/neatvnc/template
+++ b/srcpkgs/neatvnc/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvnc'
 pkgname=neatvnc
-version=0.3.2
+version=0.4.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="ISC"
 homepage="https://github.com/any1/neatvnc"
 distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz"
-checksum=8329354f83bcc654146082a8a9f2d0be4bac5bd8c76b6c31790b7b9c5857e318
+checksum=8a833d488f579e4acf7abb1c7832f8e571bddd6da054e71ed9be3b8396955a81
 
 post_install() {
 	vlicense COPYING

From 82fbb6368ba980cb38be434e8680af7d31674267 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Thu, 31 Mar 2022 21:49:20 +0200
Subject: [PATCH 1213/2561] wayvnc: update to 0.4.1

---
 srcpkgs/wayvnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template
index bf948d97827c..196e986fe9a7 100644
--- a/srcpkgs/wayvnc/template
+++ b/srcpkgs/wayvnc/template
@@ -1,6 +1,6 @@
 # Template file for 'wayvnc'
 pkgname=wayvnc
-version=0.3.1
+version=0.4.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config ninja scdoc wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="ISC"
 homepage="https://github.com/any1/wayvnc"
 distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz"
-checksum=7b68af5bfa5e19352aaa5140e6c2418f90bfe6a949775bd236b06796c56e27f5
+checksum=1813a22644a9043f96a53756bfee68d65f976de8b8f65c86f56782d22286d271
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 3741a31cf3ee693337d96f45d2f4c103b9f32d76 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 8 Apr 2022 23:36:03 +0300
Subject: [PATCH 1214/2561] notcurses: update to 3.0.8.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 9581a8e3de89..724e7b7f2475 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=3.0.7
+version=3.0.8
 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=db461c6ba07a8e3735a51a1d2e706d249ae30436519f543fa5931d414019c770
+checksum=56c33ffe2a2bc4d0b6e3ac14bdf620cf41e3293789135f76825057d0166974fd
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From aafb5382db6513fd0bfb240e0179f431ac6d9a4a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 10 Apr 2022 15:27:41 +0200
Subject: [PATCH 1215/2561] vultr-cli: update to 2.12.2.

---
 srcpkgs/vultr-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index 34e0073e1734..20612aeff1c8 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
-version=2.12.1
+version=2.12.2
 revision=1
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
@@ -8,6 +8,6 @@ short_desc="Official command line tool for Vultr services"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="Apache-2.0"
 homepage="https://github.com/vultr/vultr-cli"
-changelog="https://github.com/vultr/vultr-cli/blob/master/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/vultr/vultr-cli/master/CHANGELOG.md"
 distfiles="https://github.com/vultr/vultr-cli/archive/refs/tags/v${version}.tar.gz"
-checksum=e2a9c7243d48d44f88917cbc241512774f8f2c6e305ef5aaaf026177a2620ae6
+checksum=875a273d573ef53ab3329d3ecd9e3745d7d8963e0b3ff992435fb20881ea49a7

From 5b26daa9dcce8590febf0b651ed5fe6d8e442e21 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 3 Apr 2022 00:58:37 -0400
Subject: [PATCH 1216/2561] hobbits: update to 0.53.1.

---
 srcpkgs/hobbits/patches/backports.patch      | 78 ++++++++++++++++++++
 srcpkgs/hobbits/patches/python_version.patch | 11 ---
 srcpkgs/hobbits/template                     | 39 ++++++++--
 3 files changed, 109 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/hobbits/patches/backports.patch
 delete mode 100644 srcpkgs/hobbits/patches/python_version.patch

diff --git a/srcpkgs/hobbits/patches/backports.patch b/srcpkgs/hobbits/patches/backports.patch
new file mode 100644
index 000000000000..3348b37ae5f2
--- /dev/null
+++ b/srcpkgs/hobbits/patches/backports.patch
@@ -0,0 +1,78 @@
+Backports some changes sent upstream to better support plain cmake builds
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1cc283d..5795a97 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,10 @@ if (UNIX AND NOT APPLE)
+     set(LINUX TRUE)
+ endif()
+ 
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.version")
++if (DEFINED BUILD_VERSION)
++    message("Using build version from command-line")
++    set(VERSION_STRING "${BUILD_VERSION}")
++elseif (EXISTS "${CMAKE_SOURCE_DIR}/.version")
+     message("Getting build version from .version file")
+     file (STRINGS "${CMAKE_SOURCE_DIR}/.version" BUILD_VERSION)
+     string(REGEX REPLACE "\n$" "" BUILD_VERSION "${BUILD_VERSION}")
+@@ -106,7 +143,13 @@ else()
+ 	endif()
+ 
+ 	# PFFFT
+-	find_package(PFFFT REQUIRED)
++	option(USE_SYSTEM_PFFFT "Use a system-provided version of pffft" OFF)
++	if(USE_SYSTEM_PFFFT)
++		message(STATUS "Using system pffft")
++		find_package(PFFFT REQUIRED)
++	else()
++		add_subdirectory(external)
++	endif()
+ 
+ endif()
+ 
+@@ -124,7 +167,7 @@ elseif( MANUAL_PYTHON_PATH )
+ 	set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" )
+ endif()
+ 
+-find_package (Python3 3.9 EXACT COMPONENTS Interpreter Development REQUIRED)
++find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED)
+ message("Python3 Libs: ${Python3_LIBRARIES}")
+ 
+ #
+diff --git a/cmake/PackExternalDeps.cmake b/cmake/PackExternalDeps.cmake
+index 4be07c7..330be03 100644
+--- a/cmake/PackExternalDeps.cmake
++++ b/cmake/PackExternalDeps.cmake
+@@ -145,7 +145,7 @@ endfunction(pack_python)
+ function(pack_pffft)
+ 	install(FILES ${PFFFT_LIBRARIES}
+ 			DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-endfunction(pack_pcap)
++endfunction(pack_pffft)
+ 
+ function(pack_pcap)
+     if (LINUX)
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+new file mode 100644
+index 0000000..ea1c9a3
+--- /dev/null
++++ b/external/CMakeLists.txt
+@@ -0,0 +1,17 @@
++
++# can't assume the target system has the required SIMD instructions
++option(PFFFT_ENABLE_SIMD "Enable SIMD support for pffft" OFF)
++
++message(STATUS "Using bundled pffft")
++add_library(pffft STATIC pffft/pffft.c)
++if(PFFFT_ENABLE_SIMD)
++    message(STATUS "Enabling SIMD support for pffft")
++else()
++    message(STATUS "Disabling SIMD support for pffft")
++    target_compile_definitions(pffft PUBLIC PFFFT_SIMD_DISABLE)
++endif()
++target_compile_options(pffft PUBLIC "${PFFFT_CFLAGS}")
++target_link_libraries(pffft m)
++target_include_directories(pffft INTERFACE pffft)
++
++add_library(PFFFT::PFFFT ALIAS pffft)
diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
deleted file mode 100644
index 47b1490c4b0a..000000000000
--- a/srcpkgs/hobbits/patches/python_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2021-10-07 11:31:22.000000000 -0400
-+++ b/CMakeLists.txt	2021-10-25 21:16:59.429406408 -0400
-@@ -124,7 +124,7 @@
- 	set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" )
- endif()
- 
--find_package (Python3 3.9 EXACT COMPONENTS Interpreter Development REQUIRED)
-+find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED)
- message("Python3 Libs: ${Python3_LIBRARIES}")
- 
- #
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index fe6c7f5adda7..8260fa1988d0 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,51 @@
 # Template file for 'hobbits'
 pkgname=hobbits
-version=0.52.0
+version=0.53.1
 revision=1
+_pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215
+_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
+create_wrksrc=yes
+build_wrksrc="hobbits-${version}"
 build_style=cmake
+configure_args="-DBUILD_VERSION=${version} $(vopt_bool simd PFFFT_ENABLE_SIMD)"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake python3"
-makedepends="fftw-devel libusb-devel libpcap-devel python3-devel qt5-devel"
+makedepends="libusb-devel libpcap-devel python3-devel qt5-devel"
 short_desc="Multi-platform GUI for bit-based analysis, processing and visualization"
 maintainer="classabbyamp <void@placeviolette.net>"
-license="MIT, GPL-2.0-or-later"
+license="MIT, custom:FFTPACK"
 homepage="https://mahlet-inc.github.io"
 changelog="https://raw.githubusercontent.com/Mahlet-Inc/hobbits/master/CHANGELOG.md"
-distfiles="https://github.com/Mahlet-Inc/hobbits/archive/refs/tags/v${version}.tar.gz"
-checksum=3332e02380ab46649f0ec2066b63b6e0fb04b55cdca973d28880f1607ebbf27e
+distfiles="https://github.com/Mahlet-Inc/hobbits/archive/refs/tags/v${version}.tar.gz
+ https://bitbucket.org/jpommier/pffft/get/${_pffft_commit}.tar.gz"
+checksum="e63c51228c3f00f56a2ebf79fec1975544b1c6c986d58dff69643da46148316b
+ @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8"
+patch_args="-Np1 --directory=${build_wrksrc}"
+
+build_options="simd"
+desc_option_simd="Enable SIMD support (SSE, Altivec, or NEON)"
+
+# by default, don't use SIMD on unsupported platforms
+# SSE, Altivec, or NEON support is needed to enable this
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*|ppc64*|x86_64*) build_options_default="simd"
+esac
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
 esac
 
-pre_configure() {
-	# upstream provides no way to set the version through configure_args
-	echo "${version}" > .version
+post_extract() {
+	# until upstream merges Mahlet-Inc/hobbits#143 and releases a new version,
+	# the directory must be added, instead of removing the submodule
+	# rm -rf ${build_wrksrc}/external/pffft
+	mkdir ${build_wrksrc}/external
+	mv ${_pffft_dir} ${build_wrksrc}/external/pffft
 }
 
 post_install() {
 	vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
+	# capture the FFTPACK license from the header comment of pffft.c
+	sed -E '/\*\//,$d; 1s/\/\* //; s/^[[:blank:]]+//' external/pffft/pffft.c > LICENSE.pffft
+	vlicense LICENSE.pffft
 	vlicense LICENSE.txt
 }

From 9d905a30d7abb63bbffc1e48f1c16fdf4378a95b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Apr 2022 00:05:11 +0200
Subject: [PATCH 1217/2561] onefetch: broken on big endian

---
 srcpkgs/onefetch/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index 1eda291b053f..82a46672d356 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -10,6 +10,10 @@ homepage="https://github.com/o2sh/onefetch"
 distfiles="https://github.com/o2sh/onefetch/archive/v${version}.tar.gz"
 checksum=f57b16dfa2bb95dd1fb805257a1761baa20d69eb9ce7c311d369609894c53897
 
+if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
+	broken="exr crate unimplemented for BE"
+fi
+
 post_install() {
 	vlicense LICENSE.md
 }

From 4b5b242fe98391ee507fcdedb369e3b3ba67ce2f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Apr 2022 17:37:16 +0200
Subject: [PATCH 1218/2561] ruby: update to 3.1.2.

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 85524a7796b2..4c62a19620d0 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -2,7 +2,7 @@
 _ruby_abiver=3.1.0
 
 pkgname=ruby
-version=3.1.1
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
@@ -16,7 +16,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.xz"
-checksum=7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa
+checksum=ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally

From eb940c82cf8a48a16a95a49d261638882b83c2ea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Apr 2022 19:39:32 +0200
Subject: [PATCH 1219/2561] yj: update to 5.1.0.

---
 srcpkgs/yj/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index 895e663988d1..395a2c6b15b9 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,13 +1,13 @@
 # Template file for 'yj'
 pkgname=yj
-version=5.0.0
+version=5.1.0
 revision=1
 build_style=go
-go_import_path="github.com/sclevine/yj"
+go_import_path="github.com/sclevine/yj/v${version%%.*}"
 hostmakedepends="git"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/sclevine/yj"
 distfiles="https://github.com/sclevine/yj/archive/v${version}.tar.gz"
-checksum=df9a4f5b6d067842ea3da68ff92c374b98560dce1086337d39963a1346120574
+checksum=9a3e9895181d1cbd436a1b02ccf47579afacd181c73f341e697a8fe74f74f99d

From 83ab5191c8816141d0d94c7d03bdd1727ded913d Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Fri, 8 Apr 2022 02:18:39 +0300
Subject: [PATCH 1220/2561] pcsc-tools: update to 1.6.0.

---
 srcpkgs/pcsc-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsc-tools/template b/srcpkgs/pcsc-tools/template
index 0825d36dd719..b29c25b70ce1 100644
--- a/srcpkgs/pcsc-tools/template
+++ b/srcpkgs/pcsc-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsc-tools'
 pkgname=pcsc-tools
-version=1.5.8
+version=1.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ludovic.rousseau.free.fr/softwares/pcsc-tools"
 distfiles="http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=87c1edbdb8c9735063f688aa3e05e3893a88e78b322dc69af80757ed90282212
+checksum=651c8dd74bcb33db4c16935ce5d80dd1aa6eb20ba9d5c4b9631a098326ef8b9f

From b190724b7eac9a2c61bf9e533d8693bcff9d10af Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 12 Apr 2022 01:27:48 -0400
Subject: [PATCH 1221/2561] dbeaver: force jdk11 regardless of alternatives
 setting

fixes #34857
---
 srcpkgs/dbeaver/patches/force-jdk11.patch | 11 +++++++++++
 srcpkgs/dbeaver/template                  |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dbeaver/patches/force-jdk11.patch

diff --git a/srcpkgs/dbeaver/patches/force-jdk11.patch b/srcpkgs/dbeaver/patches/force-jdk11.patch
new file mode 100644
index 000000000000..47290b3e8639
--- /dev/null
+++ b/srcpkgs/dbeaver/patches/force-jdk11.patch
@@ -0,0 +1,11 @@
+--- a/product/community/DBeaver.product
++++ b/product/community/DBeaver.product
+@@ -9,7 +9,7 @@
+     </configIni>
+ 
+     <launcherArgs>
+-        <programArgs></programArgs>
++        <programArgs>-vm /usr/lib/jvm/openjdk11/bin</programArgs>
+         <programArgsMac>-vm ../Eclipse/jre/Contents/Home/bin/java</programArgsMac>
+ 
+         <vmArgs>-XX:+IgnoreUnrecognizedVMOptions --add-modules=ALL-SYSTEM -Dosgi.requiredJavaVersion=11 -Xms64m -Xmx1024m</vmArgs>
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 276af8802424..74a67e77e4f6 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,7 +1,7 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
 version=22.0.1
-revision=1
+revision=2
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
 hostmakedepends="apache-maven"

From aee4280221f840028bbdaa366cba3647ecb09651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 12 Apr 2022 00:00:38 -0300
Subject: [PATCH 1222/2561] iperf: update to 2.1.7.

---
 .../iperf/patches/fix-gettcpinfo-musl.patch   | 20 -------------
 .../patches/reorder-includes-for-musl.patch   | 28 -------------------
 srcpkgs/iperf/template                        | 12 ++++++--
 3 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
 delete mode 100644 srcpkgs/iperf/patches/reorder-includes-for-musl.patch

diff --git a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch b/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
deleted file mode 100644
index 71d8abf70585..000000000000
--- a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-It seems there was a broken commit meant to fix compilation on win32,
-but this broke compilation on musl.
-
-See:
-
-https://sourceforge.net/p/iperf2/code/ci/c8f861a0a07b0606a581f2658c71959ad9417923/
-
-for the broken commit. The current patch fixes that by completing the
-definition of gettcpinfo() to what it was before the broken commit.
-
---- a/compat/gettcpinfo.c	2021-12-05 17:49:56.000000000 -0300
-+++ b/compat/gettcpinfo.c	2021-12-11 19:29:24.850947483 -0300
-@@ -99,4 +99,7 @@
- };
- #else
- inline void gettcpinfo (int sock, struct ReportStruct *sample) {
-+    sample->tcpstats.rtt = 1;
-+    sample->tcpstats.isValid  = false;
-+};
- #endif
diff --git a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch b/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
deleted file mode 100644
index 066620c8666c..000000000000
--- a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Change order of includes to fix compilation with musl libc
-
---- a/include/headers.h	2021-08-16 14:27:51.000000000 -0300
-+++ b/include/headers.h	2021-10-01 23:42:09.471528972 -0300
-@@ -106,11 +106,6 @@
- #include <net/if.h>
- #endif
- 
--#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
--#include <linux/if_tun.h>
--#include <sys/ioctl.h>
--#endif
--
- 
- // AF_PACKET HEADERS
- #if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_AF_PACKET)
-@@ -146,6 +141,11 @@
- #define  IPV6HDRLEN 40
- #endif // HAVE_AF_PACKET
- 
-+#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
-+#include <linux/if_tun.h>
-+#include <sys/ioctl.h>
-+#endif
-+
- #ifdef WIN32
- 
- /* Windows config file */
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index 555b5670914f..7157ebba77cd 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -1,6 +1,6 @@
 # Template file for 'iperf'
 pkgname=iperf
-version=2.1.6
+version=2.1.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-multicast --enable-threads
@@ -9,8 +9,16 @@ short_desc="Perform network throughput tests"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="NCSA"
 homepage="https://iperf.fr/"
+changelog="https://sourceforge.net/p/iperf2/code/ci/master/tree/doc/RELEASE_NOTES?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
-checksum=4a43e44439b95622aebeee55754a17d1c94076032e90620dfc1ab9908cb9e080
+checksum=1aba2e1d7aa43641ef841951ed88e16cffba898460e0c51e6b2806f3ff20e9d4
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	# do not define struct ethhdr in <linux/if_ether.h> to avoid
+	# redefinition in <netinet/if_ether.h>
+	CFLAGS="-D__UAPI_DEF_ETHHDR=0"
+	CXXFLAGS="-D__UAPI_DEF_ETHHDR=0"
+fi
 
 post_install() {
 	vlicense COPYING LICENSE

From fd5b63dd7f1ecf9c3726f7c26a713062f69f6e70 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 12 Apr 2022 03:32:14 +0200
Subject: [PATCH 1223/2561] stagit: update to 1.1.

* take over maintainership
---
 srcpkgs/stagit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index f5828d25ed5c..7e78e61ac80d 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,16 +1,16 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=1.0
+version=1.1
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
 makedepends="libgit2-devel"
 short_desc="Static git page generator"
-maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="MIT"
 homepage="https://codemadness.org/git/stagit/log.html"
 distfiles="https://codemadness.org/releases/stagit/${pkgname}-${version}.tar.gz"
-checksum=10a0e31bb57d6da0dea84728cabed95b8f7d83fde13bb76e0ce18ef71ab68d8f
+checksum=66f6ad1be3d6b6455faf9cfdd29329644b7ff2aa3123fbf1375169c60bda75c5
 LDFLAGS="-lgit2"
 
 post_install() {

From 4928835aedc691120039fd56d222ccc03d9f5c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 11 Apr 2022 17:49:21 -0300
Subject: [PATCH 1224/2561] threejs-sage: make it available as a jupyter
 nbextension

Adds a symlink in /usr/share/jupyter/nbextensions, so that the js is
available in a jupyter notebook.

Otherwise, using 3d plots in the jupyter notebook will hit jsdelivr.net.
---
 srcpkgs/threejs-sage/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/threejs-sage/template b/srcpkgs/threejs-sage/template
index cb5c87a19c12..9cdb0fb3848d 100644
--- a/srcpkgs/threejs-sage/template
+++ b/srcpkgs/threejs-sage/template
@@ -1,7 +1,7 @@
 # Template file for 'threejs-sage'
 pkgname=threejs-sage
 version=r122
-revision=1
+revision=2
 short_desc="Custom build of three.js for sagemath"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="MIT"
@@ -13,4 +13,8 @@ do_install() {
 	vlicense LICENSE
 	vinstall version 644 usr/share/sagemath/threejs-sage
 	vinstall build/three.min.js 644 usr/share/sagemath/threejs-sage/$version
+
+	# make threejs available as a jupyter notebook extension
+	vmkdir usr/share/jupyter/nbextensions
+	ln -s /usr/share/sagemath/threejs-sage ${DESTDIR}/usr/share/jupyter/nbextensions
 }

From 5ddcf0fc7792c37e4528685122af0b9d4ec6ece2 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 11 Apr 2022 22:30:18 +0400
Subject: [PATCH 1225/2561] libusb: update to 1.0.26.

---
 .../libusb/patches/late-transfer-free.patch   | 136 ------------------
 srcpkgs/libusb/template                       |   6 +-
 2 files changed, 3 insertions(+), 139 deletions(-)
 delete mode 100644 srcpkgs/libusb/patches/late-transfer-free.patch

diff --git a/srcpkgs/libusb/patches/late-transfer-free.patch b/srcpkgs/libusb/patches/late-transfer-free.patch
deleted file mode 100644
index f4d913bbbd84..000000000000
--- a/srcpkgs/libusb/patches/late-transfer-free.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 010691ff6fdf9fcfaa7f76c1417dfc1f7df124ca Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <bberg@redhat.com>
-Date: Tue, 15 Feb 2022 11:13:41 +0100
-Subject: [PATCH] io: Track device in usbi_transfer
-
-transfer->dev_handle currently has the behaviour that it will be unset
-if the device is closed. The sync API uses this fact to catch an error
-case.
-
-In other cases, transfer->dev_handle will keep its value, which means
-that if the transfer lives longer than the device handle, the pointer
-becomes invalid.
-
-The transfer does however keep a reference to the device, which owns the
-pointer to the context. As such, we can track this reference internal to
-the transfer, and it is set while the transfer is in-flight.
-
-With this, switch the logging infrastructure to use itransfer->dev->ctx
-while checking that itransfer->dev is non-NULL.
-
-Note that this was a regression caused by 6cae9c6dbd74 ("core: update
-usbi_dbg to take the context as an argument"), specifically when
-resolving the context while freeing a transfer after closing a device.
-
-Note that the transfer will now keep a reference to the device until it
-is free'ed. This allows it to use the correct context for logging even
-in libusb_free_transfer.
-
-The alternative to all this would be to just explicitly pass NULL to the
-log handler in libusb_free_transfer.
-
-Closes: #1038
----
- libusb/io.c      | 20 ++++++++++++--------
- libusb/libusbi.h | 11 ++++++++---
- 2 files changed, 20 insertions(+), 11 deletions(-)
-
-diff --git a/libusb/io.c b/libusb/io.c
-index 0d2ac9ea..b919e9d9 100644
---- a/libusb/io.c
-+++ b/libusb/io.c
-@@ -1344,6 +1344,8 @@ void API_EXPORTED libusb_free_transfer(struct libusb_transfer *transfer)
- 
- 	itransfer = LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
- 	usbi_mutex_destroy(&itransfer->lock);
-+	if (itransfer->dev)
-+		libusb_unref_device(itransfer->dev);
- 
- 	priv_size = PTR_ALIGN(usbi_backend.transfer_priv_size);
- 	ptr = (unsigned char *)itransfer - priv_size;
-@@ -1489,9 +1491,15 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
- {
- 	struct usbi_transfer *itransfer =
- 		LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
--	struct libusb_context *ctx = TRANSFER_CTX(transfer);
-+	struct libusb_context *ctx;
- 	int r;
- 
-+	assert(transfer->dev_handle);
-+	if (itransfer->dev)
-+		libusb_unref_device(itransfer->dev);
-+	itransfer->dev = libusb_ref_device(transfer->dev_handle->dev);
-+
-+	ctx = HANDLE_CTX(transfer->dev_handle);
- 	usbi_dbg(ctx, "transfer %p", transfer);
- 
- 	/*
-@@ -1551,8 +1559,6 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
- 	r = usbi_backend.submit_transfer(itransfer);
- 	if (r == LIBUSB_SUCCESS) {
- 		itransfer->state_flags |= USBI_TRANSFER_IN_FLIGHT;
--		/* keep a reference to this device */
--		libusb_ref_device(transfer->dev_handle->dev);
- 	}
- 	usbi_mutex_unlock(&itransfer->lock);
- 
-@@ -1659,7 +1665,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
- {
- 	struct libusb_transfer *transfer =
- 		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
--	struct libusb_device_handle *dev_handle = transfer->dev_handle;
- 	struct libusb_context *ctx = ITRANSFER_CTX(itransfer);
- 	uint8_t flags;
- 	int r;
-@@ -1693,7 +1698,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
- 	 * this point. */
- 	if (flags & LIBUSB_TRANSFER_FREE_TRANSFER)
- 		libusb_free_transfer(transfer);
--	libusb_unref_device(dev_handle->dev);
- 	return r;
- }
- 
-@@ -1727,10 +1731,10 @@ int usbi_handle_transfer_cancellation(struct usbi_transfer *itransfer)
-  * function will be called the next time an event handler runs. */
- void usbi_signal_transfer_completion(struct usbi_transfer *itransfer)
- {
--	libusb_device_handle *dev_handle = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)->dev_handle;
-+	struct libusb_device *dev = itransfer->dev;
- 
--	if (dev_handle) {
--		struct libusb_context *ctx = HANDLE_CTX(dev_handle);
-+	if (dev) {
-+		struct libusb_context *ctx = DEVICE_CTX(dev);
- 		unsigned int event_flags;
- 
- 		usbi_mutex_lock(&ctx->event_data_lock);
-diff --git a/libusb/libusbi.h b/libusb/libusbi.h
-index 158a9af5..7618236f 100644
---- a/libusb/libusbi.h
-+++ b/libusb/libusbi.h
-@@ -329,10 +329,11 @@ void usbi_log(struct libusb_context *ctx, enum libusb_log_level level,
- #endif /* ENABLE_LOGGING */
- 
- #define DEVICE_CTX(dev)		((dev)->ctx)
--#define HANDLE_CTX(handle)	(DEVICE_CTX((handle)->dev))
--#define TRANSFER_CTX(transfer)	(HANDLE_CTX((transfer)->dev_handle))
-+#define HANDLE_CTX(handle)	((handle) ? DEVICE_CTX((handle)->dev) : NULL)
- #define ITRANSFER_CTX(itransfer) \
--	(TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)))
-+	((itransfer)->dev ? DEVICE_CTX((itransfer)->dev) : NULL)
-+#define TRANSFER_CTX(transfer) \
-+	(ITRANSFER_CTX(LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer)))
- 
- #define IS_EPIN(ep)		(0 != ((ep) & LIBUSB_ENDPOINT_IN))
- #define IS_EPOUT(ep)		(!IS_EPIN(ep))
-@@ -562,6 +563,10 @@ struct usbi_transfer {
- 	uint32_t state_flags;   /* Protected by usbi_transfer->lock */
- 	uint32_t timeout_flags; /* Protected by the flying_stransfers_lock */
- 
-+	/* The device reference is held until destruction for logging
-+	 * even after dev_handle is set to NULL.  */
-+	struct libusb_device *dev;
-+
- 	/* this lock is held during libusb_submit_transfer() and
- 	 * libusb_cancel_transfer() (allowing the OS backend to prevent duplicate
- 	 * cancellation, submission-during-cancellation, etc). the OS backend
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 4f192264d4bc..ff718223a773 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,7 +1,7 @@
 # Template file for 'libusb'
 pkgname=libusb
-version=1.0.25
-revision=2
+version=1.0.26
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libusb.info"
 changelog="https://raw.githubusercontent.com/libusb/libusb/master/ChangeLog"
 distfiles="https://github.com/libusb/libusb/releases/download/v${version}/libusb-${version}.tar.bz2"
-checksum=8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849
+checksum=12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5
 
 libusb-devel_package() {
 	short_desc+=" - development files"

From 3e555b37fe11310b6f9364577befabe3f3cd9900 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Mon, 11 Apr 2022 12:14:44 -0600
Subject: [PATCH 1226/2561] yad: update to 11.1

---
 srcpkgs/yad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index 960ed74e8cc6..a9d75e6930e3 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,6 +1,6 @@
 # Template file for 'yad'
 pkgname=yad
-version=11.0
+version=11.1
 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=af20b5a7120ba303ca8845db62c9a7410ae5b5224a3eb3563cd70774a745b9f2
+checksum=ca61d422d6d464d7f473d1e5bd14d3ca05d311ef203f1c67bbea7c23bf0eae2f
 
 pre_configure() {
 	autoreconf -ivf

From a667c22c5b23c9f80bcdff13bddedb38cbd9f7ac Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 10 Apr 2022 23:45:27 -0400
Subject: [PATCH 1227/2561] polybar: update to 3.6.2, adopt.

---
 srcpkgs/polybar/template | 44 +++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index 169724754f55..9a2021d35381 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -1,31 +1,33 @@
 # Template file for 'polybar'
 pkgname=polybar
-version=3.5.7
+version=3.6.2
 revision=1
 build_style=cmake
-configure_args="
- -DENABLE_ALSA=$(vopt_if alsa ON OFF)
- -DENABLE_CURL=$(vopt_if curl ON OFF)
- -DENABLE_I3=$(vopt_if i3 ON OFF)
- -DENABLE_MPD=$(vopt_if mpd ON OFF)
- -DENABLE_NETWORK=$(vopt_if network ON OFF)
- -DENABLE_PULSEAUDIO=$(vopt_if pulseaudio ON OFF)
- -DWITH_XCOMPOSITE=ON"
-hostmakedepends="pkg-config xcb-proto python3 python3-Sphinx"
+configure_args="-DBUILD_CONFIG=OFF -DBUILD_DOC_HTML=OFF
+ $(vopt_bool alsa ENABLE_ALSA)
+ $(vopt_bool curl ENABLE_CURL)
+ $(vopt_bool i3 ENABLE_I3)
+ $(vopt_bool mpd ENABLE_MPD)
+ $(vopt_bool network ENABLE_NETWORK)
+ $(vopt_bool pulseaudio ENABLE_PULSEAUDIO)"
+hostmakedepends="pkg-config xcb-proto python3 python3-Sphinx python3-packaging"
 makedepends="cairo-devel xcb-util-image-devel xcb-util-wm-devel xcb-util-xrm-devel
- zlib-devel xcb-util-renderutil-devel xcb-util-cursor-devel libxcb-devel
+ zlib-devel xcb-util-renderutil-devel xcb-util-cursor-devel libxcb-devel libuv-devel
  $(vopt_if alsa "alsa-lib-devel")
  $(vopt_if curl "libcurl-devel")
  $(vopt_if i3 "i3-devel jsoncpp-devel")
  $(vopt_if mpd "libmpdclient-devel")
- $(vopt_if network "wireless_tools-devel")
+ $(vopt_if network "libnl3-devel")
  $(vopt_if pulseaudio "pulseaudio-devel")"
 short_desc="Fast and easy-to-use status bar"
-maintainer="Michael Carlberg <c@rlberg.se>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://github.com/polybar/polybar"
-distfiles="${homepage}/releases/download/${version}/polybar-${version}.tar.gz"
-checksum=73210e6d74217acb953b253990b4302343b7b6a7870fe1da9a1855daa44123db
+changelog="https://raw.githubusercontent.com/polybar/polybar/master/CHANGELOG.md"
+distfiles="https://github.com/polybar/polybar/releases/download/${version}/polybar-${version}.tar.gz"
+checksum=73becc942e7d2418bc72bd194f2037a2a86792219fd561b663a8509fd5f547a0
+# tries to download and build unstable/unreleased googletest during configure
+make_check=no
 
 build_options="alsa curl i3 mpd network pulseaudio"
 build_options_default="$build_options"
@@ -35,21 +37,13 @@ desc_option_i3="Enable support for i3"
 desc_option_mpd="Enable support for MPD"
 desc_option_network="Enable support for network"
 
-CXXFLAGS="-Wno-error=deprecated-declarations"
-
-if [ "$build_option_network" ]; then
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) CXXFLAGS+=" -D_LINUX_IF_ETHER_H" ;;
-	esac
-fi
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic'"
 fi
 
 post_install() {
-	rm -rf ${DESTDIR}/usr/share/doc/polybar
-	vdoc config
+	rm -r ${DESTDIR}/usr/share/doc/polybar
+	vsconf doc/config.ini
 	vlicense LICENSE
 }

From 040aa7a7bac176c934fc13161aba4664fb659d84 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 00:54:09 +0200
Subject: [PATCH 1228/2561] botan: update to 2.19.1.

drop update file as botan does semver for a long time now

Closes: #34285
Closes: #36646
---
 common/shlibs          |  2 +-
 srcpkgs/botan/template | 10 ++++------
 srcpkgs/botan/update   |  1 -
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0ac24701898d..fc5a031056fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2897,7 +2897,7 @@ libKDb3.so.4 kdb-3.1.0_1
 libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
-libbotan-2.so.16 botan-2.16.0_3
+libbotan-2.so.19 botan-2.19.1_1
 libswipl.so.8 swi-prolog-8.2.4_2
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 282bceabd3ce..65a626714fdf 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,10 +1,9 @@
 # Template file for 'botan'
 pkgname=botan
-version=2.16.0
-revision=4
+version=2.19.1
+revision=1
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
-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++"
@@ -12,11 +11,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://botan.randombit.net/"
 distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
-checksum=92ed6ebc918d86bd1b04221ca518af4cf29cc326c4760740bd2d22e61cea2628
+checksum=e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560
 python_version=3
 
 LDFLAGS="-pthread"
-CXXFLAGS="-O3"
 
 do_configure() {
 	local _args _cpu
@@ -78,7 +76,7 @@ do_configure() {
 }
 
 do_check() {
-	./botan-test
+	make check
 }
 
 post_install() {
diff --git a/srcpkgs/botan/update b/srcpkgs/botan/update
index 04f08c11ede7..e69de29bb2d1 100644
--- a/srcpkgs/botan/update
+++ b/srcpkgs/botan/update
@@ -1 +0,0 @@
-pattern='\K[0-9]+\.[0-9]*[02468]\.[0-9]+'

From def9ac9773d6e0facb60c4d6a898e4f8a8f0dee9 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 00:55:52 +0200
Subject: [PATCH 1229/2561] corectrl: update to 1.2.3.

---
 srcpkgs/corectrl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index 513afe8b595a..ad16c9a8de76 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,6 +1,6 @@
 # Template file for 'corectrl'
 pkgname=corectrl
-version=1.2.2
+version=1.2.3
 revision=1
 wrksrc=${pkgname}-v${version}
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/corectrl/corectrl"
 distfiles="${homepage}/-/archive/v${version}/corectrl-v${version}.tar.gz"
-checksum=ecfbdb3d99974a64fe6fab90f4bb543154ddc7004eeac14ef65b4ae6e661ca57
+checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a760d95112642d152140d3786b6351a250f5218d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 09:53:48 +0200
Subject: [PATCH 1230/2561] qownnotes: update to 22.4.0.

---
 srcpkgs/qownnotes/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index b55900e3023a..db79662ba4bf 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,6 +1,6 @@
 # Template file for 'qownnotes'
 pkgname=qownnotes
-version=21.12.3
+version=22.4.0
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -13,8 +13,8 @@ license="GPL-2.0-only"
 homepage="https://www.qownnotes.org"
 changelog="https://www.qownnotes.org/changelog.html"
 distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz"
-checksum=a92df38f9c88f381af77800c339fe6aa8196a7a260081b0a48f61f1ae4c28029
+checksum=96b682608ecdf303e2c5d5eb2341812db3c3848e15bc4832ba5d426f01bdbd66
 
 pre_build() {
-	sed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
+	vsed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
 }

From ebb3b3f4813ec69fe5f5070f591979a9121f38cc Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 21 Mar 2022 11:18:31 +0000
Subject: [PATCH 1231/2561] libluv: update to 1.43.0.0.

---
 srcpkgs/libluv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index ac7ef54a6ffa..191d877e10fa 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -1,6 +1,6 @@
 # Template file for 'libluv'
 pkgname=libluv
-version=1.41.0.0
+version=1.43.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="4018f293d71c2d75757b64fcdacf982729c9dc8b0bf8eda4015a8818a5a29321
+checksum="567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 

From e1ed1d339fdf3d19eca2ef2f803b069be2a471c5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 17:04:42 +0100
Subject: [PATCH 1232/2561] corectrl: add missing glxinfo dependency

and simplify libatomic handling

By Piraty: distilled from the PR

Closes: #36298 [via git-merge-pr]
---
 srcpkgs/corectrl/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index ad16c9a8de76..0cfa3f792982 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,7 +1,7 @@
 # Template file for 'corectrl'
 pkgname=corectrl
 version=1.2.3
-revision=1
+revision=2
 wrksrc=${pkgname}-v${version}
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake
 kcoreaddons kauth"
 makedepends="botan-devel kauth-devel karchive-devel qt5-charts-devel
 qt5-tools-devel libdrm-devel qt5-svg-devel"
-depends="dbus hicolor-icon-theme qt5-quickcontrols2 qt5-svg"
+depends="dbus hicolor-icon-theme qt5-quickcontrols2 qt5-svg glxinfo"
 short_desc="User-friendly hardware control application"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
@@ -19,6 +19,5 @@ checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	LIBS="-latomic"
 fi

From 4e73cc0b3d1c1394442e21082352e0c5b2b9638d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 12 Apr 2022 21:07:51 +0200
Subject: [PATCH 1233/2561] vscode: update to 1.66.2

---
 srcpkgs/vscode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 3e3956fa5644..6d3b3d72d00c 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.66.1
+version=1.66.2
 revision=1
 _electronver=13.6.7
 _npmver=8.6.0
@@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz"
-checksum=243a25d7214ceba5abf510dc890c64a8cc36ccacd97f4b8c666b8b7bab9c5a28
+checksum=1b70f202b570763e85f67abd8693eeb9c88c6a066a4b579aca5c0c42ecb1b47f
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 65d505f055bc7ef1f1c2e62e73ae66617979fb4d Mon Sep 17 00:00:00 2001
From: vikigenius <master.bvik@gmail.com>
Date: Tue, 12 Apr 2022 10:56:58 -0400
Subject: [PATCH 1234/2561] zola: update to 0.15.3

---
 srcpkgs/zola/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index dcf2a8701cff..460a4b9e4830 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.15.2
+version=0.15.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://raw.githubusercontent.com/getzola/zola/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=9f6b1527e728cef3536e42a18fbc06647b388fb34fc07cc7aca82e44f4fa3447
+checksum=89a590549249e60a01f1a1f66ee23fedc711afd4e9a669ee1328e5c99ea958c8
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 20817a15ed45b1aef2337524dc05c166db738026 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:32:51 +0300
Subject: [PATCH 1235/2561] python3-click-log: fix tests.

---
 srcpkgs/python3-click-log/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-click-log/template b/srcpkgs/python3-click-log/template
index 6f966c248fc9..07f1c5b0eba5 100644
--- a/srcpkgs/python3-click-log/template
+++ b/srcpkgs/python3-click-log/template
@@ -6,6 +6,7 @@ wrksrc="click-log-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Logging integration for Click (Python3)"
 maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="MIT"

From f7597fd84a5caee3866c743c6c430844f06e2eb4 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:33:13 +0300
Subject: [PATCH 1236/2561] python3-click-plugins: fix tests.

---
 srcpkgs/python3-click-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-click-plugins/template b/srcpkgs/python3-click-plugins/template
index 142900633bb6..3fffc0e849fc 100644
--- a/srcpkgs/python3-click-plugins/template
+++ b/srcpkgs/python3-click-plugins/template
@@ -4,9 +4,9 @@ version=1.1.1
 revision=4
 wrksrc="click-plugins-${version}"
 build_style=python3-module
-pycompile_module="click-plugins"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Python3-click module extension to register CLI commands"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-2-Clause"

From 61b26784c0ec24ea5e275c4090d3f7e5fcf788bf Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:33:43 +0300
Subject: [PATCH 1237/2561] python3-click-repl: disable tests.

---
 srcpkgs/python3-click-repl/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/python3-click-repl/template b/srcpkgs/python3-click-repl/template
index b5cf6e495fcb..d4c78ba72332 100644
--- a/srcpkgs/python3-click-repl/template
+++ b/srcpkgs/python3-click-repl/template
@@ -12,6 +12,8 @@ license="MIT"
 homepage="https://github.com/click-contrib/click-repl"
 distfiles="${PYPI_SITE}/c/click-repl/click-repl-${version}.tar.gz"
 checksum=b9f29d52abc4d6059f8e276132a111ab8d94980afe6a5432b9d996544afa95d5
+# The tarball from PyPI has no tests.
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 36bb6bfb91bca0ad3fd2c16bd4a6946d071866a8 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:35:14 +0300
Subject: [PATCH 1238/2561] python3-click-threading: fix tests.

---
 srcpkgs/python3-click-threading/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-click-threading/template b/srcpkgs/python3-click-threading/template
index b639065db3d6..66bd90de3fd8 100644
--- a/srcpkgs/python3-click-threading/template
+++ b/srcpkgs/python3-click-threading/template
@@ -6,6 +6,7 @@ wrksrc="click-threading-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Multithreaded Click apps made easy (Python3)"
 maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="MIT"

From a342199c85810400423fe1a8fe144b4a7af822d1 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:35:25 +0300
Subject: [PATCH 1239/2561] python3-userpath: fix tests.

---
 srcpkgs/python3-userpath/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template
index b557bc2528af..8fc30c9a52f5 100644
--- a/srcpkgs/python3-userpath/template
+++ b/srcpkgs/python3-userpath/template
@@ -4,9 +4,9 @@ version=1.7.0
 revision=2
 wrksrc="userpath-${version}"
 build_style=python3-module
-pycompile_module="userpath"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Cross-platform tool for adding locations to the user PATH"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, Apache-2.0"

From fe36934c77554fca6bbcc7dae71e4ef2baf75555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 13 Apr 2022 20:57:27 +0200
Subject: [PATCH 1240/2561] subversion: update to 1.14.2.

---
 srcpkgs/subversion/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index acf378142fd8..8ad178264942 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion-kwallet-auth".
 #
 pkgname=subversion
-version=1.14.1
-revision=3
+version=1.14.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-javahl --disable-static --config-cache
  --with-gnome-keyring --with-editor=vi --disable-mod-activation
@@ -21,7 +21,7 @@ license="Apache-2.0, BSD-3-Clause"
 homepage="http://subversion.apache.org/"
 changelog="https://subversion.apache.org/docs/release-notes/${version%.*}.html"
 distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
-checksum=2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9
+checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
 
 pre_configure() {
 	# Based on native build values

From d46e2f046c7a42228c6d2374c8ccf70cc102b4ca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 12:52:43 +0200
Subject: [PATCH 1241/2561] gucci: update to 1.5.4.

---
 srcpkgs/gucci/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index a4d816647e74..37773ceba896 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.3
+version=1.5.4
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -10,8 +10,8 @@ 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=f52c12fbf566d42e666618d24258488eac6035a76369c2db4b741fed8792de76
+distfiles="https://github.com/noqcks/gucci/archive/refs/tags/${version}.tar.gz"
+checksum=c6e30e088c341eb6988e2b50fc477deef81882d8a517e130a8eef22c81f32823
 
 post_install() {
 	vlicense LICENSE

From 2032d7bda3b9c0b951b6e25b22c88d2a7f179c9a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 27 Mar 2022 12:30:11 +0300
Subject: [PATCH 1242/2561] rssguard: update to 4.2.1.

Also:
- change build_style to cmake (upstream),
- adjust dependencies.
---
 srcpkgs/rssguard/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index f34e58087176..300f07694c43 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,18 +1,20 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=4.1.2
+version=4.2.1
 revision=1
-build_style=qmake
-configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-tools-devel kdeclarative-devel qt5-multimedia-devel"
+build_style=cmake
+configure_args="-DUSE_WEBENGINE="false""
+hostmakedepends="qt5-host-tools qt5-qmake"
+makedepends="qt5-tools-devel qt5-devel kdeclarative-devel qt5-multimedia-devel
+ qt5-plugin-sqlite qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-mysql
+ qt5-plugin-tds"
 depends="desktop-file-utils qt5-plugin-sqlite"
 short_desc="Simple (yet powerful) Qt5 feed reader"
 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=3e9c6b25cad846aa2047f737d961fe007c88873d9e9772ec8e238908c6f8df95
+checksum=b404e3d8310c58ffb337bf1d2eb2c7cc10a692b00ed2666af30bd0153413cc05
 
 post_install() {
 	# Install rssguard icon manually

From 8cad24b0103c23c65db3ffd9636b2636d25838fb Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 13 Apr 2022 17:43:00 +0200
Subject: [PATCH 1243/2561] setxkbmap: update to 1.3.3.

---
 srcpkgs/setxkbmap/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/setxkbmap/template b/srcpkgs/setxkbmap/template
index 9fafe9eb721d..02a6f5de2452 100644
--- a/srcpkgs/setxkbmap/template
+++ b/srcpkgs/setxkbmap/template
@@ -1,16 +1,16 @@
 # Template file for 'setxkbmap'
 pkgname=setxkbmap
-version=1.3.2
+version=1.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libX11-devel libxkbfile-devel"
+makedepends="libX11-devel libxkbfile-devel libXrandr-devel"
 short_desc="Set the keyboard map using the X Keyboard Extension"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/setxkbmap-${version}.tar.bz2"
-checksum=8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5
+homepage="https://gitlab.freedesktop.org/xorg/app/setxkbmap"
+distfiles="${XORG_SITE}/app/setxkbmap-${version}.tar.xz"
+checksum=b560c678da6930a0da267304fa3a41cc5df39a96a5e23d06f14984c87b6f587b
 
 post_install() {
 	vlicense COPYING

From 6b33e3644220f84194adbbfe14ec3ebe97b25e61 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 3 Apr 2022 16:14:08 +0200
Subject: [PATCH 1244/2561] font-cozette: update to 1.13.0

---
 srcpkgs/font-cozette/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index 7a2e57669380..ad6b3acd0d12 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -1,7 +1,7 @@
 # Template file for 'font-cozette'
 pkgname=font-cozette
-version=1.11.3
-revision=2
+version=1.13.0
+revision=1
 create_wrksrc=yes
 hostmakedepends="font-util bdftopcf"
 depends="font-util"
@@ -9,8 +9,9 @@ short_desc="Bitmap programming font optimized for coziness"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/slavfox/Cozette"
+changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md"
 distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"
-checksum=0976f61ba68b3a261568819bce0b89d43ae2892ad51e5da399dab8a5894cbbc8
+checksum=11590b29856d9ffb2dc6c606009168ea87a3ecde7bcbe9fe542bc34b406c868d
 font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
 
 do_install() {

From a0c2a9e63c0b62d8503027fafbefe7f5ebdb4b64 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 13 Apr 2022 17:38:50 +0200
Subject: [PATCH 1245/2561] cocogitto: update to 5.1.0

---
 srcpkgs/cocogitto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 79a78e4b5971..b20e575819ad 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,6 +1,6 @@
 # Template file for 'cocogitto'
 pkgname=cocogitto
-version=5.0.1
+version=5.1.0
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/cocogitto/cocogitto"
 changelog="https://github.com/cocogitto/cocogitto/blob/main/CHANGELOG.md"
 distfiles="https://github.com/cocogitto/cocogitto/archive/${version}.tar.gz"
-checksum=fee00736ec4b8ce72c8d8f904d0b734372b11ce7c3711166814eca38bf0cda8f
+checksum=662bb909c6468124ad19a90bc07a4f24345167486bd19542375ead7a8f20de02
 # Test suite is not atomic, relies on user environment such as git user configuration
 make_check=no
 

From 4e4c9be4679985a9f0b111ca02d7a9a6f974efdc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 13 Apr 2022 17:45:30 +0200
Subject: [PATCH 1246/2561] zellij: update to 0.28.1

---
 srcpkgs/zellij/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 911ba18464eb..20a338d9103e 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,7 +1,7 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.27.0
-revision=2
+version=0.28.1
+revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
 archs="x86_64* aarch64* i686*"
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://zellij.dev"
 changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz"
-checksum=6159482c25d3cb55b04d23230812f4450e88ff0975161594297a7deef8979a38
+checksum=8c9495e70b1c0179200d6137dd892776c7153b0b54115edf0f39fd732bb62efe
 
 post_build() {
 	ZELLIJ="target/${RUST_TARGET}/release/zellij"

From 57d863a5e1e6c21f3e08d1a45564f855e2d15b7c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 13 Apr 2022 21:12:54 +0200
Subject: [PATCH 1247/2561] github-cli: update to 2.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 e4ed029ac23b..35576bf8ee82 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.5.2
+version=2.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=cbf22fea4574047ca3a356ee4ef629d62b872f4c4ff4e4b78fe4f89ca431858e
+checksum=d4aed3f4325bc518cf4af6fc7989ab35b498e42e8f97ba0e6bb07d7e3b14886a
 
 pre_build() {
 	local _date

From bee6d83b0e80f0195b448ef2bedee05ac8315aea Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Wed, 13 Apr 2022 15:30:35 -0400
Subject: [PATCH 1248/2561] btop: update to 1.2.6.

---
 srcpkgs/btop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/btop/template b/srcpkgs/btop/template
index 4b2064c29e40..3667b71a317a 100644
--- a/srcpkgs/btop/template
+++ b/srcpkgs/btop/template
@@ -1,6 +1,6 @@
 # Template file for 'btop'
 pkgname=btop
-version=1.2.5
+version=1.2.6
 revision=1
 build_style=gnu-makefile
 short_desc="Monitor of resources"
@@ -9,4 +9,4 @@ license="Apache-2.0"
 homepage="https://github.com/aristocratos/btop"
 changelog="https://raw.githubusercontent.com/aristocratos/btop/main/CHANGELOG.md"
 distfiles="https://github.com/aristocratos/btop/archive/refs/tags/v${version}.tar.gz"
-checksum=93ff23276f2c626282037766542543dad5964fb6117c7902c4a4899607f8c95f
+checksum=3631f39c847c884064dd0babf34487a3b8b87a9d61d89aa5185418ffdc4741d8

From 693bdd114546c25412cb98420cd4550cf65d6b7d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 13 Apr 2022 10:32:50 +0200
Subject: [PATCH 1249/2561] mutt: update to 2.2.3.

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 6c0f0d04798b..4c65fcdec66b 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.2.2
+version=2.2.3
 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=10de870cf37646c0b3f5bcf579c3cc2fd9285bda1d04be9ad7c33ec2ee820fcc
+checksum=978addcdab454f447ed7d1de84b5767e714c30714285bf82e4a1745071d18d89
 
 post_install() {
 	# provided by mime-types

From 810ac6f70e285015e7347eeeb2c650e7c3bbf780 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 13 Apr 2022 20:58:41 +0200
Subject: [PATCH 1250/2561] links: update to 2.26

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index 554ef120c0b5..b1b4d5d6629b 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,6 +1,6 @@
 # Template file for 'links'
 pkgname=links
-version=2.25
+version=2.26
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c
+checksum=f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/share/doc/

From 1df18abaf81ed73a04ea87f780a83035cbfe3144 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 13 Apr 2022 20:59:13 +0200
Subject: [PATCH 1251/2561] links-x11: update to 2.26

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 6e37599354ab..83708d05a3cf 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,6 +1,6 @@
 # Template file for 'links-x11'
 pkgname=links-x11
-version=2.25
+version=2.26
 revision=1
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c
+checksum=f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb
 conflicts="links"
 
 post_install() {

From d5ec2a027c740ca2fcb80932d448099619c128db Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:45:24 +0200
Subject: [PATCH 1252/2561] ocaml: update to 4.14.0.

---
 srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 16 ++++++++--------
 srcpkgs/ocaml/template                           |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 333276741c7d..a26f6a639e18 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -18,25 +18,25 @@
          .globl  caml_system__frametable
          .type   caml_system__frametable, @object
  caml_system__frametable:
---- ocaml-4.11.0/configure.ac
-+++ ocaml-4.11.0/configure.ac
+--- ocaml-4.14.0/configure.ac
++++ ocaml-4.14.0/configure.ac
 @@ -1006,7 +1006,7 @@ AS_IF([test $arch != "none" && $arch64 ],
  # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
  
  AS_CASE([$arch],
--  [amd64|s390x|none],
-+  [amd64|s390x|power|none],
+-  [amd64|arm64|s390x|none],
++  [amd64|arm64|s390x|power|none],
      # ocamlopt generates PIC code or doesn't generate code at all
      [],
    [AS_CASE([$host],
---- ocaml-4.11.0/configure
-+++ ocaml-4.11.0/configure
+--- ocaml-4.14.0/configure
++++ ocaml-4.14.0/configure
 @@ -13886,7 +13886,7 @@
  # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
  
  case $arch in #(
--  amd64|s390x|none) :
-+  amd64|s390x|power|none) :
+-  amd64|arm64|s390x|none) :
++  amd64|arm64|s390x|power|none) :
      # ocamlopt generates PIC code or doesn't generate code at all
       ;; #(
    *) :
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 629c13791dfe..7de25d70b827 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml'
 pkgname=ocaml
-version=4.13.1
-revision=2
+version=4.14.0
+revision=1
 build_style="gnu-configure"
 configure_args="--with-pic --libdir=/usr/lib/ocaml"
 make_build_target="world.opt"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="QPL-1.0, LGPL-2.1-only"
 homepage="http://ocaml.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4
+checksum=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8
 nocross=yes
 
 export ASPP="cc -c"

From 37d7e5082b060d26c3219ae28a5e1df4d36da095 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:47:06 +0200
Subject: [PATCH 1253/2561] ocaml-findlib: update to 1.9.3.

---
 srcpkgs/ocaml-findlib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 73cca5a2cafa..04be12e64f51 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
-version=1.9.1
-revision=3
+version=1.9.3
+revision=1
 wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
@@ -12,7 +12,7 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="MIT"
 homepage="http://projects.camlcity.org/projects/findlib.html"
 distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
+checksum=c310fcb62838d9e50f0b6d6c5ceefcbe4fe056f72496950ae7d5c6cdaae2cc41
 nocross=yes
 nopie=yes
 disable_parallel_build=yes

From c8b21b7833b291993a55a396a252bb6013e2f645 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:48:00 +0200
Subject: [PATCH 1254/2561] ocaml-num: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocaml-num/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index bfce4e7baf91..739ffcf5d419 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-num'
 pkgname=ocaml-num
 version=1.4
-revision=3
+revision=4
 wrksrc="num-${version}"
 build_style=gnu-makefile
 make_install_target="findlib-install"

From 43e2dc03dc1ec6ea481524e7d6a89613eec17047 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:49:19 +0200
Subject: [PATCH 1255/2561] ocaml-zarith: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocaml-zarith/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index d6c12772723d..936b5cd3f607 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-zarith'
 pkgname=ocaml-zarith
 version=1.12
-revision=3
+revision=4
 wrksrc="Zarith-release-${version}"
 build_style=configure
 make_check_target="tests"

From 3cfcbe98c07609c1caa3f21c59aa28a850cc3bb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:50:43 +0200
Subject: [PATCH 1256/2561] ocamlbuild: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocamlbuild/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 077d5cc7f632..b1349909f784 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'ocamlbuild'
 pkgname=ocamlbuild
 version=0.14.1
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
 make_install_args="PREFIX=/usr"
@@ -13,3 +13,5 @@ homepage="https://github.com/ocaml/ocamlbuild"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
 checksum=4e1279ff0ef80c862eaa5207a77020d741e89ef94f0e4a92a37c4188dbf08256
 nocross=yes
+
+export CHECK_IF_PREINSTALLED=false

From 41aee4b2c765e17073f6a047a277b5ecb82bf582 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:51:59 +0200
Subject: [PATCH 1257/2561] ocaml-stdcompat: update to 18.

---
 srcpkgs/ocaml-stdcompat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
index 2035a9a2c4fa..65a0d6fbc78f 100644
--- a/srcpkgs/ocaml-stdcompat/template
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-stdcompat'
 pkgname=ocaml-stdcompat
-version=16
-revision=2
+version=18
+revision=1
 wrksrc="stdcompat-${version}"
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib/ocaml"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/thierry-martinez/stdcompat"
 distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
-checksum=100152e25f138351cb265146cd8717fa9dbfbff54b48ce771e30a4e05fc1ec09
+checksum=483a8d526eb19709a1a3092fb8978302e3a9d3bb783d807fb9ee53d96c3ec607
 nocross=yes
 disable_parallel_build=yes
 

From 856bb89e79650603012e24fce6da3a99e68cd9d6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:13 +0200
Subject: [PATCH 1258/2561] hivex: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/hivex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 448c06ddc9fa..f6f12d1b70f3 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.21
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"

From 7c9a0d7e1935fcf16898ad4467c31855c33fd0f4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:32 +0200
Subject: [PATCH 1259/2561] opam: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/opam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 236a2f963b70..ca5c64092ac8 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"

From df885c62dbbb4913afee6c6f06ea4615a9ed3f43 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:52 +0200
Subject: [PATCH 1260/2561] ocaml-lablgtk2: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocaml-lablgtk2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index c835e6b19d5d..6ff864eb1720 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-lablgtk2'
 pkgname=ocaml-lablgtk2
 version=2.18.10
-revision=4
+revision=5
 wrksrc="lablgtk-${version}"
 build_style=gnu-configure
 configure_args="--without-glade --without-gnomeui --without-gtksourceview"

From b03989c1960dc2f68a1f0e24f915f55a247afe3d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:12 +0200
Subject: [PATCH 1261/2561] pdfsandwich: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/pdfsandwich/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index f3603e064c90..82f2f934fdc1 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfsandwich'
 pkgname=pdfsandwich
 version=0.1.7
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="ocaml perl"
 makedepends="ocaml"

From b579252558da36616770d63a3810b94f5beb3e07 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:17 +0200
Subject: [PATCH 1262/2561] supermin: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/supermin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 357fc3f255f8..5f80c3515b3d 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
 version=5.2.2
-revision=1
+revision=2
 _release_series=5.2-stable
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"

From 5ab7f08bab6f937aa4ad98ab4481e45340379c5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:24 +0200
Subject: [PATCH 1263/2561] z3: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/z3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 2d5bf7a80954..dea059c98d0c 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
 version=4.8.15
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"

From ff9136a4841117d3383b394b068f83c1c642400b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:01:53 +0200
Subject: [PATCH 1264/2561] coccinelle: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/coccinelle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 211c9bdb4394..709b45fd2f69 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
 # Template file for 'coccinelle'
 pkgname=coccinelle
 version=1.1.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-pdflatex --enable-release --enable-opt
  --with-python=/usr/bin/python3"

From 14e30704aead5b046068c7ee852569a998e89245 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:03:56 +0200
Subject: [PATCH 1265/2561] libguestfs: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/libguestfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 8d669017077e..c6c56f8142b7 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.48.0
-revision=1
+revision=2
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"

From 61a10cd4955a8220369d042a901c9306850c0702 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:04:56 +0200
Subject: [PATCH 1266/2561] unison: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/unison/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 783573c120ea..97eb209e2e8c 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
 # Template file for 'unison'
 pkgname=unison
 version=2.52.0
-revision=1
+revision=2
 hostmakedepends="ocaml"
 short_desc="File-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"

From d425d32a12892cebc1281f912775fd5570856401 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:08:51 +0200
Subject: [PATCH 1267/2561] camlp5: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/camlp5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 2d07ecc842b4..74e0809e16d1 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
 # Template file for 'camlp5'
 pkgname=camlp5
 version=8.00.03
-revision=1
+revision=2
 wrksrc="camlp5-rel${version}"
 build_style=configure
 configure_args="-mandir /usr/share/man"

From 6be264d2d8cdea9631fd4d81529437ad70de14a8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:12:31 +0200
Subject: [PATCH 1268/2561] dune: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/dune/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 178746cfc292..30c34cb44c00 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
 # Template file for 'dune'
 pkgname=dune
 version=3.0.3
-revision=1
+revision=2
 makedepends="ocaml"
 depends="ocaml"
 short_desc="Composable build system for OCaml"

From ba92a5434b08c7e08b9e6f3bfda470c5f6b27997 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:18:07 +0200
Subject: [PATCH 1269/2561] New package: ocaml-camlp-streams-5.0

---
 srcpkgs/ocaml-camlp-streams/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/ocaml-camlp-streams/template

diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template
new file mode 100644
index 000000000000..ce728427d280
--- /dev/null
+++ b/srcpkgs/ocaml-camlp-streams/template
@@ -0,0 +1,22 @@
+# Template file for 'ocaml-camlp-streams'
+pkgname=ocaml-camlp-streams
+version=5.0
+revision=1
+wrksrc="camlp-streams-${version}"
+makedepends="ocaml dune"
+short_desc="Stream and Genlex libraries for use with Camlp4 and Camlp5"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only,OCaml-LGPL-linking-exception"
+homepage="https://github.com/ocaml/camlp-streams"
+distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz"
+checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226
+nocross=yes
+disable_parallel_build=yes
+
+do_build() {
+	dune build --display=short
+}
+do_install() {
+	dune install --prefix=/usr --destdir="$DESTDIR" \
+		--libdir=/usr/lib/ocaml --docdir=/usr/share/doc
+}

From 3b8a67704c3b37480bb1b91fa4f14bd3be608fac Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:36 +0200
Subject: [PATCH 1270/2561] camlp5: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/camlp5/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 74e0809e16d1..1118f618ba1f 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,11 +1,12 @@
 # Template file for 'camlp5'
 pkgname=camlp5
 version=8.00.03
-revision=2
+revision=3
 wrksrc="camlp5-rel${version}"
 build_style=configure
 configure_args="-mandir /usr/share/man"
 hostmakedepends="ocaml perl ocaml-findlib"
+makedepends="ocaml-camlp-streams"
 short_desc="OCaml preprocessor and pretty-printer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From df05ccda3562dfda0e7454f53542f8029d432b26 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:46 +0200
Subject: [PATCH 1271/2561] coq: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/coq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index fcfbc92cb2f6..5db6a99c5e5e 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
 # Template file for 'coq'
 pkgname=coq
 version=8.15.1
-revision=1
+revision=2
 hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 22b8989d6c4498e47d4774a7cbd4f1913768ba02 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:30:50 +0200
Subject: [PATCH 1272/2561] mathcomp: rebuild for coq-8.15.1_2.

---
 srcpkgs/mathcomp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 5946de08e18b..9bdea51dcf48 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.14.0
-revision=1
+revision=2
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From 3c6c6653c0812e65fc9dc22c57e8777042a0160c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:48:14 +0200
Subject: [PATCH 1273/2561] xen: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/xen/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index deb572fe8b9c..cca4b6211bec 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=5
+revision=6
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64
@@ -10,8 +10,9 @@ build_style=gnu-configure
 configure_args="$(vopt_enable stubdom) --disable-systemd
  --with-system-seabios=/usr/share/seabios/bios.bin
  --with-sysconfig-leaf-dir=conf.d --with-rundir=/run"
-hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
- ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
+hostmakedepends="acpica-utils automake bin86 bison fig2dev flex gettext
+ ghostscript git ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar
+ texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
  libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel

From c479cf8eff924bbbf0d8b2a73615edac744a10c2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 22:03:19 +0200
Subject: [PATCH 1274/2561] zeroinstall: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index eb8e1ea24280..40d8740b1300 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,7 +1,7 @@
 # Template file for 'zeroinstall'
 pkgname=zeroinstall
 version=2.17
-revision=5
+revision=6
 wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"

From 4598b950e607198ea644a429ac9e37810a899aa8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 14:27:09 +0200
Subject: [PATCH 1275/2561] opam: disable tests in ci.

---
 srcpkgs/opam/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index ca5c64092ac8..dd27afd02a0d 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -17,6 +17,7 @@ distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
 checksum=735e717532f135064940fe3fef573acce6b1bbdc5e146470c2ac20fc8510a470
 nocross=yes
 disable_parallel_build=yes
+make_check=ci-skip # uses bwrap
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc

From 47d61961a8f6add2ba8363b7abfca5c5212da36d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 11:59:21 -0400
Subject: [PATCH 1276/2561] python3-pyppmd: update to 0.18.2.

enable tests by ignoring/disabling pytest-benchmark
---
 srcpkgs/python3-pyppmd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
index 4034cde05478..a80c2a5f0382 100644
--- a/srcpkgs/python3-pyppmd/template
+++ b/srcpkgs/python3-pyppmd/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pyppmd'
 pkgname=python3-pyppmd
-version=0.17.3
+version=0.18.2
 revision=1
 wrksrc="pyppmd-${version}"
 build_style=python3-module
+make_check_args="--noconftest --ignore=tests/test_benchmark.py"
 hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest python3-py-cpuinfo python3-hypothesis"
 short_desc="Python interface for PPM variation H and I.2"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/miurahr/pyppmd"
 changelog="https://raw.githubusercontent.com/miurahr/pyppmd/main/Changelog.rst"
 distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
-checksum=05a4765833623d5cc1c9afc27d9b05fb64f0319711beffe0b44d9695eb1beb0a
-# testing requires unpackaged plugin pytest-benchmark
-make_check=no
+checksum=732b28ea25afa41a282c986178b29e60ea5ec2e2b67f66997af943f73d4673e0

From 6a2d22b8ea12f9d4ccf761a656991cdda6868df5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 11:59:34 -0400
Subject: [PATCH 1277/2561] python3-pyzstd: update to 0.15.2.

fix tests with custom do_check
---
 .../patches/support_pytest.patch              | 30 +++++++++++++++++++
 srcpkgs/python3-pyzstd/template               |  8 ++---
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-pyzstd/patches/support_pytest.patch

diff --git a/srcpkgs/python3-pyzstd/patches/support_pytest.patch b/srcpkgs/python3-pyzstd/patches/support_pytest.patch
new file mode 100644
index 000000000000..05ffa75fab5b
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/patches/support_pytest.patch
@@ -0,0 +1,30 @@
+From b7ff78fc31ea054339693d6bf835134b8b9fbaa3 Mon Sep 17 00:00:00 2001
+From: Ma Lin <malincns@163.com>
+Date: Tue, 12 Apr 2022 13:00:30 +0800
+Subject: [PATCH] unittests supports pytest
+
+<more-tests>
+---
+ tests/test_zstd.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/tests/test_zstd.py b/tests/test_zstd.py
+index 263a753..0d254b9 100644
+--- a/tests/test_zstd.py
++++ b/tests/test_zstd.py
+@@ -3231,9 +3231,6 @@ def cb(a,b,c,d):
+         compress_stream(io.BytesIO(b''), io.BytesIO(), callback=cb)
+         decompress_stream(io.BytesIO(b''), io.BytesIO(), callback=cb)
+ 
+-def test_main():
+-    unittest.main()
+-
+ # uncompressed size 130KB, more than a zstd block.
+ # with a frame epilogue, 4 bytes checksum.
+ TEST_DAT_130KB = (b'(\xb5/\xfd\xa4\x00\x08\x02\x00\xcc\x87\x03:\xaaYN4pf\xc8\xae\x06b\x02'
+@@ -4419,4 +4416,4 @@ def test_main():
+  b'\xb7\x99\x1b\xce\xc9\t*\x98\x97\xb43z\x01h\x9fu\xf1')
+ 
+ if __name__ == "__main__":
+-    test_main()
++    unittest.main()
diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
index 708b8a193d9b..c097aeb44a09 100644
--- a/srcpkgs/python3-pyzstd/template
+++ b/srcpkgs/python3-pyzstd/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzstd'
 pkgname=python3-pyzstd
-version=0.15.0
+version=0.15.2
 revision=1
 wrksrc="pyzstd-${version}"
 build_style=python3-module
@@ -8,14 +8,14 @@ make_build_args="--dynamic-link-zstd"
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel libzstd-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Python bindings to zstd, API is similar to bz2/lzma/zlib module"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://github.com/animalize/pyzstd"
+changelog="https://raw.githubusercontent.com/animalize/pyzstd/dev/README.rst"
 distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
-checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
-# test is broken and can't be run by setup.py or pytest
-make_check=no
+checksum=eda9d2874a8f3823eea882125f304620f592693b3af0101c484bfc75726c8c59
 
 post_install() {
 	vlicense LICENSE

From 60fd2f95d7c45fb752942bd30cd9d2eb20bf6801 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 12:00:01 -0400
Subject: [PATCH 1278/2561] python3-pybcj: update to 0.5.1.

enable tests with pytest
---
 srcpkgs/python3-pybcj/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template
index 9e0e806f9583..a0776b796627 100644
--- a/srcpkgs/python3-pybcj/template
+++ b/srcpkgs/python3-pybcj/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-pybcj'
 pkgname=python3-pybcj
-version=0.5.0
+version=0.5.1
 revision=1
 wrksrc="pybcj-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest python3-hypothesis"
 short_desc="BCJ(Branch-Call-Jump) filter for python"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/pybcj"
 distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz"
-checksum=8de74f338874c698e405a72181eb0ea2e011ed5a6567e0feca524275f113bb0f
+checksum=376d039200639a52cba47fb04ffda39aad39715d9e988405fee0e5d60080d111

From 60efb772a3271f4370a4bfa611a2aebb7e5ca2f5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 13:39:53 -0400
Subject: [PATCH 1279/2561] New package: python3-zipfile-deflate64-0.2.0

---
 srcpkgs/python3-zipfile-deflate64/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-zipfile-deflate64/template

diff --git a/srcpkgs/python3-zipfile-deflate64/template b/srcpkgs/python3-zipfile-deflate64/template
new file mode 100644
index 000000000000..5f2c506b3e15
--- /dev/null
+++ b/srcpkgs/python3-zipfile-deflate64/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-zipfile-deflate64'
+pkgname=python3-zipfile-deflate64
+version=0.2.0
+revision=1
+wrksrc="zipfile-deflate64-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Extract Deflate64 ZIP archives with Python's zipfile API"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/brianhelba/zipfile-deflate64"
+distfiles="${PYPI_SITE}/z/zipfile-deflate64/zipfile-deflate64-${version}.tar.gz"
+checksum=875a3299de102edf1c17f8cafcc528b1ca80b62dc4814b9cb56867ec59fbfd18
+make_check=no # no tests included

From 89920fa2952524961c0e4b9c936f7665a119f2a4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 12:00:36 -0400
Subject: [PATCH 1280/2561] python3-py7zr: update to 0.18.3.

enable tests by ignoring/disabling pytest-benchmark

Closes: #36538 [via git-merge-pr]
---
 srcpkgs/python3-py7zr/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
index 7dcdc642f601..0113cb1dec27 100644
--- a/srcpkgs/python3-py7zr/template
+++ b/srcpkgs/python3-py7zr/template
@@ -1,20 +1,19 @@
 # Template file for 'python3-py7zr'
 pkgname=python3-py7zr
-version=0.16.4
-revision=2
+version=0.18.3
+revision=1
 wrksrc="py7zr-${version}"
 build_style=python3-module
+make_check_args="--ignore=tests/test_benchmark.py --noconftest"
 hostmakedepends="python3-setuptools_scm"
 depends="python3-texttable python3-pycryptodomex
  python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj
- python3-multivolumefile"
+ python3-multivolumefile python3-zipfile-deflate64"
+checkdepends="python3-pytest python3-pytest-timeout python3-py-cpuinfo $depends"
 short_desc="7zip in python3 with various compressions, and AES encryption"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/py7zr"
 changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/Changelog.rst"
 distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
-checksum=9b584dcd71b0e8c385cc66ae8e370bdbc29d1f07139d5cee770dc221fa338cf9
-# testing requires unpackaged modules:
-# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
-make_check=no
+checksum=d5bdc81536316f209a3ca4e1ce6e2ef11d8a519d613be47bcdd084bf655f400f

From deaa1da6b175180f7f0aca47dc0a6330d1119e49 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 23:34:55 +0100
Subject: [PATCH 1281/2561] libqalculate: update to 4.1.

previously 'qalculate', rearranged subpackages in a way which makes more sense.
---
 srcpkgs/libqalculate                         |  1 -
 srcpkgs/libqalculate-devel                   |  2 +-
 srcpkgs/{qalculate => libqalculate}/template | 27 ++++++++++----------
 srcpkgs/qalculate                            |  1 +
 4 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/libqalculate
 rename srcpkgs/{qalculate => libqalculate}/template (59%)
 create mode 120000 srcpkgs/qalculate

diff --git a/srcpkgs/libqalculate b/srcpkgs/libqalculate
deleted file mode 120000
index 2cf8203b7872..000000000000
--- a/srcpkgs/libqalculate
+++ /dev/null
@@ -1 +0,0 @@
-qalculate
\ No newline at end of file
diff --git a/srcpkgs/libqalculate-devel b/srcpkgs/libqalculate-devel
index 2cf8203b7872..2822077292df 120000
--- a/srcpkgs/libqalculate-devel
+++ b/srcpkgs/libqalculate-devel
@@ -1 +1 @@
-qalculate
\ No newline at end of file
+libqalculate
\ No newline at end of file
diff --git a/srcpkgs/qalculate/template b/srcpkgs/libqalculate/template
similarity index 59%
rename from srcpkgs/qalculate/template
rename to srcpkgs/libqalculate/template
index d24fcba07f06..0414d879df42 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/libqalculate/template
@@ -1,29 +1,28 @@
-# Template file for 'qalculate'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
-pkgname=qalculate
-version=3.20.1
-revision=3
-wrksrc="lib${pkgname}-${version}"
+# Template file for 'libqalculate'
+# NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt'
+pkgname=libqalculate
+version=4.1.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
 makedepends="libxml2-devel cln-devel readline-devel libcurl-devel icu-devel
  mpfr-devel"
-short_desc="Multi-purpose desktop calculator"
+short_desc="Multi-purpose desktop calculator library"
 maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
+changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=d943e5285bdc0b3cd77b8f7a10391d7c753fc19b0ddd48e5d4179decf709d6ff
 
-libqalculate_package() {
-	short_desc+=" - library files"
-	replaces="libqalculate-data>=0"
+qalculate_package() {
+	short_desc="Multi-purpose desktop calculator - CLI version"
 	pkg_install() {
-		vmove usr/lib/libqalculate.so.*
-		vmove usr/share/qalculate
+		vmove usr/bin/qalc
+		vmove usr/share/man/man1/qalc.1
 	}
 }
+
 libqalculate-devel_package() {
 	short_desc+=" - development files"
 	depends="libqalculate>=${version}_${revision} libxml2-devel cln-devel gmp-devel mpfr-devel"
diff --git a/srcpkgs/qalculate b/srcpkgs/qalculate
new file mode 120000
index 000000000000..2822077292df
--- /dev/null
+++ b/srcpkgs/qalculate
@@ -0,0 +1 @@
+libqalculate
\ No newline at end of file

From 6bc1f19fdba28b2966ad14fbaf685fc49a5cd4cc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 23:35:05 +0100
Subject: [PATCH 1282/2561] qalculate-gtk: update to 4.1.0.

---
 srcpkgs/qalculate-gtk/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..642bd9e5da80 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
+# NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-qt'
 pkgname=qalculate-gtk
-version=3.20.1
+version=4.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,5 +11,6 @@ short_desc="Multi-purpose desktop calculator - GTK+ version"
 maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
+changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=8bab126f4f87e9321572f10e9262bf095c7e72470d4b61e2a173d273673bdeca

From b9ef8f837e8badf3552decfcbb7a232e5ed3f217 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 23:35:06 +0100
Subject: [PATCH 1283/2561] qalculate-qt: update to 4.1.0.

Closes: #36179 [via git-merge-pr]
---
 srcpkgs/qalculate-qt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
index c960ee0eed61..d1995bdec691 100644
--- a/srcpkgs/qalculate-qt/template
+++ b/srcpkgs/qalculate-qt/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
+# NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-gtk'
 pkgname=qalculate-qt
-version=3.20.1
+version=4.1.0
 revision=1
 build_style=qmake
 hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
@@ -12,5 +11,6 @@ short_desc="Multi-purpose desktop calculator - QT version"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
+changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
+checksum=b54b880750bf75e756f074c1fb6a38dcfe23ad9a53954b83a8a86981c6cb824e

From 4e9e09885038a9f61abfb1f0b01a5e4a31034c0f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Thu, 14 Apr 2022 10:32:13 +0200
Subject: [PATCH 1284/2561] kalendar: update to 1.0.0, add deps, do check

---
 srcpkgs/kalendar/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kalendar/template b/srcpkgs/kalendar/template
index 0cdfbd27c3e4..6ab596817804 100644
--- a/srcpkgs/kalendar/template
+++ b/srcpkgs/kalendar/template
@@ -1,6 +1,6 @@
 # Template file for 'kalendar'
 pkgname=kalendar
-version=0.4.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -10,10 +10,17 @@ makedepends="qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel
  kcalendarcore-devel kconfigwidgets-devel kwindowsystem-devel kcoreaddons-devel
  kcontacts-devel kitemmodels-devel kxmlgui-devel knotifications-devel
  kiconthemes-devel kservice-devel akonadi5-devel akonadi-contacts-devel
- calendarsupport-devel eventviews-devel"
+ calendarsupport-devel eventviews-devel qqc2-desktop-style-devel kio-devel"
+depends="qqc2-desktop-style kdepim-runtime qt5-location kirigami2"
+checkdepends="dbus kdepim-runtime"
 short_desc="Calendar application using Akonadi"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/pim/kalendar"
 distfiles="${KDE_SITE}/kalendar/kalendar-${version}.tar.xz"
-checksum=d64b19caab3e1365cce58ae27b76417b515cf3a07777ed1905f82cfbf0d1947a
+checksum=ca4e840dc17a4e39111f5fb16bfcab29e34a10b9c840d22b81c52890f0c9fae0
+
+do_check() {
+	cd build
+	dbus-run-session ctest --output-on-failure --force-new-ctest-process
+}

From b572bc2ce56a7eacad961850c15bf6936e2cf34b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 14:53:31 +0200
Subject: [PATCH 1285/2561] xsnow: update to 3.5.0.

---
 srcpkgs/xsnow/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index a4f26810b137..198362e39ddf 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,18 +1,19 @@
 # Template file for 'xsnow'
 pkgname=xsnow
-version=3.4.4
+version=3.5.0
 revision=1
 build_style=gnu-configure
 build_helper=qemu
 hostmakedepends="pkg-config"
-makedepends="libXext-devel libXpm-devel libXt-devel libX11-devel gtk+3-devel"
+makedepends="gsl-devel gtk+3-devel libX11-devel libXext-devel libXpm-devel
+ libXt-devel"
 short_desc="Snow for your X11 sessions"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
 changelog="https://ratrabbit.nl/ratrabbit/xsnow/changelog/index.html"
 distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
-checksum=7cf332e40c4ab29164716a617ff22331cfd942d6b29634e12b16dc32dbce8d17
+checksum=884bb7478f839c120ebd031642fdae54b1f700352faac87b509a2ff221a57ff9
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then

From aa52bccffd7662631bc5194c7c65a3d6362e7613 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 16:32:43 +0200
Subject: [PATCH 1286/2561] mathcomp: mark nocross.

---
 srcpkgs/mathcomp/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 9bdea51dcf48..073327450800 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -12,6 +12,7 @@ license="CECILL-B"
 homepage="https://github.com/math-comp/math-comp"
 distfiles="https://github.com/math-comp/math-comp/archive/${pkgname}-${version}.tar.gz"
 checksum=d259cc95a2f8f74c6aa5f3883858c9b79c6e87f769bde9a415115fa4876ebb31
+nocross="ocaml"
 
 do_install() {
 	make install DESTDIR="${DESTDIR}" 'COQLIB:=$(shell coqtop -where)/'

From d54c247c79391ba06d0ac7bfd35250a7abaee2aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 17:19:17 +0200
Subject: [PATCH 1287/2561] linux5.10: update to 5.10.111.

---
 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 0912977245d4..28935f5c70d2 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.109
+version=5.10.111
 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=18fb22ecb249669ea775474aee614dcb0697cab299068074fd9f0bafa32113dc
+checksum=1831b3d8765592ce91e51441bb179d908f6bcfe8c78d03c2bec8c675c4a0ab1a
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 75934f29905d81f8535f3cf6aaa1bd2c368a7cd5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 17:21:09 +0200
Subject: [PATCH 1288/2561] linux5.15: update to 5.15.34.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 236c406a512b..9b2bc0aed3f9 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.32
+version=5.15.34
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- eacc8609dfcecb637f813ef4d2e13f48bdeb6143be929358f3b3cb4254f9c563"
+ b1a34733513b1080e763532101def34af73b4ca5e4f9b442c3e7d378a1598088"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From ee7a3f854967ca076601035323e67452ac14ead1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 17:30:18 +0200
Subject: [PATCH 1289/2561] linux5.16: update to 5.16.20.

---
 srcpkgs/linux5.16/files/arm64-dotconfig   | 3 ++-
 srcpkgs/linux5.16/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.16/files/ppc64-dotconfig   | 5 +++--
 srcpkgs/linux5.16/files/ppc64le-dotconfig | 5 +++--
 srcpkgs/linux5.16/files/x86_64-dotconfig  | 3 ++-
 srcpkgs/linux5.16/template                | 4 ++--
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig
index e4b9d7a609af..a5f05f407ac7 100644
--- a/srcpkgs/linux5.16/files/arm64-dotconfig
+++ b/srcpkgs/linux5.16/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.16.16 Kernel Configuration
+# Linux/arm64 5.16.20 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -3277,6 +3277,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 CONFIG_NET_DSA_REALTEK_SMI=m
 CONFIG_NET_DSA_SMSC_LAN9303=m
 CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
diff --git a/srcpkgs/linux5.16/files/i386-dotconfig b/srcpkgs/linux5.16/files/i386-dotconfig
index a7c014b0984b..bd1d764ded60 100644
--- a/srcpkgs/linux5.16/files/i386-dotconfig
+++ b/srcpkgs/linux5.16/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.16.11 Kernel Configuration
+# Linux/i386 5.16.20 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2911,6 +2911,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
@@ -10031,7 +10032,6 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_HEADERS_INSTALL is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_VMLINUX_MAP is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
diff --git a/srcpkgs/linux5.16/files/ppc64-dotconfig b/srcpkgs/linux5.16/files/ppc64-dotconfig
index b204dc8f8a72..b451a42c14c8 100644
--- a/srcpkgs/linux5.16/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.16.11 Kernel Configuration
+# Linux/powerpc 5.16.20 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc64-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -2922,6 +2922,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
diff --git a/srcpkgs/linux5.16/files/ppc64le-dotconfig b/srcpkgs/linux5.16/files/ppc64le-dotconfig
index 564de8e60967..ac8f74360c67 100644
--- a/srcpkgs/linux5.16/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64le-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.16.11 Kernel Configuration
+# Linux/powerpc 5.16.20 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc64le-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -2801,6 +2801,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
diff --git a/srcpkgs/linux5.16/files/x86_64-dotconfig b/srcpkgs/linux5.16/files/x86_64-dotconfig
index dbffc48dfc42..b8c5717c6eae 100644
--- a/srcpkgs/linux5.16/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.16/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.16.11 Kernel Configuration
+# Linux/x86_64 5.16.20 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2968,6 +2968,7 @@ CONFIG_NET_DSA_SJA1105=m
 # CONFIG_NET_DSA_XRS700X_I2C is not set
 # CONFIG_NET_DSA_XRS700X_MDIO is not set
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template
index 3f8c094faf24..71cb0aba3ca5 100644
--- a/srcpkgs/linux5.16/template
+++ b/srcpkgs/linux5.16/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.16'
 pkgname=linux5.16
-version=5.16.18
+version=5.16.20
 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="027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb
- 3bb88aa87c3f7788ad84ca5cbf3946ed9fbb3fddb9fca2458944fba5ebd2ab16"
+ 619cd0e39db62b581107cd71dbc1fc52654f94d4306fd02e806ab599f06d0cd8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 95b13cde6fa5d0f09257aee3c5b7034476e811f3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Thu, 14 Apr 2022 14:33:43 -0400
Subject: [PATCH 1290/2561] .github/workflows/build.yaml: only run on changes
 in srcpkgs/

---
 .github/workflows/build.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 503f1e1f4b68..2ae7a3e728fa 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -2,9 +2,13 @@ name: Check build
 
 on:
   pull_request:
+    paths:
+      - 'srcpkgs/**'
   push:
     branches:
       - 'ci-**'
+    paths:
+      - 'srcpkgs/**'
 
 jobs:
   # Lint changed templates.

From 25af251d69ff2651d7a4959e6052f5b6a35b8ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 14 Apr 2022 16:18:18 -0300
Subject: [PATCH 1291/2561] tiptop: fix homepage and distfiles

---
 srcpkgs/tiptop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tiptop/template b/srcpkgs/tiptop/template
index 140198908629..93c71833c5ac 100644
--- a/srcpkgs/tiptop/template
+++ b/srcpkgs/tiptop/template
@@ -8,8 +8,8 @@ makedepends="ncurses-devel libxml2-devel"
 short_desc="Performance monitoring tool using hardware counters"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
-homepage="http://tiptop.gforge.inria.fr/"
-distfiles="http://tiptop.gforge.inria.fr/releases/${pkgname}-${version}.tar.gz"
+homepage="https://gitlab.inria.fr/rohou/tiptop"
+distfiles="https://files.inria.fr/pacap/tiptop/tiptop-$version.tar.gz"
 checksum=51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 

From 31ab82db0568d242876ab4a35fa0c61823b7420f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Thu, 14 Apr 2022 13:04:10 -0400
Subject: [PATCH 1292/2561] github-cli: add manpages

fixes #36689
---
 srcpkgs/github-cli/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 35576bf8ee82..28c6acf2aaf5 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.8.0
-revision=1
+revision=2
 wrksrc="cli-${version}"
 build_style=go
 build_helper=qemu
@@ -24,6 +24,7 @@ pre_build() {
 }
 
 post_build() {
+	CGO_ENABLED=0 GOARCH="" go run script/build.go manpages
 	gh=$(find $GOPATH/bin -name gh)
 	for shell in bash fish zsh; do
 		vtargetrun $gh completion -s $shell > github-cli.$shell
@@ -33,6 +34,7 @@ post_build() {
 post_install() {
 	vlicense LICENSE
 
+	vcopy share/man usr/share
 	for shell in bash fish zsh; do
 		vcompletion github-cli.$shell $shell gh
 	done

From ff22a38b7c4cabc0adf8b4063613f101f6ebe1bf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 14 Apr 2022 16:34:08 +0200
Subject: [PATCH 1293/2561] pianobar: update to 2022.04.01.

---
 srcpkgs/pianobar/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index b7d991fef5a4..a9b29e91993f 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -1,6 +1,6 @@
 # Template file for 'pianobar'
 pkgname=pianobar
-version=2020.11.28
+version=2022.04.01
 revision=1
 build_style=gnu-makefile
 make_build_args="V=1"
@@ -11,8 +11,9 @@ short_desc="Free/open-source, console-based client for Pandora radio"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"
 homepage="https://6xq.net/pianobar/"
-distfiles="https://github.com/PromyLOPh/pianobar/archive/${version}.tar.gz"
-checksum=f8cdd564e2a12ee0740c54e8bc4028b328e9afb041d9ea40bcb762e08034b9e9
+changelog="https://raw.githubusercontent.com/PromyLOPh/pianobar/master/ChangeLog"
+distfiles="https://6xq.net/pianobar/pianobar-${version}.tar.bz2"
+checksum=1670b28865a8b82a57bb6dfea7f16e2fa4145d2f354910bb17380b32c9b94763
 
 post_install() {
 	vlicense COPYING

From de12a821142a11dc20c2c257e31c04fbcfd7309b Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 13 Apr 2022 10:56:22 +0200
Subject: [PATCH 1294/2561] go: update to 1.18.1.

---
 .../fix-ppc64le-startup-detection.patch       | 81 -------------------
 srcpkgs/go/template                           |  4 +-
 2 files changed, 2 insertions(+), 83 deletions(-)
 delete mode 100644 srcpkgs/go/patches/fix-ppc64le-startup-detection.patch

diff --git a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
deleted file mode 100644
index 6cc2ab337249..000000000000
--- a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 946167906ed8646c433c257b074a10e01f0a7dab Mon Sep 17 00:00:00 2001
-From: "Paul E. Murphy" <murp@ibm.com>
-Date: Tue, 22 Mar 2022 11:52:02 -0500
-Subject: [PATCH] runtime: make static/dynamic startup detection work with musl
- on ppc64le
-
-The glibc loader explicitly sets the first doubleword on the stack (R1)
-to $0 to indicate it was dynamically loaded.
-
-An ELFv2 ABI compliant loader will set R3/R4 to argc/argv when starting
-the process, and R13 to TLS. musl is not compliant. Instead it passes
-argc/argv like the kernel, but R3/R4 are in an undefined state and R13
-is valid.
-
-With the knowledge above, the startup code can be modified to
-dynamically handle all three cases when linked internally.
-
-Fixes #51787
-
-Change-Id: I5de33862c161900d9161817388bbc13a65fdc69c
-Reviewed-on: https://go-review.googlesource.com/c/go/+/394654
-Reviewed-by: Cherry Mui <cherryyz@google.com>
-Run-TryBot: Paul Murphy <murp@ibm.com>
-TryBot-Result: Gopher Robot <gobot@golang.org>
-Trust: Paul Murphy <murp@ibm.com>
-Trust: Lynn Boger <laboger@linux.vnet.ibm.com>
----
- src/runtime/rt0_linux_ppc64le.s | 32 +++++++++++++++++++++-----------
- 1 file changed, 21 insertions(+), 11 deletions(-)
-
-diff --git a/src/runtime/rt0_linux_ppc64le.s b/src/runtime/rt0_linux_ppc64le.s
-index 4f7c6e6c99f6..66f7e7b22a41 100644
---- a/go/src/runtime/rt0_linux_ppc64le.s
-+++ b/go/src/runtime/rt0_linux_ppc64le.s
-@@ -147,25 +147,35 @@ TEXT _main<>(SB),NOSPLIT,$-8
- 	// In a statically linked binary, the stack contains argc,
- 	// argv as argc string pointers followed by a NULL, envv as a
- 	// sequence of string pointers followed by a NULL, and auxv.
--	// There is no TLS base pointer.
-+	// The TLS pointer should be initialized to 0.
- 	//
--	// In a dynamically linked binary, r3 contains argc, r4
--	// contains argv, r5 contains envp, r6 contains auxv, and r13
-+	// In an ELFv2 compliant dynamically linked binary, R3 contains argc,
-+	// R4 contains argv, R5 contains envp, R6 contains auxv, and R13
- 	// contains the TLS pointer.
- 	//
--	// Figure out which case this is by looking at r4: if it's 0,
--	// we're statically linked; otherwise we're dynamically
--	// linked.
--	CMP	R0, R4
--	BNE	dlink
--
--	// Statically linked
-+	// When loading via glibc, the first doubleword on the stack points
-+	// to NULL a value. (that is *(uintptr)(R1) == 0). This is used to
-+	// differentiate static vs dynamicly linked binaries.
-+	//
-+	// If loading with the musl loader, it doesn't follow the ELFv2 ABI. It
-+	// passes argc/argv similar to the linux kernel, R13 (TLS) is
-+	// initialized, and R3/R4 are undefined.
-+	MOVD	(R1), R12
-+	CMP	R0, R12
-+	BEQ	tls_and_argcv_in_reg
-+
-+	// Arguments are passed via the stack (musl loader or a static binary)
- 	MOVD	0(R1), R3 // argc
- 	ADD	$8, R1, R4 // argv
-+
-+	// Did the TLS pointer get set? If so, don't change it (e.g musl).
-+	CMP	R0, R13
-+	BNE	tls_and_argcv_in_reg
-+
- 	MOVD	$runtime·m0+m_tls(SB), R13 // TLS
- 	ADD	$0x7000, R13
- 
--dlink:
-+tls_and_argcv_in_reg:
- 	BR	main(SB)
- 
- TEXT main(SB),NOSPLIT,$-8
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 58f0b0fc2485..44423832896f 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.18
+version=1.18.1
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6
+checksum=efd43e0f1402e083b73a03d444b7b6576bb4c539ac46208b63a916b69aca4088
 nostrip=yes
 noverifyrdeps=yes
 

From 99c340e5c32472b9f7bf4cb558b401ba871c6465 Mon Sep 17 00:00:00 2001
From: blackbeard420 <blackbeard@blackbeard420.me>
Date: Mon, 11 Apr 2022 18:03:40 -0400
Subject: [PATCH 1295/2561] kitty: update to 0.25.0

---
 srcpkgs/kitty/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 2c012bece185..7f4507a6f0aa 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.24.4
+version=0.25.0
 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=d8cd0b4967bb61e2a3427b57cb9f45f278813fb6b986f97b370c8c50aa058d18
+checksum=1a2c81bf46687d4141d3182dc984bbc0330791705af152199e5b5815dae933de
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
@@ -27,10 +27,6 @@ do_build() {
 	if [ "$CROSS_BUILD" ]; then
 		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
 	fi
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			vsed -e 's/pow10/pow_10/g' -i kitty/parser.c;;
-	esac
 	python3 setup.py linux-package --prefix=${DESTDIR}/usr --update-check-interval=0 --verbose
 }
 

From 8f84755de08efc7596d977fcf285644a66e716f3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 12 Apr 2022 02:44:55 +0200
Subject: [PATCH 1296/2561] budgie-desktop: update to 10.6.1.

---
 srcpkgs/budgie-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index a65c395c994b..02d90c307eaf 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
-version=10.6
+version=10.6.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
 distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=ba297a10b547e6d7bf164406750b5c5dae98a7524978b30b4ad3cba9624def9e
+checksum=b320cfdff8fab37286f0ca6669ef2907f551fa2a38cabd764cbf7b9e6181e166
 
 budgie-desktop-devel_package() {
 	short_desc+=" - development files"

From 376915ca95d90eafaa2528193e8742fc0fc21232 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 12 Apr 2022 02:44:58 +0200
Subject: [PATCH 1297/2561] budgie-screensaver: update to 5.0.1.

---
 srcpkgs/budgie-screensaver/patches/musl.patch | 12 ------------
 srcpkgs/budgie-screensaver/template           |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/budgie-screensaver/patches/musl.patch

diff --git a/srcpkgs/budgie-screensaver/patches/musl.patch b/srcpkgs/budgie-screensaver/patches/musl.patch
deleted file mode 100644
index 6f5c265f83ae..000000000000
--- a/srcpkgs/budgie-screensaver/patches/musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/subprocs.c b/src/subprocs.c
-index a378658..ba37650 100644
---- a/src/subprocs.c
-+++ b/src/subprocs.c
-@@ -36,6 +36,7 @@
- # define fork  vfork
- #endif /* VMS */
- 
-+#define _POSIX_SOURCE
- #include <signal.h>		/* for the signal names */
- 
- #include <glib.h>
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index b877543d33a0..16ed0e384e8a 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'budgie-screensaver'
 pkgname=budgie-screensaver
-version=5.0
+version=5.0.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/BuddiesOfBudgie/budgie-screensaver"
 distfiles="https://github.com/BuddiesOfBudgie/budgie-screensaver/releases/download/v${version}/budgie-screensaver-v${version}.tar.xz"
-checksum=611969a9f53e5d3148cad7445e95c94bfff6ea61c2f339969ecb5d9b51f6b871
+checksum=81fe6cccd938d9ef8d6cd46bbbad654ab8f7d108bbf1f96e9bf89b3ed5bafa0a

From b4c2a52930b4c6532f73413b11050774efce90ac Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 9 Apr 2022 20:54:53 -0400
Subject: [PATCH 1298/2561] libnma: update to 1.8.38.

---
 srcpkgs/libnma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index 148ae51d6de9..9d2a53119d01 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,6 +1,6 @@
 # Template file for 'libnma'
 pkgname=libnma
-version=1.8.36
+version=1.8.38
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libnma"
 changelog="https://gitlab.gnome.org/GNOME/libnma/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a
+checksum=5ed93eae18456ff5a8a4f408178c1ee198dc8d3a46c65f9075b101916e64e8b4
 replaces="libnm-gtk>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 107e3f4ebaf78d2b51ad38cf799744039fba5dea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 23:47:14 +0200
Subject: [PATCH 1299/2561] ocaml-findlib: remove ocamlbuild/META, it's part of
 ocamlbuild.

---
 srcpkgs/ocaml-findlib/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 04be12e64f51..20c083271677 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
 version=1.9.3
-revision=1
+revision=2
 wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
@@ -21,4 +21,6 @@ do_install() {
 	make prefix="$DESTDIR" install
 	vbin src/findlib/ocamlfind_opt
 	vlicense LICENSE
+
+	rm -rf ${DESTDIR}/usr/lib/ocaml/ocamlbuild
 }

From 5f5424ebff7092c0857af7e5b12e5d3aab7d4008 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Thu, 14 Apr 2022 19:30:06 -0400
Subject: [PATCH 1300/2561] .github/workflows/stale.yml: increase operations
 limit

By setting `ascending` to `true`, the most stale issues and PRs will be
caught first. By increasing the operations limit from the default (30)
to 250, more stale issues/PRs will be caught each run, increasing the
speed of the burndown.
---
 .github/workflows/stale.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 91ac19e4f638..9dbb76cd2a3d 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -17,3 +17,5 @@ jobs:
           days-before-stale: 90
           days-before-close: 14
           exempt-all-assignees: true
+          ascending: true
+          operations-per-run: 250

From 674a67bba8abde7c6489d1da49cd4d491107cc13 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 10 Apr 2022 04:47:01 +0200
Subject: [PATCH 1301/2561] .github/workflows/stale.yml: don't tag issues with
 request label as stale

Closes: #36609 [via git-merge-pr]
---
 .github/workflows/stale.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 9dbb76cd2a3d..160897fedef1 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -19,3 +19,4 @@ jobs:
           exempt-all-assignees: true
           ascending: true
           operations-per-run: 250
+          exempt-issue-labels: request

From 2b5419be165fed5a496ec1ad13ecd05eabe715de Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 14 Apr 2022 15:37:27 -0500
Subject: [PATCH 1302/2561] Signal-Desktop: update to 5.39.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 05be4f346a92..c02e6864b8a1 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.38.0
+version=5.39.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=da693cf3fd7535f8569bbdc6f64387e274daab49c2798cacc804c784e401115d
+checksum=0e5f237bd2db6f9e32d58d28c99727bdd069cffb6abf9c68b62c30c8a6ca83d9
 nostrip_files="signal-desktop"
 
 post_extract() {

From c11c8527230396378f06da1815af357a32067490 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Apr 2022 10:05:48 +0200
Subject: [PATCH 1303/2561] New package: Mousai-0.6.6

---
 srcpkgs/Mousai/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/Mousai/template

diff --git a/srcpkgs/Mousai/template b/srcpkgs/Mousai/template
new file mode 100644
index 000000000000..1b97a3851557
--- /dev/null
+++ b/srcpkgs/Mousai/template
@@ -0,0 +1,13 @@
+# Template file for 'Mousai'
+pkgname=Mousai
+version=0.6.6
+revision=1
+build_style=meson
+hostmakedepends="python3 gettext glib-devel pkg-config"
+depends="python3-gobject python3-requests libadwaita"
+short_desc="Identify any songs in seconds"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/SeaDve/Mousai"
+distfiles="https://github.com/SeaDve/Mousai/archive/refs/tags/v$version.tar.gz"
+checksum=a1e5cb29ad16405abcab8b5e1eec82fc170e5f535f8c55b57f18c80acb18a0ae

From 7c66e344992b748d2daf5a1fd44af393f2bb017a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:36:44 +0200
Subject: [PATCH 1304/2561] openssh: update to 9.0p1.

---
 srcpkgs/openssh/patches/ppoll_time64.patch | 26 ----------------------
 srcpkgs/openssh/template                   |  6 ++---
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/openssh/patches/ppoll_time64.patch

diff --git a/srcpkgs/openssh/patches/ppoll_time64.patch b/srcpkgs/openssh/patches/ppoll_time64.patch
deleted file mode 100644
index 199361c69024..000000000000
--- a/srcpkgs/openssh/patches/ppoll_time64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001
-From: Darren Tucker <dtucker@dtucker.net>
-Date: Sat, 26 Feb 2022 14:06:14 +1100
-Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox.
-
-Should fix sandbox violations on (some? at least i386 and armhf) 32bit
-Linux platforms.  Patch from chutzpahu at gentoo.org and cjwatson at
-debian.org via bz#3396.
----
- sandbox-seccomp-filter.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index 2e065ba3ed..4ce80cb2a7 100644
---- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = {
- #ifdef __NR_ppoll
- 	SC_ALLOW(__NR_ppoll),
- #endif
-+#ifdef __NR_ppoll_time64
-+	SC_ALLOW(__NR_ppoll_time64),
-+#endif
- #ifdef __NR_poll
- 	SC_ALLOW(__NR_poll),
- #endif
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index fe446fc131d4..02a2dec35f42 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=8.9p1
-revision=2
+version=9.0p1
+revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -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=fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7
+checksum=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a
 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 91776896fd974db4ed6d52247864b4b5f00629f6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:36:36 +0200
Subject: [PATCH 1305/2561] gnome-ssh-askpass: update to 9.0p1.

---
 srcpkgs/gnome-ssh-askpass/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index 558193ab2a19..692556f6836b 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
-version=8.9p1
-revision=2
+version=9.0p1
+revision=1
 wrksrc="openssh-${version}"
 build_wrksrc="contrib"
 build_style=gnu-makefile
@@ -13,7 +13,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=fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7
+checksum=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a
 
 alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass

From afcfec5d4607bdab129a48001f6c424430badf5d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:28:12 +0100
Subject: [PATCH 1306/2561] bctoolbox: update to 5.1.17.

---
 srcpkgs/bctoolbox/template | 4 ++--
 srcpkgs/bctoolbox/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/bctoolbox/update

diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 128235dc7d32..3d6b1bf167a0 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,6 +1,6 @@
 # Template file for 'bctoolbox'
 pkgname=bctoolbox
-version=5.0.55
+version=5.1.17
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://gitlab.linphone.org/BC/public/bctoolbox"
 distfiles="https://gitlab.linphone.org/BC/public/bctoolbox/-/archive/${version}/bctoolbox-${version}.tar.gz"
-checksum=64409771baf978f826eb052c0349fd9350b5aef8fd4135c988627dc6489ace81
+checksum=cbfea331dde994122a8bf04f05c03da6592aa53612f1da93eca3932d5460f231
 
 bctoolbox-devel_package() {
 	depends="bctoolbox-${version}_${revision}"
diff --git a/srcpkgs/bctoolbox/update b/srcpkgs/bctoolbox/update
new file mode 100644
index 000000000000..d81a9df130ed
--- /dev/null
+++ b/srcpkgs/bctoolbox/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/bctoolbox/-/tags

From f4f0ce2aa08dabed229fcb71b028f7866373800e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:28:23 +0100
Subject: [PATCH 1307/2561] belcard: update to 5.1.12.

---
 srcpkgs/belcard/template | 4 ++--
 srcpkgs/belcard/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/belcard/update

diff --git a/srcpkgs/belcard/template b/srcpkgs/belcard/template
index 292ec35f1891..1d117f953d91 100644
--- a/srcpkgs/belcard/template
+++ b/srcpkgs/belcard/template
@@ -1,6 +1,6 @@
 # Template file for 'belcard'
 pkgname=belcard
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=FALSE -DENABLE_UNIT_TESTS=FALSE"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belcard/-/archive/${version}/belcard-${version}.tar.gz"
-checksum=6b8f6188630eb5aeec671c8c9d417aa37b04a2d3b0b0944866bcbf6a3b2baec2
+checksum=529c6cc7edbc505495a850713020eb4d09a6aaa8d19983322f68ef0705081efe
 
 belcard-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/belcard/update b/srcpkgs/belcard/update
new file mode 100644
index 000000000000..b9a3c00d7d74
--- /dev/null
+++ b/srcpkgs/belcard/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/belcard/-/tags

From a147668ee8e444dac4a60ab4df335822df817cc7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:05 +0100
Subject: [PATCH 1308/2561] belle-sip: update to 5.1.12.

---
 srcpkgs/belle-sip/template | 4 ++--
 srcpkgs/belle-sip/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/belle-sip/update

diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index d1d46c11bd3b..ccf66d4b985c 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,6 +1,6 @@
 # Template file for 'belle-sip'
 pkgname=belle-sip
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DANTLR3_JAR_PATH=/usr/share/java/antlr3.jar -DENABLE_STRICT=OFF
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belle-sip/-/archive/${version}/belle-sip-${version}.tar.gz"
-checksum=f97e1dd8ab8eea4363187128d4ccf0223701c6efcd1e382226da25bd62ca3b24
+checksum=1a827db2d42eadd6825dc12f8c413ca3cf925e8084e5821d94f66d49b5c6f2db
 
 belle-sip-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/belle-sip/update b/srcpkgs/belle-sip/update
new file mode 100644
index 000000000000..f1c298cb081a
--- /dev/null
+++ b/srcpkgs/belle-sip/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/belle-sip/-/tags

From 7ddcb9a3601f404206ac7359ed3ffabeee7dda73 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:08 +0100
Subject: [PATCH 1309/2561] belr: update to 5.1.12.

---
 srcpkgs/belr/template | 4 ++--
 srcpkgs/belr/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/belr/update

diff --git a/srcpkgs/belr/template b/srcpkgs/belr/template
index 2e93a5492da2..299dc179a41b 100644
--- a/srcpkgs/belr/template
+++ b/srcpkgs/belr/template
@@ -1,6 +1,6 @@
 # Template file for 'belr'
 pkgname=belr
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=FALSE -DENABLE_TESTS=NO"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belr/-/archive/${version}/belr-${version}.tar.gz"
-checksum=6ef5ea9b730d5206cf278f6dd0dc0e3c87ab61a222f08cee50148b6868f6023b
+checksum=77f86470e12f8371a77c9b911705b585f97e0b983c31f33d529d3d19dc97fb56
 
 belr-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/belr/update b/srcpkgs/belr/update
new file mode 100644
index 000000000000..881207190078
--- /dev/null
+++ b/srcpkgs/belr/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/belr/-/tags

From 7710e410b2dd572d8025d809579eb8b083dc9610 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:15 +0100
Subject: [PATCH 1310/2561] bzrtp: update to 5.1.12.

---
 srcpkgs/bzrtp/template | 4 ++--
 srcpkgs/bzrtp/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/bzrtp/update

diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index 8f0b9823668d..463d7f82ec96 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,6 +1,6 @@
 # Template file for 'bzrtp'
 pkgname=bzrtp
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=FALSE -DENABLE_STATIC=FALSE"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/bzrtp/-/archive/${version}/bzrtp-${version}.tar.gz"
-checksum=53e94486fdb2bece03ebe0daf49b5d476cab977babec364cd04407aca25be4c2
+checksum=c1b44db05ab6d4df7a29d53c6aaff9a6cd79ce73d46d406f01d737e3c4cfb01e
 
 bzrtp-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bzrtp/update b/srcpkgs/bzrtp/update
new file mode 100644
index 000000000000..31738d52c44c
--- /dev/null
+++ b/srcpkgs/bzrtp/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/bzrtp/-/tags

From 6bd98e1b5f37417b49f8533a2a55559c437c259a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:19 +0100
Subject: [PATCH 1311/2561] linphone: update to 5.1.21.

---
 srcpkgs/linphone/template | 7 +++----
 srcpkgs/linphone/update   | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/linphone/update

diff --git a/srcpkgs/linphone/template b/srcpkgs/linphone/template
index c98b8c7e950e..d1af2d791c39 100644
--- a/srcpkgs/linphone/template
+++ b/srcpkgs/linphone/template
@@ -1,10 +1,9 @@
 # Template file for 'linphone'
 pkgname=linphone
-version=5.0.56
-# 5.0.57 requires an unreleased mediastreamer2
+version=5.1.21
 revision=1
-build_style="cmake"
 wrksrc="liblinphone-${version}"
+build_style="cmake"
 configure_args="-DENABLE_STRICT=FALSE
  -DENABLE_ADVANCED_IM=FALSE -DENABLE_DB_STORAGE=FALSE
  -DENABLE_LIME=NO -DENABLE_LIME_X3DH=NO -DENABLE_UNIT_TESTS=NO
@@ -21,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/liblinphone/-/archive/${version}/liblinphone-${version}.tar.gz"
-checksum=56bc789cda2507644477c1fad84169b3a39b9c26bad859763c6be66fb705c2db
+checksum=1bf7e6642bd36c8002291eda62109daac4c8f7125952e874b95969b02ab43405
 
 pre_build() {
 	echo "#define MS2_GIT_VERSION=unknown" > coreapi/gitversion.h
diff --git a/srcpkgs/linphone/update b/srcpkgs/linphone/update
new file mode 100644
index 000000000000..ccc0e69a4e33
--- /dev/null
+++ b/srcpkgs/linphone/update
@@ -0,0 +1,2 @@
+pkgname=liblinphone
+site=https://gitlab.linphone.org/BC/public/liblinphone/-/tags

From a51cbb3e084e9fa0e93e70989cea32696b5c9382 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:26 +0100
Subject: [PATCH 1312/2561] mediastreamer: update to 5.1.20.

---
 srcpkgs/mediastreamer/template | 4 ++--
 srcpkgs/mediastreamer/update   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/mediastreamer/update

diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index ba8b3dcc19e0..42f7cf4824ea 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,6 +1,6 @@
 # Template file for 'mediastreamer'
 pkgname=mediastreamer
-version=5.0.55
+version=5.1.20
 revision=1
 wrksrc="mediastreamer2-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org/technical-corner/mediastreamer2"
 distfiles="https://gitlab.linphone.org/BC/public/mediastreamer2/-/archive/${version}/mediastreamer2-${version}.tar.gz"
-checksum=4c15baa786f637c630afa7989ebdd8c8f9d424548cb02400e03fb5fe2d61e1ee
+checksum=f3f86284d48610c58cc5c104a56f392039495f3aded64b180c904877f42ecdb0
 
 mediastreamer-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/mediastreamer/update b/srcpkgs/mediastreamer/update
new file mode 100644
index 000000000000..9fcd24e296b0
--- /dev/null
+++ b/srcpkgs/mediastreamer/update
@@ -0,0 +1,2 @@
+pkgname=mediastreamer2
+site=https://gitlab.linphone.org/BC/public/mediastreamer2/-/tags

From f10f0ab0388f73c51c38e36378aa6d2b6515e07a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:36 +0100
Subject: [PATCH 1313/2561] ortp: update to 5.1.12.

---
 srcpkgs/ortp/template | 4 ++--
 srcpkgs/ortp/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ortp/update

diff --git a/srcpkgs/ortp/template b/srcpkgs/ortp/template
index f8b08f2b9be9..f5092b2eeff2 100644
--- a/srcpkgs/ortp/template
+++ b/srcpkgs/ortp/template
@@ -1,6 +1,6 @@
 # Template file for 'ortp'
 pkgname=ortp
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=OFF"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://www.linphone.org/technical-corner/ortp"
 distfiles="https://gitlab.linphone.org/BC/public/ortp/-/archive/${version}/ortp-${version}.tar.gz"
-checksum=2851d825f06ecfeeac921b73d7a932e2c8fcdbf49c83b09cd600db3e8025bc28
+checksum=dcd1b7c4876e8ca808c8c827329e90997bda51e8646399d426b529cddd727ee4
 
 ortp-devel_package() {
 	depends="bctoolbox-devel ortp-${version}_${revision}"
diff --git a/srcpkgs/ortp/update b/srcpkgs/ortp/update
new file mode 100644
index 000000000000..b1ec91983b27
--- /dev/null
+++ b/srcpkgs/ortp/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/ortp/-/tags

From aa05dcf31944b2171ac49513952115f804d68455 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 22:17:06 +0100
Subject: [PATCH 1314/2561] linphone-desktop: update to 4.4.1.

---
 srcpkgs/linphone-desktop/template | 6 +++---
 srcpkgs/linphone-desktop/update   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linphone-desktop/template b/srcpkgs/linphone-desktop/template
index 8699388aa9fc..44d72fc1466e 100644
--- a/srcpkgs/linphone-desktop/template
+++ b/srcpkgs/linphone-desktop/template
@@ -1,20 +1,20 @@
 # Template file for 'linphone-desktop'
 pkgname=linphone-desktop
-version=4.3.2
+version=4.4.1
 revision=1
 build_wrksrc="linphone-app" # The root cmake is glue code for their vendored libs
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-declarative"
 makedepends="bctoolbox-devel belcard-devel belle-sip-devel linphone-devel
  mediastreamer-devel qt5-declarative-devel qt5-quickcontrols2-devel
- qt5-svg-devel qt5-tools-devel"
+ qt5-svg-devel qt5-tools-devel qt5-webview-devel"
 depends="qt5>=5.9_1 qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects"
 short_desc="Linphone qt desktop"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.linphone.org/"
 distfiles="https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/${version}/linphone-desktop-${version}.tar.gz"
-checksum=dc7580816b5c289d9a4f21e9b3392a9b4a1a947c64ffbd6af504c8c01e3af111
+checksum=589e8ccc82e64fb1b7dbdc70b841240e02686079896d02bbe7dff782cc30bf8f
 replaces="linphone-gui>=0"
 CFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\""
 CXXFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\""
diff --git a/srcpkgs/linphone-desktop/update b/srcpkgs/linphone-desktop/update
index 7510d1a49c26..aaa59859d2f8 100644
--- a/srcpkgs/linphone-desktop/update
+++ b/srcpkgs/linphone-desktop/update
@@ -1 +1 @@
-pkgname=linphoneqt
+site=https://gitlab.linphone.org/BC/public/linphone-desktop/-/tags

From 1da2212c4bce416a6e18def882bd020c799bfb10 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 15 Apr 2022 16:19:20 +0200
Subject: [PATCH 1315/2561] lollypop: update to 1.4.33.

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 569c4e291772..02145a66a808 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.30
+version=1.4.33
 revision=1
 build_style=meson
 hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config"
@@ -14,4 +14,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/lollypop-${version}.tar.xz"
-checksum=393c3ed6431026b3214f380b7aa74ee31b054203855f7f5c928b1d25ad1b8ef5
+checksum=b1f806b3b844400131c7dc1bfad46843fc9ffcfbbf1fdeeab6bc348a74803529

From 367db42379f67fdcfb8768c8691a9ec6b003f031 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Apr 2022 16:44:11 +0200
Subject: [PATCH 1316/2561] cloud-hypervisor: update to 23.0.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index 3ecf069b2b07..c94d8e45e3fa 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=22.1
+version=23.0
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=73675ed730b5f23c4ce585918acff7496dcb585a4b91a672981c485bc7d94c37
+checksum=80f058d3ae00e23f4762fcc1c7091f22a14801c5913298f54fbfb8591da52ba9
 
 post_install() {
 	vlicense LICENSE-APACHE

From c5b273b6d93adf6d4588c6874bd73921e18ef858 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Apr 2022 16:46:43 +0200
Subject: [PATCH 1317/2561] libavif: update to 0.10.1.

---
 common/shlibs            | 2 +-
 srcpkgs/libavif/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fc5a031056fc..0d2a9fcc9b8e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4069,7 +4069,7 @@ libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
 libprimecount.so.7 primecount-7.2_1
 libprimesieve.so.9 primesieve-7.7_1
-libavif.so.13 libavif-0.9.3_1
+libavif.so.14 libavif-0.10.1_1
 libkdumpfile.so.9 libkdumpfile-0.4.1_1
 libamd.so.2 SuiteSparse-5.10.1_1
 libcholmod.so.3 SuiteSparse-5.10.1_1
diff --git a/srcpkgs/libavif/template b/srcpkgs/libavif/template
index 8b62eac56af1..6b210252322e 100644
--- a/srcpkgs/libavif/template
+++ b/srcpkgs/libavif/template
@@ -1,6 +1,6 @@
 # Template file for 'libavif'
 pkgname=libavif
-version=0.9.3
+version=0.10.1
 revision=1
 build_style=cmake
 configure_args="-DAVIF_BUILD_APPS=ON -DAVIF_BUILD_GDK_PIXBUF=ON
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/AOMediaCodec/libavif"
 distfiles="https://github.com/AOMediaCodec/libavif/archive/refs/tags/v${version}.tar.gz"
-checksum=bcd9a1f57f982a9615eb7e2faf87236dc88eb1d0c886f3471c7440ead605060d
+checksum=66e82854ceb84a3e542bc140a343bc90e56c68f3ecb4fff63e636c136ed9a05e
 
 post_install() {
 	vlicense LICENSE

From 8a8f30d60c5a3bf4bddc64abb3cbe98f177dbc41 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Apr 2022 16:47:01 +0200
Subject: [PATCH 1318/2561] efl: rebuild for libavif-0.10.1_1.

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index b7267b1905f9..714080ade250 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.26.2
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false

From af51e42be0d0fe87ff395cb94446a84deb9a4e7e Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 21 Aug 2021 17:52:02 +0200
Subject: [PATCH 1319/2561] memtest86+: switch to upstream binary

source built package has been reported to fail with more than 4GB of RAM.

Closes: #11691
---
 .../patches/00.memtest86+-5.01-no-scp.patch   |  10 --
 .../01.memtest86+-5.01-no-optimization.patch  |  18 ----
 .../02.memtest86+-5.01-compile-fix.patch      |  27 -----
 .../03.memtest86+-5.01-crash-fix.patch        | 100 ------------------
 .../04.memtest86+-5.01-fgnu89-inline.patch    |  15 ---
 ....memtest86+-5.01-fno-stack-protector.patch |  11 --
 srcpkgs/memtest86+/template                   |  20 ++--
 7 files changed, 7 insertions(+), 194 deletions(-)
 delete mode 100644 srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
 delete mode 100644 srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
 delete mode 100644 srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
 delete mode 100644 srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
 delete mode 100644 srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
 delete mode 100644 srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch

diff --git a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch b/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
deleted file mode 100644
index d998fc5a418c..000000000000
--- a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -21,7 +21,6 @@ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       
- 
- all: clean memtest.bin memtest 
--		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
- 
- # Link it statically once so I know I don't have undefined
- # symbols and then link it dynamically so I have full
diff --git a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch b/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
deleted file mode 100644
index d6453654a2b4..000000000000
--- a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/Makefile~	2014-01-08 01:30:11.355900076 +0000
-+++ b/Makefile	2014-01-08 01:31:19.387555469 +0000
-@@ -12,7 +12,7 @@
- AS=as -32
- CC=gcc
- 
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-+CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
- 	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
- 	
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
diff --git a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch b/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
deleted file mode 100644
index 348d5b152d22..000000000000
--- a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/io.h~	2013-08-10 02:01:58.000000000 +0000
-+++ b/io.h	2014-01-08 01:29:12.404465515 +0000
-@@ -31,7 +31,7 @@
-  */
- 
- #define __OUT1(s,x) \
--extern inline void __out##s(unsigned x value, unsigned short port) {
-+static inline void __out##s(unsigned x value, unsigned short port) {
- 
- #define __OUT2(s,s1,s2) \
- __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
-@@ -43,7 +43,7 @@
- __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
- 
- #define __IN1(s) \
--extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
-+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
- 
- #define __IN2(s,s1,s2) \
- __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
diff --git a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch b/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
deleted file mode 100644
index 56f40d7bcfa6..000000000000
--- a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/controller.c
-+++ b/controller.c
-@@ -2,6 +2,8 @@
-  * MemTest86+ V5 Specific code (GPL V2.0)
-  * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
-  * http://www.canardpc.com - http://www.memtest.org
-+ *
-+ * Edited by David McInnis Oct 4, 2014
-  */
- 
- //#include "defs.h"
-@@ -292,7 +294,7 @@ static void setup_nhm(void)
- 
- 	/* First, locate the PCI bus where the MCH is located */
- 
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
-@@ -327,7 +329,7 @@ static void setup_nhm32(void)
- 	ctrl.mode = ECC_NONE;
- 
- 	/* First, locate the PCI bus where the MCH is located */
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
-@@ -1424,7 +1426,7 @@ static void poll_fsb_amd64(void) {
- 	unsigned long dramchr;
- 	float clockratio;
- 	double dramclock;
--	unsigned int dummy[3];
-+	unsigned int dummy[4];
- 	int ram_type;
- 
- 	float coef = 10;
-@@ -2851,13 +2853,13 @@ static void poll_timings_nf4ie(void) {
- 
- static void poll_timings_i875(void) {
- 
--	ulong dev6, dev62;
-+	ulong dev6;
- 	ulong temp;
- 	float cas;
- 	int rcd, rp, ras, chan;
- 	long *ptr, *ptr2;
- 
--	pci_conf_read( 0, 6, 0, 0x40, 4, &dev62);
-+	pci_conf_read( 0, 6, 0, 0x40, 4, &dev6);
- 	ptr2=(long*)(dev6+0x68);
- 
- 	/* Read the MMR Base Address & Define the pointer */
---- a/init.c
-+++ b/init.c
-@@ -7,6 +7,8 @@
-  *
-  * Released under version 2 of the Gnu Public License.
-  * By Chris Brady
-+ *
-+ * Edited by David McInnis October 4, 2014
-  */
-  
- 
-@@ -914,7 +916,6 @@ void cpu_type(void)
- 			default:
- 				cprint(0, COL_MID, "Unknown Intel");
-  				break;
--			break;
- 		    }
- 
- 		}
---- a/main.c
-+++ b/main.c
-@@ -422,7 +422,7 @@ void test_start(void)
- 		//initialise_cpus();
- 		btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0);
- 		/* Draw the screen and get system information */
--	  init();
-+		init();
- 
- 		/* Set defaults and initialize variables */
- 		set_defaults();
-@@ -737,7 +737,7 @@ void test_start(void)
- 			    /* Do the same test for each CPU */
- 			    if (++cpu_sel >= act_cpus) 
- 			    	{
--	            cpu_sel = 0;
-+				cpu_sel = 0;
- 			        next_test();
- 			    	} else {
- 			        continue;
diff --git a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch b/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
deleted file mode 100644
index d044e72094cd..000000000000
--- a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-"Fix compilation of inline assembly with new gcc"
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/Makefile
-+++ b/Makefile
-@@ -13,7 +13,7 @@ AS=as -32
- CC=gcc
- 
- CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
--	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
-+	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -fgnu89-inline
- 	
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \
diff --git a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch b/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
deleted file mode 100644
index ddb3d5968682..000000000000
--- a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile	2019-03-29 16:41:29.629879497 +0100
-+++ b/Makefile	2019-03-29 16:41:55.351031244 +0100
-@@ -53,7 +53,7 @@
- 	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector test.c
- 
- random.o: random.c
- 	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index c4850769d62e..ecffaa62c401 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -1,26 +1,20 @@
 # Template file for 'memtest86+'
 pkgname=memtest86+
 version=5.01
-revision=5
-archs="i686 x86_64"
-short_desc="Advanced Memory Diagnostic Tool"
+revision=6
+archs="i686* x86_64*"
+short_desc="Advanced Memory Diagnostic Tool - upstream binary"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.memtest.org"
-distfiles="http://www.memtest.org/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039
+distfiles="https://www.memtest.org/download/${version}/memtest86+-${version}.bin.gz"
+checksum=78f6625b093de69537d99ed68e35b2a9e5d666504cb2533affab1967bd888fc8
 
+create_wrksrc=yes
 nostrip=yes
 noverifyrdeps=yes
 
-if [ "$XBPS_MACHINE" = "x86_64" ]; then
-	makedepends="gcc-multilib"
-fi
-
-do_build() {
-	make
-}
 do_install() {
-	vinstall memtest.bin 755 boot memtest86+
+	vinstall memtest86+-5.01.bin 755 boot memtest86+
 	vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d
 }

From cbed9a22d421356010d00b65df5538acefc2233e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 15 Apr 2022 11:44:22 -0400
Subject: [PATCH 1320/2561] neomutt: update to 20220415.

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 3e703630df81..75fadd569cb2 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20220408
+version=20220415
 revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
@@ -22,7 +22,7 @@ homepage="https://neomutt.org/"
 _test_files_hash=dc9fb32a701eb9dce4fda93c27da1d9b5be23231
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="bb138adb09b1f164fe690749e991a5505bf4f50b6ad478ffb085c609d5617cc7
+checksum="84982cb4c2fed63e90d71fab45faa90738bfc58050430606135cbd8924d94682
  bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947"
 python_version=3
 

From e6942fb07d124e4a1dccba9276e4f8e4dda7753b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 15 Apr 2022 18:17:14 +0200
Subject: [PATCH 1321/2561] chromium: update to 100.0.4896.127.

---
 srcpkgs/chromium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 96b34227a323..f655d29f3ba0 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=100.0.4896.60
+version=100.0.4896.127
 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="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc
+checksum=4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d
 
 lib32disabled=yes
 

From d13e568018fbd64e4bdabc09bb94d8c30f063429 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 17:45:38 +0200
Subject: [PATCH 1322/2561] libqalculate: update to 4.1.1.

---
 srcpkgs/libqalculate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libqalculate/template b/srcpkgs/libqalculate/template
index 0414d879df42..f0f03656d4c0 100644
--- a/srcpkgs/libqalculate/template
+++ b/srcpkgs/libqalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'libqalculate'
 # NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt'
 pkgname=libqalculate
-version=4.1.0
+version=4.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=d943e5285bdc0b3cd77b8f7a10391d7c753fc19b0ddd48e5d4179decf709d6ff
+checksum=b5611a91293be40fbe8723a81937e25ffb54e6ad6e60f282d044ed92f2d97002
 
 qalculate_package() {
 	short_desc="Multi-purpose desktop calculator - CLI version"

From 4ac07dc44993c8893b5198bc0a65617445691e09 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 17:45:44 +0200
Subject: [PATCH 1323/2561] qalculate-qt: update to 4.1.1.

---
 srcpkgs/qalculate-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
index d1995bdec691..0f1ac9de8561 100644
--- a/srcpkgs/qalculate-qt/template
+++ b/srcpkgs/qalculate-qt/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate-qt'
 # NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-gtk'
 pkgname=qalculate-qt
-version=4.1.0
+version=4.1.1
 revision=1
 build_style=qmake
 hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=b54b880750bf75e756f074c1fb6a38dcfe23ad9a53954b83a8a86981c6cb824e
+checksum=463e506331e8a49ec5ee355fe74da25d7a5cae945f5228081603be1f6d31f49f

From 01374914fd662062ba6eb7f4e5e3d7150c090eee Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 17:45:46 +0200
Subject: [PATCH 1324/2561] qalculate-gtk: update to 4.1.1.

---
 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 642bd9e5da80..ca1ab2e7dd98 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 'libqalculate' and 'qalculate-qt'
 pkgname=qalculate-gtk
-version=4.1.0
+version=4.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=8bab126f4f87e9321572f10e9262bf095c7e72470d4b61e2a173d273673bdeca
+checksum=8bf7dee899ba480e4f82c70cb374ed1229da28f7d3b9b475a089630a8eeb32e5

From 3b5106c01490c39aaa0819448b90dd88e09f49e2 Mon Sep 17 00:00:00 2001
From: lane-brain <lane@mailbox.org>
Date: Wed, 13 Apr 2022 23:00:33 -0400
Subject: [PATCH 1325/2561] New package: libgccjit-10.2.1_pre1

---
 common/shlibs                                |   1 +
 srcpkgs/libgccjit-devel                      |   1 +
 srcpkgs/libgccjit/files/gccgo-musl.patch     |   1 +
 srcpkgs/libgccjit/files/libgccjit-musl.patch |  63 ++++++
 srcpkgs/libgccjit/files/libgnarl-musl.patch  |   1 +
 srcpkgs/libgccjit/files/libssp-musl.patch    |   1 +
 srcpkgs/libgccjit/patches                    |   1 +
 srcpkgs/libgccjit/template                   | 216 +++++++++++++++++++
 srcpkgs/libgccjit/update                     |   2 +
 9 files changed, 287 insertions(+)
 create mode 120000 srcpkgs/libgccjit-devel
 create mode 120000 srcpkgs/libgccjit/files/gccgo-musl.patch
 create mode 100644 srcpkgs/libgccjit/files/libgccjit-musl.patch
 create mode 120000 srcpkgs/libgccjit/files/libgnarl-musl.patch
 create mode 120000 srcpkgs/libgccjit/files/libssp-musl.patch
 create mode 120000 srcpkgs/libgccjit/patches
 create mode 100644 srcpkgs/libgccjit/template
 create mode 100644 srcpkgs/libgccjit/update

diff --git a/common/shlibs b/common/shlibs
index 0d2a9fcc9b8e..ae4bb44c57a3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -59,6 +59,7 @@ libitm.so.1 libitm-4.7.3_1
 liblto_plugin.so.0 gcc-4.7.3_1
 libgcc_s.so.1 libgcc-4.4.0_1
 libgo.so.16 libgo-10.2.0_1
+libgccjit.so.0 libgccjit-10.2.1pre1_1
 libperl.so.5.34 perl-5.34.0_1
 libgmp.so.10 gmp-5.0.1_1
 libgmpxx.so.4 gmpxx-6.0.0_2
diff --git a/srcpkgs/libgccjit-devel b/srcpkgs/libgccjit-devel
new file mode 120000
index 000000000000..ad6b9f7639f3
--- /dev/null
+++ b/srcpkgs/libgccjit-devel
@@ -0,0 +1 @@
+libgccjit
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/files/gccgo-musl.patch b/srcpkgs/libgccjit/files/gccgo-musl.patch
new file mode 120000
index 000000000000..a093af857738
--- /dev/null
+++ b/srcpkgs/libgccjit/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/files/libgccjit-musl.patch b/srcpkgs/libgccjit/files/libgccjit-musl.patch
new file mode 100644
index 000000000000..d2ed16928c82
--- /dev/null
+++ b/srcpkgs/libgccjit/files/libgccjit-musl.patch
@@ -0,0 +1,63 @@
+diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
+index 5bccf591a..35f5e35ef 100644
+--- a/gcc/jit/jit-playback.c
++++ b/gcc/jit/jit-playback.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "diagnostic.h"
+ #include "stmt.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-playback.h"
+ #include "jit-result.h"
+ #include "jit-builtins.h"
+diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
+index a237d574f..5785e3269 100644
+--- a/gcc/jit/jit-recording.c
++++ b/gcc/jit/jit-recording.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "pretty-print.h"
+ #include "toplev.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-builtins.h"
+ #include "jit-recording.h"
+ #include "jit-playback.h"
+diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
+index f9c33c63c..75f21d275 100644
+--- a/gcc/jit/libgccjit.c
++++ b/gcc/jit/libgccjit.c
+@@ -18,13 +18,13 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+ #include "timevar.h"
+ #include "typed-splay-tree.h"
+ #include "cppbuiltin.h"
+-#include <pthread.h>
+ 
+ #include "libgccjit.h"
+ #include "jit-recording.h"
diff --git a/srcpkgs/libgccjit/files/libgnarl-musl.patch b/srcpkgs/libgccjit/files/libgnarl-musl.patch
new file mode 120000
index 000000000000..33ccc9789f93
--- /dev/null
+++ b/srcpkgs/libgccjit/files/libgnarl-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/files/libssp-musl.patch b/srcpkgs/libgccjit/files/libssp-musl.patch
new file mode 120000
index 000000000000..37a7489360f8
--- /dev/null
+++ b/srcpkgs/libgccjit/files/libssp-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/patches b/srcpkgs/libgccjit/patches
new file mode 120000
index 000000000000..c42218ef09df
--- /dev/null
+++ b/srcpkgs/libgccjit/patches
@@ -0,0 +1 @@
+../gcc/patches
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/template b/srcpkgs/libgccjit/template
new file mode 100644
index 000000000000..6f1d6256dcd6
--- /dev/null
+++ b/srcpkgs/libgccjit/template
@@ -0,0 +1,216 @@
+# Template file for 'libgccjit'
+# Revbump libtool when updating gcc, since it hardcodes some internal compiler paths
+# which use the version number.
+
+pkgname=libgccjit
+# we are using a 10-stable git snapshot alpine is using in order
+# to get regression fixes not yet incorporate into a stable release
+# it should be possible to switch back to stable with 10.3 or 11
+version=10.2.1pre1
+revision=1
+_patchver="${version%pre*}"
+_minorver="${_patchver%.*}"
+_majorver="${_minorver%.*}"
+_gmp_version=6.2.0
+_mpfr_version=4.1.0
+_mpc_version=1.1.0
+_isl_version=0.21
+wrksrc=gcc-${version/pre/_pre}
+short_desc="Just-In-Time Compilation library for GCC"
+maintainer="Lane Biocini <lane@mailbox.org>"
+homepage="https://gcc.gnu.org"
+license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
+# *-musl builders have issues fetching https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
+distfiles="
+ https://dev.alpinelinux.org/~nenolod/gcc-${version/pre/_pre}.tar.xz
+ https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz
+ ${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
+ ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
+ ${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2"
+checksum="772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526
+ 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f
+ 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
+ d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859"
+nopie=yes
+lib32disabled=yes
+makedepends="zlib-devel"
+hostmakedepends="tar texinfo perl flex"
+depends="gcc"
+checkdepends="dejagnu"
+
+post_extract() {
+	mv ${XBPS_BUILDDIR}/gmp-${_gmp_version} ${wrksrc}/gmp
+	mv ${XBPS_BUILDDIR}/mpfr-${_mpfr_version} ${wrksrc}/mpfr
+	mv ${XBPS_BUILDDIR}/mpc-${_mpc_version} ${wrksrc}/mpc
+	mv ${XBPS_BUILDDIR}/isl-${_isl_version} ${wrksrc}/isl
+}
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		for p in ${FILESDIR}/*-musl.patch; do
+			patch -p1 -i $p
+		done
+	fi
+}
+
+do_configure() {
+	# Define triplet for gcc build target
+	case "$XBPS_TARGET_MACHINE" in
+		i686) _target_triplet="i686-pc-linux-gnu";;
+		i686-musl) _target_triplet="i686-linux-musl";;
+		x86_64) _target_triplet="x86_64-unknown-linux-gnu";;
+		x86_64-musl) _target_triplet="x86_64-linux-musl";;
+		armv5tel) _target_triplet="arm-linux-gnueabi";;
+		armv5tel-musl) _target_triplet="arm-linux-musleabi";;
+		armv6l) _target_triplet="arm-linux-gnueabihf";;
+		armv7l) _target_triplet="armv7l-linux-gnueabihf";;
+		armv6l-musl) _target_triplet="arm-linux-musleabihf";;
+		armv7l-musl) _target_triplet="armv7l-linux-musleabihf";;
+		aarch64) _target_triplet="aarch64-linux-gnu";;
+		aarch64-musl) _target_triplet="aarch64-linux-musl";;
+		ppc) _target_triplet="powerpc-linux-gnu";;
+		ppc-musl) _target_triplet="powerpc-linux-musl";;
+		ppcle) _target_triplet="powerpcle-linux-gnu";;
+		ppcle-musl) _target_triplet="powerpcle-linux-musl";;
+		ppc64le) _target_triplet="powerpc64le-linux-gnu";;
+		ppc64le-musl) _target_triplet="powerpc64le-linux-musl";;
+		ppc64) _target_triplet="powerpc64-linux-gnu";;
+		ppc64-musl) _target_triplet="powerpc64-linux-musl";;
+		mips-musl) _target_triplet="mips-linux-musl";;
+		mipshf-musl) _target_triplet="mips-linux-muslhf";;
+		mipsel-musl) _target_triplet="mipsel-linux-musl";;
+		mipselhf-musl) _target_triplet="mipsel-linux-muslhf";;
+	esac
+
+	local _langs _args _hash
+	_hash=gnu
+	case "$XBPS_TARGET_MACHINE" in
+		mipselhf-musl) _args+=" --with-arch=mips32r2 --with-float=hard"; _hash=sysv;;
+		mipsel-musl) _args+=" --with-arch=mips32r2 --with-float=soft"; _hash=sysv;;
+		mipshf-musl) _args+=" --with-arch=mips32r2 --with-float=hard";;
+		mips-musl) _args+=" --with-arch=mips32r2 --with-float=soft";;
+		armv5*) _args+=" --with-arch=armv5te --with-float=soft";;
+		armv6l*) _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard";;
+		armv7l*) _args+=" --with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard";;
+		aarch64*) _args+=" --with-arch=armv8-a";;
+		ppc64le*) _args+=" --with-abi=elfv2 --enable-secureplt --enable-targets=powerpcle-linux";;
+		ppc64*) _args+=" --with-abi=elfv2 --enable-secureplt --enable-targets=powerpc-linux";;
+		ppc*) _args+=" --enable-secureplt";;
+	esac
+
+	# fix: unknown long double size, cannot define BFP_FMT
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*-musl) _args+=" --disable-decimal-float";;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		export CC_FOR_TARGET="$CC"
+		export GCC_FOR_TARGET="$CC"
+		export CXX_FOR_TARGET="$CXX"
+
+		_args+=" --host=$XBPS_CROSS_TRIPLET"
+		_args+=" --with-build-sysroot=${XBPS_CROSS_BASE}"
+	elif [ -z "$CHROOT_READY" ]; then
+		export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib${XBPS_TARGET_WORDSIZE}"
+		_args+=" --build=${_target_triplet}"
+	else
+		_args+=" --build=${_target_triplet}"
+	fi
+
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		_args+=" --disable-gnu-unique-object"
+		_args+=" --disable-symvers"
+		_args+=" libat_cv_have_ifunc=no"
+	else
+		_args+=" --enable-gnu-unique-object"
+	fi
+
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*) _args+=" --disable-vtable-verify";;
+		*) _args+=" --enable-vtable-verify";;
+	esac
+
+	export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}"
+	export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}"
+
+	# Disable explicit -fno-PIE, gcc will figure this out itself.
+	export CFLAGS="${CFLAGS//-fno-PIE/}"
+	export CXXFLAGS="${CXXFLAGS//-fno-PIE/}"
+	export LDFLAGS="${LDFLAGS//-no-pie/}"
+
+	# Needs explicit -fPIC
+	export CFLAGS+=" -fPIC"
+	export CXXFLAGS+=" -fPIC"
+
+	_args+=" --prefix=/usr"
+	_args+=" --mandir=/usr/share/man"
+	_args+=" --infodir=/usr/share/info"
+	_args+=" --libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+	_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+	_args+=" --enable-threads=posix"
+	_args+=" --enable-__cxa_atexit"
+	_args+=" --disable-multilib"
+	_args+=" --with-system-zlib"
+	_args+=" --enable-shared"
+	_args+=" --enable-lto"
+	_args+=" --enable-plugins"
+	_args+=" --enable-linker-build-id"
+	_args+=" --disable-werror"
+	_args+=" --disable-nls"
+	_args+=" --enable-default-pie"
+	_args+=" --enable-default-ssp"
+	_args+=" --enable-checking=release"
+	_args+=" --disable-libstdcxx-pch"
+	_args+=" --with-isl"
+	_args+=" --with-linker-hash-style=$_hash"
+	_args+=" --disable-sjlj-exceptions"
+	_args+=" --disable-target-libiberty"
+
+	# libgccjit compilation specific
+	_args+=" --enable-host-shared"
+	_args+=" --disable-bootstrap"
+	_args+=" --disable-libquadmath"
+	_args+=" --disable-libquadmath-support"
+	_args+=" --disable-libgomp"
+	_args+=" --disable-liboffloadmic"
+	_args+=" --disable-libada"
+	_args+=" --disable-libvtv"
+	_args+=" --disable-libsanitizer"
+	_args+=" --with-bugurl='https://github.com/void-linux/void-packages/issues'"
+
+	mkdir -p build
+	cd build
+
+	# If we are checking packages, we need to have c++ compiled
+	[ -z "$XBPS_CHECK_PKGS" ] && _langs="jit" || _langs="jit,c++"
+	_args+=" --enable-languages=${_langs}"
+	CONFIG_SHELL=/bin/bash \
+		${wrksrc}/configure ${_args}
+}
+
+do_build() {
+	make -C build ${makejobs}
+}
+
+do_check() {
+	make -C build/gcc check-jit RUNTESTFLAGS="-v -v -v"
+}
+
+do_install() {
+	make -C build/gcc DESTDIR=${DESTDIR} jit.install-common jit.install-info
+}
+
+post_install() {
+	vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
+}
+
+libgccjit-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+		vmove usr/share/info
+	}
+}
diff --git a/srcpkgs/libgccjit/update b/srcpkgs/libgccjit/update
new file mode 100644
index 000000000000..fb8dd58f2044
--- /dev/null
+++ b/srcpkgs/libgccjit/update
@@ -0,0 +1,2 @@
+site="https://gcc.gnu.org/releases.html"
+pattern="GCC \K[\d.]+(?=\<)"

From 4311f48aa99d732f75e57de2cc150763507ee892 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 15:54:16 +0200
Subject: [PATCH 1326/2561] emacs: enable support for native-compilation.

This enables native-compilation and provides precompiled elisp files
for emacs-x11 and emacs-gtk3.  The plain console emacs stays without
support for native compilation to keep it lean, as native-compilation
pulls in libgccjit (27MB) and gcc (172MB + deps)
as well as emacs-common-eln (15MB).

On slow machines, native compilation can be disabled by setting
(setq comp-deferred-compilation nil)
in your .emacs.
---
 srcpkgs/emacs-common-eln |  1 +
 srcpkgs/emacs/template   | 46 +++++++++++++++++++++++++++++++---------
 2 files changed, 37 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/emacs-common-eln

diff --git a/srcpkgs/emacs-common-eln b/srcpkgs/emacs-common-eln
new file mode 120000
index 000000000000..a7642dd168d6
--- /dev/null
+++ b/srcpkgs/emacs-common-eln
@@ -0,0 +1 @@
+emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 644e44cf4d06..aae0e3f6d225 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,13 +1,14 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=28.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
  $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
  $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)
- $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)"
+ $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)
+ $(vopt_with nativecomp native-compilation)"
 hostmakedepends="pkg-config tar"
 makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
  dbus-devel acl-devel
@@ -17,7 +18,8 @@ makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
  $(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
  $(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel)
  $(vopt_if json jansson-devel) $(vopt_if harfbuzz harfbuzz-devel)
- $(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)"
+ $(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)
+ $(vopt_if nativecomp libgccjit-devel)"
 depends="emacs-common-${version}_${revision}"
 short_desc="GNU Emacs editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -29,12 +31,16 @@ nocross=yes
 nopie=yes
 
 # Package build options
-build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp"
-desc_option_xpm="Enable support for XPM images"
-desc_option_sound="Enable support for sound"
+build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp nativecomp"
+desc_option_cairo="Enable support for drawing with Cairo"
+desc_option_gmp="Enable support for big numbers using GMP"
+desc_option_json="Enable support for native JSON parsing"
 desc_option_m17n="Enable support for m17n multilingual text processing"
-build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n png sound
- svg tiff xml xpm"
+desc_option_nativecomp="Enable support for native compilation"
+desc_option_sound="Enable support for sound"
+desc_option_xpm="Enable support for XPM images"
+build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp
+ png sound svg tiff xml xpm"
 
 pre_configure() {
 	# Just configuring in different directories results in
@@ -47,7 +53,8 @@ pre_configure() {
 
 do_configure() {
 	cd $wrksrc/nox
-	./configure --without-x $(vopt_with dbus) ${configure_args}
+	./configure --without-x $(vopt_with dbus) ${configure_args} \
+		--without-native-compilation
 
 	cd $wrksrc/x11
 	./configure --with-x-toolkit=athena --without-toolkit-scroll-bars \
@@ -60,12 +67,13 @@ do_configure() {
 
 do_build() {
 	make ${makejobs} -C nox
-	make ${makejobs} -C x11
+	make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
 	make ${makejobs} -C gtk3
 }
 
 do_install() {
 	make DESTDIR=$DESTDIR -C ${wrksrc}/nox install
+	make DESTDIR=$DESTDIR -C ${wrksrc}/x11 install-eln
 	rm -f ${DESTDIR}/usr/bin/ctags
 	rm -f ${DESTDIR}/usr/lib/systemd/user/emacs.service
 	rm -f ${DESTDIR}/usr/share/man/man1/ctags.1*
@@ -84,8 +92,23 @@ emacs-common_package() {
 	}
 }
 
+emacs-common-eln_package() {
+	short_desc+=" - common precompiled elisp"
+	if [ -z "$build_option_nativecomp" ]; then
+		build_style=meta
+	fi
+	pkg_install() {
+		if [ "$build_option_nativecomp" ]; then
+			vmove usr/lib/emacs
+		fi
+	}
+}
+
 emacs-x11_package() {
 	depends="emacs-common-${version}_${revision}"
+	if [ "$build_option_nativecomp" ]; then
+		depends+=" emacs-common-eln-${version}_${revision}"
+	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - X11 version"
@@ -99,6 +122,9 @@ emacs-x11_package() {
 
 emacs-gtk3_package() {
 	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
+	if [ "$build_option_nativecomp" ]; then
+		depends+=" emacs-common-eln-${version}_${revision}"
+	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - GTK+3 version"

From ffb6f9dd3d68e966fd5cc71efcb653767c0cefae Mon Sep 17 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, 16 Apr 2022 23:00:09 +0700
Subject: [PATCH 1327/2561] chroot-git: update to 2.35.2.

---
 srcpkgs/chroot-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 08a014086a96..94331ab41a8d 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.35.1
+version=2.35.2
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
@@ -10,7 +10,7 @@ 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=d768528e6443f65a203036266f1ca50f9d127ba89751e32ead37117ed9191080
+checksum=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From ac96a8763fa33a5cc66064dc054d5804c346e20a Mon Sep 17 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, 16 Apr 2022 22:59:30 +0700
Subject: [PATCH 1328/2561] git: update to 2.35.2.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 929472b982b2..865c814fca51 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.35.1
+version=2.35.2
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -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=d768528e6443f65a203036266f1ca50f9d127ba89751e32ead37117ed9191080
+checksum=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 534d93f8c40c548c8b0a708cb326d749bf119239 Mon Sep 17 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, 16 Apr 2022 23:05:27 +0700
Subject: [PATCH 1329/2561] chroot-git: update to 2.35.3.

---
 srcpkgs/chroot-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 94331ab41a8d..18efb65c4f67 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.35.2
+version=2.35.3
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
@@ -10,7 +10,7 @@ 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=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
+checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From d38c4e8dc3ca5679149952618ae8900f7a431aea Mon Sep 17 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, 16 Apr 2022 23:05:31 +0700
Subject: [PATCH 1330/2561] git: update to 2.35.3.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 865c814fca51..8b05a0f58024 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.35.2
+version=2.35.3
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -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=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
+checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From e58512eff1a361316d90985a53264a7cc1b24ae0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 20:17:28 +0300
Subject: [PATCH 1331/2561] checkbashisms: update to 2.22.1.

---
 srcpkgs/checkbashisms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template
index 69f7fbfbb7dd..1da339030ffe 100644
--- a/srcpkgs/checkbashisms/template
+++ b/srcpkgs/checkbashisms/template
@@ -1,6 +1,6 @@
 # Template file for 'checkbashisms'
 pkgname=checkbashisms
-version=2.21.7
+version=2.22.1
 revision=1
 wrksrc="devscripts-${version}"
 depends="perl"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/devscripts"
 changelog="https://salsa.debian.org/debian/devscripts/-/raw/master/debian/changelog"
 distfiles="${DEBIAN_SITE}/main/d/devscripts/devscripts_${version}.tar.xz"
-checksum=b03ae9a3214ea5492aa51519deddf0d46f8e59996b66aea1ed0dc1a1c5466ab1
+checksum=35dd5e6029d27be35b96e8c6e38b8aa6fba791a21371dac2de0f8cdee5fe33d5
 
 pre_install() {
 	vsed -i "s|###VERSION###|${version}|" scripts/checkbashisms.pl

From f3573670d4c29bf8bf41194718cd58592fd3e5f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Apr 2022 18:31:18 +0200
Subject: [PATCH 1332/2561] emacs: remove emacs-common-eln, put eln into binary
 packages.

The builds have different hashes, so the .eln files cannot be shared.
---
 srcpkgs/emacs-common-eln |  1 -
 srcpkgs/emacs/template   | 28 +++++-----------------------
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 120000 srcpkgs/emacs-common-eln

diff --git a/srcpkgs/emacs-common-eln b/srcpkgs/emacs-common-eln
deleted file mode 120000
index a7642dd168d6..000000000000
--- a/srcpkgs/emacs-common-eln
+++ /dev/null
@@ -1 +0,0 @@
-emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index aae0e3f6d225..b3130b1198d5 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=28.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
@@ -68,12 +68,11 @@ do_configure() {
 do_build() {
 	make ${makejobs} -C nox
 	make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
-	make ${makejobs} -C gtk3
+	make ${makejobs} -C gtk3 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
 }
 
 do_install() {
 	make DESTDIR=$DESTDIR -C ${wrksrc}/nox install
-	make DESTDIR=$DESTDIR -C ${wrksrc}/x11 install-eln
 	rm -f ${DESTDIR}/usr/bin/ctags
 	rm -f ${DESTDIR}/usr/lib/systemd/user/emacs.service
 	rm -f ${DESTDIR}/usr/share/man/man1/ctags.1*
@@ -84,6 +83,7 @@ do_install() {
 
 emacs-common_package() {
 	short_desc+=" - common files"
+	replaces="emacs-common-eln>=0"
 	pkg_install() {
 		vmove usr/share/emacs
 		vmove usr/share/man
@@ -92,23 +92,8 @@ emacs-common_package() {
 	}
 }
 
-emacs-common-eln_package() {
-	short_desc+=" - common precompiled elisp"
-	if [ -z "$build_option_nativecomp" ]; then
-		build_style=meta
-	fi
-	pkg_install() {
-		if [ "$build_option_nativecomp" ]; then
-			vmove usr/lib/emacs
-		fi
-	}
-}
-
 emacs-x11_package() {
 	depends="emacs-common-${version}_${revision}"
-	if [ "$build_option_nativecomp" ]; then
-		depends+=" emacs-common-eln-${version}_${revision}"
-	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - X11 version"
@@ -116,15 +101,12 @@ emacs-x11_package() {
 		make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/x11 install
 		rm -f ${PKGDESTDIR}/usr/bin/ctags
 		rm -rf ${PKGDESTDIR}/usr/share
-		rm -rf ${PKGDESTDIR}/usr/lib
+		rm -rf ${PKGDESTDIR}/usr/lib/systemd
 	}
 }
 
 emacs-gtk3_package() {
 	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
-	if [ "$build_option_nativecomp" ]; then
-		depends+=" emacs-common-eln-${version}_${revision}"
-	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - GTK+3 version"
@@ -132,6 +114,6 @@ emacs-gtk3_package() {
 		make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk3 install
 		rm -f ${PKGDESTDIR}/usr/bin/ctags
 		rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info}
-		rm -rf ${PKGDESTDIR}/usr/lib
+		rm -rf ${PKGDESTDIR}/usr/lib/systemd
 	}
 }

From af44b115d7ae9940547f5a0d4a32351db714f974 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Apr 2022 20:17:15 +0200
Subject: [PATCH 1333/2561] gzip: restore zless.

Don't depend on less to reduce bootstrap size.
---
 srcpkgs/gzip/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template
index 037dd3b27a4c..a01bc8cc5114 100644
--- a/srcpkgs/gzip/template
+++ b/srcpkgs/gzip/template
@@ -1,9 +1,10 @@
 # Template file for 'gzip'
 pkgname=gzip
 version=1.12
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
+configure_args="ac_cv_prog_LESS=less"
 short_desc="GNU compression utility (replacement for compress)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 59453a587d7dec153fcb8cf8fb5c68d6a3b4a246 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sat, 16 Apr 2022 14:39:39 -0400
Subject: [PATCH 1334/2561] common/travis/fetch_upstream.sh: fix CI for new git
 version

---
 common/travis/fetch_upstream.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index 45315563e0b1..5c0256fdbe17 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -8,5 +8,8 @@ elif command -v git >/dev/null 2>&1; then
 	GIT_CMD=$(command -v git)
 fi
 
+# required by git 2.35.2+
+$GIT_CMD config --global --add safe.directory /__w/void-packages/void-packages
+
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
 $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From 1acd655227d82f1b133f533884d3673284fb5161 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Apr 2022 05:25:00 +0200
Subject: [PATCH 1335/2561] emacs: disable nativecomp on 32-bit ppc

---
 srcpkgs/emacs/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index b3130b1198d5..d876ebfe1682 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -39,9 +39,15 @@ desc_option_m17n="Enable support for m17n multilingual text processing"
 desc_option_nativecomp="Enable support for native compilation"
 desc_option_sound="Enable support for sound"
 desc_option_xpm="Enable support for XPM images"
-build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp
+build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n
  png sound svg tiff xml xpm"
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) build_options_default+=" nativecomp";;
+	ppc*) ;; # assembler errors
+	*) build_options_default+=" nativecomp";;
+esac
+
 pre_configure() {
 	# Just configuring in different directories results in
 	# spurious emacs rebuilds with incompatible build numbers.

From 62e482edcf9c982d7814bfa5f5860bda6b3b0b9c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Apr 2022 21:06:11 +0300
Subject: [PATCH 1336/2561] xfce4-terminal: update to 1.0.1.

---
 srcpkgs/xfce4-terminal/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index b25c1f0ab755..07c3bfaa46e5 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
-version=0.8.10
-revision=3
+version=1.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,5 +11,6 @@ short_desc="Modern terminal emulator primarly for the Xfce desktop environment"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/xfce4-terminal/start"
+changelog="https://gitlab.xfce.org/apps/xfce4-terminal/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=7a3337c198e01262a0412384823185753ac8a0345be1d6776a7e9bbbcbf33dc7
+checksum=1d3690871d3fe97f8be0908ace0443819e513f6366f851682aafe17059e1eba5

From 286562b2b19fea31b555884e81f2a175a6d57ef2 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 17 Apr 2022 04:22:01 -0400
Subject: [PATCH 1337/2561] font-iosevka: update to 15.2.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index e293af01166b..c971135ce5fb 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=15.1.0
+version=15.2.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- 4bb10d12681546fa129f9105706d6f55c346b75418a19793fb300f0bd4e5991d
- e05995a4b66592d5868b7e667bba8a5f1822499fc53c6cd7a8abf3e40f8b8895"
+ b6b6bb50cd3c3db49739bea9fb5c92c22647631eb1b5a35aa7f48358c07ef529
+ 45c853ac53b638457d943c0ccf7cf12ca77219ba7e092d7ac17ed965c5482da9"
 
 font_dirs="/usr/share/fonts/TTF"
 

From e9b0680d3e68a63a8bf023e0fc7621999be7a106 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 17 Apr 2022 19:15:57 +0200
Subject: [PATCH 1338/2561] gettext: fix build with automake 1.16.4

Closes: #34866, #34810
---
 srcpkgs/gettext/patches/automake-1.16.4.patch | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 srcpkgs/gettext/patches/automake-1.16.4.patch

diff --git a/srcpkgs/gettext/patches/automake-1.16.4.patch b/srcpkgs/gettext/patches/automake-1.16.4.patch
new file mode 100644
index 000000000000..9de0e0b1208f
--- /dev/null
+++ b/srcpkgs/gettext/patches/automake-1.16.4.patch
@@ -0,0 +1,52 @@
+From d1836dbbd6a90b4c0ab79bc5292c023f08b49511 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sun, 8 Aug 2021 02:08:43 +0200
+Subject: [PATCH] libtextstyle: Make gl_INIT_PACKAGE work with Automake >=
+ 1.16.4.
+
+Reported and analyzed by Nicole Mazzuca <mazzucan@outlook.com> in
+<https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00002.html>.
+
+* m4/init-package-version.m4 (gl_INIT_PACKAGE): Use a new macro gl_INIT_EMPTY.
+(gl_INIT_DUMMY): Expand to empty in two steps, via a new macro gl_INIT_DUMMY2.
+---
+ libtextstyle/m4/init-package-version.m4 | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/libtextstyle/m4/init-package-version.m4 b/libtextstyle/m4/init-package-version.m4
+index f131a844f..a26b1ab88 100644
+--- a/libtextstyle/m4/init-package-version.m4
++++ b/libtextstyle/m4/init-package-version.m4
+@@ -1,5 +1,5 @@
+-# init-package-version.m4 serial 1 (gettext-0.18)
+-dnl Copyright (C) 1992-2009 Free Software Foundation, Inc.
++# init-package-version.m4 serial 2
++dnl Copyright (C) 1992-2021 Free Software Foundation, Inc.
+ dnl This file is free software, distributed under the terms of the GNU
+ dnl General Public License.  As a special exception to the GNU General
+ dnl Public License, this file may be distributed as part of a program
+@@ -77,7 +77,7 @@ AC_DEFUN([gl_INIT_PACKAGE],
+             m4_bpatsubst(m4_dquote(
+                 m4_defn([AM_INIT_AUTOMAKE])),
+               [AC_PACKAGE_NAME], [gl_INIT_DUMMY])),
+-          [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])),
++          [AC_PACKAGE_TARNAME], [gl_INIT_EMPTY])),
+       [AC_PACKAGE_VERSION], [gl_INIT_DUMMY])
+     [AC_SUBST([PACKAGE], [$1])
+      AC_SUBST([VERSION], [$2])
+@@ -85,7 +85,11 @@ AC_DEFUN([gl_INIT_PACKAGE],
+   m4_define([AM_INIT_AUTOMAKE],
+     m4_defn([gl_RPL_INIT_AUTOMAKE]))
+ ])
+-m4_define([gl_INIT_DUMMY], [])
++m4_define([gl_INIT_EMPTY], [])
++dnl Automake 1.16.4 no longer accepts an empty value for gl_INIT_DUMMY.
++dnl But a macro that later expands to empty works.
++m4_define([gl_INIT_DUMMY], [gl_INIT_DUMMY2])
++m4_define([gl_INIT_DUMMY2], [])
+ AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [
+   m4_ifval([$2],
+     [m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])])
+-- 
+2.17.1
+

From de2f93ce1d2ab34d15496f5c60f18641e8e51511 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 15 Dec 2021 22:38:17 +0100
Subject: [PATCH 1339/2561] xbps-src: make -E ignore remote repositories with
 -N

---
 common/xbps-src/shutils/common.sh | 10 +++++++++-
 xbps-src                          |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 47ff365e9ff2..36038af980c9 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -472,7 +472,15 @@ setup_pkg() {
     fi
     makejobs="-j$XBPS_MAKEJOBS"
     if [ -n "$XBPS_BINPKG_EXISTS" ]; then
-        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)"
+        local extraflags=""
+        if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
+            extraflags="-i"
+            # filter out remote repositories
+            for repo in $(xbps-query -L | awk '{ print $2 }' | grep '^/host/'); do
+                extraflags+=" --repository=$repo"
+            done
+        fi
+        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver $extraflags 2>/dev/null)"
         if [ "$_binpkgver" = "$pkgver" ]; then
             if [ -z "$XBPS_DEPENDENCY" ]; then
                 local _repo="$($XBPS_QUERY_XCMD -R -prepository $pkgver 2>/dev/null)"
diff --git a/xbps-src b/xbps-src
index 8488c5a3a49c..47023a723539 100755
--- a/xbps-src
+++ b/xbps-src
@@ -157,7 +157,7 @@ $(print_cross_targets)
 -C  Do not remove build directory, automatic dependencies and
     package destdir after successful install.
 
--E  If a binary package exists in a local repository for the target package,
+-E  If a binary package exists in a repository for the target package,
     do not try to build it, exit immediately.
 
 -f  Force running the specified stage (configure/build/install/pkg)

From 7b2f324c806506514ffb32b1a99d3bfdc41db10c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:37 +0200
Subject: [PATCH 1340/2561] attica: update to 5.93.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 1222f0cc9a60..47179ef8bd69 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bf647c7736acbbb99ff1557339f71b5efd5a7591b2af83b482d37d35516bc933
+checksum=81c18009911beb07d1868de78dd7fc1c4b1e8312bd95d916f4d4a80a800592e1
 
 do_check() {
 	cd build

From c3e83af15812f8dee9a7e175d11656751e40bd81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:39 +0200
Subject: [PATCH 1341/2561] baloo5: update to 5.93.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 9f6d3c93f69a..f687851bcda5 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.92.0
+version=5.93.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=283570583da0f85b2001ca600b9657e3a3fb9c2dcdd3ea8728553e212e50a475
+checksum=25d11569fddb8ad0dddbaa91cedd3d96f0ad58a2cc23de920950db6ba3aed5cd
 
 do_check() {
 	cd build

From c37b86fb51c3566cc343ee821f45be243ceb53f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:41 +0200
Subject: [PATCH 1342/2561] bluez-qt5: update to 5.93.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 2893e694f79c..e6939e618cf3 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f58d2483ed2db9cb77621bce3b3c6babd8d1153954030c0dc52ce399c6d28ab6
+checksum=ab5d84eaa37791b57c8379282a3c3afd7ef0b2ebbef83c3f12f6b3bfd9123624
 
 do_check() {
 	cd build

From 00b5584166bc9208fc00b103ff72778bbbe3d756 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:42 +0200
Subject: [PATCH 1343/2561] breeze-icons: update to 5.93.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 017805c60580..4aa9c5c952b8 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.92.0
+version=5.93.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=49e09663989fd3498d61cb7518c741c87a702689b6d6074097d628264a064366
+checksum=4367dfa6b48aa645a3680489be96e03a9a6fc20f57277b3ca5e37ce8df4d03e6
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From a99cb53cfa33a854fa47fe4c1883c34a0d7b5f45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:44 +0200
Subject: [PATCH 1344/2561] extra-cmake-modules: update to 5.93.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 9c034a06303f..19615d19ee47 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f89a238bc5f28738db25e29296b75b4f795e3e9bfe3a8f1f9390648749d303ef
+checksum=093dea7b11647bc5f74e6971d47ef15b5c410cba2b4620acae00f008d5480b21
 python_version=3
 
 do_check() {

From 461ecd7f4b370c307a3edeb78a502551d8f25a80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:45 +0200
Subject: [PATCH 1345/2561] frameworkintegration: update to 5.93.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 9840b077f5cb..130a97e3755a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bd8ef6f6656c9756a56fbfa1dc91273426ef3ea5fae3e7a4c7dbeddfbbe3ec5d
+checksum=156e54c9ee679bda943a279c28c6a834ca02e991b3f53a1b92f8c3931388a2a6
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 7a28aa70658babebe1f8aab9470308d3115ec897 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:47 +0200
Subject: [PATCH 1346/2561] kactivities5-stats: update to 5.93.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 8957274d1f85..5fa940f06eee 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=2206132e0edbb8271f77bb6c45e794b8d3baa3d9b4f94aba005556f9fa3ff751
+checksum=f1069872228e05aea349a0d3f7961da27d1aad3e4c28d0a408fceb98edef03a8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 3e774b987a473a82b2149a013a290cfa7d4d8033 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:48 +0200
Subject: [PATCH 1347/2561] kactivities5: update to 5.93.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 75438b590eef..467b2ed2fed8 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=fc06b6fc111f5ed8450c1c1c96f36188328b2292001ca3bf3293d0f68678dbcd
+checksum=eb6b204382d3bba1b32b5752a3e8382a5a7bbd8be4b95b774c68c501a2f16843
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From fd00f48b612eb47e9a5e329c382fe6440ce3e8b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:50 +0200
Subject: [PATCH 1348/2561] kapidox: update to 5.93.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 164a36aa99a3..5e8664d5b6e6 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=python3-module
 hostmakedepends="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=4f5201de5878bc3fb24f9e2ebd387c0a12d7a27c407636bc878bab5a3999a56d
+checksum=4228326a35342de8f0a301ed8afa379ef2102d99588a79808e7e86f2a4f81d5b
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From dcf6afe8aaa78fc04b2f24b38392ecc917502525 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:51 +0200
Subject: [PATCH 1349/2561] karchive: update to 5.93.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 109cc7a0ec29..dcc4a9d14cb5 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5076a28c3a10ab755454c752fa563a4be7ad890f391c43aaa2ee4ee4b6a99fae
+checksum=61e326a840860270b7f8b9e8966462085b4f309be5c3a84c3b265eb95694c7fb
 
 karchive-devel_package() {
 	short_desc+=" - development"

From cc7ba37ca5c439f0e4b7f46193ca26d50d154c70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:53 +0200
Subject: [PATCH 1350/2561] kauth: update to 5.93.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 05ea13c55c39..8877514c6a7c 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44824bf68ee510d8aa0189a9d4b44568b0fe20d17ba45e3b739db1927bfa4728
+checksum=34580078bfdf631835f3ac52955f2149209908b935a7cfec6fe5b4956c3ada6c
 
 do_check() {
 	cd build

From a9e799f594772e5c7106c0e0bafbd683a9450ff6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:55 +0200
Subject: [PATCH 1351/2561] kbookmarks: update to 5.93.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index c845e8909a62..cf60805f2206 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99504e761621b56e07a561e1caea196fe4623c9334b889f081e3da8e4a19d543
+checksum=3eeff795ff99be90b0d59c6e5fbef02022e9fb48c9b4dab098a3c27e10fd863f
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 223f25295acac5199d5bdc387ce9794ae128d483 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:56 +0200
Subject: [PATCH 1352/2561] kcalendarcore: update to 5.93.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 3359712d3db9..4e7766af00c4 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.92.0
+version=5.93.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=6ff2e68dfb8b92e0f181f3f19d20991bfd589b4a047b313af908c41391560b3a
+checksum=1609bc141739fce0abed59a353a0e356f4fa7a1b3659d3bc77737010875c1d3f
 replaces="kcalcore>=0"
 
 do_check() {

From 84d4f22225e2e3d7c0005846e723ad7463e482b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:58 +0200
Subject: [PATCH 1353/2561] kcmutils: update to 5.93.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index bf26425f364f..19bea8671950 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dd49e658fc85c215442a7fa9d2435819f0bef13c997a6c2a51557b82e1bc8d3a
+checksum=1445f978b7ffd69fd7c25d965812755679c4fdba23eb9837da37a8b5b2d30d6d
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 7b036b62d535048a9c9e0b29c18aa3fa0b49fd16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:59 +0200
Subject: [PATCH 1354/2561] kcodecs: update to 5.93.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ccc8f79b638..0a5c8577d249 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6e5b7a453948d5fa0482715eaf4a0c9abe5b902a0aca15540a04b1a1b60d275
+checksum=0efc5c8baab3142f8a0ab9369b255061772a57a80fb616b7305bf98235b2288b
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 036c275d586be816419ab5b286904edc5e1fc1cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:00 +0200
Subject: [PATCH 1355/2561] kcompletion: update to 5.93.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 8514a8625df8..fb4b7970b807 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,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=08f1525c6cee8babe399c941bb85d04be9dade0341d1d85c6beccd2e93dc7ceb
+checksum=7f8c9355e8875b619ca852741e972f41c252aa2e95b439161acc7b32d9e8fb9c
 
 kcompletion-devel_package() {
 	short_desc+=" - development"

From eed885d78c8544986988f9f9e9c4bf9fb95a9e6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:02 +0200
Subject: [PATCH 1356/2561] kconfig: update to 5.93.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 44dc8ae429da..402cf928ecbb 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7801b641b88368a0c021272073c692337b42ee28f0025d106942c8ce873b0523
+checksum=71857c20d4829017c22dd6d46ae5a642c86344960e21bc1520458fb76d02c06e
 
 do_check() {
 	cd build

From 2a09e6772bf9de5ea68a8ca15101a9423026aad8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:03 +0200
Subject: [PATCH 1357/2561] kconfigwidgets: update to 5.93.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index f14d66ae93ef..a8fec7e42dbb 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=4259eed35d9ac307ecc30e64833bad7a89ef58fc7125054eb39716d27a4a274a
+checksum=db18e0f2217ead6dd6f5877551902d5da86aa026686e3c564f5f96be279f24bb
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 8bbfbb556049d3a61022ed3f7847a44b95c3cb7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:05 +0200
Subject: [PATCH 1358/2561] kcontacts: update to 5.93.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 544ae3c7f4cd..bf35f07ce999 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.92.0
+version=5.93.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=1276006e50f507216a8241ca4b26b02c67c42e5bee26a6b391db6ae4f72533ce
+checksum=5d7c8c6c6ccfa99188d9e4d7ab6165ec5b2bceea59a01edc6b309910fd604c75
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 5577f4824beada26a5fb4524236de42196f5549b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:06 +0200
Subject: [PATCH 1359/2561] kcoreaddons: update to 5.93.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 4838e315b9d0..0db03a77e30b 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df5f718f324aa2b58191438c8aa5f7498a7997eff990d16ffbc9f19efd1a6667
+checksum=920a278af97dea3add06770a6f3604744c20d667973cb71cf477145785dbf043
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From df36f947307bc6492cf2534155e9f61c5314248c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:07 +0200
Subject: [PATCH 1360/2561] kcrash: update to 5.93.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index b9fadfc544d0..c05bc4600336 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9bc5605b5026f55d9c2c1ca32c79842c3ad0f5c042e480fe1e7027b2692526c7
+checksum=2ff8d6c6924b2b752ef4a929390606bb55ce2aa55c582927269bd65556992dd6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 201bacdd2293d40298726238aae3b60c434ce219 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:09 +0200
Subject: [PATCH 1361/2561] kdav: update to 5.93.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index caa894c1356c..32b1865fbe2d 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.92.0
+version=5.93.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=f3b16c473b104f83f6124f96f2b06a6c72a447eb19ba31a90e3f4725e732b1c4
+checksum=a7d3d40120f0a1b20f8492ea1635507a95e041582f5496a133de24720934ad68
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 8b488a4a813481c4a0cecc4f07079a188e526896 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:10 +0200
Subject: [PATCH 1362/2561] kdbusaddons: update to 5.93.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 741652529177..5e03127aa8a2 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7c03f33cc49ffa80e509f654f410cb142e917bceb2f35f08836dc46ed268ae54
+checksum=cc2c74501e65b97af1849ff454e51393f3a07755c155854bdee741a006822ad9
 
 do_check() {
 	cd build

From a8137788083d5774de5fd6e0016bf9b92a8f83ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:11 +0200
Subject: [PATCH 1363/2561] kdeclarative: update to 5.93.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 2c6a351f34f3..96902ea275a9 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe964d77fea37c04eee3863d2b4227b76e33f16583906c284b532a461982d5b3
+checksum=08a945c793aa8d89d87c42d29c9c11e7c28c47916ae728369ab478892d325067
 
 do_check() {
 	cd build

From b5e2c1b79679b95e518cbb2279c89c6e17748e77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:13 +0200
Subject: [PATCH 1364/2561] kded: update to 5.93.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 15d1ebbf684e..30238cc5f878 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8335531b856cb361ab2e5b390b333eb3405bac4e2bc7c0305994704bd0540e6c
+checksum=1992310921cccaf8fa2ca1abc8328aec5bc2e60a3d9f562f25b30885378159df
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From f089ef914d6b6b361d690d3eede51f83ac061df7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:15 +0200
Subject: [PATCH 1365/2561] kdelibs4support: update to 5.93.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index 5e8bc71495b1..ae42683b9b16 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=292e5e84ad8d7de90f0666b51f085a25b7a9faf521c58379d470d2994004ede0
+checksum=6a3e1d80cc6babc12930f24f9afd1ed10b46ae58ea71d44a466178212b07377c
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From baefe64d34a1b8af866eec53766e58a63df458a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:16 +0200
Subject: [PATCH 1366/2561] kdesignerplugin: update to 5.93.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 8b811b777580..b81b6562cf66 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=066859b345da224f5edb601a5f448540330c9a286980b0c34169646c26a22a4e
+checksum=f19ab4fc1ed58b89642d8f9f75a5da2f2ef0093c97183f336ffeb7208e628aaf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From db7c87d1fbe35b7bba59e1a27193d4e2747585d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:17 +0200
Subject: [PATCH 1367/2561] kdesu: update to 5.93.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 0ba31e7e1a34..1271d28ade36 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4687dc87a9ada0675801e0c575467bb5f7f7fe21b67ae2ffd1fed80736f95efa
+checksum=7f029d9a8959f0e2ca516ab3fb6b4ebd49ca0f0d19c72369451b6894d8138dbf
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 5d4882fffb104eed57c7a07d8d35335c403888a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:19 +0200
Subject: [PATCH 1368/2561] kdewebkit: update to 5.93.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index df9fd862a13f..c667f015e07b 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=4d0a773cad86a642cb90d9844757569f2e2e9d1e96ccf78f73bee885c908d1b6
+checksum=a2fe9b5660763d4dd74244c00bf7b1a407438279a81f2a3ef3813ea250fd2f55
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From ec59ac67b502214d7c0bd540f1888efe09f90a84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:20 +0200
Subject: [PATCH 1369/2561] kdnssd: update to 5.93.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index a48bf7f3e254..42554c854079 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f36af49faab84d8ae7ec46f1ba3300c9cdd3d8820dd1e7e48c5c37bcdd844d4
+checksum=dc97364f14b5867ea5bb2986f6ad3c84ab1acc952f50d460b3e9aed03f2f903b
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 752f1c83c83877ca0ab0626a8029d240215be746 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:21 +0200
Subject: [PATCH 1370/2561] kdoctools: update to 5.93.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 5e38783fc1b3..a43404728d1c 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=86a3aeb8b91dec0e1cd81b646654ebd750a8aedfac9b4d53b9b0019a91720870
+checksum=25e83ff151c53667b94e25a5c41993796164683a43913820a5651f3610b65d5c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From 1127da4b3c2180fd63777bc756cfb73398c10bd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:23 +0200
Subject: [PATCH 1371/2561] kemoticons: update to 5.93.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 2a4fa32fee02..5b7281e3bca7 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fdcfe30941c18a9cb29b58459fbb2ae54a55fd5a0e8688f0c59a7cc7ebf09f07
+checksum=83ca3df374935cf103a8fdaa85900d0acadbffc9d3aa8bfed073e804cd5ae410
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 87ed5bb7c3b6f1efbef2b3a87c645595110d3821 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:25 +0200
Subject: [PATCH 1372/2561] kfilemetadata5: update to 5.93.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index ab36e2d86496..eb162fdff6d0 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d624d3551094cf73d802b6e95bcd78577ce9eb1e9cbb9a8f340dcad066ea15ce
+checksum=3015c071a5f068f6e45d36238aa0243d3788a95ec84362ba79ed0369e676a816
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 1c462cb0acbcbe2c3b7c8369183a534112980dfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:26 +0200
Subject: [PATCH 1373/2561] kglobalaccel: update to 5.93.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 2405d1b174d6..7df12f5a2476 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=be7b1e279b63678ec4042f896b159d11c115d05e9831cde6cd67ef4b8e581452
+checksum=c806b8f2b029c7632d99c55cb711f9f4c1697555fde53ad4f67167efee97b712
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From f56724f9ae030841b3a61b1f8d3f2b6719a3d034 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:27 +0200
Subject: [PATCH 1374/2561] kguiaddons: update to 5.93.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index ea01d37e9ab4..72f3ba0d1e74 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.92.0
+version=5.93.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=0f6775a565f22900b0de53daa5fe73f7d7e592663e0bb442a8e26ffab27fdf5f
+checksum=27f26392140bd1abcb86c154fd6fd87e50b2493787827b2b1cacaf76544af40a
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From 8c88ccaca462781546d12fd7897e07b4316fcdc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:29 +0200
Subject: [PATCH 1375/2561] kholidays: update to 5.93.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 163b2dad1ca3..eaa54144eb21 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.92.0
+version=5.93.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=0ed382c49fb10af87bfa3845a3919ed097c9f808f3a5dbb631ef4e68c86b4b10
+checksum=0d4a1fb823501ee73b2c4d80468777adedf93c80f36b3a680cad91cc6704b841
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 8a561c4ae6c24fe970742559019dea702717cd42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:30 +0200
Subject: [PATCH 1376/2561] khtml: update to 5.93.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 7415d7e78a24..de17fc72af8e 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.92.0
+version=5.93.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=91a1d79ea382a25614810cd59f800f0a34c6e86c69ef6d0a08d2655f2a93171a
+checksum=31bfb6752ed7248b98e2bdc723e8e10c11b5fc9f7bf7edd8dedad1162f86614b
 
 khtml-devel_package() {
 	short_desc+=" - development"

From ec62269e26cd951a5ffe1f5d61a7bdcda9e0c882 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:32 +0200
Subject: [PATCH 1377/2561] ki18n: update to 5.93.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 8b0d17610f56..956d6aa70406 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -13,7 +13,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=058032e8e9556f1dadcf0c2bd633da6cfc9673e966dd113388e2b8aee2395777
+checksum=c2705400d175f18612dfe1afb28dc14accf614f7cfd65409dfa7fdcde5237339
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 22da28f8fa2eac50a94240864c261eeeae79b31e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:34 +0200
Subject: [PATCH 1378/2561] kiconthemes: update to 5.93.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 65250bdb3ac6..532d5ec8121e 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=2128710ff8bf0a7bbb699fe3a45b231c6b4607ba3e3a3a5d03c25c809233cb23
+checksum=75f7c5b34f4f1a228b4cbd81a284dbfdc0c0810ddd3a39e69f9363ab3598e2b4
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 621deb5360495ae07607b8e6ad6fc712f7d74992 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:35 +0200
Subject: [PATCH 1379/2561] kidletime: update to 5.93.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index e9ed68131b14..0556c9a0e3d0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e12f14229f7ee587becb5a693374045c460d38c55d61e21eefd78b8db39280d7
+checksum=4d9315dfe1faaeb62eae5ba60f683483de56317826d9b8da2bd58feebcb7b7d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 0994945e7426be6857463041bbfdd6b1800fb14c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:37 +0200
Subject: [PATCH 1380/2561] kimageformats: update to 5.93.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index ebd6e81db298..bc8b9f09a2c6 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
@@ -12,4 +12,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=ce049989125a49dc9bf8d2a2f2f5a2fec79e25a6343087b024fefd0131eca369
+checksum=15b0ed9de57af95979e0e40496b980f243cd81e2a400d5f64d12478e1dddc7d0

From 7b34c005c2a1069ccb1f0b46cbc62ceeb0ec6199 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:39 +0200
Subject: [PATCH 1381/2561] kinit: update to 5.93.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index a0b0aaee9112..f94cc0038dd6 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cb517912bf17d4b4f015cb1ab935eebadc52ece050f21b33fcb4e799b0c5f3ce
+checksum=db36a3bd5b30163b7a4ed8c7a907bec585acab841306755b0d8d32ef3d1ce498
 
 kinit-devel_package() {
 	short_desc+=" - development"

From e1a139716aee41294483b239dedbf8a42f1dfeb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:41 +0200
Subject: [PATCH 1382/2561] kio: update to 5.93.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index ba96fa5e727d..3047212a7964 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -16,7 +16,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=d4433f9890f71afe3d7d268e978e0ade96f506a38e41f7d57ffe832d96d44cb3
+checksum=d290a4bcfb5ec9eb9047c84a7c420df831131b92ab6c9d28a3aa0eef9f5d4c44
 
 do_check() {
 	: # Pain to get working in limited enviroment, excpects e.g. real disks

From 2ae16a6b10051aabbc99ad6f11b8ff1d45d51b1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:42 +0200
Subject: [PATCH 1383/2561] kirigami2: update to 5.93.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 1b85d94048f0..f504292b6363 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.92.0
+version=5.93.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=0adaff98ea70c577c9e6d7a688e5c52529a59f56a7d0c8ffce295f342e203d5c
+checksum=a7c2a824eb776011ae9dc94698588e8c6988ac399669723631fab26edd47ab8f
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 03574aed01165a528acd438d7265140d7bb9b988 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:44 +0200
Subject: [PATCH 1384/2561] kitemmodels: update to 5.93.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index beaa9faddb9e..bbf9bbf094c8 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e65c7f58d602b4b8160b34a3a841d1c7aac77695b73e53aa715765cf42a8e89b
+checksum=5bb9918b92ac37f1bc52c5abe04e8dbea54f31fa0101edad6d9e92c3a9f0485b
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 00322bc6929bd8517fde5aedbbc40b8f3b1d50ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:45 +0200
Subject: [PATCH 1385/2561] kitemviews: update to 5.93.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index ab3405ab8350..4518704713d6 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,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=058b4d4228387558b03aceb0ed286cbbe89ea07bb6fed968beba0b51678886d6
+checksum=93f01dec3b795b28cc6f6859873ebb941a9504eaafd13ff9f72b987d71e55abf
 
 kitemviews-devel_package() {
 	short_desc+=" - development"

From c772362e490ab2aac6c7f9a221e30e01b4ef59cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:46 +0200
Subject: [PATCH 1386/2561] kjobwidgets: update to 5.93.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index cbe04600c928..c79eb99642d6 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -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=df24b96f77ddbd2f63a6c2a3c54c4e712ef11a63b93c0b02d949d85af2fb8526
+checksum=62449b747d6fa5b32a1cb317b2b614172e42be3b85f39b02d6a07adc267c39fb
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From aff46c0d361faa2da339dbad3ec1128cc39c61ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:48 +0200
Subject: [PATCH 1387/2561] kjs: update to 5.93.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index 6990b50f3feb..263bf627d7ab 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=04072d527501c92f1e0144e9dcc114e108bfb5a2b50bed8a9b037474aaa6f118
+checksum=85aa01de9c2775564c895d3efbcfb8cc68da9a84f511176fef16742cbbf90942
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 0f5d4aa77976dca6cd80e1f9acce7865f926e610 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:49 +0200
Subject: [PATCH 1388/2561] kjsembed: update to 5.93.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index f606b2123fb1..d93a1a3b818c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d7c26538a0b7ac804565840d61df2681ea4b729abb6ecfbfcae3c20536ca6035
+checksum=fa55d3bf0b3f9026eb573cc909b1fbe53bea7090f3da465e9bb293dc0f81d424
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 23608c5c8203cd15b7e4378290e4af422f328385 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:50 +0200
Subject: [PATCH 1389/2561] kmediaplayer: update to 5.93.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 5c9a97d7230a..5ebec5415b18 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=fe38eb2ed593e2e68909129a042d52121b12b9350524a7a1463c24c9c58a97a6
+checksum=ada8afb5b0fea3af2112812792eff062d3830dfde4d8784b7e1fc3711e74830a
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 9b58792b358a9127ea17cad496032f251be47490 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:52 +0200
Subject: [PATCH 1390/2561] knewstuff: update to 5.93.0.

---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index ba2a38d746ca..dc604a8611cc 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b14aee55d7701c72d05030fad508a5cb89fee34656d4d84c2d977a3c2a66c3f
+checksum=2adc48e26c04c05f61f6ff1007f77ea43036b76d769535617e88d3f35ebb5759
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 1296b4f0777c8748f017c91398ee3ecdd766321e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:53 +0200
Subject: [PATCH 1391/2561] knotifications: update to 5.93.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 27a83bf27de8..782d259b261b 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c4e095e3d96140f19e9f2e2dbc74df174e29416455671fc6680828038ea94b7
+checksum=fe191b1fe55881d7e212a3b70fe08d53e47c32793d38f5d5a4d82b796796da4b
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 03da393ea576be8733bbfc8d9280a2e31e653cb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:54 +0200
Subject: [PATCH 1392/2561] knotifyconfig: update to 5.93.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index f33e7ca63304..1ac13b7254db 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f7f452e3197886a2afdfaa5a2954d412eb0ae2bc47ce742902765c053239313a
+checksum=cc9de166631555451965cd007b82f0ab529d6b909bc259e26e59feee586619cd
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 81dbcb6b1ea31877ec662f322f37aa34886b8dba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:56 +0200
Subject: [PATCH 1393/2561] kpackage: update to 5.93.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 7488611aa6d5..0c03af3cb837 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.92.0
+version=5.93.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/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=361f75fb4e3dff46e6dab42d858488af58fd40f3af1f7a39881ea9240cd866ab
+checksum=8de6ecd6ed1cf746b9919d93283aa650922211b51bb2d22027102f67c42ec5cd
 
 post_install() {
 	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \

From db8f8949469d0d70ed8829e1b07242559b8d3974 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:57 +0200
Subject: [PATCH 1394/2561] kparts: update to 5.93.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 681aec459145..9ed54c4d5bd5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.92.0
+version=5.93.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=094e18b2e9119f1c197c625235e639204ab5aa1910b13ae4317c8145b4fe3318
+checksum=c888e9664cc71a2f52904fa42d6bcedaa76c50c720ef0bee8d8b0c98bbcd1675
 
 do_check() {
 	: # test can not find packages assets?!

From 61cabb92ea0df66463ed97a5e4cba5348245e327 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:59 +0200
Subject: [PATCH 1395/2561] kpeople: update to 5.93.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 717d2756b92d..b6d0c7054015 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b313729131bfbdb0ffd24ded926a2c6604dd06a18bd612c2ead6aa886f29c571
+checksum=d3e1266982fa2abdd7b216d018569ea83c71312e2cfa35a0bee845e8bb49f371
 
 do_check() {
 	cd build

From 71be7d6466e33fab07815b58885cb49d7d5e2fc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:00 +0200
Subject: [PATCH 1396/2561] kplotting: update to 5.93.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 6b6fa4db6f88..a39daf53e9c9 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=c95d63e2e4c4abbf625ec1cfe749314c1a90dc5be4a90a1ea1617bc969071ed1
+checksum=586d1b694213f55259ffb6a96a10648baff6e3ce45c58d7c44734d6096b6a26d
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From e3ec4e575f950b79eb5208e235ff23d9fe354346 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:01 +0200
Subject: [PATCH 1397/2561] kpty: update to 5.93.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 47612b152d68..c5e5c306e492 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter"
@@ -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=cb1dac5f8f7ba059ef967a2cf3d1580a29a8d7b373ef67e82e0ac4f0285ee052
+checksum=2a05154dbf9eb082f32f33b494dc36c3b24a59c14521167f3306a04c3649ec12
 
 kpty-devel_package() {
 	short_desc+=" - development"

From c525cc7952943770967de73152f0080c7f486390 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:03 +0200
Subject: [PATCH 1398/2561] kquickcharts: update to 5.93.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index d2d5278ba25c..4fe68d7329a9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=1a430e2909b137466cf41c334a60ebc01e4cde82e71acbb167cd64d1f13e8678
+checksum=24346ac484d1d785bff27e0de5d29a7f7d3d73568074f8bdaeb869ff1004a848
 
 do_check() {
 	cd build

From b4548c1aee5349ab2f7bb56103629b737ee512f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:04 +0200
Subject: [PATCH 1399/2561] kross: update to 5.93.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 14c6ba42f541..31a60cd2c56f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=129e2840eb1f33c95d50cde79a82f784cf735c3f1ae636f15dcf695c0b0c1ebf
+checksum=2ba6fd2438731b1704537889120c0dcdf1eb36bffd1e921736e85834a5551ac3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From d00c83e90a72eaf2fcb1683f0d77237d4777241c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:05 +0200
Subject: [PATCH 1400/2561] krunner: update to 5.93.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 4fab48018a19..6eb7f598ef04 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3fc80c5d66359e4593115b58fcd055ca9cab8f23376123094e13c5d4bdc48fed
+checksum=2dc6b9169d415d87f5e2d82e2263183f42589cc1e962c9d6d0c60b6dfa48c991
 
 do_check() {
 	cd build

From 07e5130f3fdfec75c62f968e9c8fe1cd9c2a8041 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:07 +0200
Subject: [PATCH 1401/2561] kservice: update to 5.93.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index adda7f1fe8b9..de717b3257a9 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=52e2d9654bbade7db91c647192b78bc3ac1feedc0c279e9c371142aa5ec82ef8
+checksum=46cf92f837fb890e311c5affaaa8b01d1d66b47dd272a30ae148472ef3e67431
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 84faefb09cf30a0d76a5045d8475efde9ef3edc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:08 +0200
Subject: [PATCH 1402/2561] ksolid: update to 5.93.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index d954a2e1318d..d38f0b79b185 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=8926c859af4b6b14e0967fc3b76ca0e76de27d0ab544087eefdffe40518b5a9c
+checksum=22eff3f94608793fecb532e097d9022a14c828a0ffad0f73666088153f0d6bea
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From b387924adab89525777023a0d70643da0710528f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:10 +0200
Subject: [PATCH 1403/2561] ktexteditor: update to 5.93.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3dcd6b5a7433..6e0d131bcd2c 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,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=bcd01c3ca07d02106de1c68156e568ded7686ca9557b30a04f7b4e24cf43fb8c
+checksum=7af437b882cd2da9cf9780cb660f9242b9c2400a5ff55cf6ca8608b6e62bd6c3
 
 do_check() {
 	cd build

From 0017c9e51c8647f82164022e087233e01275aac8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:11 +0200
Subject: [PATCH 1404/2561] ktextwidgets: update to 5.93.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 2768b6f1ddcb..d685d6d0a91a 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe867bf498a5170a9fba91dff652b68fa5cae2af8864dbe89a6e54638ff90b0c
+checksum=e27f588929db35f485ebbd6ddec45ec0c56f86844935013f8a39df8bdfb7c215
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From f1c28a7ae91c2ea9d5c0224c0b083a04d1b5c82c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:12 +0200
Subject: [PATCH 1405/2561] kunitconversion: update to 5.93.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 73f122a4fc6b..0629a5319eb0 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.92.0
+version=5.93.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=47e2b4c4b329562044954a67edda4d5ade953bd2a9760f6214c5f8f17239f09e
+checksum=9baefb6aed92d2b32727f9492f1322a9e0b17b609c2d82296f4ee10b55a02fc8
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From dba230aaaef61ff8a3b9cc31cee9afe36a7883d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:14 +0200
Subject: [PATCH 1406/2561] kwallet: update to 5.93.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 6d2b98d6a7a3..9df7aac1b7ec 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.92.0
+version=5.93.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=71aca76cb0edbf569827709b073bff2edb5c129a85638df4bc666d70786740e5
+checksum=ed56f6477efb250b454f7b7861a16a5ea972487c1373647b7094047ce20fddeb
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 075630ae6d0e0902fa41fb86ef101a3e40aad4dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:15 +0200
Subject: [PATCH 1407/2561] kwayland: update to 5.93.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 41c3aee75184..f67e288b91a6 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.92.0
+version=5.93.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=95e097cefbe4e260129d77ab9fe3013818b85b9aee6e4744acfa1ada96fed195
+checksum=1648a273ad1c0c1895a0edff9a3e97eb151e1e3533362e0f01d72706ac0a7abe
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 5112b7b06800c1766d65df59e68812fed721499b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:17 +0200
Subject: [PATCH 1408/2561] kwidgetsaddons: update to 5.93.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 324be77968b3..1b80c8140b81 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d0e3558d6a7ed550f31d319e6b52d6ed61d693a1aa50e6dd4f430a1324111f2c
+checksum=9c35e17d8c6faae58bfd48180bf968b813e6bfe2d49041b3285f8e326842a410
 
 do_check() {
 	cd build

From 8ef0f015fa96300fe30cb80e0a7adba7896ab7b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:18 +0200
Subject: [PATCH 1409/2561] kwindowsystem: update to 5.93.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index dd6ffc7afaab..f33ceba374d1 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dcdbbd2b4f2372fc225141361a7d9ae4a8f28ed77a266dc22c20be473fdc7d80
+checksum=97cb223a4d1a7487a3ed496e10ff5e8c320ea7458eb34cbe4ed114bc19ebe4a1
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 562d8bde0d7eea08caaf14c2545c3a9c819e6e53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:20 +0200
Subject: [PATCH 1410/2561] kxmlgui: update to 5.93.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 4f30b9703ae8..92a6b2d152d9 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e08b4c0d3cc39f788d918bd2ba331966a8af5208233c38a27f029f93a597b743
+checksum=74ba65d95fac0cd09cb66e14d199efc739e1a8c9aec25812f41cfc64d7f4b099
 
 do_check() {
 	cd build

From 82fb360a95f1006ceed9740c9a4451a6ea20358e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:21 +0200
Subject: [PATCH 1411/2561] kxmlrpcclient: update to 5.93.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 619fe8a1d3e6..20010cf52f3a 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0e32dca201f8b3d241e985c8dd8854774569d08167a9f3f060a141551e19beab
+checksum=0cb41aff9f5660d95ee6d669f9c70692b55c089d0e1b9705e19b19fc2c49376c
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 88f5563342d75e82a9cf473d0efe8f2bf565b9d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:22 +0200
Subject: [PATCH 1412/2561] modemmanager-qt5: update to 5.93.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 920b6b1f5705..b669557f11b8 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=7ed0b4f48a781fa9166e0446ac14fc21036195cb3d800ce21a546cac02fe5898
+checksum=3aedde6936524b9d0dea07ead34f44fcff50da2ccc0da73d6208893e270a67a8
 
 do_check() {
 	cd build

From e0ffde4b86727a14b9856421a75d3a24fbe17ec0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:24 +0200
Subject: [PATCH 1413/2561] networkmanager-qt5: update to 5.93.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 bc475ea12153..de46374e6511 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=51ddc8ec0ea60c87c49d5a6709eed86fe1e066d57d059a7f9e774c97b81bfa64
+checksum=b8588ce2d811094682f51ea6150f3c58baa398fc91339bcb511bf60bc0eba960
 
 do_check() {
 	cd build

From 6df31a640383507e83436b4768c567e382d03ce1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:57 +0200
Subject: [PATCH 1414/2561] bluedevil: update to 5.24.4.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index a3eb6e450432..b76585975dd1 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.24.3
+version=5.24.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=9dd1566eae8bb793330f2f54ab34cd75ed79e7f3924bf78149077b122cc49ec2
+checksum=83778e9cd952c6efeb786395d3fb9f5d4e6aa65d2ef2bc02ad7d256a3201f0d6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 6cd2c98f0b9d241439cf648235e4c8ef645fc4d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:59 +0200
Subject: [PATCH 1415/2561] breeze-gtk: update to 5.24.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 8e1a152f177e..20473061da4b 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.24.3
+version=5.24.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=2911bb2f99ad42ec820cc2adcbf1f8a6f18ba437f72ce216562e12584fd042a4
+checksum=b2fe8150a8576fb39d26b809e6b9cb06e2c2d2b039558ad75307d62ed857a168
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 0095bd5665a65563c55cf3b0fb8645851b67bc0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:03 +0200
Subject: [PATCH 1416/2561] plasma-framework: update to 5.93.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 2ab058fb3036..2ccf8a0c2973 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6c2bc624564c74fd80bce170a1c763803d5207ef86108b5724fcba73c3506f7
+checksum=d4a2c687ea2ea8dfe7c256eb58441fc458102ed4b445dc24685513dd96b5c322
 
 do_check() {
 	cd build

From 48119e5fcbe076ce245de3d8bb55a788cfbbca69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:05 +0200
Subject: [PATCH 1417/2561] prison: update to 5.93.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 5f1e84c53f7d..fdd1d0b1a115 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=7e6fee9fd56be6c4589c106a3c16a28a4aa5832a24dcefe88302a9ad113ee41e
+checksum=1f43de6622cf263c6b71f9a801174e2791c09b5a0d52c602715659ddfb82fb56
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 1b609141cfa3cde8644d006e83d55bae715bab61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:06 +0200
Subject: [PATCH 1418/2561] purpose: update to 5.93.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index dc71877ba34b..4c9f91568f25 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94613e180550f9d15443ced1f2d93b566350d9a981205b4f98923714dc4f400a
+checksum=dc0bc0c7c5d9b27e21856132ceeb3893555a36f3944ebc97da2eb76a74e92cc4
 
 do_check() {
 	cd build

From 132ce8fac6efaf703e456271af22a4542bc68cf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:07 +0200
Subject: [PATCH 1419/2561] breeze: update to 5.24.4.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 0317ba5620d4..64bc70e3be00 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.24.3
+version=5.24.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=4b8f92e55c72ed59b7bdfe4be6044fcb0a0816fb6f1ea2bdd9884b58b9a92940
+checksum=e369ee21e6aab1d5e3ae222ecd84bdb59f3d29ce3b61965b498bbfe84c949805
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From df12cc62b5c816577689f216d514103d84938d58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:08 +0200
Subject: [PATCH 1420/2561] qqc2-desktop-style: update to 5.93.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 5af0197811cd..ee40061fe5d0 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.92.0
+version=5.93.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=97530813b9a80505b5484175a55be49cc020244fbe3b1bdaeef15845c3c9bdac
+checksum=161ec085a529e23532badb7723c78051e7b4c3a3fe11d3c4ab8bab93213ba9a8
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f6c683f5df75bec3a3efe5a3d3a1a34b061f3121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:09 +0200
Subject: [PATCH 1421/2561] kactivitymanagerd: update to 5.24.4.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 879d45275ce3..e8fc45c00005 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ 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=9cae3e136ee6743474fd96a573b235b6ca8653d4f61f412d9d3ec866861cae63
+checksum=8128371fd75f7dd4ccb2203ad775e6f12db28bbb64047d0fd63eb745d8735529

From 1682ef6c4423b40b5a46d0caea06749a10ca5e16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:09 +0200
Subject: [PATCH 1422/2561] sonnet: update to 5.93.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index b7d08f3d959b..ae917562a6e1 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.92.0
+version=5.93.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/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=31fc1dda3db582337529922d38b6eac72b1551c4a0d86fb9307363e061d05722
+checksum=3c146ba45edee43bf2e8bc48b116a38e0c28d2294fe61b44dc8254b881210d9c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sonnet"

From 8e392920247d36f3e5cfdd89885f3ac5179745c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:10 +0200
Subject: [PATCH 1423/2561] kde-cli-tools: update to 5.24.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 847a7213209e..0f61ce9efc66 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.24.3
+version=5.24.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=fe64da7ce3ad7e7b2d743e06aec0f6666e1909d3ad08867a0173c5c262f7e803
+checksum=ffe4c8d3f4e97c57801360ba32cb70c961ad5796d56d4f0bae10ab2ec68759f0
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 654cbea6179779df2e590734b65b4bd66846271e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:11 +0200
Subject: [PATCH 1424/2561] syndication: update to 5.93.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 3a35ebf2c174..bbb411538569 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.92.0
+version=5.93.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=1c9ab9772103c001e56afbe0356ede04f953b07be8d2c2e2f2fff3e7b5bd5d46
+checksum=35f14e36076760170df44785df39f522407f58cfa36faf91564696587d8eda23
 
 syndication-devel_package() {
 	short_desc+=" - development"

From ba9ef96603e77331a5191f503173a1ba269622d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:11 +0200
Subject: [PATCH 1425/2561] kde-gtk-config5: update to 5.24.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 a68d66dbb124..ca92bc05101a 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.24.3
+version=5.24.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=fb4bcd30c93e15962153e81ca218f03465f02d1d2d011f267bb96946869ba05c
+checksum=b17aaad5f96890426a8864ba51f026732007e47fd42c4ce4df3e469b455f570b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 0c66b9893c341f719bc1cdac78cda16544a26fe9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:12 +0200
Subject: [PATCH 1426/2561] syntax-highlighting: update to 5.93.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 5ad6ec877834..0f92ee3b944a 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99347eaf9b2249f875cacd8319c77f2f8e110d0e7834f51f296ed911dcc7e50e
+checksum=ebdb51f8922d2bc97457c7df376e6600d5ee9805fdc1ac7f7d6be35a3fec711b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 833ebc5e08bfb7e8a53e5c1b3c59f679c7fe5636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:13 +0200
Subject: [PATCH 1427/2561] kdecoration: update to 5.24.4.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index a358d713d04a..511d4d627094 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.24.3
+version=5.24.4
 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/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bbfc3d83f76dc8d2568bbe2f5395af5887eaba79094fcb901930585f8b53f636
+checksum=2c999206c51a6a6c5ecda211773276438f0069a2e1c81d4903ae5712c6f28c15
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 876acaa09aebbae146a3d84cc44e28939ba46a47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:14 +0200
Subject: [PATCH 1428/2561] threadweaver: update to 5.93.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 9d65ff2b49da..89e6a9a71b90 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=48b0cf3d969437eaeb0839cbb16a35209336fc6e78c1540920f91bbab8b01101
+checksum=6c0db7d276052ebc4d512b43792ae2127cb5fafb1cfee890b5f20bd05c06f185
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 1871bd797daad85e54d5897d4237474877cc9e4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:14 +0200
Subject: [PATCH 1429/2561] kdeplasma-addons5: update to 5.24.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 065f0fede44b..22c2981a4dd1 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.24.3
+version=5.24.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=86fe08a744e31ce22124bca4337633f6a2523fbc87d915d3ffd42e65da66f23c
+checksum=d721d32d16f34ef1066bdf2fcb781d5bc1aca7cf5cdf3a71c6fef2dfe668680d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From a8c266a3186e56f28b14f83ee3327030865d8287 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:15 +0200
Subject: [PATCH 1430/2561] kgamma5: update to 5.24.4.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 30fa3d8e6577..75f1ab3613c3 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.24.3
+version=5.24.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/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=66da3bdfaaddb70c6bbf5739eaa970c8a7f67fd8295872ee201a1445c2df9867
+checksum=73ed9897b2281a8ddd7b47f063d548fa71b683662a63b5648ba590160bcf3f7c

From ec0437fb89cfcd6075ec68356fa1b0240631a9af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:17 +0200
Subject: [PATCH 1431/2561] khotkeys: update to 5.24.4.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 1a59a447a853..38c24c59dde9 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.24.3
+version=5.24.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=17f45fa898147b7bd9e1bd4850aef10d03c25dbfe088ef46803a817f7348afcb
+checksum=5aac75b05f0b5a63ea924b02645bbfacfe18fef3d5c23182b482ebc5d17f6d0c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 112d7644616916ecf5aac7c0c7c85d0eb72c1c97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:18 +0200
Subject: [PATCH 1432/2561] kinfocenter: update to 5.24.4.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index eac578309f8d..34fe68536c24 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.24.3
+version=5.24.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-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d2f5acb7a52434e6b539dc52d23cf09754e313411b32d169f36403ba0801e223
+checksum=dc5b84964de4b68e45300477039c656d622a9546340e997eb8249de6a532b838
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 392e362bb26fa002a9c3299609679068961de513 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:20 +0200
Subject: [PATCH 1433/2561] kmenuedit: update to 5.24.4.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 02793528e9ee..3f4a699195b2 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.24.3
+version=5.24.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/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8bc5d0dfef18e4e1f561cd86f2d023b8d5f951ffd7bcc497633e4ad263cb3bfa
+checksum=147a7e9a15393375c2b22b5dfb025a87f3356cf756cf3b17615ba989bb443466

From 6836c1c558f41b20ccee8157dfdef9d3744935c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:21 +0200
Subject: [PATCH 1434/2561] kscreen: update to 5.24.4.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 00eb087ad0a1..c7f235baf15e 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.24.3
+version=5.24.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=0e814b3db2c952857bc399e9d3bc349b80ad7367ac755c22dae31004c7684bf2
+checksum=3048edb7e1231b0d7a33b2e10a202e6fce34e34f47079fc87f8177d7aa871b6a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From ad41903d1f3aa10e0d29b1c9d8977ae73764c072 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:22 +0200
Subject: [PATCH 1435/2561] kscreenlocker: update to 5.24.4.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 29b2b0c4f678..4b50eb78ee55 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.24.3
+version=5.24.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/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=03157ca122085fd6d8eeabb369c363ef706a773ad509eb5c08722a0e4bf903b6
+checksum=fb226273064422f9f73b6b091e26396349e0cfd53a88398b79fa2acd1540ecf7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From a6f3dcfa403f09f49c31d419b65099acd73526e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:24 +0200
Subject: [PATCH 1436/2561] ksshaskpass: update to 5.24.4.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 18b7a81583c3..4deaf3217e6c 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.24.3
+version=5.24.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=3bbe16721dabd7fbae659be3f21b4a386d8ca0a6d288c94ccd3954ecbd4d7847
+checksum=34c5d4f196d09c4ebe8990d3761bc70059436e272ad46a761e71b5910e0f44dd
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 425991fa6af0cfe6d92bda3680b8dc878fffb68b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:25 +0200
Subject: [PATCH 1437/2561] ksystemstats: update to 5.24.4.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 65541c9fde51..f912db7fea5e 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -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-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c303bd73bafb254ca8bb5dee0de3b7a2ec4123e719827d26268625047bb330e
+checksum=8dc735e9133ab01e537d71121b0e76e078f4fffce2d86b4c5d62c85878ee47dd

From b3205c8b86b0a3a301dc463c3e8a9b77e9eb9fd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:27 +0200
Subject: [PATCH 1438/2561] kwallet-pam: update to 5.24.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 c32def9d2ba6..9e206f9e5cc6 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.24.3
+version=5.24.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=33dd50c4d9258d1e3326980192e2523490754cd1724ff704c7e36984e5cdad7f
+checksum=99d4e1acc24e89376f6eb5fad78f6055b4c3a9fff73459845af32841743bdf68

From 8034483425a67318eba05e39549524e385b04cbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:27 +0200
Subject: [PATCH 1439/2561] oxygen-icons5: update to 5.93.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 94d05f08582d..62aa2f6abdb6 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca88b03fdd961f9f8bfa449e1fe74e3ce66e11937be9a8f6d1569a46f6429ef1
+checksum=734e3f44dc3be665350ac5de7f333ab954d3e3b777765b691603b3647c353005
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 8b657a9a98c61691e7892e7ae30ed78f9ce78026 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:28 +0200
Subject: [PATCH 1440/2561] kwayland-integration: update to 5.24.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 95e908c22286..d4dc57cef6d6 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.24.3
+version=5.24.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"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9f6f167fd16aebf550ae9bda176237ea80efae4a08826050ccbd2d7a73de05cf
+checksum=d2e74baa0e2966b92330b8df7567b0b1cc85a71ea24c3f453da39aed035aceb2

From 26d6f1d5f48b492799cdde5c8e12918ec06c5e77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:29 +0200
Subject: [PATCH 1441/2561] kwayland-server: update to 5.24.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 7bf6ed477fa5..19bd5a8345ab 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,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=560b20a15b459c5a1e8d0b38e9d53c3a75660bc798fa544e7a9d5c36260e063b
+checksum=d1790bd7584dce9a36a432819b170ce72d34d5df79083b1b41dfe3e021b6e988
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e56bcb4a0617c168dacffdde6f2951a7cde373ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:32 +0200
Subject: [PATCH 1442/2561] kwin: update to 5.24.4.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 435bcc4eb3af..855d5bcaa842 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,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=d84db7e32a13177a0bd030e6c65907cc37c28efad51ee17c518e402235cbf46b
+checksum=e2142321a9b1189665354838a66baeb2189235b705efca2364777bc3a3698ce3
 
 build_options="pipewire"
 build_options_default="pipewire"

From 487665f9c404feb89074a283e388821a4f15d378 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:33 +0200
Subject: [PATCH 1443/2561] kwrited: update to 5.24.4.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 5a556a8be1d2..38a32a832c3f 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.24.3
+version=5.24.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=2d768547e131aed99d165b0aee7b080e512a2a5ffab292bff8f71033631cede9
+checksum=62d700b673102f2740ed34e305902260c7035f5c8cc6ef19494a98f3088c0649

From e8d07f95e527e5a13c5611b230715dacfe96da9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:34 +0200
Subject: [PATCH 1444/2561] layer-shell-qt: update to 5.24.4.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 3642d9819344..0249259ea03e 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5de105ece2d7e6ca2d65305186462b0f9240930276adf7d5eedf77ffeaa67d40
+checksum=a0979fdb2f61a6d2c68fe2d93573d5b46597021600d748a379d18cb9af711e0f
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f91a8308fb7714b85c017faf383e8f8d03c2e9b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:36 +0200
Subject: [PATCH 1445/2561] libkscreen: update to 5.24.4.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 5b76a89d08d8..1b82bcea1033 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.24.3
+version=5.24.4
 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/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a6874f0f4066e16ea191341d4d7d73deaf304e117ab64306d311c862393de7a0
+checksum=016dec6d912b2a733ebdd26bfe5e31029651bd5b4e476d95a541765a68dd67f7
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From dc08951e801779107e19d23700a1f31bd1ad366d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:37 +0200
Subject: [PATCH 1446/2561] libksysguard: update to 5.24.4.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 2fac80ddba4c..c5cc1f764300 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ 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=148651cf33c7400d7a0df507d0bb75a6924e1ae80f5a46eefeaeb44c848ff1a2
+checksum=76da2a7fb7f760c55111db756d91dd3041721baa8a1f8863ad9e0bc0a6a02402
 
 build_options="webengine"
 

From c35639fee26e3fb83cb9234bb1a722ebfd014446 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:38 +0200
Subject: [PATCH 1447/2561] milou: update to 5.24.4.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 05ef7d33c83c..fe5a63847469 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.24.3
+version=5.24.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=31d70b760653e0fe4b9c1b59d7601bb52d307a3d3be3b8f67550a4ea9d22bd1b
+checksum=3109ad6c97415d74fccdfd26681360ff0925e58af7a1c72905437eb99faff37c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 0954cf3754487bc5d33d1cb7ee87895264b68a9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:40 +0200
Subject: [PATCH 1448/2561] oxygen: update to 5.24.4.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index afd58f630f81..2bfa8498a225 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.24.3
+version=5.24.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=018dbd3c276707bbcc8515424ae45a0133cd9a2e31ffd7a0bbc25522586e400a
+checksum=804d033afab3f16319d92a8e5dacfb2a5797f8661a64029ee9e9b3c0b0f87ab4

From ffdfaa5ec46b8cd424ac4ed7a5627db5069c95c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:42 +0200
Subject: [PATCH 1449/2561] plasma-browser-integration: update to 5.24.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 e7e64687c577..ad1a10231bed 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 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=40b07a0065bf24a78997fb210b0550642872ba8c41ba1df6c2cb6785d85851d7
+checksum=677af76b6f7072312d63bd8230af6e6920d7b69942ad69cdf0a29356ce695bc1

From 5f57710424a436455679c679db6f017898b58598 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:44 +0200
Subject: [PATCH 1450/2561] plasma-desktop: update to 5.24.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 58edbeb7f5d3..6d2b3752e213 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ 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=583e7ecfd2e2b766d645284cf13605851d96e2ad7cf2e657b4665aa3f3fd91d3
+checksum=b0e23046300e49acf93d9181d0c8dda2008a9a843a441af2528a91abc5c7d025
 replaces="user-manager>=0"
 python_version=3

From 676515510b110ec7c17b9687fd8878f3789713fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:46 +0200
Subject: [PATCH 1451/2561] plasma-disks: update to 5.24.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 9498075cb52d..025d7ab6e172 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.24.3
+version=5.24.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=9e71a018eb875dd70d7b30f23937098ae8d6d9eab2306b541f916ddf6b64745a
+checksum=cf8a33e81b8d3b6b2d94374eb673adec19639eef8c2df803e1721630c67525d6

From 78c14507db04d99fc1d6a0cb2edba3cf5edd3a45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:47 +0200
Subject: [PATCH 1452/2561] plasma-firewall: update to 5.24.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 474ae2d9cf17..be8466cd08c3 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcmutils
@@ -11,4 +11,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=bff36b7a922a6d0e5e20df539c6995d775f62a1d63c970b55bb430abd580ef64
+checksum=a2bae12766e6536b7cd6d6445368f8249bf79d488d30dc5d57e2aed6442d2f39

From 54c2bcc3e7e8ffeec057b934e591a158c56b99d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:48 +0200
Subject: [PATCH 1453/2561] plasma-integration: update to 5.24.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 59c8998026ba..b5f6098c11dd 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.24.3
+version=5.24.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=7aef8f3b6234b402b978d12e72d9c5eb2b82cbe587afa32f288e2e160b103c0c
+checksum=73d4993d2c7aeabbb068e8d28821566d04f2dcb882dd1d92feadc2062b3b4db4

From 29770f0b1020d9bc0d0f2237bfebac8361e0d6cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:50 +0200
Subject: [PATCH 1454/2561] plasma-nm: update to 5.24.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 cc71c9f54926..ee283ed3c555 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.24.3
+version=5.24.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=2cf64e94ed921546bc0be44f50e3490033a353bf3f0ad7a5a513ef5585fc3bfd
+checksum=086c28cfdaa6f4de785662ccd8123cd48b2a333fbaa2ca70b2a6d9dc3622ec2f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 115d8c59789a8d00c5c0b588207989794de78a3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:51 +0200
Subject: [PATCH 1455/2561] plasma-pa: update to 5.24.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 dd3e8e33c8ac..36cffcd23b04 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.24.3
+version=5.24.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=e18fbe9cf9f2948c2d3567ba0bb71126ffef8d7c4df8084a8fa0fd48c0ca0759
+checksum=ffe5b915e5e1d2e5d4de719502793dd5b91cd9715cc44f82c88fc5ff0556d325
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 18cf3aee0cec491af85073a458ebf9d77c32e2fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:53 +0200
Subject: [PATCH 1456/2561] plasma-sdk: update to 5.24.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 4d713043e9dc..98e9f404e1c2 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.24.3
+version=5.24.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=f9bad013598b8d4e8b0be4ceaa5ad5f1a3326911f7b41e754d57d7a5f1f5d63c
+checksum=ecf35743a28c350aada480248bbc138b726315e53f36bb39afe5fba0d27d6ffe
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From d25b6691c363ca37875a139eb391d54cceb5ac58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:54 +0200
Subject: [PATCH 1457/2561] plasma-systemmonitor: update to 5.24.4.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 4cdb8fc83b47..8a77dfdc1496 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -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=904c0cbf56469b4b021559cc898aef57917cbe36526317c5bc7d34f255c0439d
+checksum=1ff2853be75349892642a0144cc64a15c5f1bffacb0637e8b5c269055ead9a49

From ccb318d24ddb85bb6b717617530ad7c25ad4b8c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:55 +0200
Subject: [PATCH 1458/2561] plasma-thunderbolt: update to 5.24.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 7fbd11daa1a5..6dc40e6212fa 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.24.3
+version=5.24.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=52bec310386158c7f85cd6a8a7db5bedabdb8494f4c6818d8466aa33a6dba5df
+checksum=1efecdd4b5e3302b37ae28964cd371d404189f7879a9752f000b6df4745b0ab3
 
 do_check() {
 	: # Requires running dbus and bolt services

From 916aaeb6153e72fe9f0e09b14a4ce0eadd269b4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:57 +0200
Subject: [PATCH 1459/2561] plasma-vault: update to 5.24.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 980ab7d44e7e..7010aff50a86 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -14,4 +14,4 @@ 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=8d4998fd105073ce8ae6012426c0bd024529e0ae67c3c3ea9178918fcf87be38
+checksum=0169c2b8d48fbfccf132317f62cec342d2f1cbc7352e52a513ca575198f84966

From 27337e27613b8e87e814535aabc98183d6a58310 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:09 +0200
Subject: [PATCH 1460/2561] plasma-workspace-wallpapers: update to 5.24.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 4d21268470de..f0f8e072fbeb 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.24.3
+version=5.24.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=da252edb70b3373c38fb30318a44f52f047d4f31cbbd26c01c30bf2398c43848
+checksum=243cf6bb613d30ccb92e183938dcd3e02c1c7a11624a447c35c56a5eac3def42

From 26be55875f8e6cd8ae4dd5612aa5cd1cdef0f061 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:13 +0200
Subject: [PATCH 1461/2561] plasma-workspace: update to 5.24.4.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index a8ae6f591b0a..ac82a06c4a9e 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,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=104c5c0ebb000f48c749a6bafdde4cbb1b06d188e1a23ef95a2d035cce442ab4
+checksum=5b0e40b090d6bd1fe1f902a60633e4417ce711b34c32bfd2fce5b16bb9b2ec70
 
 build_options="pipewire"
 build_options_default="pipewire"

From 26f704c75f75bdb106582725c3073e78ab023d3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:14 +0200
Subject: [PATCH 1462/2561] polkit-kde-agent: update to 5.24.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 53ebff5a685c..84ef537290aa 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.24.3
+version=5.24.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=788d392c811ee7c8098d294ccc9fff7f7a695977689a66cb4a1cb52d6f4779d5
+checksum=955246c593d0332bfbe386e81aaf7714e9ac8b8e7743c8c2e4f334b28dd685ad

From 1f91867be5c7daf8ead309401b43aef87b1d88ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:16 +0200
Subject: [PATCH 1463/2561] powerdevil: update to 5.24.4.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 3eb123d13d50..32ac96524c8f 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.24.3
+version=5.24.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=495275be84a96572d2e2a7ee343e1ab98c79e7c8eef402a7f26d86863e25f010
+checksum=ef70c00e36d4ddbaedeb0efeba68523289e6e112b12951460c8d36075de9546a

From b0c8c4e9be538453c387ddc3baf34254453304cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:17 +0200
Subject: [PATCH 1464/2561] sddm-kcm: update to 5.24.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 95d916cf3e1d..e0b11b4e4cdc 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.24.3
+version=5.24.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=d0d01ceda262734e87f0cfc28138a1b5478651722a703a55ac744c4e676ec696
+checksum=bef347b9e066a756d71263b19552fbbf9b8a1d6d22861060bdfd1ead5ab9d85d

From 24ddd6dfe317f0e46f7bcf60117cd92c920ef1e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:19 +0200
Subject: [PATCH 1465/2561] systemsettings: update to 5.24.4.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 57c764dcde4e..b18700451dd6 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.24.3
+version=5.24.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-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6200618137f9a1411007a78f9b50eaf78048ce9819428d997a44816d6093d585
+checksum=69921f98956b3559f8c37821b67d32ac8d6aef254888c15df8f86f99903e1533

From 971a33660897cf7e11f6123f614f9abb77c50232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:20 +0200
Subject: [PATCH 1466/2561] xdg-desktop-portal-kde: update to 5.24.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 23aaba046f68..9f3a47148a1b 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.24.3
+version=5.24.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=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b
+checksum=11684916288bb4a452b75004e2d122a4a1264a562f7945af98d466e49c59dc1e

From 488b93432224208888d8b1e510453a9024b11bbb Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:05:33 -0300
Subject: [PATCH 1467/2561] New package: uucp-1.07

This package contains the standard UUCP package from the Free Software Foundation, with uucico, uusched, uuxqt, uux, uucp, uustat, uulog, uuname, uuto, uupick and cu.

Added files

Added install files, man manuals and patches.

Fixed whitespace and using vman

Removed -R

Added suggested changes

Added underlining

 New suggested changes
---
 srcpkgs/uucp/INSTALL                          |    7 +
 srcpkgs/uucp/files/uulog.1                    |   53 +
 srcpkgs/uucp/files/uuname.1                   |   33 +
 srcpkgs/uucp/files/uupick.1                   |   34 +
 srcpkgs/uucp/files/uusched.8                  |   20 +
 srcpkgs/uucp/files/uuto.1                     |   21 +
 srcpkgs/uucp/patches/compiler-warnings.patch  |   15 +
 srcpkgs/uucp/patches/manpage.patch            |  189 +
 srcpkgs/uucp/patches/no-sleep.patch           |   65 +
 .../option-to-not-force-hw-control.patch      |  321 +
 srcpkgs/uucp/patches/spelling.patch           |   28 +
 srcpkgs/uucp/patches/uucp-alt-misc.patch      |  111 +
 srcpkgs/uucp/patches/uucp-org.patch           | 8833 +++++++++++++++++
 .../patches/wait-for-correct-parent.patch     |   19 +
 .../uucp/patches/zpipe-improved-pipe.patch    |   40 +
 srcpkgs/uucp/template                         |   39 +
 16 files changed, 9828 insertions(+)
 create mode 100644 srcpkgs/uucp/INSTALL
 create mode 100644 srcpkgs/uucp/files/uulog.1
 create mode 100644 srcpkgs/uucp/files/uuname.1
 create mode 100644 srcpkgs/uucp/files/uupick.1
 create mode 100644 srcpkgs/uucp/files/uusched.8
 create mode 100644 srcpkgs/uucp/files/uuto.1
 create mode 100644 srcpkgs/uucp/patches/compiler-warnings.patch
 create mode 100644 srcpkgs/uucp/patches/manpage.patch
 create mode 100644 srcpkgs/uucp/patches/no-sleep.patch
 create mode 100644 srcpkgs/uucp/patches/option-to-not-force-hw-control.patch
 create mode 100644 srcpkgs/uucp/patches/spelling.patch
 create mode 100644 srcpkgs/uucp/patches/uucp-alt-misc.patch
 create mode 100644 srcpkgs/uucp/patches/uucp-org.patch
 create mode 100644 srcpkgs/uucp/patches/wait-for-correct-parent.patch
 create mode 100644 srcpkgs/uucp/patches/zpipe-improved-pipe.patch
 create mode 100644 srcpkgs/uucp/template

diff --git a/srcpkgs/uucp/INSTALL b/srcpkgs/uucp/INSTALL
new file mode 100644
index 000000000000..b82c17321a29
--- /dev/null
+++ b/srcpkgs/uucp/INSTALL
@@ -0,0 +1,7 @@
+case ${ACTION} in
+post)
+	# fix permissions and owners
+	chown _uucp:_uucp usr/bin/uucico usr/bin/uuxqt usr/bin/uux usr/bin/uucp usr/bin/uustat usr/bin/uuname	usr/bin/cu
+	chmod 4555 usr/bin/uucico usr/bin/uuxqt usr/bin/uux usr/bin/uucp usr/bin/uustat usr/bin/uuname	usr/bin/cu
+	;;
+esac
diff --git a/srcpkgs/uucp/files/uulog.1 b/srcpkgs/uucp/files/uulog.1
new file mode 100644
index 000000000000..001c9bb6993d
--- /dev/null
+++ b/srcpkgs/uucp/files/uulog.1
@@ -0,0 +1,53 @@
+.\" This is under the same license as uulog itself
+.TH UULOG 1
+.SH NAME
+uulog \- Display the UUCP log file.
+.SH SYNOPSIS
+.B uulog
+[\fI\-n number\fR] [\fI\-sf system\fR] [\fI\-u user\fR] [\fI\-DSF\fR] 
+[\fI\-I file\fR] [\fI\-X debug\fR]
+.SH DESCRIPTION
+.I Uulog
+is a program that displays the log file for the Taylor UUCP service.  
+.SH OPTIONS
+.TP
+\fB-n\fR, \fB--lines\fR \fInumber\fR
+Show the given number of lines from the end of the log.
+.TP
+\fB-s\fR, \fB--system\fR \fIsystem\fR
+Print entries for the named system.
+.TP
+\fB-f\fR \fIsystem\fR, \fB--follow\fR=\fIsystem\fR
+Follow entries for the named system.
+.TP
+\fB-u\fR, \fB--user\fR \fIuser\fR
+Print entries for the named user.
+.TP
+\fB-F\fR, \fB--follow\fR
+Follow entries for any system.
+.TP
+\fB-S\fR, \fB--statslog\fR
+Show the statistics file.
+.TP
+\fB-D\fR, \fB--debuglog\fR
+Show the debugging file.
+.TP
+\fB-X\fR, \fB--debug\fR \fIdebug\fR
+Set the debugging level.
+.TP
+\fB-I\fR, \fB--config\fR \fIfile\fR
+Set the configuration file to use.
+.TP
+\fB-v\fR, \fB--version\fR
+Print the software version and exit.
+.TP
+\fB--help\fR
+Print a help screen and exit.
+.SH BUGS
+According to comments in the source, this is a pretty bad implementation 
+of uulog.  It only takes a single \-s and/or \-u switch.
+.SH "SEE ALSO"
+.BR uucp(1) 
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>, by making a manpage out of \fBuulog\fR \fI--help\fR.
diff --git a/srcpkgs/uucp/files/uuname.1 b/srcpkgs/uucp/files/uuname.1
new file mode 100644
index 000000000000..3a23e9407f56
--- /dev/null
+++ b/srcpkgs/uucp/files/uuname.1
@@ -0,0 +1,33 @@
+.\" This is under the same license as uuname itself
+.TH UUNAME 1
+.SH NAME
+uuname \- List the names of the known remote UUCP sites.
+.SH SYNOPSIS
+.B uuname
+[\fI\-a\fR] [\fI\-l\fR] [\fI\-I file\fR]
+.SH DESCRIPTION
+.I Uuname
+is a program that lists the names of the known remote UUCP sites.
+.SH OPTIONS
+.TP
+\fB-a\fR, \fB--aliases\fR
+Display aliases.
+.TP
+\fB-l\fR, \fB--local\fR
+Print the local name.
+.TP
+\fB-I\fR, \fB--config\fR \fIfile\fR
+Set the configuration file to use.
+.TP
+\fB-v\fR, \fB--version\fR
+Print the software version and exit.
+.TP
+\fB--help\fR
+Print a help screen and exit.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucp(1) 
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>, by making a manpage out of \fBuuname\fR \fI--help\fR.
diff --git a/srcpkgs/uucp/files/uupick.1 b/srcpkgs/uucp/files/uupick.1
new file mode 100644
index 000000000000..d2b9377d08ff
--- /dev/null
+++ b/srcpkgs/uucp/files/uupick.1
@@ -0,0 +1,34 @@
+.\" This is under the same license as uupick itself
+.TH UUPICK 1
+.SH NAME
+uupick \- Get files stored in the public directory by uucp \-t.
+.SH SYNOPSIS
+.B uupick
+[\fI\-s system\fR] [\fI\-x debug\fR] [\fI\-I file\fR]
+.SH DESCRIPTION
+.I Uupick
+is a program that gets the files stored in the public directory 
+by uucp \-t.
+.SH OPTIONS
+.TP
+\fB-s\fR, \fB--system\fR \fIsystem\fR
+Only consider files from named system.
+.TP
+\fB-x\fR, \fB--debug\fR \fIdebug\fR
+Set the debugging level.
+.TP
+\fB-I\fR, \fB--config\fR \fIfile\fR
+Set the configuration file to use.
+.TP
+\fB-v\fR, \fB--version\fR
+Print the software version and exit.
+.TP
+\fB--help\fR
+Print a help screen and exit.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucp(1) 
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>, by making a manpage out of \fBuupick\fR \fI--help\fR.
diff --git a/srcpkgs/uucp/files/uusched.8 b/srcpkgs/uucp/files/uusched.8
new file mode 100644
index 000000000000..17a00d68ee25
--- /dev/null
+++ b/srcpkgs/uucp/files/uusched.8
@@ -0,0 +1,20 @@
+.\" This is under the same license as uusched itself
+.TH UUSCHED 8
+.SH NAME
+uusched \- Call all systems which have work in a random order. 
+.SH SYNOPSIS
+.B uusched 
+.SH DESCRIPTION
+.I Uusched
+is a program that calls all systems which have work in a random order. 
+.SH OPTIONS
+Since this a simply a shell script which execs uucico(8), see that manpage 
+for further options.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucico(8),
+.BR sh(1)
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>.
diff --git a/srcpkgs/uucp/files/uuto.1 b/srcpkgs/uucp/files/uuto.1
new file mode 100644
index 000000000000..1d35efff7c41
--- /dev/null
+++ b/srcpkgs/uucp/files/uuto.1
@@ -0,0 +1,21 @@
+.\" This is under the same license as uuto itself
+.TH UUTO 1
+.SH NAME
+uuto \- Send files to a user on another system.
+.SH SYNOPSIS
+.B uuto
+\fIsystem!user\fR
+.SH DESCRIPTION
+.I Uuto
+is a program that sends files to a user on another system.
+.SH OPTIONS
+Since this a simply a shell script that execs uucp(1), see that manpage 
+for further options.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucp(1),
+.BR sh(1)
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>.
diff --git a/srcpkgs/uucp/patches/compiler-warnings.patch b/srcpkgs/uucp/patches/compiler-warnings.patch
new file mode 100644
index 000000000000..5e9dc93d04f5
--- /dev/null
+++ b/srcpkgs/uucp/patches/compiler-warnings.patch
@@ -0,0 +1,15 @@
+Description: remove compiler warnings that nowadays result in errors
+Author: Thorsten Alteholz <debian@alteholz.de>
+Index: uucp/uuconv.c
+===================================================================
+--- uucp.orig/uuconv.c	2013-04-26 16:06:16.000000000 +0200
++++ uucp/uuconv.c	2013-05-08 10:49:06.000000000 +0200
+@@ -676,7 +676,7 @@
+     {
+       if ((*pz)[0] != '-' && pz != pzarg)
+ 	fprintf (e, " ");
+-      fprintf (e, *pz);
++      fprintf (e, "%s", *pz);
+     }
+ }
+ 
diff --git a/srcpkgs/uucp/patches/manpage.patch b/srcpkgs/uucp/patches/manpage.patch
new file mode 100644
index 000000000000..573deb3f2c79
--- /dev/null
+++ b/srcpkgs/uucp/patches/manpage.patch
@@ -0,0 +1,189 @@
+Description: lintian detects some issues with these manpages
+Author: Thorsten Alteholz <debian@alteholz.de>
+Index: uucp-1.07/contrib/uurate.man
+===================================================================
+--- uucp-1.07.orig/contrib/uurate.man	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/contrib/uurate.man	2019-01-12 19:51:27.927352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uurate.man,v 1.4 1993/09/28 17:38:31 kdburg Rel $
++.\" ''' $Id: uurate.man,v 1.4 1993/09/28 17:38:31 kdburg Rel $
+ .TH uurate 1
+ .SH NAME
+ uurate \- Report Taylor UUCP statistics
+Index: uucp-1.07/uucp.1
+===================================================================
+--- uucp-1.07.orig/uucp.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uucp.1	2019-01-12 19:52:26.547350782 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $
++.\"''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $
+ .TH uucp 1 "Taylor UUCP 1.07"
+ .SH NAME
+ uucp \- Unix to Unix copy
+@@ -67,10 +67,10 @@
+ .I uucico
+ (8) daemon, the copy will fail.  The files must be readable by the
+ .I uucico
+-(8) daemon, and by the invoking user.
++(8) daemon, and by the invoking user.   This is the default.
+ .TP 5
+ .B \-C, \-\-copy
+-Copy local source files to the spool directory.  This is the default.
++Copy local source files to the spool directory.
+ .TP 5
+ .B \-d, \-\-directories
+ Create all necessary directories when doing the copy.  This is the
+Index: uucp-1.07/uustat.1
+===================================================================
+--- uucp-1.07.orig/uustat.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uustat.1	2019-01-12 19:51:27.927352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $
++.\" ''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $
+ .TH uustat 1 "Taylor UUCP 1.07"
+ .SH NAME
+ uustat \- UUCP status inquiry and control
+@@ -404,7 +404,7 @@
+ .SH EXAMPLES
+ .br
+ .nf
+-uustat --all
++uustat \-\-all
+ .fi
+ Display status of all jobs.  A sample output line is as follows:
+ .br
+@@ -441,7 +441,7 @@
+ 
+ .br
+ .nf
+-uustat --executions
++uustat \-\-executions
+ .fi
+ Display status of queued up execution requests.  A sample output line
+ is as follows:
+@@ -472,7 +472,7 @@
+ 
+ .br
+ .nf
+-uustat --list
++uustat \-\-list
+ .fi
+ Display status for all systems with queued up commands.  A sample
+ output line is as follows:
+@@ -489,7 +489,7 @@
+ 
+ .br
+ .nf
+-uustat --status
++uustat \-\-status
+ .fi
+ Display conversation status for all remote systems.  A sample output
+ line is as follows:
+@@ -509,7 +509,7 @@
+ 
+ .br
+ .nf
+-uustat --ps
++uustat \-\-ps
+ .fi
+ Display the status of all processes holding UUCP locks.  The output
+ format is system dependent, as
+@@ -521,7 +521,7 @@
+ .br
+ .in +0.5i
+ .nf
+-uustat --command rmail --older-than 168 --kill-all --no-list --mail --notify --comment "Queued for over 1 week"
++uustat \-\-command rmail \-\-older\-than 168 \-\-kill\-all \-\-no\-list \-\-mail \-\-notify \-\-comment "Queued for over 1 week"
+ .fi
+ .in -0.5i
+ This will kill all
+Index: uucp-1.07/cu.1
+===================================================================
+--- uucp-1.07.orig/cu.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/cu.1	2019-01-12 19:58:34.000000000 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $
++.\" ''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $
+ .TH cu 1 "Taylor UUCP 1.07"
+ .SH NAME
+ cu \- Call up another system
+Index: uucp-1.07/uucico.8
+===================================================================
+--- uucp-1.07.orig/uucico.8	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uucico.8	2019-01-12 19:51:27.927352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $
++.\" ''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $
+ .TH uucico 8 "Taylor UUCP 1.07"
+ .SH NAME
+ uucico \- UUCP file transfer daemon
+@@ -56,7 +56,7 @@
+ .I uucico
+ will normally refuse to retry the
+ call until a certain (configurable) amount of time
+-has passed.  This may be overriden by the
++has passed.  This may be overridden by the
+ .B -f,
+ .B --force,
+ or
+@@ -175,11 +175,11 @@
+ .B \-\-system,
+ or 
+ .B \-S
+-is specifed, or to all systems which have work when just
++is specified, or to all systems which have work when just
+ .B \-r1
+ or
+ .B \-\-master
+-is specifed), begin an endless loop as with
++is specified), begin an endless loop as with
+ .B \-\-loop.
+ .TP 5
+ .B \-q, \-\-nouuxqt
+Index: uucp-1.07/uux.1
+===================================================================
+--- uucp-1.07.orig/uux.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uux.1	2019-01-12 19:51:27.931352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $
++.\" ''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $
+ .TH uux 1 "Taylor UUCP 1.07"
+ .SH NAME
+ uux \- Remote command execution over UUCP
+@@ -202,7 +202,7 @@
+ .SH EXAMPLES
+ .br
+ .nf
+-uux -z - sys1!rmail user1
++uux \-z \- sys1!rmail user1
+ .fi
+ Execute the command ``rmail user1'' on the system sys1, giving it as
+ standard input whatever is given to
+@@ -213,7 +213,7 @@
+ 
+ .br
+ .nf
+-uux 'diff -c sys1!~user1/file1 sys2!~user2/file2 >!file.diff'
++uux 'diff \-c sys1!~user1/file1 sys2!~user2/file2 >!file.diff'
+ .fi
+ Fetch the two named files from system sys1 and system sys2 and execute
+ .I diff
+Index: uucp-1.07/uuxqt.8
+===================================================================
+--- uucp-1.07.orig/uuxqt.8	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uuxqt.8	2019-01-12 19:51:27.931352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $
++.\" ''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $
+ .TH uuxqt 8 "Taylor UUCP 1.07"
+ .SH NAME
+ uuxqt \- UUCP execution daemon
+@@ -41,7 +41,7 @@
+ .br
+ .in +0.5i
+ .nf
+-uuxqt --command rmail
++uuxqt \-\-command rmail
+ .fi
+ .in -0.5i
+ .TP 5
diff --git a/srcpkgs/uucp/patches/no-sleep.patch b/srcpkgs/uucp/patches/no-sleep.patch
new file mode 100644
index 000000000000..b8b43350770f
--- /dev/null
+++ b/srcpkgs/uucp/patches/no-sleep.patch
@@ -0,0 +1,65 @@
+Description: avoid sleeps
+Author: Frank Heckenbach
+Index: uucp-1.07/prott.c
+===================================================================
+--- uucp-1.07.orig/prott.c	2017-09-27 12:24:15.963165757 +0200
++++ uucp-1.07/prott.c	2017-09-27 12:24:15.959165687 +0200
+@@ -88,7 +88,7 @@
+   zTbuf[0] = 0;
+   zTbuf[1] = 0;
+   fTfile = FALSE;
+-  usysdep_sleep (2);
++  // usysdep_sleep (2);  -- why? protocol t is meant to be used over an error-free connection
+   return TRUE;
+ }
+ \f
+Index: uucp-1.07/unix/pipe.c
+===================================================================
+--- uucp-1.07.orig/unix/pipe.c	2017-09-27 12:24:15.963165757 +0200
++++ uucp-1.07/unix/pipe.c	2017-09-27 12:24:15.959165687 +0200
+@@ -165,10 +165,43 @@
+   if (qsysdep->ipid >= 0)
+     {
+       if (kill (qsysdep->ipid, SIGHUP) == 0)
+-        usysdep_sleep (2);
++        {
++          #if defined (HAVE_USLEEP) && defined (HAVE_WAITPID)
++          /* Avoid wasting 4 seconds (including the SIGPIPE case below).
++             Quick and dirty work-around to avoid depending on SIGCHLD:
++             Just sleep up to 20 times 0.1s as long as the child exists. */
++          int i, status;
++          for (i = 20; i > 0; i--)
++            {
++              if (waitpid (qsysdep->ipid, &status, WNOHANG) == qsysdep->ipid)
++                {
++                  qsysdep->ipid = -1;
++                  return fret;
++                }
++              usleep (100000);
++            }
++          #else
++          usysdep_sleep (2);
++          #endif
++        }
+ #ifdef SIGPIPE
+       if (kill (qsysdep->ipid, SIGPIPE) == 0)
+-        usysdep_sleep (2);
++        {
++          #if HAVE_USLEEP
++          int i, status;
++          for (i = 20; i > 0; i--)
++            {
++              if (waitpid (qsysdep->ipid, &status, WNOHANG) == qsysdep->ipid)
++                {
++                  qsysdep->ipid = -1;
++                  return fret;
++                }
++              usleep (100000);
++            }
++          #else
++          usysdep_sleep (2);
++          #endif
++        }
+ #endif
+       if (kill (qsysdep->ipid, SIGKILL) < 0 && errno == EPERM)
+ 	{
diff --git a/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch b/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch
new file mode 100644
index 000000000000..3a7e4ea91fa2
--- /dev/null
+++ b/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch
@@ -0,0 +1,321 @@
+Description: avoid forcing hw control
+Author: Michal Suchanek
+Index: uucp-1.07/conn.h
+===================================================================
+--- uucp-1.07.orig/conn.h	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/conn.h	2013-12-04 11:20:26.022181350 +0100
+@@ -117,7 +117,7 @@
+   boolean (*pfunlock) P((struct sconnection *qconn));
+   /* Open the connection.  */
+   boolean (*pfopen) P((struct sconnection *qconn, long ibaud,
+-		       boolean fwait, boolean fuser));
++		       boolean fwait, boolean fuser, boolean nortscts));
+   /* Close the connection.  */
+   boolean (*pfclose) P((struct sconnection *qconn,
+ 			pointer puuconf,
+@@ -198,7 +198,7 @@
+    than the effective permissions.  */
+ extern boolean fconn_open P((struct sconnection *qconn, long ibaud,
+ 			     long ihighbaud, boolean fwait,
+-			     boolean fuser));
++			     boolean fuser, boolean nortscts));
+ 
+ /* Close a connection.  The fsuccess argument is TRUE if the
+    conversation completed normally, FALSE if it is being aborted.  */
+Index: uucp-1.07/cu.c
+===================================================================
+--- uucp-1.07.orig/cu.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/cu.c	2013-12-04 11:27:03.353425764 +0100
+@@ -223,6 +223,7 @@
+   { "baud", required_argument, NULL, 's' },
+   { "mapcr", no_argument, NULL, 't' },
+   { "nostop", no_argument, NULL, 3 },
++  { "nortscts", no_argument, NULL, 'f' },
+   { "system", required_argument, NULL, 'z' },
+   { "config", required_argument, NULL, 'I' },
+   { "debug", required_argument, NULL, 'x' },
+@@ -258,6 +259,8 @@
+   enum txonxoffsetting txonxoff = XONXOFF_ON;
+   /* -I: configuration file name.  */
+   const char *zconfig = NULL;
++  /* -f: no hardware flow control */
++  boolean nortscts = FALSE;
+   int iopt;
+   pointer puuconf;
+   int iuuconf;
+@@ -295,7 +298,7 @@
+ 	}
+     }
+ 
+-  while ((iopt = getopt_long (argc, argv, "a:c:deE:hnI:l:op:s:tvx:z:",
++  while ((iopt = getopt_long (argc, argv, "a:c:deE:fhnI:l:op:s:tvx:z:",
+ 			      asCulongopts, (int *) NULL)) != EOF)
+     {
+       switch (iopt)
+@@ -322,6 +325,11 @@
+ 	  zCuvar_escape = optarg;
+ 	  break;
+ 
++	case 'f':
++	  /* No hardware flow control.  */
++	  nortscts = TRUE;
++	  break;
++
+ 	case 'h':
+ 	  /* Local echo.  */
+ 	  fCulocalecho = TRUE;
+@@ -682,7 +690,7 @@
+ 	}
+ 
+       /* Here we have locked a connection to use.  */
+-      if (! fconn_open (&sconn, iusebaud, ihighbaud, FALSE, sinfo.fdirect))
++      if (! fconn_open (&sconn, iusebaud, ihighbaud, FALSE, sinfo.fdirect, nortscts))
+ 	ucuabort ();
+ 
+       fCuclose_conn = TRUE;
+Index: uucp-1.07/conn.c
+===================================================================
+--- uucp-1.07.orig/conn.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/conn.c	2013-12-04 11:20:26.026181299 +0100
+@@ -114,12 +114,13 @@
+ /* Open a connection.  */
+ 
+ boolean
+-fconn_open (qconn, ibaud, ihighbaud, fwait, fuser)
++fconn_open (qconn, ibaud, ihighbaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      long ihighbaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   boolean fret;
+ 
+@@ -177,7 +178,7 @@
+   else
+     ulog_device (qconn->qport->uuconf_zname);
+ 
+-  fret = (*qconn->qcmds->pfopen) (qconn, ibaud, fwait, fuser);
++  fret = (*qconn->qcmds->pfopen) (qconn, ibaud, fwait, fuser, nortscts);
+ 
+   if (! fret)
+     ulog_device ((const char *) NULL);
+Index: uucp-1.07/uucico.c
+===================================================================
+--- uucp-1.07.orig/uucico.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/uucico.c	2013-12-04 11:20:26.026181299 +0100
+@@ -695,7 +695,7 @@
+ 
+       if (fret)
+ 	{
+-	  if (! fconn_open (&sconn, (long) 0, (long) 0, TRUE, FALSE))
++	  if (! fconn_open (&sconn, (long) 0, (long) 0, TRUE, FALSE, FALSE))
+ 	    fret = FALSE;
+ 	  qConn = &sconn;
+ 	}
+@@ -714,7 +714,7 @@
+ 				     (struct uuconf_dialer *) NULL,
+ 				     TRUE)
+ 		      || ! fconn_open (&sconn, (long) 0, (long) 0, TRUE,
+-				       FALSE))
++				       FALSE, FALSE))
+ 		    break;
+ 		}
+ 	      fret = FALSE;
+@@ -1176,7 +1176,7 @@
+     }
+ 
+   if (! fconn_open (&sconn, qsys->uuconf_ibaud, qsys->uuconf_ihighbaud,
+-		    FALSE, FALSE))
++		    FALSE, FALSE, FALSE))
+     {
+       terr = STATUS_PORT_FAILED;
+       fret = FALSE;
+Index: uucp-1.07/unix/pipe.c
+===================================================================
+--- uucp-1.07.orig/unix/pipe.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/pipe.c	2013-12-04 11:20:26.026181299 +0100
+@@ -49,7 +49,7 @@
+ 
+ static void uspipe_free P((struct sconnection *qconn));
+ static boolean fspipe_open P((struct sconnection *qconn, long ibaud,
+-			      boolean fwait, boolean fuser));
++			      boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fspipe_close P((struct sconnection *qconn,
+ 			       pointer puuconf,
+ 			       struct uuconf_dialer *qdialer,
+@@ -115,11 +115,12 @@
+ 
+ /*ARGSUSED*/
+ static boolean
+-fspipe_open (qconn, ibaud, fwait, fuser)
++fspipe_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn ATTRIBUTE_UNUSED;
+      long ibaud ATTRIBUTE_UNUSED;
+      boolean fwait;
+      boolean fuser ATTRIBUTE_UNUSED;
++     boolean nortscts ATTRIBUTE_UNUSED;
+ {
+   /* We don't do incoming waits on pipes.  */
+   if (fwait)
+Index: uucp-1.07/unix/serial.c
+===================================================================
+--- uucp-1.07.orig/unix/serial.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/serial.c	2013-12-04 11:20:26.026181299 +0100
+@@ -246,11 +246,11 @@
+ 				boolean fwait, boolean fuser,
+ 				enum tclocal_setting tlocal));
+ static boolean fsstdin_open P((struct sconnection *qconn, long ibaud,
+-			       boolean fwait, boolean fuser));
++			       boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fsmodem_open P((struct sconnection *qconn, long ibaud,
+-			       boolean fwait, boolean fuser));
++			       boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fsdirect_open P((struct sconnection *qconn, long ibaud,
+-				boolean fwait, boolean fuser));
++				boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fsblock P((struct ssysdep_conn *q, boolean fblock));
+ static boolean fsserial_close P((struct ssysdep_conn *q));
+ static boolean fsstdin_close P((struct sconnection *qconn,
+@@ -1308,11 +1308,12 @@
+    call to fsblock.  */
+ 
+ static boolean
+-fsstdin_open (qconn, ibaud, fwait, fuser)
++fsstdin_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   struct ssysdep_conn *q;
+ 
+@@ -1323,6 +1324,9 @@
+   q->o = q->ord;
+   if (! fsserial_open (qconn, ibaud, fwait, fuser, IGNORE_CLOCAL))
+     return FALSE;
++  if (nortscts
++      && ! fsserial_hardflow (qconn, FALSE))
++    return FALSE;
+   q->iwr_flags = fcntl (q->owr, F_GETFL, 0);
+   if (q->iwr_flags < 0)
+     {
+@@ -1335,11 +1339,12 @@
+ /* Open a modem port.  */
+ 
+ static boolean
+-fsmodem_open (qconn, ibaud, fwait, fuser)
++fsmodem_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   struct uuconf_modem_port *qm;
+ 
+@@ -1356,7 +1361,10 @@
+      out, because some modems don't assert the necessary signals until
+      they see carrier.  Instead, we turn on hardware flow control in
+      fsmodem_carrier.  */
+-  if (fwait
++  if (nortscts
++      && ! fsserial_hardflow (qconn, FALSE))
++    return FALSE;
++  else if (fwait
+       && ! fsserial_hardflow (qconn, qm->uuconf_fhardflow))
+     return FALSE;
+ 
+@@ -1366,11 +1374,12 @@
+ /* Open a direct port.  */
+ 
+ static boolean
+-fsdirect_open (qconn, ibaud, fwait, fuser)
++fsdirect_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   struct uuconf_direct_port *qd;
+ 
+@@ -1383,7 +1392,7 @@
+ 
+   /* Always turn on hardware flow control for a direct port when it is
+      opened.  There is no other sensible time to turn it on.  */
+-  return fsserial_hardflow (qconn, qd->uuconf_fhardflow);
++  return fsserial_hardflow (qconn, qd->uuconf_fhardflow && ! nortscts);
+ }
+ \f
+ /* Change the blocking status of the port.  We keep track of the
+Index: uucp-1.07/unix/tcp.c
+===================================================================
+--- uucp-1.07.orig/unix/tcp.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/tcp.c	2013-12-04 11:20:26.026181299 +0100
+@@ -78,7 +78,7 @@
+ #endif
+ static boolean ftcp_set_flags P((struct ssysdep_conn *qsysdep));
+ static boolean ftcp_open P((struct sconnection *qconn, long ibaud,
+-			    boolean fwait, boolean fuser));
++			    boolean fwait, boolean fuser, boolean nortscts));
+ static boolean ftcp_close P((struct sconnection *qconn,
+ 			     pointer puuconf,
+ 			     struct uuconf_dialer *qdialer,
+@@ -208,11 +208,12 @@
+    system.  */
+ 
+ static boolean
+-ftcp_open (qconn, ibaud, fwait, fuser)
++ftcp_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud ATTRIBUTE_UNUSED;
+      boolean fwait;
+      boolean fuser ATTRIBUTE_UNUSED;
++     boolean nortscts ATTRIBUTE_UNUSED;
+ {
+   struct ssysdep_conn *qsysdep;
+   const char *zport;
+Index: uucp-1.07/unix/tli.c
+===================================================================
+--- uucp-1.07.orig/unix/tli.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/tli.c	2013-12-04 11:20:26.026181299 +0100
+@@ -106,7 +106,7 @@
+ static void utli_free P((struct sconnection *qconn));
+ static boolean ftli_push P((struct sconnection *qconn));
+ static boolean ftli_open P((struct sconnection *qconn, long ibaud,
+-			    boolean fwait, boolean fuser));
++			    boolean fwait, boolean fuser, boolean nortscts));
+ static boolean ftli_close P((struct sconnection *qconn,
+ 			     pointer puuconf,
+ 			     struct uuconf_dialer *qdialer,
+@@ -238,11 +238,12 @@
+    system.  */
+ 
+ static boolean
+-ftli_open (qconn, ibaud, fwait, fuser)
++ftli_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser ATTRIBUTE_UNUSED;
++     boolean nortscts ATTRIBUTE_UNUSED;
+ {
+   struct ssysdep_conn *qsysdep;
+   const char *zdevice;
+Index: uucp-1.07/cu.1
+===================================================================
+--- uucp-1.07.orig/cu.1	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/cu.1	2013-12-04 11:20:26.026181299 +0100
+@@ -231,6 +231,9 @@
+ .B \-\-nostop
+ Turn off XON/XOFF handling (it is on by default).
+ .TP 5
++.B \-f, \-\-nortscts
++Do not use hardware flow control.
++.TP 5
+ .B \-E char, \-\-escape char
+ Set the escape character.  Initially
+ .B ~
diff --git a/srcpkgs/uucp/patches/spelling.patch b/srcpkgs/uucp/patches/spelling.patch
new file mode 100644
index 000000000000..b96223fcd235
--- /dev/null
+++ b/srcpkgs/uucp/patches/spelling.patch
@@ -0,0 +1,28 @@
+Author: Thorsten Alteholz <debian@alteholz.de>
+Description: correct spelling error in binary
+Index: uucp-1.07/cu.c
+===================================================================
+--- uucp-1.07.orig/cu.c	2019-01-12 19:50:00.447355162 +0100
++++ uucp-1.07/cu.c	2019-01-12 19:50:00.435355162 +0100
+@@ -1756,7 +1756,7 @@
+     zfrom = zbufcpy (argv[1]);
+   else
+     {
+-      zfrom = zsysdep_terminal_line ("Remote file to retreive: ");
++      zfrom = zsysdep_terminal_line ("Remote file to retrieve: ");
+       if (zfrom == NULL)
+ 	ucuabort ();
+       zfrom[strcspn (zfrom, " \t\n")] = '\0';
+Index: uucp-1.07/uuxqt.c
+===================================================================
+--- uucp-1.07.orig/uuxqt.c	2003-05-29 08:08:48.000000000 +0200
++++ uucp-1.07/uuxqt.c	2019-01-12 19:50:32.907354189 +0100
+@@ -1517,7 +1517,7 @@
+ 	  az[i++] = zQcmd;
+ 	  az[i++] = "\n";
+ 
+-	  (void) fsysdep_mail (zmail, "Execution succeded", i, az);
++	  (void) fsysdep_mail (zmail, "Execution succeeded", i, az);
+ 	}
+ 
+       /* Now we may have to uucp the output to some other machine.  */
diff --git a/srcpkgs/uucp/patches/uucp-alt-misc.patch b/srcpkgs/uucp/patches/uucp-alt-misc.patch
new file mode 100644
index 000000000000..841b2e212831
--- /dev/null
+++ b/srcpkgs/uucp/patches/uucp-alt-misc.patch
@@ -0,0 +1,111 @@
+--- uucp-1.07.orig/policy.h	2003-05-29 03:08:45.000000000 -0300
++++ uucp-1.07.orig/policy.h	2020-03-09 03:48:58.317291375 -0300
+@@ -240,8 +240,8 @@
+    the sendmail choice below.  Otherwise, select one of the other
+    choices as appropriate.  */
+ #if 1
+-#define MAIL_PROGRAM "/usr/lib/sendmail -t"
+-/* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
++/* #define MAIL_PROGRAM "/usr/lib/sendmail -t" */
++#define MAIL_PROGRAM "/usr/sbin/sendmail -t" 
+ #define MAIL_PROGRAM_TO_BODY 1
+ #define MAIL_PROGRAM_SUBJECT_BODY 1
+ #endif
+@@ -302,7 +302,7 @@
+ /* #define LOCKDIR "/usr/spool/locks" */
+ /* #define LOCKDIR "/usr/spool/uucp/LCK" */
+ /* #define LOCKDIR "/var/spool/lock" */
+-/* #define LOCKDIR "/var/lock" */
++#define LOCKDIR "/var/lock/serial"
+ 
+ /* You must also specify the format of the lock files by setting
+    exactly one of the following macros to 1.  Check an existing lock
+@@ -466,8 +466,8 @@
+    When looking something up (a system, a port, etc.) the new style
+    configuration files will be read first, followed by the V2
+    configuration files, followed by the HDB configuration files.  */
+-#define HAVE_V2_CONFIG 0
+-#define HAVE_HDB_CONFIG 0
++#define HAVE_V2_CONFIG 1
++#define HAVE_HDB_CONFIG 1
+ 
+ /* Exactly one of the following macros must be set to 1.  The exact
+    format of the spool directories is explained in unix/spool.c.
+@@ -572,16 +572,16 @@
+ /* The name of the default spool directory.  If HAVE_TAYLOR_CONFIG is
+    set to 1, this may be overridden by the ``spool'' command in the
+    configuration file.  */
+-#define SPOOLDIR "/usr/spool/uucp"
+-/* #define SPOOLDIR "/var/spool/uucp" */
++/* #define SPOOLDIR "/usr/spool/uucp" */
++#define SPOOLDIR "/var/spool/uucp" 
+ 
+ /* The name of the default public directory.  If HAVE_TAYLOR_CONFIG is
+    set to 1, this may be overridden by the ``pubdir'' command in the
+    configuration file.  Also, a particular system may be given a
+    specific public directory by using the ``pubdir'' command in the
+    system file.  */
+-#define PUBDIR "/usr/spool/uucppublic"
+-/* #define PUBDIR "/var/spool/uucppublic" */
++/* #define PUBDIR "/usr/spool/uucppublic" */
++#define PUBDIR "/var/spool/uucppublic" 
+ 
+ /* The default command path.  This is a space separated list of
+    directories.  Remote command executions requested by uux are looked
+@@ -644,24 +644,23 @@
+ /* The default log file when using HAVE_TAYLOR_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+    command in the configuration file.  */
+-#define LOGFILE "/usr/spool/uucp/Log"
++/* #define LOGFILE "/usr/spool/uucp/Log" */
+ /* #define LOGFILE "/var/spool/uucp/Log" */
+-/* #define LOGFILE "/var/log/uucp/Log" */
++#define LOGFILE "/var/log/uucp/Log" 
+ 
+ /* The default statistics file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``statfile'' command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/Stats"
++/* #define STATFILE "/usr/spool/uucp/Stats" */
+ /* #define STATFILE "/var/spool/uucp/Stats" */
+-/* #define STATFILE "/var/log/uucp/Stats" */
++#define STATFILE "/var/log/uucp/Stats" 
+ 
+ /* The default debugging file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``debugfile'' command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/Debug"
++/* #define DEBUGFILE "/usr/spool/uucp/Debug" */
+ /* #define DEBUGFILE "/var/spool/uucp/Debug" */
+-/* #define DEBUGFILE "/var/log/uucp/Debug" */
+-
++#define DEBUGFILE "/var/log/uucp/Debug" 
+ #endif /* HAVE_TAYLOR_LOGGING */
+ 
+ #if HAVE_V2_LOGGING
+@@ -669,17 +668,23 @@
+ /* The default log file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+    command in the configuration file.  */
+-#define LOGFILE "/usr/spool/uucp/LOGFILE"
++ /* #define LOGFILE "/usr/spool/uucp/Log" */
++ /* #define LOGFILE "/var/spool/uucp/Log" */
++#define LOGFILE "/var/log/uucp/Log"
+ 
+ /* The default statistics file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``statfile''
+    command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/SYSLOG"
++ /* #define STATFILE "/usr/spool/uucp/Stats" */
++ /* #define STATFILE "/var/spool/uucp/Stats" */
++#define STATFILE "/var/log/uucp/Stats"
+ 
+ /* The default debugging file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``debugfile''
+    command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/DEBUG"
++ /* #define DEBUGFILE "/usr/spool/uucp/Debug" */
++ /* #define DEBUGFILE "/var/spool/uucp/Debug" */
++#define DEBUGFILE "/var/log/uucp/Debug"
+ 
+ #endif /* HAVE_V2_LOGGING */
diff --git a/srcpkgs/uucp/patches/uucp-org.patch b/srcpkgs/uucp/patches/uucp-org.patch
new file mode 100644
index 000000000000..d6294342cd77
--- /dev/null
+++ b/srcpkgs/uucp/patches/uucp-org.patch
@@ -0,0 +1,8833 @@
+Description: Changes from previous version
+ This patch contains all changes from previous versions.
+Author: Thorsten Alteholz <debian@alteholz.de>
+--- uucp-1.07.orig/uucico.c
++++ uucp-1.07/uucico.c
+@@ -125,6 +125,9 @@ struct spass
+   struct sconnection *qconn;
+ };
+ 
++/* min. grade set on commandline */
++static char cmdlgrade = '\0';
++
+ /* Local functions.  */
+ 
+ static void uusage P((void));
+@@ -175,6 +178,7 @@ static const struct option asLongopts[]
+   { "nodetach", no_argument, NULL, 'D' },
+   { "loop", no_argument, NULL, 'e' },
+   { "force", no_argument, NULL, 'f'},
++  { "grade", required_argument, NULL, 'g'},
+   { "stdin", required_argument, NULL, 'i' },
+   { "prompt", no_argument, NULL, 'l' },
+   { "port", required_argument, NULL, 'p' },
+@@ -249,9 +253,9 @@ main (argc, argv)
+     ++zProgram;
+ 
+ #if COHERENT_C_OPTION
+-  zopts = "c:CDefi:I:lp:qr:s:S:u:x:X:vwz";
++  zopts = "c:CDefg:i:I:lp:qr:s:S:u:x:X:vwz";
+ #else
+-  zopts = "cCDefi:I:lp:qr:s:S:u:x:X:vwz";
++  zopts = "cCDefg:i:I:lp:qr:s:S:u:x:X:vwz";
+ #endif
+ 
+   while ((iopt = getopt_long (argc, argv, zopts,
+@@ -292,6 +296,14 @@ main (argc, argv)
+ 	     failed call.  */
+ 	  fforce = TRUE;
+ 	  break;
++	
++	case 'g':
++	  /* Force a grade */
++	  if (isalpha(optarg[0]))
++	     cmdlgrade = optarg[0];
++	  else
++	     fprintf (stderr, "%s: invalid grade \n", zProgram);
++	  break;
+ 
+ 	case 'i':
+ 	  /* Type of port to use for standard input.  Only TLI is
+@@ -796,6 +808,7 @@ uhelp ()
+   printf ("Usage: %s [options]\n", zProgram);
+   printf (" -s,-S,--system system: Call system (-S implies -f)\n");
+   printf (" -f,--force: Force call despite system status\n");
++  printf (" -g,--grade: limit outgoing call to a given grade\n");
+   printf (" -r state: 1 for master, 0 for slave (default)\n");
+   printf (" --master: Act as master\n");
+   printf (" --slave: Act as slave (default)\n");
+@@ -1369,12 +1382,18 @@ fdo_call (qdaemon, qstat, qdialer, pfcal
+     boolean fret;
+ 
+     /* Determine the grade we should request of the other system.  A
+-       '\0' means that no restrictions have been made.  */
+-    if (! ftimespan_match (qsys->uuconf_qcalltimegrade, &ival,
+-			   (int *) NULL))
+-      bgrade = '\0';
++       '\0' means that no restrictions have been made.
++       If a grade is set on the command line, the calltimegrade-value
++       is overwritten.  */
++       
++    if (cmdlgrade != '\0')
++      bgrade = cmdlgrade;
+     else
+-      bgrade = (char) ival;
++      if (! ftimespan_match (qsys->uuconf_qcalltimegrade, &ival,
++			   (int *) NULL))
++         bgrade = '\0';
++      else
++         bgrade = (char) ival;
+ 
+     /* Determine the name we will call ourselves.  */
+     if (qsys->uuconf_zlocalname != NULL)
+--- uucp-1.07.orig/uucp.info-2
++++ uucp-1.07/uucp.info-2
+@@ -1,4 +1,6 @@
+-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
++
++INFO-DIR-SECTION Networking tools
+ 
+ START-INFO-DIR-ENTRY
+ * UUCP: (uucp).                 Transfer mail and news across phone lines.
+@@ -25,1247 +27,1119 @@ versions, except that the section entitl
+ a translation approved by the author instead of in the original English.
+ 
+ \x1f
+-File: uucp.info,  Node: Invoking cu,  Next: Invoking uucico,  Prev: Invoking uupick,  Up: Invoking the UUCP Programs
+-
+-Invoking cu
+-===========
+-
+-* Menu:
+-
+-* cu Description::              Description of cu
+-* cu Commands::                 Commands Supported by cu
+-* cu Variables::                Variables Supported by cu
+-* cu Options::                  Options Supported by cu
+-
+-\x1f
+-File: uucp.info,  Node: cu Description,  Next: cu Commands,  Prev: Invoking cu,  Up: Invoking cu
+-
+-cu Description
+---------------
+-
+-     cu [options] [system | phone | "dir"]
+-
+-   The `cu' program is used to call up another system and act as a dial
+-in terminal.  It can also do simple file transfers with no error
+-checking.
+-
+-   The `cu' program takes a single non-option argument.
+-
+-   If the argument is the string `dir' cu will make a direct connection
+-to the port.  This may only be used by users with write access to the
+-port, as it permits reprogramming the modem.
+-
+-   Otherwise, if the argument begins with a digit, it is taken to be a
+-phone number to call.
+-
+-   Otherwise, it is taken to be the name of a system to call.
+-
+-   The `-z' or `--system' options may be used to name a system
+-beginning with a digit, and the `-c' or `--phone' options may be used
+-to name a phone number that does not begin with a digit.
+-
+-   The `cu' program locates a port to use in the UUCP configuration
+-files.  If a simple system name is given, it will select a port
+-appropriate for that system.  The `-p', `--port', `-l', `--line', `-s',
+-and `--speed' options may be used to control the port selection.
+-
+-   When a connection is made to the remote system, `cu' forks into two
+-processes.  One reads from the port and writes to the terminal, while
+-the other reads from the terminal and writes to the port.
+-
+-\x1f
+-File: uucp.info,  Node: cu Commands,  Next: cu Variables,  Prev: cu Description,  Up: Invoking cu
+-
+-cu Commands
+------------
+-
+-   The `cu' program provides several commands that may be used during
+-the conversation.  The commands all begin with an escape character,
+-which by default is `~' (tilde).  The escape character is only
+-recognized at the beginning of a line.  To send an escape character to
+-the remote system at the start of a line, it must be entered twice.  All
+-commands are either a single character or a word beginning with `%'
+-(percent sign).
+-
+-   The `cu' program recognizes the following commands.
+-
+-`~.'
+-     Terminate the conversation.
+-
+-`~! command'
+-     Run command in a shell.  If command is empty, starts up a shell.
+-
+-`~$ command'
+-     Run command, sending the standard output to the remote system.
+-
+-`~| command'
+-     Run command, taking the standard input from the remote system.
+-
+-`~+ command'
+-     Run command, taking the standard input from the remote system and
+-     sending the standard output to the remote system.
+-
+-`~#, ~%break'
+-     Send a break signal, if possible.
+-
+-`~c directory, ~%cd directory'
+-     Change the local directory.
+-
+-`~> file'
+-     Send a file to the remote system.  This just dumps the file over
+-     the communication line.  It is assumed that the remote system is
+-     expecting it.
+-
+-`~<'
+-     Receive a file from the remote system.  This prompts for the local
+-     file name and for the remote command to execute to begin the file
+-     transfer.  It continues accepting data until the contents of the
+-     `eofread' variable are seen.
+-
+-`~p from to'
+-`~%put from to'
+-     Send a file to a remote Unix system.  This runs the appropriate
+-     commands on the remote system.
+-
+-`~t from to'
+-`~%take from to'
+-     Retrieve a file from a remote Unix system.  This runs the
+-     appropriate commands on the remote system.
+-
+-`~s variable value'
+-     Set a `cu' variable to the given value.  If value is not given, the
+-     variable is set to `true'.
+-
+-`~! variable'
+-     Set a `cu' variable to `false'.
+-
+-`~z'
+-     Suspend the cu session.  This is only supported on some systems.
+-     On systems for which `^Z' may be used to suspend a job, `~^Z' will
+-     also suspend the session.
+-
+-`~%nostop'
+-     Turn off XON/XOFF handling.
+-
+-`~%stop'
+-     Turn on XON/XOFF handling.
+-
+-`~v'
+-     List all the variables and their values.
+-
+-`~?'
+-     List all commands.
+-
+-\x1f
+-File: uucp.info,  Node: cu Variables,  Next: cu Options,  Prev: cu Commands,  Up: Invoking cu
+-
+-cu Variables
+-------------
+-
+-   The `cu' program also supports several variables.  They may be
+-listed with the `~v' command, and set with the `~s' or `~!'  commands.
+-
+-`escape'
+-     The escape character.  The default is `~' (tilde).
+-
+-`delay'
+-     If this variable is true, `cu' will delay for a second, after
+-     recognizing the escape character, before printing the name of the
+-     local system.  The default is true.
+-
+-`eol'
+-     The list of characters which are considered to finish a line.  The
+-     escape character is only recognized after one of these is seen.
+-     The default is `carriage return', `^U', `^C', `^O', `^D', `^S',
+-     `^Q', `^R'.
+-
+-`binary'
+-     Whether to transfer binary data when sending a file.  If this is
+-     false, then newlines in the file being sent are converted to
+-     carriage returns.  The default is false.
+-
+-`binary-prefix'
+-     A string used before sending a binary character in a file
+-     transfer, if the `binary' variable is true.  The default is `^V'.
+-
+-`echo-check'
+-     Whether to check file transfers by examining what the remote system
+-     echoes back.  This probably doesn't work very well.  The default is
+-     false.
+-
+-`echonl'
+-     The character to look for after sending each line in a file.  The
+-     default is carriage return.
+-
+-`timeout'
+-     The timeout to use, in seconds, when looking for a character,
+-     either when doing echo checking or when looking for the `echonl'
+-     character.  The default is 30.
+-
+-`kill'
+-     The character to use delete a line if the echo check fails.  The
+-     default is `^U'.
+-
+-`resend'
+-     The number of times to resend a line if the echo check continues to
+-     fail.  The default is 10.
+-
+-`eofwrite'
+-     The string to write after sending a file with the `~>' command.
+-     The default is `^D'.
+-
+-`eofread'
+-     The string to look for when receiving a file with the ` ~<'
+-     command.  The default is `$', which is intended to be a typical
+-     shell prompt.
+-
+-`verbose'
+-     Whether to print accumulated information during a file transfer.
+-     The default is true.
+-
+-\x1f
+-File: uucp.info,  Node: cu Options,  Prev: cu Variables,  Up: Invoking cu
+-
+-cu Options
+-----------
+-
+-   The following options may be given to `cu'.
+-
+-`-e'
+-`--parity=even'
+-     Use even parity.
+-
+-`-o'
+-`--parity=odd'
+-     Use odd parity.
+-
+-`--parity=none'
+-     Use no parity.  No parity is also used if both `-e' and `-o' are
+-     given.
+-
+-`-h'
+-`--halfduplex'
+-     Echo characters locally (half-duplex mode).
+-
+-`--nostop'
+-     Turn off XON/XOFF handling (it is on by default).
+-
+-`-E char'
+-`--escape char'
+-     Set the escape character.  Initially `~' (tilde).  To eliminate the
+-     escape character, use `-E '''.
+-
+-`-z system'
+-`--system system'
+-     The system to call.
+-
+-`-c phone-number'
+-`--phone phone-number'
+-     The phone number to call.
+-
+-`-p port'
+-`-a port'
+-`--port port'
+-     Name the port to use.
+-
+-`-l line'
+-`--line line'
+-     Name the line to use by giving a device name.  This may be used to
+-     dial out on ports that are not listed in the UUCP configuration
+-     files.  Write access to the device is required.
+-
+-`-s speed'
+-`-#'
+-`--speed speed'
+-     The speed (baud rate) to use.  Here, `-#' means an actual number;
+-     e.g., `-9600'.
+-
+-`-n'
+-`--prompt'
+-     Prompt for the phone number to use.
+-
+-`-d'
+-     Enter debugging mode.  Equivalent to `--debug all'.
+-
+-`-x type'
+-`--debug type'
+-`-I file'
+-`--config file'
+-`-v'
+-`--version'
+-`--help'
+-     *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uucico,  Next: Invoking uuxqt,  Prev: Invoking cu,  Up: Invoking the UUCP Programs
+-
+-Invoking uucico
+-===============
+-
+-* Menu:
+-
+-* uucico Description::          Description of uucico
+-* uucico Options::              Options Supported by uucico
+-
+-\x1f
+-File: uucp.info,  Node: uucico Description,  Next: uucico Options,  Prev: Invoking uucico,  Up: Invoking uucico
+-
+-uucico Description
+-------------------
+-
+-     uucico [options]
+-
+-   The `uucico' daemon processes file transfer requests queued by
+-`uucp' and `uux'.  It is started when `uucp' or `uux' is run (unless
+-they are given the `-r' or `--nouucico' options).  It is also typically
+-started periodically using entries in the `crontab' table(s).
+-
+-   When `uucico' is invoked with `-r1', `--master', `-s', `--system',
+-or `-S', the daemon will place a call to a remote system, running in
+-master mode.  Otherwise the daemon will start in slave mode, accepting
+-a call from a remote system.  Typically a special login name will be
+-set up for UUCP which automatically invokes `uucico' when a remote
+-system calls in and logs in under that name.
+-
+-   When `uucico' terminates, it invokes the `uuxqt' daemon, unless the
+-`-q' or `--nouuxqt' options were given; `uuxqt' executes any work
+-orders created by `uux' on a remote system, and any work orders created
+-locally which have received remote files for which they were waiting.
+-
+-   If a call fails, `uucico' will normally refuse to retry the call
+-until a certain (configurable) amount of time has passed.  This may be
+-overriden by the `-f', `--force', or `-S' options.
+-
+-   The `-l', `--prompt', `-e', or `--loop' options may be used to force
+-`uucico' to produce its own prompts of `login: ' and `Password:'.  When
+-another `uucico' daemon calls in, it will see these prompts and log in
+-as usual.  The login name and password will normally be checked against
+-a separate list kept specially for `uucico', rather than the
+-`/etc/passwd' file (*note Configuration File Names::).  It is possible,
+-on some systems, to configure `uucico' to use `/etc/passwd'.  The `-l'
+-or `--prompt' options will prompt once and then exit; in this mode the
+-UUCP administrator, or the superuser, may use the `-u' or `--login'
+-option to force a login name, in which case `uucico' will not prompt
+-for one.  The `-e' or `--loop' options will prompt again after the
+-first session is over; in this mode `uucico' will permanently control a
+-port.
+-
+-   If `uucico' receives a `SIGQUIT', `SIGTERM' or `SIGPIPE' signal, it
+-will cleanly abort any current conversation with a remote system and
+-exit.  If it receives a `SIGHUP' signal it will abort any current
+-conversation, but will continue to place calls to (if invoked with
+-`-r1' or `--master') and accept calls from (if invoked with `-e' or
+-`--loop') other systems.  If it receives a `SIGINT' signal it will
+-finish the current conversation, but will not place or accept any more
+-calls.
+-
+-\x1f
+-File: uucp.info,  Node: uucico Options,  Prev: uucico Description,  Up: Invoking uucico
+-
+-uucico Options
+---------------
+-
+-   The following options may be given to `uucico'.
+-
+-`-r1'
+-`--master'
+-     Start in master mode: call out to a remote system.  Implied by
+-     `-s', `--system', or `-S'.  If no system is specified,
+-     sequentially call every system for which work is waiting to be
+-     done.
+-
+-`-r0'
+-`--slave'
+-     Start in slave mode.  This is the default.
+-
+-`-s system'
+-`--system system'
+-     Call the specified system.
+-
+-`-S system'
+-     Call the specified system, ignoring any required wait.  This is
+-     equivalent to `-s system -f'.
+-
+-`-f'
+-`--force'
+-     Ignore any required wait for any systems to be called.
+-
+-`-l'
+-`--prompt'
+-     Prompt for login name and password using `login: ' and
+-     `Password:'.  This allows `uucico' to be easily run from `inetd'.
+-     The login name and password are checked against the UUCP password
+-     file, which need not be `/etc/passwd'.  The `--login' option may
+-     be used to force a login name, in which cause `uucico' will only
+-     prompt for a password.
+-
+-`-p port'
+-`--port port'
+-     Specify a port to call out on or to listen to.
+-
+-`-e'
+-`--loop'
+-     Enter an endless loop of login/password prompts and slave mode
+-     daemon execution.  The program will not stop by itself; you must
+-     use `kill' to shut it down.
+-
+-`-w'
+-`--wait'
+-     After calling out (to a particular system when `-s', `--system',
+-     or `-S' is specifed, or to all systems which have work when just
+-     `-r1' or `--master' is specifed), begin an endless loop as with
+-     `--loop'.
+-
+-`-q'
+-`--nouuxqt'
+-     Do not start the `uuxqt' daemon when finished.
+-
+-`-c'
+-`--quiet'
+-     If no calls are permitted at this time, then don't make the call,
+-     but also do not put an error message in the log file and do not
+-     update the system status (as reported by `uustat').  This can be
+-     convenient for automated polling scripts, which may want to simply
+-     attempt to call every system rather than worry about which
+-     particular systems may be called at the moment.  This option also
+-     suppresses the log message indicating that there is no work to be
+-     done.
+-
+-`-C'
+-`--ifwork'
+-     Only call the system named by `-s', `--system', or `-S' if there
+-     is work for that system.
+-
+-`-D'
+-`--nodetach'
+-     Do not detach from the controlling terminal.  Normally `uucico'
+-     detaches from the terminal before each call out to another system
+-     and before invoking `uuxqt'.  This option prevents this.
+-
+-`-u name'
+-`--login name'
+-     Set the login name to use instead of that of the invoking user.
+-     This option may only be used by the UUCP administrator or the
+-     superuser.  If used with `--prompt', this will cause `uucico' to
+-     prompt only for the password, not the login name.
+-
+-`-z'
+-`--try-next'
+-     If a call fails after the remote system is reached, try the next
+-     alternate rather than simply exiting.
+-
+-`-i type'
+-`--stdin type'
+-     Set the type of port to use when using standard input.  The only
+-     supported port type is TLI, and this is only available on machines
+-     which support the TLI networking interface.  Specifying `-i TLI'
+-     causes `uucico' to use TLI calls to perform I/O.
+-
+-`-X type'
+-     Same as the standard option `-x type'.  Provided for historical
+-     compatibility.
+-
+-`-x type'
+-`--debug type'
+-`-I file'
+-`--config file'
+-`-v'
+-`--version'
+-`--help'
+-     *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uuxqt,  Next: Invoking uuchk,  Prev: Invoking uucico,  Up: Invoking the UUCP Programs
+-
+-Invoking uuxqt
+-==============
+-
+-     uuxqt [-c command] [-s system] [--command command] [--system system]
+-
+-   The `uuxqt' daemon executes commands requested by `uux' from either
+-the local system or from remote systems.  It is started automatically
+-by the `uucico' daemon (unless `uucico' is given the `-q' or
+-`--nouuxqt' options).
+-
+-   There is normally no need to run `uuxqt', since it will be invoked
+-by `uucico'.  However, `uuxqt' can be invoked directly to provide
+-greater control over the processing of the work queue.
+-
+-   Multiple invocations of `uuxqt' may be run at once, as controlled by
+-the `max-uuxqts' configuration command; see *Note Miscellaneous
+-(config)::.
+-
+-   The following options may be given to `uuxqt'.
+-
+-`-c command'
+-`--command command'
+-     Only execute requests for the specified command.  For example,
+-     `uuxqt --command rmail'.
+-
+-`-s system'
+-`--system system'
+-     Only execute requests originating from the specified system.
+-
+-`-x type'
+-`--debug type'
+-`-I file'
+-`--config'
+-`-v'
+-`--version'
+-`--help'
+-     *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uuchk,  Next: Invoking uuconv,  Prev: Invoking uuxqt,  Up: Invoking the UUCP Programs
+-
+-Invoking uuchk
+-==============
+-
+-     uuchk [-s system] [--system system]
+-
+-   The `uuchk' program displays information read from the UUCP
+-configuration files.  It should be used to ensure that UUCP has been
+-configured correctly.
+-
+-   The `-s' or `--system' options may be used to display the
+-configuration for just the specified system, rather than for all
+-systems.  The `uuchk' program also supports the standard UUCP program
+-options; see *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uuconv,  Next: Invoking uusched,  Prev: Invoking uuchk,  Up: Invoking the UUCP Programs
+-
+-Invoking uuconv
+-===============
+-
+-     uuconv -i type -o type [-p program] [--program program]
+-     uuconv --input type --output type [-p program] [--program program]
+-
+-   The `uuconv' program converts UUCP configuration files from one
+-format to another.  The type of configuration file to read is specified
+-using the `-i' or `--input' options.  The type of configuration file to
+-write is specified using the `-o' or `--output' options.
+-
+-   The supported configuration file types are `taylor', `v2', and
+-`hdb'.  For a description of the `taylor' configuration files, see
+-*Note Configuration Files::.  The other types of configuration files
+-are used by traditional UUCP packages, and are not described in this
+-manual.
+-
+-   An input configuration of type `v2' or `hdb' is read from a compiled
+-in directory (specified by `oldconfigdir' in `Makefile').  An input
+-configuration of type `taylor' is read from a compiled in directory by
+-default, but may be overridden with the standard `-I' or `--config'
+-options (*note Standard Options::).
+-
+-   The output configuration is written to files in the directory in
+-which `uuconv' is run.
+-
+-   Some information in the input files may not be representable in the
+-desired output format, in which case `uuconv' will silently discard it.
+-The output of `uuconv' should be carefully checked before it is used.
+-The `uuchk' program may be used for this purpose; see *Note Invoking
+-uuchk::.
+-
+-   The `-p' or `--program' option may be used to convert specific `cu'
+-configuration information, rather than the default of only converting
+-the `uucp' configuration information; see *Note config File::.
+-
+-   The `uuchk' program also supports the standard UUCP program options;
+-see *Note Standard Options::.
++File: uucp.info,  Node: j Protocol,  Next: x Protocol,  Prev: i Protocol,  Up: Protocols
+ 
+-\x1f
+-File: uucp.info,  Node: Invoking uusched,  Prev: Invoking uuconv,  Up: Invoking the UUCP Programs
++6.12 UUCP `j' Protocol
++======================
+ 
+-Invoking uusched
+-================
++The `j' protocol is a variant of the `i' protocol.  It was also written
++by Ian Lance Taylor, and first appeared in Taylor UUCP version 1.04.
+ 
+-   The `uusched' program is actually just a shell script which invokes
+-the `uucico' daemon.  It is provided for backward compatibility.  It
+-causes `uucico' to call all systems for which there is work.  Any
+-option which may be given to `uucico' may also be given to `uusched'.
+-*Note Invoking uucico::.
++   The `j' protocol is a version of the `i' protocol designed for
++communication links which intercept a few characters, such as XON or
++XOFF.  It is not efficient to use it on a link which intercepts many
++characters, such as a seven bit link.  The `j' protocol performs no
++error correction or detection; that is presumed to be the responsibility
++of the `i' protocol.
++
++   When the `j' protocol starts up, each system sends a printable ASCII
++string indicating which characters it wants to avoid using.  The string
++begins with the ASCII character `^' (octal 136) and ends with the ASCII
++character `~' (octal 176).  After sending this string, each system
++looks for the corresponding string from the remote system.  The strings
++are composed of escape sequences: `\ooo', where `o' is an octal digit.
++For example, sending the string `^\021\023~' means that the ASCII XON
++and XOFF characters should be avoided.  The union of the characters
++described in both strings (the string which is sent and the string
++which is received) is the set of characters which must be avoided in
++this conversation.  Avoiding a printable ASCII character (octal 040 to
++octal 176, inclusive) is not permitted.
++
++   After the exchange of characters to avoid, the normal `i' protocol
++start up is done, and the rest of the conversation uses the normal `i'
++protocol.  However, each `i' protocol packet is wrapped to become a `j'
++protocol packet.
++
++   Each `j' protocol packet consists of a seven byte header, followed
++by data bytes, followed by index bytes, followed by a one byte trailer.
++The packet header looks like this:
++
++`^'
++     Every packet begins with the ASCII character `^', octal 136.
++
++HIGH
++LOW
++     These two characters give the total number of bytes in the packet.
++     Both HIGH and LOW are printable ASCII characters.  The length of
++     the packet is `(HIGH - 040) * 0100 + (LOW - 040)', where `040 <=
++     HIGH < 0177' and `040 <= LOW < 0140'.  This permits a length of
++     6079 bytes, but there is a further restriction on packet size
++     described below.
++
++`='
++     The ASCII character `=', octal 075.
++
++DATA-HIGH
++DATA-LOW
++     These two characters give the total number of data bytes in the
++     packet.  The encoding is as described for HIGH and LOW.  The number
++     of data bytes is the size of the `i' protocol packet wrapped inside
++     this `j' protocol packet.
++
++`@'
++     The ASCII character `@', octal 100.
++
++   The header is followed by the number of data bytes given in
++DATA-HIGH and DATA-LOW.  These data bytes are the `i' protocol packet
++which is being wrapped in the `j' protocol packet.  However, each
++character in the `i' protocol packet which the `j' protocol must avoid
++is transformed into a printable ASCII character (recall that avoiding a
++printable ASCII character is not permitted).  Two index bytes are used
++for each character which must be transformed.
++
++   The index bytes immediately follow the data bytes.  The index bytes
++are created in pairs.  Each pair of index bytes encodes the location of
++a character in the `i' protocol packet which was transformed to become
++a printable ASCII character.  Each pair of index bytes also encodes the
++precise transformation which was performed.
++
++   When the sender finds a character which must be avoided, it will
++transform it using one or two operations.  If the character is 0200 or
++greater, it will subtract 0200.  If the resulting character is less than
++020, or is equal to 0177, it will xor by 020.  The result is a printable
++ASCII character.
++
++   The zero based byte index of the character within the `i' protocol
++packet is determined.  This index is turned into a two byte printable
++ASCII index, INDEX-HIGH and INDEX-LOW, such that the index is
++`(INDEX-HIGH - 040) * 040 + (INDEX-LOW - 040)'.  INDEX-LOW is
++restricted such that `040 <= INDEX-LOW < 0100'.  INDEX-HIGH is not
++permitted to be 0176, so `040 <= INDEX-HIGH < 0176'.  INDEX-LOW is then
++modified to encode the transformation:
++
++   * If the character transformation only had to subtract 0200, then
++     INDEX-LOW is used as is.
++
++   * If the character transformation only had to xor by 020, then 040
++     is added to INDEX-LOW.
++
++   * If both operations had to be performed, then 0100 is added to
++     INDEX-LOW.  However, if the value of INDEX-LOW was initially 077,
++     then adding 0100 would result in 0177, which is not a printable
++     ASCII character.  For that special case, INDEX-HIGH is set to
++     0176, and INDEX-LOW is set to the original value of INDEX-HIGH.
++
++   The receiver decodes the index bytes as follows (this is the reverse
++of the operations performed by the sender, presented here for additional
++clarity):
++
++   * The first byte in the index is INDEX-HIGH, and the second is
++     INDEX-LOW.
++
++   * If `040 <= INDEX-HIGH < 0176', the index refers to the data byte
++     at position `(INDEX-HIGH - 040) * 040 + INDEX-LOW % 040'.
++
++   * If `040 <= INDEX-LOW < 0100', then 0200 must be added to indexed
++     byte.
++
++   * If `0100 <= INDEX-LOW < 0140', then 020 must be xor'ed to the
++     indexed byte.
++
++   * If `0140 <= INDEX-LOW < 0177', then 0200 must be added to the
++     indexed byte, and 020 must be xor'ed to the indexed byte.
++
++   * If `INDEX-HIGH == 0176', the index refers to the data byte at
++     position `(INDEX-LOW - 040) * 040 + 037'.  0200 must be added to
++     the indexed byte, and 020 must be xor'ed to the indexed byte.
++
++   This means the largest `i' protocol packet which may be wrapped
++inside a `j' protocol packet is `(0175 - 040) * 040 + (077 - 040) ==
++3007' bytes.
++
++   The final character in a `j' protocol packet, following the index
++bytes, is the ASCII character `~' (octal 176).
++
++   The motivation behind using an indexing scheme, rather than escape
++characters, is to avoid data movement.  The sender may simply add a
++header and a trailer to the `i' protocol packet.  Once the receiver has
++loaded the `j' protocol packet, it may scan the index bytes,
++transforming the data bytes, and then pass the data bytes directly on to
++the `i' protocol routine.
++
++\x1f
++File: uucp.info,  Node: x Protocol,  Next: y Protocol,  Prev: j Protocol,  Up: Protocols
++
++6.13 UUCP `x' Protocol
++======================
++
++The `x' protocol is used in Europe (and probably elsewhere) with
++machines that contain an builtin X.25 card and can send eight bit data
++transparently across X.25 circuits, without interference from the X.28
++or X.29 layers.  The protocol sends packets of 512 bytes, and relies on
++a write of zero bytes being read as zero bytes without stopping
++communication.  It first appeared in the original System V UUCP
++implementation.
++
++\x1f
++File: uucp.info,  Node: y Protocol,  Next: d Protocol,  Prev: x Protocol,  Up: Protocols
++
++6.14 UUCP `y' Protocol
++======================
++
++The `y' protocol was developed by Jorge Cwik for use in FX UUCICO, a PC
++uucico program.  It is designed for communication lines which handle
++error correction and flow control.  It requires an eight bit clean
++connection.  It performs error detection, but not error correction:
++when an error is detected, the line is dropped.  It is a streaming
++protocol, like the `f' protocol; there are no packet acknowledgements,
++so the protocol is efficient over a half-duplex communication line such
++as PEP.
++
++   Every packet contains a six byte header:
++
++sequence low byte
++sequence high byte
++     A two byte sequence number, in little endian order.  The first
++     sequence number is 0.  Since the first packet is always a sync
++     packet (described below) the sequence number of the first data
++     packet is always 1.  Each system counts sequence numbers
++     independently.
++
++length low byte
++length high byte
++     A two byte data length, in little endian order.  If the high bit
++     of the sixteen bit field is clear, this is the number of data
++     bytes which follow the six byte header.  If the high bit is set,
++     there is no data, and the length field is a type of control packet.
++
++checksum low byte
++checksum high byte
++     A two byte checksum, in little endian order.  The checksum is
++     computed over the data bytes.  The checksum algorithm is described
++     below.  If there are no data bytes, the checksum is sent as 0.
++
++   When the protocol starts up, each side must send a sync packet.
++This is a packet with a normal six byte header followed by data.  The
++sequence number of the sync packet should be 0.  Currently at least
++four bytes of data must be sent with the sync packet.  Additional bytes
++should be ignored.  They are defined as follows:
++
++version
++     The version number of the protocol.  Currently this must be 1.
++     Larger numbers should be ignored; it is the responsibility of the
++     newer version to accommodate the older one.
++
++packet size
++     The maximum data length to use divided by 256.  This is sent as a
++     single byte.  The maximum data length permitted is 32768, which
++     would be sent as 128.  Customarily both systems will use the same
++     maximum data length, the lower of the two requested.
++
++flags low byte
++flags high byte
++     Two bytes of flags.  None are currently defined.  These bytes
++     should be sent as 0, and ignored by the receiver.
++
++   A length field with the high bit set is a control packet.  The
++following control packet types are defined:
++
++0xfffe `YPKT_ACK'
++     Acknowledges correct receipt of a file.
++
++0xfffd `YPKT_ERR'
++     Indicates an incorrect checksum.
++
++0xfffc `YPKT_BAD'
++     Indicates a bad sequence number, an invalid length, or some other
++     error.
++
++   If a control packet other than `YPKT_ACK' is received, the
++connection is dropped.  If a checksum error is detected for a received
++packet, a `YPKT_ERR' control packet is sent, and the connection is
++dropped.  If a packet is received out of sequence, a `YPKT_BAD' control
++packet is sent, and the connection is dropped.
++
++   The checksum is initialized to 0xffff.  For each data byte in a
++packet it is modified as follows (where B is the byte before it has been
++transformed as described above):
++
++           /* Rotate the checksum left.  */
++           if ((ichk & 0x8000) == 0)
++             ichk <<= 1;
++           else
++             {
++               ichk <<= 1;
++               ++ichk;
++             }
++
++           /* Add the next byte into the checksum.  */
++           ichk += B;
++
++   This is the same algorithm as that used by the `f' protocol.
++
++   A command is sent as a sequence of data packets followed by a null
++byte.  In the normal case, a command will fit into a single packet.
++The packet should be exactly the length of the command plus a null
++byte.  If the command is too long, more packets are sent as required.
++
++   A file is sent as a sequence of data packets, ending with a zero
++length packet.  The data packets may be of any length greater than zero
++and less than or equal to the maximum permitted packet size specified
++in the initial sync packet.
++
++   After the zero length packet ending a file transfer has been
++received, the receiving system sends a `YPKT_ACK' control packet.  The
++sending system waits for the `YPKT_ACK' control packet before
++continuing; this wait should be done with a large timeout, since there
++may be a considerable amount of data buffered on the communication path.
++
++\x1f
++File: uucp.info,  Node: d Protocol,  Next: h Protocol,  Prev: y Protocol,  Up: Protocols
++
++6.15 UUCP `d' Protocol
++======================
++
++The `d' protocol is apparently used for DataKit muxhost (not RS-232)
++connections.  No file size is sent.  When a file has been completely
++transferred, a write of zero bytes is done; this must be read as zero
++bytes on the other end.
++
++\x1f
++File: uucp.info,  Node: h Protocol,  Next: v Protocol,  Prev: d Protocol,  Up: Protocols
++
++6.16 UUCP `h' Protocol
++======================
++
++The `h' protocol is apparently used in some places with HST modems.  It
++does no error checking, and is not that different from the `t'
++protocol.  I don't know the details.
++
++\x1f
++File: uucp.info,  Node: v Protocol,  Prev: h Protocol,  Up: Protocols
++
++6.17 UUCP `v' Protocol
++======================
++
++The `v' protocol is used by UUPC/extended, a PC UUCP program.  It is
++simply a version of the `g' protocol which supports packets of any
++size, and also supports sending packets of different sizes during the
++same conversation.  There are many `g' protocol implementations which
++support both, but there are also many which do not.  Using `v' ensures
++that everything is supported.
+ 
+ \x1f
+-File: uucp.info,  Node: Installing Taylor UUCP,  Next: Using Taylor UUCP,  Prev: Invoking the UUCP Programs,  Up: Top
++File: uucp.info,  Node: Hacking,  Next: Acknowledgements,  Prev: Protocols,  Up: Top
+ 
+-Installing Taylor UUCP
+-**********************
++7 Hacking Taylor UUCP
++*********************
+ 
+-   These are the installation instructions for the Taylor UUCP package.
++This chapter provides the briefest of guides to the Taylor UUCP source
++code itself.
+ 
+ * Menu:
+ 
+-* Compilation::                 Compiling Taylor UUCP
+-* Testing the Compilation::     Testing the Compilation
+-* Installing the Binaries::     Installing the Binaries
+-* Configuration::               Configuring Taylor UUCP
+-* Testing the Installation::    Testing the Installation
++* System Dependence::           System Dependence
++* Naming Conventions::          Naming Conventions
++* Patches::                     Patches
+ 
+ \x1f
+-File: uucp.info,  Node: Compilation,  Next: Testing the Compilation,  Prev: Installing Taylor UUCP,  Up: Installing Taylor UUCP
++File: uucp.info,  Node: System Dependence,  Next: Naming Conventions,  Prev: Hacking,  Up: Hacking
+ 
+-Compiling Taylor UUCP
++7.1 System Dependence
+ =====================
+ 
+-   If you have a source code distribution, you must first compile it for
+-your system.  Free versions of Unix, such as Linux, NetBSD, or FreeBSD,
+-often come with pre-compiled binary distributions of UUCP.  If you are
+-using a binary distribution, you may skip to the configuration section
+-(*note Configuration::).
+-
+-   Follow these steps to compile the source code.
+-
+-  1. Take a look at the top of `Makefile.in' and set the appropriate
+-     values for your system.  These control where the programs are
+-     installed and which user on the system owns them (normally they
+-     will be owned by a special user `uucp' rather than a real person;
+-     they should probably not be owned by `root').
+-
+-  2. Run the shell script `configure'.  This script was generated using
+-     the `autoconf' program written by David MacKenzie of the Free
+-     Software Foundation.  It takes a while to run.  It will generate
+-     the file `config.h' based on `config.h.in', and, for each source
+-     code directory, will generate `Makefile' based on `Makefile.in'.
+-
+-     You can pass certain arguments to `configure' in the environment.
+-     Because `configure' will compile little test programs to see what
+-     is available on your system, you must tell it how to run your
+-     compiler.  It recognizes the following environment variables:
+-
+-    `CC'
+-          The C compiler.  If this is not set, then if `configure' can
+-          find `gcc' it will use it, otherwise it will use `cc'.
+-
+-    `CFLAGS'
+-          Flags to pass to the C compiler when compiling the actual
+-          code.  If this is not set, `configure' will use `-g'.
+-
+-    `LDFLAGS'
+-          Flags to pass to the C compiler when only linking, not
+-          compiling.  If this is not set, `configure' will use the
+-          empty string.
+-
+-    `LIBS'
+-          Libraries to pass to the C compiler.  If this is not set,
+-          `configure' will use the empty string.
+-
+-    `INSTALL'
+-          The program to run to install UUCP in the binary directory.
+-          If this is not set, then if `configure' finds the BSD
+-          `install' program, it will set this to `install -c';
+-          otherwise, it will use `cp'.
+-
+-     Suppose, for example, you want to set the environment variable `CC'
+-     to `rcc'.  If you are using `sh', `bash', or `ksh', invoke
+-     `configure' as `CC=rcc configure'.  If you are using `csh', do
+-     `setenv CC rcc; sh configure'.
+-
+-     On some systems you will want to use `LIBS=-lmalloc'.  On Xenix
+-     derived versions of Unix do not use `LIBS=-lx' because this will
+-     bring in the wrong versions of certain routines; if you want to use
+-     `-lx' you must specify `LIBS=-lc -lx'.
+-
+-     You can also pass other arguments to `configure' on the command
+-     line.  Use `configure --help' for a complete list.  Of particular
+-     interest:
+-    `--prefix=DIRNAME'
+-          The directory under which all files are installed.  Default
+-          `/usr/local'.
+-
+-    `--with-newconfigdir=DIRNAME'
+-          The directory in which to find new style configuration files.
+-          Default `PREFIX/conf/uucp'.
+-
+-    `--with-oldconfigdir=DIRNAME'
+-          The directory in which to find old style configuration files.
+-          Default `/usr/lib/uucp'.
+-
+-     If `configure' fails for some reason, or if you have a very weird
+-     system, you may have to configure the package by hand.  To do
+-     this, copy the file `config.h.in' to `config.h' and edit it for
+-     your system.  Then for each source directory (the top directory,
+-     and the subdirectories `lib', `unix', and `uuconf') copy
+-     `Makefile.in' to `Makefile', find the words within `@' characters,
+-     and set them correctly for your system.
+-
+-  3. Igor V. Semenyuk provided this (lightly edited) note about ISC
+-     Unix 3.0.  The `configure' script will default to passing `-posix'
+-     to `gcc'.  However, using `-posix' changes the environment to
+-     POSIX, and on ISC 3.0, at least, the default for `POSIX_NO_TRUNC'
+-     is 1.  This can lead to a problem when `uuxqt' executes `rmail'.
+-     `IDA sendmail' has dbm configuration files named
+-     `mailertable.{dir,pag}'.  Notice these names are 15 characters
+-     long.  When `uuxqt' compiled with the `-posix' executes `rmail',
+-     which in turn executes `sendmail', the later is run under the
+-     POSIX environment too.  This leads to `sendmail' bombing out with
+-     `'error opening 'M' database: name too long' (mailertable.dir)'.
+-     It's rather obscure behaviour, and it took me a day to find out
+-     the cause.  I don't use the `-posix' switch; instead, I run `gcc'
+-     with `-D_POSIX_SOURCE', and add `-lcposix' to `LIBS'.
+-
+-  4. On some versions of BSDI there is a bug in the shell which causes
+-     the default value for `CFLAGS' to be set incorrectly.  If `echo
+-     ${CFLAGS--g}' echoes `g' rather than `-g', then you must set
+-     `CFLAGS' in the environment before running configure.  There is a
+-     patch available from BSDI for this bug.  (Reported by David Vrona).
+-
+-  5. On AIX 3.2.5, and possibly other versions, `cc -E' does not work,
+-     reporting `Option NOROCONST is not valid'.  Test this before
+-     running configure by doing something like `touch /tmp/foo.c; cc -E
+-     /tmp/foo.c'.  This may give a warning about the file being empty,
+-     but it should not give the `Option NOROCONST' warning.  The
+-     workaround is to remove the `,noroconst' entry from the `options'
+-     clause in the `cc' stanza in `/etc/xlc.cfg'.  (Reported by Chris
+-     Lewis).
+-
+-  6. You should verify that `configure' worked correctly by checking
+-     `config.h' and the instances of `Makefile'.
+-
+-  7. Edit `policy.h' for your local system.  The comments explain the
+-     various choices.  The default values are intended to be
+-     reasonable, so you may not have to make any changes.
+-
+-     You must decide what type of configuration files to use; for more
+-     information on the choices, see *Note Configuration::.
+-
+-     You must also decide what sort of spool directory you want to use.
+-     If this is a new installation, I recommend `SPOOLDIR_TAYLOR';
+-     otherwise, select the spool directory corresponding to your
+-     existing UUCP package.
+-
+-  8. Type `make' to compile everything.
+-
+-     The `tstuu.c' file is not particularly portable; if you can't
+-     figure out how to compile it you can safely ignore it, as it is
+-     only used for testing.  To use STREAMS pseudo-terminals, tstuu.c
+-     must be compiled with `-DHAVE_STREAMS_PTYS'; this is not
+-     determined by the configure script.
+-
+-     If you have any other problems there is probably a bug in the
+-     `configure' script.
+-
+-  9. Please report any problems you have.  That is the only way they
+-     will get fixed for other people.  Supply a patch if you can (*note
+-     Patches::), or just ask for help.
+-
+-
+-\x1f
+-File: uucp.info,  Node: Testing the Compilation,  Next: Installing the Binaries,  Prev: Compilation,  Up: Installing Taylor UUCP
+-
+-Testing the Compilation
+-=======================
+-
+-   If your system supports pseudo-terminals, and you compiled the code
+-to support the new style of configuration files (`HAVE_TAYLOR_CONFIG'
+-was set to 1 in `policy.h'), you should be able to use the `tstuu'
+-program to test the `uucico' daemon.  If your system supports STREAMS
+-based pseudo-terminals, you must compile tstuu.c with
+-`-DHAVE_STREAMS_PTYS'.  (The STREAMS based code was contributed by Marc
+-Boucher).
+-
+-   To run `tstuu', just type `tstuu' with no arguments.  You must run
+-it in the compilation directory, since it runs `./uucp', `./uux' and
+-`./uucico'.  The `tstuu' program will run a lengthy series of tests (it
+-takes over ten minutes on a slow VAX).  You will need a fair amount of
+-space available in `/usr/tmp'.  You will probably want to put it in the
+-background.  Do not use `^Z', because the program traps on `SIGCHLD'
+-and winds up dying.  The `tstuu' program will create a directory
+-`/usr/tmp/tstuu' and fill it with configuration files, and create spool
+-directories `/usr/tmp/tstuu/spool1' and `/usr/tmp/tstuu/spool2'.
+-
+-   If your system does not support the `FIONREAD' call, the `tstuu'
+-program will run very slowly.  This may or may not get fixed in a later
+-version.
+-
+-   The `tstuu' program will finish with an execute file named
+-`X.SOMETHING' and a data file named `D.SOMETHING' in the directory
+-`/usr/tmp/tstuu/spool1' (or, more likely, in subdirectories, depending
+-on the choice of `SPOOLDIR' in `policy.h').  Two log files will be
+-created in the directory `/usr/tmp/tstuu'.  They will be named `Log1'
+-and `Log2', or, if you have selected `HAVE_HDB_LOGGING' in `policy.h',
+-`Log1/uucico/test2' and `Log2/uucico/test1'.  There should be no errors
+-in the log files.
+-
+-   You can test `uuxqt' with `./uuxqt -I /usr/tmp/tstuu/Config1'.  This
+-should leave a command file `C.SOMETHING' and a data file `D.SOMETHING'
+-in `/usr/tmp/tstuu/spool1' or in subdirectories.  Again, there should
+-be no errors in the log file.
+-
+-   Assuming you compiled the code with debugging enabled, the `-x'
+-switch can be used to set debugging modes; see the `debug' command for
+-details (*note Debugging Levels::).  Use `-x all' to turn on all
+-debugging and generate far more output than you will ever want to see.
+-The `uucico' daemons will put debugging output in the files `Debug1'
+-and `Debug2' in the directory `/usr/tmp/tstuu'.  After that, you're
+-pretty much on your own.
+-
+-   On some systems you can also use `tstuu' to test `uucico' against
+-the system `uucico', by using the `-u' switch.  For this to work,
+-change the definitions of `ZUUCICO_CMD' and `UUCICO_EXECL' at the top
+-of `tstuu.c' to something appropriate for your system.  The definitions
+-in `tstuu.c' are what I used for Ultrix 4.0, on which
+-`/usr/lib/uucp/uucico' is particularly obstinate about being run as a
+-child; I was only able to run it by creating a login name with no
+-password whose shell was `/usr/lib/uucp/uucico'.  Calling login in this
+-way will leave fake entries in `wtmp' and `utmp'; if you compile
+-`tstout.c' (in the `contrib' directory) as a setuid `root' program,
+-`tstuu' will run it to clear those entries out.  On most systems, such
+-hackery should not be necessary, although on SCO I had to su to `root'
+-(`uucp' might also have worked) before I could run
+-`/usr/lib/uucp/uucico'.
+-
+-   You can test `uucp' and `uux' (give them the `-r' switch to keep
+-them from starting `uucico') to make sure they create the right sorts
+-of files.  Unfortunately, if you don't know what the right sorts of
+-files are, I'm not going to tell you here.
+-
+-   If you can not run `tstuu', or if it fails inexplicably, don't worry
+-about it too much.  On some systems `tstuu' will fail because of
+-problems using pseudo terminals, which will not matter in normal use.
+-The real test of the package is talking to another system.
+-
+-\x1f
+-File: uucp.info,  Node: Installing the Binaries,  Next: Configuration,  Prev: Testing the Compilation,  Up: Installing Taylor UUCP
++The code is carefully segregated into a system independent portion and a
++system dependent portion.  The system dependent code is in the `unix'
++subdirectory, and also in the file `sysh.unx' (also known as
++`sysdep.h').
+ 
+-Installing the Binaries
+-=======================
++   With the right configuration parameters, the system independent code
++calls only ANSI C functions.  Some of the less common ANSI C functions
++are also provided in the `lib' directory.  The replacement function
++`strtol' in `lib/strtol.c' assumes that the characters `A' to `F' and
++`a' to `f' appear in strictly sequential order.  The function
++`igradecmp' in `uuconf/grdcmp.c' assumes that the upper and lower case
++letters appear in order.  Both assumptions are true for ASCII and
++EBCDIC, but neither is guaranteed by ANSI C.  Disregarding these
++caveats, I believe that the system independent portion of the code is
++strictly conforming.
+ 
+-   You can install the executable files by becoming `root' and typing
+-`make install'.  Or you can look at what `make install' does and do it
+-by hand.  It tries to preserve your old programs, if any, but it only
+-does this the first time Taylor UUCP is installed (so that if you
+-install several versions of Taylor UUCP, you can still go back to your
+-original UUCP programs).  You can retrieve the original programs by
+-typing `make uninstall'.
+-
+-   Note that by default the programs are compiled with debugging
+-information, and they are not stripped when they are installed.  You may
+-want to strip the installed programs to save disk space.  For more
+-information, see your system documentation for the `strip' program.
++   That's not too exciting, since all the work is done in the system
++dependent code.  I think that this code can conform to POSIX 1003.1,
++given the right compilation parameters.  I'm a bit less certain about
++this, though.
+ 
+-   Of course, simply installing the executable files is not enough.  You
+-must also arrange for them to be used correctly.
++   The code has been used on a 16 bit segmented system with no function
++prototypes, so I'm fairly certain that all casts to long and pointers
++are done when necessary.
+ 
+ \x1f
+-File: uucp.info,  Node: Configuration,  Next: Testing the Installation,  Prev: Installing the Binaries,  Up: Installing Taylor UUCP
+-
+-Configuring Taylor UUCP
+-=======================
++File: uucp.info,  Node: Naming Conventions,  Next: Patches,  Prev: System Dependence,  Up: Hacking
+ 
+-   You will have to decide what types of configuration files you want to
+-use.  This package supports a new sort of configuration file; see *Note
+-Configuration Files::.  It also supports V2 configuration files
+-(`L.sys', `L-devices', etc.) and HDB configuration files (`Systems',
+-`Devices', etc.).  No documentation is provided for V2 or HDB
+-configuration files.  All types of configuration files can be used at
+-once, if you are so inclined.  Currently using just V2 configuration
+-files is not really possible, because there is no way to specify a
+-dialer (there are no built in dialers, and the program does not know
+-how to read `acucap' or `modemcap'); however, V2 configuration files
+-can be used with a new style dial file (*note dial File::), or with a
+-HDB `Dialers' file.
+-
+-   Use of HDB configuration files has two known bugs.  A blank line in
+-the middle of an entry in the `Permissions' file will not be ignored as
+-it should be.  Dialer programs, as found in some versions of HDB, are
+-not recognized directly.  If you must use a dialer program, rather than
+-an entry in `Devices', you must use the `chat-program' command in a new
+-style dial file; see *Note dial File::.  You will have to invoke the
+-dialer program via a shell script or another program, since an exit
+-code of 0 is required to recognize success; the `dialHDB' program in
+-the `contrib' directory may be used for this purpose.
+-
+-   The `uuconv' (*note Invoking uuconv::) program can be used to
+-convert from V2 or HDB configuration files to the new style (it can also
+-do the reverse translation, if you are so inclined).  It will not do all
+-of the work, and the results should be carefully checked, but it can be
+-quite useful.
+-
+-   If you are installing a new system, you will, of course, have to
+-write the configuration files; see *Note Configuration Files:: for
+-details on how to do this.
++7.2 Naming Conventions
++======================
+ 
+-   After writing the configuration files, use the `uuchk' program to
+-verify that they are what you expect; see *Note Invoking uuchk::.
+-
+-\x1f
+-File: uucp.info,  Node: Testing the Installation,  Prev: Configuration,  Up: Installing Taylor UUCP
++I use a modified Hungarian naming convention for my variables and
++functions.  As with all naming conventions, the code is rather opaque if
++you are not familiar with it, but becomes clear and easy to use with
++time.
+ 
+-Testing the Installation
+-========================
+-
+-   After you have written the configuration files, and verified them
+-with the `uuchk' program (*note Invoking uuchk::), you must check that
+-UUCP can correctly contact another system.
+-
+-   Tell `uucico' to dial out to the system by using the `-s' system
+-switch (e.g., `uucico -s uunet').  The log file should tell you what
+-happens.  The exact location of the log file depends upon the settings
+-in `policy.h' when you compiled the program, and on the use of the
+-`logfile' command in the `config' file.  Typical locations are
+-`/usr/spool/uucp/Log' or a subdirectory under `/usr/spool/uucp/.Log'.
+-
+-   If you compiled the code with debugging enabled, you can use
+-debugging mode to get a great deal of information about what sort of
+-data is flowing back and forth; the various possibilities are described
+-with the `debug' command (*note Debugging Levels::).  When initially
+-setting up a connection `-x chat' is probably the most useful (e.g.,
+-`uucico -s uunet -x chat'); you may also want to use `-x
+-handshake,incoming,outgoing'.  You can use `-x' multiple times on one
+-command line, or you can give it comma separated arguments as in the
+-last example.  Use `-x all' to turn on all possible debugging
+-information.
+-
+-   The debugging information is written to a file, normally
+-`/usr/spool/uucp/Debug', although the default can be changed in
+-`policy.h', and the `config' file can override the default with the
+-`debugfile' command.  The debugging file may contain passwords and some
+-file contents as they are transmitted over the line, so the debugging
+-file is only readable by the `uucp' user.
+-
+-   You can use the `-f' switch to force `uucico' to call out even if
+-the last call failed recently; using `-S' when naming a system has the
+-same effect.  Otherwise the status file (in the `.Status' subdirectory
+-of the main spool directory, normally `/usr/spool/uucp') (*note Status
+-Directory::) will prevent too many attempts from occurring in rapid
+-succession.
+-
+-   On older System V based systems which do not have the `setreuid'
+-system call, problems may arise if ordinary users can start an execution
+-of `uuxqt', perhaps indirectly via `uucp' or `uux'.  UUCP jobs may wind
+-up executing with a real user ID of the user who invoked `uuxqt', which
+-can cause problems if the UUCP job checks the real user ID for security
+-purposes.  On such systems, it is safest to put `run-uuxqt never'
+-(*note Miscellaneous (config)::) in the `config' file, so that `uucico'
+-never starts `uuxqt', and invoke `uuxqt' directly from a `crontab' file.
+-
+-   Please let me know about any problems you have and how you got around
+-them.  If you do report a problem, please include the version number of
+-the package you are using, the operating system you are running it on,
+-and a sample of the debugging file showing the problem (debugging
+-information is usually what is needed, not just the log file).  General
+-questions such as "why doesn't `uucico' dial out" are impossible to
+-answer without much more information.
+-
+-\x1f
+-File: uucp.info,  Node: Using Taylor UUCP,  Next: Configuration Files,  Prev: Installing Taylor UUCP,  Up: Top
++   The first character indicates the type of the variable (or function
++return value).  Sometimes additional characters are used.  I use the
++following type prefixes:
+ 
+-Using Taylor UUCP
+-*****************
++`a'
++     array; the next character is the type of an element
+ 
+-* Menu:
++`b'
++     byte or character
+ 
+-* Calling Other Systems::       Calling Other Systems
+-* Accepting Calls::             Accepting Calls
+-* Mail and News::               Using UUCP for Mail and News
+-* The Spool Directory Layout::  The Spool Directory Layout
+-* Spool Directory Cleaning::    Cleaning the UUCP Spool Directory
++`c'
++     count of something
+ 
+-\x1f
+-File: uucp.info,  Node: Calling Other Systems,  Next: Accepting Calls,  Prev: Using Taylor UUCP,  Up: Using Taylor UUCP
++`e'
++     stdio FILE *
+ 
+-Calling Other Systems
+-=====================
++`f'
++     boolean
+ 
+-   By default `uucp' and `uux' will automatically start up `uucico' to
+-call another system whenever work is queued up.  However, the call may
+-fail, or you may have put in time restrictions which prevent the call
+-at that time (perhaps because telephone rates are high) (*note When to
+-Call::).  Also, a remote system may have work queued up for your
+-system, but may not be calling you for some reason (perhaps you have
+-agreed that your system should always place the call).  To make sure
+-that work gets transferred between the systems withing a reasonable
+-time period, you should arrange to periodically invoke `uucico'.
+-
+-   These periodic invocations are normally triggered by entries in the
+-`crontab' file.  The exact format of `crontab' files, and how new
+-entries are added, varies from system to system; check your local
+-documentation (try `man cron').
+-
+-   To attempt to call all systems with outstanding work, use the command
+-`uucico -r1'.  To attempt to call a particular system, use the command
+-`uucico -s SYSTEM'.  To attempt to call a particular system, but only
+-if there is work for it, use the command `uucico -C -s SYSTEM'.  (*note
+-Invoking uucico::).
+-
+-   A common case is to want to try to call a system at a certain time,
+-with periodic retries if the call fails.  A simple way to do this is to
+-create an empty UUCP command file, known as a "poll file".  If a poll
+-file exists for a system, then `uucico -r1' will place a call to it.
+-If the call succeeds, the poll file will be deleted.
+-
+-   A poll file can be easily created using the `uux' command, by
+-requesting the execution of an empty command.  To create a poll file for
+-SYSTEM, just do something like this:
+-     uux -r SYSTEM!
+-   The `-r' tells `uux' to not start up `uucico' immediately.  Of
+-course, if you do want `uucico' to start up right away, omit the `-r';
+-if the call fails, the poll file will be left around to cause a later
+-call.
+-
+-   For example, I use the following crontab entries locally:
+-
+-     45 * * * * /bin/echo /usr/lib/uucp/uucico -r1 | /bin/su uucpa
+-     40 4,10,15 * * * /usr/bin/uux -r uunet!
+-
+-   Every hour, at 45 minutes past, this will check if there is any work
+-to be done, and, if there is, will call the appropriate system.  Also,
+-at 4:40am, 10:40am, and 3:40pm, this will create a poll file file for
+-`uunet', forcing the next run of `uucico' to call `uunet'.
++`i'
++     generic integer
+ 
+-\x1f
+-File: uucp.info,  Node: Accepting Calls,  Next: Mail and News,  Prev: Calling Other Systems,  Up: Using Taylor UUCP
++`l'
++     double
+ 
+-Accepting Calls
+-===============
++`o'
++     file descriptor (as returned by open, creat, etc.)
+ 
+-   To accept calls from another system, you must arrange matters such
+-that when that system calls in, it automatically invokes `uucico' on
+-your system.
+-
+-   The most common arrangement is to create a special user name and
+-password for incoming UUCP calls.  This user name typically uses the
+-same user ID as the regular `uucp' user (Unix permits several user
+-names to share the same user ID).  The shell for this user name should
+-be set to `uucico'.
+-
+-   Here is a sample `/etc/passwd' line to accept calls from a remote
+-system named airs:
+-     Uairs:PASSWORD:4:8:airs UUCP:/usr/spool/uucp:/usr/lib/uucp/uucico
+-   The details may vary on your system.  You must use reasonable user
+-and group ID's.  You must use the correct file name for `uucico'.  The
+-PASSWORD must appear in the UUCP configuration files on the remote
+-system, but will otherwise never be seen or typed by a human.
+-
+-   Note that `uucico' appears as the login shell, and that it will be
+-run with no arguments.  This means that it will start in slave mode and
+-accept an incoming connection.  *Note Invoking uucico::.
+-
+-   On some systems, creating an empty file named `.hushlogin' in the
+-home directory will skip the printing of various bits of information
+-when the remote `uucico' logs in, speeding up the UUCP connection
+-process.
+-
+-   For the greatest security, each system which calls in should use a
+-different user name, each with a different password, and the
+-`called-login' command should be used in the `sys' file to ensure that
+-the correct login name is used.  *Note Accepting a Call::, and see
+-*Note Security::.
+-
+-   If you never need to dial out from your system, but only accept
+-incoming calls, you can arrange for `uucico' to handle logins itself,
+-completely controlling the port, by using the `--endless' option.
+-*Note Invoking uucico::.
++`p'
++     generic pointer
+ 
+-\x1f
+-File: uucp.info,  Node: Mail and News,  Next: The Spool Directory Layout,  Prev: Accepting Calls,  Up: Using Taylor UUCP
++`q'
++     pointer to structure
+ 
+-Using UUCP for Mail and News.
+-=============================
++`s'
++     structure
+ 
+-   Taylor UUCP does not include a mail package.  All Unix systems come
+-with some sort of mail delivery agent, typically `sendmail' or `MMDF'.
+-Source code is available for some alternative mail delivery agents,
+-such as `IDA sendmail' and `smail'.
+-
+-   Taylor UUCP also does not include a news package.  The two major Unix
+-news packages are `C-news' and `INN'.  Both are available in source
+-code form.
+-
+-   Configuring and using mail delivery agents is a notoriously complex
+-topic, and I will not be discussing it here.  Configuring news systems
+-is usually simpler, but I will not be discussing that either.  I will
+-merely describe the interactions between the mail and news systems and
+-UUCP.
++`u'
++     void (function return values only)
+ 
+-   A mail or news system interacts with UUCP in two ways: sending and
+-receiving.
++`z'
++     character string
+ 
+-* Menu:
++   A generic pointer (`p') is sometimes a `void *', sometimes a
++function pointer in which case the prefix is pf, and sometimes a pointer
++to another type, in which case the next character is the type to which
++it points (pf is overloaded).
+ 
+-* Sending mail or news::        Sending mail or news via UUCP
+-* Receiving mail or news::      Receiving mail or news via UUCP
++   An array of strings (`char *[]') would be named `az' (array of
++string).  If this array were passed to a function, the function
++parameter would be named `paz' (pointer to array of string).
+ 
+-\x1f
+-File: uucp.info,  Node: Sending mail or news,  Next: Receiving mail or news,  Prev: Mail and News,  Up: Mail and News
++   Note that the variable name prefixes do not necessarily indicate the
++type of the variable.  For example, a variable prefixed with `i' may be
++int, long or short.  Similarly, a variable prefixed with `b' may be a
++char or an int; for example, the return value of `getchar' would be
++caught in an int variable prefixed with `b'.
+ 
+-Sending mail or news via UUCP
+------------------------------
++   For a non-local variable (extern or file static), the first character
++after the type prefix is capitalized.
+ 
+-   When mail is to be sent from your machine to another machine via
+-UUCP, the mail delivery agent will invoke `uux'.  It will generally run
+-a command such as `uux - SYSTEM!rmail ADDRESS', where SYSTEM is the
+-remote system to which the mail is being sent.  It may pass other
+-options to `uux', such as `-r' or `-g' (*note Invoking uux::).
+-
+-   The news system also invokes `uux' in order to transfer articles to
+-another system.  The only difference is that news will use `uux' to
+-invoke `rnews' on the remote system, rather than `rmail'.
+-
+-   You should arrange for your mail and news systems to invoke the
+-Taylor UUCP version of `uux'.  If you only have Taylor UUCP, or if you
+-simply replace any existing version of `uux' with the Taylor UUCP
+-version, this will probably happen automatically.  However, if you have
+-two UUCP packages installed on your system, you will probably have to
+-modify the mail and news configuration files in some way.
+-
+-   Actually, if both the system UUCP and Taylor UUCP are using the same
+-spool directory format, the system `uux' will probably work fine with
+-the Taylor `uucico' (the reverse is not the case: the Taylor `uux'
+-requires the Taylor `uucico').  However, data transfer will be somewhat
+-more efficient if the Taylor `uux' is used.
++   Most static variables and functions use another letter after the type
++prefix to indicate which module they come from.  This is to help
++distinguish different names in the debugger.  For example, all static
++functions in `protg.c', the `g' protocol source code, use a module
++prefix of `g'.  This isn't too useful, as a number of modules use a
++module prefix of `s'.
+ 
+ \x1f
+-File: uucp.info,  Node: Receiving mail or news,  Prev: Sending mail or news,  Up: Mail and News
++File: uucp.info,  Node: Patches,  Prev: Naming Conventions,  Up: Hacking
+ 
+-Receiving mail or news via UUCP
+--------------------------------
++7.3 Patches
++===========
+ 
+-   To receive mail, all that is necessary is for UUCP to invoke
+-`rmail'.  Any mail delivery agent will provide an appropriate version
+-of `rmail'; you must simply make sure that it is in the command path
+-used by UUCP (it almost certainly already is).  The default command
+-path is set in `policy.h', and it may be overridden for a particular
+-system by the `command-path' command (*note Miscellaneous (sys)::).
+-
+-   Similarly, for news UUCP must be able to invoke `rnews'.  Any news
+-system will provide a version of `rnews', and you must ensure that is
+-in a directory on the path that UUCP will search.
++I am always grateful for any patches sent in.  Much of the flexibility
++and portability of the code is due to other people.  Please do not
++hesitate to send me any changes you have found necessary or useful.
++
++   When sending a patch, please send the output of the Unix `diff'
++program invoked with the `-c' option (if you have the GNU version of
++`diff', use the `-p' option).  Always invoke `diff' with the original
++file first and the modified file second.
++
++   If your `diff' does not support `-c' (or you don't have `diff'),
++send a complete copy of the modified file (if you have just changed a
++single function, you can just send the new version of the function).
++In particular, please do not send `diff' output without the `-c'
++option, as it is useless.
++
++   If you have made a number of changes, it is very convenient for me if
++you send each change as a separate mail message.  Sometimes I will think
++that one change is useful but another one is not.  If they are in
++different messages it is much easier for me to apply one but not the
++other.
++
++   I rarely apply the patches directly.  Instead I work my way through
++the hunks and apply each one separately.  This ensures that the naming
++remains consistent, and that I understand all the code.
++
++   If you can not follow all these rules, then don't.  But if you do, it
++makes it more likely that I will incorporate your changes.  I am not
++paid for my UUCP work, and my available time is unfortunately very
++restricted.  The package is important to me, and I do what I can, but I
++can not do all that I would like, much less all that everybody else
++would like.
++
++   Finally, please do not be offended if I do not reply to messages for
++some time, even a few weeks.  I am often behind on my mail, and if I
++think your message deserves a considered reply I will often put it aside
++until I have time to deal with it.
++
++\x1f
++File: uucp.info,  Node: Acknowledgements,  Next: Index (concepts),  Prev: Hacking,  Up: Top
++
++8 Acknowledgements
++******************
++
++This is a list of people who gave help or suggestions while I was
++working on the Taylor UUCP project.  Appearance on this list does not
++constitute endorsement of the program, particularly since some of the
++comments were criticisms.  I've probably left some people off, and I
++apologize for any oversight; it does not mean your contribution was
++unappreciated.
++
++   First of all, I would like to thank the people at Infinity
++Development Systems (formerly AIRS, which lives on in the domain name)
++for permitting me to use their computers and `uunet' access.  I would
++also like to thank Richard Stallman <rms@gnu.org> for founding the Free
++Software Foundation, and John Gilmore <gnu@toad.com> for writing the
++initial version of gnuucp (based on uuslave) which was a direct
++inspiration for this somewhat larger project.  Chip Salzenberg
++<chip@tct.com> has contributed many patches.  Franc,ois Pinard
++<pinard@iro.umontreal.ca> tirelessly tested the code and suggested many
++improvements.  He also put together the initial version of this manual.
++Doug Evans contributed the zmodem protocol.  Marc Boucher
++<marc@CAM.ORG> contributed the code supporting the pipe port type.
++Jorge Cwik <jorge@laser.satlink.net> contributed the `y' protocol code.
++Finally, Verbus M. Counts <verbus@westmark.com> and Centel Federal
++Systems, Inc., deserve special thanks, since they actually paid me
++money to port this code to System III.
++
++   In alphabetical order:
++
++     Meno Abels <Meno.Abels@Technical.Adviser.com>
++     "Earle F. Ake - SAIC" <ake@Dayton.SAIC.COM>
++     <mra@searchtech.com> (Michael Almond)
++     <cambler@zeus.calpoly.edu> (Christopher J. Ambler)
++     Brian W. Antoine <briana@tau-ceti.isc-br.com>
++     <jantypas@soft21.s21.com> (John Antypas)
++     <james@bigtex.cactus.org> (James Van Artsdalen)
++     <jima@netcom.com> (Jim Avera)
++     <nba@sysware.DK> (Niels Baggesen)
++     <uunet!hotmomma!sdb> (Scott Ballantyne)
++     Zacharias Beckman <zac@dolphin.com>
++     <mike@mbsun.ann-arbor.mi.us> (Mike Bernson)
++     <bob@usixth.sublink.org> (Roberto Biancardi)
++     <statsci!scott@coco.ms.washington.edu> (Scott Blachowicz)
++     <bag%wood2.cs.kiev.ua@relay.ussr.eu.net> (Andrey G Blochintsev)
++     <spider@Orb.Nashua.NH.US> (Spider Boardman)
++     Gregory Bond <gnb@bby.com.au>
++     Marc Boucher <marc@CAM.ORG>
++     Ard van Breemen <ard@cstmel.hobby.nl>
++     <dean@coplex.com> (Dean Brooks)
++     <jbrow@radical.com> (Jim Brownfield)
++     <dave@dlb.com> (Dave Buck)
++     <gordon@sneaky.lonestar.org> (Gordon Burditt)
++     <dburr@sbphy.physics.ucsb.edu> (Donald Burr)
++     <mib@gnu.ai.mit.edu> (Michael I Bushnell)
++     Brian Campbell <brianc@quantum.on.ca>
++     Andrew A. Chernov <ache@astral.msk.su>
++     <jhc@iscp.bellcore.com> (Jonathan Clark)
++     <mafc!frank@bach.helios.de> (Frank Conrad)
++     Ed Carp <erc@apple.com>
++     <mpc@mbs.linet.org> (Mark Clements)
++     <verbus@westmark.westmark.com> (Verbus M. Counts)
++     <cbmvax!snark.thyrsus.com!cowan> (John Cowan)
++     Bob Cunningham <bob@soest.hawaii.edu>
++     <jorge@laser.satlink.net> (Jorge Cwik)
++     <kdburg@incoahe.hanse.de> (Klaus Dahlenburg)
++     Damon <d@exnet.co.uk>
++     <celit!billd@UCSD.EDU> (Bill Davidson)
++     <hubert@arakis.fdn.org> (Hubert Delahaye)
++     <markd@bushwire.apana.org.au> (Mark Delany)
++     Allen Delaney <allen@brc.ubc.ca>
++     Gerriet M. Denkmann <gerriet@hazel.north.de>
++     <denny@dakota.alisa.com> (Bob Denny)
++     Drew Derbyshire <ahd@kew.com>
++     <ssd@nevets.oau.org> (Steven S. Dick)
++     <gert@greenie.gold.sub.org> (Gert Doering)
++     <gemini@geminix.in-berlin.de> (Uwe Doering)
++     Hans-Dieter Doll <hd2@Insel.DE>
++     <deane@deane.teleride.on.ca> (Dean Edmonds)
++     Mark W. Eichin <eichin@cygnus.com>
++     <erik@pdnfido.fidonet.org>
++     Andrew Evans <andrew@airs.com>
++     <dje@cygnus.com> (Doug Evans)
++     Marc Evans <marc@synergytics.com>
++     Dan Everhart <dan@dyndata.com>
++     <kksys!kegworks!lfahnoe@cs.umn.edu> (Larry Fahnoe)
++     Matthew Farwell <dylan@ibmpcug.co.uk>
++     <fenner@jazz.psu.edu> (Bill Fenner)
++     <jaf@inference.com> (Jose A. Fernandez)
++     "David J. Fiander" <golem!david@news.lsuc.on.ca>
++     Thomas Fischer <batman@olorin.dark.sub.org>
++     Mister Flash <flash@sam.imash.ras.ru>
++     <louis@marco.de> (Ju"rgen Fluk)
++     <erik@eab.retix.com> (Erik Forsberg)
++     <andy@scp.caltech.edu> (Andy Fyfe)
++     Lele Gaifax <piggy@idea.sublink.org>
++     <Peter.Galbavy@micromuse.co.uk>
++     <hunter@phoenix.pub.uu.oz.au> (James Gardiner [hunter])
++     Terry Gardner <cphpcom!tjg01>
++     <dgilbert@gamiga.guelphnet.dweomer.org> (David Gilbert)
++     <ol@infopro.spb.su> (Oleg Girko)
++     <jimmy@tokyo07.info.com> (Jim Gottlieb)
++     Benoit Grange <ben@fizz.fdn.org>
++     <elg@elgamy.jpunix.com> (Eric Lee Green)
++     <ryan@cs.umb.edu> (Daniel R. Guilderson)
++     <greg@gagme.chi.il.us> (Gregory Gulik)
++     Richard H. Gumpertz <rhg@cps.com>
++     Scott Guthridge <scooter@cube.rain.com>
++     Michael Haberler <mah@parrot.prv.univie.ac.at>
++     Daniel Hagerty <hag@eddie.mit.edu>
++     <jh@moon.nbn.com> (John Harkin)
++     <guy@auspex.auspex.com> (Guy Harris)
++     <hsw1@papa.attmail.com> (Stephen Harris)
++     Tom Ivar Helbekkmo <tih@Norway.EU.net>
++     Petri Helenius <pete@fidata.fi>
++     <gabe@edi.com> (B. Gabriel Helou)
++     Bob Hemedinger <bob@dalek.mwc.com>
++     Andrew Herbert <andrew@werple.pub.uu.oz.au>
++     <kherron@ms.uky.edu> (Kenneth Herron)
++     Peter Honeyman <honey@citi.umich.edu>
++     <jhood@smoke.marlboro.vt.us> (John Hood)
++     Mark Horsburgh <markh@kcbbs.gen.nz>
++     John Hughes <john@Calva.COM>
++     Mike Ipatow <mip@fido.itc.e-burg.su>
++     Bill Irwin <bill@twg.bc.ca>
++     <pmcgw!personal-media.co.jp!ishikawa> (Chiaki Ishikawa)
++     <ai@easy.in-chemnitz.de> (Andreas Israel)
++     <iverson@lionheart.com> (Tim Iverson)
++     <bei@dogface.austin.tx.us> (Bob Izenberg)
++     <djamiga!djjames@fsd.com> (D.J.James)
++     Rob Janssen <cmgit!rob@relay.nluug.nl>
++     <harvee!esj> (Eric S Johansson)
++     Kevin Johnson <kjj@pondscum.phx.mcd.mot.com>
++     <rj@rainbow.in-berlin.de> (Robert Joop)
++     Alan Judge <aj@dec4ie.IEunet.ie>
++     <chris@cj_net.in-berlin.de> (Christof Junge)
++     Romain Kang <romain@pyramid.com>
++     <tron@Veritas.COM> (Ronald S. Karr)
++     Brendan Kehoe <brendan@cs.widener.edu>
++     <warlock@csuchico.edu> (John Kennedy)
++     <kersing@nlmug.nl.mugnet.org> (Jac Kersing)
++     <ok@daveg.PFM-Mainz.de> (Olaf Kirch)
++     Gabor Kiss <kissg@sztaki.hu>
++     <gero@gkminix.han.de> (Gero Kuhlmann)
++     <rob@pact.nl> (Rob Kurver)
++     "C.A. Lademann" <cal@zls.gtn.com>
++     <kent@sparky.IMD.Sterling.COM> (Kent Landfield)
++     Tin Le <tin@saigon.com>
++     <lebaron@inrs-telecom.uquebec.ca>  (Gregory LeBaron)
++     <karl@sugar.NeoSoft.Com> (Karl Lehenbauer)
++     <alex@hal.rhein-main.de> (Alexander Lehmann)
++     <merlyn@digibd.com> (Merlyn LeRoy)
++     <clewis@ferret.ocunix.on.ca> (Chris Lewis)
++     <gdonl@ssi1.com> (Don Lewis)
++     <libove@libove.det.dec.com> (Jay Vassos-Libove)
++     <bruce%blilly@Broadcast.Sony.COM> (Bruce Lilly)
++     Godfrey van der Linden <Godfrey_van_der_Linden@NeXT.COM>
++     Ted Lindgreen <tlindgreen@encore.nl>
++     <andrew@cubetech.com> (Andrew Loewenstern)
++     "Arne Ludwig" <arne@rrzbu.hanse.de>
++     Matthew Lyle <matt@mips.mitek.com>
++     <djm@eng.umd.edu> (David J. MacKenzie)
++     John R MacMillan <chance!john@sq.sq.com>
++     <jum@helios.de> (Jens-Uwe Mager)
++     Giles D Malet <shrdlu!gdm@provar.kwnet.on.ca>
++     <mem@mv.MV.COM> (Mark E. Mallett)
++     <pepe@dit.upm.es> (Jose A. Manas)
++     <peter@xpoint.ruessel.sub.org> (Peter Mandrella)
++     <martelli@cadlab.sublink.org> (Alex Martelli)
++     W Christopher Martin <wcm@geek.ca.geac.com>
++     Yanek Martinson <yanek@mthvax.cs.miami.edu>
++     <thomasm@mechti.wupper.de> (Thomas Mechtersheimer)
++     <jm@aristote.univ-paris8.fr> (Jean Mehat)
++     <me@halfab.freiburg.sub.org> (Udo Meyer)
++     <les@chinet.chi.il.us> (Leslie Mikesell)
++     <bug@cyberdex.cuug.ab.ca> (Trever Miller)
++     <mmitchel@digi.lonestar.org> (Mitch Mitchell)
++     Emmanuel Mogenet <mgix@krainte.jpn.thomson-di.fr>
++     <rmohr@infoac.rmi.de> (Rupert Mohr)
++     Jason Molenda <molenda@sequent.com>
++     <ianm@icsbelf.co.uk> (Ian Moran)
++     <jmorriso@bogomips.ee.ubc.ca> (John Paul Morrison)
++     <brian@ilinx.wimsey.bc.ca> (Brian J. Murrell)
++     <service@infohh.rmi.de> (Dirk Musstopf)
++     <lyndon@cs.athabascau.ca> (Lyndon Nerenberg)
++     <rolf@saans.north.de> (Rolf Nerstheimer)
++     <tom@smart.bo.open.de> (Thomas Neumann)
++     <mnichols@pacesetter.com>
++     Richard E. Nickle <trystro!rick@Think.COM>
++     <stephan@sunlab.ka.sub.org> (Stephan Niemz)
++     <raymond@es.ele.tue.nl> (Raymond Nijssen)
++     <nolan@helios.unl.edu> (Michael Nolan)
++     david nugent <david@csource.oz.au>
++     Jim O'Connor <jim@bahamut.fsc.com>
++     <kevin%kosman.uucp@nrc.com> (Kevin O'Gorman)
++     Petri Ojala <ojala@funet.fi>
++     <oneill@cs.ulowell.edu> (Brian 'Doc' O'Neill)
++     <Stephen.Page@prg.oxford.ac.uk>
++     Peter Palfrader <peter@palfrader.org>
++     <abekas!dragoman!mikep@decwrl.dec.com> (Mike Park)
++     Tim Peiffer <peiffer@cs.umn.edu>
++     <don@blkhole.resun.com> (Don Phillips)
++     "Mark Pizzolato 415-369-9366" <mark@infocomm.com>
++     John Plate <plate@infotek.dk>
++     <dplatt@ntg.com> (Dave Platt)
++     <eldorado@tharr.UUCP> (Mark Powell)
++     Mark Powell <mark@inet-uk.co.uk>
++     <pozar@kumr.lns.com> (Tim Pozar)
++     <joey@tessi.UUCP> (Joey Pruett)
++     Paul Pryor <ptp@fallschurch-acirs2.army.mil>
++     <putsch@uicc.com> (Jeff Putsch)
++     <ar@nvmr.robin.de> (Andreas Raab)
++     Vadim Radionov <rvp@zfs.lg.ua>
++     Jarmo Raiha <jarmo@ksvltd.FI>
++     James Revell <revell@uunet.uu.net>
++     Scott Reynolds <scott@clmqt.marquette.Mi.US>
++     <mcr@Sandelman.OCUnix.On.Ca> (Michael Richardson)
++     Kenji Rikitake <kenji@rcac.astem.or.jp>
++     <arnold@cc.gatech.edu> (Arnold Robbins)
++     <steve@Nyongwa.cam.org> (Steve M. Robbins)
++     Ollivier Robert <Ollivier.Robert@keltia.frmug.fr.net>
++     Serge Robyns <sr@denkart.be>
++     Lawrence E. Rosenman <ler@lerami.lerctr.org>
++     Jeff Ross <jeff@wisdom.bubble.org>
++     Aleksey P. Rudnev <alex@kiae.su>
++     "Heiko W.Rupp" <hwr@pilhuhn.ka.sub.org>
++     <wolfgang@wsrcc.com> (Wolfgang S. Rupprecht)
++     <tbr@tfic.bc.ca> (Tom Rushworth)
++     Peter Rye <prye@picu-sgh.demon.co.uk>
++     <jsacco@ssl.com> (Joseph E. Sacco)
++     <rsalz@bbn.com> (Rich Salz)
++     Curt Sampson <curt@portal.ca>
++     <sojurn!mike@hobbes.cert.sei.cmu.edu> (Mike Sangrey)
++     Nickolay Saukh <nms@ussr.EU.net>
++     Ignatios Souvatzis <is@jocelyn.rhein.de>
++     <heiko@lotte.sax.de> (Heiko Schlittermann)
++     Eric Schnoebelen <eric@cirr.com>
++     <russell@alpha3.ersys.edmonton.ab.ca> (Russell Schulz)
++     <scott@geom.umn.edu>
++     Igor V. Semenyuk <iga@argrd0.argonaut.su>
++     Christopher Sawtell <chris@gerty.equinox.gen.nz>
++     <schuler@bds.sub.org> (Bernd Schuler)
++     <uunet!gold.sub.org!root> (Christian Seyb)
++     Marcus Shang <marcus.shang@canada.cdev.com>
++     <s4mjs!mjs@nirvo.nirvonics.com> (M. J. Shannon Jr.)
++     <shields@tembel.org> (Michael Shields)
++     <peter@ficc.ferranti.com> (Peter da Silva)
++     <vince@victrola.sea.wa.us> (Vince Skahan)
++     <frumious!pat> (Patrick Smith)
++     <roscom!monty@bu.edu> (Monty Solomon)
++     <sommerfeld@orchard.medford.ma.us> (Bill Sommerfeld)
++     Julian Stacey <stacey@guug.de>
++     <evesg@etlrips.etl.go.jp> (Gjoen Stein)
++     Harlan Stenn <harlan@mumps.pfcs.com>
++     Ralf Stephan <ralf@ark.abg.sub.org>
++     <johannes@titan.westfalen.de> (Johannes Stille)
++     <chs@antic.apu.fi> (Hannu Strang)
++     <ralf@reswi.ruhr.de> (Ralf E. Stranzenbach)
++     <sullivan@Mathcom.com> (S. Sullivan)
++     Shigeya Suzuki <shigeya@dink.foretune.co.jp>
++     <kls@ditka.Chicago.COM> (Karl Swartz)
++     <swiers@plains.NoDak.edu>
++     Oleg Tabarovsky <olg@olghome.pccentre.msk.su>
++     <ikeda@honey.misystems.co.jp> (Takatoshi Ikeda)
++     John Theus <john@theus.rain.com>
++     <rd@aii.com> (Bob Thrush)
++     ppKarsten Thygesen <karthy@dannug.dk>
++     Graham Toal <gtoal@pizzabox.demon.co.uk>
++     <rmtodd@servalan.servalan.com> (Richard Todd)
++     Michael Ju. Tokarev <mjt@tls.msk.ru>
++     Martin Tomes <mt00@controls.eurotherm.co.uk>
++     Len Tower <tower-prep@ai.mit.edu>
++     Mark Towfiq <justice!towfiq@Eingedi.Newton.MA.US>
++     <mju@mudos.ann-arbor.mi.us> (Marc Unangst)
++     Matthias Urlichs <urlichs@smurf.noris.de>
++     Tomi Vainio <tomppa@fidata.fi>
++     <a3@a3.xs4all.nl> (Adri Verhoef)
++     Andrew Vignaux <ajv@ferrari.datamark.co.nz>
++     <vogel@omega.ssw.de> (Andreas Vogel)
++     Dima Volodin <dvv@hq.demos.su>
++     <jos@bull.nl> (Jos Vos)
++     <jv@nl.net> (Johan Vromans)
++     David Vrona <dave@sashimi.wwa.com>
++     <Marcel.Waldvogel@nice.usergroup.ethz.ch> (Marcel Waldvogel)
++     <steve@nshore.org> (Stephen J. Walick)
++     <syd@dsinc.dsi.com> (Syd Weinstein)
++     <gerben@rna.indiv.nluug.nl> (Gerben Wierda)
++     <jbw@cs.bu.edu> (Joe Wells)
++     <frnkmth!twwells.com!bill> (T. William Wells)
++     Peter Wemm <Peter_Wemm@zeus.dialix.oz.au>
++     <mauxci!eci386!woods@apple.com> (Greg A. Woods)
++     <John.Woods@proteon.com> (John Woods)
++     Michael Yu.Yaroslavtsev <mike@yaranga.ipmce.su>
++     Alexei K. Yushin <root@july.elis.crimea.ua>
++     <jon@console.ais.org> (Jon Zeeff)
++     Matthias Zepf <agnus@amylnd.stgt.sub.org>
++     Eric Ziegast <uunet!ziegast>
+ 
+ \x1f
+-File: uucp.info,  Node: The Spool Directory Layout,  Next: Spool Directory Cleaning,  Prev: Mail and News,  Up: Using Taylor UUCP
+-
+-The Spool Directory Layout
+-==========================
++File: uucp.info,  Node: Index (concepts),  Next: Index (configuration file),  Prev: Acknowledgements,  Up: Top
+ 
+-   In general, the layout of the spool directory may be safely ignored.
+-However, it is documented here for the curious.  This description only
+-covers the `SPOOLDIR_TAYLOR' layout.  The ways in which the other spool
+-directory layouts differ are described in the source file
+-`unix/spool.c'.
+-
+-   Directories and files are only created when they are needed, so a
+-typical system will not have all of the entries described here.
++Concept Index
++*************
+ 
++\0\b[index\0\b]
+ * Menu:
+ 
+-* System Spool Directories::    System Spool Directories
+-* Status Directory::            Status Spool Directory
+-* Execution Subdirectories::    Execution Spool Subdirectories
+-* Other Spool Subdirectories::  Other Spool Subdirectories
+-* Spool Lock Files::            Spool Directory Lock Files
++* .Corrupt:                              Execution Subdirectories.
++                                                               (line 21)
++* .Failed:                               Execution Subdirectories.
++                                                               (line 26)
++* .Preserve:                             Other Spool Subdirectories.
++                                                               (line 30)
++* .Received:                             Other Spool Subdirectories.
++                                                               (line 38)
++* .Sequence:                             Other Spool Subdirectories.
++                                                               (line  7)
++* .Status:                               Status Directory.     (line  7)
++* .Temp:                                 Other Spool Subdirectories.
++                                                               (line 14)
++* .Xqtdir:                               Execution Subdirectories.
++                                                               (line  7)
++* /usr/spool/uucp:                       Miscellaneous (config).
++                                                               (line 14)
++* /usr/spool/uucppublic:                 Miscellaneous (config).
++                                                               (line 20)
++* accepting calls:                       Accepting Calls.      (line  6)
++* anonymous UUCP:                        config File Examples. (line 41)
++* call configuration file:               Configuration File Names.
++                                                               (line 47)
++* call in login name:                    Configuration File Names.
++                                                               (line 64)
++* call in password:                      Configuration File Names.
++                                                               (line 64)
++* call out file:                         Configuration File Names.
++                                                               (line 47)
++* call out login name:                   Configuration File Names.
++                                                               (line 47)
++* call out password:                     Configuration File Names.
++                                                               (line 47)
++* calling in:                            Accepting Calls.      (line  6)
++* calling out:                           Calling Other Systems.
++                                                               (line  6)
++* changing spool directory:              config File Examples. (line 26)
++* chat scripts:                          Chat Scripts.         (line  6)
++* cleaning the spool directory:          Spool Directory Cleaning.
++                                                               (line  6)
++* config file:                           config File.          (line  6)
++* config file examples:                  config File Examples. (line  6)
++* configuration file (call):             Configuration File Names.
++                                                               (line 47)
++* configuration file (config):           config File.          (line  6)
++* configuration file (dial):             dial File.            (line  6)
++* configuration file (dialcode):         Configuration File Names.
++                                                               (line 30)
++* configuration file (passwd):           Configuration File Names.
++                                                               (line 64)
++* configuration file (port):             port File.            (line  6)
++* configuration file (sys):              sys File.             (line  6)
++* d protocol:                            d Protocol.           (line  6)
++* debugging file:                        Log File Names.       (line 19)
++* dial file:                             dial File.            (line  6)
++* dialcode configuration file:           Configuration File Names.
++                                                               (line 30)
++* dialcode file:                         Configuration File Names.
++                                                               (line 30)
++* dialer configuration file:             dial File.            (line  6)
++* e protocol:                            e Protocol.           (line  6)
++* E UUCP protocol command:               The E Command.        (line  6)
++* execution file format:                 Execution File Format.
++                                                               (line  6)
++* f protocol:                            f Protocol.           (line  6)
++* final handshake:                       The Final Handshake.  (line  6)
++* G protocol:                            Big G Protocol.       (line  6)
++* g protocol:                            g Protocol.           (line  6)
++* gateway:                               Gateway Example.      (line  6)
++* grades:                                When to Call.         (line 25)
++* grades implementation:                 UUCP Grades.          (line  6)
++* h protocol:                            h Protocol.           (line  6)
++* H UUCP protocol command:               The H Command.        (line  6)
++* i protocol:                            i Protocol.           (line  6)
++* initial handshake:                     The Initial Handshake.
++                                                               (line  6)
++* j protocol:                            j Protocol.           (line  6)
++* L.XXX:                                 Spool Lock Files.     (line 43)
++* LCK..SYS:                              Spool Lock Files.     (line 16)
++* LCK.XQT.NN:                            Spool Lock Files.     (line 28)
++* leaf site:                             Leaf Example.         (line  6)
++* lock directory:                        Miscellaneous (config).
++                                                               (line 27)
++* lock files:                            UUCP Lock Files.      (line  6)
++* lock files in spool directory:         Spool Lock Files.     (line  6)
++* log file:                              Log File Names.       (line  7)
++* LXQ.CMD:                               Spool Lock Files.     (line 36)
++* mail:                                  Mail and News.        (line  6)
++* main configuration file:               config File.          (line  6)
++* news:                                  Mail and News.        (line  6)
++* parity in login names:                 Miscellaneous (config).
++                                                               (line 43)
++* passwd configuration file:             Configuration File Names.
++                                                               (line 64)
++* passwd file:                           Configuration File Names.
++                                                               (line 64)
++* port configuration file:               port File.            (line  6)
++* port file:                             port File.            (line  6)
++* protocol d:                            d Protocol.           (line  6)
++* protocol e:                            e Protocol.           (line  6)
++* protocol f:                            f Protocol.           (line  6)
++* protocol G:                            Big G Protocol.       (line  6)
++* protocol g:                            g Protocol.           (line  6)
++* protocol h:                            h Protocol.           (line  6)
++* protocol i:                            i Protocol.           (line  6)
++* protocol j:                            j Protocol.           (line  6)
++* protocol t:                            t Protocol.           (line  6)
++* protocol v:                            v Protocol.           (line  6)
++* protocol x:                            x Protocol.           (line  6)
++* protocol y:                            y Protocol.           (line  6)
++* protocol, UUCP:                        UUCP Protocol.        (line  6)
++* public directory:                      Miscellaneous (config).
++                                                               (line 20)
++* R UUCP protocol command:               The R Command.        (line  6)
++* S UUCP protocol command:               The S Command.        (line  6)
++* spool directory:                       The Spool Directory Layout.
++                                                               (line  6)
++* spool directory, changing:             config File Examples. (line 26)
++* spool directory, cleaning:             Spool Directory Cleaning.
++                                                               (line  6)
++* spool directory, setting:              Miscellaneous (config).
++                                                               (line 14)
++* statistics file:                       Log File Names.       (line 14)
++* status files:                          Status Directory.     (line  7)
++* sys file:                              sys File.             (line  6)
++* sys file example (gateway):            Gateway Example.      (line  6)
++* sys file example (leaf):               Leaf Example.         (line  6)
++* system configuration file:             sys File.             (line  6)
++* system lock files:                     Spool Lock Files.     (line 16)
++* system name:                           Miscellaneous (config).
++                                                               (line  9)
++* system spool directories:              System Spool Directories.
++                                                               (line  6)
++* t protocol:                            t Protocol.           (line  6)
++* time strings:                          Time Strings.         (line  6)
++* unknown systems:                       Miscellaneous (config).
++                                                               (line 36)
++* UUCP protocol:                         UUCP Protocol.        (line  6)
++* UUCP protocol E command:               The E Command.        (line  6)
++* UUCP protocol H command:               The H Command.        (line  6)
++* UUCP protocol R command:               The R Command.        (line  6)
++* UUCP protocol S command:               The S Command.        (line  6)
++* UUCP protocol X command:               The X Command.        (line  6)
++* UUCP system name:                      Miscellaneous (config).
++                                                               (line  9)
++* uucppublic:                            Miscellaneous (config).
++                                                               (line 20)
++* v protocol:                            v Protocol.           (line  6)
++* x protocol:                            x Protocol.           (line  6)
++* X UUCP protocol command:               The X Command.        (line  6)
++* X.* file format:                       Execution File Format.
++                                                               (line  6)
++* y protocol:                            y Protocol.           (line  6)
+ 
+ \x1f
+-File: uucp.info,  Node: System Spool Directories,  Next: Status Directory,  Prev: The Spool Directory Layout,  Up: The Spool Directory Layout
+-
+-System Spool Directories
+-------------------------
++File: uucp.info,  Node: Index (configuration file),  Prev: Index (concepts),  Up: Top
+ 
+-`SYSTEM'
+-     There is a subdirectory of the main spool directory for each remote
+-     system.
+-
+-`SYSTEM/C.'
+-     This directory stores files describing file transfer commands to
+-     be sent to the SYSTEM.  Each file name starts with `C.G', where G
+-     is the job grade.  Each file contains one or more commands.  For
+-     details of the commands, see *Note UUCP Protocol Commands::.
+-
+-`SYSTEM/D.'
+-     This directory stores data files.  Files with names like
+-     `D.GSSSS', where G is the grade and SSSS is a sequence number, are
+-     waiting to be transferred to the SYSTEM, as directed by the files
+-     in the `SYSTEM/C.' directory.  Files with other names, typically
+-     `D.SYSTEMGSSSS', have been received from SYSTEM and are waiting to
+-     be processed by an execution file in the `SYSTEM/X.' directory.
+-
+-`SYSTEM/D.X'
+-     This directory stores data files which will become execution files
+-     on the remote system.  In current practice, this directory rarely
+-     exists, because most simple executions, including typical uses of
+-     `rmail' and `rnews', send an `E' command rather than an execution
+-     file (*note The E Command::).
+-
+-`SYSTEM/X.'
+-     This directory stores execution files which have been received from
+-     SYSTEM.  This directory normally exists, even though the
+-     corresponding `D.X' directory does not, because `uucico' will
+-     create an execution file on the fly when it receives an `E'
+-     command.
+-
+-`SYSTEM/SEQF'
+-     This file holds the sequence number of the last job sent to
+-     SYSTEM.  The sequence number is used to ensure that file names are
+-     unique in the remote system spool directory.  The file is four
+-     bytes long.  Sequence numbers are composed of digits and the upper
+-     case letters.
++Configuration File Index
++************************
+ 
+-\x1f
+-File: uucp.info,  Node: Status Directory,  Next: Execution Subdirectories,  Prev: System Spool Directories,  Up: The Spool Directory Layout
+-
+-Status Directory
+-----------------
++\0\b[index\0\b]
++* Menu:
+ 
+-`.Status'
+-     This directory holds status files for each remote system.  The
+-     name of the status file is the name of the system which it
+-     describes.  Each status file describes the last conversation with
+-     the system.  Running `uustat --status' basically just formats and
+-     prints the contents of the status files (*note uustat Examples::).
+-
+-     Each status file has a single text line with six fields.
+-
+-    code
+-          A code indicating the status of the last conversation.  The
+-          following values are defined, though not all are actually
+-          used.
+-         `0'
+-               Conversation completed normally.
+-
+-         `1'
+-               `uucico' was unable to open the port.
+-
+-         `2'
+-               The last call to the system failed while dailing.
+-
+-         `3'
+-               The last call to the system failed while logging in.
+-
+-         `4'
+-               The last call to the system failed during the initial
+-               UUCP protocol handshake (*note The Initial Handshake::).
+-
+-         `5'
+-               The last call to the system failed after the initial
+-               handshake.
+-
+-         `6'
+-               `uucico' is currently talking to the system.
+-
+-         `7'
+-               The last call to the system failed because it was the
+-               wrong time to call (this is not used if calling the
+-               system is never permitted).
+-
+-    retries
+-          The number of retries since the last successful call.
+-
+-    time of last call
+-          The time of the last call, in seconds since the epoch (as
+-          returned by the `time' system call).
+-
+-    wait
+-          If the last call failed, this is the number of seconds since
+-          the last call before `uucico' may attempt another call.  This
+-          is set based on the retry time; see *Note When to Call::.
+-          The `-f' or `-S' options to `uucico' direct it to ignore this
+-          wait time; see *Note Invoking uucico::.
+-
+-    description
+-          A text description of the status, corresponding to the code
+-          in the first field.  This may contain spaces.
++* abort:                                 dial File.           (line 137)
++* abort-chat:                            dial File.           (line 123)
++* abort-chat-fail:                       dial File.           (line 127)
++* abort-chat-program:                    dial File.           (line 131)
++* abort-chat-seven-bit:                  dial File.           (line 129)
++* abort-chat-timeout:                    dial File.           (line 125)
++* address:                               Placing the Call.    (line  46)
++* alias:                                 Naming the System.   (line  24)
++* alternate:                             Naming the System.   (line  11)
++* baud in port file:                     port File.           (line  86)
++* baud in sys file:                      Placing the Call.    (line   9)
++* baud-range:                            port File.           (line  94)
++* call-local-size:                       File Transfer Control.
++                                                              (line  33)
++* call-login:                            Logging In.          (line  67)
++* call-password:                         Logging In.          (line  75)
++* call-remote-size:                      File Transfer Control.
++                                                              (line  48)
++* call-timegrade:                        When to Call.        (line  70)
++* call-transfer:                         File Transfer Control.
++                                                              (line  19)
++* callback:                              Accepting a Call.    (line  34)
++* called-chat:                           Accepting a Call.    (line  39)
++* called-chat-fail:                      Accepting a Call.    (line  43)
++* called-chat-program:                   Accepting a Call.    (line  47)
++* called-chat-seven-bit:                 Accepting a Call.    (line  45)
++* called-chat-timeout:                   Accepting a Call.    (line  41)
++* called-local-size:                     File Transfer Control.
++                                                              (line  55)
++* called-login:                          Accepting a Call.    (line   7)
++* called-remote-size:                    File Transfer Control.
++                                                              (line  62)
++* called-timegrade:                      When to Call.        (line  89)
++* called-transfer:                       File Transfer Control.
++                                                              (line  24)
++* callfile:                              Configuration File Names.
++                                                              (line  47)
++* carrier in dial file:                  dial File.           (line  85)
++* carrier in port file:                  port File.           (line 107)
++* carrier-wait:                          dial File.           (line  92)
++* chat:                                  Chat Scripts.        (line  21)
++* chat in dial file:                     dial File.           (line  20)
++* chat in sys file:                      Logging In.          (line   7)
++* chat-fail:                             Chat Scripts.        (line 144)
++* chat-fail in dial file:                dial File.           (line  24)
++* chat-fail in sys file:                 Logging In.          (line  11)
++* chat-program:                          Chat Scripts.        (line 172)
++* chat-program in dial file:             dial File.           (line  28)
++* chat-program in sys file:              Logging In.          (line  15)
++* chat-seven-bit:                        Chat Scripts.        (line 163)
++* chat-seven-bit in dial file:           dial File.           (line  26)
++* chat-seven-bit in sys file:            Logging In.          (line  13)
++* chat-timeout:                          Chat Scripts.        (line 138)
++* chat-timeout in dial file:             dial File.           (line  22)
++* chat-timeout in sys file:              Logging In.          (line   9)
++* command:                               port File.           (line 235)
++* command-path:                          Miscellaneous (sys). (line  13)
++* commands:                              Miscellaneous (sys). (line  19)
++* complete:                              dial File.           (line 118)
++* complete-chat:                         dial File.           (line 104)
++* complete-chat-fail:                    dial File.           (line 108)
++* complete-chat-program:                 dial File.           (line 112)
++* complete-chat-seven-bit:               dial File.           (line 110)
++* complete-chat-timeout:                 dial File.           (line 106)
++* debug in config file:                  Debugging Levels.    (line   7)
++* debug in sys file:                     Miscellaneous (sys). (line  45)
++* debugfile:                             Log File Names.      (line  19)
++* default-alternates:                    Naming the System.   (line  19)
++* device:                                port File.           (line  78)
++* dial-device:                           port File.           (line 124)
++* dialcodefile:                          Configuration File Names.
++                                                              (line  30)
++* dialer in dial file:                   dial File.           (line  17)
++* dialer in port file:                   port File.           (line 129)
++* dialer-sequence:                       port File.           (line 144)
++* dialfile:                              Configuration File Names.
++                                                              (line  23)
++* dialtone:                              dial File.           (line  74)
++* dtr-toggle:                            dial File.           (line  97)
++* forward:                               File Transfer Control.
++                                                              (line 127)
++* forward-from:                          File Transfer Control.
++                                                              (line 118)
++* forward-to:                            File Transfer Control.
++                                                              (line 109)
++* free-space:                            Miscellaneous (sys). (line  25)
++* half-duplex in dial file:              dial File.           (line 160)
++* half-duplex in port file:              port File.           (line  73)
++* hardflow:                              port File.           (line 118)
++* hdb-files:                             Miscellaneous (config).
++                                                              (line 115)
++* hostname:                              Miscellaneous (config).
++                                                              (line   8)
++* local-receive:                         File Transfer Control.
++                                                              (line  98)
++* local-send:                            File Transfer Control.
++                                                              (line  69)
++* lockdir:                               Miscellaneous (config).
++                                                              (line  27)
++* lockname:                              port File.           (line 183)
++* logfile:                               Log File Names.      (line   7)
++* max-file-time:                         File Transfer Control.
++                                                              (line 132)
++* max-remote-debug:                      Miscellaneous (sys). (line  55)
++* max-retries:                           When to Call.        (line  58)
++* max-uuxqts:                            Miscellaneous (config).
++                                                              (line  61)
++* myname:                                Naming the System.   (line  30)
++* nodename:                              Miscellaneous (config).
++                                                              (line   7)
++* passwdfile:                            Configuration File Names.
++                                                              (line  64)
++* pause:                                 dial File.           (line  80)
++* phone:                                 Placing the Call.    (line  45)
++* port in port file:                     port File.           (line  23)
++* port in sys file:                      Placing the Call.    (line  24)
++* portfile:                              Configuration File Names.
++                                                              (line  15)
++* protocol in port file:                 port File.           (line  51)
++* protocol in sys file:                  Protocol Selection.  (line   7)
++* protocol-parameter in dial file:       dial File.           (line 142)
++* protocol-parameter in port file:       port File.           (line  57)
++* protocol-parameter in sys file:        Protocol Selection.  (line  90)
++* pubdir in config file:                 Miscellaneous (config).
++                                                              (line  20)
++* pubdir in sys file:                    Miscellaneous (sys). (line  37)
++* push:                                  port File.           (line 208)
++* receive-request:                       File Transfer Control.
++                                                              (line  11)
++* reliable in dial file:                 dial File.           (line 155)
++* reliable in port file:                 port File.           (line  67)
++* remote-receive:                        File Transfer Control.
++                                                              (line 102)
++* remote-send:                           File Transfer Control.
++                                                              (line  93)
++* request:                               File Transfer Control.
++                                                              (line  15)
++* run-uuxqt:                             Miscellaneous (config).
++                                                              (line  72)
++* send-request:                          File Transfer Control.
++                                                              (line   7)
++* sequence:                              Miscellaneous (sys). (line   7)
++* server-address:                        port File.           (line 215)
++* service:                               port File.           (line 193)
++* seven-bit in dial file:                dial File.           (line 148)
++* seven-bit in port file:                port File.           (line  61)
++* speed in port file:                    port File.           (line  84)
++* speed in sys file:                     Placing the Call.    (line   7)
++* speed-range:                           port File.           (line  92)
++* spool:                                 Miscellaneous (config).
++                                                              (line  14)
++* statfile:                              Log File Names.      (line  14)
++* stream:                                port File.           (line 211)
++* strip-login:                           Miscellaneous (config).
++                                                              (line  43)
++* strip-proto:                           Miscellaneous (config).
++                                                              (line  53)
++* sysfile:                               Configuration File Names.
++                                                              (line   7)
++* system:                                Naming the System.   (line   7)
++* time:                                  When to Call.        (line   7)
++* timegrade:                             When to Call.        (line  25)
++* timetable:                             Miscellaneous (config).
++                                                              (line  91)
++* transfer:                              File Transfer Control.
++                                                              (line  29)
++* type:                                  port File.           (line  26)
++* unknown:                               Miscellaneous (config).
++                                                              (line  36)
++* uuname:                                Miscellaneous (config).
++                                                              (line   9)
++* v2-files:                              Miscellaneous (config).
++                                                              (line 109)
++* version:                               port File.           (line 200)
+ 
+-    system name
+-          The name of the remote system.
+ 
+--- uucp-1.07.orig/uucp.texi
++++ uucp-1.07/uucp.texi
+@@ -5,6 +5,8 @@
+ @setchapternewpage odd
+ @c %**end of header
+ 
++@dircategory Networking tools
++
+ @iftex
+ @finalout
+ @end iftex
+--- uucp-1.07.orig/uucp.info
++++ uucp-1.07/uucp.info
+@@ -1,4 +1,6 @@
+-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
++
++INFO-DIR-SECTION Networking tools
+ 
+ START-INFO-DIR-ENTRY
+ * UUCP: (uucp).                 Transfer mail and news across phone lines.
+@@ -26,132 +28,126 @@ a translation approved by the author ins
+ 
+ \x1f
+ Indirect:
+-uucp.info-1: 1096
+-uucp.info-2: 50839
+-uucp.info-3: 100147
+-uucp.info-4: 149117
+-uucp.info-5: 197494
+-uucp.info-6: 241473
+-uucp.info-7: 285750
+-uucp.info-8: 333507
++uucp.info-1: 1132
++uucp.info-2: 295451
+ \x1f
+ Tag Table:
+ (Indirect)
+-Node: Top\x7f1096
+-Node: Copying\x7f8521
+-Node: Introduction\x7f10769
+-Node: Invoking the UUCP Programs\x7f19718
+-Node: Standard Options\x7f20638
+-Node: Invoking uucp\x7f22051
+-Node: uucp Description\x7f22320
+-Node: uucp Options\x7f24342
+-Node: Invoking uux\x7f26952
+-Node: uux Description\x7f27270
+-Node: uux Options\x7f30313
+-Node: uux Examples\x7f33052
+-Node: Invoking uustat\x7f33967
+-Node: uustat Description\x7f34302
+-Node: uustat Options\x7f36064
+-Node: uustat Examples\x7f42643
+-Node: Invoking uuname\x7f45411
+-Node: Invoking uulog\x7f46370
+-Node: Invoking uuto\x7f48579
+-Node: Invoking uupick\x7f49533
+-Node: Invoking cu\x7f50839
+-Node: cu Description\x7f51215
+-Node: cu Commands\x7f52601
+-Node: cu Variables\x7f54985
+-Node: cu Options\x7f57140
+-Node: Invoking uucico\x7f58510
+-Node: uucico Description\x7f58786
+-Node: uucico Options\x7f61428
+-Node: Invoking uuxqt\x7f64880
+-Node: Invoking uuchk\x7f66058
+-Node: Invoking uuconv\x7f66644
+-Node: Invoking uusched\x7f68492
+-Node: Installing Taylor UUCP\x7f68930
+-Node: Compilation\x7f69460
+-Node: Testing the Compilation\x7f76413
+-Node: Installing the Binaries\x7f80373
+-Node: Configuration\x7f81395
+-Node: Testing the Installation\x7f83569
+-Node: Using Taylor UUCP\x7f86701
+-Node: Calling Other Systems\x7f87150
+-Node: Accepting Calls\x7f89674
+-Node: Mail and News\x7f91636
+-Node: Sending mail or news\x7f92729
+-Node: Receiving mail or news\x7f94178
+-Node: The Spool Directory Layout\x7f94942
+-Node: System Spool Directories\x7f95857
+-Node: Status Directory\x7f97807
+-Node: Execution Subdirectories\x7f100147
+-Node: Other Spool Subdirectories\x7f101426
+-Node: Spool Lock Files\x7f104404
+-Node: Spool Directory Cleaning\x7f106953
+-Node: Configuration Files\x7f108145
+-Node: Configuration Overview\x7f109728
+-Node: Configuration File Format\x7f111880
+-Node: Configuration Examples\x7f113553
+-Node: config File Examples\x7f114122
+-Node: Leaf Example\x7f118001
+-Node: Gateway Example\x7f120687
+-Node: Time Strings\x7f125052
+-Node: Chat Scripts\x7f126868
+-Node: config File\x7f136057
+-Node: Miscellaneous (config)\x7f137121
+-Node: Configuration File Names\x7f142943
+-Node: Log File Names\x7f147880
+-Node: Debugging Levels\x7f149117
+-Node: sys File\x7f151983
+-Node: Defaults and Alternates\x7f152863
+-Node: Naming the System\x7f155955
+-Node: Calling Out\x7f157796
+-Node: When to Call\x7f158153
+-Node: Placing the Call\x7f163763
+-Node: Logging In\x7f167285
+-Node: Accepting a Call\x7f170896
+-Node: Protocol Selection\x7f173708
+-Node: File Transfer Control\x7f187452
+-Node: Miscellaneous (sys)\x7f193744
+-Node: Default sys File Values\x7f196872
+-Node: port File\x7f197494
+-Node: dial File\x7f209257
+-Node: UUCP Over TCP\x7f215278
+-Node: TCP Client\x7f215782
+-Node: TCP Server\x7f217554
+-Node: Security\x7f219008
+-Node: Protocols\x7f224051
+-Node: UUCP Protocol Sources\x7f225671
+-Node: UUCP Grades\x7f227919
+-Node: UUCP Lock Files\x7f232212
+-Node: Execution File Format\x7f235609
+-Node: UUCP Protocol\x7f240973
+-Node: The Initial Handshake\x7f241473
+-Node: UUCP Protocol Commands\x7f249866
+-Node: The S Command\x7f251888
+-Node: The R Command\x7f258938
+-Node: The X Command\x7f263032
+-Node: The E Command\x7f264950
+-Node: The H Command\x7f268063
+-Node: The Final Handshake\x7f268896
+-Node: g Protocol\x7f269558
+-Node: f Protocol\x7f279982
+-Node: t Protocol\x7f283060
+-Node: e Protocol\x7f284114
+-Node: Big G Protocol\x7f284902
+-Node: i Protocol\x7f285750
+-Node: j Protocol\x7f294764
+-Node: x Protocol\x7f301031
+-Node: y Protocol\x7f301587
+-Node: d Protocol\x7f306138
+-Node: h Protocol\x7f306503
+-Node: v Protocol\x7f306807
+-Node: Hacking\x7f307298
+-Node: System Dependence\x7f307666
+-Node: Naming Conventions\x7f309054
+-Node: Patches\x7f311229
+-Node: Acknowledgements\x7f313179
+-Node: Index (concepts)\x7f326563
+-Node: Index (configuration file)\x7f333507
++Node: Top\x7f1132
++Node: Copying\x7f8554
++Node: Introduction\x7f10799
++Node: Invoking the UUCP Programs\x7f19753
++Node: Standard Options\x7f20674
++Node: Invoking uucp\x7f22092
++Node: uucp Description\x7f22369
++Node: uucp Options\x7f24403
++Node: Invoking uux\x7f27022
++Node: uux Description\x7f27348
++Node: uux Options\x7f30403
++Node: uux Examples\x7f33151
++Node: Invoking uustat\x7f34075
++Node: uustat Description\x7f34418
++Node: uustat Options\x7f36192
++Node: uustat Examples\x7f42780
++Node: Invoking uuname\x7f45557
++Node: Invoking uulog\x7f46524
++Node: Invoking uuto\x7f48741
++Node: Invoking uupick\x7f49703
++Node: Invoking cu\x7f51017
++Node: cu Description\x7f51401
++Node: cu Commands\x7f52799
++Node: cu Variables\x7f55192
++Node: cu Options\x7f57356
++Node: Invoking uucico\x7f58735
++Node: uucico Description\x7f59021
++Node: uucico Options\x7f61677
++Node: Invoking uuxqt\x7f65140
++Node: Invoking uuchk\x7f66328
++Node: Invoking uuconv\x7f66924
++Node: Invoking uusched\x7f68782
++Node: Installing Taylor UUCP\x7f69228
++Node: Compilation\x7f69759
++Node: Testing the Compilation\x7f76717
++Node: Installing the Binaries\x7f80681
++Node: Configuration\x7f81708
++Node: Testing the Installation\x7f83887
++Node: Using Taylor UUCP\x7f87024
++Node: Calling Other Systems\x7f87477
++Node: Accepting Calls\x7f90006
++Node: Mail and News\x7f91973
++Node: Sending mail or news\x7f93071
++Node: Receiving mail or news\x7f94529
++Node: The Spool Directory Layout\x7f95301
++Node: System Spool Directories\x7f96221
++Node: Status Directory\x7f98183
++Node: Execution Subdirectories\x7f100535
++Node: Other Spool Subdirectories\x7f101826
++Node: Spool Lock Files\x7f104816
++Node: Spool Directory Cleaning\x7f107374
++Node: Configuration Files\x7f108571
++Node: Configuration Overview\x7f110155
++Node: Configuration File Format\x7f112312
++Node: Configuration Examples\x7f113990
++Node: config File Examples\x7f114564
++Node: Leaf Example\x7f118452
++Node: Gateway Example\x7f121113
++Node: Time Strings\x7f125352
++Node: Chat Scripts\x7f127174
++Node: config File\x7f136369
++Node: Miscellaneous (config)\x7f137438
++Node: Configuration File Names\x7f143273
++Node: Log File Names\x7f148223
++Node: Debugging Levels\x7f149473
++Node: sys File\x7f152352
++Node: Defaults and Alternates\x7f153237
++Node: Naming the System\x7f156338
++Node: Calling Out\x7f158192
++Node: When to Call\x7f158558
++Node: Placing the Call\x7f164185
++Node: Logging In\x7f167724
++Node: Accepting a Call\x7f171352
++Node: Protocol Selection\x7f174177
++Node: File Transfer Control\x7f187934
++Node: Miscellaneous (sys)\x7f194239
++Node: Default sys File Values\x7f197380
++Node: port File\x7f198011
++Node: dial File\x7f209779
++Node: UUCP Over TCP\x7f215806
++Node: TCP Client\x7f216317
++Node: TCP Server\x7f218099
++Node: Security\x7f219564
++Node: Protocols\x7f224614
++Node: UUCP Protocol Sources\x7f226235
++Node: UUCP Grades\x7f228488
++Node: UUCP Lock Files\x7f232786
++Node: Execution File Format\x7f236188
++Node: UUCP Protocol\x7f241557
++Node: The Initial Handshake\x7f242062
++Node: UUCP Protocol Commands\x7f250464
++Node: The S Command\x7f252495
++Node: The R Command\x7f259558
++Node: The X Command\x7f263668
++Node: The E Command\x7f265602
++Node: The H Command\x7f268731
++Node: The Final Handshake\x7f269580
++Node: g Protocol\x7f270251
++Node: f Protocol\x7f280645
++Node: t Protocol\x7f283723
++Node: e Protocol\x7f284782
++Node: Big G Protocol\x7f285575
++Node: i Protocol\x7f286430
++Node: j Protocol\x7f295451
++Node: x Protocol\x7f301725
++Node: y Protocol\x7f302288
++Node: d Protocol\x7f306841
++Node: h Protocol\x7f307213
++Node: v Protocol\x7f307525
++Node: Hacking\x7f308023
++Node: System Dependence\x7f308392
++Node: Naming Conventions\x7f309785
++Node: Patches\x7f311965
++Node: Acknowledgements\x7f313920
++Node: Index (concepts)\x7f327305
++Node: Index (configuration file)\x7f338389
+ \x1f
+ End Tag Table
+--- uucp-1.07.orig/proty.c
++++ uucp-1.07/proty.c
+@@ -606,12 +606,7 @@ fywait_for_packet (qdaemon, pfexit)
+ #endif
+ #endif
+ 
+-#ifdef I386_ASM
+-#define ROTATE(i) \
+-	asm ("rolw $1,%0" : "=g" (i) : "g" (i))
+-#else
+ #define ROTATE(i) i += i + ((i & 0x8000) >> 15)
+-#endif
+ 
+ static unsigned short
+ iychecksum (z, c)
+--- uucp-1.07.orig/uucp.info-1
++++ uucp-1.07/uucp.info-1
+@@ -1,4 +1,6 @@
+-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
++
++INFO-DIR-SECTION Networking tools
+ 
+ START-INFO-DIR-ENTRY
+ * UUCP: (uucp).                 Transfer mail and news across phone lines.
+@@ -30,7 +32,7 @@ File: uucp.info,  Node: Top,  Next: Copy
+ Taylor UUCP 1.07
+ ****************
+ 
+-   This is the documentation for the Taylor UUCP package, version 1.07.
++This is the documentation for the Taylor UUCP package, version 1.07.
+ The programs were written by Ian Lance Taylor.  The author can be
+ reached at <ian@airs.com>.
+ 
+@@ -41,7 +43,7 @@ is answered by the majordomo program.  T
+ message `subscribe ADDRESS' where ADDRESS is your e-mail address.  To
+ send a message to the list, send it to <taylor-uucp@gnu.org>.  There is
+ an archive of all messages sent to the mailing list at
+-<http://lists.cirr.com>.
++`http://lists.cirr.com'.
+ 
+ * Menu:
+ 
+@@ -230,7 +232,7 @@ File: uucp.info,  Node: Copying,  Next:
+ Taylor UUCP Copying Conditions
+ ******************************
+ 
+-   This package is covered by the GNU Public License.  See the file
++This package is covered by the GNU Public License.  See the file
+ `COPYING' for details.  If you would like to do something with this
+ package that you feel is reasonable, but you feel is prohibited by the
+ license, contact me to see if we can work it out.
+@@ -274,12 +276,12 @@ Public Licenses that accompany them.
+ \x1f
+ File: uucp.info,  Node: Introduction,  Next: Invoking the UUCP Programs,  Prev: Copying,  Up: Top
+ 
+-Introduction to Taylor UUCP
+-***************************
++1 Introduction to Taylor UUCP
++*****************************
+ 
+-   General introductions to UUCP are available, and perhaps one day I
+-will write one.  In the meantime, here is a very brief one that
+-concentrates on the programs provided by Taylor UUCP.
++General introductions to UUCP are available, and perhaps one day I will
++write one.  In the meantime, here is a very brief one that concentrates
++on the programs provided by Taylor UUCP.
+ 
+    Taylor UUCP is a complete UUCP package.  It is covered by the GNU
+ Public License, which means that the source code is always available.
+@@ -293,7 +295,7 @@ are based on earlier UUCP packages.
+      file name.  For example, to copy the file `notes.txt' to the system
+      `airs', you would say `uucp notes.txt airs!~/notes.txt'.  In this
+      example `~' is used to name the UUCP public directory on `airs'.
+-     For more details, see *Note uucp: Invoking uucp.
++     For more details, see *note uucp: Invoking uucp.
+ 
+ `uux'
+      The `uux' program is used to request the execution of a program on
+@@ -303,7 +305,8 @@ are based on earlier UUCP packages.
+      on `airs', passing it standard input, you would say `uux -
+      airs!rnews'.  The `-' means to read standard input and set things
+      up such that when `rnews' runs on `airs' it will receive the same
+-     standard input.  For more details, see *Note uux: Invoking uux.
++     standard input.  For more details, see *note uux: Invoking uux.
++
+ 
+    Neither `uucp' nor `uux' actually do any work immediately.  Instead,
+ they queue up requests for later processing.  They then start a daemon
+@@ -323,19 +326,19 @@ that if anything goes wrong it might be
+      connection status of all the remote systems your system knows
+      about.  The system administrator can use `uustat' to automatically
+      discard old jobs while sending mail to the user who requested
+-     them.  For more details, see *Note uustat: Invoking uustat.
++     them.  For more details, see *note uustat: Invoking uustat.
+ 
+ `uuname'
+      The `uuname' program by default lists all the remote systems your
+      system knows about.  You can also use it to get the name of your
+      local system.  It is mostly useful for shell scripts.  For more
+-     details, see *Note uuname: Invoking uuname.
++     details, see *note uuname: Invoking uuname.
+ 
+ `uulog'
+      The `uulog' program can be used to display entries in the UUCP log
+      file.  It can select the entries for a particular system or a
+      particular user.  You can use it to see what has happened to your
+-     queued jobs in the past.  For more details, see *Note uulog:
++     queued jobs in the past.  For more details, see *note uulog:
+      Invoking uulog.
+ 
+ `uuto'
+@@ -345,14 +348,15 @@ that if anything goes wrong it might be
+      transfer a file, or the contents of a directory, to a remote
+      system, and notify a particular user on the remote system when it
+      arrives.  The remote user can then retrieve the file(s) with
+-     `uupick'.  For more details, see *Note uuto: Invoking uuto, and
+-     see *Note uupick: Invoking uupick.
++     `uupick'.  For more details, see *note uuto: Invoking uuto, and
++     see *note uupick: Invoking uupick.
+ 
+ `cu'
+      The `cu' program can be used to call up another system and
+      communicate with it as though you were directly connected.  It can
+      also do simple file transfers, though it does not provide any
+-     error checking.  For more details, *Note cu: Invoking cu.
++     error checking.  For more details, *note cu: Invoking cu.
++
+ 
+    These eight programs just described, `uucp', `uux', `uuto',
+ `uupick', `uustat', `uuname', `uulog', and `cu' are the user programs
+@@ -376,16 +380,17 @@ normally run automatically rather than b
+      requests in the queue and goes on to the next system to call.  It
+      is also possible to force `uucico' to call a remote system even if
+      there is no work to be done for it, so that it can pick up any
+-     work that may be queued up remotely.  For more details, see *Note
++     work that may be queued up remotely.  For more details, see *note
+      uucico: Invoking uucico.
+ 
+ `uuxqt'
+      The `uuxqt' daemon processes execution requests made by the `uux'
+      program on remote systems.  It also processes requests made on the
+      local system which require files from a remote system.  It is
+-     normally started by `uucico'.  For more details, see *Note uuxqt:
++     normally started by `uucico'.  For more details, see *note uuxqt:
+      Invoking uuxqt.
+ 
++
+    Suppose you, on the system `bantam', want to copy a file to the
+ system `airs'.  You would run the `uucp' command locally, with a
+ command like `uucp notes.txt airs!~/notes.txt'.  This would queue up a
+@@ -421,7 +426,7 @@ installing and configuring UUCP.
+      The `uuchk' program reads the UUCP configuration files and
+      displays a rather lengthy description of what it finds.  This is
+      useful when configuring UUCP to make certain that the UUCP package
+-     will do what you expect it to do.  For more details, see *Note
++     will do what you expect it to do.  For more details, see *note
+      uuchk: Invoking uuchk.
+ 
+ `uuconv'
+@@ -430,13 +435,13 @@ installing and configuring UUCP.
+      administrators converting from an older UUCP package.  Taylor UUCP
+      is able to read and use old configuration file formats, but some
+      new features can not be selected using the old formats.  For more
+-     details, see *Note uuconv: Invoking uuconv.
++     details, see *note uuconv: Invoking uuconv.
+ 
+ `uusched'
+      The `uusched' script is provided for compatibility with older UUCP
+      releases.  It starts `uucico' to call, one at a time, all the
+      systems for which work has been queued.  For more details, see
+-     *Note uusched: Invoking uusched.
++     *note uusched: Invoking uusched.
+ 
+ `tstuu'
+      The `tstuu' program is a test harness for the UUCP package; it can
+@@ -444,15 +449,16 @@ installing and configuring UUCP.
+      correctly.  However, it uses pseudo-terminals, which means that it
+      is less portable than the rest of the package.  If it works, it
+      can be useful when initially installing Taylor UUCP.  For more
+-     details, see *Note tstuu: Testing the Compilation.
++     details, see *note tstuu: Testing the Compilation.
++
+ 
+ \x1f
+ File: uucp.info,  Node: Invoking the UUCP Programs,  Next: Installing Taylor UUCP,  Prev: Introduction,  Up: Top
+ 
+-Invoking the UUCP Programs
+-**************************
++2 Invoking the UUCP Programs
++****************************
+ 
+-   This chapter describes how to run the UUCP programs.
++This chapter describes how to run the UUCP programs.
+ 
+ * Menu:
+ 
+@@ -474,10 +480,10 @@ Invoking the UUCP Programs
+ \x1f
+ File: uucp.info,  Node: Standard Options,  Next: Invoking uucp,  Prev: Invoking the UUCP Programs,  Up: Invoking the UUCP Programs
+ 
+-Standard Options
+-================
++2.1 Standard Options
++====================
+ 
+-   All of the UUCP programs support a few standard options.
++All of the UUCP programs support a few standard options.
+ 
+ `-x type'
+ `--debug type'
+@@ -514,8 +520,8 @@ Standard Options
+ \x1f
+ File: uucp.info,  Node: Invoking uucp,  Next: Invoking uux,  Prev: Standard Options,  Up: Invoking the UUCP Programs
+ 
+-Invoking uucp
+-=============
++2.2 Invoking uucp
++=================
+ 
+ * Menu:
+ 
+@@ -525,8 +531,8 @@ Invoking uucp
+ \x1f
+ File: uucp.info,  Node: uucp Description,  Next: uucp Options,  Prev: Invoking uucp,  Up: Invoking uucp
+ 
+-uucp Description
+-----------------
++2.2.1 uucp Description
++----------------------
+ 
+      uucp [options] `source-file' `destination-file'
+      uucp [options] `source-file'... `destination-directory'
+@@ -570,10 +576,10 @@ resulting file is owned by the uucp user
+ \x1f
+ File: uucp.info,  Node: uucp Options,  Prev: uucp Description,  Up: Invoking uucp
+ 
+-uucp Options
+-------------
++2.2.2 uucp Options
++------------------
+ 
+-   The following options may be given to `uucp'.
++The following options may be given to `uucp'.
+ 
+ `-c'
+ `--nocopy'
+@@ -643,7 +649,7 @@ uucp Options
+ 
+ `-t'
+ `--uuto'
+-     This option is used by the `uuto' shell script; see *Note Invoking
++     This option is used by the `uuto' shell script; see *note Invoking
+      uuto::.  It causes `uucp' to interpret the final argument as
+      `system!user'.  The file(s) are sent to `~/receive/USER/LOCAL' on
+      the remote system, where USER is from the final argument and LOCAL
+@@ -662,8 +668,8 @@ uucp Options
+ \x1f
+ File: uucp.info,  Node: Invoking uux,  Next: Invoking uustat,  Prev: Invoking uucp,  Up: Invoking the UUCP Programs
+ 
+-Invoking uux
+-============
++2.3 Invoking uux
++================
+ 
+ * Menu:
+ 
+@@ -674,8 +680,8 @@ Invoking uux
+ \x1f
+ File: uucp.info,  Node: uux Description,  Next: uux Options,  Prev: Invoking uux,  Up: Invoking uux
+ 
+-uux Description
+----------------
++2.3.1 uux Description
++---------------------
+ 
+      uux [options] command
+ 
+@@ -730,7 +736,7 @@ on a remote system.
+ `uux'.  Many permit only the execution of `rmail' and `rnews'.
+ 
+    A request to execute an empty command (e.g., `uux sys!') will create
+-a poll file for the specified system; see *Note Calling Other Systems::
++a poll file for the specified system; see *note Calling Other Systems::
+ for an example of why this might be useful.
+ 
+    The exit status of `uux' is one of the codes found in the header
+@@ -740,10 +746,10 @@ file `sysexits.h'.  In particular, `EX_O
+ \x1f
+ File: uucp.info,  Node: uux Options,  Next: uux Examples,  Prev: uux Description,  Up: Invoking uux
+ 
+-uux Options
+------------
++2.3.2 uux Options
++-----------------
+ 
+-   The following options may be given to `uux'.
++The following options may be given to `uux'.
+ 
+ `-'
+ `-p'
+@@ -822,10 +828,10 @@ uux Options
+ \x1f
+ File: uucp.info,  Node: uux Examples,  Prev: uux Options,  Up: Invoking uux
+ 
+-uux Examples
+-------------
++2.3.3 uux Examples
++------------------
+ 
+-   Here are some examples of using `uux'.
++Here are some examples of using `uux'.
+ 
+      uux -z - sys1!rmail user1
+    This will execute the command `rmail user1' on the system `sys1',
+@@ -846,8 +852,8 @@ writable by the `uuxqt' daemon for this
+ \x1f
+ File: uucp.info,  Node: Invoking uustat,  Next: Invoking uuname,  Prev: Invoking uux,  Up: Invoking the UUCP Programs
+ 
+-Invoking uustat
+-===============
++2.4 Invoking uustat
++===================
+ 
+ * Menu:
+ 
+@@ -858,8 +864,8 @@ Invoking uustat
+ \x1f
+ File: uucp.info,  Node: uustat Description,  Next: uustat Options,  Prev: Invoking uustat,  Up: Invoking uustat
+ 
+-uustat Description
+-------------------
++2.4.1 uustat Description
++------------------------
+ 
+      uustat -a
+      uustat --all
+@@ -899,10 +905,10 @@ group of jobs, such as all jobs more tha
+ \x1f
+ File: uucp.info,  Node: uustat Options,  Next: uustat Examples,  Prev: uustat Description,  Up: Invoking uustat
+ 
+-uustat Options
+---------------
++2.4.2 uustat Options
++--------------------
+ 
+-   The following options may be given to `uustat'.
++The following options may be given to `uustat'.
+ 
+ `-a'
+ `--all'
+@@ -1077,11 +1083,11 @@ uustat Options
+ \x1f
+ File: uucp.info,  Node: uustat Examples,  Prev: uustat Options,  Up: Invoking uustat
+ 
+-uustat Examples
+----------------
++2.4.3 uustat Examples
++---------------------
+ 
+      uustat --all
+-   Display status of all jobs.  A sample output line is as follows:
++Display status of all jobs.  A sample output line is as follows:
+      bugsA027h bugs ian 04-01 13:50 Executing rmail ian@airs.com (sending 12 bytes)
+    The format is
+      jobid system user queue-date command (size)
+@@ -1138,8 +1144,8 @@ will be error messages.
+ \x1f
+ File: uucp.info,  Node: Invoking uuname,  Next: Invoking uulog,  Prev: Invoking uustat,  Up: Invoking the UUCP Programs
+ 
+-Invoking uuname
+-===============
++2.5 Invoking uuname
++===================
+ 
+      uuname [-a] [--aliases]
+      uuname -l
+@@ -1178,8 +1184,8 @@ local system.
+ \x1f
+ File: uucp.info,  Node: Invoking uulog,  Next: Invoking uuto,  Prev: Invoking uuname,  Up: Invoking the UUCP Programs
+ 
+-Invoking uulog
+-==============
++2.6 Invoking uulog
++==================
+ 
+      uulog [-#] [-n lines] [-sf system] [-u user] [-DSF] [--lines lines]
+            [--system system] [--user user] [--debuglog] [--statslog]
+@@ -1251,8 +1257,8 @@ If the UUCP programs have been compiled
+ \x1f
+ File: uucp.info,  Node: Invoking uuto,  Next: Invoking uupick,  Prev: Invoking uulog,  Up: Invoking the UUCP Programs
+ 
+-Invoking uuto
+-=============
++2.7 Invoking uuto
++=================
+ 
+      uuto files... system!user
+ 
+@@ -1274,8 +1280,8 @@ Invoking uucp::.
+ \x1f
+ File: uucp.info,  Node: Invoking uupick,  Next: Invoking cu,  Prev: Invoking uuto,  Up: Invoking the UUCP Programs
+ 
+-Invoking uupick
+-===============
++2.8 Invoking uupick
++===================
+ 
+      uupick [-s system] [--system system]
+ 
+@@ -1313,6 +1319,5702 @@ action to take.  One of the following co
+ 
+    The `-s' or `--system' option may be used to restrict `uupick' to
+ only present files transferred from a particular system.  The `uupick'
+-program also supports the standard UUCP program options; see *Note
++program also supports the standard UUCP program options; see *note
+ Standard Options::.
+ 
++\x1f
++File: uucp.info,  Node: Invoking cu,  Next: Invoking uucico,  Prev: Invoking uupick,  Up: Invoking the UUCP Programs
++
++2.9 Invoking cu
++===============
++
++* Menu:
++
++* cu Description::              Description of cu
++* cu Commands::                 Commands Supported by cu
++* cu Variables::                Variables Supported by cu
++* cu Options::                  Options Supported by cu
++
++\x1f
++File: uucp.info,  Node: cu Description,  Next: cu Commands,  Prev: Invoking cu,  Up: Invoking cu
++
++2.9.1 cu Description
++--------------------
++
++     cu [options] [system | phone | "dir"]
++
++   The `cu' program is used to call up another system and act as a dial
++in terminal.  It can also do simple file transfers with no error
++checking.
++
++   The `cu' program takes a single non-option argument.
++
++   If the argument is the string `dir' cu will make a direct connection
++to the port.  This may only be used by users with write access to the
++port, as it permits reprogramming the modem.
++
++   Otherwise, if the argument begins with a digit, it is taken to be a
++phone number to call.
++
++   Otherwise, it is taken to be the name of a system to call.
++
++   The `-z' or `--system' options may be used to name a system
++beginning with a digit, and the `-c' or `--phone' options may be used
++to name a phone number that does not begin with a digit.
++
++   The `cu' program locates a port to use in the UUCP configuration
++files.  If a simple system name is given, it will select a port
++appropriate for that system.  The `-p', `--port', `-l', `--line', `-s',
++and `--speed' options may be used to control the port selection.
++
++   When a connection is made to the remote system, `cu' forks into two
++processes.  One reads from the port and writes to the terminal, while
++the other reads from the terminal and writes to the port.
++
++\x1f
++File: uucp.info,  Node: cu Commands,  Next: cu Variables,  Prev: cu Description,  Up: Invoking cu
++
++2.9.2 cu Commands
++-----------------
++
++The `cu' program provides several commands that may be used during the
++conversation.  The commands all begin with an escape character, which
++by default is `~' (tilde).  The escape character is only recognized at
++the beginning of a line.  To send an escape character to the remote
++system at the start of a line, it must be entered twice.  All commands
++are either a single character or a word beginning with `%' (percent
++sign).
++
++   The `cu' program recognizes the following commands.
++
++`~.'
++     Terminate the conversation.
++
++`~! command'
++     Run command in a shell.  If command is empty, starts up a shell.
++
++`~$ command'
++     Run command, sending the standard output to the remote system.
++
++`~| command'
++     Run command, taking the standard input from the remote system.
++
++`~+ command'
++     Run command, taking the standard input from the remote system and
++     sending the standard output to the remote system.
++
++`~#, ~%break'
++     Send a break signal, if possible.
++
++`~c directory, ~%cd directory'
++     Change the local directory.
++
++`~> file'
++     Send a file to the remote system.  This just dumps the file over
++     the communication line.  It is assumed that the remote system is
++     expecting it.
++
++`~<'
++     Receive a file from the remote system.  This prompts for the local
++     file name and for the remote command to execute to begin the file
++     transfer.  It continues accepting data until the contents of the
++     `eofread' variable are seen.
++
++`~p from to'
++`~%put from to'
++     Send a file to a remote Unix system.  This runs the appropriate
++     commands on the remote system.
++
++`~t from to'
++`~%take from to'
++     Retrieve a file from a remote Unix system.  This runs the
++     appropriate commands on the remote system.
++
++`~s variable value'
++     Set a `cu' variable to the given value.  If value is not given, the
++     variable is set to `true'.
++
++`~! variable'
++     Set a `cu' variable to `false'.
++
++`~z'
++     Suspend the cu session.  This is only supported on some systems.
++     On systems for which `^Z' may be used to suspend a job, `~^Z' will
++     also suspend the session.
++
++`~%nostop'
++     Turn off XON/XOFF handling.
++
++`~%stop'
++     Turn on XON/XOFF handling.
++
++`~v'
++     List all the variables and their values.
++
++`~?'
++     List all commands.
++
++\x1f
++File: uucp.info,  Node: cu Variables,  Next: cu Options,  Prev: cu Commands,  Up: Invoking cu
++
++2.9.3 cu Variables
++------------------
++
++The `cu' program also supports several variables.  They may be listed
++with the `~v' command, and set with the `~s' or `~!'  commands.
++
++`escape'
++     The escape character.  The default is `~' (tilde).
++
++`delay'
++     If this variable is true, `cu' will delay for a second, after
++     recognizing the escape character, before printing the name of the
++     local system.  The default is true.
++
++`eol'
++     The list of characters which are considered to finish a line.  The
++     escape character is only recognized after one of these is seen.
++     The default is `carriage return', `^U', `^C', `^O', `^D', `^S',
++     `^Q', `^R'.
++
++`binary'
++     Whether to transfer binary data when sending a file.  If this is
++     false, then newlines in the file being sent are converted to
++     carriage returns.  The default is false.
++
++`binary-prefix'
++     A string used before sending a binary character in a file
++     transfer, if the `binary' variable is true.  The default is `^V'.
++
++`echo-check'
++     Whether to check file transfers by examining what the remote system
++     echoes back.  This probably doesn't work very well.  The default is
++     false.
++
++`echonl'
++     The character to look for after sending each line in a file.  The
++     default is carriage return.
++
++`timeout'
++     The timeout to use, in seconds, when looking for a character,
++     either when doing echo checking or when looking for the `echonl'
++     character.  The default is 30.
++
++`kill'
++     The character to use delete a line if the echo check fails.  The
++     default is `^U'.
++
++`resend'
++     The number of times to resend a line if the echo check continues to
++     fail.  The default is 10.
++
++`eofwrite'
++     The string to write after sending a file with the `~>' command.
++     The default is `^D'.
++
++`eofread'
++     The string to look for when receiving a file with the ` ~<'
++     command.  The default is `$', which is intended to be a typical
++     shell prompt.
++
++`verbose'
++     Whether to print accumulated information during a file transfer.
++     The default is true.
++
++\x1f
++File: uucp.info,  Node: cu Options,  Prev: cu Variables,  Up: Invoking cu
++
++2.9.4 cu Options
++----------------
++
++The following options may be given to `cu'.
++
++`-e'
++`--parity=even'
++     Use even parity.
++
++`-o'
++`--parity=odd'
++     Use odd parity.
++
++`--parity=none'
++     Use no parity.  No parity is also used if both `-e' and `-o' are
++     given.
++
++`-h'
++`--halfduplex'
++     Echo characters locally (half-duplex mode).
++
++`--nostop'
++     Turn off XON/XOFF handling (it is on by default).
++
++`-E char'
++`--escape char'
++     Set the escape character.  Initially `~' (tilde).  To eliminate the
++     escape character, use `-E '''.
++
++`-z system'
++`--system system'
++     The system to call.
++
++`-c phone-number'
++`--phone phone-number'
++     The phone number to call.
++
++`-p port'
++`-a port'
++`--port port'
++     Name the port to use.
++
++`-l line'
++`--line line'
++     Name the line to use by giving a device name.  This may be used to
++     dial out on ports that are not listed in the UUCP configuration
++     files.  Write access to the device is required.
++
++`-s speed'
++`-#'
++`--speed speed'
++     The speed (baud rate) to use.  Here, `-#' means an actual number;
++     e.g., `-9600'.
++
++`-n'
++`--prompt'
++     Prompt for the phone number to use.
++
++`-d'
++     Enter debugging mode.  Equivalent to `--debug all'.
++
++`-x type'
++`--debug type'
++`-I file'
++`--config file'
++`-v'
++`--version'
++`--help'
++     *Note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uucico,  Next: Invoking uuxqt,  Prev: Invoking cu,  Up: Invoking the UUCP Programs
++
++2.10 Invoking uucico
++====================
++
++* Menu:
++
++* uucico Description::          Description of uucico
++* uucico Options::              Options Supported by uucico
++
++\x1f
++File: uucp.info,  Node: uucico Description,  Next: uucico Options,  Prev: Invoking uucico,  Up: Invoking uucico
++
++2.10.1 uucico Description
++-------------------------
++
++     uucico [options]
++
++   The `uucico' daemon processes file transfer requests queued by
++`uucp' and `uux'.  It is started when `uucp' or `uux' is run (unless
++they are given the `-r' or `--nouucico' options).  It is also typically
++started periodically using entries in the `crontab' table(s).
++
++   When `uucico' is invoked with `-r1', `--master', `-s', `--system',
++or `-S', the daemon will place a call to a remote system, running in
++master mode.  Otherwise the daemon will start in slave mode, accepting
++a call from a remote system.  Typically a special login name will be
++set up for UUCP which automatically invokes `uucico' when a remote
++system calls in and logs in under that name.
++
++   When `uucico' terminates, it invokes the `uuxqt' daemon, unless the
++`-q' or `--nouuxqt' options were given; `uuxqt' executes any work
++orders created by `uux' on a remote system, and any work orders created
++locally which have received remote files for which they were waiting.
++
++   If a call fails, `uucico' will normally refuse to retry the call
++until a certain (configurable) amount of time has passed.  This may be
++overriden by the `-f', `--force', or `-S' options.
++
++   The `-l', `--prompt', `-e', or `--loop' options may be used to force
++`uucico' to produce its own prompts of `login: ' and `Password:'.  When
++another `uucico' daemon calls in, it will see these prompts and log in
++as usual.  The login name and password will normally be checked against
++a separate list kept specially for `uucico', rather than the
++`/etc/passwd' file (*note Configuration File Names::).  It is possible,
++on some systems, to configure `uucico' to use `/etc/passwd'.  The `-l'
++or `--prompt' options will prompt once and then exit; in this mode the
++UUCP administrator, or the superuser, may use the `-u' or `--login'
++option to force a login name, in which case `uucico' will not prompt
++for one.  The `-e' or `--loop' options will prompt again after the
++first session is over; in this mode `uucico' will permanently control a
++port.
++
++   If `uucico' receives a `SIGQUIT', `SIGTERM' or `SIGPIPE' signal, it
++will cleanly abort any current conversation with a remote system and
++exit.  If it receives a `SIGHUP' signal it will abort any current
++conversation, but will continue to place calls to (if invoked with
++`-r1' or `--master') and accept calls from (if invoked with `-e' or
++`--loop') other systems.  If it receives a `SIGINT' signal it will
++finish the current conversation, but will not place or accept any more
++calls.
++
++\x1f
++File: uucp.info,  Node: uucico Options,  Prev: uucico Description,  Up: Invoking uucico
++
++2.10.2 uucico Options
++---------------------
++
++The following options may be given to `uucico'.
++
++`-r1'
++`--master'
++     Start in master mode: call out to a remote system.  Implied by
++     `-s', `--system', or `-S'.  If no system is specified,
++     sequentially call every system for which work is waiting to be
++     done.
++
++`-r0'
++`--slave'
++     Start in slave mode.  This is the default.
++
++`-s system'
++`--system system'
++     Call the specified system.
++
++`-S system'
++     Call the specified system, ignoring any required wait.  This is
++     equivalent to `-s system -f'.
++
++`-f'
++`--force'
++     Ignore any required wait for any systems to be called.
++
++`-l'
++`--prompt'
++     Prompt for login name and password using `login: ' and
++     `Password:'.  This allows `uucico' to be easily run from `inetd'.
++     The login name and password are checked against the UUCP password
++     file, which need not be `/etc/passwd'.  The `--login' option may
++     be used to force a login name, in which cause `uucico' will only
++     prompt for a password.
++
++`-p port'
++`--port port'
++     Specify a port to call out on or to listen to.
++
++`-e'
++`--loop'
++     Enter an endless loop of login/password prompts and slave mode
++     daemon execution.  The program will not stop by itself; you must
++     use `kill' to shut it down.
++
++`-w'
++`--wait'
++     After calling out (to a particular system when `-s', `--system',
++     or `-S' is specifed, or to all systems which have work when just
++     `-r1' or `--master' is specifed), begin an endless loop as with
++     `--loop'.
++
++`-q'
++`--nouuxqt'
++     Do not start the `uuxqt' daemon when finished.
++
++`-c'
++`--quiet'
++     If no calls are permitted at this time, then don't make the call,
++     but also do not put an error message in the log file and do not
++     update the system status (as reported by `uustat').  This can be
++     convenient for automated polling scripts, which may want to simply
++     attempt to call every system rather than worry about which
++     particular systems may be called at the moment.  This option also
++     suppresses the log message indicating that there is no work to be
++     done.
++
++`-C'
++`--ifwork'
++     Only call the system named by `-s', `--system', or `-S' if there
++     is work for that system.
++
++`-D'
++`--nodetach'
++     Do not detach from the controlling terminal.  Normally `uucico'
++     detaches from the terminal before each call out to another system
++     and before invoking `uuxqt'.  This option prevents this.
++
++`-u name'
++`--login name'
++     Set the login name to use instead of that of the invoking user.
++     This option may only be used by the UUCP administrator or the
++     superuser.  If used with `--prompt', this will cause `uucico' to
++     prompt only for the password, not the login name.
++
++`-z'
++`--try-next'
++     If a call fails after the remote system is reached, try the next
++     alternate rather than simply exiting.
++
++`-i type'
++`--stdin type'
++     Set the type of port to use when using standard input.  The only
++     supported port type is TLI, and this is only available on machines
++     which support the TLI networking interface.  Specifying `-i TLI'
++     causes `uucico' to use TLI calls to perform I/O.
++
++`-X type'
++     Same as the standard option `-x type'.  Provided for historical
++     compatibility.
++
++`-x type'
++`--debug type'
++`-I file'
++`--config file'
++`-v'
++`--version'
++`--help'
++     *Note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uuxqt,  Next: Invoking uuchk,  Prev: Invoking uucico,  Up: Invoking the UUCP Programs
++
++2.11 Invoking uuxqt
++===================
++
++     uuxqt [-c command] [-s system] [--command command] [--system system]
++
++   The `uuxqt' daemon executes commands requested by `uux' from either
++the local system or from remote systems.  It is started automatically
++by the `uucico' daemon (unless `uucico' is given the `-q' or
++`--nouuxqt' options).
++
++   There is normally no need to run `uuxqt', since it will be invoked
++by `uucico'.  However, `uuxqt' can be invoked directly to provide
++greater control over the processing of the work queue.
++
++   Multiple invocations of `uuxqt' may be run at once, as controlled by
++the `max-uuxqts' configuration command; see *note Miscellaneous
++(config)::.
++
++   The following options may be given to `uuxqt'.
++
++`-c command'
++`--command command'
++     Only execute requests for the specified command.  For example,
++     `uuxqt --command rmail'.
++
++`-s system'
++`--system system'
++     Only execute requests originating from the specified system.
++
++`-x type'
++`--debug type'
++`-I file'
++`--config'
++`-v'
++`--version'
++`--help'
++     *Note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uuchk,  Next: Invoking uuconv,  Prev: Invoking uuxqt,  Up: Invoking the UUCP Programs
++
++2.12 Invoking uuchk
++===================
++
++     uuchk [-s system] [--system system]
++
++   The `uuchk' program displays information read from the UUCP
++configuration files.  It should be used to ensure that UUCP has been
++configured correctly.
++
++   The `-s' or `--system' options may be used to display the
++configuration for just the specified system, rather than for all
++systems.  The `uuchk' program also supports the standard UUCP program
++options; see *note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uuconv,  Next: Invoking uusched,  Prev: Invoking uuchk,  Up: Invoking the UUCP Programs
++
++2.13 Invoking uuconv
++====================
++
++     uuconv -i type -o type [-p program] [--program program]
++     uuconv --input type --output type [-p program] [--program program]
++
++   The `uuconv' program converts UUCP configuration files from one
++format to another.  The type of configuration file to read is specified
++using the `-i' or `--input' options.  The type of configuration file to
++write is specified using the `-o' or `--output' options.
++
++   The supported configuration file types are `taylor', `v2', and
++`hdb'.  For a description of the `taylor' configuration files, see
++*note Configuration Files::.  The other types of configuration files
++are used by traditional UUCP packages, and are not described in this
++manual.
++
++   An input configuration of type `v2' or `hdb' is read from a compiled
++in directory (specified by `oldconfigdir' in `Makefile').  An input
++configuration of type `taylor' is read from a compiled in directory by
++default, but may be overridden with the standard `-I' or `--config'
++options (*note Standard Options::).
++
++   The output configuration is written to files in the directory in
++which `uuconv' is run.
++
++   Some information in the input files may not be representable in the
++desired output format, in which case `uuconv' will silently discard it.
++The output of `uuconv' should be carefully checked before it is used.
++The `uuchk' program may be used for this purpose; see *note Invoking
++uuchk::.
++
++   The `-p' or `--program' option may be used to convert specific `cu'
++configuration information, rather than the default of only converting
++the `uucp' configuration information; see *note config File::.
++
++   The `uuchk' program also supports the standard UUCP program options;
++see *note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uusched,  Prev: Invoking uuconv,  Up: Invoking the UUCP Programs
++
++2.14 Invoking uusched
++=====================
++
++The `uusched' program is actually just a shell script which invokes the
++`uucico' daemon.  It is provided for backward compatibility.  It causes
++`uucico' to call all systems for which there is work.  Any option which
++may be given to `uucico' may also be given to `uusched'.  *Note
++Invoking uucico::.
++
++\x1f
++File: uucp.info,  Node: Installing Taylor UUCP,  Next: Using Taylor UUCP,  Prev: Invoking the UUCP Programs,  Up: Top
++
++3 Installing Taylor UUCP
++************************
++
++These are the installation instructions for the Taylor UUCP package.
++
++* Menu:
++
++* Compilation::                 Compiling Taylor UUCP
++* Testing the Compilation::     Testing the Compilation
++* Installing the Binaries::     Installing the Binaries
++* Configuration::               Configuring Taylor UUCP
++* Testing the Installation::    Testing the Installation
++
++\x1f
++File: uucp.info,  Node: Compilation,  Next: Testing the Compilation,  Prev: Installing Taylor UUCP,  Up: Installing Taylor UUCP
++
++3.1 Compiling Taylor UUCP
++=========================
++
++If you have a source code distribution, you must first compile it for
++your system.  Free versions of Unix, such as Linux, NetBSD, or FreeBSD,
++often come with pre-compiled binary distributions of UUCP.  If you are
++using a binary distribution, you may skip to the configuration section
++(*note Configuration::).
++
++   Follow these steps to compile the source code.
++
++  1. Take a look at the top of `Makefile.in' and set the appropriate
++     values for your system.  These control where the programs are
++     installed and which user on the system owns them (normally they
++     will be owned by a special user `uucp' rather than a real person;
++     they should probably not be owned by `root').
++
++  2. Run the shell script `configure'.  This script was generated using
++     the `autoconf' program written by David MacKenzie of the Free
++     Software Foundation.  It takes a while to run.  It will generate
++     the file `config.h' based on `config.h.in', and, for each source
++     code directory, will generate `Makefile' based on `Makefile.in'.
++
++     You can pass certain arguments to `configure' in the environment.
++     Because `configure' will compile little test programs to see what
++     is available on your system, you must tell it how to run your
++     compiler.  It recognizes the following environment variables:
++
++    `CC'
++          The C compiler.  If this is not set, then if `configure' can
++          find `gcc' it will use it, otherwise it will use `cc'.
++
++    `CFLAGS'
++          Flags to pass to the C compiler when compiling the actual
++          code.  If this is not set, `configure' will use `-g'.
++
++    `LDFLAGS'
++          Flags to pass to the C compiler when only linking, not
++          compiling.  If this is not set, `configure' will use the
++          empty string.
++
++    `LIBS'
++          Libraries to pass to the C compiler.  If this is not set,
++          `configure' will use the empty string.
++
++    `INSTALL'
++          The program to run to install UUCP in the binary directory.
++          If this is not set, then if `configure' finds the BSD
++          `install' program, it will set this to `install -c';
++          otherwise, it will use `cp'.
++
++     Suppose, for example, you want to set the environment variable `CC'
++     to `rcc'.  If you are using `sh', `bash', or `ksh', invoke
++     `configure' as `CC=rcc configure'.  If you are using `csh', do
++     `setenv CC rcc; sh configure'.
++
++     On some systems you will want to use `LIBS=-lmalloc'.  On Xenix
++     derived versions of Unix do not use `LIBS=-lx' because this will
++     bring in the wrong versions of certain routines; if you want to use
++     `-lx' you must specify `LIBS=-lc -lx'.
++
++     You can also pass other arguments to `configure' on the command
++     line.  Use `configure --help' for a complete list.  Of particular
++     interest:
++    `--prefix=DIRNAME'
++          The directory under which all files are installed.  Default
++          `/usr/local'.
++
++    `--with-newconfigdir=DIRNAME'
++          The directory in which to find new style configuration files.
++          Default `PREFIX/conf/uucp'.
++
++    `--with-oldconfigdir=DIRNAME'
++          The directory in which to find old style configuration files.
++          Default `/usr/lib/uucp'.
++
++     If `configure' fails for some reason, or if you have a very weird
++     system, you may have to configure the package by hand.  To do
++     this, copy the file `config.h.in' to `config.h' and edit it for
++     your system.  Then for each source directory (the top directory,
++     and the subdirectories `lib', `unix', and `uuconf') copy
++     `Makefile.in' to `Makefile', find the words within `@' characters,
++     and set them correctly for your system.
++
++  3. Igor V. Semenyuk provided this (lightly edited) note about ISC
++     Unix 3.0.  The `configure' script will default to passing `-posix'
++     to `gcc'.  However, using `-posix' changes the environment to
++     POSIX, and on ISC 3.0, at least, the default for `POSIX_NO_TRUNC'
++     is 1.  This can lead to a problem when `uuxqt' executes `rmail'.
++     `IDA sendmail' has dbm configuration files named
++     `mailertable.{dir,pag}'.  Notice these names are 15 characters
++     long.  When `uuxqt' compiled with the `-posix' executes `rmail',
++     which in turn executes `sendmail', the later is run under the
++     POSIX environment too.  This leads to `sendmail' bombing out with
++     `'error opening 'M' database: name too long' (mailertable.dir)'.
++     It's rather obscure behaviour, and it took me a day to find out
++     the cause.  I don't use the `-posix' switch; instead, I run `gcc'
++     with `-D_POSIX_SOURCE', and add `-lcposix' to `LIBS'.
++
++  4. On some versions of BSDI there is a bug in the shell which causes
++     the default value for `CFLAGS' to be set incorrectly.  If `echo
++     ${CFLAGS--g}' echoes `g' rather than `-g', then you must set
++     `CFLAGS' in the environment before running configure.  There is a
++     patch available from BSDI for this bug.  (Reported by David Vrona).
++
++  5. On AIX 3.2.5, and possibly other versions, `cc -E' does not work,
++     reporting `Option NOROCONST is not valid'.  Test this before
++     running configure by doing something like `touch /tmp/foo.c; cc -E
++     /tmp/foo.c'.  This may give a warning about the file being empty,
++     but it should not give the `Option NOROCONST' warning.  The
++     workaround is to remove the `,noroconst' entry from the `options'
++     clause in the `cc' stanza in `/etc/xlc.cfg'.  (Reported by Chris
++     Lewis).
++
++  6. You should verify that `configure' worked correctly by checking
++     `config.h' and the instances of `Makefile'.
++
++  7. Edit `policy.h' for your local system.  The comments explain the
++     various choices.  The default values are intended to be
++     reasonable, so you may not have to make any changes.
++
++     You must decide what type of configuration files to use; for more
++     information on the choices, see *note Configuration::.
++
++     You must also decide what sort of spool directory you want to use.
++     If this is a new installation, I recommend `SPOOLDIR_TAYLOR';
++     otherwise, select the spool directory corresponding to your
++     existing UUCP package.
++
++  8. Type `make' to compile everything.
++
++     The `tstuu.c' file is not particularly portable; if you can't
++     figure out how to compile it you can safely ignore it, as it is
++     only used for testing.  To use STREAMS pseudo-terminals, tstuu.c
++     must be compiled with `-DHAVE_STREAMS_PTYS'; this is not
++     determined by the configure script.
++
++     If you have any other problems there is probably a bug in the
++     `configure' script.
++
++  9. Please report any problems you have.  That is the only way they
++     will get fixed for other people.  Supply a patch if you can (*note
++     Patches::), or just ask for help.
++
++
++\x1f
++File: uucp.info,  Node: Testing the Compilation,  Next: Installing the Binaries,  Prev: Compilation,  Up: Installing Taylor UUCP
++
++3.2 Testing the Compilation
++===========================
++
++If your system supports pseudo-terminals, and you compiled the code to
++support the new style of configuration files (`HAVE_TAYLOR_CONFIG' was
++set to 1 in `policy.h'), you should be able to use the `tstuu' program
++to test the `uucico' daemon.  If your system supports STREAMS based
++pseudo-terminals, you must compile tstuu.c with `-DHAVE_STREAMS_PTYS'.
++(The STREAMS based code was contributed by Marc Boucher).
++
++   To run `tstuu', just type `tstuu' with no arguments.  You must run
++it in the compilation directory, since it runs `./uucp', `./uux' and
++`./uucico'.  The `tstuu' program will run a lengthy series of tests (it
++takes over ten minutes on a slow VAX).  You will need a fair amount of
++space available in `/usr/tmp'.  You will probably want to put it in the
++background.  Do not use `^Z', because the program traps on `SIGCHLD'
++and winds up dying.  The `tstuu' program will create a directory
++`/usr/tmp/tstuu' and fill it with configuration files, and create spool
++directories `/usr/tmp/tstuu/spool1' and `/usr/tmp/tstuu/spool2'.
++
++   If your system does not support the `FIONREAD' call, the `tstuu'
++program will run very slowly.  This may or may not get fixed in a later
++version.
++
++   The `tstuu' program will finish with an execute file named
++`X.SOMETHING' and a data file named `D.SOMETHING' in the directory
++`/usr/tmp/tstuu/spool1' (or, more likely, in subdirectories, depending
++on the choice of `SPOOLDIR' in `policy.h').  Two log files will be
++created in the directory `/usr/tmp/tstuu'.  They will be named `Log1'
++and `Log2', or, if you have selected `HAVE_HDB_LOGGING' in `policy.h',
++`Log1/uucico/test2' and `Log2/uucico/test1'.  There should be no errors
++in the log files.
++
++   You can test `uuxqt' with `./uuxqt -I /usr/tmp/tstuu/Config1'.  This
++should leave a command file `C.SOMETHING' and a data file `D.SOMETHING'
++in `/usr/tmp/tstuu/spool1' or in subdirectories.  Again, there should
++be no errors in the log file.
++
++   Assuming you compiled the code with debugging enabled, the `-x'
++switch can be used to set debugging modes; see the `debug' command for
++details (*note Debugging Levels::).  Use `-x all' to turn on all
++debugging and generate far more output than you will ever want to see.
++The `uucico' daemons will put debugging output in the files `Debug1'
++and `Debug2' in the directory `/usr/tmp/tstuu'.  After that, you're
++pretty much on your own.
++
++   On some systems you can also use `tstuu' to test `uucico' against
++the system `uucico', by using the `-u' switch.  For this to work,
++change the definitions of `ZUUCICO_CMD' and `UUCICO_EXECL' at the top
++of `tstuu.c' to something appropriate for your system.  The definitions
++in `tstuu.c' are what I used for Ultrix 4.0, on which
++`/usr/lib/uucp/uucico' is particularly obstinate about being run as a
++child; I was only able to run it by creating a login name with no
++password whose shell was `/usr/lib/uucp/uucico'.  Calling login in this
++way will leave fake entries in `wtmp' and `utmp'; if you compile
++`tstout.c' (in the `contrib' directory) as a setuid `root' program,
++`tstuu' will run it to clear those entries out.  On most systems, such
++hackery should not be necessary, although on SCO I had to su to `root'
++(`uucp' might also have worked) before I could run
++`/usr/lib/uucp/uucico'.
++
++   You can test `uucp' and `uux' (give them the `-r' switch to keep
++them from starting `uucico') to make sure they create the right sorts
++of files.  Unfortunately, if you don't know what the right sorts of
++files are, I'm not going to tell you here.
++
++   If you can not run `tstuu', or if it fails inexplicably, don't worry
++about it too much.  On some systems `tstuu' will fail because of
++problems using pseudo terminals, which will not matter in normal use.
++The real test of the package is talking to another system.
++
++\x1f
++File: uucp.info,  Node: Installing the Binaries,  Next: Configuration,  Prev: Testing the Compilation,  Up: Installing Taylor UUCP
++
++3.3 Installing the Binaries
++===========================
++
++You can install the executable files by becoming `root' and typing
++`make install'.  Or you can look at what `make install' does and do it
++by hand.  It tries to preserve your old programs, if any, but it only
++does this the first time Taylor UUCP is installed (so that if you
++install several versions of Taylor UUCP, you can still go back to your
++original UUCP programs).  You can retrieve the original programs by
++typing `make uninstall'.
++
++   Note that by default the programs are compiled with debugging
++information, and they are not stripped when they are installed.  You may
++want to strip the installed programs to save disk space.  For more
++information, see your system documentation for the `strip' program.
++
++   Of course, simply installing the executable files is not enough.  You
++must also arrange for them to be used correctly.
++
++\x1f
++File: uucp.info,  Node: Configuration,  Next: Testing the Installation,  Prev: Installing the Binaries,  Up: Installing Taylor UUCP
++
++3.4 Configuring Taylor UUCP
++===========================
++
++You will have to decide what types of configuration files you want to
++use.  This package supports a new sort of configuration file; see *note
++Configuration Files::.  It also supports V2 configuration files
++(`L.sys', `L-devices', etc.) and HDB configuration files (`Systems',
++`Devices', etc.).  No documentation is provided for V2 or HDB
++configuration files.  All types of configuration files can be used at
++once, if you are so inclined.  Currently using just V2 configuration
++files is not really possible, because there is no way to specify a
++dialer (there are no built in dialers, and the program does not know
++how to read `acucap' or `modemcap'); however, V2 configuration files
++can be used with a new style dial file (*note dial File::), or with a
++HDB `Dialers' file.
++
++   Use of HDB configuration files has two known bugs.  A blank line in
++the middle of an entry in the `Permissions' file will not be ignored as
++it should be.  Dialer programs, as found in some versions of HDB, are
++not recognized directly.  If you must use a dialer program, rather than
++an entry in `Devices', you must use the `chat-program' command in a new
++style dial file; see *note dial File::.  You will have to invoke the
++dialer program via a shell script or another program, since an exit
++code of 0 is required to recognize success; the `dialHDB' program in
++the `contrib' directory may be used for this purpose.
++
++   The `uuconv' (*note Invoking uuconv::) program can be used to
++convert from V2 or HDB configuration files to the new style (it can also
++do the reverse translation, if you are so inclined).  It will not do all
++of the work, and the results should be carefully checked, but it can be
++quite useful.
++
++   If you are installing a new system, you will, of course, have to
++write the configuration files; see *note Configuration Files:: for
++details on how to do this.
++
++   After writing the configuration files, use the `uuchk' program to
++verify that they are what you expect; see *note Invoking uuchk::.
++
++\x1f
++File: uucp.info,  Node: Testing the Installation,  Prev: Configuration,  Up: Installing Taylor UUCP
++
++3.5 Testing the Installation
++============================
++
++After you have written the configuration files, and verified them with
++the `uuchk' program (*note Invoking uuchk::), you must check that UUCP
++can correctly contact another system.
++
++   Tell `uucico' to dial out to the system by using the `-s' system
++switch (e.g., `uucico -s uunet').  The log file should tell you what
++happens.  The exact location of the log file depends upon the settings
++in `policy.h' when you compiled the program, and on the use of the
++`logfile' command in the `config' file.  Typical locations are
++`/usr/spool/uucp/Log' or a subdirectory under `/usr/spool/uucp/.Log'.
++
++   If you compiled the code with debugging enabled, you can use
++debugging mode to get a great deal of information about what sort of
++data is flowing back and forth; the various possibilities are described
++with the `debug' command (*note Debugging Levels::).  When initially
++setting up a connection `-x chat' is probably the most useful (e.g.,
++`uucico -s uunet -x chat'); you may also want to use `-x
++handshake,incoming,outgoing'.  You can use `-x' multiple times on one
++command line, or you can give it comma separated arguments as in the
++last example.  Use `-x all' to turn on all possible debugging
++information.
++
++   The debugging information is written to a file, normally
++`/usr/spool/uucp/Debug', although the default can be changed in
++`policy.h', and the `config' file can override the default with the
++`debugfile' command.  The debugging file may contain passwords and some
++file contents as they are transmitted over the line, so the debugging
++file is only readable by the `uucp' user.
++
++   You can use the `-f' switch to force `uucico' to call out even if
++the last call failed recently; using `-S' when naming a system has the
++same effect.  Otherwise the status file (in the `.Status' subdirectory
++of the main spool directory, normally `/usr/spool/uucp') (*note Status
++Directory::) will prevent too many attempts from occurring in rapid
++succession.
++
++   On older System V based systems which do not have the `setreuid'
++system call, problems may arise if ordinary users can start an execution
++of `uuxqt', perhaps indirectly via `uucp' or `uux'.  UUCP jobs may wind
++up executing with a real user ID of the user who invoked `uuxqt', which
++can cause problems if the UUCP job checks the real user ID for security
++purposes.  On such systems, it is safest to put `run-uuxqt never'
++(*note Miscellaneous (config)::) in the `config' file, so that `uucico'
++never starts `uuxqt', and invoke `uuxqt' directly from a `crontab' file.
++
++   Please let me know about any problems you have and how you got around
++them.  If you do report a problem, please include the version number of
++the package you are using, the operating system you are running it on,
++and a sample of the debugging file showing the problem (debugging
++information is usually what is needed, not just the log file).  General
++questions such as "why doesn't `uucico' dial out" are impossible to
++answer without much more information.
++
++\x1f
++File: uucp.info,  Node: Using Taylor UUCP,  Next: Configuration Files,  Prev: Installing Taylor UUCP,  Up: Top
++
++4 Using Taylor UUCP
++*******************
++
++* Menu:
++
++* Calling Other Systems::       Calling Other Systems
++* Accepting Calls::             Accepting Calls
++* Mail and News::               Using UUCP for Mail and News
++* The Spool Directory Layout::  The Spool Directory Layout
++* Spool Directory Cleaning::    Cleaning the UUCP Spool Directory
++
++\x1f
++File: uucp.info,  Node: Calling Other Systems,  Next: Accepting Calls,  Prev: Using Taylor UUCP,  Up: Using Taylor UUCP
++
++4.1 Calling Other Systems
++=========================
++
++By default `uucp' and `uux' will automatically start up `uucico' to
++call another system whenever work is queued up.  However, the call may
++fail, or you may have put in time restrictions which prevent the call
++at that time (perhaps because telephone rates are high) (*note When to
++Call::).  Also, a remote system may have work queued up for your
++system, but may not be calling you for some reason (perhaps you have
++agreed that your system should always place the call).  To make sure
++that work gets transferred between the systems withing a reasonable
++time period, you should arrange to periodically invoke `uucico'.
++
++   These periodic invocations are normally triggered by entries in the
++`crontab' file.  The exact format of `crontab' files, and how new
++entries are added, varies from system to system; check your local
++documentation (try `man cron').
++
++   To attempt to call all systems with outstanding work, use the command
++`uucico -r1'.  To attempt to call a particular system, use the command
++`uucico -s SYSTEM'.  To attempt to call a particular system, but only
++if there is work for it, use the command `uucico -C -s SYSTEM'.  (*note
++Invoking uucico::).
++
++   A common case is to want to try to call a system at a certain time,
++with periodic retries if the call fails.  A simple way to do this is to
++create an empty UUCP command file, known as a "poll file".  If a poll
++file exists for a system, then `uucico -r1' will place a call to it.
++If the call succeeds, the poll file will be deleted.
++
++   A poll file can be easily created using the `uux' command, by
++requesting the execution of an empty command.  To create a poll file for
++SYSTEM, just do something like this:
++     uux -r SYSTEM!
++   The `-r' tells `uux' to not start up `uucico' immediately.  Of
++course, if you do want `uucico' to start up right away, omit the `-r';
++if the call fails, the poll file will be left around to cause a later
++call.
++
++   For example, I use the following crontab entries locally:
++
++     45 * * * * /bin/echo /usr/lib/uucp/uucico -r1 | /bin/su uucpa
++     40 4,10,15 * * * /usr/bin/uux -r uunet!
++
++   Every hour, at 45 minutes past, this will check if there is any work
++to be done, and, if there is, will call the appropriate system.  Also,
++at 4:40am, 10:40am, and 3:40pm, this will create a poll file file for
++`uunet', forcing the next run of `uucico' to call `uunet'.
++
++\x1f
++File: uucp.info,  Node: Accepting Calls,  Next: Mail and News,  Prev: Calling Other Systems,  Up: Using Taylor UUCP
++
++4.2 Accepting Calls
++===================
++
++To accept calls from another system, you must arrange matters such that
++when that system calls in, it automatically invokes `uucico' on your
++system.
++
++   The most common arrangement is to create a special user name and
++password for incoming UUCP calls.  This user name typically uses the
++same user ID as the regular `uucp' user (Unix permits several user
++names to share the same user ID).  The shell for this user name should
++be set to `uucico'.
++
++   Here is a sample `/etc/passwd' line to accept calls from a remote
++system named airs:
++     Uairs:PASSWORD:4:8:airs UUCP:/usr/spool/uucp:/usr/lib/uucp/uucico
++   The details may vary on your system.  You must use reasonable user
++and group ID's.  You must use the correct file name for `uucico'.  The
++PASSWORD must appear in the UUCP configuration files on the remote
++system, but will otherwise never be seen or typed by a human.
++
++   Note that `uucico' appears as the login shell, and that it will be
++run with no arguments.  This means that it will start in slave mode and
++accept an incoming connection.  *Note Invoking uucico::.
++
++   On some systems, creating an empty file named `.hushlogin' in the
++home directory will skip the printing of various bits of information
++when the remote `uucico' logs in, speeding up the UUCP connection
++process.
++
++   For the greatest security, each system which calls in should use a
++different user name, each with a different password, and the
++`called-login' command should be used in the `sys' file to ensure that
++the correct login name is used.  *Note Accepting a Call::, and see
++*note Security::.
++
++   If you never need to dial out from your system, but only accept
++incoming calls, you can arrange for `uucico' to handle logins itself,
++completely controlling the port, by using the `--endless' option.
++*Note Invoking uucico::.
++
++\x1f
++File: uucp.info,  Node: Mail and News,  Next: The Spool Directory Layout,  Prev: Accepting Calls,  Up: Using Taylor UUCP
++
++4.3 Using UUCP for Mail and News.
++=================================
++
++Taylor UUCP does not include a mail package.  All Unix systems come with
++some sort of mail delivery agent, typically `sendmail' or `MMDF'.
++Source code is available for some alternative mail delivery agents,
++such as `IDA sendmail' and `smail'.
++
++   Taylor UUCP also does not include a news package.  The two major Unix
++news packages are `C-news' and `INN'.  Both are available in source
++code form.
++
++   Configuring and using mail delivery agents is a notoriously complex
++topic, and I will not be discussing it here.  Configuring news systems
++is usually simpler, but I will not be discussing that either.  I will
++merely describe the interactions between the mail and news systems and
++UUCP.
++
++   A mail or news system interacts with UUCP in two ways: sending and
++receiving.
++
++* Menu:
++
++* Sending mail or news::        Sending mail or news via UUCP
++* Receiving mail or news::      Receiving mail or news via UUCP
++
++\x1f
++File: uucp.info,  Node: Sending mail or news,  Next: Receiving mail or news,  Prev: Mail and News,  Up: Mail and News
++
++4.3.1 Sending mail or news via UUCP
++-----------------------------------
++
++When mail is to be sent from your machine to another machine via UUCP,
++the mail delivery agent will invoke `uux'.  It will generally run a
++command such as `uux - SYSTEM!rmail ADDRESS', where SYSTEM is the
++remote system to which the mail is being sent.  It may pass other
++options to `uux', such as `-r' or `-g' (*note Invoking uux::).
++
++   The news system also invokes `uux' in order to transfer articles to
++another system.  The only difference is that news will use `uux' to
++invoke `rnews' on the remote system, rather than `rmail'.
++
++   You should arrange for your mail and news systems to invoke the
++Taylor UUCP version of `uux'.  If you only have Taylor UUCP, or if you
++simply replace any existing version of `uux' with the Taylor UUCP
++version, this will probably happen automatically.  However, if you have
++two UUCP packages installed on your system, you will probably have to
++modify the mail and news configuration files in some way.
++
++   Actually, if both the system UUCP and Taylor UUCP are using the same
++spool directory format, the system `uux' will probably work fine with
++the Taylor `uucico' (the reverse is not the case: the Taylor `uux'
++requires the Taylor `uucico').  However, data transfer will be somewhat
++more efficient if the Taylor `uux' is used.
++
++\x1f
++File: uucp.info,  Node: Receiving mail or news,  Prev: Sending mail or news,  Up: Mail and News
++
++4.3.2 Receiving mail or news via UUCP
++-------------------------------------
++
++To receive mail, all that is necessary is for UUCP to invoke `rmail'.
++Any mail delivery agent will provide an appropriate version of `rmail';
++you must simply make sure that it is in the command path used by UUCP
++(it almost certainly already is).  The default command path is set in
++`policy.h', and it may be overridden for a particular system by the
++`command-path' command (*note Miscellaneous (sys)::).
++
++   Similarly, for news UUCP must be able to invoke `rnews'.  Any news
++system will provide a version of `rnews', and you must ensure that is
++in a directory on the path that UUCP will search.
++
++\x1f
++File: uucp.info,  Node: The Spool Directory Layout,  Next: Spool Directory Cleaning,  Prev: Mail and News,  Up: Using Taylor UUCP
++
++4.4 The Spool Directory Layout
++==============================
++
++In general, the layout of the spool directory may be safely ignored.
++However, it is documented here for the curious.  This description only
++covers the `SPOOLDIR_TAYLOR' layout.  The ways in which the other spool
++directory layouts differ are described in the source file
++`unix/spool.c'.
++
++   Directories and files are only created when they are needed, so a
++typical system will not have all of the entries described here.
++
++* Menu:
++
++* System Spool Directories::    System Spool Directories
++* Status Directory::            Status Spool Directory
++* Execution Subdirectories::    Execution Spool Subdirectories
++* Other Spool Subdirectories::  Other Spool Subdirectories
++* Spool Lock Files::            Spool Directory Lock Files
++
++\x1f
++File: uucp.info,  Node: System Spool Directories,  Next: Status Directory,  Prev: The Spool Directory Layout,  Up: The Spool Directory Layout
++
++4.4.1 System Spool Directories
++------------------------------
++
++`SYSTEM'
++     There is a subdirectory of the main spool directory for each remote
++     system.
++
++`SYSTEM/C.'
++     This directory stores files describing file transfer commands to
++     be sent to the SYSTEM.  Each file name starts with `C.G', where G
++     is the job grade.  Each file contains one or more commands.  For
++     details of the commands, see *note UUCP Protocol Commands::.
++
++`SYSTEM/D.'
++     This directory stores data files.  Files with names like
++     `D.GSSSS', where G is the grade and SSSS is a sequence number, are
++     waiting to be transferred to the SYSTEM, as directed by the files
++     in the `SYSTEM/C.' directory.  Files with other names, typically
++     `D.SYSTEMGSSSS', have been received from SYSTEM and are waiting to
++     be processed by an execution file in the `SYSTEM/X.' directory.
++
++`SYSTEM/D.X'
++     This directory stores data files which will become execution files
++     on the remote system.  In current practice, this directory rarely
++     exists, because most simple executions, including typical uses of
++     `rmail' and `rnews', send an `E' command rather than an execution
++     file (*note The E Command::).
++
++`SYSTEM/X.'
++     This directory stores execution files which have been received from
++     SYSTEM.  This directory normally exists, even though the
++     corresponding `D.X' directory does not, because `uucico' will
++     create an execution file on the fly when it receives an `E'
++     command.
++
++`SYSTEM/SEQF'
++     This file holds the sequence number of the last job sent to
++     SYSTEM.  The sequence number is used to ensure that file names are
++     unique in the remote system spool directory.  The file is four
++     bytes long.  Sequence numbers are composed of digits and the upper
++     case letters.
++
++\x1f
++File: uucp.info,  Node: Status Directory,  Next: Execution Subdirectories,  Prev: System Spool Directories,  Up: The Spool Directory Layout
++
++4.4.2 Status Directory
++----------------------
++
++`.Status'
++     This directory holds status files for each remote system.  The
++     name of the status file is the name of the system which it
++     describes.  Each status file describes the last conversation with
++     the system.  Running `uustat --status' basically just formats and
++     prints the contents of the status files (*note uustat Examples::).
++
++     Each status file has a single text line with six fields.
++
++    code
++          A code indicating the status of the last conversation.  The
++          following values are defined, though not all are actually
++          used.
++         `0'
++               Conversation completed normally.
++
++         `1'
++               `uucico' was unable to open the port.
++
++         `2'
++               The last call to the system failed while dailing.
++
++         `3'
++               The last call to the system failed while logging in.
++
++         `4'
++               The last call to the system failed during the initial
++               UUCP protocol handshake (*note The Initial Handshake::).
++
++         `5'
++               The last call to the system failed after the initial
++               handshake.
++
++         `6'
++               `uucico' is currently talking to the system.
++
++         `7'
++               The last call to the system failed because it was the
++               wrong time to call (this is not used if calling the
++               system is never permitted).
++
++    retries
++          The number of retries since the last successful call.
++
++    time of last call
++          The time of the last call, in seconds since the epoch (as
++          returned by the `time' system call).
++
++    wait
++          If the last call failed, this is the number of seconds since
++          the last call before `uucico' may attempt another call.  This
++          is set based on the retry time; see *note When to Call::.
++          The `-f' or `-S' options to `uucico' direct it to ignore this
++          wait time; see *note Invoking uucico::.
++
++    description
++          A text description of the status, corresponding to the code
++          in the first field.  This may contain spaces.
++
++    system name
++          The name of the remote system.
++
++\x1f
++File: uucp.info,  Node: Execution Subdirectories,  Next: Other Spool Subdirectories,  Prev: Status Directory,  Up: The Spool Directory Layout
++
++4.4.3 Execution Subdirectories
++------------------------------
++
++`.Xqtdir'
++     When `uuxqt' executes a job requested by `uux', it first changes
++     the working directory to the `.Xqtdir' subdirectory.  This permits
++     the job to create any sort of temporary file without worrying
++     about overwriting other files in the spool directory.  Any files
++     left in the `.Xqtdir' subdirectory are removed after each
++     execution is complete.
++
++`.XqtdirNNNN'
++     When several instances of `uuxqt' are executing simultaneously,
++     each one executes jobs in a separate directory.  The first uses
++     `.Xqtdir', the second uses `.Xqtdir0001', the third uses
++     `.Xqtdir0002', and so forth.
++
++`.Corrupt'
++     If `uuxqt' encounters an execution file which it is unable to
++     parse, it saves it in the `.Corrupt' directory, and sends mail
++     about it to the UUCP administrator.
++
++`.Failed'
++     If `uuxqt' executes a job, and the job fails, and there is enough
++     disk space to hold the command file and all the data files, then
++     `uuxqt' saves the files in the `.Failed' directory, and sends mail
++     about it to the UUCP administrator.
++
++\x1f
++File: uucp.info,  Node: Other Spool Subdirectories,  Next: Spool Lock Files,  Prev: Execution Subdirectories,  Up: The Spool Directory Layout
++
++4.4.4 Other Spool Subdirectories
++--------------------------------
++
++`.Sequence'
++     This directory holds conversation sequence number files.  These
++     are used if the `sequence' command is used for a system (*note
++     Miscellaneous (sys)::).  The sequence number for the system SYSTEM
++     is stored in the file `.Sequence/SYSTEM'.  It is simply stored as
++     a printable number.
++
++`.Temp'
++     This directory holds data files as they are being received from a
++     remote system, before they are moved to their final destination.
++     For file send requests which use a valid temporary file name in
++     the TEMP field of the `S' or `E' command (*note The S Command::),
++     `uucico' receives the file into `.Temp/SYSTEM/TEMP', where SYSTEM
++     is the name of the remote system, and TEMP is the temporary file
++     name.  If a conversation fails during a file transfer, these files
++     are used to automatically restart the file transfer from the point
++     of failure.
++
++     If the `S' or `E' command does not include a temporary file name,
++     automatic restart is not possible.  In this case, the files are
++     received into a randomly named file in the `.Temp' directory
++     itself.
++
++`.Preserve'
++     This directory holds data files which could not be transferred to a
++     remote system for some reason (for example, the data file might be
++     large, and exceed size restrictions imposed by the remote system).
++     When a locally requested file transfer fails, `uucico' will store
++     the data file in the `.Preserve' directory, and send mail to the
++     requestor describing the failure and naming the saved file.
++
++`.Received'
++     This directory records which files have been received.  If a
++     conversation fails just after `uucico' acknowledges receipt of a
++     file, it is possible for the acknowledgement to be lost.  If this
++     happens, the remote system will resend the file.  If the file were
++     an execution request, and `uucico' did not keep track of which
++     files it had already received, this could lead to the execution
++     being performed twice.
++
++     To avoid this problem, when a conversation fails, `uucico' records
++     each file that has been received, but for which the remote system
++     may not have received the acknowledgement.  It records this
++     information by creating an empty file with the name
++     `.Received/SYSTEM/TEMP', where SYSTEM is the name of the remote
++     system, and TEMP is the TEMP field of the `S' or `E' command from
++     the remote system (*note The S Command::).  Then, if the remote
++     system offers the file again in the next conversation, `uucico'
++     refuses the send request and deletes the record in the `.Received'
++     directory.  This approach only works for file sends which use a
++     temporary file name, but this is true of all execution requests.
++
++\x1f
++File: uucp.info,  Node: Spool Lock Files,  Prev: Other Spool Subdirectories,  Up: The Spool Directory Layout
++
++4.4.5 Lock Files in the Spool Directory
++---------------------------------------
++
++Lock files for devices and systems are stored in the lock directory,
++which may or may not be the same as the spool directory.  The lock
++directory is set at compilation time by `LOCKDIR' in `policy.h', which
++may be overridden by the `lockdir' command in the `config' file (*note
++Miscellaneous (config)::).
++
++   For a description of the names used for device lock files, and the
++format of the contents of a lock file, see *note UUCP Lock Files::.
++
++`LCK..SYS'
++     A lock file for a system, where SYS is the system name.  As noted
++     above, these lock files are kept in the lock directory, which may
++     not be the spool directory.  These lock files are created by
++     `uucico' while talking to a remote system, and are used to prevent
++     multiple simultaneous conversations with a system.
++
++     On systems which limit file names to 14 characters, only the first
++     eight characters of the system name are used in the lock file
++     name.  This requires that the names of each directly connected
++     remote system be unique in the first eight characters.
++
++`LCK.XQT.NN'
++     When `uuxqt' starts up, it uses lock files to determine how many
++     other `uuxqt' daemons are currently running.  It first tries to
++     lock `LCK.XQT.0', then `LCK.XQT.1', and so forth.  This is used to
++     implement the `max-uuxqts' command (*note Miscellaneous
++     (config)::).  It is also used to parcel out the `.Xqtdir'
++     subdirectories (*note Execution Subdirectories::).
++
++`LXQ.CMD'
++     When `uuxqt' is invoked with the `-c' or `--command' option (*note
++     Invoking uuxqt::), it creates a lock file named after the command
++     it is executing.  For example, `uuxqt -c rmail' will create the
++     lock file `LXQ.rmail'.  This prevents other `uuxqt' daemons from
++     executing jobs of the specified type.
++
++`SYSTEM/X./L.XXX'
++     While `uuxqt' is executing a particular job, it creates a lock file
++     with the same name as the `X.' file describing the job, but
++     replacing the initial `X' with `L'.  This ensures that if multiple
++     `uuxqt' daemons are running, they do not simultaneously execute
++     the same job.
++
++`LCK..SEQ'
++     This lock file is used to control access to the sequence files for
++     each system (*note System Spool Directories::).  It is only used
++     on systems which do not support POSIX file locking using the
++     `fcntl' system call.
++
++\x1f
++File: uucp.info,  Node: Spool Directory Cleaning,  Prev: The Spool Directory Layout,  Up: Using Taylor UUCP
++
++4.5 Cleaning the Spool Directory
++================================
++
++The spool directory may need to be cleaned up periodically.  Under some
++circumstances, files may accumulate in various subdirectories, such as
++`.Preserve' (*note Other Spool Subdirectories::) or `.Corrupt' (*note
++Execution Subdirectories::).
++
++   Also, if a remote system stops calling in, you may want to arrange
++for any queued up mail to be returned to the sender.  This can be done
++using the `uustat' command (*note Invoking uustat::).
++
++   The `contrib' directory includes a simple `uuclean' script which may
++be used as an example of a clean up script.  It can be run daily out of
++`crontab'.
++
++   You should periodically trim the UUCP log files, as they will
++otherwise grow without limit.  The names of the log files are set in
++`policy.h', and may be overridden in the configuration file (*note
++config File::).  By default they are are `/usr/spool/uucp/Log' and
++`/usr/spool/uucp/Stats'.  You may find the `savelog' program in the
++`contrib' directory to be of use.  There is a manual page for it in
++`contrib' as well.
++
++\x1f
++File: uucp.info,  Node: Configuration Files,  Next: Protocols,  Prev: Using Taylor UUCP,  Up: Top
++
++5 Taylor UUCP Configuration Files
++*********************************
++
++This chapter describes the configuration files accepted by the Taylor
++UUCP package if compiled with `HAVE_TAYLOR_CONFIG' set to 1 in
++`policy.h'.
++
++   The configuration files are normally found in the directory
++NEWCONFIGDIR, which is defined by the `configure' option
++`--with-newconfigdir'; by default NEWCONFIGDIR is
++`/usr/local/conf/uucp'.  However, the main configuration file,
++`config', is the only one which must be in that directory, since it may
++specify a different location for any or all of the other files.  You
++may run any of the UUCP programs with a different main configuration
++file by using the `-I' or `--config' option; this can be useful when
++testing a new configuration.  When you use the `-I' option the programs
++will revoke any setuid privileges.
++
++* Menu:
++
++* Configuration Overview::      Configuration File Overview
++* Configuration File Format::   Configuration File Format
++* Configuration Examples::      Examples of Configuration Files
++* Time Strings::                How to Write Time Strings
++* Chat Scripts::                How to Write Chat Scripts
++* config File::                 The Main Configuration File
++* sys File::                    The System Configuration File
++* port File::                   The Port Configuration Files
++* dial File::                   The Dialer Configuration Files
++* UUCP Over TCP::               UUCP Over TCP
++* Security::                    Security Issues
++
++\x1f
++File: uucp.info,  Node: Configuration Overview,  Next: Configuration File Format,  Prev: Configuration Files,  Up: Configuration Files
++
++5.1 Configuration File Overview
++===============================
++
++UUCP uses several different types of configuration files, each
++describing a different kind of information.  The commands permitted in
++each file are described in detail below.  This section is a brief
++description of some of the different types of files.
++
++   The `config' file is the main configuration file.  It describes
++general information not associated with a particular remote system, such
++as the location of various log files.  There are reasonable defaults for
++everything that may be specified in the `config' file, so you may not
++actually need one on your system.
++
++   There may be only one `config' file, but there may be one or more of
++each other type of file.  The default is one file for each type, but
++more may be listed in the `config' file.
++
++   The `sys' files are used to describe remote systems.  Each remote
++system to which you connect must be listed in a `sys' file.  A `sys'
++file will include information for a system, such as the speed (baud
++rate) to use, or when to place calls.
++
++   For each system you wish to call, you must describe one or more
++ports; these ports may be defined directly in the `sys' file, or they
++may be defined in a `port' file.
++
++   The `port' files are used to describe ports.  A port is a particular
++hardware connection on your computer.  You would normally define as
++many ports as there are modems attached to your computer.  A TCP
++connection is also described using a port.
++
++   The `dial' files are used to describe dialers.  Dialer is
++essentially another word for modem.  The `dial' file describes the
++commands UUCP should use to dial out on a particular type of modem.  You
++would normally define as many dialers as there are types of modems
++attached to your computer.  For example, if you have three Telebit
++modems used for UUCP, you would probably define three ports and one
++dialer.
++
++   There are other types of configuration files, but these are the
++important ones.  The other types are described below.
++
++\x1f
++File: uucp.info,  Node: Configuration File Format,  Next: Configuration Examples,  Prev: Configuration Overview,  Up: Configuration Files
++
++5.2 Configuration File Format
++=============================
++
++All the configuration files follow a simple line-oriented `KEYWORD
++VALUE' format.  Empty lines are ignored, as are leading spaces; unlike
++HDB, lines with leading spaces are read.  The first word on each line
++is a keyword.  The rest of the line is interpreted according to the
++keyword.  Most keywords are followed by numbers, boolean values or
++simple strings with no embedded spaces.
++
++   The `#' character is used for comments.  Everything from a `#' to
++the end of the line is ignored unless the `#' is preceded by a `\'
++(backslash); if the `#' is preceeded by a `\', the `\' is removed but
++the `#' remains in the line.  This can be useful for a phone number
++containing a `#'.  To enter the sequence `\#', use `\\#'.
++
++   The backslash character may be used to continue lines.  If the last
++character in a line is a backslash, the backslash is removed and the
++line is continued by the next line.  The second line is attached to the
++first with no intervening characters; if you want any whitespace between
++the end of the first line and the start of the second line, you must
++insert it yourself.
++
++   However, the backslash is not a general quoting character.  For
++example, you cannot use it to get an embedded space in a string
++argument.
++
++   Everything after the keyword must be on the same line.  A BOOLEAN
++may be specified as `y', `Y', `t', or `T' for true and `n', `N', `f',
++or `F' for false; any trailing characters are ignored, so `true',
++`false', etc., are also acceptable.
++
++\x1f
++File: uucp.info,  Node: Configuration Examples,  Next: Time Strings,  Prev: Configuration File Format,  Up: Configuration Files
++
++5.3 Examples of Configuration Files
++===================================
++
++This section provides few typical examples of configuration files.
++There are also sample configuration files in the `sample' subdirectory
++of the distribution.
++
++* Menu:
++
++* config File Examples::        Examples of the Main Configuration File
++* Leaf Example::                Call a Single Remote Site
++* Gateway Example::             The Gateway for Several Local Systems
++
++\x1f
++File: uucp.info,  Node: config File Examples,  Next: Leaf Example,  Prev: Configuration Examples,  Up: Configuration Examples
++
++5.3.1 config File Examples
++--------------------------
++
++To start with, here are some examples of uses of the main configuration
++file, `config'.  For a complete description of the commands that are
++permitted in `config', see *note config File::.
++
++   In many cases you will not need to create a `config' file at all.
++The most common reason to create one is to give your machine a special
++UUCP name.  Other reasons might be to change the UUCP spool directory,
++or to permit any remote system to call in.
++
++   If you have an internal network of machines, then it is likely that
++the internal name of your UUCP machine is not the name you want to use
++when calling other systems.  For example, here at `airs.com' our
++mail/news gateway machine is named `elmer.airs.com' (it is one of
++several machines all named `LOCALNAME.airs.com').  If we did not
++provide a `config' file, then our UUCP name would be `elmer'; however,
++we actually want it to be `airs'.  Therefore, we use the following line
++in `config':
++
++     nodename airs
++
++   The UUCP spool directory name is set in `policy.h' when the code is
++compiled.  You might at some point decide that it is appropriate to move
++the spool directory, perhaps to put it on a different disk partition.
++You would use the following commands in `config' to change to
++directories on the partition `/uucp':
++
++     spool /uucp/spool
++     pubdir /uucp/uucppublic
++     logfile /uucp/spool/Log
++     debugfile /uucp/spool/Debug
++
++   You would then move the contents of the current spool directory to
++`/uucp/spool'.  If you do this, make sure that no UUCP processes are
++running while you change `config' and move the spool directory.
++
++   Suppose you wanted to permit any system to call in to your system and
++request files.  This is generally known as "anonymous UUCP", since the
++systems which call in are effectively anonymous.  By default, unknown
++systems are not permitted to call in.  To permit this you must use the
++`unknown' command in `config'.  The `unknown' command is followed by
++any command that may appear in the system file; for full details, see
++*note sys File::.
++
++   I will show two possible anonymous UUCP configurations.  The first
++will let any system call in and download files, but will not permit
++them to upload files to your system.
++
++     # No files may be transferred to this system
++     unknown receive-request no
++     # The public directory is /usr/spool/anonymous
++     unknown pubdir /usr/spool/anonymous
++     # Only files in the public directory may be sent (the default anyhow)
++     unknown remote-send ~
++
++Setting the public directory is convenient for the systems which call
++in.  It permits to request a file by prefixing it with `~/'.  For
++example, assuming your system is known as `server', then to retrieve
++the file `/usr/spool/anonymous/INDEX' a user on a remote site could
++just enter `uucp server!~/INDEX ~'; this would transfer `INDEX' from
++`server''s public directory to the user's local public directory.  Note
++that when using `csh' or `bash' the `!' and the second `~' must be
++quoted.
++
++   The next example will permit remote systems to upload files to a
++special directory named `/usr/spool/anonymous/upload'.  Permitting a
++remote system to upload files permits it to send work requests as well;
++this example is careful to prohibit commands from unknown systems.
++
++     # No commands may be executed (the list of permitted commands is empty)
++     unknown commands
++     # The public directory is /usr/spool/anonymous
++     unknown pubdir /usr/spool/anonymous
++     # Only files in the public directory may be sent; users may not download
++     # files from the upload directory
++     unknown remote-send ~ !~/upload
++     # May only upload files into /usr/spool/anonymous/upload
++     unknown remote-receive ~/upload
++
++\x1f
++File: uucp.info,  Node: Leaf Example,  Next: Gateway Example,  Prev: config File Examples,  Up: Configuration Examples
++
++5.3.2 Leaf Example
++------------------
++
++A relatively common simple case is a "leaf site", a system which only
++calls or is called by a single remote site.  Here is a typical `sys'
++file that might be used in such a case.  For full details on what
++commands can appear in the `sys' file, see *note sys File::.
++
++   This is the `sys' file that is used at `airs.com'.  We use a single
++modem to dial out to `uunet'.  This example shows how you can specify
++the port and dialer information directly in the `sys' file for simple
++cases.  It also shows the use of the following:
++
++`call-login'
++     Using `call-login' and `call-password' allows the default login
++     chat script to be used.  In this case, the login name is specified
++     in the call-out login file (*note Configuration File Names::).
++
++`call-timegrade'
++     `uunet' is requested to not send us news during the daytime.
++
++`chat-fail'
++     If the modem returns `BUSY' or `NO CARRIER' the call is
++     immediately aborted.
++
++`protocol-parameter'
++     Since `uunet' tends to be slow, the default timeout has been
++     increased.
++
++
++   This `sys' file relies on certain defaults.  It will allow `uunet'
++to queue up `rmail' and `rnews' commands.  It will allow users to
++request files from `uunet' into the UUCP public directory.  It will
++also allow `uunet' to request files from the UUCP public directory; in
++fact `uunet' never requests files, but for additional security we could
++add the line `request false'.
++
++     # The following information is for uunet
++     system uunet
++
++     # The login name and password are kept in the callout password file
++     call-login *
++     call-password *
++
++     # We can send anything at any time.
++     time any
++
++     # During the day we only accept grade `Z' or above; at other times
++     # (not mentioned here) we accept all grades.  uunet queues up news
++     # at grade `d', which is lower than `Z'.
++     call-timegrade Z Wk0755-2305,Su1655-2305
++
++     # The phone number.
++     phone 7389449
++
++     # uunet tends to be slow, so we increase the timeout
++     chat-timeout 120
++
++     # We are using a preconfigured Telebit 2500.
++     port type modem
++     port device /dev/ttyd0
++     port speed 19200
++     port carrier true
++     port dialer chat "" ATZ\r\d\c OK ATDT\D CONNECT
++     port dialer chat-fail BUSY
++     port dialer chat-fail NO\sCARRIER
++     port dialer complete \d\d+++\d\dATH\r\c
++     port dialer abort \d\d+++\d\dATH\r\c
++
++     # Increase the timeout and the number of retries.
++     protocol-parameter g timeout 20
++     protocol-parameter g retries 10
++
++\x1f
++File: uucp.info,  Node: Gateway Example,  Prev: Leaf Example,  Up: Configuration Examples
++
++5.3.3 Gateway Example
++---------------------
++
++Many organizations have several local machines which are connected by
++UUCP, and a single machine which connects to the outside world.  This
++single machine is often referred to as a "gateway" machine.
++
++   For this example I will assume a fairly simple case.  It should still
++provide a good general example.  There are three machines, `elmer',
++`comton' and `bugs'.  `elmer' is the gateway machine for which I will
++show the configuration file.  `elmer' calls out to `uupsi'.  As an
++additional complication, `uupsi' knows `elmer' as `airs'; this will
++show how a machine can have one name on an internal network but a
++different name to the external world.  `elmer' has two modems.  It also
++has an TCP connection to `uupsi', but since that is supposed to be
++reserved for interactive work (it is, perhaps, only a 9600 baud SLIP
++line) it will only use it if the modems are not available.
++
++   A network this small would normally use a single `sys' file.
++However, for pedagogical purposes I will show two separate `sys' files,
++one for the local systems and one for `uupsi'.  This is done with the
++`sysfile' command in the `config' file.  Here is the `config' file.
++
++     # This is config
++     # The local sys file
++     sysfile /usr/local/lib/uucp/sys.local
++     # The remote sys file
++     sysfile /usr/local/lib/uucp/sys.remote
++
++   Using the defaults feature of the `sys' file can greatly simplify
++the listing of local systems.  Here is `sys.local'.  Note that this
++assumes that the local systems are trusted; they are permited to request
++any world readable file and to write files into any world writable
++directory.
++
++     # This is sys.local
++     # Get the login name and password to use from the call-out file
++     call-login *
++     call-password *
++
++     # The systems must use a particular login
++     called-login Ulocal
++
++     # Permit sending any world readable file
++     local-send /
++     remote-send /
++
++     # Permit receiving into any world writable directory
++     local-receive /
++     remote-receive /
++
++     # Call at any time
++     time any
++
++     # Use port1, then port2
++     port port1
++
++     alternate
++
++     port port2
++
++     # Now define the systems themselves.  Because of all the defaults we
++     # used, there is very little to specify for the systems themselves.
++
++     system comton
++     phone 5551212
++
++     system bugs
++     phone 5552424
++
++   The `sys.remote' file describes the `uupsi' connection.  The
++`myname' command is used to change the UUCP name to `airs' when talking
++to `uupsi'.
++
++     # This is sys.remote
++     # Define uupsi
++     system uupsi
++
++     # The login name and password are in the call-out file
++     call-login *
++     call-password *
++
++     # We can call out at any time
++     time any
++
++     # uupsi uses a special login name
++     called-login Uuupsi
++
++     # uuspi thinks of us as `airs'
++     myname airs
++
++     # The phone number
++     phone 5554848
++
++     # We use port2 first, then port1, then TCP
++
++     port port2
++
++     alternate
++
++     port port1
++
++     alternate
++
++     # We don't bother to make a special entry in the port file for TCP, we
++     # just describe the entire port right here.  We use a special chat
++     # script over TCP because the usual one confuses some TCP servers.
++     port type TCP
++     address uu.psi.com
++     chat ogin: \L word: \P
++
++   The ports are defined in the file `port' (*note port File::).  For
++this example they are both connected to the same type of 2400 baud
++Hayes-compatible modem.
++
++     # This is port
++
++     port port1
++     type modem
++     device /dev/ttyd0
++     dialer hayes
++     speed 2400
++
++     port port2
++     type modem
++     device /dev/ttyd1
++     dialer hayes
++     speed 2400
++
++   Dialers are described in the `dial' file (*note dial File::).
++
++     # This is dial
++
++     dialer hayes
++
++     # The chat script used to dial the phone.  \D is the phone number.
++     chat "" ATZ\r\d\c OK ATDT\D CONNECT
++
++     # If we get BUSY or NO CARRIER we abort the dial immediately
++     chat-fail BUSY
++     chat-fail NO\sCARRIER
++
++     # When the call is over we make sure we hangup the modem.
++     complete \d\d+++\d\dATH\r\c
++     abort \d\d+++\d\dATH\r\c
++
++\x1f
++File: uucp.info,  Node: Time Strings,  Next: Chat Scripts,  Prev: Configuration Examples,  Up: Configuration Files
++
++5.4 Time Strings
++================
++
++Several commands use time strings to specify a range of times.  This
++section describes how to write time strings.
++
++   A time string may be a list of simple time strings separated with a
++vertical bar `|' or a comma `,'.
++
++   Each simple time string must begin with `Su', `Mo', `Tu', `We',
++`Th', `Fr', or `Sa', or `Wk' for any weekday, or `Any' for any day.
++
++   Following the day may be a range of hours separated with a hyphen
++using 24 hour time.  The range of hours may cross 0; for example
++`2300-0700' means any time except 7 AM to 11 PM.  If no time is given,
++calls may be made at any time on the specified day(s).
++
++   The time string may also be the single word `Never', which does not
++match any time.  The time string may also be a single word with a name
++defined in a previous `timetable' command (*note Miscellaneous
++(config)::).
++
++   Here are a few sample time strings with an explanation of what they
++mean.
++
++`Wk2305-0855,Sa,Su2305-1655'
++     This means weekdays before 8:55 AM or after 11:05 PM, any time
++     Saturday, or Sunday before 4:55 PM or after 11:05 PM.  These are
++     approximately the times during which night rates apply to phone
++     calls in the U.S.A.  Note that this time string uses, for example,
++     `2305' rather than `2300'; this will ensure a cheap rate phone
++     call even if the computer clock is running up to five minutes
++     ahead of the real time.
++
++`Wk0905-2255,Su1705-2255'
++     This means weekdays from 9:05 AM to 10:55 PM, or Sunday from 5:05
++     PM to 10:55 PM.  This is approximately the opposite of the
++     previous example.
++
++`Any'
++     This means any day.  Since no time is specified, it means any time
++     on any day.
++
++
++\x1f
++File: uucp.info,  Node: Chat Scripts,  Next: config File,  Prev: Time Strings,  Up: Configuration Files
++
++5.5 Chat Scripts
++================
++
++Chat scripts are used in several different places, such as dialing out
++on modems or logging in to remote systems.  Chat scripts are made up of
++pairs of strings.  The program waits until it sees the first string,
++known as the "expect" string, and then sends out the second string, the
++"send" string.
++
++   Each chat script is defined using a set of commands.  These commands
++always end in a string beginning with `chat', but may start with
++different strings.  For example, in the `sys' file there is one set of
++commands beginning with `chat' and another set beginning with
++`called-chat'.  The prefixes are only used to disambiguate different
++types of chat scripts, and this section ignores the prefixes when
++describing the commands.
++
++`chat STRINGS'
++     Specify a chat script.  The arguments to the `chat' command are
++     pairs of strings separated by whitespace.  The first string of
++     each pair is an expect string, the second is a send string.  The
++     program will wait for the expect string to appear; when it does,
++     the program will send the send string.  If the expect string does
++     not appear within a certain number of seconds (as set by the
++     `chat-timeout' command), the chat script fails and, typically, the
++     call is aborted.  If the final expect string is seen (and the
++     optional final send string has been sent), the chat script is
++     successful.
++
++     An expect string may contain additional subsend and subexpect
++     strings, separated by hyphens.  If the expect string is not seen,
++     the subsend string is sent and the chat script continues by
++     waiting for the subexpect string.  This means that a hyphen may
++     not appear in an expect string; on an ASCII system, use `\055'
++     instead.
++
++     An expect string may simply be `""', meaning to skip the expect
++     phase.  Otherwise, the following escape characters may appear in
++     expect strings:
++
++    `\b'
++          a backspace character
++
++    `\n'
++          a newline or line feed character
++
++    `\N'
++          a null character (for HDB compatibility)
++
++    `\r'
++          a carriage return character
++
++    `\s'
++          a space character
++
++    `\t'
++          a tab character
++
++    `\\'
++          a backslash character
++
++    `\DDD'
++          character DDD, where DDD are up to three octal digits
++
++    `\xDDD'
++          character DDD, where DDD are hexadecimal digits.
++
++     As in C, there may be up to three octal digits following a
++     backslash, but the hexadecimal escape sequence continues as far as
++     possible.  To follow a hexadecimal escape sequence with a hex
++     digit, interpose a send string of `""'.
++
++     A chat script expect string may also specify a timeout.  This is
++     done by using the escape sequence `\WSECONDS'.  This escape
++     sequence may only appear at the very end of the expect string.  It
++     temporarily overrides the timeout set by `chat-timeout' (described
++     below) only for the expect string to which it is attached.
++
++     A send string may simply be `""' to skip the send phase.
++     Otherwise, all of the escape characters legal for expect strings
++     may be used, and the following escape characters are also
++     permitted:
++
++    `EOT'
++          send an end of transmission character (`^D')
++
++    `BREAK'
++          send a break character (may not work on all systems)
++
++    `\c'
++          suppress trailing carriage return at end of send string
++
++    `\d'
++          delay sending for 1 or 2 seconds
++
++    `\e'
++          disable echo checking
++
++    `\E'
++          enable echo checking
++
++    `\K'
++          same as `BREAK'
++
++    `\p'
++          pause sending for a fraction of a second
++
++    `\M'
++          do not require carrier signal
++
++    `\m'
++          require carrier signal (fail if not present)
++
++     Some specific types of chat scripts also define additional escape
++     sequences that may appear in the send string.  For example, the
++     login chat script defines `\L' and `\P' to send the login name and
++     password, respectively.
++
++     A carriage return will be sent at the end of each send string,
++     unless the `\c' escape sequence appears in the string.  Note that
++     some UUCP packages use `\b' for break, but here it means backspace.
++
++     Echo checking means that after writing each character the program
++     will wait until the character is echoed.  Echo checking must be
++     turned on separately for each send string for which it is desired;
++     it will be turned on for characters following `\E' and turned off
++     for characters following `\e'.
++
++     When used with a port which does not support the carrier signal,
++     as set by the `carrier' command in the port file, `\M' and `\m'
++     are ignored.  Similarly, when used in a dialer chat script with a
++     dialer which does not support the carrier signal, as set by the
++     `carrier' command in the dial file, `\M' and `\m' are ignored.
++
++`chat-timeout NUMBER'
++     The number of seconds to wait for an expect string in the chat
++     script, before timing out and sending the next subsend, or failing
++     the chat script entirely.  The default value is 10 for a login
++     chat or 60 for any other type of chat.
++
++`chat-fail STRING'
++     If the STRING is seen at any time during a chat script, the chat
++     script is aborted.  The string may not contain any whitespace
++     characters: escape sequences must be used for them.  Multiple
++     `chat-fail' commands may appear in a single chat script.  The
++     default is to have none.
++
++     This permits a chat script to be quickly aborted if an error
++     string is seen.  For example, a script used to dial out on a modem
++     might use the command `chat-fail BUSY' to stop the chat script
++     immediately if the string `BUSY' was seen.
++
++     The `chat-fail' strings are considered in the order they are
++     listed, so if one string is a suffix of another the longer one
++     should be listed first.  This affects the error message which will
++     be logged.  Of course, if one string is contained within another,
++     but is not a suffix, the smaller string will always be found
++     before the larger string could match.
++
++`chat-seven-bit BOOLEAN'
++     If the argument is true, all incoming characters are stripped to
++     seven bits when being compared to the expect string.  Otherwise
++     all eight bits are used in the comparison.  The default is true,
++     because some Unix systems generate parity bits during the login
++     prompt which must be ignored while running a chat script.  This
++     has no effect on any `chat-program', which must ignore parity by
++     itself if necessary.
++
++`chat-program STRINGS'
++     Specify a program to run before executing the chat script.  This
++     program could run its own version of a chat script, or it could do
++     whatever it wants.  If both `chat-program' and `chat' are
++     specified, the program is executed first followed by the chat
++     script.
++
++     The first argument to the `chat-program' command is the program
++     name to run.  The remaining arguments are passed to the program.
++     The following escape sequences are recognized in the arguments:
++
++    `\Y'
++          port device name
++
++    `\S'
++          port speed
++
++    `\\'
++          backslash
++
++     Some specific uses of `chat-program' define additional escape
++     sequences.
++
++     Arguments other than escape sequences are passed exactly as they
++     appear in the configuration file, except that sequences of
++     whitespace are compressed to a single space character (this
++     exception may be removed in the future).
++
++     If the `chat-program' command is not used, no program is run.
++
++     On Unix, the standard input and standard output of the program
++     will be attached to the port in use.  Anything the program writes
++     to standard error will be written to the UUCP log file.  No other
++     file descriptors will be open.  If the program does not exit with
++     a status of 0, it will be assumed to have failed.  This means that
++     the dialing programs used by some versions of HDB may not be used
++     directly, but you may be able to run them via the `dialHDB'
++     program in the `contrib' directory.
++
++     The program will be run as the `uucp' user, and the environment
++     will be that of the process that started `uucico', so care must be
++     taken to maintain security.
++
++     No search path is used to find the program; a full file name must
++     be given.  If the program is an executable shell script, it will
++     be passed to `/bin/sh' even on systems which are unable to execute
++     shell scripts.
++
++
++   Here is a simple example of a chat script that might be used to
++reset a Hayes compatible modem.
++
++     chat "" ATZ OK-ATZ-OK
++
++   The first expect string is `""', so it is ignored.  The chat script
++then sends `ATZ'.  If the modem responds with `OK', the chat script
++finishes.  If 60 seconds (the default timeout) pass before seeing `OK',
++the chat script sends another `ATZ'.  If it then sees `OK', the chat
++script succeeds.  Otherwise, the chat script fails.
++
++   For a more complex chat script example, see *note Logging In::.
++
++\x1f
++File: uucp.info,  Node: config File,  Next: sys File,  Prev: Chat Scripts,  Up: Configuration Files
++
++5.6 The Main Configuration File
++===============================
++
++The main configuration file is named `config'.
++
++   Since all the values that may be specified in the main configuration
++file also have defaults, there need not be a main configuration file at
++all.
++
++   Each command in `config' may have a program prefix, which is a
++separate word appearing at the beginning of the line.  The currently
++supported prefixes are `uucp' and `cu'.  Any command prefixed by `uucp'
++will not be read by the `cu' program.  Any command prefixed by `cu'
++will only be read by the `cu' program.  For example, to use a list of
++systems known only to `cu', list them in a separate file `FILE' and put
++`cu sysfile `FILE'' in `config'.
++
++* Menu:
++
++* Miscellaneous (config)::      Miscellaneous config File Commands
++* Configuration File Names::    Using Different Configuration Files
++* Log File Names::              Using Different Log Files
++* Debugging Levels::            Debugging Levels
++
++\x1f
++File: uucp.info,  Node: Miscellaneous (config),  Next: Configuration File Names,  Prev: config File,  Up: config File
++
++5.6.1 Miscellaneous config File Commands
++----------------------------------------
++
++`nodename STRING'
++`hostname STRING'
++`uuname STRING'
++     These keywords are equivalent.  They specify the UUCP name of the
++     local host.  If there is no configuration file, an appropriate
++     system function will be used to get the host name, if possible.
++
++`spool STRING'
++     Specify the spool directory.  The default is from `policy.h'.  This
++     is where UUCP files are queued.  Status files and various sorts of
++     temporary files are also stored in this directory and
++     subdirectories of it.
++
++`pubdir STRING'
++     Specify the public directory.  The default is from `policy.h'.
++     When a file is named using a leading `~/', it is taken from or to
++     the public directory.  Each system may use a separate public
++     directory by using the `pubdir' command in the system
++     configuration file; see *note Miscellaneous (sys)::.
++
++`lockdir STRING'
++     Specify the directory to place lock files in.  The default is from
++     `policy.h'; see the information in that file.  Normally the lock
++     directory should be set correctly in `policy.h', and not changed
++     here.  However, changing the lock directory is sometimes useful for
++     testing purposes.  This only affects lock files for devices and
++     systems; it does not affect certain internal lock files which are
++     stored in the spool directory (*note Spool Lock Files::).
++
++`unknown STRING ...'
++     The STRING and subsequent arguments are treated as though they
++     appeared in the system file (*note sys File::).  They are used to
++     apply to any unknown systems that may call in, probably to set
++     file transfer permissions and the like.  If the `unknown' command
++     is not used, unknown systems are not permitted to call in.
++
++`strip-login BOOLEAN'
++     If the argument is true, then, when `uucico' is doing its own
++     login prompting with the `-e', `-l', or `-w' switches, it will
++     strip the parity bit when it reads the login name and password.
++     Otherwise all eight bits will be used when checking the strings
++     against the UUCP password file.  The default is true, since some
++     other UUCP packages send parity bits with the login name and
++     password, and few systems use eight bit characters in the password
++     file.
++
++`strip-proto BOOLEAN'
++     If the argument is true, then `uucico' will strip the parity bit
++     from incoming UUCP protocol commands.  Otherwise all eight bits
++     will be used.  This only applies to commands which are not
++     encapsulated in a link layer protocol.  The default is true, which
++     should always be correct unless your UUCP system names use eight
++     bit characters.
++
++`max-uuxqts NUMBER'
++     Specify the maximum number of `uuxqt' processes which may run at
++     the same time.  Having several `uuxqt' processes running at once
++     can significantly slow down a system, but, since `uuxqt' is
++     automatically started by `uucico', it can happen quite easily.  The
++     default for `max-uuxqts' is 0, which means that there is no limit.
++     If HDB configuration files are being read and the code was compiled
++     without `HAVE_TAYLOR_CONFIG', then, if the file `Maxuuxqts' in the
++     configuration directory contains a readable number, it will be used
++     as the value for `max-uuxqts'.
++
++`run-uuxqt STRING or NUMBER'
++     Specify when `uuxqt' should be run by `uucico'.  This may be a
++     positive number, in which case `uucico' will start a `uuxqt'
++     process whenever it receives the given number of execution files
++     from the remote system, and, if necessary, at the end of the call.
++     The argument may also be one of the strings `once', `percall', or
++     `never'.  The string `once' means that `uucico' will start `uuxqt'
++     once at the end of execution.  The string `percall' means that
++     `uucico' will start `uuxqt' once per call that it makes (this is
++     only different from `once' when `uucico' is invoked in a way that
++     causes it to make multiple calls, such as when the `-r1' option is
++     used without the `-s' option).  The string `never' means that
++     `uucico' will never start `uuxqt', in which case `uuxqt' should be
++     periodically run via some other mechanism.  The default depends
++     upon which type of configuration files are being used; if
++     `HAVE_TAYLOR_CONFIG' is used the default is `once', otherwise if
++     `HAVE_HDB_CONFIG' is used the default is `percall', and otherwise,
++     for `HAVE_V2_CONFIG', the default is `10'.
++
++`timetable STRING STRING'
++     The `timetable' defines a timetable that may be used in
++     subsequently appearing time strings; see *note Time Strings::.
++     The first string names the timetable entry; the second is a time
++     string.
++
++     The following `timetable' commands are predefined.  The NonPeak
++     timetable is included for compatibility.  It originally described
++     the offpeak hours of Tymnet and Telenet, but both have since
++     changed their schedules.
++
++          timetable Evening Wk1705-0755,Sa,Su
++          timetable Night Wk2305-0755,Sa,Su2305-1655
++          timetable NonPeak Wk1805-0655,Sa,Su
++
++     If this command does not appear, then, obviously, no additional
++     timetables will be defined.
++
++`v2-files BOOLEAN'
++     If the code was compiled to be able to read V2 configuration
++     files, a false argument to this command will prevent them from
++     being read.  This can be useful while testing.  The default is
++     true.
++
++`hdb-files BOOLEAN'
++     If the code was compiled to be able to read HDB configuration
++     files, a false argument to this command will prevent them from
++     being read.  This can be useful while testing.  The default is
++     true.
++
++
++\x1f
++File: uucp.info,  Node: Configuration File Names,  Next: Log File Names,  Prev: Miscellaneous (config),  Up: config File
++
++5.6.2 Configuration File Names
++------------------------------
++
++`sysfile STRINGS'
++     Specify the system file(s).  The default is the file `sys' in the
++     directory NEWCONFIGDIR.  These files hold information about other
++     systems with which this system communicates; see *note sys File::.
++     Multiple system files may be given on the line, and the `sysfile'
++     command may be repeated; each system file has its own set of
++     defaults.
++
++`portfile STRINGS'
++     Specify the port file(s).  The default is the file `port' in the
++     directory NEWCONFIGDIR.  These files describe ports which are used
++     to call other systems and accept calls from other systems; see
++     *note port File::.  No port files need be named at all.  Multiple
++     port files may be given on the line, and the `portfile' command
++     may be repeated.
++
++`dialfile STRINGS'
++     Specify the dial file(s).  The default is the file `dial' in the
++     directory NEWCONFIGDIR.  These files describe dialing devices
++     (modems); see *note dial File::.  No dial files need be named at
++     all.  Multiple dial files may be given on the line, and the
++     `dialfile' command may be repeated.
++
++`dialcodefile STRINGS'
++     Specify the dialcode file(s).  The default is the file `dialcode'
++     in the directory NEWCONFIGDIR.  These files specify dialcodes that
++     may be used when sending phone numbers to a modem.  This permits
++     using the same set of phone numbers in different area-codes or
++     with different phone systems, by using dialcodes to specify the
++     calling sequence.  When a phone number goes through dialcode
++     translation, the leading alphabetic characters are stripped off.
++     The dialcode files are read line by line, just like any other
++     configuration file, and when a line is found whose first word is
++     the same as the leading characters from the phone number, the
++     second word on the line (which would normally consist of numbers)
++     replaces the dialcode in the phone number.  No dialcode file need
++     be used.  Multiple dialcode files may be specified on the line,
++     and the `dialcodefile' command may be repeated; all the dialcode
++     files will be read in turn until a dialcode is located.
++
++`callfile STRINGS'
++     Specify the call out login name and password file(s).  The default
++     is the file `call' in the directory NEWCONFIGDIR.  If the call out
++     login name or password for a system are given as `*' (*note
++     Logging In::), these files are read to get the real login name or
++     password.  Each line in the file(s) has three words: the system
++     name, the login name, and the password.  The login name and
++     password may contain escape sequences like those in a chat script
++     expect string (*note Chat Scripts::).  This file is only used when
++     placing calls to remote systems; the password file described under
++     `passwdfile' below is used for incoming calls.  The intention of
++     the call out file is to permit the system file to be publically
++     readable; the call out files must obviously be kept secure.  These
++     files need not be used.  Multiple call out files may be specified
++     on the line, and the `callfile' command may be repeated; all the
++     files will be read in turn until the system is found.
++
++`passwdfile STRINGS'
++     Specify the password file(s) to use for login names when `uucico'
++     is doing its own login prompting, which it does when given the
++     `-e', `-l' or `-w' switches.  The default is the file `passwd' in
++     the directory NEWCONFIGDIR.  Each line in the file(s) has two
++     words: the login name and the password (e.g., `Ufoo foopas').
++     They may contain escape sequences like those in a chat script
++     expect string (*note Chat Scripts::).  The login name is accepted
++     before the system name is known, so these are independent of which
++     system is calling in; a particular login may be required for a
++     system by using the `called-login' command in the system file
++     (*note Accepting a Call::).  These password files are optional,
++     although one must exist if `uucico' is to present its own login
++     prompts.
++
++     As a special exception, a colon may be used to separate the login
++     name from the password, and a colon may be used to terminate the
++     password.  This means that the login name and password may not
++     contain a colon.  This feature, in conjunction with the
++     `HAVE_ENCRYPTED_PASSWORDS' macro in `policy.h', permits using a
++     standard Unix `/etc/passwd' as a UUCP password file, providing the
++     same set of login names and passwords for both `getty' and
++     `uucico'.
++
++     Multiple password files may be specified on the line, and the
++     `passwdfile' command may be repeated; all the files will be read in
++     turn until the login name is found.
++
++
++\x1f
++File: uucp.info,  Node: Log File Names,  Next: Debugging Levels,  Prev: Configuration File Names,  Up: config File
++
++5.6.3 Log File Names
++--------------------
++
++`logfile STRING'
++     Name the log file.  The default is from `policy.h'.  Logging
++     information is written to this file.  If `HAVE_HDB_LOGGING' is
++     defined in `policy.h', then by default a separate log file is used
++     for each system; using this command to name a log file will cause
++     all the systems to use it.
++
++`statfile STRING'
++     Name the statistics file.  The default is from `policy.h'.
++     Statistical information about file transfers is written to this
++     file.
++
++`debugfile STRING'
++     Name the file to which all debugging information is written.  The
++     default is from `policy.h'.  This command is only effective if the
++     code has been compiled to include debugging (this is controlled by
++     the `DEBUG' macro in `policy.h').  If debugging is on, messages
++     written to the log file are also written to the debugging file to
++     make it easier to keep the order of actions straight.  The
++     debugging file is different from the log file because information
++     such as passwords can appear in it, so it must be not be
++     publically readable.
++
++
++\x1f
++File: uucp.info,  Node: Debugging Levels,  Prev: Log File Names,  Up: config File
++
++5.6.4 Debugging Levels
++----------------------
++
++`debug STRING ...'
++     Set the debugging level.  This command is only effective if the
++     code has been compiled to include debugging.  The default is to
++     have no debugging.  The arguments are strings which name the types
++     of debugging to be turned on.  The following types of debugging
++     are defined:
++
++    `abnormal'
++          Output debugging messages for abnormal situations, such as
++          recoverable errors.
++
++    `chat'
++          Output debugging messages for chat scripts.
++
++    `handshake'
++          Output debugging messages for the initial handshake.
++
++    `uucp-proto'
++          Output debugging messages for the UUCP session protocol.
++
++    `proto'
++          Output debugging messages for the individual link protocols.
++
++    `port'
++          Output debugging messages for actions on the communication
++          port.
++
++    `config'
++          Output debugging messages while reading the configuration
++          files.
++
++    `spooldir'
++          Output debugging messages for actions in the spool directory.
++
++    `execute'
++          Output debugging messages whenever another program is
++          executed.
++
++    `incoming'
++          List all incoming data in the debugging file.
++
++    `outgoing'
++          List all outgoing data in the debugging file.
++
++    `all'
++          All of the above.
++
++     The debugging level may also be specified as a number.  A 1 will
++     set `chat' debugging, a 2 will set both `chat' and `handshake'
++     debugging, and so on down the possibilities.  Currently an 11 will
++     turn on all possible debugging, since there are 11 types of
++     debugging messages listed above; more debugging types may be added
++     in the future.  The `debug' command may be used several times in
++     the configuration file; every debugging type named will be turned
++     on.  When running any of the programs, the `-x' switch (actually,
++     for `uulog' it's the `-X' switch) may be used to turn on
++     debugging.  The argument to the `-x' switch is one of the strings
++     listed above, or a number as described above, or a comma separated
++     list of strings (e.g., `-x chat,handshake').  The `-x' switch may
++     also appear several times on the command line, in which case all
++     named debugging types will be turned on.  The `-x' debugging is in
++     addition to any debugging specified by the `debug' command; there
++     is no way to cancel debugging information.  The debugging level
++     may also be set specifically for calls to or from a specific
++     system with the `debug' command in the system file (*note
++     Miscellaneous (sys)::).
++
++     The debugging messages are somewhat idiosyncratic; it may be
++     necessary to refer to the source code for additional information
++     in some cases.
++
++
++\x1f
++File: uucp.info,  Node: sys File,  Next: port File,  Prev: config File,  Up: Configuration Files
++
++5.7 The System Configuration File
++=================================
++
++By default there is a single system configuration, named `sys' in the
++directory NEWCONFIGDIR.  This may be overridden by the `sysfile'
++command in the main configuration file; see *note Configuration File
++Names::.
++
++   These files describe all remote systems known to the UUCP package.
++
++* Menu:
++
++* Defaults and Alternates::     Using Defaults and Alternates
++* Naming the System::           Naming the System
++* Calling Out::                 Calling Out
++* Accepting a Call::            Accepting a Call
++* Protocol Selection::          Protocol Selection
++* File Transfer Control::       File Transfer Control
++* Miscellaneous (sys)::         Miscellaneous sys File Commands
++* Default sys File Values::     Default Values
++
++\x1f
++File: uucp.info,  Node: Defaults and Alternates,  Next: Naming the System,  Prev: sys File,  Up: sys File
++
++5.7.1 Defaults and Alternates
++-----------------------------
++
++The first set of commands in the file, up to the first `system'
++command, specify defaults to be used for all systems in that file.  Each
++`sys' file uses a different set of defaults.
++
++   Subsequently, each set of commands from `system' up to the next
++`system' command describe a particular system.  Default values may be
++overridden for specific systems.
++
++   Each system may then have a series of alternate choices to use when
++calling out or calling in.  The first set of commands for a particular
++system, up to the first `alternate' command, provide the first choice.
++Subsequently, each set of commands from `alternate' up to the next
++`alternate' command describe an alternate choice for calling out or
++calling in.
++
++   When a system is called, the commands before the first `alternate'
++are used to select a phone number, port, and so forth; if the call fails
++for some reason, the commands between the first `alternate' and the
++second are used, and so forth.  Well, not quite.  Actually, each
++succeeding alternate will only be used if it is different in some
++relevant way (different phone number, different chat script, etc.).  If
++you want to force the same alternate to be used again (to retry a phone
++call more than once, for example), enter the phone number (or any other
++relevant field) again to make it appear different.
++
++   The alternates can also be used to give different permissions to an
++incoming call based on the login name.  This will only be done if the
++first set of commands, before the first `alternate' command, uses the
++`called-login' command.  The list of alternates will be searched, and
++the first alternate with a matching `called-login' command will be
++used.  If no alternates match, the call will be rejected.
++
++   The `alternate' command may also be used in the file-wide defaults
++(the set of commands before the first `system' command).  This might be
++used to specify a list of ports which are available for all systems
++(for an example of this, see *note Gateway Example::) or to specify
++permissions based on the login name used by the remote system when it
++calls in.  The first alternate for each system will default to the
++first alternate for the file-wide defaults (as modified by the commands
++used before the first `alternate' command for this system), the second
++alternate for each system to the second alternate for the file-wide
++defaults (as modified the same way), and so forth.  If a system
++specifies more alternates than the file-wide defaults, the trailing
++ones will default to the last file-wide default alternate.  If a system
++specifies fewer alternates than the file-wide defaults, the trailing
++file-wide default alternates will be used unmodified.  The
++`default-alternates' command may be used to modify this behaviour.
++
++   This can all get rather confusing, although it's easier to use than
++to describe concisely; the `uuchk' program may be used to ensure that
++you are getting what you want.
++
++\x1f
++File: uucp.info,  Node: Naming the System,  Next: Calling Out,  Prev: Defaults and Alternates,  Up: sys File
++
++5.7.2 Naming the System
++-----------------------
++
++`system STRING'
++     Specify the remote system name.  Subsequent commands up to the next
++     `system' command refer to this system.
++
++`alternate [STRING]'
++     Start an alternate set of commands (*note Defaults and
++     Alternates::).  An optional argument may be used to name the
++     alternate.  This name will be recorded in the log file if the
++     alternate is used to call the system.  There is no way to name the
++     first alternate (the commands before the first `alternate'
++     command).
++
++`default-alternates BOOLEAN'
++     If the argument is false, any remaining default alternates (from
++     the defaults specified at the top of the current system file) will
++     not be used.  The default is true.
++
++`alias STRING'
++     Specify an alias for the current system.  The alias may be used by
++     local `uucp' and `uux' commands, as well as by the remote system
++     (which can be convenient if a remote system changes its name).
++     The default is to have no aliases.
++
++`myname STRING'
++     Specifies a different system name to use when calling the remote
++     system.  Also, if `called-login' is used and is not `ANY', then,
++     when a system logs in with that login name, STRING is used as the
++     local system name.  Because the local system name must be
++     determined before the remote system has identified itself, using
++     `myname' and `called-login' together for any system will set the
++     local name for that login; this means that each locally used
++     system name must have a unique login name associated with it.
++     This allows a system to have different names for an external and
++     an internal network.  The default is to not use a special local
++     name.
++
++
++\x1f
++File: uucp.info,  Node: Calling Out,  Next: Accepting a Call,  Prev: Naming the System,  Up: sys File
++
++5.7.3 Calling Out
++-----------------
++
++This section describes commands used when placing a call to another
++system.
++
++* Menu:
++
++* When to Call::                When to Call
++* Placing the Call::            Placing the Call
++* Logging In::                  Logging In
++
++\x1f
++File: uucp.info,  Node: When to Call,  Next: Placing the Call,  Prev: Calling Out,  Up: Calling Out
++
++5.7.3.1 When to Call
++....................
++
++`time STRING [NUMBER]'
++     Specify when the system may be called.  The first argument is a
++     time string; see *note Time Strings::.  The optional second
++     argument specifies a retry time in minutes.  If a call made during
++     a time that matches the time string fails, no more calls are
++     permitted until the retry time has passed.  By default an
++     exponentially increasing retry time is used: after each failure
++     the next retry period is longer.  A retry time specified in the
++     `time' command is always a fixed amount of time.
++
++     The `time' command may appear multiple times in a single alternate,
++     in which case if any time string matches the system may be called.
++     When the `time' command is used for a particular system, any `time'
++     or `timegrade' commands that appeared in the system defaults are
++     ignored.
++
++     The default time string is `Never'.
++
++`timegrade CHARACTER STRING [NUMBER]'
++     The CHARACTER specifies a grade.  It must be a single letter or
++     digit.  The STRING is a time string (*note Time Strings::).  All
++     jobs of grade CHARACTER or higher (where `0' > `9' > `A' > `Z' >
++     `a' > `z') may be run at the specified time.  An ordinary `time'
++     command is equivalent to using `timegrade' with a grade of `z',
++     permitting all jobs.  If there are no jobs of a sufficiently high
++     grade according to the time string, the system will not be called.
++     Giving the `-s' switch to `uucico' to force it to call a system
++     causes it to assume there is a job of grade `0' waiting to be run.
++
++     The optional third argument specifies a retry time in minutes.
++     See the `time' command, above, for more details.
++
++     Note that the `timegrade' command serves two purposes: 1) if there
++     is no job of sufficiently high grade the system will not be
++     called, and 2) if the system is called anyway (because the `-s'
++     switch was given to `uucico') only jobs of sufficiently high grade
++     will be transferred.  However, if the other system calls in, the
++     `timegrade' commands are ignored, and jobs of any grade may be
++     transferred (but see `call-timegrade' and `called-timegrade',
++     below).  Also, the `timegrade' command will not prevent the other
++     system from transferring any job it chooses, regardless of who
++     placed the call.
++
++     The `timegrade' command may appear multiple times without using
++     `alternate'.  When the `timegrade' command is used for a
++     particular system, any `time' or `timegrade' commands that
++     appeared in the system defaults are ignored.
++
++     If this command does not appear, there are no restrictions on what
++     grade of work may be done at what time.
++
++`max-retries NUMBER'
++     Gives the maximum number of times this system may be retried.  If
++     this many calls to the system fail, it will be called at most once
++     a day whatever the retry time is.  The default is 26.
++
++`success-wait NUMBER'
++     A retry time, in seconds, which applies after a successful call.
++     This can be used to put a limit on how frequently the system is
++     called.  For example, an argument of 1800 means that the system
++     will not be called more than once every half hour.  The default is
++     0, which means that there is no limit.
++
++`call-timegrade CHARACTER STRING'
++     The CHARACTER is a single character `A' to `Z', `a' to `z', or `0'
++     to `9' and specifies a grade.  The STRING is a time string (*note
++     Time Strings::).  If a call is placed to the other system during a
++     time which matches the time string, the remote system will be
++     requested to only run jobs of grade CHARACTER or higher.
++     Unfortunately, there is no way to guarantee that the other system
++     will obey the request (this UUCP package will, but there are
++     others which will not); moreover, job grades are historically
++     somewhat arbitrary, so specifying a grade will only be meaningful
++     if the other system cooperates in assigning grades.  This grade
++     restriction only applies when the other system is called, not when
++     the other system calls in.
++
++     The `call-timegrade' command may appear multiple times without
++     using `alternate'.  If this command does not appear, or if none of
++     the time strings match, the remote system will be allowed to send
++     whatever grades of work it chooses.
++
++`called-timegrade CHARACTER STRING'
++     The CHARACTER is a single character `A' to `Z', `a' to `z', or `0'
++     to `9' and specifies a grade.  The STRING is a time string (*note
++     Time Strings::).  If a call is received from the other system
++     during a time which matches the time string, only jobs of grade
++     CHARACTER or higher will be sent to the remote system.  This
++     allows the job grade to be set for incoming calls, overriding any
++     request made by the remote uucico.  As noted above, job grades are
++     historically somewhat arbitrary, so specifying a grade will only be
++     meaningful if the other system cooperates in assigning grades.
++     This grade restriction only applies to jobs on the local system;
++     it does not affect the jobs transferred by the remote system.
++     This grade restriction only applies when the other system calls
++     in, not when the other system is called.
++
++     The `called-timegrade' command may appear multiple times.  If this
++     command does not appear, or if none of the time strings match, any
++     grade may be sent to the remote system upon receiving a call.
++
++
++\x1f
++File: uucp.info,  Node: Placing the Call,  Next: Logging In,  Prev: When to Call,  Up: Calling Out
++
++5.7.3.2 Placing the Call
++........................
++
++`speed NUMBER'
++
++`baud NUMBER'
++     Specify the speed (the term "baud" is technically incorrect, but
++     widely understood) at which to call the system.  This will try all
++     available ports with that speed until an unlocked port is found.
++     The ports are defined in the port file.  If both `speed' and
++     `port' commands appear, both are used when selecting a port.  To
++     allow calls at more than one speed, the `alternate' command must be
++     used (*note Defaults and Alternates::).  If this command does not
++     appear, there is no default; the speed may be specified in the port
++     file, but if it is not then the natural speed of the port will be
++     used (whatever that means on the system).  Specifying an explicit
++     speed of 0 will request the natural speed of the port (whatever
++     the system sets it to), overriding any default speed from the
++     defaults at the top of the file.
++
++`port STRING'
++     Name a particular port or type of port to use when calling the
++     system.  The information for this port is obtained from the port
++     file.  If this command does not appear, there is no default; a
++     port must somehow be specified in order to call out (it may be
++     specified implicitly using the `speed' command or explicitly using
++     the next version of `port').  There may be many ports with the
++     same name; each will be tried in turn until an unlocked one is
++     found which matches the desired speed.
++
++`port STRING ...'
++     If more than one string follows the `port' command, the strings are
++     treated as a command that might appear in the port file (*note
++     port File::).  If a port is named (by using a single string
++     following `port') these commands are ignored; their purpose is to
++     permit defining the port completely in the system file rather than
++     always requiring entries in two different files.  In order to call
++     out, a port must be specified using some version of the `port'
++     command, or by using the `speed' command to select ports from the
++     port file.
++
++`phone STRING'
++`address STRING'
++     Give a phone number to call (when using a modem port) or a remote
++     host to contact (when using a TCP or TLI port).  The commands
++     `phone' and `address' are equivalent; the duplication is intended
++     to provide a mnemonic choice depending on the type of port in use.
++
++     When used with a modem port, an `=' character in the phone number
++     means to wait for a secondary dial tone (although only some modems
++     support this); a `-' character means to pause while dialing for 1
++     second (again, only some modems support this).  If the system has
++     more than one phone number, each one must appear in a different
++     alternate.  The `phone' command must appear in order to call out
++     on a modem; there is no default.
++
++     When used with a TCP port, the string names the host to contact.
++     It may be a domain name or a numeric Internet address.  If no
++     address is specified, the system name is used.
++
++     When used with a TLI port, the string is treated as though it were
++     an expect string in a chat script, allowing the use of escape
++     characters (*note Chat Scripts::).  The `dialer-sequence' command
++     in the port file may override this address (*note port File::).
++
++     When used with a port that not a modem or TCP or TLI, this command
++     is ignored.
++
++
++\x1f
++File: uucp.info,  Node: Logging In,  Prev: Placing the Call,  Up: Calling Out
++
++5.7.3.3 Logging In
++..................
++
++`chat STRINGS'
++
++`chat-timeout NUMBER'
++
++`chat-fail STRING'
++
++`chat-seven-bit BOOLEAN'
++
++`chat-program STRINGS'
++     These commands describe a chat script to use when logging on to a
++     remote system.  This login chat script is run after any chat
++     script defined in the `dial' file (*note dial File::).  Chat
++     scripts are explained in *note Chat Scripts::.
++
++     Two additional escape sequences may be used in send strings.
++
++    `\L'
++          Send the login name, as set by the `call-login' command.
++
++    `\P'
++          Send the password, as set by the `call-password' command.
++
++     Three additional escape sequences may be used with the
++     `chat-program' command.  These are `\L' and `\P', which become the
++     login name and password, respectively, and `\Z', which becomes the
++     name of the system of being called.
++
++     The default chat script is:
++
++          chat "" \r\c ogin:-BREAK-ogin:-BREAK-ogin: \L word: \P
++
++     This will send a carriage return (the `\c' suppresses the
++     additional trailing carriage return that would otherwise be sent)
++     and waits for the string `ogin:' (which would be the last part of
++     the `login:' prompt supplied by a Unix system).  If it doesn't see
++     `ogin:', it sends a break and waits for `ogin:' again.  If it
++     still doesn't see `ogin:', it sends another break and waits for
++     `ogin:' again.  If it still doesn't see `ogin:', the chat script
++     aborts and hangs up the phone.  If it does see `ogin:' at some
++     point, it sends the login name (as specified by the `call-login'
++     command) followed by a carriage return (since all send strings are
++     followed by a carriage return unless `\c' is used) and waits for
++     the string `word:' (which would be the last part of the
++     `Password:' prompt supplied by a Unix system).  If it sees
++     `word:', it sends the password and a carriage return, completing
++     the chat script.  The program will then enter the handshake phase
++     of the UUCP protocol.
++
++     This chat script will work for most systems, so you will only be
++     required to use the `call-login' and `call-password' commands.  In
++     fact, in the file-wide defaults you could set defaults of
++     `call-login *' and `call-password *'; you would then just have to
++     make an entry for each system in the call-out login file.
++
++     Some systems seem to flush input after the `login:' prompt, so they
++     may need a version of this chat script with a `\d' before the
++     `\L'.  When using UUCP over TCP, some servers will not be handle
++     the initial carriage return sent by this chat script; in this case
++     you may have to specify the simple chat script `ogin: \L word: \P'.
++
++`call-login STRING'
++     Specify the login name to send with `\L' in the chat script.  If
++     the string is `*' (e.g., `call-login *') the login name will be
++     fetched from the call out login name and password file (*note
++     Configuration File Names::).  The string may contain escape
++     sequences as though it were an expect string in a chat script
++     (*note Chat Scripts::).  There is no default.
++
++`call-password STRING'
++     Specify the password to send with `\P' in the chat script.  If the
++     string is `*' (e.g., `call-password *') the password will be
++     fetched from the call-out login name and password file (*note
++     Configuration File Names::).  The string may contain escape
++     sequences as though it were an expect string in a chat script
++     (*note Chat Scripts::).  There is no default.
++
++
++\x1f
++File: uucp.info,  Node: Accepting a Call,  Next: Protocol Selection,  Prev: Calling Out,  Up: sys File
++
++5.7.4 Accepting a Call
++----------------------
++
++`called-login STRINGS'
++     The first STRING specifies the login name that the system must use
++     when calling in.  If it is `ANY' (e.g., `called-login ANY') any
++     login name may be used; this is useful to override a file-wide
++     default and to indicate that future alternates may have different
++     login names.  Case is significant.  The default value is `ANY'.
++
++     Different alternates (*note Defaults and Alternates::) may use
++     different `called-login' commands, in which case the login name
++     will be used to select which alternate is in effect; this will
++     only work if the first alternate (before the first `alternate'
++     command) uses the `called-login' command.
++
++     Additional strings may be specified after the login name; they are
++     a list of which systems are permitted to use this login name.  If
++     this feature is used, then normally the login name will only be
++     given in a single `called-login' command.  Only systems which
++     appear on the list, or which use an explicit `called-login'
++     command, will be permitted to use that login name.  If the same
++     login name is used more than once with a list of systems, all the
++     lists are concatenated together.  This feature permits you to
++     restrict a login name to a particular set of systems without
++     requiring you to use the `called-login' command for every single
++     system; you can achieve a similar effect by using a different
++     system file for each permitted login name with an appropriate
++     `called-login' command in the file-wide defaults.
++
++`callback BOOLEAN'
++     If BOOLEAN is true, then when the remote system calls `uucico'
++     will hang up the connection and prepare to call it back.  The
++     default is false.
++
++`called-chat STRINGS'
++
++`called-chat-timeout NUMBER'
++
++`called-chat-fail STRING'
++
++`called-chat-seven-bit BOOLEAN'
++
++`called-chat-program STRINGS'
++     These commands may be used to define a chat script (*note Chat
++     Scripts::) that is run whenever the local system is called by the
++     system being defined.  The chat script defined by the `chat'
++     command (*note Logging In::), on the other hand, is used when the
++     remote system is called.  This called chat script might be used to
++     set special modem parameters that are appropriate to a particular
++     system.  It is run after protocol negotiation is complete, but
++     before the protocol has been started.  For additional escape
++     sequence which may be used besides those defined for all chat
++     scripts, see *note Logging In::.  There is no default called chat
++     script.  If the called chat script fails, the incoming call will
++     be aborted.
++
++
++\x1f
++File: uucp.info,  Node: Protocol Selection,  Next: File Transfer Control,  Prev: Accepting a Call,  Up: sys File
++
++5.7.5 Protocol Selection
++------------------------
++
++`protocol STRING'
++     Specifies which protocols to use for the other system, and in which
++     order to use them.  This would not normally be used.  For example,
++     `protocol tfg'.
++
++     The default depends on the characteristics of the port and the
++     dialer, as specified by the `seven-bit' and `reliable' commands.
++     If neither the port nor the dialer use either of these commands,
++     the default is to assume an eight-bit reliable connection.  The
++     commands `seven-bit true' or `reliable false' might be used in
++     either the port or the dialer to change this.  Each protocol has
++     particular requirements that must be met before it will be
++     considered during negotiation with the remote side.
++
++     The `t' and `e' protocols are intended for use over TCP or some
++     other communication path with end to end reliability, as they do no
++     checking of the data at all.  They will only be considered on a
++     TCP port which is both reliable and eight bit.  For technical
++     details, see *note t Protocol::, and *note e Protocol::.
++
++     The `i' protocol is a bidirectional protocol.  It requires an
++     eight-bit connection.  It will run over a half-duplex link, such as
++     Telebit modems in PEP mode, but for efficient use of such a
++     connection you must use the `half-duplex' command (*note port
++     File::).  *Note i Protocol::.
++
++     The `g' protocol is robust, but requires an eight-bit connection.
++     *Note g Protocol::.
++
++     The `G' protocol is the System V Release 4 version of the `g'
++     protocol.  *Note Big G Protocol::.
++
++     The `a' protocol is a Zmodem like protocol, contributed by Doug
++     Evans.  It requires an eight-bit connection, but unlike the `g' or
++     `i' protocol it will work if certain control characters may not be
++     transmitted.
++
++     The `j' protocol is a variant of the `i' protocol which can avoid
++     certain control characters.  The set of characters it avoids can
++     be set by a parameter.  While it technically does not require an
++     eight bit connection (it could be configured to avoid all
++     characters with the high bit set) it would be very inefficient to
++     use it over one.  It is useful over a eight-bit connection that
++     will not transmit certain control characters.  *Note j Protocol::.
++
++     The `f' protocol is intended for use with X.25 connections; it
++     checksums each file as a whole, so any error causes the entire
++     file to be retransmitted.  It requires a reliable connection, but
++     only uses seven-bit transmissions.  It is a streaming protocol,
++     so, while it can be used on a serial port, the port must be
++     completely reliable and flow controlled; many aren't.  *Note f
++     Protocol::.
++
++     The `v' protocol is the `g' protocol as used by the DOS program
++     UUPC/Extended.  It is provided only so that UUPC/Extended users
++     can use it; there is no particular reason to select it.  *Note v
++     Protocol::.
++
++     The `y' protocol is an efficient streaming protocol.  It does error
++     checking, but when it detects an error it immediately aborts the
++     connection.  This requires a reliable, flow controlled, eight-bit
++     connection.  In practice, it is only useful on a connection that is
++     nearly always error-free.  Unlike the `t' and `e' protocols, the
++     connection need not be entirely error-free, so the `y' protocol
++     can be used on a serial port.  *Note y Protocol::.
++
++     The protocols will be considered in the order shown above.  This
++     means that if neither the `seven-bit' nor the `reliable' command
++     are used, the `t' protocol will be used over a TCP connection and
++     the `i' protocol will be used over any other type of connection
++     (subject, of course, to what is supported by the remote system; it
++     may be assumed that all systems support the `g' protocol).
++
++     Note that currently specifying both `seven-bit true' and `reliable
++     false' will not match any protocol.  If this occurs through a
++     combination of port and dialer specifications, you will have to
++     use the `protocol' command for the system or no protocol will be
++     selected at all (the only reasonable choice would be `protocol f').
++
++     A protocol list may also be specified for a port (*note port
++     File::), but, if there is a list for the system, the list for the
++     port is ignored.
++
++`protocol-parameter CHARACTER STRING ...'
++     CHARACTER is a single character specifying a protocol.  The
++     remaining strings are a command specific to that protocol which
++     will be executed if that protocol is used.  A typical command is
++     something like `window 7'.  The particular commands are protocol
++     specific.
++
++     The `i' protocol supports the following commands, all of which take
++     numeric arguments:
++
++    `window'
++          The window size to request the remote system to use.  This
++          must be between 1 and 16 inclusive.  The default is 16.
++
++    `packet-size'
++          The packet size to request the remote system to use.  This
++          must be between 1 and 4095 inclusive.  The default is 1024.
++
++    `remote-packet-size'
++          If this is between 1 and 4095 inclusive, the packet size
++          requested by the remote system is ignored, and this is used
++          instead.  The default is 0, which means that the remote
++          system's request is honored.
++
++    `sync-timeout'
++          The length of time, in seconds, to wait for a SYNC packet
++          from the remote system.  SYNC packets are exchanged when the
++          protocol is started.  The default is 10.
++
++    `sync-retries'
++          The number of times to retry sending a SYNC packet before
++          giving up.  The default is 6.
++
++    `timeout'
++          The length of time, in seconds, to wait for an incoming
++          packet before sending a negative acknowledgement.  The
++          default is 10.
++
++    `retries'
++          The number of times to retry sending a packet or a negative
++          acknowledgement before giving up and closing the connection.
++          The default is 6.
++
++    `errors'
++          The maximum number of errors to permit before closing the
++          connection.  The default is 100.
++
++    `error-decay'
++          The rate at which to ignore errors.  Each time this many
++          packets are received, the error count is decreased by one, so
++          that a long connection with an occasional error will not
++          exceed the limit set by `errors'.  The default is 10.
++
++    `ack-frequency'
++          The number of packets to receive before sending an
++          acknowledgement.  The default is half the requested window
++          size, which should provide good performance in most cases.
++
++     The `g', `G' and `v' protocols support the following commands, all
++     of which take numeric arguments, except `short-packets' which
++     takes a boolean argument:
++
++    `window'
++          The window size to request the remote system to use.  This
++          must be between 1 and 7 inclusive.  The default is 7.
++
++    `packet-size'
++          The packet size to request the remote system to use.  This
++          must be a power of 2 between 32 and 4096 inclusive.  The
++          default is 64 for the `g' and `G' protocols and 1024 for the
++          `v' protocol.  Many older UUCP packages do not support packet
++          sizes larger than 64, and many others do not support packet
++          sizes larger than 128.  Some UUCP packages will even dump
++          core if a larger packet size is requested.  The packet size
++          is not a negotiation, and it may be different in each
++          direction.  If you request a packet size larger than the
++          remote system supports, you will not be able to send any
++          files.
++
++    `startup-retries'
++          The number of times to retry the initialization sequence.
++          The default is 8.
++
++    `init-retries'
++          The number of times to retry one phase of the initialization
++          sequence (there are three phases).  The default is 4.
++
++    `init-timeout'
++          The timeout in seconds for one phase of the initialization
++          sequence.  The default is 10.
++
++    `retries'
++          The number of times to retry sending either a data packet or
++          a request for the next packet.  The default is 6.
++
++    `timeout'
++          The timeout in seconds when waiting for either a data packet
++          or an acknowledgement.  The default is 10.
++
++    `garbage'
++          The number of unrecognized bytes to permit before dropping the
++          connection.  This must be larger than the packet size.  The
++          default is 10000.
++
++    `errors'
++          The number of errors (malformed packets, out of order
++          packets, bad checksums, or packets rejected by the remote
++          system) to permit before dropping the connection.  The
++          default is 100.
++
++    `error-decay'
++          The rate at which to ignore errors.  Each time this many
++          packets are received, the error count is decreased by one, so
++          that a long connection with an occasional error will not
++          exceed the limit set by `errors'.  The default is 10.
++
++    `remote-window'
++          If this is between 1 and 7 inclusive, the window size
++          requested by the remote system is ignored and this is used
++          instead.  This can be useful when dealing with some poor UUCP
++          packages.  The default is 0, which means that the remote
++          system's request is honored.
++
++    `remote-packet-size'
++          If this is between 32 and 4096 inclusive the packet size
++          requested by the remote system is ignored and this is used
++          instead.  There is probably no good reason to use this.  The
++          default is 0, which means that the remote system's request is
++          honored.
++
++    `short-packets'
++          If this is true, then the code will optimize by sending
++          shorter packets when there is less data to send.  This
++          confuses some UUCP packages, such as System V Release 4 (when
++          using the `G' protocol) and Waffle; when connecting to such a
++          package, this parameter must be set to false.  The default is
++          true for the `g' and `v' protocols and false for the `G'
++          protocol.
++
++     The `a' protocol is a Zmodem like protocol contributed by Doug
++     Evans.  It supports the following commands, all of which take
++     numeric arguments except for `escape-control', which takes a
++     boolean argument:
++
++    `timeout'
++          Number of seconds to wait for a packet to arrive.  The
++          default is 10.
++
++    `retries'
++          The number of times to retry sending a packet.  The default
++          is 10.
++
++    `startup-retries'
++          The number of times to retry sending the initialization
++          packet.  The default is 4.
++
++    `garbage'
++          The number of garbage characters to accept before closing the
++          connection.  The default is 2400.
++
++    `send-window'
++          The number of characters that may be sent before waiting for
++          an acknowledgement.  The default is 1024.
++
++    `escape-control'
++          Whether to escape control characters.  If this is true, the
++          protocol may be used over a connection which does not
++          transmit certain control characters, such as `XON' or `XOFF'.
++          The connection must still transmit eight bit characters other
++          than control characters.  The default is false.
++
++     The `j' protocol can be used over an eight bit connection that will
++     not transmit certain control characters.  It accepts the same
++     protocol parameters that the `i' protocol accepts, as well as one
++     more:
++
++    `avoid'
++          A list of characters to avoid.  This is a string which is
++          interpreted as an escape sequence (*note Chat Scripts::).
++          The protocol does not have a way to avoid printable ASCII
++          characters (byte values from 32 to 126, inclusive); only
++          ASCII control characters and eight-bit characters may be
++          avoided.  The default value is `\021\023'; these are the
++          characters `XON' and `XOFF', which many connections use for
++          flow control.  If the package is configured to use
++          `HAVE_BSD_TTY', then on some versions of Unix you may have to
++          avoid `\377' as well, due to the way some implementations of
++          the BSD terminal driver handle signals.
++
++     The `f' protocol is intended for use with error-correcting modems
++     only; it checksums each file as a whole, so any error causes the
++     entire file to be retransmitted.  It supports the following
++     commands, both of which take numeric arguments:
++
++    `timeout'
++          The timeout in seconds before giving up.  The default is 120.
++
++    `retries'
++          How many times to retry sending a file.  The default is 2.
++
++     The `t' and `e' protocols are intended for use over TCP or some
++     other communication path with end to end reliability, as they do no
++     checking of the data at all.  They both support a single command,
++     which takes a numeric argument:
++
++    `timeout'
++          The timeout in seconds before giving up.  The default is 120.
++
++     The `y' protocol is a streaming protocol contributed by Jorge Cwik.
++     It supports the following commands, both of which take numeric
++     arguments:
++
++    `timeout'
++          The timeout in seconds when waiting for a packet.  The
++          default is 60.
++
++    `packet-size'
++          The packet size to use.  The default is 1024.
++
++     The protocol parameters are reset to their default values after
++     each call.
++
++
++\x1f
++File: uucp.info,  Node: File Transfer Control,  Next: Miscellaneous (sys),  Prev: Protocol Selection,  Up: sys File
++
++5.7.6 File Transfer Control
++---------------------------
++
++`send-request BOOLEAN'
++     The BOOLEAN determines whether the remote system is permitted to
++     request files from the local system.  The default is yes.
++
++`receive-request BOOLEAN'
++     The BOOLEAN determines whether the remote system is permitted to
++     send files to the local system.  The default is yes.
++
++`request BOOLEAN'
++     A shorthand command, equivalent to specifying both `send-request
++     BOOLEAN' and `receive-request BOOLEAN'.
++
++`call-transfer BOOLEAN'
++     The BOOLEAN is checked when the local system places the call.  It
++     determines whether the local system may do file transfers queued
++     up for the remote system.  The default is yes.
++
++`called-transfer BOOLEAN'
++     The BOOLEAN is checked when the remote system calls in.  It
++     determines whether the local system may do file transfers queued
++     up for the remote system.  The default is yes.
++
++`transfer BOOLEAN'
++     A shorthand command, equivalent to specifying both `call-transfer
++     BOOLEAN' and `called-transfer BOOLEAN'.
++
++`call-local-size NUMBER STRING'
++     The STRING is a time string (*note Time Strings::).  The NUMBER is
++     the size in bytes of the largest file that should be transferred
++     at a time matching the time string, if the local system placed the
++     call and the request was made by the local system.  This command
++     may appear multiple times in a single alternate.  If this command
++     does not appear, or if none of the time strings match, there are
++     no size restrictions.
++
++     With all the size control commands, the size of a file from the
++     remote system (as opposed to a file from the local system) will
++     only be checked if the other system is running this package: other
++     UUCP packages will not understand a maximum size request, nor will
++     they provide the size of remote files.
++
++`call-remote-size NUMBER STRING'
++     Specify the size in bytes of the largest file that should be
++     transferred at a given time by remote request, when the local
++     system placed the call.  This command may appear multiple times in
++     a single alternate.  If this command does not appear, there are no
++     size restrictions.
++
++`called-local-size NUMBER STRING'
++     Specify the size in bytes of the largest file that should be
++     transferred at a given time by local request, when the remote
++     system placed the call.  This command may appear multiple times in
++     a single alternate. If this command does not appear, there are no
++     size restrictions.
++
++`called-remote-size NUMBER STRING'
++     Specify the size in bytes of the largest file that should be
++     transferred at a given time by remote request, when the remote
++     system placed the call.  This command may appear multiple times in
++     a single alternate. If this command does not appear, there are no
++     size restrictions.
++
++`local-send STRINGS'
++     Specifies that files in the directories named by the STRINGS may
++     be sent to the remote system when requested locally (using `uucp'
++     or `uux').  The directories in the list should be separated by
++     whitespace.  A `~' may be used for the public directory.  On a
++     Unix system, this is typically `/usr/spool/uucppublic'; the public
++     directory may be set with the `pubdir' command.  Here is an
++     example of `local-send':
++
++          local-send ~ /usr/spool/ftp/pub
++
++     Listing a directory allows all files within the directory and all
++     subdirectories to be sent.  Directories may be excluded by
++     preceding them with an exclamation point.  For example:
++
++          local-send /usr/ftp !/usr/ftp/private ~
++
++     means that all files in `/usr/ftp' or the public directory may be
++     sent, except those files in `/usr/ftp/private'.  The list of
++     directories is read from left to right, and the last directory to
++     apply takes effect; this means that directories should be listed
++     from top down.  The default is the root directory (i.e., any file
++     at all may be sent by local request).
++
++`remote-send STRINGS'
++     Specifies that files in the named directories may be sent to the
++     remote system when requested by the remote system.  The default is
++     `~'.
++
++`local-receive STRINGS'
++     Specifies that files may be received into the named directories
++     when requested by a local user.  The default is `~'.
++
++`remote-receive STRINGS'
++     Specifies that files may be received into the named directories
++     when requested by the remote system.  The default is `~'.  On
++     Unix, the remote system may only request that files be received
++     into directories that are writeable by the world, regardless of
++     how this is set.
++
++`forward-to STRINGS'
++     Specifies a list of systems to which files may be forwarded.  The
++     remote system may forward files through the local system on to any
++     of the systems in this list.  The string `ANY' may be used to
++     permit forwarding to any system.  The default is to not permit
++     forwarding to other systems.  Note that if the remote system is
++     permitted to execute the `uucp' command, it effectively has the
++     ability to forward to any system.
++
++`forward-from STRINGS'
++     Specifies a list of systems from which files may be forwarded.  The
++     remote system may request files via the local system from any of
++     the systems in this list.  The string `ANY' may be used to permit
++     forwarding to any system.  The default is to not permit forwarding
++     from other systems.  Note that if a remote system is permitted to
++     execute the `uucp' command, it effectively has the ability to
++     request files from any system.
++
++`forward STRINGS'
++     Equivalent to specifying both `forward-to STRINGS' and
++     `forward-from STRINGS'.  This would normally be used rather than
++     either of the more specific commands.
++
++`max-file-time NUMBER'
++     The maximum amount of time which will be sent sending any one file
++     if there are other files to send.  This will only be effective
++     when using a protocol which permits interrupting one file send to
++     send another file.  This is true of the `i' and `j' protocols.
++     The default is to have no maximum.
++
++
++\x1f
++File: uucp.info,  Node: Miscellaneous (sys),  Next: Default sys File Values,  Prev: File Transfer Control,  Up: sys File
++
++5.7.7 Miscellaneous sys File Commands
++-------------------------------------
++
++`sequence BOOLEAN'
++     If BOOLEAN is true, then conversation sequencing is automatically
++     used for the remote system, so that if somebody manages to spoof
++     as the remote system, it will be detected the next time the remote
++     system actually calls.  This is false by default.
++
++`command-path STRINGS'
++     Specifies the path (a list of whitespace separated directories) to
++     be searched to locate commands to execute.  This is only used for
++     commands requested by `uux', not for chat programs.  The default
++     is from `policy.h'.
++
++`commands STRINGS'
++     The list of commands which the remote system is permitted to
++     execute locally.  For example: `commands rnews rmail'.  If the
++     value is `ALL' (case significant), all commands may be executed.
++     The default is `rnews rmail'.
++
++`free-space NUMBER'
++     Specify the minimum amount of file system space (in bytes) to
++     leave free after receiving a file.  If the incoming file will not
++     fit, it will be rejected.  This initial rejection will only work
++     when talking to another instance of this package, since older UUCP
++     packages do not provide the file size of incoming files.  Also,
++     while a file is being received, `uucico' will periodically check
++     the amount of free space.  If it drops below the amount given by
++     the `free-space' command, the file transfer will be aborted.  The
++     default amount of space to leave free is from `policy.h'.  This
++     file space checking may not work on all systems.
++
++`pubdir STRING'
++     Specifies the public directory that is used when `~' is specifed in
++     a file transfer or a list of directories.  This essentially
++     overrides the public directory specified in the main configuration
++     file for this system only.  The default is the public directory
++     specified in the main configuration file (which defaults to a
++     value from `policy.h').
++
++`debug STRING ...'
++     Set additional debugging for calls to or from the system.  This
++     may be used to debug a connection with a specific system.  It is
++     particularly useful when debugging incoming calls, since debugging
++     information will be generated whenever the call comes in.  See the
++     `debug' command in the main configuration file (*note Debugging
++     Levels::) for more details.  The debugging information specified
++     here is in addition to that specified in the main configuration
++     file or on the command line.
++
++`max-remote-debug STRING ...'
++     When the system calls in, it may request that the debugging level
++     be set to a certain value.  The `max-remote-debug' command may be
++     used to put a limit on the debugging level which the system may
++     request, to avoid filling up the disk with debugging information.
++     Only the debugging types named in the `max-remote-debug' command
++     may be turned on by the remote system.  To prohibit any debugging,
++     use `max-remote-debug none'.
++
++
++\x1f
++File: uucp.info,  Node: Default sys File Values,  Prev: Miscellaneous (sys),  Up: sys File
++
++5.7.8 Default sys File Values
++-----------------------------
++
++The following are used as default values for all systems; they can be
++considered as appearing before the start of the file.
++
++     time Never
++     chat "" \r\c ogin:-BREAK-ogin:-BREAK-ogin: \L word: \P
++     chat-timeout 10
++     callback n
++     sequence n
++     request y
++     transfer y
++     local-send /
++     remote-send ~
++     local-receive ~
++     remove-receive ~
++     command-path [ from `policy.h' ]
++     commands rnews rmail
++     max-remote-debug abnormal,chat,handshake
++
++\x1f
++File: uucp.info,  Node: port File,  Next: dial File,  Prev: sys File,  Up: Configuration Files
++
++5.8 The Port Configuration File
++===============================
++
++The port files may be used to name and describe ports.  By default there
++is a single port file, named `port' in the directory NEWCONFIGDIR.
++This may be overridden by the `portfile' command in the main
++configuration file; see *note Configuration File Names::.
++
++   Any commands in a port file before the first `port' command specify
++defaults for all ports in the file; however, since the `type' command
++must appear before all other commands for a port, the defaults are only
++useful if all ports in the file are of the same type (this restriction
++may be lifted in a later version).  All commands after a `port' command
++up to the next `port' command then describe that port.  There are
++different types of ports; each type supports its own set of commands.
++Each command indicates which types of ports support it.  There may be
++many ports with the same name; if a system requests a port by name then
++each port with that name will be tried until an unlocked one is found.
++
++`port STRING'
++     Introduces and names a port.
++
++`type STRING'
++     Define the type of port.  The default is `modem'.  If this command
++     appears, it must immediately follow the `port' command.  The type
++     defines what commands are subsequently allowed.  Currently the
++     types are:
++
++    `modem'
++          For a modem hookup.
++
++    `stdin'
++          For a connection through standard input and standard output,
++          as when `uucico' is run as a login shell.
++
++    `direct'
++          For a direct connection to another system.
++
++    `tcp'
++          For a connection using TCP.
++
++    `tli'
++          For a connection using TLI.
++
++    `pipe'
++          For a connection through a pipe running another program.
++
++`protocol STRING'
++     Specify a list of protocols to use for this port.  This is just
++     like the corresponding command for a system (*note Protocol
++     Selection::).  A protocol list for a system takes precedence over
++     a list for a port.
++
++`protocol-parameter CHARACTER STRINGS [ any type ]'
++     The same command as the `protocol-parameter' command used for
++     systems (*note Protocol Selection::).  This one takes precedence.
++
++`seven-bit BOOLEAN [ any type ]'
++     This is only used during protocol negotiation; if the argument is
++     true, it forces the selection of a protocol which works across a
++     seven-bit link.  It does not prevent eight bit characters from
++     being transmitted.  The default is false.
++
++`reliable BOOLEAN [ any type ]'
++     This is only used during protocol negotiation; if the argument is
++     false, it forces the selection of a protocol which works across an
++     unreliable communication link.  The default is true.  It would be
++     more common to specify this for a dialer rather than a port.
++
++`half-duplex BOOLEAN [ any type ]'
++     If the argument is true, it means that the port only supports
++     half-duplex connections.  This only affects bidirectional
++     protocols, and causes them to not do bidirectional transfers.
++
++`device STRING [ modem, direct and tli only ]'
++     Names the device associated with this port.  If the device is not
++     named, the port name is taken as the device.  Device names are
++     system dependent.  On Unix, a modem or direct connection might be
++     something like `/dev/ttyd0'; a TLI port might be `/dev/inet/tcp'.
++
++`speed NUMBER [modem and direct only ]'
++
++`baud NUMBER [ modem and direct only ]'
++     The speed this port runs at.  If a system specifies a speed but no
++     port name, then all ports which match the speed will be tried in
++     order.  If the speed is not specified here and is not specified by
++     the system, the natural speed of the port will be used by default.
++
++`speed-range NUMBER NUMBER [ modem only ]'
++
++`baud-range NUMBER NUMBER [ modem only ]'
++     Specify a range of speeds this port can run at.  The first number
++     is the minimum speed, the second number is the maximum speed.
++     These numbers will be used when matching a system which specifies
++     a desired speed.  The simple `speed' (or `baud') command is still
++     used to determine the speed to run at if the system does not
++     specify a speed.  For example, the command `speed-range 300 19200'
++     means that the port will match any system which uses a speed from
++     300 to 19200 baud (and will use the speed specified by the
++     system); this could be combined with `speed 2400', which means
++     that when this port is used with a system that does not specify a
++     speed, the port will be used at 2400 baud.
++
++`carrier BOOLEAN [ modem and direct only ]'
++     The argument indicates whether the port supports carrier.
++
++     If a modem port does not support carrier, the carrier detect
++     signal will never be required on this port, regardless of what the
++     modem chat script indicates.  The default for a modem port is true.
++
++     If a direct port supports carrier, the port will be set to expect
++     carrier whenever it is used.  The default for a direct port is
++     false.
++
++`hardflow BOOLEAN [ modem and direct only ]'
++     The argument indicates whether the port supports hardware flow
++     control.  If it does not, hardware flow control will not be turned
++     on for this port.  The default is true.  Hardware flow control is
++     only supported on some systems.
++
++`dial-device STRING [ modem only ]'
++     Dialing instructions should be output to the named device, rather
++     than to the normal port device.  The default is to output to the
++     normal port device.
++
++`dialer STRING [ modem only ]'
++     Name a dialer to use.  The information is looked up in the dial
++     file.  There is no default.  Some sort of dialer information must
++     be specified to call out on a modem.
++
++`dialer STRING ... [ modem only ]'
++     If more than one string follows the `dialer' command, the strings
++     are treated as a command that might appear in the dial file (*note
++     dial File::).  If a dialer is named (by using the first form of
++     this command, described just above), these commands are ignored.
++     They may be used to specify dialer information directly in simple
++     situations without needing to go to a separate file.  There is no
++     default.  Some sort of dialer information must be specified to
++     call out on a modem.
++
++`dialer-sequence STRINGS [ modem or tcp or tli only ]'
++     Name a sequence of dialers and tokens (phone numbers) to use.  The
++     first argument names a dialer, and the second argument names a
++     token.  The third argument names another dialer, and so on.  If
++     there are an odd number of arguments, the phone number specified
++     with a `phone' command in the system file is used as the final
++     token.  The token is what is used for `\D' or `\T' in the dialer
++     chat script.  If the token in this string is `\D', the system
++     phone number will be used; if it is `\T', the system phone number
++     will be used after undergoing dialcodes translation.  A missing
++     final token is taken as `\D'.
++
++     This command currently does not work if `dial-device' is specified;
++     to handle this correctly will require a more systematic notion of
++     chat scripts.  Moreover, the `complete' and `abort' chat scripts,
++     the protocol parameters, and the `carrier' and `dtr-toggle'
++     commands are ignored for all but the first dialer.
++
++     This command basically lets you specify a sequence of chat scripts
++     to use.  For example, the first dialer might get you to a local
++     network and the second dialer might describe how to select a
++     machine from the local network.  This lets you break your dialing
++     sequence into simple modules, and may make it easier to share
++     dialer entries between machines.
++
++     This command is to only way to use a chat script with a TCP port.
++     This can be useful when using a modem which is accessed via TCP.
++
++     When this command is used with a TLI port, then if the first
++     dialer is `TLI' or `TLIS' the first token is used as the address to
++     connect to.  If the first dialer is something else, or if there is
++     no token, the address given by the `address' command is used
++     (*note Placing the Call::).  Escape sequences in the address are
++     expanded as they are for chat script expect strings (*note Chat
++     Scripts::).  The different between `TLI' and `TLIS' is that the
++     latter implies the command `stream true'.  These contortions are
++     all for HDB compatibility.  Any subsequent dialers are treated as
++     they are for a TCP port.
++
++`lockname STRING [ modem and direct only ]'
++     Give the name to use when locking this port.  On Unix, this is the
++     name of the file that will be created in the lock directory.  It
++     is used as is, so on Unix it should generally start with `LCK..'.
++     For example, if a single port were named both `/dev/ttycu0' and
++     `/dev/tty0' (perhaps with different characteristics keyed on the
++     minor device number), then the command `lockname LCK..ttycu0' could
++     be used to force the latter to use the same lock file name as the
++     former.
++
++`service STRING [ tcp only ]'
++     Name the TCP port number to use.  This may be a number.  If not,
++     it will be looked up in `/etc/services'.  If this is not
++     specified, the string `uucp' is looked up in `/etc/services'.  If
++     it is not found, port number 540 (the standard UUCP-over-TCP port
++     number) will be used.
++
++`version STRING [ tcp only ]'
++     Specify the IP version number to use.  The default is `0', which
++     permits any version.  The other possible choices are `4', which
++     requires `IPv4', or `6', which requires `IPv6'.  Normally it is
++     not necessary to use this command, but in some cases, as `IPv6' is
++     rolled out across the Internet, it may be necessary to require
++     UUCP to use a particular type of connection.
++
++`push STRINGS [ tli only ]'
++     Give a list of modules to push on to the TLI stream.
++
++`stream BOOLEAN [ tli only ]'
++     If this is true, and the `push' command was not used, the `tirdwr'
++     module is pushed on to the TLI stream.
++
++`server-address STRING [ tli only ]'
++     Give the address to use when running as a TLI server.  Escape
++     sequences in the address are expanded as they are for chat script
++     expect strings (*note Chat Scripts::).
++
++     The string is passed directly to the TLI `t_bind' function.  The
++     value needed may depend upon your particular TLI implementation.
++     Check the manual pages, and, if necessary, try writing some sample
++     programs.
++
++     For AT&T 3B2 System V Release 3 using the Wollongong TCP/IP stack,
++     which is probably typical, the format of TLI string is `SSPPIIII',
++     where `SS' is the service number (for TCP, this is 2), `PP' is the
++     TCP port number, and `IIII' is the Internet address.  For example,
++     to accept a connection from on port 540 from any interface, use
++     `server-address \x00\x02\x02\x1c\x00\x00\x00\x00'.  To only accept
++     connections from a particular interface, replace the last four
++     digits with the network address of the interface.  (Thanks to Paul
++     Pryor for the information in this paragraph).
++
++`command STRINGS [ pipe only ]'
++     Give the command, with arguments, to run when using a pipe port
++     type.  When a port of this type is used, the command is executed
++     and `uucico' communicates with it over a pipe.  This permits
++     `uucico' or `cu' to communicate with another system which can only
++     be reached through some unusual means.  A sample use might be
++     `command /bin/rlogin -E -8 -l LOGIN SYSTEM'.  The command is run
++     with the full privileges of UUCP; it is responsible for
++     maintaining security.
++
++
++\x1f
++File: uucp.info,  Node: dial File,  Next: UUCP Over TCP,  Prev: port File,  Up: Configuration Files
++
++5.9 The Dialer Configuration File
++=================================
++
++The dialer configuration files define dialers.  By default there is a
++single dialer file, named `dial' in the directory NEWCONFIGDIR.  This
++may be overridden by the `dialfile' command in the main configuration
++file; see *note Configuration File Names::.
++
++   Any commands in the file before the first `dialer' command specify
++defaults for all the dialers in the file.  All commands after a
++`dialer' command up to the next `dialer' command are associated with
++the named dialer.
++
++`dialer STRING'
++     Introduces and names a dialer.
++
++`chat STRINGS'
++
++`chat-timeout NUMBER'
++
++`chat-fail STRING'
++
++`chat-seven-bit BOOLEAN'
++
++`chat-program STRINGS'
++     Specify a chat script to be used to dial the phone.  This chat
++     script is used before the login chat script in the `sys' file, if
++     any (*note Logging In::).  For full details on chat scripts, see
++     *note Chat Scripts::.
++
++     The `uucico' daemon will sleep for one second between attempts to
++     dial out on a modem.  If your modem requires a longer wait period,
++     you must start your chat script with delays (`\d' in a send
++     string).
++
++     The chat script will be read from and sent to the port specified
++     by the `dial-device' command for the port, if there is one.
++
++     The following escape addition escape sequences may appear in send
++     strings:
++
++    `\D'
++          send phone number without dialcode translation
++
++    `\T'
++          send phone number with dialcode translation
++
++     See the description of the dialcodes file (*note Configuration
++     File Names::) for a description of dialcode translation.
++
++     If both the port and the dialer support carrier, as set by the
++     `carrier' command in the port file and the `carrier' command in
++     the dialer file, then every chat script implicitly begins with
++     `\M' and ends with `\m'.
++
++     There is no default chat script for dialers.
++
++     The following additional escape sequences may be used in
++     `chat-program':
++
++    `\D'
++          phone number without dialcode translation
++
++    `\T'
++          phone number with dialcode translation
++
++     If the program changes the port in any way (e.g., sets parity) the
++     changes will be preserved during protocol negotiation, but once the
++     protocol is selected it will change the port settings.
++
++`dialtone STRING'
++     A string to output when dialing the phone number which causes the
++     modem to wait for a secondary dial tone.  This is used to
++     translate the `=' character in a phone number.  The default is a
++     comma.
++
++`pause STRING'
++     A string to output when dialing the phone number which causes the
++     modem to wait for 1 second.  This is used to translate the `-'
++     character in a phone number.  The default is a comma.
++
++`carrier BOOLEAN'
++     An argument of true means that the dialer supports the modem
++     carrier signal.  After the phone number is dialed, `uucico' will
++     require that carrier be on.  One some systems, it will be able to
++     wait for it.  If the argument is false, carrier will not be
++     required.  The default is true.
++
++`carrier-wait NUMBER'
++     If the port is supposed to wait for carrier, this may be used to
++     indicate how many seconds to wait.  The default is 60 seconds.
++     Only some systems support waiting for carrier.
++
++`dtr-toggle BOOLEAN BOOLEAN'
++     If the first argument is true, then DTR is toggled before using
++     the modem.  This is only supported on some systems and some ports.
++     The second BOOLEAN need not be present; if it is, and it is true,
++     the program will sleep for 1 second after toggling DTR.  The
++     default is to not toggle DTR.
++
++`complete-chat STRINGS'
++
++`complete-chat-timeout NUMBER'
++
++`complete-chat-fail STRING'
++
++`complete-chat-seven-bit BOOLEAN'
++
++`complete-chat-program STRINGS'
++     These commands define a chat script (*note Chat Scripts::) which
++     is run when a call is finished normally.  This allows the modem to
++     be reset.  There is no default.  No additional escape sequences
++     may be used.
++
++`complete STRING'
++     This is a simple use of `complete-chat'.  It is equivalent to
++     `complete-chat "" STRING'; this has the effect of sending STRING
++     to the modem when a call finishes normally.
++
++`abort-chat STRINGS'
++
++`abort-chat-timeout NUMBER'
++
++`abort-chat-fail STRING'
++
++`abort-chat-seven-bit BOOLEAN'
++
++`abort-chat-program STRINGS'
++     These commands define a chat script (*note Chat Scripts::) to be
++     run when a call is aborted.  They may be used to interrupt and
++     reset the modem.  There is no default.  No additional escape
++     sequences may be used.
++
++`abort STRING'
++     This is a simple use of `abort-chat'.  It is equivalent to
++     `abort-chat "" STRING'; this has the effect of sending STRING to
++     the modem when a call is aborted.
++
++`protocol-parameter CHARACTER STRINGS'
++     Set protocol parameters, just like the `protocol-parameter' command
++     in the system configuration file or the port configuration file;
++     see *note Protocol Selection::.  These parameters take precedence,
++     then those for the port, then those for the system.
++
++`seven-bit BOOLEAN'
++     This is only used during protocol negotiation; if it is true, it
++     forces selection of a protocol which works across a seven-bit
++     link.  It does not prevent eight bit characters from being
++     transmitted.  The default is false.  It would be more common to
++     specify this for a port than for a dialer.
++
++`reliable BOOLEAN'
++     This is only used during protocol negotiation; if it is false, it
++     forces selection of a protocol which works across an unreliable
++     communication link.  The default is true.
++
++`half-duplex BOOLEAN [ any type ]'
++     If the argument is true, it means that the dialer only supports
++     half-duplex connections.  This only affects bidirectional
++     protocols, and causes them to not do bidirectional transfers.
++
++
++\x1f
++File: uucp.info,  Node: UUCP Over TCP,  Next: Security,  Prev: dial File,  Up: Configuration Files
++
++5.10 UUCP Over TCP
++==================
++
++If your system has a Berkeley style socket library, or a System V style
++TLI interface library, you can compile the code to permit making
++connections over TCP.  Specifying that a system should be reached via
++TCP is easy, but nonobvious.
++
++* Menu:
++
++* TCP Client::                  Connecting to Another System Over TCP
++* TCP Server::                  Running a TCP Server
++
++\x1f
++File: uucp.info,  Node: TCP Client,  Next: TCP Server,  Prev: UUCP Over TCP,  Up: UUCP Over TCP
++
++5.10.1 Connecting to Another System Over TCP
++--------------------------------------------
++
++If you are using the new style configuration files (*note Configuration
++Files::), add the line `port type tcp' to the entry in the `sys' file.
++By default UUCP will get the port number by looking up `uucp' in
++`/etc/services'; if the `uucp' service is not defined, port 540 will be
++used.  You can set the port number to use with the command `port
++service XXX', where XXX can be either a number or a name to look up in
++`/etc/services'.  You can specify the address of the remote host with
++`address A.B.C'; if you don't give an address, the remote system name
++will be used.  You should give an explicit chat script for the system
++when you use TCP; the default chat script begins with a carriage
++return, which will not work with some UUCP TCP servers.
++
++   If you are using V2 configuration files, add a line like this to
++`L.sys':
++     SYS Any TCP uucp HOST.DOMAIN chat-script
++   This will make an entry for system SYS, to be called at any time,
++over TCP, using port number `uucp' (as found in `/etc/services'; this
++may be specified as a number), using remote host `HOST.DOMAIN', with
++some chat script.
++
++   If you are using HDB configuration files, add a line like this to
++Systems:
++     SYS Any TCP - HOST.DOMAIN chat-script
++   and a line like this to `Devices':
++     TCP uucp - -
++   You only need one line in `Devices' regardless of how many systems
++you contact over TCP.  This will make an entry for system SYS, to be
++called at any time, over TCP, using port number `uucp' (as found in
++`/etc/services'; this may be specified as a number), using remote host
++`HOST.DOMAIN', with some chat script.
++
++\x1f
++File: uucp.info,  Node: TCP Server,  Prev: TCP Client,  Up: UUCP Over TCP
++
++5.10.2 Running a TCP Server
++---------------------------
++
++The `uucico' daemon may be run as a TCP server.  To use the default
++port number, which is a reserved port, `uucico' must be invoked by the
++superuser (or it must be set user ID to the superuser, but I don't
++recommend doing that).
++
++   You must define a port, either using the port file (*note port
++File::), if you are using the new configuration method, or with an
++entry in `Devices' if you are using HDB; there is no way to define a
++port using V2.  If you are using HDB the port must be named `TCP'; a
++line as shown above will suffice.  You can then start `uucico' as
++`uucico -p TCP' (after the `-p', name the port; in HDB it must be
++`TCP').  This will wait for incoming connections, and fork off a child
++for each one.  Each connection will be prompted with `login:' and
++`Password:'; the results will be checked against the UUCP (not the
++system) password file (*note Configuration File Names::).
++
++   Another way to run a UUCP TCP server is to use the BSD `uucpd'
++program.
++
++   Yet another way to run a UUCP TCP server is to use `inetd'.  Arrange
++for `inetd' to start up `uucico' with the `-l' switch.  This will cause
++`uucico' to prompt with `login:' and `Password:' and check the results
++against the UUCP (not the system) password file (you may want to also
++use the `-D' switch to avoid a fork, which in this case is unnecessary).
++
++\x1f
++File: uucp.info,  Node: Security,  Prev: UUCP Over TCP,  Up: Configuration Files
++
++5.11 Security
++=============
++
++This discussion of UUCP security applies only to Unix.  It is a bit
++cursory; suggestions for improvement are solicited.
++
++   UUCP is traditionally not very secure.  Taylor UUCP addresses some
++security issues, but is still far from being a secure system.
++
++   If security is very important to you, then you should not permit any
++external access to your computer, including UUCP.  Any opening to the
++outside world is a potential security risk.
++
++   When local users use UUCP to transfer files, Taylor UUCP can do
++little to secure them from each other.  You can allow somewhat increased
++security by putting the owner of the UUCP programs (normally `uucp')
++into a separate group; the use of this is explained in the following
++paragraphs, which refer to this separate group as `uucp-group'.
++
++   When the `uucp' program is invoked to copy a file to a remote
++system, it will, by default, copy the file into the UUCP spool
++directory.  When the `uux' program is used, the `-C' switch must be
++used to copy the file into the UUCP spool directory.  In any case, once
++the file has been copied into the spool directory, other local users
++will not be able to access it.
++
++   When a file is requested from a remote system, UUCP will only permit
++it to be placed in a directory which is writable by the requesting user.
++The directory must also be writable by UUCP.  A local user can create a
++directory with a group of `uucp-group' and set the mode to permit group
++write access.  This will allow the file be requested without permitting
++it to be viewed by any other user.
++
++   There is no provision for security for `uucp' requests (as opposed
++to `uux' requests) made by a user on a remote system.  A file sent over
++by a remote request may only be placed in a directory which is world
++writable, and the file will be world readable and writable.  This will
++permit any local user to destroy or replace the contents of the file.
++A file requested by a remote system must be world readable, and the
++directory it is in must be world readable.  Any local user will be able
++to examine, although not necessarily modify, the file before it is sent.
++
++   There are some security holes and race conditions that apply to the
++above discussion which I will not elaborate on.  They are not hidden
++from anybody who reads the source code, but they are somewhat technical
++and difficult (though scarcely impossible) to exploit.  Suffice it to
++say that even under the best of conditions UUCP is not completely
++secure.
++
++   For many sites, security from remote sites is a more important
++consideration.  Fortunately, Taylor UUCP does provide some support in
++this area.
++
++   The greatest security is provided by always dialing out to the other
++site.  This prevents anybody from pretending to be the other site.  Of
++course, only one side of the connection can do this.
++
++   If remote dialins must be permitted, then it is best if the dialin
++line is used only for UUCP.  If this is the case, then you should
++create a call-in password file (*note Configuration File Names::) and
++let `uucico' do its own login prompting.  For example, to let remote
++sites log in on a port named `entry' in the port file (*note port
++File::), you might invoke `uucico -e -p entry'.  This would cause
++`uucico' to enter an endless loop of login prompts and daemon
++executions.  The advantage of this approach is that even if remote users
++break into the system by guessing or learning the password, they will
++only be able to do whatever `uucico' permits them to do.  They will not
++be able to start a shell on your system.
++
++   If remote users can dial in and log on to your system, then you have
++a security hazard more serious than that posed by UUCP.  But then, you
++probably knew that already.
++
++   Once your system has connected with the remote UUCP, there is a fair
++amount of control you can exercise.  You can use the `remote-send' and
++`remote-receive' commands to control the directories the remote UUCP
++can access.  You can use the `request' command to prevent the remote
++UUCP from making any requests of your system at all; however, if you do
++this it will not even be able to send you mail or news.  If you do
++permit remote requests, you should be careful to restrict what commands
++may be executed at the remote system's request.  The default is `rmail'
++and `rnews', which will suffice for most systems.
++
++   If different remote systems call in and they must be granted
++different privileges (perhaps some systems are within the same
++organization and some are not) then the `called-login' command should
++be used for each system to require that they use different login names.
++Otherwise, it would be simple for a remote system to use the `myname'
++command and pretend to be a different system.  The `sequence' command
++can be used to detect when one system pretended to be another, but,
++since the sequence numbers must be reset manually after a failed
++handshake, this can sometimes be more trouble than it's worth.
++
++\x1f
++File: uucp.info,  Node: Protocols,  Next: Hacking,  Prev: Configuration Files,  Up: Top
++
++6 UUCP Protocol Internals
++*************************
++
++This chapter describes how the various UUCP protocols work, and
++discusses some other internal UUCP issues.
++
++   This chapter is quite technical.  You do not need to understand it,
++or even read it, in order to use Taylor UUCP.  It is intended for people
++who are interested in how the UUCP code works.
++
++   The information in this chapter is posted monthly to the Usenet
++newsgroups `comp.mail.uucp', `news.answers', and `comp.answers'.  The
++posting is available from any `news.answers' archive site, such as
++`rtfm.mit.edu'.  If you plan to use this information to write a UUCP
++program, please make sure you get the most recent version of the
++posting, in case there have been any corrections.
++
++* Menu:
++
++* UUCP Protocol Sources::       Sources for UUCP Protocol Information
++* UUCP Grades::                 UUCP Grades
++* UUCP Lock Files::             UUCP Lock Files
++* Execution File Format::       Execution File Format
++* UUCP Protocol::               UUCP Protocol
++* g Protocol::                  g protocol
++* f Protocol::                  f protocol
++* t Protocol::                  t protocol
++* e Protocol::                  e protocol
++* Big G Protocol::              G protocol
++* i Protocol::                  i protocol
++* j Protocol::                  j protocol
++* x Protocol::                  x protocol
++* y Protocol::                  y protocol
++* d Protocol::                  d protocol
++* h Protocol::                  h protocol
++* v Protocol::                  v protocol
++
++\x1f
++File: uucp.info,  Node: UUCP Protocol Sources,  Next: UUCP Grades,  Prev: Protocols,  Up: Protocols
++
++6.1 UUCP Protocol Sources
++=========================
++
++     "Unix-to-Unix Copy Program," said PDP-1.  "You will never find a
++     more wretched hive of bugs and flamers.  We must be cautious."
++                                                              --DECWars
++
++I took a lot of the information from Jamie E. Hanrahan's paper in the
++Fall 1990 DECUS Symposium, and from `Managing UUCP and Usenet' by Tim
++O'Reilly and Grace Todino (with contributions by several other people).
++The latter includes most of the former, and is published by
++     O'Reilly & Associates, Inc.
++     103 Morris Street, Suite A
++     Sebastopol, CA 95472
++   It is currently in its tenth edition.  The ISBN number is
++`0-937175-93-5'.
++
++   Some information is originally due to a Usenet article by Chuck
++Wegrzyn.  The information on execution files comes partially from Peter
++Honeyman.  The information on the `g' protocol comes partially from a
++paper by G.L. Chesson of Bell Laboratories, partially from Jamie E.
++Hanrahan's paper, and partially from source code by John Gilmore.  The
++information on the `f' protocol comes from the source code by Piet
++Berteema.  The information on the `t' protocol comes from the source
++code by Rick Adams.  The information on the `e' protocol comes from a
++Usenet article by Matthias Urlichs.  The information on the `d'
++protocol comes from Jonathan Clark, who also supplied information about
++QFT.  The UUPlus information comes straight from Christopher J. Ambler,
++of UUPlus Development; it applies to version 1.52 and up of the
++shareware version of UUPlus Utilities, called FSUUCP 1.52, but referred
++to in this article as UUPlus.
++
++   Although there are few books about UUCP, there are many about
++networks and protocols in general.  I recommend two non-technical books
++which describe the sorts of things that are available on the network:
++`The Whole Internet', by Ed Krol, and `Zen and the Art of the
++Internet', by Brendan P. Kehoe.  Good technical discussions of
++networking issues can be found in `Internetworking with TCP/IP', by
++Douglas E. Comer and David L. Stevens and in `Design and Validation of
++Computer Protocols' by Gerard J. Holzmann.
++
++\x1f
++File: uucp.info,  Node: UUCP Grades,  Next: UUCP Lock Files,  Prev: UUCP Protocol Sources,  Up: Protocols
++
++6.2 UUCP Grades
++===============
++
++Modern UUCP packages support a priority grade for each command.  The
++grades generally range from `A' (the highest) to `Z' followed by `a' to
++`z'.  Some UUCP packages (including Taylor UUCP) also support `0' to
++`9' before `A'.  Some UUCP packages may permit any ASCII character as a
++grade.
++
++   On Unix, these grades are encoded in the name of the command file
++created by `uucp' or `uux'.  A command file name generally has the form
++`C.nnnngssss' where `nnnn' is the remote system name for which the
++command is queued, `g' is a single character grade, and `ssss' is a
++four character sequence number.  For example, a command file created
++for the system `airs' at grade `Z' might be named `C.airsZ2551'.
++
++   The remote system name will be truncated to seven characters, to
++ensure that the command file name will fit in the 14 character file
++name limit of the traditional Unix file system.  UUCP packages which
++have no other means of distinguishing which command files are intended
++for which systems thus require all systems they connect to to have
++names that are unique in the first seven characters.  Some UUCP
++packages use a variant of this format which truncates the system name
++to six characters.  HDB and Taylor UUCP use a different spool directory
++format, which allows up to fourteen characters to be used for each
++system name.
++
++   The sequence number in the command file name may be a decimal
++integer, or it may be a hexadecimal integer, or it may contain any
++alphanumeric character.  Different UUCP packages are different.  Taylor
++UUCP uses any alphanumeric character.
++
++   UUPlus Utilities (as FSUUCP, a shareware DOS based UUCP and news
++package) uses up to 8 characters for file names in the spool (this is a
++DOS file system limitation; actually, with the extension, 11 characters
++are available, but FSUUCP reserves that for future use).  FSUUCP
++defaults mail to grade `D', and news to grade `N', except that when the
++grade of incoming mail can be determined, that grade is preserved if
++the mail is forwarded to another system. The default grades may be
++changed by editing the `LIB/MAILRC' file for mail, or the `UUPLUS.CFG'
++file for news.
++
++   UUPC/extended for DOS, OS/2 and Windows NT handles mail at grade
++`C', news at grade `d', and file transfers at grade `n'.  The
++UUPC/extended `UUCP' and `RMAIL' commands accept grades to override the
++default, the others do not.
++
++   I do not know how command grades are handled in other non-Unix UUCP
++packages.
++
++   Modern UUCP packages allow you to restrict file transfer by grade
++depending on the time of day.  Typically this is done with a line in
++the `Systems' (or `L.sys') file like this:
++         airs Any/Z,Any2305-0855 ...
++   This allows grades `Z' and above to be transferred at any time.
++Lower grades may only be transferred at night.  I believe that this
++grade restriction applies to local commands as well as to remote
++commands, but I am not sure.  It may only apply if the UUCP package
++places the call, not if it is called by the remote system.
++
++   Taylor UUCP can use the `timegrade' and `call-timegrade' commands to
++achieve the same effect.  *Note When to Call::.  It supports the above
++format when reading `Systems' or `L.sys'.
++
++   UUPC/extended provides the `symmetricgrades' option to announce the
++current grade in effect when calling the remote system.
++
++   UUPlus allows specification of the highest grade accepted on a
++per-call basis with the `-g' option in `UUCICO'.
++
++   This sort of grade restriction is most useful if you know what grades
++are being used at the remote site.  The default grades used depend on
++the UUCP package.  Generally `uucp' and `uux' have different defaults.
++A particular grade can be specified with the `-g' option to `uucp' or
++`uux'.  For example, to request execution of `rnews' on `airs' with
++grade `d', you might use something like
++         uux -gd - airs!rnews < article
++
++   Uunet queues up mail at grade `C', but increases the grade based on
++the size.  News is queued at grade `d', and file transfers at grade
++`n'.  The example above would allow mail (below some large size) to be
++received at any time, but would only permit news to be transferred at
++night.
++
++\x1f
++File: uucp.info,  Node: UUCP Lock Files,  Next: Execution File Format,  Prev: UUCP Grades,  Up: Protocols
++
++6.3 UUCP Lock Files
++===================
++
++This discussion applies only to Unix.  I have no idea how UUCP locks
++ports on other systems.
++
++   UUCP creates files to lock serial ports and systems.  On most, if not
++all, systems, these same lock files are also used by `cu' to coordinate
++access to serial ports.  On some systems `getty' also uses these lock
++files, often under the name `uugetty'.
++
++   The lock file normally contains the process ID of the locking
++process.  This makes it easy to determine whether a lock is still
++valid.  The algorithm is to create a temporary file and then link it to
++the name that must be locked.  If the link fails because a file with
++that name already exists, the existing file is read to get the process
++ID.  If the process still exists, the lock attempt fails.  Otherwise
++the lock file is deleted and the locking algorithm is retried.
++
++   Older UUCP packages put the lock files in the main UUCP spool
++directory, `/usr/spool/uucp'.  HDB UUCP generally puts the lock files
++in a directory of their own, usually `/usr/spool/locks' or `/etc/locks'.
++
++   The original UUCP lock file format encodes the process ID as a four
++byte binary number.  The order of the bytes is host-dependent.  HDB UUCP
++stores the process ID as a ten byte ASCII decimal number, with a
++trailing newline.  For example, if process 1570 holds a lock file, it
++would contain the eleven characters space, space, space, space, space,
++space, one, five, seven, zero, newline.  Some versions of UUCP add a
++second line indicating which program created the lock (`uucp', `cu', or
++`getty/uugetty').  I have also seen a third type of UUCP lock file
++which does not contain the process ID at all.
++
++   The name of the lock file is traditionally `LCK..' followed by the
++base name of the device.  For example, to lock `/dev/ttyd0' the file
++`LCK..ttyd0' would be created.  On SCO Unix, the last letter of the
++lock file name is always forced to lower case even if the device name
++ends with an upper case letter.
++
++   System V Release 4 UUCP names the lock file using the major and minor
++device numbers rather than the device name.  The file is named
++`LK.XXX.YYY.ZZZ', where XXX, YYY and ZZZ are all three digit decimal
++numbers.  XXX is the major device number of the device holding the
++directory holding the device file (e.g., `/dev').  YYY is the major
++device number of the device file itself.  ZZZ is the minor device
++number of the device file itself.  If `s' holds the result of passing
++the device to the stat system call (e.g., `stat ("/dev/ttyd0", &s)'),
++the following line of C code will print out the corresponding lock file
++name:
++         printf ("LK.%03d.%03d.%03d", major (s.st_dev),
++                 major (s.st_rdev), minor (s.st_rdev));
++   The advantage of this system is that even if there are several links
++to the same device, they will all use the same lock file name.
++
++   When two or more instances of `uuxqt' are executing, some sort of
++locking is needed to ensure that a single execution job is only started
++once.  I don't know how most UUCP packages deal with this.  Taylor UUCP
++uses a lock file for each execution job.  The name of the lock file is
++the same as the name of the `X.*' file, except that the initial `X' is
++changed to an `L'.  The lock file holds the process ID as described
++above.
++
++\x1f
++File: uucp.info,  Node: Execution File Format,  Next: UUCP Protocol,  Prev: UUCP Lock Files,  Up: Protocols
++
++6.4 Execution File Format
++=========================
++
++UUCP `X.*' files control program execution.  They are created by `uux'.
++They are transferred between systems just like any other file.  The
++`uuxqt' daemon reads them to figure out how to execute the job
++requested by `uux'.
++
++   An `X.*' file is simply a text file.  The first character of each
++line is a command, and the remainder of the line supplies arguments.
++The following commands are defined:
++
++`C command'
++     This gives the command to execute, including the program and all
++     arguments.  For example, `rmail ian@airs.com'.
++
++`U user system'
++     This names the user who requested the command, and the system from
++     which the request came.
++
++`I standard-input'
++     This names the file from which standard input is taken.  If no
++     standard input file is given, the standard input will probably be
++     attached to `/dev/null'.  If the standard input file is not from
++     the system on which the execution is to occur, it will also appear
++     in an `F' command.
++
++`O standard-output [system]'
++     This names the standard output file.  The optional second argument
++     names the system to which the file should be sent.  If there is no
++     second argument, the file should be created on the executing
++     system.
++
++`F required-file [filename-to-use]'
++     The `F' command can appear multiple times.  Each `F' command names
++     a file which must exist before the execution can proceed.  This
++     will usually be a file which is transferred from the system on
++     which `uux' was executed, but it can also be a file from the local
++     system or some other system.  If the file is not from the local
++     system, then the command will usually name a file in the spool
++     directory.  If the optional second argument appears, then the file
++     should be copied to the execution directory under that name.  This
++     is necessary for any file other than the standard input file.  If
++     the standard input file is not from the local system, it will
++     appear in both an `F' command and an `I' command.
++
++`R requestor-address'
++     This is the address to which mail about the job should be sent.
++     It is relative to the system named in the `U' command.  If the `R'
++     command does not appear, then mail is sent to the user named in the
++     `U' command.
++
++`Z'
++     This command takes no arguments.  It means that a mail message
++     should be sent if the command failed.  This is the default
++     behaviour for most modern UUCP packages, and for them the `Z'
++     command does not actually do anything.
++
++`N'
++     This command takes no arguments.  It means that no mail message
++     should be sent, even if the command failed.
++
++`n'
++     This command takes no arguments.  It means that a mail message
++     should be sent if the command succeeded.  Normally a message is
++     sent only if the command failed.
++
++`B'
++     This command takes no arguments.  It means that the standard input
++     should be returned with any error message.  This can be useful in
++     cases where the input would otherwise be lost.
++
++`e'
++     This command takes no arguments.  It means that the command should
++     be processed with `/bin/sh'.  For some packages this is the default
++     anyhow.  Most packages will refuse to execute complex commands or
++     commands containing wildcards, because of the security holes this
++     opens.
++
++`E'
++     This command takes no arguments.  It means that the command should
++     be processed with the `execve' system call.  For some packages
++     this is the default anyhow.
++
++`M status-file'
++     This command means that instead of mailing a message, the message
++     should be copied to the named file on the system named by the `U'
++     command.
++
++`Q'
++     This command takes no arguments.  It means that the string
++     arguments to all the other commands are backslash quoted.  Any
++     backslash in one of the strings should be followed by either a
++     backslash or three octal digits.  The backslash quoting is
++     interpreted as in a C string.  If the `Q' command does not appear,
++     backslashes in the strings are not treated specially.  The `Q'
++     command was introduced in Taylor UUCP version 1.07.
++
++`# comment'
++     This command is ignored, as is any other unrecognized command.
++
++   Here is an example.  Given the following command executed on system
++test1
++         uux - test2!cat - test2!~ian/bar !qux '>~/gorp'
++   (this is only an example, as most UUCP systems will not permit the
++cat command to be executed) Taylor UUCP will produce something like the
++following `X.'  file:
++     U ian test1
++     F D.test1N003r qux
++     O /usr/spool/uucppublic/gorp test1
++     F D.test1N003s
++     I D.test1N003s
++     C cat - ~ian/bar qux
++   The standard input will be read into a file and then transferred to
++the file `D.test1N003s' on system `test2'.  The file `qux' will be
++transferred to `D.test1N003r' on system `test2'.  When the command is
++executed, the latter file will be copied to the execution directory
++under the name `qux'.  Note that since the file `~ian/bar' is already
++on the execution system, no action need be taken for it.  The standard
++output will be collected in a file, then copied to the file
++`/usr/spool/uucppublic/gorp' on the system `test1'.
++
++\x1f
++File: uucp.info,  Node: UUCP Protocol,  Next: g Protocol,  Prev: Execution File Format,  Up: Protocols
++
++6.5 UUCP Protocol
++=================
++
++The UUCP protocol is a conversation between two UUCP packages.  A UUCP
++conversation consists of three parts: an initial handshake, a series of
++file transfer requests, and a final handshake.
++
++* Menu:
++
++* The Initial Handshake::       The Initial Handshake
++* UUCP Protocol Commands::      UUCP Protocol Commands
++* The Final Handshake::         The Final Handshake
++
++\x1f
++File: uucp.info,  Node: The Initial Handshake,  Next: UUCP Protocol Commands,  Prev: UUCP Protocol,  Up: UUCP Protocol
++
++6.5.1 The Initial Handshake
++---------------------------
++
++Before the initial handshake, the caller will usually have logged in the
++called machine and somehow started the UUCP package there.  On Unix this
++is normally done by setting the shell of the login name used to
++`/usr/lib/uucp/uucico'.
++
++   All messages in the initial handshake begin with a `^P' (a byte with
++the octal value `\020') and end with a null byte (`\000').  A few
++systems end these messages with a line feed character (`\012') instead
++of a null byte; the examples below assume a null byte is being used.
++
++   Some options below are supported by QFT, which stands for Queued File
++Transfer, and is (or was) an internal Bell Labs version of UUCP.
++
++   Taylor UUCP size negotiation was introduced by Taylor UUCP, and is
++also supported by DOS based UUPlus and Amiga based wUUCP and UUCP-1.17.
++
++   The initial handshake goes as follows.  It is begun by the called
++machine.
++
++called: `\020Shere=hostname\000'
++     The hostname is the UUCP name of the called machine.  Older UUCP
++     packages do not output it, and simply send `\020Shere\000'.
++
++caller: `\020Shostname options\000'
++     The hostname is the UUCP name of the calling machine.  The
++     following options may appear (or there may be none):
++
++    `-QSEQ'
++          Report sequence number for this conversation.  The sequence
++          number is stored at both sites, and incremented after each
++          call.  If there is a sequence number mismatch, something has
++          gone wrong (somebody may have broken security by pretending
++          to be one of the machines) and the call is denied.  If the
++          sequence number changes on one of the machines, perhaps
++          because of an attempted breakin or because a disk backup was
++          restored, the sequence numbers on the two machines must be
++          reconciled manually.
++
++    `-xLEVEL'
++          Requests the called system to set its debugging level to the
++          specified value.  This is not supported by all systems.
++
++    `-pGRADE'
++    `-vgrade=GRADE'
++          Requests the called system to only transfer files of the
++          specified grade or higher.  This is not supported by all
++          systems.  Some systems support `-p', some support `-vgrade='.
++          UUPlus allows either `-p' or `-v' to be specified on a
++          per-system basis in the `SYSTEMS' file (`gradechar' option).
++
++    `-R'
++          Indicates that the calling UUCP understands how to restart
++          failed file transmissions.  Supported only by System V
++          Release 4 UUCP, QFT, and Taylor UUCP.
++
++    `-ULIMIT'
++          Reports the ulimit value of the calling UUCP.  The limit is
++          specified as a base 16 number in C notation (e.g.,
++          `-U0x1000000').  This number is the number of 512 byte blocks
++          in the largest file which the calling UUCP can create.  The
++          called UUCP may not transfer a file larger than this.
++          Supported only by System V Release 4 UUCP, QFT and UUPlus.
++          UUPlus reports the lesser of the available disk space on the
++          spool directory drive and the ulimit variable in
++          `UUPLUS.CFG'.  Taylor UUCP understands this option, but does
++          not generate it.
++
++    `-N[NUMBER]'
++          Indicates that the calling UUCP understands the Taylor UUCP
++          size negotiation extension.  Not supported by traditional
++          UUCP packages.  Supported by UUPlus.  The optional number is
++          a bitmask of features supported by the calling UUCP, and is
++          described below.
++
++called: `\020ROK\000'
++     There are actually several possible responses.
++    `ROK'
++          The calling UUCP is acceptable, and the handshake proceeds to
++          the protocol negotiation.  Some options may also appear; see
++          below.
++
++    `ROKN[NUMBER]'
++          The calling UUCP is acceptable, it specified `-N', and the
++          called UUCP also understands the Taylor UUCP size limiting
++          extensions.  The optional number is a bitmask of features
++          supported by the called UUCP, and is described below.
++
++    `RLCK'
++          The called UUCP already has a lock for the calling UUCP,
++          which normally indicates the two machines are already
++          communicating.
++
++    `RCB'
++          The called UUCP will call back.  This may be used to avoid
++          impostors (but only one machine out of each pair should call
++          back, or no conversation will ever begin).
++
++    `RBADSEQ'
++          The call sequence number is wrong (see the `-Q' discussion
++          above).
++
++    `RLOGIN'
++          The calling UUCP is using the wrong login name.
++
++    `RYou are unknown to me'
++          The calling UUCP is not known to the called UUCP, and the
++          called UUCP does not permit connections from unknown systems.
++          Some versions of UUCP just drop the line rather than sending
++          this message.
++
++     If the response is `ROK', the following options are supported by
++     System V Release 4 UUCP and QFT.
++    `-R'
++          The called UUCP knows how to restart failed file
++          transmissions.
++
++    `-ULIMIT'
++          Reports the ulimit value of the called UUCP.  The limit is
++          specified as a base 16 number in C notation.  This number is
++          the number of 512 byte blocks in the largest file which the
++          called UUCP can create.  The calling UUCP may not send a file
++          larger than this.  Also supported by UUPlus.  Taylor UUCP
++          understands this option, but does not generate it.
++
++    `-xLEVEL'
++          I'm not sure just what this means.  It may request the
++          calling UUCP to set its debugging level to the specified
++          value.
++
++     If the response is not `ROK' (or `ROKN') both sides hang up the
++     phone, abandoning the call.
++
++called: `\020Pprotocols\000'
++     Note that the called UUCP outputs two strings in a row.  The
++     protocols string is a list of UUCP protocols supported by the
++     caller.  Each UUCP protocol has a single character name.  These
++     protocols are discussed in more detail later in this document.
++     For example, the called UUCP might send `\020Pgf\000'.
++
++caller: `\020Uprotocol\000'
++     The calling UUCP selects which protocol to use out of the protocols
++     offered by the called UUCP.  If there are no mutually supported
++     protocols, the calling UUCP sends `\020UN\000' and both sides hang
++     up the phone.  Otherwise the calling UUCP sends something like
++     `\020Ug\000'.
++
++   Most UUCP packages will consider each locally supported protocol in
++turn and select the first one supported by the called UUCP.  With some
++versions of HDB UUCP, this can be modified by giving a list of protocols
++after the device name in the `Devices' file or the `Systems' file.  For
++example, to select the `e' protocol in `Systems',
++         airs Any ACU,e ...
++   or in Devices,
++         ACU,e ttyXX ...
++   Taylor UUCP provides the `protocol' command which may be used either
++for a system (*note Protocol Selection::) or a port (*note port File::).
++UUPlus allows specification of the protocol string on a per-system basis
++in the `SYSTEMS' file.
++
++   The optional number following a `-N' sent by the calling system, or
++an `ROKN' sent by the called system, is a bitmask of features supported
++by the UUCP package.  The optional number was introduced in Taylor UUCP
++version 1.04.  The number is sent as an octal number with a leading
++zero.  The following bits are currently defined.  A missing number
++should be taken as `011'.
++
++`01'
++     UUCP supports size negotiation.
++
++`02'
++     UUCP supports file restart.
++
++`04'
++     UUCP supports the `E' command.
++
++`010'
++     UUCP requires the file size in the `S' and `R' commands to be in
++     base 10.  This bit is used by default if no number appears, but
++     should not be explicitly sent.
++
++`020'
++     UUCP expects a dummy string between the notify field and the size
++     field in an `S' command.  This is true of SVR4 UUCP.  This bit
++     should not be used.
++
++`040'
++     UUCP supports the `q' option in the `S', `R', `X', and `E'
++     commands.
++
++   After the protocol has been selected and the initial handshake has
++been completed, both sides turn on the selected protocol.  For some
++protocols (notably `g') a further handshake is done at this point.
++
++\x1f
++File: uucp.info,  Node: UUCP Protocol Commands,  Next: The Final Handshake,  Prev: The Initial Handshake,  Up: UUCP Protocol
++
++6.5.2 UUCP Protocol Commands
++----------------------------
++
++Each protocol supports a method for sending a command to the remote
++system.  This method is used to transmit a series of commands between
++the two UUCP packages.  At all times, one package is the master and the
++other is the slave.  Initially, the calling UUCP is the master.
++
++   If a protocol error occurs during the exchange of commands, both
++sides move immediately to the final handshake.
++
++   The master will send one of five commands: `S', `R', `X', `E', or
++`H'.
++
++   Any file name referred to below is either an absolute file name
++beginning with `/', a public directory file name beginning with `~/', a
++file name relative to a user's home directory beginning with `~USER/',
++or a spool directory file name.  File names in the spool directory are
++not absolute, but instead are converted to file names within the spool
++directory by UUCP.  They always begin with `C.' (for a command file
++created by `uucp' or `uux'), `D.' (for a data file created by `uucp',
++`uux' or by an execution, or received from another system for an
++execution), or `X.' (for an execution file created by `uux' or received
++from another system).
++
++   All the commands other than the `H' command support options.  The
++`q' option indicates that the command argument strings are backslash
++quoted.  If the `q' option appears, then any backslash in one of the
++arguments should be followed by either a backslash or three octal
++digits.  The backslash quoting is interpreted as in a C string.  If the
++`q' option does not appear, backslashes in the strings are not treated
++specially.  The `q' option was introduced in Taylor UUCP version 1.07.
++
++* Menu:
++
++* The S Command::               The S Command
++* The R Command::               The R Command
++* The X Command::               The X Command
++* The E Command::               The E Command
++* The H Command::               The H Command
++
++\x1f
++File: uucp.info,  Node: The S Command,  Next: The R Command,  Prev: UUCP Protocol Commands,  Up: UUCP Protocol Commands
++
++6.5.2.1 The S Command
++.....................
++
++master: `S FROM TO USER -OPTIONS TEMP MODE NOTIFY SIZE'
++     The `S' and the `-' are literal characters.  This is a request by
++     the master to send a file to the slave.
++
++    FROM
++          The name of the file to send.  If the `C' option does not
++          appear in OPTIONS, the master will actually open and send
++          this file.  Otherwise the file has been copied to the spool
++          directory, where it is named TEMP.  The slave ignores this
++          field unless TO is a directory, in which case the basename of
++          FROM will be used as the file name.  If FROM is a spool
++          directory filename, it must be a data file created for or by
++          an execution, and must begin with `D.'.
++
++    TO
++          The name to give the file on the slave.  If this field names
++          a directory the file is placed within that directory with the
++          basename of FROM.  A name ending in `/' is taken to be a
++          directory even if one does not already exist with that name.
++          If TO begins with `X.', an execution file will be created on
++          the slave.  Otherwise, if TO begins with `D.' it names a data
++          file to be used by some execution file.  Otherwise, TO should
++          not be in the spool directory.
++
++    USER
++          The name of the user who requested the transfer.
++
++    OPTIONS
++          A list of options to control the transfer.  The following
++          options are defined (all options are single characters):
++         `C'
++               The file has been copied to the spool directory (the
++               master should use TEMP rather than FROM).
++
++         `c'
++               The file has not been copied to the spool directory
++               (this is the default).
++
++         `d'
++               The slave should create directories as necessary (this
++               is the default).
++
++         `f'
++               The slave should not create directories if necessary,
++               but should fail the transfer instead.
++
++         `m'
++               The master should send mail to USER when the transfer is
++               complete.
++
++         `n'
++               The slave should send mail to NOTIFY when the transfer is
++               complete.
++
++         `q'
++               Backslash quoting is applied to the FROM, TO, USER, and
++               NOTIFY arguments.  *Note UUCP Protocol Commands::.  This
++               option was introduced in Taylor UUCP version 1.07.
++
++    TEMP
++          If the `C' option appears in OPTIONS, this names the file to
++          be sent.  Otherwise if FROM is in the spool directory, TEMP
++          is the same as FROM.  Otherwise TEMP may be a dummy string,
++          such as `D.0'.  After the transfer has been succesfully
++          completed, the master will delete the file TEMP.
++
++    MODE
++          This is an octal number giving the mode of the file on the
++          master.  If the file is not in the spool directory, the slave
++          will always create it with mode 0666, except that if (MODE &
++          0111) is not zero (the file is executable), the slave will
++          create the file with mode 0777.  If the file is in the spool
++          directory, some UUCP packages will use the algorithm above
++          and some will always create the file with mode 0600.  This
++          field is ignored by UUPlus, since it is meaningless on DOS;
++          UUPlus uses 0666 for outgoing files.
++
++    NOTIFY
++          This field may not be present, and in any case is only
++          meaningful if the `n' option appears in OPTIONS.  If the `n'
++          option appears, then, when the transfer is successfully
++          completed, the slave will send mail to NOTIFY, which must be
++          a legal mailing address on the slave.  If a SIZE field will
++          appear but the `n' option does not appear, NOTIFY will always
++          be present, typically as the string `dummy' or simply a pair
++          of double quotes.
++
++    SIZE
++          This field is only present when doing Taylor UUCP or SVR4
++          UUCP size negotiation.  It is the size of the file in bytes.
++          Taylor UUCP version 1.03 sends the size as a decimal integer,
++          while versions 1.04 and up, and all other UUCP packages that
++          support size negotiation, send the size in base 16 with a
++          leading 0x.
++
++     The slave then responds with an `S' command response.
++
++    `SY START'
++          The slave is willing to accept the file, and file transfer
++          begins.  The START field will only be present when using file
++          restart.  It specifies the byte offset into the file at which
++          to start sending.  If this is a new file, START will be 0x0.
++
++    `SN2'
++          The slave denies permission to transfer the file.  This can
++          mean that the destination directory may not be accessed, or
++          that no requests are permitted.  It implies that the file
++          transfer will never succeed.
++
++    `SN4'
++          The slave is unable to create the necessary temporary file.
++          This implies that the file transfer might succeed later.
++
++    `SN6'
++          This is only used by Taylor UUCP size negotiation.  It means
++          that the slave considers the file too large to transfer at
++          the moment, but it may be possible to transfer it at some
++          other time.
++
++    `SN7'
++          This is only used by Taylor UUCP size negotiation.  It means
++          that the slave considers the file too large to ever transfer.
++
++    `SN8'
++          This is only used by Taylor UUCP.  It means that the file was
++          already received in a previous conversation.  This can happen
++          if the receive acknowledgement was lost after it was sent by
++          the receiver but before it was received by the sender.
++
++    `SN9'
++          This is only used by Taylor UUCP (versions 1.05 and up) and
++          UUPlus (versions 2.0 and up).  It means that the remote
++          system was unable to open another channel (see the discussion
++          of the `i' protocol for more information about channels).
++          This implies that the file transfer might succeed later.
++
++    `SN10'
++          This is reportedly used by SVR4 UUCP to mean that the file
++          size is too large.
++
++     If the slave responds with `SY', a file transfer begins.  When the
++     file transfer is complete, the slave sends a `C' command response.
++
++    `CY'
++          The file transfer was successful.
++
++    `CYM'
++          The file transfer was successful, and the slave wishes to
++          become the master; the master should send an `H' command,
++          described below.
++
++    `CN5'
++          The temporary file could not be moved into the final
++          location.  This implies that the file transfer will never
++          succeed.
++
++After the `C' command response has been received (in the `SY' case) or
++immediately (in an `SN' case) the master will send another command.
++
++\x1f
++File: uucp.info,  Node: The R Command,  Next: The X Command,  Prev: The S Command,  Up: UUCP Protocol Commands
++
++6.5.2.2 The R Command
++.....................
++
++master: `R FROM TO USER -OPTIONS SIZE'
++     The `R' and the `-' are literal characters.  This is a request by
++     the master to receive a file from the slave.  I do not know how
++     SVR4 UUCP or QFT implement file transfer restart in this case.
++
++    FROM
++          This is the name of the file on the slave which the master
++          wishes to receive.  It must not be in the spool directory,
++          and it may not contain any wildcards.
++
++    TO
++          This is the name of the file to create on the master.  I do
++          not believe that it can be a directory.  It may only be in
++          the spool directory if this file is being requested to
++          support an execution either on the master or on some system
++          other than the slave.
++
++    USER
++          The name of the user who requested the transfer.
++
++    OPTIONS
++          A list of options to control the transfer.  The following
++          options are defined (all options are single characters):
++         `d'
++               The master should create directories as necessary (this
++               is the default).
++
++         `f'
++               The master should not create directories if necessary,
++               but should fail the transfer instead.
++
++         `m'
++               The master should send mail to USER when the transfer is
++               complete.
++
++         `q'
++               Backslash quoting is applied to the FROM, TO, and USER
++               arguments.  *Note UUCP Protocol Commands::.  This option
++               was introduced in Taylor UUCP version 1.07.
++
++    SIZE
++          This only appears if Taylor UUCP size negotiation is being
++          used.  It specifies the largest file which the master is
++          prepared to accept (when using SVR4 UUCP or QFT, this was
++          specified in the `-U' option during the initial handshake).
++
++     The slave then responds with an `R' command response.  UUPlus does
++     not support `R' requests, and always responds with `RN2'.
++
++    `RY MODE [SIZE]'
++          The slave is willing to send the file, and file transfer
++          begins.  The MODE argument is the octal mode of the file on
++          the slave.  The master treats this just as the slave does the
++          MODE argument in the send command, q.v.  I am told that SVR4
++          UUCP sends a trailing SIZE argument.  For some versions of
++          BSD UUCP, the MODE argument may have a trailing `M' character
++          (e.g., `RY 0666M').  This means that the slave wishes to
++          become the master.
++
++    `RN2'
++          The slave is not willing to send the file, either because it
++          is not permitted or because the file does not exist.  This
++          implies that the file request will never succeed.
++
++    `RN6'
++          This is only used by Taylor UUCP size negotiation.  It means
++          that the file is too large to send, either because of the
++          size limit specifies by the master or because the slave
++          considers it too large.  The file transfer might succeed
++          later, or it might not (this may be cleared up in a later
++          release of Taylor UUCP).
++
++    `RN9'
++          This is only used by Taylor UUCP (versions 1.05 and up) and
++          FSUUCP (versions 1.5 and up).  It means that the remote
++          system was unable to open another channel (see the discussion
++          of the `i' protocol for more information about channels).
++          This implies that the file transfer might succeed later.
++
++     If the slave responds with `RY', a file transfer begins.  When the
++     file transfer is complete, the master sends a `C' command.  The
++     slave pretty much ignores this, although it may log it.
++
++    `CY'
++          The file transfer was successful.
++
++    `CN5'
++          The temporary file could not be moved into the final location.
++
++     After the `C' command response has been sent (in the `RY' case) or
++     immediately (in an `RN' case) the master will send another command.
++
++\x1f
++File: uucp.info,  Node: The X Command,  Next: The E Command,  Prev: The R Command,  Up: UUCP Protocol Commands
++
++6.5.2.3 The X Command
++.....................
++
++master: `X FROM TO USER -OPTIONS'
++     The `X' and the `-' are literal characters.  This is a request by
++     the master to, in essence, execute uucp on the slave.  The slave
++     should execute `uucp FROM TO'.
++
++    FROM
++          This is the name of the file or files on the slave which the
++          master wishes to transfer.  Any wildcards are expanded on the
++          slave.  If the master is requesting that the files be
++          transferred to itself, the request would normally contain
++          wildcard characters, since otherwise an `R' command would
++          suffice.  The master can also use this command to request
++          that the slave transfer files to a third system.
++
++    TO
++          This is the name of the file or directory to which the files
++          should be transferred.  This will normally use a UUCP name.
++          For example, if the master wishes to receive the files
++          itself, it would use `master!path'.
++
++    USER
++          The name of the user who requested the transfer.
++
++    OPTIONS
++          A list of options to control the transfer.  As far as I know,
++          only one option is defined:
++         `q'
++               Backslash quoting is applied to the FROM, TO, and USER
++               arguments.  *Note UUCP Protocol Commands::.  This option
++               was introduced in Taylor UUCP version 1.07.
++
++     The slave then responds with an `X' command response.  FSUUCP does
++     not support `X' requests, and always responds with `XN'.
++
++    `XY'
++          The request was accepted, and the appropriate file transfer
++          commands have been queued up for later processing.
++
++    `XN'
++          The request was denied.  No particular reason is given.
++
++     In either case, the master will then send another command.
++
++\x1f
++File: uucp.info,  Node: The E Command,  Next: The H Command,  Prev: The X Command,  Up: UUCP Protocol Commands
++
++6.5.2.4 The E Command
++.....................
++
++master: `E FROM TO USER -OPTIONS TEMP MODE NOTIFY SIZE COMMAND'
++     The `E' command is only supported by Taylor UUCP 1.04 and up.  It
++     is used to make an execution request without requiring a separate
++     `X.*' file.  *Note Execution File Format::.  It is only used when
++     the command to be executed requires a single input file which is
++     passed to it as standard input.
++
++     All the fields have the same meaning as they do for an `S' command,
++     except for OPTIONS and COMMAND.
++
++    OPTIONS
++          A list of options to control the transfer.  The following
++          options are defined (all options are single characters):
++         `C'
++               The file has been copied to the spool directory (the
++               master should use TEMP rather than FROM).
++
++         `c'
++               The file has not been copied to the spool directory
++               (this is the default).
++
++         `N'
++               No mail message should be sent, even if the command
++               fails.  This is the equivalent of the `N' command in an
++               `X.*' file.
++
++         `Z'
++               A mail message should be sent if the command fails (this
++               is generally the default in any case).  This is the
++               equivalent of the `Z' command in an `X.*' file.
++
++         `R'
++               Mail messages about the execution should be sent to the
++               address in the NOTIFY field.  This is the equivalent of
++               the `R' command in an `X.*' file.
++
++         `e'
++               The execution should be done with `/bin/sh'.  This is the
++               equivalent of the `e' command in an `X.*' file.
++
++         `q'
++               Backslash quoting is applied to the FROM, TO, USER, and
++               NOTIFY arguments.  *Note UUCP Protocol Commands::.  This
++               option was introduced in Taylor UUCP version 1.07.  Note
++               that the COMMAND argument is not backslash quoted--that
++               argument is defined as the remainder of the line, and so
++               is already permitted to contain any character.
++
++    COMMAND
++          The command which should be executed.  This is the equivalent
++          of the `C' command in an `X.*' file.
++
++     The slave then responds with an `E' command response.  These are
++     the same as the `S' command responses, but the initial character is
++     `E' rather than `S'.
++
++     If the slave responds with `EY', the file transfer begins.  When
++     the file transfer is complete, the slave sends a `C' command
++     response, just as for the `S' command.  After a successful file
++     transfer, the slave is responsible for arranging for the command
++     to be executed.  The transferred file is passed as standard input,
++     as though it were named in the `I' and `F' commands of an `X.*'
++     file.
++
++     After the `C' command response has been received (in the `EY'
++     case) or immediately (in an `EN' case) the master will send another
++     command.
++
++\x1f
++File: uucp.info,  Node: The H Command,  Prev: The E Command,  Up: UUCP Protocol Commands
++
++6.5.2.5 The H Command
++.....................
++
++master: `H'
++     This is used by the master to hang up the connection.  The slave
++     will respond with an `H' command response.
++
++    `HY'
++          The slave agrees to hang up the connection.  In this case the
++          master sends another `HY' command.  In some UUCP packages the
++          slave will then send a third `HY' command.  At this point the
++          protocol is shut down, and the final handshake is begun.
++
++    `HN'
++          The slave does not agree to hang up.  In this case the master
++          and the slave exchange roles.  The next command will be sent
++          by the former slave, which is the new master.  The roles may
++          be reversed several times during a single connection.
++
++\x1f
++File: uucp.info,  Node: The Final Handshake,  Prev: UUCP Protocol Commands,  Up: UUCP Protocol
++
++6.5.3 The Final Handshake
++-------------------------
++
++After the protocol has been shut down, the final handshake is performed.
++This handshake has no real purpose, and some UUCP packages simply drop
++the connection rather than do it (in fact, some will drop the connection
++immediately after both sides agree to hangup, without even closing down
++the protocol).
++
++caller: `\020OOOOOO\000'
++
++called: `\020OOOOOOO\000'
++
++   That is, the calling UUCP sends six `O' characters and the called
++UUCP replies with seven `O' characters.  Some UUCP packages always send
++six `O' characters.
++
++\x1f
++File: uucp.info,  Node: g Protocol,  Next: f Protocol,  Prev: UUCP Protocol,  Up: Protocols
++
++6.6 UUCP `g' Protocol
++=====================
++
++The `g' protocol is a packet based flow controlled error correcting
++protocol that requires an eight bit clear connection.  It is the
++original UUCP protocol, and is supported by all UUCP implementations.
++Many implementations of it are only able to support small window and
++packet sizes, specifically a window size of 3 and a packet size of 64
++bytes, but the protocol itself can support up to a window size of 7 and
++a packet size of 4096 bytes.  Complaints about the inefficiency of the
++`g' protocol generally refer to specific implementations, rather than
++to the correctly implemented protocol.
++
++   The `g' protocol was originally designed for general packet drivers,
++and thus contains some features that are not used by UUCP, including an
++alternate data channel and the ability to renegotiate packet and window
++sizes during the communication session.
++
++   The `g' protocol is spoofed by many Telebit modems.  When spoofing
++is in effect, each Telebit modem uses the `g' protocol to communicate
++with the attached computer, but the data between the modems is sent
++using a Telebit proprietary error correcting protocol.  This allows for
++very high throughput over the Telebit connection, which, because it is
++half-duplex, would not normally be able to handle the `g' protocol very
++well at all.  When a Telebit is spoofing the `g' protocol, it forces
++the packet size to be 64 bytes and the window size to be 3.
++
++   This discussion of the `g' protocol explains how it works, but does
++not discuss useful error handling techniques.  Some discussion of this
++can be found in Jamie E. Hanrahan's paper, cited above (*note UUCP
++Protocol Sources::).
++
++   All `g' protocol communication is done with packets.  Each packet
++begins with a six byte header.  Control packets consist only of the
++header.  Data packets contain additional data.
++
++   The header is as follows:
++
++`\020'
++     Every packet begins with a `^P'.
++
++K (1 <= K <= 9)
++     The K value is always 9 for a control packet.  For a data packet,
++     the K value indicates how much data follows the six byte header.
++     The amount of data is 2 ** (K + 4), where ** indicates
++     exponentiation.  Thus a K value of 1 means 32 data bytes and a K
++     value of 8 means 4096 data bytes.  The K value for a data packet
++     must be between 1 and 8 inclusive.
++
++checksum low byte
++checksum high byte
++     The checksum value is described below.
++
++control byte
++     The control byte indicates the type of packet, and is described
++     below.
++
++xor byte
++     This byte is the xor of K, the checksum low byte, the checksum
++     high byte and the control byte (i.e., the second, third, fourth and
++     fifth header bytes).  It is used to ensure that the header data is
++     valid.
++
++   The control byte in the header is composed of three bit fields,
++referred to here as TT (two bits), XXX (three bits) and YYY (three
++bits).  The control is TTXXXYYY, or `(TT << 6) + (XXX << 3) + YYY'.
++
++   The TT field takes on the following values:
++
++`0'
++     This is a control packet.  In this case the K byte in the header
++     must be 9.  The XXX field indicates the type of control packet;
++     these types are described below.
++
++`1'
++     This is an alternate data channel packet.  This is not used by
++     UUCP.
++
++`2'
++     This is a data packet, and the entire contents of the attached data
++     field (whose length is given by the K byte in the header) are
++     valid.  The XXX and YYY fields are described below.
++
++`3'
++     This is a short data packet.  Let the length of the data field (as
++     given by the K byte in the header) be L.  Let the first byte in
++     the data field be B1.  If B1 is less than 128 (if the most
++     significant bit of B1 is 0), then there are `L - B1' valid bytes
++     of data in the data field, beginning with the second byte.  If `B1
++     >= 128', let B2 be the second byte in the data field.  Then there
++     are `L - ((B1 & 0x7f) + (B2 << 7))' valid bytes of data in the
++     data field, beginning with the third byte.  In all cases L bytes
++     of data are sent (and all data bytes participate in the checksum
++     calculation) but some of the trailing bytes may be dropped by the
++     receiver.  The XXX and YYY fields are described below.
++
++   In a data packet (short or not) the XXX field gives the sequence
++number of the packet.  Thus sequence numbers can range from 0 to 7,
++inclusive.  The YYY field gives the sequence number of the last
++correctly received packet.
++
++   Each communication direction uses a window which indicates how many
++unacknowledged packets may be transmitted before waiting for an
++acknowledgement.  The window may range from 1 to 7, and may be different
++in each direction. For example, if the window is 3 and the last packet
++acknowledged was packet number 6, packet numbers 7, 0 and 1 may be sent
++but the sender must wait for an acknowledgement before sending packet
++number 2.  This acknowledgement could come as the YYY field of a data
++packet, or as the YYY field of a `RJ' or `RR' control packet (described
++below).
++
++   Each packet must be transmitted in order (the sender may not skip
++sequence numbers).  Each packet must be acknowledged, and each packet
++must be acknowledged in order.
++
++   In a control packet, the XXX field takes on the following values:
++
++1 `CLOSE'
++     The connection should be closed immediately.  This is typically
++     sent when one side has seen too many errors and wants to give up.
++     It is also sent when shutting down the protocol.  If an unexpected
++     `CLOSE' packet is received, a `CLOSE' packet should be sent in
++     reply and the `g' protocol should halt, causing UUCP to enter the
++     final handshake.
++
++2 `RJ' or `NAK'
++     The last packet was not received correctly.  The YYY field
++     contains the sequence number of the last correctly received packet.
++
++3 `SRJ'
++     Selective reject.  The YYY field contains the sequence number of a
++     packet that was not received correctly, and should be
++     retransmitted.  This is not used by UUCP, and most implementations
++     will not recognize it.
++
++4 `RR' or `ACK'
++     Packet acknowledgement.  The YYY field contains the sequence
++     number of the last correctly received packet.
++
++5 `INITC'
++     Third initialization packet.  The YYY field contains the maximum
++     window size to use.
++
++6 `INITB'
++     Second initialization packet.  The YYY field contains the packet
++     size to use.  It requests a size of 2 ** (YYY + 5).  Note that
++     this is not the same coding used for the K byte in the packet
++     header (it is 1 less).  Most UUCP implementations that request a
++     packet size larger than 64 bytes can handle any packet size up to
++     that specified.
++
++7 `INITA'
++     First initialization packet.  The YYY field contains the maximum
++     window size to use.
++
++   To compute the checksum, call the control byte (the fifth byte in the
++header) C.
++
++   The checksum of a control packet is simply `0xaaaa - C'.
++
++   The checksum of a data packet is `0xaaaa - (CHECK ^ C)', where `^'
++denotes exclusive or, and CHECK is the result of the following routine
++as run on the contents of the data field (every byte in the data field
++participates in the checksum, even for a short data packet).  Below is
++the routine used by an early version of Taylor UUCP; it is a slightly
++modified version of a routine which John Gilmore patched from G.L.
++Chesson's original paper.  The `z' argument points to the data and the
++`c' argument indicates how much data there is.
++
++     int
++     igchecksum (z, c)
++          register const char *z;
++          register int c;
++     {
++       register unsigned int ichk1, ichk2;
++
++       ichk1 = 0xffff;
++       ichk2 = 0;
++
++       do
++         {
++           register unsigned int b;
++
++           /* Rotate ichk1 left.  */
++           if ((ichk1 & 0x8000) == 0)
++             ichk1 <<= 1;
++           else
++             {
++               ichk1 <<= 1;
++               ++ichk1;
++             }
++
++           /* Add the next character to ichk1.  */
++           b = *z++ & 0xff;
++           ichk1 += b;
++
++           /* Add ichk1 xor the character position in the buffer counting from
++              the back to ichk2.  */
++           ichk2 += ichk1 ^ c;
++
++           /* If the character was zero, or adding it to ichk1 caused an
++              overflow, xor ichk2 to ichk1.  */
++           if (b == 0 || (ichk1 & 0xffff) < b)
++             ichk1 ^= ichk2;
++         }
++       while (--c > 0);
++
++       return ichk1 & 0xffff;
++     }
++
++   When the `g' protocol is started, the calling UUCP sends an `INITA'
++control packet with the window size it wishes the called UUCP to use.
++The called UUCP responds with an `INITA' packet with the window size it
++wishes the calling UUCP to use.  Pairs of `INITB' and `INITC' packets
++are then similarly exchanged.  When these exchanges are completed, the
++protocol is considered to have been started.
++
++   Note that the window and packet sizes are not a negotiation.  Each
++system announces the window and packet size which the other system
++should use.  It is possible that different window and packet sizes will
++be used in each direction.  The protocol works this way on the theory
++that each system knows how much data it can accept without getting
++overrun.  Therefore, each system tells the other how much data to send
++before waiting for an acknowledgement.
++
++   When a UUCP package transmits a command, it sends one or more data
++packets.  All the data packets will normally be complete, although some
++UUCP packages may send the last one as a short packet.  The command
++string is sent with a trailing null byte, to let the receiving package
++know when the command is finished.  Some UUCP packages require the last
++byte of the last packet sent to be null, even if the command ends
++earlier in the packet.  Some packages may require all the trailing bytes
++in the last packet to be null, but I have not confirmed this.
++
++   When a UUCP package sends a file, it will send a sequence of data
++packets.  The end of the file is signalled by a short data packet
++containing zero valid bytes (it will normally be preceeded by a short
++data packet containing the last few bytes in the file).
++
++   Note that the sequence numbers cover the entire communication
++session, including both command and file data.
++
++   When the protocol is shut down, each UUCP package sends a `CLOSE'
++control packet.
++
++\x1f
++File: uucp.info,  Node: f Protocol,  Next: t Protocol,  Prev: g Protocol,  Up: Protocols
++
++6.7 UUCP `f' Protocol
++=====================
++
++The `f' protocol is a seven bit protocol which checksums an entire file
++at a time.  It only uses the characters between `\040' and `\176'
++(ASCII `space' and `~') inclusive, as well as the carriage return
++character.  It can be very efficient for transferring text only data,
++but it is very inefficient at transferring eight bit data (such as
++compressed news).  It is not flow controlled, and the checksum is
++fairly insecure over large files, so using it over a serial connection
++requires handshaking (XON/XOFF can be used) and error correcting
++modems.  Some people think it should not be used even under those
++circumstances.
++
++   I believe that the `f' protocol originated in BSD versions of UUCP.
++It was originally intended for transmission over X.25 PAD links.
++
++   The `f' protocol has no startup or finish protocol.  However, both
++sides typically sleep for a couple of seconds before starting up,
++because they switch the terminal into XON/XOFF mode and want to allow
++the changes to settle before beginning transmission.
++
++   When a UUCP package transmits a command, it simply sends a string
++terminated by a carriage return.
++
++   When a UUCP package transmits a file, each byte B of the file is
++translated according to the following table:
++
++            0 <= B <=  037: 0172, B + 0100 (0100 to 0137)
++          040 <= B <= 0171:       B        ( 040 to 0171)
++         0172 <= B <= 0177: 0173, B - 0100 ( 072 to  077)
++         0200 <= B <= 0237: 0174, B - 0100 (0100 to 0137)
++         0240 <= B <= 0371: 0175, B - 0200 ( 040 to 0171)
++         0372 <= B <= 0377: 0176, B - 0300 ( 072 to  077)
++
++   That is, a byte between `\040' and `\171' inclusive is transmitted
++as is, and all other bytes are prefixed and modified as shown.
++
++   When all the file data is sent, a seven byte sequence is sent: two
++bytes of `\176' followed by four ASCII bytes of the checksum as printed
++in base 16 followed by a carriage return.  For example, if the checksum
++was 0x1234, this would be sent: `\176\1761234\r'.
++
++   The checksum is initialized to 0xffff.  For each byte that is sent
++it is modified as follows (where B is the byte before it has been
++transformed as described above):
++
++           /* Rotate the checksum left.  */
++           if ((ichk & 0x8000) == 0)
++             ichk <<= 1;
++           else
++             {
++               ichk <<= 1;
++               ++ichk;
++             }
++
++           /* Add the next byte into the checksum.  */
++           ichk += B;
++
++   When the receiving UUCP sees the checksum, it compares it against its
++own calculated checksum and replies with a single character followed by
++a carriage return.
++
++`G'
++     The file was received correctly.
++
++`R'
++     The checksum did not match, and the file should be resent from the
++     beginning.
++
++`Q'
++     The checksum did not match, but too many retries have occurred and
++     the communication session should be abandoned.
++
++   The sending UUCP checks the returned character and acts accordingly.
++
++\x1f
++File: uucp.info,  Node: t Protocol,  Next: e Protocol,  Prev: f Protocol,  Up: Protocols
++
++6.8 UUCP `t' Protocol
++=====================
++
++The `t' protocol is intended for use on links which provide reliable
++end-to-end connections, such as TCP.  It does no error checking or flow
++control, and requires an eight bit clear channel.
++
++   I believe the `t' protocol originated in BSD versions of UUCP.
++
++   When a UUCP package transmits a command, it first gets the length of
++the command string, C.  It then sends `((C / 512) + 1) * 512' bytes
++(the smallest multiple of 512 which can hold C bytes plus a null byte)
++consisting of the command string itself followed by trailing null bytes.
++
++   When a UUCP package sends a file, it sends it in blocks.  Each block
++contains at most 1024 bytes of data.  Each block consists of four bytes
++containing the amount of data in binary (most significant byte first,
++the same format as used by the Unix function `htonl') followed by that
++amount of data.  The end of the file is signalled by a block containing
++zero bytes of data.
++
++\x1f
++File: uucp.info,  Node: e Protocol,  Next: Big G Protocol,  Prev: t Protocol,  Up: Protocols
++
++6.9 UUCP `e' Protocol
++=====================
++
++The `e' protocol is similar to the `t' protocol.  It does no flow
++control or error checking and is intended for use over networks
++providing reliable end-to-end connections, such as TCP.
++
++   The `e' protocol originated in versions of HDB UUCP.
++
++   When a UUCP package transmits a command, it simply sends the command
++as an ASCII string terminated by a null byte.
++
++   When a UUCP package transmits a file, it sends the complete size of
++the file as an ASCII decimal number.  The ASCII string is padded out to
++20 bytes with null bytes (i.e. if the file is 1000 bytes long, it sends
++`1000\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0').  It then sends the entire file.
++
++\x1f
++File: uucp.info,  Node: Big G Protocol,  Next: i Protocol,  Prev: e Protocol,  Up: Protocols
++
++6.10 UUCP `G' Protocol
++======================
++
++The `G' protocol is used by SVR4 UUCP.  It is identical to the `g'
++protocol, except that it is possible to modify the window and packet
++sizes.  The SVR4 implementation of the `g' protocol reportedly is fixed
++at a packet size of 64 and a window size of 7.  Supposedly SVR4 chose
++to implement a new protocol using a new letter to avoid any potential
++incompatibilities when using different packet or window sizes.
++
++   Most implementations of the `g' protocol that accept packets larger
++than 64 bytes will also accept packets smaller than whatever they
++requested in the `INITB' packet.  The SVR4 `G' implementation is an
++exception; it will only accept packets of precisely the size it
++requests in the INITB packet.
++
++\x1f
++File: uucp.info,  Node: i Protocol,  Next: j Protocol,  Prev: Big G Protocol,  Up: Protocols
++
++6.11 UUCP `i' Protocol
++======================
++
++The `i' protocol was written by Ian Lance Taylor (who also wrote this
++manual).  It was first used by Taylor UUCP version 1.04.
++
++   It is a sliding window packet protocol, like the `g' protocol, but
++it supports bidirectional transfers (i.e., file transfers in both
++directions simultaneously).  It requires an eight bit clear connection.
++Several ideas for the protocol were taken from the paper `A
++High-Throughput Message Transport System' by P. Lauder.  I don't know
++where the paper was published, but the author's e-mail address is
++<piers@cs.su.oz.au>.  The `i' protocol does not adopt his main idea,
++which is to dispense with windows entirely.  This is because some links
++still do require flow control and, more importantly, because using
++windows sets a limit to the amount of data which the protocol must be
++able to resend upon request.  To reduce the costs of window
++acknowledgements, the protocol uses a large window and only requires an
++ack at the halfway point.
++
++   Each packet starts with a six byte header, optionally followed by
++data bytes with a four byte checksum.  There are currently five defined
++packet types (`DATA', `SYNC', `ACK', `NAK', `SPOS', `CLOSE') which are
++described below.  Although any packet type may include data, any data
++provided with an `ACK', `NAK' or `CLOSE' packet is ignored.
++
++   Every `DATA', `SPOS' and `CLOSE' packet has a sequence number.  The
++sequence numbers are independent for each side.  The first packet sent
++by each side is always number 1.  Each packet is numbered one greater
++than the previous packet, modulo 32.
++
++   Every packet has a local channel number and a remote channel number.
++For all packets at least one channel number is zero.  When a UUCP
++command is sent to the remote system, it is assigned a non-zero local
++channel number.  All packets associated with that UUCP command sent by
++the local system are given the selected local channel number.  All
++associated packets sent by the remote system are given the selected
++number as the remote channel number.  This permits each UUCP command to
++be uniquely identified by the channel number on the originating system,
++and therefore each UUCP package can associate all file data and UUCP
++command responses with the appropriate command.  This is a requirement
++for bidirectional UUCP transfers.
++
++   The protocol maintains a single global file position, which starts
++at 0.  For each incoming packet, any associated data is considered to
++occur at the current file position, and the file position is
++incremented by the amount of data contained.  The exception is a packet
++of type `SPOS', which is used to change the file position.  The reason
++for keeping track of the file position is described below.
++
++   The header is as follows:
++
++`\007'
++     Every packet begins with `^G'.
++
++`(PACKET << 3) + LOCCHAN'
++     The five bit packet number combined with the three bit local
++     channel number.  `DATA', `SPOS' and `CLOSE' packets use the packet
++     sequence number for the PACKET field.  `NAK' packet types use the
++     PACKET field for the sequence number to be resent.  `ACK' and
++     `SYNC' do not use the PACKET field, and generally leave it set to
++     0.  Packets which are not associated with a UUCP command from the
++     local system use a local channel number of 0.
++
++`(ACK << 3) + REMCHAN'
++     The five bit packet acknowledgement combined with the three bit
++     remote channel number.  The packet acknowledgement is the number
++     of the last packet successfully received; it is used by all packet
++     types.  Packets which are not sent in response to a UUCP command
++     from the remote system use a remote channel number of 0.
++
++`(TYPE << 5) + (CALLER << 4) + LEN1'
++     The three bit packet type combined with the one bit packet
++     direction combined with the upper four bits of the data length.
++     The packet direction bit is always 1 for packets sent by the
++     calling UUCP, and 0 for packets sent by the called UUCP.  This
++     prevents confusion caused by echoed packets.
++
++LEN2
++     The lower eight bits of the data length.  The twelve bits of data
++     length permit packets ranging in size from 0 to 4095 bytes.
++
++CHECK
++     The exclusive or of the second through fifth bytes of the header.
++     This provides an additional check that the header is valid.
++
++   If the data length is non-zero, the packet is immediately followed by
++the specified number of data bytes.  The data bytes are followed by a
++four byte CRC 32 checksum, with the most significant byte first.  The
++CRC is calculated over the contents of the data field.
++
++   The defined packet types are as follows:
++
++0 `DATA'
++     This is a plain data packet.
++
++1 `SYNC'
++     `SYNC' packets are exchanged when the protocol is initialized, and
++     are described further below.  `SYNC' packets do not carry sequence
++     numbers (that is, the PACKET field is ignored).
++
++2 `ACK'
++     This is an acknowledgement packet.  Since `DATA' packets also carry
++     packet acknowledgements, `ACK' packets are only used when one side
++     has no data to send.  `ACK' packets do not carry sequence numbers.
++
++3 `NAK'
++     This is a negative acknowledgement.  This is sent when a packet is
++     received incorrectly, and means that the packet number appearing
++     in the PACKET field must be resent.  `NAK' packets do not carry
++     sequence numbers (the PACKET field is already used).
++
++4 `SPOS'
++     This packet changes the file position.  The packet contains four
++     bytes of data holding the file position, most significant byte
++     first.  The next packet received will be considered to be at the
++     named file position.
++
++5 `CLOSE'
++     When the protocol is shut down, each side sends a `CLOSE' packet.
++     This packet does have a sequence number, which could be used to
++     ensure that all packets were correctly received (this is not
++     needed by UUCP, however, which uses the higher level `H' command
++     with an `HY' response).
++
++   When the protocol starts up, both systems send a `SYNC' packet.  The
++`SYNC' packet includes at least three bytes of data.  The first two
++bytes are the maximum packet size the remote system should send, most
++significant byte first.  The third byte is the window size the remote
++system should use.  The remote system may send packets of any size up
++to the maximum.  If there is a fourth byte, it is the number of
++channels the remote system may use (this must be between 1 and 7,
++inclusive).  Additional data bytes may be defined in the future.
++
++   The window size is the number of packets that may be sent before a
++packet is acknowledged.  There is no requirement that every packet be
++acknowledged; any acknowledgement is considered to acknowledge all
++packets through the number given.  In the current implementation, if one
++side has no data to send, it sends an `ACK' when half the window is
++received.
++
++   Note that the `NAK' packet corresponds to the unused `g' protocol
++`SRJ' packet type, rather than to the `RJ' packet type.  When a `NAK'
++is received, only the named packet should be resent, not any subsequent
++packets.
++
++   Note that if both sides have data to send, but a packet is lost, it
++is perfectly reasonable for one side to continue sending packets, all of
++which will acknowledge the last packet correctly received, while the
++system whose packet was lost will be unable to send a new packet because
++the send window will be full.  In this circumstance, neither side will
++time out and one side of the communication will be effectively shut down
++for a while.  Therefore, any system with outstanding unacknowledged
++packets should arrange to time out and resend a packet even if data is
++being received.
++
++   Commands are sent as a sequence of data packets with a non-zero local
++channel number.  The last data packet for a command includes a trailing
++null byte (normally a command will fit in a single data packet).  Files
++are sent as a sequence of data packets ending with one of length zero.
++
++   The channel numbers permit a more efficient implementation of the
++UUCP file send command.  Rather than send the command and then wait for
++the `SY' response before sending the file, the file data is sent
++beginning immediately after the `S' command is sent.  If an `SN'
++response is received, the file send is aborted, and a final data packet
++of length zero is sent to indicate that the channel number may be
++reused.  If an `SY' reponse with a file position indicator is received,
++the file send adjusts to the file position; this is why the protocol
++maintains a global file position.
++
++   Note that the use of channel numbers means that each UUCP system may
++send commands and file data simultaneously.  Moreover, each UUCP system
++may send multiple files at the same time, using the channel number to
++disambiguate the data.  Sending a file before receiving an
++acknowledgement for the previous file helps to eliminate the round trip
++delays inherent in other UUCP protocols.
++
+--- uucp-1.07.orig/unix/pipe.c
++++ uucp-1.07/unix/pipe.c
+@@ -199,6 +199,7 @@ fspipe_dial (qconn, puuconf, qsys, zphon
+   struct ssysdep_conn *q;
+   int aidescs[3];
+   const char **pzprog;
++  char **p;
+ 
+   q = (struct ssysdep_conn *) qconn->psysdep;
+ 
+@@ -211,6 +212,11 @@ fspipe_dial (qconn, puuconf, qsys, zphon
+       ulog (LOG_ERROR, "No command for pipe connection");
+       return FALSE;
+     }
++  
++  /* Look for a string \H and replaced it by the address given for this system */
++  for (p=pzprog; *p; p++)
++    if (!strcmp(*p, "\\H"))
++      *p = zphone;
+ 
+   aidescs[0] = SPAWN_WRITE_PIPE;
+   aidescs[1] = SPAWN_READ_PIPE;
+--- uucp-1.07.orig/contrib/uurate.c
++++ uucp-1.07/contrib/uurate.c
+@@ -216,7 +216,7 @@ struct Protocol_Summary
+ struct Host_entry
+     {
+     struct Host_entry *next;
+-    char Hostname[32];
++    char Hostname[MAXHOSTNAMELEN];
+     struct Execution_Command *cmds;      /* Local Activities */
+     struct Phone_Call call[2];            /* In & Out Activities */
+     struct Protocol_Summary *proto;
+--- uucp-1.07.orig/contrib/Makefile.uurt
++++ uucp-1.07/contrib/Makefile.uurt
+@@ -17,9 +17,9 @@ MAN=$(prefix)/man/man1
+ newconfigdir = $(prefix)/conf/uucp
+ 
+ # Flags to use when compiling uurate
+-CC=gcc -O2
+-CFLAGS=-I.. -Wall
+-LDFLAGS=-s -lm
++CC=gcc
++CFLAGS+=-I..
++LDFLAGS=-lm
+ 
+ SHELL=/bin/sh
+ PROGS=uurate
+ 
diff --git a/srcpkgs/uucp/patches/wait-for-correct-parent.patch b/srcpkgs/uucp/patches/wait-for-correct-parent.patch
new file mode 100644
index 000000000000..50bbcd9ed8ac
--- /dev/null
+++ b/srcpkgs/uucp/patches/wait-for-correct-parent.patch
@@ -0,0 +1,19 @@
+Description: wait for correct parent to die
+Author: Jörg Sommer <joerg@jo-so.de>
+Index: uucp-1.07/unix/detach.c
+===================================================================
+--- uucp-1.07.orig/unix/detach.c	2019-03-02 16:36:11.238947732 +0100
++++ uucp-1.07/unix/detach.c	2019-03-02 16:37:21.850946777 +0100
+@@ -98,10 +98,8 @@
+       if (ipid != 0)
+ 	_exit (EXIT_SUCCESS);
+ 
+-      /* We'll always wind up as a child of process number 1, right?
+-	 Right?  We have to wait for our parent to die before
+-	 reenabling SIGHUP.  */
+-      while (getppid () != 1)
++      /* We have to wait for our parent to die before reenabling SIGHUP. */
++      while (getppid () == igrp)
+ 	sleep (1);
+ 
+       ipid = getpid ();
diff --git a/srcpkgs/uucp/patches/zpipe-improved-pipe.patch b/srcpkgs/uucp/patches/zpipe-improved-pipe.patch
new file mode 100644
index 000000000000..fef1c42a2c52
--- /dev/null
+++ b/srcpkgs/uucp/patches/zpipe-improved-pipe.patch
@@ -0,0 +1,40 @@
+Author: Rafael Diniz <rafael@rhizomatica.org>
+Description: 
+ remove ATTRIBUTE_UNUSED of the parameter uucp-org.patch uses
+ add the possibility to send the system name to be called in pipe command
+ (use \Z as place holder for the system name)
+Index: uucp-1.07/unix/pipe.c
+===================================================================
+--- uucp-1.07.orig/unix/pipe.c	2019-08-17 23:06:47.774519770 +0200
++++ uucp-1.07/unix/pipe.c	2019-08-17 23:06:47.742519770 +0200
+@@ -225,8 +225,8 @@
+ fspipe_dial (qconn, puuconf, qsys, zphone, qdialer, ptdialer)
+      struct sconnection *qconn;
+      pointer puuconf;
+-     const struct uuconf_system *qsys ATTRIBUTE_UNUSED;
+-     const char *zphone ATTRIBUTE_UNUSED;
++     const struct uuconf_system *qsys;
++     const char *zphone;
+      struct uuconf_dialer *qdialer;
+      enum tdialerfound *ptdialer;
+ {
+@@ -246,12 +246,17 @@
+       ulog (LOG_ERROR, "No command for pipe connection");
+       return FALSE;
+     }
+-  
+-  /* Look for a string \H and replaced it by the address given for this system */
++
++  /* Look for a string \H and replace it by the address given for this system */
+   for (p=pzprog; *p; p++)
+     if (!strcmp(*p, "\\H"))
+       *p = zphone;
+ 
++  /* Look for a string \Z and replace by the system name to be called */
++  for (p=pzprog; *p; p++)
++    if (!strcmp(*p, "\\Z"))
++      *p = qsys->uuconf_zname;
++
+   aidescs[0] = SPAWN_WRITE_PIPE;
+   aidescs[1] = SPAWN_READ_PIPE;
+   aidescs[2] = SPAWN_NULL;
diff --git a/srcpkgs/uucp/template b/srcpkgs/uucp/template
new file mode 100644
index 000000000000..2b2b6f758fae
--- /dev/null
+++ b/srcpkgs/uucp/template
@@ -0,0 +1,39 @@
+# Template file for 'uucp'
+pkgname=uucp
+version=1.07
+revision=1
+build_style=gnu-configure
+conf_files="/etc/uucp/config /etc/uucp/sys1 /etc/uucp/port"
+makedepends="wget"
+short_desc="Taylor UUCP is a free implementation of UUCP"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://www.gnu.org/software/uucp/uucp.html"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c
+patch_args="-Np1"
+
+system_accounts="_uucp"
+_uucp_homedir="/var/spool/uucp"
+
+make_dirs="
+	/var/spool/uucp		0750 uucp uucp
+	/var/spool/uucppublic	0750 uucp uucp"
+
+pre_configure() {
+	sed -i 's|${CC-cc} -E|${CC-cc} -E|g' configure
+}
+do_install() {
+	make DESTDIR=${DESTDIR} install
+	vmkdir etc/uucp/
+	vinstall sample/config 0644 etc/uucp/
+	vinstall sample/sys1 0644 etc/uucp/
+	vinstall sample/port 0644 etc/uucp/
+	sed -i 's|\$\*|"$@"|' ${DESTDIR}/usr/bin/{uuto,uusched}
+	chmod u+w ${DESTDIR}/usr/bin/*
+	vman ${FILESDIR}/uulog.1
+	vman ${FILESDIR}/uuname.1
+	vman ${FILESDIR}/uupick.1
+	vman ${FILESDIR}/uuto.1
+	vman ${FILESDIR}/uusched.8
+}

From bb1088509bdab933631fa56e1ff62e00ec7e4d32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 12:28:43 +0200
Subject: [PATCH 1468/2561] krita: update to 5.0.5.

---
 srcpkgs/krita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..68e67ccb8157 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=5.0.2
+version=5.0.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -22,7 +22,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=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
+checksum=162fff4596484e688655d4636373b1a77bcea39824c655b477afc1463aaf2dae
 python_version=3
 replaces="calligra-krita>=0"
 make_check=no

From 1b23a594103926162505e36b6855afe9c90901af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 12:30:15 +0200
Subject: [PATCH 1469/2561] pioneer: update to 20220203.

---
 srcpkgs/pioneer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..9614ba1f1ade 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20220203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=415b55bab7f011f7244348428e13006fa67a926b9be71f2c4ad24e92cfeb051c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"

From c1493eeadf63fb428ed12ca8f24e5134bad5fc64 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Mon, 18 Apr 2022 12:09:41 -0500
Subject: [PATCH 1470/2561] google-chrome: update to 100.0.4896.127

---
 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 5f9e67c864f2..b20753366d95 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=100.0.4896.75
+version=100.0.4896.127
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=856934272783e5a48fa63e30eb896040f5b46d6f394c1b3aa2e461cbf89b395b
+checksum=d012bc3e5e000bffbd83cf20c48add187c52b065cc37408862c42d127aa4a656
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From a6c95c3aa98ab472e72f00364c1b0916943f6e24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 19:40:56 +0200
Subject: [PATCH 1471/2561] krita: remove patch

---
 ...5beaa1fdba03d38f887b93a15a58fc0830c7.patch | 50 -------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch

diff --git a/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch b/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch
deleted file mode 100644
index 6c9c71d4fca2..000000000000
--- a/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
-From: Sharaf Zaman <shzam@sdf.org>
-Date: Wed, 27 Oct 2021 22:19:07 +0000
-Subject: [PATCH] Fix build on linux clang targets
-
-In CheckAtomic.cmake we include is_lock_free because these routines
-don't seem to be included in the compiler's "simple atomics". This
-triggers a failure in clang toolchain, forcing it to link libatomic.
-
-Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
-
-CCBUG:444247
-CCBUG:444547
----
- cmake/modules/CheckAtomic.cmake | 1 +
- libs/image/CMakeLists.txt       | 6 ++----
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
-index b061e2d65b..df6b70504c 100644
---- a/cmake/modules/CheckAtomic.cmake
-+++ b/cmake/modules/CheckAtomic.cmake
-@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
- 	std::atomic<uint64_t> x (0);
- 	int main() {
- 		uint64_t i = x.load(std::memory_order_relaxed);
-+		x.is_lock_free();
- 		return 0;
- 	}
- 	" ${varname})
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index e883c7f1c8..43c945fad3 100644
---- a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
- 
- target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
- 
--if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
--    if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
--        target_link_libraries(kritaimage PUBLIC atomic)
--    endif()
-+if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
-+   target_link_libraries(kritaimage PUBLIC atomic)
- endif()
- 
- if(OpenEXR_FOUND)
--- 
-GitLab
-

From f579263d4ec79f983fe0bd2d8ee9446a20d72ff5 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sat, 9 Apr 2022 10:10:18 -0400
Subject: [PATCH 1472/2561] python3-trimesh: update to 3.10.8.

---
 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 e51b6eb62f9d..0a162818e7cb 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.10.7
+version=3.10.8
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -16,7 +16,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=e98fd2dff632729fc6fb963653b91d9f4a5a6a9a1f79493dd885e3e4d1f9c4da
+checksum=465d30b17e1f62c467283422eb932b70ff4807f9346f3012195ac94675c837f3
 
 post_install() {
 	vlicense LICENSE.md

From 462aa7eb9fb81b3538d844de142516543daf2832 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 18 Apr 2022 16:07:28 +0200
Subject: [PATCH 1473/2561] celluloid: update to 0.23.

---
 srcpkgs/celluloid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template
index c9f0461fb42e..739911562045 100644
--- a/srcpkgs/celluloid/template
+++ b/srcpkgs/celluloid/template
@@ -1,6 +1,6 @@
 # Template file for 'celluloid'
 pkgname=celluloid
-version=0.22
+version=0.23
 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=5fded5b7bbf15ef110548bcc980ceec981f5f1a70df77ad3f10e3ca4a449e5a1
+checksum=b22d1963d03f0215bce07c2de8e77892c322f500ae5c0fd6e2e84d2e13f04374
 
 gnome-mpv_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 456d5d37ebc225525b076cc5b2a50bead9ef40e8 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 18 Apr 2022 12:21:09 +0700
Subject: [PATCH 1474/2561] mdBook: update to 0.4.18

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index d2aa033512fa..d4b97f2a5d03 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.17
+version=0.4.18
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=9523d0bed63ce35eec5a8259eb963651cd7e37ec5644ef551134068a2fb72f89
+checksum=ce357327f4443189fde307103f8008f43410ca8b738c5c61401ada9a54b8b5b5
 
 post_install() {
 	vlicense LICENSE

From fc3ce7eaa157a9d882758839ccc083ec982f56d3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 18 Apr 2022 15:41:44 +0200
Subject: [PATCH 1475/2561] jpegoptim: update to 1.4.7.

---
 srcpkgs/jpegoptim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jpegoptim/template b/srcpkgs/jpegoptim/template
index d11aa4be4f78..13dbf5ffaedd 100644
--- a/srcpkgs/jpegoptim/template
+++ b/srcpkgs/jpegoptim/template
@@ -1,6 +1,6 @@
 # Template file for 'jpegoptim'
 pkgname=jpegoptim
-version=1.4.6
+version=1.4.7
 revision=1
 wrksrc="${pkgname}-RELEASE.${version}"
 build_style=gnu-configure
@@ -10,4 +10,4 @@ maintainer="archaeme <normandy@firemail.cc>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/tjko/jpegoptim"
 distfiles="https://github.com/tjko/jpegoptim/archive/RELEASE.${version}.tar.gz"
-checksum=c44dcfac0a113c3bec13d0fc60faf57a0f9a31f88473ccad33ecdf210b4c0c52
+checksum=9d2a13b7c531d122f360209422645206931c74ada76497c4aeb953610f0d70c1

From 6dcf5953c36fddaebc642bf1fe2e118c3ea9d5ff Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 17 Apr 2022 20:25:38 +0200
Subject: [PATCH 1476/2561] xh: update to 0.16.0

---
 srcpkgs/xh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xh/template b/srcpkgs/xh/template
index eddc9c125106..e40a27df688d 100644
--- a/srcpkgs/xh/template
+++ b/srcpkgs/xh/template
@@ -1,6 +1,6 @@
 # Template file for 'xh'
 pkgname=xh
-version=0.14.1
+version=0.16.0
 revision=1
 # depends on ring
 archs="x86_64* i686* armv[67]* aarch64*"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/ducaale/xh"
 changelog="https://raw.githubusercontent.com/ducaale/xh/master/CHANGELOG.md"
 distfiles="https://github.com/ducaale/xh/archive/v${version}.tar.gz"
-checksum=ca89e8a9a230ff16cc0bba5bd7ebdceb986eac84638e15b4928d737b9ec12776
+checksum=d6ec84977da567dd36a4c59d624dc1e2b1c77a21e2b0a10e463216120be8112d
 
 post_install() {
 	ln -sf ${pkgname} ${DESTDIR}/usr/bin/${pkgname}s

From c7a7678bd8f487e5379b00c02f73d9c79b5b474f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Apr 2022 19:34:19 +0200
Subject: [PATCH 1477/2561] sfeed: update to 1.4.

---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 46b4d83e558b..fd5f0fe156d7 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.3
+version=1.4
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -11,7 +11,7 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=49d32e98a47a80a2a6cbd5d816938057d4ca3910e0a6a814b2c2a6520fbda9ba
+checksum=3c90f4bef1becdf583cc0ae201e694459edcd024e1d76bfeed3f417ecc163498
 
 post_install() {
 	vlicense LICENSE

From a30821d190974a1f037742947926e14c92651893 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Apr 2022 19:10:10 +0200
Subject: [PATCH 1478/2561] xfce4-panel: update to 4.16.4.

---
 srcpkgs/xfce4-panel/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 210113d3d67d..ce83d56a6c70 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
-version=4.16.3
-revision=2
+version=4.16.4
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-locales-dir=/usr/share/locale
@@ -12,9 +12,9 @@ makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel
 short_desc="Next generation panel for the XFCE desktop environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://xfce.org/"
+homepage="https://docs.xfce.org/xfce/xfce4-panel/start"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=5934eaed8a76da52c29b734ccd79600255420333dd6ebd8fd9f066379af1e092
+checksum=1faf51a81a655244dba4c6ac9dd33e3ab0d78a9ee096c218b38fed6642c9cd84
 
 # Package build options
 build_options="gir"

From 66b32fbacf1af5a5a37173af717bec91c0c85d96 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 18:09:35 +0200
Subject: [PATCH 1479/2561] gnome-settings-daemon: remove pulseaudio dependency

---
 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 9f8c9857eec6..c8be36b2a457 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
 version=41.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -11,7 +11,7 @@ makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-dev
  libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel
  polkit-devel pulseaudio-devel startup-notification-devel upower-devel
  xf86-input-wacom-devel libXfixes-devel"
-depends="hicolor-icon-theme pulseaudio"
+depends="hicolor-icon-theme"
 checkdepends="elogind libnotify python3-dbusmock python3-gobject
  python3-pycodestyle which hwids eudev"
 short_desc="GNOME settings daemon"

From 1a20b58285290bac7ea62ab623bc134d28d6d8d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 18:09:35 +0200
Subject: [PATCH 1480/2561] mkchromecast: remove pulseaudio dependency

---
 srcpkgs/mkchromecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkchromecast/template b/srcpkgs/mkchromecast/template
index 161210796b90..306abdb6613f 100644
--- a/srcpkgs/mkchromecast/template
+++ b/srcpkgs/mkchromecast/template
@@ -1,11 +1,11 @@
 # Template file for 'mkchromecast'
 pkgname=mkchromecast
 version=0.3.8.1
-revision=4
+revision=5
 pycompile_dirs="/usr/share/mkchromecast/mkchromecast"
 depends="python3-Flask python3-netifaces python3-setuptools python3-requests
  python3-mutagen python3-psutil python3-PyQt5 python3-SoCo python3-chromecast
- python3-gobject pulseaudio python3-youtube-dl ffmpeg"
+ python3-gobject python3-youtube-dl ffmpeg"
 short_desc="Cast Linux Audio/Video to Google cast and Sonos devices"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From d1d7e6380871c117d0e1cbedb3d8af72cf6e13f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 18:09:35 +0200
Subject: [PATCH 1481/2561] pasystray: remove pulseaudio dependency

---
 srcpkgs/pasystray/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/pasystray/template b/srcpkgs/pasystray/template
index a25bcc5af5b8..fc553ddc05fe 100644
--- a/srcpkgs/pasystray/template
+++ b/srcpkgs/pasystray/template
@@ -1,12 +1,11 @@
 # Template file for 'pasystray'
 pkgname=pasystray
 version=0.7.1
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool automake"
 makedepends="gtk+3-devel pulseaudio-devel libnotify-devel"
-depends="pulseaudio"
 short_desc="PulseAudio System Tray"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"

From 110be3b92986eeb5d1f63f30c06904085720aa6d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 15:55:01 -0700
Subject: [PATCH 1482/2561] kitinerary: temporarily ignore test failure

This test was fixed upstream, so this should be
 able to be removed after the next update
---
 .../temporarily-disable-broken-test.patch        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch

diff --git a/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch b/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch
new file mode 100644
index 000000000000..4e7bb1ce88bd
--- /dev/null
+++ b/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch
@@ -0,0 +1,16 @@
+Temporarily disable the calendarhandler test.
+This test has been fixed upstream, so this should be able to be
+ removed in the next release.
+
+diff -Naur a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+--- a/autotests/CMakeLists.txt	2022-04-18 11:34:57.356111303 -0700
++++ b/autotests/CMakeLists.txt	2022-04-18 11:33:56.175938220 -0700
+@@ -35,7 +35,7 @@
+ ecm_add_test(postprocessortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
+ ecm_add_test(extractorvalidatortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
+ if (TARGET KF5::CalendarCore)
+-    ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
++   #ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
+     ecm_add_test(extractortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary KPim::PkPass)
+ endif()
+ ecm_add_test(documentutiltest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)

From 0f29e7b0520757e55303a1677abecbab6f3c0fde Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 18 Apr 2022 15:22:04 +0700
Subject: [PATCH 1483/2561] signond: update to 8.61

---
 srcpkgs/signond/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/signond/template b/srcpkgs/signond/template
index 9a2f0cff8c26..6a3bb44122ab 100644
--- a/srcpkgs/signond/template
+++ b/srcpkgs/signond/template
@@ -1,7 +1,7 @@
 # Template file for 'signond'
 pkgname=signond
-version=8.60
-revision=3
+version=8.61
+revision=1
 wrksrc="signond-VERSION_${version}"
 build_style=qmake
 configure_args="LIBDIR=/usr/lib"
@@ -13,7 +13,7 @@ maintainer="John Rowley <enterthevoid@codesector.co>"
 license="LGPL-2.1-only"
 homepage="https://gitlab.com/accounts-sso/signond"
 distfiles="${homepage}/-/archive/VERSION_${version}/signond-VERSION_${version}.tar.gz"
-checksum=0da2a080e4b01f44855d1a519f828007a5c756ee93827db9098a1b4b880f28fe
+checksum=3dd57c25e1bf1583b2cb857f96831e38e73d40264ff66ca43e63bb7233f76828
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then

From 454e6d330e94b23777c35f52570370cd72939975 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 18:17:16 +0200
Subject: [PATCH 1484/2561] aisleriot: update to 3.22.22.

---
 srcpkgs/aisleriot/patches/guile-2.2.patch | 36 -----------------------
 srcpkgs/aisleriot/template                |  4 +--
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/aisleriot/patches/guile-2.2.patch

diff --git a/srcpkgs/aisleriot/patches/guile-2.2.patch b/srcpkgs/aisleriot/patches/guile-2.2.patch
deleted file mode 100644
index eb2ce5610b44..000000000000
--- a/srcpkgs/aisleriot/patches/guile-2.2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5e9b538db5304ccfed6c0d048a94d8c47dd27e31 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jeremy.bicha@canonical.com>
-Date: Thu, 17 Feb 2022 23:51:15 +0100
-Subject: [PATCH] games: Only use -Ono-letrectify with guile 3.0
-
-This fixes a build failure on guile 2.2 where this flag is unknown.
-
-Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/925
----
- games/meson.build | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/games/meson.build b/games/meson.build
-index e552beab..56819b4d 100644
---- a/games/meson.build
-+++ b/games/meson.build
-@@ -122,9 +122,13 @@ guile_warnings = [
-   '-W1',
- ]
- 
--guile_flags = [
--  '-Ono-letrectify',
--]
-+guile_flags = []
-+
-+if guile_version.version_compare('>= 3.0')
-+  guile_flags += [
-+    '-Ono-letrectify',
-+  ]
-+endif
- 
- # FIXME: this should use files('...') (allowed as per docs),
- # but that crashes meson, see https://gitlab.gnome.org/chpe/meson/issues/2
--- 
-GitLab
-
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d4d178b13c9e..11ad75cf3ad8 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.21
+version=3.22.22
 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=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655
+checksum=0666b7b35037f796334cda104be5bda65977053f3cab0a3928624da7f236f8ae
 replaces="aisleriot-data>=0"

From c15cfb1f413178d8f83eebd3de865c377a0aabb8 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Fri, 15 Apr 2022 15:27:17 +0200
Subject: [PATCH 1485/2561] qtractor: update to 0.9.26

---
 srcpkgs/qtractor/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index b9df4028f2ac..9ccd9cb666b7 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -1,8 +1,8 @@
 # Template file for 'qtractor'
 pkgname=qtractor
-version=0.9.24
+version=0.9.26
 revision=1
-_vst3sdk_tag=3.7.3_build_20
+_vst3sdk_tag=3.7.4_build_25
 wrksrc="qtractor-qtractor_${version//./_}"
 create_wrksrc=yes
 build_wrksrc="qtractor-qtractor_${version//./_}"
@@ -24,11 +24,11 @@ distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.ta
  https://github.com/steinbergmedia/vst3_base/archive/v$_vst3sdk_tag.tar.gz>vst3_base-v${_vst3sdk_tag}.tar.gz
  https://github.com/steinbergmedia/vst3_pluginterfaces/archive/v$_vst3sdk_tag.tar.gz>vst3_pluginterfaces-v${_vst3sdk_tag}.tar.gz
  https://github.com/steinbergmedia/vst3_public_sdk/archive/v$_vst3sdk_tag.tar.gz>vst3_public_sdk-v${_vst3sdk_tag}.tar.gz"
-checksum="724b80587f844cfc7c58c22d69d6ff1cd30c7752c2116e55837f468edb6bf4d1
- 815e51e84e6ed900f6103f00e847bee175c2dc95b16a73ae60719daa0e24ad95
- d69d28a6a932d3c946749c9aeb6220b028d7af7ab10f83e4e732e760347fe796
- 313f3e8c8f080d514763b3e88964a0820851d81f1159219628e1ed188fdb7303
- 63cd7e3bf0be8ec9b3934ebdc145e13af84004c988071ecbed1aa5c8f8277d80"
+checksum="bf1f89a805166e99ca4b9bfc66f8bb1d71a258bf611b1e9e90613cd46799e6a4
+ 24f79a670d8f3c7aac34e1340f2d12763beabc9229d61b6f806d850675c8c5f6
+ ee333bd17ad533135481c163d85c99fe4d3cdb3e49214eb5adb17ffb1897a423
+ 59326a77b5df73ec6a35925a4005874ee3e29a2dbd6e6b88905d03b90fc9c3a5
+ 3b321b7f2289c7204bceae1f6640d74b6cf35b474f98da7a50ed36c24e019831"
 
 post_extract() {
 	cd $wrksrc

From aa34d71e5518e54f88639f61bd7a83fcb22c607e Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Fri, 15 Apr 2022 12:21:27 +0200
Subject: [PATCH 1486/2561] mkvtoolnix: update to 67.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 98317332f361..7f84979ecc3f 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=66.0.0
+version=67.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ 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=73a3f6c39b3580f28233f93555d282d07d5f51a8bbeb8b0bee09b820de80692c
+checksum=db68be91ee8a0b688d924cc00d3bac9349306d54c29ce44a555728c1abb7d3ec
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 327a6833319bc7a4438e6a3c38ef18deca6e4c36 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 18 Mar 2022 17:42:40 +0200
Subject: [PATCH 1487/2561] yaru: update to 22.04.4.

---
 srcpkgs/yaru/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yaru/template b/srcpkgs/yaru/template
index c2bf7e2503af..94264394ad6d 100644
--- a/srcpkgs/yaru/template
+++ b/srcpkgs/yaru/template
@@ -1,6 +1,6 @@
 # Template file for 'yaru'
 pkgname=yaru
-version=22.04.1
+version=22.04.4
 revision=1
 build_style=meson
 configure_args="-Dxfwm4=true"
@@ -11,4 +11,4 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://github.com/ubuntu/yaru"
 distfiles="https://github.com/ubuntu/yaru/archive/$version.tar.gz"
-checksum=fbd4c19c16817eec74845d9723ebffb90f1897e0d085384f31f4b4d6c32a91ee
+checksum=e8b85d3b1965b4611b4280b4d53b8deafdac754f795a8aad43c22ddb3308025e

From 3088cbae527e41fba57664197a38d51ba19c70bf Mon Sep 17 00:00:00 2001
From: Barbaross <cullenrss@gmail.com>
Date: Mon, 18 Apr 2022 09:54:39 -0400
Subject: [PATCH 1488/2561] vit: update to 2.2.0

---
 srcpkgs/vit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vit/template b/srcpkgs/vit/template
index 173648d69b95..9eb3596b5d31 100644
--- a/srcpkgs/vit/template
+++ b/srcpkgs/vit/template
@@ -1,17 +1,17 @@
 # Template file for 'vit'
 pkgname=vit
-version=2.1.0
+version=2.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="task python3-pytz python3-urwid python3-tzlocal python3-tasklib"
+depends="task python3-urwid python3-tasklib"
 checkdepends="python3-pytest $depends"
 short_desc="Visual Interactive Taskwarrior full-screen terminal interface"
 maintainer="Cullen Ross <cullenrss@gmail.com>"
 license="MIT"
 homepage="https://github.com/vit-project/vit"
 distfiles="${PYPI_SITE}/v/vit/vit-${version}.tar.gz"
-checksum=fd34f0b827953dfdecdc39f8416d41c50c24576c33a512a047a71c1263eb3e0f
+checksum=e866c8739822b9e73152ab30c9a009c3aef947533c06f7a5cb244d15c4ea296f
 
 do_check() {
 	TERM=linux python3 -m pytest

From d38d67699eb5801d507ddc7a43675843ff120bd3 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 15 Apr 2022 07:54:08 +0200
Subject: [PATCH 1489/2561] pyradio: update to 0.8.9.16

---
 srcpkgs/pyradio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 1c2670682351..042fd3d257ee 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.8.9.14
+version=0.8.9.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="http://www.coderholic.com/pyradio/"
 changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=76e06934926a1acfd7bba3735d8e0b387d7985dd38a398376877b6fd7da71940
+checksum=2ccd644ea93a0538162fa673863d68e5934edd82350b2dacfffc33b2396f8aeb
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 76420c6b95f0bf9973185b0aa3250d400e7c1cfe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 17 Apr 2022 21:56:07 +0200
Subject: [PATCH 1490/2561] stress-ng: update to 0.14.00.

---
 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 d13629b279bc..986b096bf1c4 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.13.12
+version=0.14.00
 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="https://github.com/ColinIanKing/stress-ng/"
 distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=16540d9cfa80d6a274fc0238d7251675ee38df6d5be805d14a67ce9efcb59ce9
+checksum=d0cc53073e0c2499e15044fbd5a0df0176521575ea13fba01f67834b9e07d19d

From 06b828d490664c9e7f2819d31ae4484fe580bdbf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Apr 2022 14:14:36 +0200
Subject: [PATCH 1491/2561] babashka: update to 0.8.1.

---
 srcpkgs/babashka/template | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 5a2292af27bf..a8fbeff23b0d 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.7.8
+version=0.8.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -10,14 +10,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
 changelog="https://github.com/babashka/babashka/blob/master/CHANGELOG.md"
-_sci_commit=4eb8e99e18942ba9c3b7ec3c4707d8237f970035
-_babashka_curl_commit=3d3d117ea0f8a143a06e3cace92e4e8b6a5782df
+_sci_commit=2af989d0eb80741b026fd2355442033b05a3b181
+_babashka_curl_commit=8a27e6060a739c7580cc89ba2bfddf48881e7178
 _babashka_nrepl_commit=d3fce67198b042707f01d841c032f841cc57ab7f
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=5db9560eab698f9773537acb0167f38d6fd0d322
-_pods_commit=538fc6f4147badf3a457b3eb8f9f95dd3bc947b1
-_deps_clj_commit=6636890388cdf779708806a93110b165577cd226
-_fs_commit=2bf527f797d69b3f14247940958e0d7b509f3ce2
+_process_commit=1eebafc696e9bac7538c296d5a7c1fde977ad523
+_pods_commit=e075b13bfe3666a73f82c12817bdf5f1d6c692e3
+_deps_clj_commit=c948c2f5c1e240c0e0ea4201877695f729ee309e
+_fs_commit=dc73460e63ff10c701c353227f2689b3d7c33a43
 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
@@ -29,15 +29,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
  https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="23a08adcc9237be9f24c1781cb646514434dbcb651aac00c3eedca763ca25086
- 0766f0a8be23e94efefbfc16c5987f1dab4520da3294f1bccef402f97898c490
- 45abdaa5e4effd3bcfea777d02844d4634f1f80a592843eca9ec7d3544b7e16d
+checksum="e7084426aa86f79684e66b1ee112da26f2b9e05b259d7d19acbb1a7c8d380338
+ 0d8c40688df17c3441a1a6c1005dc11538ed841fc74fa12396d6057fdf88a5e2
+ d8e57bc67f237a5cfea90a6c38f9e303c1591250624087e348600af72e8910fa
  b56a06bf113bcd85084d48f595541447014308860d9c45efcde5b02e859c934c
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- b6671246a1f0742bd4ae4d1f7b0afe4101d6c8907060455e0473c2ef966e370c
- 7fea6762ecbb31d454e0b5c194d12e1e6d4ec301972aa33daf617b571e097678
- fee3f84f935d141cf7343d7bab19c3eef56fdb2f3dac4a950db71c9b083e0d17
- e5b92a25221b735941861968a5570a4169da1aee7f2a7545975afe930cb8574f
+ 09ea197a0381a1f5be268da5c1470646bef01eef85add16541e32e0bb2da5d1f
+ 4aca4c1e15576309f33352bbed9dd9e7f0af5eca9f725dd8593ae1cb32cae8c3
+ af8a90dba22d980e536a901b833ccf38816c8944b72b32c10d3134869eced4e2
+ af930f686933ef74b0d857abb0f763d6fe0d5b0452a4c13e5b10207288feae86
  bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"

From 0e23910758c807f7ef1f6d51b78a70c920aba407 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Apr 2022 14:15:48 +0200
Subject: [PATCH 1492/2561] jet: update to 0.1.1.

---
 srcpkgs/jet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template
index 58b209817581..0a0bb5113cf8 100644
--- a/srcpkgs/jet/template
+++ b/srcpkgs/jet/template
@@ -1,6 +1,6 @@
 # Template file for 'jet'
 pkgname=jet
-version=0.1.0
+version=0.1.1
 revision=1
 hostmakedepends="mandrel leiningen"
 makedepends="zlib-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://github.com/borkdude/jet"
 distfiles="https://github.com/borkdude/jet/archive/refs/tags/v${version}.tar.gz"
-checksum=faed01c3d31631332fa60fd6f1bb39ae4a2f6cfc396a8747d5cfce4f1053a99c
+checksum=2085cd757607eebfdcc6107f507e362b88952f5cd7139127ba9c47708bbd91c4
 nocross="mandrel"
 
 do_build() {

From 32b6746a2e0239871bb7188765fce00d5587d8e5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Apr 2022 14:17:16 +0200
Subject: [PATCH 1493/2561] bmake: update to 20220414.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 5eac7a6f158f..58cf70979203 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20220330
+version=20220414
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=4b46d95b6ae4b3311ba805ff7d5a19b9e37ac0e86880e296e2111f565b545092
+checksum=10ee07a7be26b22ce6a3bbc386e2916ca8e51b0ed2d256c271a7135e3c94f2a7
 python_version=3
 
 do_configure() {

From 5b515e8c6091c60eb460dca4c74f75ad0890fa89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 22 Sep 2020 23:20:57 +0200
Subject: [PATCH 1494/2561] yaboot: fix build w/ gcc10 and host i686/x86_64

The -fcommon is required for gcc10 to build yaboot.
Adding --build=$XBPS_TRIPLET seems to be a good idea in any case
according to the autoconf manual, see the document at:
https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Hosts-and-Cross_002dCompilation.html

Still gives an error for me trying to build for ppc-musl using any
x86 host environment, be it glibc or musl libc.

More patches required or something else may be wrong?
---
 srcpkgs/yaboot/patches/0003-build-system.patch | 6 ++++--
 srcpkgs/yaboot/template                        | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yaboot/patches/0003-build-system.patch b/srcpkgs/yaboot/patches/0003-build-system.patch
index 8fdf419f1870..6dcd018b34c2 100644
--- a/srcpkgs/yaboot/patches/0003-build-system.patch
+++ b/srcpkgs/yaboot/patches/0003-build-system.patch
@@ -22,7 +22,7 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
  # command used to get root (needed for tarball creation)
  GETROOT = fakeroot
  
-@@ -32,14 +32,17 @@ LD		:= $(CROSS)ld
+@@ -32,14 +32,18 @@ LD		:= $(CROSS)ld
  AS		:= $(CROSS)as
  OBJCOPY		:= $(CROSS)objcopy
  
@@ -39,10 +39,11 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
  YBCFLAGS += -DKERNELADDR=$(KERNELADDR)
 -YBCFLAGS += -Werror -fdiagnostics-show-option
 +YBCFLAGS += -fgnu89-inline -fno-builtin-malloc -fno-stack-protector -no-pie
++YBCFLAGS += -fcommon
  YBCFLAGS += -I ./include
  YBCFLAGS += -fno-strict-aliasing
  
-@@ -69,12 +72,12 @@ LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux
+@@ -69,12 +72,13 @@ LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux
  
  # Libraries
  #
@@ -54,6 +55,7 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
  UCFLAGS = -Os $(CFLAGS) -Wall -I/usr/include
 -UCFLAGS += -Werror -fdiagnostics-show-option
 +UCFLAGS += -fdiagnostics-show-option
++UCFLAGS += -fcommon
  
  # For compiling build-tools that run on the host.
  #
diff --git a/srcpkgs/yaboot/template b/srcpkgs/yaboot/template
index 8d2adf264b73..a61158c899fd 100644
--- a/srcpkgs/yaboot/template
+++ b/srcpkgs/yaboot/template
@@ -58,6 +58,7 @@ _build_e2fsprogs() {
 		if [ -n "$_need_cross" -o -n "$CROSS_BUILD" ]; then
 			# using a crosscompiler, set up configure/compiler for that
 			_args+=" --host=${_need_cross:-$XBPS_CROSS_TRIPLET}"
+			_args+=" --build=$XBPS_TRIPLET"
 			_ecc="${_need_cross:-$XBPS_CROSS_TRIPLET}-gcc"
 			_ear="${_need_cross:-$XBPS_CROSS_TRIPLET}-ar"
 		fi

From f9d9ae26fea02fa32882616d6d249b3ac6501447 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:17:39 +0200
Subject: [PATCH 1495/2561] xpdf: update to 4.04.

---
 srcpkgs/xpdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xpdf/template b/srcpkgs/xpdf/template
index 3c66f615f115..854150d56eb5 100644
--- a/srcpkgs/xpdf/template
+++ b/srcpkgs/xpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'xpdf'
 pkgname=xpdf
-version=4.03
+version=4.04
 revision=1
 build_style=cmake
 configure_args="-DSYSTEM_XPDFRC=/etc/xpdfrc"
@@ -13,10 +13,10 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://www.xpdfreader.com/"
 distfiles="https://dl.xpdfreader.com/xpdf-${version}.tar.gz"
-checksum=0fe4274374c330feaadcebb7bd7700cb91203e153b26aa95952f02bf130be846
+checksum=63ce23fcbf76048f524c40be479ac3840d7a2cbadb6d1e0646ea77926656bade
 
 post_extract() {
-	sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
+	vsed -i -e 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
 }
 
 post_install() {

From 11e43047762198fa9cfb24891b759839ae091bfa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:18:24 +0200
Subject: [PATCH 1496/2561] spectre-meltdown-checker: update to 0.45.

---
 srcpkgs/spectre-meltdown-checker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectre-meltdown-checker/template b/srcpkgs/spectre-meltdown-checker/template
index 23e3f2c00bdf..b3a5163801c3 100644
--- a/srcpkgs/spectre-meltdown-checker/template
+++ b/srcpkgs/spectre-meltdown-checker/template
@@ -1,6 +1,6 @@
 # Template file for 'spectre-meltdown-checker'
 pkgname=spectre-meltdown-checker
-version=0.44
+version=0.45
 revision=1
 short_desc="Spectre & Meltdown vulnerability/mitigation checker for Linux"
 depends="binutils"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/speed47/spectre-meltdown-checker"
 distfiles="https://github.com/speed47/spectre-meltdown-checker/archive/v${version}.tar.gz"
-checksum=96765d765275476c36a146da123fa7e9eb310a84e84ae71b179c9ace3b6ab0c8
+checksum=32db6b73b9a3b08c165cac39446c856a07ac3d17c6b556ce08a9e99dd5600ea7
 
 do_install() {
 	vbin spectre-meltdown-checker.sh spectre-meltdown-checker

From 5df3e041cbee755d61fd1a06bd558e46fcac8574 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:19:28 +0200
Subject: [PATCH 1497/2561] makedumpfile: update to 1.7.1.

---
 srcpkgs/makedumpfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/makedumpfile/template b/srcpkgs/makedumpfile/template
index ba00074bc4e1..e91ab999560d 100644
--- a/srcpkgs/makedumpfile/template
+++ b/srcpkgs/makedumpfile/template
@@ -1,6 +1,6 @@
 # Template file for 'makedumpfile'
 pkgname=makedumpfile
-version=1.7.0
+version=1.7.1
 revision=1
 makedepends="elfutils-devel zlib-devel bzip2-devel liblzma-devel lzo-devel"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/makedumpfile/makedumpfile"
 distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
-checksum=8985f8df249087ea68c6051dec6dac3ef0703fe2aa87d0266f3951f93aa8da5e
+checksum=cb04b1bd0e750d0d0ac1b43b759b326d4a3797b0af08e0c269d1b155893fb664
 
 post_extract() {
 	sed -i '/#define PAGESIZE/i#undef PAGESIZE' makedumpfile.h

From 6b129a5feae38c31313af5d4f09420c4f3d13892 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:19:56 +0200
Subject: [PATCH 1498/2561] mcelog: update to 181.

---
 srcpkgs/mcelog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index 9707998bd78b..90429083870c 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
 # Template file for 'mcelog'
 pkgname=mcelog
-version=180
+version=181
 revision=1
 archs="i686* x86_64*"
 hostmakedepends="python3"
@@ -10,7 +10,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=e9c82b565da06673c2630f9e6bc668634ad7d2c7f13c70db1900cce110ae62dc
+checksum=924e84e235231fd2b5e6ad527e87fd8977113cf170d8bd4ebac5d4781ff7b172
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From cf069c7508bf5d7671cfd777af4dcf6e01382a1f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 18 Apr 2022 19:50:48 +0200
Subject: [PATCH 1499/2561] linux5.4: update to 5.4.189.

---
 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 ac636bc1d2ff..770cb9be83ad 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.188
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc
+checksum=8485d536531833cd2dbca0a7f267daff69ede5c9831cb693acc8318447e568c6
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 7704a7c08628b7d885bfc86142c7bfbfbfebfbb8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 18 Apr 2022 19:54:03 +0200
Subject: [PATCH 1500/2561] linux4.19: update to 4.19.238.

---
 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 cb61654da418..d6916078343b 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.237
+version=4.19.238
 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=bafff35102cc486ec2bf94c6d908be8e24017b2e4a1873f52f24c855eb220cd8
+checksum=83b74545c5d380384e09955c26e786bf9ee81a44bcf9347f2ca2ad3d31b46b7a
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 6e40130ca426c30ce45036815fbd2d988c755791 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Apr 2022 14:02:47 +0200
Subject: [PATCH 1501/2561] texlive2022-bin: install infraonly by default,
 tweak INSTALL.msg.

---
 srcpkgs/texlive2022-bin/INSTALL.msg | 18 +++++-------------
 srcpkgs/texlive2022-bin/template    | 11 +++++++----
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/texlive2022-bin/INSTALL.msg b/srcpkgs/texlive2022-bin/INSTALL.msg
index 05a58d965c72..1ccb0429afc2 100644
--- a/srcpkgs/texlive2022-bin/INSTALL.msg
+++ b/srcpkgs/texlive2022-bin/INSTALL.msg
@@ -1,11 +1,4 @@
-- TeXLive is free software see the files:
-
-  /usr/share/licenses/texlive2022-bin/LICENSE.TL
-  /usr/share/licenses/texlive2022-bin/LICENSE.CTAN
-
-=====================================================================
-
-  To update you TeXLive installation use only the program 
+  To update your TeX Live installation use only the program 
 
   /opt/texlive/2022/bin/<arch>/tlmgr
 
@@ -13,13 +6,12 @@
     - x86_64-linux  ==> x86_64 architecture
     - i386-linux    ==> i386 architecture
 
-  see:
-
+  for details 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
+  WARNING: To avoid messing up your TeX Live installation, DON'T use
   the installation scripts in /opt/texlive-installer.
 
+  This package only installs TeX Live infrastructure now, not TeX Live itself.
+  For a basic installation (previous default), run "tlmgr install scheme-basic".
   For a full installation, run "tlmgr install scheme-full".
diff --git a/srcpkgs/texlive2022-bin/template b/srcpkgs/texlive2022-bin/template
index 902d4dc245d7..679a1e4e4bdd 100644
--- a/srcpkgs/texlive2022-bin/template
+++ b/srcpkgs/texlive2022-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive2022-bin'
 pkgname=texlive2022-bin
 version=2022
-revision=1
+revision=2
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
@@ -15,8 +15,9 @@ distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>$
 checksum=e67edec49df6b7c4a987a7d5a9b31bcf41258220f9ac841c7a836080cd334fb5
 
 # Package build options
-build_options="basic small medium full"
-build_options_default="small"
+build_options="infraonly basic small medium full"
+build_options_default="infraonly"
+desc_option_infraonly="Install TeXLive infrastructure only"
 desc_option_basic="Install TeXLive using scheme-basic"
 desc_option_small="Install TeXLive using scheme-small"
 desc_option_medium="Install TeXLive using scheme-medium"
@@ -31,7 +32,9 @@ 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
+	if [ "$build_option_infraonly" ]; then
+		echo "selected_scheme scheme-infraonly"
+	elif [ "$build_option_basic" ]; then
 		echo "selected_scheme scheme-basic"
 	elif [ "$build_option_small" ]; then
 		echo "selected_scheme scheme-small"

From b2ff2e4c4067285dca3c42763f5dd4f348374448 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:38:58 -0400
Subject: [PATCH 1502/2561] openjdk17: update to 17.0.3+5.

---
 srcpkgs/openjdk17/template | 43 +++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 19fa38707f00..7e368f9b687e 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,15 +1,14 @@
 # Template file for 'openjdk17'
-_java_ver=17
-_java_min_ver=0
-_java_sec_ver=3
-_jdk_update=1
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk17
-version="${_base_version}+${_jdk_update}"
+version=17.0.3+5
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}"
+_gtest_ver=1.8.1
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+create_wrksrc=yes
+build_wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --enable-unlimited-crypto
@@ -19,8 +18,9 @@ configure_args="--disable-warnings-as-errors
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-gtest=${XBPS_BUILDDIR}/googletest-release-1.8.1
+ --with-gtest=../googletest-release-${_gtest_ver}
  --with-debug-level=release
+ --with-native-debug-symbols=internal
  --with-jobs=${XBPS_ORIG_MAKEJOBS}
  --with-version-pre=
  --with-version-build=${_jdk_update}
@@ -38,15 +38,16 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
 depends="${pkgname}-jre-${version}_${revision}"
-provides="java-environment-${version}_1"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
- https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
-checksum="0fac6d90091fc16678a14349e578f6c1cf29738d55508f9f723fbb69469f6867
+ https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
+checksum="a557f4d2972bbbbcdc12fa7e167ad60b4ee1461a9bc7ad259a003172c34e6331
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+provides="java-environment-${version}_1"
+patch_args="-Np1 --directory=$build_wrksrc"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -79,10 +80,6 @@ else
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk17"
 fi
 
-if [ -n "$XBPS_DEBUG_PKGS" ]; then
-	configure_args+=" --with-native-debug-symbols=internal"
-fi
-
 alternatives="
  java:/usr/bin/java:/${_jdk_home}/bin/java
  java:/usr/bin/jfr:/${_jdk_home}/bin/jfr
@@ -120,9 +117,9 @@ alternatives="
 "
 
 post_extract() {
-	chmod +x configure
+	chmod +x $build_wrksrc/configure
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		rm -r src/jdk.hotspot.agent
+		rm -r $build_wrksrc/src/jdk.hotspot.agent
 	fi
 }
 
@@ -171,11 +168,6 @@ post_install() {
 	rm -rf ./ca
 }
 
-do_clean() {
-	# clean up gtest
-	rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
-
 subpackages="openjdk17-src openjdk17-jre openjdk17-doc"
 
 openjdk17-jre_package() {
@@ -213,11 +205,10 @@ openjdk17-doc_package() {
 	noshlibprovides=yes
 	short_desc+=" - documentation"
 	pkg_install() {
-		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			local _docdir=usr/share/doc/openjdk$_java_ver
 			vmkdir $_docdir
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir
+			cp -a $wrksrc/$build_wrksrc/build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir
 		fi
 		vmove $_jdk_home/man/man1
 	}

From c39a847694bf39377cb924015d5062c127b25e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 19 Apr 2022 16:58:10 +0200
Subject: [PATCH 1503/2561] postfix: update to 3.7.1.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 38a7e61f2171..466de1f19105 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.7.0
+version=3.7.1
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="https://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=645c6a74959703f8dff5b696b2df2e8bc0c91ac530127a21c998e3defbb9528c
+checksum=25c3e7ec09955af873407af3070fd259da8477b80e2f4663c5fdc00a2cc947ee
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From df84c57f29206cfa772bb6fd3f116af5c606267f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 18 Apr 2022 16:04:34 +0200
Subject: [PATCH 1504/2561] font-unifont-bdf: update to 14.0.03.

---
 srcpkgs/font-unifont-bdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template
index ce94f9be9c3c..675429a16aa2 100644
--- a/srcpkgs/font-unifont-bdf/template
+++ b/srcpkgs/font-unifont-bdf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-unifont-bdf'
 pkgname=font-unifont-bdf
-version=14.0.01
+version=14.0.03
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://unifoundry.com/unifont/index.html"
 distfiles="http://unifoundry.com/pub/unifont/unifont-${version}/font-builds/unifont-${version}.bdf.gz"
-checksum=391d194f6307fcd0915daafd360509a734e26f3e4013e63d47deb2530d59e66e
+checksum=6323f50b1b0b50224988e5f7aec2bd26bd78563bbb7e05c417dc5b7b4a06acb5
 font_dirs=/usr/share/fonts/misc
 
 do_install() {

From e3cb5643d3a0bf9ca87914f9cc7b8d9dae1292c8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 17 Apr 2022 16:31:52 +0300
Subject: [PATCH 1505/2561] skype: update to 8.83.0.408.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 7760c535079c..5305633214e0 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.82.0.403
+version=8.83.0.408
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=df903a805c3db301d8846e5fcfe2ec5acbea720c49f3031edb50d416f5a52a24
+checksum=f6dc153980f74b3b75241b2c4d0c1c866391963778af5d96fa0aa28b24a693c2
 repository="nonfree"
 nostrip="yes"
 

From 509115c1d7e34e6395b401a93b023e56e8588ab2 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Wed, 13 Apr 2022 18:28:10 +0100
Subject: [PATCH 1506/2561] thunderbird-i18n: update to 91.8.0.

---
 srcpkgs/thunderbird-i18n/template | 110 +++++++++++++++---------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index f95f0e304a80..0a299d66d969 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=91.5.0
+version=91.8.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -95,57 +95,57 @@ _pkgtmpl() {
 	}
 }
 
-checksum="153b74896853e462e9ae9cf9098f0b6f34116559975861e6c9f04e8010c0842a
- fd018fcbeceace184dc1f4b1e1623511eb0a8ecc1ae1b956ffa170842fefcc73
- 550f2310775beb5ce913b6bfa593fa04776c1927c87cf8079eaaf10f6d8b0537
- 99c61014976faafeb2e813ad74b1678e2128ddc0a76bfcbba7cf6c602c11a223
- 7aeb9c9c9aaaacb2a84a5491aff9588c8b426ea08e0a43d2c63c091b47cfc5d0
- a30026739c7e130ad1d9196c19da72eea6c16c7571f6073aea4c0f80f10d8f3c
- 7941933c4c80d4f1109db2a3f584518c6995aa8746b0f4ab4a6f70706becb0de
- 1840fbf5e814853fdd976e20bb4a432c210321bdf8cdc5b5c26a593afea41d94
- d04205f28a0ffed85aa1b11de42d46063db482392a71e0ad8f5074b142c6deb8
- 1dc362d91c8699a81ec4070af6422f97bd275ef01acda4dd41634c1af6415609
- 9207a8c1a98ca2fa51efb54f12a79d9cae0e03faf5941bfc6cd66b0f02bddd40
- fac6239a5e043b75ff595fa670b23f0520e93bd3c8e4aabce0340db72dab1909
- 4642127f3e521d130d246acbe8df7f2f8b2b461cd357839773bc0f73b76ddf82
- adce6a6c77997f9e9fe08a20012ce8ed88116963599c348763d36a0c196af1a1
- 6608e4c2bb3c396cb35794d5b90eec5c3403b319e3d220088331b7b3fb5f45e6
- d6cbd9e7089f05928202cb95340d94322714036cdf2bd50777e09300d60b35e2
- 965b43d20a9abaabe8f7d07dd5bf2c522d73754e52dc9eb4e917568e14f03ef4
- 17a78d93de483a0097504683b29752449ea1cdd0578313428b39c9d6959b4fc2
- 75238449104d85368cfbefb2d06fe92113f4ba719fbfa1d4da5fe46a3be63d0f
- f8765c44569a1eead7f96c30cae8e34557597c03ae0778859135e637370f6769
- 1675ad25f3d7372fe8e004f1a5df4eeb4d11042574d67546d99c696f76bb416b
- 17d1c9c752a31c0d123de4fa84b5c0a06bdadb7ecfb3fedab4cad22289ac2cba
- eaeedd14c00ffb253b6d6ccf66f131940a44e190c77e232ded88a13b6b7e3b59
- 5ab29c16330c3951236839af54081d282cf0de17f18e1421b7e6d812cafefff4
- d6a9ab1ca1a3f9613a00f1f6296568d3da6ce850a7e797ce377e9516c8b78837
- 38bba476644a2f0ccc636ac176e501b85f3ef8c912c7ff9b9cc4ebac74d83cdd
- 4338ff7ef6adfaf0308616128bf00d190372b8818d421527dc5742d8f3ed4918
- 38d88509c005ad62601a368a284b745570e33a9724da1a1ff41e6feaaa4273fc
- 031b23573ec355d23ebe18615a86216ab30a95e04525ace23f7f4d7ba8245c41
- cc95bfa23f1468ca5a670dea7d67b579d18166332fc17942c4733ce249a882ce
- b21a892bd65dbd12e6f047079bfa8e6175c58167e7c8defc3ee285eefd738d41
- 494796c4657fa6283400b9cd9ff54bed947068222f9e94d0131033d953d37176
- 44e135062450c53044b412447b6d0a722fc5a99658ed7ec3c741dbbe91ecd736
- ea62afd388cc7c30c0a1a2e161e1154742e535b1177c718ca0620de7e296fe61
- 67d954bd71dc1a21d28bd410a0c633c4c3d93bcb53095d349c470a270c242d39
- 6a63ff0bbf96411935ba101baa7286315e70ccbc0bbc1e8f5ede822c901a23b2
- 18d6578ffebd4867b01918f7a154a317b054d5fd55418f61657cac05a995ee1a
- 22bdf3404e59627ab73ee64394efb0275741b7b9c1d31d134d5612242e1858e6
- 9eb94a5b380f084625e605f20a388a9b75455c07e49bc73ab4bc94e2d52baee8
- 60ed67eb52c673b168b42f385ac05e4f0cec906002f46dd0dabbf807777c3302
- 6711681f44fd41ee493c7ccd618d98ecce24354073d72ca59ca60df1a3b53f2b
- f0fe96cec503d05033651489aa6251f8279fa0f0323818df9f17fce56cdeebb6
- b012c406274bb8a4131546cf363d4828a7e55f1e6221559d5313137de886bf7f
- bce8e92d31183afb48fba2b78339d9404cf87b67a9d2f13db09672fc8539dacf
- 6a3c56c782219a0f3951d90700f3c63cc69266f8d4546f19281194cc3101588b
- a8bfaa012718716c45727f207fadfebdf1dc06a66628d284bc60d8d37087caa6
- cfecad5b1cf8c233ad01af7489959d5d680028851fb676356ace00cb737b7eae
- 8a0aea8d91a3978378166219f5aaebe7aca91b199fcfe3227752ed3f443d3612
- 6ff82ddcf1974b8bc7a44789e1d4238e92a8d5cea2c14daf1a4f57f6ae98c983
- 9483d7dca9c450483c9be9c21ff77e191f62e41120fdc186fe766bfedec805af
- 14eccd3edf9c4be0ece562c4bda88bb0512d846c79e5480478569493268a6a6f
- 3be16dd793abe690471bdfc633c41bad85172603aeb78145ca5290332ece9ff6
- f886871be3055d85d9bfdff63b5d24209af97a04d8504f5afb631ef0a1372088
- abd7ff3fae4d2d3459bff96bdde26cc62f045edbaf9eba8b457ade3c17f7a57e"
+checksum="e338b3f00ce13b8b98213d9fb53dbdeaef8082517a2cda06a62c59d8f4021e1e
+ 0c6339b23d2de88b0cea5473289c05820d44fd89999037285ed19b6394e5d221
+ 4f8254201247e6d8e01924715d101e4bce8f53d3799f129a0003b528cd994839
+ f7c99eb62ab9ade49d2022edca802b4ebbdf53a753c378315cccf9bf2126bff3
+ 13191acb9cec0bdd45527e09e1f28205fad9e4b67682018f9f0aa6d096b40a7d
+ 08e7f631467b5b1aca8d35c38936c854c3b8bbba975d1b30b5d43637e1b1cc3d
+ 8b40a658dd14af8b268bef3ae656524165c9e432f2df882c21a083b477379a76
+ 68247d9f9e33f803446ba4c114d5db8173dc46aa93bf06c828a2d154c69e4ce6
+ da155c974f591a6f7b29f42ddb82ed94fee8db34b0b7c67a18d747c38138fb7b
+ 3cf905249aeb0676d8a6206746c1d0ee03fba579bd39d9ec8e9cdc8a23ba6232
+ 2afa46cf5301607dc1b18933bd3877842ffcb86563bb8ddf859114aa74bacf1c
+ d437fd884c900cdce7c22bfdf445819ebe8f27d6d2b32392e6ab4291188403b5
+ 458ff1cd1a3a3357d6592f04fadc5bb6c06a1a8ae4e095de599c0a4b4f3f4c39
+ 5a3cc430c53f3a2e7258be9c4dc90002e74b1df4fedd57d748034facdf09462f
+ aa41718568841dd4b2487023d7c68b88a7d4cce6634c2c8b2af5a5024e910491
+ 8e08fca9f5b4284cd78cd80f54f2005cfaa9db9b2df596aabff3cf85fed3b032
+ 00647c73c5d834c2daa7b1c04c152ba70e530f8917a88b48b876634e6735a08d
+ 3b367c2aeb5c0b7e7158570cba56473f36f0e4e2105528f6cff6424a8bb1b188
+ 602f80592d721c0d1157845c9cf83547b4497842cfd37ae5466190d5f89fc2ca
+ 310a50fbd029f0bbb5d7b3b80b9f0882ddf03667caa2c93a1f2c878c32bd1404
+ cf75c1a2992d11b2ea5f4160d34f793fd00d7eae2c3604fe35a96303bdd5b6d0
+ 39255ccf6c1661287fab017e95a3c1eb74619d408bdce09dd359fd58f2303ca4
+ 41e9b2df204081b13ff2adb391f0414b2b0ba4bf83bf2118a30c21265b19983e
+ f6be5a2cf4006b31459a887e14f69e61505e3577ece674e81356ae53b025b4ab
+ 22575da8459ceb57e1dd3e02c9a5e7219b894767438d810b94dfd6c4e97bb3ae
+ 27487ba8f1115f1aff0245629fdc1b785391d5af98521e58937677f173eb0f45
+ 666bd43ccbdb37f097477273aa8ca11b9716c024f8c162bb81a1b07006044bc0
+ 1907c178beac70dafdab55acbc87e56a9913142ffaa85be6cbe541361d53d24c
+ 20e7464b43f12dcdcb3892a6e9c7d7c46a2385a82953c388599cbeeabc362786
+ 6a7e2ee51d92aa5db52816de0dbf103ce2abf40a34411498fb7b2380dc87101d
+ 2d2be878ba6d5afcb6823f58a6939ebe895290a925b13234ed2c63d013ad5165
+ d329c730c338b7d9e4a3fc07fae4537dd0be0b86317db42b1270daaeb7025f98
+ 51ead8dd506cc5aaf4dfb58be942b3061869c9c26bfec9b29930d0a627c32aa9
+ ba4191dca0ec8a9eb70cc3d9d0a20d50fa87a5c0be3190db0ef5867532ef8318
+ 4e849ddec5f68004315b93dc8e382774101a815e9bf476f10c8e804a9657aa2e
+ 04b06a1a5842962116ef0eae6dfa263197e04b5a560ce7386f786322b5199364
+ 8f81e86174d6126e0e0551b1431713f09ca66e3dc546cd5a7838d17c2cddf52e
+ 1ca4983cf2de4a0ac8debdfba0c0e3844cd5020199f4ab054864dda7ae2170da
+ f625cda77e82c13e358d33df96d613ea8145a170b54ce399bfe960e0b88ef146
+ 93b79805973de19cd0beaea81add9a0f40e3746b88648c6c7e90a0fbba857777
+ 368b268f6b08b5e1d0f1ffeeb662ab4460bc3b60d6c3ced54a6efff44e6bec2e
+ 8de648e97c00fc1988ae5788944c3821304c49f49a669797e3bdc4c3637ff336
+ 1489f343e79064d24549556f7d7164ea0e9e0e65256290f8287a00fdd256bd04
+ 0f004c54f4fce861b709d6f0d394c6ebb01a16aedc29e6599f56c7d043e18936
+ 8f7a814d8a47efa9fe1509b0ea450697e2e6007beb5b78e2937b3f2b133402b3
+ 7db9b294668932d2e59309c452ab74d0d737eb6c8220f6fa5aafd7be66ea42dd
+ b9c81d14520928957f95e40faa80a8ed63e76758652fb3a73458a848d9703ac7
+ 1129915d753dc68c4d4e23e6d4dea5de7c911f7d3204448b231f8755d7447c70
+ 76badde28f93f4d8e05c163a357223bf1a85e9301cf6221b222553f637e33532
+ c50d5aa28e33dee903a31b1ea73c01575d7d784cc86dfec0f853dc51e31bef40
+ 6b897ca847c9d497895d2dc2164582836407902c2784219617ce14b80b140739
+ 4cd25edb40fd1309d1121cb582001d580605eb12ec414fe4125d580b809927c9
+ 2b822f814877d3b20ced442e466ff78cc0e2effa971b5e7b16ddd6bb9500c7c3
+ b2962ead550ab841c4981a70a0f80f1baeb2d10165dc7536d069598643f3d4d5"

From f5e4d0ed66fe8d5163eaf3fb21b1137f79512575 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Wed, 13 Apr 2022 18:28:13 +0100
Subject: [PATCH 1507/2561] thunderbird: update to 91.8.0.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 6ce073f6f0f9..bf03d0a2eb61 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=91.5.0
+version=91.8.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=b89a8e1b57d5be828a7346e817120d7c763a258a2397a23393b7ceb3ce810ab2
+checksum=4a93d1773e17aa110341428165581f0176c347d55dd7f6cbed789ca8369da6fa
 
 lib32disabled=yes
 

From 12e4a1df372e3c2e5ac58ce16aab03d2b25dbfad Mon Sep 17 00:00:00 2001
From: Tung Anh Vu <vu.tunganh96@gmail.com>
Date: Tue, 15 Mar 2022 20:50:59 +0100
Subject: [PATCH 1508/2561] texlive: Pull latexmk into a subpackage

---
 srcpkgs/texlive-latexmk  |  1 +
 srcpkgs/texlive/template | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/texlive-latexmk

diff --git a/srcpkgs/texlive-latexmk b/srcpkgs/texlive-latexmk
new file mode 120000
index 000000000000..c6cca627ba90
--- /dev/null
+++ b/srcpkgs/texlive-latexmk
@@ -0,0 +1 @@
+texlive
\ No newline at end of file
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index cf3fa5c8044e..b8bb1919fded 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20210325
-revision=2
+revision=3
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
@@ -71,7 +71,7 @@ makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel
  harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel
  poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel
  libXaw-devel"
-depends="dialog ghostscript perl-Tk texlive-core xbps-triggers"
+depends="dialog ghostscript perl-Tk texlive-core texlive-latexmk xbps-triggers"
 short_desc="TeX Live"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
@@ -393,3 +393,12 @@ texlive-PythonTeX_package() {
 		vmove usr/share/texmf-dist/scripts/pythontex
 	}
 }
+
+texlive-latexmk_package() {
+	depends="perl"
+	short_desc+=" - script for compiling the correct number of times"
+	pkg_install() {
+		vmove usr/bin/latexmk
+		vmove usr/share/texmf-dist/scripts/latexmk
+	}
+}

From 7333d3b25e1c91a0a1d822a5f79cde40c0a54e87 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Tue, 19 Apr 2022 20:14:14 +0200
Subject: [PATCH 1509/2561] stockfish: update to 15

---
 srcpkgs/stockfish/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index ab86e2e00d8d..4a0284fce9a4 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,8 +1,8 @@
 # Template file for 'stockfish'
 pkgname=stockfish
-version=14.1
+version=15
 revision=1
-_net_file=nn-13406b1dcbe0.nnue
+_net_file=nn-6877cd24400e.nnue
 wrksrc="Stockfish-sf_${version}"
 build_wrksrc=src
 build_style=gnu-makefile
@@ -10,13 +10,13 @@ make_build_target=build
 make_use_env=yes
 hostmakedepends="tar"
 short_desc="Free UCI chess engine derived from Glaurung"
-maintainer="cipr3s <cipr3s@gmx.com>"
+maintainer="shtayerc <david.murko@mailbox.org>"
 license="GPL-3.0-or-later"
 homepage="http://stockfishchess.org/"
 distfiles="https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz
  https://tests.stockfishchess.org/api/nn/${_net_file}"
-checksum="11d71018af47ba047175f846be72d8d9878df698e9b5d708ab158cf530633600
- 13406b1dcbe0a36dfc5e07da51d8db38b7a45d7da43078ec25a7624c2b83236f"
+checksum="0553fe53ea57ce6641048049d1a17d4807db67eecd3531a3749401362a27c983
+ 6877cd24400e01b19ff12ae3068ae242152802bdd330e66f7b6703865251d6e3"
 skip_extraction="${_net_file}"
 
 LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"

From 317163ec2e6e63bb1a92d4a1fcc565973598a22c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 7 Apr 2022 23:08:41 +0200
Subject: [PATCH 1510/2561] dbeaver: update to 22.0.3.

---
 srcpkgs/dbeaver/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 74a67e77e4f6..a1e7ca0c3004 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,7 +1,7 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=22.0.1
-revision=2
+version=22.0.3
+revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
 hostmakedepends="apache-maven"
@@ -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=2258f77b6e68fc0784dd7d92fc1297695b57e6ca22e3d454f21f328bf61e2bf0
+checksum=5af628ec7cd4c0e63fd074dd92d5668788136321cc273f778f20ff8c7907323a
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

From 1ee348ca940cb9a980222d96a2208b19f41e48f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:18:10 -0400
Subject: [PATCH 1511/2561] maturin: update to 0.12.12.

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index a6c1cbdd3d71..64140c2f5fe7 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.11
+version=0.12.12
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="4d39f15fae9c01f2f23a544fc26b20c68693ec03f820b30ca5f505647c452be1
+checksum="0da8b649dc91278363d6a07fee26ea53b8f2d9cd06139034dea3a5506baf12a0
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From ab5faee633eb605ae3a2c25e097557a85494c07d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:19:36 -0400
Subject: [PATCH 1512/2561] python3-imageio: update to 2.17.0.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index b129927d534f..a5167cbc45e8 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.16.1
+version=2.17.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=97f6d150d3a4b2424810fd3042ab794af45365f168031aee6f0be21c00e90d2f
+checksum=34173213c7e90096743bf077d888dd1c0300e8ebfad8184ee24a968cc860af5c
 
 post_install() {
 	vlicense LICENSE

From 1fa411e82c8212bae6a8477386051a70a3d0f07f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:27:26 -0400
Subject: [PATCH 1513/2561] python3-hypothesis: update to 6.43.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 d214e0ec6b62..fd24d4f52491 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.41.0
+version=6.43.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=0fa002e65956bedead5149d2ffa5875cbcb5ca1a3f95301fcf2ad5a241829d91
+checksum=57e04ecd3fb433604a17dbcf535947734f98bcced562a71c67513d98919d1d3b
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 9daa6681e5a23a59d1290c4c18b76dc904281de8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:35:18 -0400
Subject: [PATCH 1514/2561] python3-typing_extensions: update to 4.2.0.

---
 srcpkgs/python3-typing_extensions/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-typing_extensions/template b/srcpkgs/python3-typing_extensions/template
index a9917a177428..413acfdb1c3a 100644
--- a/srcpkgs/python3-typing_extensions/template
+++ b/srcpkgs/python3-typing_extensions/template
@@ -1,14 +1,14 @@
 # Template file for 'python3-typing_extensions'
 pkgname=python3-typing_extensions
-version=3.10.0.2
+version=4.2.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
 depends="python3"
 short_desc="Backported and Experimental Type Hints for Python 3.5+"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="Python-2.0"
 homepage="https://github.com/python/typing"
 distfiles="${PYPI_SITE}/t/typing_extensions/typing_extensions-${version}.tar.gz"
-checksum=49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e
+checksum=f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376

From 04a5acf2fcfc10b87d1b40cc1d5eb64d3a01124c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:37:24 -0400
Subject: [PATCH 1515/2561] python3-pytools: update to 2022.1.4.

---
 srcpkgs/python3-pytools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 1cbf56dc08dd..6a57301a4d61 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.2
+version=2022.1.4
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-decorator python3-appdirs python3-six python3-numpy"
-checkdepends="python3-pytest python3-mpi4py $depends"
+depends="python3-platformdirs python3-numpy python3-typing_extensions"
+checkdepends="python3-pytest $depends"
 short_desc="Python utilities from Andreas Kloeckner"
 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=5e824101880a246354756365880a65bb416f6a8cab6513b68fcbb48fba090fcb
+checksum=ae25f7c9b196fcd0d15e53bfe05236fe7bc5efd923810fbaeeee1a4bc4b6764a
 
 post_install() {
 	vlicense LICENSE

From 8b0c6ce593a5e03229f3480535e6b63d5bc7fdf4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:40:20 -0400
Subject: [PATCH 1516/2561] python3-pyopencl: update to 2022.1.3.

---
 srcpkgs/python3-pyopencl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 7f3c35a88e9d..ccd4812bcfea 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2022.1
+version=2022.1.3
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
 makedepends="opencl2-headers ocl-icd-devel python3-pybind11"
-depends="python3-pytools"
+depends="python3-numpy python3-pytools python3-platformdirs"
 short_desc="OpenCL bindings for Python 3"
 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=24c6d9a0a1ff7609f3d7365ebd8778616a5433c426566c2c8e35ffab00ef22c4
+checksum=18386938b54855696460b4b19a210300f241a28eb3255748be5f279aef664d6d
 # Tests require a working OpenCL platform
 make_check=no
 

From c30c5c81849f6b34ceb699b578083fd491364eea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:40:33 -0400
Subject: [PATCH 1517/2561] python3-tifffile: update to 2022.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 65b0d119adef..b8fb29af1782 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.3.25
+version=2022.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=620c68f3eeb2b1923e1b3a8bf8a8b7f79498bcd9cd34051ad567c44f0a404353
+checksum=f4dafa604c949ebedc60a0fd41be0048399fea72b529efcff6330a29590ee5f6
 # Tests require unpackaged fsspec
 make_check=no
 

From 5234a5b670e75b019f314d66ef1bea5c3868807b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:40:46 -0400
Subject: [PATCH 1518/2561] python3-websockets: update to 10.3.

---
 srcpkgs/python3-websockets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-websockets/template b/srcpkgs/python3-websockets/template
index 08f829cf4b39..7c02b7ec8ed7 100644
--- a/srcpkgs/python3-websockets/template
+++ b/srcpkgs/python3-websockets/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-websockets'
 pkgname=python3-websockets
-version=10.2
+version=10.3
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://websockets.readthedocs.io/en/stable/"
 changelog="https://websockets.readthedocs.io/en/stable/project/changelog.html"
 distfiles="${PYPI_SITE}/w/websockets/websockets-${version}.tar.gz"
-checksum=8351c3c86b08156337b0e4ece0e3c5ec3e01fcd14e8950996832a23c99416098
+checksum=fc06cc8073c8e87072138ba1e431300e2d408f054b27047d047b549455066ff4
 # Package ships no tests
 make_check=no
 

From 5a64f28c9806c037137f0c79c1f0385e28cfca47 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 19 Apr 2022 22:49:40 +0200
Subject: [PATCH 1519/2561] keepassxc: update to 2.7.1.

upstream
* switched from libsodium to botan
* switched from quazip to minizip
* relies on vendored (patched) ykcore [1]

[1]: quote droidmonkey from IRC (keepassxc developer)
> KeePassXC bundles the ykcore code due to lack of support from Yubico and
> stratification of version across various operating system distros.
> Additionally, KeePassXC has modified the API of ykcore to make it more
> functional when using non-YubiKey keys (ie, OnlyKey)

Closes: https://github.com/void-linux/void-packages/pull/36662
---
 ...001-Link-ykcore-against-pthread-7807.patch | 33 +++++++++++++++++++
 srcpkgs/keepassxc/template                    | 24 ++++++++------
 2 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch

diff --git a/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch b/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch
new file mode 100644
index 000000000000..cad44dae05d8
--- /dev/null
+++ b/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch
@@ -0,0 +1,33 @@
+From 7edeceec0376513002813efb7bf723fbcbe6752d Mon Sep 17 00:00:00 2001
+From: Piraty <piraty1@inbox.ru>
+Date: Fri, 15 Apr 2022 08:27:04 +0000
+Subject: [PATCH] Link ykcore against pthread (#7807)
+
+---
+ src/thirdparty/ykcore/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/thirdparty/ykcore/CMakeLists.txt b/src/thirdparty/ykcore/CMakeLists.txt
+index 47191ea7..103349f2 100644
+--- a/src/thirdparty/ykcore/CMakeLists.txt
++++ b/src/thirdparty/ykcore/CMakeLists.txt
+@@ -27,13 +27,15 @@ if(WIN32)
+ elseif(UNIX AND NOT APPLE)
+     target_sources(ykcore PRIVATE ykcore_libusb-1.0.c)
+ 
++    find_package(Threads REQUIRED)
++
+     find_library(LIBUSB_LIBRARY NAMES usb-1.0)
+     find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb")
+     if(NOT LIBUSB_LIBRARY OR NOT LIBUSB_INCLUDE_DIR)
+         message(FATAL_ERROR "libusb-1.0 dev package required, but not found")
+     endif()
+ 
+-    target_link_libraries(ykcore PRIVATE ${LIBUSB_LIBRARY})
++    target_link_libraries(ykcore PRIVATE Threads::Threads ${LIBUSB_LIBRARY})
+     target_include_directories(ykcore PRIVATE ${LIBUSB_INCLUDE_DIR})
+     target_compile_definitions(ykcore PRIVATE _GNU_SOURCE)
+ elseif(APPLE)
+-- 
+2.35.1
+
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index f3543633d6da..a4839235260d 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,6 +1,6 @@
 # Template file for 'keepassxc'
 pkgname=keepassxc
-version=2.6.6
+version=2.7.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
@@ -8,16 +8,17 @@ configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
  -DWITH_XC_BROWSER=$(vopt_if browser ON OFF)
  -DWITH_XC_FDOSECRETS=$(vopt_if fdosecrets ON OFF)
  -DWITH_XC_KEESHARE=$(vopt_if keeshare ON OFF)
- -DWITH_XC_KEESHARE_SECURE=$(vopt_if keeshare ON OFF)
  -DWITH_XC_NETWORKING=$(vopt_if network ON OFF)
  -DWITH_XC_SSHAGENT=$(vopt_if sshagent ON OFF)
  -DWITH_XC_YUBIKEY=$(vopt_if yubikey ON OFF)"
-hostmakedepends="qt5-qmake qt5-host-tools ruby-asciidoctor"
-makedepends="qt5-tools-devel qt5-svg-devel libgcrypt-devel libargon2-devel
- qrencode-devel readline-devel libsodium-devel
- $(vopt_if autotype 'qt5-x11extras-devel libXtst-devel libXi-devel')
- $(vopt_if keeshare quazip-devel)
- $(vopt_if yubikey 'libykpers-devel libyubikey-devel')"
+hostmakedepends="qt5-devel ruby-asciidoctor"
+makedepends="qt5-tools-devel qt5-svg-devel botan-devel libargon2-devel
+ qrencode-devel readline-devel pcsclite-devel
+ qt5-x11extras-devel
+ $(vopt_if autotype 'libXtst-devel libXi-devel')
+ $(vopt_if keeshare minizip-devel)
+ $(vopt_if yubikey 'libusb-devel')"
+checkdepends="xvfb-run"
 short_desc="KeePassXC is a cross-platform port of “Keepass Password Safe”"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,
@@ -25,9 +26,8 @@ license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,
 homepage="https://keepassxc.org/"
 changelog="https://raw.githubusercontent.com/keepassxreboot/keepassxc/${version}/CHANGELOG.md"
 distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz"
-checksum=3603b11ac39b289c47fac77fa150e05fd64b393d8cfdf5732dc3ef106650a4e2
+checksum=6001ba626c35c316dbda6de35736f012a2264f95139fcb4a094b8eb49b15d3e7
 
-# https://github.com/keepassxreboot/keepassxc/blob/a775031fe9471310e50232d1861d4991e2803aff/CMakeLists.txt#L46
 build_options="autotype browser fdosecrets keeshare network sshagent yubikey"
 desc_option_autotype="Include auto-type"
 desc_option_browser="Include browser integration with keepassxc-browser-plugin"
@@ -43,3 +43,7 @@ post_install() {
 	vlicense LICENSE.BSD
 	vlicense LICENSE.MIT
 }
+
+do_check() {
+	xvfb-run ninja -C build test || : #XXX: TestCli::testClip() fails
+}

From 16b191d24e94f3db85db77244263e86075ca0793 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:23:50 +0200
Subject: [PATCH 1520/2561] gstreamer1: update to 1.20.1

---
 srcpkgs/gstreamer1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index cc540feaf0b7..ababbeeb987d 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,7 +1,7 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
-version=1.18.5
-revision=2
+version=1.20.1
+revision=1
 wrksrc="gstreamer-${version}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,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=55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a
+checksum=de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031
 
 pre_check() {
 	# gst_gstdatetime is known to fail according to LFS

From d80ea3376a82ddc3da8fe13e07772a48cbc7b205 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:24:18 +0200
Subject: [PATCH 1521/2561] gst-plugins-base1: update to 1.20.1

---
 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 fc954cc96cf5..6ab6210e6605 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.5
+version=1.20.1
 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=960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3
+checksum=96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204
 
 build_options="cdparanoia gir sndio"
 build_options_default="cdparanoia gir"

From a25ec622829f307370e054acc6d2fa70e6fa50c6 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:28:16 +0200
Subject: [PATCH 1522/2561] gst-plugins-base1: update to 1.20.1

---
 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 974cdbc22c41..0ce7d1bce5c9 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.5
+version=1.20.1
 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=3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b
+checksum=3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa
 
 build_options="gtk3"
 build_options_default="gtk3"

From 9972c6d395fa9e80738b085df2015b701e88500a Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:49:44 +0200
Subject: [PATCH 1523/2561] gst-plugins-ugly1: update to 1.20.1

---
 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 8f3e16d98f81..ad8c128ef726 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.5
+version=1.20.1
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
@@ -16,4 +16,4 @@ 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=df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9
+checksum=42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19

From b5c29e93178540bf915d9bb61e415ec92589826a Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:51:56 +0200
Subject: [PATCH 1524/2561] gst-plugins-bad1: update to 1.20.1

---
 srcpkgs/gst-plugins-bad1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 451f73cb9f55..f7d203133212 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.5
+version=1.20.1
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
@@ -9,7 +9,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
  -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
  -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled
  -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
- -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
+ -Dmplex=disabled -Dmusepack=disabled -Dopenexr=disabled
  -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled
  -Dsrt=disabled -Dteletext=disabled -Dvoaacenc=disabled -Dvoamrwbenc=disabled
  -Dwildmidi=disabled -Dwpe=disabled -Ddirectfb=disabled
@@ -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=a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e
+checksum=09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848
 
 build_options="gir gme"
 build_options_default="gir"

From 3a3f184e15603e0978d78aa1f38b1939a0a5f9a2 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:54:36 +0200
Subject: [PATCH 1525/2561] gst-libav: update to 1.20.1

---
 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 dc77de85702b..333636d0657a 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.5
+version=1.20.1
 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=822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548
+checksum=91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Required by musl for M_SQRT1_2

From 824da444a771758566e1d7cf7170dd0eda5f3fa8 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:56:44 +0200
Subject: [PATCH 1526/2561] gst-omx: update to 1.20.1

---
 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 5e78c4c68549..d657aff289a7 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.5
+version=1.20.1
 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=2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42
+checksum=86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c

From 68a1182380abaa10e3bd2a171d8ba2884ab4cf72 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:59:29 +0200
Subject: [PATCH 1527/2561] gst1-python3: update to 1.20.1

---
 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 5f2fe61a6968..4f6ead444091 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.5
+version=1.20.1
 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=533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52
+checksum=ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422

From 75a7e2ae64cb93910efc0a089299e944b40f5304 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 20:05:05 +0200
Subject: [PATCH 1528/2561] gstreamer-vaapi: update to 1.20.1

---
 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 90a3a0a7579b..1a934c852d1b 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.5
+version=1.20.1
 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=4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b
+checksum=87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137
 
 pre_check() {
 	# Seems to need certain hardware to pass

From 1dacd0ec947e8ba7930a9f1849f85baadc0882eb Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 20:09:30 +0200
Subject: [PATCH 1529/2561] gst1-editing-services: update to 1.20.1

---
 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 1613a7ababfd..ad2318c059ae 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.5
+version=1.20.1
 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=8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5
+checksum=6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df
 
 do_check() {
 	: # Tests fail in older versions as well

From 707b6f9671bb8e5ce841e4ae2319bf044ae64cc8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 19 Apr 2022 23:48:56 +0200
Subject: [PATCH 1530/2561] mkvtoolnix: broken on 32-bit ppc

---
 srcpkgs/mkvtoolnix/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 7f84979ecc3f..52d67b0a6c87 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -23,6 +23,11 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="assembler shits itself";;
+esac
+
 pre_configure() {
 	./autogen.sh
 }

From a14c41ea230690974ca6870ded4bbb5c4b5d5f94 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 30 Mar 2022 21:10:51 -0400
Subject: [PATCH 1531/2561] cgminer: remove package

Upstream is archived and hasn't had a commit or release since 2018
---
 srcpkgs/cgminer/files/cgminer/run |  2 --
 srcpkgs/cgminer/template          | 41 -------------------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 srcpkgs/cgminer/files/cgminer/run
 delete mode 100644 srcpkgs/cgminer/template

diff --git a/srcpkgs/cgminer/files/cgminer/run b/srcpkgs/cgminer/files/cgminer/run
deleted file mode 100644
index b9f9b29ae3d6..000000000000
--- a/srcpkgs/cgminer/files/cgminer/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec cgminer -T --config /etc/cgminer.conf --syslog
diff --git a/srcpkgs/cgminer/template b/srcpkgs/cgminer/template
deleted file mode 100644
index c8add74d08fb..000000000000
--- a/srcpkgs/cgminer/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'cgminer'
-pkgname=cgminer
-version=4.11.1
-revision=1
-build_style=gnu-configure
-configure_args="
- --enable-avalon --enable-avalon2 --enable-bflsc --enable-bitfury \
- --enable-cointerra --enable-drillbit --enable-hashfast --enable-hashratio \
- --enable-icarus --enable-klondike --with-system-libusb"
-hostmakedepends="pkg-config automake libtool yasm"
-makedepends="libcurl-devel libusb-devel jansson-devel eudev-libudev-devel ncurses-devel"
-conf_files="/etc/cgminer.conf"
-short_desc="Multi-threaded multi-pool CPU and GPU miner for bitcoin"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/ckolivas/cgminer"
-distfiles="http://ck.kolivas.org/apps/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=a8f3e244343eda8c3410e6d27188ee941de25c54bd76412e5b4d17de9f30ac18
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	# We have latest jansson and libusb - just use them
-	sed	-e 's|^AC_CONFIG_SUBDIRS.*compat/jansson.*||' \
-		-e 's|JANSSON_LIBS=\".*\"|JANSSON_LIBS=-ljansson|' \
-		-e 's|compat/Makefile||' \
-		-i configure.ac
-
-	sed	-e 's|^JANSSON_CPPFLAGS= .*||' \
-		-e "s|^USBUTILS_CPPFLAGS = .*|USBUTILS_CPPFLAGS = -I${XBPS_CROSS_BASE}/usr/include/libusb-1.0|" \
-		-e 's|^SUBDIRS.*|SUBDIRS = lib ccan|' \
-		-i Makefile.am
-
-	rm -r compat
-	autoreconf -fi
-}
-post_install() {
-	vsv cgminer
-	vconf example.conf cgminer.conf
-	sed -i 's#/usr/local/bin#/usr/bin#g' ${DESTDIR}/etc/cgminer.conf
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6859fe29da93..0923c53cfc05 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -35,6 +35,7 @@ replaces="
  california<=0.4.0_4
  capstone-python<=4.0.2_3
  captain-ballard<=1.0.0_2
+ cgminer<=4.11.1_1
  clamz<=0.5_4
  couchdb<=1.7.1_2
  cracklib-python<=2.9.7_1

From 2f9553307a926db46ea62484df217a3aba82c523 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 14 Apr 2022 19:09:44 -0400
Subject: [PATCH 1532/2561] python3-svg.path: update to 6.0.

---
 srcpkgs/python3-svg.path/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template
index 0d92697a0a9a..a98cae8cfe78 100644
--- a/srcpkgs/python3-svg.path/template
+++ b/srcpkgs/python3-svg.path/template
@@ -1,11 +1,9 @@
 # Template file for 'python3-svg.path'
 pkgname=python3-svg.path
-version=5.1
+version=6.0
 revision=1
 wrksrc="svg.path-${version}"
 build_style=python3-module
-# disable failing test
-make_check_args="-k not(ImageTest)"
 hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest-cov python3-Pillow"
@@ -14,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://github.com/regebro/svg.path"
 distfiles="https://github.com/regebro/svg.path/archive/${version}.tar.gz"
-checksum=2ea5351a5886f8c55ae8fddb2f7182dca3d5760c03abade9cb256b91e4bb9bb4
+checksum=3c460dfb366c3cb70f26eb7e22c092144e24f4f62028632289fa703f8dc25630
 
 post_install() {
 	vlicense LICENSE.txt

From 448636537039eccb4d1cde84a9da3a254706b740 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 19 Apr 2022 18:56:06 -0500
Subject: [PATCH 1533/2561] Amass: update to 3.19.2.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 9293dab01c93..7106a5c312fd 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.19.1
+version=3.19.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=259dbef81ca63ceb85113c0f741c9212bacbac653bca2cd3e8022b256d08d426
+checksum=ef2b5303b3e92debe68ea72c03c4f60320c34f0281f50b5f7108750c7e1a7491

From e95cb755e594d635834acfbb68b8583c0b2059be Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 19 Apr 2022 19:12:59 -0500
Subject: [PATCH 1534/2561] stellarium: update to 0.22.1.

---
 srcpkgs/stellarium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template
index c2a87b2847ad..657b3a6e97b1 100644
--- a/srcpkgs/stellarium/template
+++ b/srcpkgs/stellarium/template
@@ -1,6 +1,6 @@
 # Template file for 'stellarium'
 pkgname=stellarium
-version=0.22.0
+version=0.22.1
 revision=1
 build_style=cmake
 hostmakedepends="perl qt5-qmake qt5-host-tools"
@@ -12,5 +12,5 @@ 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=0b4dc23cf9054b5e76cd9bc5ad68e172eb221999e90af37e93667d04fe78c885
+checksum=61a595ecc345dcc7517359573d0dc772e67ecaf6d52fefab142a77c92cf3fa24
 replaces="stellarium-data>=0"

From 15553f6e0fa1eb565088df31863bf966ebeef64f Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Tue, 19 Apr 2022 23:31:19 -0500
Subject: [PATCH 1535/2561] iperf3: update to 3.11.

---
 srcpkgs/iperf3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iperf3/template b/srcpkgs/iperf3/template
index 81ba349c49be..d71d870ac7c8 100644
--- a/srcpkgs/iperf3/template
+++ b/srcpkgs/iperf3/template
@@ -1,6 +1,6 @@
 # Template file for 'iperf3'
 pkgname=iperf3
-version=3.10.1
+version=3.11
 revision=1
 wrksrc="iperf-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://software.es.net/iperf/"
 changelog="https://raw.githubusercontent.com/esnet/iperf/master/RELNOTES.md"
 distfiles="https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"
-checksum=03bc9760cc54a245191d46bfc8edaf8a4750f0e87abca6764486972044d6715a
+checksum=de8cb409fad61a0574f4cb07eb19ce1159707403ac2dc01b5d175e91240b7e5f
 
 post_install() {
 	vlicense LICENSE

From 05ed17e997466f29b2730a15d3b0ce9c3d4444ee Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Apr 2022 11:04:22 -0400
Subject: [PATCH 1536/2561] python3-signedjson: update to 1.1.4.

---
 .../patches/importlib_metadata.patch          | 39 -------------------
 srcpkgs/python3-signedjson/template           |  4 +-
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/python3-signedjson/patches/importlib_metadata.patch

diff --git a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch b/srcpkgs/python3-signedjson/patches/importlib_metadata.patch
deleted file mode 100644
index d7553958cc15..000000000000
--- a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c40c83f844fee3c1c7b0c5d1508f87052334b4e5 Mon Sep 17 00:00:00 2001
-From: MeggyCal <MeggyCal@users.noreply.github.com>
-Date: Tue, 21 Apr 2020 18:55:37 +0200
-Subject: [PATCH] Do not require importlib_metadata on python 3.8. (#9)
-
----
- setup.py               | 2 +-
- signedjson/__init__.py | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 9c09760..c1cc299 100755
---- a/setup.py
-+++ b/setup.py
-@@ -41,7 +41,7 @@ def read_file(path_segments):
-         "pynacl>=0.3.0",
-         "typing_extensions>=3.5",
-         'typing>=3.5;python_version<"3.5"',
--        "importlib_metadata",
-+        'importlib_metadata;python_version<"3.8"',
-     ],
-     long_description=read_file(("README.rst",)),
-     keywords="json",
-diff --git a/signedjson/__init__.py b/signedjson/__init__.py
-index 6641e64..62faa5e 100644
---- a/signedjson/__init__.py
-+++ b/signedjson/__init__.py
-@@ -12,7 +12,10 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--from importlib_metadata import version, PackageNotFoundError
-+try:
-+    from importlib.metadata import version, PackageNotFoundError
-+except ImportError:  # pragma: nocover
-+    from importlib_metadata import version, PackageNotFoundError
- 
- try:
-     __version__ = version(__name__)
diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index bf9a8ddc1255..8acbaa32ab11 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-signedjson'
 pkgname=python3-signedjson
-version=1.1.1
+version=1.1.4
 revision=1
 wrksrc="signedjson-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-signedjson"
 distfiles="${PYPI_SITE}/s/signedjson/signedjson-${version}.tar.gz"
-checksum=350586e7570ba208f7729dcda09d43f554ead0207a15e3e3695533ef3f720009
+checksum=cd91c56af53f169ef032c62e9c4a3292dc158866933318d0592e3462db3d6492

From 9935530e654669865a1cc5e350d29cdee816ea5f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Apr 2022 11:02:53 -0400
Subject: [PATCH 1537/2561] synapse: update to 1.57.0.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 984ad56e0a8a..22ad01847677 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.56.0
+version=1.57.0
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -21,7 +21,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=7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373
+checksum=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From e5c266d80d28f722e5ef9254d4fcd8d0fc54834b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Apr 2022 14:10:55 +0200
Subject: [PATCH 1538/2561] xauth: update to 1.1.2.

---
 srcpkgs/xauth/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xauth/template b/srcpkgs/xauth/template
index 8cf9d80c6069..b663ef7b1ed9 100644
--- a/srcpkgs/xauth/template
+++ b/srcpkgs/xauth/template
@@ -1,6 +1,6 @@
 # Template file for 'xauth'
 pkgname=xauth
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="X authentication utility"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=78ba6afd19536ced1dddb3276cba6e9555a211b468a06f95f6a97c62ff8ee200
 
 post_install() {
 	vlicense COPYING

From 83aacf89c2a12064145d55b510b27c4b9f18b481 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 20 Apr 2022 17:16:56 +0200
Subject: [PATCH 1539/2561] elixir: update to 1.13.4.

---
 srcpkgs/elixir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 5a8b5d7c1e9d..8f721e3a3337 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.13.3
+version=1.13.4
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -13,7 +13,7 @@ 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=652779f7199f5524e2df1747de0e373d8b9f1d1206df25b2e551cd0ad33f8440
+checksum=95daf2dd3052e6ca7d4d849457eaaba09de52d65ca38d6933c65bc1cdf6b8579
 
 do_check() {
 	ERL_EPMD_PORT=5369 make ${make_check_target}

From 8d874f160f0b1c8b338e73f4ff172a5e25eadd49 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 20 Apr 2022 10:36:14 -0500
Subject: [PATCH 1540/2561] jadx: update to 1.3.5.

---
 srcpkgs/jadx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template
index 71467e34044c..dba5153c9961 100644
--- a/srcpkgs/jadx/template
+++ b/srcpkgs/jadx/template
@@ -1,6 +1,6 @@
 # Template file for 'jadx'
 pkgname=jadx
-version=1.3.4
+version=1.3.5
 revision=1
 hostmakedepends="openjdk8 gradle"
 short_desc="Decompiler for Dalvik bytecode"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/skylot/jadx"
 distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz"
-checksum=9f7f05c647a287fe4a572d85f14715559513e864d27f6bf6b19852529da8efdc
+checksum=ed556c32b87f6f6cc1ef6ea35bc6881da1a6ad538bb81f9dad1c16969435ea24
 
 do_build() {
 	gradle copyArtifacts

From 2904f5489c36ae6505bddfa980c1f68783b98459 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 20 Apr 2022 10:44:59 -0500
Subject: [PATCH 1541/2561] python3-easygui: update to 0.98.3.

---
 srcpkgs/python3-easygui/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-easygui/template b/srcpkgs/python3-easygui/template
index 3a35dad07d78..87188a537d51 100644
--- a/srcpkgs/python3-easygui/template
+++ b/srcpkgs/python3-easygui/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-easygui'
 pkgname=python3-easygui
-version=0.98.1
-revision=5
+version=0.98.3
+revision=1
 wrksrc="easygui-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-tkinter"
+checkdepends="$depends"
 short_desc="Simple, very easy GUI programming in Python"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/robertlugg/easygui"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b46d1f06b85a2de2b15129906d21bb42bc66a6e800315fed57e634cf151fc083
+distfiles="${PYPI_SITE}/e/easygui/easygui-${version}.tar.gz"
+checksum=d653ff79ee1f42f63b5a090f2f98ce02335d86ad8963b3ce2661805cafe99a04
+make_check=no # Requires X connection
 
 post_install() {
 	sed -n '29,74p' easygui/easygui.py > LICENSE

From d70f3af4e9227111a1de23da5ee4421852e0b53c Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 13 Feb 2022 12:36:33 +0200
Subject: [PATCH 1542/2561] shadow: increase maximum group name length to 32
 (from 16).

This is already the case for usernames, so why not groups?
---
 srcpkgs/shadow/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index f01181a49bd6..c59d92bfeb54 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,12 +1,13 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin --sbindir=/usr/bin
  --enable-shared --disable-static
  --with-libpam --without-selinux --with-acl --with-attr --without-su
- --disable-nls --enable-subordinate-ids --disable-account-tools-setuid"
+ --disable-nls --enable-subordinate-ids --disable-account-tools-setuid
+ --with-group-name-max-length=32"
 hostmakedepends="libtool"
 makedepends="acl-devel pam-devel"
 depends="pam"

From 9791498d7dff8be5324198f383838352d0e7e95f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 19 Apr 2022 10:48:20 +0200
Subject: [PATCH 1543/2561] platformio: update to 5.2.5.

Closes: #36762 [via git-merge-pr]
---
 srcpkgs/platformio/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/platformio/template b/srcpkgs/platformio/template
index 4aec9f82cc5a..9dbceafd89f5 100644
--- a/srcpkgs/platformio/template
+++ b/srcpkgs/platformio/template
@@ -1,7 +1,7 @@
 # Template file for 'platformio'
 pkgname=platformio
-version=5.1.1
-revision=2
+version=5.2.5
+revision=1
 wrksrc="platformio-core-${version}"
 build_style=python3-module
 # According to https://github.com/platformio/platformio-core/blob/9c20ab81cb68f1ffb7a8cac22ce95c4c797643ec/Makefile#L13
@@ -11,14 +11,14 @@ depends="python3-bottle python3-click python3-colorama python3-marshmallow
  python3-pyelftools python3-pyserial python3-requests
  python3-semanticversion python3-setuptools python3-tabulate"
 checkdepends="python3-pytest python3-jsondiff python3-wheel python3-pip
- python3-Twisted python3-certifi git $depends"
+ python3-Twisted python3-certifi git python3-zeroconf $depends"
 short_desc="Ecosystem for embedded development"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 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=f312c4cb535dc52c96b754cb54df3fee8001ab960894c7f2f9edd0e50d416aed
+checksum=26cc5b61d113250519257c156ae693ab8f6aea891283b28f1c4c67ffc81fb574
 
 post_install() {
 	vinstall scripts/99-platformio-udev.rules 644 usr/lib/udev/rules.d

From f40c7d77a616eebf23992ceb88f156a959846205 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 21 Apr 2022 00:59:24 +0200
Subject: [PATCH 1544/2561] qt5: rebuild against gstreamer-1.20.1

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 3a6841ed69b4..f6c03777d993 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20220222
 # commit fcca82ca40a5d8a02a4ddd90846d070f2c58cfad
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From ed94af3a280b97aa0a3ddf463f45d8639d162f4f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 10 Apr 2022 15:00:08 +0200
Subject: [PATCH 1545/2561] pipewire: update to 0.3.50.

---
 srcpkgs/pipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 5ed1ee1d3bd6..6427e0b66e77 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.48
+version=0.3.50
 revision=1
 _pms_version=0.4.1
 build_style=meson
@@ -32,7 +32,7 @@ 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
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="0d218be86b3d2b548c06259c47ad8d110ee1c09f071e17c4393eeef5c880fa6f
+checksum="a4bd81e9046f0bd19ecc18402b44199c6c4c54305670e43111c7fbdfe4d17bdf
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

From da97da0bcac91a7c9bfbec387efeba32a36bec29 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 16 Apr 2022 16:34:02 +0200
Subject: [PATCH 1546/2561] Carla: update to 2.4.3.

---
 srcpkgs/Carla/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 83b8224861ae..6d25e6bb0482 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,6 +1,6 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.4.2
+version=2.4.3
 revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
@@ -14,9 +14,9 @@ depends="python3 python3-PyQt5 python3-PyQt5-svg pyliblo which"
 short_desc="Audio plugin host"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
+homepage="https://kx.studio/Applications:Carla"
 distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
-checksum=376884965e685242953cab757818dde262209c651bd563a04eade0678c6b9f39
+checksum=0092926e5167f3a5eb592f0055e5491803354ae42947e706db0dc548d9e786d3
 python_version=3
 
 case $XBPS_TARGET_MACHINE in
@@ -29,15 +29,14 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" Carla-devel"
 fi
 
-pre_build() {
-	vsed -e '1,1i#include <unistd.h>' \
-		-i source/modules/water/text/CharacterFunctions.h
-
+post_patch() {
 	if [ "$CROSS_BUILD" ]; then
 		vsed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \
 			source/plugin/Makefile
 	fi
+}
 
+pre_build() {
 	make ${make_build_args} features
 }
 

From ca76560170e69aed9cd92592fea98f9f5dde786f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:38:26 +0200
Subject: [PATCH 1547/2561] python3-fasteners: add python3 to dependencies

---
 srcpkgs/python3-fasteners/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-fasteners/template b/srcpkgs/python3-fasteners/template
index d1d2c75ca2e2..0e5b8bed2c28 100644
--- a/srcpkgs/python3-fasteners/template
+++ b/srcpkgs/python3-fasteners/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-fasteners'
 pkgname=python3-fasteners
 version=0.17.3
-revision=1
+revision=2
 wrksrc="fasteners-${version}"
 build_style=python3-pep517
 hostmakedepends="python3 python3-wheel"
+depends="python3"
 short_desc="Python3 package that provides useful locks"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From e7ab16cc4e6a66f2ae9ff0c9c2b14cc346fab1f9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:38:26 +0200
Subject: [PATCH 1548/2561] python3-listparser: add python3 to dependencies

---
 srcpkgs/python3-listparser/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-listparser/template b/srcpkgs/python3-listparser/template
index dfe7ba100839..55bcd24119af 100644
--- a/srcpkgs/python3-listparser/template
+++ b/srcpkgs/python3-listparser/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-listparser'
 pkgname=python3-listparser
 version=0.18
-revision=1
+revision=2
 wrksrc="listparser-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
+depends="python3"
 short_desc="Parse subscription lists in Python"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-3.0-or-later"

From 72ef671650cc55f97dbbaf400dd40d2c99564300 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:39:03 +0200
Subject: [PATCH 1549/2561] python3-pylast: fix dependencies

---
 srcpkgs/python3-pylast/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index 63b2e0104e61..76e57a27f4cf 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-pylast'
 pkgname=python3-pylast
 version=4.1.0
-revision=3
+revision=4
 wrksrc="pylast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3"
+depends="python3-setuptools"
 short_desc="Python3 interface to last.fm and libre.fm"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pylast/pylast"
 distfiles="${PYPI_SITE}/p/pylast/pylast-${version}.tar.gz"
 checksum=ad084aec1bf7e307bc42d7cc1a003851f5bee1ad24fb697a9fdc300bbfe63932
+make_check=no # The 'pylast' distribution was not found and is required by the application

From 7599e78edb1290b89511095d0dae01f227e61718 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:39:04 +0200
Subject: [PATCH 1550/2561] python3-soupsieve: fix dependencies

---
 srcpkgs/python3-soupsieve/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index 14449f20c47f..83862532f658 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-soupsieve'
 pkgname=python3-soupsieve
 version=1.9.5
-revision=6
+revision=7
 wrksrc="soupsieve-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-pytest python3-lxml python3-html5lib python3-BeautifulSoup4"
+depends="python3-BeautifulSoup4"
+checkdepends="python3-pytest python3-lxml python3-html5lib $depends"
 short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"

From 24e0b169c4e71e83b0951428e0788cf9c1cc359d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:39:04 +0200
Subject: [PATCH 1551/2561] python3-readability-lxml: fix dependencies

---
 srcpkgs/python3-readability-lxml/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-readability-lxml/template b/srcpkgs/python3-readability-lxml/template
index 798cc9c5f4cc..dfb4b0fb6b25 100644
--- a/srcpkgs/python3-readability-lxml/template
+++ b/srcpkgs/python3-readability-lxml/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-readability-lxml'
 pkgname=python3-readability-lxml
 version=0.8.1
-revision=4
+revision=5
 wrksrc="readability-lxml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lxml"
+depends="python3-lxml python3-chardet python3-cssselect"
 short_desc="Fast html to text parser"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/buriy/python-readability"
 distfiles="${PYPI_SITE}/r/readability-lxml/readability-lxml-${version}.tar.gz"
 checksum=e51fea56b5909aaf886d307d48e79e096293255afa567b7d08bca94d25b1a4e1
+make_check=no # needs unpackaged timeout_decorator

From 4996d152242dcc44ad980a5c93f74e83157d438e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:05:43 -0400
Subject: [PATCH 1552/2561] New package: openjdk17-jmods-17.0.3+5

---
 srcpkgs/openjdk17-jmods    |  1 +
 srcpkgs/openjdk17/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk17-jmods

diff --git a/srcpkgs/openjdk17-jmods b/srcpkgs/openjdk17-jmods
new file mode 120000
index 000000000000..99ab1cb1b0d2
--- /dev/null
+++ b/srcpkgs/openjdk17-jmods
@@ -0,0 +1 @@
+openjdk17
\ No newline at end of file
diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 7e368f9b687e..9dba58b0d0d7 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -168,7 +168,7 @@ post_install() {
 	rm -rf ./ca
 }
 
-subpackages="openjdk17-src openjdk17-jre openjdk17-doc"
+subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods"
 
 openjdk17-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -223,3 +223,11 @@ openjdk17-src_package() {
 		vmove "$_jdk_home/lib/src.zip"
 	}
 }
+
+openjdk17-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From be533af960b33eb2f39412737341091592cfc556 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:06:37 -0400
Subject: [PATCH 1553/2561] openjdk17: update to 17.0.3+7.

also disable for armv5 and 6, the arch is not supported
---
 srcpkgs/openjdk17/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 9dba58b0d0d7..2554e49c54ea 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,6 +1,6 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
-version=17.0.3+5
+version=17.0.3+7
 revision=1
 _gtest_ver=1.8.1
 _java_ver="${version%%.*}"
@@ -44,7 +44,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
  https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
-checksum="a557f4d2972bbbbcdc12fa7e167ad60b4ee1461a9bc7ad259a003172c34e6331
+checksum="22575340d080a396442658356583d9c7dc0c44cefa52842fbfcf23eef23c39a0
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1"
 patch_args="-Np1 --directory=$build_wrksrc"
@@ -53,10 +53,11 @@ patch_args="-Np1 --directory=$build_wrksrc"
 disable_parallel_build=yes
 build_options="docs"
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then
@@ -81,11 +82,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jfr:/${_jdk_home}/bin/jfr
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
-
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
  jdk:/usr/bin/java:/${_jdk_home}/bin/java

From 0c00f7eca1c83b0f4b03eec61a4489e745ef5d0b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:38 -0400
Subject: [PATCH 1554/2561] openjdk9-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk9-bootstrap/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 48cc14fb712c..c82f0761166a 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -50,10 +50,11 @@ checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  9cba7f03ebeda4d3cfaffb015f9bf967fcca2c3c113604836073556df6a7b9aa
  c939de46f903ecb283c02155e1415cee98ab66803e17eae0403c399c1a475647"
 
-# no hotspot JIT for arm32 and ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	arm*|ppc*) _use_zero=yes ;;
+	# no hotspot JIT for arm32 and ppc32
+	armv7*|ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 0cef4c954f67190f47c1f7850bb0ccc6af71dfd6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:40 -0400
Subject: [PATCH 1555/2561] openjdk10-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk10-bootstrap/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 3d99cd14af98..1c673dc748d1 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -35,10 +35,11 @@ distfiles="http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-${_repo_ver
 checksum="374f7ae35f0a7439a40bd2c765d1f410607c75c6c1e788f1a344a42e59431f51"
 lib32disabled=yes
 
-# no hotspot JIT for arm32 and ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	arm*|ppc*) _use_zero=yes ;;
+	# no hotspot JIT for arm32 and ppc32
+	armv7*|ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 79e1657bdebd920167760c954d25d9ee5ff31618 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:41 -0400
Subject: [PATCH 1556/2561] openjdk12-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk12-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 2b5d421a52f0..1f20483ecbd4 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -47,10 +47,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From ff5e50fdffd236e9df2434d9c1e311ab70c861dd Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:41 -0400
Subject: [PATCH 1557/2561] openjdk13-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk13-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 4a61e102381d..6a6b3340ffcd 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -47,10 +47,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From ec803b07277af1681b865dc9a8d79281937edd02 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:42 -0400
Subject: [PATCH 1558/2561] openjdk14-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk14-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 768b94633196..341818dc5cf9 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -46,10 +46,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 75077cc88a70d502286cb4856ec8bda27c47b2fa Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:43 -0400
Subject: [PATCH 1559/2561] openjdk15-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk15-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 7608f4dd2658..1430f205d1b9 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -49,10 +49,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 873ff286963e54d5905dfde53426d391cd72d33b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:43 -0400
Subject: [PATCH 1560/2561] openjdk16-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk16-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 28e70a17fd2b..2c8566bb1c31 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -49,10 +49,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From f4c7ccb907c5ec1b8a576aff371bd3f77ce907da Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 22:12:21 -0400
Subject: [PATCH 1561/2561] openjdk8: update to 8u322b04, enable debug.

---
 .../openjdk8/patches/006_8197981-pr3548.patch |  32 ----
 srcpkgs/openjdk8/patches/010_pr1869.patch     |  33 ----
 .../patches/999-native-no-sysroot.patch       |  10 +-
 srcpkgs/openjdk8/template                     | 161 ++++++++----------
 4 files changed, 77 insertions(+), 159 deletions(-)
 delete mode 100644 srcpkgs/openjdk8/patches/006_8197981-pr3548.patch
 delete mode 100644 srcpkgs/openjdk8/patches/010_pr1869.patch

diff --git a/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch b/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch
deleted file mode 100644
index 5f6d9ce9e4b5..000000000000
--- a/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518667645 0
-#      Thu Feb 15 04:07:25 2018 +0000
-# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
-# Parent  999983606f5c61b093c6f6316a7b26c4cd4ca79e
-8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -457,6 +457,7 @@
-     long long unsigned int oldval,
-     long long unsigned int newval) {
-     ShouldNotCallThis();
-+    return 0;
-   }
- };
- #endif // !_LP64
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -498,6 +498,7 @@
-     long long unsigned int oldval,
-     long long unsigned int newval) {
-     ShouldNotCallThis();
-+    return 0;
-   }
- };
- #endif // !_LP64
diff --git a/srcpkgs/openjdk8/patches/010_pr1869.patch b/srcpkgs/openjdk8/patches/010_pr1869.patch
deleted file mode 100644
index 26f8c8e14bd6..000000000000
--- a/srcpkgs/openjdk8/patches/010_pr1869.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1405461315 -3600
-#      Tue Jul 15 22:55:15 2014 +0100
-# Node ID 967ae4d849eb20b4b63c399bc3f376dfc0f9d2cc
-# Parent  84854c983fd81cf1a1598f8c069a2db010abc05c
-PR1869: Avoid x86 workaround when running Zero rather than a JIT
-Contributed-by: Matthias Klose <doko@ubuntu.com>
-
-diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2019-04-11 03:36:49.000000000 +0100
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2019-04-19 17:15:35.194017652 +0100
-@@ -5139,7 +5139,7 @@
- 
-   Linux::capture_initial_stack(JavaThread::stack_size_at_create());
- 
--#if defined(IA32)
-+#if defined(IA32) && !defined(ZERO)
-   workaround_expand_exec_shield_cs_limit();
- #endif
- 
-diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2019-04-11 03:36:49.000000000 +0100
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2019-04-19 17:15:58.329656663 +0100
-@@ -890,7 +890,7 @@
-  * updates (JDK-8023956).
-  */
- void os::workaround_expand_exec_shield_cs_limit() {
--#if defined(IA32)
-+#if defined(IA32) && !defined(ZERO)
-   size_t page_size = os::vm_page_size();
- 
-   /*
diff --git a/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch b/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch
index 52c8194b0bca..aabc19835d5c 100644
--- a/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch
+++ b/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch
@@ -2,11 +2,9 @@ By default, OpenJDK 8 passes sysroot flags to native compiler. This is wrong,
 as it will then use target include files when calling the native compiler.
 Newer versions of OpenJDK have seemingly fixed this, 8 has not.
 
-diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
-index d961cf3..9679f97 100644
 --- a/make/common/NativeCompilation.gmk
 +++ b/make/common/NativeCompilation.gmk
-@@ -383,10 +383,6 @@ define SetupNativeCompilation
+@@ -384,10 +384,6 @@
      $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
    endif
  
@@ -17,12 +15,12 @@ index d961cf3..9679f97 100644
    # Now call add_native_source for each source file we are going to compile.
    $$(foreach p,$$($1_SRCS), \
        $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
-@@ -432,8 +428,6 @@ define SetupNativeCompilation
+@@ -433,8 +429,6 @@
      $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
    endif
  
 -  $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS)
 -
+   # Need to make sure TARGET is first on list
    $1 := $$($1_TARGET)
-   ifneq (,$$($1_LIBRARY))
-     # Generating a dynamic library.
+   ifeq ($$($1_STATIC_LIBRARY),)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index c10b5216435b..9cced29b4be9 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -3,13 +3,12 @@
 # TODO: make -headless versions
 # TODO: config files?
 pkgname=openjdk8
-version=8u272b02
+version=8u322b04
 revision=1
-_jdk_update=272
 _jdk_update="${version#*u}"
 _jdk_update="${_jdk_update%b*}"
 _jdk_build="${version#*b}"
-_final_jdk_home="usr/lib/jvm/java-1.8-openjdk"
+_jdk_home="usr/lib/jvm/java-1.8-openjdk"
 # we're using aarch64 port repo to get aarch64 JIT; the repo is
 # otherwise the same as the normal one, just with aarch64 port added
 _repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
@@ -19,6 +18,8 @@ configure_args="
  --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
  --with-update-version=${_jdk_update}
  --with-build-number=b${_jdk_build}
+ --with-debug-level=release
+ --with-native-debug-symbols=internal
  --with-milestone=fcs
  --enable-unlimited-crypto
  --with-zlib=system
@@ -53,14 +54,14 @@ distfiles="
  http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/${_repo_ver}.tar.gz>langtools-${_repo_ver}.tar.gz
  http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/${_repo_ver}.tar.gz>nashorn-${_repo_ver}.tar.gz"
 
-checksum="bb931ea723a8b6c418ef6a8dc7b33c9a082ce240f607e33d260951bdc52d1294
- 655a3f4875f4ea4d6d7083c65e3bffbd694114af25a7e25bb4276c63f606328d
- 2c6bc905ffe04659e89806514f10848e4ff548209c8e4407a5f37a3358a8cb78
- 9543a96eb3f60171cebbf0652190942c0b0a78560fae19c7c7aff7a72e14daa5
- 7a610a834483650660a98828420cd3bb36f17e077cc0eaf30c4d01db97ee0efd
- 330f52d045993ca98f6c6376bb67e5c085937553db80fd21503129f9fcdd144d
- 04d6b61009f7373c49a5381281cae2d4c06d4c5bc42991b3bccfb8b820b95bba
- 48aac240d50cb3fa651b2299b6add1376f31624fd7666b74ba23761bb535fab7"
+checksum="1b93adf81488be199243f684398d616c20e68bd3bef990d9eafb3d607ab3d02e
+ 03a7e0fc8ce0ed938c80c69890812e1dbad423df1718115e28f930908a9b5f9b
+ 2213194f9b3aef81340710ca63fd00fbabc42a82b6b30d6955640e66293ab497
+ 80646bf709598067622227c982efdbd88b3c6e8da0024e6f9a264145d942a99c
+ 8c8fc97a8c056cc520472d292b85dbe25a7edbfa4545a8c45275b7b378b0fb65
+ 2d659ba2c64b19dba192ed1be1e6033efb7445809f8e6966439619a417975a73
+ 16cc13cc5234ac1ed3dcebc8c8586a4e31b43cf5c9a4b496fd1f29279fa6b827
+ 68357e18386d833a882a9a988bf4535e5ce8dfa90beeeed7a1939aa75c0e991f"
 
 build_options="docs"
 desc_option_docs="Build documentation"
@@ -81,75 +82,59 @@ fi
 
 provides="java-environment-${version}_1"
 
-if [ -n "$XBPS_DEBUG_PKGS" ]; then
-	configure_args+=" --with-native-debug-symbols=internal"
-fi
-
 if [ ! "$CROSS_BUILD" ]; then
 	hostmakedepends+=" openjdk7-bootstrap"
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-1.7-openjdk"
 else
 	hostmakedepends+=" openjdk8"
-	configure_args+=" --with-boot-jdk=/${_final_jdk_home}"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 # enabling ccache segfaults gcc
 export CCACHE_DISABLE=1
 
 alternatives="
- java:/usr/bin/java:/${_final_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_final_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_final_jdk_home}/bin/keytool
- java:/usr/bin/orbd:/${_final_jdk_home}/bin/orbd
- java:/usr/bin/pack200:/${_final_jdk_home}/bin/pack200
- java:/usr/bin/policytool:/${_final_jdk_home}/bin/policytool
- java:/usr/bin/rmid:/${_final_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_final_jdk_home}/bin/rmiregistry
- java:/usr/bin/servertool:/${_final_jdk_home}/bin/servertool
- java:/usr/bin/tnameserv:/${_final_jdk_home}/bin/tnameserv
- java:/usr/bin/unpack200:/${_final_jdk_home}/bin/unpack200
-
- jdk:/usr/bin/appletviewer:/${_final_jdk_home}/bin/appletviewer
- jdk:/usr/bin/extcheck:/${_final_jdk_home}/bin/extcheck
- jdk:/usr/bin/idlj:/${_final_jdk_home}/bin/idlj
- jdk:/usr/bin/jar:/${_final_jdk_home}/bin/jar
- jdk:/usr/bin/jarsigner:/${_final_jdk_home}/bin/jarsigner
- jdk:/usr/bin/java:/${_final_jdk_home}/bin/java
- jdk:/usr/bin/java-rmi.cgi:/${_final_jdk_home}/bin/java-rmi.cgi
- jdk:/usr/bin/javac:/${_final_jdk_home}/bin/javac
- jdk:/usr/bin/javadoc:/${_final_jdk_home}/bin/javadoc
- jdk:/usr/bin/javah:/${_final_jdk_home}/bin/javah
- jdk:/usr/bin/javap:/${_final_jdk_home}/bin/javap
- jdk:/usr/bin/jcmd:/${_final_jdk_home}/bin/jcmd
- jdk:/usr/bin/jconsole:/${_final_jdk_home}/bin/jconsole
- jdk:/usr/bin/jdb:/${_final_jdk_home}/bin/jdb
- jdk:/usr/bin/jdeps:/${_final_jdk_home}/bin/jdeps
- jdk:/usr/bin/jhat:/${_final_jdk_home}/bin/jhat
- jdk:/usr/bin/jinfo:/${_final_jdk_home}/bin/jinfo
- jdk:/usr/bin/jjs:/${_final_jdk_home}/bin/jjs
- jdk:/usr/bin/jmap:/${_final_jdk_home}/bin/jmap
- jdk:/usr/bin/jps:/${_final_jdk_home}/bin/jps
- jdk:/usr/bin/jrunscript:/${_final_jdk_home}/bin/jrunscript
- jdk:/usr/bin/jsadebugd:/${_final_jdk_home}/bin/jsadebugd
- jdk:/usr/bin/jstack:/${_final_jdk_home}/bin/jstack
- jdk:/usr/bin/jstat:/${_final_jdk_home}/bin/jstat
- jdk:/usr/bin/jstatd:/${_final_jdk_home}/bin/jstatd
- jdk:/usr/bin/keytool:/${_final_jdk_home}/bin/keytool
- jdk:/usr/bin/native2ascii:/${_final_jdk_home}/bin/native2ascii
- jdk:/usr/bin/orbd:/${_final_jdk_home}/bin/orbd
- jdk:/usr/bin/pack200:/${_final_jdk_home}/bin/pack200
- jdk:/usr/bin/policytool:/${_final_jdk_home}/bin/policytool
- jdk:/usr/bin/rmic:/${_final_jdk_home}/bin/rmic
- jdk:/usr/bin/rmid:/${_final_jdk_home}/bin/rmid
- jdk:/usr/bin/rmiregistry:/${_final_jdk_home}/bin/rmiregistry
- jdk:/usr/bin/schemagen:/${_final_jdk_home}/bin/schemagen
- jdk:/usr/bin/serialver:/${_final_jdk_home}/bin/serialver
- jdk:/usr/bin/servertool:/${_final_jdk_home}/bin/servertool
- jdk:/usr/bin/tnameserv:/${_final_jdk_home}/bin/tnameserv
- jdk:/usr/bin/unpack200:/${_final_jdk_home}/bin/unpack200
- jdk:/usr/bin/wsgen:/${_final_jdk_home}/bin/wsgen
- jdk:/usr/bin/wsimport:/${_final_jdk_home}/bin/wsimport
- jdk:/usr/bin/xjc:/${_final_jdk_home}/bin/xjc
+ jdk:/usr/bin/appletviewer:/${_jdk_home}/bin/appletviewer
+ jdk:/usr/bin/extcheck:/${_jdk_home}/bin/extcheck
+ jdk:/usr/bin/idlj:/${_jdk_home}/bin/idlj
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/java-rmi.cgi:/${_jdk_home}/bin/java-rmi.cgi
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javah:/${_jdk_home}/bin/javah
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhat:/${_jdk_home}/bin/jhat
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jsadebugd:/${_jdk_home}/bin/jsadebugd
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/native2ascii:/${_jdk_home}/bin/native2ascii
+ jdk:/usr/bin/orbd:/${_jdk_home}/bin/orbd
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/policytool:/${_jdk_home}/bin/policytool
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/schemagen:/${_jdk_home}/bin/schemagen
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/servertool:/${_jdk_home}/bin/servertool
+ jdk:/usr/bin/tnameserv:/${_jdk_home}/bin/tnameserv
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+ jdk:/usr/bin/wsgen:/${_jdk_home}/bin/wsgen
+ jdk:/usr/bin/wsimport:/${_jdk_home}/bin/wsimport
+ jdk:/usr/bin/xjc:/${_jdk_home}/bin/xjc
 "
 
 post_extract() {
@@ -219,11 +204,11 @@ post_install() {
 
 	# unify the install prefix
 	mv ${DESTDIR}/usr/lib/jvm/openjdk-1.8.0_${_jdk_update} \
-	   ${DESTDIR}/${_final_jdk_home}
+	   ${DESTDIR}/${_jdk_home}
 
-	vmkdir ${_final_jdk_home}/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/${_final_jdk_home}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/${_final_jdk_home}/lib/security/
+	vmkdir ${_jdk_home}/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/${_jdk_home}/bin/keytool"
+	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/${_jdk_home}/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 
@@ -237,23 +222,23 @@ openjdk8-jre_package() {
 	short_desc+=" - runtime components"
 	provides="java-runtime-${version}_1"
 	alternatives="
-	 java:/usr/bin/java:/${_final_jdk_home}/jre/bin/java
-	 java:/usr/bin/jjs:/${_final_jdk_home}/jre/bin/jjs
-	 java:/usr/bin/keytool:/${_final_jdk_home}/jre/bin/keytool
-	 java:/usr/bin/orbd:/${_final_jdk_home}/jre/bin/orbd
-	 java:/usr/bin/pack200:/${_final_jdk_home}/jre/bin/pack200
-	 java:/usr/bin/policytool:/${_final_jdk_home}/jre/bin/policytool
-	 java:/usr/bin/rmid:/${_final_jdk_home}/jre/bin/rmid
-	 java:/usr/bin/rmiregistry:/${_final_jdk_home}/jre/bin/rmiregistry
-	 java:/usr/bin/servertool:/${_final_jdk_home}/jre/bin/servertool
-	 java:/usr/bin/tnameserv:/${_final_jdk_home}/jre/bin/tnameserv
-	 java:/usr/bin/unpack200:/${_final_jdk_home}/jre/bin/unpack200
+	 java:/usr/bin/java:/${_jdk_home}/jre/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/jre/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/jre/bin/keytool
+	 java:/usr/bin/orbd:/${_jdk_home}/jre/bin/orbd
+	 java:/usr/bin/pack200:/${_jdk_home}/jre/bin/pack200
+	 java:/usr/bin/policytool:/${_jdk_home}/jre/bin/policytool
+	 java:/usr/bin/rmid:/${_jdk_home}/jre/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/jre/bin/rmiregistry
+	 java:/usr/bin/servertool:/${_jdk_home}/jre/bin/servertool
+	 java:/usr/bin/tnameserv:/${_jdk_home}/jre/bin/tnameserv
+	 java:/usr/bin/unpack200:/${_jdk_home}/jre/bin/unpack200
 	"
 	pkg_install() {
-		vmove ${_final_jdk_home}/jre
+		vmove ${_jdk_home}/jre
 		vmkdir etc/profile.d
 		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk8.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/${_final_jdk_home}/jre}
+export JAVA_HOME=\${JAVA_HOME=/${_jdk_home}/jre}
 EOF
 	}
 }
@@ -264,7 +249,7 @@ openjdk8-src_package() {
 	noshlibprovides=yes
 	short_desc+=" - source code"
 	pkg_install() {
-		vmove ${_final_jdk_home}/src.zip
+		vmove ${_jdk_home}/src.zip
 	}
 }
 
@@ -279,6 +264,6 @@ openjdk8-doc_package() {
 			vmkdir usr/share/doc/openjdk8
 			cp -a build/linux-*/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk8
 		fi
-		vmove ${_final_jdk_home}/man/man1
+		vmove ${_jdk_home}/man/man1
 	}
 }

From e906d3bed0475f598f08e5125ef507ba205ecfca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Apr 2022 12:15:20 +0200
Subject: [PATCH 1562/2561] python3-pwntools: update to 4.8.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 e57c1bed3007..f61ad95fa813 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.7.0
+version=4.8.0
 revision=1
 wrksrc="pwntools-${version}"
 build_style=python3-module
@@ -17,7 +17,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=74388e28675e7a1929f763df5a1cec6a3d589641049b6cf476bb1c56ec50a88e
+checksum=42052e2d883710e4e1da041e91675a6d719fb4e5ef2dd245cb2853da11269290
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From cbaf517bbb78ea16af46a1bb836d358ecf258514 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Apr 2022 14:20:52 +0200
Subject: [PATCH 1563/2561] gst-plugins-base1: ensure wayland winsys is built

This is a regression from previous state.
---
 srcpkgs/gst-plugins-base1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 6ab6210e6605..fcb7c07b06ab 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
 version=1.20.1
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
@@ -9,12 +9,13 @@ configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
  -Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled)"
-hostmakedepends="gettext pkg-config glib-devel orc"
+hostmakedepends="gettext pkg-config glib-devel orc wayland-devel"
 makedepends="gstreamer1-devel glib-devel libxml2-devel pango-devel
  cairo-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel
  libvisual-devel libgudev-devel libtheora-devel libvorbis-devel
  libSM-devel orc-devel $(vopt_if cdparanoia libcdparanoia-devel)
- opus-devel MesaLib-devel $(vopt_if sndio sndio-devel) graphene-devel"
+ opus-devel MesaLib-devel $(vopt_if sndio sndio-devel) graphene-devel
+ wayland-devel wayland-protocols"
 depends="orc>=0.4.18 gstreamer1>=${version}"
 checkdepends="mesa-dri"
 short_desc="GStreamer Base Plug-ins (v1.x)"

From 68c1db90d9b191d5c3d3cbb7fa8883a79b3454f4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Apr 2022 14:25:20 +0200
Subject: [PATCH 1564/2561] gst-plugins-good1: rebuild against fixed
 gst-plugins-base1

---
 srcpkgs/gst-plugins-good1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 0ce7d1bce5c9..aba03519e450 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-good1'
 pkgname=gst-plugins-good1
 version=1.20.1
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled

From 488111a2d9229acac6c26dbfa43c8299d4067583 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Apr 2022 14:28:46 +0200
Subject: [PATCH 1565/2561] qt5: rebuild again against fixed gstreamer

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f6c03777d993..ee788fad2019 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20220222
 # commit fcca82ca40a5d8a02a4ddd90846d070f2c58cfad
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From ac2bb3ee233d4c9acf28f433f7ff24b60b1e3f52 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Apr 2022 15:36:44 +0200
Subject: [PATCH 1566/2561] clojure: update to 1.11.1.1105.

---
 srcpkgs/clojure/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 7fdaa6090b67..ac65080ef7af 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,6 +1,6 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.1029
+version=1.11.1.1105
 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=422986f259608c049fcff7147222c713b5563a9f0c6e74e0a0dae4a076478091
+checksum=991cad02a2ac459dc4222c9f8233e2145458ed8576a254b64c262798cae40567
 
 do_install() {
 	vmkdir /usr/lib/clojure

From f24b584a55cf63a7c745d75ff29b95073b51b62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 13 Apr 2022 21:13:37 +0200
Subject: [PATCH 1567/2561] xbps-src: sort and deduplicate packages at
 update-sys

---
 common/xbps-src/shutils/bulk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 8eb6e920f04f..c0228f10ac2b 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -68,7 +68,7 @@ bulk_build() {
 
     # Compare installed pkg versions vs srcpkgs
     if [[ $sys ]]; then
-        xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR
+        bulk_sortdeps $(xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR)
         return $?
     fi
     # compare repo pkg versions vs srcpkgs

From 3f7c0af70a2cac282b5d469c5dc14fa6613456f2 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 14:08:15 +0200
Subject: [PATCH 1568/2561] lxqt: update to 1.1.0.

---
 srcpkgs/lxqt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lxqt/template b/srcpkgs/lxqt/template
index a510106d65db..d30d711e9561 100644
--- a/srcpkgs/lxqt/template
+++ b/srcpkgs/lxqt/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt'
 pkgname=lxqt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=meta
 depends="
@@ -21,15 +21,15 @@ depends="
 	obconf-qt
 	pcmanfm-qt>=${version}
 	lximage-qt>=${version}
-	lxmenu-data
 	lxqt-archiver
 	qterminal>=${version}
 	openbox
 	breeze-icons
+	xdg-desktop-portal-lxqt
 	xdg-utils
 	elogind
 	upower"
 short_desc="LXQt meta-package for Void Linux"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="BSD-2-Clause" # Suppress xlint warning: vlicense
-homepage="https://www.lxqt.org/"
+homepage="https://lxqt-project.org"

From 01853cacd185d0f63bdd7672e9f23bb666a8bf98 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 14:25:28 +0200
Subject: [PATCH 1569/2561] lxqt-build-tools: update to 0.11.0.

---
 srcpkgs/lxqt-build-tools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-build-tools/template b/srcpkgs/lxqt-build-tools/template
index 8b88c28e20c2..179cfee67e7f 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.10.0
+version=0.11.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config"
@@ -8,9 +8,9 @@ makedepends="qt5-devel"
 short_desc="LXQt build tools"
 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=facb86b0bf3bd4fd20306d3ae965a148ed59785eaf7d73169a82a97473d03bea
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-build-tools/archive/${version}.tar.gz"
+checksum=95da1309ae0111e3b97f775788465f82548a3de09b0e9d5e0a26e5fe715075b2
 
 post_install() {
 	vlicense BSD-3-Clause LICENSE

From 5040b48632299eae45d9be31d566786e1b988060 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 14:44:10 +0200
Subject: [PATCH 1570/2561] libqtxdg: update to 3.9.0.

---
 srcpkgs/libqtxdg/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template
index a9c665844f3c..b8bea143f360 100644
--- a/srcpkgs/libqtxdg/template
+++ b/srcpkgs/libqtxdg/template
@@ -1,6 +1,6 @@
 # Template file for 'libqtxdg'
 pkgname=libqtxdg
-version=3.8.0
+version=3.9.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools lxqt-build-tools"
@@ -8,9 +8,9 @@ makedepends="qt5-svg-devel"
 short_desc="Qt implementation of freedesktop.org XDG specifications"
 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=ce824fb2dda47758b44e57e8e4b63437a5bc5bd476cf37dbba61442990d7ccec
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/libqtxdg/archive/${version}.tar.gz"
+checksum=4dc7e3e65e6bcd50010647ef781ef5601b08ce024b0b1155e6a68316696c5a58
 
 libqtxdg-devel_package() {
 	short_desc+=" - development files"

From 60edc970d26e22e46fdf9b239cdd03a4e3ca83ee Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:05:52 +0200
Subject: [PATCH 1571/2561] liblxqt: update to 1.1.0.

---
 srcpkgs/liblxqt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/liblxqt/template b/srcpkgs/liblxqt/template
index c39a0398f965..5e5734ad61c5 100644
--- a/srcpkgs/liblxqt/template
+++ b/srcpkgs/liblxqt/template
@@ -1,6 +1,6 @@
 # Template file for 'liblxqt'
 pkgname=liblxqt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools
@@ -10,9 +10,9 @@ makedepends="kwindowsystem-devel libqtxdg-devel libXScrnSaver-devel
 short_desc="Core utility library for all LXQt components"
 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=d62820a94839637aedd6a0ceecc232f85d8ccd2173d4ec655cd92c9cbcbcc98c
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/liblxqt/archive/${version}.tar.gz"
+checksum=3b4672cef3906f82444da886557fe0504bf53066e7741c2215592119fbafbb42
 
 liblxqt-devel_package() {
 	short_desc+=" - development files"

From c14754d865de646969d0a40958deefbdf459d42b Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:26:14 +0200
Subject: [PATCH 1572/2561] lxqt-config: update to 1.1.0.

---
 srcpkgs/lxqt-config/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lxqt-config/template b/srcpkgs/lxqt-config/template
index c38f2486029f..8372521a2c32 100644
--- a/srcpkgs/lxqt-config/template
+++ b/srcpkgs/lxqt-config/template
@@ -1,14 +1,14 @@
 # Template file for 'lxqt-config'
 pkgname=lxqt-config
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
-hostmakedepends="pkgconf lxqt-build-tools qt5-qmake qt5-host-tools perl"
+hostmakedepends="pkg-config 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"
 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=64d7dd43e5ec1f98f0ba41e99f4438bb1f881fcbc2b2931f798cc82643c2d8a5
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-config/archive/${version}.tar.gz"
+checksum=debe3f51c30e37a8bca37bfdaa0187a68ddd57dad0ecefef169a32c2b042cc58

From 7ceb4c66f7f81282acdcc60910e20e5915e7a64d Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:36:44 +0200
Subject: [PATCH 1573/2561] lxqt-policykit: update to 1.1.0.

---
 srcpkgs/lxqt-policykit/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-policykit/template b/srcpkgs/lxqt-policykit/template
index ef972dba1961..ad81878cab8a 100644
--- a/srcpkgs/lxqt-policykit/template
+++ b/srcpkgs/lxqt-policykit/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-policykit'
 pkgname=lxqt-policykit
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools polkit-qt5-devel perl"
@@ -8,7 +8,7 @@ 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=8e3ae58196c55c28a5a231f44154a83d6697aa5f6b40dffdedb6b9ea776b4d35
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-policykit/archive/${version}.tar.gz"
+checksum=4866bb843657206b0bb55cc063474941a6d81db578fe3d5143d3760f438b033d
 replaces="lxqt-common>=0"

From 3942237ce49686951a76f706dc4feae289aa9c31 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:48:19 +0200
Subject: [PATCH 1574/2561] lxqt-session: update to 1.1.0.

---
 srcpkgs/lxqt-session/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lxqt-session/template b/srcpkgs/lxqt-session/template
index 3afe6da177f3..3b30d410cc33 100644
--- a/srcpkgs/lxqt-session/template
+++ b/srcpkgs/lxqt-session/template
@@ -1,16 +1,16 @@
 # Template file for 'lxqt-session'
 pkgname=lxqt-session
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools xdg-user-dirs
  perl"
-makedepends="liblxqt-devel xdg-user-dirs procps-ng-devel"
+makedepends="kwindowsystem-devel liblxqt-devel 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=3245457cb4a1e59ec62802308c872173baa300fa0f8e517fe14f45112733a6c1
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-session/archive/${version}.tar.gz"
+checksum=6ff41d1c95464fe7b00d3b5493f259323ecad61ae72865cf251ad5db9ae68e4e
 replaces="lxqt-common>=0"

From e45b2ead50ae34104f15abc65cc927d583011b9f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:54:04 +0200
Subject: [PATCH 1575/2561] lxqt-about: update to 1.1.0.

---
 srcpkgs/lxqt-about/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-about/template b/srcpkgs/lxqt-about/template
index 4103f1a6038e..447c2a945f8b 100644
--- a/srcpkgs/lxqt-about/template
+++ b/srcpkgs/lxqt-about/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-about'
 pkgname=lxqt-about
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,6 +8,6 @@ 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=1c14f68bf65099fbd46b062ffc6c92656620aa1a9eec5a0fd2d1b11888939203
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-about/archive/${version}.tar.gz"
+checksum=d8b5bb348c73e59e000151c5569b46496299155019a3cf9ce7e21a8f641d42b4

From 99f432f5aa87000937bddc84a2f0511a1acd7acc Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 17:21:23 +0200
Subject: [PATCH 1576/2561] lxqt-admin: update to 1.1.0.

---
 srcpkgs/lxqt-admin/patches/systemd.patch |  9 +++++++++
 srcpkgs/lxqt-admin/template              | 14 ++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/lxqt-admin/patches/systemd.patch

diff --git a/srcpkgs/lxqt-admin/patches/systemd.patch b/srcpkgs/lxqt-admin/patches/systemd.patch
new file mode 100644
index 000000000000..097c7669b1bf
--- /dev/null
+++ b/srcpkgs/lxqt-admin/patches/systemd.patch
@@ -0,0 +1,9 @@
+lxqt-admin-time depends on systemd-{timedated,timesyncd}
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,5 +38,4 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD
+     message(WARNING "${CMAKE_SYSTEM_NAME} is not supported by lxqt-admin-time")
+ else()
+     add_subdirectory(lxqt-admin-user)
+-    add_subdirectory(lxqt-admin-time)
+ endif()
diff --git a/srcpkgs/lxqt-admin/template b/srcpkgs/lxqt-admin/template
index 9bf02478a149..cba72e16fbce 100644
--- a/srcpkgs/lxqt-admin/template
+++ b/srcpkgs/lxqt-admin/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-admin'
 pkgname=lxqt-admin
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools polkit-qt5-devel
@@ -9,12 +9,6 @@ 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=f6eebb0da1563f14e9e4d39d3ff2622ee1c8ffa5b130ba26321cfe5261c1411e
-
-post_install() {
-	# depends on systemd-{timedated,timesyncd}
-	rm -f ${DESTDIR}/usr/bin/lxqt-admin-time
-	rm -f ${DESTDIR}/usr/share/applications/lxqt-admin-time.desktop
-}
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-admin/archive/${version}.tar.gz"
+checksum=cf6c41a63b861caacae5ace8bef4781f502cfb0f559fe56afbffe60d13a74775

From 41b9c71054293381b0112c61d6260ae69e1f5631 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 17:31:34 +0200
Subject: [PATCH 1577/2561] lxqt-archiver: update to 0.6.0.

---
 srcpkgs/lxqt-archiver/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-archiver/template b/srcpkgs/lxqt-archiver/template
index 5a5dd96932b2..076965fb01bb 100644
--- a/srcpkgs/lxqt-archiver/template
+++ b/srcpkgs/lxqt-archiver/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-archiver'
 pkgname=lxqt-archiver
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools pkg-config qt5-host-tools qt5-qmake perl"
@@ -8,6 +8,6 @@ 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=8ae5259ec00761b1f178e54b9e99bcf64685a6000a148501c4bbe862b4b08fc7
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/${pkgname}/archive/${version}.tar.gz"
+checksum=63029ed0c22dccaa30a7dd7866b6739e7746904cfa97deac836b40da6d56eb8c

From a7bd670fcd4fef54d1a65da628cbbf70c246be79 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 17:43:05 +0200
Subject: [PATCH 1578/2561] libfm-qt: update to 1.1.0.

---
 common/shlibs             | 2 +-
 srcpkgs/libfm-qt/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..11328b15a9cc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1990,7 +1990,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.10 libfm-qt-1.0.0_1
+libfm-qt.so.11 libfm-qt-1.1.0_1
 libqtermwidget5.so.1 qtermwidget-1.0.0_1
 libQt6Core.so.6 qt6-core-6.0.0_1
 libQt6OpenGL.so.6 qt6-gui-6.0.0_1
diff --git a/srcpkgs/libfm-qt/template b/srcpkgs/libfm-qt/template
index 9b2009242a83..bd7343fac83d 100644
--- a/srcpkgs/libfm-qt/template
+++ b/srcpkgs/libfm-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'libfm-qt'
 pkgname=libfm-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,9 +9,9 @@ makedepends="qt5-tools-devel qt5-x11extras-devel libexif-devel
 short_desc="Core library of PCManFM-Qt"
 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=743d9c8fc30d065d7fefc12e72f31085891733184f1320ba3ade890dae54993b
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/libfm-qt/archive/${version}.tar.gz"
+checksum=8ba16e0db696bb938f675b6d5394ec96726585e8b6130e6a2718a4ffde073d62
 replaces="libfm-qt5>=0"
 
 libfm-qt-devel_package() {

From 4e06ac1511e601501c20a581d1d2190cb3c25075 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:09:10 +0200
Subject: [PATCH 1579/2561] pcmanfm-qt: update to 1.1.0.

---
 srcpkgs/pcmanfm-qt/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/pcmanfm-qt/template b/srcpkgs/pcmanfm-qt/template
index fc09b2987170..5a5341a6c5f6 100644
--- a/srcpkgs/pcmanfm-qt/template
+++ b/srcpkgs/pcmanfm-qt/template
@@ -1,15 +1,15 @@
 # Template file for 'pcmanfm-qt'
 pkgname=pcmanfm-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel perl"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-qt-devel perl"
 makedepends="qt5-tools-devel qt5-x11extras-devel libfm-qt-devel"
 depends="qt5-translations"
-short_desc="LXQt pcmanfm Qt frontend"
+short_desc="Qt port of PCManFM"
 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=fa45cc0d3e870db3fb56f474e854aa1284576023082b770b3e4a44410f22cce3
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/pcmanfm-qt/archive/${version}.tar.gz"
+checksum=28b5ff1fb71d9259ae73962892ce04142a750794aa35c4840ed575da08972b9d
 replaces="lxqt-common>=0"

From 8a94987a0e2ada5b55a40411a94cf73aba85af92 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:16:28 +0200
Subject: [PATCH 1580/2561] lximage-qt: update to 1.1.0.

---
 srcpkgs/lximage-qt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lximage-qt/template b/srcpkgs/lximage-qt/template
index b64d2568b9d4..503990ab93db 100644
--- a/srcpkgs/lximage-qt/template
+++ b/srcpkgs/lximage-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'lximage-qt'
 pkgname=lximage-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,6 +9,6 @@ makedepends="qt5-x11extras-devel qt5-tools-devel qt5-svg-devel libfm-qt-devel
 short_desc="LXQt image viewer"
 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=04fdff9d0d20dbfeddca2ca8166f7dd14b691badb6ca65909ca8bce75c4a7225
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lximage-qt/archive/${version}.tar.gz"
+checksum=cd1eb058af1c927fac9ac4d2d31435cf46572b2f017cbb0d0b099ad6106c8b91

From 3cea76ba6855701d80d08cca83da05d9f2451fee Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:23:45 +0200
Subject: [PATCH 1581/2561] lxqt-globalkeys: update to 1.1.0.

---
 srcpkgs/lxqt-globalkeys/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-globalkeys/template b/srcpkgs/lxqt-globalkeys/template
index 97537e06f8ae..dcffc9ba5257 100644
--- a/srcpkgs/lxqt-globalkeys/template
+++ b/srcpkgs/lxqt-globalkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-globalkeys'
 pkgname=lxqt-globalkeys
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,9 +8,9 @@ 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=b81944cc8d8f20f1eeedb3cd54d4e6ad86a1697d71b4212cf60110af43559a45
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-globalkeys/archive/${version}.tar.gz"
+checksum=ce0cbdbfbddef4ea9b2018b61fb6fc03caeea57fc31bc6f4bb54a04619edb2aa
 replaces="lxqt-common>=0"
 
 lxqt-globalkeys-devel_package() {

From 6c0b50e7f1fcc6c87a2148e18f69dc8944420d45 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:30:32 +0200
Subject: [PATCH 1582/2561] lxqt-notificationd: update to 1.1.0.

---
 srcpkgs/lxqt-notificationd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-notificationd/template b/srcpkgs/lxqt-notificationd/template
index 0158f56a3364..57cd26eed5a8 100644
--- a/srcpkgs/lxqt-notificationd/template
+++ b/srcpkgs/lxqt-notificationd/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-notificationd'
 pkgname=lxqt-notificationd
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,7 +8,7 @@ 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=94c10fd904995d3eea3b587dd521ed01b839d863ff80205af0af8cab6cb2a660
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-notificationd/archive/${version}.tar.gz"
+checksum=6b29f0163541ba734bcb8d21f0f3579bc36c868fa8afee44d8b7e56ea8ca23ee
 replaces="lxqt-common>=0"

From ea535e2ae357ea0e8d8f7af245fed650a84a9b07 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:31:58 +0200
Subject: [PATCH 1583/2561] lxqt-openssh-askpass: update to 1.1.0.

---
 srcpkgs/lxqt-openssh-askpass/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-openssh-askpass/template b/srcpkgs/lxqt-openssh-askpass/template
index 57fe03004c15..566f1741e329 100644
--- a/srcpkgs/lxqt-openssh-askpass/template
+++ b/srcpkgs/lxqt-openssh-askpass/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-openssh-askpass'
 pkgname=lxqt-openssh-askpass
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,7 +9,7 @@ depends="openssh"
 short_desc="LXQt ssh-agent helper"
 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=9de22a06646cfa50b0ddeef26ac87b510f820501ff8832dc80c7d88a55d878b5
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-openssh-askpass/archive/${version}.tar.gz"
+checksum=77578faf1aaf3e273cd8f92b84ad9570d7aacc88b44663c3373517e790c606b6
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/lxqt-openssh-askpass"

From fca95f2aba4c91afeb4640bb9375b95444e03ce9 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:42:14 +0200
Subject: [PATCH 1584/2561] lxqt-panel: update to 1.1.0.

---
 srcpkgs/lxqt-panel/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lxqt-panel/template b/srcpkgs/lxqt-panel/template
index f486e3e3a258..f5524550a6ed 100644
--- a/srcpkgs/lxqt-panel/template
+++ b/srcpkgs/lxqt-panel/template
@@ -1,16 +1,17 @@
 # Template file for 'lxqt-panel'
 pkgname=lxqt-panel
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 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
- libqtxdg-devel libXdamage-devel"
+ libsensors-devel libsysstat-devel libdbusmenu-qt5-devel
+ libqtxdg-devel libxcb-devel libXtst-devel xcb-util-image-devel"
+depends="lxmenu-data"
 short_desc="LXQt desktop panel"
 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=ea63939c557fa639d2ab3fae48341c1a59ae8baae1a79d11f15e4bc0e38468d5
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-panel/archive/${version}.tar.gz"
+checksum=f80ccdeb59933d32aab1a425301b9b68458bf0c55567befe1c03263afad20d6d

From 172cb7a27aa9064e9e513e3b40eff3ad17558539 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:47:30 +0200
Subject: [PATCH 1585/2561] lxqt-powermanagement: update to 1.1.0.

---
 srcpkgs/lxqt-powermanagement/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-powermanagement/template b/srcpkgs/lxqt-powermanagement/template
index f7c8b8d85e8f..b083469ecbbd 100644
--- a/srcpkgs/lxqt-powermanagement/template
+++ b/srcpkgs/lxqt-powermanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-powermanagement'
 pkgname=lxqt-powermanagement
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,6 +8,6 @@ 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=c0a444faeed60337c966bfd562e65e936f132f578762c2f01f136038a3f058ee
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-powermanagement/archive/${version}.tar.gz"
+checksum=df59e7b93392863874250a49769dcd7ed395f98548428f9ef6a5b1e728d32e86

From 43d774d163a1cd34bd4a50e81945b10292ed6782 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:53:50 +0200
Subject: [PATCH 1586/2561] lxqt-qtplugin: update to 1.1.0.

---
 srcpkgs/lxqt-qtplugin/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lxqt-qtplugin/template b/srcpkgs/lxqt-qtplugin/template
index 8148c7119f10..eaddfdf3d70b 100644
--- a/srcpkgs/lxqt-qtplugin/template
+++ b/srcpkgs/lxqt-qtplugin/template
@@ -1,13 +1,13 @@
 # Template file for 'lxqt-qtplugin'
 pkgname=lxqt-qtplugin
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel"
-makedepends="liblxqt-devel libdbusmenu-qt5-devel libfm-qt-devel"
+makedepends="liblxqt-devel libdbusmenu-qt5-devel libfm-qt-devel libqtxdg-devel"
 short_desc="LXQt Qt theme plugin"
 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=8e789430e1f3b6a354f61d496440a59b797f699320bb8c001d8ef7ac8e1db05e
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-qtplugin/archive/${version}.tar.gz"
+checksum=20eda3ac9319e793c4b1236413f119058771d34915483bed4a048591a59ae990

From 814912c42403fe35e9098e38f822f151b340d44a Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:00:22 +0200
Subject: [PATCH 1587/2561] lxqt-runner: update to 1.1.0.

---
 srcpkgs/lxqt-runner/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-runner/template b/srcpkgs/lxqt-runner/template
index e85e2f5a7602..e96c3b6950f5 100644
--- a/srcpkgs/lxqt-runner/template
+++ b/srcpkgs/lxqt-runner/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-runner'
 pkgname=lxqt-runner
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,6 +8,6 @@ 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=24daa86680ef78daf8753b60b3a0c6df391e760b851796a0abeddeed61ae13b9
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-runner/archive/${version}.tar.gz"
+checksum=7c253d338019cb162cddcb606429faa016ac148a16bf720e87e28f756698b731

From 7dcb133944534c6cabe98902376ab2b0794d2329 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:04:18 +0200
Subject: [PATCH 1588/2561] lxqt-sudo: update to 1.1.0.

---
 srcpkgs/lxqt-sudo/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-sudo/template b/srcpkgs/lxqt-sudo/template
index 88b8389b1968..5ffd63acec36 100644
--- a/srcpkgs/lxqt-sudo/template
+++ b/srcpkgs/lxqt-sudo/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-sudo'
 pkgname=lxqt-sudo
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,6 +9,6 @@ depends="sudo"
 short_desc="LXQt GUI frontend for sudo"
 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=6072f6914942fff5884388be9c7c5d38d259fed14358c4c2a9103d0cdd0a43f0
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-sudo/archive/${version}.tar.gz"
+checksum=c31332d056355ff888175ba10556639f436b314579349ca90e555da849ebe22b

From 1c85f55e17409fb896388b59a05bfe055fa302c1 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:07:53 +0200
Subject: [PATCH 1589/2561] lxqt-themes: update to 1.1.0.

---
 srcpkgs/lxqt-themes/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-themes/template b/srcpkgs/lxqt-themes/template
index 01038f959c5d..a3c9b9c6a671 100644
--- a/srcpkgs/lxqt-themes/template
+++ b/srcpkgs/lxqt-themes/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-themes'
 pkgname=lxqt-themes
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools perl"
@@ -8,7 +8,7 @@ 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=e3a6c96311bbf471ce0af72953b2f34ecf15461ab5e57a6f5b924de41758562b
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-themes/archive/${version}.tar.gz"
+checksum=aeb24c1570ae350e4c4ecdea9fb1b67208f641966476bbafd1817a816f665efe
 replaces="lxqt-common>=0"

From 272fad7fe0feda36a7e4043c63763f19aef8c4d8 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:17:29 +0200
Subject: [PATCH 1590/2561] qtermwidget: update to 1.1.0.

---
 srcpkgs/qtermwidget/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qtermwidget/template b/srcpkgs/qtermwidget/template
index 938f79879735..273705963a64 100644
--- a/srcpkgs/qtermwidget/template
+++ b/srcpkgs/qtermwidget/template
@@ -1,6 +1,6 @@
 # Template file for 'qtermwidget'
 pkgname=qtermwidget
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
@@ -8,9 +8,9 @@ makedepends="qt5-tools-devel"
 short_desc="Terminal widget for QTerminal"
 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=2af0e9f212932cb36bbbf20722eaf4a1d3acf640dfed9b763ca7d388af8b7fd2
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/qtermwidget/archive/${version}.tar.gz"
+checksum=b062e5169bee35c3a8c1d0f67b78b43d63f1041d11e3a5a717f6a54a016bd734
 
 qtermwidget-devel_package() {
 	short_desc+=" - development files"

From 6409605fb236592b7f7e83cf2d25c4a31b96099a Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:30:33 +0200
Subject: [PATCH 1591/2561] qterminal: update to 1.1.0.

---
 srcpkgs/qterminal/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qterminal/template b/srcpkgs/qterminal/template
index 079c89b00a15..7469a365b367 100644
--- a/srcpkgs/qterminal/template
+++ b/srcpkgs/qterminal/template
@@ -1,14 +1,13 @@
 # Template file for 'qterminal'
 pkgname=qterminal
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 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"
 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=f169a5279ae5afe386ec3016385c7692b551fea1bae639a8ae438ec90165a643
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/qterminal/archive/${version}.tar.gz"
+checksum=5a72a6f3deb5326618183ddae59989316aa78c86163220f26895df677cbc4479

From 09e0bef6e2652f2287fd85f573d876ab6f06aeae Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 20:08:13 +0200
Subject: [PATCH 1592/2561] pavucontrol-qt: update to 1.1.0.

---
 srcpkgs/pavucontrol-qt/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pavucontrol-qt/template b/srcpkgs/pavucontrol-qt/template
index 2faef3430dc0..0be80a6c17c8 100644
--- a/srcpkgs/pavucontrol-qt/template
+++ b/srcpkgs/pavucontrol-qt/template
@@ -1,13 +1,13 @@
 # Template file for 'pavucontrol-qt'
 pkgname=pavucontrol-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 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>"
+maintainer="Enrico Belleri <idesmi@protonmail.com>"
 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=2407aa55a2d3dc0fdc7074b461c02b97fd455514fbbf9f5b711e68fadd45ac69
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/pavucontrol-qt/archive/${version}.tar.gz"
+checksum=8e4017c584c357fbff75d849e3210fa446edc6e53655b6920221891b8e3dc403

From 2636207f945bc69aff617dfb1c5cd28945ea6ab8 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 20:13:58 +0200
Subject: [PATCH 1593/2561] qps: update to 2.5.0.

---
 srcpkgs/qps/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qps/template b/srcpkgs/qps/template
index 4934c280c4db..264e1eeda9da 100644
--- a/srcpkgs/qps/template
+++ b/srcpkgs/qps/template
@@ -1,6 +1,6 @@
 # Template file for 'qps'
 pkgname=qps
-version=2.4.0
+version=2.5.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools perl qt5-qmake qt5-host-tools"
@@ -8,6 +8,6 @@ makedepends="liblxqt-devel"
 short_desc="Qt process manager"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/lxqt/qps"
-distfiles="https://github.com/lxqt/qps/releases/download/${version}/qps-${version}.tar.xz"
-checksum=c2a6c1d5e40e96997cca834f88ca1104aa179bef576a1a8b355b987eaaac69cd
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/qps/archive/${version}.tar.gz"
+checksum=c5f3a27b731eccfae59734c4a3048f9d8632827444e35b773c1a112702666b6a

From f6d24a08133b8c4864e14c427bcd75f296edd699 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 20:40:11 +0200
Subject: [PATCH 1594/2561] New package: xdg-desktop-portal-lxqt-0.2.0

---
 srcpkgs/xdg-desktop-portal-lxqt/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-lxqt/template

diff --git a/srcpkgs/xdg-desktop-portal-lxqt/template b/srcpkgs/xdg-desktop-portal-lxqt/template
new file mode 100644
index 000000000000..297e1769a1f5
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-lxqt/template
@@ -0,0 +1,14 @@
+# Template file for 'xdg-desktop-portal-lxqt'
+pkgname=xdg-desktop-portal-lxqt
+version=0.2.0
+revision=1
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="kwindowsystem-devel libfm-qt-devel"
+short_desc="Backend implementation for xdg-desktop-portal using Qt/KF5/libfm-qt"
+maintainer="Enrico Belleri <idesmi@protonmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/lxqt/xdg-desktop-portal-lxqt"
+changelog="https://github.com/lxqt/xdg-desktop-portal-lxqt/raw/master/CHANGELOG"
+distfiles="https://github.com/lxqt/xdg-desktop-portal-lxqt/archive/${version}.tar.gz"
+checksum=9d7ac6fd6980293cb184518642dcc57d842b67105b3d236f893189bd30911ad7

From 7e94f037e9b6d6e133c6cbc8db39b8c7b33bdf17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 29 Mar 2022 21:41:02 +0200
Subject: [PATCH 1595/2561] qtcreator: update to 7.0.0.

---
 .../qtcreator/patches/QTCREATORBUG-26910.diff | 39 -------------------
 srcpkgs/qtcreator/template                    | 31 +++++++--------
 2 files changed, 15 insertions(+), 55 deletions(-)
 delete mode 100644 srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff

diff --git a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff b/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
deleted file mode 100644
index 8c07c72ccf10..000000000000
--- a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001
-From: Marco Bubke <marco.bubke@qt.io>
-Date: Mon, 24 Jan 2022 14:38:29 +0100
-Subject: [PATCH] QmlDesigner: Fix 32 bit
-
-Because std::ptrdiff_t and int are the same under 32 bit the constructor
-is changed to a template. The class is private so it is very unlikely
-that it leads to errors.
-
-Task-number: QTCREATORBUG-26910
-Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd
-Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
-Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
----
-
-diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-index 747c3d9..27d2905 100644
---- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-+++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-@@ -67,15 +67,8 @@
- 
-         StorageCacheIndex(const char *) = delete;
- 
--        constexpr explicit StorageCacheIndex(int id) noexcept
--            : id{id}
--        {}
--
--        constexpr explicit StorageCacheIndex(std::size_t id) noexcept
--            : id{static_cast<int>(id)}
--        {}
--
--        constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
-+        template<typename IntegerType>
-+        constexpr explicit StorageCacheIndex(IntegerType id) noexcept
-             : id{static_cast<int>(id)}
-         {}
- 
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 988491ec6496..912c6c00c4c5 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,14 +1,16 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=6.0.2
+version=7.0.0
 revision=1
 wrksrc="qt-creator-opensource-src-${version}"
-build_style=qmake
-make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
+build_style=cmake
+configure_args="$(vopt_bool qbs BUILD_QBS)"
 hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
- qt5-host-tools"
+ qt5-host-tools qt5-tools"
 makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
- qt5-quickcontrols qt5-svg-devel clang llvm"
+ qt5-quickcontrols qt5-svg-devel qt5-plugin-odbc qt5-plugin-sqlite
+ qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
+ clang llvm clang-tools-extra"
 depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
 short_desc="Cross-platform IDE for Qt developers"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -16,24 +18,21 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa
+checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9
 replaces="qtcreator-data>=0"
 python_version=3
 
+build_options="qbs"
+desc_option_qbs="Build vendored Qbs"
+
+if [ -z "$XBPS_CROSS_BUILD" ]; then
+	build_options_default="qbs"
+fi
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
-pre_configure() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vsed -i src/plugins/qmldesigner/qmldesignerplugin.pro \
-			src/plugins/clangformat/clangformat.pro \
-			-e "/LIBS += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
-		vsed -i src/plugins/debugger/debugger.pro \
-			-e "/RESOURCES += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
-	fi
-}
-
 post_install() {
 	# Install the license with the annotation for
 	# the Qt Company GPL Exception 1.0

From 9545e8dec5112238ecd29e1b1c89682de0662039 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 20 Apr 2022 20:15:38 +0200
Subject: [PATCH 1596/2561] grim: update to 1.4.0.

---
 srcpkgs/grim/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template
index 89af643b6a7f..f42ed188f1f4 100644
--- a/srcpkgs/grim/template
+++ b/srcpkgs/grim/template
@@ -1,18 +1,22 @@
 # Template file for 'grim'
 pkgname=grim
-version=1.3.2
+version=1.4.0
 revision=1
+wrksrc="grim-v${version}"
 build_style=meson
 configure_args="-Djpeg=enabled -Dwerror=false"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wayland-devel wayland-protocols cairo-devel libjpeg-turbo-devel"
+makedepends="wayland-devel wayland-protocols pixman-devel libjpeg-turbo-devel
+ libpng-devel"
 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/grim/archive/v${version}.tar.gz"
-checksum=42c2952e98389506156c08e40e0c37afdc2ec5ef4d55a5a4febde6acdac4d1c8
+distfiles="https://git.sr.ht/~emersion/grim/archive/v${version}.tar.gz"
+checksum=66729ae654546404f50ed163055310dd23ed52cc5a881d39752c0cd076e3d7aa
 
 post_install() {
 	vlicense LICENSE
+	vcompletion contrib/completions/bash/grim.bash bash
+	vcompletion contrib/completions/fish/grim.fish fish
 }

From e657fd5c3b0ebe019eb79f60c891556e08e30040 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 21 Apr 2022 17:43:24 -0500
Subject: [PATCH 1597/2561] Signal-Desktop: update to 5.40.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index c02e6864b8a1..8bcfe617ab40 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.39.0
+version=5.40.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=0e5f237bd2db6f9e32d58d28c99727bdd069cffb6abf9c68b62c30c8a6ca83d9
+checksum=57bb0ebbf4b3fb9d6dfbaa84166ecf668ce0df8a0afa0f69907680804dd064c4
 nostrip_files="signal-desktop"
 
 post_extract() {

From 53df20b3fc6f2815d69ffcf44a7aab31e4bacf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 20 Apr 2022 12:41:47 +0200
Subject: [PATCH 1598/2561] New package: dasel-1.24.1

---
 srcpkgs/dasel/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/dasel/template

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
new file mode 100644
index 000000000000..6d913b08ba62
--- /dev/null
+++ b/srcpkgs/dasel/template
@@ -0,0 +1,19 @@
+# Template file for 'dasel'
+pkgname=dasel
+version=1.24.1
+revision=1
+build_style=go
+go_import_path=github.com/tomwright/dasel
+go_package="${go_import_path}/cmd/dasel"
+go_ldflags="-X ${go_import_path}/internal.Version=${version}"
+short_desc="Query and modify data structures using selector strings"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="MIT"
+homepage="https://daseldocs.tomwright.me/"
+changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md"
+distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz"
+checksum=ca1fa030f41abcd3659e76d7413ce14c551f40d41769e7a000a46f4fea6d0b64
+
+post_install() {
+	vlicense LICENSE
+}

From 5084d6a26efd71c7f6362da860c5049ef2ff1f06 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 11 Apr 2022 09:26:30 +0200
Subject: [PATCH 1599/2561] python3-tweepy: update to 4.8.0.

---
 srcpkgs/python3-tweepy/template | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-tweepy/template b/srcpkgs/python3-tweepy/template
index d71fa028f64f..fc13e91d8d57 100644
--- a/srcpkgs/python3-tweepy/template
+++ b/srcpkgs/python3-tweepy/template
@@ -1,21 +1,18 @@
 # Template file for 'python3-tweepy'
 pkgname=python3-tweepy
-version=3.9.0
-revision=2
+version=4.8.0
+revision=1
 wrksrc="tweepy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-requests-oauthlib python3-six python3-pysocks"
+depends="python3-requests-oauthlib python3-pysocks"
 short_desc="Twitter library for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tweepy/tweepy"
 distfiles="https://github.com/tweepy/tweepy/archive/v${version}.tar.gz"
-checksum=2b7ec06cc5d143396423a5eae16b198e69b93df2bc6044f1365270c805e940b7
-
-do_check() {
-	: # requires packages not provided by Void
-}
+checksum=6ca49718d9cd0e73080f780062e050dd8ca777201365fb50b935d727f7c1fc18
+make_check=no # requires packages not provided by Void
 
 post_install() {
 	vlicense LICENSE

From 918c842c552efb79bf1f147397553bc2444ed9a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 10 Apr 2022 22:31:50 +0200
Subject: [PATCH 1600/2561] gdu: update to 5.13.2.

---
 srcpkgs/gdu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 9c47a649b805..9ef80a2f5a7d 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,6 +1,6 @@
 # Template file for 'gdu'
 pkgname=gdu
-version=5.12.1
+version=5.13.2
 revision=1
 build_style=go
 go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
@@ -9,7 +9,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/dundee/gdu"
 distfiles="https://github.com/dundee/gdu/archive/v${version}.tar.gz"
-checksum=81471d80aedcf20c84bcee67814d34ab2cf43477b831ffa320b7721d481c64ab
+checksum=f4f237f6da470599f6393591282cfd67922a963325859a939ca40ba7e18024a8
 
 post_install() {
 	vman gdu.1

From 4e5db53dc43ae226d0158cadb44e65f9623a7a1b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 22 Apr 2022 16:41:56 +0200
Subject: [PATCH 1601/2561] zchunk: update to 1.2.2.

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index e8679bcbabc4..c4812272d3ca 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,6 +1,6 @@
 # Template file for 'zchunk'
 pkgname=zchunk
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -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=9639942cf36f4f36d3b635d36d5164682249cc0240015569ac948db1584499b5
+checksum=bc36f13b1bcb2ab52d046bfc3ec04a9bd1f89b070b4e8fca52eded235a583526
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"

From b369712dc922afe013253e425d04a938c0416491 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Apr 2022 17:01:48 +0200
Subject: [PATCH 1602/2561] virt-what: update to 1.22.

---
 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 6403a915bec3..e6562de073cc 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.21
+version=1.22
 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=12cb455334aa4cfd53ab78f27e2252e94d1f676dd093f48327ed94d8080d1f7b
+checksum=e175df6109e537da1e18006f03d74a2e6dab76b5caf410dedafef188f1ee4561

From 25f311af3a24f6f251d9f6f63220a84472b7b732 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Apr 2022 17:20:41 +0200
Subject: [PATCH 1603/2561] bmake: update to 20220418.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 58cf70979203..babb5d6d3938 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20220414
+version=20220418
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=10ee07a7be26b22ce6a3bbc386e2916ca8e51b0ed2d256c271a7135e3c94f2a7
+checksum=6ea7de515cba74f173dc14ee17b1488ae032582028d2e86ea12f70369cc896f5
 python_version=3
 
 do_configure() {

From 279ed3feb55aeb34001e46235d0aab4631dc5598 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Apr 2022 18:19:58 +0200
Subject: [PATCH 1604/2561] rsync: update to 3.2.4.

---
 srcpkgs/rsync/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 928aa4824a2a..2f79c20f8f6b 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,7 +1,7 @@
 # Template file for 'rsync'
 pkgname=rsync
-version=3.2.3
-revision=3
+version=3.2.4
+revision=1
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
@@ -13,7 +13,7 @@ license="GPL-3.0-only"
 homepage="https://rsync.samba.org/"
 changelog="https://download.samba.org/pub/rsync/NEWS"
 distfiles="https://www.samba.org/ftp/rsync/src/rsync-$version.tar.gz"
-checksum=becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e
+checksum=6f761838d08052b0b6579cf7f6737d93e47f01f4da04c5d24d3447b7f2a5fad1
 
 # Force enable IPv6 on musl - upstream bug https://bugzilla.samba.org/show_bug.cgi?id=10715
 CFLAGS="-DINET6"

From 6a7167a2202604e9c5105fe805cc1cf7e51dd238 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Apr 2022 18:55:18 -0400
Subject: [PATCH 1605/2561] sof-firmware: update to 2.1.1.

---
 srcpkgs/sof-firmware/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 5e6399eca917..5436fb1db1ef 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
-version=1.9.2
+version=2.1.1
 revision=1
 archs="i686* x86_64*"
 wrksrc="sof-bin-${version}"
@@ -11,7 +11,7 @@ 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/refs/tags/v${version}.tar.gz"
-checksum=8eac925c129d195072237dcd28f4bbe80cf63eb00fd8b23bdc0719cd1ee9b395
+checksum=97c51c03bfb0a8cfc0a33d795e051e8f0608a3bfb3e07cd84de6fd7e9511f208
 
 do_install() {
 	vmkdir usr/lib/firmware/intel/sof

From c43cc06146d0d12829b11777311618014a9da18e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Apr 2022 20:35:39 -0400
Subject: [PATCH 1606/2561] pango: update to 1.50.7.

---
 srcpkgs/pango/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 4d410dbc72b0..5d49a2f7ed58 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,6 +1,6 @@
 # Template file for 'pango'
 pkgname=pango
-version=1.50.6
+version=1.50.7
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://www.pango.org/"
 changelog="https://gitlab.gnome.org/GNOME/pango/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a
+checksum=0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33
 make_check=no  # doesn't pass its own tests
 
 # Package build options

From 13765e0f8eab6e0aa891d44a861c3fc2557a428f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:33 +0200
Subject: [PATCH 1607/2561] filelight: update to 22.04.0.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index cdf212f14ef7..30e825e0eee5 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=28fc076caf94217f732b7228e0c77dc40b5d490bcbb3df7866c2e772130578f0
+checksum=434fa7439732905c4655cc376d2c89e86a5fcc5371ee6fda16400917a8e4e587

From fce29cc49f178826b619d42514aa685513ffefd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:34 +0200
Subject: [PATCH 1608/2561] kaccounts-integration: update to 22.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 846027947d2f..7a8b45b2da07 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=eb428cd94bf33910546527bad8a56ddaafd2a7fa894c9fcdba6da364e969048f
+checksum=3e5197c1c7ddce92dd5bdcdcc05492f3c63c468e3c1e743c6e747114d34d08b8
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From c9325bb7b0abe21db54ae98ada6485bb57da2529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:35 +0200
Subject: [PATCH 1609/2561] kaccounts-providers: update to 22.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 00cd5f36950d..09f7d22603b9 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=a09eed6a35e5f1909e4f8cdb9016ed0cd1fb33c34f5545f4c1e2a005d4dd9e4d
+checksum=297a55bcfa26379e9501b70f17da238a4ae23fd908b3afaa0052853a1cca0e34
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From c9bf6eedfac897c01755a3abdb15ce09982933bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:36 +0200
Subject: [PATCH 1610/2561] kcachegrind: update to 22.04.0.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 5b96b2e4e879..d46aefe7cb9b 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -13,5 +13,5 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=ddcf3722211d47c90616528607ebc4573835faa52a57e2e9d6763968b9975ab3
+checksum=aed09ea5dc01ace24c76ed69edef5111c47f53992ba45896365b53cd3fc8890d
 python_version=2

From 9d33f533359f8c4e8f278ebe3c9c939f69b4c8e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:37 +0200
Subject: [PATCH 1611/2561] kcron: update to 22.04.0.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index af6f042ab5e6..636aad34dab9 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=f556c6afbdf4a060dd52db64d36ebc13fcf7dcdaa6a7013b697e866b6338cc39
+checksum=d8ace47c86633ba677b64c765efe0b6f3de27cb75c17ae2434c498b07f3c0648

From aae5113feff04485e3be71633c4597538ae6bb79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:38 +0200
Subject: [PATCH 1612/2561] kdialog: update to 22.04.0.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index b1975e4203e7..64efbaad5e8b 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=a370f03edd88913d7cecf2bc9b61e2bd1466418fa1534a8f415a0057186ea111
+checksum=ac47479b576b87e8a82d62f4b685941b6ab54a44a06391c4c0762db159930589

From 70bd1a0c2408d932c15d30003cd80e69d3d01531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:39 +0200
Subject: [PATCH 1613/2561] keditbookmarks: update to 22.04.0.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index a67fbd7881c3..5291ab00f990 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=d356285aaeb12cdadf70c456a43d4e31f94a5f15c9dc01bae0ae4148833ccb71
+checksum=d6daabf60acec49cac1401da1019f965a96e8fd41b967694b2c8fd6723b87327

From 11da1781158931fc296e99d462d9430e3cb933a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:40 +0200
Subject: [PATCH 1614/2561] kfind: update to 22.04.0.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 766f1d9fee4f..06de53b604a9 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=a0ff3b4a44b938f7f336d4c2fbc302d8a55612b089ee954b2d98ec5f97ee3eec
+checksum=5133cad0be64fb3fc3f9666b01b4cff8141016f31c244ed39a3e21fc298b6935

From 72a0eb2d6cebbcbdb6054fc25a0a0b944b776a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:41 +0200
Subject: [PATCH 1615/2561] kig: update to 22.04.0.

---
 srcpkgs/kig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 33b5ad292bad..3f291745d311 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kig"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=b6a9ec8981c6983df2295ad0a8a53732928a8bb40c6c92305030392d5bf88066
+checksum=6dd9e280e3f0bca4c900f9fd8ef2e138eb8f1b021adf4ffe4e29804adddc7965

From f9f44182fc0a3f119c25a1225b95d71c85d95124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:42 +0200
Subject: [PATCH 1616/2561] kio-gdrive: update to 22.04.0.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 5bf3a6225a95..d1e301180476 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=07c1c20ed3ec8b96691d85a408997a94a76e0a61a50b056df3e21f6cde61a32e
+checksum=9f910baa87f707d1f28c9da5d3f1b104b992f7c7b3ca2ca532cb3646d92c84ec

From 54a4c11240aaee3eead289509aac7c299ccd4765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:42 +0200
Subject: [PATCH 1617/2561] kmag: update to 22.04.0.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 8dffb97af131..a68adf873813 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=548f9b4c13eda644c0fb182eb78f6326c57f6cb7dc8a185fcb09dd585f31fd18
+checksum=e65aaaa3e480c215384bae721afb36d7e50a7f8ab27aa4013eb46de1f43d97af

From d5b19636a73808e0d93bdd04b31727133d48eec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:44 +0200
Subject: [PATCH 1618/2561] kmix: update to 22.04.0.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 902b798dc250..e4bf7c548be8 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=13c1336f9e8e7a64f3e89a0558b9f16547a33e37f917bd491dfb061d25ed62fe
+checksum=3f41a53cb7033fde10ae92b693a6b84c0da045e570e83136dbc659afa89e5e7a

From 9acf29631779cbeeb02ab66440bc8e58327774b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:45 +0200
Subject: [PATCH 1619/2561] kolourpaint: update to 22.04.0.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index bf7598673a41..5a81652e6b04 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d2199ded688d768d8066a262d7a6b706b72a880fab9a394ffe64ae31be447f4d
+checksum=aeb2e439f32d9b1d7556e807c0902c870b90691f84764266e3f7fd92af5d9163
 
 post_install() {
 	vlicense COPYING

From 83a002c168d3c0bd0e8b398575060681336f03df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:45 +0200
Subject: [PATCH 1620/2561] kompare: update to 22.04.0.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 4219b5b650ad..457830d20119 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=9008fb78e238dc34233b5eb063bc0b54553dfa70b22d4164b39adef82b57ea24
+checksum=e2e0ee484b2eb098d9315ea26a0b68abce64ae02572baab998a5711f609c018d

From 222bd999e336d97c0e9a16a5687316693537d5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:46 +0200
Subject: [PATCH 1621/2561] konversation: update to 22.04.0.

---
 srcpkgs/konversation/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 877672e7ec18..5358aed5c724 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,17 +1,17 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel qca-qt5-devel qt5-multimedia-devel"
 short_desc="User friendly IRC client for KDE"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=00e16ff398e4ff19c8485f5d5078faea018c7b11c25d535d5949fca6eefcbd15
+checksum=f89c3854edd6dabcceff7a3615b532ac34d5b4769be1e125789e41d67e7f9b8a
 python_version=3

From 78a127deaf10c3006e0a8e6cd5a5988c5106d5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:47 +0200
Subject: [PATCH 1622/2561] kpat: update to 22.04.0.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 71cda890586b..e3d3d8d5ad3b 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -14,4 +14,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=68353dba09757a2696fce36f802a5bca3b7a5492de4d690d15ad04074f21a9c9
+checksum=275e2e4508980dbc53bd598c7abd05a21dd5c50b255e750436639cc75f67a44d

From ba43f502020ea8c7164ba3a6d13fb36398621a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:48 +0200
Subject: [PATCH 1623/2561] kruler: update to 22.04.0.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 74bc40f901b4..8c70ce207278 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=f95725a73d3bbb4fd59dfeadf6c070ed3d64e36995168300d2a0cb03921aab4a
+checksum=f4f189b606813fb2f42e40f7664adafafdcd210e474909b9e93ff30eba18cd45

From aca58bac51ba4bd6b5e9dac03e0f04ecd994727f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:49 +0200
Subject: [PATCH 1624/2561] ksystemlog: update to 22.04.0.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 72a178b4d0db..53c40ccabd7c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=a90af7b6116301eea4bd74a61e5e4e2a854c7ab91a103d54d7fcd30e7a066d4a
+checksum=25525e28756928ddb014ccec6f352c7378473ad417971608989818484b2847a4

From e704053cf2bc208f4210c9f0a2b5abb9630e8f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:50 +0200
Subject: [PATCH 1625/2561] kteatime: update to 22.04.0.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 5b5a6c75b194..dc8dbc935798 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=a4c0994170a877b14b8b66e68021a6ef03e5e427380c135caf99218f54d07744
+checksum=f3098313f7df6de082490c11ae6f840d3f73d2c3be22fb56d4bb0c15baf81df6

From 70356e37c285fc126aaaea4d3121b843b01bf031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:51 +0200
Subject: [PATCH 1626/2561] kturtle: update to 22.04.0.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index d9f82442461b..f3be87556605 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=43bc3de793f0971b75bf11a96e5af7961ccbc29a2a57417325953731f9d40999
+checksum=fd42b1380e7e46d6c1e5bc4cbe538edcf9ed9bfc5abf54141393adc28fe38427

From 87b7c89e7ef584bf3b8a64cf0e9df260e593fb4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:52 +0200
Subject: [PATCH 1627/2561] kwalletmanager: update to 22.04.0.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 18dce3c40633..902061e38dca 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=271db1bd744e9d9b183663b8a0239590f81f9997ff67cab51833861f0971b107
+checksum=d33824ae0abc7972fed9d7dad6acea9f67e7274ee5b15c0bb1df72b1a24aec17

From c7ce0a0f6f4477325750eb077c667496324b24f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:53 +0200
Subject: [PATCH 1628/2561] libkcddb: update to 22.04.0.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 555cba64b240..fbcc0153671e 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,7 +12,7 @@ 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"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=62709f9ccd8463208b905a3b935be1ba80102c451728e9f5c77e83eaf4afc191
+checksum=ddc91cc5112c5a749fccf18bb9a6b169279f6d5658fed3b4d60646d9ccbb0775
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From 65629881c8fe11ae1964f4e921d40a221c2f0c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:54 +0200
Subject: [PATCH 1629/2561] libkdegames: update to 22.04.0.

---
 srcpkgs/libkdegames/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index bb7f34a7fb8e..7aafa5cf73fd 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=4b2f3fb2af0866f7aba1ae679b505faeb7577b0ab50bd619ecb642c48ae0b574
+checksum=4dd8d80dbfd2806d420bb6efc2df64a175e8273d9ea34b9c61a0a7daae342e76
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f248a902f5f3eb4b9b09bf1dc93800d6cb648817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:55 +0200
Subject: [PATCH 1630/2561] libkomparediff2: update to 22.04.0.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 7c7f2de89c1e..5f3b036be599 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=a2815b6c9fc08172b4e39b27c25764baa96de40d6ca298544085fba692a323c9
+checksum=9c9ff478d4e31cc0b0dc980238956d92f683e6ff55dc1c6b67e3212c7e7e0711
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 32ebecef2cb9ddb925f04c6636adb4e0ec3a8155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:56 +0200
Subject: [PATCH 1631/2561] marble5: update to 22.04.0.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 4bc5bdaa1d27..841cb976ad1d 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.12.3
+version=22.04.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=442925b9024c0d7d470aa1523b0647c8fdce9ce69a0a2c6b29133d43596ad86c
+checksum=eb39219936b387dae4743638fe8ac5cf7f5654f4b4aff06a7c7b67e177799962
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From d92f21a716ba54bf1dd9f8adb293442ddf5b593e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:57 +0200
Subject: [PATCH 1632/2561] signon-kwallet-extension: update to 22.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 7cc3e0d56453..4361bac6029b 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=7579e0434114c33eb5fea3f232bbd414658e2715f3f3a3a220a4f5be4079606b
+checksum=33d19b1b758a21e568ce508cc168e568e34716f148cd83e214fb8a3f3194d2e8

From 9b453eb4b735a4de1ec2f00ddee14693d7e7e412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:58 +0200
Subject: [PATCH 1633/2561] svgpart: update to 22.04.0.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 54ceffce29ea..a0b9d95a6ce2 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=12fd83a8a4fafcc81d3bb0bfd9bc72da84a2fc3edc06e38d3acbfdf483d5e879
+checksum=923bda29e6610fb4dfd2b4f98e14045271c099ab1ed3988d52fefdc0b408df9a

From 36df8c7304912b2da6ab84f1f02ea973d5a96158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:59 +0200
Subject: [PATCH 1634/2561] umbrello: update to 22.04.0.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 6fc35aa3b336..da2757161229 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=c6c5f6107870b397dcc60932cbdc1767cc2d6a2f5223dc5e0314226b61a124c5
+checksum=f4f681daedbefdeb0e6b0da0fd718c20031491d3b088e0523ff5bbfab3de72d8
 python_version=2
 
 pre_configure() {

From 991dd3e3f0dac1ef45e4156008d1ad091a06e9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:42:00 +0200
Subject: [PATCH 1635/2561] yakuake: update to 22.04.0.

---
 srcpkgs/yakuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index 44a2f4000ebe..dd56e9afefb1 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=09667eb9aaaf7d072a0cd78b55b441691726686441b83a04d0c2c9b935cab382
+checksum=b7f96b48fd5baa75dd8fe53c8886f8cb0628f6a77a33232dc5bf06f45f6b2006

From a61e6af8768d0f742efec35c79b266199f2568c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 31 Aug 2021 21:00:01 +0200
Subject: [PATCH 1636/2561] hooks/99-pkglint.sh: make missing shlib entry not a
 warning

---
 common/hooks/pre-pkg/99-pkglint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index ea73c961ec5b..325938f5d541 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -182,7 +182,7 @@ hook() {
 			if [ -z "$found" ]; then
 				_myshlib="${libname}.so"
 				[ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
-				msg_warn "${pkgver}: ${_myshlib} not found in common/shlibs!\n"
+				msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
 			fi;
 		}
 	done

From 00ecf7810b5603d8235f239ad7cfdbc4aa2f8bde Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 22 Apr 2022 01:08:59 -0500
Subject: [PATCH 1637/2561] New package: step-certificates-0.19.0.

---
 srcpkgs/step-certificates/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/step-certificates/template

diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
new file mode 100644
index 000000000000..4d616f9450af
--- /dev/null
+++ b/srcpkgs/step-certificates/template
@@ -0,0 +1,22 @@
+# Template file for 'step-certificates'
+pkgname=step-certificates
+version=0.19.0
+revision=1
+wrksrc=certificates-$version
+build_style=go
+go_import_path=github.com/smallstep/certificates
+go_package="$go_import_path/cmd/step-ca
+ $go_import_path/cmd/step-awskms-init
+ $go_import_path/cmd/step-cloudkms-init
+ $go_import_path/cmd/step-pkcs11-init
+ $go_import_path/cmd/step-yubikey-init"
+go_ldflags="-w -X main.Version=$version"
+hostmakedepends="pkg-config"
+makedepends="pcsclite-devel"
+short_desc="Private CA and ACME server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://smallstep.com/certificates/"
+changelog="https://raw.githubusercontent.com/smallstep/certificates/master/CHANGELOG.md"
+distfiles="https://github.com/smallstep/certificates/archive/refs/tags/v$version.tar.gz"
+checksum=edf8aeaabff2cae9fed4e27177d755be522c20a94a3fd7346de1ec42614d1d46

From 3cb27b2a526b1f9eb0faa6bfbff498c2aa7cdb73 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 22 Apr 2022 01:18:55 -0500
Subject: [PATCH 1638/2561] New package: step-cli-0.19.0.

---
 srcpkgs/step-cli/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/step-cli/template

diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
new file mode 100644
index 000000000000..0fe5dc2dd34e
--- /dev/null
+++ b/srcpkgs/step-cli/template
@@ -0,0 +1,15 @@
+# Template file for 'step-cli'
+pkgname=step-cli
+version=0.19.0
+revision=1
+wrksrc=cli-$version
+build_style=go
+go_import_path=github.com/smallstep/cli
+go_package=$go_import_path/cmd/step
+short_desc="Zero trust swiss army knife"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://smallstep.com/cli"
+changelog="https://raw.githubusercontent.com/smallstep/cli/master/CHANGELOG.md"
+distfiles="https://github.com/smallstep/cli/archive/refs/tags/v$version.tar.gz"
+checksum=a58e63acbfd65a5df84f85715253aa88b566a13af26e2fa1353ae5766b3687d5

From cfe1690d05ef2ca4cc8656798d73fc4039cad90e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 08:20:02 +0200
Subject: [PATCH 1639/2561] linux5.4: update to 5.4.190.

---
 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 770cb9be83ad..25d8aeea2d8f 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.189
+version=5.4.190
 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=8485d536531833cd2dbca0a7f267daff69ede5c9831cb693acc8318447e568c6
+checksum=81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From a1eb07e98593b1b28267cbcfa7803291399327b8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 08:22:35 +0200
Subject: [PATCH 1640/2561] linux4.19: update to 4.19.239.

---
 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 d6916078343b..a44ed5b0cd25 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.238
+version=4.19.239
 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=83b74545c5d380384e09955c26e786bf9ee81a44bcf9347f2ca2ad3d31b46b7a
+checksum=bf7c5dc26c9a3113e43e4d32f73228788f8f6f005b9ddba379378786bc4c593b
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 4f80e5af3325780694b4a390a2f4a63a9167457d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 08:25:43 +0200
Subject: [PATCH 1641/2561] kore: update to 4.2.2.

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index 52b7dbe718a2..cb2063a8adf6 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,6 +1,6 @@
 # Template file for 'kore'
 pkgname=kore
-version=4.2.1
+version=4.2.2
 revision=1
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"
 homepage="https://kore.io"
 distfiles="https://kore.io/releases/kore-${version}.tar.gz"
-checksum=f76b108a4eefa27c89123f5d6a36b493b171e429be7a85d3dd1466ac87e7f15a
+checksum=77c12d80bb76fe774b16996e6bac6d4ad950070d0816c3409dc0397dfc62725f
 disable_parallel_build=yes
 
 export TARGET_PLATFORM=${XBPS_TARGET_MACHINE}

From 7183674284ef15a91f530fc291113bcab607c893 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Thu, 21 Apr 2022 15:17:48 +0200
Subject: [PATCH 1642/2561] k3b: update to 22.04.0

---
 srcpkgs/k3b/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 1994bc5ccec9..c2eab8d7964d 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
@@ -16,4 +16,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#k3b"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=acdbf40e1bccff837c50ba0a9d5e83370c24bc759c51d61385429ac3bf59f845
+checksum=5856d71fd5cf7f14eb646107f76e521869b4ac99df3411257c9f3427267b6504

From d7e4a10a76d71142f33ae47824744ef6e1cd6fec Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 21 Apr 2022 16:00:28 +0300
Subject: [PATCH 1643/2561] git: update to 2.36.0.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 8b05a0f58024..e45663f9ff9b 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.35.3
+version=2.36.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -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=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
+checksum=af5ebfc1658464f5d0d45a2bfd884c935fb607a10cc021d95bc80778861cc1d3
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 509ff4db020396ceaf16f17c53fc5bd2b9c216d8 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 22 Apr 2022 19:53:11 -0700
Subject: [PATCH 1644/2561] skopeo: update to 1.7.0

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index d8015fbcd92c..b3106205abb8 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.6.2
+version=1.7.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=48a1b3d18bde9d7af94756d546b0472e90416f05926281f7e533badfb5fcbd7b
+checksum=453bdcce16767696ed71046b60ad7b34358b183b50eb5aa708ced0b5ea2927b1
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From bcb543f02f6c1c1cfce01241584150947b79f718 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 23 Apr 2022 00:55:42 +0200
Subject: [PATCH 1645/2561] droidcam: update to 1.8.2.

---
 srcpkgs/droidcam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1357308432ef..1207bdec5cea 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,6 +1,6 @@
 # Template file for 'droidcam'
 pkgname=droidcam
-version=1.8.1
+version=1.8.2
 revision=1
 build_style=gnu-makefile
 make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
@@ -13,7 +13,7 @@ maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.dev47apps.com/"
 distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
-checksum=27724a3b3a94b0e5282628c85f0f9db1492df073cba331bd1e0a07f60290de71
+checksum=9f18c6768572571c59bfe08ac70e24612e08fc3d887c127ff47899252d3dc662
 
 post_patch() {
 	vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -e "s,/local,," -i droidcam.desktop

From 9d72a18f7ad4d845bb4176ddc4e2fe4930ed30ab Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 09:09:15 +0200
Subject: [PATCH 1646/2561] vlc: update to 3.0.17.4.

---
 srcpkgs/vlc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 14a00043a651..bdcf4ff726cd 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.17.3
+version=3.0.17.4
 revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
@@ -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="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz"
-checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014
+checksum=8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133
 
 lib32disabled=yes
 

From da3f66a000c696ed0206950435c10cbbb79c0e49 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 09:13:07 +0200
Subject: [PATCH 1647/2561] libkdcraw5: update to 22.04.0.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 8d69a674cdfb..f71d7b6c6ac4 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.12.3
+version=22.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=6acfd4ca20417e525c1676c2b77beb26a683b346afa309cd5b9db3e894d2d8df
+checksum=f92cee9a87fdef59f12bde784e1ec2b13b2677c82634e303f20ed8055ddb3e79
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6a0da893082f86730fd3051733d4eb84172c7f95 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 09:38:44 +0200
Subject: [PATCH 1648/2561] gwenview: update to 22.04.0.

---
 srcpkgs/gwenview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index aa6d3facb994..a9eafcc90cf1 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -16,4 +16,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=28d10e121394e4c710c77f2d46e18fc881c57613603ed65bfd892d4e79f67a7d
+checksum=73683096898c59388cd566cc8f71d7677fd0b22a2ab42a6d5f82f1232372ab05

From 9f7102ef6694298c0f0a9ad9a75cc0733de924f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 23 Apr 2022 08:01:08 +0000
Subject: [PATCH 1649/2561] python3-soupsieve: fix dependency cycle

---
 srcpkgs/python3-soupsieve/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index 83862532f658..aa8f81af5a6e 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-soupsieve'
 pkgname=python3-soupsieve
 version=1.9.5
-revision=7
+revision=8
 wrksrc="soupsieve-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-BeautifulSoup4"
-checkdepends="python3-pytest python3-lxml python3-html5lib $depends"
+depends="python3"
+checkdepends="python3-pytest python3-lxml python3-html5lib
+ python3-BeautifulSoup4"
 short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"

From 91f81262e3e1abbf46314837136f8f2988c642b0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 16:34:01 +0200
Subject: [PATCH 1650/2561] wine: update to 7.7.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index beb10898af92..b08032957c49 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.6
+version=7.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="eeab772f091328a3fb9db89aacab6be087c3d59c168ef2b41af5ec5010cf0328
- bdd1a095b9c4cddce4663825e2ad331c5bf1ac8b2288b0b380a665d0ca987a23"
+checksum="52a4d06ba77080df4a4b022bf9c2cc05cfa1d79bd4bb08c6b88f7c3ae09d1464
+ 9a8c18196ea346cdce84bd87693e911ecb505c1324b85bdbf60b115f8c487ab7"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 14b5d164168bf3347ae7448528d6287f239d9b9f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 23 Apr 2022 15:53:43 +0200
Subject: [PATCH 1651/2561] xfce4-terminal: update to 1.0.2.

---
 srcpkgs/xfce4-terminal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 07c3bfaa46e5..418817a0ac32 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
-version=1.0.1
+version=1.0.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/xfce4-terminal/start"
 changelog="https://gitlab.xfce.org/apps/xfce4-terminal/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=1d3690871d3fe97f8be0908ace0443819e513f6366f851682aafe17059e1eba5
+checksum=ac1543167b43322ad2483ffb033a7e74669ecb59f4b63016a3c183d96141d326

From 1b064e1fa77d7fa71ade10c3971b20a72779c730 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Apr 2022 23:46:12 +0200
Subject: [PATCH 1652/2561] perl-local-lib: update to 2.000029.

---
 srcpkgs/perl-local-lib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-local-lib/template b/srcpkgs/perl-local-lib/template
index 9990e7e7c0d4..3f9ad808f0ba 100644
--- a/srcpkgs/perl-local-lib/template
+++ b/srcpkgs/perl-local-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-local-lib'
 pkgname=perl-local-lib
-version=2.000028
+version=2.000029
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/local-lib"
 distfiles="${CPAN_SITE}/lib/HAARG/local-lib-${version}.tar.gz"
-checksum=408317d67a59f9f91e23e3000b82de4f529cf9cf0896e228f3a27d6f607bfe3d
+checksum=8df87a10c14c8e909c5b47c5701e4b8187d519e5251e87c80709b02bb33efdd7

From a7ca9b50a760101805bbb7124cabf43a56d744b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 24 Apr 2022 00:11:41 +0200
Subject: [PATCH 1653/2561] neovim: update to 0.7.0.

---
 srcpkgs/neovim/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 28cbc7e363cb..63c9247030f7 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,10 +1,10 @@
 # Template file for 'neovim'
 pkgname=neovim
-version=0.6.1
+version=0.7.0
 revision=1
 build_style=cmake
 build_helper="qemu"
-configure_args="-DCMAKE_BUILD_TYPE=Release"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCOMPILE_LUA=OFF"
 hostmakedepends="pkg-config gettext gperf LuaJIT lua51-lpeg lua51-mpack"
 makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel
  LuaJIT-devel libluv-devel tree-sitter-devel"
@@ -14,7 +14,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="Apache-2.0, custom:Vim"
 homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
-checksum=dd882c21a52e5999f656cae3f336b5fc702d52addd4d9b5cd3dc39cfff35e864
+checksum=792a9c55d5d5f4a5148d475847267df309d65fb20f05523f21c1319ea8a6c7df
 
 alternatives="
  vi:vi:/usr/bin/nvim
@@ -30,5 +30,5 @@ pre_configure() {
 }
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.txt
 }

From 0beedabfc5f0cec7443a054bfdb5bec9bd9ac476 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 23 Apr 2022 20:36:57 -0700
Subject: [PATCH 1654/2561] gtksourceview5: update to 5.4.1

---
 srcpkgs/gtksourceview5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index 81be2e5248da..2f056edbeeab 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
 # Template file for 'gtksourceview5'
 pkgname=gtksourceview5
-version=5.4.0
+version=5.4.1
 revision=1
 wrksrc="gtksourceview-${version}"
 build_style=meson
@@ -19,7 +19,7 @@ homepage="https://wiki.gnome.org/Projects/GtkSourceView"
 #changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS"
 distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=003bc217e670a8ec8aa3aece994b70e70b7d6b8074938adda21718555d84e637
+checksum=eb3584099cfa0adc9a0b1ede08def6320bd099e79e74a2d0aefb4057cd93d68e
 
 # Package build options
 build_options="gir gtk_doc"

From 197452d93b537bb24692da7dac17db2772c9b714 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 23 Apr 2022 22:06:09 +0200
Subject: [PATCH 1655/2561] yq-go: update to 4.24.5.

---
 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 9342a11e5deb..fa1737d4e916 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.23.1
+version=4.24.5
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/mikefarah/yq"
 changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=f55ffb9c6d7926b06d5862eb6a9e9ea942ec2883286df8e2e3d6f0716cc36eed
+checksum=8ffab12d2d527f0ac62823777201f8e5e78c9af5c754914274db2733da98c796
 
 do_check() {
 	go test -v

From 541f22fab1897414d2f7b1da1b64e363b02b2810 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Fri, 22 Apr 2022 15:24:10 -0500
Subject: [PATCH 1656/2561] Signal-Desktop: update to 5.40.1.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 8bcfe617ab40..448189474620 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.40.0
+version=5.40.1
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=57bb0ebbf4b3fb9d6dfbaa84166ecf668ce0df8a0afa0f69907680804dd064c4
+checksum=d80d210554e0296d916f7e25d9a49afc58340ab03ef7a1e7ae21017e80e9de7b
 nostrip_files="signal-desktop"
 
 post_extract() {

From 385e829fe58520e216ec3df8b9b4c6e2bffb5824 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Wed, 20 Apr 2022 23:41:51 -0500
Subject: [PATCH 1657/2561] intel-ucode: update to 20220419

---
 srcpkgs/intel-ucode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index 642dee9f7c27..e7e57d0f6588 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-ucode'
 pkgname=intel-ucode
-version=20220207
+version=20220419
 revision=1
 archs="i686* x86_64*"
 wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}"
@@ -9,7 +9,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom: Proprietary"
 homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
 distfiles="${homepage}/archive/microcode-${version}.tar.gz"
-checksum=532527bd17f3ea6664452b536699818a3bf896e4ace689a43a73624711b7c921
+checksum=b8838d300e749c1dd55d8865bdd49dee5153beb5e29d4b0e613aee475e0c0881
 repository=nonfree
 
 do_install() {

From 7aeb9faefe0ec0effd39738c5d00015e11f32250 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 16 Apr 2022 16:17:52 +0530
Subject: [PATCH 1658/2561] New package: libnvme-0.1

---
 common/shlibs                                 |  1 +
 srcpkgs/libnvme-devel                         |  1 +
 srcpkgs/libnvme-doc                           |  1 +
 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 +++++++
 srcpkgs/libnvme/template                      | 39 +++++++++++++++++++
 srcpkgs/python3-libnvme                       |  1 +
 6 files changed, 56 insertions(+)
 create mode 120000 srcpkgs/libnvme-devel
 create mode 120000 srcpkgs/libnvme-doc
 create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
 create mode 100644 srcpkgs/libnvme/template
 create mode 120000 srcpkgs/python3-libnvme

diff --git a/common/shlibs b/common/shlibs
index 11328b15a9cc..073830fc1442 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,4 @@ librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
+libnvme.so.1 libnvme-1.0_1
diff --git a/srcpkgs/libnvme-devel b/srcpkgs/libnvme-devel
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-devel
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme-doc b/srcpkgs/libnvme-doc
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-doc
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ 		nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+ 
+ 	const char *scope = NULL;
+-	char *p = strchr(tmp, SCOPE_DELIMITER);
++	char *p = strchr(tmp, '%');
+ 	if (p) {
+ 		*p = '\0';
+ 		scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..aafe21aa9aa5
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,39 @@
+# Template file for 'libnvme'
+pkgname=libnvme
+version=1.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man"
+hostmakedepends="pkg-config swig"
+makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
+short_desc="C Library for NVM Express on Linux"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/linux-nvme/libnvme"
+distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
+checksum=387524b1c24a4091a88bfb258c98c054f716da210e77702f0709164740370807
+
+libnvme-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	depends+=" json-c-devel libuuid-devel openssl-devel"	# otherwise 'pkgconf libnvme' doesn't work
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
+
+libnvme-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share
+	}
+}
+
+python3-libnvme_package() {
+	short_desc+=" - Python3 bindings"
+	pkg_install() {
+		vmove "usr/lib/python*"
+	}
+}
diff --git a/srcpkgs/python3-libnvme b/srcpkgs/python3-libnvme
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/python3-libnvme
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file

From 22ea2c3466dd92687098452f3d3b129d043fef44 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 16 Apr 2022 16:55:09 +0530
Subject: [PATCH 1659/2561] nvme-cli: update to 2.0, adopt

---
 srcpkgs/nvme-cli/patches/dracut-warning.patch |  5 ----
 srcpkgs/nvme-cli/template                     | 28 ++++++++-----------
 2 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch

diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch
deleted file mode 100644
index ef0b0b4df244..000000000000
--- a/srcpkgs/nvme-cli/patches/dracut-warning.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:37:06.346511231 +0700
-+++ b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:38:01.351158511 +0700
-@@ -1 +1 @@
--install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"
-+install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules "
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 0da50f2663ef..9b142b02de0f 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,28 +1,22 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=1.13
-revision=2
-build_style=gnu-makefile
-# yeah, it must be 0 to enable
-make_build_args="LIBUUID=0"
-make_install_args="SBINDIR=/usr/bin UDEVDIR=/usr/lib/udev"
-make_install_target="install-spec"
-makedepends="libuuid-devel"
+version=2.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
+hostmakedepends="pkg-config"
+makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel libhugetlbfs-devel"
 short_desc="NVMe management command line interface"
-maintainer="Peter Froehlich <peter.hans.froehlich@gmail.com>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://nvmexpress.org"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=03f4875f3e68d326b0280e16df2f027ca6b086cfa148c34e8569df61319b4b85
+checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c
 conf_files="/etc/nvme/*.conf"
 
 post_install() {
-	# these files are touch'd by install, remove so they aren't registered
-	# by the package (which would cause trouble during removal)
-	rm -f "${DESTDIR}/etc/nvme/hostnqn"
-	rm -f "${DESTDIR}/etc/nvme/hostid"
-	rm -rf "${DESTDIR}/etc/udev/rules.d"
-	rm -f "${DESTDIR}/usr/sbin/nvme"
-	# no need for systemd files
+	# remove files that are systemd-only
 	rm -rf "${DESTDIR}/usr/lib/systemd"
+	rm -rf "${DESTDIR}/usr/lib/udev/rules.d/70-nvmf-autoconnect.rules"         # calls systemctl
+	rm -rf "${DESTDIR}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf"  # needs 70-nvmf-autoconnect.rules
 }

From df6257526cc2d36040b99ec815fe5a984f5a03d7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:05:17 +0200
Subject: [PATCH 1660/2561] parallel: update to 20220422.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 030875ae0ffd..27a4c2a2b059 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20220322
+version=20220422
 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=df93ccf6a9f529ad2126b7042aef0486603e938c77b405939c41702d38a4e6d8
+checksum=96e4b73fff1302fc141a889ae43ab2e93f6c9e86ac60ef62ced02dbe70b73ca7
 
 pre_configure() {
 	# no html and pdf doc

From 9d7a8ac0dacccf8b25711a3ed4fa9c623333d1ee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 17:35:37 +0200
Subject: [PATCH 1661/2561] public-inbox: update to 1.8.0.

---
 srcpkgs/public-inbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/public-inbox/template b/srcpkgs/public-inbox/template
index d95bb6f3a0b2..d8bd1f5ce727 100644
--- a/srcpkgs/public-inbox/template
+++ b/srcpkgs/public-inbox/template
@@ -1,6 +1,6 @@
 # Template file for 'public-inbox'
 pkgname=public-inbox
-version=1.7.0
+version=1.8.0
 revision=1
 wrksrc="${pkgname}-${version/pre/-pre}"
 build_style=perl-module
@@ -18,7 +18,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="AGPL-3.0-or-later"
 homepage="https://public-inbox.org/"
 distfiles="https://public-inbox.org/public-inbox.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=8504a998014556e3e65d9bdceeaeb23f966197cea86abf3738b6059fee36c8c9
+checksum=95a24e38293935e7081967acbf80f7d1c2c67e28d01d591ea39e5e36a34acdec
 
 pre_check() {
 	mkdir -p ~/.public-inbox

From 93201be2a61e82179aafa8074150087e6c0a3fa1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:31:46 +0200
Subject: [PATCH 1662/2561] dune: update to 3.1.1.

---
 srcpkgs/dune/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 30c34cb44c00..bc2898d2cd4c 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
 # Template file for 'dune'
 pkgname=dune
-version=3.0.3
-revision=2
+version=3.1.1
+revision=1
 makedepends="ocaml"
 depends="ocaml"
 short_desc="Composable build system for OCaml"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://dune.build/"
 distfiles="https://github.com/ocaml/dune/archive/refs/tags/${version}.tar.gz"
-checksum=8f5e1570e68f7b2e0a8d1ffea77318e058f125f4cb8ea9a4af9cf9afe4ced893
+checksum=176c7095b2fcb59ca5c8fba880cf32dd3010144e926b99fc01f7a89e973b895d
 nocross="ocaml"
 
 _dune_release_pkgs="dune dune-action-plugin dune-build-info dune-configurator

From 91f058a7daf0ec8d4c8280dfee952ad69ae3309a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:41:50 +0200
Subject: [PATCH 1663/2561] z3: update to 4.8.16.

---
 srcpkgs/z3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index dea059c98d0c..d322211cbd9b 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.15
-revision=2
+version=4.8.16
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
 distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=2abe7f5ecb7c8023b712ffba959c55b4515f4978522a6882391de289310795ac
+checksum=75f95e09f3f35fef746e571d5ec88a4efba27f1bc8f1a0ef1117167486ec3dc6
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"

From b2fbe98903e8af13db337e48be7513f83ec090c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:47:16 +0200
Subject: [PATCH 1664/2561] python3-pyinfra: update to 2.0.2.

---
 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 c4935c5e16b9..b5b66a212d18 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.7.2
+version=2.0.2
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -14,7 +14,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=c7a2464ab50c5de865f0984e1978a9af37fbeca2260c4bf642db37fd0aed910d
+checksum=d5775bbd7060a67184092f6d29d7ee9f08ad76035cad7328e2fd63824c6fa649
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From aa210d2c24d6e1f95114f05498f5405d96b76f15 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:48:05 +0200
Subject: [PATCH 1665/2561] python3-pywinrm: update to 0.4.3.

---
 srcpkgs/python3-pywinrm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pywinrm/template b/srcpkgs/python3-pywinrm/template
index 24c8b63fec06..642166e13b6e 100644
--- a/srcpkgs/python3-pywinrm/template
+++ b/srcpkgs/python3-pywinrm/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pywinrm'
 pkgname=python3-pywinrm
-version=0.4.2
-revision=2
+version=0.4.3
+revision=1
 wrksrc="pywinrm-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/diyan/pywinrm"
 distfiles="https://github.com/diyan/pywinrm/archive/v${version}.tar.gz"
-checksum=c2a0d839f524a3cf4548923c29f85f909174405ac4339df45813410aae759b44
+checksum=253d2af9a6f1ec1ae8e21919a174e178b2e0475060956e3add0746584520ae84
 
 post_install() {
 	vlicense LICENSE

From f8a1bfb1ad9caad0a3e4b613a6e0fe2ee904662b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:48:43 +0200
Subject: [PATCH 1666/2561] python3-pipenv: update to 2022.4.21.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index ea94ef51e087..2c0c939cf5f7 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.4.8
+version=2022.4.21
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=53562bf69d9e5238f99a1e2101c356746b1c0aefa5dceb9b8a84a5a3e201de0d
+checksum=3f93229de25a4c3a658249f48407b80f347f076640a9fd50c476a2876212f781
 conflicts="python-pipenv>=0"
 
 post_extract() {

From 673c7ddc5b828eda304d31f6ca4fa53fb00940a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 23 Apr 2022 15:34:59 +0200
Subject: [PATCH 1667/2561] python3-pwntools: disable tests

---
 srcpkgs/python3-pwntools/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template
index f61ad95fa813..d062f213cf17 100644
--- a/srcpkgs/python3-pwntools/template
+++ b/srcpkgs/python3-pwntools/template
@@ -18,6 +18,7 @@ license="MIT, BSD-2-Clause"
 homepage="https://github.com/Gallopsled/pwntools"
 distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz"
 checksum=42052e2d883710e4e1da041e91675a6d719fb4e5ef2dd245cb2853da11269290
+#make_check=no # needs unpackaged rpyc
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From d5092f3af8fe03aaa5a70388971ca798b499a1bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 22:33:45 +0200
Subject: [PATCH 1668/2561] libinput: update to 1.20.1.

---
 srcpkgs/libinput/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 38fe908dbb36..1736a1f91f39 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.20.0
+version=1.20.1
 revision=1
 build_style=meson
 configure_args="-Dtests=false"
@@ -13,7 +13,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="https://gitlab.freedesktop.org/libinput/libinput/-/archive/${version}/libinput-${version}.tar.gz"
-checksum=04d27bce1eb8387e99740e43224b0de7ea65161826d120199bf96230132e5186
+checksum=fbbfe95c5cf20a1790c077b703db86ff0811c04a040b15f2a8579518e8a58064
 
 CFLAGS="-UNDEBUG"
 

From 6a5e0307fc35e3770737f136ca30506dfddde6b6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 22:33:50 +0200
Subject: [PATCH 1669/2561] pp: fix checksum

---
 srcpkgs/pp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index c1a59659fb65..4865bcd96d92 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -9,7 +9,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=3c85716c05145c85f281478c82f445d9a808faad0497b438a8bfcbfdfd055665
+checksum=3b4726a2d2e78349fd5512ea8d4c4f5e8417d5a81e511f74e7efb5f4e03e978c
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"

From 2cdad05a673ef11a9b2b1c270c60b4d8b9dae7e3 Mon Sep 17 00:00:00 2001
From: ThePademelon <zomanom@gmail.com>
Date: Sun, 24 Apr 2022 16:22:20 +1000
Subject: [PATCH 1670/2561] blanket: update to 0.6.0.

---
 srcpkgs/blanket/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 57d75b5ba8d1..9db5a1d5a3c9 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -1,14 +1,14 @@
 # Template file for 'blanket'
 pkgname=blanket
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"
-depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libhandy1"
+depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libadwaita"
 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/refs/tags/${version}.tar.gz"
-checksum=5af1d417d31bafff7c13a48e26bc4daae58a537f312b4ffb6911ae1b8b09a1d1
+checksum=710a3b733da5eb349bf8dc3c37ef0afeb301c8299c22e7fad3c753576f33f7f4
 python_version=3

From 42687ce1a2ac3d66b7818862f7bb2107cd78d5a4 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Sat, 23 Apr 2022 21:47:40 +0200
Subject: [PATCH 1671/2561] volta: update to 1.0.7

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 7874993281ec..e624659785b0 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,6 +1,6 @@
 # Template file for 'volta'
 pkgname=volta
-version=1.0.6
+version=1.0.7
 revision=1
 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=0f66edcb2639bee2c1668efd119c2937a77fbbe564c9d63827e8eaf37dbee4b9
+checksum=7e38691c56d77b4d4b466247bc9f10672d4f8f6b98cf53c50fdab6c34526aa91
 
 post_install() {
 	vlicense LICENSE

From f2322f2a62ab50806d20c41bc21fd2bef703335a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 21 Apr 2022 17:40:59 +0300
Subject: [PATCH 1672/2561] StyLua: update to 0.13.1.

---
 srcpkgs/StyLua/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index b6dc22c3875d..90ef1beb0f3c 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
 # Template file for 'StyLua'
 pkgname=StyLua
-version=0.13.0
+version=0.13.1
 revision=1
 build_style=cargo
 configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')"
@@ -10,7 +10,7 @@ license="MPL-2.0"
 homepage="https://github.com/JohnnyMorganz/StyLua"
 changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md"
 distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
-checksum=ad74d1f47b0337810459dab9b49694bd5bd6c8c7381a35dcab7866752652988b
+checksum=21158028569158ec7c1ad71352f3cb1906a005eb797508aa2b0b4a861162cf72
 
 build_options="lua52 luau"
 build_options_default="lua52 luau"

From fe6dff3774e7420949ee7ca98c9b23d670d46d70 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Thu, 21 Apr 2022 12:34:46 -0300
Subject: [PATCH 1673/2561] thefuck: update to 3.32.

---
 srcpkgs/thefuck/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 267a27d7789a..7704ab2a6a68 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=2
+version=3.32
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,12 +12,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=76cbb014473672d1c384922857f8fbc1f6f7774f74f784149ad88751854ecfdf
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
 	x86_64*|i686*|armv[67]*|aarch64*|ppc64le*) checkdepends+=" go" ;;
-	*) make_check=no ;;
+	*) make_check=no ;; # go is not available
 esac
 
 pre_check() {

From 0de8ad16968f04d3bb44493f222374de0219cda3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 18:00:25 +0200
Subject: [PATCH 1674/2561] linux-firmware: update to 20220411.

---
 srcpkgs/linux-firmware/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 018f08f95099..dde0c93b3fb4 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20220310
+version=20220411
 revision=1
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=f4c34a7ba8144b52fd7f6dd0b1dea2998f140ab1139372f8fbdb76f4557ff228
+checksum=533ae621b3eacf6a4696dab52a9dbc5727403a175c413b1682ab3f9cfb37872f
 python_version=3
 nostrip=yes
 

From df34168c5e51cfaa54d37822836d6ac05640e3b5 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 9 Apr 2022 14:10:43 +0200
Subject: [PATCH 1675/2561] img2pdf: update to 0.4.4.

---
 srcpkgs/img2pdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index a24ea1f1b610..d3b30d5af5da 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'img2pdf'
 pkgname=img2pdf
-version=0.4.3
+version=0.4.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
@@ -10,5 +10,5 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
-checksum=8e51c5043efa95d751481b516071a006f87c2a4059961a9ac43ec238915de09f
+checksum=8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c
 make_check=no # need to patch out some bitdepth checks

From 11c22cfbaeb4b8de0d15897b954ca51af38674b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 23 Apr 2022 12:39:03 +0200
Subject: [PATCH 1676/2561] dasel: update to 1.24.3.

---
 srcpkgs/dasel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index 6d913b08ba62..1f4e0d9fb800 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,6 +1,6 @@
 # Template file for 'dasel'
 pkgname=dasel
-version=1.24.1
+version=1.24.3
 revision=1
 build_style=go
 go_import_path=github.com/tomwright/dasel
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://daseldocs.tomwright.me/"
 changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md"
 distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz"
-checksum=ca1fa030f41abcd3659e76d7413ce14c551f40d41769e7a000a46f4fea6d0b64
+checksum=86d497e7dcfe63901ef0aeddb31e3989959d60d785a04f98fc6a88b6f497980a
 
 post_install() {
 	vlicense LICENSE

From 8b689f2e07c0d0c5a8570a992b9a8221dfa75868 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Fri, 22 Apr 2022 17:28:47 -0400
Subject: [PATCH 1677/2561] tailscale: update to 1.24.0.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 27a3611b7296..9b6db1157ae8 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.22.2
+version=1.24.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -13,7 +13,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=3e7b5b8073a7b94d84ff6677a9f110070b808c8d35c5b7da0c6e6fe639444e58
+checksum=3c8fe851c440d5dbd9dba2f3242924a7d99e7df37b5ae098507a8feb3663c76f
 
 post_install() {
 	vlicense LICENSE

From aea843e2d64fc341fa7764598bc7fce246504674 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Fri, 22 Apr 2022 18:27:05 +0200
Subject: [PATCH 1678/2561] ncmpc: update to 0.46.

Also, remove unneeded boost-devel dependency and
bump to pcre2.
---
 srcpkgs/ncmpc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index a7d76aa3ce9e..0c9c46bf8400 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,18 +1,18 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
-version=0.45
-revision=2
+version=0.46
+revision=1
 build_style=meson
 configure_args="-Dlirc=disabled -Dhtml_manual=false"
 hostmakedepends="pkg-config python3-Sphinx"
-makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel"
+makedepends="libmpdclient-devel ncurses-devel pcre2-devel"
 short_desc="Ncurses-based mpd client"
 maintainer="Getty Ritter <gettyritter@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/clients/ncmpc/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/master/NEWS"
 distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"
-checksum=17ff446447e002f2ed4342b7324263a830df7d76bcf177dce928f7d3a6f1f785
+checksum=177f77cf09dd4ab914e8438be399cdd5d83c9aa992abc8d9abac006bb092934e
 
 post_install() {
 	vmkdir usr/share/examples/ncmpc

From 3f0d8373730fd1635720870ad8cd1f19236cc23f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 23 Apr 2022 21:21:38 +0200
Subject: [PATCH 1679/2561] gst-plugins-base1: fix -devel dependencies

---
 srcpkgs/gst-plugins-base1/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index fcb7c07b06ab..538f4111a74e 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
 version=1.20.1
-revision=2
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
@@ -53,7 +53,10 @@ do_check() {
 }
 
 gst-plugins-base1-devel_package() {
-	depends="gstreamer1-devel>=${version} ${sourcepkg}>=${version}_${revision} orc-devel"
+	depends="gstreamer1-devel>=${version} ${sourcepkg}>=${version}_${revision}
+	 libX11-devel libdrm-devel libgbm-devel libglib-devel libglvnd-devel
+	 libgudev-devel orc-devel wayland-devel zlib-devel"
+
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 131318255a1fe46452db477083c6c7e7d96dc9fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 21:54:18 +0200
Subject: [PATCH 1680/2561] btrfs-progs: move .pc file to libbtrfsutil-devel

---
 srcpkgs/btrfs-progs/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 971267a50435..5be94b6daaff 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
 version=5.14.1
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -65,6 +65,7 @@ libbtrfsutil-devel_package() {
 	short_desc+=" - libbtrfsutil development files"
 	pkg_install() {
 		vmove usr/include/btrfsutil.h
+		vmove usr/lib/pkgconfig/libbtrfsutil.pc
 		vmove usr/lib/libbtrfsutil.a
 		vmove usr/lib/libbtrfsutil.so
 	}

From bcb06f08631a8df25f597d65db7b24a3a574abe1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 25 Apr 2022 14:10:53 +0200
Subject: [PATCH 1681/2561] kubefwd: update to 1.22.2.

---
 srcpkgs/kubefwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 734b9c732c88..8aa2f1b456d8 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,6 +1,6 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
-version=1.22.0
+version=1.22.2
 revision=1
 build_style=go
 go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/txn2/kubefwd"
 distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz"
-checksum=38a36dfe7182b4a9a4515d49c6dbeeceb101397cc5c11fbf720d2570cb0b86ef
+checksum=ce7ed2d054a594c9471b1ef777d024186ac427f7d0db8422fda96ede26238f9e
 
 post_install() {
 	vlicense NOTICE

From 76b3bf2db3574f4390f558d03a7357c899c58405 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sun, 24 Apr 2022 19:15:20 +1100
Subject: [PATCH 1682/2561] muse: update to 4.1.0.

---
 srcpkgs/muse/patches/i686.patch | 22 ++++++++++++++++++++++
 srcpkgs/muse/template           |  7 +++----
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/muse/patches/i686.patch

diff --git a/srcpkgs/muse/patches/i686.patch b/srcpkgs/muse/patches/i686.patch
new file mode 100644
index 000000000000..e15bce630026
--- /dev/null
+++ b/srcpkgs/muse/patches/i686.patch
@@ -0,0 +1,22 @@
+From 40afa0ad60e221c7b02fb8febbf9baff42c13cdc Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 25 Apr 2022 10:19:30 +0200
+Subject: [PATCH] Fix intptr_t was not declared in this scope on i386
+
+---
+ src/al/dsp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/al/dsp.cpp b/src/al/dsp.cpp
+index 8a4803e4c..3f601dc63 100644
+--- a/src/al/dsp.cpp
++++ b/src/al/dsp.cpp
+@@ -21,7 +21,7 @@
+ //=============================================================================
+ 
+ #include <stdio.h>
+-//#include <stdint.h>
++#include <stdint.h>
+ //#include "config.h"
+ #include "al.h"
+ #include "dsp.h"
diff --git a/srcpkgs/muse/template b/srcpkgs/muse/template
index c1289802a6b6..bfc011eb1037 100644
--- a/srcpkgs/muse/template
+++ b/srcpkgs/muse/template
@@ -1,8 +1,7 @@
 # Template file for 'muse'
 pkgname=muse
-version=4.0.0
-revision=2
-wrksrc="muse-${version}"
+version=4.1.0
+revision=1
 build_wrksrc=src
 build_style=cmake
 build_helper=qmake
@@ -19,7 +18,7 @@ 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
+checksum=b5462cdebd84326b0ffc0aa0b2c27f5eab55362dcc04e17796de866fcee4f391
 python_version=3
 
 build_options="alsa python"

From 120a9e27bbf43f7d32d745eb961afeef100b21e2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Apr 2022 21:19:00 -0400
Subject: [PATCH 1683/2561] mdcat: update to 0.27.1.

---
 srcpkgs/mdcat/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index c07dbd3b3913..84a8294986a9 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,18 +1,20 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.26.1
+version=0.27.1
 revision=1
 wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config ruby-asciidoctor"
 makedepends="openssl-devel"
+depends="shared-mime-info"
+checkdepends="shared-mime-info"
 short_desc="Cat for markdown"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MPL-2.0"
 homepage="https://codeberg.org/flausch/mdcat/"
 changelog="https://codeberg.org/flausch/mdcat/raw/branch/main/CHANGELOG.md"
 distfiles="https://codeberg.org/flausch/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=1120c4f3b5b517075b6347dbfe76a2211a91837b4d0242c0b72cdbc19e6886dd
+checksum=79961e0a842ee0f68aee3d54b39458352664c67388e56175a9d18d80f357bf14
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From a5110d908c95a9539edf1ba812f6476c6a3784f3 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 10 Apr 2022 12:03:13 +0200
Subject: [PATCH 1684/2561] praat: update to 6.2.12

and enable check
---
 srcpkgs/praat/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 142f0d2661ae..c40c093208ec 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,18 +1,19 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.2.10
+version=6.2.12
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if jack jack-devel)
  $(vopt_if pulseaudio 'alsa-lib-devel pulseaudio-devel')"
+checkdepends="cantarell-fonts"
 short_desc="Speech analysis, synthesis, and manipulation"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 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=f6358b2c6a967afe89882720d503c74221b364c563e1e4316a2d73c9f0c22bcd
+checksum=b6f1e09ffc8d0c89e3a892d997af0766a49f7d863cdeae857a9b5ea7f95f5650
 
 # 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
@@ -59,6 +60,12 @@ do_install() {
 	vbin praat_nogui
 }
 
+do_check() {
+	cd "${pkgname}-${version}/test"
+	../../praat --run runAllTests_batch.praat
+	../../praat_nogui --run runAllTests_batch.praat
+}
+
 praat-nogui_package() {
 	short_desc+=" (nogui)"
 	pkg_install() {

From bd7338f82e16854e970360b9d8809cb7cf35f31e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 20 Apr 2022 13:50:04 -0400
Subject: [PATCH 1685/2561] python3-pybcj: update to 0.5.2.

---
 srcpkgs/python3-pybcj/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template
index a0776b796627..c6cef8f80b03 100644
--- a/srcpkgs/python3-pybcj/template
+++ b/srcpkgs/python3-pybcj/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pybcj'
 pkgname=python3-pybcj
-version=0.5.1
+version=0.5.2
 revision=1
 wrksrc="pybcj-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/pybcj"
 distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz"
-checksum=376d039200639a52cba47fb04ffda39aad39715d9e988405fee0e5d60080d111
+checksum=050e7bf780b82b0c6ba4368c4a78953a1cf5922cef50e8b251fb8b87f0483ad7

From 323aabb095a849e79718bc6066262e21ae39b6c6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 20 Apr 2022 13:50:30 -0400
Subject: [PATCH 1686/2561] python3-py7zr: update to 0.18.4.

---
 srcpkgs/python3-py7zr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
index 0113cb1dec27..e6e8e05ec41a 100644
--- a/srcpkgs/python3-py7zr/template
+++ b/srcpkgs/python3-py7zr/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-py7zr'
 pkgname=python3-py7zr
-version=0.18.3
+version=0.18.4
 revision=1
 wrksrc="py7zr-${version}"
 build_style=python3-module
@@ -16,4 +16,4 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/py7zr"
 changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/Changelog.rst"
 distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
-checksum=d5bdc81536316f209a3ca4e1ce6e2ef11d8a519d613be47bcdd084bf655f400f
+checksum=6986e90ca4ca1f4999d57987a54d891673c9f8befa02c9c6cd8201893a17442c

From 7ae49fba54d5bdd94d892580e8637a17392c5041 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:08:31 -0400
Subject: [PATCH 1687/2561] protobuf: update to 3.20.1.

---
 common/shlibs             | 6 +++---
 srcpkgs/protobuf/template | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 073830fc1442..a437c5742ede 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3100,9 +3100,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
 libm17n-gui.so.0 m17n-lib-1.7.0_1
 libm17n-core.so.0 m17n-lib-1.7.0_1
 libm17n.so.0 m17n-lib-1.7.0_1
-libprotobuf-lite.so.30 libprotobuf-lite-3.19.4_1
-libprotoc.so.30 libprotoc-3.19.4_1
-libprotobuf.so.30 libprotobuf-3.19.4_1
+libprotobuf-lite.so.31 libprotobuf-lite-3.20.1_1
+libprotoc.so.31 libprotoc-3.20.1_1
+libprotobuf.so.31 libprotobuf-3.20.1_1
 libsombok.so.3 sombok-2.4.0_1
 libdeviceclient.so.0 pragha-1.3.3_1
 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 14ffcfb820e2..25a15ced0975 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf'
 pkgname=protobuf
-version=3.19.4
+version=3.20.1
 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=3bd7828aa5af4b13b99c191e8b1e884ebfa9ad371b0ce264605d347f135d2568
+checksum=8b28fdd45bab62d15db232ec404248901842e5340299a57765e48abe8a80d930
 # Checks rely on googletest
 make_check=no
 

From 99ef0df438cd28358526ad038d876172beb5e121 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:12:32 -0400
Subject: [PATCH 1688/2561] python3-protobuf: update to 3.20.1.

---
 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 64e2f45c305f..7c27f55ec180 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.19.4
+version=3.20.1
 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=9df0c10adf3e83015ced42a9a7bd64e13d06c4cf45c340d2c63020ea04499d0a
+checksum=adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9
 
 build_options="cppext"
 build_options_default="cppext"

From c09a3ded2240c11c1b56aef627f77708c3618d3d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1689/2561] protobuf-c: update to 1.4.0.

---
 srcpkgs/protobuf-c/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template
index 16b4e155b6b6..8faaf9f8ea46 100644
--- a/srcpkgs/protobuf-c/template
+++ b/srcpkgs/protobuf-c/template
@@ -1,17 +1,17 @@
 # Template file for 'protobuf-c'
 pkgname=protobuf-c
-version=1.3.3
-revision=10
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable protoc)"
-hostmakedepends="pkg-config protobuf"
+hostmakedepends="pkg-config protobuf protobuf-devel"
 makedepends="protobuf-devel boost-devel $(vopt_if protoc libprotoc-devel)"
 short_desc="C implementation of the Google Protocol Buffers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/protobuf-c/protobuf-c"
 distfiles="${homepage}/releases/download/v${version}/protobuf-c-${version}.tar.gz"
-checksum=22956606ef50c60de1fabc13a78fbc50830a0447d780467d3c519f84ad527e78
+checksum=26d98ee9bf18a6eba0d3f855ddec31dbe857667d269bc0b6017335572f85bbcb
 
 build_options="protoc"
 build_options_default="protoc"

From 3366cc85007b144575cb44b47d2f7b65f612d406 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:39 -0400
Subject: [PATCH 1690/2561] Bear: rebuild for protobuf-3.20.1

---
 srcpkgs/Bear/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index abd76cbcd534..c8c6efebccf2 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
 # Template file for 'Bear'
 pkgname=Bear
 version=3.0.18
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config protobuf protobuf-devel grpc"
 makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"

From b58c6ce394854ee66faadcafe03a6eea68ef5f34 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:39 -0400
Subject: [PATCH 1691/2561] EternalTerminal: rebuild for protobuf-3.20.1

---
 srcpkgs/EternalTerminal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index 659e1e69df84..ae3f21ee709a 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
 # Template file for 'EternalTerminal'
 pkgname=EternalTerminal
 version=6.0.13
-revision=5
+revision=6
 wrksrc="${pkgname}-et-v${version}"
 build_style=cmake
 hostmakedepends="protobuf"

From 27e71c64e03fa9f2c92495bd23eccccb7c64a510 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:39 -0400
Subject: [PATCH 1692/2561] android-tools: rebuild for protobuf-3.20.1

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index b1b47376caa1..51a783085b73 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'android-tools'
 pkgname=android-tools
 version=31.0.3p1
-revision=2
+revision=3
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf pkg-config"

From 5a17917d111f70a94c6d1741917fbaf977a1a25e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1693/2561] astroid: rebuild for protobuf-3.20.1

---
 srcpkgs/astroid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 1021eb482068..1207eacbacc1 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
 # Template file for 'astroid'
 pkgname=astroid
 version=0.16
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
 makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel

From 40484407f7d9de109257994804feceab278179f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1694/2561] bloaty: rebuild for protobuf-3.20.1

---
 srcpkgs/bloaty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bloaty/template b/srcpkgs/bloaty/template
index eb432b02e6d4..1334dc8715df 100644
--- a/srcpkgs/bloaty/template
+++ b/srcpkgs/bloaty/template
@@ -1,7 +1,7 @@
 # Template file for 'bloaty'
 pkgname=bloaty
 version=1.1
-revision=8
+revision=9
 build_style=cmake
 hostmakedepends="pkg-config protobuf"
 makedepends="capstone-devel protobuf-devel re2-devel zlib-devel"

From 524b4c6bcba9dcbf1cb8301037251c16e2e015ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1695/2561] clementine: rebuild for protobuf-3.20.1

---
 srcpkgs/clementine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index af56ba9852ab..9615d5fe8b44 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
 # Template file for 'clementine'
 pkgname=clementine
 version=1.4.0rc1
-revision=7
+revision=8
 _fullver=$version-343-gb49afcc5b
 wrksrc=${pkgname}-${_fullver}
 build_style=cmake

From 466499dca136e25af1bb1af92e94583ac06d6817 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1696/2561] cura-engine: rebuild for protobuf-3.20.1

---
 srcpkgs/cura-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 5cded6271dea..f5c611d2c5fe 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
 version=4.13.1
-revision=1
+revision=2
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"

From c944839c4d8d9652c49e04a777f0ca9f76d42a31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1697/2561] grpc: rebuild for protobuf-3.20.1

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 4805cc956328..9b35682fdb17 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.39.1
-revision=4
+revision=5
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON

From be7386bed07c7d7751218287e40fb2c24d3bc0db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1698/2561] kismet: rebuild for protobuf-3.20.1

---
 srcpkgs/kismet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index fc851637ef5f..eb243e3f27c4 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,7 +1,7 @@
 # Template file for 'kismet'
 pkgname=kismet
 version=2022.02.R1
-revision=2
+revision=3
 _realver="${version//./-}"
 wrksrc="${pkgname}-${_realver}"
 build_style=gnu-configure

From c7e46183e9ab5fb7259c757d30aef28408ee3332 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1699/2561] libArcus: rebuild for protobuf-3.20.1

---
 srcpkgs/libArcus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 21176dfdbcbe..30a87aec8742 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
 version=4.13.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"

From 4b7a88cdee156aa9c15d4698db0abe7b8d5e77b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1700/2561] libcompizconfig: rebuild for protobuf-3.20.1

---
 srcpkgs/libcompizconfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template
index f8c8b185ef78..102a1483e694 100644
--- a/srcpkgs/libcompizconfig/template
+++ b/srcpkgs/libcompizconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'libcompizconfig'
 pkgname=libcompizconfig
 version=0.8.18
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake intltool libtool pkg-config protobuf"

From 981bd696febf5570f49f92a6dad0035b0417baec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1701/2561] libphonenumber: rebuild for protobuf-3.20.1

---
 srcpkgs/libphonenumber/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 5f1d01690030..a3b2436f07d1 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
 # Template file for 'libphonenumber'
 pkgname=libphonenumber
 version=8.12.39
-revision=3
+revision=4
 build_wrksrc=cpp
 build_style=cmake
 build_helper=qemu

From cb3cfa075b775830f8364d5b6a03a8bddd6675d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1702/2561] litecoin: rebuild for protobuf-3.20.1

---
 srcpkgs/litecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index ed98488c14b1..1e973e9cdc77 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
  --disable-tests --with-openssl"

From 7618aaa31dda0bf3913b0082b0688db16c94c9da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1703/2561] mixxx: rebuild for protobuf-3.20.1

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 9eedd269bc7e..712ce645098b 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=11
+revision=12
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From ed24dcd1280cfbc2e97901a14befe8d965f8bae4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1704/2561] mosh: rebuild for protobuf-3.20.1

---
 srcpkgs/mosh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 3ff5d593ea64..ddfdb29fd43a 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=24
+revision=25
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
 makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"

From acd06af77ba2814cfd0bbf45d958f2a530403000 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1705/2561] mozc: rebuild for protobuf-3.20.1

---
 srcpkgs/mozc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 3b0a01c254da..8a43596a41d5 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -3,7 +3,7 @@ pkgname=mozc
 # src/data/version/mozc_version_template.bzl
 # revision is always 102, template always says 100 ;)
 version=2.26.4632.102
-revision=2
+revision=3
 _commit=06024d8567dd96eea7a1745e82a5d699a56f4ba5
 _abseil=20211102.0
 create_wrksrc=yes

From 249ea1ce037390407078184a9026224b6516970f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1706/2561] mumble: rebuild for protobuf-3.20.1

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 9c158c6e8efd..24f30f5e019d 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.4.230
-revision=3
+revision=4
 wrksrc=mumble-${version}.src
 build_style=cmake
 make_cmd=make

From 63322b48b8b4007d45e799393214ba4680423533 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1707/2561] nsjail: rebuild for protobuf-3.20.1

---
 srcpkgs/nsjail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index ed03a8949a64..673f1882b97f 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -1,7 +1,7 @@
 # Template file for 'nsjail'
 pkgname=nsjail
 version=3.0
-revision=7
+revision=8
 build_style=gnu-makefile
 hostmakedepends="bison flex pkg-config protobuf which"
 makedepends="libnl3-devel protobuf-devel"

From 3a4ffee1479f454f1071bc9291e50b040d14bd4f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:42 -0400
Subject: [PATCH 1708/2561] strawberry: rebuild for protobuf-3.20.1

---
 srcpkgs/strawberry/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 31e5da77a346..c9eb95bbd85e 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,7 +1,7 @@
 # Template file for 'strawberry'
 pkgname=strawberry
 version=0.9.3
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel

From 8b57a8a5521c114389985d9482cd42be71083497 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:42 -0400
Subject: [PATCH 1709/2561] sysdig: rebuild for protobuf-3.20.1

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index e0c59ec03489..b375b8b95491 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.28.0
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

From 3e6fd759757f54456ef56d9d1baf0e4ce7b5865b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:42 -0400
Subject: [PATCH 1710/2561] usbguard: rebuild for protobuf-3.20.1

---
 srcpkgs/usbguard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index e5039446e584..1c2a323c8f42 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
 # Template file for 'usbguard'
 pkgname=usbguard
 version=1.0.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
 conf_files="/etc/usbguard/*"

From 5c9291b308545a3ae42ea0b086248f72bca45ddd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:42 -0400
Subject: [PATCH 1711/2561] vlc: rebuild for protobuf-3.20.1

---
 srcpkgs/vlc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index bdcf4ff726cd..69d14f330ed5 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.17.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread

From 29d559800b62fa2c122846a44ffd3e40d4813aa2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 23:12:48 -0400
Subject: [PATCH 1712/2561] kubefwd: fix linking on cross

---
 srcpkgs/kubefwd/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 8aa2f1b456d8..e779e7ae9ff3 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -12,6 +12,9 @@ homepage="https://github.com/txn2/kubefwd"
 distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz"
 checksum=ce7ed2d054a594c9471b1ef777d024186ac427f7d0db8422fda96ede26238f9e
 
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
 post_install() {
 	vlicense NOTICE
 }

From 29750b4604279113866169f46f3b1365d01b45ff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:02:55 +0200
Subject: [PATCH 1713/2561] libtls: update to 3.5.2.

---
 common/shlibs           | 2 +-
 srcpkgs/libtls/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a437c5742ede..58db2bb112f5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3539,7 +3539,7 @@ libmanette-0.2.so.0 libmanette-0.2.1_1
 libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
-libtls.so.22 libtls-3.4.1_1
+libtls.so.25 libtls-3.5.2_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
 libfstrcmp.so.0 libfstrcmp-0.7.D001_1
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index f8217c020c65..4fa641e00827 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,6 +1,6 @@
 # Template file for 'libtls'
 pkgname=libtls
-version=3.4.3
+version=3.5.2
 revision=1
 wrksrc="libressl-${version}"
 build_style=gnu-configure
@@ -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=ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d
+checksum=56feab8e21c3fa6549f8b7d7511658b8e98518162838a795314732654adf3e5f
 _lssl_asm_ver="1.2.0"
 replaces="libtls20>0"
 

From e700d24869a1d435107e00512fd51b475fe71b3d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:01:50 +0200
Subject: [PATCH 1714/2561] catgirl: rebuild for libtls-3.5.2.

---
 srcpkgs/catgirl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index d110f03f1fbc..9025181a1bb6 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,7 +1,7 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=2.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"

From fd9f4ae4e1ad673430cd2eaed9d68125d361d123 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:02:03 +0200
Subject: [PATCH 1715/2561] litterbox: rebuild for libtls-3.5.2.

---
 srcpkgs/litterbox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index 03f412ee709c..433697392dc9 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,7 +1,7 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.8
-revision=2
+revision=3
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"

From a39055b78a5e436a8b4e947386029b5f54b272f7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:02:12 +0200
Subject: [PATCH 1716/2561] openntpd: rebuild for libtls-3.5.2.

---
 srcpkgs/openntpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index 17565797cec7..d910495a7ea4 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,7 +1,7 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.8p1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-privsep-user=openntpd --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"

From 4c508ed1f4e8f442e2f053cf8f4cc7f14efe3857 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:02:22 +0200
Subject: [PATCH 1717/2561] pounce: rebuild for libtls-3.5.2.

---
 srcpkgs/pounce/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 3ac742851872..4fec47dc7ba7 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,7 +1,7 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=3.0
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"

From 1683fda3362e036195c837414c19d760bf88b53f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:02:34 +0200
Subject: [PATCH 1718/2561] sacc: rebuild for libtls-3.5.2.

---
 srcpkgs/sacc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sacc/template b/srcpkgs/sacc/template
index 39e1edb01681..c07aef1a4c3b 100644
--- a/srcpkgs/sacc/template
+++ b/srcpkgs/sacc/template
@@ -1,7 +1,7 @@
 # Template file for 'sacc'
 pkgname=sacc
 version=1.05
-revision=1
+revision=2
 build_style="gnu-makefile"
 makedepends="ncurses-devel libtls-devel"
 short_desc="Terminal gopher client"

From 0ce9252dfd8cdeaf3a6fe65bed828c3820d53930 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Apr 2022 13:41:52 +0200
Subject: [PATCH 1719/2561] crash: update to 8.0.1.

---
 srcpkgs/crash/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index 7f158c9ed635..fadb3fcbcb6c 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,7 +1,7 @@
 # Template file for 'crash'
 pkgname=crash
-version=8.0.0
-revision=2
+version=8.0.1
+revision=1
 archs="i686 x86_64"  # broken on musl
 build_style=gnu-makefile
 hostmakedepends="flex tar wget texinfo"
@@ -13,8 +13,9 @@ 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=caab49b7b6d442f60c41360e0ec80cf852dc64e89303b41d704d7661cef43e68
+checksum=233208b1433a49e1d5a063fa88e6fc9772b99fbb7b30ae79a2115d1b8f0dfc52
 nocross=yes
+disable_parallel_build=yes
 LDFLAGS=-llzo2
 
 post_extract() {

From 8496892c977b13d291d182994aa1fe49f8af38b1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Apr 2022 13:43:53 +0200
Subject: [PATCH 1720/2561] pax-utils: update to 1.3.4.

---
 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 757227de499a..75d38b714cbe 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.3.3
+version=1.3.4
 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=eeca7fbd98bc66bead4a77000c2025d9f17ea8201b84245882406ce00b9b6b14
+checksum=8baed2f9c5ae8e0cda1b9c75990864101afc64fad0a4616e10f3ff8ef891040b

From 2bdc2572b907393be94a4580c314809236616785 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Apr 2022 13:44:41 +0200
Subject: [PATCH 1721/2561] perl-LWP: update to 6.63.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index b878123cf002..c3fe1fd7ac9f 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.62
+version=6.63
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=569ac15eb69d54b2a8d932403610690b89c68d6a987eab2f627c0639bae7de18
+checksum=6e6a9479affdf23d7de91b6e2e1b903669af6296840a88c41e86d18067db7f17

From bc00ac8217138fbb0c560fc64148189046fcaca5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Apr 2022 13:52:49 +0200
Subject: [PATCH 1722/2561] chez-scheme: update to 9.5.8.

---
 srcpkgs/chez-scheme/template | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/chez-scheme/template b/srcpkgs/chez-scheme/template
index e2369c47543c..3fe0b0a5d0d0 100644
--- a/srcpkgs/chez-scheme/template
+++ b/srcpkgs/chez-scheme/template
@@ -1,9 +1,8 @@
 # Template file for 'chez-scheme'
 pkgname=chez-scheme
-version=9.5.6
+version=9.5.8
 revision=1
-_nanopass_version=1.9.2
-wrksrc="ChezScheme-${version}"
+wrksrc="csv${version}"
 build_style=gnu-configure
 hostmakedepends="git libX11-devel liblz4-devel libuuid-devel ncurses-devel zlib-devel"
 makedepends="${hostmakedepends}"
@@ -11,10 +10,8 @@ short_desc="Compiler and run-time system for R6RS Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="http://scheme.com/"
-distfiles="https://github.com/cisco/ChezScheme/archive/v${version}.tar.gz
- https://github.com/nanopass/nanopass-framework-scheme/archive/v${_nanopass_version}.tar.gz"
-checksum="e23c556493f9a661852ea046f3317500feac5f223ea6ef3aa3b9234567e14c0e
- 46d3ab75f425ef93a6ac31f0b0b2f893b9cb3154219832ad52ea044dd36b021c"
+distfiles="https://github.com/cisco/ChezScheme/releases/download/v${version}/csv${version}.tar.gz"
+checksum=af83e80cbfe1a9a7c868e7c069a40c449fadd5e2a1737fd0f1260fc9d4159906
 alternatives="
  scheme:scheme:/usr/bin/chez-scheme
  scheme:scheme.1:/usr/share/man/man1/chez-scheme.1
@@ -34,19 +31,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) broken="unsupported target platform";;
 esac
 
-post_extract() {
-	sed -i '/xlocale\.h/d' c/expeditor.c
-
-	# Create a dummy git repo and hack out submodules.
-	# Its presence stops 'configure' from downloading its own versions of nanopass etc.
-
-	mkdir .git
-	sed -i '/git submodule/s/^/: #/' configure
-
-	rmdir nanopass
-	mv ../nanopass-framework-scheme-${_nanopass_version} nanopass
-}
-
 do_configure() {
 	# Configure such that scheme uses the zlib and lz4 system shared libs.
 	# ZLIB and LZ4 is used when building the scheme kernel and use the full path.

From 7a4454468cfef6a9502d9f86867c229337b66d42 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 26 Apr 2022 18:41:20 +0200
Subject: [PATCH 1723/2561] cppcheck: update to 2.7.5.

---
 srcpkgs/cppcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index 13f7e7256004..4c3c71be5336 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,6 +1,6 @@
 # Template file for 'cppcheck'
 pkgname=cppcheck
-version=2.7
+version=2.7.5
 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=5fd20549bb2fabf9a8026f772779d8cc6a5782c8f17500408529f7747afbc526
+checksum=6c7ac29e57fa8b3ac7be224510200e579d5a90217e2152591ef46ffc947d8f78
 
 post_install() {
 	vman cppcheck.1

From c8574cdfb5d3e65d9aa24b8d2f6a2e196e2bdf96 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 26 Apr 2022 14:13:40 +0200
Subject: [PATCH 1724/2561] github-cli: update to 2.9.0

---
 srcpkgs/github-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 28c6acf2aaf5..744f8c4ddb11 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.8.0
-revision=2
+version=2.9.0
+revision=1
 wrksrc="cli-${version}"
 build_style=go
 build_helper=qemu
@@ -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=d4aed3f4325bc518cf4af6fc7989ab35b498e42e8f97ba0e6bb07d7e3b14886a
+checksum=730b600d33afb67d84af4dca1af80cb1fbff79d302ac4f840fc8e9e4c25fceb7
 
 pre_build() {
 	local _date

From 753ae346619f6fb3294bcc33e30070aa3dc835b1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 25 Apr 2022 14:28:55 -0400
Subject: [PATCH 1725/2561] .github/workflows/cycle.yml: fix error message
 related to git 2.35.2+

---
 .github/workflows/cycles.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index e75297ac937d..72c8d83b2c82 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -28,6 +28,7 @@ jobs:
          common/travis/prepare.sh
       - name: Find cycles and open issues
         run: |
+         git config --global --add safe.directory "$PWD"
          common/scripts/xbps-cycles.py | tee cycles
          grep 'Cycle:' cycles | while read -r line; do
              if gh issue list -R "$GITHUB_REPOSITORY" -S "$line" | grep .; then

From 6e2a7a8ac0bd92cac2bdf72220021cef55d3c130 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 26 Apr 2022 13:50:36 -0400
Subject: [PATCH 1726/2561] common/travis/fetch_upstream.sh: fix checkout dir

---
 common/travis/fetch_upstream.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index 5c0256fdbe17..049cfd69e54d 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -9,7 +9,7 @@ elif command -v git >/dev/null 2>&1; then
 fi
 
 # required by git 2.35.2+
-$GIT_CMD config --global --add safe.directory /__w/void-packages/void-packages
+$GIT_CMD config --global --add safe.directory "$PWD"
 
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
 $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From db13076f7da879ddbd019ca672de63d982da7247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 23 Apr 2022 13:12:36 +0200
Subject: [PATCH 1727/2561] xbps-src: add flag to build broken packages

helps to check if build can be fixed
---
 common/xbps-src/shutils/common.sh    | 33 +++++++++++++++++++++-------
 common/xbps-src/shutils/pkgtarget.sh |  3 +--
 xbps-src                             | 10 ++++++---
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 36038af980c9..a640528f4d6a 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -147,6 +147,23 @@ msg_normal() {
     fi
 }
 
+report_broken() {
+    if [ "$show_problems" = "ignore-problems" ]; then
+        return
+    fi
+    if [ -z "$XBPS_IGNORE_BROKENNESS" ]; then
+        for line in "$@"; do
+            msg_red "$line"
+        done
+        exit 2
+    elif [ "$XBPS_IGNORE_BROKENNESS" != reported ]; then
+        for line in "$@"; do
+            msg_warn "$line"
+        done
+        XBPS_IGNORE_BROKENNESS=reported
+    fi
+}
+
 msg_normal_append() {
     [ -n "$NOCOLORS" ] || printf "\033[1m"
     printf "$@"
@@ -644,14 +661,14 @@ setup_pkg() {
         wrksrc="$XBPS_BUILDDIR/$wrksrc"
     fi
 
-    if [ "$cross" -a "$nocross" -a "$show_problems" != "ignore-problems" ]; then
-        msg_red "$pkgver: cannot be cross compiled, exiting...\n"
-        msg_red "$pkgver: $nocross\n"
-        exit 2
-    elif [ "$broken" -a "$show_problems" != "ignore-problems" ]; then
-        msg_red "$pkgver: cannot be built, it's currently broken; see the build log:\n"
-        msg_red "$pkgver: $broken\n"
-        exit 2
+    if [ "$cross" -a "$nocross" ]; then
+        report_broken \
+            "$pkgver: cannot be cross compiled...\n" \
+            "$pkgver: $nocross\n"
+    elif [ "$broken" ]; then
+        report_broken \
+            "$pkgver: cannot be built, it's currently broken; see the build log:\n" \
+            "$pkgver: $broken\n"
     fi
 
     if [ -n "$restricted" -a -z "$XBPS_ALLOW_RESTRICTED" -a "$show_problems" != "ignore-problems" ]; then
diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index 06fbcd844cc0..ba8c63bca8aa 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -34,8 +34,7 @@ check_pkg_arch() {
             esac
         done
         if [ -z "$nonegation" -a -n "$match" ] || [ -n "$nonegation" -a -z "$match" ]; then
-            msg_red "${pkgname}-${version}_${revision}: this package cannot be built for ${_arch}.\n"
-            exit 2
+            report_broken "${pkgname}-${version}_${revision}: this package cannot be built for ${_arch}.\n"
         fi
     fi
 }
diff --git a/xbps-src b/xbps-src
index 47023a723539..dfa059927cc2 100755
--- a/xbps-src
+++ b/xbps-src
@@ -150,6 +150,8 @@ Options:
 
 $(print_cross_targets)
 
+-b  Build packages even if marked as broken, nocross, or excluded with archs.
+
 -c  <configuration>
     If specified, etc/conf.<configuration> will be used as the primary config
     file name; etc/conf will only be attempted if that does not exist.
@@ -360,7 +362,7 @@ readonly XBPS_SRC_VERSION="113"
 export XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch)
 
 XBPS_OPTIONS=
-XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qsQKr:tV"
+XBPS_OPTSTRING="1a:bc:CEfgGhH:iIj:Lm:No:p:qsQKr:tV"
 
 # Preprocess arguments in order to allow options before and after XBPS_TARGET.
 eval set -- $(getopt "$XBPS_OPTSTRING" "$@");
@@ -372,6 +374,7 @@ while getopts "$XBPS_OPTSTRING" opt; do
     case $opt in
         1) XBPS_ARG_BUILD_ONLY_ONE_PKG=yes; XBPS_OPTIONS+=" -1";;
         a) XBPS_ARG_CROSS_BUILD="$OPTARG"; XBPS_OPTIONS+=" -a $OPTARG";;
+        b) XBPS_ARG_IGNORE_BROKENNESS=yes; XBPS_OPTIONS+=" -b";;
         c) XBPS_ARG_CONFIG="$OPTARG"; XBPS_OPTIONS+=" -c $OPTARG";;
         C) XBPS_ARG_KEEP_ALL=1; XBPS_OPTIONS+=" -C";;
         E) XBPS_ARG_BINPKG_EXISTS=1; XBPS_OPTIONS+=" -E";;
@@ -463,6 +466,7 @@ fi
 
 # Set options passed on command line, after configuration files have been read
 [ -n "$XBPS_ARG_BUILD_ONLY_ONE_PKG" ] && XBPS_BUILD_ONLY_ONE_PKG=yes
+[ -n "$XBPS_ARG_IGNORE_BROKENNESS" ] && XBPS_IGNORE_BROKENNESS=1
 [ -n "$XBPS_ARG_SKIP_REMOTEREPOS" ] && XBPS_SKIP_REMOTEREPOS=1
 [ -n "$XBPS_ARG_BUILD_FORCEMODE" ] && XBPS_BUILD_FORCEMODE=1
 [ -n "$XBPS_ARG_INFORMATIVE_RUN" ] && XBPS_INFORMATIVE_RUN=1
@@ -484,7 +488,7 @@ export XBPS_BUILD_ONLY_ONE_PKG XBPS_SKIP_REMOTEREPOS XBPS_BUILD_FORCEMODE \
        XBPS_INFORMATIVE_RUN XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \
        XBPS_USE_GIT_REVS XBPS_CHECK_PKGS XBPS_DEBUG_PKGS XBPS_SKIP_DEPS \
        XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_CROSS_BUILD \
-       XBPS_MAKEJOBS XBPS_PRINT_VARIABLES
+       XBPS_MAKEJOBS XBPS_PRINT_VARIABLES XBPS_IGNORE_BROKENNESS
 
 # The masterdir/hostdir variables are forced and readonly in chroot
 if [ -z "$IN_CHROOT" ]; then
@@ -644,7 +648,7 @@ export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \
     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_BUILD_ENVIRONMENT \
-    XBPS_PRESERVE_PKGS
+    XBPS_PRESERVE_PKGS XBPS_IGNORE_BROKENNESS
 
 for i in REPOSITORY DESTDIR BUILDDIR SRCDISTDIR; do
     eval val="\$XBPS_$i"

From dcb2c9e502a6b1b9fde3d3bae9d132953f09adc9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 26 Apr 2022 15:31:22 -0400
Subject: [PATCH 1728/2561] .github/workflows/cycles.yml: fix git command
 detection

---
 .github/workflows/cycles.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 72c8d83b2c82..d57976cbeed2 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -28,7 +28,13 @@ jobs:
          common/travis/prepare.sh
       - name: Find cycles and open issues
         run: |
-         git config --global --add safe.directory "$PWD"
+         if command -v chroot-git >/dev/null 2>&1; then
+             GIT_CMD=$(command -v chroot-git)
+         elif command -v git >/dev/null 2>&1; then
+            GIT_CMD=$(command -v git)
+         fi
+         # required by git 2.35.2+
+         $GIT_CMD config --global --add safe.directory "$PWD"
          common/scripts/xbps-cycles.py | tee cycles
          grep 'Cycle:' cycles | while read -r line; do
              if gh issue list -R "$GITHUB_REPOSITORY" -S "$line" | grep .; then

From 07e417fb4861b95063118b68ae596e982a24bd0b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 26 Apr 2022 15:36:00 -0500
Subject: [PATCH 1729/2561] ghidra: update to 10.1.3.

---
 srcpkgs/ghidra/template | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index fc41784b2bca..0c8a621cae26 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,8 +1,8 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.1.2
+version=10.1.3
 revision=1
-_commit=7d843ec229d43c2d1a8178aaa892be90e37e95a2
+_commit=939210dab2570714944ac35a4daef9633fd842b3
 archs="x86_64* aarch64*"
 # Other 64bit archs should be easily patchable,
 # grep for linux_arm_64 to find all places in need of patching
@@ -28,20 +28,20 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver
  https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2019_x86.fidb
  https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x64.fidb
  https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x86.fidb"
-checksum="eac2ed632394f542da82a08578873f01e3890e2917f7d16ccb849f8b114a781c
+checksum="b1f8d68ba878a100da5205973e05f604f97c0a1f509150303cc47767a21e02e0
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
  430fb7901bd0fd52a5b90bd0cbd89e9d334077eb72a9b26896f465de1e593a99
  00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
- f26548a6df6b6963a418d8c83ac216d9e196b180d944a52b8123c457d472b7c9
- 0a8962cf3699d5b8d4b3a79400382462519edc26570a46b2085200e38534f900
- 187248f87fc1deb695bc3051b2d92f9b7482023a356821154db22478eed13088
- 1d05afa070e9c09b83ee15d544c8559ed0d2b53d7eac476f8f5f8849543b3812
- 1784ad6b25571177ff8212871867559998c6b8256bb1dbaeee864b580c1b2d6a
- bc9bf30621190e0eb56c4db5ec30ad0401ca7be0311f5a2ce3d894178eafd19c
- aab04eefd1142f7b3c3f86c8d766abe361b167b4fe4157c36fad18777b2a6fbd
- 0a2282ac3479ffc022e6cdb4e32e057bc10f0394cfb0f8016d7145be0167f5f7
- fe1856c0acad297d9ba4fb6a2df1d32ba34df766d9f1a2a16da0ca2b375e23dd
- 46e56bc82ba68ad4e9a3c6a2e4ecd3428e2c390c7de0a379fa0165a58d46e115"
+ 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21
+ 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad
+ c3c16d23517c233d6950d5d43e34cdfa1b15c1ee2e066c8e9a53b4f75a907a87
+ 6fc0a61e935a0060ab33bd6406c9ca5f215ac3dff655f83c18f3d144ad389fe5
+ 5b0f8b8dee110d8c54fc27ed808ea28c2c675e95f3809e33eb99f03672741833
+ 2a81615d588aa80043f7bc3a35db04580c990c90398e77399fcffc66f053e5ac
+ 80413b57ae20fc1850d15a401d1cec87ac61b1809a1dafc2fa4403bf2029ec94
+ 68b96a4e13ee2c157517636aa1c7841f750fbfc0026188f6123af017f3fa3117
+ 2466595f6e74d9599e16095cc61c6de769461c935c20a442db1d2dfd2d7bde9b
+ 5b97f786eaebc785aaa365f17eb7cc9a1dd2b5a15b277a5229157ea76945fdc1"
 skip_extraction="AXMLPrinter2.jar  vs2012_x64.fidb vs2015_x64.fidb vs2017_x64.fidb vs2019_x64.fidb
  vsOlder_x64.fidb vsOlder_x86.fidb vs2012_x86.fidb vs2015_x86.fidb vs2017_x86.fidb vs2019_x86.fidb"
 nopie=yes

From e90a5efa5a2b2cdaa98f9e7feb5e362910165e14 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 26 Apr 2022 15:37:50 -0500
Subject: [PATCH 1730/2561] jc: update to 1.18.7.

---
 srcpkgs/jc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index 20a7438da19d..992b2ebc206c 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,7 +1,7 @@
 # Template file for 'jc'
 pkgname=jc
-version=1.18.6
-revision=2
+version=1.18.7
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-Pygments python3-ruamel.yaml python3-xmltodict"
@@ -11,4 +11,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/kellyjonbrazil/jc"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=5347188ed55762a0325d5d8f6a1ff3ec221b4ad548dee085fadc5fe10366af93
+checksum=eece56f592b04ddd19fb1fbac3ac6f0b27d6a731a05fb902813ccf0c0c78510d

From 5e2c1ed1534891e53e7509da584cd33d87191aa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 23:23:17 +0100
Subject: [PATCH 1731/2561] libvpx: rename subpackages to libvpx6-*

---
 srcpkgs/{libvpx-devel => libvpx6-devel} | 0
 srcpkgs/{libvpx-tools => libvpx6-tools} | 0
 srcpkgs/libvpx6/template                | 6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename srcpkgs/{libvpx-devel => libvpx6-devel} (100%)
 rename srcpkgs/{libvpx-tools => libvpx6-tools} (100%)

diff --git a/srcpkgs/libvpx-devel b/srcpkgs/libvpx6-devel
similarity index 100%
rename from srcpkgs/libvpx-devel
rename to srcpkgs/libvpx6-devel
diff --git a/srcpkgs/libvpx-tools b/srcpkgs/libvpx6-tools
similarity index 100%
rename from srcpkgs/libvpx-tools
rename to srcpkgs/libvpx6-tools
diff --git a/srcpkgs/libvpx6/template b/srcpkgs/libvpx6/template
index 8084243cc21d..a0e31b29ab81 100644
--- a/srcpkgs/libvpx6/template
+++ b/srcpkgs/libvpx6/template
@@ -4,7 +4,7 @@
 pkgname=libvpx6
 reverts="1.10.0_1"
 version=1.9.0
-revision=2
+revision=3
 wrksrc=libvpx-${version}
 hostmakedepends="perl yasm"
 short_desc="VP8 and VP9 video codec"
@@ -44,14 +44,14 @@ do_install() {
 	vlicense LICENSE
 }
 
-libvpx-tools_package() {
+libvpx6-tools_package() {
 	short_desc+=" - tools"
 	pkg_install() {
 		vmove usr/bin
 	}
 }
 
-libvpx-devel_package() {
+libvpx6-devel_package() {
 	depends="libvpx6>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From cef69c25141ec4bf9ea44dba8438705a663101b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 15:30:50 +0100
Subject: [PATCH 1732/2561] New package: libvpx7-1.11.0

---
 common/shlibs            |  1 +
 srcpkgs/libvpx-devel     |  1 +
 srcpkgs/libvpx-tools     |  1 +
 srcpkgs/libvpx7/template | 61 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/libvpx-devel
 create mode 120000 srcpkgs/libvpx-tools
 create mode 100644 srcpkgs/libvpx7/template

diff --git a/common/shlibs b/common/shlibs
index 58db2bb112f5..6cba857e95a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -819,6 +819,7 @@ libchamplain-0.12.so.0 libchamplain-0.12.5_2
 libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2
 libvpx.so.5 libvpx5-1.7.0_1
 libvpx.so.6 libvpx6-1.8.0_1
+libvpx.so.7 libvpx7-1.11.0_1
 libXevie.so.1 libXevie-1.0.2_1
 libatspi.so.0 at-spi2-core-1.91.91_1
 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
diff --git a/srcpkgs/libvpx-devel b/srcpkgs/libvpx-devel
new file mode 120000
index 000000000000..c7fce52cd7e0
--- /dev/null
+++ b/srcpkgs/libvpx-devel
@@ -0,0 +1 @@
+libvpx7
\ No newline at end of file
diff --git a/srcpkgs/libvpx-tools b/srcpkgs/libvpx-tools
new file mode 120000
index 000000000000..c7fce52cd7e0
--- /dev/null
+++ b/srcpkgs/libvpx-tools
@@ -0,0 +1 @@
+libvpx7
\ No newline at end of file
diff --git a/srcpkgs/libvpx7/template b/srcpkgs/libvpx7/template
new file mode 100644
index 000000000000..3526e2d28538
--- /dev/null
+++ b/srcpkgs/libvpx7/template
@@ -0,0 +1,61 @@
+# Template file for 'libvpx7'
+# updates generally break abi, so if you update this,
+# have fun rebuilding everything
+pkgname=libvpx7
+version=1.11.0
+revision=1
+wrksrc=libvpx-${version}
+hostmakedepends="perl yasm"
+short_desc="VP8 and VP9 video codec"
+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=965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83
+
+do_configure() {
+	export LD="$CC"
+	local target args
+
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) target="x86_64-linux-gcc" ;;
+		i686*) target="x86-linux-gcc" ;;
+		armv7*) target="armv7-linux-gcc"; args="--disable-neon" ;;
+		aarch64*) target="arm64-linux-gcc" ;;
+		*) target="generic-gnu";;
+	esac
+	CFLAGS+=" -fPIC"
+
+	./configure --enable-vp8 --enable-vp9 \
+		--enable-experimental \
+		--enable-runtime-cpu-detect --enable-shared \
+		--enable-postproc --enable-pic --disable-install-docs \
+		--disable-install-srcs --as=yasm ${args} --target=${target}
+}
+
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
+	make DIST_DIR=${DESTDIR}/usr install
+	vlicense LICENSE
+}
+
+libvpx-tools_package() {
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/bin
+	}
+}
+
+libvpx-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 53be5d5b7091af1c4ff58f7e00ba8dfa52111b50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 14:50:31 +0100
Subject: [PATCH 1733/2561] telegram-desktop: update to 3.7.3.

---
 srcpkgs/telegram-desktop/patches/cross.patch | 11 +++++++++++
 srcpkgs/telegram-desktop/template            | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/telegram-desktop/patches/cross.patch

diff --git a/srcpkgs/telegram-desktop/patches/cross.patch b/srcpkgs/telegram-desktop/patches/cross.patch
new file mode 100644
index 000000000000..47fcb4bbb338
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/cmake/external/kwayland/CMakeLists.txt	2022-04-19 14:57:00.000000000 +0200
++++ -	2022-04-26 18:18:21.919838146 +0200
+@@ -32,6 +32,8 @@
+         -DCMAKE_INSTALL_PREFIX=<BINARY_DIR>
+         -DCMAKE_INSTALL_DATADIR=share
+         -DBUILD_TESTING=OFF
++	-DQT_HOST_PATH=/usr
++	-DQtWaylandScanner_EXECUTABLE=/usr/lib/qt6/libexec/qtwaylandscanner
+     BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR>
+     COMMAND ${CMAKE_COMMAND} --install <BINARY_DIR>
+     STEP_TARGETS build
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index d778d218ef30..0199fe9ddceb 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=3.4.8
+version=3.7.3
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -11,23 +11,23 @@ configure_args="-DTDESKTOP_API_ID=209235
  -DTDESKTOP_LAUNCHER_BASENAME=org.telegram.desktop.desktop
  -DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true')
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DDESKTOP_APP_QT6=OFF"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools python extra-cmake-modules
- wayland-devel qt5-devel qt5-wayland-devel"
+ -DQT_HOST_PATH=/usr"
+hostmakedepends="pkg-config qt6-base-devel python3 extra-cmake-modules
+ qt6-wayland-devel wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
- minizip-devel opus-devel xxHash-devel pulseaudio-devel qt5-devel range-v3
- qt5-svg-devel libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel
- MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel
+ minizip-devel opus-devel xxHash-devel pulseaudio-devel range-v3
+ qt6-svg-devel libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel
+ MesaLib-devel qt6-wayland-devel qt6-qt5compat-devel libatomic-devel
  xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel)
- kwayland-devel glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel"
-depends="qt5-imageformats qt5-svg qt5-core>=5.15.2<5.16.0 ttf-opensans"
+ glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel"
+depends="qt6-imageformats ttf-opensans"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=6a962a1110bc15c21999832b0151af8125f33a3b6e978461b8f446217c76876e
+checksum=9735f30610ff62b01cbdb0b945d32c494cec245961023c9860d9dd5268b9fe1e
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 2d82ed877a76104e2a9fd3f08d2e07e8fe55a02d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 23:18:52 +0100
Subject: [PATCH 1734/2561] tg_owt: update to 0.0.0.20220413.

---
 srcpkgs/tg_owt/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 6afa56d321e4..3022048a7e76 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,10 +1,9 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
-version=0.0.0.20211207
+version=0.0.0.20220413
 revision=1
-_commit=d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589
+_commit=63a934db1ed212ebf8aaaa20f0010dd7b0d7b396
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
-_libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF -DTG_OWT_ARCH_ARMV7_USE_NEON=OFF"
@@ -12,19 +11,18 @@ hostmakedepends="pkg-config yasm protobuf"
 makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  pipewire-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel
  libevent-devel libXcomposite-devel libXrandr-devel libXdamage-devel
- libXrender-devel libglib-devel"
+ libepoxy-devel libdrm-devel libXrender-devel libglib-devel libgbm-devel
+ libvpx-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="@693bf80128946881c9dd357218c806c7e98f02daec02e076f1d123d3e6afc525
- @ea967f58e720be3a8f8105d48fedb983570679c8ced8ffbad48fb673089c7ed9
+checksum="@677f3dff8619e8e9e38ece55579ad10a5e162145644ec9afa11ac45dcd96904e
  @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3"
-skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"
+skip_extraction="${_libyuv_commit}.tar.gz"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -36,5 +34,4 @@ 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 7b6ca258af6ad1a60271aad7e3e742635ebb7346 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:30:57 +0200
Subject: [PATCH 1735/2561] qt6-3d: update to 6.3.0.

---
 srcpkgs/qt6-3d/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 06017e74ef5e..666f57559532 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz"
-checksum=ce5088048f151be2dd41600aa1132faa6cf8accfaaf4c40e60572384aef396ad
+checksum=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 886b08de621d7b4b655c609f0851880ad572a201 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:30:59 +0200
Subject: [PATCH 1736/2561] qt6-base: update to 6.3.0.

---
 srcpkgs/qt6-base/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 3f840bf17c09..1f514441a7e8 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.2.2
-revision=2
+version=6.3.0
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -29,7 +29,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
-checksum=85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a
+checksum=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 124d956e78de6b5a855a131381764f50aaaddabb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:00 +0200
Subject: [PATCH 1737/2561] qt6-charts: update to 6.3.0.

---
 srcpkgs/qt6-charts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 0da284b2f9b0..79cb8a220401 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
-checksum=8ffe724433af53a09892cce4e13b242cfcb6c67fef68295b0f29374460f16e7a
+checksum=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 423555c03f872668814c3819ba6f1b9023ccc142 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:01 +0200
Subject: [PATCH 1738/2561] qt6-declarative: update to 6.3.0.

---
 srcpkgs/qt6-declarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index fafd1f1505a9..e0bd28d9e383 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz"
-checksum=1a04ef0092b31354e0fded0d8391865719cb58f9ca5dc604da2b1f62c742cf28
+checksum=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then

From f2ae31bca270df53adfbb243dbce13558d9d827b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:02 +0200
Subject: [PATCH 1739/2561] qt6-imageformats: update to 6.3.0.

---
 srcpkgs/qt6-imageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index db47b21186d8..eaca95243c48 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtimageformats-everywhere-src-${version}.tar.xz"
-checksum=214f6d552391a70d72ff534295ef06c59dba756b6323762967820963a15bd267
+checksum=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef

From 9a304fdde408cdd38ab053a4320ac35131d0f161 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:03 +0200
Subject: [PATCH 1740/2561] qt6-location: update to 6.3.0.

---
 srcpkgs/qt6-location/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index 9a895b81c63a..b7397f5f8942 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtpositioning-everywhere-src-${version}.tar.xz"
-checksum=26231545eae383089510b236e88bbee8a6d338c06c170b674e8f36a57a0ba09a
+checksum=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From cf484013975ae1bce056ef2d59935918baa41ce0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:04 +0200
Subject: [PATCH 1741/2561] qt6-lottie: update to 6.3.0.

---
 srcpkgs/qt6-lottie/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 75a2d476e08c..1c97cd5f4f32 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlottie-everywhere-src-${version}.tar.xz"
-checksum=9c2ac91b9f5dc860d211ed9f3c1e3965dbb4665ace4af735e96b6328990fd74f
+checksum=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From b3594a0cb90753c2ea266b883c03060044c85bda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:05 +0200
Subject: [PATCH 1742/2561] qt6-networkauth: update to 6.3.0.

---
 srcpkgs/qt6-networkauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index bc7e7fd8b4cc..e934beada9b0 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtnetworkauth-everywhere-src-${version}.tar.xz"
-checksum=c8217c740167b9e96c3fabcc92d781864220c553c7a23254c16bd8f09f05e9e1
+checksum=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 988af82f19c03621e88eaa013b7fd83159491313 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:06 +0200
Subject: [PATCH 1743/2561] qt6-qt5compat: update to 6.3.0.

---
 srcpkgs/qt6-qt5compat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 5900458ab145..641b746c2176 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.2.2
-revision=2
+version=6.3.0
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
-checksum=a5bb33d9df1d99e5afc21b0d0a36b79aa98829e2b1bee03c811ad69b79276bad
+checksum=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 873a5b1f4be1b68f3a45cc28f243ca3c4a4512cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:08 +0200
Subject: [PATCH 1744/2561] qt6-quick3d: update to 6.3.0.

---
 common/shlibs                | 2 ++
 srcpkgs/qt6-quick3d/template | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6cba857e95a9..60b4402c8bd2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2037,6 +2037,8 @@ libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
+libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
+libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 2bafca923bef..0f7ef336a3ff 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
-checksum=be7ef8a36e84cb2f05edfd238d98899478eefbd56a5fecc7d570ce5848b5364b
+checksum=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually

From 148e5fccc7b18bae072a73a518f023b2c8ae8dae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:09 +0200
Subject: [PATCH 1745/2561] qt6-quicktimeline: update to 6.3.0.

---
 srcpkgs/qt6-quicktimeline/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index ad3155c453e0..15aa7a8e5819 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz"
-checksum=939d5479b035f674dd669b3e084ec9688eaea62763d2a7ad134630ff20efd479
+checksum=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From c0fed8e7ec2451e5467e89472e91d1f194d950dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:10 +0200
Subject: [PATCH 1746/2561] qt6-scxml: update to 6.3.0.

---
 srcpkgs/qt6-scxml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index eaf992803dbd..112baca0ab83 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtscxml-everywhere-src-${version}.tar.xz"
-checksum=b71d438c5e4106532cf48833116241bc48c0c4effe617770ae80e34bb77e92ed
+checksum=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 6fd13040740c52bd50e5fc9eb4fec050904feeee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:11 +0200
Subject: [PATCH 1747/2561] qt6-serialport: update to 6.3.0.

---
 srcpkgs/qt6-serialport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index e4763e3f4162..0804671ca57b 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtserialport-everywhere-src-${version}.tar.xz"
-checksum=5555aae0332df90c7d955381a758a2b918b6e65e2148da8003c1fb2f9cf9640a
+checksum=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From b3f609c7df36856c78a4b8b8c19f3c1a4332649a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:12 +0200
Subject: [PATCH 1748/2561] qt6-shadertools: update to 6.3.0.

---
 srcpkgs/qt6-shadertools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 72cfb47e50a9..9c1ec210a96a 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
-checksum=f97505e72358c1fa2a2131c3a9a5b3497a2b9ea65b75a5beaf7f46c4b56a89e5
+checksum=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 75a80f51f12f92ca4fef6c56b05164b1663c91f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:13 +0200
Subject: [PATCH 1749/2561] qt6-svg: update to 6.3.0.

---
 srcpkgs/qt6-svg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index 51ad5f24aea3..aa8e6b745109 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
-checksum=e1bd63932fa16468bc737a38b0060431f67a6073f4101ede188eb47a191abd75
+checksum=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 95d3c0a8da297954f4f5f124ad5888a8c5e1b353 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:14 +0200
Subject: [PATCH 1750/2561] qt6-tools: update to 6.3.0.

---
 srcpkgs/qt6-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index 768fc552fb75..f875dff5c046 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
-checksum=c0542ecb4a0aec21246a1cb5cd9f8f51b368929ce2065a455b13c3b47a94ecd1
+checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 02b3f80222d8801b78f198e5c1a11349dc7aa2ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:15 +0200
Subject: [PATCH 1751/2561] qt6-translations: update to 6.3.0.

---
 srcpkgs/qt6-translations/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index ee844d48b010..be0a74ca74e2 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttranslations-everywhere-src-${version}.tar.xz"
-checksum=fc9244224c6e9930035e7efc8b6b541c739aa4cccf46de9779bc3f64d8e94c8f
+checksum=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3

From 0646d14bee5c466d6021c0cf46caf1b96acbdeb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:16 +0200
Subject: [PATCH 1752/2561] qt6-virtualkeyboard: update to 6.3.0.

---
 srcpkgs/qt6-virtualkeyboard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 1fba027d4582..67ecef145ea1 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtvirtualkeyboard-everywhere-src-${version}.tar.xz"
-checksum=9973c1a703e717936858a8e81eeef1372e6830127f9729013f9da3c2870561a5
+checksum=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 773f6605d2c5d22b4f5e66061ecd290291598fad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:17 +0200
Subject: [PATCH 1753/2561] qt6-wayland: update to 6.3.0.

---
 srcpkgs/qt6-wayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index a13e6e52ff52..b71a273009b9 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwayland-everywhere-src-${version}.tar.xz"
-checksum=2d3652b3ecb5d8c9493c938b3d379dd700800859bb19033e8024e29d8deb3618
+checksum=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 5bf701e48f530da803c065fd45a3037d0bf67464 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:18 +0200
Subject: [PATCH 1754/2561] qt6-websockets: update to 6.3.0.

---
 srcpkgs/qt6-websockets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index a8a471e485fb..c2e674aacb31 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebsockets-everywhere-src-${version}.tar.xz"
-checksum=8847a8bf0da6741b0bb22883c760037488c2d336fccc8cdb0b4e368f034c2076
+checksum=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 3c7b0b3161d07001e8a35c85cc364d63c4622efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 26 Apr 2022 19:24:22 +0200
Subject: [PATCH 1755/2561] doctl: update to 1.73.1.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index e42f75c749fd..23fbb957a0b4 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.73.0
+version=1.73.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -14,4 +14,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=cc7a6f91febf4d40f8afca0fe4ddfa7aa9be3572e3a0124fca2865e35b52ef00
+checksum=cada668df915bf4eaa7ef271ab0920002b2bc7f9b6b3cbd8598481646c52d4e8

From ab57ee6539a54841a3c1de66a2455b576fd8eb21 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 27 Apr 2022 04:23:40 +0200
Subject: [PATCH 1756/2561] nvme-cli: fix build on musl

---
 srcpkgs/nvme-cli/patches/musl.patch | 18 ++++++++++++++++++
 srcpkgs/nvme-cli/template           |  8 +++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvme-cli/patches/musl.patch

diff --git a/srcpkgs/nvme-cli/patches/musl.patch b/srcpkgs/nvme-cli/patches/musl.patch
new file mode 100644
index 000000000000..4ebfba11d38f
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/musl.patch
@@ -0,0 +1,18 @@
+commit ddf3610e8326d014360c9550d54a73f97b40e862
+Author: q66 <daniel@octaforge.org>
+Date:   Wed Apr 27 04:20:41 2022 +0200
+
+    fix build on musl
+
+diff --git a/util/base64.c b/util/base64.c
+index e386c11..dad4492 100644
+--- a/util/base64.c
++++ b/util/base64.c
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <sys/types.h>
+ 
+ static const char base64_table[65] =
+ 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 9b142b02de0f..d4e7bc892403 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel libhugetlbfs-devel"
+makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel"
 short_desc="NVMe management command line interface"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
@@ -14,6 +14,12 @@ distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
 checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c
 conf_files="/etc/nvme/*.conf"
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libhugetlbfs-devel"
+else
+	CFLAGS="-D_GNU_SOURCE"
+fi
+
 post_install() {
 	# remove files that are systemd-only
 	rm -rf "${DESTDIR}/usr/lib/systemd"

From 452134c63e40e7ff4b67bc11905ba751a31d2c1a Mon Sep 17 00:00:00 2001
From: atweiden <atweiden@ioiojo.com>
Date: Wed, 27 Apr 2022 04:59:12 +0800
Subject: [PATCH 1757/2561] MoarVM: update to 2022.04.

---
 srcpkgs/MoarVM/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index 9386751ab79a..e48fd6c8af8e 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2022.03
+version=2022.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=fb71cd13912464482b99b33f0c06e9fd7c51a151c6e632a9220cf93c5855fdaf
+checksum=ae06f50ba5562721a4e5eb6457e2fea2d07eda63e2abaa8c939c9daf70774804
 nocross=yes
 shlib_provides="libmoar.so"

From 42deac25abbe51d5193bcda286e8525cfd620410 Mon Sep 17 00:00:00 2001
From: atweiden <atweiden@ioiojo.com>
Date: Wed, 27 Apr 2022 05:00:16 +0800
Subject: [PATCH 1758/2561] nqp: update to 2022.04.

---
 srcpkgs/nqp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index 52ec0153fe05..4d698dd1aa73 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2022.03
+version=2022.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=a95e778970c4d09c091d2aa299c05036208ce4b4b0d3a7af373198c12258b306
+checksum=556d458e25d3c0464af9f04ea3e92bbde10046066b329188a88663943bd4e79c
 nocross=yes

From db6260402c69d9113d87f58be8cb4c18b959ac38 Mon Sep 17 00:00:00 2001
From: atweiden <atweiden@ioiojo.com>
Date: Wed, 27 Apr 2022 05:01:19 +0800
Subject: [PATCH 1759/2561] rakudo: update to 2022.04.

---
 srcpkgs/rakudo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 6a0345b57907..67fd64f1ebb5 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2022.03
+version=2022.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=03e215b001a879747618d6fc18eb7f89c0b812f5e543a43ed66c13439ea8a227
+checksum=7e13a8cc927efbe86b8ff7b19155a60a6f6e2b6e2952bd690dcacef2d02a1c74
 nocross=yes
 provides="raku-${version}_${revision}"
 

From 7ce7ce007857f53cd56748a805f1c1d747d29271 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 25 Apr 2022 14:48:04 +0300
Subject: [PATCH 1760/2561] gawk: update to 5.1.1.

---
 srcpkgs/gawk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template
index b922097b01f7..b5f624bebf45 100644
--- a/srcpkgs/gawk/template
+++ b/srcpkgs/gawk/template
@@ -1,6 +1,6 @@
 # Template file for 'gawk'
 pkgname=gawk
-version=5.1.0
+version=5.1.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-readline"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cf5fea4ac5665fd5171af4716baab2effc76306a9572988d5ba1078f196382bd
+checksum=d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2
 lib32disabled=yes
 
 provides="awk-0_1"

From f6c5e16a6d7b0394113512634a94294e15f373d5 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 22 Apr 2022 08:43:08 -0400
Subject: [PATCH 1761/2561] hexedit: update to 1.6.

---
 srcpkgs/hexedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexedit/template b/srcpkgs/hexedit/template
index a7840b7a3ddd..eb73aa150c1c 100644
--- a/srcpkgs/hexedit/template
+++ b/srcpkgs/hexedit/template
@@ -1,6 +1,6 @@
 # Template file for 'hexedit'
 pkgname=hexedit
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -10,7 +10,7 @@ maintainer="Jim Westfall <jwestfall@surrealistic.net>"
 license="GPL-2.0-or-later"
 homepage="http://rigaux.org"
 distfiles="https://github.com/pixel/hexedit/archive/${version}.tar.gz"
-checksum=27a2349f659e995d7731ad672450f61a2e950330049a6fb59b77490c5e0015ac
+checksum=598906131934f88003a6a937fab10542686ce5f661134bc336053e978c4baae3
 
 pre_configure() {
 	./autogen.sh

From 64e60be91e27c2ea83fe705e72f0c819bafe0e80 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Sat, 23 Apr 2022 18:26:03 +0200
Subject: [PATCH 1762/2561] texlive-bin: export MANPATH

---
 srcpkgs/texlive-bin/INSTALL.msg      | 18 +++++++++---------
 srcpkgs/texlive-bin/files/texlive.sh |  4 +++-
 srcpkgs/texlive-bin/template         |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/texlive-bin/INSTALL.msg b/srcpkgs/texlive-bin/INSTALL.msg
index 72c1e0fe9a33..58930b757fd0 100644
--- a/srcpkgs/texlive-bin/INSTALL.msg
+++ b/srcpkgs/texlive-bin/INSTALL.msg
@@ -1,29 +1,29 @@
-- TeXLive is free software see the files:
+- TeX Live is free software see the files:
 
   /usr/share/licenses/texlive-bin/LICENSE.TL
   /usr/share/licenses/texlive-bin/LICENSE.CTAN
 
 =====================================================================
 
-  This package sets the location of TeXLive binary using the file: 
-  /etc/profile.d/texlive.sh.
+  This package sets the location of TeX Live binaries and manual
+  pages using the file: /etc/profile.d/texlive.sh.
 
   see  http://www.tug.org/texlive/quickinstall.html for details 
 
-  Check if your PATH is update correctly with:
+  Check if your PATH and MANPATH are updated correctly with:
 
   $ printenv
 
-  You may need to reboot to ensure that PATH is update correctly,
-  for the impatients, if you want you can type
+  You may need to reboot to ensure that the paths are updated
+  correctly, for the impatients, if you want you can type
 
   $ source /etc/profile
 
-  and check the PATH.
+  and check PATH and MANPATH.
 
 =====================================================================
 
-  To update you TeXLive installation use only the program 
+  To update you TeX Live installation use only the program
 
   /opt/texlive/${VERSION}/bin/<arch>/tlmgr.
 
@@ -37,5 +37,5 @@
   
   for the details and the documentation in 
     		 		 
-  WARNING: To avoid messing up your TeXLive installation, DON'T use
+  WARNING: To avoid messing up your TeX Live installation, DON'T use
   the installation scripts in /opt/texlive-installer.
diff --git a/srcpkgs/texlive-bin/files/texlive.sh b/srcpkgs/texlive-bin/files/texlive.sh
index c868d50fe1e7..fdf6faf899c6 100644
--- a/srcpkgs/texlive-bin/files/texlive.sh
+++ b/srcpkgs/texlive-bin/files/texlive.sh
@@ -1,2 +1,4 @@
-#location of the TeXLive binaries
+# location of the TeXLive binaries
 export PATH=$PATH:/opt/texlive/@@VERSION@@/bin/@@ARCH@@
+# and manual pages
+export MANPATH=$MANPATH:/opt/texlive/@@VERSION@@/texmf-dist/doc/man
diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template
index 26866c5e5841..05c3c33e1825 100644
--- a/srcpkgs/texlive-bin/template
+++ b/srcpkgs/texlive-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-bin'
 pkgname=texlive-bin
 version=2022
-revision=1
+revision=2
 depends="texlive${version}-bin"
 short_desc="TeX Live Binary distribution through tl-install (newest version)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 1322810e8209c88218fd51cda937a5fe81b39c35 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 23 Apr 2022 10:59:41 +0200
Subject: [PATCH 1763/2561] iw: update to 5.16.

---
 srcpkgs/iw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iw/template b/srcpkgs/iw/template
index e82a6792b111..8c63c60873cf 100644
--- a/srcpkgs/iw/template
+++ b/srcpkgs/iw/template
@@ -1,6 +1,6 @@
 # Template file for 'iw'
 pkgname=iw
-version=5.9
+version=5.16
 revision=1
 hostmakedepends="pkg-config libnl3-devel"
 makedepends="libnl3-devel"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="ISC"
 homepage="http://wireless.kernel.org/en/users/Documentation/iw"
 distfiles="http://www.kernel.org/pub/software/network/iw/iw-${version}.tar.xz"
-checksum=293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2
+checksum=4c44e42762f903f9094ba5a598998c800a97a62afd6fd31ec1e0a799e308659c
 
 do_build() {
 	make V=1 CC=$CC ${makejobs}

From 71a6b885e071a92adc556c87c79291a7d1324e7b Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Sat, 23 Apr 2022 02:48:27 -0500
Subject: [PATCH 1764/2561] telegram-tg: update to 0.19.0

---
 srcpkgs/telegram-tg/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/telegram-tg/template b/srcpkgs/telegram-tg/template
index 16f22a8419ce..49ede65ab6c1 100644
--- a/srcpkgs/telegram-tg/template
+++ b/srcpkgs/telegram-tg/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-tg'
 pkgname=telegram-tg
-version=0.17.0
-revision=3
+version=0.19.0
+revision=1
 wrksrc=tg-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,6 +11,6 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unlicense"
 homepage="https://github.com/paul-nameless/tg"
 distfiles="${PYPI_SITE}/t/tg/tg-${version}.tar.gz"
-checksum=aab22b1e40a28710b6e3dbe4f3bba67ff02e36d612d8388f9400e4c34feab221
+checksum=2f1ad2fd1af78e10dfe50663cc9b1f31af531fcd27f630f6a1fc1aa2d5b569cb
 # There are no tests to run
 make_check=no

From 37585090203857b00daf89502f08f8acf0a6d14e Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 22 Apr 2022 17:21:50 +0200
Subject: [PATCH 1765/2561] minizip: update to 1.2.12.

---
 srcpkgs/minizip/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/minizip/template b/srcpkgs/minizip/template
index 7f674f50744d..f3938368a139 100644
--- a/srcpkgs/minizip/template
+++ b/srcpkgs/minizip/template
@@ -1,7 +1,7 @@
 # Template file for 'minizip'
 pkgname=minizip
-version=1.2.11
-revision=3
+version=1.2.12
+revision=1
 wrksrc="zlib-${version}"
 build_wrksrc="contrib/${pkgname}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="ojab <ojab@ojab.ru>"
 license="Zlib"
 homepage="http://www.winimage.com/zLibDll/minizip.html"
 distfiles="http://www.zlib.net/zlib-${version}.tar.gz"
-checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+checksum=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
 
 pre_configure() {
 	autoreconf -i
@@ -23,7 +23,6 @@ post_install() {
 	rm ${DESTDIR}/usr/include/minizip/crypt.h
 }
 
-
 minizip-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}-${version}_${revision}"

From 0a070a8d3d74c77ec1c32654526496574e4c7620 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Apr 2022 13:05:36 +0200
Subject: [PATCH 1766/2561] netpbm: update to 10.98.02.

---
 srcpkgs/netpbm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 61728c4c7d28..91c85332c50a 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.98.0.0
+version=10.98.02
 revision=1
-_githash=772c4792d998deb70f1719c1a2ad82f2defde5f0
+_githash=5991a720c260e171c145d035014609f18cb2eaf3
 _githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79
 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="f53f8e57e1dec64edddec971f13a1cdcbc17d07110e4699b3090de7a79e3f75a
+checksum="7ed7fdfc8cae0a11f15ace63715296917a4a1f61017c06f3d09ead2d39d83320
  30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde"
 
 post_extract() {

From c85f08b2b934430a600e060651dfeb350e18f872 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Apr 2022 15:46:51 +0200
Subject: [PATCH 1767/2561] linux5.10: update to 5.10.113.

---
 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 28935f5c70d2..e2bf0b9cae3d 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.111
+version=5.10.113
 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=1831b3d8765592ce91e51441bb179d908f6bcfe8c78d03c2bec8c675c4a0ab1a
+checksum=82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 4a4e6018a44e115cf0e1202e2570439cc752182a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Apr 2022 15:50:44 +0200
Subject: [PATCH 1768/2561] linux5.15: update to 5.15.36.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 9b2bc0aed3f9..ae0410039d0c 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.34
+version=5.15.36
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- b1a34733513b1080e763532101def34af73b4ca5e4f9b442c3e7d378a1598088"
+ a40a27adb37c5ac569428c517f3eb51ce1148258db5b8a42aadb79128197d4a0"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 502a69e14ef74b32bc4805de090085e1cc57580c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 27 Apr 2022 11:17:45 -0400
Subject: [PATCH 1769/2561] dendrite: update to 0.8.2.

---
 srcpkgs/dendrite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index fffd933f62c1..998442981fcf 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=e26d306b008c9a88da31449e51df4c97e991d99b7954ab130f4fcf00371aa503
+checksum=c09c53964434785d9828482a00e3300a7e54692a0052c71f6a245e147b46cd01
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"

From 1881a1dec420a1602b094508148c5699d8566122 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 Apr 2022 22:58:39 +0200
Subject: [PATCH 1770/2561] telegram-desktop: "fix cross" for arm*-musl

Still needs proper investigation at why this is only breaking on
arm*-musl, and in general some cleanup of qt6 cmake cross
---
 srcpkgs/telegram-desktop/patches/cross.patch | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/telegram-desktop/patches/cross.patch b/srcpkgs/telegram-desktop/patches/cross.patch
index 47fcb4bbb338..e1fef852c391 100644
--- a/srcpkgs/telegram-desktop/patches/cross.patch
+++ b/srcpkgs/telegram-desktop/patches/cross.patch
@@ -9,3 +9,11 @@
      BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR>
      COMMAND ${CMAKE_COMMAND} --install <BINARY_DIR>
      STEP_TARGETS build
+@@ -83,6 +82,7 @@
+         -DCMAKE_PREFIX_PATH=${CMAKE_CURRENT_BINARY_DIR}
+         -DECM_DIR=${extra_cmake_modules_binary_dir}/share/ECM/cmake
+         -DPlasmaWaylandProtocols_DIR=${plasma_wayland_protocols_binary_dir}/lib/cmake/PlasmaWaylandProtocols
++	-D_qtpaths_executable=/usr/lib/qt6/bin/qtpaths
+     STEP_TARGETS build
+     EXCLUDE_FROM_ALL TRUE
+     BUILD_BYPRODUCTS <BINARY_DIR>/lib/libKF5WaylandClient.a

From 06dc73d852a68572914cda776c2393e07a1102cf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1771/2561] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 112 ++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..a7e3ed176e19 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -32,7 +32,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
 depends="fontconfig"
-short_desc="OpenJDK Java Development Kit"
+short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	short_desc+=" - static libs"
 	pkg_install() {
-		vmkdir usr/lib/jvm/openjdk${_java_ver}
-		vcopy build/*-normal-*-release/images/static-libs/lib "usr/lib/jvm/openjdk${_java_ver}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From dd60fe2c91552036f04503911591c33bc518e26c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 1772/2561] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index 60b4402c8bd2..4114151662fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1811,12 +1811,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a7e3ed176e19..f0b16258cf9f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From 5d3041d2c3eca51f5110e1c3e5bfb3006dfc4663 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 1773/2561] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f0b16258cf9f..ba11f44a43c9 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From 79afe33fbd28f96e3f328993614f54b97b342ffd Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:24:39 -0400
Subject: [PATCH 1774/2561] openjdk11: disable on armv[56]*

fixes #29457
---
 srcpkgs/openjdk11/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index ba11f44a43c9..f164f5de741f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -44,10 +44,11 @@ provides="java-environment-${version}_1"
 disable_parallel_build=yes
 build_options="docs"
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 04cf1a6db03b08d8038fe5cad714e9256cb696ef Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 20:14:58 -0400
Subject: [PATCH 1775/2561] openjdk11: update to 11.0.12+7, enable debug.

---
 srcpkgs/openjdk11/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f164f5de741f..711376c10824 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
-version=11.0.12+5
-revision=3
+version=11.0.12+7
+revision=1
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -16,14 +16,14 @@ configure_args="
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-native-debug-symbols=none
+ --with-native-debug-symbols=internal
  --with-version-pre=
- --with-version-opt="void-r$revision"
+ --with-version-opt=void-r$revision
  --with-version-build=${version#*+}
- --with-vendor-name="Void"
- --with-vendor-url="https://voidlinux.org/"
- --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues"
- --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues""
+ --with-vendor-name=Void
+ --with-vendor-url=https://voidlinux.org/
+ --with-vendor-bug-url=https://github.com/void-linux/void-packages/issues
+ --with-vendor-vm-bug-url=https://github.com/void-linux/void-packages/issues"
 make_build_args="images static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
+checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
 provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
@@ -72,14 +72,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
- java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
- java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
-
  jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner

From a18bf9fbba24aab56faff9230e830b537bfe69c7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Apr 2022 21:57:06 -0400
Subject: [PATCH 1776/2561] sshuttle: update to 1.1.0.

---
 srcpkgs/sshuttle/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sshuttle/template b/srcpkgs/sshuttle/template
index b029f2575cf6..078fd6e6821c 100644
--- a/srcpkgs/sshuttle/template
+++ b/srcpkgs/sshuttle/template
@@ -1,7 +1,7 @@
 # Template file for 'sshuttle'
 pkgname=sshuttle
-version=1.0.5
-revision=2
+version=1.1.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm python3-Sphinx"
 depends="python3-psutil"
@@ -12,7 +12,7 @@ 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=fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd
+checksum=21fb91bdf392b50e78db6b8d75e95b73ac9dafd361e2657e784e674561219315
 
 post_extract() {
 	# BUG: wrong permissions (https://github.com/sshuttle/sshuttle/issues/217)

From f8d0c23417ba7d3a69c7be2c9685ff3218df5a0c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 18 Mar 2022 17:33:46 +0100
Subject: [PATCH 1777/2561] ghc: update to 9.0.2

---
 .../ghc/patches/no-atomic-64-on-32bit.patch   |  58 -------
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch      | 159 ++++++++----------
 srcpkgs/ghc/template                          |   4 +-
 3 files changed, 72 insertions(+), 149 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch

diff --git a/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch b/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
deleted file mode 100644
index 05ca275ea9df..000000000000
--- a/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5c5aa87d50dc4ea97e76e13f285a7b5dd71fcd88 Mon Sep 17 00:00:00 2001
-From: Ilias Tsitsimpis <iliastsi@debian.org>
-Date: Sun, 1 Mar 2020 16:25:13 +0200
-Subject: [PATCH] Do not define hs_atomic{read,write}64() on non-64bit
-
-Do not define hs_atomicread64() and hs_atomicwrite64() on machines where
-WORD_SIZE_IN_BITS is less than 64, just like we do with the rest of the atomic
-functions which work on 64-bit values.
-
-Without this, compilation fails on MIPSel and PowerPC with the following error:
-
-/usr/bin/ld: /<<PKGBUILDDIR>>/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3_p.a(atomic.p_o): in function `hs_atomicread64':
-atomic.c:(.text.hs_atomicread64+0x8): undefined reference to `__sync_add_and_fetch_8'
-/usr/bin/ld: /<<PKGBUILDDIR>>/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3_p.a(atomic.p_o): in function `hs_atomicwrite64':
-atomic.c:(.text.hs_atomicwrite64+0x38): undefined reference to `__sync_bool_compare_and_swap_8'
-
-Fixes #17886.
----
- libraries/ghc-prim/cbits/atomic.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libraries/ghc-prim/cbits/atomic.c b/libraries/ghc-prim/cbits/atomic.c
-index ac2e608ec2..01037d70ee 100644
---- a/libraries/ghc-prim/cbits/atomic.c
-+++ b/libraries/ghc-prim/cbits/atomic.c
-@@ -361,6 +361,7 @@ hs_atomicread32(StgWord x)
- #endif
- }
- 
-+#if WORD_SIZE_IN_BITS == 64
- extern StgWord64 hs_atomicread64(StgWord x);
- StgWord64
- hs_atomicread64(StgWord x)
-@@ -371,6 +372,7 @@ hs_atomicread64(StgWord x)
-   return __sync_add_and_fetch((StgWord64 *) x, 0);
- #endif
- }
-+#endif
- 
- // AtomicWriteByteArrayOp_Int
- // Implies a full memory barrier (see compiler/prelude/primops.txt.pp)
-@@ -409,6 +411,7 @@ hs_atomicwrite32(StgWord x, StgWord val)
- #endif
- }
- 
-+#if WORD_SIZE_IN_BITS == 64
- extern void hs_atomicwrite64(StgWord x, StgWord64 val);
- void
- hs_atomicwrite64(StgWord x, StgWord64 val)
-@@ -420,3 +423,5 @@ hs_atomicwrite64(StgWord x, StgWord64 val)
- #endif
- }
- #endif
-+
-+#endif
--- 
-GitLab
-
diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index 275444e828b7..df1a0bfe15ba 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -1,36 +1,24 @@
-From fd191973558cf4aeb0d5ca107357defd6f837c38 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Tue, 5 Jan 2021 04:10:25 +0100
+From 587edc0d9786aff3c7a4728ba941f6a993e59bdc Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Thu, 28 Apr 2022 00:48:04 +0200
 Subject: [PATCH] fix up runtime for ppc64 BE ELFv2 + ensure it's used
 
 ---
- aclocal.m4                        |  2 +-
  configure                         |  2 +-
  libraries/ghci/GHCi/InfoTable.hsc | 36 ++++++++++++-------------------
- rts/Adjustor.c                    | 12 +++++------
+ m4/fptools.m4                     |  2 +-
  rts/AdjustorAsm.S                 |  2 +-
  rts/StgCRun.c                     |  4 ++--
  rts/StgCRunAsm.S                  |  2 +-
- 7 files changed, 26 insertions(+), 34 deletions(-)
+ rts/adjustor/NativeIA64.c         |  2 +-
+ rts/adjustor/NativePowerPC.c      |  2 +-
+ 8 files changed, 22 insertions(+), 30 deletions(-)
 
-diff --git a/aclocal.m4 b/aclocal.m4
-index 41cecf0..ba08bd2 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -199,7 +199,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
-             test -z "[$]2" || eval "[$]2=ArchPPC"
-             ;;
-         powerpc64)
--            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V1}\""
-+            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
-             ;;
-         powerpc64le)
-             test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
 diff --git a/configure b/configure
-index 183e661..8aae1bc 100755
+index 8310e6f..eac1124 100755
 --- a/configure
 +++ b/configure
-@@ -10296,7 +10296,7 @@ $as_echo "done" >&6; }
+@@ -10508,7 +10508,7 @@ printf "%s\n" "no" >&6; }
              test -z "$2" || eval "$2=ArchPPC"
              ;;
          powerpc64)
@@ -40,10 +28,10 @@ index 183e661..8aae1bc 100755
          powerpc64le)
              test -z "$2" || eval "$2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
 diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
-index ec3c18a..0359be7 100644
+index ad4eb4d..e4f1c0c 100644
 --- a/libraries/ghci/GHCi/InfoTable.hsc
 +++ b/libraries/ghci/GHCi/InfoTable.hsc
-@@ -228,30 +228,22 @@ mkJumpToAddr a = case platform of
+@@ -231,30 +231,22 @@ mkJumpToAddr' platform a = case platform of
                  , fromIntegral w64
                  , fromIntegral (w64 `shiftR` 32) ]
      ArchPPC64 ->
@@ -85,103 +73,96 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
-
+ 
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
-diff --git a/rts/Adjustor.c b/rts/Adjustor.c
-index d360cfe..ab7ede7 100644
---- a/rts/Adjustor.c
-+++ b/rts/Adjustor.c
-@@ -49,7 +49,7 @@ Haskell side.
-
- #if defined(i386_HOST_ARCH)
- extern void adjustorCode(void);
--#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
-+#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
- // from AdjustorAsm.s
- // not declared as a function so that AIX-style
- // fundescs can never get in the way.
-@@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
- extern void obscure_ccall_ret_code(void);
- #endif
-
--#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
-+#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
- #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
-
- /* !!! !!! WARNING: !!! !!!
-@@ -318,7 +318,7 @@ typedef struct AdjustorStub {
- } AdjustorStub;
- #endif
-
--#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
-+#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
- static int totalArgumentSize(char *typeString)
- {
-     int sz = 0;
-@@ -351,7 +351,7 @@ void*
- createAdjustor(int cconv, StgStablePtr hptr,
-                StgFunPtr wptr,
-                char *typeString
--#if !defined(powerpc_HOST_ARCH) && !defined(powerpc64_HOST_ARCH) && !defined(x86_64_HOST_ARCH)
-+#if !defined(powerpc_HOST_ARCH) && (!defined(powerpc64_HOST_ARCH) || (_CALL_ELF == 2)) && !defined(x86_64_HOST_ARCH)
-                   STG_UNUSED
- #endif
-               )
-@@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
-    return;
-  }
-  freeStablePtr(((StgStablePtr*)ptr)[1]);
--#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
-+#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-  if ( ((AdjustorStub*)ptr)->code != (StgFunPtr) &adjustorCode ) {
-    errorBelch("freeHaskellFunctionPtr: not for me, guv! %p\n", ptr);
-    return;
+diff --git a/m4/fptools.m4 b/m4/fptools.m4
+index 8c6c9b7..eb25c37 100644
+--- a/m4/fptools.m4
++++ b/m4/fptools.m4
+@@ -201,7 +201,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
+             test -z "[$]2" || eval "[$]2=ArchPPC"
+             ;;
+         powerpc64)
+-            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V1}\""
++            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
+             ;;
+         powerpc64le)
+             test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
 diff --git a/rts/AdjustorAsm.S b/rts/AdjustorAsm.S
 index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
-
+ 
  /* ******************************** PowerPC ******************************** */
-
+ 
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
      /* The following code applies, with some differences,
         to all powerpc platforms except for powerpc32-linux,
 diff --git a/rts/StgCRun.c b/rts/StgCRun.c
-index 934926e..2ff8662 100644
+index f43227a..927d44a 100644
 --- a/rts/StgCRun.c
 +++ b/rts/StgCRun.c
-@@ -726,7 +726,7 @@ StgRunIsImplementedInAssembler(void)
+@@ -724,7 +724,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
-
+ 
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
-
- static void GNUC3_ATTRIBUTE(used)
- StgRunIsImplementedInAssembler(void)
-@@ -851,7 +851,7 @@ StgRunIsImplementedInAssembler(void)
-
+ /* 64-bit PowerPC ELF ABI 1.9
+  *
+  * Stack frame organization (see Figure 3-17, ELF ABI 1.9, p 14)
+@@ -792,7 +792,7 @@ StgRunIsImplementedInAssembler(void)
+ 
  #endif
-
+ 
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
-
+ 
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
-index 9274a44..3b4fc33 100644
+index 60f1bf9..c6794d7 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
 @@ -5,7 +5,7 @@
   * then functions StgRun/StgReturn are implemented in file StgCRun.c */
  #if !defined(USE_MINIINTERPRETER)
-
+ 
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  # if defined(linux_HOST_OS)
- # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
- 	.file	"StgCRun.c"
+ /* 64-bit PowerPC ELF V2 ABI Revision 1.4
+  *
+diff --git a/rts/adjustor/NativeIA64.c b/rts/adjustor/NativeIA64.c
+index 9fd1991..816b3ef 100644
+--- a/rts/adjustor/NativeIA64.c
++++ b/rts/adjustor/NativeIA64.c
+@@ -39,7 +39,7 @@ void*
+ createAdjustor(int cconv, StgStablePtr hptr,
+                StgFunPtr wptr,
+                char *typeString
+-#if !defined(powerpc_HOST_ARCH) && !defined(powerpc64_HOST_ARCH) && !defined(x86_64_HOST_ARCH)
++#if !defined(powerpc_HOST_ARCH) && (!defined(powerpc64_HOST_ARCH) || (_CALL_ELF == 2)) && !defined(x86_64_HOST_ARCH)
+                STG_UNUSED
+ #endif
+     )
+diff --git a/rts/adjustor/NativePowerPC.c b/rts/adjustor/NativePowerPC.c
+index 2e5d605..caef5d3 100644
+--- a/rts/adjustor/NativePowerPC.c
++++ b/rts/adjustor/NativePowerPC.c
+@@ -29,7 +29,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
+ extern void obscure_ccall_ret_code(void);
+ #endif /* defined(linux_HOST_OS) */
+ 
+-#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+ #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
+ 
+ /* !!! !!! WARNING: !!! !!!
+-- 
+2.35.1
+
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index b8b16f67b433..c4bbb3e4e3b1 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.7
+version=9.0.2
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
+checksum=140e42b96346322d1a39eb17602bcdc76e292028ad4a69286b230bab188a9197
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"
 _bindir="/usr/lib/${pkgname}-${version}/bin"

From 498151684cd2abd1f67bf5a626e9658a0c02df6d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 19 Mar 2022 10:48:13 +0100
Subject: [PATCH 1778/2561] cabal-install: update to 3.6.3.0

Technically, this is only upgrading Cabal (the library) to 3.6.3.0, as
the installed version of cabal-install is still 3.6.2.0.  This is,
however, necessary for GHC 9.x support.
---
 srcpkgs/cabal-install/files/linux-9.0.2.json | 1 +
 srcpkgs/cabal-install/template               | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/cabal-install/files/linux-9.0.2.json

diff --git a/srcpkgs/cabal-install/files/linux-9.0.2.json b/srcpkgs/cabal-install/files/linux-9.0.2.json
new file mode 100644
index 000000000000..f3cb6b4aeeb5
--- /dev/null
+++ b/srcpkgs/cabal-install/files/linux-9.0.2.json
@@ -0,0 +1 @@
+{"builtin":[{"package":"rts","version":"1.0.2"},{"package":"ghc-prim","version":"0.7.0"},{"package":"ghc-bignum","version":"1.1"},{"package":"base","version":"4.15.1.0"},{"package":"array","version":"0.5.4.0"},{"package":"deepseq","version":"1.4.5.0"},{"package":"bytestring","version":"0.10.12.1"},{"package":"containers","version":"0.6.4.1"},{"package":"binary","version":"0.8.8.0"},{"package":"filepath","version":"1.4.2.1"},{"package":"time","version":"1.9.3"},{"package":"unix","version":"2.7.2.2"},{"package":"directory","version":"1.3.6.2"},{"package":"transformers","version":"0.5.6.2"},{"package":"mtl","version":"2.2.2"},{"package":"ghc-boot-th","version":"9.0.2"},{"package":"pretty","version":"1.1.3.6"},{"package":"template-haskell","version":"2.17.0.0"},{"package":"text","version":"1.2.5.0"},{"package":"parsec","version":"3.1.14.0"},{"package":"process","version":"1.6.13.2"},{"package":"stm","version":"2.5.0.0"}],"dependencies":[{"cabal_sha256":null,"flags":["-bundled-binary-generic"],"package":"Cabal","revision":null,"source":"local","src_sha256":null,"version":"3.6.3.0"},{"cabal_sha256":"714a55fd28d3e2533bd5b49e74f604ef8e5d7b06f249c8816f6c54aed431dcf1","flags":["-optimised-mixer"],"package":"splitmix","revision":0,"source":"hackage","src_sha256":"6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa","version":"0.1.0.4"},{"cabal_sha256":"8bee24dc0c985a90ee78d94c61f8aed21c49633686f0f1c14c5078d818ee43a2","flags":[],"package":"random","revision":0,"source":"hackage","src_sha256":"265c768fc5f2ca53cde6a87e706b4448cad474c3deece933c103f24453661457","version":"1.2.1"},{"cabal_sha256":"3a2beeafb220f9de706568a7e4a5b3c762cc4c9f25c94d7ef795b8c2d6a691d7","flags":["+integer-gmp","-random-initial-seed"],"package":"hashable","revision":1,"source":"hackage","src_sha256":"baaad82cd4271b197016bdbe76f22d5c3d3913fe38534cec7d817db9bae19886","version":"1.3.5.0"},{"cabal_sha256":"b83dec34a53520de84c6dd3dc7aae45d22409b46eb471c478b98108215a370f0","flags":["-bench"],"package":"async","revision":1,"source":"hackage","src_sha256":"484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725","version":"2.2.4"},{"cabal_sha256":"037d70bb091c49f68726dde920f6a003b646835a86cdcb5b5ad58ad9af3207d9","flags":[],"package":"Cabal-syntax","revision":0,"source":"hackage","src_sha256":"ca25e5fc601397565fa857f1aa477740fac7f43d659e77c4d9b1485dca239251","version":"3.6.0.0"},{"cabal_sha256":"d8699f46b485f105eea9c7158f3d432ca578e6bbe5d68751184e9899a41d430d","flags":["-old-bytestring","-old-time"],"package":"tar","revision":4,"source":"hackage","src_sha256":"b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de","version":"0.5.1.1"},{"cabal_sha256":"e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568","flags":["-devel"],"package":"network","revision":0,"source":"hackage","src_sha256":"7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85","version":"3.1.2.7"},{"cabal_sha256":"a16dd922947a6877defe52c4c38d1ab48ed3f85a826930f5d1a568741d619993","flags":[],"package":"th-compat","revision":0,"source":"hackage","src_sha256":"6b5059caf6714f47da92953badf2f556119877e09708c14e206b3ae98b8681c6","version":"0.1.3"},{"cabal_sha256":"a4765164ed0a2d1668446eb2e03460ce98645fbf083598c690846af79b7de10d","flags":[],"package":"network-uri","revision":0,"source":"hackage","src_sha256":"57856db93608a4d419f681b881c9b8d4448800d5a687587dc37e8a9e0b223584","version":"2.6.4.1"},{"cabal_sha256":"6042643c15a0b43e522a6693f1e322f05000d519543a84149cb80aeffee34f71","flags":["-conduit10","-mtl1","+network-uri","-warn-as-error","-warp-tests"],"package":"HTTP","revision":1,"source":"hackage","src_sha256":"d6091c037871ac3d08d021c906206174567499d5a26a6cb804cf530cd590fe2d","version":"4000.3.16"},{"cabal_sha256":"64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a","flags":[],"package":"base16-bytestring","revision":0,"source":"hackage","src_sha256":"1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784","version":"1.0.2.0"},{"cabal_sha256":"50ec0e229255d4c45cbdd568da011311b8887f304b931564886016f4984334d8","flags":[],"package":"base64-bytestring","revision":0,"source":"hackage","src_sha256":"fbf8ed30edde271eb605352021431d8f1b055f95a56af31fe2eacf6bdfdc49c9","version":"1.2.1.0"},{"cabal_sha256":"188d0b5a0491e8b686b32d9b144c9287760ba333d2509bf3f17e3d846fbc2332","flags":["-exe","+use-cbits"],"package":"cryptohash-sha256","revision":0,"source":"hackage","src_sha256":"73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6","version":"0.11.102.1"},{"cabal_sha256":"ccce771562c49a2b29a52046ca68c62179e97e8fbeacdae32ca84a85445e8f42","flags":["-example"],"package":"echo","revision":0,"source":"hackage","src_sha256":"c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43","version":"0.1.4"},{"cabal_sha256":"4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee","flags":[],"package":"edit-distance","revision":1,"source":"hackage","src_sha256":"3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a","version":"0.2.2.1"},{"cabal_sha256":"24ac7b5f3d9fa3c2f70262b329f2a75f24e7fd829f88c189b388efa1bcd67eb2","flags":["+no-donna","+test-doctests","+test-hlint","+test-properties"],"package":"ed25519","revision":5,"source":"hackage","src_sha256":"d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d","version":"0.0.5.0"},{"cabal_sha256":"c084c043a40632d3cafcac50fb5eeff84d91edb070a54baa94945f1c976f97c0","flags":["+ofd-locking"],"package":"lukko","revision":2,"source":"hackage","src_sha256":"a80efb60cfa3dae18682c01980d76d5f7e413e191cd186992e1bf7388d48ab1f","version":"0.1.1.3"},{"cabal_sha256":"262a93dbf370be59f4ee57f3b1a51b338bc2c309797daa37c14f2262ae61dae4","flags":["-bundled-c-zlib","-non-blocking-ffi","-pkg-config"],"package":"zlib","revision":1,"source":"hackage","src_sha256":"807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88","version":"0.6.2.3"},{"cabal_sha256":"eb34c3e2fa39f9819293045c03e56148a7125573c1de265cdfe5d967f1d71c6e","flags":["+base48","-cabal-syntax","+lukko","-mtl21","-old-directory","+use-network-uri"],"package":"hackage-security","revision":1,"source":"hackage","src_sha256":"bf22cd16dde7d6b7130463f4d7324b64a2964d9ef3f523df97d7cb98544d64a8","version":"0.6.2.1"},{"cabal_sha256":"2561adac8ce373910948066debe090a22b336b129ba5af18c0332524d16e72ce","flags":[],"package":"regex-base","revision":0,"source":"hackage","src_sha256":"7b99408f580f5bb67a1c413e0bc735886608251331ad36322020f2169aea2ef1","version":"0.94.0.2"},{"cabal_sha256":"b6421e5356766b0c0a78b6094ae2e3a6259b42c147b717283c03c1cb09163dca","flags":["-_regex-posix-clib"],"package":"regex-posix","revision":0,"source":"hackage","src_sha256":"c7827c391919227711e1cff0a762b1678fd8739f9c902fc183041ff34f59259c","version":"0.96.0.1"},{"cabal_sha256":"2088eb9368b920f80bbe4e3b03c3b8484090208f5c3b31645bd67a9ef7d26db4","flags":[],"package":"resolv","revision":4,"source":"hackage","src_sha256":"81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671","version":"0.1.2.0"},{"cabal_sha256":null,"flags":["-debug-conflict-sets","-debug-expensive-assertions","-debug-tracetree","+lukko","+native-dns"],"package":"cabal-install","revision":null,"source":"local","src_sha256":null,"version":"3.6.2.0"}]}
\ No newline at end of file
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index d6d718709993..6a4b0ad7fc0e 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,6 +1,6 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.6.2.0
+version=3.6.3.0
 revision=1
 wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
 distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
-checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
+checksum=dea086acad6d9fe5fe22d838b95b4e988022e8519f38d41609119ea32bfb7466
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,13 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-9.0.2.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
+	cp "${FILESDIR}/linux-9.0.2.json" bootstrap/
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-9.0.2.json
 }
 do_install() {
 	vbin _build/bin/cabal

From 368e54f72210a8f171fc01ae861599c9d62c8abb Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 19 Mar 2022 12:54:36 +0100
Subject: [PATCH 1779/2561] stack: update stackage resolver to lts-19.0

Related: https://github.com/commercialhaskell/stack/pull/5559
---
 srcpkgs/stack/patches/ghc9.0.2.patch   | 212 +++++++++++++++++++++++++
 srcpkgs/stack/patches/persistent.patch |  46 ++++++
 srcpkgs/stack/template                 |   6 +-
 3 files changed, 261 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/stack/patches/ghc9.0.2.patch
 create mode 100644 srcpkgs/stack/patches/persistent.patch

diff --git a/srcpkgs/stack/patches/ghc9.0.2.patch b/srcpkgs/stack/patches/ghc9.0.2.patch
new file mode 100644
index 000000000000..bdd77de58c6b
--- /dev/null
+++ b/srcpkgs/stack/patches/ghc9.0.2.patch
@@ -0,0 +1,212 @@
+From cb7e56842a25f93142545fad21306a7c1750fbbf Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 16:26:22 -0700
+Subject: [PATCH 1/6] Use Cabal 3.4.0.0
+
+---
+ stack.yaml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/stack.yaml b/stack.yaml
+index 005bd19f4..9472509be 100644
+--- a/stack.yaml
++++ b/stack.yaml
+@@ -20,6 +20,9 @@ flags:
+ ghc-options:
+    "$locals": -fhide-source-paths
+
++extra-deps:
++- Cabal-3.4.0.0
++
+ drop-packages:
+ # See https://github.com/commercialhaskell/stack/pull/4712
+ - cabal-install
+
+From 11e11ab0edeba033b40a7fc62434be58dea82ce2 Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 16:40:56 -0700
+Subject: [PATCH 2/6] Fix Flag => PackageFlag
+
+---
+ src/Stack/BuildPlan.hs | 2 +-
+ src/Stack/Package.hs   | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Stack/BuildPlan.hs b/src/Stack/BuildPlan.hs
+index 36f82236e..c5c80efc6 100644
+--- a/src/Stack/BuildPlan.hs
++++ b/src/Stack/BuildPlan.hs
+@@ -224,7 +224,7 @@ selectPackageBuildPlan platform compiler pool gpd =
+     flagCombinations :: NonEmpty [(FlagName, Bool)]
+     flagCombinations = mapM getOptions (genPackageFlags gpd)
+       where
+-        getOptions :: C.Flag -> NonEmpty (FlagName, Bool)
++        getOptions :: C.PackageFlag -> NonEmpty (FlagName, Bool)
+         getOptions f
+             | flagManual f = (fname, flagDefault f) :| []
+             | flagDefault f = (fname, True) :| [(fname, False)]
+diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
+index 4db50d2a4..d9bca7af5 100644
+--- a/src/Stack/Package.hs
++++ b/src/Stack/Package.hs
+@@ -128,7 +128,7 @@ resolvePackage packageConfig gpkg =
+         (resolvePackageDescription packageConfig gpkg)
+
+ packageFromPackageDescription :: PackageConfig
+-                              -> [D.Flag]
++                              -> [PackageFlag]
+                               -> PackageDescriptionPair
+                               -> Package
+ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkgNoMod pkg) =
+@@ -935,9 +935,9 @@ resolvePackageDescription packageConfig (GenericPackageDescription desc defaultF
+ -- | Make a map from a list of flag specifications.
+ --
+ -- What is @flagManual@ for?
+-flagMap :: [Flag] -> Map FlagName Bool
++flagMap :: [PackageFlag] -> Map FlagName Bool
+ flagMap = M.fromList . map pair
+-  where pair :: Flag -> (FlagName, Bool)
++  where pair :: PackageFlag -> (FlagName, Bool)
+         pair = flagName &&& flagDefault
+
+ data ResolveConditions = ResolveConditions
+@@ -986,7 +986,7 @@ resolveConditions rc addDeps (CondNode lib deps cs) = basic <> children
+                   case v of
+                     OS os -> os == rcOS rc
+                     Arch arch -> arch == rcArch rc
+-                    Flag flag ->
++                    PackageFlag flag ->
+                       fromMaybe False $ M.lookup flag (rcFlags rc)
+                       -- NOTE:  ^^^^^ This should never happen, as all flags
+                       -- which are used must be declared. Defaulting to
+
+From 8facd731ec3f2bbc15a083750740929167b33bb2 Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 16:55:30 -0700
+Subject: [PATCH 3/6] Fix CabalSpecVersion
+
+---
+ src/Stack/Package.hs | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
+index d9bca7af5..fca039140 100644
+--- a/src/Stack/Package.hs
++++ b/src/Stack/Package.hs
+@@ -32,6 +32,7 @@ import           Data.List (find, isPrefixOf, unzip)
+ import qualified Data.Map.Strict as M
+ import qualified Data.Set as S
+ import qualified Data.Text as T
++import           Distribution.CabalSpecVersion (CabalSpecVersion, cabalSpecMinimumLibraryVersion)
+ import           Distribution.Compiler
+ import           Distribution.ModuleName (ModuleName)
+ import qualified Distribution.ModuleName as Cabal
+@@ -190,7 +191,7 @@ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkg
+           (library pkg)
+     , packageBuildType = buildType pkg
+     , packageSetupDeps = msetupDeps
+-    , packageCabalSpec = either orLaterVersion id $ specVersionRaw pkg
++    , packageCabalSpec = orLaterVersion $ mkVersion $ cabalSpecMinimumLibraryVersion $ specVersion pkg
+     }
+   where
+     extraLibNames = S.union subLibNames foreignLibNames
+@@ -696,7 +697,7 @@ packageDescModulesAndFiles pkg = do
+
+ -- | Resolve globbing of files (e.g. data files) to absolute paths.
+ resolveGlobFiles
+-  :: Version -- ^ cabal file version
++  :: CabalSpecVersion -- ^ cabal file version
+   -> [String]
+   -> RIO Ctx (Set (Path Abs File))
+ resolveGlobFiles cabalFileVersion =
+
+From 004f14652409b7d0645215d354b2e599eb7f76bc Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 16:55:40 -0700
+Subject: [PATCH 4/6] Fix GenericPackageDescription
+
+---
+ src/Stack/Build.hs   | 2 +-
+ src/Stack/Package.hs | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Stack/Build.hs b/src/Stack/Build.hs
+index 23b9a9719..856903bed 100644
+--- a/src/Stack/Build.hs
++++ b/src/Stack/Build.hs
+@@ -358,7 +358,7 @@ checkComponentsBuildable lps =
+ checkSubLibraryDependencies :: HasLogFunc env => [ProjectPackage] -> RIO env ()
+ checkSubLibraryDependencies proj = do
+   forM_ proj $ \p -> do
+-    C.GenericPackageDescription _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p
++    C.GenericPackageDescription _ _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p
+
+     let dependencies = concatMap getDeps subLibs <>
+                        concatMap getDeps foreignLibs <>
+diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
+index fca039140..39aad4d2f 100644
+--- a/src/Stack/Package.hs
++++ b/src/Stack/Package.hs
+@@ -863,7 +863,7 @@ data PackageDescriptionPair = PackageDescriptionPair
+ resolvePackageDescription :: PackageConfig
+                           -> GenericPackageDescription
+                           -> PackageDescriptionPair
+-resolvePackageDescription packageConfig (GenericPackageDescription desc defaultFlags mlib subLibs foreignLibs' exes tests benches) =
++resolvePackageDescription packageConfig (GenericPackageDescription desc _ defaultFlags mlib subLibs foreignLibs' exes tests benches) =
+     PackageDescriptionPair
+       { pdpOrigBuildable = go False
+       , pdpModifiedBuildable = go True
+
+From 820797b566ef981936907f4d19658259d4a635a8 Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 17:01:01 -0700
+Subject: [PATCH 5/6] Fix generatePackageVersionMacros
+
+---
+ src/Stack/Build/Execute.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
+index 1e381dd21..aedd7fee5 100644
+--- a/src/Stack/Build/Execute.hs
++++ b/src/Stack/Build/Execute.hs
+@@ -1214,7 +1214,7 @@ withSingleContext ActionContext {..} ee@ExecuteEnv {..} task@Task {..} allDeps m
+                             let macroDeps = mapMaybe snd matchedDeps
+                                 cppMacrosFile = setupDir </> relFileSetupMacrosH
+                                 cppArgs = ["-optP-include", "-optP" ++ toFilePath cppMacrosFile]
+-                            writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros macroDeps)))
++                            writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros (packageVersion package) macroDeps)))
+                             return (packageDBArgs ++ depsArgs ++ cppArgs)
+
+                         -- This branch is usually taken for builds, and
+
+From 336ab515e30f03c274f89ebe1cbc6aa1e597c2a4 Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 17:04:16 -0700
+Subject: [PATCH 6/6] Fix ModuleReexport
+
+---
+ src/Stack/Script.hs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs
+index 6bb67c049..9ebd2173d 100644
+--- a/src/Stack/Script.hs
++++ b/src/Stack/Script.hs
+@@ -18,6 +18,7 @@ import           Distribution.Compiler      (CompilerFlavor (..))
+ import           Distribution.ModuleName    (ModuleName)
+ import qualified Distribution.PackageDescription as PD
+ import qualified Distribution.Types.CondTree as C
++import qualified Distribution.Types.ModuleReexport as ModuleReexport
+ import           Distribution.Types.PackageName (mkPackageName)
+ import           Distribution.Types.VersionRange (withinRange)
+ import           Distribution.System        (Platform (..))
+@@ -280,7 +281,7 @@ allExposedModules gpd = do
+       mlibrary = snd . C.simplifyCondTree checkCond <$> PD.condLibrary gpd
+   pure $ case mlibrary  of
+     Just lib -> PD.exposedModules lib ++
+-                map PD.moduleReexportName (PD.reexportedModules lib)
++                map ModuleReexport.moduleReexportName (PD.reexportedModules lib)
+     Nothing  -> mempty
+
+ -- | The Stackage project introduced the concept of hidden packages,
diff --git a/srcpkgs/stack/patches/persistent.patch b/srcpkgs/stack/patches/persistent.patch
new file mode 100644
index 000000000000..cf462d7b80c2
--- /dev/null
+++ b/srcpkgs/stack/patches/persistent.patch
@@ -0,0 +1,46 @@
+commit 188d7ece06ee06ed6ccaf0df0c46285bd43898f4
+Author: q66 <daniel@octaforge.org>
+Date:   Thu Apr 28 05:02:09 2022 +0200
+
+    constrain persistent to fix build
+
+diff --git a/stack.cabal b/stack.cabal
+index dba5bf0..e221321 100644
+--- a/stack.cabal
++++ b/stack.cabal
+@@ -281,7 +281,7 @@ library
+         pantry >=0.5.3,
+         path >=0.7.0,
+         path-io >=1.6.3,
+-        persistent >=2.11.0.4,
++        persistent >=2.11.0.4 && <2.14.0.0,
+         persistent-sqlite >=2.11.1.0,
+         persistent-template >=2.9.1.0,
+         pretty >=1.1.3.6,
+@@ -407,7 +407,7 @@ executable stack
+         pantry >=0.5.3,
+         path >=0.7.0,
+         path-io >=1.6.3,
+-        persistent >=2.11.0.4,
++        persistent >=2.11.0.4 && <2.14.0.0,
+         persistent-sqlite >=2.11.1.0,
+         persistent-template >=2.9.1.0,
+         pretty >=1.1.3.6,
+@@ -537,7 +537,7 @@ executable stack-integration-test
+         pantry >=0.5.3,
+         path >=0.7.0,
+         path-io >=1.6.3,
+-        persistent >=2.11.0.4,
++        persistent >=2.11.0.4 && <2.14.0.0,
+         persistent-sqlite >=2.11.1.0,
+         persistent-template >=2.9.1.0,
+         pretty >=1.1.3.6,
+@@ -672,7 +672,7 @@ test-suite stack-test
+         pantry >=0.5.3,
+         path >=0.7.0,
+         path-io >=1.6.3,
+-        persistent >=2.11.0.4,
++        persistent >=2.11.0.4 && <2.14.0.0,
+         persistent-sqlite >=2.11.1.0,
+         persistent-template >=2.9.1.0,
+         pretty >=1.1.3.6,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 9e53b95ca633..15c38039684d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.5
-revision=1
-_stackage="lts-18.14"
+revision=2
+_stackage="lts-19.0"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
 checksum="9ddd44c2a62e9404194d69e7dc1c94e707910620316b66d6ac0b3201a8f37e80
- 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
+ 6b9983f6448eb825231f65fe955d6d85516f482f0d26fee84183a1a79c6b0646"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 7eb641c94400f8dd73a73c5703cb881b3e00959e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 09:17:26 +0100
Subject: [PATCH 1780/2561] cgrep: bump for stackage lts-19.0

---
 srcpkgs/cgrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index e57106f3fa26..1c54fe367396 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.7.1
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-18.15"
+stackage="lts-19.0"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

From 847994a0c60f0eaf50fe78aa04fc86808084cb35 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 09:23:26 +0100
Subject: [PATCH 1781/2561] git-mediate: bump for stackage lts-19.0

---
 srcpkgs/git-mediate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index 0c9ec10241e5..705df7843b8e 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,9 +1,9 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
 version=1.0.8.1
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-18.14"
+stackage="lts-19.0"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From 5c55a956d539fd7579f85c060ddd9db5522bb264 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 09:51:34 +0100
Subject: [PATCH 1782/2561] hlint: update to 3.3.6

---
 srcpkgs/hlint/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fd72c1bbea58..0109be25805f 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=3.2.7
-revision=2
+version=3.3.6
+revision=1
 build_style=haskell-stack
-stackage="lts-18.14"
+stackage="lts-19.0"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
+checksum=7d536c03f77a0c259efb2b00b525ef34578ca8a4a95ccb412708e8c7172e2e6a
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 9d5e12c0cfdbb649f34091b99261bce55ef34161 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 11:38:44 +0100
Subject: [PATCH 1783/2561] pandoc: update to 2.17.1.1

+ Fix compilation of `pandoc-crossref` for musl systems.
+ Remove the `system-lua` flag, as `pkg-config` already implies it [1].

Related: https://github.com/lierdakil/pandoc-crossref/issues/342
[1]: https://github.com/hslua/hslua/blob/main/lua/README.md?plain=1#L39-L40
---
 srcpkgs/pandoc/files/pandoc-crossref.cabal | 154 +++++++++++++++++++++
 srcpkgs/pandoc/template                    |  43 +++---
 2 files changed, 173 insertions(+), 24 deletions(-)
 create mode 100644 srcpkgs/pandoc/files/pandoc-crossref.cabal

diff --git a/srcpkgs/pandoc/files/pandoc-crossref.cabal b/srcpkgs/pandoc/files/pandoc-crossref.cabal
new file mode 100644
index 000000000000..7aacc47278f3
--- /dev/null
+++ b/srcpkgs/pandoc/files/pandoc-crossref.cabal
@@ -0,0 +1,154 @@
+cabal-version: 2.0
+
+-- This file has been generated from package.yaml by hpack version 0.34.6.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: 20655cd6263e9fe7e5737ee81b093c8c6f5eae67e260ddd3a821ac6ef5e35e69
+
+name:           pandoc-crossref
+version:        0.3.13.0
+synopsis:       Pandoc filter for cross-references
+description:    pandoc-crossref is a pandoc filter for numbering figures, equations, tables and cross-references to them.
+category:       Text
+homepage:       https://github.com/lierdakil/pandoc-crossref#readme
+bug-reports:    https://github.com/lierdakil/pandoc-crossref/issues
+author:         Nikolay Yakimov
+maintainer:     root@livid.pp.ru
+license:        GPL-2
+license-file:   LICENSE
+build-type:     Simple
+
+source-repository head
+  type: git
+  location: https://github.com/lierdakil/pandoc-crossref
+
+flag enable_flaky_tests
+  description: Some tests rely on specific behaviour of pandoc, which may change between minor versions. These are still useful indicators for the developer, but not necessarily indicating there's a problem with the package itself. Enable if you know what you are doing.
+  manual: True
+  default: False
+
+library
+  exposed-modules:
+      Text.Pandoc.CrossRef
+  other-modules:
+      Text.Pandoc.CrossRef.References
+      Text.Pandoc.CrossRef.References.Blocks
+      Text.Pandoc.CrossRef.References.List
+      Text.Pandoc.CrossRef.References.Refs
+      Text.Pandoc.CrossRef.References.Types
+      Text.Pandoc.CrossRef.Util.CodeBlockCaptions
+      Text.Pandoc.CrossRef.Util.CustomLabels
+      Text.Pandoc.CrossRef.Util.Meta
+      Text.Pandoc.CrossRef.Util.ModifyMeta
+      Text.Pandoc.CrossRef.Util.Options
+      Text.Pandoc.CrossRef.Util.Settings
+      Text.Pandoc.CrossRef.Util.Settings.Gen
+      Text.Pandoc.CrossRef.Util.Settings.Template
+      Text.Pandoc.CrossRef.Util.Template
+      Text.Pandoc.CrossRef.Util.Util
+  hs-source-dirs:
+      lib
+      lib-internal
+  ghc-options: -Wall
+  build-depends:
+      base >=4.11 && <5
+    , containers >=0.1 && <0.7
+    , data-default >=0.4 && <0.8
+    , directory >=1 && <1.4
+    , filepath >=1.1 && <1.5
+    , microlens >=0.4.12.0 && <0.5.0.0
+    , microlens-mtl >=0.2.0.1 && <0.3.0.0
+    , microlens-th >=0.4.3.10 && <0.5.0.0
+    , mtl >=1.1 && <2.3
+    , pandoc >=2.10 && <2.18
+    , pandoc-types >=1.21 && <1.23
+    , roman-numerals ==0.5.*
+    , syb >=0.4 && <0.8
+    , template-haskell >=2.7.0.0 && <3.0.0.0
+    , text >=1.2.2 && <1.3
+    , utility-ht >=0.0.11 && <0.1.0
+  default-language: Haskell2010
+
+executable pandoc-crossref
+  main-is: pandoc-crossref.hs
+  other-modules:
+      ManData
+  hs-source-dirs:
+      src
+  ghc-options: -Wall -threaded
+  build-depends:
+      base >=4.11 && <5
+    , deepseq ==1.4.*
+    , gitrev >=1.3.1 && <1.4
+    , open-browser ==0.2.*
+    , optparse-applicative >=0.13 && <0.17
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , template-haskell >=2.7.0.0 && <3.0.0.0
+    , temporary >=1.2 && <1.4
+    , text >=1.2.2 && <1.3
+  default-language: Haskell2010
+
+test-suite test-integrative
+  type: exitcode-stdio-1.0
+  main-is: test-integrative.hs
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -fno-warn-unused-do-bind -threaded
+  build-depends:
+      base >=4.11 && <5
+    , directory >=1 && <1.4
+    , filepath >=1.1 && <1.5
+    , hspec >=2.4.4 && <3
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , text >=1.2.2 && <1.3
+  if flag(enable_flaky_tests)
+    cpp-options: -DFLAKY
+  default-language: Haskell2010
+
+test-suite test-pandoc-crossref
+  type: exitcode-stdio-1.0
+  main-is: test-pandoc-crossref.hs
+  other-modules:
+      Native
+      Paths_pandoc_crossref
+  autogen-modules:
+      Paths_pandoc_crossref
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -fno-warn-unused-do-bind -threaded
+  build-depends:
+      base >=4.11 && <5
+    , containers >=0.1 && <0.7
+    , data-default >=0.4 && <0.8
+    , hspec >=2.4.4 && <3
+    , microlens >=0.4.12.0 && <0.5.0.0
+    , mtl >=1.1 && <2.3
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , text >=1.2.2 && <1.3
+  if flag(enable_flaky_tests)
+    cpp-options: -DFLAKY
+  default-language: Haskell2010
+
+benchmark simple
+  type: exitcode-stdio-1.0
+  main-is: bench-simple.hs
+  other-modules:
+      Native
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -fno-warn-unused-do-bind -threaded
+  build-depends:
+      base >=4.11 && <5
+    , criterion >=1.5.9.0 && <1.6
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , text >=1.2.2 && <1.3
+  default-language: Haskell2010
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8628b1d1f3c2..9bdf32ef3c53 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=3
-_sidenote_version=0.20.0.0
+version=2.17.1.1
+revision=1
+_sidenote_version=0.22.1.0
 _monad_gen_version=0.3.0.1
 _crossref_version=0.3.12.2
 _roman_numerals_version=0.5.1.5
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.14"
+stackage="lts-19.0"
 make_build_args="
- --flag pandoc:embed_data_files --flag=hslua:system-lua
- --flag=hslua:pkg-config"
+ --flag pandoc:embed_data_files
+ --flag=lua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
@@ -21,33 +21,28 @@ license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://hackage.haskell.org/package/${pkgname}-sidenote-${_sidenote_version}/${pkgname}-sidenote-${_sidenote_version}.tar.gz
- https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
- 91f8e96d8470722d677d31d4bbf16c2ac6902567d818ed7a2715bad2617a4cdb
- be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
-subpackages="pandoc-sidenote"
-nocross=yes
-nopie_files="
- /usr/bin/pandoc
- /usr/bin/pandoc-sidenote"
-
-# pandoc-crossref is currently broken on musl. See lierdakil/pandoc-crossref#342 and commercialhaskell/stack#5683
-if [ "$XBPS_TARGET_LIBC" != "musl" ]; then
-	distfiles+="
+ https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz
  https://hackage.haskell.org/package/${pkgname}-crossref-${_crossref_version}/${pkgname}-crossref-${_crossref_version}.tar.gz
  https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz"
-	checksum+="
+checksum="649ec528d1413130c5ce304b826ff473b3696269eea8834d908589e775bd1ad1
+ c39dd7343b9cb4dc5b1c91c9e47c3d357874e9e1a30b8d377bbea0b1d50323b2
+ be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465
  94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4
  b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
-	nopie_files+="
- /usr/bin/pandoc-crossref"
-	subpackages+="
+subpackages="
+ pandoc-sidenote
  pandoc-crossref"
-fi
+nocross=yes
+nopie_files="
+ /usr/bin/pandoc
+ /usr/bin/pandoc-sidenote
+ /usr/bin/pandoc-crossref"
 
 post_extract() {
 	sed -i 's/tasty .*,/tasty,/' pandoc-*/pandoc.cabal
 	sed -i 's/zip-archive .*,/zip-archive,/' pandoc-*/pandoc.cabal
+	# See https://github.com/lierdakil/pandoc-crossref/issues/342#issuecomment-1073256586
+	cp "${FILESDIR}/pandoc-crossref.cabal" pandoc-crossref-${_crossref_version}
 }
 
 post_install() {

From 422c3d0d9d788a76223762fb24b2bbf9b3e5bb3d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 12:15:01 +0100
Subject: [PATCH 1784/2561] shellcheck: bump for stackage lts-19.0

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 70eee6c2854b..903d703488d6 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.8.0
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-18.14"
+stackage="lts-19.0"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 7e0354d6a9a97faf0645be5d55448d945399a67e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 12:52:11 +0100
Subject: [PATCH 1785/2561] hoogle: update to 5.0.18.3

---
 srcpkgs/hoogle/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4c3e80186494..dc487cab4017 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,16 +1,16 @@
 # Template file for 'hoogle'
 pkgname=hoogle
-version=5.0.18.2
-revision=2
+version=5.0.18.3
+revision=1
 build_style=haskell-stack
-stackage="lts-18.14"
+stackage="lts-19.0"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
 homepage="https://hoogle.haskell.org/"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=9f8f0afde52fe602100ab7828fad230c2f5e94050dda9fe1e2a9f0a93f7fe617
+checksum=a2765fcbaf99fe67a64ef29fe50e69fb380cce07807cddeb0836c148b1ae472b
 nopie_files="/usr/bin/hoogle"
 nocross=yes # Can't yet cross compile Haskell
 

From c7abbe190c4357413ff582a8cecc5dca5cda2d3e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 13:33:12 +0100
Subject: [PATCH 1786/2561] xmobar: update to 0.42

Also enable most flags during compilation in order to be less surprising
with regards to what features xmobar supports out of the box.
---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 47544eb729d8..7e0956374142 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-18.13
+resolver: lts-19.0
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index b97c9f268d68..6a12a9ed7055 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=2
+version=0.42
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -15,10 +15,10 @@ maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
 homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=53f4a06d79c3db32ef1a498ec7b764b17d03ebf9bca3126c6b8259595492769b
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
-build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
+build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm alsa mpris mpd dbus"
 nopie_files="/usr/bin/xmobar"
 nocross=yes
 vopt_hflag() {

From 1dea1a9e78506fc33a7a73948cdb6b01e26465a1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 18:09:34 +0100
Subject: [PATCH 1787/2561] hledger: update to 1.25

---
 srcpkgs/hledger/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index fdcab180a6de..32d39207fd82 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,8 +1,9 @@
 # Template file for 'hledger'
 pkgname=hledger
-version=1.23
-revision=2
+version=1.25
+revision=1
 build_style=haskell-stack
+stackage="lts-19.0"
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
@@ -10,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://hledger.org/"
 changelog="https://hackage.haskell.org/package/hledger-${version}/changelog"
 distfiles="https://github.com/simonmichael/${pkgname}/archive/${version}.tar.gz"
-checksum=7252d78aafbae488b113a6350518a702186cacc4e746cec2b31f8321b4dddcb4
+checksum=4c947c2a7d243d2a56efc1fa02994a118e995df025a412f6d2daeadfd78338ee
 nopie_files="/usr/bin/hledger"
 nocross=yes # Can't yet cross compile Haskell
 

From 05579e84dfe4cbfb6d4925e4a302bc2ce552e472 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 21 Mar 2022 08:19:29 +0100
Subject: [PATCH 1788/2561] haskell-language-server: update to 1.6.1.0

---
 srcpkgs/haskell-language-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 0182c9b95757..0c7b2187c5ca 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.4.0
+version=1.6.1.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.7.yaml"
+make_build_args="--stack-yaml stack-9.0.2.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=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
+checksum=e5c336ad2de8d021c882cdac5bbc26bf6427df8d2a5bd244c05cf18296a9bfdc
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 5882afbf32036ecb461f4ed3193a62c3ebcec764 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 21 Mar 2022 15:48:58 +0100
Subject: [PATCH 1789/2561] git-annex: update to 10.20220222

---
 srcpkgs/git-annex/files/stack.yaml | 33 ++++++++++++++++++++++++++++++
 srcpkgs/git-annex/template         |  5 +++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/git-annex/files/stack.yaml

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
new file mode 100644
index 000000000000..4935307f48cf
--- /dev/null
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -0,0 +1,33 @@
+flags:
+  git-annex:
+    production: true
+    assistant: true
+    pairing: true
+    torrentparser: true
+    webapp: true
+    magicmime: false
+    dbus: false
+    debuglocks: false
+    benchmark: true
+    networkbsd: true
+    gitlfs: true
+    httpclientrestricted: true
+packages:
+  - '.'
+resolver: lts-19.0
+extra-deps:
+  - IfElse-0.85
+  - aws-0.22
+  - bloomfilter-2.0.1.0
+  - git-lfs-1.2.0
+  - http-client-restricted-0.0.4
+  - network-multicast-0.3.2
+  - sandi-0.5
+  - torrent-10000.1.1
+  - base16-bytestring-0.1.1.7
+  - base64-bytestring-1.0.0.3
+  - bencode-0.6.1.1
+  - aeson-1.5.6.0@sha256:5003bb6fd260d2e2d5a51dee2bf5c8e8f29e4e0e0288fef805c22dcc80ecab06,6788
+  - http-client-0.7.11@sha256:3f59ac8ffe2a3768846cdda040a0d1df2a413960529ba61c839861c948871967,5756
+explicit-setup-deps:
+    git-annex: true
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 1cf2ab14789f..7b788bc5861e 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,8 +1,9 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20211028
+version=10.20220222
 revision=1
 build_style=haskell-stack
+stackage="lts-19.0"
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
  lsof rsync git ncurses-devel"
 # depends are utilities required by git-annex
@@ -12,7 +13,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=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d
+checksum=1fb9f75a83feb16f7515122135c0f3abe6aa77544d8d778792296cbc053d2c85
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From b40a6cc9f5f97405be0cc5f19f60f5fe539b9807 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 23 Mar 2022 09:14:58 +0100
Subject: [PATCH 1790/2561] darcs: bump for stackage lts-19.0

---
 srcpkgs/darcs/files/stack.yaml | 7 ++-----
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 5ae0f5313b8d..6e459703764a 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,7 +1,4 @@
-resolver: lts-18.14
+resolver: lts-19.0
 packages:
 - .
-extra-deps:
-- graphviz-2999.20.1.0
-- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
-- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
+allow-newer: true
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index f9fcac534d46..15a8f71f9021 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.5
-revision=2
+revision=3
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 40d3c4dc32d0825d601a149e9fe6131e16f2c253 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 24 Mar 2022 11:50:45 +0100
Subject: [PATCH 1791/2561] debug-me: update to 1.20220324

---
 srcpkgs/debug-me/files/stack.yaml        |  8 +++---
 srcpkgs/debug-me/patches/ghc8.10.4.patch | 33 ------------------------
 srcpkgs/debug-me/template                |  7 ++---
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/debug-me/patches/ghc8.10.4.patch

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index ad8b055bb33e..f2b1a79d70c6 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,8 +1,6 @@
 packages:
 - '.'
-resolver: lts-18.14
+resolver: lts-19.0
 extra-deps:
-- posix-pty-0.2.1.1
-- graphviz-2999.20.1.0
-- sandi-0.5
-- protobuf-0.2.1.3@sha256:d8ed3c73027c6b7e7583c6a94ee1835beee8a755a875b06bbf51bc667d53ab69,3048
+  - posix-pty-0.2.1.1
+  - sandi-0.5@sha256:b278d072ca717706ea38f9bd646e023f7f2576a778fb43565b434f93638849aa,3010
diff --git a/srcpkgs/debug-me/patches/ghc8.10.4.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
deleted file mode 100644
index bfcff16a4438..000000000000
--- a/srcpkgs/debug-me/patches/ghc8.10.4.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/Val.hs	2020-03-31 11:00:33.329814064 +0200
-+++ b/Val.hs	2020-03-31 11:00:24.602711845 +0200
-@@ -42,7 +42,7 @@
- b64 :: B.ByteString -> T.Text
- b64 = T.decodeUtf8 . B64.encode
-
--unb64 :: Monad m => T.Text -> m B.ByteString
-+unb64 :: MonadFail m => T.Text -> m B.ByteString
- unb64 t = either
- 	(\_ -> fail "bad base64 data")
- 	return
---- a/Server.hs	2020-03-31 12:53:45.860509650 +0200
-+++ b/Server.hs	2020-03-31 12:52:34.873835069 +0200
-@@ -105,7 +105,7 @@
- 		-- (Workaround for
- 		-- https://github.com/jaspervdj/websockets/issues/140)
- 		setHost "*6" $
--		setPort (serverPort o) $
-+		setPort (CmdLine.serverPort o) $
- 		defaultSettings
-
- checkEnv :: ServerOpts -> IO ServerOpts
---- a/debug-me.cabal
-+++ b/debug-me.cabal
-@@ -64,7 +64,7 @@
-     , stm-chans (>= 3.0)
-     , posix-pty (>= 0.2.1)
-     , terminal-size (>= 0.3)
--    , aeson (>= 0.11 && < 1.5)
-+    , aeson (>= 0.11 && < 1.6)
-     , sandi (>= 0.4)
-     , text (>= 1.2.2)
-     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 86ac0037311a..f971f2156c77 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,15 +1,16 @@
 # Template file for 'debug-me'
 pkgname=debug-me
-version=1.20200820
-revision=3
+version=1.20220324
+revision=1
 build_style=haskell-stack
+stackage="lts-19.0"
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://debug-me.branchable.com/"
 distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=9497dc9b85a58e5c499ea25fa1bed9f4fd6cdd2f57564f52a0e4152ad4fdc102
+checksum=9fd6256aa34408106ff095e0560850aca3558a774be4ce19de6ab6e81fbfdb9f
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/debug-me"
 

From ba8220827211385a683a9870501cab8e5898b527 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 25 Mar 2022 14:40:52 +0100
Subject: [PATCH 1792/2561] ghc-bin: update to 9.0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sigrid Solveig Haflínudóttir <ftrvxmtrx@gmail.com>
---
 srcpkgs/ghc-bin/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 3949ee3fa1aa..d05dcd821f37 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.7
+version=9.0.2
 revision=1
 archs="i686 x86_64* ppc64le* ppc64"
 wrksrc="ghc-${version%[!0-9]}"
@@ -15,29 +15,29 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
-	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
+	distfiles="https://downloads.haskell.org/ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=805f5628ce6cec678ba77ff48c924831ebdf75ec2c66368e8935a618913a150e
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
+	checksum=e21eaddeffcd5de7abe43b1f3982a3bc2c5b5f408d2574857cb2b0368106e12c
 	;;
 i686)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
+	distfiles="https://downloads.haskell.org/ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
+	checksum=fdeb9f8928fbe994064778a8e1e85bb1a58a6cd3dd7b724fcc2a1dcfda6cad47
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"
-	checksum=4662c88bc642941d9d463fd4878fc799e081c6fc5b10d2df5fa48e0cadea888c
+	checksum=7de8114c991f9a2a3b0f5e472da76e3956be6447efec4b1157f14e707049f22d
 	;;
 ppc64le-musl)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux-musl.tar.xz"
-	checksum=c01b2d9d4c7b05a62f79b24e374413ac524116cbe5fb7c20673d62b8c3eebf10
+	checksum=37de8e069712307c9b2039e92f56e540e80ca1390dd27aa247ebe18c40e0c629
 	;;
 ppc64)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz"
-	checksum=b8578e602abd4b453845303fb9cfed0b2186f86f60e3aa45869026ea833726c8
+	checksum=6eb8684fdbede0cded7e3f7b93574b968f5f66dd2fcd4ec30ac5f0c402af6602
 	;;
 *)
 	broken="No distfiles available for this target"

From 04a0c4ea8784141a2b2b72d8ffcdee6fafd6fa56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Thu, 24 Mar 2022 09:27:25 +0100
Subject: [PATCH 1793/2561] ghc, ghc-bin: Add aarch64* support

---
 srcpkgs/ghc-bin/template | 12 +++++++++++-
 srcpkgs/ghc/template     |  8 ++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index d05dcd821f37..996be0fb5f53 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -2,7 +2,7 @@
 pkgname=ghc-bin
 version=9.0.2
 revision=1
-archs="i686 x86_64* ppc64le* ppc64"
+archs="i686 x86_64* ppc64le* ppc64 aarch64*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
@@ -39,6 +39,16 @@ ppc64)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz"
 	checksum=6eb8684fdbede0cded7e3f7b93574b968f5f66dd2fcd4ec30ac5f0c402af6602
 	;;
+aarch64)
+	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux.tar.xz"
+	checksum=44a20a896246dce64392b7d0feedd0a28a9d733245a803e95dbe4b4b7e15b4fd
+	depends+=" llvm"
+	;;
+aarch64-musl)
+	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux-musl.tar.xz"
+	checksum=de98e2ff33a25cb32a28c738066fecacb736a33cac12688876eec4eb96d88607
+	depends+=" llvm"
+	;;
 *)
 	broken="No distfiles available for this target"
 	;;
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index c4bbb3e4e3b1..d0b1600987be 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -54,6 +54,14 @@ elif [ "${XBPS_MACHINE%-*}" != "${XBPS_TARGET_MACHINE%-*}" ]; then
 	configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET}"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+aarch64*)
+	# GHC uses LLVM to generate code on aarch64
+	hostmakedepends+=" llvm"
+	depends+=" llvm"
+	;;
+esac
+
 # Recent safe to use tarball
 # GHC's bundled tarball is from 2017, buggy on some archs
 _ffi_rev=4d6d2866ae43e55325e8ee96561221804602cd7a

From 7a888d46c488b583f6106bc662d23f9c48269635 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 24 Mar 2022 14:27:41 +0100
Subject: [PATCH 1794/2561] kmonad: update to
 65b501defdd0049563752f8af8c8c57f5a1ae38b

The reason for updating to an unreleased version is that the author
(and core maintainer) of the project is chronically ill[1] and unable
to spend a lot of time on kmonad.  At the same time, there is a rather
large refactor on the way, without which a new release would not make
too much sense[2].  As such, updating to what's essentially HEAD makes
sense in this case; it is not any less stable than 0.4.1 (I've
personally been running this for months without any problems).  As a
bonus, we get GHC 9.0.2 compatibility for free and do not need to
cherry pick the relevant commits.

[1]: https://github.com/kmonad/kmonad#disclaimer
[2]: https://github.com/kmonad/kmonad/pull/372
---
 srcpkgs/kmonad/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index c93d2bee4c4f..829d96a535eb 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,15 +1,15 @@
 # Template file for 'kmonad'
 pkgname=kmonad
-version=0.4.1
-revision=3
+version=65b501defdd0049563752f8af8c8c57f5a1ae38b
+revision=1
 build_style=haskell-stack
-stackage=lts-18.14
+stackage=lts-19.0
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"
 homepage="https://github.com/david-janssen/kmonad"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=cb66f0c6d4c304c7e3c48cefd0c50ea00b156ffc361e278e1fc5c6070317d927
+checksum=2b0cb0c5d1575bf61b1c442476ad24103028c309d103fedb56214a3bb30f8c0f
 nopie_files="/usr/bin/kmonad"
 nocross=yes
 

From 04c12e8951fe90edc70c82e17c816987cae565cd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Apr 2022 15:23:36 +0200
Subject: [PATCH 1795/2561] minify: update to 2.11.2.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 7131527fa009..9be3e9620c49 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.11.1
+version=2.11.2
 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=f238ffcb9ed6ff3c413442e3c5bfe9409809cc3de67db29ebc541d83168a09ea
+checksum=de1bcdf33c8bb3fafa2286f71d28c4639dcba044dae1707232eb53ed6980a33a
 
 post_install() {
 	vlicense LICENSE

From e8ce7a1cbbab8905e485cfb91b69040c08569424 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Apr 2022 15:24:56 +0200
Subject: [PATCH 1796/2561] xrootconsole: update to 0.6.5.

---
 srcpkgs/xrootconsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xrootconsole/template b/srcpkgs/xrootconsole/template
index 029212328a27..a9ee30ed0758 100644
--- a/srcpkgs/xrootconsole/template
+++ b/srcpkgs/xrootconsole/template
@@ -1,7 +1,7 @@
 # Template file for 'xrootconsole'
 pkgname=xrootconsole
 reverts=0.6r3_3
-version=0.6.4
+version=0.6.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="xrootconsole-${version%.*}"
@@ -14,7 +14,7 @@ homepage="https://packages.debian.org/source/sid/xrootconsole"
 distfiles="${DEBIAN_SITE}/main/x/xrootconsole/xrootconsole_${version%.*}.orig.tar.gz
  ${DEBIAN_SITE}/main/x/xrootconsole/xrootconsole_${version%.*}-${version##*.}.debian.tar.xz"
 checksum="8306de6f4d3f39677334ee65214e46729cf2dd89aeff1705df3c499738a4076d
- 4d9429c1588d3be7b47eeba6f06371184e71562a439ec9fcacc340776b845f41"
+ 332e080e61f02290454147f14624a94803e4664a996271cfab124633b48f9bcf"
 
 post_extract() {
 	for p in debian/patches/*.patch; do

From cc63d36237818712b0ee22354513d25ee341b298 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Apr 2022 19:09:02 +0200
Subject: [PATCH 1797/2561] ghc-bin: mark nocross.

---
 srcpkgs/ghc-bin/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 996be0fb5f53..21847afbecb5 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -10,6 +10,7 @@ short_desc="Glorious Haskell Compiler - precompiled binaries"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
+nocross=yes
 nostrip=yes
 noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"

From eb5f5f0d328f9c36cf18d68f251fcfa688f15ac0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Apr 2022 19:11:08 +0200
Subject: [PATCH 1798/2561] cabal-install: fix build.

---
 srcpkgs/cabal-install/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 6a4b0ad7fc0e..e50dba1d51b2 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,7 +1,7 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
 version=3.6.3.0
-revision=1
+revision=2
 wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
@@ -15,6 +15,10 @@ checksum=dea086acad6d9fe5fe22d838b95b4e988022e8519f38d41609119ea32bfb7466
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
+post_extract() {
+	cp "${FILESDIR}/linux-9.0.2.json" bootstrap/
+}
+
 post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
@@ -24,7 +28,6 @@ post_patch() {
 }
 
 do_build() {
-	cp "${FILESDIR}/linux-9.0.2.json" bootstrap/
 	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-9.0.2.json
 }
 do_install() {

From a7320f4db2370bcbaebf5a38c9e6e814df3af103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 28 Apr 2022 17:36:17 +0200
Subject: [PATCH 1799/2561] postfix: update to 3.7.2.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 466de1f19105..a9994b1233fa 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.7.1
+version=3.7.2
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="https://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=25c3e7ec09955af873407af3070fd259da8477b80e2f4663c5fdc00a2cc947ee
+checksum=3785f76c2924a02873c0be0f0cd124a9166fc1aaf77ea2a06bd4ad795a6ed416
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From 39a11e377bc8a67db38b66cddc37a58230b37028 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 28 Apr 2022 11:54:19 +0200
Subject: [PATCH 1800/2561] sqlite: update to 3.38.3.

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index e0be13546327..17f75a5f22a0 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.2
+version=3.38.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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=e7974aa1430bad690a5e9f79a6ee5c8492ada8269dc675875ad0fb747d7cada4
+checksum=61f2dd93a2e38c33468b7125967c3218bf9f4dd8365def6025e314f905dc942e
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From 39767fdf345d82582d91c238edd376b2fd51fe92 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Apr 2022 22:44:39 +0200
Subject: [PATCH 1801/2561] curl: update to 7.83.0.

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 16a1abd02150..74358a24969d 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,6 +1,6 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.82.0
+version=7.83.0
 revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
@@ -24,7 +24,7 @@ license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=46d9a0400a33408fd992770b04a44a7434b3036f2e8089ac28b57573d59d371f
+checksum=247c7ec7521c4258e65634e529270d214fe32969971cccb72845e7aa46831f96
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssh ssl zstd"
 vopt_conflict ssl gnutls

From 414cf525401da080010cdc5eb50041d601654e17 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 29 Apr 2022 00:20:49 +0200
Subject: [PATCH 1802/2561] teams-bin: update to 1.5.00.10453.

---
 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 43a0d6e8d907..92e7fe8bd41e 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.26453
+version=1.5.00.10453
 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=ee15b57793aa6b79ccda744d5232da670335abd931bae2a020f5043a129ab859
+checksum=7cb570d9ac5231eb6e6a84738e0fb1e0345863c58fe5341b2fb2db7c5e8b15f0
 
 repository=nonfree
 restricted=yes

From 790a62011b55f8bedb446e804f49e02467607fa2 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Apr 2022 15:24:40 -0500
Subject: [PATCH 1803/2561] lazarus: update to 2.2.0.

---
 srcpkgs/lazarus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lazarus/template b/srcpkgs/lazarus/template
index 92c904cceb9a..cf12477f758d 100644
--- a/srcpkgs/lazarus/template
+++ b/srcpkgs/lazarus/template
@@ -1,9 +1,9 @@
 # Template file for 'lazarus'
 pkgname=lazarus
-version=2.0.10
+version=2.2.0
 revision=1
 # For adding a revision suffix to version on the source tarball file
-_version_revision_suffix="-2"
+_version_revision_suffix="-0"
 archs="x86_64 i686"
 wrksrc=lazarus
 hostmakedepends="fpc rsync"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0, LGPL-2.0-or-later"
 homepage="http://www.lazarus.freepascal.org"
 distfiles="${SOURCEFORGE_SITE}/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${_version_revision_suffix}.tar.gz"
-checksum=64d5626468dd24a3332b205f3abd0a581ab7de1b060a2d57e21864066cfd43b7
+checksum=b6b5d516511e3dfb34910d7656db068d4bba80f009692500aebbcae79cb12160
 nopie=yes
 lib32disabled=yes
 

From a73225da2951e5e1389269700ac2e596908bc68e Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 28 Apr 2022 17:29:34 -0500
Subject: [PATCH 1804/2561] Signal-Desktop: update to 5.41.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 448189474620..43e11503bd50 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.40.1
+version=5.41.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=d80d210554e0296d916f7e25d9a49afc58340ab03ef7a1e7ae21017e80e9de7b
+checksum=55a201912f5a41c1a76d210d3942078e734ac619df7ffb56083149ce4995e949
 nostrip_files="signal-desktop"
 
 post_extract() {

From 05268673f7f7d1b32adf0d27fc2ced8c06d78ca1 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Mon, 18 Apr 2022 13:30:56 +0200
Subject: [PATCH 1805/2561] PolyMC: update to 1.2.1.

---
 srcpkgs/PolyMC/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template
index 3b3b0deb3466..91b439b6b529 100644
--- a/srcpkgs/PolyMC/template
+++ b/srcpkgs/PolyMC/template
@@ -1,9 +1,9 @@
 # Template file for 'PolyMC'
 pkgname=PolyMC
-version=1.1.1
+version=1.2.1
 revision=1
 build_style=cmake
-configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_PORTABLE=0
+configure_args="-DLauncher_BUILD_PLATFORM=Void
  -DLauncher_VERSION_BUILD=${revision}"
 hostmakedepends="openjdk8 qt5-host-tools qt5-qmake"
 makedepends="qt5-devel"
@@ -13,7 +13,11 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-only"
 homepage="https://polymc.org/"
 distfiles="https://github.com/PolyMC/PolyMC/releases/download/${version}/PolyMC-${version}.tar.gz"
-checksum=7ade9abc3a6f61ed27a129c10084c783cc9a3266484a53e29dabcc1cbb0ba5c4
+checksum=cec7b0175bd0dc3ff2a43e822d1218772e0833332026ae681c81ecc5c51bf608
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTING=0"
+fi
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;

From 55ad9305b8d7a8a835fe3f9a56c5114e77574248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Thu, 28 Apr 2022 18:13:25 +0200
Subject: [PATCH 1806/2561] pipewire: update to 0.3.51

---
 srcpkgs/pipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 6427e0b66e77..4cf367d32675 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.50
+version=0.3.51
 revision=1
 _pms_version=0.4.1
 build_style=meson
@@ -32,7 +32,7 @@ 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
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="a4bd81e9046f0bd19ecc18402b44199c6c4c54305670e43111c7fbdfe4d17bdf
+checksum="f18e7a2cd2fcd75482c3df4e736e01435bd20779ddf63da63b0a086d3a9735ac
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

From c336303cdb3dfc32d659738ec5e0aaf68f1e45f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 28 Apr 2022 17:24:48 +0200
Subject: [PATCH 1807/2561] croc: update to 9.5.4.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 4ff52c773d40..5a4e8dcb6556 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.5.3
+version=9.5.4
 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=7f8ac260c786bc3f1e3c577e6ac3d3e27d0d8cffa90d7a8d21cec85fe6f22abc
+checksum=b89b9d1c2e27e5ca710a7c524f70361122b8b0fd374c0be18f1e7337acca7d07
 
 post_install() {
 	vlicense LICENSE

From c53cb7e3b81b1ed419ad4f3f86818bc2da6b4b7d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:15:34 -0400
Subject: [PATCH 1808/2561] New package: php8.0-8.0.18

---
 srcpkgs/php8.0-apache                         |   1 +
 srcpkgs/php8.0-cgi                            |   1 +
 srcpkgs/php8.0-devel                          |   1 +
 srcpkgs/php8.0-embed                          |   1 +
 srcpkgs/php8.0-enchant                        |   1 +
 srcpkgs/php8.0-ffi                            |   1 +
 srcpkgs/php8.0-fpm                            |   1 +
 srcpkgs/php8.0-gd                             |   1 +
 srcpkgs/php8.0-intl                           |   1 +
 srcpkgs/php8.0-ldap                           |   1 +
 srcpkgs/php8.0-mysql                          |   1 +
 srcpkgs/php8.0-odbc                           |   1 +
 srcpkgs/php8.0-pgsql                          |   1 +
 srcpkgs/php8.0-phpdbg                         |   1 +
 srcpkgs/php8.0-snmp                           |   1 +
 srcpkgs/php8.0-sodium                         |   1 +
 srcpkgs/php8.0-sqlite                         |   1 +
 srcpkgs/php8.0-tidy                           |   1 +
 srcpkgs/php8.0-xsl                            |   1 +
 srcpkgs/php8.0/files/apache.conf              |  13 +
 srcpkgs/php8.0/files/php-fpm8.0/run           |   3 +
 srcpkgs/php8.0/patches/php-706-crypt.patch    |  15 +
 srcpkgs/php8.0/patches/php-cross-config.patch |  41 +++
 srcpkgs/php8.0/patches/php-fpm.patch          |  13 +
 .../patches/php-ltmain-sysroot-support.patch  |  39 ++
 .../php8.0/patches/php-opcache-cross.patch    |  14 +
 srcpkgs/php8.0/patches/php-pear-cross.patch   |  23 ++
 srcpkgs/php8.0/patches/php-phar-cross.patch   |  29 ++
 .../patches/php-phpize-sysroot-support.patch  |  28 ++
 srcpkgs/php8.0/patches/php.ini.patch          |  24 ++
 srcpkgs/php8.0/template                       | 337 ++++++++++++++++++
 srcpkgs/php8.0/update                         |   2 +
 32 files changed, 600 insertions(+)
 create mode 120000 srcpkgs/php8.0-apache
 create mode 120000 srcpkgs/php8.0-cgi
 create mode 120000 srcpkgs/php8.0-devel
 create mode 120000 srcpkgs/php8.0-embed
 create mode 120000 srcpkgs/php8.0-enchant
 create mode 120000 srcpkgs/php8.0-ffi
 create mode 120000 srcpkgs/php8.0-fpm
 create mode 120000 srcpkgs/php8.0-gd
 create mode 120000 srcpkgs/php8.0-intl
 create mode 120000 srcpkgs/php8.0-ldap
 create mode 120000 srcpkgs/php8.0-mysql
 create mode 120000 srcpkgs/php8.0-odbc
 create mode 120000 srcpkgs/php8.0-pgsql
 create mode 120000 srcpkgs/php8.0-phpdbg
 create mode 120000 srcpkgs/php8.0-snmp
 create mode 120000 srcpkgs/php8.0-sodium
 create mode 120000 srcpkgs/php8.0-sqlite
 create mode 120000 srcpkgs/php8.0-tidy
 create mode 120000 srcpkgs/php8.0-xsl
 create mode 100644 srcpkgs/php8.0/files/apache.conf
 create mode 100755 srcpkgs/php8.0/files/php-fpm8.0/run
 create mode 100644 srcpkgs/php8.0/patches/php-706-crypt.patch
 create mode 100644 srcpkgs/php8.0/patches/php-cross-config.patch
 create mode 100644 srcpkgs/php8.0/patches/php-fpm.patch
 create mode 100644 srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch
 create mode 100644 srcpkgs/php8.0/patches/php-opcache-cross.patch
 create mode 100644 srcpkgs/php8.0/patches/php-pear-cross.patch
 create mode 100644 srcpkgs/php8.0/patches/php-phar-cross.patch
 create mode 100644 srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch
 create mode 100644 srcpkgs/php8.0/patches/php.ini.patch
 create mode 100644 srcpkgs/php8.0/template
 create mode 100644 srcpkgs/php8.0/update

diff --git a/srcpkgs/php8.0-apache b/srcpkgs/php8.0-apache
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-apache
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-cgi b/srcpkgs/php8.0-cgi
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-cgi
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-devel b/srcpkgs/php8.0-devel
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-devel
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-embed b/srcpkgs/php8.0-embed
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-embed
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-enchant b/srcpkgs/php8.0-enchant
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-enchant
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-ffi b/srcpkgs/php8.0-ffi
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-ffi
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-fpm b/srcpkgs/php8.0-fpm
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-fpm
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-gd b/srcpkgs/php8.0-gd
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-gd
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-intl b/srcpkgs/php8.0-intl
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-intl
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-ldap b/srcpkgs/php8.0-ldap
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-ldap
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-mysql b/srcpkgs/php8.0-mysql
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-mysql
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-odbc b/srcpkgs/php8.0-odbc
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-odbc
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-pgsql b/srcpkgs/php8.0-pgsql
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pgsql
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-phpdbg b/srcpkgs/php8.0-phpdbg
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-phpdbg
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-snmp b/srcpkgs/php8.0-snmp
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-snmp
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-sodium b/srcpkgs/php8.0-sodium
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-sodium
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-sqlite b/srcpkgs/php8.0-sqlite
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-sqlite
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-tidy b/srcpkgs/php8.0-tidy
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-tidy
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-xsl b/srcpkgs/php8.0-xsl
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-xsl
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/files/apache.conf b/srcpkgs/php8.0/files/apache.conf
new file mode 100644
index 000000000000..17a0ad5f6fa4
--- /dev/null
+++ b/srcpkgs/php8.0/files/apache.conf
@@ -0,0 +1,13 @@
+# Required modules: dir_module, php8.0_module
+
+<IfModule dir_module>
+	<IfModule php8.0_module>
+		DirectoryIndex index.php index.html
+		<FilesMatch "\.php$">
+			SetHandler application/x-httpd-php
+		</FilesMatch>
+		<FilesMatch "\.phps$">
+			SetHandler application/x-httpd-php-source
+		</FilesMatch>
+	</IfModule>
+</IfModule>
diff --git a/srcpkgs/php8.0/files/php-fpm8.0/run b/srcpkgs/php8.0/files/php-fpm8.0/run
new file mode 100755
index 000000000000..f1c712335ab8
--- /dev/null
+++ b/srcpkgs/php8.0/files/php-fpm8.0/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec php-fpm8.0 --nodaemonize ${OPTS}
diff --git a/srcpkgs/php8.0/patches/php-706-crypt.patch b/srcpkgs/php8.0/patches/php-706-crypt.patch
new file mode 100644
index 000000000000..254f1d2187c2
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-706-crypt.patch
@@ -0,0 +1,15 @@
+--- a/ext/standard/crypt.c	2016-04-28 14:13:00.000000000 -0400
++++ b/ext/standard/crypt.c	2016-04-28 21:45:24.340955313 -0400
+@@ -267,6 +267,12 @@
+ 	}
+ # elif defined(HAVE_CRYPT)
+ 	crypt_res = crypt(password, salt);
++	if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
++		return NULL;
++	} else {
++		result = zend_string_init(crypt_res, strlen(crypt_res), 0);
++		return result;
++	}
+ # else
+ #  error No crypt() implementation
+ # endif
diff --git a/srcpkgs/php8.0/patches/php-cross-config.patch b/srcpkgs/php8.0/patches/php-cross-config.patch
new file mode 100644
index 000000000000..24de8c58cbdd
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-cross-config.patch
@@ -0,0 +1,41 @@
+--- a/configure	2020-03-17 11:40:20.000000000 +0100
++++ b/configure	2020-04-12 19:51:57.216350534 +0200
+@@ -6374,10 +6374,12 @@ IFS="- /.
+     as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
+   fi
+ 
++  APXS_PREFIX='$(INSTALL_ROOT)'/usr
+   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+   if test -z `$APXS -q SYSCONFDIR`; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
++                       -S PREFIX='$APXS_PREFIX' \
+                        -i -n php"
+   else
+     APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+@@ -6385,6 +6387,7 @@ IFS="- /.
+                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
++                       -S PREFIX='$APXS_PREFIX' \
+                        -i -a -n php"
+   fi
+ 
+@@ -57170,7 +57173,7 @@ $as_echo_n "checking for pg_config... "
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+@@ -58821,7 +58824,7 @@ $as_echo_n "checking for pg_config... "
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.0/patches/php-fpm.patch b/srcpkgs/php8.0/patches/php-fpm.patch
new file mode 100644
index 000000000000..5e55e179f8a4
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-fpm.patch
@@ -0,0 +1,13 @@
+--- a/sapi/fpm/Makefile.frag	2017-04-15 23:58:56.965737425 +0200
++++ b/sapi/fpm/Makefile.frag	2017-04-16 00:00:57.814831649 +0200
+@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
+ 	else \
+ 		echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
+ 		$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+-		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+-		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
+ 	fi
+ 	
+ 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
diff --git a/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch
new file mode 100644
index 000000000000..bbe0a514a9e8
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch
@@ -0,0 +1,39 @@
+--- a/build/ltmain.sh	2021-09-09 15:19:14.822208365 +0200
++++ b/build/ltmain.sh	2021-09-09 15:47:55.397011151 +0200
+@@ -2375,6 +2375,13 @@ EOF
+ 	*) . ./$lib ;;
+ 	esac
+ 
++        newdependency_libs=
++        for deplib in $dependency_libs; do
++            deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
++            newdependency_libs="$newdependency_libs $deplib"
++        done
++        dependency_libs=${newdependency_libs}
++
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -5750,6 +5757,13 @@ fi\
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
++
++          newdependency_libs=
++          for deplib in $dependency_libs; do
++              deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
++              newdependency_libs="$newdependency_libs $deplib"
++          done
++
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -5767,7 +5781,7 @@ library_names='$library_names'
+ old_library='$old_library'
+ 
+ # Libraries that this one depends upon.
+-dependency_libs='$dependency_libs'
++dependency_libs='$newdependency_libs'
+ 
+ # Version information for $libname.
+ current=$current
diff --git a/srcpkgs/php8.0/patches/php-opcache-cross.patch b/srcpkgs/php8.0/patches/php-opcache-cross.patch
new file mode 100644
index 000000000000..5d8a8c5ceed5
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-opcache-cross.patch
@@ -0,0 +1,14 @@
+diff --git a/configure b/configure.new
+index 1159224b4c..29f763aa05 100755
+--- a/configure
++++ b/configure.new
+@@ -51689,7 +51689,8 @@ $as_echo "$have_shm_ipc" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5
+ $as_echo_n "checking for mmap() using MAP_ANON shared memory support... " >&6; }
+   if test "$cross_compiling" = yes; then :
+-  have_shm_mmap_anon=no
++$as_echo "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
++  have_shm_mmap_anon=yes
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
diff --git a/srcpkgs/php8.0/patches/php-pear-cross.patch b/srcpkgs/php8.0/patches/php-pear-cross.patch
new file mode 100644
index 000000000000..f9191a50a0b5
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-pear-cross.patch
@@ -0,0 +1,23 @@
+--- a/pear/Makefile.frag	2020-03-17 11:40:21.000000000 +0100
++++ b/pear/Makefile.frag	2020-04-12 22:29:31.846943414 +0200
+@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null`
+ PEAR_PREFIX = -dp a${program_prefix}
+ PEAR_SUFFIX = -ds a$(program_suffix)
+ PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
++PEAR_PHP ?= $(top_builddir)/sapi/cli/php
+ 
+ install-pear-installer: $(SAPI_CLI_PATH)
+-	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
++	@$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
+ 
+ install-pear:
+ 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
+@@ -23,7 +24,7 @@ install-pear:
+ 			elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
+ 				"$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
+ 			else \
+-				$(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
++				$(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
+ 			fi \
+ 		fi \
+ 	fi
diff --git a/srcpkgs/php8.0/patches/php-phar-cross.patch b/srcpkgs/php8.0/patches/php-phar-cross.patch
new file mode 100644
index 000000000000..1e4e627ec65b
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-phar-cross.patch
@@ -0,0 +1,29 @@
+--- a/ext/phar/Makefile.frag	2020-04-13 12:18:23.998801926 +0200
++++ b/ext/phar/Makefile.frag	2020-04-13 12:20:58.031795293 +0200
+@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p
+ 
+ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
+ 
++PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH)
++PHAR_PHP_MODULES ?= $(top_builddir)/modules
+ PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
+ PHP_PHARCMD_EXECUTABLE = ` \
+-	if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
+-		$(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
++	if test -x "$(PHAR_PHP)"; then \
++		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \
+ 		if test "x$(PHP_MODULES)" != "x"; then \
+-		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
++		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \
+ 		for i in bz2 zlib phar; do \
+ 			if test -f "$(top_builddir)/modules/$$i.la"; then \
+ 				. $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
+ 		done; \
+ 		fi; \
+ 	else \
+-		$(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
++		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \
+ 	fi;`
+ PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
+ 
diff --git a/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch
new file mode 100644
index 000000000000..76cff3f81664
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch
@@ -0,0 +1,28 @@
+--- a/scripts/phpize.m4	2020-03-17 11:40:21.000000000 +0100
++++ b/scripts/phpize.m4	2020-04-15 12:27:36.400466387 +0200
+@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir],
+   [lib],
+   [no])
+ 
++PHP_ARG_WITH([sysroot],,
++  [AS_HELP_STRING([--with-sysroot=NAME],
++    [System sysroot])],
++    [no],
++    [no])
++
+ PHP_RUNPATH_SWITCH
+ PHP_SHLIB_SUFFIX_NAMES
+ 
+@@ -58,7 +64,11 @@ dnl For BC.
+ PHP_CONFIG=$PHP_PHP_CONFIG
+ prefix=`$PHP_CONFIG --prefix 2>/dev/null`
+ phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
+-INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++if test "x$PHP_SYSROOT" = xno; then :
++	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++else
++	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"`
++fi
+ EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
+ PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
+ 
diff --git a/srcpkgs/php8.0/patches/php.ini.patch b/srcpkgs/php8.0/patches/php.ini.patch
new file mode 100644
index 000000000000..07e38a04cf4f
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php.ini.patch
@@ -0,0 +1,24 @@
+diff --git php.ini-production php.ini-production
+index 794d3e8ddb..c7acf9c883 100644
+--- a/php.ini-production
++++ b/php.ini-production
+@@ -729,7 +729,7 @@ default_charset = "UTF-8"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
++include_path = ".:/usr/share/pear"
+ ;
+ ; Windows: "\path1;\path2"
+ ;include_path = ".;c:\php\includes"
+@@ -752,9 +752,7 @@ user_dir =
+ 
+ ; Directory in which the loadable extensions (modules) reside.
+ ; http://php.net/extension-dir
+-;extension_dir = "./"
+-; On windows:
+-;extension_dir = "ext"
++extension_dir = "/usr/lib/php8.0/modules/"
+ 
+ ; Directory where the temporary files should be placed.
+ ; Defaults to the system default (see sys_get_temp_dir)
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
new file mode 100644
index 000000000000..2ddb350061f3
--- /dev/null
+++ b/srcpkgs/php8.0/template
@@ -0,0 +1,337 @@
+# Template file for 'php8.0'
+pkgname=php8.0
+version=8.0.18
+revision=1
+_php_version=8.0
+wrksrc="php-${version}"
+hostmakedepends="bison pkg-config apache-devel curl"
+makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
+ gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
+ libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
+ postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
+ libffi-devel oniguruma-devel gd-devel"
+short_desc="HTML-embedded scripting language"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://www.php.net"
+distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
+checksum=cd980f5a2f422362f8c52d314ed25140c6f472877c5442c4f3304205f54e192a
+
+fetch_cmd="curl -O"
+
+conf_files="/etc/php${_php_version}/php.ini"
+
+lib32disabled=yes
+
+if [ -n "$CROSS_BUILD" ]; then
+	# phar needs php to build
+	hostmakedepends+=" php${_php_version}"
+	CFLAGS+=" -DHAVE_LIBDL
+		 -DHAVE_DLOPEN
+		 -DHAVE_DLSYM
+		 -DHAVE_SHM_IPC
+		 -DHAVE_SHM_MMAP_ANON
+		 -DHAVE_SHM_MMAP_ZERO
+		 -DHAVE_SHM_MMAP_POSIX
+		 -DHAVE_SHM_MMAP_FILE"
+fi
+
+do_build() {
+	local _phpconfig="--srcdir=.. \
+		--config-cache \
+		--prefix=/usr \
+		--sbindir=/usr/bin \
+		--sysconfdir=/etc/php${_php_version} \
+		--localstatedir=/var \
+		--with-layout=GNU \
+		--with-config-file-path=/etc/php${_php_version} \
+		--with-config-file-scan-dir=/etc/php${_php_version}/conf.d \
+		--disable-rpath \
+		--mandir=/usr/share/man \
+		--libdir=/usr/lib/php${_php_version} \
+		--datarootdir=/usr/share/php${_php_version} \
+		--datadir=/usr/share/php${_php_version} \
+		--program-suffix=${_php_version} \
+		--includedir=/usr/include/php${_php_version} \
+		"
+
+	local _phpextensions="--enable-bcmath=shared \
+		--enable-calendar=shared \
+		--enable-exif=shared \
+		--enable-ftp=shared \
+		--enable-intl=shared \
+		--enable-mbstring \
+		--enable-opcache \
+		--enable-pcntl \
+		--enable-phar=shared \
+		--enable-posix=shared \
+		--enable-shmop=shared \
+		--enable-soap=shared \
+		--enable-sockets=shared \
+		--enable-sysvmsg=shared \
+		--enable-sysvsem=shared \
+		--enable-sysvshm=shared \
+		--enable-mysqlnd \
+		--enable-gd=shared \
+		--with-external-gd \
+		--with-ffi=shared \
+		--with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
+		--with-curl=shared \
+		--with-db4=$XBPS_CROSS_BASE/usr \
+		--with-enchant=shared,$XBPS_CROSS_BASE/usr \
+		--with-gdbm=$XBPS_CROSS_BASE/usr \
+		--with-gettext=shared \
+		--with-gmp=shared \
+		--with-iconv=shared \
+		--with-ldap=shared,$XBPS_CROSS_BASE/usr \
+		--with-ldap-sasl \
+		--with-sodium=shared \
+		--with-mhash \
+		--with-mysql-sock=/run/mysqld/mysqld.sock \
+		--with-mysqli=shared,mysqlnd \
+		--with-openssl=shared \
+		--with-external-pcre \
+		--without-pear \
+		--with-pdo-mysql=shared,mysqlnd \
+		--with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
+		--with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
+		--with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
+		--with-pgsql=shared,$XBPS_CROSS_BASE/usr \
+		--with-readline=$XBPS_CROSS_BASE/usr \
+		--with-snmp=shared,$XBPS_CROSS_BASE/usr \
+		--with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
+		--with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
+		--with-xsl=shared,$XBPS_CROSS_BASE/usr \
+		--with-tidy=shared,$XBPS_CROSS_BASE/usr \
+		--with-zip=shared \
+		--with-zlib \
+		${configure_args} \
+		"
+	if [ -n "$CROSS_BUILD" ]; then
+		local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules"
+	fi
+
+	EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
+	export EXTENSION_DIR
+	PEAR_INSTALLDIR=/usr/share/pear
+	export PEAR_INSTALLDIR
+	EXTRA_LIBS="-ldl"
+	export EXTRA_LIBS
+
+	# cgi,cli,embed,fcgi,fpm
+	mkdir -p build
+	cd build
+	ln -s ${wrksrc}/configure
+	./configure ${_phpconfig} \
+		--host=${XBPS_CROSS_TRIPLET} \
+		--enable-cgi \
+		--enable-fpm \
+		--with-fpm-user=http \
+		--with-fpm-group=http \
+		--enable-embed=shared \
+		${_phpextensions}
+	make ${makejobs} ${_make_env}
+
+	# apache
+	# reuse the previous run; this will save us a lot of time
+	cp -a ${wrksrc}/build ${wrksrc}/build-apache
+	cd ${wrksrc}/build-apache
+	./configure ${_phpconfig} \
+		--host=${XBPS_CROSS_TRIPLET} \
+		--with-apxs2 \
+		${_phpextensions}
+	make ${makejobs} ${_make_env}
+}
+
+do_install() {
+	cd ${wrksrc}/build
+	local _env="INSTALL_ROOT=${DESTDIR}"
+	if [ -n "$CROSS_BUILD" ]; then
+		_env+=" PHAR_PHP=/usr/bin/php${_php_version}"
+	fi
+	make ${_env} install-{modules,cli,build,headers,programs,pharcmd}
+
+	# install php.ini
+	vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
+	# remove static modules
+	rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
+}
+
+php8.0-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/php${_php_version}/build"
+		vmove "usr/bin/php-config${_php_version}"
+		vmove "usr/bin/phpize${_php_version}"
+		vmove "usr/share/man/man1/phpize${_php_version}.1"
+		vmove "usr/share/man/man1/php-config${_php_version}.1"
+	}
+}
+
+php8.0-phpdbg_package() {
+	short_desc+=" - interactive debugger"
+	depends="php${_php_version}-${version}_${revision}"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
+	}
+}
+
+php8.0-cgi_package() {
+	short_desc+=' - CGI and FCGI SAPI'
+	depends="php${_php_version}-${version}_${revision}"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-cgi
+	}
+}
+
+php8.0-apache_package() {
+	short_desc+=' - Apache SAPI'
+	depends="php${_php_version}-${version}_${revision}"
+	conf_files="/etc/apache/extra/php${_php_version}_module.conf"
+	pkg_install() {
+		vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
+		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"
+	}
+}
+
+php8.0-fpm_package() {
+	short_desc+=' - FastCGI Process Manager'
+	depends="php${_php_version}-${version}_${revision}"
+	conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-fpm
+		vsv "php-fpm${_php_version}"
+	}
+}
+
+php8.0-embed_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - Embed SAPI'
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi
+		mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so
+	}
+}
+
+php8.0-enchant_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - enchant module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/enchant.so"
+	}
+}
+
+php8.0-gd_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - gd module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/gd.so"
+	}
+}
+
+php8.0-intl_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - Internationalization module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/intl.so"
+	}
+}
+
+php8.0-ldap_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - LDAP module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/ldap.so"
+	}
+}
+
+php8.0-mysql_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - MySQL modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*mysql*.so"
+	}
+}
+
+php8.0-odbc_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - ODBC modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*odbc.so"
+	}
+}
+
+php8.0-pgsql_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - PostgreSQL modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*pgsql.so"
+	}
+}
+
+php8.0-snmp_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - snmp module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/snmp.so"
+	}
+}
+
+php8.0-sqlite_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - sqlite module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*sqlite*.so"
+	}
+}
+
+php8.0-tidy_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - tidy HTML module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*tidy*.so"
+	}
+}
+
+php8.0-xsl_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - XSL module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/xsl.so"
+	}
+}
+
+php8.0-sodium_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - sodium module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/sodium.so"
+	}
+}
+
+php8.0-ffi_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - FFI module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/ffi.so"
+	}
+}
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
new file mode 100644
index 000000000000..c4d9bc5958ca
--- /dev/null
+++ b/srcpkgs/php8.0/update
@@ -0,0 +1,2 @@
+pkgname=php
+ignore="8.[1-9].*"

From b8739a96f606fc67abd96151aabc6cc64d8f51dc Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:32:37 -0400
Subject: [PATCH 1809/2561] New package: php8.0-apcu-5.1.21

---
 srcpkgs/php8.0-apcu/INSTALL.msg |  3 +++
 srcpkgs/php8.0-apcu/template    | 29 +++++++++++++++++++++++++++++
 srcpkgs/php8.0-apcu/update      |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/php8.0-apcu/INSTALL.msg
 create mode 100644 srcpkgs/php8.0-apcu/template
 create mode 100644 srcpkgs/php8.0-apcu/update

diff --git a/srcpkgs/php8.0-apcu/INSTALL.msg b/srcpkgs/php8.0-apcu/INSTALL.msg
new file mode 100644
index 000000000000..9da8a70ccc2b
--- /dev/null
+++ b/srcpkgs/php8.0-apcu/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable APCu add the following line to your php.ini:
+
+	extension=apcu.so
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
new file mode 100644
index 000000000000..0409dd840ff5
--- /dev/null
+++ b/srcpkgs/php8.0-apcu/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.0-apcu'
+pkgname=php8.0-apcu
+version=5.1.21
+revision=1
+wrksrc="apcu-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.0"
+make_check_target=test
+hostmakedepends="autoconf php8.0-devel"
+makedepends="php8.0-devel pcre2-devel"
+depends="php8.0"
+short_desc="In-memory key-value store for PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/APCu"
+distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
+checksum=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+
+pre_configure() {
+	phpize8.0
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+	rm -r $DESTDIR/usr/include
+}
diff --git a/srcpkgs/php8.0-apcu/update b/srcpkgs/php8.0-apcu/update
new file mode 100644
index 000000000000..ad899519e313
--- /dev/null
+++ b/srcpkgs/php8.0-apcu/update
@@ -0,0 +1,2 @@
+site="https://pecl.php.net/package/APCu"
+pattern="apcu-\K[\d\.]*(?=\.tgz)"

From 90985ae0359257f6d075a1a9b5bfb4de2c54ddbd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:30:18 -0400
Subject: [PATCH 1810/2561] New package: php8.0-ast-1.0.16

---
 srcpkgs/php8.0-ast/INSTALL.msg |  2 ++
 srcpkgs/php8.0-ast/template    | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/php8.0-ast/INSTALL.msg
 create mode 100644 srcpkgs/php8.0-ast/template

diff --git a/srcpkgs/php8.0-ast/INSTALL.msg b/srcpkgs/php8.0-ast/INSTALL.msg
new file mode 100644
index 000000000000..0dd0b5df2d96
--- /dev/null
+++ b/srcpkgs/php8.0-ast/INSTALL.msg
@@ -0,0 +1,2 @@
+To enable the ast extension please add the following to php.ini:
+	extension=ast.so 
diff --git a/srcpkgs/php8.0-ast/template b/srcpkgs/php8.0-ast/template
new file mode 100644
index 000000000000..7f7a3bda75d2
--- /dev/null
+++ b/srcpkgs/php8.0-ast/template
@@ -0,0 +1,25 @@
+# Template file for 'php8.0-ast'
+pkgname=php8.0-ast
+version=1.0.16
+revision=1
+wrksrc="ast-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.0"
+hostmakedepends="php8.0-devel autoconf"
+makedepends="php8.0-devel"
+depends="php8.0"
+short_desc="Exposes the abstract syntax tree generated by PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/nikic/php-ast"
+distfiles="https://pecl.php.net/get/ast-${version}.tgz"
+checksum=45bda34b780c4661ce77cf65cd8a504fb56526d4b456edcc97d791c86f3879ce
+
+pre_configure() {
+	phpize8.0
+}
+
+do_install() {
+	make INSTALL_ROOT=${DESTDIR} install
+	vlicense LICENSE
+}

From fdef0d97030546738f48b5c3f85bad9217bd2331 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:29:14 -0400
Subject: [PATCH 1811/2561] New package: php8.0-igbinary-3.2.7

---
 srcpkgs/php8.0-igbinary/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/php8.0-igbinary/template

diff --git a/srcpkgs/php8.0-igbinary/template b/srcpkgs/php8.0-igbinary/template
new file mode 100644
index 000000000000..f74c6f88186c
--- /dev/null
+++ b/srcpkgs/php8.0-igbinary/template
@@ -0,0 +1,25 @@
+# Template file for 'php8.0-igbinary'
+pkgname=php8.0-igbinary
+version=3.2.7
+revision=1
+wrksrc="igbinary-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.0"
+hostmakedepends="autoconf php8.0-devel"
+makedepends="php8.0-devel"
+depends="php8.0"
+short_desc="Igbinary is a drop in replacement for the standard php serializer"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/igbinary/igbinary/"
+distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
+checksum=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+
+pre_configure() {
+	phpize8.0
+}
+
+do_install() {
+	make INSTALL_ROOT="${DESTDIR}" install
+	vlicense COPYING
+}

From acb96a19f3b4bb6434f31762d90c7ee6ff06eea8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:31:34 -0400
Subject: [PATCH 1812/2561] New package: php8.0-imagick-3.7.0

---
 srcpkgs/php8.0-imagick/INSTALL.msg            |  3 ++
 ...le-libmagick-header-file-search-path.patch | 17 +++++++++++
 srcpkgs/php8.0-imagick/template               | 29 +++++++++++++++++++
 srcpkgs/php8.0-imagick/update                 |  1 +
 4 files changed, 50 insertions(+)
 create mode 100644 srcpkgs/php8.0-imagick/INSTALL.msg
 create mode 100644 srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
 create mode 100644 srcpkgs/php8.0-imagick/template
 create mode 100644 srcpkgs/php8.0-imagick/update

diff --git a/srcpkgs/php8.0-imagick/INSTALL.msg b/srcpkgs/php8.0-imagick/INSTALL.msg
new file mode 100644
index 000000000000..00497519fcee
--- /dev/null
+++ b/srcpkgs/php8.0-imagick/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the Imagick extension add the following line to your php.ini:
+
+	extension=imagick.so
diff --git a/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
new file mode 100644
index 000000000000..16b8aaa57371
--- /dev/null
+++ b/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
@@ -0,0 +1,17 @@
+--- a/imagemagick.m4	2021-09-09 10:53:42.287881616 +0200
++++ b/imagemagick.m4	2021-09-09 11:14:47.662312430 +0200
+@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
+   
+     AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h])
+ 
++  elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
++
++    IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
++    IM_HEADER_STYLE="SEVEN"
++    AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header])
++
++    AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h])
++
+   elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
+ 
+     IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
diff --git a/srcpkgs/php8.0-imagick/template b/srcpkgs/php8.0-imagick/template
new file mode 100644
index 000000000000..9b0e0ba248c5
--- /dev/null
+++ b/srcpkgs/php8.0-imagick/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.0-imagick'
+pkgname=php8.0-imagick
+version=3.7.0
+revision=1
+wrksrc="imagick-$version"
+build_style=gnu-configure
+configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
+ --with-php-config=/usr/bin/php-config8.0"
+hostmakedepends="php8.0-devel autoconf pkg-config"
+makedepends="php8.0-devel pcre2-devel libmagick-devel"
+depends="php8.0"
+short_desc="Provides a PHP wrapper to the ImageMagick library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/imagick"
+distfiles="https://pecl.php.net/get/imagick-$version.tgz"
+checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
+
+pre_configure() {
+	phpize8.0
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+	rm -r $DESTDIR/usr/include
+}
diff --git a/srcpkgs/php8.0-imagick/update b/srcpkgs/php8.0-imagick/update
new file mode 100644
index 000000000000..fb47044a964d
--- /dev/null
+++ b/srcpkgs/php8.0-imagick/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'

From 18a0d6ef85823b1b9e224a78e53568c53759068f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:45:45 -0400
Subject: [PATCH 1813/2561] New package: composer8.0-2.3.5

---
 srcpkgs/composer8.0/files/composer8.0 |  2 ++
 srcpkgs/composer8.0/template          | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/composer8.0/files/composer8.0
 create mode 100644 srcpkgs/composer8.0/template

diff --git a/srcpkgs/composer8.0/files/composer8.0 b/srcpkgs/composer8.0/files/composer8.0
new file mode 100644
index 000000000000..2a3236b4a5ff
--- /dev/null
+++ b/srcpkgs/composer8.0/files/composer8.0
@@ -0,0 +1,2 @@
+#!/bin/sh
+php8.0 -f /usr/libexec/composer.phar8.0 "$@"
diff --git a/srcpkgs/composer8.0/template b/srcpkgs/composer8.0/template
new file mode 100644
index 000000000000..dfc9de6993bd
--- /dev/null
+++ b/srcpkgs/composer8.0/template
@@ -0,0 +1,26 @@
+# Template file for 'composer8.0'
+pkgname=composer8.0
+version=2.3.5
+revision=1
+build_style=fetch
+depends="php8.0"
+short_desc="Dependency manager for PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://getcomposer.org/"
+changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
+distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
+ https://raw.githubusercontent.com/composer/composer/main/LICENSE"
+checksum="3b3b5a899c06a46aec280727bdf50aad14334f6bc40436ea76b07b650870d8f4
+ 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
+
+do_install() {
+	vbin ${FILESDIR}/composer8.0
+
+	vinstall composer.phar 644 usr/libexec composer.phar8.0
+	vlicense LICENSE
+
+	vmkdir /etc/php8.0/conf.d
+	printf 'extension=%s\n' phar iconv openssl zip \
+		>${DESTDIR}/etc/php8.0/conf.d/composer.ini
+}

From ba14caa3b8f88b8e70260e6f0c25e65499902099 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:20:19 -0400
Subject: [PATCH 1814/2561] New package: xdebug8.0-3.1.4

---
 srcpkgs/xdebug8.0/INSTALL.msg |  1 +
 srcpkgs/xdebug8.0/template    | 29 +++++++++++++++++++++++++++++
 srcpkgs/xdebug8.0/update      |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/xdebug8.0/INSTALL.msg
 create mode 100644 srcpkgs/xdebug8.0/template
 create mode 100644 srcpkgs/xdebug8.0/update

diff --git a/srcpkgs/xdebug8.0/INSTALL.msg b/srcpkgs/xdebug8.0/INSTALL.msg
new file mode 100644
index 000000000000..04e3343216f7
--- /dev/null
+++ b/srcpkgs/xdebug8.0/INSTALL.msg
@@ -0,0 +1 @@
+You should add 'zend_extension="xdebug.so"' to php.ini
diff --git a/srcpkgs/xdebug8.0/template b/srcpkgs/xdebug8.0/template
new file mode 100644
index 000000000000..159f30cd5299
--- /dev/null
+++ b/srcpkgs/xdebug8.0/template
@@ -0,0 +1,29 @@
+# Template file for 'xdebug8.0'
+pkgname=xdebug8.0
+version=3.1.4
+revision=1
+wrksrc="xdebug-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.0"
+hostmakedepends="autoconf"
+makedepends="php8.0-devel"
+short_desc="PHP debugging extension"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.0"
+homepage="http://xdebug.org"
+changelog="https://xdebug.org/updates"
+distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
+checksum=4195926f9f6c4e802ff749bb2ca85ac50636719a72e5389e372e35ef523505f9
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" php8.0-devel"
+fi
+
+pre_configure() {
+	phpize8.0
+}
+
+do_install() {
+	make INSTALL_ROOT=${DESTDIR} install
+	vlicense LICENSE
+}
diff --git a/srcpkgs/xdebug8.0/update b/srcpkgs/xdebug8.0/update
new file mode 100644
index 000000000000..280b0bc7e3ac
--- /dev/null
+++ b/srcpkgs/xdebug8.0/update
@@ -0,0 +1,2 @@
+site="https://xdebug.org/updates"
+pattern='<dt><a name=.*></a>.*Xdebug \K[\d.]+(?=</dt>)'

From 78ebd016f1c7bbde56b0beb3e0433acf13b3157a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:13:12 -0400
Subject: [PATCH 1815/2561] New package: php8.1-8.1.5

---
 srcpkgs/php8.1-apache                         |   1 +
 srcpkgs/php8.1-cgi                            |   1 +
 srcpkgs/php8.1-devel                          |   1 +
 srcpkgs/php8.1-embed                          |   1 +
 srcpkgs/php8.1-enchant                        |   1 +
 srcpkgs/php8.1-ffi                            |   1 +
 srcpkgs/php8.1-fpm                            |   1 +
 srcpkgs/php8.1-gd                             |   1 +
 srcpkgs/php8.1-intl                           |   1 +
 srcpkgs/php8.1-ldap                           |   1 +
 srcpkgs/php8.1-mysql                          |   1 +
 srcpkgs/php8.1-odbc                           |   1 +
 srcpkgs/php8.1-pgsql                          |   1 +
 srcpkgs/php8.1-phpdbg                         |   1 +
 srcpkgs/php8.1-snmp                           |   1 +
 srcpkgs/php8.1-sodium                         |   1 +
 srcpkgs/php8.1-sqlite                         |   1 +
 srcpkgs/php8.1-tidy                           |   1 +
 srcpkgs/php8.1-xsl                            |   1 +
 srcpkgs/php8.1/files/apache.conf              |  13 +
 srcpkgs/php8.1/files/php-fpm8.1/run           |   3 +
 srcpkgs/php8.1/patches/php-706-crypt.patch    |  15 +
 srcpkgs/php8.1/patches/php-cross-config.patch |  22 ++
 srcpkgs/php8.1/patches/php-fpm.patch          |  13 +
 .../patches/php-ltmain-sysroot-support.patch  |  39 ++
 srcpkgs/php8.1/patches/php-pear-cross.patch   |  23 ++
 srcpkgs/php8.1/patches/php-phar-cross.patch   |  29 ++
 .../patches/php-phpize-sysroot-support.patch  |  28 ++
 srcpkgs/php8.1/patches/php.ini.patch          |  24 ++
 srcpkgs/php8.1/template                       | 337 ++++++++++++++++++
 srcpkgs/php8.1/update                         |   2 +
 31 files changed, 567 insertions(+)
 create mode 120000 srcpkgs/php8.1-apache
 create mode 120000 srcpkgs/php8.1-cgi
 create mode 120000 srcpkgs/php8.1-devel
 create mode 120000 srcpkgs/php8.1-embed
 create mode 120000 srcpkgs/php8.1-enchant
 create mode 120000 srcpkgs/php8.1-ffi
 create mode 120000 srcpkgs/php8.1-fpm
 create mode 120000 srcpkgs/php8.1-gd
 create mode 120000 srcpkgs/php8.1-intl
 create mode 120000 srcpkgs/php8.1-ldap
 create mode 120000 srcpkgs/php8.1-mysql
 create mode 120000 srcpkgs/php8.1-odbc
 create mode 120000 srcpkgs/php8.1-pgsql
 create mode 120000 srcpkgs/php8.1-phpdbg
 create mode 120000 srcpkgs/php8.1-snmp
 create mode 120000 srcpkgs/php8.1-sodium
 create mode 120000 srcpkgs/php8.1-sqlite
 create mode 120000 srcpkgs/php8.1-tidy
 create mode 120000 srcpkgs/php8.1-xsl
 create mode 100644 srcpkgs/php8.1/files/apache.conf
 create mode 100755 srcpkgs/php8.1/files/php-fpm8.1/run
 create mode 100644 srcpkgs/php8.1/patches/php-706-crypt.patch
 create mode 100644 srcpkgs/php8.1/patches/php-cross-config.patch
 create mode 100644 srcpkgs/php8.1/patches/php-fpm.patch
 create mode 100644 srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch
 create mode 100644 srcpkgs/php8.1/patches/php-pear-cross.patch
 create mode 100644 srcpkgs/php8.1/patches/php-phar-cross.patch
 create mode 100644 srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch
 create mode 100644 srcpkgs/php8.1/patches/php.ini.patch
 create mode 100644 srcpkgs/php8.1/template
 create mode 100644 srcpkgs/php8.1/update

diff --git a/srcpkgs/php8.1-apache b/srcpkgs/php8.1-apache
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-apache
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-cgi b/srcpkgs/php8.1-cgi
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-cgi
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-devel b/srcpkgs/php8.1-devel
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-devel
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-embed b/srcpkgs/php8.1-embed
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-embed
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-enchant b/srcpkgs/php8.1-enchant
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-enchant
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-ffi b/srcpkgs/php8.1-ffi
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-ffi
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-fpm b/srcpkgs/php8.1-fpm
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-fpm
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-gd b/srcpkgs/php8.1-gd
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-gd
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-intl b/srcpkgs/php8.1-intl
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-intl
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-ldap b/srcpkgs/php8.1-ldap
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-ldap
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-mysql b/srcpkgs/php8.1-mysql
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-mysql
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-odbc b/srcpkgs/php8.1-odbc
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-odbc
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-pgsql b/srcpkgs/php8.1-pgsql
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pgsql
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-phpdbg b/srcpkgs/php8.1-phpdbg
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-phpdbg
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-snmp b/srcpkgs/php8.1-snmp
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-snmp
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-sodium b/srcpkgs/php8.1-sodium
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-sodium
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-sqlite b/srcpkgs/php8.1-sqlite
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-sqlite
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-tidy b/srcpkgs/php8.1-tidy
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-tidy
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-xsl b/srcpkgs/php8.1-xsl
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-xsl
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/files/apache.conf b/srcpkgs/php8.1/files/apache.conf
new file mode 100644
index 000000000000..f321ec12d31b
--- /dev/null
+++ b/srcpkgs/php8.1/files/apache.conf
@@ -0,0 +1,13 @@
+# Required modules: dir_module, php8.1_module
+
+<IfModule dir_module>
+	<IfModule php8.1_module>
+		DirectoryIndex index.php index.html
+		<FilesMatch "\.php$">
+			SetHandler application/x-httpd-php
+		</FilesMatch>
+		<FilesMatch "\.phps$">
+			SetHandler application/x-httpd-php-source
+		</FilesMatch>
+	</IfModule>
+</IfModule>
diff --git a/srcpkgs/php8.1/files/php-fpm8.1/run b/srcpkgs/php8.1/files/php-fpm8.1/run
new file mode 100755
index 000000000000..5928ea5103ef
--- /dev/null
+++ b/srcpkgs/php8.1/files/php-fpm8.1/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec php-fpm8.1 --nodaemonize ${OPTS}
diff --git a/srcpkgs/php8.1/patches/php-706-crypt.patch b/srcpkgs/php8.1/patches/php-706-crypt.patch
new file mode 100644
index 000000000000..254f1d2187c2
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-706-crypt.patch
@@ -0,0 +1,15 @@
+--- a/ext/standard/crypt.c	2016-04-28 14:13:00.000000000 -0400
++++ b/ext/standard/crypt.c	2016-04-28 21:45:24.340955313 -0400
+@@ -267,6 +267,12 @@
+ 	}
+ # elif defined(HAVE_CRYPT)
+ 	crypt_res = crypt(password, salt);
++	if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
++		return NULL;
++	} else {
++		result = zend_string_init(crypt_res, strlen(crypt_res), 0);
++		return result;
++	}
+ # else
+ #  error No crypt() implementation
+ # endif
diff --git a/srcpkgs/php8.1/patches/php-cross-config.patch b/srcpkgs/php8.1/patches/php-cross-config.patch
new file mode 100644
index 000000000000..169c43f1df93
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-cross-config.patch
@@ -0,0 +1,22 @@
+diff --git a/configure b/configure
+index e4b82d1..1a8678f 100755
+--- a/configure
++++ b/configure
+@@ -62424,7 +62424,7 @@ printf %s "checking for pg_config... " >&6; }
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ printf "%s\n" "$PG_CONFIG" >&6; }
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+@@ -63948,7 +63948,7 @@ printf %s "checking for pg_config... " >&6; }
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ printf "%s\n" "$PG_CONFIG" >&6; }
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.1/patches/php-fpm.patch b/srcpkgs/php8.1/patches/php-fpm.patch
new file mode 100644
index 000000000000..5e55e179f8a4
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-fpm.patch
@@ -0,0 +1,13 @@
+--- a/sapi/fpm/Makefile.frag	2017-04-15 23:58:56.965737425 +0200
++++ b/sapi/fpm/Makefile.frag	2017-04-16 00:00:57.814831649 +0200
+@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
+ 	else \
+ 		echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
+ 		$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+-		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+-		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
+ 	fi
+ 	
+ 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
diff --git a/srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch
new file mode 100644
index 000000000000..bbe0a514a9e8
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch
@@ -0,0 +1,39 @@
+--- a/build/ltmain.sh	2021-09-09 15:19:14.822208365 +0200
++++ b/build/ltmain.sh	2021-09-09 15:47:55.397011151 +0200
+@@ -2375,6 +2375,13 @@ EOF
+ 	*) . ./$lib ;;
+ 	esac
+ 
++        newdependency_libs=
++        for deplib in $dependency_libs; do
++            deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
++            newdependency_libs="$newdependency_libs $deplib"
++        done
++        dependency_libs=${newdependency_libs}
++
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -5750,6 +5757,13 @@ fi\
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
++
++          newdependency_libs=
++          for deplib in $dependency_libs; do
++              deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
++              newdependency_libs="$newdependency_libs $deplib"
++          done
++
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -5767,7 +5781,7 @@ library_names='$library_names'
+ old_library='$old_library'
+ 
+ # Libraries that this one depends upon.
+-dependency_libs='$dependency_libs'
++dependency_libs='$newdependency_libs'
+ 
+ # Version information for $libname.
+ current=$current
diff --git a/srcpkgs/php8.1/patches/php-pear-cross.patch b/srcpkgs/php8.1/patches/php-pear-cross.patch
new file mode 100644
index 000000000000..f9191a50a0b5
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-pear-cross.patch
@@ -0,0 +1,23 @@
+--- a/pear/Makefile.frag	2020-03-17 11:40:21.000000000 +0100
++++ b/pear/Makefile.frag	2020-04-12 22:29:31.846943414 +0200
+@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null`
+ PEAR_PREFIX = -dp a${program_prefix}
+ PEAR_SUFFIX = -ds a$(program_suffix)
+ PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
++PEAR_PHP ?= $(top_builddir)/sapi/cli/php
+ 
+ install-pear-installer: $(SAPI_CLI_PATH)
+-	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
++	@$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
+ 
+ install-pear:
+ 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
+@@ -23,7 +24,7 @@ install-pear:
+ 			elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
+ 				"$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
+ 			else \
+-				$(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
++				$(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
+ 			fi \
+ 		fi \
+ 	fi
diff --git a/srcpkgs/php8.1/patches/php-phar-cross.patch b/srcpkgs/php8.1/patches/php-phar-cross.patch
new file mode 100644
index 000000000000..1e4e627ec65b
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-phar-cross.patch
@@ -0,0 +1,29 @@
+--- a/ext/phar/Makefile.frag	2020-04-13 12:18:23.998801926 +0200
++++ b/ext/phar/Makefile.frag	2020-04-13 12:20:58.031795293 +0200
+@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p
+ 
+ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
+ 
++PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH)
++PHAR_PHP_MODULES ?= $(top_builddir)/modules
+ PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
+ PHP_PHARCMD_EXECUTABLE = ` \
+-	if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
+-		$(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
++	if test -x "$(PHAR_PHP)"; then \
++		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \
+ 		if test "x$(PHP_MODULES)" != "x"; then \
+-		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
++		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \
+ 		for i in bz2 zlib phar; do \
+ 			if test -f "$(top_builddir)/modules/$$i.la"; then \
+ 				. $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
+ 		done; \
+ 		fi; \
+ 	else \
+-		$(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
++		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \
+ 	fi;`
+ PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
+ 
diff --git a/srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch
new file mode 100644
index 000000000000..76cff3f81664
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch
@@ -0,0 +1,28 @@
+--- a/scripts/phpize.m4	2020-03-17 11:40:21.000000000 +0100
++++ b/scripts/phpize.m4	2020-04-15 12:27:36.400466387 +0200
+@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir],
+   [lib],
+   [no])
+ 
++PHP_ARG_WITH([sysroot],,
++  [AS_HELP_STRING([--with-sysroot=NAME],
++    [System sysroot])],
++    [no],
++    [no])
++
+ PHP_RUNPATH_SWITCH
+ PHP_SHLIB_SUFFIX_NAMES
+ 
+@@ -58,7 +64,11 @@ dnl For BC.
+ PHP_CONFIG=$PHP_PHP_CONFIG
+ prefix=`$PHP_CONFIG --prefix 2>/dev/null`
+ phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
+-INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++if test "x$PHP_SYSROOT" = xno; then :
++	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++else
++	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"`
++fi
+ EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
+ PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
+ 
diff --git a/srcpkgs/php8.1/patches/php.ini.patch b/srcpkgs/php8.1/patches/php.ini.patch
new file mode 100644
index 000000000000..186898f63fab
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php.ini.patch
@@ -0,0 +1,24 @@
+diff --git a/php.ini-production b/php.ini-production
+index b39a960..68f14a6 100644
+--- a/php.ini-production
++++ b/php.ini-production
+@@ -737,7 +737,7 @@ default_charset = "UTF-8"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
++include_path = ".:/usr/share/pear"
+ ;
+ ; Windows: "\path1;\path2"
+ ;include_path = ".;c:\php\includes"
+@@ -760,9 +760,7 @@ user_dir =
+ 
+ ; Directory in which the loadable extensions (modules) reside.
+ ; https://php.net/extension-dir
+-;extension_dir = "./"
+-; On windows:
+-;extension_dir = "ext"
++extension_dir = "/usr/lib/php8.1/modules/"
+ 
+ ; Directory where the temporary files should be placed.
+ ; Defaults to the system default (see sys_get_temp_dir)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
new file mode 100644
index 000000000000..16da7be3f32c
--- /dev/null
+++ b/srcpkgs/php8.1/template
@@ -0,0 +1,337 @@
+# Template file for 'php8.1'
+pkgname=php8.1
+version=8.1.5
+revision=1
+_php_version=8.1
+wrksrc="php-${version}"
+hostmakedepends="bison pkg-config apache-devel curl"
+makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
+ gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
+ libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
+ postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
+ libffi-devel oniguruma-devel gd-devel"
+short_desc="HTML-embedded scripting language"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://www.php.net"
+distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
+checksum=44d637627746082395d5d3d3d6ae7d71e780b82a8d55a0228887158c4316bf11
+
+fetch_cmd="curl -O"
+
+conf_files="/etc/php${_php_version}/php.ini"
+
+lib32disabled=yes
+
+if [ -n "$CROSS_BUILD" ]; then
+	# phar needs php to build
+	hostmakedepends+=" php${_php_version}"
+	CFLAGS+=" -DHAVE_LIBDL
+		 -DHAVE_DLOPEN
+		 -DHAVE_DLSYM
+		 -DHAVE_SHM_IPC
+		 -DHAVE_SHM_MMAP_ANON
+		 -DHAVE_SHM_MMAP_ZERO
+		 -DHAVE_SHM_MMAP_POSIX
+		 -DHAVE_SHM_MMAP_FILE"
+fi
+
+do_build() {
+	local _phpconfig="--srcdir=.. \
+		--config-cache \
+		--prefix=/usr \
+		--sbindir=/usr/bin \
+		--sysconfdir=/etc/php${_php_version} \
+		--localstatedir=/var \
+		--with-layout=GNU \
+		--with-config-file-path=/etc/php${_php_version} \
+		--with-config-file-scan-dir=/etc/php${_php_version}/conf.d \
+		--disable-rpath \
+		--mandir=/usr/share/man \
+		--libdir=/usr/lib/php${_php_version} \
+		--datarootdir=/usr/share/php${_php_version} \
+		--datadir=/usr/share/php${_php_version} \
+		--program-suffix=${_php_version} \
+		--includedir=/usr/include/php${_php_version} \
+		"
+
+	local _phpextensions="--enable-bcmath=shared \
+		--enable-calendar=shared \
+		--enable-exif=shared \
+		--enable-ftp=shared \
+		--enable-intl=shared \
+		--enable-mbstring \
+		--enable-opcache \
+		--enable-pcntl \
+		--enable-phar=shared \
+		--enable-posix=shared \
+		--enable-shmop=shared \
+		--enable-soap=shared \
+		--enable-sockets=shared \
+		--enable-sysvmsg=shared \
+		--enable-sysvsem=shared \
+		--enable-sysvshm=shared \
+		--enable-mysqlnd \
+		--enable-gd=shared \
+		--with-external-gd \
+		--with-ffi=shared \
+		--with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
+		--with-curl=shared \
+		--with-db4=$XBPS_CROSS_BASE/usr \
+		--with-enchant=shared,$XBPS_CROSS_BASE/usr \
+		--with-gdbm=$XBPS_CROSS_BASE/usr \
+		--with-gettext=shared \
+		--with-gmp=shared \
+		--with-iconv=shared \
+		--with-ldap=shared,$XBPS_CROSS_BASE/usr \
+		--with-ldap-sasl \
+		--with-sodium=shared \
+		--with-mhash \
+		--with-mysql-sock=/run/mysqld/mysqld.sock \
+		--with-mysqli=shared,mysqlnd \
+		--with-openssl=shared \
+		--with-external-pcre \
+		--without-pear \
+		--with-pdo-mysql=shared,mysqlnd \
+		--with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
+		--with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
+		--with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
+		--with-pgsql=shared,$XBPS_CROSS_BASE/usr \
+		--with-readline=$XBPS_CROSS_BASE/usr \
+		--with-snmp=shared,$XBPS_CROSS_BASE/usr \
+		--with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
+		--with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
+		--with-xsl=shared,$XBPS_CROSS_BASE/usr \
+		--with-tidy=shared,$XBPS_CROSS_BASE/usr \
+		--with-zip=shared \
+		--with-zlib \
+		${configure_args} \
+		"
+	if [ -n "$CROSS_BUILD" ]; then
+		local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules"
+	fi
+
+	EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
+	export EXTENSION_DIR
+	PEAR_INSTALLDIR=/usr/share/pear
+	export PEAR_INSTALLDIR
+	EXTRA_LIBS="-ldl"
+	export EXTRA_LIBS
+
+	# cgi,cli,embed,fcgi,fpm
+	mkdir -p build
+	cd build
+	ln -s ${wrksrc}/configure
+	./configure ${_phpconfig} \
+		--host=${XBPS_CROSS_TRIPLET} \
+		--enable-cgi \
+		--enable-fpm \
+		--with-fpm-user=http \
+		--with-fpm-group=http \
+		--enable-embed=shared \
+		${_phpextensions}
+	make ${makejobs} ${_make_env}
+
+	# apache
+	# reuse the previous run; this will save us a lot of time
+	cp -a ${wrksrc}/build ${wrksrc}/build-apache
+	cd ${wrksrc}/build-apache
+	./configure ${_phpconfig} \
+		--host=${XBPS_CROSS_TRIPLET} \
+		--with-apxs2 \
+		${_phpextensions}
+	make ${makejobs} ${_make_env}
+}
+
+do_install() {
+	cd ${wrksrc}/build
+	local _env="INSTALL_ROOT=${DESTDIR}"
+	if [ -n "$CROSS_BUILD" ]; then
+		_env+=" PHAR_PHP=/usr/bin/php${_php_version}"
+	fi
+	make ${_env} install-{modules,cli,build,headers,programs,pharcmd}
+
+	# install php.ini
+	vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
+	# remove static modules
+	rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
+}
+
+php8.1-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/php${_php_version}/build"
+		vmove "usr/bin/php-config${_php_version}"
+		vmove "usr/bin/phpize${_php_version}"
+		vmove "usr/share/man/man1/phpize${_php_version}.1"
+		vmove "usr/share/man/man1/php-config${_php_version}.1"
+	}
+}
+
+php8.1-phpdbg_package() {
+	short_desc+=" - interactive debugger"
+	depends="php${_php_version}-${version}_${revision}"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
+	}
+}
+
+php8.1-cgi_package() {
+	short_desc+=' - CGI and FCGI SAPI'
+	depends="php${_php_version}-${version}_${revision}"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-cgi
+	}
+}
+
+php8.1-apache_package() {
+	short_desc+=' - Apache SAPI'
+	depends="php${_php_version}-${version}_${revision}"
+	conf_files="/etc/apache/extra/php${_php_version}_module.conf"
+	pkg_install() {
+		vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
+		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"
+	}
+}
+
+php8.1-fpm_package() {
+	short_desc+=' - FastCGI Process Manager'
+	depends="php${_php_version}-${version}_${revision}"
+	conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-fpm
+		vsv "php-fpm${_php_version}"
+	}
+}
+
+php8.1-embed_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - Embed SAPI'
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi
+		mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so
+	}
+}
+
+php8.1-enchant_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - enchant module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/enchant.so"
+	}
+}
+
+php8.1-gd_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - gd module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/gd.so"
+	}
+}
+
+php8.1-intl_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - Internationalization module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/intl.so"
+	}
+}
+
+php8.1-ldap_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - LDAP module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/ldap.so"
+	}
+}
+
+php8.1-mysql_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - MySQL modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*mysql*.so"
+	}
+}
+
+php8.1-odbc_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - ODBC modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*odbc.so"
+	}
+}
+
+php8.1-pgsql_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - PostgreSQL modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*pgsql.so"
+	}
+}
+
+php8.1-snmp_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - snmp module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/snmp.so"
+	}
+}
+
+php8.1-sqlite_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - sqlite module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*sqlite*.so"
+	}
+}
+
+php8.1-tidy_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - tidy HTML module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*tidy*.so"
+	}
+}
+
+php8.1-xsl_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - XSL module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/xsl.so"
+	}
+}
+
+php8.1-sodium_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - sodium module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/sodium.so"
+	}
+}
+
+php8.1-ffi_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - FFI module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/ffi.so"
+	}
+}
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
new file mode 100644
index 000000000000..0c2792ec963f
--- /dev/null
+++ b/srcpkgs/php8.1/update
@@ -0,0 +1,2 @@
+pkgname=php
+ignore="8.[2-9].*"

From ae0b40f2befa27717216e18d42cb4d80786e0084 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:29:51 -0400
Subject: [PATCH 1816/2561] New package: php8.1-apcu-5.1.21

---
 srcpkgs/php8.1-apcu/INSTALL.msg |  3 +++
 srcpkgs/php8.1-apcu/template    | 29 +++++++++++++++++++++++++++++
 srcpkgs/php8.1-apcu/update      |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/php8.1-apcu/INSTALL.msg
 create mode 100644 srcpkgs/php8.1-apcu/template
 create mode 100644 srcpkgs/php8.1-apcu/update

diff --git a/srcpkgs/php8.1-apcu/INSTALL.msg b/srcpkgs/php8.1-apcu/INSTALL.msg
new file mode 100644
index 000000000000..9da8a70ccc2b
--- /dev/null
+++ b/srcpkgs/php8.1-apcu/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable APCu add the following line to your php.ini:
+
+	extension=apcu.so
diff --git a/srcpkgs/php8.1-apcu/template b/srcpkgs/php8.1-apcu/template
new file mode 100644
index 000000000000..60d5ca79143d
--- /dev/null
+++ b/srcpkgs/php8.1-apcu/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.1-apcu'
+pkgname=php8.1-apcu
+version=5.1.21
+revision=1
+wrksrc="apcu-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.1"
+make_check_target=test
+hostmakedepends="autoconf php8.1-devel"
+makedepends="php8.1-devel pcre2-devel"
+depends="php8.1"
+short_desc="In-memory key-value store for PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/APCu"
+distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
+checksum=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+
+pre_configure() {
+	phpize8.1
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+	rm -r $DESTDIR/usr/include
+}
diff --git a/srcpkgs/php8.1-apcu/update b/srcpkgs/php8.1-apcu/update
new file mode 100644
index 000000000000..ad899519e313
--- /dev/null
+++ b/srcpkgs/php8.1-apcu/update
@@ -0,0 +1,2 @@
+site="https://pecl.php.net/package/APCu"
+pattern="apcu-\K[\d\.]*(?=\.tgz)"

From 95129d84cf176db2058245457a4cba43c66b4b82 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:30:37 -0400
Subject: [PATCH 1817/2561] New package: php8.1-ast-1.0.16

---
 srcpkgs/php8.1-ast/INSTALL.msg |  2 ++
 srcpkgs/php8.1-ast/template    | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/php8.1-ast/INSTALL.msg
 create mode 100644 srcpkgs/php8.1-ast/template

diff --git a/srcpkgs/php8.1-ast/INSTALL.msg b/srcpkgs/php8.1-ast/INSTALL.msg
new file mode 100644
index 000000000000..0dd0b5df2d96
--- /dev/null
+++ b/srcpkgs/php8.1-ast/INSTALL.msg
@@ -0,0 +1,2 @@
+To enable the ast extension please add the following to php.ini:
+	extension=ast.so 
diff --git a/srcpkgs/php8.1-ast/template b/srcpkgs/php8.1-ast/template
new file mode 100644
index 000000000000..549b8fcc1bce
--- /dev/null
+++ b/srcpkgs/php8.1-ast/template
@@ -0,0 +1,25 @@
+# Template file for 'php8.1-ast'
+pkgname=php8.1-ast
+version=1.0.16
+revision=1
+wrksrc="ast-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.1"
+hostmakedepends="php8.1-devel autoconf"
+makedepends="php8.1-devel"
+depends="php8.1"
+short_desc="Exposes the abstract syntax tree generated by PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/nikic/php-ast"
+distfiles="https://pecl.php.net/get/ast-${version}.tgz"
+checksum=45bda34b780c4661ce77cf65cd8a504fb56526d4b456edcc97d791c86f3879ce
+
+pre_configure() {
+	phpize8.1
+}
+
+do_install() {
+	make INSTALL_ROOT=${DESTDIR} install
+	vlicense LICENSE
+}

From 4c6d73b469e2874c4643b7ca5033a3bab858b05f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:31:06 -0400
Subject: [PATCH 1818/2561] New package: php8.1-igbinary-3.2.7

---
 srcpkgs/php8.1-igbinary/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/php8.1-igbinary/template

diff --git a/srcpkgs/php8.1-igbinary/template b/srcpkgs/php8.1-igbinary/template
new file mode 100644
index 000000000000..14fadb10e252
--- /dev/null
+++ b/srcpkgs/php8.1-igbinary/template
@@ -0,0 +1,25 @@
+# Template file for 'php8.1-igbinary'
+pkgname=php8.1-igbinary
+version=3.2.7
+revision=1
+wrksrc="igbinary-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.1"
+hostmakedepends="autoconf php8.1-devel"
+makedepends="php8.1-devel"
+depends="php8.1"
+short_desc="Igbinary is a drop in replacement for the standard php serializer"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/igbinary/igbinary/"
+distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
+checksum=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+
+pre_configure() {
+	phpize8.1
+}
+
+do_install() {
+	make INSTALL_ROOT="${DESTDIR}" install
+	vlicense COPYING
+}

From 622054bde23275a8b7eddac06cbf4cbe1faa3051 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:31:33 -0400
Subject: [PATCH 1819/2561] New package: php8.1-imagick-3.7.0

---
 srcpkgs/php8.1-imagick/INSTALL.msg            |  3 ++
 ...le-libmagick-header-file-search-path.patch | 17 +++++++++++
 srcpkgs/php8.1-imagick/template               | 29 +++++++++++++++++++
 srcpkgs/php8.1-imagick/update                 |  1 +
 4 files changed, 50 insertions(+)
 create mode 100644 srcpkgs/php8.1-imagick/INSTALL.msg
 create mode 100644 srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
 create mode 100644 srcpkgs/php8.1-imagick/template
 create mode 100644 srcpkgs/php8.1-imagick/update

diff --git a/srcpkgs/php8.1-imagick/INSTALL.msg b/srcpkgs/php8.1-imagick/INSTALL.msg
new file mode 100644
index 000000000000..00497519fcee
--- /dev/null
+++ b/srcpkgs/php8.1-imagick/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the Imagick extension add the following line to your php.ini:
+
+	extension=imagick.so
diff --git a/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
new file mode 100644
index 000000000000..16b8aaa57371
--- /dev/null
+++ b/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
@@ -0,0 +1,17 @@
+--- a/imagemagick.m4	2021-09-09 10:53:42.287881616 +0200
++++ b/imagemagick.m4	2021-09-09 11:14:47.662312430 +0200
+@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
+   
+     AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h])
+ 
++  elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
++
++    IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
++    IM_HEADER_STYLE="SEVEN"
++    AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header])
++
++    AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h])
++
+   elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
+ 
+     IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
diff --git a/srcpkgs/php8.1-imagick/template b/srcpkgs/php8.1-imagick/template
new file mode 100644
index 000000000000..6cd0c4098d69
--- /dev/null
+++ b/srcpkgs/php8.1-imagick/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.1-imagick'
+pkgname=php8.1-imagick
+version=3.7.0
+revision=1
+wrksrc="imagick-$version"
+build_style=gnu-configure
+configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
+ --with-php-config=/usr/bin/php-config8.1"
+hostmakedepends="php8.1-devel autoconf pkg-config"
+makedepends="php8.1-devel pcre2-devel libmagick-devel"
+depends="php8.1"
+short_desc="Provides a PHP wrapper to the ImageMagick library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/imagick"
+distfiles="https://pecl.php.net/get/imagick-$version.tgz"
+checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
+
+pre_configure() {
+	phpize8.1
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+	rm -r $DESTDIR/usr/include
+}
diff --git a/srcpkgs/php8.1-imagick/update b/srcpkgs/php8.1-imagick/update
new file mode 100644
index 000000000000..fb47044a964d
--- /dev/null
+++ b/srcpkgs/php8.1-imagick/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'

From 062bf7244a6968a7aa0ea3f4c083673321d53736 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:29:23 -0400
Subject: [PATCH 1820/2561] New package: composer8.1-2.3.5

---
 srcpkgs/composer8.1/files/composer8.1 |  2 ++
 srcpkgs/composer8.1/template          | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/composer8.1/files/composer8.1
 create mode 100644 srcpkgs/composer8.1/template

diff --git a/srcpkgs/composer8.1/files/composer8.1 b/srcpkgs/composer8.1/files/composer8.1
new file mode 100644
index 000000000000..a3f41b8b5578
--- /dev/null
+++ b/srcpkgs/composer8.1/files/composer8.1
@@ -0,0 +1,2 @@
+#!/bin/sh
+php8.1 -f /usr/libexec/composer.phar8.1 "$@"
diff --git a/srcpkgs/composer8.1/template b/srcpkgs/composer8.1/template
new file mode 100644
index 000000000000..9ae0765cf0d4
--- /dev/null
+++ b/srcpkgs/composer8.1/template
@@ -0,0 +1,26 @@
+# Template file for 'composer8.1'
+pkgname=composer8.1
+version=2.3.5
+revision=1
+build_style=fetch
+depends="php8.1"
+short_desc="Dependency manager for PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://getcomposer.org/"
+changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
+distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
+ https://raw.githubusercontent.com/composer/composer/main/LICENSE"
+checksum="3b3b5a899c06a46aec280727bdf50aad14334f6bc40436ea76b07b650870d8f4
+ 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
+
+do_install() {
+	vbin ${FILESDIR}/composer8.1
+
+	vinstall composer.phar 644 usr/libexec composer.phar8.1
+	vlicense LICENSE
+
+	vmkdir /etc/php8.1/conf.d
+	printf 'extension=%s\n' phar iconv openssl zip \
+		>${DESTDIR}/etc/php8.1/conf.d/composer.ini
+}

From b754d469e6672679a6474c9c9cc87beda86514fb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:31:58 -0400
Subject: [PATCH 1821/2561] New package: xdebug8.1-3.1.4

---
 srcpkgs/xdebug8.1/INSTALL.msg |  1 +
 srcpkgs/xdebug8.1/template    | 29 +++++++++++++++++++++++++++++
 srcpkgs/xdebug8.1/update      |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/xdebug8.1/INSTALL.msg
 create mode 100644 srcpkgs/xdebug8.1/template
 create mode 100644 srcpkgs/xdebug8.1/update

diff --git a/srcpkgs/xdebug8.1/INSTALL.msg b/srcpkgs/xdebug8.1/INSTALL.msg
new file mode 100644
index 000000000000..04e3343216f7
--- /dev/null
+++ b/srcpkgs/xdebug8.1/INSTALL.msg
@@ -0,0 +1 @@
+You should add 'zend_extension="xdebug.so"' to php.ini
diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
new file mode 100644
index 000000000000..62fa2b795f40
--- /dev/null
+++ b/srcpkgs/xdebug8.1/template
@@ -0,0 +1,29 @@
+# Template file for 'xdebug8.1'
+pkgname=xdebug8.1
+version=3.1.4
+revision=1
+wrksrc="xdebug-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.1"
+hostmakedepends="autoconf"
+makedepends="php8.1-devel"
+short_desc="PHP debugging extension"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.0"
+homepage="http://xdebug.org"
+changelog="https://xdebug.org/updates"
+distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
+checksum=4195926f9f6c4e802ff749bb2ca85ac50636719a72e5389e372e35ef523505f9
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" php8.1-devel"
+fi
+
+pre_configure() {
+	phpize8.1
+}
+
+do_install() {
+	make INSTALL_ROOT=${DESTDIR} install
+	vlicense LICENSE
+}
diff --git a/srcpkgs/xdebug8.1/update b/srcpkgs/xdebug8.1/update
new file mode 100644
index 000000000000..280b0bc7e3ac
--- /dev/null
+++ b/srcpkgs/xdebug8.1/update
@@ -0,0 +1,2 @@
+site="https://xdebug.org/updates"
+pattern='<dt><a name=.*></a>.*Xdebug \K[\d.]+(?=</dt>)'

From 587a412fede402a1103c364f7986a36eab817a5d Mon Sep 17 00:00:00 2001
From: PaperStork <vincent.hour.del@gmail.com>
Date: Thu, 28 Apr 2022 14:30:05 +0200
Subject: [PATCH 1822/2561] scaleway-cli: update to 2.5.1.

---
 srcpkgs/scaleway-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 89407918a7a0..caad6e99dde0 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
-version=2.4.0
+version=2.5.1
 revision=1
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/scaleway/scaleway-cli"
 distfiles="https://github.com/scaleway/scaleway-cli/archive/v${version}.tar.gz"
-checksum=7baa6d7af5602703bc9b1f54beb5a36642151cc12d6584d6ab76df8bb088365e
+checksum=af926168122c192b10a19d701f2a03a41f14897b2a6c654499203edd2aafcafe
 
 post_install() {
 	vdoc README.md README

From df7be75ce79972e10abcbe322feee4370a704cf0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Apr 2022 12:30:31 +0200
Subject: [PATCH 1823/2561] cpanminus: update to 1.7046.

---
 srcpkgs/cpanminus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpanminus/template b/srcpkgs/cpanminus/template
index 49ee16c6124a..caa1f64e9baa 100644
--- a/srcpkgs/cpanminus/template
+++ b/srcpkgs/cpanminus/template
@@ -1,6 +1,6 @@
 # Template file for 'cpanminus'
 pkgname=cpanminus
-version=1.7045
+version=1.7046
 revision=1
 wrksrc="App-${pkgname}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/App-cpanminus"
 distfiles="${CPAN_SITE}/App/App-${pkgname}-${version}.tar.gz"
-checksum=ac4e4adc23fec0ab54f088aca511f5a57d95e6c97a12a1cb98eed1fe0fe0e99c
+checksum=3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862

From a0e12bd3854a699bcb365937089a68b4639e0d12 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Apr 2022 12:39:21 +0200
Subject: [PATCH 1824/2561] xorgproto: update to 2022.1.

---
 srcpkgs/xorgproto/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index e5a9b43ba341..525ac1826589 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,16 +1,16 @@
 # Template file for 'xorgproto'
 pkgname=xorgproto
-version=2021.5
+version=2022.1
 revision=1
-build_style=gnu-configure
-configure_args="--enable-legacy"
+build_style=meson
+configure_args="-Dlegacy=true"
 hostmakedepends="xorg-util-macros"
 short_desc="Combined X.Org X11 Protocol headers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.gz"
-checksum=be6ddd6590881452fdfa170c1c9ff87209a98d36155332cbf2ccbc431add86ff
+checksum=2a399e77d98fe53e9056726a1934b62cbaa6c41d7b1f41a354911b0925363343
 replaces="bigreqsproto>=0 compositeproto>=0 damageproto>=0 dmxproto>=0 dri2proto>=0
  dri3proto>=0 fixesproto>=0 fontsproto>=0 glproto>=0 inputproto>=0 kbproto>=0 presentproto>=0
  printproto>=0 randrproto>=0 recordproto>=0 renderproto>=0 resourceproto>=0 scrnsaverproto>=0
@@ -32,11 +32,6 @@ provides="bigreqsproto-${version}_${revision} compositeproto-${version}_${revisi
  xproto-${version}_${revision} xf86bigfontproto-${version}_${revision}
  fontcacheproto-${version}_${revision}"
 
-post_configure() {
-	# man/Xprint.7 is can't be generated thus remove the rule
-	sed -i Makefile -e "s;\(miscman_DATA =\).*;\1;"
-}
-
 post_install() {
 	for license in COPYING-* ; do
 		vlicense $license

From 3ab49d24753bc1958ea65bd1f8ebeeabade78d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Wed, 27 Apr 2022 19:28:54 +0200
Subject: [PATCH 1825/2561] libopenal: update to 1.22.0, adopt

---
 srcpkgs/libopenal/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template
index c89016a3584b..a396607b7ea6 100644
--- a/srcpkgs/libopenal/template
+++ b/srcpkgs/libopenal/template
@@ -1,19 +1,19 @@
 # Template file for 'libopenal'
 pkgname=libopenal
-version=1.21.0
+version=1.22.0
 revision=1
 wrksrc="openal-soft-${version}"
 build_style=cmake
-configure_args="-DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF"
+configure_args="-DALSOFT_EXAMPLES=OFF"
 hostmakedepends="pkg-config"
 makedepends="zlib-devel alsa-lib-devel pulseaudio-devel SDL2-devel ffmpeg-devel
  jack-devel $(vopt_if sndio sndio-devel)"
 short_desc="Cross-platform 3D audio library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Sigrid Solveig Haflínudóttir <ftrvxmtrx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://openal-soft.org/"
 distfiles="http://openal-soft.org/openal-releases/openal-soft-${version}.tar.bz2"
-checksum=2916b4fc24e23b0271ce0b3468832ad8b6d8441b1830215b28cc4fee6cc89297
+checksum=ce0f9300de3de7bc737b0be2a995619446e493521d070950eea53eddd533fc9b
 
 build_options="sndio"
 build_options_default="sndio"

From 15fd10503b2108bf7bde10a10e0b0c67d479fc71 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Fri, 29 Apr 2022 13:34:34 +0100
Subject: [PATCH 1826/2561] inspircd: update to 3.13.0.

---
 srcpkgs/inspircd/INSTALL.msg |  2 +-
 srcpkgs/inspircd/template    | 26 ++++++++++----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/inspircd/INSTALL.msg b/srcpkgs/inspircd/INSTALL.msg
index 8f2d589b175c..28be2fc456b1 100644
--- a/srcpkgs/inspircd/INSTALL.msg
+++ b/srcpkgs/inspircd/INSTALL.msg
@@ -1,2 +1,2 @@
 You need to create a configuration file before running inspircd.
-Example configuration can be found at /etc/inspircd/examples/
+Example configuration can be found at /usr/share/doc/inspircd
diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 86a42adea5a4..d80ffdef2907 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,20 +1,21 @@
 # Template file for 'inspircd'
 pkgname=inspircd
-version=3.10.0
+version=3.13.0
 revision=1
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
+makedepends="gnutls-devel libmaxminddb-devel openssl-devel sqlite-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://www.inspircd.org/"
 distfiles="https://github.com/inspircd/inspircd/archive/v${version}.tar.gz"
-checksum=9bbf3581fc1a9443ef4c4595b208e5b8852483cb78b20fe3e98d225fa4538982
+checksum=0a4534114f5db1602c53ca4cfbb5ad623b9f990737d8c8f85890d8de47165729
 
 system_accounts="inspircd"
 inspircd_homedir="/var/lib/inspircd"
 make_dirs="
+ /run/inspircd     0750 ${pkgname} ${pkgname}
  /var/log/inspircd 0750 ${pkgname} ${pkgname}
  /var/lib/inspircd 0750 ${pkgname} ${pkgname}"
 
@@ -26,24 +27,17 @@ pre_configure() {
 }
 
 do_configure() {
-	./configure --enable-extras=m_ssl_openssl.cpp,m_regex_posix.cpp,m_sqlite3.cpp
 	./configure \
-		--prefix=/usr \
-		--config-dir=/etc/inspircd \
-		--log-dir=/var/log/inspircd \
-		--data-dir=/var/lib/inspircd \
-		--manual-dir=/usr/share/man/man1 \
-		--module-dir=/usr/lib/${pkgname}/modules \
-		--binary-dir=/usr/bin \
+		--enable-extras "geo_maxmind regex_posix regex_stdlib ssl_gnutls ssl_openssl sslrehashsignal sqlite3"
+	./configure \
+		--binary-dir /usr/bin \
+		--disable-auto-extras \
+		--disable-ownership \
 		--distribution-label voidlinux-${revision} \
-		--gid 0 \
-		--uid 0 \
-		--disable-interactive
+		--system
 	vsed -i 's/-ldl/& -lm/' GNUmakefile
 }
 
 post_install() {
 	vsv inspircd
-	rm ${DESTDIR}/usr/${pkgname}
-	rm ${DESTDIR}/usr/inspircd.service
 }

From 321b2ef22a8afcbc515f08d03f080296a30a6c8c Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Fri, 29 Apr 2022 11:17:11 -0500
Subject: [PATCH 1827/2561] oksh: update to 7.1

---
 srcpkgs/oksh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oksh/template b/srcpkgs/oksh/template
index d41bc21f75f3..79f73084b930 100644
--- a/srcpkgs/oksh/template
+++ b/srcpkgs/oksh/template
@@ -1,6 +1,6 @@
 # Template file for 'oksh'
 pkgname=oksh
-version=7.0
+version=7.1
 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=21d5891f38ffea3a5d1aa8c494f0a5579c93778535e0a92275b102dec3221da1
+checksum=9dc0b0578d9d64d10c834f9757ca11f526b562bc5454da64b2cb270122f52064
 register_shell="/bin/oksh"
 
 alternatives="

From 24b4c0f9542c52ebc246c6491dbc811c8445a485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 30 Apr 2022 06:39:15 +0200
Subject: [PATCH 1828/2561] you-get: update to 0.4.1602.

---
 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 c376e137b6cd..71de2bf4e560 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.1555
+version=0.4.1602
 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=99282aca720c7ee1d9ef4b63bbbd226e906ea170b789a459fafd5b0627b0b15f
+checksum=4706c06cc4b9080ea93b4f13b9a4dbebb60cfe12d191c78e17b0fa895d17708f
 
 post_install() {
 	vlicense LICENSE.txt

From 7081c61b7182276b0fcc14d0aa199dc366eec1e0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 30 Apr 2022 08:02:25 +0200
Subject: [PATCH 1829/2561] linux5.4: update to 5.4.191.

---
 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 25d8aeea2d8f..1380552916af 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.190
+version=5.4.191
 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=81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194
+checksum=288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 5495f5a7a1d797e0e9212e7435025f20b7c50895 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 30 Apr 2022 08:25:09 +0200
Subject: [PATCH 1830/2561] linux4.19: update to 4.19.240.

---
 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 a44ed5b0cd25..725d28a4a212 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.239
+version=4.19.240
 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=bf7c5dc26c9a3113e43e4d32f73228788f8f6f005b9ddba379378786bc4c593b
+checksum=72ac1fd5bdf9b1d0a6da1237692a0570028cb994e750f99992d374eb9fdd46c2
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From f7e3a5724d7f18ceeea3625ea21cc94b0f666601 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Apr 2022 16:33:34 +0200
Subject: [PATCH 1831/2561] sbcl: update to 2.2.4.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index b78c25202981..984a1f24ac07 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.2.3
+version=2.2.4
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc texinfo"
@@ -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=de7f49e1f7750fd2cd89111ef70641cc5471355f621b737392ac68aa95f37f9f
+checksum=fcdd251cbc65f7f808ed0ad77246848d1be166aa69a17f7499600184b7a57202
 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+=" 8745f9358b686819209e188a93fb8cf5b4227a3f623af20504a68d129a314256"
+	checksum+=" 33b0d3ec4e71855b3c5c564ccc0759c09b3ed7ab65e7c4d7e80c519107635851"
 	;;
 arm*)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"

From d47d2919f3b26f7f23cc9a1d6652e166d7617007 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Apr 2022 16:36:13 +0200
Subject: [PATCH 1832/2561] perl-LWP: update to 6.64.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index c3fe1fd7ac9f..a093660fbdaa 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.63
+version=6.64
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=6e6a9479affdf23d7de91b6e2e1b903669af6296840a88c41e86d18067db7f17
+checksum=48335e0992b4875bd73c6661439f3506c2c6d92b5dd601582b8dc22e767d3dae

From d398ce8dfeeb44430f1f1c266d60fb1a170ca54c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Apr 2022 16:38:20 +0200
Subject: [PATCH 1833/2561] perl-WWW-Mechanize: update to 2.07.

---
 srcpkgs/perl-WWW-Mechanize/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 6df7be5b4baf..6b2e839a781b 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.06
+version=2.07
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=d97cd31e35fd1ff7078d3f568b62e3fe3911843a64d3c2d078eebd3ff9b8b38d
+checksum=9863cedcffc6b032664992c27fe7cb4bf5f9ce89452e77dc960d1a4a3349e783

From 68dfd33e7a1e79c2f2341eedddb72089a4f3f4ce Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 30 Apr 2022 16:49:27 +0200
Subject: [PATCH 1834/2561] knot: update to 3.1.8.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index a8f43d8d92ae..13dcf355e6e6 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.7
+version=3.1.8
 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=ffb6887e238ce4c7df0cc76bb55a5093465275201ac12156a3390782dc49857b
+checksum=767e458a56277a1270b359294c3be6c63fd734884d62a045e01756a46507aa94
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From b36348bfada07567c1c43e018b3c4d4b9c77a8b7 Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Sat, 30 Apr 2022 09:17:05 +0200
Subject: [PATCH 1835/2561] loksh: Update to 7.1

---
 srcpkgs/loksh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template
index 634269418f41..da0f03e5ee22 100644
--- a/srcpkgs/loksh/template
+++ b/srcpkgs/loksh/template
@@ -1,6 +1,6 @@
 # Template file for 'loksh'
 pkgname=loksh
-version=7.0
+version=7.1
 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=413275c9a259629bbdb4ce97c610c45bc14a589f73cd51571ed82eec58e45840
+checksum=ab7d274a057b83bc64643664094031126641aa91ee440a96765279991aab6938
 register_shell="/bin/loksh"
 
 alternatives="

From 5540057be13211a3e87962aa8c918b8972cfc841 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Apr 2022 17:14:00 +0200
Subject: [PATCH 1836/2561] cwm: update to 7.1.

---
 srcpkgs/cwm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cwm/template b/srcpkgs/cwm/template
index 4dcc6e11819f..ce893dcec72e 100644
--- a/srcpkgs/cwm/template
+++ b/srcpkgs/cwm/template
@@ -1,6 +1,6 @@
 # Template file for 'cwm'
 pkgname=cwm
-version=6.7
+version=7.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config bison"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://man.openbsd.org/cwm"
 distfiles="https://github.com/leahneukirchen/cwm/archive/v${version}.tar.gz"
-checksum=fdd3d5b4fe9b1b03e1fc270d3dd5a031218589a8e40170e8438d2b9c44a35f08
+checksum=4a58c5cb4312d8d0f03ba657d7656c12d8d7c1277aeb1c05272984501597bd90
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 51ca80ea1f67bf81e215cd4615e01bcff11a4481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 30 Apr 2022 23:36:17 -0300
Subject: [PATCH 1837/2561] tree-sitter: update to 0.20.6.

post_patch update for autocfg can be removed once [1] is merged.

[1] https://github.com/tree-sitter/tree-sitter/pull/1731
---
 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 aae7b848d6ec..660cf7043a62 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.20.2
+version=0.20.6
 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/tree-sitter/archive/v${version}.tar.gz"
-checksum=2a0445f8172bbf83db005aedb4e893d394e2b7b33251badd3c94c2c5cc37c403
+checksum=4d37eaef8a402a385998ff9aca3e1043b4a3bba899bceeff27a7178e1165b9de
 make_check=no # tests require generating fixtures from remote repositories
 
 post_patch() {

From 18aee389ad88cccb3cfb1f9d36a2c655f0767548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 30 Apr 2022 23:57:06 -0300
Subject: [PATCH 1838/2561] elfutils: update to 0.187.

Update checkdepends for glibc; for musl, tests no longer compile
properly due to using error(3) functions. To avoid uncaught test
failures, add conditional so glibc with debug packages enabled results
in failures if tests error out.
---
 ...ompilation-on-platforms-without-erro.patch | 35 -------------------
 srcpkgs/elfutils/template                     | 17 ++++++---
 2 files changed, 12 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch

diff --git a/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch b/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
deleted file mode 100644
index 329baac25378..000000000000
--- a/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Wed, 10 Nov 2021 21:11:55 -0300
-Subject: [PATCH] debuginfod: fix compilation on platforms without <error.h>
-
-"system.h" only declares the error() function, so it needs to be in an
-'extern "C"' block, otherwise linking fails.
-
-Since we are here, use quotes for "system.h" header, since it's a local
-header, not a system one.
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- debuginfod/debuginfod.cxx | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
-index 521cb529..764e7b94 100644
---- a/debuginfod/debuginfod.cxx
-+++ b/debuginfod/debuginfod.cxx
-@@ -33,11 +33,11 @@
- 
- extern "C" {
- #include "printversion.h"
-+#include "system.h"
- }
- 
- #include "debuginfod.h"
- #include <dwarf.h>
--#include <system.h>
- 
- #include <argp.h>
- #ifdef __GNUC__
--- 
-2.33.1
-
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 5d37eb20eeb8..1fe41abe92d3 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,6 +1,6 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.186
+version=0.187
 revision=1
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
@@ -8,13 +8,13 @@ hostmakedepends="automake libtool pkg-config"
 _devel_depends="bzip2-devel liblzma-devel zlib-devel libzstd-devel"
 makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel
  libmicrohttpd-devel"
-checkdepends="zstd bzip2 curl rpm cpio"
+checkdepends="zstd bzip2 curl rpm cpio iproute2 procps-ng"
 short_desc="Utilities to handle ELF object files"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
-checksum=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177
+checksum=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8
 # subpackages require explicit ordering
 subpackages="debuginfod libdebuginfod libelf elfutils-devel"
 
@@ -31,8 +31,15 @@ fi
 
 do_check() {
 	# test failures also expected if building with debug disabled
-	make check ${makejobs} ||
-		msg_warn "Failure in testsuite, expected on musl systems, at least\n"
+	make check ${makejobs} || {
+		if [ "$XBPS_TARGET_LIBC" = musl ]; then
+			msg_warn "Expected testsuite failure: using musl\n"
+		elif [ -z "$XBPS_DEBUG_PKGS" ]; then
+			msg_warn "Expected testsuite failure: debug is disabled\n"
+		else
+			msg_error "Testsuite failure\n"
+		fi
+	}
 }
 
 libdebuginfod_package() {

From 9c10367c581ce74c57a3720606976cc578614747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 00:53:56 -0300
Subject: [PATCH 1839/2561] python3-md2gemini: update to 1.9.0.

---
 srcpkgs/python3-md2gemini/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-md2gemini/template b/srcpkgs/python3-md2gemini/template
index 4b4f88c7233d..6ae29b77849b 100644
--- a/srcpkgs/python3-md2gemini/template
+++ b/srcpkgs/python3-md2gemini/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-md2gemini'
 pkgname=python3-md2gemini
-version=1.8.1
-revision=2
+version=1.9.0
+revision=1
 wrksrc="md2gemini-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-mistune2 python3-cjkwrap
@@ -13,7 +13,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-3.0-only"
 homepage="https://github.com/makeworld-the-better-one/md2gemini"
 distfiles="${PYPI_SITE}/m/md2gemini/md2gemini-${version}.tar.gz"
-checksum=3ef2bd2d9e2b4968a844a2858f721348429f3a0b5976bd1c324198538103ca55
+checksum=775cee2be36aa0f4b7ea2861f2ac7d80e113f78b40a58f92192b6c73f6c84e75
 
 post_install() {
 	# remove tests directory polluting site-packages

From e77f42cc9783e62b2baf483eae9b9fd1ff4c90b8 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Sat, 23 Apr 2022 03:02:01 -0500
Subject: [PATCH 1840/2561] python3-telegram: update to 0.15.0

---
 srcpkgs/python3-telegram/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-telegram/template b/srcpkgs/python3-telegram/template
index b9eebe0fde9a..13b971bbd6b9 100644
--- a/srcpkgs/python3-telegram/template
+++ b/srcpkgs/python3-telegram/template
@@ -1,20 +1,23 @@
 # Template file for 'python3-telegram'
 pkgname=python3-telegram
-version=0.14.0
-revision=3
+version=0.15.0
+revision=1
 wrksrc=python-telegram-${version}
 build_style=python3-module
-hostmakedepends="python3"
+hostmakedepends="python3-setuptools"
 depends="libtd python3-setuptools"
+checkdepends="python3-pytest $depends"
 short_desc="Python library for building Telegram clients"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/alexander-akhmetov/python-telegram"
 distfiles="https://github.com/alexander-akhmetov/python-telegram/archive/${version}.tar.gz"
-checksum=11b0a2387bae642eb7f134fe35b9ef67b8183aa961412bcdfa86ff404beed897
+checksum=eaa9c883e9a6415590eaada88b39817247361ee2ba959526081a14f3e66ecc0b
 
 post_extract() {
-	rm -r telegram/lib
+	# mocked_resource.assert_called_once_with('telegram', 'lib/linux/libtdjson.so')
+	# AssertionError: Expected 'mock' to be called once. Called 0 times.
+	rm tests/test_tdjson.py
 }
 
 post_install() {

From a1e6ed8aadcaf67a0efbf4041a8623a2466bebe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 30 Apr 2022 06:51:47 +0200
Subject: [PATCH 1841/2561] croc: update to 9.5.5.

---
 srcpkgs/croc/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 5a4e8dcb6556..5683587f7355 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,16 +1,15 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.5.4
+version=9.5.5
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
-hostmakedepends="git"
 short_desc="Easily and securely send things from one computer to another"
 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=b89b9d1c2e27e5ca710a7c524f70361122b8b0fd374c0be18f1e7337acca7d07
+checksum=221ebf034e05ef8c06b2e2290dfb83c6f8b4b3f8a9168d6d826b87ed3c62d51a
 
 post_install() {
 	vlicense LICENSE

From b85429fef1759051986624d684505120b3fa97c1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Thu, 28 Apr 2022 01:02:44 -0400
Subject: [PATCH 1842/2561] tailscale: update to 1.24.2.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 9b6db1157ae8..d2411f209214 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.24.0
+version=1.24.2
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -13,7 +13,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=3c8fe851c440d5dbd9dba2f3242924a7d99e7df37b5ae098507a8feb3663c76f
+checksum=f1fe7770b4e372ace47c5b0ac4cbe21af95c3a6fb1828ee4f407fcfe35b7958f
 
 post_install() {
 	vlicense LICENSE

From 92197768a52a8da2c197f0e9874d5903ef495bd4 Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Sat, 30 Apr 2022 19:13:28 +0200
Subject: [PATCH 1843/2561] emptty: update to 0.8.0.

---
 srcpkgs/emptty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 2bbbbf4a11e5..9ba3fd93c742 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.7.1
+version=0.8.0
 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=1d86dc0623773d43f9ced8c699ee82c812065ba18ecf277061210392fb2ec56a
+checksum=b1c67e1661f6cde6c3d9723f6602d2ec9e7dbe8f11caf72f06102750ebd2c636
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From 2e34e6d15f405dad8ab4f56d9311c96d513d5372 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Apr 2022 17:43:45 +0300
Subject: [PATCH 1844/2561] rssguard: update to 4.2.2.

---
 srcpkgs/rssguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index 300f07694c43..9a775b634fd8 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=cmake
 configure_args="-DUSE_WEBENGINE="false""
@@ -14,7 +14,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=b404e3d8310c58ffb337bf1d2eb2c7cc10a692b00ed2666af30bd0153413cc05
+checksum=8f92257efa9321c1d511a977870c9ad053778256fd3cd8e7b1003d49c97e7af8
 
 post_install() {
 	# Install rssguard icon manually

From b1fe7c077eaf39fe9554f31f0bfb5c4108b94dd1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Apr 2022 21:13:28 +0300
Subject: [PATCH 1845/2561] Thunar: update to 4.16.11.

---
 srcpkgs/Thunar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 70631d39f65d..4656fbc6226d 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.10
+version=4.16.11
 revision=1
 wrksrc=thunar-${version}
 build_style=gnu-configure
@@ -16,9 +16,9 @@ short_desc="Thunar File Manager"
 maintainer="Ulf <void@uw.anonaddy.com>"
 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"
+changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=f105c8f5abc50c411f6218f913561ae3a485826bd0cd09503a4772d015899c92
+checksum=f47dde90b2e5e3e31920a4f57ddd3670282d0a90870a45e89148fce41b2a8a1b
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

From 83366cadee3d11818edf4763fe54323b3418a1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Thu, 28 Apr 2022 17:52:51 +0200
Subject: [PATCH 1846/2561] SDL2: update to 2.0.22, adopt

---
 srcpkgs/SDL2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index db3afefab3ce..640b57bbee14 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.20
+version=2.0.22
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -10,12 +10,12 @@ hostmakedepends="pkg-config nasm"
 makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
  libsamplerate-devel"
 short_desc="Simple DirectMedia Layer (version 2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Sigrid Solveig Haflínudóttir <ftrvxmtrx@gmail.com>"
 license="Zlib"
 homepage="https://www.libsdl.org/"
 changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
 distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06
+checksum=fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e
 
 # Package build options
 build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"

From 1475785c9324210ebee09ac85bd74e080bb49aa9 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Thu, 28 Apr 2022 02:53:19 +0300
Subject: [PATCH 1847/2561] spotify: update to 1.1.84.

---
 srcpkgs/spotify/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 32d439d290f8..0dba9c4293c0 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,8 +1,8 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.1.80
+version=1.1.84
 revision=1
-_ver="${version}.699.gc3dac750_amd64"
+_ver="${version}.716.gc5f8b819_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=19f80255b89d768969ff9d6a05d90091a30c05f65eabdd968592d47a7754b80e
+checksum=08e6b2666dc2a39624890e553a3046d05ecebe17bcc2fe930d49314b2fb812c7
 _license_checksum=4465d0bba5deb87866184b04ba76604cd93561c0dc9cd21cacdf5b0295bdae3a
 repository=nonfree
 restricted=yes

From 0bd7352cd9b4c92322c9e3726134964ccedffdc2 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 30 Apr 2022 10:38:10 +0200
Subject: [PATCH 1848/2561] apache: update to 2.4.53, adopt.

Fixes CVE-2022-23943, CVE-2022-22721, CVE-2022-22720,
CVE-2022-22719.
---
 srcpkgs/apache/patches/libressl.patch | 11 -----------
 srcpkgs/apache/template               | 15 +++++++++------
 2 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/apache/patches/libressl.patch

diff --git a/srcpkgs/apache/patches/libressl.patch b/srcpkgs/apache/patches/libressl.patch
deleted file mode 100644
index 300bd7ee1fa6..000000000000
--- a/srcpkgs/apache/patches/libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/modules/ssl/ssl_engine_init.c.orig  2018-10-30 16:25:09.084840429 +0100
-+++ b/modules/ssl/ssl_engine_init.c       2018-10-30 16:25:55.019411636 +0100
-@@ -1492,7 +1492,7 @@
-     X509_STORE_CTX *sctx;
-     X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx);
-
--#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)
-     /* For OpenSSL >=1.1.1, turn on client cert support which is
-      * otherwise turned off by default (by design).
-      * https://github.com/openssl/openssl/issues/6933 */
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 2cdb6ca2f449..812286b52f20 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,6 +1,6 @@
 # Template file for 'apache'
 pkgname=apache
-version=2.4.52
+version=2.4.53
 revision=1
 wrksrc="httpd-${version}"
 build_style=gnu-configure
@@ -19,24 +19,23 @@ configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
  --enable-dav --enable-info --enable-cgi --enable-cgid --enable-dav-fs
  --enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so
  --enable-rewrite --enable-layout=XBPS --sysconfdir=/etc/${pkgname}
- --enable-mpms-shared=all --with-pcre=${XBPS_CROSS_BASE}/usr
- --with-z=${XBPS_CROSS_BASE}/usr"
+ --enable-mpms-shared=all --with-z=${XBPS_CROSS_BASE}/usr"
 conf_files="
 	/etc/${pkgname}/extra/*.conf
 	/etc/${pkgname}/httpd.conf
 	/etc/${pkgname}/magic
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
-makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
+makedepends="zlib-devel libuuid-devel pcre2-devel nghttp2-devel
  openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="ologantr <mrphyber@protonmail.com>"
 license="Apache-2.0"
 homepage="http://httpd.apache.org/"
 changelog="http://www.apache.org/dist/httpd/CHANGES_2.4"
 distfiles="https://dlcdn.apache.org/httpd/httpd-${version}.tar.bz2"
-checksum=0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9
+checksum=d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63
 
 system_accounts="_apache"
 _apache_homedir="/srv/www/$pkgname"
@@ -63,6 +62,10 @@ pre_configure() {
 
 	cat ${FILESDIR}/xbps.layout >> config.layout
 	if [ "$CROSS_BUILD" ]; then
+		# pcre{,2}-config detection doesn't work on cross
+		# since httpd-2.4.53, manually export PCRE_CONFIG
+		# to let configure know where it is
+		export PCRE_CONFIG="${XBPS_CROSS_BASE}/usr/bin/pcre2-config"
 		configure_args+=" --with-apr=$XBPS_WRAPPERDIR/apr-1-config
 		 --with-apr-util=$XBPS_WRAPPERDIR/apu-1-config"
 	else

From c4a3914cb75bb7aabef0d5b0cd67309c913877a8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 May 2022 12:55:30 +0200
Subject: [PATCH 1849/2561] bitmap: update to 1.1.0.

---
 srcpkgs/bitmap/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bitmap/template b/srcpkgs/bitmap/template
index 95b2d1556c28..a6455eeee1b9 100644
--- a/srcpkgs/bitmap/template
+++ b/srcpkgs/bitmap/template
@@ -1,6 +1,6 @@
 # Template file for 'bitmap'
 pkgname=bitmap
-version=1.0.9
+version=1.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Bitmap editor and converter utilities for X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=e0f3afad5272d796f54c33fa1b5bd1fb3f62843a54b28c87196d06a35123e5f5
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=8e86879c2feeece3f10e189330479cf51da0dd268355d1e3ee8a8497ab833690
 conflicts="mesa-demos>0"
 
 post_install() {

From 47ae6d65dae6ee7d9c2915aea425a50bc7f07679 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 May 2022 12:57:47 +0200
Subject: [PATCH 1850/2561] libX11: update to 1.8.

---
 srcpkgs/libX11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index e47acb6ecf69..4940467c5a25 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.7.5
+version=1.8
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
-checksum=5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151
+checksum=081bf42ebab023aa92cfdb20c7af8c5ae13d13e88a5e22f90f4453ef80bbdde4
 
 do_configure() {
 	./configure ${configure_args}

From 6f43d912aaa3e039ab3015b42c82a831eb1820d9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 May 2022 13:00:08 +0200
Subject: [PATCH 1851/2561] slurm: update to 0.4.4.

---
 srcpkgs/slurm/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/slurm/template b/srcpkgs/slurm/template
index 64ade843fce4..c75b8ea1a667 100644
--- a/srcpkgs/slurm/template
+++ b/srcpkgs/slurm/template
@@ -1,22 +1,19 @@
 # Template file for 'slurm'
 pkgname=slurm
-version=0.4.3
-revision=5
+version=0.4.4
+revision=1
 wrksrc="${pkgname}-upstream-${version}"
-build_style="cmake"
+build_style="meson"
 makedepends="ncurses-devel"
 short_desc="Yet another network load monitor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/mattthias/slurm"
 distfiles="https://github.com/mattthias/slurm/archive/upstream/${version}.tar.gz"
-checksum=b960c0d215927be1d02c176e1b189321856030226c91f840284886b727d3a3ac
+checksum=2f846c9aa16f86cc0d3832c5cd1122b9d322a189f9e6acf8e9646dee12f9ac02
 
 post_patch() {
 	vsed -i '/<sys\/sysctl.h>/d' os.h
 	vsed -i 's,<net/ppp_defs.h>,<linux/ppp_defs.h>,g' os.h
 	vsed -i 's,<net/if_ppp.h>,<linux/if_ppp.h>,g' os.h
 }
-post_install() {
-	vman slurm.1
-}

From 103cc166bb976ade09f19ac9c8566c52b0ea0c45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 13:47:39 +0200
Subject: [PATCH 1852/2561] apostrophe: update to 2.6.3.

---
 srcpkgs/apostrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 54a80188bdae..ac880ca649a2 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,6 +1,6 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.6.2
+version=2.6.3
 revision=1
 wrksrc="$pkgname-v$version"
 build_style=meson
@@ -15,4 +15,4 @@ license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/World/apostrophe"
 changelog="https://gitlab.gnome.org/World/apostrophe/-/raw/main/NEWS"
 distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz"
-checksum=b06ca4593ceb21bcd7f9734e41ba3fb69f632b5ab24afcdc66500d18d242c068
+checksum=6f73c80146af0820ec705ec8b32ec64f0f323f51de6b6a4cfd4d02f0719876f3

From 48fbddca3efe79d642f9867d43e8aa8b7af6c1c4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 13:47:42 +0200
Subject: [PATCH 1853/2561] AppStream: update to 0.15.3.

---
 srcpkgs/AppStream/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index b2d920729249..d30e54263353 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,6 +1,6 @@
 # Template file for 'AppStream'
 pkgname=AppStream
-version=0.15.2
+version=0.15.3
 revision=1
 wrksrc="appstream-${version}"
 build_style=meson
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
 distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=70c95545ac2cde87c9ba4a292648ed64ed1211fb24d792b5b9e84f870a83fe9d
+checksum=349b4753c5e6d8118c8ea3883547b1fde11a8217ffd61248a181f18bdfc1670c
 conf_files="/etc/appstream.conf"
 triggers="appstream-cache"
 

From dbb8b56824b451b6f04f7045bfa56a791044c10a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:21:14 +0200
Subject: [PATCH 1854/2561] libadwaita: update to 1.1.1.

---
 srcpkgs/libadwaita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index aef0032bfb7c..9a48617f470a 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
+checksum=491169d4f6a11765328996bc088272d05c7235453bc0ee73c20dfd4bd67b401c
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 21c888f1f4ff68b638029d2c08a724f77b636052 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:22:00 +0200
Subject: [PATCH 1855/2561] lagrange: update to 1.12.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 16787f411ee0..12a3938f5212 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.12.1
+version=1.12.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=8a342d9b7e980cd6d9771d72215dd543d411721685fb60fc2202e300cb5d6483
+checksum=cef0ef9543a87d3a4cc8ad83955f9a4e62af7bef4e786642c1ab5ec85ff8b950
 
 post_install() {
 	vlicense LICENSE.md

From b273f155861c69f75913c2685e74b1030db8c752 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:33:15 +0200
Subject: [PATCH 1856/2561] python3-mypy: update to 0.950.

---
 srcpkgs/python3-mypy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index a92e1c803e48..ba0df7ee09d3 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
-version=0.942
+version=0.950
 revision=1
 wrksrc="mypy-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/python/mypy"
 distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=17e44649fec92e9f82102b48a3bf7b4a5510ad0cd22fa21a104826b5db4903e2
+checksum=1b333cfbca1762ff15808a0ef4f71b5d3eed8528b23ea1c3fb50543c867d68de
 make_check=no # needs pytest-xdist and many tests fail
 
 post_install() {

From 9596910f8631b49f6b2476a87cc5d2c3cb0dad5d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:33:12 +0200
Subject: [PATCH 1857/2561] python3-astroid: update to 2.11.3.

---
 srcpkgs/python3-astroid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index ca5db18ccc79..8b0c64e88833 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.11.2
+version=2.11.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ 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="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4a275523e2600c928ac95cda3ed7c1307dff2e6fbe24ef95ed867bda0fcaeab8
+checksum=455d18bfb08cec3bb61d273306c82cffc1de494c2ad4c67410494ebe6e192bc5

From ecc1de38e297fec87c5b0f314fce7933b9c9b843 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:23:03 +0200
Subject: [PATCH 1858/2561] pylint: update to 2.13.7.

---
 srcpkgs/pylint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 2d53ba7420f1..3a6db1a7ce36 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,6 +1,6 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.13.5
+version=2.13.7
 revision=1
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=5450fd8014baf1663fb4860b7e1dc4f4c4eb9649598a210d68e97be0973c783f
+checksum=c497a2b29e9c78322324e88b2303b388c28ed57a81601e365393ba68d976bc50
 
 post_install() {
 	# install example config and emacs files

From cfa4c59c3ea6ecbef7173e839c62bb60daf639b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:47:47 +0200
Subject: [PATCH 1859/2561] gtk4: update to 4.6.3.

---
 srcpkgs/gtk4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index ed86ad7bab4c..d26e4a18c432 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.6.2
+version=4.6.3
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -29,7 +29,7 @@ license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-6/NEWS"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=ff263af609a50eb76056653592d929459aef4819a444c436f6d52c6f63c1faec
+checksum=a57acd0e4482981700fdf86596c7413cb61ef47f75e4747fda809e8231b8d96c
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11"

From bf7c078027178022f04db6e63727cbb08aee50e8 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 10 Apr 2022 15:30:13 +0200
Subject: [PATCH 1860/2561] qpwgraph: update to 0.2.6.

---
 srcpkgs/qpwgraph/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qpwgraph/template b/srcpkgs/qpwgraph/template
index 5e83972a7062..3ecbdfb9e081 100644
--- a/srcpkgs/qpwgraph/template
+++ b/srcpkgs/qpwgraph/template
@@ -1,15 +1,15 @@
 # Template file for 'qpwgraph'
 pkgname=qpwgraph
-version=0.2.4
+version=0.2.6
 revision=1
 wrksrc="qpwgraph-v${version}"
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="alsa-lib-devel pipewire-devel qt5-devel"
+makedepends="alsa-lib-devel pipewire-devel qt5-devel qt5-svg-devel"
 short_desc="Graph manager for PipeWire"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.freedesktop.org/rncbc/qpwgraph"
 changelog="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/ChangeLog"
 distfiles="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/archive/v${version}/qpwgraph-v${version}.tar.gz"
-checksum=5e2ad77e794367e3e1e6df5214e8770135941092ffac49bbbaaf7619decb54b5
+checksum=d9f8109ef87d947948f5d61f60480968d925d7a93fcf15e7fca8c45f194e2f90

From 236db21f3adbd80b4865d278126edd85d386eb4d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1861/2561] httpstat: update to 1.1.0.

---
 srcpkgs/httpstat/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template
index c6ecf6bf23a0..ef084155b7b9 100644
--- a/srcpkgs/httpstat/template
+++ b/srcpkgs/httpstat/template
@@ -1,16 +1,16 @@
 # Template file for 'httpstat'
 pkgname=httpstat
-version=1.0.0
-revision=12
+version=1.1.0
+revision=1
 build_style=go
+go_ldflags="-X=main.version=$version"
 go_import_path="github.com/davecheney/httpstat"
-hostmakedepends="git"
 short_desc="It's like curl -v, with colours"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/davecheney/httpstat"
 distfiles="https://github.com/davecheney/httpstat/archive/v${version}.tar.gz"
-checksum=3a9e89141bb773ca5fa35b9b0ddd4832c17b317849471bacd0f1130333bbcd7b
+checksum=58260ab0a56557d0c2509ea09ee3fe54fe21a49f95d94189efdd64caec84fa67
 
 post_install() {
 	vlicense LICENSE

From c7beaf252fa17a18689b6afb816849867aca9c97 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 21:52:50 +0200
Subject: [PATCH 1862/2561] gettext: fix non-cross builds

---
 srcpkgs/gettext/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index dfb11a1f886c..2ab568366d26 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -14,7 +14,7 @@ configure_args="--disable-java --disable-native-java --disable-csharp
 # Either:
 # - Have xz in hostmakedepends; or
 # - Let gettext-devel depends on bzip2
-hostmakedepends="xz"
+hostmakedepends="xz automake libtool"
 short_desc="Internationalized Message Handling Library and tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -36,12 +36,9 @@ else
 	conflicts="gettext-libs>=0"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" automake libtool"
-	pre_configure() {
-		autoreconf -fi
-	}
-fi
+pre_configure() {
+	autoreconf -fi
+}
 
 post_install() {
 	# don't overwrite musl's header

From 299d929e57c2ea501fec98b6278e2a243968b69a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 May 2022 18:43:10 +0200
Subject: [PATCH 1863/2561] libX11: revert to to 1.7.5.

Due to upstream issue:
https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/157
---
 srcpkgs/libX11/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 4940467c5a25..a47190eca09b 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,8 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.8
-revision=1
+reverts="1.8.0_1"
+version=1.7.5
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
@@ -12,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
-checksum=081bf42ebab023aa92cfdb20c7af8c5ae13d13e88a5e22f90f4453ef80bbdde4
+checksum=5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151
 
 do_configure() {
 	./configure ${configure_args}

From b9f1c9cb1b8f6dc87bb07f3123a128fcadab6b72 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 19:09:04 +0200
Subject: [PATCH 1864/2561] libX11: fix $reverts

---
 srcpkgs/libX11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index a47190eca09b..6b81e23b0d1f 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,8 +1,8 @@
 # Template file for 'libX11'
 pkgname=libX11
-reverts="1.8.0_1"
+reverts="1.8_1"
 version=1.7.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"

From 080baea3d3703c75d4c61014be0c080853e2ced8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 27 Apr 2022 20:18:58 +0200
Subject: [PATCH 1865/2561] chromium: update to 101.0.4951.41.

Co-Authored-By: q66 <daniel@octaforge.org>

Closes https://github.com/void-linux/void-packages/pull/36887
---
 ...romium-100-SCTHashdanceMetadata-move.patch | 35 -------------
 .../patches/chromium-libxml-unbundle.patch    | 10 ++++
 .../fix-missing-cstdint-include-musl.patch    | 10 ++++
 ...ebcodecs-stop-using-AudioOpusEncoder.patch | 49 -------------------
 .../patches/xxx-ppc64le-support.patch         |  6 +--
 srcpkgs/chromium/template                     |  4 +-
 6 files changed, 25 insertions(+), 89 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
 create mode 100644 srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch
 delete mode 100644 srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch

diff --git a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
deleted file mode 100644
index 903942906c7d..000000000000
--- a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Wed, 23 Feb 2022 12:18:57 +0100
-Subject: [PATCH] GCC: explicitely move return value of SCTHashdanceMetadata::ToValue
-
-GCC rejects to do Return Value Optimization in
-SCTHashdanceMetadata::ToValue, because the copy constructor is
-deleted, and in that scenario RVO is rejected in GCC:
-    ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ‘base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const’:
-    ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ‘base::Value::Value(const base::Value&)’
-      191 |   return value;
-          |          ^~~~~
-    In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14,
-                     from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5:
-    ../../base/values.h:254:3: note: declared here
-      254 |   Value(const Value&) = delete;
-          |   ^~~~~
-
-Bug: 819294
-Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166
----
-
-diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc
-index a057e8e..365527b 100644
---- a/services/network/sct_auditing/sct_auditing_reporter.cc
-+++ b/services/network/sct_auditing/sct_auditing_reporter.cc
-@@ -188,7 +188,7 @@
-       kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id))));
-   value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd));
-   value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry));
--  return value;
-+  return std::move(value);
- }
- 
- // static
diff --git a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
new file mode 100644
index 000000000000..5699bc8f8eaf
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
@@ -0,0 +1,10 @@
+--- a/build/linux/unbundle/libxml.gn
++++ b/build/linux/unbundle/libxml.gn
+@@ -19,6 +19,7 @@ static_library("libxml_utils") {
+     ":xml_reader",
+     ":xml_writer",
+     "//base/test:test_support",
++    "//services/data_decoder:lib",
+     "//services/data_decoder:xml_parser_fuzzer_deps",
+   ]
+   sources = [
diff --git a/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch b/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch
new file mode 100644
index 000000000000..baa48c8f2a78
--- /dev/null
+++ b/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch
@@ -0,0 +1,10 @@
+--- a/net/third_party/quiche/src/http2/adapter/window_manager.h
++++ b/net/third_party/quiche/src/http2/adapter/window_manager.h
+@@ -3,6 +3,7 @@
+ 
+ #include <stddef.h>
+ 
++#include <cstdint>
+ #include <functional>
+ 
+ #include "common/platform/api/quiche_export.h"
diff --git a/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch b/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch
deleted file mode 100644
index 32957d32fa37..000000000000
--- a/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001
-From: Eugene Zemtsov <eugene@chromium.org>
-Date: Thu, 24 Feb 2022 23:17:20 +0000
-Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo
- audio encoder
-
-AudioOpusEncoder was only used here for testing. Let's not let it get
-comfortable. We'll use MF AAC encoder here when we have it. (Soon...)
-
-Bug: 1259883
-Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449
-Commit-Queue: Eugene Zemtsov <eugene@chromium.org>
-Auto-Submit: Eugene Zemtsov <eugene@chromium.org>
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#974895}
----
- media/mojo/services/gpu_mojo_media_client.cc | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc
-index 8f83a4d6cf6..40cdaff8d3a 100644
---- a/media/mojo/services/gpu_mojo_media_client.cc
-+++ b/media/mojo/services/gpu_mojo_media_client.cc
-@@ -13,7 +13,6 @@
- #include "build/chromeos_buildflags.h"
- #include "gpu/ipc/service/gpu_channel.h"
- #include "media/audio/audio_features.h"
--#include "media/audio/audio_opus_encoder.h"
- #include "media/base/audio_decoder.h"
- #include "media/base/cdm_factory.h"
- #include "media/base/media_switches.h"
-@@ -119,14 +118,7 @@ std::unique_ptr<AudioEncoder> GpuMojoMediaClient::CreateAudioEncoder(
-     scoped_refptr<base::SequencedTaskRunner> task_runner) {
-   if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder))
-     return nullptr;
--  // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on
--  // we'll create a real platform encoder here.
--  auto opus_encoder = std::make_unique<AudioOpusEncoder>();
--  auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner(
--      {base::TaskPriority::USER_BLOCKING});
--  return std::make_unique<OffloadingAudioEncoder>(std::move(opus_encoder),
--                                                  std::move(encoding_runner),
--                                                  std::move(task_runner));
-+  return nullptr;
- }
- 
- VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() {
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 0be29c1a4eec..79a1e2a17568 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -2248,12 +2248,12 @@ index 7a1b2763c..beda8da9e 100644
 --- a/third_party/crashpad/crashpad/snapshot/capture_memory.cc
 +++ b/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) {
+   for (size_t i = 0; i < std::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) {
++  for (size_t i = 0; i < std::size(context.ppc64->regs); ++i) {
 +    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
 +  }
  #else
@@ -3527,7 +3527,7 @@ index ec3e56964..4cf8999a2 100644
 -    return buffer.str();
 +
 +    std::string ret(buffer.str());
-+    if (signbit(value) && ret[0] == '.') {
++    if (std::signbit(value) && ret[0] == '.') {
 +        ret[0] = '-';
 +    }
 +    return ret;
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index f655d29f3ba0..0dce8772fdb8 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=100.0.4896.127
+version=101.0.4951.41
 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="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d
+checksum=099863882e88b9a035fcb6b63dd5288554f6b27558e0ebce93e0d804465efa37
 
 lib32disabled=yes
 

From 4b2da33f92daf013acdf1c1457ee2e5cb9f1619e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 19 Apr 2022 16:42:30 +0200
Subject: [PATCH 1866/2561] homebank: update to 5.5.5.

---
 srcpkgs/homebank/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 57eca4181c43..84f52ed2fa7a 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.4
+version=5.5.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=0d0669bca099340ae5c213ea13cb2b93283bfc8a0e4cf7a5902c1829366e5765
+checksum=bece05ecb52392147424aa1e5a179389777b82bf468abebd73eb70b2af9c9e67
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From 81db43f8a3f960a2b22fe33988a8d7702b575e22 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Mon, 2 May 2022 15:35:51 +0200
Subject: [PATCH 1867/2561] base-files: add alacritty to DIR_COLORS.256color

---
 srcpkgs/base-files/files/DIR_COLORS.256color | 1 +
 srcpkgs/base-files/template                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/base-files/files/DIR_COLORS.256color b/srcpkgs/base-files/files/DIR_COLORS.256color
index 34fbe33a8712..0e96e50eab58 100644
--- a/srcpkgs/base-files/files/DIR_COLORS.256color
+++ b/srcpkgs/base-files/files/DIR_COLORS.256color
@@ -20,6 +20,7 @@ COLOR tty
 OPTIONS -F -T 0
 
 # Below, there should be one TERM entry for each termtype that is colorizable
+TERM alacritty
 TERM putty-256color
 TERM rxvt-256color
 TERM screen-256color
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index bf7b7ef242b0..2249d002f3f9 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.142
-revision=12
+revision=13
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"

From 49bf1198573518d87a9b48adf2ad74449b7719ea Mon Sep 17 00:00:00 2001
From: Brihadeesh S <brihadeesh.santharam@gmail.com>
Date: Mon, 2 May 2022 12:15:26 +0530
Subject: [PATCH 1868/2561] e16: update to 1.0.24.

e16: update to 1.0.24
---
 srcpkgs/e16/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/e16/template b/srcpkgs/e16/template
index 246087e36b57..30a4bc9b281e 100644
--- a/srcpkgs/e16/template
+++ b/srcpkgs/e16/template
@@ -1,6 +1,6 @@
 # Template file for 'e16'
 pkgname=e16
-version=1.0.23
+version=1.0.24
 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=5b441bebf0c733e724ebe753f0c74aa632d0fead2bced67a3a7e988dc5de3336
+checksum=e5309b1a77595a5fe9c29231bf91057093b0b96eb592d2d6805fb6e556a2735a
 
 post_install() {
 	# install gnome and kde session scripts

From 8489dbceacaa5f82c7b3b7fbd4107f2b268eb0fa Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 1 May 2022 11:00:38 -0400
Subject: [PATCH 1869/2561] chezmoi: update to 2.15.2, cleanup.

remove unnecessary variable, make more reproducible.
---
 srcpkgs/chezmoi/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index bacfc8c9b294..531370c90298 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,20 +1,25 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.15.1
+version=2.15.2
 revision=1
 build_style=go
 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.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps"
+go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.builtBy=xbps"
 short_desc="Manage your dotfiles across multiple machines, securely"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0100dcf8b70774595f56859e5d1b635319ba584ad7b280946352be328f36d679
+checksum=c06c62feeaa95d735191db19fb9f4ef473b7144e01004e789b03d9a3c9c5b4b6
 
-export CGO_ENABLED=1
+pre_build() {
+	local _date
+	if [ "$SOURCE_DATE_EPOCH" ]; then
+		_date="$(date --utc --date "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d")"
+		go_ldflags+=" -X main.date=${_date}"
+	fi
+}
 
 post_install() {
 	vlicense LICENSE

From 45369687efdda99012c25f24989e7746766f3666 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 2 May 2022 13:05:10 -0400
Subject: [PATCH 1870/2561] nano: update to 6.3.

---
 srcpkgs/nano/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index c168a9b2b9cf..6efd3dcd6d1e 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,6 +1,6 @@
 # Template file for 'nano'
 pkgname=nano
-version=6.2
+version=6.3
 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=2bca1804bead6aaf4ad791f756e4749bb55ed860eec105a97fba864bc6a77cb3
+checksum=eb532da4985672730b500f685dbaab885a466d08fbbf7415832b95805e6f8687
 
 post_install() {
 	vsconf syntax/nanorc.nanorc

From 02d8fc31b4ec282a65a7bdbe7540f200f692f535 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 25 Apr 2022 16:22:44 +0530
Subject: [PATCH 1871/2561] spotify-adblock: update to 1.0.2

---
 srcpkgs/spotify-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
index 8d64a84df72f..ee363eab2c70 100644
--- a/srcpkgs/spotify-adblock/template
+++ b/srcpkgs/spotify-adblock/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-adblock'
 pkgname=spotify-adblock
-version=1.0.1
+version=1.0.2
 revision=1
 build_style=cargo
 conf_files="/etc/spotify-adblock/config.toml"
@@ -9,7 +9,7 @@ maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/abba23/spotify-adblock"
 distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${version}.tar.gz"
-checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360
+checksum=a0b5124573b95548e2f5ae36fc74fdab4fab9282d755affba754641e561aeac6
 
 pre_install() {
 	{ sed -n '/<summary>Debian/q'

From 0a3d92a6d73caa3b742b91739535151eabe4bd18 Mon Sep 17 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, 3 May 2022 11:24:20 +0700
Subject: [PATCH 1872/2561] tzutils: update to 2022a.

---
 srcpkgs/tzutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 814693a3a56f..d0d6cf99dd95 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,6 +1,6 @@
 # Template file for 'tzutils'
 pkgname=tzutils
-version=2021e
+version=2022a
 revision=1
 bootstrap=yes
 wrksrc="tz-${version}"
@@ -9,7 +9,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="Public Domain, BSD-3-Clause"
 homepage="https://www.iana.org/time-zones"
 distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz"
-checksum=11908a7f18530ca3013c8458d902a54cdd3382276bdd56891db074b1af4a26b8
+checksum=e9d82a851a15bb5db2cbaae2c3fc633743ad9edc069e3738c5e8908978064ed8
 
 do_build() {
 	echo "$version" >version

From 0e2e959548a432eef44d5cf2ec56ac5864ed54c4 Mon Sep 17 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, 3 May 2022 11:24:16 +0700
Subject: [PATCH 1873/2561] tzdata: update to 2022a.

---
 srcpkgs/tzdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 576f199552d3..fe7ca90f5ac8 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -1,6 +1,6 @@
 # Template file for 'tzdata'
 pkgname=tzdata
-version=2021e
+version=2022a
 revision=1
 bootstrap=yes
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 homepage="http://www.iana.org/time-zones"
 distfiles="http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"
-checksum=07ec42b737d0d3c6be9c337f8abb5f00554a0f9cc4fcf01a703d69403b6bb2b1
+checksum=ef7fffd9f4f50f4f58328b35022a32a5a056b245c5cb3d6791dddb342f871664
 
 do_install() {
 	local timezones="africa antarctica asia australasia europe northamerica \

From 8db5fd087cf3100f8dc6803c6640e17409843316 Mon Sep 17 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, 3 May 2022 11:23:38 +0700
Subject: [PATCH 1874/2561] nss: update to 3.78.

---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 5cc04daf52c2..31d1b847a9d1 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.77
+version=3.78
 revision=1
 hostmakedepends="perl which"
 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=825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd
+checksum=f455f341e787c1167328e80a84f77b9a557d595066dda6486a1874d72da68800
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 6938acf5559a1e99d6fe010c171290897bd998e7 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <aldridge.mac@gmail.com>
Date: Tue, 3 May 2022 02:06:10 -0500
Subject: [PATCH 1875/2561] goreleaser: update to 1.8.3.

---
 srcpkgs/goreleaser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index cdeae7a06171..2062a8d28d04 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,6 +1,6 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
-version=1.2.5
+version=1.8.3
 revision=1
 build_style=go
 go_import_path=github.com/goreleaser/goreleaser
@@ -9,7 +9,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://goreleaser.com/"
 distfiles="https://github.com/goreleaser/goreleaser/archive/refs/tags/v$version.tar.gz"
-checksum=f6ad356f4b53a3e4742bb429c636b974f04aab8d5d12f5fc6919526c83665d1a
+checksum=3ac091dacf81357a83b5c8bf17bbcb325371111b88bc59fa79c8354be2273145
 
 post_install() {
 	vlicense LICENSE.md

From bd4fe0baf46a0f001689712b80fe9320d21b05b8 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <aldridge.mac@gmail.com>
Date: Tue, 3 May 2022 02:09:01 -0500
Subject: [PATCH 1876/2561] xlunch: update to 4.7.3.

---
 srcpkgs/xlunch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template
index 36c568aafa8f..c3e9ed018c47 100644
--- a/srcpkgs/xlunch/template
+++ b/srcpkgs/xlunch/template
@@ -1,6 +1,6 @@
 # Template file for 'xlunch'
 pkgname=xlunch
-version=4.7.1
+version=4.7.3
 revision=1
 build_style=gnu-makefile
 make_build_target=xlunch
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://xlunch.org/"
 distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz"
-checksum=9ee401638fde606539bb36e7754af83d5827e4764d4e8fcbe95f25d19338bf33
+checksum=9bc03634e8889f47d5727a8f3f49462cebc2c3576337593ffd9832801ea63e6c
 
 do_install() {
 	vbin xlunch

From 56183724e96c2de65eecd58110caf71ed7a26eea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 30 Apr 2022 09:49:24 -0400
Subject: [PATCH 1877/2561] maturin: update to 0.12.14.

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 64140c2f5fe7..4bb299175cae 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.12
+version=0.12.14
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="0da8b649dc91278363d6a07fee26ea53b8f2d9cd06139034dea3a5506baf12a0
+checksum="4b45ef2f5a63d7dde7700556f60d82222c7ccba64cea70950f909b06e8355249
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From 7fffb535506b7c3b79fc562553872bb482947bb0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:04:13 -0400
Subject: [PATCH 1878/2561] python3-Pygments: update to 2.12.0.

---
 srcpkgs/python3-Pygments/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index 5ac883fda323..89335f3d551a 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.11.2
+version=2.12.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a
+checksum=5eb116118f9612ff1ee89ac96437bb6b49e8f04d8a13b514ba26f620208e26eb
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 post_install() {

From 15222637164ceee51646ba2bf10b1d31e6ccb260 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:04:32 -0400
Subject: [PATCH 1879/2561] python3-cryptography_vectors: update to 37.0.1.

---
 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 c31863f52ad7..4576117879de 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=36.0.2
+version=37.0.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -11,7 +11,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=2a7924449a03025faf7f8754a6f4200001cab210734a6ce6ac1f6bdacd3a68e4
+checksum=66c9a714232be730fe822bd7e4e9da6231ff9e537ee4feb0f092c06b8ea4d94a
 
 post_install() {
 	vlicense LICENSE

From fe716c3fa793393f7d664a22f5b5f71706cf8f00 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:21:03 -0400
Subject: [PATCH 1880/2561] python3-cryptography: update to 37.0.1.

---
 srcpkgs/python3-cryptography/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 278446d27efb..12fd50551a13 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=36.0.2
+version=37.0.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
+make_check_args="--ignore tests/bench/test_x509.py"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
 makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
@@ -16,7 +17,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=70f8f4f7bb2ac9f340655cbac89d68c527af5bb4387522a8413e841e3e6628c9
+checksum=d610d0ee14dd9109006215c7c0de15eee91230b70a9bce2263461cf7c3720b83
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"
@@ -24,6 +25,10 @@ if [ "$CROSS_BUILD" ]; then
 	export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
 fi
 
+pre_check() {
+	vsed -i '/addopts/d' pyproject.toml
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.BSD

From 6d0cd81b25c7d5d85e96301cd57ea375fe8c4c4e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:22:16 -0400
Subject: [PATCH 1881/2561] python3-imageio: update to 2.19.0.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index a5167cbc45e8..17b159983528 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.17.0
+version=2.19.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=34173213c7e90096743bf077d888dd1c0300e8ebfad8184ee24a968cc860af5c
+checksum=df6f0f80b7e7dbad66e80d223ecfdcb6285c800716251aabc49fcf756b516168
 
 post_install() {
 	vlicense LICENSE

From fe98419be05faca4a793397c6583ddc5d40a683f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:30:04 -0400
Subject: [PATCH 1882/2561] python3-hypothesis: update to 6.46.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 fd24d4f52491..f4017b40bb79 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.43.0
+version=6.46.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=57e04ecd3fb433604a17dbcf535947734f98bcced562a71c67513d98919d1d3b
+checksum=47a115c01f40afa137747b3ddd8c2d7394be86da1318222eeecc66c227b49d38
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 400ad5219e2c5d9a5006bdc3f6f8cad2111126f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:32:00 -0400
Subject: [PATCH 1883/2561] python3-ipython: update to 8.3.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 dfaae66b583d..99b847586a12 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.2.0
+version=8.3.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=70e5eb132cac594a34b5f799bd252589009905f05104728aea6a403ec2519dc1
+checksum=807ae3cf43b84693c9272f70368440a9a7eaa2e7e6882dad943c32fbf7e51402
 conflicts="python-ipython<=5.8.0_2"
 
 do_check() {

From abfcec13b7141f710ca456870133510fdb428e43 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:32:21 -0400
Subject: [PATCH 1884/2561] python3-pytools: update to 2022.1.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 6a57301a4d61..1367b8ec31b1 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.4
+version=2022.1.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=ae25f7c9b196fcd0d15e53bfe05236fe7bc5efd923810fbaeeee1a4bc4b6764a
+checksum=9271dc8a65da02fa3fe342e2be7979b2d10f792f3b54fb115e51bf10386eb770
 
 post_install() {
 	vlicense LICENSE

From b9c59f981fbfe79be826bae09813e5ccec3ff5b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:32:35 -0400
Subject: [PATCH 1885/2561] python3-setuptools-rust: update to 1.3.0.

---
 srcpkgs/python3-setuptools-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index c2a506773cae..19b7dea26647 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools-rust'
 pkgname=python3-setuptools-rust
-version=1.2.0
+version=1.3.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/PyO3/setuptools-rust"
 changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=0a4ada479e8c7e3d8bd7cb56e1a29acc2b2bb98c2325051b0cdcb57d7f056de8
+checksum=958c5bf4ab6483d59dab888538121871cc5006354a42fb0fbd50acf03caad1de
 # Tests have unpackaged dependencies
 make_check=no
 

From 9fcd2403c690d7c2c6a47e560c37882ffc7f573f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:32:47 -0400
Subject: [PATCH 1886/2561] python3-tifffile: update to 2022.4.28.

---
 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 b8fb29af1782..a34273322530 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.4.8
+version=2022.4.28
 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=f4dafa604c949ebedc60a0fd41be0048399fea72b529efcff6330a29590ee5f6
+checksum=5ee740afa64bfc8da5b1e7badc5d4e20766f7631adb48792e5ee72978ba0fcff
 # Tests require unpackaged fsspec
 make_check=no
 

From 81319ca9c8089a58786e0d7b7f8c45a98d1b9464 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:43:00 -0400
Subject: [PATCH 1887/2561] xpra: update to 4.3.3.

---
 srcpkgs/xpra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 5bc9ea89fdff..d9485ca78e2f 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.3.2
+version=4.3.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=1e548b8d20c243fba40692abb0aa2759e3bd3f2d3b6b51a160f82746cdf1d782
+checksum=06009ea2cd41b3ffaab51b01e29bb4d9e635ead795d378575f5379e5cb166a83
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From 21b86f3165f0c9a0d4ac56668eb042966660bd30 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 3 May 2022 08:09:38 -0400
Subject: [PATCH 1888/2561] python3-matplotlib: update to 3.5.2.

---
 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 b4b1852b2e58..e4e03bc540ba 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.5.1
+version=3.5.2
 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=9683da9a0c84d1c42d1bf92ecf6e012d302406a38fd987e3dfbcb7b58b2eea2d
+checksum=c81325d1b0d822ef75fd71d243f98478cdca1f800a838a2a1bc8e4e17b8df93c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From 70a08af4f56b8fe9a92d83d95cbece1311d0fb16 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 3 May 2022 08:45:00 +0200
Subject: [PATCH 1889/2561] kmonad: correct version to 0.4.1.20220321.

Fixes: 78955200f6 ("kmonad: update to 65b501defdd0049563752f8af8c8c57f5a1ae38b")
---
 srcpkgs/kmonad/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 829d96a535eb..bddd3b33b893 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,14 +1,17 @@
 # Template file for 'kmonad'
 pkgname=kmonad
-version=65b501defdd0049563752f8af8c8c57f5a1ae38b
+reverts="65b501defdd0049563752f8af8c8c57f5a1ae38b_1"
+_githash=65b501defdd0049563752f8af8c8c57f5a1ae38b
+version=0.4.1.20220321
 revision=1
+wrksrc="${pkgname}-${_githash}"
 build_style=haskell-stack
 stackage=lts-19.0
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"
 homepage="https://github.com/david-janssen/kmonad"
-distfiles="${homepage}/archive/${version}.tar.gz"
+distfiles="${homepage}/archive/${_githash}.tar.gz"
 checksum=2b0cb0c5d1575bf61b1c442476ad24103028c309d103fedb56214a3bb30f8c0f
 nopie_files="/usr/bin/kmonad"
 nocross=yes

From 623115405c7ddbe3028262a38b91d2be22b341f9 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 28 Apr 2022 15:44:54 -0400
Subject: [PATCH 1890/2561] python3-trimesh: update to 3.11.2.

---
 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 0a162818e7cb..3bd4a284eca9 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.10.8
+version=3.11.2
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -16,7 +16,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=465d30b17e1f62c467283422eb932b70ff4807f9346f3012195ac94675c837f3
+checksum=bee21e9aa5b6c98f46dde34d490a0082e5c209f99288435282e145d328f14672
 
 post_install() {
 	vlicense LICENSE.md

From 3a504284f421aecffc14ae7713d75edaac64fffc Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sun, 1 May 2022 15:48:38 -0400
Subject: [PATCH 1891/2561] python3-zeroconf: update to 0.38.5.

---
 srcpkgs/python3-zeroconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index acae59ecd99f..0a32bfc59f8b 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-zeroconf'
 pkgname=python3-zeroconf
-version=0.38.4
+version=0.38.5
 revision=1
 wrksrc="python-zeroconf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ 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=74ead61490a7573d1cab1e9e9ea6fe846be0843c4ddd55633788d4670837c0eb
+checksum=54fa609011b5d2b2ff3a689471a2af16a4bc20edcc4077360e94e93ec4fbea98
 
 do_check() {
 	# IPv6 doesn't work on github CI

From c5a6aff768523f090ff16ebc68a08e3ac5ea5add Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 2 May 2022 18:07:41 +0200
Subject: [PATCH 1892/2561] gnumeric: update to 1.12.52.

---
 srcpkgs/gnumeric/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 51992c67f473..c516b93e1ae9 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,17 +1,17 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
-version=1.12.51
+version=1.12.52
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config"
-makedepends="goffice-devel librsvg-devel libxslt-devel"
+makedepends="goffice-devel librsvg-devel libxslt-devel libxml2-devel"
 short_desc="GNOME Spreadsheet Program"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://gnumeric.org/"
 changelog="https://github.com/GNOME/gnumeric/raw/mainline/NEWS"
 distfiles="${GNOME_SITE}/gnumeric/${version%.*}/gnumeric-${version}.tar.xz"
-checksum=a00e6c6e4ecddadabd9b0ae18013d7b05937fdcb8f9aad5a73b95923c7aeb1dd
+checksum=73cf73049a22a1d828506275b2c9378ec37c5ff37b68bb1f2f494f0d6400823b
 
 # This isn't a direct dependency but when soname bumping perl it will
 # cause build failures

From 37cdcf494215bf670b7f861a1cafe8cbc6dd1eeb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 3 May 2022 17:33:26 +0200
Subject: [PATCH 1893/2561] syncthing: update to 1.20.0.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 6a2673395275..10166603a685 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.19.2
+version=1.20.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=81be2d3b22fa7282eee9cc1dc7569975fa62e7149700dcedaf03d372fb012a1e
+checksum=27d9b52f18ebd833938731ffaaeed4f34ced534ef3d1ed2bc126a495764f753d
 
 pre_build() {
 	GOARCH= go generate \

From 387095d99a6994e82a45a2ff04f0dcbe8fab4c3c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 May 2022 19:09:34 +0200
Subject: [PATCH 1894/2561] python3-pipenv: update to 2022.4.30.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 2c0c939cf5f7..0b0975137e1d 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.4.21
+version=2022.4.30
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=3f93229de25a4c3a658249f48407b80f347f076640a9fd50c476a2876212f781
+checksum=e26ded6ab90a7900676a1db9955d5ee714115f443aecc072b09497153ed237c7
 conflicts="python-pipenv>=0"
 
 post_extract() {

From 2d857ed38b488bb920ad37160335791016e105d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 3 May 2022 15:28:06 -0400
Subject: [PATCH 1895/2561] armadillo: update to 11.0.1.

---
 common/shlibs                                 |  2 +-
 .../patches/9.700.2--include_dirs.patch       | 40 -------------------
 srcpkgs/armadillo/template                    | 18 +++++++--
 3 files changed, 15 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/armadillo/patches/9.700.2--include_dirs.patch

diff --git a/common/shlibs b/common/shlibs
index 4114151662fb..a2d858413fda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3722,7 +3722,7 @@ libdrumstick-rt.so.1 drumstick-1.1.2_1
 libnozzle.so.1 libnozzle1-1.11_4
 libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
 libluv.so.1 libluv-1.30.1.0_1
-libarmadillo.so.9 armadillo-9.700.2_1
+libarmadillo.so.11 armadillo-11.0.1_1
 libvarnishapi.so.2 libvarnishapi-6.3.0_1
 libicns.so.1 libicns-0.8.1_1
 librabbitmq.so.4 rabbitmq-c-0.10.0_2
diff --git a/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch b/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
deleted file mode 100644
index a19472dff135..000000000000
--- a/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a65f29c4cddccd22545746b077e6bd19d56e6bfb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 24 Jul 2020 23:07:44 +0200
-Subject: [PATCH] Absolute paths can't match both cross and native use
-
-
-diff --git include/armadillo_bits/config.hpp.cmake include/armadillo_bits/config.hpp.cmake
-index be42243..a285e35 100644
---- a/include/armadillo_bits/config.hpp.cmake
-+++ b/include/armadillo_bits/config.hpp.cmake
-@@ -50,7 +50,7 @@
- #endif
- 
- #if !defined(ARMA_SUPERLU_INCLUDE_DIR)
--#define ARMA_SUPERLU_INCLUDE_DIR ${ARMA_SUPERLU_INCLUDE_DIR}/
-+#define ARMA_SUPERLU_INCLUDE_DIR ./
- //// If you're using SuperLU and want to explicitly include the SuperLU headers,
- //// uncomment the above define and specify the appropriate include directory.
- //// Make sure the directory has a trailing /
-@@ -94,7 +94,7 @@
- //// ARMA_BLAS_LONG, ARMA_BLAS_LONG_LONG, ARMA_USE_FORTRAN_HIDDEN_ARGS
- 
- #cmakedefine ARMA_USE_ATLAS
--#define ARMA_ATLAS_INCLUDE_DIR ${ARMA_ATLAS_INCLUDE_DIR}/
-+#define ARMA_ATLAS_INCLUDE_DIR ./
- //// If you're using ATLAS and the compiler can't find cblas.h and/or clapack.h
- //// uncomment the above define and specify the appropriate include directory.
- //// Make sure the directory has a trailing /
-@@ -140,7 +140,7 @@
-   #undef  ARMA_USE_HDF5
-   #define ARMA_USE_HDF5
-   
--  #define ARMA_HDF5_INCLUDE_DIR ${ARMA_HDF5_INCLUDE_DIR}/
-+  #define ARMA_HDF5_INCLUDE_DIR ./
- #endif
- 
- #if !defined(ARMA_MAT_PREALLOC)
--- 
-2.27.0
-
diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template
index 9407c3aa8b48..7117b47a3129 100644
--- a/srcpkgs/armadillo/template
+++ b/srcpkgs/armadillo/template
@@ -1,9 +1,10 @@
 # Template file for 'armadillo'
 pkgname=armadillo
-version=9.900.2
+version=11.0.1
 revision=1
 build_style=cmake
-configure_args="-DDETECT_HDF5=$(vopt_if hdf5 ON OFF)"
+configure_args="-DOPENBLAS_PROVIDES_LAPACK=true
+ -DDETECT_HDF5=$(vopt_if hdf5 ON OFF)"
 hostmakedepends="pkg-config"
 makedepends="openblas-devel superlu-devel $(vopt_if hdf5 hdf5-devel)"
 short_desc="C++ linear algebra library"
@@ -11,15 +12,24 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="Apache-2.0"
 homepage="http://arma.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/arma/${pkgname}-${version}.tar.xz"
-checksum=d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05
+checksum=e43d4449376c1fc8b562095431bb82cf9c4ff98a791a22a25d0f96e5e7937c22
 
 build_options="hdf5"
 desc_option_hdf5="HDF5 support"
-# hd5 is nocross
+
+# hdf5 is nocross
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="hdf5"
 fi
 
+post_install() {
+	# Strip cross prefix from default header paths in config.hpp
+	if [ "$CROSS_BUILD" ]; then
+		vsed -e "s@${XBPS_CROSS_BASE}/@/@" \
+			-i "${DESTDIR}/usr/include/armadillo_bits/config.hpp"
+	fi
+}
+
 armadillo-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From c3a3d6d3bfcfdb9df19e37be8e461f3ba2728e47 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 4 May 2022 00:12:44 +0200
Subject: [PATCH 1896/2561] New package: opendht-2.3.1

---
 common/shlibs            |  1 +
 srcpkgs/opendht-devel    |  1 +
 srcpkgs/opendht/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/opendht-devel
 create mode 100644 srcpkgs/opendht/template

diff --git a/common/shlibs b/common/shlibs
index a2d858413fda..353e291f59d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -992,6 +992,7 @@ libmdbsql.so.0 libmdb-0.5_1
 libkmod.so.2 libkmod-5_1
 libestr.so.0 libestr-0.1.2_1
 libee.so.0 libee-0.3.2_1
+libopendht.so.2 opendht-2.3.1_1
 libobt.so.2 libopenbox-3.5.2_1
 libobrender.so.32 libopenbox-3.6.1_1
 libgssglue.so.1 libgssglue-0.3_1
diff --git a/srcpkgs/opendht-devel b/srcpkgs/opendht-devel
new file mode 120000
index 000000000000..6e5a7c5ebfb0
--- /dev/null
+++ b/srcpkgs/opendht-devel
@@ -0,0 +1 @@
+opendht
\ No newline at end of file
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
new file mode 100644
index 000000000000..c24ee3c55943
--- /dev/null
+++ b/srcpkgs/opendht/template
@@ -0,0 +1,31 @@
+# Template file for 'opendht'
+pkgname=opendht
+version=2.3.1
+revision=1
+build_style=cmake
+configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
+ -DOPENDHT_TESTS_NETWORK=OFF"
+hostmakedepends="pkg-config"
+makedepends="gnutls-devel msgpack-devel readline-devel libargon2-devel asio"
+short_desc="Distributed Hash Table implementation"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/savoirfairelinux/opendht"
+distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/${version}.tar.gz"
+checksum=9a75db4f119761d6524964b27d3a49aa809a6cb08bde963edc2f338458433c78
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+opendht-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/cmake"
+		vmove "usr/lib/pkgconfig"
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From baad326726337376306b0f713f6dde452417a767 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 2 May 2022 15:32:43 +0200
Subject: [PATCH 1897/2561] zellij: update to 0.29.1

---
 srcpkgs/zellij/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 20a338d9103e..293238e95a38 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,6 +1,6 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.28.1
+version=0.29.1
 revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://zellij.dev"
 changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz"
-checksum=8c9495e70b1c0179200d6137dd892776c7153b0b54115edf0f39fd732bb62efe
+checksum=340f5241c9b1abb5652b1531167f837fc573b9cfdefa551363a48930f8f1d4dd
 
 post_build() {
 	ZELLIJ="target/${RUST_TARGET}/release/zellij"

From 86d4231aef11d68368d33c1959a4dfad236fefce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 10 Apr 2022 21:03:22 -0300
Subject: [PATCH 1898/2561] owncloudclient: update to 2.10.1, adopt.

---
 srcpkgs/owncloudclient/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index d2297995cd1a..3772509dcdda 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,6 +1,6 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=2.10.0
+version=2.10.1
 revision=1
 wrksrc=client-${version}
 build_style=cmake
@@ -12,12 +12,12 @@ makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel
 depends="qt5-plugin-sqlite qt5-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
-maintainer="Nathan Owens <ndowens@artixlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://www.owncloud.org"
 changelog="https://raw.githubusercontent.com/owncloud/client/master/CHANGELOG.md"
 distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
-checksum=fc3248eb9afa67bba946cf788319d6dcc419d155700cb10baebb19f6ccf6b583
+checksum=cd79c46e0c13b606ec08527f9f5f35fe295d4655c12510aa6805ccb797119c49
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel"

From 2544aef7d2afbf07dffb8760fcc07601daaa9943 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 29 Apr 2022 17:25:53 +0200
Subject: [PATCH 1899/2561] fwupd-efi: update to 1.3

---
 srcpkgs/fwupd-efi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
index 663782fa1da5..78a543fec1dd 100644
--- a/srcpkgs/fwupd-efi/template
+++ b/srcpkgs/fwupd-efi/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd-efi'
 pkgname=fwupd-efi
-version=1.2
+version=1.3
 revision=1
 archs="x86_64* i686* arm* aarch64*"
 build_style=meson
@@ -15,7 +15,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd-efi"
 distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
-checksum=568fa4a9eb884821661d47d0c04ad5681ffe26346a1f8186a068efe56854b77b
+checksum=0e76057c178e221f63eaf9142fa1d06780a8eb3df7cf0c11f92660138dec5c83
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"

From 01e3ef3b6ea293a9795d411b83fbe260b968dffa Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 29 Apr 2022 17:26:06 +0200
Subject: [PATCH 1900/2561] fwupd: update to 1.8.0

---
 srcpkgs/fwupd/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 9f15e0a43ddc..189a8780874c 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,7 +1,7 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.7.5
-revision=2
+version=1.8.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true
@@ -20,9 +20,9 @@ conf_files="
 short_desc="Daemon to allow session software to update firmware"
 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=1acbec6727967ceb6dff9408a9312bb9eba5a7ebd0fde655122921a62d1d396c
+homepage="https://github.com/fwupd/fwupd"
+distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz"
+checksum=1616394b6d23b5696b91ebfcd83fef537be21e9600daca3ec3a09519074385bd
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From 7463f0be00e4c401739d498a44652e096c089eb0 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sun, 1 May 2022 23:18:20 -0400
Subject: [PATCH 1901/2561] podman-compose: update to 1.0.3.

---
 srcpkgs/podman-compose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template
index 4e1722d64ea6..7f92015f8ecf 100644
--- a/srcpkgs/podman-compose/template
+++ b/srcpkgs/podman-compose/template
@@ -1,6 +1,6 @@
 # Template file for 'podman-compose'
 pkgname=podman-compose
-version=1.0.2
+version=1.0.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,6 +10,6 @@ maintainer="juan <juan@horlux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/containers/podman-compose"
 distfiles="https://github.com/containers/podman-compose/archive/v${version}.tar.gz"
-checksum=8eae5f2d89a423c66c26377c29955e077e7c90532e1a63989e8f04d973181c76
+checksum=b28e5792a50feee987e7864e0df1b6e8929c923c010e1f65493fe29b4c2aedcf
 # Source distribution does not script unit tests
 make_check=no

From b1b05e409a7114225cb285111a7e8e7d22dcf7ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 3 May 2022 12:40:00 +0200
Subject: [PATCH 1902/2561] Chipmunk2D: update to 7.0.3.

---
 .../patches/backport-zero-division.patch      | 35 -------------------
 srcpkgs/Chipmunk2D/template                   |  6 ++--
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/Chipmunk2D/patches/backport-zero-division.patch

diff --git a/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch b/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch
deleted file mode 100644
index 2ced601be100..000000000000
--- a/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6a5767cc5a6c8f88f8cc689c0916ddc0111308fe Mon Sep 17 00:00:00 2001
-From: Bram Stolk <b.stolk@gmail.com>
-Date: Fri, 30 Mar 2018 19:21:26 -0700
-Subject: [PATCH] Fix issue #144 of division by zero when setting zero mass,
- zero moment.
-
----
- src/cpBody.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git src/cpBody.c src/cpBody.c
-index a8e0797..8ad2bc9 100644
---- a/src/cpBody.c
-+++ b/src/cpBody.c
-@@ -258,7 +258,7 @@ cpBodySetMass(cpBody *body, cpFloat mass)
- 	
- 	cpBodyActivate(body);
- 	body->m = mass;
--	body->m_inv = 1.0f/mass;
-+	body->m_inv = mass == 0.0f ? INFINITY : 1.0f/mass;
- 	cpAssertSaneBody(body);
- }
- 
-@@ -275,7 +275,7 @@ cpBodySetMoment(cpBody *body, cpFloat moment)
- 	
- 	cpBodyActivate(body);
- 	body->i = moment;
--	body->i_inv = 1.0f/moment;
-+	body->i_inv = moment == 0.0f ? INFINITY : 1.0f/moment;
- 	cpAssertSaneBody(body);
- }
- 
--- 
-2.21.0
-
diff --git a/srcpkgs/Chipmunk2D/template b/srcpkgs/Chipmunk2D/template
index 142051ec0a4a..e4342835ac7d 100644
--- a/srcpkgs/Chipmunk2D/template
+++ b/srcpkgs/Chipmunk2D/template
@@ -1,6 +1,6 @@
 # Template file for 'Chipmunk2D'
 pkgname=Chipmunk2D
-version=7.0.2
+version=7.0.3
 revision=1
 wrksrc="Chipmunk2D-Chipmunk-${version}"
 build_style=cmake
@@ -8,9 +8,9 @@ configure_args="-DBUILD_DEMOS=NO"
 short_desc="Fast and lightweight 2D game physics library"
 maintainer="Ekaterina Vaartis <vaartis@cock.li>"
 license="MIT"
-homepage="http://chipmunk-physics.net/"
+homepage="https://chipmunk-physics.net/"
 distfiles="https://github.com/slembcke/Chipmunk2D/archive/Chipmunk-${version}.tar.gz"
-checksum=6b6d8d5d910c4442fb9c8c4c46a178126d8c21d075cdb3ce439a7f8d8757b0ca
+checksum=1e6f093812d6130e45bdf4cb80280cb3c93d1e1833d8cf989d554d7963b7899a
 
 post_install() {
 	vlicense LICENSE.txt

From e10b293a44c42ab8cdc704893533125a98b7b1c6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 3 May 2022 13:18:55 +0200
Subject: [PATCH 1903/2561] python3-astroid: update to 2.11.4.

---
 srcpkgs/python3-astroid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 8b0c64e88833..bc3440d167b2 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.11.3
+version=2.11.4
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ 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="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=455d18bfb08cec3bb61d273306c82cffc1de494c2ad4c67410494ebe6e192bc5
+checksum=08a17987045eda03c7088e12d54317a0bb28e60404634ab7a7808e644a667ad6

From 77ed68fdd82e46831dc482394a6f0156bbaf841d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 3 May 2022 13:18:59 +0200
Subject: [PATCH 1904/2561] pylint: update to 2.13.8.

---
 srcpkgs/pylint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 3a6db1a7ce36..7abac2cbef15 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,6 +1,6 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.13.7
+version=2.13.8
 revision=1
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=c497a2b29e9c78322324e88b2303b388c28ed57a81601e365393ba68d976bc50
+checksum=7bd4cfc0e3e4332f0f3d8f8fc9e967d2e2946912ca7a336f36d3f2ac99c5cd42
 
 post_install() {
 	# install example config and emacs files

From d896d0da0ad440480f899c8dfbaf2f12ede34875 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 3 May 2022 13:27:38 +0200
Subject: [PATCH 1905/2561] stig: update to 0.12.3a0.

---
 srcpkgs/stig/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 8f6f7cc177b5..59d37e89baa3 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,7 +1,7 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=2
+version=0.12.3a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
@@ -11,5 +11,5 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+checksum=49cf2b8d73fa7f61a500672d02cd18a7155d842907b09450a5f92a9b360c6575
 make_check=no # needs python3-asynctest which is not packaged

From 87cec7ccb1c07489ea22211e0974d7010d4e9020 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 3 May 2022 13:31:19 +0200
Subject: [PATCH 1906/2561] lagrange: update to 1.13.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 12a3938f5212..0e7f419708ae 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.12.2
+version=1.13.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=cef0ef9543a87d3a4cc8ad83955f9a4e62af7bef4e786642c1ab5ec85ff8b950
+checksum=f84c5fe078734df06ada747f87760ea8863369be5519d1e56992c7c5278395da
 
 post_install() {
 	vlicense LICENSE.md

From b489b962aae30e82789ab886af31249d079e2cef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:00 +0200
Subject: [PATCH 1907/2561] NetAuth-ldap: remove git build dep

---
 srcpkgs/NetAuth-ldap/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index ef3429113f67..299cbb22ae47 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -6,7 +6,6 @@ wrksrc=ldap-$version
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"
-hostmakedepends="git"
 short_desc="LDAP Proxy for NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

From 746943d3d9043181c72da1b7ef1ca4ed13db90a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1908/2561] NetAuth-localizer: remove git build dep

---
 srcpkgs/NetAuth-localizer/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 7039dd37cbea..dc57f91921b6 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -6,7 +6,6 @@ wrksrc=localizer-$version
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize
-hostmakedepends="git"
 depends="snooze"
 short_desc="Make NetAuth accounts local in Linux"
 maintainer="Michael Aldridge <maldridge@netauth.org>"

From d7b77abd4e15aaf0c263195ae490d92d7d993c15 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1909/2561] NetAuth-nsscache: remove git build dep

---
 srcpkgs/NetAuth-nsscache/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index b7d171889aaf..bb441ae25d41 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc="nsscache-$version"
 build_style=go
 go_import_path="github.com/netauth/nsscache"
-hostmakedepends="git"
 short_desc="NetAuth nsscache implementation"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

From 500e9b5e8be5579da0804497343348c41afbfe69 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1910/2561] NetAuth-pam-helper: remove git build dep

---
 srcpkgs/NetAuth-pam-helper/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 8c961a56b403..763a72035eef 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc=pam-helper-$version
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
-hostmakedepends="git"
 short_desc="Helper executable to use with pam_exec"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

From 96b06c64ace3833e13704eadabcf016059e9235f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1911/2561] NetAuth-sftpgo-hook: remove git build dep

---
 srcpkgs/NetAuth-sftpgo-hook/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index aab25468a2c4..51862cc53980 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -5,7 +5,6 @@ revision=2
 wrksrc=sftpgo-hook-$version
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
-hostmakedepends="git"
 depends="sftpgo"
 short_desc="External authorization hook for SFTPGo using NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"

From e476dd949edf99c486d394eb800ca46b7d1c24ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1912/2561] NetAuth: remove git build dep

---
 srcpkgs/NetAuth/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index 4a227be08ea2..4586019d0690 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -7,7 +7,6 @@ build_style="go"
 go_import_path="github.com/netauth/netauth"
 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@netauth.org>"
 license="MIT"

From c59aa31855538c4f17036570b8e81d82b71105b8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1913/2561] NetKeys: remove git build dep

---
 srcpkgs/NetKeys/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 9d5c4a4385dc..cb0ef063efb2 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc=netkeys-$version
 build_style=go
 go_import_path="github.com/netauth/netkeys"
-hostmakedepends="git"
 short_desc="Key retrieval daemon for NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

From e50809777a23c64928bd3db25e12a5d4b5767349 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1914/2561] TerraState: remove git build dep

---
 srcpkgs/TerraState/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index 5c87d1706917..01ed55bb41ca 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -7,7 +7,6 @@ make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"
 go_package="${go_import_path}/cmd/terrastate"
-hostmakedepends="git"
 short_desc="Remote state for Terraform"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"

From 9ffbdb7b56470f8f586aafd874e20f076fc9cff9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1915/2561] antibody: remove git build dep

---
 srcpkgs/antibody/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index cb109f0b1837..df466c33a9ca 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -4,7 +4,6 @@ version=6.1.1
 revision=1
 build_style=go
 go_import_path=github.com/getantibody/antibody
-hostmakedepends="git"
 short_desc="Fast and lightweight shell plugin manager"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"

From a8360ad4864e767b250896c0e681dc777862c28c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1916/2561] browserpass: remove git build dep

---
 srcpkgs/browserpass/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index b6426a249756..63537def3f40 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc="browserpass-native-${version}"
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
-hostmakedepends="git"
 short_desc="Browser extension for pass"
 maintainer="John <me@johnnynator.dev>"
 license="MIT"

From d1df979351ff9b60d7a1c1833cc9fff42d209917 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1917/2561] cdetect: remove git build dep

---
 srcpkgs/cdetect/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index b02df3a496e5..e859340a9cb3 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -4,7 +4,6 @@ version=0.5.4
 revision=1
 build_style=go
 go_import_path=github.com/xyproto/cdetect
-hostmakedepends="git"
 short_desc="Detects the compiler (and version) used to compile an ELF binary"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From eb14c3e596bbf96ce473ed19e0efec43f185b81c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1918/2561] chroma: remove git build dep

---
 srcpkgs/chroma/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index b549685882ce..e2ae9e6a677f 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -6,7 +6,6 @@ build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/cmd/chroma"
 go_ldflags="-X main.version=${version} -X main.date=$(date +%Y.%m.%d)"
-hostmakedepends="git"
 short_desc="General purpose syntax highlighter"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"

From facf6b1275a089481375e477b4f7f4791085c785 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1919/2561] consul-template: remove git build dep

---
 srcpkgs/consul-template/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index 4faeaf1c9ae5..d144f447c7bc 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -4,7 +4,6 @@ version=0.28.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
-hostmakedepends="git"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="MPL-2.0"

From 68e55ebd11b2b55583507901670b494296c64f6b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1920/2561] consul: remove git build dep

---
 srcpkgs/consul/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index fc0e80502879..d31feecc270f 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -9,7 +9,6 @@ go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
 go_mod_mode=default
-hostmakedepends="git"
 short_desc="Distributed solution to connect and configure applications"
 maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"

From 669394cded0ed111ca4f2dbb79da81c047225a8c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1921/2561] crane: remove git build dep

---
 srcpkgs/crane/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index edb04e896ae5..5a304a9faf73 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -3,7 +3,6 @@ pkgname=crane
 version=3.6.0
 revision=1
 build_style=go
-hostmakedepends="git"
 short_desc="Lift containers with ease"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 80ac6db206ee8423c0a7cc9cbd053691015fd702 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1922/2561] distrobuilder: remove git build dep

---
 srcpkgs/distrobuilder/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index fd58594e1748..05f805c1ac1f 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -6,7 +6,6 @@ wrksrc="distrobuilder-distrobuilder-${version}"
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"
-hostmakedepends="git"
 depends="debootstrap gnupg squashfs-tools"
 short_desc="System container image builder for LXC and LXD"
 maintainer="Robert Lowry <bobertlo@gmail.com>"

From 0801a2ecdc90786872c5598ae0ea01f1c23ef123 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1923/2561] dlayer: remove git build dep

---
 srcpkgs/dlayer/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..b909474e3932 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -4,7 +4,6 @@ version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
-hostmakedepends="git"
 short_desc="Dlayer is a docker layer analyzer"
 maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"

From a7d57bf719e3544891988115e67008aef4ca9754 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1924/2561] elfinfo: remove git build dep

---
 srcpkgs/elfinfo/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 189d842b0012..b354ced06d81 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -4,7 +4,6 @@ version=1.1.0
 revision=1
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
-hostmakedepends="git"
 short_desc="Emit basic information about an ELF file"
 maintainer="Alexander F. Rødseth <xyproto@archlinux.org>"
 license="MIT"

From 4eae7643fee6d72c9926cd6686d14b168ede17c0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1925/2561] ensure-access: remove git build dep

---
 srcpkgs/ensure-access/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
index b5187c8bb4f4..9d3abe476303 100644
--- a/srcpkgs/ensure-access/template
+++ b/srcpkgs/ensure-access/template
@@ -4,7 +4,6 @@ version=0.1.0
 revision=1
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
-hostmakedepends="git"
 short_desc="Tool which ensures permissions exists for files and directories"
 maintainer="Noah Huppert <contact@noahh.io>"
 license="MIT"

From d6eeafd50408113af92658888e7e65728f0d6114 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1926/2561] exercism: remove git build dep

---
 srcpkgs/exercism/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
index eb696027500b..5869f87dbce0 100644
--- a/srcpkgs/exercism/template
+++ b/srcpkgs/exercism/template
@@ -6,7 +6,6 @@ wrksrc="cli-${version}"
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"
-hostmakedepends="git"
 short_desc="Command line tool for exercism.io"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"

From 7bb656d656731aa5703c6b653b5f54e9b7d43d1f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1927/2561] figurine: remove git build dep

---
 srcpkgs/figurine/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index bef430fa4ba2..bf412358486a 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -4,7 +4,6 @@ version=1.0.1
 revision=1
 build_style=go
 go_import_path=github.com/arsham/figurine
-hostmakedepends="git"
 short_desc="Print your name in style"
 maintainer="travankor <travankor@tuta.io>"
 license="Apache-2.0"

From 787756012c0092abfbae623cc3b04b0aa8bda1cd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1928/2561] flint: remove git build dep

---
 srcpkgs/flint/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index 9a6b0d8c0aac..a04ca9e022d5 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -3,7 +3,6 @@ pkgname=flint
 version=0.1.0
 revision=9
 build_style=go
-hostmakedepends="git"
 short_desc="Check your project for common sources of contributor friction"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From fcca9068b6829db0b4f0e9ae66566fd448b693c3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:04 +0200
Subject: [PATCH 1929/2561] fzf: remove git build dep

---
 srcpkgs/fzf/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index ec60af9ddc64..86789e858d66 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -4,7 +4,6 @@ version=0.30.0
 revision=1
 build_style=go
 go_import_path="github.com/junegunn/fzf"
-hostmakedepends="git"
 makedepends="ncurses-devel"
 short_desc="Command-line fuzzy finder"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 112b512dafeb0ef1db0cba7f8dc6294f7d58c878 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:04 +0200
Subject: [PATCH 1930/2561] ghq: remove git build dep

---
 srcpkgs/ghq/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 50202b42a260..fbe3c19e4517 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"
-hostmakedepends="git"
 depends="git"
 short_desc="Remote repository management made easy"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"

From f748aeb7da77a68806c599af68836f4240b20dc1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:04 +0200
Subject: [PATCH 1931/2561] gitbatch: remove git build dep

---
 srcpkgs/gitbatch/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
index 4464729f2b8f..df26ed89b193 100644
--- a/srcpkgs/gitbatch/template
+++ b/srcpkgs/gitbatch/template
@@ -4,7 +4,6 @@ version=0.5.0
 revision=1
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
-hostmakedepends="git"
 short_desc="Command line tool to manage your git repositories in one place"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="MIT"

From 9c74466654d837e489aa98686496046436001253 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:04 +0200
Subject: [PATCH 1932/2561] glide: remove git build dep

---
 srcpkgs/glide/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
index 635084f70988..15948753606e 100644
--- a/srcpkgs/glide/template
+++ b/srcpkgs/glide/template
@@ -4,7 +4,6 @@ version=0.13.3
 revision=1
 build_style=go
 go_import_path="github.com/Masterminds/glide"
-hostmakedepends="git"
 depends="go git"
 short_desc="Vendor package management for golang"
 maintainer="ananteris <ananteris@protonmail.ch>"

From 068f3d5a0f8924ee29009ddad5448c14e68de809 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:04 +0200
Subject: [PATCH 1933/2561] glider: remove git build dep

---
 srcpkgs/glider/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
index e132cfda4b72..362825602699 100644
--- a/srcpkgs/glider/template
+++ b/srcpkgs/glider/template
@@ -4,7 +4,6 @@ version=0.13.0
 revision=1
 build_style=go
 go_import_path=github.com/nadoo/glider
-hostmakedepends="git"
 short_desc="Forward proxy with multiple protocols support"
 maintainer="whoami <whoami@systemli.org>"
 license="GPL-3.0-or-later"

From fe6ce9bdc829a75adbc1ccc0396f41c5df2c03ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1934/2561] go-md2man: remove git build dep

---
 srcpkgs/go-md2man/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e1094a54cbe0..5f5feb187d3b 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -4,7 +4,6 @@ version=2.0.1
 revision=1
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
-hostmakedepends="git"
 short_desc="Convert md to manpages"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"

From 17e1b2c93b8f7b2733d7bb6d58a3dcae23fbdfce Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1935/2561] go-review: remove git build dep

---
 srcpkgs/go-review/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
index b352545bedb9..907a214d4019 100644
--- a/srcpkgs/go-review/template
+++ b/srcpkgs/go-review/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"
-hostmakedepends="git"
 short_desc="Publish reports from different Go linters as gerrit reviews"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"

From 43d83e96e3ecc98d993f06e7965d70f5f94d2f39 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1936/2561] gobuster: remove git build dep

---
 srcpkgs/gobuster/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index c5427cd4339b..60e075b3182a 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -4,7 +4,6 @@ version=3.1.0
 revision=2
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
-hostmakedepends="git"
 short_desc="Directory, file and DNS busting tool"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 34f4399fed93f343f3dc394af48456255f9accc0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1937/2561] goimapnotify: remove git build dep

---
 srcpkgs/goimapnotify/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 4b54689a434d..208db03d00ec 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -4,7 +4,6 @@ version=2.3.7
 revision=1
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
-hostmakedepends="git"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-3.0-only"

From 0bab38490459c82950ab67386fc42c7dc53df28c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1938/2561] gomatrix: remove git build dep

---
 srcpkgs/gomatrix/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
index fae7a4343ed7..eb9d6e7bedac 100644
--- a/srcpkgs/gomatrix/template
+++ b/srcpkgs/gomatrix/template
@@ -4,7 +4,6 @@ version=101.0.0
 revision=1
 build_style=go
 go_import_path=github.com/GeertJohan/gomatrix
-hostmakedepends="git"
 short_desc="Terminal Matrix display in golang"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-2-Clause"

From ab6cd8adf6ce2ac4461265168bfb65e42c532e8b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1939/2561] gotty: remove git build dep

---
 srcpkgs/gotty/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template
index 0e5d268e9926..58fc0572197c 100644
--- a/srcpkgs/gotty/template
+++ b/srcpkgs/gotty/template
@@ -4,7 +4,6 @@ version=1.0.1
 revision=8
 build_style=go
 go_import_path="github.com/yudai/gotty"
-hostmakedepends="git"
 short_desc="Share your terminal as a web application"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"

From d468d993edb6d802620c10d43827e4824a27f45c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1940/2561] goversion: remove git build dep

---
 srcpkgs/goversion/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index 390551d2b425..ac45067873fe 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -4,7 +4,6 @@ version=1.2.0
 revision=3
 build_style=go
 go_import_path=rsc.io/goversion
-hostmakedepends="git"
 short_desc="Print version used to build Go executables"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 32d4d36a71538208613032d39d4fbf42bdd1ef6c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1941/2561] gucci: remove git build dep

---
 srcpkgs/gucci/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 37773ceba896..09992b5b65ad 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -5,7 +5,6 @@ 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"

From b8d1996e3b6f2b8f65f872f13cbc5b73733e26c2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1942/2561] gx: remove git build dep

---
 srcpkgs/gx/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gx/template b/srcpkgs/gx/template
index ff3ea0267c88..7414b6bab10a 100644
--- a/srcpkgs/gx/template
+++ b/srcpkgs/gx/template
@@ -4,7 +4,6 @@ version=0.14.3
 revision=1
 build_style=go
 go_import_path="github.com/whyrusleeping/gx"
-hostmakedepends="git"
 short_desc="Language-agnostic, universal package manager around IPFS"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 76367ce980f8a8682633ac5595773b7d8969abf2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1943/2561] hey: remove git build dep

---
 srcpkgs/hey/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template
index 84954e36b76b..52427108dc60 100644
--- a/srcpkgs/hey/template
+++ b/srcpkgs/hey/template
@@ -4,7 +4,6 @@ version=0.1.4
 revision=1
 build_style=go
 go_import_path=github.com/rakyll/hey
-hostmakedepends="git"
 short_desc="HTTP load generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From d0a6e9bd0c36bba78f89712210064f7d4b385e5d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1944/2561] hooktftp: remove git build dep

---
 srcpkgs/hooktftp/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index 2cba14aec605..d9482c378c75 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"
-hostmakedepends="git"
 short_desc="Hook based tftp server"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 2d118fdf53f3f7ca40aac5f10d6e3e2e42a7a505 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1945/2561] hydroxide: remove git build dep

---
 srcpkgs/hydroxide/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5f63ded6f759..c7fc20b5de90 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
 go_package=$go_import_path/cmd/hydroxide
-hostmakedepends="git"
 short_desc="Third-party, open-source ProtonMail CardDAV, IMAP and SMTP bridge"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"

From e34edb5c8cf81c251df28d840ee2a059a6addfc8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1946/2561] immortal: remove git build dep

---
 srcpkgs/immortal/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index 76c1d8c6dabd..e693e767adb5 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -7,7 +7,6 @@ go_import_path=github.com/immortal/immortal
 go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl
  ${go_import_path}/cmd/immortaldir"
 go_ldflags="-X main.Version=v${version}"
-hostmakedepends="git"
 short_desc="*nix cross-platform (OS agnostic) supervisor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 9ef1eb73704e8bb731e291a7294efdf1c10ce3d0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1947/2561] ipfs-cluster: remove git build dep

---
 srcpkgs/ipfs-cluster/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index ebb062d409c7..27e6d6aad94b 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"
-hostmakedepends="git"
 depends="go-ipfs"
 short_desc="Collective pinning and composition for IPFS"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 92bdb7480b884f67028e08f844c6cf7cf4c95d0d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1948/2561] jid: remove git build dep

---
 srcpkgs/jid/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template
index abce00a83532..52055ab9f9ee 100644
--- a/srcpkgs/jid/template
+++ b/srcpkgs/jid/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=github.com/simeji/jid
 go_package=github.com/simeji/jid/cmd/jid
-hostmakedepends="git"
 short_desc="Drill down JSON interactively by using filtering queries"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 2cc925a11c36420672a1ab5e8845140d57b04250 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1949/2561] joker: remove git build dep

---
 srcpkgs/joker/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index a66fffbab258..2682f33a5dfa 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -4,7 +4,6 @@ version=0.14.1
 revision=1
 build_style=go
 go_import_path=github.com/candid82/joker
-hostmakedepends="git"
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"

From ca8953aa63f58dc3b72d34a6b967ccec8b376475 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1950/2561] jump: remove git build dep

---
 srcpkgs/jump/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template
index b31f01bba494..9c4a258d56a3 100644
--- a/srcpkgs/jump/template
+++ b/srcpkgs/jump/template
@@ -4,7 +4,6 @@ version=0.40.0
 revision=1
 build_style=go
 go_import_path=github.com/gsamokovarov/jump
-hostmakedepends="git"
 short_desc="Fuzzy directory jumper that learns your habits"
 maintainer="Arthur Weagel <arthur.contrib@gmail.com>"
 license="MIT"

From e6aa56cc32288d14b126bc6ccf3cd699d0b605d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1951/2561] keybase: remove git build dep

---
 srcpkgs/keybase/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index 3e86e92e2f84..d0c5ace0df38 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -10,7 +10,6 @@ ${go_import_path}/go/kbfs/kbfsfuse
 ${go_import_path}/go/kbfs/kbfsgit/git-remote-keybase
 ${go_import_path}/go/kbfs/kbfstool ${go_import_path}/go/kbfs/redirector"
 go_build_tags="production"
-hostmakedepends="git"
 depends="gnupg2"
 short_desc="Client for keybase.io"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From e0be4fe325c970778aabe6b60927585e8151b095 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1952/2561] lego: remove git build dep

---
 srcpkgs/lego/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index 6d46cd6a6e67..9605311ef9b0 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
 go_package="${go_import_path}/cmd/lego"
-hostmakedepends="git"
 short_desc="Let's Encrypt client and ACME library written in Go"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From cec05a78bdc9abec4cabfaa50cc645de531432cf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1953/2561] licensechecker: remove git build dep

---
 srcpkgs/licensechecker/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index ec09ba9751f9..f04bcd1fe4d4 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -5,7 +5,6 @@ revision=5
 wrksrc="lc-${version}"
 build_style=go
 go_import_path=github.com/boyter/lc
-hostmakedepends="git"
 short_desc="Identify software licenses used on a source tree"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From fa4cb5fff63a2c6b495f01af5b973f76cc7289cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1954/2561] massren: remove git build dep

---
 srcpkgs/massren/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index d3f4250b2ecb..d98fce7395b0 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -3,7 +3,6 @@ pkgname=massren
 version=1.5.4
 revision=7
 build_style=go
-hostmakedepends="git"
 short_desc="Massive renamer from command line"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From c7a2f46b9064ef332514ff5fa8a9b3fdbdaa0126 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1955/2561] minify: remove git build dep

---
 srcpkgs/minify/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 9be3e9620c49..095c1e5a242d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"
-hostmakedepends="git"
 short_desc="Go minifiers for web formats"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"

From 120efde7ef0024c75746057d53e606153936b733 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1956/2561] minio: remove git build dep

---
 srcpkgs/minio/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 58d745f326b1..06cf90aec4a5 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -7,7 +7,6 @@ wrksrc=${pkgname}-RELEASE.${_version}
 build_style=go
 go_import_path="github.com/minio/minio"
 conf_files="/etc/default/minio /etc/minio/config.json"
-hostmakedepends="git"
 short_desc="Object storage server compatible with Amazon S3"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"

From a78427e491ecdd9b4ab045be1f353b718ffa1c6f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1957/2561] mountain-backup: remove git build dep

---
 srcpkgs/mountain-backup/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template
index 309cbda5305e..bfbd5cb3cc01 100644
--- a/srcpkgs/mountain-backup/template
+++ b/srcpkgs/mountain-backup/template
@@ -4,7 +4,6 @@ version=0.2.0
 revision=1
 build_style=go
 go_import_path=github.com/Noah-Huppert/mountain-backup
-hostmakedepends="git"
 short_desc="File backup tool"
 maintainer="Noah Huppert <contact@noahh.io>"
 license="MIT"

From 573efc35fe247130204cb9f050ed18cbc994f787 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1958/2561] nebula: remove git build dep

---
 srcpkgs/nebula/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template
index 888e436ae614..8e67012d17c2 100644
--- a/srcpkgs/nebula/template
+++ b/srcpkgs/nebula/template
@@ -7,7 +7,6 @@ make_dirs="/etc/nebula 0750 root root"
 go_import_path=github.com/slackhq/nebula
 go_package="${go_import_path}/cmd/nebula ${go_import_path}/cmd/nebula-cert"
 go_ldflags="-X main.Build=${version}"
-hostmakedepends="git"
 short_desc="Scalable overlay networking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="MIT"

From d213d8363676441362697ed9a8147c668d4e382b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1959/2561] node_exporter: remove git build dep

---
 srcpkgs/node_exporter/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index f84cae0d6a1c..baec4cfc14d5 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -8,7 +8,6 @@ go_ldflags="-X ${go_import_path}/version.Version=${version}
  -X ${go_import_path}/version.Revision=${version}
  -X ${go_import_path}/version.Branch=${version}
  -X ${go_import_path}/version.BuildUser=VoidLinux"
-hostmakedepends="git"
 short_desc="Exporter for machine metrics"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"

From aeef7daf7427e41224c109cec0fb6456eaabd99d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1960/2561] nomad: remove git build dep

---
 srcpkgs/nomad/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 8707ada37bf9..7b53596b1aed 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -7,7 +7,6 @@ go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
 _git_commit=95514d569610f15ce49b4a7a1a6bfd3e7b3e7b4f
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
-hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"

From a4987271d1b0aa0196e177db80773f4f312ddabd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1961/2561] obfs4proxy: remove git build dep

---
 srcpkgs/obfs4proxy/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template
index 1b9dd7e0b53e..c38ce754ce86 100644
--- a/srcpkgs/obfs4proxy/template
+++ b/srcpkgs/obfs4proxy/template
@@ -7,7 +7,6 @@ wrksrc="${_pkgname}-${version}"
 build_style=go
 go_import_path=gitlab.com/yawning/obfs4.git
 go_package="${go_import_path}/obfs4proxy"
-hostmakedepends="git"
 short_desc="Pluggable transport proxy for Tor, implementing obfs4"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="BSD-2-Clause"

From c3272754ea7474f558707297b31ede84f4469b3d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1962/2561] oh: remove git build dep

---
 srcpkgs/oh/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index 03149b3ed692..1f9a346883ca 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -4,7 +4,6 @@ version=0.8.0
 revision=1
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
-hostmakedepends="git"
 short_desc="Surprisingly powerful Unix shell"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="MIT"

From 6a9215b5f0945bddf20f8c1a4494c9389ce5288d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1963/2561] pam_netauth: remove git build dep

---
 srcpkgs/pam_netauth/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index 09a33291eb8e..7c300852f696 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -4,7 +4,6 @@ version=0.3.5
 revision=1
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
-hostmakedepends="git"
 makedepends=pam-devel
 short_desc="PAM plugin for NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"

From 97d117f0768746e3812b3de263d075c4188c3fdc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1964/2561] peco: remove git build dep

---
 srcpkgs/peco/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 0fc04b8036bc..6f5679e73ca9 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/peco/peco"
 go_package="${go_import_path}/cmd/peco"
-hostmakedepends="git"
 short_desc="Simplistic interactive filtering tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"

From 4c185e5157b3c038d6306a17895aa2e16ebc8134 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1965/2561] pst: remove git build dep

---
 srcpkgs/pst/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template
index 9aa71e758390..b1d3888ae8bc 100644
--- a/srcpkgs/pst/template
+++ b/srcpkgs/pst/template
@@ -4,7 +4,6 @@ version=1.3.2
 revision=1
 build_style=go
 go_import_path=github.com/skanehira/pst
-hostmakedepends="git"
 short_desc="TUI process monitor"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"

From 488ce6c2da852ceaf4ab38f2ea2e5434d3775786 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1966/2561] pwget: remove git build dep

---
 srcpkgs/pwget/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template
index ddc85de35f0b..64cdcae14fb9 100644
--- a/srcpkgs/pwget/template
+++ b/srcpkgs/pwget/template
@@ -4,7 +4,6 @@ version=2.0
 revision=1
 build_style=go
 go_import_path="github.com/majewsky/pwget"
-hostmakedepends="git"
 short_desc="Single-binary stateless password manager"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="GPL-3.0-or-later"

From 452a0e0c4a89778066edcd658e348c53776bc093 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1967/2561] s: remove git build dep

---
 srcpkgs/s/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 76a7da458242..8dd517674760 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -5,7 +5,6 @@ revision=1
 build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s
-hostmakedepends="git"
 short_desc="Web search from the terminal"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"

From a803aa4ff4096d9ce99e1a531f5c0360f21e8904 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1968/2561] saml2aws: remove git build dep

---
 srcpkgs/saml2aws/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 43cd823b7b57..a3afe9ed49fb 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -6,7 +6,6 @@ build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"
 go_ldflags="-X main.Version=${version}"
-hostmakedepends="git"
 depends="aws-cli"
 short_desc="Get AWS temporary credentials from SAML provider"
 maintainer="Mate GABRI <iam@theguy.io>"

From b964ea2b2ee646736191c7d0a14595dec55368f5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1969/2561] sampler: remove git build dep

---
 srcpkgs/sampler/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index 8612da45a6ac..be43f33416cd 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -4,7 +4,6 @@ version=1.1.0
 revision=1
 build_style=go
 go_import_path="github.com/sqshq/sampler"
-hostmakedepends="git"
 makedepends="alsa-lib-devel"
 short_desc="Tool for shell commands execution, visualization and alerting"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 2d694a75f19475d894fbbc7c2010aa008bae2bd7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1970/2561] seaweedfs: remove git build dep

---
 srcpkgs/seaweedfs/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 4c3a91e3a89f..af07c3694fae 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/chrislusf/seaweedfs"
 go_package="github.com/chrislusf/seaweedfs/weed"
-hostmakedepends="git"
 short_desc="Simple and highly scalable distributed file system"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"

From c72a3fa7786d329814171a4bbefb45948b4427ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1971/2561] shadowfox-updater: remove git build dep

---
 srcpkgs/shadowfox-updater/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template
index 37e613755302..fb2eadb6f541 100644
--- a/srcpkgs/shadowfox-updater/template
+++ b/srcpkgs/shadowfox-updater/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=github.com/SrKomodo/shadowfox-updater
 go_ldflags="-X main.version=v${version}"
-hostmakedepends="git"
 short_desc="Auto-updater for ShadowFox"
 maintainer="Renato Aguiar <renato@renag.me>"
 license="MIT"

From b684a61baba49da59921449f741a53710becac71 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1972/2561] sops: remove git build dep

---
 srcpkgs/sops/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index f1215b6c3eb7..ade18a059c57 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"
-hostmakedepends="git"
 short_desc="Simple and flexible tool for managing secrets"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="MPL-2.0"

From 974aade4666ee706e1d90b7e1e88462124cda845 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1973/2561] syncthing: remove git build dep

---
 srcpkgs/syncthing/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 10166603a685..d1cdcc490bb2 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -10,7 +10,6 @@ go_package="
  ${go_import_path}/cmd/syncthing"
 go_build_tags="noupgrade"
 go_ldflags="-X github.com/syncthing/syncthing/lib/build.Version=v${version}"
-hostmakedepends="git"
 short_desc="Open Source Continuous File Synchronization"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0"

From c3973bf8813b4e53d89d38ad654ed3a501f165ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1974/2561] termshark: remove git build dep

---
 srcpkgs/termshark/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 4656690cb609..73a8d1976c52 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"
-hostmakedepends="git"
 depends="wireshark"
 short_desc="Terminal UI for tshark, inspired by Wireshark"
 maintainer="Piraty <piraty1@inbox.ru>"

From be204dcb13cb038faa223ee58d0023689aad42ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1975/2561] terragrunt: remove git build dep

---
 srcpkgs/terragrunt/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index b99451213534..2c5080b61c3c 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -4,7 +4,6 @@ version=0.36.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
-hostmakedepends="git"
 depends="terraform"
 short_desc="Thin wrapper for Terraform that provides extra tools"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

From b176ff46724c135fbd3bfb4b4df0b09b6ec4f3c9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1976/2561] tml: remove git build dep

---
 srcpkgs/tml/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 46ab37c0a3d2..21810a85215f 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -6,7 +6,6 @@ build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"
 go_ldflags="-X github.com/liamg/tml/version.Version=${TRAVIS_TAG}"
-hostmakedepends="git"
 short_desc="Tiny markup language for terminal output"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 22057779400761d1079b977dd39878028ce56315 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1977/2561] up: remove git build dep

---
 srcpkgs/up/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/up/template b/srcpkgs/up/template
index dbaf768841d9..3907504ad47b 100644
--- a/srcpkgs/up/template
+++ b/srcpkgs/up/template
@@ -4,7 +4,6 @@ version=0.4
 revision=1
 build_style=go
 go_import_path=github.com/akavel/up
-hostmakedepends="git"
 short_desc="Ultimate Plumber - write Linux pipes interactively"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="Apache-2.0"

From 77e7b45c968045bb8f3f1e13f42ee7e84e8496d2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1978/2561] usql: remove git build dep

---
 srcpkgs/usql/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index f5705bd21b3a..45687345c30c 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -4,7 +4,6 @@ version=0.9.5
 revision=1
 build_style=go
 go_import_path=github.com/xo/usql
-hostmakedepends="git"
 short_desc="Universal command-line interface for SQL databases"
 maintainer="Alan Brown <adbrown@rocketmail.com>"
 license="MIT"

From d4a26865edb7f7330bd04e787ed31457438a7646 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1979/2561] vault: remove git build dep

---
 srcpkgs/vault/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 49f6a4b405b9..111feb18627e 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -7,7 +7,6 @@ go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
 _git_commit=fcbe948b2542a13ee8036ad07dd8ebf8554f56cb
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
-hostmakedepends="git"
 depends="libcap-progs"
 short_desc="Manage Secrets and Protect Sensitive Data"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 291df4d4b81ecef4853a2d53a533f788df20bfcf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1980/2561] websocketd: remove git build dep

---
 srcpkgs/websocketd/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 110a42b2a91b..f6e09cd762d4 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -4,7 +4,6 @@ version=0.4.1
 revision=1
 build_style=go
 go_import_path="github.com/joewalnes/websocketd"
-hostmakedepends="git"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"

From b24c5875b95430c84ae0022ef4cac243fd6518cc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1981/2561] wego: remove git build dep

---
 srcpkgs/wego/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 5e806bb83653..a02b1253a235 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -2,7 +2,6 @@
 pkgname=wego
 version=2.1
 revision=1
-hostmakedepends="git"
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"

From 7f74c2f0b3248be41d4d671cc9a86ec274059221 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1982/2561] xurls: remove git build dep

---
 srcpkgs/xurls/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index 03a9960c67d5..797420fe7824 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -5,7 +5,6 @@ revision=2
 build_style=go
 go_import_path="mvdan.cc/xurls/v2"
 go_package="${go_import_path}/cmd/xurls"
-hostmakedepends="git"
 short_desc="Extract urls from text"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 2898d1a89f9fab6b7cb8af7b0e82eec3c13097eb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1983/2561] yggdrasil: remove git build dep

---
 srcpkgs/yggdrasil/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index ce580cd52950..0839a7cda8ad 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc="yggdrasil-go-${version}"
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
-hostmakedepends="git"
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="LGPL-3.0-only"

From 46318d641df7b5946f24cfac9396e08a6f7adf69 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1984/2561] yj: remove git build dep

---
 srcpkgs/yj/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index 395a2c6b15b9..1574254ace3e 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -4,7 +4,6 @@ version=5.1.0
 revision=1
 build_style=go
 go_import_path="github.com/sclevine/yj/v${version%%.*}"
-hostmakedepends="git"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 1c46f87c31ce0f450c6d81fb5ab9d5feb5cb3467 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1985/2561] zrepl: remove git build dep

---
 srcpkgs/zrepl/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index dd4b712b8e46..a989c805ab8f 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"
-hostmakedepends="git"
 depends="zfs"
 short_desc="One-stop ZFS backup & replication solution"
 maintainer="Frans Bergman <frans@tankernn.eu>"

From acea52bb27cb2f414a76fc499396433eb12999fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1986/2561] dep: remove git build dep

---
 srcpkgs/dep/template | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index 79cce5410597..65981b673f88 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -6,7 +6,6 @@ build_style=go
 go_import_path=github.com/golang/dep
 go_package="${go_import_path}/cmd/dep"
 go_ldflags="-X main.version=v${version}"
-hostmakedepends="git"
 depends="git go"
 short_desc="Go dependency management tool"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -15,10 +14,6 @@ homepage="https://github.com/golang/dep"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=929c8f759838f98323211ba408a831ea80d93b75beda8584b6d950f393a3298a
 
-pre_build() {
-	git config --global http.https://gopkg.in.followRedirects true
-}
-
 post_install() {
 	vlicense LICENSE
 }

From a759b2178fd5c1320f597bbc0a1b6b7f51007bf5 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Tue, 3 May 2022 01:15:52 +0200
Subject: [PATCH 1987/2561] go-md2man: update to 2.0.2.

---
 srcpkgs/go-md2man/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index 5f5feb187d3b..c6771ad1f193 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -1,6 +1,6 @@
 # Template file for 'go-md2man'
 pkgname=go-md2man
-version=2.0.1
+version=2.0.2
 revision=1
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
@@ -9,7 +9,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/cpuguy83/go-md2man"
 distfiles="https://github.com/cpuguy83/go-md2man/archive/v${version}.tar.gz"
-checksum=889309ecf43e40d3a76d666b0259dcd71b340ea0fad003784ff3fe0b6c21990e
+checksum=2f52e37101ea2734b02f2b54a53c74305b95b3a9a27792fdac962b5354aa3e4a
 
 post_install() {
 	vlicense LICENSE.md

From 9850b986c73a377b86810c081e98d955304b0b71 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Tue, 3 May 2022 01:00:53 +0200
Subject: [PATCH 1988/2561] dragon: update to 1.2.0.

---
 srcpkgs/dragon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dragon/template b/srcpkgs/dragon/template
index 61e86f39408b..6e19adab1dc9 100644
--- a/srcpkgs/dragon/template
+++ b/srcpkgs/dragon/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon'
 pkgname=dragon
-version=1.1.1
+version=1.2.0
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/mwh/dragon"
 distfiles="https://github.com/mwh/dragon/archive/v${version}.tar.gz"
-checksum=010a508c539c35bd128c54bbe57ad7c17c078e1b95e7bd3457a8589973e0b171
+checksum=9bda28e96d715c759c8a1db754bdfde5e7d83671e13cd25a892f6b5e29357994
 
 do_install() {
 	vbin dragon

From 9ae537d58891844c0f4eb1f42260069245d61e8a Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 May 2022 18:30:12 +0200
Subject: [PATCH 1989/2561] dbeaver: update to 22.0.4.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index a1e7ca0c3004..5890f3e34d22 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=22.0.3
+version=22.0.4
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -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=5af628ec7cd4c0e63fd074dd92d5668788136321cc273f778f20ff8c7907323a
+checksum=ebb6c99d5875a7d68e7a6adb3dc99f2868096208f97137560ba6dbbfb3a06f37
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

From f42e2007ac4bfcf122303eddf47527f678a09aff Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Tue, 3 May 2022 01:07:02 +0200
Subject: [PATCH 1990/2561] s: update to 0.6.6.

---
 srcpkgs/s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 8dd517674760..18c984fc28b3 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,6 +1,6 @@
 # Template file for 's'
 pkgname=s
-version=0.6.4
+version=0.6.6
 revision=1
 build_helper=qemu
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=5829a18da40cb5a936f32240b4244d2a0543cb85dc3d5e013ae5aa08557c148f
+checksum=d91c8d2935f55dc6f241b7abc0325863846bdeac07a8f3bfa99b4a932d20ace3
 
 post_build() {
 	s_cli=$(find $GOPATH/bin -name s)

From cb516291e7b26fe25247525e4edaf3764e3ba3fc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 13:41:23 +0200
Subject: [PATCH 1991/2561] New package: python3-versioningit-1.1.1

---
 srcpkgs/python3-versioningit/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-versioningit/template

diff --git a/srcpkgs/python3-versioningit/template b/srcpkgs/python3-versioningit/template
new file mode 100644
index 000000000000..4751d63ffa00
--- /dev/null
+++ b/srcpkgs/python3-versioningit/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-versioningit'
+pkgname=python3-versioningit
+version=1.1.1
+revision=1
+wrksrc="versioningit-$version"
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+depends="python3-packaging python3-setuptools python3-tomli"
+short_desc="Versioning It with your Version In Git"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="MIT"
+homepage="https://github.com/jwodder/versioningit"
+changelog="https://raw.githubusercontent.com/jwodder/versioningit/master/CHANGELOG.md"
+distfiles="https://github.com/jwodder/versioningit/archive/refs/tags/v$version.tar.gz"
+checksum=45d611fa50f3ef25f678468927b6295e27e295f39d55a5d8c0c426a0fae69445
+
+post_install() {
+	vlicense LICENSE
+}

From ba1d7eff892fcc3576fac88a68e7e2016fb3eb99 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 13:44:17 +0200
Subject: [PATCH 1992/2561] streamlink: update to 4.0.1.

---
 srcpkgs/streamlink/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index 5b8427c56e96..ee0a31a9aa05 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,10 +1,10 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=3.2.0
+version=4.0.1
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-lxml python3-pycryptodome python3-pycountry
+build_style=python3-pep517
+hostmakedepends="python3-wheel python3-versioningit"
+depends="python3-lxml python3-pycryptodome python3-pycountry
  python3-pysocks python3-requests python3-websocket-client python3-isodate"
 checkdepends="$depends python3-pytest python3-mock python3-requests-mock
  python3-freezegun"
@@ -13,8 +13,8 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
-distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz"
-checksum=9770d2d83844c5378a73e14130dcb760abc856566caa0a41fc5b97a0ded5d926
+distfiles="https://github.com/streamlink/streamlink/releases/download/$version/streamlink-$version.tar.gz"
+checksum=f38a4fd5c45b1628e7ebee43ba7f8522be5045565aa7c64009740baf853f20f5
 make_check=ci-skip # some tests fail when running as root
 
 post_install() {

From 5928314206ff1473699388a12289452aabfe3009 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1993/2561] blush: update to 0.6.0.

---
 srcpkgs/blush/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template
index c62c1a7bde85..6e6d068746ea 100644
--- a/srcpkgs/blush/template
+++ b/srcpkgs/blush/template
@@ -1,16 +1,15 @@
 # Template file for 'blush'
 pkgname=blush
-version=0.5.3
-revision=3
+version=0.6.0
+revision=1
 build_style=go
 go_import_path=github.com/arsham/blush
-hostmakedepends="git"
 short_desc="Grep with colours"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://github.com/arsham/blush"
 distfiles="https://github.com/arsham/blush/archive/v${version}.tar.gz"
-checksum=1d96e080e7db9d57bb3aee1a7fae3df2aaa3a3f85cf41077e8235c78840ae740
+checksum=6db6b033bb5d4c4ac350b36b82d79447d5b91509db3a5eceb72ecb9484495e54
 
 post_install() {
 	vlicense LICENSE

From 926e8b41d73664a6c32c5539b11931b7eb815a22 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 28 Feb 2022 14:40:07 +0100
Subject: [PATCH 1994/2561] xbps-src: add make_check_pre

$make_check_pre can be used for wrapper commands like xvfb-run or
dbus-run-session which are common ways to make tests work. This way many
templates can avoid defining their own do_check function.
---
 Manual.md                              | 3 +++
 common/build-style/cargo.sh            | 2 +-
 common/build-style/cmake.sh            | 2 +-
 common/build-style/configure.sh        | 2 +-
 common/build-style/gnu-configure.sh    | 2 +-
 common/build-style/gnu-makefile.sh     | 2 +-
 common/build-style/meson.sh            | 2 +-
 common/build-style/perl-ModuleBuild.sh | 2 +-
 common/build-style/perl-module.sh      | 2 +-
 common/build-style/python-module.sh    | 2 +-
 common/build-style/python3-module.sh   | 4 ++--
 common/build-style/python3-pep517.sh   | 2 +-
 common/build-style/raku-dist.sh        | 2 +-
 common/environment/setup/sourcepkg.sh  | 2 +-
 14 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Manual.md b/Manual.md
index 8ec755499bbe..1ce07792f546 100644
--- a/Manual.md
+++ b/Manual.md
@@ -600,6 +600,9 @@ path of the Python wheel produced by the build phase that will be installed; whe
 `python-pep517` build style will look for a wheel matching the package name and version in the
 current directory with respect to the install.
 
+- `make_check_pre` The expression in front of `${make_cmd}`. This can be used for wrapper commands
+or for setting environment variables for the check command. By default empty.
+
 - `patch_args` The arguments to be passed in to the `patch(1)` command when applying
 patches to the package sources during `do_patch()`. Patches are stored in
 `srcpkgs/<pkgname>/patches` and must be in `-p1` format. By default set to `-Np1`.
diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 53c489772e7f..573a69003614 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -11,7 +11,7 @@ do_build() {
 do_check() {
 	: ${make_cmd:=cargo}
 
-	${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \
+	${make_check_pre} ${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \
 		${make_check_args}
 }
 
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 33a556be0011..7d1d675c3aba 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -116,7 +116,7 @@ do_check() {
 
 	: ${make_check_target:=test}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/configure.sh b/common/build-style/configure.sh
index 0963fc347934..6f2c94ace694 100644
--- a/common/build-style/configure.sh
+++ b/common/build-style/configure.sh
@@ -29,7 +29,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=check}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/gnu-configure.sh b/common/build-style/gnu-configure.sh
index 8121136cd121..f66b081955e2 100644
--- a/common/build-style/gnu-configure.sh
+++ b/common/build-style/gnu-configure.sh
@@ -30,7 +30,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=check}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh
index d7ea148fc483..2492749bd84a 100644
--- a/common/build-style/gnu-makefile.sh
+++ b/common/build-style/gnu-makefile.sh
@@ -30,7 +30,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=check}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh
index ab9f2cacfd0a..a7bd901e9760 100644
--- a/common/build-style/meson.sh
+++ b/common/build-style/meson.sh
@@ -138,7 +138,7 @@ do_check() {
 	: ${make_check_target:=test}
 	: ${meson_builddir:=build}
 
-	${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/perl-ModuleBuild.sh b/common/build-style/perl-ModuleBuild.sh
index a84373b5b0bf..f21d2b0efb4c 100644
--- a/common/build-style/perl-ModuleBuild.sh
+++ b/common/build-style/perl-ModuleBuild.sh
@@ -41,7 +41,7 @@ do_check() {
 	if [ ! -x ./Build ]; then
 		msg_error "$pkgver: cannot find ./Build script!\n"
 	fi
-	./Build test
+	${make_check_pre} ./Build test
 }
 
 do_install() {
diff --git a/common/build-style/perl-module.sh b/common/build-style/perl-module.sh
index b9a01b13cfa9..9126091cb2cf 100644
--- a/common/build-style/perl-module.sh
+++ b/common/build-style/perl-module.sh
@@ -79,7 +79,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=test}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/python-module.sh b/common/build-style/python-module.sh
index 15cf7577adb2..b80801a67247 100644
--- a/common/build-style/python-module.sh
+++ b/common/build-style/python-module.sh
@@ -49,7 +49,7 @@ do_check() {
 			fi
 		fi
 
-		python${pyver} setup.py ${make_check_target:-test} ${make_check_args}
+		${make_check_pre} python${pyver} setup.py ${make_check_target:-test} ${make_check_args}
 		rm build
 	done
 }
diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh
index 093bdae8a006..8daf40e69219 100644
--- a/common/build-style/python3-module.sh
+++ b/common/build-style/python3-module.sh
@@ -25,7 +25,7 @@ do_build() {
 
 do_check() {
 	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		PYTHONPATH="$(cd build/lib* && pwd)" \
+		${make_check_pre} PYTHONPATH="$(cd build/lib* && pwd)" \
 			python3 -m pytest ${make_check_args} ${make_check_target}
 	else
 		# Fall back to deprecated setup.py test orchestration without pytest
@@ -37,7 +37,7 @@ do_check() {
 		fi
 
 		: ${make_check_target:=test}
-		python3 setup.py ${make_check_target} ${make_check_args}
+		${make_check_pre} python3 setup.py ${make_check_target} ${make_check_args}
 	fi
 }
 
diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh
index 075f954a1a69..a733a521fb3d 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -14,7 +14,7 @@ do_build() {
 
 do_check() {
 	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		python3 -m pytest ${make_check_args} ${make_check_target}
+		${make_check_pre} python3 -m pytest ${make_check_args} ${make_check_target}
 	else
 		msg_warn "Unable to determine tests for PEP517 Python templates"
 		return 0
diff --git a/common/build-style/raku-dist.sh b/common/build-style/raku-dist.sh
index 3b1f28d6421b..bbbba96e7140 100644
--- a/common/build-style/raku-dist.sh
+++ b/common/build-style/raku-dist.sh
@@ -3,7 +3,7 @@
 #
 
 do_check() {
-	RAKULIB=lib prove -r -e raku t/
+	${make_check_pre} RAKULIB=lib prove -r -e raku t/
 }
 
 do_install() {
diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh
index bc06f745b78a..e0e16d7915cb 100644
--- a/common/environment/setup/sourcepkg.sh
+++ b/common/environment/setup/sourcepkg.sh
@@ -7,7 +7,7 @@ unset -v archs distfiles checksum build_style build_helper nocross broken
 unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc
 unset -v make_build_args make_check_args make_install_args
 unset -v make_build_target make_check_target make_install_target
-unset -v make_cmd meson_cmd gem_cmd fetch_cmd
+unset -v make_cmd meson_cmd gem_cmd fetch_cmd make_check_pre
 unset -v python_version stackage
 unset -v cmake_builddir meson_builddir
 unset -v meson_crossfile

From 4977c0573ac08058ab824f7b46976b5d3caeb198 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 28 Feb 2022 14:41:46 +0100
Subject: [PATCH 1995/2561] totem: fix tests

---
 srcpkgs/totem/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index c3e8c0911ba3..bccea7f2a7c3 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -12,21 +12,19 @@ makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
  gst-plugins-ugly1 libSM-devel libXtst-devel libepc-devel libpeas-devel
  nautilus-devel zeitgeist-devel gst-plugins-base1-devel"
 depends="grilo-plugins gst-libav gst-plugins-good1 gst-plugins-ugly1 tracker3"
+checkdepends="xvfb-run"
 short_desc="GNOME integrated movie player based on Gstreamer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Videos"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=fce562e2b26cbcfc0c678538dcc81f9dc15ce60d5a89ee4358907bf634304c40
+make_check_pre="xvfb-run"
 
 # XXX xulrunner plugin.
 # XXX reenable python plugin if pylint pkg exists.
 #pycompile_dirs="usr/lib/totem/plugins"
 
-do_check() {
-	:
-}
-
 libtotem_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From 5e1585b70ac93606064d465852057f7edbf3ee83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 08:57:55 -0300
Subject: [PATCH 1996/2561] SuiteSparse: update to 5.12.0.

---
 .../patches/skip-demo-on-build.patch          | 22 +++++++++++++++++++
 srcpkgs/SuiteSparse/template                  |  7 +++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch

diff --git a/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch b/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch
new file mode 100644
index 000000000000..9ec775229ed6
--- /dev/null
+++ b/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch
@@ -0,0 +1,22 @@
+This is to avoid running demos on `make install`, which break cross compile
+
+--- a/Makefile
++++ b/Makefile
+@@ -294,7 +294,7 @@ endif
+ # just compile GraphBLAS
+ gb:
+ 	echo $(CMAKE_OPTIONS)
+-	( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
++	( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+ 
+ # compile and install GraphBLAS libgraphblas_renamed, for MATLAB
+ gbrenamed:
+@@ -309,7 +309,7 @@ gbrenamed:
+ 
+ # just compile Mongoose
+ mon:
+-	( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
++	( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+ 
+ # compile and install Mongoose
+ moninstall: mon
diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index ab5c829e3ab7..b304dfc8f786 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,7 +1,7 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=5.10.1
-revision=2
+version=5.12.0
+revision=1
 # XXX: re-enable TBB=-ltbb -DSPQR_CONFIG=-DHAVE_TBB when updating, if possible
 make_build_args="BLAS=-lblas LAPACK=-llapack"
 hostmakedepends="cmake chrpath"
@@ -10,8 +10,9 @@ short_desc="Suite of sparse matrix software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="custom:multiple"
 homepage="https://people.engr.tamu.edu/davis/suitesparse.html"
+changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog"
 distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz"
-checksum=acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee
+checksum=5fb0064a3398111976f30c5908a8c0b40df44c6dd8f0cc4bfa7b9e45d8c647de
 
 do_build() {
 	make config library $make_build_args JOBS=$XBPS_MAKEJOBS

From ad93afe053ddd8c8dfb1f48ee1683dc94d67c51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:25:55 -0300
Subject: [PATCH 1997/2561] igraph: update to 0.9.8.

---
 srcpkgs/igraph/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/igraph/template b/srcpkgs/igraph/template
index f131886aae63..983de0006d3b 100644
--- a/srcpkgs/igraph/template
+++ b/srcpkgs/igraph/template
@@ -1,6 +1,6 @@
 # Template file for 'igraph'
 pkgname=igraph
-version=0.9.6
+version=0.9.8
 revision=1
 build_style=cmake
 configure_args="-DIGRAPH_ENABLE_TLS=on -DIGRAPH_ENABLE_LTO=on -DBUILD_SHARED_LIBS=ON"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://igraph.org/c/"
 changelog="https://raw.githubusercontent.com/igraph/igraph/master/CHANGELOG.md"
 distfiles="https://github.com/igraph/igraph/releases/download/${version}/igraph-${version}.tar.gz"
-checksum=7c299ec54eecfe413758c332a42c4cb71d02d2951b2ac232584d317c5792f387
+checksum=f9a83473cea3e037b605b79b336be656b00dcf3037b233b4b250bd9270f36397
 
 igraph-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From af9059f7acfa61fcc4ffcf0ca7828af5f9788db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:39:35 -0300
Subject: [PATCH 1998/2561] planarity: update to 3.0.2.0.

---
 srcpkgs/planarity/template | 4 ++--
 srcpkgs/planarity/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/planarity/template b/srcpkgs/planarity/template
index aab5ce4a08fc..fe5d9e08c9f9 100644
--- a/srcpkgs/planarity/template
+++ b/srcpkgs/planarity/template
@@ -1,6 +1,6 @@
 # Template file for 'planarity'
 pkgname=planarity
-version=3.0.1.1
+version=3.0.2.0
 revision=1
 build_style=gnu-configure
 short_desc="Graph algorithms for planar embedding and related algorithms"
@@ -8,7 +8,7 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-3-Clause"
 homepage="https://github.com/graph-algorithms/edge-addition-planarity-suite/"
 distfiles="https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_${version}/planarity-${version}.tar.gz"
-checksum=50b686fce6e67ba3a4d0634632c16566539a95d7e51afd066f6b1d5ae0eab284
+checksum=b4897df8f323e660197242e0aa273a542a59782cad783d7334111a9ad49b9e08
 
 post_install() {
 	vlicense LICENSE.TXT
diff --git a/srcpkgs/planarity/update b/srcpkgs/planarity/update
index 315139e84f6e..3dffcc02a424 100644
--- a/srcpkgs/planarity/update
+++ b/srcpkgs/planarity/update
@@ -1 +1,2 @@
 site=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases
+ignore=*.WindowsExe

From fba36d22caebcb066423d3c586aec13a28f4ef86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:41:43 -0300
Subject: [PATCH 1999/2561] python3-cvxopt: update to 1.3.0.

Also:
 - fix support for gsl
 - enable support for fftw
---
 srcpkgs/python3-cvxopt/patches/fix-gsl.patch | 11 +++++++++++
 srcpkgs/python3-cvxopt/template              |  8 +++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/python3-cvxopt/patches/fix-gsl.patch

diff --git a/srcpkgs/python3-cvxopt/patches/fix-gsl.patch b/srcpkgs/python3-cvxopt/patches/fix-gsl.patch
new file mode 100644
index 000000000000..e32dc2fbf1e1
--- /dev/null
+++ b/srcpkgs/python3-cvxopt/patches/fix-gsl.patch
@@ -0,0 +1,11 @@
+--- a/setup.py	2022-03-07 18:58:58.000000000 -0300
++++ b/setup.py	2022-04-14 22:25:18.860887901 -0300
+@@ -129,7 +129,7 @@
+ # optional modules
+ 
+ if BUILD_GSL:
+-    gsl = Extension('gsl', libraries = M_LIB + ['gsl'] + BLAS_LIB,
++    gsl = Extension('gsl', libraries = M_LIB + ['gsl', 'gslcblas'],
+         include_dirs = [ GSL_INC_DIR ],
+         library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ],
+         define_macros = GSL_MACROS,
diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template
index 0fb769b294e0..d89abbcafa5f 100644
--- a/srcpkgs/python3-cvxopt/template
+++ b/srcpkgs/python3-cvxopt/template
@@ -1,20 +1,22 @@
 # Template file for 'python3-cvxopt'
 pkgname=python3-cvxopt
-version=1.2.7
+version=1.3.0
 revision=1
 wrksrc="cvxopt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel blas-devel lapack-devel SuiteSparse-devel gsl-devel glpk-devel"
+makedepends="python3-devel blas-devel lapack-devel SuiteSparse-devel gsl-devel
+ glpk-devel fftw-devel"
 checkdepends="python3-pytest"
 short_desc="Python software for convex optimization"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-or-later"
 homepage="http://cvxopt.org/"
 distfiles="${PYPI_SITE}/c/cvxopt/cvxopt-${version}.tar.gz"
-checksum=3f9db1f4d4e820aaea81d6fc21054c89dc6327c84f935dd5a1eda1af11e1d504
+checksum=00b1b232f9d1f902d578a9d75814b67fa020758d5ae422e28ca8cef6269fa5c6
 
 pre_build() {
 	export CVXOPT_BUILD_GSL=1
 	export CVXOPT_BUILD_GLPK=1
+	export CVXOPT_BUILD_FFTW=1
 }

From 0a24c5ac2db4cf306729e764460e93eece5a5686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 8 Apr 2022 20:57:31 -0300
Subject: [PATCH 2000/2561] giac: update to 1.9.0.7.

---
 srcpkgs/giac/patches/fgamma.patch  |  2 +-
 srcpkgs/giac/patches/micropy.patch | 18 ------------------
 srcpkgs/giac/template              | 10 ++++++++--
 3 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/giac/patches/micropy.patch

diff --git a/srcpkgs/giac/patches/fgamma.patch b/srcpkgs/giac/patches/fgamma.patch
index 665803db13f3..8cdc5fda88ac 100644
--- a/srcpkgs/giac/patches/fgamma.patch
+++ b/srcpkgs/giac/patches/fgamma.patch
@@ -1,7 +1,7 @@
 --- a/src/first.h	2017-09-22 20:44:12.000000000 +0200
 +++ b/src/first.h	2017-11-14 15:26:53.529711489 +0100
 @@ -503,7 +503,7 @@
- #if defined(__MINGW_H) || defined(VISUALC) // FIXME gamma, not used
+ #if defined(__MINGW_H) || defined(VISUALC) || defined(FXCG)// FIXME gamma, not used
  inline float fgamma(float f1){ return f1; }
  #else
 -inline float fgamma(float f1){ return gammaf(f1); } // or tgammaf(f1) on some versions of emscripten
diff --git a/srcpkgs/giac/patches/micropy.patch b/srcpkgs/giac/patches/micropy.patch
deleted file mode 100644
index 0e417a5a8ecb..000000000000
--- a/srcpkgs/giac/patches/micropy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/icas.cc	2021-03-02 04:52:40.000000000 -0300
-+++ b/src/icas.cc	2022-03-30 10:00:39.154056068 -0300
-@@ -1810,6 +1810,7 @@
-     cerr << "// Setting tex log" << '\n';
-     show_tex=true;
-   }
-+#ifdef HAVE_LIBMICROPYTHON
-   if (getenv("GIAC_MICROPY")){
-     cerr << "Micropython mode\n";
-     python_compat(4 | python_compat(contextptr),contextptr);
-@@ -1821,6 +1822,7 @@
-       return 0;
-     }
-   }
-+#endif
- #ifdef HAVE_LIBREADLINE
-   if (ARGC==1){
-     int taillemax=1000;
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index fbdadc31dde7..e892c8bf7506 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,6 +1,6 @@
 # Template file for 'giac'
 pkgname=giac
-version=1.7.0.53
+version=1.9.0.7
 revision=1
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
@@ -14,11 +14,17 @@ license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 changelog="https://www-fourier.ujf-grenoble.fr/~parisse/install_en#new"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
-checksum=74e5f98f63147c0197e4ce309601ae745312761be61c1a99c8a6bab4862e4a9f
+checksum=72016988b7180e9b630ecabecc60969213e7b61418c2598c91acbaec139fd740
 
 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"
 
+post_extract() {
+	# remove a binary that works only for x86_64 host
+	# the binary will be rebuilt using host compiler
+	rm src/mkjs
+}
+
 post_install() {
 	# remove duplicates
 	rm -r ${DESTDIR}/usr/share/doc

From 0e25add3634076850347b137aab27ab0a05fc20f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 15 Apr 2022 13:51:02 -0300
Subject: [PATCH 2001/2561] pari-nflistdata: update to 20220326.

---
 srcpkgs/pari-nflistdata/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pari-nflistdata/template b/srcpkgs/pari-nflistdata/template
index c6e66f228b98..c4089cdb84a3 100644
--- a/srcpkgs/pari-nflistdata/template
+++ b/srcpkgs/pari-nflistdata/template
@@ -1,6 +1,6 @@
 # Template file for 'pari-nflistdata'
 pkgname=pari-nflistdata
-version=20210527
+version=20220326
 revision=1
 create_wrksrc=yes
 short_desc="PARI/GP database needed by nflist"
@@ -8,10 +8,10 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr/packages.html"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/${pkgname#pari-}.tgz>${pkgname}-${version}.tar.gz"
-checksum=a123b2a6776a6579108254f5dbe9fd720ddbc7e46456b45e90a69e92a73b0597
+checksum=f298af350a0d329bb3b8d4ff6880865be213098d106b484d5477b1dc2e06b90f
 
 do_build() {
-	# compressed data files work ok (install-size: 4.1M -> 2.9M)
+	# compressed data files work ok (install-size: 15M -> 8.8M)
 	find data -type f -size +4k -print0 | xargs -0 gzip -9
 }
 

From b53626cd9d0ca73ba16712915ac91628f4f3da34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 28 Apr 2022 11:24:39 -0300
Subject: [PATCH 2002/2561] flintlib: update to 2.8.5.

Also, enable openblas (used for matrix multiplication)
---
 srcpkgs/flintlib/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template
index cebf8e300812..57a4a2de4f42 100644
--- a/srcpkgs/flintlib/template
+++ b/srcpkgs/flintlib/template
@@ -1,21 +1,24 @@
 # Template file for 'flintlib'
 pkgname=flintlib
-version=2.8.4
+version=2.8.5
 revision=1
 wrksrc="flint-${version}"
 build_style=configure
-configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr $(vopt_if ntl --with-ntl=/usr)"
-makedepends="mpfr-devel $(vopt_if ntl ntl-devel)"
+configure_args="--prefix=/usr $(vopt_with ntl)
+ $(vopt_if openblas --with-blas=${XBPS_CROSS_BASE}/usr/include/openblas)"
+makedepends="mpfr-devel $(vopt_if ntl ntl-devel)
+ $(vopt_if openblas openblas-devel)"
 short_desc="Fast Library for Number Theory"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="https://flintlib.org"
 changelog="https://raw.githubusercontent.com/wbhart/flint2/trunk/NEWS"
 distfiles="https://flintlib.org/flint-${version}.tar.gz"
-checksum=61df92ea8c8e9dc692d46c71d7f50aaa09a33d4ba08d02a1784730a445e5e4be
+checksum=5911fedff911100f15781f35e3a4fa934fe60e4aea02a8c10cc8918101c1eed8
 
-build_options="ntl"
+build_options="ntl openblas"
 desc_option_ntl="enable NTL support"
+build_options_default="openblas"
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" ntl"

From 7c2cbf307db72425189c612021a9c2ceb51cd8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 3 May 2022 23:07:32 -0300
Subject: [PATCH 2003/2561] primesieve: update to 7.9.

---
 srcpkgs/primesieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/primesieve/template b/srcpkgs/primesieve/template
index 2737e1b3013c..7bfb5bc29c28 100644
--- a/srcpkgs/primesieve/template
+++ b/srcpkgs/primesieve/template
@@ -1,6 +1,6 @@
 # Template file for 'primesieve'
 pkgname=primesieve
-version=7.8
+version=7.9
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTS=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/kimwalisch/primesieve"
 changelog="https://raw.githubusercontent.com/kimwalisch/primesieve/master/ChangeLog"
 distfiles="https://github.com/kimwalisch/primesieve/archive/refs/tags/v${version}.tar.gz"
-checksum=0cd0490259e6e919c6e3dd3f3e69ac6d91e6cbe616e22a219abe4006d9293d5d
+checksum=c567f2a1a9d46a70020f920eb2c794142528a31a055995500e7fcb19642b7c91
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From df614f43dc0d686c0aa4ea40d0975ba0bbeaf476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 3 May 2022 23:07:36 -0300
Subject: [PATCH 2004/2561] primecount: update to 7.3.

---
 srcpkgs/primecount/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/primecount/template b/srcpkgs/primecount/template
index 09a43b602f19..b20c0897c523 100644
--- a/srcpkgs/primecount/template
+++ b/srcpkgs/primecount/template
@@ -1,6 +1,6 @@
 # Template file for 'primecount'
 pkgname=primecount
-version=7.2
+version=7.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTS=ON -DBUILD_LIBPRIMESIEVE=OFF
@@ -10,8 +10,9 @@ short_desc="Fast prime counting function"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-2-Clause"
 homepage="https://github.com/kimwalisch/primecount/"
+changelog="https://raw.githubusercontent.com/kimwalisch/primecount/master/ChangeLog"
 distfiles="https://github.com/kimwalisch/primecount/archive/refs/tags/v${version}.tar.gz"
-checksum=54c1eec33e665a780002dda20cf39ba0cefa8e846fdeda44734fb2265cba9257
+checksum=471fe21461e42e5f28404e17ff840fb527b3ec4064853253ee22cf4a81656332
 
 build_options="native_build"
 

From e55f8c21ea3c214c92e5ab0e93348fb54847c9f0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 May 2022 19:40:52 +0200
Subject: [PATCH 2005/2561] syncthing: update to 1.20.1.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index d1cdcc490bb2..7d5c7893b3e2 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.20.0
+version=1.20.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
 homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=27d9b52f18ebd833938731ffaaeed4f34ced534ef3d1ed2bc126a495764f753d
+checksum=4b355eda64b9f52d53b34ab99a1ff73dc3d5ad5e43086223e7fc7f4d05a58a05
 
 pre_build() {
 	GOARCH= go generate \

From 6ecffafdebd59a887dfdd7f162104c0650ea75bb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 May 2022 19:43:32 +0200
Subject: [PATCH 2006/2561] lollypop: update to 1.4.34.

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 02145a66a808..d30ca5dbb206 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.33
+version=1.4.34
 revision=1
 build_style=meson
 hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config"
@@ -14,4 +14,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/lollypop-${version}.tar.xz"
-checksum=b1f806b3b844400131c7dc1bfad46843fc9ffcfbbf1fdeeab6bc348a74803529
+checksum=b1e6786c331c61232a26fbeca281cb47242ca56754fef4492aa79b9b0f4d1fae

From 5864b2982be158653f597991fd0233b129cd7dd6 Mon Sep 17 00:00:00 2001
From: Kyra Zimmer <me@nonchip.de>
Date: Tue, 3 May 2022 10:35:41 +0200
Subject: [PATCH 2007/2561] sublime-merge-bin: update to 2071.

---
 srcpkgs/sublime-merge-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index 8c5cd2e290fe..73583df6b1ef 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2068
+version=2071
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=0ac7994208eaafc07ae9295fff215966c9d115cdf3a8218a140cd274c45074d2
+checksum=c58564e45c7a55da07cdfd1c6e68702b212be470c46603e00e8056420fed4b45
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree

From 3d515e8147b4e3945f57237e4149a4cc555dea9e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 4 May 2022 17:35:51 -0500
Subject: [PATCH 2008/2561] nvidia: fix broken symlink

---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 3707accdab6e..1ff0e8dbc33b 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=510.60.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -136,7 +136,7 @@ do_install() {
 	vinstall 15_nvidia_gbm.json 755 usr/share/glvnd/egl_vendor.d
 
 	vmkdir usr/lib/gbm
-	ln -sf libnvidia-allocator.so.${version} \
+	ln -sf /usr/lib/libnvidia-allocator.so.${version} \
 		${DESTDIR}/usr/lib/gbm/nvidia-drm_gbm.so
 
 	vinstall 10_nvidia.json 755 usr/share/glvnd/egl_vendor.d

From 81815370ef8f7cd5dc808a1238f42803ffb3d016 Mon Sep 17 00:00:00 2001
From: Markus Uhlin <markus.uhlin@bredband.net>
Date: Wed, 4 May 2022 22:00:53 +0200
Subject: [PATCH 2009/2561] swirc: update to 3.3.4.

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 2f56d62942bf..5a4b6482a3b7 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,6 +1,6 @@
 # Template file for 'swirc'
 pkgname=swirc
-version=3.3.3
+version=3.3.4
 revision=1
 build_style=configure
 configure_args="$(vopt_with notify libnotify)"
@@ -15,7 +15,7 @@ license="BSD-3-Clause, ISC, MIT"
 homepage="https://www.nifty-networks.net/swirc"
 changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md"
 distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz"
-checksum="29bd8ece384527ab22ee994c000049ba4623e8ce6e0ca8023e1386ba60e72acf"
+checksum="2a8404965e796a67555b10b54aaf53d32bbd63e1707cd8364c572a5ed7e3f837"
 
 build_options="notify"
 

From 61c3f401380d8eb043497294e47dab186cd56ff8 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 4 May 2022 11:04:05 -0400
Subject: [PATCH 2010/2561] polybar: update to 3.6.3.

---
 srcpkgs/polybar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index 9a2021d35381..b59ed9cd039a 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -1,6 +1,6 @@
 # Template file for 'polybar'
 pkgname=polybar
-version=3.6.2
+version=3.6.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_CONFIG=OFF -DBUILD_DOC_HTML=OFF
@@ -25,7 +25,7 @@ license="MIT"
 homepage="https://github.com/polybar/polybar"
 changelog="https://raw.githubusercontent.com/polybar/polybar/master/CHANGELOG.md"
 distfiles="https://github.com/polybar/polybar/releases/download/${version}/polybar-${version}.tar.gz"
-checksum=73becc942e7d2418bc72bd194f2037a2a86792219fd561b663a8509fd5f547a0
+checksum=f25758573567208fc7b6f4d4115a6117a87389cbcc094cf605d079775be95fa5
 # tries to download and build unstable/unreleased googletest during configure
 make_check=no
 

From 53b56e2c33d725271b1b1eb30cea8e6205268ec7 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Wed, 27 Apr 2022 09:27:20 +0200
Subject: [PATCH 2011/2561] google-chrome: update to 101.0.4951.41

---
 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 b20753366d95..c6614dbcd27b 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=100.0.4896.127
+version=101.0.4951.41
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=d012bc3e5e000bffbd83cf20c48add187c52b065cc37408862c42d127aa4a656
+checksum=78d24e94017eb94ab771d49bcd4dd0684f86ca05bc40250fe3151040aefedf8a
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From a1c80e91f71115a98d2253d045bac54d24b57641 Mon Sep 17 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, 17 Apr 2022 00:16:10 +0700
Subject: [PATCH 2012/2561] refind: update to 0.13.3.1.

---
 .../patches/refind-install-abs-path.patch     | 113 ++++++++++++++++++
 srcpkgs/refind/template                       |  56 ++++-----
 2 files changed, 134 insertions(+), 35 deletions(-)
 create mode 100644 srcpkgs/refind/patches/refind-install-abs-path.patch

diff --git a/srcpkgs/refind/patches/refind-install-abs-path.patch b/srcpkgs/refind/patches/refind-install-abs-path.patch
new file mode 100644
index 000000000000..22f30cbce019
--- /dev/null
+++ b/srcpkgs/refind/patches/refind-install-abs-path.patch
@@ -0,0 +1,113 @@
+Index: refind-0.13.3.1/refind-install
+===================================================================
+--- refind-0.13.3.1.orig/refind-install
++++ refind-0.13.3.1/refind-install
+@@ -342,19 +342,8 @@ DeterminePlatform() {
+ # $ThisDir to point to the directory in which this script resides,
+ # and $RefindDir to point to where the rEFInd binaries live
+ CheckForFiles() {
+-   # Note: $ThisDir points to real (not symlinked) script home on Linux,
+-   # enabling creating a symlink in /usr/sbin (or wherever); but on OS X,
+-   # "readlink" doesn't do the same thing as under Linux, so the script
+-   # must not be a symlink under OS X.
+-   case "$OSTYPE" in
+-      darwin*)
+-           ThisDir="$( cd -P "${BASH_SOURCE%/*}" && pwd )"
+-           ;;
+-      linux*)
+-           ThisDir="$(dirname "$(readlink -f "$0")")"
+-           ;;
+-   esac
+-   RefindDir="$ThisDir/refind"
++   ThisDir="/do/not/use/this/var"
++   RefindDir="/usr/share/refind"
+ 
+    if [[ ! -f "$RefindDir/refind_$Platform.efi" ]] ; then
+       echo "The rEFInd binary file is missing! Aborting installation!"
+@@ -363,8 +352,6 @@ CheckForFiles() {
+ 
+    if [[ -f "$RefindDir/refind.conf-sample" ]] ; then
+       ConfFile="$RefindDir/refind.conf-sample"
+-   elif [[ -f "$ThisDir/refind.conf-sample" ]] ; then
+-      ConfFile="$ThisDir/refind.conf-sample"
+    else
+       echo "The sample configuration file is missing! Aborting installation!"
+       exit 1
+@@ -372,8 +359,6 @@ CheckForFiles() {
+ 
+    if [[ -d "$RefindDir/icons" ]] ; then
+       IconsDir="$RefindDir/icons"
+-   elif [[ -d "$ThisDir/icons" ]] ; then
+-      IconsDir="$ThisDir/icons"
+    else
+       echo "The icons directory is missing! Aborting installation!"
+       exit 1
+@@ -603,7 +588,6 @@ SetBootFS() {
+ CopyDrivers() {
+    if [[ $InstallDrivers == "all" ]] ; then
+       mkdir -p "$InstallDir/$TargetDir/drivers_$1"
+-      cp "$ThisDir"/drivers_"$1"/*_"$1".efi "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null
+       cp "$RefindDir"/drivers_"$1"/*_"$1".efi "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null
+    elif [[ "$InstallDrivers" == "boot" ]] ; then
+       SetBootFS
+@@ -628,7 +612,6 @@ CopyDrivers() {
+       if [[ -n $BootFS ]] ; then
+          echo "Installing driver for $BootFS (${DriverType}_$1.efi)"
+          mkdir -p "$InstallDir/$TargetDir/drivers_$1"
+-         cp "$ThisDir/drivers_$1/${DriverType}_$1.efi" "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null
+          cp "$RefindDir/drivers_$1/${DriverType}_$1.efi" "$InstallDir/$TargetDir/drivers_$1"/ 2> /dev/null
+       fi
+    fi
+@@ -669,7 +652,6 @@ CopyRefindFiles() {
+       fi
+       if [[ $InstallDrivers == "all" ]] ; then
+          cp -r "$RefindDir"/drivers_* "$InstallDir/$TargetDir/" 2> /dev/null
+-         cp -r "$ThisDir"/drivers_* "$InstallDir/$TargetDir/" 2> /dev/null
+       elif [[ $Upgrade == 1 || $InstallToEspOnMac == 1 ]] ; then
+          CopyDrivers "$Platform"
+          CopyTools "$Platform"
+@@ -693,8 +675,8 @@ CopyRefindFiles() {
+          if [[ $LocalKeys == 0 ]] ; then
+             echo "Storing copies of rEFInd Secure Boot public keys in $EtcKeysDir"
+             mkdir -p "$EtcKeysDir"
+-            cp "$ThisDir/keys/refind.cer" "$EtcKeysDir" 2> /dev/null
+-            cp "$ThisDir/keys/refind.crt" "$EtcKeysDir" 2> /dev/null
++            cp "$RefindDir/keys/refind.cer" "$EtcKeysDir" 2> /dev/null
++            cp "$RefindDir/keys/refind.crt" "$EtcKeysDir" 2> /dev/null
+          fi
+       fi
+       if [[ "$TargetDir" == '/System/Library/CoreServices' ]] ; then
+@@ -731,7 +713,7 @@ CopyRefindFiles() {
+       Problems=1
+    fi
+    mkdir -p "$InstallDir/$TargetDir/keys"
+-   cp -rf "$ThisDir"/keys/*.[cd]er "$InstallDir/$TargetDir/keys/" 2> /dev/null
++   cp -rf "$RefindDir"/keys/*.[cd]er "$InstallDir/$TargetDir/keys/" 2> /dev/null
+    cp -rf "$EtcKeysDir"/*.[cd]er "$InstallDir/$TargetDir/keys/" 2> /dev/null
+    if [[ -f "$InstallDir/$TargetDir/refind.conf" ]] ; then
+       echo "Existing refind.conf file found; copying sample file as refind.conf-sample"
+@@ -1139,14 +1121,12 @@ ReSignBinaries() {
+    GenerateKeys
+    mkdir -p "$TempDir/drivers_$Platform"
+    cp "$RefindDir/refind.conf-sample $TempDir" 2> /dev/null
+-   cp "$ThisDir/refind.conf-sample $TempDir" 2> /dev/null
+    cp "$RefindDir/refind_ia32.efi $TempDir" 2> /dev/null
+    cp -a "$RefindDir/drivers_ia32 $TempDir" 2> /dev/null
+-   cp -a "$ThisDir/drivers_ia32 $TempDir" 2> /dev/null
+    SignOneBinary "$RefindDir/refind_$Platform.efi" "$TempDir/refind_$Platform.efi"
+    SaveIFS=$IFS
+    IFS=$(echo -en "\n\b")
+-   for Driver in $(ls "$RefindDir"/drivers_$Platform/*.efi "$ThisDir"/drivers_$Platform/*.efi 2> /dev/null) ; do
++   for Driver in $(ls "$RefindDir"/drivers_$Platform/*.efi 2> /dev/null) ; do
+       TempName=$(basename "$Driver")
+       SignOneBinary "$Driver" "$TempDir/drivers_$Platform/$TempName"
+    done
+@@ -1403,7 +1383,7 @@ InstallSBKey() {
+     if [ "$LocalKeys" == "1" ] ; then
+         UsedDerKey="$DerKey"
+     else
+-        UsedDerKey="$ThisDir/keys/refind.cer"
++        UsedDerKey="$RefindDir/keys/refind.cer"
+     fi
+     if command -v mokutil &>/dev/null ; then
+        if mokutil --test-key "$UsedDerKey" &> /dev/null ; then
diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index 49d462907523..bec621c4e3a1 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -1,6 +1,6 @@
 # Template file for 'refind'
 pkgname=refind
-version=0.13.2
+version=0.13.3.1
 revision=1
 archs="x86_64* i686* aarch64*"
 makedepends="gnu-efi-libs"
@@ -10,27 +10,10 @@ 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=dd58944854a42df5a2a943f15e5dcfd995808f28580df96ad39d68fb1e48c970
+checksum=7a3e3f0f81bd4ae95f24e120f44e01319231f488fef7cc8bf03a1aea23c6cfd1
 python_version=2
 conf_files="/etc/default/refind-kernel-hook.conf"
-
-post_extract() {
-	vsed -e 's|RefindDir=\"\$ThisDir/refind\"|RefindDir="/usr/share/refind"|g' \
-		-i refind-install
-
-	# Patch paths to libaries and includes for cross-compiling
-	vsed \
-		-e "s|^EFIINC.*|EFIINC = ${XBPS_CROSS_BASE}/usr/include/efi|" \
-		-e "s|^GNUEFILIB.*|GNUEFILIB = ${XBPS_CROSS_BASE}/usr/lib|" \
-		-e "s|^EFILIB.*|EFILIB = ${XBPS_CROSS_BASE}/usr/lib|" \
-		-e "s|^EFICRT0.*|EFICRT0 = ${XBPS_CROSS_BASE}/usr/lib|" \
-		-i Make.common
-
-	# Only this file is written in python3
-	# All other files are python2
-	vsed -e '1s,^.*python3$,#!/usr/bin/python3,' \
-			-i refind-mkdefault
-}
+make_dirs="/etc/refind.d/keys 0755 root root"
 
 do_build() {
 	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
@@ -44,7 +27,12 @@ do_build() {
 		export CROSS_COMPILE="${XBPS_CROSS_TRIPLET}-"
 	fi
 
-	make ARCH=${_ARCH} gnuefi fs_gnuefi
+	make ARCH=${_ARCH} \
+		EFIINC=${XBPS_CROSS_BASE}/usr/include/efi \
+		GNUEFILIB=${XBPS_CROSS_BASE}/usr/lib \
+		EFILIB=${XBPS_CROSS_BASE}/usr/lib \
+		EFICRT0=${XBPS_CROSS_BASE}/usr/lib \
+		gnuefi fs_gnuefi
 }
 
 do_install() {
@@ -67,27 +55,25 @@ do_install() {
 	vdoc README.txt
 	vdoc CREDITS.txt
 	vdoc NEWS.txt
-	vcopy docs/refind /usr/share/doc/refind
-	vcopy docs/Styles /usr/share/doc/refind
+	vcopy docs/refind usr/share/doc/refind
+	vcopy docs/Styles usr/share/doc/refind
 
 	vman docs/man/mkrlconf.8
 	vman docs/man/mvrefind.8
 	vman docs/man/refind-install.8
 	vman docs/man/refind-mkdefault.8
 
-	vmkdir usr/share/refind
-	vcopy refind/refind_${_EFI_ARCH}.efi /usr/share/refind/
-	vcopy refind.conf-sample /usr/share/refind/
-	vcopy fonts /usr/share/refind/
-	vcopy icons /usr/share/refind/
-	vcopy banners /usr/share/refind/
-	vcopy images /usr/share/refind/
-	vcopy drivers_${_EFI_ARCH} /usr/share/refind/
-	vmkdir usr/share/refind/tools_${_EFI_ARCH}
-	vcopy gptsync/gptsync_${_EFI_ARCH}.efi /usr/share/refind/tools_${_EFI_ARCH}/
+	vinstall refind/refind_${_EFI_ARCH}.efi 644 usr/share/refind/
+	vinstall refind.conf-sample 644 usr/share/refind/
+	vcopy keys usr/share/refind
+	vcopy fonts usr/share/refind/
+	vcopy icons usr/share/refind/
+	vcopy banners usr/share/refind/
+	vcopy images usr/share/refind/
+	vcopy drivers_${_EFI_ARCH} usr/share/refind/
+	vinstall gptsync/gptsync_${_EFI_ARCH}.efi 644 \
+		usr/share/refind/tools_${_EFI_ARCH}/
 
-	vmkdir etc/refind.d
-	vcopy keys /etc/refind.d/
 
 	vinstall "${FILESDIR}/refind-kernel-hook.conf" 644 etc/default
 	vinstall ${FILESDIR}/kernel.post-install 744 \

From c7d14cdaaf5dffc4f563cf66a26e9d090cc57620 Mon Sep 17 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, 5 May 2022 09:42:16 +0700
Subject: [PATCH 2013/2561] gnu-efi-libs: update to 3.0.14.

---
 srcpkgs/gnu-efi-libs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 0b8c679b5225..a0e5ad82d53b 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.12
+version=3.0.14
 revision=1
 wrksrc="gnu-efi-${version}"
 makedepends="pciutils-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=0196f2e1fd3c334b66e610a608a0e59233474c7a01bec7bc53989639aa327669
+checksum=b73b643a0d5697d1f396d7431448e886dd805668789578e3e1a28277c9528435
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet

From 48795603830b051ceba29a22e467e556d79b5822 Mon Sep 17 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, 5 May 2022 09:42:29 +0700
Subject: [PATCH 2014/2561] mutt: update to 2.2.4.

---
 srcpkgs/mutt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 4c65fcdec66b..ba747971293e 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.2.3
+version=2.2.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
@@ -8,7 +8,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --sysconfdir=/etc/$pkgname
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
-hostmakedepends="perl pkg-config"
+hostmakedepends="perl pkg-config gettext"
 makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel zlib-devel"
 depends="cyrus-sasl-modules mime-types"
@@ -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=978addcdab454f447ed7d1de84b5767e714c30714285bf82e4a1745071d18d89
+checksum=b82776bebff0e10820a33fa1e7eafa5cba4ab3a011b08e83b66ed62d75c6e060
 
 post_install() {
 	# provided by mime-types

From 202cab4cc15c6543925ec8c21da5d2f3189f1789 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 20 Mar 2022 16:09:47 -0400
Subject: [PATCH 2015/2561] xbps-triggers: add openjdk-profile trigger

This removes the need for each openjdk package to provide their own
/etc/profile.d entry, and fixes the conflict caused by each providing
their own.
---
 Manual.md                                   |  8 +++++
 srcpkgs/xbps-triggers/files/openjdk-profile | 39 +++++++++++++++++++++
 srcpkgs/xbps-triggers/template              |  2 +-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/xbps-triggers/files/openjdk-profile

diff --git a/Manual.md b/Manual.md
index 1ce07792f546..8afe781f0ec1 100644
--- a/Manual.md
+++ b/Manual.md
@@ -62,6 +62,7 @@ packages for XBPS, the `Void Linux` native packaging system.
 		* [kernel-hooks](#triggers_kernel_hooks)
 		* [mimedb](#triggers_mimedb)
 		* [mkdirs](#triggers_mkdirs)
+		* [openjdk-profile](#triggers_openjdk_profile)
 		* [pango-modules](#triggers_pango_module)
 		* [pycompile](#triggers_pycompile)
 		* [register-shell](#triggers_register_shell)
@@ -2000,6 +2001,13 @@ During removal it will delete the directory using `rmdir`.
 To include this trigger use the `make_dirs` variable, as the trigger won't do anything
 unless it is defined.
 
+<a id="triggers_openjdk_profile"></a>
+#### openjdk-profile
+
+The openjdk-profile trigger is responsible for creating an entry in /etc/profile.d that
+sets the `JAVA_HOME` environment variable to the currently-selected alternative for
+`/usr/bin/java` on installation. This trigger must be manually requested.
+
 <a id="triggers_pango_module"></a>
 #### pango-modules
 
diff --git a/srcpkgs/xbps-triggers/files/openjdk-profile b/srcpkgs/xbps-triggers/files/openjdk-profile
new file mode 100755
index 000000000000..007d9cd9eedf
--- /dev/null
+++ b/srcpkgs/xbps-triggers/files/openjdk-profile
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Adds an entry to /etc/profile.d for setting $JAVA_HOME.
+#
+# Arguments:	$ACTION = [run/targets]
+#		$TARGET = [post-install/pre-remove]
+#		$PKGNAME
+#		$VERSION
+#		$UPDATE = [yes/no]
+#
+ACTION="$1"
+TARGET="$2"
+PKGNAME="$3"
+VERSION="$4"
+UPDATE="$5"
+
+jdkprofile=etc/profile.d/openjdk.sh
+
+case "$ACTION" in
+targets)
+	echo "post-install"
+	;;
+run)
+	[ -f "$jdkprofile" ] && exit 0
+
+	cat > "$jdkprofile" <<'EOF'
+if _java_bin=$(readlink -e /usr/bin/java); then
+	_java_bin="${_java_bin%/bin/java}"
+	[ -d "${_java_bin}" ] && export JAVA_HOME="${JAVA_HOME:=${_java_bin}}"
+fi
+unset _java_bin
+EOF
+	;;
+*)
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index 5de97d53c210..b1e4f34a4dde 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
-version=0.121
+version=0.122
 revision=1
 bootstrap=yes
 short_desc="XBPS triggers for Void Linux"

From fb57e2b092bb0ad6289553e3412d651a88dd3a31 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 20 Mar 2022 16:12:02 -0400
Subject: [PATCH 2016/2561] openjdk8: move /etc/profile.d/10-openjdk*.sh to
 trigger

---
 srcpkgs/openjdk8/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 9cced29b4be9..9832b18555a6 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
 # TODO: config files?
 pkgname=openjdk8
 version=8u322b04
-revision=1
+revision=2
 _jdk_update="${version#*u}"
 _jdk_update="${_jdk_update%b*}"
 _jdk_build="${version#*b}"
@@ -221,6 +221,8 @@ openjdk8-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 	short_desc+=" - runtime components"
 	provides="java-runtime-${version}_1"
+	depends="xbps-triggers>=0.122_1"
+	triggers="openjdk-profile"
 	alternatives="
 	 java:/usr/bin/java:/${_jdk_home}/jre/bin/java
 	 java:/usr/bin/jjs:/${_jdk_home}/jre/bin/jjs
@@ -236,10 +238,6 @@ openjdk8-jre_package() {
 	"
 	pkg_install() {
 		vmove ${_jdk_home}/jre
-		vmkdir etc/profile.d
-		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk8.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/${_jdk_home}/jre}
-EOF
 	}
 }
 

From 1246f0280bf9065a8ca9a1734d7b25bda4edf09f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 20 Mar 2022 16:12:04 -0400
Subject: [PATCH 2017/2561] openjdk11: move /etc/profile.d/10-openjdk*.sh to
 trigger

---
 srcpkgs/openjdk11/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 711376c10824..45c775856fa9 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+7
-revision=1
+revision=2
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -160,7 +160,8 @@ openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 	short_desc+=" - runtime components"
 	provides="java-runtime-${version}_1"
-	depends="fontconfig"
+	depends="fontconfig xbps-triggers>=0.122_1"
+	triggers="openjdk-profile"
 	alternatives="
 	 java:/usr/bin/java:/${_jdk_home}/bin/java
 	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
@@ -179,11 +180,6 @@ openjdk11-jre_package() {
 			vmove $_jdk_home/$f
 		done
 
-		vmkdir etc/profile.d
-		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
-
 		vlicense ASSEMBLY_EXCEPTION
 		vlicense LICENSE
 	}

From c6ae034c7f9eba47ca7aa0be03ebc222e7986aa6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 20 Mar 2022 16:12:05 -0400
Subject: [PATCH 2018/2561] openjdk17: move /etc/profile.d/10-openjdk*.sh to
 trigger

---
 srcpkgs/openjdk17/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 2554e49c54ea..f60e96f79082 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
 version=17.0.3+7
-revision=1
+revision=2
 _gtest_ver=1.8.1
 _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
@@ -170,6 +170,8 @@ openjdk17-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 	short_desc+=" - runtime components"
 	provides="java-runtime-${version}_1"
+	depends="xbps-triggers>=0.122_1"
+	triggers="openjdk-profile"
 	alternatives="
 	 java:/usr/bin/java:/${_jdk_home}/bin/java
 	 java:/usr/bin/jfr:/${_jdk_home}/bin/jfr
@@ -185,11 +187,6 @@ openjdk17-jre_package() {
 			vmove $_jdk_home/$f
 		done
 
-		vmkdir etc/profile.d
-		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk17.sh <<-EOF
-export JAVA_HOME=\${JAVA_HOME=/$_jdk_home}
-EOF
-
 		vlicense ASSEMBLY_EXCEPTION
 		vlicense LICENSE
 	}

From 599fd022ddd888619e7bb368e2cf7e90ea234726 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:32 -0400
Subject: [PATCH 2019/2561] apache-fop: fix name of
 etc/profile.d/10_openjdk*.sh in template

---
 srcpkgs/apache-fop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template
index 96ab59bce8b3..3b7c917a7c09 100644
--- a/srcpkgs/apache-fop/template
+++ b/srcpkgs/apache-fop/template
@@ -1,7 +1,7 @@
 # Template file for 'apache-fop'
 pkgname=apache-fop
 version=2.5
-revision=2
+revision=3
 wrksrc="fop-${version}"
 build_wrksrc="fop"
 hostmakedepends="openjdk8 apache-ant"
@@ -18,7 +18,7 @@ conf_files="/etc/fop.conf"
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/10_openjdk8.sh
+	. /etc/profile.d/openjdk.sh
 	ant package
 }
 do_install() {

From 893db6771d3636ed0cfedf1034e23f427b82b82f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:35 -0400
Subject: [PATCH 2020/2561] apache-maven: fix name of
 etc/profile.d/10_openjdk*.sh in template

---
 srcpkgs/apache-maven/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template
index c9603329c2cd..cc1e3e561634 100644
--- a/srcpkgs/apache-maven/template
+++ b/srcpkgs/apache-maven/template
@@ -1,7 +1,7 @@
 # Template file for 'apache-maven'
 pkgname=apache-maven
 version=3.6.3
-revision=2
+revision=3
 hostmakedepends="openjdk8"
 depends="virtual?java-environment which"
 short_desc="Software project management and comprehension tool"
@@ -15,7 +15,7 @@ checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07
 replaces="apache-maven-bin>=0"
 
 do_build() {
-	source /etc/profile.d/10_openjdk8.sh
+	source /etc/profile.d/openjdk.sh
 	./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname}
 }
 

From c887045c54d1b0194ca9aad2a9d3e45a7375af9d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:36 -0400
Subject: [PATCH 2021/2561] arduino: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/arduino/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index 19daa0c1b1e8..485d24ad5a28 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino'
 pkgname=arduino
 version=1.8.19
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=$pkgname-$version
 create_wrksrc=yes
@@ -27,7 +27,7 @@ fi
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/10_openjdk8.sh
+	. /etc/profile.d/openjdk.sh
 
 	export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include/linux"
 	export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include"

From 39bc9a8a559eb297f394232717feb18668bfa015 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:37 -0400
Subject: [PATCH 2022/2561] bibletime: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/bibletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template
index 559755a9dd6f..af3301e02365 100644
--- a/srcpkgs/bibletime/template
+++ b/srcpkgs/bibletime/template
@@ -4,7 +4,7 @@
 # to start.
 pkgname=bibletime
 version=3.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=/usr/share/xsl/docbook/html/chunk.xsl
  -DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=/usr/share/xsl/docbook/fo/docbook.xsl"
@@ -20,7 +20,7 @@ distfiles="https://github.com/bibletime/bibletime/releases/download/v${version}/
 checksum=d6beef62ad44b255e3dc4c5e89214bf01a0e85c9136073b0be12fca3d2b22622
 
 pre_build() {
-	. /etc/profile.d/10_openjdk11.sh
+	. /etc/profile.d/openjdk.sh
 	if [ "$XBPS_WORDSIZE" = "32" ]; then
 		export _JAVA_OPTIONS="-Xmx1024m"
 	fi

From 75ef1e284ecdd0806c43a3bf2df7176bf89a694a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:37 -0400
Subject: [PATCH 2023/2561] davmail: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/davmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/davmail/template b/srcpkgs/davmail/template
index 0482c0dce531..b739bf6b8bb6 100644
--- a/srcpkgs/davmail/template
+++ b/srcpkgs/davmail/template
@@ -1,7 +1,7 @@
 # Template file for 'davmail'
 pkgname=davmail
 version=5.5.1
-revision=2
+revision=3
 _commit=3299
 wrksrc=davmail-src-${version}-${_commit}
 hostmakedepends="openjdk8 apache-ant"
@@ -13,7 +13,7 @@ distfiles="${SOURCEFORGE_SITE}/davmail/davmail-src-${version}-${_commit}.tgz"
 checksum=63e14eeda3fed2a1a5c55f864a8832f8842d597e797ca1e8874c9b66b811f508
 
 do_build() {
-	. /etc/profile.d/10_openjdk8.sh
+	. /etc/profile.d/openjdk.sh
 	. /etc/profile.d/apache-ant.sh
 
 	ant jar

From bce908b9952f733afae88bec20d7d0b6ce7a06a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:38 -0400
Subject: [PATCH 2024/2561] freeplane: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/freeplane/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 2e7adb76ea4a..fa4eeb5e80ba 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,7 +1,7 @@
 # Template file for 'freeplane'
 pkgname=freeplane
 version=1.9.12
-revision=1
+revision=2
 wrksrc="freeplane-release-${version}"
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -23,7 +23,7 @@ esac
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/10_openjdk8.sh
+	. /etc/profile.d/openjdk.sh
 
 	gradle format_translation binZip -x test
 }

From 3922ba12880b491a98c3d7f6b7cb4f8fe8de7169 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:38 -0400
Subject: [PATCH 2025/2561] freerouting: fix name of
 etc/profile.d/10_openjdk*.sh in template

---
 srcpkgs/freerouting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index f643eabdb6fe..bfde02fc9e29 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -1,7 +1,7 @@
 # Template file for 'freerouting'
 pkgname=freerouting
 version=1.4.5.1
-revision=1
+revision=2
 hostmakedepends="dos2unix gradle openjdk11"
 depends="openjdk11"
 short_desc="Advanced PCB autorouter"
@@ -21,7 +21,7 @@ post_extract() {
 }
 
 do_build() {
-	. /etc/profile.d/10_openjdk11.sh
+	. /etc/profile.d/openjdk.sh
 	gradle assemble
 }
 

From 5b161aa0006822d579b17e800e6f8ea28eaebd3c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:39 -0400
Subject: [PATCH 2026/2561] java-commons-io: fix name of
 etc/profile.d/10_openjdk*.sh in template

---
 srcpkgs/java-commons-io/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/java-commons-io/template b/srcpkgs/java-commons-io/template
index e91dcc87b8b5..5b8413e2a03d 100644
--- a/srcpkgs/java-commons-io/template
+++ b/srcpkgs/java-commons-io/template
@@ -2,7 +2,7 @@
 _origname=commons-io
 pkgname=java-commons-io
 version=2.6
-revision=2
+revision=3
 wrksrc="${_origname}-${version}-src"
 hostmakedepends="openjdk8 apache-maven which"
 depends="virtual?java-runtime"
@@ -19,7 +19,7 @@ case "$XBPS_MACHINE" in
 esac
 
 do_build() {
-	source /etc/profile.d/10_openjdk8.sh
+	source /etc/profile.d/openjdk.sh
 	mvn package -Dmaven.test.skip=true
 }
 

From 5d110f2fc41ccafb62ecad298a7afdeeab1c0dba Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:39 -0400
Subject: [PATCH 2027/2561] jedit: fix name of /etc/profile.d/10_openjdk*.sh,
 hard-code openjdk11

---
 srcpkgs/jedit/files/jedit | 4 +---
 srcpkgs/jedit/template    | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/jedit/files/jedit b/srcpkgs/jedit/files/jedit
index 622bb9171864..706d2f8dd45c 100644
--- a/srcpkgs/jedit/files/jedit
+++ b/srcpkgs/jedit/files/jedit
@@ -1,10 +1,8 @@
 #!/bin/sh
 
 # openjdk11 is required
-. /etc/profile.d/10_openjdk11.sh
-
 # default to gtk3, use antialiased fonts
-exec "${JAVA_HOME}/bin/java" \
+exec "/usr/lib/jvm/openjdk11/bin/java" \
     -Djdk.gtk.version=3 \
     -Dawt.useSystemAAFontSettings=on \
     -Dswing.aatext=true \
diff --git a/srcpkgs/jedit/template b/srcpkgs/jedit/template
index cf7ac8cdd201..19ca4ac3df1f 100644
--- a/srcpkgs/jedit/template
+++ b/srcpkgs/jedit/template
@@ -1,7 +1,7 @@
 # Template file for 'jedit'
 pkgname=jedit
 version=5.6.0
-revision=1
+revision=2
 wrksrc=jEdit
 hostmakedepends="apache-ant openjdk11 docbook-xsl"
 depends="openjdk11 desktop-file-utils"
@@ -19,7 +19,7 @@ post_patch() {
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/10_openjdk11.sh
+	. /etc/profile.d/openjdk.sh
 
 	ant -propertyfile ${FILESDIR}/build.properties build
 	ant -propertyfile ${FILESDIR}/build.properties docs-html

From e6d3160a0edec85dd232f9aac73a5047cac2f467 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:40 -0400
Subject: [PATCH 2028/2561] kodi: fix name of etc/profile.d/10_openjdk*.sh in
 template

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index da81c7e2d0a5..b4eeacdab624 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.4
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -111,7 +111,7 @@ pre_configure() {
 		xargs sed -i  -e "s;-isystem;-I;g"
 	fi
 
-	. /etc/profile.d/10_openjdk11.sh
+	. /etc/profile.d/openjdk.sh
 
 	# Build tools needed to run on the host
 	if [ "$CROSS_BUILD" ]; then

From 548b25bb232e114ea90fafe254849592c45c295e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:40 -0400
Subject: [PATCH 2029/2561] lightzone: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/lightzone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template
index 13242f01cc77..261626fb9dff 100644
--- a/srcpkgs/lightzone/template
+++ b/srcpkgs/lightzone/template
@@ -1,7 +1,7 @@
 # Template file for 'lightzone'
 pkgname=lightzone
 version=4.2.2
-revision=1
+revision=2
 _ivy_version=2.4.0
 wrksrc=LightZone-${version}
 hostmakedepends="automake git openjdk11 apache-ant javahelp2 rsync pkg-config"
@@ -29,7 +29,7 @@ do_build() {
 	vsed -i lightcrafts/jnisrc/tiff/GNUmakefile \
 		-e "s;\./configure;& --host=${XBPS_MACHINE%-musl};"
 
-	. /etc/profile.d/10_openjdk11.sh
+	. /etc/profile.d/openjdk.sh
 	cd linux
 	TARGET=${XBPS_TARGET_MACHINE%-musl} ant jar
 }

From a21a638a61d3928b800b6e583998368c4df43062 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:44 -0400
Subject: [PATCH 2030/2561] plantuml: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/plantuml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index fff4ec18b203..85259ce2ca6b 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -2,7 +2,7 @@
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
 version=1.2021.14
-revision=1
+revision=2
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
 depends="virtual?java-environment graphviz"
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
 checksum=468aeaaea0742d8312d0f2f709df140e599967d8284fc0555f842fd0a6fe6941
 
 do_build() {
-	. /etc/profile.d/10_openjdk8.sh
+	. /etc/profile.d/openjdk.sh
 	. /etc/profile.d/apache-ant.sh
 	ant
 	mv ${pkgname}.jar ${pkgname}-${version}.jar

From 6eb62252fe1f05d94cce46a317343e1c04a54ca1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 5 May 2022 00:01:06 -0400
Subject: [PATCH 2031/2561] apache-maven: fix distfiles

---
 srcpkgs/apache-maven/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template
index cc1e3e561634..e793e240b2c0 100644
--- a/srcpkgs/apache-maven/template
+++ b/srcpkgs/apache-maven/template
@@ -8,8 +8,8 @@ short_desc="Software project management and comprehension tool"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://maven.apache.org/"
-distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/source/${pkgname}-${version}-src.tar.gz
- https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz"
+distfiles="https://dlcdn.apache.org/maven/maven-3/${version}/source/${pkgname}-${version}-src.tar.gz
+ https://dlcdn.apache.org/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz"
 checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07
  26ad91d751b3a9a53087aefa743f4e16a17741d3915b219cf74112bf87a438c5"
 replaces="apache-maven-bin>=0"

From 7d2538d922d5e7193f3cf46a2cc3fdb58227ef21 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 5 May 2022 00:09:42 -0400
Subject: [PATCH 2032/2561] apache-fop: fix distfiles

---
 srcpkgs/apache-fop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template
index 3b7c917a7c09..82997c3555dc 100644
--- a/srcpkgs/apache-fop/template
+++ b/srcpkgs/apache-fop/template
@@ -10,8 +10,8 @@ short_desc="Java print formatter driven by XSL formatting objects (XSL-FO)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://xmlgraphics.apache.org/fop/"
-distfiles="http://mirror.dkd.de/apache/xmlgraphics/fop/source/fop-${version}-src.tar.gz
- http://mirror.dkd.de/apache/xmlgraphics/fop/binaries/fop-${version}-bin.tar.gz"
+distfiles="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-${version}-src.tar.gz
+ https://archive.apache.org/dist/xmlgraphics/fop/binaries/fop-${version}-bin.tar.gz"
 checksum="783077318139d581d5f485566d1b08bfc576003c53cfbf5beaeba503a24b4005
  6a3c5f8915be5ef90fff202c818152d8252bb45b96d9c5d6550594903739e5ed"
 conf_files="/etc/fop.conf"

From 59a1d5b535013782c7c88f341ea912d8b1b0f88f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 5 May 2022 00:34:26 -0400
Subject: [PATCH 2033/2561] bibletime: explicitly require JRE to ensure profile
 is available to source

---
 srcpkgs/bibletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template
index af3301e02365..d8be23d33be6 100644
--- a/srcpkgs/bibletime/template
+++ b/srcpkgs/bibletime/template
@@ -8,8 +8,8 @@ revision=3
 build_style=cmake
 configure_args="-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=/usr/share/xsl/docbook/html/chunk.xsl
  -DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=/usr/share/xsl/docbook/fo/docbook.xsl"
-hostmakedepends="pkg-config qt5-host-tools qt5-qmake apache-fop po4a
- docbook-xsl docbook-xml libxslt"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake openjdk8-jre apache-fop
+ po4a docbook-xsl docbook-xml libxslt"
 makedepends="clucene-devel libcurl-devel qt5-devel qt5-tools-devel
  qt5-svg-devel qt5-webkit-devel sword-devel zlib-devel qt5-declarative-devel"
 short_desc="Powerful cross platform Bible study tool"

From 135bbf31e171217f2a72b0b3d7a73094f1303722 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 5 May 2022 01:05:08 -0400
Subject: [PATCH 2034/2561] freeplane: mark broken

---
 srcpkgs/freeplane/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index fa4eeb5e80ba..67a233224e9a 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="https://github.com/freeplane/freeplane/archive/release-${version}.tar.gz"
 checksum=200002b5cbe3e3286a7595847d28356d3efd8498ff930fa05e5e90af622e544f
+broken="https://build.voidlinux.org/builders/x86_64_builder/builds/37505/steps/shell_3/logs/stdio"
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root

From d722db310b3b5f409d4bffbd9da7afd61adacfc0 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 4 May 2022 22:48:32 +0200
Subject: [PATCH 2035/2561] mat2: update to 0.12.4.

---
 srcpkgs/mat2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mat2/template b/srcpkgs/mat2/template
index 8ee8a477aa2a..5a662f0b45ec 100644
--- a/srcpkgs/mat2/template
+++ b/srcpkgs/mat2/template
@@ -1,6 +1,6 @@
 # Template file for 'mat2'
 pkgname=mat2
-version=0.12.3
+version=0.12.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,4 +10,4 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-3.0-or-later"
 homepage="https://0xacab.org/jvoisin/mat2"
 distfiles="https://0xacab.org/jvoisin/mat2/-/archive/${version}/mat2-${version}.tar.gz"
-checksum=6e7e8a87a0932a890455626d8b73e9c52288bc30761cce46bd17c60815e8bb54
+checksum=00c163bf05cc5d282e420dbf53113ae48a63e1cace90dc1d0ca44e23005d28a5

From fcaed3290910f4f1f4d0fb249a1a536f8a542edb Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 5 May 2022 09:13:48 +0200
Subject: [PATCH 2036/2561] opendht: update to 2.4.4.

---
 srcpkgs/opendht/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index c24ee3c55943..ebdbdde002cf 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,6 +1,6 @@
 # Template file for 'opendht'
 pkgname=opendht
-version=2.3.1
+version=2.4.4
 revision=1
 build_style=cmake
 configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
@@ -12,7 +12,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/savoirfairelinux/opendht"
 distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/${version}.tar.gz"
-checksum=9a75db4f119761d6524964b27d3a49aa809a6cb08bde963edc2f338458433c78
+checksum=a4b452423f9a55f3c53ceaeeb43ec50f2747fdc89a546caa74cd79b93b6ede08
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f5259207dfb69e77ecff9c6b55fb16fb7e86c582 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 5 May 2022 09:14:07 +0200
Subject: [PATCH 2037/2561] qtox: update to 1.17.6.

---
 srcpkgs/qtox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index f3fa78acb915..63d1196bd1aa 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,6 +1,6 @@
 # Template file for 'qtox'
 pkgname=qtox
-version=1.17.4
+version=1.17.6
 revision=1
 wrksrc="qTox-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.tox.chat/clients/qtox"
 changelog="https://raw.githubusercontent.com/qTox/qTox/master/CHANGELOG.md"
 distfiles="https://github.com/qTox/qTox/archive/v${version}.tar.gz"
-checksum=3d2fe2a344c83c50e6603d2a4070f2cc0c6ccd13fa5e77457eff96f57ee6f8c2
+checksum=cd0781241b4ea536da90ce8c72ad9f2aa9bbdf9fbae5d38ee645e30d790fa7f2
 
 build_options="snorenotify"
 build_options_default="snorenotify"

From 6abe8038aefb8dd2d6b6d77cbce3959a34c441b9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 5 May 2022 10:59:26 -0500
Subject: [PATCH 2038/2561] yara: update to 4.2.1.

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index fe171d75b35d..df2a2f39937f 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.2.0
+version=4.2.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
@@ -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=6f567d4e4b79a210cd57a820f59f19ee69b024188ef4645b1fc11488a4660951
+checksum=f26d9c481e6789181431ac410665f6ba25d551c2948995f84c9e17df7a93731a
 
 pre_configure() {
 	autoreconf -fi

From eaefa647ed85a44acd5280717ecc402a7ec2db3e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 5 May 2022 11:00:00 -0500
Subject: [PATCH 2039/2561] sqlmap: update to 1.6.5.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 74ce3a2ca71e..67335427c811 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.4
+version=1.6.5
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=14585e4fc95006467e52685c4838f024654d7e23cbd84eb12762a55918b8d561
+checksum=534194953d8a95ff1d28d1a19f9b2c1b6d021fe9bc3ea7368ecab2084ceba714
 python_version=3
 
 do_install() {

From cc1da059590536b95b7c93007e831fb197b39a38 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 5 May 2022 11:01:59 -0500
Subject: [PATCH 2040/2561] python3-rich: update to 12.3.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 c3de71a5749a..f9cd79d81ea9 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=12.2.0
+version=12.3.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=ea74bc9dad9589d8eea3e3fd0b136d8bf6e428888955f215824c2894f0da8b47
+checksum=7e8700cda776337036a712ff0495b04052fb5f957c7dfb8df997f88350044b64
 make_check=extended # some checks only work on windows
 
 post_install() {

From e166313e0c9b17a77968bdcddf157ad6de2c5423 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 5 May 2022 11:06:29 -0500
Subject: [PATCH 2041/2561] jc: update to 1.18.8.

---
 srcpkgs/jc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index 992b2ebc206c..24a52a65f655 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,6 +1,6 @@
 # Template file for 'jc'
 pkgname=jc
-version=1.18.7
+version=1.18.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/kellyjonbrazil/jc"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eece56f592b04ddd19fb1fbac3ac6f0b27d6a731a05fb902813ccf0c0c78510d
+checksum=a2cb40099cec38961477fbbbe14a8c3f41c9d3998e4cc402d9ae3d21171ff924

From 89e493dc4b1125978976aa6f9365532cc1da80ff Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 5 May 2022 11:07:15 -0500
Subject: [PATCH 2042/2561] python3-youtubesearch: update to 1.6.5.

---
 srcpkgs/python3-youtubesearch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 822d7eb70ee4..494188c3a466 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
-version=1.6.4
+version=1.6.5
 revision=1
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/alexmercerind/youtube-search-python"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=a9dcc4536fd839beb29b12d93e59fb92b294a0d83b94b882b16a445158d1f8da
+checksum=5e47c2bd09829aa830bc7f855693c20dfe49d2390c3041b0a44422cc743b3f00
 make_check=no # no tests defined
 
 post_install() {

From 5ec34a44f7c26da3e7917583ccd7de2fcb358da3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 May 2022 17:15:40 +0200
Subject: [PATCH 2043/2561] firefox: update to 100.0.

---
 srcpkgs/firefox/patches/fix-build-tier3.patch | 366 ------------------
 srcpkgs/firefox/patches/sndio.patch           |  52 ---
 srcpkgs/firefox/template                      |   8 +-
 3 files changed, 4 insertions(+), 422 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-build-tier3.patch
 delete mode 100644 srcpkgs/firefox/patches/sndio.patch

diff --git a/srcpkgs/firefox/patches/fix-build-tier3.patch b/srcpkgs/firefox/patches/fix-build-tier3.patch
deleted file mode 100644
index c7f5b7ea1f7b..000000000000
--- a/srcpkgs/firefox/patches/fix-build-tier3.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-commit 8a0c895dee94b3c15e56557eb1dd0114477a6056
-Author: q66 <daniel@octaforge.org>
-Date:   Sun Apr 10 00:38:30 2022 +0200
-
-    fix build on tier 3 platforms
-    
-    https://bugzilla.mozilla.org/show_bug.cgi?id=1758610
-
-diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-index 0fa127b..78c8961 100644
---- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-@@ -814,7 +814,7 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
- #  ifdef MOZ_WAYLAND_USE_VAAPI
-     // Create VideoFramePool in case we need it.
-     if (!mVideoFramePool && mEnableHardwareDecoding) {
--      mVideoFramePool = MakeUnique<VideoFramePool>();
-+      mVideoFramePool = MakeUnique<VideoFramePool<LIBAV_VER>>();
-     }
- 
-     // Release unused VA-API surfaces before avcodec_receive_frame() as
-diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
-index b1a2f73..c77d76f 100644
---- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
-+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
-@@ -16,6 +16,9 @@
- #if LIBAVCODEC_VERSION_MAJOR >= 57 && LIBAVUTIL_VERSION_MAJOR >= 56
- #  include "mozilla/layers/TextureClient.h"
- #endif
-+#ifdef MOZ_WAYLAND_USE_VAAPI
-+#  include "FFmpegVideoFramePool.h"
-+#endif
- 
- struct _VADRMPRIMESurfaceDescriptor;
- typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor;
-@@ -23,7 +26,6 @@ typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor;
- namespace mozilla {
- 
- class ImageBufferWrapper;
--class VideoFramePool;
- 
- template <int V>
- class FFmpegVideoDecoder : public FFmpegDataDecoder<V> {};
-@@ -138,7 +140,7 @@ class FFmpegVideoDecoder<LIBAV_VER>
-   AVBufferRef* mVAAPIDeviceContext;
-   bool mEnableHardwareDecoding;
-   VADisplay mDisplay;
--  UniquePtr<VideoFramePool> mVideoFramePool;
-+  UniquePtr<VideoFramePool<LIBAV_VER>> mVideoFramePool;
-   static nsTArray<AVCodecID> mAcceleratedFormats;
- #endif
-   RefPtr<KnowsCompositor> mImageAllocator;
-diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
-index 7943e09..673b3fc 100644
---- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
-@@ -5,6 +5,7 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
- #include "FFmpegVideoFramePool.h"
-+#include "PlatformDecoderModule.h"
- #include "FFmpegLog.h"
- #include "mozilla/widget/DMABufLibWrapper.h"
- #include "libavutil/pixfmt.h"
-@@ -15,11 +16,11 @@
- 
- namespace mozilla {
- 
--RefPtr<layers::Image> VideoFrameSurfaceVAAPI::GetAsImage() {
-+RefPtr<layers::Image> VideoFrameSurface<LIBAV_VER>::GetAsImage() {
-   return new layers::DMABUFSurfaceImage(mSurface);
- }
- 
--VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface)
-+VideoFrameSurface<LIBAV_VER>::VideoFrameSurface(DMABufSurface* aSurface)
-     : mSurface(aSurface),
-       mLib(nullptr),
-       mAVHWFramesContext(nullptr),
-@@ -30,22 +31,22 @@ VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface)
-   MOZ_ASSERT(mSurface);
-   MOZ_RELEASE_ASSERT(mSurface->GetAsDMABufSurfaceYUV());
-   mSurface->GlobalRefCountCreate();
--  FFMPEG_LOG("VideoFrameSurfaceVAAPI: creating surface UID = %d",
-+  FFMPEG_LOG("VideoFrameSurface: creating surface UID = %d",
-              mSurface->GetUID());
- }
- 
--void VideoFrameSurfaceVAAPI::LockVAAPIData(AVCodecContext* aAVCodecContext,
--                                           AVFrame* aAVFrame,
--                                           FFmpegLibWrapper* aLib) {
--  FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI locking dmabuf surface UID = %d",
-+void VideoFrameSurface<LIBAV_VER>::LockVAAPIData(AVCodecContext* aAVCodecContext,
-+                                                 AVFrame* aAVFrame,
-+                                                 FFmpegLibWrapper* aLib) {
-+  FFMPEG_LOG("VideoFrameSurface: VAAPI locking dmabuf surface UID = %d",
-              mSurface->GetUID());
-   mLib = aLib;
-   mAVHWFramesContext = aLib->av_buffer_ref(aAVCodecContext->hw_frames_ctx);
-   mHWAVBuffer = aLib->av_buffer_ref(aAVFrame->buf[0]);
- }
- 
--void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) {
--  FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI releasing dmabuf surface UID = %d",
-+void VideoFrameSurface<LIBAV_VER>::ReleaseVAAPIData(bool aForFrameRecycle) {
-+  FFMPEG_LOG("VideoFrameSurface: VAAPI releasing dmabuf surface UID = %d",
-              mSurface->GetUID());
- 
-   // It's possible to unref GPU data while IsUsed() is still set.
-@@ -67,43 +68,43 @@ void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) {
-   }
- }
- 
--VideoFrameSurfaceVAAPI::~VideoFrameSurfaceVAAPI() {
--  FFMPEG_LOG("VideoFrameSurfaceVAAPI: deleting dmabuf surface UID = %d",
-+VideoFrameSurface<LIBAV_VER>::~VideoFrameSurface() {
-+  FFMPEG_LOG("VideoFrameSurface: deleting dmabuf surface UID = %d",
-              mSurface->GetUID());
-   // We're about to quit, no need to recycle the frames.
-   ReleaseVAAPIData(/* aForFrameRecycle */ false);
- }
- 
--VideoFramePool::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {}
-+VideoFramePool<LIBAV_VER>::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {}
- 
--VideoFramePool::~VideoFramePool() {
-+VideoFramePool<LIBAV_VER>::~VideoFramePool() {
-   MutexAutoLock lock(mSurfaceLock);
-   mDMABufSurfaces.Clear();
- }
- 
--void VideoFramePool::ReleaseUnusedVAAPIFrames() {
-+void VideoFramePool<LIBAV_VER>::ReleaseUnusedVAAPIFrames() {
-   MutexAutoLock lock(mSurfaceLock);
-   for (const auto& surface : mDMABufSurfaces) {
--    auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI();
--    if (!vaapiSurface->IsUsed()) {
--      vaapiSurface->ReleaseVAAPIData();
-+    if (!surface->IsUsed()) {
-+      surface->ReleaseVAAPIData();
-     }
-   }
- }
- 
--RefPtr<VideoFrameSurface> VideoFramePool::GetFreeVideoFrameSurface() {
-+RefPtr<VideoFrameSurface<LIBAV_VER>>
-+VideoFramePool<LIBAV_VER>::GetFreeVideoFrameSurface() {
-   for (auto& surface : mDMABufSurfaces) {
-     if (surface->IsUsed()) {
-       continue;
-     }
--    auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI();
--    vaapiSurface->ReleaseVAAPIData();
-+    surface->ReleaseVAAPIData();
-     return surface;
-   }
-   return nullptr;
- }
- 
--RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
-+RefPtr<VideoFrameSurface<LIBAV_VER>>
-+VideoFramePool<LIBAV_VER>::GetVideoFrameSurface(
-     VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext,
-     AVFrame* aAVFrame, FFmpegLibWrapper* aLib) {
-   if (aVaDesc.fourcc != VA_FOURCC_NV12 && aVaDesc.fourcc != VA_FOURCC_YV12 &&
-@@ -113,7 +114,7 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
-   }
- 
-   MutexAutoLock lock(mSurfaceLock);
--  RefPtr<VideoFrameSurface> videoSurface = GetFreeVideoFrameSurface();
-+  RefPtr<VideoFrameSurface<LIBAV_VER>> videoSurface = GetFreeVideoFrameSurface();
-   if (!videoSurface) {
-     RefPtr<DMABufSurfaceYUV> surface =
-         DMABufSurfaceYUV::CreateYUVSurface(aVaDesc);
-@@ -121,7 +122,7 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
-       return nullptr;
-     }
-     FFMPEG_LOG("Created new VA-API DMABufSurface UID = %d", surface->GetUID());
--    RefPtr<VideoFrameSurfaceVAAPI> surf = new VideoFrameSurfaceVAAPI(surface);
-+    RefPtr<VideoFrameSurface<LIBAV_VER>> surf = new VideoFrameSurface<LIBAV_VER>(surface);
-     if (!mTextureCreationWorks) {
-       mTextureCreationWorks = Some(surface->VerifyTextureCreation());
-     }
-@@ -138,11 +139,8 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
-     }
-     FFMPEG_LOG("Reusing VA-API DMABufSurface UID = %d", surface->GetUID());
-   }
--
--  auto* vaapiSurface = videoSurface->AsVideoFrameSurfaceVAAPI();
--  vaapiSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
--  vaapiSurface->MarkAsUsed();
--
-+  videoSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
-+  videoSurface->MarkAsUsed();
-   return videoSurface;
- }
- 
-diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
-index c506d22..c89b418 100644
---- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
-+++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
-@@ -7,8 +7,9 @@
- #ifndef __FFmpegVideoFramePool_h__
- #define __FFmpegVideoFramePool_h__
- 
--#include "FFmpegVideoDecoder.h"
- #include "FFmpegLibWrapper.h"
-+#include "FFmpegLibs.h"
-+#include "FFmpegLog.h"
- 
- #include "mozilla/layers/DMABUFSurfaceImage.h"
- #include "mozilla/widget/DMABufLibWrapper.h"
-@@ -16,43 +17,16 @@
- 
- namespace mozilla {
- 
--class VideoFramePool;
--class VideoFrameSurfaceVAAPI;
--
--class VideoFrameSurface {
-- public:
--  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface)
--
--  VideoFrameSurface() = default;
--
--  virtual VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() { return nullptr; }
--
--  virtual void SetYUVColorSpace(gfx::YUVColorSpace aColorSpace) = 0;
--  virtual void SetColorRange(gfx::ColorRange aColorRange) = 0;
--
--  virtual RefPtr<DMABufSurfaceYUV> GetDMABufSurface() { return nullptr; };
--  virtual RefPtr<layers::Image> GetAsImage() = 0;
--
--  // Don't allow VideoFrameSurface plain copy as it leads to
--  // unexpected DMABufSurface/HW buffer releases and we don't want to
--  // deep copy them.
--  VideoFrameSurface(const VideoFrameSurface&) = delete;
--  const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete;
--
-- protected:
--  virtual ~VideoFrameSurface(){};
--};
--
--// VideoFrameSurfaceVAAPI holds a reference to GPU data with a video frame.
-+// VideoFrameSurface holds a reference to GPU data with a video frame.
- //
- // Actual GPU pixel data are stored at DMABufSurface and
- // DMABufSurface is passed to gecko GL rendering pipeline via.
- // DMABUFSurfaceImage.
- //
--// VideoFrameSurfaceVAAPI can optionally hold VA-API ffmpeg related data to keep
-+// VideoFrameSurface can optionally hold VA-API ffmpeg related data to keep
- // GPU data locked untill we need them.
- //
--// VideoFrameSurfaceVAAPI is used for both HW accelerated video decoding
-+// VideoFrameSurface is used for both HW accelerated video decoding
- // (VA-API) and ffmpeg SW decoding.
- //
- // VA-API scenario
-@@ -72,13 +46,24 @@ class VideoFrameSurface {
- // Unfortunately there isn't any obvious way how to mark particular VASurface
- // as used. The best we can do is to hold a reference to particular AVBuffer
- // from decoded AVFrame and AVHWFramesContext which owns the AVBuffer.
--class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
--  friend class VideoFramePool;
-+template <int V>
-+class VideoFrameSurface {};
-+template <>
-+class VideoFrameSurface<LIBAV_VER>;
-+
-+template <int V>
-+class VideoFramePool {};
-+template <>
-+class VideoFramePool<LIBAV_VER>;
-+
-+template <>
-+class VideoFrameSurface<LIBAV_VER> {
-+  friend class VideoFramePool<LIBAV_VER>;
- 
-  public:
--  explicit VideoFrameSurfaceVAAPI(DMABufSurface* aSurface);
-+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface)
- 
--  VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() final { return this; }
-+  explicit VideoFrameSurface(DMABufSurface* aSurface);
- 
-   void SetYUVColorSpace(mozilla::gfx::YUVColorSpace aColorSpace) {
-     mSurface->GetAsDMABufSurfaceYUV()->SetYUVColorSpace(aColorSpace);
-@@ -93,6 +78,12 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
- 
-   RefPtr<layers::Image> GetAsImage();
- 
-+  // Don't allow VideoFrameSurface plain copy as it leads to
-+  // unexpected DMABufSurface/HW buffer releases and we don't want to
-+  // deep copy them.
-+  VideoFrameSurface(const VideoFrameSurface&) = delete;
-+  const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete;
-+
-  protected:
-   // Lock VAAPI related data
-   void LockVAAPIData(AVCodecContext* aAVCodecContext, AVFrame* aAVFrame,
-@@ -107,7 +98,7 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
-   void MarkAsUsed() { mSurface->GlobalRefAdd(); }
- 
-  private:
--  virtual ~VideoFrameSurfaceVAAPI();
-+  virtual ~VideoFrameSurface();
- 
-   const RefPtr<DMABufSurface> mSurface;
-   const FFmpegLibWrapper* mLib;
-@@ -116,23 +107,24 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
- };
- 
- // VideoFramePool class is thread-safe.
--class VideoFramePool final {
-+template <>
-+class VideoFramePool<LIBAV_VER> {
-  public:
-   VideoFramePool();
-   ~VideoFramePool();
- 
--  RefPtr<VideoFrameSurface> GetVideoFrameSurface(
-+  RefPtr<VideoFrameSurface<LIBAV_VER>> GetVideoFrameSurface(
-       VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext,
-       AVFrame* aAVFrame, FFmpegLibWrapper* aLib);
-   void ReleaseUnusedVAAPIFrames();
- 
-  private:
--  RefPtr<VideoFrameSurface> GetFreeVideoFrameSurface();
-+  RefPtr<VideoFrameSurface<LIBAV_VER>> GetFreeVideoFrameSurface();
- 
-  private:
-   // Protect mDMABufSurfaces pool access
-   Mutex mSurfaceLock;
--  nsTArray<RefPtr<VideoFrameSurfaceVAAPI>> mDMABufSurfaces;
-+  nsTArray<RefPtr<VideoFrameSurface<LIBAV_VER>>> mDMABufSurfaces;
-   // We may fail to create texture over DMABuf memory due to driver bugs so
-   // check that before we export first DMABuf video frame.
-   Maybe<bool> mTextureCreationWorks;
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-index de2611e..8ffdaae 100644
---- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-@@ -30,6 +30,9 @@ if CONFIG['MOZ_WAYLAND']:
-   CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
-   DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
-   USE_LIBS += ['mozva']
-+  UNIFIED_SOURCES += [
-+    '../FFmpegVideoFramePool.cpp',
-+  ]
- 
- include("/ipc/chromium/chromium-config.mozbuild")
- 
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-index 7d28420..1da28a1 100644
---- a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-@@ -30,6 +30,9 @@ if CONFIG["MOZ_WAYLAND"]:
-     CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-     DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1
-     USE_LIBS += ["mozva"]
-+    UNIFIED_SOURCES += [
-+        "../FFmpegVideoFramePool.cpp",
-+    ]
- 
- include("/ipc/chromium/chromium-config.mozbuild")
- 
diff --git a/srcpkgs/firefox/patches/sndio.patch b/srcpkgs/firefox/patches/sndio.patch
deleted file mode 100644
index fa3b6fa8ab6b..000000000000
--- a/srcpkgs/firefox/patches/sndio.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/old-configure.in
-+++ b/old-configure.in
-@@ -2818,6 +2818,22 @@
-     _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
- fi
- 
-+dnl ==================================
-+dnl = Check sndio availability
-+dnl ==================================
-+
-+MOZ_ARG_ENABLE_BOOL(sndio,
-+[  --enable-sndio         Enable sndio support],
-+   MOZ_SNDIO=1,
-+   MOZ_SNDIO=)
-+
-+if test -n "$MOZ_SNDIO"; then
-+    MOZ_SNDIO_LIBS="-lsndio"
-+    AC_SUBST_LIST(MOZ_SNDIO_LIBS)
-+fi
-+
-+AC_SUBST(MOZ_SNDIO)
-+
- dnl ========================================================
- dnl =
- dnl = Maintainer debug option (no --enable equivalent)
---- a/media/libcubeb/src/moz.build
-+++ b/media/libcubeb/src/moz.build
-@@ -44,11 +44,13 @@
-     ]
-     DEFINES['USE_JACK'] = True
- 
--if CONFIG['OS_ARCH'] == 'OpenBSD':
-+if CONFIG['MOZ_SNDIO']:
-     SOURCES += [
-         'cubeb_sndio.c',
-     ]
-     DEFINES['USE_SNDIO'] = True
-+
-+if CONFIG['OS_ARCH'] == 'OpenBSD':
-     DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True
- 
- if CONFIG['OS_TARGET'] == 'Darwin':
---- a/build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
-+++ b/build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
-@@ -88,6 +88,7 @@
- @old_configure_options(
-     "--cache-file",
-     "--datadir",
-+    "--enable-sndio",
-     "--enable-official-branding",
-     "--includedir",
-     "--libdir",
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8ee3b78f809b..021bb6aee82b 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=99.0
+version=100.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327
+checksum=664c0cc4e0fb70886aa4e652d144996045d533a18eebc7d61093103cbb2d5e7f
 
 lib32disabled=yes
 
@@ -172,7 +172,7 @@ do_build() {
 	export MOZ_MAKE_FLAGS="${makejobs}"
 	export MOZ_NOSPAM=1
 	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
-	export MACH_USE_SYSTEM_PYTHON=1
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 
 	export AS=$CC
 
@@ -191,7 +191,7 @@ ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' '
 	./mach build
 }
 do_install() {
-	export MACH_USE_SYSTEM_PYTHON=1
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
 	DESTDIR="$DESTDIR" ./mach install
 

From 5907d6f58d72eaa1fb707faa49f8525554d6aa42 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 May 2022 17:18:04 +0200
Subject: [PATCH 2044/2561] firefox-i18n: update to 100.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 0e98d438bd21..f13acdfd6d5d 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=99.0
+version=100.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="e398f1b14ae79fcd74639a81b27c4cd38b09282ca625d1b72c69df09fc4ec1fc
- a8cbef3ba5c35e33c0f1e02dcd2781cc362315d5b63e9e6065a22afbe460581f
- 35b4f32eabd40875d518cb174858bb6d8ecff272f4ee677e0c108d8395707960
- 4f1a97c404347121c53799efd2a986860e030b7789e66e252d92b6a78012b681
- 580e9e9fde913ce410774d366bad95af3a67df52c688a6ad64ad59e8d33eab47
- 91236c6ecd7ee99927d5b69566cc30f4b1de6e7caca3336386f3e7bb995c96e2
- fa36e967b14e530993e3a50fcdc5f32e686f5b110f6cdee59b8c555c82294517
- c88a65b1f3c10085b0d5236a3e687b70cd9a620803393caf81b4ee0677330ef0
- c12d138948d4e5cebce1051f0cc750f8f9bfb23f733417e7e7b9596ee74a6980
- e4b9cdcb7c08beceecfef7d8b94d70a24e3f24404c73cd7cf5aed6572e293bf6
- 75d09dfb5c0b55b670c912feecd48bfdc7f936f31c41d8e4b2ede0e46d16f749
- 8780f97e115fbe8f156412757d1980517b85dc409fbbc8e0266bdcc7d0568c83
- 815c9a81efce33b19b9bcabd46093ea92bd062698575c83ea127f20a3495c984
- 76e9a327a69960f4ebd857b5b204d435d60461b7129aa70db90ebb28411ffaee
- 8fdd5adfec75310172819a959a2b68ad3ecb614c94298be315804e730b43a160
- 8947c35c94f08bbb61a3beb8b106a776d0f0a3b2f247b9e49619ab9b9416bb19
- 7851a711a8de28c6e6c3c07814ef995263f4c3a48981742f1aa481389dab3897
- 8bb525f9045c91b3f539103eb398da1d1f71a580971a1adcc780198da36a2623
- 04cfc4a69fba8f3838d385179511954277cf1f6d8243663f338941c1e86a49ca
- cd9f142ac06d16919b5f1102ae53f1241574057c75012198fe1dbdb7a8d63a8c
- 8ff53385252becfbc2f15354ea57b873251584444129c137350e974dc488318c
- 9a58559be92950e33051625e49dd3f5bae36c225b9a7030bec9a6aa78d45ba93
- 6e0f538d93f8b2d189c667c2aac37c6d1eb50fb802c4ee2ff310db15da57de56
- 2c051ea90460cda20296b1a69037e037b82258fe382c9031594974e75cbc10eb
- 053dfbb9ad0feb3b54cab94bd8f5ac544ec598f9b819a7d163496f838104b8a5
- faa25b7302f249b9aaea768a7cf61f78f67e3637e9a62906361a1fae257d0161
- 54f02a1e948d2944b3889152b093200a0d31358df28f7309e5fb5d490616d317
- 7c104e3c70024163fc0fe7597df0a995b2e813319dc23268fe36e04f09f2ced7
- 2cf6b8e82042208407bfdbad01a3d5113c87f0bd37acb082452f1f6c22bf1485
- da05a0fe7a65ce243f0ec69ad60d93a3bc988383f983343a66b399a2de1a10a0
- 13da03264b7d522bcbb77cfb1fece6606f9efe742822325ced7627fe28add070
- 0d835b249070428d8d5e1c251ab46b19df71cc2858b69843a41eee897c27b396
- 5dbbe35e45b15dca15ba5de15aa55b4fce44d33fb456ca8184270c0f162567d7
- 9e6b2c13f0c2347fe27e189dea6dd8a3c5b23aaac668010213258bd26e0d3da7
- 1aa07979f8bb7d6039a11f64b3c93b3c70332def967af6fb426897b7c65fdba2
- c21b99ea6049d498bb446770801e3c9f8041bd11e0ae8164bd16a016f14f5578
- ed537abf79efa484fc920902d59ea1b840c6acf6fa540f435722f5c75a1bca90
- e9517bb3330ec5cb2a743dd56a69c912a35b6dafe6a7abeadfe1532a17963549
- cf97f81502f30c807fde8127c6f8ac1a9ea58508ba8d243ea0d6fbabe2ddc8b1
- 85b90f53e79bc2961b3f0c702ba5762ba7559c366d7682bc66b20514769c2a92
- bd31d635b44f039ad2f89e4ad1cd0f7fcbcec7e0d6d381f8bf89e17bb74aa952
- 10d597d44d8261cd0eebe024de51ba803c94792d13c5732d43ed9bec4db72783
- 33da29355095f9ae0383e21ae0c6d300d6a7f298c7e126e8747c71277b1175be
- 84ff5d1b88c4205eba0f04e89daf4d91e9f25da4590367050917a6d34c629147
- 4de39e8b907391f197fe5d138f87985d74d3a34796c3963f2e33142164696f84
- 47e8c5ece6643d5c6cac713799c841e73c0bda691243ccd346b5e85b0a4810d1
- c196be8854dded19c2a85c5bb7f3ff3123da0d91852da7b16f844cb44e9d11fa
- 7f97921badcf0c7ffeb92c6f1d1d2ada3afd0069e8e80a524ad3b7c0c1220f0a
- 79d845fccaa1916f07dfd821c3ed95dd5647b70bd9a39e485caa66cc65a077f7
- 40ce23e0cc6e4fa5192e987bc835c1408d958a2fcfb8875370db517ff64c92a4
- 8f6f739077a383884d400c3062925e0e848be4942e3be0e378e589bfa3941c9c
- 9f014d8807130a01ae008997393deb4c865c70482a4fe75f3cee0e9f8071246a
- 240aa4b7091065ef0495c8f52eeb91b5a0cae03676c6ea4cedee9260e204dd6f
- 788f7ab9bfbb7b692d4d28efad9ae3de964ef7bfa4e30f6f50a3bd178ac004ee
- 04a7fbbc1b0769a5b66bb068385482e50c5f70298eba250235d259bc4aa3ea99
- 30a1707f4a57a2ba738eb27f5525daa12f0713e3bb7b1a3ebe2c710ac6e37a27
- bdc752daf3b4e8f8ea3980d98a01d7249f38dddf183909eb55a8c50ad30368e1
- 48332123774a79eed86d1e826021a05a3921ac5f95ca54e086f173c8e1e72fd1
- 31f2f1c2adabe35fd353d3720eb8458716f926e57c9d782518f943533cd1a72d
- 4756150d141a8ce3e2bdca7fdb1b343466b19cb9a19adbfa25d86c39d0f7c933
- 024f3b186772c5381a458dda4a6b914fb2695f8c16e648c58d463072f10f5b57
- 8160d89f88b3c7d9e967377e513b8fc18e4a19faa55f95371db3553564db65bf
- 6d2816247894f2e73ecb0258ee5a9b85b650542bac46a8587d547c8824e2d280
- d3e017f003c34a6768670ae2c8bbd5e3500f452647e36193614810ced595b2b3
- 7ceafc2a330620665c51e8b394d296ddb190d97f4cebcd0a247d0278d3a54274
- 6b6992a92df788fbd119446aabd9329b7edd1643a8dd1e3ca7b60dc7976b3b60
- 8dee92aa771ca1b0deb233b974f844b8025d4b25f2ff8be41d91c636565eb7f0
- b4fc00a30204c8c5b19c92bd3164b98955d9591366f89c194fe248bdbc0ce580
- 406335d53b11c42f34446adc68d6836a6841fc34af3c2f1fa621ddc2026017b4
- 7ac66cef872878f6e5568266d9c807da1cc4041ae51723cf387590954f73cf7d
- 74c5306c711a4150cb6f89289067533a5438495a251d63cb06f586d27eafbeb4
- f3e67b76944280de1eb8df059bec0f0eafd06a4bc4e7c93e98c434a17192c084
- e13b87e04ee3fbf7ea0c02e4b176d6dc66dbd234b59cb245dfd225e65c5cdcd3
- bfab113c2dde187aaabfd89957c7dc840bbbb25c4f27b31fb422c9817035eaa8
- 7bde7feb01a40d3b89b78928154fcfc0eff8c77b086e360b940f61d45d7eadb0
- 18f2267d16b30aecfd2b6f9437cc79bca68084680b2770820323a968fd20c93e
- 5bd5138456fae929520bbd821beddd1f934d156e3c99916e47df31b7bedaa32a
- eb4db96ab4b78dede2d92db7c0c3dd4084971178f101a342655348a4b90a6487
- 07a06be606d6adacf1cb57cbf448ff18a7c13c90df9e11768ac3fe3e200569a2
- 090e6759314eb16b2169bd1f89387963ba81a0e565f1d77143f2da0e6d267e28
- 38cf5fa44116bc15f12db4506db386b147762838f25d991a0c39cdcd236533f6
- 448a4ab5be3d9f246f961705a02f31abcaa8c616351c4d05857c3db41ba83154
- 3fcfcc54f9ec4762b4b78ce0db9351ac59a717e4931d6267cacafa16d3d41057
- 7349863f4edfd79321be9b214384138596cbe16ecd2107cee58501e2511c438a
- 4a50c82c68898c25dfdfcb95079750a455ba2e4d1397d5e51cc2991dce1be60b
- 275ab1a945003153a10fd5bbebf8ce9af346e5ad2068c83eebdcd60ecf0ce99e
- cce68831a20669468b108e3dd58dbc34cd981c874bdd299b715df838ba5ca0f9
- d6cdb55b0f8d7f3c9c4f3bc7906feb123f84243bfbd719eab75a6894cf455582
- 74012d5c8c22cc2f5780ae55020cdbe3c74f21671a2769fde907dbd63e0281bb
- 14a02938f76ce51767746ecc104ff571f2da0429144ee981cd28af8b4eda3518
- dc05af8f59bdbf1c77d6d45dc1bf6bba634b782533e245993d852e39f145cfc9
- 557444ed827906476ec3385ffae1e1952acc5b3234840fc645ff892c9753b2f3
- 9925d116300b43f82061e1c04deae6c241cfb121d46364aa1f206e0d8bd9732a
- aaf3249f295362530f04f23c00e309baa5a7a89c70bbf1a3a763b8ef66631ac8
- d289624c73955ff377057be150ff8d52118810a4adaf861fe51b7f0a0b80dbbf
- 2f07d98e74625892478c321161f62db8c790d978dd4e5c3633c5cf5ef5d8d6b4"
+checksum="05fc947ff479288182364d39a343fb33276f37266be02c17c6c2adb15c9209c4
+ 8ffad9c79427474069ab2b5dc4cf772947a34b7988d68adb576e79b8a23ab67a
+ 523277c631901519063d41b63333aac3ac874b3e6a453566c0c1ea3fbb7a90aa
+ deb96111e07746d8ddc99e961dfc1e545cc9fd50e4eaade71fa40f5f575f9ac4
+ dd1672b8e38ac2a29fe3be20b11a73c7935dae71ef2624fe92e755763a639d7c
+ 5e10c7080c772a441d3e3116cc964e162d6a5a2ced953bf5a6c59c303fdbcdf0
+ edcb679e72e4ffd3b8fddcf231bcb07a5c0d44b2e1c32982b752f40cafaa625f
+ c4670cc9456a9c170b71b85a1a2486c10d9046f3fec7fd807555a32335d2fa9e
+ 57dcb0e6af8b0573a1188cbc4509e4a30fd1d027b686d73a6b793f6b21e86df2
+ 5c385dede7eaa4e248a15f918c7f64e9125899ef742817bb39571ae0b37b34c4
+ ff15f4844392d0cb50527bdf48d4873f55ba08d8500306ec9ca83405a704fbdc
+ eeefc55c1f80988ebf4c759e4f19092fae79b6335f450d24616c3b3db4985170
+ ccb517a28a85c6aca804ae46bfeba7a0a3fa577111328ccb7bbfda2cb67cb055
+ bb657cc31e3a2eaca1aa19df8532baa4c05d86c4eedb2dad41e1c85a977193fe
+ caea7efda0efd010947fef5260726cd1412d222faccab12a7017c6053e355fff
+ 1b2667186c51e750fdaf05efcf724a932d4b3e10f839396b36bf35c7b8fb58c9
+ e079ce25240d5d286af227c19175446328174082e7f24db3da3366933b213327
+ b534df3b5798fc73ec0989c7e2acadec5d96dc5c29f599ca34b6e3fc2d063ebe
+ 3b232b2de0b99a6d1cb4f0afa203edfb62896065de9aaf351860cca222f22327
+ 520b578228ab2efb7880477276c2b9db430a77efacf590c75bd16cefb5a96d67
+ 10ef072059fb1ed982d7e5a4e90f741f99213d15b94eeeb398d09d7f651aff3d
+ 9b882019ca6e4de58c8f229b344888814424b079e939dd362ea77cf50c9ed059
+ f389a84de1dd7ff8375c66694168a1479697f9ce64e6d4c2824a585076b5aee0
+ f4f3eedcbe27ee556a8e58cd0d07c9c530b0a83b68ada75e74a1d91977333b89
+ 4d67fca1b1f12f4e5c8ac9e5f70140bda20e8c608ee77df4eb4dc97f9f984eaa
+ b73da525fa7ed072e2f2ef2d68eeba037de126942d1190d875d359de77f7006c
+ 4d2253d1d31a6740b24046c066a8342d240599a096585e848e7c065d0912d80e
+ 309eed3a6b60de8b338ae464d29db444320f55d31adf0a8b00885d0cca43ad93
+ c92d925cd81c692f7180cc71fae28d77b3ff7466e365169d92e4288d40249a08
+ 50b1fbc60bea33b12fc5d3fa676503c8417708db0451b9afaff604892612a23b
+ a42141c5c6c00be51e947f9a49ede93e2283050487200e28e71901480b845ff7
+ fa552045ce9cd1b1ca47ef0a0aab50d1095ec9b2f46d3103efd957cdeeccb751
+ 3974ecc24feab6d577d23bd27427136cb0389104011ff796d68d02a69d71789f
+ ca5eb3b04b1c4b32aeefbda17949a358257fe389d48dab1c886b9cec884fe0f9
+ 846ad932823fd5764540e72d2e8854f87963f8caf4685eb60012bfb5923a75fd
+ f5a05fb9a4607f1589096e13b47f985d26253cb5bb5da1cb918865e9654e550e
+ 6717b235fa616b1b9d6684ef50863926d7ee3571811c215d226518916ad3e95f
+ a767439949302a6eb682c58c72c35920fb143deaac708ae72bad47bb42430945
+ 985cd6fb46031859fb238c8b8ca3ae64f8583bab09e6719704c427d2589525c1
+ 7c6b502db9cfa306bc214a3d17c5931b071072ab4326c6ce8bd7498ae126282a
+ e4d00cf895acdac207b1ed4f62280927850d3621ae6ed959bc0dd4adf377bfd7
+ cc11c9b95bfb4e3ce0782c9f2c7e4c7fd92a3b0cc3f6f7bd1390921df1b59ac0
+ 2951c4030c25c59407be23d4c8b203f68c302dee756b895a3ef1c21df1830146
+ e659f2a38763062004fe34968fcdb805b00bf440e4b576ee7028c12a7d8493a4
+ ed29465a92aeb657fa04c226fe3fac1edbe73f69f5001d18b379b21ceaf7f98f
+ b3c38d2d016017b6449bf73f55f63d67e0a9ebf8ba6df059e7d378f953b2a9f2
+ 516d885123c351b24ed093ee1ac194d7297530852ef2bdc23b20903790d060a5
+ 2744519881bda9cd1fc210629a4366886b55e840877e7fbcc11211c281d4668d
+ dff4045c796f34b4d31a55fb59aecae4b8dce24a12ed552d146707e9cc51187c
+ 3862311cc49c8e6d8e8f0f2f03303a0a137654f5cc6511f7f8931a50215f838c
+ d0cb5d6b31eaa479a903fcef3a9f014ba8939c446ef7a44e8d40b0a6760a17b6
+ 7701f6381976c0f1c15c80f3661c6ef20a9953d5cefd64710da7814e875deccd
+ 9757690f40ea70ec1ed6ca4791cf7fafa4d7f9f58a4b1683cfe0be229c3c656a
+ 2d076430aea914ed0fe8c6cf3c9f61a2f7b5b6fefb87fa0631f3b1fca2274eec
+ a32477149c8bdf30590b7dfe931dba18bf9589271d01ffa58d47389dd6ecfe3d
+ 9da35b91db26edb8b8c48cbbd8b953fd7b7fbd74c2233a004c8a35de4fe473f3
+ 5bee5ac2905748ba2ba0f0488f2ecfc409112e626b2e1580f21f1a6dfc685d6a
+ b362ca18cb856bec6aedd2a05b3dfcdfdc78ecdee19866f8aab6047c1603ae88
+ 7a044e5236ba024e80065a8a159dc18c61fd938d39902e4f626615f927038783
+ 26e198549ddf1df25f22801c74cba3c18440d17f1e9b90d96a83c38498213aba
+ 2ca078ccb32f81356f58db590a95ba27fda61dc2ce88d939bbb68d5392b4677b
+ 1b183032cf35b4c3ccc088ba63d83bbde55e1d1a14a0da756957345875a3a695
+ 1dba115cf55edd6082e3e68366fa5aa679deae0262621f8ef574f6f6f7f3f5f0
+ 915c75c205383edf6e31325b9717769dad24f6f457a390a80cf9063bd38fb29c
+ 055866db316ecf278f682a6389f9a42c422c3eda5fa3c5f4223adb18511c5c61
+ f7ffd0af9d3f401e6fdb1425c19de890cfcf2077fadefb77aa9514d83701aefc
+ 9a518360c83589f326252c0096d0a7b766f271f40cf8ae99394cef5a46120306
+ 2ed7c8a352d064d5813121238e385de73d02c70260a3622b774892c003d4fdcc
+ 4bce9dd4f8eac65f13f447976c61142aa9e227ebd79ef84e2205abbf383dc096
+ 1f51826364ba69823a7c56c87523f5aadbf4e577c6d4934bc96021083efe2083
+ d5b38929489bb0da1688c9f31d35051f5801a4111d60b49521bd736512a5812b
+ 31494871d4ee110921cca19eafd2ddc089ab51edb96e67de6d5e75b2293262b0
+ 11166cc8dcbae00aaf39c58f23f1e357a942cf9fae1873e486aadefdd33bf933
+ 9ff85ed3a21d63785e7c2475577097bd8a53cf4eaa7122bbf78225078abb7c96
+ 82102671cd03006743333b73dae07f4cf0702ac96ecccdb86fa7b40e9ea85c74
+ 8c9096f28cbce9b40d534cddab6ce9c3dd1003120b7201490d936743763af12d
+ c11653e2d1f845360c176a698f77b196230b7ad108f6e86033ba24b8fe7f8e1f
+ f728c9850b153bcd15d3fde9f134177d58db1cacd4ef42a9e9baccf5981c5195
+ 2683e367a49ca9e3c9c278970a5b8a56f5718d948dc73c1fc26c5340cac4d005
+ 96b0327b8766a6e3e40097cdcef6cdbb4498df256c9a0a43cb20bc7543fdf9fa
+ 9936f3f4a9a1c86ae0123c714f71b8652e7217f58c3e529d6f3e4737a930c044
+ 5e6d54c42b0fc394142449727aea373cef5dec109c857d3f7de2576abc55394d
+ 7092c55e961b30bc42941730ed4ee831445c5d8682e51af8af1a134aa0a6be1b
+ 670723fe5f0d50cc59e1d4af1c8d3176ef6d2a4b61c56274a9a805c084bba72c
+ a04627bfb97a249b166c625630e4ba5875400e9fd6cd9f54e8d9c94dc43ec7e0
+ c7c7bf41ad8a745da097fde5c9e06885f520cd8f2cb4bde06fee8b029ee85888
+ 485d48e4c86c82c1812f603a7a02ac390134adccdfa25e86a6d0f75643bc5f2a
+ 55598530db9d7640fc73ee9881fb5c43b2a50b3b075454dc4e59baef93b4f70f
+ d4afee4357c8e49ac06d66b24606ed1265b8cb14979125e0e0d326335238779d
+ 28d511b6de7c0c92730c79523710624427e6cd320225827a49cc217c06e1d612
+ 5c587ab32b4f5a835992f03ed47f875f962da36ecc48a6b4cd999de6f944e7e1
+ 949ab674459d323cc04364ab6a8a141d1976d22c08c8705d434276405fada9fb
+ 1e7a6048da7b760b85301927b9a57ad7da041046df179126cd0126df97029927
+ d3af2b83e1349e9db60b8caf47141f3e9ff339651823909f6ee98fdeb7b1134e
+ 53dd63b3de2a325b278084825883a19de8e7fdc8bc4fff88f24b052a64731094
+ d4da572047b11729bc29c3f7f9c9afa68ea308b0f0d03515037c9bac77dfdb37"

From f9a0011f773a7fc4a4ed847509531a4ad7d5c540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 4 May 2022 21:44:51 +0200
Subject: [PATCH 2045/2561] common/: add script finding file conflicts

---
 common/scripts/lint-conflicts | 195 ++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100755 common/scripts/lint-conflicts

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
new file mode 100755
index 000000000000..bb0e2b2fd6b3
--- /dev/null
+++ b/common/scripts/lint-conflicts
@@ -0,0 +1,195 @@
+#!/usr/bin/env bash
+
+# Report packages installing same file and not marked with
+# conflicts or replaces.
+# Without argument, find conflicts between packages in local
+# repository at hostdir/binpkgs and packages indexed in xlocate.
+# With single path as argument, read that local repository.
+# With -a flag, find conflicts between packages indexed in xlocate.
+
+if [ "$#" = 0 ]; then
+	binpkgs="$PWD/hostdir/binpkgs"
+elif [ "$1" = -a ]; then
+	all=1
+elif [ -d "$1" ]; then
+	binpkgs="$1"
+else
+	echo "Usage:"
+	echo "$0"
+	echo "  check packages in ./hostdir/binpkgs"
+	echo "$0 path/to/hostdir/binpkgs"
+	echo "  check packages there"
+	echo "$0 -a"
+	echo "  check all packages indexed in xlocate"
+	exit 1
+fi
+
+declare -A newly_built conflicts_cache providers_cache pairs owners
+repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+rv=0
+
+template_exists() {
+	[ -f "srcpkgs/$1/template" ]
+}
+
+partial_check() {
+	[ -z "$all" ]
+}
+
+providers_of() {
+	# print the pkgname and packages that `provides` it
+	local pkgname=$1
+	if [ "${providers_cache[$pkgname]}" = '' ]; then
+		local line provider_pkgver provided_pkgver provider_pkgname provided_pkgname
+		local -A providers
+		providers[$pkgname]=$pkgname
+		while read -r line; do
+			line=${line%%'('*}
+			provider_pkgver=${line%': '*}
+			provided_pkgver=${line#*': '}
+			provider_pkgname=${provider_pkgver%-*}
+			provided_pkgname=${provided_pkgver%-*}
+			# comes from $(xbps-query -s $pkgname), so $pkgname can be substring
+			if [ "$provided_pkgname" = "$pkgname" ]; then
+				providers[$provider_pkgname]=$provider_pkgname
+			fi
+		done < <(xbps-query "${repositories[@]}" -p provides -R -s "$pkgname")
+		# leading space ensures ${[]} != ''
+		providers_cache[$pkgname]=" ${providers[*]}"
+	fi
+	echo ${providers_cache[$pkgname]}
+}
+
+conflicts_of() {
+	# print list of packages that are _marked_ as conflicting with given one
+	local pkgname=$1
+	if [ "${conflicts_cache[$pkgname]}" = '' ]; then
+		local in_conflict provider
+		local -A all
+		while read -r in_conflict; do
+			in_conflict=${in_conflict%'<'*}
+			in_conflict=${in_conflict%'>'*}
+			providers_of "$in_conflict" > /dev/null # executing in same process to fill cache
+			for provider in $(providers_of "$in_conflict"); do
+				all[$provider]=$provider
+			done
+		done < <(xbps-query "${repositories[@]}" -p conflicts,replaces -R "$pkgname")
+		# leading space ensures ${[]} != ''
+		conflicts_cache[$pkgname]=" ${all[*]}"
+	fi
+	echo ${conflicts_cache[$pkgname]}
+}
+
+conflict_between() {
+	# exit successfully if packages are _marked_ as conflicting
+	conflicts_of "$1" > /dev/null # executing in same process to fill cache
+	case " $(conflicts_of "$1") " in
+		*" $2 "*) return 0
+	esac
+	conflicts_of "$2" > /dev/null # executing in same process to fill cache
+	case " $(conflicts_of "$2") " in
+		*" $1 "*) return 0
+	esac
+	return 1
+}
+
+list_newly_built_files() {
+	# print one line per file in newly built packages
+	# each line contains pkgname and file path
+	local pkgver pkgname
+	while read -r pkgver; do
+		pkgname=${pkgver%-*}
+		xbps-query "${repositories[@]}" -i -f "$pkgname" | sed s'/ -> .*//;'" s/^/$pkgname /"
+	done < <(xbps-query "${repositories[@]}" -i -R -s '' | cut -d' ' -f 2)
+}
+
+list_interesting_files() {
+	# list files potentially contained in more than one package
+	# each line contains pkgver/pkgname and file path
+	if partial_check; then
+		list_newly_built_files
+	else
+		xlocate / | sed s'/ -> .*//' | grep -F -f <(xlocate / | cut -f 2- | sed s'/ -> .*//' | sort | uniq -d)
+	fi
+}
+
+group_by_file_full() {
+	# create associative array `owners` mapping file to list of packages
+	# for packages potentially conflicting with newly built ones
+	local pkgver file pkgname
+	while read -r pkgver file; do
+		pkgname=${pkgver%-*}
+		if template_exists "$pkgname"; then
+			owners[$file]+=" $pkgname"
+		fi
+	done < <(list_interesting_files)
+}
+
+group_by_file_partial() {
+	# create associative array `owners` mapping file to list of packages
+	# for all packages in xlocate
+	local pkgname file
+	## newly built packages
+	while read -r pkgname file; do
+		owners[$file]+=" $pkgname"
+		newly_built[$pkgname]=$pkgname
+	done < <(list_newly_built_files)
+	## rest of repository
+	while read -r pkgver file; do
+		pkgname=${pkgver%-*}
+		if [ -z "${newly_built[$pkgname]}" ] && template_exists "$pkgname"; then
+			owners[$file]+=" $pkgname"
+		fi
+	done < <(xlocate / | sed s'/ -> .*//' | grep -F -f <(list_newly_built_files | cut -d ' ' -f 2-))
+}
+
+group_by_pair() {
+	# find package pairs owning same file and not marked as conflicting
+	local pkg file a b
+	while read -r pkg file; do
+		for a in ${owners[$file]}; do
+			for b in ${owners[$file]}; do
+				if ! [ "$a" "<" "$b" ]; then
+					continue
+				fi
+				if partial_check && [ -z "${newly_built[$a]}" ] && [ -z "${newly_built[$b]}" ]; then
+					continue
+				fi
+				if ! conflict_between "$a" "$b"; then
+					unset pair_files
+					local -A pair_files
+					eval "${pairs["$a $b"]}"
+					pair_files[$file]="$file"
+					pairs["$a $b"]="${pair_files[@]@A}"
+				fi
+			done
+		done
+	done < <(list_interesting_files)
+}
+
+print_out() {
+	local pair file
+	if [ "${#pairs[@]}" = 0 ]; then
+		echo 1>&2 "No conflicts found in" "${repositories[@]#*=}"
+		exit 0
+	fi
+	while read -r pair; do
+		rv=1
+		echo "${pair% *} and ${pair#* } conflict for"
+		unset pair_files
+		eval "${pairs[$pair]}"
+		for file in "${pair_files[@]}"; do
+			echo "  $file"
+		done | sort
+	done < <(printf '%s\n' "${!pairs[@]}" | sort)
+}
+
+if partial_check; then
+	group_by_file_partial
+else
+	group_by_file_full
+fi
+group_by_pair
+print_out
+
+exit $rv

From cb3068477c99f0a2d174f8c245d9043334e777b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 4 May 2022 21:44:51 +0200
Subject: [PATCH 2046/2561] .github: check file conflicts in x86_64 build job

---
 .github/workflows/build.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ae7a3e728fa..e4619a3f3c4b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -94,6 +94,12 @@ jobs:
           "$here/common/travis/show_files.sh" "$BOOTSTRAP" "$ARCH"
           )
 
+      - name: Check file conflicts
+        if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
+        run: |
+          xlocate -S &&
+          common/scripts/lint-conflicts $HOME/hostdir/binpkgs
+
       - name: Verify repository state
         run: |
           (

From 486135a1197e8d37ac7f0305b1ff242cec0ede35 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 2 May 2022 00:58:34 -0400
Subject: [PATCH 2047/2561] common/travis/xlint.sh: print Github annotations

Turns xlint, version lint, and commit lint messages into warning or error
annotaions. All are printed with special highlighting in the action log and
summary. Xlint and version lint annotations are shown inline in the changes tab
and commit view. Annotations without line number are shown at line 1.
---
 common/scripts/lint-commits         | 10 +++++-----
 common/scripts/lint2annotations.awk | 11 +++++++++++
 common/travis/xlint.sh              |  5 +++--
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 common/scripts/lint2annotations.awk

diff --git a/common/scripts/lint-commits b/common/scripts/lint-commits
index 01c4eda17007..7207ed81d5aa 100755
--- a/common/scripts/lint-commits
+++ b/common/scripts/lint-commits
@@ -35,18 +35,18 @@ do
 	/^$/ && !msg { msg = 1; next }
 	!msg { next }
 	# 3: long-line-is-banned-except-footnote-like-this-for-url
-	(NF > 2) && (length > 80) { print C ": long line: " $0; exit 1 }
+	(NF > 2) && (length > 80) { print "::error title=Commit Lint::" C ": long line: " $0; exit 1 }
 	!subject {
-		if (length > 50) { print C ": subject is a bit long" }
-		if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print C ": subject does not follow CONTRIBUTING.md guildelines"; exit 1 }
+		if (length > 50) { print "::warning title=Commit Lint::" C ": subject is a bit long" }
+		if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print "::error title=Commit Lint::" C ": subject does not follow CONTRIBUTING.md guildelines"; exit 1 }
 		# Below check is too noisy?
 		# if (!($0 ~ "^New package:" || $0 ~ ".*: update to")) {
-		# 	print C ": not new package/update/removal?"
+		# 	print "::warning title=Commit Lint::" C ": not new package/update/removal?"
 		# }
 		subject = 1; next
 	}
 	/^$/ { body = 1; next }
-	!body { print C ": second line must be blank"; exit 1 }
+	!body { print "::error title=Commit Lint::" C ": second line must be blank"; exit 1 }
 	' || status=1
 done
 exit $status
diff --git a/common/scripts/lint2annotations.awk b/common/scripts/lint2annotations.awk
new file mode 100644
index 000000000000..5405d6971535
--- /dev/null
+++ b/common/scripts/lint2annotations.awk
@@ -0,0 +1,11 @@
+# Converts xlint/etc format lints into GH Actions annotations
+# The original line is printed alongside the annotation command
+{
+	split($0, a, ": ")
+	split(a[1], b, ":")
+	msg = substr($0, index($0, ": ") + 2)
+	if (b[2]) {
+		line = ",line=" b[2]
+	}
+	printf "::error title=Template Lint,file=%s%s::%s\n", b[1], line, msg
+}
diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh
index 6b3d9e91c90a..327417c1c327 100755
--- a/common/travis/xlint.sh
+++ b/common/travis/xlint.sh
@@ -11,7 +11,8 @@ common/scripts/lint-commits $base $tip || EXITCODE=$?
 
 for t in $(awk '{ print "srcpkgs/" $0 "/template" }' /tmp/templates); do
 	/bin/echo -e "\x1b[32mLinting $t...\x1b[0m"
-	xlint "$t" || EXITCODE=$?
-	common/scripts/lint-version-change "$t" $base $tip || EXITCODE=$?
+	xlint "$t" > /tmp/xlint_out || EXITCODE=$?
+	common/scripts/lint-version-change "$t" $base $tip > /tmp/vlint_out || EXITCODE=$?
+	awk -f common/scripts/lint2annotations.awk /tmp/xlint_out /tmp/vlint_out
 done
 exit $EXITCODE

From d8be2e7c53ab260a76edd6160cdb893810c3542a Mon Sep 17 00:00:00 2001
From: Bas Ploeger <5904333+basploeger@users.noreply.github.com>
Date: Sat, 2 Apr 2022 22:00:49 +0200
Subject: [PATCH 2048/2561] New package: apcupsd-3.14.14

---
 srcpkgs/apcupsd/files/apcupsd/run |  3 +++
 srcpkgs/apcupsd/template          | 40 +++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/apcupsd/files/apcupsd/run
 create mode 100644 srcpkgs/apcupsd/template

diff --git a/srcpkgs/apcupsd/files/apcupsd/run b/srcpkgs/apcupsd/files/apcupsd/run
new file mode 100644
index 000000000000..2c0b807da287
--- /dev/null
+++ b/srcpkgs/apcupsd/files/apcupsd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf] && . ./conf
+exec apcupsd -b ${OPTS}
diff --git a/srcpkgs/apcupsd/template b/srcpkgs/apcupsd/template
new file mode 100644
index 000000000000..ba1394b2d9d0
--- /dev/null
+++ b/srcpkgs/apcupsd/template
@@ -0,0 +1,40 @@
+# Template file for 'apcupsd'
+pkgname=apcupsd
+version=3.14.14
+revision=1
+build_style=gnu-configure
+configure_args="
+ --disable-install-distdir
+ --enable-modbus-usb
+ --enable-usb
+ --sysconfdir=/etc/apcupsd
+ --with-dev=
+ --with-halpolicydir=
+ --with-pwrfail-dir=/etc/apcupsd
+ --with-upscable=usb
+ --with-upstype=usb"
+hostmakedepends="autoconf automake pkg-config"
+makedepends="libusb-compat-devel net-snmp-devel"
+depends="libusb-compat net-snmp nullmailer"
+conf_files="/etc/apcupsd/*"
+short_desc="APC UPS daemon with integrated tcp/ip remote shutdown"
+maintainer="Bas Ploeger <s.c.w.ploeger@gmail.com>"
+license="GPL-2.0-only"
+homepage="http://www.apcupsd.org/"
+distfiles="${SOURCEFORGE_SITE}/apcupsd/apcupsd-${version}.tar.gz"
+checksum="db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867"
+
+# Avoid passing an invalid arg 'strip' to the install command for the binaries.
+make_install_args="STRIP="
+
+pre_configure() {
+	export SHUTDOWN=/usr/bin/shutdown
+	export WALL=/usr/bin/wall
+	export APCUPSD_MAIL=/usr/bin/mail
+}
+
+post_install() {
+	# This binary is not needed and conflicts with a binary from an other package.
+	rm ${DESTDIR}/usr/bin/smtp
+	vsv apcupsd
+}

From c4b39fa3e89005a615e1aeb097a07ce4e362baad Mon Sep 17 00:00:00 2001
From: Brihadeesh S <brihadeesh.santharam@gmail.com>
Date: Mon, 2 May 2022 17:02:32 +0530
Subject: [PATCH 2049/2561] New package: paleta-1.0.2

---
 srcpkgs/paleta/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/paleta/template

diff --git a/srcpkgs/paleta/template b/srcpkgs/paleta/template
new file mode 100644
index 000000000000..f61a1c05dcbf
--- /dev/null
+++ b/srcpkgs/paleta/template
@@ -0,0 +1,19 @@
+# Template file for 'paleta'
+pkgname=paleta
+version=1.0.2
+revision=1
+build_style=gnu-makefile
+short_desc="Change terminal colors on-the-fly independent of terminal emulator"
+maintainer="Brihadeesh <brihadeesh@protonmail.com>"
+license="MIT"
+homepage="https://github.com/dylanaraps/paleta"
+distfiles="https://github.com/dylanaraps/paleta/archive/${version}.tar.gz"
+checksum=b6a44653266598cd4e027703b0b06acb3a753f632abf87ea30732d139cf1bd16
+
+post_install() {
+	# copying palettes provided to package files
+	vmkdir /usr/share/paleta
+	vcopy palettes /usr/share/paleta/
+
+	vlicense LICENSE
+}

From d3810d0f42c7d3659da5b1252a9da1f8b94b6ee3 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 5 May 2022 17:15:34 +0200
Subject: [PATCH 2050/2561] sqlite: update to 3.38.4.

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 17f75a5f22a0..956daec63b5c 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.3
+version=3.38.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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=61f2dd93a2e38c33468b7125967c3218bf9f4dd8365def6025e314f905dc942e
+checksum=1935751066c2fd447404caa78cfb8b2b701fad3f6b1cf40b3d658440f6cc7563
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From f54839b4898e718250ffca18f8dd9e991adee05a Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Fri, 6 May 2022 01:05:17 +0100
Subject: [PATCH 2051/2561] nnn: update to 4.5.

---
 srcpkgs/nnn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index ac5827f0e9af..d8d3d2f57088 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,6 +1,6 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=4.4
+version=4.5
 revision=1
 build_style=gnu-makefile
 make_install_target="install install-desktop"
@@ -12,7 +12,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=e04a3f0f0c2af1e18cb6f005d18267c7703644274d21bb93f03b30e4fd3d1653
+checksum=fadc15bd6d4400c06e5ccc47845b42e60774f368570e475bd882767ee18749aa
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel"

From adf21b2d150f02edba3462d7f3a4504999a131ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 6 May 2022 18:11:09 +0700
Subject: [PATCH 2052/2561] Revert "git: update to 2.36.0."

This reverts commit 0a0487fc3090b5b96e507f4ee2019293f95dd0b3.

See: https://lore.kernel.org/git/xmqqlevfdbiq.fsf@gitster.g/
---
 srcpkgs/git/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index e45663f9ff9b..dc2146690ab2 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,8 @@
 # Template file for 'git'
 pkgname=git
-version=2.36.0
-revision=1
+reverts="2.36.0_1"
+version=2.35.3
+revision=2
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
@@ -14,7 +15,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=af5ebfc1658464f5d0d45a2bfd884c935fb607a10cc021d95bc80778861cc1d3
+checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 18b9da150481d8d8d824490571cc1c98b02d9371 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 May 2022 20:01:45 +0200
Subject: [PATCH 2053/2561] z3: update to 4.8.17.

---
 srcpkgs/z3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index d322211cbd9b..598d15032a9d 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,6 +1,6 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.16
+version=4.8.17
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
 distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=75f95e09f3f35fef746e571d5ec88a4efba27f1bc8f1a0ef1117167486ec3dc6
+checksum=1e57637ce8d5212fd38453df28e2730a18e0a633f723682267be87f5b858a126
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"

From 6beecaa19e2b615eadd2b41456207349a9fbf559 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 May 2022 17:41:04 +0200
Subject: [PATCH 2054/2561] ecm: update to 7.0.5.

---
 srcpkgs/ecm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ecm/template b/srcpkgs/ecm/template
index 6750b25dbeca..496636f06cea 100644
--- a/srcpkgs/ecm/template
+++ b/srcpkgs/ecm/template
@@ -1,7 +1,7 @@
 # Template file for 'ecm'
 pkgname=ecm
-version=7.0.4
-revision=3
+version=7.0.5
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --enable-openmp"
 hostmakedepends="m4"
@@ -10,8 +10,8 @@ short_desc="Elliptic Curve Method for Integer Factorization"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.inria.fr/zimmerma/ecm"
-distfiles="https://gitlab.inria.fr/zimmerma/ecm/uploads/00c4c691a1ef8605b65bdf794a71539d/ecm-${version}.tar.gz"
-checksum=0cf7b3eee8462cc6f98b418b47630e1eb6b3f4f8c3fc1fb005b08e2a1811ba43
+distfiles="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc922004e4b2/ecm-${version}.tar.gz"
+checksum=c721dd22e557c4a5dac9ac7e156a400cd2298812dd1f9b56e89966de01471ba8
 
 # ppc64 asm only provided for BE and ELFv1, we're ELFv2 for BE and LE
 case "$XBPS_TARGET_MACHINE" in

From cc9de2f7aaa760221b96a3e3cd4c2286c15ff7c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 May 2022 17:42:14 +0200
Subject: [PATCH 2055/2561] pgn-extract: update to 22.07.

---
 srcpkgs/pgn-extract/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgn-extract/template b/srcpkgs/pgn-extract/template
index 1b0d78af839e..387cb7803032 100644
--- a/srcpkgs/pgn-extract/template
+++ b/srcpkgs/pgn-extract/template
@@ -1,6 +1,6 @@
 # Template file for 'pgn-extract'
 pkgname=pgn-extract
-version=22.05
+version=22.07
 revision=1
 wrksrc="pgn-extract"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.cs.kent.ac.uk/people/staff/djb/pgn-extract/"
 changelog="https://www.cs.kent.ac.uk/people/staff/djb/pgn-extract/changes.html"
 distfiles="https://www.cs.kent.ac.uk/~djb/pgn-extract/pgn-extract-${version/./-}.tgz"
-checksum=73bbc4e011cc3a92330c0e0f8a6783a1c61b1a2c93165b3090b44a34980be40a
+checksum=51dda2d8cca7a6390c82d7f928263e3885b4ab62eb7e16a4431877af903ea7a6
 
 post_extract() {
 	sed -i '/^CC=/d' Makefile

From 4fb769c8b5c82b6eedaf9e5f39ba4e823bfe91f2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 18 Mar 2022 17:30:11 +0200
Subject: [PATCH 2056/2561] opera: update to 86.0.4363.50.

---
 srcpkgs/opera/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index f3965df0408d..1be0482067b9 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=84.0.4316.31
+version=86.0.4363.50
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,8 +10,8 @@ short_desc="Fast, secure, easy to use browser"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
-distfiles="https://rpm.opera.com/rpm/opera_stable-${version}-linux-release-x64-signed.rpm"
-checksum=6ae3c4ff44a4ae627724a8df3fcb2d5663ca8677a5eb62b5354b99fe21688608
+distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
+checksum=94b73abd6e1d2a710ddbd437e11a1702d487cc9497258b90a131332123ce28a5
 repository="nonfree"
 nostrip=yes
 
@@ -27,7 +27,6 @@ do_install() {
 	# Link executable in path
 	ln -s ../lib/opera/opera "${DESTDIR}/usr/bin/opera"
 
-	# Install licenses
-	vlicense usr/lib64/opera/resources/eula_desktop_eea.txt
-	vlicense usr/lib64/opera/resources/eula_desktop_row.txt
+	# Install 3rd-party licenses
+	vlicense usr/lib64/opera/opera_autoupdate.licenses
 }

From 8f1776d2637397ce7f4efc296d6687f0e566d8e4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 17:17:06 -0500
Subject: [PATCH 2057/2561] nvidia390: update homepage

---
 srcpkgs/nvidia390/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index c44d128eb279..903c74f394fe 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -7,7 +7,7 @@ version=390.147
 revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
-homepage="https://www.nvidia.com"
+homepage="https://www.nvidia.com/en-us/drivers/unix/"
 
 archs="i686 x86_64"
 nopie=yes

From 4a744fcf20d2501867214ff5fe2713a09d962e4d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 17:17:21 -0500
Subject: [PATCH 2058/2561] nvidia390: fix update check

---
 srcpkgs/nvidia390/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia390/update b/srcpkgs/nvidia390/update
index b74fe6d69aaf..0a48e18e1154 100644
--- a/srcpkgs/nvidia390/update
+++ b/srcpkgs/nvidia390/update
@@ -1,2 +1,2 @@
-site="http://www.nvidia.com/object/unix.html"
-pattern='390.+>\K[\d.]+(?=</A>)'
+site='https://forums.developer.nvidia.com/t/current-graphics-driver-releases/28500'
+pattern='\K390[\d.]+(?=</A>)'

From c6442e58cab09eec70c973a3fd7f109cf0474058 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 15:29:46 -0500
Subject: [PATCH 2059/2561] nvidia470: update homepage

---
 srcpkgs/nvidia470/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index 20b23dfd4dcc..d746210cc92f 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -7,7 +7,7 @@ version=470.103.01
 revision=3
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
-homepage="https://www.nvidia.com"
+homepage="https://www.nvidia.com/en-us/drivers/unix/"
 
 archs="x86_64"
 nopie=yes

From 1fa21cf385fb8e7982b8d31ac8d9f345411a03ba Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 15:29:57 -0500
Subject: [PATCH 2060/2561] nvidia470: fix update check

---
 srcpkgs/nvidia470/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia470/update b/srcpkgs/nvidia470/update
index d33b1d9a141f..e0f201851c73 100644
--- a/srcpkgs/nvidia470/update
+++ b/srcpkgs/nvidia470/update
@@ -1,2 +1,2 @@
-site="http://www.nvidia.com/object/unix.html"
-pattern='Branch Version.+>\K[\d.]+(?=</A>)'
+site='https://forums.developer.nvidia.com/t/current-graphics-driver-releases/28500'
+pattern='\K470[\d.]+(?=</A>)'

From 5889ea50c509e466b7ab92cfdcb5cdebd643b9aa Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 15:30:11 -0500
Subject: [PATCH 2061/2561] nvidia: update homepage

---
 srcpkgs/nvidia/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1ff0e8dbc33b..94482a9de0e2 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -7,7 +7,7 @@ version=510.60.02
 revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
-homepage="https://www.nvidia.com"
+homepage="https://www.nvidia.com/en-us/drivers/unix/"
 
 archs="x86_64"
 nopie=yes

From a9bf21a4132a86917b2f0d8ca304cf4a006ba19b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 17:23:41 -0500
Subject: [PATCH 2062/2561] nvidia: fix update check

---
 srcpkgs/nvidia/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/update b/srcpkgs/nvidia/update
index d33b1d9a141f..c6ae1d281ec6 100644
--- a/srcpkgs/nvidia/update
+++ b/srcpkgs/nvidia/update
@@ -1,2 +1,2 @@
-site="http://www.nvidia.com/object/unix.html"
-pattern='Branch Version.+>\K[\d.]+(?=</A>)'
+site="https://forums.developer.nvidia.com/t/current-graphics-driver-releases/28500"
+pattern='Current production branch release: \K[\d.]+(?= \(x86)'

From 87dfb79cc25e586d6f220e58415c876f3adc4e70 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 6 May 2022 00:05:05 +0300
Subject: [PATCH 2063/2561] htop: update to 3.2.0.

---
 srcpkgs/htop/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template
index 3b3cd7ade73c..4edcd93cf2ed 100644
--- a/srcpkgs/htop/template
+++ b/srcpkgs/htop/template
@@ -1,21 +1,14 @@
 # Template file for 'htop'
 pkgname=htop
-version=3.1.2
+version=3.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-unicode --enable-sensors"
-hostmakedepends="automake"
 makedepends="ncurses-devel libsensors-devel"
 short_desc="Interactive process viewer"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-only"
 homepage="https://htop.dev/"
-changelog="https://github.com/htop-dev/htop/blob/master/ChangeLog"
-distfiles="https://github.com/htop-dev/htop/archive/${version}.tar.gz"
-checksum=fe9559637c8f21f5fd531a4c072048a404173806acbdad1359c6b82fd87aa001
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	./autogen.sh
-}
+changelog="https://raw.githubusercontent.com/htop-dev/htop/main/ChangeLog"
+distfiles="https://github.com/htop-dev/htop/releases/download/${version}/htop-${version}.tar.xz"
+checksum=e0f645d4ac324f2c4c48aaa7a3a96d007b95516559550be0b56e423fc5b6d783

From bd974d054a7788d42c6748062b17b9b7ad2ca5dc Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Thu, 5 May 2022 11:41:49 -0400
Subject: [PATCH 2064/2561] freeplane: update to 1.9.14, hard-code jdk11

---
 srcpkgs/freeplane/patches/jdk11-default.patch | 15 +++++++++++++++
 srcpkgs/freeplane/template                    | 11 +++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/freeplane/patches/jdk11-default.patch

diff --git a/srcpkgs/freeplane/patches/jdk11-default.patch b/srcpkgs/freeplane/patches/jdk11-default.patch
new file mode 100644
index 000000000000..2f27d35af84a
--- /dev/null
+++ b/srcpkgs/freeplane/patches/jdk11-default.patch
@@ -0,0 +1,15 @@
+freeplane does not work with jdk17, so set jdk11 as the default.
+This can be overridden by the upstream-created method still.
+
+--- a/freeplane_framework/script/freeplane.sh
++++ b/freeplane_framework/script/freeplane.sh
+@@ -5,6 +5,9 @@
+ 	set -x
+ fi
+ 
++# set openjdk11 as the default, regardless of xbps-alternatives
++[ -z "$FREEPLANE_JAVA_HOME" ] && FREEPLANE_JAVA_HOME=/usr/lib/jvm/openjdk11
++
+ ########## FUNCTIONS DEFINITIONS #######################################
+ 
+ _debug() {
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 67a233224e9a..1c65ce682b38 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,17 +1,16 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.12
-revision=2
+version=1.9.14
+revision=1
 wrksrc="freeplane-release-${version}"
-hostmakedepends="apache-ant openjdk8 unzip gradle"
-depends="virtual?java-runtime"
+hostmakedepends="apache-ant openjdk11 unzip gradle"
+depends="openjdk11-jre"
 short_desc="Application for Mind Mapping, Knowledge Management, Project Management"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="https://github.com/freeplane/freeplane/archive/release-${version}.tar.gz"
-checksum=200002b5cbe3e3286a7595847d28356d3efd8498ff930fa05e5e90af622e544f
-broken="https://build.voidlinux.org/builders/x86_64_builder/builds/37505/steps/shell_3/logs/stdio"
+checksum=8c463c997675b0e351724673e9ca6357f4ef47bd9df0c49b73645090fb19cd7f
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root

From b9cbcc0c254e504d5dd8c9e188369518d5a63098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 6 May 2022 15:56:55 +0200
Subject: [PATCH 2065/2561] doctl: update to 1.74.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 23fbb957a0b4..81d5feb1d6e9 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.73.1
+version=1.74.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -14,4 +14,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=cada668df915bf4eaa7ef271ab0920002b2bc7f9b6b3cbd8598481646c52d4e8
+checksum=3b0fcd2daff4cdce575f7a833a36c3a63a66c0dbb9af50baafe3ec9fe02c3872

From c7a3fa3e669de817b7fc2a10b9a97323b67bc726 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 6 May 2022 21:37:38 -0400
Subject: [PATCH 2066/2561] just: update to 1.1.3.

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index f3857ec4f01f..eecc1f7890cc 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.1.2
+version=1.1.3
 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/refs/tags/${version}.tar.gz"
-checksum=5f04ce85dc2de7609d68c336a7c51f477f8ff079d8b209a0d72183615e3f1e55
+checksum=571f35b2b08d0e0617028854a8c2781b822544c58b8a081f4fc795a779c80878
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From b96df6aa663aee0fe10a701d933ff57ec3a9c38a Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Fri, 6 May 2022 22:32:16 +0600
Subject: [PATCH 2067/2561] fselect: update to 0.8.0.

---
 srcpkgs/fselect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index bdb1a6071b02..5c35c5be539f 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -1,6 +1,6 @@
 # Template file for 'fselect'
 pkgname=fselect
-version=0.7.7
+version=0.8.0
 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=0dc6749a0c15a79639a183d44be630f59c7ce7c1af5a835fe0fd31c0eab4a653
+checksum=33dfcbbf7e598bce479b1fb5c17429af1bb309beab2e4bc95642e9f4b5c2ffbd
 
 post_install() {
 	vlicense LICENSE-MIT

From 074ab2b843232e3e741e4e5b570b8363e173b90e Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 5 May 2022 17:05:48 +0200
Subject: [PATCH 2068/2561] master-pdf-editor: update to 5.8.52.

---
 srcpkgs/master-pdf-editor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49f1604d8a0d..8ffcc363e6d9 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.8.33
+version=5.8.52
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=b202c5fcda5a36590be6203597b43332260ac1170c0eed831dd4c869e1ceb5f2
+checksum=dba3e36371c897ebd463e59366d37a77c091f59fb1a73d7b58eb0213c2bff3e7
 nostrip=yes
 repository=nonfree
 restricted=yes

From e99feb6db08f49219dda247a981e56e033f4bcaf Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Thu, 5 May 2022 10:45:59 +0200
Subject: [PATCH 2069/2561] google-chrome: update to 101.0.4951.54

---
 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 c6614dbcd27b..94cd9a30ad4a 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=101.0.4951.41
+version=101.0.4951.54
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=78d24e94017eb94ab771d49bcd4dd0684f86ca05bc40250fe3151040aefedf8a
+checksum=bedc9782f008645c3bcda9edbeeabf52ef15ed1d736a697819e56f2e5c37dad4
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From d9ecf803d5bebe337fc1f39990dda3dc5296c084 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 May 2022 09:16:28 +0200
Subject: [PATCH 2070/2561] alkimia: update to 8.1.1.

---
 srcpkgs/alkimia/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/alkimia/template b/srcpkgs/alkimia/template
index 5b385025413a..b8f46d0139d5 100644
--- a/srcpkgs/alkimia/template
+++ b/srcpkgs/alkimia/template
@@ -1,12 +1,12 @@
 # Template file for 'alkimia'
 pkgname=alkimia
-version=8.1.0
+version=8.1.1
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson
  -DSHARE_INSTALL_DIR=/usr/share -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
- kcoreaddons gettext"
+ kcoreaddons gettext kpackage"
 makedepends="qt5-devel gmp-devel gmpxx-devel qt5-webkit-devel
  qt5-declarative-devel kconfig-devel kcoreaddons-devel kdelibs4support-devel
  kpackage-devel plasma-framework-devel knewstuff-devel"
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"
 distfiles="${KDE_SITE}/alkimia/${version}/alkimia-${version}.tar.xz"
-checksum=916807352707b0490cdd9ca65682eff73b00ca523029bda6fe7a2749a1bc927c
+checksum=957adc63c0be54dd433e3268a37323be5456e5ab84ece27f73a1616a92db86d5
 
 libalkimia-devel_package() {
 	short_desc+=" - development files"

From 0ffbfb58f765111524776276346d346a3d8479e5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 May 2022 09:26:50 +0200
Subject: [PATCH 2071/2561] libvirt: update to 8.3.0.

---
 srcpkgs/libvirt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index e73c337822e7..e6af657a3b8b 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=8.2.0
+version=8.3.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
@@ -20,7 +20,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=0ecd9c7dd52db7a2d124155ffa5e11de2fbd05014eceffbd1972b022d21becba
+checksum=be229b9ad1d48be7007e7bf341fc990c65e24aea624c16db6b36d02c820df5eb
 # At least one test times out on CI but works locally
 make_check=ci-skip
 

From 2dc77d60eba867c9666ee4c9a6bc6f627b2606f5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 May 2022 09:29:31 +0200
Subject: [PATCH 2072/2561] libvirt-python3: update to 8.3.0.

---
 srcpkgs/libvirt-python3/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 2aea5df86fec..e9d77cf43598 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,10 +1,11 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=8.2.0
+version=8.3.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
-hostmakedepends="pkg-config python3-devel libvirt-devel libapparmor-devel"
+hostmakedepends="pkg-config python3-devel python3-setuptools libvirt-devel
+ libapparmor-devel"
 makedepends="libvirt-devel python3-devel"
 checkdepends="python3-pytest python3-lxml python3-nose"
 short_desc="Libvirt virtualization API Python3 binding"
@@ -12,7 +13,7 @@ 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=f8b8cea67ff0d64d63029cc3410a4656e04ee9f26837a856bc0c287da55d053a
+checksum=e936ff747c1d72b6618eebb7236ae69c255ca9e0de6e4153d95d8b9c6b2ecfc1
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest

From 54c7ee81981ae20181bbaffba38f3700ffcb1faa Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 May 2022 09:41:52 +0200
Subject: [PATCH 2073/2561] linux4.19: update to 4.19.241.

---
 srcpkgs/linux4.19/files/i386-dotconfig    | 5 ++---
 srcpkgs/linux4.19/files/ppc-dotconfig     | 4 ++--
 srcpkgs/linux4.19/files/ppc64-dotconfig   | 5 ++---
 srcpkgs/linux4.19/files/ppc64le-dotconfig | 5 ++---
 srcpkgs/linux4.19/files/x86_64-dotconfig  | 5 ++---
 srcpkgs/linux4.19/template                | 4 ++--
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/linux4.19/files/i386-dotconfig b/srcpkgs/linux4.19/files/i386-dotconfig
index 3a63fc470876..4552d18061c8 100644
--- a/srcpkgs/linux4.19/files/i386-dotconfig
+++ b/srcpkgs/linux4.19/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.19.230 Kernel Configuration
+# Linux/i386 4.19.241 Kernel Configuration
 #
 
 #
@@ -2003,6 +2003,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3237,8 +3238,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index c58c80497acd..b5025b4536cf 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.230 Kernel Configuration
+# Linux/powerpc 4.19.241 Kernel Configuration
 #
 
 #
@@ -1649,6 +1649,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_MAC_FLOPPY=y
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
@@ -2931,7 +2932,6 @@ CONFIG_MISDN_W6692=m
 # CONFIG_MISDN_NETJET is not set
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
-# CONFIG_NVM is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux4.19/files/ppc64-dotconfig b/srcpkgs/linux4.19/files/ppc64-dotconfig
index ad7f89793eff..ca44b106df42 100644
--- a/srcpkgs/linux4.19/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.230 Kernel Configuration
+# Linux/powerpc 4.19.241 Kernel Configuration
 #
 
 #
@@ -2018,6 +2018,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3317,8 +3318,6 @@ CONFIG_IEEE802154_HWSIM=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux4.19/files/ppc64le-dotconfig b/srcpkgs/linux4.19/files/ppc64le-dotconfig
index 195a7ef89b4d..0c14831463ab 100644
--- a/srcpkgs/linux4.19/files/ppc64le-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64le-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.230 Kernel Configuration
+# Linux/powerpc 4.19.241 Kernel Configuration
 #
 
 #
@@ -1929,6 +1929,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3171,8 +3172,6 @@ CONFIG_IEEE802154_HWSIM=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux4.19/files/x86_64-dotconfig b/srcpkgs/linux4.19/files/x86_64-dotconfig
index 43c483127f5b..0bcdb8d876cb 100644
--- a/srcpkgs/linux4.19/files/x86_64-dotconfig
+++ b/srcpkgs/linux4.19/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.19.230 Kernel Configuration
+# Linux/x86_64 4.19.241 Kernel Configuration
 #
 
 #
@@ -2053,6 +2053,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3308,8 +3309,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 725d28a4a212..d58249cf182a 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.240
+version=4.19.241
 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=72ac1fd5bdf9b1d0a6da1237692a0570028cb994e750f99992d374eb9fdd46c2
+checksum=4c6269d3c14e593151b035a55227110e632642d848032ef6992135c18488fe13
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 6ca0500ccdfa55ae3c98d355888f086501c95c53 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 May 2022 10:26:17 +0200
Subject: [PATCH 2074/2561] wine: update to 7.8.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index b08032957c49..6fa72d3b0d65 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.7
+version=7.8
 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="52a4d06ba77080df4a4b022bf9c2cc05cfa1d79bd4bb08c6b88f7c3ae09d1464
- 9a8c18196ea346cdce84bd87693e911ecb505c1324b85bdbf60b115f8c487ab7"
+checksum="8f76e9c96b50f2ac8e24e5deedfa3e0d9596a5706709226f65a94c6a160019b8
+ 2561142889a700534b1d710d000cd6d819b9ed23c55b0f66b5af878b4a29a587"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 4c1655aa024bcfb8c2122b050bacd3477c1576c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 May 2022 11:36:48 +0200
Subject: [PATCH 2075/2561] libfido2: update to 1.11.0.

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index b1ac557296c8..85f27e57bfa2 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,6 +1,6 @@
 # Template file for 'libfido2'
 pkgname=libfido2
-version=1.10.0
+version=1.11.0
 revision=1
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
@@ -11,7 +11,7 @@ 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=526efd3d56af706c05d09f3d21f18ee3b0b15ac0c1f5c5da1acbc27c2730b99b
+checksum=0830c5853e3b44099a97166e0cec54a65b54b7faaac07071872f77b8e4d7b302
 # 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"

From c2ea76e48c40bb45654b36b6306c2fd312b4b5ee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 May 2022 11:37:50 +0200
Subject: [PATCH 2076/2561] carton: update to 1.0.35.

---
 srcpkgs/carton/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/carton/template b/srcpkgs/carton/template
index 4ae5b32d16e5..27d383712926 100644
--- a/srcpkgs/carton/template
+++ b/srcpkgs/carton/template
@@ -1,7 +1,7 @@
 # Template file for 'carton'
 pkgname=carton
-version=1.0.34
-revision=2
+version=1.0.35
+revision=1
 wrksrc="Carton-v${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Class-Tiny perl-JSON perl-Menlo-Legacy
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="https://metacpan.org/release/Carton"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 distfiles="${CPAN_SITE}/XML/MIYAGAWA/Carton-v${version}.tar.gz"
-checksum=77d42b92732bcfc18a59d341e56ce476205b1c4d380eab3a07224f5745c23e45
+checksum=9c4558ca97cd08b69fdfb52b28c3ddc2043ef52f0627b90e53d05a4087344175

From 51f377fe00368a3c7f1c4aeb9356c9e459915a33 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 7 May 2022 14:17:27 +0200
Subject: [PATCH 2077/2561] sqlite: update to 3.38.5.

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 956daec63b5c..5ca279068b5d 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.4
+version=3.38.5
 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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=1935751066c2fd447404caa78cfb8b2b701fad3f6b1cf40b3d658440f6cc7563
+checksum=5af07de982ba658fd91a03170c945f99c971f6955bc79df3266544373e39869c
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From d42a65860172d29b04dd8b53a2432ecb7cc6b987 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 May 2022 22:51:24 +0300
Subject: [PATCH 2078/2561] New package: s6-portable-utils-man-pages-2.2.4.0.1

---
 srcpkgs/s6-portable-utils-man-pages/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/s6-portable-utils-man-pages/template

diff --git a/srcpkgs/s6-portable-utils-man-pages/template b/srcpkgs/s6-portable-utils-man-pages/template
new file mode 100644
index 000000000000..b040275bc53c
--- /dev/null
+++ b/srcpkgs/s6-portable-utils-man-pages/template
@@ -0,0 +1,16 @@
+# Template file for 's6-portable-utils-man-pages'
+pkgname=s6-portable-utils-man-pages
+version=2.2.4.0.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="mdocml"
+short_desc="Documentation for s6-portable-utils in mdoc(7) format"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="ISC"
+homepage="https://github.com/flexibeast/s6-portable-utils-man-pages"
+distfiles="https://github.com/flexibeast/s6-portable-utils-man-pages/archive/refs/tags/v${version}.tar.gz"
+checksum=c5d7cd6ed2d9c91f92784e5d6dd80161e6a5195b4b90477083e07ba424eb6720
+
+post_install() {
+	vlicense LICENSE
+}

From cdad530d65a25baec51e86c776f72fbab479770c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 May 2022 22:43:39 +0300
Subject: [PATCH 2079/2561] execline-man-pages: update to 2.8.3.0.2.

---
 srcpkgs/execline-man-pages/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template
index fb3a1885cae1..3bebd8f3ba1e 100644
--- a/srcpkgs/execline-man-pages/template
+++ b/srcpkgs/execline-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 'execline-man-pages'
 pkgname=execline-man-pages
-version=2.8.1.0.4
+version=2.8.3.0.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/execline-man-pages"
 distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz"
-checksum=b535b83dc840b5285a19b9ee0ac3cd739912b069b3c4f3547d8b2ef6c6bcb98b
+checksum=7862c8918faa3e82ff0a65b5c108498a2b0b3b07b3ebfb8a7e6491890e0e84b4
 
 post_install() {
 	vlicense LICENSE

From b831d7e9540a1313dd5b9e7eee41bfa41df358cb Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 6 May 2022 20:59:47 +0300
Subject: [PATCH 2080/2561] lynx: update to 2.9.0dev.10.

---
 srcpkgs/lynx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..4266c099e153 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,17 +1,17 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
+version=2.9.0dev.10
 revision=1
 wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
-short_desc="A text browser for the World Wide Web"
+short_desc="Text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
 distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+checksum=898ac82bcfcbd4b20ea39afdf66fd659b8773c7549623b0f8802bf392a41a912
 
 pre_configure() {
 	sed -i configure \

From ade8702575e3cc6d7e545e55857814985c7e4a0c Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Tue, 3 May 2022 11:55:59 -0500
Subject: [PATCH 2081/2561] gptfdisk: update to 1.0.9.

---
 srcpkgs/gptfdisk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gptfdisk/template b/srcpkgs/gptfdisk/template
index c1278f5d47db..a760af49bcc0 100644
--- a/srcpkgs/gptfdisk/template
+++ b/srcpkgs/gptfdisk/template
@@ -1,6 +1,6 @@
 # Template file for 'gptfdisk'
 pkgname=gptfdisk
-version=1.0.8
+version=1.0.9
 revision=1
 build_style=gnu-makefile
 make_check_target=test
@@ -8,9 +8,9 @@ makedepends="ncurses-devel popt-devel libuuid-devel"
 short_desc="GPT fdisk text-mode partitioning tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.rodsbooks.com/gdisk/"
+homepage="https://www.rodsbooks.com/gdisk/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df
+checksum=dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2
 
 pre_build() {
 	vsed -i 's#<ncursesw/ncurses.h>#<ncurses.h>#' gptcurses.cc

From 1a9685a366ec727d547b44f441e95eb4b43bc037 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 6 May 2022 18:21:38 +0300
Subject: [PATCH 2082/2561] mupdf: update to 1.19.1.

I also switched from a `tar.gz` tarball to a `tar.xz` one since it's
smaller in size (87 MB vs 62 MB).
---
 srcpkgs/mupdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index c6331d120357..93286959c402 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,6 +1,6 @@
 # Template file for 'mupdf'
 pkgname=mupdf
-version=1.19.0
+version=1.19.1
 revision=1
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
@@ -14,8 +14,8 @@ short_desc="Lightweight PDF and XPS viewer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://mupdf.com"
-distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.gz"
-checksum=21affcd4fcabf1cc7a896db95ba971552ba9df229ebec7720313a8803185deed
+distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.xz"
+checksum=b5eac663fe74f33c430eda342f655cf41fa73d71610f0884768a856a82e3803e
 
 pre_build() {
 	# libmupdf-{threads,pkcs7}.a are required by fbpdf

From ef97b3e743d2b802bff3cacb8d7eac9c682021e5 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Thu, 14 Apr 2022 10:44:44 -0500
Subject: [PATCH 2083/2561] dropbear: update to 2022.82.

---
 srcpkgs/dropbear/patches/test-without-pip.patch | 15 +++++++++++++++
 srcpkgs/dropbear/template                       | 12 ++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dropbear/patches/test-without-pip.patch

diff --git a/srcpkgs/dropbear/patches/test-without-pip.patch b/srcpkgs/dropbear/patches/test-without-pip.patch
new file mode 100644
index 000000000000..f726be40a34e
--- /dev/null
+++ b/srcpkgs/dropbear/patches/test-without-pip.patch
@@ -0,0 +1,15 @@
+diff --git a/test/Makefile.in b/test/Makefile.in
+index b2c8d43..5747310 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -13,9 +13,7 @@ one: venv/bin/pytest fakekey
+ fakekey:
+ 	../dropbearkey -t ecdsa -f $@
+ 
+-venv/bin/pytest: $(srcdir)/requirements.txt
++venv/bin/pytest:
+ 	python3 -m venv init venv
+-	./venv/bin/pip install --upgrade pip
+-	./venv/bin/pip install -r $(srcdir)/requirements.txt
+ 
+ .PHONY: test
diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template
index 69981dcfe9e5..8b792314536d 100644
--- a/srcpkgs/dropbear/template
+++ b/srcpkgs/dropbear/template
@@ -1,19 +1,27 @@
 # Template file for 'dropbear'
 pkgname=dropbear
-version=2020.81
+version=2022.82
 revision=1
 build_style=gnu-configure
 configure_args="--enable-zlib --disable-bundled-libtom"
 makedepends="zlib-devel libtommath-devel libtomcrypt-devel"
+checkdepends="python3-pytest python3-parsing python3-psutil openssh"
 short_desc="Small SSH server and client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://matt.ucc.asn.au/dropbear/dropbear.html"
 changelog="https://matt.ucc.asn.au/dropbear/CHANGES"
 distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar.bz2"
-checksum=48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b
+checksum=3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1
 make_dirs="/etc/dropbear 0755 root root"
 
+# These tests don't work from within xbps-src
+# and probably should not be run from there
+pre_check() {
+	rm test/test_aslr.py
+	rm test/test_channels.py
+}
+
 post_install() {
 	vsv dropbear
 	vlicense LICENSE

From 6d43cc36c23380286eaafe61e447a46f106a36b1 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 4 May 2022 16:45:42 +0200
Subject: [PATCH 2084/2561] python3-pivy: update to 0.6.7.

Closes: #36984 [via git-merge-pr]
---
 srcpkgs/python3-pivy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template
index 6105058d9982..a442b6a94c87 100644
--- a/srcpkgs/python3-pivy/template
+++ b/srcpkgs/python3-pivy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pivy'
 pkgname=python3-pivy
-version=0.6.6
-revision=3
+version=0.6.7
+revision=1
 wrksrc="pivy-${version}"
 build_style=cmake
 hostmakedepends="python3-devel swig"
@@ -12,7 +12,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="ISC"
 homepage="https://github.com/coin3d/pivy"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=27204574d894cc12aba5df5251770f731f326a3e7de4499e06b5f5809cc5659e
+checksum=37e33d85117aac27640e011df74ddcd77f270428300df916b46ee5c50645d582
 
 # still relevant with pivy 0.6.6 ?
 case "$XBPS_TARGET_MACHINE" in

From e5d8050e8c44870c28417d43d730c97ccf39cc25 Mon Sep 17 00:00:00 2001
From: Caleb Heydon <caleb.heydon@gmail.com>
Date: Sat, 9 Apr 2022 16:53:19 -0400
Subject: [PATCH 2085/2561] freecad: update to 0.19.4.

Closes: #36607 [via git-merge-pr]
---
 srcpkgs/freecad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index a2f04bd91f1b..1e2aec024fd7 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
-version=0.19.2
-revision=4
+version=0.19.4
+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=47e39e3d6fcafe6e0c68923fb1b86acda16986268e5e6011694057b940139fba
+checksum=e40a1c343956e13c56cc8578d025ae83d68d9d20acda1732953bc8a3883e9722
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"

From 392deacdefbca037fe6c33d475ff3f91c18472a8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Oct 2021 14:43:08 -0400
Subject: [PATCH 2086/2561] New package: activityrelay-0.2.0

---
 .../activityrelay/files/activityrelay/log/run |  1 +
 srcpkgs/activityrelay/files/activityrelay/run |  5 +++
 srcpkgs/activityrelay/template                | 36 +++++++++++++++++++
 srcpkgs/activityrelay/update                  |  2 ++
 4 files changed, 44 insertions(+)
 create mode 120000 srcpkgs/activityrelay/files/activityrelay/log/run
 create mode 100755 srcpkgs/activityrelay/files/activityrelay/run
 create mode 100644 srcpkgs/activityrelay/template
 create mode 100644 srcpkgs/activityrelay/update

diff --git a/srcpkgs/activityrelay/files/activityrelay/log/run b/srcpkgs/activityrelay/files/activityrelay/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/activityrelay/files/activityrelay/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/activityrelay/files/activityrelay/run b/srcpkgs/activityrelay/files/activityrelay/run
new file mode 100755
index 000000000000..2082710dd442
--- /dev/null
+++ b/srcpkgs/activityrelay/files/activityrelay/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+exec 2>&1
+exec chpst -u _activityrelay:_activityrelay activityrelay \
+	-c ${CONFIG_FILE:-/etc/activityrelay/activityrelay.yaml}
diff --git a/srcpkgs/activityrelay/template b/srcpkgs/activityrelay/template
new file mode 100644
index 000000000000..dc8271c846d2
--- /dev/null
+++ b/srcpkgs/activityrelay/template
@@ -0,0 +1,36 @@
+# Template file for 'activityrelay'
+pkgname=activityrelay
+version=0.2.0
+revision=1
+wrksrc="relay-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-aiohttp python3-cachetools python3-click python3-pycryptodome
+ python3-yaml"
+short_desc="Generic LitePub relay (works with LitePub consumers and Mastodon)"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="AGPL-3.0-or-later"
+homepage="https://git.pleroma.social/pleroma/relay"
+distfiles="https://git.pleroma.social/pleroma/relay/-/archive/${version}/relay-${version}.tar.gz"
+checksum=32db6e1084ddc5b000d45e8f5f7e098132082ea04eb538fc4927e94f49ac2a50
+make_check=no # no tests specified
+
+system_accounts="_activityrelay"
+_activityrelay_homedir="/var/lib/activityrelay"
+
+make_dirs="/var/lib/activityrelay 0700 _activityrelay _activityrelay
+ /etc/activityrelay 0755 _activityrelay _activityrelay"
+
+post_patch() {
+	vsed -i 's,relay.jsonld,/var/lib/activityrelay/relay.jsonld,' relay.yaml.example
+}
+
+post_install() {
+	vsv activityrelay
+	vsconf installation/relay.caddy
+	vsconf installation/relay.nginx
+	vsconf relay.yaml.example
+	vsconf Dockerfile
+
+	vlicense LICENSE
+}
diff --git a/srcpkgs/activityrelay/update b/srcpkgs/activityrelay/update
new file mode 100644
index 000000000000..2a4e4176fdc7
--- /dev/null
+++ b/srcpkgs/activityrelay/update
@@ -0,0 +1,2 @@
+site="https://git.pleroma.social/pleroma/relay/-/tags"
+pkgname="relay"

From 1fd99f707600db7661730da5ed5e2f7291dfcaed Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Tue, 4 Jan 2022 16:11:43 -0800
Subject: [PATCH 2087/2561] New package: R-cran-RInside-0.2.16

---
 common/shlibs                   | 16 ++++++++++++++++
 srcpkgs/R-cran-RInside/template | 12 ++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/R-cran-RInside/template

diff --git a/common/shlibs b/common/shlibs
index 353e291f59d6..784375c7c9aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4153,3 +4153,19 @@ librz_bin.so.0.3.4 rizin-0.3.4_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
 libnvme.so.1 libnvme-1.0_1
+libRInside.so R-cran-RInside-0.2.16_1
+libXrdUtils.so.3 xrootd-5.4.0_1
+libXrdCl.so.3 xrootd-5.4.0_1
+libXrdServer.so.3 xrootd-5.4.0_1
+libXrdCrypto.so.2 xrootd-5.4.0_1
+libXrdPosix.so.3 xrootd-5.4.0_1
+libXrdHttpUtils.so.2 xrootd-5.4.0_1
+libXrdSsiLib.so.2 xrootd-5.4.0_1
+libXrdCryptoLite.so.2 xrootd-5.4.0_1
+libCore.so root-6.24.06_1
+libTree.so root-6.24.06_1
+libRIO.so root-6.24.06_1
+libMatrix.so root-6.24.06_1
+libThread.so root-6.24.06_1
+libTMVA.so root-6.24.06_1
+libMathCore.so root-6.24.06_1
diff --git a/srcpkgs/R-cran-RInside/template b/srcpkgs/R-cran-RInside/template
new file mode 100644
index 000000000000..9bd19d893cd1
--- /dev/null
+++ b/srcpkgs/R-cran-RInside/template
@@ -0,0 +1,12 @@
+# Template file for 'R-cran-RInside'
+pkgname=R-cran-RInside
+version=0.2.17
+revision=1
+build_style=R-cran
+makedepends="R-cran-Rcpp"
+short_desc="C++ classes to embed R in C++ (and C) applications"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://CRAN.R-project.org/package=RInside"
+checksum=0be28c44ee34cba669a7264d2b99c289230645598ca78e21682559dc31824348
+shlib_provides="libRInside.so"

From 08c17c6a4f699edffd6207ce4c7cd49def1150a1 Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Tue, 11 Jan 2022 12:36:46 -0800
Subject: [PATCH 2088/2561] New package: xrootd-5.4.0

---
 srcpkgs/xrootd/patches/musl.patch | 227 ++++++++++++++++++++++++++++++
 srcpkgs/xrootd/template           |  21 +++
 2 files changed, 248 insertions(+)
 create mode 100644 srcpkgs/xrootd/patches/musl.patch
 create mode 100644 srcpkgs/xrootd/template

diff --git a/srcpkgs/xrootd/patches/musl.patch b/srcpkgs/xrootd/patches/musl.patch
new file mode 100644
index 000000000000..7dccd97d6c45
--- /dev/null
+++ b/srcpkgs/xrootd/patches/musl.patch
@@ -0,0 +1,227 @@
+diff --git a/src/Xrd/XrdConfig.hh b/src/Xrd/XrdConfig.hh
+index a06ad462f..702403d82 100644
+--- a/src/Xrd/XrdConfig.hh
++++ b/src/Xrd/XrdConfig.hh
+@@ -34,6 +34,11 @@
+ #include "Xrd/XrdProtLoad.hh"
+ #include "Xrd/XrdProtocol.hh"
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++#define __NEED_mode_t
++#include <bits/alltypes.h>
++#endif
++
+ class XrdSysError;
+ class XrdTcpMonInfo;
+ class XrdNetSecurity;
+diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc
+index e663fdd35..14c3b19d6 100644
+--- a/src/XrdAcc/XrdAccGroups.cc
++++ b/src/XrdAcc/XrdAccGroups.cc
+@@ -46,6 +46,14 @@
+ #include "XrdAcc/XrdAccGroups.hh"
+ #include "XrdAcc/XrdAccPrivs.hh"
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++int innetgr(const char *netgroup, const char *host, const char *user,
++             const char *domain)
++{
++   return 0;
++}
++#endif
++
+ // Additionally, this routine does not support a user in more than
+ // NGROUPS_MAX groups. This is a standard unix limit defined in limits.h.
+   
+diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh
+index 9f9d8b91f..5ff49cbbc 100644
+--- a/src/XrdCl/XrdClFileStateHandler.hh
++++ b/src/XrdCl/XrdClFileStateHandler.hh
+@@ -42,6 +42,12 @@
+ #include <sys/uio.h>
+ #include <cstdint>
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++#define __NEED_suseconds_t
++#define __NEED_struct_timeval
++#include <bits/alltypes.h>
++#endif
++
+ namespace
+ {
+   class PgReadHandler;
+diff --git a/src/XrdCl/XrdClMonitor.hh b/src/XrdCl/XrdClMonitor.hh
+index 2fc753777..d22c3c275 100644
+--- a/src/XrdCl/XrdClMonitor.hh
++++ b/src/XrdCl/XrdClMonitor.hh
+@@ -43,6 +43,12 @@
+ 
+ #include "XrdCl/XrdClFileSystem.hh"
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++#define __NEED_suseconds_t
++#define __NEED_struct_timeval
++#include <bits/alltypes.h>
++#endif
++
+ namespace XrdCl
+ {
+   class URL;
+diff --git a/src/XrdNet/XrdNetSecurity.cc b/src/XrdNet/XrdNetSecurity.cc
+index 0f8451127..e39b1ef4b 100644
+--- a/src/XrdNet/XrdNetSecurity.cc
++++ b/src/XrdNet/XrdNetSecurity.cc
+@@ -40,12 +40,14 @@
+ #include <sys/types.h>
+ #include <Winsock2.h>
+ #include <io.h>
++#include "XrdSys/XrdWin32.hh"
++#endif
++#if WIN32 || defined(__linux__) && !defined(__GLIBC__)
+ int innetgr(const char *netgroup, const char *host, const char *user,
+              const char *domain)
+ {
+    return 0;
+ }
+-#include "XrdSys/XrdWin32.hh"
+ #endif
+ 
+ #include "XrdNet/XrdNetAddr.hh"
+diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc
+index 0f32dc2ee..b6dea957f 100644
+--- a/src/XrdPosix/XrdPosix.cc
++++ b/src/XrdPosix/XrdPosix.cc
+@@ -37,6 +37,9 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/uio.h>
++#if defined(__linux__) && !defined(_IO_ERR_SEEN)
++#include <stdio_ext.h>
++#endif
+ 
+ #include "XrdSys/XrdSysHeaders.hh"
+ #include "XrdPosix/XrdPosixLinkage.hh"
+@@ -311,8 +314,12 @@ size_t XrdPosix_Fread(void *ptr, size_t size, size_t nitems, FILE *stream)
+         if (bytes > 0 && size) rc = bytes/size;
+ #ifndef SUNX86
+ #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
++#ifdef _IO_ERR_SEEN
+    else if (bytes < 0) stream->_flags |= _IO_ERR_SEEN;
+    else                stream->_flags |= _IO_EOF_SEEN;
++#else
++   else if (bytes < 0) __fseterr(stream);
++#endif
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+    else if (bytes < 0) stream->_flags |= __SEOF;
+    else                stream->_flags |= __SERR;
+@@ -482,7 +489,11 @@ size_t XrdPosix_Fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream
+    if (bytes > 0 && size) rc = bytes/size;
+ #ifndef SUNX86
+ #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
++#ifdef _IO_ERR_SEEN
+       else stream->_flags |= _IO_ERR_SEEN;
++#else
++      else  __fseterr(stream);
++#endif
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+       else stream->_flags |= __SERR;
+ #else
+diff --git a/src/XrdPosix/XrdPosixLinkage.hh b/src/XrdPosix/XrdPosixLinkage.hh
+index 903153252..b5cc6d4b4 100644
+--- a/src/XrdPosix/XrdPosixLinkage.hh
++++ b/src/XrdPosix/XrdPosixLinkage.hh
+@@ -40,6 +40,7 @@
+ #include <unistd.h>
+ 
+ #include "XrdPosix/XrdPosixOsDep.hh"
++#include "XrdPosix/XrdPosixXrootd.hh"
+ #include "XrdSys/XrdSysPlatform.hh"
+ 
+ /******************************************************************************/
+diff --git a/src/XrdPosix/XrdPosixMap.hh b/src/XrdPosix/XrdPosixMap.hh
+index ac2da483a..a15602787 100644
+--- a/src/XrdPosix/XrdPosixMap.hh
++++ b/src/XrdPosix/XrdPosixMap.hh
+@@ -36,6 +36,11 @@
+ #include "XrdCl/XrdClFileSystem.hh"
+ #include "XrdCl/XrdClXRootDResponses.hh"
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++#define __NEED_dev_t
++#include <bits/alltypes.h>
++#endif
++
+ class XrdPosixMap
+ {
+ public:
+diff --git a/src/XrdPosix/XrdPosixPreload.cc b/src/XrdPosix/XrdPosixPreload.cc
+index 867b73479..d967c53b3 100644
+--- a/src/XrdPosix/XrdPosixPreload.cc
++++ b/src/XrdPosix/XrdPosixPreload.cc
+@@ -42,6 +42,22 @@
+ 
+ #include "XrdPosix/XrdPosixExtern.hh"
+  
++#ifdef creat64
++#undef creat64
++#undef fseeko64
++#undef ftello64
++#undef ftruncate64
++#undef lseek64
++#undef open64
++#undef pread64
++#undef pwrite64
++#undef readdir64
++#undef readdir64_r
++#undef statfs64
++#undef statvfs64
++#undef truncate64
++#endif
++
+ /******************************************************************************/
+ /*                   G l o b a l   D e c l a r a t i o n s                    */
+ /******************************************************************************/
+diff --git a/src/XrdSys/XrdSysPlatform.hh b/src/XrdSys/XrdSysPlatform.hh
+index a1ac544ad..eaeaeabac 100644
+--- a/src/XrdSys/XrdSysPlatform.hh
++++ b/src/XrdSys/XrdSysPlatform.hh
+@@ -241,16 +241,8 @@ extern "C"
+ #if defined(_AIX) || \
+    (defined(XR__SUNGCC3) && !defined(__arch64__))
+ #   define SOCKLEN_t size_t
+-#elif defined(XR__GLIBC) || \
+-   defined(__FreeBSD__) || \
+-   (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) || \
+-   (defined(XR__SUNGCC3) && defined(__arch64__)) || defined(__APPLE__) || \
+-   (defined(__sun) && defined(_SOCKLEN_T))
+-#   ifndef SOCKLEN_t
+-#      define SOCKLEN_t socklen_t
+-#   endif
+ #elif !defined(SOCKLEN_t)
+-#   define SOCKLEN_t int
++#   define SOCKLEN_t socklen_t
+ #endif
+ 
+ #ifdef _LP64
+diff --git a/src/XrdSys/XrdSysPthread.hh b/src/XrdSys/XrdSysPthread.hh
+index 17f8fd0be..78741a7dc 100644
+--- a/src/XrdSys/XrdSysPthread.hh
++++ b/src/XrdSys/XrdSysPthread.hh
+@@ -351,7 +351,7 @@ enum PrefType {prefWR=1};
+ 
+         XrdSysRWLock(PrefType ptype)
+                     {
+-#ifdef __linux__
++#ifdef __GLIBC__
+                      pthread_rwlockattr_t attr;
+                      pthread_rwlockattr_setkind_np(&attr,
+                              PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+@@ -367,7 +367,7 @@ enum PrefType {prefWR=1};
+ inline void ReInitialize(PrefType ptype)
+ {
+   pthread_rwlock_destroy(&lock);
+-#ifdef __linux__
++#ifdef __GLIBC__
+   pthread_rwlockattr_t attr;
+   pthread_rwlockattr_setkind_np(&attr,
+                      PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template
new file mode 100644
index 000000000000..2bd0b59714c2
--- /dev/null
+++ b/srcpkgs/xrootd/template
@@ -0,0 +1,21 @@
+# Template file for 'xrootd'
+pkgname=xrootd
+version=5.4.2
+revision=1
+build_style=cmake
+makedepends="zlib-devel openssl-devel libuuid-devel readline-devel"
+short_desc="Low latency, scalable and fault tolerant access to data"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://xrootd.slac.stanford.edu"
+distfiles="http://xrootd.org/download/v${version}/xrootd-${version}.tar.gz"
+checksum=d868ba5d8b71ec38f7a113d2d8f3e25bbcedc1bc23d21bba1686ddfdb2b900c1
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
+	makedepends+=" libexecinfo-devel"
+fi
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+	makedepends+=" libatomic-devel"
+fi

From 4bdf656cf4fcb72b2561df71f7356444cd12b99f Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Tue, 11 Jan 2022 12:38:46 -0800
Subject: [PATCH 2089/2561] New package: libvdt-0.4.3

---
 srcpkgs/libvdt-devel    |  1 +
 srcpkgs/libvdt/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libvdt-devel
 create mode 100644 srcpkgs/libvdt/template

diff --git a/srcpkgs/libvdt-devel b/srcpkgs/libvdt-devel
new file mode 120000
index 000000000000..25fca34b3833
--- /dev/null
+++ b/srcpkgs/libvdt-devel
@@ -0,0 +1 @@
+libvdt
\ No newline at end of file
diff --git a/srcpkgs/libvdt/template b/srcpkgs/libvdt/template
new file mode 100644
index 000000000000..3caa629d6eb2
--- /dev/null
+++ b/srcpkgs/libvdt/template
@@ -0,0 +1,28 @@
+# Template file for 'libvdt'
+pkgname=libvdt
+version=0.4.3
+revision=1
+wrksrc="vdt-${version}"
+build_style=cmake
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*|arm*)
+	configure_args="-DSSE=OFF -DNEON=OFF"
+	make_cmd=make
+	export CMAKE_GENERATOR="Unix Makefiles"
+	;;
+esac
+hostmakedepends="python3"
+short_desc="Collection of fast and inline implementations of mathematical functions"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/dpiparo/vdt"
+distfiles="https://github.com/dpiparo/vdt/archive/refs/tags/v${version}.tar.gz"
+checksum=705674612ebb5c182b65a8f61f4d173eb7fe7cdeee2235b402541a492e08ace1
+
+libvdt-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+	}
+}

From bc1e8f7d602a1fe76a32a91ad7cb6baf1fd0e82f Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Mon, 20 Dec 2021 23:55:36 -0500
Subject: [PATCH 2090/2561] New package: root-6.26.02

---
 srcpkgs/python3-pyroot          |  1 +
 srcpkgs/root-R                  |  1 +
 srcpkgs/root/INSTALL.msg        |  3 ++
 srcpkgs/root/patches/musl.patch | 21 +++++++++++
 srcpkgs/root/template           | 66 +++++++++++++++++++++++++++++++++
 5 files changed, 92 insertions(+)
 create mode 120000 srcpkgs/python3-pyroot
 create mode 120000 srcpkgs/root-R
 create mode 100644 srcpkgs/root/INSTALL.msg
 create mode 100644 srcpkgs/root/patches/musl.patch
 create mode 100644 srcpkgs/root/template

diff --git a/srcpkgs/python3-pyroot b/srcpkgs/python3-pyroot
new file mode 120000
index 000000000000..93ca1422a8da
--- /dev/null
+++ b/srcpkgs/python3-pyroot
@@ -0,0 +1 @@
+root
\ No newline at end of file
diff --git a/srcpkgs/root-R b/srcpkgs/root-R
new file mode 120000
index 000000000000..93ca1422a8da
--- /dev/null
+++ b/srcpkgs/root-R
@@ -0,0 +1 @@
+root
\ No newline at end of file
diff --git a/srcpkgs/root/INSTALL.msg b/srcpkgs/root/INSTALL.msg
new file mode 100644
index 000000000000..4d92c4ced6bc
--- /dev/null
+++ b/srcpkgs/root/INSTALL.msg
@@ -0,0 +1,3 @@
+Before using ROOT, source 'thisroot.sh' to set up environmental variables.
+
+$ source /usr/bin/thisroot.sh # also available: thisroot.{csh,fish}
diff --git a/srcpkgs/root/patches/musl.patch b/srcpkgs/root/patches/musl.patch
new file mode 100644
index 000000000000..7605e91675a3
--- /dev/null
+++ b/srcpkgs/root/patches/musl.patch
@@ -0,0 +1,21 @@
+diff --git a/core/thread/src/TPosixThread.cxx b/core/thread/src/TPosixThread.cxx
+index 1e879c1c3a..4e1245baeb 100644
+--- a/core/thread/src/TPosixThread.cxx
++++ b/core/thread/src/TPosixThread.cxx
+@@ -37,13 +37,13 @@ Int_t TPosixThread::Run(TThread *th, const int affinity)
+    pthread_attr_init(attr);
+    
+    if (affinity >= 0) {
+-   #ifdef R__MACOSX
+-      Warning("Run", "Affinity setting not yet implemented on MacOS");
+-   #else
++   #ifdef __GLIBC__
+       cpu_set_t cpuset;
+       CPU_ZERO(&cpuset);
+       CPU_SET(affinity, &cpuset);
+       pthread_attr_setaffinity_np(attr, sizeof(cpu_set_t), &cpuset);
++   #else
++      Warning("Run", "Affinity setting not yet implemented on this platform");
+    #endif
+    }
+ 
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
new file mode 100644
index 000000000000..bfc8cb6d8a3b
--- /dev/null
+++ b/srcpkgs/root/template
@@ -0,0 +1,66 @@
+# Template file for 'root'
+pkgname=root
+version=6.26.02
+revision=1
+# Only i686 and x86_64 seem to be officially supported
+archs="i686* x86_64*"
+build_style=cmake
+configure_args="-Dgnuinstall=ON -Druntime_cxxmodules=OFF
+ -Dclad=OFF $(vopt_if fortran '-Dfortran=ON')
+ -DXROOTD_XrdCl_LIBRARY=/usr/lib/libXrdCl.so.3
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib/root -Dr=ON
+ -DCMAKE_INSTALL_SYSCONFDIR='libexec/root'
+ $(vopt_if root7 '-Droot7=ON -DCMAKE_CXX_STANDARD=17 -Dwebgui=ON')
+ -DCMAKE_INSTALL_PYTHONDIR=${py3_sitelib/'usr/'}"
+hostmakedepends="gcc-fortran"
+makedepends="libX11-devel libXpm-devel libXft-devel libXext-devel
+ openssl-devel libpng-devel readline-devel tbb-devel liblz4-devel
+ pcre-devel xxHash-devel libzstd-devel liblzma-devel libvdt-devel
+ libxml2-devel python3-devel python3-numpy R-cran-Rcpp R-cran-RInside
+ xrootd"
+depends="gcc"
+case "$XBPS_TARGET_MACHINE" in
+	*-musl)
+	configure_args+=" -Dssl=OFF"
+	;;
+esac
+short_desc="C++ framework for data processing created by CERN"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://root.cern"
+distfiles="https://root.cern/download/root_v${version}.source.tar.gz"
+checksum=7ba96772271a726079506c5bf629c3ceb21bf0682567ed6145be30606d7cd9bb
+build_options="fortran root7"
+build_options_default="fortran"
+python_version=3
+shlib_provides="libCore.so libTree.so libRIO.so libMatrix.so libThread.so
+ libTMVA.so libMathCore.so"
+
+post_install() {
+	rm -v ${DESTDIR}/usr/share/root/fonts/LICENSE
+	rm -v ${DESTDIR}/usr/share/root/fonts/[a-mt-z]*.ttf
+}
+
+python3-pyroot_package() {
+	short_desc="Python interface to ROOT"
+	depends="root>=${version}_${revision} python3"
+	pkg_install() {
+		vmove ${py3_sitelib}
+	}
+}
+root-R_package() {
+	short_desc="ROOT interface to R"
+	depends="root>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/root/RExports.h
+		vmove usr/include/root/TRDataFrame.h
+		vmove usr/include/root/TRFunctionExport.h
+		vmove usr/include/root/TRFunctionImport.h
+		vmove usr/include/root/TRInterface.h
+		vmove usr/include/root/TRInternalFunction.h
+		vmove usr/include/root/TRObject.h
+		vmove usr/lib/root/libRInterface.so
+		vmove usr/lib/root/libRMVA.so
+		vmove usr/lib/root/libRtools.so
+	}
+}

From 18513cc3d1e002f82f8ffb8efd6aeb0f7932639c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 27 Mar 2022 21:26:45 +0300
Subject: [PATCH 2091/2561] anydesk: use the generic upstream tarball for the
 license.

That fixes the issue with the eula checksums,
thanks @tibequadorian.
---
 srcpkgs/anydesk/template | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index ba95d8775fe1..d22134033508 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,10 +1,11 @@
 # Template file for 'anydesk'
 pkgname=anydesk
 version=6.1.1
-revision=1
+revision=2
 archs="x86_64"
-create_wrksrc=yes
-hostmakedepends="patchelf rpmextract w3m"
+create_wrksrc="yes"
+hostmakedepends="patchelf rpmextract"
+depends="hicolor-icon-theme"
 short_desc="Fast remote desktop application"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
@@ -13,28 +14,18 @@ homepage="https://anydesk.com/remote-desktop"
 nopie=yes
 restricted=yes
 
-distfiles="https://download.anydesk.com/linux/anydesk_$version-1_x86_64.rpm"
-checksum=93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a
+distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_x86_64.rpm
+	https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
+checksum="93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a
+ 102e72c75502a4779083320322dd047e2b0c00a25ead7444a00aad1db54325aa"
 
-_eula_digest=cf42c51d94d40c5890b103a1b2c5b62b5faad7af1e14933cab98dea8066175e8
-
-post_extract() {
-	$XBPS_FETCH_CMD -o eula.html https://anydesk.com/en/terms
-	< eula.html w3m -dump -I utf-8 -T text/html |
-	sed -n '/envelope.p/q;/Terms [&] Conditions/,$p' >eula.txt
-
-	filesum="$($XBPS_DIGEST_CMD eula.txt)"
-	if [ "$filesum" != $_eula_digest ]; then
-		msg_error "EULA changed, new digest: $filesum\n"
-	fi
-}
 
 do_build() {
 	patchelf --remove-needed libpangox-1.0.so.0 usr/bin/anydesk
 }
 
 do_install() {
-	vcopy usr/share usr
-	vbin usr/bin/anydesk
-	vlicense eula.txt
+	vlicense "${pkgname}-${version}"/copyright
+	rm -rf "${pkgname}-${version}"
+	vcopy "*" /
 }

From 421c26bd111aae7d62e14d97273729cf92617c51 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 7 May 2022 19:19:31 +0200
Subject: [PATCH 2092/2561] xarcan: update to 0.6.1.

---
 srcpkgs/xarcan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index fef279d8e4ba..fbd3d7e6e867 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,20 +1,20 @@
 # Template file for 'xarcan'
 pkgname=xarcan
-version=0.6.0
-revision=3
+version=0.6.1
+revision=1
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
  libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
- xorgproto libxshmfence-devel"
+ xorgproto libxshmfence-devel xcb-util-wm-devel"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/letoram/xarcan"
 distfiles="https://github.com/letoram/xarcan/archive/${version}.tar.gz"
-checksum=db582bf9c412842fb263d4eb5118f4c1eb6e7b579042a179044d9467fdb98193
+checksum=b31c053a3b33e0af37528b8388f5687fe0d4af572bda0e507667dc7dd80ee1ba
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/{include,lib,share}

From 8c48e3b75c3cb6581779bd09660841670dcc7bab Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 7 May 2022 19:21:44 +0200
Subject: [PATCH 2093/2561] acfgfs: update to 0.6.1.

---
 srcpkgs/acfgfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/acfgfs/template b/srcpkgs/acfgfs/template
index 0e1ced9d4f06..91daf6055354 100644
--- a/srcpkgs/acfgfs/template
+++ b/srcpkgs/acfgfs/template
@@ -1,7 +1,7 @@
 # Template file for 'acfgfs'
 # !! keep synced with arcan
 pkgname=acfgfs
-version=0.6.0.1
+version=0.6.1
 revision=1
 wrksrc=arcan-${version}
 build_wrksrc=src/tools/acfgfs
@@ -13,7 +13,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://arcan-fe.com"
 distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz"
-checksum=7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed
+checksum=ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551
 
 case "${XBPS_TARGET_MACHINE}" in
 	i686|armv6l|armv7l|ppc)

From bdb6fe3c3c3ce2e388705967b020f7d5e563889c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 7 May 2022 19:23:43 +0200
Subject: [PATCH 2094/2561] exo: add changelog, fix homepage

---
 srcpkgs/exo/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index 5dd6fc3c2a1f..df5c22224d59 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,7 +1,7 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
@@ -10,7 +10,8 @@ depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Extension library for the Xfce desktop environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://xfce.org/"
+homepage="https://docs.xfce.org/xfce/exo/start"
+changelog="https://gitlab.xfce.org/xfce/exo/-/blob/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2"
 checksum=722dff3c3fe23f0a65405e63889cf247c99d092d3f9fb16dec78d062cfb8fae6
 

From fa6d2e4272ed0bb0366d40245f9930de394762cb Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:57:36 -0400
Subject: [PATCH 2095/2561] common/travis/xpkgdiff.sh: add CI script to compare
 pkgs with xpkgdiff

---
 .github/workflows/build.yaml |  8 ++++++++
 common/travis/xpkgdiff.sh    | 24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100755 common/travis/xpkgdiff.sh

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e4619a3f3c4b..f527ce1f897d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -94,6 +94,14 @@ jobs:
           "$here/common/travis/show_files.sh" "$BOOTSTRAP" "$ARCH"
           )
 
+      - name: Compare to previous
+        run: |
+          (
+          here="$(pwd)"
+          cd /
+          "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
+          )
+
       - name: Check file conflicts
         if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
         run: |
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
new file mode 100755
index 000000000000..a36fd76e5d88
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir"
+export DIFF='diff --unified=0 --report-identical-files --suppress-common-lines
+ --color=always --label REPO --label BUILT'
+
+while read -r pkg; do
+	for subpkg in $(xsubpkg $pkg); do
+		if xbps-query --repository=$HOME/hostdir/binpkgs \
+					  --repository=$HOME/hostdir/binpkgs/nonfree \
+					  -i "$subpkg" >&/dev/null; then
+			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"
+			xpkgdiff -f $subpkg
+			/bin/echo -e "\x1b[34mMetadata Diff of $subpkg:\x1b[0m"
+			xpkgdiff -S $subpkg
+			/bin/echo -e "\x1b[34mDependency Diff of $subpkg:\x1b[0m"
+			xpkgdiff -x $subpkg
+		else
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From fdd5a4e3393387079a828b4f5e15a7b0624a819e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 7 May 2022 23:12:44 +0200
Subject: [PATCH 2096/2561] lagrange: update to 1.13.3.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7f419708ae..a430d64fda49 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.13.2
+version=1.13.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=f84c5fe078734df06ada747f87760ea8863369be5519d1e56992c7c5278395da
+checksum=a25c48bb4c5c9eb81ba0e93609a5b0e350194eddab27bc55a5b86ae7b749259b
 
 post_install() {
 	vlicense LICENSE.md

From 72c5f1b11e0cf71666651b15877419cb9ffce58e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 2097/2561] New package: robin-hood-hashing-3.11.5

---
 srcpkgs/robin-hood-hashing/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/robin-hood-hashing/template

diff --git a/srcpkgs/robin-hood-hashing/template b/srcpkgs/robin-hood-hashing/template
new file mode 100644
index 000000000000..63a9db6c3f89
--- /dev/null
+++ b/srcpkgs/robin-hood-hashing/template
@@ -0,0 +1,16 @@
+# Template file for 'robin-hood-hashing'
+pkgname=robin-hood-hashing
+version=3.11.5
+revision=1
+build_style=cmake
+configure_args=" -DRH_STANDALONE_PROJECT=OFF"
+short_desc="Fast & memory efficient hashtable based on robin hood hashing for C++"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="MIT"
+homepage="https://github.com/martinus/robin-hood-hashing"
+distfiles="https://github.com/martinus/robin-hood-hashing/archive/${version}.tar.gz"
+checksum=3693e44dda569e9a8b87ce8263f7477b23af448a3c3600c8ab9004fe79c20ad0
+
+post_install() {
+	vlicense LICENSE
+}

From 1a2d471f6fb97d31cd2da79b4491c48f18bac98b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 2098/2561] SPIRV-Tools: update to 2022.1.

---
 srcpkgs/SPIRV-Tools/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template
index 70d13dfb6da5..ffb2fe25efaf 100644
--- a/srcpkgs/SPIRV-Tools/template
+++ b/srcpkgs/SPIRV-Tools/template
@@ -1,6 +1,6 @@
 # Template file for 'SPIRV-Tools'
 pkgname=SPIRV-Tools
-version=2020.6
+version=2022.1
 revision=1
 build_style=cmake
 configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
@@ -8,11 +8,12 @@ configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
 hostmakedepends="python3"
 makedepends="SPIRV-Headers"
 short_desc="API and commands for processing SPIR-V modules"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/SPIRV-Tools"
+changelog="https://raw.githubusercontent.com/KhronosGroup/SPIRV-Tools/master/CHANGES"
 distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz"
-checksum=de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3
+checksum=844c0f590a0ab9237cec947e27cfc75bd14f39a68fc3b37d8f1b9e1b21490a58
 
 SPIRV-Tools-devel_package() {
 	depends="SPIRV-Tools-${version}_${revision}"

From e7b35ae09d4dccb6937745e352007ae6e81a4cd2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 2099/2561] SPIRV-Headers: update to 1.3.204.1.

---
 srcpkgs/SPIRV-Headers/template | 16 +++++++++++-----
 srcpkgs/SPIRV-Headers/update   |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/SPIRV-Headers/update

diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template
index 5dcf457c04c7..8f3e68ba87c3 100644
--- a/srcpkgs/SPIRV-Headers/template
+++ b/srcpkgs/SPIRV-Headers/template
@@ -1,11 +1,17 @@
 # Template file for 'SPIRV-Headers'
 pkgname=SPIRV-Headers
-version=1.5.4.raytracing.fixed
+reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1"
+version=1.3.204.1
 revision=1
+wrksrc="SPIRV-Headers-sdk-${version}"
 build_style=cmake
 short_desc="Machine-readable files for the SPIR-V Registry"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="MIT"
 homepage="https://github.com/KhronosGroup/SPIRV-Headers"
-distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/${version}.tar.gz"
-checksum=df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6
+distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-${version}.tar.gz"
+checksum=262864053968c217d45b24b89044a7736a32361894743dd6cfe788df258c746c
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/SPIRV-Headers/update b/srcpkgs/SPIRV-Headers/update
new file mode 100644
index 000000000000..2fa65238787a
--- /dev/null
+++ b/srcpkgs/SPIRV-Headers/update
@@ -0,0 +1 @@
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From ad13785536d6f2242b7cb710e3014bbe81187b72 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 2100/2561] Vulkan-Headers: update to 1.3.204.1.

---
 srcpkgs/Vulkan-Headers/template | 9 +++++----
 srcpkgs/Vulkan-Headers/update   | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template
index d619f96e2362..cb69e012e7a2 100644
--- a/srcpkgs/Vulkan-Headers/template
+++ b/srcpkgs/Vulkan-Headers/template
@@ -1,11 +1,12 @@
 # Template file for 'Vulkan-Headers'
 pkgname=Vulkan-Headers
-version=1.2.182
+version=1.3.204.1
 revision=1
+wrksrc="Vulkan-Headers-sdk-${version}"
 build_style=cmake
 short_desc="Vulkan header files"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${version}.tar.gz"
-checksum=38d1c953de7bb2d839556226851feeb690f0d23bc22ac46c823dcb66c97bfdc8
+distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-${version}.tar.gz"
+checksum=9c4d33f71467c915749fbf48c0c3a8ee7833f15babf398e3463cd88791fb592e
diff --git a/srcpkgs/Vulkan-Headers/update b/srcpkgs/Vulkan-Headers/update
index 995551ef357b..2fa65238787a 100644
--- a/srcpkgs/Vulkan-Headers/update
+++ b/srcpkgs/Vulkan-Headers/update
@@ -1,2 +1 @@
-pkgname=sdk
-pattern="/$pkgname-\K[0-9.]+(?=.tar.gz)"
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From 23441783d1a9dc429e727db6f4bc528ccdbebf03 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 2101/2561] Vulkan-Tools: update to 1.3.204.1.

---
 srcpkgs/Vulkan-Tools/template | 12 ++++++------
 srcpkgs/Vulkan-Tools/update   |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template
index 8d5c74629cb8..8b80e1ec890e 100644
--- a/srcpkgs/Vulkan-Tools/template
+++ b/srcpkgs/Vulkan-Tools/template
@@ -1,20 +1,20 @@
 # Template file for 'Vulkan-Tools'
 pkgname=Vulkan-Tools
-version=1.2.182
+version=1.3.204.1
 revision=1
-wrksrc="${pkgname}-${version}"
+wrksrc="Vulkan-Tools-sdk-${version}"
 build_style=cmake
 configure_args="-DGLSLANG_INSTALL_DIR=/usr -DBUILD_CUBE=$(vopt_if cube ON OFF)
  -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -Wno-dev"
 hostmakedepends="python3 pkg-config $(vopt_if cube glslang)"
 makedepends="Vulkan-Headers vulkan-loader libxcb-devel libxkbcommon-devel
- wayland-devel libXrandr-devel"
+ wayland-devel wayland-protocols libXrandr-devel"
 short_desc="Official Vulkan tools and utilities"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/v${version}.tar.gz"
-checksum=50c959851230d1daba20235167faced7b7686ebe5d9e626dfb1fe5c92fa30b9e
+distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-${version}.tar.gz"
+checksum=3242f9ad158d02af9cc44186cbd415982387356a2dd8c0492af2fdace8c22f49
 
 build_options="cube"
 desc_option_cube="Build cube vulkan demo"
diff --git a/srcpkgs/Vulkan-Tools/update b/srcpkgs/Vulkan-Tools/update
index 75a4ad43aa6d..2fa65238787a 100644
--- a/srcpkgs/Vulkan-Tools/update
+++ b/srcpkgs/Vulkan-Tools/update
@@ -1,2 +1 @@
-site=https://github.com/KhronosGroup/Vulkan-Tools/releases
-pkgname=sdk
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From 30f52ca9a4003dacf63f5c6b734eda1cd22ce75f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 2102/2561] Vulkan-ValidationLayers: update to 1.3.204.1.

---
 srcpkgs/Vulkan-ValidationLayers/template | 14 +++++++-------
 srcpkgs/Vulkan-ValidationLayers/update   |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/Vulkan-ValidationLayers/update

diff --git a/srcpkgs/Vulkan-ValidationLayers/template b/srcpkgs/Vulkan-ValidationLayers/template
index d89eb414b126..330c8e3169f0 100644
--- a/srcpkgs/Vulkan-ValidationLayers/template
+++ b/srcpkgs/Vulkan-ValidationLayers/template
@@ -1,16 +1,16 @@
 # Template file for 'Vulkan-ValidationLayers'
 pkgname=Vulkan-ValidationLayers
-version=1.2.162
+version=1.3.204.1
 revision=1
+wrksrc="Vulkan-ValidationLayers-sdk-${version}"
 build_style=cmake
-configure_args="-Wno-dev -DSPIRV_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
- -DGLSLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_LAYER_SUPPORT_FILES=ON"
+configure_args="-Wno-dev -DBUILD_LAYER_SUPPORT_FILES=ON"
 hostmakedepends="pkg-config"
 makedepends="Vulkan-Headers libXrandr-devel wayland-devel glslang-devel
- SPIRV-Tools-devel SPIRV-Headers"
+ SPIRV-Tools-devel SPIRV-Headers robin-hood-hashing"
 short_desc="Khronos official Vulkan validation layers"
-maintainer="Colin Gillespie <colin@breavyn.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/${pkgname}/archive/v${version}.tar.gz"
-checksum=83619b81a86e733383a71ea54f0f5e64e194bf596ee8ec4e36217bb0b29b8917
+distfiles="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-${version}.tar.gz"
+checksum=a5e658a4c1f504ae38488acdbe2ab2799e2ae4b626104d76776f1c24b079f341
diff --git a/srcpkgs/Vulkan-ValidationLayers/update b/srcpkgs/Vulkan-ValidationLayers/update
new file mode 100644
index 000000000000..2fa65238787a
--- /dev/null
+++ b/srcpkgs/Vulkan-ValidationLayers/update
@@ -0,0 +1 @@
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From 88b2d9a3c0fff08f0caaef1f07f2f2f23732cfd3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 2103/2561] vulkan-loader: update to 1.3.204.1.

---
 srcpkgs/vulkan-loader/template | 10 +++++-----
 srcpkgs/vulkan-loader/update   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/vulkan-loader/template b/srcpkgs/vulkan-loader/template
index 383d90ddd350..fb866dcb3ecd 100644
--- a/srcpkgs/vulkan-loader/template
+++ b/srcpkgs/vulkan-loader/template
@@ -1,8 +1,8 @@
 # Template file for 'vulkan-loader'
 pkgname=vulkan-loader
-version=1.2.182
+version=1.3.204.1
 revision=1
-wrksrc="Vulkan-Loader-${version}"
+wrksrc="Vulkan-Loader-sdk-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
  -DBUILD_TESTS=OFF"
@@ -10,8 +10,8 @@ hostmakedepends="python3 pkg-config"
 makedepends="Vulkan-Headers libxcb-devel libxkbcommon-devel wayland-devel
  libXrandr-devel"
 short_desc="Vulkan Installable Client Driver (ICD) loader"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${version}.tar.gz"
-checksum=0d1f9fde9d21642526e9baa55d30364c95035c4fe3c6db96836631991b44dd90
+distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-${version}.tar.gz"
+checksum=5dcd42b564804f4c01891ddd429a4a5028113c4cf39b44256689e8f543773134
diff --git a/srcpkgs/vulkan-loader/update b/srcpkgs/vulkan-loader/update
index 46acb07cbe81..c21c479d0e53 100644
--- a/srcpkgs/vulkan-loader/update
+++ b/srcpkgs/vulkan-loader/update
@@ -1,3 +1,3 @@
 _pkgname=Vulkan-Loader
-site="https://github.com/KhronosGroup/${_pkgname}/releases"
+site="https://github.com/KhronosGroup/${_pkgname}/tags"
 pattern="/releases/tag/sdk-\K\d.\d.\d+.\d(?=)"

From 89f22b4f7f791f37f28feee1d3c22cca6d5204f9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 18:30:16 +0300
Subject: [PATCH 2104/2561] FeatherPad: update to 1.2.0.

---
 srcpkgs/FeatherPad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index 17c9bfbe5018..a1c43cc24aee 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -1,6 +1,6 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=1.1.1
+version=1.2.0
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 changelog="https://github.com/tsujan/FeatherPad/raw/master/ChangeLog"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
-checksum=8f2943224f04a1ee4b30b5b7f5b60f34d10d6fe9000e786e1b3a38369d293f8f
+checksum=3926f496ff3a3e65d9d3ebf9f76cfa43a0a225580cbd3d1c362f37e3b13a60e8

From 219761892fcf18ffb93ddfd3805ecb8ac2e370e4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 18:46:12 +0300
Subject: [PATCH 2105/2561] cmst: update to 2022.05.01.

---
 srcpkgs/cmst/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cmst/template b/srcpkgs/cmst/template
index a7df44131f8e..3acc6ff6b22f 100644
--- a/srcpkgs/cmst/template
+++ b/srcpkgs/cmst/template
@@ -1,6 +1,6 @@
 # Template file for 'cmst'
 pkgname=cmst
-version=2022.01.05
+version=2022.05.01
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="Jonathan Lee <vjon207@gmail.com>"
 license="MIT"
 homepage="https://github.com/andrew-bibb/cmst"
 distfiles="https://github.com/andrew-bibb/cmst/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
-checksum=6ddc0e3a702592ec98b80164aa2b5ad1edb66d3f8dce18a545f26a67a46dc13a
+checksum=61c4ad7acad302814a677b0dd94092e336d47f55def2829c825e9128c9378dc4
 post_install() {
 	vlicense text/LICENSE
 }

From a9ae44a9d23a74e7bc0244f43a1adad0e369674d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 25 Mar 2022 10:37:33 +0100
Subject: [PATCH 2106/2561] New package: python3-hcloud-1.16.0

---
 srcpkgs/python3-hcloud/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-hcloud/template

diff --git a/srcpkgs/python3-hcloud/template b/srcpkgs/python3-hcloud/template
new file mode 100644
index 000000000000..e0556027cb01
--- /dev/null
+++ b/srcpkgs/python3-hcloud/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hcloud'
+pkgname=python3-hcloud
+version=1.16.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-future python3-dateutil"
+checkdepends="${depends} python3-pytest-flake8 python3-isort python3-mock tox black"
+short_desc="Official Hetzner Cloud python library"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/hetznercloud/hcloud-python"
+distfiles="${PYPI_SITE}/h/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=c8b94557d93bcfe437f20a8176693ea4f54358b74986cc19d94ebc23f48e40cc
+
+post_install() {
+	vlicense LICENSE
+}

From ce8cd755e9a256e89190be5b60bb78d451867fac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 25 Apr 2022 08:47:29 +0200
Subject: [PATCH 2107/2561] New package: rink-0.6.3

---
 srcpkgs/rink/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/rink/template

diff --git a/srcpkgs/rink/template b/srcpkgs/rink/template
new file mode 100644
index 000000000000..7772630d24bc
--- /dev/null
+++ b/srcpkgs/rink/template
@@ -0,0 +1,16 @@
+# Template file for 'rink'
+pkgname=rink
+version=0.6.3
+revision=1
+wrksrc=rink-rs-${version}
+build_style=cargo
+make_install_args="--path ./cli"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel"
+short_desc="Unit-aware calculator and conversion tool"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MPL-2.0, GPL-3.0-only"
+homepage="https://github.com/tiffany352/rink-rs"
+changelog="https://github.com/tiffany352/rink-rs/releases"
+distfiles="https://github.com/tiffany352/rink-rs/archive/refs/tags/v${version}.tar.gz"
+checksum=49431c12f57d58090b9f5f7f899e98bebffaeed8ca69b5ee140aad4b1c1d9dc8

From e25a8bf9d90fd5c1350d734546c3a7119668b187 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 18 Apr 2022 16:24:23 +0200
Subject: [PATCH 2108/2561] pmbootstrap: update to 1.43.0.

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 8d6ae321ef05..474961425930 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
-version=1.42.0
+version=1.43.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,5 +10,5 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://postmarketos.org"
 distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz"
-checksum=c3df501a52f8deb2a982960b9ef604bf58b4f4bf8b63598707883933a3ac66cd
+checksum=65f720fe8c8436cc13780e74978e2dfa66c4ca72e9e8567004015ff6f8a536a3
 make_check=no # tests require chroot

From 827ca5ff222cf52d78f4a9539a4fd932e2e86b24 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 7 May 2022 11:33:14 +0400
Subject: [PATCH 2109/2561] python3-regex: update to 2022.4.24.

---
 srcpkgs/python3-regex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 57e5b7f4fb02..923919c05941 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2022.3.15
+version=2022.4.24
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=0a7b75cc7bb4cc0334380053e4671c560e31272c9d2d5a6c4b8e9ae2c9bd0f82
+checksum=92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 32a69232d27dd15af25a903457177b1bd2b286fe Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 6 May 2022 21:12:55 +0300
Subject: [PATCH 2110/2561] .github: remove extraneous whitespace

---
 .github/issue_template.md        | 2 +-
 .github/pull_request_template.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/issue_template.md b/.github/issue_template.md
index 25a0538174cc..10a72b0729c2 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,4 +1,4 @@
-<!-- Don't request update of package. We have a script for that. https://alpha.de.repo.voidlinux.org/void-updates/void-updates.txt . However, a quality pull request may help. -->
+<!-- Don't request update of package. We have a script for that. https://alpha.de.repo.voidlinux.org/void-updates/void-updates.txt. However, a quality pull request may help. -->
 ### System
 
 * xuname:  
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index ef2a5d7637aa..8a9e2348494d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -13,7 +13,7 @@ https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuo
 and test at least one native build and, if supported, at least one cross build.
 Ignore this section if this PR is not skipping CI.
 -->
-<!-- 
+<!--
 #### Local build testing
 - I built this PR locally for my native architecture, (ARCH-LIBC)
 - I built this PR locally for these architectures (if supported. mark crossbuilds):

From d2743fd63463e9dc728e6bfc2ce7041d927f37b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 8 May 2022 08:12:03 +0700
Subject: [PATCH 2111/2561] common/do_check: move make_check_pre behind env
 setting

All environment variables setting in command execution must be put
before any non-variables-like, otherwise, they're intepretted as
something else.

Fix: 71b11fdbdb, (xbps-src: add make_check_pre, 2022-02-28)
---
 common/build-style/python3-module.sh | 3 ++-
 common/build-style/raku-dist.sh      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh
index 8daf40e69219..6ec5225d6aab 100644
--- a/common/build-style/python3-module.sh
+++ b/common/build-style/python3-module.sh
@@ -25,7 +25,8 @@ do_build() {
 
 do_check() {
 	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		${make_check_pre} PYTHONPATH="$(cd build/lib* && pwd)" \
+		PYTHONPATH="$(cd build/lib* && pwd)" \
+			${make_check_pre} \
 			python3 -m pytest ${make_check_args} ${make_check_target}
 	else
 		# Fall back to deprecated setup.py test orchestration without pytest
diff --git a/common/build-style/raku-dist.sh b/common/build-style/raku-dist.sh
index bbbba96e7140..67350161b938 100644
--- a/common/build-style/raku-dist.sh
+++ b/common/build-style/raku-dist.sh
@@ -3,7 +3,7 @@
 #
 
 do_check() {
-	${make_check_pre} RAKULIB=lib prove -r -e raku t/
+	RAKULIB=lib ${make_check_pre} prove -r -e raku t/
 }
 
 do_install() {

From ac1fc41b944200c6d5e6ca79051450b167b8c9e3 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 25 Apr 2022 19:43:57 +0200
Subject: [PATCH 2112/2561] caddy: update to 2.5.1.

---
 srcpkgs/caddy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 762a36749b46..d2d08682696b 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=2.4.6
-revision=2
+version=2.5.1
+revision=1
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=5a450a4ff0d2dbd165d62f957ecdaebdc4bd0445c66a06a27d0025a82843402d
+checksum=841f5524e2e107bff278b604c544843564a4a1ef0c3803eeae588e79e4ea5d06
 
 system_accounts="caddy"
 caddy_homedir="/var/lib/caddy"

From 7781bfb99383f521150009ac591acddae97573ce Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 8 May 2022 16:47:20 +0200
Subject: [PATCH 2113/2561] python3-hcloud: remove unnecessary checkdepends

---
 srcpkgs/python3-hcloud/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-hcloud/template b/srcpkgs/python3-hcloud/template
index e0556027cb01..5b2584860022 100644
--- a/srcpkgs/python3-hcloud/template
+++ b/srcpkgs/python3-hcloud/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-future python3-dateutil"
-checkdepends="${depends} python3-pytest-flake8 python3-isort python3-mock tox black"
+checkdepends="${depends} python3-pytest python3-mock"
 short_desc="Official Hetzner Cloud python library"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 00992eb8d01f312a1cd61e35b70e128a2cb819b3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 8 May 2022 17:06:45 +0200
Subject: [PATCH 2114/2561] mokutil: update to 0.6.0.

---
 srcpkgs/mokutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mokutil/template b/srcpkgs/mokutil/template
index 06225c575530..06cabe2116f3 100644
--- a/srcpkgs/mokutil/template
+++ b/srcpkgs/mokutil/template
@@ -1,6 +1,6 @@
 # Template file for 'mokutil'
 pkgname=mokutil
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lcp/mokutil"
 distfiles="https://github.com/lcp/mokutil/archive/refs/tags/${version}.tar.gz"
-checksum=af7616855f817e7eb54043071e51c8651bc8cc479ac455fbfe35203d98de8181
+checksum=6cc4be216ac083ee19dc986e8a510e1d74f6f4080baa4b5fdc7c503eb483f569
 
 pre_configure() {
 	autoreconf -fi

From 694c3986067dc69e215867a73acf5102ccc1945c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 8 May 2022 17:35:08 +0200
Subject: [PATCH 2115/2561] libbluray: only build java support on supported
 targets

---
 srcpkgs/libbluray/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libbluray/template b/srcpkgs/libbluray/template
index 070c351ee279..28c0b342155a 100644
--- a/srcpkgs/libbluray/template
+++ b/srcpkgs/libbluray/template
@@ -4,7 +4,7 @@ version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-optimizations"
-hostmakedepends="pkg-config apache-ant openjdk8"
+hostmakedepends="pkg-config"
 makedepends="libxml2-devel fontconfig-devel"
 short_desc="Library to access Blu-Ray disks for video playback"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -13,6 +13,13 @@ homepage="https://www.videolan.org/developers/libbluray.html"
 distfiles="${VIDEOLAN_SITE}/libbluray/${version}/libbluray-${version}.tar.bz2"
 checksum=e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*|ppc64*)
+		hostmakedepends+=" apache-ant openjdk8"
+		;;
+	*) configure_args+=" --disable-bdjava-jar";;
+esac
+
 pre_build() {
 	export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
 }

From 5ec124fc8fd84c057d4b8409eae3467d3f8233f4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 8 May 2022 17:36:27 +0200
Subject: [PATCH 2116/2561] openjdk*: disable on ppc32

---
 srcpkgs/openjdk10-bootstrap/template | 1 +
 srcpkgs/openjdk11/template           | 1 +
 srcpkgs/openjdk12-bootstrap/template | 1 +
 srcpkgs/openjdk13-bootstrap/template | 1 +
 srcpkgs/openjdk14-bootstrap/template | 1 +
 srcpkgs/openjdk15-bootstrap/template | 1 +
 srcpkgs/openjdk16-bootstrap/template | 1 +
 srcpkgs/openjdk17/template           | 1 +
 srcpkgs/openjdk7-bootstrap/template  | 1 +
 srcpkgs/openjdk8/template            | 1 +
 srcpkgs/openjdk9-bootstrap/template  | 1 +
 11 files changed, 11 insertions(+)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 1c673dc748d1..1cbc8a618e18 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -4,6 +4,7 @@ pkgname=openjdk10-bootstrap
 version=10.0.2p13
 revision=2
 _repo_ver=${version/p/+}
+archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc="jdk10u-jdk-${_repo_ver}"
 build_style=gnu-configure
 configure_args="
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 45c775856fa9..48be7fa6bfc8 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -4,6 +4,7 @@ version=11.0.12+7
 revision=2
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 1f20483ecbd4..0d546a254aa7 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -6,6 +6,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 6a6b3340ffcd..29dad64f6101 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -6,6 +6,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 341818dc5cf9..50c1282cbf49 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -6,6 +6,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 1430f205d1b9..6dce37796018 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -6,6 +6,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 2c8566bb1c31..011612e0a966 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -6,6 +6,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index f60e96f79082..03ac17c81b4d 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -7,6 +7,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 create_wrksrc=yes
 build_wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index 1e40e5803c7f..c5ef9bc1b52a 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -7,6 +7,7 @@ _bootstrap_jdk_home="/usr/lib/jvm/java-1.5-gcj"
 _final_jdk_home="/usr/lib/jvm/java-1.7-openjdk"
 version=7u221b02
 revision=3
+archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc=icedtea-${_icedtea_ver}
 build_style=gnu-configure
 configure_args="
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 9832b18555a6..ebf8aa2b56a6 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -12,6 +12,7 @@ _jdk_home="usr/lib/jvm/java-1.8-openjdk"
 # we're using aarch64 port repo to get aarch64 JIT; the repo is
 # otherwise the same as the normal one, just with aarch64 port added
 _repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
+archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc="jdk8u-shenandoah-aarch64-shenandoah-jdk8u${_jdk_update}-b${_jdk_build}"
 build_style=gnu-configure
 configure_args="
diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index c82f0761166a..78292991d9e5 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -4,6 +4,7 @@ pkgname=openjdk9-bootstrap
 version=9.0.4p12
 revision=2
 _repo_ver=${version/p/+}
+archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc="jdk9u-jdk-${_repo_ver}"
 build_style=gnu-configure
 configure_args="

From 503c18bb0b1b388cff9b286f4f4757eee9081163 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Wed, 20 Apr 2022 15:10:57 -0700
Subject: [PATCH 2117/2561] lxc: update to 4.0.12

Also add update file.
---
 srcpkgs/lxc/template | 8 ++++----
 srcpkgs/lxc/update   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/lxc/update

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 679ec36e4363..1c10303f00d7 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,21 +1,21 @@
 # Template file for 'lxc'
 pkgname=lxc
-version=4.0.6
-revision=2
+version=4.0.12
+revision=1
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none
  --with-rootfs-path=/var/lxc/containers --with-log-path=/var/lxc/log"
 hostmakedepends="automake libtool pkg-config docbook2x"
 makedepends="libcap-devel libseccomp-devel gnutls-devel libapparmor-devel"
-depends="xz wget gnupg"
+depends="xz wget"
 _desc="Linux Containers"
 short_desc="${_desc} - utilities"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://linuxcontainers.org"
 distfiles="https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"
-checksum=9165dabc0bb6ef7f2fda2009aee90b20fbefe77ed8008347e9f06048eba1e463
+checksum=db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef
 
 conf_files="/etc/lxc/default.conf"
 make_dirs="
diff --git a/srcpkgs/lxc/update b/srcpkgs/lxc/update
new file mode 100644
index 000000000000..a02626079abf
--- /dev/null
+++ b/srcpkgs/lxc/update
@@ -0,0 +1 @@
+site="https://linuxcontainers.org/lxc/downloads/"

From 42906d050a403cd33d9fd397491294f7f5a9bebc Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <socvirnyl.estela@gmail.com>
Date: Mon, 2 May 2022 13:49:24 +0800
Subject: [PATCH 2118/2561] leftwm: update to 0.3.0

---
 srcpkgs/leftwm/patches/fix-arm-builds.patch | 31 ---------------------
 srcpkgs/leftwm/patches/series               |  1 -
 srcpkgs/leftwm/template                     |  4 +--
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/leftwm/patches/fix-arm-builds.patch
 delete mode 100644 srcpkgs/leftwm/patches/series

diff --git a/srcpkgs/leftwm/patches/fix-arm-builds.patch b/srcpkgs/leftwm/patches/fix-arm-builds.patch
deleted file mode 100644
index 9337bc90ec52..000000000000
--- a/srcpkgs/leftwm/patches/fix-arm-builds.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 876216bcc0398fb869240cd51d5ea0d12ba699b1 Mon Sep 17 00:00:00 2001
-From: pkubaj <pkubaj@anongoth.pl>
-Date: Tue, 14 Dec 2021 06:37:11 +0000
-Subject: [PATCH] Fix build errors on architectures with u8 (#623)
-
----
- .../src/display_servers/xlib_display_server/xwrap/getters.rs  | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs b/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs
-index 2fe20d3a..b8a90495 100644
---- a/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs
-+++ b/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs
-@@ -3,7 +3,7 @@ use super::{Screen, WindowHandle, XlibError, MAX_PROPERTY_VALUE_LEN};
- use crate::models::{DockArea, WindowState, WindowType, XyhwChange};
- use crate::XWrap;
- use std::ffi::CString;
--use std::os::raw::{c_int, c_long, c_uchar, c_uint, c_ulong};
-+use std::os::raw::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong};
- use std::slice;
- use x11_dl::xlib;
- 
-@@ -575,7 +575,7 @@ impl XWrap {
-             if status == 0 {
-                 return Err(XlibError::FailedStatus);
-             }
--            if let Ok(s) = CString::from_raw(text_prop.value.cast::<i8>()).into_string() {
-+            if let Ok(s) = CString::from_raw(text_prop.value.cast::<c_char>()).into_string() {
-                 return Ok(s);
-             }
-         };
diff --git a/srcpkgs/leftwm/patches/series b/srcpkgs/leftwm/patches/series
deleted file mode 100644
index 5f8e5e089321..000000000000
--- a/srcpkgs/leftwm/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-arm-builds.patch
diff --git a/srcpkgs/leftwm/template b/srcpkgs/leftwm/template
index 6da896578e3b..1c416bae1a65 100644
--- a/srcpkgs/leftwm/template
+++ b/srcpkgs/leftwm/template
@@ -1,6 +1,6 @@
 # Template file for 'leftwm'
 pkgname=leftwm
-version=0.2.11
+version=0.3.0
 revision=1
 build_style=cargo
 makedepends="libX11-devel libXinerama-devel libXrandr-devel xorg-server-devel"
@@ -10,7 +10,7 @@ maintainer="Soc Virnyl S. Estela <socvirnyl.estela@gmail.com>"
 license="MIT"
 homepage="https://github.com/leftwm/leftwm"
 distfiles="https://github.com/leftwm/leftwm/archive/${version}.tar.gz"
-checksum=3a2bd59f12566d94b6be3b162c95d280acbaec1b40da415cb42fe07332a5b709
+checksum=d69d3ec8ea49b4a23e145d42a2f66f5c38642378c762919fce6c56b818fad8c7
 
 do_install() {
 	vdoc README.md

From 81eee09d77c04e47ca4de19f2a12da50fb31c441 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 May 2022 09:41:05 +0300
Subject: [PATCH 2119/2561] ncdu: update to 1.17.

---
 srcpkgs/ncdu/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ncdu/template b/srcpkgs/ncdu/template
index 4189b2ac0e11..1f3991b1d2fd 100644
--- a/srcpkgs/ncdu/template
+++ b/srcpkgs/ncdu/template
@@ -1,16 +1,16 @@
 # Template file for 'ncdu'
 pkgname=ncdu
-version=1.16
+version=1.17
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
 short_desc="NCurses Disk Usage utility"
 maintainer="teldra <teldra@rotce.de>"
 license="MIT"
-homepage="http://dev.yorhel.nl/ncdu"
+homepage="https://dev.yorhel.nl/ncdu"
 changelog="https://dev.yorhel.nl/ncdu/changes"
-distfiles="http://dev.yorhel.nl/download/${pkgname}-${version}.tar.gz"
-checksum=2b915752a183fae014b5e5b1f0a135b4b408de7488c716e325217c2513980fd4
+distfiles="https://dev.yorhel.nl/download/${pkgname}-${version}.tar.gz"
+checksum=810745a8ed1ab3788c87d3aea4cc1a14edf6ee226f764bcc383e024ba56adbf1
 
 post_install() {
 	vlicense COPYING

From 710d11675261cf6e91e3091dd82b5dfa9fb824ef Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 19 Apr 2022 13:56:35 -0400
Subject: [PATCH 2120/2561] python3-pgspecial: update to 1.13.1, adopt.

---
 srcpkgs/python3-pgspecial/template | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/python3-pgspecial/template b/srcpkgs/python3-pgspecial/template
index e0279616a906..8d52e1238aa2 100644
--- a/srcpkgs/python3-pgspecial/template
+++ b/srcpkgs/python3-pgspecial/template
@@ -1,24 +1,20 @@
 # Template file for 'python3-pgspecial'
 pkgname=python3-pgspecial
-version=1.11.9
-revision=4
+version=1.13.1
+revision=1
 wrksrc="pgspecial-${version}"
 build_style=python3-module
-pycompile_module="pgspecial"
 hostmakedepends="python3-setuptools"
 depends="python3-click python3-sqlparse python3-psycopg2"
 checkdepends="${depends} python3-pytest"
 short_desc="Meta-commands handler for PostgreSQL"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://www.dbcli.com"
+changelog="https://raw.githubusercontent.com/dbcli/pgspecial/main/changelog.rst"
 distfiles="${PYPI_SITE}/p/pgspecial/pgspecial-${version}.tar.gz"
-checksum=77f8651450ccbde7d3036cfe93486a4eeeb5ade28d1ebc4b2ba186fea0023c56
-
-do_check() {
-	# pgspecial tests require a PostgreSQL server; skip them.
-	:
-}
+checksum=d5dab96690908275916dc2c622efae217f142e08165fa366949d41cbc5658701
+make_check=no # pgspecial tests require a PostgreSQL server; skip them.
 
 post_install() {
 	vlicense License.txt

From 0f5228bc097f1cb97b3cbec68e76b57f44638429 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 19 Apr 2022 13:53:22 -0400
Subject: [PATCH 2121/2561] pgcli: update to 3.4.1, adopt.

---
 srcpkgs/pgcli/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index 0ff6f5079c4d..6f651301e0d4 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,6 +1,6 @@
 # Template file for 'pgcli'
 pkgname=pgcli
-version=3.4.0
+version=3.4.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -8,12 +8,12 @@ depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit
  python3-psycopg2 python3-sqlparse python3-configobj python3-pendulum
  python3-cli_helpers python3-setproctitle"
 short_desc="PostgreSQL CLI with autocompletion and syntax highlighting"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://www.pgcli.com"
-changelog="https://github.com/dbcli/pgcli/blob/main/changelog.rst"
+changelog="https://raw.githubusercontent.com/dbcli/pgcli/main/changelog.rst"
 distfiles="${PYPI_SITE}/p/pgcli/pgcli-${version}.tar.gz"
-checksum=d566c6eda99aad1a27680bdfd74657e25bc0586d04eaf0b1626bb58bde75cfb6
+checksum=f03930187e27d60df658ca8a04fb601ec5d7476c735f2b1542c6adec5cac8fe2
 make_check=no # pgcli tests require a PostgreSQL server; skip them.
 
 post_install() {

From 0f50028f42fca15329d649a92e7848663bebbb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 29 Mar 2021 14:46:19 +0200
Subject: [PATCH 2122/2561] New package: mdbook-mermaid-0.10.0

---
 srcpkgs/mdbook-mermaid/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/mdbook-mermaid/template

diff --git a/srcpkgs/mdbook-mermaid/template b/srcpkgs/mdbook-mermaid/template
new file mode 100644
index 000000000000..ec8acd019132
--- /dev/null
+++ b/srcpkgs/mdbook-mermaid/template
@@ -0,0 +1,15 @@
+# Template file for 'mdbook-mermaid'
+pkgname=mdbook-mermaid
+version=0.10.0
+revision=1
+build_style=cargo
+short_desc="Prepocessor for mdbook to add mermaid support"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MPL-2.0"
+homepage="https://github.com/badboy/mdbook-mermaid"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=7b62ac139c8ece9f21cfdf0b3cd11aabf0d6fdfdfb71848918a028a4cb8de24c
+
+post_install() {
+	vlicense LICENSE
+}

From acd7d4687e3f25ec5282aa90bf36de74b03631eb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sat, 7 May 2022 20:21:07 -0400
Subject: [PATCH 2123/2561] botan: drop unneeded update file

---
 srcpkgs/botan/update | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 srcpkgs/botan/update

diff --git a/srcpkgs/botan/update b/srcpkgs/botan/update
deleted file mode 100644
index e69de29bb2d1..000000000000

From 9867c3c2171c83c8cf39af68f3efb0ebb258e4b3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sat, 7 May 2022 20:21:38 -0400
Subject: [PATCH 2124/2561] boinc: set update to ignore android-specic release
 series

---
 srcpkgs/boinc/update | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/boinc/update b/srcpkgs/boinc/update
index a9205555e786..432eb766178b 100644
--- a/srcpkgs/boinc/update
+++ b/srcpkgs/boinc/update
@@ -1,2 +1,3 @@
 site=http://boinc.berkeley.edu/download.php
 pattern="\K[\d]+\.[\d]+\.[\d]+"
+ignore="7.18.*" # android-specific release series

From db9ab8282278da1c11f19a846dc08bdae745cb40 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sat, 7 May 2022 20:22:22 -0400
Subject: [PATCH 2125/2561] VirtualGL: set update to ignore development series

---
 srcpkgs/VirtualGL/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/VirtualGL/update

diff --git a/srcpkgs/VirtualGL/update b/srcpkgs/VirtualGL/update
new file mode 100644
index 000000000000..4251f46cbd68
--- /dev/null
+++ b/srcpkgs/VirtualGL/update
@@ -0,0 +1 @@
+ignore="2.6.[9][0-9]"

From e5712f483fdf2f891ce31201626d85acb2dff1f0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sat, 7 May 2022 20:22:47 -0400
Subject: [PATCH 2126/2561] asio: set update to ignore development series

---
 srcpkgs/asio/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/asio/update

diff --git a/srcpkgs/asio/update b/srcpkgs/asio/update
new file mode 100644
index 000000000000..b09e17332b0a
--- /dev/null
+++ b/srcpkgs/asio/update
@@ -0,0 +1 @@
+ignore="*1.*[13579].*" # development release series

From b170dc9134f09db4669c36ec7ded9a2a52a2a128 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sat, 7 May 2022 20:23:20 -0400
Subject: [PATCH 2127/2561] gnupg: set update to ignore development series (odd
 numbered versions)

---
 srcpkgs/gnupg/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/gnupg/update

diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
new file mode 100644
index 000000000000..0164c3462a52
--- /dev/null
+++ b/srcpkgs/gnupg/update
@@ -0,0 +1 @@
+ignore="*.[13579].*" # development release series

From 4041ba51580041010476f2b3ed7d6e95cd998ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:32 -0300
Subject: [PATCH 2128/2561] kicad: update to 6.0.5.

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index cd60f0ad49dd..aaf6b16f3b14 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad'
 pkgname=kicad
-version=6.0.1
+version=6.0.5
 revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
@@ -18,7 +18,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz"
-checksum=946173455db986cc79050a8c1983193690f14eb538785b21c1584d5999b864e4
+checksum=4bea4d329995d0fe7a0253f25be136ddbff3cdcfde2e21eef834a1dfe37f6157
 python_version=3
 replaces="kicad-i18n>=0"
 

From bb595e3f0d4958502110d3c6846ea9f379df2825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:31 -0300
Subject: [PATCH 2129/2561] kicad-footprints: update to 6.0.5.

---
 srcpkgs/kicad-footprints/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kicad-footprints/template b/srcpkgs/kicad-footprints/template
index aa8062df6655..6a6282de56d6 100644
--- a/srcpkgs/kicad-footprints/template
+++ b/srcpkgs/kicad-footprints/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-footprints'
 pkgname=kicad-footprints
-version=6.0.1
+version=6.0.5
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,9 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=c2b825f346b5eb60faaa7b39c64855c47d80e1ef950e4df08c58e843783bc9a6
-
-post_install() {
-	# otherwise KiCad will complain about a missing library when launched
-	touch $DESTDIR/usr/share/kicad/footprints/Connector_Multicomp.pretty/.empty
-}
+checksum=9a842d1b78cbccec6290e449e00c70ed76a8d4dbaed6c58afabe165471e88199

From 7bd875c6a3ead3d49988e2bcd97b8cc3ff6349d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:34 -0300
Subject: [PATCH 2130/2561] kicad-symbols: update to 6.0.5.

---
 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 4580597c8f23..36238be4a13d 100644
--- a/srcpkgs/kicad-symbols/template
+++ b/srcpkgs/kicad-symbols/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-symbols'
 pkgname=kicad-symbols
-version=6.0.1
+version=6.0.5
 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.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=56593ff7dfae14ce4e5afa2b0477a8fb832dbf5ae81abec831ebbae7568f0433
+checksum=bc7669a84b9541fba5592016d6ac95bff10e36e7a852913df32737267c75e789

From 575340075f672e18227b552b00790ae258285a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:30 -0300
Subject: [PATCH 2131/2561] kicad-packages3D: update to 6.0.5.

---
 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 bc7dfc81abc6..3f6cb166ce03 100644
--- a/srcpkgs/kicad-packages3D/template
+++ b/srcpkgs/kicad-packages3D/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-packages3D'
 pkgname=kicad-packages3D
-version=6.0.1
+version=6.0.5
 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.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.bz2"
-checksum=caf3359cf474b4f71fa2b62a5128d594f92285a92817adbcd6be99f199ac36da
+checksum=af10545c315474495e8be2137f25172d16103430133e91437cd4cf4f9d382436

From 2eaf1d8f95876425c555fa8b112bf8e4b111993f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:32 -0300
Subject: [PATCH 2132/2561] kicad-templates: update to 6.0.5.

---
 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 9d3319894ca4..d186df2fe18c 100644
--- a/srcpkgs/kicad-templates/template
+++ b/srcpkgs/kicad-templates/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-templates'
 pkgname=kicad-templates
-version=6.0.1
+version=6.0.5
 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.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=590d77e693d9f54d740e75f8e504e02227da44461f3ef3e69ff2ef9c3d6d78ee
+checksum=00e152c4e708e91ee6d14d8b3d6fca597fb8aa024a2e7da9943e3eeda058c14e

From 32f01c626117bb32cb38d75e1c5e96cba0ef806b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:34 -0300
Subject: [PATCH 2133/2561] kicad-doc: update to 6.0.5.

---
 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 4591eb3b08ad..7b3243238a91 100644
--- a/srcpkgs/kicad-doc/template
+++ b/srcpkgs/kicad-doc/template
@@ -1,13 +1,13 @@
 # Template file for 'kicad-doc'
 pkgname=kicad-doc
-version=6.0.1
+version=6.0.5
 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.org"
 distfiles="https://kicad-downloads.s3.cern.ch/docs/${pkgname}-${version}.tar.gz"
-checksum=6093c99cfde827fb42fc351ef301f0dcad805f0c256ef02a0e82d9daafc238d3
+checksum=9e2959f0410e1262c868274d9a4dbddcf96113915fe288364066919661e31a7b
 
 if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
 	broken="kicad not available"

From feadf6c1e66bc59eb85e30fa46440c3fee901737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:33 -0300
Subject: [PATCH 2134/2561] kicad-library: update to 6.0.5.

---
 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 ab472215f802..77ed42dcf830 100644
--- a/srcpkgs/kicad-library/template
+++ b/srcpkgs/kicad-library/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-library'
 pkgname=kicad-library
-version=6.0.1
+version=6.0.5
 revision=1
 build_style=meta
 depends="kicad-footprints>=${version} kicad-packages3D>=${version}

From ff492d4df2653c65f4b095ccde6f586bbea3ac6b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 9 May 2022 04:37:29 +0200
Subject: [PATCH 2135/2561] SuiteSparse: fix ppc32 build

---
 srcpkgs/SuiteSparse/patches/ppc32.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/SuiteSparse/patches/ppc32.patch

diff --git a/srcpkgs/SuiteSparse/patches/ppc32.patch b/srcpkgs/SuiteSparse/patches/ppc32.patch
new file mode 100644
index 000000000000..234fa06d0130
--- /dev/null
+++ b/srcpkgs/SuiteSparse/patches/ppc32.patch
@@ -0,0 +1,22 @@
+commit e483b8506640797a09ea30c126c081ea4070b2e2
+Author: q66 <daniel@octaforge.org>
+Date:   Mon Feb 28 19:15:39 2022 +0100
+
+    prevent cpu_features from shitting itself on ppc32
+
+diff --git a/GraphBLAS/cpu_features/src/impl_ppc_linux.c b/GraphBLAS/cpu_features/src/impl_ppc_linux.c
+index 13a381a..fa72eee 100644
+--- a/GraphBLAS/cpu_features/src/impl_ppc_linux.c
++++ b/GraphBLAS/cpu_features/src/impl_ppc_linux.c
+@@ -69,6 +69,11 @@
+   LINE(PPC_SCV, scv, "scv", 0, PPC_FEATURE2_SCV)                               \
+   LINE(PPC_HTM_NO_SUSPEND, htm_no_suspend, "htm-no-suspend", 0,                \
+        PPC_FEATURE2_HTM_NO_SUSPEND)
++
++#ifdef PPC
++#undef PPC
++#endif
++
+ #define INTROSPECTION_PREFIX PPC
+ #define INTROSPECTION_ENUM_PREFIX PPC
+ #include "define_introspection_and_hwcaps.inl"

From 07538c6fbb0332468e09f2b0e1495e6fec0948a8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 9 May 2022 04:41:16 +0200
Subject: [PATCH 2136/2561] libvdt: fix template for non-x86

---
 srcpkgs/libvdt/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libvdt/template b/srcpkgs/libvdt/template
index 3caa629d6eb2..d989e8c7d247 100644
--- a/srcpkgs/libvdt/template
+++ b/srcpkgs/libvdt/template
@@ -5,7 +5,8 @@ revision=1
 wrksrc="vdt-${version}"
 build_style=cmake
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*|arm*)
+	x86_64*|i686*) ;;
+	*)
 	configure_args="-DSSE=OFF -DNEON=OFF"
 	make_cmd=make
 	export CMAKE_GENERATOR="Unix Makefiles"

From 08b6ccca26855be039f590e2391878e9d541b7d0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 9 May 2022 04:44:24 +0200
Subject: [PATCH 2137/2561] flintlib: only enable openblas where supported

---
 srcpkgs/flintlib/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template
index 57a4a2de4f42..968dbcb525c2 100644
--- a/srcpkgs/flintlib/template
+++ b/srcpkgs/flintlib/template
@@ -18,12 +18,16 @@ checksum=5911fedff911100f15781f35e3a4fa934fe60e4aea02a8c10cc8918101c1eed8
 
 build_options="ntl openblas"
 desc_option_ntl="enable NTL support"
-build_options_default="openblas"
+build_options_default=""
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" ntl"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|aarch64*|arm*|ppc64*) build_options_default+=" openblas";;
+esac
+
 CFLAGS="-D_GNU_SOURCE" # needed for cpu_set_t
 
 flintlib-devel_package() {

From d03a388ec9491084b50d4faa70da0f3222afe1e8 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Mon, 9 May 2022 00:00:12 +0200
Subject: [PATCH 2138/2561] chezmoi: update to 2.15.3

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 531370c90298..7f416e873786 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.15.2
+version=2.15.3
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -11,7 +11,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=c06c62feeaa95d735191db19fb9f4ef473b7144e01004e789b03d9a3c9c5b4b6
+checksum=2c0239c643795a13420f815c7e906720cd98594152b6d6fa546b0242462adc9e
 
 pre_build() {
 	local _date

From 66566680dac7df023df2b3d3d380849dfaaabdcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 1 May 2022 18:17:53 +0200
Subject: [PATCH 2139/2561] scrcpy: update to 1.24.

---
 srcpkgs/scrcpy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template
index 42f57c3fb663..e1140b975f5c 100644
--- a/srcpkgs/scrcpy/template
+++ b/srcpkgs/scrcpy/template
@@ -1,6 +1,6 @@
 # Template file for 'scrcpy'
 pkgname=scrcpy
-version=1.23
+version=1.24
 revision=1
 build_style=meson
 configure_args="-Dcompile_server=false
@@ -14,8 +14,8 @@ license="Apache-2.0"
 homepage="https://github.com/Genymobile/scrcpy"
 distfiles="${homepage}/archive/v${version}.tar.gz
  ${homepage}/releases/download/v${version}/scrcpy-server-v${version}"
-checksum="47686af76e2314404deda0eea58761ca1378a6a1567408b4560683461c7ea18b
- 2a913fd47478c0b306fca507cb0beb625e49a19ff9fc7ab904e36ef5b9fe7e68"
+checksum="e3054ad453ac577b941f8df0eabc94e842affc6e1d10ba8d21cededfa2eacc73
+ ae74a81ea79c0dc7250e586627c278c0a9a8c5de46c9fb5c38c167fb1a36f056"
 skip_extraction="scrcpy-server-v${version}"
 
 post_install() {

From 07cbc2d1ccd5f8c324e63da6a80b7375fc047a8e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 25 Feb 2022 19:49:40 +0100
Subject: [PATCH 2140/2561] rosegarden: update to 21.12

and disable failing test test_notationview_selection
---
 srcpkgs/rosegarden/template | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/rosegarden/template b/srcpkgs/rosegarden/template
index d9331e27f413..e909cd4173b5 100644
--- a/srcpkgs/rosegarden/template
+++ b/srcpkgs/rosegarden/template
@@ -1,6 +1,6 @@
 # Template file for 'rosegarden'
 pkgname=rosegarden
-version=21.06.1
+version=21.12
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config shared-mime-info"
@@ -12,7 +12,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://rosegardenmusic.com/"
 distfiles="${SOURCEFORGE_SITE}/rosegarden/rosegarden/${version/*.*.*/${version%.*}}/rosegarden-${version}.tar.bz2"
-checksum=87750dc0b55ae27e07acc4effdc25ae5c4f6ba4ccf81ac5112abb0fed211397a
+checksum=dc3ed3db064e754de9fe830b69df40a53dc7157fbfa8a206ca82e5e41c262809
 
 if [ -n "${CROSS_BUILD}" ]; then
 	hostmakedepends+=" qt5-devel qt5-host-tools"
@@ -20,10 +20,7 @@ fi
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
-}
-
-pre_check() {
-	mkdir  -p ${wrksrc}/check_xdg_runtime_dir
-	chmod 700 ${wrksrc}/check_xdg_runtime_dir
-	export XDG_RUNTIME_DIR=${wrksrc}/check_xdg_runtime_dir
+	# disable failing test, see
+	# https://bugs.gentoo.org/show_bug.cgi?id=701682
+	vsed -i test/CMakeLists.txt -e '/\s*test_notationview_selection/d'
 }

From c0c7eaad92b31efa6b2d8811c1366ac13592ff5d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:13:14 -0400
Subject: [PATCH 2141/2561] python3-frozendict: update to 2.3.2.

---
 srcpkgs/python3-frozendict/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 3946c2ee05b1..4badb45e2d89 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.3.1
+version=2.3.2
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=bc91c69233eb916bb6ebc40988b6d849735770240efc9c60be45b4ab919c1bde
+checksum=7fac4542f0a13fbe704db4942f41ba3abffec5af8b100025973e59dff6a09d0d
 
 do_check() {
 	PYTHONPATH="$(cd build/lib* && pwd)" pytest3

From 47f9005779980b8ba40307028501aeb60cb03548 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:14:03 -0400
Subject: [PATCH 2142/2561] python3-phonenumbers: update to 8.12.47.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 0a952e920922..5b4179baaacf 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.46
+version=8.12.47
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=1c440f6336cb49893ff1a8326c70b4df693802ae981f210f545cd4215ac48133
+checksum=56fd605d2f5460e1df2117085b653bb38322295ec658e6acaafc9c976867d522

From 000eeeee8d7851aa48e86b722c444ea4414eab97 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 3 May 2022 07:58:38 -0400
Subject: [PATCH 2143/2561] python3-canonicaljson: update to 1.6.1.

---
 srcpkgs/python3-canonicaljson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index b9535436442b..2124a48c545b 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
-version=1.6.0
+version=1.6.1
 revision=1
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=8739d5fd91aca7281d425660ae65af7663808c8177778965f67e90b16a2b2427
+checksum=a93664f698556dbd4bab9c3fc4fb35834cf2535da1ea00b6b7758d8fe2bbb824

From de9d3acc8b36606ab26ea615902b813715fd2426 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:17:05 -0400
Subject: [PATCH 2144/2561] synapse: update to 1.58.0.

upstream dropped support for setup.py
---
 srcpkgs/synapse/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 22ad01847677..5e23260063e5 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,10 +1,11 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.57.0
+version=1.58.0
 revision=1
-build_style=python3-module
+build_style=python3-pep517
 make_check_target=tests
-hostmakedepends="python3-setuptools"
+make_install_target="matrix_synapse-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-signedjson python3-pynacl python3-service_identity python3-Twisted
  python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
@@ -14,14 +15,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
  python3-typing_extensions python3-ijson python3-matrix-common
  python3-packaging"
-checkdepends="$depends python3-parameterized python3-pytest"
+checkdepends="$depends python3-parameterized python3-pytest unzip"
 short_desc="Matrix reference homeserver"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 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=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a
+checksum=f859c3c426aff099360c84cfb580ba23b9d784b1a1b0e7b68965428f17e697ab
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
@@ -31,6 +32,10 @@ make_dirs="
 	/etc/synapse 755 synapse synapse
 	/var/log/synapse 0755 synapse synapse"
 
+pre_check() {
+	unzip ${make_install_target} "*.dist-info/*"
+}
+
 post_install() {
 	vsv synapse
 

From b85538f4b5a6fa660f32c950a0b82886ba67b8f3 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 27 Apr 2022 04:15:09 -0400
Subject: [PATCH 2145/2561] net-tools: update to 2.10, adopt.

Also cleaned up the template and made the build system behave slightly better.
---
 srcpkgs/net-tools/template | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/net-tools/template b/srcpkgs/net-tools/template
index 384feba77fb9..b320c3183b32 100644
--- a/srcpkgs/net-tools/template
+++ b/srcpkgs/net-tools/template
@@ -1,15 +1,15 @@
 # Template file for 'net-tools'
 pkgname=net-tools
-version=1.60.20181103git
+version=2.10
 revision=1
-_githash=0eebece8c964e3cfa8a018f42b2e7e751a7009a0
-wrksrc="${pkgname}-${_githash}"
+build_style="gnu-makefile"
+make_use_env=yes
 short_desc="Basic networking tools"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="0x5c <dev@0x5c.io>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ecki/net-tools"
-distfiles="https://github.com/ecki/net-tools/archive/${_githash}.tar.gz"
-checksum=795cb4dd2618ed7ff9a48b9cb63b33780b47dfd7464c8e52ba734e6796cbab17
+distfiles="https://github.com/ecki/net-tools/archive/refs/tags/v${version}.tar.gz"
+checksum=8e186f65f0ff304989b3dc8b0067c3a07d36ae777da60667bdd6ccb2730908d2
 
 alternatives="
  ifconfig:ifconfig:/usr/bin/${pkgname}-ifconfig
@@ -17,9 +17,10 @@ alternatives="
  hostname:hostname:/usr/bin/${pkgname}-hostname
  hostname:/usr/share/man/man1/hostname.1:/usr/share/man/man8/${pkgname}-hostname.1"
 
-pre_build() {
-	vsed -i "s#/sbin#/bin#" Makefile
-	vsed -i "s#/usr##" man/Makefile
+post_patch() {
+	# Hacky and flaky, but upstream does not support $PREFIX !
+	vsed -e "s|/sbin|/bin|" -i Makefile
+	vsed -e "s|/bin|/usr/bin|" -i Makefile
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
 			# HZ is defined in <asm/param.h>
@@ -27,20 +28,18 @@ pre_build() {
 				-e "/#include <sys\/param.h>/a #include <asm\/param.h>"
 			vsed -i ${wrksrc}/netstat.c \
 				-e "/#include <sys\/param.h>/a #include <asm\/param.h>"
-
 			# Need <termios.h> for tty constants and structure
 			vsed -i ${wrksrc}/slattach.c \
 				-e "/#include <limits.h>/a #include <termios.h>"
 	esac
 }
 
-do_build() {
+do_configure() {
 	replace_interpreter bash configure.sh
-	yes "" | make
+	yes "" | make config
 }
 
-do_install() {
-	make DESTDIR=${DESTDIR}/usr update
+post_install() {
 	# Rename ifconfig for alternatives.
 	mv ${DESTDIR}/usr/bin/{ifconfig,${pkgname}-ifconfig}
 	mv ${DESTDIR}/usr/share/man/man8/{ifconfig,${pkgname}-ifconfig}.8

From 61a12faa105a9367428ba57dfa61633761e9c5e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 8 May 2022 17:12:18 +0200
Subject: [PATCH 2146/2561] erlang: update to 24.3.4.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index d59eeb464e74..fb0fa77fc4c4 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.3.2
+version=24.3.4
 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=cdc9cf788d28a492eb6b24881fbd06a0a5c785dc374ad415b3be1db96326583c
+checksum=e59bedbb871af52244ca5284fd0a572d52128abd4decf4347fe2aef047b65c58
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From a8c78d79fd25ad6f161dfe080d378beb5cf5df34 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 May 2022 14:36:33 +0200
Subject: [PATCH 2147/2561] ugrep: update to 3.7.10.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 5025d63a7ebd..fda7c355b64a 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.9
+version=3.7.10
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=016e771756574a2a0b026ec50f7e7f3898d39cb61771ce98bc225c34d86a03be
+checksum=733503055e309e83898a403481d92357fc3b02d4642acdb51026dd2dd44e0477
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 27fd8b53411e869c9a624cce32e6fd9f42b37283 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 17:56:52 -0500
Subject: [PATCH 2148/2561] nvidia: update to 510.68.02.

Also update conflicts.
---
 srcpkgs/nvidia/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 94482a9de0e2..026ef02110ff 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=510.60.02
-revision=2
+version=510.68.02
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -15,11 +15,11 @@ repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
 hostmakedepends="tar"
-conflicts="xserver-abi-video>25_1"
+conflicts="xserver-abi-video>25_1 nvidia470>=0 nvidia390>=0"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=a800dfc0549078fd8c6e8e6780efb8eee87872e6055c7f5f386a4768ce07e003
+checksum=bd2c344ac92b2fc12b06043590a4fe8d4eb0ccb74d0c49352f004cf2d299f4c5
 # 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}
@@ -279,6 +279,7 @@ do_install() {
 
 nvidia-gtklibs_package() {
 	short_desc="${_desc} - GTK+ libraries"
+	conflicts="nvidia470-gtklibs>=0 nvidia390-gtklibs>=0"
 	pkg_install() {
 		vmove "usr/lib/lib*gtk*.so*"
 	}
@@ -288,6 +289,7 @@ nvidia-libs-32bit_package() {
 	short_desc="${_desc} - common libraries (32bit)"
 	# manually set 32bit depends for libglvnd
 	depends="glibc-32bit>=0 libX11-32bit>=0 libXext-32bit>=0 libglvnd-32bit>=0"
+	conflicts="nvidia470-libs-32bit>=0 nvidia390-libs-32bit>=0"
 	repository="multilib/nonfree"
 	pkg_install() {
 		vmove usr/lib32
@@ -298,6 +300,7 @@ nvidia-libs_package() {
 	short_desc="${_desc} - common libraries"
 	depends="libglvnd"
 	nostrip_files="gsp.bin"
+	conflicts="nvidia470-libs>=0 nvidia390-libs>=0"
 	pkg_install() {
 		vmove usr/lib
 	}
@@ -309,6 +312,7 @@ nvidia-dkms_package() {
 	dkms_modules="nvidia ${version}"
 	# dkms must be before initramfs-regenerate to build modules before images
 	triggers="dkms initramfs-regenerate"
+	conflicts="nvidia470-dkms>=0 nvidia390-dkms>=0"
 
 	pkg_install() {
 		vmove usr/src
@@ -319,6 +323,7 @@ nvidia-dkms_package() {
 nvidia-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
 	depends="ocl-icd"
+	conflicts="nvidia470-opencl>=0 nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

From 1dfc345e944a3b428631d692d8d9b2899a2a31b9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 18:14:22 -0500
Subject: [PATCH 2149/2561] nvidia470: update conflicts

---
 srcpkgs/nvidia470/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index d746210cc92f..def3fee02786 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)"
 
 pkgname=nvidia470
 version=470.103.01
-revision=3
+revision=4
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -15,7 +15,7 @@ repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
 hostmakedepends="tar"
-conflicts="xserver-abi-video>25_1"
+conflicts="xserver-abi-video>25_1 nvidia390>=0"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
@@ -263,6 +263,7 @@ do_install() {
 
 nvidia470-gtklibs_package() {
 	short_desc="${_desc} - GTK+ libraries"
+	conflicts="nvidia390-gtklibs>=0"
 	pkg_install() {
 		vmove "usr/lib/lib*gtk*.so*"
 	}
@@ -273,6 +274,7 @@ nvidia470-libs-32bit_package() {
 	# manually set 32bit depends for libglvnd
 	depends="glibc-32bit>=0 libX11-32bit>=0 libXext-32bit>=0 libglvnd-32bit>=0"
 	repository="multilib/nonfree"
+	conflicts="nvidia390-libs-32bit>=0"
 	pkg_install() {
 		vmove usr/lib32
 	}
@@ -282,6 +284,7 @@ nvidia470-libs_package() {
 	short_desc="${_desc} - common libraries"
 	depends="libglvnd"
 	nostrip_files="gsp.bin"
+	conflicts="nvidia390-libs>=0"
 	pkg_install() {
 		vmove usr/lib
 	}
@@ -293,6 +296,7 @@ nvidia470-dkms_package() {
 	dkms_modules="nvidia ${version}"
 	# dkms must be before initramfs-regenerate to build modules before images
 	triggers="dkms initramfs-regenerate"
+	conflicts="nvidia390-dkms>=0"
 
 	pkg_install() {
 		vmove usr/src
@@ -303,6 +307,7 @@ nvidia470-dkms_package() {
 nvidia470-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
 	depends="ocl-icd"
+	conflicts="nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

From bd668c8c32b4a03992e0c4d66619b1c0ae35b42b Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Fri, 29 Apr 2022 11:10:13 +0200
Subject: [PATCH 2150/2561] xf86-video-amdgpu: update to 22.0.0.

---
 srcpkgs/xf86-video-amdgpu/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 6ca8bc71b554..d31626a071df 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,7 +1,7 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=2
+version=22.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
@@ -11,8 +11,8 @@ short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
-distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.xz"
+checksum=9d23fb602915dc3ccde92aa4d1e9485e7e54eaae2f41f485e55eb20761778266
 
 lib32disabled=yes
 LDFLAGS="-Wl,-z,lazy"

From 588cd63bcfdc033f5441813041a5a87270a7b97a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 18:34:14 +0300
Subject: [PATCH 2151/2561] sakura: update to 3.8.5.

---
 srcpkgs/sakura/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template
index 36627625740f..6b0bda6d0a13 100644
--- a/srcpkgs/sakura/template
+++ b/srcpkgs/sakura/template
@@ -1,6 +1,6 @@
 # Template file for 'sakura'
 pkgname=sakura
-version=3.8.4
+version=3.8.5
 revision=1
 build_style=cmake
 hostmakedepends="perl pkg-config gettext"
@@ -11,4 +11,4 @@ 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=c3f610168796b3d44f69a6431f7b0d032be958ca42f7117a17380869bb1816b5
+checksum=d55fe959ea50b5e5cefc6bf30c890e747199cc98e443a2193e6cafe6f2540d34

From b5d022f8fe0fc28137a7179a9dd4146672c29648 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 7 May 2022 11:24:57 +0400
Subject: [PATCH 2152/2561] unrar: update to 6.1.7.

---
 srcpkgs/unrar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index cb408ad13c23..de70a410fada 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,6 +1,6 @@
 # Template file for 'unrar'
 pkgname=unrar
-version=6.1.6
+version=6.1.7
 revision=1
 wrksrc=unrar
 short_desc="Unarchiver for .rar files (non-free version)"
@@ -8,7 +8,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="custom:freeware"
 homepage="https://www.rarlab.com/rar_add.htm"
 distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"
-checksum=67f4ab891c062218c2badfaac9c8cab5c8bfd5e96dabfca56c8faa3d209a801d
+checksum=de75b6136958173fdfc530d38a0145b72342cf0d3842bf7bb120d336602d88ed
 repository=nonfree
 
 do_build() {

From 10241d5196447cbd8a5e77b6f531f660c95ac773 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 9 May 2022 08:25:54 -0500
Subject: [PATCH 2153/2561] impacket: update to 0.10.0.

---
 srcpkgs/impacket/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/impacket/template b/srcpkgs/impacket/template
index 008b4c5d4f25..42c058f9d464 100644
--- a/srcpkgs/impacket/template
+++ b/srcpkgs/impacket/template
@@ -1,6 +1,6 @@
 # Template file for 'impacket'
 pkgname=impacket
-version=0.9.24
+version=0.10.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,12 +13,9 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-1.1, MIT"
 homepage="https://www.secureauth.com/labs/open-source-tools/impacket/"
 distfiles="https://github.com/SecureAuthCorp/impacket/releases/download/impacket_${version//./_}/impacket-${version}.tar.gz"
-checksum=18d557d387f4914fafa739813b9172bc3f8bd9c036e93bf589a8e0ebb7304bba
+checksum=b8eb020a2cbb47146669cfe31c64bb2e7d6499d049c493d6418b9716f5c74583
 make_check=extended
 
 post_install() {
 	vlicense LICENSE
-
-	rm ${DESTDIR}/usr/bin/PoC.py    \
-	   ${DESTDIR}/usr/bin/PoC2.py
 }

From df1ace075513ff6349cebacdbec9fcb79656b151 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 9 May 2022 08:26:38 -0500
Subject: [PATCH 2154/2561] python3-rich: update to 12.4.1.

---
 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 f9cd79d81ea9..377a89153322 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=12.3.0
+version=12.4.1
 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=7e8700cda776337036a712ff0495b04052fb5f957c7dfb8df997f88350044b64
+checksum=d239001c0fb7de985e21ec9a4bb542b5150350330bbc1849f835b9cbc8923b91
 make_check=extended # some checks only work on windows
 
 post_install() {

From 5fd29271c1ea6000e323f753e1dcc635eb34a872 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 9 May 2022 16:21:14 +0200
Subject: [PATCH 2155/2561] rink: broken on big endian ppc64

---
 srcpkgs/rink/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/rink/template b/srcpkgs/rink/template
index 7772630d24bc..9191abe6af4e 100644
--- a/srcpkgs/rink/template
+++ b/srcpkgs/rink/template
@@ -14,3 +14,8 @@ homepage="https://github.com/tiffany352/rink-rs"
 changelog="https://github.com/tiffany352/rink-rs/releases"
 distfiles="https://github.com/tiffany352/rink-rs/archive/refs/tags/v${version}.tar.gz"
 checksum=49431c12f57d58090b9f5f7f899e98bebffaeed8ca69b5ee140aad4b1c1d9dc8
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc64le*) ;;
+	ppc64*) broken="lots of unresolved imports for some reason";;
+esac

From 1d3fb7afd86c85403d1ca704d94d4539844c679b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 9 May 2022 17:12:40 +0200
Subject: [PATCH 2156/2561] fselect: fix build on ppc64le-musl

---
 srcpkgs/fselect/template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index 5c35c5be539f..9f26f6100bf0 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -10,6 +10,16 @@ homepage="https://github.com/jhspetersson/fselect"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=33dfcbbf7e598bce479b1fb5c17429af1bb309beab2e4bc95642e9f4b5c2ffbd
 
+post_patch() {
+	# in rustix-0.32.x:
+	#
+	# libc::BLKSSZGET as c::c_ulong,
+	# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u64`
+	#
+	# remove on next version update
+	cargo update --package fd-lock --precise 3.0.5
+}
+
 post_install() {
 	vlicense LICENSE-MIT
 }

From 2fa35595a08c5ad1bf3111e168492f35b1f2ec60 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 9 May 2022 20:04:19 +0200
Subject: [PATCH 2157/2561] libguestfs: update to 1.48.1.

---
 srcpkgs/libguestfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index c6c56f8142b7..48d521d89d19 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
-version=1.48.0
-revision=2
+version=1.48.1
+revision=1
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"
@@ -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=1681fddedfcf484ca6deec54230330a32defbd30c2ab1f81788e252cb5d04829
+checksum=4c3e84ae257b48fa6628734c8b305e3a0b8653928aef02caa423341413a90f1f
 
 conf_files="etc/libguestfs-tools.conf"
 

From 9cf44086a3bf81c31f8762a7585d8a2fa89e4690 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 9 May 2022 20:13:22 +0200
Subject: [PATCH 2158/2561] perl-Template-Toolkit: update to 3.100.

---
 srcpkgs/perl-Template-Toolkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Template-Toolkit/template b/srcpkgs/perl-Template-Toolkit/template
index 453f8262144c..24712b0359a2 100644
--- a/srcpkgs/perl-Template-Toolkit/template
+++ b/srcpkgs/perl-Template-Toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Template-Toolkit'
 pkgname=perl-Template-Toolkit
-version=3.010
+version=3.100
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Template-Toolkit"
 distfiles="${CPAN_SITE}/Template/Template-Toolkit-${version}.tar.gz"
-checksum=f4b65e93364088aa850887820652e467b0bce1493760fd3690268520b37d82cc
+checksum=cec7c20af57ed4b0d8131599a41027f56e22b544c8083704afad6a13cd483ffc

From 6d7b017868e59e3a9fa9a9ebff66034b5ed1f431 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 9 May 2022 20:13:35 +0200
Subject: [PATCH 2159/2561] python-b2sdk: update to 1.16.0.

---
 srcpkgs/python-b2sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index 7b0578b60926..bdc6d758e732 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'python-b2sdk'
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
-version=1.14.1
+version=1.16.0
 revision=1
 wrksrc="b2sdk-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://pypi.org/project/b2sdk"
 distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=7d839eca12a6f66453eb535c41569714a7910bc012f657c864c3bfb3a88569e8
+checksum=cbffff1163bb8e7cc920c76b29f5e889369d7f5ef1b7b53c89fd5bb79f5ea9c5
 
 post_install() {
 	vlicense LICENSE

From 02fe28cd7521d75fa59129f83a06e9d2b9bb0f54 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 9 May 2022 20:14:24 +0200
Subject: [PATCH 2160/2561] texmaker: update to 5.1.3.

---
 srcpkgs/texmaker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/texmaker/template b/srcpkgs/texmaker/template
index 5a2f65a3be81..d7a71964ac45 100644
--- a/srcpkgs/texmaker/template
+++ b/srcpkgs/texmaker/template
@@ -1,6 +1,6 @@
 # Template file for 'texmaker'
 pkgname=texmaker
-version=5.1.2
+version=5.1.3
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://www.xm1math.net/texmaker/index.html"
 distfiles="http://www.xm1math.net/$pkgname/$pkgname-$version.tar.bz2"
-checksum=526896f2c1ae561130eec7aae815b9dcda9e8eeb772b6541d0dc94ce91a71044
+checksum=bfa52e5e0e3c61d5258ea8c69ea527f6bd20f0e23fe2da43b80aee00b2609f61

From 712a593267e70cfa97dc6836fe59206b9070320b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 21 Dec 2021 19:19:59 -0500
Subject: [PATCH 2161/2561] New package: gotify-cli-2.2.1

---
 srcpkgs/gotify-cli/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/gotify-cli/template

diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template
new file mode 100644
index 000000000000..50754553ec46
--- /dev/null
+++ b/srcpkgs/gotify-cli/template
@@ -0,0 +1,21 @@
+# Template file for 'gotify-cli'
+pkgname=gotify-cli
+version=2.2.1
+revision=1
+wrksrc="cli-$version"
+build_style=go
+go_import_path="github.com/gotify/cli/v2"
+go_ldflags="-w -s -X main.Version=${version} \
+ -X main.BuildDate=${SOURCE_DATE_EPOCH} \
+ -X main.Mode=prod"
+short_desc="Command line interface for pushing messages to a Gotify server"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gotify.net"
+distfiles="https://github.com/gotify/cli/archive/v${version}.tar.gz"
+checksum=9013f4afdcc717932e71ab217e09daf4c48e153b23454f5e732ad0f74a8c8979
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/cli ${DESTDIR}/usr/bin/gotify-cli
+	vlicense LICENSE
+}

From ab87e02e966042ed9f0260d6b33f6a58b1c6cb74 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 20 Feb 2022 18:37:39 -0500
Subject: [PATCH 2162/2561] New package: gotify-server-2.1.4

---
 .../gotify-server/files/gotify-server/log/run |  1 +
 srcpkgs/gotify-server/files/gotify-server/run |  3 ++
 srcpkgs/gotify-server/template                | 44 +++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/gotify-server/files/gotify-server/log/run
 create mode 100755 srcpkgs/gotify-server/files/gotify-server/run
 create mode 100644 srcpkgs/gotify-server/template

diff --git a/srcpkgs/gotify-server/files/gotify-server/log/run b/srcpkgs/gotify-server/files/gotify-server/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/gotify-server/files/gotify-server/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/gotify-server/files/gotify-server/run b/srcpkgs/gotify-server/files/gotify-server/run
new file mode 100755
index 000000000000..6d4d3243be2f
--- /dev/null
+++ b/srcpkgs/gotify-server/files/gotify-server/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec chpst -u _gotify:_gotify gotify-server
diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template
new file mode 100644
index 000000000000..9a0dad5ea6e9
--- /dev/null
+++ b/srcpkgs/gotify-server/template
@@ -0,0 +1,44 @@
+# Template file for 'gotify-server'
+pkgname=gotify-server
+version=2.1.4
+revision=1
+wrksrc="server-$version"
+build_style=go
+go_import_path="github.com/gotify/server/v2"
+go_ldflags="-w -s -extldflags=-fuse-ld=bfd \
+ -X main.Version=${version} \
+ -X main.BuildDate=${SOURCE_DATE_EPOCH} \
+ -X main.Mode=prod"
+hostmakedepends="yarn packr2"
+short_desc="Simple server for sending and receiving messages"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gotify.net"
+distfiles="https://github.com/gotify/server/archive/v${version}.tar.gz"
+checksum=141e16147dadc34264c4ec9fb1e28df229148d87fa73deaad3ac5b2ecbb0dfb3
+conf_files="/etc/gotify/config.yml"
+
+system_accounts="_gotify"
+_gotify_homedir="/var/lib/gotify"
+make_dirs="/var/lib/gotify 0750 _gotify _gotify"
+
+post_patch() {
+	vsed 's,data/,/var/lib/gotify/,' -i config.example.yml
+}
+
+pre_build() {
+	cd ui
+	yarn
+	yarn build
+
+	cd "$wrksrc"
+	packr2
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/server ${DESTDIR}/usr/bin/gotify-server
+	vlicense LICENSE
+	vinstall config.example.yml 644 etc/gotify config.yml
+
+	vsv gotify-server
+}

From 31ae3878c31984d3396e07fe6fde5370fba06414 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 20 Feb 2022 18:37:51 -0500
Subject: [PATCH 2163/2561] New package: up_rewrite-1.1.1

---
 srcpkgs/up_rewrite/files/up_rewrite/log/run |  1 +
 srcpkgs/up_rewrite/files/up_rewrite/run     |  3 +++
 srcpkgs/up_rewrite/template                 | 23 +++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/up_rewrite/files/up_rewrite/log/run
 create mode 100755 srcpkgs/up_rewrite/files/up_rewrite/run
 create mode 100644 srcpkgs/up_rewrite/template

diff --git a/srcpkgs/up_rewrite/files/up_rewrite/log/run b/srcpkgs/up_rewrite/files/up_rewrite/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/up_rewrite/files/up_rewrite/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/up_rewrite/files/up_rewrite/run b/srcpkgs/up_rewrite/files/up_rewrite/run
new file mode 100755
index 000000000000..6db9c1c3f962
--- /dev/null
+++ b/srcpkgs/up_rewrite/files/up_rewrite/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec chpst -u _up_rewrite:_up_rewrite up_rewrite -c /etc/up_rewrite/config.toml
diff --git a/srcpkgs/up_rewrite/template b/srcpkgs/up_rewrite/template
new file mode 100644
index 000000000000..33037f90984c
--- /dev/null
+++ b/srcpkgs/up_rewrite/template
@@ -0,0 +1,23 @@
+# Template file for 'up_rewrite'
+pkgname=up_rewrite
+version=1.1.1
+revision=1
+wrksrc="common-proxies-${version}"
+build_style=go
+go_import_path="github.com/karmanyaahm/up_rewrite"
+go_ldflags="-X $go_import_path/config.Version=$version"
+short_desc="Rewrite Proxy for UnifiedPush written in Go"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://unifiedpush.org"
+distfiles="https://github.com/UnifiedPush/common-proxies/archive/v${version}.tar.gz"
+checksum=178d99a053afeeb64bff7149415d14a5f9b809af4d2c081ec4fbfe33ae55428f
+conf_files="/etc/up_rewrite/config.toml"
+
+system_accounts="_up_rewrite"
+
+post_install() {
+	vinstall example-config.toml 644 etc/up_rewrite config.toml
+	vlicense LICENSE
+	vsv up_rewrite
+}

From 331e45a53a9527f6f1b7eebc4b19feba8e1bf871 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 29 Apr 2022 22:59:01 +0200
Subject: [PATCH 2164/2561] f2fs-tools: remove unnecessary git build dep

---
 srcpkgs/f2fs-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/f2fs-tools/template b/srcpkgs/f2fs-tools/template
index 32d2b94ba650..f885bf580849 100644
--- a/srcpkgs/f2fs-tools/template
+++ b/srcpkgs/f2fs-tools/template
@@ -3,8 +3,8 @@ pkgname=f2fs-tools
 version=1.14.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static ac_cv_file__git=yes"
-hostmakedepends="automake libtool pkg-config git"
+configure_args="--disable-static"
+hostmakedepends="automake libtool pkg-config"
 makedepends="libuuid-devel libblkid-devel"
 short_desc="Tools for the Linux Flash-Friendly File System (F2FS)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 693a42e1f91e16b05ba0142cfd22633d47d2f49b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 May 2022 21:07:49 +0200
Subject: [PATCH 2165/2561] gtk4: fix update-check

---
 srcpkgs/gtk4/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk4/update b/srcpkgs/gtk4/update
index f925f98e9eea..20fb052fc29a 100644
--- a/srcpkgs/gtk4/update
+++ b/srcpkgs/gtk4/update
@@ -1,2 +1,2 @@
-site=https://download.gnome.org/sources/gtk/cache.json
-pattern='4\.(\d|[1-8]\d)\.\d*(?=.tar)'
+pkgname="gtk"
+pattern="4\.[0-9]*[02468]\.[0-9]*"

From 14daa5eb1f2d4ed7ad6bc4ec2a1922d04e098eae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 May 2022 21:19:14 +0200
Subject: [PATCH 2166/2561] nv-codec-headers: fix update-check

---
 srcpkgs/nv-codec-headers/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/nv-codec-headers/update

diff --git a/srcpkgs/nv-codec-headers/update b/srcpkgs/nv-codec-headers/update
new file mode 100644
index 000000000000..0ef66a085297
--- /dev/null
+++ b/srcpkgs/nv-codec-headers/update
@@ -0,0 +1 @@
+pattern=">n\K[\d\.]+(?=</a>)"

From 3afda925b18eac9fec3844a2512fe45b138b0942 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Mon, 30 Aug 2021 09:47:14 -0700
Subject: [PATCH 2167/2561] pinebookpro-kernel: update to 5.15.38

Add patch series for dpaltmode support
Add patch series for gamma adjustment support
---
 .../pinebookpro-kernel/files/DocBook/Makefile |  282 ---
 srcpkgs/pinebookpro-kernel/files/dotconfig    | 1644 +++++++++--------
 ...-es8316-Run-micdetect-only-if-jack-s.patch |   30 -
 ...chip-support-gamma-control-on-RK3399.patch |  667 +++++++
 .../patches/pbp-dpaltmode.patch               |  854 +++++++++
 srcpkgs/pinebookpro-kernel/template           |   72 +-
 6 files changed, 2470 insertions(+), 1079 deletions(-)
 delete mode 100644 srcpkgs/pinebookpro-kernel/files/DocBook/Makefile
 delete mode 100644 srcpkgs/pinebookpro-kernel/patches/0005-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
 create mode 100644 srcpkgs/pinebookpro-kernel/patches/drm-rockchip-support-gamma-control-on-RK3399.patch
 create mode 100644 srcpkgs/pinebookpro-kernel/patches/pbp-dpaltmode.patch

diff --git a/srcpkgs/pinebookpro-kernel/files/DocBook/Makefile b/srcpkgs/pinebookpro-kernel/files/DocBook/Makefile
deleted file mode 100644
index 85916f13d330..000000000000
--- a/srcpkgs/pinebookpro-kernel/files/DocBook/Makefile
+++ /dev/null
@@ -1,282 +0,0 @@
-###
-# This makefile is used to generate the kernel documentation,
-# primarily based on in-line comments in various source files.
-# See Documentation/kernel-doc-nano-HOWTO.txt for instruction in how
-# to document the SRC - and how to read it.
-# To add a new book the only step required is to add the book to the
-# list of DOCBOOKS.
-
-DOCBOOKS := z8530book.xml  \
-	    kernel-hacking.xml kernel-locking.xml \
-	    networking.xml \
-	    filesystems.xml lsm.xml kgdb.xml \
-	    libata.xml mtdnand.xml librs.xml rapidio.xml \
-	    s390-drivers.xml scsi.xml \
-	    sh.xml w1.xml
-
-ifeq ($(DOCBOOKS),)
-
-# Skip DocBook build if the user explicitly requested no DOCBOOKS.
-.DEFAULT:
-	@echo "  SKIP    DocBook $@ target (DOCBOOKS=\"\" specified)."
-else
-ifneq ($(SPHINXDIRS),)
-
-# Skip DocBook build if the user explicitly requested a sphinx dir
-.DEFAULT:
-	@echo "  SKIP    DocBook $@ target (SPHINXDIRS specified)."
-else
-
-
-###
-# The build process is as follows (targets):
-#              (xmldocs) [by docproc]
-# file.tmpl --> file.xml +--> file.ps   (psdocs)   [by db2ps or xmlto]
-#                        +--> file.pdf  (pdfdocs)  [by db2pdf or xmlto]
-#                        +--> DIR=file  (htmldocs) [by xmlto]
-#                        +--> man/      (mandocs)  [by xmlto]
-
-
-# for PDF and PS output you can choose between xmlto and docbook-utils tools
-PDF_METHOD	= $(prefer-db2x)
-PS_METHOD	= $(prefer-db2x)
-
-
-targets += $(DOCBOOKS)
-BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
-xmldocs: $(BOOKS)
-sgmldocs: xmldocs
-
-PS := $(patsubst %.xml, %.ps, $(BOOKS))
-psdocs: $(PS)
-
-PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
-pdfdocs: $(PDF)
-
-HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
-htmldocs: $(HTML)
-	$(call cmd,build_main_index)
-
-MAN := $(patsubst %.xml, %.9, $(BOOKS))
-mandocs: $(MAN)
-	find $(obj)/man -name '*.9' | xargs gzip -nf
-
-# Default location for installed man pages
-export INSTALL_MAN_PATH = $(objtree)/usr
-
-installmandocs: mandocs
-	mkdir -p $(INSTALL_MAN_PATH)/man/man9/
-	find $(obj)/man -name '*.9.gz' -printf '%h %f\n' | \
-		sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \
-		xargs install -m 644 -t $(INSTALL_MAN_PATH)/man/man9/
-
-# no-op for the DocBook toolchain
-epubdocs:
-latexdocs:
-linkcheckdocs:
-
-###
-#External programs used
-KERNELDOCXMLREF = $(srctree)/scripts/kernel-doc-xml-ref
-KERNELDOC       = $(srctree)/scripts/kernel-doc
-DOCPROC         = $(objtree)/scripts/docproc
-CHECK_LC_CTYPE = $(objtree)/scripts/check-lc_ctype
-
-# Use a fixed encoding - UTF-8 if the C library has support built-in
-# or ASCII if not
-LC_CTYPE := $(call try-run, LC_CTYPE=C.UTF-8 $(CHECK_LC_CTYPE),C.UTF-8,C)
-export LC_CTYPE
-
-XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl
-XMLTOFLAGS += --skip-validation
-
-###
-# DOCPROC is used for two purposes:
-# 1) To generate a dependency list for a .tmpl file
-# 2) To preprocess a .tmpl file and call kernel-doc with
-#     appropriate parameters.
-# The following rules are used to generate the .xml documentation
-# required to generate the final targets. (ps, pdf, html).
-quiet_cmd_docproc = DOCPROC $@
-      cmd_docproc = SRCTREE=$(srctree)/ $(DOCPROC) doc $< >$@
-define rule_docproc
-	set -e;								\
-        $(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))';) 	\
-        $(cmd_$(1)); 							\
-        ( 								\
-          echo 'cmd_$@ := $(cmd_$(1))'; 				\
-          echo $@: `SRCTREE=$(srctree) $(DOCPROC) depend $<`; 		\
-        ) > $(dir $@).$(notdir $@).cmd
-endef
-
-%.xml: %.tmpl $(KERNELDOC) $(DOCPROC) $(KERNELDOCXMLREF) FORCE
-	$(call if_changed_rule,docproc)
-
-# Tell kbuild to always build the programs
-always := $(hostprogs-y)
-
-notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
-		   exit 1
-db2xtemplate = db2TYPE -o $(dir $@) $<
-xmltotemplate = xmlto TYPE $(XMLTOFLAGS) -o $(dir $@) $<
-
-# determine which methods are available
-ifeq ($(shell which db2ps >/dev/null 2>&1 && echo found),found)
-	use-db2x = db2x
-	prefer-db2x = db2x
-else
-	use-db2x = notfound
-	prefer-db2x = $(use-xmlto)
-endif
-ifeq ($(shell which xmlto >/dev/null 2>&1 && echo found),found)
-	use-xmlto = xmlto
-	prefer-xmlto = xmlto
-else
-	use-xmlto = notfound
-	prefer-xmlto = $(use-db2x)
-endif
-
-# the commands, generated from the chosen template
-quiet_cmd_db2ps = PS      $@
-      cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))
-%.ps : %.xml
-	$(call cmd,db2ps)
-
-quiet_cmd_db2pdf = PDF     $@
-      cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))
-%.pdf : %.xml
-	$(call cmd,db2pdf)
-
-
-index = index.html
-main_idx = $(obj)/$(index)
-quiet_cmd_build_main_index = HTML    $(main_idx)
-      cmd_build_main_index = rm -rf $(main_idx); \
-		   echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \
-		   echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
-		   cat $(HTML) >> $(main_idx)
-
-quiet_cmd_db2html = HTML    $@
-      cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
-		echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \
-		$(patsubst %.html,%,$(notdir $@))</a><p>' > $@
-
-###
-# Rules to create an aux XML and .db, and use them to re-process the DocBook XML
-# to fill internal hyperlinks
-       gen_aux_xml = :
- quiet_gen_aux_xml = echo '  XMLREF  $@'
-silent_gen_aux_xml = :
-%.aux.xml: %.xml
-	@$($(quiet)gen_aux_xml)
-	@rm -rf $@
-	@(cat $< | egrep "^<refentry id" | egrep -o "\".*\"" | cut -f 2 -d \" > $<.db)
-	@$(KERNELDOCXMLREF) -db $<.db $< > $@
-.PRECIOUS: %.aux.xml
-
-%.html:	%.aux.xml
-	@(which xmlto > /dev/null 2>&1) || \
-	 (echo "*** You need to install xmlto ***"; \
-	  exit 1)
-	@rm -rf $@ $(patsubst %.html,%,$@)
-	$(call cmd,db2html)
-	@if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \
-            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
-
-quiet_cmd_db2man = MAN     $@
-      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man/$(*F) $< ; fi
-%.9 : %.xml
-	@(which xmlto > /dev/null 2>&1) || \
-	 (echo "*** You need to install xmlto ***"; \
-	  exit 1)
-	$(Q)mkdir -p $(obj)/man/$(*F)
-	$(call cmd,db2man)
-	@touch $@
-
-###
-# Rules to generate postscripts and PNG images from .fig format files
-quiet_cmd_fig2eps = FIG2EPS $@
-      cmd_fig2eps = fig2dev -Leps $< $@
-
-%.eps: %.fig
-	@(which fig2dev > /dev/null 2>&1) || \
-	 (echo "*** You need to install transfig ***"; \
-	  exit 1)
-	$(call cmd,fig2eps)
-
-quiet_cmd_fig2png = FIG2PNG $@
-      cmd_fig2png = fig2dev -Lpng $< $@
-
-%.png: %.fig
-	@(which fig2dev > /dev/null 2>&1) || \
-	 (echo "*** You need to install transfig ***"; \
-	  exit 1)
-	$(call cmd,fig2png)
-
-###
-# Rule to convert a .c file to inline XML documentation
-       gen_xml = :
- quiet_gen_xml = echo '  GEN     $@'
-silent_gen_xml = :
-%.xml: %.c
-	@$($(quiet)gen_xml)
-	@(                            \
-	   echo "<programlisting>";   \
-	   expand --tabs=8 < $< |     \
-	   sed -e "s/&/\\&amp;/g"     \
-	       -e "s/</\\&lt;/g"      \
-	       -e "s/>/\\&gt;/g";     \
-	   echo "</programlisting>")  > $@
-
-endif # DOCBOOKS=""
-endif # SPHINDIR=...
-
-###
-# Help targets as used by the top-level makefile
-dochelp:
-	@echo  ' Linux kernel internal documentation in different formats (DocBook):'
-	@echo  '  htmldocs        - HTML'
-	@echo  '  pdfdocs         - PDF'
-	@echo  '  psdocs          - Postscript'
-	@echo  '  xmldocs         - XML DocBook'
-	@echo  '  mandocs         - man pages'
-	@echo  '  installmandocs  - install man pages generated by mandocs to INSTALL_MAN_PATH'; \
-	 echo  '                    (default: $(INSTALL_MAN_PATH))'; \
-	 echo  ''
-	@echo  '  cleandocs       - clean all generated DocBook files'
-	@echo
-	@echo  '  make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'
-	@echo  '  valid values for DOCBOOKS are: $(DOCBOOKS)'
-	@echo
-	@echo  "  make DOCBOOKS=\"\" [target] Don't generate docs from Docbook"
-	@echo  '     This is useful to generate only the ReST docs (Sphinx)'
-
-
-###
-# Temporary files left by various tools
-clean-files := $(DOCBOOKS) \
-	$(patsubst %.xml, %.dvi,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.aux,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.tex,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.log,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.out,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.ps,      $(DOCBOOKS)) \
-	$(patsubst %.xml, %.pdf,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.html,    $(DOCBOOKS)) \
-	$(patsubst %.xml, %.9,       $(DOCBOOKS)) \
-	$(patsubst %.xml, %.aux.xml, $(DOCBOOKS)) \
-	$(patsubst %.xml, %.xml.db,  $(DOCBOOKS)) \
-	$(patsubst %.xml, %.xml,     $(DOCBOOKS)) \
-	$(patsubst %.xml, .%.xml.cmd, $(DOCBOOKS)) \
-	$(index)
-
-clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
-
-cleandocs:
-	$(Q)rm -f $(call objectify, $(clean-files))
-	$(Q)rm -rf $(call objectify, $(clean-dirs))
-
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable so we can use it in if_changed and friends.
-
-.PHONY: $(PHONY)
diff --git a/srcpkgs/pinebookpro-kernel/files/dotconfig b/srcpkgs/pinebookpro-kernel/files/dotconfig
index 2c383ae77363..a4b353fa6e5e 100644
--- a/srcpkgs/pinebookpro-kernel/files/dotconfig
+++ b/srcpkgs/pinebookpro-kernel/files/dotconfig
@@ -1,17 +1,21 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.9 Kernel Configuration
+# Linux/arm64 5.15.28 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23501
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23501
 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_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -21,6 +25,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_WERROR is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -61,7 +66,6 @@ CONFIG_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_DEBUGFS=y
 # end of IRQ subsystem
 
-CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
@@ -79,9 +83,26 @@ CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # end of Timers subsystem
 
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+CONFIG_BPF_JIT_DEFAULT_ON=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
+CONFIG_USERMODE_DRIVER=y
+# CONFIG_BPF_PRELOAD is not set
+# end of BPF subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
+# CONFIG_SCHED_CORE is not set
 
 #
 # CPU/Task time and stats accounting
@@ -123,6 +144,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=23
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=14
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=15
+# CONFIG_PRINTK_INDEX is not set
 CONFIG_GENERIC_SCHED_CLOCK=y
 
 #
@@ -155,6 +177,7 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_BPF=y
+CONFIG_CGROUP_MISC=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_NAMESPACES=y
@@ -184,7 +207,6 @@ CONFIG_LD_ORPHAN_WARN=y
 CONFIG_SYSCTL=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_BPF=y
 CONFIG_EXPERT=y
 CONFIG_UID16=y
 CONFIG_MULTIUSER=y
@@ -193,7 +215,6 @@ CONFIG_SYSFS_SYSCALL=y
 CONFIG_FHANDLE=y
 CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
@@ -212,14 +233,9 @@ CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
-# CONFIG_BPF_JIT_ALWAYS_ON is not set
-CONFIG_BPF_JIT_DEFAULT_ON=y
-CONFIG_USERMODE_DRIVER=y
-# CONFIG_BPF_PRELOAD is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
@@ -235,7 +251,6 @@ CONFIG_PERF_EVENTS=y
 
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
@@ -245,6 +260,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y
 # CONFIG_SLAB_FREELIST_HARDENED is not set
 # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
 CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 # end of General setup
 
@@ -261,16 +277,12 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
 CONFIG_SMP=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
@@ -282,10 +294,11 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 # Platform selection
 #
 # CONFIG_ARCH_ACTIONS is not set
-# CONFIG_ARCH_AGILEX is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_ALPINE is not set
+# CONFIG_ARCH_APPLE is not set
 # CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_BCM4908 is not set
 # CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_BITMAIN is not set
@@ -307,7 +320,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_S32 is not set
 # CONFIG_ARCH_SEATTLE is not set
-# CONFIG_ARCH_STRATIX10 is not set
+# CONFIG_ARCH_INTEL_SOCFPGA is not set
 # CONFIG_ARCH_SYNQUACER is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_SPRD is not set
@@ -317,7 +330,6 @@ CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_VISCONTI is not set
 # CONFIG_ARCH_XGENE is not set
-# CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set
 # end of Platform selection
 
@@ -337,6 +349,7 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
+CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_1418040=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
@@ -359,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
 
@@ -377,32 +391,25 @@ CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=256
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_NUMA is not set
-CONFIG_HOLES_IN_ZONE=y
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
 # CONFIG_CRASH_DUMP is not set
+CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -418,15 +425,15 @@ CONFIG_SETEND_EMULATION=y
 #
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
+CONFIG_AS_HAS_LDAPR=y
+CONFIG_AS_HAS_LSE_ATOMICS=y
 CONFIG_ARM64_LSE_ATOMICS=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
-CONFIG_ARM64_VHE=y
 # end of ARMv8.1 architectural features
 
 #
 # ARMv8.2 architectural features
 #
-CONFIG_ARM64_UAO=y
 # CONFIG_ARM64_PMEM is not set
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_CNP=y
@@ -436,6 +443,7 @@ CONFIG_ARM64_CNP=y
 # ARMv8.3 architectural features
 #
 CONFIG_ARM64_PTR_AUTH=y
+CONFIG_ARM64_PTR_AUTH_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
 CONFIG_AS_HAS_PAC=y
@@ -453,6 +461,7 @@ CONFIG_ARM64_TLB_RANGE=y
 #
 # ARMv8.5 architectural features
 #
+CONFIG_AS_HAS_ARMV8_5=y
 CONFIG_ARM64_BTI=y
 CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
@@ -462,6 +471,12 @@ CONFIG_ARM64_AS_HAS_MTE=y
 CONFIG_ARM64_MTE=y
 # end of ARMv8.5 architectural features
 
+#
+# ARMv8.7 architectural features
+#
+CONFIG_ARM64_EPAN=y
+# end of ARMv8.7 architectural features
+
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_MODULE_PLTS=y
 # CONFIG_ARM64_PSEUDO_NMI is not set
@@ -482,7 +497,6 @@ CONFIG_DMI=y
 # end of Boot options
 
 CONFIG_SYSVIPC_COMPAT=y
-CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 
 #
 # Power management options
@@ -564,56 +578,11 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=y
 CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_ACPI_CPPC_CPUFREQ=y
+CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
 CONFIG_ARM_SCPI_CPUFREQ=y
 # end of CPU Frequency scaling
 # end of CPU Power Management
 
-#
-# Firmware Drivers
-#
-# CONFIG_ARM_SCMI_PROTOCOL is not set
-CONFIG_ARM_SCPI_PROTOCOL=y
-CONFIG_ARM_SCPI_POWER_DOMAIN=y
-# CONFIG_ARM_SDE_INTERFACE is not set
-# CONFIG_FIRMWARE_MEMMAP is not set
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=y
-# CONFIG_ISCSI_IBFT is not set
-# CONFIG_FW_CFG_SYSFS is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=y
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB=y
-# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
-CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
-CONFIG_EFI_BOOTLOADER_CONTROL=y
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_EFI_DISABLE_PCI_DMA is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_EFI_EARLYCON=y
-CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
-CONFIG_HAVE_ARM_SMCCC=y
-CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
-CONFIG_ARM_SMCCC_SOC_ID=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
 CONFIG_ARCH_SUPPORTS_ACPI=y
 CONFIG_ACPI=y
 CONFIG_ACPI_GENERIC_GSI=y
@@ -665,7 +634,8 @@ CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
-CONFIG_KVM_ARM_PMU=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
+# CONFIG_NVHE_EL2_DEBUG is not set
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA256_ARM64=y
 CONFIG_CRYPTO_SHA512_ARM64=y
@@ -691,7 +661,6 @@ CONFIG_CRYPTO_AES_ARM64_BS=y
 # General architecture-dependent options
 #
 CONFIG_CRASH_CORE=y
-CONFIG_SET_FS=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
@@ -701,6 +670,7 @@ CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
 CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
@@ -710,6 +680,7 @@ CONFIG_ARCH_HAS_KEEPINITRD=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_NO_INSTR=y
 CONFIG_HAVE_ASM_MODVERSIONS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
@@ -730,16 +701,23 @@ CONFIG_HAVE_ARCH_SECCOMP=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
 CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
+CONFIG_LTO_NONE=y
+CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
 CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@@ -754,6 +732,8 @@ CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
+CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
@@ -764,6 +744,8 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
 #
 # GCOV-based kernel profiling
@@ -788,27 +770,28 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
-CONFIG_MODULE_COMPRESS=y
+# CONFIG_MODULE_COMPRESS_NONE is not set
 CONFIG_MODULE_COMPRESS_GZIP=y
 # CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-CONFIG_UNUSED_SYMBOLS=y
+CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_CGROUP_RWSTAT=y
-CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
-CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOPRIO is not set
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEBUG_FS_ZONED=y
 CONFIG_BLK_SED_OPAL=y
@@ -844,6 +827,7 @@ CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
 
 #
 # IO Schedulers
@@ -939,9 +923,6 @@ CONFIG_COREDUMP=y
 #
 # Memory Management options
 #
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
@@ -949,16 +930,19 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_FAST_GUP=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 # CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_PAGE_REPORTING=y
 CONFIG_MIGRATION=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_BOUNCE=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -970,6 +954,7 @@ CONFIG_FRONTSWAP=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
 CONFIG_CMA_DEBUGFS=y
+# CONFIG_CMA_SYSFS is not set
 CONFIG_CMA_AREAS=7
 CONFIG_ZSWAP=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
@@ -992,12 +977,22 @@ CONFIG_ZSMALLOC=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
-CONFIG_FRAME_VECTOR=y
+CONFIG_ARCH_HAS_ZONE_DMA_SET=y
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA32=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 # CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
+# CONFIG_GUP_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_SECRETMEM=y
+
+#
+# Data Access Monitoring
+#
+# CONFIG_DAMON is not set
+# end of Data Access Monitoring
 # end of Memory Management options
 
 CONFIG_NET=y
@@ -1014,6 +1009,7 @@ CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
 CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
 CONFIG_UNIX_DIAG=m
 CONFIG_TLS=m
 # CONFIG_TLS_DEVICE is not set
@@ -1118,6 +1114,7 @@ CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SEG6_HMAC=y
 CONFIG_IPV6_SEG6_BPF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
+# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
 CONFIG_NETLABEL=y
 # CONFIG_MPTCP is not set
 # CONFIG_NETWORK_SECMARK is not set
@@ -1134,13 +1131,13 @@ CONFIG_NETFILTER_INGRESS=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_FAMILY_BRIDGE=y
 CONFIG_NETFILTER_FAMILY_ARP=y
+# CONFIG_NETFILTER_NETLINK_HOOK is not set
 CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_LOG_NETDEV=m
+CONFIG_NF_LOG_SYSLOG=m
 CONFIG_NETFILTER_CONNCOUNT=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
@@ -1209,9 +1206,11 @@ CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_FIB_NETDEV=m
+# CONFIG_NFT_REJECT_NETDEV is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XTABLES_COMPAT=y
 
 #
 # Xtables combined modules
@@ -1348,6 +1347,7 @@ CONFIG_IP_VS_SH=m
 CONFIG_IP_VS_MH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
+# CONFIG_IP_VS_TWOS is not set
 
 #
 # IPVS SH scheduler
@@ -1448,7 +1448,6 @@ CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_TABLES_BRIDGE=m
 # CONFIG_NFT_BRIDGE_META is not set
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
 # CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
@@ -1525,23 +1524,28 @@ CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 # CONFIG_BRIDGE_MRP is not set
-CONFIG_HAVE_NET_DSA=y
+# CONFIG_BRIDGE_CFM is not set
 CONFIG_NET_DSA=m
 # CONFIG_NET_DSA_TAG_AR9331 is not set
 CONFIG_NET_DSA_TAG_BRCM_COMMON=m
 CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
 CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+# CONFIG_NET_DSA_TAG_HELLCREEK is not set
 # CONFIG_NET_DSA_TAG_GSWIP is not set
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
 CONFIG_NET_DSA_TAG_DSA=m
 CONFIG_NET_DSA_TAG_EDSA=m
 # CONFIG_NET_DSA_TAG_MTK is not set
 # CONFIG_NET_DSA_TAG_KSZ is not set
 # CONFIG_NET_DSA_TAG_RTL4_A is not set
 # CONFIG_NET_DSA_TAG_OCELOT is not set
+# CONFIG_NET_DSA_TAG_OCELOT_8021Q is not set
 CONFIG_NET_DSA_TAG_QCA=m
 # CONFIG_NET_DSA_TAG_LAN9303 is not set
 # CONFIG_NET_DSA_TAG_SJA1105 is not set
 CONFIG_NET_DSA_TAG_TRAILER=m
+# CONFIG_NET_DSA_TAG_XRS700X is not set
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1678,9 +1682,7 @@ CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
-CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
-# CONFIG_BATMAN_ADV_SYSFS is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
@@ -1701,14 +1703,15 @@ CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_L3_MASTER_DEV=y
 # CONFIG_QRTR is not set
 # CONFIG_NET_NCSI is not set
+CONFIG_PCPU_DEV_REFCNT=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_XPS=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
-CONFIG_BPF_JIT=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_NET_FLOW_LIMIT=y
 
@@ -1767,6 +1770,7 @@ CONFIG_CAN_CC770=m
 CONFIG_CAN_CC770_PLATFORM=m
 # CONFIG_CAN_IFI_CANFD is not set
 CONFIG_CAN_M_CAN=m
+# CONFIG_CAN_M_CAN_PCI is not set
 # CONFIG_CAN_M_CAN_PLATFORM is not set
 # CONFIG_CAN_M_CAN_TCAN4X5X is not set
 # CONFIG_CAN_PEAK_PCIEFD is not set
@@ -1795,6 +1799,7 @@ CONFIG_CAN_SOFTING=m
 CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
+# CONFIG_CAN_ETAS_ES58X is not set
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
@@ -1818,6 +1823,7 @@ CONFIG_BT_LE=y
 CONFIG_BT_6LOWPAN=m
 # CONFIG_BT_LEDS is not set
 # CONFIG_BT_MSFTEXT is not set
+# CONFIG_BT_AOSPEXT is not set
 CONFIG_BT_DEBUGFS=y
 # CONFIG_BT_SELFTEST is not set
 
@@ -1858,11 +1864,13 @@ CONFIG_BT_ATH3K=m
 # CONFIG_BT_MTKSDIO is not set
 # CONFIG_BT_MTKUART is not set
 CONFIG_BT_HCIRSI=m
+# CONFIG_BT_VIRTIO is not set
 # end of Bluetooth device drivers
 
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 CONFIG_STREAM_PARSER=y
+# CONFIG_MCTP is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -1898,7 +1906,6 @@ CONFIG_MAC80211_DEBUGFS=y
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-# CONFIG_WIMAX is not set
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
@@ -1924,6 +1931,7 @@ CONFIG_NFC_SHDLC=y
 # CONFIG_NFC_TRF7970A is not set
 CONFIG_NFC_SIM=m
 CONFIG_NFC_PORT100=m
+# CONFIG_NFC_VIRTUAL_NCI is not set
 # CONFIG_NFC_FDP is not set
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_I2C=m
@@ -1941,6 +1949,7 @@ CONFIG_NFC_ST21NFCA_I2C=m
 # CONFIG_NFC_ST_NCI_SPI is not set
 # CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_S3FWRN5_I2C is not set
+# CONFIG_NFC_S3FWRN82_UART is not set
 # CONFIG_NFC_ST95HF is not set
 # end of Near Field Communication (NFC) devices
 
@@ -1950,12 +1959,12 @@ CONFIG_LWTUNNEL=y
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
+CONFIG_NET_SELFTESTS=y
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
 CONFIG_FAILOVER=m
 CONFIG_ETHTOOL_NETLINK=y
-CONFIG_HAVE_EBPF_JIT=y
 
 #
 # Device Drivers
@@ -1976,7 +1985,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # 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
@@ -2015,6 +2023,7 @@ CONFIG_PCI_XGENE_MSI=y
 # CONFIG_PCI_HOST_THUNDER_ECAM is not set
 CONFIG_PCIE_ROCKCHIP=y
 CONFIG_PCIE_ROCKCHIP_HOST=y
+# CONFIG_PCIE_MICROCHIP_HOST is not set
 
 #
 # DesignWare PCI Core Support
@@ -2024,6 +2033,7 @@ CONFIG_PCIE_DW_HOST=y
 CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_PCI_HISI=y
+# CONFIG_PCIE_ROCKCHIP_DW_HOST is not set
 # CONFIG_PCIE_KIRIN is not set
 # CONFIG_PCI_MESON is not set
 # CONFIG_PCIE_AL is not set
@@ -2032,7 +2042,6 @@ CONFIG_PCI_HISI=y
 #
 # Mobiveil PCIe Core Support
 #
-# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set
 # end of Mobiveil PCIe Core Support
 
 #
@@ -2055,12 +2064,14 @@ CONFIG_PCI_HISI=y
 # CONFIG_PCI_SW_SWITCHTEC is not set
 # end of PCI switch controller drivers
 
+# CONFIG_CXL_BUS is not set
 # CONFIG_PCCARD is not set
 # CONFIG_RAPIDIO is not set
 
 #
 # Generic Driver Options
 #
+CONFIG_AUXILIARY_BUS=y
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
@@ -2088,9 +2099,8 @@ CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
-CONFIG_REGMAP_SPMI=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
@@ -2105,13 +2115,68 @@ CONFIG_ARM_CCI=y
 CONFIG_ARM_CCI400_COMMON=y
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_MOXTET is not set
-CONFIG_SIMPLE_PM_BUS=y
 CONFIG_VEXPRESS_CONFIG=y
 # CONFIG_MHI_BUS is not set
 # end of Bus devices
 
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_ARM_SCPI_PROTOCOL=y
+CONFIG_ARM_SCPI_POWER_DOMAIN=y
+# CONFIG_ARM_SDE_INTERFACE is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+# CONFIG_ISCSI_IBFT is not set
+# CONFIG_FW_CFG_SYSFS is not set
+CONFIG_SYSFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
+# CONFIG_ARM_FFA_TRANSPORT is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_GENERIC_STUB=y
+# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
+CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
+CONFIG_EFI_BOOTLOADER_CONTROL=y
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+# CONFIG_RESET_ATTACK_MITIGATION is not set
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
+CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
+CONFIG_ARM_SMCCC_SOC_ID=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 # CONFIG_GNSS is not set
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
@@ -2132,6 +2197,10 @@ CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 # CONFIG_MTD_BLOCK_RO is not set
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
@@ -2182,6 +2251,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_DATAFLASH is not set
 # CONFIG_MTD_MCHP23K256 is not set
+# CONFIG_MTD_MCHP48L640 is not set
 # CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
@@ -2199,10 +2269,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 #
 CONFIG_MTD_NAND_CORE=y
 # CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_NAND_ECC_SW_HAMMING=y
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
 CONFIG_MTD_RAW_NAND=y
-# CONFIG_MTD_NAND_ECC_SW_BCH is not set
 
 #
 # Raw/parallel NAND flash controllers
@@ -2216,6 +2283,8 @@ CONFIG_MTD_RAW_NAND=y
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_CADENCE is not set
 # CONFIG_MTD_NAND_ARASAN is not set
+# CONFIG_MTD_NAND_INTEL_LGM is not set
+# CONFIG_MTD_NAND_ROCKCHIP is not set
 
 #
 # Misc
@@ -2229,6 +2298,9 @@ CONFIG_MTD_RAW_NAND=y
 # ECC engine support
 #
 CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # end of ECC engine support
 # end of NAND
 
@@ -2240,6 +2312,9 @@ CONFIG_MTD_NAND_ECC=y
 
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_LIMIT=20
@@ -2256,7 +2331,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 # CONFIG_OF_OVERLAY is not set
 # CONFIG_PARPORT is not set
@@ -2272,16 +2346,21 @@ CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_CDROM=y
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
 # CONFIG_ZRAM_WRITEBACK is not set
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
-CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SKD=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -2317,6 +2396,7 @@ CONFIG_TIFM_CORE=y
 CONFIG_TIFM_7XX1=m
 # CONFIG_ICS932S401 is not set
 CONFIG_ENCLOSURE_SERVICES=m
+# CONFIG_HI6421V600_IRQ is not set
 # CONFIG_HP_ILO is not set
 CONFIG_APDS9802ALS=m
 CONFIG_ISL29003=m
@@ -2328,9 +2408,9 @@ CONFIG_SENSORS_APDS990X=m
 # CONFIG_DS1682 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
+# CONFIG_DW_XDATA_PCIE is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_XILINX_SDFEC is not set
-# CONFIG_PVPANIC is not set
 # CONFIG_HISI_HIKEY_USB is not set
 # CONFIG_C2PORT is not set
 
@@ -2358,18 +2438,16 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # end of Texas Instruments shared transport line discipline
 
 CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
 CONFIG_ALTERA_STAPL=m
 # CONFIG_GENWQE is not set
 CONFIG_ECHO=m
+# CONFIG_BCM_VK is not set
 # CONFIG_MISC_ALCOR_PCI is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISC_RTSX_USB is not set
 # CONFIG_HABANA_AI is not set
 # CONFIG_UACCE is not set
+# CONFIG_PVPANIC is not set
 # end of Misc devices
 
 #
@@ -2377,6 +2455,7 @@ CONFIG_ECHO=m
 #
 CONFIG_SCSI_MOD=y
 CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=y
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
@@ -2389,6 +2468,7 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=y
 CONFIG_CHR_DEV_SG=y
+CONFIG_BLK_DEV_BSG=y
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_CONSTANTS=y
@@ -2440,6 +2520,7 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
 # CONFIG_SCSI_MPT3SAS is not set
 # CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPI3MR is not set
 # CONFIG_SCSI_SMARTPQI is not set
 CONFIG_SCSI_UFSHCD=y
 CONFIG_SCSI_UFSHCD_PCI=m
@@ -2448,6 +2529,7 @@ CONFIG_SCSI_UFSHCD_PLATFORM=y
 # CONFIG_SCSI_UFS_CDNS_PLATFORM is not set
 # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 # CONFIG_SCSI_UFS_BSG is not set
+# CONFIG_SCSI_UFS_HPB is not set
 CONFIG_SCSI_HPTIOP=m
 # CONFIG_SCSI_MYRB is not set
 # CONFIG_SCSI_MYRS is not set
@@ -2458,7 +2540,6 @@ CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
 # CONFIG_SCSI_FDOMAIN_PCI is not set
-# CONFIG_SCSI_GDTH is not set
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
@@ -2477,6 +2558,7 @@ CONFIG_TCM_QLA2XXX=m
 # CONFIG_TCM_QLA2XXX_DEBUG is not set
 CONFIG_SCSI_QLA_ISCSI=m
 # CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_EFCT is not set
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_AM53C974=m
 CONFIG_SCSI_WD719X=m
@@ -2635,6 +2717,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 # CONFIG_DM_MULTIPATH_HST is not set
+# CONFIG_DM_MULTIPATH_IOA is not set
 CONFIG_DM_DELAY=m
 CONFIG_DM_DUST=m
 CONFIG_DM_INIT=y
@@ -2722,11 +2805,12 @@ CONFIG_NET_DSA_MV88E6060=m
 # CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
 # CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set
 CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
 # CONFIG_NET_DSA_MSCC_SEVILLE is not set
 # CONFIG_NET_DSA_AR9331 is not set
 # CONFIG_NET_DSA_SJA1105 is not set
+# CONFIG_NET_DSA_XRS700X_I2C is not set
+# CONFIG_NET_DSA_XRS700X_MDIO is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
@@ -2764,7 +2848,6 @@ CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
-# CONFIG_NET_VENDOR_AURORA is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -2831,7 +2914,10 @@ CONFIG_I40EVF=m
 # CONFIG_ICE is not set
 CONFIG_FM10K=m
 # CONFIG_IGC is not set
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
+CONFIG_NET_VENDOR_LITEX=y
+# CONFIG_LITEX_LITEETH is not set
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
 CONFIG_SKGE=m
@@ -2851,6 +2937,7 @@ CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX5_CORE is not set
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
+# CONFIG_MLXBF_GIGE is not set
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851 is not set
@@ -2925,6 +3012,7 @@ CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_ROCKCHIP=m
 # CONFIG_DWMAC_INTEL_PLAT is not set
+# CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_STMMAC_PCI is not set
 # CONFIG_NET_VENDOR_SUN is not set
 CONFIG_NET_VENDOR_SYNOPSYS=y
@@ -2940,6 +3028,7 @@ CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_VELOCITY=m
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_EMACLITE is not set
 # CONFIG_XILINX_AXI_EMAC is not set
 # CONFIG_XILINX_LL_TEMAC is not set
 # CONFIG_FDDI is not set
@@ -2958,7 +3047,7 @@ CONFIG_SFP=m
 CONFIG_AMD_PHY=m
 # CONFIG_ADIN_PHY is not set
 # CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AX88796B_PHY is not set
+CONFIG_AX88796B_PHY=m
 CONFIG_BROADCOM_PHY=m
 # CONFIG_BCM54140_PHY is not set
 CONFIG_BCM7XXX_PHY=m
@@ -2974,11 +3063,16 @@ CONFIG_LXT_PHY=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88X2222_PHY is not set
+# CONFIG_MAXLINEAR_GPHY is not set
+# CONFIG_MEDIATEK_GE_PHY is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
 # CONFIG_MICROSEMI_PHY is not set
+# CONFIG_MOTORCOMM_PHY is not set
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_AT803X_PHY=m
 CONFIG_QSEMI_PHY=m
@@ -2998,7 +3092,9 @@ CONFIG_VITESSE_PHY=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
 CONFIG_OF_MDIO=y
+CONFIG_ACPI_MDIO=y
 CONFIG_MDIO_DEVRES=y
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BCM_UNIMAC=m
@@ -3087,8 +3183,8 @@ CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 # CONFIG_USB_NET_AQC111 is not set
+# CONFIG_USB_RTL8153_ECM is not set
 CONFIG_WLAN=y
-# CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ADM8211=m
 CONFIG_ATH_COMMON=m
@@ -3248,7 +3344,6 @@ CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_LEDS=y
-CONFIG_PRISM54=m
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
@@ -3275,6 +3370,7 @@ CONFIG_MT7601U=m
 # CONFIG_MT7663U is not set
 # CONFIG_MT7663S is not set
 # CONFIG_MT7915E is not set
+# CONFIG_MT7921E is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
@@ -3362,10 +3458,6 @@ CONFIG_QTNFMAC_PCIE=m
 CONFIG_MAC80211_HWSIM=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_VIRT_WIFI is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
@@ -3377,12 +3469,18 @@ CONFIG_IEEE802154_ATUSB=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 # CONFIG_IEEE802154_HWSIM is not set
+
+#
+# Wireless WAN
+#
+# CONFIG_WWAN is not set
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 # CONFIG_FUJITSU_ES is not set
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -3390,7 +3488,6 @@ CONFIG_NET_FAILOVER=m
 CONFIG_INPUT=y
 CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=m
-# CONFIG_INPUT_POLLDEV is not set
 CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_MATRIXKMAP=y
 
@@ -3445,12 +3542,15 @@ CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_BYD=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
 CONFIG_MOUSE_PS2_CYPRESS=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
 CONFIG_MOUSE_PS2_SENTELIC=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
@@ -3492,25 +3592,23 @@ CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 # CONFIG_JOYSTICK_PSXPAD_SPI is not set
 # CONFIG_JOYSTICK_PXRC is not set
+# CONFIG_JOYSTICK_QWIIC is not set
 # CONFIG_JOYSTICK_FSIA6B is not set
 CONFIG_INPUT_TABLET=y
 CONFIG_TABLET_USB_ACECAD=m
 CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
 CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_PEGASUS=m
 CONFIG_TABLET_SERIAL_WACOM4=m
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_ADC is not set
 # CONFIG_TOUCHSCREEN_AR1021_I2C is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_BU21013 is not set
 # CONFIG_TOUCHSCREEN_BU21029 is not set
 # CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
@@ -3519,38 +3617,40 @@ CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
-CONFIG_TOUCHSCREEN_DYNAPRO=m
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
 # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
 # CONFIG_TOUCHSCREEN_EXC3000 is not set
-CONFIG_TOUCHSCREEN_FUJITSU=m
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GOODIX is not set
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
-CONFIG_TOUCHSCREEN_ILI210X=m
+# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+# CONFIG_TOUCHSCREEN_ILITEK is not set
 # CONFIG_TOUCHSCREEN_S6SY761 is not set
-CONFIG_TOUCHSCREEN_GUNZE=m
+# CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_EKTF2127 is not set
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
+# CONFIG_TOUCHSCREEN_ELAN is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
-CONFIG_TOUCHSCREEN_MTOUCH=m
+# CONFIG_TOUCHSCREEN_MSG2638 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
-# CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -3570,24 +3670,22 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_RM_TS is not set
 # CONFIG_TOUCHSCREEN_SILEAD is not set
 # CONFIG_TOUCHSCREEN_SIS_I2C is not set
-CONFIG_TOUCHSCREEN_ST1232=m
+# CONFIG_TOUCHSCREEN_ST1232 is not set
 # CONFIG_TOUCHSCREEN_STMFTS is not set
 # CONFIG_TOUCHSCREEN_SUR40 is not set
 # CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
 # CONFIG_TOUCHSCREEN_SX8654 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_ZET6223 is not set
-CONFIG_TOUCHSCREEN_ZFORCE=m
-# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
+# CONFIG_TOUCHSCREEN_ZFORCE is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_IQS5XX is not set
 # CONFIG_TOUCHSCREEN_ZINITIX is not set
@@ -3614,9 +3712,11 @@ CONFIG_INPUT_PWM_BEEPER=m
 # CONFIG_INPUT_PWM_VIBRA is not set
 CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+# CONFIG_INPUT_DA7280_HAPTICS is not set
 # CONFIG_INPUT_ADXL34X is not set
 # CONFIG_INPUT_IMS_PCU is not set
 # CONFIG_INPUT_IQS269A is not set
+# CONFIG_INPUT_IQS626A is not set
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 # CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
@@ -3716,9 +3816,9 @@ CONFIG_SERIAL_JSM=m
 # CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
@@ -3732,19 +3832,13 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-CONFIG_SYNCLINKMP=m
 CONFIG_SYNCLINK_GT=m
-# CONFIG_ISI is not set
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 CONFIG_NOZOMI=m
 # CONFIG_NULL_TTY is not set
-# CONFIG_TRACE_SINK is not set
 CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
@@ -3765,19 +3859,18 @@ CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_HW_RANDOM_BA431 is not set
 CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_HISI_V2=y
 CONFIG_HW_RANDOM_CAVIUM=y
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
+CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
 # CONFIG_APPLICOM is not set
 CONFIG_DEVMEM=y
-CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=8192
 CONFIG_DEVPORT=y
 CONFIG_TCG_TPM=y
 CONFIG_HW_RANDOM_TPM=y
 # CONFIG_TCG_TIS is not set
 # CONFIG_TCG_TIS_SPI is not set
+# CONFIG_TCG_TIS_I2C_CR50 is not set
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_INFINEON=m
 # CONFIG_TCG_TIS_I2C_NUVOTON is not set
@@ -3788,15 +3881,16 @@ CONFIG_TCG_ATMEL=m
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 # CONFIG_XILLYBUS is not set
-# end of Character devices
-
+# CONFIG_XILLYUSB is not set
 # CONFIG_RANDOM_TRUST_CPU is not set
 # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
 
 #
 # I2C support
 #
-CONFIG_I2C=m
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
@@ -3863,6 +3957,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+# CONFIG_I2C_HISI is not set
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 CONFIG_I2C_PCA_PLATFORM=m
@@ -3875,6 +3970,7 @@ CONFIG_I2C_SIMTEC=m
 # External I2C/SMBus adapter drivers
 #
 CONFIG_I2C_DIOLAN_U2C=m
+# CONFIG_I2C_CP2615 is not set
 # CONFIG_I2C_ROBOTFUZZ_OSIF is not set
 # CONFIG_I2C_TAOS_EVM is not set
 CONFIG_I2C_TINY_USB=m
@@ -3884,6 +3980,7 @@ CONFIG_I2C_VIPERBOARD=m
 # Other I2C/SMBus bus drivers
 #
 CONFIG_I2C_CROS_EC_TUNNEL=m
+# CONFIG_I2C_VIRTIO is not set
 # end of I2C Hardware Bus support
 
 CONFIG_I2C_STUB=m
@@ -3910,6 +4007,7 @@ CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_HISI_KUNPENG is not set
 # CONFIG_SPI_HISI_SFC_V3XX is not set
 CONFIG_SPI_NXP_FLEXSPI=y
 CONFIG_SPI_GPIO=y
@@ -3918,6 +4016,7 @@ CONFIG_SPI_GPIO=y
 CONFIG_SPI_PL022=y
 # CONFIG_SPI_PXA2XX is not set
 CONFIG_SPI_ROCKCHIP=y
+# CONFIG_SPI_ROCKCHIP_SFC is not set
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_SIFIVE is not set
 # CONFIG_SPI_MXIC is not set
@@ -3941,6 +4040,7 @@ CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_DYNAMIC=y
 CONFIG_SPMI=y
+# CONFIG_SPMI_HISI3670 is not set
 # CONFIG_HSI is not set
 CONFIG_PPS=m
 # CONFIG_PPS_DEBUG is not set
@@ -3960,10 +4060,13 @@ CONFIG_PPS_CLIENT_GPIO=m
 # PTP clock support
 #
 CONFIG_PTP_1588_CLOCK=m
+CONFIG_PTP_1588_CLOCK_OPTIONAL=m
 CONFIG_DP83640_PHY=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
+CONFIG_PTP_1588_CLOCK_KVM=m
 # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
+# CONFIG_PTP_1588_CLOCK_OCP is not set
 # end of PTP clock support
 
 CONFIG_PINCTRL=y
@@ -3978,9 +4081,11 @@ CONFIG_PINCTRL_AMD=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_STMFX is not set
 CONFIG_PINCTRL_RK805=m
 # CONFIG_PINCTRL_OCELOT is not set
+# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 
 #
 # Renesas pinctrl drivers
@@ -4010,10 +4115,12 @@ CONFIG_GPIO_DWAPB=y
 # CONFIG_GPIO_FTGPIO010 is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_HISI is not set
 # CONFIG_GPIO_HLWD is not set
 # CONFIG_GPIO_LOGICVC is not set
 # CONFIG_GPIO_MB86S7X is not set
 CONFIG_GPIO_PL061=y
+CONFIG_GPIO_ROCKCHIP=y
 # CONFIG_GPIO_SAMA5D2_PIOBU is not set
 # CONFIG_GPIO_SIFIVE is not set
 CONFIG_GPIO_SYSCON=y
@@ -4067,8 +4174,14 @@ CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_VIPERBOARD=m
 # end of USB GPIO expanders
 
+#
+# Virtual GPIO drivers
+#
 # CONFIG_GPIO_AGGREGATOR is not set
 # CONFIG_GPIO_MOCKUP is not set
+# CONFIG_GPIO_VIRTIO is not set
+# end of Virtual GPIO drivers
+
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4112,6 +4225,7 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 # CONFIG_POWER_RESET_LTC2952 is not set
+# CONFIG_POWER_RESET_REGULATOR is not set
 CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_XGENE=y
@@ -4136,10 +4250,7 @@ CONFIG_BATTERY_SBS=m
 CONFIG_CHARGER_SBS=m
 CONFIG_MANAGER_SBS=m
 # CONFIG_BATTERY_BQ27XXX is not set
-CONFIG_CHARGER_AXP20X=m
-# CONFIG_BATTERY_AXP20X is not set
 # CONFIG_AXP20X_POWER is not set
-# CONFIG_AXP288_FUEL_GAUGE is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -4149,6 +4260,7 @@ CONFIG_CHARGER_AXP20X=m
 CONFIG_CHARGER_GPIO=y
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_CHARGER_LT3651 is not set
+# CONFIG_CHARGER_LTC4162L is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
@@ -4157,10 +4269,14 @@ CONFIG_CHARGER_GPIO=y
 # CONFIG_CHARGER_BQ2515X is not set
 # CONFIG_CHARGER_BQ25890 is not set
 # CONFIG_CHARGER_BQ25980 is not set
+# CONFIG_CHARGER_BQ256XX is not set
 CONFIG_CHARGER_SMB347=m
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 CONFIG_CHARGER_CROS_USBPD=m
+# CONFIG_CHARGER_CROS_PCHG is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 CONFIG_HWMON=y
@@ -4187,6 +4303,8 @@ CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
+# CONFIG_SENSORS_AHT10 is not set
+# CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set
 # CONFIG_SENSORS_AS370 is not set
 CONFIG_SENSORS_ASC7621=m
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
@@ -4194,6 +4312,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_ASPEED is not set
 CONFIG_SENSORS_ATXP1=m
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
+# CONFIG_SENSORS_CORSAIR_PSU is not set
 # CONFIG_SENSORS_DRIVETEMP is not set
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
@@ -4219,6 +4338,7 @@ CONFIG_SENSORS_LTC2945=m
 # CONFIG_SENSORS_LTC2947_I2C is not set
 # CONFIG_SENSORS_LTC2947_SPI is not set
 # CONFIG_SENSORS_LTC2990 is not set
+# CONFIG_SENSORS_LTC2992 is not set
 CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4222=m
@@ -4226,6 +4346,7 @@ CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4260=m
 CONFIG_SENSORS_LTC4261=m
 # CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX127 is not set
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX1668=m
@@ -4240,6 +4361,7 @@ CONFIG_SENSORS_MAX6697=m
 # CONFIG_SENSORS_MAX31790 is not set
 CONFIG_SENSORS_MCP3021=m
 # CONFIG_SENSORS_TC654 is not set
+# CONFIG_SENSORS_TPS23861 is not set
 # CONFIG_SENSORS_MR75203 is not set
 # CONFIG_SENSORS_ADCXX is not set
 CONFIG_SENSORS_LM63=m
@@ -4266,6 +4388,7 @@ CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 # CONFIG_SENSORS_NPCM7XX is not set
+# CONFIG_SENSORS_NZXT_KRAKEN2 is not set
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
@@ -4273,9 +4396,13 @@ CONFIG_SENSORS_PMBUS=m
 # CONFIG_SENSORS_ADM1266 is not set
 CONFIG_SENSORS_ADM1275=m
 # CONFIG_SENSORS_BEL_PFE is not set
+# CONFIG_SENSORS_BPA_RS600 is not set
+# CONFIG_SENSORS_FSP_3Y is not set
 # CONFIG_SENSORS_IBM_CFFPS is not set
+# CONFIG_SENSORS_DPS920AB is not set
 # CONFIG_SENSORS_INSPUR_IPSPS is not set
 # CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR36021 is not set
 # CONFIG_SENSORS_IR38064 is not set
 # CONFIG_SENSORS_IRPS5401 is not set
 # CONFIG_SENSORS_ISL68137 is not set
@@ -4283,6 +4410,7 @@ CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
 # CONFIG_SENSORS_LTC3815 is not set
+# CONFIG_SENSORS_MAX15301 is not set
 CONFIG_SENSORS_MAX16064=m
 # CONFIG_SENSORS_MAX16601 is not set
 # CONFIG_SENSORS_MAX20730 is not set
@@ -4290,8 +4418,13 @@ CONFIG_SENSORS_MAX16064=m
 # CONFIG_SENSORS_MAX31785 is not set
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_MP2888 is not set
 # CONFIG_SENSORS_MP2975 is not set
+# CONFIG_SENSORS_PIM4328 is not set
+# CONFIG_SENSORS_PM6764TR is not set
 # CONFIG_SENSORS_PXE1610 is not set
+# CONFIG_SENSORS_Q54SJ108A2 is not set
+# CONFIG_SENSORS_STPDDC60 is not set
 CONFIG_SENSORS_TPS40422=m
 # CONFIG_SENSORS_TPS53679 is not set
 CONFIG_SENSORS_UCD9000=m
@@ -4299,9 +4432,12 @@ CONFIG_SENSORS_UCD9200=m
 # CONFIG_SENSORS_XDPE122 is not set
 CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_SBTSI is not set
+# CONFIG_SENSORS_SBRMI is not set
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
+# CONFIG_SENSORS_SHT4x is not set
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_DME1737=m
@@ -4381,6 +4517,7 @@ CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_WATCHDOG_SYSFS is not set
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set
 
 #
 # Watchdog Pretimeout Governors
@@ -4443,6 +4580,10 @@ CONFIG_BCMA_DRIVER_GPIO=y
 #
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_ACT8945A is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
 # CONFIG_MFD_BCM590XX is not set
@@ -4451,7 +4592,10 @@ CONFIG_MFD_AXP20X=m
 CONFIG_MFD_AXP20X_I2C=m
 CONFIG_MFD_CROS_EC_DEV=y
 # CONFIG_MFD_MADERA is not set
+# CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
@@ -4461,65 +4605,98 @@ CONFIG_MFD_CROS_EC_DEV=y
 # CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_MFD_MP2629 is not set
 # CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_HI6421_SPMI is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
+# CONFIG_MFD_INTEL_PMT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77620 is not set
 # CONFIG_MFD_MAX77650 is not set
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
 # CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_MT6360 is not set
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_MENF21BMC is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_MFD_CPCAP is not set
 CONFIG_MFD_VIPERBOARD=m
+# CONFIG_MFD_NTXEC is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
-# CONFIG_UCB1400_CORE is not set
 # CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RT4831 is not set
 # CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RC5T583 is not set
 CONFIG_MFD_RK808=m
 # CONFIG_MFD_RN5T618 is not set
+# CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_SKY81452 is not set
-# CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_TI_LMU is not set
+# CONFIG_MFD_PALMAS is not set
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TI_LP87565 is not set
 # CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
 CONFIG_MFD_WL1273_CORE=m
 # CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TQMX86 is not set
 CONFIG_MFD_VX855=m
+# CONFIG_MFD_LOCHNAGAR is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
+# CONFIG_MFD_ROHM_BD71828 is not set
+# CONFIG_MFD_ROHM_BD957XMUF is not set
+# CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
+# CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_KHADAS_MCU is not set
+# CONFIG_MFD_QCOM_PM8008 is not set
 CONFIG_MFD_VEXPRESS_SYSREG=y
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_INTEL_M10_BMC is not set
+# CONFIG_MFD_RSMU_I2C is not set
+# CONFIG_MFD_RSMU_SPI is not set
 # end of Multifunction device drivers
 
 CONFIG_REGULATOR=y
@@ -4532,6 +4709,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_AD5398 is not set
 CONFIG_REGULATOR_AXP20X=m
 # CONFIG_REGULATOR_CROS_EC is not set
+# CONFIG_REGULATOR_DA9121 is not set
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
 CONFIG_REGULATOR_FAN53555=m
@@ -4548,6 +4726,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8893 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
 # CONFIG_REGULATOR_MAX77826 is not set
@@ -4557,7 +4736,9 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MP886X is not set
 # CONFIG_REGULATOR_MPQ7920 is not set
 # CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_MT6315 is not set
 # CONFIG_REGULATOR_PCA9450 is not set
+# CONFIG_REGULATOR_PF8X00 is not set
 CONFIG_REGULATOR_PFUZE100=m
 # CONFIG_REGULATOR_PV88060 is not set
 # CONFIG_REGULATOR_PV88080 is not set
@@ -4568,7 +4749,11 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
 CONFIG_REGULATOR_RK808=m
 # CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RT6160 is not set
+# CONFIG_REGULATOR_RT6245 is not set
+# CONFIG_REGULATOR_RTQ2134 is not set
 # CONFIG_REGULATOR_RTMV20 is not set
+# CONFIG_REGULATOR_RTQ6752 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
@@ -4652,13 +4837,13 @@ CONFIG_MEDIA_TEST_SUPPORT=y
 #
 CONFIG_VIDEO_DEV=y
 CONFIG_MEDIA_CONTROLLER=y
-CONFIG_DVB_CORE=m
+CONFIG_DVB_CORE=y
 # end of Media core support
 
 #
 # Video4Linux options
 #
-CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_V4L2_I2C=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -4697,7 +4882,6 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 #
 # Media drivers
 #
-CONFIG_TTPCI_EEPROM=m
 CONFIG_MEDIA_USB_SUPPORT=y
 
 #
@@ -4874,7 +5058,6 @@ CONFIG_VIDEO_TW68=m
 # Media capture/analog TV support
 #
 CONFIG_VIDEO_IVTV=m
-# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV_ALSA=m
 CONFIG_VIDEO_FB_IVTV=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
@@ -4910,14 +5093,10 @@ CONFIG_VIDEO_SAA7164=m
 #
 # Media digital TV PCI Adapters
 #
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
 CONFIG_DVB_B2C2_FLEXCOP_PCI=m
 # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
 CONFIG_DVB_PLUTO2=m
@@ -4960,6 +5139,7 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 #
 CONFIG_VIDEO_CX2341X=m
 CONFIG_VIDEO_TVEEPROM=m
+CONFIG_TTPCI_EEPROM=m
 CONFIG_CYPRESS_FIRMWARE=m
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_V4L2=m
@@ -4979,6 +5159,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_CADENCE is not set
 # CONFIG_VIDEO_ASPEED is not set
 # CONFIG_VIDEO_MUX is not set
+# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
 # CONFIG_VIDEO_XILINX is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
@@ -5106,13 +5287,18 @@ CONFIG_VIDEO_M52790=m
 # Camera sensor devices
 #
 # CONFIG_VIDEO_HI556 is not set
+# CONFIG_VIDEO_IMX208 is not set
 # CONFIG_VIDEO_IMX214 is not set
 # CONFIG_VIDEO_IMX219 is not set
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX334 is not set
+# CONFIG_VIDEO_IMX335 is not set
 # CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_IMX412 is not set
+# CONFIG_VIDEO_OV02A10 is not set
 # CONFIG_VIDEO_OV2640 is not set
 # CONFIG_VIDEO_OV2659 is not set
 # CONFIG_VIDEO_OV2680 is not set
@@ -5121,6 +5307,7 @@ CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_OV5640 is not set
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV5648 is not set
 # CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV5670 is not set
 # CONFIG_VIDEO_OV5675 is not set
@@ -5131,8 +5318,11 @@ CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_OV7670 is not set
 # CONFIG_VIDEO_OV7740 is not set
 # CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV8865 is not set
+# CONFIG_VIDEO_OV9282 is not set
 # CONFIG_VIDEO_OV9640 is not set
 # CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV9734 is not set
 # CONFIG_VIDEO_OV13858 is not set
 # CONFIG_VIDEO_VS6624 is not set
 # CONFIG_VIDEO_MT9M001 is not set
@@ -5148,12 +5338,13 @@ CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_NOON010PC30 is not set
 # CONFIG_VIDEO_M5MOLS is not set
 # CONFIG_VIDEO_RDACM20 is not set
+# CONFIG_VIDEO_RDACM21 is not set
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_S5K6AA is not set
 # CONFIG_VIDEO_S5K6A3 is not set
 # CONFIG_VIDEO_S5K4ECGX is not set
 # CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
 # CONFIG_VIDEO_S5C73M3 is not set
 # end of Camera sensor devices
@@ -5188,7 +5379,7 @@ CONFIG_VIDEO_M52790=m
 CONFIG_CXD2880_SPI_DRV=m
 # end of Media SPI Adapters
 
-CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER=y
 
 #
 # Customize TV tuners
@@ -5291,7 +5482,6 @@ CONFIG_DVB_TDA10071=m
 #
 # DVB-T (terrestrial) frontends
 #
-CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
@@ -5346,6 +5536,7 @@ CONFIG_DVB_AU8522=m
 CONFIG_DVB_AU8522_DTV=m
 CONFIG_DVB_AU8522_V4L=m
 CONFIG_DVB_S5H1411=m
+CONFIG_DVB_MXL692=m
 
 #
 # ISDB-T (terrestrial) frontends
@@ -5410,24 +5601,19 @@ CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_BUS=m
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TTM_DMA_PAGE_POOL=y
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_TTM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
 #
@@ -5455,39 +5641,44 @@ CONFIG_DRM_VGEM=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
-# CONFIG_ROCKCHIP_CDN_DP is not set
+CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
 CONFIG_ROCKCHIP_RGB=y
 # CONFIG_ROCKCHIP_RK3066_HDMI is not set
+# CONFIG_DRM_VMWGFX is not set
 CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
+# CONFIG_DRM_QXL is not set
+# CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_PANEL=y
 
 #
 # Display Panels
 #
+# CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
+# CONFIG_DRM_PANEL_DSI_CM is not set
 # CONFIG_DRM_PANEL_LVDS is not set
 CONFIG_DRM_PANEL_SIMPLE=m
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+# CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
@@ -5496,6 +5687,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@@ -5506,12 +5698,15 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
@@ -5521,11 +5716,13 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
+# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
+# CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 # end of Display Panels
 
@@ -5536,9 +5733,14 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
+# CONFIG_DRM_CROS_EC_ANX7688 is not set
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_LONTIUM_LT8912B is not set
 # CONFIG_DRM_LONTIUM_LT9611 is not set
+# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_ITE_IT66121 is not set
 # CONFIG_DRM_LVDS_CODEC is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_NWL_MIPI_DSI is not set
@@ -5556,11 +5758,13 @@ CONFIG_DRM_TOSHIBA_TC358767=m
 # CONFIG_DRM_TOSHIBA_TC358768 is not set
 # CONFIG_DRM_TOSHIBA_TC358775 is not set
 CONFIG_DRM_TI_TFP410=m
+# CONFIG_DRM_TI_SN65DSI83 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
 # CONFIG_DRM_TI_TPD12S015 is not set
 # CONFIG_DRM_ANALOGIX_ANX6345 is not set
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_ANALOGIX_DP=m
+# CONFIG_DRM_ANALOGIX_ANX7625 is not set
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
@@ -5573,12 +5777,14 @@ CONFIG_DRM_DW_MIPI_DSI=m
 # end of Display Interface Bridges
 
 # CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_HISI_HIBMC is not set
-CONFIG_DRM_HISI_KIRIN=m
+# CONFIG_DRM_HISI_KIRIN is not set
 # CONFIG_DRM_MXSFB is not set
-CONFIG_DRM_CIRRUS_QEMU=m
+# CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_BOCHS is not set
+# CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_GM12U320 is not set
+# CONFIG_DRM_SIMPLEDRM is not set
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9225 is not set
 # CONFIG_TINYDRM_ILI9341 is not set
@@ -5587,16 +5793,12 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_TINYDRM_REPAPER is not set
 # CONFIG_TINYDRM_ST7586 is not set
 # CONFIG_TINYDRM_ST7735R is not set
-CONFIG_DRM_PL111=m
+# CONFIG_DRM_PL111 is not set
 # CONFIG_DRM_LIMA is not set
 CONFIG_DRM_PANFROST=m
 # CONFIG_DRM_TIDSS is not set
-CONFIG_DRM_LEGACY=y
-# CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_VIA is not set
-# CONFIG_DRM_SAVAGE is not set
+# CONFIG_DRM_GUD is not set
+# CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 
 #
@@ -5687,7 +5889,7 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_ADP8870 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
-CONFIG_BACKLIGHT_LP855X=m
+# CONFIG_BACKLIGHT_LP855X is not set
 CONFIG_BACKLIGHT_GPIO=m
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
@@ -5705,6 +5907,7 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@@ -5742,20 +5945,17 @@ CONFIG_SND_DEBUG=y
 CONFIG_SND_DEBUG_VERBOSE=y
 # CONFIG_SND_PCM_XRUN_DEBUG is not set
 # CONFIG_SND_CTL_VALIDATION is not set
+# CONFIG_SND_JACK_INJECTION_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_CTL_LED=m
 CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
 # CONFIG_SND_SEQUENCER_OSS is not set
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_SEQ_MIDI_EVENT=m
 CONFIG_SND_SEQ_MIDI=m
-CONFIG_SND_SEQ_MIDI_EMUL=m
 CONFIG_SND_SEQ_VIRMIDI=m
 CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_DRIVERS=y
 CONFIG_SND_DUMMY=m
 CONFIG_SND_ALOOP=m
@@ -5763,75 +5963,70 @@ CONFIG_SND_VIRMIDI=m
 # CONFIG_SND_MTPAV is not set
 CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_MPU401=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
+# CONFIG_SND_AD1889 is not set
 # CONFIG_SND_ALS300 is not set
 # CONFIG_SND_ALI5451 is not set
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
 # CONFIG_SND_AW2 is not set
 # CONFIG_SND_AZT3328 is not set
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
 # CONFIG_SND_EMU10K1 is not set
 # CONFIG_SND_EMU10K1X is not set
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
 # CONFIG_SND_ICE1712 is not set
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
 # CONFIG_SND_MAESTRO3 is not set
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SE6X is not set
 # CONFIG_SND_SONICVIBES is not set
 # CONFIG_SND_TRIDENT is not set
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
 
 #
 # HD-Audio
@@ -5850,6 +6045,7 @@ CONFIG_SND_HDA_CODEC_SIGMATEL=m
 CONFIG_SND_HDA_CODEC_VIA=m
 CONFIG_SND_HDA_CODEC_HDMI=m
 CONFIG_SND_HDA_CODEC_CIRRUS=m
+# CONFIG_SND_HDA_CODEC_CS8409 is not set
 CONFIG_SND_HDA_CODEC_CONEXANT=m
 CONFIG_SND_HDA_CODEC_CA0110=m
 CONFIG_SND_HDA_CODEC_CA0132=m
@@ -5866,26 +6062,24 @@ CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_INTEL_NHLT=y
 CONFIG_SND_INTEL_DSP_CONFIG=m
-CONFIG_SND_SPI=y
+CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m
+# CONFIG_SND_SPI is not set
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_HIFACE is not set
 # CONFIG_SND_BCD2000 is not set
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
+# CONFIG_SND_USB_POD is not set
+# CONFIG_SND_USB_PODHD is not set
+# CONFIG_SND_USB_TONEPORT is not set
+# CONFIG_SND_USB_VARIAX is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-CONFIG_SND_SOC_AMD_ACP=m
-# CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
-# CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
+# CONFIG_SND_SOC_ADI is not set
+# CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_ATMEL_SOC is not set
 # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
 # CONFIG_SND_DESIGNWARE_I2S is not set
@@ -5904,6 +6098,8 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 # CONFIG_SND_SOC_FSL_MICFIL is not set
+# CONFIG_SND_SOC_FSL_XCVR is not set
+# CONFIG_SND_SOC_FSL_RPMSG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # end of SoC Audio for Freescale CPUs
 
@@ -5929,13 +6125,14 @@ CONFIG_SND_SOC_RK3399_GRU_SOUND=m
 # CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
 # CONFIG_SND_SOC_XILINX_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
-# CONFIG_ZX_TDM is not set
-CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_I2C_AND_SPI=y
 
 #
 # CODEC drivers
 #
 # CONFIG_SND_SOC_AC97_CODEC is not set
+# CONFIG_SND_SOC_ADAU1372_I2C is not set
+# CONFIG_SND_SOC_ADAU1372_SPI is not set
 # CONFIG_SND_SOC_ADAU1701 is not set
 # CONFIG_SND_SOC_ADAU1761_I2C is not set
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
@@ -5953,7 +6150,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 # CONFIG_SND_SOC_BT_SCO is not set
-CONFIG_SND_SOC_CROS_EC_CODEC=m
+# CONFIG_SND_SOC_CROS_EC_CODEC is not set
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 # CONFIG_SND_SOC_CS35L34 is not set
@@ -5986,6 +6183,7 @@ CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_ICS43432 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 CONFIG_SND_SOC_MAX98090=m
@@ -5996,8 +6194,8 @@ CONFIG_SND_SOC_MAX98357A=m
 # CONFIG_SND_SOC_MAX98373_I2C is not set
 # CONFIG_SND_SOC_MAX98390 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=y
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=y
+# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM1789_I2C is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
@@ -6006,23 +6204,27 @@ CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=y
 # CONFIG_SND_SOC_PCM186X_SPI is not set
 # CONFIG_SND_SOC_PCM3060_I2C is not set
 # CONFIG_SND_SOC_PCM3060_SPI is not set
-CONFIG_SND_SOC_PCM3168A=m
-CONFIG_SND_SOC_PCM3168A_I2C=m
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM5102A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
-CONFIG_SND_SOC_RK3328=m
+# CONFIG_SND_SOC_RK3328 is not set
+# CONFIG_SND_SOC_RK817 is not set
 CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5514_SPI=m
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
+# CONFIG_SND_SOC_RT5640 is not set
 CONFIG_SND_SOC_RT5645=m
+# CONFIG_SND_SOC_RT5659 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
+# CONFIG_SND_SOC_SIMPLE_MUX is not set
 # CONFIG_SND_SOC_SPDIF is not set
 # CONFIG_SND_SOC_SSM2305 is not set
+# CONFIG_SND_SOC_SSM2518 is not set
 # CONFIG_SND_SOC_SSM2602_SPI is not set
 # CONFIG_SND_SOC_SSM2602_I2C is not set
 # CONFIG_SND_SOC_SSM4567 is not set
@@ -6039,12 +6241,14 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_TAS6424 is not set
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
+# CONFIG_SND_SOC_TFA989X is not set
 # CONFIG_SND_SOC_TLV320AIC23_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC23_SPI is not set
 # CONFIG_SND_SOC_TLV320AIC31XX is not set
 # CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC3X is not set
+# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
 # CONFIG_SND_SOC_TLV320ADCX140 is not set
 CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_TSCS42XX is not set
@@ -6074,22 +6278,26 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_WM8978 is not set
 # CONFIG_SND_SOC_WM8985 is not set
 # CONFIG_SND_SOC_ZL38060 is not set
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
 # CONFIG_SND_SOC_MAX9759 is not set
 # CONFIG_SND_SOC_MT6351 is not set
 # CONFIG_SND_SOC_MT6358 is not set
 # CONFIG_SND_SOC_MT6660 is not set
+# CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 # CONFIG_SND_SOC_NAU8824 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
+# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
+# CONFIG_SND_SOC_LPASS_TX_MACRO is not set
 # end of CODEC drivers
 
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_AC97_BUS=m
+# CONFIG_SND_VIRTIO is not set
 
 #
 # HID support
@@ -6131,6 +6339,7 @@ CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=m
+# CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GFRM=m
 # CONFIG_HID_GLORIOUS is not set
@@ -6181,11 +6390,13 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PLANTRONICS=m
+# CONFIG_HID_PLAYSTATION is not set
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_RETRODE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SONY=m
 CONFIG_SONY_FF=y
 CONFIG_HID_SPEEDLINK=m
@@ -6227,7 +6438,9 @@ CONFIG_USB_HIDDEV=y
 #
 # I2C HID support
 #
-CONFIG_I2C_HID=m
+# CONFIG_I2C_HID_ACPI is not set
+# CONFIG_I2C_HID_OF is not set
+# CONFIG_I2C_HID_OF_GOODIX is not set
 # end of I2C HID support
 # end of HID support
 
@@ -6332,7 +6545,7 @@ CONFIG_USBIP_VHCI_NR_HCS=1
 CONFIG_USBIP_HOST=m
 CONFIG_USBIP_VUDC=m
 # CONFIG_USBIP_DEBUG is not set
-# CONFIG_USB_CDNS3 is not set
+# CONFIG_USB_CDNS_SUPPORT is not set
 CONFIG_USB_MUSB_HDRC=y
 # CONFIG_USB_MUSB_HOST is not set
 # CONFIG_USB_MUSB_GADGET is not set
@@ -6432,7 +6645,6 @@ CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SYMBOL=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_WWAN=m
 CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_SERIAL_OMNINET=m
@@ -6442,6 +6654,7 @@ CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_UPD78F0730=m
+# CONFIG_USB_SERIAL_XR is not set
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
@@ -6600,11 +6813,12 @@ CONFIG_TYPEC_TCPM=y
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_TYPEC_RT1711H is not set
 # CONFIG_TYPEC_TCPCI_MAXIM is not set
-CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_FUSB302=y
 # CONFIG_TYPEC_UCSI is not set
-# CONFIG_TYPEC_HD3SS3220 is not set
 # CONFIG_TYPEC_TPS6598X is not set
+# CONFIG_TYPEC_HD3SS3220 is not set
 # CONFIG_TYPEC_STUSB160X is not set
+CONFIG_TYPEC_EXTCON=y
 
 #
 # USB Type-C Multiplexer/DeMultiplexer Switch support
@@ -6695,9 +6909,7 @@ CONFIG_LEDS_CLASS_FLASH=m
 #
 # LED drivers
 #
-# CONFIG_LEDS_AAT1290 is not set
 # CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_AS3645A is not set
 # CONFIG_LEDS_AW2013 is not set
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
@@ -6707,7 +6919,6 @@ CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM3532 is not set
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_LM3692X is not set
-# CONFIG_LEDS_LM3601X is not set
 # CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_LP3944=m
@@ -6726,7 +6937,6 @@ CONFIG_LEDS_LT3593=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
 # CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_KTD2692 is not set
 # CONFIG_LEDS_IS31FL319X is not set
 # CONFIG_LEDS_IS31FL32XX is not set
 
@@ -6739,6 +6949,16 @@ CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_USER=m
 # CONFIG_LEDS_SPI_BYTE is not set
 # CONFIG_LEDS_TI_LMU_COMMON is not set
+
+#
+# Flash and Torch LED drivers
+#
+# CONFIG_LEDS_AAT1290 is not set
+# CONFIG_LEDS_AS3645A is not set
+# CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_RT4505 is not set
+# CONFIG_LEDS_RT8515 is not set
 # CONFIG_LEDS_SGM3140 is not set
 
 #
@@ -6765,6 +6985,7 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=y
 CONFIG_LEDS_TRIGGER_PATTERN=m
 CONFIG_LEDS_TRIGGER_AUDIO=m
+# CONFIG_LEDS_TRIGGER_TTY is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 
@@ -6844,12 +7065,11 @@ CONFIG_RTC_DRV_EM3027=m
 # CONFIG_RTC_DRV_MAX6916 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RX4581 is not set
-# CONFIG_RTC_DRV_RX6110 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_PCF2123 is not set
 # CONFIG_RTC_DRV_MCP795 is not set
-CONFIG_RTC_I2C_AND_SPI=m
+CONFIG_RTC_I2C_AND_SPI=y
 
 #
 # SPI and I2C RTC drivers
@@ -6859,6 +7079,7 @@ CONFIG_RTC_DRV_DS3232_HWMON=y
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_RV3029C2=m
 CONFIG_RTC_DRV_RV3029_HWMON=y
+# CONFIG_RTC_DRV_RX6110 is not set
 
 #
 # Platform RTC drivers
@@ -6899,6 +7120,7 @@ CONFIG_RTC_DRV_PL031=y
 # HID Sensor RTC drivers
 #
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+# CONFIG_RTC_DRV_GOLDFISH is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -6943,14 +7165,17 @@ CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
 # CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
 # end of DMABUF options
 
 CONFIG_AUXDISPLAY=y
 # CONFIG_HD44780 is not set
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_HT16K33 is not set
+# CONFIG_LCD2S is not set
 # CONFIG_CHARLCD_BL_OFF is not set
 # CONFIG_CHARLCD_BL_ON is not set
 CONFIG_CHARLCD_BL_FLASH=y
@@ -6964,13 +7189,14 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
+CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
 # CONFIG_VFIO_NOIOMMU is not set
-CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_CORE=m
 CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PLATFORM=m
 CONFIG_VFIO_AMBA=m
 CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m
@@ -6978,6 +7204,7 @@ CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m
 # CONFIG_VFIO_MDEV is not set
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI_LIB=y
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
@@ -6986,7 +7213,6 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
 # CONFIG_VDPA is not set
 CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST=m
@@ -6999,22 +7225,18 @@ CONFIG_VHOST_VSOCK=m
 #
 # Microsoft Hyper-V guest support
 #
+# CONFIG_HYPERV is not set
 # end of Microsoft Hyper-V guest support
 
 # CONFIG_GREYBUS is not set
-CONFIG_STAGING=y
-CONFIG_PRISM2_USB=m
 # CONFIG_COMEDI is not set
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
+CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTLLIB is not set
 # CONFIG_RTL8723BS is not set
-CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
+# CONFIG_R8712U is not set
+# CONFIG_R8188EU is not set
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@@ -7048,7 +7270,6 @@ CONFIG_ADT7316_I2C=m
 #
 # Capacitance to digital converters
 #
-CONFIG_AD7150=m
 CONFIG_AD7746=m
 # end of Capacitance to digital converters
 
@@ -7086,68 +7307,30 @@ CONFIG_VIDEO_HANTRO=m
 CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 CONFIG_VIDEO_ROCKCHIP_VDEC=m
 # CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_SP8870=m
 
 #
 # Android
 #
 CONFIG_ASHMEM=y
-# CONFIG_ION is not set
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
-CONFIG_FB_TFT=m
-CONFIG_FB_TFT_AGM1264K_FL=m
-CONFIG_FB_TFT_BD663474=m
-CONFIG_FB_TFT_HX8340BN=m
-CONFIG_FB_TFT_HX8347D=m
-CONFIG_FB_TFT_HX8353D=m
-CONFIG_FB_TFT_HX8357D=m
-CONFIG_FB_TFT_ILI9163=m
-CONFIG_FB_TFT_ILI9320=m
-CONFIG_FB_TFT_ILI9325=m
-CONFIG_FB_TFT_ILI9340=m
-CONFIG_FB_TFT_ILI9341=m
-CONFIG_FB_TFT_ILI9481=m
-CONFIG_FB_TFT_ILI9486=m
-CONFIG_FB_TFT_PCD8544=m
-CONFIG_FB_TFT_RA8875=m
-CONFIG_FB_TFT_S6D02A1=m
-CONFIG_FB_TFT_S6D1121=m
-# CONFIG_FB_TFT_SEPS525 is not set
-CONFIG_FB_TFT_SH1106=m
-CONFIG_FB_TFT_SSD1289=m
-CONFIG_FB_TFT_SSD1305=m
-CONFIG_FB_TFT_SSD1306=m
-CONFIG_FB_TFT_SSD1331=m
-CONFIG_FB_TFT_SSD1351=m
-CONFIG_FB_TFT_ST7735R=m
-CONFIG_FB_TFT_ST7789V=m
-CONFIG_FB_TFT_TINYLCD=m
-CONFIG_FB_TFT_TLS8204=m
-CONFIG_FB_TFT_UC1611=m
-CONFIG_FB_TFT_UC1701=m
-CONFIG_FB_TFT_UPD161704=m
-CONFIG_FB_TFT_WATTEROTT=m
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+# CONFIG_FB_TFT is not set
 # CONFIG_KS7010 is not set
 # CONFIG_PI433 is not set
-
-#
-# Gasket devices
-#
-# CONFIG_STAGING_GASKET_FRAMEWORK is not set
-# end of Gasket devices
-
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
-# CONFIG_KPC2000 is not set
 # CONFIG_QLGE is not set
 # CONFIG_WFX is not set
-# CONFIG_SPMI_HISI3670 is not set
-# CONFIG_MFD_HI6421_SPMI is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_TBMC=m
@@ -7167,10 +7350,20 @@ CONFIG_CROS_EC_TYPEC=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CROS_USBPD_NOTIFY=y
 # CONFIG_MELLANOX_PLATFORM is not set
+# CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
+
+#
+# Clock driver for ARM Reference designs
+#
+# CONFIG_ICST is not set
+# CONFIG_CLK_SP810 is not set
+# CONFIG_CLK_VEXPRESS_OSC is not set
+# end of Clock driver for ARM Reference designs
+
+# CONFIG_LMK04832 is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SCPI=y
@@ -7182,22 +7375,19 @@ CONFIG_COMMON_CLK_SCPI=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_CLK_QORIQ is not set
+# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=y
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_COMMON_CLK_ROCKCHIP=y
-CONFIG_CLK_PX30=y
-CONFIG_CLK_RV110X=y
-CONFIG_CLK_RK3036=y
-CONFIG_CLK_RK312X=y
-CONFIG_CLK_RK3188=y
-CONFIG_CLK_RK322X=y
-CONFIG_CLK_RK3308=y
-CONFIG_CLK_RK3328=y
-CONFIG_CLK_RK3368=y
+# CONFIG_CLK_PX30 is not set
+# CONFIG_CLK_RK3308 is not set
+# CONFIG_CLK_RK3328 is not set
+# CONFIG_CLK_RK3368 is not set
 CONFIG_CLK_RK3399=y
+# CONFIG_CLK_RK3568 is not set
+# CONFIG_XILINX_VCU is not set
 CONFIG_HWSPINLOCK=y
 
 #
@@ -7219,6 +7409,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 
 CONFIG_MAILBOX=y
 CONFIG_ARM_MHU=y
+# CONFIG_ARM_MHU_V2 is not set
 CONFIG_PLATFORM_MHU=y
 # CONFIG_PL320_MBOX is not set
 CONFIG_ROCKCHIP_MBOX=y
@@ -7240,6 +7431,8 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # end of Generic IOMMU Pagetable Support
 
 # CONFIG_IOMMU_DEBUGFS is not set
+CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
@@ -7263,6 +7456,7 @@ CONFIG_REMOTEPROC=y
 #
 CONFIG_RPMSG=y
 CONFIG_RPMSG_CHAR=y
+# CONFIG_RPMSG_NS is not set
 CONFIG_RPMSG_QCOM_GLINK=y
 CONFIG_RPMSG_QCOM_GLINK_RPM=y
 # CONFIG_RPMSG_VIRTIO is not set
@@ -7279,11 +7473,6 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y
 #
 # end of Amlogic SoC drivers
 
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
 #
 # Broadcom SoC drivers
 #
@@ -7302,6 +7491,12 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y
 #
 # end of i.MX SoC drivers
 
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
 #
 # Qualcomm SoC drivers
 #
@@ -7315,7 +7510,6 @@ CONFIG_ROCKCHIP_PM_DOMAINS=y
 #
 # Xilinx SoC drivers
 #
-# CONFIG_XILINX_VCU is not set
 # end of Xilinx SoC drivers
 # end of SOC (System On Chip) specific Drivers
 
@@ -7350,6 +7544,7 @@ CONFIG_EXTCON_GPIO=y
 # CONFIG_EXTCON_SM5502 is not set
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON_USBC_CROS_EC=y
+# CONFIG_EXTCON_USBC_TUSB320 is not set
 CONFIG_MEMORY=y
 # CONFIG_ARM_PL172_MPMC is not set
 CONFIG_IIO=y
@@ -7370,118 +7565,109 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 #
 # Accelerometers
 #
-CONFIG_ADIS16201=m
-CONFIG_ADIS16209=m
-CONFIG_ADXL345=m
-CONFIG_ADXL345_I2C=m
-CONFIG_ADXL345_SPI=m
-CONFIG_ADXL372=m
-CONFIG_ADXL372_SPI=m
-CONFIG_ADXL372_I2C=m
-CONFIG_BMA180=m
-CONFIG_BMA220=m
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADXL345_I2C is not set
+# CONFIG_ADXL345_SPI is not set
+# CONFIG_ADXL372_SPI is not set
+# CONFIG_ADXL372_I2C is not set
+# CONFIG_BMA180 is not set
+# CONFIG_BMA220 is not set
 # CONFIG_BMA400 is not set
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_BMC150_ACCEL_SPI=m
-CONFIG_DA280=m
-CONFIG_DA311=m
-CONFIG_DMARD06=m
-CONFIG_DMARD09=m
-CONFIG_DMARD10=m
-CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
-CONFIG_KXSD9=m
-CONFIG_KXSD9_SPI=m
-CONFIG_KXSD9_I2C=m
-CONFIG_KXCJK1013=m
-CONFIG_MC3230=m
-CONFIG_MMA7455=m
-CONFIG_MMA7455_I2C=m
-CONFIG_MMA7455_SPI=m
-CONFIG_MMA7660=m
-CONFIG_MMA8452=m
-CONFIG_MMA9551_CORE=m
-CONFIG_MMA9551=m
-CONFIG_MMA9553=m
-CONFIG_MXC4005=m
-CONFIG_MXC6255=m
-CONFIG_SCA3000=m
-CONFIG_STK8312=m
-CONFIG_STK8BA50=m
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_BMI088_ACCEL is not set
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
+# CONFIG_FXLS8962AF_I2C is not set
+# CONFIG_FXLS8962AF_SPI is not set
+# CONFIG_HID_SENSOR_ACCEL_3D is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
+# CONFIG_MMA7660 is not set
+# CONFIG_MMA8452 is not set
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_SCA3300 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
 # end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_AD7091R5 is not set
-CONFIG_AD7124=m
-CONFIG_AD7192=m
-CONFIG_AD7266=m
-CONFIG_AD7291=m
+# CONFIG_AD7124 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
-CONFIG_AD7298=m
-CONFIG_AD7476=m
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-CONFIG_AD7606_IFACE_SPI=m
-CONFIG_AD7766=m
-CONFIG_AD7768_1=m
-CONFIG_AD7780=m
-CONFIG_AD7791=m
-CONFIG_AD7793=m
-CONFIG_AD7887=m
-CONFIG_AD7923=m
-CONFIG_AD7949=m
-CONFIG_AD799X=m
-# CONFIG_AD9467 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606_IFACE_PARALLEL is not set
+# CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7766 is not set
+# CONFIG_AD7768_1 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD7949 is not set
+# CONFIG_AD799X is not set
 # CONFIG_ADI_AXI_ADC is not set
-CONFIG_AXP20X_ADC=m
-CONFIG_AXP288_ADC=m
-CONFIG_CC10001_ADC=m
-CONFIG_ENVELOPE_DETECTOR=m
-CONFIG_HI8435=m
-CONFIG_HX711=m
-CONFIG_INA2XX_ADC=m
-CONFIG_LTC2471=m
-CONFIG_LTC2485=m
+# CONFIG_AXP20X_ADC is not set
+# CONFIG_AXP288_ADC is not set
+# CONFIG_CC10001_ADC is not set
+# CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_HI8435 is not set
+# CONFIG_HX711 is not set
+# CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2471 is not set
+# CONFIG_LTC2485 is not set
 # CONFIG_LTC2496 is not set
-CONFIG_LTC2497=m
-CONFIG_MAX1027=m
-CONFIG_MAX11100=m
-CONFIG_MAX1118=m
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
 # CONFIG_MAX1241 is not set
-CONFIG_MAX1363=m
-CONFIG_MAX9611=m
-CONFIG_MCP320X=m
-CONFIG_MCP3422=m
-CONFIG_MCP3911=m
-CONFIG_NAU7802=m
-CONFIG_QCOM_VADC_COMMON=y
-CONFIG_QCOM_SPMI_IADC=m
-CONFIG_QCOM_SPMI_VADC=y
-CONFIG_QCOM_SPMI_ADC5=m
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX9611 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP3911 is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_QCOM_SPMI_IADC is not set
+# CONFIG_QCOM_SPMI_VADC is not set
+# CONFIG_QCOM_SPMI_ADC5 is not set
 CONFIG_ROCKCHIP_SARADC=m
-CONFIG_SD_ADC_MODULATOR=m
-CONFIG_TI_ADC081C=m
-CONFIG_TI_ADC0832=m
-CONFIG_TI_ADC084S021=m
-CONFIG_TI_ADC12138=m
-CONFIG_TI_ADC108S102=m
-CONFIG_TI_ADC128S052=m
-CONFIG_TI_ADC161S626=m
-CONFIG_TI_ADS1015=m
-CONFIG_TI_ADS7950=m
-CONFIG_TI_ADS8344=m
-CONFIG_TI_ADS8688=m
-CONFIG_TI_ADS124S08=m
-CONFIG_TI_TLC4541=m
-CONFIG_VF610_ADC=m
-CONFIG_VIPERBOARD_ADC=m
+# CONFIG_SD_ADC_MODULATOR is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+# CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS7950 is not set
+# CONFIG_TI_ADS8344 is not set
+# CONFIG_TI_ADS8688 is not set
+# CONFIG_TI_ADS124S08 is not set
+# CONFIG_TI_ADS131E08 is not set
+# CONFIG_TI_TLC4541 is not set
+# CONFIG_TI_TSC2046 is not set
+# CONFIG_VF610_ADC is not set
+# CONFIG_VIPERBOARD_ADC is not set
 # CONFIG_XILINX_XADC is not set
 # end of Analog to digital converters
 
@@ -7494,30 +7680,34 @@ CONFIG_IIO_RESCALE=m
 #
 # Amplifiers
 #
-CONFIG_AD8366=m
+# CONFIG_AD8366 is not set
 # CONFIG_HMC425 is not set
 # end of Amplifiers
 
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# end of Capacitance to digital converters
+
 #
 # Chemical Sensors
 #
-CONFIG_ATLAS_PH_SENSOR=m
+# CONFIG_ATLAS_PH_SENSOR is not set
 # CONFIG_ATLAS_EZO_SENSOR is not set
-CONFIG_BME680=m
-CONFIG_BME680_I2C=m
-CONFIG_BME680_SPI=m
-CONFIG_CCS811=m
-CONFIG_IAQCORE=m
-CONFIG_PMS7003=m
+# CONFIG_BME680 is not set
+# CONFIG_CCS811 is not set
+# CONFIG_IAQCORE is not set
+# CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
-CONFIG_SENSIRION_SGP30=m
-CONFIG_SPS30=m
-CONFIG_VZ89X=m
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SENSIRION_SGP40 is not set
+# CONFIG_SPS30_I2C is not set
+# CONFIG_SPS30_SERIAL is not set
+# CONFIG_VZ89X is not set
 # end of Chemical Sensors
 
-CONFIG_IIO_CROS_EC_SENSORS_CORE=m
-CONFIG_IIO_CROS_EC_SENSORS=m
-# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
 
 #
 # Hid Sensor IIO Common
@@ -7526,7 +7716,10 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # end of Hid Sensor IIO Common
 
-CONFIG_IIO_MS_SENSORS_I2C=m
+#
+# IIO SCMI Sensors
+#
+# end of IIO SCMI Sensors
 
 #
 # SSP Sensor Common
@@ -7534,49 +7727,44 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # end of SSP Sensor Common
 
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_SPI=m
-CONFIG_IIO_ST_SENSORS_CORE=m
-
 #
 # Digital to analog converters
 #
-CONFIG_AD5064=m
-CONFIG_AD5360=m
-CONFIG_AD5380=m
-CONFIG_AD5421=m
-CONFIG_AD5446=m
-CONFIG_AD5449=m
-CONFIG_AD5592R_BASE=m
-CONFIG_AD5592R=m
-CONFIG_AD5593R=m
-CONFIG_AD5504=m
-CONFIG_AD5624R_SPI=m
-CONFIG_AD5686=m
-CONFIG_AD5686_SPI=m
-CONFIG_AD5696_I2C=m
-CONFIG_AD5755=m
-CONFIG_AD5758=m
-CONFIG_AD5761=m
-CONFIG_AD5764=m
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5766 is not set
 # CONFIG_AD5770R is not set
-CONFIG_AD5791=m
-CONFIG_AD7303=m
-CONFIG_AD8801=m
-CONFIG_DPOT_DAC=m
-CONFIG_DS4424=m
-CONFIG_LTC1660=m
-CONFIG_LTC2632=m
-CONFIG_M62332=m
-CONFIG_MAX517=m
-CONFIG_MAX5821=m
-CONFIG_MCP4725=m
-CONFIG_MCP4922=m
-CONFIG_TI_DAC082S085=m
-CONFIG_TI_DAC5571=m
-CONFIG_TI_DAC7311=m
-CONFIG_TI_DAC7612=m
-CONFIG_VF610_DAC=m
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
+# CONFIG_LTC1660 is not set
+# CONFIG_LTC2632 is not set
+# CONFIG_M62332 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
+# CONFIG_TI_DAC5571 is not set
+# CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7612 is not set
+# CONFIG_VF610_DAC is not set
 # end of Digital to analog converters
 
 #
@@ -7592,13 +7780,13 @@ CONFIG_VF610_DAC=m
 #
 # Clock Generator/Distribution
 #
-CONFIG_AD9523=m
+# CONFIG_AD9523 is not set
 # end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
-CONFIG_ADF4350=m
+# CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
@@ -7606,25 +7794,18 @@ CONFIG_ADF4350=m
 #
 # Digital gyroscope sensors
 #
-CONFIG_ADIS16080=m
-CONFIG_ADIS16130=m
-CONFIG_ADIS16136=m
-CONFIG_ADIS16260=m
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS290 is not set
-CONFIG_ADXRS450=m
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_BMG160_SPI=m
-CONFIG_FXAS21002C=m
-CONFIG_FXAS21002C_I2C=m
-CONFIG_FXAS21002C_SPI=m
-CONFIG_HID_SENSOR_GYRO_3D=m
-CONFIG_MPU3050=m
-CONFIG_MPU3050_I2C=m
-CONFIG_IIO_ST_GYRO_3AXIS=m
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
-CONFIG_ITG3200=m
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+# CONFIG_FXAS21002C is not set
+# CONFIG_HID_SENSOR_GYRO_3D is not set
+# CONFIG_MPU3050_I2C is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
 # end of Digital gyroscope sensors
 
 #
@@ -7634,50 +7815,45 @@ CONFIG_ITG3200=m
 #
 # Heart Rate Monitors
 #
-CONFIG_AFE4403=m
-CONFIG_AFE4404=m
-CONFIG_MAX30100=m
-CONFIG_MAX30102=m
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
 # end of Heart Rate Monitors
 # end of Health Sensors
 
 #
 # Humidity sensors
 #
-CONFIG_AM2315=m
-CONFIG_DHT11=m
-CONFIG_HDC100X=m
+# CONFIG_AM2315 is not set
+# CONFIG_DHT11 is not set
+# CONFIG_HDC100X is not set
 # CONFIG_HDC2010 is not set
-CONFIG_HID_SENSOR_HUMIDITY=m
-CONFIG_HTS221=m
-CONFIG_HTS221_I2C=m
-CONFIG_HTS221_SPI=m
-CONFIG_HTU21=m
-CONFIG_SI7005=m
-CONFIG_SI7020=m
+# CONFIG_HID_SENSOR_HUMIDITY is not set
+# CONFIG_HTS221 is not set
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
 # end of Humidity sensors
 
 #
 # Inertial measurement units
 #
-CONFIG_ADIS16400=m
+# CONFIG_ADIS16400 is not set
 # CONFIG_ADIS16460 is not set
 # CONFIG_ADIS16475 is not set
-CONFIG_ADIS16480=m
-CONFIG_BMI160=m
-CONFIG_BMI160_I2C=m
-CONFIG_BMI160_SPI=m
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
 # CONFIG_FXOS8700_I2C is not set
 # CONFIG_FXOS8700_SPI is not set
-CONFIG_KMX61=m
+# CONFIG_KMX61 is not set
 # CONFIG_INV_ICM42600_I2C is not set
 # CONFIG_INV_ICM42600_SPI is not set
-CONFIG_INV_MPU6050_IIO=m
-CONFIG_INV_MPU6050_I2C=m
-CONFIG_INV_MPU6050_SPI=m
-CONFIG_IIO_ST_LSM6DSX=m
-CONFIG_IIO_ST_LSM6DSX_I2C=m
-CONFIG_IIO_ST_LSM6DSX_SPI=m
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
+# CONFIG_IIO_ST_LSM9DS0 is not set
 # end of Inertial measurement units
 
 CONFIG_IIO_ADIS_LIB=m
@@ -7686,80 +7862,74 @@ CONFIG_IIO_ADIS_LIB_BUFFER=y
 #
 # Light sensors
 #
-CONFIG_ACPI_ALS=m
-CONFIG_ADJD_S311=m
+# CONFIG_ACPI_ALS is not set
+# CONFIG_ADJD_S311 is not set
 # CONFIG_ADUX1020 is not set
 # CONFIG_AL3010 is not set
-CONFIG_AL3320A=m
-CONFIG_APDS9300=m
-CONFIG_APDS9960=m
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9960 is not set
 # CONFIG_AS73211 is not set
-CONFIG_BH1750=m
-CONFIG_BH1780=m
-CONFIG_CM32181=m
-CONFIG_CM3232=m
-CONFIG_CM3323=m
-CONFIG_CM3605=m
-CONFIG_CM36651=m
-CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+# CONFIG_BH1750 is not set
+# CONFIG_BH1780 is not set
+# CONFIG_CM32181 is not set
+# CONFIG_CM3232 is not set
+# CONFIG_CM3323 is not set
+# CONFIG_CM3605 is not set
+# CONFIG_CM36651 is not set
 # CONFIG_GP2AP002 is not set
-CONFIG_GP2AP020A00F=m
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_ISL29125=m
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-CONFIG_JSA1212=m
-CONFIG_RPR0521=m
-CONFIG_LTR501=m
-CONFIG_LV0104CS=m
-CONFIG_MAX44000=m
-CONFIG_MAX44009=m
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
+# CONFIG_HID_SENSOR_ALS is not set
+# CONFIG_HID_SENSOR_PROX is not set
+# CONFIG_JSA1212 is not set
+# CONFIG_RPR0521 is not set
+# CONFIG_LTR501 is not set
+# CONFIG_LV0104CS is not set
+# CONFIG_MAX44000 is not set
+# CONFIG_MAX44009 is not set
 # CONFIG_NOA1305 is not set
-CONFIG_OPT3001=m
-CONFIG_PA12203001=m
-CONFIG_SI1133=m
-CONFIG_SI1145=m
-CONFIG_STK3310=m
-CONFIG_ST_UVIS25=m
-CONFIG_ST_UVIS25_I2C=m
-CONFIG_ST_UVIS25_SPI=m
-CONFIG_TCS3414=m
-CONFIG_TCS3472=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL2583=m
-CONFIG_TSL2772=m
-CONFIG_TSL4531=m
-CONFIG_US5182D=m
-CONFIG_VCNL4000=m
-CONFIG_VCNL4035=m
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1133 is not set
+# CONFIG_SI1145 is not set
+# CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2591 is not set
+# CONFIG_TSL2772 is not set
+# CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
-CONFIG_VEML6070=m
-CONFIG_VL6180=m
-CONFIG_ZOPT2201=m
+# CONFIG_VEML6070 is not set
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
 # end of Light sensors
 
 #
 # Magnetometer sensors
 #
-CONFIG_AK8974=m
+# CONFIG_AK8974 is not set
 CONFIG_AK8975=m
-CONFIG_AK09911=m
-CONFIG_BMC150_MAGN=m
-CONFIG_BMC150_MAGN_I2C=m
-CONFIG_BMC150_MAGN_SPI=m
-CONFIG_MAG3110=m
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_MMC35240=m
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-CONFIG_SENSORS_HMC5843_SPI=m
-CONFIG_SENSORS_RM3100=m
-CONFIG_SENSORS_RM3100_I2C=m
-CONFIG_SENSORS_RM3100_SPI=m
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+# CONFIG_SENSORS_RM3100_I2C is not set
+# CONFIG_SENSORS_RM3100_SPI is not set
+# CONFIG_YAMAHA_YAS530 is not set
 # end of Magnetometer sensors
 
 #
@@ -7787,102 +7957,96 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 #
 # Linear and angular position sensors
 #
+# CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
 # end of Linear and angular position sensors
 
 #
 # Digital potentiometers
 #
-CONFIG_AD5272=m
-CONFIG_DS1803=m
+# CONFIG_AD5110 is not set
+# CONFIG_AD5272 is not set
+# CONFIG_DS1803 is not set
 # CONFIG_MAX5432 is not set
-CONFIG_MAX5481=m
-CONFIG_MAX5487=m
-CONFIG_MCP4018=m
-CONFIG_MCP4131=m
-CONFIG_MCP4531=m
-CONFIG_MCP41010=m
-CONFIG_TPL0102=m
+# CONFIG_MAX5481 is not set
+# CONFIG_MAX5487 is not set
+# CONFIG_MCP4018 is not set
+# CONFIG_MCP4131 is not set
+# CONFIG_MCP4531 is not set
+# CONFIG_MCP41010 is not set
+# CONFIG_TPL0102 is not set
 # end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
-CONFIG_LMP91000=m
+# CONFIG_LMP91000 is not set
 # end of Digital potentiostats
 
 #
 # Pressure sensors
 #
-CONFIG_ABP060MG=m
-CONFIG_BMP280=m
-CONFIG_BMP280_I2C=m
-CONFIG_BMP280_SPI=m
-CONFIG_IIO_CROS_EC_BARO=m
+# CONFIG_ABP060MG is not set
+# CONFIG_BMP280 is not set
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
-CONFIG_HID_SENSOR_PRESS=m
-CONFIG_HP03=m
+# CONFIG_HID_SENSOR_PRESS is not set
+# CONFIG_HP03 is not set
 # CONFIG_ICP10100 is not set
-CONFIG_MPL115=m
-CONFIG_MPL115_I2C=m
-CONFIG_MPL115_SPI=m
-CONFIG_MPL3115=m
-CONFIG_MS5611=m
-CONFIG_MS5611_I2C=m
-CONFIG_MS5611_SPI=m
-CONFIG_MS5637=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_IIO_ST_PRESS_SPI=m
-CONFIG_T5403=m
-CONFIG_HP206C=m
-CONFIG_ZPA2326=m
-CONFIG_ZPA2326_I2C=m
-CONFIG_ZPA2326_SPI=m
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
 # end of Pressure sensors
 
 #
 # Lightning sensors
 #
-CONFIG_AS3935=m
+# CONFIG_AS3935 is not set
 # end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
-CONFIG_ISL29501=m
-CONFIG_LIDAR_LITE_V2=m
-CONFIG_MB1232=m
+# CONFIG_CROS_EC_MKBP_PROXIMITY is not set
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_MB1232 is not set
 # CONFIG_PING is not set
-CONFIG_RFD77402=m
-CONFIG_SRF04=m
+# CONFIG_RFD77402 is not set
+# CONFIG_SRF04 is not set
 # CONFIG_SX9310 is not set
-CONFIG_SX9500=m
-CONFIG_SRF08=m
+# CONFIG_SX9500 is not set
+# CONFIG_SRF08 is not set
 # CONFIG_VCNL3020 is not set
-CONFIG_VL53L0X_I2C=m
+# CONFIG_VL53L0X_I2C is not set
 # end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
-CONFIG_AD2S90=m
-CONFIG_AD2S1200=m
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
 # end of Resolver to digital converters
 
 #
 # Temperature sensors
 #
 # CONFIG_LTC2983 is not set
-CONFIG_MAXIM_THERMOCOUPLE=m
-CONFIG_HID_SENSOR_TEMP=m
-CONFIG_MLX90614=m
-CONFIG_MLX90632=m
-CONFIG_TMP006=m
-CONFIG_TMP007=m
-CONFIG_TSYS01=m
-CONFIG_TSYS02D=m
-CONFIG_MAX31856=m
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_HID_SENSOR_TEMP is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+# CONFIG_TMP006 is not set
+# CONFIG_TMP007 is not set
+# CONFIG_TMP117 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+# CONFIG_MAX31856 is not set
 # end of Temperature sensors
 
 # CONFIG_NTB is not set
@@ -7890,7 +8054,9 @@ CONFIG_MAX31856=m
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_DEBUG is not set
+# CONFIG_PWM_ATMEL_TCB is not set
 CONFIG_PWM_CROS_EC=m
+# CONFIG_PWM_DWC is not set
 # CONFIG_PWM_FSL_FTM is not set
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_ROCKCHIP=y
@@ -7912,8 +8078,6 @@ CONFIG_PARTITION_PERCPU=y
 # CONFIG_IPACK_BUS is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
-# CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -7922,7 +8086,7 @@ CONFIG_RESET_CONTROLLER=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 CONFIG_PHY_XGENE=y
-# CONFIG_USB_LGM_PHY is not set
+# CONFIG_PHY_CAN_TRANSCEIVER is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
@@ -7942,6 +8106,7 @@ CONFIG_PHY_ROCKCHIP_DP=y
 CONFIG_PHY_ROCKCHIP_EMMC=y
 CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+# CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY is not set
 # CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set
 CONFIG_PHY_ROCKCHIP_PCIE=y
 CONFIG_PHY_ROCKCHIP_TYPEC=y
@@ -7952,6 +8117,7 @@ CONFIG_PHY_ROCKCHIP_TYPEC=y
 
 CONFIG_POWERCAP=y
 # CONFIG_IDLE_INJECT is not set
+# CONFIG_DTPM is not set
 # CONFIG_MCB is not set
 
 #
@@ -7967,6 +8133,7 @@ CONFIG_ARM_PMU_ACPI=y
 # CONFIG_ARM_SMMU_V3_PMU is not set
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
+# CONFIG_ARM_DMC620_PMU is not set
 CONFIG_HISI_PMU=y
 # end of Performance monitor support
 
@@ -7998,6 +8165,7 @@ CONFIG_NVMEM_SYSFS=y
 # CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_ROCKCHIP_EFUSE=y
 # CONFIG_ROCKCHIP_OTP is not set
+# CONFIG_NVMEM_RMEM is not set
 
 #
 # HW tracing support
@@ -8087,16 +8255,18 @@ CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_F2FS_FS_COMPRESSION is not set
+CONFIG_F2FS_IOSTAT=y
 # CONFIG_ZONEFS_FS is not set
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FS_ENCRYPTION_ALGS=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -8125,14 +8295,13 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 # Caches
 #
+CONFIG_NETFS_SUPPORT=m
+CONFIG_NETFS_STATS=y
 CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
-# CONFIG_FSCACHE_HISTOGRAM is not set
 # CONFIG_FSCACHE_DEBUG is not set
-CONFIG_FSCACHE_OBJECT_LIST=y
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
 # end of Caches
 
 #
@@ -8158,6 +8327,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 CONFIG_NTFS_RW=y
+# CONFIG_NTFS3_FS is not set
 # end of DOS/FAT/EXFAT/NT Filesystems
 
 #
@@ -8174,6 +8344,7 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_TMPFS_INODE64 is not set
+CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_MEMFD_CREATE=y
@@ -8234,6 +8405,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_BOTH is not set
 CONFIG_ROMFS_ON_BLOCK=y
 CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
 # CONFIG_PSTORE_LZO_COMPRESS is not set
 # CONFIG_PSTORE_LZ4_COMPRESS is not set
@@ -8263,7 +8435,7 @@ CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=y
 CONFIG_PNFS_BLOCK=y
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=y
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
 CONFIG_NFS_V4_SECURITY_LABEL=y
@@ -8288,6 +8460,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_SUNRPC_BACKCHANNEL=y
@@ -8302,7 +8475,6 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
@@ -8310,7 +8482,10 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_SWN_UPCALL is not set
 CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS_COMMON=m
 CONFIG_CODA_FS=m
 # CONFIG_AFS_FS is not set
 CONFIG_9P_FS=m
@@ -8404,7 +8579,9 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
 CONFIG_SECURITY_YAMA=y
 # CONFIG_SECURITY_SAFESETID is not set
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
+# CONFIG_SECURITY_LANDLOCK is not set
 # CONFIG_INTEGRITY is not set
+# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
 CONFIG_DEFAULT_SECURITY_APPARMOR=y
 # CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_LSM="yama,apparmor"
@@ -8472,10 +8649,11 @@ CONFIG_CRYPTO_ENGINE=m
 #
 # Public-key cryptography
 #
-CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
 # CONFIG_CRYPTO_ECRDSA is not set
 # CONFIG_CRYPTO_SM2 is not set
 CONFIG_CRYPTO_CURVE25519=m
@@ -8530,17 +8708,13 @@ CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SM3=y
 # CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
 #
@@ -8559,7 +8733,6 @@ CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
@@ -8617,6 +8790,7 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
@@ -8635,6 +8809,7 @@ CONFIG_CRYPTO_DEV_CCREE=m
 # CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
 # CONFIG_CRYPTO_DEV_HISI_ZIP is not set
 # CONFIG_CRYPTO_DEV_HISI_HPRE is not set
+# CONFIG_CRYPTO_DEV_HISI_TRNG is not set
 # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
@@ -8642,6 +8817,8 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 # CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
 CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 
 #
 # Certificates for signature checking
@@ -8653,6 +8830,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # end of Certificates for signature checking
 
+CONFIG_BINARY_PRINTF=y
+
 #
 # Library routines
 #
@@ -8665,6 +8844,7 @@ CONFIG_HAVE_ARCH_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_CORDIC=m
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_RATIONAL=y
@@ -8745,6 +8925,7 @@ CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_SWIOTLB=y
+# CONFIG_DMA_RESTRICTED_POOL is not set
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_REMAP=y
@@ -8762,6 +8943,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MAX is not set
 CONFIG_CMA_ALIGNMENT=8
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
@@ -8788,9 +8970,11 @@ CONFIG_SG_POOL=y
 CONFIG_MEMREGION=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
 # end of Library routines
 
+CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_ASN1_ENCODER=m
+
 #
 # Kernel hacking
 #
@@ -8800,6 +8984,7 @@ CONFIG_SBITMAP=y
 #
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINTK_CALLER is not set
+# CONFIG_STACKTRACE_BUILD_ID is not set
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
@@ -8814,16 +8999,16 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # Compile-time checks and compiler options
 #
 # CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_HEADERS_INSTALL is not set
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
+# CONFIG_VMLINUX_MAP is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # end of Compile-time checks and compiler options
 
@@ -8882,9 +9067,13 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
+CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # CONFIG_KASAN is not set
+CONFIG_HAVE_ARCH_KFENCE=y
+# CONFIG_KFENCE is not set
 # end of Memory Debugging
 
 # CONFIG_DEBUG_SHIRQ is not set
@@ -8937,10 +9126,10 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_CSD_LOCK_WAIT_DEBUG is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)
 
+# CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
-CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 
 #
 # Debug kernel data structures
@@ -8967,7 +9156,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # end of RCU Debugging
 
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -8980,7 +9168,6 @@ CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_IO_STRICT_DEVMEM is not set
 
@@ -9003,6 +9190,7 @@ CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
+CONFIG_ARCH_USE_MEMTEST=y
 # CONFIG_MEMTEST is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
diff --git a/srcpkgs/pinebookpro-kernel/patches/0005-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch b/srcpkgs/pinebookpro-kernel/patches/0005-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
deleted file mode 100644
index 2dff40be4b93..000000000000
--- a/srcpkgs/pinebookpro-kernel/patches/0005-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From bdf0ad5977e37d8415f53011f8f8495e0ebce152 Mon Sep 17 00:00:00 2001
-From: Tobias Schramm <t.schramm@manjaro.org>
-Date: Thu, 28 May 2020 14:34:47 +0200
-Subject: [PATCH 5/8] sound: soc: codecs: es8316: Run micdetect only if jack
- status asserted
-
-Think this is (was?) required to prevent flapping of detection status on
-the PBP.
-
-Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
----
- sound/soc/codecs/es8316.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
-index f9ec5cf82599..04bba9442060 100644
---- a/sound/soc/codecs/es8316.c
-+++ b/sound/soc/codecs/es8316.c
-@@ -688,7 +688,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component)
- 	snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE,
- 				      ES8316_GPIO_ENABLE_INTERRUPT, 0);
- 
--	if (es8316->jack->status & SND_JACK_MICROPHONE) {
-+	if (es8316->jack && (es8316->jack->status & SND_JACK_MICROPHONE)) {
- 		es8316_disable_micbias_for_mic_gnd_short_detect(component);
- 		snd_soc_jack_report(es8316->jack, 0, SND_JACK_BTN_0);
- 	}
--- 
-2.29.2
-
diff --git a/srcpkgs/pinebookpro-kernel/patches/drm-rockchip-support-gamma-control-on-RK3399.patch b/srcpkgs/pinebookpro-kernel/patches/drm-rockchip-support-gamma-control-on-RK3399.patch
new file mode 100644
index 000000000000..7969b640d8a2
--- /dev/null
+++ b/srcpkgs/pinebookpro-kernel/patches/drm-rockchip-support-gamma-control-on-RK3399.patch
@@ -0,0 +1,667 @@
+Source: https://patchwork.kernel.org/project/linux-rockchip/patch/20211019215843.42718-2-sigmaris@gmail.com/
+Upstream: no
+
+From patchwork Tue Oct 19 21:58:41 2021
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Hugh Cole-Baker <sigmaris@gmail.com>
+X-Patchwork-Id: 12571177
+Return-Path: 
+ <SRS0=otL+=PH=lists.infradead.org=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@kernel.org>
+X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
+	aws-us-west-2-korg-lkml-1.web.codeaurora.org
+Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
+	by smtp.lore.kernel.org (Postfix) with ESMTP id EF2BCC43217
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 21:59:16 +0000 (UTC)
+Received: from bombadil.infradead.org (bombadil.infradead.org
+ [198.137.202.133])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by mail.kernel.org (Postfix) with ESMTPS id BADCF60FDA
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 21:59:16 +0000 (UTC)
+DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BADCF60FDA
+Authentication-Results: mail.kernel.org;
+ dmarc=fail (p=none dis=none) header.from=gmail.com
+Authentication-Results: mail.kernel.org;
+ spf=none smtp.mailfrom=lists.infradead.org
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+	d=lists.infradead.org; s=bombadil.20210309; h=Sender:
+	Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:
+	List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
+	Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:
+	Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
+	List-Owner; bh=EqcGhTXNHxLjs4GeNeyEmq5LQRaq+Myjxe15Omdo3zg=; b=WipF8awV3GyV0e
+	kgWAQIrKxNxmI+xZhPVMfYQrDKseHUh5l4MTVbElfsNAZnP6UY9y2RciAwS1T6QE6g7cWBToK+kSd
+	tgP1fTozzC6ykiWD4rvkUEDsthGCT1OC/xPjfMIBPVQk1TDVRY40iKHnmGz9kCRWsa09nkFDeslMW
+	ZoAV7QxTXvFpqflmFTe887J37+PxeSsqAtjUZwjrdTip6oybHVhd9q6eVrVPNz0c3EzopeFx/kOOm
+	Wvt2AWng+UCxTZoTZugNQBOBfOsv/QQgLfg0q9V6kNHycJtcevP6GsyYGZ+0LabMaqckOh9RK7O4x
+	Co47MeIsJRvrSAP295ng==;
+Received: from localhost ([::1] helo=bombadil.infradead.org)
+	by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))
+	id 1mcx8a-002irO-35; Tue, 19 Oct 2021 21:59:12 +0000
+Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e])
+ by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))
+ id 1mcx8J-002ihZ-Mf; Tue, 19 Oct 2021 21:58:57 +0000
+Received: by mail-wm1-x32e.google.com with SMTP id
+ z77-20020a1c7e50000000b0030db7b70b6bso5870939wmc.1;
+ Tue, 19 Oct 2021 14:58:54 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
+ h=from:to:cc:subject:date:message-id:in-reply-to:references
+ :mime-version:content-transfer-encoding;
+ bh=Ws77StmGP8OqTFmlkQUufLolF3RfQn4nI0VMLqEcX8s=;
+ b=dGZQ8Q3orJrTzIZ4Gs9rn9dr9PAu9PCjkmUK5Lr6UkhpNzYMcMd3020nPpiG6Sqqpy
+ iLRrSxDSXQ7kSYllOPk2BtvQUGsDdBHD7NGzfb5c2CazkxrvtoLOMJXxZabDfp9dJ33y
+ Nc6l+vslIYyFBqsf5MjBRyT1WWM8BbqdLViNK1jE0RWT9LaZ+QLmNI1goCpLxyjClx5q
+ BHWHbXcWTtSRVC5h7zAbVkeTp5sxkU/JgDJP/NlgaeLhv5fT3vRPg7iwOgHc91kIXC5y
+ UrXcfWoKPWR5+n9loBQ6PqrQbibvW07GBRJNMSRCw72SB0r9diQgYYeWronJNwIqWDmB
+ vHpg==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20210112;
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
+ :references:mime-version:content-transfer-encoding;
+ bh=Ws77StmGP8OqTFmlkQUufLolF3RfQn4nI0VMLqEcX8s=;
+ b=sxveNLJpyeHIxAc0lLGzMi6dTwpuj5EC2Nq5+ypLTJu+vH83R/yV+whpVpI4yQbNQZ
+ uZfjds+vUF8T/kr+k9v72xQGg5VmtKIm4Al4j8+OdPupdsjUqwymsp40RUA476Pc1yX+
+ DjIRdfFWS6YDp5foNGlLXHefuI4S/4fvGmW53BI7ZoEGldia25la5PCHUspe2VZI4Lgn
+ ZchGK4aT1RbEL0KBThFjSVt4mGon+KeHk8bjW5CI4EUuAAf4/jpppC69B5Cy+myMU/WE
+ Tujt2FKA0MGVxprviL1MniA81m5IEvewvG5eZhO59TnXKq+XY47lK0n5TGag9jEdT2LT
+ fcsg==
+X-Gm-Message-State: AOAM533AZaW6ntLxS4JBa7mC0O7lveBcmLsJQF9kcmDdUxInS38G3xBI
+ I/e9THNRFXBr5BPQpV/GwEc=
+X-Google-Smtp-Source: 
+ ABdhPJxlnImj2nZarYrS7pboEsot76oZv/a0I0DfIZ6Yn6Tqye98tM7z2na6Er6vRQMM1xsYYiNxOg==
+X-Received: by 2002:adf:97d0:: with SMTP id
+ t16mr45716779wrb.124.1634680732995;
+ Tue, 19 Oct 2021 14:58:52 -0700 (PDT)
+Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165])
+ by smtp.gmail.com with ESMTPSA id s3sm178540wrm.40.2021.10.19.14.58.52
+ (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
+ Tue, 19 Oct 2021 14:58:52 -0700 (PDT)
+From: Hugh Cole-Baker <sigmaris@gmail.com>
+To: heiko@sntech.de,
+	hjc@rock-chips.com
+Cc: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org,
+ linux-arm-kernel@lists.infradead.org, ezequiel@collabora.com,
+ Hugh Cole-Baker <sigmaris@gmail.com>
+Subject: [PATCH v2 1/3] drm/rockchip: define gamma registers for RK3399
+Date: Tue, 19 Oct 2021 22:58:41 +0100
+Message-Id: <20211019215843.42718-2-sigmaris@gmail.com>
+X-Mailer: git-send-email 2.24.3 (Apple Git-128)
+In-Reply-To: <20211019215843.42718-1-sigmaris@gmail.com>
+References: <20211019215843.42718-1-sigmaris@gmail.com>
+MIME-Version: 1.0
+X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
+X-CRM114-CacheID: sfid-20211019_145855_763472_DAE885F2 
+X-CRM114-Status: GOOD (  15.39  )
+X-BeenThere: linux-rockchip@lists.infradead.org
+X-Mailman-Version: 2.1.34
+Precedence: list
+List-Id: Upstream kernel work for Rockchip platforms
+ <linux-rockchip.lists.infradead.org>
+List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=unsubscribe>
+List-Archive: <http://lists.infradead.org/pipermail/linux-rockchip/>
+List-Post: <mailto:linux-rockchip@lists.infradead.org>
+List-Help: <mailto:linux-rockchip-request@lists.infradead.org?subject=help>
+List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=subscribe>
+Sender: "Linux-rockchip" <linux-rockchip-bounces@lists.infradead.org>
+Errors-To: 
+ linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org
+
+The VOP on RK3399 has a different approach from previous versions for
+setting a gamma lookup table, using an update_gamma_lut register. As
+this differs from RK3288, give RK3399 its own set of "common" register
+definitions.
+
+Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com>
+---
+
+Changes from v1: no changes in this patch
+
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.h |  2 ++
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 24 +++++++++++++++++++--
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.h |  1 +
+ 3 files changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
+index 857d97cdc67c..14179e89bd21 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
++++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
+@@ -99,6 +99,8 @@ struct vop_common {
+ 	struct vop_reg dither_down_en;
+ 	struct vop_reg dither_up;
+ 	struct vop_reg dsp_lut_en;
++	struct vop_reg update_gamma_lut;
++	struct vop_reg lut_buffer_index;
+ 	struct vop_reg gate_en;
+ 	struct vop_reg mmu_en;
+ 	struct vop_reg out_mode;
+diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+index ca7cc82125cb..bfb7e130f09b 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
++++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+@@ -865,6 +865,24 @@ static const struct vop_output rk3399_output = {
+ 	.mipi_dual_channel_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 3),
+ };
+ 
++static const struct vop_common rk3399_common = {
++	.standby = VOP_REG_SYNC(RK3399_SYS_CTRL, 0x1, 22),
++	.gate_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 23),
++	.mmu_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 20),
++	.dither_down_sel = VOP_REG(RK3399_DSP_CTRL1, 0x1, 4),
++	.dither_down_mode = VOP_REG(RK3399_DSP_CTRL1, 0x1, 3),
++	.dither_down_en = VOP_REG(RK3399_DSP_CTRL1, 0x1, 2),
++	.pre_dither_down = VOP_REG(RK3399_DSP_CTRL1, 0x1, 1),
++	.dither_up = VOP_REG(RK3399_DSP_CTRL1, 0x1, 6),
++	.dsp_lut_en = VOP_REG(RK3399_DSP_CTRL1, 0x1, 0),
++	.update_gamma_lut = VOP_REG(RK3399_DSP_CTRL1, 0x1, 7),
++	.lut_buffer_index = VOP_REG(RK3399_DBG_POST_REG1, 0x1, 1),
++	.data_blank = VOP_REG(RK3399_DSP_CTRL0, 0x1, 19),
++	.dsp_blank = VOP_REG(RK3399_DSP_CTRL0, 0x3, 18),
++	.out_mode = VOP_REG(RK3399_DSP_CTRL0, 0xf, 0),
++	.cfg_done = VOP_REG_SYNC(RK3399_REG_CFG_DONE, 0x1, 0),
++};
++
+ static const struct vop_yuv2yuv_phy rk3399_yuv2yuv_win01_data = {
+ 	.y2r_coefficients = {
+ 		VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 0, 0xffff, 0),
+@@ -944,7 +962,7 @@ static const struct vop_data rk3399_vop_big = {
+ 	.version = VOP_VERSION(3, 5),
+ 	.feature = VOP_FEATURE_OUTPUT_RGB10,
+ 	.intr = &rk3366_vop_intr,
+-	.common = &rk3288_common,
++	.common = &rk3399_common,
+ 	.modeset = &rk3288_modeset,
+ 	.output = &rk3399_output,
+ 	.afbc = &rk3399_vop_afbc,
+@@ -952,6 +970,7 @@ static const struct vop_data rk3399_vop_big = {
+ 	.win = rk3399_vop_win_data,
+ 	.win_size = ARRAY_SIZE(rk3399_vop_win_data),
+ 	.win_yuv2yuv = rk3399_vop_big_win_yuv2yuv_data,
++	.lut_size = 1024,
+ };
+ 
+ static const struct vop_win_data rk3399_vop_lit_win_data[] = {
+@@ -970,13 +989,14 @@ static const struct vop_win_yuv2yuv_data rk3399_vop_lit_win_yuv2yuv_data[] = {
+ static const struct vop_data rk3399_vop_lit = {
+ 	.version = VOP_VERSION(3, 6),
+ 	.intr = &rk3366_vop_intr,
+-	.common = &rk3288_common,
++	.common = &rk3399_common,
+ 	.modeset = &rk3288_modeset,
+ 	.output = &rk3399_output,
+ 	.misc = &rk3368_misc,
+ 	.win = rk3399_vop_lit_win_data,
+ 	.win_size = ARRAY_SIZE(rk3399_vop_lit_win_data),
+ 	.win_yuv2yuv = rk3399_vop_lit_win_yuv2yuv_data,
++	.lut_size = 256,
+ };
+ 
+ static const struct vop_win_data rk3228_vop_win_data[] = {
+diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h
+index 0b3cd65ba5c1..406e981c75bd 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h
++++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h
+@@ -628,6 +628,7 @@
+ #define RK3399_YUV2YUV_WIN			0x02c0
+ #define RK3399_YUV2YUV_POST			0x02c4
+ #define RK3399_AUTO_GATING_EN			0x02cc
++#define RK3399_DBG_POST_REG1			0x036c
+ #define RK3399_WIN0_CSC_COE			0x03a0
+ #define RK3399_WIN1_CSC_COE			0x03c0
+ #define RK3399_WIN2_CSC_COE			0x03e0
+
+From patchwork Tue Oct 19 21:58:42 2021
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Hugh Cole-Baker <sigmaris@gmail.com>
+X-Patchwork-Id: 12571179
+Return-Path: 
+ <SRS0=otL+=PH=lists.infradead.org=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@kernel.org>
+X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
+	aws-us-west-2-korg-lkml-1.web.codeaurora.org
+Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
+	by smtp.lore.kernel.org (Postfix) with ESMTP id 85B47C433F5
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 21:59:33 +0000 (UTC)
+Received: from bombadil.infradead.org (bombadil.infradead.org
+ [198.137.202.133])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by mail.kernel.org (Postfix) with ESMTPS id 595856113D
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 21:59:33 +0000 (UTC)
+DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 595856113D
+Authentication-Results: mail.kernel.org;
+ dmarc=fail (p=none dis=none) header.from=gmail.com
+Authentication-Results: mail.kernel.org;
+ spf=none smtp.mailfrom=lists.infradead.org
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+	d=lists.infradead.org; s=bombadil.20210309; h=Sender:
+	Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:
+	List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
+	Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:
+	Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
+	List-Owner; bh=tHyvTqRKxrtKIbj34MYknHzX+yLAnQqh47VxQue4tCk=; b=jZnpTJ3DoyBMFy
+	53BFSj7Q2F7I6UvGzGrARdwtdy/GdZOQriN9rtqp0Jw6BHj/n2ercvi7m71vOUSovvx5MTV4NmCHa
+	UDHYDeQJSdRDxwq86bhU3kAZWb4EPkIrrXqZ0uEhA0f5w7dEwSw3r+3PpE15K6XFrVytUJNtcOxmZ
+	LUmJC4Q/ngOkxLB5um91h4YwdKXvfQkioiuaDwY49q0TzExLe5l9Ujt3HYxIvs1DcKJkbP+PtKO5W
+	K7osyX7sJvMa1NDDZf3Od/aDgOx0wAeiSetnxvN5vEdcirsNTfBcizUMdSrJMJOX+6rl1qKXe+MDu
+	1q72eLFjWmMphhJFlPGg==;
+Received: from localhost ([::1] helo=bombadil.infradead.org)
+	by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))
+	id 1mcx8r-002j2z-88; Tue, 19 Oct 2021 21:59:29 +0000
+Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333])
+ by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))
+ id 1mcx8P-002ikY-5a; Tue, 19 Oct 2021 21:59:03 +0000
+Received: by mail-wm1-x333.google.com with SMTP id
+ n40-20020a05600c3ba800b0030da2439b21so5894295wms.0;
+ Tue, 19 Oct 2021 14:59:01 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
+ h=from:to:cc:subject:date:message-id:in-reply-to:references
+ :mime-version:content-transfer-encoding;
+ bh=Q2/puQXisdIHy96scnY39dLOhAgOrf8qFIVS4zmDucw=;
+ b=mdJBK7nOU5EfOez2g0KuQcjPX1mqo1Yu1pyUoN+Yonchoy51OiK+gS5SHgjrEoxpOG
+ sDimMoXQXXfpFuyMt5InbeCA1ma78VxZZywXFdfahXW4HKbUjs2tnVUa+itAc40a/Lut
+ NxF/KtplJGjsU6gnEIouvEaFfzpcZMzpxv8D9kRUTed0sDtlerGTRROHvnHK6Pw2okZY
+ QRFluqjW3Vn4uKF7VXKbxGVFIj+s47JoFGFp45q5EuEIhsZUbBnh5vSeuhbfmUIGk//P
+ gFNhLcrUXRMbHK5TsyZLzZ7hZifip4eO5zDxP0adM8Pl2bLFIKMZ31phyOxVwysjxCxu
+ PDWg==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20210112;
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
+ :references:mime-version:content-transfer-encoding;
+ bh=Q2/puQXisdIHy96scnY39dLOhAgOrf8qFIVS4zmDucw=;
+ b=jn+JsIGvDA601iU5jMDQWABrrTP4pgk3O2OZBgof0QYw8ggY8zxTe/efUUPyXJIGTE
+ 2m3iE3Pcv5gj7Dcj4PIhzOg8zqSe1DU6P0hNO2BUxjZtLbEFis1NIct0ETnSFadB1BQB
+ ysjv58mVj+CNTkOB4SC7pZG3YnB9kiALfn5srFP5QIZbH7zEkUmlcC68MCiTovkam5VZ
+ edpald9X31meuqO248k3kWflmGaPoFpYgKDGHB1+gHVwrz/zdHEOfyW+ywMCqhAz9Ips
+ bHdQrFXJhfBm73e/YpzMo+CGW2pKgwVwKvgfaYk70AaV21ZQwmVchdrKL+JbaqB3Pb8M
+ q98A==
+X-Gm-Message-State: AOAM5310Qyqstssdsu0x76uWY5DcBoeRppvU7QgcaPxDqN1ox6+rbUCB
+ 8ZjpkAW88saV2ZLk3LFE/SY=
+X-Google-Smtp-Source: 
+ ABdhPJyH6EYKD5Zz7cAvlgR25QY6isGkEOndRqrg115y3IbztxMbNkQ417bBT6OIYq5kolH2WJ4Otw==
+X-Received: by 2002:a05:600c:1d05:: with SMTP id
+ l5mr7158510wms.97.1634680737804;
+ Tue, 19 Oct 2021 14:58:57 -0700 (PDT)
+Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165])
+ by smtp.gmail.com with ESMTPSA id s3sm178540wrm.40.2021.10.19.14.58.57
+ (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
+ Tue, 19 Oct 2021 14:58:57 -0700 (PDT)
+From: Hugh Cole-Baker <sigmaris@gmail.com>
+To: heiko@sntech.de,
+	hjc@rock-chips.com
+Cc: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org,
+ linux-arm-kernel@lists.infradead.org, ezequiel@collabora.com,
+ Hugh Cole-Baker <sigmaris@gmail.com>
+Subject: [PATCH v2 2/3] drm/rockchip: support gamma control on RK3399
+Date: Tue, 19 Oct 2021 22:58:42 +0100
+Message-Id: <20211019215843.42718-3-sigmaris@gmail.com>
+X-Mailer: git-send-email 2.24.3 (Apple Git-128)
+In-Reply-To: <20211019215843.42718-1-sigmaris@gmail.com>
+References: <20211019215843.42718-1-sigmaris@gmail.com>
+MIME-Version: 1.0
+X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
+X-CRM114-CacheID: sfid-20211019_145901_258532_1013C062 
+X-CRM114-Status: GOOD (  23.54  )
+X-BeenThere: linux-rockchip@lists.infradead.org
+X-Mailman-Version: 2.1.34
+Precedence: list
+List-Id: Upstream kernel work for Rockchip platforms
+ <linux-rockchip.lists.infradead.org>
+List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=unsubscribe>
+List-Archive: <http://lists.infradead.org/pipermail/linux-rockchip/>
+List-Post: <mailto:linux-rockchip@lists.infradead.org>
+List-Help: <mailto:linux-rockchip-request@lists.infradead.org?subject=help>
+List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=subscribe>
+Sender: "Linux-rockchip" <linux-rockchip-bounces@lists.infradead.org>
+Errors-To: 
+ linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org
+
+The RK3399 has a 1024-entry gamma LUT with 10 bits per component on its
+"big" VOP and a 256-entry, 8 bit per component LUT on the "little" VOP.
+Compared to the RK3288, it no longer requires disabling gamma while
+updating the LUT. On the RK3399, the LUT can be updated at any time as
+the hardware has two LUT buffers, one can be written while the other is
+in use. A swap of the buffers is triggered by writing 1 to the
+update_gamma_lut register.
+
+Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com>
+---
+
+Changes from v1: Moved the vop_crtc_gamma_set call to the end of
+vop_crtc_atomic_enable after the clocks and CRTC are enabled.
+
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 105 +++++++++++++-------
+ 1 file changed, 71 insertions(+), 34 deletions(-)
+
+diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+index ba9e14da41b4..e2c97f1b26da 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
++++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+@@ -9,6 +9,7 @@
+ #include <linux/delay.h>
+ #include <linux/iopoll.h>
+ #include <linux/kernel.h>
++#include <linux/log2.h>
+ #include <linux/module.h>
+ #include <linux/of.h>
+ #include <linux/of_device.h>
+@@ -66,6 +67,9 @@
+ #define VOP_REG_SET(vop, group, name, v) \
+ 		    vop_reg_set(vop, &vop->data->group->name, 0, ~0, v, #name)
+ 
++#define VOP_HAS_REG(vop, group, name) \
++		(!!(vop->data->group->name.mask))
++
+ #define VOP_INTR_SET_TYPE(vop, name, type, v) \
+ 	do { \
+ 		int i, reg = 0, mask = 0; \
+@@ -1204,17 +1208,22 @@ static bool vop_dsp_lut_is_enabled(struct vop *vop)
+ 	return vop_read_reg(vop, 0, &vop->data->common->dsp_lut_en);
+ }
+ 
++static u32 vop_lut_buffer_index(struct vop *vop)
++{
++	return vop_read_reg(vop, 0, &vop->data->common->lut_buffer_index);
++}
++
+ static void vop_crtc_write_gamma_lut(struct vop *vop, struct drm_crtc *crtc)
+ {
+ 	struct drm_color_lut *lut = crtc->state->gamma_lut->data;
+-	unsigned int i;
++	unsigned int i, bpc = ilog2(vop->data->lut_size);
+ 
+ 	for (i = 0; i < crtc->gamma_size; i++) {
+ 		u32 word;
+ 
+-		word = (drm_color_lut_extract(lut[i].red, 10) << 20) |
+-		       (drm_color_lut_extract(lut[i].green, 10) << 10) |
+-			drm_color_lut_extract(lut[i].blue, 10);
++		word = (drm_color_lut_extract(lut[i].red, bpc) << (2 * bpc)) |
++		       (drm_color_lut_extract(lut[i].green, bpc) << bpc) |
++			drm_color_lut_extract(lut[i].blue, bpc);
+ 		writel(word, vop->lut_regs + i * 4);
+ 	}
+ }
+@@ -1224,38 +1233,66 @@ static void vop_crtc_gamma_set(struct vop *vop, struct drm_crtc *crtc,
+ {
+ 	struct drm_crtc_state *state = crtc->state;
+ 	unsigned int idle;
++	u32 lut_idx, old_idx;
+ 	int ret;
+ 
+ 	if (!vop->lut_regs)
+ 		return;
+-	/*
+-	 * To disable gamma (gamma_lut is null) or to write
+-	 * an update to the LUT, clear dsp_lut_en.
+-	 */
+-	spin_lock(&vop->reg_lock);
+-	VOP_REG_SET(vop, common, dsp_lut_en, 0);
+-	vop_cfg_done(vop);
+-	spin_unlock(&vop->reg_lock);
+ 
+-	/*
+-	 * In order to write the LUT to the internal memory,
+-	 * we need to first make sure the dsp_lut_en bit is cleared.
+-	 */
+-	ret = readx_poll_timeout(vop_dsp_lut_is_enabled, vop,
+-				 idle, !idle, 5, 30 * 1000);
+-	if (ret) {
+-		DRM_DEV_ERROR(vop->dev, "display LUT RAM enable timeout!\n");
+-		return;
+-	}
++	if (!state->gamma_lut || !VOP_HAS_REG(vop, common, update_gamma_lut)) {
++		/*
++		 * To disable gamma (gamma_lut is null) or to write
++		 * an update to the LUT, clear dsp_lut_en.
++		 */
++		spin_lock(&vop->reg_lock);
++		VOP_REG_SET(vop, common, dsp_lut_en, 0);
++		vop_cfg_done(vop);
++		spin_unlock(&vop->reg_lock);
+ 
+-	if (!state->gamma_lut)
+-		return;
++		/*
++		 * In order to write the LUT to the internal memory,
++		 * we need to first make sure the dsp_lut_en bit is cleared.
++		 */
++		ret = readx_poll_timeout(vop_dsp_lut_is_enabled, vop,
++					 idle, !idle, 5, 30 * 1000);
++		if (ret) {
++			DRM_DEV_ERROR(vop->dev, "display LUT RAM enable timeout!\n");
++			return;
++		}
++
++		if (!state->gamma_lut)
++			return;
++	} else {
++		/*
++		 * On RK3399 the gamma LUT can updated without clearing dsp_lut_en,
++		 * by setting update_gamma_lut then waiting for lut_buffer_index change
++		 */
++		old_idx = vop_lut_buffer_index(vop);
++	}
+ 
+ 	spin_lock(&vop->reg_lock);
+ 	vop_crtc_write_gamma_lut(vop, crtc);
+ 	VOP_REG_SET(vop, common, dsp_lut_en, 1);
++	VOP_REG_SET(vop, common, update_gamma_lut, 1);
+ 	vop_cfg_done(vop);
+ 	spin_unlock(&vop->reg_lock);
++
++	if (VOP_HAS_REG(vop, common, update_gamma_lut)) {
++		ret = readx_poll_timeout(vop_lut_buffer_index, vop,
++					 lut_idx, lut_idx != old_idx, 5, 30 * 1000);
++		if (ret) {
++			DRM_DEV_ERROR(vop->dev, "gamma LUT update timeout!\n");
++			return;
++		}
++
++		/*
++		 * update_gamma_lut is auto cleared by HW, but write 0 to clear the bit
++		 * in our backup of the regs.
++		 */
++		spin_lock(&vop->reg_lock);
++		VOP_REG_SET(vop, common, update_gamma_lut, 0);
++		spin_unlock(&vop->reg_lock);
++	}
+ }
+ 
+ static void vop_crtc_atomic_begin(struct drm_crtc *crtc,
+@@ -1305,14 +1342,6 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc,
+ 		return;
+ 	}
+ 
+-	/*
+-	 * If we have a GAMMA LUT in the state, then let's make sure
+-	 * it's updated. We might be coming out of suspend,
+-	 * which means the LUT internal memory needs to be re-written.
+-	 */
+-	if (crtc->state->gamma_lut)
+-		vop_crtc_gamma_set(vop, crtc, old_state);
+-
+ 	mutex_lock(&vop->vop_lock);
+ 
+ 	WARN_ON(vop->event);
+@@ -1403,6 +1432,14 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc,
+ 
+ 	VOP_REG_SET(vop, common, standby, 0);
+ 	mutex_unlock(&vop->vop_lock);
++
++	/*
++	 * If we have a GAMMA LUT in the state, then let's make sure
++	 * it's updated. We might be coming out of suspend,
++	 * which means the LUT internal memory needs to be re-written.
++	 */
++	if (crtc->state->gamma_lut)
++		vop_crtc_gamma_set(vop, crtc, old_state);
+ }
+ 
+ static bool vop_fs_irq_is_pending(struct vop *vop)
+@@ -2125,8 +2162,8 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
+ 
+ 	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ 	if (res) {
+-		if (!vop_data->lut_size) {
+-			DRM_DEV_ERROR(dev, "no gamma LUT size defined\n");
++		if (vop_data->lut_size != 1024 && vop_data->lut_size != 256) {
++			DRM_DEV_ERROR(dev, "unsupported gamma LUT size %d\n", vop_data->lut_size);
+ 			return -EINVAL;
+ 		}
+ 		vop->lut_regs = devm_ioremap_resource(dev, res);
+
+From patchwork Tue Oct 19 21:58:43 2021
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Hugh Cole-Baker <sigmaris@gmail.com>
+X-Patchwork-Id: 12571181
+Return-Path: 
+ <SRS0=otL+=PH=lists.infradead.org=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@kernel.org>
+X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
+	aws-us-west-2-korg-lkml-1.web.codeaurora.org
+Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
+	by smtp.lore.kernel.org (Postfix) with ESMTP id 6D49BC433F5
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 22:00:01 +0000 (UTC)
+Received: from bombadil.infradead.org (bombadil.infradead.org
+ [198.137.202.133])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by mail.kernel.org (Postfix) with ESMTPS id 2FA4660FDA
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 22:00:01 +0000 (UTC)
+DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2FA4660FDA
+Authentication-Results: mail.kernel.org;
+ dmarc=fail (p=none dis=none) header.from=gmail.com
+Authentication-Results: mail.kernel.org;
+ spf=none smtp.mailfrom=lists.infradead.org
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+	d=lists.infradead.org; s=bombadil.20210309; h=Sender:
+	Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:
+	List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
+	Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:
+	Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
+	List-Owner; bh=x6/d2diqqgTC0AwbnyEkOK36w4vwRzp43AaTU68aj5M=; b=wkiGia5/EwS6cQ
+	SuVhyaTwREo92OuMyUFAEaHlaZXJMke3RttvX7iZ6ppbhCetp+wP0NzQTHAgryAGolioWpRPr8Bqa
+	yjYRAS/Lt6PEyPQAWwK8AgGZTi+ZjtP+eJiH4GMdXd/D0puZXnwfWZK/HvZDtTk882s6clzgQylG5
+	nzNX86FCOLlAsuwNDZ6nOLDw3W+A2X5Ii++oF/gAjegyzYxXoton/PnPqq4eLXggmefeHypIfo4Sk
+	HzWEL/d4eWtI2Jwyi+q8LkuTKcnhdYhDlDcvdX771PJCkq/YhcpC+i65AWiL5hB2opn5q/Z6FozHW
+	7viWXFDhM90u9a/5zWJg==;
+Received: from localhost ([::1] helo=bombadil.infradead.org)
+	by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))
+	id 1mcx9I-002jH5-CN; Tue, 19 Oct 2021 21:59:56 +0000
+Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332])
+ by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))
+ id 1mcx8P-002ikX-LK; Tue, 19 Oct 2021 21:59:04 +0000
+Received: by mail-wm1-x332.google.com with SMTP id
+ a140-20020a1c7f92000000b0030d8315b593so5820655wmd.5;
+ Tue, 19 Oct 2021 14:59:00 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
+ h=from:to:cc:subject:date:message-id:in-reply-to:references
+ :mime-version:content-transfer-encoding;
+ bh=uCZAM1vvyZIsuTswhisB5UCt6gNS7FCdaVGaaFS3YV4=;
+ b=N9x2DcoC3Zq7l+EXYxzzDvYTGb6e0oKBL/owgOeCIM34js4lC6qA/TCA1k1opUXEUK
+ iJyLxAfyGd/1irS6OFaK6/VaWbkuhUSrXcg5VejFWZOTCNEheBAERgim9vZebgpODSTB
+ 0zfpE8VREGwYumyR5wQB7OI+ZVttjvlGw4zUdGt1trfhORiUkTkmFI/a6PYbJB9TlFRb
+ I4/WknNvC/do0cuW/idOQdbadmwvcobJTrlHbgf+cZmrX4RxL7vwtJjMvYku0e8WGnjY
+ iS38SlU6UOMwxnLaCRBqu8RVDT19yUl9mcbSU9vrJpfbI91HZeeKpD3RKOsshqR4E+dm
+ lwBQ==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20210112;
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
+ :references:mime-version:content-transfer-encoding;
+ bh=uCZAM1vvyZIsuTswhisB5UCt6gNS7FCdaVGaaFS3YV4=;
+ b=ZtozeJ/Sb8WHJMd0KU8pz9+jU0TGMxtub9urEkLpu0peP+z2iuJ2IC1R1fHuveNHM9
+ qHCTWYIko+2U8h6BiSzTBkwKYqtNCH+3e85ImJhtwyX6QbEcNfwrOrShf+PSsYkfunx1
+ 0CBcvHQB3SMQ983RS4X8YXtjeKYhUhJtCq45tsXs2DiMPP1/NiiNRQvqFnX+mlbRos0f
+ 1XrbESWVB/tYzAtCRK2IIyD7dtp8BYkhoudKR0Z0Hc1Q6BomDWFG9H0VV3yNWRgHwdp3
+ FN+/YFLCLWmVhGZclMvqFYxIKZpr9nWPpTx6TYTWKFpPCTm4wtv3+U6EakPiCKZdZ84f
+ SKJw==
+X-Gm-Message-State: AOAM532tmkKpoFPpmG1bg92UfYgCYfs57494dXW9qNEbXkobGNhzn4uH
+ U3AFIO+Y+oMp3e1o2nrxeyTtLUEVnPd/ho9y
+X-Google-Smtp-Source: 
+ ABdhPJxx3QAL6lyP35xXPqTB47LPyaFAa19cRinJBEnDBpBQBMv+2xmSW5ECPRIbVOY9Eer57KphDw==
+X-Received: by 2002:adf:a413:: with SMTP id
+ d19mr48203915wra.246.1634680739774;
+ Tue, 19 Oct 2021 14:58:59 -0700 (PDT)
+Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165])
+ by smtp.gmail.com with ESMTPSA id s3sm178540wrm.40.2021.10.19.14.58.59
+ (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
+ Tue, 19 Oct 2021 14:58:59 -0700 (PDT)
+From: Hugh Cole-Baker <sigmaris@gmail.com>
+To: heiko@sntech.de,
+	hjc@rock-chips.com
+Cc: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org,
+ linux-arm-kernel@lists.infradead.org, ezequiel@collabora.com,
+ Hugh Cole-Baker <sigmaris@gmail.com>
+Subject: [PATCH v2 3/3] arm64: dts: rockchip: enable gamma control on RK3399
+Date: Tue, 19 Oct 2021 22:58:43 +0100
+Message-Id: <20211019215843.42718-4-sigmaris@gmail.com>
+X-Mailer: git-send-email 2.24.3 (Apple Git-128)
+In-Reply-To: <20211019215843.42718-1-sigmaris@gmail.com>
+References: <20211019215843.42718-1-sigmaris@gmail.com>
+MIME-Version: 1.0
+X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
+X-CRM114-CacheID: sfid-20211019_145901_757551_331C36C9 
+X-CRM114-Status: GOOD (  11.48  )
+X-BeenThere: linux-rockchip@lists.infradead.org
+X-Mailman-Version: 2.1.34
+Precedence: list
+List-Id: Upstream kernel work for Rockchip platforms
+ <linux-rockchip.lists.infradead.org>
+List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=unsubscribe>
+List-Archive: <http://lists.infradead.org/pipermail/linux-rockchip/>
+List-Post: <mailto:linux-rockchip@lists.infradead.org>
+List-Help: <mailto:linux-rockchip-request@lists.infradead.org?subject=help>
+List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=subscribe>
+Sender: "Linux-rockchip" <linux-rockchip-bounces@lists.infradead.org>
+Errors-To: 
+ linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org
+
+Define the memory region on RK3399 VOPs containing the gamma LUT at
+base+0x2000.
+
+Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com>
+---
+
+Changes from v1: no changes in this patch
+
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+index 3871c7fd83b0..9cbf6ccdd256 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+@@ -1619,7 +1619,7 @@ i2s2: i2s@ff8a0000 {
+ 
+ 	vopl: vop@ff8f0000 {
+ 		compatible = "rockchip,rk3399-vop-lit";
+-		reg = <0x0 0xff8f0000 0x0 0x3efc>;
++		reg = <0x0 0xff8f0000 0x0 0x2000>, <0x0 0xff8f2000 0x0 0x400>;
+ 		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
+ 		assigned-clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
+ 		assigned-clock-rates = <400000000>, <100000000>;
+@@ -1676,7 +1676,7 @@ vopl_mmu: iommu@ff8f3f00 {
+ 
+ 	vopb: vop@ff900000 {
+ 		compatible = "rockchip,rk3399-vop-big";
+-		reg = <0x0 0xff900000 0x0 0x3efc>;
++		reg = <0x0 0xff900000 0x0 0x2000>, <0x0 0xff902000 0x0 0x1000>;
+ 		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
+ 		assigned-clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
+ 		assigned-clock-rates = <400000000>, <100000000>;
diff --git a/srcpkgs/pinebookpro-kernel/patches/pbp-dpaltmode.patch b/srcpkgs/pinebookpro-kernel/patches/pbp-dpaltmode.patch
new file mode 100644
index 000000000000..4b65ea4e41e4
--- /dev/null
+++ b/srcpkgs/pinebookpro-kernel/patches/pbp-dpaltmode.patch
@@ -0,0 +1,854 @@
+Source: https://megous.com/git/linux
+Upstream: no
+
+From 1fc012b18f91abf70e9ab8cbdef2f0e47e80c14e Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sun, 7 Nov 2021 19:28:27 +0100
+Subject: usb: typec: fusb302: Set the current before enabling pullups
+
+This seems more reasonable and should avoid short period of incorrect
+current setting being applied to CC pin.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/tcpm/fusb302.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
+index 72f9001b0792..776a949ef6e3 100644
+--- a/drivers/usb/typec/tcpm/fusb302.c
++++ b/drivers/usb/typec/tcpm/fusb302.c
+@@ -635,6 +635,14 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
+ 		goto done;
+ 	}
+ 
++	/* adjust current for SRC */
++	ret = fusb302_set_src_current(chip, cc_src_current[cc]);
++	if (ret < 0) {
++		fusb302_log(chip, "cannot set src current %s, ret=%d",
++			    typec_cc_status_name[cc], ret);
++		goto done;
++	}
++
+ 	ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES0,
+ 				     switches0_mask, switches0_data);
+ 	if (ret < 0) {
+@@ -645,14 +653,6 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
+ 	chip->cc1 = TYPEC_CC_OPEN;
+ 	chip->cc2 = TYPEC_CC_OPEN;
+ 
+-	/* adjust current for SRC */
+-	ret = fusb302_set_src_current(chip, cc_src_current[cc]);
+-	if (ret < 0) {
+-		fusb302_log(chip, "cannot set src current %s, ret=%d",
+-			    typec_cc_status_name[cc], ret);
+-		goto done;
+-	}
+-
+ 	/* enable/disable interrupts, BC_LVL for SNK and COMP_CHNG for SRC */
+ 	switch (cc) {
+ 	case TYPEC_CC_RP_DEF:
+-- 
+cgit v1.2.3
+
+From cd26cebee9bf5e0a1a064d391195db761dbf40a6 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Tue, 23 Nov 2021 17:57:06 +0100
+Subject: usb: typec: fusb302: Update VBUS state even if VBUS interrupt is not
+ triggered
+
+This seems to improve robustness.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/tcpm/fusb302.c | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
+index 70b0e15992af..1d5affaabcf3 100644
+--- a/drivers/usb/typec/tcpm/fusb302.c
++++ b/drivers/usb/typec/tcpm/fusb302.c
+@@ -1716,14 +1716,16 @@ static void fusb302_irq_work(struct work_struct *work)
+ 
+ 	fusb302_print_state(chip);
+ 
+-	if (interrupt & FUSB_REG_INTERRUPT_VBUSOK) {
+-		vbus_present = !!(status0 & FUSB_REG_STATUS0_VBUSOK);
++	vbus_present = !!(status0 & FUSB_REG_STATUS0_VBUSOK);
++	if (interrupt & FUSB_REG_INTERRUPT_VBUSOK)
+ 		fusb302_log(chip, "IRQ: VBUS_OK, vbus=%s",
+ 			    vbus_present ? "On" : "Off");
+-		if (vbus_present != chip->vbus_present) {
+-			chip->vbus_present = vbus_present;
+-			tcpm_vbus_change(chip->tcpm_port);
+-		}
++	if (vbus_present != chip->vbus_present) {
++		chip->vbus_present = vbus_present;
++		if (!(interrupt & FUSB_REG_INTERRUPT_VBUSOK))
++		fusb302_log(chip, "IRQ: VBUS changed without interrupt, vbus=%s",
++			    vbus_present ? "On" : "Off");
++		tcpm_vbus_change(chip->tcpm_port);
+ 	}
+ 
+ 	if (interrupta & FUSB_REG_INTERRUPTA_TOGDONE) {
+-- 
+cgit v1.2.3
+
+From a8e657e94f489297fa7d80767980730207ebb1bd Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sun, 14 Nov 2021 01:14:25 +0100
+Subject: usb: typec: fusb302: Add OF extcon support
+
+It's possible to create a dependency cycle between fusb302 and
+other drivers via extcon device, so we retrieve the device on
+demand after probe and not during probe.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/tcpm/fusb302.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
+index ae3b930d774f..0c5dd0058f5e 100644
+--- a/drivers/usb/typec/tcpm/fusb302.c
++++ b/drivers/usb/typec/tcpm/fusb302.c
+@@ -518,6 +518,16 @@ static int tcpm_get_current_limit(struct tcpc_dev *dev)
+ 	int current_limit = 0;
+ 	unsigned long timeout;
+ 
++	/*
++	 * To avoid cycles in OF dependencies, we get extcon when necessary
++	 * outside of probe function.
++	 */
++	if (of_property_read_bool(chip->dev->of_node, "extcon") && !chip->extcon) {
++		chip->extcon = extcon_get_edev_by_phandle(chip->dev, 0);
++		if (IS_ERR(chip->extcon))
++			chip->extcon = NULL;
++	}
++
+ 	if (!chip->extcon)
+ 		return 0;
+ 
+-- 
+cgit v1.2.3
+
+From b6d4f583034b4098587497cd0e138223b6697a25 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sat, 20 Nov 2021 14:33:58 +0100
+Subject: usb: typec: fusb302: Fix register definitions
+
+MEASURE_VBUS bit is at position 6. MDAC bits are also wrong.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/tcpm/fusb302_reg.h | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/usb/typec/tcpm/fusb302_reg.h b/drivers/usb/typec/tcpm/fusb302_reg.h
+index edc0e4b0f1e6..f37d226c5027 100644
+--- a/drivers/usb/typec/tcpm/fusb302_reg.h
++++ b/drivers/usb/typec/tcpm/fusb302_reg.h
+@@ -27,14 +27,13 @@
+ #define FUSB_REG_SWITCHES1_TXCC2_EN		BIT(1)
+ #define FUSB_REG_SWITCHES1_TXCC1_EN		BIT(0)
+ #define FUSB_REG_MEASURE			0x04
+-#define FUSB_REG_MEASURE_MDAC5			BIT(7)
+-#define FUSB_REG_MEASURE_MDAC4			BIT(6)
+-#define FUSB_REG_MEASURE_MDAC3			BIT(5)
+-#define FUSB_REG_MEASURE_MDAC2			BIT(4)
+-#define FUSB_REG_MEASURE_MDAC1			BIT(3)
+-#define FUSB_REG_MEASURE_MDAC0			BIT(2)
+-#define FUSB_REG_MEASURE_VBUS			BIT(1)
+-#define FUSB_REG_MEASURE_XXXX5			BIT(0)
++#define FUSB_REG_MEASURE_VBUS			BIT(6)
++#define FUSB_REG_MEASURE_MDAC5			BIT(5)
++#define FUSB_REG_MEASURE_MDAC4			BIT(4)
++#define FUSB_REG_MEASURE_MDAC3			BIT(3)
++#define FUSB_REG_MEASURE_MDAC2			BIT(2)
++#define FUSB_REG_MEASURE_MDAC1			BIT(1)
++#define FUSB_REG_MEASURE_MDAC0			BIT(0)
+ #define FUSB_REG_CONTROL0			0x06
+ #define FUSB_REG_CONTROL0_TX_FLUSH		BIT(6)
+ #define FUSB_REG_CONTROL0_INT_MASK		BIT(5)
+@@ -105,7 +104,6 @@
+ #define FUSB_REG_STATUS0A_RX_SOFT_RESET		BIT(1)
+ #define FUSB_REG_STATUS0A_RX_HARD_RESET		BIT(0)
+ #define FUSB_REG_STATUS1A			0x3D
+-#define FUSB_REG_STATUS1A_TOGSS			BIT(3)
+ #define FUSB_REG_STATUS1A_TOGSS_RUNNING		0x0
+ #define FUSB_REG_STATUS1A_TOGSS_SRC1		0x1
+ #define FUSB_REG_STATUS1A_TOGSS_SRC2		0x2
+-- 
+cgit v1.2.3
+
+From 5f43c360ba28cb7f53c35f0e4221cd0e9abd1624 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sat, 20 Nov 2021 14:35:10 +0100
+Subject: usb: typec: fusb302: Clear interrupts before we start toggling
+
+This is recommended by the datasheet.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/tcpm/fusb302.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
+index 0c5dd0058f5e..011dce5e73a2 100644
+--- a/drivers/usb/typec/tcpm/fusb302.c
++++ b/drivers/usb/typec/tcpm/fusb302.c
+@@ -586,6 +586,7 @@ static int fusb302_set_toggling(struct fusb302_chip *chip,
+ 				enum toggling_mode mode)
+ {
+ 	int ret = 0;
++	u8 reg;
+ 
+ 	/* first disable toggling */
+ 	ret = fusb302_i2c_clear_bits(chip, FUSB_REG_CONTROL2,
+@@ -644,6 +645,12 @@ static int fusb302_set_toggling(struct fusb302_chip *chip,
+ 	} else {
+ 		/* Datasheet says vconn MUST be off when toggling */
+ 		WARN(chip->vconn_on, "Vconn is on during toggle start");
++
++		/* clear interrupts */
++                ret = fusb302_i2c_read(chip, FUSB_REG_INTERRUPT, &reg);
++		if (ret < 0)
++			return ret;
++
+ 		/* unmask TOGDONE interrupt */
+ 		ret = fusb302_i2c_clear_bits(chip, FUSB_REG_MASKA,
+ 					     FUSB_REG_MASKA_TOGDONE);
+-- 
+cgit v1.2.3
+
+From c9c0c64a3ecabb48594a6da29bed7b70e7c1cbb9 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sun, 7 Nov 2021 19:24:40 +0100
+Subject: usb: typec: typec-extcon: Add typec -> extcon bridge driver
+
+This bridge connects standard Type C port interfaces for controling
+muxes, switches and usb roles to muxes, switches and usb role
+drivers controlled via extcon interface.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/Kconfig        |   7 +
+ drivers/usb/typec/Makefile       |   1 +
+ drivers/usb/typec/typec-extcon.c | 337 +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 345 insertions(+)
+ create mode 100644 drivers/usb/typec/typec-extcon.c
+
+diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
+index ab480f38523a..01ecc5e590f1 100644
+--- a/drivers/usb/typec/Kconfig
++++ b/drivers/usb/typec/Kconfig
+@@ -88,6 +88,13 @@ config TYPEC_QCOM_PMIC
+ 	  It will also enable the VBUS output to connected devices when a
+ 	  DFP connection is made.
+ 
++config TYPEC_EXTCON
++	tristate "Type-C switch/mux -> extcon interface bridge driver"
++	depends on USB_ROLE_SWITCH
++	help
++	  Say Y or M here if your system needs bridging between typec class
++	  and extcon interfaces.
++
+ source "drivers/usb/typec/mux/Kconfig"
+ 
+ source "drivers/usb/typec/altmodes/Kconfig"
+diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
+index a0adb8947a30..d9d829386b73 100644
+--- a/drivers/usb/typec/Makefile
++++ b/drivers/usb/typec/Makefile
+@@ -8,4 +8,5 @@ obj-$(CONFIG_TYPEC_TPS6598X)	+= tipd/
+ obj-$(CONFIG_TYPEC_HD3SS3220)	+= hd3ss3220.o
+ obj-$(CONFIG_TYPEC_QCOM_PMIC)	+= qcom-pmic-typec.o
+ obj-$(CONFIG_TYPEC_STUSB160X) 	+= stusb160x.o
++obj-$(CONFIG_TYPEC_EXTCON)	+= typec-extcon.o
+ obj-$(CONFIG_TYPEC)		+= mux/
+diff --git a/drivers/usb/typec/typec-extcon.c b/drivers/usb/typec/typec-extcon.c
+new file mode 100644
+index 000000000000..143ff2486f2f
+--- /dev/null
++++ b/drivers/usb/typec/typec-extcon.c
+@@ -0,0 +1,337 @@
++/*
++ * typec -> extcon bridge
++ * Copyright (c) 2021 Ondřej Jirman <megi@xff.cz>
++ *
++ * This driver bridges standard type-c interfaces to drivers that
++ * expect extcon interface.
++ */
++
++#include <linux/delay.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/power_supply.h>
++#include <linux/platform_device.h>
++#include <linux/usb/pd.h>
++#include <linux/usb/role.h>
++#include <linux/usb/typec.h>
++#include <linux/usb/typec_dp.h>
++#include <linux/usb/typec_mux.h>
++#include <linux/extcon-provider.h>
++
++struct typec_extcon {
++        struct device *dev;
++
++	/* consumers */
++	struct usb_role_switch *role_sw;
++        struct typec_switch *sw;
++        struct typec_mux *mux;
++
++	/* providers */
++	struct extcon_dev *extcon;
++	struct notifier_block extcon_nb;
++
++	/* cached state from typec controller */
++	enum usb_role role;
++	enum typec_orientation orientation;
++	struct typec_altmode alt;
++	unsigned long mode;
++	bool has_alt;
++	struct mutex lock;
++};
++
++static const unsigned int typec_extcon_cable[] = {
++	EXTCON_DISP_DP,
++
++	EXTCON_USB,
++	EXTCON_USB_HOST,
++
++	EXTCON_CHG_USB_SDP,
++	EXTCON_CHG_USB_CDP,
++	EXTCON_CHG_USB_DCP,
++	EXTCON_CHG_USB_ACA,
++
++	EXTCON_NONE,
++};
++
++static void typec_extcon_set_cable(struct typec_extcon *tce, int id, bool on,
++				   union extcon_property_value prop_ss,
++				   union extcon_property_value prop_or)
++{
++	union extcon_property_value cur_ss, cur_or;
++	bool prop_diff = false;
++	int ret;
++
++	ret = extcon_get_property(tce->extcon, id,
++				  EXTCON_PROP_USB_SS, &cur_ss);
++	if (ret || cur_ss.intval != prop_ss.intval)
++		prop_diff = true;
++
++	ret = extcon_get_property(tce->extcon, id,
++				  EXTCON_PROP_USB_TYPEC_POLARITY, &cur_or);
++	if (ret || cur_or.intval != prop_or.intval)
++		prop_diff = true;
++
++	if (!on && extcon_get_state(tce->extcon, id)) {
++		extcon_set_state_sync(tce->extcon, id, false);
++	} else if (on && (!extcon_get_state(tce->extcon, id) || prop_diff)) {
++		extcon_set_state(tce->extcon, id, true);
++		extcon_set_property(tce->extcon, id,
++				    EXTCON_PROP_USB_SS, prop_ss);
++		extcon_set_property(tce->extcon, id,
++				    EXTCON_PROP_USB_TYPEC_POLARITY, prop_or);
++		extcon_sync(tce->extcon, id);
++	}
++}
++
++static int typec_extcon_sync_extcon(struct typec_extcon *tce)
++{
++	union extcon_property_value prop_ss, prop_or;
++	bool has_dp = false;
++
++        mutex_lock(&tce->lock);
++
++	/* connector is disconnected */
++	if (tce->orientation == TYPEC_ORIENTATION_NONE) {
++		typec_extcon_set_cable(tce, EXTCON_USB, false, prop_ss, prop_or);
++		typec_extcon_set_cable(tce, EXTCON_USB_HOST, false, prop_ss, prop_or);
++		typec_extcon_set_cable(tce, EXTCON_DISP_DP, false, prop_ss, prop_or);
++
++		extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_SDP, false);
++		extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_DCP, false);
++		extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_CDP, false);
++		extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_ACA, false);
++
++                goto out_unlock;
++	}
++
++	prop_or.intval = tce->orientation == TYPEC_ORIENTATION_NORMAL ? 0 : 1;
++	prop_ss.intval = 0;
++
++	if (tce->has_alt && tce->alt.svid == USB_TYPEC_DP_SID) {
++		switch (tce->mode) {
++		case TYPEC_STATE_SAFE:
++			break;
++		case TYPEC_DP_STATE_C:
++		case TYPEC_DP_STATE_E:
++			has_dp = true;
++			break;
++		case TYPEC_DP_STATE_D:
++			has_dp = true;
++			fallthrough;
++		case TYPEC_STATE_USB:
++			prop_ss.intval = 1;
++			break;
++		default:
++			dev_err(tce->dev, "unhandled mux mode=%lu\n", tce->mode);
++			break;
++		}
++	}
++
++	typec_extcon_set_cable(tce, EXTCON_USB,
++			tce->role == USB_ROLE_DEVICE, prop_ss, prop_or);
++	typec_extcon_set_cable(tce, EXTCON_USB_HOST,
++			tce->role == USB_ROLE_HOST, prop_ss, prop_or);
++
++	typec_extcon_set_cable(tce, EXTCON_DISP_DP, has_dp, prop_ss, prop_or);
++
++out_unlock:
++	mutex_unlock(&tce->lock);
++	return 0;
++}
++
++static int typec_extcon_sw_set(struct typec_switch *sw,
++			       enum typec_orientation orientation)
++{
++        struct typec_extcon *tce = typec_switch_get_drvdata(sw);
++
++	dev_dbg(tce->dev, "SW SET: orientation=%d\n", orientation);
++
++        mutex_lock(&tce->lock);
++	tce->orientation = orientation;
++        mutex_unlock(&tce->lock);
++
++	typec_extcon_sync_extcon(tce);
++
++        return 0;
++}
++
++static int typec_extcon_mux_set(struct typec_mux *mux,
++				struct typec_mux_state *state)
++{
++        struct typec_extcon *tce = typec_mux_get_drvdata(mux);
++	struct typec_altmode *alt = state->alt;
++
++	dev_dbg(tce->dev, "MUX SET: state->mode=%lu\n", state->mode);
++	if (alt)
++		dev_dbg(tce->dev, "      ...alt: svid=%04hx mode=%d vdo=%08x active=%u\n",
++			alt->svid, alt->mode, alt->vdo, alt->active);
++
++        mutex_lock(&tce->lock);
++	tce->mode = state->mode;
++	tce->has_alt = alt != NULL;
++        if (alt)
++		tce->alt = *alt;
++	mutex_unlock(&tce->lock);
++
++	typec_extcon_sync_extcon(tce);
++
++        return 0;
++}
++
++static int typec_extcon_usb_set_role(struct usb_role_switch *sw,
++				     enum usb_role role)
++{
++        struct typec_extcon *tce = usb_role_switch_get_drvdata(sw);
++
++	dev_dbg(tce->dev, "ROLE SET: role=%d\n", role);
++
++        mutex_lock(&tce->lock);
++	tce->role = role;
++	mutex_unlock(&tce->lock);
++
++	typec_extcon_sync_extcon(tce);
++
++        return 0;
++}
++
++static int typec_extcon_notifier(struct notifier_block *nb,
++					 unsigned long action, void *data)
++{
++	struct typec_extcon *tce = container_of(nb, struct typec_extcon, extcon_nb);
++
++	bool sdp = extcon_get_state(tce->extcon, EXTCON_CHG_USB_SDP);
++	bool cdp = extcon_get_state(tce->extcon, EXTCON_CHG_USB_CDP);
++	bool dcp = extcon_get_state(tce->extcon, EXTCON_CHG_USB_DCP);
++	bool usb = extcon_get_state(tce->extcon, EXTCON_USB);
++	bool usb_host = extcon_get_state(tce->extcon, EXTCON_USB_HOST);
++	bool dp = extcon_get_state(tce->extcon, EXTCON_DISP_DP);
++
++	dev_info(tce->dev, "extcon changed sdp=%d cdp=%d dcp=%d usb=%d usb_host=%d dp=%d\n",
++		 sdp, cdp, dcp, usb, usb_host, dp);
++
++	return NOTIFY_OK;
++}
++
++static int typec_extcon_probe(struct platform_device *pdev)
++{
++        struct typec_switch_desc sw_desc = { };
++        struct typec_mux_desc mux_desc = { };
++        struct usb_role_switch_desc role_desc = { };
++        struct device *dev = &pdev->dev;
++        struct typec_extcon *tce;
++        int ret = 0;
++
++        tce = devm_kzalloc(dev, sizeof(*tce), GFP_KERNEL);
++        if (!tce)
++                return -ENOMEM;
++
++        tce->dev = &pdev->dev;
++	mutex_init(&tce->lock);
++	tce->mode = TYPEC_STATE_SAFE;
++
++	sw_desc.drvdata = tce;
++	sw_desc.fwnode = dev->fwnode;
++	sw_desc.set = typec_extcon_sw_set;
++
++	tce->sw = typec_switch_register(dev, &sw_desc);
++	if (IS_ERR(tce->sw))
++		return dev_err_probe(dev, PTR_ERR(tce->sw),
++				     "Error registering typec switch\n");
++
++	mux_desc.drvdata = tce;
++	mux_desc.fwnode = dev->fwnode;
++	mux_desc.set = typec_extcon_mux_set;
++
++	tce->mux = typec_mux_register(dev, &mux_desc);
++	if (IS_ERR(tce->mux)) {
++		ret = dev_err_probe(dev, PTR_ERR(tce->mux),
++				    "Error registering typec mux\n");
++		goto err_sw;
++	}
++
++	role_desc.driver_data = tce;
++	role_desc.fwnode = dev->fwnode;
++	role_desc.name = fwnode_get_name(dev->fwnode);
++	role_desc.set = typec_extcon_usb_set_role;
++
++	tce->role_sw = usb_role_switch_register(dev, &role_desc);
++	if (IS_ERR(tce->role_sw)) {
++		ret = dev_err_probe(dev, PTR_ERR(tce->role_sw),
++				    "Error registering USB role switch\n");
++		goto err_mux;
++	}
++
++	tce->extcon = devm_extcon_dev_allocate(dev, typec_extcon_cable);
++	if (IS_ERR(tce->extcon)) {
++		ret = PTR_ERR(tce->extcon);
++		goto err_role;
++	}
++
++	ret = devm_extcon_dev_register(dev, tce->extcon);
++	if (ret) {
++		ret = dev_err_probe(dev, ret, "failed to register extcon device\n");
++		goto err_role;
++	}
++
++	extcon_set_property_capability(tce->extcon, EXTCON_USB,
++				       EXTCON_PROP_USB_SS);
++	extcon_set_property_capability(tce->extcon, EXTCON_USB,
++				       EXTCON_PROP_USB_TYPEC_POLARITY);
++	extcon_set_property_capability(tce->extcon, EXTCON_USB_HOST,
++				       EXTCON_PROP_USB_SS);
++	extcon_set_property_capability(tce->extcon, EXTCON_USB_HOST,
++				       EXTCON_PROP_USB_TYPEC_POLARITY);
++	extcon_set_property_capability(tce->extcon, EXTCON_DISP_DP,
++				       EXTCON_PROP_USB_SS);
++	extcon_set_property_capability(tce->extcon, EXTCON_DISP_DP,
++				       EXTCON_PROP_USB_TYPEC_POLARITY);
++
++	tce->extcon_nb.notifier_call = typec_extcon_notifier;
++	ret = devm_extcon_register_notifier_all(dev, tce->extcon, &tce->extcon_nb);
++	if (ret) {
++		dev_err_probe(dev, ret, "Failed to register extcon notifier\n");
++		goto err_role;
++	}
++
++	return 0;
++
++err_role:
++	usb_role_switch_unregister(tce->role_sw);
++err_mux:
++	typec_mux_unregister(tce->mux);
++err_sw:
++	typec_switch_unregister(tce->sw);
++	return ret;
++}
++
++static int typec_extcon_remove(struct platform_device *pdev)
++{
++        struct typec_extcon *tce = platform_get_drvdata(pdev);
++
++	usb_role_switch_unregister(tce->role_sw);
++	typec_mux_unregister(tce->mux);
++	typec_switch_unregister(tce->sw);
++
++        return 0;
++}
++
++static struct of_device_id typec_extcon_of_match_table[] = {
++        { .compatible = "linux,typec-extcon-bridge" },
++        { },
++};
++MODULE_DEVICE_TABLE(of, typec_extcon_of_match_table);
++
++static struct platform_driver typec_extcon_driver = {
++        .driver = {
++                .name = "typec-extcon",
++                .of_match_table = typec_extcon_of_match_table,
++        },
++        .probe = typec_extcon_probe,
++        .remove = typec_extcon_remove,
++};
++
++module_platform_driver(typec_extcon_driver);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Ondrej Jirman <megous@megous.com>");
++MODULE_DESCRIPTION("typec -> extcon bridge driver");
+-- 
+cgit v1.2.3
+
+From 4f9167affd8b3647ebc1b13cc3a0ff1b949b0c49 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Tue, 23 Nov 2021 17:32:18 +0100
+Subject: phy: rockchip-typec: Make sure the plug orientation is respected
+
+RK3399 TRM says about bit 8:
+
+typec_conn_dir_sel: TypeC connect direction select
+
+- 0: select typec_conn_dir (bit0 of this register) to TypeC PHY
+- 1: select TCPC ouput typec_con_dir to TypeC PHY (default value)
+
+This means that by default, typec_conn_dir bit is not respected.
+Fix setting of typec_conn_dir by setting typec_conn_dir to 0 first.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/phy/rockchip/phy-rockchip-typec.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
+index d2bbdc96a167..fa10ee9a5794 100644
+--- a/drivers/phy/rockchip/phy-rockchip-typec.c
++++ b/drivers/phy/rockchip/phy-rockchip-typec.c
+@@ -350,6 +350,7 @@ struct usb3phy_reg {
+  * struct rockchip_usb3phy_port_cfg - usb3-phy port configuration.
+  * @reg: the base address for usb3-phy config.
+  * @typec_conn_dir: the register of type-c connector direction.
++ * @typec_conn_dir_sel: the register of type-c connector direction source.
+  * @usb3tousb2_en: the register of type-c force usb2 to usb2 enable.
+  * @external_psm: the register of type-c phy external psm clock.
+  * @pipe_status: the register of type-c phy pipe status.
+@@ -360,6 +361,7 @@ struct usb3phy_reg {
+ struct rockchip_usb3phy_port_cfg {
+ 	unsigned int reg;
+ 	struct usb3phy_reg typec_conn_dir;
++	struct usb3phy_reg typec_conn_dir_sel;
+ 	struct usb3phy_reg usb3tousb2_en;
+ 	struct usb3phy_reg external_psm;
+ 	struct usb3phy_reg pipe_status;
+@@ -434,6 +436,7 @@ static const struct rockchip_usb3phy_port_cfg rk3399_usb3phy_port_cfgs[] = {
+ 	{
+ 		.reg = 0xff7c0000,
+ 		.typec_conn_dir	= { 0xe580, 0, 16 },
++		.typec_conn_dir_sel	= { 0xe580, 8, 16+8 },
+ 		.usb3tousb2_en	= { 0xe580, 3, 19 },
+ 		.external_psm	= { 0xe588, 14, 30 },
+ 		.pipe_status	= { 0xe5c0, 0, 0 },
+@@ -444,6 +447,7 @@ static const struct rockchip_usb3phy_port_cfg rk3399_usb3phy_port_cfgs[] = {
+ 	{
+ 		.reg = 0xff800000,
+ 		.typec_conn_dir	= { 0xe58c, 0, 16 },
++		.typec_conn_dir_sel	= { 0xe58c, 8, 16+8 },
+ 		.usb3tousb2_en	= { 0xe58c, 3, 19 },
+ 		.external_psm	= { 0xe594, 14, 30 },
+ 		.pipe_status	= { 0xe5c0, 16, 16 },
+@@ -739,6 +743,7 @@ static int tcphy_phy_init(struct rockchip_typec_phy *tcphy, u8 mode)
+ 
+ 	reset_control_deassert(tcphy->tcphy_rst);
+ 
++	property_enable(tcphy, &cfg->typec_conn_dir_sel, 0);
+ 	property_enable(tcphy, &cfg->typec_conn_dir, tcphy->flip);
+ 	tcphy_dp_aux_set_flip(tcphy);
+ 
+-- 
+cgit v1.2.3
+
+From 331a9126d98c94f315482f14eed307d184a26f72 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Wed, 2 Dec 2020 12:09:45 +0100
+Subject: arm64: dts: rk3399-pinebook-pro: Fix USB-PD charging
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+index c2f021a1a18f..d7fe1d99b546 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+@@ -713,9 +713,9 @@
+ 			op-sink-microwatt = <1000000>;
+ 			power-role = "dual";
+ 			sink-pdos =
+-				<PDO_FIXED(5000, 2500, PDO_FIXED_USB_COMM)>;
++				<PDO_FIXED(5000, 2500, PDO_FIXED_USB_COMM | PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP)>;
+ 			source-pdos =
+-				<PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM)>;
++				<PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM | PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP)>;
+ 			try-power-role = "sink";
+ 
+ 			ports {
+-- 
+cgit v1.2.3
+
+From 6947a3f43482268bc96d2eb6a7fc51323a83d9f7 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sun, 14 Nov 2021 01:16:51 +0100
+Subject: arm64: dts: rk3399-pinebook-pro: Improve Type-C support on Pinebook
+ Pro
+
+This is using the same extcon bridge developed by me for Pinephone Pro.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ .../boot/dts/rockchip/rk3399-pinebook-pro.dts      | 51 +++++++++++++++++++---
+ 1 file changed, 46 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+index d7fe1d99b546..ae175ee3f4c3 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+@@ -345,7 +345,7 @@
+ 
+ 	/* Regulators supplied by vcc5v0_usb */
+ 	/* Type C port power supply regulator */
+-	vbus_5vout: vbus_typec: vbus-5vout {
++	vbus_5vout: vbus-5vout {
+ 		compatible = "regulator-fixed";
+ 		enable-active-high;
+ 		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
+@@ -384,6 +384,14 @@
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&dc_det_pin>;
+ 	};
++
++	typec_extcon_bridge: typec-extcon {
++		compatible = "linux,typec-extcon-bridge";
++		usb-role-switch;
++		orientation-switch;
++		mode-switch;
++		svid = /bits/ 16 <0xff01>;
++	};
+ };
+ 
+ &cpu_b0 {
+@@ -410,6 +418,12 @@
+ 	cpu-supply = <&vdd_cpu_l>;
+ };
+ 
++&cdn_dp {
++	status = "okay";
++	extcon = <&typec_extcon_bridge>;
++	phys = <&tcphy0_dp>;
++};
++
+ &edp {
+ 	force-hpd;
+ 	pinctrl-names = "default";
+@@ -704,7 +718,9 @@
+ 		interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&fusb0_int_pin>;
+-		vbus-supply = <&vbus_typec>;
++		vbus-supply = <&vbus_5vout>;
++		usb-role-switch = <&typec_extcon_bridge>;
++		extcon = <&typec_extcon_bridge>;
+ 
+ 		connector {
+ 			compatible = "usb-c-connector";
+@@ -717,6 +733,15 @@
+ 			source-pdos =
+ 				<PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM | PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP)>;
+ 			try-power-role = "sink";
++			mode-switch = <&typec_extcon_bridge>;
++			orientation-switch = <&typec_extcon_bridge>;
++
++			altmodes {
++				dp {
++					svid = <0xff01>;
++					vdo = <0x0c0046>;
++				};
++			};
+ 
+ 			ports {
+ 				#address-cells = <1>;
+@@ -984,6 +1009,7 @@
+ };
+ 
+ &tcphy0 {
++	extcon = <&typec_extcon_bridge>;
+ 	status = "okay";
+ };
+ 
+@@ -1017,13 +1043,20 @@
+ 
+ &u2phy0 {
+ 	status = "okay";
++	extcon = <&typec_extcon_bridge>;
+ 
+ 	u2phy0_otg: otg-port {
++		/*
++		 * Type-C port on the left side of the chasis.
++		 */
+ 		status = "okay";
+ 	};
+ 
+ 	u2phy0_host: host-port {
+-		phy-supply = <&vcc5v0_otg>;
++		/*
++		 * USB 2.0 host port for the keyboard (internally connected).
++		 */
++		phy-supply = <&vcc5v0_usb>;
+ 		status = "okay";
+ 	};
+ 
+@@ -1038,11 +1071,18 @@
+ 	status = "okay";
+ 
+ 	u2phy1_otg: otg-port {
++		/*
++		 * USB 3.0 A port on the left side of the chasis.
++		 */
+ 		status = "okay";
+ 	};
+ 
+ 	u2phy1_host: host-port {
+-		phy-supply = <&vcc5v0_otg>;
++		/*
++		 * To the HUB that has USB camera and USB 2.0 port on the right
++		 * side of the chasis.
++		 */
++		phy-supply = <&vcc5v0_usb>;
+ 		status = "okay";
+ 	};
+ };
+@@ -1093,7 +1133,8 @@
+ };
+ 
+ &usbdrd_dwc3_0 {
+-	dr_mode = "host";
++	dr_mode = "otg";
++	extcon = <&typec_extcon_bridge>;
+ 	status = "okay";
+ };
+ 
+-- 
+cgit v1.2.3
+
diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index c8b1255026de..8c88917e5a77 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -1,15 +1,18 @@
 # Template file for 'pinebookpro-kernel'
 pkgname=pinebookpro-kernel
-version=5.10.46
+version=5.15.38
 revision=1
 archs="aarch64*"
-wrksrc="linux-${version}"
+wrksrc="linux-${version%.*}"
 short_desc="Linux kernel for Pinebook Pro"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 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=569122a39c6b325befb9ac1c07da0c53e6363b3baacd82081d131b06c1dc1415
+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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
+ b62b570af247d884dd0232f509e4e33c5edf57240b1712733e61c37a1d4b4424"
+skip_extraction="patch-${version}.xz"
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
@@ -19,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"
@@ -28,6 +31,7 @@ kernel_hooks_version="${_kernver}"
 # These files could be modified when an external module is built.
 mutable_files="
  /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
  /usr/lib/modules/${_kernver}/modules.softdep
  /usr/lib/modules/${_kernver}/modules.dep
  /usr/lib/modules/${_kernver}/modules.dep.bin
@@ -37,40 +41,40 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.alias.bin
  /usr/lib/modules/${_kernver}/modules.devname"
 
-do_configure() {
-	# 5.4 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
 
-	local arch subarch _args
+if [ "$CROSS_BUILD" ]; then
+	_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
 
-	arch=arm64
+pre_patch() {
+	xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1
+}
 
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
+do_configure() {
+	local arch
+
+	arch=arm64
 
 	cp -f ${FILESDIR}/dotconfig .config
-	make ${makejobs} ARCH=$arch ${_args} oldconfig
+	make ${makejobs} ARCH=$arch ${_cross} oldconfig
 
 	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
 	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
 }
 
 do_build() {
-	local arch _cross _args
+	local arch _args
 
 	_args="Image modules dtbs"
 	arch=arm64
 
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
 	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+	make ARCH=$arch ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_cross} ${makejobs} ${_args}
 }
 
 do_install() {
@@ -82,7 +86,7 @@ do_install() {
 	sed -i '2iexit 0' scripts/depmod.sh
 
 	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} ${_cross} modules_install
 
 	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
 
@@ -90,7 +94,7 @@ do_install() {
 	vinstall System.map 644 boot System.map-${_kernver}
 
 	vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
 
 	# Switch to /usr.
 	vmkdir usr
@@ -109,7 +113,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${subarch:-$arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -117,7 +121,7 @@ do_install() {
 	# Remove firmware stuff provided by the "linux-firmware" pkg.
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
+	for i in acpi asm-generic clocksource config crypto drm generated linux vdso \
 		math-emu media net pcmcia scsi sound trace uapi video xen dt-bindings; do
 		if [ -d include/$i ]; then
 			cp -a include/$i ${hdrdest}/include
@@ -132,7 +136,7 @@ do_install() {
 	# if generated files from the scripts/ directory need to be included,
 	# they need to be copied to ${hdrdest} before this step
 	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		make ${makejobs} ARCH=${subarch:-$arch} ${_cross} _mrproper_scripts
 		# remove host specific objects as well
 		find scripts -name '*.o' -delete
 	fi
@@ -170,10 +174,6 @@ do_install() {
 		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
 	done
 
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
 	# Add md headers
 	mkdir -p ${hdrdest}/drivers/md
 	cp drivers/md/*.h ${hdrdest}/drivers/md
@@ -186,14 +186,7 @@ do_install() {
 	mkdir -p ${hdrdest}/net/mac80211/
 	cp net/mac80211/*.h ${hdrdest}/net/mac80211
 
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
 	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
 	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
 
 	# add dvb headers
@@ -249,5 +242,6 @@ pinebookpro-kernel-dbg_package() {
 	short_desc+=" - debugging symbols"
 	pkg_install() {
 		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
 	}
 }

From 70f26f72602a25000db63799feda63aed2f92c3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Mar 2022 00:50:30 +0100
Subject: [PATCH 2168/2561] gmime: rename from gmime3

* drop gmime(2), it's not used by anything
* make gmime3{,-devel} a transitional subpackage
---
 common/shlibs                            |  3 +-
 srcpkgs/gmime/files/iconv-detect.h       |  1 +
 srcpkgs/gmime/files/musl-iconv-detect.h  |  1 +
 srcpkgs/gmime/template                   | 87 ++++++++++++++++--------
 srcpkgs/gmime/update                     |  1 -
 srcpkgs/gmime3                           |  1 +
 srcpkgs/gmime3-devel                     |  2 +-
 srcpkgs/gmime3/files/iconv-detect.h      |  6 --
 srcpkgs/gmime3/files/musl-iconv-detect.h |  6 --
 srcpkgs/gmime3/template                  | 68 ------------------
 srcpkgs/gmime3/update                    |  1 -
 11 files changed, 63 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/gmime/update
 create mode 120000 srcpkgs/gmime3
 delete mode 100644 srcpkgs/gmime3/files/iconv-detect.h
 delete mode 100644 srcpkgs/gmime3/files/musl-iconv-detect.h
 delete mode 100644 srcpkgs/gmime3/template
 delete mode 100644 srcpkgs/gmime3/update

diff --git a/common/shlibs b/common/shlibs
index 784375c7c9aa..d75ecdda38dc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -745,7 +745,6 @@ libpulsecore-15.0.so libpulseaudio-15.0_1
 libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
-libgmime-2.6.so.0 gmime-2.6.4_1
 libtotem-plparser.so.18 totem-pl-parser-3.26.1_1
 libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1
 libgladeui-2.so.13 libgladeui3-3.38.0_1
@@ -3574,7 +3573,7 @@ libcloudproviders.so.0 libcloudproviders-0.2.5_2
 libKF5KDEGames.so.7 libkdegames-18.08.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
+libgmime-3.0.so.0 gmime-3.2.3_1
 libgetdns.so.10 getdns-1.5.1_7
 libgetdns_ext_event.so.10 getdns-1.5.1_7
 libgetdns_ext_ev.so.10 getdns-1.5.1_7
diff --git a/srcpkgs/gmime/files/iconv-detect.h b/srcpkgs/gmime/files/iconv-detect.h
index 714cb5aa9dd4..6d9dd05b59e2 100644
--- a/srcpkgs/gmime/files/iconv-detect.h
+++ b/srcpkgs/gmime/files/iconv-detect.h
@@ -2,4 +2,5 @@
 
 #define ICONV_ISO_INT_FORMAT "iso-%u-%u"
 #define ICONV_ISO_STR_FORMAT "iso-%u-%s"
+#define ICONV_SHIFT_JIS "shift-jis"
 #define ICONV_10646 "iso-10646"
diff --git a/srcpkgs/gmime/files/musl-iconv-detect.h b/srcpkgs/gmime/files/musl-iconv-detect.h
index 9f431bf9ff00..569da106b943 100644
--- a/srcpkgs/gmime/files/musl-iconv-detect.h
+++ b/srcpkgs/gmime/files/musl-iconv-detect.h
@@ -2,4 +2,5 @@
 
 #define ICONV_ISO_INT_FORMAT "iso-%u-%u"
 #define ICONV_ISO_STR_FORMAT "iso-%u-%s"
+#define ICONV_SHIFT_JIS "shift-jis"
 #define ICONV_10646 "UCS-4BE"
diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template
index 697cbd0ab67a..57718cac3bf0 100644
--- a/srcpkgs/gmime/template
+++ b/srcpkgs/gmime/template
@@ -1,43 +1,57 @@
 # Template file for 'gmime'
 pkgname=gmime
-version=2.6.23
-revision=4
+version=3.2.7
+revision=2
+wrksrc="gmime-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --disable-mono --enable-smime
- --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="automake pkg-config intltool libtool
- $(vopt_if gir gobject-introspection)"
-makedepends="glib-devel gpgme-devel"
+configure_args="--disable-static --enable-crypto $(vopt_enable vala)
+ $(vopt_enable gir introspection)"
+hostmakedepends="pkg-config $(vopt_if vala vala)"
+makedepends="glib-devel gpgme-devel libidn2-devel
+ $(vopt_if vala vala)"
+checkdepends="gnupg2"
 short_desc="GNOME Core mime parsing library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/jstedfast/gmime"
 distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
-checksum=7149686a71ca42a1390869b6074815106b061aaeaaa8f2ef8c12c191d9a79f6a
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" am_cv_func_iconv=yes am_cv_func_iconv_works=yes"
-	configure_args+=" am_cv_lib_iconv=no ac_cv_have_iconv_detect_h=yes"
-	configure_args+=" am_cv_proto_iconv_arg1="
-fi
-
-pre_build() {
-	if [ -z "$CROSS_BUILD" ]; then
-		:
-	elif [ "$XBPS_TARGET_LIBC" = musl ]; then
+checksum=2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44
+
+build_options="gir vala"
+build_options_default="gir vala"
+
+pre_configure() {
+	[ -z "$CROSS_BUILD" ] && return 0
+
+	configure_args+=" ac_cv_have_iconv_detect_h=yes"
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
 		cp ${FILESDIR}/musl-iconv-detect.h ${wrksrc}/iconv-detect.h
 	else
-		cp ${FILESDIR}/iconv-detect.h ${wrksrc}
+		cp ${FILESDIR}/iconv-detect.h ${wrksrc}/iconv-detect.h
+	fi
+}
+
+do_check() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		make check VERBOSITY=-vv |
+		awk '
+			1
+			# utf-8 to iso-2022-jp is stateless
+			/GMimeFilterCharset.*utf-8.*iso-2022-jp/ { next }
+			# euc-kr has not been supported
+			/euc-kr to UTF-8/ { next }
+			$NF == "FAILED" { e = 1 }
+			END { exit e }
+		'
+	else
+		make check
 	fi
 }
 
 gmime-devel_package() {
-	depends="libglib-devel zlib-devel gmime>=${version}_${revision}"
+	depends="libglib-devel zlib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -45,7 +59,22 @@ gmime-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
 		if [ "$build_option_gir" ]; then
-			vmove "usr/share/gir-*"
+			vmove usr/share/gir-1.0
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
 		fi
 	}
 }
+
+gmime3_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+gmime3-devel_package() {
+	depends="${sourcepkg}-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/gmime/update b/srcpkgs/gmime/update
deleted file mode 100644
index 4ee52a63831a..000000000000
--- a/srcpkgs/gmime/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="3*" # Packages in gmime3
diff --git a/srcpkgs/gmime3 b/srcpkgs/gmime3
new file mode 120000
index 000000000000..4173041bbe71
--- /dev/null
+++ b/srcpkgs/gmime3
@@ -0,0 +1 @@
+gmime
\ No newline at end of file
diff --git a/srcpkgs/gmime3-devel b/srcpkgs/gmime3-devel
index 8029aee6f9f9..4173041bbe71 120000
--- a/srcpkgs/gmime3-devel
+++ b/srcpkgs/gmime3-devel
@@ -1 +1 @@
-gmime3
\ No newline at end of file
+gmime
\ No newline at end of file
diff --git a/srcpkgs/gmime3/files/iconv-detect.h b/srcpkgs/gmime3/files/iconv-detect.h
deleted file mode 100644
index 6d9dd05b59e2..000000000000
--- a/srcpkgs/gmime3/files/iconv-detect.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This is an auto-generated header, DO NOT EDIT! */
-
-#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
-#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
-#define ICONV_SHIFT_JIS "shift-jis"
-#define ICONV_10646 "iso-10646"
diff --git a/srcpkgs/gmime3/files/musl-iconv-detect.h b/srcpkgs/gmime3/files/musl-iconv-detect.h
deleted file mode 100644
index 569da106b943..000000000000
--- a/srcpkgs/gmime3/files/musl-iconv-detect.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This is an auto-generated header, DO NOT EDIT! */
-
-#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
-#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
-#define ICONV_SHIFT_JIS "shift-jis"
-#define ICONV_10646 "UCS-4BE"
diff --git a/srcpkgs/gmime3/template b/srcpkgs/gmime3/template
deleted file mode 100644
index 43e04197d50d..000000000000
--- a/srcpkgs/gmime3/template
+++ /dev/null
@@ -1,68 +0,0 @@
-# Template file for 'gmime3'
-pkgname=gmime3
-version=3.2.7
-revision=1
-wrksrc="gmime-${version}"
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --enable-crypto $(vopt_enable vala)
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config $(vopt_if vala vala)"
-makedepends="glib-devel gpgme-devel libidn2-devel
- $(vopt_if vala vala)"
-checkdepends="gnupg2"
-short_desc="GNOME Core mime parsing library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/jstedfast/gmime"
-distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
-checksum=2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44
-
-build_options="gir vala"
-build_options_default="gir vala"
-
-pre_configure() {
-	[ -z "$CROSS_BUILD" ] && return 0
-
-	configure_args+=" ac_cv_have_iconv_detect_h=yes"
-
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		cp ${FILESDIR}/musl-iconv-detect.h ${wrksrc}/iconv-detect.h
-	else
-		cp ${FILESDIR}/iconv-detect.h ${wrksrc}/iconv-detect.h
-	fi
-}
-
-do_check() {
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		make check VERBOSITY=-vv |
-		awk '
-			1
-			# utf-8 to iso-2022-jp is stateless
-			/GMimeFilterCharset.*utf-8.*iso-2022-jp/ { next }
-			# euc-kr has not been supported
-			/euc-kr to UTF-8/ { next }
-			$NF == "FAILED" { e = 1 }
-			END { exit e }
-		'
-	else
-		make check
-	fi
-}
-
-gmime3-devel_package() {
-	depends="libglib-devel zlib-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
-			vmove usr/share/vala
-		fi
-	}
-}
diff --git a/srcpkgs/gmime3/update b/srcpkgs/gmime3/update
deleted file mode 100644
index 0b6f335b26fa..000000000000
--- a/srcpkgs/gmime3/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gmime

From 3f9ef139f62efdbc1674a696d96995f78464fd67 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 28 Apr 2022 17:44:53 -0700
Subject: [PATCH 2169/2561] wayfire: update to 0.7.3.

---
 srcpkgs/wayfire/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 9b0026c58565..6a9e874d1723 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,13 +1,13 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.7.2
-revision=2
+version=0.7.3
+revision=1
 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
 build_style=meson
 configure_args="-Dprint_trace=false"
 hostmakedepends="pkg-config wayland-devel"
-makedepends="wf-config-devel wlroots0.14-devel cairo-devel
+makedepends="wf-config-devel wlroots-devel cairo-devel
  $(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
 depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
@@ -17,7 +17,7 @@ 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="e45fddcc22b7149d793fea08763c5b3dc0edf7c0be9d094575a32cf847560fd4
+checksum="72575b6d598087d6fe737a8066db5405d7cff88a3041447f56b83313ac9a0684
  bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f
  09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f"
 

From ced501b2ff041346b34194a51683ca697f23d489 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 28 Apr 2022 17:45:55 -0700
Subject: [PATCH 2170/2561] wayfire-plugins-extra: fix build for wayfire update

---
 .../wayfire-plugins-extra/patches/mag.patch   | 99 +++++++++++++++++++
 srcpkgs/wayfire-plugins-extra/template        |  2 +-
 2 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wayfire-plugins-extra/patches/mag.patch

diff --git a/srcpkgs/wayfire-plugins-extra/patches/mag.patch b/srcpkgs/wayfire-plugins-extra/patches/mag.patch
new file mode 100644
index 000000000000..0cb71ad5d86b
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/patches/mag.patch
@@ -0,0 +1,99 @@
+diff --git a/src/mag.cpp b/src/mag.cpp
+index 1ed4d73..f03cf7c 100644
+--- a/src/mag.cpp
++++ b/src/mag.cpp
+@@ -35,16 +35,6 @@
+ #include "wayfire/opengl.hpp"
+ #include <glm/gtc/matrix_transform.hpp>
+ 
+-extern "C"
+-{
+-#define static
+-#include <wlr/config.h>
+-#include <wlr/render/gles2.h>
+-#include <wlr/render/wlr_renderer.h>
+-#include <wlr/types/wlr_matrix.h>
+-#undef static
+-}
+-
+ #include <wayfire/util/log.hpp>
+ 
+ 
+@@ -171,19 +161,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
+ 
+     wf::effect_hook_t post_hook = [=] ()
+     {
+-        wlr_dmabuf_attributes dmabuf_attribs;
+-
+-        /* This plugin only works if this function succeeds. It will not
+-         * work with the x11 backend but works with drm, for example. */
+-        if (!wlr_output_export_dmabuf(output->handle, &dmabuf_attribs))
+-        {
+-            LOGE("Failed reading output contents");
+-            deactivate();
+-            active = false;
+-
+-            return;
+-        }
+-
+         auto cursor_position = output->get_cursor_position();
+ 
+         auto ortho = output->render->get_target_framebuffer()
+@@ -201,9 +178,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
+         float y = cursor.y;
+ 
+         auto og = output->get_relative_geometry();
+-        gl_geometry src_geometry = {0, 0, (float)og.width, (float)og.height};
+-        auto transform = output->render->get_target_framebuffer().transform;
+-        transform = glm::inverse(transform);
+ 
+         width  = og.width;
+         height = og.height;
+@@ -220,6 +194,9 @@ class wayfire_magnifier : public wf::plugin_interface_t
+         /* Compute zoom_box, forcing the zoom to stay on the output */
+         gl_geometry zoom_box;
+ 
++        /* Y-invert */
++        y = 1.0 - y;
++
+         zoom_box.x1 = x - level;
+         zoom_box.y1 = y - level;
+         zoom_box.x2 = x + level;
+@@ -249,27 +226,25 @@ class wayfire_magnifier : public wf::plugin_interface_t
+             zoom_box.y2  = 1.0;
+         }
+ 
++        zoom_box.x1 *= width - 1;
++        zoom_box.x2 *= width - 1;
++        zoom_box.y1 *= height - 1;
++        zoom_box.y2 *= height - 1;
++
+         /* Copy zoom_box part of the output to our own texture to be
+          * read by the mag_view_t. */
+-        auto wlr_texture = wlr_texture_from_dmabuf(
+-            wf::get_core().renderer, &dmabuf_attribs);
+-
+-        wf::texture_t texture{wlr_texture};
+ 
+         OpenGL::render_begin();
+         mag_view->mag_tex.allocate(width, height);
+         mag_view->mag_tex.geometry = og;
+         mag_view->mag_tex.bind();
+-
+-        OpenGL::render_transformed_texture(texture, src_geometry, zoom_box,
+-            transform * mag_view->mag_tex.get_orthographic_projection(),
+-            glm::vec4(1.0),
+-            OpenGL::TEXTURE_USE_TEX_GEOMETRY);
++        GL_CALL(glBindFramebuffer(GL_READ_FRAMEBUFFER,
++            output->render->get_target_framebuffer().fb));
++        GL_CALL(glBlitFramebuffer(zoom_box.x1, zoom_box.y2, zoom_box.x2, zoom_box.y1,
++            0, 0, width, height,
++            GL_COLOR_BUFFER_BIT, GL_LINEAR));
+         OpenGL::render_end();
+ 
+-        wlr_texture_destroy(wlr_texture);
+-        wlr_dmabuf_attributes_finish(&dmabuf_attribs);
+-
+         mag_view->damage();
+     };
+ 
diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index 79b40857cf0e..a666281e177a 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=5
+revision=6
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayfire-devel glibmm-devel"

From 071eb7364890f6215bd3ac301dc8252e6029ff3d Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 8 May 2022 13:31:20 -0700
Subject: [PATCH 2171/2561] podman: update to 4.1.0

---
 srcpkgs/podman/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index a12ca2c32440..bc2e8cce46cb 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=4.0.3
+version=4.1.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v4"
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://podman.io/"
 changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=e3b53fc9142d4f2dc085f17a377d92ffb8bfe7756c4f47b8128b38bcc3540cbc
+checksum=f814e12a7311d486c1ccdc4eb021bc6dd24499569de7a572e436342876f70e95
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
@@ -30,9 +30,10 @@ post_install() {
 	mv "${DESTDIR}/usr/bin/rootlessport" "${DESTDIR}/usr/libexec/podman/rootlessport"
 	make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
 	make install.completions DESTDIR="${DESTDIR}" PREFIX="/usr"
-	sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
-		vendor/github.com/containers/common/pkg/config/containers.conf \
-		>containers.cgfs.conf
+	cp vendor/github.com/containers/common/pkg/config/containers.conf \
+		containers.cgfs.conf
+	vsed -i -e 's|#cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
+		containers.cgfs.conf
 	vinstall containers.cgfs.conf 644 usr/share/containers containers.conf
 	vsv podman
 	vsv podman-docker

From 3d005855d69d7ec07f53bc12690437c3a887436e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 9 May 2022 12:50:19 -0400
Subject: [PATCH 2172/2561] dendrite: update to 0.8.3.

---
 srcpkgs/dendrite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 998442981fcf..7e8f9fd27312 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.8.2
+version=0.8.3
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=c09c53964434785d9828482a00e3300a7e54692a0052c71f6a245e147b46cd01
+checksum=2d61dc970bf812e13f7a81c65e811811ef950dad02631380650191214f2b5d5d
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"

From 366325a6a11d212ce742b9866e1177245732059a Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Mon, 9 May 2022 12:28:03 -0400
Subject: [PATCH 2173/2561] font-iosevka: update to 15.3.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index c971135ce5fb..479289115363 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=15.2.0
+version=15.3.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- b6b6bb50cd3c3db49739bea9fb5c92c22647631eb1b5a35aa7f48358c07ef529
- 45c853ac53b638457d943c0ccf7cf12ca77219ba7e092d7ac17ed965c5482da9"
+ 0ebdabed87473163055f2fbe6927e210c9259a94efdeac3ed54976bb0873ce0c
+ dc08f215c57fd3e3d9f4a69a600a2a0d92bd56bac47e6099c47374e7cee0b7ae"
 
 font_dirs="/usr/share/fonts/TTF"
 

From bd880a6cf2f55f028aeaecadb8409223bbb9dba4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 9 May 2022 19:23:31 -0400
Subject: [PATCH 2174/2561] chezmoi: update to 2.15.4.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 7f416e873786..119bcf35e55a 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.15.3
+version=2.15.4
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -11,7 +11,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=2c0239c643795a13420f815c7e906720cd98594152b6d6fa546b0242462adc9e
+checksum=879ce990f1655124af7e3bbf95dd3fb79453f8c1047d6f4ad5af30d86a674843
 
 pre_build() {
 	local _date

From eaf91ed51183a7b97a3748e3c966ff5ab959182b Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Tue, 10 May 2022 08:31:33 +0200
Subject: [PATCH 2175/2561] PolyMC: update to 1.2.2.

---
 srcpkgs/PolyMC/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template
index 91b439b6b529..c3a336ce02ab 100644
--- a/srcpkgs/PolyMC/template
+++ b/srcpkgs/PolyMC/template
@@ -1,6 +1,6 @@
 # Template file for 'PolyMC'
 pkgname=PolyMC
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=cmake
 configure_args="-DLauncher_BUILD_PLATFORM=Void
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-only"
 homepage="https://polymc.org/"
 distfiles="https://github.com/PolyMC/PolyMC/releases/download/${version}/PolyMC-${version}.tar.gz"
-checksum=cec7b0175bd0dc3ff2a43e822d1218772e0833332026ae681c81ecc5c51bf608
+checksum=4ce46406040b5315a598e412feecb70e5248cfc07fac9e3086597af12c102137
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=0"

From bfe0d445d31b1d942ac8e831c2ceacce1d67400c Mon Sep 17 00:00:00 2001
From: Noel Cower <ncower@nil.dev>
Date: Mon, 9 May 2022 15:23:05 -0700
Subject: [PATCH 2176/2561] sops: update to 3.7.3.

---
 srcpkgs/sops/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index ade18a059c57..09a33de74f58 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,6 +1,6 @@
 # Template file for 'sops'
 pkgname=sops
-version=3.7.0
+version=3.7.3
 revision=1
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
@@ -10,4 +10,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=909496eaed98f6ff4fadc216ad904ef2d2a82ff229e6af6cc0cb1625e2df5d83
+checksum=0e563f0c01c011ba52dd38602ac3ab0d4378f01edfa83063a00102587410ac38

From 8ea6108c6878d509d53954fd6a7d13da56f2faf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 10 May 2022 18:58:53 +0200
Subject: [PATCH 2177/2561] .github/: skip file conflicts check if no packages
 are built

workflow was limited to branches modifying srcpkgs/, but this
still triggered when modifying only update files or removing template
---
 .github/workflows/build.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f527ce1f897d..177944e1c03c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -105,8 +105,10 @@ jobs:
       - name: Check file conflicts
         if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
         run: |
-          xlocate -S &&
-          common/scripts/lint-conflicts $HOME/hostdir/binpkgs
+          if [ -s /tmp/templates ]; then
+              xlocate -S &&
+              common/scripts/lint-conflicts $HOME/hostdir/binpkgs
+          fi
 
       - name: Verify repository state
         run: |

From 2a88d3061c0a15ee7ddfce2c0ee9329c45612fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 10 May 2022 20:33:18 +0200
Subject: [PATCH 2178/2561] common/scripts/lint-conflicts: handle emptied
 packages

---
 common/scripts/lint-conflicts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index bb0e2b2fd6b3..2917f72a89a6 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -130,9 +130,12 @@ group_by_file_partial() {
 	# for all packages in xlocate
 	local pkgname file
 	## newly built packages
+	while read -r pkgver; do
+		pkgname=${pkgver%-*}
+		newly_built[$pkgname]=$pkgname
+	done < <(xbps-query "${repositories[@]}" -i -R -s '' | cut -d' ' -f 2)
 	while read -r pkgname file; do
 		owners[$file]+=" $pkgname"
-		newly_built[$pkgname]=$pkgname
 	done < <(list_newly_built_files)
 	## rest of repository
 	while read -r pkgver file; do

From cd5e4c65675664f51b63be3ab82f35da8afb8862 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 10 May 2022 15:33:46 -0500
Subject: [PATCH 2179/2561] python3-oletools: update to 0.60.1.

---
 srcpkgs/python3-oletools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template
index 08b132fac61b..9e09720167dd 100644
--- a/srcpkgs/python3-oletools/template
+++ b/srcpkgs/python3-oletools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-oletools'
 pkgname=python3-oletools
-version=0.60
-revision=2
+version=0.60.1
+revision=1
 wrksrc="oletools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/decalage2/oletools"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=85500022ebf58e9bd514e295270cb5ac2b061b2e59912432a3a7ceffd88db3e0
+checksum=34cef47d88488126952f994be7b4c20d2758203b64f69335d3d8179ad3ae0992
 
 post_install() {
 	vlicense oletools/LICENSE.txt

From 55cb8ffa90491b2e5d04f885c195b8082f5dd013 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 10 May 2022 16:13:00 -0500
Subject: [PATCH 2180/2561] python3-ytmusicapi: update to 0.22.0.

---
 srcpkgs/python3-ytmusicapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index b791bcb33c0b..faec190cff1c 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=0.21.0
+version=0.22.0
 revision=1
 wrksrc="ytmusicapi-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
-checksum=338941fb2fb52078a69fa47a34456574e4e9998caead56d27e440bacacdb917c
+checksum=5240fc8862a6bf7fd602bc420a0b48d81fae389acad6ff1ee8eeb5ed32ae09b9
 
 post_install() {
 	vlicense LICENSE

From 039f5acc79a161fc63c81a00b39304fe13c6fdc5 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 10 May 2022 21:30:17 +0200
Subject: [PATCH 2181/2561] google-chrome: update to 101.0.4951.64

---
 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 94cd9a30ad4a..c95d625d5853 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=101.0.4951.54
+version=101.0.4951.64
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=bedc9782f008645c3bcda9edbeeabf52ef15ed1d736a697819e56f2e5c37dad4
+checksum=1b6dfea8fc0232ad88a02c997facb28b06c000d9d27cedfdbde278018fcc3292
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From c8d9e12bcbfa8fd59b68680656d9eb784d1e2839 Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Mon, 9 May 2022 09:14:51 -0700
Subject: [PATCH 2182/2561] zoom: update to 5.10.4.2845

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index aa16c7503ed4..796df0c7ea2f 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.9.6.2225
+version=5.10.4.2845
 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=1e43ae0e43168586f5dd05ace1e646afe1455825b62b760e2dab0a3564da35e3
+checksum=b206618eacbae117eda78a0cfcd8986a553412dbba8f1891660e12c3366ad802
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From b1690aea027d02c131e6fd90fdb05bb2e54cf205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 9 May 2022 17:38:45 +0700
Subject: [PATCH 2183/2561] git: update to 2.36.1.

---
 srcpkgs/git/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index dc2146690ab2..702dca4ef81f 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,8 +1,7 @@
 # Template file for 'git'
 pkgname=git
-reverts="2.36.0_1"
-version=2.35.3
-revision=2
+version=2.36.1
+revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
@@ -15,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=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
+checksum=405d4a0ff6e818d1f12b3e92e1ac060f612adcb454f6299f70583058cb508370
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From c5e296b793a71fbb012946ea1c378d89026ba7a0 Mon Sep 17 00:00:00 2001
From: Tung Anh Vu <vu.tunganh96@gmail.com>
Date: Mon, 9 May 2022 14:55:24 +0200
Subject: [PATCH 2184/2561] ipe: Add qt5-svg to depends

Icons in toolbars (and possibly elsewhere) are not displayed without
qt5-svg.

Close: #37058
---
 srcpkgs/ipe/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index fbd500a3dc94..a84d5c036b2f 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,11 +1,12 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.24
-revision=5
+revision=6
 _tools_commit=v7.2.20.1
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"
 makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel
  lua53-devel poppler-devel qt5-devel libspiro-devel"
+depends="qt5-svg"
 short_desc="Drawing editor for creating figures in PDF or EPS formats"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 0c329ac6d822145059de3198b2f5078e7740eab9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 May 2022 14:13:43 +0200
Subject: [PATCH 2185/2561] ugrep: update to 3.7.11.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index fda7c355b64a..eb86699fa39a 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.10
+version=3.7.11
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=733503055e309e83898a403481d92357fc3b02d4642acdb51026dd2dd44e0477
+checksum=47cf3eee0a6eb759a5ee53b8e0e09d5d1843c5597cfd83e9c88f1b29e6873b2b
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From a196e1eb267a9945d1c46f575d1ee6009faeb119 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 May 2022 14:51:03 +0200
Subject: [PATCH 2186/2561] cloud-hypervisor: update to 23.1.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index c94d8e45e3fa..3305b00cc909 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=23.0
+version=23.1
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=80f058d3ae00e23f4762fcc1c7091f22a14801c5913298f54fbfb8591da52ba9
+checksum=c4e04a7f8af27517f3a07aee04a5eea4e81780f4ed5fa21876d282de0f998354
 
 post_install() {
 	vlicense LICENSE-APACHE

From 1d0732e6321bafbc882635e35daacd64d67c6b8e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 May 2022 14:56:09 +0200
Subject: [PATCH 2187/2561] dovecot: update to 2.3.19.

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index bfee0c1db554..abce7c8b3878 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.18
+version=2.3.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33
+checksum=0173f693d441b6248b8a62aa5fd690021a1f04a12902653e0bf2e5b012fe437b
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then

From 8955c4c7725833ab169423bfadd2e56e0b2dabc5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 May 2022 15:42:28 +0200
Subject: [PATCH 2188/2561] dovecot-plugin-pigeonhole: update to 0.5.19.

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 97c54750ab02..d3b68337604c 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.18
+version=0.5.19
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5
+checksum=10b923efcc6f3c4d92ecdbb780e12a5c33e6d0fdbe3aba5fcd3ecde4179c730c
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From deab4a9f275567412c73c707e6be8e962e038281 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 11 May 2022 20:56:38 +0200
Subject: [PATCH 2189/2561] youtube-viewer: update to 3.10.0.

---
 srcpkgs/youtube-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index af6941e45319..c7d726cdbf9c 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.9
+version=3.10.0
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=29a326b6496bc6e96840d3c854d79a3ffb9e6006a033f11478c1633c1ac48a8b
+checksum=68a2bd03c1f9a01809505e9beef75b4f64119f3709b3fb9ae6343d8b50c0bc85
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From cd7376b1144a9f30f1a7f25186ac11d3928f3797 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:20:28 -0400
Subject: [PATCH 2190/2561] intel-ucode: update to 20220510.

---
 srcpkgs/intel-ucode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index e7e57d0f6588..22516894871f 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-ucode'
 pkgname=intel-ucode
-version=20220419
+version=20220510
 revision=1
 archs="i686* x86_64*"
 wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}"
@@ -9,7 +9,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom: Proprietary"
 homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
 distfiles="${homepage}/archive/microcode-${version}.tar.gz"
-checksum=b8838d300e749c1dd55d8865bdd49dee5153beb5e29d4b0e613aee475e0c0881
+checksum=254ddc71b598fbb8dbb200ceb3af29aeb22f6bf50bc609e8f953cf9c8d286d2a
 repository=nonfree
 
 do_install() {

From c1b845992af8e7dc0f8d202990e2210dbcb8c229 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:41:25 -0400
Subject: [PATCH 2191/2561] maturin: update to 0.12.15.

---
 srcpkgs/maturin/patches/add-ppc-tier3.patch | 60 ++++++++++++---------
 srcpkgs/maturin/template                    |  4 +-
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch
index 5b5b7c2021a1..b19d2ada15ed 100644
--- a/srcpkgs/maturin/patches/add-ppc-tier3.patch
+++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch
@@ -1,7 +1,7 @@
-diff -ur setup.py setup.py
+diff -u a/setup.py b/setup.py
 --- a/setup.py
 +++ b/setup.py
-@@ -69,7 +69,7 @@
+@@ -71,7 +71,7 @@
                  "--message-format=json",
              ]
  
@@ -10,19 +10,33 @@ diff -ur setup.py setup.py
                  sys.platform == "win32" and platform.machine() == "ARM64"
              ):
                  cargo_args.extend(
-diff -ur src/target.rs src/target.rs
+diff -u a/src/auditwheel/policy.rs b/src/auditwheel/policy.rs
+--- a/src/auditwheel/policy.rs
++++ b/src/auditwheel/policy.rs
+@@ -100,6 +100,8 @@
+                 Arch::Armv7L => "libc.musl-armv7.so.1",
+                 Arch::Powerpc64Le => "libc.musl-ppc64le.so.1",
+                 Arch::Powerpc64 => "", // musllinux doesn't support ppc64
++                Arch::PowerpcLe => "", // musllinux doesn't support ppcle
++                Arch::Powerpc => "", // musllinux doesn't support ppc
+                 Arch::X86 => "libc.musl-x86.so.1",
+                 Arch::X86_64 => "libc.musl-x86_64.so.1",
+                 Arch::S390X => "libc.musl-s390x.so.1",
+diff -u a/src/target.rs.orig b/src/target.rs
 --- a/src/target.rs
 +++ b/src/target.rs
-@@ -40,6 +40,8 @@
-     Armv7L,
+@@ -52,6 +52,10 @@
      Powerpc64Le,
+     #[serde(alias = "ppc64")]
      Powerpc64,
++    #[serde(alias = "ppcle")]
 +    PowerpcLe,
++    #[serde(alias = "ppc")]
 +    Powerpc,
+     #[serde(alias = "i686")]
      X86,
      X86_64,
-     S390X,
-@@ -52,6 +54,8 @@
+@@ -65,6 +69,8 @@
              Arch::Armv7L => write!(f, "armv7l"),
              Arch::Powerpc64Le => write!(f, "ppc64le"),
              Arch::Powerpc64 => write!(f, "ppc64"),
@@ -31,7 +45,7 @@ diff -ur src/target.rs src/target.rs
              Arch::X86 => write!(f, "i686"),
              Arch::X86_64 => write!(f, "x86_64"),
              Arch::S390X => write!(f, "s390x"),
-@@ -67,6 +71,8 @@
+@@ -80,6 +86,8 @@
              Arch::Armv7L,
              Arch::Powerpc64,
              Arch::Powerpc64Le,
@@ -40,7 +54,7 @@ diff -ur src/target.rs src/target.rs
              Arch::S390X,
              Arch::X86,
              Arch::X86_64,
-@@ -123,6 +129,8 @@
+@@ -154,6 +162,8 @@
              target_lexicon::Architecture::Aarch64(_) => Arch::Aarch64,
              target_lexicon::Architecture::Powerpc64 => Arch::Powerpc64,
              target_lexicon::Architecture::Powerpc64le => Arch::Powerpc64Le,
@@ -49,16 +63,25 @@ diff -ur src/target.rs src/target.rs
              target_lexicon::Architecture::S390x => Arch::S390X,
              unsupported => bail!("The architecture {} is not supported", unsupported),
          };
-@@ -200,7 +208,7 @@
-     /// Returns the default Manylinux tag for this architecture
-     pub fn get_default_manylinux_tag(&self) -> PlatformTag {
+@@ -303,6 +313,8 @@
+             Arch::Armv7L => "armv7l",
+             Arch::Powerpc64Le => "powerpc64le",
+             Arch::Powerpc64 => "powerpc64",
++            Arch::PowerpcLe => "powerpcle",
++            Arch::Powerpc => "powerpc",
+             Arch::X86 => "i386",
+             Arch::X86_64 => "x86_64",
+             Arch::S390X => "s390x",
+@@ -327,7 +339,7 @@
+     /// Returns the oldest possible Manylinux tag for this architecture
+     pub fn get_minimum_manylinux_tag(&self) -> PlatformTag {
          match self.arch {
 -            Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::S390X => {
 +            Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::PowerpcLe | Arch::Powerpc | Arch::S390X => {
                  PlatformTag::manylinux2014()
              }
              Arch::X86 | Arch::X86_64 => PlatformTag::manylinux2010(),
-@@ -214,6 +222,8 @@
+@@ -341,6 +353,8 @@
              Arch::Armv7L => 32,
              Arch::Powerpc64 => 64,
              Arch::Powerpc64Le => 64,
@@ -67,14 +90,3 @@ diff -ur src/target.rs src/target.rs
              Arch::X86 => 32,
              Arch::X86_64 => 64,
              Arch::S390X => 64,
---- a/src/auditwheel/policy.rs
-+++ b/src/auditwheel/policy.rs
-@@ -110,6 +110,8 @@
-                 Arch::Armv7L => "libc.musl-armv7.so.1",
-                 Arch::Powerpc64Le => "libc.musl-ppc64le.so.1",
-                 Arch::Powerpc64 => "", // musllinux doesn't support ppc64
-+                Arch::PowerpcLe => "", // musllinux doesn't support ppcle
-+                Arch::Powerpc => "", // musllinux doesn't support ppc
-                 Arch::X86 => "libc.musl-x86.so.1",
-                 Arch::X86_64 => "libc.musl-x86_64.so.1",
-                 Arch::S390X => "libc.musl-s390x.so.1",
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 4bb299175cae..fa332fc42822 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.14
+version=0.12.15
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="4b45ef2f5a63d7dde7700556f60d82222c7ccba64cea70950f909b06e8355249
+checksum="aa640e1620dc466778cd48f0c9cefe08a9ade265c7f0582b005c25e9f1518be4
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From b45add7ce07d6cf0c82ca7c5677d448c6184b032 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:43:32 -0400
Subject: [PATCH 2192/2561] python3-cryptography_vectors: update to 37.0.2.

---
 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 4576117879de..e626eebdca96 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=37.0.1
+version=37.0.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -11,7 +11,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=66c9a714232be730fe822bd7e4e9da6231ff9e537ee4feb0f092c06b8ea4d94a
+checksum=7c65d3de51756f418142df605417ec2c6e961c364f70cc8a103030889d5a3219
 
 post_install() {
 	vlicense LICENSE

From e567df74fb7258ea71fba8ec5571caa9ddc3a267 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:45:53 -0400
Subject: [PATCH 2193/2561] python3-cryptography: update to 37.0.2.

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 12fd50551a13..97c7c0f59f72 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=37.0.1
+version=37.0.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -17,7 +17,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=d610d0ee14dd9109006215c7c0de15eee91230b70a9bce2263461cf7c3720b83
+checksum=f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 02538f0f64014d612ebc7fb0fd43219badba7b8a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:47:06 -0400
Subject: [PATCH 2194/2561] python3-imageio: update to 2.19.1.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 17b159983528..6966116f3b8a 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.19.0
+version=2.19.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=df6f0f80b7e7dbad66e80d223ecfdcb6285c800716251aabc49fcf756b516168
+checksum=1c8ee257e71c544e663e824a6082bfbc080d1c673a7230487acc3f99112d9135
 
 post_install() {
 	vlicense LICENSE

From 9cf3c8487a30868b72d795f58de6b327bb803a84 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:47:30 -0400
Subject: [PATCH 2195/2561] python3-more-itertools: update to 8.13.0.

---
 srcpkgs/python3-more-itertools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template
index 59676a780535..914d46f0a695 100644
--- a/srcpkgs/python3-more-itertools/template
+++ b/srcpkgs/python3-more-itertools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-more-itertools'
 pkgname=python3-more-itertools
-version=8.12.0
+version=8.13.0
 revision=1
 wrksrc="more-itertools-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/erikrose/more-itertools"
 distfiles="${PYPI_SITE}/m/more-itertools/more-itertools-${version}.tar.gz"
-checksum=7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064
+checksum=a42901a0a5b169d925f6f217cd5a190e32ef54360905b9c39ee7db5313bfec0f
 
 post_install() {
 	vlicense LICENSE

From d8409b2761a524ba8ef400782fe7b4c8eb12daa6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:47:47 -0400
Subject: [PATCH 2196/2561] python3-pip: update to 22.1.

---
 srcpkgs/python3-pip/template | 4 ++--
 srcpkgs/python3-pip/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-pip/update

diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 51b892eb0596..2f0080bc1ebb 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=22.0.4
+version=22.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=b3a9de2c6ef801e9247d1527a4b16f92f2cc141cd1489f3fffaf6a9e96729764
+checksum=2debf847016cfe643fa1512e2d781d3ca9e5c878ba0652583842d50cc2bcc605
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pip/update b/srcpkgs/python3-pip/update
new file mode 100644
index 000000000000..e9b0a0a5ea4c
--- /dev/null
+++ b/srcpkgs/python3-pip/update
@@ -0,0 +1 @@
+ignore="*b*"

From a98bf4e10d9006ff8965fff4cf4dba4388aceba1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:48:09 -0400
Subject: [PATCH 2197/2561] python3-pytools: update to 2022.1.7.

---
 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 1367b8ec31b1..f019ed703836 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.6
+version=2022.1.7
 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=9271dc8a65da02fa3fe342e2be7979b2d10f792f3b54fb115e51bf10386eb770
+checksum=9083e8b6e617560eebb7e0c22c01545b1599eb1c048fe72ca2796f22c040a317
 
 post_install() {
 	vlicense LICENSE

From f6059917139e95fbdd4adb4ed16984e0fe8cc6d0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:48:22 -0400
Subject: [PATCH 2198/2561] python3-tifffile: update to 2022.5.4.

---
 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 a34273322530..eee1d7dcc283 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.4.28
+version=2022.5.4
 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=5ee740afa64bfc8da5b1e7badc5d4e20766f7631adb48792e5ee72978ba0fcff
+checksum=352ed08a1b0d91bccd0246139da8eec9b98ed8f7dd6c3f548fe2940fb67541e2
 # Tests require unpackaged fsspec
 make_check=no
 

From f142a36e6ed31c2771f8e64dab52d92918746ad8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:53:10 -0400
Subject: [PATCH 2199/2561] qtutilities: update to 6.6.1.

---
 srcpkgs/qtutilities/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index d0e2622414d5..07c824a44a0c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,17 +1,22 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.6.0
+version=6.6.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel cpp-utilities-devel"
+checkdepends="xvfb-run"
 short_desc="Qt helper routines, including dialogs, widgets, and models"
 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=2dda37fd6e1cd957f0a2b395ce424ca23cfc893310c0cebc82d89dc960239d13
+checksum=118df63a255a181c14cf1588c6abddda73bc545125a8406aa8e0e4f9fa98a13d
+
+pre_check() {
+	ninja -C build tests
+}
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From f43f618e0a849a07a3abd877f7aa56eeeeb134bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:54:02 -0400
Subject: [PATCH 2200/2561] tagparser: update to 11.2.0.

---
 srcpkgs/tagparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 494b83e203eb..37fb00fc2c01 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=11.1.0
+version=11.2.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=dc3bd56ee7ddd3220062d2637b89dffc27747c3027c4b223a4697d693e55e2f1
+checksum=8f1ed6b15ec70f90d918c2c31f4ebbbca900cc8f35be76127d777316eb783f16
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From d4bdc480ca761a1f140d32f49fa718dc7726e391 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:54:36 -0400
Subject: [PATCH 2201/2561] tageditor: update to 3.7.1.

---
 srcpkgs/tageditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 0f9ad2024a6d..a97acf3a24c1 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.7.0
+version=3.7.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=e3814efdb9ca9bc386b51c602f8f4f507e8698ecdaf39a5849ed1795ddaa5c38
+checksum=df567627b91114da23664d4194f2fd2392cc24da7e59bd71e1e86f7638e2a5fb
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 4bb61e93f8caba3dd972e0fef82912483d959494 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 May 2022 20:03:26 +0200
Subject: [PATCH 2202/2561] perl-LWP: update to 6.65.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index a093660fbdaa..f61f2d0f0cb0 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.64
+version=6.65
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=48335e0992b4875bd73c6661439f3506c2c6d92b5dd601582b8dc22e767d3dae
+checksum=ae048023d275e1d6ad72882fa8b818f6e16d18d9cbda1f6f8e4012b93d4c834c

From 456e67900a61959cc162c63c707f4f86a891c981 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 May 2022 20:05:21 +0200
Subject: [PATCH 2203/2561] janet: update to 1.22.0.

---
 common/shlibs          | 2 +-
 srcpkgs/janet/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d75ecdda38dc..680ab7920513 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.9 libcbor-0.9.0_1
 libfido2.so.1 libfido2-1.6.0_2
-libjanet.so.1.21 janet-1.21.1_1
+libjanet.so.1.22 janet-1.22.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 8c3612e4dd77..83a1f7fb3d10 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.21.2
+version=1.22.0
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=52db8d18f93351256d0731810e8bea95516db8142f51eeb31664f7884bf63088
+checksum=7c6969f8e82badc7afa28aa1054555c1c91d2858f9f45c41a82557f5c5ce85bd
 
 post_install() {
 	vlicense LICENSE

From f2562c963f88c6ddab7c848f1afe91d208ffb00e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 12 May 2022 21:00:44 +0200
Subject: [PATCH 2204/2561] lagrange: update to 1.13.4.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index a430d64fda49..fad02e8df150 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.13.3
+version=1.13.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=a25c48bb4c5c9eb81ba0e93609a5b0e350194eddab27bc55a5b86ae7b749259b
+checksum=3bd9c3c370f23da3d2ae63d6560721799a07c05fab6c7b8c592e7e8b2e8d4434
 
 post_install() {
 	vlicense LICENSE.md

From 6b6fd71219690daf8fa4524c088340cf2e10b2b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 12 May 2022 21:07:54 +0200
Subject: [PATCH 2205/2561] mpdevil: update to 1.7.0.

---
 srcpkgs/mpdevil/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mpdevil/template b/srcpkgs/mpdevil/template
index 348f570c274c..4cf34103022d 100644
--- a/srcpkgs/mpdevil/template
+++ b/srcpkgs/mpdevil/template
@@ -1,13 +1,13 @@
 # Template file for 'mpdevil'
 pkgname=mpdevil
-version=1.4.1
+version=1.7.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"
+build_style=meson
+hostmakedepends="gettext pkg-config glib-devel"
+depends="python3-mpd2 python3-gobject gtk+3"
 short_desc="Simple music browser for MPD"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 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=6402fbc18dcefdd2e967f45690ea325112760cf9a87c644f3880ae14a654441d
+checksum=5821963a766d1ed35a96200d1d7153176e47c361579d70a9822377f8b1df2718

From bba99aa60f67ddbcf8da622a4c882d26154bb2f1 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 12 May 2022 12:52:28 +0200
Subject: [PATCH 2206/2561] pipe-viewer: update to 0.2.1

---
 srcpkgs/pipe-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index 670d4181ab17..1b6091d47ff9 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.2.0
+version=0.2.1
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,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=3913ecfaa3006f645603fb76df9962829138ca62d4b0acaf8b8d4d2e58902f64
+checksum=683b817415186f63cc0f7e0540a3935d965cf470d429525d17e1cefb2de22353
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From bf9ed3cb0a2d20b09c32b8cd275555abbb0732f8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 12 May 2022 22:52:22 +0200
Subject: [PATCH 2207/2561] nocache: update to 1.2.

---
 srcpkgs/nocache/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nocache/template b/srcpkgs/nocache/template
index 1c4198631e74..b864dbd5c6fc 100644
--- a/srcpkgs/nocache/template
+++ b/srcpkgs/nocache/template
@@ -1,17 +1,19 @@
 # Template file for 'nocache'
 pkgname=nocache
-version=1.1
+version=1.2
 revision=1
 build_style=gnu-makefile
+make_check_target="test"
+checkdepends="perl"
 short_desc="Minimize filesystem caching effects"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/Feh/nocache"
 distfiles="https://github.com/Feh/nocache/archive/v${version}.tar.gz"
-checksum=e5441b27f60e1af5551b76fe0c8a9da17b8c31675794d9d49bf59c7c47fbb9b9
+checksum=2f8c6adbc82da4477416e1eaf9d435cf52f602d07064602f433d4ba4ecad5fdd
 
 pre_build() {
-	sed -i -e '/#include <error.h>/d' cachedel.c cachestats.c
+	vsed -e '/#include <error.h>/d' -i cachedel.c -i cachestats.c
 }
 
 post_install() {

From 86c3a33e18fad9f88e54f41ecb0b5798acb1471c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 20:31:00 -0400
Subject: [PATCH 2208/2561] Revert "python3-matplotlib: update to 3.5.2."

This update breaks event-loop integration with IPython, preventing
figures from updating without manually calling a draw function.

This reverts commit 69d5ad4bc9acd55d6190dcd4ea939eb6aefef0e3.
---
 srcpkgs/python3-matplotlib/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index e4e03bc540ba..e4d44cb11edc 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,7 +1,8 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.5.2
-revision=1
+reverts="3.5.2_1"
+version=3.5.1
+revision=2
 wrksrc="matplotlib-${version}"
 build_style=python3-module
 build_helper="numpy"
@@ -14,7 +15,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=c81325d1b0d822ef75fd71d243f98478cdca1f800a838a2a1bc8e4e17b8df93c
+checksum=9683da9a0c84d1c42d1bf92ecf6e012d302406a38fd987e3dfbcb7b58b2eea2d
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From afa0a6adc7fc137a4c382313aee7505c116bb63f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 13 May 2022 10:45:02 +0200
Subject: [PATCH 2209/2561] lagrange: disable SSE4.1

---
 srcpkgs/lagrange/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index fad02e8df150..584682270b78 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,8 +1,9 @@
 # Template file for 'lagrange'
 pkgname=lagrange
 version=1.13.4
-revision=1
+revision=2
 build_style=cmake
+configure_args="-DTFDN_ENABLE_SSE41=NO"
 hostmakedepends="pkg-config zip"
 makedepends="pcre-devel SDL2-devel openssl-devel zlib-devel libunistring-devel
  mpg123-devel libcurl-devel fribidi-devel harfbuzz-devel libwebp-devel"

From 9afe3aac3bf9a8b60dba492021b8fa0d9c00f335 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Mon, 9 May 2022 20:36:08 +0200
Subject: [PATCH 2210/2561] lazydocker: update to 0.18.1

---
 srcpkgs/lazydocker/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index caf9198328f6..50a36c7a5899 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,17 +1,18 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
-version=0.13
+version=0.18.1
 revision=1
 wrksrc="lazydocker-${version}"
 build_style=go
 go_import_path=github.com/jesseduffield/lazydocker
+go_ldflags="-X main.version=${version}"
 depends="docker docker-compose"
 short_desc="Simple terminal UI for docker and docker-compose, written in Go"
 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=4328ddcb3156ff57c1e21c0d2f9d9d67d48237a386d338f1d68831b6056dfe3e
+checksum=f5081b846d530818e1f04b9e8479c801f287ac77ebdf063425a142ff50fc395b
 
 post_install() {
 	vlicense LICENSE

From 3def04130592b405b049a94e8ea26064d42ab683 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 5 May 2022 15:18:37 -0500
Subject: [PATCH 2211/2561] Signal-Desktop: update to 5.43.0, adopt

---
 srcpkgs/Signal-Desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 43e11503bd50..aee39932147e 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.41.0
+version=5.43.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -10,11 +10,11 @@ archs="x86_64"
 hostmakedepends="git git-lfs nodejs python3 tar yarn"
 depends="cairo gtk+3 libvips pango"
 short_desc="Signal Private Messenger for Linux"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="akierig <anelki@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=55a201912f5a41c1a76d210d3942078e734ac619df7ffb56083149ce4995e949
+checksum=9239dfc0356cec3c0aaea93e09d0ac44030037f24c1dcc3725e1e417c74af419
 nostrip_files="signal-desktop"
 
 post_extract() {

From f0499c423293f1d75156c2197ed7ab883399a1eb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 13 May 2022 13:25:00 +0200
Subject: [PATCH 2212/2561] linux5.10: update to 5.10.115.

---
 srcpkgs/linux5.10/files/i386-dotconfig    | 5 ++---
 srcpkgs/linux5.10/files/ppc-dotconfig     | 4 ++--
 srcpkgs/linux5.10/files/ppc64-dotconfig   | 5 ++---
 srcpkgs/linux5.10/files/ppc64le-dotconfig | 5 ++---
 srcpkgs/linux5.10/files/x86_64-dotconfig  | 5 ++---
 srcpkgs/linux5.10/template                | 4 ++--
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index e3ea24162dc7..70d61a837efd 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.10.99 Kernel Configuration
+# Linux/i386 5.10.115 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2237,6 +2237,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3563,8 +3564,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index 078ffac9ee09..4e8adac5af1d 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.99 Kernel Configuration
+# Linux/powerpc 5.10.115 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -1815,6 +1815,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_MAC_FLOPPY=y
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
@@ -3139,7 +3140,6 @@ CONFIG_MISDN_W6692=m
 # CONFIG_MISDN_NETJET is not set
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
-# CONFIG_NVM is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index 5d973825057c..7227a355e3c6 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.99 Kernel Configuration
+# Linux/powerpc 5.10.115 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2243,6 +2243,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3640,8 +3641,6 @@ CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index a5158c12dd3f..de9c8c54e6a7 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.99 Kernel Configuration
+# Linux/powerpc 5.10.115 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2143,6 +2143,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3475,8 +3476,6 @@ CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index fa04bb81b4dc..1a5057ad0234 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.99 Kernel Configuration
+# Linux/x86_64 5.10.115 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2297,6 +2297,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3635,8 +3636,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index e2bf0b9cae3d..c5bd16c1ade3 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.113
+version=5.10.115
 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=82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc
+checksum=f5e417b32f89318b6d0a230109a592ffd68997817463dc4692fa49ec7fe42f71
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From de8c22ab169befde6016ab96b0f00d2dc8180a52 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 13 May 2022 13:39:37 +0200
Subject: [PATCH 2213/2561] linux5.15: update to 5.15.39.

---
 srcpkgs/linux5.15/files/i386-dotconfig    | 30 ++++++++++-------------
 srcpkgs/linux5.15/files/ppc-dotconfig     | 24 +++++++++---------
 srcpkgs/linux5.15/files/ppc64-dotconfig   | 22 ++++++++---------
 srcpkgs/linux5.15/files/ppc64le-dotconfig | 22 ++++++++---------
 srcpkgs/linux5.15/files/x86_64-dotconfig  | 25 ++++++++++---------
 srcpkgs/linux5.15/template                |  4 +--
 6 files changed, 62 insertions(+), 65 deletions(-)

diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index db7fdf4d3bbd..0e497896cbbb 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.22 Kernel Configuration
+# Linux/i386 5.15.39 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2312,6 +2312,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -2934,6 +2935,7 @@ CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
+CONFIG_CX_ECAT=m
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -2952,8 +2954,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -2973,7 +2973,6 @@ CONFIG_CHELSIO_TLS_DEVICE=m
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_NET_VENDOR_CORTINA=y
-CONFIG_CX_ECAT=m
 CONFIG_DNET=m
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_TULIP=y
@@ -3027,7 +3026,6 @@ CONFIG_I40EVF=m
 # CONFIG_ICE is not set
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_NET_VENDOR_MARVELL=y
@@ -3083,9 +3081,12 @@ CONFIG_ENC28J60=m
 CONFIG_ENCX24J600=m
 # CONFIG_LAN743X is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3098,8 +3099,6 @@ CONFIG_NFP=m
 # CONFIG_NFP_APP_FLOWER is not set
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NE2K_PCI=m
 CONFIG_NET_VENDOR_NVIDIA=y
@@ -3125,6 +3124,8 @@ CONFIG_QEDE=m
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCOM_EMAC=m
 CONFIG_RMNET=m
@@ -3145,6 +3146,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3153,11 +3159,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
@@ -4832,15 +4833,11 @@ CONFIG_DEVFREQ_THERMAL=y
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_X86_PKG_TEMP_THERMAL=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 
 #
 # ACPI INT340X thermal drivers
 #
-CONFIG_INT340X_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_INT3406_THERMAL=m
 # end of ACPI INT340X thermal drivers
 
 CONFIG_INTEL_PCH_THERMAL=m
@@ -9955,7 +9952,6 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_HEADERS_INSTALL is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_VMLINUX_MAP is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig
index 6ca79da60447..ad1e046893d2 100644
--- a/srcpkgs/linux5.15/files/ppc-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.15.22 Kernel Configuration
+# Linux/powerpc 5.15.39 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -1865,7 +1865,6 @@ CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_DMA_DEFAULT_COHERENT=y
@@ -1882,6 +1881,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_MAC_FLOPPY=y
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
@@ -2479,8 +2479,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 # CONFIG_MACB is not set
 CONFIG_NET_VENDOR_CAVIUM=y
@@ -2566,7 +2564,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 # CONFIG_FM10K is not set
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -2608,9 +2605,12 @@ CONFIG_NET_VENDOR_MICROCHIP=y
 # CONFIG_ENCX24J600 is not set
 CONFIG_LAN743X=m
 CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -2621,8 +2621,6 @@ CONFIG_VXGE=m
 CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NFP=m
 # CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -2649,6 +2647,8 @@ CONFIG_QEDE=m
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
@@ -2669,17 +2669,17 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SAMSUNG=y
 # CONFIG_SXGBE_ETH is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig
index 355ff2fa768c..6e196ad358c3 100644
--- a/srcpkgs/linux5.15/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.15.22 Kernel Configuration
+# Linux/powerpc 5.15.39 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2310,7 +2310,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
@@ -2328,6 +2327,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -2967,8 +2967,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -3073,7 +3071,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -3130,9 +3127,11 @@ CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 # CONFIG_MSCC_OCELOT_SWITCH is not set
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3145,7 +3144,6 @@ CONFIG_NFP=m
 # CONFIG_NFP_APP_FLOWER is not set
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -3176,6 +3174,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -3198,6 +3198,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3206,11 +3211,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig
index 5148c4e5cf55..fb902ca0b43e 100644
--- a/srcpkgs/linux5.15/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.15.22 Kernel Configuration
+# Linux/powerpc 5.15.39 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2207,7 +2207,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
@@ -2224,6 +2223,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -2844,8 +2844,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -2926,7 +2924,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -2983,9 +2980,11 @@ CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 # CONFIG_MSCC_OCELOT_SWITCH is not set
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -2998,7 +2997,6 @@ CONFIG_NFP=m
 # CONFIG_NFP_APP_FLOWER is not set
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NE2K_PCI=m
 CONFIG_NET_VENDOR_NVIDIA=y
@@ -3025,6 +3023,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -3047,6 +3047,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3055,11 +3060,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 225e5c5022ee..32714ae96633 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.22 Kernel Configuration
+# Linux/x86_64 5.15.39 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2376,6 +2376,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -2991,6 +2992,7 @@ CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
+CONFIG_CX_ECAT=m
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -3009,8 +3011,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -3037,7 +3037,6 @@ CONFIG_CHELSIO_TLS_DEVICE=m
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_NET_VENDOR_CORTINA=y
-CONFIG_CX_ECAT=m
 CONFIG_DNET=m
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_TULIP=y
@@ -3093,8 +3092,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
-CONFIG_MICROSOFT_MANA=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_NET_VENDOR_MARVELL=y
@@ -3151,10 +3148,13 @@ CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_MICROSOFT_MANA=m
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_MYRI10GE_DCA=y
 CONFIG_FEALNX=m
+# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3167,7 +3167,6 @@ CONFIG_NFP=m
 # CONFIG_NFP_APP_FLOWER is not set
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NE2K_PCI=m
 CONFIG_NET_VENDOR_NVIDIA=y
@@ -3194,6 +3193,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCOM_EMAC=m
 CONFIG_RMNET=m
@@ -3214,6 +3215,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3222,11 +3228,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index ae0410039d0c..9f2e16a73927 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.36
+version=5.15.39
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- a40a27adb37c5ac569428c517f3eb51ce1148258db5b8a42aadb79128197d4a0"
+ b773d0ca695b0dbe1254f13396ae71120cb1e662fa89a698b29d828ba13a4b73"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 5baaa52adc0ae767b219b32161cc2e33344cfa6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 10:05:35 -0300
Subject: [PATCH 2214/2561] arduino-cli: update to 0.22.0.

---
 srcpkgs/arduino-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index 832daeaf2824..0653103ac372 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
-version=0.19.0
+version=0.22.0
 revision=1
 build_helper=qemu
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/arduino/arduino-cli"
 distfiles="https://github.com/arduino/arduino-cli/archive/${version}.tar.gz"
-checksum=2828bcfc113a45dd486e72968092967ce90dcd15aaaa5ca9b96863e8ec7dbc7f
+checksum=9b6bc045a0dbe8d34d90adbc5d32fdb29b1f1303c50c5893e47a2f2a517273e6
 
 case "$XBPS_TARGET_MACHINE" in
 	# the downloaded toolchains use glibc, this allows them to work on musl

From 9b538ae21f7590f7eb86656daa70f9c60fe27b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 10:14:28 -0300
Subject: [PATCH 2215/2561] thunderbird: update to 91.9.0.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index bf03d0a2eb61..d27434e30e22 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=91.8.0
+version=91.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=4a93d1773e17aa110341428165581f0176c347d55dd7f6cbed789ca8369da6fa
+checksum=616e48327c4b0cdd2fd3c6385bfa4d380ba5cc7c52ce6014ae39d389a19fd092
 
 lib32disabled=yes
 

From 5b67da7833a4b3a4b776f0df3be13970faa3db19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 10:14:32 -0300
Subject: [PATCH 2216/2561] thunderbird-i18n: update to 91.9.0.

---
 srcpkgs/thunderbird-i18n/template | 110 +++++++++++++++---------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 0a299d66d969..b0492b7682fa 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=91.8.0
+version=91.9.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -95,57 +95,57 @@ _pkgtmpl() {
 	}
 }
 
-checksum="e338b3f00ce13b8b98213d9fb53dbdeaef8082517a2cda06a62c59d8f4021e1e
- 0c6339b23d2de88b0cea5473289c05820d44fd89999037285ed19b6394e5d221
- 4f8254201247e6d8e01924715d101e4bce8f53d3799f129a0003b528cd994839
- f7c99eb62ab9ade49d2022edca802b4ebbdf53a753c378315cccf9bf2126bff3
- 13191acb9cec0bdd45527e09e1f28205fad9e4b67682018f9f0aa6d096b40a7d
- 08e7f631467b5b1aca8d35c38936c854c3b8bbba975d1b30b5d43637e1b1cc3d
- 8b40a658dd14af8b268bef3ae656524165c9e432f2df882c21a083b477379a76
- 68247d9f9e33f803446ba4c114d5db8173dc46aa93bf06c828a2d154c69e4ce6
- da155c974f591a6f7b29f42ddb82ed94fee8db34b0b7c67a18d747c38138fb7b
- 3cf905249aeb0676d8a6206746c1d0ee03fba579bd39d9ec8e9cdc8a23ba6232
- 2afa46cf5301607dc1b18933bd3877842ffcb86563bb8ddf859114aa74bacf1c
- d437fd884c900cdce7c22bfdf445819ebe8f27d6d2b32392e6ab4291188403b5
- 458ff1cd1a3a3357d6592f04fadc5bb6c06a1a8ae4e095de599c0a4b4f3f4c39
- 5a3cc430c53f3a2e7258be9c4dc90002e74b1df4fedd57d748034facdf09462f
- aa41718568841dd4b2487023d7c68b88a7d4cce6634c2c8b2af5a5024e910491
- 8e08fca9f5b4284cd78cd80f54f2005cfaa9db9b2df596aabff3cf85fed3b032
- 00647c73c5d834c2daa7b1c04c152ba70e530f8917a88b48b876634e6735a08d
- 3b367c2aeb5c0b7e7158570cba56473f36f0e4e2105528f6cff6424a8bb1b188
- 602f80592d721c0d1157845c9cf83547b4497842cfd37ae5466190d5f89fc2ca
- 310a50fbd029f0bbb5d7b3b80b9f0882ddf03667caa2c93a1f2c878c32bd1404
- cf75c1a2992d11b2ea5f4160d34f793fd00d7eae2c3604fe35a96303bdd5b6d0
- 39255ccf6c1661287fab017e95a3c1eb74619d408bdce09dd359fd58f2303ca4
- 41e9b2df204081b13ff2adb391f0414b2b0ba4bf83bf2118a30c21265b19983e
- f6be5a2cf4006b31459a887e14f69e61505e3577ece674e81356ae53b025b4ab
- 22575da8459ceb57e1dd3e02c9a5e7219b894767438d810b94dfd6c4e97bb3ae
- 27487ba8f1115f1aff0245629fdc1b785391d5af98521e58937677f173eb0f45
- 666bd43ccbdb37f097477273aa8ca11b9716c024f8c162bb81a1b07006044bc0
- 1907c178beac70dafdab55acbc87e56a9913142ffaa85be6cbe541361d53d24c
- 20e7464b43f12dcdcb3892a6e9c7d7c46a2385a82953c388599cbeeabc362786
- 6a7e2ee51d92aa5db52816de0dbf103ce2abf40a34411498fb7b2380dc87101d
- 2d2be878ba6d5afcb6823f58a6939ebe895290a925b13234ed2c63d013ad5165
- d329c730c338b7d9e4a3fc07fae4537dd0be0b86317db42b1270daaeb7025f98
- 51ead8dd506cc5aaf4dfb58be942b3061869c9c26bfec9b29930d0a627c32aa9
- ba4191dca0ec8a9eb70cc3d9d0a20d50fa87a5c0be3190db0ef5867532ef8318
- 4e849ddec5f68004315b93dc8e382774101a815e9bf476f10c8e804a9657aa2e
- 04b06a1a5842962116ef0eae6dfa263197e04b5a560ce7386f786322b5199364
- 8f81e86174d6126e0e0551b1431713f09ca66e3dc546cd5a7838d17c2cddf52e
- 1ca4983cf2de4a0ac8debdfba0c0e3844cd5020199f4ab054864dda7ae2170da
- f625cda77e82c13e358d33df96d613ea8145a170b54ce399bfe960e0b88ef146
- 93b79805973de19cd0beaea81add9a0f40e3746b88648c6c7e90a0fbba857777
- 368b268f6b08b5e1d0f1ffeeb662ab4460bc3b60d6c3ced54a6efff44e6bec2e
- 8de648e97c00fc1988ae5788944c3821304c49f49a669797e3bdc4c3637ff336
- 1489f343e79064d24549556f7d7164ea0e9e0e65256290f8287a00fdd256bd04
- 0f004c54f4fce861b709d6f0d394c6ebb01a16aedc29e6599f56c7d043e18936
- 8f7a814d8a47efa9fe1509b0ea450697e2e6007beb5b78e2937b3f2b133402b3
- 7db9b294668932d2e59309c452ab74d0d737eb6c8220f6fa5aafd7be66ea42dd
- b9c81d14520928957f95e40faa80a8ed63e76758652fb3a73458a848d9703ac7
- 1129915d753dc68c4d4e23e6d4dea5de7c911f7d3204448b231f8755d7447c70
- 76badde28f93f4d8e05c163a357223bf1a85e9301cf6221b222553f637e33532
- c50d5aa28e33dee903a31b1ea73c01575d7d784cc86dfec0f853dc51e31bef40
- 6b897ca847c9d497895d2dc2164582836407902c2784219617ce14b80b140739
- 4cd25edb40fd1309d1121cb582001d580605eb12ec414fe4125d580b809927c9
- 2b822f814877d3b20ced442e466ff78cc0e2effa971b5e7b16ddd6bb9500c7c3
- b2962ead550ab841c4981a70a0f80f1baeb2d10165dc7536d069598643f3d4d5"
+checksum="0ce1beef54dbedfa0805ac3f5cad1520f60acb09d2a39711fdb33532645e2924
+ 6922131d1a57c6525a4ce4c495c809ecfe255f45c0b110dcccacf2137036153e
+ d039e0e8d4421c98eea04ca69fd48332c107ca3f57deec0b9985d8a3a60df5fa
+ 16a85769ebba4719732f10fde372c6363731d20ca228bd31d38db1b2dc7fe6e9
+ 5363483b71670f2dd418519c5e0a7d9abb01057e15c7f5c3893285c478c9b7d5
+ 7b49e28df13fc28691ab22223da98431f9b14c271a61fc863deda92512504d0f
+ acc349d2b4da8aeb7f554fe00efd75161919dde821b4dcb8170d7b74301a5274
+ af60b34b9e7b6a04c67c0c105fc9a757409e1d15e8ba5ae59e1b57ec70c2afe1
+ 99a7150815a0c8adf9eafa21779540ce08198f45a58566a4db149904659395bc
+ 6f5ac93dd4c69316ca3112db66c1da65a899ad94be13f135e96f4fca4b186a1a
+ 9adadd236b2095393ee811e0b952d70f034f816036dc90b31ca82cd3be4e2574
+ 35654dc18ef7363eb6d603f229b8f53c2b0eb506bb4414b42699344887b18477
+ e353e6d913c0b23863c3fcc1a91f37fb5cbeece2dcfbe4b45cad8d7673fa58d1
+ da884de1c02b92b5421c84ffa9b3e83939add60cb2cb79336e5ba58e8ef74cd3
+ cfae324fb7af7475baf1a7202e4da08dcfa422b09acc7fddde411322185ea5ce
+ b786362cf397dc5cec3d91ac592da033609c67a6d67a7e21a8133cdf52e9d604
+ 0e04c656b7a14c3800286d95bd513eec63566e7ba28aefbd7cc55073395cd906
+ e334ef8b569eb8eeaf8b95058b87c06c872edcda67cc5c7d3432b2021183469c
+ 001ae51d73e21e546da191b85596f3c33573cf1d81fc6141d329c9e6851e73c7
+ 972803d21adf67fa61464f6f701a5f254fe223fc2e83e83cc3e2e47ecaa88be4
+ c816a554eee3ebbbcde9efd991ca95c99d4402e87184ac13bb390c485048e9bb
+ 49328cf9998e464730a16dade381fbc8562457083fcdbe6a38814ef934a27d4e
+ 2039ca0bbaf1992d2709a010139106b09d38c32054402240e2e5cc66e6854598
+ 744e711200cf8a568ad4200c3c5ce086798495874fb6f6581f1636f0bf8bbbfb
+ dc284a451c2bb8df5121edcc1b68c823f5f9210c7a97d162ecc5ab3575df1219
+ 258b93a4bc5048c96e568f6d2bcd665ec8adfd47d82fd8247dd26bf9c6289f3c
+ e3b0cfdb2c428c3f6ba6dd589807245ed6cbfb6fe17cd27348a39e97151d2b40
+ e9f5c2338acce514e958d7d9c77ad9428930f7ef9ba39291d7a2efe8045f3bf9
+ 0ff0260f8a7456cee42b0528b45e3c9821cce159f8c81b057e53da027c6932e3
+ aea0bec5ecbf61d6a44acc6c6946ebf002acc80c95c034f913a53d5ce28491c5
+ 9f4982e6fa9c5deadf0f49116f79a5105ee5e9e623319e0a3f3fda6678a8ead4
+ 893d5851100e2bfd462529bdb6fe8ab19c42cbebd7e02725d3ea79f9cccc0f16
+ c44f697280b29c4961cb0f59dd4692068ba3bd80d56b3724288227bdbd227524
+ c04195860e0871d89f7b8c0977d34a676746a8b504a1c871062f635c1000a9cb
+ 08dc12dc180c59fe76787243c292bd4896193d56940bda3ef6aa723c9fbb855f
+ 1cb6fdddb41a038f7eefc41af1a06d4da287a7d4ed958298799fdf724883cd19
+ ece6218b8603fc7931bf2e3be52235b0448b0b418716c32323b9a118d9260f5c
+ 9e92c7a11b3e4d37d2377d5601a760f32ac79be0c7d2907a0cbabc340b141564
+ dac4ae0c976d806f0a0e325405153e93cb37e31febb45d4fc03a3b8f1578fdbe
+ 62b63c940f24a826d538305a9d3e108308edaf4421aaff73c02e5fc03fbc2259
+ 7eb08ab6108b8925229591368a33bb95dc880850860addaa914ea994f1e772c8
+ b9b73326aef68b2b547b2654f995fce7e99c085e0c4ebea394ae276b0bc87c14
+ d503a590b9e6b38b19574c71a95af806249f5ca7bab5a87256e6694bdcc17e08
+ 30269418942d78ebc5560ffcb81bcf31d14a0579e356b14699af46af8c19da30
+ 90113e8574ee41b463904012442bcd759147d6799ce743a9cbcf6860e6ae98b8
+ a86cb03c5eb8bc498127c6453a306e46d089cce36b99dabc747e3696d0740463
+ f014d4c67692dc424720f0ef23ac1f918a291cb904e31fd809bf4aff6c339c7e
+ fb1e4741305ec130ba7b06172ec34a08ca5b24c3e13a2e52249a21e1053482fd
+ 0d8120993a0430d3dacc71589495d1a9a811a8b17d2dd93cf2dc27e5613e2717
+ 361835a4ae3117a1c34b782d47001c46d632d46674eb59b8ccfb168ccf53737b
+ f9410e78a0f43e4dfb06859aa84b2ddeceb8719552fb9cce41ba43a8f95f1805
+ 4a1e7534982e55831056f0a59154c674025de11a332dbc083ad2fd66b9ea1e80
+ e69994d2b0fd425ba0a73b0971358988ce7a0aa62fdc370a180175c0ff848fb0
+ 2aedbe39ac0e555d0a27b6d266dc2e575dcb9e5ba057cf05dd6c6be8261571c7"

From 827c0b807985ed19da1bb7c5373c876296f9fbbf Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Tue, 12 Apr 2022 06:49:28 +0530
Subject: [PATCH 2217/2561] wireplumber: update to 0.4.10, fix service.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit 9f50345e006a3620a6142ffce4023229f8d42d7c added a runit service
for wireplumber but set HOME to a directory that doesn't persist across
boots.

wireplumber stores the state configuration in
${XDG_STATE_HOME:-$HOME/.local/state}/wireplumber and
pipewire-media-session (the default media router) uses /var/lib/pipewire
as persistent location, so we can use the same directory.

Co-authored-by: Érico Nogueira <erico.erc@gmail.com>

Closes: #36650 [via git-merge-pr]
---
 srcpkgs/wireplumber/files/wireplumber/run | 2 +-
 srcpkgs/wireplumber/template              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
index ae0cf99e200b..9a28ecdbe9a4 100644
--- a/srcpkgs/wireplumber/files/wireplumber/run
+++ b/srcpkgs/wireplumber/files/wireplumber/run
@@ -6,5 +6,5 @@ sv check dbus >/dev/null 2>&1 || exit 1
 
 exec 2>&1
 
-export HOME=/var/run/pipewire
+export XDG_STATE_HOME=/var/lib/pipewire
 exec chpst -u _pipewire:_pipewire:audio:video -P dbus-run-session wireplumber
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index acbffa27fd8c..1413d2ad84bc 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,6 +1,6 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
-version=0.4.9
+version=0.4.10
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://pipewire.pages.freedesktop.org/wireplumber"
 changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
-checksum=0b25774a2821286a1fa31afb7db8db0573f493b35c40a7031b6e5a30cec0bbe3
+checksum=bddc5bb3c47e97c170d27c712bc3c7912592aea1ea9df747e92685f5194456d4
 
 post_install() {
 	vlicense LICENSE

From d9ba91163db0247f8f99e739dbcc1d996157263c Mon Sep 17 00:00:00 2001
From: Omar Polo <op@void-live.homenet.telecomitalia.it>
Date: Mon, 2 May 2022 16:31:36 +0000
Subject: [PATCH 2218/2561] New package: got-0.70

---
 srcpkgs/got/patches/cross.patch | 18 ++++++++++++++++++
 srcpkgs/got/template            | 23 +++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/got/patches/cross.patch
 create mode 100644 srcpkgs/got/template

diff --git a/srcpkgs/got/patches/cross.patch b/srcpkgs/got/patches/cross.patch
new file mode 100644
index 000000000000..377a34c8c475
--- /dev/null
+++ b/srcpkgs/got/patches/cross.patch
@@ -0,0 +1,18 @@
+--- got-portable-0.69/configure.ac.orig
++++ got-portable-0.69/configure.ac
+@@ -204,6 +204,7 @@
+ 		[return (reallocarray(NULL, 1, 1) == NULL);]
+ 	)],
+ 	AC_MSG_RESULT(yes),
++	[AC_LIBOBJ(reallocarray) AC_MSG_RESULT([no])],
+ 	[AC_LIBOBJ(reallocarray) AC_MSG_RESULT([no])]
+ )
+ AC_MSG_CHECKING([for working recallocarray])
+@@ -212,6 +213,7 @@
+ 		[return (recallocarray(NULL, 1, 1, 1) == NULL);]
+ 	)],
+ 	AC_MSG_RESULT(yes),
++	[AC_LIBOBJ(recallocarray) AC_MSG_RESULT([no])],
+ 	[AC_LIBOBJ(recallocarray) AC_MSG_RESULT([no])]
+ )
+ 
diff --git a/srcpkgs/got/template b/srcpkgs/got/template
new file mode 100644
index 000000000000..4c0b09d07b01
--- /dev/null
+++ b/srcpkgs/got/template
@@ -0,0 +1,23 @@
+# Template file for 'got'
+pkgname=got
+version=0.70
+revision=1
+wrksrc=got-portable-${version}
+build_style=gnu-configure
+hostmakedepends="automake byacc pkg-config"
+makedepends="libmd-devel zlib-devel libuuid-devel libbsd-devel ncurses-devel openssl-devel"
+short_desc="VCS which prioritizes ease of use and simplicity over flexibility"
+maintainer="Omar Polo <op@omarpolo.com>"
+license="ISC"
+homepage="https://gameoftrees.org"
+distfiles="https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"
+checksum="2e534ed89f794a61543e6d2cb306903ea04f93977ed241004585c6b85e8b074e"
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
+	sed -n '/Copyright/,/PERFORMANCE/p' got/got.c > LICENSE
+	vlicense LICENSE
+}

From 92deba6de5648230395a108de0ec3ca345ec09e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 12 May 2022 12:05:46 +0200
Subject: [PATCH 2219/2561] lux: update to 0.15.0.

---
 srcpkgs/lux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index c09f51778e30..9e738499f207 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,6 +1,6 @@
 # Template file for 'lux'
 pkgname=lux
-version=0.14.0
+version=0.15.0
 revision=1
 build_style=go
 go_import_path=github.com/iawia002/lux
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/iawia002/lux"
 distfiles="https://github.com/iawia002/lux/archive/v${version}.tar.gz"
-checksum=3d485c9703851f3fb5cdee9b029b5b6855f84bfd29b44cae310a031a6fa8c00f
+checksum=41e45542587caa27bf8180e66c72c6c77e83d00f8dcba2e952c5a9b04d382c6c
 
 post_install() {
 	vlicense LICENSE

From e8385fad3ab05d37ceafdc36ba2a8d4606d6fc09 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 12 May 2022 21:49:21 +0300
Subject: [PATCH 2220/2561] opera: update to 86.0.4363.59.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 1be0482067b9..8bc185d34277 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=86.0.4363.50
+version=86.0.4363.59
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=94b73abd6e1d2a710ddbd437e11a1702d487cc9497258b90a131332123ce28a5
+checksum=426ea69abdc724c3cd36dd44d68071c02212e81162cd4238677d2aa160b09554
 repository="nonfree"
 nostrip=yes
 

From 1f60fd499b0ffd3d6ab84778e5f5095d1aceea9b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 10 May 2022 19:43:43 +0200
Subject: [PATCH 2221/2561] github-cli: update to 2.10.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 744f8c4ddb11..86b6ad53bdf9 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.9.0
+version=2.10.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=730b600d33afb67d84af4dca1af80cb1fbff79d302ac4f840fc8e9e4c25fceb7
+checksum=a94ba6a731ad558f7937d0ac46ff8034b56214ec9e24a9ad70296331b1bb12ed
 
 pre_build() {
 	local _date

From 19851bdc873a364d60762f6078fed0bc74b2b994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 11 May 2022 12:36:23 +0200
Subject: [PATCH 2222/2561] doctl: update to 1.75.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 81d5feb1d6e9..63cb90f307ca 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.74.0
+version=1.75.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -14,4 +14,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=3b0fcd2daff4cdce575f7a833a36c3a63a66c0dbb9af50baafe3ec9fe02c3872
+checksum=3fe102d60f57ee8f9bd4a8f5094fd3ddfdf7af1bbaf35c7b8286a9ae3c8a8f3e

From 3caafb34c40abe05007ebeaa488f6ece31a85608 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 8 May 2022 21:41:00 +0200
Subject: [PATCH 2223/2561] tdrop: update to 0.5.0.

---
 srcpkgs/tdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tdrop/template b/srcpkgs/tdrop/template
index d2e9668b03a1..14dfbaa93eb3 100644
--- a/srcpkgs/tdrop/template
+++ b/srcpkgs/tdrop/template
@@ -1,6 +1,6 @@
 # Template file for 'tdrop'
 pkgname=tdrop
-version=0.4.0
+version=0.5.0
 revision=1
 depends="bash xdotool xprop xwininfo"
 short_desc="Turn terminal emulator or any program into dropdown window"
@@ -8,7 +8,7 @@ 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=ef4c644ad6c2c350b2e0f97ae2712e9871e13a6baef9065bcc1d8125eb073bb1
+checksum=ac37c76cb936d8e4c1c0aba5874999e09b8acbe07a2e23e8181114bd4a2a0a5d
 
 do_install() {
 	vbin tdrop

From a882e1d54867ff3ab7638ecc0a1cb929e2a4dfc1 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sun, 8 May 2022 15:05:58 -0300
Subject: [PATCH 2224/2561] icewm: update to 2.9.7.

---
 srcpkgs/icewm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index f42cb153a7f1..1ad1fd904689 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.9.6
+version=2.9.7
 revision=1
 build_style=cmake
 make_cmd=make
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 changelog="https://raw.githubusercontent.com/ice-wm/icewm/master/NEWS"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=d1ff3ce7491d857c17ed0dc3dda47ddc5fdeee23ac910fa6c42ca55b7039d541
+checksum=c7ad8599dcd2912545fca9f72ab0b68d17bcb05bc11c1b3e1c7eb9f3761c4ea5
 # broken tests
 make_check=no
 

From dd19a28b0baa4edc48820b8f7e93636a795c6c2d Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Thu, 28 Apr 2022 00:06:39 +0200
Subject: [PATCH 2225/2561] util-linux-common: update to 2.38

Closes: #36775 [via git-merge-pr]
---
 srcpkgs/util-linux-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index 0d94f16d34e8..b6e0f73d6cf4 100644
--- a/srcpkgs/util-linux-common/template
+++ b/srcpkgs/util-linux-common/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux-common'
 # Keep this package sync with util-linux
 pkgname=util-linux-common
-version=2.37.2
+version=2.38
 revision=1
 wrksrc="util-linux-$version"
 build_style=gnu-configure
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
-checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
+checksum=6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64
 
 post_extract() {
 	# hung inside xbps-src

From 6cab37fe054b4b88cc9f9aec0479349e28011a48 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Thu, 28 Apr 2022 00:06:27 +0200
Subject: [PATCH 2226/2561] util-linux: update to 2.38

---
 ...t-before-reading-stdin-and-fix-unini.patch | 37 -------------------
 ...ush-stdout-before-reading-from-stdin.patch | 27 --------------
 ...w-flush-stdout-before-getting-answer.patch | 35 ------------------
 srcpkgs/util-linux/template                   |  6 +--
 4 files changed, 3 insertions(+), 102 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
 delete mode 100644 srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
 delete mode 100644 srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch

diff --git a/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch b/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
deleted file mode 100644
index 0a99aa7fae56..000000000000
--- a/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 05907d0d9e7c85f33e168feab1eb36b464425054 Mon Sep 17 00:00:00 2001
-From: Lorenzo Beretta <vc.net.loreb@gmail.com>
-Date: Mon, 25 Oct 2021 14:06:00 +0200
-Subject: [PATCH] chfn: flush stdout before reading stdin and fix uninitialized
- variable
-
-Same problem as described in https://github.com/karelzak/util-linux/pull/1481
-
-Signed-off-by: Lorenzo Beretta <vc.net.loreb@gmail.com>
----
- login-utils/chfn.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/login-utils/chfn.c b/login-utils/chfn.c
-index 2508e14c9..ece5cdce0 100644
---- a/login-utils/chfn.c
-+++ b/login-utils/chfn.c
-@@ -227,7 +227,7 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question,
- 			   char *def_val)
- {
- 	int len;
--	char *buf;
-+	char *buf = NULL; /* leave initialized to NULL or getline segfaults */
- #ifndef HAVE_LIBREADLINE
- 	size_t dummy = 0;
- #endif
-@@ -242,6 +242,7 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question,
- 		if ((buf = readline(" ")) == NULL)
- #else
- 		putchar(' ');
-+		fflush(stdout);
- 		if (getline(&buf, &dummy, stdin) < 0)
- #endif
- 			errx(EXIT_FAILURE, _("Aborted."));
--- 
-2.33.0
-
diff --git a/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch b/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
deleted file mode 100644
index 280c7fd0a62a..000000000000
--- a/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0a08200bd5664d1849e477f7f776ab4d13bb8422 Mon Sep 17 00:00:00 2001
-From: Lorenzo Beretta <vc.net.loreb@gmail.com>
-Date: Mon, 25 Oct 2021 15:28:02 +0200
-Subject: [PATCH] chsh: fflush stdout before reading from stdin
-
-Same problem as described in https://github.com/karelzak/util-linux/pull/1481
-
-Signed-off-by: Lorenzo Beretta <vc.net.loreb@gmail.com>
----
- login-utils/chsh.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/chsh.c b/login-utils/chsh.c
-index 349712072..3b446beeb 100644
---- a/login-utils/chsh.c
-+++ b/login-utils/chsh.c
-@@ -210,6 +210,7 @@ static char *ask_new_shell(char *question, char *oldshell)
- 	if ((ans = readline(" ")) == NULL)
- #else
- 	putchar(' ');
-+	fflush(stdout);
- 	if (getline(&ans, &dummy, stdin) < 0)
- #endif
- 		return NULL;
--- 
-2.33.0
-
diff --git a/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch b/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch
deleted file mode 100644
index e17c31291bcf..000000000000
--- a/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 34a9b65587a7d704db0344e859511af4a6756c89 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Fri, 22 Oct 2021 14:28:50 -0300
-Subject: [PATCH] vipw: flush stdout before getting answer.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise the question is displayed only after the user presses Return,
-and the program looks like it's hanging.
-
-This happens at least on musl libc.
-
-Reported by @loreb.
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- login-utils/vipw.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/vipw.c b/login-utils/vipw.c
-index 8e63efde2..f59948a44 100644
---- a/login-utils/vipw.c
-+++ b/login-utils/vipw.c
-@@ -353,6 +353,7 @@ int main(int argc, char *argv[])
- 		 * which means they can be translated. */
- 		printf(_("Would you like to edit %s now [y/n]? "), orig_file);
- 
-+		fflush(stdout);
- 		if (fgets(response, sizeof(response), stdin) &&
- 		    rpmatch(response) == RPMATCH_YES)
- 			edit_file(1);
--- 
-2.33.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index ae39761e102d..63b38ec67f4a 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-common
 pkgname=util-linux
-version=2.37.2
-revision=2
+version=2.38
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
@@ -22,7 +22,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
+checksum=6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"

From 9b05168fd3ccf9c3bf8d8b26c71bf6f2ecb34e3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 22 Apr 2022 23:40:12 +0200
Subject: [PATCH 2227/2561] svt-av1: update to 1.0.0.

---
 common/shlibs            | 2 +-
 srcpkgs/svt-av1/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 680ab7920513..85b44e2cc5e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4123,7 +4123,7 @@ libjvm.so openjdk17-jre-17.0.1+12_1
 librttopo.so.1 librttopo-1.1.0_1
 libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
-libSvtAv1Enc.so.0 libsvt-av1-0.9.0_1
+libSvtAv1Enc.so.1 libsvt-av1-1.0.0_1
 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
 librz_bp.so.0.3.4 rizin-0.3.4_1
 librz_reg.so.0.3.4 rizin-0.3.4_1
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index ab9386d90cb7..7b08bf9c309c 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,6 +1,6 @@
 # Template file for 'svt-av1'
 pkgname=svt-av1
-version=0.9.1
+version=1.0.0
 revision=1
 wrksrc="SVT-AV1-v${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ license="BSD-3-Clause-Clear"
 homepage="https://gitlab.com/AOMediaCodec/SVT-AV1"
 changelog="https://gitlab.com/AOMediaCodec/SVT-AV1/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${version}/SVT-AV1-v${version}.tar.gz"
-checksum=714154c08a90a5eb1f09c4d0d766621132711137af127468dc122c04ca9784ae
+checksum=84030ef7f33645ddfcdd2dc8a08277e49f3c4297fc53711958060c8ce51dc22d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="32-bit is not supported"

From 5499016066d3264b9520de916f9965768e06d97a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 22 Apr 2022 23:40:50 +0200
Subject: [PATCH 2228/2561] ffmpeg: rebuild against svt-av1-1.0.0

---
 srcpkgs/ffmpeg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 213aae8bbfa0..8ffdd4401f2d 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.4.1
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 72d8e75c902e0e0c679e7c4f9000100c0382f51d Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 8 May 2022 13:10:47 -0700
Subject: [PATCH 2229/2561] libslirp: update to 4.7.0

---
 srcpkgs/libslirp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libslirp/template b/srcpkgs/libslirp/template
index 17fc6fdc9f3d..b22560ec3b3a 100644
--- a/srcpkgs/libslirp/template
+++ b/srcpkgs/libslirp/template
@@ -1,6 +1,6 @@
 # Template file for 'libslirp'
 pkgname=libslirp
-version=4.6.1
+version=4.7.0
 revision=1
 wrksrc="libslirp-v${version}"
 build_style=meson
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://gitlab.freedesktop.org/slirp/libslirp"
 changelog="https://gitlab.freedesktop.org/slirp/libslirp/-/blob/master/CHANGELOG.md"
 distfiles="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${version}/libslirp-v${version}.tar.gz"
-checksum=69ad4df0123742a29cc783b35de34771ed74d085482470df6313b6abeb799b11
+checksum=9398f0ec5a581d4e1cd6856b88ae83927e458d643788c3391a39e61b75db3d3b
 
 pre_configure() {
 	printf '%s\n' "${version}" > .tarball-version

From ad000e688d4e6dfb1608e31d1b4a039551b38610 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 8 May 2022 13:20:05 -0700
Subject: [PATCH 2230/2561] slirp4netns: update to 1.2.0

---
 srcpkgs/slirp4netns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slirp4netns/template b/srcpkgs/slirp4netns/template
index 437145fa33dc..d96168c502d8 100644
--- a/srcpkgs/slirp4netns/template
+++ b/srcpkgs/slirp4netns/template
@@ -1,6 +1,6 @@
 # Template file for 'slirp4netns'
 pkgname=slirp4netns
-version=1.1.12
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/rootless-containers/slirp4netns"
 distfiles="https://github.com/rootless-containers/slirp4netns/archive/v${version}.tar.gz"
-checksum=279dfe58a61b9d769f620b6c0552edd93daba75d7761f7c3742ec4d26aaa2962
+checksum=b584edde686d3cfbac210cbdb93c4b0ba5d8cc0a6a4d92b9dfc3c5baec99c727
 # tests fail due to use of unshare (unavailable with chroot util-linux)
 make_check=no
 

From d4a9674a7ef676dd9ce5eebb52383e67a8dfe25d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 12 May 2022 19:54:47 -0400
Subject: [PATCH 2231/2561] gthumb: update to 3.12.2.

---
 .../patches/linguas-remove-duplicate.patch    | 24 -------------------
 srcpkgs/gthumb/template                       |  4 ++--
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/gthumb/patches/linguas-remove-duplicate.patch

diff --git a/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch
deleted file mode 100644
index 00e9dde84669..000000000000
--- a/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From daef485dffd67319c114cf1bda453bf6157e11ff Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@src.gnome.org>
-Date: Tue, 11 Jan 2022 12:30:44 +0100
-Subject: [PATCH] LINGUAS: removed duplicated entry
-
----
- help/LINGUAS | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/help/LINGUAS b/help/LINGUAS
-index b615195e..aabf71ac 100644
---- a/help/LINGUAS
-+++ b/help/LINGUAS
-@@ -9,7 +9,6 @@ eu
- fr
- hu
- id
--id
- nl
- oc
- sl
--- 
-GitLab
-
diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template
index 13fb63a7fb13..6de1a2663ebe 100644
--- a/srcpkgs/gthumb/template
+++ b/srcpkgs/gthumb/template
@@ -1,6 +1,6 @@
 # Template file for 'gthumb'
 pkgname=gthumb
-version=3.12.0
+version=3.12.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gthumb"
 changelog="https://gitlab.gnome.org/GNOME/gthumb/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gthumb/${version%.*}/gthumb-${version}.tar.xz"
-checksum=3deffc030384e64b57361c437c79b481ae1489ef44c87ae856e81bb10d8e383f
+checksum=97f8afe522535216541ebbf1e3b546d12a6beb38a8f0eb85f26e676934aad425
 
 LDFLAGS="-fPIC"
 

From d2f2d90b0275bbaa039779bfa5a145f259f39675 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Wed, 11 May 2022 18:07:15 -0700
Subject: [PATCH 2232/2561] runc: update to 1.1.2

Fixes CVE-2022-29162
---
 srcpkgs/runc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 182e20b99857..35f011484e72 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,6 +1,6 @@
 # Template file for 'runc'
 pkgname=runc
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=go
 go_import_path=github.com/opencontainers/runc
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/opencontainers/runc"
 distfiles="https://github.com/opencontainers/runc/releases/download/v${version}/runc.tar.xz"
-checksum=75c1f0bb19b209412c52599e24b33ac306cf7caf772c97577b7ebe964837a54b
+checksum=78ad532465ce4c2802480644a8756c30ae99c1bf779f0243af4bca11c4d041de
 
 post_build() {
 	make man

From 8a9f409cad8c41d84236e10c417faf4ef1ac28b3 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH 2233/2561] po4a: update to 0.66

---
 srcpkgs/po4a/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..8dd6a6ed641b 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
 # Template file for 'po4a'
 pkgname=po4a
-version=0.63
+version=0.66
 revision=1
 build_style=perl-ModuleBuild
 _perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,12 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
  libxslt docbook-xsl"
 makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
 depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
 short_desc="PO for anything (po4a) project to ease translations using gettext tools"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://po4a.org/"
+changelog="https://raw.githubusercontent.com/mquinson/po4a/master/NEWS"
 distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=8ae65c69b3a3e3911c449284aa9f07c80b74484fd211f6e2a7e6b57e09f3afd8
+make_check=ci-skip # cannot repoduce failure locally

From 4b49c87b8800e43488e80feb8d1002e086f32063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 12:00:29 -0300
Subject: [PATCH 2234/2561] curl: update to 7.83.1.

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 74358a24969d..00cbfd709875 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,6 +1,6 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.83.0
+version=7.83.1
 revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
@@ -24,7 +24,7 @@ license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=247c7ec7521c4258e65634e529270d214fe32969971cccb72845e7aa46831f96
+checksum=f539a36fb44a8260ec5d977e4e0dbdd2eee29ed90fcedaa9bc3c9f78a113bff0
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssh ssl zstd"
 vopt_conflict ssl gnutls

From d84ddb181f1054b19f249dc13ed7d3467562892e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 12:00:32 -0300
Subject: [PATCH 2235/2561] doxygen: update to 1.9.4.

---
 srcpkgs/doxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index 946ceeebcc11..998bd04bcefe 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'doxygen'
 pkgname=doxygen
-version=1.9.3
+version=1.9.4
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="http://www.doxygen.org/"
 changelog="https://www.doxygen.nl/manual/changelog.html"
 distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz"
-checksum=f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0
+checksum=a15e9cd8c0d02b7888bc8356eac200222ecff1defd32f3fe05257d81227b1f37
 
 build_options="wizard"
 desc_option_wizard="build Qt5 GUI configuration tool, doxywizard"

From 03eda3bd6ef534c46cc27e63af3c4e63bced6d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 12:00:35 -0300
Subject: [PATCH 2236/2561] iwd: update to 1.27.

---
 srcpkgs/iwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 66f55599c5e0..0b01bad5a239 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.26
+version=1.27
 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=0ff4541c2b7f14ec010c3cbd1f02350f1b58cb0c103412db22550e90d8040d6b
+checksum=013b4a0a79629c20d915954fc3b5d0620ef6e0d6065db3c342f4b3f9111f46ec
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From c01df37f049356bd350cffb9e5a7481e740cb41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 12:00:37 -0300
Subject: [PATCH 2237/2561] ell: update to 0.50.

---
 srcpkgs/ell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index bb563505e80e..fdfbd4e413a1 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,7 +1,7 @@
 # Template file for 'ell'
 # ell ABI isn't stable! Always test dependants after updates and update common/shlibs
 pkgname=ell
-version=0.45
+version=0.50
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
@@ -13,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=fedfcceee56eb63ab1eb98bf120a3cfbecee50bcd893874328c889f1b381e7d7
+checksum=0fe51d51c6eddc2a2784092f1dfdd1143a5ef27f15c274ecfbadd680d3a72fd9
 # tests depend on kernel features
 make_check=extended
 

From e4a5c6120493a07068495cfdd9a84295edca1456 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 12 May 2022 17:41:51 -0400
Subject: [PATCH 2238/2561] libfilezilla: update to 0.37.2.

---
 common/shlibs                 | 2 +-
 srcpkgs/libfilezilla/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 85b44e2cc5e8..a143f5928c41 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2623,7 +2623,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.24 libfilezilla-0.36.0_1
+libfilezilla.so.25 libfilezilla-0.37.2_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index de4331d8fcca..9c50531cbbb6 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.36.0
+version=0.37.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c0271c18ede7fbbc826b21c972c2cb0ff96744ee5a15c91d8d74e9bc3853a872
+checksum=e51140ee63646ba92ae41969c1fbff25946dc452410d3c4daf91cd792bfee2d5
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From d82b58425126560a5bc473d30902634242578e7b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 12 May 2022 17:42:10 -0400
Subject: [PATCH 2239/2561] filezilla: update to 3.59.0.

---
 srcpkgs/filezilla/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 0c5abd1a1b55..3d6a65eaf383 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.58.0
+version=3.59.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=d0fe7f72e01f7742baa06466818b186e8e91fff62d6ee7b2f0e884b6b3385d88
+checksum=ad82d70e55dca8e0e2b2e194c68f3c8f2e003a46b7920cf0b6d6e8433e911501
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From d0b3dc4e6d97e1c9c47033d4d0b8d5550db6ab2a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 May 2022 17:10:34 +0200
Subject: [PATCH 2240/2561] libqtxdg: update to 3.9.1.

---
 srcpkgs/libqtxdg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template
index b8bea143f360..b4f1e5ab53aa 100644
--- a/srcpkgs/libqtxdg/template
+++ b/srcpkgs/libqtxdg/template
@@ -1,6 +1,6 @@
 # Template file for 'libqtxdg'
 pkgname=libqtxdg
-version=3.9.0
+version=3.9.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-project.org"
 distfiles="https://github.com/lxqt/libqtxdg/archive/${version}.tar.gz"
-checksum=4dc7e3e65e6bcd50010647ef781ef5601b08ce024b0b1155e6a68316696c5a58
+checksum=6866a9f5bf83ef46c436342a266ae4562f81823f8d053c028c0c87c2223332cb
 
 libqtxdg-devel_package() {
 	short_desc+=" - development files"

From c28379911d5565e31524f4e05abdda7bfa9189a3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 May 2022 17:13:36 +0200
Subject: [PATCH 2241/2561] libkdcraw5: update to 22.04.1.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index f71d7b6c6ac4..0e357c09c464 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=22.04.0
+version=22.04.1
 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=f92cee9a87fdef59f12bde784e1ec2b13b2677c82634e303f20ed8055ddb3e79
+checksum=62942d392519e86e880e5c5b0dc1bda124f245380546299536d755f4eb12a8a5
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 0be8911622c630facf03ffd280d4363e91da2eed Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 May 2022 18:22:04 +0200
Subject: [PATCH 2242/2561] gwenview: update to 22.04.1.

---
 srcpkgs/gwenview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index a9eafcc90cf1..c91d1866d19b 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -16,4 +16,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=73683096898c59388cd566cc8f71d7677fd0b22a2ab42a6d5f82f1232372ab05
+checksum=f99a8f6eb7c7e2ba8b3f434512a2050cf64e032c48830c3ad80dbbb6d5e9cc4a

From 43e46c6c7f33374e0fb875632f0a1cc74243671e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 May 2022 18:28:53 +0200
Subject: [PATCH 2243/2561] linux5.4: update to 5.4.193.

---
 srcpkgs/linux5.4/files/arm64-dotconfig  | 3 +--
 srcpkgs/linux5.4/files/x86_64-dotconfig | 5 ++---
 srcpkgs/linux5.4/template               | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index 2b70d687ce1a..21f6ee83333d 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.187 Kernel Configuration
+# Linux/arm64 5.4.193 Kernel Configuration
 #
 
 #
@@ -3835,7 +3835,6 @@ CONFIG_VMXNET3=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.4/files/x86_64-dotconfig b/srcpkgs/linux5.4/files/x86_64-dotconfig
index 42961c8c8ad8..0ecfe841959e 100644
--- a/srcpkgs/linux5.4/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.4/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.180 Kernel Configuration
+# Linux/x86_64 5.4.193 Kernel Configuration
 #
 
 #
@@ -2199,6 +2199,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3524,8 +3525,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 1380552916af..8c274c1b3653 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.191
+version=5.4.193
 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=288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a
+checksum=0d16d343956d311e3f4ab3f032fd626d8e6b67c0db94edd32f561407d374f2a0
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 7e49dfc39b6e7f43525d09b68580636326b6afd9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 May 2022 18:30:58 +0200
Subject: [PATCH 2244/2561] linux4.19: update to 4.19.242.

---
 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 d58249cf182a..0b504065d4b7 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.241
+version=4.19.242
 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=4c6269d3c14e593151b035a55227110e632642d848032ef6992135c18488fe13
+checksum=59bcfd094ec26b03ca506199224cff53c13325e62d22bd4e31ef4ccafe7265a2
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 9af36aeb27959281a1fbaee3aa1d898b27356ea8 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 13 May 2022 18:32:01 +0200
Subject: [PATCH 2245/2561] remmina: update to 1.4.25.

---
 srcpkgs/remmina/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index a784eb1b6afc..77f5663cf476 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,6 +1,6 @@
 # Template file for 'remmina'
 pkgname=remmina
-version=1.4.24
+version=1.4.25
 revision=1
 wrksrc="Remmina-v${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
  libsecret-devel libsodium-devel libsoup-devel libssh-devel libva-devel
  libvncserver-devel libxkbfile-devel opus-devel phodav-devel
  spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel"
+ vte3-devel libappindicator-devel webkit2gtk-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Remote desktop client written in GTK+"
 maintainer="Frank Steinborn <steinex@nognu.de>"
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://remmina.org"
 changelog="https://gitlab.com/Remmina/Remmina/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.com/Remmina/Remmina/-/archive/v${version}/Remmina-v${version}.tar.bz2"
-checksum=76a42062689b32fb6e41c59084fd52135ac8ea7806b119a40e0e1134ff0231fe
+checksum=7c860c22b77b928fc93c5ab50cdb8af14a6a9160d17c548b9f084f66e634c9f2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

From 67438b5ac5190ec237ad756b87d509cb5cae5504 Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Sun, 24 Apr 2022 19:33:01 +0100
Subject: [PATCH 2246/2561] radare2: update to 5.6.8.

---
 common/shlibs                             | 45 ++++++++++++-----------
 srcpkgs/radare2-devel                     |  1 +
 srcpkgs/radare2/patches/sys_openssl.patch | 21 +++++++++++
 srcpkgs/radare2/patches/try.patch         | 20 ----------
 srcpkgs/radare2/template                  | 25 ++++++++++---
 5 files changed, 64 insertions(+), 48 deletions(-)
 create mode 120000 srcpkgs/radare2-devel
 create mode 100644 srcpkgs/radare2/patches/sys_openssl.patch
 delete mode 100644 srcpkgs/radare2/patches/try.patch

diff --git a/common/shlibs b/common/shlibs
index a143f5928c41..a95bc3054f14 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3184,28 +3184,29 @@ libkdeconnectinterfaces.so.21 kdeconnect-21.03.80_1
 libkdeconnectcore.so.21 kdeconnect-21.03.80_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
-libr_cons.so.5.0.0 radare2-5.0.0_1
-libr_util.so.5.0.0 radare2-5.0.0_1
-libr_flag.so.5.0.0 radare2-5.0.0_1
-libr_asm.so.5.0.0 radare2-5.0.0_1
-libr_bin.so.5.0.0 radare2-5.0.0_1
-libr_anal.so.5.0.0 radare2-5.0.0_1
-libr_lang.so.5.0.0 radare2-5.0.0_1
-libr_debug.so.5.0.0 radare2-5.0.0_1
-libr_egg.so.5.0.0 radare2-5.0.0_1
-libr_bp.so.5.0.0 radare2-5.0.0_1
-libr_search.so.5.0.0 radare2-5.0.0_1
-libr_io.so.5.0.0 radare2-5.0.0_1
-libr_hash.so.5.0.0 radare2-5.0.0_1
-libr_socket.so.5.0.0 radare2-5.0.0_1
-libr_parse.so.5.0.0 radare2-5.0.0_1
-libr_syscall.so.5.0.0 radare2-5.0.0_1
-libr_crypto.so.5.0.0 radare2-5.0.0_1
-libr_fs.so.5.0.0 radare2-5.0.0_1
-libr_magic.so.5.0.0 radare2-5.0.0_1
-libr_reg.so.5.0.0 radare2-5.0.0_1
+libr_core.so.5.6.8 radare2-5.6.8_1
+libr_config.so.5.6.8 radare2-5.6.8_1
+libr_cons.so.5.6.8 radare2-5.6.8_1
+libr_util.so.5.6.8 radare2-5.6.8_1
+libr_flag.so.5.6.8 radare2-5.6.8_1
+libr_asm.so.5.6.8 radare2-5.6.8_1
+libr_bin.so.5.6.8 radare2-5.6.8_1
+libr_anal.so.5.6.8 radare2-5.6.8_1
+libr_lang.so.5.6.8 radare2-5.6.8_1
+libr_debug.so.5.6.8 radare2-5.6.8_1
+libr_egg.so.5.6.8 radare2-5.6.8_1
+libr_bp.so.5.6.8 radare2-5.6.8_1
+libr_search.so.5.6.8 radare2-5.6.8_1
+libr_io.so.5.6.8 radare2-5.6.8_1
+libr_hash.so.5.6.8 radare2-5.6.8_1
+libr_socket.so.5.6.8 radare2-5.6.8_1
+libr_parse.so.5.6.8 radare2-5.6.8_1
+libr_syscall.so.5.6.8 radare2-5.6.8_1
+libr_crypto.so.5.6.8 radare2-5.6.8_1
+libr_fs.so.5.6.8 radare2-5.6.8_1
+libr_magic.so.5.6.8 radare2-5.6.8_1
+libr_reg.so.5.6.8 radare2-5.6.8_1
+libr_main.so.5.6.8 radare2-5.6.8_1
 libykpiv.so.1 libykpiv-2.1.1_2
 libykcs11.so.1 libykcs11-2.1.1_2
 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
diff --git a/srcpkgs/radare2-devel b/srcpkgs/radare2-devel
new file mode 120000
index 000000000000..fef4c7d8311a
--- /dev/null
+++ b/srcpkgs/radare2-devel
@@ -0,0 +1 @@
+radare2
\ No newline at end of file
diff --git a/srcpkgs/radare2/patches/sys_openssl.patch b/srcpkgs/radare2/patches/sys_openssl.patch
new file mode 100644
index 000000000000..1711c75aaa85
--- /dev/null
+++ b/srcpkgs/radare2/patches/sys_openssl.patch
@@ -0,0 +1,21 @@
+From bdaff5a9fdd628482cd03a384a8804f228eecf9a Mon Sep 17 00:00:00 2001
+From: ypsvlq <86775241+ypsvlq@users.noreply.github.com>
+Date: Tue, 10 May 2022 08:24:14 +0100
+Subject: [PATCH] Fix meson build with use_sys_openssl ##build
+
+---
+ libr/socket/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libr/socket/meson.build b/libr/socket/meson.build
+index 4e8614e9e57b..135c7b50efb9 100644
+--- a/libr/socket/meson.build
++++ b/libr/socket/meson.build
+@@ -20,7 +20,6 @@ endif
+ 
+ if use_sys_openssl
+   r_util_deps += [sys_openssl]
+-  r_util_static_deps += [sys_openssl]
+ endif
+ 
+ r_socket = library('r_socket', r_socket_sources,
diff --git a/srcpkgs/radare2/patches/try.patch b/srcpkgs/radare2/patches/try.patch
deleted file mode 100644
index 332d9e083192..000000000000
--- a/srcpkgs/radare2/patches/try.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/shlr/Makefile	2020-12-21 09:39:46.000000000 +0100
-+++ b/shlr/Makefile	2021-01-04 22:13:43.513442861 +0100
-@@ -122,7 +122,7 @@
- SDB_LIBA=sdb/src/libsdb.a
- 
- $(SDB_HOST):
--	$(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC)
-+	$(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC) LD=ld
- 
- $(SDB_LIBA):
- 	$(MAKE) sdb-target
-@@ -136,7 +136,7 @@
- 	@echo ">>>>>>>>"
- 	@echo
- 	$(MAKE) -C sdb clean ; rm -f sdb/src/*.o sdb/src/sdb_version.h
--	$(MAKE) -C sdb/src "CC=${HOST_CC}" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin
-+	$(MAKE) -C sdb/src "CC=${HOST_CC}" "LD=ld" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin
- 	cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/src/.sdb${BUILD_EXT_EXE}
- 	cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/sdb$(BUILD_EXT_EXE)
- 	-file sdb/sdb$(BUILD_EXT_EXE)
diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template
index 39818e99e7f2..9baabf500146 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -1,19 +1,32 @@
 # Template file for 'radare2'
-# cutter needs to be bumped when radare2 is updated
 pkgname=radare2
-version=5.0.0
+version=5.6.8
 revision=1
 build_style=meson
-configure_args="-Duse_sys_capstone=true -Denable_tests=false"
+configure_args="-Denable_tests=false -Duse_sys_capstone=true
+ -Duse_sys_magic=true -Duse_sys_xxhash=true
+ -Duse_ssl=true -Duse_sys_openssl=true -Duse_libuv=true
+ -Duse_sys_zlib=true -Duse_sys_zip=true -Duse_sys_lz4=true"
 hostmakedepends="pkg-config"
-makedepends="capstone-devel"
+makedepends="capstone-devel file-devel xxHash-devel openssl-devel libuv-devel
+ zlib-devel libzip-devel liblz4-devel"
 short_desc="Advanced command line debugger and hexadecimal editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-only"
-homepage="http://www.radare.org"
+homepage="https://www.radare.org"
 distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz"
-checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae
+checksum=320d4f4733402cbc38303c7d37db04716e4376138da44d3664bb73adbdd77e0c
 
 case "$XBPS_TARGET_MACHINE" in
 	mips*) CFLAGS="-Os";;
 esac
+
+radare2-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 0d0f18f98cb3ed735d94d1d7e1f8cdec0b964d68 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 13 May 2022 09:34:24 -0400
Subject: [PATCH 2247/2561] dendrite: update to 0.8.5.

---
 srcpkgs/dendrite/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 7e8f9fd27312..283fce810710 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.8.3
+version=0.8.5
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=2d61dc970bf812e13f7a81c65e811811ef950dad02631380650191214f2b5d5d
+checksum=43b8197515a713bb2c0bb867abd0898104a53756f0c34b22601c4deebb898974
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"
@@ -25,11 +25,11 @@ make_dirs="
 pre_configure() {
 	vsed -e 's,\./logs,/var/log/dendrite,' \
 	 -e 's,: matrix_key.pem,: /etc/dendrite/matrix_key.pem,' \
-	 -i dendrite-config.yaml
+	 -i dendrite-sample.monolith.yaml
 }
 
 post_install() {
-	vsconf dendrite-config.yaml dendrite.yaml
+	vsconf dendrite-sample.monolith.yaml
 	vsv dendrite-monolith-server
 
 	cd "${DESTDIR}"/usr/bin

From ddb85096d3fad5bde7a996419f074337bfbfa1f6 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 13 May 2022 18:27:45 +0200
Subject: [PATCH 2248/2561] xfce4-terminal: update to 1.0.3.

---
 srcpkgs/xfce4-terminal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 418817a0ac32..d3aaada37900 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
-version=1.0.2
+version=1.0.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/xfce4-terminal/start"
 changelog="https://gitlab.xfce.org/apps/xfce4-terminal/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=ac1543167b43322ad2483ffb033a7e74669ecb59f4b63016a3c183d96141d326
+checksum=1c69a6d2edffbaf30d7123da82fd05c12259fc279caf7c491520158cc67ff5ed

From 3b27acc3ed69ee712b853605c5f6d10b2555604d Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 13 May 2022 18:30:28 +0200
Subject: [PATCH 2249/2561] ltris: update to 1.2.4.

---
 srcpkgs/ltris/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
index 98846feaac3b..80d9f0a9f455 100644
--- a/srcpkgs/ltris/template
+++ b/srcpkgs/ltris/template
@@ -1,6 +1,6 @@
 # Template file for 'ltris'
 pkgname=ltris
-version=1.2.3
+version=1.2.4
 revision=1
 build_style=gnu-configure
 configure_args="--localstatedir=/var/games/ltris"
@@ -11,6 +11,6 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="http://lgames.sourceforge.net/index.php?project=LTris"
 distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
-checksum=0ec4ad053e066a296529e923c2f626fa0a19c094c5ae03e44359f9c9e50955a8
+checksum=d6eb7b301023278604d9292a92f2fd2f5103ee412a75a126d2550e2ec2368f83
 nocheckperms=yes # uses a world-writable .hscr file for global leaderboard
 CFLAGS+=" -fgnu89-inline"

From 407da321cca79f6c67d93e0b602e548edee0c0da Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 10 Apr 2022 15:32:56 +0200
Subject: [PATCH 2250/2561] chatty: update to 0.18.

---
 srcpkgs/chatty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index 32821e5277f3..58ab4862f6fc 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -1,6 +1,6 @@
 # Template file for 'chatty'
 pkgname=chatty
-version=0.17
+version=0.18
 revision=1
 hostmakedepends="gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-3.0-or-later"
 homepage="https://chatty.github.io/"
 distfiles="https://github.com/chatty/chatty/archive/v${version}.tar.gz"
-checksum=1d649d87fccb23b05136df387d4e23d79c2254b4c9f66ac09bc15c575d5680dd
+checksum=cbc4009a233168a751cf2732cd5da79d851151fe866a74f75651e8eab75dc4f7
 
 do_build() {
 	gradle shadowJar

From a22bc60a0046c34dbd2097b4b625082f92826efe Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 12 May 2022 14:03:23 +0200
Subject: [PATCH 2251/2561] bat: update to 0.21.0

---
 srcpkgs/bat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index e3f210b3cab2..11e11a56fd68 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,6 +1,6 @@
 # Template file for 'bat'
 pkgname=bat
-version=0.20.0
+version=0.21.0
 revision=1
 build_style=cargo
 hostmakedepends="cmake llvm clang"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/bat"
 distfiles="https://github.com/sharkdp/bat/archive/v${version}.tar.gz"
-checksum=12eca3add56f21b8056a4c17cfb5bffc45e107f23f75a8e0f5de948d8e997c39
+checksum=3dff1e52d577d0a105f4afe3fe7722a4a2b8bb2eb3e7a6a5284ac7add586a3ee
 
 post_patch() {
 	# fixes an indexmap error when cross compiling

From 08b75a158a48063dd4abb0b49f47750e8f0d8ec8 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloi.torrentsj@gmail.com>
Date: Sat, 30 Apr 2022 00:19:44 +0200
Subject: [PATCH 2252/2561] New Package: clickclack-0.2.3

---
 srcpkgs/clickclack/template | 16 ++++++++++++++++
 srcpkgs/clickclack/update   |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/clickclack/template
 create mode 100644 srcpkgs/clickclack/update

diff --git a/srcpkgs/clickclack/template b/srcpkgs/clickclack/template
new file mode 100644
index 000000000000..bb137432cd35
--- /dev/null
+++ b/srcpkgs/clickclack/template
@@ -0,0 +1,16 @@
+# Template file for 'clickclack'
+pkgname=clickclack
+version=0.2.3
+revision=1
+build_style=gnu-makefile
+makedepends="SDL2-devel"
+short_desc="Simple haptic feedback and audio feedback tool"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license=MIT
+homepage=https://git.sr.ht/~proycon/clickclack
+distfiles="https://git.sr.ht/~proycon/clickclack/archive/${version}.tar.gz"
+checksum=940f13ae1aa8b33677d8153db4af848233cb45dbb755320463dc3f980c73cced
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/clickclack/update b/srcpkgs/clickclack/update
new file mode 100644
index 000000000000..963c41fa75bc
--- /dev/null
+++ b/srcpkgs/clickclack/update
@@ -0,0 +1 @@
+pattern='\s{12}\K[\d.]+'

From 9ef581c1581bb726b1d2948a4dc161068b21a90e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 12 Apr 2022 15:28:23 -0400
Subject: [PATCH 2253/2561] common/hooks/pre-pkg/04-generate-runtime-deps.sh:
 sort deps for reproducibility

fixes #36641
---
 common/hooks/pre-pkg/04-generate-runtime-deps.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index c8f8c04d4884..987b0cece9c5 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -34,15 +34,14 @@ add_rundep() {
 
 store_pkgdestdir_rundeps() {
         if [ -n "$run_depends" ]; then
-            : > ${PKGDESTDIR}/rdeps
             for f in ${run_depends}; do
                 _curdep="$(echo "$f" | sed -e 's,\(.*\)?.*,\1,')"
                 if [ -z "$($XBPS_UHELPER_CMD getpkgdepname ${_curdep} 2>/dev/null)" -a \
                      -z "$($XBPS_UHELPER_CMD getpkgname ${_curdep} 2>/dev/null)" ]; then
                     _curdep="${_curdep}>=0"
                 fi
-                printf -- "${_curdep} " >> ${PKGDESTDIR}/rdeps
-            done
+                printf -- "${_curdep}\n"
+            done | sort | xargs > ${PKGDESTDIR}/rdeps
         fi
 }
 
@@ -145,7 +144,7 @@ hook() {
 
         if [ "${_pkgname}" != "${pkgname}" ]; then
             echo "   SONAME: $f <-> ${_sdep}"
-            sorequires+="${f} "
+            sorequires+="${f}\n"
         else
             # Ignore libs by current pkg
             echo "   SONAME: $f <-> ${_rdep} (ignored)"
@@ -163,9 +162,9 @@ hook() {
     store_pkgdestdir_rundeps
 
     for f in ${shlib_requires}; do
-        sorequires+="${f} "
+        sorequires+="${f}\n"
     done
     if [ -n "${sorequires}" ]; then
-        echo "${sorequires}" > ${PKGDESTDIR}/shlib-requires
+        echo "${sorequires}" | sort | xargs > ${PKGDESTDIR}/shlib-requires
     fi
 }

From d76e5aac89895c815abfdddd6d1057ba411bb383 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Fri, 13 May 2022 16:13:57 -0400
Subject: [PATCH 2254/2561] common/hooks/pre-pkg/04-generate-runtime-deps.sh:
 fix sorequires

---
 common/hooks/pre-pkg/04-generate-runtime-deps.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 987b0cece9c5..eb19ebfe7081 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -144,7 +144,7 @@ hook() {
 
         if [ "${_pkgname}" != "${pkgname}" ]; then
             echo "   SONAME: $f <-> ${_sdep}"
-            sorequires+="${f}\n"
+            sorequires+="${f} "
         else
             # Ignore libs by current pkg
             echo "   SONAME: $f <-> ${_rdep} (ignored)"
@@ -162,9 +162,9 @@ hook() {
     store_pkgdestdir_rundeps
 
     for f in ${shlib_requires}; do
-        sorequires+="${f}\n"
+        sorequires+="${f} "
     done
     if [ -n "${sorequires}" ]; then
-        echo "${sorequires}" | sort | xargs > ${PKGDESTDIR}/shlib-requires
+        echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
     fi
 }

From 3b64f652fa6f4bd5d6bf2ce1432ea1a9406126d1 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 13 May 2022 18:17:57 +0200
Subject: [PATCH 2255/2561] node_exporter: update to 1.3.1.

---
 srcpkgs/node_exporter/template | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index baec4cfc14d5..5be5dc50d5e5 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
-version=1.1.2
-revision=2
+version=1.3.1
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}
@@ -14,8 +14,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=edb40c783bd5767f174b916c89a768496ccae0f74811ba1d03c57c32cd250bbd
-python_version=3
+checksum=66856b6b8953e094c46d7dd5aabd32801375cf4d13d9fe388e320cbaeaff573a
 
 system_accounts="_node_exporter"
 
@@ -25,9 +24,3 @@ post_install() {
 	vsconf example-rules.yml
 	vsv node_exporter
 }
-
-# REMARKS:
-# The following remark is now obsolete:
-# ON UPDATE: Be sure to update the default list of collectors in the sv run
-# 	file. There is no easy way at 0.14.0 to go from the -h output
-# 	of node_exporter to taking the default list and appending runit.

From 54f3be47be6aa28a19a05894c279c859d9700806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 13 May 2022 23:58:58 +0200
Subject: [PATCH 2256/2561] mpd: update to 0.23.7.

---
 srcpkgs/mpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index b34c78c11815..944431faaf10 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.23.6
+version=0.23.7
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -39,7 +39,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed
+checksum=960dcbac717c388f5dcc4fd945e3af19a476f2b15f367e9653d4c7a948768211
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From c9cbe89c400c4caf49ada4df65d3cce34fa29efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 8 May 2022 14:35:27 +0200
Subject: [PATCH 2257/2561] tor: update to 0.4.7.7.

---
 srcpkgs/tor/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 025d10205848..ec1efb4fb8b3 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,6 +1,6 @@
 # Template file for 'tor'
 pkgname=tor
-version=0.4.6.10
+version=0.4.7.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-zstd"
@@ -14,11 +14,11 @@ license="BSD-3-Clause"
 homepage="https://www.torproject.org/"
 changelog="https://gitlab.torproject.org/tpo/core/tor/-/raw/main/ChangeLog"
 distfiles="https://dist.torproject.org/tor-${version}.tar.gz"
-checksum=94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c
+checksum=3e131158b52b9435d7e43d1c47ef288b96d005342cc44b8c950bb403851a5b44
 
 conf_files="/etc/tor/torrc"
 system_accounts="tor"
-tor_homedir=/var/lib/tor
+tor_homedir="/var/lib/tor"
 make_dirs="/var/lib/tor 0700 tor tor"
 
 pre_configure() {

From a614bbf20b01bc2e852de65c23433e2b9b1ed270 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 9 May 2022 17:28:52 +0300
Subject: [PATCH 2258/2561] bleachbit: update to 4.4.2.

---
 srcpkgs/bleachbit/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template
index 20b148a472a1..7bca1dfd6a27 100644
--- a/srcpkgs/bleachbit/template
+++ b/srcpkgs/bleachbit/template
@@ -1,15 +1,15 @@
 # Template file for 'bleachbit'
 pkgname=bleachbit
-version=4.4.0
+version=4.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
-hostmakedepends="python3 gettext"
-depends="python3-gobject python3-scandir gtk+3 desktop-file-utils hicolor-icon-theme"
+hostmakedepends="python3 gettext desktop-file-utils"
+depends="gtk+3 python3-gobject python3-scandir python3-chardet"
 short_desc="Deletes unneeded files to free disk space and maintain privacy"
 maintainer="graysky <graysky@archlinux.us>"
 license="GPL-3.0-or-later"
 homepage="https://www.bleachbit.org/"
 distfiles="https://github.com/bleachbit/bleachbit/archive/v${version}.tar.gz"
-checksum=c45dad54d8c1da90be315e6d2403cba4c6fc59453b107d6d8ce0ca975228146f
+checksum=6001c864688e36bd8f950c1341923c9347c2373149a9ce98dc26c39023b51997
 python_version=3

From 4a50acd134c814631d903d8868b73fb713804b57 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 8 May 2022 20:41:22 +0530
Subject: [PATCH 2259/2561] avrdude: update to 7.0, remove build options

Build options can be added back if anybody demands. Until then, they
aren't necessary.

Changelog should point to the latest changelog, so that users can see
what changes have been made before upgrading.
---
 srcpkgs/avrdude/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/avrdude/template b/srcpkgs/avrdude/template
index 5ebe45ae47e4..b30f9fb13724 100644
--- a/srcpkgs/avrdude/template
+++ b/srcpkgs/avrdude/template
@@ -1,9 +1,9 @@
 # Template file for 'avrdude'
 pkgname=avrdude
-version=6.4
+version=7.0
 revision=1
 build_style=gnu-configure
-configure_args="$(vopt_enable gpio linuxgpio) $(vopt_enable spi linuxspi)"
+configure_args="--enable-linuxspi --enable-linuxgpio --enable-parport"
 hostmakedepends="flex"
 makedepends="elfutils-devel libusb-devel libusb-compat-devel libftdi1-devel
  hidapi-devel"
@@ -12,10 +12,7 @@ short_desc="Utility to manipulate ROM and EEPROM of AVR microcontrollers"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://www.nongnu.org/avrdude/"
+changelog="https://raw.githubusercontent.com/avrdudes/avrdude/master/NEWS"
 distfiles="$NONGNU_SITE/$pkgname/${pkgname}-$version.tar.gz"
-checksum=a9be7066f70a9dcf4bf0736fcf531db6a3250aed1a24cc643add27641b7110f9
+checksum=c0ef65d98d6040ca0b4f2b700d51463c2a1f94665441f39d15d97442dbb79b54
 conf_files="/etc/avrdude.conf"
-build_options="gpio spi"
-desc_option_spi="Enable LINUXSPI support"
-desc_option_gpio="Enable LINUXGPIO support"
-build_options_default="${build_options}"

From 9a03e3bd30d6a8c5ddfe709be23a129356d54ff3 Mon Sep 17 00:00:00 2001
From: Kyra Zimmer <me@nonchip.de>
Date: Thu, 12 May 2022 07:46:37 +0200
Subject: [PATCH 2260/2561] verilator: update to 4.222.

---
 srcpkgs/verilator/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/verilator/template b/srcpkgs/verilator/template
index dc61d2c8326d..3864a6ed8147 100644
--- a/srcpkgs/verilator/template
+++ b/srcpkgs/verilator/template
@@ -1,16 +1,16 @@
 # Template file for 'verilator'
 pkgname=verilator
-version=4.104
+version=4.222
 revision=1
 build_style=gnu-configure
-hostmakedepends="autoconf flex"
+hostmakedepends="autoconf flex python3"
 makedepends="libfl-devel"
 short_desc="SystemVerilog simulator and lint system"
 maintainer="Sasha Krassovsky <krassovskysasha@gmail.com>"
 license="LGPL-3.0-only"
 homepage="https://veripool.org/wiki/verilator"
 distfiles="https://github.com/verilator/verilator/archive/v${version}.tar.gz"
-checksum=6d42fa468234461e4a0c3154d5602cdded7b22d57f14be92c27a65d418a4a010
+checksum=15c60175807c0f3536c3c5b435f131c2b1e8725aefd30645efd946bf401b4c84
 
 pre_configure() {
 	autoconf

From 2ef4bb2069578204861de49e972e09118307c173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 21:45:36 -0300
Subject: [PATCH 2261/2561] manpages-pt-br: update to 4.14.0.

Also add new languages. Some of these were present already but not as
proper subpackages, instead in manpages-pt-br. This commit fixes that.
---
 srcpkgs/manpages-cs             |   1 +
 srcpkgs/manpages-da             |   1 +
 srcpkgs/manpages-el             |   1 +
 srcpkgs/manpages-es             |   1 +
 srcpkgs/manpages-fi             |   1 +
 srcpkgs/manpages-hu             |   1 +
 srcpkgs/manpages-id             |   1 +
 srcpkgs/manpages-it             |   1 +
 srcpkgs/manpages-mk             |   1 +
 srcpkgs/manpages-nb             |   1 +
 srcpkgs/manpages-pt-br/template | 107 ++++++++++++++++++++++++++++++--
 srcpkgs/manpages-sr             |   1 +
 srcpkgs/manpages-sv             |   1 +
 srcpkgs/manpages-uk             |   1 +
 srcpkgs/manpages-vi             |   1 +
 15 files changed, 117 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/manpages-cs
 create mode 120000 srcpkgs/manpages-da
 create mode 120000 srcpkgs/manpages-el
 create mode 120000 srcpkgs/manpages-es
 create mode 120000 srcpkgs/manpages-fi
 create mode 120000 srcpkgs/manpages-hu
 create mode 120000 srcpkgs/manpages-id
 create mode 120000 srcpkgs/manpages-it
 create mode 120000 srcpkgs/manpages-mk
 create mode 120000 srcpkgs/manpages-nb
 create mode 120000 srcpkgs/manpages-sr
 create mode 120000 srcpkgs/manpages-sv
 create mode 120000 srcpkgs/manpages-uk
 create mode 120000 srcpkgs/manpages-vi

diff --git a/srcpkgs/manpages-cs b/srcpkgs/manpages-cs
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-cs
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-da b/srcpkgs/manpages-da
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-da
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-el b/srcpkgs/manpages-el
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-el
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-es b/srcpkgs/manpages-es
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-es
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-fi b/srcpkgs/manpages-fi
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-fi
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-hu b/srcpkgs/manpages-hu
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-hu
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-id b/srcpkgs/manpages-id
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-id
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-it b/srcpkgs/manpages-it
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-it
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-mk b/srcpkgs/manpages-mk
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-mk
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-nb b/srcpkgs/manpages-nb
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-nb
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-pt-br/template b/srcpkgs/manpages-pt-br/template
index 8a053c3eeab2..f6e969138b25 100644
--- a/srcpkgs/manpages-pt-br/template
+++ b/srcpkgs/manpages-pt-br/template
@@ -1,9 +1,10 @@
 # Template file for 'manpages-pt-br'
 pkgname=manpages-pt-br
-version=4.11.0
+version=4.14.0
 revision=1
+_commit=2a0461feb98f408bac9454b87325aacb1dd014f2
 _prjname=manpages-l10n
-wrksrc=${_prjname}-v${version}
+wrksrc=${_prjname}-${version}-${_commit}
 build_style=gnu-configure
 make_build_args="comp_extension= compressor=cat"
 hostmakedepends="po4a"
@@ -12,8 +13,8 @@ short_desc="${_desc} - Brazilian Portuguese (Português Brasileiro)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://manpages-l10n-team.pages.debian.net/manpages-l10n/"
-distfiles="https://salsa.debian.org/manpages-l10n-team/${_prjname}/-/archive/v${version}/${_prjname}-v${version}.tar.gz"
-checksum=e40e6ece56281f9d6075daff9c56f34b1d335414d4c88c0a081c27c852371b7d
+distfiles="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/${version}/${_prjname}-v${version}.tar.gz"
+checksum=33f9f867e958faa0b3a699d503809d56aed3eadfcc349d329a79b545071c544f
 
 post_install() {
 	find $DESTDIR -name '*systemd*' -delete
@@ -53,3 +54,101 @@ manpages-ro_package() {
 		vmove usr/share/man/ro
 	}
 }
+
+manpages-vi_package() {
+	short_desc+="${_desc} - Vietnamese (Tiếng Việt)"
+	pkg_install() {
+		vmove usr/share/man/vi
+	}
+}
+
+manpages-uk_package() {
+	short_desc+="${_desc} - Ukrainian (Украї́нська Мо́ва)"
+	pkg_install() {
+		vmove usr/share/man/uk
+	}
+}
+
+manpages-sv_package() {
+	short_desc+="${_desc} - Swedish (Svenska)"
+	pkg_install() {
+		vmove usr/share/man/sv
+	}
+}
+
+manpages-sr_package() {
+	short_desc+="${_desc} - Serbian (Српски Језик)"
+	pkg_install() {
+		vmove usr/share/man/sr
+	}
+}
+
+manpages-nb_package() {
+	short_desc+="${_desc} - Norwegian Bokmål (Bokmål)"
+	pkg_install() {
+		vmove usr/share/man/nb
+	}
+}
+
+manpages-mk_package() {
+	short_desc+="${_desc} - Macedonian (Македонски)"
+	pkg_install() {
+		vmove usr/share/man/mk
+	}
+}
+
+manpages-it_package() {
+	short_desc+="${_desc} - Italian (Italiano)"
+	pkg_install() {
+		vmove usr/share/man/it
+	}
+}
+
+manpages-id_package() {
+	short_desc+="${_desc} - Indonesian (Bahasa Indonesia)"
+	pkg_install() {
+		vmove usr/share/man/id
+	}
+}
+
+manpages-hu_package() {
+	short_desc+="${_desc} - Hungarian (Magyar Nyelv)"
+	pkg_install() {
+		vmove usr/share/man/hu
+	}
+}
+
+manpages-fi_package() {
+	short_desc+="${_desc} - Finnish (Suomi)"
+	pkg_install() {
+		vmove usr/share/man/fi
+	}
+}
+
+manpages-es_package() {
+	short_desc+="${_desc} - Spanish (Español)"
+	pkg_install() {
+		vmove usr/share/man/es
+	}
+}
+
+manpages-el_package() {
+	short_desc+="${_desc} - Greek (Ελληνικά)"
+	pkg_install() {
+		vmove usr/share/man/el
+	}
+}
+
+manpages-da_package() {
+	short_desc+="${_desc} - Danish (Dansk)"
+	pkg_install() {
+		vmove usr/share/man/da
+	}
+}
+
+manpages-cs_package() {
+	short_desc+="${_desc} - Czech (Čeština)"
+	pkg_install() {
+		vmove usr/share/man/cs
+	}
+}
diff --git a/srcpkgs/manpages-sr b/srcpkgs/manpages-sr
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-sr
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-sv b/srcpkgs/manpages-sv
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-sv
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-uk b/srcpkgs/manpages-uk
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-uk
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-vi b/srcpkgs/manpages-vi
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-vi
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file

From 992af9e7daaf7d3bde305cb8497ccf3fc0abd92a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 21:47:32 -0300
Subject: [PATCH 2262/2561] sdcc: update to 4.2.0.

---
 srcpkgs/sdcc/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sdcc/template b/srcpkgs/sdcc/template
index c1c1c055eaa4..85a0a7131c3e 100644
--- a/srcpkgs/sdcc/template
+++ b/srcpkgs/sdcc/template
@@ -1,8 +1,7 @@
 # Template file for 'sdcc'
 pkgname=sdcc
-version=4.1.0
+version=4.2.0
 revision=1
-wrksrc=sdcc
 build_style=gnu-configure
 configure_args="--enable-libgc $(vopt_enable nonfree non-free)"
 hostmakedepends="automake flex bison gputils texinfo"
@@ -12,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="http://sdcc.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/sdcc/${pkgname}-src-${version}.tar.bz2"
-checksum=81edf776d5a2dc61a4b5c3408929db7b25874d69c46e4a71b116be1322fd533f
+checksum=b49bae1d23bcd6057a82c4ffe5613f9cd0cbcfd1e940e9d84c4bfe9df0a8c053
 python_version=3
 nostrip=yes
 

From 0de7ccb5e6c3ae19630dd895d4f1b33931328624 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Sun, 8 May 2022 19:40:55 +0200
Subject: [PATCH 2263/2561] aerc: update to 0.10.0

---
 srcpkgs/aerc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 30a431484026..9741c99ba38a 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,6 +1,6 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
@@ -13,7 +13,7 @@ maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=b5901feb37a55edd1f713e76c1012ac3fc0757202ddacd7d388cc7ce60638023
+checksum=14d6c622a012069deb1a31b51ecdd187fd11041c8e46f396ac22830b00e4c114
 
 post_install() {
  	make PREFIX=/usr DESTDIR=${DESTDIR} install

From c1a741ebd5258637b4a9d52f78a69359eebc950a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 May 2022 09:10:57 +0300
Subject: [PATCH 2264/2561] bftpd: update to 6.1.

---
 srcpkgs/bftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bftpd/template b/srcpkgs/bftpd/template
index e153a1dac490..7c456ad4fc60 100644
--- a/srcpkgs/bftpd/template
+++ b/srcpkgs/bftpd/template
@@ -1,6 +1,6 @@
 # Template file for 'bftpd'
 pkgname=bftpd
-version=6.0
+version=6.1
 revision=1
 wrksrc="$pkgname"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Norbert Vegh <vegh@norvegh.com>"
 license="GPL-2.0-only"
 homepage="http://bftpd.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/bftpd/bftpd-${version}.tar.gz"
-checksum=b7e602cacebb76b60a703dc65f1495cd9a381d345902b22903a1287dec8f025c
+checksum=9721d0614e1a5d0fe6b80c9a8a04ada8efd42cbdfddd239e95a8059ae283aa6f
 
 CFLAGS="-fcommon"
 

From 06b3aa46adc3055e36356b6021d122a2dfd0d983 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 7 May 2022 17:17:34 -0300
Subject: [PATCH 2265/2561] oil: update to 0.10.0

---
 srcpkgs/oil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 7def1be36587..8866e01d7f94 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.9.9
+version=0.10.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=6f6b4c4b9cf8a1e8e1dc2ff7bf39c85a11b871ddda9e9e51b9f7e1a0e46b2824
+checksum=cf7da9494ba9f0f101d27f0d0b5e248f8a54721ddeec13dd54652c9528580296
 register_shell="/usr/bin/osh"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From 44201b390354be0add38d69da07feaec7b6e2245 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 6 May 2022 20:39:07 +0300
Subject: [PATCH 2266/2561] krita: update to 5.0.6.

---
 srcpkgs/krita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 68e67ccb8157..c388e3b0505b 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=5.0.5
+version=5.0.6
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -22,7 +22,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=162fff4596484e688655d4636373b1a77bcea39824c655b477afc1463aaf2dae
+checksum=edd76d1b3e5fd00cffb90c4fdaa4dafecc8bf3638d1f7bccf463ec11ea3e0e62
 python_version=3
 replaces="calligra-krita>=0"
 make_check=no

From ce78f6f3a4308c2f258b12eab304f1237dfdfb9e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 5 May 2022 23:52:07 +0300
Subject: [PATCH 2267/2561] fribidi: update to 1.0.12.

---
 srcpkgs/fribidi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template
index 50f61f6e98c4..39f2fbc41ca9 100644
--- a/srcpkgs/fribidi/template
+++ b/srcpkgs/fribidi/template
@@ -1,6 +1,6 @@
 # Template file for 'fribidi'
 pkgname=fribidi
-version=1.0.11
+version=1.0.12
 revision=1
 build_style=gnu-configure
 configure_args="--disable-docs"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/fribidi/fribidi/"
 changelog="https://raw.githubusercontent.com/fribidi/fribidi/master/NEWS"
 distfiles="https://github.com/fribidi/fribidi/archive/v${version}.tar.gz"
-checksum=0e6d631c184e1012fb3ae86e80adabf26e46b4ffee2332e679eb308edd337398
+checksum=2e9e859876571f03567ac91e5ed3b5308791f31cda083408c2b60fa1fe00a39d
 disable_parallel_build=yes
 
 pre_configure() {

From 3b4e88c39b2e3d797a71832f715855f1e36a9bcb Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sun, 8 May 2022 16:09:45 +0200
Subject: [PATCH 2268/2561] yad: update to 12.0

---
 srcpkgs/yad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index a9d75e6930e3..a16f62311a4b 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,6 +1,6 @@
 # Template file for 'yad'
 pkgname=yad
-version=11.1
+version=12.0
 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=ca61d422d6d464d7f473d1e5bd14d3ca05d311ef203f1c67bbea7c23bf0eae2f
+checksum=65dbfa72a229f6cbd131470caf4f70fec98fe935a1436acb58c841fa2a8bddde
 
 pre_configure() {
 	autoreconf -ivf

From 3b2642884e4736210351cef1de4bdea490703101 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sun, 8 May 2022 15:34:13 +0200
Subject: [PATCH 2269/2561] gitea: update to 1.16.7

---
 srcpkgs/gitea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index c8b9b361ce2d..b24b3171b49a 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.16.5
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -32,7 +32,7 @@ license="MIT"
 homepage="https://gitea.io"
 changelog="https://raw.githubusercontent.com/go-gitea/gitea/main/CHANGELOG.md"
 distfiles="https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"
-checksum=d9aab2e8357ca1a22eaffb328356e4e355a8f851a4de6fb4e7eb54ca80f0187b
+checksum=51599b16d1c2e16dd617e0e9b5d1cc314a1ef141394d582833d411b9ccd2ac48
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From ae4aae274d0d2d12927e295fab8cdd6a53e06606 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 13 May 2022 22:46:21 -0400
Subject: [PATCH 2270/2561] dua-cli: update to 2.17.5

---
 srcpkgs/dua-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template
index ea5c1c27dad2..31df51fc5c59 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'dua-cli'
 pkgname=dua-cli
-version=2.17.1
+version=2.17.5
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/Byron/dua-cli"
 changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=d9af81b30f83d080472e91da3e07b42294904827ad5274d9aaf51d346072d2f1
+checksum=805a911300bbb5234c25f607b25444988a97c260c03c02932844aeee0ba108e1
 
 post_install() {
 	vlicense LICENSE

From 3d97169b7b5217b4403069c293e37c8a02558702 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 13 May 2022 22:19:47 -0400
Subject: [PATCH 2271/2561] procs: update to 0.12.2

---
 srcpkgs/procs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index 84e47b23614b..350cb3742e03 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,6 +1,6 @@
 # Template file for 'procs'
 pkgname=procs
-version=0.12.1
+version=0.12.2
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/dalance/procs"
 changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md"
 distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz"
-checksum=ce84e98dd85cb8d5afda871ad2ddceb4faec077d9e019469aa668a75821e4fc2
+checksum=14be8440fe85dc46e544a3f7e89b887db455a61db981d5f75b91fd89b366d84f
 
 post_build() {
 	PROCS="target/${RUST_TARGET}/release/procs"

From 9a032054f01fe28992ef004211b074b9df0d192b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 13 May 2022 21:53:57 -0400
Subject: [PATCH 2272/2561] fnott: update to 1.2.1

---
 srcpkgs/fnott/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fnott/template b/srcpkgs/fnott/template
index 713071aa9f0a..cb7c4c766ad8 100644
--- a/srcpkgs/fnott/template
+++ b/srcpkgs/fnott/template
@@ -1,6 +1,6 @@
 # Template file for 'fnott'
 pkgname=fnott
-version=1.2.0
+version=1.2.1
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fnott/"
 distfiles="https://codeberg.org/dnkl/fnott/archive/${version}.tar.gz"
-checksum=d6cfb7efcfad5e0aa95c5fd9632c638a53a0debfc17128e70922a1ba9f841470
+checksum=a4e72845cde23aff0653f9b218a32cb40ae628b3f690dc02333ea95469faf216
 
 post_install() {
 	vlicense LICENSE

From 71f96876ceec2a44402b01dc82331bf3e1c650a8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 13 May 2022 20:14:55 +0200
Subject: [PATCH 2273/2561] php: update to 7.4.29.

---
 srcpkgs/php/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 700226b020b4..c6a628cf6864 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,6 +1,6 @@
 # Template file for 'php'
 pkgname=php
-version=7.4.27
+version=7.4.29
 revision=1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -13,7 +13,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="PHP-3.01"
 homepage="https://www.php.net"
 distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=3f8b937310f155822752229c2c2feb8cc2621e25a728e7b94d0d74c128c43d0c
+checksum=7d0f07869f33311ff3fe1138dc0d6c0d673c37fcb737eaed2c6c10a949f1aed6
 
 conf_files="/etc/php/php.ini"
 

From 280332e23bb9edcf314d3b1128c969d473619367 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 13 May 2022 20:14:57 +0200
Subject: [PATCH 2274/2561] php8.0: update to 8.0.19.

---
 srcpkgs/php8.0/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 2ddb350061f3..c4a6df3a389e 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,10 +1,10 @@
 # Template file for 'php8.0'
 pkgname=php8.0
-version=8.0.18
+version=8.0.19
 revision=1
 _php_version=8.0
 wrksrc="php-${version}"
-hostmakedepends="bison pkg-config apache-devel curl"
+hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
@@ -15,9 +15,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://www.php.net"
 distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=cd980f5a2f422362f8c52d314ed25140c6f472877c5442c4f3304205f54e192a
-
-fetch_cmd="curl -O"
+checksum=48e57634d350bcab4745d25d9d94ffa474649bf4f7e879fad163226c0d107bb5
 
 conf_files="/etc/php${_php_version}/php.ini"
 

From d5e60355f73c6b6ddbac5ccec106e44ca9b46683 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 13 May 2022 20:14:58 +0200
Subject: [PATCH 2275/2561] php8.1: update to 8.1.6.

---
 srcpkgs/php8.1/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 16da7be3f32c..9852f076d51b 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,10 +1,10 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.5
+version=8.1.6
 revision=1
 _php_version=8.1
 wrksrc="php-${version}"
-hostmakedepends="bison pkg-config apache-devel curl"
+hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
@@ -15,9 +15,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://www.php.net"
 distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=44d637627746082395d5d3d3d6ae7d71e780b82a8d55a0228887158c4316bf11
-
-fetch_cmd="curl -O"
+checksum=e847745fd66fc8c57fac993a609fefcded93fddccd225f0620a26bb5ae5753c3
 
 conf_files="/etc/php${_php_version}/php.ini"
 

From b7ea21e9d4f3923bfa8e948a4353600daed7a825 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 15 Mar 2021 19:12:50 +0100
Subject: [PATCH 2276/2561] xbps-src/shutils/update_check.sh: change gitlab
 check to handle subgroups

The `/-/` sequence is always between e.g. archive and the repo path,
so this should work reliably for distfiles.
If gitlab is used only as a homepage, this still wroks if homepage
points to the base repo (which it usually does)
---
 common/xbps-src/shutils/update_check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 0a624274f500..1f0ed7b1fe4d 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -123,7 +123,7 @@ update_check() {
                 url="https://github.com/$pkgurlname/tags"
                 rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';;
             *//gitlab.*)
-                pkgurlname="$(printf %s "$url" | cut -d/ -f1-5)"
+                pkgurlname="$(printf %s "$url" | sed 's%/-/*%%g')"
                 url="$pkgurlname/tags"
                 rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';;
             *bitbucket.org*)

From 1ae84af6e10ac401906836d088d4464999fcb4f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 May 2022 15:36:27 +0200
Subject: [PATCH 2277/2561] xbps-src/shutils/update_check.sh: change gitlab
 check to handle old urls

---
 common/xbps-src/shutils/update_check.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 1f0ed7b1fe4d..7348260f54af 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -123,7 +123,10 @@ update_check() {
                 url="https://github.com/$pkgurlname/tags"
                 rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';;
             *//gitlab.*)
-                pkgurlname="$(printf %s "$url" | sed 's%/-/*%%g')"
+                case "$url" in
+                    */-/*) pkgurlname="$(printf %s "$url" | sed -e 's%/-/.*%%g; s%/$%%')";;
+                    *) pkgurlname="$(printf %s "$url" | cut -d / -f 1-5)";;
+                esac
                 url="$pkgurlname/tags"
                 rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';;
             *bitbucket.org*)

From d9ff24ce9f305a37b78220d7a37d2cd2e0300ab7 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Fri, 22 Apr 2022 06:33:47 +0700
Subject: [PATCH 2278/2561] kamoso: update to 21.04.1, orphan package

---
 srcpkgs/kamoso/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5b065d6f5788..dd41855bf15d 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -15,9 +15,9 @@ depends="
  gst-plugins-bad1 phonon-qt5 qt5-graphicaleffects qt5-quickcontrols kirigami2
  purpose"
 short_desc="Simple and friendly program to use your webcam recorder"
-maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kamoso"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2bde8e8e6de25673a412ba6a966e898959ee5625dcadadc1bc295c12ad7128e1
+checksum=5b8c58640624701b05cb8534c14b26fdccb43828c50eb347e114da9fb32d3d0d

From ea35a61b957c3568b6166bae44286ae7ab5315c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 14 May 2022 16:31:35 +0200
Subject: [PATCH 2279/2561] tcsh: update to 6.24.01.

---
 srcpkgs/tcsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index d9c9d0d7c8af..d18e79e784d2 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,6 +1,6 @@
 # Template file for 'tcsh'
 pkgname=tcsh
-version=6.24.00
+version=6.24.01
 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="https://www.tcsh.org/"
 distfiles="https://astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=60be2c504bd8f1fa6e424b1956495d7e7ced52a2ac94db5fd27f4b6bfc8f74f0
+checksum=5659a1b973b1f947e36238cb17a00210ac4cff3b496f8f851acd77172ab91d7e
 register_shell="/bin/tcsh /bin/csh"
 
 post_extract() {

From 10f2c474169818b34ce2667e34b13390266cc3b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 14 May 2022 16:32:41 +0200
Subject: [PATCH 2280/2561] spigot: update to 20220509.4b9cde0.

---
 srcpkgs/spigot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spigot/template b/srcpkgs/spigot/template
index 6f9899faa780..d4c744b18bd3 100644
--- a/srcpkgs/spigot/template
+++ b/srcpkgs/spigot/template
@@ -1,6 +1,6 @@
 # Template file for 'spigot'
 pkgname=spigot
-version=20210527.7dd3cfd
+version=20220509.4b9cde0
 revision=1
 build_style=cmake
 makedepends="gmp-devel ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.chiark.greenend.org.uk/~sgtatham/spigot/"
 distfiles="https://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1014b79607cbb6cc8143c9b3a093f266144124d9a4552785e5779c1a072faadc
+checksum=d32514c9e3a16c5a58bfbc8cfbad076fa50c7744273237e0bba3d15dc6e2102d
 
 post_install() {
 	vlicense LICENCE

From db334c2993d57659ab686089c2285d8ff33e8546 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 14 May 2022 16:33:24 +0200
Subject: [PATCH 2281/2561] nsd: update to 4.5.0.

---
 srcpkgs/nsd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 74062c7a360a..2e42a1014fb0 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
 # Template file for 'nsd'
 pkgname=nsd
-version=4.4.0
+version=4.5.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -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=cfcd6fdd99344ca5a7ef7c2940c241bcef471fc3252ba3dcbd4c57e0638e8836
+checksum=5ae7a704ab92c8a49f3c8f3a29565ce194c51a721c29c75ea7d43c13372d79c5
 system_accounts="nsd"
 nsd_homedir=/var/db/nsd
 make_dirs="/var/db/nsd 0755 nsd nsd"

From 1de4c9a70d6b8dbeef43b56af8b5a313bbd4d26c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 14 May 2022 11:00:55 -0500
Subject: [PATCH 2282/2561] nomad: update to 1.3.0.

---
 srcpkgs/nomad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 7b53596b1aed..6618e86058dd 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,18 +1,18 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.2.6
+version=1.3.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=95514d569610f15ce49b4a7a1a6bfd3e7b3e7b4f
+_git_commit=52e95d64113e01be05d585d8b4c07f6f19efebbc
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=c69ec89ae5f76704d4b3ecb842b130f3d90e579bfd31191721b5f2da99f95a93
+checksum=ce00994e1dbd89d0685237b6815322780e09c414fcc80b019e0d163ea1cb7ac0
 
 post_install() {
 	vlicense LICENSE

From 17113e071009e5a65c8fbbcd49ca5f93592e9b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 21:35:45 +0200
Subject: [PATCH 2283/2561] perl-Stow: replace with stow

---
 srcpkgs/perl-Stow          |  1 +
 srcpkgs/perl-Stow/template | 15 ---------------
 srcpkgs/stow/template      |  8 +++++++-
 3 files changed, 8 insertions(+), 16 deletions(-)
 create mode 120000 srcpkgs/perl-Stow
 delete mode 100644 srcpkgs/perl-Stow/template

diff --git a/srcpkgs/perl-Stow b/srcpkgs/perl-Stow
new file mode 120000
index 000000000000..1466463c80cd
--- /dev/null
+++ b/srcpkgs/perl-Stow
@@ -0,0 +1 @@
+stow
\ No newline at end of file
diff --git a/srcpkgs/perl-Stow/template b/srcpkgs/perl-Stow/template
deleted file mode 100644
index 33dfbcc7cf05..000000000000
--- a/srcpkgs/perl-Stow/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'perl-Stow'
-pkgname=perl-Stow
-version=2.3.1
-revision=2
-wrksrc="Stow-v${version}"
-build_style=perl-ModuleBuild
-hostmakedepends="perl perl-Module-Build perl-Test-Output perl-IO-stringy"
-makedepends="${hostmakedepends}"
-depends="${makedepends}"
-short_desc="Perl module for managing symlinks"
-maintainer="Martin Harrigan <martinharrigan@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://metacpan.org/release/Stow"
-distfiles="${CPAN_SITE}/Finance/ASPIERS/Stow-v${version}.tar.gz"
-checksum=5062a1f8d0c03e38aca5cf46b72de0cba03f901279729338b7b2f93e518182d8
diff --git a/srcpkgs/stow/template b/srcpkgs/stow/template
index cb6eb1aa1199..f20c72acbc16 100644
--- a/srcpkgs/stow/template
+++ b/srcpkgs/stow/template
@@ -1,7 +1,7 @@
 # Template file for 'stow'
 pkgname=stow
 version=2.3.1
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target="test"
 hostmakedepends="perl"
@@ -14,3 +14,9 @@ license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/stow/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=09d5d99671b78537fd9b2c0b39a5e9761a7a0e979f6fdb7eabfa58ee45f03d4b
+
+perl-Stow_package() {
+	build_style=meta
+	depends="stow>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}

From f74b843c0251d21c2e57025f52e98580c4e3ff70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 23:49:38 +0200
Subject: [PATCH 2284/2561] bash-completion: resolve conflict with pacman

---
 srcpkgs/bash-completion/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template
index 8908de525e82..74d80d5f5dde 100644
--- a/srcpkgs/bash-completion/template
+++ b/srcpkgs/bash-completion/template
@@ -1,7 +1,7 @@
 # Template file for 'bash-completion'
 pkgname=bash-completion
 version=2.11
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="profiledir=/etc/bash/bashrc.d"
 depends="bash"
@@ -60,3 +60,8 @@ pre_check() {
 	done
 	export PYTEST_ADDOPTS
 }
+
+post_install() {
+	# for slackware's that we don't have, conflicts with pacman's
+	rm ${DESTDIR}/usr/share/bash-completion/completions/makepkg
+}

From 4d612ba5f75f630fd0bb9efc5d45c8ffc5d395df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 23:50:21 +0200
Subject: [PATCH 2285/2561] bff-apankrat: resolve conflict with bff

---
 srcpkgs/bff-apankrat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bff-apankrat/template b/srcpkgs/bff-apankrat/template
index 452aa4c3f0b7..9355d1ef7e38 100644
--- a/srcpkgs/bff-apankrat/template
+++ b/srcpkgs/bff-apankrat/template
@@ -1,7 +1,7 @@
 # Template file for 'bff-apankrat'
 pkgname=bff-apankrat
 version=1.0.7
-revision=1
+revision=2
 wrksrc="bff-${version}"
 build_style=gnu-makefile
 short_desc="Moderately-optimizing brainfuck interpreter"
@@ -12,7 +12,7 @@ distfiles="https://github.com/apankrat/bff/archive/v${version}.tar.gz"
 checksum=1f8787f8bc12ae4282112dabc5b85f03002269dce57023ee0443250d5a68702f
 
 do_install() {
-	vbin bff
+	vbin bff bff-apankrat
 	head -n 13 bff.c > LICENSE
 	vlicense LICENSE
 }

From 2c137f0323000e2b4d6fd9258ecab23b0891f8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 23:54:43 +0200
Subject: [PATCH 2286/2561] nullmailer: provide smtp-server

- resolve conflict with other `smtp-server`s
- fix tests
---
 srcpkgs/nullmailer/template | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/nullmailer/template b/srcpkgs/nullmailer/template
index 16a0bc618ef8..0812b846f8ec 100644
--- a/srcpkgs/nullmailer/template
+++ b/srcpkgs/nullmailer/template
@@ -1,7 +1,7 @@
 # Template file for 'nullmailer'
 pkgname=nullmailer
 version=2.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-tls"
 conf_files="/etc/nullmailer/*"
@@ -10,6 +10,7 @@ make_dirs="
 	/var/spool/nullmailer/queue	0700	_nullmail	root
 	/var/spool/nullmailer/tmp	0700	_nullmail	root"
 makedepends="gnutls-devel"
+checkdepends="daemontools ucspi-tcp"
 short_desc="Simple relay-only mail transport agent"
 maintainer="Deneys S. Maartens <deneys.maartens@gmail.com>"
 license="GPL-2.0-or-later"
@@ -17,6 +18,13 @@ homepage="https://untroubled.org/nullmailer/"
 distfiles="https://untroubled.org/nullmailer/archive/nullmailer-${version}.tar.gz"
 checksum=9886fa627b7e7e775e2f09fbe789247b1ca304f152da04ff705e50079263a855
 system_accounts="_nullmail"
+provides="smtp-server-0_1"
+replaces="smtp-server>=0"
+
+pre_check() {
+	# Hangs, possibly missing test data
+	vsed  -i test/tests/smtp-auth -e '/Testing auth permanent failure with smtp/,/error/d'
+}
 
 post_install() {
 	for f in mailq sendmail; do

From 195a4bdbb1aad2f739e7e6419396b778f7f49084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 23:55:13 +0200
Subject: [PATCH 2287/2561] qdirstat-cache-writer: resolve conflict with
 qdirstat

---
 srcpkgs/qdirstat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template
index 5016c664a012..d297cd50e41a 100644
--- a/srcpkgs/qdirstat/template
+++ b/srcpkgs/qdirstat/template
@@ -1,7 +1,7 @@
 # Template file for 'qdirstat'
 pkgname=qdirstat
 version=1.8
-revision=3
+revision=4
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="zlib-devel qt5-devel"
@@ -21,6 +21,6 @@ qdirstat-cache-writer_package() {
 	depends="perl"
 	pkg_install() {
 		vmove usr/bin/qdirstat-cache-writer
-		vman man/qdirstat-cache-writer.1
+		vmove usr/share/man/man1/qdirstat-cache-writer.1.gz
 	}
 }

From 5851be76d35a234815dceff10d705d5edb4c5410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 23:55:29 +0200
Subject: [PATCH 2288/2561] zsh-completions: resolve conflict with cheat

---
 srcpkgs/zsh-completions/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/zsh-completions/template b/srcpkgs/zsh-completions/template
index db1fa7a5f517..dfbb5cde85b8 100644
--- a/srcpkgs/zsh-completions/template
+++ b/srcpkgs/zsh-completions/template
@@ -1,7 +1,7 @@
 # Template file for 'zsh-completions'
 pkgname=zsh-completions
 version=0.33.0
-revision=1
+revision=2
 depends="zsh"
 short_desc="Additional completions for Zsh"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
@@ -16,6 +16,7 @@ post_patch() {
 
 do_install() {
 	vmkdir usr/share/zsh/site-functions/
+	rm src/_cheat # cheat package includes better one
 	vcopy src/_* usr/share/zsh/site-functions/
 	vlicense LICENSE
 }

From 32c23abb8115de90c015ef6d7ec8ec62a306fe0f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 14 May 2022 18:28:39 +0300
Subject: [PATCH 2289/2561] toybox: update to 0.8.7.

---
 srcpkgs/toybox/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template
index 74b0a779e296..722e17bc2307 100644
--- a/srcpkgs/toybox/template
+++ b/srcpkgs/toybox/template
@@ -1,6 +1,6 @@
 # Template file for 'toybox'
 pkgname=toybox
-version=0.8.5
+version=0.8.7
 revision=1
 create_wrksrc=yes
 short_desc="BSD-licensed alternative to busybox"
@@ -8,7 +8,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="0BSD"
 homepage="http://www.landley.net/toybox"
 distfiles="http://www.landley.net/toybox/downloads/toybox-${version}.tar.gz"
-checksum=bfd230c187726347f7e31a1fc5841705871dfe4f3cbc6628f512b54e57360949
+checksum=b508bf336f82cb0739b77111f945931d1a143b5a53905cb753cd2607cfdd1494
 
 post_extract() {
 	mv toybox-${version} toybox
@@ -40,6 +40,7 @@ _rm_failing_tests() {
 	rm tests/hostname.test
 	rm tests/losetup.test
 	rm tests/rmdir.test
+	rm tests/rm.test
 }
 
 do_check() {

From 68db6145e6b8f48e573aa9350e0d41c91be40e93 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 14 May 2022 18:23:39 +0300
Subject: [PATCH 2290/2561] pidgin: update to 2.14.9.

---
 srcpkgs/pidgin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index 7b38bc319060..d9010fb67b46 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.8
-revision=2
+version=2.14.9
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=3f8085c0211c4ca1ba9f8a03889b3d60738432c1673b57b0086070ef6e094cca
+checksum=1872d1629a26e9b775d9ec0bdd3d3fd348f721376f320b29bcd5ff3f0443222b
 python_version=2
 lib32disabled=yes
 

From a6124cb5fb82484b6f3bfefa74191bb13c15c1d1 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 3 May 2022 19:49:15 +0700
Subject: [PATCH 2291/2561] kdenlive: update to 22.04.1

- add opencv (for motion tracking)
- remove vlc (only as optional media player)
---
 srcpkgs/kdenlive/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index a4871c0af642..1cc4793c923f 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -10,14 +10,14 @@ makedepends="
  kdeclarative-devel kfilemetadata5-devel knewstuff-devel knotifyconfig-devel
  kplotting-devel mlt7-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel
  v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel qt5-networkauth-devel"
-depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
+depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit opencv qt5-quickcontrols"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7aa3fee6f2938664f2e35dae97a67ebfdedb6aec2bf4bbabfca5e7b1456c55c1
+checksum=ae879041f18ee89b3fef2dc85cbb6899bf184c433b234d0c2145085767952a4e
 # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails
 make_check=extended
 

From ac0c0787408502ed366ba201ef2b620438ffb4b7 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 14 May 2022 21:12:51 -0500
Subject: [PATCH 2292/2561] consul: update to 1.12.0.

---
 srcpkgs/consul/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index d31feecc270f..9f3f4d50721c 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.11.4
+version=1.12.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=944e8ce64201ab2bbe923b207883d08a4dcff73a
+_git_commit=09a8cdb4a5c0c53201d7888d9fb618dde007cdd8
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -14,7 +14,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=253200fbf79aefee632c5cde9f90e6df6eddcb2766f2909b0d347c4438065126
+checksum=87b3fe01d0a772dc1cbab31cf38ab05d651d93cd1632aa289faf06988a65d617
 
 post_install() {
 	vlicense LICENSE

From 6e55bdde6c50c56449f9afd4f12d01c590630f34 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 14 May 2022 21:21:12 -0500
Subject: [PATCH 2293/2561] vault: update to 1.10.3.

---
 srcpkgs/vault/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 111feb18627e..c9243585313c 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.10.0
+version=1.10.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=fcbe948b2542a13ee8036ad07dd8ebf8554f56cb
+_git_commit=af866591ee60485f05d6e32dd63dde93df686dfb
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 depends="libcap-progs"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=4b3303af72b9383369d6219dc88beaef3b343b262625e5d7c6a309ae9286d8c2
+checksum=5f7d3d2fcd856b5595182e02c40c976b520658be3cca8638edac5a20869c8373
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0750 root _vault"

From aa969727d17040405afb5457185c65a3461d51a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 15 May 2022 00:29:14 -0300
Subject: [PATCH 2294/2561] linux5.4: update i686 config.

---
 srcpkgs/linux5.4/files/i386-dotconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.4/files/i386-dotconfig b/srcpkgs/linux5.4/files/i386-dotconfig
index e27c6fe9edfc..fa6a30fd7091 100644
--- a/srcpkgs/linux5.4/files/i386-dotconfig
+++ b/srcpkgs/linux5.4/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.4.180 Kernel Configuration
+# Linux/i386 5.4.193 Kernel Configuration
 #
 
 #
@@ -2143,6 +2143,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3449,8 +3450,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support

From da01ef525063b30cad311d4171d8df4e1c177d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 15 May 2022 00:29:40 -0300
Subject: [PATCH 2295/2561] horizon: update to 2.3.0.

---
 srcpkgs/horizon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 8615a24596f8..1165f67ab713 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,6 +1,6 @@
 # Template file for 'horizon'
 pkgname=horizon
-version=2.1.0
+version=2.3.0
 revision=1
 build_style=gnu-makefile
 make_build_args="GOLD="
@@ -9,14 +9,14 @@ make_use_env=yes
 hostmakedepends="pkg-config glib-devel"
 makedepends="cairomm-devel librsvg-devel yaml-cpp-devel sqlite-devel boost-devel
  glm libgit2-devel libcurl-devel occt-devel cppzmq libpodofo-devel libzip-devel
- gtkmm-devel libepoxy-devel libsodium-devel"
+ gtkmm-devel libepoxy-devel libsodium-devel libarchive-devel libspnav-devel"
 short_desc="Free EDA package"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://horizon-eda.org/"
 changelog="https://raw.githubusercontent.com/horizon-eda/horizon/master/CHANGELOG.md"
 distfiles="https://github.com/horizon-eda/horizon/archive/v${version}.tar.gz"
-checksum=2ba7a64ef0d8f22ad12e6a5a9c108f865eeb468f954f51ee5fbc03e6a847549a
+checksum=32045e46ad54469cce926508c09d0d1701dc49fb6ab613be2bc99b0e0a0662b3
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade"

From 07e870d551d8378278213c78386e1c652af7de97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:02 +0200
Subject: [PATCH 2296/2561] libtpms: update to 0.9.4.

---
 srcpkgs/libtpms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index 9d8d52f00aa7..ad897ea2a623 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,6 +1,6 @@
 # Template file for 'libtpms'
 pkgname=libtpms
-version=0.9.1
+version=0.9.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="libtool automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause, custom:IBM"
 homepage="https://github.com/stefanberger/libtpms"
 distfiles="https://github.com/stefanberger/libtpms/archive/refs/tags/v${version}.tar.gz"
-checksum=9a4d1ed07b78142c394faad1a1481771d470048f5859e80593fe42c82e5635a5
+checksum=61d6f947a60686ec98e7cc5861f0999bd6cdaa1fc2b8901b8dc68d1a715b35cf
 
 pre_configure() {
 	autoreconf -f -i

From 13a11066449e3cf8a6be59ccf31c66817a4cb612 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:04 +0200
Subject: [PATCH 2297/2561] swtpm: update to 0.7.3.

---
 srcpkgs/swtpm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index dd12bc9e41fd..d1eeb0a56a5f 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,6 +1,6 @@
 # Template file for 'swtpm'
 pkgname=swtpm
-version=0.7.0
+version=0.7.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-gnutls ac_cv_path_TCSD="
@@ -14,11 +14,11 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://github.com/stefanberger/swtpm"
 distfiles="https://github.com/stefanberger/swtpm/archive/refs/tags/v${version}.tar.gz"
-checksum=bed41871ad42ec852c450f5764be36b6c16456b943b912351eca9c29ce382976
+checksum=e856d1f5842fb3335164f02f2c545dd329efbc3416db20b7a327e991a4cd49c8
 # check expects that root directory is setup fully for swtpm with e.g. tss user created
 make_check=no
 ignore_elf_files="/usr/share/swtpm/swtpm-localca"
-make_dirs="/usr/lib/swtpm-localca 0750 tss root"
+make_dirs="/var/lib/swtpm-localca 0750 tss root"
 
 conf_files="/etc/swtpm-localca.conf
  /etc/swtpm-localca.options

From 8a711eb53b53140842f12dc1d9be8891361de08d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:13 +0200
Subject: [PATCH 2298/2561] bluedevil: update to 5.24.5.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index b76585975dd1..7c47f2823beb 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.24.4
+version=5.24.5
 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=83778e9cd952c6efeb786395d3fb9f5d4e6aa65d2ef2bc02ad7d256a3201f0d6
+checksum=c96999c1400804e8bddc8b9801c4951f82daca83110e036bdc9c89faaeb31efa
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 2b8cf72435bc80fca23a4d4579e545e12f69f5a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:14 +0200
Subject: [PATCH 2299/2561] breeze-gtk: update to 5.24.5.

---
 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 20473061da4b..403f6fb2677b 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.24.4
+version=5.24.5
 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=b2fe8150a8576fb39d26b809e6b9cb06e2c2d2b039558ad75307d62ed857a168
+checksum=23716cc08d570ddcf0e739fef2f585f3469d801313ab2c0ba89f494f93f94530
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 454894c08bbc6d376199241eb456404de032d5c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:54 +0200
Subject: [PATCH 2300/2561] breeze: update to 5.24.5.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 64bc70e3be00..3b55c9d71a52 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.24.4
+version=5.24.5
 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=e369ee21e6aab1d5e3ae222ecd84bdb59f3d29ce3b61965b498bbfe84c949805
+checksum=8525a6b50da5523c3d21c1223e0f2b8ad4a2d147e48e5d128e1c6ee06baaf0a3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 5d6cb383aa9bb09f5ddb3f48280388bdf9477ac5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:56 +0200
Subject: [PATCH 2301/2561] kactivitymanagerd: update to 5.24.5.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index e8fc45c00005..d53668245c2f 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ 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=8128371fd75f7dd4ccb2203ad775e6f12db28bbb64047d0fd63eb745d8735529
+checksum=ea9276b022264b3b92a1307be83ca0030a5f12270d9ad5ff1e92f82c1928cd48

From 48cb83dd50e52ef1c97e618ac645a972ee5b602d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:59 +0200
Subject: [PATCH 2302/2561] kde-cli-tools: update to 5.24.5.

---
 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 0f61ce9efc66..d8774cbd926c 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.24.4
+version=5.24.5
 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=ffe4c8d3f4e97c57801360ba32cb70c961ad5796d56d4f0bae10ab2ec68759f0
+checksum=e7f0dd3469b7b3152e72514f1f6ce544514067011ebd0137cb0957d37ad6d329
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From d79457cd6c4ea3f75729e23fcd99c28939cf65d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:01 +0200
Subject: [PATCH 2303/2561] kde-gtk-config5: update to 5.24.5.

---
 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 ca92bc05101a..3bd609544f8e 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.24.4
+version=5.24.5
 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=b17aaad5f96890426a8864ba51f026732007e47fd42c4ce4df3e469b455f570b
+checksum=98a19c230fd4559818276c13295250bd3508e2869f979f8c8472d339299ee869
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 698800b7db545a10a758811b97b7603b377e094f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:03 +0200
Subject: [PATCH 2304/2561] kdecoration: update to 5.24.5.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 511d4d627094..cba7c08d1975 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.24.4
+version=5.24.5
 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/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2c999206c51a6a6c5ecda211773276438f0069a2e1c81d4903ae5712c6f28c15
+checksum=273087d6345fd1f7bcefa570f56123cde4355832952dba6cb228fe04a6a152c2
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From e3643f5b0ac98f7ab5a9048309e977562f3897f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:05 +0200
Subject: [PATCH 2305/2561] kdeplasma-addons5: update to 5.24.5.

---
 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 22c2981a4dd1..169fbd46faa7 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.24.4
+version=5.24.5
 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=d721d32d16f34ef1066bdf2fcb781d5bc1aca7cf5cdf3a71c6fef2dfe668680d
+checksum=3db52bc3c594d92deea3cfcb3112b4fa6ce328b7481acaa79187dab274e5e80e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f8b77a4555f0e139de8b2af2a511fd2e7bb44483 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:07 +0200
Subject: [PATCH 2306/2561] kgamma5: update to 5.24.5.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 75f1ab3613c3..dd6c2e7ad48b 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.24.4
+version=5.24.5
 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/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=73ed9897b2281a8ddd7b47f063d548fa71b683662a63b5648ba590160bcf3f7c
+checksum=8086897a9faa9b1be0222a9505b05b6d2d89f2d730f1f461da63395c581bf1c4

From 724ae045573034119f0fe8fe182c2193586531a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:10 +0200
Subject: [PATCH 2307/2561] khotkeys: update to 5.24.5.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 38c24c59dde9..8e4d7a53334b 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.24.4
+version=5.24.5
 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=5aac75b05f0b5a63ea924b02645bbfacfe18fef3d5c23182b482ebc5d17f6d0c
+checksum=7a2307b4ca1dca1b240a59ea4bbbceb48b1f6759c9ce3bb36b3cab7274f6a71a
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 76976127e5e2f6e441000a88e83d1608f37ef529 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:13 +0200
Subject: [PATCH 2308/2561] kinfocenter: update to 5.24.5.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 34fe68536c24..9c0cf6f993ff 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.24.4
+version=5.24.5
 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-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=dc5b84964de4b68e45300477039c656d622a9546340e997eb8249de6a532b838
+checksum=c1d241c05ebc578633512bf304b7e5bf461c7e63e45285913e212786eac14b30
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 988fb2dabb7cac4be99f1a7a64ac88fd95924066 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:16 +0200
Subject: [PATCH 2309/2561] kmenuedit: update to 5.24.5.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 3f4a699195b2..b1a389b142a5 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.24.4
+version=5.24.5
 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/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=147a7e9a15393375c2b22b5dfb025a87f3356cf756cf3b17615ba989bb443466
+checksum=78a776a8cd6db98334335b68011ac887f9b27bb52cb4d0b504d14aafe032340a

From a7cedf11a79b8b3df1c1787cceb64b91063af8c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:18 +0200
Subject: [PATCH 2310/2561] kscreen: update to 5.24.5.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index c7f235baf15e..12e9a3fc2317 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.24.4
+version=5.24.5
 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=3048edb7e1231b0d7a33b2e10a202e6fce34e34f47079fc87f8177d7aa871b6a
+checksum=d9c351ad25783596aae466e305ad80de48ff3094a219ec6ffe08c7870ea3b5bc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 471d703456b8e5c23e1ca9de0a12e45a6c75278a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:19 +0200
Subject: [PATCH 2311/2561] kscreenlocker: update to 5.24.5.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 4b50eb78ee55..4f2877a5ae46 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.24.4
+version=5.24.5
 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/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fb226273064422f9f73b6b091e26396349e0cfd53a88398b79fa2acd1540ecf7
+checksum=3270a1845c9fc694a50db38de4c27586d2f488152e1bcf88be0088d6799bf98e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 870189acc0758c6159427769683ac48e50159502 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:21 +0200
Subject: [PATCH 2312/2561] ksshaskpass: update to 5.24.5.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 4deaf3217e6c..15e89443b35e 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.24.4
+version=5.24.5
 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=34c5d4f196d09c4ebe8990d3761bc70059436e272ad46a761e71b5910e0f44dd
+checksum=3fe20b23ae5f777d7dd15069212c15826121ce70e5260283d61ad34bad8383cb
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From d540b1478f1a778d39d9a1c4dde48c54ffc48cdb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:23 +0200
Subject: [PATCH 2313/2561] ksystemstats: update to 5.24.5.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index f912db7fea5e..e4d9ab1e6343 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -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-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8dc735e9133ab01e537d71121b0e76e078f4fffce2d86b4c5d62c85878ee47dd
+checksum=0bacd8f8a494addb4afa37d59236429f8898ab5b80882abde44f41182aa759f7

From ed5411842fac3e12e7595fe8885147d7b33cb957 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:25 +0200
Subject: [PATCH 2314/2561] kwallet-pam: update to 5.24.5.

---
 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 9e206f9e5cc6..54376f6b8565 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.24.4
+version=5.24.5
 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=99d4e1acc24e89376f6eb5fad78f6055b4c3a9fff73459845af32841743bdf68
+checksum=238ed9b80fe3fc72d10a728801c873a0c85db9b9823f3a62ef7d39d6e9a4acea

From 83d11643e06fa73ddb503621e50b041b66879db6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:27 +0200
Subject: [PATCH 2315/2561] kwayland-integration: update to 5.24.5.

---
 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 d4dc57cef6d6..4c671829a5d1 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.24.4
+version=5.24.5
 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"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d2e74baa0e2966b92330b8df7567b0b1cc85a71ea24c3f453da39aed035aceb2
+checksum=806a9607bb70f95b08ccad55f28eaf0a85adc1439afa2d2717b7c9d6c33022ec

From 2cd87197f29693854a3672fd44512b0ba33346aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:29 +0200
Subject: [PATCH 2316/2561] kwayland-server: update to 5.24.5.

---
 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 19bd5a8345ab..3b1b1efb8d83 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.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,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=d1790bd7584dce9a36a432819b170ce72d34d5df79083b1b41dfe3e021b6e988
+checksum=2ddabe29794489d11096ed831ad4d5c1626130019322d4305d58df84c835b279
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 3a7e48ebface71bad27f762587846b997ff4dbea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:40 +0200
Subject: [PATCH 2317/2561] kwin: update to 5.24.5.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 855d5bcaa842..3aac33c97cd5 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,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=e2142321a9b1189665354838a66baeb2189235b705efca2364777bc3a3698ce3
+checksum=f35e15254cebeb8afc5eae1c694a603e04097fe3e7e0033a5f5fc255835eaf82
 
 build_options="pipewire"
 build_options_default="pipewire"

From e3965a8cec003949894a20297c07c88db2d16057 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:42 +0200
Subject: [PATCH 2318/2561] kwrited: update to 5.24.5.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 38a32a832c3f..b33f3a1963a1 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.24.4
+version=5.24.5
 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=62d700b673102f2740ed34e305902260c7035f5c8cc6ef19494a98f3088c0649
+checksum=6204a31fe1e160c8d664e68b30a1d91d31ead2bbfd7cd5841eeb39cb91dcd23d

From 5769a13dd8a734c61eb47f2967f962e8a1eae254 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:44 +0200
Subject: [PATCH 2319/2561] layer-shell-qt: update to 5.24.5.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 0249259ea03e..9fd4f43f7921 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a0979fdb2f61a6d2c68fe2d93573d5b46597021600d748a379d18cb9af711e0f
+checksum=f591600cc0697cc94ce765bd17b1f9e3ab52d3d58c4de89e2820de3a7377b279
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8ce57ee0437ba67afc9d582b83714489721f1883 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:45 +0200
Subject: [PATCH 2320/2561] libkscreen: update to 5.24.5.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 1b82bcea1033..108314ca7b5e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.24.4
+version=5.24.5
 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/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=016dec6d912b2a733ebdd26bfe5e31029651bd5b4e476d95a541765a68dd67f7
+checksum=7ff118af3320e53d2c1cb9f324d2ee13d087062ef354d219f20503da5ac06fc9
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 06268e46f44db91bce7185b1c196c30534ccdec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:47 +0200
Subject: [PATCH 2321/2561] libksysguard: update to 5.24.5.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index c5cc1f764300..d635b103f323 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ 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=76da2a7fb7f760c55111db756d91dd3041721baa8a1f8863ad9e0bc0a6a02402
+checksum=b06cb33a6e17c04c47ed4ded72a122acd6a2af60776c18719cdd74be27eb41ec
 
 build_options="webengine"
 

From 5a0801f1527ca5b5c3e24d1e58ed36e0fdfa4423 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:49 +0200
Subject: [PATCH 2322/2561] milou: update to 5.24.5.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index fe5a63847469..539e9435f370 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.24.4
+version=5.24.5
 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=3109ad6c97415d74fccdfd26681360ff0925e58af7a1c72905437eb99faff37c
+checksum=c1594e8b575d7de7b7cafe8a6f37dbe7c75d338075c6fa0fd8ec08d283ff05e6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 5daf7cf614d054128936ca544ef63d26258ab05f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:57 +0200
Subject: [PATCH 2323/2561] oxygen: update to 5.24.5.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 2bfa8498a225..4cf06488fa6a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.24.4
+version=5.24.5
 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=804d033afab3f16319d92a8e5dacfb2a5797f8661a64029ee9e9b3c0b0f87ab4
+checksum=3b58ef1edd0d704113adacb50b163dbc34a71fcdd9762a97beb23d53393700be

From d89a5f47b279ce63d567cfb94aee49e0e959e85a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:59 +0200
Subject: [PATCH 2324/2561] plasma-browser-integration: update to 5.24.5.

---
 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 ad1a10231bed..8955230045ec 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.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 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=677af76b6f7072312d63bd8230af6e6920d7b69942ad69cdf0a29356ce695bc1
+checksum=1b67baf45996b66c63e88a6df5572c83a3f36b777a9df2802c192abd8df5cbf7

From 2c54b0f656a7cb269ec9f9b3f022a9d543eab12b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:09 +0200
Subject: [PATCH 2325/2561] plasma-desktop: update to 5.24.5.

---
 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 6d2b3752e213..9bc60832c68a 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.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ 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=b0e23046300e49acf93d9181d0c8dda2008a9a843a441af2528a91abc5c7d025
+checksum=af58796c43a7eb909d4c6782e899e428c9b569a9ab92eb34ba7391c763002c46
 replaces="user-manager>=0"
 python_version=3

From 388501d17ffdc0e99b326020995dc1027b4c65ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:11 +0200
Subject: [PATCH 2326/2561] plasma-disks: update to 5.24.5.

---
 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 025d7ab6e172..423c637a22b1 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.24.4
+version=5.24.5
 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=cf8a33e81b8d3b6b2d94374eb673adec19639eef8c2df803e1721630c67525d6
+checksum=139495ade44ac725856bb4567dfd503fa9eb92c0f7dcca268aa1286e59a974f4

From a34e4571950534798def407890a728a3bfc5652f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:14 +0200
Subject: [PATCH 2327/2561] plasma-firewall: update to 5.24.5.

---
 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 be8466cd08c3..9e3576a024c7 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.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcmutils
@@ -11,4 +11,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=a2bae12766e6536b7cd6d6445368f8249bf79d488d30dc5d57e2aed6442d2f39
+checksum=84a49688753645c234dec4ad84ac726a3aa2def18795e2f139cff21c16bd6956

From ff2cfe652b8d30e015759dbbf29a8a4893db82eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:16 +0200
Subject: [PATCH 2328/2561] plasma-integration: update to 5.24.5.

---
 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 b5f6098c11dd..f62cd0035065 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.24.4
+version=5.24.5
 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=73d4993d2c7aeabbb068e8d28821566d04f2dcb882dd1d92feadc2062b3b4db4
+checksum=cd4490e1e23276bd4f7827ec1c6a3dee6703b8065bd5b4f3fad8112b53eadf7a

From 2ad51eb75d31f58948a1657ff6e6d44fe032d766 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:18 +0200
Subject: [PATCH 2329/2561] plasma-nm: update to 5.24.5.

---
 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 ee283ed3c555..a6339194bc8a 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.24.4
+version=5.24.5
 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=086c28cfdaa6f4de785662ccd8123cd48b2a333fbaa2ca70b2a6d9dc3622ec2f
+checksum=ae1026cf7d2fb60f862ac9b985da4f7001f54267602062e461d0849f1d2fb429
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From e05d88188ecf7fd16970be5d57a5ea597ad6cb1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:20 +0200
Subject: [PATCH 2330/2561] plasma-pa: update to 5.24.5.

---
 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 36cffcd23b04..98baa5aaf919 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.24.4
+version=5.24.5
 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=ffe5b915e5e1d2e5d4de719502793dd5b91cd9715cc44f82c88fc5ff0556d325
+checksum=068f0d393a87d3f3c8031eaecd1c2d2bdb17e73c510e020280ab18da3c15f8d1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From c73dc897ea3f264b6ab71e58130ac97482b3e8b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:22 +0200
Subject: [PATCH 2331/2561] plasma-sdk: update to 5.24.5.

---
 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 98e9f404e1c2..6af830b1aaea 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.24.4
+version=5.24.5
 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=ecf35743a28c350aada480248bbc138b726315e53f36bb39afe5fba0d27d6ffe
+checksum=1cd4db58018bc827572e5d2f08d6a9a037dd7a0cd0dd72c858e7c42d27d36534
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 9ed10bb8455b512c777a2f118fa9dc84aa40bd46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:24 +0200
Subject: [PATCH 2332/2561] plasma-systemmonitor: update to 5.24.5.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 8a77dfdc1496..d9ab9d8da698 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -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=1ff2853be75349892642a0144cc64a15c5f1bffacb0637e8b5c269055ead9a49
+checksum=156bd761c4e2e334475ed0e7d0de6bc6f5009197f168d53c846c5c5b67e1a0ef

From 866c30e088472359fca1f55ba8946680d084c83e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:26 +0200
Subject: [PATCH 2333/2561] plasma-thunderbolt: update to 5.24.5.

---
 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 6dc40e6212fa..8869f2df4f1c 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.24.4
+version=5.24.5
 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=1efecdd4b5e3302b37ae28964cd371d404189f7879a9752f000b6df4745b0ab3
+checksum=9485a89477c629083be0933f44ee96ec65f079c39b16a1ba5f131bb0044d19e0
 
 do_check() {
 	: # Requires running dbus and bolt services

From e589db1ed0f7485302890ee1c54443e6e3a8b63d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:28 +0200
Subject: [PATCH 2334/2561] plasma-vault: update to 5.24.5.

---
 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 7010aff50a86..04d057b95eb0 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.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -14,4 +14,4 @@ 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=0169c2b8d48fbfccf132317f62cec342d2f1cbc7352e52a513ca575198f84966
+checksum=8122c33727ce5b9c338bdbfe7a96086dedbe9932a73c08cfd39863fe9dff9e99

From 722b73025818f2304f18e7ef78d9499eb719dc56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:12:50 +0200
Subject: [PATCH 2335/2561] plasma-workspace-wallpapers: update to 5.24.5.

---
 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 f0f8e072fbeb..d9b6085b81d9 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.24.4
+version=5.24.5
 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=243cf6bb613d30ccb92e183938dcd3e02c1c7a11624a447c35c56a5eac3def42
+checksum=119b6732ac14447e49362d9544ff4431ed703dc03e7854926fbf72fd49ab4b29

From bf29892ec1148fcc6a4b2eb34b8107f39c716f74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:11 +0200
Subject: [PATCH 2336/2561] plasma-workspace: update to 5.24.5.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index ac82a06c4a9e..aa7680e4d8ce 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,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=5b0e40b090d6bd1fe1f902a60633e4417ce711b34c32bfd2fce5b16bb9b2ec70
+checksum=b9912691e0becfa0839dbf7750ea24729b72bad0216bef27584f9faf882064f6
 
 build_options="pipewire"
 build_options_default="pipewire"

From 95c362bf5a51a67d2dda8a304df56eee4270e4fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:13 +0200
Subject: [PATCH 2337/2561] polkit-kde-agent: update to 5.24.5.

---
 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 84ef537290aa..56a84b2d2891 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.24.4
+version=5.24.5
 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=955246c593d0332bfbe386e81aaf7714e9ac8b8e7743c8c2e4f334b28dd685ad
+checksum=89a61cc4f2dee58dd420317b0732a67f954cd22f03d47c4bb33d9c6a5361e870

From c4e3df02e32eb2b18e1620ff16b74a93a6bf73f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:16 +0200
Subject: [PATCH 2338/2561] powerdevil: update to 5.24.5.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 32ac96524c8f..bb5713c0e601 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.24.4
+version=5.24.5
 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=ef70c00e36d4ddbaedeb0efeba68523289e6e112b12951460c8d36075de9546a
+checksum=964ca1b876005595c361add1eab5fa80c8d63da12c1201bdcd234914c6cc23f3

From 65f6d9335bb05b662d2e6d8c757c643ac43efd17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:18 +0200
Subject: [PATCH 2339/2561] sddm-kcm: update to 5.24.5.

---
 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 e0b11b4e4cdc..a25508f6fd38 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.24.4
+version=5.24.5
 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=bef347b9e066a756d71263b19552fbbf9b8a1d6d22861060bdfd1ead5ab9d85d
+checksum=cf9262036c4b3c149663335ab7b3770705924554e227e924dee3c4cfae83e597

From 38e0bff7fbc805f39b3bc534b796529cfe26d43d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:20 +0200
Subject: [PATCH 2340/2561] systemsettings: update to 5.24.5.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index b18700451dd6..8bdaf8cd638e 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.24.4
+version=5.24.5
 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-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=69921f98956b3559f8c37821b67d32ac8d6aef254888c15df8f86f99903e1533
+checksum=5b72b53f0bd8760b35844732a60f99713d45d0f80cecaca80de965e84effe9e5

From 8c7d0b8445b69d1c944dd26f39186e92a23b4b3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:21 +0200
Subject: [PATCH 2341/2561] xdg-desktop-portal-kde: update to 5.24.5.

---
 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 9f3a47148a1b..1d2fce78de3c 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.24.4
+version=5.24.5
 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=11684916288bb4a452b75004e2d122a4a1264a562f7945af98d466e49c59dc1e
+checksum=b59ccf65d29aef2ce6af9757a5c87eddd87b633fba2e45470f92b18b2ce5c6fe

From ff6729bdd9601f0ecd97ad3bb31130b40f31b014 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:32 +0200
Subject: [PATCH 2342/2561] attica: update to 5.94.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 47179ef8bd69..e7539d0176ee 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81c18009911beb07d1868de78dd7fc1c4b1e8312bd95d916f4d4a80a800592e1
+checksum=f6293699da5794812080ba2d41b4ea05e830532678af324d8e852f508f2def65
 
 do_check() {
 	cd build

From d4071097aec0f1e32c1af2d3bc552e6e572ebab0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:34 +0200
Subject: [PATCH 2343/2561] baloo5: update to 5.94.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index f687851bcda5..48b4235f16bd 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.93.0
+version=5.94.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=25d11569fddb8ad0dddbaa91cedd3d96f0ad58a2cc23de920950db6ba3aed5cd
+checksum=9dc4182e5803c32a47d6a82588f6a6b36837fb44a90fe4404750886150b9273a
 
 do_check() {
 	cd build

From 3503e39ae664a3ded50794d3ddeb7669958a7e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:36 +0200
Subject: [PATCH 2344/2561] bluez-qt5: update to 5.94.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 e6939e618cf3..2bda9496bd7a 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.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=ab5d84eaa37791b57c8379282a3c3afd7ef0b2ebbef83c3f12f6b3bfd9123624
+checksum=7e776feb095e727abea0fec4b3ae3c81d704a0527b8ff3257d799feee2cc0632
 
 do_check() {
 	cd build

From 50f684a269ef23d1cd7b03a8415568dbb70460a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:41 +0200
Subject: [PATCH 2345/2561] breeze-icons: update to 5.94.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 4aa9c5c952b8..0a07951510a4 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.93.0
+version=5.94.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=4367dfa6b48aa645a3680489be96e03a9a6fc20f57277b3ca5e37ce8df4d03e6
+checksum=3e0b3fd2374dba82ca304c066938345f25b0eb85dca7169267c84f62bfb3a3bb
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From b296f1cf5443d3559924279873a5ba375c43f67e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:43 +0200
Subject: [PATCH 2346/2561] extra-cmake-modules: update to 5.94.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 19615d19ee47..2d483c20bf80 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.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=093dea7b11647bc5f74e6971d47ef15b5c410cba2b4620acae00f008d5480b21
+checksum=23548a8ce2b998cfa675fc00112bf93914ee25194f0bfdf832d283c8d678d279
 python_version=3
 
 do_check() {

From 7fd63d8a07eebcff5fb2aa7d1b72973b0ab9156f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:47 +0200
Subject: [PATCH 2347/2561] frameworkintegration: update to 5.94.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 130a97e3755a..d67f04101e31 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=156e54c9ee679bda943a279c28c6a834ca02e991b3f53a1b92f8c3931388a2a6
+checksum=9a64abebf8d242765ae759611fc9819a03403047ed56b8dd71aba7a0bbb4faa6
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From d4f223417926497d872d2dd2be1cd68bc5c5a356 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:49 +0200
Subject: [PATCH 2348/2561] kactivities5-stats: update to 5.94.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 5fa940f06eee..e3f3396b6dbc 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.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=f1069872228e05aea349a0d3f7961da27d1aad3e4c28d0a408fceb98edef03a8
+checksum=83fe7d109d830f348f18432949902700ee8a6a934cbaf3f89ae7bbfb28ef2340
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From fd0fbac769d2c35623ab1bbde421a164df992ea3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:51 +0200
Subject: [PATCH 2349/2561] kactivities5: update to 5.94.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 467b2ed2fed8..90e69f8f83a4 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=eb6b204382d3bba1b32b5752a3e8382a5a7bbd8be4b95b774c68c501a2f16843
+checksum=52dd5eba3daeb2a9bbb3a1865b3219277b3ca6357c2870c3570dfac10f445adf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From f8a1eab2a4fcd906b01bc829e41fcc5b8220f1e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:53 +0200
Subject: [PATCH 2350/2561] kapidox: update to 5.94.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 5e8664d5b6e6..0128d4be7da0 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=python3-module
 hostmakedepends="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=4228326a35342de8f0a301ed8afa379ef2102d99588a79808e7e86f2a4f81d5b
+checksum=1ca7520539bfe3179ae8b50b9a7c381478080d520a68f9fbb7e73b5946e55577
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 81a1ad5dec078eb38f19527c3d6b0e30e6c384a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:56 +0200
Subject: [PATCH 2351/2561] karchive: update to 5.94.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dcc4a9d14cb5..9564f05437bc 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61e326a840860270b7f8b9e8966462085b4f309be5c3a84c3b265eb95694c7fb
+checksum=55cd87a5437a649c168efbce4af132b992aa67dd9a3a8ced7cff0144f155e1e4
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 117572a6229dddd432e1d31c70573019d33182d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:58 +0200
Subject: [PATCH 2352/2561] kauth: update to 5.94.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 8877514c6a7c..ccfb3ce26ecf 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34580078bfdf631835f3ac52955f2149209908b935a7cfec6fe5b4956c3ada6c
+checksum=9cfed0ad69a8fa5df88273a5ef340d7b6dff1cd3e9d53bda16f3cf4afdd64159
 
 do_check() {
 	cd build

From d9760cb7d11160143f42bafb0fcd92322788a1eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:00 +0200
Subject: [PATCH 2353/2561] kbookmarks: update to 5.94.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index cf60805f2206..917bc5bdc970 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3eeff795ff99be90b0d59c6e5fbef02022e9fb48c9b4dab098a3c27e10fd863f
+checksum=8ccb99ab6f6e9babd503abd043ab183b849cfd9248d3b7d4e2805c75735f517c
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 7e1be21e852e59df240c3476f3905446d25d242b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:02 +0200
Subject: [PATCH 2354/2561] kcalendarcore: update to 5.94.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 4e7766af00c4..6c53e506cbb7 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.93.0
+version=5.94.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=1609bc141739fce0abed59a353a0e356f4fa7a1b3659d3bc77737010875c1d3f
+checksum=3bab1ae2e8214fb889b742d4a4f2c6acfd0bf40a4c4933cc91c66d21d77c042b
 replaces="kcalcore>=0"
 
 do_check() {

From b083445c79744b025c66dd8956ff43de7bc5c12d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:04 +0200
Subject: [PATCH 2355/2561] kcmutils: update to 5.94.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 19bea8671950..8d03cac1f90f 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1445f978b7ffd69fd7c25d965812755679c4fdba23eb9837da37a8b5b2d30d6d
+checksum=798cef6990cdcb22e4822ea12c3c0b9aa35797806e93fb474a2f58632cd53309
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From f6b85252b0814a3c96dac42356ff08559f9be9c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:06 +0200
Subject: [PATCH 2356/2561] kcodecs: update to 5.94.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 0a5c8577d249..48b83e786263 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0efc5c8baab3142f8a0ab9369b255061772a57a80fb616b7305bf98235b2288b
+checksum=bcc0e9fb1c1d259f05a326de160639a46c4bb6e0cce6fbc8244c39f251b8e7f9
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From fa39fca8753e6800be00e43553199a29552625bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:08 +0200
Subject: [PATCH 2357/2561] kcompletion: update to 5.94.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index fb4b7970b807..a38fc1a11a5c 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,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=7f8c9355e8875b619ca852741e972f41c252aa2e95b439161acc7b32d9e8fb9c
+checksum=1ad13d41650bbe352b0c2ecfd8c059015f9441cbf7534a2bcc9ed17a3bfa6ea4
 
 kcompletion-devel_package() {
 	short_desc+=" - development"

From d92d67b80950a3694785956703672c92e1d7595f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:10 +0200
Subject: [PATCH 2358/2561] kconfig: update to 5.94.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 402cf928ecbb..9b68611ec39a 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=71857c20d4829017c22dd6d46ae5a642c86344960e21bc1520458fb76d02c06e
+checksum=8e6d9104f070d94f083be000ea116acae3499b0dd110fa4c9c55f51ea91cb3d7
 
 do_check() {
 	cd build

From 79bde3b775f333cd1c6d549dcfd468ac098459bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:12 +0200
Subject: [PATCH 2359/2561] kconfigwidgets: update to 5.94.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index a8fec7e42dbb..830b2fdae6b2 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=db18e0f2217ead6dd6f5877551902d5da86aa026686e3c564f5f96be279f24bb
+checksum=35055f637ff44b0f0e67f9b5c79307d37f5c259289bf71b2a24c0203f82fb508
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 99760cfe9b0110c7087a5708d646a6f2b46e7962 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:14 +0200
Subject: [PATCH 2360/2561] kcontacts: update to 5.94.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bf35f07ce999..a27b215a57e4 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.93.0
+version=5.94.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=5d7c8c6c6ccfa99188d9e4d7ab6165ec5b2bceea59a01edc6b309910fd604c75
+checksum=f7f317dfd9b270249cf168a699b39236490b5b21ec2ef1d186b59e29566252f8
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From bf81a23a62d381a84dd132fd4c5d8fd3f6dfad5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:16 +0200
Subject: [PATCH 2361/2561] kcoreaddons: update to 5.94.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 0db03a77e30b..8e0756322319 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=920a278af97dea3add06770a6f3604744c20d667973cb71cf477145785dbf043
+checksum=5c10b6ce070d6aa9b15abe7483b67f8802cec175e0eaeefc18a27c0e01ce110b
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 9d5bdc8d54c76f9cdca6ed931284a09c97256ff4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:18 +0200
Subject: [PATCH 2362/2561] kcrash: update to 5.94.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index c05bc4600336..c7c464516a7c 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2ff8d6c6924b2b752ef4a929390606bb55ce2aa55c582927269bd65556992dd6
+checksum=48c7792ca8c2ad6e9b6c8e9a260cdfcee5ed8d8769c4a8a199de7bf671f03cf5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From f1248b8b4a68c6035fa9b35ca4b1fa21e8966ec7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:19 +0200
Subject: [PATCH 2363/2561] kdav: update to 5.94.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 32b1865fbe2d..39533fd3bf13 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.93.0
+version=5.94.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=a7d3d40120f0a1b20f8492ea1635507a95e041582f5496a133de24720934ad68
+checksum=8b211ec6e1009f11ae5d0769e21947a473d6ca479ea8a16701a808aa57335b3e
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e779d3711f22acf31f414cdb9ba5c77de62214e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:21 +0200
Subject: [PATCH 2364/2561] kdbusaddons: update to 5.94.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 5e03127aa8a2..247de9346fcc 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cc2c74501e65b97af1849ff454e51393f3a07755c155854bdee741a006822ad9
+checksum=0a1530117ccad6f1ea7b9db653bdf99adfe7f15f3f9394c3d885028f3ff4dae8
 
 do_check() {
 	cd build

From edc35b341011f1dc30d9356aa99c0127356614db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:23 +0200
Subject: [PATCH 2365/2561] kdeclarative: update to 5.94.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 96902ea275a9..5d853acf58f0 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08a945c793aa8d89d87c42d29c9c11e7c28c47916ae728369ab478892d325067
+checksum=f2996ca7671994f42c9233897d10d6bc93ffc2b12865ae07e516a93812dd6b08
 
 do_check() {
 	cd build

From c787922bc86492cfdc0b8a46544b033d52431ee0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:25 +0200
Subject: [PATCH 2366/2561] kded: update to 5.94.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 30238cc5f878..f6cb6da3f191 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1992310921cccaf8fa2ca1abc8328aec5bc2e60a3d9f562f25b30885378159df
+checksum=2f4d61a3e8c64f81e5916558d48e381d0a3890c5ad388f27934944136c44f3c5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 65ba4dc38c54c428d5afe1b5ea32d7cee333ad5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:31 +0200
Subject: [PATCH 2367/2561] kdelibs4support: update to 5.94.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index ae42683b9b16..e3ec30c70a39 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6a3e1d80cc6babc12930f24f9afd1ed10b46ae58ea71d44a466178212b07377c
+checksum=d726ebb00766d3d5ed39603601c4b9541659bebc4bb7b755eec25bffd8a76033
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From 1ea719dbb0ac749fc572cdde4d39400250f549c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:32 +0200
Subject: [PATCH 2368/2561] kdesignerplugin: update to 5.94.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index b81b6562cf66..6742406d5bc0 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=f19ab4fc1ed58b89642d8f9f75a5da2f2ef0093c97183f336ffeb7208e628aaf
+checksum=6bd051e47f3a9f301e26b876036b1a36ccf2a2c7e6747f3a96a157c0c3a78a03
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From e89c6f59a163779c2a814db806d57d65dbaba637 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:34 +0200
Subject: [PATCH 2369/2561] kdesu: update to 5.94.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 1271d28ade36..ecf34e383a62 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7f029d9a8959f0e2ca516ab3fb6b4ebd49ca0f0d19c72369451b6894d8138dbf
+checksum=90494323ebab4c8cdd93c068c2c4fe3a8457513cee21d7887fc4473028a9dce1
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 4a0dec2e540598bd3dbe5389dee44b6ce5ceaa8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:36 +0200
Subject: [PATCH 2370/2561] kdewebkit: update to 5.94.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index c667f015e07b..2fd81d121996 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a2fe9b5660763d4dd74244c00bf7b1a407438279a81f2a3ef3813ea250fd2f55
+checksum=9bca73e8e67ccb89a044514ff6f6c02f6e65003cb34bc7e358a44182bc710d59
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From 015c1705cfeb04eefee2ee99082bc32bf3f9a31c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:38 +0200
Subject: [PATCH 2371/2561] kdnssd: update to 5.94.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 42554c854079..4090acbb9e64 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dc97364f14b5867ea5bb2986f6ad3c84ab1acc952f50d460b3e9aed03f2f903b
+checksum=28eba2ff83d92bb80eac5bb771d5d5bf40c975d4b26a74d388092b034a964863
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From ddbdd09dbef147db01a47fa883d626f742c5effe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:40 +0200
Subject: [PATCH 2372/2561] kdoctools: update to 5.94.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index a43404728d1c..8abfa56316d1 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=25e83ff151c53667b94e25a5c41993796164683a43913820a5651f3610b65d5c
+checksum=f54e61ffe8c5e634e7d6e341020b63346d40b524d4a22565c86b9147033cd2f4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From 6c27b63098bc0af89e3284c717c3fbd3a3ab41d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:44 +0200
Subject: [PATCH 2373/2561] kemoticons: update to 5.94.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 5b7281e3bca7..4525d35dceeb 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=83ca3df374935cf103a8fdaa85900d0acadbffc9d3aa8bfed073e804cd5ae410
+checksum=fa7db15d75a017e75514af4361ae3dd91a22ac9d9e2daf41a8e7e33bcce31302
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 97f288cbb6b61fb5d996e9799ced973b4edd6749 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:47 +0200
Subject: [PATCH 2374/2561] kfilemetadata5: update to 5.94.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index eb162fdff6d0..add84045349a 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3015c071a5f068f6e45d36238aa0243d3788a95ec84362ba79ed0369e676a816
+checksum=7f573b1a30349e331309dcf9e3374d7a304b6bdd0453a122366f7bd2574977e6
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From c2817804c7f914c06c7fc6ac9d35be42309a8fa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:49 +0200
Subject: [PATCH 2375/2561] kglobalaccel: update to 5.94.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 7df12f5a2476..09ed09ffa793 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c806b8f2b029c7632d99c55cb711f9f4c1697555fde53ad4f67167efee97b712
+checksum=a34b00116a72d0973cdeb203a5d237da63cc307e9e294dfaedb00ff0a36835e9
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From dc236988081159982cada7c4601f9a8fdb085ec0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:51 +0200
Subject: [PATCH 2376/2561] kguiaddons: update to 5.94.0.

---
 srcpkgs/kguiaddons/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 72f3ba0d1e74..db66b082a692 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,19 +1,19 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules
  wayland-devel qt5-wayland qt5-host-tools qt5-tools-devel"
 makedepends="qt5-tools-devel qt5-x11extras-devel xcb-util-devel
- qt5-wayland-devel wayland-devel"
+ plasma-wayland-protocols qt5-wayland-devel wayland-devel"
 short_desc="KDE frameworks - Addons to QtGui"
 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=27f26392140bd1abcb86c154fd6fd87e50b2493787827b2b1cacaf76544af40a
+checksum=f23182a7268d37cbc32eaa77bdc9dddc6429a8eff912f57841f6d96c71973873
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From d45a8aab1a87f7f8d4063fd63306e8fa2239df40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:52 +0200
Subject: [PATCH 2377/2561] kholidays: update to 5.94.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index eaa54144eb21..cc78337a49f7 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.93.0
+version=5.94.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=0d4a1fb823501ee73b2c4d80468777adedf93c80f36b3a680cad91cc6704b841
+checksum=e53735539c9d7658e3c18e0d8b0f81bc9ce27ff32a868bac32c19c12288a055d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 969b5116d8e1ba11cd01603ed91977585b19971b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:55 +0200
Subject: [PATCH 2378/2561] khtml: update to 5.94.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index de17fc72af8e..99705db8fbdb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.93.0
+version=5.94.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=31bfb6752ed7248b98e2bdc723e8e10c11b5fc9f7bf7edd8dedad1162f86614b
+checksum=98bd2a284a2fbc1c2d93cd6719d18baeccd5258dfaa48b1fe74bb61e24fe9b79
 
 khtml-devel_package() {
 	short_desc+=" - development"

From 5a777647111a7ec78631951aec8ba73712ed25c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:00 +0200
Subject: [PATCH 2379/2561] ki18n: update to 5.94.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 956d6aa70406..5139b30bbdfb 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -13,7 +13,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=c2705400d175f18612dfe1afb28dc14accf614f7cfd65409dfa7fdcde5237339
+checksum=0c5a8332343570e8530469840d67c72a28a04a7257578e5a962c73824508944a
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 779a0906de640441ce49fb5773979bdc645186a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:02 +0200
Subject: [PATCH 2380/2561] kiconthemes: update to 5.94.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 532d5ec8121e..613b98a4f402 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=75f7c5b34f4f1a228b4cbd81a284dbfdc0c0810ddd3a39e69f9363ab3598e2b4
+checksum=d972d81dcd7ccb74ef4abd4db2a88512a07ea459a301b94e7a98b831ab814993
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 201025817e8511ee171c52c814273859c8d167ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:04 +0200
Subject: [PATCH 2381/2561] kidletime: update to 5.94.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 0556c9a0e3d0..02ad544802b1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4d9315dfe1faaeb62eae5ba60f683483de56317826d9b8da2bd58feebcb7b7d9
+checksum=a61c3d545bcec8866cf6aeb8df00dc4f239f1725ace09b8ef1946839c4b4e3e8
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From d1ba35b6b0207f394ecf69ce465553ffd4d004e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:09 +0200
Subject: [PATCH 2382/2561] kimageformats: update to 5.94.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index bc8b9f09a2c6..d94eb968f1c7 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
@@ -12,4 +12,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=15b0ed9de57af95979e0e40496b980f243cd81e2a400d5f64d12478e1dddc7d0
+checksum=b189626c091dc9959d586a229c47ca36443b77d79706476ff89a50f9e8774e54

From c4eb786d6c6df3ccdfd759e251a6d83b67db2ccf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:11 +0200
Subject: [PATCH 2383/2561] kinit: update to 5.94.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index f94cc0038dd6..67433100a92e 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=db36a3bd5b30163b7a4ed8c7a907bec585acab841306755b0d8d32ef3d1ce498
+checksum=ee98f909cea837dc0e8cae363fda5891fac89de388aaf75388e3ae9f3e1ebc61
 
 kinit-devel_package() {
 	short_desc+=" - development"

From 9dcfa27da03013fb145a8759cc6e6b124be45b76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:14 +0200
Subject: [PATCH 2384/2561] kio: update to 5.94.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 3047212a7964..076fcc67cdbe 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -16,7 +16,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=d290a4bcfb5ec9eb9047c84a7c420df831131b92ab6c9d28a3aa0eef9f5d4c44
+checksum=85c0bf8e49d845730d95c85c0292330a5bf03ed63a008cbf02ec9d02f990d09b
 
 do_check() {
 	: # Pain to get working in limited enviroment, excpects e.g. real disks

From 6f19f1e65d2b0ac369c04335016b40336ae27c90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:16 +0200
Subject: [PATCH 2385/2561] kirigami2: update to 5.94.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index f504292b6363..ba0713080057 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.93.0
+version=5.94.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=a7c2a824eb776011ae9dc94698588e8c6988ac399669723631fab26edd47ab8f
+checksum=d7f27da3325feb339f4e1a3db78df44f05e4f505f36e15c7caeac04da0428e39
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From fd848d1664271488ffb2c9fa4257cfc3c1392827 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:19 +0200
Subject: [PATCH 2386/2561] kitemmodels: update to 5.94.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index bbf9bbf094c8..35f165bf1945 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5bb9918b92ac37f1bc52c5abe04e8dbea54f31fa0101edad6d9e92c3a9f0485b
+checksum=705ff2b97502b2ba436f9371b559e47f2a7634bf5b06d26c8243387d6a084f89
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 57a51a58f792ea5d2d044e25d9fd055cbd07479f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:21 +0200
Subject: [PATCH 2387/2561] kitemviews: update to 5.94.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 4518704713d6..67d0d7e9ad9d 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,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=93f01dec3b795b28cc6f6859873ebb941a9504eaafd13ff9f72b987d71e55abf
+checksum=5b75334b719ce07f4aa33236ef4bd11829504ff381670818ef57a7526938b52e
 
 kitemviews-devel_package() {
 	short_desc+=" - development"

From e1f10d209f2018dd4fd2568bdb56e150a07172c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:22 +0200
Subject: [PATCH 2388/2561] kjobwidgets: update to 5.94.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index c79eb99642d6..b9db92ebb87a 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -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=62449b747d6fa5b32a1cb317b2b614172e42be3b85f39b02d6a07adc267c39fb
+checksum=014f45fca82886af463956c533f5ba868700ac7ec61733f35a7fabad0042b007
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From f5f95a90b7b190ee59a592a7c87d6140ffa1017d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:24 +0200
Subject: [PATCH 2389/2561] kjs: update to 5.94.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index 263bf627d7ab..46e552bf8993 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=85aa01de9c2775564c895d3efbcfb8cc68da9a84f511176fef16742cbbf90942
+checksum=f93e14a2deb978ccb8e7b0e7e6a2e4c3a23fe9ffe5a64d569c824302d93b3c1b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 8690ed4b33f9ed224c6c9c3f7a9bed46cb56e123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:26 +0200
Subject: [PATCH 2390/2561] kjsembed: update to 5.94.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index d93a1a3b818c..074c3ba9f1aa 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=fa55d3bf0b3f9026eb573cc909b1fbe53bea7090f3da465e9bb293dc0f81d424
+checksum=f3ce37479d0f579feeeebc837074b3d138a37989884149b92f12b107fedef62e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 376fe230cb0dbeccbd92743f81c1049897e7cd63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:28 +0200
Subject: [PATCH 2391/2561] kmediaplayer: update to 5.94.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 5ebec5415b18..b803dbd9b428 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=ada8afb5b0fea3af2112812792eff062d3830dfde4d8784b7e1fc3711e74830a
+checksum=0bf1f6df0ce21d397ca168307b3b3e57d10c0fb90369cee03bbfbf9fa7d8208c
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From a39f6756cab27895b0d811d00f5463bb1ebfc377 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:32 +0200
Subject: [PATCH 2392/2561] knewstuff: update to 5.94.0.

---
 srcpkgs/knewstuff/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index dc604a8611cc..bc45f43afe24 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,19 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  kpackage qt5-host-tools qt5-qmake python3"
-makedepends="kio-devel kpackage-devel attica-devel"
+makedepends="kio-devel kpackage-devel attica-devel
+ syndication-devel kirigami2-devel"
 depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2adc48e26c04c05f61f6ff1007f77ea43036b76d769535617e88d3f35ebb5759
+checksum=aacd014f99ab66d40ae98333cb56257244ca552bc4df0ce04de4e29bae90336f
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 30abaa5b4575ee970eba95a62dff602792f09f32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:33 +0200
Subject: [PATCH 2393/2561] knotifications: update to 5.94.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 782d259b261b..d7f8260d8a23 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe191b1fe55881d7e212a3b70fe08d53e47c32793d38f5d5a4d82b796796da4b
+checksum=c8d51ce32b65f096c75da3e7bdb033202086cabaa8faad3bcdd46730b74b43bf
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 02ff48a0fd8f26fe61198f4cab68e134b1fa91fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:35 +0200
Subject: [PATCH 2394/2561] knotifyconfig: update to 5.94.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 1ac13b7254db..e69a58ab9070 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cc9de166631555451965cd007b82f0ab529d6b909bc259e26e59feee586619cd
+checksum=ab85989a7482ab8e2feddd1d3c6a1f2f81a16af67894bd9dea725421c3ba8910
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 8ded6b1103440ea5ca8bbbbeba3def91dfa603e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:37 +0200
Subject: [PATCH 2395/2561] kpackage: update to 5.94.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 0c03af3cb837..c1214c00262d 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.93.0
+version=5.94.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/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8de6ecd6ed1cf746b9919d93283aa650922211b51bb2d22027102f67c42ec5cd
+checksum=4d4c9c2920c9b10f6879f2d8a29426615e9e6b13d78c0b751ea4a656b4baf414
 
 post_install() {
 	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \

From 962249920b91db3c96bacca4f35bce6441475cb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:40 +0200
Subject: [PATCH 2396/2561] kparts: update to 5.94.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 9ed54c4d5bd5..ef2dd1d22be6 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.93.0
+version=5.94.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=c888e9664cc71a2f52904fa42d6bcedaa76c50c720ef0bee8d8b0c98bbcd1675
+checksum=05a5120f1a97dce84f5ea85d80eb4eb50793f800ce2af055d1d73ce61ed06bba
 
 do_check() {
 	: # test can not find packages assets?!

From a90a780556868f07c3f492874f876087bf226aff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:42 +0200
Subject: [PATCH 2397/2561] kpeople: update to 5.94.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index b6d0c7054015..d83af4e4af13 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3e1266982fa2abdd7b216d018569ea83c71312e2cfa35a0bee845e8bb49f371
+checksum=217eba378c223e3518914512fc303a106101d26fa1a8fc57495abbd0d36a5274
 
 do_check() {
 	cd build

From 1f76de858e9e9a4fa2f939f4485384e24300106a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:44 +0200
Subject: [PATCH 2398/2561] kplotting: update to 5.94.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index a39daf53e9c9..6a66c890cbc0 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=586d1b694213f55259ffb6a96a10648baff6e3ce45c58d7c44734d6096b6a26d
+checksum=783d6d618601d58077c4ac7920a579af7b877b26a64a6f453570da36b57606aa
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 76a2c2218093e7a894cb7adf8d6d8e00825bdb77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:45 +0200
Subject: [PATCH 2399/2561] kpty: update to 5.94.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index c5e5c306e492..12a7ad77d5f7 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter"
@@ -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=2a05154dbf9eb082f32f33b494dc36c3b24a59c14521167f3306a04c3649ec12
+checksum=569a60318b54cca6a5c5fb1e182556010d2f4c052961b125ad852ffa015746ca
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 1667f14b16e208eadfc8a0701194f378a3bd103a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:47 +0200
Subject: [PATCH 2400/2561] kquickcharts: update to 5.94.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 4fe68d7329a9..1f407b752e41 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=24346ac484d1d785bff27e0de5d29a7f7d3d73568074f8bdaeb869ff1004a848
+checksum=3065fabdb4938b68194060794abc90feac19e73dcb7648591c58e2c9cfea9528
 
 do_check() {
 	cd build

From d61ad383ad1638cc79d2fdce9ee5c25a297bdf55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:49 +0200
Subject: [PATCH 2401/2561] kross: update to 5.94.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 31a60cd2c56f..a307f5bdedad 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=2ba6fd2438731b1704537889120c0dcdf1eb36bffd1e921736e85834a5551ac3
+checksum=1d6925bd2530ded6ea97f832fda42de0e24d1d7302e52262171fd0461f642d49
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 1dff25a958dcbbe23127aefe76e42dba255d3681 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:51 +0200
Subject: [PATCH 2402/2561] krunner: update to 5.94.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 6eb7f598ef04..413b433ec694 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2dc6b9169d415d87f5e2d82e2263183f42589cc1e962c9d6d0c60b6dfa48c991
+checksum=32b0bcda190884f9de2f8a598c854ed2d29cab199dda5d341364913321b7cbd1
 
 do_check() {
 	cd build

From 115db2978fd246d9619c2e517ca9653ecda46bc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:53 +0200
Subject: [PATCH 2403/2561] kservice: update to 5.94.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index de717b3257a9..27ba8af07487 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=46cf92f837fb890e311c5affaaa8b01d1d66b47dd272a30ae148472ef3e67431
+checksum=1aad105fc0a4060b1cbe6e29f96f93a01af254159c9263c080d94e4eeae43b32
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 7b9f06dab0c537779aeb02c01c018c1e790fc3b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:55 +0200
Subject: [PATCH 2404/2561] ksolid: update to 5.94.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index d38f0b79b185..0f787d3516bb 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=22eff3f94608793fecb532e097d9022a14c828a0ffad0f73666088153f0d6bea
+checksum=9d8ed401e36b6a4b9e51438c8e2d359129b9d6149deb8240cb894b1128fa1107
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 95099864dfde75469c2a4c2c8ee48b6befff4a8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:57 +0200
Subject: [PATCH 2405/2561] ktexteditor: update to 5.94.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 6e0d131bcd2c..5fab6876dc1f 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,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=7af437b882cd2da9cf9780cb660f9242b9c2400a5ff55cf6ca8608b6e62bd6c3
+checksum=d82d9997167d718ab821dce40e8752205a5ab60f2e69a1bffaf2265455e1b3b6
 
 do_check() {
 	cd build

From 8dfa173faadc8619e67eba532f5b24e9680ff630 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:00 +0200
Subject: [PATCH 2406/2561] ktextwidgets: update to 5.94.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d685d6d0a91a..a4a83792c67c 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e27f588929db35f485ebbd6ddec45ec0c56f86844935013f8a39df8bdfb7c215
+checksum=44fceedacb526f4c3c66c1d55257bb39881c7dcca55dae0deccefd84399ed866
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From de97f4bb9658b7ef5477d1e609027d664e47c78b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:02 +0200
Subject: [PATCH 2407/2561] kunitconversion: update to 5.94.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 0629a5319eb0..c126fc6841d0 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.93.0
+version=5.94.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=9baefb6aed92d2b32727f9492f1322a9e0b17b609c2d82296f4ee10b55a02fc8
+checksum=e4adf0f124db45134042e706b466c30e531398996f872294119887af9ca38049
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 4f76fc280865311df5e0e2ee63693c08363c5ae6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:04 +0200
Subject: [PATCH 2408/2561] kwallet: update to 5.94.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 9df7aac1b7ec..a66634cb13fa 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.93.0
+version=5.94.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=ed56f6477efb250b454f7b7861a16a5ea972487c1373647b7094047ce20fddeb
+checksum=01366b42754ee7543b67fe57deb39bc2a772923eda3e6ea70a59f8ef955e2a32
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 4ba0312d259330af664df8439e4569192f6ad0d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:06 +0200
Subject: [PATCH 2409/2561] kwayland: update to 5.94.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index f67e288b91a6..be5d66338cee 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.93.0
+version=5.94.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=1648a273ad1c0c1895a0edff9a3e97eb151e1e3533362e0f01d72706ac0a7abe
+checksum=b2a4d8e1b4d81ce798c991cfb34210ba095f6406a37f4714ae3ab64abaca2636
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 605e5342180e78db5eb4a680fbfc9044c05554e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:11 +0200
Subject: [PATCH 2410/2561] kwidgetsaddons: update to 5.94.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 1b80c8140b81..c6863ab7bb7a 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c35e17d8c6faae58bfd48180bf968b813e6bfe2d49041b3285f8e326842a410
+checksum=678eed15c65d6298a5f720bc6dec1a6eed4e742431f7210a1d6bad261a003d32
 
 do_check() {
 	cd build

From 6c4a25de07c4cf31a6eb031512cc529309bba697 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:13 +0200
Subject: [PATCH 2411/2561] kwindowsystem: update to 5.94.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index f33ceba374d1..980bcbdf52b2 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97cb223a4d1a7487a3ed496e10ff5e8c320ea7458eb34cbe4ed114bc19ebe4a1
+checksum=52ebb7d4e9ac3f24fadfd5265ff8cc390efbccf6fa6d084e5a573c3b2aa43c78
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 8c9f0f4f18c4407333c5c44f9f03848cac6cfbbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:15 +0200
Subject: [PATCH 2412/2561] kxmlgui: update to 5.94.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 92a6b2d152d9..8080e90da11e 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=74ba65d95fac0cd09cb66e14d199efc739e1a8c9aec25812f41cfc64d7f4b099
+checksum=43a31730ff0ed113320817aa35a04e53b6ec647ab94320cf3b075adc38619dd6
 
 do_check() {
 	cd build

From ccf783d0575366c1488db6d6cf7dd1db6a8e3946 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:17 +0200
Subject: [PATCH 2413/2561] kxmlrpcclient: update to 5.94.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 20010cf52f3a..c5e11b6709ad 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0cb41aff9f5660d95ee6d669f9c70692b55c089d0e1b9705e19b19fc2c49376c
+checksum=65ac95cb022d5c7ca54c1e601211969aba06858773d881feb0004628a3451f82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 2656c13de31ceff720509a1fff297b6d4c411ae1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:19 +0200
Subject: [PATCH 2414/2561] modemmanager-qt5: update to 5.94.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 b669557f11b8..78f3c7a86a5f 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.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3aedde6936524b9d0dea07ead34f44fcff50da2ccc0da73d6208893e270a67a8
+checksum=7928dc36bad38a9721305d59bb6d318e35118843001c21aa8802ce11ce11bff2
 
 do_check() {
 	cd build

From acdb6db1c049648eb80c8a5041e7894f54e96065 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:21 +0200
Subject: [PATCH 2415/2561] networkmanager-qt5: update to 5.94.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 de46374e6511..b80cd9d64821 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.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=b8588ce2d811094682f51ea6150f3c58baa398fc91339bcb511bf60bc0eba960
+checksum=12208cc319ff0e77bbc1c37437e0fde57f62aa2a4d0f9e26110e8eb27b986502
 
 do_check() {
 	cd build

From 755515c9cfa8162beb3620e1fb642a170ac974b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:22 +0200
Subject: [PATCH 2416/2561] oxygen-icons5: update to 5.94.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 62aa2f6abdb6..8876060c0c95 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.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=734e3f44dc3be665350ac5de7f333ab954d3e3b777765b691603b3647c353005
+checksum=203d9dbc3fb783c8c31c3d3d59624e31b502a50beea31505dcc56d8c33fcd1d0
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 99cd0bc9a21ff5a6c00d8236456ebe422bed3e31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:23 +0200
Subject: [PATCH 2417/2561] plasma-framework: update to 5.94.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 2ccf8a0c2973..670f0892379a 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.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4a2c687ea2ea8dfe7c256eb58441fc458102ed4b445dc24685513dd96b5c322
+checksum=6cebfb9e7b61062194119bf7c4ef0e9529cd7321c8e06fb68b68fa518815ed2a
 
 do_check() {
 	cd build

From 8870bebeb00819faedca522776007957e93a5626 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:25 +0200
Subject: [PATCH 2418/2561] prison: update to 5.94.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index fdd1d0b1a115..4abb24f2d9da 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=1f43de6622cf263c6b71f9a801174e2791c09b5a0d52c602715659ddfb82fb56
+checksum=99607978559f63dba65d796c5edaf6c54e8aee5d31882d856347ea5ada06d1cb
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 0d52f5ade7ac0b8d6621d75e65def5dfb1d988eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:26 +0200
Subject: [PATCH 2419/2561] purpose: update to 5.94.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 4c9f91568f25..e826b58f213f 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dc0bc0c7c5d9b27e21856132ceeb3893555a36f3944ebc97da2eb76a74e92cc4
+checksum=73adff977f2a69624abaf6340d6609dde41f404600feb28e51e1c7db4541b3ab
 
 do_check() {
 	cd build

From 9338ee019e43f837b77105634a1c96717e4810bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:28 +0200
Subject: [PATCH 2420/2561] qqc2-desktop-style: update to 5.94.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 ee40061fe5d0..1f89a4a2948f 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.93.0
+version=5.94.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=161ec085a529e23532badb7723c78051e7b4c3a3fe11d3c4ab8bab93213ba9a8
+checksum=0b15210dbe93c22e423c876b27ca2f530f66cb72c6c5bcc7f854848ded0e7e48
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 515142617f6f9adfc82ffe06e7d5ade6be6650b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:29 +0200
Subject: [PATCH 2421/2561] sonnet: update to 5.94.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index ae917562a6e1..886f71fb6e1c 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.93.0
+version=5.94.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/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c146ba45edee43bf2e8bc48b116a38e0c28d2294fe61b44dc8254b881210d9c
+checksum=8c570a64748d6bb6b91dff6fbf5e0cc5da7634c9a6f867944e99442066b7474c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sonnet"

From 6f4aab3cec6ea12587bceba37c8f7d9d9d32edf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:31 +0200
Subject: [PATCH 2422/2561] syndication: update to 5.94.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index bbb411538569..d0715f91d152 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.93.0
+version=5.94.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=35f14e36076760170df44785df39f522407f58cfa36faf91564696587d8eda23
+checksum=458e12e4d4898d5e660ea6a3fe0d6158c208f5d4176451e1132423df2044685b
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 8d76b4f9c64306b3da829cc860774459e52b7141 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:33 +0200
Subject: [PATCH 2423/2561] syntax-highlighting: update to 5.94.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 0f92ee3b944a..72f6043303da 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.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ebdb51f8922d2bc97457c7df376e6600d5ee9805fdc1ac7f7d6be35a3fec711b
+checksum=cf871332a50355836919fdd833a82c32b3d5fe7fea8fa3e58714c39c8ddde5a6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 853b044348dc4e6e2cb9c3b0319531ea6decabaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:34 +0200
Subject: [PATCH 2424/2561] threadweaver: update to 5.94.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 89e6a9a71b90..d1798ff3ef40 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c0db7d276052ebc4d512b43792ae2127cb5fafb1cfee890b5f20bd05c06f185
+checksum=87d8431a62c53b7e433b49dfad4fd6cacb58356a50cfa17ac480c6bb00a8e1c5
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From ea289798f01acb8778686b1c5e3de4d98a126217 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:43 +0200
Subject: [PATCH 2425/2561] dolphin-plugins: update to 22.04.1.

---
 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 cc08eb66a548..b1dfd4dc672e 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.12.3
+version=22.04.1
 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=65b5aa7fcc6b1d07499596a220ab54f0eeff2e60b2079f4180e13094b8337f65
+checksum=81220b19a5224fe720a2c5755900519b29b625a89051fd9ce269d611b122b0ff

From 790f06dc79b9040e536e21abb2fd2fd27f0eaa98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:44 +0200
Subject: [PATCH 2426/2561] khelpcenter: update to 22.04.1.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 905786760162..b6af1198f55a 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.12.3
+version=22.04.1
 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=193b2caf6a24bbb5f9f0d4e992cb58844258dd7691ac967a4e0068bc4e6141ba
+checksum=c87d35c5942d7f13b9889b777ade17c5f8e745b0c52a3173f5e645666b665272
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From f8252020f692d6b182872379467dfac7019a1444 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:47 +0200
Subject: [PATCH 2427/2561] kate5: update to 22.04.1.

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 7f8402eddc19..dd4240f84fb4 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.12.3
+version=22.04.1
 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=afa5141fb2746fc18ea2d97bd80ec37c096589822fe0b0e7ec00c63d0198e0de
+checksum=f46ec33d7edf8032efcd489cc431ebf3f93e703e0e7d88a51e93941fd8509849
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 331bc6c92c08fccfdec42b979c6126520ccbf675 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:48 +0200
Subject: [PATCH 2428/2561] konsole: update to 22.04.1.

---
 ...0c2b791275f3727f2240ca7fab9f58db943d.patch | 86 +++++++++++++++++++
 srcpkgs/konsole/template                      |  4 +-
 2 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch

diff --git a/srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch b/srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch
new file mode 100644
index 000000000000..f04148e72f89
--- /dev/null
+++ b/srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch
@@ -0,0 +1,86 @@
+From f6310c2b791275f3727f2240ca7fab9f58db943d Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Tue, 22 Mar 2022 22:08:10 +0100
+Subject: [PATCH] Detect the presence of malloc_trim to fix the build with musl
+
+malloc_trim is indeed a GNU extension, but an extension of glibc.
+Relying on __GNUC__ unfortunately doesn't help with that. Check for
+the actual presence of malloc_trim with cmake's check_function_exists
+instead.
+This fixes the build with musl libc, which doesn't come with
+malloc_trim.
+
+Co-authored-by: Ahmad Samir <a.samirh78@gmail.com>
+---
+ CMakeLists.txt             |  2 +-
+ src/Screen.cpp             | 17 +++++++----------
+ src/config-konsole.h.cmake |  4 ++--
+ 3 files changed, 10 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e6775aeef..9e990c37d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,7 +94,7 @@ set(HAVE_X11 ${X11_FOUND})
+ # Check for function GETPWUID
+ check_symbol_exists(getpwuid "pwd.h" HAVE_GETPWUID)
+ 
+-check_include_files(malloc.h      HAVE_MALLOC_H)
++check_function_exists(malloc_trim HAVE_MALLOC_TRIM)
+ 
+ # See above includes for defaults
+ add_definitions(
+diff --git a/src/Screen.cpp b/src/Screen.cpp
+index ad578b4fd..10876f988 100644
+--- a/src/Screen.cpp
++++ b/src/Screen.cpp
+@@ -28,13 +28,11 @@
+ #include "history/HistoryType.h"
+ #include "profile/Profile.h"
+ 
+-#ifdef HAVE_MALLOC_H
+-    // For malloc_trim, which is a GNU extension
+-    #ifdef __GNUC__
+-    extern "C" {
+-            #include <malloc.h>
+-    }
+-    #endif
++#ifdef HAVE_MALLOC_TRIM
++// For malloc_trim, which is a GNU extension
++extern "C" {
++#include <malloc.h>
++}
+ #endif
+ 
+ using namespace Konsole;
+@@ -1797,14 +1797,13 @@
+         t.scroll(_history);
+     }
+ 
+-#ifdef HAVE_MALLOC_H
++#ifdef HAVE_MALLOC_TRIM
++
+ #ifdef Q_OS_LINUX
+-#ifdef __GNUC__
+     // We might have been using gigabytes of memory, so make sure it is actually released
+     malloc_trim(0);
+ #endif
+ #endif
+-#endif
+ }
+ 
+ bool Screen::hasScroll() const
+diff --git a/src/config-konsole.h.cmake b/src/config-konsole.h.cmake
+index b74992b0a..4b1d9b515 100644
+--- a/src/config-konsole.h.cmake
++++ b/src/config-konsole.h.cmake
+@@ -15,5 +15,5 @@
+ 
+ #cmakedefine HAVE_GETPWUID ${HAVE_GETPWUID}
+ 
+-/* Define to 1 if you have the <malloc.h> header file. */
+-#cmakedefine HAVE_MALLOC_H 1
++/* Defined if system has the malloc_trim function, which is a GNU extension */
++#cmakedefine HAVE_MALLOC_TRIM
+-- 
+GitLab
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 61c59d3fc3c7..6483bcd8fe31 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.12.3
+version=22.04.1
 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=1a9727a1ab878bce3419a3fa9cedf41cf0ed778dc7d9ce5a66314755bba8581b
+checksum=8d049888a9be2464ec5c0c961fbab155fea679a714558f9ad6e13720c56822e3
 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 b9095136536466858f88f164b6f08757294ee23b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:50 +0200
Subject: [PATCH 2429/2561] baloo-widgets5: update to 22.04.1.

---
 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 c91a22fe9d31..8a9b4c13bbc7 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.12.3
+version=22.04.1
 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=1b66aa05d60e6523a9458977f50fa5bed4a9e908c0813cd428b1abf57475cc31
+checksum=680722c0124f9f149227221778fa4f3e30788e5bb6b202ac8cbcfd412d6e73ae
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From d94a5f3dec79121f50875c3ec9e2408f7f38d26c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:51 +0200
Subject: [PATCH 2430/2561] kio-extras: update to 22.04.1.

---
 srcpkgs/kio-extras/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..1ead831c057e 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=b1400209157f5ff21e0981a54c8bdb442a51764ccd88fecdd7e49f989bb4f787
+checksum=a4475107e06d740e0d3fb9e80fa3c58d389508d48d6434e4ab21d6cac25ff814

From 1e434c470658e199a9d01fdc4786abd9b2fb06d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:56 +0200
Subject: [PATCH 2431/2561] akonadi-calendar: update to 22.04.1.

---
 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 a600d71f87e5..2ea65468ed42 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.12.3
+version=22.04.1
 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=78617cb53b3e9a4abdae34db63e57fb884ad412428fb722f9806a87e9337fe43
+checksum=359c86f9fe84ea0b66629f143244dda0c14b534e34feacf88971f5170ba111cb
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From bd2315fc8be990780d7bc134b1cb9f728b0fa8c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:58 +0200
Subject: [PATCH 2432/2561] akonadi-contacts: update to 22.04.1.

---
 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 90a30d0eb2c2..0e4786133fa3 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
@@ -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=b5a50748877cac1209bbbfbb19cbd20441c0563924aceceaba081fa113903d12
+checksum=cdf2c60ab9d0d197eeddafc558506e3d1862c0e5648baf34eb6e43f87449390e
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From a3d6abfe60db5d9e760c249fad279ddf1971d97b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:59 +0200
Subject: [PATCH 2433/2561] akonadi-import-wizard: update to 22.04.1.

---
 srcpkgs/akonadi-import-wizard/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index b664301805f3..5ab0a8f7095b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,17 +1,18 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
  gettext"
-makedepends="kcontacts-devel mailcommon-devel mailimporter-devel messagelib-devel"
+makedepends="kcontacts-devel mailcommon-devel mailimporter-devel messagelib-devel
+ kcalutils-devel"
 short_desc="Import data from other mail clients to KMail"
 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=92f1f46a7e1eccc83ae738c9c3a0c3dddecb2c6385f4f62b4a17b3f647e97db9
+checksum=7244e9c7a1f61a3ebdfc4b5331ce42ecf678cb483c8f0a06d6dbbd52d0fff761
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6ff4ec1fac0e3bf1a29e9a37fcdf9948aeb50574 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:00 +0200
Subject: [PATCH 2434/2561] akonadi-mime: update to 22.04.1.

---
 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 c4b4df73fa1d..a749a2a614fa 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.12.3
+version=22.04.1
 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=bbcf7ef38a113765176b5325c7c458562084bfd1a56e6680b8e584f48b5b99ad
+checksum=6f5808f19431c42654da7e8e729a8b0dad0e9ed1d0057efc035fd78c88347d0e
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From dc9edd43233fa5b0466eb594a5f199d0631976ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:02 +0200
Subject: [PATCH 2435/2561] akonadi-notes: update to 22.04.1.

---
 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 2468cd512209..8d7f87ab2748 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.12.3
+version=22.04.1
 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=4ba78418ef7c866bb00db799069efcd445f3232751bc18197ddff5f763e26c76
+checksum=5363c67945a98bbe8d0c10c42870eb42ee6730efc6cfa59c98316944df3e3a85
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4b2583640a9874ac4edd07c1db016ba61d7c046f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:03 +0200
Subject: [PATCH 2436/2561] akonadi-search: update to 22.04.1.

---
 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 c8e9882dd472..bc270672f179 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.12.3
+version=22.04.1
 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=d76c0edccf2e25b9e86469d21a32015315e77cb05f489fc3bffb27d6e5ffa6c5
+checksum=731ecb9ead8fd2e4cffeb72199bf1b6165c71d69e3dddbb38a75521d4bab3e2b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From a4139d6ca8b03ac7df5672ea61a39b3f525077bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:04 +0200
Subject: [PATCH 2437/2561] akonadi5: update to 22.04.1.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 6fd3230cdaa3..26a997672ed4 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.12.3
+version=22.04.1
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=4fe8ded706faf6ce87a48b7f164cbdd4eb71a342501eb9a0db40a87666cfda08
+checksum=daf8cde6cdfe3bebf1b56ffa33705deab479454d0622fcd824e839f89a213981
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From cd2cc61fb6b837d37e42134bf928489710d33397 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:06 +0200
Subject: [PATCH 2438/2561] akregator: update to 22.04.1.

---
 srcpkgs/akregator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index 3319b8d9f643..15400416e8d7 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,6 +1,6 @@
 # Template file for 'akregator'
 pkgname=akregator
-version=21.12.3
+version=22.04.1
 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=c8a1fa0682123189b3c31c52c3f73d72c4f8a6dcaddad91a2391defe9360c5fb
+checksum=e29f8af6c6526591d87feb221481a6ba79141a1bd12ca87fc4af46c609fe56a1

From 96d1de14b544e62e59ea6448eafc918b7cef98bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:07 +0200
Subject: [PATCH 2439/2561] ark: update to 22.04.1.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index cf6c31c7756e..37061e10b14f 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.12.3
+version=22.04.1
 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=4817458000a8f0c241cc59aed1c52ae4338c9d3c5f4f65a57080abb1ec5b60dc
+checksum=765ecb081dbb0aaf3d41f53fabd27152ffee38bfff885bfd73a5b80150e66dc6
 
 do_check() {
 	cd build

From 7be9be79691a513b79cf13f4a3608b13186d7ca9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:09 +0200
Subject: [PATCH 2440/2561] calendarsupport: update to 22.04.1.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 01b884d25085..a70cae62110e 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.12.3
+version=22.04.1
 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=77a337bea4bf5cac162d09684794edca3e3f6997f30949857ae1b23340b4d62a
+checksum=10b395b52c3a892b32ec5ba6663a85536930cfa751d8d01fafb5429d0083aeab
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 2d8be2b9277c51ef5e307b2f20833ff2dc79e84d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:10 +0200
Subject: [PATCH 2441/2561] dragon-player: update to 22.04.1.

---
 srcpkgs/dragon-player/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index fd0948ebc1c5..d2d506f5c336 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon-player'
 pkgname=dragon-player
-version=21.12.3
+version=22.04.1
 revision=1
 wrksrc="dragon-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.dragonplayer"
 distfiles="${KDE_SITE}/release-service/${version}/src/dragon-${version}.tar.xz"
-checksum=e1bae79adf88ae980a41ff475260c4d6e9f0b04b1f88df44d2bd4ab217e53c26
+checksum=37bd492b88480569a59f74e9788bf7a24cbda5c2153f33c02f8b2b6f7ca9035b

From 10e7dc10a60a8a2c99586b91c5784ca71caab4c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:12 +0200
Subject: [PATCH 2442/2561] elisa: update to 22.04.1.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index db7b9fae4ff9..186af4f1b6f1 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.12.3
+version=22.04.1
 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=8afd7c82af4b4e023bcab3b473997baf5cf7ab4153f497c3b698328706d9e931
+checksum=77bea9ed938ccda42818fc89612c86242e391fba435ba4a48a832404be155e05
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 7832a197387a70067b2346fc443fd7935b9ffc20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:13 +0200
Subject: [PATCH 2443/2561] eventviews: update to 22.04.1.

---
 srcpkgs/eventviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template
index d55340fe660e..63d0a86693ac 100644
--- a/srcpkgs/eventviews/template
+++ b/srcpkgs/eventviews/template
@@ -1,6 +1,6 @@
 # Template file for 'eventviews'
 pkgname=eventviews
-version=21.12.3
+version=22.04.1
 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=828bcb2263f72d931dfd0b74d86f18dcc8afaeb928b3ceeae42dd8ab3963a907
+checksum=ad0814c2bae3536dfd363f0b7bef7fd629944467a5aece0d033e70cb8f0f6e48
 
 eventviews-devel_package() {
 	short_desc+=" - development"

From d436fec464285abcc22cb71350d414b7a56b6094 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:14 +0200
Subject: [PATCH 2444/2561] ffmpegthumbs: update to 22.04.1.

---
 srcpkgs/ffmpegthumbs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template
index 72f6ccaeedd0..0f28d432b1d5 100644
--- a/srcpkgs/ffmpegthumbs/template
+++ b/srcpkgs/ffmpegthumbs/template
@@ -1,6 +1,6 @@
 # Template file for 'ffmpegthumbs'
 pkgname=ffmpegthumbs
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ffmpegthumbs"
 distfiles="${KDE_SITE}/release-service/${version}/src/ffmpegthumbs-${version}.tar.xz"
-checksum=9a9b310eef45990f065449688801f435fbc9e0a936c83e6e307f7e0546bf4f74
+checksum=8c2f7bdccde8f6ee78f8c6fe77cd6d0558fcc0173fb6605f04fddf453c9d7875

From 5141006f54ec44040954daad8dededa9a1933155 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:16 +0200
Subject: [PATCH 2445/2561] filelight: update to 22.04.1.

---
 srcpkgs/filelight/patches/musl.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/filelight/template           |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/patches/musl.patch b/srcpkgs/filelight/patches/musl.patch
index e97ad3ffc1ba..56b36abac39c 100644
--- a/srcpkgs/filelight/patches/musl.patch
+++ b/srcpkgs/filelight/patches/musl.patch
@@ -39,3 +39,29 @@
 -#endif
 -
  #endif
+--- a/src/posixWalker.cpp	2022-05-09 04:52:35.000000000 +0200
++++ -	2022-05-15 17:20:54.296063960 +0200
+@@ -3,6 +3,10 @@
+ 
+ #include "posixWalker.h"
+ 
++#ifndef S_BLKSIZE
++#define S_BLKSIZE 512
++#endif
++
+ static void outputError(const QByteArray &path)
+ {
+     /// show error message that stat or opendir may give
+--- a/autotests/directoryIteratorTest.cpp	2022-05-09 04:52:35.000000000 +0200
++++ -	2022-05-15 17:21:05.992082135 +0200
+@@ -8,6 +8,10 @@
+ #include "directoryIterator.h"
+ #include "test-config.h"
+ 
++#ifndef S_BLKSIZE
++#define S_BLKSIZE 512
++#endif
++
+ class DirectoryIteratorTest : public QObject
+ {
+     Q_OBJECT
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 30e825e0eee5..fa8bade73616 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=434fa7439732905c4655cc376d2c89e86a5fcc5371ee6fda16400917a8e4e587
+checksum=b639aef7f2db474367e38b5ed2faee32b6affc7f78595d8d184e9f909172f91b

From 50398eddfced9473b3dd5eb9272d4e4de4447285 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:17 +0200
Subject: [PATCH 2446/2561] grantleetheme: update to 22.04.1.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index b6db35eedbc5..03bab8a0d8a1 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.12.3
+version=22.04.1
 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=67d9d531e4f326ea4efd40a955c9d2c6e8e54b9a02678dcee4c10b3917d503f1
+checksum=7532503e0a3b090734217db20cc6461140c02cd0d00b85793064724f964e7a2a
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 2873c3248e9a4db19c1b0cbd7a3d337ea6683dbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:19 +0200
Subject: [PATCH 2447/2561] incidenceeditor: update to 22.04.1.

---
 srcpkgs/incidenceeditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template
index 7490da76989f..82cdbe426759 100644
--- a/srcpkgs/incidenceeditor/template
+++ b/srcpkgs/incidenceeditor/template
@@ -1,6 +1,6 @@
 # Template file for 'incidenceeditor'
 pkgname=incidenceeditor
-version=21.12.3
+version=22.04.1
 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=aa278c3710a08622fedb2e38d329947aa03bbe30c4101ec7831ce2fb9ea36ee9
+checksum=832d5332caa888205e1680a6636b31429e77b5a0b0807445234ab74df3936340
 
 do_check() {
 	# failing tests are disabled

From a8cf22531a595762fbed11286d70e3bd382d0cb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:20 +0200
Subject: [PATCH 2448/2561] juk: update to 22.04.1.

---
 srcpkgs/juk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index 08664e3fed32..c83a111c2c56 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
 # Template file for 'juk'
 pkgname=juk
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://juk.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/juk-${version}.tar.xz"
-checksum=9a61b68b9993e1eb9551e1b899f0d4d616b74b5fdf0d9edc40d0a41406e8ffc6
+checksum=a0aeeafedacc9b9569152e334e83c76dcd1dbb9b201664ad52f56371da8b2cb1

From 2aa6bc2f3cae08025424cfdecbd83d55e787516a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:23 +0200
Subject: [PATCH 2449/2561] k3b: update to 22.04.1.

---
 srcpkgs/k3b/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index c2eab8d7964d..3c8c150df561 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
@@ -16,4 +16,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#k3b"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5856d71fd5cf7f14eb646107f76e521869b4ac99df3411257c9f3427267b6504
+checksum=d79037e95c7d567b9e6453f9f6cb72f4d764d43180aa8854ee935a338ed354fb

From 7cc9da2446151fe380974be9a9ffaeef54cde253 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:24 +0200
Subject: [PATCH 2450/2561] kaccounts-integration: update to 22.04.1.

---
 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 7a8b45b2da07..db39510102f4 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=3e5197c1c7ddce92dd5bdcdcc05492f3c63c468e3c1e743c6e747114d34d08b8
+checksum=72ed8df11b396ffaedb5196996ff3101051271432a7347952e19cdfe306144fa
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From 2624ea4ff23101acff0fb92c92ea2de5e1d6a4ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:26 +0200
Subject: [PATCH 2451/2561] kaccounts-providers: update to 22.04.1.

---
 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 09f7d22603b9..5e41147ff956 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=297a55bcfa26379e9501b70f17da238a4ae23fd908b3afaa0052853a1cca0e34
+checksum=b8533965489af122ad8d96d86dea3a0e4f7ff7771e8a1763b9b4b7ef9fb4f056
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 01aa48641c5a09c113b3f01e244a7e7e520966a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:27 +0200
Subject: [PATCH 2452/2561] kaddressbook: update to 22.04.1.

---
 srcpkgs/kaddressbook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template
index 585719896ba2..f396dc86b9c9 100644
--- a/srcpkgs/kaddressbook/template
+++ b/srcpkgs/kaddressbook/template
@@ -1,6 +1,6 @@
 # Template file for 'kaddressbook'
 pkgname=kaddressbook
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ 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=ad02369e61e42b32cd8a302e6510cffb99a20115a83412389e81a6e49b03f8c3
+checksum=c0a467b6de83a07ef6b92aa1ff1f7eea8740185a269aaf5a1656e5439c5ae6d8
 
 kaddressbook-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7e1555d6dfc21f7d91f4edd1dc34a4ae40b4906c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:29 +0200
Subject: [PATCH 2453/2561] kalarm: update to 22.04.1.

---
 srcpkgs/kalarm/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 9a40d89caf48..d7d8bae4232b 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,15 +1,16 @@
 # Template file for 'kalarm'
 pkgname=kalarm
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
  kauth kconfig gettext"
-makedepends="kalarmcal-devel mailcommon-devel messagelib-devel kidletime-devel
- knotifyconfig-devel"
+makedepends="mailcommon-devel messagelib-devel kidletime-devel
+ kcalutils-devel kholidays-devel knotifyconfig-devel"
 short_desc="Personal alarm scheduler"
 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=71cca4083a29d20485612d505b3ab99190722d3948af2cee52111a5263673cd6
+checksum=958106e7c537ee5d006c4bae49d4708eeb8e8a19aa1e8485d1d474feaa478f11
+replaces="kalarmcal>=0"

From 6207b63f816155f643a0a132e76304ffdf08801a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:30 +0200
Subject: [PATCH 2454/2561] kalarmcal: remove package

---
 common/shlibs              |  1 -
 srcpkgs/kalarmcal-devel    |  1 -
 srcpkgs/kalarmcal/template | 26 --------------------------
 3 files changed, 28 deletions(-)
 delete mode 120000 srcpkgs/kalarmcal-devel
 delete mode 100644 srcpkgs/kalarmcal/template

diff --git a/common/shlibs b/common/shlibs
index a95bc3054f14..7607a62859c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -512,7 +512,6 @@ libKF5CalendarSupport.so.5 calendarsupport-17.12.3_1
 libKF5AkonadiNotes.so.5 akonadi-notes-17.12.3_1
 libKPimKDAV.so.5 kdav-5.72.0_1
 libKF5DAV.so.5 kdav-5.72.0_1
-libKF5AlarmCalendar.so.5 kalarmcal-17.12.3_1
 libakonadi-singlefileresource.so.5 kdepim-runtime-17.12.3_1
 libkmindexreader.so.5 kdepim-runtime-17.12.3_1
 libkdexoauth2.so.3 kdepim-runtime-17.12.3_1
diff --git a/srcpkgs/kalarmcal-devel b/srcpkgs/kalarmcal-devel
deleted file mode 120000
index d1b3ef0bb316..000000000000
--- a/srcpkgs/kalarmcal-devel
+++ /dev/null
@@ -1 +0,0 @@
-kalarmcal
\ No newline at end of file
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
deleted file mode 100644
index 7e5cf95394f9..000000000000
--- a/srcpkgs/kalarmcal/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'kalarmcal'
-pkgname=kalarmcal
-version=21.12.3
-revision=1
-build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
- gettext kdoctools kdesignerplugin"
-makedepends="kidentitymanagement-devel kholidays-devel kcalendarcore-devel akonadi5-devel
- kdelibs4support-devel kcalutils-devel"
-short_desc="KAlarm client library"
-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=194f97ee30c8382ac7fd80432e72f04f5db3f3fe4a009ab487c82c014eae1798
-
-kalarmcal-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/qt5/mkspecs
-		vmove "usr/lib/*.so"
-	}
-}

From 121c0a57c7e2cddd88585f4d86885a8d6a2e2873 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:32 +0200
Subject: [PATCH 2455/2561] kapman: update to 22.04.1.

---
 srcpkgs/kapman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapman/template b/srcpkgs/kapman/template
index 4e84c65b75cb..54a19dd74974 100644
--- a/srcpkgs/kapman/template
+++ b/srcpkgs/kapman/template
@@ -1,6 +1,6 @@
 # Template file for 'kapman'
 pkgname=kapman
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kapman"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kapman"
 distfiles="${KDE_SITE}/release-service/${version}/src/kapman-${version}.tar.xz"
-checksum=7318f2de85402da182d630e53890ac0fde78f21b0ef6013b226e533fdef9e4a4
+checksum=730a218d8a2fcd2b7f736b2c3875642ba7fc79590654125ab293d6aeeaafd5a8

From 227e9543b381eb40ba22d277626c0273f1bf25e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:34 +0200
Subject: [PATCH 2456/2561] kblocks: update to 22.04.1.

---
 srcpkgs/kblocks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kblocks/template b/srcpkgs/kblocks/template
index 9ef7a1b7e279..b3a1ce9eb28d 100644
--- a/srcpkgs/kblocks/template
+++ b/srcpkgs/kblocks/template
@@ -1,6 +1,6 @@
 # Template file for 'kblocks'
 pkgname=kblocks
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kblocks"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kblocks"
 distfiles="${KDE_SITE}/release-service/${version}/src/kblocks-${version}.tar.xz"
-checksum=91ae615c64645e7244e436aff487dcff8e6b126bc1d018e6430720cd4d6272d8
+checksum=6d34f530007087db2ab5dcf0fdfab2946d7075008e99696fb5bb2d27ef5df4b5

From 72f3335585795a71d2caa5246132c44a5f8b79af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:35 +0200
Subject: [PATCH 2457/2561] kcachegrind: update to 22.04.1.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index d46aefe7cb9b..3d1915bffa27 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -13,5 +13,5 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=aed09ea5dc01ace24c76ed69edef5111c47f53992ba45896365b53cd3fc8890d
+checksum=5af150fc24f36f67f4c86ccb7a5a85067619685c4639fa905195136e84a7785b
 python_version=2

From f316757d9f3e77a1e9c9fad8d361b8344d29848c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:36 +0200
Subject: [PATCH 2458/2561] kcalc: update to 22.04.1.

---
 srcpkgs/kcalc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalc/template b/srcpkgs/kcalc/template
index 877954b3dfb4..35ff05723e80 100644
--- a/srcpkgs/kcalc/template
+++ b/srcpkgs/kcalc/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalc'
 pkgname=kcalc
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kcalc"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcalc"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalc-${version}.tar.xz"
-checksum=986ca84e82fda9325171a84c8efd7fd4eb2a82e3082af536473db24f33fcd897
+checksum=f4b1db0f7f1185e6060ef86538a1467ed25214d063703997e8b2ae026b65ce26

From 2b811c5c0d610c9804dc0116e9bc65385a551121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:38 +0200
Subject: [PATCH 2459/2561] kcalutils: update to 22.04.1.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 7f4328aeab8b..73f7f360f386 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.12.3
+version=22.04.1
 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=9a35191c4424ed195e697a0601b1e449654b740cd6d72aa85fa845ffe574da00
+checksum=d8ab231623f20d9014d9a77d480b06b4c1639d10d2e122b9e4c2651bfdf8fc6d
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 67d21d83586b4e3acf4725c0159fc4b6d09a0200 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:39 +0200
Subject: [PATCH 2460/2561] kcharselect: update to 22.04.1.

---
 srcpkgs/kcharselect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcharselect/template b/srcpkgs/kcharselect/template
index 81baec03474c..41a89b9994a5 100644
--- a/srcpkgs/kcharselect/template
+++ b/srcpkgs/kcharselect/template
@@ -1,6 +1,6 @@
 # Template file for 'kcharselect'
 pkgname=kcharselect
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons gettext"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kcharselect"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcharselect"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcharselect-${version}.tar.xz"
-checksum=c713581d6d0b300d408208ecb69d9752f6c7ac75f704439070d5099f5cfa51a9
+checksum=69522b00031af8bc564dfcf17472d410683e560a0443e2e41a51370410769c68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools python3 qt5-host-tools qt5-qmake"

From 50037cec2c0385ad61eb51186e57cd76a34884dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:41 +0200
Subject: [PATCH 2461/2561] kcolorchooser: update to 22.04.1.

---
 srcpkgs/kcolorchooser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcolorchooser/template b/srcpkgs/kcolorchooser/template
index be3e0741cc05..65cb65e4ecdd 100644
--- a/srcpkgs/kcolorchooser/template
+++ b/srcpkgs/kcolorchooser/template
@@ -1,6 +1,6 @@
 # Template file for 'kcolorchooser'
 pkgname=kcolorchooser
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons gettext"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://kde.org/applications/en/graphics/org.kde.kcolorchooser"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcolorchooser"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcolorchooser-${version}.tar.xz"
-checksum=fadc3df8e6b47de72681434ecc9370a92fc23cf2aa97c4988b60f524155fd64a
+checksum=f9e78bca7ce4ce3cd1cc4503542d9c7e6753aee0ba4fa5146a3fe09e4b3e32e9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"

From 73a880e83d06b54f3fd7017fd73b7f281333214a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:42 +0200
Subject: [PATCH 2462/2561] kcron: update to 22.04.1.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 636aad34dab9..8568a91546c5 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d8ace47c86633ba677b64c765efe0b6f3de27cb75c17ae2434c498b07f3c0648
+checksum=550e736e2d21c72bd83dbfb6b7d3bd435bc40bb7ff7b3d2de4ea0382fe98e595

From 7a8c16d7d0a7b33a592b1b397637314e85fb958e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:43 +0200
Subject: [PATCH 2463/2561] kdeconnect: update to 22.04.1.

---
 common/shlibs               | 6 +++---
 srcpkgs/kdeconnect/template | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7607a62859c1..829d4007b3d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3179,9 +3179,9 @@ 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.21 kdeconnect-21.03.80_1
-libkdeconnectcore.so.21 kdeconnect-21.03.80_1
-libkpmcore.so.11 kpmcore-21.03.80_1
+libkdeconnectinterfaces.so.22 kdeconnect-22.04.1_1
+libkdeconnectcore.so.22 kdeconnect-22.04.1_1
+libkpmcore.so.12 kpmcore-22.04.1_1
 libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
 libr_core.so.5.6.8 radare2-5.6.8_1
 libr_config.so.5.6.8 radare2-5.6.8_1
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index a7b4fcf1e5b3..1f48792b51ca 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.12.3
+version=22.04.1
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
@@ -19,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=8fc84f22ad5fa1371a109679f283baaf8728c05a92b9a6f36629b8f8d9a933d9
+checksum=6dd9ba48bb80ba607e73097bf05fb8d914f3ccc1d10f8ea8e279a918c2b0a57a
 python_version=3

From 52a9cb634cb1bff3623b9a16515716b3c130198c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:45 +0200
Subject: [PATCH 2464/2561] kdegraphics-mobipocket: update to 22.04.1.

---
 srcpkgs/libqmobipocket                           |  1 -
 srcpkgs/libqmobipocket-devel                     |  2 +-
 .../template                                     | 16 +++++-----------
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/libqmobipocket
 rename srcpkgs/{kdegraphics-mobipocket => libqmobipocket}/template (72%)

diff --git a/srcpkgs/libqmobipocket b/srcpkgs/libqmobipocket
deleted file mode 120000
index b58879252b9f..000000000000
--- a/srcpkgs/libqmobipocket
+++ /dev/null
@@ -1 +0,0 @@
-kdegraphics-mobipocket
\ No newline at end of file
diff --git a/srcpkgs/libqmobipocket-devel b/srcpkgs/libqmobipocket-devel
index b58879252b9f..5b1b2b17ef7b 120000
--- a/srcpkgs/libqmobipocket-devel
+++ b/srcpkgs/libqmobipocket-devel
@@ -1 +1 @@
-kdegraphics-mobipocket
\ No newline at end of file
+libqmobipocket
\ No newline at end of file
diff --git a/srcpkgs/kdegraphics-mobipocket/template b/srcpkgs/libqmobipocket/template
similarity index 72%
rename from srcpkgs/kdegraphics-mobipocket/template
rename to srcpkgs/libqmobipocket/template
index 13f0ad0fbde7..eb665365282a 100644
--- a/srcpkgs/kdegraphics-mobipocket/template
+++ b/srcpkgs/libqmobipocket/template
@@ -1,7 +1,8 @@
-# Template file for 'kdegraphics-mobipocket'
-pkgname=kdegraphics-mobipocket
-version=21.12.3
+# Template file for 'libqmobipocket'
+pkgname=libqmobipocket
+version=22.04.1
 revision=1
+wrksrc="kdegraphics-mobipocket-${version}"
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="kio-devel"
@@ -11,14 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics-mobipocket"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdegraphics-mobipocket"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-mobipocket-${version}.tar.xz"
-checksum=58c4dc769972a1472a9cfe1d134a77a12e9a78357829247d247aa73bc8e83124
-
-libqmobipocket_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-	}
-}
+checksum=e7e31efa63d478b049aca107bf8fd9731fcc357b67fdc62dab3f3307f4d41f5d
 
 libqmobipocket-devel_package() {
 	short_desc+=" - development files"

From 44e066a491d3841fe0b7b12eea2f895772b62d76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:46 +0200
Subject: [PATCH 2465/2561] kdegraphics-thumbnailers: update to 22.04.1.

---
 srcpkgs/kdegraphics-mobipocket            |  1 +
 srcpkgs/kdegraphics-thumbnailers/template | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/kdegraphics-mobipocket

diff --git a/srcpkgs/kdegraphics-mobipocket b/srcpkgs/kdegraphics-mobipocket
new file mode 120000
index 000000000000..3c1f23ee29e1
--- /dev/null
+++ b/srcpkgs/kdegraphics-mobipocket
@@ -0,0 +1 @@
+kdegraphics-thumbnailers
\ No newline at end of file
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 7419cd1f4de8..a4d121047967 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,14 +1,20 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
-makedepends="qt5-devel kio-devel libkexiv25-devel"
+makedepends="qt5-devel kio-devel libkexiv25-devel libqmobipocket-devel"
 depends="ghostscript"
 short_desc="KDE Plasma 5 Thumbnailers for various graphics file formats"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=0379a413575705c6ea412aca00c8488f3ae895f9c8d799258a449c600dcd0d6a
+checksum=1706ae5b009cd79c95674ed8fdfb48f6206948cdd280b59074ce7f55b29c19f9
+
+kdegraphics-mobipocket_package() {
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+	build_style=meta
+}

From ceae5910104e887d4be53984c732311f0ea4b95c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:48 +0200
Subject: [PATCH 2466/2561] kdepim-addons: update to 22.04.1.

---
 srcpkgs/kdepim-addons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template
index 18142a0233e5..3bac99179a3f 100644
--- a/srcpkgs/kdepim-addons/template
+++ b/srcpkgs/kdepim-addons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-addons'
 pkgname=kdepim-addons
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 kdoctools kcoreaddons
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-late
 homepage="https://invent.kde.org/pim/kdepim-addons"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdepim-addons"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d0909026abf6aabbbf6720cb91120e2df955db2f5c50117e019db1243e4067df
+checksum=ae44004d989328a21476d3226a79c2a39667cd3bc820b779a83adb604df1af64
 
 do_check() {
 	# failing tests are disabled

From 386c9b116f3416a30369a1aaba36b339e73f4d96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:49 +0200
Subject: [PATCH 2467/2561] kdepim-runtime: update to 22.04.1.

---
 srcpkgs/kdepim-runtime/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 4ab89aad0dae..5f5cc4ff8627 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,21 +1,21 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
 hostmakedepends="extra-cmake-modules python3 kdoctools kdesignerplugin
  gettext qt5-qmake qt5-host-tools"
 makedepends="akonadi-calendar-devel akonadi-notes-devel knotifyconfig-devel
- pimcommon-devel kdav-devel libkgapi-devel kalarmcal-devel kmbox-devel
+ pimcommon-devel kdav-devel libkgapi-devel kmbox-devel
  qt5-networkauth-devel qca-qt5-devel qt5-webengine-devel
- qt5-webchannel-devel"
+ kholidays-devel qt5-webchannel-devel"
 short_desc="KDE PIM runtime applications/libraries"
 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=f5b00a947cd74a39ee18d61dbfbc59b9b8b5137b52674bb42905d89d98b519aa
+checksum=b5fb61f475ce441a9db5b8258b1cb510b26391d95d95a960305250f569fb903f
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From 70aa4d68058e73255131135279920ffe46e7d80e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:51 +0200
Subject: [PATCH 2468/2561] kdevelop-php: update to 22.04.1.

---
 srcpkgs/kdevelop-php/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdevelop-php/template b/srcpkgs/kdevelop-php/template
index e3a2875e174f..88a48aaf7f7d 100644
--- a/srcpkgs/kdevelop-php/template
+++ b/srcpkgs/kdevelop-php/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop-php'
 pkgname=kdevelop-php
-version=21.12.3
+version=22.04.1
 revision=1
 wrksrc="kdev-php-${version}"
 build_style=cmake
@@ -16,4 +16,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kdevelop.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdev-php"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdev-php-${version}.tar.xz"
-checksum=4a85438a51bf6e3faedca3f64c2ffd08355d20fd4214c12fe010f003f5c3b17c
+checksum=5e40d2412accda564b56710eea25c165c776b0146449b1d79b45751c97ffbbb3

From e07615396906d9daaf29f4272230017eafdb31f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:53 +0200
Subject: [PATCH 2469/2561] kdevelop: update to 22.04.1.

---
 common/shlibs             | 30 +++++++++++++++---------------
 srcpkgs/kdevelop/template |  4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 829d4007b3d3..0fbd5ba82cce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2680,21 +2680,21 @@ libvidstab.so.1.1 libvidstab-1.1.0_1
 libxdo.so.3 xdotool-3.20150503.1_1
 libabigail.so.0 libabigail-1.0.rc3_1
 libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1
-libKDevCMakeCommon.so.35 kdevelop-21.12.2_1
-libKDevClangPrivate.so.35 kdevelop-21.12.2_1
-libKDevCompileAnalyzerCommon.so.35 kdevelop-21.12.2_1
-libKDevPlatformDebugger.so.57 kdevelop-21.12.2_1
-libKDevPlatformDocumentation.so.57 kdevelop-21.12.2_1
-libKDevPlatformInterfaces.so.57 kdevelop-21.12.2_1
-libKDevPlatformLanguage.so.57 kdevelop-21.12.2_1
-libKDevPlatformOutputView.so.57 kdevelop-21.12.2_1
-libKDevPlatformProject.so.57 kdevelop-21.12.2_1
-libKDevPlatformSerialization.so.57 kdevelop-21.12.2_1
-libKDevPlatformShell.so.57 kdevelop-21.12.2_1
-libKDevPlatformSublime.so.57 kdevelop-21.12.2_1
-libKDevPlatformTests.so.57 kdevelop-21.12.2_1
-libKDevPlatformUtil.so.57 kdevelop-21.12.2_1
-libKDevPlatformVcs.so.57 kdevelop-21.12.2_1
+libKDevCMakeCommon.so.36 kdevelop-22.04.1_1
+libKDevClangPrivate.so.36 kdevelop-22.04.1_1
+libKDevCompileAnalyzerCommon.so.36 kdevelop-22.04.1_1
+libKDevPlatformDebugger.so.58 kdevelop-22.04.1_1
+libKDevPlatformDocumentation.so.58 kdevelop-22.04.1_1
+libKDevPlatformInterfaces.so.58 kdevelop-22.04.1_1
+libKDevPlatformLanguage.so.58 kdevelop-22.04.1_1
+libKDevPlatformOutputView.so.58 kdevelop-22.04.1_1
+libKDevPlatformProject.so.58 kdevelop-22.04.1_1
+libKDevPlatformSerialization.so.58 kdevelop-22.04.1_1
+libKDevPlatformShell.so.58 kdevelop-22.04.1_1
+libKDevPlatformSublime.so.58 kdevelop-22.04.1_1
+libKDevPlatformTests.so.58 kdevelop-22.04.1_1
+libKDevPlatformUtil.so.58 kdevelop-22.04.1_1
+libKDevPlatformVcs.so.58 kdevelop-22.04.1_1
 libts.so.0 tslib-1.6_1
 libobs.so.0 obs-0.14.1_2
 libobsglad.so.0 obs-0.14.1_2
diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template
index 010185849d80..8dee78d9f0c0 100644
--- a/srcpkgs/kdevelop/template
+++ b/srcpkgs/kdevelop/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop'
 pkgname=kdevelop
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.kdevelop.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdevelop"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdevelop-${version}.tar.xz"
-checksum=86f36502559675aaae2afc8f2d649ee29997cd75a32116acf63e9edce94717ea
+checksum=22f3f50d2d484c821ca39f66f953d61a7f77e596ce9d38b552a721f48366cdd8
 
 build_options="webengine"
 desc_option_webengine="Use Qt5 WebEngine for documentation"

From 7facd5d4b224919c58a00d3635fe67b445764123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:55 +0200
Subject: [PATCH 2470/2561] kdialog: update to 22.04.1.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 64efbaad5e8b..5da6a6f830ef 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=ac47479b576b87e8a82d62f4b685941b6ab54a44a06391c4c0762db159930589
+checksum=95933b853cfc053c6881e27be945c96419a138994a57a28cf8dddab866de1763

From 0cc339ee38f3a0aef686febd19f6be34c93ab1fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:56 +0200
Subject: [PATCH 2471/2561] keditbookmarks: update to 22.04.1.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 5291ab00f990..0ed901f95aa3 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=d6daabf60acec49cac1401da1019f965a96e8fd41b967694b2c8fd6723b87327
+checksum=c22b7649f0779cc51f64ac2dca95174b8e41da2b54f65cef02290ae021413d2e

From 5984257103d8175f6f4a58fdc9e561f440f28e58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:57 +0200
Subject: [PATCH 2472/2561] kfind: update to 22.04.1.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 06de53b604a9..d722b800a4a6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=5133cad0be64fb3fc3f9666b01b4cff8141016f31c244ed39a3e21fc298b6935
+checksum=ac92abee62045f7eb97aaf12b6f8e272e3b066681f6b0f07976a5f456d9639d7

From fd3ec64174ac1ee4c8e148518c4668f49d91e005 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:59 +0200
Subject: [PATCH 2473/2561] kget: update to 22.04.1.

---
 srcpkgs/kget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template
index 619e663138b2..cdf9e98935f3 100644
--- a/srcpkgs/kget/template
+++ b/srcpkgs/kget/template
@@ -1,6 +1,6 @@
 # Template file for 'kget'
 pkgname=kget
-version=21.12.3
+version=22.04.1
 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=9460f6890e66b252bc8cad5414e0aaf2d0d48070bddb1aec61ea90fff74b44f0
+checksum=2de3cd0cf8d1f4b2a54240b7c4e514acf5388b4573e7502c27dc7266c5d81bed

From 5744bbef9b5b287df81135483eec713425d36371 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:01 +0200
Subject: [PATCH 2474/2561] kgpg: update to 22.04.1.

---
 srcpkgs/kgpg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgpg/template b/srcpkgs/kgpg/template
index 8487622df3ed..f837f1e425d6 100644
--- a/srcpkgs/kgpg/template
+++ b/srcpkgs/kgpg/template
@@ -1,6 +1,6 @@
 # Template file for 'kgpg'
 pkgname=kgpg
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext
@@ -18,4 +18,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/utilities/org.kde.kgpg"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kgpg"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=632bcf685fc9604ecc09933d0257533fd208177abba75bc14c853cdec91bf8d7
+checksum=c5bf5d77538bbb8a7ee6bd1b39cacc71fe67a7d7395799c47c75d57ae018ec35

From 150ea1e5d2c26159ef8618dd29236d9fdd629c0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:02 +0200
Subject: [PATCH 2475/2561] kidentitymanagement: update to 22.04.1.

---
 common/shlibs                        | 1 +
 srcpkgs/kidentitymanagement/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0fbd5ba82cce..ee2395bc2b07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3230,6 +3230,7 @@ libKF5AkonadiWidgets.so.5 akonadi5-17.12.0_1
 libKF5AkonadiXml.so.5 akonadi5-17.12.0_1
 libKF5PimTextEdit.so.5 kpimtextedit-17.12.0_1
 libKF5IdentityManagement.so.5 kidentitymanagement-17.12.0_1
+libKF5IdentityManagementWidgets.so.5 kidentitymanagement-22.04.0_1
 libKChart.so.2 kdiagram-2.6.0_1
 libKGantt.so.2 kdiagram-2.6.0_1
 libscrypt.so.0 libscrypt-1.21_1
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 4629eb5dc285..981eae91032c 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.12.3
+version=22.04.1
 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=64e698618d4384fa98512d208776eb94abc2aa514356f162950546882bddbca3
+checksum=746a01e43dae1841ec412257f64cc25dd19139403e9119ff746882883ac80738
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From 17778e331039ccd4b6ebb3f8a01cc72fe040219a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:04 +0200
Subject: [PATCH 2476/2561] kig: update to 22.04.1.

---
 srcpkgs/kig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 3f291745d311..6fa9a2b95ef3 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kig"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=6dd9e280e3f0bca4c900f9fd8ef2e138eb8f1b021adf4ffe4e29804adddc7965
+checksum=850c826c9823e3abaff4504c03874755565e2d6732982b4bdffcccedd841e2e3

From ba7ba24a261d40d3e08bc9c659dee63bdc929e49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:05 +0200
Subject: [PATCH 2477/2561] kimap: update to 22.04.1.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index 8557da8b5f25..81987d3bab3c 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=fd96fa20b465ea442df960b57f5c27640e452b92d099a1f11bd051b7e74f4d86
+checksum=743f7e5b089233654467811008c7b8d4f9d697e26661c5aef2751733c02e2465
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From 6555b3d374eba35bad3bff8af1d1d5729a41ec70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:07 +0200
Subject: [PATCH 2478/2561] kio-gdrive: update to 22.04.1.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index d1e301180476..dba5da596c91 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9f910baa87f707d1f28c9da5d3f1b104b992f7c7b3ca2ca532cb3646d92c84ec
+checksum=06160b034bce0fb29205e8d201a337129010b53137b00ebe30dd596045350b8b

From 81826af3ab72b1ec07ff5a97b38c854607e95187 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:08 +0200
Subject: [PATCH 2479/2561] kitinerary: update to 22.04.1.

---
 .../temporarily-disable-broken-test.patch        | 16 ----------------
 srcpkgs/kitinerary/template                      |  4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch

diff --git a/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch b/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch
deleted file mode 100644
index 4e7bb1ce88bd..000000000000
--- a/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Temporarily disable the calendarhandler test.
-This test has been fixed upstream, so this should be able to be
- removed in the next release.
-
-diff -Naur a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
---- a/autotests/CMakeLists.txt	2022-04-18 11:34:57.356111303 -0700
-+++ b/autotests/CMakeLists.txt	2022-04-18 11:33:56.175938220 -0700
-@@ -35,7 +35,7 @@
- ecm_add_test(postprocessortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
- ecm_add_test(extractorvalidatortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
- if (TARGET KF5::CalendarCore)
--    ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
-+   #ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
-     ecm_add_test(extractortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary KPim::PkPass)
- endif()
- ecm_add_test(documentutiltest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index aa5ad07fe219..343ef64911d6 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,6 +1,6 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kitinerary"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b15f8aac50ac7eaf2fc23e40c7a165283e99844f88d96cb2a45face8a3cc8c4d
+checksum=306a74c9be1b37dbba7e6876d81426b01af52f80ef139087949042bcc6956b7a
 
 kitinerary-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ce21f4eb7d5079fa523be10085f6ef179c4542e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:09 +0200
Subject: [PATCH 2480/2561] kldap: update to 22.04.1.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index e5eeb67963d9..b71d9ef2e341 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=0abce0ebca12a6ee71e6b93a727579d20900fdbc750f059283dbd1d4a1d3948e
+checksum=0bd291d6b2695e97813c00203c94a0d76f19d0898ab7ab70f0a7c59a10d806dc
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 954ec62fc7308108f72c748a31c64d9ae9988289 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:11 +0200
Subject: [PATCH 2481/2561] kleopatra: update to 22.04.1.

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 4edaad7b4fc7..8d6f461297bd 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9a4ad9c602d557c0547d47229def661749bfe213a34992ec8d18e88c410dc681
+checksum=d30e6335b78c6fce6ad22e5482032d0f8a02740b46fe9fdc3263d39ceaeaae23
 
 do_check() {
 	dbus-run-session ninja -C build test

From 92ddfe8160a5dbd576bf488cb8f55961ce152594 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:12 +0200
Subject: [PATCH 2482/2561] kmag: update to 22.04.1.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index a68adf873813..08027cfdcac0 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=e65aaaa3e480c215384bae721afb36d7e50a7f8ab27aa4013eb46de1f43d97af
+checksum=ff2341c12d3f4eeced74339912079120266a3830451e8486a810ffedf2e3316a

From c2a905c351dabb42a96a039e741b4ccf99ab78c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:14 +0200
Subject: [PATCH 2483/2561] kmail-account-wizard: update to 22.04.1.

---
 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 39c89a1b2607..d3dbeca761e3 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.12.3
+version=22.04.1
 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=ef9227b88d842cb52bd6f96a1a5dd30fbfbc6377074cb56e745ac7b84dcd222b
+checksum=d3253e6395e27ef42904b50b8cd7abcc6797351efcf54d45b3ce12b41bba2f85

From 2c2e4d830dd702f927ba5288738a9cc99e52278b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:16 +0200
Subject: [PATCH 2484/2561] kmail: update to 22.04.1.

---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index e75cd76144a9..054659f11f82 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.12.3
+version=22.04.1
 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=e023a8ced8bc6ea5fe40bc30a0a803812c04ce0245f0e8a5612d42711c33d0ce
+checksum=a44043a7c293981494ad5552db29f5aff1d8859013352c96791ccae3d15e93e8

From b22b9420185a768d49a292d9789b356c830cf1a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:17 +0200
Subject: [PATCH 2485/2561] kmailtransport: update to 22.04.1.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 51dbdef1525a..679f7343fd81 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=26ba38d87c0072f448d63966cab31914903c7dfa73817846d2d1a8808e7e7750
+checksum=8f1dc26f0dad28e81bce0f8ade3d83c811841bdb56a9b982032b1a233725add2
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 484d55ad48cb16aa605ad81d3efc91165d9d746b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:19 +0200
Subject: [PATCH 2486/2561] kmbox: update to 22.04.1.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index bc35b8709de9..a6dade4ca180 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.12.3
+version=22.04.1
 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=19731646fccea7f1615e7b0a6d2a1682e6afdf444ff74a6d40f6a821e1149411
+checksum=91b89f23b98a1a86fbf25bac17318364241a05c5601d20bce7b4fdced6af2691
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From dc9c0a575d2c9acee5e4e2fd026d1b96b97e6b0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:20 +0200
Subject: [PATCH 2487/2561] kmime: update to 22.04.1.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index dd6b7a36145f..c783cf4a865c 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.12.3
+version=22.04.1
 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=fc5a1b86a18c0b0ef67759e3813cb49b3286b101f8494ce0497737ee29a1470f
+checksum=a7f94a60d204f7546a711551feafb05549caf25d5831ecb9942cad32caddca05
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From ee56629b996e50731a4bc7d877603ef09a0478bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:22 +0200
Subject: [PATCH 2488/2561] kmines: update to 22.04.1.

---
 srcpkgs/kmines/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmines/template b/srcpkgs/kmines/template
index fc5f71db232d..bfdd1048c312 100644
--- a/srcpkgs/kmines/template
+++ b/srcpkgs/kmines/template
@@ -1,6 +1,6 @@
 # Template file for 'kmines'
 pkgname=kmines
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kmines"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmines"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmines-${version}.tar.xz"
-checksum=8cbef528fdffd990cbaa3836ac8c23aa591e88c33942e9badd7c8cf33d03bef3
+checksum=4450fadd3155108e25b308c86b1a5ef82d1080340369ba90528f025abb4f9de5

From 6b33104e005c0d1f4fc235b0d1c2f86295d17a10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:23 +0200
Subject: [PATCH 2489/2561] kmix: update to 22.04.1.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index e4bf7c548be8..34b494824b39 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=3f41a53cb7033fde10ae92b693a6b84c0da045e570e83136dbc659afa89e5e7a
+checksum=5cb779f8c899025d32893913ef5c7b54cb9091b20a7712a161a9ae309b1a8eba

From 5afe6c49be3ba107cb9e11690931bfbeb93d664b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:25 +0200
Subject: [PATCH 2490/2561] knights: update to 22.04.1.

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 40ccaef520dc..80992e62ff76 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.12.3
+version=22.04.1
 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=a4138f8ae91e587a749f930064fecb62d9eb210671977ac8e083b76cc28b4bd4
+checksum=5296758dbaf431283002ba1f5e6262c1835a78710ff339f1391637f88f470e05

From 873c01b1282b20c979806556cc45927e4960b850 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:26 +0200
Subject: [PATCH 2491/2561] knotes: update to 22.04.1.

---
 srcpkgs/knotes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index a19c79190bd3..0acc654ef0c0 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,6 +1,6 @@
 # Template file for 'knotes'
 pkgname=knotes
-version=21.12.3
+version=22.04.1
 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://apps.kde.org/knotes/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a721328deea314066352a92bf99c22163cd7eb1f10f4d36b893d78cdb102f21e
+checksum=41b46d073bfa312bd69675d99d7b5b290ddf9d59c1ac21c0ff758c9674742ac0

From 590782ce722e81e0e07f0ccef32b73e2daa7cb65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:28 +0200
Subject: [PATCH 2492/2561] kolourpaint: update to 22.04.1.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 5a81652e6b04..f717108dd44f 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=aeb2e439f32d9b1d7556e807c0902c870b90691f84764266e3f7fd92af5d9163
+checksum=4d5096c7e40a592583f597ff388b3bc7c64e5b75f1b12e73b18e4bd7b777afeb
 
 post_install() {
 	vlicense COPYING

From ec8daccaf6a4cd202b82d299a92dab91ce7c063c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:30 +0200
Subject: [PATCH 2493/2561] kompare: update to 22.04.1.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 457830d20119..812edd32644a 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=e2e0ee484b2eb098d9315ea26a0b68abce64ae02572baab998a5711f609c018d
+checksum=15fc7e13926dd0a994f50edc5b4ff17d7564f2f0781598a2106f6edb8bac534e

From 940e2a1a0216511f3497676822493176123471f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:32 +0200
Subject: [PATCH 2494/2561] konqueror: update to 22.04.1.

---
 srcpkgs/konqueror/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template
index 95df07305792..a8c83ec4e0c8 100644
--- a/srcpkgs/konqueror/template
+++ b/srcpkgs/konqueror/template
@@ -1,6 +1,6 @@
 # Template file for 'konqueror'
 pkgname=konqueror
-version=21.12.3
+version=22.04.1
 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=fd8e66566ac926dbbdf701fcaa3ff154b857d72f033df75ee9d75260c3c17f7c
+checksum=2744e2eaab3ebbd8949699cccfd6f849376b10b8a0f9cef00249207701e947ef
 
 do_check() {
 	:

From 4f435705d5c502561f65a4d75f4480aa40d88641 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:34 +0200
Subject: [PATCH 2495/2561] konquest: update to 22.04.1.

---
 srcpkgs/konquest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konquest/template b/srcpkgs/konquest/template
index 7005b60793a5..b241cd02d7c7 100644
--- a/srcpkgs/konquest/template
+++ b/srcpkgs/konquest/template
@@ -1,6 +1,6 @@
 # Template file for 'konquest'
 pkgname=konquest
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kdoctools
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.konquest"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konquest"
 distfiles="${KDE_SITE}/release-service/${version}/src/konquest-${version}.tar.xz"
-checksum=00793a5a0e9a88f7de2003ee620a65d7689221dbf731c21b113d83a313862a53
+checksum=b901d71ce47fe86c26e92e7d965002371cabc93a802d84cf23fa77e94de45265

From 49ff85e33959f5a91ae87c28f10d928459110047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:35 +0200
Subject: [PATCH 2496/2561] kontact: update to 22.04.1.

---
 srcpkgs/kontact/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontact/template b/srcpkgs/kontact/template
index cdf7623d3285..0736368c0ff3 100644
--- a/srcpkgs/kontact/template
+++ b/srcpkgs/kontact/template
@@ -1,6 +1,6 @@
 # Template file for 'kontact'
 pkgname=kontact
-version=21.12.3
+version=22.04.1
 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=20b923182a5ea30540bb8ce6db0883d07434d0f3490f8ac80354654ac93ae19a
+checksum=962321abcf6d1f1aeed2368b98159e8afab0f71eef4c81ae7ce48c6267b479a6

From e4bbbbd43d7370c19829c59a880d939525808c18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:36 +0200
Subject: [PATCH 2497/2561] kontactinterface: update to 22.04.1.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 57fb764a3bd6..fd38bf901eda 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.12.3
+version=22.04.1
 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=e8b0408b7e634e9802ae81caaba3e154a5474a5bfc0c1981386dccb508069de3
+checksum=a30ab91e4b38c691ef5e7f4b81dddb318ec6006faf5cb4a44823bd0ed618ca6b
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 52108a6f1bc503d85e12313357792abf751a1ad6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:38 +0200
Subject: [PATCH 2498/2561] konversation: update to 22.04.1.

---
 srcpkgs/konversation/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 5358aed5c724..a6934f6f1977 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,6 +1,6 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
@@ -13,5 +13,5 @@ license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=f89c3854edd6dabcceff7a3615b532ac34d5b4769be1e125789e41d67e7f9b8a
+checksum=d1b3f3ce151f0cc6a6ed566658ea24120e6b8539e35a15b20620b0b6c50efebf
 python_version=3

From 514428dfeb03b9df3f1fc6c8183a25fa581af772 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:40 +0200
Subject: [PATCH 2499/2561] korganizer: update to 22.04.1.

---
 srcpkgs/korganizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/korganizer/template b/srcpkgs/korganizer/template
index 1787addb124f..40b1223a296d 100644
--- a/srcpkgs/korganizer/template
+++ b/srcpkgs/korganizer/template
@@ -1,6 +1,6 @@
 # Template file for 'korganizer'
 pkgname=korganizer
-version=21.12.3
+version=22.04.1
 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=19c02adddade1a398fe77e30d56f03a4cb0433598e4212793d603734f4f7571c
+checksum=594ce6973ff95d278f546db012deac6dc454cecc05b92e499eaac88716d45534

From 3394091fe8a5010c9fc87643789fd3239f1fff49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:42 +0200
Subject: [PATCH 2500/2561] kpat: update to 22.04.1.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index e3d3d8d5ad3b..63cb7a7b143e 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -14,4 +14,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=275e2e4508980dbc53bd598c7abd05a21dd5c50b255e750436639cc75f67a44d
+checksum=ea9938aa038467e1f5c3356e9e6dd09cf394e6887a69a573ffd4d5d76d11a1f1

From a7126ec1a1bc2f1c907288f9c3d54e8f75c3c553 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:43 +0200
Subject: [PATCH 2501/2561] kpimtextedit: update to 22.04.1.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index e838f5d3ac54..f1f6c3dac9aa 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.12.3
+version=22.04.1
 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=54f3e7bea55e051240a7b328553eb43131e6c0ce33bf67eb0e28decae4c219a6
+checksum=f6cedefcc351069e01d0f3f15d4eaefe0ecb2865aaab3e17811af54a39f9bfc7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 01f212344b1acca7aa88c9b93f5bcbec1d128d27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:44 +0200
Subject: [PATCH 2502/2561] kpkpass: update to 22.04.1.

---
 srcpkgs/kpkpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpkpass/template b/srcpkgs/kpkpass/template
index c615112cdcea..8869dac35bf9 100644
--- a/srcpkgs/kpkpass/template
+++ b/srcpkgs/kpkpass/template
@@ -1,6 +1,6 @@
 # Template file for 'kpkpass'
 pkgname=kpkpass
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools shared-mime-info"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpkpass"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=678e79e450c5859d53c436ab991f4eadffd742dad129e4254953b98e2944c815
+checksum=5e5cadca3951f7e3439713f295d549e0ab2f5e4a013c604fb9a703ea9e99411d
 
 kpkpass-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 28993a4f83899c5217444a5dc4b018825f0d7ad5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:46 +0200
Subject: [PATCH 2503/2561] kpmcore: update to 22.04.1.

---
 srcpkgs/kpmcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpmcore/template b/srcpkgs/kpmcore/template
index cf275bae79cd..b78ba2611391 100644
--- a/srcpkgs/kpmcore/template
+++ b/srcpkgs/kpmcore/template
@@ -1,6 +1,6 @@
 # Template file for 'kpmcore'
 pkgname=kpmcore
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/system/org.kde.partitionmanager"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpmcore"
 distfiles="${KDE_SITE}/release-service/$version/src/$pkgname-$version.tar.xz"
-checksum=6ad7a6d04a1c28bca9e934a3d7664fcb91069f841a8292208764ff4eca5300a6
+checksum=70d043cc125bd040d6b2af091e3a038d1780702fa327cda070300e94027c64f8
 
 if [ -n "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From f06c7c4651de8d8386c493342ebd80849a469519 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:47 +0200
Subject: [PATCH 2504/2561] kqtquickcharts: update to 22.04.1.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 54a784cecaad..7c78e719d727 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.12.3
+version=22.04.1
 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=b9f6ee7a7028c29b43729028e4d78ed043f0acb3c40b4405108010eb3e62893e
+checksum=e85918af3a24aaedcabe9ba47c31cc50fd3227dc95ffd1d1a6dc2d1394e62c2c
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 311a2028d4595879babd78d141f9beb4ae1b34b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:49 +0200
Subject: [PATCH 2505/2561] krdc: update to 22.04.1.

---
 srcpkgs/krdc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krdc/template b/srcpkgs/krdc/template
index 95ad42e261aa..eaa9d65e8aa4 100644
--- a/srcpkgs/krdc/template
+++ b/srcpkgs/krdc/template
@@ -1,6 +1,6 @@
 # Template file for 'krdc'
 pkgname=krdc
-version=21.12.3
+version=22.04.1
 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=12088c5881c66897e698477d813cb5fa31f221b55cab74c53e94b6ba294bd726
+checksum=ff233533b9f4381262633f5d390cfbe00bd9b36f4a784210068ba5998b2a8f31
 
 krdc-devel_package() {
 	short_desc+=" - development files"

From b617e7bb3ce166ac97bbcb671ea7a4ea067ea6f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:50 +0200
Subject: [PATCH 2506/2561] krfb: update to 22.04.1.

---
 srcpkgs/krfb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 795ecb6b26ea..4128d7ed1c91 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -16,4 +16,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=16ec7684243d9488380abd621edf5dd6916a45a097fe780705b1a32fe0de14e5
+checksum=777b12e7abff962aad997377ffb377f46382d5f7265242a8e9643dcb2c1f0401

From ade0f16b1c44c3565d490533dea7b97479ee6a60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:51 +0200
Subject: [PATCH 2507/2561] kruler: update to 22.04.1.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 8c70ce207278..5446477eae29 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=f4f189b606813fb2f42e40f7664adafafdcd210e474909b9e93ff30eba18cd45
+checksum=f7848cac9c7a3c6c3d03edc90dc78ff7df97a1beff374e469419f9ca4112e16e

From 2535f7d7bb6d032884692679497b22638e745bd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:53 +0200
Subject: [PATCH 2508/2561] ksmtp: update to 22.04.1.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 068a3a0db671..dc0ce4c75fde 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.12.3
+version=22.04.1
 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=22da5a72c957d8a38d7b5792013edaa826da8d41eeba30db66ece9f0f42bbe4d
+checksum=f445692c54310c737d6afffeb8a2ce9d6c17164ca6145fc7f983f8adfe79f458
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 253830688dc9bca5d611c8612694a6c4d11111bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:54 +0200
Subject: [PATCH 2509/2561] ksystemlog: update to 22.04.1.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 53c40ccabd7c..e342cd165a96 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=25525e28756928ddb014ccec6f352c7378473ad417971608989818484b2847a4
+checksum=d761a1e42d02479311bbe6a57724a2db5c9011615a8ce83813fe63fa9822eb36

From 9586f282f9ec9bfdc0edee780a4a5b0a703ed907 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:56 +0200
Subject: [PATCH 2510/2561] kteatime: update to 22.04.1.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index dc8dbc935798..e4df7b1d71fd 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=f3098313f7df6de082490c11ae6f840d3f73d2c3be22fb56d4bb0c15baf81df6
+checksum=d5bf75bdc3cafe4b7dc9b4ddff9baacf0f7f903d2a97fa45abf7739b9588655b

From 8baa96fa95b92acf8c2babda1eac0a58ebd82d5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:57 +0200
Subject: [PATCH 2511/2561] ktnef: update to 22.04.1.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index fb8003e8f7f9..ab3214a40e68 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.12.3
+version=22.04.1
 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=d496cc88668646b9b4c13a07de26e1e82bd5dec973737001717d52856c48c9c6
+checksum=8938f4940ef6c65c67da761d1fe6e17bbcf36b37c4704bf6fff0f105258af6e6
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 018cbf23351c33c37dbad15a627464ebcb2e62ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:59 +0200
Subject: [PATCH 2512/2561] ktorrent: update to 22.04.1.

---
 srcpkgs/ktorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktorrent/template b/srcpkgs/ktorrent/template
index bf45561f7890..48c693f7284f 100644
--- a/srcpkgs/ktorrent/template
+++ b/srcpkgs/ktorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'ktorrent'
 pkgname=ktorrent
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEM_GEOIP=ON"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/internet/ktorrent"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ktorrent"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktorrent-${version}.tar.xz"
-checksum=ed97d2d4b58c8305cac04067988514442711447215d7e255816d92b918363d08
+checksum=f359d69fd8fd9125b2738d72c55a2ee286556b5c1fd25a0c8fdda1ffda08d8b2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 6e08ad3dd9f5f32a4efc53326425d2b62d6533a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:01 +0200
Subject: [PATCH 2513/2561] ktouch: update to 22.04.1.

---
 srcpkgs/ktouch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktouch/template b/srcpkgs/ktouch/template
index 09d394c0760c..cd47e20ca075 100644
--- a/srcpkgs/ktouch/template
+++ b/srcpkgs/ktouch/template
@@ -1,6 +1,6 @@
 # Template file for 'ktouch'
 pkgname=ktouch
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
@@ -16,4 +16,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/education/org.kde.ktouch"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ktouch"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktouch-${version}.tar.xz"
-checksum=cd0ab11fff7cb03c40569f9cdcdef9db723044b87372bb2126baeb82f20b2072
+checksum=52cf92c131b75662c27d936a5811f1af13e428766deb4823df766cc07a3ae367

From 125ae62d0d56a04abba41acfce29959161e7c351 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:12 +0200
Subject: [PATCH 2514/2561] ktuberling: update to 22.04.1.

---
 srcpkgs/ktuberling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 6fe6ec899db7..10b831fcde39 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.12.3
+version=22.04.1
 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/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=4fbffaeff31ab4c28919a825504f15dc90f89aa249e579bd7fcf265990b09aab
+checksum=4522ad76f14d82baff654556d9ef9be0b90d460e586a983e51cb13d7715139ac

From d7eee1b99ccaa11c70cc83b9671f126970bf1eee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:14 +0200
Subject: [PATCH 2515/2561] kturtle: update to 22.04.1.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index f3be87556605..2914d16c6711 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=fd42b1380e7e46d6c1e5bc4cbe538edcf9ed9bfc5abf54141393adc28fe38427
+checksum=15c6c08d2539e22d62524d0acad713397ddfce7fb7275a8b99eb76ea87c043bf

From 6e25f08c0618ee307e4265f66ae6c7af490ffe5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:15 +0200
Subject: [PATCH 2516/2561] kwalletmanager: update to 22.04.1.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 902061e38dca..47d52d3a5f8c 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=d33824ae0abc7972fed9d7dad6acea9f67e7274ee5b15c0bb1df72b1a24aec17
+checksum=289e181b2dadb9e2b1068e5ab9e844d5a99d05c6d83f47e492524befd2f70e5a

From 53e6e4b9960b82ff7d6f8df4194f4a635081653a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:16 +0200
Subject: [PATCH 2517/2561] libgravatar: update to 22.04.1.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 3319038eeb7d..15d0b46671b2 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.12.3
+version=22.04.1
 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=076ed85282b04eee4960072bf5ffaca514bb24f61510af9a3a8c3fe5daf030ae
+checksum=d6bbb3c449585a881fa49ca82d5ad9d189aabb7b698ca9d59e07ce3e2a14c53b
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 5b6ebb4ae6ea8afa7c3833c589a998a934ee9972 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:18 +0200
Subject: [PATCH 2518/2561] libkcddb: update to 22.04.1.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index fbcc0153671e..23746ea0d697 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,7 +12,7 @@ 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"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ddc91cc5112c5a749fccf18bb9a6b169279f6d5658fed3b4d60646d9ccbb0775
+checksum=10538a73e7e463fb8a7e98f4b43be6c995932402ce4f79345cc5b7779cc30b00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From bbdcb526ec75abc2820458c64948f3f5768791d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:20 +0200
Subject: [PATCH 2519/2561] libkdegames: update to 22.04.1.

---
 srcpkgs/libkdegames/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 7aafa5cf73fd..50767058c213 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=4dd8d80dbfd2806d420bb6efc2df64a175e8273d9ea34b9c61a0a7daae342e76
+checksum=0ce94753c590ac4019b3f11ca0b4de83d8bb0dc619de15fc73be7f3a820fd9e0
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 2285bea597b7ed436ba387ae09ce6d34bede706c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:22 +0200
Subject: [PATCH 2520/2561] libkdepim: update to 22.04.1.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 72b396350b3f..a86488439dfe 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.12.3
+version=22.04.1
 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=9c579e68c7686862988b9baf43a34e5952b2d00033b01e80c53e3959bee9323d
+checksum=963bbeb53f34576354fe5e040e79de80ea536dec342ee59058716b2708f74174
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 8109aaeb0326ed79e952672d3323f05c7cb55476 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:23 +0200
Subject: [PATCH 2521/2561] libkexiv25: update to 22.04.1.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index ef84c329eb32..2eac31dc6f9f 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.12.3
+version=22.04.1
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=491496b277fb3bebf17b1f2488fc8e905e08f888415edc4dcd26039e53335564
+checksum=376f38b3391f7a14e9ee1f41e97270b9003227c76ac5c4a9a3eb50d6075ed5da
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From 27a29dd0595450b4b6293eddc0374f360e9bf3eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:24 +0200
Subject: [PATCH 2522/2561] libkgapi: update to 22.04.1.

---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 0ed84474492d..3d6c363a21ee 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -11,7 +11,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=5d06d1c4712991cfb7c51ff0f36d22a1d9078e38a9ea4552cd31cc6ad04173ed
+checksum=94e05f3a289b2a3db3d7119ea95063dcba0636a4ce148ea9913eeaf5051b0a9f
 
 do_check() {
 	:

From bc56cacdd78aa2795506d1a6b5418a743a2e0e34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:26 +0200
Subject: [PATCH 2523/2561] libkipi5: update to 22.04.1.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 9355ee5134c9..32fb835efab2 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.12.3
+version=22.04.1
 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=ec21153b3237c4f8a0bb9ce58498ae92d7e7d0362167772bace872d94ce45370
+checksum=ef15b74fed59d10dd584e452925027d927eeb7b738569089cb8da21b1e9c9afd
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 9124412d05d46aba561db14df0311ac471d2c0f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:27 +0200
Subject: [PATCH 2524/2561] libkleo: update to 22.04.1.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 0fcab492f094..a2d797c51079 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.12.3
+version=22.04.1
 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=f47c65970564a0aeeabaa90714023d9f1f9737297900b68fbf5a81d8281201a7
+checksum=96d6058bab59c4b807548443d20dfc950f0a916c02aa84a96bf46ea2ecfe1807
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 16f8b8092cd9a2c5234c31cf3d73206e3878e292 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:28 +0200
Subject: [PATCH 2525/2561] libkomparediff2: update to 22.04.1.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 5f3b036be599..fcf4ae52ffd1 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=9c9ff478d4e31cc0b0dc980238956d92f683e6ff55dc1c6b67e3212c7e7e0711
+checksum=e404db3115a2a669edd3010dcfd2b45b140481c8b98be9df08fae11d8a0ce33f
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 2a2b9c23445b07c1259ecb7e063774582c441f50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:29 +0200
Subject: [PATCH 2526/2561] libksane: update to 22.04.1.

---
 srcpkgs/libksane/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksane/template b/srcpkgs/libksane/template
index b3978c672174..42205caeb79b 100644
--- a/srcpkgs/libksane/template
+++ b/srcpkgs/libksane/template
@@ -1,6 +1,6 @@
 # Template file for 'libksane'
 pkgname=libksane
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/graphics"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libksane"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksane-${version}.tar.xz"
-checksum=ef8b823a11de933023061641627ab94b802d745ce5310c97469840ed09122232
+checksum=bb755d27682b0a0f4b23af8267165822bf5cad09c03cf24429d8f8b23b226480
 
 libksane-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8d1cd48f0b0f5ee604847acf65ecc40a54ffa2f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:31 +0200
Subject: [PATCH 2527/2561] libksieve: update to 22.04.1.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index cc0665cfda23..eaa9b59f997d 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.12.3
+version=22.04.1
 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=6d1faf32d2ae9e90b71590f77acc85fa77d2a4ae38088549257675e30b6329d2
+checksum=3dffbb22fcae637c6c458dfea69cd2ae840a79d9dc72ba4af6b2dfda0b8fd71b
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 6083f77a4429926269fc63f5e109cb46b8d3eec8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:32 +0200
Subject: [PATCH 2528/2561] libktorrent: update to 22.04.1.

---
 srcpkgs/libktorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template
index b238683af76b..787e5a7c40ee 100644
--- a/srcpkgs/libktorrent/template
+++ b/srcpkgs/libktorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'libktorrent'
 pkgname=libktorrent
-version=21.12.3
+version=22.04.1
 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=80cef9619c0ea9079f6ad351f9fdd81d363d40eeb32f4cef7a83e995a8322745
+checksum=57dd46edc9e10127bca69104b0288bdfa5f1dab261f89d8fa4b2161ab7e7ddca
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 1198410a84b2343cfb5463939500cf790009a556 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:34 +0200
Subject: [PATCH 2529/2561] mailcommon: update to 22.04.1.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 55ac94f2da05..b5267dbffa16 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.12.3
+version=22.04.1
 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=4e8dcb2ece18dfca8e219838d85d8e402cb353e6a2ca8fa9d79bbcb4e1fc28fe
+checksum=5ac134dc7d4ff1c03fd192ff1f709a9839187a7bdd66b6ef033909730d95da75
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 10b1fde03108e75841f989f3d7560f7f736f253e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:35 +0200
Subject: [PATCH 2530/2561] mailimporter: update to 22.04.1.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 77c51b937fa7..5161c5cc317d 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.12.3
+version=22.04.1
 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=53dbab7697658d38dbbf6e7f31fbe97a88fcad1ca3a77cb540ce04d7fe4f9951
+checksum=866c77c85dbae71f7c6a3bac43d8fd19f1865155955a936660f7ba14d7a3f39d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From cde611e6c45a62dd440a2c37e5c4a691072fa7b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:44 +0200
Subject: [PATCH 2531/2561] marble5: update to 22.04.1.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 841cb976ad1d..702f8bfb99a8 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=22.04.0
+version=22.04.1
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=eb39219936b387dae4743638fe8ac5cf7f5654f4b4aff06a7c7b67e177799962
+checksum=359b14486376c387e990eb4836b058495e03a69791bbafd560f1034af0b9b857
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From a5d88baa5f72ecc6bc5c05acba05971409c1a3ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:47 +0200
Subject: [PATCH 2532/2561] messagelib: update to 22.04.1.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index f0ed61466d50..7e9a45f1d13e 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.12.3
+version=22.04.1
 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=5c57b5d7fcabaf8030f609e1458bc8d0ad436901a5ef45cff83a470cd5b43077
+checksum=a8029e5c87b67980952850c84a92a80604b8bf98159096576acfbafdfc2ddf46
 
 #TODO: fix build without qca-qt5
 

From 24ab32dc12040da2e63e5117560a44913fe1fdbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:49 +0200
Subject: [PATCH 2533/2561] okular: update to 22.04.1.

---
 common/shlibs           | 2 +-
 srcpkgs/okular/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ee2395bc2b07..8f5670e21484 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1777,7 +1777,7 @@ libspiro.so.1 libspiro-20190731_1
 libopenjp2.so.7 libopenjpeg2-2.1.0_1
 libcln.so.6 cln-1.3.3_1
 libchm.so.0 libchmlib-0.40_1
-libOkular5Core.so.9 libokular-18.04.1_1
+libOkular5Core.so.10 libokular-22.04.1_1
 libmnl.so.0 libmnl-1.0.3_1
 libnftnl.so.11 libnftnl-1.1.2_1
 libfcgi.so.0 fcgi-2.4.0_2
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 0933595722c1..fba4e72d0f84 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.12.3
+version=22.04.1
 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=63314864b1975b16ffadcce7c19b2ee4ae5477739639cfac165d4eac71fb9914
+checksum=cee20b2df2828728e9208406c9dec7a96b33a10eaac7b26c35788009e077163f
 
 do_check() {
 	cd build

From d38601e4cb873aa7ed5e29da5594fb5b3be77cd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:51 +0200
Subject: [PATCH 2534/2561] palapeli: update to 22.04.1.

---
 srcpkgs/palapeli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/palapeli/template b/srcpkgs/palapeli/template
index 8debf3cedc2a..bc4908e81a6d 100644
--- a/srcpkgs/palapeli/template
+++ b/srcpkgs/palapeli/template
@@ -1,6 +1,6 @@
 # Template file for 'palapeli'
 pkgname=palapeli
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/palapeli"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#palapeli"
 distfiles="${KDE_SITE}/release-service/${version}/src/palapeli-${version}.tar.xz"
-checksum=0f55a6f34867b6e10df956061df25c9211181111e92cd91d2ca5eb84287ed11c
+checksum=ba116943e9f42983ca71104ae637526655759f0900d9deed281029021e060da9

From 73ab464d211e2afa63deff2a66197c9d550f0569 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:52 +0200
Subject: [PATCH 2535/2561] partitionmanager: update to 22.04.1.

---
 srcpkgs/partitionmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partitionmanager/template b/srcpkgs/partitionmanager/template
index 335ea8f8f4f2..81b9559cd8e5 100644
--- a/srcpkgs/partitionmanager/template
+++ b/srcpkgs/partitionmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'partitionmanager'
 pkgname=partitionmanager
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/system/org.kde.partitionmanager"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#partitionmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/partitionmanager-${version}.tar.xz"
-checksum=37c0b3e4c8252bd743e9540c219adb3d595704e042e2c7f63c8b3dbbf41e1374
+checksum=5620d9a193ddd5675d4ca3d01a4632f2d5ed9fc9870d50e7c394adf5fda6d722
 
 if [ -n "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 4cd4cfa7c8ddd9d9c68172fc0a2386dbfb5e9d35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:54 +0200
Subject: [PATCH 2536/2561] pim-data-exporter: update to 22.04.1.

---
 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 2f83487e9798..7a55eb8f98ed 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.12.3
+version=22.04.1
 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=b8e0cfaec06eeb26af7d08d3b0932fa3721ec8b83761e84a604fea4fd6d29c61
+checksum=71bde8eb1fde57087a20c63c38b4d774f93f580b7f3a356196b3fb77f0da6b96

From 342338dc61a996eccdbc6ac3223ca361715f03f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:55 +0200
Subject: [PATCH 2537/2561] pimcommon: update to 22.04.1.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 30ba3411e0e3..f8cd8e62ec0e 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.12.3
+version=22.04.1
 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=27148d059cb6d55d523ec594e66c6a5ef4d475d75ad8eff9a3e7884c01082dcc
+checksum=2a94cdd9e4340a9ed0a793191b87bd50502683b5480db3dae9f360298fb48106
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 38207ae2f448e5340a0ca355085fb89273d123ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:56 +0200
Subject: [PATCH 2538/2561] print-manager: update to 22.04.1.

---
 srcpkgs/print-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/print-manager/template b/srcpkgs/print-manager/template
index 8a86ae55f9d5..a534cb9f2811 100644
--- a/srcpkgs/print-manager/template
+++ b/srcpkgs/print-manager/template
@@ -1,6 +1,6 @@
 # Template file for 'print-manager'
 pkgname=print-manager
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/print-manager"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#print-manager"
 distfiles="${KDE_SITE}/release-service/${version}/src/print-manager-${version}.tar.xz"
-checksum=0b6dd52a7f1b1aabd95202b4cce227dba719fb51187506072a75479876d93be1
+checksum=f49c063ce442070f386fb1bb480a0c8450184f6c83274205155cff0f6e72b879
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From bcedfaced301e7d3e48ea2a32388efea2adcf1f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:58 +0200
Subject: [PATCH 2539/2561] signon-kwallet-extension: update to 22.04.1.

---
 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 4361bac6029b..0adf1226c20d 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=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=33d19b1b758a21e568ce508cc168e568e34716f148cd83e214fb8a3f3194d2e8
+checksum=2cecc13cf9316f0697542894f0995ee3bde358ee503c153e0a9072e3df1bd08e

From ded1debdb388c2f9e332ec9dd7d4f8bac70f704b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:59 +0200
Subject: [PATCH 2540/2561] skanlite: update to 22.04.1.

---
 srcpkgs/skanlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skanlite/template b/srcpkgs/skanlite/template
index 1051d91a4943..d90d0b902f06 100644
--- a/srcpkgs/skanlite/template
+++ b/srcpkgs/skanlite/template
@@ -1,6 +1,6 @@
 # Template file for 'skanlite'
 pkgname=skanlite
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/skanlite"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#skanlite"
 distfiles="${KDE_SITE}/release-service/${version}/src/skanlite-${version}.tar.xz"
-checksum=77e09cee9f57e8bda4905d358ecf296528df8ad73c93f722c6ec689d65abbc19
+checksum=69f7fe0850459c5f81767b4d3ba4d60ffcb3e495d9a2eaf1461bb95b56f013c8
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake"

From b5e7d2da995b25427c2f1473ca11794e829d157a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:22:01 +0200
Subject: [PATCH 2541/2561] spectacle: update to 22.04.1.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index ed5805b3279c..a5a0344ad34e 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.12.3
+version=22.04.1
 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=5b0ffca9ea43f5ffebd5c2d12090f0d81a9014742a20b1b806594e6a848dbd94
+checksum=335bc9ab70966d23bdd09614c373d73cf0d8ee09788b22637d5717919e443884

From d91561ad4c00c502a5bb1b7e1451bd707ec27237 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:22:02 +0200
Subject: [PATCH 2542/2561] svgpart: update to 22.04.1.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index a0b9d95a6ce2..a1d9cc612e30 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=923bda29e6610fb4dfd2b4f98e14045271c099ab1ed3988d52fefdc0b408df9a
+checksum=5e5b9314e06798177a3b4ada63236cfc6b65e229153b83b69a8c2699a6b8689c

From 576f4364cc17bc23614b2ed542e482a5c810be20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:22:04 +0200
Subject: [PATCH 2543/2561] umbrello: update to 22.04.1.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index da2757161229..d06ffb898648 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=f4f681daedbefdeb0e6b0da0fd718c20031491d3b088e0523ff5bbfab3de72d8
+checksum=bf2d65a6a1d08f695b3ca29c902e4fc52917870cd3d161b3a478e77b021f5306
 python_version=2
 
 pre_configure() {

From 2b53a78a12a256a6dd1c6690634d2ca7239b5e7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:22:06 +0200
Subject: [PATCH 2544/2561] yakuake: update to 22.04.1.

---
 srcpkgs/yakuake/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dd56e9afefb1..1b8ba024c853 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,10 +1,10 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
-makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+makedepends="knewstuff-devel knotifyconfig-devel kparts-devel kwayland-devel"
 depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=b7f96b48fd5baa75dd8fe53c8886f8cb0628f6a77a33232dc5bf06f45f6b2006
+checksum=53389837706aa62d56d3965bb846b435fc15a3083e3756c75a25aa86ee65c1b0

From 1efdc38124eeec90359e2ff118a3fab4dbbee4f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:51:47 +0200
Subject: [PATCH 2545/2561] plasma-wayland-protocols: update to 1.7.0.

---
 srcpkgs/plasma-wayland-protocols/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-wayland-protocols/template b/srcpkgs/plasma-wayland-protocols/template
index 2d8978e4a14c..ec9540317fa6 100644
--- a/srcpkgs/plasma-wayland-protocols/template
+++ b/srcpkgs/plasma-wayland-protocols/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-wayland-protocols'
 pkgname=plasma-wayland-protocols
-version=1.6.0
+version=1.7.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
@@ -9,7 +9,7 @@ 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=b74ffac969ef067e47180e748a67a3a1816b7157ff4ea620ed4432f59b70f01f
+checksum=084e2685caa61d94c6fe86dce006b22474d7bb4b34c4cb96bd763b97e305fad6
 
 post_install() {
 	vsed -e '/NOT CMAKE_SIZEOF_VOID_P STREQUAL/,+5d' \

From 59492d84bb83c62db84feded0011a0868b4477d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 11:27:35 +0200
Subject: [PATCH 2546/2561] calligra: rebuild against libokular-22.04.1

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..7c1411bf3da6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 5ee5f44b08a0b4d284e18db27b8345d812077baf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 16 May 2022 07:51:09 +0200
Subject: [PATCH 2547/2561] dolphin: update to 21.04.1.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 70df61b65c45..2cfd8607589a 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.12.3
+version=21.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5812238be9a4ee204e864cd30166285af599c6478eb9ce53cf9a552091c2b654
+checksum=292377aca0454189186d4046ed69785d7fda672270362c3b538a001c9daa826e
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From 2ea3cd622ab26560a3e4bb57839f349fda28f4db Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 May 2022 12:56:18 +0200
Subject: [PATCH 2548/2561] New package: bzip3-1.1.3

---
 srcpkgs/bzip3-devel    |  1 +
 srcpkgs/bzip3/template | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/bzip3-devel
 create mode 100644 srcpkgs/bzip3/template

diff --git a/srcpkgs/bzip3-devel b/srcpkgs/bzip3-devel
new file mode 120000
index 000000000000..c336c0baa420
--- /dev/null
+++ b/srcpkgs/bzip3-devel
@@ -0,0 +1 @@
+bzip3
\ No newline at end of file
diff --git a/srcpkgs/bzip3/template b/srcpkgs/bzip3/template
new file mode 100644
index 000000000000..b7de15d1c2ec
--- /dev/null
+++ b/srcpkgs/bzip3/template
@@ -0,0 +1,22 @@
+# Template file for 'bzip3'
+pkgname=bzip3
+version=1.1.3
+revision=1
+build_style=gnu-configure
+short_desc="Better and stronger spiritual successor to bzip2"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/kspalaiologos/bzip3"
+#changelog=""
+distfiles="https://github.com/kspalaiologos/bzip3/releases/download/${version}/bzip3-${version}.tar.xz"
+checksum=9ee90e5b07a81e581515a89e263917f1738d8d28dbec05b3ded4524c79977c3c
+
+bzip3-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+	}
+}

From 36f6606cd98425f48963188191adefaa616fb0ab Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 May 2022 14:20:12 +0200
Subject: [PATCH 2549/2561] zsh: update to 5.9.

---
 srcpkgs/zsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template
index 1a1d9d9a4755..44550da3b66e 100644
--- a/srcpkgs/zsh/template
+++ b/srcpkgs/zsh/template
@@ -1,6 +1,6 @@
 # Template file for 'zsh'
 pkgname=zsh
-version=5.8.1
+version=5.9
 revision=1
 build_style=gnu-configure
 make_build_target="all info"
@@ -22,7 +22,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, GPL-3.0-or-later"
 homepage="http://www.zsh.org"
 distfiles="http://www.zsh.org/pub/zsh-${version}.tar.xz"
-checksum=b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919
+checksum=9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5
 register_shell="/bin/zsh /usr/bin/zsh"
 lib32disabled=yes
 conf_files="/etc/zsh/*"

From 8aa5d37c5358c0912478928ff6845af4e257f824 Mon Sep 17 00:00:00 2001
From: Johannes Daniel Nuemm <daniel.nuemm@blacktre.es>
Date: Fri, 18 Mar 2022 15:16:53 +0100
Subject: [PATCH 2550/2561] firefox-esr: update to 91.9.0.

---
 srcpkgs/firefox-esr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index a3d95e10b2cb..e259184e0247 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=91.6.0
+version=91.9.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust"
@@ -13,7 +13,7 @@ license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz
  https://github.com/chmeeedalf/gecko-dev/files/7729086/esrppcjit.tar.gz"
-checksum="7e802832152c39588b9a5c8392e90c1b00036bf948fa4a97a7af0d1435ba09a1
+checksum="b4beea934c2ff67d93539c0a4a563f7c5fb8e2d231b05f082b1d8a73ee54ba9c
  5e926a8be5d6d4949c3bc3eb98e2103692eaa26a98928db432b1d44b535f7241"
 
 lib32disabled=yes

From 2f60fdeedfcca759bd9595e585c49bc06312bdf4 Mon Sep 17 00:00:00 2001
From: Johannes Daniel Nuemm <daniel.nuemm@blacktre.es>
Date: Fri, 18 Mar 2022 20:32:13 +0100
Subject: [PATCH 2551/2561] firefox-esr-i18n: update to 91.9.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 6abafa19b37f..ff444f584a28 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=91.6.0
+version=91.9.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="26e349c4fce1e45bc461211fc99777e896e452649972e99bec1bd07c4d902f42
- 076463b82bb48b0a7f4ab030af3d0123a73140e3d01d01e9ddd61bc43ce642da
- c54688e23c96524c24ecd3ba896186003f6395f265283d8df0d6e0680f03e57f
- e442e5194859b2aa6ed2b931827974f2b325f7d2b496ca483d6a6d6e03fdcc3e
- 5c8761c72e7e260d69f3d0d9e5af87faa9c4c64d5bf936cdb18af59154070d3e
- 831c20161bf4d27448eeff447b0777cc9d9444e00e692f5612d25eca4d63ff16
- aae556cecfbb89918644b8a0a5d6517e89c22a2a6d1f81bea50d15d3d84b46ef
- 672a064959a60a99863552368c2547171e0a19a1d2a8e367e7bf510ada4f4de1
- fbc1b076abcf18184239cbde2e668d5437aa973ab2d610db7eff7af5e9c38ce1
- e041427003cb3cdcae0c01d0cfed0b30ed5e382a7e03d497ee3bee5ee689d090
- 395ee2ce266d96188d91a4580608326e877a3aef7c547b2af25ee42ac8338840
- ad334efd5ae9b95bdf9bc3738769535a06d8953864d67b187b8fd9d64c19f351
- 50213a9f6c2f32ffce964ada97c335d2aaf6bc022fe0ce2de27cb5b81ca1f5f9
- 0e37238869cf1746cde69b1dd0440b31a771bdaa47f6ddb844e960c64379f93a
- 7f6c48b5e89d3eb60920251c2988870f6e33e9fef36e48f44c35cf4b0a8851e8
- 959de89d58feb1e90ea2c12d02b44de9854a4deaa292d70068de6692a9398e31
- fd197b8191eabd69d1ecf1033e5a19d5420334eb3d6cf085a7fcc734a7f5f59d
- 684dbe393b4b01a7195dbfa1b5adb7bff308b88efc7ca92a1e0717d1e9082f3e
- badcd1fb341fd10d63398d765f75cf86029cf99549ab86eaa1f946d958e215b8
- 2cb08b847596e919a159eebb71d16731176156402f4282a0d7f3ea304bd038a1
- a06b9980e16492776e6dd2bb7323b362172e428a6e9309280dbce3d61bbd8dfd
- 5591a3f1b44af4d2aecbeba96ca40e02eeb368139c1ca060fdc2f8d1db490e36
- d95ebbf6ef473a7985346826bae396f49f1b0658d2bea3e608a6f86df017eb3f
- 54f512380853e88bfe8586135d6e1e5284bfa0765e2785971ba40129ee92c4e4
- 30c98ea5192bd5d0aefea9f93a2565ddce0534df4311fe27451e847232a978b5
- 6ef84347128571d9129ca238cdd88ee07cd4a05ea6c031c55a9499fb053af66e
- 4c30f6dd5fc7bf48032f04fe9433f717981a4bf2d2048c5e2cbae7b77f987f71
- 07139a074668572406604b6fc89d6426e0bbe653c6057b1f17b4ebd53f3127ad
- 2da9a5038bca016401e2c827a00812fc15fdcbfbc24e37b29b3a47fcaeeafad0
- 4a01835e6c6c7d8a298f54ab68c5c5d5815eec83bd651ce638697cf4f3b4af13
- 62db35ed290f007b5bebed9157d5dce24eb9cfaef6c7984444e2e5bbd57ef8b9
- c6c0a855a5d0356a8c576503be0500a311b81c5889e6d2eea9e3427bba39c8f6
- dcf7413fd9784a141720c0b5200fc46e33cf62b6e7189b2e2283052a4ce1c05f
- 6e6c2abb5f57095c416402a25d2be8dfac6c43713d3a7c34e4ef5854e49eea9b
- 9b9eb4f38ea40993890be5152f58221ff6a91742fad48e491f3d5610ab7a2258
- a6eb93ac5d2f6e3d06d3181794e6fb75ff99d9efafd0787813d2c072a684cc53
- d4ee6c181affa0404321fdd40b59b25b35aab10a87016ff262b0e8c9d69dd943
- b268a39f6182b32f9a122e0f50103ea8442b380a28476356ea235413120ffd91
- af308bc769012d9a909635daa79eac5bd11f8e55ffc78e4d6508dc51787c2adf
- 6031a2ebf4000f14cacb9f44faa6eb623d08d1ba7313bba71c95eef4f626562d
- 1195b4574c1c2b2c97742518187a3bca8acad0ee8c681efc9b90a068541a8f47
- d98320c38922ddb2984739726027bfb9de1a293c9c23a3b2405ab6eac1dd76b4
- ea5664de8b25e2b71276c3e21ea653b17969a8e514c791e439b2778975719e31
- 98ffbee7305778a0c76bb87e13b035b35fdd2c327dea9680b59cdb6151afc39c
- f75cf5a40464f6a4d68cfd5359cba5a26b3af9dc98d58329c41815eaf09ef96d
- 43b2f23ec429350eb43e55b6bb86450caa6bbc225e238252d748c201b6047435
- b4da39d2d04f63f6976ec152eff73db33917d22d6cee8f9796fa3e412f343369
- 17df7e3aa5a7820783781dcd3cff7ac67c6928e8dd24cda12f863dc0f244b9cb
- d5a5ec172b7f7b419d959312ee4f7188fd8c9d375930efba9587d0044b8ce3e4
- b25d34adb7b3c2e766da82602d5333534d71f73a7e2ef7289672f57f572a0cb5
- 7aeb7c6f0bc2703333d9725b9d6c46402945d387c089ac5df547cb57792f4238
- 3efa8cd779922500be67ff2649b48094273a4f6f2b971a25f6b686381578610f
- 4cfb95c8e62d9585ee11f5c0abd1198a8608347f4df1713c79372ba421b8f822
- e223b9d0b43fa8be974cfe09dccf881eb8b380229397cc0db2365b907dbb9602
- 30a6ef94763f5a7da8b0eba094d6689dc3dec4f5f0109145df4a081bfaa3d275
- 0a6b335ca4adfd53d7a7a3895df34b58fff7516388c52066492b717d9cb22a76
- 6350b5513131aa60858463bc0b34028b1ed965d1cb101ae77cab6b6e82b4ea8a
- 8e5d38a1bcc687b7bf838a8551ed01d6f8364d6e6d525989d354c19ab8fa5e13
- 576fcdf1610c839b19ac67d62908a246603755c714295b4597f57dd21f9998fa
- b689df1c96b238807a23be81e7bf3c90e8dfce93a000bcad6f62ba6b68c81947
- 48d49f4823c0416d17a8ef7ceade4b6308c1c9e1d64fd3ae73ca08bcb8b0de21
- 88268b81d50bea3189a738569e21360799aaf3235241aa7a7066b4a90c6bcda5
- 8973c7be7aace97d90c57651298254d484d57a88f9703ce96b3044206f0832f1
- f9e31af49fecb071f5b8fc818d1916c2b58e64a7d02507150dff176733573fea
- c3be99b059b88534930fc795bde952318dd766caa82354c43201fa4892c311ac
- 56e3718d4b5a8bf70b5857433cb97f228663728636cd6edd3e4e59e59a7efd19
- cc77ab370e68487e6909bf3fcebb17bdd200c3bcc19a32a36e2c72d1417e463b
- f0be0fe4dfc36bd95675643d37494747437bf250b82a65832dd6b11bc4e99490
- 05578860c05cb4a688fdec57f5720aa641d556257dc3c46b7530c31f57f4d174
- 66c3085c1d0929d3478da66fc383b2c45bf474233802f07010ad952255c38a93
- d0cb932951b4b088e5aaf2fa4115c51f2ada1661a958324b3e0e7be4912db7fa
- 53733713343dbbde77ec44c98ef1904377eb6bb75f0d66e5e0b2f18ce3bc93ba
- 0137da4588097a1e662c3cafe77d4e0ca0fe554ab342615629d8157f0f217b4e
- 09649a9fbb2f034c8ae7c9444278b0906dd831616abc886fe3b7032045711eef
- 37a6b6168082978d9503a6c58b0ce62799f7f070b70e19a7661ca4f794e0e86b
- 86dbc3b1c659489f9563dd15e85e94357f7ceefc828bcd333345936f3dc7f2bc
- eb710163923480c1bad315b3e4eaa61f1aaab3e30f659081291b52a0e2621093
- ad7924c0a473ed3c3a89c51ebf0d09b9def9cf2ec6f38db10598266fadcd6b56
- 1f2ce18e0f9033b8a84c30b3ca1d2d771d35658995344cd8e6b8fca09fd6048e
- 5b96b615350f84a44873125a6d1abdfe76dfa3df820c4f4aebcfd36f3d2d0c67
- f74dd9356810f9d3a1dca90d53e534dc0541a7a56c3e877e5234c0f12c39f7e0
- 0d260486d46c6e352a309860364c904f1687156f24a4ec474ad04acf7c800e5b
- 50aef56fa7faced30ecc1fc370d52c5d54c6e73708ce5705d70f38d0920946dc
- aee885b8a055800c2cce6e3b0ee4f604a016818d828d88fb249011e127853691
- 39ec3fc095961fca458bb81c5586255cf8a5c20716770d1d9cf3bbdd1bfb485b
- 1e556da079a2ef106e24a039bbc510969447223799619af075c7205191700435
- 9f15c26f67c5d9d2fb0d339cbfe9c6cabb859e8675a4e3c4c797fda64b7478a7
- 6a10daecf2d1fd23592cf2ff832120688a78ccd86d9e9510090ad2d3a40628f1
- a7f287d37ec3651d68a56f3b2a9d2a22ceeb76aacef95f14bcba91ad95e9ce75
- 8974f735c60699521430d7c0bc41ad4badc15d96c0eab810bcc8a547793f17e8
- e34c02a6c1bd51bc34b36f332346fcbbeb41e7d7c6b3a4928f5864a7c89ff153
- e0f79891a14e3d811685bc4ba88803affc01ff0348cbf596fb270dc4e0f1eaa6
- 45a9ec86fe0a9ae4ecf81f1dc320353d5ba3b1a50a1eec42b4fc32e8ae2257b3"
+checksum="2bc70d0cbda5bf23e166c13eb3500904135211f3931e7f47ddeb1fb45f5bbcae
+ 6919cb6c47fe39afb7a49414241f31590c935565f972f82c0d0c7038fba26563
+ 2877b443f701a73cee387e631b8f28f42c750851a2150710334bb82015c45427
+ 6660890b4ce3629b061475532f3295e72a1b7624bd937b3bcaf83fe794f9b390
+ 887ea64a54ef264a3f35612b9e3e0b9fd40b8fd6ee0a7fa9782888406fdb43f7
+ 148c555c47a0c47cc9683e6f469a8dc29a4efb2b869296b89f6f9b84077b98de
+ 8fc6459c9de31065fbfe9e64b36dda9f0355e624f8c3d2377d25794dfdf97674
+ 81d64dda58ea8602352c324284b0d6e28ef40e697f19357c6b6a73aee8c6e85d
+ 8008231903f276c3bdeac6fd720c33c7c9617cd866791f4132b87ba2b94967ac
+ 1fd22e04b47ccdfbce50f2c0ad312473e9fbeeed14316345ebf8702a2e0c0f9a
+ 27f4f5d115c0ae796ac348da5162bc3861204e3ce50414035f2d480dcfd0668f
+ 02d1e040d0c8e84abacf617ec41b6e128a15c1b88eb038a432da2b8fd3c194bd
+ ebf2d34382902b810ab46374df7e31e893520fe9751415d5fe63fec4fc775bb2
+ 993c6f8da2a00f801421e1dbd8981b67e26c4f01356c6a62177d2987c0b15cbe
+ c490d94b7595090ecd238cc1c8c84a3bfc2450ef2393bd95d954488f314f34b0
+ 530a1b09162dad6ff7fea360d232f628f1f67751e2cd21783207fc77c057464d
+ cdb58015b09a861f4b1c02d7fc9823d87974c3f4b13abd8e7c76bd249c61581b
+ 59c0ab8f08edaa9e430a5988fb1890cd3cd5a7dfa785303c8776fb6f38192efe
+ 37e221b2ccb512ead4445b2345a6527a3358075e011a58658158954f052784da
+ 580dc1641d96072ee44800af8c553eab82f158e36a0f13f795a7a51f1bb762ec
+ 9570ab68c643e612aa10818633b3d93607581d0d97ea764e0213f0b1e5769d4d
+ d2fd517a39874e8f8fb37458450db6ab496cfa1bc2baf0f71e883296bfbdde27
+ 2616aaf1722723003d91aab4e69b4381412f810a439feff4ef2a146e22d9f960
+ 21a06c320fb80e4e45b02ce8f084bcc8900764dd137e2ca4c8b7929c89e0c3d5
+ 59a6e10dedc26f6ebd7755477015d7b3e956ab34f29fd3954f12f7a4f5ee345d
+ eefd5a4d637fc86281cdbd43a06e07fbb76f8a01e9bdaff181daba5bd7cf46cc
+ fb50ad15895d27e30c54f1cc2fe848405a5c10917d3d73c71b82e1e93d658c8a
+ c04680483e96c0c8a77f07b18333b02b8dec4807de332ab77ec3a6446a866dfd
+ b38c3d132e74034d2659172f374b4eb6261b2346a705988823a9af56f906e155
+ a94238d8a7ed68b6170c49a07d8d1cc06d8c3a30b5b4746095d559856f30773d
+ 324bb76b3c95fe645796ec43962497ebb03b80b4a068e778b684fcf7a307bef0
+ 0f0df750b7e54edc132133d53d7dd9fd78fb828578d79d97097afc98b8de538a
+ e77a14ff78e90944d14439d1bb9ca5bd116a6cf71b5bf14e16d3cb593ff35b70
+ 143995923b153cbf6cc3a8d846afda70601c13ede25ef8b193db80fd9f1896e9
+ 446132041fe6f31bd5413735ca9813e86595ce35ed5fe499aae164775ba0f987
+ 0d5798050376c4b7aafc2bb78692056abcd1f441fc131591180e11647c276872
+ b2e4c9aa9452bd1af2e7fdade9752aa6019f28a2e4599bafbe9da9e9e1d5f01a
+ cdda19d8b15cf46d6c2141434969d7599ebbfb60b62b29940f52a79fd8cf072f
+ b6095ac9de172e6df5bc586afe934c327fd5602ed18aa1fed0d8ddb1387c7df9
+ 75fe7ab4377e3c212b256c3391fdff1a609d91cb58c14fd6cae453869fb334df
+ 46706eef7e7bb90fc055b002f627286c2de43ddd5a0caf2b9c06d032ad7d85d5
+ 203ca7b2bb45eb5cee5b1eeb9d24e25520379e7af1ff4aabd09ab25c5b3f3d8a
+ 2c643a1d8696037b047cc06ee0886e4696db55b4c8cacb69ce52066c35680bd9
+ b7309661250a56ed8a42619699efc8c9f8a388506ae3c5b38e5680d7c7d50f51
+ 0572d0fc5e88798a0f944e5e60e0c95365241f474ae201a85a0077d083812620
+ d52085185911557948c94e7f4f45e6ce50ad104f3031ba32e62d58b6b581df93
+ 5ea6410c8a42f3e558a3b73993e185778a3f91fcefe37dfb32881b884d9a7328
+ 67ff089e58616e50df99730c33bfa90071beff2c3715d5bcdc218a602346c8e3
+ 753cf07925bfe1c3b5fd6f2947a18b8f826d514d5c9b0d7f2d357fd033b66192
+ ab291fd924c16b7fe51dbfc06519bc9b1d02182bfa0dbd9523638c285615cc77
+ 9d31e9a493077b8c0409969e4d53102239f472467510b9dcdb7a227fdb6277a7
+ c9dc5c95b109c895c3cf0fc0f0eb46385634637bce107e000ba42a2f9b7907fe
+ 6b08f873fe1f9dc7d468b710b2dd8f3fe49138c3cdb4b4594a579d0379977271
+ ad3510d8b699dc71356f622f2e7b9c2dec12096fcf9741dfdfeec03d9382e0e0
+ 5d2afd46ea725d43357c0c9ac6d4d4db89aa9f0c49a4e1e9fc1c124390ea6e20
+ 9ca197bb00e23df520199bbbb49fe66d09e5d5741e7acbd4e93da0a642140ed6
+ 633879681627dcd34759732ceb40cf6b7f803690cd73ae7bcab39459993cc78c
+ f8830dbd04e1248220fcc7e6eba6e7903bc36dc097a4360279847fc8148df7fa
+ 2828ad3e3563ad3e4652ed19eedef1d3c96c12c295bdc1a6057302bd590da00a
+ 763cf455f806bb30eed4c8b25c3bbfdd500959b8fd0d26713f0c19b2a8429589
+ 2d84d2806ecaa9520f6d6575b6bf3f11e9431066dd133dd28882cd4b4bed3aa4
+ a70ace7c4803934c4207347a24910a4f7406b79936aa6289c2d078c174f95a1a
+ d1f0df1831f0fe552ee3b58d83740ee95dce560ecb5a595185dfbd7a11c9838d
+ 0d08b1365d603534d73fb756bd139a913c4b4042c9f40de545db56eb37dbe7d1
+ 79a49173ea82db7b36c019545adc2faafb07d6db31da1a100c7cbc61ca2c2ea8
+ 66fa26fed2113b1cb173170939a0f5376a61af168fd35fcce055078fabdb3288
+ 4b321e39baa8cebbf32ed9e53aa77c562445b9ee2504896272ed2da093f07e26
+ be1a45a7ea2f23addb28a767cb9a6a9a54cc8d8809d6ebf28a41a03d2d09ded8
+ fda6f1000b7a14b4e3200ae00597aaf0e5a0e769a1ba5af9c3b9f841e1adf534
+ 7f907551000f435586a43acc215eadf994c590fe454eef6f843949efbeb1b3e6
+ b7e58ea0c7c347e747f03531dfcdf13a2a70e2d08caaa704e4d8d0a9c139cb86
+ 8b6b6274781bfb5869bf81c0366b768e10b8642139910490adbe92658546115c
+ a70c758f52467b8f04bbda20d1cfdae79ae99a860b54e1b463d7005f267656b3
+ b0177a28695c8e2297fbda2f9fe7ccca9142fa2933d08ecfa607019f3a07e7f9
+ 23cb3211b6c66beccb8619606e62011a3aaa4a082b49abbe507d6d9ce081d6a5
+ 3af4c4f8ee80740aafbeffeec8a6a2ed3f091bd4d149f687a302e1d027bdeb9f
+ 467139c240ef5cdb8f522e04b05a1f87f82f0788ab65ee3b135b72b201f06050
+ 841fa5f1b1d810061c2f014bd942f626d30d27b35d07bc7712a323cbfbbb133b
+ 35ca0a96504d16ad7b542f457b137432737c49dbd972aea4188bb1be950d47e1
+ f837ac7a86a79db85a79b0d1acaac49fe9c18ca15072bd0dd88c70aa9d00c9ac
+ 07d40bfdf5ef1cb91b757f1d05679b18428edaa06aa6ede3eb259e596e08fa2b
+ 96c4523ea1d5285174ecf1ec1a5ef09daa3adcf60ecd8d2a196f741ad80461cd
+ f94199bb442b47cd8a5abd08a443d8b5ff21d73fd9a98eb93757ab3639ed1bd0
+ 2d09a80290021506b292326b7869d2818d17dac54f6cfa8aa3896dc044f76d90
+ 2fe0a1871ecb3f834ba677de34b5d991e1686681b4f7b4fbf4f03df26afe4768
+ 79bba3d52f9d3a8326b706e6289767e6aab2f6216e050557c787ed7bf395384f
+ 14aae95adc96b8b68f0e3d71a20407fca89c9256a6475517a54026683aae2bfc
+ af5477c70b190fa3b94eea570b1b8c52a2bac739ecfa37272f39d917ce5cad05
+ a60b318f6597cadad59728434d665a053f5ac80322e0b532416650443eca8f22
+ 428a8e350f67cf25413e59c97a069fa47a8f814e8073c4a82ba3ea0440d1f2ec
+ 87582b34d4c374b6d828e03282d2afe63513769abf0d4cc0b7f8da83f1510a03
+ 139c2d899969839508c0c05ca0b8d572a2f35d86a6b313ea023855cb9a77ad8b
+ b80cb04dc34f815e86dbb82d42338bef4c7cdac6a5e21969f39b594e707c7c99"

From 236a1005f7a0aa3e407fddd2b318ff2fedaffa68 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 16 May 2022 17:37:45 +0700
Subject: [PATCH 2552/2561] dolphin: fix typo version

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 2cfd8607589a..dca073039742 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.1
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=292377aca0454189186d4046ed69785d7fda672270362c3b538a001c9daa826e
+checksum=9cf51ac21ffc3d12a919e99cca80f3bb14741eed2a3af54b4499332ccd979a7b
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From c3520b0f388b40b1055d0fcb45557be75bdc9807 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:26:50 -0400
Subject: [PATCH 2553/2561] build-style/python3-pep517.sh: improve default
 wheel selection

When naming wheels, hyphens are converted to underscores in package
names. Recognizing this in the build style eliminates manual definition
of `make_install_target` in several templates.
---
 common/build-style/python3-pep517.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh
index a733a521fb3d..62cfac7d67d3 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -23,7 +23,11 @@ do_check() {
 
 do_install() {
 	# As with do_build, no need to accommodate cross compilation here
-	: ${make_install_target:=${pkgname#python3-}-${version}-*-*-*.whl}
+	if [ -z "${make_install_target}" ]; then
+		# Default wheel name normalizes hyphens to underscores
+		local wheelbase="${pkgname#python3-}"
+		make_install_target="${wheelbase//-/_}-${version}-*-*-*.whl"
+	fi
 
 	# If do_build was overridden, make sure the TMPDIR exists
 	mkdir -p build

From 78fff044bf8189c4371f0b593da7b6456e1edb8b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:30:06 -0400
Subject: [PATCH 2554/2561] python3-more-itertools: fix build, use PEP-517

---
 srcpkgs/python3-more-itertools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template
index 914d46f0a695..2ab2b760ec37 100644
--- a/srcpkgs/python3-more-itertools/template
+++ b/srcpkgs/python3-more-itertools/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-more-itertools'
 pkgname=python3-more-itertools
 version=8.13.0
-revision=1
+revision=2
 wrksrc="more-itertools-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="More Python3 routines for operating on itertables"

From a663d68d7a11c36a1d725e91b3007aaa4167ccdd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:34:25 -0400
Subject: [PATCH 2555/2561] python3-ansible-compat: fix build

---
 srcpkgs/python3-ansible-compat/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
index 919455b7e64b..5b5b64154f3f 100644
--- a/srcpkgs/python3-ansible-compat/template
+++ b/srcpkgs/python3-ansible-compat/template
@@ -1,12 +1,11 @@
 # Template file for 'python3-ansible-compat'
 pkgname=python3-ansible-compat
 version=2.0.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
-make_install_target="ansible_compat-${version}-py3-none-any.whl"
-hostmakedepends="python3-wheel python3-toml"
-depends="python3-subprocess-tee"
+hostmakedepends="python3-wheel python3-setuptools_scm"
+depends="python3-subprocess-tee python3-yaml"
 short_desc="Python package for working with various version of ansible"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
@@ -15,8 +14,7 @@ distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.t
 checksum=c651995dc323ef145bab857fee6540febc881fb71b7feafe8163d49e273163a5
 
 post_patch() {
-	# scm versioning is broken in this release
-	vsed -e "/name =/a version = ${version}" -i setup.cfg
+	vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml
 }
 
 post_install() {

From a74ef090b81518fbe4acccf215fefc42845cd4ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:34:25 -0400
Subject: [PATCH 2556/2561] python3-ansible-lint: fix build

---
 srcpkgs/python3-ansible-lint/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index 00d8dc40f6a6..7cded1c60322 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,11 +1,10 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
 version=6.0.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
-make_install_target="ansible_lint-${version}-py3-none-any.whl"
-hostmakedepends="python3-wheel python3-toml"
+hostmakedepends="python3-wheel python3-setuptools_scm"
 depends="ansible-core python3-yamllint python3-six python3-yaml
  python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch
  python3-ansible-compat"
@@ -26,6 +25,5 @@ checksum=b539bc22d13e6de0cc2e25758e1d28b2bc01561a414ae37ceda3708b5a2a79ed
 make_check=no
 
 post_patch() {
-	# scm versioning is broken in this release
-	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+	vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml
 }

From c25c32d87caf751afa6a6f133c91af78f39a124f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:34:25 -0400
Subject: [PATCH 2557/2561] python3-matrix-common: remove unnecessary
 make_install_target

---
 srcpkgs/python3-matrix-common/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/python3-matrix-common/template b/srcpkgs/python3-matrix-common/template
index c9f7a2d5c8e1..b216a122778a 100644
--- a/srcpkgs/python3-matrix-common/template
+++ b/srcpkgs/python3-matrix-common/template
@@ -4,7 +4,6 @@ version=1.1.0
 revision=1
 wrksrc="matrix-python-common-${version}"
 build_style=python3-pep517
-make_install_target="matrix_common-${version}-*-*-*.whl"
 hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-attrs"
 short_desc="Common code for Synapse, Sydent and Sygnal"

From 3dda605bc16d2b6efad783f8ec701f2a6e0da0a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:34:25 -0400
Subject: [PATCH 2558/2561] python3-msoffcrypto-tool: remove unnecessary
 make_install_target

---
 srcpkgs/python3-msoffcrypto-tool/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/python3-msoffcrypto-tool/template b/srcpkgs/python3-msoffcrypto-tool/template
index 10672ed09241..fa80ef343248 100644
--- a/srcpkgs/python3-msoffcrypto-tool/template
+++ b/srcpkgs/python3-msoffcrypto-tool/template
@@ -4,7 +4,6 @@ version=5.0.0
 revision=2
 wrksrc="msoffcrypto-tool-${version}"
 build_style=python3-pep517
-make_install_target="msoffcrypto_tool-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core"
 depends="python3-setuptools python3-olefile python3-cryptography"
 checkdepends="python3-pytest $depends"

From 4e31fa0f6f78a9bda9504b85a7e7967d397897d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:34:25 -0400
Subject: [PATCH 2559/2561] python3-subprocess-tee: fix build

---
 srcpkgs/python3-subprocess-tee/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-subprocess-tee/template b/srcpkgs/python3-subprocess-tee/template
index 39a0233dad70..e14060d2bffa 100644
--- a/srcpkgs/python3-subprocess-tee/template
+++ b/srcpkgs/python3-subprocess-tee/template
@@ -4,8 +4,7 @@ version=0.3.5
 revision=1
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
-make_install_target="subprocess_tee-${version}-py3-none-any.whl"
-hostmakedepends="python3-wheel python3-toml"
+hostmakedepends="python3-wheel python3-setuptools_scm"
 depends="python3"
 short_desc="Replacement for subprocess.run capturing output while still printing it"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
@@ -17,8 +16,7 @@ checksum=ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577
 make_check=no
 
 post_patch() {
-	# scm versioning is broken in this release
-	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+	vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml
 }
 
 post_install() {

From 91f269d098c6b30213296e37919704d1c9beff50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 16 May 2022 21:15:24 +0200
Subject: [PATCH 2560/2561] qtcreator: update to 7.0.1.

---
 srcpkgs/qtcreator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 912c6c00c4c5..a616a42d5e40 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,6 +1,6 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=7.0.0
+version=7.0.1
 revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=cmake
@@ -18,7 +18,7 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9
+checksum=da78f293829851e32f6bf25540791697606809e47a32ca8439561fcbab96b22e
 replaces="qtcreator-data>=0"
 python_version=3
 

From 44dbd7e6f6c20befc6e0b1cc3808b26c3a3c9616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 16 May 2022 21:15:25 +0200
Subject: [PATCH 2561/2561] diffoscope: update to 211.

---
 srcpkgs/diffoscope/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 9ce203fb8ff3..e4eb386165e0 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=209
+version=211
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,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=e845a0b6cd56c116fee670ae8497512489504dc911201bd77b7d65b8550618f6
+checksum=8e75f3acb181096632e43935ba7a85304703ac54739810b4523919188367ec03

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 732 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-q5go-35831.patch --]
[-- Type: text/x-diff, Size: 4836794 bytes --]

From 39bb9e3fc7219db6a95bf0cfcf1ae91c1c6d83b8 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 23 Feb 2022 16:55:57 -0600
Subject: [PATCH 0001/2561] New package: q5go-2.12

---
 srcpkgs/q5go/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/q5go/template

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..a2cc898854f6
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,21 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

From 1b430d6d9f2e4a0a010b3af9a74ecc0e28e8d598 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Thu, 3 Mar 2022 08:14:29 +0100
Subject: [PATCH 0002/2561] gitea: update to 1.16.3

---
 srcpkgs/gitea/files/gitea/run | 14 ++++++++------
 srcpkgs/gitea/template        |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/gitea/files/gitea/run b/srcpkgs/gitea/files/gitea/run
index d24ce523bba7..6a621804bdd0 100755
--- a/srcpkgs/gitea/files/gitea/run
+++ b/srcpkgs/gitea/files/gitea/run
@@ -1,9 +1,11 @@
 #!/bin/sh
 
-# We cd here, because builtin SSH won't run without.
-cd /var/lib/gitea || exit 1
+# USER and HOME are needed because gitea doesn't actually check the user it
+# runs as, but instead just grabs the variables from the variables.
+export USER=_gitea
+export HOME=/var/lib/gitea
 
-# The USER variable is needed here because gitea doesn't actually
-# check what user its running as, it instead grabs the USER variable
-# from the environment.  HOME is set for the same reasons.
-USER=_gitea HOME=/var/lib/gitea GITEA_WORK_DIR=$HOME exec chpst -u _gitea:_gitea gitea web --config /etc/gitea.conf
+# gitea needs to run from its home for SSH to work properly
+export GITEA_WORK_DIR="${HOME}"
+
+exec chpst -u _gitea:_gitea gitea web --config /etc/gitea.conf
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index e8843a9f1a37..75d8c4290fe4 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.16.1
+version=1.16.3
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -32,7 +32,7 @@ license="MIT"
 homepage="https://gitea.io"
 changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
 distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=09a27a06bf12cbef06ba823c516c6c9f7a06129e91dd7e64be5f6f0ca641d5b7
+checksum=913f3b095fcfd4c5012d17adcd8748b081950e3a7d17ace60f6a2f99c9b2e18b
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From f21811bc64350371c7d36f632c63e7d1218ee489 Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Tue, 8 Mar 2022 22:02:30 +0100
Subject: [PATCH 0003/2561] yt-dlp: update to 2022.03.08.1.

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 4bf37918a58a..967cb7e75b0d 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2022.02.04
+version=2022.03.08.1
 revision=1
 wrksrc="$pkgname"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=c8dd119c28a5d256322ddb3a2fff72bc02ace43fc5880c0065d97f7a48d7a8e3
+checksum=135fd7bbf81c2639419b191d8e5abb80cd8a9801b7ed8e92a331a4107e820ab2
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 2acc3caf125b6adc8fe6c0ed91c394b2f9fcc3c1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 12:16:17 +0100
Subject: [PATCH 0004/2561] cflow: update to 1.7.

---
 srcpkgs/cflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cflow/template b/srcpkgs/cflow/template
index 974c82619b65..fef756128a24 100644
--- a/srcpkgs/cflow/template
+++ b/srcpkgs/cflow/template
@@ -1,6 +1,6 @@
 # Template file for 'cflow'
 pkgname=cflow
-version=1.6
+version=1.7
 revision=1
 build_style=gnu-configure
 short_desc="C source files control analyzer and grapher"
@@ -8,4 +8,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/cflow/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=34487b4116e9b7ecde142b24480ce036887921ed5defb2958068bb069c1fedd7
+checksum=d01146caf9001e266133417c2a8258a64b5fc16fcb082a14f6528204d0c97086

From b4838205c241a170bdb6c4e78088b647d56b3e75 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Tue, 22 Feb 2022 22:41:45 +0100
Subject: [PATCH 0005/2561] sqlite: update to 3.38.0.

Also remove -DSQLITE_ENABLE_JSON1 as JSON is now on by default,
and revbump sqlite common/shlibs entry.
---
 common/shlibs           | 2 +-
 srcpkgs/sqlite/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 250e1e0b8cb5..d60e60a87534 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -352,7 +352,7 @@ libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
 libtcl8.6.so tcl-8.6.0_1
 libtk8.6.so tk-8.6.1_3
-libsqlite3.so.0 sqlite-3.31.1_3
+libsqlite3.so.0 sqlite-3.38.0_1
 libIDL-2.so.0 libIDL-0.8.13_1
 libnspr4.so nspr-4.8_1
 libplc4.so nspr-4.8_1
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index a2cb06763b8d..8760d30aee97 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.37.2
+version=3.38.0
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,10 +13,10 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8
+checksum=1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \
+ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \
  -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 \
  -DSQLITE_ENABLE_FTS3_TOKENIZER=1 -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE=1 \
  -DSQLITE_ENABLE_DESERIALIZE"

From 26f8a4565ee70308d54e91f9b2c851d5b1052a41 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 5 Mar 2022 21:26:06 +0100
Subject: [PATCH 0006/2561] fossil: update to 2.18.

Also, add --with-sqlite to configure_args in order to
use the system-provided sqlite.
---
 srcpkgs/fossil/patches/cross.patch | 2 +-
 srcpkgs/fossil/template            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fossil/patches/cross.patch b/srcpkgs/fossil/patches/cross.patch
index 79ce61fcdcd7..2e5cc092a67a 100644
--- a/srcpkgs/fossil/patches/cross.patch
+++ b/srcpkgs/fossil/patches/cross.patch
@@ -8,6 +8,6 @@ index 9818cbd..1c248b8 100644
  
 -XBCC = $(BCC) $(BCCFLAGS)
 +XBCC = $(BCC) -Os
- XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
+ XTCC = $(TCC) $(CFLAGS_INCLUDE) -I$(OBJDIR) $(TCCFLAGS)
  
  TESTFLAGS := -quiet
diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index 63323b9f1f02..7e266eb29fe2 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,9 +1,9 @@
 # Template file for 'fossil'
 pkgname=fossil
-version=2.17
+version=2.18
 revision=1
 build_style=configure
-configure_args="--disable-internal-sqlite --prefix=/usr"
+configure_args="--disable-internal-sqlite --prefix=/usr --with-sqlite=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="tcl"
 makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://www.fossil-scm.org"
 changelog="https://www.fossil-scm.org/home/doc/trunk/www/changes.wiki"
 distfiles="https://fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"
-checksum=21d6ee5187775113f74e55ab5ebcb1764f7226a8e59be1b2c7896cbe9dce6914
+checksum=e89cb9c726348bb14e7736e031d2b08574408c5d4db98e7d3fc814dadc6f3546
 
 post_extract() {
 	vsed -i 's/test_system_sqlite$/# &/' auto.def  # failing on cross

From 041d9aab4b5e542a40c123f33f48bec8990cf0c1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Mar 2022 18:24:31 +0200
Subject: [PATCH 0007/2561] bc-gh: update to 5.2.2.

---
 srcpkgs/bc-gh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bc-gh/template b/srcpkgs/bc-gh/template
index 8804980eb9c9..3ae95d694e9c 100644
--- a/srcpkgs/bc-gh/template
+++ b/srcpkgs/bc-gh/template
@@ -1,6 +1,6 @@
 # Template file for 'bc-gh'
 pkgname=bc-gh
-version=5.2.1
+version=5.2.2
 revision=1
 wrksrc="bc-${version}"
 short_desc="Implementation of POSIX bc with GNU extensions"
@@ -9,7 +9,7 @@ license="BSD-2-Clause"
 homepage="https://git.yzena.com/gavin/bc"
 changelog="https://git.yzena.com/gavin/bc/raw/branch/master/NEWS.md"
 distfiles="https://github.com/gavinhoward/bc/releases/download/${version}/bc-${version}.tar.xz"
-checksum=bc031b68e5eafef37305697b76f6261abac4a94286e260fa339771f2484f1ecd
+checksum=480249fc0e6a54cb2dc0059734ce433bff344d27b40b8591ae410068e1573352
 alternatives="
  bc:bc:/usr/bin/bc-gh
  bc:bc.1:/usr/share/man/man1/bc-gh.1

From 2249be3f073be29d3e28b11b77e260e090f3de6e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 22:09:23 +0100
Subject: [PATCH 0008/2561] xosview: update to 1.23.

---
 srcpkgs/xosview/patches/musl-fix.patch | 22 ++++++++++------------
 srcpkgs/xosview/template               |  6 +++---
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/xosview/patches/musl-fix.patch b/srcpkgs/xosview/patches/musl-fix.patch
index 879008fe051f..26c5160162bc 100644
--- a/srcpkgs/xosview/patches/musl-fix.patch
+++ b/srcpkgs/xosview/patches/musl-fix.patch
@@ -1,14 +1,12 @@
---- a/linux/serialmeter.cc	2016-01-02 10:39:10.279496776 +0100
-+++ b/linux/serialmeter.cc	2016-01-02 10:37:54.667491325 +0100
-@@ -39,9 +39,11 @@
+diff --git a/linux/serialmeter.cc b/linux/serialmeter.cc
+index 8211316..50de182 100644
+--- a/linux/serialmeter.cc
++++ b/linux/serialmeter.cc
+@@ -25,7 +25,6 @@
+  */
+ #if defined(__i386__) || defined(__ia64__) || defined(__amd64__)
+ #include <sys/io.h>
+-#include <sys/perm.h>
+ #define HAVE_IOPERM
  #endif
- #else
- #if !defined(__alpha__) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__ia64__) && !defined(__m68k__)
-+#if defined(HAVE_ASM_IO_H)
- #include <asm/io.h>
- #endif
- #endif
-+#endif
- #include <linux/serial.h>
- 
  
diff --git a/srcpkgs/xosview/template b/srcpkgs/xosview/template
index 3d6c3ab6c1f9..69715f530985 100644
--- a/srcpkgs/xosview/template
+++ b/srcpkgs/xosview/template
@@ -1,15 +1,15 @@
 # Template file for 'xosview'
 pkgname=xosview
-version=1.22
+version=1.23
 revision=1
 build_style=gnu-makefile
 makedepends="libXpm-devel"
-short_desc="A classic system monitoring tool"
+short_desc="Classic system monitoring tool"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.pogo.org.uk/~mark/xosview"
 distfiles="http://www.pogo.org.uk/~mark/xosview/releases/xosview-${version}.tar.gz"
-checksum=901b75af2676b11b28b88f0c79c5bd0f4f01de4790c0c5385edf6d71aee1f83a
+checksum=960acb68a8668e936e8dc71cc4e3926d879f47559b4a5f64555bdcc676c6739d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# does not have asm/io.h

From fd34f7b5db9933727811cfd1f260670cd3bc5777 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 2 Mar 2022 20:49:50 +1100
Subject: [PATCH 0009/2561] MoarVM: update to 2022.02.

---
 srcpkgs/MoarVM/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index f2e7dd6dc664..f437404bd76c 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2021.12
+version=2022.02
 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=d49bbeb10d9616c2d87a7fadd1c6bb7a5ce11c19c7c44bbb8bef76f25b505c4f
+checksum=4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96
 nocross=yes
 shlib_provides="libmoar.so"

From 88a02c8d6d1feb47b5cb4641f731e93776fc3b03 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 2 Mar 2022 20:51:19 +1100
Subject: [PATCH 0010/2561] nqp: update to 2022.02.

---
 srcpkgs/nqp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index 392da8ee3e64..e80e23f80ee6 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2021.12
+version=2022.02
 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=0e1d534fd1ee61a4c8072309bafbc04660e9ae72d88618daa0e8f15022f0d913
+checksum=25d3c99745cd84f4049a9bd9cf26bb5dc817925abaafe71c9bdb68841cdb18b1
 nocross=yes

From 8ae5d84c1fe30a1e909b9d9716635c6c87ebc828 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 2 Mar 2022 20:52:51 +1100
Subject: [PATCH 0011/2561] rakudo: update to 2022.02.

---
 srcpkgs/rakudo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index ab23fedcaa48..979c33def794 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2021.12
+version=2022.02
 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=7f53d2c7138d13ab01692d5bd7dbc28f3f29ed86bd96d5280856f55a1ab05406
+checksum=6a6e9dbcc6d9a1610a34c6ec67e2d3f694d7b33e9e0a0f224543089fa7f71332
 nocross=yes
 provides="raku-${version}_${revision}"
 

From dff90fdda89b655b1d3b6c23d1bec77fb990d252 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Feb 2022 02:33:26 +0100
Subject: [PATCH 0012/2561] libjpeg-turbo: update to 2.1.3.

---
 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 935b5088f210..4f7f43cf1204 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.2
+version=2.1.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -11,7 +11,7 @@ license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 changelog="https://raw.githubusercontent.com/libjpeg-turbo/libjpeg-turbo/main/ChangeLog.md"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5
+checksum=467b310903832b033fe56cd37720d1b73a6a3bd0171dbf6ff0b620385f4f76d0
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"

From 6643ad794bb09be57a2d7e2e4e8eed0e1846c4c4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Feb 2022 02:12:43 +0100
Subject: [PATCH 0013/2561] mplayer: update to 1.5.

---
 srcpkgs/mplayer/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template
index 6bf5f3d1b08d..e4ee92dee1dd 100644
--- a/srcpkgs/mplayer/template
+++ b/srcpkgs/mplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'mplayer'
 pkgname=mplayer
-version=1.4
-revision=6
+version=1.5
+revision=1
 wrksrc="MPlayer-${version}"
 build_style=configure
 hostmakedepends="pkg-config yasm"
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.mplayerhq.hu/"
 distfiles="http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz"
-checksum=82596ed558478d28248c7bc3828eb09e6948c099bbd76bb7ee745a0e3275b548
+checksum=650cd55bb3cb44c9b39ce36dac488428559799c5f18d16d98edb2b7256cbbf85
 
 nocross=yes
 
@@ -30,8 +30,6 @@ conf_files="
 	/etc/mplayer/codecs.conf"
 
 do_configure() {
-	sed 's|-march=i486||g' -i configure
-
 	# we tried runtime cpudetection for ppc32 but stuff's broken
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|x86_64*|ppc64*) configure_args+=" --enable-vdpau --enable-runtime-cpudetection";;

From 324c84b8abae289d55bf362a02f5317135db6b86 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 26 Feb 2022 11:48:49 +0100
Subject: [PATCH 0014/2561] cpuid: update to 20220224.

---
 srcpkgs/cpuid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 61d6868aaf8b..4c651ab451cd 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20211210
+version=20220224
 revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
@@ -10,4 +10,4 @@ maintainer="Gerardo Di Iorio  <arete74@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.etallen.com/cpuid.html"
 distfiles="http://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=e029895700de1a6f83360252804892cd58b54d1f5ff3af44b7bb6afe410e5f44
+checksum=4a19de2a118aee44f856cd1becfa5a192574b5957795372a86e37dca24da1f9d

From 3fe62c82c3fc388f77a5d088119be2873e5e87a8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 25 Feb 2022 21:36:09 +0200
Subject: [PATCH 0015/2561] mercurial: update to 6.0.3.

---
 srcpkgs/mercurial/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 87d80c12555a..778d60757cf6 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.9.3
+version=6.0.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-devel gettext"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=3b43f68977ad0fa75aa7f1e5c8f0a83ba935621ab2396129abb498e56d1be08e
+checksum=67f13647a46517a2b567cdcb73c98721d75d36a0432debb15022b77f9c138333
 
 pre_check() {
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then

From 9d102b10ef0b9825fbdb133fd0af427205172566 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 19 Feb 2022 14:04:14 +0200
Subject: [PATCH 0016/2561] python3-distro: update to 1.7.0.

---
 srcpkgs/python3-distro/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index d573bc5b60c8..12554d77cfb4 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=2
+version=1.7.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,5 +12,6 @@ short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
+changelog="https://raw.githubusercontent.com/python-distro/distro/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39

From 9e3a5db3dbcfddca48348637b57d9772187f8812 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Feb 2022 15:06:09 +0100
Subject: [PATCH 0017/2561] sigil: update to 1.9.0.

---
 srcpkgs/sigil/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index ce12835e5a53..8e6fdb0c959e 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.8.0
+version=1.9.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -18,8 +18,9 @@ short_desc="Multi-platform EPUB ebook editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
+changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=33d84331f259ab8d92fc2c5fed6f05fd5f011695c48f83537423635a7afdd2ec
+checksum=c44b0cf2472ef59c4d76178883a7795af39febf32496fb7af1e34f7a3977791f
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From cac513090b4d94c29c11c6e329698b126d8d6340 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Mar 2022 11:50:18 +0100
Subject: [PATCH 0018/2561] Komikku: update to 0.37.0.

---
 srcpkgs/Komikku/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 91de9f9e4f0c..89da2026f68e 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.35.2
+version=0.37.0
 revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -16,4 +16,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
 distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=b349c67a5b4ddf49b6edf87e5fb4a8f41a1f10a0967ff7d4fe4db40eb0b4eb72
+checksum=f126d91a21663d60c502a45ad9171bad933255839bc17a20b2f6c83500dfc4bf

From efb3e8ba81e13801a2f9d57b44dc968599d52c2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Mar 2022 12:04:35 +0100
Subject: [PATCH 0019/2561] Minder: update to 1.14.0.

---
 srcpkgs/Minder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index 2022aca4548d..da4f9b751c20 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,17 +1,17 @@
 # Template file for 'Minder'
 pkgname=Minder
-version=1.13.1
+version=1.14.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
 makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
- libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel"
+ libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel json-glib-devel"
 short_desc="Mind-mapping application designed for Pantheon"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/phase1geo/Minder"
 distfiles="https://github.com/phase1geo/Minder/archive/${version}.tar.gz"
-checksum=f319501e40e53e7721864d73e8c071960acc40a4f32dd84e85646a2031be215a
+checksum=7561084a0ee51b51a1e25753dbdd34f48632cc340c89cd78c591a539d8cef653
 
 post_install() {
 	vinstall data/com.github.phase1geo.minder.desktop 644 /usr/share/applications/

From 0b72691c69b78ecfd92dc84cfd4b1368ce3e6ccc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Mar 2022 14:33:18 +0100
Subject: [PATCH 0020/2561] blanket: update to 0.5.0.

---
 srcpkgs/blanket/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 7bde1ef9e8fe..57d75b5ba8d1 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -1,7 +1,7 @@
 # Template file for 'blanket'
 pkgname=blanket
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"
 depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libhandy1"
@@ -10,5 +10,5 @@ maintainer="Reback00 <reback00@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rafaelmardojai/blanket"
 distfiles="https://github.com/rafaelmardojai/blanket/archive/refs/tags/${version}.tar.gz"
-checksum=fbb5f34a704840c50bb5b29f6fae69a2f37677d88db717b79e6bf6fdd625d9eb
+checksum=5af1d417d31bafff7c13a48e26bc4daae58a537f312b4ffb6911ae1b8b09a1d1
 python_version=3

From 183ced720f95bbcf9e9aa6526b106fd31963e2d4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 8 Mar 2022 16:24:43 +0100
Subject: [PATCH 0021/2561] python3-py7zr: remove importlib_metadata dependency

* only required until Python 3.8
---
 srcpkgs/python3-py7zr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
index ecd53ab39117..7dcdc642f601 100644
--- a/srcpkgs/python3-py7zr/template
+++ b/srcpkgs/python3-py7zr/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-py7zr'
 pkgname=python3-py7zr
 version=0.16.4
-revision=1
+revision=2
 wrksrc="py7zr-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+depends="python3-texttable python3-pycryptodomex
  python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj
  python3-multivolumefile"
 short_desc="7zip in python3 with various compressions, and AES encryption"

From 2e8aa48a9b109e4691f5aeb07094a54967081ad5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 8 Mar 2022 21:51:57 +0100
Subject: [PATCH 0022/2561] avahi: remove intltool build dep

---
 srcpkgs/avahi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 080d04537e75..c6cbd3860135 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -28,7 +28,7 @@ checksum="060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
  83edd888ccc464ab032134a45b7ded3bc43cb1dda2cd921ff47b01949d98ed7c"
 skip_extraction="build-db.txt"
 
-hostmakedepends="pkg-config intltool python3"
+hostmakedepends="pkg-config gettext python3"
 makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
 conf_files="
 	/etc/avahi/services/ssh.service

From 342ff1f3cd04b6b7ad31dd4fbbf4fd2dd8b5656e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 9 Mar 2022 15:25:13 +0100
Subject: [PATCH 0023/2561] fontforge: update to 20220308.

---
 srcpkgs/fontforge/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/fontforge/template b/srcpkgs/fontforge/template
index 7c116429856d..f768483ba14c 100644
--- a/srcpkgs/fontforge/template
+++ b/srcpkgs/fontforge/template
@@ -1,14 +1,13 @@
 # Template file for 'fontforge'
 pkgname=fontforge
-version=20201107
-revision=2
+version=20220308
+revision=1
 build_style=cmake
 hostmakedepends="automake ca-certificates gettext libltdl-devel libtool m4
  pkg-config python3"
-makedepends="libltdl-devel python3-devel zlib-devel pango-devel readline-devel
- giflib-devel libpng-devel libjpeg-turbo-devel tiff-devel libxml2-devel
- libspiro-devel hicolor-icon-theme desktop-file-utils libuninameslist-devel
- gtk+3-devel"
+makedepends="desktop-file-utils giflib-devel gtk+3-devel hicolor-icon-theme
+ libjpeg-turbo-devel libltdl-devel libpng-devel libspiro-devel libxml2-devel
+ pango-devel python3-devel readline-devel tiff-devel woff2-devel zlib-devel"
 depends="desktop-files-utils"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Create and modify PostScript, TrueType and SVG fonts"
@@ -16,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://fontforge.github.io/en-US/"
 distfiles="https://github.com/fontforge/fontforge/archive/${version}.tar.gz"
-checksum=274f8c8cbd7b6a1c77d2a1c03d4d6cd3c9319db62be8b8c88fabbf597f7e863c
+checksum=58bbc759eb102263be835e6c006b1c16b508ba3d0252acd5389062826764f7a5
 
 post_extract() {
 	# Disable unused #include <execinfo.h>

From 544106603a8d05db63c101cf4ea2b8b486ed303f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 20:42:22 +0100
Subject: [PATCH 0024/2561] freshplayerplugin: remove.

---
 .../patches/addvoidpepper.patch               | 11 ----------
 .../freshplayerplugin/patches/ffmpeg4.patch   | 16 --------------
 srcpkgs/freshplayerplugin/template            | 21 -------------------
 srcpkgs/removed-packages/template             |  3 ++-
 4 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/freshplayerplugin/patches/addvoidpepper.patch
 delete mode 100644 srcpkgs/freshplayerplugin/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/freshplayerplugin/template

diff --git a/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch b/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch
deleted file mode 100644
index 8dacb2570781..000000000000
--- a/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/config_pepperflash.c
-+++ b/src/config_pepperflash.c
-@@ -80,6 +80,9 @@
-     // Chrome component update
-     "~/.config/google-chrome/PepperFlash/*/libpepflashplayer.so",
-
-+    // chromium-pepper-flash (Void Linux)
-+    "/usr/lib/chromium-pepper-flash",
-+
-     NULL,
- };
diff --git a/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch b/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch
deleted file mode 100644
index 53fd1a31acdd..000000000000
--- a/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/ppb_video_decoder.c.orig        2018-05-03 22:08:33.026677145 +0200
-+++ b/src/ppb_video_decoder.c     2018-05-03 22:09:26.176206079 +0200
-@@ -542,9 +542,9 @@
-         goto err;
-     }
-
--    if (vd->avcodec->capabilities & CODEC_CAP_TRUNCATED) {
--        trace_info("%s, codec have CODEC_CAP_TRUNCATED\n", __func__);
--        vd->avctx->flags |= CODEC_FLAG_TRUNCATED;
-+    if (vd->avcodec->capabilities & AV_CODEC_CAP_TRUNCATED) {
-+        trace_info("%s, codec have AV_CODEC_CAP_TRUNCATED\n", __func__);
-+        vd->avctx->flags |= AV_CODEC_FLAG_TRUNCATED;
-     }
-
-     vd->avctx->opaque = vd;
-
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
deleted file mode 100644
index f24272ef708f..000000000000
--- a/srcpkgs/freshplayerplugin/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'freshplayerplugin'
-pkgname=freshplayerplugin
-version=0.3.9
-revision=9
-build_style=cmake
-hostmakedepends="pkg-config ragel"
-makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
- libvdpau-devel libva-devel ffmpeg-devel v4l-utils-devel libdrm-devel MesaLib-devel"
-short_desc="PPAPI2NPAPI compatibility layer for Pepper Flash"
-maintainer="Emanuel Serpa <emanuel@openmailbox.org>"
-license="MIT"
-homepage="https://github.com/i-rinat/freshplayerplugin"
-changelog="https://raw.githubusercontent.com/i-rinat/freshplayerplugin/master/ChangeLog"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4fa4fe07e812f6e10784ff984e1389b9b444ca44b84101999c6fad8f55db59d9
-
-do_install() {
-	vinstall build/libfreshwrapper-flashplayer.so 755 usr/lib/mozilla/plugins
-	vsconf data/freshwrapper.conf.example
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bd67947de02f..a7a19630a01a 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=63
+revision=64
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -70,6 +70,7 @@ replaces="
  enventor<=1.0.0_2
  epstopdf<=2.27_3
  fontmatrix<=0.6.0.20171228_2
+ freshplayerplugin<=0.3.9_9
  fuse-usmb<=20130204_7
  gconf-editor<=3.0.1_3
  gegl3<=0.3.28_2

From e3872b0f411da0aa88d2269f8cc490a9460098df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:12:21 +0100
Subject: [PATCH 0025/2561] girara: fix distfiles location

---
 srcpkgs/girara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template
index c45def53b929..6bcbe95b8076 100644
--- a/srcpkgs/girara/template
+++ b/srcpkgs/girara/template
@@ -10,8 +10,8 @@ short_desc="Library implementing a user interface that focuses on minimalism"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://pwmt.org/projects/girara/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=77132e9bd652f1c9e4260de046768ea449a7d977c4cd3d6d817d2d72b6f946e0
+distfiles="https://git.pwmt.org/pwmt/girara/-/archive/${version}/girara-${version}.tar.gz"
+checksum=41342213f8e745258f1db28cbb6ccc27a63009a5e001bf791bbe01ce436d4db7
 
 build_options="notify"
 build_options_default="notify"

From aedf0020bc498e6687e8c6cd65caf598a473726e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:07:53 +0100
Subject: [PATCH 0026/2561] fractal: fix cross

---
 srcpkgs/fractal/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index cd5ea935a87f..37461c7272bc 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -16,6 +16,11 @@ homepage="https://wiki.gnome.org/Apps/Fractal"
 distfiles="https://gitlab.gnome.org/World/fractal/-/archive/$version/$pkgname-$version.tar.gz"
 checksum=3c3ea4e67e6d8fbc2e7b220fef188dcde5229e83c2cfeeadee42137718b34e56
 
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
+
 post_patch() {
 	[ -z "$CROSS_BUILD" ] && return 0
 

From 1c780b126448195057b42ff6027ccab31b232860 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 9 Mar 2022 11:57:37 +0100
Subject: [PATCH 0027/2561] miniflux: update to 2.0.36.

---
 srcpkgs/miniflux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 41757c6201bf..886d40df8a9f 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.35
+version=2.0.36
 revision=1
 wrksrc="v2-${version}"
 build_style=go
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/v2/master/ChangeLog"
 distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=8f9693380754072d1a74671c6b645abe7ddb0c8d22651ebc867b1af6dfcc4229
+checksum=15ac4ad4ab6f87de2143a85f52252e80d7c216a69aab334363e1972b81f231fd
 system_accounts="_miniflux"
 
 post_install() {

From 298e43cd18e1616b4e9b848b49c5d0e968f5db91 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 18:59:31 +0100
Subject: [PATCH 0028/2561] warzone2100: update to 4.2.7.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index af3746aaffc1..9ef2297baeb7 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.2.6
+version=4.2.7
 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=b1d1dcfe2d5f7db4c063b7a13ba2ec21afa597e2c792e5c8c1cc13204398dbc8
+checksum=7f527ce00eda44099b1a7e3c303ede276f835f6d6ad945b0600a175ddabb00b0
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 6abb0bba570774c825f201715b29b1cd813ee42c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 19:42:39 +0100
Subject: [PATCH 0029/2561] vlc: update to 3.0.17.

---
 srcpkgs/vlc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 2cd761b3ddb4..309477a2f775 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.16
-revision=6
+version=3.0.17
+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=ffae35fc64f625c175571d2346bc5f6207be99762517f15423e74f18399410f6
+checksum=48bd9bf337aa107a1524eba57c52dc4a91e29f5a97fbdee92f6a4dba90383cd0
 
 lib32disabled=yes
 

From 0d83ad81126aab7d0eed0c477bf8a0522cd8deb0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 19:46:14 +0100
Subject: [PATCH 0030/2561] linux5.4: update to 5.4.183.

---
 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 bc25dbd847b2..439a5538b1c1 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.182
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d
+checksum=2d4b0b77644835410b2a5f599b2893fe199d5542615684207f579753020cc99c
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 91aaeac67c3b85bb344ebe3bcbcefea230354492 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 19:49:11 +0100
Subject: [PATCH 0031/2561] linux4.19: update to 4.19.233.

---
 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 b38210b714e2..5a274df27b39 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.232
+version=4.19.233
 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=4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c
+checksum=b8f665f020c2724a9f1e0368fdc0ea451b0b7d915ffae7ef4b9ec27a550fce37
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From ae2b035ae8d18ad00a85801750f4005ccd5f469d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:22:37 -0500
Subject: [PATCH 0032/2561] python3-numpy: update to 1.22.3.

Fixes #36062.
---
 srcpkgs/python3-numpy/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 51bd23a1ec97..957551b64d91 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.22.2
+version=1.22.3
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=3428c3bd846beca1cd4417ebee6eab8bb62e987fc3101e5858d74c92b312d096
+checksum=c8f3ec591e3f17b939220f2b9eabb4c5e2db330f8af62c0a3aeee8a4d1a6c0db
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
@@ -69,13 +69,8 @@ pre_build() {
 }
 
 post_install() {
-	# create compat symlinks for .h files
-	vmkdir ${py3_inc}
-	ln -sfr ${DESTDIR}/${py3_sitelib}/numpy/core/include/numpy \
-		${DESTDIR}/${py3_inc}
+	rm ${DESTDIR}/usr/bin/f2py
 
-	rm -f ${DESTDIR}/usr/bin/f2py
-
-	rm -f ${DESTDIR}/usr/lib/python*/site-packages/numpy/LICENSE.txt
+	rm ${DESTDIR}/${py3_sitelib}/numpy/LICENSE.txt
 	vlicense LICENSE.txt LICENSE
 }

From ad5dc1f2d8c3ff025e1f420264b7d512351237b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:54:45 -0500
Subject: [PATCH 0033/2561] maturin: update to 0.12.10.

---
 srcpkgs/maturin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index d3c387fdfaa7..a7de61b7704a 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,15 +1,15 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.9
+version=0.12.10
 revision=1
 build_style=cargo
 build_helper=qemu
 # 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 log,upload,human-panic"
-hostmakedepends="python3-setuptools python3-toml"
+hostmakedepends="python3-setuptools python3-tomli"
 makedepends="openssl-devel"
-depends="python3-toml"
+depends="python3-tomli"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="26b094c20c9939cc9df5632b4b8d8921c4086b27a4867b439297e616f5781716
+checksum="764d91bb35a41d0fa389f3e8179353c0a7e173fbb52c6d434e2877951f15e4a4
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From a1bf0516bb193721458bf4a9131518852653d2c1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:56:54 -0500
Subject: [PATCH 0034/2561] python3-ipython: update to 8.1.1.

---
 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 387bd59fbc55..07bdc201821d 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.1.0
+version=8.1.1
 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=42c23e90b2deaae631266885de1656a517a1673d7e1db57e8eb3a4bb6cd5ce1b
+checksum=8138762243c9b3a3ffcf70b37151a2a35c23d3a29f9743878c33624f4207be3d
 conflicts="python-ipython<=5.8.0_2"
 
 do_check() {

From bce3e8b0909ef318c5dfe6e1ddeb8c119adcd8e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:57:11 -0500
Subject: [PATCH 0035/2561] python3-pip: update to 22.0.4.

---
 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 4ba92b54262e..51b892eb0596 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=22.0.3
+version=22.0.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=f29d589df8c8ab99c060e68ad294c4a9ed896624f6368c5349d70aa581b333d0
+checksum=b3a9de2c6ef801e9247d1527a4b16f92f2cc141cd1489f3fffaf6a9e96729764
 # Tests have unpackaged dependencies
 make_check=no
 

From f6764072e705d2dcc57b84deafb8c9d6d468d600 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:57:22 -0500
Subject: [PATCH 0036/2561] python3-pylru: update to 1.2.1.

---
 srcpkgs/python3-pylru/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pylru/template b/srcpkgs/python3-pylru/template
index a44b59ad2714..91c93a98d8d1 100644
--- a/srcpkgs/python3-pylru/template
+++ b/srcpkgs/python3-pylru/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pylru'
 pkgname=python3-pylru
-version=1.2.0
-revision=3
+version=1.2.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/jlhutch/pylru"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c4dcf175f6317539199434db13ffea0f642a52fac1e547e2e5f0866686fc9292
+checksum=8d8d5ac67c5567137c53cf505a851a0c125666bd64402a111f141ae35db00859

From 13ab6857c81e6485277ef9612709a6b6a82f4312 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:57:48 -0500
Subject: [PATCH 0037/2561] python3-pytools: update to 2022.1.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 25c3394ed9fb..3280c48dfb07 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1
+version=2022.1.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=197aacf6e1f5d60c715b92438792acb7702aed59ebbfb147fa84eda780e54fee
+checksum=3eebcc11923bf36fc42a9102d6e417a94817efb1aeb24d3149686dd5e3ec54d4
 
 post_install() {
 	vlicense LICENSE

From 1139b85622fd818fb68d220a40748076e6bf2b7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Mar 2022 22:34:15 +0100
Subject: [PATCH 0038/2561] libvirt: fix virsh undefine

closes #36061
closes #35996
---
 srcpkgs/libvirt/patches/823a62ec.patch | 48 ++++++++++++++++++++++++++
 srcpkgs/libvirt/template               |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libvirt/patches/823a62ec.patch

diff --git a/srcpkgs/libvirt/patches/823a62ec.patch b/srcpkgs/libvirt/patches/823a62ec.patch
new file mode 100644
index 000000000000..5fcc644d3e5a
--- /dev/null
+++ b/srcpkgs/libvirt/patches/823a62ec.patch
@@ -0,0 +1,48 @@
+From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
+From: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Date: Tue, 1 Mar 2022 18:47:59 +0100
+Subject: [PATCH] qemu: segmentation fault in virtqemud executing
+ qemuDomainUndefineFlags
+
+Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
+
+Stack trace of thread 664419:
+ #0  0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
+ #1  0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
+ #2  0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
+        at src/remote/remote_daemon_dispatch_stubs.h:13080
+ #3  remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
+        at src/remote/remote_daemon_dispatch_stubs.h:13059
+ #4  0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
+        at ../src/rpc/virnetserverprogram.c:428
+ #5  virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
+ #6  0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
+ #7  virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
+ #8  0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
+ #9  0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
+ #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
+ #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
+
+Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Reviewed-by: Jim Fehlig <jfehlig@suse.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index bcd9bdb436..8337eed510 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
+         }
+     }
+ 
+-    if (vm->def->os.loader->nvram) {
++    if (vm->def->os.loader && vm->def->os.loader->nvram) {
+         nvram_path = g_strdup(vm->def->os.loader->nvram);
+     } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
+         qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
+-- 
+GitLab
+
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 1568aa905a56..bf08aa899e00 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
 version=8.1.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
  -Dpolkit=enabled"

From 0383be72ab9b818eec1ad65cbea2957e2102979f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 23:06:26 +0100
Subject: [PATCH 0039/2561] jwm: remove faulty fix_dvorak.patch

was causing segfault when running `jwm -p`.
---
 srcpkgs/jwm/patches/fix_dvorak.patch | 31 ----------------------------
 srcpkgs/jwm/template                 |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 srcpkgs/jwm/patches/fix_dvorak.patch

diff --git a/srcpkgs/jwm/patches/fix_dvorak.patch b/srcpkgs/jwm/patches/fix_dvorak.patch
deleted file mode 100644
index a8c1a02a9c5b..000000000000
--- a/srcpkgs/jwm/patches/fix_dvorak.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1aa74e96e32b4012ee0e13ada22b64811b519bab Mon Sep 17 00:00:00 2001
-From: Olga Ustuzhanina <me@laserbat.pw>
-Date: Thu, 24 Jan 2019 15:07:31 +0700
-Subject: [PATCH] fix desktop switching on dvorak layouts
-
----
- src/binding.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/binding.c b/src/binding.c
-index dc23b640..8c238717 100644
---- a/src/binding.c
-+++ b/src/binding.c
-@@ -18,6 +18,8 @@
- #include "root.h"
- #include "tray.h"
- 
-+#include <X11/XKBlib.h>
-+
- #define MASK_NONE    0
- #define MASK_SHIFT   (1 << ShiftMapIndex)
- #define MASK_LOCK    (1 << LockMapIndex)
-@@ -418,7 +420,7 @@ void InsertBinding(ActionType action, const char *modifiers,
- 
-             for(temp[offset] = '1'; temp[offset] <= '9'; temp[offset]++) {
- 
--               sym = ParseKeyString(temp);
-+               sym = XkbKeycodeToKeysym(display, temp[offset] - '1' + 10, 0, 0);
-                if(sym == NoSymbol) {
-                   Release(temp);
-                   return;
diff --git a/srcpkgs/jwm/template b/srcpkgs/jwm/template
index 3d052853912c..6595c27e2d6a 100644
--- a/srcpkgs/jwm/template
+++ b/srcpkgs/jwm/template
@@ -1,7 +1,7 @@
 # Template file for 'jwm'
 pkgname=jwm
 version=2.4.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config which"
 makedepends="

From c46a04dba7186b37ac5f040fd336c9fd6b6cf966 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 2 Mar 2022 10:29:49 -0500
Subject: [PATCH 0040/2561] python3-phonenumbers: update to 8.12.44.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index f84326ecff0f..9cb6d6a351f6 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.43
+version=8.12.44
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=1c8270a2e257d6c65458a42283f82d3eca7f7b9d925454a6966e2f04df75e1cf
+checksum=26cfd0257d1704fe2f88caff2caabb70d16a877b1e65b6aae51f9fbbe10aa8ce

From 856a1d32b3fabdce329308650dd988662d5e089a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 4 Mar 2022 21:03:26 -0500
Subject: [PATCH 0041/2561] python3-saml2: update to 7.1.2.

---
 srcpkgs/python3-saml2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 673cfd1edac5..ce87ae737d8d 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-saml2'
 pkgname=python3-saml2
-version=7.1.1
+version=7.1.2
 revision=1
 wrksrc="pysaml2-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://github.com/IdentityPython/pysaml2"
 changelog="https://raw.githubusercontent.com/IdentityPython/pysaml2/master/CHANGELOG.md"
 distfiles="https://github.com/IdentityPython/pysaml2/archive/v${version}.tar.gz"
-checksum=ef271ad65d82dcb18f20b380003600f74e0b4c938596002befd79d63e09d87ec
+checksum=308934d5cd5f22a3ea7bd8d4fb5423ab0f5b0f08bf541e7c6b2cb0eb7302a3ab
 
 do_check() {
 	# Ignore tests that depend on unpackaged python dependency 'pymongo'

From bddd0775a5559e4542715c22a77d760c0e7b20e1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 4 Mar 2022 21:06:29 -0500
Subject: [PATCH 0042/2561] python3-canonicaljson: update to 1.6.0.

---
 srcpkgs/python3-canonicaljson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index 7dbdf1adb9d0..b9535436442b 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
-version=1.5.0
+version=1.6.0
 revision=1
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=5ebddcd74c5b066ee68ecca56465338e9b1380467e0a906f4797697c9fb381e2
+checksum=8739d5fd91aca7281d425660ae65af7663808c8177778965f67e90b16a2b2427

From f07008a5bc62a0d64c8b547ab1fe7a1be4115a8f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Mar 2022 10:37:47 -0500
Subject: [PATCH 0043/2561] synapse: update to 1.54.0.

---
 srcpkgs/synapse/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 19153bc23bc3..f28f1313dcd0 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.53.0
+version=1.54.0
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -12,7 +12,8 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-phonenumbers python3-prometheus_client python3-attrs python3-netaddr
  python3-setuptools python3-bleach python3-Jinja2 python3-psycopg2 python3-lxml
  python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
- python3-typing_extensions python3-ijson python3-matrix-common"
+ python3-typing_extensions python3-ijson python3-matrix-common
+ python3-packaging"
 checkdepends="$depends python3-parameterized python3-pytest"
 short_desc="Matrix reference homeserver"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
@@ -20,7 +21,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=e9fb5c8d1178996e677f6ce8f44c11d9294da0a06297fffa34706879870f9bf4
+checksum=6e9ee5f0657fe01c5d141101b11c2c2da147003f7f8e684ef44d4f462125b7a1
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From b082ec0a720cce9297ba5924f1151bf4a8925a15 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 9 Mar 2022 15:20:44 -0600
Subject: [PATCH 0044/2561] New package: terraform-docs-0.16.0

---
 srcpkgs/terraform-docs/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/terraform-docs/template

diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
new file mode 100644
index 000000000000..cc03309e372b
--- /dev/null
+++ b/srcpkgs/terraform-docs/template
@@ -0,0 +1,16 @@
+# Template file for 'terraform-docs'
+pkgname=terraform-docs
+version=0.16.0
+revision=1
+build_style=go
+go_import_path="github.com/$pkgname/$pkgname"
+short_desc="Utility to generate documentation from Terraform modules"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="MIT"
+homepage="https://terraform-docs.io/"
+distfiles="https://$go_import_path/archive/v$version.tar.gz"
+checksum=e370fd106ca74caebc8632834cc28412a3a6a160952392da71f213515bba2085
+
+post_install() {
+	vlicense LICENSE
+}

From fa8b6ff5aaaac79299e5c19f41e45af2536c5b08 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 8 Mar 2022 20:51:53 -0500
Subject: [PATCH 0045/2561] delta: update to 0.12.1, restore cross

---
 srcpkgs/delta/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 32984c557cb7..dd9809f3f7e1 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.11.3
+version=0.12.1
 revision=1
 build_style=cargo
 checkdepends="git"
@@ -9,9 +9,12 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=cf68f43d4d26c10551c0137a7e718719958e52267d83f29a8f7794af12095b9e
-make_check=no  # TODO: Re-enable checks when Rust gets updated
-nocross=yes # fails with current rust
+checksum=1b97998841305909638008bd9fa3fca597907cb23830046fd2e610632cdabba3
+
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
 
 post_install() {
 	vlicense LICENSE

From c26798f5b7eecaa0db8ca6842300f71a297e5315 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 9 Mar 2022 01:20:54 +0100
Subject: [PATCH 0046/2561] sigil: update to 1.9.1.

---
 srcpkgs/sigil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 8e6fdb0c959e..47b8b14dd330 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.9.0
+version=1.9.1
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c44b0cf2472ef59c4d76178883a7795af39febf32496fb7af1e34f7a3977791f
+checksum=08a6c52a9043ecb5fa8314783191b81aa21346bd6b937a522ee417e7bb0dc773
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 7bca3f0764210c01ae077e9702b12e11ea526b16 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 8 Mar 2022 15:19:04 +0100
Subject: [PATCH 0047/2561] dbeaver: update to 22.0.0.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index d6c1958bbb3e..d20837b230c8 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.3.5
+version=22.0.0
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -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=c6f822f4e88bffd37ba0b2525625bbd83156ec36725c2d29101c97f12e280d03
+checksum=c4e995ce3c46723f071faefe8dc68df54f001c634e757a9bf89c594fe3a55613
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

From 2ba10af44f02eb1cffb2795e55adb7031c9b2ec7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 20:01:58 +0100
Subject: [PATCH 0048/2561] libgsf: update to 1.14.48.

---
 srcpkgs/libgsf/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template
index a0d675a3de49..132ac53261b5 100644
--- a/srcpkgs/libgsf/template
+++ b/srcpkgs/libgsf/template
@@ -1,6 +1,6 @@
 # Template file for 'libgsf'
 pkgname=libgsf
-version=1.14.47
+version=1.14.48
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -12,8 +12,9 @@ short_desc="Structured File Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnome.org/"
+changelog="https://gitlab.gnome.org/GNOME/libgsf/-/raw/master/ChangeLog"
 distfiles="${GNOME_SITE}/libgsf/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d188ebd3787b5375a8fd38ee6f761a2007de5e98fa0cf5623f271daa67ba774d
+checksum=ff86d7f1d46dd0ebefb7bd830a74a41db64362b987bf8853fff6ab4c1132b837
 
 pre_configure() {
 	autoreconf -fi

From 7704d801e4cdf6465f621e6b7e9e87b557392d34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 19:49:10 +0100
Subject: [PATCH 0049/2561] libidn2: update to 2.3.2.

---
 srcpkgs/libidn2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libidn2/template b/srcpkgs/libidn2/template
index c3c2ce9e6a26..e7f490959388 100644
--- a/srcpkgs/libidn2/template
+++ b/srcpkgs/libidn2/template
@@ -1,6 +1,6 @@
 # Template file for 'libidn2'
 pkgname=libidn2
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake gettext-devel libtool pkg-config"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://www.gnu.org/software/libidn/#libidn2"
 changelog="https://gitlab.com/libidn/libidn2/-/raw/master/NEWS"
 distfiles="${GNU_SITE}/libidn/libidn2-${version}.tar.gz"
-checksum=8af684943836b8b53965d5f5b6714ef13c26c91eaa36ce7d242e3d21f5d40f2d
+checksum=76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91
 
 pre_configure() {
 	autoreconf -if

From 340c2b55686bf003b388d273d9e39ed6c22ddfaa Mon Sep 17 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, 10 Mar 2022 07:28:31 +0700
Subject: [PATCH 0050/2561] spotify-adblock-linux: clean-up

---
 .../files/spotify-adblock.desktop                     | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop

diff --git a/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop b/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
deleted file mode 100644
index 074ba5775a5b..000000000000
--- a/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Spotify (adblock)
-GenericName=Music Player
-Icon=spotify-client
-TryExec=spotify
-Exec=env LD_PRELOAD=/usr/lib/spotify-adblock.so spotify %U
-Terminal=false
-MimeType=x-scheme-handler/spotify;
-Categories=Audio;Music;Player;AudioVideo;
-StartupWMClass=spotify

From 5b2219d7d408aaf7832f9f9de3ec505a388e26e2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 9 Mar 2022 15:38:47 +0100
Subject: [PATCH 0051/2561] firefox: update to 98.0.

---
 srcpkgs/firefox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 0f1d1933c03e..8d4e8b1ecb2a 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=97.0.2
+version=98.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=c9f127741beabde78b021dc95b1740259d01677d461400682cb30e072126f075
+checksum=fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd
 
 lib32disabled=yes
 

From 7563325fd5add7a990e7335ae8c329a826d6b8eb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 9 Mar 2022 15:38:55 +0100
Subject: [PATCH 0052/2561] firefox-i18n: update to 98.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 bfdb1893da22..713c5914d0ab 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=97.0.2
+version=98.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="711d38544847e9ea74ec6c1adc2a87359f6114f7538a19a08aa9b39af6d86af2
- 8805946b3e3a76175bb6a32c7dd3a0525274b076afcf19f786362299aad282d3
- da191476f0f624a47bba2bc1382333dca67fd256cb3a541d97642304afd17fd6
- dc12c37abd5747e84aae8e4d942e721015813cea6da9fb2da398c8b88317ecae
- c83f1458f8003ea1e746a2bc0e7c33a9bfe1b61827b8ef48b7940e7dcb7266d8
- b6ddab275ccdd04881834a185e11c3b2a6e85b44b054d98c00e67d2044213fef
- ddd33119b4e0e80493d6fadb1bf0cd1275b469ded565da0303e78e46b591b4bb
- d6f9f5fbd5579631b0d824bc4d0654e5862ad62bebcbeec63edae3550773500e
- 39e4bf91ca90d77dcb97f3642dcdf04e12fc297f5e33969f557ce9d35f8a095b
- d1a126bfbf375114b12716b3b68e59458f4189ae87feda89c3d0f33ab80e66d2
- 2a823e92ea4a24a751040a6651b53dc3909353db84748d03d413e982d0d5b09c
- 1215642aad0c49fa4ce33fd55a92fc9948f50193ffcc0f705b69024c76c3e554
- 9f207a5a7ab721971251b00732ddc4af52937626719f561298bdf958b44b3b08
- 91eec747e15c744f199a829c9f04c3f88c32cb4edd084ae928d1bbaad62e3b79
- 07db181ed390bb6b77f816e4b5277ecf113b5648a132be0ba810f139e9237449
- a056a7d25c9e7b931f0195bd88e5e10df63a2f9bcbf6b3b6712e6f0b01a16806
- fac5ca4b7254bb78ea66c802105f6d501fcf373c058fe8af9a2182ff2ca8f03f
- 38b88252d9c2d8ee248c82d2191ee85b8702d46c3abc5b357dc688501bee1e34
- c0f3663bf61d61433541222eedd1cd37ca83ac01aeb5749a0cd5fb3193b0afa3
- 6de41349be51985aa19de40f9d09cbadbce5e333da3e0b7b54e32da522db5cda
- 8950a2c95e19913c5244d7639d80a74e4ba98d7c83ef7d1249af9d8b30b855ab
- d4867cdc49f6d53f45bbbeccb6fcbec4fb0acded1c946025a491756243f56001
- 1e531ade63594207d98e8720cee2d5cd34d8734cbd133ad646ea5f5459308b4f
- e5779b7142b9bf7b533e47e7fd47fc30068f2d7db979671c190518b9a306bca8
- ca51dbf1af8da13176b22d90feeade8c3eaead1f115b7da1be34a2e53ab1e937
- fd4bb194dbbca5c9f6537fccbe3856da41fc8c0e6c33b81bd037053bfed3e5a3
- abcb4ea5b585eb4a78781692ca80b75c73955a3b4526b30df707d7146e1a2107
- f9e1a0222c41dccb742309be1fb6cb22e217e117ca9460121ec898672bca9e2a
- 9c57c19591de2803766b9e9847745378c224b907b026d9a9146be1e6134274e4
- 457e512d642c7f80ad8638421019ae2fd371b528167e2be0cfe0becca911fc2b
- da11d9b3451f917aa388b342c829f00d6f81e219cfbd06605a8d922513849214
- da8d02366543bd36a29336fb203fba5011980b71847889fd24657626b61a8cbe
- ea49c349b6be0ff747fea4d08debdb0e4507307792ecd51c05f1929c646d5992
- 5015f52f2a061bd891d905b4d929915b57dd7440ddac59b62ee1389528523e09
- 661beeb7d220ad86e108be57cb032ec619fcfe735f78b6f96eb0f8d8b14d4ba2
- 1e80bdb89d96aa719363622f0a5960dae95b002a34d56f40f73817e50c9266a8
- be4f0af6b55af753315171b508c7aaca165ebbaaaf748cb6af36998b31df64b8
- 484dff3ca854329ef248c83df4413f4a41e1783f9e3ab44cb2b41e99b9788b0b
- 5a35b1184dadb6027960d1e0cd3acac6286f7ee3b67aecb93e0fe986803cf59f
- 61520b9337e75ea00b0c7e126fc36c4dcaf24564c5ee31f28a1209da75c7ec8a
- 775ccaacd49132212816313f4e881852374dd249dea2c7715935ef01f6123ccb
- db405bbe804d98b55d2aa526d7079c8702f0548d46ff83793ba238d2bf220d5f
- dd212faf00b2f48bf850f62c1f3615bb9ac6a3143217edad56b5812ae19ec15a
- 1aac0dbe4123b4fc88cf87255e7eb3b042e0415f49cd53e5fc910632ab614ccd
- f0faa8713a4ddd92d89ead3e202768c2ec448e060f18dc00fde87a7bc25dd76a
- b54474b2322b0845952e0a924a5f6e77195bebb5822c44c33622cf1061610b6a
- 2b6172294f78ee15a1c5fd751150132fe31cd8eb430e1f52d9e044a183473a92
- 00aaf9744109b74815042c5b1c8de65dbf6fe343dcb053567f4272c594da4257
- 71244a451478cda2dec27f8ec90890083ef735881f2c9704b98a9b6aefd84ce2
- 21434b8de86fe5248298e08722f11402f7840e68c019c93a6d215cb17dede252
- bb58afe4b2786da68441e919988b2203ab38ba25304d2d2223417655d0343c0b
- 91f9df67ed7b312cecd979d18041f6d395607a8564daa2bdeb16e74d2f60c1ae
- b8af6da30f2765375124fa213363c347590e11e5b7438605c1e0e0a9c347031d
- 1bd2f00d73573b568f1314a94246af52b5afd8dc509d620a9bc3021eaba75d37
- 200d15e3239f79fbec8a39e35f1f4139dcf434a9a1e9138a71d5c77535215b6a
- 4f4071649cf9b6e972bd3f7be36cea1939eefb4338aa5fa24cd9c6304fe74a62
- 7b9d7947fdd50a3ae7e49a26008c9fc8fafb443303ef4bfeb54e615483631989
- 2d9183491e5c460b8e662c495403e210e03a55a65cc3e57cb2d80c990e420d09
- b6655c5a9e2fb070508d70dd21d1a8da707d703335438ee8eccb76518d5273c8
- 3e4a696d97aa99c62f24bdf326c7cc628335f4b99e11aa242616509dd86ed50b
- dce0d2f0ced7865adb3cb34ce8295cfd23df5d796f7cce1da95ea084aed7063a
- a6fc74a8eeadb00237c21a0135681908a74b0a7dbc0a226f245bd4156cd2ec5b
- 0a1380c3993a7a275d8ef0a778784dbeeda62291010876378417e9511b47f982
- 0fdbd02fe36abeb72ed4aa728ab0e2c937d0224e583e464272d86f44d4609cbc
- f973ffbd380fce49db9edf64b5386ca57813b63d7a6f0435794f31f8c4a161fd
- 2ca75e3517ecd64125004806c98222dbc868c7a5ef8aef34ae5e81019b4591b5
- b228a9dc1a2e5b7b5fe78ce191d1c51e9db0013d05f580b80bc511d2618cf2ec
- 0ef7b62babd9ef2808490ee95dd6001d8a62c3106804c58757fb884fdf900410
- d985b8e7a677b694e64293f767f976ff4024763550e5b4150857724a7d5e36ee
- 8576c3c2d81f118f956a311fe54d5e4a45cf77c28d2aee30b62da7d27a266309
- cab9dc8fc76c26c82cd3c1a818e56f97524d413d6baaddb5fbfbc6446b0593f2
- c87bc1ae8c9c41cc61563f098fa88835bc67b947b7d8b8d8b2d2dc2fc941de1a
- 6bd7e96b564b99061f0f468d4b30ae77e72ef44909a5fee99ff5b2b2dd4f8706
- 81c4c1e7b9c9f315b8a3048bf784b990b0a71b38be837c1b73bf63945402d8c4
- f5ac4343c8bed58b9e018aac8964192a2b04cd10ebc95a6b1f37c306a47b85f7
- d8e0129850e4c1e312ffb9fdb3c42a2d671559387bc94e0668e93cf934273ba7
- 1264002195853450cdee6c7333775ed13fd26479d7fcb4e579113946fc97756a
- efe3fca2293b84d6b3eb28266677e0521fe7fc9e2985fcd5f6e0a3f6d6a46eeb
- ca496799f27d1566c3385e6f047f336fbf773bd9a6fa7e27bac97e853d17bed8
- a25e2715b447f329ccd749225a6155ae51b504908fed590f7e127ff6b5eb705f
- 0af4c3134d6c4362137406dfba47f3807ce582663a68362b32fb928a92f98580
- 1a4ad144cd1ba9773806bf8bf39b4b7bef26f35fc276e473c753d21a910a79d2
- 9c5bbe7d92835cb6b9ce9925352a74e95f22915930a39d17221e421cd0c1b948
- 92ebb48617b264736e1ea5b86b80dfc3f4fc3c517b29fe51fcfcb0f6bd5d10ed
- 0f1b1651f04f039d9fc55e183125a97b2806e7ab2654ad84fd0df050111f5bd9
- bb86e3d7e91f6102a4efbaff6f52ef24b277273185c46860fd7077017ac3dc8b
- 85e614958e4e9a59e88cb76ae1ff26c45e0f2aae1ac4545180e8bebeeb687327
- 4a3f9d8aaae340064bcf588455413387d9afee07737c9d62c65bae99004d5283
- 06fd12aade8ca116b7e33efdfd96d29701571bc9a966dd62ffcdb9243c155a7a
- 2038f234ba78e9a6ec5b97cabc445713369ac3ef14d9de7b152284a5c0b94ff4
- 4bb6828f28b425ccf1c73e08fef35db1ac065f062f64a8d2d6213b70554b2801
- bb51fd7d53e5ffd4b44967c0d1381a32777218be5cf4e1135cec05b8e07fdace
- ca95135eb63eb5bd9c4d63d92e9aae6af8ab44aea3730ac52b9382f65d7d1d90
- 54236cc83d40a305d35669c45ea670f6e07b2e3b0bacb01fb0f9f37149cb1478
- 1b18c0255e1f73ebad87795cea2bb8cffa62641c75476e4d9466088407bb66b5
- abb80985d3c25c6bd22d42643a74a5d585d77c7ff0c5264660a8bc06edbbf9d8"
+checksum="dff169f590c9ba54034df42a131d067a30e6ed967fc0e5142705df22d8ea977f
+ b73f738bae53b0afbe28d087a889ab7c98e3b325cfd5122cc60eea59a7db8616
+ 4f13f00bda1aafc6a2d97041fcb3740a4e8c1c049bba151b3791924d73d3ef06
+ 02ab060f05a1a2af373c2a3fe48ef891fa6d1835ddee77ba9678f22bb4782e86
+ b02d91316af55caf87abd7650b286f9c181eb7added7d021446ae2976ff69bbd
+ dfb07ae1cfc143166fdada9e378cb4f22e4ddda92d0e2c66e6a1d2742c51d0c0
+ 4a0409fdc266d1e819a178d558d90b3209c8423cf2794ca0fce3eedea947faa6
+ 567e77ed85bacaafbf82fbc90dfabae6e31be8acec5a2db8cfd28197d5bd1815
+ b92173bf696785e4f64f74871996c75c9fe96854e3194ebf7ff1dcc9f817b0d8
+ bbd223abe4457a1e7425f0cf035c7b6de33e26440d30af8655320ff9c68b124b
+ 8e98b9083a77a97886affbbf089e842b0286539fd93df18b031c8d7e8ac92d30
+ d4a94e6f5753e5f4d2a777830a0cb23ac94298278328bd3579606ceb47d949eb
+ 360dc9fd3a91eac883ca28efd02c218d7365d889146278129ea27424ba452a58
+ cd9bc801f9807b0b8f1dcb3ff8bed985cbe291ee95f25963617845d1d7de57b2
+ fd5b0f3d1d81c74ebd53b4e2f221cc79dbe9c2a936e73b6a983cb666d6c8f7a6
+ e2b37b8fa911c4bca068b0fce10db9fa28490c939c15fb8ffda785d396e6f33b
+ 2a0993286c9e5f1350a660636ec2b43c9c7d974ac9d1c2c979df888f81a90141
+ 2fc6465bc4dd66c23deacfa7d055a2bf50eb2db9a0a10c20f6f3b5321879e33e
+ b88cd11ed43a4f67897434281a4ebd7ef7cb3f4c4d041822fb672d0812d98a2d
+ 9d3de3237d2e12e72f9244151ff9c24caccbd7e1a560718f8f41a0bb7e96e2c9
+ 1cb6d182af78f237d0d01edba2263b01173377ddc0c9b1e7f5db1cf593765da8
+ 52a7d3401c0d333fcf98b33bff2fddc88ae017476e0be74c73359c01d9f7eaee
+ 661374e104b98180fba058d4ab6574246d4d9244739decdfcece493338f1ed3f
+ ba74a4dba80b8cde6a4105cd6179a72005123d1c92898496a2793479c1921676
+ c6259edeb1da7d3ca05ca4b3565408d02e48e3c7f7a254d56b41fdb3639cb56f
+ fddfbe98c0d309323981b685b134f000cc9c69518efc365c5c559ffd2c05b602
+ bee9c9a60147bcf86f55bccace7fe63316fb79af7cd45b8ffe43abba980db8b9
+ 8a4536988167922619e06721229fc91d087d56177ce2ad1a417dd52bc218814f
+ 1c11f7b7d2349d8bf0cbd3f6133d1f93b70b6d0176555d538e0bfb7774ea0de9
+ 52bc04a4c244de19b4e02a60b79fd760df35a2b825363a1e94c5becd535413ec
+ d19315771ccaf194add0459e85a44a8a11dc04f2d9b426201fd4c7000e4defe0
+ 3e0df7a54beb78791adfb9f56cc62c5cd01126e964fa90cc1bb65331b2d572f6
+ 49b38e6fe6746b2c3e4bcf8a1b7bc828ac8c5784dbe5b1039edde51d2e942dd3
+ 97751019d9f01120a0acf4153b3b06c2e476b83d5da8561bac349cdcba5fe095
+ bb222cce7ff359eeef5cbaad871aa42214ab5b62872deead6cc57068d0f1fd8b
+ fcff68e01cbf4740e7816fb61a15853f9be14034b3fdde1a67b22f80dd43ff33
+ bc7c2beadf026cd535635b540c2a8ca7953662b154b9e128378b6ab51ac62953
+ b1f207489d09eec55d486b467ceb88bd289b7238ff506a01318d797811121f95
+ 08dacf388f2a04796450d37c2a7db5270b3515c38ef0f0426ecc59915ae6b812
+ cc7e4230277d9b54f114048f951880aaf4ed88af03a5791e0dc091ecb947e956
+ cd6024b8bc6780265146720559fb1f828e36688eeec919044a62d365b440ba97
+ 33c1d05921e6041db7d09279da354e2d406798ffd14c67b9cf204e339fc1caee
+ 0264439a560fef95488a5aa05783b24e39d16acbed6f1b389a75864ac60f3267
+ f174f19aacd50078adceb236e9432feccaf0edc8aae9632191a4c38dab22b206
+ 596b84ba309ed661429c8fe5a13baa38e773f40b3b17c997d61834afec92b535
+ 6e2e243496089c084844868744ed2a736e621fc14fe95cdf3b5b7507d56b022e
+ 91449d6929c9c3068d0c724315e00d412f25c7ca72fddba53ac97c24f4214189
+ 138ca2aaf0f0a2decba98db228ac835b1299c841932bf683deb635a8cf226616
+ 299bacaffa3b2f8bc359b7bd33a9e4b5588546f7b75ea323ab63b6a25152ace1
+ c9eaa1d9e843a07eed355db514c10f8df0e898f9f177dc96eb721643218c6314
+ 5231901059f7a9d7b5bd7ff15168c469f2f7813c85c7266b70c20661e2eeb838
+ c2d0f151ffd2e9daf33bbffc2d069fd65c258d7c69b29f38785e2e395d8ff6c0
+ c2edbea7c2037a57524c4899a888eb0a3007593f0b39e8686a049b5dda10a768
+ 95acf4112f5b67f22f8df330e53e6cf764e1648f6fbbebc7feb316dc3eb6cf8f
+ 22224ae5b1818b86a5ce7b5872ebcea1c071009a6fe1abcfcf26cfe36b53c6b8
+ 035658f37f5a9c025db1386a89f5c05b72895b73c1a6826656055117afbd5239
+ 627d5f227d5e39c98802dabf68096f2588ee988afcdb13b95470457bb1f1c44c
+ 7d5f86ab7a0f47947ccfebf496e7e8164d433ee7560c39661a0f3d88995d72c4
+ 9623353017b1f980f43eae284662dbd2cd0b1ea1d8864e4fa6f86c83d78e7c06
+ 1fb1f82cbaca4a5463b8375709dc2e865dae4492ef294c7c39324fb867e58272
+ ad7df8473b55cc460476e05f265e7c496f711dbd6635b594e3d1cdd435ff6504
+ 38416b1b2ca89bec7e71e2143ba27e64b2c3319ef45499346b47dc30fbca793c
+ b55d6775b6bb9254b87692e244fd7078ec93c031efa51b6d205cff98a1651484
+ 66318b8528b59acba6be065989e51b5187a8735cc1be87fb25c835d9f5ae37af
+ 423f5a30c7174d2b41f5fcd38beaa232967990f66aec84769ce501402f5881a3
+ 7933dfd5d65816c54c8ab3da1455d6810c4d1532790d95c54b0bc4adc055ff40
+ a44392970b81bbc639822aaa9f73f7da4e64e39b91a402483d5bf98538fd88e4
+ 0cf1c29300b3fee8659c630bd37867323c42422b50bd429e9ca196025fbf090c
+ ff56285588b4bcc927db05ac856e2bf69d4f6b31c63d254242551c0315719854
+ cc1de1d246c39e1214186cbe88932b70e8e60121739faf9c88f24446e74445b8
+ b97123397c9f1419bd6ce9c62a7be178c35683b64fe3c20046ee4aeeadd2f83b
+ b09681f50489150130ae682139d6427f1fc77c2cb2a9debdd5db9fc4ae307a1c
+ 84f5dc461c256fd058522acf368c5d83a4560a8a478be5f5d551a1a194598374
+ 336a044de2b47ee875f27627059bef2dea0862908b2bd937416a2765ec91eeda
+ 3154deee82fe4fa24df33713a2a9688c1028c39df791732af097419dca83e3f6
+ 973e3de5de51533ebd699879ec1679525e7b35a0a74218f68c29a1b4d2280c2d
+ 18344197c44ed32c4cf31df5c4424d0128b6791a57fb910ce42e1f68d282e13d
+ 87c4014428af7f4303f9accc16951be16dc7122a191d1465d0a5e0b60486ef80
+ 6ca8549d8c1c91ca2136e49458b935974354640aa6bab2a8d2255868d56d87ed
+ 2a18628d8955170725121f5f5a2b4262e39456e9fd4a007bd387f2a14e235a50
+ 96cbf50ad97ada93a6e0156557911911e46c7963b34951cfe5abd0be3dbfaade
+ ba6fd1a48128dfa48a1f3c70b28181e658abbbf549e104d08df3f27197475dcc
+ 7bb5c17d1f1e25cfc735867f005563ead7de99c19e27f05a0efeced067ab50be
+ b3712f4146b50e243a6b2056d062045a14c9d8057ba1430f5c2662dac06ac34e
+ 8f1c167582e3d46cf2d24887b47dd4830f0dd084aefd7371b61ef716932db352
+ 29563c43673308e83437984ebe46e650a56e11be5fe2e1298946bc232287e121
+ 9badcf85535fc5b2282bdaea3fc6ac15d0f9f560524015321f0ed5c075fe7e5b
+ 1b6c1b1374e257cb5f699f71dbd1d2d1a287588548610272598a85b8133fcaef
+ 3aed734f122676a568c68a98a3243570dea7b06cf5a65f1be1ce060da2fe6804
+ a365cac889289ede9cf61a0fb73b8efe7cccf758167354ff43b29b3845777c82
+ 20c519b8cf6f16eac1fbc00b93178eb78c076f10518faf4c43f9606de6fbab83
+ 138ef57dc8947ef1580ee7fb0edc3459cd49a16ec296edabcfa913c784ee7320
+ 1b4fd65008d7780b9af4857ef91b9d4eccb97cb3469d90a982713812ab7c1b11
+ 1930509ac41ac78987f50332f9e44b66d0e27ad59fea56e933e05d4475012196
+ d6c16dec9ea82842f64e11ff7f6b4194f9b513f904423291ec8e7782ab7024f8
+ 54af90457d760ea7ac38b1b6d7b532996542192d0541004f9da9386fb5ea91ea"

From e217897ce8bcb170345bb9053096975f3211856f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 17:57:12 -0600
Subject: [PATCH 0053/2561] Amass: update to 3.17.1.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 4f2e6ce8db16..271551b6b159 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.17.0
+version=3.17.1
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ 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=e1217f5a62f87bbde467bb772f7cdf8583db3de68cc7c1693402f450486b4c93
+checksum=5d11de26ce62dad9ddc4f36032a1192c2c126c4e23a31e1e04cb2d08098d5dfd
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From b5b518647a3c89d79980378fb8fbffd78e835ffc Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 17:58:17 -0600
Subject: [PATCH 0054/2561] eggdrop: update to 1.9.2.

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index a2ec4f5e291c..fa8b5a4b163f 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,6 +1,6 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
-version=1.9.1
+version=1.9.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
@@ -10,7 +10,7 @@ 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=72916ff3b34d86b11c53317f8c91531c5ff5b64138b4f39aa10ee43aae01e884
+checksum=7e3667f31f9770708aa52a4dd6c7aa1f61b29cf62b90f7e13769aed28f7c5e39
 conf_files="/etc/eggdrop/text/banner /etc/eggdrop/text/motd"
 
 pre_build() {

From 812f686247b0822bf581ac917759bb5e417d54a9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 17:59:05 -0600
Subject: [PATCH 0055/2561] sqlmap: update to 1.6.3.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index e681d2086c4b..c77f23f03939 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.2
+version=1.6.3
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=e416cd76a5fc4a69a5e1b7924f95b9f2856272899a9db2fac475d4b3a7061e21
+checksum=a099cde73f57ba9e70ad7dd2f7473202a02929766471fc5701f64f2c16b304c2
 python_version=3
 
 do_install() {

From 7de9db1114e3544d8198f097e74f172ab8b8b63d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 18:01:22 -0600
Subject: [PATCH 0056/2561] python3-waitress: update to 2.1.0.

---
 srcpkgs/python3-waitress/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-waitress/template b/srcpkgs/python3-waitress/template
index d3cc687e412e..ae3ee23f6934 100644
--- a/srcpkgs/python3-waitress/template
+++ b/srcpkgs/python3-waitress/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-waitress'
 pkgname=python3-waitress
-version=2.0.0
+version=2.1.0
 revision=1
 wrksrc="waitress-${version}"
 build_style=python3-module
@@ -11,5 +11,5 @@ short_desc="Pure-Python WSGI server"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="ZPL-2.1"
 homepage="https://github.com/Pylons/waitress"
-distfiles="${PYPI_SITE}/w/waitress/waitress-2.0.0.tar.gz"
-checksum=69e1f242c7f80273490d3403c3976f3ac3b26e289856936d1f620ed48f321897
+distfiles="${PYPI_SITE}/w/waitress/waitress-${version}.tar.gz"
+checksum=ec8a8d9b6b15f3bb2c1a82b8f3929a029c333c35fcafb08c185a9e562d8cc9c2

From 7867d4289073b60bb4c51cada2ed99372dc06b02 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 18:02:43 -0600
Subject: [PATCH 0057/2561] python3-ytmusicapi: update to 0.21.0.

---
 srcpkgs/python3-ytmusicapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index 4c7faa119848..b791bcb33c0b 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=0.20.0
+version=0.21.0
 revision=1
 wrksrc="ytmusicapi-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
-checksum=16b986f687379f3e2411dac413316b789fb61a25df3209ed70e6b09d28908c6d
+checksum=338941fb2fb52078a69fa47a34456574e4e9998caead56d27e440bacacdb917c
 
 post_install() {
 	vlicense LICENSE

From 2930547bdef7cb878958b049ddda94ab1bee55ad Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 9 Mar 2022 19:46:43 -0500
Subject: [PATCH 0058/2561] just: update to 1.0.1, adopt.

---
 srcpkgs/just/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 0e9a5efa9f4f..156d04e3120d 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,15 +1,15 @@
 # Template file for 'just'
 pkgname=just
-version=1.0.0
+version=1.0.1
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
-maintainer="Wilson Birney <wpb@360scada.com>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 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/refs/tags/${version}.tar.gz"
-checksum=19134e517976678a8f2e8fbff0eef79667c608ca09c0b7d3f96dd4197d9bb98b
+checksum=261532a3b72b34a79df01bb0c4a366bcc3fd870c5706340fec260faebddb42c6
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 9873ad8c43afdb8e3b888f2ad417bf4b97f1b998 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 9 Mar 2022 19:44:28 -0500
Subject: [PATCH 0059/2561] chezmoi: update to 2.14.0.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 286f3e1fb1ac..464d7ccc07ca 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.13.1
+version=2.14.0
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=52fba493bb9f987a7971bcc187e7af9c01277b00daa91e4113e2e1f68c634ae2
+checksum=4d7a1baf7e3caa8f6976b1ea5e6ba81c75273b1dd1f0fc946134a82454720397
 
 export CGO_ENABLED=1
 

From 982b0ee6d4aef27bf805c59bdf0a71a7f275dad4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 9 Mar 2022 19:11:23 -0500
Subject: [PATCH 0060/2561] mdcat: update to 0.26.1, restore cross, adopt.

---
 srcpkgs/mdcat/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index 9a3ea193604c..c07dbd3b3913 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,21 +1,20 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.25.0
+version=0.26.1
 revision=1
-wrksrc="${pkgname}-${pkgname}-${version}"
+wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config ruby-asciidoctor"
 makedepends="openssl-devel"
 short_desc="Cat for markdown"
-maintainer="Wilson Birney <wpb@360scada.com>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MPL-2.0"
-homepage="https://github.com/lunaryorn/mdcat"
-changelog="https://raw.githubusercontent.com/lunaryorn/mdcat/main/CHANGELOG.md"
-distfiles="https://github.com/lunaryorn/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=92fddabab24f2e7d673b06c1f31a7746abbb547c5581faaed17a8e3e1e5b17a5
+homepage="https://codeberg.org/flausch/mdcat/"
+changelog="https://codeberg.org/flausch/mdcat/raw/branch/main/CHANGELOG.md"
+distfiles="https://codeberg.org/flausch/mdcat/archive/mdcat-${version}.tar.gz"
+checksum=1120c4f3b5b517075b6347dbfe76a2211a91837b4d0242c0b72cdbc19e6886dd
 
 case "$XBPS_TARGET_MACHINE" in
-	armv6l|armv7l) broken="https://build.voidlinux.org/builders/armv7l_builder/builds/36158/steps/shell_3/logs/stdio" ;;
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac

From b9ba38019a387198ff4d7a148028777ca6f65571 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 10 Mar 2022 13:24:44 +0100
Subject: [PATCH 0061/2561] nncp: update to 8.7.1.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 43de7495a654..e6d62ac2f55f 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=8.7.0
+version=8.7.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=ed488ffd7d88028bdd64386bec4ad9116f7da0881fb1e628493d2f2bbbd1e868
+checksum=ceb4d197af5a8d9e93b749d5c0f50b53e6746a318af47b364bf5cb323d6c4ebd
 
 do_build() {
 	make

From fdd9356a23cab0d35d3f4b0b6e4ffc5b84b90bb3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 10 Mar 2022 13:25:22 +0100
Subject: [PATCH 0062/2561] mcomix: update to 2.0.1.

---
 srcpkgs/mcomix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mcomix/template b/srcpkgs/mcomix/template
index 3f26682f077e..6baf097d98dd 100644
--- a/srcpkgs/mcomix/template
+++ b/srcpkgs/mcomix/template
@@ -1,6 +1,6 @@
 # Template file for 'mcomix'
 pkgname=mcomix
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://sourceforge.net/projects/mcomix/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/MComix-${version}/${pkgname}-${version}.tar.gz"
-checksum=a3ef3d76ee34a82b67e91d3ea0e2b19b88179421698c73453829eceaca895d89
+checksum=57f97ebac913f8b9021b4cb52e135b205ef58353d16d9f838d62f55d0252eca0
 
 post_install() {
 	cp -r mcomix/images ${DESTDIR}/usr/lib/python3.*/site-packages/mcomix

From 5e3dcc63a071e7ecef3a57053d10ceef7ab13e02 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Wed, 9 Mar 2022 00:02:11 -0500
Subject: [PATCH 0063/2561] ghostscript: update to 9.55.0.

Remove patch for CVE-2021-3781 as it is included in the current release.

Include a patch for a typo in the current release:
https://bugs.ghostscript.com/show_bug.cgi?id=704501
---
 .../ghostscript/patches/CVE-2021-3781.patch   | 233 ------------------
 .../fix_gscms_transform_color_typo.patch      |  11 +
 srcpkgs/ghostscript/template                  |   7 +-
 3 files changed, 15 insertions(+), 236 deletions(-)
 delete mode 100644 srcpkgs/ghostscript/patches/CVE-2021-3781.patch
 create mode 100644 srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch

diff --git a/srcpkgs/ghostscript/patches/CVE-2021-3781.patch b/srcpkgs/ghostscript/patches/CVE-2021-3781.patch
deleted file mode 100644
index e9c34ee05b51..000000000000
--- a/srcpkgs/ghostscript/patches/CVE-2021-3781.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=a9bd3dec9fde
-
-From a9bd3dec9fde03327a4a2c69dad1036bf9632e20 Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Tue, 7 Sep 2021 20:36:12 +0100
-Subject: [PATCH] Bug 704342: Include device specifier strings in access
- validation
-
-for the "%pipe%", %handle%" and %printer% io devices.
-
-We previously validated only the part after the "%pipe%" Postscript device
-specifier, but this proved insufficient.
-
-This rebuilds the original file name string, and validates it complete. The
-slight complication for "%pipe%" is it can be reached implicitly using
-"|" so we have to check both prefixes.
-
-Addresses CVE-2021-3781
----
- base/gdevpipe.c | 22 +++++++++++++++-
- base/gp_mshdl.c | 11 +++++++-
- base/gp_msprn.c | 10 ++++++-
- base/gp_os2pr.c | 13 +++++++++-
- base/gslibctx.c | 69 ++++++++++---------------------------------------
- 5 files changed, 65 insertions(+), 60 deletions(-)
-
-diff --git a/base/gdevpipe.c b/base/gdevpipe.c
-index 96d71f5d8..5bdc485be 100644
---- a/base/gdevpipe.c
-+++ b/base/gdevpipe.c
-@@ -72,8 +72,28 @@ pipe_fopen(gx_io_device * iodev, const char *fname, const char *access,
- #else
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    /* The pipe device can be reached in two ways, explicltly with %pipe%
-+       or implicitly with "|", so we have to check for both
-+     */
-+    char f[gp_file_name_sizeof];
-+    const char *pipestr = "|";
-+    const size_t pipestrlen = strlen(pipestr);
-+    const size_t preflen = strlen(iodev->dname);
-+    const size_t nlen = strlen(fname);
-+    int code1;
-+
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(f, iodev->dname, preflen);
-+    memcpy(f + preflen, fname, nlen + 1);
-+
-+    code1 = gp_validate_path(mem, f, access);
-+
-+    memcpy(f, pipestr, pipestrlen);
-+    memcpy(f + pipestrlen, fname, nlen + 1);
- 
--    if (gp_validate_path(mem, fname, access) != 0)
-+    if (code1 != 0 && gp_validate_path(mem, f, access) != 0 )
-         return gs_error_invalidfileaccess;
- 
-     /*
-diff --git a/base/gp_mshdl.c b/base/gp_mshdl.c
-index 2b964ed74..8d87ceadc 100644
---- a/base/gp_mshdl.c
-+++ b/base/gp_mshdl.c
-@@ -95,8 +95,17 @@ mswin_handle_fopen(gx_io_device * iodev, const char *fname, const char *access,
-     long hfile;	/* Correct for Win32, may be wrong for Win64 */
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    char f[gp_file_name_sizeof];
-+    const size_t preflen = strlen(iodev->dname);
-+    const size_t nlen = strlen(fname);
- 
--    if (gp_validate_path(mem, fname, access) != 0)
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(f, iodev->dname, preflen);
-+    memcpy(f + preflen, fname, nlen + 1);
-+
-+    if (gp_validate_path(mem, f, access) != 0)
-         return gs_error_invalidfileaccess;
- 
-     /* First we try the open_handle method. */
-diff --git a/base/gp_msprn.c b/base/gp_msprn.c
-index ed4827968..746a974f7 100644
---- a/base/gp_msprn.c
-+++ b/base/gp_msprn.c
-@@ -168,8 +168,16 @@ mswin_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
-     uintptr_t *ptid = &((tid_t *)(iodev->state))->tid;
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    const size_t preflen = strlen(iodev->dname);
-+    const size_t nlen = strlen(fname);
- 
--    if (gp_validate_path(mem, fname, access) != 0)
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(pname, iodev->dname, preflen);
-+    memcpy(pname + preflen, fname, nlen + 1);
-+
-+    if (gp_validate_path(mem, pname, access) != 0)
-         return gs_error_invalidfileaccess;
- 
-     /* First we try the open_printer method. */
-diff --git a/base/gp_os2pr.c b/base/gp_os2pr.c
-index f852c71fc..ba54cde66 100644
---- a/base/gp_os2pr.c
-+++ b/base/gp_os2pr.c
-@@ -107,9 +107,20 @@ os2_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
-            FILE ** pfile, char *rfname, uint rnamelen)
- {
-     os2_printer_t *pr = (os2_printer_t *)iodev->state;
--    char driver_name[256];
-+    char driver_name[gp_file_name_sizeof];
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    const size_t preflen = strlen(iodev->dname);
-+    const int size_t = strlen(fname);
-+
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(driver_name, iodev->dname, preflen);
-+    memcpy(driver_name + preflen, fname, nlen + 1);
-+
-+    if (gp_validate_path(mem, driver_name, access) != 0)
-+        return gs_error_invalidfileaccess;
- 
-     /* First we try the open_printer method. */
-     /* Note that the loop condition here ensures we don't
-diff --git a/base/gslibctx.c b/base/gslibctx.c
-index 6dfed6cd5..318039fad 100644
---- a/base/gslibctx.c
-+++ b/base/gslibctx.c
-@@ -655,82 +655,39 @@ rewrite_percent_specifiers(char *s)
- int
- gs_add_outputfile_control_path(gs_memory_t *mem, const char *fname)
- {
--    char *fp, f[gp_file_name_sizeof];
--    const int pipe = 124; /* ASCII code for '|' */
--    const int len = strlen(fname);
--    int i, code;
-+    char f[gp_file_name_sizeof];
-+    int code;
- 
-     /* Be sure the string copy will fit */
--    if (len >= gp_file_name_sizeof)
-+    if (strlen(fname) >= gp_file_name_sizeof)
-         return gs_error_rangecheck;
-     strcpy(f, fname);
--    fp = f;
-     /* Try to rewrite any %d (or similar) in the string */
-     rewrite_percent_specifiers(f);
--    for (i = 0; i < len; i++) {
--        if (f[i] == pipe) {
--           fp = &f[i + 1];
--           /* Because we potentially have to check file permissions at two levels
--              for the output file (gx_device_open_output_file and the low level
--              fopen API, if we're using a pipe, we have to add both the full string,
--              (including the '|', and just the command to which we pipe - since at
--              the pipe_fopen(), the leading '|' has been stripped.
--            */
--           code = gs_add_control_path(mem, gs_permit_file_writing, f);
--           if (code < 0)
--               return code;
--           code = gs_add_control_path(mem, gs_permit_file_control, f);
--           if (code < 0)
--               return code;
--           break;
--        }
--        if (!IS_WHITESPACE(f[i]))
--            break;
--    }
--    code = gs_add_control_path(mem, gs_permit_file_control, fp);
-+
-+    code = gs_add_control_path(mem, gs_permit_file_control, f);
-     if (code < 0)
-         return code;
--    return gs_add_control_path(mem, gs_permit_file_writing, fp);
-+    return gs_add_control_path(mem, gs_permit_file_writing, f);
- }
- 
- int
- gs_remove_outputfile_control_path(gs_memory_t *mem, const char *fname)
- {
--    char *fp, f[gp_file_name_sizeof];
--    const int pipe = 124; /* ASCII code for '|' */
--    const int len = strlen(fname);
--    int i, code;
-+    char f[gp_file_name_sizeof];
-+    int code;
- 
-     /* Be sure the string copy will fit */
--    if (len >= gp_file_name_sizeof)
-+    if (strlen(fname) >= gp_file_name_sizeof)
-         return gs_error_rangecheck;
-     strcpy(f, fname);
--    fp = f;
-     /* Try to rewrite any %d (or similar) in the string */
--    for (i = 0; i < len; i++) {
--        if (f[i] == pipe) {
--           fp = &f[i + 1];
--           /* Because we potentially have to check file permissions at two levels
--              for the output file (gx_device_open_output_file and the low level
--              fopen API, if we're using a pipe, we have to add both the full string,
--              (including the '|', and just the command to which we pipe - since at
--              the pipe_fopen(), the leading '|' has been stripped.
--            */
--           code = gs_remove_control_path(mem, gs_permit_file_writing, f);
--           if (code < 0)
--               return code;
--           code = gs_remove_control_path(mem, gs_permit_file_control, f);
--           if (code < 0)
--               return code;
--           break;
--        }
--        if (!IS_WHITESPACE(f[i]))
--            break;
--    }
--    code = gs_remove_control_path(mem, gs_permit_file_control, fp);
-+    rewrite_percent_specifiers(f);
-+
-+    code = gs_remove_control_path(mem, gs_permit_file_control, f);
-     if (code < 0)
-         return code;
--    return gs_remove_control_path(mem, gs_permit_file_writing, fp);
-+    return gs_remove_control_path(mem, gs_permit_file_writing, f);
- }
- 
- int
--- 
-2.17.1
diff --git a/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch b/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
new file mode 100644
index 000000000000..9ffa2e09ba66
--- /dev/null
+++ b/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
@@ -0,0 +1,11 @@
+--- ./base/gsicc_lcms2.c.jlg	2021-09-27 03:44:02.000000000 -0400
++++ ./base/gsicc_lcms2.c	2021-10-05 10:50:03.428000000 -0400
+@@ -462,7 +462,7 @@
+ gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor,
+                              void *outputcolor, int num_bytes)
+ {
+-    return gscms_transformm_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
++    return gscms_transform_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
+ }
+ 
+ int
diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 5d9e1aa9d410..8bce83846ad8 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,7 +1,7 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
-version=9.54.0
-revision=2
+version=9.55.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"
@@ -10,8 +10,9 @@ short_desc="Interpreter for the PostScript language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later, CPL-1.0"
 homepage="https://www.ghostscript.com/"
+changelog="https://www.ghostscript.com/doc/${version}/News.htm"
 distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${version//./}/ghostscript-${version}.tar.xz"
-checksum=c2b7b43cde600f4e70efb2cd95865f6d884a67315c3de235914697d8ccde6e3b
+checksum=6ee3057773646d6a2c6d117eb53a17d6752feadc513828e4322f68b7b7789ff6
 
 build_options="cups"
 build_options_default="cups"

From 2a7dd8964f11bffa8cf1e4ee0e582e8cc643d716 Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Thu, 10 Mar 2022 13:44:18 +0100
Subject: [PATCH 0064/2561] jless: update to 0.8.0

---
 srcpkgs/jless/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jless/template b/srcpkgs/jless/template
index 2d4cfa1f1865..0de4ebf061dc 100644
--- a/srcpkgs/jless/template
+++ b/srcpkgs/jless/template
@@ -1,14 +1,16 @@
 # Template file for 'jless'
 pkgname=jless
-version=0.7.2
+version=0.8.0
 revision=1
 build_style=cargo
+hostmakedepends="python3"
+makedepends="xcb-util-devel"
 short_desc="Pager for JSON data"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/PaulJuliusMartinez/jless"
 distfiles="https://github.com/PaulJuliusMartinez/jless/archive/refs/tags/v${version}.tar.gz"
-checksum=5d776cb6488743ccdaeeffb4bfc54d84862028170cee852a8bb5c156526ed263
+checksum=3f1168c9b2432f7f4fa9dd3c31b55e371ef9d6f822dc98a8cdce5318a112bf2d
 
 post_install() {
 	vlicense LICENSE

From 68e970f5642cd34905acef0f5c8bdce442f28656 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 10 Mar 2022 21:51:21 +0100
Subject: [PATCH 0065/2561] firefox: mark broken for armv7l*

---
 srcpkgs/firefox/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8d4e8b1ecb2a..6c1596b19e06 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -32,6 +32,7 @@ build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 
 case $XBPS_TARGET_MACHINE in
 	armv[56]*) broken="required NEON extensions are not supported on armv6" ;;
+	armv7*) broken="currently broken" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
 esac

From cf8e09bed0e5849aab80ea9becb609ebecc601c1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 9 Mar 2022 18:50:46 -0600
Subject: [PATCH 0066/2561] bzflag: update to 2.4.24.

---
 srcpkgs/bzflag/patches/NetHandler-musl.patch | 11 -----------
 srcpkgs/bzflag/template                      |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/bzflag/patches/NetHandler-musl.patch

diff --git a/srcpkgs/bzflag/patches/NetHandler-musl.patch b/srcpkgs/bzflag/patches/NetHandler-musl.patch
deleted file mode 100644
index 75385ce3ca86..000000000000
--- a/srcpkgs/bzflag/patches/NetHandler-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/game/NetHandler.cxx	2018-01-22 12:28:31.043278572 -0600
-+++ b/src/game/NetHandler.cxx	2018-01-22 12:28:07.889568033 -0600
-@@ -135,7 +135,7 @@
-   uint16_t code;
-   while (true) {
-     n = recvfrom(udpSocket, buffer, MaxUDPPacketLen, 0, (struct sockaddr *) uaddr,
--		 &recvlen);
-+		 (socklen_t*)&recvlen);
-     if ((n < 0) || (n >= 4))
-       break;
-   }
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index d58270495975..59f664f1c059 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,6 +1,6 @@
 # Template file for 'bzflag'
 pkgname=bzflag
-version=2.4.22
+version=2.4.24
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="LGPL-2.1-only, MPL-2.0"
 homepage="https://www.bzflag.org"
 changelog="https://raw.githubusercontent.com/BZFlag-Dev/bzflag/2.4/ChangeLog"
 distfiles="https://download.bzflag.org/bzflag/source/${version}/bzflag-${version}.tar.bz2"
-checksum=9e64653302b657bd8b5f96fe1150a9ff80a1d53a6d7e8a35138c6b1b02006a4d
+checksum=5f8131beb7fc8ba51e323a06ecd7d8eab91537c342ce87a113e5eb6ea98ce3c4

From 80982d5347fa002966fe159240218b1b40b841f4 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Thu, 10 Mar 2022 02:02:43 +0200
Subject: [PATCH 0067/2561] spotify: update to 1.1.80.

Closes: #36073 [via git-merge-pr]
---
 srcpkgs/spotify/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 185d59ecdb5c..32d439d290f8 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,8 +1,8 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.1.72
+version=1.1.80
 revision=1
-_ver="${version}.439.gc253025e_amd64"
+_ver="${version}.699.gc3dac750_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=c211a16b6ed6627c4b7d8ca6997376f8345dca638938696933c5495405ce9e16
+checksum=19f80255b89d768969ff9d6a05d90091a30c05f65eabdd968592d47a7754b80e
 _license_checksum=4465d0bba5deb87866184b04ba76604cd93561c0dc9cd21cacdf5b0295bdae3a
 repository=nonfree
 restricted=yes

From 9587b57212400294d8dc121c7c04bcb9972123fe Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 10 Mar 2022 16:26:06 -0600
Subject: [PATCH 0068/2561] xlockmore: update to 5.69.

---
 srcpkgs/xlockmore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template
index b79c581190bd..c520c4d7b4c6 100644
--- a/srcpkgs/xlockmore/template
+++ b/srcpkgs/xlockmore/template
@@ -1,6 +1,6 @@
 # Template file for 'xlockmore'
 pkgname=xlockmore
-version=5.68
+version=5.69
 revision=1
 build_style=gnu-configure
 configure_args="--with-xinerama $(vopt_if opengl '--with-opengl --with-mesa')"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="http://sillycycle.com/xlockmore.html"
 changelog="http://sillycycle.com/xlock/xlockmore.README"
 distfiles="http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"
-checksum=30731fdcb203f16eb5c1c43c05d42e452ad0eb4555c97c55566a6ecb1877cd6e
+checksum=ea92654c001226848765a251a73bcbc473ccef17b721cc18d5361f59dbd6d3b9
 CFLAGS="-D_DEFAULT_SOURCE"
 
 build_options="opengl"

From 5ca79ac0877db93e4821490e87e8127ca805e814 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 11 Mar 2022 00:18:57 +0100
Subject: [PATCH 0069/2561] plank: add dependencies to -devel subpkg

---
 srcpkgs/plank/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plank/template b/srcpkgs/plank/template
index 71793ba1429a..232f336c0d93 100644
--- a/srcpkgs/plank/template
+++ b/srcpkgs/plank/template
@@ -1,7 +1,7 @@
 # Template file for 'plank'
 pkgname=plank
 version=0.11.89
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable dbusmenu) --disable-apport"
 hostmakedepends="intltool libgee08-devel glib-devel pkg-config libxml2 vala
@@ -21,7 +21,8 @@ build_options_default="dbusmenu"
 
 plank-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} cairo-devel libgee08-devel
+	 libglib-devel gtk+3-devel gdk-pixbuf-devel bamf-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From d3ea27e31a24a13d08f1d3a90dafe6a01d259bd5 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:07:35 -0800
Subject: [PATCH 0070/2561] podman: update to 4.0.2

---
 srcpkgs/podman/patches/musl.patch | 47 -------------------------------
 srcpkgs/podman/template           | 11 +++++---
 2 files changed, 7 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/podman/patches/musl.patch

diff --git a/srcpkgs/podman/patches/musl.patch b/srcpkgs/podman/patches/musl.patch
deleted file mode 100644
index 2732d190233c..000000000000
--- a/srcpkgs/podman/patches/musl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1d781ccbeab3364ac18c487f66893847fe5e102f Mon Sep 17 00:00:00 2001
-From: Marc Nguyen <nguyen_marc@live.fr>
-Date: Fri, 10 Dec 2021 03:07:20 +0100
-Subject: [PATCH] [NO NEW TESTS NEEDED] rootless: declare TEMP_FAILURE_RETRY
- before usage (Fixes: #12563)
-
-Signed-off-by: Nguyen Marc <nguyen_marc@live.fr>
----
- pkg/rootless/rootless_linux.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
-index e71d5d999fe..92f331ce493 100644
---- a/pkg/rootless/rootless_linux.c
-+++ b/pkg/rootless/rootless_linux.c
-@@ -19,6 +19,15 @@
- #include <sys/select.h>
- #include <stdio.h>
- 
-+#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
-+
- #define cleanup_free __attribute__ ((cleanup (cleanup_freep)))
- #define cleanup_close __attribute__ ((cleanup (cleanup_closep)))
- #define cleanup_dir __attribute__ ((cleanup (cleanup_dirp)))
-@@ -72,15 +81,6 @@ int rename_noreplace (int olddirfd, const char *oldpath, int newdirfd, const cha
-   return rename (oldpath, newpath);
- }
- 
--#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 const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces";
- static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone";
- 
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 8558180f3a4b..e83467c87f7c 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,9 +1,9 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.4.4
+version=4.0.2
 revision=1
 build_style=go
-go_import_path="github.com/containers/podman/v3"
+go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman"
 go_build_tags="seccomp apparmor containers_image_ostree_stub"
 hostmakedepends="pkg-config go-md2man"
@@ -15,15 +15,18 @@ license="Apache-2.0"
 homepage="https://podman.io/"
 changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=718c9e1e734c2d374fcf3c59e4cc7c1755acb954fc7565093e1d636c04b72e3a
+checksum=cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
 fi
 
+post_build() {
+	make docs
+}
+
 post_install() {
 	make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
-	make install.completions DESTDIR="${DESTDIR}" PREFIX="/usr"
 	sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
 		vendor/github.com/containers/common/pkg/config/containers.conf \
 		>containers.cgfs.conf

From 2040e40a4cf65e82ad934736a8c62b2dad615b8c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:15:51 -0800
Subject: [PATCH 0071/2561] fuse-overlayfs: update to 1.8.2

---
 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 ebf055c49202..0fb2a3a56503 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.8.1
+version=1.8.2
 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=99cc7fac93716527c054f90c86eea508b7b87ca2132776c30544660e5365aba2
+checksum=dfcadb2d7e1d109db42cca250fbe3341bbd463ac25f5950b2b56bd7618c0fc0f
 
 pre_configure() {
 	./autogen.sh

From 0c5e93c6b76b495558ca1b87d9f8fbf7d1811d7e Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:26:50 -0800
Subject: [PATCH 0072/2561] conmon: update to 2.1.0

---
 srcpkgs/conmon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index a165b519932c..6d26aed4983c 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -1,6 +1,6 @@
 # Template file for 'conmon'
 pkgname=conmon
-version=2.0.32
+version=2.1.0
 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=0ffd17a185322779d14d9a64c39120900f1e0cc3297b18679a933f5f6ba06a75
+checksum=874909d831feac75e452562087f6ea0eb39848ef144397bdd8f0daf579c5ee85
 
 do_install() {
 	vbin bin/conmon

From cceb3ab52c5c4a9843c8883f5d693715909b8a7a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 10 Mar 2022 11:37:49 +0100
Subject: [PATCH 0073/2561] revive: update to 1.1.4.

---
 srcpkgs/revive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index e6895a6daf1c..55a011447362 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,6 +1,6 @@
 # Template file for 'revive'
 pkgname=revive
-version=1.1.2
+version=1.1.4
 revision=1
 build_style=go
 go_ldflags="-X main.version=$version -X main.builtBy=xbps"
@@ -10,7 +10,7 @@ maintainer="Roberto Ricci <ricci@disroot.org>"
 license="MIT"
 homepage="https://revive.run/"
 distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz"
-checksum=b2dd477895e11de93ef076a7ad8186003c5ccc87416909e281eed63d8e26d1db
+checksum=afe0d11a614d5ca706485b7f6ca1e53b374b45017ea75f14149a4434d3ef74b5
 
 do_check() {
 	go test -v ./...

From e2c2e6d2985682e3fc2acfd588561dbd32346c4f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 0074/2561] ghc: update to 8.10.7

Closes https://github.com/void-linux/void-packages/pull/33850
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch |  9 ---------
 srcpkgs/ghc/patches/sphinx-unicode.patch | 17 -----------------
 srcpkgs/ghc/template                     |  4 ++--
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index 41ad0ceb3463..275444e828b7 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -128,15 +128,6 @@ index d360cfe..ab7ede7 100644
                    STG_UNUSED
  #endif
                )
-@@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
-         }
-     }
-
--#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
-+#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-
- #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
- #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
     return;
   }
diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch
deleted file mode 100644
index 5a09de43bc0c..000000000000
--- a/srcpkgs/ghc/patches/sphinx-unicode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py
---- ghc-8.8.4-orig/docs/users_guide/conf.py	2020-07-08 16:43:03.000000000 +0000
-+++ ghc-8.8.4/docs/users_guide/conf.py	2021-07-10 20:25:33.536928487 +0000
-@@ -101,5 +101,5 @@ latex_elements = {
-     'inputenc': '',
-     'utf8extra': '',
--    'preamble': '''
-+    'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
-@@ -107,5 +107,5 @@ latex_elements = {
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"
 _bindir="/usr/lib/${pkgname}-${version}/bin"

From d53f93b5cda22e8b08323c5fcfa093e5f2efd8cb Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 0075/2561] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From d940f0b7dad54a19f083a15b001dce73b53bf641 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 0076/2561] stack: update to 2.7.5

---
 srcpkgs/stack/patches/aeson.patch | 46 +++++++++++++++++++++++++++++++
 srcpkgs/stack/template            |  8 +++---
 2 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/stack/patches/aeson.patch

diff --git a/srcpkgs/stack/patches/aeson.patch b/srcpkgs/stack/patches/aeson.patch
new file mode 100644
index 000000000000..68f267c30cc8
--- /dev/null
+++ b/srcpkgs/stack/patches/aeson.patch
@@ -0,0 +1,46 @@
+commit 09e233ed73aa3335642f97c080ef27e42047c527
+Author: q66 <daniel@octaforge.org>
+Date:   Fri Mar 11 04:37:15 2022 +0100
+
+    constrain aeson to prevent build failures
+
+diff --git a/stack.cabal b/stack.cabal
+index dba5bf0..0195f2c 100644
+--- a/stack.cabal
++++ b/stack.cabal
+@@ -231,7 +231,7 @@ library
+ 
+     build-depends:
+         Cabal >=3.2.1.0,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
+@@ -357,7 +357,7 @@ executable stack
+ 
+     build-depends:
+         Cabal >=3.2.1.0,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
+@@ -485,7 +485,7 @@ executable stack-integration-test
+ 
+     build-depends:
+         Cabal >=3.2.1.0,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
+@@ -621,7 +621,7 @@ test-suite stack-test
+     build-depends:
+         Cabal >=3.2.1.0,
+         QuickCheck >=2.14.2,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..9e53b95ca633 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.7.3
+version=2.7.5
 revision=1
-_stackage="lts-18.5"
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -12,8 +12,8 @@ license="BSD-3-Clause"
 homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+checksum="9ddd44c2a62e9404194d69e7dc1c94e707910620316b66d6ac0b3201a8f37e80
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From b5edf4997b5b3738f8f22762a883942395fa11c1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 0077/2561] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..3949ee3fa1aa 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
-archs="i686 x86_64* ppc64le*"
+archs="i686 x86_64* ppc64le* ppc64"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
@@ -16,26 +16,31 @@ conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"
-	checksum=81065f401c5fc88d44be08db1cc0bdad473af4750bb0a19e54c9d15a5981406b
+	checksum=4662c88bc642941d9d463fd4878fc799e081c6fc5b10d2df5fa48e0cadea888c
 	;;
 ppc64le-musl)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux-musl.tar.xz"
-	checksum=3a62e73a1a099a38e5e86f9eacc565db5393905b74af7e29a8790d6197e5ccd4
+	checksum=c01b2d9d4c7b05a62f79b24e374413ac524116cbe5fb7c20673d62b8c3eebf10
 	;;
-*) broken="No distfiles available for this target"
+ppc64)
+	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz"
+	checksum=b8578e602abd4b453845303fb9cfed0b2186f86f60e3aa45869026ea833726c8
+	;;
+*)
+	broken="No distfiles available for this target"
 	;;
 esac
 

From fc3579d1f96f41a16dbf5a664323a98692bdebd8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 11 Mar 2022 14:34:56 +0100
Subject: [PATCH 0078/2561] srcpkgs/*: enable pandoc-using stuff for ppc64

---
 srcpkgs/amsynth/template       | 2 +-
 srcpkgs/bird_exporter/template | 2 +-
 srcpkgs/earlyoom/template      | 2 +-
 srcpkgs/growlight/template     | 2 +-
 srcpkgs/notcurses/template     | 2 +-
 srcpkgs/pelican/template       | 2 +-
 srcpkgs/vimpager/template      | 2 +-
 srcpkgs/xpra/template          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/amsynth/template b/srcpkgs/amsynth/template
index 8a762ee4981f..dd936a7d784b 100644
--- a/srcpkgs/amsynth/template
+++ b/srcpkgs/amsynth/template
@@ -18,5 +18,5 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 0143b41cd58d..897de17d226f 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -17,7 +17,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 post_build() {
diff --git a/srcpkgs/earlyoom/template b/srcpkgs/earlyoom/template
index deb392a098c9..1b93ee045982 100644
--- a/srcpkgs/earlyoom/template
+++ b/srcpkgs/earlyoom/template
@@ -18,7 +18,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 do_install() {
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 3703defbdfef..876eb479b662 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -22,7 +22,7 @@ desc_option_man="Use pandoc for manpages"
 desc_option_zfs="Build with ZFS Support"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 pre_configure() {
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 633896bf5515..9581a8e3de89 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -20,7 +20,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 notcurses-devel_package() {
diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index 70c34c55e834..6bca8b41203d 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -21,7 +21,7 @@ distfiles="https://github.com/getpelican/pelican/archive/${version}.tar.gz"
 checksum=b47c65f663bf6f2513b8ebc1f096e51f4d7865c17b36c370f83eadd80b6ba702
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) checkdepends+=" pandoc";;
+	x86_64*|i686|ppc64le*|ppc64) checkdepends+=" pandoc";;
 esac
 
 post_extract() {
diff --git a/srcpkgs/vimpager/template b/srcpkgs/vimpager/template
index 71ea5ec5e7ab..eb8697af94bb 100644
--- a/srcpkgs/vimpager/template
+++ b/srcpkgs/vimpager/template
@@ -15,7 +15,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 post_install() {
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 296cbb9834b5..5bc9ea89fdff 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -26,7 +26,7 @@ build_options="docs"
 desc_option_docs="Enable documentation"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686*|ppc64le*) build_options_default="docs" ;;
+	x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
 esac
 
 if [ -z "$CROSS_BUILD" ]; then

From 6f136277779eccc4176479dd66ec90034e6d8318 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 0079/2561] kmonad: bump for ghc 8.10.7

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 8c34a920ba7d..c93d2bee4c4f 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=2
+revision=3
 build_style=haskell-stack
-stackage=lts-17.5
+stackage=lts-18.14
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From f16c33cedb44f74e7a386cc74b93b88ab62c6fa0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 0080/2561] haskell-language-server: update to 1.4.0

---
 srcpkgs/haskell-language-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 5a7064dfc6a9b0ab6d282b09e209cd626d21f470 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 0081/2561] xmobar: bump for ghc 8.10.7

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 20014b3d482539479e41b4b49743ff5274de72f7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 0082/2561] hledger: bump for ghc 8.10.7

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index 3feab3fe200c..fdcab180a6de 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.23
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From 7e6441b5168f667230b37e485fe0400b93608d40 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 0083/2561] hoogle: bump for ghc 8.10.7

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 6bc425b0d002..4c3e80186494 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.2
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 734157092d226217efda3b0cf2a96b745b87653c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 0084/2561] hlint: bump for ghc 8.10.7

---
 srcpkgs/hlint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 2e6bec6894ba1782a7ce688b45f9cabe6514dd6d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 0085/2561] darcs: bump for ghc 8.10.7

---
 srcpkgs/darcs/files/stack.yaml | 4 +++-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index ddf0cdbb0d1b..f9fcac534d46 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.5
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 6cc914138f9a2525d7f2171201a48cb4044b0dc4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 2 Nov 2021 08:57:33 +0100
Subject: [PATCH 0086/2561] shellcheck: bump for ghc 8.10.7

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 08e64456eda9..70eee6c2854b 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.8.0
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 71649f051003e955df8786aaa8c797155306f94d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 08:35:15 +0100
Subject: [PATCH 0087/2561] pandoc: bump for ghc 8.10.7

---
 srcpkgs/pandoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 0e487510497e..8628b1d1f3c2 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,14 +2,14 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.14.0.3
-revision=2
+revision=3
 _sidenote_version=0.20.0.0
 _monad_gen_version=0.3.0.1
 _crossref_version=0.3.12.2
 _roman_numerals_version=0.5.1.5
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-18.14"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"

From 3dbf9fd62fbb23950c7ba568fd16eb733f60d670 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 19:17:39 +0100
Subject: [PATCH 0088/2561] cgrep: bump for ghc 8.10.7

---
 srcpkgs/cgrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index c987e67725b0..e57106f3fa26 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.7.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-18.6"
+stackage="lts-18.15"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

From 19d2833a7c24bdaead8b891453232cef0414fc5c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 21:11:14 +0100
Subject: [PATCH 0089/2561] git-mediate: bump for ghc 8.10.7

---
 srcpkgs/git-mediate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index 971a6236224f..0c9ec10241e5 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,9 +1,9 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
 version=1.0.8.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From 6ccfdcdbc3e275073d3c7cbab85a77fbf03aaa94 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 4 Nov 2021 09:34:26 +0100
Subject: [PATCH 0090/2561] debug-me: bump for ghc 8.10.7

---
 srcpkgs/debug-me/files/stack.yaml | 2 +-
 srcpkgs/debug-me/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index ecff9d9d18f2..ad8b055bb33e 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-17.5
+resolver: lts-18.14
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 797c52f1f479..86ac0037311a 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=2
+revision=3
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From a2e833443ae71cd528081cbbe17c561de827da9c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 5 Nov 2021 07:22:52 +0100
Subject: [PATCH 0091/2561] git-annex: update to 8.20211028

---
 srcpkgs/git-annex/files/stack.yaml       | 32 ------------------------
 srcpkgs/git-annex/patches/ghc8.8.3.patch | 18 -------------
 srcpkgs/git-annex/template               |  6 ++---
 3 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/git-annex/files/stack.yaml
 delete mode 100644 srcpkgs/git-annex/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
deleted file mode 100644
index 5d457bebde83..000000000000
--- a/srcpkgs/git-annex/files/stack.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-flags:
-  git-annex:
-    production: true
-    assistant: true
-    pairing: true
-    torrentparser: true
-    webapp: true
-    magicmime: false
-    dbus: false
-    debuglocks: false
-    benchmark: false
-    networkbsd: false
-    gitlfs: true
-    httpclientrestricted: true
-packages:
-- '.'
-extra-deps:
- - IfElse-0.85
- - aws-0.22
- - bloomfilter-2.0.1.0
- - filepath-bytestring-1.4.2.1.6
- - git-lfs-1.1.0
- - http-client-restricted-0.0.3
- - network-multicast-0.3.2
- - sandi-0.5
- - torrent-10000.1.1
- - bencode-0.6.1.1
- - network-3.1.0.1
-explicit-setup-deps:
-  git-annex: true
-resolver: lts-17.5
-allow-newer: true
diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch
deleted file mode 100644
index 27a1739c1119..000000000000
--- a/srcpkgs/git-annex/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
-+++ b/git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
-@@ -304,6 +304,7 @@
-   Build-Depends:
-    base (>= 4.11.1.0 && < 5.0),
-    network-uri (>= 2.6),
-+   network-bsd,
-    optparse-applicative (>= 0.14.1),
-    containers (>= 0.5.8),
-    exceptions (>= 0.6),
-@@ -404,3 +404,3 @@ if flag(NetworkBSD)
-     Build-Depends: network-bsd, network (>= 3.0.0.0)
-   else
--    Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
-+    Build-Depends: network (< 3.2.0.0), network (>= 2.6.3.0)
-
-   if flag(S3)
-     Build-Depends: aws (>= 0.20)
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index cdcd6bb0f83c..1cf2ab14789f 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,10 +1,10 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210330
+version=8.20211028
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
- lsof rsync git"
+ lsof rsync git ncurses-devel"
 # depends are utilities required by git-annex
 depends="git rsync curl lsof gnupg2"
 short_desc="Git addon for managing large files"
@@ -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=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d
+checksum=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From ae2a21f271d303823dac6fc7f2f975921e82b0da Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 11 Mar 2022 19:21:25 +0100
Subject: [PATCH 0092/2561] cfitsio: enable reentrant multithreading

---
 srcpkgs/cfitsio/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cfitsio/template b/srcpkgs/cfitsio/template
index 3545bb4299bd..55ff7d14e61d 100644
--- a/srcpkgs/cfitsio/template
+++ b/srcpkgs/cfitsio/template
@@ -1,8 +1,9 @@
 # Template file for 'cfitsio'
 pkgname=cfitsio
 version=4.0.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--enable-reentrant"
 makedepends="libcurl-devel"
 short_desc="Library for reading and writing data files in FITS data format"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"

From 19f3503eb8681371d1ce32e607d616c3211e3b6c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 11 Mar 2022 10:44:13 -0800
Subject: [PATCH 0093/2561] podman: install rootlessport and completions

Fixes #36095
---
 srcpkgs/podman/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index e83467c87f7c..c719e4ca6057 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,10 +1,10 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.0.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
-go_package="${go_import_path}/cmd/podman"
+go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
 go_build_tags="seccomp apparmor containers_image_ostree_stub"
 hostmakedepends="pkg-config go-md2man"
 makedepends="gpgme-devel libseccomp-devel device-mapper-devel libbtrfs-devel"
@@ -26,7 +26,10 @@ post_build() {
 }
 
 post_install() {
+	vmkdir usr/libexec/podman
+	mv "${DESTDIR}/usr/bin/rootlessport" "${DESTDIR}/usr/libexec/podman/rootlessport"
 	make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
+	make install.completions DESTDIR="${DESTDIR}" PREFIX="/usr"
 	sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
 		vendor/github.com/containers/common/pkg/config/containers.conf \
 		>containers.cgfs.conf

From 50ddd3f969e48fe5b6ee4126018fd9a01268d9d7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 12 Mar 2022 09:34:10 +0100
Subject: [PATCH 0094/2561] wine: update to 7.4.

---
 srcpkgs/wine/patches/musl-limits.patch |  4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  |  8 ++++----
 srcpkgs/wine/patches/musl-uid-t.patch  |  4 ++--
 srcpkgs/wine/template                  | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index a791710f0c77..b13cbe9ea48c 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.3/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.3/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index 8607cbe9929a..82f45cc1d171 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.3/configure
-+++ b/wine-7.3/configure
+--- a/wine-7.4/configure
++++ b/wine-7.4/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
---- a/wine-7.3/configure.ac
-+++ b/wine-7.3/configure.ac
+--- a/wine-7.4/configure.ac
++++ b/wine-7.4/configure.ac
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 9ee5a79e1637..2fe1c18c553b 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.3/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.3/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/wine-7.4/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/wine-7.4/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index f82741c2741d..8dfb8df9f6be 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.3
+version=7.4
 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="71fdffed747bd176ba414ebc49027df75aa2d45580a0338a7a36d974cd147a96
- 6175e8929e4594dcf23ef28f556cde87b122dbf2e2476006660d920cc121cc98"
+checksum="728e866d6e49ce92a2a0c514333e9ff08bdbf6c86f5ef4e6180143b8d2b7d416
+ c1688af87737f47337a8f7e24d501d99582a691a2a08ba8e71b9911abbfd8554"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"
@@ -43,8 +43,8 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  libldap-devel alsa-lib-devel libgphoto2-devel glib-devel
  freetype-devel pulseaudio-devel libopenal-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
- libpcap-devel cups-devel ocl-icd-devel vulkan-loader vkd3d-devel
- gst-plugins-base1-devel SDL2-devel"
+ libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
+ SDL2-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}"

From 22bebebfd34aaf5a460492c3ff0fca8da9141473 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 12 Mar 2022 09:36:33 +0100
Subject: [PATCH 0095/2561] linux5.4: update to 5.4.184.

---
 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 439a5538b1c1..983e18bdc0ba 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.183
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=2d4b0b77644835410b2a5f599b2893fe199d5542615684207f579753020cc99c
+checksum=8694ca39e6c665cac5a78c7f80acef83ad9b5b13f9688e94bfe39b3c71541489
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 0ee3846d76909a67dc121042d5403074339a7fed Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 12 Mar 2022 09:41:51 +0100
Subject: [PATCH 0096/2561] linux4.19: update to 4.19.234.

---
 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 5a274df27b39..64351dd2d235 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.233
+version=4.19.234
 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=b8f665f020c2724a9f1e0368fdc0ea451b0b7d915ffae7ef4b9ec27a550fce37
+checksum=0082966be4a476c42ed59996e072e7e9fa5282b742efe4ffabadd6cd91212d8b
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 90cfdaab2092208babf1dd741ee321464d6e144b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:27:59 +0100
Subject: [PATCH 0097/2561] flannel: update to 0.17.0.

---
 srcpkgs/flannel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 7a65a2143779..14fdf5fbbda4 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,6 +1,6 @@
 # Template file for 'flannel'
 pkgname=flannel
-version=0.16.3
+version=0.17.0
 revision=1
 build_style=go
 short_desc="Etcd backed network fabric for containers"
@@ -10,7 +10,7 @@ license="Apache-2.0"
 go_import_path="github.com/coreos/flannel"
 homepage="https://$go_import_path"
 distfiles="$homepage/archive/v${version}.tar.gz"
-checksum=d78043adbd3933606ec728068369d0c5596c82309246ff36c3fcadb99561c5bb
+checksum=5a52113cfee3d54b6b906ab16ef64114efd1a3533ed79ab5e46d008bab669a07
 
 post_extract() {
 	ln -s $wrksrc vendor/$go_import_path

From 5602d4882728ce5ac59f93cc680dab6448abc8f4 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:29:26 +0100
Subject: [PATCH 0098/2561] hugo: update to 0.94.2.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 6732e2725b69..477c90d66393 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.92.2
+version=0.94.2
 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=00d61205f426587dcfc4e2844a6f9fb451c825b828c00f0b46e3d0930c132751
+checksum=315bc0d22977e84ba25125b1d23333648e36194a46a4d6ae4f4c6c683dc8979c
 
 post_install() {
 	vdoc README.md

From 966077d66e3c4aece8de5f17bcd64ddcab631517 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:39:16 +0100
Subject: [PATCH 0099/2561] python-b2sdk: update to 1.14.1.

---
 srcpkgs/python-b2sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index d7ccc8eb440f..7b0578b60926 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'python-b2sdk'
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
-version=1.14.0
+version=1.14.1
 revision=1
 wrksrc="b2sdk-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://pypi.org/project/b2sdk"
 distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=900da60f9e569e02405b85db35541a79e1cac776ace5d054498b107982ea443c
+checksum=7d839eca12a6f66453eb535c41569714a7910bc012f657c864c3bfb3a88569e8
 
 post_install() {
 	vlicense LICENSE

From 04ccfe5253ac8dcdb4ab61b51533b34bb8d07881 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:40:19 +0100
Subject: [PATCH 0100/2561] supermin: update to 5.2.2.

---
 srcpkgs/supermin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 09b45ddd429f..357fc3f255f8 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
-version=5.2.1
-revision=3
+version=5.2.2
+revision=1
 _release_series=5.2-stable
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://people.redhat.com/~rjones/supermin/"
 distfiles="http://download.libguestfs.org/supermin/${_release_series}/supermin-${version}.tar.gz"
-checksum=c45d8479b6da8ea55ca2c4b82b2c8bc7c2e6f724cf59c980df1dec93fb578ffb
+checksum=ce3921d3635c8168cfb7ca0c5a82b9d5cef5b2b271f84b776d63b8bbbeec358e
 nocross=yes

From 7ffbdb32121548f575bc7f0bb41ecd17e935d6e5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 15:00:14 +0100
Subject: [PATCH 0101/2561] ruby: update to 3.1.1.

---
 common/shlibs         |  2 +-
 srcpkgs/ruby/template | 34 ++++++++++++----------------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d60e60a87534..f26b9bab58fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -440,7 +440,7 @@ libKScreenLocker.so.5 kscreenlocker-5.8.4_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.89 ntfs-3g-2021.8.22_1
-libruby.so.3.0 ruby-3.0.2_1
+libruby.so.3.1 ruby-3.1.0_1
 librw.so.0 rankwidth-0.9_1
 libprocessui.so.9 libksysguard-5.18.90_1
 libksignalplotter.so.9 libksysguard-5.18.90_1
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index f9fb36a74dda..85524a7796b2 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -1,12 +1,12 @@
 # Template file for 'ruby'
-_ruby_abiver=3.0.0
+_ruby_abiver=3.1.0
 
 pkgname=ruby
-version=3.0.3
+version=3.1.1
 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"
+ PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
 makedepends="zlib-devel readline-devel libffi-devel openssl-devel
@@ -16,7 +16,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.xz"
-checksum=88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c
+checksum=7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally
@@ -48,6 +48,12 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 post_patch() {
+	# https://bugs.ruby-lang.org/issues/18373#note-8
+	find .bundle -name extconf.rb -exec \
+		sed -i \
+			-e '/create_makefile/i \$arch_hdrdir = "$(hdrdir)/../.ext/include/$(arch)"' \
+			-e '/create_makefile/i \$DLDFLAGS << " -L#{$top_srcdir}"' {} \;
+
 	[ "$XBPS_TARGET_LIBC" = "glibc" ] && return 0
 
 	echo "Patching out using binary gems for non-glibc..."
@@ -55,29 +61,16 @@ post_patch() {
 }
 
 pre_configure() {
-	# this allows the test suite to pass without crashing
-	export CFLAGS+=" -fno-omit-frame-pointer -fno-strict-aliasing"
-	export CPPFLAGS+=" -fno-omit-frame-pointer -fno-strict-aliasing"
-
 	case "$XBPS_TARGET_MACHINE" in
 		ppc64le*) ;;
 		ppc*)
 			# Random segfaults otherwise
 			export CFLAGS+=" -Os"
-			export CPPFLAGS+=" -Os"
 			;;
 	esac
-
-	# force this to pass on systems with these as macros (musl)
-	export ac_cv_func_isnan=yes
-	export ac_cv_func_isinf=yes
 }
 
 pre_build() {
-	# Force getaddrinfo detection.
-	sed -e 's,\(checking_for("wide getaddrinfo") {try_\)run,\1link,' -i ext/socket/extconf.rb
-	# Hack for cross-builds.
-	touch ext/ripper/check
 	# Set -fno-stack-protector for i686* or otherwise linking fails with
 	# ...: undefined reference to '__stack_chk_fail_local'
 	case "$XBPS_TARGET_MACHINE" in
@@ -91,13 +84,10 @@ pre_build() {
 post_install() {
 	# Remove references to the cross compiler
 	if [ "$CROSS_BUILD" ]; then
-		sed -e "s,${XBPS_CROSS_TRIPLET}-,,g" -i ${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
+		vsed -e "s,${XBPS_CROSS_TRIPLET}-,,g" -i ${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
 	fi
 	# Replace reference to the install(1) wrapper
-	sed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
-		${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
-	# Remove references to hardening -specs.
-	sed -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" -i \
+	vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
 		${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
 	vlicense COPYING
 }

From 2a3eb4022bc85a59fba494d19d22579b8cebef7b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:57:04 +0100
Subject: [PATCH 0102/2561] ruby-clocale: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-clocale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-clocale/template b/srcpkgs/ruby-clocale/template
index a921bc084bc0..61691785300f 100644
--- a/srcpkgs/ruby-clocale/template
+++ b/srcpkgs/ruby-clocale/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-clocale'
 pkgname=ruby-clocale
 version=0.0.4
-revision=4
+revision=5
 build_style=gemspec
 short_desc="Ruby gem that wraps C locale functions"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 30a7e83648d14b6ccf9b7df9009be75bfc1bd357 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:57:23 +0100
Subject: [PATCH 0103/2561] ruby-ffi: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-ffi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-ffi/template b/srcpkgs/ruby-ffi/template
index efe3ca4f3f5f..11a8d58499ed 100644
--- a/srcpkgs/ruby-ffi/template
+++ b/srcpkgs/ruby-ffi/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-ffi'
 pkgname=ruby-ffi
 version=1.11.3
-revision=5
+revision=6
 wrksrc="ffi-${version}"
 build_style=gemspec
 hostmakedepends="libffi-devel"

From 38dad3fea5740d4f8d5d75dbc4bf473b74b087be Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:57:45 +0100
Subject: [PATCH 0104/2561] ruby-hpricot: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-hpricot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-hpricot/template b/srcpkgs/ruby-hpricot/template
index 1013a395fa57..40cdaabc73ff 100644
--- a/srcpkgs/ruby-hpricot/template
+++ b/srcpkgs/ruby-hpricot/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-hpricot'
 pkgname=ruby-hpricot
 version=0.8.6
-revision=6
+revision=7
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"

From cd4a5858de81e927119f48fda9e3f1367951cbd3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:58:19 +0100
Subject: [PATCH 0105/2561] ruby-rdiscount: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rdiscount/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rdiscount/template b/srcpkgs/ruby-rdiscount/template
index b784e7283e13..acd6dc4a494a 100644
--- a/srcpkgs/ruby-rdiscount/template
+++ b/srcpkgs/ruby-rdiscount/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rdiscount'
 pkgname=ruby-rdiscount
 version=2.2.0.1
-revision=7
+revision=8
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"

From 3c1a8994c2e579116f0779a34925af2edeff19b7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:58:57 +0100
Subject: [PATCH 0106/2561] vim: rebuild for ruby-3.1.0.

---
 srcpkgs/vim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index bd919ebdf9b7..252c84c21b18 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
 version=8.2.4221
-revision=1
+revision=2
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="acl-devel ncurses-devel
  $(vopt_if x11 libXt-devel)

From 071d4aa3b48b2a1eabb6023ce0c912ff05d2987b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:59:22 +0100
Subject: [PATCH 0107/2561] ruby-asciidoctor: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-asciidoctor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-asciidoctor/template b/srcpkgs/ruby-asciidoctor/template
index 8b0417bb3623..e9e7669f0f6c 100644
--- a/srcpkgs/ruby-asciidoctor/template
+++ b/srcpkgs/ruby-asciidoctor/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-asciidoctor'
 pkgname=ruby-asciidoctor
 version=2.0.15
-revision=2
+revision=3
 build_style=gem
 short_desc="Ruby implementation of AsciiDoc"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e882c298af5f04c7426c68211de331a19f865dfe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:01:12 +0100
Subject: [PATCH 0108/2561] weechat: rebuild for ruby-3.1.0.

---
 srcpkgs/weechat/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 9395e73319cf..a496a6412e85 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
 version=3.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
@@ -32,6 +32,10 @@ if [ "$CROSS_BUILD" ]; then
 	 -DPERL_LFLAGS=-L$_perlpath"
 fi
 
+post_extract() {
+	vsed -i '/pkg_search_module/s/ruby-3.0/ruby-3.1 &/' cmake/FindRuby.cmake
+}
+
 weechat-aspell_package() {
 	lib32disabled=yes
 	depends="${sourcepkg}>=${version}_${revision}"

From 820eefa3b618b13fa9ed1bba45342bec1cbd0e0b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:02:18 +0100
Subject: [PATCH 0109/2561] ruby-sync: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-sync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-sync/template b/srcpkgs/ruby-sync/template
index a76352acfaab..77569174612f 100644
--- a/srcpkgs/ruby-sync/template
+++ b/srcpkgs/ruby-sync/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-sync'
 pkgname=ruby-sync
 version=0.5.0
-revision=3
+revision=4
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 hostmakedepends="ruby"

From 6690229c4ab2405a140f25656a6150b06108fa6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:02:39 +0100
Subject: [PATCH 0110/2561] ruby-concurrent-ruby: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-concurrent-ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-concurrent-ruby/template b/srcpkgs/ruby-concurrent-ruby/template
index cb58198062a2..8117a8fef1c8 100644
--- a/srcpkgs/ruby-concurrent-ruby/template
+++ b/srcpkgs/ruby-concurrent-ruby/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-concurrent-ruby'
 pkgname=ruby-concurrent-ruby
 version=1.1.7
-revision=2
+revision=3
 build_style=gem
 hostmakedepends="ruby"
 depends="ruby"

From 56f4fb69b8fb8a2f121f6a41a15f322043817521 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:02:53 +0100
Subject: [PATCH 0111/2561] ruby-rubysl-singleton: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rubysl-singleton/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rubysl-singleton/template b/srcpkgs/ruby-rubysl-singleton/template
index d119521708b2..36945b5cf4f5 100644
--- a/srcpkgs/ruby-rubysl-singleton/template
+++ b/srcpkgs/ruby-rubysl-singleton/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rubysl-singleton'
 pkgname=ruby-rubysl-singleton
 version=2.0.0
-revision=4
+revision=5
 build_style=gemspec
 hostmakedepends="ruby"
 depends="ruby"

From 10a85aaa340b7269fd60592987280ab95d5d13b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:04:11 +0100
Subject: [PATCH 0112/2561] ruby-deep_merge: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-deep_merge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-deep_merge/template b/srcpkgs/ruby-deep_merge/template
index 858e491f0a99..2f38c05c30ea 100644
--- a/srcpkgs/ruby-deep_merge/template
+++ b/srcpkgs/ruby-deep_merge/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-deep_merge'
 pkgname=ruby-deep_merge
 version=1.2.1
-revision=4
+revision=5
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 hostmakedepends="ruby"

From 7572ee22a6abf1eb843823f40ad27c11a846b097 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:04:46 +0100
Subject: [PATCH 0113/2561] ruby-addressable: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-addressable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-addressable/template b/srcpkgs/ruby-addressable/template
index 89ee94646ec5..13097fcfe0be 100644
--- a/srcpkgs/ruby-addressable/template
+++ b/srcpkgs/ruby-addressable/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-addressable'
 pkgname=ruby-addressable
 version=2.7.0
-revision=5
+revision=6
 build_style=gem
 depends="ruby-public_suffix>=2.0.2 ruby-public_suffix<5.0"
 short_desc="Replacement for Ruby's standard library URI implementation"

From 77fd225a19273a85be53094ca4116f036ed39517 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:04:55 +0100
Subject: [PATCH 0114/2561] ruby-backports: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-backports/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-backports/template b/srcpkgs/ruby-backports/template
index adcf4bfdde06..355a40cfad75 100644
--- a/srcpkgs/ruby-backports/template
+++ b/srcpkgs/ruby-backports/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-backports'
 pkgname=ruby-backports
 version=3.15.0
-revision=4
+revision=5
 build_style=gem
 short_desc="Essential backports that enable many of the nice features of Ruby"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fb053355b3526d9f7ca78422f8399a26815585c6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:11 +0100
Subject: [PATCH 0115/2561] ruby-connection_pool: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-connection_pool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-connection_pool/template b/srcpkgs/ruby-connection_pool/template
index 6e0dc024cce7..a83d37b84ed5 100644
--- a/srcpkgs/ruby-connection_pool/template
+++ b/srcpkgs/ruby-connection_pool/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-connection_pool'
 pkgname=ruby-connection_pool
 version=2.2.2
-revision=5
+revision=6
 build_style=gem
 short_desc="Generic connection pool for Ruby"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ae79af67907882772be38cb0bc1ffb980d17aca1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:23 +0100
Subject: [PATCH 0116/2561] ruby-erubis: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-erubis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-erubis/template b/srcpkgs/ruby-erubis/template
index b79aff3062b8..5cc96909679e 100644
--- a/srcpkgs/ruby-erubis/template
+++ b/srcpkgs/ruby-erubis/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-erubis'
 pkgname=ruby-erubis
 version=2.7.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Erubis is an implementation of eRuby"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fd3c8303ab5e95a4b145aa74900fc9fd1c4705a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:29 +0100
Subject: [PATCH 0117/2561] ruby-ethon: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-ethon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-ethon/template b/srcpkgs/ruby-ethon/template
index d6bbf0958c52..a3184cb3fc47 100644
--- a/srcpkgs/ruby-ethon/template
+++ b/srcpkgs/ruby-ethon/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-ethon'
 pkgname=ruby-ethon
 version=0.12.0
-revision=4
+revision=5
 build_style=gem
 depends="ruby-ffi>=1.3.0"
 short_desc="Lightweight wrapper around libcurl"

From 11dbb39a091b7e9d2566ca465bdc2d342d37f6d5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:44 +0100
Subject: [PATCH 0118/2561] ruby-faraday: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-faraday/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-faraday/template b/srcpkgs/ruby-faraday/template
index 5d8de2ac9e1c..6b8997a6425d 100644
--- a/srcpkgs/ruby-faraday/template
+++ b/srcpkgs/ruby-faraday/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-faraday'
 pkgname=ruby-faraday
 version=1.0.1
-revision=3
+revision=4
 build_style=gem
 depends="ruby-multipart-post>=1.2 ruby-multipart-post<3"
 short_desc="HTTP/REST API client library"

From 657f2f943ef6e31db60a99781150f3b23c65a6ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:51 +0100
Subject: [PATCH 0119/2561] ruby-faraday_middleware: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-faraday_middleware/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-faraday_middleware/template b/srcpkgs/ruby-faraday_middleware/template
index 6f6eadeb60af..b819c537ba5f 100644
--- a/srcpkgs/ruby-faraday_middleware/template
+++ b/srcpkgs/ruby-faraday_middleware/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-faraday_middleware'
 pkgname=ruby-faraday_middleware
 version=1.0.0
-revision=3
+revision=4
 build_style=gem
 depends="ruby-faraday>=1.0"
 short_desc="Various middleware for Faraday"

From 8b127773dda371a9cbffde76dad03ac488b2a7cb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:58 +0100
Subject: [PATCH 0120/2561] ruby-filesize: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-filesize/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-filesize/template b/srcpkgs/ruby-filesize/template
index 0d2c06a995d1..1a9939136b77 100644
--- a/srcpkgs/ruby-filesize/template
+++ b/srcpkgs/ruby-filesize/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-filesize'
 pkgname=ruby-filesize
 version=0.2.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Small class for handling filesizes"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d3fecbe945e3a4846f0dad7cacd5766255cf98a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:07 +0100
Subject: [PATCH 0121/2561] ruby-gh: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-gh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-gh/template b/srcpkgs/ruby-gh/template
index fa43ad84d5f0..5758f646973d 100644
--- a/srcpkgs/ruby-gh/template
+++ b/srcpkgs/ruby-gh/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-gh'
 pkgname=ruby-gh
 version=0.15.1
-revision=5
+revision=6
 build_style=gem
 depends="ruby-addressable>=2.4.0 ruby-backports ruby-faraday>=0.8
  ruby-multi_json>=1.0 ruby-net-http-persistent>=2.9 ruby-net-http-pipeline"

From cfcba061ca5be1de65fea963a5830374d52dcdf4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:15 +0100
Subject: [PATCH 0122/2561] ruby-highline: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-highline/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-highline/template b/srcpkgs/ruby-highline/template
index aa00cf9b5bde..7e7e9bdd80ea 100644
--- a/srcpkgs/ruby-highline/template
+++ b/srcpkgs/ruby-highline/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-highline'
 pkgname=ruby-highline
 version=2.0.3
-revision=4
+revision=5
 build_style=gem
 short_desc="High-level IO library for comamndline interfaces"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5330c08eadfa38eaa053ff95fd8047e0fb90ddf8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:23 +0100
Subject: [PATCH 0123/2561] ruby-httparty: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-httparty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-httparty/template b/srcpkgs/ruby-httparty/template
index 2df74d93b219..4b286f65f329 100644
--- a/srcpkgs/ruby-httparty/template
+++ b/srcpkgs/ruby-httparty/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-httparty'
 pkgname=ruby-httparty
 version=0.17.1
-revision=4
+revision=5
 build_style=gem
 depends="ruby-mime-types>=3.0 ruby-multi_xml>=0.5.2"
 short_desc="Makes http fun! Also, makes consuming restful web services dead easy"

From 59b5b9321827cdcca9ab0cf9cf2d23fb75640f0e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:33 +0100
Subject: [PATCH 0124/2561] ruby-launchy: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-launchy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-launchy/template b/srcpkgs/ruby-launchy/template
index 0e2f076b4977..f8890626158c 100644
--- a/srcpkgs/ruby-launchy/template
+++ b/srcpkgs/ruby-launchy/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-launchy'
 pkgname=ruby-launchy
 version=2.4.3
-revision=5
+revision=6
 build_style=gem
 depends="ruby-addressable>=2.3 ruby-addressable<3.0"
 short_desc="Helper class for launching cross-platform applications"

From 0d0e28f77aa74f4146225f1a699f5b80014872c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:47 +0100
Subject: [PATCH 0125/2561] ruby-manpages: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-manpages/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-manpages/template b/srcpkgs/ruby-manpages/template
index 4fbc854f82f6..927f16b7068c 100644
--- a/srcpkgs/ruby-manpages/template
+++ b/srcpkgs/ruby-manpages/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-manpages'
 pkgname=ruby-manpages
 version=0.6.1
-revision=5
+revision=6
 build_style=gem
 short_desc="Gem to add man pages support to ruby gems"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 05f173bd57d1105beb56f149fcca0cd2c955bd47 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:56 +0100
Subject: [PATCH 0126/2561] ruby-mime-types: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-mime-types/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-mime-types/template b/srcpkgs/ruby-mime-types/template
index 4323b3617da1..94fa4f592d2a 100644
--- a/srcpkgs/ruby-mime-types/template
+++ b/srcpkgs/ruby-mime-types/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mime-types'
 pkgname=ruby-mime-types
 version=3.3
-revision=4
+revision=5
 build_style=gem
 depends="ruby-mime-types-data>=3.2015"
 short_desc="Library for registry and information about MIME types"

From 930f6834e7e638dc06dedc0d03258d05cbba940b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:01 +0100
Subject: [PATCH 0127/2561] ruby-mime-types-data: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-mime-types-data/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-mime-types-data/template b/srcpkgs/ruby-mime-types-data/template
index 8f4b85acebc1..64d444528873 100644
--- a/srcpkgs/ruby-mime-types-data/template
+++ b/srcpkgs/ruby-mime-types-data/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mime-types-data'
 pkgname=ruby-mime-types-data
 version=3.2019.1009
-revision=4
+revision=5
 build_style=gem
 short_desc="Registry for MIME media type definitions"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c72dbe711ff78ae60d998c4ec26baea4138213fa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:07 +0100
Subject: [PATCH 0128/2561] ruby-mini_portile2: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-mini_portile2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-mini_portile2/template b/srcpkgs/ruby-mini_portile2/template
index aacfb695d15c..f7c225545dc9 100644
--- a/srcpkgs/ruby-mini_portile2/template
+++ b/srcpkgs/ruby-mini_portile2/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mini_portile2'
 pkgname=ruby-mini_portile2
 version=2.4.0
-revision=4
+revision=5
 build_style=gem
 short_desc="Simplistic port-like solution for developers"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e58aa7603325a8863fc7f9c44c88c664d42574b4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:17 +0100
Subject: [PATCH 0129/2561] ruby-multi_json: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-multi_json/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-multi_json/template b/srcpkgs/ruby-multi_json/template
index 72d7a67451c9..006d7d578a16 100644
--- a/srcpkgs/ruby-multi_json/template
+++ b/srcpkgs/ruby-multi_json/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-multi_json'
 pkgname=ruby-multi_json
 version=1.14.1
-revision=4
+revision=5
 build_style=gem
 short_desc="Common interface for multiple JSON parsing libraries"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9bf053abb28d9db11849f165220eabefbe087d53 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:26 +0100
Subject: [PATCH 0130/2561] ruby-multi_xml: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-multi_xml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-multi_xml/template b/srcpkgs/ruby-multi_xml/template
index 9df407b1c57e..fd23fbc227f5 100644
--- a/srcpkgs/ruby-multi_xml/template
+++ b/srcpkgs/ruby-multi_xml/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-multi_xml'
 pkgname=ruby-multi_xml
 version=0.6.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Swappable XML backends utilizing LibXML, Nokogiri, Ox, or REXML"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c6852ce5d150302fb9fd43521bd4b7424a26e35c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:35 +0100
Subject: [PATCH 0131/2561] ruby-multipart-post: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-multipart-post/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-multipart-post/template b/srcpkgs/ruby-multipart-post/template
index 616e52195daf..c6baa24adf70 100644
--- a/srcpkgs/ruby-multipart-post/template
+++ b/srcpkgs/ruby-multipart-post/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-multipart-post'
 pkgname=ruby-multipart-post
 version=2.1.1
-revision=4
+revision=5
 build_style=gem
 short_desc="Use with Net::HTTP to do multipart form posts"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3bdb09b57c852917b1f0a8474d76bad48908b787 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:45 +0100
Subject: [PATCH 0132/2561] ruby-mustache: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-mustache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-mustache/template b/srcpkgs/ruby-mustache/template
index ce9b567d0dd5..cf10ae6f107f 100644
--- a/srcpkgs/ruby-mustache/template
+++ b/srcpkgs/ruby-mustache/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mustache'
 pkgname=ruby-mustache
 version=1.1.1
-revision=4
+revision=5
 build_style=gem
 short_desc="Framework-agnostic way to render logic-free views"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8441d3b204652762730846f7d4c4303a1693e940 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:56 +0100
Subject: [PATCH 0133/2561] ruby-net-http-persistent: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-net-http-persistent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-net-http-persistent/template b/srcpkgs/ruby-net-http-persistent/template
index a0f35fc709ae..943562acf325 100644
--- a/srcpkgs/ruby-net-http-persistent/template
+++ b/srcpkgs/ruby-net-http-persistent/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-net-http-persistent'
 pkgname=ruby-net-http-persistent
 version=4.0.1
-revision=1
+revision=2
 build_style=gem
 depends="ruby-connection_pool>=2.2 ruby-connection_pool<3.0"
 short_desc="Manages persistent connections using Net::HTTP"

From 92462d0a48fab9d63b263a881c625e3e124c3797 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:04 +0100
Subject: [PATCH 0134/2561] ruby-net-http-pipeline: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-net-http-pipeline/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-net-http-pipeline/template b/srcpkgs/ruby-net-http-pipeline/template
index c976e9b00208..a071ee510449 100644
--- a/srcpkgs/ruby-net-http-pipeline/template
+++ b/srcpkgs/ruby-net-http-pipeline/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-net-http-pipeline'
 pkgname=ruby-net-http-pipeline
 version=1.0.1
-revision=5
+revision=6
 build_style=gem
 short_desc="HTTP/1.1 pipelining implementation atop Net::HTTP"
 maintainer="Orphaned <orphan@voidlinux.org>"

From acfc4f5b76dabcfd234301de2f1c2e5e2e7f661b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:16 +0100
Subject: [PATCH 0135/2561] ruby-pkg-config: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-pkg-config/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-pkg-config/template b/srcpkgs/ruby-pkg-config/template
index cdfa408875dd..8c53cce12f49 100644
--- a/srcpkgs/ruby-pkg-config/template
+++ b/srcpkgs/ruby-pkg-config/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-pkg-config'
 pkgname=ruby-pkg-config
 version=1.4.0
-revision=4
+revision=5
 build_style=gem
 short_desc="Properly detect need libraries for compiling Ruby native extensions"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ac9bd1f84cc00b4fde588c464c552bf927b82d84 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:26 +0100
Subject: [PATCH 0136/2561] ruby-public_suffix: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-public_suffix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-public_suffix/template b/srcpkgs/ruby-public_suffix/template
index c68fd046d502..0e4eed0e0f02 100644
--- a/srcpkgs/ruby-public_suffix/template
+++ b/srcpkgs/ruby-public_suffix/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-public_suffix'
 pkgname=ruby-public_suffix
 version=4.0.2
-revision=4
+revision=5
 build_style=gem
 short_desc="Parse domain names into top level domain, domain and subdomains"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1f204722a0e65c87a3a589da112288165d5bb09f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:34 +0100
Subject: [PATCH 0137/2561] ruby-pusher-client: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-pusher-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-pusher-client/template b/srcpkgs/ruby-pusher-client/template
index 90f0c3249f71..2d4e3c021e57 100644
--- a/srcpkgs/ruby-pusher-client/template
+++ b/srcpkgs/ruby-pusher-client/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-pusher-client'
 pkgname=ruby-pusher-client
 version=0.6.2
-revision=5
+revision=6
 build_style=gem
 depends="ruby-websocket>=1.0 ruby-websocket<2.0"
 short_desc="Client for consuming WebSockets from http://pusher.com"

From a49702f99655439b8d1a479e205b9d41a4627a3b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:47 +0100
Subject: [PATCH 0138/2561] ruby-rainbow: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rainbow/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rainbow/template b/srcpkgs/ruby-rainbow/template
index 6bc1fb209420..e9a41a7cf61f 100644
--- a/srcpkgs/ruby-rainbow/template
+++ b/srcpkgs/ruby-rainbow/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rainbow'
 pkgname=ruby-rainbow
 version=3.0.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Colorize printed text on ANSI terminals"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ac6ad09a42054ea6909ad695154405305e0ceed2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:51 +0100
Subject: [PATCH 0139/2561] ruby-rb-readline: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rb-readline/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rb-readline/template b/srcpkgs/ruby-rb-readline/template
index 9b35afe5be12..15beb60005a5 100644
--- a/srcpkgs/ruby-rb-readline/template
+++ b/srcpkgs/ruby-rb-readline/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rb-readline'
 pkgname=ruby-rb-readline
 version=0.5.5
-revision=5
+revision=6
 build_style=gem
 depends="ruby"
 short_desc="Pure Ruby implementation of GNU readline library"

From dd1d3cd493f173a7c1d6268c0eab02f906303083 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:11 +0100
Subject: [PATCH 0140/2561] ruby-rdiscount: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rdiscount/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rdiscount/template b/srcpkgs/ruby-rdiscount/template
index acd6dc4a494a..526af9a6dc2d 100644
--- a/srcpkgs/ruby-rdiscount/template
+++ b/srcpkgs/ruby-rdiscount/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rdiscount'
 pkgname=ruby-rdiscount
 version=2.2.0.1
-revision=8
+revision=9
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"

From ca4c785bcad1f6a6097ff18ea5378fa682cd5d69 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:29 +0100
Subject: [PATCH 0141/2561] ruby-ronn: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-ronn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-ronn/template b/srcpkgs/ruby-ronn/template
index 83516fe69653..d6a74ac864b6 100644
--- a/srcpkgs/ruby-ronn/template
+++ b/srcpkgs/ruby-ronn/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-ronn'
 pkgname=ruby-ronn
 version=0.7.3
-revision=5
+revision=6
 build_style=gem
 depends="ruby-hpricot ruby-mustache ruby-rdiscount groff"
 short_desc="Strick markdown-like format for manpages"

From 4d9b635c0d2cbdaae7a2890e83eac60824683eb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:37 +0100
Subject: [PATCH 0142/2561] ruby-thor: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-thor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-thor/template b/srcpkgs/ruby-thor/template
index b7aefd3626c2..241ea78068e6 100644
--- a/srcpkgs/ruby-thor/template
+++ b/srcpkgs/ruby-thor/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-thor'
 pkgname=ruby-thor
 version=0.20.3
-revision=5
+revision=6
 build_style=gem
 short_desc="Toolkit for building powerful command-line interfaces"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3b1344eed45bfcb88f7247a5417c1f7e1580f09d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:46 +0100
Subject: [PATCH 0143/2561] ruby-tmuxinator: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-tmuxinator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-tmuxinator/template b/srcpkgs/ruby-tmuxinator/template
index 57342385cb77..7d11374018a5 100644
--- a/srcpkgs/ruby-tmuxinator/template
+++ b/srcpkgs/ruby-tmuxinator/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-tmuxinator'
 pkgname=ruby-tmuxinator
 version=0.16.0
-revision=4
+revision=5
 build_style=gem
 depends="ruby-erubis>=2.6 ruby-thor>=0.15.0 ruby-xdg>=2.2.3 tmux"
 short_desc="Create and manage complex tmux sessions easily"

From a11e7b25a80ef223d9ddf1448cbf73371891e37c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:53 +0100
Subject: [PATCH 0144/2561] ruby-travis: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-travis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-travis/template b/srcpkgs/ruby-travis/template
index 847c706a36b9..3743358bb37f 100644
--- a/srcpkgs/ruby-travis/template
+++ b/srcpkgs/ruby-travis/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-travis'
 pkgname=ruby-travis
 version=1.9.0
-revision=3
+revision=4
 build_style=gem
 depends="ruby-backports ruby-faraday>=1.0 ruby-faraday_middleware>=1.0
  ruby-gh>=0.13 ruby-highline>=2.0 ruby-launchy>=2.1 ruby-pusher-client>=0.4

From 82389afdda3842320fa6f660443eae2b42fbab05 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:10:39 +0100
Subject: [PATCH 0145/2561] ruby-typhoeus: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-typhoeus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-typhoeus/template b/srcpkgs/ruby-typhoeus/template
index cd0057c1ca20..4b4bd3a2ccfc 100644
--- a/srcpkgs/ruby-typhoeus/template
+++ b/srcpkgs/ruby-typhoeus/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-typhoeus'
 pkgname=ruby-typhoeus
 version=1.3.1
-revision=5
+revision=6
 build_style=gem
 depends="ruby-ethon>=0.9.0"
 short_desc="Parallel HTTP requests runner"

From b811356b073c6259735e229b1f76f587abe78b0f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:10:48 +0100
Subject: [PATCH 0146/2561] ruby-websocket: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-websocket/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-websocket/template b/srcpkgs/ruby-websocket/template
index c2e971d9b5c5..95d7cd3f07f4 100644
--- a/srcpkgs/ruby-websocket/template
+++ b/srcpkgs/ruby-websocket/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-websocket'
 pkgname=ruby-websocket
 version=1.2.8
-revision=5
+revision=6
 build_style=gem
 short_desc="Universal Ruby library to handle WebSocket protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e966515378d4a7c62c036c89abe49f42f9fea2b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:10:57 +0100
Subject: [PATCH 0147/2561] ruby-xdg: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-xdg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-xdg/template b/srcpkgs/ruby-xdg/template
index 389d17c7c32a..e04194374ce9 100644
--- a/srcpkgs/ruby-xdg/template
+++ b/srcpkgs/ruby-xdg/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-xdg'
 pkgname=ruby-xdg
 version=5.1.1
-revision=1
+revision=2
 build_style=gem
 short_desc="Module for supporting the XDG Base Directory Standard"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a9d42f8ae58f1c9d13d455c091193e3cfa183a64 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:11:08 +0100
Subject: [PATCH 0148/2561] subtle: rebuild for ruby-3.1.0.

---
 srcpkgs/subtle/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index 0a9d2684a2ca..4db67b872bce 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
 # Template file for 'subtle'
 pkgname=subtle
 version=0.11.6579
-revision=2
+revision=3
 wrksrc="${pkgname}-${version#*.*.}"
 hostmakedepends="python3 mercurial ruby-devel pkg-config"
 makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://hg.unexist.dev/subtle/"
 distfiles="https://hg.unexist.dev/subtle/archive/${version#*.*.}.tar.gz"
-checksum=82fead3b4ced4d9985410e1dfd912fc8f78ce5c1b77448862da5a5bea1a33a96
+checksum=58b4bf85ae348f120a77001042f036570c239cd3327802b012506ea0158d8d86
 conf_files="/etc/xdg/subtle/subtle.rb"
 
 if [ "$CROSS_BUILD" ]; then
@@ -19,7 +19,7 @@ if [ "$CROSS_BUILD" ]; then
 		broken="Word size must match"
 	fi
 	hostmakedepends+=" $makedepends"
-	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/ruby-3.0.0/"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/ruby-3.1.0/"
 	export CFLAGS
 fi
 

From 319ea8de564c9cb697f2b1fb851c29b336048b37 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:11:54 +0100
Subject: [PATCH 0149/2561] rrdtool: rebuild for ruby-3.1.0.

---
 srcpkgs/rrdtool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index 53d8b08aef1a..b1bd0e4e50e9 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
 # Template file for 'rrdtool'
 pkgname=rrdtool
 version=1.7.2
-revision=10
+revision=11
 build_style=gnu-configure
 # configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
 # until this is fixed upstream, manually define am_cv_python_version to circumvent

From 6d67bcb5dfc0cab70100c0cff88bea34c52a076e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:12:53 +0100
Subject: [PATCH 0150/2561] notmuch: rebuild for ruby-3.1.0.

---
 srcpkgs/notmuch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index c7a25199498a..841645d19fe9 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,7 +1,7 @@
 # Template file for 'notmuch'
 pkgname=notmuch
 version=0.32.2
-revision=3
+revision=4
 build_style=configure
 configure_args="--prefix=/usr
  --emacslispdir=/usr/share/emacs/site-lisp/notmuch

From 08c98c92d52c938ed9480ec2069f39ec0d85b8a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:15:22 +0100
Subject: [PATCH 0151/2561] hivex: rebuild for ruby-3.1.0.

---
 srcpkgs/hivex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 613e708f1fa3..448c06ddc9fa 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.21
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"

From c9c3602bad687f6d4d2888b51e91ab534eeefaaf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:13:57 +0100
Subject: [PATCH 0152/2561] libguestfs: rebuild for ruby-3.1.0.

---
 srcpkgs/libguestfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 24a4c3bd4d74..5ac1d1d2b8ee 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.46.2
-revision=1
+revision=2
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"

From c50054a8f068463a900bdddebb5b4daf95b1e03c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:21:25 +0100
Subject: [PATCH 0153/2561] vagrant: rebuild for ruby-3.1.0.

---
 srcpkgs/vagrant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 05139891c1b4..f15d85850d03 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,7 +1,7 @@
 # Template file for 'vagrant'
 pkgname=vagrant
 version=2.2.19
-revision=1
+revision=2
 archs="i686 x86_64*"
 hostmakedepends="ruby"
 makedepends="ruby-devel zlib-devel"
@@ -15,7 +15,7 @@ checksum=4f0e6b1d466e26dead682c4d4843e8f64a012eba4be91506ae6c6d34d3d9c8f9
 nocross=yes
 
 post_extract() {
-	sed -i 's|\,\ "<\ 2\.7"||g' $pkgname.gemspec
+	sed -i 's|, "< 3\.1"||g' $pkgname.gemspec
 }
 
 do_build() {

From 5206b90fd5cbc35853bc48e54611bd7322059e5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 12 Mar 2022 17:59:27 +0100
Subject: [PATCH 0154/2561] cloud-hypervisor: update to 22.1.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index 37f949e6e6c0..3ecf069b2b07 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=22.0
+version=22.1
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=5c5440435f78d4acdbb3ea91abe17d6704da6c18b6f52fe77f15835cfc60d17a
+checksum=73675ed730b5f23c4ce585918acff7496dcb585a4b91a672981c485bc7d94c37
 
 post_install() {
 	vlicense LICENSE-APACHE

From 03df720f0440fc3b818822db9122f529678fc0d1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 12 Mar 2022 18:12:49 +0100
Subject: [PATCH 0155/2561] python3-ropgadget: update to 6.7.

---
 srcpkgs/python3-ropgadget/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-ropgadget/template b/srcpkgs/python3-ropgadget/template
index 6ff8980ab2b0..df108c7351ab 100644
--- a/srcpkgs/python3-ropgadget/template
+++ b/srcpkgs/python3-ropgadget/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ropgadget'
 pkgname=python3-ropgadget
-version=6.6
-revision=2
+version=6.7
+revision=1
 wrksrc="ROPGadget-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/JonathanSalwan/ROPgadget"
 distfiles="${PYPI_SITE}/R/ROPGadget/ROPGadget-${version}.tar.gz"
-checksum=dc61186e0114ec67ec7ce374df8fd2ddc2a7cba129a1242338e900a7483fba22
+checksum=a048f2e51c397b902e4586997bd4fe62af97984e207567cb63e67d86e8e09c8e

From 9bdd69cd97c6bdbebbeff4f64c8e30d5bfda4216 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 23:18:41 +0100
Subject: [PATCH 0156/2561] kup: update to 0.9.1.

---
 srcpkgs/kup/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 461bbcd45f97..15196942dbba 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,9 +1,10 @@
 # Template file for 'kup'
 pkgname=kup
-version=0.8.0
+version=0.9.1
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
+hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
+ kpackage 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"
@@ -13,4 +14,4 @@ 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"
+checksum=5597d215b025bfc76aa290efbe187fb6f92313fbdc40628b851180c535610976

From 825cb152642a5676fb96477f0d13d6791a8e619d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 12 Mar 2022 16:44:34 +0100
Subject: [PATCH 0157/2561] whois: update to 5.5.12.

---
 srcpkgs/whois/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index f46219419be0..46bb8347a810 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,8 +1,12 @@
 # Template file for 'whois'
 pkgname=whois
-version=5.5.11
+version=5.5.12
 revision=1
 wrksrc=whois
+build_style=gnu-makefile
+make_build_args="prefix=/usr HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf"
+make_install_args="prefix=/usr BASEDIR=\${DESTDIR}"
+make_install_target="install-whois"
 hostmakedepends="perl pkg-config gettext"
 makedepends="libidn2-devel"
 short_desc="Improved whois client"
@@ -11,18 +15,13 @@ 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=966281eb8301c14a1acc17e46c70061f73179d80e370aef43065c22f0947fb87
+checksum=f1c5bab781b7f2357dab1039e8875d41ff7b5d03a78c27443fa26351952a0822
 
 alternatives="
  whois:whois:/usr/bin/gwhois
  whois:whois.1:/usr/share/man/man1/gwhois.1"
 
-do_build() {
-	make CC=$CC prefix=/usr HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf
-}
-
-do_install() {
-	make prefix=/usr BASEDIR=${DESTDIR} install-whois
+post_install() {
 	mv ${DESTDIR}/usr/bin/{whois,gwhois}
 	mv ${DESTDIR}/usr/share/man/man1/{whois,gwhois}.1
 }

From 0f47608acf86080a0a66f8289168ab1d28f77f4c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 12 Mar 2022 23:46:58 +0100
Subject: [PATCH 0158/2561] New package: adjtimex-1.29

---
 srcpkgs/adjtimex/patches/destdir.patch | 17 +++++++++++++++++
 srcpkgs/adjtimex/template              | 12 ++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 srcpkgs/adjtimex/patches/destdir.patch
 create mode 100644 srcpkgs/adjtimex/template

diff --git a/srcpkgs/adjtimex/patches/destdir.patch b/srcpkgs/adjtimex/patches/destdir.patch
new file mode 100644
index 000000000000..5fba7fdfad59
--- /dev/null
+++ b/srcpkgs/adjtimex/patches/destdir.patch
@@ -0,0 +1,17 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -42,10 +42,11 @@
+ 	$(CC) $(CFLAGS) -c mat.c
+ 
+ install: all
+-	$(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex
+-	$(INSTALL) -d -g root -m 755 -o root $(mandir)
++	$(INSTALL) -d -g root -m 755 -o root $(DESTDIR)$(bindir)
++	$(INSTALL) -g bin -m 755 -o root adjtimex $(DESTDIR)$(bindir)/adjtimex
++	$(INSTALL) -d -g root -m 755 -o root $(DESTDIR)$(mandir)
+ 	-$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \
+-		$(mandir)/adjtimex.$(manext)
++		$(DESTDIR)$(mandir)/adjtimex.$(manext)
+ 
+ uninstall:
+ 	rm -f $(bindir)/adjtimex $(mandir)/adjtimex.$(manext)
diff --git a/srcpkgs/adjtimex/template b/srcpkgs/adjtimex/template
new file mode 100644
index 000000000000..7a50e751d531
--- /dev/null
+++ b/srcpkgs/adjtimex/template
@@ -0,0 +1,12 @@
+# Template file for 'adjtimex'
+pkgname=adjtimex
+version=1.29
+revision=1
+build_style=gnu-configure
+make_install_args="bindir=/usr/bin"
+short_desc="Kernel time variables configuration utility"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/rogers0/adjtimex"
+distfiles="${DEBIAN_SITE}/main/a/adjtimex/adjtimex_${version}.orig.tar.gz"
+checksum=04b9e8b66e77276ed07e78de89af37fd1aa12725923de853480827c4fafd176a

From b60b1ecab5c68b2db68740d18f2141f44f85f100 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 13 Mar 2022 00:05:37 +0100
Subject: [PATCH 0159/2561] kup: fix build on musl

---
 srcpkgs/kup/patches/musl.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/kup/patches/musl.patch

diff --git a/srcpkgs/kup/patches/musl.patch b/srcpkgs/kup/patches/musl.patch
new file mode 100644
index 000000000000..b62cdd945d9b
--- /dev/null
+++ b/srcpkgs/kup/patches/musl.patch
@@ -0,0 +1,10 @@
+--- a/daemon/fsexecutor.cpp
++++ b/daemon/fsexecutor.cpp
+@@ -15,6 +15,7 @@
+ 
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#include <sys/select.h>
+ 
+ namespace {
+ 

From fd21b66c6fb5f0339e100619e5f5729341fe5750 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sat, 12 Mar 2022 09:57:21 -0600
Subject: [PATCH 0160/2561] zfs: update to 2.1.3.

---
 ...1-only-build-the-module-in-dkms.conf.patch |  43 +++
 srcpkgs/zfs/patches/12975.patch               | 276 ------------------
 srcpkgs/zfs/patches/dkms.patch                |  39 ---
 srcpkgs/zfs/patches/musl-seek-constants.patch |  58 ----
 srcpkgs/zfs/template                          |   6 +-
 5 files changed, 46 insertions(+), 376 deletions(-)
 create mode 100644 srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
 delete mode 100644 srcpkgs/zfs/patches/12975.patch
 delete mode 100644 srcpkgs/zfs/patches/dkms.patch
 delete mode 100644 srcpkgs/zfs/patches/musl-seek-constants.patch

diff --git a/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch b/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
new file mode 100644
index 000000000000..cd9e890ab76e
--- /dev/null
+++ b/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
@@ -0,0 +1,43 @@
+# Patch from https://aur.archlinux.org/cgit/aur.git/tree/0001-only-build-the-module-in-dkms.conf.patch?h=zfs-dkms
+# Avoids recompiling ZFS userland utilities with DKMS rebuilds
+From b4a2c0b184c9c9599421b15a430fb88deb5dbd17 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Sun, 28 Oct 2018 15:01:58 -0400
+Subject: [PATCH] only build the module in dkms.conf
+
+---
+ scripts/dkms.mkconf | 19 ++-----------------
+ 1 file changed, 2 insertions(+), 17 deletions(-)
+
+diff --git a/scripts/dkms.mkconf b/scripts/dkms.mkconf
+index 88c289383..5a859a0e0 100755
+--- a/scripts/dkms.mkconf
++++ b/scripts/dkms.mkconf
+@@ -28,14 +28,7 @@ PACKAGE_CONFIG="${pkgcfg}"
+ PRE_BUILD="configure
+   --prefix=/usr
+   --with-config=kernel
+-  --with-linux=\$(
+-    if [ -e "\${kernel_source_dir/%build/source}" ]
+-    then
+-      echo "\${kernel_source_dir/%build/source}"
+-    else
+-      echo "\${kernel_source_dir}"
+-    fi
+-  )
++  --with-linux="\${kernel_source_dir}"
+   --with-linux-obj="\${kernel_source_dir}"
+   \$(
+     [[ -n \"\${ICP_ROOT}\" ]] && \\
+@@ -69,7 +54,7 @@ POST_BUILD="scripts/dkms.postbuild
+ "
+ AUTOINSTALL="yes"
+ REMAKE_INITRD="no"
+-MAKE[0]="make"
++MAKE[0]="make -C module/"
+ STRIP[0]="\$(
+   [[ -r \${PACKAGE_CONFIG} ]] \\
+   && source \${PACKAGE_CONFIG} \\
+-- 
+2.19.1
+
diff --git a/srcpkgs/zfs/patches/12975.patch b/srcpkgs/zfs/patches/12975.patch
deleted file mode 100644
index 13d08e98d8bb..000000000000
--- a/srcpkgs/zfs/patches/12975.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-From 7b926912e9a968341c2140f7b887261fea86c706 Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Fri, 14 Jan 2022 05:09:08 -0500
-Subject: [PATCH 1/4] Linux 5.16 compat: Check slab.h for kvmalloc
-
-As it says on the tin - the folio work moved a bunch out of mm.h.
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-kmem.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/kernel-kmem.m4 b/config/kernel-kmem.m4
-index 43f9e72f88d..03c2a41fbdb 100644
---- a/config/kernel-kmem.m4
-+++ b/config/kernel-kmem.m4
-@@ -64,6 +64,7 @@ dnl #
- AC_DEFUN([ZFS_AC_KERNEL_SRC_KVMALLOC], [
- 	ZFS_LINUX_TEST_SRC([kvmalloc], [
- 		#include <linux/mm.h>
-+		#include <linux/slab.h>
- 	],[
- 		void *p __attribute__ ((unused));
- 
-
-From 1ca38ed9280ce80e7a12813b54dc5ade5e78f61b Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Fri, 14 Jan 2022 05:08:33 -0500
-Subject: [PATCH 2/4] Linux 5.16 compat: Added add_disk check for return
-
-add_disk went from void to must-check int return.
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-add-disk.m4     | 27 +++++++++++++++++++++++++++
- config/kernel.m4              |  2 ++
- module/os/linux/zfs/zvol_os.c |  4 ++++
- 3 files changed, 33 insertions(+)
- create mode 100644 config/kernel-add-disk.m4
-
-diff --git a/config/kernel-add-disk.m4 b/config/kernel-add-disk.m4
-new file mode 100644
-index 00000000000..3bc40f1e7d2
---- /dev/null
-+++ b/config/kernel-add-disk.m4
-@@ -0,0 +1,27 @@
-+dnl #
-+dnl # 5.16 API change
-+dnl # add_disk grew a must-check return code
-+dnl #
-+AC_DEFUN([ZFS_AC_KERNEL_SRC_ADD_DISK], [
-+
-+	ZFS_LINUX_TEST_SRC([add_disk_ret], [
-+		#include <linux/genhd.h>
-+	], [
-+		struct gendisk *disk = NULL;
-+		int err = add_disk(disk);
-+		err = err;
-+	])
-+
-+])
-+
-+AC_DEFUN([ZFS_AC_KERNEL_ADD_DISK], [
-+	AC_MSG_CHECKING([whether add_disk() returns int])
-+	ZFS_LINUX_TEST_RESULT([add_disk_ret],
-+	[
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_ADD_DISK_RET, 1,
-+		    [add_disk() returns int])
-+	], [
-+		AC_MSG_RESULT(no)
-+	])
-+])
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index bdd3caed2b3..b3ed966b726 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -135,6 +135,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
- 	ZFS_AC_KERNEL_SRC_VFS_SET_PAGE_DIRTY_NOBUFFERS
- 	ZFS_AC_KERNEL_SRC_STANDALONE_LINUX_STDARG
- 	ZFS_AC_KERNEL_SRC_PAGEMAP_FOLIO_WAIT_BIT
-+	ZFS_AC_KERNEL_SRC_ADD_DISK
- 
- 	AC_MSG_CHECKING([for available kernel interfaces])
- 	ZFS_LINUX_TEST_COMPILE_ALL([kabi])
-@@ -243,6 +244,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
- 	ZFS_AC_KERNEL_VFS_SET_PAGE_DIRTY_NOBUFFERS
- 	ZFS_AC_KERNEL_STANDALONE_LINUX_STDARG
- 	ZFS_AC_KERNEL_PAGEMAP_FOLIO_WAIT_BIT
-+	ZFS_AC_KERNEL_ADD_DISK
- ])
- 
- dnl #
-diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c
-index cef52e22483..e26d4db4977 100644
---- a/module/os/linux/zfs/zvol_os.c
-+++ b/module/os/linux/zfs/zvol_os.c
-@@ -1110,7 +1110,11 @@ zvol_os_create_minor(const char *name)
- 		rw_enter(&zvol_state_lock, RW_WRITER);
- 		zvol_insert(zv);
- 		rw_exit(&zvol_state_lock);
-+#ifdef HAVE_ADD_DISK_RET
-+		error = add_disk(zv->zv_zso->zvo_disk);
-+#else
- 		add_disk(zv->zv_zso->zvo_disk);
-+#endif
- 	} else {
- 		ida_simple_remove(&zvol_ida, idx);
- 	}
-
-From a0b11a8996b55a0bb3c1c100fa6f392ca90d74b0 Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Fri, 14 Jan 2022 05:07:33 -0500
-Subject: [PATCH 3/4] Linux 5.16 compat: Added mapping for
- iov_iter_fault_in_readable
-
-Linux decided to rename this for some reason. At some point, we
-should probably invert this mapping, but for now...
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-add-disk.m4      |  1 -
- config/kernel-vfs-iov_iter.m4  | 22 ++++++++++++++++++++--
- include/os/linux/spl/sys/uio.h |  4 ++++
- 3 files changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/config/kernel-add-disk.m4 b/config/kernel-add-disk.m4
-index 3bc40f1e7d2..5d1779eb432 100644
---- a/config/kernel-add-disk.m4
-+++ b/config/kernel-add-disk.m4
-@@ -13,7 +13,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_ADD_DISK], [
- 	])
- 
- ])
--
- AC_DEFUN([ZFS_AC_KERNEL_ADD_DISK], [
- 	AC_MSG_CHECKING([whether add_disk() returns int])
- 	ZFS_LINUX_TEST_RESULT([add_disk_ret],
-diff --git a/config/kernel-vfs-iov_iter.m4 b/config/kernel-vfs-iov_iter.m4
-index ecdda939f1c..57f78745a24 100644
---- a/config/kernel-vfs-iov_iter.m4
-+++ b/config/kernel-vfs-iov_iter.m4
-@@ -41,6 +41,17 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_IOV_ITER], [
- 		error = iov_iter_fault_in_readable(&iter, size);
- 	])
- 
-+	ZFS_LINUX_TEST_SRC([fault_in_iov_iter_readable], [
-+		#include <linux/fs.h>
-+		#include <linux/uio.h>
-+	],[
-+		struct iov_iter iter = { 0 };
-+		size_t size = 512;
-+		int error __attribute__ ((unused));
-+
-+		error = fault_in_iov_iter_readable(&iter, size);
-+	])
-+
- 	ZFS_LINUX_TEST_SRC([iov_iter_count], [
- 		#include <linux/fs.h>
- 		#include <linux/uio.h>
-@@ -123,8 +134,15 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_IOV_ITER], [
- 		AC_DEFINE(HAVE_IOV_ITER_FAULT_IN_READABLE, 1,
- 		    [iov_iter_fault_in_readable() is available])
- 	],[
--		AC_MSG_RESULT(no)
--		enable_vfs_iov_iter="no"
-+		AC_MSG_CHECKING([whether fault_in_iov_iter_readable() is available])
-+		ZFS_LINUX_TEST_RESULT([fault_in_iov_iter_readable], [
-+			AC_MSG_RESULT(yes)
-+			AC_DEFINE(HAVE_FAULT_IN_IOV_ITER_READABLE, 1,
-+			    [fault_in_iov_iter_readable() is available])
-+		],[
-+			AC_MSG_RESULT(no)
-+			enable_vfs_iov_iter="no"
-+		])
- 	])
- 
- 	AC_MSG_CHECKING([whether iov_iter_count() is available])
-diff --git a/include/os/linux/spl/sys/uio.h b/include/os/linux/spl/sys/uio.h
-index 66af2b0b534..439eec98623 100644
---- a/include/os/linux/spl/sys/uio.h
-+++ b/include/os/linux/spl/sys/uio.h
-@@ -34,6 +34,10 @@
- #include <asm/uaccess.h>
- #include <sys/types.h>
- 
-+#if defined(HAVE_VFS_IOV_ITER) && defined(HAVE_FAULT_IN_IOV_ITER_READABLE)
-+#define	iov_iter_fault_in_readable(a, b)	fault_in_iov_iter_readable(a, b)
-+#endif
-+
- typedef struct iovec iovec_t;
- 
- typedef enum zfs_uio_rw {
-
-From 700bb88b595d0e73ad3c19767cec68cb8081be2d Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Wed, 19 Jan 2022 00:12:15 -0500
-Subject: [PATCH 4/4] Add support for FALLOC_FL_ZERO_RANGE
-
-For us, I think it's always just FALLOC_FL_PUNCH_HOLE with a fake
-mustache on.
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-fallocate.m4     | 17 +++++++++++++++++
- module/os/linux/zfs/zpl_file.c |  9 +++++++--
- 2 files changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/config/kernel-fallocate.m4 b/config/kernel-fallocate.m4
-index 7a8550f7e76..815602d3e2c 100644
---- a/config/kernel-fallocate.m4
-+++ b/config/kernel-fallocate.m4
-@@ -3,6 +3,10 @@ dnl # Linux 2.6.38 - 3.x API
- dnl # The fallocate callback was moved from the inode_operations
- dnl # structure to the file_operations structure.
- dnl #
-+dnl #
-+dnl # Linux 3.15+
-+dnl # fallocate learned a new flag, FALLOC_FL_ZERO_RANGE
-+dnl #
- AC_DEFUN([ZFS_AC_KERNEL_SRC_FALLOCATE], [
- 	ZFS_LINUX_TEST_SRC([file_fallocate], [
- 		#include <linux/fs.h>
-@@ -15,12 +19,25 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FALLOCATE], [
- 			.fallocate = test_fallocate,
- 		};
- 	], [])
-+	ZFS_LINUX_TEST_SRC([falloc_fl_zero_range], [
-+		#include <linux/falloc.h>
-+	],[
-+		int flags __attribute__ ((unused));
-+		flags = FALLOC_FL_ZERO_RANGE;
-+	])
- ])
- 
- AC_DEFUN([ZFS_AC_KERNEL_FALLOCATE], [
- 	AC_MSG_CHECKING([whether fops->fallocate() exists])
- 	ZFS_LINUX_TEST_RESULT([file_fallocate], [
- 		AC_MSG_RESULT(yes)
-+		AC_MSG_CHECKING([whether FALLOC_FL_ZERO_RANGE exists])
-+		ZFS_LINUX_TEST_RESULT([falloc_fl_zero_range], [
-+			AC_MSG_RESULT(yes)
-+			AC_DEFINE(HAVE_FALLOC_FL_ZERO_RANGE, 1, [FALLOC_FL_ZERO_RANGE is defined])
-+		],[
-+			AC_MSG_RESULT(no)
-+		])
- 	],[
- 		ZFS_LINUX_TEST_ERROR([file_fallocate])
- 	])
-diff --git a/module/os/linux/zfs/zpl_file.c b/module/os/linux/zfs/zpl_file.c
-index 21926f170c5..a3af1804f6a 100644
---- a/module/os/linux/zfs/zpl_file.c
-+++ b/module/os/linux/zfs/zpl_file.c
-@@ -745,7 +745,12 @@ zpl_fallocate_common(struct inode *ip, int mode, loff_t offset, loff_t len)
- 	fstrans_cookie_t cookie;
- 	int error = 0;
- 
--	if ((mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) != 0)
-+	int test_mode = FALLOC_FL_PUNCH_HOLE;
-+#ifdef HAVE_FALLOC_FL_ZERO_RANGE
-+	test_mode |= FALLOC_FL_ZERO_RANGE;
-+#endif
-+
-+	if ((mode & ~(FALLOC_FL_KEEP_SIZE | test_mode)) != 0)
- 		return (-EOPNOTSUPP);
- 
- 	if (offset < 0 || len <= 0)
-@@ -756,7 +761,7 @@ zpl_fallocate_common(struct inode *ip, int mode, loff_t offset, loff_t len)
- 
- 	crhold(cr);
- 	cookie = spl_fstrans_mark();
--	if (mode & FALLOC_FL_PUNCH_HOLE) {
-+	if (mode & (test_mode)) {
- 		flock64_t bf;
- 
- 		if (offset > olen)
diff --git a/srcpkgs/zfs/patches/dkms.patch b/srcpkgs/zfs/patches/dkms.patch
deleted file mode 100644
index 850a976534d4..000000000000
--- a/srcpkgs/zfs/patches/dkms.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-# Patch from https://aur.archlinux.org/packages/zfs-dkms/
-# Avoids recompiling ZFS userland utilities with DKMS rebuilds
-# Also short-circuits a useless test for Debian in the DKMS source
-
---- a/scripts/dkms.mkconf	2021-01-19 19:19:08.000000000 -0500
-+++ b/scripts/dkms.mkconf	2021-02-02 19:03:02.045984881 -0500
-@@ -26,22 +26,7 @@
- PRE_BUILD="configure
-   --prefix=/usr
-   --with-config=kernel
--  --with-linux=\$(
--    case \`lsb_release -is\` in
--      (Debian|Devuan)
--        if [[ -e \${kernel_source_dir/%build/source} ]]
--        then
--          echo \${kernel_source_dir/%build/source}
--        else
--          # A kpkg exception for Proxmox 2.0
--          echo \${kernel_source_dir}
--        fi
--      ;;
--      (*)
--        echo \${kernel_source_dir}
--      ;;
--    esac
--  )
-+  --with-linux=\${kernel_source_dir}
-   --with-linux-obj=\${kernel_source_dir}
-   \$(
-     [[ -n \"\${ICP_ROOT}\" ]] && \\
-@@ -75,7 +60,7 @@
- "
- AUTOINSTALL="yes"
- REMAKE_INITRD="no"
--MAKE[0]="make"
-+MAKE[0]="make -C module/"
- STRIP[0]="\$(
-   [[ -r \${PACKAGE_CONFIG} ]] \\
-   && source \${PACKAGE_CONFIG} \\
diff --git a/srcpkgs/zfs/patches/musl-seek-constants.patch b/srcpkgs/zfs/patches/musl-seek-constants.patch
deleted file mode 100644
index 3d2c563f8c51..000000000000
--- a/srcpkgs/zfs/patches/musl-seek-constants.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 123c87b3c2d75636da79f57a4b0ed60d2a3133a8 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Mon, 20 Dec 2021 12:25:11 -0800
-Subject: [PATCH] zfs-test/mmap_seek: fix build on musl
-
-it needs linux/fs.h for SEEK_DATA and friends
-
-without linux/fs.h:
-
-```
-mmap_seek.c
-mmap_seek.c: In function 'seek_data':
-mmap_seek.c:37:40: error: 'SEEK_DATA' undeclared (first use in this function);
-did you mean 'SEEK_SET'?
-   37 |  off_t data_offset = lseek(fd, offset, SEEK_DATA);
-```
-
-also it needs sys/sysmacros.h for P2ROUNDUP
-without it:
-
-```
-mmap_seek.c: In function 'main':
-mmap_seek.c:122:19: warning:
-implicit declaration of function 'P2ROUNDUP' [-Wimplicit-function-declaration]
-  122 |  seek_hole(fd, 0, P2ROUNDUP(file_size / 2, block_size));
-      |                   ^~~~~~~~~
-powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.o: in function `main':
-mmap_seek.c:(.text.startup+0x1b8): undefined reference to `P2ROUNDUP'
-powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.c:(.text.startup+0x1d8):
-	undefined reference to `P2ROUNDUP'
-powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.c:(.text.startup+0x21c):
-	undefined reference to `P2ROUNDUP'
-collect2: error: ld returned 1 exit status
-make[5]: *** [Makefile:754: mmap_seek] Error 1
-```
-
-Closes: https://github.com/openzfs/zfs/pull/12891
-Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
----
- tests/zfs-tests/cmd/mmap_seek/mmap_seek.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
-index f476e1dba9a..bb36527aafe 100644
---- a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
-+++ b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
-@@ -29,7 +29,11 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/mman.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
-+#ifdef __linux__
-+#include <linux/fs.h>
-+#endif
- 
- static void
- seek_data(int fd, off_t offset, off_t expected)
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 0b0c490a5843..477c39614cd0 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.1.2
-revision=2
+version=2.1.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=258cf1d17a1f668a3b99b61eaf14be06c614df42503db0319bef1b9fc4c8b9e7
+checksum=b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

From 62c022ad7a1e55d20a48245716a739892089eefb Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 11 Mar 2022 23:17:55 +0200
Subject: [PATCH 0161/2561] R: update to 4.1.3.

---
 srcpkgs/R/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 8190ac146535..d506d02764b0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
-version=4.1.2
-revision=2
+version=4.1.3
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
@@ -22,7 +22,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
 distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
-checksum=2036225e9f7207d4ce097e54972aecdaa8b40d7d9911cd26491fac5a0fab38af
+checksum=15ff5b333c61094060b2a52e9c1d8ec55cc42dd029e39ca22abdaa909526fed6
 nocross=yes
 shlib_provides="libR.so"
 make_check=extended

From c85522fc4eed021296a4fa23291db1e4760dc7ee Mon Sep 17 00:00:00 2001
From: TROUVERIE Joachim <jtrouverie@joakode.fr>
Date: Fri, 4 Mar 2022 17:59:30 +0100
Subject: [PATCH 0162/2561] notmuch: update to 0.35.

---
 ...mime-session-key-extraction-support-.patch | 43 +++++++-------
 ...mime-x509-certificate-validity-check.patch | 56 +++++++++----------
 ...-gmime-verify-with-session-key-check.patch | 39 +++++++------
 srcpkgs/notmuch/template                      | 10 ++--
 4 files changed, 72 insertions(+), 76 deletions(-)

diff --git a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
index 581c6be15590..b6445729af6f 100644
--- a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
+++ b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
@@ -17,13 +17,13 @@ Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
  1 file changed, 58 deletions(-)
 
 diff --git a/configure b/configure
-index 7dae745c..99b0c328 100755
+index 36f3f606..1bf2097d 100755
 --- a/configure
 +++ b/configure
-@@ -467,65 +467,7 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
- 
+@@ -492,65 +492,7 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+
      printf "Checking for GMime session key extraction support... "
- 
+
 -    cat > _check_session_keys.c <<EOF
 -#include <gmime/gmime.h>
 -#include <stdio.h>
@@ -54,16 +54,16 @@ index 7dae745c..99b0c328 100755
 -}
 -EOF
 -    if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
--        printf 'No.\nCould not make tempdir for testing session-key support.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nCould not make tempdir for testing session-key support.\n'
+-	errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
--           && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
--           && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
--           && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+-	   && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+-	   && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+-	   && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
 -    then
-         printf "OK.\n"
+ 	printf "OK.\n"
 -    else
--        cat <<EOF
+-	cat <<EOF
 -No.
 -*** Error: Could not extract session keys from encrypted message.
 -
@@ -73,19 +73,18 @@ index 7dae745c..99b0c328 100755
 -Please try to rebuild your version of GMime against a more recent
 -version of GPGME (at least GPGME 1.8.0).
 -EOF
--        if command -v gpgme-config >/dev/null; then
--            printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
--        else
--            printf 'You do not have the GPGME development libraries installed.\n'
--        fi
--        errors=$((errors + 1))
+-	if command -v gpgme-config >/dev/null; then
+-	    printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+-	else
+-	    printf 'You do not have the GPGME development libraries installed.\n'
+-	fi
+-	errors=$((errors + 1))
 -    fi
 -    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
--        rm -rf "$TEMP_GPG"
+-	rm -rf "$TEMP_GPG"
 -    fi
- 
+
      # see https://github.com/jstedfast/gmime/pull/90
      # should be fixed in GMime in 3.2.7, but some distros might patch
--- 
-2.28.0.rc2.21.g5c06d60fc5
-
+--
+2.35.1
diff --git a/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
index 49b5b3a0795d..c7e5addc0784 100644
--- a/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
+++ b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
@@ -11,18 +11,17 @@ The problem has been fixed with gmime 3.2.7 already.
 
 Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
 ---
- configure | 70 -------------------------------------------------------
- 1 file changed, 70 deletions(-)
+ configure | 69 -------------------------------------------------------
+ 1 file changed, 69 deletions(-)
 
 diff --git a/configure b/configure
-index 99b0c328..ef602d10 100755
+index 36f3f606..fd23aa67 100755
 --- a/configure
 +++ b/configure
-@@ -472,78 +472,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
-     # see https://github.com/jstedfast/gmime/pull/90
+@@ -556,77 +556,8 @@ EOF
      # should be fixed in GMime in 3.2.7, but some distros might patch
      printf "Checking for GMime X.509 certificate validity... "
--
+
 -    cat > _check_x509_validity.c <<EOF
 -#include <stdio.h>
 -#include <gmime/gmime.h>
@@ -63,40 +62,39 @@ index 99b0c328..ef602d10 100755
 -}
 -EOF
 -    if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
--        printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n'
+-	errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \
--            && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \
--            && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \
--            && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt
+-	    && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \
+-	    && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \
+-	    && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt
 -    then
--        if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then
-             gmime_x509_cert_validity=1
-             printf "Yes.\n"
--        else
--            gmime_x509_cert_validity=0
--            printf "No.\n"
--            if pkg-config --exists "gmime-3.0 >= 3.2.7"; then
--                cat <<EOF
+-	if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then
+ 	    gmime_x509_cert_validity=1
+ 	    printf "Yes.\n"
+-	else
+-	    gmime_x509_cert_validity=0
+-	    printf "No.\n"
+-	    if pkg-config --exists "gmime-3.0 >= 3.2.7"; then
+-		cat <<EOF
 -*** Error: GMime fails to calculate X.509 certificate validity, and
 -is later than 3.2.7, which should have fixed this issue.
 -
 -Please follow up on https://github.com/jstedfast/gmime/pull/90 with
 -more details.
 -EOF
--                errors=$((errors + 1))
--            fi
--        fi
+-		errors=$((errors + 1))
+-	    fi
+-	fi
 -    else
--        printf 'No.\nFailed to set up gpgsm for testing X.509 certificate validity support.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nFailed to set up gpgsm for testing X.509 certificate validity support.\n'
+-	errors=$((errors + 1))
 -    fi
 -    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
--        rm -rf "$TEMP_GPG"
+-	rm -rf "$TEMP_GPG"
 -    fi
- 
+
      # see https://dev.gnupg.org/T3464
      # there are problems verifying signatures when decrypting with session keys with GPGME 1.13.0 and 1.13.1
--- 
-2.28.0.rc2.21.g5c06d60fc5
-
+--
+2.35.1
diff --git a/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch b/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch
index 5de4f6ff5ce4..5ca5b506eaca 100644
--- a/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch
+++ b/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch
@@ -18,10 +18,10 @@ Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
  1 file changed, 66 deletions(-)
 
 diff --git a/configure b/configure
-index ef602d10..204d46d9 100755
+index 36f3f606..cd99bf4a 100755
 --- a/configure
 +++ b/configure
-@@ -478,74 +478,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+@@ -631,74 +631,8 @@ EOF
      # see https://dev.gnupg.org/T3464
      # there are problems verifying signatures when decrypting with session keys with GPGME 1.13.0 and 1.13.1
      printf "Checking signature verification when decrypting using session keys... "
@@ -67,35 +67,34 @@ index ef602d10..204d46d9 100755
 -}
 -EOF
 -    if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
--        printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
+-	errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \
--            && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
--            && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
+-	    && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+-	    && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
 -    then
--        if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
-             gmime_verify_with_session_key=1
-             printf "Yes.\n"
--        else
--            gmime_verify_with_session_key=0
--            printf "No.\n"
--            cat <<EOF
+-	if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
+ 	    gmime_verify_with_session_key=1
+ 	    printf "Yes.\n"
+-	else
+-	    gmime_verify_with_session_key=0
+-	    printf "No.\n"
+-	    cat <<EOF
 -*** Error: GMime fails to verify signatures when decrypting with a session key.
 -
 -This is most likely due to a buggy version of GPGME, which should be fixed in 1.13.2 or later.
 -See https://dev.gnupg.org/T3464 for more details.
 -EOF
--        fi
+-	fi
 -    else
--        printf 'No.\nFailed to set up gpg for testing signature verification while decrypting with a session key.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nFailed to set up gpg for testing signature verification while decrypting with a session key.\n'
+-	errors=$((errors + 1))
 -    fi
 -    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
--        rm -rf "$TEMP_GPG"
+-	rm -rf "$TEMP_GPG"
 -    fi
  else
      have_gmime=0
      printf "No.\n"
--- 
-2.28.0.rc2.21.g5c06d60fc5
-
+--
+2.35.1
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 841645d19fe9..b33a09fbddcf 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,7 +1,7 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.32.2
-revision=4
+version=0.35
+revision=1
 build_style=configure
 configure_args="--prefix=/usr
  --emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -14,12 +14,12 @@ depends="gmime3>=3.2.7"
 checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core
  openssl"
 short_desc="Thread-based email index, search, and tagging"
-maintainer="Jan S. <jan.schreib@gmail.com>"
+maintainer="Joachim T. <jtrouverie@joakode.fr>"
 license="GPL-3.0-or-later"
 homepage="https://notmuchmail.org"
 distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
  https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7
+checksum="a831c414c4f20a6cae3a580793c855102d3295080f000eb3832b77226a40ac39
  4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
 skip_extraction="database-v1.tar.xz"
 replaces="notmuch-emacs>=0"
@@ -56,7 +56,7 @@ do_check() {
 	# we don't ship python-cffi
 	NOTMUCH_SKIP_TESTS+=" libconfig python-cffi"
 	if [ $(id -u) = 0 ]; then
-		NOTMUCH_SKIP_TESTS+=" new.36 tagging.25"
+		NOTMUCH_SKIP_TESTS+=" new.36 new.39 tagging.25"
 	fi
 	export NOTMUCH_SKIP_TESTS
 	make test

From 28d7a5bfdf3e3dda4c56bfacbad5d11fc1ef7c75 Mon Sep 17 00:00:00 2001
From: Neel <neel@chot.ai>
Date: Sun, 19 Dec 2021 21:54:53 +0000
Subject: [PATCH 0163/2561] hstr: update to 2.5

---
 srcpkgs/hstr/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/hstr/template b/srcpkgs/hstr/template
index ee259a9eac03..3f2d95c854ec 100644
--- a/srcpkgs/hstr/template
+++ b/srcpkgs/hstr/template
@@ -1,6 +1,6 @@
 # Template file for 'hstr'
 pkgname=hstr
-version=2.3
+version=2.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
@@ -11,12 +11,9 @@ license="Apache-2.0"
 homepage="https://github.com/dvorka/hstr"
 changelog="https://raw.githubusercontent.com/dvorka/hstr/master/Changelog"
 distfiles="https://github.com/dvorka/hstr/archive/${version}.tar.gz"
-checksum=c7e7408671757b3f4be9c5a59b4e2d56e7a7b601ace2a94eb6b2b61f20ee890b
+checksum=7f5933fc07d55d09d5f7f9a6fbfdfc556d8a7d8575c3890ac1e672adabd2bec4
 
 pre_configure() {
-	vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h
-	vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr_curses.h
-	aclocal
-	automake --force-missing --add-missing
-	autoconf
+	vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h src/include/hstr_curses.h
+	autoreconf -fi
 }

From c70838be96f64a070d3df572d3cb6b9421f1947f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sat, 12 Mar 2022 16:15:07 +0200
Subject: [PATCH 0164/2561] dbus-glib: update to 0.112.

Additionally fix xlint and tests.
---
 srcpkgs/dbus-glib/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dbus-glib/template b/srcpkgs/dbus-glib/template
index ee905b75bfe6..3da4c3010605 100644
--- a/srcpkgs/dbus-glib/template
+++ b/srcpkgs/dbus-glib/template
@@ -1,18 +1,19 @@
 # Template file for 'dbus-glib'
 pkgname=dbus-glib
-version=0.110
+version=0.112
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-bash-completion"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel dbus-devel"
 depends="dbus"
+checkdepends="dbus glib-devel"
 short_desc="GLib bindings for D-Bus"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.freedesktop.org/wiki/Software/DBusBindings"
 distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
-checksum=7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825
+checksum=7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-dbus-binding-tool=dbus-binding-tool"

From 1df2896a5c15877cfc7363b95c1e5b8f95868754 Mon Sep 17 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, 13 Mar 2022 19:11:18 +0700
Subject: [PATCH 0165/2561] mutt: no needs libidn2-devel in hostmakedepends

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 42039d5d78f4..7ae82f76bd8c 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -8,7 +8,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --sysconfdir=/etc/$pkgname
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
-hostmakedepends="libidn2-devel perl pkg-config"
+hostmakedepends="perl pkg-config"
 makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"

From f7b58f45fdcb14d8532e45c7ed52c9ae3d85e4fd Mon Sep 17 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, 13 Mar 2022 19:14:36 +0700
Subject: [PATCH 0166/2561] fcitx5: update to 5.0.15.

---
 srcpkgs/fcitx5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template
index 3f55cd914dc9..ffc3011295f8 100644
--- a/srcpkgs/fcitx5/template
+++ b/srcpkgs/fcitx5/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5'
 pkgname=fcitx5
-version=5.0.14
+version=5.0.15
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,7 @@ 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="d30658323f6620c43e306af233980b2dbd765ee2240ac7db865c00052d1c313b
+checksum="343df0f278dc6db4afebc778664ee477d9bd6c011c8446e5aa89c20bb1786e41
  c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
 skip_extraction=en_dict-${_en_dict_ver}.tar.gz
 lib32disabled=yes

From cf8d12b30198d8da817954b4351f768907b2d05a Mon Sep 17 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, 13 Mar 2022 19:14:41 +0700
Subject: [PATCH 0167/2561] fcitx5-anthy: update to 5.0.10.

---
 srcpkgs/fcitx5-anthy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template
index 3077b0796431..f2003e8be2c6 100644
--- a/srcpkgs/fcitx5-anthy/template
+++ b/srcpkgs/fcitx5-anthy/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-anthy'
 pkgname=fcitx5-anthy
-version=5.0.9
+version=5.0.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ 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=73f96564d003ecc4160ceb311b2416547dcdf1a7cb6996d7d00cc01dae834a44
+checksum=1dab20b65c65059f707d64cbf1cd0f98a88016161240ad514b811a161bfed7fd
 
 fcitx5-anthy-icons_package() {
 	short_desc+=" - icons"

From 59fadfba8c4782affefc9e17c0533a077a684df1 Mon Sep 17 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, 13 Mar 2022 19:14:44 +0700
Subject: [PATCH 0168/2561] fcitx5-chewing: update to 5.0.10.

---
 srcpkgs/fcitx5-chewing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template
index 5bdde29ffaa0..ab4df7c374dd 100644
--- a/srcpkgs/fcitx5-chewing/template
+++ b/srcpkgs/fcitx5-chewing/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-chewing'
 pkgname=fcitx5-chewing
-version=5.0.8
+version=5.0.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext doxygen extra-cmake-modules"
@@ -10,7 +10,7 @@ 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=993acad34d3490c1903827e6ee6de4b946419b14c970e7b02154eaba28971eba
+checksum=70843186dfa571eef674dde049abf2cbf16fbc9434dfb3060986bcc92cc4dadd
 lib32disabled=yes
 
 fcitx5-chewing-icons_package() {

From f0e4da152e6c2d6136c1443efeaa0bdd5bd9459b Mon Sep 17 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, 13 Mar 2022 19:14:51 +0700
Subject: [PATCH 0169/2561] fcitx5-chinese-addons: update to 5.0.12.

---
 srcpkgs/fcitx5-chinese-addons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index 97e8ef4c575e..519e91a0dd44 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-chinese-addons'
 pkgname=fcitx5-chinese-addons
-version=5.0.11
+version=5.0.12
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
@@ -17,7 +17,7 @@ _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="1fdc6749e5b3e6bfd5b30921008fd037cbf2f0e10e66904b79ba02fce8f71b0a
+checksum="f872c755290ca8610ebfd22e1492bde065028c6e75b59555b4a82b0377b79005
  42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
  8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248"
 skip_extraction="

From 81f4aebdfb3cbb4d842b0577c6db168333c4a07e Mon Sep 17 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, 13 Mar 2022 19:14:55 +0700
Subject: [PATCH 0170/2561] fcitx5-configtool: update to 5.0.12.

---
 srcpkgs/fcitx5-configtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
index f4c554c85e48..136a79694953 100644
--- a/srcpkgs/fcitx5-configtool/template
+++ b/srcpkgs/fcitx5-configtool/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-configtool'
 pkgname=fcitx5-configtool
-version=5.0.11
+version=5.0.12
 revision=1
 build_style=cmake
 hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
@@ -17,7 +17,7 @@ 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=bf005d01220343d24c488f6559675da694ec64354592451c7c38ce959dce8803
+checksum=293da52dbac987a3c4880433a4a93bf8b3b45e2ac3d77cb025f76dc859302a1b
 lib32disabled=yes
 
 post_install() {

From 862c38ba3064b78adc79921f60df5d99489ed7b8 Mon Sep 17 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, 13 Mar 2022 19:15:00 +0700
Subject: [PATCH 0171/2561] fcitx5-gtk: update to 5.0.13.

---
 srcpkgs/fcitx5-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
index 430209846b81..c6d4efe52f10 100644
--- a/srcpkgs/fcitx5-gtk/template
+++ b/srcpkgs/fcitx5-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-gtk'
 pkgname=fcitx5-gtk
-version=5.0.12
+version=5.0.13
 revision=1
 build_style=cmake
 build_helper=gir
@@ -14,7 +14,7 @@ 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=5a2ca9629695fe7500e0574b6f942a0a93d386cb6a12734f506a521537d6d11d
+checksum=a38053806b23c097e8fca5a6c405326c14e5e0bc26595d144553006ed90c32d4
 lib32disabled=yes
 
 build_options="gir"

From 116f7124c13b544748bda6bed11feaf49cad2720 Mon Sep 17 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, 13 Mar 2022 19:15:04 +0700
Subject: [PATCH 0172/2561] fcitx5-hangul: update to 5.0.8.

---
 srcpkgs/fcitx5-hangul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template
index d51f9b3a99d5..2e6dc2e0b4e8 100644
--- a/srcpkgs/fcitx5-hangul/template
+++ b/srcpkgs/fcitx5-hangul/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-hangul'
 pkgname=fcitx5-hangul
-version=5.0.7
+version=5.0.8
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ 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=281f44c9d024b6a9984aad0f51a3840fc3873d7e3a629aeed77025f00b08bb27
+checksum=a784d80761b16269ebe6e780aac23fb1bfb6c06e9aa03bcca442bc3a62ec6220
 lib32disabled=yes
 
 fcitx5-hangul-icons_package() {

From 282fc89943050fd86273995d9230d67ddee8cd38 Mon Sep 17 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, 13 Mar 2022 19:15:08 +0700
Subject: [PATCH 0173/2561] fcitx5-qt: update to 5.0.11.

---
 srcpkgs/fcitx5-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template
index d72af31d0adf..d36f9369b1cf 100644
--- a/srcpkgs/fcitx5-qt/template
+++ b/srcpkgs/fcitx5-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-qt'
 pkgname=fcitx5-qt
-version=5.0.10
+version=5.0.11
 revision=1
 build_style=cmake
 configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DENABLE_QT6=ON
@@ -14,7 +14,7 @@ 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=29daa4454825e316aa89b6c2610078e4cc9924e288ccd45b38e47db9df721f85
+checksum=7196798d4c6f9305c028dab30a31eb64566b9b47b1cb916518d33f3a0f053d62
 lib32disabled=yes
 
 if [ "$XBPS_TARGET_NOATOMIC8" ]; then

From eeea3a6edcc6e6087110af3949fbdefa3eb343b4 Mon Sep 17 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, 13 Mar 2022 19:15:12 +0700
Subject: [PATCH 0174/2561] fcitx5-rime: update to 5.0.12.

---
 srcpkgs/fcitx5-rime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
index a557cec20a0f..d76a1b3f01a3 100644
--- a/srcpkgs/fcitx5-rime/template
+++ b/srcpkgs/fcitx5-rime/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-rime'
 pkgname=fcitx5-rime
-version=5.0.11
+version=5.0.12
 revision=1
 build_style=cmake
 configure_args="-DRIME_DATA_DIR=/usr/share/rime-data"
@@ -13,7 +13,7 @@ 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=f00fd7d53bf22d7f14c66946dbd84f70d22334ad72198e2213e8f13447168cb4
+checksum=8b7e4945fc43c2815af2e2229ce71e19959ce24cdeffe92b42ae18522410eb12
 lib32disabled=yes
 
 fcitx5-rime-icons_package() {

From dc3a10a15ade7f3954a46f2402ba741fe3668715 Mon Sep 17 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, 13 Mar 2022 19:15:18 +0700
Subject: [PATCH 0175/2561] fcitx5-table-extra: update to 5.0.9.

---
 srcpkgs/fcitx5-table-extra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template
index 8d2545d40a5e..0cd1610e4ad9 100644
--- a/srcpkgs/fcitx5-table-extra/template
+++ b/srcpkgs/fcitx5-table-extra/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-table-extra'
 pkgname=fcitx5-table-extra
-version=5.0.8
+version=5.0.9
 revision=1
 build_style=cmake
 hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ 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=9ca4ab67b65efdd1b4462f20982f54c644ae822746e5c8cb02216686024c28aa
+checksum=cf791178f5871f58bf008042359ffd55e8cf11fbc4c74e77e33debe7f3ddbce4

From e1f2be35ad8777a27652f6143082c41d64fc0dd6 Mon Sep 17 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, 13 Mar 2022 19:15:22 +0700
Subject: [PATCH 0176/2561] fcitx5-lua: update to 5.0.7.

---
 srcpkgs/fcitx5-lua/template | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template
index 1952c78ae475..1c1ab31f1683 100644
--- a/srcpkgs/fcitx5-lua/template
+++ b/srcpkgs/fcitx5-lua/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-lua'
 pkgname=fcitx5-lua
-version=5.0.6
+version=5.0.7
 revision=1
 build_style=cmake
 configure_args="-DUSE_DLOPEN=No"
@@ -14,16 +14,9 @@ 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=bd55815df13cfee8b0ac90dab1dec0aca6b1b3943f80543b04a0cf2e8f03c8a9
+checksum=bff8e5143912b212726b2bab8cf62bbd11ca4f3837b65cb8ce94a7c56fc15f2d
 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"

From bfbe1ce608250d674225367b284dae2d1725387b Mon Sep 17 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, 13 Mar 2022 19:15:26 +0700
Subject: [PATCH 0177/2561] fcitx5-table-other: update to 5.0.8.

---
 srcpkgs/fcitx5-table-other/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-table-other/template b/srcpkgs/fcitx5-table-other/template
index 00ebafb93cdb..febce6577128 100644
--- a/srcpkgs/fcitx5-table-other/template
+++ b/srcpkgs/fcitx5-table-other/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-table-other'
 pkgname=fcitx5-table-other
-version=5.0.7
+version=5.0.8
 revision=1
 build_style=cmake
 hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ 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=7df2445a93f2117f315a0b26d738876d205ae83d2b3e8a898ac64c3860abac70
+checksum=f741f42c72d415dccab3d1e699fa582046e4f8a64bd8d21ce6da4dc557594fac

From 3c204e9b993e65becd2a76882f2f417607460e36 Mon Sep 17 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, 13 Mar 2022 19:15:30 +0700
Subject: [PATCH 0178/2561] fcitx5-unikey: update to 5.0.9.

---
 srcpkgs/fcitx5-unikey/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-unikey/template b/srcpkgs/fcitx5-unikey/template
index 81c35b310d5b..f054cb3b5360 100644
--- a/srcpkgs/fcitx5-unikey/template
+++ b/srcpkgs/fcitx5-unikey/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-unikey'
 pkgname=fcitx5-unikey
-version=5.0.8
+version=5.0.9
 revision=1
 build_style=cmake
 #configure_args=""
@@ -16,7 +16,7 @@ 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-unikey/fcitx5-unikey-${version}.tar.xz"
-checksum=7505d9f937512272baf348ba38c72bef7f27fd2df9ae5dbc99cf738c5fcef8d0
+checksum=a72d59e21ddde6ccfa5f66accd9d763ded7c8210dbb19a99435aa35b4ac7d5ed
 conflicts="fcitx-unikey>=0"
 
 fcitx5-unikey-macro-editor_package() {

From 0916f5eacf85261d23e70949ea49713763a2536b Mon Sep 17 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, 13 Mar 2022 20:09:35 +0700
Subject: [PATCH 0179/2561] libchewing: cross-compiling

---
 srcpkgs/libchewing-data                       |  1 -
 .../libchewing/patches/cross-compile.patch    | 23 +++++++++++++++++++
 srcpkgs/libchewing/template                   | 13 +++--------
 3 files changed, 26 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/libchewing-data
 create mode 100644 srcpkgs/libchewing/patches/cross-compile.patch

diff --git a/srcpkgs/libchewing-data b/srcpkgs/libchewing-data
deleted file mode 120000
index 5ea20a615bbb..000000000000
--- a/srcpkgs/libchewing-data
+++ /dev/null
@@ -1 +0,0 @@
-libchewing
\ No newline at end of file
diff --git a/srcpkgs/libchewing/patches/cross-compile.patch b/srcpkgs/libchewing/patches/cross-compile.patch
new file mode 100644
index 000000000000..d127a83589f7
--- /dev/null
+++ b/srcpkgs/libchewing/patches/cross-compile.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07112b0..597a764 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -229,15 +229,16 @@ set_target_properties(${ALL_TOOLS} PROPERTIES
+ )
+ 
+ # tools command
++file(MAKE_DIRECTORY ${DATA_BIN_DIR})
+ add_custom_command(
+     OUTPUT
+         ${ALL_DATA}
+-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DATA_BIN_DIR}
+-    COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_BIN_DIR} ${TOOLS_BIN_DIR}/init_database ${DATA_SRC_DIR}/phone.cin ${DATA_SRC_DIR}/tsi.src
++    COMMAND init_database ${DATA_SRC_DIR}/phone.cin ${DATA_SRC_DIR}/tsi.src
+     DEPENDS
+         ${ALL_TOOLS}
+         ${DATA_SRC_DIR}/phone.cin
+         ${DATA_SRC_DIR}/tsi.src
++    WORKING_DIRECTORY ${DATA_BIN_DIR}
+ )
+ 
+ # test
diff --git a/srcpkgs/libchewing/template b/srcpkgs/libchewing/template
index 7e1acca89dcc..9345a70fe6ff 100644
--- a/srcpkgs/libchewing/template
+++ b/srcpkgs/libchewing/template
@@ -1,18 +1,18 @@
 # Template file for 'libchewing'
 pkgname=libchewing
 version=0.5.1
-revision=4
+revision=5
 build_style=cmake
+build_helper="qemu"
 hostmakedepends="texinfo"
 makedepends="sqlite-devel"
-depends="libchewing-data-${version}_${revision}"
 short_desc="Intelligent phonetic (Zhuyin/Bopomofo) input method"
 maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
 license="LGPL-2.1-only"
 homepage="http://chewing.im/"
 distfiles="https://github.com/chewing/libchewing/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
 checksum=9708c63415fa6034435c0f38100e7d30d0e1bac927f67bec6dfeb3fef016172b
-nocross="/builddir/libchewing-0.5.1/build/src/tools/init_database: cannot execute binary file"
+replaces="libchewing-data>=0"
 
 libchewing-devel_package() {
 	depends="libchewing>=${version}_${revision}"
@@ -25,10 +25,3 @@ libchewing-devel_package() {
 		vmove usr/share/info
 	}
 }
-
-libchewing-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/libchewing
-	}
-}

From 8a70cf3ada53a9e8d477bef7935d8937378d3739 Mon Sep 17 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, 13 Mar 2022 20:23:48 +0700
Subject: [PATCH 0180/2561] fcitx-chewing: need libfcitx in hostmakedepends

---
 srcpkgs/fcitx-chewing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fcitx-chewing/template b/srcpkgs/fcitx-chewing/template
index 8f2c9c4ce432..67d01e039272 100644
--- a/srcpkgs/fcitx-chewing/template
+++ b/srcpkgs/fcitx-chewing/template
@@ -3,7 +3,7 @@ pkgname=fcitx-chewing
 version=0.2.3
 revision=2
 build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config libfcitx"
 makedepends="fcitx-devel libchewing-devel"
 depends="fcitx5-chewing-icons"
 short_desc="Fcitx wrapper for Chewing IM engine"

From 93d341685d6fe4bf36fec477fed6abb3d55e65a3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 13 Mar 2022 15:40:18 +0100
Subject: [PATCH 0181/2561] linux5.15: update to 5.15.28.

---
 srcpkgs/linux5.15/files/arm64-dotconfig | 4 ++--
 srcpkgs/linux5.15/template              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index a90de90be07d..f2091f4a8972 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.22 Kernel Configuration
+# Linux/arm64 5.15.28 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -424,6 +424,7 @@ CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -2643,7 +2644,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 387e8abc54dc..d314a6f8a251 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.26
+version=5.15.28
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 5ceba1332b26e735342a76dd85a5b1b53cc4873e202e58b99a25da0cf6e20992"
+ 1019709aa85b87904e901aca141f8ade27b3719333be8a3e9d3b2cb0e05ad345"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From b64607a3de57b5dba61d5c9caaeb716c8010a5c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 13 Mar 2022 15:42:25 +0100
Subject: [PATCH 0182/2561] linux5.10: update to 5.10.105.

---
 srcpkgs/linux5.10/files/arm64-dotconfig | 3 ++-
 srcpkgs/linux5.10/template              | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index 5294c39d31d5..f5587464698f 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.99 Kernel Configuration
+# Linux/arm64 5.10.105 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -419,6 +419,7 @@ CONFIG_CRASH_DUMP=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index d12ac8cfdb27..305d9822a51c 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.103
+version=5.10.105
 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=4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a
+checksum=3ddc0e0ab2b9cadb64df43141e0a1e5432b5963ed50f34d586c065ac8d4fcb85
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 1209bf5d9a6bbb1c002b6daaee46ef69be930cbf Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 29 Jan 2022 14:37:43 +0100
Subject: [PATCH 0183/2561] praat: update to 6.2.09

---
 srcpkgs/praat/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index b64c721ab717..ac2777a445cc 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.2.04
+version=6.2.09
 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=65c8a70d02760fdf36e04d892412441d8d338867db30d593aea1c202aa937c24
+checksum=3c38b8af267b152a3fda1af78fe8cc26a1717f70a886387e657c55746f666af1
 
 # 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
@@ -34,13 +34,11 @@ do_build() {
 
 		cp makefiles/makefile.defs.linux.${_variant} ./makefile.defs
 		sed -i -e 's/$(LIBS)/& $(LDFLAGS)/' Makefile
-		sed -i -e 's/CC = gcc/CC = "${CC}"/' \
-		 -e 's/CXX = g++/CXX = "${CXX}"/' \
-		 -e 's/LINK = g++/LINK = "${CXX}"/' \
-		 -e 's/AR = ar/AR = "${AR}"/' \
+		sed -i -e 's/AR = ar/AR = "${AR}"/' \
 		 -e 's/-O\(1\|3\)//' \
 		 -e 's/CFLAGS =/CFLAGS +=/' \
 		 -e 's/CXXFLAGS =/CXXFLAGS +=/' \
+		 -e 's/-no-pie//' \
 		 makefile.defs
 
 		if [ $XBPS_TARGET_ENDIAN == "le" ]; then

From d6150319bff3b89e651b82940b5accba5d8cc6c2 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 3 Jan 2022 09:48:03 +0100
Subject: [PATCH 0184/2561] dhcpcd: update to 9.4.1.

---
 srcpkgs/dhcpcd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index e651bd019067..12be60c1efcf 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,6 +1,6 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=9.4.0
+version=9.4.1
 revision=1
 build_style=configure
 make_check_target=test
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/dhcpcd"
 distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz"
-checksum=41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513
+checksum=819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c
 lib32disabled=yes
 conf_files=/etc/dhcpcd.conf
 

From 0ab56de207750e665913bce87d93f196afa5fb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 11 Mar 2022 17:27:59 +0100
Subject: [PATCH 0185/2561] kopia: update to 0.10.6.

---
 srcpkgs/kopia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index e366eb0282b5..056235ef545f 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,6 +1,6 @@
 # Template file for 'kopia'
 pkgname=kopia
-version=0.10.5
+version=0.10.6
 revision=1
 build_style=go
 build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="Apache-2.0"
 homepage="https://kopia.io/"
 distfiles="https://github.com/kopia/kopia/archive/v${version}.tar.gz"
-checksum=3d6418e6909050204078e389fe2ecb3e6080e3185378eba243c4101cc873c770
+checksum=07df866ff4a2662f503a1348fe02bb62e6cf195260217d7e1234b03ff7b27797
 
 post_install() {
 	for shell in bash zsh; do

From 3f8ab64d9e8aeb64b5b52882a4949be69152b51e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Mar 2022 12:23:13 +0400
Subject: [PATCH 0186/2561] python3-curl: update to 7.45.0, adopt.

---
 srcpkgs/python3-curl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 9bba5853691b..ea7831c2f087 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
-version=7.44.1
+version=7.45.0
 revision=1
 wrksrc="pycurl-${version}"
 build_style=python3-module
@@ -8,12 +8,12 @@ hostmakedepends="python3-devel"
 makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 depends="python3"
 short_desc="Python3 interface to cURL library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later, MIT"
 homepage="http://pycurl.io/"
 changelog="https://raw.githubusercontent.com/pycurl/pycurl/master/ChangeLog"
 distfiles="${PYPI_SITE}/p/pycurl/pycurl-${version}.tar.gz"
-checksum=5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8
+checksum=5036c53c6f4106e9160d053a4baa3433a0215fb3386073e211273c56a3a95f3d
 
 pre_build() {
 	vsed -i "/setup_args\['data_files'\] = /d" setup.py

From 35e45ba1712b94998e16613cfdd69131aaeebac2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 11 Mar 2022 20:56:32 -0500
Subject: [PATCH 0187/2561] procs: update to 0.12.1.

---
 srcpkgs/procs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index 309ff8c6f5c9..84e47b23614b 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,6 +1,6 @@
 # Template file for 'procs'
 pkgname=procs
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/dalance/procs"
 changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md"
 distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz"
-checksum=04dbb3ddc734a9d1305b26b546a913e3e04d556b5863212a2675d29268aebed3
+checksum=ce84e98dd85cb8d5afda871ad2ddceb4faec077d9e019469aa668a75821e4fc2
 
 post_build() {
 	PROCS="target/${RUST_TARGET}/release/procs"

From 99c8a5c4bd2aa00d86ae66e6b3bc08c47f5a74ea Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Thu, 10 Mar 2022 11:21:59 -0600
Subject: [PATCH 0188/2561] Signal-Desktop: update to 5.35

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 97cac6378e09..038af9b6e175 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.34.0
+version=5.35.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=54d81b6fa1be05d60a840b9ffcf3f8fc1642863c0a5a6ec2cfa3e02ff6e9e31d
+checksum=12d4766356d50f4eaff907a738860be91bf4c012fd2db62d00757078923dca67
 nostrip_files="signal-desktop"
 
 post_extract() {

From 98576fa34f377e4c4dd4ab10ad51600ce87c84a0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 11 Mar 2022 10:44:50 -0500
Subject: [PATCH 0189/2561] texlab: update to 3.3.2, restore cross.

---
 srcpkgs/texlab/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
index 6e60a74ebf9f..8891cb68bf1c 100644
--- a/srcpkgs/texlab/template
+++ b/srcpkgs/texlab/template
@@ -1,6 +1,6 @@
 # Template file for 'texlab'
 pkgname=texlab
-version=3.3.1
+version=3.3.2
 revision=1
 build_style=cargo
 short_desc="Implementation of the Language Server Protocol for LaTeX"
@@ -9,8 +9,7 @@ license="GPL-3.0-or-later"
 homepage="https://texlab.netlify.app/"
 changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md"
 distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz"
-checksum="a39766f497dfb2cf9e370ddc430b7d275cb055b4d8a0751d718a86072747a75c"
-nocross=yes # https://github.com/void-linux/void-packages/issues/34889
+checksum=380395a37ee2ece590c0db04ac4898f5f430ee37d0ab0fa0801805167fff066a
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="smartstring fails to compile"

From c559fdef7d694d6432fd4546051ab027d1c11f99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 11 Mar 2022 19:22:20 -0500
Subject: [PATCH 0190/2561] just: update to 1.1.0.

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 156d04e3120d..436ea6d5d455 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.0.1
+version=1.1.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/refs/tags/${version}.tar.gz"
-checksum=261532a3b72b34a79df01bb0c4a366bcc3fd870c5706340fec260faebddb42c6
+checksum=b0eaf3c7da507be9ad8e0ce050a10459eeead72b94d50bc3261e3dcda516b03a
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 23458584c645eabecd09d54d7cf1ef2021169e9f Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Thu, 10 Mar 2022 17:40:25 -0600
Subject: [PATCH 0191/2561] kubernetes-kind: update to 0.12.0.

---
 srcpkgs/kubernetes-kind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 810e9935e3dd..c40e1a1f98f2 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
-version=0.11.1
+version=0.12.0
 revision=1
 wrksrc="kind-${version}"
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
 license="Apache-2.0"
 homepage="https://kind.sigs.k8s.io/"
 distfiles="https://github.com/kubernetes-sigs/kind/archive/v${version}.tar.gz"
-checksum=95ce0e7b01c00be149e5bd777936cef3f79ba7f1f3e5872e7ed60595858a2491
+checksum=cd1d09921b3c8a0f58c6423e5706be0c6e556f0c3d2b9e62f42be59263b209bb
 _completions="bash zsh fish"
 
 post_build() {

From 80c268226d25abf4ed6b5c9007c8b2eabca2e370 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 28 Feb 2022 20:32:26 -0600
Subject: [PATCH 0192/2561] gns3-server: update to 2.2.31.

---
 srcpkgs/gns3-server/patches/requirements.patch | 17 ++++++++++-------
 srcpkgs/gns3-server/template                   |  6 +++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch
index 1c61d2dd6ae1..4cfa85b16ba2 100644
--- a/srcpkgs/gns3-server/patches/requirements.patch
+++ b/srcpkgs/gns3-server/patches/requirements.patch
@@ -1,18 +1,21 @@
 diff --git a/requirements.txt b/requirements.txt
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,9 +1,8 @@
+@@ -1,12 +1,11 @@
 -jsonschema==3.2.0
 +jsonschema>=3.2.0
 -aiohttp==3.7.4.post0
 +aiohttp>=3.7.4
  aiohttp-cors==0.7.0
--aiofiles==0.7.0
-+aiofiles>=0.8.0
--Jinja2==3.0.1
-+Jinja2>=3.0.1
--sentry-sdk==1.3.1
--psutil==5.8.0
+ aiofiles==0.8.0
+-Jinja2==3.0.3
++Jinja2>=3.0.3
+-sentry-sdk==1.5.4
+-psutil==5.9.0
 +psutil>=5.9.0
  async-timeout==3.0.1
  distro==1.6.0
+ py-cpuinfo==8.0.0
+-setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
++setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
+ setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 1845cc2e3fcf..038457a27a3b 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.29
-revision=2
+version=2.2.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=34237771bb743ac9142569e67284123b6090f78cfd802a729e2f11b9d5d48929
+checksum=10a530866a156cea6b544be9b557f61ca0baa7e58c3064d79a1d523b70301edc
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From 193490e2963f774490df6a6c45fd35dd1b43da91 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 28 Feb 2022 20:32:36 -0600
Subject: [PATCH 0193/2561] gns3-gui: update to 2.2.31.

---
 srcpkgs/gns3-gui/patches/requirements.patch | 9 ++++++---
 srcpkgs/gns3-gui/template                   | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch
index d594ea77de5b..ab3d55dea830 100644
--- a/srcpkgs/gns3-gui/patches/requirements.patch
+++ b/srcpkgs/gns3-gui/patches/requirements.patch
@@ -1,10 +1,13 @@
 diff --git a/requirements.txt b/requirements.txt
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,4 +1,3 @@
+@@ -1,6 +1,5 @@
 -jsonschema==3.2.0
 +jsonschema>=3.2.0
--sentry-sdk==1.3.1
--psutil==5.8.0
+-sentry-sdk==1.5.4
+-psutil==5.9.0
 +psutil>=5.9.0
  distro==1.6.0
+-setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
++setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
+ setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index a4d9d410e3fc..175eab41080c 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.29
-revision=2
+version=2.2.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=5b9b6db1917af66d0e4bf32c41ff17d6a03a487a2a870d18b04e68e7b572bf28
+checksum=7b6f041f88a63dc44e33680ea489556abc7d96d1c3d4bb5d85dd15b15db6d036
 
 post_install() {
 	vinstall gns3-gui.desktop 644 usr/share/applications

From 56ed1528f535f3e10f78bf0b58e8839229950952 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 12 Mar 2022 21:24:39 +0100
Subject: [PATCH 0194/2561] sqlite: update to 3.38.1.

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 8760d30aee97..0ef5405dfa66 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.0
+version=3.38.1
 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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68
+checksum=8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From 8fc968f39ed101e1ab45964c4fc1fe32c2e0379a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 26 Feb 2022 14:52:18 +0100
Subject: [PATCH 0195/2561] xterm: update to 372.

---
 srcpkgs/xterm/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 0af0328c6f96..ed4be0755e8f 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=370
+version=372
 revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -17,11 +17,10 @@ makedepends="libXaw-devel libXft-devel libutempter-devel libxkbfile-devel
 short_desc="X Terminal Emulator"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT, X11"
-homepage="http://invisible-island.net/xterm/"
-changelog="http://invisible-island.net/xterm/xterm.log.html"
-# using HTTP TEMPORARILY due to cert issues
-distfiles="http://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=963c5d840a0f0f4c077ff284586e8b1f83f3f983dca6f74f4b361975b5388c82
+homepage="https://invisible-island.net/xterm/"
+changelog="https://invisible-island.net/xterm/xterm.log.html"
+distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
+checksum=c6d08127cb2409c3a04bcae559b7025196ed770bb7bf26630abcb45d95f60ab1
 
 post_install() {
 	for f in {u,}xterm.desktop; do

From 0e547aa0d6aacee369f470be4394419c5b80280b Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 10 Mar 2022 12:39:11 +0100
Subject: [PATCH 0196/2561] fscrypt: update to 0.3.3.

---
 srcpkgs/fscrypt/template | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index 87799d6b9c14..50849c9f7070 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,10 +1,11 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
-version=0.2.9
+version=0.3.3
 revision=1
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"
+go_ldflags="-X main.version=v${version}"
 hostmakedepends="m4"
 makedepends="pam-devel"
 short_desc="Tool for managing Linux filesystem encryption"
@@ -12,9 +13,13 @@ maintainer="Andrea Brancaleoni <abc@pomel.me>"
 license="Apache-2.0"
 homepage="https://github.com/google/fscrypt"
 distfiles="https://github.com/google/fscrypt/archive/v${version}.tar.gz"
-checksum=36f1166d9886548b0d72beeeffb9ca8fb5b28b63a42b369923bc3f0bea78bb3d
+checksum=7485232dc4c48d8db262e0280b34b3c869e7b6f41f8ee8601ebfe04297796410
 conf_files="/etc/pam.d/fscrypt"
 
+do_check() {
+	make test
+}
+
 post_install() {
 	# build and install the PAM module
 	LDFLAGS= make PREFIX=/usr DESTDIR=${DESTDIR} install-pam
@@ -22,4 +27,8 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/share/pam-configs/
 	# add PAM config file
 	vinstall ${FILESDIR}/pam_config 644 etc/pam.d fscrypt
+
+	vcompletion cmd/fscrypt/fscrypt_bash_completion bash
+
+	vdoc README.md
 }

From a7c1c226b06216533734789b549c9d1194a5b316 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 22:43:50 +0100
Subject: [PATCH 0197/2561] libgusb: update to 0.3.10.

---
 srcpkgs/libgusb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 0064f3f07e51..6860869a82c9 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -1,6 +1,6 @@
 # Template file for 'libgusb'
 pkgname=libgusb
-version=0.3.7
+version=0.3.10
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ 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=da5f25d6873622689b3351486cbe028efc254403f646dd81225dfe8542d8c67d
+checksum=0eb0b9ab0f8bba0c59631c809c37b616ef34eb3c8e000b0b9b71cf11e4931bdc
 # requires access to USB devices, not available on CI
 make_check=ci-skip
 

From ea8e4bfe0e31195c9c28a0adaf206379e5cfcc38 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:02 +0200
Subject: [PATCH 0198/2561] skalibs: update to 2.11.2.0.

---
 srcpkgs/skalibs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index 8b6b7b79227c..bac3772b161c 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,6 +1,6 @@
 # Template file for 'skalibs'
 pkgname=skalibs
-version=2.11.1.0
+version=2.11.2.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --enable-static --enable-shared
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/skalibs/"
 changelog="https://skarnet.org/software/skalibs/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=400180b4d5b651e4fafaf0297b933f5f863b467d357f5b36a6545cf6eb14eab9
+checksum=649cf3236fe3103f45366b6196b1bcd0457c9c17ca86f2b80007696a2baa7b77
 
 post_install() {
 	vlicense COPYING LICENSE

From 46a780352c93d645d0364dbbdce684da81494e4f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:08 +0200
Subject: [PATCH 0199/2561] execline: update to 2.8.3.0.

---
 srcpkgs/execline/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index b938a86b8018..f27c5a33e5fb 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,6 +1,6 @@
 # Template file for 'execline'
 pkgname=execline
-version=2.8.2.0
+version=2.8.3.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/execline/"
 changelog="https://skarnet.org/software/execline/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=2fdf7607f306e94fe42ebe2b49872d0f654aa2297a576d5a2d8037d4d9583341
+checksum=235dbecd594c82e0523c87c2eacf04c48781b39264158f57049f1a1ff8b4ad80
 
 CFLAGS="-fPIC"
 

From 347b6229d8cbf8078e7a69c906e7338081aa6f1d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:12 +0200
Subject: [PATCH 0200/2561] s6: update to 2.11.1.0.

---
 srcpkgs/s6/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index 863800141414..5812c18784b0 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,6 +1,6 @@
 # Template file for 's6'
 pkgname=s6
-version=2.11.0.1
+version=2.11.1.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -15,7 +15,7 @@ license="ISC"
 homepage="http://skarnet.org/software/s6/"
 changelog="https://skarnet.org/software/s6/upgrade.html"
 distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=ad7f204587634eeb20ef8f7a7beb6dd63ba3080a46a3a650448ca7cc0826f90a
+checksum=ae64dc2ba208ff80e4ac4792ce90dd526b42bf19c966dc7d8eb9a6870e4bc23a
 
 build_options="static"
 

From aaf08da24fe0fa36f18cda760a322669efb60683 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:18 +0200
Subject: [PATCH 0201/2561] s6-portable-utils: update to 2.2.4.0.

---
 srcpkgs/s6-portable-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index 4f775e6459e8..e7de2cf69b93 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,6 +1,6 @@
 # Template file for 's6-portable-utils'
 pkgname=s6-portable-utils
-version=2.2.3.4
+version=2.2.4.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-portable-utils/"
 changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=37ba98f727a9e382bf742af32ddbd8464c226a13a0a51bef586c28d57c8ac912
+checksum=cb1eea89f0311006f0132aa45324ff96fa7756d11a5f4366c68d084839e5a56f
 
 build_options="static"
 

From b0f0f83c799557500c1404e2456e29746cd9b755 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 8 Mar 2022 19:33:53 +0100
Subject: [PATCH 0202/2561] pass-git-helper: update to 1.2.0.

---
 srcpkgs/pass-git-helper/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template
index eaf7d1f49ab0..863a14a28137 100644
--- a/srcpkgs/pass-git-helper/template
+++ b/srcpkgs/pass-git-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'pass-git-helper'
 pkgname=pass-git-helper
-version=1.1.2
-revision=2
+version=1.2.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pass python3-xdg"
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/languitar/pass-git-helper"
 distfiles="https://github.com/languitar/${pkgname}/archive/v${version}.tar.gz"
-checksum=4acfb486d0873014376383167792ee2b46926386718eb2331a1b4564576a2076
+checksum=d9ab12d81e283411a65285a0030cbfef2548dc580631d2337628e57f10e463aa

From f28a100d7776dae8c3ab9a03d0e63fa69ccc32c4 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 8 Mar 2022 19:29:11 +0100
Subject: [PATCH 0203/2561] py3status: update to 3.41.

---
 srcpkgs/py3status/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 092ccfbe2bd9..13a91c28109b 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.40
+version=3.41
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=84885ec8a43626dcd7576b9cad029406c98675ca00ba66ff124d7607290d2b66
+checksum=9728ff6913a13087201c73f682f67afcd8dc73a71b044d6833737ee227ad5fba
 
 post_install() {
 	vlicense LICENSE

From e884d14036a7ae925eb64a8dc7759ce54befc06e Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 10:03:27 +0100
Subject: [PATCH 0204/2561] openimagedenoise: update to 1.4.3.

---
 srcpkgs/openimagedenoise/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 59bbde5bf3ab..15c98835c051 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.2
-revision=3
+version=1.4.3
+revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
 build_style=cmake
@@ -11,8 +11,9 @@ short_desc="Intel(R) Open Image Denoise library"
 maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
+changelog="https://github.com/OpenImageDenoise/oidn/blob/master/CHANGELOG.md"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=e70d27ce24b41364782376c1b3b4f074f77310ccfe5f8ffec4a13a347e48a0ea
+checksum=3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a
 
 do_check() {
 	build/oidnTest

From f86f73a82c98cd246178b756bd6f17a2f5386362 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Sun, 6 Mar 2022 16:24:32 +0530
Subject: [PATCH 0205/2561] touchegg: update to 2.0.13

---
 srcpkgs/touchegg/patches/musl.patch       | 24 -------------------
 srcpkgs/touchegg/patches/no-systemd.patch | 28 -----------------------
 srcpkgs/touchegg/template                 |  6 +++--
 3 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/touchegg/patches/musl.patch
 delete mode 100644 srcpkgs/touchegg/patches/no-systemd.patch

diff --git a/srcpkgs/touchegg/patches/musl.patch b/srcpkgs/touchegg/patches/musl.patch
deleted file mode 100644
index 8504cfa2f8c0..000000000000
--- a/srcpkgs/touchegg/patches/musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From da9a3a95cfe9965ff6e15e3a0e1a98f8840a34d7 Mon Sep 17 00:00:00 2001
-From: Alexander Gehrke <void@qwertyuiop.de>
-Date: Tue, 25 May 2021 23:47:51 +0000
-Subject: [PATCH] Fix missing header for musl
-
----
- src/utils/client-lock.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/utils/client-lock.cpp b/src/utils/client-lock.cpp
-index fb1e67b..27c6c6a 100644
---- a/src/utils/client-lock.cpp
-+++ b/src/utils/client-lock.cpp
-@@ -19,6 +19,7 @@
- 
- #include <sys/file.h>
- #include <unistd.h>
-+#include <fcntl.h>
- 
- #include <exception>
- #include <stdexcept>
--- 
-2.31.1
-
diff --git a/srcpkgs/touchegg/patches/no-systemd.patch b/srcpkgs/touchegg/patches/no-systemd.patch
deleted file mode 100644
index efd2ca83347d..000000000000
--- a/srcpkgs/touchegg/patches/no-systemd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 938167799926ad70849d8088bdef023b5e8a0700 Mon Sep 17 00:00:00 2001
-From: Alexander Gehrke <void@qwertyuiop.de>
-Date: Tue, 25 May 2021 20:11:29 +0000
-Subject: [PATCH] Fix CMake failing because of missing Systemd service dir
-
----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dee220d..13b773f 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,11 +76,6 @@ include(GNUInstallDirs)
- set(SYSTEM_CONFIG_FILE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/touchegg/touchegg.conf")
- target_compile_definitions(touchegg PUBLIC SYSTEM_CONFIG_FILE_PATH=\"${SYSTEM_CONFIG_FILE_PATH}\")
- 
--# configure systemd service unit to use the right path, e.g. @CMAKE_INSTALL_BINDIR@/touchegg
--configure_file(${PROJECT_SOURCE_DIR}/installation/touchegg.service.in ${PROJECT_SOURCE_DIR}/installation/touchegg.service @ONLY)
--pkg_get_variable(SYSTEMD_SERVICE_DIR systemd systemdsystemunitdir)
--
- install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.conf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/touchegg) # /usr/share/touchegg/touchegg.conf
--install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.service DESTINATION ${SYSTEMD_SERVICE_DIR})
- install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.desktop DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart)
- install(PROGRAMS ${PROJECT_BINARY_DIR}/touchegg DESTINATION ${CMAKE_INSTALL_BINDIR}) # /usr/bin/touchegg
--- 
-2.31.1
-
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index 538277a2c683..a8526763517f 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,8 +1,9 @@
 # Template file for 'touchegg'
 pkgname=touchegg
-version=2.0.9
+version=2.0.13
 revision=1
 build_style=cmake
+configure_args="-DUSE_SYSTEMD=false"
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel
  libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel"
@@ -10,8 +11,9 @@ short_desc="Multitouch gesture recognizer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/JoseExposito/touchegg"
+changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
 distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=efff0f2011078cea15f2f130d1501714f8e3f82b7e883e81eccf956ac7966d0e
+checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
 system_accounts="_touchegg"
 
 post_install() {

From 920e8dc24087d595896def72a92d254a776c198f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Mar 2022 12:39:20 +0200
Subject: [PATCH 0206/2561] LGOGDownloader: update to 3.9.

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 208d25192c4e..6e7e5c685f83 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,6 +1,6 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
-version=3.8
+version=3.9
 revision=1
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"
 homepage="https://github.com/Sude-/lgogdownloader"
 distfiles="https://github.com/Sude-/lgogdownloader/archive/v${version}.tar.gz"
-checksum=8e4cf5268cee76bb2addf5e7720b230b43b21d6e995d24407da9ca0fcd02df35
+checksum=4ab9fe89b47bde7744d5100663c7822de74bb161e2790baddede8146056430b1
 
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 2ab3f9e79e2a7d8e6627a39cb10a184221daa205 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Mar 2022 12:32:25 +0200
Subject: [PATCH 0207/2561] rage-player: update to 0.4.0.

---
 srcpkgs/rage-player/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rage-player/template b/srcpkgs/rage-player/template
index c81765b0b5e5..656227dbf3ed 100644
--- a/srcpkgs/rage-player/template
+++ b/srcpkgs/rage-player/template
@@ -1,7 +1,7 @@
 # Template file for 'rage-player'
 pkgname=rage-player
-version=0.3.1
-revision=2
+version=0.4.0
+revision=1
 wrksrc="rage-${version}"
 build_style=meson
 hostmakedepends="pkg-config efl-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.enlightenment.org/about-rage"
 distfiles="https://download.enlightenment.org/rel/apps/rage/rage-${version}.tar.xz"
-checksum=e5c434ef415ec1dd268399c527f582baeef39a25dee52f828876bfb58698cd11
+checksum=7ce58419aa5197aa6c33f2e3f9eb9d78ff379cae863d5fa114fd1428d5a1ca0f
 
 post_install() {
 	vlicense COPYING

From ed07c5ba07a2c6698176dbb9404ce84cb3bc481b Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:34:45 -0800
Subject: [PATCH 0208/2561] gammastep: update to 2.0.8

---
 srcpkgs/gammastep/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gammastep/template b/srcpkgs/gammastep/template
index 1a12e16e3a97..1f24e8383904 100644
--- a/srcpkgs/gammastep/template
+++ b/srcpkgs/gammastep/template
@@ -1,11 +1,11 @@
 # Template file for 'gammastep'
 pkgname=gammastep
-version=2.0.7
-revision=2
+version=2.0.8
+revision=1
 wrksrc="${pkgname}-v$version"
 build_style=gnu-configure
 configure_args="--enable-gui --enable-drm --enable-vidmode --enable-randr
- --enable-wayland --enable-apparmor --with-systemdunitdir=no
+ --enable-wayland --enable-apparmor --with-systemduserunitdir=no
  $(vopt_enable geoclue2)"
 hostmakedepends=" tar automake libtool gettext-devel intltool pkg-config
  python3-devel wayland-devel"
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.com/chinstrap/gammastep"
 changelog="https://gitlab.com/chinstrap/gammastep/raw/master/NEWS.md"
 distfiles="${homepage}/-/archive/v$version/${pkgname}-v$version.tar.gz"
-checksum=b3dc1d515088ef5578da009c4b70b22f9702397a6a21bbba79f1c01793a90e73
+checksum=46535cbeba2ec0e6e18a33f7c1bdec3f520230441e7cdff318d3cf612160bd76
 build_options="geoclue2"
 build_options_default="geoclue2"
 

From b51348097128686f9268d6a4e157fd79b2777d96 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 14 Mar 2022 02:36:47 +0100
Subject: [PATCH 0209/2561] abcm2ps: update to 8.14.13.

---
 srcpkgs/abcm2ps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template
index 31a97e4daec5..1199fa010fd2 100644
--- a/srcpkgs/abcm2ps/template
+++ b/srcpkgs/abcm2ps/template
@@ -1,6 +1,6 @@
 # Template file for 'abcm2ps'
 pkgname=abcm2ps
-version=8.14.12
+version=8.14.13
 revision=1
 build_style=configure
 hostmakedepends="pkg-config python3-docutils which"
@@ -10,7 +10,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-or-later"
 homepage="http://moinejf.free.fr/"
 distfiles="https://github.com/leesavide/abcm2ps/archive/v${version}.tar.gz"
-checksum=f98701bc25f52e98a9283d0cef04591351b62ff8dc80fa54bb21467d60886feb
+checksum=8db29e33f30fce609ddffeb641c3bfe60ae5d16c3305402157ddc88bcaaf0c5b
 
 pre_configure() {
 	echo CC=${CC} >> custom

From 8bdd3cf2f7489363f12b0e51415829488bc9dcb6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 23 Feb 2022 23:55:47 -0500
Subject: [PATCH 0210/2561] common/build-helper/rust.sh: fix cross for bindgen

When using a build.rs script to dynamically generate bindgen bindings
at build-time, it will run on the host, and by default bindgen will
generate bindings for the host arch/libc instead of the target.
To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS
to specify the proper sysroot and include path for the target.
These arguments are not used for anything other than bindgen's clang
invocation.
---
 common/build-helper/rust.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 431cb5f0fd43..798083709c3e 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then
 	# innocuous flags are used here just to disable its defaults
 	export HOST_CC="gcc"
 	export HOST_CFLAGS="-O2"
+
+	# Crates that use bindgen via build.rs are not cross-aware unless these are set
+	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
 else
 	unset CARGO_BUILD_TARGET
 fi

From aa7ba36500127d7ad481df03cc466ef1fb74576f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 24 Feb 2022 00:07:36 -0500
Subject: [PATCH 0211/2561] New package: helvum-0.3.4

---
 srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++
 srcpkgs/helvum/template                    | 46 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
 create mode 100644 srcpkgs/helvum/template

diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..17f0f17f8875
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/helvum-0.3.4/pipewire/src/loop_.rs b/helvum-0.3.4/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/helvum-0.3.4/pipewire/src/loop_.rs
++++ b/helvum-0.3.4/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+         fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+             spa_sys::timespec {
+                 tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+-                tv_nsec: duration.subsec_nanos().into(),
++                tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+             }
+         }
+ 
+-- 
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..49ad2dd6013a
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,46 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+_pipewire_rs_version=0.4.1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+license="GPL-3.0-only"
+homepage="https://gitlab.freedesktop.org/pipewire/helvum"
+distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/archive/v${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+	pushd $build_wrksrc
+	echo "[patch.crates-io]" >> Cargo.toml
+	for crate in pipewire pipewire-sys libspa libspa-sys; do
+		mv ../pipewire-rs-*/$crate $crate
+		echo "$crate = { path = './$crate' }" >> Cargo.toml
+	done
+	popd
+}
+
+post_install() {
+	# Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
+	# This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
+	# On update, all meson.build files should be checked for changes
+	_app_id='org.pipewire.Helvum'
+	vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+	vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+	vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+	vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+	vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+	vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}

From 0aa55b61ee21b9dfebbee43e84db4cbedb5da804 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 14 Mar 2022 09:41:16 +0100
Subject: [PATCH 0212/2561] vale: update to 2.15.2

---
 srcpkgs/vale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 8675c1d9b8d9..d08391061a35 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.13.0
+version=2.15.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=4e039ac35c874e62f3380a619041c721ed7eedc1fb70b52cc3f78e632f2eddc4
+checksum=15c79d613c181edc99a0a35bde1658b33fbd5aa49f1ac7f1029eba779bf8d4bc
 
 post_install() {
 	vlicense LICENSE

From 2c5785c6126fa59c049e57d10952032dcca1fcaf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 14 Mar 2022 12:52:21 +0100
Subject: [PATCH 0213/2561] weechat: update to 3.4.1.

---
 srcpkgs/weechat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index a496a6412e85..c5898cbf3091 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=3.4
-revision=2
+version=3.4.1
+revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=7cd3dcc7029e888de49e13ebbcc3749586ff59c9d97f89f5eeb611067c7bb94c
+checksum=7e088109ad5dfbcb08a9a6b1dd70ea8236093fed8a13ee9d9c98881d7b1aeae7
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"

From fab87feb50eed34505e3f80ce332f1bed6113fd7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 14 Mar 2022 12:55:55 +0100
Subject: [PATCH 0214/2561] ugrep: update to 3.7.5.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 1653c0b8d518..16301971cb5f 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.4
+version=3.7.5
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=47505886facf738aa33019ccf22a66e98a46e81171bcb6aabf1815f97925b54f
+checksum=2b237330ef92017d69ed6611b9dfb91b447d4679b9fb3704514bfd5b89a1a44d
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 29aaea52b3ff0cd052f1ff3f9d6a661c55897483 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 14 Mar 2022 12:55:58 +0100
Subject: [PATCH 0215/2561] nncp: update to 8.7.2.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index e6d62ac2f55f..9dd39f4ee3af 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=8.7.1
+version=8.7.2
 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=ceb4d197af5a8d9e93b749d5c0f50b53e6746a318af47b364bf5cb323d6c4ebd
+checksum=a0eec9b0f33059de33f13084599805d0f4a1c8c379e925bacfe8dc94d1ddc23d
 
 do_build() {
 	make

From c042eee926da06698776267bf8a13bd1fe9d7fbc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 14 Mar 2022 15:32:20 +0100
Subject: [PATCH 0216/2561] zchunk: update to 1.2.1.

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 07c43561ec28..e8679bcbabc4 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,6 +1,6 @@
 # Template file for 'zchunk'
 pkgname=zchunk
-version=1.2.0
+version=1.2.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -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=8c9eca82845b656ccae5c0e9dc097cd7a6830981e2529677ce9a5617a1f50321
+checksum=9639942cf36f4f36d3b635d36d5164682249cc0240015569ac948db1584499b5
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"

From 351351e37f8181c6195cdc6eaaafce359567916a Mon Sep 17 00:00:00 2001
From: Christopher Brannon <chris@the-brannons.com>
Date: Mon, 14 Mar 2022 09:41:00 -0700
Subject: [PATCH 0217/2561] tinyssh: update to 20220305.

This release contains a fix for
https://github.com/janmojzis/tinyssh/issues/63
---
 srcpkgs/tinyssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index a2e1012a9c0e..05245c35db62 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,6 +1,6 @@
 # Template file for 'tinyssh'
 pkgname=tinyssh
-version=20220101
+version=20220305
 revision=1
 build_style=gnu-makefile
 make_dirs="/etc/tinyssh 0755 root root"
@@ -10,7 +10,7 @@ maintainer="Christopher Brannon <chris@the-brannons.com>"
 license="Public Domain"
 homepage="https://tinyssh.org"
 distfiles="https://github.com/janmojzis/tinyssh/archive/${version}.tar.gz"
-checksum=b68e5b8d1f72304d70b25b53dd221cdc0a25730695bf4e8e08e27ece9dcb499d
+checksum=26e1f14ee865fc48c173f51efa03aeeb72c44f102a0084ff267693406bd7aebe
 
 if [ -n "${CROSS_BUILD}" ] ; then
 	make_build_target=cross-compile

From 8675a9577c7405980611524b13f80387adde8499 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 14 Mar 2022 09:20:08 +0100
Subject: [PATCH 0218/2561] nbd: update to 3.24

---
 srcpkgs/nbd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nbd/template b/srcpkgs/nbd/template
index 79c9bdf8c315..a36cb448e89c 100644
--- a/srcpkgs/nbd/template
+++ b/srcpkgs/nbd/template
@@ -1,6 +1,6 @@
 # Template file for 'nbd'
 pkgname=nbd
-version=3.23
+version=3.24
 revision=1
 build_style=gnu-configure
 configure_args="--enable-syslog"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://nbd.sourceforge.io/"
 distfiles="${SOURCEFORGE_SITE}/nbd/nbd-${version}.tar.gz"
-checksum=3c969cd9cf83dae9276f999b7ff8e31e32411c8cc751221e698861bc05b8f76c
+checksum=a771022599525fd4f5c17c7b1c88696a91927c227e770425a55f67a7384441b6
 
 system_accounts="nbd"
 nbd_homedir="/var/chroot"

From 9633fa8ee393388dae97889c701639946c2c89b7 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 21 Feb 2022 18:48:26 +0300
Subject: [PATCH 0219/2561] nodejs-lts: update to 12.22.10.

---
 srcpkgs/nodejs-lts/template | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 5155f8ef1489..7ef99575a323 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -46,11 +46,6 @@ esac
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
-post_patch() {
-	# XXX Drop after c-ares 1.17.3 has been released.
-	vsed -i -e 's:<ares_nameser.h>:<arpa/nameser.h>:g' src/cares_wrap.cc
-}
-
 do_configure() {
 	local _args
 

From 05873892855c2dafb54eae1ae99d85f26cba1b60 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Fri, 11 Mar 2022 00:36:25 +1100
Subject: [PATCH 0220/2561] Ice: orphan package(s)

---
 srcpkgs/Ice/template        | 2 +-
 srcpkgs/zeroc-mcpp/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index f85b38df28d6..31b15fbb4d92 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -10,7 +10,7 @@ make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
  openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
-maintainer="a dinosaur <nick@a-dinosaur.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, custom:ICE"
 homepage="https://www.zeroc.com"
 distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz"
diff --git a/srcpkgs/zeroc-mcpp/template b/srcpkgs/zeroc-mcpp/template
index db9b9cc8e12b..048d464ab2ce 100644
--- a/srcpkgs/zeroc-mcpp/template
+++ b/srcpkgs/zeroc-mcpp/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="LIBDIR=lib"
 make_install_args="LIBDIR=lib"
 short_desc="Simplified fork of mcpp from ZeroC, for building ICE"
-maintainer="a dinosaur <nick@a-dinosaur.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/zeroc-ice/mcpp"
 distfiles="https://github.com/zeroc-ice/mcpp/archive/v${version}.tar.gz"

From 833359d12d651b1fe75d9d225173fd1ce489e725 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 14:13:24 +0100
Subject: [PATCH 0221/2561] nlopt: update to 2.7.1.

---
 srcpkgs/nlopt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nlopt/template b/srcpkgs/nlopt/template
index d43d4a4f287c..38c5ab972a87 100644
--- a/srcpkgs/nlopt/template
+++ b/srcpkgs/nlopt/template
@@ -1,14 +1,14 @@
 # Template file for 'nlopt'
 pkgname=nlopt
-version=2.6.2
+version=2.7.1
 revision=1
 build_style=cmake
 short_desc="FOSS library for nonlinear optimization"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://ab-initio.mit.edu/wiki/index.php/NLopt"
+homepage="https://nlopt.readthedocs.io"
 distfiles="https://github.com/stevengj/nlopt/archive/v${version}.tar.gz"
-checksum=cfa5981736dd60d0109c534984c4e13c615314d3584cf1c392a155bfe1a3b17e
+checksum=db88232fa5cef0ff6e39943fc63ab6074208831dc0031cf1545f6ecd31ae2a1a
 
 post_install() {
 	vlicense COPYING

From 39a0708b600f5890758ed5d410d56365445c0863 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Mon, 14 Mar 2022 21:37:11 +0100
Subject: [PATCH 0222/2561] slack-desktop: update to 4.24.0

Closes: #36141 [via git-merge-pr]
---
 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 8750d2687f69..b90525004d6c 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.23.0
+version=4.24.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://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=3a823be14d9aaea2ef565ac6c3fc62580a10775bcc1eadcc62c3256999ea59f3
+checksum=b557d264ae68cafe383d647dfd26f366ee94315f77132f64bff8f9ef44635197
 restricted=yes
 repository="nonfree"
 nopie=yes

From 69ff4ef67357114399aaff26d942593336ac8eda Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 15 Mar 2022 14:14:22 +0100
Subject: [PATCH 0223/2561] python3-boto3: update to 1.21.19.

---
 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 dce13428ee55..b96fa86eb165 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.21.8
+version=1.21.19
 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=00a0df9ee9ff1cca084d99004f67cdfb3ec63102b1e554077791698c4f10b4e0
+checksum=fb04acb6eb998652eb52381a580d3624490982a7b17d6080b0d78163874962b7
 
 post_install() {
 	vlicense LICENSE

From f54cf9b026ae9d5e7deeac1ddc6e828ab81abcc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 14 Mar 2022 23:06:17 +0100
Subject: [PATCH 0224/2561] mpd: update to 0.23.6.

---
 srcpkgs/mpd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index eeb298abfa1e..b34c78c11815 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.23.5
-revision=2
+version=0.23.6
+revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
@@ -39,7 +39,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299
+checksum=cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From d74d93282242287ecf66b045b10c236353046c96 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Mon, 25 Oct 2021 19:42:25 +0200
Subject: [PATCH 0225/2561] New package: qrcp-0.9.1

---
 srcpkgs/qrcp/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/qrcp/template

diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
new file mode 100644
index 000000000000..0e690a7073be
--- /dev/null
+++ b/srcpkgs/qrcp/template
@@ -0,0 +1,18 @@
+# Template file for 'qrcp'
+pkgname=qrcp
+version=0.9.1
+revision=1
+build_style=go
+go_import_path=github.com/claudiodangelis/qrcp
+go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}
+ -X github.com/claudiodangelis/qrcp/version.date=$(date -d@$SOURCE_DATE_EPOCH +%Y-%m-%dT%H:%M:%SZ)"
+short_desc="Transfer files over wifi to mobile devices by scanning a QR code"
+maintainer="meator <meator.dev@gmail.com>"
+license="MIT"
+homepage="https://claudiodangelis.com/qrcp/"
+distfiles="https://github.com/claudiodangelis/qrcp/archive/refs/tags/${version}.tar.gz"
+checksum=1ee0d1b04222fb2a559d412b144a49051c3315cbc99c7ea1f281bdd4f13f07bf
+
+post_install() {
+	vlicense LICENSE
+}

From df059a88661509027c167cf800bab24d08bd49be Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 14 Mar 2022 02:31:24 +0100
Subject: [PATCH 0226/2561] flickcurl: remove package

unused since 2019
---
 common/shlibs                     |  1 -
 srcpkgs/flickcurl-devel           |  1 -
 srcpkgs/flickcurl-doc             |  1 -
 srcpkgs/flickcurl/template        | 33 -------------------------------
 srcpkgs/removed-packages/template |  5 ++++-
 5 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 120000 srcpkgs/flickcurl-devel
 delete mode 120000 srcpkgs/flickcurl-doc
 delete mode 100644 srcpkgs/flickcurl/template

diff --git a/common/shlibs b/common/shlibs
index f26b9bab58fd..230fc6a994c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2580,7 +2580,6 @@ libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
 libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1
 libtspi.so.1 trousers-0.3.14_11
-libflickcurl.so.0 flickcurl-1.26_1
 libpsiconv.so.6 psiconv-0.9.9_1
 libshout.so.3 libshout-2.4.1_1
 libfirm.so.1.22 libfirm-1.22.0_1
diff --git a/srcpkgs/flickcurl-devel b/srcpkgs/flickcurl-devel
deleted file mode 120000
index 0c0d78612042..000000000000
--- a/srcpkgs/flickcurl-devel
+++ /dev/null
@@ -1 +0,0 @@
-flickcurl
\ No newline at end of file
diff --git a/srcpkgs/flickcurl-doc b/srcpkgs/flickcurl-doc
deleted file mode 120000
index 0c0d78612042..000000000000
--- a/srcpkgs/flickcurl-doc
+++ /dev/null
@@ -1 +0,0 @@
-flickcurl
\ No newline at end of file
diff --git a/srcpkgs/flickcurl/template b/srcpkgs/flickcurl/template
deleted file mode 100644
index 7756752110e9..000000000000
--- a/srcpkgs/flickcurl/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'flickcurl'
-pkgname=flickcurl
-version=1.26
-revision=4
-build_style=gnu-configure
-makedepends="libcurl-devel libxml2-devel raptor-devel"
-short_desc="C library for the Flickr API"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
-homepage="http://librdf.org/flickcurl/"
-distfiles="http://download.dajobe.org/flickcurl/flickcurl-${version}.tar.gz"
-checksum=ff42a36c7c1c7d368246f6bc9b7d792ed298348e5f0f5d432e49f6803562f5a3
-
-flickcurl-doc_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - Documentation (HTML Version)"
-	pkg_install() {
-		vmove usr/share/gtk-doc
-	}
-}
-
-flickcurl-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/flickcurl-config
-		vmove usr/share/man/man1/flickcurl-config.1
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a7a19630a01a..6a744198712d 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=64
+revision=65
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -69,6 +69,9 @@ replaces="
  electron9<=9.4.1_1
  enventor<=1.0.0_2
  epstopdf<=2.27_3
+ flickcurl-devel<=1.26_4
+ flickcurl-doc<=1.26_4
+ flickcurl<=1.26_4
  fontmatrix<=0.6.0.20171228_2
  freshplayerplugin<=0.3.9_9
  fuse-usmb<=20130204_7

From 6e3a74a440b081317ec064f0baafdc89d660edb3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Mar 2022 20:51:03 -0400
Subject: [PATCH 0227/2561] common/build-helper/rust.sh: link to libsodium
 dynamically

without this envvar, libsodium-sys will attempt to link to libsodium
staticly, and may fail.
---
 common/build-helper/rust.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 798083709c3e..272d03f52607 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -44,6 +44,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
 # sodium-sys
 export SODIUM_LIB_DIR="${XBPS_CROSS_BASE}/usr/include"
 export SODIUM_INC_DIR="${XBPS_CROSS_BASE}/usr/lib"
+export SODIUM_SHARED=1
 
 # openssl-sys
 export OPENSSL_NO_VENDOR=1

From 4de1d826cb39c8f4605f1fde2f50198402411136 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Mar 2022 20:53:07 -0400
Subject: [PATCH 0228/2561] rdedup: update to 3.2.1.

removes the need for patched/backported bindgen
---
 srcpkgs/rdedup/patches/bindgen-cross.patch | 12 ------------
 srcpkgs/rdedup/template                    | 21 +++++----------------
 2 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/rdedup/patches/bindgen-cross.patch

diff --git a/srcpkgs/rdedup/patches/bindgen-cross.patch b/srcpkgs/rdedup/patches/bindgen-cross.patch
deleted file mode 100644
index 7eab10fd3d56..000000000000
--- a/srcpkgs/rdedup/patches/bindgen-cross.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
-https://github.com/jnbr/rust-bindgen/tree/0.37.4-clang_args
-
---- a/Cargo.toml	2019-06-15 13:18:05.509893680 +0200
-+++ b/Cargo.toml	2019-06-15 13:19:48.854887006 +0200
-@@ -53,3 +53,6 @@
- slog-term = "2"
- slog-async = "2"
- url = "1"
-+
-+[patch.crates-io]
-+bindgen = {git = 'https://github.com/jnbr/rust-bindgen', rev = '4afb05213b3e7e0ec928b84ea85d9f2b99477586'}
diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index c392e3c0e2fc..6bd71cacfc46 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,25 +1,14 @@
 # Template file for 'rdedup'
 pkgname=rdedup
-version=3.1.1
-revision=6
-wrksrc=rdedup-rdedup-v${version}
+version=3.2.1
+revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="pkg-config clang"
 makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/dpc/rdedup"
-distfiles="https://github.com/dpc/rdedup/archive/rdedup-v${version}.tar.gz"
-checksum=5e7c09c40897cd2f2635e8c213c2ff0f5c4d7ceccbd22980cd4cb0a16f3dfc28
-
-if [ "$CROSS_BUILD" ]; then
-	export HOST_CC="$BUILD_CC"
-	export HOST_CFLAGS="$BUILD_CFLAGS"
-	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE}"
-fi
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-	cargo update --package openssl --precise 0.10.22
-}
+distfiles="https://github.com/dpc/rdedup/archive/v${version}.tar.gz"
+checksum=023b5576f30ebf75c1740dd244ac13b6ef3ad7f6d4a6ab6654e12130201eb923

From ac2a2fbac4cfc803c762b33c2ad211d496e0ff31 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Mar 2022 20:54:55 -0400
Subject: [PATCH 0229/2561] pijul: remove unnecessary bindgen workarounds

---
 srcpkgs/pijul/patches/bindgen.patch | 3 +--
 srcpkgs/pijul/template              | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
index 2457f1434d94..04ccc8381aae 100644
--- a/srcpkgs/pijul/patches/bindgen.patch
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -1,10 +1,9 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -133,3 +133,7 @@
+@@ -133,3 +133,6 @@
  version = "2.0"
  [target."cfg(unix)".dependencies.tokio-uds]
  version = "0.2"
 +
 +[patch.crates-io]
-+"bindgen" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"}
 +"sequoia-rfc2822" = {path = '/builddir/sequoia-v0.9.0/rfc2822'}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 40df186b9387..581d77789c9c 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,8 +1,9 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=4
+revision=5
 build_style=cargo
+build_helper=rust
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
 makedepends="libsodium-devel openssl-devel nettle-devel"
@@ -15,12 +16,6 @@ distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${ver
 checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889
  71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b"
 
-if [ "$CROSS_BUILD" ]; then
-	export HOST_CC="$BUILD_CC"
-	export HOST_CFLAGS="$BUILD_CFLAGS"
-	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE"
-fi
-
 # We only want to install the binary, so don't run cargo install
 do_install() {
 	vbin target/${RUST_TARGET}/release/pijul

From b05d4de88c7029b63f2db950e6062d5ca595768b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 15 Mar 2022 16:19:41 +0100
Subject: [PATCH 0230/2561] less: use last stable release for update-check.

---
 srcpkgs/less/update | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/less/update b/srcpkgs/less/update
index 8ccb86344234..50cae37e4fa6 100644
--- a/srcpkgs/less/update
+++ b/srcpkgs/less/update
@@ -1 +1,2 @@
-site="${homepage}/download.html"
+site='https://greenwoodsoftware.com/less/release.txt'
+pattern='\d+'

From 45a3f301b15cfd156c75db4dd13e9aaed7d72922 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 3 Mar 2022 02:20:38 -0500
Subject: [PATCH 0231/2561] void-artwork: update to 20220303.

Adds an svg version of the logo, a script to generate icons from it,
and generated icon files for the logo (with and without the VOID text)
at various sizes, which are installed to the hicolor (fallback) icon
theme.

The logo files are pre-generated to avoid makedep on librsvg-utils,
and they are small enough and change so rarely that it is not a big
deal to include them in git.

The source svg is slightly different than the one on alpha.de; it has
a small white border added to help with legibility on dark backgrounds.

This is a follow-up to #35604
---
 srcpkgs/void-artwork/files/generate-icons.sh  |  29 ++++++++
 .../files/icons/void-logo-128.png             | Bin 0 -> 8406 bytes
 .../void-artwork/files/icons/void-logo-16.png | Bin 0 -> 655 bytes
 .../void-artwork/files/icons/void-logo-22.png | Bin 0 -> 932 bytes
 .../files/icons/void-logo-256.png             | Bin 0 -> 18160 bytes
 .../void-artwork/files/icons/void-logo-32.png | Bin 0 -> 1287 bytes
 .../void-artwork/files/icons/void-logo-48.png | Bin 0 -> 1864 bytes
 .../files/icons/void-logo-512.png             | Bin 0 -> 39176 bytes
 .../void-artwork/files/icons/void-logo-64.png | Bin 0 -> 4013 bytes
 .../files/icons/void-logo-notext-128.png      | Bin 0 -> 5156 bytes
 .../files/icons/void-logo-notext-16.png       | Bin 0 -> 655 bytes
 .../files/icons/void-logo-notext-22.png       | Bin 0 -> 932 bytes
 .../files/icons/void-logo-notext-256.png      | Bin 0 -> 10660 bytes
 .../files/icons/void-logo-notext-32.png       | Bin 0 -> 1287 bytes
 .../files/icons/void-logo-notext-48.png       | Bin 0 -> 1864 bytes
 .../files/icons/void-logo-notext-512.png      | Bin 0 -> 22310 bytes
 .../files/icons/void-logo-notext-64.png       | Bin 0 -> 2534 bytes
 .../files/icons/void-logo-notext.svg          |   8 +++
 .../void-artwork/files/icons/void-logo.svg    |  19 ++++++
 srcpkgs/void-artwork/files/void-logo.svg      |  64 ++++++++++++++++++
 srcpkgs/void-artwork/template                 |  13 +++-
 21 files changed, 130 insertions(+), 3 deletions(-)
 create mode 100755 srcpkgs/void-artwork/files/generate-icons.sh
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-128.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-16.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-22.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-256.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-32.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-48.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-512.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-64.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-128.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-16.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-22.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-256.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-32.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-48.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-512.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-64.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext.svg
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo.svg
 create mode 100644 srcpkgs/void-artwork/files/void-logo.svg

diff --git a/srcpkgs/void-artwork/files/generate-icons.sh b/srcpkgs/void-artwork/files/generate-icons.sh
new file mode 100755
index 000000000000..6c03e973acd3
--- /dev/null
+++ b/srcpkgs/void-artwork/files/generate-icons.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# regenerates the files in icons/ from void-logo.svg
+# run with ./generate-icons.sh
+# only needed when the logo changes
+
+if ! command -v rsvg-convert >/dev/null; then
+    echo "Please install librsvg-utils"
+    exit 1
+fi
+
+[ -d "./icons" ] && rm -r ./icons
+mkdir ./icons
+
+RESOLUTIONS="16 22 32 48 64 128 256 512"
+
+for res in $RESOLUTIONS; do
+	# at low resolutions, the text is too small to read, so the text is left out
+	if [ "$res" -lt 64 ]; then
+		rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -i circlearcs -o ./icons/void-logo-$res.png
+	else
+		rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -o ./icons/void-logo-$res.png
+	fi
+	rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -i circlearcs -o ./icons/void-logo-notext-$res.png
+done
+
+# scalable
+rsvg-convert void-logo.svg --format svg -o ./icons/void-logo.svg
+rsvg-convert void-logo.svg --format svg -i circlearcs -o ./icons/void-logo-notext.svg
+
diff --git a/srcpkgs/void-artwork/files/icons/void-logo-128.png b/srcpkgs/void-artwork/files/icons/void-logo-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..adf9a1f1a647b8b71a967c35364e85972ad14534
GIT binary patch
literal 8406
zcmZu%WmuHY*WRThL_q1(Md=cxTb33UmhLWTSXi0`R2ozo1e7l6&Q&Crlx~n%x;x+f
zy`TTrb3HR3p1IDPIdkSd=ef^BYN#s`6Veg_003fTB`_4zBmR5w@i1+tlm!aY;aRFG
zf&mZzJ>T03699nc0A;YOw$Hb{Ogo=(ok?V{9e>)X0<E%={R;w|w**Q8usr;7&}OK<
zE^I=_Ob^yY*qq$;iH*{nyR?xDbdIG2$$OS3_xv*s{>vYE7imog;c3qWuOI{jUzbh>
z!Ut{-nuI-v=RNjC(Qlury%`1n&nDO{?+2ZR8C!k;qFl!4d;S>(?j`UZ0X(diG6f_W
znsp(Smq{y0l(7GT^A0`gA3To2H39kB;^x#NbepzsXsifTh+thdU5R?hT85e`1~xQ0
z-5fD2%q%qoH8YP9i}LZ&(L{ckjCyUHcx^ye64wBUz{8`;R^zkso{&1Eig{ARu485J
zWTbHw;rB!jARd-5Rws%BHM_BfcB?*oiTetdJcTMZ(Zev15sxJFHWdGe<i)f!wJZF<
zN<VQ$)x0V~Tl{A=s+Xb=pi&%%+(SASMne?oC4CdWjfs*cQJ746`!xGLr6pC-b|aU)
zmu1B<00gjrjCdU7=+~k&0Qrf4Tm)-B2daFqfAF8%qD2%cny%RaAy1R@Hpiak?^7m7
z_5yMTdCO^`Z9k6D@vqfY-NP#EXzScTaZJSfn3@nxyf?%$&70cTEAkfmtw4xg2n3v0
z9g^XtO#2gyEnfjxvA%(>U-Gx+WhH_L!4jN6NLIx8mpuZK$I^JMI0Iy4o^lO40koNz
z!D83~gsMc3_IjsfU4mTXg!^9Hw%%^e7YMw#e_@2^i0s|?<T5t%h89;tg$7~AS<0C`
zpVWjB6c8ROF1`H3!Y}f5$XP67fq35&VF!NM@na4r77R>;E+8P)5L?#U<a;`b2@2wc
zJilKPT}e;4#Yq_$Gnqlp<gMl98j62W$goprIhQQfogsCnm|5fAz&v?~eg*w9eg=>2
z>s&tKKZKCI7SuL^5$hZoe4A|9Jb^WLk0hcxBY!{RT56tu#VT#bQTdLYVp7A|;gAf#
zWow*2zRi8p@WF1~Mi3*6E|ipxMl}F+Nl!-e0yM`HOh-$gQtVAw`gF}yQUyRd$rWR|
z=TFhJY3xG&MJJ_ZUm+LZra++UJk#;&-+Qf4TdBcDq5D~mu+kN8G6SEcZD(ylfZm1D
z^3IkjwC80)ct%ek=y-I!sAiNMVBF@21>lAA;=vfrkNJG&IY4F;@W5Co5P7AtytNV8
z5H5`Isd?i4#%&X_s@ofd1hU*drMjy0zx~iCR8(=%dl91#6)C*fPw}*APd|~JwXxXO
z5(3USLn25w>69YO@G+*j^uJjxflG#Vb)u==$fMEmWGMLZ$1d?Ani1NFpF%p}RLSID
z^-_BxL!W))kn-vdS@R%WqXR<=^FUOYC;-{j&-QJHaY8^nyKJQyAGe&*(@Cy(O-;?t
zSjpIqh(Qq4+^Vfz21HqyAghpYl)kGqQyzZuBq1dmZlM0MGyUUep<FgSnKJnot20f-
zTs=UM34t+;r`BaLy?({{=;&|;F90Wi88oBrA}6psjNDt-S#SGWGbZYD`&=PmG;P9I
z#@L#k!N|*)_;E2wv_%^m0?NTC!VT)lWILgMHL?W*hbumt15NI3Y}e!aXn}=9OWVa}
z{{mB?Hf8Cbvogz<vfDZq$z@5ey?0el5F5Nvz1nCLoL{Aw@fAhBqvT`8LK9fCEU3CC
zvU-j^U-w{mk!cZBgloEQ8eRFVY!9x>AXHx{c=*m&=gQ2Re)dOcMa^SjJ>gF<I?HoD
zpU2O>tPdsbX=D7o30TY<d=(^tOw2eyP3#zdE5|`T0Ey&Zb{Tju$g+D8AIh4_nl@m(
zO+(jU<5Ua-7Mn}O!Q~M!(l28}Uw3w&r8<<tons&~H6IftjeO2ZMSm#NIOKcv!U#bg
zGGIm*u1pg1Ouur1BNE>L`-UGnWU^%H6|2@O%75eY!?7wvw93a6FyPmaQ~fnIIPk$B
zP<HEpv00g+c?zX8qOYmq^@uW$LCvv+(<(&^PUJ@=+1X4Y;7=`a9o36x*9+Ug=UZJu
zwTl#<0HNnjD|Hp<Pw4};g>g8s6s1N!@za!5oc?tOAESr59I9hkn8ly$jQ|e}S3&gM
z>=@i>KGN9#a*t}LXxT*fwFnE`mCpR9e$qt614-<}f}=H9<4;PU*s1J64m^Dqb9g`N
zeNMrjM?dy`!ikvhx>+X)Hqb96$@WqswS1GIYy3(@gWy*5&GXZxwz&%h)*(8l28P*B
zZzW3;J>c5O0)}4bjnhnqdd683blBw9^FP)?yd5e9*aB|B_A;9(l9v9@)eSu;k|^DG
z$E*03T@-CZ^8hOB42PGYiA;hiqK;yXhLbq9=9boOYrG6b;;zeca33Zld8u&Sf`}N_
z{O9CMvWA;OU<P4koqQ{1s1EXH6}P3pZ|u%YkU+=F>~FW<*vvzjJ?M21J?)ogtSy9D
zbu5jB1z}jr!wYj>700j>SkyqE;yF-aCE{_*f6$d}<aRuJ=5U^^oz);8Q)4tj5gOsd
z-$<La&p5WgeymQJl~+_&)Hd<dfhsNr056-bT3p%8TwBO6_<U@|_T>FB#UCRK&SrqZ
zm@`4Um{@>_JWp<L40|v5cD~-S$IpM~t_{fJhX-rLGjH$wy^U<P-!l)a!wD#3qQEvl
zGMYmI@!X>#4A{@y&_bD0=r#0aNo<__XS;P<vL*hYR_OL?|KFo~bsCT7Qv%ukZ5Gpu
zM?Va0GGa&KJKeX{K$_lHZctKV%>!fDI5-KpIJk3as}s|Cmvj!IQZlI8P1`U1uCt&j
z+;|&66!_0p789sinf*+;<<L9foZfpt%+yq82!q73m^CmX4xG7ND=>Dho;!N37q*z>
z9;lceQpiB*O_m51#vVpfq2U9)gUi!>R$ko<%`MH3K0W#fablSDvqV6UJo)29pz0#V
z^a~Fd_%!pT=3<B8?3IYeKYWbr)y5b?K1<bW9`We=Aup5i{IrH8I0)K6(TA4^T|p{h
zVs<CodiQz7bBO0m)HdN02I)UPR>Luodn<KBY(+JH9BTempe+XcQjT4)!&!e${BK-=
z=t~ssTj}1cY9U^%B<Lt>^l@&Dy2!mrOuH>9GUEx67*W1<aQ=9GCXIM_#dQ7ef+6Yb
z)=&vuC!=3OF`1o-&<^(eYw@aLz*sJGj!rDRx-C&BSrcmd)MZ$`Kg$GJIk+Xh%jV5<
zq`7BLLtmu|o)qI6h=RV?uB-A>J|0?IuFZ8&@8kWR2->r!?GsN3D~+8{#aK$@M=>Cx
z*OVlzr<?SFG~6bWO#<j0gXOnlG2|sf6l>$sFmVijjmLTlylkwuD<f)Ll%Y@F>c{62
zU6PwjCqIsRZ*^wm=w0s4%~sV1)PKfG2&uH~p}n{#xa-hRA*T8wIC*Y@4Vz@^#<}GH
zIZQGrn>}adcv+H?o2GG0cx=DWdiFAZyo-`tUf=j%Lv}|IMgDlaY6=fST2fNJFa34E
z8GJ2;f^3?F9xlzBLB|Oi$d-`9^|`5g`lXY~Ux9ssBDKbOuAZ^DxH$D4i-e?Pnuxn)
zNd!z!r4F|nTR15(5vH!D=4DW2f$Ph<$8-#wmza-mqEJR{CL251KRG8VFe?mV1?O?P
zU6h-&+&8%_bjAM~Rs=V$CmX5U-QMOPFp`Vo^9l+qg)(Ncsu*nQga7>9IeS^F-neOJ
zYHIrO<;#&`t-@8LBeDf#i9?#ur~Q<id@U*4)xZ1cu&vZ-pxa|HsyW-Q=iIZ$lX-Sf
z`8BMBR4;J4$M$$}F^S~qXNzB<xPVQVSb<tb_js|^6tKtB)6+FwI=J0s<@ZOYnQGkJ
z(I(TTLFRPNxxj`|N0|yDshZ~Z6@A0Q2Xpn#Ms1S^Lt|qJxr*`WSXfwi^r9XwMTLZP
z`%$RO+5K7jrFKcz_A3@<g&2Lj7_u)<Gt~=kme%?b_MYl{H>d9YtQTMNc3EIt4n1Yl
z4IfT43%Xj*AIcQZ-nuO+VoT;V8^Y)mzqYn^>bLnL+{I<0B+2D?t<Pz?^4C@-$>)U3
z&J3-kwVMZ%#u^pzbOl*u*#}Y24g387M9Y42Gy;LB2vM%F9c(VkB&mcSm@355c7-zq
ziI86k>lYvnkB^VB_h#!(28QYbZ4Ne8mH$30#6*{#GpwVYF)>#;-zt$AJht1o_D7*m
zO997ytZjCK>0Y)#VV8Lk+u<yei86zlTZq)v%hReJ#?GwKep4`O>+vs6a6`Nl`p$N7
zu<_)RxTxQ0k&q~8ccv!1v9WQqtE($ICnsl~knmfF?r7*QbMu}!hCkiiEL-wxsnG3A
zyDZ<0zK**+S0SQOE}qri<Tr+AaZ|=DVqApgL<ne!=-~k|ols2k$&mO=#}a?e<;~5>
zqW{5bi{Br@C@3giB(SIv-d(O5PQ}>SkCx!(y3oj@>bZ}OPDIfHH8bz_tBf~>(;(d;
zF=96CHUDmKmjtdpdMft0c3kUvqOoHbCDSol4$4%-OW#iy3^7T(=Mz?I-O9<<(b26E
z@M6twd!S*-tw;VSDdAWQx^Z3%ez^00A5>p~(V^{PC|!`#?O?GjolaLyq5p{?EL!$p
z!w_8qTnxJOy<UsxCCDFd+}_?MF~#gNGR4%7AffM=<S}MF|4m2F$apXB>w6XP+N%4K
z%b*&pWn?Md&42c@n0lUPkCki^6jS|`f6?!rTa6#?v={>2{wBW?PgE!V3m|d5nF}~b
zeOHj?+HqIE;gR#~{>=*H!>4f5<Fww%FJ&fG$#*SvkRDVrH@4E>ko7Xdim8t4-$cCj
zlx{*gHWb#*<F;dQ_LPKf8tj6u7yAoD{^z?imzV+O{Aq`WhvpjtX<VkQA_5W;w-A+L
zsfGpbjE>165`4ntNWHA0x)aA<>HI)ic5e3kveOImcoQSI1FhtHB_$<uBm!uFIA~Z3
zqD%eqqs__k0Q}o<JX3D_RC&%)zPh?vL*-+3TR^s;_wICOoBu_<vIcS5j<=?XDO_dV
zyu&tiaHAZvrt?34{(ysS2LC}uYV08O&U4+&@e=$Huoy6*0Fu3UoZ;F&I{(QX9@{y!
zq&HSmyaN?PNirD)-#uLRNCOsu_paSBG(t%XUZ^6mY|(G-sR>Qq`G4;gbacQR;I*r*
zvBEiKd@Fg1w4H4!CcYHi*KW%)!yONI2im&2Ia51nLe8{~Q{{uvk&#WB;C;Z?^Zf<?
z)mn$KH&aZsjQ!ug%s#ddoe|xgExF_BT((7`<}43Hg4RTggq<dgg(M`t8M!p&Q}-@b
zTF8~@W&mY&ynjX>7+%c2pMcb(KjS}nq5wV~T0#a-R+x2|bcT~O7(ADm?3UC{GWK)y
zbn+MDoxdRYnveiQwZl3;5lcMWo=CSeHp0lh9F)bkUtX@pYnlAK^YK6Znd?647@eel
zJ7JkI@MqM$;{XtJ`R`H2V<8ghTRyxn3m&(J4A)uj-PhZb&B1p`6iH>K)w3*3fXK*5
zK+CWu!14BKtfKvz<NT$|8yy<aT5mM&fnHK#%~>#N=1Pq)X`LbhKlpCPY^K&hOWD%$
zUm(aMP>rn#S~Arhc=MEs*R-t3l$VJYFNXU2)=c$ZeqHYRJ*u&MJ1T%ml#0^*D+5na
z2n4d<c47Lgl0`tk6Tv-ZAfo{Y#5*rOY0`<-(}Zg07`PD2g+Ia7cbDaj?j<20Am~s}
zHP5cu`Z9P^#Kt9g0w3Cc7ZmtFr=Dl<wh&t`%%D9019}4nt9yG3n&6ErR?C4_-xH_n
zk56bMafIQ*YQyEX4zJepXNmdz^dzwrpWvAH39A;BjbvRv?6(}S@bS5kx$O+32@LOg
z)bd#l;GcR;>n1|Eu2kl*uAKghYJ3)<WS7TK=@WL|_Dhh9%WV62&1*U}dX<^Ds+_0=
z=`yREl+q%engEBvRimTZ-6`rf_9KMmpCgR9(5Ub0s5<dSk?Pdmt9)w1x_WwZtq3|1
z%jfrlx5ee<wp+rgf+=HLFp1L<Ilu`K5s~ZY`%ZwHC)}!+SZ+JOWi>t4nyG%l=K_gM
zLP|~Ds06O&DX|1qtFxc&-CZmN=W_c`(#G9;BU)>jwJDA2)yuP7{={#~*@x>!$dXjH
zP<FJ`*H44Qymr8DC+2FyJU1>hg~#d+$$P6iotGVPkDjlmkQ1sq3NOyPbrNHcxE%Ky
z6M?4c8uf3^gzmyGdU~b`C+!Ao1&E{!zZ=*R4`v9Xo6uRMfUJ+Rcfc&)^BFs}_V(F&
z9lP9j8v>b3(?X$A7fVW*`2mSKx`_3~b|Mt}x}m1#iXAE?>CGGEG0%0I^#I8O$3YKy
zR*B2gFgr2JBfZ(Fmu}sMCn2NutrrXMr3upteCD3GvXdqX>GJ2|sCu&w(+c#-uyhY5
z@MeQNNZ)G$$Y!3Alb>eyFa^&SsJwS`_j=*t18Ih|K7lVSVZZP=h9K7Yd!jAgP(N0n
zqT2g1T*Y81D0#7B!~{*PxZCeJx`<(|f`9;XLe9(rl3JcK7>Kz(+esn7;Wn&gTRvQg
z&hjx!ESGF~N~Yr<8aZ(KPAc$1YmnbD^|cjV*dvmAGL(se%mSmV7Aqvnn3B@gNXWAz
z!rX5un3>z(tMNH**B7lGAkVBLC<i8HqVVor%tmwiBcX~j&xF1|tOo&akD+^|7a0eQ
zSM+l?5F+R3pz5shc5Df!(iQZzQF+DLiB)*~(d<~oOf5C8&)wOS@8wFkF!0%MR*<8K
ztszO2t>neLr&cXJd8E2xsnk&|-86C2hj<xH0|NQ=SF$R_GGtBDA6hL>H%DI^P5~eM
z&dpBS%Z2wD(F!VhdU~F>o9;qoi^$P;&f!Ak<>l}EU{AvoiKR{!S7JJymRe1;d=U{5
z_}y^~MmTHvd3m)9tp+U@wG9=*uex59nR!{X%DZd6rnwPNGDx=6Li_vp9F8h7y$-s)
z^g^DY%|eU{sXjydm+apZz_-WQ-Im%_my)+Bb|Jsj?hc7b%4#&n4t&1x{1lHN{X%rk
zr&4^m+7o{e5g$KgGGw(R^xE0SydS&v{nYli3u&J-Y~A}>Xw5eaP7B!dCr*V(2`|93
zmN0=~vWd7ZL@Mx_558~wZ*^4~i?Mb3%*)HrA7hp}rI`GSwp>9kDdhRUn@a2DR{g-1
z&fmXHAO1!29-hL~No|}zD110ZCO-198RDdZ1z7~WU`N%WbB<3>*RuTgUt>9rjg8#|
zJ+uwFT&us3lFITu+4%DH>sJOQCTRume$)8EN5eLeMFvbp)G1&$6l2_Rf3ecXj10dV
z4J2@~nxnPw?>43O8Iz|#_6uM@?QEgi289igJR^^$;w>mC=`Rp_&)n$CcVzN!OFWO4
zVBr~$!<q5f2}en3ZALDW@7fpIPRK)(C)#v!{x>EE6}Y}0ofldW!ni5i7;Fouk<Zf=
z_+hK4kw5+!lT~FywX}#I4Buqr^g{zWu|^$gJF;U<(Z8u6tyae#ClRDyRGT|F@;_li
zFsb>esM|8)e!N)qU?mB<+dnTK)Ynx=oT(n(5HB3^B7{mL(l|<sRo$d=;`rjcP^(m(
zN+ib5*VlbeaLT&5vGEj7!PeS30Cu=6t9C{mt1x*`BRQgrw!F#?eH)5TL~NyhVIi-7
zjC-3Ss6J8<f#Zm^Ua@p}-uWv<1wTJY(e;w3vzbMb10*0gIrkKQ<L{VmPsw(PUIP3T
z-F7E8J#q<^jrol!#c;V0EHslJIkwUJ<153kH?@tk59|WMCqKAv7+O5VFr;LbyJQFH
z7wI|ZP{9Zv89P)ZaI{IsKb*q+>fGz`PC86nqYx`XiHs^}g(^Z@g#p9cJmj4DPqm0Y
zC4;?wdn>oO&<_7tx_CxOcJ-qiEpN?4X?BaDo7*;GGBhzf55VckR6Q%dy$yOY4(&0W
zRG0lNG+`kTYC=zGD-RCxm}q&Tww;<dCslnXe|Nq2S^1{-{H52selN_2iN9BdRckst
zTkm7H-6KX28VEBdZo3++h~8hM9mujufb;o<>JN>826q}{!V>~960$2DaC3J<)Pt|m
z)C)ng7?TfpANccjNdFmiJ#c|c<k$3Ag(#MfPIqD9A1{3_m-qHFUx9?gVY3-8tZf?V
zXWJ0GUBktWY;4@LrHOxShbJN;=&8Q!+_m1iyxUH#4Ro9Oh2h**Ee?xn%EEtzZ64a=
z!5Q8`d-C>zOoN28_9~XS5}~h?CX$5h*6c4xTFG@^O$BNDQl5Vb=cOMnzAy`#t)3nF
zN6ArIdTHCq%M(l^aV|=)<mtf<UK7tBzW^=*!?0ShS-c(QY^>dV-IXjHUf59BXwz^T
zsfH~g3R_r%vVtysuGfHq1R&i>#ZY`s-a-a7&(~=T9oRYY8bp=M!hq>CE<^V9oJ28?
zi?YJsacJ@SY5q;(fxyF86Z6tV!GU&w2E6aJJzqfu6zGD8zCT|<wyu)iern?7+&|gW
zOw*gS>FX$bn*3kq^h6kcmse}e=AIVBjfhYNZ;+^04u@SjmBi=_m^8~END`qKUQGlM
z!A3U242lM?5tF6a2DVuQx<Ufs?MX+95Js=Y6QJRzTAWl@2s+Hl;P(dc{`?&K7G!E~
zuD|<kZnepe|KngpWQ3^go<s}ThoTWS#PDvCMFVD!&npq1mzwL{)#G{^f-gy~^5us)
z^J{&5jDJP+%97EHNY>v}CI2|*l+`z<Uff@#>k3gVWEdpBzW%9Pmu=>_4pV+HMm0E@
zk>uMB<>+O9OZOT>C4L4jST)<tmEyeSwnRQXa21Z@K>i;3`R^Pa5mSDnOzbo~-*dah
zWC)Pv$afl+aQ|qb6B@E$<-|mge)WdASD20AvV17q@z)F7%GowEhHPy(AWZkZ<=Q{_
zKKbvnR97|1qwtLZrIGR$HOEj))uGZj2|Xh9m*xU@V25#G%MF%lMU+lU9t97&O(ec)
zSO5eBOt6L6sC{=3!#^itk>I-}J&ert5-$UQpxhwddFg=GF&;2q+F<MPx|7iUQjqvz
z612qS*&@Y|!I*5O%I6Ul;Bus@sPA-W&Hn2vNKaAfnVi@ZLw{ZphZO}cS8CVSpMAmr
z)ry>tE6CY`u%gdw7zdlgnhl(H{KZaae#YPC`gg=#!4;1FxiHW_Fee?*A3PP1ZLK!$
z^K<NjFmx#W36DN?^R~&>cyj`Q&$s~|XW@eNOOW_oTfkC_;~}+OBo3EjsBdY<da<u-
zt%wP<QHA|%oGH-6ZIbec{?+DeJtrexd>ZJVPtHbq^S4*{Tv_5O#S6m$Qn??KRr8!)
zjr3%9#J5K??mhK3Kl1Q8KPod}%fGg4GPsp2Wsay>tJl)!87MC)&v6Y{x|5+Ib2s#>
zx^9#ZWACW7Uk|G(+=8Uo$N#DNDCNG;7<}nN@sH}#Y+2r+5tVC&Nbw+2k27g=Oo-VN
zkZ5Sf$idM5n1TUtNcZ}>S?YdkFYU%OXuC$3uk`vT#tZJX3Xu%wE4c7tk%naRhHQay
zBtttfMH)#&4-qP=C#cE0YX3%!vxr}JjJN%fR`<LflL{%}hX^GT7k42oGs5rKLH7ZJ
z@J=bSz0W^N)aQ+fW8Uo!tF@Ig|Ka7MK#AUm&bG$x$+A-bV}ScZQb}X$H-nr8)q-jL
z+nx&(JE{cR(SDi$43QlH<v2@{uQAHob)QXN{~CeMkZVc(w~1uRd(#CIi<EG6u}TqY
zmQ8i40xHF}`cGw9fnm}8Dt={<8?^=uAL?yeFyY63nv{ogRsb+3I4KdLNyxrAFdD44
zna&CxF+CNdvSgkeY4V~sF>EMQJ7H^GkUXjM*<!>w4tctRdfbRLh|u6FpLg$C&tG{I
zXIG8kgT1Zytu9tz83i?*@&wyDKxFk>o>DHe^FM_ZzIjaW`MVj@+qQtn$M4nkW$+nY
z_I;@5k6<-8iL`1gDxCejyxjk+HKk?>Jw$bOeT@GleaAT~2beeYzUZjk%;=H6Pm#K*
z)hgUjfLQ5ap-mi2h(O1f4LmS$oxe*QH3(PGBaFQ(UqkU@jek$1)iKq%>QW_II(sL%
z86c-=#ZoK>FPIN7%Q8jt>x1b#+)>KLy0`#TI?|s1{%}_K;fa#>?+H)6r@F6tF$D_R
zL73YN1we*<Vzg`^8eMVqqYHEDw+HpdsU4ggL-8~LmD2=>VYu}^o!DKe=y=LZ<7<ye
zrICplGR1li1IiF8Iq)%Jh2ZDEtiXeIw3>;baPygFn}u#vR7sS~_g{hZv`#o8botuS
z`Qx`t4P{Z6u=S}#?ZgR_O~OCJW8se!)$_~(;unw$pz7iubK`8}7+uyMwWgXGo;JiM
zbHfa(0t0_;OmY&Ctu*sYd0c$1QowlR6e3uxGZRIFDKZxQ@-th$5wAJFNN=;2dgNKl
zYTy(Db9^=|IkoUMW29FHX{{J4vK^*S2yokYbL5ggK8~STnIBSavHj!UqZ-EaH^=!u
zNwda+s+@ZQ_31@2ll6b6y-~p}l4Z96xID_5Pp%U7lkJB%q3jPc$6k?<l{;tmPD?RI
z#M-w#LUm1N&(Jmciel=n8e!0W+(rr?P{pA(dZI<B+S-x7M_pW)<a1jszS9sQPLgK6
ziNpf<s}D(sj89?zJN=>@A6JCVQT>N_B6RhFUfH$X1MOGOI3JelOX!rZqlB}NEAH-m
z1O8`ND@k}ug{o*fdZJ0S5~YQp9cn%cpyw08Otp3%6X=ARMh%s{IVP-IBGRA|8zrNl
zS7@o!g*nm4S<c1bT;b6pzb3DXbESdHl{_~nN&)EH#3(#G3uW24hSn0$ac>`eHDujw
zZOy$Jg4Wd5eP>`Jx~`L?t*tXTZ-Tg`sw~Ca4ha75E`V%B&)@{2FyoOFqbbgfAoDnH
z1nGke2usdkPNIKpe>)j3&r-RoUK{*Ga9Vl?e9uSdCZ)p8^c+w1{j~@eoE!&xaWaL9
z)I6{irw9;*z*^?}Y!jG|J-4mWH2c5H|Nnn4AU5&g(f4(#^)Ned4@MP$vb;LD{H=ND
F{{h|)kP-j@

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-16.png b/srcpkgs/void-artwork/files/icons/void-logo-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bdb5f3314c1c012d5568cc2f3c8868ccd225482
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0z^qfK~y-6b&}6ZR8bViKj*&3fJ8!}f{PdzEkaAB!YHL2OU>=1lQ5N;
z;3nGm7rflNYGYBj(TL|X%Y>3<l629=iJWN_87)N9%|M9u-a9RPqtk=Ft9$SHe$V}$
zA3_A~2lt#2Gp?dHP~t!Utc%E^@yzpNBDq%0mx%bbh`a<$G;s(YVOme>M5-mVPn1|6
z)W1f^04TbQ@DzBW=n~)q7Rp1}kp;Kt#sF-9KIi`MK24cKBH`t7x%8&lbcU}DfBnbZ
zlG`lE4A24em>n|(Jd&Hvy;j9q1u}cY(|O17{$n3^#jO!f@?jERjI`N`84pWI)$rpn
zPy)y<XB)i0y8~bwdp6mb+)7<Z?Pfk^9%!JS0ZRiNGax<T2P+HC%%Rx#{eq}WiOQ7k
z`-SXswgF(UYp{s00-&P3Mxp7TX?!_swddaj8mrtlR@`tvE&zy1+z5C80)GzUMm1W$
zs02qBVwIBteulEvO58T~EU;0f-%xa}%0X*b!ny(8g~>VxoY7{0WM^{AvaEJNCIp$V
zEUP_rHT4S)#tB>okU-u`pEGt=2nv7&`l+_|clZ3n{BE>_3Uaxey=`yLq1+N9ZRV}>
zVhwaUbkR{RAItYoj<iID1I}o3x8vA}M8d1{>e8y39_$({3c!#v6f1N54e0fd?*l7>
z6aq9R&>GryqswLil=3D2eD~>Bd&Euv7sB^Aa7o}Ia4O`Vu_>3n<yVVG1Bsx2a->B9
pGp5kX!HyW<JFsZrS!LNO_zMBG;mT&TE3N<l002ovPDHLkV1jLwGlT#D

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-22.png b/srcpkgs/void-artwork/files/icons/void-logo-22.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc749c3b63fc6170b5f2e183b3c2dcdc72c204b8
GIT binary patch
literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x16fH#K~y-6m6cCuR96(nf9Jku5`r<bR@*o&G3cViO+gpMc8CFEklJQ3
z=0P$bjY=(rZVIKOq%Z|bgPTI3B8Z08mI-eN_@@@?wA4gXT*PJU%0$t`rUZ-Ww4IsE
zd#8&eGdGV>)3dtgJKz28ckbhzD?BDHT))sz&_a(OohUnjO@IRT75z;_E*2@CPsWpf
zR@*O8z@PMMc*uvM@)6MRxPzDD5pY6X{leSr{c9IYlo`wi&l@#I*B}be2z(}sGUos4
z$DZgIU}SuxISj&IfEHjLVN6tRqZBc;sA>mGS7XP0b@f$mw>MK3-v8zMwZTGe^Ob?2
zdlB&tb@jVwo4)Tm(j-ZgL7=HzP$qI=F5cJPmluG}PY-{B>d^pc|0#8LY7JKaK>B)m
ziyOF?5nd^4tM+?s-k|JHB{ziB%mC|wJC1Ai{4j9l?*9@G-J8G*%h02u6kFVo+FsE0
z%iz`^2=)P|?ajmE!`qyavlqY^lTE}E<*s^O@0s<-{C+`(mZ8RVx~|KBc32wo8yf!p
z))w_g{Uc7`Od^~@I2CF*nYotfTV?xq&H?i)si?eVfSnd)Eb~F8{Go=&hqsByS3s@B
zsY5yGkNPbufaiGukS#NWR->?aC0F#eZNv@Sj)-Vk+=$s5!KSTs%m@UPgUq7MR8_4a
zx?&<)tFhK%KxQk#VYAIN#$<tf72Uk5{v0`IyOsW7fLoQK?CbWsos~QhPfQ`a7ZJ~k
z%DY~hS8n~%#HD&c;udGZAbQaPHZ9z0NZL-i<K06>%nlVjrlQAGwe?`z!LMyj;h#bh
z*jVXYveKD4@+^c?EDaPuAB31)+0@xt))*t>Bh4D<RYkV~3mRz5{FplP5cEWaCQSyt
z+>tuGWv#-A*AjO_6Se_Uz@XRe<pf|)>g~EZ<eI{+3SA!v=HrIezs_a6OkfMWnR=(b
z$YQVKnymf%r$^H-InOzB-VU!=9-9Y_ABruOoEyN45kvDp7Gzq`8b!8)#(|BX(~j%3
zSDP)X=JA2!hhn9YbAGk+r-e?dD{c13g~$u?{lGUfc{Hv_KTFTf(_%qHPB)fvb5C?^
z#~YvbJ`)t`x)i!VUuNlw4CtI7H&ygXLF?03QzvuP_WuWs+f=9_lj|D*0000<MNUMn
GLSTY6Dah~u

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-256.png b/srcpkgs/void-artwork/files/icons/void-logo-256.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ff992021329630c281308f09bd190cab7f91572
GIT binary patch
literal 18160
zcmcG0^;=YJ)b-5J-3ZbkCEZ;^4-L`{0@5JegMyTR%1C!ehlDhY4+7FiH%NDPzQ^~w
z-ap}kA7<d1bIu)muf5m4*Pa+{O=Udn=hz?+2v1c-K^Fu918>0~OmyJI>}`oX@Pclm
zrmO&Z`uCgLUYrC1(SuYK<X-t_?q~V=ztX?GmT_Q7S_;Da1PUiqdGk&s1wWthvKr0D
z=b*j%(c8zz&`+P#Q%9#_rp8JxeN671$`K6|g0<5=G<fsixn<8(=y158+LW`E#+sB7
zbQF*@7;q%!j)wC8=VzM!oE(W1Q(>2a56f1pksVw=hoFLgCR|Cw8`t>b)|`dt!y&y_
zWU^IjUr}C5EIELB;cL)nY>hAmloTsAxbO$W7~MABIrvLBt*i)r_LIh&p>B|79^3o(
zNKGq=8a>R<8;q2=neaT&0!6Q0I{`0h6Nus?|Ez{XwsVSa|I2>1YR=-evdq{r?Edop
z(z2@jIRlNa4Y5wnLIxT7V#{v5_Kn~b>q}Y8a6(Aj>^nk;RvfDZt%bjd<jMK*uYqwK
zOD)Ub_K=ga%PtrGX;xqI8oX;fBLWvvC_?m#$99Di7i~pJg<V5d#_Hpm5b<$&NWzd?
zK}mh|yD<p18V)-*&$s$E#8|&>A%Z(;a(<l3lE)Gff`WC5Qx*_l+%_yZiM|h-f~bY-
zL!<dqu$)HeKR`w)d%uJ-da!#C5n7xHyy!0KUMJuBVv10+@TBdw>sB!n`I8aXSS-Tu
z$Pj_{fryquQ$_Z7T6rY4l~4`pwK1lr_A@y=kUV(%9fF^*3AYKI0%t-}IBp<T%-lbH
z9Id#I`}englcJPV&7UvSBTyp<iAd$V-w0ZRtuarE6Bm80q<JkdJyqz~N6dlQF%}}S
zk<7>o<ZJ3=|JM2>z0|J0g`~`W2}MW6(rg>2gzhfrD-Y5?d4GOI^kg>M%|L>&f^8^B
z%-`pM1eIWEs0-NY7>v}tzhC}dRk*~`+{`YVGpQ{97|0Mo&&c*plPD`1FRpuhwe+#%
z`8AP0!L=f$^|Z!s-vr=tS(qdGH^>!A!NgiXcL4Q>xMrZH_}9s=Eqz-Fm<-X_35?t?
z6J~0R)W1Df?&VuCUomG;=x~Gl&;!P;P>28{EyIJtxk36<FUK^CJq6F$B8wth`lk(!
zYyF9yktwH?aHC$Mmqe+-3E(0Tgvu95RUy`FAXfS!T*ZL7<wRmvWgTOpD1Lm;`}33M
zVXbm!F_^KrK`wqa|Je}s_fDb*<J_xZemA$=nUnqid4rY^^F-l6KnVKuHK+UW{2`ND
zw6fggARd$hYU%Z5<$kH@!vR~NS`lOTMH^D&+)9C+i>AW<0LRc~3FAcqi@GoMJ>}lU
zHlvK$f}H2yC3*4?T6+SJ#4*}&8<E~<FfQ6CE_F}4Y511T7gy1*ezE4gzLa-C&(`ct
z7{BW=F50w|a=dd|;aZ`CM!)+|Ev(H)DogTNHvzPyfHlcn%o~-}>kAlCd9~G+=u-C5
z3m;g%v$~-Wl8wrr++PdRn!@t=Pi;^<ebGm-eXhbm%$HN*A9S<BrEPlRYWCV0vdgl!
zz6WZrR1kr0Fg#KSS4C*L-v;5LX%pzezzg_oxTvPC2Ka?^R$;fHU1di-3h2sX)uu9l
zy~}+k7(~w|hLY}aqy^cq!Nou6vg9k|#e-BvR2}C3y1sfvDa1PmVX<cXZp$boarNo|
zg%#c!Nr>Y^K6JoKD$7N!^$-Mq0!fqUletK>ef^k;o5d{f2J3O@5qDb}{(D8`Vze09
z4vl66M#KT^zATIqZ4m7nh+51if=1bIf^?MkO{;hO4h)t;%4v^-^juM5_+^sS{T2ro
z4Wz=}3MrLUu=8OKqrUFqJ#7#OZVwidISKyn{eR#JWGDPt1mRZw2N6;beNiyEzjPy8
z%JSvC{fpgty$C{J5gALpzU=awVVH46h&nVp7&mMT>s*3S?=Z@zY~TAvBfdyE1{pQj
zel_v47OgRciJ3Y4@$NDLi+<7_h8#A`x>hW=FGX*-Zy61eqch{@%Nt>6=VQ_lK?lc-
zIa6%eKp6N0NX`{nd8|x{7ryE*n$>F49k2O3S_$)Ar>&jQKR`+%<*^1)59@$i%{L_M
z|L4-)%|Du&I!ZCDB}o?-g@(}GOu=G!>rFnuOo6?EJNydL16x_39~JrZx3BBu;uK93
z)y$jw^|R;Lx%eLskj*gwx^x8+F#VE2MWC}j!(n(FHRjX+j7f@uBixIGpble;HM{yb
zh8nyS8cil1S40VzKfKNb(mMUw+-e4OP6CQKycbG)qH_YWLvBE$i*8{>c)({+Z6!Po
z#~Ph20qe#nL9HT!-sje-X!dG@G?3bmE$;T!z(3_)JlZyBRZi|OB=GNbb!ICUjA5EU
zpF_p!CX3t(RBkdT=eY5UVrw?Iy;TM3u=$s@q@CGPRyN^q)dS{?QEkvrp;QIxAdA<~
zz-#`=dX_r1*3XX%pof+VCcvR&iFkiVHDThRjY1ZTv91H|h_<Oza^2|xf4C03Sv}Z^
zPfQ`mrp<O@KM4FjfAGqL<6qdwFMC(p&;Ku=RB{%TR7B_3GVWh`HR>-TX;Ji#WXX98
zEB)B{No8?7F_>4@cH|X2Q2&Pi6-xUUui=3h7FT2wJ8{aA3?EyTeK6tCg~blUv9qz$
zH;Se#{AY$efc;tb$7!P@6($447eR%1k{KLa=K(1kV2s#im8gKd0_ds`sX#<an$X!8
zW?oE#;tOsK_eKQz7gHbAJ?Hp(upL6U>E8`HNia0b6&b}jt_X>rwBPXl>BxU3&^I_x
zSW#Qi-Dzuz?ArfXB3&>M{Zk+L>qolmYc{w+egiRphkqC<P`+D#2V8dQFdYYmci(_?
zvLdN5-3#>7h2ea{#6|r8mJfg76p{>tHPsQ#Ernq$Sif35sj^6$R6FIk`^R*N;~2tK
zmUcTQtPc<m$glwfikUB;zw><j>-MKN4S{%U9ot`#S_#!b5ri$(?L~;sNK~uZHRq<=
zy8AD|33jwhToRQ%Gcy*L=XkHZm;X4C|9uaQP755EFasR=MP?pqa9i*;@nR&mj`{J)
zsSZI3iW>X~p0gOzxibSb!!*M)OOU5Day1z98WT(PtTAuUiNlJwesh$EsUQ^VkgL&*
zfd_;IlQL9DFhpe^p|bURI8|YYIE)qM{!VM&sak@)2*ZQ#*wBhNf!N#l#+drIsH{O~
za`viNyvd(;X~+O*bdq@7#A{$QuhR=q-`&642F#9zNxY2Au}oWhv4bf>#V2i)TNXA;
zS+w=vfv6-N5ViKDJ6eZ0AmLU<N7f2aN+|c}W^55}Nba(P3qXa4b{+AvLzK-HueIJD
z1RSuuzLUORian)K{n~-VZHy73f8U0iM<e(_8&B7mqeS$@Y*94IzMl*;i_2Xqe~x!0
zeShd(-8#TH)?)beG;aFs+b9bu9Knx2)AJNOaR$$r|3Ylk86?%L*!;p<h5jE-RrAR2
zh~Bplu4cxvC+h|lRG>e8D3}Zc0;@#A{+l|tUxZJDN>^0zs;Mr>?H^VI9zkgIMS@@s
zxQ=P!eqK<N|9yK%9^T9FvfY=HO{_ZWVKB_kRmC3znTpQQXwkD#?<<5kg2paAc-O2l
zaJgZ-nF>cuOS#_kyIY5s89zp!tuR=<a`Tjay1#YJzP^?rO-X?)fP&X+#9Nv1pDl(U
zGwhR$v+no8e?p^owr<xk2%!ip1`CB4uGB5-%TFOK=hkLVo=&+M88()4(hZ+nsE;kP
zx*bUyEx@9e4;e)Wi;>_*^f2l<EZN5G;Wo(!K1lF=E?xyHu-G9W9)@3lfqFU=A_~IA
zWZ#+3&3XkB+>Ku~mQKQ}Q+U=eJ{qo}aC>b%hq$#uJUAbgG1@|}AEwj$2s}gu;)}P2
zatrfu=a4XvEavyF)cbg*2qUa>@S`m;i|N~7{%4oX+Co(gSp6>tW<0&4ZV$qW5ORV2
z<AiSIAb4vyj^?w?)05bv;oHCANy_sRzR27iOoskQLM@OjyuJp>+k;0@%(7CCm0(Y+
z@2vO>!n4Pz+1^wH`K0R$vOv8)$`3#oPA*oQdDuVK3O$9nG9NcHUH{6Zp^q>^IY;aG
zp2~%LAcR10vpWq&%-3y<lDqg)ArEx>i2?`op1GBRw9RbgIDEg=o**yLwIt=S%<zKW
zRG`ig;B(wgA`9R`K<s_?!W=%k{`j;Cg#OEK2WWQL?FR`2tc`jg-F`kKS<%;xLE~Gy
zq^i;`765zah@hD45&n1-1na*(^zxUDu(feo1jbFVVT=)IzcN6Dy}Y0ikMkmTD*{m`
zUE;w<3?5|V9LEJrM{2NuNa7n!XhX(}DoXgAus=1_cDFocMR=wti$>WA_uYsZyZi-W
zOML+b&VBP6K_XUseR8!i)X{{W0k@`balmB2&zqn(+S@wljSS&=@q5HIejg+hsjD4Z
zac}P6`4}<J24XLgImSh17FpUfG!9m}yI{=8K%>p97;Apbk7s;lXIiwta*?T}X{|?D
zU@lUhFr_7H)B&;m&DD`eJaW+E$_Z2B{ef~o$Dkm_OJ=lUcVhFpUj;~JF38I*000+z
zyNd}&^VhU=e2g*$9%d&B^QG_#d+1@m5;TiApi`#lC@(Gg2R7%x1;AqJ4^&xl6{-I*
zrS%{|14)8WtL9tNLUy9EeD%5%XC8^5M&ZukIqd+NW=m4L$2Bh5OsWDoNt6~1y4{jg
zakU_J3kUER3Xdqn7cIlkqw_l|;qc2uTV@Y3{H~Rnb!!dw#3~%Xn#;@Kj=KHez=48R
z2#6LH5<1@)xi(9gj{7e(%iw1q?U0Xvmjk)R+kxnxfFtAEQ=>8y9XV!o|1kusu%m<r
zfjdmD>b}`h{(Ar+BS9+Ub?=AnFB4*_?w@zpt$O5q$awW(X}QImfz_Zx&^r;DxxVnE
zUO~G3j|cGY#BZX2?LjewOcgf0uz}j1lkaerRp?X8gis?t>K;Kwy!Ai{#Ya-0<qFIF
zTF-dS|1J}mVzxcQt+ZF^8v>$Cb;?)&4B_*na&I?7nsB2fe8u0>^j@}lTiHsC0_)U<
zKX`S1{MuvWXG2DL6B_ddbLOBF)(Xx-X$p1VOZXj_ypUUd_11~!L)>xZitmcQkrjoM
z#KnYZa-HZWPuY;5R*M`da{wo6S$XrD+7MqQM0Ob<R!x}m63}QU;;Edg)QkA%Bc8Cd
zuNZ)wr0iJkS=!JH^8^bHcqfE&`GiW}AS9z~>MvvPvd+--|2iN>n+-7w`US<S*0V3B
z9)f!%x0ls{ACFEu0SZgfL}WEP<x@r5p*cK*zku3gcR~K1{7lk={x?tb;rGRh<P9xg
zam*^8dw)laZE)jAP5dpA{nhc2iMsD?4vT1SotEx-r@<7tlpUW3H^7fcQ|k7~rUxq9
zAo`Q~uh(CL{BtFP&0=Y>SH$6#Kbm{TEjMa^u0`X;LuO*f0$UdWY);bsk@dE<5~-uU
zu2<Km{x-OFY4sjUSslbChR5AqgwCV9zWh34arm~~)J)9#J?ahmaTpViPG^V;K*#iG
z9sbU^nS*dq14S(s;UN0LsQ}Q8ES3kR=!*XX7+}K_=3g5QPDEBthd*aMBxZ_3HFXk}
zPC*_mD}n%D^EYn0g|P==Gh8-1xfq(Z6@!;d6ZYK<nt3Xl9R~&P5mi#lSPTYxTw2bb
zbbBCA80w%8dDm$p(gdmv`i@r4e5QoZh+MWvP2{#oak3hF7)mnOvVLQ;2#CnK{VDLU
zZ{Dib8@^XY+p6q+zx#3lQlpLg=gDJorpf?hh*B|o(Ha+3nUi4sNBuc3aW1jHnS-ZE
z1Y+#nX=6K9QF6zuXXd*vkhigK*#N%YRFMjRA7HO#e@oHp`aS~u7On+9J;kHv<oyV^
z4IRTTBP-71FNn9y$9%_MnQ*ErPsBa6jI4~JfIJ7tw=R+~;3TuGuh2a34s^hxu+aF1
zIaimN&Pn|);r_`k9$j;JFKW+qS9Im5Mbq$J?Z7|Q4aR-Hhv=DD-|zpopI#hnJF_qB
zqA&ci?B&FgFUUxeGXmqoIA1;!kf5;;)J2uyKC%}Dqxmm?j+tfw;-iECxGu2w%9jf5
zlU}NPfWDY?wsbp?TSO2BnekO|7=n^O)#kld<>4YNBt#VbsR$fUS@^U!d2yfUDrptU
zBZ@bOjg5U}rSCmpOC@Rcnt5|3LjdUmNPf4$nSo80jcT+8{V$n964=v+;zC3s${F>L
z_B`YWoEUi><?WlI4_A2m@(R&{-Gu281Mw(&wqgUHc)%06^<Xx{%cvkvxK_aQZ2Nw;
z2xhk<uAwescZyobH=8=J=&d#l+wh<AEY^G!_&!$wI6>xyX-b{jwD@E+IbJZN;;o>U
zPY|`zkRdqGdq1yE@QH~-MlD35Pv5ph0WA7F!~(VE1SxEYJIf~50R}b~f<(VJb?{7&
zK%8n?;qbNqdAr7)$oIE*u!i+|wZ6fT*OQm}0N=_6vU&Jtwyew}&t_h(H57Ute$g+Z
zpewe?9Q{v42KcmpXZW2H$_+pv;n5!#)HOF8L;`C$QfI<Y0cwzI^hmJFr6ms_Wf8&>
z;*PQurAceEL#O6^m*}(hYKcAB)uJaaDGJmEZ!APuwt6X>ffy9nkMU(2@fW?5m3}(a
zeKAeNS&6Y3oTN5nhkpl|CLa3y@xWsuRHxP^Ik>CJt`+=%;D2s}XQt;`&f??#avtBk
zU~WoqEt{ieuEIs4E&if)T2J2`4JMbcT!_f>Ca>hPNBNQPmu505{BWXHx#@-2Z+&bl
zL8PyU4k)DcMX64hvd3D9jB<0yg>2`4W6;pWQ;r?6oxnJKp5jx@lf5ZRfRKQ;(JFji
zhqf?7qj9Z1&%XYqR~WSYQd!N@Lq|Gx6C3$?OA-p}yDZ?w@o@U2`V@3K;yGO+)4Oho
z<2}SNY<n?0i7-Iyav2mL^pn3k^}d|UCBvxjbYKPzq5+A!qPrMiXI$EN%|P<c5TCVd
zV)h-P0)~veeMGnvP<2>H<En`hkWMcv-@^1nbo*6S9O%Ubc#<Y149eB^gu^H8?H;l(
zoVqhGSDvxkIb?O0CFX>W{|x=<_QzNSrV3QY*u2glmAz*kxakqZ>SI(Mz9F@;@OIV(
zrXG8b#113i*4PXR2DV!w5nZjG%&~EG7_hV6IoO5hvCy%bEeD=5!<W~HgRy0Jbla+=
z?p0AXS;I7W&HO>(p@!YR^gU9+2Q@TV7vGO`2jmpGwWpK6+>%StnW@Th%yFDYxN21C
z8KP5*Qk)wh9fabId-OY7Fr{gk>IG0R07?|_kwV0cM$-#AQM`2!E8G%(0gYC|Q>4}H
z*I^5Lq4ECRrTF(XEoX|kx^K_A-c2ni!ve@)ekm4snNwtT&^wU8Zj-Vfg5b%>icmW#
z&Ctl?_nf)2(8Zo}y!lI*)vIM4)H^g*l%oQ{V{MYJ9bj(9ZQ9C04jAiSszL-x1Yu;t
z<-!2`Y*@0{HX?`(ZlVfv3RUt7z-CL<eFU|!MU*sdfBU5C2EH9h<$JFseG{>|x=Q|W
zT2xH&=9Pr>AUT~DV~bz@-tUgo!KygL)AO3+Nn7{TwH-SQn@GYT-&~30t)qNWA-k)?
z#lcLmq@fHEJ#FpdVlNB=+QF@yF#H;0OukXi5L{SVnRCenL;d{0{%l>;#Kfx~F0=n-
zcLlNi=E-d;NgcBZxqP&+u(-y!A)%mF>1|3lr<q7OY;Uy{7O4)-0<v`5yTtB+RWy%8
zLYp6mQ>>MZj~{Vq{a3)g`!nG~n+snxwY3TB?1yY-YOFy(*&`Gvv!FfJdTnXa2JQ3V
z(})+^%R^%E3NEh#=_B443_&a{E&uE4iuw5Qg_u~HY7&d*Qoxoqe;TNQE!-qg?3U#|
zfRo+MM^P~{Dkq1|x7GQ;dQs_;+4|#N3zPY$nZ&KCb~?nypW{sno}x_bK`^72msh}c
zUext|-N^1ktJLH5+Wp<~6Z$nokwXT5;hk+?T1Liz$Z~MkJ2V_%j3|nVhe-^^bdTYW
zX5QV3>dk@J9ibXepOm7M1lq1Vw7*n+D3FYl|A0r;<KFr3ExraBOU6MV6)4EY@tp+u
zczXKQ%f^P0RkMEfSC3LmLc-=rFWpvE>*0U%^HhlQLw0Die8Y$Un6<sVy?F&Pbb#mJ
z$>}4a&s;UYL^;~PqI=Q1X|{#=>jrd98*SF+&&STr9(=n~?4udV!^2|{a-nY#dSj=}
zh$pY}2=+6sG&thvxPI4{#7aU!(v{`6)Hhb7HvelKgN^;A^<&go^HzG$Ow+d=G;@J7
zerF7v5UdDJ%MP>gzMRz5-z7Q)pjhpNQUcIsqReBHxmGBAa8R8#^x8V`eETObL)q^-
zuAg)-%R{oUlm!uMsvEj4`UVLV^M7kkZhx_sxf=>yJZIl{V};?N77!ptAbAYZ`=<VP
zqEyc(J0~+!-O1@?qU0$i6q72p(b~q&uE=gUQ|tu`%iBet>F=-mh|9_sSyPLf5u{&_
z=jy6Yy0&BlZ_<Gps*Z&|K1_$$eo%CPbM+N%z&eo+rR1|?3^$+v)OONCm7cJtnJMb|
zj?cD-H|#N38~1*B%9ke{E&@OQ+ZE;2$80iZyGwMO`0$F<sk0aF{DPI6kvx}zIlDuy
z5U~VgC_1=>o~5Ow=LhpCz{b}NOXc^yUVXef+5(m#*RnGdw80i|vy>Bh%f8s+vz8!n
zxbpim)9`(Rx8fZ0*-~0>S$BE5cLxA~cSOvTE>DjSoW`{Z0<(;aj7@((P{|sHw?~dK
zA;bRu7rDQDG^ZpOsHdaz^J3a^Bwff^mhWR|$>ZSq?~PER6`7|S0$SRtN+O%aIng$y
zJKUd$CWQux!9ZoLo50Vymtfs+*0S<)jS;CU>aHk)t(BiGdg!ZbYsTMg&;%TYe+>+%
z<x^M$Cs2$1_bY}ZO*%xJl5);l+81Lf<Al~xc|6_QEznn7Oi`@ua?Uw@F7vSC&Mi0?
z@luN|=qU(n5%%CS)Z^_?VZbqM5yUk+JDV%WOoRV)X52}ze=u9eDzfBXFc3K~6ZmN?
z^S>S~7qoVXX~cUA{bey-7(tXzAjzm7057<-lBocqbXeeA#EUHbPN0!+Iub%#Ihitb
z|NQ04f3<c4nK#Z&%=%yTgD)NpHKb*Hf?l3&4vnkR0v3JPR`+dwYLAUJCBgKEi}hrg
zetP`gVWzlG+2xNtc8}}FNJ3%u4FRMGPunrXGUS5H&aR4Mj^V&Jp<-6Ee}hSgs=(A+
zgMN<Ar=Q-=kkqe_w{>y2!nn?VHHNjMqN0`7{`Kn@UYmo~yA!3md7SiR`T6f8j@pud
zot|m#gul=IL_bUwNE_1^gBpoyed5ygE<iB=?MCdzWw}19lB&_B(l^xQ=eLUt6`5qs
z-s^<;?7N+)99@g5tdpw`RBrU*;?J#;2yNaYPPs;xHa#Y}4F3oe1?Y@S>Q9oAk$!iW
zrxmVRR0$~kp>#4^=WzCmM2nD`T2d7@yP-wnLETLkC3!hx+jhHKo{s&N1&aA$A%GpM
zGq-LZb}^&=E*J%r@2m_GFWb8(W7h6H+Wu3p5PUYY8(ON#qLn?k(Cifx69Z;L9SdLD
z+1W7*z1eV?tMA)6y}Q2QeK_1P6WxJIa&j$yqnY!Ib~p-2-hH`6MPJ=^1FO0j5W>sW
zGdCYvG+fk>vygkg)$rk9zHz)*i%xs@g*^(#`1ttFTtm72hiPDimL4}<Ig^tc5x@KT
z|Mt!26!KcmPad}goHae(?t$GT1hBVM;l<g3v7_44<f@-^-}-+Q?uJ6|-%s>~-G1z&
zL*Z1w+CRBlPtw{3p3t5o!^`{0Z#g7IF^;@6>FJpj)#%;z$=XK>K4?-O9TCk>j-$^1
zn$&t4oK8_*oU2<Q(dK?x?9bJf|M8mQG%wg$&k^;^7r#j?PzaL7<#nFo)M)1>;mMdO
z>mwkfB^y5W9KzRf6y`9f&|XfsNrHHs>syi%6aQzMDD|zG-r-Bbm1rd8Fb@SW9c6jP
zVrhqG#OWb~yT8AGbxe(C<6DMXeqrHZL=l7hhnj#hd$-O9Uv18N0x%h}<ow*b=Obm;
zciY}f?jUUy!jYligpwJytwn)X874GQm$Xi!HLOLiPa5NdC`~u=qG)xOhZQ_UGyx3%
z+kUk)?xG%79Ep{p;nCmz4q9Jb@FhLHtV5%e1OG}D`MC0)V5~H0&#REYu?Bma)MEUt
zYa@am3cKOrrNex<-K*YNY!#7tIM>UXHsK_He7x$c^F1&jCME_6=f4ugM(6Gu9DF^P
z%9q}B6`|_!BydGSNwPC>x0yZcv-|L>V$uK>yE}5d@WYd;m%!PuyTtEkNj;SpOlo+9
zfqW0&=^~JMA=Ak&Cd6gC9`RW-qe;woPK2Xxup$PYD5?g=WblRL1Ox@00b$gMdoXRC
zTAlSM)ysJy5@YI@)O9}REDsMGo7L_4j#<dX<of266hq+E;ZRRJRls5M7H`Io0fHr|
z3x0?cn4Fw6^O@AYXu&WYD0EEP7N|+oJ7Pch^3Ym;_Ws$ksT{Rhk4NZG58B4gk;lcb
z+|H5cqJ5p?^J}IEtA2gGOyABBiH7R5&pA1XlTK)u<vb)?l)0zLrfzwL)gQhr*8d&F
z-ui)uLs0SEVFBIS=!c832AjJ%CPUNH<K1jqfWX7u6-JT5nH9q?FIi<oY}>b9+Mtg<
zd-Xe>+jQF_lZ|Ev=XZw-wRJy>y`4)(no@lQ<FhjSrfvir2q`H`pZ{<{hJ~}E5Wf9C
zEr0}gnJ)BNZhWO&8s%=ZG|tPQpLJaG?P|#-L%%L;lGdhF4`7|IM}#wm+OAjQ(s8_5
zZXAu*X{C4S?;<f!QF1?=YNiXuoS(O-Id^w=e}B8tKPM;U1($<j>T|T?M-1l3<fI8W
zh->r+r1^FU-lJq$Qe39cg?ZjeIj<e;nQxusblj_sbGEh~b(m@d-k^(OEuhS`K5}>5
z+7vH3cjuFF_bCWw3^{#zr6}Lr^aQ~!*2wtwO|J!kG9dCk>5<$zoT2dBx3Ox=&OrG9
za8=9h%O9@u-_S1#!M2fven3eSsMW58JKo&fECe034--}4-=jQGhVA$lFE`Rx!!`CY
zkBYR3poGM}zPEwa77TkS)zdBu0+6sJS;utZcE@p+sp@IB1x<7DKUeo1n$0Og_O?S~
zx8@_mzlfN?pUkTvgwS<RHOR>zLycWLt!oEG1Bb^I)3NSsnbMs<_}T-XT2y;WjEIPc
z)2If1bGAi7O^pj9%L#=>r@zZfcnlH%X9pdM2^H#+uvqd@(pl0KFZ*?maMTz#lyj33
z)4oe-oHp)#7SgDa)P(YNXS|q%j0_Fdv#dl)5Wo4I^O<?TXD6>WLZ*6+UvkQ`@@j?6
zTYdGHX&oz`_u^8=K%ZIew-ssXi8TeQl_x7O7vrdegfZ|uoLOG{zl{T6(`(i)1xyMO
z!DOf+hi2X^H-S~=>Kq7w{LnYf&IvcJ`@dhM!_}Csb#q3S?|)eLVX0y{(3Dq{tf$b`
zFZxcH#JA&r#L!KklNkn3v3NE${Ac*b%$2s^lZwlnZ|B;d+pZwPcjp)JUV@bKM`h%4
z6!N}|-@HDQp4#6lL{Mujc6|_&(e*BK!wHj>1s!$VamPL5F?b)C4DN$QkL)%dwC74b
zG~lvP@>xf)gx=zn3%}WX)Ki72ito+rGM7`G<JKnwiFRqYOt1E?kR&dz*QWa9SS1$8
zH%;XDfEY9GctW8Ndvw3?MA^gVIYgk@5jZI6%a@6BSjyWs8|1GAYJ2)|VApGF%=@Ob
zL_tymi~q3GZXg-3V**GLwa@AZ6edPW;c>dI+5vc>{S*Gs-+T_9vGop_u!lO9tIDAO
z`6n}bEm-MIQl-Jl2$d``Z(d1BG=cQBY#kpLISxs&nEThuvuT;u3f#1A8y#Eb7d5py
zXe(?^C!EMQo{ka|0&^u}HzL+Xk;>fdzJn+unY+8dHOyVC-5u75)L9jW`5^F8=$)%Z
z&SMDrB}0{I=J-*o`<68Rfz-rxOeKAu1B5Tj=F!{b%srz|Wt<yN93USjYrXHkMBXs;
zFIl!-Ed`O1J3Z5qaarJfC;vX{ZS{Zm(5c7TDfTNT?6uxR!vizZNWvYB%HKC!H4MVS
z$^X1jVrTd7@viHI^boiV)<1jO{nnS;D6W#$R*yzb>Iq#5lVSG<E^zpM3rd-D5nc*=
zdN8;rk6%+y(RDRDInN2+Sg%WXIM-kN^L02MSe8~cAM)xtlghT6%?uz19z^EYE%S^|
z$Of_i3zd6&$@Ip?maupH#1USc6FRpM1KmJlE_5#q%C<k0?rE9D5pD0JO$^WN$jxTW
z&=sL6QY}~pl6<EqZSgGpEQ!&h`_TBD8TDF$y4iXIiD^1n6(dY}WrBzC?@Sm8H4YiR
z%s-fzn3@k;_GH;RPRaXU4&Cilcd~F*UMv;d0x(W+f_0+VZ0O_Du=!zj?gcBWfZKwo
z_Qyp!sDL<%n3+wSJQV7G{ztjta}7A5VllkZfVQ<EKXy^(q35#NP}khRZ@5FNMn?YW
z?f2&sC=M7Gf|1ss&injI=AizsdW0-nO$etmzy>7R7cSG((}i~`IJ<K?CN6ivfb_T|
zT*k7X@O}wv&hXxIb3E*zwjteKDO<IYY&-}WP5dU*xu!EuFJIfvlhU!1V@T19Am{bN
z{*mgkS(ti|_mTgH1-`Gy;m>8^MJ>MCS^^ZPHJ-NP94o@l=w#@WG`&Ol5Ws$iKI|9*
zpeOv9@3UF(P);Lvz-)kvQG;9^Uwd0y6F?Lu+#Mhy5F+QPia#%COqsvw;XYto`SrK&
z`${Z_RaMG03y0jETLVE7q|e5|lADGN99+>{FZA|CIb;X)G!qMl7wq}fI{bCNKiScJ
z8N18<Vs~dt<H@;q?5gaKQLyA^U0nlxu$5<hgcCOwDCqJ{V<wG|C+U*3Pt@p-50Pij
zbd7bcc7Gc$ynW(wXzn5pX;m4A7i74#sN&rlW85b&9V_n@KQT|6t=8+$wOCGh?kX&P
zEy{`q=nudhbr!FyF&UgLRk$1n&TzGFQabOu0V|rc`<i)O@K_w`59O3U$^=50%vB!e
z%kmR>k@BOwf-B47-CZY*xWI&T(f*w)&fgqXJMW4#JKbIXCDtfWc=zMq`(t6rJZ4q1
zsZh*+rGbn2X`S1<3rX*7LLd#V@Ff^xq~}FChRXoCLGZ($X~2r~{w*g3|7%P(MO}-s
zhdO%>kaALY<B+`oKm^|Dp}KI{$6-jZ;%&C=v96GLT*`OURIuDtHpgp)fV@0CzuS|!
zFxfKhOx0zKAKi5aS!!E+GY@I5iRL{FT&=20;IV8n8+Yjfcyl>Hb^($=H2V?YQxo<5
z$JeE6d$?Y1SU8;~D)t|I(KqH^Ff&gc-gp868!ff1WZ}&_R&D>AjT8az?NKGIsV^%D
zM7Zr<FFl`~>+YUR$;qi|OlPIGjFddnlGR%d>pZ&?<H|PMIPU1GFl(zlAu)}P>V6;f
zbaHI0$P1W7T!)Y2iWW963lC2sfy{l)W1LA0@B!6v7O@SB*|gc<t5RQv{st^u+}A(f
zp`oIpf(FT;nfeK(ia`C3?fm6-5*sT0AWMt+Oyb!SKiYE5hr1RBvZ+_bG47kZk#MdT
zh0J&+8A@+EUl%V`*XDl_u?!}0oaV0GPrh@@Q$C_~pm_=zI(ltaU$z$b{-4kK?i*<@
z7}2d@-i2&s`LS_LRy7aSeDA`<a({3@+Si?I;<)STSo}pTeXfN06N4^T7N~Zx*&Xhw
zTe@mEFHOTg5-}<9+QpukF=_mi;ZMbJYfX*7xfAJQOVZaSL7`jD^o$_%r5_m|PeLL;
zd{tN5S!xejV-+G|XZEtl=;{;Pn$#6dDtBuxTe|f#0erdM6s0?h3e`+cU%wluPzljY
z8&`FXEI%wTlZ8bP{)0j@&u%hMaX3c=p^sA*IR|_$2FlZZu3KlS)QD*M*-r8Ht_Za!
zLg*%a@IHNFu?jECkbrV!A;u)*7`~a#yt`FkOy`)cCw=h2@xp*zy#DCZx1t_K0O$b9
zEQfV}!_!YPbXH#7F*YGP-x}uL;(au>dv||)LvVjx<f{ZDV?cFpzerAJFplNF+2azJ
zNGAh{5=ZLl>I!O+o?=}(jA|rpiv{qqByO^2kcbH#CMQ=kPJ_+-|3-2()q9TN7h9ja
zF&Enz`=V>{5LWG!?k{lBQflUR=X3FR-^)|~;IRxO1x_m?!Sv6XP!>8@6C39G7eqGs
zk7y3W8A?;tS?ou$D?jX|<kzFP*VvnvS864k&YcPH^KUP;x3bV!<_GnT@2y%J1)C&?
zIuf&x-@6K1kZVa0`hR1tXDCD%f|h~mMMPiHNP?d`myV9kz4K-#=KknCmy)p~WjT4Z
z&CfQpbVY<QC%IeDwQ!F*rQVSkV3-S6VONgip4)3{@+KzF|Ni|8dLMokZv2mRxkAzj
z$N4^_o!S5RePyX{+<oL6wzZeoG3BlHjhK}57Z9Dwgs-{e((dEAF|t0dJmGzMPDK^;
z)7)=y<5m1VfOyq$QN&*-T5!c$>%AoJUPy`m%79z2DSiG{OU;(WYyHkLkydKA^5ukX
zZEbDS#hmHRL=lM&O+JFN4qe(^xIBLKKbyCjTc3PIHT0$p-zcypb{w-U1_`x2{1IQc
z1{j_$>(g_@lv_^trB)a~$;1RU1s@<-ijj(>>*OBiNS&01FfABt_3o&%SUHh4x4xv+
z4D-ZPugWL(NfjoBZS*xKN2}3oF;n-wlq5s)dTH0*`CelL26uBzABqxqfhpom@}vsv
zM*MgM@DOBW<I*l^z(N)dcN=`3wypBd>Wht{jfH@XEW}r*aW!4cpNEUBsxTNN^}}h}
zgWGaP$ocN%fL*}(VKm`8Q@7?wpbjJNbMcT+yH(w~>Pk~Tg`SID``l>tqe5QKyFiov
zB@!VaG!xyw-ssvsXG0?8-K29|Kl6S{o+c{$uhS(8mh%7Mk$K3UUB^h}w~GasGeqXE
z$HP!6-&$t&Jr))gr|FN6&0bq&Nlz$Nuf14gL><upZQVYK3l|TM$OTY!SgM`JBU<2l
zhj3(~x&UT6Q}bqX>5d0(3yrqV@F_wNfCV&jq=%5<C}N(_yW4}RU%k^&0MT7JrQ+$G
zu6B%_wy*O%YPfQm8?wJS-S|i;fW9J)U|s0h-**A(+JXnX`&AK<ktd__1Si`CiDi^k
zl*kZhG#XcPj-CMs1dXOaKI2j)CI0pe<Dwps)ND-pQVe{e+n-E9wgl=(1Zu@XLi&|l
zqnjruXMbz=cx*54XBRxS@HDdTK~x5Aqu!^*g@wF<=WpP_2nadB`?1wqvyA(H#{O^=
zwsrisOY-4-+&>^-R;Tthu)+KEJ&7R*kXUddr89;$(|{rt08&)#Ju-}`hyi8cf$C-5
z?6y^WZgpB*k7B~r#ecPCTv@(AO}3XWSAlvjAnI;TC(oIHB=sqr!e1+?Q~X@{{NB{;
z-Mzcty~en%EnUbtk;tMq3EO0b1qk~k2Zt1}3cvfuxK~Hbk1sDb^W(Tz=bWoIfP#d6
z&b2RsI{I0L@pQgsrbReV5I{dh{uhbUd_JbOw^*FUMf;0D<J(@e^w8yABf>Kz>U7(#
z5gg1DkvjDy=%3cRQD^SsclTv!i+~L>axRlX$L`!IVlpa4=m=`yxAWJ>B|m+HkKf=c
zqA4x}minUq2}i-GweCWfl$3m_qgyKhqMEL@96A0w*El+b0!#=v0(fx_Tlv7@z7ji7
zT|yIXf)@;K<BWK7-#4dFuMM(hvuk8b;jtX<|H|>*q>^*4E%r++zwF90aut7Qg<gEH
z2Ez=`Cmz}W8U_VELWYPpp0#a=Q^plLL<DIe!ezN5ODgE{Q&N(=udi?1qO5OgmaTDb
z$&ZHpKzBO#dzAYVf^$~37tu`-q7Vp*iFfsFjj=1|qZ?o3P5iUvbKW3AI<mys2|-0V
zpddaZvaAjqKOohh(ZE6J3G&aocaZ<30kNU57f}NEwn=ja+PWtvCqHFI>7MArpk2@y
zwdk(iX$%>685V-F7%^iEKtBx#Ne^5oGcDi8rt{A&qY&+WPw5DVnrsc5wrR3IxvkVn
zn)ptIw1Y;|nRxLix5J&a7xdOZ#ddgPU&;R+yaA`z!!1SJz{#=M%og<Befr{_Eaa%5
zux1XR)^#PUrQMXTHyvu-QiO*rGUNdvTxO2HG?I}a;#-Vxy7w(1^nSAjLmkZxz2|B-
zbA=q+>flhL4AO*c$1`a|-3PS<S*oxPAwh`4pMTi;tC`iPwN_eWJCP-ToYc6^3(vrG
zzLu{fH6n&VRUW9wJ!gg&vp+w0Q8V_ZtOK3lSBP%EpLWZW!gPS$KohRY;O{@&#kpb;
z=o6%ilibDg;r5lG)PH~EsIe!4*MfY+TU`;f6|;3QotjO+#YMU>I%QqGa!<)3;XiF`
zUE-g0J5Vcd@GuWN<wk(>6h9Q<R_ElR;s0Ft1)8?37~eC2H9=j^VKB#+(C9_v;nb3{
zB8(DsfwgG;Rh2W$TS$ou?Nix>k){`lFw#CZ-}#k8uw<5=PLa?$=|&yL0lh59qj`9B
zB8HHWstNP=NBnsES2;TV#^+D-LS%pvRz3)?=$~RY`+hBx??z}f5Gf)clN9T8aCT1B
z)wM5I6UNKNQ8Z+dSlkTppqP8)%}{^QBi?zguV&QJz@ohBE4A?kli`=Om8gfPAU#5d
zz2Nxla@@2+3FtYn1!R!Gp=0=1b@iW34skCk<e$NUzyYwVzm+J9HAKZ{YPX&NI79_0
z!(5lSrOXA*x+-QLFqp}TKum>*7(n(#htJH5J43wv>~|A*ZJYG(+}r)3JYcvzmvrTa
zH-2lINtQ4%%xy~@eL4H=pe7F*Qx-T`6~zc}cFc~<jUau7H_Z#k=aY|SK(Wu(r2(ZK
zA%g-rFLtT}pDD$H7cUAidVR|WxB#F%JJ;GC8MTlH`X*4jU4;spJ$J-CFxa%hS|_;6
zYsKmf(Q0VfcF7mhw8OR<JKV6Aiy!kJ$K5@DaW`=Re2L*#JlnwJX%(M&n*Wl*Dr45N
zN_{iXQNa7ycH$kkgRUJ;Y<CluV1&~M>>kd7Rf=z;@neu_8<y^-G8SyjWXKZ`9-Ob-
z>0|y3Sj;p<tt-mxAF=Q1sLXBJ9j<ae_<+f<33-59{*zZBM5Fm0dI(A87HoPeSy==>
z0DtjTT=4>`Z@B=Q3wPD%22Dw9|18mvceSvCTFMN0bt7CT){rqvgoi398c+p*)IjLI
zeu=IiWFwW+a|cQKqVs9J<ZpmplRkoizznA_3O#}!xML3ig;ww@N%A^hQxw2fJas%j
z?#U!rw?~y8mf^0514<Hxh)Xh_EVymAUxq@hjCrg0hoPcm#_10KT$G_z(5@99{m9Xh
zvVWjaNo`9N^V^VpG0$jM<*U(ZwQ7%*&=pHS9{VbS&{CDX6T=NmOK^&_%U{zgd&_#h
z_4-g1P{IPu9&SD_@`|HaiR6d?ksdJ>t*J!jl_>1XFh(U-=~PS<_z6(c$M(lQmzpI@
z)v)(@a!09mt<uKPfQIkM!<uO+Ztqj-W@^I9IijjkEV77GPg06yRmBb%BRoPsHTQ@T
zBdSo{pfO(r-V@JT80o5L>fkHdDIyRl+GZB&4Gp&y+fZQY<aKCamSKPx4)Yj`UXm@-
zs&i#7Ud@G#c}yC-De}F&#gw6FA4Cnh4_&<FKx3}j8=fZw<Sw{7La0_*gf<c7Jw6-Q
zAVh4Hyz(XOx-hoYNQ}ITczu!_7CQq{4@vS*CLBR%Kss=jqT5e_xR1bs@G;KF%q$Zb
zy(Qn>MXp-wTxI*{#IE+3qX)A`jCTB2^y8l7SWO~pQ#gq(SMPOv&=rSa!rm^KEaxW!
z3w_6y&94{>EPsl;6fl-L&gfD#zQO2?G4ss7wBmf$HPL>#osDsh8kl>ogsJ3Mkv9i_
z0c*^Hu3+|)yp@5ym{T&OEUZ_8%@WMG)Xl4_JsIr^_s9UtkYeV6WuG*Q{!84fvx;(F
z9|fp$^A{raLL}RjGMA+yeS(A%y<LbMXIYKg?1Y{XP#;8&o$m9u+r33kV7?9P-Q%P_
z7*q7>FKqO*z)%NdmQ6$J7|if~Yg6OD{e1*g7m$)*EZ)4%fgfTTt4UvRCbp5Ky8Wer
z18dk3gmzo~>nXbUAnuBivK85uAT(Crm@;;qo3!%YDS2=(J_1i&g@ylj$f|p6KkRyC
z+I_<PY410&z#ExY?`@7Su|}(AoxK29Vv-c4&c!TR$W-%e21==<pk)B+PaaHk^Gqek
z-7UI)6a;~6bj-}q4^Wj|!;S5e(g2H}#BZMb%KgXu70P}}U`5Zl5g0zE_bKK<dBT@(
zCqaRKZ!4h8^VFBU$a$WY>dg?!gf0ZI*m#RvW}qvCyNo6CF2wxxsI9hg*MCx<<*eP3
z=nKDm&gcso*nGdra0B#v6xFGqYeF#@bP!0Fy1v2V^}j7usNzcAzk0_ptjY=VCnH~*
zytCi{!Tmtobo@HXM7#EXzkMyFok1tW3SKXHa2Un+U<(iOe19MdjY@xM?7qzix_t?6
zmUZjoR`rfMtSF#xVER0Gf5LPM!v?c}M|L<qhYN^#G3Q1RW8&cId9m|*dLC=J0^&xX
zm&*ztNhZ&_!>rW4o<e@|pP_pxL!FiyJI^0e7L+X=XJ%egf(+TKne>E#qwO@cysI%^
za&57)s~fis;#ad7p{ZA)X$1Ytj@gK@c3g7w%GJRGc)1G%+yMrB7=i!~?Y=s2@zw{P
zq=($HPm1AK^dJKrclB7_*v$vRWmg=O`D5fH<Pr~LM>M7Mr<bXf!A6UtL1-YDAI+ZP
zRy-pNE80WC{_&g$5aOY4qjCzqi<o=nLy6unhY$2bl={$=>p+uy6#amb=X0?Uplv{?
zYjOO*tzrIp>wcDcWEiwf!0E<;rhuFNq1-H@UHnS7{4ta*LdEMAG^7ArwL&L58S&T^
zgY`#5v_KlhF%WRNW~eeUgh~Mk<|#U#GUh~K&2Na~1$s~b$)H?m)^+~4+XD6i6mW<H
z2wh<6pqWg6$eG8fTAY925^inWDX1sk1!JMps8cTK&lt-m>YNItj>l>9=S5AC5RYR<
zZRsB)gn{1C)27LReJ_9i?Mt*Qtwc?J4k%b7$%VrKd3A%HF2k|zUXeGxTLFk#Xx)+s
z>M^~(M^&a>AVC>mEP47<Ept!;54M)@^@Cq-$Y1pgxa?@Pv&_YO7!JeRtQYp>o>aiZ
zWMl(%d)+>&OIx}dKVSE@=1vSbf9u+1RYt@*+EKz`RKg6Smln6skdww8^r%8qc2$zX
znP^T`;ikRjF)7`84l&PJ8k^wC(*CL%42P%{NxBvlbw=o#g$?uIxTwhW>vRhWf>u*B
zyGC6QzBGog0(zw9dnzhaeb~$X>#&@59SNgt4EBvPC5X;lp3r<a;+nLf?u-YDnKF6j
z{?hG=!RP+_5u}WVj{ox^--)=|gs4Hr*XhvIfeaj(9;do=xPwkU`eMOugj~5}OdKze
zb8z#SgI?;~YBtfh6@x$#g!AEsLo6f&8trI_PeKJA&g8BZLnJwEx)O1K^!Su9tDE10
zc*v6|Jt8Jt3cajnKdi}l`bFa_5dI^Wdi(igjH5iuHkVq`Y?kk**5w-sDgqabXlM*s
zDpwKigs~tB>*xgMe}%)UsJG~leN+q2N`ywQD;b<HAJRngNyI|*>oAdP?|^}}$uBR<
zw!Z!D938t#Vm8zCMJ1T$nhN`!Dm%t5m$H0jDe7=NR>XDGrx|u4B=*AQFb!hC0O+P=
zFhHr3l9CMA?QcCkAFVnms{5=GdLJU@HyCPgLF|nhiqPc-B=zIQl8y4PS!LJ_P7T@2
zi=ulK*v^lj&Reqx0I<%2va5UUI$uOwn_H?<^@J3-Qme3sz-8bT%dSTKnRYE?T8?~>
zpX+BzrzxI>e~%7uVs*Ch5Cke2dy3oYg@`{$95xNjA+#bz|5T}o&T+{Vdxi)NElMgV
zj2+$xZ*}#hnvI-Qh*EezrtcUnA@h)j#|8q#-Ii7bh_Sudk!7p#ysW^u2}YoMp(%8t
z$c+CDr+pF@JwXx4A5I2^n2xb#a^<)~3^+zOsC=mZKN*A5o&KX3toZdJDmrFlFTq>_
zaVpxvn&>NZTw>_{AFZ-)e^^LCaKx$gN<-Th=wZl}*yPv}%MS76XTUDIkx%*x!%BU4
zVak}Ft8-q@tzo8xqIP$z@f5ut%GL-z-V=FEwmy+LT_FGL(Pxdx)t(vP>zN6}WVfY+
zHgQX*f{{N8L8!+9ya9f5a{u}|j1Jr$0^T5&vRVW}1_f_>u3iy*1<`@ru^8}oS<}uw
z>*7Px&P5;=y0Cxhbe`$Q!Jm4)yKUdNUWWfr%Fy{ohPACoMlYh`J5Mjaj9ifSv7a9<
zWN}1kuD+vvnDExYs!(zyKdJ0u8r$@Et!hDVPqvL=RX1<k!11+uii?q}^+a>+1Mz6G
za1ki?Tlbked?c(RqboM6G%#*m(55RtP1v8h0MNgT3@A&Pq27ZAF_N2u%H4VkJ1J7p
z%}}r5UqrsU%!>o@Y-s1dP3A62n5@KHCIp_|KGpkmQeX1%q;odM^OgJO%-EFfq|fc>
ze2z$!Kp$AiqI4zUHJK5F)3Z=}FV@yM8TBKCTdwr;3Ko#GK8n`Ib!Ql!-Tge6*}o)D
zv}FUkzDdFc$^IkRvZ0Pd1np0ZX$`n42Qj~Md6mwe|NgzSHC`ZppVm%FfU-wZt%0Pi
ztQ(>xitj@PuqB0}!Z4U+`{HJNy?OSo+^oAED@hULVy-UoSfV*UDnNrsKV*@kSh2tV
zVJBPZo8`(w`G@xush|EsMv&h6XfTd$RkRcutbl58L?P5D2@uwBGx}n_&U(Zc3Ufp=
z6Cs|r(oXUMmECG@PJo8J9R9z?h`qmy_n{sD$*|*kVy6134H+&PdI<t4OLa^l1LhMC
z)^-8}CN!lFXv1^$6mZ)me2NW=QCpP!7`gLNXzdewxVa!MY_u5ql&BzDSryx7DTewU
z_ulBrwVE{m+mc8;FdQgo#swyjC|n5w=qjJ=%h7<vrJ=U-q4~-==O1>G>h{3??NI*-
zFInNumuHN|#%2<vPn8AI%aD62u3B9aV@*dz%2~yLb+TulOwD99b)<L1(x@e}G!5jq
ziFfjsOG0s(SE%ROARs_&1~tZt-~lxK)uA%a*e{+wwJ?#_MVaJ6EP32rd?kRbe)Y=m
zNAqM-9;%5}tM)&`1S8+l`|nIOw4JOeyPXvBk0wW?HVKmn@4Gem2wQo1L|ABoVJw$)
zKMzQ%efIkQLm&P-TDm4F<^I9RzYXlM#|iZ-SR5i`-=IKzvOZGGFcjF^(gOM}#s05l
z$(DIkeJ<<Y=n@oTvd>H#oSCXQ{f{z*aI@7YU_=`EF~AoE#Q*zVfZUsUH8hY=AFCRC
z)F(*f?6mRdhZs|e+?iMxuP9xU1*Y}=+Fsrwus`f}VOH#f-|v3OWk0<oSG3!DHTNLa
zN67(}#}brnH2`U^F`D6eOQ-pzJ4gp*eQe|W*F#DHG+YSIwF6dfl}8sIu4u<B`Lx05
zoAbtS=Mvoq=m2`Ym8lKVCK0|D^Ki8DA*+76W+?Y{oiOD@iRW{H;CT(Rfl5^A15t|7
zIpTz??Jx5KTsvw%$#qf8hu?}7lfq*Wr}itZ$RGeU9&ax8h0Se8b3KQ(AvyVM;a*E3
z!J02YC0I0%<k2Hs+$&$vj=mpkTl^c?CxIU*e%K64lcp@~jv{%;p>85^NkSuXa>7A1
z5$S%{wQ4t*c%>W_Gm}W2??p*AURF?*$8Z(s6}4*{9oPa@GBIm-Wy5`WW5#i@+?7)F
zGXPX)+x4a~STU$Y^>dgE3iB?!e-(xU&~h1z)Rj(%3tt%+o}Bcf1?Sx2_y!ESlgtY)
zk@L9G28rp7&=n`^&4bjRL8-@#1sj2`)dt{%6;ciM1FZtBS^{CW(I~8mI~=KUaoZ%z
zN&kwrGox(UbKj*<+UzNw9;5O=yU5Qv*W911fb{CJkvaIsEo)hYoB8K?q+E?9eWO-e
zG9UZ1k|^EqPHYC>9kygspoKcnLy-AFA~pocRLqt`kP<c!OGEV$%H$Rs)i;QcD@c<L
zOrJB%qws%zU41f9O(hQ&e8-fx?P|q~tg1(8t6Rsx&l0bywn7iHv4UdzskbF-{^i@v
zJAz|G60&-e4jcg8z9b%kolRhWtmv=0rvsN4z_5B{gz5!7q+-6CH`(ofJ>UCMNIQon
z3G|=k6&Sgq1J6KFmj1a6j{?&HLFr4S^Ud1>=-b#iA3e)PCT_;$odO=)HzVLO9~mlt
zTL0<j3wLp#DHyEV|35o-;6HO7n@;GpEMQyX==ImrCq(CHFzLRO6F&dHch3yP&c9bX
z<9i<MoT=ENaV>n;HeirNHBQ+i{XxfzJ!Ug-UF6ku_kZRc4(dyhjP_4g6!`Lb))7%>
zH6sH>SKFATM=O7B7f_0}e|gIcv@<p6)I5#o=Ila~V|R*D%<uo(HbvLHOxo2mx&zot
zPX5i4`07F75%*)O+PNDd56pJrILvU_3%KVKc%Z<>1Ah;^buiGV{X8u%_VlK;uY2A)
z3U~JRq+V*6*z?kON!kCy$-u=rmQEbcOJ!`28;Ufr0rv<rL^oPDx&%a}{s$JDr?;(p
z-0y6?a+BGO#h>RWUpPMh;a)bQh5rkxj+L$byLjsXp9j^-?e~95a5*^3ygMuiJi<Vm
zLB3(rsiL6o`N?13-M?8=@!c|d?TzREx0mbN`?3bg9N)kF#-$)Fky~C%ShzSZt+4T#
z@*_gR{FuFi@ZbA)b{0H!3eW4YUVKpC;-&>hl};?4<{o{E>1AtSq5cv>wPQ!Nu-4Ci
zvLyCQ(xqj~cc!PE`|;<F%<M<+re?0|jd?cb`4hW--#Ny={dG@!ndY~p&lhrNmPkHy
zK=^@S0r&UK`tQSkPMDXhW_$ejQIVssZtA7PzvwftwL19ag^IBA^jH1y@(;EY*0b%|
zqT~I0owNhz0?r;o<^#?T1PhqIR~sCg5Eq}M_PO=u`p-IRQY}}^eRtncLm;Ilqvxc{
zq?0b2>Xyq{T%Ww3bsn?6&S@=^<i7vLstsz!$9S0d@9bco6SDWsVrQe*_h-bPoDk)=
zdBZH#_*;3`LjIpfuIzCC<#EhiqMLtmPrrf0Tl={6_S;%7FZ(O{;npUduSwZTstsaE
zJs%%l;d#egUSK6w`TF>j@7gKFt9AbV@H5+fsHkpkuhYD>cbyJTlfG>umlP|g_w5MC
z&?Ap{zViZ2Tz>cU@6rm^<rBUi>y4B>lPT-PpnJx4VukFE-eB_?Ouy>Qui0%mDZ2fH
zsM$&J?V2H8Q&y#VRi~D%76p=7+s@X#W%zyJ*$D})-_;C1YVG#C+g#yZ-LPPPa{`dG
zchC?}DcaXwkS>1lb7GZqV$$8cUs-ooxjV2`ygz20;1^vSJzeO4W^&I<#$%1E^Lm(^
z9b_`DY`tMRr}U?*0&fkQ9i!&yO<KIOn*T6+F{HN`9^>X=;GC0kf!n2F#cw;FmOBsU
zTJ($MTJ$FNo2!a2-mblS@Mh_D<~5Ac2UbaI{|Xleu6`mG{FJt5oT)YOXT!ZTA>a`<
N44$rjF6*2UngG4xc&q>b

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-32.png b/srcpkgs/void-artwork/files/icons/void-logo-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d345a61b2669c8ece2d5e4d30754882fa7082ba
GIT binary patch
literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x1iVQ^K~z|UrI%Z5R8<&-zkkn7T2KO^iuxcAh@pv!frKcO)<6rzfshUp
z18FU2C_%(a!i$7@z(_)T0gNK3fk*&D2S}}?ib#>7$R&758ZjisTL_2&gfhc0bLRH}
z&~nb63wAxOz4pJ>IcJ}}|1Fe=j^iC=sZ^>?RH{^Uyb*JsqC<fYa8c1;1o;lwA2#7V
zGbhZvTuNOjCfMG!{ee(0^pdJR0}L)PZ&F0IlVf#kQtZ_K3b3PRN0{?06_sVcfD(<p
z$Oy9LvU|C8Ud_C#Hi5}I^)v%SCE5>jfRLg~%T0OL&VxIL+XMwa!S1fzgEN85UO~q7
zBg9SoA;|PtRqTh716V>Nfp!(`G-6H|G3U~n4hA$ZT#!nXC@>8u&lf^n9T%^OpYa8l
zw(f;U>ip#a2b|3pZ6UHIyI4gx#H-@x3I*Qv)vgLR=eDA>0737#s(v%@%E0RS`ug-O
z0qR!FUykZ5Fq1!XJ~&_ay%a}VcUv_|0vPHY6J%wqD)!pH0cu}=ZUnB|Bi9$)u{2t1
zdlR>d#FvSYDtg!wqE}rV8Lx?-F#yKRy)6H&_Hhwpf1UH}kp2dUO^Tf|IWrr`dWHs?
zfN2FVwQn|-E86H0j6wAIVg?<@JIXqaca#;<G*mZqp=|W>iZ-<$Y9ACdR|0kF-{F#~
znGLprjyk6DP~}3DC0CPIM**~Tx1AJ~wG9&+Hi(FN=VUUOm7#E`8R#3fJng3IjUrVR
zpZ2}ZmOriL-IZHW-UdeXd7Ot7U7zSqY*AI;uRUk-oU;g@dU=C+(g5Rq_M)A(r>{Iz
zxe$2THg*GZ69*FuYy*;$kG-6VK4Jj>7AbndT14f=0_HbFEV1$ddMxY+qcF_NhI5g#
zUatL6`yfRhEE)ht+ZJYq%xR1EE+Y`|ve!a{yj(hy_ARb_NL@?$w0c!ti!^J1OFpri
zzSqmeYvR4YPbK*G#2=5RyksyGtgvYRGN3<uSy35nEiJ4o=B}bvjln!-p-&qy-&+FA
zuodZ<(DN>^y@3DL*%M~JmnYbCpAT}_D7pPUF-)s<8hx+K5hoX$7@Mo;B7~ED3jL^}
zEwPEQM%zZTZQr)Lfu}6Fx`Wp!`y@i@3b&r&<wBqpSnNxE-C#Yi{^n|rj*TX5Pkj@?
zaIgh`XLTV`7TIeKIPdf-`jLN{ESTyvR~ITA9UDy+GY25eTHuI>-5eboO&S0Vuo}pC
z1R+Hd^-fbM|9(Nlr^Npby1}W69=ky$O~9;$8%^ow%Qv4=bd6>1P?x~hbt~rA^f$z;
znpqb~GX*%JqN^I7X!sTSbVSuo^BrNNOKfKYWEI)yhRn(@mc8%WCHtb*X{-<lwWKxo
zR=)Nwl8U5!Eg3-F8w-Y$$s7gl&r?4M+NmNPs?r0T&V`H{akCX}&Wr)ASD0}-ot5wC
zoa!_^tOWKH2yr_o8p7I^Pg^x_Snir8u=fhLi*E}xy4IUf=c}8}nIVH}ftA3OewZgk
zXuFe3z4-)1FDCU)^F1!o3N(@b!r?7@0ode{UAxcu@VA1>(h5SgvuI#gQqxgt1Re!O
xaJ`qz0_T9=L5?DN@XkTKd)r=V^PPw``~wqC*;EtrvwZ*n002ovPDHLkV1iGNSrY&N

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-48.png b/srcpkgs/void-artwork/files/icons/void-logo-48.png
new file mode 100644
index 0000000000000000000000000000000000000000..d394f47213edab1f6f5cb59a2614657364428911
GIT binary patch
literal 1864
zcmV-O2e<f%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x2K`AyK~!jgy_tV(Rc9H;KhHV0ZAM!*U}MFgU_uCL+z;yzF)dtWEkpl+
zOYdQ9jI@PNm*|3V#%LrtWzlGcL!Cc{AQD(MdTwd9WY)pd(pK5RMi75wGb4@(6J*e_
zwYRbDJ?HU{wyfYi?>V<z_Wkdk_xn80_qp$RpYy)YD-;3G{_)w$kziyoN{xzED>_q<
zn}M5w5?}zh2>cV}HL>KSAQyBwN$1?P#+Jz%c6N4_4OR@M6>R}N3)qGFQ1oR%_SwVs
zQ>kUCi<8k&Z~|VBcZ;Ze9bp5b|8Oyo1$Jsew>gWQw+b<goq*?gw%jV45w-v~7OF5N
zvcT59DSg{pKHV}B$H0o~S*m0|!Zxm-cz|-?2h+3DkM8f?KR=E^>;%-;Zvkf}tE?ah
zci3vb;`Mr~qNuSGaFWi+oS&-^<kU5Zi;qfC$+Y*hf7wJTd=Ynf^Td`eV0H*)2snXo
zMv!+1@YT|rQ04*)fT@MXRM8fv#`$Hwu}PKDJV~4f+SF2yX&iMv;SA@s^E{g>ss&jM
ztOGt2Go&v_Lql!DGet=NE+^p$vajFo|3y=>>AwZp|J^I4k48~x1*&40^ovS$!;*&A
zCqBG70jYPJp7w3K^><r#y;_K%$-;ZVyHUzyJJ1w^e!Oo=-)AP4*ee!so!i(1tg(In
z56d3e_^~2u%?syl=iPK|x>;2>0=WqKozn)VZJzkx@(k3w8>U0>8gR?lqjSD(fBu7-
z34r#V_LYiefP{fIU}4Q)UAy`$TrmT|H+f$?K$Y$Lhw9x8^R9>3d>C7#4@S@`6n%L7
zhXCC3ldqNqeFLYtGJ$b?;4_iw$?V3wCbIUhJtws+b<qL{`m$@tFCIo`;^|_GG-0T8
zXfyC{1EoAD3GRilcTHfEnmmf^D?~thcl(_xx?GSC0|XlUiv-U*pL6~k$9~<Sb?;@m
zGg}d!2;->edf;brk9+^rfYLs~_w(n6&^d?QJ&|?3qqpOBAOCTbnh;92AP+UvHvA>Z
zS7&EuS+*kk1~4lu2ivx*tbmfm2Jr~e7Ds%hH}fT5{UZkP0811-;`Ml6jPkc)#fl+8
zo-|M-m&+wBuuK8*Ex#=)SVwQi?I>-)lqfDxE=Zf#?R_$mDI72ki!8E$PZ>BvHwA+)
zN5%2g{}J)TkE0ynr%|LCxf#cRegkEJMR@fA^hCzZ<lUH!!|U~`fu&Jmu7)7B?LF<c
znK;R0G6$H-_dE-9rh#xeQiw`j6ekP;L4Blu<PF2{G)s*Kb9pB+fXdt`&NbO8?;1uc
zEHPFff=K_C8b2XMSVY<?YT6g&EJmA7A;vKd@XDK!oG??>NLv-19yTV(+ZJGYP3A@g
z5S8bnIH6D?ZAB&Q=!&8jE#RcV{^Lts*EEGRENM8dqFqr!@}S#U;{4S_=<Mt)LkO=_
z%6UuS9|j+lWt=vBCjdy0_!=-6#hZYv?b~08A`MI(xC<x^C0HD@Ea4@y8%;$8O4X!J
zAgp1uvlfM{qH9vg)Ze0r;>%hiA)wc?RJ*`b4fKJun-2dM#*nT_KPSjyMSBdi!?tfP
za%!F5MEUcMcsC$821>5fE`3n|>fNTJz+GWXMOqHIyYu#C@&^BtcZUR0Prye25Z<)K
zKA5UWorvor)17%3;n7fn(3`GF*Cqf|bf2h%CLrk6rEa5l*xhp}PVljPf2_T~0rwk6
z19rgJnb<E0p2Gb8-dct{c8!7xLN3UyGPE%-3<LuQU@U>(e|zsm(47%Jo0hjWZz!Th
zBi1I@o(lZnZt^sgMP%1_Bkgimq9hS)Bch6^>JxQt<H}--4MRvn`O<K1_=n>^E+_EZ
zclN#oY>n`l5F}IYHf=1f)Nouq6Ds=1eaZVSjE`T@nY%EnWIJ#?!e;{5S?@OOUiSS>
z*YmRDGMuDyQhiM#ba0j*PaONd=I#o2{d^z$6`(SP?{gx!GOc3IZy$Pms1Q-<$I>_S
zzgPaCBJ03%4!XZGZD~T0w>!POwRx4QW{7?BsAm<P#F7KU!JK1<T{mx!Gwr5J`>9;0
z=o;W&-am_+0V_F~BtqNkb#C(}L3b4D5a<Ve737q_r2w@BYlfh+6>cMZZ!@VRjQ0b}
z-R4FeEw9EMX%SIy5|I}ib#CKILG}`FO%wwKB@ubacgWrIOkis@(bcI~m<>T|Tym^i
z$``imd3}gE3lZInxlePg=u@QSp!@4}aSaN-Bdh=JrdcvF@(qPej9yF^1Lr|@4G}yV
zcf&Z2Nni4P;d|?6B!=y^jNUdboP@6&=n-JYRI=?+4YV*!I)RC(b03(AB$A@K2&@I5
zA7!-TS1~G-3&4LA-WK$j3cbTR<;BD9&qF&Raq&N_T8iT?Zq@Jr0000<MNUMnLSTXr
Cnt?a~

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-512.png b/srcpkgs/void-artwork/files/icons/void-logo-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c2771f85e66ac1d08cd1ba29e6f0f87baf3137
GIT binary patch
literal 39176
zcmdp7g;$hcw4EWP1w>k4q|>20WK^W3k!A=1>245_8bG>BI;5m?Xe0!rdz9{yuJ`d<
z@BI^Rxe(UkoA2Ix?m7GHv(F(+Rrw78E)^~a1R{7V2U7!q(10J&K##D1Z~r_du7Gb?
zrV4Lhp!<h^*{y|fAP_z1ElftkBYk(#-9vw}_VCa0vs3HYYO`6V1ibx*o*85O0%1l5
z>6Z!)0cq0oIT&a{@$u9RI5<Ai9~c;F6j<NVf0ky=p`cDPMN$aOHVjsqm+A~}yH1_=
zQL^RczM~sXsb1O`dp;s*X_2@W^Gme3j6j|(KVI$s<$q|y!n6TuB?mA@a6iWHKz`%U
z4UXY6iP@8QR{F^urr#GMBmQ`*dza1<qo~W1cSwR7G|f!7d1i$gN^TwwSIjWF|0G{5
zQ-~9wCi5Eh1&uTi2gy1zEjOY)pA{ndG~0gZrwooNXczlf+~_*6tCyl)_J}S2BR^Pm
z01V;9NRD#N$=bb?{CSeFZ~P&s7)KcCPx9#&`OKK3a-L%Rua24gD|#hRJQWN=LV&=u
z0G(8EU-1Q4ZH{EsTNn#f63h^O1l3W(&qSya)Jzop!E9?RkiTdJXb}NDNb#}=-}Lt7
z(#HIhs{*go)U*$FwgrtnSJu|H-}3W=3lf=A^-`@I>rrlct^0P4<8yO!PdSFa4}-d4
zea0^+;Gt3BSo8yAui`mMx{i`JDNNy}VG&`^1+S!*;qWpZKH+v{`2eoW3Y7q&NN5Pw
zN@RREe=3M|QUwx=MuV3Q;_PVJBx<;BD{c%+{X%8EZBt}lQkYX5c=dY3ePl(;eMfq^
z_u#*mMm^_dj>@}WBv~Q-e&9HD{<#4|zjrOVo*hFHB-y>qcF|2Sz8g)h#UA?sEn9;p
zOpe`w#DU!b_eGrF9e!<1ovNnxD@_BkT7ue%2|e-~V6{}e&Xe~R2nGhhz`TpRGYkd+
zXad7qS-B{c-ekXf(GoOCEXhuJ{Hd)HjC`*G;Pwm-5zBOV>Fby8al6k>UANP=i_3~@
zxG!ooH6}Dv4YVWa{i1|j8W9nzpUu876EO*}B}{Z{Jp3dn*e1m@9gy&-3`2_wE_flJ
zli&H786@vX95aSYLFyuZO20J9G@90VqpL}|Hn|qBnc!G+_CeKcIwbsJ#^Vbkfr-w*
zi{I+wZ&lv1FpCyc@Wf%?P<xQ-m?Mf$y|d+m0SC~4krJa1VYWrNj%6wE_;bHs{H~#)
zt*T}4+EY`+eA1ksU*O*jY|<V})>^G30Y9&RPux}b?a^Cb&#>1h-?GmrGWgJv430+e
z<7}LOaN*3^D;Dqud~q*&Ywe_{s5rZ!I{A6R8`e_x@#bs#$8^*qhZBGD3Jc;=5`TWp
zWAOF7!a`x9FyTXYfHN1<=L7GcfbgO>%$x|62#tum_l}PpAdzQRV3l}3*XE*(S@C%W
z<2635%v2@k>%7R#!LJ=|r~@S59A7phkQu~Y7S>OL(nAI#FAURFbX_Si-{1=CyCpZh
z&QN?dfPm&P<;MUE_y3Clws2lx7zo-4*a##Cd<<JcHJ=7J0j?N?7p(!~f?KPn)lNWA
zNKM1A`_FOL6YVGCze~uhx-@-0itEb$ph%DmFU!$w(3hBEazH--MT75ud!e(Z15VWW
zDHH}C3>>Ut{^vS>Fh4pWEn@}7%*O;ShvA#TF+@qx1wZ#oq^V2q2jC!MX^>Yv$gIG=
zNN6**)XRLVB;XWzVg15oVz&olU1n|Ti57%ObOk6ma1U8e!z-Zz^+ZW#bhNULZ8DFa
z6uAmg8gjoeq=RWjez&e6U6DzF-2Qs?HFXXRyDzY#X(l4twi6nXg{#MZP{u*OAZieq
z$~@Sa;AaB8AL(v3<B#b859og!!&pXnBlRt$>NY$T_Zas?*kLswYOB;wAymQmW3LW#
zRH~e*zNvd5?%`913aEv-@i%pAV*qJnRA8^sw9%$Vhb_d0xrS*tCHmXCu8YdP<Lmga
z-%#RHT2Zbdh8V;onhSmL>Oe&3Dm#Y(xE86PqHHDzUO-x)bHHZ#FOFhPh6>hbS@V#&
z`Zi7LO2%F$UcYXSUdzaXV(n~@$D@ll==uj>&64wnHQ&GzK~m_yHn-EY+&M0LE_X#*
zLQ0xSkeG$>AssJFHy<%aroyHw%l4JOV?D!u_M&$cn_2X~P{gHzIEhXL-{+P8vie|c
zZ1hL+?8$ykaU+{U2is&M5Pr;2>2kmNX};;dGsu|wBw%vrU%Ok0iv>VWUs%5tvLfJ>
zL5BJ}^^Qzg?*|i=&uYtX0QeI2oQ2nFg3%P-v>?(%c|m=s09Q0b0sDOp04yA4CUQt^
z?5Dl)B$52MCy<A=f}2R+Se`)DMT39kH3IH*W)`~=*DU%Sd_n3^2rXcB7-KUZ!;r>I
z52eArd8)I1BHWqtTXt8tQr7aM^sB`S1eIiXac&_mzxfC4!by|wR2Tle$-j}W3LzPQ
z^BBX-s2s4T%I=i2TI=xc&u;cat5kwBhH4Zol#+W!SGh?8tx;gqGXsHaG#OHmz$VO$
z(}8*lOCrNUF6_~D#QBdE6rnY>H9Bpk8d$*V;zL1nnzFU2wRT}VND4cXzqba9o0rTA
zxQU?GFp@x<D!-IVnnzrmJdE!C+;417zr1-x7{uW1A;{M|LeIpIUpn3f^81MJ<Os+q
ze)J6|;8;xM`yF0D^Ok8)CJ@_o>$dsd3Lx24Y-EaaB!MX_ma*xhYi1q(AgM7j^nqny
z9X}?Bb7e0y=}Oel&_H?rP9MMnH0oqEnIUt1z`aba8n(J$U+YWGV2GpLbW-G!n#CId
zfq3&0_65Bii@UE+*xy!`OYgYOq3E9~60Xj!(cRn43*W_edcE#ayDZIcsE!)xrQiz9
z!GZw>q0ijEJ1})UC;CBW?^<7df>L&Sx|=uo{UjxRJ2L+Blc-^lx@M9tn?Mc(R1BRW
z5tk3}XFt-IpE|*cKII!coIGYLnUNC$Q<#D;@;hM`@0p#Me{EU!NTX|E4mU?ahXW%O
zgVBMw%L<djKO{wwOSjy5m@6@*o!Nb>k+(@@6;QQ3LAOAp$tb!YD%9&hN!0KuY+-(~
zzkn@#ArR-lzQcEI^~L#N3oZJ`;m40%Jk;3y!z030X42u5X(Ch8CPGtDK|)k;Yc%Q<
zTuoqihDT*v_XJZ-eo40;CY}sg2Y2aL1y=!m1saS$sZx7dexAr76#lsi6I}#C*Y`jn
z`7ggRgG$~&j+sza#wE8pzUmUd?tahS%44d=bA)fL6!0;5%WIcnW}=mkGX<510c&uF
z$?;Fc<{E*<XrmZb$=0gOm!H0WuSXN6QY@F0nBM#8C!U;w@(HkrjtN4S995|iI*K8E
z$p|5>+`meiiKhK7G4N%P+9kp;|5LzVL$as^yLz8u&)PP>=rr0wgr>BdHf|9iV1kU$
zekPsyIJY7t_D9XQZdF|V)OPjrDX4fg$$aL5YU2U4FZnL)ec(ejEqi1paF|cYz+o~%
zyTSflbLI6xO}(O12l^v1xo^<ulGRGI5m3dSnVpCuK8F<LR<I_rwl}$u_K^}M18_xR
z#Eqm4vrC4m?~xnLQia9&KLd;6)qDjw%_;Drb!R5AWc|_oJ|K$m9dy|H0iO#vi*3vI
zNI0?mXt#Q@nB`ogXnDawX8kSqTS^9BT6!6cQOHT)Nv(&f**JzYm>$BWWANEFTDQ@W
z>5WaaC`E#rb#|{A!elAWv#sQjAlftq{FysFCm9BC>^)fC;}6Tec};Dp0(w)UqZ24&
z4f*0gd4$5MLZ43<f`PJ)P%275NZNn&xniL%g#DWY>J|vV;QSwnBy{7&3+-y`p8>C|
za@%=dw_$&-S#a%S{5|xd3|iKibOtJNgOCK*p4~$Z-1cx(*?r9N%qu@^L;jln-3^fs
zw5NnGxzcm4fdHFeXELJh10q`I1s<LQz`ELF&h$$Gel49frXRsg1@v`<?`IL<L6$kv
zY>kTur&mzRzckEdN{6l&bjbYP<T>C@(Bw!#YjI~7tYnl<)lSKLR#6q5GHHQ)kx)#+
z&-rN5q@YPACA9c(eA&2=YL6>ZBRzaNv^ERG?5?zq^;avj?50Ug5`dib%yHRReVAgD
zE_QfKM>_ItD}o|ZbiuEPssTxHQh;t!ER%;5upRT?Li*g~c+5P;A1w;W0=bZry~%HA
zA1M%!06VStK$5Monk?xiI^L&r?z$<1@`5WCnxe7)1MbvINgJD$Or$rOVgv{jA0<K`
zs*5)0Yj<osN5JhR$AGo_A6Ug-s|eq{=anSFZ<27n2m)`-+Hwd`i+K+4IVQfui}wtb
z&xE@u)c2)z28e+By#4m};kS~4nWPr!$kA2h1azrBd9*0u$B9%AysUkTL?$2d21pVt
zic*1y8f7tDKXAGoLSz-N00?*i`Zo!%{42tw!Jco$5da|>@M9$s9;Wy)5?HAr1y~46
zF%Fau2^nnA5q4$B4T-L!6Aehf*ma}loFoD=TKnka!^h$HCoChDH=##ovcWoC;CVE<
zgl!HWZ7n~T#4Lr+kudJHQngSL+8_ejNccJL3b>jzZBd$sUrLw=s=rpL5=sKGP{Q4W
zAIEMpJ$%yY;gcd3|DZ#uF9w(NLFpe5vve1s8ul(FM@19Tl<@a~2Wb9Bb}Db>{^ZTF
z5Ytf~C>jH$PSp=%mid$V`Ls9a2ci9P*e}&u0Y*mk1n@T!e!$ltAEhcYGBCyVhT|$@
z1C+h-IW``S8L3TjsD0oDcnhwI-br0`y+cK-C)QzND83^-<0OF+Xd?TV5lo&7n48!H
zKxP1&X45vn_MvjI=nTc&n~c(Ak2AvpM?lMGcGJ}zL4y>siW>OPF=zuKVzX%T49=aD
zaNoRW2TIjTBPND@PMmtW@V6kpwkM`R^8;V+LzGm9Sk4o*;`wOSlMoUDP7yH1h?GJ=
z8M~RkQY6W#`H<i^;&k`*l9H3Y@lh0ata9vr-A6)7D;v*YEq$=|R7h!9iC;iyZ07d|
zUwgZ}s>YbBUN38En_}Cd{PG;a`i9$oLK=UN=K3^Jw;t7B%x8%t@bpa)#Mqr`hJYi0
z^WRDz^t|qiO^uhAe~HV6!<NTf5SyN?XsQq4Ce_b%|1>%}Gn)BWV_H*PSMRN+EtzYi
zt8z#o4ar)#=}!bxo8aTC1n9bddg$BR5P(6T_;EHl0a|0i)&(Fo{KK*8@7Qslz4m9Z
zsqa&T-+R~GmbNsdm&~zaw1N>BWADb&#jnkPM_SS_FEXL)Y?j~DfO~V2%VPl-zb(dB
zp;h*>7TsdoVq{??n$pt*2}ld564iLzeM|z?4EHNyehYxn(}o_os{#}<UNh;PmgZ|K
zO*XPgGSOvv1XDM2<;P#V-fHvsK0OpC<+3KP#2;7{gbfGCS&V#Kam2E3zNRF;)mL1Q
zHY~>xezfZCON$j=wOvV$&eTg`M1Cbn8lypvP7#&xI1l}Kz!4Io;s6KTgNWURovoa+
zpr|FZdYczk6GESk|CXxrXJ4kGqDF{MHHpr*G;9%Bz}t%)l+X}R;2gjDO`cPxNXEv0
zj=yVBB&(#nK%3b*^=*eTZ(1yb^*<_u8S}ot6P`M09Z5g|74Upq;NNglpy0cuE_3P*
z&3P_t(u;E@!g+~=z!hVFlW+njS?OfL2?a3HX+{okBR+t?n&!f<kN;7j)Qu$$MJkDB
zND2A!B{WfUv4NOK5@UTM!`$kE*q}FrYO3$0ZDsf9VZ~_XFQ+ipRWj}E@9>3ZDRS={
z!2s;x;u<i4JK6%j4z8KP<{rJaL@)zPyi4@@*%P$VKv!f4@~O&LUMM|e7I}ok$vkil
zG`wBWoYZ{hkQaddhEP@Ah%fYANe8d<jbcGminaY6i-VmoV{6V!QV<#c%VHLK34x5G
z=e>LYM>PHBE%2rs%Y#S<r)&Z`5+zRdR~g)fmL4b&Kbl)z!h5W6ETZG|b$x2R1OMIS
ztfP7~T(OtJ`$Q!Y+U^R;lzZ4Mdq+A35HT<8x`lfqDW>P4x8f)Pl%{c{meh^}u?Q9i
z<ppkK{C%0~VR3$K@TcEs0QUjvN<3JobpQbE3YOgF7heglF=|b}<9qbwR6@c5U*5#f
zBl!wt3<}F-=4JQQu*W_00gDsebWy~KU5o`wjj(_I5r`MCCS4!LQL<gq&oS`4T{x@Y
z>2TvGU42EG!eNQX&kclla`J(gy~#cyo#7NfbZ4)+kUR!LXCc&4kxC?NB5xv7c^U79
zz@vlWhq)?xgaafND;-_`QM$a404`8Z@A52-?8`R0mP<dTPUJ<zS!OM?2?h6Im8}JK
z@a>a-0YX@2Ff1(45$dQ&BN78_^{hs#oyvpQ1J}cdg&Q-|(zT-pxrY45JtE7>&SQF>
zvly?Dh`}j2=`HfyIa$amv-R>G0bO<m44DHM(mHS(M=o6DZ}M0lV9bV0!O=?!4-AiY
zNt~EO#3JAeNe4+SOxdh~(!p8X%DArlklH7XUv*!YgIC@l>V@us#L0r)8TRPmq(aFO
z;4sH9MOv{0;HKS$+Kh;9$UJ5!PCVO}6$wO%DbdP6<=_HWS3^J~0kB(L_5I_@8I5zG
zf=c(<{fV#iY<qFxQMwu8vOA};GZnZH#*1badN#>0D|jJP(D|b~`Q1yD4C)<R(Nn5Z
zi;$QY-G{7!SZ8X|lT3i@<H)kIiKhwDRNX)UpgA>-g~Zh3CYc*D#!+|pS6R%UAQ&Kw
z<pu=xCbJi=;9%d$p#gj)S<sCNuuD_(p*{9KICDJTJ4Xe!4rfB!7=KljbG+^3biT1o
z6G;D1Dkcu;e1g()tME|4f4Q?4H~{)XmS+>aKamgKPLk5|DOeRX0@?(<0-Xx|7o<$y
zxaz%%Rras{+M+v%9i}R8<4HkypEgk1{LUW9|NM&V)yJj!lx@-W-Q2t@tGQ&WAquIk
zr5g$O(7gz;O2cmqWVASWp?hGQ4~-v@usTZ=LHfq>B^yd?X%C21IA0&HO(!RbY4bvv
z9p0f$Su=j?VTcGZCHjq!1JkHgafsf+u0%@`51~(vD+Z0}3(kzzc!2mV4c8*Y;X~XZ
zowxuKzlaIFdD4)ZrY?yramtT~#V!&eMIVp-oy_ML)%rWRULRGsN$U?Ii3vmA8!J)m
z*8Ix_YKgte`B}XN?RsW6>6ahT3P+?C+lr@HbWXwVX>d8pKA@pkAiUT+U9)#q-|emG
z8S2zA$InMILG7D%!rA{mu#r|X&-4+`KLNF4+|j(HK4e{nnXx;tXw`Nomspq1R9Xfl
zQn(>E|K#fO+s3qBPWL7o2?GY%swywuP64R7%8Kg|&-W74@$x-F$<t^?MT*ix9TtmD
zZsKvQ-@?=T{@XM+Ahe~&h_rFvO(MS|pTLLWypFU%y~(t_$<6`eRbIiOa!T^%vsHu1
zLY{{1CvPU`Sy{P^{g3>-PrgH{y8|6MqnJT=M|x$gzrc@)_dPEi2TC|D){N*56EHZz
zci-P4k)BN8ku!&F8zeq_D5E#|sv}x4m<m25kJ3S@Wsf@r00cgfM@QMs%MA&SFncK2
zn%cVZhFDQNnF(4Cq>O@|SQkrwWASVxdfBdhQ%F$AH3_3-dlpNRAb<tuf(L~|7b1kl
zLIrOFh#bWzQllT*+Ykv=L07M`mUh`>k`GlfKKj?gnOav=s5UmB0u)deE`5a!J$sAd
zSUdM`2m*eADL^B!?Ze21x;pgyVEvQAd9mSVQ4wKlXZA*Y={OnTaa-NeQY0~P0Tm_$
zeP!Uge1qGPc9<FXkm5z3Ul~9y2%3cedB_2U9w9y6s|@dLP*y;1w?KGyg?V%WA{sh9
zL<O{$rdiXV*Z3!FxpK!LbL6D?E!vVS3l=+BJdBa5fyyRWrSMs^Z}9a@i#^|WyJ0?T
zKwScWP0`D`$^8UuTmXHIC-g6f5d1GLG#$-nx_K{UlE>ZiD8w!VT^Y-8{0}JqQ#7;y
zNa&!cn*jH{KIhl#4s$Kzy8^ojSz(W|_O6C9KScJF{K>hJAr0_59J=zSsCX7ni|KuN
z9df^a)EGIev~V_!JzMP`ay$BSa~pVHBGiIsN<OeOfKXFHokUI8{1=-domgvWe&GO7
z$xi9zU+F^XA{&@l73tAuQ6<pTMv_k4XV3@NX3x!2%iTDQrisyoex5t0_Hsg1_HGJz
zH^s>tW68tDJqn;Gu-qET7nN~%yvI57)?6vyJr2*~w==u|V8a2DBr&r(=CJwJ!;YO@
zF457#=`ny=2Xn)R2#ukK_W^_{{;%I-75<V)$YB#@d_e*GOyDgzQ_82@Gq)jg3K-m%
z9>R@^mi89-D!bNmb9y^{b?PNCgfseJq-1EpPYP!~2P!SspKbsWKTs{8lyYEhc%l8y
zpku$Qd2d*XG-gY=o3w-<yqRVburmKF^bt|(8NL$N@U36RGcPn3Vd-LeON4HufJ|i<
zV>YYylLyMbwCcHNEAjoxYW~i4g5O0)f)-DFyYZcRYxccrD<dSga#+yUdmQ`Yz`P`C
zdY=L3p<KWefh&qQFduSc%PzYpYY{3~?zDjXZ2*<Tapbl4362NXu-4)@M)vtWn%dkm
zjR~!znR%Xzy&k}OlwXFR$K!fsvVXb{sx4Lx(Y5YU4{;tySC@M$cXVqu$pgrnt4XW#
zX$OZ-tkfk&F|x_U6%@5R>Lt#mmW!+o?H4oc5+7{?6%|7##R>Z%lW~N*H^8h1qYQcv
zC%EeiwQef`#ld@RQW3R57)+`LSR>F<e9Nz8>c(EGA!JfdiZcFuoavK%uq1rwS=r^w
z`+s)PkzwXrW%-C<njJ-BlcK7|F>Tuby0CsTmcKYmsi1$mYQ`q>=)`|wgzm##Xx2|S
zGJuM9^CbRElBi*%d2!9D>M%K2k(O`roK!Pw4?yOUCia5@9n`asP8`Zqkc%u#t#aGH
z-rIR)&TjDbD&iMV#r*SJ$6NsEgKIqK(nS22e=rXn-@+zY>>Phs9WZ;J=t7Rofz`=?
zPah;9`|Ge>BTvO!uhs%u8@Y)!*u?=w0KE;zC0W>IXcG?P{%5bx&8aH^AuW6$Vt4r5
zOVC+O@&no^CUFXe{?6jrkT;L|J7@lE$4$U;e>(U?4jHp&nk6jF2#rM76`Dc<=swQX
z|1^yC#d64({evN)1Zq0tD05^45yn3~-YzVq!GS&88&PjE0a6W>?S4HoRK=NDN0Fr9
z&qM@M@+I&lI;a)8mxulK&7j-*H@+TJxO9)XWE<UjE6zo@f4&&O^r;D{Q~cN%F^if0
zX!ppD4yaV+(Q2$w0T1O|@A~V5f*hn0aAOny;@0O4JZ|S#pUw1KE$TIiNWAdUfn0oH
z2BHZIt|+NRQaRb|yIL8;nck!tf{v99w4ZD*=XZyvy-FI{c~U_$q5Wzo{DV3c?Y2!-
z{){bd;Igsdio_1=qdA#-56S0+d7v^rO+d>xaR3oo(?~`Q1C#+r*{xq9l3Z#G+rvJ0
zaV>xD1!a-;2FgirZ}M{_+e~bLW6H{dM8PK$3?@F(q}h}wrrd*xcgT~1cpy%Kb&GeI
zhPNYjnSav%H`*SXAc`>((P^)~vqYu$SBdnAl4?*00|Yp?mR8HQ2VKgQH9Z^Pydj0F
z2Nf;zON-S}zCGB@9$!u#V)f7%!PY}XIJ31VDdJtNg}=+vVabDBgT$@?Ys!%Z++Q${
z8YY(ZEDku^7&^X4Um63DqB96uKp{*!bFe50@bzBvC}+k3Rc)X`Ft-hfq=W}#i9Asr
z9m7CL*&X>Eu744DqDAA#o+!Cx5|&K}$Quv@6uT-m;N`*DrTRM1oY_)TWw7(UbMqe0
zhd3cft1zgQKp^5vsu%5hjuFiX<dQe_LByvS|GA`x8_5lo>iE<;FZWX=J(&EbJBstk
zKh<6F+DYC*uX5%w(NjS+Tcb?>_Sd6XMc%J#aNZU;1Lg&sDiT>AaJCJv8mr<=Y5WW{
zDmKvY-bs3a+rH0Z+Mophxr5Wrd-th(|KhFpxCr0}*zlnpBvI>p?B6(HzpJD7ybaOe
z?BT4X+YajFnED5*!ZNZ_uj-ob&z+>!RCNn!^IwMl?;eR;rklBdibX`^{qyV!H=14k
zH`_p3Yyi#{5vmM=tqPYxXl$cB{{&6bBKrLw1c#3c7&l$b3_!2|^hWrJ@&|TKp1hLs
zfo3*hJtBp?uuTlm{Lp>0o6oPiSXt$szwV+e(#4~e2uJiJP+IH!hGKfxXnf8u46<)-
zbaS@$P48iUGeVgtU?0)wAuE9u-u1V8w}%ba=TpNZG7rcS`l5FNY>B>yKKrhm^{I+p
zSsdCmeLG{;mjbMV0%BwjVem>rs1hiE&O`|VY&>{JyUV?Bpz|W=ZPFulvMX`1M}E{5
z2@iaoQ~b3%(Joj0{P0p|>)ATBM1t{iW!PQ*D@MwTO!xW0tTGqYROCZ~d6@-Wr~Sw@
z_y(W0V`A(*cSHS|?3Gf>|IGqCTT)Q4iEtl>BDHC8``!_!fI!QbUuq<PYwYb46B40N
zHr@nes?N@PG+H;dG)X(rF10U!r+u)pwt}<^FE9Dzl2!?G{UrerLy?n9wmkmTB=rrn
z;jEP|t^sN}!xYbv=16db;8SG-ITwu@=fL2v1|e<?kR>ISi2j@MUqsr(Ng!j_)0*kP
za(nC5?<3Qq6w0UvfeBDvG>nxDZL)~I(qxs*W1p)58h^+j;e1+!1LP^oD^oOw@8?18
zg1*wW@K*II;ny30);NcN+5|SY%mW$J_}}3e;j1U_&uEt5_D!t6?ff9@;KwmII%2l9
z66=$vr8J0s-G}@9>P~%F?A`@Pf1%NlGx>Y1ZmXNb|Di{0ARY~FA2D$P$awh1{$9+#
z&0Y*!0k2s^;$};$^ML^<@;MNX`Y}aBMw#z-H~zvTdwE8_S1)9+FHI2@mW&|{`xbD2
zZ0BtQH;cS=&kqp=Kj><Y`FeLT{dN}<CB)Nq|9uRB;L-wJt}`4|1k5Z^{RrcIHzNq>
z^PP26m0VFx?agc&3wPv){0Z>)B4N$fc+A@?4sO|76m<Ws4+sf>srmW&g;aH>iphmd
zy}%GQ@aADwlher?es@kR;-e-YGxu#<Xvkw$(4o2768(j*q=@(x1pWE^1prC!@t&A!
zDQOrZ2<VCmk2mjSDA5T&QF7Q}#<>V5Jz~xG>ZABUbdm3_2XxJN$9W%C16rl((>fcA
z{7;0Za~#mvAta!(j2hFqXS=L33Wkn>L4Ppnd)JwrPTXhHTpvjnqul8ZQ{21K!<-#b
z<SsRr-9KHV;$Qe;zr<;fyVUTRzV2v$UUsNrWKQ^Y<Azjp@vwbEnpM77@<nfrsX@zJ
zpO8AKdWx|1H)omPfR?}F-sZ^sO!E~Ju3b_PvB=Zpsk4T*;+Wd`DKUz7hu0mH%go#b
zU8_0bC_tuqCx03YwIDqVaG$TK8h4pT*-Z#dsq4SnT{H^~NClZ>fsAdlX6+V#MNYUc
z5WV+IN#n~{Dg5<AXxSJM*5VXqA_t3wnH6nt^qmL{oe0lvUBoZn;IdkIKc=P~{O34M
zi_daFEABM9^yCajTIYb~&+Ns<%Y(YwdC9%MAIa97j=K0nmClT;5T3JP9vaJ`a`;n{
z<a_}*NDpAngMRU3a&Omy*a~An+~^h3Z$$f9CGABg#W???KO9oLy)<MoS?JMqwQFW;
zl@$(j|Md@a4@EWHLOu6AVU2TzV#7dBsyBI2xmO^$Qxpt(YI2K)kzJ4zMd0m}5y9N=
z>$x9>7^YZTocL^efI&th{&NrdAOs=BjYVIK1}{4T<0eTJpIC<>)#w*A7mqI<&Fs(S
zC}SqER0=lef~KMZ`_^d&=e~<#4<rGaXgEhWWx~=QcN8X)mN1xqvr_`R>2QAkhn(7F
z&z~G{#l{a?x@YSlk<bil3=YdsIjl+=o44yu^j(23Oe;x(bb))T<0baQ_8|2br%+#*
zjMGF>z!xA+5{Hsg$$}|XDP{zN--=rLXHlOfI-X+-fFEH411Y~w?7Vr-NkhKj_-#D9
zH~&&dcxqR|h>*I-c?sjKnqoA1l->_o-wS;Nh>QI7g6Jr>X5zfoK|WFT)R|2k1k~4e
z%LS#E$x|O%hHeNl<nMKvbJoO+g09OFUt$}!<5@<f72`;g;|}6kS=lm(mfZdp)`JyL
z!|TK-r;TyuF+ioCZM~tp19R*~)Jv@N0??F`XrScx0UEhOVIGi-P#B!7{7O;_XUA~T
z`0)d9JPb8#Us-QcZ5P>=<>yod0vssyy_b*+9iRvUq7zOP4r4D%?2{}QAm+-FgnUg;
zUKmexBA@!&jf3=sRO5Q!d+2Tu3a@LSK8n{qXtNK~2wmo>X|oRlD;n?2menqOP;MbF
zsWkqigM7xXJLYV6tX!L$MTNd)G+*G8tdO*%;RayS;<A`}vTGSeYSwv~sccLOO{!~Y
zPTjfIoUwl2p91%dE&Nt=R^Ssj6);ZY0g^i~Pr?8s(0>yyfR$NtRxAs<wvbkt70)5Z
zjE7&L>!Sfd8m&N!<~c+KJ*l>Km_{hBv-%}QMw5xQLmtqH^TAUBy;KeX@158C0|E~*
z7htR(PcyCU+YFL!F{45i(d{tWf&_3XN>5n7v*!cC?6+{p8w=;=9;H`Gn1CJxbo#L?
zafbmvfY^L^N-4|RMD?;CWQXO)3GqkYhxUFX&|f7!&_?!nFozW|=f`HmD0L8j54GNa
zQy7<o4)OPXUc^7HR0N6l`1jUHl$TeSUw2d*{DjhP(E4NHRMD1;Tn9*rJyC`c1I^sp
z`F15C_;vmp1rd)``Ve`du~8Zy0Zu?AEGj8A)$ZU1q^5r55es0BgZDS@3m17T(<*sq
z|2{rJU%iH?3M^8%Vq2(qV6Dkx5MS>wN_C6D8?z;JdfP6)vgIq365f(F0_F!lBDVCF
z(rNdOaJ#>L!3Yhm@Gl-;yayx=3zolOPav_uu5ZqaT#oo=CVs<!ITCNey_}MA_OE{k
z<lxTFufxx(Dn8Hw4g*v$gWc~)-y#%hvbH;^^dz)lnV5bhvgkqOdwfZtud!b{0s8Ap
zh79uv86cb`4d4qf5_|G18)q5=wX;MtwYRXUK_j!5zM}kN`St)i)0H{(kOkt1JVmMm
zY8Y+M0KM6zF7KZ_KhFm}+Ts93`$0K0z-;cPO6&oklOmCK$S)PI^bJa%xDn6hgLFt1
zRv@%M6?XUeloG>uJGmH;rBv14eG2s;vZQ5!$VNiRlzZ3gO|)@!V6VX^^Ur{hl}Z!)
znbQS)9eqVkBfZL@r5lcnVhLfG8CxZ011TN(Js=}5jreA{OZtcSzPf&S_xC{QF%Xuz
zwN_*{b!C70$DX$-E1=zx_mjnpqf?u}8mUW><RIDDFPm;1lKi#&?+gw07oQM(Ufkf_
z1#;4w`kvMN`mI>8%>*@WGtY=b%tSX~{xVUn`@J6vq!@DiXv!{JeYcOpn*D<Q99_%a
z&~_QY$Vn^W^%>~DRsvnrffAo`-eK?(Nz6TIjPfF;wXwJ><=x*!L8j*MJ~i+wvJ7h`
zm-igB+nrGG=IHJHPwu_DdS^=VWt|DO6kq9syITcdlqD^YBWLAf129J?xqK^9Dp-De
z8o|7qppjVVbz&{KaK-@4o}G1J*_3%jgr<`mqB@sb53^4Fb-Su5V)?r}96rTGo4z$V
ziboMrn<Rij<v2%kjIQCd_Xn#N#m<x>HL~?a0)}Z{iUNsaJ`i7$O&Q#K%tPI17CQ8@
zT6@~Q`4YDiHUl16FVr%8hCc78P#D%Uixh)6)o)npT?Sf;%<C=L#{FOsd!lq$QdXRo
zv+}D-7g<FZ%*Wcv4o1%1uoUlg1pa<0A7u>{6QkR?qXUSUD6v8Vam*iNdtes46y**8
zN~z#?2rwVQ)x`3u85r9Eq~epaFZI5|L=ND40v}cgTue&ubX;PIsMi9)Bw05f33(nx
z|3ur3DiN>LB)~xdB<ezLH&-|qu?IY0I@JJ#&-=h-AXasVV}g;d%Ld$+_C5|S_YOpI
z6c^!?zU}tYR5$7Zn!~fH^^@B6NHi4bh?%^AbZ@eIm75C&a?J?}j2La8;i^fluYEv!
z+%38=XE$)&SuFf%N*7P1R@>Se=n-sai2r#B;|5KEXstu1CZ->*q)qrR_^JLDrpycw
z0-9-B?+mnUrP6~17#)hE3rpI(`>#7bm*KSG3cacUnm^Ygdq)rwK~m;UW`JEX0&)Vp
zz5!6J3WJC-vp&ywC}*_JEZtO+R(&QVZX~?m7|kK71#ZJ#sMW?uInOHx==3B|Yge~>
zwBM?79>#}?Kei*Sra5$Paq|Wwe#rCTFxrA3ZMbu8>ohmkqcp>!%D14(JM}ph+&wmN
zX{C+X9^$>c6uh^a!oTXVfv$+d%gj&;;zqg#x{53&Vg}$!=<Ke)u0Q1}nKAmluO&Hu
zN||<Udp7BP{2cXeq;9!{4gsyz3A1U&(Iuq`XZ8U6awaXx9TL^?SXoM(w(tJL<!0IL
zGM(wHK#CGx^V&(uV_%XEqx{6q-pbZwk$h*yQMEqvENL;s?Zj{Yx-GVNFmMCL*c({c
z*#lo90y<u#<l}388pJ=}w1$(Whr(ZcwneMd?YkEPu+?;KGi*tT>%*TczoP|LNlg8f
z#ih{+WGa`9OV+83s+w-+Hdkq}P1z5+tEY!T#5mK{>p=q)Cn8I6;K+!ol%|<ZJuA&(
z-^TryD!K<>$)Dl`gyx}YC4T_zqXqP)>#X`UXXQhIOP*u)QT(qPzwS-Su1@#1sdhZ<
z2falH{U2*iYE@Z}vm2#7_a(h34TW8Lq;Aiy06rQ?u>rtkaby0hB!d89@`kFgAK6nJ
z(9~-C8Qq=4E9?&+r@pz_BB1HNJ&&{OF6X7r!BU5IMYcue!-)bD6Vt*^)K)+2m;+2;
z!f#U?MVvt~!{ZO0<5+qaP)yx)t|$rBe6MM3zs;XX72e4N)>*wZzV47v?jer1K%^+X
zwhpP@&PUn+qDeJum1U;)W<K%qlGU;l>n)HKZ0fEQ(YUeg-0AbaS|CKiHCsvy&JI5U
z3`yBM18*R>M?64z#RB4lujR%^Sc<S>jSt!W8o9?hvjd!I3viY_B_1rjMStRy@YDNb
zbbRdJULNx3U$I-v5VPX_Rg`5BgBeSEKnuAg>$<H~zX&&=V4Zo&&S3EE50&cW?|1sJ
zGfH^o_MT0c9PiXKNL-bqf0!SEn?pk&i81-1zENE<Sqx2C#-39ERA)LcW@!UKDfxwm
za8tZQP|^$Z>v0VE&5dA!^pA~ehO)icb1*P66;v(p!5b)=Ndw<hYC`c|iQ%4!(7qgf
z(d%$Cq1>f;cZWKQ2u1YGv2Lh+Y!A3XkwcClhd|RM;2I@Cdb4h-nVE(@bnK&YELj0e
z3D@dPZD+IxQKeCPN}c;A(l#Ty8_sO%I^I7^22|4V#S;lk13Qdzte2h}9b&Im{oq3*
z&0=q11@MF-Njf?q|0T6JwYN%&rvl3m$fV%JZ(tP1fLnxcXBqmq<khM=>Umk_{An*m
zy9Qarm$T*ymBT6(&my)8k&@H<)}d$a_*-nWb_EduwS>Xw0ikBbi%R$8=yYFrb)-UT
zk?z-&BTtM)rsQMeHvgE8ZriQp?$Ny)&xYSAm)e(Y1T7Hhxb5<qew)`u?*)xS^rOKQ
z11mNjdd~!oohHsnj3`Tpnk}Mna2hAmfXoOS>q~oX4p5Z3jUA_LL32%WWrD~&W6eeh
zvJ1?wERYd6*UFOAS8}&7Iq^er6Ne-0i<dy`37gFMc#kh*mx>j$WOj-yW4oa(ceOjK
z-YLL-?V8hY6YDZU+{63HGd-T6waE~X`^#LI^|8EP<O$W7)I2(hir%}%Mu6`2Z5k6p
z&Cuu`KO^_IZ$JGgvltkfPS~PM$9)F^22%Df^B(<$Qy|$$1M~tGA;;;VL;DAKuh50i
zX$?_pNk$f@+movs8|r%0?+wyJ1|rysYfeEFp-KoAZl;(&an+Q9CV9SZ^=IA-=Z_yW
zB&CPS!d{zl30;*`tn~Eslo__BMoZl#$HtNj3=B9lH<!PQkB{#bnAY#IDs-i&dao=L
zNBzo-SF56nX~z2Od=(jpP9y9P;F?wO++CYHzbBtxKwwODTH3~j<Fxj4v6tHJ+qc|M
zl~5Kz?!@jq7;iOiKSfMOQB^L5gdab*w($lzx%QJE0`?qz>n;~9JZSsKIi=D0MI__F
z7lUTEqt!T-YMW{9l2Wlfna3{Qa&sy9EbxUE9MIJZm2GVVkx5mt)Y+}DE7F;Dr`F5$
zw3{8Hdx(@&RzX2|A$o#l!q~RksvpB<H>~Fczxif%i<`baO;}hMBNG$Utp72yVlwjL
zXeC9`S2T{ry;0Md-+|a6CsZ8wW`Sb7P%Q4lN7qRE#<i#WO@o#^YC1Fb@3>|AqEIt<
ziNs0iC>P-%Yaa_iU8}CvH1<FublMQh+;l0>))}16{|0)#;7nA}a*WHx<vS0lFDmNK
z1S!^Ltu&(FJe^`}BhB7eR6agA(QWk-pcedSJebJ!ake^mKz@;{v7RKBBw5^+*Eu?E
z@UMBq+mYRW%aW{s7^d`IE!CIyngDWK4qaacWs0pvw5nXJ(B1dfP8%xN*lZeX*4Zr%
zG`a4yq&=Ngz7&~)Nr6&RQ+29LF?rf9OzAt-{l3P;bo}j!5V_v{A+nL~Od(jN&SL)L
zP!{DweAxzFUt4OcBaXop=POT3O_h85c1!R%KKYi&b6tlc%GL&&&*gYYK9L8RUghrN
zMv+i*%<bD(W~@_MT^UP1YHH%s?3%&~GrdZdn^$jlEu~hb+wW@K$Kk!n9O4HOG&Zew
zlRC})uEhlfUxb!@;@p=!Lo`dZsw|@kpI=5mzgYb!JeoXdALwMlgO+#P21Z1Mug8lN
z&S+!NU|CSZ2VkpQWtk9=*7x^4R)rZ)tHlJk_39A78$5+t%@HE#bN+XPe+2?hd#UYL
z-P^AXjDs}%NU5m@Q!F!o`rn`X|L|}uoZ|+4sulV<+?)JN2m<|k`cum1;>GN2%#S<g
z{d#34XX}f^)|PYcdS19<$bN1F0_wlF?c+}pvxbb5E+m@Rsc8QN#F+BCclUV2h8}-{
z#Q{6Q-nb_Z`A|-It!H`NEtr$5SXr^%-)u;Et|e%DoG-dteHhL639^NqJ>qWq3yCrk
zZ1675W6pQlPFD|ea%IK8;CCRZq*R&Xfed9zq%ABg$V6JckN{p>rc>3~yaga>G#Iw}
z6jg7F?Y1}9gP`QQS{N_*H2ynZ;d1f7ukYqEW8D+nLg3RyF<$IeCq%C0hL0?Imzyl+
zUhbcZZ|be(|ExO2UxmbUMTA+bueq4aX6huHB!-dLlfr{^zNfvZDV3wV;S=A8_>X0B
ze_%9@KxhHA^Vk2e&CjK0WmLBr+;?1DTrF4IrRm=Ljb@gX&OKz>hgUllJ3Ug;;Y4K4
z%RC1wbvt&so1-Yrobr<Irh0dR-X}~tIMUwa-GI%W{U*QP-TnAWs(oC(W&;Fcd^&GP
z23RJ`@TRMOuGU7k!GS^Bz%`+w(Q7c!-+N%y{U@f&rqtE2z2C|*YmknsBj&3{PvsCO
z>$+m{YnMK;>{H(i`rq1+>PIt=^n-03%om$nhq9!y`kr|YZ8&?wcW0`~^c!Qn4_c@F
zj_f;AjT|H-!y5o3bGY8C=d&21_$9i-Y3Q|;A4;)~t2HlZw^A@@|2J2Yj$qDvmwRT<
zX6kHfiRfi3$IYBg1(TrQRI^npbe(S`i>I3d%)`U80r(V-nFl*)!A{8kW`!<A%3o5i
z-maF;5clRs^CGVSlCG8dm+%U{vc##z{Tr&hvzB^doUYk<XXk?Xv?a>2bCMVx;zo3v
zGsh5U$ojg4UGtuxviK3q?O^{NOKBs^Uy@qL&TO{Y{7lx4{wW>#-QIk?^W|C+pWT8m
z@N6BJK!o+aq~iNV+x-4Yj}*}_Gk%$wN}C{GEN^eMCiB6kOTgJ>JP)Mh6ctyG2YKp+
zye;{q&Lj^HyNE&-!nr5C#oYJJj{f$vT<<rZ$rhTDU7Y+hM_fKCm4-Eo9klS7CjOjE
z&~*HuexY=A90PK>GP?*09qML>oT|47nxXX%51aq#3|{cN-n-2-$w*A>{V^grh{w}{
zvN_|pC}OGvKwGO!r=v{whsWPAmYN8uP>K8Q6Y=xH4Xm}=(w)*-Plv)0xcjoNyByKI
zf!nNkUZJ~=!8_0mx-=}&MDqtmc2!l3)Xg8FKmt`veOp^D%M9129NOhIbXS?7`dd39
zw(a8fy>oQW0x<EOIxKl^5GcpXd^ku|YS4RWkE5#ng^9>y=#VhM)h00d_VQWgH_2&m
zmPx{Z?eyH-fPwpB&nHa0nHnqg_GS3x@!IP8`W%ahYjJjVz#w-s5MdUFN$odG-=@|=
zs*|$3Q-lnC;Hrk+mL0#8*HVe-B!}>LFkT7l`Z+f0-)z2-suq$$3G7_IK0qIlI8Q(G
zdllN$B-(a4Y=3pt>RnMtD38qzf)6Q|=~nOUH>?nvnl{mhKH?yFW5agglQeE}F^s6n
zxXY4y(aV3eb1ETlqiw<^w54jr#lsVAKA7k@$W=c&Gt*wLC?|)yyFS<$7Fyn&EQv2D
zVBT-q;Vw{0>y1;9EGEr(Ihy5vZz<^4GImfgzinr3W7t<UhE3=5B5xxg-S=!(F?Av*
z>YadA%=fzL{k@(#*yrnmcBx7*`x{Md?UU0A|BUBvqCA9Hz|nIfr~8t(blJW?k*h!B
zd?TU3-+gU_#^-3Bkw<O8MVUZ;X|_y|B#>S}ob8_Y)n@Jka-A>xw=Y-tFF5v9S&cK7
zH}5wY63BiB!f^J7r895_RrTE3OWB0^y>%k@yTI+-yNXVr)ix^0P+49c)ko*QaBx5@
zCv|rey{Du?0iR>nG>D$o52;`Fo1b2NLAH*Ii+gc*-fnL%sS9h{Uj)WzDBy%9WVTlB
z^S1RdvA_4&KUI$DsE-7ybiuC&x8TgPX;}KVDlpzxtLCT?oiz0t4tDmxWj}uX9pI?g
zJ%1%EDw>*R-<ASwJBv-d;Gc(|k`lp#$LY5Dh={pgJ=@UC$**pSWufzMQZ*D48hO8e
z-c72as`a!fEqE9J8&VbVF#t?Q4s2D9N)=j&wio?Zy#UO=m|woLu)q5rS~D_Pt&)Ak
zHQJ`Z$;TH50HNO@1fSQF&MrT{s_*Yx87@K5#4z3es&W<V<5Y+fcO`-Fyx;DD|GgNW
z<*(J+=_byO<y@=rf}^88I_HfH_cQAmtKn3E2Xnu9=E<1H;#B-g(&t?EZ1?a!Z{c@|
z8qm=8IPAc_y_*YkS&0;yOS`i|%<f#C5FM5H$E2kV>e&-`Z4r@m+qIr*U90Zmqd07d
zL>WPuc6o%<;02d)B{K^PLJNdUZew}OjcW#O=;!#i&-+MdCru)6wBU;ESDLTPLPKwG
zJcu_Nilxn&$c=oU<oXUW?FU5&sJ>$lna|m*Wm}1^Yg08a{rexRiL5<2KJNVCC!0q~
ze0Q~pdQ$4MTio}uX~@~lt*+wd?77T!Cb_mZUBms|wSY{N!}a;Wxu$pituu+O6q<Ob
zri?Ydw38EW{gPK{g=1l5{P{a>cpHDhOx{JN3gOGR*HJ%&z8{S2g!WtM<ooo^M7N$!
z>FEQALL=%@B*jC3?2mcw31HC0fOgy89S6Rt%>6xid3k^o1y?X}GcY-uF~gY=3?c$4
ztMO*B>T!FoBCpD-a$*t_pIVpNh^YB|mc0xSR&&YQV8JT>PF<%~*&Z;qa@$P1XLNT%
z-ri=I4Zw-(*|X}?O!Ea0M`fKfR@tIJmbaZlqBhn`H7AmdGGWWn<-)pxMBtSJ3IlB1
zoEG<)w>4kJ!e3M}w;KAMPA)l@Bu4am0DsV@-0q2h5<r~9GIjGoKu#oUzrQ`0ZFaA?
z{Z~0YH!*Y<?Udqlg;prLl@z9%aVEGqK4DG#7UYL>gP}+C&cJ{cFcSxn#J|yiea>G}
z_dd@&S7XYjPK8YMbSwRCy?%*o&=Ar|?(W=VCnm@Dcjn`z)PH!UZmDFxdDt<lJh3k~
zM*QGUOBa3A8u3~fs}i@bU>-Yb^$ojMgEwcX-tN2ReTlSw-mTIK^74PH2Ssna7tp6-
z^*;vt-yMcXeRjExP;d9MmL>r;f4RaEtXLkR_V*9kORLAexyA0<Uu^aSyjZ8L#g~Ya
z+=0-+UpviBDp+70Pe<(WqT9S}5G7ny<Z#Q4s-$UAmf^$YCitSIeuOM0SO=$Tc!vA#
zfmu7R5B=%DrrSO5X%G1(xu$c9E2@8E<h8}5EP1*5wfTaDnW_5k0Gar4^qYpOsZ!mR
zkB&&7cB0g!O#kthX8-!ccgWz0*R^+<UMr#Fb;b3Sk^gnlvf&_3l96BIttB&^$Ip|E
zHRMno`swNE%~3QhZp)YWq9WEduYGNANyo?CEZxovzgHUeI_7m8%@4MtKYs!e_R^Be
z(~F{SSjGq|OuzL-x3O2`Q2V788657J8o~P5^FL1uyEcDp7JcY7M;zN(gT3_886jg3
zCq6B<Wq3<;ZNjlZwb{=A`O7oa2}=Skk!8k%-sXe0w3893tfr<>`QCM|)V|x1r4bR1
zUknUYg9JF}5H_YTy8GikGc$8xsy9Zo--QRt_wI^^9rHFHWtCla^Hi*T2KHUvdiLJ?
z1Q_?Ma~%}&pz~NyvD~#m$_{*sBag{USvm;|>Zj-e-umZ49m{=VK-zP!c6v8>EHPBh
zR9gZ7S;G#S%jChezfofQ6y1-56gn)$iYpH9Q&&6UB|d)kMMITm)&)I@+0xNOJLneN
z&je7$v5!_LTdhsv$!Rf~ANmk_Y%9?Nwmf_>Xb&HxlWjN*X4JpnmvC^umUt^CkE-EQ
zaTY~L&i}KzFO~E1UZJ!9cYQ*Q|4Z`vBeQb)=As6HICw9=VO~fCH>6X_($Jw`oT27=
zpiy#zH8>q8Rt4>LUr^DY5AE=R4;zRpW@ln*-hFMJ9Bw<8EhRS|I^^_LPYTk>RBO{V
zRwCJbfw{crc7jAFsx<CEyACN(dCINd-y2EY%)Wg>>>%lYY3Pax`%HJc`DVfQeDT)L
zs4(4q%d@P(3A2~X=lX+U8sG5N<ExJ&<mg#dMn>8rCDU4`KBkXPpx|pq_|TXN%k7K*
zn+2%r@*unO1d#aRZ^Y<#OJ3J04Q8bsjlOQEx`krL+V&PNC6(lD&A9bp@Z#Mt0-6P?
z@T$K(t8b4?j{HPuJEvs3HI}J@Pf~Yv50d0q4F&$jbvW?uvn_dRom$(pk-u-d!et%V
z=_M+NNO(ONz8gXf$N~|S%&B!eJWq)I4uj|pM`ejlcYHJc4M(*93{EoGbfGYir%qjW
zdE{Gn9ucS_>UTcrUR+A>oq^FF?<uG8&se4<rKMp1>Pn0Idc0GvsCKuG>2$&z^rXR8
zPS#E%EMEdncf`0JrA?+y6m-3oF}nJl1hL4acf|9az9^*Tef-*eAG{e43hlo{GG~vs
zHK|D5^8c_LvDlldy^S)NtFbE6t1mD8CfSIDpiEFkGl>*;t1MD~#@>h}loEQeWcopt
z@9yd|2y^vv8puAnY6=Kw-trvmx;0;(E8L&KVSyXDha(ET$-bFVM#0m0vs`+0m0qXY
z(!uNQK#X&WJLZg=xX?o;rl-VczZhL4cL|jDVIV1f1U*_}En*dl-u`wBSQIUHT<jE7
zQ{jEgzIKf^`p2!Zp&|LlFVP4Ep4OV>e4qL7t1_eZOiVmct{fNmWKwdp0NW9zaossi
zJ3#Cj&X>HePnVRbM7$W6+jG>1_p;RuNvN_+nt%WO?I(4<axPhrSJ@pshB37{mMa2?
z0ei!?!Tuzb?Dw_J8=2lOn+``($kQoZ7WXvCH2H->++1e_FE2083aVOfr}qKpjTR_2
zc?+94$-H-GqsG^j4Vh1KlO4(Tu^dY7D6MF-mYTReA0GG%RQ@X}{#T@L-@ZNTx(+n&
zP2NF3m5}$Q-(_qc=*r<q)_u$J!9n~?gO1(JWF#Y_h}d|$5aGVmrpu#SHMhKb*K4Eu
z>m5G?<6#r)&5vIv8w!V1l43p=l@<Ah49}r#G3G{F6Kq=zH@+F%sSG=Zf4a^vpg**6
z0xWa0Lt5wU+HcQ7XIYEP`oK|7G0v+~FOr47FuGmb3*$C4bF6v)WJ<y>is#XJ<y&Vv
z->coe?Yy|phvbA0y$6jbYe=0+ngD)r1Edc8pJGX5+U3Rz-O8@ypVaoh=oiXvCVjcO
zBl|I1Wscok7rg&;nT?ID%?;j4Ee+GxX}+uV-pmPk=@qe}J|Zr_O1foBE!)iBQa?4N
zwY?*TZ|TyCKN_-ZJkPq>v{Qbf{ZWQz#v9B#F8V!<tB1<Dz0(i1SHEmARi-O`GQ@Z5
z*IrY@pXs@tQXYO453;0&b3=P4fYy+pmerp#$~=ITY_y#G!u!cxx9d3TbD7Q~M*F&g
zUr6AGv)+gO<e8b#_OPOg*3tXn;!hpsNd~XqzYmFN@<C-~O8FBc&$(sS)d@0g{Hh5H
z567KbbNdqyk}hnNe%GoD5~s$zl{)wzn!Ylsj;?9;;4VRfb8sgR+}+(>gS)#02s~(l
zySuwP3GVI^g1bB1;r-VA!CL&_%$eQ0cXxGF&Cn#ZLQ~>82_Ct}<tCCymMCyLdYkO!
z7_RE-$~vxUkNG;m75x4CcmM9i!{Y3Tg-YGW36HLw;|p29b}i>~$Ub=&AJAKln+ITN
zAdBh0AtmW~-xi9AOMX<QrJF;lv~&^XVaO+SxV(azkXw=)8>FZlbZqQD0JmrA;NMez
zp%~^Cq{x4ZwY!_kJqTsAJrgRdT~Y=h;PusK!xx6n%g4qyZUcXygr1E|WMmLO@EA!S
zB1*faog+^OlUad#8`61=#w<ypFD3>?%k>1W*Y!9j9)H`c1fzOSBH%ZVX1Pn%Z3fA9
z5&**iPm}#=t(37+TC=5rRN|uk^&UR3-^~vpT@E9+D@d7TS)mCIzB>e6i0^y|q+~9a
zI=wsY?Tr_cq>q;KlHgbFD@yLx{y2$4RY;)ag6!|@+mFi1hlYnQMJ;=)uY?c^eV)3Z
zHjMC-_<mcod(dv`w?7F|t!T{c@1;B3v8&#b8)dN+sR|Z^%R%srUHH5`?t8sl4xSeO
zfZk!%^PT^r5H@YoIN#{oRkgS(44v6U1!`n(tnepyP3{Yt>=TUj#(q0gy1P%*G(b3H
zjG>m#{GEWOnt|G1jHcng<qGc)Ow;ctnI4{4>i2_!oSi>Igh=Ov4k*|PrK{=0(N8)%
z=`?EY&(75iv9Wn^#L$I>#1G{Ub6laJ3qnwXlte^CR$gCg)46!t58HXaw%=d#d5vYH
zp7{6Hxa@7XbcKb(!>uM?V;{DDjwL}ueA;imWulrVP@I?A|2}57+N8cR(i~MJz#odP
zP{nvhYnBZqp8XfdVT<44pRi|4V0rFOPVQJ5v%c;AO-!n&rJ-QR^F`?CGsMwoahyVS
zJz4ryrBC#-e_e}fw0dkwxK^|g@a}j1-!(|op3tNLI+>8)b&gRX!JLebPw)LAN%;)A
zM}TH%`@b_Fx_fz%74;N4cr&pDPQGD}I-(|I`H@}B4Oe!XU4DfXzPb&T%4wyFxZvOK
zC*7D;Ekv2yQ~hXyW6SjmPMULHU-q^oWNE&t$n3pv4O-$Ql2sL{+R4`b+u!|qzVAh>
zw&RuM`4_>@vJKrN`}H|&dhA%M*`8=LnfX46tywi+0|i){Z3A*LLrQH=T&6VTwh7K?
zDPk)VJlK3|F!;OsdsnY(H({;1ErJk`#(vLtl?jOsxuuf;Zz{ujdq^5Wvp}URgZE#h
zOF=j=7^;mp^jI>r{UgI?Z=P^pEE42!^6chrt{4#!5)x{~2u$p*q+o3P%UCHfn<ETW
z)pkVZ_W%W=HN$o#;y>?tu1Zeu`VpjwM)76JH?)Bp*IA3z;lF9tH3busJb{L4)+X6W
zOEg$iLMb3N^q0;HVDek!!KO3%R}p3mY~tY%1We2IHg?%$jgEtIfchNE;I3yV5-2po
zjfD_j2(g&RaB6I}qW!UHl35%O$UR&6dSlpW?)LqAuuS*V#M<FP(<>3TGlj4)YQRRK
zNI3i5`8g;;LXMcnH9Xt@X*lv|P1aM4>$U33zESHgQnKdA_mzqkDbSq;7X-RUg%Bsr
zL1pvCRl2Znd%$M+7^h^YrGf+wxqWxLibj{w*W2YbH~L_>cETZ+PnN2dN5B&VBWXSH
zD@(v&JzQ(LXP3_qjbo=XRTu3>bwnh?{d=!5JvvF5_K1p$Q5$D;AzF92v%k%!Nm*IB
zYE2!<E&ys8@7))eUz4g%55AV5efssO(9jZuWX|wK=ewlk%x|j^lR^y;C`*KsW+>F7
zQPKHLjVFwg;62F2Ru_?8;5GHpg}&<^4->N=2wVz}8{K?4FCJncWdBK#!2ZZX+++^k
zrO(5KvB2BI4&w1wDAB5~7PTr)V_6)luB&Rhg<kZ<d9x;|x516k0cWlI#3m+$JYFh+
zcz5Svkm7zp`xBY<wzw!uP42Mzr!(Ahj!h0L6C3(IvfWePU61~;Sz7rNVt}4=Na1+7
z1MsmLEDos<ujn-N4YjZ8T$VUou+xiQ70w<bPH&-Z&Ns6wb(@`!E17gx_aIM0(7O|E
zZwnIUL1Bkn0F6YrKdI|MVH2&xelWFOiqqHdt-zuNc!DXiAJJ-|%=Xk+5{=lbAOE<C
z2No9g3V?q{{UnwVHbgq_T`yO%vbZzuCmX*W+AbwV9siprqKG7?p$We`U9}O#c$g*1
zPc{(yN>id;Z|?t<h6cdcVGBN+4t#c#pEUe=f<=$%?ay^AkG=-Hy~N4+!6JZTlCBF$
zAS2eO+|M`03#8-eDrS+9yWDFIixLulf5$_jv(2@^frNy#oSCs2o}sKSnh?R!@@U*S
zDz9Du$Zn`jkQ6O1#5$59piEs4Q)e5Qjak3Md$T3pmXF!oY2d9i*_Brxu26=QXyFFp
zXa;`=xLHa~m~R5ZS!U@&_i^La{`LaxIF+Wa9!Nt9)epY+F+{v|#{ED3%K2$Po$9AP
zCH(LcD-8}i1h`98V>HOG=)|8CvW553RWt}6y&lKj&AO&p>Et697)Kf;Gk#_D&O9!-
z@jxdJ2%3hXAKsmlEM`3beRZjQu}yX^T9>UzJRRpF^XiMo@3{B7MZE9ND$y#xU+F^N
zhV|#<0G##p5P58ZW9#|P_|)+rK@ZOtzX@WV-lIv28izlI*c+?!X-^H7+c&XaaMMRk
z(ZFKjkpxu`5ptceB!UK|L89h4o7k^%x)uK-5+gO8k3!u1wvi5(@=a5#(t%PhTkY<8
zx{@f%)G9_W0wn<ZQ-uRW_yoD>bI$)!gU$V(CP&8p-nTBe|77@&zS=bnx*KaP0ki}M
z)0rR5|9UeEY^&vY1miz5A9JkYF=nItxab!ad%zEPSoki)!e%`ePAQvov7qbl2?HZf
zuoLBgBE+*0S~a`QG5Kx_U=ycfvm3A=ARvk|fdJMQPjcvd*F9M3yn!a=<XpVMUS-O9
zD@FjLE_IV2VBNx00VE&0&B8%-GxEH(TE6T#6OeVodD@XfBMoO3>e6b}2ANFygl`+y
zLCafR*q|Cb4K8FvZ(tCWX<73a8l3=}ML!Qpm=|Ojk89R1)qhhBz2`!b_iM6U7HPI$
zzbU5VP|d!h1a=vQ)(kU8bKA+^UtrVsTHefH#*xSUTxxt}LE5C*VPj$=b3vb&sX+N!
z;`btLr<CoVKI{wy-cuOytXv>lkO?^CNQj|G3!`Aq7P4yEPS1PFVbh$yn+pp=xCAsb
zg^5Wc6Y<O?cK?=kG=(%G!MaJ~xC4&X(|Ar!g8J&vuxmVAYsjljQ~gt<p|qfmlf_rg
zw5Np7)hRjB48Z{ZLJ8D#h<YYXoWYaQuFIQE2ghY(lL~uRAl@{uaM#Y@-y}f&g@}0R
zygywX1Zd_Ox?JPj8v+xBoovCRx8DCu7YJnyaLzie75qvLaEI3m$2UQ%NN4~U@C3;J
z^%tBy3PI}R1a)2dR~~H(R;}k#J@>Kad=<tYW^A`k7Pkq(@*6EqJ8KU!8^u5jiWoJV
z|6Gy}YBxJ)ex$#p7R@^Islkz3`l3CRnMcGvj8`~75NMK&g$@V`FZsT|^IyI_CovVB
z0<~9pdID;6EU>!i4WhwzIqqzo=#76DVipl?Ee+IykL3z5x(`5HUIT2Yc{~5Uo=I|?
zo6lQ(<w{g>8th0(`8*Iqq#IW{dEpF1C?cWm(^T077r=sYyHvconl~1|bI<NSh{3od
zZ|IMxxmvmHWCMzYro#*1jGljcWfuzW!vvaJ?TvdHJUVj6NJb-@kNb)7BFA~Nvri--
zS}2}R@an=VH?SSw?U{prPaeR+yl%d~X18w+Bw+p9t#|m7<ovD&G%EsX=Dq6d<am$V
zzl@=wMFPO&R$V>|{F0?5Nm$0ORbv!X82N6pV<P`?8Y`~5RD1ajR%VF)qMq?uTBYx>
zetzd_Q1ZL{gPU0Qz>#*RzoJT=8#B$S_jgqBorQ&E4WO-_F0@XAir3_`=82K<*@hfo
zVTg3P<11#(0$K#R_(K!3CrI7)gJzhSe)Qz@%*gq@sR{#UjaA6!0w9HPJTfUid(QVb
zqvW!r{rQUfECzG^N1utRwsf`!gW6m^(+s!^o2pg`!IWL(FQ`H?%P2Hy0GFF?<416M
zJZ_cmcl4W9gIU|I0Xg;(81|JLt<~*lU>v_7TuMQbhG@lPqaxA`F&j<R&15SeR{C<v
zzh-7!V>1&+l@dsHD|058AMMnlc+nOLT?fH5K?;>)VBm|q=e`1s+8mImQ=j7<)V`p#
zFPD;S{0Ec*osGSvP{|Qok?=lAU%1sxfSq=_*b;udO#;_ikx8G%MI~*=aSKj>H%aL|
z6fyDeh5;?|X8S$_9rZaR>xR<}AM2mV0?@j@UE8xN;+)TCHZ@;qbdiw;{ywWbbX_#+
zD{p0}0^atfsBHy-RharQcpWG!GO~GQoxQfFH)#!H)8kfC+*+1>q;xu}-3XhV)5hfW
z&~4mx5%s}BWjg&%wj!t?;lIFO(@560OJux5JcfrqE5sO-PMd!B%J~u~b_ZNrY{Da^
z2!Vb|Qywcz1P&eBxWV7Q1$_ewrNSi{{pNp(^;amd(Rn*WP?ihbP!K^7|MqzONQ>Hg
z=ZY)1_+E9FOQ5%|jFSl%bH|1thneF?_=<-c!a=>`_v?B`Zmry{3@>K6xL97OxC4T!
z>;r<akmAu-vPlfauinSrvx5VFW*Qwd^UYem-Q6q;)Y|PuSkISTp43ks_2&baJ-|p&
zk;@B@MrYH0p#l%!mo*WRpHTr^xU*Ipz^Fa>(Q0bD)ka2ea}1vMT-)DeOfcWrWrmq)
zNUM9c4M;S$IcWs#8sKaet8V}5wkMkpk6X^I@pNI^BvozqbVV%2q=arjdC!(;9|oMu
z?lEqkSRE_$(*Jp&#&JAAYIvIM*0!;#W3BgHdDy>QG+guuB!UxgajTTX1o@aBEA?Ih
zn&LBX`qyPS$dC}1n*TDtJ(w%}w+dPKNrf^a(&0$)>Sq=753cIG4Bm4kN<tG4jB8lb
zc{yHpPk*NG#Vx)qp;>Q*|BBE3S#=}|{|k@W8fbT5xaFaxtS{DHJvjI!Neuon)r;Ve
zivCye`TjmHHLn$r6wN1_&aye#80H!p*<AcHME6=Fs(aE>|NZ->sc*z=Z7oN5F%UJ&
zS*zX(*(5B?6oKg*H%A1g^>~Qv&ZrYMR_z(<UinX~O^_=CfBXp7N8USW_T7*g6NI+?
z6LhlLJSppNYykLG4rT^<Dg%x+E2($0vGUE-($Xc@<ZSh9OBe0*>VNe=qxlH`vIvif
zVH$p*{tWD|#+};%drmT~jTO^3!x~>QZ9<@R`T`TBx5u#j60e-zTU4<)0$2g!eRcp~
z81TCBu+&nE-*Rfu<HB4EPa8WCP|+AKS8lEq5QOwXH(PwMC_ySRDk>@+H%(`SF6R?T
zrHa2`;tn?zIDu$cEf-NHqjomPEl#``n;+t)rhFooKqoq_p=pi{;4Q3zJHpA5l9e^>
z3qdeY+cyY7M{X-}6@(*CVRysXpJ*G08dr<LXO}sDg1gX?ZZz7^f&i`dq~_i5)6qo~
zXZx?nI@rmVahAz9KZhw-`(3l@pOZmcJRk-puwq3UJ|4~%a|d+&RS1`usjQyOp_r|+
z?Pa|?Su$;ilKF&>GvcSX9tKa-$?geA9JZ?mZ^pVCWB~LGBleae@mIX=J(+sCU$)5B
zzT5n?^g?(<HOB}{I`Qsg(b?V4%a(Y=U>25N0I#V}@}>c=oF|&1i2(xt_Oi9J66d>_
z5(RKg2_G~x%uGc9+{&gmw=s)Zbt0F|7-C?sMY;O=NSQ{t^@@QRKW-iKm&fv9iO~`^
zkLb4Yu`|bRg~$1s0l`HBA4UWOgq0~PBfh|dIy9w!iT>MtFaobPs?|p>oWa#@+yTEG
zsr-3<AuXS!_?R<&4-S3=MAzF!H_2MJ#Dwr>4NwmUO-YH!ST-z7Vq(dI7E|j!B1U^N
zQ?u0!x2ZLV(0`}mY0g>tTvjiYCN&OkbCMJo4>8Hcg_`}>4|rQ_Cvu7vv&`om%K0jW
z>RU>@@O3jTCjk}G!HOh0<TtdA{#w}$Qs-C<BQL|dj~byv$K{U=UC1qAuvlq*UFTgX
zb;uA@*6e^iU`zsV=sqJtQQ_3wew<Gj2DV|PNVOBktd(K8Mqy}TOh2NKc@aCk&8n-V
z>XSGXDI<Gys%k|iu0gwjodh3C-q_;gqZ6uEs}}%uRlIKwg!d;<HSk({ia{zPdx8Dt
zk0~ss9n=$0$gRfVhlGYmfCBpzT+P@Sp+*P=hx!lDBp1WF8z=wKVpj{?Es0|n8o#m8
zlyLQ#<{x-IcNYm@Q{Gn0sv7r?9MF-YnvJyKP|K1+hENW?$<RJtbuu${hTwg|>z#EF
zkoWxNnOfET(=Q0<e?D4?7EZ=5*TLv{Q>*u%*s^<(aGAbcn;)ZcNBkF^s~d1VKQorX
z)<2V<ADQp8Ga#42rJU_}3d*38#}4~+ob@qJqY<BQ27kYqvszs;Kbj@&x`~wCe!we+
z&bcY2OB^&F7v$@(B{?xC1GDrdoXU9bO{PpfsV}&NVnTfX#T-*$A6$nU_A0RNF;S@7
zY{CnqWUgo!FknGS(e8l4l<hP)-|!sgL9=c%CmXftrJHi>IzLwbi;39-B&2DAw{H-O
zNZ^qUtmE7Nu_DH>JHR|_)n-Pni1EMbc%pc`&99&Kq!waop>QCIvVPS^x$_gGR;p6i
zax5o1`fuiSKYDMgD_HKuH4o@=f9%lKB%Z5IM}0dPYPv2b^J4|d46${|LTDOBI?%>(
zfbnUSfnSWCiz`JoETOV+RySjkZ}OSB``iU801^r+mCuWHczF0pl{^%EH%-z(ZFja_
zX!<=-A(My2_rWo^z%%)w;D@V^(P#EFT!$moPZMTlabCT>N8AQ7hgPG1fIm)i_4V!8
zZGv!}UoIl&q)uk3jt1|G#7wKujZG1RCHc^dtzg@5yFa9aVR>bhsh1~xd%=vbPrVC9
z6R5c%cAFga!BAx!u*5@+^0TN=L>`$T3)uo_Y?CQc>g>?i5Ojrpf0_QD&_eLF*y}kt
zfIUq0+~}VwbSP{*UjhAT)v>5lh(*Pd>SV@T7{2Gf=o5G_g%Vpi8&Fwz+(s5w%y7~u
zI9PN<YNco&Uot0`yDhqbTa!D7=xp8X(j9qq0Y*}~S2E16CcoidBbEeT+ONDY)5zB6
z=G3~LC$@K{RN%pKoVN~Fn(=;hNAK$%o4bJAH5In6{3A(F^Yila4PO&KQcp7+jJktb
zx;+{)bA73zIQL!#$TJ_cXZvgpu#zx$6h4PXMw64V<pJk6Dk1KYB-&#6#Y{rB^o#zJ
z>-L+)8T0+!Mi!CJgU{$DvC6I&P+Pn%go}A9&_d8*RAhqA`k#Q=3(U)_8_;QHxmwD2
zi@)$yN8*!9(d2e9!a{a@?uYl|U+p0AY*@4L>V5T;K$tN?Ao|}gckU@7241_^+4xv$
z%BtBB&L<73kW*tj4%W{w40(Rfb?4V<K>)vfG>|&lC?_-A!U8;-?f0>La`$iRc(*ep
zh>!GI>v#76Q=aed7sl8%+tYk^&J3f2n>92su~$E-hiYAqY|i?o&F1oHM-bnk0l692
zLV!RArns!>>=h_Ist~E_0~>-<|0}~BOY<sb6vT*#*xk5xdh;Vy<-2T0{G`9pupVKL
z-9)_ZH+{Nov5hv1D&0SPj#=nLHOz6&`QA~l{nIQO5)fy7j2wvlx3>}Jg9|dHOvh)~
ziIsNwC1MCm(fo=^$J{+b(!Ur(QY&y_U+DaJ`tR0iwYGAa^`{D}=?rq$=hx6e8`>La
zSXfr~6Rj-YE9uu#QK10v?_VPwUBH`u)=Llc?M_OIvu2t(v=Bd$zOmnys<Qwwt2=)X
z_A3F*No!*~r@{ao$EXg^<*>o`Erx=pPj@yx(qgempU-b{wnD$Q=_XQsB*zB!vS$`e
zZAshdZf-fLYUOOc95<84ZRUq_?W9SvN)sd#Js-I6A8-aPs)RVdKCJZq@Ng{5mfk<z
z-!Pw9k{*KGY<&z13Hf3*L-D~jy_W7Q*}u^y`l01(f<OX2N#h`NfXV`_RW>;p5vE^n
z@wBXf8;y(e*2;dRlBMO>(WVVqf*_>ft1{^10sOMJ|8(0DZ*E*AqVdIp(}*jR8GZqX
z{c87s+3T_wm)m<NjiV+gDClK>`rUDVh<B82YY<y|zg~-PbU!M93JHuTxJe8X@#efY
zkvX~vyb^Z-+-A+j&wOmP^o)yzRdcZz%ICeBU!mJtbwg5vK3}eBF`Xx_7w~%fqzV_9
zB@&)_=1I~&dKQYVtunG0R2y0wM&h3W=zj^FKKJ+~6}~_{PATZsUt3r-{KWKc&+(rt
zom)9J9#SZTJcMGv$e7sdg6lZ@VvX;kGg^1ya|)XkMrvv*a)%k|ytTK*yoAi~MyAiB
z-Gl=}X7k(?YCvq)6U`})`ox0IWyPP2$%Z{Xgc`heJ*QAr_7^yyiFw-2zl&?FKkU~T
zCx5c-*<ZixAJp#l=KnZQ55IN{0s<6g^Td(N$J4}j2BL3^-64~$GbrezY1cdo5`ubg
zax5uU0Rz%;*?O;Qh#CU5mz1V82dAXqBhn(j)O`|as3%b9`K&`J3p=p1lstX+#_*07
zDs5V~g@A#9qER|ed=+O-zC_kl{oWQyik92sj&Oe>i~LoN=lTBRBb_q%{T3Lj9Vk%n
zIkzqsiHqG|R}#H5zki36*kGHPAvqxNyZHt9fzCz3yMX0r1|=gZ+HQ0#U%4nrbaBO{
zXieU|Sy-6G1B6zpss)$t)|XWdTk_M8#xUc=-`JXZy#Nau9vwZOt%HV)A<{Cx)Pscp
z3QV}7+ZycK0lsCW*<lj!k0Gn6vtCN0NVnxh4n956_c3->{Y%==v=)8G7U|d;zE4nr
z1+`B%5XF3E`3@L~`{EtSzoZBRKRMp#dthSVs~j%s+&<H71U&k2mazU<TGB!#<jOgJ
zC7}yRp)EunTwv18zxWN5iV5I$Iv7=rRRAH&^FwesEKJs$pBw|()5iXB&}I=u0f9uq
zvulQONF7q1)Dk);LIX4P^!F8j@@U!Q2+9h0^XlsxyY<L-{Gf*U9@c{SF2<njTOWff
zA0|hzOkY$V!rHLM$KL_Zk6bG2pU5LDb1E=6=!5J6Twg71kKIsur~jo3rqDpt>;PCr
zF<U^w%1L@YB+V7isc=x<k8WfW&f{1#^Hi51YmYvsgoGUo7Vai2yMS16wd_B*%s=GM
zX<jvO88qZwYP3sUHJDt5hJ*X?5*+lO<66921E45A-c;YlBJ{cCZpG#d=TqDN_W~?8
zSYfWWamy=@L7riW@R<elT)`K~fKGzH6B5I0cpo$NugYy1s%9&AppxaKc@+<4PRQ*a
zScP@{wd|Ner3sM|U7UIRSO(oUWv!nVLyl+uH}(dfUm=|?o$USW$^~ByfurcXldUSW
z{q#nfW4YmKZcb%7$it9C`|>j+1bS~WdvdN+RsZz<9GV9SJm8}fR*C`QEh51B7E-Ec
zw&Z_7;y0u#+O`Q7LDeEAA;IeZ;+dUwxrOF>zM08_Iq3L!F}nWtoDC4Sg30fP3yU`#
zyDV>bg8qEP3Yjy8)fbpRN5cc;2EYruTQ|z&;x>FQ1PA_YxG`ng2Ho=p$N49R6by~R
zLyc#0q>9%><hTNRA!FKwP6pLtNN~K-*}l7)`H~1!bg#$YWS}e2nCxU^sjT&#Sk=?g
zTr43L4<4?!H*dVM;yw@pJP7K6u4f+L*<>*t@YKxdV*|LCa6tQF0Svx*c^MkNW&_hh
z&^cEHB|E<#0_#)={;n6ba6_}LUOsgh1JUq#X&GHLd!%N)6}3l~9t7w^IkH>C{tw0<
zKMvALYH>PlHkTJjXkVYwryJT@5(hV^zmmsqn!oSWF5bg3MFn&%etzex;=cq~oU2Je
zg>n}}l44-wX3%K}2TYH+oD6mxQxfnj%cC=6v#=$SGTiv%SIfW1B`sGPN;SPl$Blp}
zgrLj$9Ep~Na3hn-I2H$qNlVe12F?q~%13>;nXeX#yW~#28}Zz)zj&h@>|*oo<HehQ
zu{xoM?T#%5u0zY~eln$LZ%7fcL{V4)bpjQ!LIJoT{?wT*WS*7KkgT_R>;sndqJa0e
zKl;w_o@=uLjFiTElB=A7WW@<QZbzQJN=j1SKI5)0#V+*w=-ln0HKm_!!rdSAGjV3{
z1)=|C_yWCJr(qoRVUz@lq3%3%N)#aKT>J~j{x;@edceEHTTgg(eU*A&?*>N<!FM%8
z{*?Z10v5}48t%8We>+~R*5nKjBqb#c{IHoP(recFK3@H`f5Q#r48oDvc<KF34+5&&
zevLdb^w!C8J)8YnN(0+HukfE{TcMesRYk|g)inJ)h9iDZ_H#dqkib>9MX<DHxJFD{
zMz{b+%xd5DXpTz6^X~}`o0yu9HN*b3ZTdapjm>`hRUsNswXV01NxWbE*2QgY8Q{=}
z=VF;j$U;)g9NPI&vE<p?4~x=M_?D09I}n+t0SOOqG`OF2J=^<9h9^PVntMzlfHUr_
zqI*sdgrGS@qj^GWr}HJR0dGaiDgSqoU@L!Z$=SPG&4jjjo6B2K2TRdIp$v4g#dMy6
z1fsylKvC@7R+oLx4`V1`z8)SOy)L5YrUZgf;4XcGKNZQ;*^Z8nW1W&@apw1fpEpCJ
zl;NY}j}ka=y*#fVP%Qhr>*l0(I~`1c@!74#?5i~24{7=2<m8Yw4ZJ9U4dDfvE0Yyu
z(eJ&z`v`QC$a}1$m{Lp-h<3NrQg5%WzTRrNjuJ3VB>JCP|JP{cX6DgXu0i{1f^;=L
z)LcTOt4eTWb+2<lr!qpZMcqR?3JjIF4xP6+09Tgz6nFy??iHqJmfefnNS-Q{q;4MP
zEI|gE*iIGL1CKGk?}OXV<n=fjOxk1)p{aQ5hM@6YBN6oPSd2`;&H{I7@by;_4gjtZ
zfH*({gDH88_aJ8jJ=k<bi~11LYYm}djhJbWkdQt+`^dz6Eq#hHVD&z$g=&7cRrW?9
zL^Y>{^NkT~qGxMSC{Q&u&>v1!Mq-xU40&ut*=!b~fC2ClFzK_HjbME^p|b;Y+L_m+
z`uh4U=Q=(CY^0QRx>)@`^B)3-?I!OVuM)B)U%+5+6rjQcTnqMf4+!S4yg@9rxs`Jk
z0MCBj;?G-cv~drg#z|Wz{|@HlmvS^Jy)`ZlWDblCMGxbzuKTO?_l~-d5b~ugno+Oi
zXR?9!e*lh+%g#0&Q+$&ZG6Ja|FH#6_|7tr;!}xrH;-P1HxK_bfy>Xz#)v65dRIBWr
zbMU@PEmTWjR$5vL_~U;7Fsk0~*&U#JfCp~C{QR9QB$ot$m=+%K9~l+LkCrqiwMv7;
z2cFA0#R^4{d}!;1Dl6~$vZxzm1HT(}l{aY?9hp>s)5rxXPsiKSvFrJUe!vqBSWKBW
zIN{2it+EEN=nw#$3O}`C)=iv_xHbYJDj6M5gf)BFCtdy|;0xxe4AVmf5ZG+je$q|9
zSD|Vml=lV3Kt=eJLfU33Vg^cQU7dMw?!6UEkrrkkujRz<@9*=jeHO@gWE^d(c6oZ-
za=b@oti>?y&6V?cBL5B*iQ`Q%r3CNPBcv@wn;(Q*n+hwQ<lG8{hllsW9{Yr^B|bCE
z-TOTnMofct(J=9Fm?v9Yxa(OiFm29CL?yUjhPeVXJw5%$O_E`NBVQi}7NB!`3{J&W
zWF|7WcRtx=kueL#dL8d+uauN>0kMLQMP^={q?nV-QFSR^wzjFozLTGM5Y&RDw}rsE
zLZ5;@$Uy;gQXWs*W}A(O`DZzG3**nrt+-1K=MFp^wD>TjHH^Kn917U*;F%!m!i4w!
zrcM`<w1~sFDS5qXo=j6-@?gp^#WZiTNsJK5gmb7C3hO@$c{a|P4%Pk)P(Q33-hj;X
zQyH18eKo)x(DUj_PwTe|8}*C7F)I`2Ztd-&4DnomXFTg069Azug^k|~B-vrhs)%4#
zAJig_HdoGvRdI@h(TAW@hoUos8f)gMqo88&%geq&e^(giRpxJ#dyMEq5|fmeZ56k0
z*m$`HUdfw-VXI3b(rjnN9+SZbm@-tA`9}^nUwp}3TQEl{KA@Bw_&2){f$j5902Jyw
zh~N)3I<ZMr9yPgkqbXGDBkG?xqQZnC{Aqwu!W0?96?u__SB8^<wjba?^1-h`)iu0b
z#xNMLfrf>iVK1du@AIqo`7I+BA~BV(j`ls6&wkAfcJ+L_cnMkWjKL~f6aE*P9+V#3
z%a6)0W32yh|GE52kO3hgAj4A>MFeL`3p8!Q$(j~229ljX1xNfCm!(~V!i54ZKGk7Q
z&T;zO-a>Lu&ssNGZ#>Dt!)a5FVhHszNh)1P79s_qQX@a$EFyyk>*-^6<!l?O9|X$n
z&AqV(-jt@B^fT4&KW~z3ayG66;!1CH;=dQ=q(N|jBx?^Ek9T(E&c^p^Ddz9Mr%_Yp
ztxlwE<Fz2T+@C(TdX+IY|6HQ0g@zB?-|g<;ZWvV6Vuf(*bv{7=38}nN(Lqer*skjM
zK|1nNDS%`|;eVlg1E!B+DOwvS@qCni(f-5fGC0|021<JB@(>dBmh?Vo2D(10vX#-$
z*9UXp??cUpQd57bpw1JM@EEsxbHu7Ju2{XlqX9caAZrJa&?9py?EHQ7KUx3LG9rSZ
z;nC?IOmQktNw>MU=pr3x9p%yL2-U#LZ#w@&zOF>{`-+J}C^5Of|6hzNEBh1SgCG=z
zHh#OLq%$Ch3JXXornX@X9=Fhd^h`rgJ$B*|gd)A8<u`#xlk1%8w3}Clqr|l1)uW07
zCmVu>YNWgy4-2g!JA}k6p*vUasHj*a0*-jMg#E<3^5nRDaRB2(c!#gqWaS_6>2vFk
zJI<B@g`i8;oZ>;D<KZjxr@2LAeiOm5Gblt`2NyP+4T%QVY#I^wX}}nW0oU|fy`yB}
znLyWn6O#Le419xoqNO|>0DK<|`rE>47iYO1$_oe;StO#Q|BDG<SWL|Tx#Lj`Rz8S9
z8Vx!T<aDjTPF)RF$roh0d?EV}?gx%bYaa9oXIeWb%*h?x3%;>kkAGs1VCPm-`w9Ht
z9`EK;c`?h7x4HYCXc73^Asv<<5aO^f`^*{p|L}ITN(#*ZMSkkMt8V6BJ%W&m-!5DZ
zWp_@Xc)I3MzXw6?AKaP%5a0JIst=f=z{v9};b%xq%ydzyl|eQ4dVG8PmC-w4i~9Nt
z{U5)T;DjAoDc`>vdmMTcpvdT{Z3JHq2+Kt&KhSY%voW3u&&y7ioXm0$4ZnsYJUA3x
z(L@$HA}Jf@djYJptL&MC)X#TqrS{029#SSNFN8`=-D4YXii<Mzzy6IUhE6A{JU-Sj
z(%eZV8KjtGA*4(LR=SFmAgXWlKXp8nDrJ!WySznCFcpZ&66oDaAX-rZU62I-dq5Tm
zXIbjNp0L?zESt}J|MRNv7f2%mZjxbmWjd1V<SGv6$F1SN?f&bhE-(mXxz|g`@0M_l
zJCW?z`mW4gS0?Zu(7=~W6No)_z9Iy^O84}p)%JH2KOpkDa5Bt>Ni3nrU?mE{Uw&;W
zrVZ0>{*?Ra<M;t9D*IZ93=g(c?uPMOxdqd$l@7kcPigXcDJruRBq;Y(t}JEc3%D4%
z5HKaZ2YeL?E51mD?wQ~_6&@@CPFVfX`EAC8>lgO&|Hj=lm8C<_kAv<GFqFa2(g@Nw
z-6h@S{wATBDMO#18cs#ae^lO7*%*C&J|Ycqw6;)I3+D|YBM*%_K~_;LPI7Dw_&fUi
zzU70^<7-Pi4x*TMkoi{P-7+7So;^4wnCTxz60cG=sLE+XqQm~#6Jd2Kg$&Wb(GI`S
zNquUs85#z5y3CmVNq=rq{d)phN6_i8Ve4!Q1g#nRMG8mL{g8qBOEEdkm!bK)bquHi
zPvmT1b|dK$hr)-1g0x&5`g+}4IX2eV{VUT)n7|qVnN=!g5*#vwE7E~_BgBbo054qM
zHvW0ZiB$fG?ef_!$lK|*rQ+4Bp=7gfUiBR!Cma2*m-^wkMio><M1ae+%d&@Wc98R!
z^mrLNP($Z_a3Fzwtx;QmRB$J3g5Y7ZGD|?6b!MWE7f;X7fh6G+iDV`Z(SmA#5|Egs
z1aV9Tx<{{0pXd3{RcWlE`$=Gs5GZcC`?VJAQdW6CQ(j<CX~5UcJs<gIQ8&Q(#Ga`K
z2k0pkdlUIt7JcI3`;VCl<kAR7l-{6x8p!nEbnA;)(9d5Qn^4!O?CpyU{>=^k-M^#(
z)pR_m8C@aM{LlWzZZTP>wy}eGYILqbCw{}uXEt9w_U{q+t+#0{AQt^^R5=nBwxo;~
zx1;j56X3XLM?2?G`o;YTUh|z;9nuJ50a9E;!)dyft>iFa_>o^yG23W-LjLLETEg-Y
z?&OcnX-#DV*ZNYKxO%=%`5E%Tmq04Fw1Z?~#%Lj>b{)H?rej&4Hb&OV3WV7a+S!1A
zV^kyFFdIw}pD3<ZQ)#!6a?mB!poa~QOV+OI`XXk_f=*5Yks4}a<X1lz46Ml+vMZ9{
zn`a{zT>za^5B%Fl=&LQ0yTWmmdSCfel@l+l2l3b+d1iO^n*r93CfH%%0_%=11uXp!
z|K&c^PT-zMcykCkuAY8D3Ey4u`&pW)JJA(_tWUFQd)sW&8iQf&`}|)Qgg~M&UfpIK
zT!O;>Ia|S&bQGUvD^W<#Wm0bcVD!HsKo!V=xnNA2NE8wIE@G)x{wdkOm)39PF4t<k
z=qZSzh=PGDYQPPDwq4!<)(v0m`1eB9-9xVi<|Y46hLDHYvWt5}W-Bz*EUux}3Kt10
z7IwEX?n?YgR^a4a4v#z0nz3(vMz<B*i$TlYYr%Kk7OUq$!E?Efe6qf&5`oYD>|q5{
zkT70jhq4A6g6%^Tr+Qe-<$Xjms6etK_k+7>$dt^q1Y0*!XWse~E|I2=ML&!Y#upv<
zZ8gl?3uIv3UTLN{6^1z&AY8E@;;c10LUuGr;g}*18S;6GR3C%hvZc;ymk!tbd|Wf6
z=V_7T!M_&yIsh!DDto_R)0)ZK-c{U#3UR9RhB|wOZ{iCw<#)b4Nl%z(QFixOvGi5~
zkO6}TPhQWJa6Z2r6PKuXlb$hVXDR7PP(|^1LtF+g(C)p>lJ-XE2;yz+vDhh3PVU-!
z+$!_Hh>TMfp5-?Ue-_1%B?R#|x-{q<3uo#?5LSQ4W<ZfCW>^q?vJ9;cA~?f07&{AS
z;D{Y$g)f3eq)lQ*q<>y`QBY6|?Qh%WDh+^AI&b#P!ja>eVZUy|N#L0;bvgB${ty{8
za~M*q*{T5=0xFn|CgEbrkxYa<966GLjxXY1$TF`le`H7hXY6>!v5ip?y2x!BUcWpr
zB&*2030yP-$2~gIX=65OY8%DZ3x*VbRaJ6&XIP(vzyFu&$k_}wv;I4}K9LP22Z(6C
zf!*|%iUwR2WEGq@RH8K+03X22f@rjbl_+W}5}%=<;b1TcvGkUkmLYAMIt4+3EAjZD
z!cw%Nf!#q8p|zco_jShiusdR@DJ2&)Oy`cR90@3M7$O<$QgM=(^JGFH=!ZQbb`_Fw
zbdJn12;GxYv4~xtTmF!8Bl3!bvw?pni-f-|?QyIHRytm2i5oCe(EQ#m6`&)F0I&sF
zKN$i7V(G!SAoc_5s@#8`U@-^qZ;PWn2Sj2qm+Q&VNz-Qtb#G<DTN@t!*U8)YbioHl
zNF$4~yBv!;8Bhc{<t;iAM<rn2Z>lb!kpm=-1oXcElSCvEzOuA}a1QGF-DI*8jnhVG
zgn5C|q&&kIihd~)t{aNJi3C<Ftdy>)Cg%3^IpOJuJjt*P#!4l@-6^If$nDpCa7F?3
zR4*kt_JQyhWk|tQ9B>L{_!OGH^$(J5)NWI#N)d2bA{NAXU*JT-18TVU{gA{(4bmWn
zg~+C+-qZ<7?BAW2<BP#aQuP5uP%0;e&w+M53XRDQcpE);?}Rnj(Pdrle@pST6Au7b
znTc%FB<$SrUGZaZb*0_aGx9X9@KJ&5GTd{CiLu|7Gv`rFn*1yHT0Q@RBw59uGDM0+
zDk(2&32x7JFm%@utTOT?=SzQiL?!A$!z-6Ae6H=bFEH7QFKJjtETz>YcKEWZmU8Ja
zyiZ>ISrBCG>Vg5a*##O@^57NrV~lClD;d(@!FHJbBn(aeB=QXjtgzaBhXB5_j+r0d
zgsX|Yd;2WkdvF*vTR<qwA{W056yy1K!OyvW(jP=2zaY_!{KcOukp*BRN`k4q^Y!(E
zbI|PhE4#`FebiLG63xiCnUJQP(RJ3il<&mwf*tVhT8@e6XQ#ABp2-BV0Y;5A@Ni|R
zC(;MMU;w{jqxDy`Po~DNK^fXg8@Xzw2Q<G1xM$US7gqgw^CYo;9hBQ#X_0V3ptoWJ
z4xSU=QvQSaGR#l8d-v*`aj_PP6x5U3_uZ%$hQa@6up;VqYNibt%XGBY@n7S9ZlP;#
zyc+^QZuLR@!}Sz2jtmu8v!&$Sd}NzLcJ1;o=S0QmMwirKD6>2c&yN_IH#Rm;EEXy`
zT`td@2#qD$|L{ZHT+4j{5#02-a4;RXiqSs(X>ZS+H9-zrQFYqrS^jflE@;cfhq6^9
z_X}7gJn=x_Tn$5s4`qkoNYt>kWsLf=7}^LDKR=<Ukzl649SUkUCHv(&<i@iZp;ru)
zd0IXJeVG!C+@RlqoUIzhmfY>Z(bLAeoKXajA~Bm3Aos93yp<)8I<gj>Pb|r|fwa)4
zi&>QsfvPG^8ms~GkRdqxKjzbVVrrgP{JQrP3|f>Bp#K^%ZgWfB3B0;{8~~0J^-rLm
zj-iN_V~Mg3L;r8euUx)IEgV=NU-H5V>z@>%BFcz&6kDjS(n79cY@I7*iGe?J&@~sj
z{gq!d!@DU#-4N|aXk?=O^S*(sj$qEP=71-WZtN+LzDS`G%~&WEg3>Ak5B|Kpm{LwK
z-Wi9_Yslsn@GKCz2;@#f?RK)B&hllkfA2*9b4tUFrr!fTZDHEy5~Y-sxF)C<b_8^h
zsS<Z`KhLO7I#Iu?f!p0QO1Fd+GV%3Wp=$b~6yugs=ZmAO;(pMdEk&EjF@uE|>P2JE
z+hZ6X2%x2#iGbpubCfvK&;H3kZpGw2llZwMkD{oUG8QCsyj~}N`(|O?KixB_GBQ&%
zMvH|Ar7Ydk%~rXpM)ITw|LgEb$8g{r_|p7sL(>yfd7arD34N$tt+4pRV!W@{x_&K;
z7oiZ&Scu}>O6(Bmx|B)Q%JU7tOHaQB|N9(aNClkWN=sONcyLSEs2MC>9nNTTwdvcy
z?$gD%%E)u{|IR~9_abzQ=hHjD^i07sO6(*f1ZGaJ1b5lBDOE<Kxv6RhWbyyfm%Kad
zH!Vn5|G&>DNUuV4onWGW!WZtuSEvl|*95j=^W*D6d-nQvwt7f^xE@*LklFkKVC=D=
zZ{PCue#5qrQA7gk2B|iX$Wd6$L|dZ*5aUPe<U(AJZ`B+!vC|KBK>qTd_F@w~p%dpt
z1&xgScca?D{pxasgxIj%)`Lu2h~EtC3}L_uDm)UZ%kIm)AbCRyOn@SY3QF8ZP<i{;
zjYIj5^~5mw=eNDpP5+rNW(X=7+Sk{6+1xMuZ!<(w4F;+J@@>o|>Y0QcW`Xg4g<uRB
zf)Q94s5;~kI!7&}3ALi%ultywAFQ_+p+3&6^WS4>AxEVz(bn8}?;YR}8b`Oz?yW^2
zO3Z<I(I*dOPI~^o%1r6eFoxT|c9}f)u0N?NmQ8>{`|ux}BaLQx<PlI27k=F3KD#`T
z`+roJ2@r{uDd#PrjFeKia72Z)f&o*t+?$dh8~heI?XD6z8!cAE)pjI1gm92BTh*)<
z$y+u$*(5x_dEYrEi1*y6{yTJzx0*U^lV<++QCV*dSZ3e*uCA}7=qU_^Y5}>3p)ePX
zIK2an1eix$x3{0S{+aK^mOuyQsRyDp)DpCzQL$-NLM9~V7pr=`hA9q>dq`E02d1iw
zpu!HT&|vNMXi6Z!!NJS|VA1cv4lLI6$$RXF4Crl_e@kpz*f#O=57!f$9Kz$e+a4x~
z$&d5GL5MPzsM5qLl_Zi&1J|X5`2jRV2uc3M<lBx$Dgp2jEC$PC7<k-<Mz#jo{m=Z{
z@Pgoj(VnLt209!=l1kZSByiI;&hkQ*jx@liF&$=jKbR}{Cl>=GDbSY$hD0Ya2sO@p
zCZHKy8QW~hsJ$*e=w}alR2hMVmHN2l-(`&7rBUK;7}sfgk_SpysDUZXXcCzyBe&{|
zCy>tg7c6a^z}GjeArIMr=`hT|LKT_f8@*hm6tr?XH~{jsIluZS!~Zf3A+FEE09gn?
zp<)xOAw+IHodpA9t6!Jy6_Q|8Ry7(YNJENt^)sn-u2KRfy&W6{r__Sa+dGV}!%xCl
z;FCmmM^l`QwZ_SMGN(&vu(VewT{>S9wQT}s!**)tp&K}b;(!QIrzHmdx6+cT16?km
zQRqMZ^mI}GcJ{Q7m<VdwlQpu~7Irj3zt?lm405iB6}uYFkp2Mr0cAB`lu(S7Xcz+d
z5n3?yF^rOMdYhtG$<SA(5W&A~^KVk{fD7~pkZ(EJRoFyET5WPIlZtl*iCxY2l}72Z
z=?Bok>KbneL45=A%Q;UPQcfLHiMfiH-Nf2b6vJ}?odrjT67<Jt@-q=fm870Oc@V@=
zbw!<=K6jYnzQRm1yaZ&o46Wp63Rz(FQ1bGDv+jYPq=k%xNI&R+enEJ!hNpUXsFFv0
zoEO#*BcD`>au@_Iy`-+k#c_7zqvf3#u-(wUOofE`5(xBId&MoMAo94tz1uX*!=>6p
z7``2L2ploLp(Fr0Ic&Muoiqvbmtx=;|0LTqnRue?xV}#IUNs8*wX_HK*-*JaiAF{&
z9-2#S+2<<)JQ_-|cBlE%g|0~WD{+7eQa(oDj2Da)Jzw~L;eU$^tXqKh;ht8r^Sz#~
z7GzIOWw)W~IvJth3KjvqEd&TBO0Wjx3Psa&`Wqqi#_d7+6NnCi1_u0_cFWAp*0R`t
zuH0Z0h~?m2aJ$z_Iw!aHQ^=c|rcr*v6~_OCQ)$LMkXjdd$K-E`VSnlAISb$bjP1xp
z%f$$+W5HR{@I=Q#A1VPiAM46vC2nmE=SMwVxit|zNCuQK)riS>RYTN$RPhV<NTWdb
zt-n;b$NltyB<oKS0ueHxkwA1ZG+kk%Pn860nlM53RQ&Y87Su83e>RVAi$#KJRYt1S
z^aDkV?K`wFr}F%f^2qZVfhHgf4q@1n#KKpDRFVimN1DFv*zj9+Q;UsYm-^)p7oXf8
zQ0za_B0fv|Q(-{=9U`e*SOhV&^-@A!2<X=1$DE5{g6JZ)r8kk!2tYJQ$b<5tkA|ik
z&qzGugPeUa|NC|{!p-+}TYutP(XpZjs7Z>}fkh|{NO1Bj`%ku;75qUEK`T@KTk|rV
zCD}kAoJm8t5co=?-5i#)su(lwa<J@;WJgem-~O_@6K@m?Vx!0<s3`nYk!XKV4izzm
z<ZC4Q=)HgQc5b#miNF`TlZjuJK<8w@gS%jGEKSi+y40hQ@6f4d6fb{sI<PwQvuYMQ
z{At3U>L2|GCZ5y1yO5UD=SuvhnXqn55w2)L^@J!H5Z!>EkomT7BOS}y{5w9>?gK~b
zqnGa&7ryt*J3PGQ)TddLz|De$YAM=al%K^wn)PNfe#d2R4F_O{9SzF*36A)(5`qv6
zy2y#>KFXJizgZ2ka;#Fn0&0Apb%-Bcu$zdN3I(x4PTvOs$<N}PUX=!`P<hQ=$V&&B
zV9r)({mAWhdoTpO)E@IlvP9wz(d53&5W<x<iikULB-qrDihlpQQ{PKqPaw$tggb=5
z2ib`|qZIUj=qUp4H1T`{EDaD`p@I+sMPY7%d6{9oE&-Srk_B;zF(wL6ndb#xnW339
z?E<hxDM5*V=8U6-gvH1|2^7xzfY$*oWq&b%DduyV@0=?;QbUIR3At8$2ZNm`EVE3~
zLbysd>(ImCR$s~ofGz@m<4qqB=ySBRn6R3y8=rVW0`!gLd@w*>+8r<eI<ZqvypA7G
zcGNIvcaM9JfT!qY1uYJn1W{D}8HT`yIl5Hm>dm@=Ao_M=7QSs+fqx4#%c^R9rZuDA
z63vM{o73CU0f(rvMCAD<SWxBwY(azFoW?swGXj|EC^(`HIL0z$g~*UeP~!f#c+2}<
zTi40b{OKAmXmo2bJ30t_JU0qybMA+qT!|mx9|Y&A3TO~$&D3qlzmdR*M6}w%e37za
zQO~NYfEE)Mn|{xGd&+vp6A9nmm^+Frf$l+(qD_Y+2&4<G?Y=wzd+4y~zH455fi4UY
zq&L6oY=8PS%4l%dD3lO73%01lOfMA22X1(MDeBt@YmhVT7p+QYwXC?fz}*1G{kWuL
zCC0L}J2ko~9qc!CVxSNs(C+H@EUqjqMi#Ny?dk<%Ju=_!Sbx2WShZa58K!FZslF5e
zt?8qj)E6Q}3*(4=0lUSfL~OL&)TkC6l_%ei^Q20L;E4Ih4({LX{^8&YB=RSbv8yBw
zLkUWdy_gI)QA^teS2bz&;9%$W$gsjT3?M*^0&;VnyKOC+t4m-q;82_m!|DR~FU||9
zv{PP2I7Q;!Yp;0iZVUR{UT}x^4$TT>)0|;Z9EekSO(rmgIRu@&gJO7J86l9M_MF5X
z76Z}r<1@L;2D>8mF+fhH{LC?`I&<b;bR&`Tl(KY6X6)0TY3Yre!GZ-Bp2UoE=5?1}
z@7J-WwtR!FUwl>Y@9oz01QfOo_gNZEdWbTr9(k;03?mENDTDdT7BnDAc(i7Qww<No
zl!s;PQ=Vm#>bn#Ei&NF|xFL>@HijU%K@FORWRH2;j-Z4(k_(J2=NJzFE_J`PrqGUB
zv^!@&%g8~_$pog?P(xIMVvWkn<9hhEh{3;&p$Z=f=^!ou?xuMf1?9<T@8R#u3ARCj
zQzf+h@z;!r@eG}ah6?Dnu%pK&KKK5r-X0gM`Z?ypZ_|6~au2T-3I*A8x9syWfgV6X
z0{z#6pnkEBrv|wNQIG)cvCgrSGXm~I(f1msJ*LDP^mQuFo*YP+jJxP~**06uFZd6_
z@V}0U%n&_D3o9Vkf+{nsm019n*fUR;;T=6~>8?+W8a)J}A<%J&MPyRpE1)8tG=cB@
zn_FA$eAnSE^aY9Wn0@cAt6w&K#}WPk>j5}yW4t3+*upZY(0qZFKgV`UENLkNUg}f-
z>z*{4tc^$?D(w>rod<Rg?w1NG$UMIkZmGe6cT(P0@ewK|iUUR0(QXmK)pDk-1s@_%
z&j_bU8|wPBUmgpVybu}c2gE&OC+(gKBcM`J>b`%}c0w+v-;C##8jx5TK+X|M$UKr=
zq;YV#?Gg?!rrG}_6PKQ=#F_l5;D<NYmF#~Io)z4~Wm^vU+?lVCD=xE)u*&+5B4q2d
zXtw+9Yru}PzaD$HoX^XycqKGV1<=*_qB`NNV84iA?z|WIjf`}wKeuZCSBcS|nEAxg
zB1)3iM=sl@X7Uv$4N(qPq-B3vWgCOm%w>zmmh%<k-YzCf!E9k=^FzEy#jWEjll{1A
zxD2QxaGhjJF~`c7fu1`3mtogLZ@gqQW)V%|)E2rorH4t+AAaew&4Pweq#E__xKvPs
z{7h45z{86D<~45oN+!<|+i!0bjotPBlNtp#2AE+o!0LfIY9J!BjIV1UG`;gLx51R}
z={A5nxljPNLMRyD4bRa@@u~4t#MLu#hG`P+t%rl(p14LBJ{M7NB(M{$gVzz}OM(f5
zcO#*oOI&EWW}VRvqG*_7DTR<RC6H0#1qqyxn>MBar<=nrn3D17*%m+P#Jvzuk@Iv%
z@AOux2u?BL;gKD=e`qPv)qr$GY5?M~FQ1I@ho4n<_G>vB<;fwgGcfpK2UMH(4q)3Z
zch8n9K2zq#fkM>*@SXfir7NtGvo*YM_3dBfq3N%b9Vj_v_p%W2nO1FGZwikb(f9>u
z?idC}RD_cr4c;0^Ey|FkUFl5ozPFHUWLKy*qxS7Z`q9a~f4g<Y=Nw56x`Q9m-^^GP
zCuZ3fC1V(15oRYO{$Fbt9dKB@mgTx$UoA|<XxBvMhb-HgZ51c~#ZXYQ(I1ZpflHS#
zzO(lj_85wU2WL$k%Ad^M;X~mrck_TUX^SK`v9-CED^@!b=Xp75y!WYQH*RiA5<#KM
zKvF|U(URBt!8a@pYy#v2z_fjlNa(BlK<RlB!$4L?0OPSLf0?zo!5&);3=k!lC4>{G
zn3VD0o{iHPkY&v2VHfulhNURC{axtCP6)m)_oZbLEXUQ&*6DtuLs0s_&!0mQ>NuK;
zJM)HvykH(XxDNd|&erWSzJ#uRg2&i7p3arFS>d!2k8F#EM`4;a&0%w{c|<<}NVRu<
z#De8+1swnL7;RXUk<U4>O0#e3qi^%*tLF|-wz3b{Z=!`3W;I@$s2r!O6Gfc?E)NOk
zY)U0S7HFtJ8j-4uXe`|Ynj)G4>FnvdMzDKFrKuH`6DX86Xa6DX0uiJv^~W?R|DEs_
zyekRlb2F!dhf8gkSD;RkMi62$Em;taZTu1+*~wCBysh8`+A7+q@pDkX(*G;&%KxGI
z{{J1jv1f~>Wt1&%S<1dPQOG((WC_W>M3%xBnIR%dw(R?o<sD^TCPXA7WNR^IvX)&;
z*6*3m`;YiO9{0y{&g;Hjujf7I^?aUt&rN&y;gW7xj<zTaei4wAsAuSH<~isc{`F{`
zI}OSDYQa6qj_?|Esg04%sHb5eb@yD)xVT*VsW0lud?DGO*>BC}+_qlM+Pw)((8(XY
z<?(e_KW?bfV#bjIr2};@d&0}*$wUNM*5v8Y>Baer?C4_ImkW>2Uy3t1BiDX`!(+7A
z(hISE!_)L^iH&s&N9$Gl%bMbYIb^>nx$Ru#&iv$F<&X`DJrjhbrl7FJu{>Gc^DtRf
z@J=pP@a^mG*LF6y8hk^)^;kGc)9FB9%ca{Yq0sV+GWd_pW6m1XecZB?m`MM2ct}eB
zm~c``KqRP$26KocpjMV%9P}64M7YWm{Y4Hg^%Aqr{V^1FpC2rPS-I$dnA8E?Kl!$A
z+AdS0-HB<8pAyjsVHC8&=!}#6$4JkV1$p@$j)9S1l%6MlhT$;;K2898TW7?T1hI71
zguiUoKLz>x4pE93lk+J`_!v`tY$rRYEp#R{=t`h*H%jLA!Kdrf5!%M~)pDIc9r|i^
z_cFXtGR-`;vu+}^#ka?j@1{;mcWP@`m);}#sCXX0Nxlu@zai{%)T4orF_yc;I8eWb
zm*6`E<{>el@JD$wl7hWk!zp)injY#r_&y6pjWq*y^+vyU<5-Zj{~BGsRh1CzIhk`U
z<_DhJWBzLX8b2+j@IY}nxgh5H_Y40-MeKQU6uO4#Vj?S=EhWP6$2{mPA$mM_h4{@G
z8X*0PUfd%b^EzD8rKzAwCE<6i6Yt|uGx1<X{GlTX31}NwGv9LY<Mj?(*18oEzEt}2
z=j`#bhWVzAC%>G`TN5}B`<G?=+-;tER!`miw-Mqp;aWZNXVLs{-9-TU84h3r2@Vgy
zHff7{hmAiAS3mk5+V6iOe+@YrgzX#wF?7<Cd_`9mSv^I~ab^zjA-fIcjB`Bz<+P<P
z$eRhkGMkex+pbWf#ffPEJ)&{QxQuv}BwxD$YyCR_P7A=OZ}LgHNGN_KIZlO4HI1}x
z9UR|AsNIg21)c<f!l9EF*y*J0Fsx!d->z3?dHqP=7V-=}a`~?bh?<`g@I-kVhH@y(
z6iIh5C5Q*KI|D)*y#S<#l~UZf+pK>0B~H^9%qb8R+BWN~fypcoKT(~L&hsXh4HU+J
zON_K}1VKFlJPw8&pm$T$jb+aV^Yb;M%8vNXYe1re2Ll|QzG5)RmCkALrKjQaw@*^$
zn&%E$cWq52!eA*366c>7Kw;dHF7k>sSf(i|SlAu}_FqF7sNMbFy;@p4$t#ct?p%9@
z9%I5Vs=86YY}&f>Q90Gu!S%l;z~h1f&?M&d2__?^=mqlr#=J<o?OK$uWThz;qQ#5>
zc%i(l`0g`7;-E=dQY|E4cRp*-aHpLXGE0kKY(Xm+z$6L%gC&er$Acn1VzRkAnmG9&
zB=<jjn@YjrHh?c$V98{nvbt3!%+JlQ_hqf7H#lbe*F?fa^!C5p<kp=Vk^^AP-e;F|
z`A3%Lc%_z->j7FbS1BW_6|u?&675rnTfxfUxp#!~^&K_AIuiq!4^}WT4GS$d(TgW;
zbe!(3a0ImVz2sfdGt6a@IMcIN_(7aqi(W*%u43x;pwP%2*eJo+w?VPB+?EoR20+4U
zf4IN_B;&U;L8!-{uDYYsX}MED_xDU>(SKbedQUZE2V)Ljz6mI8lL3gfh)ew=yxG0h
zQhrO?{=^`&2lz5l_}q0z5evFJZ37{AE35jWm0*#xd+Mh@<$M^fia1_i1VoZVFnjwf
z++$SwBaFhb4CUsC;Ti{7?BJU~*wW=e_g|0njhxyIc%oQCPFCUV>u(~3I|6ak@KTvs
zT4{B2OwZe6w%PUxRczYQi;_?ZBypeiK;*)d7KkT})p|lZ!n*3CjzS#L0q0JIcnDwY
zWafcr0xE~$+`+E9Oxw@7QE#adai9q36h-%c#hPHxH!Fj}e6aDomj59tRgMhEBoC{?
zlB~yv<#Xe{OG{h!Bt>Mmfy_trO`5?tP{$$C8QzTNs-@gZHJK0Vjq4Z>r5QXUaVF_i
zv+ZD2cy!alr8Gh>VFbmJQZ8i+o=V+Vz?~zlBE?~)CK(DXitC>%V=K(H^VdZB{$$G2
zOpTUNmbQ?j3&?I1%@jK@)sK6z;Y5-mi5xV=|K0?8RYKFRG|6e8qekgOM+bQ3I@(T_
zYoQwVsX35(0sMf^<+3OgCl6{@x>F2?PkhR_C&K78vlJrFmZICLjq=w5ABqLv>7G?W
zYgAOc8rj3{;kh^4{<-ex2$CkDgzgt3+{~*vv<2%>-PmDI_q1zLc^m_OoIx_TRVEL;
zPf<9<vf6kawn|@9hSZANp!tPQLc>YMB)j{TozSASkfF`4)WxIy1UhR{U^pEAB^I9e
zbI$&X&{TP@)RoiNKLicb;{^NEk~JP+vWySiZv+0t{<eB>RV4^ZoDU~D>;*rtN=G@G
z0ZqDbzu?rjA3NurL<(%}p2vD8jmMxKtFKm=Q;(g8nKm*?&YmG@<Tbt8{8(Q#`wDLk
zXz-jJKnvb&S~(;1LQ7<{!mnmk>B!UAQXDsP+bhEvz;Lx^6n{%c1v^O{iyz4)_I;e`
zy|J0m?0*5w3-;rsrs*kjfxJz1(+azv+iVo+3US;Y+a#{fP-q>4Xw&~Mf`)e9VHl8@
zI}Tr`pSB`e#bP^a%B|W28g@<^@1&lL^Zca-YlXr@ai;Gt!5ct~@V!asdP2Rl?9i9L
zb@Rk^O2yv+sxyzugZ={B8Le*JUVn39zAeU#i;mt_fI17KVCTOq*yBrS7^Ub*#?Y@q
z33l098JL%SA6?}mDDaJq8%D{U!R3~s(Vop5KjS#VSy<sgfw2r2274gEY*nk`JHYdV
zw@N}s({VvWNWso7`JrM0;D>U6b!@PWdX#nsmkF6?1Gx6&ZMT8$k}I|E33aH)Z|z@{
ztT}_^&|W3hBO$%&7%N(u=hn(8h7Kx;?{8T?OHTWB1Ef}s=JWW@al_oPG;ThU1*iE3
zz(WpoL4Q*aEk|~AzXZu_FYUVT$VkTGz<z)nz?AVr%V?`Vl6)!ofOJ-`YNnske=o2D
z``v9x+9~8laeOunISGKz{yv9A9a3lOZfq7)(n>78b@VfazfL7&qm0(sMVI9=s19r=
zo3yes>!lZaIygd3P!Es3wlqvvuc|(!5M?yd>bJDn@ID%5UMi{H?BB%nY!wT9tew7P
z$C`n&Whl8Me8a<*JL^3<yu9k{3SKj30$Ac-50l;SspyA!L-fVPjJxaPy;qjMSr=-0
z=g<C~+cVnzi-}mZ4|kXznP1k?v@v9Yq*-H4m?I1jOoug}O`X_XU&{FZ9FV(U3(iW~
zEn2)&?CR$>kNGiq#6+x-$#!2*A*;wg4S8QvOn~x40X%dNbQl(|bRS#uP_}D>2nr<v
z(@)=l7!sLC@5pJ`X&cN8ZSS0lugr+fVZhui)s$8MCiRgxLy{UH5j(Zm!@<dQ?>E`~
zaDP$1dM`v<Kebs5-=@%_yx$4i9{ZhDt<ObJUW2U#xUP<%U7(@o0;rqxVf0ivKfjXK
zpR%hE8WE2YHIHz6Tvr7P)T@qVvMK%Vh9@?KMSqp-hq!dwk-|xWW_$`VdiRFS<sr98
z7Gx{KJ_A)CN%ec<%x9jb4!g{!v$Tw_yMBH2r8GrULm?sj)~~<2PngSVDl-?0HL;!q
znaG_23E`XR@M2eIXsDJK1-3)D!no3Fy{B-ggNjcbRJ;0m>ViZ@E74<>`R)EE9KOF!
zv|6%HU!KH3#@r2Ehv9s>i2_A>?m5SyH(q#d^y5ADeJoY(-J4)WXv!zhuVNi>8gnR@
z9o`^Npd-zzP|P3Zy_2TWc;Eu}FWDCkti3?8>bBamdhU?@0>K1Tu^@3qgy7g!c8gE)
zsXg0wjTLidEk;y!qg$O@rgU^hy(&nA?KZ@>b@}%X@O8@@EXwd!=6%UHk<zl!T32W&
z?s<s&8uvXZaxgYNqbD)up72z)-|ohPK}DsZ$?-aF7Z0AI(vrH;il-nLlMR7Nx=rTB
z+J74b$Z5Mj5(~=CmNOc#4M2JPQn(}&1l<otd*%|a4n=F%X=#8Ra_1MZ!MB%W<%6^)
zUCzhSj+|<75!~x|lbKfk`<#?Uz=f7Tu)&M*c0N^g2Y3TV;^;`yq_2d`0VI382BI*3
z8Sa{SLV0|cknq*6?}9l|;-Yj^_Ux@mJL}$@3U3SV5TE*n9q}z#1OtW*5g2D*#RP^?
zMdF;uCalwpoX|+UduHXUjx=Jm;^&aIjFN2u)s_3=b%viVFTLdR_*hY1Q&HGn`*f;y
zDWiEsqdJCKbfiYA(HtN5012)TKuxf;av;PohDmDU;d?6_{!MN8>#^EH{&gua6bx&s
z;a|_qGU-<Z)s-)sYdz|Hs?S~Y?ip7<70gP#;-tc>`#A&+Pf3N*V_$Hi^yuwHIq72}
zznjz^O?1h%FSr%2@A9`VH1@n*32NT+<^6Z{<A|P#QDH$*JQxhz92mLeO&(RB>moc$
z<lb;%!NOFl;CX3tCdgeFi91GKjG3luXXR60l)Kuq5<m$O^wv;vU-6pVt;)1r_HeyT
zT~W7cY2}}*ENs1Vktpa}Q1a%{#&aW!7cZWr%2P%;&4s`*@THL*u!z_KH^25@DVB8f
z*h|bvoCQgj#7|Nnt1*rQNo5%k3EnoLs&30om#rLRz8|#R|FbhZGTq|Ta$@ezU2_}L
z&XUe!25i?Qq$Nr!-OkR6X7=?BU{bF*Flo|hGCaLzHmW4UcwH(Brv1<$wlBthwj=U3
zm#lYaqspmdwJQg-(Y_1DJX-1YcXh+IbX{S8%D(Ov=C09fY+_U@p_JSCEwGX(ohKW7
zQn!hbZ+6by=6LSbX087mr8FA*gz$hYwa;tDr}7|bi;o=|R%b=>@k}EpO!f~6oO$X(
z9f7|0agm|HLI@!zKjqi)><8j!aNNgFwGj)~@AY&kcNLz6;x&&`-gQwqyM_)N&m^Vf
z=o^qf{T<k1N1KzEE4K{M=I9T719!de2DJ`;5D6U)@)@&%2W;m4fn!viwRzX24@|Hf
z^hSeCGM~6Ws&$Y!^*p8t<9!y#6Q*314g<}pd79+pgTLLwESIjD{WLU0KR*r?F$$m_
zW8t?2{}p|0r{bRd;^U$yNpY>FdsyB*TqUkR?TK~z8(|@+NK|b7&pVwnWqMv(%zWah
zB00C)A2ALye>40iJ9+G+_KBfmx@Je@6!FD-02e}VWDzfOqzJi}Rd?T4`2&O4%gK2j
zVo>_?iD>GDu5NZ!SbCWMN~qVKJ$aQrd5rgKFg8ab?&{oXNAfxS=l|cAO~xUIumAY2
U$3`4@F%N?Db&YkZQMVucA4q>^y8r+H

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-64.png b/srcpkgs/void-artwork/files/icons/void-logo-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..c20179a3185183681679210a8a068fe24274e9b1
GIT binary patch
literal 4013
zcmV;e4^r@nP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x4`N9~K~#90?OS<NmDjcZ?K@wl%j_kJDB!>l1Qo;qBhg^$6hspfEr~UG
zjW17=yr!*5SF6;t+L#y3&@_2QyP8;I;y{QJL(wP+qBtPRtinYG6&Wv=>0a)z-yeb%
z?ucIf=lNUfF4lL3-`RV!&v(w==X}6JJj6ph#Q$T^gB*;Ry#b5|5ClNc_hSHR0G$A;
z0bC-Y)(0iieKkOz!t+`*Eib4$)$#4!?Q(Uen!9z~0=+>mU}k^-AqiO^6tJt*)ueD$
zkiu1=^KkPx<?rFY2f#rhYPw%C-WLNf^AnA2jel%tYly9Ft`%r?TEX4$NX1eP^b0f&
z_ZeR3=jr!0fJ`D{XUghS12FUa`sVuWmDei$n>EcMXL5VGdK$+Bj%g0^3wjm6K4%%i
zDF$HXkjA#g^wQeWh!#zY&>5W8pm0?fqeewt9_BslX(B4USH62TfKI1dcIo=1FD}<z
zmN1;^oz_7>$gmJYL{P+fiA3_3d+~<5nwxh*B9XM~^?G_>$^!rcRSi|5<3-2+)Y8#%
zf|=d!mdaUEVBz`7^9NKnRAOiF4Fy7h5b<I0R|C8Q;_ha(aN0|dnHQeFa{hp-;lUe0
zKmx>#i)$R=HzIPVMsV7jnurcD^AZ47jUboFO}=ivCT|aKgGeaShy)^yiA*K}x#)Uz
zzM3A5xUsDf-P&&9P^OfLO*nJujK5eUKF!QgMAYf9+zyZ8AO?GaL@eQ8Ww1f%rOfkH
z_<jN)pNML$^z{KSv!%0TWn)X@&nj<JigbFN!!n9QBAyXB<D{><Z-S#QMu*AUJ3E(4
zMWS|@O!l3<w#>ZnV%5cTsYGfVHEh%tnMC$KM5J+atUeA`lgYGNbwjnWw5C+9H|iad
z)m`pxN{mYUy;LgQ>_~fuNSQfw$C0ngT01rL#-deEi$tOf2l`9^P)kH@j*MZ0$D>2r
z@qSTNQR<D>8xBp`5M_uVW=u@9Bl`r02n$su>FKAk#U^HmgrdDVo$eW_RBF=*M0C*+
zZhPqSoK?)cue_%Go6_1+sl7f`H>*UC_&&0inIr8@1-ttIW?uNk@q^(ezQvPWm@9t&
zyU+LObh;Erm2d`#==-psu-NF(=q|gB87QhQ8V6vhy{2|OAh-1Fr{(pP1GcxvicX0{
zLeW=_c!D!QM8(WJRo|;WYtIwfyV`|yO?4kK^L|@iVABJbIq5)t_ApCz*@d~{4{muv
zvSZ>q2SijH78I5e;2mJF*Y;A~B|iWQY_+lJ0fp7&X%+QVR)d=#icX2#<Su)eIgW@f
z*b~TEAfm&X9?d_S+nZmowK}M~)WSw}<L?0+vew3`2Qahuxys^Ld%`GOJQ#q*b=?ZD
z7c-|ewKpBCZLBS>ZLBSB(lmX`%&E-m<tUH4%>A{9pokuO?XI_6pUBL9*6M9}z`UH|
ze4A6mO)ls8lV-l>ND7OYCAwbS#<H5S|5n{pi3TM}BIQ!~f?#E^p-0!VRVI;bAfjGd
zd_<(t>2-fBuPgtHt<6$hQ=Kq6Bzh5motEmYDp*=qncC8!wrPO*lO8uJToqevwE=E<
zQ<J9YLiYLW-<H*uNi1cEdUQR4(wb7q(ZZwaZnodN(6=kJ35iJZap)tVHs1w0y^b0+
zjn7%D7Zny3Zo78v+7p8-zCZe}upV_M<et_e&55Dm`9!4de`e;#a&mIgbUK}4?%cU6
z0ki{Ha-sCXhNGvCdYDWmt6V;QK2UfopzYOCUU6R7^hc-XGV@cpxw+dl8qEL~W@h7z
z88iM+QBg6ernaW1y0%(uD|TQtCuU}5mH>cQELO+G#U1nX^!$*BnnkBipMGie>eUvt
z6pDqIv33b$9<F9}z8>DD2|-~W_X#AgsHpfPIXU^~Sy@@aO`A69<#PGwyLRo0+_Pto
zsH@BV(hUIN6T<P@`q$v?=Z&)!XU8i=$|JL8%?cW9IDdbCR;g68)~#E&_Ta&Tj%?-x
z03!Myq*Ceh_uhN&SIitkTCH|<czF27DwWEjy9Z7lkMIRk&B|v*PBFZ><mFHR{`>ar
z`)<veHNGAm9{B9D&uUMcIH62SOOqOn#@p@1VliS9V&SLs0}(;pqDKCY`Ox-g2k^!v
z#Nju8{tW=&o1Nd_%g?_w8++r%jlD@pNqN(zO-meX94}ulJT~{S+s`-ZZs1Jr888p@
z5P?8|?Ck7(kyI-EEG;eV?dP9=-q(@=>I*Mp)U-&rc)JfM9}^H{tgo+MwQ=Ldw|4B<
zA%5wlm-Jh<Z29N9b?bh<ef#zS;jmaNM%ssI7#lHm07qv>C(h-a8&G!f>_xDN(cRsR
z^u6h3@<^pptXQ#P-`1^Lmsy%p3!YwpMb9m|{mdrDFBbj+T^$3x&}1^9prBx)fQXE#
zsi`l=#>N^4lK}u5O{n_Oe2K5Wd{sPs`t(0!W@d^qGBU1j-@bk3?%lhe9jrV6%vm(Y
zO!;12FUpI`&3JozdtqV|j(mH>%sT*J<;s-?p-_mOJ9nD7zDzE|?1i%jlvP$#nknB8
zy<RUA000rCZ`iP*+F~mJH;Sv!)pYA!$3_z>a|-dR7ynBT8yjoP%gg)QqD6~FH#9Un
zxqkh6+2FoHp%70!_mmlD?vY%Jf{h9p1u&5HO_o_55g|1-_2ll|yO(OU=Eg~!mk3w4
zf$ythhmToP3nNF4Y`8t|=g*)2Vp39)#U+JJjLMusbT+DyzatZMXDhJzgLjSl_wP>#
z4h~*JM7^1rnQL2HTg}$vDKn?Q$KS_{FLQ6EMWN<BJr5_3pF~Szi&<S#Qj#G$I{L!4
zZQCS+>jVM;<}aN;piHCIAU8YLn)0T_ix+RcZ2%(r>8-ckDijDTFZ~UrS8?ipzlGe>
z4bxv)jF^NejYO0W0L)DF_4S^X`aQnjakH|#V|l2*T5nb!8WxI~Ni%VH-(ia~tX{pk
z=F2a?T-n^*Y-Z@m(<fut@PT2=fiDg~r`4J95D~U)+0yFf=C*x+wzFo<dU5&k<rcj_
zBo!lUUOb|gJr0Sh3>{q^-ggkPtE;QtQor!X@By#iYqi(#_YeMV*3Lh`A8&4c6Xh4n
zQCU%GRzGgsIAd~ha{9Jy+sxNw0P~+2_}@R1dj?tQ=F<oOHgDeCvuxS21R^pIBnk=&
z4#mgEFVO4%t&eA*KOSA202gnM+htEqoN0W0;mUyiENpIW?$N}=#MuVJK>Ljj84cw~
zB><qOy9Z?#%FwGDxXYb5bs}DQ^A#w(6nN*Ycg$7>0NAl(hsN96yE!E#C3tY1P$)#)
z%(&an?XB%7FDf@%`dnOG_@j?L(yUswYBmuS02WeW%pCN_8*fx@-MUpIl!y>ID+WPR
zBS18;snXNe_>b4NJWE9T`}zg$+O_NAtFON5saC7)rrP8#a)d{RV{Y<XL{EtZ5#i>w
zn^?PIE!Z?raHUeoDwXQ}<;$19o{^C;q(rVjAV9$I0IXWMO22gJ(*03UQU6Iq?fvx@
z$<%7~vOWLG*nQyQQK3*`In7TXeE1*hGsg}ewXnae?}R3`u&^+pt*y-+0Emdha`DWP
zx)OJz>DEdslgps+QkZe-^?I~6wL&NmA~G<tL*JwSiJ5uCh!NFe$BupX%$YOqb#`{j
z@9ZOX5l=0uDY6(h2m}In`FJ5NJWd;|3|8K$ct0#|BRxGmzb>n<d?BO!$Ddi$9sq-J
zy7IzYW_Ih(!}tCDr0@6dw#?q+!^i)WU!EVX?bTZS4~oTN1dR&f_^|jgUk~4z7NX2&
z2Jw27TrFuHrni{0xeYfLw>(SA12&?;u;C$lz1<YnqZa@NPyZn5=<Ql#b94Yi)avWu
z8#8CpoK4{)!+T{CnHjH4Dl>(T4DX#YY0f5J58oI^LTqiX_SdQgmCaZ{CY71|J^a70
zDx0+mX7>5)$litnC$nr0@bcW}x);Yk@rX4GTj2EsFu$#{ZE0suXD9%;$=xcw+`RS!
z`0mc=(jL#Hx=RhkSBq`t2FDB^W0(*;K}kgB8w=P-h!9cBc~#lj11Gc0BcVI+c}}`~
zQfTB~0i-%2c%Op1`+oO=5!zm@-Ma_@UIAyVDG%65ipGo%dwc97qb<e={m|-kv_1Q)
zXPMb%^3mBKqLK+A6H<Z$f-UYp0Kmt?$Kdbfzrhxdy>o%ArPH3gX-}AQSBgcuax(V!
zod!KH5YeHDp%a$`D=ix#ba-eJ5goC`VRL>H5i|4JuTLD_Th&lw)7^Iecu49lcRk6>
z)0}lG<OupsrIVTY+v=OuxApOI_c8|h2L94sf4e6`M3nyG6HCemZ-mUj_%!P)mt8p-
zr<r-7oyJZD5gnd1c2Y{eClCmcL6PM|WI5uxv#%oqF!T7oeZRZt;F%vBy8JMC%%g^1
z&VBZ)kv;)y99<o3jO__vlq2U3{YUd6kqA+vqaujtioHG#9gY%Fg{E8cy9=uFcWRrj
z+x41rSBga?wU<}CFe@cRqw9RzUE=!Jp<G%30A^OSc52@EI`{BzTf5qYI-Txm2M%Np
zG4mq5Uhn6K^1u-82QV|0*Q;`Vx9i=6o?gc<EqJ)N@uIldhS;%>9vK%9{0{&*)~>NI
za}a>|qN|r*DX1!*_FchoVP{V_0YFkrf_}}DE1Z57Ii$dXnOzI2N-n1D`5;7Zw7EK3
z7>MAf@HR~hiQthwN`t$rd#gkw>;RLXyH}^^)OLAPUat|B)l~|bG_4lB?0y(w$X8^T
z+2=$>LCHJ&KUEIZ2+n}BjWFa(Qbg3k%#rfvUeEv2zK=tCbk>8L`+@AjT(QAu*yqSQ
z!4cfG@XYLb=~{K>)`L3}Y8tQK*XyyC@I=fE!<xA(k{!9TWD9qFO^%4V03>R<HNW1K
zb8yq4v&Y1PGcflH0wQ?1xU<e+u$YG&3Y>LQbbO(zWbck62g2>`81EI~fuY9K#FUbl
z(c_m8QPsWjIs3YNN^a@dkM^F-8g}J+wbKkiAViEDV@RGdr(s6;<d=!aa@zQ=xSb4U
zCIC;KzgoWj+~uOl$BXg>ZC&kmbt&7&-P4p9HPsX!5|tl0dR!V2{orJA@B1e+J^&V$
z)?Im4)lfU5rt!M0>P9W!Y;O^0^;+uH8wkV@2}SHCb74P)k1<pkC<yW!-Zfeocq$@r
z%ohN%?&mi|5Bj4iF92f!jKZxCraS-$0kq-Phf_5GF5m0r%7=J}hj@sGa1j3oN`j`O
T7)vOF00000NkvXXu0mjflT-0;

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-128.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..82cbd153ab2061058cb84c9a7959fcd27a3b3559
GIT binary patch
literal 5156
zcmV+<6x-{GP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00006VoOIv0RI60
z0RN!9r;`8x6WK{bK~#90?VWpkl+~HXzt5RW!cCN$Xsw7_ixzBmt+$p-U=$L-qJ@wt
zP%nVDYS*fDtyU?%(%M#OtGjLeh^v5NqfSEn6f1WPL9w`kZC9y6Z3SE{Dxe4m$;|sc
z`$rNCBq1}Cb7m%(?_Xptzvqzmm-C+Yoaa18I0A`P#g4-;5TT!_^cRtn6zzx76QMiM
z8R!Ib2SUJJpcdG#qB}%o2k^ciZ!5Z4(SL*_^!kLM6W$UL&EEgaK9cPQw3XP3*wNBS
zh5=`yd==$PgcBTv+YP)bA}=etCLxJ6lZQ@z*HNsD(C!SNs#5uU<rx9NXhn+!84ToQ
zu}K?&C4wyNvZu?cv17;9WU(zN({2n9TNC>?@#Rur5^#LB+tUKOP=2qXu@Ad^xcus~
zu8wEBL9LO~1}Ixu);AmuUxIKc@a1f`Cq=fQJfeX<6pcjR%ywg1A}0;-#F{6*5K4r;
zhj1lz1GaXJqHBzpyGw?a{2|u{kvV06^6K)z2tNSE0Vdn+v5lgy2r_Hpu!)Ou#RxfJ
zfG4V-_)<th_W<9>c3U!nvQ9*1Oe~zZEZa@VssSojR`&A4{!D~x$?ix#D=4}$&(FJY
zLS({g*=j>p4B)9}2Cg1>oruh$ZZhVxOdPmZ^VEwDj_%8J@QfRvqPpUXDmoV!n(5d%
z&YP-wb#!?2xl9Jlm;qE(%3mnIQdE8gbj?)Uc7}?|e;0HuxN+QB<37nmz>FE7a%E*N
zKi{tg24yN{JLXj}GI`?Ai5px8%GjgUgpm_=C>jA?%~Z^G%$GILmn*6(E^{3y<70rz
zHI>KuzW*E@Jwb8^zuYi%!w)?10ypwmAhtTzN04V}f783!L3wIVuxHA&$h7^orL#5<
z&|!kqP|>Q|aP2oQ{@TSK+tkhKL{NtbQf7T96dF5W$b|Q831)pNxMNI^GJi|>iK5Ao
z$(wD6W!(VK(G#SKAb$`1U}!WF-PU%k9Km5vuvO95MCDC{cLaGikYIa=Py(M_fdpYy
z?J6NT2I!`Nb{AxTiViTCQx!eYa(isCKHua=E*g5#?zV{Ji~+!k34BG@8a1mFU9GkH
zQgl>wS6kW?tBQ4#ken+j5fwcTIGfyAxO!H5>DcI?Xl=RzIb{Gy%LEBvnTS-@CTbT=
ziA>q<uzAF)V%;!YAR?Cl#bntGf;{=!u-B%fJ5P{v27u&DAjsxGf`@$Z=VdE1w`^ru
z-*A3-vLM$eIv^WusOO&2!qQvP`C?8Q01i7a+<<UT??msiNF<WTM%xa>Q_r0K!s!=i
zpfeH9%0d$q7++dg`ukMBn6n0eCOyFx;MR%5CO(-f=~RcJs#3nXe4H4$8|AbNhu@LV
z#2J%^PkuX<FQsIF5uTTK6z?AMwD+LX`)p$>*Hj)G_`$b>yx@UsBuu13Y(p$xcF0Y@
z44_K}L%+DQ%gzz0q@$-~fYEnO`=KhA5)PlY?Dhx$nR@#^TP$3&@T9;GehXZX!LTWf
z2a+~GkvH`;LH<PDp1L<WOpqL^Dhr=qc!Q!p2l6u#5{*O)qt(fLIH`Pq(pYIo;1TLB
zKEP?j<Ife}bycqJ(8(D@L?;$byjMjB3-b4jghcM2vu;i}nGYvrfRF#$?Iw_O4te=B
z;_($l-X+JT+{Diy(P7c`HBxi7qN_6yZeWj3dfbrA2V1=bjPj;`&Y+uUIghX7c8~&#
z7cVZ@+imXxpww}wPfW-REE!U=<!~QrwFfZhk2!o2XUFXz1;&mYTcg`_GQu3kp}GWq
z@Qc<ybl4tXw0G%Ol+Y{G6;Wu7j-DU|R8=aTub2Z|={VHL(!$bbTY9sV9>B~dxr+~V
zJwa7RPmmlUqPk750V*7answNAwDiW9S<{9G0jtsoxFHb^o&W6Z551ShcRzE)HpKGT
z!83x4bQUC_uyjP}^Ub~0Vh<1mq_wyJ49bi9)g3)SazqD3YvU4+3bNT*5W|d?-fFf7
zDDo~pT?qcSrT3F$BjIqQV@!}73s)^XJ21fuIGQXnfjOsSM9IrdUT^NhLU1!}Unn}Y
zV@!}dB_m2+7UWh}`o8gRYwq<X7rFkq|1In}v13e-B=t`QPvd6oK>d*a#YsaZ9W)!+
zqz4FzUWVOnsAEi!BqE|}^jhlb7Fw4N`Jw5DzSzV7s$A?K_^FaexX?Y~hz^ZzRneb0
zlAnI)8o@yZ80Aer3m9lSs=_-#m-zj*b&ptjG8^Fy2g=9w*w^Fy#xER{&?x974uWFf
z)}=QuaM7)$Ol(E$XbL#hi0P}UT>(U7ulTZUU#EQ=ZEw9whv=YaZN=(}A1eBkZEd6G
zTfowWpAQTIJ<l_LWXroiU&}Gy_&O&I@;o=YTU%q!x;fz<dwYyA#$2eX5#V21`O2F>
z6~dyOop&zFR<XzW0pVY;zggxZ?WKJiQppb(VDzl1XKNt;V>uWgmo4+=K5Ae0@YENi
zxE}Zp&?ilq_Yv;bkp4P4IJ(nf^OB<C`HIP^T4r0<h#6HftYjrL8Uv`B(Y6BtTelyd
z_qYSy7MZhdPPn|f{3bu&e+&2#>0f++V^KUw$UkD$vFod<sxrC<Aoynx1O8@PS5?O}
z{M$5o)xH5l9$J6(gBj~WV^y(JdVJDjEy6E=qby1vEh6`A4{cu)tB##)QTMP!qfsBV
zzih00daVt>1wWh812{C}r>*!J()pG(Tco_YyhuW_UXZUk40Dc%ys~iB!id8d2N93Q
zAER#flT8LLT)psks5gLL(`gv?w>T|dK4V@=IqK;WTOFH-@HCmJIe1K9f+ZEJE54b5
zSWFo?<vn1fZCynNL%ji%!1`_$5m{(kvpLFFm!B`lV`L`dwt)ggpDeE~FUmwPRb60R
z6CDBv3?OG(*7qf>i!5t4AyyST1*ilHT*qpLe1s=6F(#-jsQm+$Zv%>+1N8<FuzlZr
zX~}K#KCrBL5Odbe2@~Q;vRi8Q7!i3q7K<gDHI)|ilT+($Y6^0?s*3r>PcA(HIL@Xx
z$SS*fP3iGTj~g5h_>$#ZIZm#19YjQ`EK43;`C?^16HnxQ$+9p3B(*CgUCOG;dJ8hs
zWsDS=^;FeU$G8j-_<{8r!hr?@jS}>;EgUCsFr)Y>;k@wmKsT2$QskIKC~=+300nsk
zYpL4?ZV%;TBgjcsMd9sL-u#a&YaSrBA(oHw9as8kqkPxpOksU3Agk$hqSD`hTI~VU
zaV=o8!;A%byNr<*Lf`G-?V}t=vARU8q9+;b_W({$$Wrt|m-=l%0vYEx#3q|!iuN&T
z`L9Xf9h-Vh^(AA|u&JWxc~133tu73SN-rapD_E$AGXun4jP+EszbkzU42V_5oDEJ5
z#_rfk>19A|moRa+ZeGi&&a~|yp-{+KwJ=57R1~raLKg#K)c{5VcXfP1wkNFY6PUnu
zM%4kV8vqInmTv(9)@#}~BA1^1n?-$fHZ>j6kP`z~JvPQij<^#)a|J)}ZRb@6Mj`Dw
zv(2H1yFri|+kXMpk&rmcDi&k+b`9(`V%Y#jtfpcegcxaad34u^@2-s^mJOinHCWz;
zB<jupzVWS2gg8KhAh4dq*+8H{FPnNIve#hwu}#6*s#tVzbf?pO^lfKTG!ot8OkFs^
zrktXC4Pd$KYjBEPy@OHJj2^9;5=x7;cx+(QSTz8`b|cmeVB8i-7M!P=rHdMU+Nr*%
z-9Ij6i&12&RZ+)v^R<^Q!MbU!u&qy`kM-=`gHY?+#I_phib2@q^CP@#ojnRh2SsZU
z9&n|fHp*{Zo?lQ_Rn{BJse7Wb)hKMXDGEp@*?X>K&4UQlgzf`!X-?pyyddv4E(7F+
z@~r<(MP;iAkiXg%Ry9tSY$uGIumj~zmoZX7RA!8ijCYm=1z<44ZEO1Kziw7~bKe4N
z&t5rSv+o`B{!f&3uHz)ZAA|P-=eHz93oT3jUo;ZkW~fUve9f}>*%#hD-Pwc?KqL}L
z_<8;$piRfZwUM1BWF|+WQQu{dvXy0h!R}c^imroC7lNA9k8300{rh#SWz8l`8Zznc
zCNSfH8rQL!q1K4`R%_L`ZIGXzKc3`E_9lg>tcQl3L85DHiq{2jQ*P!^N=B4a3G!_$
zuW7WxejwUVWWhBmI>EN4Ag@5f?qD_64FFO+)|;A<1dfS?6BimW7m%6T!G{QA(mA3n
z9UiZK{6rMnxrT|LHdq7o23X<EeHX;`LQ9^HnPgeBMM{R1tTbZ2s;KST*#T5_tqGYk
zN{5xMauwrH!V<m$%iX`CFE$*h+bDTMm)Hza&o!m7Ql}dy8&fi@<R5+fK7)Z9vHN86
zk)qe}9z!#6&u<{MA(pRblj4qTMUZ6;|2|*<5gZsm2kd&i+eG`iEfa}E5~YQu_i3J<
zTt8Qk{w`(ZJw@-x^Yc!Q7Dj*LdbEEiW~aFr_`G#p%z-j-2evXvk8Z1U=bl}_(KdsL
z>TN&_+xyyDp}wk@H)q|PyL#^HSuBB!t3UnwunQ`JY*O?&QF*#o&}(_Nj;D>qVj(o`
zlKqEc+pEJ~{d2<)2NjDh_NF}oTxvU_AQvt5=H|pI-eYSY>)t8RX@II8ht?&TD!LnC
zTY(g8s^5c`bt<YWE>m$*W9h!q!qOWXemKYgqrItP6?w*fOxa|5cKynd@BKO(&+F}u
z*o(2wCSf)zdZKM@4e1%tA<+Xpz(E<j`{}<NaBvj64$u$xeBZwAk%`3RyDlz1@M`0W
z4~H0FmFFb{byC$cP<~YO<0~>&W3N4<qL1KWm$lO5+BPj0Pv~JB4A=xZi=X&4Ieuh)
zE)Xq@eh><UMgkiw%GSi=@g~*Aniyc2_wbvbi!BCjgj`VUO~2la_L0SeArszLG=jaJ
z;L-Y;g9p+4E*>$zv=p=%^q$ePrhna?{*gnpF#3U_=hJo*sIUIL&ArjA0hZk{w+h5+
zS+YiiH3)uJU!JyuR<LA(MU#e4dcC<fTHMDct(-X7Hss`ZO~K-E-c`1@IvtU;bxfc}
zTRcO!MFZ4N+`N=dz+@2kTAcV3BRnsoCD_|5Z5R_g6CE0Tp`|wuyOTF?T#HX(Tmf6}
zr{l>WDblzd_+sR+)5)#=;)}hhe*kfDj$I>kehvMvT;+LLnRjn*#8$`p2=XkgA1Cub
zX<_L#hx<Shd-+2*;5_9@rWUYeVd<|*JG+f@WRPS}ut$AuHFLUE1Jun6$bG3aFikG}
z_~WiiJDv`bqqTvdATy(pXscV*ld9&?z5DJvaa{ke4k=936#Ti!n>N^etoBb!14C6^
z8*B^yD;bTX3{d|4@_mS0MP}CY`w3JP-8t<>ItGWW(#-9k2I2B#lUGvu1s8i$?*+Lb
z)kda|J|pn&OTGD<GZ(Xc(l9VobV0N*Iy>3#rDT8+-qcP7@Dj*ZQg33~d;)q`clQ3G
z+$+yy>UY|d{;IU|uHD_f<L8CSGI?rxSyfr@ybtm|OeJ+K<u0~()@6eT%vv&EvTY;6
zEz9nhw}=d<mnDnmdFDmgI$2bI2Al}|H4zS-mq`<(N?P~W(RWTCuc`~v{eByH4P<r=
z{mOD>-r&qRSA~23Gcg(TR^ZSBI5rXvN0#0Gpw&|Ewn+N|j`pU_R`?H_jY*Ne3HpG6
zvc=x~tW*yh<6ZIj0Dn4g1$BS%EwLdH4xOKiJwe(As6TAF4EUDC_N0RkEEi#cXzepg
zyx%!J{d>$$r}YVHxd@~LbQH;N+Q>;0w5ba(^-A+UrrR^XNK5T$D+yq|!gGjLb?Ri+
zF1lrIo3eb1y~}&5=($FNLPdsCcfxAAn_Y6w1Z}>DUwHTQqiXh11#0{3K`SV{V_>7A
zo4{-oVK)RH`)YOxx<@bx(C&y7pxR4BPeA2(MF%LHF4!&2Mvj@l${=o>cUA9N;x9nX
zmvhe*a%Ny?rLgnU-h<mid8QZ#N1Y#`oJu^t;{3a=a8_DAS*%s|UOeOBEnvQ;u-2C5
z5ze5zxWB6SuB(pEW+SXW#~01Mq^s-=SJ3E;`VJ1u8-&B>W$Siey|(}In-}cu&hCp8
zdBV2#5z1-A<IiQQCvbAOL%CO8JD7go2DzIYowm&}P9q*)QRH26Y^DP{pUN%vrjG=D
z49NO`ryY>-+d)R=@{4{l?L?E1#}yrtiFoat4T*ez__Mb?x+4?8GIGAp@)`5q-cP>~
zg4_w%KKJH`L17=F3woZi&uP`s#$<dougJT+Pzde^24y;SZlkLqba`D4X6DHF317>-
zhgWYuK75A4&49bpHQEomfa|_a|461UK4dxPZj?9ua|V76nJFrnW5fmK#lxYQ*<2UM
ziKNRSZ`yf+-T`8}AabtqdkM)cOMf(XW40TT69#CYc-GWm1ado2ob9$aAOL+zjm%y?
zbDpz3m#LCd256vo*7ScR;3m*1Sgw+p1!_QIO7PR=-uySR-IznkNdq)6=Es+P!S~JO
zf=&g=>Y_;+{0Zbyldr#9a@)N0i&Z)%rw!1+2+zwaVDm_jC@>y}XA`!C`s9<xjnPLJ
z&zx_+$dd!wg#j8<mxgv!Vf||37+_!)n-d4tAi6YAmaXvS|Alt8_R;PPa42KFsmBE{
z7-T5OIf|Z+<#M-;cpGHBpz9S~SJ2t4X=~15wrTeUXpYg|)c%2(FBuI^4xqmv{eWXZ
zdnwXOkS?Hkz)?T~WH;zu>IQ5df$mgvtBBcxvc(wP;s=S>mwOA|&+h-sKK~Ch3Q803
SsiesO0000<MNUMnLSTYGGS)8u

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-16.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bdb5f3314c1c012d5568cc2f3c8868ccd225482
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0z^qfK~y-6b&}6ZR8bViKj*&3fJ8!}f{PdzEkaAB!YHL2OU>=1lQ5N;
z;3nGm7rflNYGYBj(TL|X%Y>3<l629=iJWN_87)N9%|M9u-a9RPqtk=Ft9$SHe$V}$
zA3_A~2lt#2Gp?dHP~t!Utc%E^@yzpNBDq%0mx%bbh`a<$G;s(YVOme>M5-mVPn1|6
z)W1f^04TbQ@DzBW=n~)q7Rp1}kp;Kt#sF-9KIi`MK24cKBH`t7x%8&lbcU}DfBnbZ
zlG`lE4A24em>n|(Jd&Hvy;j9q1u}cY(|O17{$n3^#jO!f@?jERjI`N`84pWI)$rpn
zPy)y<XB)i0y8~bwdp6mb+)7<Z?Pfk^9%!JS0ZRiNGax<T2P+HC%%Rx#{eq}WiOQ7k
z`-SXswgF(UYp{s00-&P3Mxp7TX?!_swddaj8mrtlR@`tvE&zy1+z5C80)GzUMm1W$
zs02qBVwIBteulEvO58T~EU;0f-%xa}%0X*b!ny(8g~>VxoY7{0WM^{AvaEJNCIp$V
zEUP_rHT4S)#tB>okU-u`pEGt=2nv7&`l+_|clZ3n{BE>_3Uaxey=`yLq1+N9ZRV}>
zVhwaUbkR{RAItYoj<iID1I}o3x8vA}M8d1{>e8y39_$({3c!#v6f1N54e0fd?*l7>
z6aq9R&>GryqswLil=3D2eD~>Bd&Euv7sB^Aa7o}Ia4O`Vu_>3n<yVVG1Bsx2a->B9
pGp5kX!HyW<JFsZrS!LNO_zMBG;mT&TE3N<l002ovPDHLkV1jLwGlT#D

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-22.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-22.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc749c3b63fc6170b5f2e183b3c2dcdc72c204b8
GIT binary patch
literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x16fH#K~y-6m6cCuR96(nf9Jku5`r<bR@*o&G3cViO+gpMc8CFEklJQ3
z=0P$bjY=(rZVIKOq%Z|bgPTI3B8Z08mI-eN_@@@?wA4gXT*PJU%0$t`rUZ-Ww4IsE
zd#8&eGdGV>)3dtgJKz28ckbhzD?BDHT))sz&_a(OohUnjO@IRT75z;_E*2@CPsWpf
zR@*O8z@PMMc*uvM@)6MRxPzDD5pY6X{leSr{c9IYlo`wi&l@#I*B}be2z(}sGUos4
z$DZgIU}SuxISj&IfEHjLVN6tRqZBc;sA>mGS7XP0b@f$mw>MK3-v8zMwZTGe^Ob?2
zdlB&tb@jVwo4)Tm(j-ZgL7=HzP$qI=F5cJPmluG}PY-{B>d^pc|0#8LY7JKaK>B)m
ziyOF?5nd^4tM+?s-k|JHB{ziB%mC|wJC1Ai{4j9l?*9@G-J8G*%h02u6kFVo+FsE0
z%iz`^2=)P|?ajmE!`qyavlqY^lTE}E<*s^O@0s<-{C+`(mZ8RVx~|KBc32wo8yf!p
z))w_g{Uc7`Od^~@I2CF*nYotfTV?xq&H?i)si?eVfSnd)Eb~F8{Go=&hqsByS3s@B
zsY5yGkNPbufaiGukS#NWR->?aC0F#eZNv@Sj)-Vk+=$s5!KSTs%m@UPgUq7MR8_4a
zx?&<)tFhK%KxQk#VYAIN#$<tf72Uk5{v0`IyOsW7fLoQK?CbWsos~QhPfQ`a7ZJ~k
z%DY~hS8n~%#HD&c;udGZAbQaPHZ9z0NZL-i<K06>%nlVjrlQAGwe?`z!LMyj;h#bh
z*jVXYveKD4@+^c?EDaPuAB31)+0@xt))*t>Bh4D<RYkV~3mRz5{FplP5cEWaCQSyt
z+>tuGWv#-A*AjO_6Se_Uz@XRe<pf|)>g~EZ<eI{+3SA!v=HrIezs_a6OkfMWnR=(b
z$YQVKnymf%r$^H-InOzB-VU!=9-9Y_ABruOoEyN45kvDp7Gzq`8b!8)#(|BX(~j%3
zSDP)X=JA2!hhn9YbAGk+r-e?dD{c13g~$u?{lGUfc{Hv_KTFTf(_%qHPB)fvb5C?^
z#~YvbJ`)t`x)i!VUuNlw4CtI7H&ygXLF?03QzvuP_WuWs+f=9_lj|D*0000<MNUMn
GLSTY6Dah~u

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-256.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-256.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe3a6acbedf9bdac4491cf0a952b9f192f641a9
GIT binary patch
literal 10660
zcmX9^bzGC*_uoc?w8RI=At9XtqZI^cq(LcZQEEuTMo39XNH?RqyIXRkw16-=rQtWe
zzt{eFp6xl$z4x5E`#$gUzBg1uO@R=f1|I+b5WZEEdj|jj(YHVVE;jn|-nqaEeZe+Y
zR*(ZcJbp4;^J4)3M!;J+S#9^!{UwjYr_-$u#~1aUl)560Q8$$G{9j1n|511Qu45zf
zWa4`FfA(%HC%$iGop_bg*Mq)Ie5QxXlXw8Ee?}r_ohbVpFZ4}NPf&<ccZmO9wYHC+
zA0Ksx86v;ASY2n#Ly~w*@C@qeW7E{;volrbg2_4acQnnYt?lBvTPa`?V`?Hm$JH-z
zEL152X385Vsrm1z1+OWujG@RrUR>>c3!aVLod-9JF(S+t(>w4aCd4~;n}*cjb;pj3
zzfRl{LVSGb-GE<tyvgLTRtbBej`;4;<d4Z%?Q{248wyE7?MM(&=f*?M2|U{&Y=C1`
zmDFS2*2(z3;v%@**yB2Wq|e#lze+4db8Q`~*%2uoMNAC2%_p>KuTaE$wh$vW;j9vp
zn4dc5EO9HJl6b1Qzu8n`byQ59Xd9TTn#-(W>R_gZ@&V=+pk>iQK)+Y|V2<#V<mB`W
zKKm{l#A{c}I>6J!qM^O(c@x~{)Y#r{qdV=z84iDFpHXOf;JYi`*aR$$eco|o=5(+J
zvcno(wh|onS}T>bM={!-c#lF6A-{1Ym<P0E-yY?PkNeC*GtI3DWE2szYKJq!C}Hei
z0?j@^tBQ445<nl6OPiYP6u-VKLRUaN4~kZ(t*vGGq%`}ae+wLV3YS!|<{$%Vl-m^L
z7CsmLIyV=kg2O>s2iWK=k*_9t;iSZx=}jm)1x*Lf;!3QAxLnM2e#{^x6{ce!wFeGN
zei%OBSh7BqT89n8IrhA4yPn}*ycBskR-s2;^-;PeEv`s?Kin~>0Nus_l%4=)wOXG%
zp3xMrNTnJaN^S%YKpUj3hMa!ZNyCK-ruEyUWD}73Cex;-I;ayvtO#Uq>?o&G$rO(y
zWqAO!NRN_V1>2lztBcEQ+ou{jIy&Jf2~A6ajxV`8@2o?aS1|faSMuk`HiUIrojf*A
z4AR}<XoHW^bIpp=`D!FR7)6zb>Juaz<s8>Jn*l$iZ3sHs=ZM{lr?RI=BSn!<(?UM)
zQ1NccuO@FqZ-9`R*_p#suqkArWM0ZGV3XtC)vrZoL;L(K&eqNj({y>tsQJ5}+<+nu
z;qXs9ZyE_jJD~K#Ay#n@)2yw_bO*lXkneaOssK|$Q>lgUd$Khs(x61~GC$;YwxM$!
z;a000{GkXS(YQBAZzS@$m3~cJrVC2XX&#7e8^c*tT=ZZCQObfQfi$WMtiFfc<BR@+
zQgTk#W!~!F>~McD`{JL?3n*kM^vRX?#rrOj)*BX2MVmU@rxSTojbb$8*a7i1oBgYh
z2|&%^iI(iuWG<F4Y^#>-UL(2#v)Bn_?A{hN3k?(EuJjrs>z#9pl*!f1|1^X-`H7^l
ztc0DcI(l2{e^M~fyuT^wB8vgSvHg^0^LYgxA68)jq7CDc8Nq^;t#`UoF9e&<_x?@0
zs7YH_qu8%BYOnyAR+<sT*~CB=M76&BCX4i1RIAOnJf|woppK?UOmVPwzMLi4)B&gV
zq|mQR{Z?!`x~T&i{hq>=z*KyJtm0KRyR@-!<84#Jve_I9K44A?$f>PvKVN0p#lp-x
zZvj!Xc1;2S>R3#Jc3Aq|?mxeuZg5k<L4D6Yz?h5QC$D%lCGF^+SGe`ggpV#)ut^&T
zFv2V$!NUpXJumz=#g5bznBK$(*mHu4Ab9LUYiS9Zt@4}44NquxeqaGQ=>AA?agbMV
z134dtU^rUg?|vo|O~&vT0Xou&^s|&g1|)^gg&)iyie637|Fx_Unk}u&tMo7cjb1{X
zU;zxnVFN6WgMQK_jJiIHKzyvpQ;xvc4xwW+4ccq6usqR4GJUlm=-`<oL_Htso&%c(
z$zG{BE1u*dKH8%f^D{ddyT0Nbj2^E!NAe28iFzy#b?up=ZL7F9fvUKw9oX_l8vmY>
z;`G|yc@WEAU|oZJ=IZdB8Dbw2!P#JE16TR;J467C8_-M<3nl^hDR}(1MiKaPdSce7
zuBJuWY%Y-aq%o(TN_u(0;U6)9l0UOX<eTk$c>4Eo;_dV?A6KB%Q9OE>q)1tNpp61%
zct>#9jQF3aaNaQoyTzKWGeY)4ZH~3QUD|-|Bn}8JH70G;oxN-BTOEbw*NfJw-zpy7
z((%2=oWVFH-I24HXpmjk?J-*moBA;&RpVI4JjzZ8ecIKD5R{*S$m2A|AK+^N(SRZY
zM|afmQB>l$i_e&K|M&lp`Y@kwMTj;;d-fKP3UsHk6-p+ni{<N>V6<8Gvf7W6nTZPS
zic4H*mpskIGxMSVXh%7FhLqubYT=))kTgn;6?R|g6?O1h^_QRxfehP5GcNmeYRF<K
zo@z7368Dw+NP~t>p>2VfQS>l{Bm=uh+Te3}1|!W%^Y>ZSlvP-nu_qd6CoVWWqXu2t
z**zNmt+lbJ4O)VoDHeFdzP=4xUe#^FqT@%mO<6_DRfD}b%9@YbBIjf+Bjhwn%}dB1
z+W07@uG7vr@E_uonj~aMZ2EQ47NuQq9l+wndIIc(r)%G+&c3n#jHMYpl()0_W3mmJ
z(XpyqFDhyyMf0ibD8NPl=W$umOOj5c&)ITW#gIL<whr1&?Hu<GJjChK?<eN<=}XuY
z*;?bvgoyz=VLJw3XMXV&`8mwRvItL=D)1Gj*O9floRC3`%C6l$?||O?*U*|vJQJJ6
zMR#knua=wk!BX)2+rWpz-U@S-r;>&@+s52#!?m~%YE%t&j9~I2&LZoerYJrW@42Y5
zIpq9r?b?o%WBtUNP=EA{b{@!Fd_amd`D^>^V6J|V#ZDR}t8(4h9y~C;U@+TfoC5Jp
zra;J{plq$bD}3v4z6(oN?jjCUFKSqRldXduaT@r>X8fX-qomU;>m2y~h&6-QlRsL<
z@_N8FmY3+0iS8^jct^Lvt=?uhG>k_mjZH`?h?eo;znS6SNf7nghn5VD6M>2qBI27z
zM3B|VL$v)}z!lL-^}!e+8ik?L-+k&K6;U1*<MRXStpJ9)dd!wV@~*l3Y1hyY*5K!U
z$<aMYGW?NcT!gp>rKP1KH(WX%ynq~p>VL#14$W7tAPa;fT}2mPo%x>0)T|)ZRVj*#
zNz_u+e5C&LF55#AiyHNzi5Qa;b|>y$gtmMYZ>RWyiK87;N!5BVhkNIfU;U5|vk7nF
z7Nv}%I32^SsW^6NbR)&VQV|579dX0cq}8=llw8ky(9$|SV5?QE;e&`RM+F!QtfU+}
zwmIw1MB3SXk}Ai$qjStfab1DIKmUGuH_`GGmX)seuFuGiQuIam$UX{2Q6xsNb#^>_
z+YjqRRBsGQ*J?(&1~+GHT)*-V!`kjMG8sNu#qole2HEdbR5I9xM#>~vLzL6^*fvk@
zyjwIzxnVPr?Xv?u%kGab9B-J;5gWC^l=&N)AYpUTD~-wy3pXC#lz09DWbfqOu%5tu
zG~4{=k^-$Yem?L7X>gMH3omuS#V01!5RmgF*)#R}8vp9Uo8dal5)F?Xu{)aUJM7Ca
z6j$S<j6%cfrTpq8seDSA)!ot!KSIg>H5N*>ZI|}`3C6dcm<-PyOCMV6*0q9XY#B_B
zzI6+39hB%)fX-qJ=a<{&t8Qo~w{v~Z@2aGTs(Ao3qV;44`#p8I`dLjUXPhaua<N5C
zQ_zI>1v$v7&sY|<6SxjT^O+_?RtsuXA|wV`&Nxj*hW-gIuvzp(B^0F2m1kw7jMN!W
z0N^d}1Aaxf!UyoD1B>uJ-3Cf0yN`*ve|+gi@U;o>{U0kapa|0ZA#(3A=;7EOY9{eg
z3E-4SgDU8+U>1hR!@W0YJOH4xk9GYZIXd}hL_C9(QEnO{#hi~a(pohOwAATQs$vxS
zGxPf=zm{bzf;g6<@41z9x26zy0!2+#p1z2&LwkZ%@x%<J#eaDES(B8l+R^RFqcMaO
ztxbYsW0$7%2da_-vMZQFkTee3uRWO*$zruGYG>s44Dc_AYAD(tL&@ChAeHnKCxQ;y
z_BT)>-wGd)Zb+YQgb&sx4#LGk{xV7>BUuwj?bENb*|BMWgCE5W(zQv@<9RTk&8O8n
z%MPZJN*(<5K8XTw=Z<uj5+8QZp6h(2%Pw&YS~+F|imA6~n&#zM=EVwlm|I~1BL37r
zMB4XfQiL4`^tb2RFyXXq1~KYcIKQpv2J!763j2Z9n=CpFk6{a=py2e)+jc>?K)+=x
z<UN~=r;{x224%JxM_wuWB`IYJ`1Gj$q%(tr=t!Wu>vt-{Ojfl<J&}djH`W^gei&Ch
z30V-?@yC*GxKKqhmHc@p+2ASWn2(}O6XL0TUaRh<Zc`7i&%9vIUbvb~ptN2vWf>l7
zCTq8#Ic_p5ND)%5YGtc20)V#9MzFr!d8UiBQqO*?2Cw=T5zK@(dYM%*?-ScDe+G*7
zH)jWDnvD8okC$-fK$B4<x=sYTI2S$kiAT}@`Y`wY-LJi|l~RZ^Ub7gImUZx)Z1##k
z(P|31-2Y0KY&sWx$tX&>CQ3T5uI<V3TWg{fh-tt%z-pRP<jXklDRRB#_YWJ75xVU!
z{I}{MPiI~4(1cWo)T0NQ@PuVZX}D-!^`ZBGjYNaz38yBm)OKq>;z5`WjQ_5-5aT)1
zYj`!*f7#poVPW>|(K(syfU54^wEZZi1>b+u3Wjn>LX@6-p04~So!Ze-=sJ{$Hq63O
zApVQu!%s%Gl+hodGN7MJPhl^44_W*Y_S$@X%7ta3_yRT~wrfuv5}i^|)Ch_9H;yZl
zawvCsUdoN{ByM>f@8lV568<W%>Z))df<(kw(DY44`)}fCOqPuDnTA{D%|ThaO*OG;
z_w{mj=x`@-#^t7E`%Aj6z<Jl|;>mMVzY=-gA<!+*`>4B)_j@(wl}=JZYetd!bS`Cn
zm}P6LniJ=u0>xc8iuOO}T!Y_xW1p%4?4D{39w$3n1m&&bUq05l2t2Y|sE_B{Rm?Ha
z7BCOnJdQv>4P=X^`joS1${jmqS-dVI=lccn8ler<Hj485EB)(KV#{OMlS-8FOuKPm
zBhIO(Wf$QVdOC?7*Vqx=!zjobX)QmorIfp|`;oJ+Z!?9Tt@ION8Hh+IjRoVG*O$F{
zw_l0;5#mypNt7M$tfy^z)>jo`R-i!v4->x?E|kz5P{PrFE64K)16N=`&(FY9^LmSz
z$H$Qv>CyEU4U;gF$0!-2o1(4R4akth()dp|TGS)jal;t-Usr;iVuYQO;r+KGRYo(2
zI<^u?o58Yv8+a+2-VUNNmwflv3)V-JK@E%)%@8BJQ~_$lzv8-#!MP6hm|gifQKR6b
zZDeHh!#M7r+@>4uf2s#0FS<I}36SBF#vJisuh)i#9<dC@rm{64$Jn|3fnlK#@V#xl
z$XOnTlII=I20aq5OJJ)}?56Z>NuhiLT!L%uiw0;7n`pH#n1=rM0yJ@)z0xK$Y$&ww
z_mo=xg}6_He{BjjK9twKq{N=<kp3b5!-7EZ*O@gqgAhR8#X~jP%+j#VeJ0x=IB}Hh
z+h+VQ6{xZSWBRQq#@Fi`wRRmk!vVheSOfL<E)Uqq7bm4wPO9x>`4*Mg{mG+b{^Uxz
z7PfYpJI|4_CnMy%B=PzsT3Op_bnxbvyz6|Y#9-eEpPMn;M3*Y;Ch9d)q`@m_bclqJ
zmeHvP`VBS3q{!&3Is(|12hmZle?O`vs&0ogTqSrQf1a>9>TEg#XU`I%3_P0-lu9#9
zg-k)Cy^G39eDOlMOSkj$5^|*^M;>YbTx<K}Fv$qHou@ukqo;qGVC&YoJ6bo`G{0Er
z1Kyr&x{wVlMp_kz(y@Goyuu#B75#i;BE=1O#h1Cir4YU<VF!8LR>QM(%kG$p;=(>7
zH=#eC3P06}OcVXn^T#>!()sVd3^(`F^P0MJTK;EVhm~u#NTw6Zi0Z$={@zwl-Je-c
z4)s<JAxQocOZ(nAD%geU)_}~zzVx03AlJ`m>^oUdK5|8ksuz>uv9<|3Odd5$<>UU4
z5jnV8{Vy~GM4+;@9esp~r`|#augVG93T(-wp`Kht8~*sMpzZs*1?Orb9OIX}_wjlw
zx<HG~SHT(Rz;oknE`Dk#4a;#zhCU|=ND;Y(An{IQy&HqvN9t(n#)NH=goxK00oh|6
z|4{MZ;+C-)ss2}=fJZ)|-K*cDa2z){(T|I)oJLSK&#4TBm9J(}zll{Qnior!Y9U&!
zAPNdX<FT2w08wy%N<?f7_Sh*1$>f|>lnuY9SvYf04lVb!XPvY8Np@w~BeyAMbH`ZZ
zTr)446pbE-b9|Y421d`CUHFUFXoaRsfDWwpM{$Dy7DkV^Kmee%e5uyovvz?H+)$D$
z<4<GS0kK`Cqn<S43+bb0LqYo-_fk(wXonjRpXt<yB56!q;`5>=i8U&XxSmAIGRO4K
zDwFl#iY8^0G2Ot_&zu0K=y_4P37ylH;F%P)m~fc@hon&wsxV_q$ZMYWv*#2M*E_N|
z(vPLQ8nbFJ+0|zIrX_lq{Eur1$gH{*LLfipRr7B`e}$T5;^CLl`nSH<bfj!VB3W{G
zBldc$IOP0-u5RyLKfSHdP9cgRkGQwiRX)d6U|zY!k^ks(XEG74Y8{f&&~Cl6y`pNp
z9a2EMok?>?3Ck%@iHt5a2)CxgOf`onEaD2V&z#~yCNjV(IyVr1xi&x?=1G$9$RBW4
zXm-OyFHEj6fta5T{3#{J1OSsFvN1uvfQ;YD6FuakNao4n=ZNk3<#j&ZEH`#9slya`
z(>cICwAs>x(>MGKAc-j`tl^!)*vm8~Dh?V{!lz7G28A4HLjBy8o_{qwQLcd~S|=8c
z{;@Ri`bB7@edv$^La;_5x-C+!1&fiN2e4HC^)O7!XH(1EXY5=dnJ9)^el~G*9NtQo
zy#l(NgTm|!bI{^bft-^04LxK>t_ceeCoV&beDOPnltF7L9sFT6C)50n9x`!%LYBJ-
z3_ZgYmi=f1AQ9hHA2q+F=V+RSe*0HomxMus0%a=N6TldI1;*0&$$Bm&wUbp8Y<}8{
zV}(G0B%uyKTz|$khUE~AiMh65j^8$r*ErcG0PT<7_^ac?&_FQB0%#RejSF9<#+q;G
z<!qB>uNtFlk3%(%Lg+t_uxv|&par*S4hmPEv2M5{Tu~kQA7p$(v4;TG(*O{SBwrwQ
z&<;`ZUg?G%&`A##u;PSVdW4ZLfHG~orCUg|)V{C0MhlE?N+L+oDn!pep1y&QV=s2a
zT%38}NTf_P>ghg#dGogx#uyVOR%~NoI!2=+nsZRapk~OK4U6M-qFOXJ-t#(!<pL7v
zzQZh%{jsvDQPSs=v6MZgT|bt7PkvTL_cO7IbAuI=VdPLB7oduE{wS3E&WKX@w@wY6
z$$v-j=Op2US=n|$3u6&yIz?aKKEVf&92-%xoK#cRD;EmWF_p<}7$E<vidV`blk>s5
zgt-!t98&^(##%qy*#`%Ng>VB5-c4V&xn-;a(CO+8j?{Nq0zloDm~Iv80o`gO?Scb;
z_bsb!kq8~wC=?-gW>nT?r||suX#$YZ*M4jInY8<@SJ?eLG?Lm-qSD;FN4&sojOu|J
z9ZE3Ap_t848;X&R)D_(B?cs&#(E<I|pgFDIZXLOvYJpzF{&Gj@%mW-qSqLJ=PjDet
z@i{%~2}T*%@{_FwWC0rTzTnM+V9I!pms+{x%eJ>Y4tSK?4(R3DM?`a@ZrX<ar!oz!
zQ)z#w7==dC%C`bAmqeg`vv2*xTd^+3p~?R+$9a>K-n1&zGCzET$h<Gup+mz7_#A4d
zzDj}=gB<-!<o`&MHq$QWSrI04p{{%O-8)~&>qq>cHH-z}BA1p;5c~Q^rEdn=W+*wl
zKpne^%+w30Z^@%zMVkuzA2Ru(-Ixj;7(svG7+>Z3pW6-{`B*Z#$xmYOg5c=i?G{&^
z9)hcWK_hXCm35!*qH|Y#c0585DkuLi4I-J)`_(rXNF<QPs0Yse5nT>yLvfK#fd}dz
z?ef!^!4zn2t*8$y#bVUhvaGfhaK2SMoSYjatoU%gx?|ZPi5}?qgSMV-y9Gq9Osz!v
z*aF<P%nA!@!z{(h41In7X382HB>Sh?_%<>*7X=A9R1vvi9az}e6+()g$jYOWdNka1
zP<F6Bs}?ZjVN7tOmlGq9N%I|z5DaK`_`Wzh7S;hxz&*ksWNp^@Qu!<M5krXZc$Igd
zH={(v3T;;`eBZWBj0Z!E)}&a#(l67PL1k{i4f0OiQ?bM8d%!1xY0MZI^t&09fFSBK
zi~)E~i*mM97sp2*!|Pi>RwtB5>uFkhi@C?ddzz&t+g*0XolihU_^s2;82S~bvkR*~
z&`7004|Fh<(TcIMi}I;{V0+T&I~$H`rD~z5iyqE&B%@gg3O5OttaEZ-+RqS>+UofL
z-*&_F-@!zZp4h&c4ix5=9mbViewmgBTRz6{Q%QBWSekxRzbzMD*iDrx6Dj#ZjL!41
zOqWIcCJK)HlT^}9u3|*gcB~<CQV|RS_n%jXWfmP^gFV4J+Z8i@E)#RsyHee-R#kLr
zK55yjSpFNC2E&!myOcA)-FSuWwX~_~n#IY2?<f*2HFzp}7eaBGdqs?#WhSA4Dh1n<
zbPsJVXdF`j%CKrY*TeX#jjnw>!dKqOey8fT=?|m)Tv$+6#M5*i`6%)|`=beXKIaiR
zl!h;pIl}(}Kr3wbJGWXj7`OYf=(zZ4sfJM9=~}IsY^aGq0h(qm2xCW>06mjNW8fo_
zA{V#ak;Hr207`e_TXKElaYci7t~?@XOk7{`ZkUS2o>|fy({pX)s2CYndP7N7jwaHF
z(G)`C4!uCW?rgh#_4(G((zQ7_h?V1zR8@{5F?0Gbt4{RRlRZaMiZ6|g;E??~ZzDQa
zPy6TfSIz2%zff5<;WTFQFkh>VX={7{nS@TXP$TDQ%Emh+Q&$4*kM|m6ao+TsM1P#9
z%m{|)A}k~B7M0v$P<&=u(+%D?>jl-0v;9)Yn1r(*mb<80?2vAA+Qa?MKITbdNZYW2
z>#HIr*W`jlyi{9=veDC0g{yDkJrSJ+lZzt;qWMuKf6Kx2TMvgidfI+p`juhhZwNBa
zO~Z!6xNv;Ht$is(n(SYKZt^WGona6|pu|VW*w-*AHt<$c{6Tb?^AX0S<^43eD!_3!
zpABI64Z#9vhYZ^Svb}@BEzjrZ-71<z4U%XP+Zyr=7%DX|8aPdy?3X<8hNkT6w;2C@
zw@te|Ek+mSO4`3~A8e}uaV)oNA?k;xp*byuTZu$w{zfPsXU-)8GS$!kxy@%Chj?yb
z7XbZ|Y`vFnk?_GG3xNZ2cPr(g4Gwd@V};_8P08Wi-`Blg+Qk$+wP;|SW-LQ&K|gVv
z=cpvg-Mvx-g&!FT7I&wH>zRFAR!619$}4<K4;`IP@*4*EgN4t;?d{Kg{veqDbtUNa
z^>F!4m62XAD^P4OY@?yhSEs7^v$hZmM<qJ|#Ks-3vkt34aUp7XUj4AUdyU>-5Fc_<
z3wJ5W?g#Jn*PYH7haGT(!>WiZF)B#cFyu{K9E}%N9o#=FO~;jDKZwOlwR&BYlm86x
zOHufG5x!Ip_|o=ACOKurOe7zVw8lJ&{N+FOW|ZiAj%srbos8dl(X((#v}`ku%{_6q
z1V2cq^KD!R@VdV^@MQ==I!=+#ly85i$-yYKA=!BI$K{B5;A6A+WmbTLTm0vdfy?of
zaI?RroXL-ZF|$;+FAx{kcVYQ(fg9jkm;w3&C2EKw@m_)A7K_?u)+5#04K~;rO7<(i
z%6h5W)&nG5mVQOS6i#V4Ebv#T_f^HvKvdlDt0>J?ln+gP)RLVxQF?XFTt2~c-uM@P
zdDUg(upQgCJe*K1HRh(?)0aB9>yK)Y01N!r_O=)u{d0mARBgxZ6|T07wG{6|$Ot<(
zC;bnKL7^_pKbn}7mI7BwtSdi?2JSp?we^eYBQMwD3d$$G^rGe6B+3}&kju0r4o?%-
zvEhQGy`K;y{OcGCxS+mfP7A$>@hIQQ-$GY2QVd^O3bFI#1gs|=F5SRiHUA_B+s(bx
zy=z8G8pok0C|I_e6~td~-9Z88fi2K0=PmowM#~0~D*}XzelJ_Ld?sl|v!IW2AJ*y%
zhrh~l+w^B@>~7J)-#ksihkX`wzsr^4;tC9xI_p_q->RiE?5c}DV+X6Te;ih6nri{-
zn#mP>)W9J0ok=2u=m7qD38sVYCkquxnH)RO!rb&@CojNs0qW4NZxCu1(ZxqAX-lje
zm|y7DR9_68V{)CUWDwb8*1LX9QKN!MMy*^j9)D;=$eE7f9!`?0;#7vkR)QHN_K93G
z4)?6k@|&&5e(`{6+7i#Je@}1O+MuVFHz`Es6l~-^pdwF~mkXA{idLEQknqG3#;KQL
z;E6rygj<8EX4G?CCl1Gq4z2mJ&S)Lrkp!>CQPuoQ4ovJ4la<}$3Agt;Um)Q+srXPx
zCei3c)spD0SrvNzs^L^<ITQR1hrz+qqF}3ci{61#7heO@SG>%5F{64(^rzDa4dd)a
zg^%3!)#h#YvY=@YYY%uF+@><TiRFAfF1^3hE|ZB%88{xEu~mxmS-AsWnOa^(?%>x(
z!pgsm+fugBRq44pC6&d9!#*RIZ=SKuNoaraC8*$0X>ZuJik-x$U>?$!BTB138{5>L
zvZrcA{;Jf&DXG{f#buw}{1}tal6sNg_S06TPlQo!ar=DNYi8aFq^pnK=1908ytWcr
zQ@9qYs{sJ;R3Fa*D4e_lq&NJ%Ck(Ulc>(s^2+te2|Dh?ODme-zD;C}4(^tg1v_q#=
z<7={$nbX#e6#leJF3x49Am-^=7Uq1_Qh~Hy4z>9wlw|Q<KVHWYUJXT$DVxwdKT`@?
zDtkrt`X=-G3@!4PcP=a02W7_QV-!D2>-%)t_|W24px~}mPH{Hl-Tnnr;=qkFt>)-=
zvot?l4~G=$8<cF*?6*+`m1<M`7gec?l#5PYRa#H+qgQPvBA`)a`_I11YP?oKOaW5x
z{!^c$*SJ`jqo;;*b-sp+R-~gn$3#`ojhaHekLq|O5})$bO(U+aAG+qOZ5aN<EN|?}
zR5i)-vr^jOX;FFmT`wR4^m{F5k#N4``-PyF_jg=G52W%?olL^++@SV|)R$Mu792@@
zbbTE3&Cn<JtR(>quebo|TUb)}7N#HcZ$e=71-CYLVaDgo4yjXP(8RJo!_qAqrjL40
zi6R2)tzC{U=dZg!UwZMbly}_G6C5o3vtUQR7kMjQ{}U4VdTkQj2D9*#d~qSbi5F;D
z?ihwrang&9EYVz!`wu@Bzp@-xALArIQf<yr{kLjLI%^aAlXKQXok(wn27LBUK65y&
z7HuNyW&soC<&0RXw1;8zszSU#HJ+Y(@Sk$VWdmBnbq`}xhzf1QqZ;J5|BX{_(=*fI
znR=x>qXJfQobay{PYX~2{NO`@&zpd@T*q#ZL*IIjqpdJGdhPE{M~vvPI}1B%;HcNj
zGvZ*iCP<q9-dM{PAl?pZ{aeoLxkcY9vXplJwJGtN^43UWz3To_gK%QlP;Cb=ZEmXG
z2Q>fU(ljAvIc^u8ir^0u@iCF}Wy)I=KWsuVB&(5QJw{F)V+$WX*g<d5_Wd)SMb;`-
z$N$v4WQ<h3Z65^{@}tDCWpNE+KSc34dFuLyiJT-#y@_Es+{4qr2oo|m;5b7n-Pn*{
zU6`x31|`3VqW2-+FzZyWE$ez8_oL9l{LaKnFB?uEKtCrKxHJbI$Ls5>jyh&#SY;l=
z2u>Ly(e$Hup0`bY+KS>OIgRXoL;?DeC5b15eW0z$uMWO#^WbQv9Fdyu{}8Dp9WEWl
ztS)kMcJM1WAFt+6H9tx)nqNdsYJ%7zq=O`g)WXj=gTM$=!1Ok<j&wP$8td<IIgozl
zpcS7>*2Xbz#bK>t*6^@R=<nhJ;@_8LvNHllY`|+7PM8#{;C=@soQRqi0ANO_HfqEL
zZzuo6ajB%xXF75Ql*8JxDwLYzTa(5@l_kbp(s_Lx9x@v@O_@Y#a@%F3$75xP*uWV%
zOBM2&bTL;^&%{0tJ&n5w(LlJz)@B}Zct2mbFPZop_4!Q=DTR(j8g3rR*}HAl9VpKJ
z3k}MSwhnj)6X*sxsv^w48t!<kC8CmH2~nJq+c8DAv@@&89VU!jGEf;1^qZuR^<t=r
z>fT*@`o%8Ro8(b*3ObyP#gE_8PcB4ujJbX*m!?q^f&dj&2fcX;#FD+hZ;Ai25j{*S
z(lYkTIq20>2@dripa8()U3q8dKAZ=YGNNnC%CJa`R0ku_f?O2<P*UP`+?W%behuXN
z7ILnmUs+$uVj3<3B>;4wJ5Qj~aotgxf9cOvgBmX38KeY)jR64NnbxBdO`ZIf8AD8P
z#%x$T&k7q!3gZ0e85^N9Xp0|TFkx}W&>KFe?tx?wqRSmON0#_rU$02uj2d+8J|1ac
z%i{YOC$h<j2zY8}j}PeZK5P>iVy9ytaCv;1uS^M_OVeuCy~rQwCzf1~q4X!mj1)=h
z=ivBIrq1}%2k<#M2Fd!s#vwx9{mM$-@F$8q<Q!g&4#ZYu8Kf3SO?W1Rwx;>;m&`2H
z2#`T@-2Eb0k)Rqb_~^aTL_MbY5@_zrW;Jh_^!egPdV6~=aa_?}D1EWbQ=beO%^JX0
zp~;jTQ2T)=L9{;83B{<%s_KI@S`+2g{RtH0Uul-kWAPNwutsOGr`oGho^?+*-(ASh
zg681g(Rh|pa7!(|k{O>i9pW;7`|RK*4Sk^G#a|GhWBVDeBnz&;7hFr#y7JHKwNBQv
zB8WpD1ZmKveTD@vE!c{W8!jr(IeDG=6D6SwebGX29f7s{y<f%pMIetRpl+e=RpmVm
zH9CD#h`~ErEtfXM|6ltx!_QNufawZ2|Bf4Eudn)CXH*=nrC&6lqwaOVE0~ry9(KSX
zgAKhWMCN}QOUS`Y>Z@x!FXef=qPH;wr+rz#Nq;*oYy=Sh5B0%Q2($j99_N7)4c6UZ
z=~+YL=*{#Sq?yXj36^Pd%<`03X1!TC<x@e1MAW($L2J?j9~~>cJ#bF`6VoOCS4F2v
zgAnGGB)_{mKYqIBO6c<s0b3rUWV((1ivaIs^a-6$_!4-dBd4u5_h`g?Iu9C;MC1Ql
zMfR+_d^^G93fkf$Fq-n#DE-8W@_fIgu?mY(P+&0yA|dNo3+}EwG}8X8>z;}EVC~YH
zRGvgcj`J^I@h!Tnz2*!phKE;NP|Ni$ge-@$9-v9uMJ0;Q$(%qY;f*`h;g%xmxegD8
z<P0>Ohn)m!23th-m_<!{7>A=|oGb`r=)X5OP1>rhzR%(#6&E%rc)ConA<J-JyuI|`
zhV=L|N(qy=t~X-aTUwmsezEFLl&5I*UO;_@qmxzvIs=f*o;hvlfM%PUp%0V&k1PFr
zS^u4YL@(37Ol%KAwM&t-+rc%Tzjf=eax0&MlIb0wgn_8hdytB&!<jjl-+-;E)?o!Y
z9S?=u<X$@nd0XBk3y4N#HCASaTJvt$WLvQjb`As|s!hdUQUTP@?W$(UCfG8TUbjTT
zn`n#xPoDV<$N2<UVHfQ%%3=faftv`IppDn?yf7Y}+_KQ_dsDB&5p*!kA9;^!w-}v2
zum72zDBiZhZCF=-hY9Q_X2Ofn$*W}_heRUF{a=(YYU&*i7M4)ANGDLc^iU{B0TdiS
z4|LA#w2|7DmeKWZ%NkI^`M?y{A~e=~K^M?i@?;)F;_|w6aA|1Ou}AFHIEFTgS<!@L
zn^V+B<_6$Ja0bwr!*~ufRNB1_!8gL3Z`!wB;;O*fARn&<?Sjt8I}Mn(y?`zGYDaB~
mC@-(;jFwO0JAd{cFd6~coi;O)o#<nifVc8$a%Hbf{r?XoV0mHy

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-32.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d345a61b2669c8ece2d5e4d30754882fa7082ba
GIT binary patch
literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x1iVQ^K~z|UrI%Z5R8<&-zkkn7T2KO^iuxcAh@pv!frKcO)<6rzfshUp
z18FU2C_%(a!i$7@z(_)T0gNK3fk*&D2S}}?ib#>7$R&758ZjisTL_2&gfhc0bLRH}
z&~nb63wAxOz4pJ>IcJ}}|1Fe=j^iC=sZ^>?RH{^Uyb*JsqC<fYa8c1;1o;lwA2#7V
zGbhZvTuNOjCfMG!{ee(0^pdJR0}L)PZ&F0IlVf#kQtZ_K3b3PRN0{?06_sVcfD(<p
z$Oy9LvU|C8Ud_C#Hi5}I^)v%SCE5>jfRLg~%T0OL&VxIL+XMwa!S1fzgEN85UO~q7
zBg9SoA;|PtRqTh716V>Nfp!(`G-6H|G3U~n4hA$ZT#!nXC@>8u&lf^n9T%^OpYa8l
zw(f;U>ip#a2b|3pZ6UHIyI4gx#H-@x3I*Qv)vgLR=eDA>0737#s(v%@%E0RS`ug-O
z0qR!FUykZ5Fq1!XJ~&_ay%a}VcUv_|0vPHY6J%wqD)!pH0cu}=ZUnB|Bi9$)u{2t1
zdlR>d#FvSYDtg!wqE}rV8Lx?-F#yKRy)6H&_Hhwpf1UH}kp2dUO^Tf|IWrr`dWHs?
zfN2FVwQn|-E86H0j6wAIVg?<@JIXqaca#;<G*mZqp=|W>iZ-<$Y9ACdR|0kF-{F#~
znGLprjyk6DP~}3DC0CPIM**~Tx1AJ~wG9&+Hi(FN=VUUOm7#E`8R#3fJng3IjUrVR
zpZ2}ZmOriL-IZHW-UdeXd7Ot7U7zSqY*AI;uRUk-oU;g@dU=C+(g5Rq_M)A(r>{Iz
zxe$2THg*GZ69*FuYy*;$kG-6VK4Jj>7AbndT14f=0_HbFEV1$ddMxY+qcF_NhI5g#
zUatL6`yfRhEE)ht+ZJYq%xR1EE+Y`|ve!a{yj(hy_ARb_NL@?$w0c!ti!^J1OFpri
zzSqmeYvR4YPbK*G#2=5RyksyGtgvYRGN3<uSy35nEiJ4o=B}bvjln!-p-&qy-&+FA
zuodZ<(DN>^y@3DL*%M~JmnYbCpAT}_D7pPUF-)s<8hx+K5hoX$7@Mo;B7~ED3jL^}
zEwPEQM%zZTZQr)Lfu}6Fx`Wp!`y@i@3b&r&<wBqpSnNxE-C#Yi{^n|rj*TX5Pkj@?
zaIgh`XLTV`7TIeKIPdf-`jLN{ESTyvR~ITA9UDy+GY25eTHuI>-5eboO&S0Vuo}pC
z1R+Hd^-fbM|9(Nlr^Npby1}W69=ky$O~9;$8%^ow%Qv4=bd6>1P?x~hbt~rA^f$z;
znpqb~GX*%JqN^I7X!sTSbVSuo^BrNNOKfKYWEI)yhRn(@mc8%WCHtb*X{-<lwWKxo
zR=)Nwl8U5!Eg3-F8w-Y$$s7gl&r?4M+NmNPs?r0T&V`H{akCX}&Wr)ASD0}-ot5wC
zoa!_^tOWKH2yr_o8p7I^Pg^x_Snir8u=fhLi*E}xy4IUf=c}8}nIVH}ftA3OewZgk
zXuFe3z4-)1FDCU)^F1!o3N(@b!r?7@0ode{UAxcu@VA1>(h5SgvuI#gQqxgt1Re!O
xaJ`qz0_T9=L5?DN@XkTKd)r=V^PPw``~wqC*;EtrvwZ*n002ovPDHLkV1iGNSrY&N

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-48.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-48.png
new file mode 100644
index 0000000000000000000000000000000000000000..d394f47213edab1f6f5cb59a2614657364428911
GIT binary patch
literal 1864
zcmV-O2e<f%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x2K`AyK~!jgy_tV(Rc9H;KhHV0ZAM!*U}MFgU_uCL+z;yzF)dtWEkpl+
zOYdQ9jI@PNm*|3V#%LrtWzlGcL!Cc{AQD(MdTwd9WY)pd(pK5RMi75wGb4@(6J*e_
zwYRbDJ?HU{wyfYi?>V<z_Wkdk_xn80_qp$RpYy)YD-;3G{_)w$kziyoN{xzED>_q<
zn}M5w5?}zh2>cV}HL>KSAQyBwN$1?P#+Jz%c6N4_4OR@M6>R}N3)qGFQ1oR%_SwVs
zQ>kUCi<8k&Z~|VBcZ;Ze9bp5b|8Oyo1$Jsew>gWQw+b<goq*?gw%jV45w-v~7OF5N
zvcT59DSg{pKHV}B$H0o~S*m0|!Zxm-cz|-?2h+3DkM8f?KR=E^>;%-;Zvkf}tE?ah
zci3vb;`Mr~qNuSGaFWi+oS&-^<kU5Zi;qfC$+Y*hf7wJTd=Ynf^Td`eV0H*)2snXo
zMv!+1@YT|rQ04*)fT@MXRM8fv#`$Hwu}PKDJV~4f+SF2yX&iMv;SA@s^E{g>ss&jM
ztOGt2Go&v_Lql!DGet=NE+^p$vajFo|3y=>>AwZp|J^I4k48~x1*&40^ovS$!;*&A
zCqBG70jYPJp7w3K^><r#y;_K%$-;ZVyHUzyJJ1w^e!Oo=-)AP4*ee!so!i(1tg(In
z56d3e_^~2u%?syl=iPK|x>;2>0=WqKozn)VZJzkx@(k3w8>U0>8gR?lqjSD(fBu7-
z34r#V_LYiefP{fIU}4Q)UAy`$TrmT|H+f$?K$Y$Lhw9x8^R9>3d>C7#4@S@`6n%L7
zhXCC3ldqNqeFLYtGJ$b?;4_iw$?V3wCbIUhJtws+b<qL{`m$@tFCIo`;^|_GG-0T8
zXfyC{1EoAD3GRilcTHfEnmmf^D?~thcl(_xx?GSC0|XlUiv-U*pL6~k$9~<Sb?;@m
zGg}d!2;->edf;brk9+^rfYLs~_w(n6&^d?QJ&|?3qqpOBAOCTbnh;92AP+UvHvA>Z
zS7&EuS+*kk1~4lu2ivx*tbmfm2Jr~e7Ds%hH}fT5{UZkP0811-;`Ml6jPkc)#fl+8
zo-|M-m&+wBuuK8*Ex#=)SVwQi?I>-)lqfDxE=Zf#?R_$mDI72ki!8E$PZ>BvHwA+)
zN5%2g{}J)TkE0ynr%|LCxf#cRegkEJMR@fA^hCzZ<lUH!!|U~`fu&Jmu7)7B?LF<c
znK;R0G6$H-_dE-9rh#xeQiw`j6ekP;L4Blu<PF2{G)s*Kb9pB+fXdt`&NbO8?;1uc
zEHPFff=K_C8b2XMSVY<?YT6g&EJmA7A;vKd@XDK!oG??>NLv-19yTV(+ZJGYP3A@g
z5S8bnIH6D?ZAB&Q=!&8jE#RcV{^Lts*EEGRENM8dqFqr!@}S#U;{4S_=<Mt)LkO=_
z%6UuS9|j+lWt=vBCjdy0_!=-6#hZYv?b~08A`MI(xC<x^C0HD@Ea4@y8%;$8O4X!J
zAgp1uvlfM{qH9vg)Ze0r;>%hiA)wc?RJ*`b4fKJun-2dM#*nT_KPSjyMSBdi!?tfP
za%!F5MEUcMcsC$821>5fE`3n|>fNTJz+GWXMOqHIyYu#C@&^BtcZUR0Prye25Z<)K
zKA5UWorvor)17%3;n7fn(3`GF*Cqf|bf2h%CLrk6rEa5l*xhp}PVljPf2_T~0rwk6
z19rgJnb<E0p2Gb8-dct{c8!7xLN3UyGPE%-3<LuQU@U>(e|zsm(47%Jo0hjWZz!Th
zBi1I@o(lZnZt^sgMP%1_Bkgimq9hS)Bch6^>JxQt<H}--4MRvn`O<K1_=n>^E+_EZ
zclN#oY>n`l5F}IYHf=1f)Nouq6Ds=1eaZVSjE`T@nY%EnWIJ#?!e;{5S?@OOUiSS>
z*YmRDGMuDyQhiM#ba0j*PaONd=I#o2{d^z$6`(SP?{gx!GOc3IZy$Pms1Q-<$I>_S
zzgPaCBJ03%4!XZGZD~T0w>!POwRx4QW{7?BsAm<P#F7KU!JK1<T{mx!Gwr5J`>9;0
z=o;W&-am_+0V_F~BtqNkb#C(}L3b4D5a<Ve737q_r2w@BYlfh+6>cMZZ!@VRjQ0b}
z-R4FeEw9EMX%SIy5|I}ib#CKILG}`FO%wwKB@ubacgWrIOkis@(bcI~m<>T|Tym^i
z$``imd3}gE3lZInxlePg=u@QSp!@4}aSaN-Bdh=JrdcvF@(qPej9yF^1Lr|@4G}yV
zcf&Z2Nni4P;d|?6B!=y^jNUdboP@6&=n-JYRI=?+4YV*!I)RC(b03(AB$A@K2&@I5
zA7!-TS1~G-3&4LA-WK$j3cbTR<;BD9&qF&Raq&N_T8iT?Zq@Jr0000<MNUMnLSTXr
Cnt?a~

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-512.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5286e8872efc4d13bf2073b4a86dd54662924e4
GIT binary patch
literal 22310
zcmX_ocRUr||Npty9@(Q|??fsUu61!G*&%zRL}Yifxk5&T5|S-DGkX&vl@XDBGcs;A
zk@-Eh_viO}^oJhqxo5o2Ydl}C*Yk+b)mA$}eVQ5oa6<h$<|Y70_+KQTB!@q?yaxB+
z4{{p~H4Hc={!4GnjRk-QsAH52ypn%U_$C`*4;9yj_rH{m>p6SB8@#N6D5|(=?KwhP
z%kt)T4;A8t>cG<e*F6W@k?PYDiK87APcwufGcT9pLzUORA!+OnFMp<Sm@6s?r516w
z^X&0HJ^~V5miO#>zWDaYl+4fc^PAl3@jl!3#Zh72LxCH?XxLEu)x-D1bvkJVE^^<s
zKXD<y&x!8ut?gh3N7Ohc*dzT7u-tBUtwi<!4*kb4@3(?xAow(KJWhe`^-Re;(Gu^O
zrqAOddYJ;R1&XLAL}Q#l74_Y>%2LQ5d6{R(HlFy@T}-^*RHgr@c&yp!cz9`P$vykP
zMH$oaqL^D5lbu=c-n!%QjxbY1u<9HL;z)1eqQnDMd0id~AkEN%p2-U}rodND93Nj|
zIlk4O!0BeW!Fhb_UR0Zq`(4Y-CHaL&l`#mvAr|{dpp;vIvg4<#YfU%@dB;ycN8x%B
zXZev)+{vhaK7BVAeRMWv9y6O(R67)?Ap2`1Fk5ihj6xt%lnrF!vaT$1RQ}GRm!X<J
z3Dn*#Q8J#&=~Dp)r#flgE`wA=DS3-N())B|?t#(ayv6YLvvS5zE*hYR_*MOd+c>n~
zPWnlNH7V{6pe5-WzG@=&fMQJ=*J-d-7LwrgAlBI@v#i)H40|E-!fgc4lCp<~hkJ1O
z?GTg?($CKn6J@l(I8<v-FZ28K+1>I2h2*W+Kp(#^Gmc(VL3ww?0A}^Y{hr?vRDUnC
z2%}x)a5F6~e{NS$wH!0Yg<Z*bSD;(D@v1-fK^2{<!C7M<@`tU+bW5RkQ-K68iTwLa
znZCRSBluHk{UoV)K^?7p={L^BCTGsbE@~Rk(PMFLb!n=gs8TnX5|06Gt<5xUvn0D`
zaQmEYD^st=Dqe0<ifHfVsJ%$|beAdOkh$~S5{C7V7N;|vLgp4e`JNN~RGAw$ZCO3!
z{{h9IceV`Z3fSJV^N~%JWK&Sc&5T8GSf@lN&kO3A6htYM`j7n)l<e#sci;>cxh@7+
zP9=U%3{Fm#G%?h9l1{g7X&v^s(lBG^Y1hP?zItg-TqceTr|hKk`7uA!n_VPMANV2t
zwDcF}c<i4<hdMbqd1{}LT{a}3F`@V*!BFjcw!ebc*2#cA*#;Fsj>WM_*$CMs#Qf>Y
zD?NS7ayrZ_2{u3-s!A_*`uFyh!n=Z8npw<RrAAz*{z4nW7suuPI_r<?l2=VA_?Bp=
zF!?qUduv4`K9$=JYu^>Mc(8zJC^3Aa!h*+hf6b-!Tup*6yRM)OB0Vzp{wEH?ZqJA)
z>I7PmAcs*krBS_w2^iBISgXOF%&aa2x~j$%4*mNL$)0uL$@zW!MVkz9T@JwG`v949
zN__{4w&M&9NK|(mJyqu3Zs)h%`?1*MVEj_Tv`u;5_=<E-Nv?s;-z4nGNMSZ0TK^^T
zi!NmkTU<H9uMb84qAX7LAZK-`Nh?-JYxF+nlj&eGT(?lUoa6_$<dXcQhpsQUGIvZV
zS~=8GtcHgNODgG9`a6+m!R_MPM<s||vE4WPOE=Ep>IaA4jbB_*8M-Y}w|h@h(2dYm
zO_w)n@_iwE)6ls@!{B6Su{+*;`|ftEXBIS``3(Eph;+2LdD$AUI@rwE<-;L{yu&lm
zJb^|F(fiJezBKbxy1Gy$84}|X=_7^bRn}BNBRsn5%V|T<tiJatEzQ((=^8<r#aRp(
zyvmu=;=a|t3SJ}9!?0YLuYZWdI6ms`Nz*AwJ$iyYNliR^SLQF(w!@HP@z7Lqp8F|b
zA~{v)^>fP^M($5-md>+*rFh~jI~~VOXl;a*A|}p85@#h~%B+}l=}|X1;Q|YtA4zV5
zn0e)z_1DEvQ6Hh2v-En|qgVL)3KZQtYh6skGP*w^(J9@9U9_xmo4mUyTq-=2h{PG5
z-SznK_;+Urr#+3~pmrpB`OVa&K<hXwEP~XEtgjPA&&WD!#pnK_d8j$jjA_8P4D@la
zDZa1ijars%qV6CA<fikynSe4i2;VTcFepEym*-vz7;qLEf9R}a{Nf8Nsqp}+j{!1L
zwjpchYyR6D1v}2r-(`T|&8@4PxlNWNcv6BG#=zZ4*Zf`4p1(HBGbuLQNwXT8pNN7t
zxBAP0G~8=m;nln)K`++k*#n%H4I(^4Ci=_bMOQ*gNqAQW-sccgmebcPaCu#EyK?(n
zVY#k%8EF6VAwKku;r8iJuKOvW;iBEEhTG=Qrdv^zaTGLY&Aah-bgW$^Jg@DEpAJ0=
zJ+jV|+A654t4qe76cuN~g*!SsYZrSA9VUdEQ>Uk4x%dkFs1MCP==hZdXdWJy_b6w#
zAsKEzHD%+B9T?w6{>{R&@lmI6uryCL-PsTQ&nG;2+=*mRf-Yh5n-DwNmA6J!f{}IJ
zTP@jR=^cT)luo%7p62zJNX;UWc~mIZZMYXc6*BjC14{?=o@buX!EG3CwPdzh#_f0j
z$-;65y}ON>eI<2QoMW*JqFgj+(z~XYm@#wLT&b-1M5F6Dq^*ie@~s>>L#W}xHuWXj
zR!zR03P&bPdNNL=YjXx#4ngpXw2GINMa%g%&jx)VS!0CqXR$)ocI+IK)L>WG2x5cs
zVt{vGd_37a%{)+nB>^XS5RrGOA-zf4v$KZYgd*dh41{z+`EqXzCJD#r4Vi?8Px4cA
z&~F<yh9uF1lF*>9-(Bhb&2P9NM!Iie$IG`A9(h&RJtA=%yDed6m(k-!^CQL;>Sn=G
zKDhedfV{!KRL7sbY<#&4Hy{%QLNxE0{33OmwRAmW1w{}2iieC+=_R-_g9cy>?JA$X
z?%%fXB)2fQFV%~RCxmF{O9aw2cfe@a6rEQ>Z+q+RY2t^{P!JqcJedr7A^{iMx!nUS
zEG&9Zv~VIW;zVCIs)nj0H2-;B9ycg8gct(Da!KOpbrltCTUudo`>A<=0rR8`dR+}x
zh6z$d_IsJw80i^Gbcm|}F8sqap6XroV-C-(`U#ZAcqzbWKJtDfK)Qnygdfi6EG^DY
zpmtaZJZ>N0a<K(kMZe|%A9bS6Q~v0?w`>*eaSCV~1HNz%WVpyfQi=%SbMMcUGZ(#W
zC!;}Q%HXP$+hNi5<)6#vjVU5XdJy5#+Oz_hx;M=SpfAQU>JdcrI*<$`#7*BE5uc1t
ze2#rCTNsRCgi2ltzka>Qd2>`d@s^ZRBQ_@QHX@uc9xk6B7}=fmWb{cOoRmo$`Ha!?
z***gcb8AEphUI+NxeCF7moh`B>#s^dJMAzOo-WgGVbRZQ=go}mI0Z$aymP!{aN)`h
zXIOG`9Q1cgD5zwkKsyU@Xv`8x>$IlEF9QP4Z79w=|8{1W`SNSUUF~W*rh8)GVkZ+C
z!yCsCSDQGOC|ML7!b$^(Cp8wt%<lb;{5=eR#Yh7X)^N5yCSYW1_Fl1+j_GOx4en1%
zJxRDo1&dLZgZ@-i6eAl4B3+(%4ayp>N{>|k*bq+MZe;`x>}pV)g$CQQ&PBep*r*#Y
zIB?p)=}K?*Z%#Pu*bT{uo}vNRNO(ueH^|(zRkYf+hm=I&Mz9gY-*q#;7&udK#<`mA
zW(0Ki5+idXFBry2;&B&zm~r&hlDKg*MT3QFK>~=avBS3tz-Q%X-oJH+BJ#;q#(bAN
zXX6K)S>M(qr01Rsrt>|3I1e*t8&pVA+7osh`L@Rq47IkBTOEF-k|_K1**j^%Z6&EA
zxv;iYrk2fdN9)gZIyN2hr~JYG+Z0c`8Qkt(z-2V;1(Uh+;8Z|E$!?%(X3Mf`d!o6O
z#W4;WbK?UNJ@J7_mpn31WsR1lS9y(|)&FcpL_(IK<(q#o!Yd`Q`l02Ng8x28W<glN
z5-*>7cmWp@uN&mYQh)7KxYz?M{#glh9JZWUH(_Y6E+ZxVbpiw;)?P;{q^>dbK3J_h
z968n58$NrQHc?aPCpVt^SDr@&I_lN}We~>+yzW|Kc=wDJt9*aaBkoGNn^e0AQPdxp
z`kaz@y-r4k8E##an3sQKI&ojZG^~Ksv#8-+;JaazG7q;=KQnkn?plgHA1TuDj#|F8
z2y0auW%Ha2NBxnh?_y9xUSAx8+$*$=p|jJ9`Y=|WV1E0BNs3I@eUEFct=G4)ETr5d
zF%><k{X8+bp4~lq1MhO1Z>MxH(E!#^LA(=zclT|c91kD;kkPQB3#Z79U*ajl)kY<j
zX>2dbfDqU{xqGDAVUiP!ZIJ!qR7qzO8W@yke^DI4g$v`^ZQOOAioK$9Brbk`3T0p}
z_8%^w0z&AEbS-FtCW`{HHoK|rh!&cm7#k55Ts(_N0%C^!9ku2wsrRu1LuM427O^zU
z`@&H>9ciHB6Nswn!TjWnd3wg-v`uZ?1sXsmlqrZm0Xz%r$%EHArRmw9bUdD;iPDs&
zVy9+r(Hrv4o6gU>e0A{ZIMk_exQH&J$yKj2IK}WT@gttVvx-}7@9x_UT-d%$Mq!1U
zeha@~Qz<j889An`1OaJHOcbdXSTXvZRJCWe>QLx7ew#D=ahyrq-`8H3I9oJbJCsMq
zu7yUqJC0u&QtA#R!`<M+@FRMa%XsGJou~c(uE%(b>d!T-JTv+}fY3z5l=fialz1fe
zQUf2G%{SSkWOEpUyt|L0Nyll@o3Zgb_GG2HoQIXNqZSaj{U*j)EIv6u^Esfa=uu()
zspDV0Rg`l1{x@v`Pd3CQf`+#R@wOtrDk>{26rFxo7!|eY&e{JLd$pKeNRXVQZ<6|$
zWUXC*+7=|7%>KwO6K78L3Kyqqeg%4SPw35y31Rxl;trOV$2Gj>5wD+kR;lIGFn-ZC
z%>8BBDIy3l7EQ1WLIEeJdmv(%WNMM)aWh2Bv~t1UvS*)~^!S8zDV9sLo^$#-76ufx
z!r)ghk%-euyoRhIsWFj1%r~1qDi4{@c-?i`ZcknLG{TRwC9H5$*QD{4y%vYr;+QLY
zB!s60A%fOta577aac+sN8gp?ly^sb29N2*LzBV{Ik#c3Y5_K^$34#;d5i&m+>)gEY
z@p$|Cg^K>%Lt)$uBUZHNzTJ=R+uNBN{A@u#cJ&H`uo>9!^fC|=0j?n*A!}~QH$I-)
z{iOUWUo)=Zyj^Q&C<Djcl&~8&$S!4P<otvZRkA_wNRq_^E1pe3-l=!ohQ~Ma-!slR
zI&Y3!9x@#^k#<z`{^&)~$9)mPZt1Vs@0h^vz!Xk@;w*yNB9gReIm-Rm^oc!Y;=S*C
zd?+}gKuZwh4451T2XyL*;DATT8o}e?{R-EKNKPnFmpA@sj3G1m@qSGu)yIfBYZ65h
zhnxOr;IyPkI0=WQNA|V0w>&R+!?i?z$jZK!QTnOsZf8rUA%ou+6b+e%VQyXJ%4(qp
z%TqF(=*RjS=)j=yC4poY%~MzAt`N*Ip`-qtEwsBeFE>f}Y~P}Mp2?0LCSYT1LYhGG
zZd>^u-?e%vSBsr+dx!gbmq{&O8BJyG*1r84<?r!nd`>s{Ic38tQ+noC$7?00lHw~|
zQnGb30(hh9cc1A+t%|vEB>VO5%%89BQNau*e(C;V-|1PbzwlznM1+Ao%i*SxX_$zC
zJxz<cqC#WI1Fa+0mY<*sMW^r?hOap19)1rW+EIlCIg#_^y0$4{k>7Iq`kkNe+Yxv|
zT?<KAZd3`Cv=-9`f(63<Zd?1)GmhetjEva1<e8rP@Z80^-)F$VClozvb{P7X-5bfn
z!eAD@S7g@8K7T%ed(HEm#K3vlxoAJ6Df2C<JJ+LSTcw{5YXs(mhj^(O>ofqfgd@jN
z^)yv_+o{S14m2j?+u-<?p5o75_AX%vf?E~R3e+cTIWuKp@d97HRJpL*#*M!YA&;ht
zMVsWwXUyP$6m4%8*ExQI#z;)A1%>epDFB)^_J0z)T(IIqn851!dhAVsy1%|*C&Ft4
zMUNe0;6B<O;;rMqoB*`zW(!q1Hjg4#oOtU^f~a<~=Znu9p6AO<pXm4NY^ueq3<GV5
zlP9uXzbMf9S{?Nwy6+hXpZ}_~vlG24(c(`;Wfx>BR|cQwzZtv?tVl~I;1a?3r7^A=
zah7)qPclLBL%o?(;3MnqLrXe{LT-G|a=w0jniTXx6xncMMeq9zioozUZ&w2dTVC~W
zeSc;BGA=`vE7Fq!!o7dVZh`4LXSS~SqH^5;mN(GJ2@yC_@^=|=Ttz+KMUMU_k-=v(
zb`NeC=H{T+oYu|<=`zGw^|&M|_Mz15MC+hP^4uDfb11y76J;XE*l&Pcq7F@^#h)O^
z4U)A67@A@evCn!8ehcD0Etc<BWG=gbusHnMzf1XE(XiOoG$X+j_jAZ3PhWxMd;X|_
z>SV;NGJa5GUw<<D?;3?P5f2UNj;+zpx*~Ck#&#LnGD{1|#4P7FXO=vx3HWFww|^4M
z$M0SyYK1AxuvM-4^-0}}uxv}O^Juv%{QJCzWJdMf62P~`ip>j_d$GvQxW!lIV&UP+
z;^lIiPK>p*th=e&0OzFrL8c(U;80^oX|ibg8sK`#-YYf}rr6T)I9z0Q+;qo1D62&^
zSk#cacQe3&bGlKqKwMi>ha3NP$pq}5Nls-Zi4YlND>nCPSl##Je{Gg~)*6}Er#nzO
zi0U*Gbs%j~i+*ao`IFvN8|s?*;lf^+{Q5PLyu6HiK4XS)mw8KVs9Sz$^q`nxjxR;E
z!lP$gt@K%%`rdyU9GCVe``%o5K~hbBP=Jl9Hqb;|_d4nY2Fj8|^rq{fR)2g`$I)O*
zogh{rtoK(bN9N9zZ;fG*B7pf@xeocm$Ji*(+y6!q#*Ie%Zjs=1hD_|~Nd$P=&BB1F
zHIubyO2KHzkq+<)!Nxywwc%k5HO-M3pjRIk7sU>lEI6eW1dJD9(@JS?D<Ic|_R@?p
zxQ_r4P0o&^JT+D)8x<+=3IwsOs*v!5aa716Wy|c=h>B_d9}XNMUS^}^1yqqrVi9s%
zYs*3`rVK96P8dUKse#eHN4%oP|I;}0I~Frhlm0$wnSHFpWsR;#NeLHeJKq8do{L|C
z{qP#M<|P0zK^dK$5pr=Xa!8@=;D?h9I|UJ92|CrNW)p<{XTkGq>DAx=(zO2*<IL`<
zq?ZBi9Jo%HDgsrXPcH@K#kHMo0-<a>E`)VXM=ePUao{6|iTpFn5$&XusbxLNyZEZ3
zv7R#NGIhin-kiMUcbytAh6f(ZdG==GO{~X9gjXxfZ1R_mCo4CKkLDCyMrc}Uwtmlm
z#G5Od@&7hy>ThxQIr9=%iw{BUqEy9qmqVXg9n(KZJV<zpWaFWxB%Z`n#i>n^LpqJ3
zv<;>4B_+)y<&;4Wb9^N<u!U#L2>G()d9mQ8rsxjg>@#Yn6uf+*7=NupQObMBwW9L&
z9||vH-$x-|Rf0T}qR9N;?!0EO<3`NDL=98A3zj^KJle;H|CKL`W8;cI@+*aMax}KK
z#}1bObA~~pW{U(krSN|wH~4F4b#C}m_btHT<z^pGG%1I@g4A~fPvIQ#c*5LiG7$~L
z$u#GK5ao|?Gv=(sTu%8j)}o}+jz9}?WWRU(P#_K(rfk_^Oi4Wc`!7{_<96^&OGd);
z67Iy1iH*9eGgPdS!Q8Xnh}W;3<)~X`Z>HrUiHVMV$}P{)rwm_^tF)yT`qWY78vZX|
zvIF{!M)%}g<$oix3-p^Q)>H@_Wm&svH&<DVztR7SNJw^jjn>bWQ==qicJ}gyhX$q@
z8igM1&z0#-V6N_PwpZ^P67Sm+3Yg%i>#k)yeAL+$S%+8eC-KJ27nZj_F9;}q)hRL3
z-VpmOw^=8~j|yFKGlf5d7}k9M#X>q|%pj-Mxi=8ntAIUYy9ie9EBP1m<8N}*-Q@>#
zK7M2eYk?B~ys<;xeJ>952wQ%}1V^$}fl9(%QtRm}R?CacO>?SXKVf>8@t-+lKhXH&
zsarE7V}p_3exg;BviGo$;`}E{+|I}Ne0*4-9nt?~3`Pz~Aa)b5Q72!72=s_|1Zms^
z936oP(>083#Lp!gefG{!&-DaBU{FQjJSMRaOl}FZZ={*LZE;iLmdYgR?8EWXo-(*J
zllkx$mhwJ-c5n7koM-@)e%efnTtw&1$yqo>w)Pqu^+VUsmS`Tqa(C0otiM6~pvBMf
zM4w_NDud|Ch3fD6E-0K6yvJ$(u|1b0rdb4uIH*nDu>v>h9^MXdBZ@XIzfwPqt?Sry
zKAa{rK&ESk>=wAWXb^|KM}}>9z4X5jSL*eC@6$Vk+}#v@HkR*C->{#cUvdp%#YtsP
z<%1{W*oKoc#EQW4iY$Lac?xtAHePy-X>vq~^IR#CCsHyP#YWT!ubRpg=1li&Y}D)5
zGA@e^O-dXhF-X^M+0VJbS|U%Bs>>bd_xgVPc4=a1DTlJQPJ`}+;yu$H9x}AMG|l*S
z2@6p|ET>_)PkJf&1RB~D`VIrd**cJQDW4Qct+KpC*f*B@IXxn542^F|)8FZknzFdO
zhtWH738EvlNO{eEGW^%v{WMZMNe5RL>bsSHAUA;lgRxNm^>T`Q?F}|6kJ;)ToA0ws
z8eCrQr@-uL`}=!2zC|hw5cmw%=}Q$X>=b%nQm3D33h57K?_@%wfZh}QHNV)I-gCCp
zf;qy)c%Fx^d-zSiqcd2`!$w_a=9vAx`b_*6gDNZT*8LPZp1#V6MR`m~&8n|dgEePx
zxQNw#^?io5ry3Dwx3+9jt;PjG+(4v{0(Q<yzH+H^h&MdE?wnzYDS0a&frD}9uck+i
zRff*_8VD{vnS>#C4KjLjiz61K*m6r|uARZK+*l$=f#0P)jJN$$vLtK!gxSqO`{xvL
zG_}71R`u9#mEPImy|xm@Km^tk5iN#8GMSo&xvYERHs=w38R7Fc*;zI?U6oGoQP+y*
zE~)7@IHd4@_$c9H-H%sJHP%H)pOq)P#c^14d7PDKZkCYWi6(9_65G9?e^td5Rx2n8
zKaKw8E2q8|n^i}$$jzcHHduN*3srP?zd}$_8n)$?=5@)K<J9kWiYFh7uG@lS`Gl2Q
z_GfV7QLDcV)THuq&m4p_^A7XxbQ5vSr9Gqc@E_Aof3=!1&6|jZDU=4w-|2b~FfcLC
z`tU@cpU<Ci9G6~~NB%jVfp1${=B9}oFHKSwmv?(Eh(z7`4m(dIu3am~Cny&#y8ti7
zNOoQ?y2rxp3Bm`wNBYoIuB3bDwqFr<*^^*Bg!&o2!4%ORq<>9oaftfa1Q$YjaauAe
zw3q&vY5jood^w#`oVuay&-bC+N=*FUhxPc}AOG5-42}2UFAf6a%4_QuN-%eS5MvI@
zIrqUkgNImTgyHu0?cM}wn$TB@?ah`~yZ!>Y${r>qs@_d)a#t14)WKy&-1_3jbHMLi
zeec_bFBWf7WyesYhEZd0T+ZB#D?ClnfeDSGSW_TqT6mpmX++izPc16qqdcZ6=rD2o
z^?bf;I6{#JX0Q<=(e@R&3>>oMCvm?aT;9h!&U;~4hWFV0?lJn`8S<z7wk?7<qSu@&
zQ%FiVA|E78Rk@l@RBR6gb=?w*RhQnEb$pe^o86bAJ~0IwQ>m-Wb%x+$Zm%52+Fyj>
zX{qyCy>lOLT*MA{*Y8#Tb<#K7dMI*@7x%nQRFkfSo6P<5Jr@uCI~M%xVG;QcG#&}D
zNSV!t3$&ifUm9%i<DP7kI@PaV#~HryVv|R)f=+2}xZ?d{4Xm1BivkGEtUjD9-@_-v
z6iXeO`qil$v#m0x0^ffwH<BQx$0(M#wBql7K~1wdRo>F432#3sHE>UyA}h!Dg$RAM
zxK?k9Gw0)Oewc^ucK=M<{;p`mqq_Wy^%1qjT)2lSgmP0)DcPGMBXZ(%JPfxTpgC1!
zuf{j22x+~kkW8bPw;&#rgLJnfv!#+GPrnnM_3$Z{Qncucexj&du%ubWJc;x;N+;A?
zna60aWVgD$m|zl?@y+z0Yg$3JYI&C(_xM)n+o=2!;o3Xn`<vbmj#Qpc`?DRaNrdkI
z{mJcgUrTl*{z3N$zEE$W5{3@nYa&~0GU(JVRd?;~T}mv~_REsfRB+z73Wi|};1mAo
zcXhS%m%o9yUnlR<>qz(dDaz01d$msuUHW}W<Px>~7nDwiz8_0ul5OB$je92dlCd13
zDX<{?t~CWol3U;%cxxU@h5sRAw{!A+l@lk<pITdWxvw)J$7Szi&7#h%m~j)nD?}iG
z-1;##{(}Aj326E?RO1NKueCR~E`K##5F>Et&E$Iy4vyyQcy8A;Tm$6I-%#WSYxK!2
zwbTb|(XY(7o3Q9A!Trx60;xdp;Hgkd8PZz}s-($1Y)&<ni#mQrMv-iagd`!Reb<jG
z!3e>C-Mz-vuq}(1D5X<sy>B{sIp5B)S2%rFBE)k&^@af%URJxun-5Nr342UEuj<a~
zAdR6Da%T~q+borv2O`Jc$g~6M#r&B|0##cM;{TGApL<`OzrYP(_f5xOIaS3i5L(};
zx5oT-Wsgd$?svx`NlaAwBVxp?_c2Z&!?%CFM@N2vFGhEZ&5F5)gTP?W@O$HTmuQg>
zOUr#2HT{5~=KtdYC<DKI&(%qty9st`up2dfVms_SVvQSW&w!n8+Ooyb;lg_$U=}O<
zYg4*A4FnQByQ^R!1F-{hFTqYCES+q8;>(8&2C>gocO`VcKd!ox+pTM4ltAJd3nR`t
zXY=QJ`?>>bqXoOi5h^b0s?xKpHi@i>83bm+YA7CA%3-#I=$O+I*Lpe+yW94hPpESX
zq`(?9_{hv%Bo8P#rnnvyxau+cYroJ#_cpOLB^+~1anzV6kXH1qK+!JV&MW^?7DSL_
zp-25FwJb^nH?>X9{YQUdv|)K5;c5UduN2coj=#c|n=f4sc`rVaxI_>I6fjF|<T%gw
zu3UVi7xqm)NH3YYr107#n_rTu8=!c2^x$W8GEQCDxvU30@wVWl(<e*Nq4fi+aoR8^
zKzBUR;>BSBmSIUDFg#EgHw*)3g#CQd4%QU-O&+mV#O(yEezYr6(LMSlcPUqGATlQ@
zy@q3ATs~G)0GJO{WG?0=bDTU69W*O4K#4j=*->`?u=p1kBzrCR2Qw=~pncU0?Xo~=
zj6xh|odYvTuF%xs!EX;WJUk?&F3>QlrHmCyV!jBkn0gx>M+KC(AulX`lcZ<Er+>Q}
z$xT-EbmfcbeENY{z+E@)5uT?RuWeF7sjvF`yB{9>m%4^*=v(O@vlG)gM&3`iO14A(
z&4Tw;U>~83K_`sIrZ#^<QDB{REax<E2k`@0)H$vcPG?@(Qc=?DeKNKSXHg1cM#zeR
zg58JrzqQ9w2H2$p)y2btWF>68i{Z3OQuOkYFWK*>lQnQKFd^A+JXBGu3)QG3lD?m@
zd1F<7{Tl>_c=J49(VF+n?5!Zp_dUu8eNB@z<3JVD0rQ&t4_5{+%hBP+6e(2K7o#k9
zmXBPC5S9vmNALtIKXvVXlgs4$?{JTrh8-hQi8MU6DWNxhJ-dA_43;+^Z=~b>^6|7M
zn;dpuEFWImciP?l%1zNXr>*>oJ50rt)#di*4;9Kf)jdjrIns)-<2E&PG0$U~ruqhb
z%<A9esD)}Xz=9`j!HJYMh6&Y9VaXgF?xVCarpkMi=6GY$?2PW}l=UcaI_5cgT~ke~
z=wW2#`?iwYL`RL@r_Who#vgSo5~@t*)Bo5)+bUSn!t*J*y#%g~1Kl~dhm`W}WV%;l
zpXBK-<c{upt1;W48eC%P)VFqq81wwA<z2@Dz$N@fliQ$<e<Qy~;5}{v&me+($5btx
zI*2xDOs;y^H?YYFA-x`Ew@iU2u~ldFUwXGmL13t;CSLH1!W;K^%zul1RCp#j{y{MK
z+yDdT1_SQ-kPIK+h}4K@31dkkH99)EbL1Goi0|JYkUHu_Q7k+4RVgJ<p{7KFGj%XR
zu%CvSg1;>)E<R6zM?iPUE6N?X+WSWoG(GlpplF|83si-@>p`S+FN(sDvelL*LHr;K
zOFNoWuyF~k%VNO}X*L$Am;2|#J<_n`qXV2@J%68z@m}!Z7mJMMT3Yz}l-p#y6Ggdv
zmN!BW45HKou5*zAT{fKc1Iucw4MupJTxgIKEfhr_y0&@?FJ!A$@q9|GIZZhM;y7Vw
zcJ2ME7L2aZR?pNS!AZe%=z9Nlr&@1q@mCaSBmdaTLk^Z=EM0+aq=enAd#G{g&@XG3
z&=>ZijAf={JddrTk-DMB`yw?+YaW9wB?9eM6w&1amSJc-k-x$vq$)h?Sw`I2Yo|~u
z1|komWf6Zw05ZDm7_purU{`W0Ce=y4gmf){z+tei@J+G*Sayhafzzzo$)6J4gHmG=
z*~;@g9v#_~vi0(w!Ne8&<9(&%oKhY?f{|g%O{B>_CHR9<##GN`J36R{^<Ov?J>DsE
zSNAYdDWJ{+5Owy>D@u=Bro!o-yVJ)U$=f=A-zg&#%)-(=DeuN%pM)>e0LqF9aguyr
zgDqYHZH2}??_V_LYhiU7Jll!3iEcwO_UwkX2+GI!JkKerwLgkk-||J#UcLr^LoW&#
z;E1Zi%cuChN9m_P)Is=XQloG#ysyKBJ-@phYLk{n2g}G(nf_zl-=l(0Bhy>{932fc
zo6PfAuT{0$A*BaV6rn?9G-hn>V|Z$O)WhQwctNNny4i*<y)NGKOt^XOdoP82j*_+P
z%!*XnCteC__#kWg;J1<_js#aN<U${WyK<o!2KyUna1z!CN*oA$--B)$3NY)vCE{6`
zl^Nc>_Ve5mDVTSlTfKpjZiPNb|1f5W<c&5J4zJe~iUn&}0td^9rd<y80#bz|2TopU
zmc2g-ho1CKWq`CrXE)l!E?joR>LyUQn-ZL<#M3EeUR4UOX53J)AQecFQ-7G`2S`gK
zWlN6UByX=t7*D`{uJzxjz$WaI8d=+|vq^{s`xO4)r0?e`(WsP1fWwAWMENLQJJ+AU
z;1+L@%1MPE7?Kfj7ZSHOaSg#zB8^DJESvv|Z&D!ZX<FL6)`RgvXr<k!SlkchWGBub
zKJ}Mx<UXTF;r245d;%GMSb+8y!A>)n;BeO|2bIKq$$fAgx()lA_A@JE8lNI@t7WkG
z;}76K1GjXiWc#&t-;XGj!tM4&SOn-y?>hZHdn*3Z5bw06`@u`r7|&~f<pYudDCUcS
zC#3FmSn|lLO&=fpB^(5TANPny+32AJ2J{!Sm`@P68eAvI;X$yzo6BKfHw#M_*+Au@
zm7clbVKE#$y*ecGLECW35CAq@=HkE*)wEdR^*T`FMiXahsM9<TSG8FoBLGHM(1K(*
z8RWV<_0oNVJ1#78qw=154I3K#Au$HXw}2g7dI@=D^sQx3R#&yn54vo$uU57(;-(wv
zy>fvolXd^BDuL8ZP(6{7?pXit)@Utu{v_O(;D?=2K<f<Q1}b*IZU=Fp1*NsSu6qC4
z#eNjB<7uRJX%B;ucF#{r^m;PZSgL*Gg}r<iN}WZ-)T*L~L9O2N=!|1ZuuT|QOIQ4m
zxEMfO7mD4Np~5~fhJA6es;Pt~+Z1e+F^ZBOtW}ALR?|;4Z9K9>UAf?K@TCas2ABzi
z(qRX8cFO3O9w8e@o%Qd3_$2eTP*PV;@Sy!Vfz~a%kG)7TBqevUDGIr7N)dreC?aW(
zCuyRJr3xzbJI%=2G|#5avyY0RR0EL$eMUu+?QsRE)+s?YPv-_Aaqo)R)H6spL)}T!
z?Kj?FA4}H}TO<e$8@Or5_7(L!gL{1MCs8UtWR`x<<iSzK3N$#Xsr6{`)nj4VMmHY1
zYC1->rE_rdtiGTqS2}b*#*3=uv9g-6UAh-@+*`Qb%Qg+r!KC&F3tUOluV;z@A=0)&
ze%*$MZdZ5!0lXm2Cf~tol8k}0)4L6&%yD+>0)dvrh59fC`$T$L5C<stq(9i=p8nc@
zKY~)x<aFS~*{m`UfLj(7REx7dvS812o>G?EDXCBrma(XD^v3h)ul3_~X+CkPTOvhX
zD(_1JA1Ls84h}ZlC9_h8Rs`^YI{uoOqx9~lm#IS+r*n)POT>pxebB~0eMwh|9_`iu
zwnJ@%G8i}bKu^4XwX0&>r6g%Ln{zb>K5maJkbR;A4&Lf3gnRN(P57f|t9sC+0BV9`
z*%u53QDHJqSvyI`!+{X#c?7pQ`>xl;!hmtt^zwiMC(rE522$P2UrmI=`9s}ltP3bP
zo?j{-K%u(?jX|Uk$CLN{y(qv4!X^CSiCCa)V;=%2S~p`LMrl=Tzze70WrzYSVf>H^
zfw;h<Fkh@|yY_SQD*6mukZvBZXqbQpYi8_*lzO)j7t;GUhfXP<|A`yRXH(ssiVhF|
zpvDOr!Wu<BxMZ@uY6~<tW$<b^Q{0uM)VN3tsLm+gU>nr4^vQ_Cx4^ISbbF&!9qu4R
z-fZlpkwpRBY`kNCh_VTYBpT2<6OPfDT$#0%J@6g&$!i;gh;|YQrP2FybTl}G8s`dy
zHmee*=1S2CHr#Xt%DlVEzJb&lt!e`D`0{#(Gha*&A(V^1BU*gVJ{=%wU@iT9xmC)d
zfY$QE43y-hL`@_}us;77J<5TuNwRPgh|_ixDfl9{ZCMWG-7;l2pdbb>>JfSjtUWc-
z^V=<=OCKu?4w)brHtw6*g(pE?SuvSfN!J^j<t+7BuQS$(+wMLmpw&Lg{Pqi2BSdb}
zOME(P`K*aC;5mkY=%O$zX)AMh%S4l<8$T{;AY}kk`YRO9=nM%{qDE7~Qw6yWR(iRh
zAZtg}1K#ij9#}w?)NROL+8jDHeVyZHLb1)+tEg@=!^oTujDSXTFAF+BDMs%PC>4(U
zr2u#rI%_#3)^D*<rTS!WK34y66iG+&;}WGatL1bIh%=nFP}n3<z}Q}^N`Vdy!N&uq
z9jk3`XjqT=LC4L8MM@fU|0@rm`9(V5qY#jQc;Sc7IM!k%+Xf9aI8xASK#w@Y7|<3~
z(V^D`VhrKdy4lkb;Ab2N%J9H+?Bkl7B2yusLPV{6Z*gGh-b0ZrEnZXW2y8=L-~E&U
zoo#neo7C+~Kf^bPhIrFZZ-JuFBP2Cgiqo(Vmi`bbomtJ_dQlh-d6UE0SYQbu#5!M0
z^FP*Q52M<M?Z{zE3V51pJTEO@U|HG2NG6|B1QVa|x3Hc`$yEx6XBO<3+J&DJUR-Ou
zN-4h<Szf-}f(3pAv5eeLDuw*eRZZT3u1W~O2F@wKbL~8l{Wh^8rjhG`XK+{_oR<UV
zxK_x9Nzyk)`rjFq%)uxG4@s8p<%nn*Iiy)BvJ^m=<+E1z_^W0_L$C0|%XPyowl*x1
zG05)+^lE3f6kBA;aGTJ3=|+K*OmWZPO;NBOra%YH>^F!~{t?m5MTRRkdHT@|AwCzg
z&*^mvcf&>a5#E`=P?jV84W&%lu+M}$NV9z@qKoe`5Q>8djZyCR)IWg*d%_SKI8irt
za?Us1PvI|SlP|Tu0E!z-1wxzN0ZMor0rcwE-am@tD7EAW{%Ytk?LF}04k^4n4OyPA
zuunu7<}DHc#snaL?yH%pg-cFkY$9CU+2Wo|e?Q@W6-K)l=?{csgs%56B~BWuDyiW!
zsM&V)VfSE}S0s~ED$QeD#tFJNP1WeK9tN`1`9{*;=Rwh@s=$$t5!62^aaTI9LyRIX
z2bou^VJy{IcOy_Tmd=d4u{%Bi2hv+gyO2mfJPm9S7vdp5?bi1&sEe})w;i?zo6W+)
z%PVp?fnT)v<R+}Mw#Zf^kS&|nZu4R25?`k(w4hYSWn7CPqUz7=OM@9({m;)&xDmLd
zVpes-G+#m*jO(*$Y`6KY$r+r0QN;7;-H~#T-0(Jk#74STdy!l1R>{Swb;a8$ywsS<
zzlDMIfbta?58(UYXz<Z|csm_00?3qAOG<mtIR2han2!eK{gy|jAADq?{r+Nzk#a3;
zcbEo-bq*G1(Y@I>OIMy2dNAPI=6xN3U#Ckh2=7HQJkuLOP`ZZI7B%hugP}sA$NNJe
zXWy3-;{p;A-P8nTOLqi;Gz=t^A6uCR>>8&~qzIR-fIH`<YvZW1y|Oauf@qEnaN_<|
zen?1(;9$i6^!M7YI<BT^xxRWRakg|qNWa20ui#QL@iG|v#vlNVjSNu1)U+CqF)%je
zlFtajX8PWc#N>If_;8dRe=13{KU3F|JdYuN$$$;mx$1k`%4{}guE}3HsnfL2zG_JU
zkQVxrV*LUPO~&WKg|-Ml4j%Kgth?ok*$^)T-K>-lnJ_YPvI8<0&@wuosRxGA+%ll_
ze6?=`hRx>FV|2~k{;{q)(=AqvA9Y>;`>>dZ)cZSDAGrMcZ~caW$pFUaJ@uHPE$8FO
zvT}!cGGJNNqr|#8B7PMAxk#l?)?IrAL!f=}b7tN1*gYB<qr1AekrPo-HiTH<l#EI%
zQ_rx14wdz*ky`J6<f4#25T!liJVG6FuO78>k)^Ndjir%Dkx_>L<|4_y)bZ0h^bB`l
zoh6jXoDlWM$h0%v^D=CHs%F7^z{t(jt#El{zzoPlih%ISEPRnkc<r`0LSY(~E-&cu
z$pg6VJB|jUQ&+y%vkM;?zTWQH(?Q_L9b3H)8Wmmt1Uyr?6(w+yhYBx1%<J?C+7k<T
z9w;v((0E6fWk8r)D)DVv+{adF0;L{rOk>mdsv%&Zqd}utx<3Qfyr!xEGF%#TwB6~M
z?2vP{=3j!$U-~q3DpNVbA{vOSC2X`ukeredO3^mWO>aE0{=|>noF^PtfAg*WxXgPb
zd?`T3<m&l7ebx}X4Bk^fq!)=r@aa(8`YAX`XB<R)E#g$<WCdJKJQEK(u<%?uWxi5<
zNk+!*5-5W=*;{{QrEcfQwFK$fTig7DO2mbNHXOvlxU--0JmpWp-V)M&d83u(N|OI>
zZr#kdR8g?*zTa*vtj>jo%Z*R=jwO;(f{po`Pa>GfyiUA(46CSNAQ^$1Le8}5e?R5?
z{BxYnxxt3)%{}T_Ntmb4>MS3YP9XdA%+gnwt=rol&gc!v<lTW)a3tk<c&~H3qE;S`
z7S5Yytv)-8@>JtTQWu)`{zijc(d8;K(Pzr$1lqycC;cbbX<$K#!@%7L3hkg9MT*rn
zY_?9}ReofB;b?TyrNRtcn<jAtYoo?!7Qc%|C`P?w)?+bXLJ%{!Bqe1a1r3H2>%6me
zObU~`j6SuA+s^fy$)n;#TcMbJ@$F+|T(owb*AOLvVNeG0067aKS?bz}6rv28ZC3eM
z$)j^tC6<lah`wQzn!&?I>dnFGIFO!9!H}NZ`x)HE(|MTr?kuJtONqQAl?>0O{`uzv
zll62cLm|c{Bl5yFjXh2_z-nUnMr>UGmM~9=D8@!7H53`8S*DS>mSEXLqtF36*V3fM
zJ)&g89Fs!OzmC2rfRE6gm{^ws5DVXF&LL)Ryc9{LOY&MzH2*FtAjB=@okTaJ&r;Wi
zqG5$RVcI|By|8HQB`wd%o_xril`zro9F~-ZH3ln9_>W&7|FNUHd3$gt*TgRUptfy%
zC}XlOAN(@4%UEITiYB}x^ya;LH<R!hwtnBjyxhCAeCqdII*=a2+IlZSitL_N!>@Pp
z&~+aX)eK(Y1H(fUn1Ym=Pt0-0&UyED*@O>5KR=EqQv=eI#46^|j}aG7Q^3=WWGLj_
z`*^RI_M|c-%wA!UMEtJkQRW=w6BXW6ICj0U8!>_(Jq~hr*JdO`r?9P=>7*OXJsmog
zcOidt(2t_$dJxQCL;q|<ha^a6WK;!JyFSr{y%4l(9c%}AS2Yzk4SelEi35#+W`E9>
zDdcm^9brrNkGElI?!xw!?ZErnri%G}6out|=L_nj7X=lsWIK1qLcYv}9z>4-pnwfl
zrl5y=%iIeNq}B=hBwfm@3{xJ`{etZ|@X?gw;29KSOEg%UbeApC^^-J=Mg40w!dml(
z{3Rn8GjwyAK~MuVt`v~2ez`NBJkf?CWp&<}ZK3%->;TC`^AVh_l61+;H!JhgT;E&O
zh#ObpF92cKLO9v{-O*z5dvKi?ko{R=VC{P$(Z2dHtoW-|1)Wld2js&GHqMsuxx=pQ
zYuzC8v3H&&cL<J4$2Oc#A`{k_t*!;U?SCa4dW0pmh%DrbKOZlA{wB5Tnl9ejo>?sd
zE7h#ILn(D-8FjZ&9Gb|rm)O)irY?^HR23xjog-@CS4a_)C`S#Pi8O(o#*aY*b8E-N
zopUN2+FsO?yX)+|3LjCVWWrZaSe-ciE65g!mRf|;C{=5AQsdXQ3DfG&5n3!<)1M4L
zFsye!FA1>x{CeIH_{I4~K2=%XI4m(!OSewBwD;;O)R@}oPp%@nJ2_s>J4}<Mkmlt3
zk4@gD+v1n($jSS7((mo+8Sm$#^NkB1cDD-W5i%8PnuAeSDI(}6Vw*Ase6O5sfPD{t
zt`=5m`41?KJdq>nR;im;@*AF9I_pOyw*L$!TqRxoW1uBkVmn`dab5XH*Z%a9E<HWh
zJQ8CJY1k<`w-mhvNYCQ}jpwO?t}rC88+_I8+-OrAHP}vqe)u|uZGQiUGYdp3B8VWr
z`<i>_4q-4^gztB93-m{Z_Zt*wTiD4qJPDd{*D?Z`U)<L*RJ_7xnDQne{<0Cz^U|C+
zt<H!WFdwJvUT*JcsJ^K4YaeZ=dwlPBTRaJ|B_YCwMN|Cw@Mi=RmuV|!SNfWbp858s
z$?gAl#O@S%nA}_tRZBj1`kK^1>ds~-Me||8lgKJf_^RhxQ}pW4N1B;|@>Q_4IT5Xz
zGQdvGQMuh_BK0|O<|6T3)wvi6Ww+DBmqp!oNpNN?K8<EG#btCVbN{GfqI;KdkeZaI
z_a9OHuY$rVBLEEe^TZG@9Oi5~5QxHg52@!hj63Y;f#@DH)arqP|DK<cp$>)a^Myv4
zDukCV=GXSfxLrR?hHBo~Xyz|?GByr-s=E3KuM&>Yu<7?P%Wip$c|#Oe;GCW5Cs%!h
z<5E-b>A^Y;DRte-kttVXvS(mqk9<M7nq+&1^mBR_d~oEcc}mtc7|Zj%()#=3HYUsI
zQx7*k3(qO7X%?WccRf?T6)A?;E+$=#(vdn(aiQ3(RfIe2gvr<=a@?81;23cT&&gUO
z5C@maQIeESC+EW@l`@#YZx@b|a}p8VH>cKDm(R*`OB1VMMI?H2*S#WEgSd~fGivJV
zbry#x0g;Bc&S7|vL+tP#d_Fa}8t&V3NEW7+Z$V?q#_=;x@*AUF1+2H>`Ag66+LNqR
zpl{_bi3%?k7IGW*X2;}P9Q?5|&D@B9&mKDKHj|x?l_~_8J%z>^tauyRUdH_n-rM^n
zi8vTVQ5xptf7d^z!><BoB<?>h*B?&u4)}($xF9T|o0oxu+ByxVy^q4Nv+QM}Q<=M%
zqoj3a$>&lZL6C_^3FbThLc@>y18jMFSJiVLp%MH5Tu_jAl;OD&Dwj}~=}1BQ!^ikf
zgP5mvRwnVO%*@Wlj)$CGsleUR-Ag|_4^pQ!0;R7jzX0hByP4mXo;Dlu$Qoc(KBzy?
z)sfn5Y91=`s5U;X*R8RQx4RbJbqCMh`AygSRe@G^{eA^<?DbtlDR>paQF>qh*aJYG
z8dYeLY>z*4OVW@`IA-?7T3hp7gUk9|o7AJhBl#az!7R1+`8kzl{|(miT09eDsO3G?
z9JUr1iy8kIXAthQ7=V>p*A*1HM%8uk_i)`rb03P7QSYLGAqLV>W%!(xGIYf9;A`Oa
z<|6$3%>)+r$r_D&{y$I@jCvVwOy4wtR#+zH(@Y83tXEDmcSZCmO!5IU8c3+f?_QsE
zCvr$ay9#@@*t()&y**Lch~0zW)JldYc3)UqR^h-o+irFCuhW?t7#0+KOeM0#0D*!~
z%;V-mk`8nDEZNQZ?9$&sLA_cBP1ILky9klX&Q<~Y6g>E-!0hh@eUD3yNmSWjt-`sE
zz2$QUM{wQc!i0v0Iao@*Oh3Vt*<QpJ1Yq|c%TAp3w73{1QULBw6bkp5J(VHHYOy9f
zQ|}!eCZ5LV(r3xEAe%^RRM+PEm<_!iWSaoGgIZAWV@5ak$*mw}WP}JQ%NW9yIq#d#
zV*Z=l$R^h21!Sp!{OT&;68$4RD1+!xI6JX>iok)vq`1Kdl3y}|c<{c5$&kA7qWJyh
zA2Tc#0H86>wA0dqXBoRH?|duwF(EQ?zN|1^fX|b%@ogiOr;N*xXMt?R@M??V!lgcb
zALXNA6dBy0G4ckcY>;#L=v=r8*-a3i9oVSKn@nrW#je?~`z6{ejE8TDS_8d?$y)dn
z=t7kRmqPBnOOH}bxv|%zC>*EmW+%>9;3b9#GM%#1NNZuk(-Z>OsjDY%=}wPQOWB+K
zb;ZB=9_Qn55$=_fJG>%7k3A_^R58x4A*sJ7J&N5J0RZb?t(eZYQD<kvV$Y{u`9PGM
z0t~L-8)VZ(YOgjg4=Zt9=tIVw{83GX);q_nH|gWu^d-sbtC25}_t#A!LBW!}STQ<q
zB+*4eZVFapcGzVRb0X-!ewtQO?)m?2t&EiAqg(Pj62*Ic6qx7&M??jAfVo2ga{jqa
zFBh!GLSm2@Vj{~cE8yW_n-cfcHDu{l{cw>X5A&8=z6xEsRGQbwm)0Sr@bHZerWi%H
zS-Wg$=QU`lq%{RBo!NApuODblTElbZ$r>X!Hn;<0noC(I&Z{Gg-=yxd2NjBTl;!j9
z{at7O3Lk_~^JT7BQ!RWe8NcnUe*RrT7Wh4#aJTC*Do51FBM!|+eI_19x2!3^BzR^*
z+yo)b6*f+VU%bhg_D2ZqGPSe%I$6Ot9KImTT*2EY`7*~P<wEkMX?~Q|dt?l30{{*(
zk>+5t{ztM2)Iyo1KjD})zo}!lvpTx4K!uacn-T{{`rRJ7^&gvRbF4;**6F$K-f|vU
z`?bj9*reOzRRtLLSdn-X+10DzP3MpXrcz>3uXGS^#<PqR&DmS~eo*-AeFVT2Sni&{
zJ<nF4Ush#tA0RSyzo97MsE%4vk%#?6HbMNJoS+2ov~r!f2Zmqm$qg1CQT2Y-gd|~W
z&XDlD`e{=nM`vw=*!<Z}^+(Dj3yJe(u(;nw{JQ{1HAErpjvm$y@^If1xrP>H=Ma&;
zFp|pMjM9(G24Wgh6^tz<-EQX{j3$J(>W7F&;hi=>Ud~8}BbeKs1@$`Hl50oW8s);~
zgS(vnTt~P%mGKJ9CF2QqZO{EfnHE7-@dUpLDZ>L-<vO<~SUSE;WsH9rPp9X3QNrJD
z?@J}!`)B#~DA<`YTecy0Sj`OTohT-Rou;ljK-1qtM#p#vxrPtjyqdS5^VwT_R6`<k
zQs%7uCMAIf`l@jJ9KhoJs>g-J9ihl>EpO@rL9?;f8<&2lOt(@knuHN4bfTE{8!f9#
z5Dwm4iH&cBXFK+JO5N=q&5vC=q^=D#_xTe<)IVy*7fdnCI^90Y$KtjU0F*{M|7A^=
zFiuYT<61*<I1`~L=cxGKx@fAJjEv%+r=Bt=vEUw{#tK@p+2(T^{RBpSi68!s&N)#5
zg=!Gakbql`nm_1UniV1g;E#+0;VVwT85=O#cF{@J_x!2YqZ|KCNO^~f;l(=wVackB
z$SCfrGtuEaz5@rwg3g`xDA~>|yKUGrhf~JH;hqP4I4-jV<<Q+ivj34@kgS+wU;Sc)
zVT`X%lg*<*f&df^r3Mv4SI5fr9qeb?9Jsh&*FQF$Qaz<^y+^%*w1WRH9{A)G4pgGr
z%~kv%HO1Z80OVqt*1gfiu=e1)D}bL;Tz~&D<DY2s`UP8BYl(zRg==IBBWDyz9~NQh
zM%#oBZiyX_XG_u(wa6fxS{%`=^IUu44kt1X(js@rq?~Wz1B*QRETbNLmJz=*P_B5F
zsGAI|w~(gt>pj(U>+z5^4lXc-jgzMT*5JKqG}}kI6+JEs3B?7EZ?yF0-qJa&cY9K8
z2s!Av15HRPvUEtlmZ0#xE_Zo-`lIQ;`?w&1h&00HTHbSCp@U>~fZPA(VMNje3kZ)+
zZ1{`GFJ_Jm6a_OdvVM3^nzv9*eCP-H({`c-(ChLo`q8vpC2$NDr)K(m4taXI`Od!`
z{^wMYKg>T49C>SPzwx$}v$AYQp?yE*o@pk-Q^RlM*AnO#+<M;5n-AanXK|N4UxICh
z9pp*fY5h4!v99{DQhkn93SN|~+gdO1hFw%_fm_#TmEau-MPJzG$6zK5t3D$l({4?N
zDe7jBS(~6zJUIUH;gTT_Wbj9OR8`!}`NZwp|BYN?;)!9eUi}fEem06TBvK3j*WR7L
z{gXtdZTk5Wo^sv~m3@X-{u|uQgx^0JAwGaUz2z2svkdA0Iqi>^<ZC)`=h;Wp_fMy#
z`g@DU-Y^b>F)fNI4wp1>ape%fCE<G9+$c-`zMx_A!qGub<HXmYaFO$FPv2hS)y}+m
zQBM-d=o4|8`D^w)P29>Y^-O;Cu9M{_<tAzb&$GI9Q(-a?DFR#eg3f(4KVQ)Zy{Qp+
z{fzIlR;J#oq7KWIzhAj8T&Yo-S{XZ>oZHXOj6^=*(yg`9PTNm?%mtjv$Er>T(4o$x
zpFFu6nl$vRrd}wu%4p#v;|udyZ_+}~gU51y$q2(f5@4-5Ue~=InjxDtEOctIbIJ6y
z0wW585n%T|gXkH~O_koRJTN$s{Foa?K|@GRC<$4Kv6SUe{~a{?>xqYQSa|qsW;1`w
z`v0|X<$+AUfBZ9ZH_OOvXo#hdGv}6TqaqcO9EA{unp-m|G*?8C+=LFHFV=`jh{6!@
zoioK;b97Ly-^aJ#zk8nN{eC^K=k>gw*XP*h*T>r*yTf}V1-ZiE^vw!i!h0&ShJj31
z+4NMLyFo}5Ym}jxnU&Q4E8}e-<IZ&^w-r-|wlbGBn7*y)B3)h?b(o?804k~kf9R$s
z3*MO--IU0l_^hQn7_W*z%)J1^x8{W%)w{%}Uhmkp_GQ1h766pv^Y^g=(%ZZOZZsFG
z5*lkr<G<|+-ObD*<U4G5w&oLso2X$0IcpW=+}O=^u`Pk=MFz58DXq0xF~BdpQ8jO;
znsE$;deip-v2rogVcmiI8QPUHBSS_Gwk3Z@UX5elYYG~coD#E3U7*(aUvttSrY5|v
zT>LQt>5<6h%XZ>vei}`g=cn&h6nx2{%bJGbC&XdFi}R;_Ee!1kG~A<DGKe(ik<LuA
z6lJwdmhyui!1|Ad!B%+BNYKpxly*!-#H~jKeB(N~@7McN2t-(KCOJ6M_FIR|<`19P
z-`-P==q`|!rPZPd{g5CQe6IeVmLm&zjN@m+>5@I@2CrH($pR_5q6>+b1FIqc`FKh(
zE^JlC?JP^Qb6@BM#+_&{yHVOfViLZ|Z}YrEhKrt8UvZ(60_MS3vtNG2{U@S7A;IQG
z0AT&v;}2=fs6r{m$fO=W-WU`9;e9o7w=##bG;6TkD>)=RQJ@Dpo`SM=G4|?%7B-j_
zaB>4!=g~l#dp#(M#z^j{kjPOQikN^`J=7jVOULL+kkD1L@QJ}fgxsAX1+cgOC{@rK
zHg*vDW#~vqi_z-aS=0E0#jXr$#i6$^xl^{tvNa=x1kXm+RLi1JczwDAAUu5ocfR_k
zt=lD*sDxmy8>UjStF+#kTIC%;OY5)Q&b7pF9$Nnr@5_k~RMZ53`57G~+i_QWIrL0y
z2Bo<nsEsh_MC#XR@b_hjr#*V@CF?h`s7S}$XBs@y;!r40mjr;|?$fS;>rToot~rgZ
zt}!2q`{YTqsG;E8LidubPcHg5T$kB9DJ>4<CgW)ndF(B8r&#AB>Z(TUGANJ}t3opl
zxCVz^GgB<L>1jiMwc;yv)30E0GgGGX?O47d1s?2G$3wL~-3j058H}SE$6<LkNe@&p
ztQotYQDGX+syBl=XBy|~&CD~^Q0SF)ap3S^WPSyJ<Jx(zy~M^+Av|{oX(xVi%wX6*
zF6&lOUQP(<TTmwIA`>@6H?-Dv-!{u90}|&I4FKTDI{}=;ufROj0n4C~uMDe4&+J|P
zVU;qDosGJ7@oG}N!q4Cp&6rPe+yDF_l3|b1WdJ}s$n^eYU2r09G#E+Lob=QA#>IR%
zQvQzr73s2Pi@jyp-%oeg@MaXMKs1!CNC5EZT{32bR92ax#$$hF3s)vfEMp7bLk{lo
zL~G~`%JQjlWyxr9cnD^+0p<CjB)hft2Rvk(I6|7qWOS^zttjEs+%3=U`7d#NDK`Z+
zIL;vSS<Ya8Y-Sq(Z1{~<*@!wN6ZkWBXXA_>)6>T+2rf@!?{u}IAD)_cX&`k|qW%@R
z)nt9~7Mt%L<eUx^D5&#n$5|Hf#Ml-(l}t7gs<iH==Q#8@ZiTVLJ70d(&MuVFb;u{M
zHOcqiFTHDG5EZf9W{v^?`OkxPK1&mWo0!)pttJxT&6KJ-k=3_6rXBc+PrU}shc{<t
zB)=;|Ns?_h&8U@}`0>m!u;?V_NJ_invv>X|Dn)a+T6}Hx&VRMBztG)dc78V3HM8;e
zkcVM5|6}e&Q5rfG%(eE^&lT{UZoleg&4Qy3M+Z^`ibR~HSE|M>&xl(md$C7+#*}b9
zXm~9)nDqowf{+V8R|f^E{-ye?{u+2=cD)v{B~v9LGPk&9pn7rbA>+h1RLV39;bO@D
z9X-=mkrGX5F(@w+^yb97WPAtYguM>y9xFm-iPOv}xfrgxx82JU8VVP0GVkoujaNOa
zcy2~VTGX@nJ`B@&S*QxfdP3LYD4FPr0D#9)zq1?GiS|aENdjXiMfrV(p2M+xovrBp
z{i>+}VS2>#)mh>lbBA5FvU2j>2py1oZaD9l9T^<&+O;Q*k4BqrAFj$me!;=v3%&GM
zy1Zq^mTK+~!#9Ra;pbT8ChB_N`{x-!T5Oz@^lab}brjJdjlp}*cmNnCFk>-Ak?0o<
zais;n^{dKa%3AWeo)ncu)@)*&p6ZHOCrMe@S%gsara%71#TUmEGhRz?mm=hD7D1|F
z(ML6{6Vl6(;xaVzt|2B}w#9|~m8*3~ab{uV6HWE0i}DYg^k>(h<4?*yz^&4xv$BvL
zJ(uZ-NgR1eiuUrh4=27y3m7leAv}VS44|8%0clMU$O}AMA{X{IvR58SEOh(d)ak0M
ze>YTi*nc~r@~9N^OI;;t>r%+tH?NfW#ZwMtsAnlc&#aHs#=lOrbd!}IVY(%`M?z&e
zjA5{a^_OS<Sjl6r7eQ8xuRW5o)~<I_Zj6sj_;DxJe|TrmI<~$pdiqe+kqu?$j#tdI
z=|M>jml)&yu1O%bpS1wvzlF9L=r43KGrL~k9$V@_nTrvRy=Fcd@l47KYRM8sq)EeU
zgxJpmd>#wxoAEp8<>qC+s(qFhw#KmRc+O)iMKd>3;K^ir7_Vg)%Yxr{P;!BR``i-h
zCN@<0XDk4o8}`wnK$V!7fQN(Iu}lkyxV-dq;)Sutmp-3ZVbgl>tjEe@jqh<|)m}LN
ze77BMtv~Ny)%h0@LT>paRF22j!Dy9HD4aUZe~NDmg-VAe1L6Ax$kP5&kdDT#Iw|N+
z9V-M{R1&fVkAN%`Kbm=>mK~|0uY@(DB=+zLVxa}D*QTFTOzIX2L(NO5-kb^C*yur>
z{NS3%{;TR*{|DFgm>Vnesb0$(FGS#Z`hR2vNj|_=OXriVN`}=UbQa?%3Z=*3RX!&P
zgr5h`;zq^3T>AK5uw}dt4jRFfQ|-YbK`lGm0qMO>Kp;9#)V5d|Vapp?{B+>>?={WP
z<+<lHuB-$95%-6PmFN>8Ljq?*cfWV1`Bgw4{5L2@M)8sbk;~1^(Rq|uJ$-|*T$^xU
zzcZgQG{RPrQ@cA^^P?khJ`RjOr<hC@DubxwuYGCn6(8kD;s+V(KPd@OJOy<V9PCJ*
z7NQDo1n#Y*OFyr&EsZZw@Mx;o3(Khvz31SL0{gb!zs>ah(mrh(k0<#6u$qQ1Lk?$)
zai@q`Vj#$pheT^EUw;|E@ibAYc~M<fTy*bOu^)3}p(2Rja0Yd%oR`35aD0zOHE+%g
zUI8-rrz_8ab$n<kf&1DXkw0!(VEGt;va~&Obj5#E)pY%80)A?MSNXam!1d%1!LZE@
zt*?eP<IlIiA_f3u?B8;-WIy?SkMV{A#F-Le#cN<}J9fy+Kq5lAN*&DhUX}Hjj4D+D
zxGGf%$H%I<=rVgN5dwYyjFQBSMU<!Zj!$%|hHRYLn|<y^q!MZ4DK*%XB{-rjK>l*M
zwp-v;;3gvCX+gpP>F6%}lNSjO4Mk{X5x8~W!2W<{>d%WxlFKW^J&U^(K_?wgPqAUO
zHB(vqSVY&Q`x3OEfdmy;4{jH3t{@mY+j8}Jf|xN_Ag`B+rK0RVk6u`?R;jW9bE8!V
zD+Bcse_q(F{&X?{4+3xC!0Ufcda-@S#=ax1!Lo=d?VVCf3mT#%iq*yw(sud)WrQ~9
zAT-u}`<Ptj9&XeYA*DxSG7}pXEb%#v09oj)unqG=Ih8-^;$8wIcdu9V%Q2+dCC~z{
z;h+VagYS}EwW#nhDLK^k0Q8dP^{)@8{vpgE#<6r)NkH-1nuum-;y9ad?D&5C9X2AZ
z=)2ji+#8{dE7gpH8tPhr)uq!Pl2#v-%*3Yd2l1It9sTHJk+MX6`k!M>f=LUIHPlHv
zA1OwzbB~gl(ry<(TZ%qU0`FSrFIOfKqK*;o!VJMq*Si!4))&~8uAu8P|LU9<ob^V-
zg@|JbN*IFgQ<T@e_7P%#C(DB}!Jk3KIeQkzyEgsxNgjbdKt{#gpvRRpVm+-dB!-WI
zP8oKXrvYugwzMZwkV<hd2K!Y|tFdE|=*poV1V~!?Y?VGGYKWruq8Tg}mwf<UKzr2@
zC)sI-^#`ev5L9#DdGjmLDS*R}m~^`gBDZ`-O7}E(Gyg^y*xZ?@tG?U!em*5!|06D>
z1Z+)nd|>GxarGVXvG{Ry5Wo*hp5fYD1&2zClkV-5w710&Ia%es<MHg6TbQQ4{e_YX
zM5!Zd6bf~FbKj1rz6Jk7Zt~*U?#zKWrc*_9+mZpjoMD7oYm#1UrZ;^Cm-G@#933SI
z^!wJXIu;+?6sU4!y@*BKK|x5C9!HmMh#E_P)-0Zz{B`jL#_uUR%0N#nRh4tXh?t7c
zwxSd6u7rg*dY=Y^7=uB)gs0<dO%s}?)K8jXJs3pD$)fYu+ty@{xJZFfKqx<)_Mi;d
zt}3>ALF41u2()c3cjA4mhtC_m`%Z%Hbi)V0k9$1uJe!j*L83L>+_&Mul1US)hWIrN
z-0bcOo0|Z=%p3!_2eJLH0#>|?&A*!>E;^SutKM8Vko|If^#gXV*$xxhesIK3>%*kq
zo;uP@yoOCLT=)MuoZ`fMQs-&9j-TrX?wzoWcAU=gtIzi(%yLA6Qbel<=p8xTVmQ{P
z7Hba0a@%b;et(v(tCJ7;WjC2`vYv4J+k*PcbVYt$hi(&sX3>?%P3AnOTR#`r+s{ja
ztLqa}-^<N$Hgq3#q%nt68i?7hCVjxY$vUL=<2=d$Z<OSAD7tiRJ!^t-E^U;!y#C<%
zex!U6#=ErOR7#m_Rt?KFaP#oW6u3y+Q&odi24t?K)whvg;zc|Z%YXK-@m@i@4Uh-O
zQ-wKZ5fwbt&&m10zZp*UZJz`9kP2%gEudu5v$7L5Mh)Na`0g#a;e+*L9ZCzeghjqP
z>a$>37EM}S4+zsH-g{r^4d89{=4$35OB(tmS~cOqjDw~^8Ad6qnl`^Rki9Bx7Emn3
ze%mwIJ)N*?D3c2(37tXEEUoflw?(HNKrgh#mi@<AN*`bH5=^V`f5QdW6G`ul83YCk
zb4s-Q8q#`~HD56YDi)EUm;U*x2EtxD0mWKb@686hg%SiWBS*u<rD&Fvo&~oL-RVq~
zcrz73L*Ud5;{@vW6NsE*z}o1m4hze=p2ukVT^5pS&1H;U95<F@*0i<pwP501(Bs=F
zLK1jM;H>>$&pHy+*kE(ljnaAydw_P5+nK}ACotejh-@ouHxj%$H88>5g&h(A(7t<;
z&1}b*6O{BxsNrK+ed0q{0tT|KH~R3!$MKf~8zrMYK*FNil_++?!MdNEp%}>GIeImn
zP}rd0mD566+K{Ig+ns;jWaP3E!BS2$DT2t=2nR{yQq30HBd+9Y71_kd?n^QSb)~?!
zf^*ZJd3LUSehNo?-e($O7Ge#>D&VGPd!G+~AM8oJSJG}^Z2Y#}fOLTNI#At@dsEg;
z;DKQZF1lP{`}R(VTDpM%kY<=LeLO;|mObfrWg6B#r2}6qp2QVgW{Bm|^<yUt43{>}
z@%5csf4A>5L`L7b<bXGj06UT+ZG(|R1(#>b-eMNg3+V@$%}KmDV&{2Qq^m^3da7$D
zdrJrU{&kOphgk-+3QJs&1W=H@>tr3;x(yyFKE-orc!v(*-h@O#-0Pyzb-NC(P#3O9
ziF60)$dO6A4%d_-)}XTG(3nVllaT(|lE)%U*~2JLrB_Gp&tK4tI%QHLcGaD3VUVOz
zWXn$a_gAnimkuoI_GMFK955JHhGcH%%Jw}ApLIeuwA5j0h8hIwfDQNrdqXr<fNl{l
z5Eq~|Og5JiUQdqmUs2w?s&CcImXCi^vsbU7y9V;8?bYTTOuu*X4$}dA)CE|YTbosy
HxZV06xm0HE

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-64.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..21445440acb8199ad2fca6c0689eeb263bee41b7
GIT binary patch
literal 2534
zcmV<C2^sc@P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x37bhoK~#90&6{g*Rn-;8e`}u`FyYY-NgZuftWXf~N!5PH17eE-TLvY$
zR{|E2V1u<|tyZhdC>&^+QA=BGJJaG6f>@IDhBzu31#JT)*jBK@h=8`XBBC=WpcC@W
zJ*yu=G9iRy@B480f66)M|6gm}b$9kzd+&9H6eC(6J<o*9b&5_Al}U<T1dIjJfzdz!
zoB%#k^td4JD0;wP-Zq|Tn3Fx{NGju#R2Yr!h+b_1bE^hA1L3L!{HTh)ZPaYRP*s#u
zv@4l$LJ||OY1gKV)|S>XLCS$El4Z9a_Mub^^M<XSoin>B83q$h!1~SWN2H&Veh<Rk
zKvoiBvcYkb-*%XeC+6qQKc0x8xD%kNQoFr&fubuBzLrQ33E&fi2a0lv)`^J5V<4^s
zRBfxeFeITTff@1WlMO|81YWRkZuZ>wT(u@1hn{$s0J-sKQvpG;y_ok#O+!uCT^lEA
z8fvDYya0@d*G4KJ$glV2?!Dg^Kd|E`fM{bhM*?{X7@3HjWJ5$MkES0jS$yr{&LO#p
zIy+lO0`TIojAOS9m4u|!0TxM6V80-*tLRPw{$tb}?@a4FmKLOGEQpQp)XNGan1C=D
zm<C*)g!ncT<raN^us1}~3ZVg$ARHiIgQ6QEQzQR#u@|k6o@YE$tY`^vWdfnC3g?CI
zKhwjcmcl(r5afe^U}-ovTpREE`4qd2H8TlV27D_Xy`terUS#7y&jw7uO}|()R)gT;
zmzGv+b9Gj|qk5b<Y~GJVA~9F(U{F=5ZLBR-)yIHLNBQSQ%#_01!vFSvFi--dz%P9X
z$W@rN#jp5VJOQT)we__Z1fif3b*w{#hN7IJsr^UfX@yY1^3oEZ0LTz{euiH%ErEEG
zj>7!H53{<mZa`V<Bvf*1x7RM{fBTdXFwMVn<ZxQv1v$UZ?Uu7~B&e#?Hq@?C^j-(q
zkx(o&@s|8sKI^%0$_N-v>%ILxJe;K?K}57Lx9~m@S>qr(x6|wVao-!g37F-VX8?Dd
zK{!H@7jN`SZ-^t-ltDx^vn%rsMR!<hkh`C2d~Q_Fb#DUNrDG9;ujkLok&vIC-xbqX
zF>usUGNxVIf6#N$n*dQMw-Ap|<b|0(UpUS&&Xl5fYVjdKme}$|Wl_)H2B5$%okDl%
zX(K<}8vFV|#~4q;rd^vdqV>`7)jO)kMPG}iCu(nR?%p-P>z4G(Hg4N^4M3>-S|Z)$
z`p^&w9@@Ih?}{Tvs_LsQ4w=v$2sgL2v`rLG@M0bSH4QZf1bJ4B{IM{*&^f`r_(61g
zbcG-<*zi?!9`L3B6!;~3Ky2#mcQ*SKld#R!Nz~QV4R0RRyb|RuVAv4!cHjxk)Q2OJ
zBONY&R8=-MY}|vzrmUiSB6*RkO~K0Y^Fi!(aYZ)Z_~9$-E3;0FJn>hQpEC4^2N(|g
zjHA5r%&X5hmAoRNC{I~&kt-|fE3*t;o!4WzC<;ta?Gn)HU8~d5ytIviWV`522ACHc
z7JIg?u5P%CuFLDH!tP6wG?SKRP^MVg-v7$O>;CN$OlC{wBfwM_O+Vx`k8EDyA}G!&
z{s`D-MHVI-kV%%d|KSoyRejaPivGw&a|ZmRwxRYCCxx)pk~z`PeO5OlRM_bfL&yvL
zknaEIL@_MT;C2^*s=jT-Lnj!83+#-F)1JE^H@onMz-%YB@{SEnkSrrGYG^8miP@H#
zMC+p?6`f$qx4>mC#gY;8sU>xk0WxfuLEu@R!5L%vuP76S7xS!b1{&BNoQ^VdpU)48
z5P=mBAP9nl_W}DO7R2mr26&cCW9V*9u(4@<_>n#;{UckhCA2wc{@9xBF~*YFYyhj_
zBBEch^*`&{SuJ2U5m{n?X?|&&HCyZwAV`w|v6?W%eNubQk)JeMqVf$Jo}z~g=(|={
zRVKRx(G~0Z1KkUoMA2qEv)V-<$aR*~4~&Xh4OJy@Drt-Ji{D51y^H1yj-PN{9;>KT
z0u<eE1hd!9tXy%EUvi#HAji^=EdiVlSNfn)vvjG8AX*<Ck22AQYt-yAs+|p3uAaI?
zid}+PeC^`S&RAy=(CDHAP;|T3;oa=ICm=>{!)|q}fdo6v7XRrZ3Ra^)R7)(4_hMfD
zyiYY#zYVOyZcb=Nd6Z11&-u<A>*^E0SKo-pZI<-ik-W$!2Ef3pb{e_z#^q(seL<1Q
zk&bX)`2Ma~*QF?rA{-ciwogPJF`k(io*I78^_vH{yz%l|6}8>4eHl*f3C560gWhAK
z64hlV#m?1Uaendpz=Obp(buBsfd*d%Xzge{?DU==0MTgFQ|#vpPrScCpW$5Km%fGV
z&ahCnd09n;Ymli#^^WRsUd-ErMW;&7ejxNY7f|f>(oT|pIn%%0Y8m}SVQ%)^_Yl4Z
zG+WSn>x$k4oRcoAL2OrinE|oNX}%wFj5DPO=Z3ec(HRWBzB$^~+P1#uqBjB0Kd`n5
z^mh*aa))uSf)q7e$BRf#q!D2jXBY`8`kMs>3wocOaylFu-u^i7iLEn%+Y0=$Rh(r>
zIO9lA4!5<mJ>K`$X@M6kFD-R$K7fjL#+GmO<2x}*6;5m15*CJY!|VHU25ga;;g>Zi
z>a>?H$c`YS#akY#I23opDL|iQ&VLr=7EK?rMFvpuVhe%KT^uQzEnVy`@Jny^eLt=q
z<iQY*hP`-BrF-TC<C#SRb*!E7e|N_6lCY{oT^)8qUq`$Zo0qMrBaVWpFMQuOf9HcD
z(B;5If`0d9f8EwZZ1%;VlUIRX_AA_aaQb7fpcOGp^(+2br){zVf6;iA*nCl$5A@yO
zXh~)g22DVB_76S{%uCRZ0{cL>g4wI+yJF;METG9l3@`>_V?f4(Tn~C3aOoiSl9q%a
zUtix`U7nWtap$uFHzn#U$w*2PhMcV4So~yX2V-Z0^Q$q{$Vf)xmP-L6GyKxW6z)sJ
zVG5AYNN}#;3YM1@qPhn7Qalb*gt(L7{J!42Y;A1}nF2JpYEy`9LCEd!wg-vS@N(nw
z(gmVC2ArFKokZ}Vz>=5!ia*C|!1fGnK)kng_nr%<UHzvJ(h6Kf_wRwf2pkb%<>=8T
z=0Cq=!@m+Sl(bdcH2=<#=g?BFNEzUCh~j|VAgf1@ZhETb-kR2A7);4BcIJvj*Ju#T
zQ<zS7%UZl^g8<}BV6$g}>bj-t-b!AS-AMU5ewJUJ)k#Ml$YlzX1SSAu6uwON&+QCI
w6KInlhZH@C$N`02!!@*XlmDb`vqN0?KO)hHGlEV{y#N3J07*qoM6N<$f{!NG{r~^~

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext.svg b/srcpkgs/void-artwork/files/icons/void-logo-notext.svg
new file mode 100644
index 000000000000..772d80a775fd
--- /dev/null
+++ b/srcpkgs/void-artwork/files/icons/void-logo-notext.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="210.46875" height="210.46875" viewBox="0 0 210.46875 210.46875" version="1.1">
+<g id="surface2">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 105.234375 0 C 83.203125 0.046875 61.742188 7.007812 43.875 19.898438 L 67.777344 43.804688 C 79.054688 36.902344 92.015625 33.242188 105.234375 33.21875 C 145.007812 33.21875 177.25 65.460938 177.25 105.234375 C 177.21875 118.449219 173.550781 131.402344 166.648438 142.671875 L 190.597656 166.621094 C 203.484375 148.742188 210.4375 127.273438 210.46875 105.234375 C 210.46875 47.117188 163.355469 0 105.234375 0 Z M 105.234375 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.843139%,50.196081%,38.039216%);fill-opacity:1;" d="M 166.59375 190.570312 L 142.691406 166.667969 C 131.414062 173.566406 118.457031 177.226562 105.234375 177.25 C 65.464844 177.25 33.222656 145.007812 33.222656 105.234375 C 33.253906 92.019531 36.921875 79.066406 43.824219 67.796875 L 19.875 43.851562 C 6.984375 61.726562 0.0351562 83.195312 0 105.234375 C 0 163.355469 47.117188 210.46875 105.234375 210.46875 C 127.265625 210.421875 148.730469 203.460938 166.59375 190.570312 Z M 166.59375 190.570312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 138.722656 105.234375 C 138.722656 123.738281 123.722656 138.738281 105.21875 138.738281 C 86.714844 138.738281 71.714844 123.738281 71.714844 105.234375 C 71.714844 86.730469 86.714844 71.730469 105.21875 71.730469 C 123.722656 71.730469 138.722656 86.730469 138.722656 105.234375 Z M 138.722656 105.234375 "/>
+</g>
+</svg>
diff --git a/srcpkgs/void-artwork/files/icons/void-logo.svg b/srcpkgs/void-artwork/files/icons/void-logo.svg
new file mode 100644
index 000000000000..5c1130adf9aa
--- /dev/null
+++ b/srcpkgs/void-artwork/files/icons/void-logo.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256" viewBox="0 0 256 256" version="1.1">
+<g id="surface1">
+<path style="fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 128.01879 0.000438608 C 105.983867 0.0479021 84.522461 7.009213 66.656415 19.899504 L 90.56219 43.801324 C 101.838723 36.903298 114.796254 33.244654 128.01879 33.220922 C 167.789234 33.220922 200.032761 65.464449 200.032761 105.234894 C 200.001119 118.449519 196.330609 131.403095 189.428628 142.671717 L 213.377911 166.621 C 226.268202 148.743088 233.217647 127.273772 233.253245 105.234894 C 233.253245 47.115857 186.137826 0.000438608 128.01879 0.000438608 Z M 128.01879 0.000438608 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(27.843139%,50.196081%,38.039216%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 189.377209 190.570283 L 165.471434 166.668464 C 154.194901 173.56649 141.23737 177.225134 128.01879 177.248865 C 88.24439 177.248865 56.000863 145.005338 56.000863 105.234894 C 56.032505 92.020269 59.703014 79.066693 66.604996 67.798071 L 42.655713 43.848787 C 29.765422 61.7267 22.815977 83.196016 22.780379 105.234894 C 22.780379 163.35393 69.895798 210.469349 128.01879 210.469349 C 150.049757 210.421886 171.511162 203.460575 189.377209 190.570283 Z M 189.377209 190.570283 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 161.504278 105.234894 C 161.504278 123.737742 146.501861 138.740158 127.999013 138.740158 C 109.496165 138.740158 94.497704 123.737742 94.497704 105.234894 C 94.497704 86.732046 109.496165 71.729629 127.999013 71.729629 C 146.501861 71.729629 161.504278 86.732046 161.504278 105.234894 Z M 161.504278 105.234894 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 30.592077 124.809626 C 29.445043 125.628371 28.400847 126.039721 27.455532 126.039721 L 23.397404 126.039721 C 22.823887 126.039721 22.372984 125.936884 22.04865 125.731208 C 21.720361 125.529489 21.451401 125.220976 21.245726 124.809626 L 0.468586 86.202037 C 0.385525 86.122931 0.345972 86.020093 0.345972 85.897479 L 0.345972 85.525682 C 0.345972 85.118287 0.488363 84.789998 0.777099 84.54477 C 1.105388 84.256034 1.61562 84.113643 2.311751 84.113643 L 27.578146 84.113643 C 28.930856 84.113643 29.812885 84.521038 30.224235 85.343739 L 43.011689 109.993108 L 78.850575 85.343739 C 80.041118 84.521038 81.290989 84.113643 82.60019 84.113643 L 86.595034 84.113643 C 87.128998 84.113643 87.397958 84.339095 87.397958 84.789998 C 87.397958 85.15784 87.069668 85.608743 86.41309 86.142707 Z M 30.592077 124.809626 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 86.353761 126.039721 C 84.221859 126.039721 82.335186 125.711432 80.697696 125.054854 C 79.05625 124.358723 77.683764 123.417364 76.576283 122.226821 C 75.472757 121.040234 74.63028 119.647972 74.056763 118.046079 C 73.483246 116.408589 73.198465 114.64453 73.198465 112.761811 C 73.198465 110.341174 73.60586 107.964044 74.42856 105.630423 C 75.247306 103.292846 76.374563 101.058107 77.806378 98.930161 C 79.281702 96.798259 81.006208 94.828525 82.971988 93.028868 C 84.981275 91.225255 87.15273 89.666871 89.490306 88.353715 C 91.86348 87.044513 94.367179 86.020093 96.989537 85.280454 C 99.611894 84.501262 102.297536 84.113643 105.042508 84.113643 L 135.165999 84.113643 C 137.337454 84.113643 139.243904 84.441932 140.881394 85.098511 C 142.562392 85.751134 143.954654 86.672716 145.062136 87.863259 C 146.169617 89.010293 147.008139 90.382779 147.581656 91.980716 C 148.159128 93.578653 148.443909 95.322936 148.443909 97.205654 C 148.443909 99.626292 148.012782 102.023198 147.154484 104.400328 C 146.331784 106.737904 145.18475 108.968688 143.709426 111.100589 C 142.234103 113.232491 140.493775 115.222002 138.484488 117.065167 C 136.4752 118.86878 134.283969 120.446941 131.90684 121.79965 C 129.52971 123.108851 127.029967 124.153048 124.407609 124.93224 C 121.785252 125.671879 119.139163 126.039721 116.477252 126.039721 Z M 123.363413 100.89594 C 124.716122 98.028355 125.392477 95.876677 125.392477 94.440906 C 125.392477 93.254319 124.96135 92.431619 124.099097 91.980716 C 123.280352 91.529813 122.050256 91.304361 120.412766 91.304361 L 112.051282 91.304361 C 110.86074 91.304361 109.753259 91.470483 108.728838 91.798772 C 107.747926 92.083553 106.826344 92.597741 105.964091 93.333425 C 105.101837 94.073064 104.263316 95.053976 103.444571 96.284072 C 102.665378 97.514167 101.86641 99.052775 101.047665 100.89594 L 98.093063 107.596202 C 96.538634 111.080813 95.759441 113.70317 95.759441 115.46723 C 95.759441 116.653817 96.107507 117.51607 96.803638 118.046079 C 97.499769 118.540491 98.504413 118.785719 99.817569 118.785719 L 108.238382 118.785719 C 109.508031 118.785719 110.678797 118.59982 111.74277 118.231978 C 112.806743 117.820628 113.831163 117.187781 114.81603 116.325528 C 115.800898 115.46723 116.742257 114.320196 117.644063 112.884425 C 118.545869 111.448655 119.467452 109.688551 120.412766 107.596202 Z M 123.363413 100.89594 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 144.120777 126.039721 C 143.385093 126.039721 143.017251 125.794493 143.017251 125.304037 C 143.017251 125.054854 143.07658 124.750296 143.199194 124.378499 L 160.475902 85.711581 C 160.966358 84.647608 161.74555 84.113643 162.813479 84.113643 L 183.958461 84.113643 C 184.737653 84.113643 185.129227 84.378648 185.129227 84.912612 C 185.129227 85.15784 185.046166 85.422844 184.880044 85.711581 L 167.66662 124.378499 C 167.176164 125.48598 166.396972 126.039721 165.332999 126.039721 Z M 144.120777 126.039721 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 174.347105 126.039721 C 173.611421 126.039721 173.243579 125.794493 173.243579 125.304037 C 173.243579 125.054854 173.302909 124.750296 173.425523 124.378499 L 190.702231 85.711581 C 191.192687 84.647608 191.971879 84.113643 193.035852 84.113643 L 242.465116 84.113643 C 244.597017 84.113643 246.479736 84.441932 248.121181 85.098511 C 249.758671 85.751134 251.131157 86.672716 252.238638 87.863259 C 253.34612 89.010293 254.184641 90.382779 254.762114 91.980716 C 255.335631 93.578653 255.620412 95.322936 255.620412 97.205654 C 255.620412 99.709353 255.189285 102.165589 254.330987 104.586226 C 253.468734 106.963356 252.282147 109.213916 250.763315 111.345817 C 249.287992 113.477719 247.527888 115.443498 245.479047 117.247111 C 243.46976 119.050723 241.274574 120.609107 238.897444 121.922264 C 236.563823 123.191912 234.103632 124.196556 231.520828 124.93224 C 228.941978 125.671879 226.359174 126.039721 223.776369 126.039721 Z M 227.834497 100.89594 C 229.143698 97.945294 229.800276 95.793616 229.800276 94.440906 C 229.800276 93.254319 229.392881 92.431619 228.570181 91.980716 C 227.751436 91.529813 226.564849 91.304361 225.006464 91.304361 L 212.527523 91.304361 L 200.35314 118.785719 L 212.772751 118.785719 C 214.002847 118.785719 215.149881 118.59982 216.213854 118.231978 C 217.281782 117.820628 218.282471 117.187781 219.227785 116.325528 C 220.208697 115.423722 221.154012 114.276688 222.055818 112.884425 C 222.997177 111.448655 223.938536 109.688551 224.88385 107.596202 Z M 227.834497 100.89594 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 128.035156 24.070312 C 106.273438 24.117188 85.078125 30.992188 67.433594 43.722656 L 91.042969 67.328125 C 102.179688 60.515625 114.976562 56.902344 128.035156 56.878906 C 167.3125 56.878906 199.15625 88.722656 199.15625 128 C 199.125 141.050781 195.5 153.84375 188.683594 164.972656 L 212.335938 188.625 C 225.066406 170.96875 231.929688 149.765625 231.964844 128 C 231.964844 70.601562 185.433594 24.070312 128.035156 24.070312 Z M 128.035156 24.070312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.843139%,50.196081%,38.039216%);fill-opacity:1;" d="M 188.632812 212.277344 L 165.023438 188.671875 C 153.886719 195.484375 141.089844 199.097656 128.035156 199.121094 C 88.753906 199.121094 56.910156 167.277344 56.910156 128 C 56.941406 114.949219 60.566406 102.15625 67.382812 91.027344 L 43.730469 67.375 C 31 85.03125 24.136719 106.234375 24.101562 128 C 24.101562 185.398438 70.632812 231.929688 128.035156 231.929688 C 149.792969 231.882812 170.988281 225.007812 188.632812 212.277344 Z M 188.632812 212.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 161.105469 128 C 161.105469 146.273438 146.289062 161.089844 128.015625 161.089844 C 109.742188 161.089844 94.929688 146.273438 94.929688 128 C 94.929688 109.726562 109.742188 94.910156 128.015625 94.910156 C 146.289062 94.910156 161.105469 109.726562 161.105469 128 Z M 161.105469 128 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 31.816406 147.332031 C 30.683594 148.140625 29.652344 148.546875 28.71875 148.546875 L 24.710938 148.546875 C 24.144531 148.546875 23.699219 148.445312 23.378906 148.242188 C 23.054688 148.042969 22.789062 147.738281 22.585938 147.332031 L 2.066406 109.203125 C 1.984375 109.125 1.945312 109.023438 1.945312 108.902344 L 1.945312 108.535156 C 1.945312 108.132812 2.085938 107.808594 2.371094 107.566406 C 2.695312 107.28125 3.199219 107.140625 3.886719 107.140625 L 28.839844 107.140625 C 30.175781 107.140625 31.046875 107.542969 31.453125 108.355469 L 44.082031 132.699219 L 79.476562 108.355469 C 80.652344 107.542969 81.886719 107.140625 83.179688 107.140625 L 87.125 107.140625 C 87.652344 107.140625 87.917969 107.363281 87.917969 107.808594 C 87.917969 108.171875 87.59375 108.617188 86.945312 109.144531 Z M 31.816406 147.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 86.886719 148.546875 C 84.78125 148.546875 82.917969 148.222656 81.300781 147.574219 C 79.679688 146.886719 78.324219 145.957031 77.230469 144.78125 C 76.140625 143.609375 75.308594 142.234375 74.742188 140.652344 C 74.175781 139.035156 73.894531 137.292969 73.894531 135.433594 C 73.894531 133.042969 74.296875 130.695312 75.109375 128.390625 C 75.917969 126.082031 77.03125 123.875 78.445312 121.773438 C 79.902344 119.667969 81.605469 117.722656 83.546875 115.945312 C 85.53125 114.164062 87.675781 112.625 89.984375 111.328125 C 92.328125 110.035156 94.800781 109.023438 97.390625 108.292969 C 99.980469 107.523438 102.632812 107.140625 105.34375 107.140625 L 135.09375 107.140625 C 137.238281 107.140625 139.121094 107.464844 140.738281 108.113281 C 142.398438 108.757812 143.773438 109.667969 144.867188 110.84375 C 145.960938 111.976562 146.789062 113.332031 147.355469 114.910156 C 147.925781 116.488281 148.207031 118.210938 148.207031 120.070312 C 148.207031 122.460938 147.78125 124.828125 146.933594 127.175781 C 146.121094 129.484375 144.988281 131.6875 143.53125 133.792969 C 142.074219 135.898438 140.355469 137.863281 138.371094 139.683594 C 136.386719 141.464844 134.222656 143.023438 131.875 144.359375 C 129.527344 145.652344 127.058594 146.683594 124.46875 147.453125 C 121.878906 148.183594 119.265625 148.546875 116.636719 148.546875 Z M 123.4375 123.714844 C 124.773438 120.882812 125.441406 118.757812 125.441406 117.339844 C 125.441406 116.167969 125.015625 115.355469 124.164062 114.910156 C 123.355469 114.464844 122.140625 114.242188 120.523438 114.242188 L 112.265625 114.242188 C 111.089844 114.242188 109.996094 114.40625 108.984375 114.730469 C 108.015625 115.011719 107.105469 115.519531 106.253906 116.246094 C 105.402344 116.976562 104.574219 117.945312 103.765625 119.160156 C 102.996094 120.375 102.207031 121.894531 101.398438 123.714844 L 98.480469 130.332031 C 96.945312 133.773438 96.175781 136.363281 96.175781 138.105469 C 96.175781 139.277344 96.519531 140.128906 97.207031 140.652344 C 97.894531 141.140625 98.886719 141.382812 100.183594 141.382812 L 108.5 141.382812 C 109.753906 141.382812 110.910156 141.199219 111.960938 140.835938 C 113.011719 140.429688 114.023438 139.804688 114.996094 138.953125 C 115.96875 138.105469 116.898438 136.972656 117.789062 135.554688 C 118.679688 134.136719 119.589844 132.398438 120.523438 130.332031 Z M 123.4375 123.714844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 143.9375 148.546875 C 143.210938 148.546875 142.847656 148.304688 142.847656 147.820312 C 142.847656 147.574219 142.90625 147.273438 143.027344 146.90625 L 160.089844 108.71875 C 160.574219 107.667969 161.34375 107.140625 162.398438 107.140625 L 183.28125 107.140625 C 184.050781 107.140625 184.4375 107.402344 184.4375 107.929688 C 184.4375 108.171875 184.355469 108.433594 184.191406 108.71875 L 167.191406 146.90625 C 166.707031 148 165.9375 148.546875 164.886719 148.546875 Z M 143.9375 148.546875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 173.789062 148.546875 C 173.0625 148.546875 172.699219 148.304688 172.699219 147.820312 C 172.699219 147.574219 172.757812 147.273438 172.878906 146.90625 L 189.941406 108.71875 C 190.425781 107.667969 191.195312 107.140625 192.246094 107.140625 L 241.0625 107.140625 C 243.167969 107.140625 245.027344 107.464844 246.648438 108.113281 C 248.265625 108.757812 249.621094 109.667969 250.714844 110.84375 C 251.808594 111.976562 252.636719 113.332031 253.207031 114.910156 C 253.773438 116.488281 254.054688 118.210938 254.054688 120.070312 C 254.054688 122.542969 253.628906 124.96875 252.78125 127.359375 C 251.929688 129.707031 250.757812 131.929688 249.257812 134.035156 C 247.800781 136.140625 246.0625 138.082031 244.039062 139.863281 C 242.054688 141.644531 239.886719 143.183594 237.539062 144.480469 C 235.234375 145.734375 232.804688 146.726562 230.253906 147.453125 C 227.707031 148.183594 225.15625 148.546875 222.605469 148.546875 Z M 226.613281 123.714844 C 227.90625 120.800781 228.554688 118.675781 228.554688 117.339844 C 228.554688 116.167969 228.152344 115.355469 227.339844 114.910156 C 226.53125 114.464844 225.359375 114.242188 223.820312 114.242188 L 211.496094 114.242188 L 199.472656 141.382812 L 211.738281 141.382812 C 212.953125 141.382812 214.085938 141.199219 215.136719 140.835938 C 216.191406 140.429688 217.179688 139.804688 218.113281 138.953125 C 219.082031 138.0625 220.015625 136.929688 220.90625 135.554688 C 221.835938 134.136719 222.765625 132.398438 223.699219 130.332031 Z M 226.613281 123.714844 "/>
+</g>
+</svg>
diff --git a/srcpkgs/void-artwork/files/void-logo.svg b/srcpkgs/void-artwork/files/void-logo.svg
new file mode 100644
index 000000000000..35e8a7c2c2af
--- /dev/null
+++ b/srcpkgs/void-artwork/files/void-logo.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="256"
+   height="256"
+   viewBox="0 0 252.06154 252.06153"
+   version="1.1"
+   preserveAspectRatio="xMidYMid"
+   id="voidlogo"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#logo"
+     id="border"
+     style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     width="100%"
+     height="100%" />
+  <g
+     id="logo"
+     transform="matrix(0.97240747,0,0,0.97240747,1.5789588,23.699565)"
+     style="display:inline">
+    <g
+       id="circlearcs"
+       style="display:inline">
+      <path
+         id="toparc"
+         fill="#abc2ab"
+         d="M 128.01682,0 C 105.98494,0.04678314 84.523372,7.0072685 66.657757,19.900168 l 23.902685,23.902684 c 11.277448,-6.898594 24.236288,-10.559734 37.456378,-10.582214 39.77241,-7.9e-5 72.01434,32.241846 72.01426,72.014262 -0.0318,13.21538 -3.69956,26.16719 -10.60151,37.43708 l 23.94799,23.94799 c 12.8888,-17.87595 19.8404,-39.34715 19.87417,-61.38507 C 233.25173,47.115274 186.13644,0 128.01682,0 Z" />
+      <path
+         id="bottomarc"
+         fill="#478061"
+         d="m 189.37588,190.56963 -23.90269,-23.90268 c -11.27745,6.89859 -24.23629,10.55974 -37.45637,10.58221 -39.772417,8e-5 -72.014343,-32.24185 -72.014264,-72.01426 0.03183,-13.215382 3.699547,-26.167196 10.60151,-37.437081 L 42.656067,43.849832 C 29.76725,61.725769 22.815686,83.196977 22.781918,105.2349 c 0,58.11962 47.115274,105.2349 105.234902,105.2349 22.03188,-0.0468 43.49344,-7.00726 61.35906,-19.90017 z" />
+      <circle
+         id="circle"
+         fill="#abc2ab"
+         cx="128"
+         cy="105.2349"
+         r="33.503357" />
+    </g>
+    <g
+       id="letters"
+       style="display:inline">
+      <path
+         id="letterv"
+         fill="#000000"
+         d="m 30.591915,124.81039 c -1.147564,0.81968 -2.192665,1.22952 -3.135303,1.22952 h -4.057453 c -0.573782,0 -1.024609,-0.10245 -1.352481,-0.30737 -0.327871,-0.20493 -0.59427,-0.51231 -0.799195,-0.92215 L 0.46842244,86.203138 C 0.38645233,86.121168 0.34546728,86.01871 0.34546728,85.895763 v -0.368865 c 0,-0.409842 0.14344762,-0.737718 0.43034287,-0.983628 C 1.1036817,84.256383 1.615986,84.11294 2.3127229,84.11294 H 27.579567 c 1.35248,0 2.233641,0.409841 2.643482,1.229525 L 43.010172,109.99455 78.85096,85.342465 c 1.188548,-0.819684 2.438574,-1.229525 3.750078,-1.229525 h 3.995963 c 0.532806,0 0.799208,0.225413 0.799208,0.67624 0,0.368856 -0.327871,0.819683 -0.983614,1.35248 z" />
+      <path
+         id="lettero"
+         fill="#000000"
+         d="m 86.35303,126.03991 c -2.131187,0 -4.016463,-0.32787 -5.65583,-0.98362 -1.639384,-0.69673 -3.012366,-1.63937 -4.118944,-2.82792 -1.106579,-1.18855 -1.946755,-2.58201 -2.520528,-4.18039 -0.573773,-1.63938 -0.860659,-3.40171 -0.860659,-5.287 0,-2.41807 0.409842,-4.79516 1.229525,-7.13126 0.819683,-2.33611 1.946754,-4.56976 3.381213,-6.70095 1.475427,-2.131187 3.196763,-4.098434 5.16401,-5.901741 2.008232,-1.803315 4.180404,-3.360721 6.516517,-4.672216 2.377097,-1.311495 4.877141,-2.336103 7.500131,-3.073825 2.623008,-0.778698 5.307485,-1.168047 8.053425,-1.168047 h 30.12348 c 2.17218,0 4.07795,0.327871 5.71734,0.983614 1.68035,0.655752 3.07381,1.577903 4.18039,2.766451 1.10658,1.147555 1.94676,2.520527 2.52053,4.118918 0.57379,1.59839 0.86069,3.340224 0.86069,5.2255 0,2.418083 -0.43034,4.815666 -1.29101,7.192756 -0.8197,2.33611 -1.96726,4.56976 -3.44269,6.70094 -1.47544,2.13118 -3.21728,4.11893 -5.22551,5.96323 -2.00823,1.80331 -4.2009,3.3812 -6.57799,4.73368 -2.37708,1.3115 -4.87713,2.35661 -7.50013,3.13531 -2.62299,0.73772 -5.26649,1.10657 -7.93048,1.10657 z m 37.00886,-25.1439 c 1.35249,-2.868898 2.02874,-5.020573 2.02874,-6.455023 0,-1.188549 -0.43035,-2.008237 -1.29103,-2.459063 -0.81969,-0.450827 -2.04921,-0.67624 -3.68858,-0.67624 h -8.36081 c -1.18854,0 -2.29512,0.163935 -3.31974,0.491807 -0.98363,0.286895 -1.90577,0.7992 -2.76644,1.536913 -0.86067,0.737722 -1.70084,1.72135 -2.52053,2.950883 -0.77869,1.229526 -1.57788,2.766434 -2.39757,4.610723 l -2.950895,6.70095 c -1.557397,3.48367 -2.336095,6.10667 -2.336095,7.869 0,1.18854 0.348364,2.04921 1.045092,2.582 0.696746,0.49181 1.700862,0.73772 3.012348,0.73772 h 8.42229 c 1.27052,0 2.43858,-0.18443 3.50417,-0.55328 1.0656,-0.40985 2.09021,-1.04511 3.07383,-1.90578 0.98362,-0.86067 1.92626,-2.00823 2.82791,-3.44268 0.90166,-1.43445 1.8238,-3.19678 2.76644,-5.28698 z" />
+      <path
+         id="letteri"
+         fill="#000000"
+         d="m 144.12269,126.03991 c -0.73771,0 -1.10657,-0.2459 -1.10657,-0.73771 0,-0.2459 0.0615,-0.55329 0.18444,-0.92215 l 17.27487,-38.668719 c 0.49183,-1.065594 1.27053,-1.59839 2.33613,-1.59839 h 21.14791 c 0.7787,0 1.16805,0.266394 1.16805,0.799182 0,0.24591 -0.082,0.512313 -0.24589,0.799208 L 167.6682,124.38005 c -0.49182,1.10658 -1.27052,1.65986 -2.33612,1.65986 z" />
+      <path
+         id="letterd"
+         fill="#000000"
+         d="m 174.34897,126.03991 c -0.73772,0 -1.10657,-0.2459 -1.10657,-0.73771 0,-0.2459 0.0615,-0.55329 0.18443,-0.92215 l 17.27488,-38.668719 c 0.49182,-1.065594 1.27053,-1.59839 2.33612,-1.59839 h 49.42712 c 2.13119,0 4.01646,0.327871 5.65583,0.983614 1.63937,0.655752 3.01234,1.577903 4.11892,2.766451 1.10657,1.147555 1.94676,2.520527 2.52055,4.118918 0.57377,1.59839 0.86066,3.340224 0.86066,5.2255 0,2.500053 -0.43033,4.959116 -1.291,7.377186 -0.86067,2.37709 -2.04922,4.63123 -3.56565,6.76242 -1.47543,2.13118 -3.23775,4.09843 -5.28696,5.90174 -2.00824,1.80331 -4.2009,3.36072 -6.578,4.67221 -2.33611,1.27052 -4.79517,2.27464 -7.37717,3.01235 -2.58203,0.73772 -5.16404,1.10658 -7.74605,1.10658 z m 53.48456,-25.1439 c 1.3115,-2.950868 1.96725,-5.102543 1.96725,-6.455023 0,-1.188549 -0.40984,-2.008237 -1.22952,-2.459063 -0.81969,-0.450827 -2.00824,-0.67624 -3.56565,-0.67624 h -12.47973 l -12.17235,27.479996 h 12.41826 c 1.22953,0 2.37709,-0.18443 3.44269,-0.55328 1.06559,-0.40985 2.06971,-1.0451 3.01234,-1.90578 0.98363,-0.90166 1.92627,-2.04921 2.82792,-3.44268 0.94264,-1.43445 1.88528,-3.19678 2.82791,-5.28698 z" />
+    </g>
+  </g>
+</svg>
diff --git a/srcpkgs/void-artwork/template b/srcpkgs/void-artwork/template
index d02a5a0fa3b1..6685641fe4e2 100644
--- a/srcpkgs/void-artwork/template
+++ b/srcpkgs/void-artwork/template
@@ -1,10 +1,10 @@
 # Template file for 'void-artwork'
 pkgname=void-artwork
-version=20170517
-revision=3
+version=20220303
+revision=1
 short_desc="Void Linux artwork"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="custom:Public Domain"
+license="custom:Public Domain" #no vlicense check
 homepage="http://www.voidlinux.org"
 
 do_install() {
@@ -12,4 +12,11 @@ do_install() {
 	vinstall ${FILESDIR}/splashwhite.png 644 usr/share/void-artwork
 	vinstall ${FILESDIR}/void-logo.png 644 usr/share/void-artwork
 	vinstall ${FILESDIR}/void-transparent.png 644 usr/share/void-artwork
+	vinstall ${FILESDIR}/void-logo.svg 644 usr/share/void-artwork
+	for size in 16 22 32 48 64 128 256 512; do
+		vinstall ${FILESDIR}/icons/void-logo-${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps void-logo.png
+		vinstall ${FILESDIR}/icons/void-logo-notext-${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps void-logo-notext.png
+	done
+	vinstall ${FILESDIR}/icons/void-logo.svg 644 usr/share/icons/hicolor/scalable/apps
+	vinstall ${FILESDIR}/icons/void-logo-notext.svg 644 usr/share/icons/hicolor/scalable/apps
 }

From 936267a31604138a5bdb15669e9104a2040a1f77 Mon Sep 17 00:00:00 2001
From: David Wildasin <dragonmaus@posteo.net>
Date: Sun, 13 Feb 2022 23:05:53 -0500
Subject: [PATCH 0232/2561] runit-void: Standardise/improve os-release

---
 srcpkgs/runit-void/files/os-release | 9 +++++++--
 srcpkgs/runit-void/template         | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e6..e652642b5571 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,9 @@
-NAME="void"
+NAME="Void"
 ID="void"
+PRETTY_NAME="Void Linux"
+HOME_URL="https://voidlinux.org/"
+DOCUMENTATION_URL="https://docs.voidlinux.org/"
+LOGO="void-logo"
+ANSI_COLOR="0;38;2;71;128;97"
+
 DISTRIB_ID="void"
-PRETTY_NAME="void"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 0c98cadc9e18..a0aef0484c0b 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20210314
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
@@ -32,10 +32,12 @@ post_install() {
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/
+	vmkdir usr/lib
+	vinstall ${FILESDIR}/os-release 644 /usr/lib/
+	ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release
 	# Enable services at post-install time instead.
 	rm -f ${DESTDIR}/etc/runit/runsvdir/current
 	rm -rf ${DESTDIR}/etc/runit/runsvdir/default

From c869a8955f9d6d7c6a38f98e12fc27dfba75d009 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 09:58:36 +0100
Subject: [PATCH 0233/2561] gjs: ignore development versions in update-check

---
 srcpkgs/gjs/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/gjs/update

diff --git a/srcpkgs/gjs/update b/srcpkgs/gjs/update
new file mode 100644
index 000000000000..12132d5fa5b4
--- /dev/null
+++ b/srcpkgs/gjs/update
@@ -0,0 +1 @@
+pattern="gjs-[0-9]+\.[0-9]*[02468]\.[0-9]+"

From 2c17243be6a3ddd874e22baa16f6f0ce0fa7ef2d Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Fri, 11 Mar 2022 16:07:49 +0100
Subject: [PATCH 0234/2561] zellij: update to 0.26.0

---
 srcpkgs/zellij/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 2be522145138..e2ada810e570 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,6 +1,6 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.25.0
+version=0.26.0
 revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://zellij.dev"
 changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz"
-checksum=5bd4e6a726cf32e096f9c90d7dc414e63dee0613a56f5b665f4bfc6376dcf20a
+checksum=f0b0cfe7b72ce842de80d5c32cc2abe624b3286fab16f313a4e43e226e95e87b
 
 post_build() {
 	ZELLIJ="target/${RUST_TARGET}/release/zellij"

From 6270aa2a99669735ace0cb9829e04dc99e49d5ac Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 15 Mar 2022 01:12:19 +0700
Subject: [PATCH 0235/2561] Converseen: update 0.9.9.5

---
 srcpkgs/Converseen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template
index b457a0b6b8fa..bb8790332271 100644
--- a/srcpkgs/Converseen/template
+++ b/srcpkgs/Converseen/template
@@ -1,6 +1,6 @@
 # Template file for 'Converseen'
 pkgname=Converseen
-version=0.9.9.4
+version=0.9.9.5
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ 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=c96642b0120ba8aabe02d52210f1c8ff921d97a57851d44561b89d10bc569a88
+checksum=30d731968e61ab3fb701976f05b2f5b372e9760c05665d6183921fb94f8cfa44

From 91856677ebeaaa0c5983ba574876cf5ae2d74700 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 17:32:36 +0100
Subject: [PATCH 0236/2561] New package: python3-listparser-0.18

---
 srcpkgs/python3-listparser/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-listparser/template

diff --git a/srcpkgs/python3-listparser/template b/srcpkgs/python3-listparser/template
new file mode 100644
index 000000000000..dfe7ba100839
--- /dev/null
+++ b/srcpkgs/python3-listparser/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-listparser'
+pkgname=python3-listparser
+version=0.18
+revision=1
+wrksrc="listparser-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Parse subscription lists in Python"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/kurtmckee/listparser"
+changelog="https://raw.githubusercontent.com/kurtmckee/listparser/develop/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/l/listparser/listparser-${version}.tar.gz"
+checksum=4be0cc459b9f3d9f24726f0f448ac67ff8d4c87a7010453dca817b556bd0b841

From 16c235b76737130ff9034d18e5fa7ac14c8b2133 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 3 Oct 2021 01:08:10 +0200
Subject: [PATCH 0237/2561] New package: gfeeds-0.16.2

---
 srcpkgs/gfeeds/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/gfeeds/template

diff --git a/srcpkgs/gfeeds/template b/srcpkgs/gfeeds/template
new file mode 100644
index 000000000000..b6ae09f74fc5
--- /dev/null
+++ b/srcpkgs/gfeeds/template
@@ -0,0 +1,16 @@
+# Template file for 'gfeeds'
+pkgname=gfeeds
+version=0.16.2
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gobject-introspection glib-devel gettext"
+makedepends="libglib-devel gtk+3-devel libhandy1-devel"
+depends="python3-gobject python3-feedparser python3-readability-lxml
+ python3-listparser python3-pytz python3-dateutil python3-requests
+ python3-html5lib gtk+3 webkit2gtk libhandy1"
+short_desc="RSS/Atom feed reader for GNOME"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://gfeeds.gabmus.org/"
+distfiles="https://gitlab.gnome.org/World/gfeeds/-/archive/$version/gfeeds-$version.tar.gz"
+checksum=f061e89a1962a5ac544ea98239c2503af8da817ded0a5bfd8094ddf43e9dd00e

From f8cc56325462bb4e434325cfdcaf755e169e1c26 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 14 Mar 2022 18:53:16 -0500
Subject: [PATCH 0238/2561] ghostwriter: update to 2.1.2.

---
 srcpkgs/ghostwriter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
index 71f5f14aad66..86e4b10c4533 100644
--- a/srcpkgs/ghostwriter/template
+++ b/srcpkgs/ghostwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'ghostwriter'
 pkgname=ghostwriter
-version=2.1.1
+version=2.1.2
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://wereturtle.github.io/ghostwriter"
 distfiles="https://github.com/wereturtle/ghostwriter/archive/${version}.tar.gz"
-checksum=a9add6202dc1c9bb3f591fd4ec5d70e0fbd49d55f4921dc217923debc4d02f06
+checksum=65aa523a9c3d4f4c68f2cb6f5ab600cf24c98b4f0673a622d757a8e28eab120f
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5tel*) broken="qtwebengine not built for this platform";;

From e7845b22339734a76cf4f14aa40dabeb75de1800 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:21:55 +0100
Subject: [PATCH 0239/2561] libhandy: fix checksum

---
 srcpkgs/libhandy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template
index 796cd46e7359..5a46045b7173 100644
--- a/srcpkgs/libhandy/template
+++ b/srcpkgs/libhandy/template
@@ -12,11 +12,11 @@ hostmakedepends="glib-devel pkg-config $(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"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy"
 distfiles="https://gitlab.gnome.org/GNOME/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz"
-checksum=645355a009f23f254eaec7752b9489c3c2f5832397fcec75433a7e00efbfe52f
+checksum=138bec94e66d15a7a19350b65845d4529bcd969ea913ab3eb438f56fe47d5d37
 
 build_options="gir glade"
 desc_option_glade="Generate glade modules and catalog files"

From ed3d84fb944857f67490fec6a87c1b672ec386f1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 15 Mar 2022 14:21:19 -0500
Subject: [PATCH 0240/2561] melonDS: update to 0.9.4.

---
 srcpkgs/melonDS/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/melonDS/template b/srcpkgs/melonDS/template
index 58602c65746a..9594c3b3294b 100644
--- a/srcpkgs/melonDS/template
+++ b/srcpkgs/melonDS/template
@@ -1,7 +1,7 @@
 # Template file for 'melonDS'
 pkgname=melonDS
-version=0.9.3
-revision=2
+version=0.9.4
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="qt5-devel libslirp-devel SDL2-devel libepoxy-devel
@@ -11,4 +11,4 @@ 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=c50a3855c1f77f58a2b15045687dc399b845224a970fe68ff95919c939ac634f
+checksum=8022c8798a723f8ffae6ffdad2e7637cf9046e88f86b55b5f9ad3fa3b2e6d398

From 192c3d7f75396c077d14775728671b02e0fa450c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 15 Mar 2022 21:05:47 +0100
Subject: [PATCH 0241/2561] openssl: update to 1.1.1n.

---
 srcpkgs/openssl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 06d83aa0d81d..b77267e3d098 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,6 +1,6 @@
 # Template file for 'openssl'
 pkgname=openssl
-version=1.1.1l
+version=1.1.1n
 revision=1
 bootstrap=yes
 build_style=configure
@@ -17,7 +17,7 @@ maintainer="John <johnz@posteo.net>"
 license="OpenSSL"
 homepage="https://www.openssl.org"
 distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
-checksum=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
+checksum=40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a
 conf_files="/etc/ssl/openssl.cnf"
 replaces="libressl>=0"
 

From c23efe670eb7c90a7da33eb44caf54ef0e7c1946 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 15:24:34 -0400
Subject: [PATCH 0242/2561] sublime-text3: replace with empty meta package

---
 srcpkgs/sublime-text3/INSTALL.msg |  4 ++++
 srcpkgs/sublime-text3/template    | 33 ++++++-------------------------
 2 files changed, 10 insertions(+), 27 deletions(-)
 create mode 100644 srcpkgs/sublime-text3/INSTALL.msg

diff --git a/srcpkgs/sublime-text3/INSTALL.msg b/srcpkgs/sublime-text3/INSTALL.msg
new file mode 100644
index 000000000000..cf4c4e70a7a9
--- /dev/null
+++ b/srcpkgs/sublime-text3/INSTALL.msg
@@ -0,0 +1,4 @@
+sublime-text3 is replaced with the restricted sublime-text3-bin
+package, due to its license that restricts redistribution.
+In order to install it you have to build it with xbps-src, please see:
+https://docs.voidlinux.org/xbps/repositories/restricted.html
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index c693768e6e4e..c077963863d3 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,36 +1,15 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=2
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="Sophisticated text editor for code, markup and prose"
+revision=3
+archs="i686 x86_64"
+build_style=meta
+short_desc="Empty meta-package for sublime-text3"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:Proprietary"
+license="custom:EULA" #no vlicense check
 homepage="http://www.sublimetext.com/3dev"
-
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
-	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
-else
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
-	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
-fi
-
 repository="nonfree"
-archs="i686 x86_64"
-wrksrc="sublime_text_3"
-nopie=yes
 
 do_install() {
-	vmkdir "usr/bin"
-	vmkdir "usr/lib/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
-	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
-	for size in 128 16 256 32 48; do
-		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
-		 "usr/share/icons/hicolor/${size}x${size}/apps/"
-	done
-	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
-	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg"  README.voidlinux
 }

From e66ba2adff53aef4a1300c940c556d60d719315b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 15:25:10 -0400
Subject: [PATCH 0243/2561] New package: sublime-text3-bin-3211

replaces sublime-text3
---
 srcpkgs/sublime-text3-bin/template | 55 ++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 srcpkgs/sublime-text3-bin/template

diff --git a/srcpkgs/sublime-text3-bin/template b/srcpkgs/sublime-text3-bin/template
new file mode 100644
index 000000000000..73d67ea9c631
--- /dev/null
+++ b/srcpkgs/sublime-text3-bin/template
@@ -0,0 +1,55 @@
+# Template file for 'sublime-text3-bin'
+pkgname=sublime-text3-bin
+version=3211
+revision=1
+archs="i686 x86_64"
+wrksrc="sublime_text_3"
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="Sophisticated text editor for code, markup and prose"
+maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
+license="custom:EULA"
+homepage="http://www.sublimetext.com/3dev"
+_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
+repository="nonfree"
+restricted=yes
+nopie=yes
+replaces="sublime-text3>0"
+
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
+	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+else
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
+	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
+fi
+
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+
+do_install() {
+	vmkdir "usr/bin"
+	vmkdir "usr/lib/sublime_text"
+	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
+	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+	for size in 128 16 256 32 48; do
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
+		 "usr/share/icons/hicolor/${size}x${size}/apps/"
+	done
+	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
+	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
+	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vlicense EULA
+}

From f6643c0fdbbe10e437dc7bdf7454b1847bc2071f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 4 Sep 2021 23:06:20 +0200
Subject: [PATCH 0244/2561] New package: gtksourceview5-5.2.0

---
 common/shlibs                   |  1 +
 srcpkgs/gtksourceview5-devel    |  1 +
 srcpkgs/gtksourceview5/template | 52 +++++++++++++++++++++++++++++++++
 srcpkgs/gtksourceview5/update   |  3 ++
 4 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/gtksourceview5-devel
 create mode 100644 srcpkgs/gtksourceview5/template
 create mode 100644 srcpkgs/gtksourceview5/update

diff --git a/common/shlibs b/common/shlibs
index 230fc6a994c0..83b5783cb026 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3497,6 +3497,7 @@ liblqr-1.so.0 liblqr-0.4.2_1
 libmozjs-78.so.0 mozjs78-78.1.0_1
 libebur128.so.1 libebur128-1.2.4_1
 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1
+libgtksourceview-5.so.0 gtksourceview5-5.2.0_1
 libwx_gtk3u_propgrid-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_qa-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_core-3.0.so.0 wxWidgets-gtk3-3.0.4_1
diff --git a/srcpkgs/gtksourceview5-devel b/srcpkgs/gtksourceview5-devel
new file mode 120000
index 000000000000..1aac62393079
--- /dev/null
+++ b/srcpkgs/gtksourceview5-devel
@@ -0,0 +1 @@
+gtksourceview5
\ No newline at end of file
diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
new file mode 100644
index 000000000000..c4c7d94f51e8
--- /dev/null
+++ b/srcpkgs/gtksourceview5/template
@@ -0,0 +1,52 @@
+# Template file for 'gtksourceview5'
+pkgname=gtksourceview5
+version=5.2.0
+revision=1
+wrksrc="gtksourceview-${version}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
+ $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala)
+ pcre2-devel"
+checkdepends="xvfb-run cantarell-fonts"
+short_desc="Text widget that extends GTK4 GtkTextView widget"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/GtkSourceView"
+changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-2/NEWS"
+distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
+checksum=c9b34fa02654f56ce22fa08827d89db4ba81631b2e6d7d31ea65d13c729430e9
+
+# Package build options
+build_options="gir gtk_doc"
+desc_option_gtk_doc="Build API docs via gtk-doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+gtksourceview5-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel libglib-devel
+	 libxml2-devel pcre2-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+	}
+}
diff --git a/srcpkgs/gtksourceview5/update b/srcpkgs/gtksourceview5/update
new file mode 100644
index 000000000000..4617ff233267
--- /dev/null
+++ b/srcpkgs/gtksourceview5/update
@@ -0,0 +1,3 @@
+pkgname="gtksourceview"
+pattern="$pkgname-\K5\.[0-9]*[02468]\.[0-9]*(?=)"
+ignore="*.99"

From bff8ff5c0e0fbc477e28cc4356a2fe8722fef88f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 6 Dec 2021 11:07:59 +0100
Subject: [PATCH 0245/2561] New package: gnome-text-editor-41.1

---
 srcpkgs/gnome-text-editor/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/gnome-text-editor/template

diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template
new file mode 100644
index 000000000000..f1e474fca5ff
--- /dev/null
+++ b/srcpkgs/gnome-text-editor/template
@@ -0,0 +1,16 @@
+# Template file for 'gnome-text-editor'
+pkgname=gnome-text-editor
+version=41.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext itstool glib-devel"
+makedepends="libglib-devel gtk4-devel gtksourceview5-devel enchant2-devel
+ icu-devel libadwaita-devel pcre2-devel"
+short_desc="Simple text editor"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/gnome-text-editor"
+changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/gnome-41/NEWS"
+distfiles="${GNOME_SITE}/gnome-text-editor/${version%.*}/gnome-text-editor-$version.tar.xz"
+checksum=619ec520d6e0905d431167024e43dce0dbf6a345f2d48693501d70dc7626f861
+make_check=no # Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting.

From f7fcff8c60587bae99a37c2179eaac22d0b867ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:05:48 +0100
Subject: [PATCH 0246/2561] NetworkManager: update to 1.36.2.

---
 srcpkgs/NetworkManager/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 5483f5c8b35b..5502f41159d3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.34.0
+version=1.36.2
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ configure_args="-Dsystemd_journal=false
  -Dsuspend_resume=$(vopt_if elogind elogind upower)
  -Dconfig_dhcp_default=internal"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel docbook-xsl gtk-doc
+ intltool dbus-glib-devel docbook-xsl gtk-doc
  $(vopt_if gir 'vala python3-gobject')"
 makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
@@ -33,8 +33,9 @@ short_desc="Network Management daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd
+checksum=ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -58,6 +59,9 @@ post_patch() {
 			-e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" \
 			-e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \
 			src/libnm-client-impl/meson.build
+		# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/955
+		vsed -e "s#jansson_dep.get_pkgconfig_variable('libdir')#'${XBPS_CROSS_BASE}/usr/lib'#" \
+			-i meson.build
 	fi
 }
 

From a23f016d95d0027a7bec21f264616bfdfa07169d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 15 Mar 2022 23:11:07 +0100
Subject: [PATCH 0247/2561] google-chrome: update to 99.0.4844.74

---
 srcpkgs/google-chrome/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index f50d9caa3464..5516594f44f9 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,7 +1,7 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.51
-revision=2
+version=99.0.4844.74
+revision=1
 _channel=stable
 archs="x86_64"
 hostmakedepends="curl tar xz python3 python3-html2text python3-setuptools"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=a19354b3f8eee069cec49cdc44bea43d7f0cbddf6a94bb49c1e221a4ee757812
+checksum=0444893153d4b3b628c6465c48e7c49f06649b101ce5ab066d59b14c363ef9f7
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 123935a962481d4ac0a1798eae8d3960cc691dad Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Tue, 8 Mar 2022 10:50:56 +0100
Subject: [PATCH 0248/2561] nwg-launchers: add gtk-layer-shell to makedepends

This dependancy makes nwg-launchers work better under wayland compositors,
by enabling layer-shell support.
---
 srcpkgs/nwg-launchers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nwg-launchers/template b/srcpkgs/nwg-launchers/template
index 0f394bff2582..acf5bfc58349 100644
--- a/srcpkgs/nwg-launchers/template
+++ b/srcpkgs/nwg-launchers/template
@@ -1,10 +1,10 @@
 # Template file for 'nwg-launchers'
 pkgname=nwg-launchers
 version=0.6.3
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel json-c++"
+makedepends="gtkmm-devel gtk-layer-shell-devel json-c++"
 short_desc="GTK-based launchers for window managers"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"

From c14ca21c49480cff014cd49da97f1d69cf3d15fe Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 22 Feb 2022 09:15:54 +0100
Subject: [PATCH 0249/2561] vscode: update to 1.65.2

---
 .../patches/disable-crash-reporter.patch      | 14 -------
 srcpkgs/vscode/patches/product.patch          |  9 ++--
 srcpkgs/vscode/patches/ripgrep.patch          | 42 +++++++++----------
 srcpkgs/vscode/template                       | 15 ++++---
 4 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch
index d91f6895969c..dac81e3341c4 100644
--- a/srcpkgs/vscode/patches/disable-crash-reporter.patch
+++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch
@@ -13,20 +13,6 @@ So, disable it entirely. No cookies for you, Visual Studio Code team.
  src/vs/code/electron-main/app.ts |  2 +-
  3 files changed, 1 insertion(+), 20 deletions(-)
 
-diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js
-index f7b07e49255..576c82f23e8 100644
---- a/src/bootstrap-fork.js
-+++ b/src/bootstrap-fork.js
-@@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) {
- 	terminateWhenParentTerminates();
- }
- 
--// Configure Crash Reporter
--configureCrashReporter();
--
- // Load AMD entry point
- require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']);
- 
 diff --git a/src/main.js b/src/main.js
 index ad838aa245e..e6319e100b9 100644
 --- a/src/main.js
diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index edeebf5d1439..a7e2b79925bf 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,19 +1,18 @@
 diff --git a/product.json b/product.json
-index 22e93d4b7c3..335cddd4c7c 100644
+index 9d630f23cd7..eea95dce319 100644
 --- a/product.json
 +++ b/product.json
-@@ -25,13 +25,22 @@
+@@ -27,6 +27,9 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
 +	"quality": "stable",
 +	"documentationUrl": "https://github.com/microsoft/vscode-docs",
 +	"requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/c42793d0357ff9c6589cce79a847177fd42852ee/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/",
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
- 		"ms-vscode.vscode-js-profile-table",
-+		"ms-python.python",
+@@ -34,6 +37,11 @@
  		"GitHub.remotehub",
  		"GitHub.remotehub-insiders"
  	],
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index 6e81145a1cb1..ff0dfc233e41 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -1,32 +1,32 @@
-Ping q66 if this needs updating.
+Ping atk if this needs updating.
 
 This prevents vscode from fetching prebuilt ripgrep from Microsoft
 during build, which unbreaks build on platforms where MS deos not
 ship a prebuilt ripgrep.
 
 diff --git a/package.json b/package.json
-index 6d1fb7cca0c..057ed39ac31 100644
+index 5d6022a2a40..f66ee44eef0 100644
 --- a/package.json
 +++ b/package.json
-@@ -83,7 +83,7 @@
-     "vscode-oniguruma": "1.6.1",
-     "vscode-proxy-agent": "^0.11.0",
-     "vscode-regexpp": "^3.1.0",
--    "vscode-ripgrep": "^1.12.1",
-+    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.5.0",
-     "xterm": "4.16.0-beta.2",
-     "xterm-addon-search": "0.9.0-beta.6",
+@@ -63,7 +63,7 @@
+     "@parcel/watcher": "2.0.5",
+     "@vscode/debugprotocol": "1.51.0",
+     "@vscode/iconv-lite-umd": "0.7.0",
+-    "@vscode/ripgrep": "^1.14.1",
++    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
+     "@vscode/sqlite3": "4.0.12",
+     "@vscode/sudo-prompt": "9.3.1",
+     "@vscode/vscode-languagedetection": "1.0.21",
 diff --git a/remote/package.json b/remote/package.json
-index 662ce3568ab..a79fe3764d9 100644
+index 4bc40998093..9d22d408c02 100644
 --- a/remote/package.json
 +++ b/remote/package.json
-@@ -22,7 +22,7 @@
-     "vscode-oniguruma": "1.6.1",
-     "vscode-proxy-agent": "^0.11.0",
-     "vscode-regexpp": "^3.1.0",
--    "vscode-ripgrep": "^1.12.1",
-+    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.5.0",
-     "xterm": "4.16.0-beta.2",
-     "xterm-addon-search": "0.9.0-beta.6",
+@@ -6,7 +6,7 @@
+     "@microsoft/applicationinsights-web": "^2.6.4",
+     "@parcel/watcher": "2.0.5",
+     "@vscode/iconv-lite-umd": "0.7.0",
+-    "@vscode/ripgrep": "^1.14.1",
++    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
+     "@vscode/vscode-languagedetection": "1.0.21",
+     "applicationinsights": "1.4.2",
+     "cookie": "^0.4.0",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 97f1a142a814..620c9a6928aa 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,17 +1,17 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.63.2
+version=1.65.2
 revision=1
-_electronver=13.6.1
-hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
-makedepends="libxkbfile-devel libsecret-devel electron13"
-depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
+_electronver=13.6.7
+hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep"
+makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13"
+depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
 short_desc="Microsoft Code for Linux"
-maintainer="shizonic <realtiaz@gmail.com>"
+maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=21fc9bc17ba4cf480b1e006f298363d86215c339c480f8d781cabcfedad2d624
+checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -61,7 +61,6 @@ do_install() {
 	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop
 	vmkdir usr/share/pixmaps
 	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png
-	ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
 	vsed \
 	-e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
 	-e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \

From 744da894729460ad3eb848d97c71ae29c7f89ae6 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 09:40:04 +0100
Subject: [PATCH 0250/2561] geonkick: update to 2.9.0.

---
 srcpkgs/geonkick/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geonkick/template b/srcpkgs/geonkick/template
index 79f8ba451959..af8ea0fa8190 100644
--- a/srcpkgs/geonkick/template
+++ b/srcpkgs/geonkick/template
@@ -1,6 +1,6 @@
 # Template file for 'geonkick'
 pkgname=geonkick
-version=2.8.1
+version=2.9.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config tar xz"
@@ -10,9 +10,9 @@ short_desc="Free software percussion synthesizer"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/free-sm/geonkick"
-changelog="https://github.com/free-sm/geonkick/blob/main/NEWS.md"
+changelog="https://raw.githubusercontent.com/free-sm/geonkick/main/NEWS.md"
 distfiles="https://github.com/free-sm/geonkick/archive/refs/tags/v${version}.tar.gz"
-checksum=813fb10709136ed79403c8baf3d847fce9fbf717fea3c194ad2952e0172e6d45
+checksum=54968894e3fab1ad1b7a92e12cdb5041ca39a22842c8e815a443f50cbcc4dc5b
 
 if [ ${CROSS_BUILD} ]; then
 	configure_args+=" -DGKICK_ARCHITECTURE=$XBPS_TARGET_MACHINE"

From d8e21d8188b9764965a7a6402ddb4ca7fd4c26e0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 16 Mar 2022 14:55:31 +0100
Subject: [PATCH 0251/2561] libtls: update to 3.4.3.

---
 srcpkgs/libtls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 42f33db208a6..f8217c020c65 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,6 +1,6 @@
 # Template file for 'libtls'
 pkgname=libtls
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="libressl-${version}"
 build_style=gnu-configure
@@ -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=cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce
+checksum=ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d
 _lssl_asm_ver="1.2.0"
 replaces="libtls20>0"
 

From b33dbf437325b26e8ba5021766b20b6e27ca2515 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 16 Mar 2022 18:34:42 +0100
Subject: [PATCH 0252/2561] flatpak: update to 1.12.7.

---
 srcpkgs/flatpak/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 2682c5ce96c8..7820788874be 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak'
 pkgname=flatpak
-version=1.12.6
+version=1.12.7
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -23,7 +23,7 @@ license="LGPL-2.1-or-later"
 homepage="https://flatpak.org/"
 changelog="https://github.com/flatpak/flatpak/raw/main/NEWS"
 distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=ef02cb505b91cce5173099b5485768eef1899ebcf39edf827c4254163a811627
+checksum=6db52a531ce278282ac7ebfb99f66a0bb3eccaf44e864844c2c95c1ee5ba9316
 
 build_options="gir"
 build_options_default="gir"

From 7978fdc1cfac91d90ecf0bfeb3d18137c8d5f2fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:51:15 +0100
Subject: [PATCH 0253/2561] tali: update to 40.5.

---
 srcpkgs/tali/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index bfd640177d27..3e50e64f96fc 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -1,14 +1,13 @@
 # Template file for 'tali'
 pkgname=tali
-version=3.38.3
+version=40.5
 revision=1
 build_style=meson
-hostmakedepends="cmake pkg-config gettext glib-devel appstream-glib
- desktop-file-utils itstool"
+hostmakedepends="pkg-config gettext glib-devel itstool"
 makedepends="gtk+3-devel libgnome-games-support-devel"
 short_desc="GNOME sort of poker game with dice"
 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"
-checksum=0215428b50c4a0827fb0de2e4e6ba6e56678f9ba76d8d25b7eeca85215f25a39
+checksum=63a09c55e46a1a19756bf5e0957caf994300fadabdba6bda602e668dfcdf7122

From 226dab218f59260f9a013893fde4cdd119de1a06 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:20:44 +0100
Subject: [PATCH 0254/2561] pangomm2.48: update to 2.50.0.

---
 srcpkgs/pangomm2.48/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pangomm2.48/template b/srcpkgs/pangomm2.48/template
index 291837c42612..d46d232ea53f 100644
--- a/srcpkgs/pangomm2.48/template
+++ b/srcpkgs/pangomm2.48/template
@@ -1,6 +1,6 @@
 # Template file for 'pangomm2.48'
 pkgname=pangomm2.48
-version=2.48.1
+version=2.50.0
 revision=1
 wrksrc="pangomm-$version"
 build_style=meson
@@ -10,8 +10,9 @@ short_desc="C++ bindings for the pango library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
+changelog="https://gitlab.gnome.org/GNOME/pangomm/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/pangomm/${version%.*}/pangomm-${version}.tar.xz"
-checksum=776ad53e791e43106b7f40ff0834bee6e4eb1c6ad7cb6d215546f7a3df0edc4d
+checksum=a27aa77e017b9afce9e751d85bd1cf890abbb3a58bf59d0fac917eef82db3b5b
 
 pangomm2.48-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From e3ab7a02b2fe8efc8fc08c2105cbc0def6eef277 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:25:52 +0100
Subject: [PATCH 0255/2561] zathura: fix distfiles 404

---
 srcpkgs/zathura/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index 3f456aa370ff..c93fbc062cee 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -12,9 +12,9 @@ checkdepends="gettext-devel check-devel"
 short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="https://pwmt.org/projects/zathura"
-distfiles="${homepage}/download/zathura-${version}.tar.xz"
-checksum=fc30c42cd660d993bce8758e22e4ba8078761d51f1e29494e7a0d37a8a3e5e57
+homepage="https://git.pwmt.org/pwmt/zathura/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=82235cbc89899421fca98477265626f2149df7d072740f0360550cc8d4e449d6
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=enabled"

From 41b898a473b884e8ee0c5250fbe456480fe50757 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:25:54 +0100
Subject: [PATCH 0256/2561] zathura-ps: fix distfiles 404

---
 srcpkgs/zathura-ps/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..e17da900762c 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -9,9 +9,9 @@ depends="zathura ghostscript"
 short_desc="PostScript support for zathura"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-ps/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+homepage="https://git.pwmt.org/pwmt/zathura-ps/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=e7092c831e345002edc87321911faa27c5dc3210dd6e3939dfbc49192a54d35e
 
 post_install() {
 	vlicense LICENSE

From ef3225cbc3d11b688a7842e1fd91bbc757672560 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:25:57 +0100
Subject: [PATCH 0257/2561] zathura-djvu: fix distfiles 404

---
 srcpkgs/zathura-djvu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-djvu/template b/srcpkgs/zathura-djvu/template
index 80ce14959c2a..733475923712 100644
--- a/srcpkgs/zathura-djvu/template
+++ b/srcpkgs/zathura-djvu/template
@@ -9,9 +9,9 @@ depends="zathura"
 short_desc="DjVu support for zathura"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-djvu/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=96e6f8a6ee53231073b2f7003264872f84501e63c3da7bf0598d046286b0c200
+homepage="https://git.pwmt.org/pwmt/zathura-djvu/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=84fae6da42e7cdc2e49ed4cd4f0315ac09716e95358b9c7487803a2cff47dbca
 
 post_install() {
 	vlicense LICENSE

From 95bc60b7af51e4d94c28f50a4b7929be299666b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:26:05 +0100
Subject: [PATCH 0258/2561] zathura-cb: fix distfiles 404

---
 srcpkgs/zathura-cb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-cb/template b/srcpkgs/zathura-cb/template
index 80d700895c54..4cfed7b4d6f0 100644
--- a/srcpkgs/zathura-cb/template
+++ b/srcpkgs/zathura-cb/template
@@ -9,9 +9,9 @@ depends="zathura"
 short_desc="Comic book support for zathura"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-cb/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=3ad7619449987fd2e0203644f7487e073000b022a8b80bdd1df52147424b40d6
+homepage="https://git.pwmt.org/pwmt/zathura-cb/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=30d2cea3b1eb65e7386eb66ec305e455b2bed272c35530faaec541b47217fdcd
 
 post_install() {
 	vlicense LICENSE

From 1167133920819c6e5cc0c7097226407a0efe1553 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:26:15 +0100
Subject: [PATCH 0259/2561] zathura-pdf-mupdf: fix distfiles 404

---
 srcpkgs/zathura-pdf-mupdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index e2afbf966505..9f973214cf83 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -12,9 +12,9 @@ depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+homepage="https://git.pwmt.org/pwmt/zathura-pdf-mupdf/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=3f2d341dfe3bdbfb7a51a33aee81f3763a684d0ea503dd20c726311125d7c08a
 conflicts="zathura-pdf-poppler>=0"
 
 post_install() {

From 4c7ab4aa3c81779752b35e36a01c71d2f4b3db0f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:26:18 +0100
Subject: [PATCH 0260/2561] zathura-pdf-poppler: fix distfiles 404

---
 srcpkgs/zathura-pdf-poppler/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template
index 9c174c61fab0..d638f659a507 100644
--- a/srcpkgs/zathura-pdf-poppler/template
+++ b/srcpkgs/zathura-pdf-poppler/template
@@ -9,9 +9,9 @@ depends="zathura"
 short_desc="PDF support for zathura (using poppler)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-pdf-poppler/"
-distfiles="https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${version}.tar.xz"
-checksum=d5cc3a7dae49471b85b503bbb9049c6f8d10903f4a611d721a2e0fefe726d4ed
+homepage="https://git.pwmt.org/pwmt/zathura-pdf-poppler/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=2034f70a936d458ddc9276f769e77ff308ba3bb1b7a7cdc87bab8b9ef7ade84a
 
 conflicts="zathura-pdf-mupdf>=0"
 

From 4c4bbe6472d1982caae5d9dbcd4480952c974857 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:48:52 +0100
Subject: [PATCH 0261/2561] certbot: update to 1.25.0.

---
 srcpkgs/certbot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 63432609805f..aa8de157d59b 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.24.0
+version=1.25.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=ba19713ff22c4ac0939c7863986d673d0a45209340f80b1bc6a301d278580be3
+checksum=9633d21051fe7fd076d64cb41963de61d300d7c30f4b491c8d18cb8306357509

From 059e8e663658266418e58476e819787d6ad8d489 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:48:56 +0100
Subject: [PATCH 0262/2561] certbot-apache: update to 1.25.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 cf9eb1c6fd70..1f5c098c802d 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.24.0
+version=1.25.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=d432e6b748ae3d12a794da2a90d3a40a054bcc36c4ff63c303766a685f48b324
+checksum=91dbd326c5ee4fe7a2ef5f1c3c525863a7f4ed5f228e1c7c10048d18fe18d0a1

From c16b388f15dbbe6ff992aa26de3458bc53a420a6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:48:58 +0100
Subject: [PATCH 0263/2561] certbot-nginx: update to 1.25.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 3cd8fb59c303..b635785e5d0a 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.24.0
+version=1.25.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=192843768cf50e07c133efd79c4cae8b689d986c2f952173875fa0717a0cbaf7
+checksum=433a7237e841c462a67f9195fb7d7711ac6ed6d27bedb981c71238ef5348d62b

From 7658d93d402147aba174692805523138ec2a0e6c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:49:03 +0100
Subject: [PATCH 0264/2561] python3-acme: update to 1.25.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 20fbf978b912..19e374d105a8 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.24.0
+version=1.25.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=63161f442d7c995313305663ad2eef6b3f770899c3f635e1c1f1d0141696b298
+checksum=e3fbe36fcfa27ec46f450369498f3486370ab53a0fd7db91557a23d58b3969fa

From d0eee7901ba711990d9cfc01f6a6a101a7b2d0f8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:49:06 +0100
Subject: [PATCH 0265/2561] python3-josepy: update to 1.13.0.

---
 srcpkgs/python3-josepy/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index 4130d629dc3b..6df2673629f2 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
-version=1.12.0
+version=1.13.0
 revision=1
 wrksrc="josepy-${version}"
 build_style=python3-module
@@ -11,8 +11,9 @@ short_desc="JOSE protocol implementation in Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/josepy"
+changelog="https://raw.githubusercontent.com/certbot/josepy/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/j/josepy/josepy-${version}.tar.gz"
-checksum=267004a64f08c016cd54b7aaf7c323fa3ef3679fb62f4b086cd56448d0fecb25
+checksum=8931daf38f8a4c85274a0e8b7cb25addfd8d1f28f9fb8fbed053dd51aec75dc9
 
 pre_check() {
 	vsed -e '/addopts/d' -i pytest.ini

From c879624975dc0289e22f6b9700ab6df11ace984f Mon Sep 17 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, 10 Mar 2022 21:30:02 +0700
Subject: [PATCH 0266/2561] nss: update to 3.76.

---
 srcpkgs/nss/patches/D136289.patch            | 43 --------------------
 srcpkgs/nss/patches/cpputil-databuffer.patch | 20 +++++++++
 srcpkgs/nss/template                         |  4 +-
 3 files changed, 22 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/nss/patches/D136289.patch
 create mode 100644 srcpkgs/nss/patches/cpputil-databuffer.patch

diff --git a/srcpkgs/nss/patches/D136289.patch b/srcpkgs/nss/patches/D136289.patch
deleted file mode 100644
index a6d380515504..000000000000
--- a/srcpkgs/nss/patches/D136289.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1750624
-diff --git a/nss/tests/chains/chains.sh b/nss/tests/chains/chains.sh
---- a/nss/tests/chains/chains.sh
-+++ b/nss/tests/chains/chains.sh
-@@ -917,7 +917,7 @@
-     done
- 
-     VFY_OPTS_TNAME="${DB_OPT} ${ENGINE} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${TRUST_OPT}"
--    VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
-+    VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${VFY_TIME_OPT} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
- 
-     TESTNAME="Verifying certificate(s) ${VFY_LIST} with flags ${VFY_OPTS_TNAME}"
-     echo "${SCRIPTNAME}: ${TESTNAME}"
-@@ -1118,6 +1118,7 @@
-             ;;
-         "verify")
-             VERIFY="${VALUE}"
-+            VFY_TIME_OPT=
-             TRUST=
-             TRUST_AND_DB=
-             POLICY=
-@@ -1126,6 +1127,9 @@
-             REV_OPTS=
-             USAGE_OPT=
-             ;;
-+        "at_time")
-+            VFY_TIME_OPT="-b ${VALUE}"
-+            ;;
-         "cert")
-             VERIFY="${VERIFY} ${VALUE}"
-             ;;
-diff --git a/nss/tests/chains/scenarios/realcerts.cfg b/nss/tests/chains/scenarios/realcerts.cfg
---- a/nss/tests/chains/scenarios/realcerts.cfg
-+++ b/nss/tests/chains/scenarios/realcerts.cfg
-@@ -22,6 +22,7 @@
- 
- verify PayPalEE:x
-   policy OID.2.16.840.1.114412.2.1 
-+  at_time 2201010000Z
-   result pass
- 
- verify BrAirWaysBadSig:x
-
diff --git a/srcpkgs/nss/patches/cpputil-databuffer.patch b/srcpkgs/nss/patches/cpputil-databuffer.patch
new file mode 100644
index 000000000000..44dd3f467882
--- /dev/null
+++ b/srcpkgs/nss/patches/cpputil-databuffer.patch
@@ -0,0 +1,20 @@
+Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1758478
+diff --git a/nss/cpputil/databuffer.h b/nss/cpputil/databuffer.h
+index 8d34e1a..6aee509 100644
+--- a/nss/cpputil/databuffer.h
++++ b/nss/cpputil/databuffer.h
+@@ -33,11 +33,9 @@ class DataBuffer {
+     return *this;
+   }
+   DataBuffer& operator=(DataBuffer&& other) {
+-    if (this == &other) {
+-      data_ = other.data_;
+-      len_ = other.len_;
+-      other.data_ = nullptr;
+-      other.len_ = 0;
++    if (this != &other) {
++      std::swap(data_, other.data_);
++      std::swap(len_, other.len_);
+     }
+     return *this;
+   }
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 52ce1074b303..f85cfe79a868 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.75
+version=3.76
 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=fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582
+checksum=1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From da358ef4f77a4b4a2a878ae63e48edbace7cf7a5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 16 Mar 2022 15:26:02 +0200
Subject: [PATCH 0267/2561] skype: update to 8.82.0.403.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index b0cfc9ea66c1..7760c535079c 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.81.0.268
+version=8.82.0.403
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=0a701bee1be8b2b0872696f3fea1c429635b6dfd738b86978f9b81d238f35118
+checksum=df903a805c3db301d8846e5fcfe2ec5acbea720c49f3031edb50d416f5a52a24
 repository="nonfree"
 nostrip="yes"
 

From a05a8c5a6c81e941f5445d9e5f6b87c5da9f574e Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Wed, 9 Mar 2022 18:50:40 +0100
Subject: [PATCH 0268/2561] python3-docutils: update to 0.18.1.

---
 srcpkgs/python3-docutils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
index 0600a65a729b..13bc5f4d7c33 100644
--- a/srcpkgs/python3-docutils/template
+++ b/srcpkgs/python3-docutils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-docutils'
 pkgname=python3-docutils
-version=0.17.1
-revision=2
+version=0.18.1
+revision=1
 wrksrc="docutils-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
 homepage="http://docutils.sourceforge.net"
 distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+checksum=679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06
 
 alternatives="
  docutils:rst2html:/usr/bin/rst2html.py

From f0e620db7ec794e89e5c483f8c1445a026edbcc0 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 15 Mar 2022 21:12:07 +0400
Subject: [PATCH 0269/2561] python3-curl: update to 7.45.1.

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index ea7831c2f087..7a728a5ff62d 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
-version=7.45.0
+version=7.45.1
 revision=1
 wrksrc="pycurl-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="LGPL-2.1-or-later, MIT"
 homepage="http://pycurl.io/"
 changelog="https://raw.githubusercontent.com/pycurl/pycurl/master/ChangeLog"
 distfiles="${PYPI_SITE}/p/pycurl/pycurl-${version}.tar.gz"
-checksum=5036c53c6f4106e9160d053a4baa3433a0215fb3386073e211273c56a3a95f3d
+checksum=a863ad18ff478f5545924057887cdae422e1b2746e41674615f687498ea5b88a
 
 pre_build() {
 	vsed -i "/setup_args\['data_files'\] = /d" setup.py

From 6c6f5e64c6e0ff33a0b47830334e68229b7ff138 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 16 Mar 2022 19:45:56 +0400
Subject: [PATCH 0270/2561] python3-regex: update to 2022.3.15.

---
 srcpkgs/python3-regex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 6e31d60343e8..57e5b7f4fb02 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2022.3.2
+version=2022.3.15
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=79e5af1ff258bc0fe0bdd6f69bc4ae33935a898e3cbefbbccf22e88a27fa053b
+checksum=0a7b75cc7bb4cc0334380053e4671c560e31272c9d2d5a6c4b8e9ae2c9bd0f82
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 13d992cd9f52506ed795309a5403dd9dad407e24 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Thu, 17 Feb 2022 16:13:22 +0100
Subject: [PATCH 0271/2561] python3-pikepdf: update to 5.0.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 bc4dc5911630..ae0b2ee09ba5 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=4.4.1
+version=5.0.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -14,7 +14,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=c25d4c7673f9588d1f98bca498db98ba675070dc89ffffe50b3b124d4a005df9
+checksum=5fae9eeb7a0120d466fb219aea643a94a1423d68ee9171639a44cf0329ebe7aa
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 88f3b2e567fd0ec6bc4d22c64a82eb543867c718 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:53:29 -0400
Subject: [PATCH 0272/2561] python3: update to 3.10.3.

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 85cd88971a4d..df408f9ed74d 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.10.2
+version=3.10.3
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -22,7 +22,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=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7
+checksum=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From 3ae77052ef66c1800ed09d73e4d0c4cfaf3c9539 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:54:49 -0400
Subject: [PATCH 0273/2561] python3-tkinter: update to 3.10.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 3c7ecb8cfd82..bfe219597ff5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.10.2
+version=3.10.3
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -29,7 +29,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=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7
+checksum=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"

From ec05d4869fb3196438737c18793c26e7cf8ac0c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:55:04 -0400
Subject: [PATCH 0274/2561] python3-MarkupSafe: update to 2.1.1.

---
 srcpkgs/python3-MarkupSafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-MarkupSafe/template b/srcpkgs/python3-MarkupSafe/template
index d298c3f318bd..3f1b6a839d0f 100644
--- a/srcpkgs/python3-MarkupSafe/template
+++ b/srcpkgs/python3-MarkupSafe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-MarkupSafe'
 pkgname=python3-MarkupSafe
-version=2.1.0
+version=2.1.1
 revision=1
 wrksrc="MarkupSafe-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://palletsprojects.com/p/markupsafe/"
 distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
-checksum=80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f
+checksum=7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b
 
 post_install() {
 	vlicense LICENSE.rst

From 8d1532d53b34c0bbe28917770b30c61f8792245c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:55:14 -0400
Subject: [PATCH 0275/2561] python3-cppy: update to 1.2.0.

---
 srcpkgs/python3-cppy/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-cppy/template b/srcpkgs/python3-cppy/template
index de7943af84f5..3afd8399c77a 100644
--- a/srcpkgs/python3-cppy/template
+++ b/srcpkgs/python3-cppy/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-cppy'
 pkgname=python3-cppy
-version=1.1.0
-revision=2
+version=1.2.0
+revision=1
 wrksrc="cppy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="C++ headers to make it easier to write Python C extensions"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://cppy.readthedocs.io"
 changelog="https://raw.githubusercontent.com/nucleic/cppy/master/releasenotes.rst"
 distfiles="${PYPI_SITE}/c/cppy/cppy-${version}.tar.gz"
-checksum=4eda6f1952054a270f32dc11df7c5e24b259a09fddf7bfaa5f33df9fb4a29642
+checksum=95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc
 
 post_install() {
 	vlicense LICENSE

From 8ccea11f84be6ce5349eac49aaeb1ee5309d9eb2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:55:45 -0400
Subject: [PATCH 0276/2561] python3-cryptography_vectors: update to 36.0.2.

---
 srcpkgs/python3-cryptography_vectors/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 152ad12ebdde..c31863f52ad7 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
-version=36.0.0
-revision=2
+version=36.0.2
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,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=c6b7e53ec701f47497297cfcfbafdf81a3f76f6f9d684721ef3dea254301faa5
+checksum=2a7924449a03025faf7f8754a6f4200001cab210734a6ce6ac1f6bdacd3a68e4
 
 post_install() {
 	vlicense LICENSE

From 4e53138ccacc603845c5c4ae2504d1142af0ea09 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:57:51 -0400
Subject: [PATCH 0277/2561] python3-cryptography: update to 36.0.2.

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 40c226de9f8c..278446d27efb 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=36.0.0
+version=36.0.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=52f769ecb4ef39865719aedc67b4b7eae167bafa48dbc2a26dd36fa56460507f
+checksum=70f8f4f7bb2ac9f340655cbac89d68c527af5bb4387522a8413e841e3e6628c9
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 525e4d9f25a600cc688a36822826722c3395db0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:00:01 -0400
Subject: [PATCH 0278/2561] python3-pywt: update to 1.3.0.

---
 srcpkgs/python3-pywt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pywt/template b/srcpkgs/python3-pywt/template
index 3fdb9e576558..cb3cad5d80d6 100644
--- a/srcpkgs/python3-pywt/template
+++ b/srcpkgs/python3-pywt/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pywt'
 pkgname=python3-pywt
-version=1.2.0
+version=1.3.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/PyWavelets/pywt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ad88e5745eeaccaf759287f11b63539353df31324fe7498d9f8121e01e4106ed
+checksum=6dc7e55a2d7c415262eb212a2fbbb0e3aa19572fecd5cebcef72b810ac11d4ae
 
 do_check() {
 	(cd build/lib* && python3 -m pytest pywt/tests)

From ac3e12f657de03aa04b91a27c1f13cee63fda9e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:00:13 -0400
Subject: [PATCH 0279/2561] python3-tifffile: update to 2022.3.16.

---
 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 d7a735438e5b..00d4c6c3f391 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.2.9
+version=2022.3.16
 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=901f11169c2aa94c6b3cd9af2998de4b169d33210f78ae08a9acd21a231ebb7e
+checksum=2e51c805be3a77f472c0cca3f0c13e60eb110fbfc305a20e278dad3d4e4fe4bf
 # Tests require unpackaged fsspec
 make_check=no
 

From e94ae669e265d6bd500e644f50ee0eda39ab7615 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:02:25 -0400
Subject: [PATCH 0280/2561] maturin: update to 0.12.11.

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index a7de61b7704a..a6c1cbdd3d71 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.10
+version=0.12.11
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="764d91bb35a41d0fa389f3e8179353c0a7e173fbb52c6d434e2877951f15e4a4
+checksum="4d39f15fae9c01f2f23a544fc26b20c68693ec03f820b30ca5f505647c452be1
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From a7fd2b219ca5779ef7279cc100a11c586df1d36d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:06:09 -0400
Subject: [PATCH 0281/2561] python3-pyzmq: ignore beta releases

---
 srcpkgs/python3-pyzmq/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/python3-pyzmq/update

diff --git a/srcpkgs/python3-pyzmq/update b/srcpkgs/python3-pyzmq/update
new file mode 100644
index 000000000000..e9b0a0a5ea4c
--- /dev/null
+++ b/srcpkgs/python3-pyzmq/update
@@ -0,0 +1 @@
+ignore="*b*"

From 4585ae49ce73ba1ab436cfce29811a0726286fd1 Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Wed, 9 Mar 2022 18:44:49 +0100
Subject: [PATCH 0282/2561] python3-setuptools: update to 60.9.3.

Closes: #36067 [via git-merge-pr]
---
 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 a17da25edcac..1c21c918978d 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=60.5.0
+version=60.9.3
 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=2404879cda71495fc4d5cbc445ed52fdaddf352b36e40be8dcc63147cb4edabe
+checksum=2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;

From d64a2361b1a15d21247703b859d5b81edd0d5281 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 22 Feb 2022 01:59:54 +0100
Subject: [PATCH 0283/2561] python3-pulsectl: update to 22.1.3.

Closes: #35749 [via git-merge-pr]
---
 srcpkgs/python3-pulsectl/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template
index 006363a1c5d4..2c2a985b0b39 100644
--- a/srcpkgs/python3-pulsectl/template
+++ b/srcpkgs/python3-pulsectl/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-pulsectl'
 pkgname=python3-pulsectl
-version=20.5.1
-revision=2
+version=22.1.3
+revision=1
 wrksrc="pulsectl-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"
+checkdepends="pulseaudio"
 short_desc="Python3 high-level interfaces and ctypes bindings for libpulse"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mk-fg/python-pulse-control"
 changelog="https://github.com/mk-fg/python-pulse-control/raw/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/pulsectl/pulsectl-${version}.tar.gz"
-checksum=39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db
+checksum=f28fe4b881dd2cc144d2d94f83ec60d8c59a52642a0ad3635cc4d0f8406f4858
 
 post_install() {
 	vlicense COPYING

From 45021ff4d74ab399db09d66269ae7be6412d91cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 18:01:31 +0100
Subject: [PATCH 0284/2561] doctl: update to 1.71.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 8dd3efe61c68..0580a504f27e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.70.0
+version=1.71.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=527a0d02acb303ca3e55c28db162acbc018fb77ca9e77d9298fece2124774c32
+checksum=62a14c05bd4b8442f0a610f9eba7237fe67e1afc397750893cdf2b741aebfd54

From 1983d76ca7819bc48a611e90cba4de170ab8af69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:28:55 +0100
Subject: [PATCH 0285/2561] qpdf: update to 10.6.3.

---
 srcpkgs/qpdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 83b293d0ac77..324de5aefaa2 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=10.6.2
+version=10.6.3
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://github.com/qpdf/qpdf"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/stable/manual/release-notes.rst"
 distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
-checksum=e8f8f7f09fe3b9d1f98907e4a0cb7fddb4f0f9b8084e7e3201a571334e686c8c
+checksum=64bbb654ec19b6812284ef1bc40c57b091de5281f265f1c3c83dd8ccf6bedcf5
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 25ab3c4abdafaf48ef7eae0ca8176de58d70afac Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 17 Mar 2022 16:06:11 +0100
Subject: [PATCH 0286/2561] libguestfs: update to 1.48.0.

---
 srcpkgs/libguestfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 5ac1d1d2b8ee..8d669017077e 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
-version=1.46.2
-revision=2
+version=1.48.0
+revision=1
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"
@@ -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=e6ea69ca521d60f0c54bd6d3daf1f591cc62e1105dc253897152489aa348006b
+checksum=1681fddedfcf484ca6deec54230330a32defbd30c2ab1f81788e252cb5d04829
 
 conf_files="etc/libguestfs-tools.conf"
 

From a452ec2e579bf79cccaff74fc475f2c2450686da Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 1 Mar 2022 13:38:42 +0100
Subject: [PATCH 0287/2561] lrzip: update to 0.650.

* enable ASM for x86
* liblrzip is deprecated
---
 srcpkgs/liblrzip                  |  1 -
 srcpkgs/lrzip-devel               |  1 -
 srcpkgs/lrzip/template            | 27 ++++++++++-----------------
 srcpkgs/removed-packages/template |  4 +++-
 4 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/liblrzip
 delete mode 120000 srcpkgs/lrzip-devel

diff --git a/srcpkgs/liblrzip b/srcpkgs/liblrzip
deleted file mode 120000
index ce2559e2110e..000000000000
--- a/srcpkgs/liblrzip
+++ /dev/null
@@ -1 +0,0 @@
-lrzip
\ No newline at end of file
diff --git a/srcpkgs/lrzip-devel b/srcpkgs/lrzip-devel
deleted file mode 120000
index ce2559e2110e..000000000000
--- a/srcpkgs/lrzip-devel
+++ /dev/null
@@ -1 +0,0 @@
-lrzip
\ No newline at end of file
diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template
index 2ec52997c8e8..1b492e9e6c6c 100644
--- a/srcpkgs/lrzip/template
+++ b/srcpkgs/lrzip/template
@@ -1,6 +1,6 @@
 # Template file for 'lrzip'
 pkgname=lrzip
-version=0.641
+version=0.650
 revision=1
 build_style="gnu-configure"
 hostmakedepends="perl automake libtool"
@@ -10,25 +10,18 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lrzip.kolivas.org/"
 distfiles="https://github.com/ckolivas/lrzip/archive/v${version}.tar.gz"
-checksum=9b6b4bb1ae76dafbaab96ec9d50d41af5fed45a6c4f2e06feea828c2cd8025c0
+checksum=e07b2b3511689e4aaf7404d289feba5d9d6e1170c448f85e393a11249502dd66
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*) hostmakedepends+=" nasm";;
+esac
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
 
-lrzip-devel_package() {
-	short_desc+=" - development files"
-	depends="liblrzip-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
-liblrzip_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-	}
+# The library is deprecated as of lrzip 0.650.
+post_install() {
+	rm -f ${DESTDIR}/usr/include/Lrzip.h
+	rm -f ${DESTDIR}/usr/lib/pkgconfig/lrzip.pc
 }
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6a744198712d..c23125bb0cb4 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=65
+revision=66
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -211,6 +211,7 @@ replaces="
  libgksu<=2.0.12_5
  libglib-static<=2.58.3_5
  libgtkhtml<=4.10.0_1
+ liblrzip<=0.641_1
  libmagick6-devel<=6.9.12.12_2
  libmagick6-perl<=6.9.12.12_2
  libmagick6<=6.9.12.12_2
@@ -228,6 +229,7 @@ replaces="
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  lprng<=3.8.C_1
+ lrzip-devel<=0.641_1
  ls++-git<=20140919_3
  luxmark<=3.1_9
  luxrays-devel<=3.1_18

From 132808d7291d906ed1793754744b0264320ad697 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Mar 2022 20:13:45 +0100
Subject: [PATCH 0288/2561] sigil: update to 1.9.2.

---
 srcpkgs/sigil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 47b8b14dd330..5e0adb74c86c 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.9.1
+version=1.9.2
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=08a6c52a9043ecb5fa8314783191b81aa21346bd6b937a522ee417e7bb0dc773
+checksum=d1a16f33fe93cda88442c798e0c53f700fa8e2ef792dd78566392d7ad11d997f
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From bba9814a529f1c14665772e31117ff497997786e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 9 Mar 2022 01:52:18 +0100
Subject: [PATCH 0289/2561] mercurial: update to 6.1.

---
 srcpkgs/mercurial/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 778d60757cf6..26795f34512d 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=6.0.3
+version=6.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-devel gettext"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=67f13647a46517a2b567cdcb73c98721d75d36a0432debb15022b77f9c138333
+checksum=86f98645e4565a9256991dcde22b77b8e7d22ca6fbb60c1f4cdbd8469a38cc1f
 
 pre_check() {
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then

From 04b20c181dbf62514851fc159ca82d93f4ac898b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 15 Mar 2022 11:35:30 +0100
Subject: [PATCH 0290/2561] ansible-core: update to 2.12.3.

---
 srcpkgs/ansible-core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index fc3df299249c..80236532b369 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
-version=2.12.2
+version=2.12.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ 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-core/ansible-core-${version}.tar.gz"
-checksum=bc79e1723a5a92cbc105d581b25b66840d15bb5f4c98925c936ef5a71f92e7c3
+checksum=8a135a9f74c97cab67759293744ad34350f719523e8bd9bb9008df4cf953af20
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
 # Tests are currently broken for ansible on python 3.10

From b2690d66287963c2b02df963c7b970738b073349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 15 Mar 2022 11:35:33 +0100
Subject: [PATCH 0291/2561] ansible: update to 5.4.0.

---
 srcpkgs/ansible/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 70de17aec1f3..eb132fa68380 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=5.3.0
+version=5.4.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ 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=50020dab43f6c59debdeb57f45c90ec6db78d4fa574edc6d75bc52e05cbd3639
+checksum=2f0ecbd8a3232e520bf3e3bc23f40dda60b9ce7924ca194bd35f4de4027100fc
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660

From bcd3f13c0254b719726e0a9032796d85cc1adfe3 Mon Sep 17 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, 17 Mar 2022 22:57:58 +0700
Subject: [PATCH 0292/2561] python3-pkgconfig: depends on pkg-config

Close #35371
---
 srcpkgs/python3-pkgconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pkgconfig/template b/srcpkgs/python3-pkgconfig/template
index 8b015d19b57f..05d37a5d5ee1 100644
--- a/srcpkgs/python3-pkgconfig/template
+++ b/srcpkgs/python3-pkgconfig/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-pkgconfig'
 pkgname=python3-pkgconfig
 version=1.5.1
-revision=5
+revision=6
 wrksrc="pkgconfig-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3"
+depends="python3 pkg-config"
 short_desc="Python3 module to interface with pkg-config"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From ae384f9468e13dde5852163e6551d0328504ddae Mon Sep 17 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, 17 Mar 2022 23:07:00 +0700
Subject: [PATCH 0293/2561] xob: fix crash

When building xob without any arguments, xob will be built with
SYSCONFDIR points to /usr/local/etc. Thus, crash at runtime.

Reported-by: Urs Schulz <voidpkgs@ursschulz.de>
Close #35009
---
 srcpkgs/xob/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template
index f2d1701f523e..dfac3851302c 100644
--- a/srcpkgs/xob/template
+++ b/srcpkgs/xob/template
@@ -1,9 +1,10 @@
 # Template file for 'xob'
 pkgname=xob
 version=0.3
-revision=1
+revision=2
 build_style=gnu-makefile
-make_install_args="prefix=/usr sysconfdir=/etc"
+make_build_args="prefix=/usr sysconfdir=/etc"
+make_install_args="$make_build_args"
 make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libconfig-devel libXrender-devel"

From 4357e9542157d9c2d58ab5589edc71bd33c29293 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 6 Mar 2022 18:22:18 -0700
Subject: [PATCH 0294/2561] python3-identify: update to 2.4.11.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/python3-identify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-identify/template b/srcpkgs/python3-identify/template
index 6af581162d2f..65fd70ec42c6 100644
--- a/srcpkgs/python3-identify/template
+++ b/srcpkgs/python3-identify/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-identify'
 pkgname=python3-identify
-version=2.3.1
+version=2.4.11
 revision=1
 wrksrc="identify-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://github.com/chriskuehl/identify"
 distfiles="${PYPI_SITE}/i/identify/identify-${version}.tar.gz"
-checksum=8a92c56893e9a4ce951f09a50489986615e3eba7b4c60610e0b25f93ca4487ba
+checksum=2986942d3974c8f2e5019a190523b0b0e2a07cb8e89bf236727fb4b26f27f8fd
 
 post_install() {
 	vlicense LICENSE

From bb8f8e5458901758d9644adad7885cc3f46e7fbc Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 6 Mar 2022 18:22:53 -0700
Subject: [PATCH 0295/2561] pre-commit: update to 2.17.0.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/pre-commit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 855dff84d13f..3eecb71e1136 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
 # Template file for 'pre-commit'
 pkgname=pre-commit
-version=2.15.0
+version=2.17.0
 revision=1
 wrksrc="pre_commit-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://pre-commit.com/"
 distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=3c25add78dbdfb6a28a651780d5c311ac40dd17f160eb3954a0c59da40a505a7
+checksum=c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a
 make_check=no   # No tests available
 
 post_install() {

From 74620c9099d501a866a65b081b00d06b273a5c9e Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Wed, 16 Mar 2022 14:31:06 +0100
Subject: [PATCH 0296/2561] pyradio: update to 0.8.9.14

---
 srcpkgs/pyradio/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index a86b57d7bd61..1c2670682351 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,17 +1,17 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.8.9.9
-revision=2
+version=0.8.9.14
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-requests python3-dnspython"
+depends="python3-requests python3-dnspython python3-psutil"
 short_desc="Curses based internet radio player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.coderholic.com/pyradio/"
-changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=9114254088e294bf06399f892c08056d86172bd32c40869474347eb846a965f3
+checksum=76e06934926a1acfd7bba3735d8e0b387d7985dd38a398376877b6fd7da71940
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 1a7edfdf402b3c8969b7d9766d99db65693f2a01 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 27 Feb 2022 10:15:07 -0700
Subject: [PATCH 0297/2561] nyxt: remove runtime deps on *-devel

Signed-off-by: Joseph Benden <joe@benden.us>
Close: #35877
---
 srcpkgs/nyxt/patches/001-libfixposix.patch | 12 ++++++++++++
 srcpkgs/nyxt/patches/002-webkit2gtk.patch  | 14 ++++++++++++++
 srcpkgs/nyxt/template                      |  7 ++++---
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/nyxt/patches/001-libfixposix.patch
 create mode 100644 srcpkgs/nyxt/patches/002-webkit2gtk.patch

diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch
new file mode 100644
index 000000000000..23ef9da26442
--- /dev/null
+++ b/srcpkgs/nyxt/patches/001-libfixposix.patch
@@ -0,0 +1,12 @@
+--- a/_build/iolib/src/syscalls/ffi-functions-unix.lisp.orig	2022-02-27 09:44:00.327307802 -0700
++++ b/_build/iolib/src/syscalls/ffi-functions-unix.lisp	2022-02-27 09:48:30.875539336 -0700
+@@ -12,7 +12,8 @@
+ (eval-when (:compile-toplevel :load-toplevel :execute)
+   (define-foreign-library
+       (libfixposix :canary "lfp_buildinfo")
+-    (t (:default "libfixposix")))
++    (:unix "libfixposix.so.3")
++    (t (:default "libfixposix")))
+   (load-foreign-library 'libfixposix))
+ \f
+ 
diff --git a/srcpkgs/nyxt/patches/002-webkit2gtk.patch b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
new file mode 100644
index 000000000000..5a0fe2e923d3
--- /dev/null
+++ b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
@@ -0,0 +1,14 @@
+--- a/_build/cl-webkit/webkit2/webkit2.init.lisp	2022-01-14 03:22:05.000000000 -0700
++++ b/_build/cl-webkit/webkit2/webkit2.init.lisp	2022-02-27 09:59:29.175938024 -0700
+@@ -18,9 +18,9 @@
+               "libwebkit2gtk-4.0.37.dylib"
+               "libwebkit2gtk-4.0.dylib"))
+     (:unix (:or "libwebkit2gtk-4.1.so"
+-                "libwebkit2gtk-4.0.so"
+                 ;; Fedora only has this one?
+-                "libwebkit2gtk-4.0.so.37")))
++                "libwebkit2gtk-4.0.so.37"
++                "libwebkit2gtk-4.0.so")))
+   (use-foreign-library libwebkit2))
+ 
+ (defcfun "webkit_get_major_version" :int)
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index 8332e1286d2c..a0da399fb2da 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,13 +1,13 @@
 # Template file for 'nyxt'
 pkgname=nyxt
 version=2.2.4
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target=all
 hostmakedepends="sbcl git"
-makedepends="webkit2gtk-devel libfixposix-devel libgirepository-devel"
-depends="dbus xclip enchant2 webkit2gtk-devel libfixposix-devel libgirepository-devel"
+makedepends="webkit2gtk libfixposix-devel libgirepository-devel"
+depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"
@@ -19,6 +19,7 @@ make_check=no
 nostrip=yes
 nopie=yes
 nocross="Cross-compilation fails due to package iolib/syscalls setting incorrect compiler flags"
+shlib_requires="libwebkit2gtk-4.0.so.37 libfixposix.so.3 libgirepository-1.0.so.1"
 
 do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} install

From a438616b62f8240e426281cd66667a7eb0b11d48 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Fri, 18 Mar 2022 19:43:51 +0530
Subject: [PATCH 0298/2561] alacritty: update to 0.10.1

- fix cross-compiling
- fix distfiles URL
---
 srcpkgs/alacritty/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 9fb9ccfdb36d..94bf361be18d 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,6 +1,6 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.10.0
+version=0.10.1
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
@@ -12,9 +12,13 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5dee9c94f944b742b0189dd87c43c87175ffadde8049abb4668ca5a3e68fd65a
-nocross="IndexMap/autocfg/rust issues - #34889"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=e48d4b10762c2707bb17fd8f89bd98f0dcccc450d223cade706fdd9cfaefb308
+
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From d60922057c517fed3eaa6f87dd36155931da2f50 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 18 Mar 2022 20:16:43 +0100
Subject: [PATCH 0299/2561] scite: update to 5.2.1.

---
 srcpkgs/scite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 02f66bdc7b1f..4943d99f3fcf 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.2.0
+version=5.2.1
 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=a63e0f340bf90df8c1ec9abe8d9c5db0a3aee5663c8b325117155456364f52ff
+checksum=0e7a1daca03d9eea20b2857b722ffd57788799235803bb7b84694af5a1707e07
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile

From 34c390511160d7be38472b2eebb3d44feedf3156 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Mar 2022 16:48:30 +0100
Subject: [PATCH 0300/2561] lrzip: update to 0.651.

---
 srcpkgs/lrzip/template | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template
index 1b492e9e6c6c..afc7475bf96d 100644
--- a/srcpkgs/lrzip/template
+++ b/srcpkgs/lrzip/template
@@ -1,6 +1,6 @@
 # Template file for 'lrzip'
 pkgname=lrzip
-version=0.650
+version=0.651
 revision=1
 build_style="gnu-configure"
 hostmakedepends="perl automake libtool"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lrzip.kolivas.org/"
 distfiles="https://github.com/ckolivas/lrzip/archive/v${version}.tar.gz"
-checksum=e07b2b3511689e4aaf7404d289feba5d9d6e1170c448f85e393a11249502dd66
+checksum=f4c84de778a059123040681fd47c17565fcc4fec0ccc68fcf32d97fad16cd892
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) hostmakedepends+=" nasm";;
@@ -19,9 +19,3 @@ esac
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
-
-# The library is deprecated as of lrzip 0.650.
-post_install() {
-	rm -f ${DESTDIR}/usr/include/Lrzip.h
-	rm -f ${DESTDIR}/usr/lib/pkgconfig/lrzip.pc
-}

From 72ea28aadcfeac0292c7acb1ea507c9233782fb0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 18 Mar 2022 20:13:07 +0100
Subject: [PATCH 0301/2561] perl: update to 5.34.1.

---
 srcpkgs/perl/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index da223660988a..54ce2298d139 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,8 +1,8 @@
 # Template file for 'perl'
 pkgname=perl
-version=5.34.0
+version=5.34.1
 revision=1
-_perl_cross_version=1.3.6
+_perl_cross_version=1.3.7
 build_style=gnu-configure
 hostmakedepends="less"
 makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
@@ -14,8 +14,8 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://www.perl.org"
 distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
  https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
-checksum="551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a
- 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5"
+checksum="357951a491b0ba1ce3611263922feec78ccd581dddc24a446b033e25acf242a1
+ 77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335"
 
 # Before updating this package to a new major version, run ${FILESDIR}/provides.pl
 # against ${wrksrc} to find the list of built in packages.
@@ -39,7 +39,7 @@ provides="perl-Archive-Tar-2.38_1
  perl-Digest-MD5-2.58_1
  perl-Digest-SHA-6.02_1
  perl-Dumpvalue-1.21_1
- perl-Encode-3.08_1
+ perl-Encode-3.08.01_1
  perl-Env-1.05_1
  perl-Exporter-5.76_1
  perl-ExtUtils-CBuilder-0.280236_1
@@ -74,7 +74,7 @@ provides="perl-Archive-Tar-2.38_1
  perl-Math-BigRat-0.2614_1
  perl-Math-Complex-1.59.02_1
  perl-Memoize-1.03.01_1
- perl-Module-CoreList-5.20210520_1
+ perl-Module-CoreList-5.20220313_1
  perl-Module-Load-0.36_1
  perl-Module-Load-Conditional-0.74_1
  perl-Module-Loaded-0.08_1

From 5d47f1ee20bed6e85e20a8d3889cded5371b4b2c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 08:24:09 +0100
Subject: [PATCH 0302/2561] cfitsio: update to 4.1.0.

---
 srcpkgs/cfitsio/template  |  6 +++---
 srcpkgs/cfitsio/templateo | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cfitsio/templateo

diff --git a/srcpkgs/cfitsio/template b/srcpkgs/cfitsio/template
index 55ff7d14e61d..4ce6d6d138bc 100644
--- a/srcpkgs/cfitsio/template
+++ b/srcpkgs/cfitsio/template
@@ -1,7 +1,7 @@
 # Template file for 'cfitsio'
 pkgname=cfitsio
-version=4.0.0
-revision=2
+version=4.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-reentrant"
 makedepends="libcurl-devel"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="custom:NASA license"
 homepage="https://heasarc.gsfc.nasa.gov/fitsio/"
 distfiles="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${pkgname}-${version}.tar.gz"
-checksum=b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e
+checksum=b367c695d2831958e7166921c3b356d5dfa51b1ecee505b97416ba39d1b6c17a
 
 post_install() {
 	vlicense License.txt
diff --git a/srcpkgs/cfitsio/templateo b/srcpkgs/cfitsio/templateo
new file mode 100644
index 000000000000..2df3d6385012
--- /dev/null
+++ b/srcpkgs/cfitsio/templateo
@@ -0,0 +1,27 @@
+# Template file for 'cfitsio'
+pkgname=cfitsio
+version=4.1.0
+revision=1
+build_style=gnu-configure
+configure_args="--enable-reentrant"
+makedepends="libcurl-devel"
+short_desc="Library for reading and writing data files in FITS data format"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="custom:NASA license"
+homepage="https://heasarc.gsfc.nasa.gov/fitsio/"
+distfiles="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${pkgname}-${version}.tar.gz"
+checksum=b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e
+
+post_install() {
+	vlicense License.txt
+}
+
+cfitsio-devel_package() {
+	depends="cfitsio-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From ce4b054f4ce097c185ccb2170af97816d736ea76 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 08:28:30 +0100
Subject: [PATCH 0303/2561] obconf-qt: update to 0.16.2.

---
 srcpkgs/obconf-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/obconf-qt/template b/srcpkgs/obconf-qt/template
index 40f4e2f54866..793399f3e499 100644
--- a/srcpkgs/obconf-qt/template
+++ b/srcpkgs/obconf-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'obconf-qt'
 pkgname=obconf-qt
-version=0.16.1
+version=0.16.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -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=458d96b63dca8a09a4f477d42030d829e8090aae0ea39b3994fcf0b8da8e8b42
+checksum=7328da1606b289280e2ce0f2279ab30d06f584e4c2d6fc5f01c0f3d9ce714960

From 8f6b15141f02657f0eebd0f526aff6aee2b04946 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 09:14:49 +0100
Subject: [PATCH 0304/2561] vlc: update to 3.0.17.3.

---
 srcpkgs/vlc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 309477a2f775..318e7ac12ce1 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.17
+version=3.0.17.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
@@ -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=48bd9bf337aa107a1524eba57c52dc4a91e29f5a97fbdee92f6a4dba90383cd0
+checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014
 
 lib32disabled=yes
 

From 71035bf2d614da6bcf8b37b77d3972cf1abecf27 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 09:18:01 +0100
Subject: [PATCH 0305/2561] linux5.4: update to 5.4.185.

---
 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 983e18bdc0ba..771796079797 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.184
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=8694ca39e6c665cac5a78c7f80acef83ad9b5b13f9688e94bfe39b3c71541489
+checksum=d15fe9da679bfb624f35f127a17559f6d037ad37a313cf5fd22ce155401f3787
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 71a4cb4f76d7b191788461fcb888dc497fb82142 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 09:20:12 +0100
Subject: [PATCH 0306/2561] linux4.19: update to 4.19.235.

---
 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 64351dd2d235..840a4516d83e 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.234
+version=4.19.235
 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=0082966be4a476c42ed59996e072e7e9fa5282b742efe4ffabadd6cd91212d8b
+checksum=530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 681c1e8c2470f23f3d88c80d1c9dccf38e3fc648 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 18 Mar 2022 20:56:11 -0500
Subject: [PATCH 0307/2561] gns3-server: loosen requirements for new
 python3-distro package

---
 srcpkgs/gns3-server/patches/requirements.patch | 3 ++-
 srcpkgs/gns3-server/template                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch
index 4cfa85b16ba2..27cd2441e53c 100644
--- a/srcpkgs/gns3-server/patches/requirements.patch
+++ b/srcpkgs/gns3-server/patches/requirements.patch
@@ -14,7 +14,8 @@ diff --git a/requirements.txt b/requirements.txt
 -psutil==5.9.0
 +psutil>=5.9.0
  async-timeout==3.0.1
- distro==1.6.0
+-distro==1.6.0
++distro>=1.6.0
  py-cpuinfo==8.0.0
 -setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
 +setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 038457a27a3b..c45f0a8f8b82 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
 version=2.2.31
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl

From 05402b59827205aec4d82eded8decee56c387f20 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 18 Mar 2022 20:57:06 -0500
Subject: [PATCH 0308/2561] gns3-gui: loosen requirements for new
 python3-distro package

---
 srcpkgs/gns3-gui/patches/requirements.patch | 3 ++-
 srcpkgs/gns3-gui/template                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch
index ab3d55dea830..6cf6d68d94cc 100644
--- a/srcpkgs/gns3-gui/patches/requirements.patch
+++ b/srcpkgs/gns3-gui/patches/requirements.patch
@@ -7,7 +7,8 @@ diff --git a/requirements.txt b/requirements.txt
 -sentry-sdk==1.5.4
 -psutil==5.9.0
 +psutil>=5.9.0
- distro==1.6.0
+-distro==1.6.0
++distro>=1.6.0
 -setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
 +setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
  setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 175eab41080c..348325010d73 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
 version=2.2.31
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema

From a5a73fc2e1338ebc13aba2823348cb63eab9a285 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Fri, 4 Mar 2022 19:16:42 -0500
Subject: [PATCH 0309/2561] New package: tea-0.8.0

---
 srcpkgs/tea/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/tea/template

diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
new file mode 100644
index 000000000000..5b01c790341f
--- /dev/null
+++ b/srcpkgs/tea/template
@@ -0,0 +1,19 @@
+# Template file for 'tea'
+pkgname=tea
+version=0.8.0
+revision=1
+wrksrc=$pkgname
+build_style=go
+go_import_path=code.gitea.io/tea
+depends="git"
+short_desc="Command line tool to interact with Gitea"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="MIT"
+homepage="https://gitea.com/gitea/tea"
+changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
+distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
+checksum=6c73c0a7b66cdfd1e5a302257d54df06a3a41eb9bdbfeb547966db431ae23b23
+
+post_install() {
+	vlicense LICENSE
+}

From 79a13c090ea82434f3cfb9c63085ae4075079498 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 16:14:15 +0100
Subject: [PATCH 0310/2561] linux5.15: update to 5.15.30.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index d314a6f8a251..9b43d8ebf3e3 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.28
+version=5.15.30
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 1019709aa85b87904e901aca141f8ade27b3719333be8a3e9d3b2cb0e05ad345"
+ 18059d8e3f01ab38b22ddf4c2e0a0a9db50926f6535649f51ee7a86a8542aff1"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 2049d765c3d4e36c0c0b69a0195fd9bcebd443a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 16:18:09 +0100
Subject: [PATCH 0311/2561] linux5.10: update to 5.10.107.

---
 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 305d9822a51c..a3ccac15e158 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.105
+version=5.10.107
 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=3ddc0e0ab2b9cadb64df43141e0a1e5432b5963ed50f34d586c065ac8d4fcb85
+checksum=c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From e8e3c62c953f29b8fe2f7ac8e12ed436bd2ae949 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 16:22:26 +0100
Subject: [PATCH 0312/2561] linux5.16: update to 5.16.16.

---
 srcpkgs/linux5.16/files/arm64-dotconfig | 5 +++--
 srcpkgs/linux5.16/template              | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig
index d928e0d07a04..23f03c1e5630 100644
--- a/srcpkgs/linux5.16/files/arm64-dotconfig
+++ b/srcpkgs/linux5.16/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.16.11 Kernel Configuration
+# Linux/arm64 5.16.16 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -376,6 +376,7 @@ CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_1508412=y
 CONFIG_ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE=y
 CONFIG_ARM64_ERRATUM_2051678=y
+CONFIG_ARM64_ERRATUM_2077057=y
 CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
@@ -429,7 +430,6 @@ CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -439,6 +439,7 @@ CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template
index a4d787e19716..5775997c8c58 100644
--- a/srcpkgs/linux5.16/template
+++ b/srcpkgs/linux5.16/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.16'
 pkgname=linux5.16
-version=5.16.11
+version=5.16.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="027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb
- ef7b5e4f1b043a58fcece6e3f5d9e5425db7fb2a1abddc64c5094b93931bab37"
+ 9e7af5007d3596c1efee8556aaa1b1a2e40ddded107448b583624a1f305376db"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 519e06c2765f9eba1ade3a4d30aef745eefe9ec2 Mon Sep 17 00:00:00 2001
From: Eduard Ganiukov <ed+git@gnkv.io>
Date: Sat, 19 Feb 2022 23:05:21 +0100
Subject: [PATCH 0313/2561] himalaya: update to 0.5.9

---
 srcpkgs/himalaya/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/himalaya/template b/srcpkgs/himalaya/template
index 5ad5316f8c08..6869ca90cc20 100644
--- a/srcpkgs/himalaya/template
+++ b/srcpkgs/himalaya/template
@@ -1,8 +1,9 @@
 # Template file for 'himalaya'
 pkgname=himalaya
-version=0.5.1
+version=0.5.9
 revision=1
 build_style=cargo
+make_check_args="--lib"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
 short_desc="CLI email client"
@@ -11,7 +12,12 @@ license="BSD-3-Clause"
 homepage="https://github.com/soywod/himalaya"
 changelog="https://raw.githubusercontent.com/soywod/himalaya/master/CHANGELOG.md"
 distfiles="https://github.com/soywod/himalaya/archive/v${version}.tar.gz"
-checksum=13567726903243f04a4aa64e96b88e0d0fd5c3ccbe4953357f3a8ef1c569dad9
+checksum=70da5d75354e47b47315938b9cbeca2ec167b8e6bd8ce133eff68ef1638d8c59
+
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
 
 post_install() {
 	vlicense LICENSE

From 83b97abff5ee84f36ef353ba81e9ea9eb2e26451 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 17:29:07 +0100
Subject: [PATCH 0314/2561] babashka: update to 0.7.8.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 64fd2b0b1cfe..5a2292af27bf 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.7.6
+version=0.7.8
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -10,14 +10,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
 changelog="https://github.com/babashka/babashka/blob/master/CHANGELOG.md"
-_sci_commit=582aa8fa0bac2251e9d4acb93d042bf9d99282c7
+_sci_commit=4eb8e99e18942ba9c3b7ec3c4707d8237f970035
 _babashka_curl_commit=3d3d117ea0f8a143a06e3cace92e4e8b6a5782df
-_babashka_nrepl_commit=e8e2273a8de6e8c45371e8ee8d5fa49e5d7dea02
+_babashka_nrepl_commit=d3fce67198b042707f01d841c032f841cc57ab7f
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=2343393d3266026097a61b8fced6f1b1beaefad0
+_process_commit=5db9560eab698f9773537acb0167f38d6fd0d322
 _pods_commit=538fc6f4147badf3a457b3eb8f9f95dd3bc947b1
-_deps_clj_commit=e6fb7918b5898549084fc82d006ed8857bf49ccd
-_fs_commit=ec037054668d3fd31d858de97ce125462d357da6
+_deps_clj_commit=6636890388cdf779708806a93110b165577cd226
+_fs_commit=2bf527f797d69b3f14247940958e0d7b509f3ce2
 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
@@ -29,15 +29,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
  https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="97e61e9138cf614cf1e2d92083a4504eb97fccc0bacfba4853f1417230d6b679
- e39d038aa0ff3f058a41a962fae6cc1e87192cfa26b27c218fe2333245692e41
+checksum="23a08adcc9237be9f24c1781cb646514434dbcb651aac00c3eedca763ca25086
+ 0766f0a8be23e94efefbfc16c5987f1dab4520da3294f1bccef402f97898c490
  45abdaa5e4effd3bcfea777d02844d4634f1f80a592843eca9ec7d3544b7e16d
- bc6a65c9bad2ced362636fca54ee5105e12706bd7c4412edd64c0bb18af15b3e
+ b56a06bf113bcd85084d48f595541447014308860d9c45efcde5b02e859c934c
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 99ffaf99eccccb78001f2fd85527d41461f645d65f4cd839295fcba07f85eb8b
+ b6671246a1f0742bd4ae4d1f7b0afe4101d6c8907060455e0473c2ef966e370c
  7fea6762ecbb31d454e0b5c194d12e1e6d4ec301972aa33daf617b571e097678
- 2f1824c0a525481489ecfa0f2fa4c9e6b5a0e4e00676d0dcecfc7107ceebe979
- 9c98895e85e2566d0db7f5f85815a83e0839525bb7599e6a22778dbdd1ce2a3b
+ fee3f84f935d141cf7343d7bab19c3eef56fdb2f3dac4a950db71c9b083e0d17
+ e5b92a25221b735941861968a5570a4169da1aee7f2a7545975afe930cb8574f
  bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"

From de9cec7ab7bb1e16a2000332da7081cdce896e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sat, 19 Mar 2022 21:15:33 +0100
Subject: [PATCH 0315/2561] tailscale: bump to 1.22.2

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 4684014fffd7..27a3611b7296 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.22.0
+version=1.22.2
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -13,7 +13,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=79c240a3d623a304c908a8b4035f1f775014e9dff6ae076c06279c2829a7d746
+checksum=3e7b5b8073a7b94d84ff6677a9f110070b808c8d35c5b7da0c6e6fe639444e58
 
 post_install() {
 	vlicense LICENSE

From a5ece0c4ba9e10d0195791bb579c543ab1e4d042 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:17:39 -0500
Subject: [PATCH 0316/2561] nomad: update to 1.2.6.

---
 srcpkgs/nomad/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 0e6f169d0118..8707ada37bf9 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.2.3
-revision=2
+version=1.2.6
+revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=55e5c49b99a6fd2bf925e7fd98d95829776c331f
+_git_commit=95514d569610f15ce49b4a7a1a6bfd3e7b3e7b4f
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=36e074f34091043a2b5d115496f371fb9df048134f402bb5943e17bcb2f911ff
+checksum=c69ec89ae5f76704d4b3ecb842b130f3d90e579bfd31191721b5f2da99f95a93
 
 post_install() {
 	vlicense LICENSE

From 84006692b426c20f0588a1c33a6a01b7789c7753 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:20:47 -0500
Subject: [PATCH 0317/2561] consul: update to 1.11.4.

---
 srcpkgs/consul/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index e7a39388514f..fc0e80502879 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.11.1
+version=1.11.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=2c56447e427c0dd4bdbcabe6cc39bd0802aaf897
+_git_commit=944e8ce64201ab2bbe923b207883d08a4dcff73a
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=e548902d6a9c92bcc07fc1af33049078fb34a371e9853be6b0d6a69cf2a2c208
+checksum=253200fbf79aefee632c5cde9f90e6df6eddcb2766f2909b0d347c4438065126
 
 post_install() {
 	vlicense LICENSE

From d350911ed5a02598b05c8995cffd839664d44c51 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:27:30 -0500
Subject: [PATCH 0318/2561] vault: update to 1.9.4.

---
 srcpkgs/vault/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 1ba3566e77c7..4746d4974195 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.9.2
+version=1.9.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=aca76f63357041a43b49f3e8c11d67358496959f
+_git_commit=fcbe948b2542a13ee8036ad07dd8ebf8554f56cb
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 depends="libcap-progs"
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=84a2506d8d0e0757a3229012328904b5e1e13c39c7766d431ffa9c32bce51fae
+checksum=7ebae46e12ff353c3a9e861c4991410679a3c890d36c7c6fb17b43e9ea6f6115
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0750 root _vault"

From fd3b90494ae173718bacd76e4d03d9746f5a46af Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:37:39 -0500
Subject: [PATCH 0319/2561] terraform: update to 1.1.7.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 4f03771b4775..14fb8b368a9a 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.1.6
+version=1.1.7
 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=4dd037773928b93ba98c7885c9f2f500db96c407555459a744f8316ab9b16d34
+checksum=7651b69a2196de4393195cef4a03171c83aa50581f1019bca3f17cf05db5335b

From d7bbe882842fcb71e809466b2a9be812c5b25dfb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 00:09:37 +0100
Subject: [PATCH 0320/2561] zimg: update to 3.0.3.

---
 srcpkgs/zimg/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zimg/template b/srcpkgs/zimg/template
index a0b0ff763198..3f2f7291d0aa 100644
--- a/srcpkgs/zimg/template
+++ b/srcpkgs/zimg/template
@@ -1,6 +1,6 @@
 # Template file for 'zimg'
 pkgname=zimg
-version=2.9.3
+version=3.0.3
 revision=1
 wrksrc=zimg-release-${version}
 build_style=gnu-configure
@@ -9,8 +9,13 @@ short_desc="Image processing library"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="WTFPL"
 homepage="https://github.com/sekrit-twc/zimg"
+changelog="https://raw.githubusercontent.com/sekrit-twc/zimg/master/ChangeLog"
 distfiles="https://github.com/sekrit-twc/zimg/archive/release-${version}.tar.gz"
-checksum=a15c0483fbe945ffe695a1a989bc43b3381c8bf33e2d1760464ec21d32cdf30b
+checksum=5e002992bfe8b9d2867fdc9266dc84faca46f0bfd931acc2ae0124972b6170a7
+
+case "$XBPS_TARGET_MACHINE" in
+	armv7*) configure_args+=" --disable-simd";;
+esac
 
 pre_configure() {
 	./autogen.sh

From b1b08640247a39806f45ff0469845048cd3da047 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 00:09:41 +0100
Subject: [PATCH 0321/2561] vapoursynth: update to R57.

---
 srcpkgs/vapoursynth/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index c4de1d5712a0..63a2043fe522 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -1,21 +1,22 @@
 # Template file for 'vapoursynth'
 pkgname=vapoursynth
-version=R52
-revision=4
+version=R57
+revision=1
 build_style=gnu-configure
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
-configure_args="am_cv_python_version=${py3_ver}"
 hostmakedepends="automake libtool nasm pkg-config python3-Cython"
-makedepends="ffmpeg-devel python3-devel zimg-devel libass-devel libmagick-devel
- libxml2-devel"
+makedepends="python3-devel zimg-devel"
 short_desc="Application for video manipulation"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="LGPL-2.1-or-later, OFL-1.1"
 homepage="http://www.vapoursynth.com"
 changelog="https://raw.githubusercontent.com/vapoursynth/vapoursynth/master/ChangeLog"
 distfiles="https://github.com/vapoursynth/vapoursynth/archive/${version}.tar.gz"
-checksum=4d5dc7950f4357da695d29708bc98013bc3e0bd72fc5d697f8c91ce3c4a4b2ac
+checksum=9bed2ab1823050cfcbdbb1a57414e39507fd6c73f07ee4b5986fcbf0f6cb2d07
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS="-latomic"
+fi
 
 pre_configure() {
 	./autogen.sh

From 9aacdeba579c0510fb14b85527126a89092396eb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:54:08 +0100
Subject: [PATCH 0322/2561] common/environment/setup/misc.sh: add
 ${VIDEOLAN_SITE}

---
 common/environment/setup/misc.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index d22a7388d689..177b1e5622a2 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -17,5 +17,6 @@ MOZILLA_SITE="https://ftp.mozilla.org/pub"
 GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
+VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
 
 set +a

From b594110ae27b32d40079e8c53fe92c46cebf09b9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:53:17 +0100
Subject: [PATCH 0323/2561] Manual.md: document ${VIDEOLAN_SITE}

---
 Manual.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Manual.md b/Manual.md
index 40b2321f7a25..af5f698debae 100644
--- a/Manual.md
+++ b/Manual.md
@@ -529,6 +529,7 @@ Example:
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
   | XORG_SITE        | https://www.x.org/releases/individual            |
   | KDE_SITE         | https://download.kde.org/stable                 |
+  | VIDEOLAN_SITE    | https://download.videolan.org/pub/videolan      |
 
 - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be
 separated by blanks. Please note that the order must be the same than

From b569e3111a00d1d219c609a2410e4ae3d0d3dd0d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:42:29 +0100
Subject: [PATCH 0324/2561] vlc: use ${VIDEOLAN_SITE}

---
 srcpkgs/vlc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 318e7ac12ce1..14a00043a651 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -16,7 +16,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 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"
+distfiles="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz"
 checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014
 
 lib32disabled=yes

From 2d5a016b45a237e2d40b900d0305c4e65dc9f613 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:42:38 +0100
Subject: [PATCH 0325/2561] x264: use ${VIDEOLAN_SITE}

---
 srcpkgs/x264/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index 1ed803645ba6..a33dede30ccb 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -10,7 +10,7 @@ short_desc="Free library for encoding H264/AVC video streams"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.videolan.org/developers/x264.html"
-distfiles="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${version//./-}-stable.tar.bz2"
+distfiles="${VIDEOLAN_SITE}/x264/snapshots/x264-snapshot-${version//./-}-stable.tar.bz2"
 checksum=b2495c8f2930167d470994b1ce02b0f4bfb24b3317ba36ba7f112e9809264160
 
 pre_configure() {

From e95da374d84dd62e57de328867be02a8eba7bb31 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:42:51 +0100
Subject: [PATCH 0326/2561] libdvdnav: use ${VIDEOLAN_SITE}

---
 srcpkgs/libdvdnav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libdvdnav/template b/srcpkgs/libdvdnav/template
index 5a7a859c4c0b..9ff884a90b37 100644
--- a/srcpkgs/libdvdnav/template
+++ b/srcpkgs/libdvdnav/template
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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"
+distfiles="${VIDEOLAN_SITE}/libdvdnav/${version}/libdvdnav-${version}.tar.bz2"
 checksum=c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48
 
 libdvdnav-devel_package() {

From 9ac51da482c0efad15671dcb4e9adcb7130d0960 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:04 +0100
Subject: [PATCH 0327/2561] libdvdcss: use ${VIDEOLAN_SITE}

---
 srcpkgs/libdvdcss/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libdvdcss/template b/srcpkgs/libdvdcss/template
index ca9d26cd31cd..c77443b8e055 100644
--- a/srcpkgs/libdvdcss/template
+++ b/srcpkgs/libdvdcss/template
@@ -7,7 +7,7 @@ short_desc="Simple library designed for accessing DVDs"
 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"
+distfiles="${VIDEOLAN_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
 checksum=233cc92f5dc01c5d3a96f5b3582be7d5cee5a35a52d3a08158745d3d86070079
 
 libdvdcss-devel_package() {

From 9b69fa15bdbce1b624dda6c7bda15f23ea6a97bf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:17 +0100
Subject: [PATCH 0328/2561] libdvbpsi: use ${VIDEOLAN_SITE}

---
 srcpkgs/libdvbpsi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libdvbpsi/template b/srcpkgs/libdvbpsi/template
index c8aa475b2de5..5aac623a13ae 100644
--- a/srcpkgs/libdvbpsi/template
+++ b/srcpkgs/libdvbpsi/template
@@ -7,7 +7,7 @@ short_desc="PSI decoder and generator library for MPEG2 and DVB streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.videolan.org/developers/libdvbpsi.html"
-distfiles="https://download.videolan.org/pub/libdvbpsi/${version}/${pkgname}-${version}.tar.bz2"
+distfiles="${VIDEOLAN_SITE}/libdvbpsi/${version}/${pkgname}-${version}.tar.bz2"
 checksum=02b5998bcf289cdfbd8757bedd5987e681309b0a25b3ffe6cebae599f7a00112
 
 libdvbpsi-devel_package() {

From 7ac272cf9351446e912a61b91fad0e7f22e0f169 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:28 +0100
Subject: [PATCH 0329/2561] libdca: use ${VIDEOLAN_SITE}

---
 srcpkgs/libdca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libdca/template b/srcpkgs/libdca/template
index a9007df8387c..a144e80ad73b 100644
--- a/srcpkgs/libdca/template
+++ b/srcpkgs/libdca/template
@@ -8,7 +8,7 @@ short_desc="DTS Coherent Acoustics decoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.videolan.org/developers/libdca.html"
-distfiles="https://download.videolan.org/pub/videolan/libdca/${version}/libdca-${version}.tar.bz2"
+distfiles="${VIDEOLAN_SITE}/libdca/${version}/libdca-${version}.tar.bz2"
 checksum=3a0b13815f582c661d2388ffcabc2f1ea82f471783c400f765f2ec6c81065f6a
 
 pre_configure() {

From 50b58cb6b43e054adc078baa1a4db85deb7b8e3e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:39 +0100
Subject: [PATCH 0330/2561] libbluray: use ${VIDEOLAN_SITE}

---
 srcpkgs/libbluray/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbluray/template b/srcpkgs/libbluray/template
index b81a8ee351de..070c351ee279 100644
--- a/srcpkgs/libbluray/template
+++ b/srcpkgs/libbluray/template
@@ -10,7 +10,7 @@ short_desc="Library to access Blu-Ray disks for video playback"
 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"
+distfiles="${VIDEOLAN_SITE}/libbluray/${version}/libbluray-${version}.tar.bz2"
 checksum=e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9
 
 pre_build() {

From fc14f4d7111ec6650435196c34cef16c811b97f3 Mon Sep 17 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, 4 Mar 2022 10:17:47 +0700
Subject: [PATCH 0331/2561] dnsmasq: configurable services

Close: #35826
---
 srcpkgs/dnsmasq/files/dnsmasq/run | 3 ++-
 srcpkgs/dnsmasq/template          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dnsmasq/files/dnsmasq/run b/srcpkgs/dnsmasq/files/dnsmasq/run
index 2b740a49d8f5..f3504f9e6ece 100644
--- a/srcpkgs/dnsmasq/files/dnsmasq/run
+++ b/srcpkgs/dnsmasq/files/dnsmasq/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 mkdir -p /var/lib/misc
-exec dnsmasq -k --enable-dbus -u dnsmasq -g dnsmasq 2>&1
+[ -r ./conf ] && . ./conf
+exec dnsmasq -k ${OPTS:---enable-dbus -u dnsmasq -g dnsmasq} 2>&1
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index 731594e8a9de..b59608c47912 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,7 +1,7 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
 version=2.86
-revision=1
+revision=2
 conf_files="/etc/dnsmasq.conf"
 hostmakedepends="pkg-config"
 makedepends="dbus-devel libcap-devel libidn2-devel $(vopt_if dnssec nettle-devel)"

From 91ca6488d54592bd616f49091c9818122c661c51 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 20 Mar 2022 19:45:01 +0100
Subject: [PATCH 0332/2561] ugrep: update to 3.7.6.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 16301971cb5f..8af468ccc9bc 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.5
+version=3.7.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=2b237330ef92017d69ed6611b9dfb91b447d4679b9fb3704514bfd5b89a1a44d
+checksum=8288af9eb9f5a5638134911e9e81c8b37d02f29223d473dd96a2046c228cd5d4
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From c80c7e0a593e1d05e610781056c54a0742f56fef Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 19 Mar 2022 16:00:40 -0400
Subject: [PATCH 0333/2561] octoxbps: fix detection of Void Linux

Without this change, OctoXBPS fails to detect that it is running on Void
Linux which causes a password prompt to be shown every time OctoXBPS is
opened.
---
 ...tion-of-Void-Linux-in-getLinuxDistro.patch | 42 +++++++++++++++++++
 srcpkgs/octoxbps/template                     |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch

diff --git a/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch b/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
new file mode 100644
index 000000000000..9941fc6da8c2
--- /dev/null
+++ b/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
@@ -0,0 +1,42 @@
+From 41e0ba546e85f812d89899a3034d67256ec5f23c Mon Sep 17 00:00:00 2001
+From: chili-b <dexter.gaonshatford@gmail.com>
+Date: Sat, 19 Mar 2022 15:33:41 -0400
+Subject: [PATCH] Fix detection of Void Linux in getLinuxDistro
+
+Before this change, OctoXBPS detects Void Linux based on whether or not
+the string, `PRETTY_NAME="void"`, occurs in the file, `/etc/os-release`.
+As of March 15 2022, the contents of `/etc/os-release` have been changed
+and `PRETTY_NAME="Void Linux"` replaces the previous value.
+(see https://github.com/void-linux/void-packages/commit/1dfc401d1237120e8e936627e7e28d2441916e80)
+
+With this change, Void Linux is detected based on the value of `ID` in
+`/etc/os-release` which is less subject to change.
+
+This change is important because OctoXBPS only checks for the existence
+of the local package db if it detects that it is running on either Void
+Linux or Trident Linux. If OctoXBPS does not detect that it is running
+on either distribution (which it doesn't without this change), it will
+prompt for elevated privileges in order to synchronize the local package
+database with the remote database using `xbps-install -Syy` every time
+it is started, regardless of whether or not there are remote changes
+that need to be synced.
+---
+ src/unixcommand.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/unixcommand.cpp b/src/unixcommand.cpp
+index 8a88a2f..1762c4b 100644
+--- a/src/unixcommand.cpp
++++ b/src/unixcommand.cpp
+@@ -709,7 +709,7 @@ LinuxDistro UnixCommand::getLinuxDistro()
+ 
+       QString contents = file.readAll();
+ 
+-      if (contents.contains("PRETTY_NAME=\"void\""))
++      if (contents.contains("ID=\"void\""))
+       {
+         ret = ectn_VOID;
+       }
+-- 
+2.35.1
+
diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index fef8bb3ab323..8315f57ff0d8 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -1,7 +1,7 @@
 # Template file for 'octoxbps'
 pkgname=octoxbps
 version=0.3.0
-revision=2
+revision=3
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="qt5-declarative-devel qtermwidget-devel"

From 45991cb56205e2eac1e9da55a6911007e7ef7f3e Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 6 Nov 2021 15:51:38 +0100
Subject: [PATCH 0334/2561] cups: update to 2.4.1.

Closes: #33939 [via git-merge-pr]
---
 .../cups/patches/cups-no-export-ssllibs.patch | 11 -----
 srcpkgs/cups/template                         | 48 ++++++-------------
 2 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/cups/patches/cups-no-export-ssllibs.patch

diff --git a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch b/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
deleted file mode 100644
index bf618ce330bd..000000000000
--- a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
-+++ b/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
-@@ -180,7 +180,7 @@
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
- 
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
- 
- dnl
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 66204733fa86..772f73ca4a76 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,22 +1,20 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.3.3op2
+version=2.4.1
 revision=1
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
-hostmakedepends="automake $(vopt_if avahi avahi-libs-devel)
- gnutls-devel perl pkg-config poppler-utils"
-makedepends="acl-devel gnutls-devel libpaper-devel libpng-devel
- libusb-devel pam-devel poppler-devel tiff-devel
- $(vopt_if avahi avahi-libs-devel)
- $(vopt_if gssapi 'mit-krb5-devel')"
+hostmakedepends="gnutls-devel pkg-config
+ $(vopt_if avahi avahi-libs-devel)"
+makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel
+ zlib-devel $(vopt_if avahi avahi-libs-devel) $(vopt_if gssapi mit-krb5-devel)"
 depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/OpenPrinting/cups"
 distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df
+checksum=c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="
@@ -34,40 +32,24 @@ system_groups=lpadmin
 cups_pgroup=lp
 cups_homedir=/var/spool/cups
 
-pre_configure() {
-	aclocal -I config-scripts
-	autoconf -I config-scripts
-}
-
 do_configure() {
 	./configure ${configure_args} --sbindir=/usr/bin --libdir=/usr/lib \
-		--enable-acl --enable-dbus --enable-raw-printing \
-		--enable-threads --with-logdir=/var/log/cups \
-		--with-docdir=/usr/share/cups/doc --with-rundir=/run/cups \
-		--with-cups-user=cups --with-cups-group=lp --with-system-groups="lpadmin sys root" --enable-relro \
-		--enable-libpaper --enable-pam --enable-ssl \
-		--with-menudir=/usr/share/applications --with-xinetd=/etc/xinetd.d \
-		--with-optim="${CFLAGS}" --disable-systemd --disable-launchd \
-		--without-rcdir --without-java --without-perl --without-php \
-		--without-python \
-		$(vopt_enable avahi) $(vopt_enable gssapi)
+		--enable-acl --with-logdir=/var/log/cups \
+		--docdir=/usr/share/cups/doc --with-rundir=/run/cups \
+		--with-cups-user=cups --with-cups-group=lp \
+		--with-system-groups="lpadmin sys root" --enable-relro \
+		--enable-libpaper --with-menudir=/usr/share/applications \
+		--with-xinetd=/etc/xinetd.d --with-optim="${CFLAGS}" \
+		--with-rcdir=no \
+		$(vopt_if avahi '--with-dnssd=avahi') $(vopt_enable gssapi)
 }
 
 post_install() {
-	# compress some driver files, adopted from Fedora
-	find ${DESTDIR}/usr/share/cups/model -name "*.ppd"|xargs gzip -n9f
 	# install some more configuration files that will get filled by cupsd
 	for f in printers classes client subscriptions; do
 		touch ${DESTDIR}/etc/cups/${f}.conf
 	done
 
-	# Remove files provided by cups-filters.
-	rm -f ${DESTDIR}/usr/share/cups/banners/*
-	rm -f ${DESTDIR}/usr/share/cups/data/testprint
-	# comment out all conversion rules which use any of the removed filters
-	perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' \
-		${DESTDIR}/usr/share/cups/mime/mime.convs
-
 	# remove unnecessary PageLogFormat entry
 	vsed -i -e 's:PageLogFormat:#PageLogFormat:' ${DESTDIR}/etc/cups/cupsd.conf*
 
@@ -92,7 +74,7 @@ libcups_package() {
 }
 
 cups-devel_package() {
-	depends="zlib-devel libcups>=${version}_${revision}"
+	depends="libcups>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 5045f7bc2bf03507a52e1ddd7d16bf42a898f96f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 20 Mar 2022 22:25:04 +0100
Subject: [PATCH 0335/2561] tumbler: fix homepage and ignore development
 releases

tumbler-4.17 autoconf explicity requires libxfce4util-4.17.1 which is a
development release, so i assume the same 'odd mindor release is dev
release' policy that most xfce components adhere to is implied for
tumbler as well
---
 srcpkgs/tumbler/template | 4 ++--
 srcpkgs/tumbler/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/tumbler/update

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index dcdd7cfd40e9..9b4de6a28c82 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,7 +1,7 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
@@ -10,7 +10,7 @@ makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
 short_desc="D-Bus Thumbnailer service"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://xfce.org/"
+homepage="https://docs.xfce.org/xfce/tumbler/start"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66
 
diff --git a/srcpkgs/tumbler/update b/srcpkgs/tumbler/update
new file mode 100644
index 000000000000..5636324afbce
--- /dev/null
+++ b/srcpkgs/tumbler/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"

From aa81b7da713c8eb559d790f67943579693c1e929 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 22:30:27 +0100
Subject: [PATCH 0336/2561] libreoffice: fix KDE Headers include check

---
 srcpkgs/libreoffice/patches/kde-inc.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/libreoffice/patches/kde-inc.patch

diff --git a/srcpkgs/libreoffice/patches/kde-inc.patch b/srcpkgs/libreoffice/patches/kde-inc.patch
new file mode 100644
index 000000000000..d01aba1e34cf
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/kde-inc.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac	2021-11-18 12:33:09.000000000 +0100
++++ -	2022-03-20 22:27:09.688261731 +0100
+@@ -12788,7 +12788,7 @@
+         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
+     fi
+ 
+-    kf5_test_include="KF5/kcoreaddons_version.h"
++    kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h"
+     kf5_test_library="libKF5CoreAddons.so"
+     kf5_libdirs="$qt5_libdir $kf5_libdirs"
+ 
+--- a/configure	2021-11-18 12:36:47.000000000 +0100
++++ -	2022-03-20 22:27:22.080024887 +0100
+@@ -41089,7 +41089,7 @@
+         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
+     fi
+ 
+-    kf5_test_include="KF5/kcoreaddons_version.h"
++    kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h"
+     kf5_test_library="libKF5CoreAddons.so"
+     kf5_libdirs="$qt5_libdir $kf5_libdirs"
+ 

From c025faa24edefe133fb0b172fd168c9333210091 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <withercubes@protonmail.com>
Date: Thu, 3 Mar 2022 19:11:30 +0530
Subject: [PATCH 0337/2561] nsxiv: update to 29

---
 srcpkgs/nsxiv/patches/no-rebuild-options.patch | 12 ++++++++++++
 srcpkgs/nsxiv/template                         |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/nsxiv/patches/no-rebuild-options.patch

diff --git a/srcpkgs/nsxiv/patches/no-rebuild-options.patch b/srcpkgs/nsxiv/patches/no-rebuild-options.patch
new file mode 100644
index 000000000000..455884f0b1a1
--- /dev/null
+++ b/srcpkgs/nsxiv/patches/no-rebuild-options.patch
@@ -0,0 +1,12 @@
+Preventing rebuild of options.o when installing
+--- a/Makefile
++++ b/Makefile
+@@ -106,7 +106,7 @@
+ 		rm -f "$$dir/nsxiv.png"; \
+ 	done
+
+-install: all
++install:
+ 	@echo "INSTALL bin/nsxiv"
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	cp nsxiv $(DESTDIR)$(PREFIX)/bin/
diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index 6ef4a1e207d2..a52cc2bb03f2 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -1,17 +1,17 @@
 # Template file for 'nsxiv'
 pkgname=nsxiv
-version=28
+version=29
 revision=1
 build_style=gnu-makefile
 make_install_target=install-all
 makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel
- libwebp-devel"
+ libwebp-devel freetype-devel fontconfig-devel"
 short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
-maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
+maintainer="Sanjay Pavan <withercubes@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/nsxiv/nsxiv"
 distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
-checksum=38047f60e51854363dd98fb7b3bc9f1cfa9b7d6f9e8788508b6f1e317328dd75
+checksum="564a17d921172336f7cd463bf313e39f84e4bcf4fdc789326f4112f848aad039"
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
 
 pre_build() {

From cbb829a45dbe28591fe127039b5a2ae8ff5cc515 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Mar 2022 12:38:42 +0100
Subject: [PATCH 0338/2561] syncthing: update to 1.19.1.

---
 srcpkgs/syncthing/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index d0792f1961fd..6c2d860909cb 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.19.0
+version=1.19.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -14,10 +14,10 @@ hostmakedepends="git"
 short_desc="Open Source Continuous File Synchronization"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0"
-homepage="http://syncthing.net/"
+homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=9d7f020ee151512b5a121c08e2b07f7a2ce5bd4a749ca91e60803d21eb1aca02
+checksum=46319031c0805374baa382ee2b21290fb9dc595b70e905b97eb9a5643a78edc4
 
 pre_build() {
 	GOARCH= go generate \

From fc4d9e340d91eda2ae83927701d11bf094ee1b94 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 23 Jan 2022 17:57:27 +0200
Subject: [PATCH 0339/2561] deluge: update to 2.0.5.

---
 .../0001-Fix-warning-related-to-gettext.patch | 25 ------------
 srcpkgs/deluge/patches/drop-priv.patch        | 40 -------------------
 srcpkgs/deluge/template                       | 23 ++++++-----
 3 files changed, 13 insertions(+), 75 deletions(-)
 delete mode 100644 srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch

diff --git a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch b/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
deleted file mode 100644
index 565cd4f952d0..000000000000
--- a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
-From: neeshy <neeshy@tfwno.gf>
-Date: Sat, 18 Apr 2020 23:23:51 -0400
-Subject: Fix warning related to gettext
-
----
- deluge/i18n/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
-index bd002f7a2..90568fc5b 100644
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@ def setup_translation():
-         # Workaround for Python 2 unicode gettext (keyword removed in Py3).
-         kwargs = {} if not deluge.common.PY2 else {'unicode': True}
- 
--        gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+        gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
-         builtins.__dict__['_n'] = builtins.__dict__['ngettext']
- 
-         libintl = None
--- 
-2.27.0
-
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 180e473235fd..bdb186148072 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,20 +1,22 @@
 # Template file for 'deluge'
 pkgname=deluge
-version=2.0.3
-revision=15
+version=2.0.5
+revision=1
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
 depends="python3-setuptools python3-chardet python3-Twisted python3-Mako
  python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3
- python3-Pillow"
-checkdepends="python3-pytest $depends"
+ python3-Pillow python3-pyasn1 python3-openssl python3-six python3-zope.interface"
+checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3
+ python3-gobject xvfb-run cantarell-fonts"
 short_desc="Fully-featured cross-platform BitTorrent client"
 maintainer="Alexey Rochev <equeim@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://deluge-torrent.org/"
+changelog="https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md"
 distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
-checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
+checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
 
 system_accounts="deluge"
 deluge_homedir="/var/lib/deluge"
@@ -25,18 +27,19 @@ make_dirs="
  /var/lib/deluge/.config/deluge 0755 deluge deluge
  "
 
-post_install() {
-	vsv deluged
+do_check() {
+	rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
+	xvfb-run python3 -m pytest
 }
 
-do_check() {
-	python3 -m pytest || : # fails
+post_install() {
+	vsv deluged
 }
 
 deluge-gtk_package() {
 	replaces="deluge<1.3.14_1"
 	short_desc+=" - GTK+ frontend"
-	depends="${sourcepkg}-${version}_${revision} python3-gobject"
+	depends="${sourcepkg}-${version}_${revision} python3-gobject gtk+3"
 	pkg_install() {
 		vmove usr/bin/deluge
 		vmove usr/bin/deluge-gtk

From b4904c7b8eea3886ec55c53745c7197daa8d0d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:05:24 +0100
Subject: [PATCH 0340/2561] devedeng: update to 4.17.0.

---
 srcpkgs/devedeng/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/devedeng/template b/srcpkgs/devedeng/template
index f3229ed60680..e99cf74e0356 100644
--- a/srcpkgs/devedeng/template
+++ b/srcpkgs/devedeng/template
@@ -1,15 +1,14 @@
 # Template file for 'devedeng'
 pkgname=devedeng
-version=4.16.0
-revision=4
+version=4.17.0
+revision=1
 build_style=python3-module
-pycompile_module="devedeng"
 hostmakedepends="gettext python3"
 depends="cdrtools desktop-file-utils dvdauthor ffmpeg gtk+3
  hicolor-icon-theme python3-gobject python3-setuptools vcdimager"
 short_desc="Create video DVDs and CDs"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://www.rastersoft.com/programas/devede.html"
+homepage="https://www.rastersoft.com/programas/devede.html"
 distfiles="https://gitlab.com/rastersoft/devedeng/-/archive/${version}/${pkgname}-${version}.tar.bz2"
-checksum=fe2715aa8f73133fc2d809d840fd662dcf9776fcedfb68169984af2e762b5164
+checksum=c0f22037972dcfd70b3cbe92668c98e6853e20055913dbacf862684cebf3809b

From 35355a195cf5839f950d72ab6bce7d47d9bb7a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:39:56 +0100
Subject: [PATCH 0341/2561] doomretro: update to 4.4.9.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 75e937546567..5367dc8680ce 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.4.8
+version=4.4.9
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 changelog="https://raw.githubusercontent.com/bradharding/doomretro/master/releasenotes.md"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=a680eecee1e8929774c340a2db8de24cb4d6e17e1f36d9e7c755656e12cac22c
+checksum=02f2f3ec9d8d4db5ad1d00fcb5a5161113d3caa6dc108f14af8760535f00ce9e

From 3cc383f5234f6f3085aa5ed9b66e93d25ffbfc2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:52:46 +0100
Subject: [PATCH 0342/2561] lux: update to 0.14.0.

---
 srcpkgs/lux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index ac88c0efaaa5..c09f51778e30 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,6 +1,6 @@
 # Template file for 'lux'
 pkgname=lux
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=go
 go_import_path=github.com/iawia002/lux
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/iawia002/lux"
 distfiles="https://github.com/iawia002/lux/archive/v${version}.tar.gz"
-checksum=4fe99247a718dc1038cb6b9b1808c8e836bbf6a8464afefddf4bf8a161b08236
+checksum=3d485c9703851f3fb5cdee9b029b5b6855f84bfd29b44cae310a031a6fa8c00f
 
 post_install() {
 	vlicense LICENSE

From 3f4ad7560afb5511ab715b144e8a30398e4ea197 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 5 Mar 2022 13:19:13 -0500
Subject: [PATCH 0343/2561] menumaker: update to 0.99.14, move to python3.

---
 srcpkgs/menumaker/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/menumaker/template b/srcpkgs/menumaker/template
index 7a057147d0cd..db15e5a366f6 100644
--- a/srcpkgs/menumaker/template
+++ b/srcpkgs/menumaker/template
@@ -1,19 +1,19 @@
 # Template file for 'menumaker'
 pkgname=menumaker
-version=0.99.12
-revision=2
+version=0.99.14
+revision=1
 build_style=gnu-configure
 pycompile_dirs="/usr/share/menumaker"
-hostmakedepends="python"
-makedepends="python"
-depends="python"
+hostmakedepends="python3"
+makedepends="python3"
+depends="python3"
 short_desc="Menu generation utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://menumaker.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=e3a3566186a5a9ed4d721c1e7788a5af243c8c8a45b96fe6fff3e94580289b0c
-python_version=2
+checksum=11e95d0e76a3b850f57df81bc5560222bd60141c5751b6e9bd05c3cd5560d65a
+python_version=3
 
 post_install() {
 	vlicense COPYING

From 797e9aababcb346994b62f8b3e481f45c39a2092 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 8 Mar 2022 15:35:49 -0500
Subject: [PATCH 0344/2561] soju: update to 0.4.0.

---
 srcpkgs/soju/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 733636d4a288..04bca21ab088 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
-version=0.3.0
-revision=2
+version=0.4.0
+revision=1
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/soju ./cmd/sojuctl"
@@ -12,7 +12,7 @@ license="AGPL-3.0-or-later"
 homepage="https://soju.im"
 changelog="https://git.sr.ht/~emersion/soju/refs/v${version}"
 distfiles="https://git.sr.ht/~emersion/soju/refs/download/v${version}/soju-${version}.tar.gz"
-checksum=c1b77e87e42eb12bdc57a8c308b0d0f2b3dd367a2a8f9093a3983fa692c6aa01
+checksum=91a78d8f038fb3319042961ff38d9a54a9bf897942804c0a690628dc6c959118
 conf_files="/etc/soju/config"
 system_accounts="_soju"
 make_dirs="/var/db/soju 0750 _soju _soju

From bc79277b10e6bd586e22d1d52fcf93df14d70721 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 03:34:41 -0400
Subject: [PATCH 0345/2561] python3-language-server: update to 0.36.2, add
 missing dependency.

fixes #36129
---
 srcpkgs/python3-language-server/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template
index 83332ba10f94..a443ec3fb514 100644
--- a/srcpkgs/python3-language-server/template
+++ b/srcpkgs/python3-language-server/template
@@ -1,11 +1,12 @@
 # Template file for 'python3-language-server'
 pkgname=python3-language-server
-version=0.36.1
-revision=3
+version=0.36.2
+revision=1
 wrksrc="${pkgname/3}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson"
+depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson
+ python3-setuptools"
 checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib
  python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle
  python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov
@@ -15,7 +16,7 @@ maintainer="k4leg <d0xi@inbox.ru>"
 license="MIT"
 homepage="https://github.com/palantir/python-language-server"
 distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
-checksum=c85d718ef6860319ad59fd6f2acb1166e9349b782ee8e8908e08ecf241615f52
+checksum=9984c84a67ee2c5102c8e703215f407fcfa5e62b0ae86c9572d0ada8c4b417b0
 # Needs unpackaged rope and versioneer
 # https://github.com/palantir/python-language-server/blob/develop/setup.py#L51
 make_check=no

From ed32352002e2cf1cb6fce4fdc7d09aeb5060371d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 03:39:12 -0400
Subject: [PATCH 0346/2561] protontricks: update to 1.8.0, add missing
 dependency.

fixes #36072
---
 srcpkgs/protontricks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 30b450cd3532..208a55032a36 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,17 +1,17 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.1
+version=1.8.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3-vdf winetricks"
+depends="python3-vdf winetricks python3-setuptools"
 short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
 changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7fe1bcc4cf029947850d8032b8a389e07ffb4e60e2d25a9c7535fa6e845b3ad8
+checksum=d56b53c4ea4286ae20588072433c30193143a75654ea216db389503a63661b09
 make_check=no # no tests in pypi tarball
 
 post_install() {

From a10413f94c26f76caee98e8820b82e50e3f4148f Mon Sep 17 00:00:00 2001
From: hechos <martin.damian.fernandez@gmail.com>
Date: Sun, 20 Mar 2022 15:38:45 -0300
Subject: [PATCH 0347/2561] i3status-rust: update to 0.21.8

---
 srcpkgs/i3status-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 62c33ae48c9d..6973e02571b4 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.21.7
+version=0.21.8
 revision=1
 build_style=cargo
 make_check_args="--bins"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=6085e261b2040110dd2043096d69e02c1f7d8c88651f2129b37f5a770c0a30ac
+checksum=259fdcb3ce067c6f9089fc0d7e60b856d838fff3dfb7e7e4dc5c96742c1a1be1
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From 5d6043dc71f53b824b45ee8d0a556be52d9ff898 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 19 Mar 2022 18:20:53 +0530
Subject: [PATCH 0348/2561] linux-firmware: update to 20220310

---
 srcpkgs/linux-firmware/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 7c55a94b343c..018f08f95099 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20220209
+version=20220310
 revision=1
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=1ff936dc3946affa2695f31024b22e117b3faf9aa7b8857aba1d0473cd277897
+checksum=f4c34a7ba8144b52fd7f6dd0b1dea2998f140ab1139372f8fbdb76f4557ff228
 python_version=3
 nostrip=yes
 

From 1f8e8a4107b1ed688d6fb39594a0bc5284ffeadc Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 20 Mar 2022 05:19:39 -0400
Subject: [PATCH 0349/2561] font-iosevka: update to 15.0.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 3b89fa15109a..4f1c061d5764 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=15.0.2
+version=15.0.3
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- 39e5c01184547c47d8dd4eb14897e045f5d4b39a71939f31f5ba410876aa0322
- eaa972a710765849339e17b44f1214e0b080f78cf88eaca21ae61609517301e5"
+ 7c6a4d8e003cab1a46f86fdf43f8c49e4b9d6ce932961572476266ad9f351608
+ 629dd3cf957f7ef255e7dccc3286c5a3b54c0a6a7cde8b93b3a7fdc9dffc4cbd"
 
 font_dirs="/usr/share/fonts/TTF"
 

From a247da2405881d6610a35b968037ebc9feec958f Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 19 Mar 2022 21:10:43 -0400
Subject: [PATCH 0350/2561] Ice: update to 3.7.7.

---
 srcpkgs/Ice/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index 31b15fbb4d92..90ede78d19ad 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,7 +1,7 @@
 # Template file for 'Ice'
 pkgname=Ice
-version=3.7.5
-revision=2
+version=3.7.7
+revision=1
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, custom:ICE"
 homepage="https://www.zeroc.com"
 distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz"
-checksum=36bf45591a95e6ee7216153d45d8eca05ff00c1da35608f0c400e6ddc8049da9
+checksum=3aef143a44a664f3101cfe02fd13356c739c922e353ef0c186895b5843a312ae
 
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp

From dc29bd4bdc112ec0b226a7aa741c9be19b993c59 Mon Sep 17 00:00:00 2001
From: gary <28818063+garylaski@users.noreply.github.com>
Date: Sat, 19 Mar 2022 17:43:17 -0400
Subject: [PATCH 0351/2561] nicotine+: update to 3.2.2

---
 srcpkgs/nicotine+/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template
index 4dbf467d42b3..fc00ddb36446 100644
--- a/srcpkgs/nicotine+/template
+++ b/srcpkgs/nicotine+/template
@@ -1,6 +1,6 @@
 # Template file for 'nicotine+'
 pkgname=nicotine+
-version=3.2.1
+version=3.2.2
 revision=1
 wrksrc="nicotine-plus-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://nicotine-plus.org"
 changelog="https://raw.githubusercontent.com/nicotine-plus/nicotine-plus/master/NEWS.md"
 distfiles="https://github.com/Nicotine-Plus/nicotine-plus/archive/${version}.tar.gz"
-checksum=fa9301fe816e3a753948325ae193b58750c2e1e80c92aee3e049309ad47ee80b
+checksum=f58286f4dec6febfeab075cdfe2d2fc35c58349a504f7d393ec129df132ad40f

From 7efbb9477f91a7fdd04d4b36937cc5c033a42a0c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 14:50:28 +0100
Subject: [PATCH 0352/2561] tali: update to 40.6.

---
 srcpkgs/tali/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index 3e50e64f96fc..659f5257ae2e 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -1,6 +1,6 @@
 # Template file for 'tali'
 pkgname=tali
-version=40.5
+version=40.6
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel itstool"
@@ -9,5 +9,6 @@ short_desc="GNOME sort of poker game with dice"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tali"
+changelog="https://gitlab.gnome.org/GNOME/tali/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz"
-checksum=63a09c55e46a1a19756bf5e0957caf994300fadabdba6bda602e668dfcdf7122
+checksum=83fba047edecd196d30719a70e2f4d0986bb26cc2bd5f955a0a9200ea63f0612

From 44a97735dcd95fe2983ae7df2383000dc1bfe39c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 21:05:01 +0100
Subject: [PATCH 0353/2561] xfce4-diskperf-plugin: update to 2.7.0, adopt.

---
 srcpkgs/xfce4-diskperf-plugin/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index d57de65ca808..d7b6f822491a 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,17 +1,18 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
-version=2.6.3
+version=2.7.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
+checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9
 
 post_install() {
 	vlicense COPYING

From 90cdaaded05344f6a9f12e99a38a211ee4242ecb Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sat, 19 Mar 2022 16:37:20 +0100
Subject: [PATCH 0354/2561] mkvtoolnix: update to 66.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0b007bb865d0..98317332f361 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=65.0.0
+version=66.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ 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=0dddc9cc1bae26ceaac3a184482c50e6bb8add2d62e06ef08b55f9f0108bb92e
+checksum=73a3f6c39b3580f28233f93555d282d07d5f51a8bbeb8b0bee09b820de80692c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From c8997089f2c4a93a15c0cffa4ef88bfea9cd5473 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 8 Mar 2022 02:57:59 -0500
Subject: [PATCH 0355/2561] autofs: add log service, fix patch

---
 srcpkgs/autofs/files/autofs/log/run |  2 ++
 srcpkgs/autofs/files/autofs/run     |  1 +
 srcpkgs/autofs/patches/musl.patch   | 22 +++++++++++-----------
 srcpkgs/autofs/template             |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/autofs/files/autofs/log/run

diff --git a/srcpkgs/autofs/files/autofs/log/run b/srcpkgs/autofs/files/autofs/log/run
new file mode 100644
index 000000000000..a2abfe61e846
--- /dev/null
+++ b/srcpkgs/autofs/files/autofs/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -p daemon.info -t autofs
diff --git a/srcpkgs/autofs/files/autofs/run b/srcpkgs/autofs/files/autofs/run
index 14ee8daad0c8..6da6f9c3d404 100644
--- a/srcpkgs/autofs/files/autofs/run
+++ b/srcpkgs/autofs/files/autofs/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec automount -f
diff --git a/srcpkgs/autofs/patches/musl.patch b/srcpkgs/autofs/patches/musl.patch
index 5cd45dd184ab..f81228ad740a 100644
--- a/srcpkgs/autofs/patches/musl.patch
+++ b/srcpkgs/autofs/patches/musl.patch
@@ -30,18 +30,18 @@
  #include <dlfcn.h>
 --- a/lib/log.c.orig     2019-03-30 10:49:52.965336128 +0100
 +++ b/lib/log.c  2019-03-30 10:50:43.232710045 +0100
-@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons
-       char buffer[ATTEMPT_ID_SIZE + 1];
-       char *prefixed_msg = NULL;
+@@ -38,7 +38,11 @@
+ 	char buffer[ATTEMPT_ID_SIZE + 1];
+ 	char *prefixed_msg = NULL;
  
--      attempt_id = pthread_getspecific(key_thread_attempt_id);
-+      if (key_thread_attempt_id) {
-+              attempt_id = pthread_getspecific(key_thread_attempt_id);
-+      } else {
-+              attempt_id = 0;
-+      }
-       if (attempt_id) {
-               int len = sizeof(buffer) + 1 + strlen(msg) + 1;
+-	attempt_id = pthread_getspecific(key_thread_attempt_id);
++	if (key_thread_attempt_id) {
++		attempt_id = pthread_getspecific(key_thread_attempt_id);
++	} else {
++		attempt_id = 0;
++	}
+ 	if (attempt_id) {
+ 		int len = sizeof(buffer) + 1 + strlen(msg) + 1;
  
 --- a/include/hash.h	2021-01-31 09:22:19.668222263 +0100
 +++ b/include/hash.h	2021-01-31 09:22:41.390327622 +0100
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 6ec782cccbb9..a9abc60e64e8 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
 # Template file for 'autofs'
 pkgname=autofs
 version=5.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_args="DONTSTRIP=1"
 configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"

From 7d4d71ec48ca5621b308e107409fcfd36dcbc748 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Fri, 11 Mar 2022 21:13:50 +0100
Subject: [PATCH 0356/2561] nheko: update to 0.9.2.

---
 srcpkgs/nheko/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 50f5f543b500..846f2e381b17 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,22 +1,22 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.9.1
-revision=2
+version=0.9.2
+revision=1
 build_style=cmake
-hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
+hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
  spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
  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 gst-plugins-good1 gst-plugins-good1-qt5"
-short_desc="Desktop client for Matrix using Qt and C++14"
+short_desc="Desktop client for Matrix using Qt and C++"
 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"
+homepage="https://nheko-reborn.github.io"
+changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=f8261131ed10816bdae568e5d88f6f41adc6cc2564f2f57b07266103a4972776
+checksum=207243e1c0d0e879066233488b766e30d1902a24fd8f848850567d88408ce8ce
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*-musl)

From 7f6094a62d2b3d3cee8e4e7a633f460c48c4c448 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Fri, 11 Mar 2022 21:33:23 +0100
Subject: [PATCH 0357/2561] mtxclient: update to 0.7.0.

---
 common/shlibs              | 2 +-
 srcpkgs/mtxclient/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..315841c47bae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -421,7 +421,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.6.2 mtxclient-0.6.2_1
+libmatrix_client.so.0.7.0 mtxclient-0.7.0_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 c58ff20762d0..952926c7df99 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,6 +1,6 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.6.2
+version=0.7.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
@@ -10,8 +10,9 @@ short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
+changelog="https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=97e41340c3f03db8a7625dcd54f6c6a3c8726c7b7226630727fea7d2bb2213bf
+checksum=dd8ad5725c391b7c5b18564074e50bfc667fb3047e681561e5e42aec99c25b12
 
 post_install() {
 	vlicense LICENSE

From 8db6bf45e8b90cd2893bc6fef693cb75b85ce313 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 16 Mar 2022 11:27:47 +0100
Subject: [PATCH 0358/2561] py3status: update to 3.42.

---
 srcpkgs/py3status/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 13a91c28109b..a84b6bc296be 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.41
+version=3.42
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9728ff6913a13087201c73f682f67afcd8dc73a71b044d6833737ee227ad5fba
+checksum=bf7dd6cb65e88c3b0cf570a8df08c8ca30b655c88c7ba5b29fbfbf86a0737e27
 
 post_install() {
 	vlicense LICENSE

From 41cb5edbbabe6c2601a17db975a82228add65cf0 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Mon, 14 Mar 2022 23:28:42 +0100
Subject: [PATCH 0359/2561] gitea: update to 1.16.4

---
 srcpkgs/gitea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 75d8c4290fe4..f9eaa1b18732 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.16.3
+version=1.16.4
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -32,7 +32,7 @@ license="MIT"
 homepage="https://gitea.io"
 changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
 distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=913f3b095fcfd4c5012d17adcd8748b081950e3a7d17ace60f6a2f99c9b2e18b
+checksum=ef396b797d39a64867dfcd4532043c363dce3fe054afaa37bb97f8a2ea3f2a18
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From 2cf1dbfa6c2b7f29d0dac1fc08a3f919aac415df Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 20 Mar 2022 21:22:09 -0500
Subject: [PATCH 0360/2561] yara: update to 4.2.0.

---
 common/shlibs         | 2 +-
 srcpkgs/yara/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 315841c47bae..2d8a8b8b0df3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3044,7 +3044,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.8 libyara-4.1.0_1
+libyara.so.9 libyara-4.2.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 f4dcddc35692..fe171d75b35d 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.1.3
+version=4.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
@@ -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=3610ddd0c3645b8b9cfa7cfbafc0146f2df751ad8d6cd261a638bfff81efbc32
+checksum=6f567d4e4b79a210cd57a820f59f19ee69b024188ef4645b1fc11488a4660951
 
 pre_configure() {
 	autoreconf -fi

From 3ebad3bf941e2d6c988d7e7e63fcdc0a56c83c21 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 20 Mar 2022 21:22:11 -0500
Subject: [PATCH 0361/2561] python3-yara: update to 4.2.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 fcbbb46b64a7..3f4c5925636a 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.1.3
+version=4.2.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=009273c362d2f552ae784a297e4f0bd21ec5c51abd7e07fedb408156ffa2da8b
+checksum=eb2df7d4b4b2631a9fa09b7fe7e41eea19a03d2f7204eff10a7341f8a443f550

From b80c99191a0e39dc6cfa188a1ba9cd3a73819c33 Mon Sep 17 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, 21 Mar 2022 09:54:31 +0700
Subject: [PATCH 0362/2561] python3-Sphinx: update to 4.4.0.

---
 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 8b0493c1f92c..ec36f57837af 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Sphinx'
 pkgname=python3-Sphinx
-version=4.2.0
+version=4.4.0
 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=94078db9184491e15bce0a56d9186e0aec95f16ac20b12d00e06d4e36f1058a6
+checksum=6caad9786055cb1fa22b4a365c1775816b876f91966481765d7d50e9f0dd35cc
 conflicts="python-Sphinx>=0"
 
 post_install() {

From 974ac90282b422d611f47f8bba8eba655b0f2962 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 10 Sep 2021 21:24:56 +0400
Subject: [PATCH 0363/2561] libssh: update to 0.9.6.

---
 srcpkgs/libssh/patches/fix-includes.patch | 10 ----------
 srcpkgs/libssh/template                   |  9 +++++----
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/libssh/patches/fix-includes.patch

diff --git a/srcpkgs/libssh/patches/fix-includes.patch b/srcpkgs/libssh/patches/fix-includes.patch
deleted file mode 100644
index 39122128a307..000000000000
--- a/srcpkgs/libssh/patches/fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/libssh/libssh.h
-+++ b/include/libssh/libssh.h
-@@ -57,6 +57,7 @@
-   typedef unsigned long long uint64_t;
-   typedef int mode_t;
- #else /* _MSC_VER */
-+  #include <sys/types.h>
-   #include <unistd.h>
-   #include <inttypes.h>
- #endif /* _MSC_VER */
diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 9b57379bfc88..3732311abb24 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,9 +1,8 @@
 # Template file for 'libssh'
 pkgname=libssh
-version=0.9.5
-revision=2
+version=0.9.6
+revision=1
 build_style=cmake
-configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
 makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
@@ -11,8 +10,10 @@ short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.libssh.org/"
+changelog="https://git.libssh.org/projects/libssh.git/plain/ChangeLog?h=stable-${version%.*}"
 distfiles="https://git.libssh.org/projects/libssh.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=df65d6054554e8ff5458628808ce8d68b928175f4fefa1c833582b9568491e64
+checksum=63ddcb340e0898eb5c874418c1ff421cf90236fcb3fe5166675e79fa8a7511e4
+make_check=ci-skip # some tests fail when running as root
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="-DHAVE_GLOB=0" ;;

From 4d0d6782c738a2f68bfeceeaaa236d8e365fff2c Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Mon, 21 Mar 2022 09:33:41 +0100
Subject: [PATCH 0364/2561] google-chrome: update to 99.0.4844.82

---
 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 5516594f44f9..e12c57deeb5c 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.74
+version=99.0.4844.82
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=0444893153d4b3b628c6465c48e7c49f06649b101ce5ab066d59b14c363ef9f7
+checksum=b9c181ddc15760795a7c30b950d90a8ef78487825fb12b1e171d1f71fe8a107e
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 49f5e29c90208df1c492473dfa887db6b209633c Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Sun, 20 Mar 2022 19:51:34 -0600
Subject: [PATCH 0365/2561] dolphin-emu: update to 5.0.16101.

---
 srcpkgs/dolphin-emu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 4f00d57388e1..2b3a783943b8 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,8 +1,8 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.15993
+version=5.0.16101
 revision=1
-_dolphin_commit=5e595616379a694789fe749e40a27ef069f0090e
+_dolphin_commit=8ecfa537a242de74d2e372e30d9d79b14584b2fb
 _mgba_commit=40d4c430fc36caeb7ea32fd39624947ed487d2f2
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
 distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
  https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="d25e597356d410d71a825d881432ab40d66f65a5116412ec7d1661f414c72191
+checksum="a7bff69fce6466668c36e6c7ac3838434d64bb315cd2ad22817c943a9887f6e5
  3cabf00a97cf4fb15fe8524b3d02190acdd003f25967cdbbf8de958649b8061b"
 nopie=yes
 

From 30d2010798d02607d3b9c8602e2db7decf360805 Mon Sep 17 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, 21 Mar 2022 17:04:55 +0700
Subject: [PATCH 0366/2561] nyxt: fix musl runtime

While we're at it, load versioned libgi-repository.

Fix: #35877
Fix: #36243
Close: #36251
---
 srcpkgs/nyxt/patches/001-libfixposix.patch | 16 +++++++++-------
 srcpkgs/nyxt/patches/gir.patch             | 13 +++++++++++++
 srcpkgs/nyxt/template                      |  4 ++--
 3 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/nyxt/patches/gir.patch

diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch
index 23ef9da26442..7339c30acbe8 100644
--- a/srcpkgs/nyxt/patches/001-libfixposix.patch
+++ b/srcpkgs/nyxt/patches/001-libfixposix.patch
@@ -1,12 +1,14 @@
---- a/_build/iolib/src/syscalls/ffi-functions-unix.lisp.orig	2022-02-27 09:44:00.327307802 -0700
-+++ b/_build/iolib/src/syscalls/ffi-functions-unix.lisp	2022-02-27 09:48:30.875539336 -0700
-@@ -12,7 +12,8 @@
+Index: nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp
+===================================================================
+--- nyxt-2.2.4.orig/_build/iolib/src/syscalls/ffi-functions-unix.lisp
++++ nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp
+@@ -11,7 +11,8 @@
+ ;; FIXME: move this into an ASDF operation
  (eval-when (:compile-toplevel :load-toplevel :execute)
    (define-foreign-library
-       (libfixposix :canary "lfp_buildinfo")
--    (t (:default "libfixposix")))
+-      (libfixposix :canary "lfp_buildinfo")
++      (libfixposix :canary "lfp_buildinfo_not_exist")
 +    (:unix "libfixposix.so.3")
-+    (t (:default "libfixposix")))
+     (t (:default "libfixposix")))
    (load-foreign-library 'libfixposix))
  \f
- 
diff --git a/srcpkgs/nyxt/patches/gir.patch b/srcpkgs/nyxt/patches/gir.patch
new file mode 100644
index 000000000000..39f94a1d4dde
--- /dev/null
+++ b/srcpkgs/nyxt/patches/gir.patch
@@ -0,0 +1,13 @@
+Index: nyxt-2.2.4/_build/cl-gobject-introspection/src/init.lisp
+===================================================================
+--- nyxt-2.2.4.orig/_build/cl-gobject-introspection/src/init.lisp
++++ nyxt-2.2.4/_build/cl-gobject-introspection/src/init.lisp
+@@ -10,7 +10,7 @@
+     (t "libgobject-2.0"))
+   (cffi:define-foreign-library girepository
+     (:darwin "libgirepository-1.0.dylib")
+-    (:unix (:or "libgirepository-1.0.so" "libgirepository-1.0.so.1"))
++    (:unix (:or "libgirepository-1.0.so.1"))
+     (:windows (:or "libgirepository-1.0.dll" "libgirepository-1.0.0.dll"
+                    "libgirepository-1.0-1.dll"))
+     (t "libgirepository-1.0")))
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index a0da399fb2da..8fdd7215cd90 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,12 +1,12 @@
 # Template file for 'nyxt'
 pkgname=nyxt
 version=2.2.4
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target=all
 hostmakedepends="sbcl git"
-makedepends="webkit2gtk libfixposix-devel libgirepository-devel"
+makedepends="webkit2gtk libfixposix-devel libgirepository"
 depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"

From 3cb3a61c8cac0a76e775285a0bae9d4e98331a7b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 21 Mar 2022 14:06:08 +0100
Subject: [PATCH 0367/2561] z3: update to 4.8.15.

---
 srcpkgs/z3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index a907482b751d..2d5bf7a80954 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,6 +1,6 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.14
+version=4.8.15
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
 distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=96a1f49a7701120cc38bfa63c02ff93be4d64c7926cea41977dedec7d87a1364
+checksum=2abe7f5ecb7c8023b712ffba959c55b4515f4978522a6882391de289310795ac
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"

From e49cbb974d78ef45b5e31ebf69ecb50081b237db Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 21 Mar 2022 16:12:29 +0100
Subject: [PATCH 0368/2561] knot-resolver: update to 5.5.0.

---
 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 2f03d4420f03..f40c2f1646ee 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.4.4
+version=5.5.0
 revision=1
 build_style=meson
 configure_args="
@@ -19,7 +19,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=588964319e943679d391cc9c886d40ef858ecd9b33ae160023b4e2b5182b2cea
+checksum=4e6f48c74d955f143d603f6072670cb41ab9acdd95d4455d6e74b6908562c55a
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From 8bd3bff5dd269a47c61bbb313e95755763908f0a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 25 May 2021 12:08:54 +1100
Subject: [PATCH 0369/2561] patchelf: update to 0.14.5.

---
 srcpkgs/patchelf/template | 8 ++++----
 srcpkgs/patchelf/update   | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 srcpkgs/patchelf/update

diff --git a/srcpkgs/patchelf/template b/srcpkgs/patchelf/template
index fe2dc3ccee4e..e0071fcf0b1b 100644
--- a/srcpkgs/patchelf/template
+++ b/srcpkgs/patchelf/template
@@ -1,11 +1,11 @@
 # Template file for 'patchelf'
 pkgname=patchelf
-version=0.10
+version=0.14.5
 revision=1
 build_style=gnu-configure
 short_desc="Utility for modifing existing ELF executables and libraries"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://nixos.org/patchelf.html"
-distfiles="https://nixos.org/releases/patchelf/patchelf-${version}/patchelf-${version}.tar.bz2"
-checksum=f670cd462ac7161588c28f45349bc20fb9bd842805e3f71387a320e7a9ddfcf3
+homepage="https://github.com/NixOS/patchelf"
+distfiles="${homepage}/releases/download/${version}/patchelf-${version}.tar.bz2"
+checksum=b9a46f2989322eb89fa4f6237e20836c57b455aa43a32545ea093b431d982f5c
diff --git a/srcpkgs/patchelf/update b/srcpkgs/patchelf/update
deleted file mode 100644
index dd90721fd90a..000000000000
--- a/srcpkgs/patchelf/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site='https://nixos.org/releases/patchelf/'
-pattern='patchelf-\K[\d.]+(?=/</a>)'

From 7c142518c4131c36edf42ac27d514dd9fe556d56 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 22 Mar 2022 11:51:31 +0100
Subject: [PATCH 0370/2561] warzone2100: don't install /usr/bin/.portable

it tricks keepassxc into portable mode

Closes: #36277
---
 srcpkgs/warzone2100/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 9ef2297baeb7..9c691626703f 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
 version=4.2.7
-revision=1
+revision=3
 wrksrc="warzone2100"
 build_style=cmake
 configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -28,6 +28,12 @@ post_extract() {
 	fi
 }
 
+post_install() {
+	# .portable has side-effect with keepassxc
+	# https://github.com/Warzone2100/warzone2100/issues/2645
+	rm "$DESTDIR"/usr/bin/.portable
+}
+
 warzone2100-data_package() {
 	short_desc+=" - data files"
 	pkg_install() {

From 2328d1e5c7fae68ba16ab7132259c00020d9b744 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 22 Mar 2022 16:19:05 +0100
Subject: [PATCH 0371/2561] skaffold: update to 1.37.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index fa05e329472f..4f54c6c05e98 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.36.1
+version=1.37.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=b30361c02963d2374f2636f0181808f868834024f99ace74282c9f7416c1646a
+checksum=a97a6f6cbf571f342183e5cf65c30932ade282b182fc92f108cb2a160a46779b

From 1ce214704e975a34b3a32bf588528108069b7592 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Mon, 21 Mar 2022 20:11:35 +0700
Subject: [PATCH 0372/2561] vivaldi: update to 5.1.2567.66

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index e3421bb8539c..d36738824694 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.1.2567.57
+version=5.1.2567.66
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=ffb1f9ea4fc7eb9e99274f13a771999682ab1eef078641df6fcd48c1357ffd7a
+checksum=e2631cfabdd2d916fd8ab05004afd86efeec4e47d50a86b8be4cd3b59f6430ed
 repository=nonfree
 restricted=yes
 nostrip=yes

From 26fac6fbf5692c32c4e880b63d77b2ac5177ebdb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 22 Mar 2022 17:56:15 +0100
Subject: [PATCH 0373/2561] lollypop: update to 1.4.30.

---
 srcpkgs/lollypop/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 2c2d8c329e63..569c4e291772 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,10 +1,11 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.29
+version=1.4.30
 revision=1
 build_style=meson
 hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config"
-makedepends="gtk+3-devel libsoup-devel python3-gobject-devel python3-devel"
+makedepends="gtk+3-devel libsoup-devel python3-gobject-devel python3-devel
+ libhandy1-devel"
 depends="dconf gst-libav gst-plugins-good1 libnotify libsecret
  python3-Pillow totem-pl-parser python3-BeautifulSoup4 libhandy1
  python3-gobject python3-pylast youtube-dl gnome-keyring"
@@ -13,4 +14,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/lollypop-${version}.tar.xz"
-checksum=f6975923315adc57ebe693e7cae9e2668d1d3f7f9a0e3209eda4b67f270761ee
+checksum=393c3ed6431026b3214f380b7aa74ee31b054203855f7f5c928b1d25ad1b8ef5

From 9e00bae32e1315e228df9d3208afd7ee9544081f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 22 Mar 2022 17:58:04 +0100
Subject: [PATCH 0374/2561] squashfs-tools: update to 4.5.1.

---
 srcpkgs/squashfs-tools/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index 04b0bef6df6a..8b22de823ade 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'squashfs-tools'
 pkgname=squashfs-tools
-version=4.5
-revision=2
+version=4.5.1
+revision=1
 build_wrksrc="squashfs-tools"
 build_style=gnu-makefile
 make_use_env=yes
@@ -11,8 +11,9 @@ short_desc="Tool to create and append to squashfs filesystems"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/plougher/squashfs-tools"
+changelog="https://github.com/plougher/squashfs-tools/raw/master/CHANGES"
 distfiles="https://github.com/plougher/squashfs-tools/archive/refs/tags/${version}.tar.gz"
-checksum=b9e16188e6dc1857fe312633920f7d71cc36b0162eb50f3ecb1f0040f02edddd
+checksum=277b6e7f75a4a57f72191295ae62766a10d627a4f5e5f19eadfbc861378deea7
 
 do_install() {
 	vbin mksquashfs

From b510a4388fd310bf8f452cca2994fe962f243b4f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 21 Mar 2022 10:02:40 -0400
Subject: [PATCH 0375/2561] python-dbus: include egg-info metadata

Also drop python-dbus-devel, there is no value in carrying the metapkg.
---
 srcpkgs/python-dbus-devel    |  1 -
 srcpkgs/python-dbus/template | 64 ++++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 26 deletions(-)
 delete mode 120000 srcpkgs/python-dbus-devel

diff --git a/srcpkgs/python-dbus-devel b/srcpkgs/python-dbus-devel
deleted file mode 120000
index 082b5c2fc193..000000000000
--- a/srcpkgs/python-dbus-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-dbus
\ No newline at end of file
diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index 19ac9e7cbf0b..64c1ae021798 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -1,11 +1,11 @@
 # Template file for 'python-dbus'
 pkgname=python-dbus
 version=1.2.18
-revision=1
+revision=2
 wrksrc="dbus-python-${version}"
 build_style=gnu-configure
-hostmakedepends="pkg-config python-devel python3-devel"
-makedepends="libglib-devel ${hostmakedepends/pkg-config/}"
+hostmakedepends="pkg-config python python3"
+makedepends="libglib-devel python3-devel python-devel"
 depends="python dbus"
 short_desc="D-Bus Python2 bindings"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,35 +20,55 @@ pre_configure() {
 	mv * dbus-${py2_ver} || true
 	cp -a dbus-${py2_ver} dbus-${py3_ver}
 }
+
 do_configure() {
-	local py_abiver=
+	local py_abiver py_inc pyver
 	for pyver in $py2_ver $py3_ver; do
-		if [ "$pyver" != "$py2_ver" ]; then
-			py_inc="$py3_inc"
-			py_abiver="$py3_abiver"
-		else
-			py_inc="$py2_inc"
-		fi
+		case "${pyver}" in
+			"${py2_ver}")
+				py_inc="$py2_inc"
+				;;
+			*)
+				py_inc="$py3_inc"
+				py_abiver="$py3_abiver"
+				;;
+		esac
 
-		cd ${wrksrc}/dbus-${pyver}
 		export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py_inc}"
 		export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${py_abiver}"
 		export PYTHON_VERSION="${pyver}"
-		./configure ${configure_args}
+
+		( cd dbus-${pyver} && ./configure ${configure_args} )
+
 	done
+
+	unset PYTHON_CPPFLAGS PYTHON_EXTRA_LIBS PYTHON_VERSION
 }
+
 do_build() {
+	local pyver
 	for pyver in $py2_ver $py3_ver; do
-		cd ${wrksrc}/dbus-${pyver}
-		make ${makejobs}
+		( cd dbus-${pyver} && make ${makejobs} )
 	done
 }
+
 do_install() {
+	local pyver pysite eggver
 	for pyver in $py2_ver $py3_ver; do
-		cd ${wrksrc}/dbus-${pyver}
-		make DESTDIR=${DESTDIR} install
-		vlicense COPYING
+		case "${pyver}" in
+			"${py2_ver}") pysite="${py2_sitelib}" ;;
+			*) pysite="${py3_sitelib}" ;;
+		esac
+
+		eggver="dbus_python-${version}-py${pyver}"
+		(
+			cd dbus-${pyver}
+			make DESTDIR=${DESTDIR} install
+			vcopy dbus_python.egg-info "${pysite}/${eggver}.egg-info"
+		)
 	done
+
+	vlicense dbus-${py2_ver}/COPYING
 }
 
 python3-dbus_package() {
@@ -57,16 +77,10 @@ python3-dbus_package() {
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*
+		vlicense dbus-${py3_ver}/COPYING
 	}
 }
-# This package used to provide both Python 2 and Python 3 development files
-# Those files are now in python3-dbus-devel
-python-dbus-devel_package() {
-	depends="python-devel python-dbus>=${version}_${revision}
-	 python3-dbus-devel>=${version}_${revision}"
-	build_style=meta
-	short_desc+=" - development files (Python 2 meta)"
-}
+
 python3-dbus-devel_package() {
 	depends="python3-devel python3-dbus>=${version}_${revision}"
 	short_desc="${short_desc/Python2/Python3} - development files"

From 4c8c59f7985813cec1056e7b4445d91a54ffecb4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 21 Mar 2022 23:58:07 -0400
Subject: [PATCH 0376/2561] libusb: fix segfault

libusb/libusb#1073
---
 .../libusb/patches/late-transfer-free.patch   | 136 ++++++++++++++++++
 srcpkgs/libusb/template                       |   2 +-
 2 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libusb/patches/late-transfer-free.patch

diff --git a/srcpkgs/libusb/patches/late-transfer-free.patch b/srcpkgs/libusb/patches/late-transfer-free.patch
new file mode 100644
index 000000000000..f4d913bbbd84
--- /dev/null
+++ b/srcpkgs/libusb/patches/late-transfer-free.patch
@@ -0,0 +1,136 @@
+From 010691ff6fdf9fcfaa7f76c1417dfc1f7df124ca Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Tue, 15 Feb 2022 11:13:41 +0100
+Subject: [PATCH] io: Track device in usbi_transfer
+
+transfer->dev_handle currently has the behaviour that it will be unset
+if the device is closed. The sync API uses this fact to catch an error
+case.
+
+In other cases, transfer->dev_handle will keep its value, which means
+that if the transfer lives longer than the device handle, the pointer
+becomes invalid.
+
+The transfer does however keep a reference to the device, which owns the
+pointer to the context. As such, we can track this reference internal to
+the transfer, and it is set while the transfer is in-flight.
+
+With this, switch the logging infrastructure to use itransfer->dev->ctx
+while checking that itransfer->dev is non-NULL.
+
+Note that this was a regression caused by 6cae9c6dbd74 ("core: update
+usbi_dbg to take the context as an argument"), specifically when
+resolving the context while freeing a transfer after closing a device.
+
+Note that the transfer will now keep a reference to the device until it
+is free'ed. This allows it to use the correct context for logging even
+in libusb_free_transfer.
+
+The alternative to all this would be to just explicitly pass NULL to the
+log handler in libusb_free_transfer.
+
+Closes: #1038
+---
+ libusb/io.c      | 20 ++++++++++++--------
+ libusb/libusbi.h | 11 ++++++++---
+ 2 files changed, 20 insertions(+), 11 deletions(-)
+
+diff --git a/libusb/io.c b/libusb/io.c
+index 0d2ac9ea..b919e9d9 100644
+--- a/libusb/io.c
++++ b/libusb/io.c
+@@ -1344,6 +1344,8 @@ void API_EXPORTED libusb_free_transfer(struct libusb_transfer *transfer)
+ 
+ 	itransfer = LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
+ 	usbi_mutex_destroy(&itransfer->lock);
++	if (itransfer->dev)
++		libusb_unref_device(itransfer->dev);
+ 
+ 	priv_size = PTR_ALIGN(usbi_backend.transfer_priv_size);
+ 	ptr = (unsigned char *)itransfer - priv_size;
+@@ -1489,9 +1491,15 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
+ {
+ 	struct usbi_transfer *itransfer =
+ 		LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
+-	struct libusb_context *ctx = TRANSFER_CTX(transfer);
++	struct libusb_context *ctx;
+ 	int r;
+ 
++	assert(transfer->dev_handle);
++	if (itransfer->dev)
++		libusb_unref_device(itransfer->dev);
++	itransfer->dev = libusb_ref_device(transfer->dev_handle->dev);
++
++	ctx = HANDLE_CTX(transfer->dev_handle);
+ 	usbi_dbg(ctx, "transfer %p", transfer);
+ 
+ 	/*
+@@ -1551,8 +1559,6 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
+ 	r = usbi_backend.submit_transfer(itransfer);
+ 	if (r == LIBUSB_SUCCESS) {
+ 		itransfer->state_flags |= USBI_TRANSFER_IN_FLIGHT;
+-		/* keep a reference to this device */
+-		libusb_ref_device(transfer->dev_handle->dev);
+ 	}
+ 	usbi_mutex_unlock(&itransfer->lock);
+ 
+@@ -1659,7 +1665,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
+ {
+ 	struct libusb_transfer *transfer =
+ 		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+-	struct libusb_device_handle *dev_handle = transfer->dev_handle;
+ 	struct libusb_context *ctx = ITRANSFER_CTX(itransfer);
+ 	uint8_t flags;
+ 	int r;
+@@ -1693,7 +1698,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
+ 	 * this point. */
+ 	if (flags & LIBUSB_TRANSFER_FREE_TRANSFER)
+ 		libusb_free_transfer(transfer);
+-	libusb_unref_device(dev_handle->dev);
+ 	return r;
+ }
+ 
+@@ -1727,10 +1731,10 @@ int usbi_handle_transfer_cancellation(struct usbi_transfer *itransfer)
+  * function will be called the next time an event handler runs. */
+ void usbi_signal_transfer_completion(struct usbi_transfer *itransfer)
+ {
+-	libusb_device_handle *dev_handle = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)->dev_handle;
++	struct libusb_device *dev = itransfer->dev;
+ 
+-	if (dev_handle) {
+-		struct libusb_context *ctx = HANDLE_CTX(dev_handle);
++	if (dev) {
++		struct libusb_context *ctx = DEVICE_CTX(dev);
+ 		unsigned int event_flags;
+ 
+ 		usbi_mutex_lock(&ctx->event_data_lock);
+diff --git a/libusb/libusbi.h b/libusb/libusbi.h
+index 158a9af5..7618236f 100644
+--- a/libusb/libusbi.h
++++ b/libusb/libusbi.h
+@@ -329,10 +329,11 @@ void usbi_log(struct libusb_context *ctx, enum libusb_log_level level,
+ #endif /* ENABLE_LOGGING */
+ 
+ #define DEVICE_CTX(dev)		((dev)->ctx)
+-#define HANDLE_CTX(handle)	(DEVICE_CTX((handle)->dev))
+-#define TRANSFER_CTX(transfer)	(HANDLE_CTX((transfer)->dev_handle))
++#define HANDLE_CTX(handle)	((handle) ? DEVICE_CTX((handle)->dev) : NULL)
+ #define ITRANSFER_CTX(itransfer) \
+-	(TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)))
++	((itransfer)->dev ? DEVICE_CTX((itransfer)->dev) : NULL)
++#define TRANSFER_CTX(transfer) \
++	(ITRANSFER_CTX(LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer)))
+ 
+ #define IS_EPIN(ep)		(0 != ((ep) & LIBUSB_ENDPOINT_IN))
+ #define IS_EPOUT(ep)		(!IS_EPIN(ep))
+@@ -562,6 +563,10 @@ struct usbi_transfer {
+ 	uint32_t state_flags;   /* Protected by usbi_transfer->lock */
+ 	uint32_t timeout_flags; /* Protected by the flying_stransfers_lock */
+ 
++	/* The device reference is held until destruction for logging
++	 * even after dev_handle is set to NULL.  */
++	struct libusb_device *dev;
++
+ 	/* this lock is held during libusb_submit_transfer() and
+ 	 * libusb_cancel_transfer() (allowing the OS backend to prevent duplicate
+ 	 * cancellation, submission-during-cancellation, etc). the OS backend
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 7b63b401f2a6..4f192264d4bc 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,7 +1,7 @@
 # Template file for 'libusb'
 pkgname=libusb
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel"

From b2edcc1379ed369586f6a97c2e31cb8fa227a0d9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 22 Mar 2022 19:54:46 +0100
Subject: [PATCH 0377/2561] vim: update to 8.2.4609.

---
 srcpkgs/vim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 252c84c21b18..f5ff0d9066a7 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
-version=8.2.4221
-revision=2
+version=8.2.4609
+revision=1
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="acl-devel ncurses-devel
  $(vopt_if x11 libXt-devel)
@@ -13,7 +13,7 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="Vim"
 homepage="https://www.vim.org"
 distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=4b81c03d54a5df697d74bc1eccc5939d6836b8fb58291eda5344c6ddb757ae57
+checksum=a9b150ed68cf41931e1af2f9fe8b958cf36ed1a14d00378ac8cebf7d8617afb1
 python_version=3
 
 build_options="x11 gtk3 huge"

From e9966dbdb4108342b828ecdb6c1b7cedd887aba3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 22 Mar 2022 20:24:14 +0100
Subject: [PATCH 0378/2561] fwupd: fix -devel dependencies

---
 srcpkgs/fwupd/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 005880d7bcbf..9f15e0a43ddc 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,7 +1,7 @@
 # Template file for 'fwupd'
 pkgname=fwupd
 version=1.7.5
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true
@@ -60,7 +60,9 @@ pre_build() {
 }
 
 fwupd-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
+	depends="${sourcepkg}>=${version}_${revision} libglib-devel libcurl-devel
+	 libjcat-devel libgusb-devel libxmlb-devel libarchive-devel gcab-devel
+	 json-glib-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From da293199193e8192c42d7151d32d6800c0bf4cd6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:37:09 +0100
Subject: [PATCH 0379/2561] nautilus-sendto: remove package

---
 srcpkgs/nautilus-sendto/template  | 14 --------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/nautilus-sendto/template

diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template
deleted file mode 100644
index c357b9efae65..000000000000
--- a/srcpkgs/nautilus-sendto/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'nautilus-sendto'
-pkgname=nautilus-sendto
-version=3.8.6
-revision=2
-build_style=meson
-# XXX: add pidgin and gajim depends for plugins to work.
-hostmakedepends="pkg-config intltool"
-makedepends="evolution-data-server-devel nautilus-devel gupnp-devel appstream-glib-devel"
-short_desc="Nautilus context menu for sending files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://download.gnome.org/sources/nautilus-sendto/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c23125bb0cb4..30fa0d2cce34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -243,6 +243,7 @@ replaces="
  mongroup<=0.4.1_2
  mozjs68<=68.11.0_1
  mutagen<=1.43.0_3
+ nautilus-sendto<=3.8.6_2
  ncdns<=0.0.2_12
  newt-python<=0.52.21_5
  nodejs-lts-10<=10.24.0_2

From 045d2c0ab3af8088cb47a59a092a047a103f75c3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Mar 2022 13:55:28 +1100
Subject: [PATCH 0380/2561] jadx: update to 1.3.4.

---
 srcpkgs/jadx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template
index d5e2f69ab770..71467e34044c 100644
--- a/srcpkgs/jadx/template
+++ b/srcpkgs/jadx/template
@@ -1,6 +1,6 @@
 # Template file for 'jadx'
 pkgname=jadx
-version=1.3.3
+version=1.3.4
 revision=1
 hostmakedepends="openjdk8 gradle"
 short_desc="Decompiler for Dalvik bytecode"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/skylot/jadx"
 distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz"
-checksum=c423176c0b0675db6a9969133af3ec71d2568897155362fe50b0288e76bfe78d
+checksum=9f7f05c647a287fe4a572d85f14715559513e864d27f6bf6b19852529da8efdc
 
 do_build() {
 	gradle copyArtifacts

From 8baabab2ddb52d60d61eb8d201973e3644dbba4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 11:12:24 +0100
Subject: [PATCH 0381/2561] tau: update to 0.12.0.

---
 srcpkgs/tau/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tau/template b/srcpkgs/tau/template
index d81968c76ac8..d1f9e9624997 100644
--- a/srcpkgs/tau/template
+++ b/srcpkgs/tau/template
@@ -1,11 +1,10 @@
 # Template file for 'tau'
 pkgname=tau
-version=0.11.3
+version=0.12.0
 revision=1
 build_style=meson
 build_helper=rust
-configure_args=" -Dxi-core=system"
-hostmakedepends="cargo gettext pkg-config rust glib-devel xi-editor"
+hostmakedepends="cargo gettext pkg-config glib-devel"
 makedepends="libhandy-devel rust-std vte3-devel"
 depends="xi-editor"
 checkdepends="appstream-glib desktop-file-utils"
@@ -13,8 +12,8 @@ short_desc="GTK frontend for the Xi text editor, written in Rust"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.gnome.org/World/Tau"
-distfiles="https://gitlab.gnome.org/World/Tau/uploads/b5f24cd692ec0c2a2c2be460fffaf505/tau-${version}.tar.xz"
-checksum=36e915de4ca906599b4ad176d4e2d625b454801a09ca0d4b0a1fbaf14915e60e
+distfiles="https://gitlab.gnome.org/World/Tau/uploads/14037a7f98f475d2497b74bd74a0430e/tau-${version}.tar.xz"
+checksum=a14e4c3511fa51cc051c33ad04a3989b93c6aa2405e8b0f5ac05970fe5d95449
 
 # this sometimes builds and sometimes doesn't, do not
 # reenable unless you can reliably build it every time

From 9c2ff6b767873bdb5577e8acbe6c009810eb2e63 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:02:00 -0500
Subject: [PATCH 0382/2561] Amass: update to 3.18.2.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 271551b6b159..c11b52a04657 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.17.1
+version=3.18.2
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ 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=5d11de26ce62dad9ddc4f36032a1192c2c126c4e23a31e1e04cb2d08098d5dfd
+checksum=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From 243ee06ce6a5feb23c6f4371f69a82e0efbe95be Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:04:08 -0500
Subject: [PATCH 0383/2561] QMPlay2: update to 22.03.19.

---
 srcpkgs/QMPlay2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 463afde3a834..1c8571de2591 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=21.12.24
+version=22.03.19
 revision=1
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=92e5fa7f7df43a83f72bf9e87366ebae71148bc683db0556447981f0dd8e5f2d
+checksum=d6cde1cec25729d32a8cc1ba925b711b98d18961941f9764a7db8a75b255004e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a7a3e3ac22e0419b3d5453bd032ca965ed08b508 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:05:38 -0500
Subject: [PATCH 0384/2561] python3-rich: update to 12.0.1.

---
 srcpkgs/python3-rich/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 942d44da3fa2..c394edfbeade 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=11.2.0
+version=12.0.1
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,8 @@ 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=1a6266a5738115017bb64a66c59c717e7aa047b3ae49a011ede4abdeffc6536e
+checksum=3fba9dd15ebe048e2795a02ac19baee79dc12cc50b074ef70f2958cd651b59a9
+make_check=extended # some checks only work on windows
 
 post_install() {
 	vlicense LICENSE

From 7b6f31c76eb9486d8b9d41371352015b6c3e8388 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:08:55 -0500
Subject: [PATCH 0385/2561] python3-waitress: update to 2.1.1.

---
 srcpkgs/python3-waitress/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-waitress/template b/srcpkgs/python3-waitress/template
index ae3ee23f6934..5e40d71a3d46 100644
--- a/srcpkgs/python3-waitress/template
+++ b/srcpkgs/python3-waitress/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-waitress'
 pkgname=python3-waitress
-version=2.1.0
+version=2.1.1
 revision=1
 wrksrc="waitress-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="ZPL-2.1"
 homepage="https://github.com/Pylons/waitress"
 distfiles="${PYPI_SITE}/w/waitress/waitress-${version}.tar.gz"
-checksum=ec8a8d9b6b15f3bb2c1a82b8f3929a029c333c35fcafb08c185a9e562d8cc9c2
+checksum=e2e60576cf14a1539da79f7b7ee1e79a71e64f366a0b47db54a15e971f57bb16

From 30499e948c736042f68bf7bd0d4bda0d2bc874f9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:09:04 -0500
Subject: [PATCH 0386/2561] ytmdl: update to 2022.03.16.

---
 srcpkgs/ytmdl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index dd28541cea49..5dfe4a7636a8 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,6 +1,6 @@
 # Template file for 'ytmdl'
 pkgname=ytmdl
-version=2021.11.07
+version=2022.03.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -16,7 +16,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/deepjyoti30/ytmdl"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=1de4cdd9f256acac5518637d533c0737e8f3ab13a4990e171f2ffd16d1bdfd8f
+checksum=cb2271e7e2e2db107848699dd7e56a7d9479b6ce20e5ddef8710bd7078543430
 # There is no test to run
 make_check=no
 

From 0d822cebd283b85fa70690f4f856e23cd08027af Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 14:49:45 +0100
Subject: [PATCH 0387/2561] pianobar: fix build

Close: #36316
---
 srcpkgs/pianobar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index 652db15ba46b..b7d991fef5a4 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_build_args="V=1"
 hostmakedepends="pkg-config"
 makedepends="faad2-devel ffmpeg-devel gnutls-devel json-c-devel libao-devel
- libcurl-devel"
+ libcurl-devel libgcrypt-devel"
 short_desc="Free/open-source, console-based client for Pandora radio"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"

From 9233f5b696f2c21fb8e2041959f5a2402a6fae3e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 23 Mar 2022 14:33:28 +0100
Subject: [PATCH 0388/2561] netpbm: update to 10.97.06.

---
 srcpkgs/netpbm/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index db6f8708eb8d..d72721bd9eb3 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.97.05
+version=10.97.06
 revision=1
-_githash=9f95511f291ecc492e283932064857717678bb19
-_githash_guide=4571e910b4cc98268539768c98d9303dc052847b
+_githash=f336dfc59346a26a045f7e0df0ecba32d904c55e
+_githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79
 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="8d42d131931141d79848bf9320b63b8858c51651c0f1ebb2fc2da7e2bcd8c78d
- b782b5092a3da5fe804084f7e8eb2452e777dcbe73bc0f9634671eafe6a07392"
+checksum="9cd658ec9081b980a98fb44f02aa5289ba9ca17ad7e9a699627bf6f2a85c5612
+ 30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde"
 
 post_extract() {
 	cd $build_wrksrc

From c97bba169dd656892cb3eaa556c6cfa3c4c54d9f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 23 Mar 2022 14:35:23 +0100
Subject: [PATCH 0389/2561] tab: update to 9.1.

---
 srcpkgs/tab/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index 987ae0a0e9ec..b0e7720b1d23 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,15 +1,15 @@
 # Template file for 'tab'
 pkgname=tab
-version=9.0
+version=9.1
 revision=1
-wrksrc="tkatchev-tab-95a2e7a0d12d"
+wrksrc="tkatchev-tab-457574615bf4"
 checkdepends="python3"
 short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
 distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=1df7244af5db044fc4a6a38f2aa22e040246580bddd89bccb64d3967699d01d1
+checksum=ccc72e4c8a5f0d7786a8c4a4c8b8dd5599ad867c876605b2cacad7f32c30651a
 
 do_build() {
 	${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm

From 2e00ed66df28ee9aeab1a8b0a58e1f74636d67d3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 24 Mar 2022 15:52:34 +0100
Subject: [PATCH 0390/2561] parallel: update to 20220322.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index dd16940a024d..030875ae0ffd 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20220122
+version=20220322
 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=b8221a21412bca572ad8445b7981dfd625a3c6d48772cda468dfb5b886337e00
+checksum=df93ccf6a9f529ad2126b7042aef0486603e938c77b405939c41702d38a4e6d8
 
 pre_configure() {
 	# no html and pdf doc

From 976470a20d34847ed2960bb1688f5a4a9a8789d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 22 Mar 2022 09:28:37 +0100
Subject: [PATCH 0391/2561] doomretro: update to 4.4.10.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 5367dc8680ce..aa3010c9a7db 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.4.9
+version=4.4.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 changelog="https://raw.githubusercontent.com/bradharding/doomretro/master/releasenotes.md"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=02f2f3ec9d8d4db5ad1d00fcb5a5161113d3caa6dc108f14af8760535f00ce9e
+checksum=4f16113b576c6c76a1961b143437be67e149f1c24262f44dde0b81407c01e466

From bf182aaf9a5b98590e5b7ff7459bcf63b02b74af Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 17 Mar 2022 21:27:57 -0700
Subject: [PATCH 0392/2561] CLion: update to 2021.3.4.

---
 srcpkgs/CLion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 7bcdc3545a25..65e76c206e6c 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.3.3
+version=2021.3.4
 revision=1
 archs="x86_64 aarch64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d
+checksum=f3b0b9e0dd0cd4aebef5d424e7a22868c732daad47d6c94f73630cef449ccf78
 repository=nonfree
 restricted=yes
 nopie=yes

From 2ef31401be271cd94b9c7db1d20b688a2f16ab35 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 17 Mar 2022 21:28:52 -0700
Subject: [PATCH 0393/2561] intellij-idea-ultimate-edition: update to 2021.3.3.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 3340f9c0f0f2..92ad9135f3a9 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.3.2
+version=2021.3.3
 revision=1
 archs="i686 x86_64"
 create_wrksrc="true"
@@ -11,7 +11,7 @@ license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 _filename="ideaIU-${version}-no-jbr.tar.gz"
 distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=face5d154a2c9244b278bfc6dca37218ae3344090526a0679086eff9b0c56670
+checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
 repository=nonfree
 restricted=yes
 nopie=yes

From ae38670ae9ba3bf668d71da906d5fb75044ed3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 19 Mar 2022 22:50:25 +0100
Subject: [PATCH 0394/2561] New package: rootlesskit-0.14.6

---
 srcpkgs/rootlesskit/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/rootlesskit/template

diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
new file mode 100644
index 000000000000..15fbeba58f75
--- /dev/null
+++ b/srcpkgs/rootlesskit/template
@@ -0,0 +1,14 @@
+# Template file for 'rootlesskit'
+pkgname=rootlesskit
+version=0.14.6
+revision=1
+build_style=go
+go_import_path="github.com/rootless-containers/rootlesskit"
+go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl
+ ${go_import_path}/cmd/rootlesskit-docker-proxy"
+short_desc="Linux-native \"fake root\" for implementing rootless containers"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="Apache-2.0"
+homepage="https://github.com/rootless-containers/rootlesskit"
+distfiles="https://github.com/rootless-containers/rootlesskit/archive/v${version}.tar.gz"
+checksum=e27e4249f12cca44fc6e15a27f214f30fcb5f15646c813a90b6788bd9f0cfd4b

From c598b24e9bd9ce92628f13049fa08a5378812b55 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 18 Mar 2022 20:41:30 +0400
Subject: [PATCH 0395/2561] calibre: update to 5.39.0.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index af47d8993ee0..9f59df3a0350 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.38.0
+version=5.39.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=82b46b2c9d0ba2c82d95940e285b1fa168d55998613d216fa6d60da7d68fc550
+checksum=2fbe45ec9d4dea481772cc290e27567efdba60cd9d2fe736713d9b1eb020582e
 python_version=3
 lib32disabled=yes
 nocross=yes

From 5bf24c06a49e78025b34cf860bd35ae12d63c8da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 24 Mar 2022 21:42:57 +0100
Subject: [PATCH 0396/2561] Amass: fix build

---
 srcpkgs/Amass/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index c11b52a04657..ea6584b868d1 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -10,7 +10,3 @@ 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=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb
-
-post_install() {
-	rm ${DESTDIR}/usr/bin/examples
-}

From 10e9529f675ecd4af796f45b8f72cebe3f20111f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 15:02:10 -0700
Subject: [PATCH 0397/2561] libadwaita: update to 1.1.0

---
 srcpkgs/libadwaita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 37abdc5a2e5e..aef0032bfb7c 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091
+checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 3a3e7733450f41dc670ccd01829779686bebca92 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 13:48:28 +0100
Subject: [PATCH 0398/2561] New package: budgie-control-center-1.0.1

---
 srcpkgs/budgie-control-center-devel    |  1 +
 srcpkgs/budgie-control-center/template | 30 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/budgie-control-center-devel
 create mode 100644 srcpkgs/budgie-control-center/template

diff --git a/srcpkgs/budgie-control-center-devel b/srcpkgs/budgie-control-center-devel
new file mode 120000
index 000000000000..ff5de5ddf18f
--- /dev/null
+++ b/srcpkgs/budgie-control-center-devel
@@ -0,0 +1 @@
+budgie-control-center
\ No newline at end of file
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
new file mode 100644
index 000000000000..15d7ee0dca87
--- /dev/null
+++ b/srcpkgs/budgie-control-center/template
@@ -0,0 +1,30 @@
+# Template file for 'budgie-control-center'
+pkgname=budgie-control-center
+version=1.0.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
+ polkit python3 libxml2"
+makedepends="ModemManager-devel NetworkManager-devel accountsservice-devel
+ colord-devel colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel
+ gnome-online-accounts-devel gnome-settings-daemon-devel ibus-devel
+ libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel libnma-devel
+ polkit-devel pulseaudio-devel samba-devel upower-devel libxml2-devel
+ libX11-devel libXi-devel libepoxy-devel gdk-pixbuf-devel gtk+3-devel
+ libglib-devel cups-devel libgudev-devel libwacom-devel libsecret-devel
+ udisks2-devel gsound-devel libsoup-devel gcr-devel cheese-devel"
+depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
+ gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
+short_desc="Budgie Control Center"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/BuddiesOfBudgie/budgie-control-center"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-control-center/releases/download/v${version}/budgie-control-center-${version}.tar.xz"
+checksum=6c049d02600f6650238b4376a7eac77d8fcd786e9c603c4e4ec87cad0022028a
+
+budgie-control-center-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/pkgconfig
+	}
+}

From 49ad82f68d23ecb2547257856cb31e12711fd5f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 14:04:46 +0100
Subject: [PATCH 0399/2561] New package: budgie-desktop-view-1.2

---
 srcpkgs/budgie-desktop-view/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/budgie-desktop-view/template

diff --git a/srcpkgs/budgie-desktop-view/template b/srcpkgs/budgie-desktop-view/template
new file mode 100644
index 000000000000..57ec2a5790ad
--- /dev/null
+++ b/srcpkgs/budgie-desktop-view/template
@@ -0,0 +1,13 @@
+# Template file for 'budgie-desktop-view'
+pkgname=budgie-desktop-view
+version=1.2
+revision=1
+build_style=meson
+hostmakedepends="pkg-config intltool vala glib-devel"
+makedepends="libglib-devel gtk+3-devel vala-devel"
+short_desc="Budgie desktop icons application"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://github.com/BuddiesOfBudgie/budgie-desktop-view"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop-view/releases/download/v${version}/budgie-desktop-view-v${version}.tar.xz"
+checksum=8399fae4326e5a21dda889bd89cb16ed8201f2854dc5cbc12394b90420d4cf2e

From 01bcd3ee036ac7eb8b200a55c53ff2a29f84e735 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 01:27:41 +0100
Subject: [PATCH 0400/2561] budgie-screensaver: update to 5.0.

---
 srcpkgs/budgie-screensaver/patches/musl.patch | 12 ++++++++++++
 srcpkgs/budgie-screensaver/template           | 17 ++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/budgie-screensaver/patches/musl.patch

diff --git a/srcpkgs/budgie-screensaver/patches/musl.patch b/srcpkgs/budgie-screensaver/patches/musl.patch
new file mode 100644
index 000000000000..6f5c265f83ae
--- /dev/null
+++ b/srcpkgs/budgie-screensaver/patches/musl.patch
@@ -0,0 +1,12 @@
+diff --git a/src/subprocs.c b/src/subprocs.c
+index a378658..ba37650 100644
+--- a/src/subprocs.c
++++ b/src/subprocs.c
+@@ -36,6 +36,7 @@
+ # define fork  vfork
+ #endif /* VMS */
+ 
++#define _POSIX_SOURCE
+ #include <signal.h>		/* for the signal names */
+ 
+ #include <glib.h>
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index 971ebcdb4c28..b877543d33a0 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,14 +1,13 @@
 # Template file for 'budgie-screensaver'
 pkgname=budgie-screensaver
-version=4.0
-revision=2
-wrksrc=budgie-screensaver-v${version}
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool glib"
+version=5.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config intltool glib-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>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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
+homepage="https://github.com/BuddiesOfBudgie/budgie-screensaver"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-screensaver/releases/download/v${version}/budgie-screensaver-v${version}.tar.xz"
+checksum=611969a9f53e5d3148cad7445e95c94bfff6ea61c2f339969ecb5d9b51f6b871

From 74f37e84207e4eb09cc81f417563b73d785f35dc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 01:27:36 +0100
Subject: [PATCH 0401/2561] budgie-desktop: update to 10.6.

---
 srcpkgs/budgie-desktop/template | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 6d7dc6d139be..a65c395c994b 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,9 +1,7 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
-version=10.5.3
-revision=2
-create_wrksrc=yes
-build_wrksrc="$pkgname-$version"
+version=10.6
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false"
@@ -13,20 +11,14 @@ 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 budgie-screensaver"
+depends="gnome-session gnome-settings-daemon budgie-control-center elogind
+ gnome-themes-extra budgie-screensaver budgie-desktop-view"
 short_desc="Modern desktop environment from the Solus Project"
-maintainer="Lorem <notloremipsum@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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
- ${homepage}/commit/7a2835f2fa247e7201bb9e4a434bade8f4bfe86e.patch>mutter41.patch"
-checksum="878f4e6460c29740bf633c3b11ba97bcb788068c1460f82569938af2f1633b25
- 65430e84e33b1529aebae169ad8e0392abf1b5c4bb1b454d46f17dc37469d763"
-
-post_patch() {
-	patch -Np1 < ../mutter41.patch
-}
+homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
+checksum=ba297a10b547e6d7bf164406750b5c5dae98a7524978b30b4ad3cba9624def9e
 
 budgie-desktop-devel_package() {
 	short_desc+=" - development files"

From 3de95a703fc295d70f7314f8e8c0084538089f35 Mon Sep 17 00:00:00 2001
From: Barbaross <cullenrss@gmail.com>
Date: Thu, 17 Mar 2022 07:31:50 -0400
Subject: [PATCH 0402/2561] herbstluftwm: update to 0.9.4

---
 srcpkgs/herbstluftwm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..9b284845113a 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
 makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+ libXrender-devel freetype-devel libXfixes-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Cullen Ross <cullenrss@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
 distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+checksum=eef8eed076af33af2a75911c0fb1215fdb3427606a034ea8b44fe76872cb03cc
 
 post_install() {
 	vlicense LICENSE

From 56065c9b9c7890b23f0b2049bbd9cbc60fc71b73 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 25 Mar 2022 00:26:43 +0100
Subject: [PATCH 0403/2561] thermald: update to 2.4.9.

---
 srcpkgs/thermald/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 8a3625e5c194..633a5a498121 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.8
+version=2.4.9
 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=3e5a5033339c021de41ed4f946dd39e13f79f722fb5bd98d798e83658184c39b
+checksum=fb793a2bfaae2e544ef62801075419587b0c045041c69eeafbf61959cce07fdb
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then

From 1e8e2d970f7ad049c2d7f545b8aec32fe51cda39 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 25 Mar 2022 15:01:20 +0100
Subject: [PATCH 0404/2561] kore: update to 4.2.1.

---
 srcpkgs/kore/patches/platform.patch | 11 -----------
 srcpkgs/kore/template               |  8 +++++---
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/kore/patches/platform.patch

diff --git a/srcpkgs/kore/patches/platform.patch b/srcpkgs/kore/patches/platform.patch
deleted file mode 100644
index cbacde0591b1..000000000000
--- a/srcpkgs/kore/patches/platform.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/misc/linux-platform.sh	2020-09-02 14:26:51.393112635 +0200
-+++ b/misc/linux-platform.sh	2020-09-02 14:28:26.281114976 +0200
-@@ -2,7 +2,7 @@
- #
- # Linux specific defines and system call maps.
- 
--PLATFORM=$(uname -m)
-+PLATFORM=${XBPS_TARGET_MACHINE}
- BASE=$(dirname $0)
- 
- case "$PLATFORM" in
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index 6c6e2d1378c2..52b7dbe718a2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,7 +1,7 @@
 # Template file for 'kore'
 pkgname=kore
-version=4.1.0
-revision=2
+version=4.2.1
+revision=1
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
@@ -14,9 +14,11 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"
 homepage="https://kore.io"
 distfiles="https://kore.io/releases/kore-${version}.tar.gz"
-checksum=b7d73b005fde0ea01c356a54e4bbd8a209a4dff9cf315802a127ce7267efbe61
+checksum=f76b108a4eefa27c89123f5d6a36b493b171e429be7a85d3dd1466ac87e7f15a
 disable_parallel_build=yes
 
+export TARGET_PLATFORM=${XBPS_TARGET_MACHINE}
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi

From 2041c184ddab4947c0ac57c8f2b6aa45dd0a64ca Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 25 Mar 2022 09:04:13 -0500
Subject: [PATCH 0405/2561] Amass: update to 3.18.3.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index ea6584b868d1..a33e92ce1d2c 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.18.2
+version=3.18.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=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb
+checksum=66eee8ffd300e67a540e9962d2526377677df04b1a3b436471e0a930dd422a9f

From 91ed36133206788ced2e97aebfd9980a542cce09 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 22:26:51 -0500
Subject: [PATCH 0406/2561] nvidia: update to 510.60.02.

---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 43a6ba6821f0..3707accdab6e 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=510.47.03
+version=510.60.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=f2a421dae836318d3c0d96459ccb3af27e90e50c95b0faa4288af76279e5d690
+checksum=a800dfc0549078fd8c6e8e6780efb8eee87872e6055c7f5f386a4768ce07e003
 # 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 d51e9174b031598da984e04014ed0af989d26fec Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 25 Mar 2022 15:10:32 +0100
Subject: [PATCH 0407/2561] linux5.4: update to 5.4.187.

---
 srcpkgs/linux5.4/files/arm64-dotconfig | 3 ++-
 srcpkgs/linux5.4/template              | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index a6dd16191de4..2b70d687ce1a 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.180 Kernel Configuration
+# Linux/arm64 5.4.187 Kernel Configuration
 #
 
 #
@@ -394,6 +394,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 771796079797..46c8f5c5c751 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.185
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=d15fe9da679bfb624f35f127a17559f6d037ad37a313cf5fd22ce155401f3787
+checksum=189e3db3f2af8578037f9c8b4710e1002bdd56f318c5f8589b40de889be9a7b8
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 4e16c16c91c2a866f4e34512b0c9f11a97704926 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 25 Mar 2022 15:15:24 +0100
Subject: [PATCH 0408/2561] linux4.19: update to 4.19.236.

---
 srcpkgs/linux4.19/files/arm64-dotconfig | 3 ++-
 srcpkgs/linux4.19/template              | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux4.19/files/arm64-dotconfig b/srcpkgs/linux4.19/files/arm64-dotconfig
index a2bf3cb34ad9..8268b16af7fc 100644
--- a/srcpkgs/linux4.19/files/arm64-dotconfig
+++ b/srcpkgs/linux4.19/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.230 Kernel Configuration
+# Linux/arm64 4.19.236 Kernel Configuration
 #
 
 #
@@ -449,6 +449,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 # CONFIG_ARMV8_DEPRECATED is not set
 CONFIG_ARM64_SW_TTBR0_PAN=y
 
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 840a4516d83e..f2fb29a3cf0c 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.235
+version=4.19.236
 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=530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598
+checksum=002ef6adcafe8d90571f8882280a9bef28d1aa7cc9a3f35a50afc4cb2ebe31c0
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 37111e9c7989e5cfd2c9e11859f7eea44d43872d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 25 Mar 2022 10:42:45 -0500
Subject: [PATCH 0409/2561] python3-youtubesearch: update to 1.6.3.

---
 srcpkgs/python3-youtubesearch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 2e1c6fc13226..3d88fc1126aa 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
-version=1.6.2
+version=1.6.3
 revision=1
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/alexmercerind/youtube-search-python"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=d3d4081c319e839f8843f8e361c0b461d420fcd4d7aa4fcbdadf744af8208a8e
+checksum=bdb34757c5e390c4d20989d04317acbceffa94293693cbeecb493b079440dbd3
 make_check=no # no tests defined
 
 post_install() {

From bce8fbbe9f3f5a60da6dc41f1f66ae336b261955 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 25 Mar 2022 20:09:54 +0100
Subject: [PATCH 0410/2561] grml-rescueboot: update to 0.5.2.

---
 srcpkgs/grml-rescueboot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grml-rescueboot/template b/srcpkgs/grml-rescueboot/template
index dd08b8fa0402..41eb267a7806 100644
--- a/srcpkgs/grml-rescueboot/template
+++ b/srcpkgs/grml-rescueboot/template
@@ -1,6 +1,6 @@
 # Template file for 'grml-rescueboot'
 pkgname=grml-rescueboot
-version=0.5.1
+version=0.5.2
 revision=1
 archs="i686 x86_64"
 build_style="gnu-makefile"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://wiki.grml.org/doku.php?id=rescueboot"
 distfiles="https://github.com/grml/${pkgname}/archive/v${version}.tar.gz"
-checksum=03a2196f3b8cac67d16ba7a87e2a1a57d435a75712492a15ab98a2cd34543098
+checksum=14d37a44c7ef9b0d73cf4e3d3e2698e4a3683e719e02203ff69472b282582f9d
 
 do_build() {
 	:

From 30058265e7dd30ae71222a0e3f3ef04c1afca5ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:16:55 -0400
Subject: [PATCH 0411/2561] python3: update to 3.10.4.

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index df408f9ed74d..ed15b88359ff 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.10.3
+version=3.10.4
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -22,7 +22,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=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
+checksum=80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From f6846388acb33188153d42d6cd542487db136d52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:18:20 -0400
Subject: [PATCH 0412/2561] python3-tkinter: update to 3.10.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 bfe219597ff5..4aa0a732d032 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.10.3
+version=3.10.4
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -29,7 +29,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=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
+checksum=80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"

From 40f012be82ad97fc064d6b3fa19e02100290eb28 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:18:42 -0400
Subject: [PATCH 0413/2561] python3-pytools: update to 2022.1.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 3280c48dfb07..1cbf56dc08dd 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.1
+version=2022.1.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=3eebcc11923bf36fc42a9102d6e417a94817efb1aeb24d3149686dd5e3ec54d4
+checksum=5e824101880a246354756365880a65bb416f6a8cab6513b68fcbb48fba090fcb
 
 post_install() {
 	vlicense LICENSE

From 0ddd7d04a6f542c40eae65824487edfed36246e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:18:57 -0400
Subject: [PATCH 0414/2561] python3-pytz: update to 2022.1.

---
 srcpkgs/python3-pytz/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pytz/template b/srcpkgs/python3-pytz/template
index 7bddbf1ddfd3..9f9136df52fb 100644
--- a/srcpkgs/python3-pytz/template
+++ b/srcpkgs/python3-pytz/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytz'
 pkgname=python3-pytz
-version=2021.3
-revision=2
+version=2022.1
+revision=1
 wrksrc="pytz-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://pythonhosted.org/pytz/"
 distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.tar.gz"
-checksum=acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326
+checksum=1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7
 
 post_install() {
 	# use system tz database

From 65d68d9584a00eda771a8ab75bcbca805a59df80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:19:10 -0400
Subject: [PATCH 0415/2561] python3-setuptools-rust: update to 1.2.0.

---
 srcpkgs/python3-setuptools-rust/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index 9cd1c497793f..c2a506773cae 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-setuptools-rust'
 pkgname=python3-setuptools-rust
-version=1.1.2
+version=1.2.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3-semanticversion python3-tomli
- python3-setuptools python3-typing_extensions"
+depends="python3-semanticversion python3-setuptools python3-typing_extensions"
 short_desc="Setuptools plugin for Rust support"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/PyO3/setuptools-rust"
 changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1
+checksum=0a4ada479e8c7e3d8bd7cb56e1a29acc2b2bb98c2325051b0cdcb57d7f056de8
 # Tests have unpackaged dependencies
 make_check=no
 

From c13f66093cefe5b270c8cd2b0015c65740b3846d Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 25 Mar 2022 09:56:17 -0500
Subject: [PATCH 0416/2561] zfs: update to 2.1.4.

---
 srcpkgs/zfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 477c39614cd0..6c7b69345fd3 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.1.3
+version=2.1.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd
+checksum=3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

From c91e77151247cdd4b4960452384fbc7d95567528 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 15:08:23 -0700
Subject: [PATCH 0417/2561] libhandy1: update to 1.6.1

---
 srcpkgs/libhandy1/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 95803645bb70..fbbe35856b2f 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.5.0
+version=1.6.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 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 gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config gettext $(vopt_if gtk_doc gi-docgen) $(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"
@@ -17,15 +17,11 @@ 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=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
+checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4
 
 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
+build_options_default="gir glade gtk_doc"
 
 do_check() {
 	xvfb-run ninja -C build test
@@ -47,7 +43,7 @@ libhandy1-devel_package() {
 			vmove usr/share/vala
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 	}
 }

From 985455ea9eb94d35a99ce3b12a9315addbafdc0c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Mar 2022 17:14:32 +0100
Subject: [PATCH 0418/2561] mutter: update to 41.5.

---
 srcpkgs/mutter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 5efabfea13b1..e3f7f7bf1ca8 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=41.4
+version=41.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55882695064aa6f0385cd1f7f7fab2c2a2ed2c9aec78f578faa07f5209ca529c
+checksum=2233e52528451620be8578ea1dc7ff30d7eb6701eb316e9d17c219df57a08ea7
 shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
  libmutter-cogl-pango-9.so"
 make_check=no # needs a full graphical session

From ed5d7c04377869fbcfe7e73ae66cc83dc1338a12 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Mar 2022 17:13:34 +0100
Subject: [PATCH 0419/2561] gnome-shell: update to 41.5.

* restore optional build dependencies

They were removed with GNOME 41, but are required for recorder and
bluetooth indicator

Closes #36291
---
 srcpkgs/gnome-shell/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 9cca8add22c7..ff60caafa4ec 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=41.4
+version=41.5
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,7 +10,8 @@ hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
 makedepends="gnome-control-center-devel at-spi2-atk-devel
  evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
- NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel"
+ NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel"
 depends="elogind gnome-control-center gsettings-desktop-schemas upower"
 checkdepends="xvfb-run mesa-dri $depends"
 short_desc="GNOME core user interface"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4
+checksum=efbe8d1179983d5c2e68b1035f073fefe01b15fbdaf68f48adff96fa355b0bc5
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From d44cb87a43b9f03630f02f4ed5a93dbaff6ca2a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:17:29 +0100
Subject: [PATCH 0420/2561] gnome-nibbles: fix build with recent vala

---
 srcpkgs/gnome-nibbles/patches/vala.patch | 178 +++++++++++++++++++++++
 1 file changed, 178 insertions(+)
 create mode 100644 srcpkgs/gnome-nibbles/patches/vala.patch

diff --git a/srcpkgs/gnome-nibbles/patches/vala.patch b/srcpkgs/gnome-nibbles/patches/vala.patch
new file mode 100644
index 000000000000..48c565303196
--- /dev/null
+++ b/srcpkgs/gnome-nibbles/patches/vala.patch
@@ -0,0 +1,178 @@
+From 62964e9256fcac616109af874dbb2bd8342a9853 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 17 Mar 2021 11:25:05 +0100
+Subject: [PATCH] Reference of [GtkChild] fields is handled by GtkBuilder, type
+ must be unowned
+
+---
+ src/controls.vala           | 20 ++++++++++----------
+ src/nibbles-window.vala     | 26 +++++++++++++-------------
+ src/players.vala            |  6 +++---
+ src/preferences-dialog.vala | 30 +++++++++++++++---------------
+ src/scoreboard.vala         |  6 +++---
+ 5 files changed, 44 insertions(+), 44 deletions(-)
+
+diff --git a/src/controls.vala b/src/controls.vala
+index 584c9ff..f95d210 100644
+--- a/src/controls.vala
++++ b/src/controls.vala
+@@ -22,7 +22,7 @@ using Gtk;
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls.ui")]
+ private class Controls : Box
+ {
+-    [GtkChild] private Box grids_box;
++    [GtkChild] private unowned Box grids_box;
+     private Gee.LinkedList<ControlsGrid> grids = new Gee.LinkedList<ControlsGrid> ();
+ 
+     private Gdk.Pixbuf arrow_pixbuf;
+@@ -100,15 +100,15 @@ private class Controls : Box
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls-grid.ui")]
+ private class ControlsGrid : Button
+ {
+-    [GtkChild] private Label name_label;
+-    [GtkChild] private Image arrow_up;
+-    [GtkChild] private Image arrow_down;
+-    [GtkChild] private Image arrow_left;
+-    [GtkChild] private Image arrow_right;
+-    [GtkChild] private Label move_up_label;
+-    [GtkChild] private Label move_down_label;
+-    [GtkChild] private Label move_left_label;
+-    [GtkChild] private Label move_right_label;
++    [GtkChild] private unowned Label name_label;
++    [GtkChild] private unowned Image arrow_up;
++    [GtkChild] private unowned Image arrow_down;
++    [GtkChild] private unowned Image arrow_left;
++    [GtkChild] private unowned Image arrow_right;
++    [GtkChild] private unowned Label move_up_label;
++    [GtkChild] private unowned Label move_down_label;
++    [GtkChild] private unowned Label move_left_label;
++    [GtkChild] private unowned Label move_right_label;
+ 
+     internal WormProperties worm_props;
+     internal ulong external_handler;
+diff --git a/src/nibbles-window.vala b/src/nibbles-window.vala
+index 6961326..6bfb74a 100644
+--- a/src/nibbles-window.vala
++++ b/src/nibbles-window.vala
+@@ -40,30 +40,30 @@ private class NibblesWindow : ApplicationWindow
+     private int window_height;
+ 
+     /* Main widgets */
+-    [GtkChild] private Stack main_stack;
+-    [GtkChild] private Overlay overlay;
++    [GtkChild] private unowned Stack main_stack;
++    [GtkChild] private unowned Overlay overlay;
+ 
+     /* HeaderBar */
+-    [GtkChild] private HeaderBar headerbar;
+-    [GtkChild] private MenuButton hamburger_menu;
+-    [GtkChild] private Button new_game_button;
+-    [GtkChild] private Button pause_button;
++    [GtkChild] private unowned HeaderBar headerbar;
++    [GtkChild] private unowned MenuButton hamburger_menu;
++    [GtkChild] private unowned Button new_game_button;
++    [GtkChild] private unowned Button pause_button;
+ 
+     /* Pre-game screen widgets */
+-    [GtkChild] private Players players;
+-    [GtkChild] private Speed speed;
+-    [GtkChild] private Controls controls;
++    [GtkChild] private unowned Players players;
++    [GtkChild] private unowned Speed speed;
++    [GtkChild] private unowned Controls controls;
+ 
+     /* Statusbar widgets */
+-    [GtkChild] private Stack statusbar_stack;
+-    [GtkChild] private Label countdown;
+-    [GtkChild] private Scoreboard scoreboard;
++    [GtkChild] private unowned Stack statusbar_stack;
++    [GtkChild] private unowned Label countdown;
++    [GtkChild] private unowned Scoreboard scoreboard;
+     private Gdk.Pixbuf scoreboard_life;
+ 
+     /* Rendering of the game */
+     private NibblesView? view;
+ 
+-    [GtkChild] private Box game_box;
++    [GtkChild] private unowned Box game_box;
+     private Games.GridFrame frame;
+ 
+     /* Game being played */
+diff --git a/src/players.vala b/src/players.vala
+index 9198412..4bde18e 100644
+--- a/src/players.vala
++++ b/src/players.vala
+@@ -21,9 +21,9 @@ using Gtk;
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/players.ui")]
+ private class Players : Box
+ {
+-    [GtkChild] private ToggleButton worms4;
+-    [GtkChild] private ToggleButton worms5;
+-    [GtkChild] private ToggleButton worms6;
++    [GtkChild] private unowned ToggleButton worms4;
++    [GtkChild] private unowned ToggleButton worms5;
++    [GtkChild] private unowned ToggleButton worms6;
+ 
+     private SimpleAction nibbles_number_action;
+     private SimpleAction players_number_action;
+diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
+index 216a1e2..2d3a7bf 100644
+--- a/src/preferences-dialog.vala
++++ b/src/preferences-dialog.vala
+@@ -24,21 +24,21 @@ private class PreferencesDialog : Window
+     private GLib.Settings settings;
+     private Gee.ArrayList<GLib.Settings> worm_settings;
+ 
+-    [GtkChild] private Stack            stack;
+-    [GtkChild] private Stack            headerbar_stack;
+-    [GtkChild] private ComboBoxText     worm_combobox;
+-    [GtkChild] private Gtk.ListStore    list_store_1;
+-    [GtkChild] private Gtk.ListStore    list_store_2;
+-    [GtkChild] private Gtk.ListStore    list_store_3;
+-    [GtkChild] private Gtk.ListStore    list_store_4;
+-    [GtkChild] private TreeView         tree_view_1;
+-    [GtkChild] private TreeView         tree_view_2;
+-    [GtkChild] private TreeView         tree_view_3;
+-    [GtkChild] private TreeView         tree_view_4;
+-    [GtkChild] private ComboBoxText     combo_box_1;
+-    [GtkChild] private ComboBoxText     combo_box_2;
+-    [GtkChild] private ComboBoxText     combo_box_3;
+-    [GtkChild] private ComboBoxText     combo_box_4;
++    [GtkChild] private unowned Stack            stack;
++    [GtkChild] private unowned Stack            headerbar_stack;
++    [GtkChild] private unowned ComboBoxText     worm_combobox;
++    [GtkChild] private unowned Gtk.ListStore    list_store_1;
++    [GtkChild] private unowned Gtk.ListStore    list_store_2;
++    [GtkChild] private unowned Gtk.ListStore    list_store_3;
++    [GtkChild] private unowned Gtk.ListStore    list_store_4;
++    [GtkChild] private unowned TreeView         tree_view_1;
++    [GtkChild] private unowned TreeView         tree_view_2;
++    [GtkChild] private unowned TreeView         tree_view_3;
++    [GtkChild] private unowned TreeView         tree_view_4;
++    [GtkChild] private unowned ComboBoxText     combo_box_1;
++    [GtkChild] private unowned ComboBoxText     combo_box_2;
++    [GtkChild] private unowned ComboBoxText     combo_box_3;
++    [GtkChild] private unowned ComboBoxText     combo_box_4;
+ 
+     private Gee.ArrayList<Gtk.ListStore>    list_stores;
+     private Gee.ArrayList<TreeView>         tree_views;
+diff --git a/src/scoreboard.vala b/src/scoreboard.vala
+index a41aee1..aebc1cc 100644
+--- a/src/scoreboard.vala
++++ b/src/scoreboard.vala
+@@ -59,9 +59,9 @@ private class Scoreboard : Box
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/player-score-box.ui")]
+ private class PlayerScoreBox : Box
+ {
+-    [GtkChild] private Label name_label;
+-    [GtkChild] private Label score_label;
+-    [GtkChild] private Grid lives_grid;
++    [GtkChild] private unowned Label name_label;
++    [GtkChild] private unowned Label score_label;
++    [GtkChild] private unowned Grid lives_grid;
+ 
+     private Gee.LinkedList<Image> life_images = new Gee.LinkedList<Image> ();
+ 
+-- 
+GitLab
+

From 5b844bdee6a594abf50ce0d32137b9e6b84a658a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 22:43:33 +0100
Subject: [PATCH 0421/2561] gnome-nibbles: fix build with recent vala (part2)

---
 srcpkgs/gnome-nibbles/patches/vala2.patch | 66 +++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 srcpkgs/gnome-nibbles/patches/vala2.patch

diff --git a/srcpkgs/gnome-nibbles/patches/vala2.patch b/srcpkgs/gnome-nibbles/patches/vala2.patch
new file mode 100644
index 000000000000..c7a86316925e
--- /dev/null
+++ b/srcpkgs/gnome-nibbles/patches/vala2.patch
@@ -0,0 +1,66 @@
+From 1b48446068608aff9b5edf1fdbd4b8c0d9f0be94 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 16 Jan 2021 13:56:10 +0100
+Subject: [PATCH] Don't alter or try to write [GtkChild] fields
+
+See https://gitlab.gnome.org/GNOME/vala/issues/1121
+---
+ src/controls.vala | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/src/controls.vala b/src/controls.vala
+index 4f07358..584c9ff 100644
+--- a/src/controls.vala
++++ b/src/controls.vala
+@@ -140,25 +140,25 @@ private class ControlsGrid : Button
+         arrow_left.set_from_pixbuf  (arrow.rotate_simple (Gdk.PixbufRotation.COUNTERCLOCKWISE));
+         arrow_right.set_from_pixbuf (arrow.rotate_simple (Gdk.PixbufRotation.CLOCKWISE));
+ 
+-           up_handler = worm_props.notify ["up"].connect    (() => configure_label (worm_props.up,    ref move_up_label));
+-         down_handler = worm_props.notify ["down"].connect  (() => configure_label (worm_props.down,  ref move_down_label));
+-         left_handler = worm_props.notify ["left"].connect  (() => configure_label (worm_props.left,  ref move_left_label));
+-        right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, ref move_right_label));
+-
+-        configure_label (worm_props.up,    ref move_up_label);
+-        configure_label (worm_props.down,  ref move_down_label);
+-        configure_label (worm_props.left,  ref move_left_label);
+-        configure_label (worm_props.right, ref move_right_label);
++           up_handler = worm_props.notify ["up"].connect    (() => configure_label (worm_props.up,    move_up_label));
++         down_handler = worm_props.notify ["down"].connect  (() => configure_label (worm_props.down,  move_down_label));
++         left_handler = worm_props.notify ["left"].connect  (() => configure_label (worm_props.left,  move_left_label));
++        right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, move_right_label));
++
++        configure_label (worm_props.up,    move_up_label);
++        configure_label (worm_props.down,  move_down_label);
++        configure_label (worm_props.left,  move_left_label);
++        configure_label (worm_props.right, move_right_label);
+     }
+ 
+     internal void mark_duplicated_keys (GenericSet<uint> duplicate_keys)
+     {
+-        set_duplicate_class (worm_props.up    in duplicate_keys, ref move_up_label);
+-        set_duplicate_class (worm_props.down  in duplicate_keys, ref move_down_label);
+-        set_duplicate_class (worm_props.left  in duplicate_keys, ref move_left_label);
+-        set_duplicate_class (worm_props.right in duplicate_keys, ref move_right_label);
++        set_duplicate_class (worm_props.up    in duplicate_keys, move_up_label);
++        set_duplicate_class (worm_props.down  in duplicate_keys, move_down_label);
++        set_duplicate_class (worm_props.left  in duplicate_keys, move_left_label);
++        set_duplicate_class (worm_props.right in duplicate_keys, move_right_label);
+     }
+-    private static void set_duplicate_class (bool new_value, ref Label label)
++    private static void set_duplicate_class (bool new_value, Label label)
+     {
+         if (new_value)
+             label.get_style_context ().add_class ("duplicate");
+@@ -175,7 +175,7 @@ private class ControlsGrid : Button
+         worm_props.disconnect (color_handler);
+     }
+ 
+-    private static void configure_label (uint key_value, ref Label label)
++    private static void configure_label (uint key_value, Label label)
+     {
+         string? key_name = Gdk.keyval_name (key_value);
+         if (key_name == "Up")
+-- 
+GitLab
+

From 1d614d4af22d0ab5800085ed4c9c7ea5504af364 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 12:37:45 +0100
Subject: [PATCH 0422/2561] aisleriot: update to 3.22.21.

---
 srcpkgs/aisleriot/patches/guile-2.2.patch | 36 +++++++++++++++++++++++
 srcpkgs/aisleriot/template                |  4 +--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/aisleriot/patches/guile-2.2.patch

diff --git a/srcpkgs/aisleriot/patches/guile-2.2.patch b/srcpkgs/aisleriot/patches/guile-2.2.patch
new file mode 100644
index 000000000000..eb2ce5610b44
--- /dev/null
+++ b/srcpkgs/aisleriot/patches/guile-2.2.patch
@@ -0,0 +1,36 @@
+From 5e9b538db5304ccfed6c0d048a94d8c47dd27e31 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Thu, 17 Feb 2022 23:51:15 +0100
+Subject: [PATCH] games: Only use -Ono-letrectify with guile 3.0
+
+This fixes a build failure on guile 2.2 where this flag is unknown.
+
+Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/925
+---
+ games/meson.build | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/games/meson.build b/games/meson.build
+index e552beab..56819b4d 100644
+--- a/games/meson.build
++++ b/games/meson.build
+@@ -122,9 +122,13 @@ guile_warnings = [
+   '-W1',
+ ]
+ 
+-guile_flags = [
+-  '-Ono-letrectify',
+-]
++guile_flags = []
++
++if guile_version.version_compare('>= 3.0')
++  guile_flags += [
++    '-Ono-letrectify',
++  ]
++endif
+ 
+ # FIXME: this should use files('...') (allowed as per docs),
+ # but that crashes meson, see https://gitlab.gnome.org/chpe/meson/issues/2
+-- 
+GitLab
+
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 6655dbb76606..d4d178b13c9e 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.20
+version=3.22.21
 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=e5f4d00156060a8ecf410ed5d4e485b0f19177c554009c2b0ea6ee6579af549a
+checksum=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655
 replaces="aisleriot-data>=0"

From 761d41c1a3700249a62d0c1661a5dc601f8ad3d8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 25 Mar 2022 11:15:28 -0400
Subject: [PATCH 0423/2561] dendrite: update to 0.7.0.

add MAX_OPEN_FILES variable with default set to value recommended by
upstream (65535).
---
 srcpkgs/dendrite/files/dendrite-monolith-server/run | 1 +
 srcpkgs/dendrite/template                           | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dendrite/files/dendrite-monolith-server/run b/srcpkgs/dendrite/files/dendrite-monolith-server/run
index 2fab17797c4d..66400fe89c54 100755
--- a/srcpkgs/dendrite/files/dendrite-monolith-server/run
+++ b/srcpkgs/dendrite/files/dendrite-monolith-server/run
@@ -1,5 +1,6 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
+ulimit -n ${MAX_OPEN_FILES:-65535}
 cd /var/lib/dendrite || exit 1
 exec 2>&1
 exec chpst -u _dendrite:_dendrite dendrite-monolith-server \
diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 7589a7944cec..1bef12b95642 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.6.5
+version=0.7.0
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=b74170bd3f81e2f22ff4673bc632e37afeef1121fa90acb03ed2eed17a387133
+checksum=26c378bff1738b0e8422c7bd425be4763f22225f422ae1854c78644e4ca8bc42
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"

From 7dcf3c80979da3c5ec21e495737e70568a64c227 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Fri, 25 Mar 2022 21:19:05 +0100
Subject: [PATCH 0424/2561] google-chrome: update to 99.0.4844.84

---
 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 e12c57deeb5c..e6a568ca685d 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.82
+version=99.0.4844.84
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=b9c181ddc15760795a7c30b950d90a8ef78487825fb12b1e171d1f71fe8a107e
+checksum=96f260f798f1adb471a3a5b8e68702ef88237884e32f0e43baf15a78aed5b669
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 5dcc16f257f115da7c83c3d98f601e07c0c3310f Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 22 Mar 2022 12:25:49 +0100
Subject: [PATCH 0425/2561] volta: update to 1.0.6

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index b8fc160cdda0..7874993281ec 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,6 +1,6 @@
 # Template file for 'volta'
 pkgname=volta
-version=1.0.5
+version=1.0.6
 revision=1
 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=8b3741376e639d0e2d2eec7a7b628ac1d70af7a2c459d9b01c05c4853f5680ae
+checksum=0f66edcb2639bee2c1668efd119c2937a77fbbe564c9d63827e8eaf37dbee4b9
 
 post_install() {
 	vlicense LICENSE

From 9b12b869b165a9a229d6e6ac50cbddfe09234520 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH 0426/2561] aerc: update to 0.9.0

---
 .../aerc/patches/makefile-only-install.patch  | 18 +++++++++++++++
 srcpkgs/aerc/template                         | 22 ++++++-------------
 2 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/aerc/patches/makefile-only-install.patch

diff --git a/srcpkgs/aerc/patches/makefile-only-install.patch b/srcpkgs/aerc/patches/makefile-only-install.patch
new file mode 100644
index 000000000000..696832fe736c
--- /dev/null
+++ b/srcpkgs/aerc/patches/makefile-only-install.patch
@@ -0,0 +1,18 @@
+Build style handles building and installing aerc binary.
+Makefile should only install remaining files.
+
+--- ./Makefile
++++ ./Makefile
+@@ -82,11 +82,10 @@
+ clean:
+ 	$(RM) $(DOCS) aerc
+ 
+-install: $(DOCS) aerc
++install: $(DOCS)
+ 	mkdir -m755 -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man7 \
+ 		$(DESTDIR)$(SHAREDIR) $(DESTDIR)$(SHAREDIR)/filters $(DESTDIR)$(SHAREDIR)/templates $(DESTDIR)$(SHAREDIR)/stylesets \
+ 		$(DESTDIR)$(PREFIX)/share/applications
+-	install -m755 aerc $(DESTDIR)$(BINDIR)/aerc
+ 	install -m644 aerc.1 $(DESTDIR)$(MANDIR)/man1/aerc.1
+ 	install -m644 aerc-search.1 $(DESTDIR)$(MANDIR)/man1/aerc-search.1
+ 	install -m644 aerc-config.5 $(DESTDIR)$(MANDIR)/man5/aerc-config.5
diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..30a431484026 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,29 +1,21 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.9.0
 revision=1
 build_style=go
-hostmakedepends="scdoc git"
+go_import_path="git.sr.ht/~rjarry/aerc"
+go_build_tags=notmuch
+go_ldflags="-X main.Version=${version}"
+hostmakedepends="scdoc"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
-
-do_configure() {
-	:
-}
-
-do_build() {
-	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
-}
-
-do_install() {
-	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
-}
+checksum=b5901feb37a55edd1f713e76c1012ac3fc0757202ddacd7d388cc7ce60638023
 
 post_install() {
+ 	make PREFIX=/usr DESTDIR=${DESTDIR} install
 	vlicense LICENSE
 }

From 87b9a19026fb87590ca11fdb2b5dc9d6a409314a Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@cold-front.org>
Date: Fri, 25 Mar 2022 10:33:02 -0400
Subject: [PATCH 0427/2561] pipewire: update to 0.3.48.

---
 srcpkgs/pipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 0924ae71ba1f..5ed1ee1d3bd6 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.47
+version=0.3.48
 revision=1
 _pms_version=0.4.1
 build_style=meson
@@ -32,7 +32,7 @@ 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
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="8d70170a91ecba73746c1d83f95d54eee8ca71d0c3521926f05ed830d8b5a84e
+checksum="0d218be86b3d2b548c06259c47ad8d110ee1c09f071e17c4393eeef5c880fa6f
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

From a1a70c04a0007f8764eea04354c08b50ba258671 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 17:16:45 +0100
Subject: [PATCH 0428/2561] retroarch: update to 1.10.2.

---
 srcpkgs/retroarch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index ed8e9da4394f..6b89a54d89a2 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.10.0
+version=1.10.2
 revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=ff9c31abae19528275e40fbe49ef40be9410b4108513ae7dbf325e210e5b5bec
+checksum=e426b8d30c25806e54c61f21d0d742695fa4f6bc6a271def4459db5460d28e8e
 
 build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"

From ae50898ce6655c7e3ac1897ec0454047d64f8b0c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 17 Mar 2022 08:55:25 -0400
Subject: [PATCH 0429/2561] python3-phonenumbers: update to 8.12.45.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 9cb6d6a351f6..c4dd9b71d037 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.44
+version=8.12.45
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=26cfd0257d1704fe2f88caff2caabb70d16a877b1e65b6aae51f9fbbe10aa8ce
+checksum=94e30f59b2be6c4310a90f3d5da53d49900bdb440484506f3333c694ebb0cdab

From 71af5c6594f9441976b8e4ac8171089a86d6dcd7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 17 Mar 2022 08:53:53 -0400
Subject: [PATCH 0430/2561] synapse: update to 1.55.2.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index f28f1313dcd0..1c07111f4247 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.54.0
+version=1.55.2
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -21,7 +21,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=6e9ee5f0657fe01c5d141101b11c2c2da147003f7f8e684ef44d4f462125b7a1
+checksum=8e06cb264d1631d2518f2f726c89d62c5ed7148b73fbb8190a9c120d3166e7c4
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 9cca298f23effffe5a0d66689a7e69fe900cdb27 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 6 Feb 2022 18:45:45 -0500
Subject: [PATCH 0431/2561] New package: conduit-0.3.0

---
 srcpkgs/conduit/files/conduit/log/run |  1 +
 srcpkgs/conduit/files/conduit/run     |  6 ++++++
 srcpkgs/conduit/template              | 29 +++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 120000 srcpkgs/conduit/files/conduit/log/run
 create mode 100644 srcpkgs/conduit/files/conduit/run
 create mode 100644 srcpkgs/conduit/template

diff --git a/srcpkgs/conduit/files/conduit/log/run b/srcpkgs/conduit/files/conduit/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/conduit/files/conduit/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/conduit/files/conduit/run b/srcpkgs/conduit/files/conduit/run
new file mode 100644
index 000000000000..a3a42e323623
--- /dev/null
+++ b/srcpkgs/conduit/files/conduit/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+ulimit -n ${MAX_OPEN_FILES:-8192}
+export CONDUIT_CONFIG=${CONDUIT_CONFIG:-/etc/conduit/conduit.toml}
+
+exec chpst -u _conduit:_conduit conduit
diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template
new file mode 100644
index 000000000000..c2e423e79891
--- /dev/null
+++ b/srcpkgs/conduit/template
@@ -0,0 +1,29 @@
+# Template file for 'conduit'
+pkgname=conduit
+version=0.3.0
+revision=1
+wrksrc="conduit-v${version}"
+build_style=cargo
+hostmakedepends="clang"
+short_desc="Simple, fast and reliable chat server powered by Matrix"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://conduit.rs/"
+distfiles="https://gitlab.com/famedly/conduit/-/archive/v${version}/conduit-v${version}.tar.gz"
+checksum=9e750ed2b8d0e986b1cdc02278124b39c11fa785f2763914836978a5a79863e3
+
+system_accounts="_conduit"
+_conduit_homedir="/var/lib/conduit"
+
+make_dirs="/var/lib/conduit 0700 _conduit _conduit
+ /etc/conduit 755 _conduit _conduit"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	XBPS_CROSS_RUSTFLAGS+=" -latomic"
+fi
+
+post_install() {
+	vsconf conduit-example.toml conduit.toml
+	vsv conduit
+}

From 71dd8042f4045c73138a2a1e11be3c6efcff9564 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 12:35:01 +0100
Subject: [PATCH 0432/2561] Venom: remove package

* not maintained, doesn't build with recent vala versions
---
 srcpkgs/Venom/template            | 16 ----------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 srcpkgs/Venom/template

diff --git a/srcpkgs/Venom/template b/srcpkgs/Venom/template
deleted file mode 100644
index deb714982db1..000000000000
--- a/srcpkgs/Venom/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'Venom'
-pkgname=Venom
-version=0.5.5
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config glib-devel"
-makedepends="gtk+3-devel libgee08-devel gspell-devel
- libcanberra-devel sqlcipher-devel json-glib-devel
- libsoup-devel toxcore-devel libsodium-devel
- opus-devel libvpx-devel gstreamer1-devel"
-short_desc="Modern Tox client for the desktop"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/naxuroqa/Venom/"
-distfiles="https://github.com/naxuroqa/Venom/archive/${version}.tar.gz"
-checksum=0348e26d70b0614b6ee3d50fb6c086ae1f696ed250d8ea80eec28299bee23562
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 30fa0d2cce34..5003333859c9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -12,6 +12,7 @@ replaces="
  ImageMagick6<=6.9.12.12_2
  MoinMoin<=1.9.11_1
  Platinum9-theme<=0.0.0.20170720_3
+ Venom<=0.5.5_1
  XorCurses<=0.2.2_1
  acme-client<=0.1.16_5
  albert<=0.16.1_4

From dcbf80e5921254072403e7e317144648c8329664 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:09:02 +0100
Subject: [PATCH 0433/2561] granite: update to 6.2.0.

---
 common/shlibs            | 2 +-
 srcpkgs/granite/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d8a8b8b0df3..dd26ddee444b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1190,7 +1190,7 @@ libconfig.so.11 libconfig-1.7.1_1
 libopusfile.so.0 opusfile-0.12_2
 libopusurl.so.0 opusfile-0.12_2
 libopusenc.so.0 libopusenc-0.2_1
-libgranite.so.5 granite-0.5.0_1
+libgranite.so.6 granite-6.2.0_1
 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
 librlog.so.5 librlog-1.4_1
 libtinyxml.so.0 tinyxml-2.6.2_1
diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template
index 2ae77d6ee66c..f3a53c4165bb 100644
--- a/srcpkgs/granite/template
+++ b/srcpkgs/granite/template
@@ -1,10 +1,10 @@
 # Template file for 'granite'
 pkgname=granite
-version=5.5.0
+version=6.2.0
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config gettext vala"
 makedepends="gtk+3-devel libgee08-devel"
 depends="hicolor-icon-theme"
 short_desc="GTK3 widget library for elementary OS"
@@ -12,7 +12,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/elementary/granite"
 distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz"
-checksum=0c376520c7d462fca05213a14970ee1075fea4a78062a33b47529e2647cd5557
+checksum=067d31445da9808a802fca523630c3e4b84d2d7c78ae547ced017cb7f3b9c6b5
 
 granite-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 0dca9520aae987f40a3f1819b9edff6ce3574796 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:02 +0100
Subject: [PATCH 0434/2561] Minder: revbump for granite 6, build translations

---
 srcpkgs/Minder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index da4f9b751c20..8ee716a6f9f3 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,9 +1,9 @@
 # Template file for 'Minder'
 pkgname=Minder
 version=1.14.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config glib-devel vala"
+hostmakedepends="pkg-config gettext glib-devel vala"
 makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
  libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel json-glib-devel"
 short_desc="Mind-mapping application designed for Pantheon"

From 0b5478dfc38fd23f47e9fd01391ce6aaff24f234 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:02 +0100
Subject: [PATCH 0435/2561] bookworm: revbump for granite 6, build translations

---
 srcpkgs/bookworm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 3e319fb786d9..0205a6e62427 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -1,9 +1,9 @@
 # Template file for 'bookworm'
 pkgname=bookworm
 version=1.1.2
-revision=4
+revision=5
 build_style=meson
-hostmakedepends="pkg-config glib-devel vala"
+hostmakedepends="pkg-config glib-devel gettext vala"
 makedepends="gtk+3-devel libgee08-devel granite-devel
  webkit2gtk-devel sqlite-devel poppler-glib-devel
  libxml2-devel glib-devel libsoup-devel"

From 8346bc9887546c6ce04f5fedcb6a5148d3f09e04 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 0436/2561] notes-up: update to 2.0.6.

---
 srcpkgs/notes-up/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template
index 481a214cfbc2..55db14d47b32 100644
--- a/srcpkgs/notes-up/template
+++ b/srcpkgs/notes-up/template
@@ -1,6 +1,6 @@
 # Template file for 'notes-up'
 pkgname=notes-up
-version=2.0.5
+version=2.0.6
 revision=1
 wrksrc=Notes-up-${version}
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="https://github.com/Philip-Scott/Notes-up"
 distfiles="https://github.com/Philip-Scott/Notes-up/archive/${version}.tar.gz"
-checksum=56ddf5ab3468c3bbb806106c41b485b020ade3c7f48d271bda1e78ddce5e1664
+checksum=6e7b6ac4a3a917867a1555db0a6e03e40ccd9955b5d76e980a26fa8e40744f07
 
 post_install() {
 	ln -s com.github.philip_scott.notes-up ${DESTDIR}/usr/bin/notes-up

From 9af70956f10a11310738a2f506ec0737fe3ed66f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 0437/2561] nutty: revbump for granite 6, build translations

---
 srcpkgs/nutty/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index 37396577835b..eb263a89af4d 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -1,18 +1,18 @@
 # Template file for 'nutty'
 pkgname=nutty
 version=1.1.1
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config vala glib-devel"
+hostmakedepends="pkg-config gettext vala glib-devel"
 makedepends="gtk+3-devel libgee08-devel libnotify-devel granite-devel
  sqlite-devel"
 short_desc="Network Utility"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/babluboy/nutty"
-distfiles="${homepage}/archive/${version}.tar.gz"
+distfiles="https://github.com/babluboy/nutty/archive/${version}.tar.gz"
 checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
-python_version=2 #unverified
+python_version=2
 
 post_install() {
 	vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications

From cf9ee116541112c6f3be39b853397764d7248b4f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 0438/2561] pantheon-agent-polkit: revbump for granite 6

---
 srcpkgs/pantheon-agent-polkit/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pantheon-agent-polkit/template b/srcpkgs/pantheon-agent-polkit/template
index c2ae95b313e4..4285532c67b5 100644
--- a/srcpkgs/pantheon-agent-polkit/template
+++ b/srcpkgs/pantheon-agent-polkit/template
@@ -1,13 +1,13 @@
 # Template file for 'pantheon-agent-polkit'
 pkgname=pantheon-agent-polkit
 version=1.0.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="intltool pkg-config vala gobject-introspection"
+hostmakedepends="gettext pkg-config vala gobject-introspection"
 makedepends="gtk+3-devel polkit-devel granite-devel"
 short_desc="Pantheon Polkit Agent"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
+homepage="https://github.com/elementary/pantheon-agent-polkit"
+distfiles="https://github.com/elementary/pantheon-agent-polkit/archive/${version}.tar.gz"
 checksum=8e730f335545a4ca2717e1c9ccad61c329c1f19ea51f76ae4783da9e0416d484

From 33267a80630161741425f360f3ef7d0260e30f14 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0439/2561] pantheon-screenshot: update to 6.0.2.

---
 srcpkgs/pantheon-screenshot/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pantheon-screenshot/template b/srcpkgs/pantheon-screenshot/template
index 3492b0c0d49e..fb2ee8e7b095 100644
--- a/srcpkgs/pantheon-screenshot/template
+++ b/srcpkgs/pantheon-screenshot/template
@@ -1,18 +1,18 @@
 # Template file for 'pantheon-screenshot'
 pkgname=pantheon-screenshot
-version=1.7.1
+version=6.0.2
 revision=1
 wrksrc="screenshot-${version}"
 build_style=meson
-hostmakedepends="desktop-file-utils glib-devel intltool pkgconf vala"
-makedepends="granite-devel libcanberra-devel"
-depends="desktop-file-utils gdk-pixbuf gtk+3 hicolor-icon-theme"
+hostmakedepends="desktop-file-utils glib-devel gettext pkg-config vala"
+makedepends="granite-devel libcanberra-devel libhandy1-devel"
+depends="desktop-file-utils gdk-pixbuf hicolor-icon-theme"
 short_desc="Screenshot tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-only"
 homepage="https://github.com/elementary/screenshot-tool"
 distfiles="https://github.com/elementary/screenshot-tool/archive/${version}.tar.gz"
-checksum=2789abf01b9b41ae62e39eea4d5765dd606898435e1723939a06301922c431e2
+checksum=af1d67b196a22af529190f593183ff2eebad51a1329be7279cddb7dc0ce406f4
 
 post_install() {
 	ln -s io.elementary.screenshot-tool "$DESTDIR"/usr/bin/"$pkgname"

From dbeed3a28755a0dbe0b1cb82b478bb2e02656a94 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0440/2561] planner: update to 3.0.6.

---
 srcpkgs/planner/template | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index 7be79ab4c6ba..b55a40f9306f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,32 +1,19 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.7
+version=3.0.6
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel curl"
-makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel libpeas-devel libhandy1-devel"
+makedepends="libgee08-devel granite-devel webkit2gtk-devel libsoup-devel
+ libhandy1-devel json-glib-devel"
 depends="io.elementary.icons io.elementary.stylesheet curl"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=cd34953867a91b2992aa4eafddc5093a695d1e6096571ade75640dddcc425d69
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" evolution-data-server-devel"
-fi
-pre_configure() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		# In musl libc there is no _NL_TIME_FIRST_WEEKDAY in langinfo.h
-		# thus replace Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
-		# with 0; (sunday)
-		vsed -i src/Services/Calendar/CalendarModel.vala \
-			-e "s#\(int week_start =\) Posix.*#\1 0;#"
-	fi
-}
+checksum=345a9ad2220820f08f583321e874528eee9f7e009236127efacee72d071c7ea5
 
 post_install() {
 	vinstall data/com.github.alainm23.planner.desktop.in 644 \

From 4a0bbf67604e7b951167a86ea18a07a4c964ffbc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0441/2561] quickDocs: revbump for granite 6

---
 srcpkgs/quickDocs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template
index 940ad376d9c7..c4a22e6bbe7d 100644
--- a/srcpkgs/quickDocs/template
+++ b/srcpkgs/quickDocs/template
@@ -1,7 +1,7 @@
 # Template file for 'quickDocs'
 pkgname=quickDocs
 version=2.2.6
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="vala pkg-config"
 makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel"

From 80a6caf402fa109b4af14b238dc8cf5be05e8c3d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0442/2561] sequeler: revbump for granite 6

---
 srcpkgs/sequeler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..32f127dc5c6e 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,7 +1,7 @@
 # Template file for 'sequeler'
 pkgname=sequeler
 version=0.8.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
 makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel

From 1ed05ba5da3bfb4c89d41ec0b20eb60c1e20b756 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0443/2561] switchboard: update to 6.0.0.

---
 srcpkgs/switchboard/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index ebb706e5d9e5..9397fea8cdeb 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -1,16 +1,16 @@
 # Template file for 'switchboard'
 pkgname=switchboard
-version=2.3.7
-revision=2
+version=6.0.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config vala gettext"
-makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
+makedepends="granite-devel gtk+3-devel libhandy1-devel"
 short_desc="Extensible System Settings app designed for elementary OS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/elementary/switchboard"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=373db840b254897b2a59f6f421508f8f1361adc5d4d35b7963ba024e5c8234c9
+distfiles="https://github.com/elementary/switchboard/archive/${version}.tar.gz"
+checksum=40c2fd17535cba239b7c78b62d93a3f5ef7e990b31a7c4ecf04cba0c2b60d792
 
 switchboard-devel_package() {
 	short_desc+=" - development files"

From 7f207024023d15349fe51ab9f8fb4b5f31a04ffa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 0444/2561] switchboard-plug-bluetooth: update to 2.3.6.

---
 srcpkgs/switchboard-plug-bluetooth/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-bluetooth/template b/srcpkgs/switchboard-plug-bluetooth/template
index 373368918159..b1b6977a5269 100644
--- a/srcpkgs/switchboard-plug-bluetooth/template
+++ b/srcpkgs/switchboard-plug-bluetooth/template
@@ -1,13 +1,13 @@
 # Template file for 'switchboard-plug-bluetooth'
 pkgname=switchboard-plug-bluetooth
-version=2.3.0
+version=2.3.6
 revision=1
 build_style=meson
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
 makedepends="switchboard-devel granite-devel gtk+3-devel"
 short_desc="Switchboard Bluetooth Plug"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ffeb4cdb53696b241e203f4e0920bb90c05fd77b99a05bd9483cb4c8367f1000
+homepage="https://github.com/elementary/switchboard-plug-bluetooth"
+distfiles="https://github.com/elementary/switchboard-plug-bluetooth/archive/${version}.tar.gz"
+checksum=fec5d135dc17c3ab1396cbe78f255e767f1834dfc4db8ec30579ff0ef29836b9

From f40ac2d0a3156afc3e3327f3bd32befe96dedb25 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 0445/2561] switchboard-plug-network: update to 2.4.2.

* build translations
* enable cross builds
---
 srcpkgs/switchboard-plug-network/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index 31f640cf25df..382aea7559a0 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,15 +1,14 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.3.3
+version=2.4.2
 revision=1
 build_style=meson
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
 makedepends="switchboard-devel granite-devel gtk+3-devel
  libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/switchboard-plug-network"
-distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
-checksum=a2f29b3054c187f2be9688bb04b6800cf4c2d3dd74cdd4fa37626f0b2ac5df50
-nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"
+distfiles="https://github.com/elementary/switchboard-plug-network/archive/${version}.tar.gz"
+checksum=190b1f9123bc9ee4120a624ad3de91c0e40a141cb19b8eb7ec74d3c39f008971

From f4135e0d46954dd611dcff0c5854b28e56fa7744 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 0446/2561] switchboard-plug-printers: update to 2.1.10.

---
 .../patches/fix-signal_subscribe.patch        | 11 ---------
 .../patches/ftbfs.patch                       | 23 -------------------
 srcpkgs/switchboard-plug-printers/template    | 10 ++++----
 3 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
 delete mode 100644 srcpkgs/switchboard-plug-printers/patches/ftbfs.patch

diff --git a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
deleted file mode 100644
index 48eb8948a642..000000000000
--- a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/CUPSNotifier.vala	2018-11-28 12:34:33.000000000 +0100
-+++ b/src/CUPSNotifier.vala	2021-01-29 19:26:11.191992396 +0100
-@@ -63,7 +63,7 @@
-         Bus.get_proxy.begin<NotifierDBus> (BusType.SYSTEM, "org.cups.cupsd.Notifier", "/org/cups/cupsd/Notifier", GLib.DBusProxyFlags.NONE, null, (obj, res) => {
-             try {
-                 dbus_notifier = Bus.get_proxy.end (res);
--                ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, subscription_callback);
-+                ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, (GLib.DBusSignalCallback)subscription_callback);
-             } catch (IOError e) {
-                 critical (e.message);
-             }
diff --git a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch b/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
deleted file mode 100644
index e8e21e2c4841..000000000000
--- a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3175c2ebf106145a95355d2571e0a2aa4834e884 Mon Sep 17 00:00:00 2001
-From: Enerccio <admin@en-circle.com>
-Date: Tue, 17 Sep 2019 15:31:37 +0200
-Subject: [PATCH] Update cups.vapi (#118)
-
-Fixed bug with compilation
----
- vapi/cups.vapi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vapi/cups.vapi b/vapi/cups.vapi
-index 7f1b795..5dcdba6 100644
---- a/vapi/cups.vapi
-+++ b/vapi/cups.vapi
-@@ -605,7 +605,7 @@ namespace CUPS {
- 			[CCode (cname = "ippAddBooleans")]
- 			private unowned Attribute _add_booleans (Tag group, string name, [CCode (array_length_pos = 0.9)] char[] values);
- 			public unowned Attribute add_booleans (Tag group, string name, bool[] values) {
--				char[] char_values;
-+				char[] char_values = {};
- 				foreach (var val in values) {
- 					char_values += val ? 1 : 0;
- 				}
diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template
index caecd10c886c..05f3c86abd79 100644
--- a/srcpkgs/switchboard-plug-printers/template
+++ b/srcpkgs/switchboard-plug-printers/template
@@ -1,14 +1,14 @@
 # Template file for 'switchboard-plug-printers'
 pkgname=switchboard-plug-printers
-version=2.1.6
+version=2.1.10
 revision=1
 build_style=meson
-hostmakedepends="pkg-config vala intltool"
+hostmakedepends="pkg-config vala gettext"
 makedepends="switchboard-devel granite-devel gtk+3-devel cups-devel"
 depends="cups-pk-helper"
 short_desc="Switchboard Printers Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=fe2c748e3737c3304ea8613d43d5ba8596f95499a65b8d13f93c4f702901f442
+homepage="https://github.com/elementary/switchboard-plug-printers"
+distfiles="https://github.com/elementary/switchboard-plug-printers/archive/${version}.tar.gz"
+checksum=448f6ae28fc4dacc2c329532e21aacc4ec7aa4af7d93bd6d7013002253faef3d

From 430d844a9cde0be1332588ea2a0046f51e1d52ed Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:59:08 +0100
Subject: [PATCH 0447/2561] io.elementary.calculator: update to 1.7.2.

---
 srcpkgs/io.elementary.calculator/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index 56abf698403b..35a363c7ae9a 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,17 +1,17 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
-version=1.6.0
-revision=2
+version=1.7.2
+revision=1
 wrksrc="calculator-${version}"
 build_style=meson
-hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"
-makedepends="granite-devel gtk+3-devel"
+hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream"
+makedepends="granite-devel gtk+3-devel libhandy1-devel"
 short_desc="Calculator app designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/elementary/calculator"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c650d5ff7d2df2d122ade0cbd35be50927f22b0d260f28e374b1112114f24540
+checksum=d296d06b36a0c7dd84e7e91e9801989e83312612d6ee6f0479030c1b340d397b
 
 pantheon-calculator_package() {
 	depends="io.elementary.calculator>=${version}_${revision}"

From 9a3a5cefb6074fc2edfc4708b7a0ce65871824e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:06 +0100
Subject: [PATCH 0448/2561] io.elementary.calendar: update to 6.1.0.

---
 .../patches/00-musl.patch                     | 65 ++++++++++---------
 .../01-fix-build-without-locale-command.patch | 32 +++++++++
 srcpkgs/io.elementary.calendar/template       | 18 ++---
 3 files changed, 76 insertions(+), 39 deletions(-)
 create mode 100644 srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch

diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch
index f85beca403fa..9b50a7e6e259 100644
--- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch
+++ b/srcpkgs/io.elementary.calendar/patches/00-musl.patch
@@ -1,44 +1,49 @@
-commit c9ba80af072819261a9e24a04a0859b93b5db810
-Author: Cameron Nemo <camerontnorman@gmail.com>
-Date:   Thu Oct 18 11:33:15 2018 -0700
-
-    Check for _NL_TIME_FIRST_WEEKDAY declaration
-
-diff --git core/Model/CalendarModel.vala core/Model/CalendarModel.vala
-index 3e3b8cbd..b33f75f8 100644
---- a/core/Model/CalendarModel.vala
-+++ b/core/Model/CalendarModel.vala
-@@ -68,7 +68,11 @@ public class Maya.Model.CalendarModel : Object {
-     }
- 
-     private CalendarModel () {
+--- a/core/Services/Calendar/EventStore.vala
++++ b/core/Services/Calendar/EventStore.vala
+@@ -304,6 +304,7 @@ public class Calendar.EventStore : Object {
+         // number we want, so we convert the pointer address to a uint to get
+         // the data. Since the pointer address is actually data, using it as a
+         // pointer will segfault.
++#if HAVE_NL_TIME_WEEK_1STDAY
+         uint week_day1 = (uint) Posix.NLTime.WEEK_1STDAY.to_string ();
+         var week_1stday = 0; // Default to 0 if unrecognized data
+         if (week_day1 == 19971130) { // Sunday
+@@ -313,6 +314,9 @@ public class Calendar.EventStore : Object {
+         } else {
+             warning ("Unknown value of _NL_TIME_WEEK_1STDAY: %u", week_day1);
+         }
++#else
++        var week_1stday = 0;
++#endif
+         /* The offset between GLib and local POSIX numbering.
+          * If week_1stday is Monday, data is correct for GLib: Monday=1 through Sunday=7,
+          * so offset is 0.
+@@ -323,7 +327,11 @@ public class Calendar.EventStore : Object {
+         // Get the start of week
+         // HACK This line produces a string of 3 bytes. It takes the raw value
+         // of the first one and uses that as the value of week_start.
 +#if HAVE_NL_TIME_FIRST_WEEKDAY
-         int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
+         int week_start_posix = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
 +#else
-+        int week_start = 0;
++        int week_start_posix = 0;
 +#endif
-         if (week_start >= 1 && week_start <= 7) {
-             week_starts_on = (Maya.Settings.Weekday)week_start-1;
-         }
-diff --git meson.build meson.build
-index a0cd2dd7..02b4e1d1 100644
+ 
+         var week_start = week_start_posix + glib_offset;
+         if (week_start == 0) { // Sunday special case
 --- a/meson.build
 +++ b/meson.build
-@@ -31,7 +31,17 @@ folks_dep = dependency('folks')
- geocode_glib_dep = dependency('geocode-glib-1.0')
- gclue_dep = dependency('libgeoclue-2.0')
+@@ -48,7 +48,14 @@ else
+     add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala')
+ endif
  
 -m_dep = meson.get_compiler('c').find_library('m', required : false)
 +cc = meson.get_compiler('c')
 +m_dep = cc.find_library('m', required : false)
-+libnotify_dep = dependency('libnotify', required: false)
-+
-+if libnotify_dep.found()
-+    add_project_arguments('--define=HAVE_LIBNOTIFY', language: 'vala')
-+endif
-+
 +if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY')
 +    add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala')
++endif
++if cc.has_header_symbol('langinfo.h', '_NL_TIME_WEEK_1STDAY')
++    add_project_arguments('--define=HAVE_NL_TIME_WEEK_1STDAY', language: 'vala')
 +endif
  
  gresource_calendar = gnome.compile_resources(
diff --git a/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch b/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch
new file mode 100644
index 000000000000..6513e4c5422b
--- /dev/null
+++ b/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch
@@ -0,0 +1,32 @@
+--- a/core/Tests/meson.build
++++ b/core/Tests/meson.build
+@@ -18,15 +18,20 @@ util_tests = executable(
+ )
+ test('Utils Tests', util_tests, suite: 'core', is_parallel: false)
+ 
++locale_prog = find_program('locale', required: false)
+ # We need these three locales to run the tests
+-locales = run_command('locale', '-a').stdout().split('\n')
+-if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8')
+-    eventstore_tests = executable(
+-      tests_name + '-eventstore',
+-      'eventstore-tests.vala',
+-      dependencies: tests_deps
+-    )
+-    test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false)
++if locale_prog.found()
++  locales = run_command(locale_prog, '-a').stdout().split('\n')
++  if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8')
++      eventstore_tests = executable(
++        tests_name + '-eventstore',
++        'eventstore-tests.vala',
++        dependencies: tests_deps
++      )
++      test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false)
++  else
++    message('EventStore Tests have been disabled, a locale is missing in the system.')
++  endif
+ else
+-message('EventStore Tests have been disabled, a locale is missing in the system.')
++    message('EventStore Tests have been disabled, the locale command is missing in the system.')
+ endif
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index a5ea019353a0..bf87c7599001 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,22 +1,21 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
-version=5.0
-revision=6
-_git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
-wrksrc="calendar-${_git_commit}"
+version=6.1.0
+revision=1
+wrksrc="calendar-${version}"
 build_style=meson
 build_helper="gir"
-hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream
+hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
  glib-devel evolution-data-server-devel"
 makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
- libchamplain-devel clutter-devel evolution-data-server-devel
+ libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
  folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
 short_desc="Desktop calendar app designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/elementary/calendar"
-distfiles="${homepage}/archive/${_git_commit}.tar.gz"
-checksum=3be3851baeed67144e5cbed209b2c1b982fe9830db13372e3051423295dee345
+distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz"
+checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d
 
 libio.elementary.calendar_package() {
 	short_desc+=" - library"
@@ -28,7 +27,8 @@ libio.elementary.calendar_package() {
 libio.elementary.calendar-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.calendar>=${version} evolution-data-server-devel
-	 granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel"
+	 granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel
+	 libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From 9278fef1fd70ea02b4979b04b26007d336573d43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:04 +0100
Subject: [PATCH 0449/2561] io.elementary.code: update to 6.1.0.

---
 .../io.elementary.code/patches/vala050.patch  | 25 -------------------
 srcpkgs/io.elementary.code/template           | 18 ++++++-------
 2 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/io.elementary.code/patches/vala050.patch

diff --git a/srcpkgs/io.elementary.code/patches/vala050.patch b/srcpkgs/io.elementary.code/patches/vala050.patch
deleted file mode 100644
index ec3abb8fd9f0..000000000000
--- a/srcpkgs/io.elementary.code/patches/vala050.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a185de0e7716aa2de2bf21de96e6c9af1dca81aa Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 20:43:07 +0200
-Subject: [PATCH] fix with vala-0.50
-
----
- plugins/outline/Vala/ValaSymbolOutline.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git plugins/outline/Vala/ValaSymbolOutline.vala plugins/outline/Vala/ValaSymbolOutline.vala
-index c8db339..31386a6 100644
---- a/plugins/outline/Vala/ValaSymbolOutline.vala
-+++ b/plugins/outline/Vala/ValaSymbolOutline.vala
-@@ -61,7 +61,7 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline
- 
-     public void parse_symbols () {
-         var context = new Vala.CodeContext ();
--        context.profile = Vala.Profile.GOBJECT;
-+        context.set_target_profile(Vala.Profile.GOBJECT);
-         context.add_source_filename (doc.file.get_path ());
-         context.report = new Report ();
-         if (cancellable != null)
--- 
-2.28.0
-
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 05d84cc39c9f..c47d667b8a96 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,19 +1,19 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
-version=3.4.1
-revision=5
+version=6.1.0
+revision=1
 wrksrc="code-${version}"
 build_style=meson
-hostmakedepends="pkg-config vala intltool glib-devel"
+hostmakedepends="pkg-config vala gettext polkit glib-devel"
 makedepends="editorconfig-devel libgee08-devel granite-devel libpeas-devel
- gtksourceview-devel vte3-devel gtkspell3-devel zeitgeist-devel libsoup-devel
- webkit2gtk-devel gtk+3-devel libgit2-glib-devel"
+ gtksourceview4-devel vte3-devel gtkspell3-devel libsoup-devel
+ gtk+3-devel libgit2-glib-devel polkit-devel libhandy1-devel"
 short_desc="Code editor designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/code"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=d84b38193b72cd93995aae604358c83c5b6976d8472ce985027b947cfed990bf
+distfiles="https://github.com/elementary/code/archive/${version}.tar.gz"
+checksum=d44851eb827dc9a069ab81b6a9cfe255795e3319a6882ca344152781968ce3ce
 
 libio.elementary.code_package() {
 	short_desc+=" - library"
@@ -25,8 +25,8 @@ libio.elementary.code_package() {
 libio.elementary.code-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.code>=${version} fontconfig-devel granite-devel
-	 gtk+3-devel gtksourceview-devel libgee08-devel libgit2-glib-devel
-	 libglib-devel libpeas-devel pango-devel zeitgeist-devel"
+	 gtk+3-devel gtksourceview4-devel libgee08-devel libgit2-glib-devel
+	 libglib-devel libpeas-devel pango-devel polkit-devel libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From 1f9e7f010dc7343bd57594d0cb18ea5091c33b5e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:07 +0100
Subject: [PATCH 0450/2561] io.elementary.files: update to 6.1.2.

---
 common/shlibs                        |  4 ++--
 srcpkgs/io.elementary.files/template | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dd26ddee444b..ffcc843af85c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,8 +3524,8 @@ libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
-libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1
-libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1
+libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1
+libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1
 libwlroots.so.9 wlroots0.14-0.14.1_1
 libwlroots.so.10 wlroots-0.15.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template
index cb0643a02449..0e8d5fb177d6 100644
--- a/srcpkgs/io.elementary.files/template
+++ b/srcpkgs/io.elementary.files/template
@@ -1,20 +1,20 @@
 # Template file for 'io.elementary.files'
 pkgname=io.elementary.files
-version=4.5.0
+version=6.1.2
 revision=1
 wrksrc="files-${version}"
 build_style=meson
-configure_args="-Dwith-unity=disabled"
-hostmakedepends="vala glib-devel pkg-config intltool"
+configure_args="-Dsystemduserunitdir=no"
+hostmakedepends="vala glib-devel pkg-config gettext"
 makedepends="gtk+3-devel libglib-devel libgee08-devel sqlite-devel plank-devel
  libcanberra-devel granite-devel pango-devel zeitgeist-devel dbus-glib-devel
- libnotify-devel libcloudproviders-devel libgit2-glib-devel"
+ libnotify-devel libcloudproviders-devel libgit2-glib-devel libhandy1-devel"
 short_desc="File browser designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/files"
 distfiles="https://github.com/elementary/files/archive/${version}.tar.gz"
-checksum=987f87df2a74c97cb866b34a20ea395ae1f67d03c9517185494860653fbc065c
+checksum=2a328d8df901186bb700c835064c9a526e5694545b668df512282773cfaa7b08
 
 CFLAGS="-fcommon"
 
@@ -28,7 +28,7 @@ libio.elementary.files_package() {
 libio.elementary.files-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.files>=${version} libgee08-devel gtk+3-devel
-	 libcanberra-devel libglib-devel zeitgeist-devel"
+	 libcanberra-devel libglib-devel zeitgeist-devel libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From aebab20e0f2cd0d8a3218c9e7fe974ae083dc15d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:04 +0100
Subject: [PATCH 0451/2561] io.elementary.icons: update to 6.1.0.

---
 srcpkgs/io.elementary.icons/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index fb3a6c06cc84..95dbc0ca3ddb 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -1,6 +1,6 @@
 # Template file for 'io.elementary.icons'
 pkgname=io.elementary.icons
-version=5.3.1
+version=6.1.0
 revision=1
 wrksrc="icons-${version}"
 build_style=meson
@@ -11,8 +11,8 @@ short_desc="Named, vector icons for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/icons"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=67b349453f8990e399521bb8d96f4caf4c23a27cf22cbc18ddacf0e817c59e12
+distfiles="https://github.com/elementary/icons/archive/${version}.tar.gz"
+checksum=bab0f638a60d7a28bf269f4a11346b28495a819e3f516403a7e0bb880c441c2f
 
 post_install() {
 	# How did that get there?

From 13c0b451fb649ec22bcd5bc2fd1df12999964c1e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:07 +0100
Subject: [PATCH 0452/2561] io.elementary.music: update to 5.1.1.

---
 .../io.elementary.music/patches/vala-array-size.patch | 11 -----------
 srcpkgs/io.elementary.music/template                  | 11 ++++++-----
 2 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/io.elementary.music/patches/vala-array-size.patch

diff --git a/srcpkgs/io.elementary.music/patches/vala-array-size.patch b/srcpkgs/io.elementary.music/patches/vala-array-size.patch
deleted file mode 100644
index 2cc268cdae64..000000000000
--- a/srcpkgs/io.elementary.music/patches/vala-array-size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/core/GStrewamer/Equalizer.vala	2020-03-04 23:50:04.000000000 +0100
-+++ b/core/GStreamer/Equalizer.vala	2020-12-14 15:53:22.359597220 +0100
-@@ -31,7 +31,7 @@
-     construct {
-         element = Gst.ElementFactory.make ("equalizer-10bands", "equalizer");
- 
--        int[10] freqs = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000};
-+        int freqs[10] = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000};
- 
-         float last_freq = 0;
-         for (int index = 0; index < 10; index++) {
diff --git a/srcpkgs/io.elementary.music/template b/srcpkgs/io.elementary.music/template
index de6ae0f94d90..3ef8c1568630 100644
--- a/srcpkgs/io.elementary.music/template
+++ b/srcpkgs/io.elementary.music/template
@@ -1,20 +1,21 @@
 # Template file for 'io.elementary.music'
 pkgname=io.elementary.music
-version=5.0.5
+version=5.1.1
 revision=1
 wrksrc="music-${version}"
 build_style=meson
 configure_args="-Dbuild-plugins=true -Dplugins=audioplayer,cdrom,ipod"
-hostmakedepends="vala desktop-file-utils intltool pkg-config AppStream glib-devel"
+hostmakedepends="vala desktop-file-utils gettext pkg-config AppStream glib-devel"
 makedepends="taglib-devel granite-devel vala-devel gtk+3-devel libgee08-devel
  clutter-gtk-devel dbus-glib-devel libgda-devel libgpod-devel libxml2-devel
- json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel"
+ json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel
+ libhandy1-devel"
 short_desc="Music player and library designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/music"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ed7cba3b07189273890b321b21cda198f18b102e4466eb7207c0b5f27b31dfc9
+checksum=35e97ec496327b4eb388308168711bf9f8e976a857eb97bca21805f83abf9d15
 
 libio.elementary.music_package() {
 	short_desc+=" - library"
@@ -26,7 +27,7 @@ libio.elementary.music-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.music>=${version} granite-devel
 	 gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libglib-devel
-	 libpeas-devel"
+	 libpeas-devel libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From 95221a431c05027d3174590198f5d3b9bff71874 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:05 +0100
Subject: [PATCH 0453/2561] io.elementary.photos: update to 2.7.4.

---
 .../patches/fix-meson.patch                   | 95 -------------------
 srcpkgs/io.elementary.photos/template         | 11 +--
 2 files changed, 5 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/io.elementary.photos/patches/fix-meson.patch

diff --git a/srcpkgs/io.elementary.photos/patches/fix-meson.patch b/srcpkgs/io.elementary.photos/patches/fix-meson.patch
deleted file mode 100644
index 820e3b8ef96d..000000000000
--- a/srcpkgs/io.elementary.photos/patches/fix-meson.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 27e529fc96da828982563e2e19a6f0cef883a29e Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 22 Jul 2020 19:35:53 +0200
-Subject: [PATCH] meson: Properly include config.vapi and config.h (#578)
-
----
- meson.build     | 21 +++++++++++++++++++--
- src/meson.build | 13 -------------
- 2 files changed, 19 insertions(+), 15 deletions(-)
-
-diff --git meson.build meson.build
-index 5edb5314..9bebaca0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -11,14 +11,33 @@ add_project_arguments([
-         '-Wno-unused',
-         '-Wl,--enable-new-dtags',
- 
-+        '-include', 'config.h',
-         '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name())
-     ],
-     language: 'c',
- )
-+add_project_arguments([
-+        '--vapidir', join_paths(meson.current_source_dir(), 'vapi'),
-+        '--pkg', 'config',
-+    ],
-+    language: 'vala',
-+)
- 
- libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), meson.project_name())
- pluginsdir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
- 
-+conf_data = configuration_data()
-+conf_data.set_quoted('PROJECT_NAME', meson.project_name())
-+conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-+conf_data.set_quoted('_VERSION', meson.project_version())
-+conf_data.set_quoted('_PREFIX', get_option('prefix'))
-+conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
-+conf_data.set_quoted('_LIBEXECDIR', libexecdir)
-+config_header = configure_file(
-+    output : 'config.h',
-+    configuration : conf_data
-+)
-+
- gnome = import('gnome')
- i18n = import('i18n')
- 
-@@ -52,7 +71,6 @@ gstreamer_plugins_base_vapi = meson.get_compiler('vala').find_library('gstreamer
- gstreamer_plugins_base_dep = declare_dependency(dependencies: [gstreamer_plugins_base_vapi])
- lconv_dep = meson.get_compiler('vala').find_library('LConv', dirs: join_paths(meson.current_source_dir(), 'vapi'))
- linux_dep = meson.get_compiler('vala').find_library('linux')
--config_dep = meson.get_compiler('vala').find_library('config', dirs: join_paths(meson.current_source_dir(), 'vapi'))
- 
- vapi_include = include_directories('./vapi')
- 
-@@ -82,7 +100,6 @@ dependencies = [
-     webkit2gtk_dep,
-     lconv_dep,
-     linux_dep,
--    config_dep
- ]
- 
- add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi')], language: 'vala')
-diff --git src/meson.build src/meson.build
-index 45bf4c1b..1215d778 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -4,18 +4,6 @@ library_files = files(
-     'plugins/TransitionsInterfaces.vala'
- )
- 
--conf_data = configuration_data()
--conf_data.set_quoted('PROJECT_NAME', meson.project_name())
--conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
--conf_data.set_quoted('_VERSION', meson.project_version())
--conf_data.set_quoted('_PREFIX', get_option('prefix'))
--conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
--conf_data.set_quoted('_LIBEXECDIR', libexecdir)
--config_header = configure_file(
--    output : 'config.h',
--    configuration : conf_data
--)
--
- photos_files = files(
-     'AppDirs.vala',
-     'Application.vala',
-@@ -233,7 +221,6 @@ photos_exe = executable(
-     meson.project_name(),
-     photos_files,
-     library_files,
--    config_header,
-     icons_gresource,
-     global_gresource,
-     dependencies: dependencies,
diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 81c1734164ba..d0f69169be3b 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,22 +1,21 @@
 # Template file for 'io.elementary.photos'
 pkgname=io.elementary.photos
-version=2.7.0
-revision=2
+version=2.7.4
+revision=1
 wrksrc="photos-${version}"
 build_style=meson
-configure_args="-Dlibunity=false"
-hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream
+hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
  glib-devel python3-scour"
 makedepends="libaccounts-glib-devel libexif-devel libgee08-devel
  geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel
  gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel
  json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel
  webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel
- vte3-devel"
+ vte3-devel libhandy1-devel"
 depends="desktop-file-utils gsettings-desktop-schemas"
 short_desc="Photo viewer and organizer designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/elementary/photos"
 distfiles="https://github.com/elementary/photos/archive/${version}.tar.gz"
-checksum=9f6ad409d053e3239b9ec7fc59429afe9ce89e40878697a73c2c3f215556a074
+checksum=3227f498e483b150f0a1407f4cf244d69f1c7453fc9bcba164fe3ab944283315

From 82b610c4b9916acb0a243d27130fbfd4219bbbfe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:05 +0100
Subject: [PATCH 0454/2561] io.elementary.stylesheet: update to 6.1.1.

---
 srcpkgs/io.elementary.stylesheet/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template
index 791bca04709c..618ac82dda0c 100644
--- a/srcpkgs/io.elementary.stylesheet/template
+++ b/srcpkgs/io.elementary.stylesheet/template
@@ -1,12 +1,13 @@
 # Template file for 'io.elementary.stylesheet'
 pkgname=io.elementary.stylesheet
-version=5.4.2
-revision=2
+version=6.1.1
+revision=1
 wrksrc="stylesheet-${version}"
 build_style=meson
+hostmakedepends="sassc gettext"
 short_desc="GTK Stylesheet for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/stylesheet"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec
+checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e

From 4986d24af0aea6b33ef798bea09ca3552a580db8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:08 +0100
Subject: [PATCH 0455/2561] io.elementary.terminal: update to 6.0.1.

---
 srcpkgs/io.elementary.terminal/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/io.elementary.terminal/template b/srcpkgs/io.elementary.terminal/template
index 2aba6a5b563f..f3e0972cdfe3 100644
--- a/srcpkgs/io.elementary.terminal/template
+++ b/srcpkgs/io.elementary.terminal/template
@@ -1,19 +1,19 @@
 # Template file for 'io.elementary.terminal'
 pkgname=io.elementary.terminal
-version=5.5.2
+version=6.0.1
 revision=1
 wrksrc="terminal-${version}"
 build_style=meson
 configure_args="-Dubuntu-bionic-patched-vte=false"
-hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream glib-devel"
-makedepends="granite-devel libnotify-devel vte3-devel"
+hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel"
+makedepends="granite-devel libnotify-devel vte3-devel libhandy1-devel"
 depends="desktop-file-utils gsettings-desktop-schemas"
 short_desc="Terminal from elementary OS for the 21st century"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-3.0-only"
 homepage="https://github.com/elementary/terminal"
 distfiles="https://github.com/elementary/terminal/archive/${version}.tar.gz"
-checksum=589ad0225e3a45700d95c8ead1b646f22a22c7688f647876a5329b3b4bd923cd
+checksum=de741ad5deadb927243a7007be0f5d3bb4070f780362d59ded600692064b0eca
 
 pantheon-terminal_package() {
 	depends="io.elementary.terminal>=${version}_${revision}"

From 446b36bb6e50913723a1e3ac15fc915abead6e5d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:06 +0100
Subject: [PATCH 0456/2561] io.elementary.videos: update to 2.8.3.

---
 srcpkgs/io.elementary.videos/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template
index c989ccaf6954..eaca37a83723 100644
--- a/srcpkgs/io.elementary.videos/template
+++ b/srcpkgs/io.elementary.videos/template
@@ -1,15 +1,15 @@
 # Template file for 'io.elementary.videos'
 pkgname=io.elementary.videos
-version=2.7.2
+version=2.8.3
 revision=1
 wrksrc="videos-${version}"
 build_style=meson
-hostmakedepends="intltool pkg-config vala AppStream"
+hostmakedepends="gettext pkg-config vala AppStream"
 makedepends="granite-devel clutter-gst3-devel clutter-gtk-devel
- gstreamer1-devel gst-plugins-base1-devel"
+ gstreamer1-devel gst-plugins-base1-devel libhandy1-devel"
 short_desc="Video player and library app designed for elementary OS"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/videos"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a
+checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6

From fcd7f08c01bad8fad5c52a3b4ba1ecb5edc327e9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:49:31 +0100
Subject: [PATCH 0457/2561] giti: remove package

* doesn't build with recent vala
---
 srcpkgs/giti/template             | 13 -------------
 srcpkgs/removed-packages/template |  3 ++-
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/giti/template

diff --git a/srcpkgs/giti/template b/srcpkgs/giti/template
deleted file mode 100644
index e3c8663fa536..000000000000
--- a/srcpkgs/giti/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'giti'
-pkgname=giti
-version=1.0.0
-revision=1
-build_style=meson
-hostmakedepends="pkg-config vala gettext"
-makedepends="gtk+3-devel libgit2-glib-devel libgee08-devel granite-devel"
-short_desc="Permanent observer of your git directories"
-maintainer="linarcx <linarcx@riseup.net>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/LinArcX/giti"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=8054581f9eddf226a3e16e404ef062ebaba0ea1223255d8b0c3eeac301cf6872
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5003333859c9..df264c9d7501 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=66
+revision=67
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -81,6 +81,7 @@ replaces="
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
  gespeaker<=0.8.6_3
+ giti<=1.0.0_1
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9

From 3f9de2ef837a6519371cb81492b8fe1f6afc99ec Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 12:22:51 +0100
Subject: [PATCH 0458/2561] colord-gtk: update to 0.3.0.

---
 common/shlibs               |  1 +
 srcpkgs/colord-gtk/template | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ffcc843af85c..7d323593a120 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1133,6 +1133,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1
 libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libcolord-gtk4.so.1 colord-gtk-0.3.0_1
 libgdm.so.1 libgdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1
diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 634a9322dae3..843320e63089 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,26 +1,27 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 build_helper=gir
-configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
- -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)"
-hostmakedepends="pkg-config intltool glib-devel libxslt
+configure_args="-Dtests=false $(vopt_bool vala vapi) $(vopt_bool docs docs)
+ $(vopt_bool man man)"
+hostmakedepends="pkg-config gettext glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
  $(vopt_if man docbook-xsl-ns)"
-makedepends="colord-devel gtk+3-devel"
+makedepends="colord-devel gtk+3-devel gtk4-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/colord-gtk"
+changelog="https://raw.githubusercontent.com/hughsie/colord-gtk/main/NEWS"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
-checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
+checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0
 
 build_options="vala docs man"
-build_options_default="vala"
-desc_option_docs="Generate documents"
-desc_option_man="Generate manpage"
+build_options_default="vala man docs"
+desc_option_docs="Generate documentation"
+desc_option_man="Generate man pages"
 
 colord-gtk-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -33,5 +34,8 @@ colord-gtk-devel_package() {
 		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
+		if [ "$build_option_docs" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 4334f5580b8197c93d5f764c2817938159c8f7e7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 16:47:44 +0100
Subject: [PATCH 0459/2561] timg: update to 1.4.4.

---
 srcpkgs/timg/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template
index 7774d007cf01..91f1516b2597 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -1,6 +1,6 @@
 # Template file for 'timg'
 pkgname=timg
-version=1.4.2
+version=1.4.4
 revision=1
 build_style=cmake
 configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev"
@@ -10,5 +10,5 @@ short_desc="24-bit color image & video viewer for terminal"
 maintainer="33KK <g33kk@pm.me>"
 license="GPL-2.0-only"
 homepage="https://github.com/hzeller/timg"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7607efaffbed0b65b3c824956de421b155a4f14243e7a752b19454f88bf9d563
+distfiles="https://github.com/hzeller/timg/archive/v${version}.tar.gz"
+checksum=66d2e00b50068fd6638bb8be1859c50ca4f24caef751f9dc95b303f37fb07b1e

From 2163993c17d922cf6ee80ccd1769bc63d2337982 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 26 Mar 2022 08:51:52 +0100
Subject: [PATCH 0460/2561] wine: update to 7.5.

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  | 8 ++++----
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index b13cbe9ea48c..45cb7cbd5106 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index 82f45cc1d171..4ed5e2642d9f 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.4/configure
-+++ b/wine-7.4/configure
+--- a/wine-7.5/configure
++++ b/wine-7.5/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
---- a/wine-7.4/configure.ac
-+++ b/wine-7.4/configure.ac
+--- a/wine-7.5/configure.ac
++++ b/wine-7.5/configure.ac
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 2fe1c18c553b..a358997c3963 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.4/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.4/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/wine-7.5/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/wine-7.5/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 8dfb8df9f6be..e9598ba932a0 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.4
+version=7.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="728e866d6e49ce92a2a0c514333e9ff08bdbf6c86f5ef4e6180143b8d2b7d416
- c1688af87737f47337a8f7e24d501d99582a691a2a08ba8e71b9911abbfd8554"
+checksum="462c3185aedeec851067a5165d648f5499fb93c1b655f46b825f4bc11914e281
+ 3b3a10654c90b210ab8dbf9d0aa2d2e3f4179a73e56e7c2101008e77903afead"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 86ce9d15cebc3ed0b1ae380da6221c236da1c66d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 00:52:47 +0100
Subject: [PATCH 0461/2561] apostrophe: update to 2.6.1.

---
 srcpkgs/apostrophe/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 127919d611a3..d130b8694cd4 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,7 +1,7 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.5
-revision=2
+version=2.6.1
+revision=1
 wrksrc="$pkgname-v$version"
 build_style=meson
 build_helper=gir
@@ -14,4 +14,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/World/apostrophe"
 distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz"
-checksum=366b239ea7bb720c11fc7344827b6739e4983132c9932aa4705a3b88533d75e4
+checksum=f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c

From 739594745a9f585dbd932514a2a44d0ff8b99427 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Mar 2022 13:09:45 +1100
Subject: [PATCH 0462/2561] openvpn: update to 2.5.6.

---
 srcpkgs/openvpn/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 04bead136a49..bb874a247ab1 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openvpn'
 pkgname=openvpn
-version=2.5.5
+version=2.5.6
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
@@ -12,8 +12,9 @@ short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.openvpn.net"
+changelog="https://raw.githubusercontent.com/OpenVPN/openvpn/release/${version%.*}/Changes.rst"
 distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz"
-checksum=119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b
+checksum=13c7c3dc399d1b571cabf189c4d34ae34656ee72b6bde2a8059c1e9bc61574ed
 
 build_options="mbedtls pkcs11"
 build_options_default="pkcs11"

From 8d443d241169b734449a5ee1d648a2a88d3b7332 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:02 +0100
Subject: [PATCH 0463/2561] meson: update to 0.61.4.

---
 srcpkgs/meson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 67fa3514289f..2f9ccaaa4691 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.60.3
+version=0.61.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e
+checksum=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 586a6bd46df155aa2b063c98b3530335b7039b7e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 0464/2561] Marker: fix for meson 0.61

---
 srcpkgs/Marker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Marker/template b/srcpkgs/Marker/template
index be02723dc4ed..eed5bddc36c3 100644
--- a/srcpkgs/Marker/template
+++ b/srcpkgs/Marker/template
@@ -4,7 +4,7 @@ version=2020.04.04
 revision=1
 wrksrc=marker
 build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config itstool gettext"
 makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel
  webkit2gtk-devel"
 depends="iso-codes"

From 1044bb37a76b9eede8a0437460ee9f81ffe75e4c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 0465/2561] accountsservice: fix for meson 0.61

---
 .../accountsservice/patches/meson-0.61.patch  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch

diff --git a/srcpkgs/accountsservice/patches/meson-0.61.patch b/srcpkgs/accountsservice/patches/meson-0.61.patch
new file mode 100644
index 000000000000..9245afdd47d2
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/meson-0.61.patch
@@ -0,0 +1,29 @@
+From ac9b14f1c1bbca413987d0bbfeaad05804107e9a Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Sun, 31 Oct 2021 12:29:14 +0000
+Subject: Fix build with meson 0.60
+
+Positional parameters to merge_file() were never allowed and always
+ignored, so just drop it.
+See: https://github.com/mesonbuild/meson/issues/9441
+
+Fixes #97
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 70edf89..9e80299 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -33,7 +33,6 @@ configure_file(
+ policy = act_namespace.to_lower() + '.policy'
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy + '.in',
+   output: policy,
+   po_dir: po_dir,
+-- 
+cgit v1.2.1
+

From bb017bdaf955a1f4febc22334276537487affe01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0466/2561] bijiben: fix for meson 0.61

---
 srcpkgs/bijiben/patches/meson-0.61.patch | 46 ++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 srcpkgs/bijiben/patches/meson-0.61.patch

diff --git a/srcpkgs/bijiben/patches/meson-0.61.patch b/srcpkgs/bijiben/patches/meson-0.61.patch
new file mode 100644
index 000000000000..7576536953a1
--- /dev/null
+++ b/srcpkgs/bijiben/patches/meson-0.61.patch
@@ -0,0 +1,46 @@
+From 01ccae2ccb640b2d33fd09c3dfb7d605830b5b0f Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 22 Jan 2022 23:16:37 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build         | 2 --
+ 2 files changed, 3 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 48a31e3..d78d052 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ info = 'org.gnome.Notes.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
+diff --git a/data/meson.build b/data/meson.build
+index d00d98f..556d564 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ subdir('appdata')
+ mime = 'org.gnome.Notes.xml'
+ 
+ i18n.merge_file(
+-  mime,
+   input: mime + '.in',
+   output: mime,
+   po_dir: po_dir,
+@@ -18,7 +17,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set ('icon', application_id)
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: files (desktop + '.in'),
+-- 
+2.34.1
+

From bc6d8263ead14f84e80ba04799b32d770a80f9a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0467/2561] cinnamon: fix for meson 0.61

---
 srcpkgs/cinnamon/patches/meson-0.61.patch | 53 +++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 srcpkgs/cinnamon/patches/meson-0.61.patch

diff --git a/srcpkgs/cinnamon/patches/meson-0.61.patch b/srcpkgs/cinnamon/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f0937a355f92
--- /dev/null
+++ b/srcpkgs/cinnamon/patches/meson-0.61.patch
@@ -0,0 +1,53 @@
+From 37de1aaae1edd1fbcd3c2ef2ac5f4baa4c8e2751 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 18:14:35 -0500
+Subject: [PATCH] Revert "build: disable gir install via list to pacify meson
+ >= 0.60.2 (#10489)"
+
+This reverts commit 8fc2df08b40aa3e1958ed2fde853c50676d8cf48.
+
+This commit was wrong, because it tried to work around a bug in a single
+version of meson by using something that isn't, wasn't, and won't be a
+valid value.
+
+The fixed version of meson 0.60.x has been out for a while now, which
+once again accepts `false`, and 0.61.0 also accepts `false` but was
+known at the time of this workaround to not work in meson-git master
+(now meson 0.61.0).
+
+Using `false` is acceptable and the failure to accept it has been
+qualified as a meson regression. Using `[false]` is just... trying to
+fuzz meson with random objects until you get something that slips its
+way through the argument checker and produces desired effects on the
+python implementation level.
+---
+ src/meson.build    | 2 +-
+ src/st/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 7999c0a67b..34b130d50f 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -196,7 +196,7 @@ cinnamon_gir = gnome.generate_gir(
+     includes: cinnamon_gir_includes,
+     install: true,
+     install_dir_typelib: pkglibdir,
+-    install_dir_gir: [false],
++    install_dir_gir: false,
+     extra_args: [
+         '-DST_COMPILATION',
+         '--quiet',
+diff --git a/src/st/meson.build b/src/st/meson.build
+index d299727d06..ec7d7b30a1 100644
+--- a/src/st/meson.build
++++ b/src/st/meson.build
+@@ -213,7 +213,7 @@ st_gir = gnome.generate_gir(
+     includes: st_gir_includes,
+     install: true,
+     install_dir_typelib: pkglibdir,
+-    install_dir_gir: [false],
++    install_dir_gir: false,
+     extra_args: [
+         '-DST_COMPILATION',
+         '--quiet',

From 2a33d26399b52aad1f9ca697736856e76a1a7802 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0468/2561] d-feet: fix for meson 0.61

---
 srcpkgs/d-feet/patches/meson-0.61.patch | 33 +++++++++++++++++++++++++
 srcpkgs/d-feet/x                        |  1 -
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/d-feet/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/d-feet/x

diff --git a/srcpkgs/d-feet/patches/meson-0.61.patch b/srcpkgs/d-feet/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f8e7f64a60c0
--- /dev/null
+++ b/srcpkgs/d-feet/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From b5a99f86395fd71dc08907ac3c5f2d757384c49f Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 23 Jan 2022 12:35:26 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 026bd80..3b03b94 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+@@ -25,7 +24,6 @@ i18n.merge_file(
+ appdata = df_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+2.34.1
+
diff --git a/srcpkgs/d-feet/x b/srcpkgs/d-feet/x
deleted file mode 100644
index 166f7a957085..000000000000
--- a/srcpkgs/d-feet/x
+++ /dev/null
@@ -1 +0,0 @@
-xbps-query: option requires an argument -- 's'

From 494d933e35b41e18ec8757fac4248f49fba0582b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0469/2561] dconf-editor: fix for meson 0.61

---
 srcpkgs/dconf-editor/patches/meson-0.61.patch | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/dconf-editor/patches/meson-0.61.patch

diff --git a/srcpkgs/dconf-editor/patches/meson-0.61.patch b/srcpkgs/dconf-editor/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b6f06606e882
--- /dev/null
+++ b/srcpkgs/dconf-editor/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:22:58 +0100
+Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ editor/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/editor/meson.build b/editor/meson.build
+index 4c89ab99..0eb3bb1a 100644
+--- a/editor/meson.build
++++ b/editor/meson.build
+@@ -1,7 +1,6 @@
+ desktop = dconf_editor_namespace + '.desktop'
+ 
+ i18n.merge_file (
+-  desktop,
+   type: 'desktop',
+   input: desktop + '.in',
+   output: desktop,
+@@ -26,7 +25,6 @@ configure_file(
+ appdata = dconf_editor_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 75f7589f0eed70366bd517517117c596ac664866 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0470/2561] devhelp: fix for meson 0.61

---
 srcpkgs/devhelp/patches/meson-0.61.patch | 48 ++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch

diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
new file mode 100644
index 000000000000..dfea339688e3
--- /dev/null
+++ b/srcpkgs/devhelp/patches/meson-0.61.patch
@@ -0,0 +1,48 @@
+From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:02:20 +0800
+Subject: [PATCH] Remove incorrect arg for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments and
+explicitly rejects with error "ERROR: Function does not take
+positional arguments" since meson 0.60.0
+---
+ data/meson.build                 | 2 --
+ plugins/gedit-plugin/meson.build | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c6aeffb4..0bc531a2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', APPLICATION_ID)
+ appdata = APPLICATION_ID + '.appdata.xml'
+ appdata_file = I18N.merge_file(
+-  appdata,
+   input: configure_file(
+     input: 'org.gnome.Devhelp.appdata.xml.in.in',
+     output: APPLICATION_ID + '.appdata.xml.in',
+@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('application_id', APPLICATION_ID)
+ desktop = APPLICATION_ID + '.desktop'
+ desktop_file = I18N.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Devhelp.desktop.in.in',
+diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
+index 4f779886..877a01ff 100644
+--- a/plugins/gedit-plugin/meson.build
++++ b/plugins/gedit-plugin/meson.build
+@@ -7,7 +7,6 @@ install_data(
+ 
+ plugin_info_file = 'devhelp.plugin'
+ I18N.merge_file(
+-  plugin_info_file,
+   type: 'desktop',
+   input: plugin_info_file + '.desktop.in',
+   output: plugin_info_file,
+-- 
+GitLab
+

From 2e10c4109bf2d74f06a73b065c52af9b57214d4a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0471/2561] epiphany: fix for meson 0.61

---
 srcpkgs/epiphany/patches/meson-0.61.patch | 33 +++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/epiphany/patches/meson-0.61.patch

diff --git a/srcpkgs/epiphany/patches/meson-0.61.patch b/srcpkgs/epiphany/patches/meson-0.61.patch
new file mode 100644
index 000000000000..1584627ca2d9
--- /dev/null
+++ b/srcpkgs/epiphany/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Wed, 24 Nov 2021 04:52:42 +0000
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 46df3fd80..eac6b8224 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -16,7 +16,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop = i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+     input: files('org.gnome.Epiphany.desktop.in.in'),
+     output: 'org.gnome.Epiphany.desktop.in',
+@@ -32,7 +31,6 @@ desktop = i18n.merge_file(
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: files('org.gnome.Epiphany.appdata.xml.in.in'),
+     output: 'org.gnome.Epiphany.appdata.xml.in',
+-- 
+GitLab
+

From 3999695c97f3b540a499d35fe2e3b988ce159fa6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0472/2561] evince: fix for meson 0.61

---
 srcpkgs/evince/patches/meson-0.61.patch | 52 +++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 srcpkgs/evince/patches/meson-0.61.patch

diff --git a/srcpkgs/evince/patches/meson-0.61.patch b/srcpkgs/evince/patches/meson-0.61.patch
new file mode 100644
index 000000000000..baed9dc1af8f
--- /dev/null
+++ b/srcpkgs/evince/patches/meson-0.61.patch
@@ -0,0 +1,52 @@
+From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:22:45 +0800
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for
+a time and explicitly rejects with error since meson 0.60.0
+---
+ backend/meson.build | 1 -
+ data/meson.build    | 1 -
+ meson.build         | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/backend/meson.build b/backend/meson.build
+index e44c1d6d7..ab3df9acf 100644
+--- a/backend/meson.build
++++ b/backend/meson.build
+@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends
+   )
+ 
+   i18n.merge_file(
+-    appstream,
+     input: appstream_in,
+     output: appstream,
+     po_dir: po_dir,
+diff --git a/data/meson.build b/data/meson.build
+index 8a308b853..afc302098 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -15,7 +15,6 @@ foreach desktop: desktops
+   )
+ 
+   i18n.merge_file(
+-    desktop,
+     type: 'desktop',
+     input: desktop_in,
+     output: desktop,
+diff --git a/meson.build b/meson.build
+index 34c86661f..f74efb3c4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -492,7 +492,6 @@ install_headers(
+ appdata = ev_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 86af67026738ecc716c4652e4654ccdaf89b0c48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0473/2561] fprintd: fix for meson 0.61

---
 srcpkgs/fprintd/patches/meson-0.61.patch | 146 +++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 srcpkgs/fprintd/patches/meson-0.61.patch

diff --git a/srcpkgs/fprintd/patches/meson-0.61.patch b/srcpkgs/fprintd/patches/meson-0.61.patch
new file mode 100644
index 000000000000..836c7e036054
--- /dev/null
+++ b/srcpkgs/fprintd/patches/meson-0.61.patch
@@ -0,0 +1,146 @@
+From 50943b1bd4f18d103c35233f0446ce7a31d1817e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 27 Oct 2021 15:44:31 +0200
+Subject: [PATCH] build: Do not use positional arguments in i18n.merge_file
+
+This was never really used and it's breaking meson 60.
+While this may just become a warning in 60.1, it's just better to avoid
+using it.
+
+See: https://github.com/mesonbuild/meson/issues/9441
+---
+ data/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 92bfa2e..ece5fc6 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -24,7 +24,7 @@ if get_option('systemd')
+ endif
+ 
+ polkit_policy = 'net.reactivated.fprint.device.policy'
+-polkit_policy_target = i18n.merge_file(polkit_policy,
++polkit_policy_target = i18n.merge_file(
+     input: '@0@.in'.format(polkit_policy),
+     output: polkit_policy,
+     po_dir: meson.source_root() / 'po',
+-- 
+GitLab
+
+From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 21:06:35 -0500
+Subject: [PATCH] use more idiomatic/correct embedded shell scripting
+
+Formatting arguments into code is fragile, and meson natively knows how
+to pass files as arguments via argv. So pass them as arguments to the
+shell.
+---
+ doc/dbus/meson.build | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build
+index 802938e..861da64 100644
+--- a/doc/dbus/meson.build
++++ b/doc/dbus/meson.build
+@@ -19,11 +19,10 @@ foreach interface_file: dbus_interfaces_files
+         capture: true,
+         command: [
+             bash, '-c',
+-            'cat @INPUT@;' +
+-            xsltproc.path() + ' @0@/@1@ '.format(
+-                meson.source_root(),
+-                files('spec-to-docbook.xsl')[0]) +
+-            interface_file.full_path() + '| tail -n +2;',
++            'cat "$1"; "$2" "$3" "$4" | tail -n +2',
++            '_', # argv0 ignored
++            '@INPUT@',
++            xsltproc, files('spec-to-docbook.xsl')[0], interface_file
+         ],
+     )
+ endforeach
+-- 
+GitLab
+
+From 2c34cef5ef2004d8479475db5523c572eb409a6b Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 20:46:29 -0500
+Subject: [PATCH] remove pointless copying of files into build directory
+
+I'm not entirely sure what this did, but it seems to be obsoleted by
+commit 93bad825406d13ed5eb2cf27541dc58194bef8f3.
+---
+ doc/dbus/meson.build                          |  6 +++---
+ src/meson.build                               | 20 ++++++-------------
+ ....xml => net.reactivated.Fprint.Device.xml} |  0
+ ...xml => net.reactivated.Fprint.Manager.xml} |  0
+ 4 files changed, 9 insertions(+), 17 deletions(-)
+ rename src/{device.xml => net.reactivated.Fprint.Device.xml} (100%)
+ rename src/{manager.xml => net.reactivated.Fprint.Manager.xml} (100%)
+
+diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build
+index 861da64..431127d 100644
+--- a/doc/dbus/meson.build
++++ b/doc/dbus/meson.build
+@@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header',
+ )
+ 
+ dbus_interfaces_refs = []
+-foreach interface_file: dbus_interfaces_files
+-    basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip()
++foreach interface_file: dbus_interfaces
++    basename = run_command('basename', interface_file, '.xml').stdout().strip()
+     dbus_interfaces_refs += custom_target(basename + '_ref',
+         input: docbook_xml_header,
+         output: basename + '.ref.xml',
+         build_by_default: true,
+-        depends: interface_file,
++        depend_files: interface_file,
+         capture: true,
+         command: [
+             bash, '-c',
+diff --git a/src/meson.build b/src/meson.build
+index 1df6216..a7ce3fe 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,22 +1,14 @@
+ bash = find_program('bash')
+-dbus_interfaces = ['Manager', 'Device']
+-dbus_interfaces_files = []
++dbus_interfaces = files(
++    'net.reactivated.Fprint.Manager.xml',
++    'net.reactivated.Fprint.Device.xml',
++)
+ 
+-foreach interface_name: dbus_interfaces
+-    interface = interface_name.to_lower()
+-    interface_file = interface + '.xml'
+-    dbus_interfaces_files += custom_target('dbus_interface_' + interface,
+-        input: interface_file,
+-        output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name),
+-        command: ['cp', '@INPUT@', '@OUTPUT@'],
+-        install: true,
+-        install_dir: dbus_interfaces_dir,
+-    )
+-endforeach
++install_data(dbus_interfaces, install_dir: dbus_interfaces_dir)
+ 
+ # NOTE: We should pass "--glib-min-required 2.64" but cannot
+ fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus',
+-    sources: dbus_interfaces_files,
++    sources: dbus_interfaces,
+     autocleanup: 'all',
+     interface_prefix: 'net.reactivated.Fprint.',
+     namespace: 'FprintDBus',
+diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml
+similarity index 100%
+rename from src/device.xml
+rename to src/net.reactivated.Fprint.Device.xml
+diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml
+similarity index 100%
+rename from src/manager.xml
+rename to src/net.reactivated.Fprint.Manager.xml
+-- 
+GitLab
+

From 81fc22f28080c5082c640292918162f2e28e2f59 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0474/2561] fractal: fix for meson 0.61

---
 srcpkgs/fractal/patches/meson-0.61.patch | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/fractal/patches/meson-0.61.patch

diff --git a/srcpkgs/fractal/patches/meson-0.61.patch b/srcpkgs/fractal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..79197803abf5
--- /dev/null
+++ b/srcpkgs/fractal/patches/meson-0.61.patch
@@ -0,0 +1,35 @@
+From 6fa1a23596d65d94aa889efe725174e6cd2903f0 Mon Sep 17 00:00:00 2001
+From: Jonas Platte <jplatte+git@posteo.de>
+Date: Sun, 31 Oct 2021 15:23:31 +0100
+Subject: [PATCH] Remove deprecated positional argument to i18n.merge_file
+
+See https://github.com/mesonbuild/meson/issues/9441
+---
+ fractal-gtk/res/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fractal-gtk/res/meson.build b/fractal-gtk/res/meson.build
+index 7a7a7d65..a176787c 100644
+--- a/fractal-gtk/res/meson.build
++++ b/fractal-gtk/res/meson.build
+@@ -2,7 +2,7 @@ subdir('icons')
+ 
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Fractal.desktop.in.in'),
+@@ -28,7 +28,7 @@ endif
+ 
+ metainfo_conf = configuration_data()
+ metainfo_conf.set('appid', application_id)
+-metainfo_file = i18n.merge_file ('metainfo-file',
++metainfo_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Fractal.metainfo.xml.in.in'),
+     output: 'org.gnome.Fractal.metainfo.xml.in',
+-- 
+GitLab
+

From 99022a5136f200215a8f1f2869604758c7c9fc48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0475/2561] gcr: fix for meson 0.61

---
 srcpkgs/gcr/patches/meson-0.61.patch | 59 ++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 srcpkgs/gcr/patches/meson-0.61.patch

diff --git a/srcpkgs/gcr/patches/meson-0.61.patch b/srcpkgs/gcr/patches/meson-0.61.patch
new file mode 100644
index 000000000000..21c1c3610226
--- /dev/null
+++ b/srcpkgs/gcr/patches/meson-0.61.patch
@@ -0,0 +1,59 @@
+From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 12 Jan 2022 00:24:20 +0100
+Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
+
+This argument has been removed in Meson 0.61.0:
+
+    gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
+
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
+
+> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
+
+Fixes #89
+---
+ gck/meson.build | 1 -
+ gcr/meson.build | 1 -
+ ui/meson.build  | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/gck/meson.build b/gck/meson.build
+index 756b486..a21a1e9 100644
+--- a/gck/meson.build
++++ b/gck/meson.build
+@@ -131,7 +131,6 @@ if get_option('introspection')
+     sources: gck_gir_sources,
+     namespace: 'Gck',
+     nsversion: '@0@'.format(gck_major_version),
+-    packages: gck_deps,
+     export_packages: 'gck-@0@'.format(gck_major_version),
+     includes: [ 'GObject-2.0', 'Gio-2.0' ],
+     header: 'gck/gck.h',
+diff --git a/gcr/meson.build b/gcr/meson.build
+index 2233a44..c83641b 100644
+--- a/gcr/meson.build
++++ b/gcr/meson.build
+@@ -190,7 +190,6 @@ if get_option('introspection')
+     sources: [ gcr_base_public_sources, gcr_base_headers ],
+     namespace: 'Gcr',
+     nsversion: '@0@'.format(gcr_major_version),
+-    packages: gcr_base_deps,
+     export_packages: 'gcr-base-@0@'.format(gcr_major_version),
+     includes: [
+       'GObject-2.0',
+diff --git a/ui/meson.build b/ui/meson.build
+index e656ea2..32ee057 100644
+--- a/ui/meson.build
++++ b/ui/meson.build
+@@ -152,7 +152,6 @@ if get_option('introspection')
+     export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+     identifier_prefix: 'Gcr',
+     symbol_prefix: 'gcr',
+-    packages: gcr_ui_deps,
+     includes: [
+       'GObject-2.0',
+       'Gio-2.0',
+-- 
+GitLab
+

From 486164b8c5d3915bf2f25ee99742a435fefd380e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0476/2561] gitg: fix for meson 0.61

---
 srcpkgs/gitg/patches/meson-0.61.patch | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/gitg/patches/meson-0.61.patch

diff --git a/srcpkgs/gitg/patches/meson-0.61.patch b/srcpkgs/gitg/patches/meson-0.61.patch
new file mode 100644
index 000000000000..330d45fc5ad8
--- /dev/null
+++ b/srcpkgs/gitg/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From c81e1579afe7f221371b6866c25f388f48747728 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 23 Jan 2022 14:54:31 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index a8b90fd1..2413531d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -6,7 +6,6 @@ desktop_config = configuration_data()
+ desktop_config.set('icon', application_id)
+ desktop_config.set('binary', gitg_name)
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: desktop + '.in.in',
+@@ -42,7 +41,6 @@ appdata_config = configuration_data()
+ appdata_config.set('app-id', application_id)
+ appdata_config.set('gettext', gitg_name)
+ i18n.merge_file(
+-  appdata,
+   type: 'xml',
+   input: configure_file(
+     input: appdata + '.in.in',
+-- 
+2.34.1
+

From 5a2af4372b797e9d897a9232792bddc1b907ab84 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:20:40 +0100
Subject: [PATCH 0477/2561] glade3: fix for meson 0.61

---
 srcpkgs/glade3/patches/meson-0.61.patch | 57 +++++++++++++++++++++++++
 srcpkgs/glade3/template                 |  2 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/glade3/patches/meson-0.61.patch

diff --git a/srcpkgs/glade3/patches/meson-0.61.patch b/srcpkgs/glade3/patches/meson-0.61.patch
new file mode 100644
index 000000000000..72f9c0e509ba
--- /dev/null
+++ b/srcpkgs/glade3/patches/meson-0.61.patch
@@ -0,0 +1,57 @@
+From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:18:09 -0500
+Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
+ argument
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 9f244566..bfbc514c 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', glade_version)
+ 
+ i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Glade.desktop.in.in',
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ appdata = glade_name + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Glade.appdata.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+GitLab
+
+
+From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:19:03 -0500
+Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index fc3cd4c3..d67e42c8 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -1,6 +1,5 @@
+ # please keep this list sorted alphabetically
+ #
+-da
+ bg
+ ca
+ cs
+-- 
+GitLab
+
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 763632c1e712..a0235c1faef9 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -4,7 +4,7 @@ version=3.38.2
 revision=1
 wrksrc="glade-${version}"
 build_style=meson
-build_helper="gir"
+build_helper="gir qemu"
 configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection)"
 hostmakedepends="glib-devel intltool itstool pkg-config
  gjs-devel yelp-tools gettext-devel gtk-doc"

From e1747edc5f73f3f81c658e7bed4cf0d360f2ebfa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:19:02 +0100
Subject: [PATCH 0478/2561] gnome-2048: fix for meson 0.61

---
 srcpkgs/gnome-2048/patches/meson-0.61.patch | 36 +++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnome-2048/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-2048/patches/meson-0.61.patch b/srcpkgs/gnome-2048/patches/meson-0.61.patch
new file mode 100644
index 000000000000..912759654d73
--- /dev/null
+++ b/srcpkgs/gnome-2048/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sun, 23 Jan 2022 10:49:07 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:19:0: ERROR: Function does not take positional arguments.
+data/meson.build:39:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 33f73ca..8974a63 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,7 +17,6 @@ install_data(
+ 
+ # Desktop file
+ desktop_file = i18n.merge_file(
+-  'desktop-file',
+   input: 'org.gnome.TwentyFortyEight.desktop.in',
+   output: 'org.gnome.TwentyFortyEight.desktop',
+   install: true,
+@@ -37,7 +36,6 @@ endif
+ 
+ # AppData file
+ appdata_file = i18n.merge_file(
+-  'appdata-file',
+   input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
+   output: 'org.gnome.TwentyFortyEight.appdata.xml',
+   install: true,
+-- 
+GitLab
+

From 145b48fd7e5b6399a681f73f3075b6afaecb6c74 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:37:12 +0100
Subject: [PATCH 0479/2561] gnome-authenticator: fix for meson 0.61

---
 .../patches/meson-0.61.patch                   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..eade2e1241b5
--- /dev/null
+++ b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -63,7 +63,6 @@ configure_file(
+ desktop_conf = configuration_data()
+ desktop_conf.set('APP_ID', application_id)
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+     input: meson.project_name() + '.desktop.in.in',
+     output: '@BASENAME@',
+@@ -90,7 +89,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('APP_ID', application_id)
+ appdata_conf.set('GETTEXT_PACKAGE', gettext_package)
+ appdata_file = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: meson.project_name() + '.appdata.xml.in.in',
+     output: '@BASENAME@',

From 338732390abb5895cc722923200ce38bbe27e907 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 16:44:19 +0100
Subject: [PATCH 0480/2561] gnome-bluetooth: fix for meson 0.61

---
 .../gnome-bluetooth/patches/meson-0.61.patch  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c6962edd4f05
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
@@ -0,0 +1,25 @@
+From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jan 2022 12:51:22 +0100
+Subject: [PATCH] build: Fix build for newer versions of meson
+
+sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
+---
+ sendto/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sendto/meson.build b/sendto/meson.build
+index 24a4e394..3e233a03 100644
+--- a/sendto/meson.build
++++ b/sendto/meson.build
+@@ -22,7 +22,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file (
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: desktop,
+-- 
+GitLab
+

From 6df2194bfb294d55c4655c73da804244ef81c7b7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:47:14 +0100
Subject: [PATCH 0481/2561] gnome-books: fix for meson 0.61

---
 srcpkgs/gnome-books/patches/meson-0.61.patch | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0e6ba9befd96
--- /dev/null
+++ b/srcpkgs/gnome-books/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Wed, 9 Mar 2022 17:46:00 +0100
+Subject: [PATCH] meson: remove positional args from i18n.merge_file
+
+This causes the build to fail with meson 0.61+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bc6edfb4..5061554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -54,7 +54,6 @@ sources += gnome.compile_resources(
+ appdata = 'org.gnome.Books.appdata.xml'
+ 
+ appdata_file = i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+@@ -74,7 +73,6 @@ if appstream_util.found()
+ desktop = 'org.gnome.Books.desktop'
+ 
+ desktop_file = i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop + '.in',
+   output: desktop,
+-- 
+2.35.1
+

From 0d72818f84bb350ac613c06a856fc4ff35162c15 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0482/2561] gnome-boxes: fix for meson 0.61

---
 srcpkgs/gnome-boxes/patches/meson-0.61.patch | 36 ++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnome-boxes/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-boxes/patches/meson-0.61.patch b/srcpkgs/gnome-boxes/patches/meson-0.61.patch
new file mode 100644
index 000000000000..3d9c56f5841c
--- /dev/null
+++ b/srcpkgs/gnome-boxes/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From fd0acfbe79444687c73dea182c2d1a5fa1c77324 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 15 Jan 2022 00:07:31 +0100
+Subject: [PATCH] build: remove positional i18n.merge_file arguments
+
+otherwise building with meson 0.61+ fails:
+
+    ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index d32638a8..2dc1798b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes',
+ desktop_conf = configuration_data ()
+ desktop_conf.set ('icon', application_id)
+ desktop = i18n.merge_file (
+-  'desktop',
+   input: configure_file (
+     input: files ('org.gnome.Boxes.desktop.in'),
+     output: 'org.gnome.Boxes.desktop.in',
+@@ -65,7 +64,7 @@ configure_file (
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file (
+     input: files ('org.gnome.Boxes.appdata.xml.in'),
+     output: 'org.gnome.Boxes.appdata.xml.in',
+-- 
+2.34.1
+

From 9e72c87263c39eb639b12d78392f5157df57a247 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0483/2561] gnome-calendar: fix for meson 0.61

---
 srcpkgs/gnome-calendar/patches/meson-0.61.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/gnome-calendar/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-calendar/patches/meson-0.61.patch b/srcpkgs/gnome-calendar/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e2df31e0760e
--- /dev/null
+++ b/srcpkgs/gnome-calendar/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: files('org.gnome.Calendar.appdata.xml.in.in'),
+     output: 'org.gnome.Calendar.appdata.xml.in',

From b1f9258b8744535b0567875492137244afd0e5af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0484/2561] gnome-characters: fix for meson 0.61

---
 .../gnome-characters/patches/meson-0.61.patch  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/gnome-characters/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-characters/patches/meson-0.61.patch b/srcpkgs/gnome-characters/patches/meson-0.61.patch
new file mode 100644
index 000000000000..248f8d5dced7
--- /dev/null
+++ b/srcpkgs/gnome-characters/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -47,7 +47,6 @@ desktop_conf.set('appid', characters_application_id)
+ desktop_conf.set('bindir', characters_bindir)
+ 
+ i18n.merge_file(
+-  'desktop-file',
+   type: 'desktop',
+   input: configure_file (
+     input: characters_name + '.desktop.in',
+@@ -61,7 +60,6 @@ i18n.merge_file(
+ )
+ 
+ appdata_file = i18n.merge_file(
+-  'appdata-file',
+   input: characters_name + '.appdata.xml.in',
+   output: characters_application_id + '.appdata.xml',
+   po_dir: po_dir,

From 805d72c7d982a519019fe52a70e23e1e8b6d24fe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:34:03 +0100
Subject: [PATCH 0485/2561] gnome-dictionary: fix for meson 0.61

---
 .../gnome-dictionary/patches/meson-0.61.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/gnome-dictionary/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-dictionary/patches/meson-0.61.patch b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
new file mode 100644
index 000000000000..768494e2a8cf
--- /dev/null
+++ b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,6 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', application_id)
+-i18n.merge_file('appdata',
++i18n.merge_file(
+   input: configure_file(
+     input: 'org.gnome.Dictionary.appdata.xml.in.in',
+     output: 'org.gnome.Dictionary.appdata.xml.in',
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,7 @@ subdir('appdata')
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('application_id', application_id)
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+     input: 'org.gnome.Dictionary.desktop.in.in',
+     output: 'org.gnome.Dictionary.desktop.in',
+@@ -45,7 +45,7 @@ sources = [
+ ]
+ 
+ foreach s: sources
+-  i18n.merge_file('sources',
++  i18n.merge_file(
+     input: '@0@.in'.format(s),
+     output: s,
+     install: true,

From a8e702839ef8c64e7856994aaf5fae2e7dbd7138 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0486/2561] gnome-disk-utility: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 srcpkgs/gnome-disk-utility/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
new file mode 100644
index 000000000000..09e0c33d0798
--- /dev/null
+++ b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
@@ -0,0 +1,34 @@
+From 46ed7d26873b9741dff61f9df8e7778a8dc6f5cc Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Fri, 17 Dec 2021 12:29:30 +0000
+Subject: [PATCH] build: fix arguments of i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for a time
+and explicitly rejects with error since meson 0.60.0
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index e38a1d8e..38fb5207 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -11,7 +11,6 @@ desktops = [
+ 
+ foreach desktop: desktops
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -38,7 +37,6 @@ install_data(
+ info = 'org.gnome.DiskUtility.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
+-- 
+GitLab
+

From d4e174320b64b876dd5dc918dcef762a0e537f2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:45:53 +0100
Subject: [PATCH 0487/2561] gnome-documents: fix for meson 0.61

---
 .../gnome-documents/patches/meson-0.61.patch   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch
new file mode 100644
index 000000000000..131d34509406
--- /dev/null
+++ b/srcpkgs/gnome-documents/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -56,7 +56,6 @@ foreach app: documents_apps
+   appdata = app + '.appdata.xml'
+ 
+   appdata_file = i18n.merge_file(
+-    appdata,
+     input: appdata + '.in',
+     output: appdata,
+     po_dir: po_dir,
+@@ -76,7 +75,6 @@ foreach app: documents_apps
+   desktop = app + '.desktop'
+ 
+   desktop_file = i18n.merge_file(
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,

From 7b9865f682e1ec5a6ce0fd30fd188b1f07faca23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0488/2561] gnome-font-viewer: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/gnome-font-viewer/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..072ce27fd0d2
--- /dev/null
+++ b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
@@ -0,0 +1,40 @@
+From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Thu, 30 Dec 2021 17:14:47 +0800
+Subject: [PATCH] Fix meson build with meson 0.60.0+
+
+`i18n.merge_file` has been ignoring positional arguments for a time
+and explicitly rejects with error since meson 0.60.0
+---
+ data/meson.build | 2 +-
+ src/meson.build  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bfc9caa..8e42134 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ appdatadir = join_paths(datadir, 'metainfo')
+ appdata_file = 'org.gnome.font-viewer.appdata.xml'
+-merged_appdata = i18n.merge_file(appdata_file,
++merged_appdata = i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
+diff --git a/src/meson.build b/src/meson.build
+index f863d45..826c59b 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop'
+ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', meson.project_version())
+ desktop_conf.set('APPLICATION_ID', application_id)
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: configure_file(input: desktop_file + '.in.in',
+     output: desktop_file + '.in',
+     configuration: desktop_conf),
+-- 
+GitLab
+

From 7ad3c667db1a2152854c50503558479e27890cee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:45:56 +0100
Subject: [PATCH 0489/2561] gnome-games: fix for meson 0.61

---
 srcpkgs/gnome-games/patches/meson-0.61.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0a3b006b227b
--- /dev/null
+++ b/srcpkgs/gnome-games/patches/meson-0.61.patch
@@ -0,0 +1,20 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -44,7 +44,7 @@ mime_types = [
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Games.desktop.in.in'),
+@@ -70,7 +70,7 @@ endif
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Games.appdata.xml.in.in'),
+     output: 'org.gnome.Games.appdata.xml.in',

From dc5c9bd21286eefdd928383adb2a06d2e0d30d23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:14:37 +0100
Subject: [PATCH 0490/2561] gnome-mahjongg: fix for meson 0.61

---
 .../gnome-mahjongg/patches/meson-0.61.patch   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 srcpkgs/gnome-mahjongg/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
new file mode 100644
index 000000000000..2a17ad713752
--- /dev/null
+++ b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:22:48 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+data/meson.build:45:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 8740503..edb8583 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ 
+ desktop_file = i18n.merge_file (
+-  'desktop-file',
+   input:       'org.gnome.Mahjongg.desktop.in',
+   output:      'org.gnome.Mahjongg.desktop',
+   install:     true,
+@@ -41,7 +40,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+                  input: 'org.gnome.Mahjongg.appdata.xml.in',
+                  output: 'org.gnome.Mahjongg.appdata.xml',
+                  install: true,
+-- 
+GitLab
+

From 459889a6af774864ca531c229c4b2b1ea6e8127b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0491/2561] gnome-music: fix for meson 0.61

---
 srcpkgs/gnome-music/patches/meson-0.61.patch | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/gnome-music/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-music/patches/meson-0.61.patch b/srcpkgs/gnome-music/patches/meson-0.61.patch
new file mode 100644
index 000000000000..aca43b5608a2
--- /dev/null
+++ b/srcpkgs/gnome-music/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+From d9f35b542adbf6b0e1114c7c077df04212a98fc7 Mon Sep 17 00:00:00 2001
+From: Jean Felder <jfelder@src.gnome.org>
+Date: Thu, 18 Nov 2021 12:09:26 +0100
+Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0
+where it returns a deprecation message:
+"DEPRECATION: i18n.merge_file does not take any positional
+arguments. This will become a hard error in the next Meson release."
+
+See: https://github.com/mesonbuild/meson/issues/9441
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 25ff1e102..145ee5221 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID)
+ appdata_conf.set('package_url', PACKAGE_URL)
+ appdata_conf.set('package_url_bug', PACKAGE_URL_BUG)
+ i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     output: PROJECT_RDNN_NAME + '.appdata.xml.in',
+     input: PROJECT_RDNN_NAME + '.appdata.xml.in.in',
+-- 
+GitLab
+

From 1bfa2d897093e6f42cba7378f8471c7c7c1f650f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:23:31 +0100
Subject: [PATCH 0492/2561] gnome-photos: fix for meson 0.61

---
 srcpkgs/gnome-photos/patches/meson-0.61.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/gnome-photos/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-photos/patches/meson-0.61.patch b/srcpkgs/gnome-photos/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f406b1c494c0
--- /dev/null
+++ b/srcpkgs/gnome-photos/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From a0ac868a19d55dc52100e54fe4b2d29041bc6752 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Fri, 21 Jan 2022 12:36:02 +0000
+Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 6e7192e0..94271de2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,6 @@ subdir('icons')
+ appdata = photos_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+@@ -23,7 +22,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: desktop,
+-- 
+GitLab
+

From d9401be1bae1af3dfde6da16d7db484ec14dfcd4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:25:42 +0100
Subject: [PATCH 0493/2561] gnome-podcasts: fix for meson 0.61

---
 .../gnome-podcasts/patches/meson-0.61.patch   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/gnome-podcasts/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-podcasts/patches/meson-0.61.patch b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b5ad823b70cf
--- /dev/null
+++ b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 6614bb62ecbec7c3b18ea7fe44beb50fe7942b27 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Thu, 20 Jan 2022 01:27:48 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments.
+podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments.
+---
+ podcasts-gtk/resources/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/podcasts-gtk/resources/meson.build b/podcasts-gtk/resources/meson.build
+index c1f1ee9f..87148087 100644
+--- a/podcasts-gtk/resources/meson.build
++++ b/podcasts-gtk/resources/meson.build
+@@ -2,7 +2,7 @@ subdir('icons')
+ 
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Podcasts.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Podcasts.appdata.xml.in.in'),
+     output: 'org.gnome.Podcasts.appdata.xml.in',
+-- 
+GitLab
+

From f21cb8d1e342053d0b79127465294b035aff38de Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:27:03 +0100
Subject: [PATCH 0494/2561] gnome-screenshot: fix for meson 0.61

---
 .../gnome-screenshot/patches/meson-0.61.patch | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnome-screenshot/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-screenshot/patches/meson-0.61.patch b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b21aa0490d49
--- /dev/null
+++ b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001
+From: Jack Hill <jackhill@jackhill.us>
+Date: Thu, 18 Nov 2021 00:46:58 -0500
+Subject: [PATCH] meson: remove extraneous positional argument
+
+* data/meson.build (desktop_file)
+  (metainfo_file): Remove extraneous positional argument.
+
+Closes #186
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd570b3..4e2e2e8 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,7 +1,6 @@
+ gnome = import('gnome')
+ 
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: 'org.gnome.Screenshot.desktop.in',
+   output: 'org.gnome.Screenshot.desktop',
+@@ -23,7 +22,6 @@ if desktop_file_validate.found()
+ endif
+ 
+ metainfo_file = i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Screenshot.metainfo.xml.in',
+   output: 'org.gnome.Screenshot.metainfo.xml',
+   po_dir: join_paths(meson.current_source_dir(), '../po'),
+-- 
+GitLab
+

From 3998dc805abe005ac2708220617ed3b75e64fdda Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:28:32 +0100
Subject: [PATCH 0495/2561] gnome-settings-daemon: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b7c03ca2da63
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Wed, 26 Jan 2022 23:08:58 +0100
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+---
+ plugins/power/meson.build | 1 -
+ plugins/wacom/meson.build | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/plugins/power/meson.build b/plugins/power/meson.build
+index 69e619f2..014bb6da 100644
+--- a/plugins/power/meson.build
++++ b/plugins/power/meson.build
+@@ -76,7 +76,6 @@ if host_is_linux
+   )
+ 
+   i18n.merge_file(
+-    policy,
+     input: policy_in,
+     output: policy,
+     po_dir: po_dir,
+diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
+index d8dd0ec7..c00323d4 100644
+--- a/plugins/wacom/meson.build
++++ b/plugins/wacom/meson.build
+@@ -7,7 +7,6 @@ policy_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy_in,
+   output: policy,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 976f3b9dfbd8012c1db71f79c1b1133b440439b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:30:02 +0100
Subject: [PATCH 0496/2561] gnome-shell: fix for meson 0.61

---
 srcpkgs/gnome-shell/patches/meson-0.61.patch | 82 ++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 srcpkgs/gnome-shell/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-shell/patches/meson-0.61.patch b/srcpkgs/gnome-shell/patches/meson-0.61.patch
new file mode 100644
index 000000000000..ad3b7ef3923a
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/meson-0.61.patch
@@ -0,0 +1,82 @@
+From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 23 Dec 2021 17:18:16 +0100
+Subject: [PATCH] build: Drop incorrect positional arg
+
+Unlike other targets that take a name, i18n.merge_file() does not.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
+---
+ data/meson.build                                      | 2 +-
+ src/calendar-server/meson.build                       | 2 +-
+ subprojects/extensions-app/data/meson.build           | 2 +-
+ subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
+ subprojects/extensions-tool/src/templates/meson.build | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f924fdf806..76ae45c93a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+ 
+ foreach desktop_file : desktop_files
+-  i18n.merge_file('desktop',
++  i18n.merge_file(
+     input: configure_file(
+       input: desktop_file + '.in.in',
+       output: desktop_file + '.in',
+diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
+index 7363282a59..8b4ef411c8 100644
+--- a/src/calendar-server/meson.build
++++ b/src/calendar-server/meson.build
+@@ -27,7 +27,7 @@ configure_file(
+   install_dir: servicedir
+ )
+ 
+-i18n.merge_file('evolution-calendar.desktop',
++i18n.merge_file(
+   input: 'evolution-calendar.desktop.in',
+   output: 'evolution-calendar.desktop',
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
+index d7e7d4001c..4b601e8bd1 100644
+--- a/subprojects/extensions-app/data/meson.build
++++ b/subprojects/extensions-app/data/meson.build
+@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('app_id', app_id)
+ desktopconf.set('prgname', prgname)
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+     input: base_id + '.desktop.in.in',
+     output: desktop_file + '.in',
+diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build
+index c4962c0576..a19bfa80a4 100644
+--- a/subprojects/extensions-app/data/metainfo/meson.build
++++ b/subprojects/extensions-app/data/metainfo/meson.build
+@@ -1,5 +1,5 @@
+ metainfo = app_id + '.metainfo.xml'
+-i18n.merge_file(metainfo,
++i18n.merge_file(
+   input: base_id + '.metainfo.xml.in',
+   output: metainfo,
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build
+index 670e2bf448..d693bfaddb 100644
+--- a/subprojects/extensions-tool/src/templates/meson.build
++++ b/subprojects/extensions-tool/src/templates/meson.build
+@@ -4,7 +4,7 @@ template_metas = [
+ ]
+ template_deps = []
+ foreach template : template_metas
+-  template_deps += i18n.merge_file(template,
++  template_deps += i18n.merge_file(
+     input: template + '.in',
+     output: template,
+     po_dir: po_dir,
+-- 
+GitLab
+

From f1c04a218ac84dfed7b6fda27e13b224e9de958b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:31:24 +0100
Subject: [PATCH 0497/2561] gnome-sound-recorder: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
new file mode 100644
index 000000000000..40392e6a9fe8
--- /dev/null
+++ b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From 1335b1b1aff61167f8648f7cb3c569764031960d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:37:06 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:16:0: ERROR: Function does not take positional arguments.
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build         | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 1f5744e..d2c2c3a 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
+ metainfo_conf.set('gettext-package', gettext_package)
+ 
+ metainfo_file = i18n.merge_file(
+-  'metainfo-file',
+   input: configure_file(
+   	input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
+   	output: '@BASENAME@',
+diff --git a/data/meson.build b/data/meson.build
+index 44117ad..0ff8fa5 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -14,7 +14,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('app-id', application_id)
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+   	input: 'org.gnome.SoundRecorder.desktop.in.in',
+   	output: '@BASENAME@',
+-- 
+GitLab
+

From 93c3d535d7c3486a2782ffe1bbb289a39cc747ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:05:16 +0100
Subject: [PATCH 0498/2561] gnome-sudoku: fix for meson 0.61

---
 srcpkgs/gnome-sudoku/patches/meson-0.61.patch | 38 +++++++++++++++++++
 srcpkgs/gnome-sudoku/template                 |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-sudoku/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-sudoku/patches/meson-0.61.patch b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
new file mode 100644
index 000000000000..93549d0158d5
--- /dev/null
+++ b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:44:06 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f18f247..9c95e02 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml')
+ 
+ resources = gnome.compile_resources('gnome-sudoku', resource_files)
+ 
+-desktop_file = i18n.merge_file('desktop',
++desktop_file = i18n.merge_file(
+   input: '@0@.desktop.in'.format(application_id),
+   output: '@0@.desktop'.format(application_id),
+   install: true,
+@@ -21,7 +21,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file('appdata',
++appdata_file = i18n.merge_file(
+   input: '@0@.appdata.xml.in'.format(application_id),
+   output: '@0@.appdata.xml'.format(application_id),
+   install: true,
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index ed1759478ab5..6e0af45248ff 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -5,7 +5,7 @@ revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk4-devel libgee08-devel json-glib-devel qqwing-devel"
+makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel"
 short_desc="GNOME Sudoku Japanese logic game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From fe658aacb89b107c16cc147fd937362909ceec8e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:56:48 +0100
Subject: [PATCH 0499/2561] gnome-taquin: fix for meson 0.61

---
 srcpkgs/gnome-taquin/patches/meson-0.61.patch | 134 ++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 srcpkgs/gnome-taquin/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-taquin/patches/meson-0.61.patch b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e14267675ecb
--- /dev/null
+++ b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
@@ -0,0 +1,134 @@
+From 99dea5e7863e112f33f16e59898c56a4f1a547b3 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 16 Jan 2021 14:00:15 +0100
+Subject: [PATCH] Don't alter or try to write [GtkChild] fields
+
+See https://gitlab.gnome.org/GNOME/vala/issues/1121
+---
+ src/overlayed-list.vala | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/src/overlayed-list.vala b/src/overlayed-list.vala
+index 3fbb1c3..eb2404a 100644
+--- a/src/overlayed-list.vala
++++ b/src/overlayed-list.vala
+@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+     internal void set_window_size (AdaptativeWidget.WindowSize new_size)
+     {
+         if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size))
+-            set_horizontal (ref main_context, ref edit_mode_box);
++            set_horizontal (ref main_context, edit_mode_box);
+         else
+-            set_vertical (ref main_context, ref edit_mode_box);
++            set_vertical (ref main_context, edit_mode_box);
+     }
+-    private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box)
++    private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box)
+     {
+         main_context.remove_class ("vertical");
+         edit_mode_box.halign = Align.END;
+@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+         edit_mode_box.width_request = 160;
+         main_context.add_class ("horizontal");
+     }
+-    private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box)
++    private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box)
+     {
+         main_context.remove_class ("horizontal");
+         edit_mode_box.halign = Align.CENTER;
+@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool next_match ()
+     {
+-        return _next_match (ref main_list_box);
++        return _next_match (main_list_box);
+     }
+-    private static inline bool _next_match (ref ListBox main_list_box)
++    private static inline bool _next_match (ListBox main_list_box)
+     {
+         ListBoxRow? row = main_list_box.get_selected_row ();    // TODO multiple rows and focus-only lists
+         if (row == null)
+@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+         if (row == null)
+         {
+-            _scroll_bottom (ref main_list_box);
++            _scroll_bottom (main_list_box);
+             return false;
+         }
+         main_list_box.select_row ((!) row);
+@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool previous_match ()
+     {
+-        return _previous_match (ref main_list_box);
++        return _previous_match (main_list_box);
+     }
+-    private static inline bool _previous_match (ref ListBox main_list_box)
++    private static inline bool _previous_match (ListBox main_list_box)
+     {
+         uint n_items = main_list_box.get_children ().length ();  // FIXME OverlayedList.n_items is unreliable
+         if (n_items == 0)
+@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected int [] get_selected_rows_indices ()
+     {
+-        return _get_selected_rows_indices (ref main_list_box);
++        return _get_selected_rows_indices (main_list_box);
+     }
+-    private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box)
++    private static inline int [] _get_selected_rows_indices (ListBox main_list_box)
+     {
+         int [] indices = new int [0];
+         main_list_box.selected_foreach ((_list_box, selected_row) => {
+@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected void scroll_top ()
+     {
+-        _scroll_top (ref main_list_box);
++        _scroll_top (main_list_box);
+     }
+-    private static inline void _scroll_top (ref ListBox main_list_box)
++    private static inline void _scroll_top (ListBox main_list_box)
+     {
+         Adjustment adjustment = main_list_box.get_adjustment ();
+         adjustment.set_value (adjustment.get_lower ());
+@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected void scroll_bottom ()
+     {
+-        _scroll_bottom (ref main_list_box);
++        _scroll_bottom (main_list_box);
+     }
+-    private static inline void _scroll_bottom (ref ListBox main_list_box)
++    private static inline void _scroll_bottom (ListBox main_list_box)
+     {
+         Adjustment adjustment = main_list_box.get_adjustment ();
+         adjustment.set_value (adjustment.get_upper ());
+@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool handle_copy_text (out string copy_text)
+     {
+-        return _handle_copy_text (out copy_text, ref main_list_box);
++        return _handle_copy_text (out copy_text, main_list_box);
+     }
+-    private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box)
++    private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box)
+     {
+         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+         OverlayedListRow row;
+@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal SelectionState get_selection_state ()
+     {
+-        return _get_selection_state (ref main_list_box, ref main_list_store);
++        return _get_selection_state (main_list_box, ref main_list_store);
+     }
+-    private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store)
++    private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store)
+     {
+         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+         uint n_selected_rows = selected_rows.length ();
+-- 
+GitLab
+

From ef4ee1ed7b43b55195e0663f0c278f5a24690ef5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0500/2561] gnome-terminal: fix for meson 0.61

---
 .../gnome-terminal/patches/meson-0.61.patch   | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 srcpkgs/gnome-terminal/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-terminal/patches/meson-0.61.patch b/srcpkgs/gnome-terminal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8b6edbb923a2
--- /dev/null
+++ b/srcpkgs/gnome-terminal/patches/meson-0.61.patch
@@ -0,0 +1,47 @@
+From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@src.gnome.org>
+Date: Fri, 14 Jan 2022 11:33:32 +0100
+Subject: [PATCH] build: Fix for newer meson
+
+---
+ data/meson.build | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 79d97e5b..e0bcbb91 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -18,7 +18,6 @@
+ metainfodir = gt_datadir / 'metainfo'
+ 
+ i18n.merge_file(
+-  gt_dns_name + '.metainfo.xml',
+   input: gt_dns_name + '.metainfo.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+@@ -27,7 +26,6 @@ i18n.merge_file(
+ )
+ 
+ i18n.merge_file(
+-  gt_dns_name + '.Nautilus.metainfo.xml',
+   input: gt_dns_name + '.Nautilus.metainfo.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+@@ -40,7 +38,6 @@ i18n.merge_file(
+ desktopdatadir = gt_datadir / 'applications'
+ 
+ i18n.merge_file(
+-  gt_dns_name + '.desktop',
+   input: gt_dns_name + '.desktop.in',
+   output: '@BASENAME@',
+   type: 'desktop',
+@@ -57,4 +54,4 @@ meson.add_install_script(
+ 
+ # Subdirs
+ 
+-subdir('icons')
+\ No newline at end of file
++subdir('icons')
+-- 
+GitLab
+

From 7859be92cc6d3336b1e15a744f895e6cfe2cc73a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:30:05 +0100
Subject: [PATCH 0501/2561] gnome-tetravex: fix for meson 0.61

---
 .../gnome-tetravex/patches/meson-0.61.patch   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/gnome-tetravex/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-tetravex/patches/meson-0.61.patch b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
new file mode 100644
index 000000000000..12e0eab64ef0
--- /dev/null
+++ b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:48:22 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+data/meson.build:59:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bb77248..b881e8a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -34,7 +34,7 @@ endif
+ 
+ # Desktop file
+ if get_option('build_gui')
+-  desktop_file = i18n.merge_file ('desktop-file',
++  desktop_file = i18n.merge_file (
+                            input: project_id + '.desktop.in',
+                           output: project_id + '.desktop',
+                          install: true,
+@@ -56,7 +56,7 @@ endif
+ 
+ # AppData file
+ if get_option('build_gui')
+-  appdata_file = i18n.merge_file ('appdata-file',
++  appdata_file = i18n.merge_file (
+                            input: project_id + '.appdata.xml.in',
+                           output: project_id + '.appdata.xml',
+                          install: true,
+-- 
+GitLab
+

From 615677f2437cc47f88e116a12267e3a03aabeaaa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:27:12 +0100
Subject: [PATCH 0502/2561] gnome-tweaks: fix for meson 0.61

---
 srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
new file mode 100644
index 000000000000..80efde38735e
--- /dev/null
+++ b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001
+From: Mae Dartmann <hello@maedartmann.name>
+Date: Wed, 16 Feb 2022 06:08:41 +0000
+Subject: [PATCH] meson: fix invalid positional argument
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd6d5da..74f7e82 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ appdata_file = 'org.gnome.tweaks.appdata.xml'
+-i18n.merge_file(appdata_file,
++i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
+@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
+ )
+ 
+ desktop_file = 'org.gnome.tweaks.desktop'
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: desktop_file + '.in',
+   output: desktop_file,
+   po_dir: '../po',
+-- 
+GitLab
+

From ad77c6788a257479ca7f3ea559595b032781925d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0503/2561] gnome-weather: fix for meson 0.61

---
 srcpkgs/gnome-weather/patches/meson-0.61.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/gnome-weather/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-weather/patches/meson-0.61.patch b/srcpkgs/gnome-weather/patches/meson-0.61.patch
new file mode 100644
index 000000000000..a305b8c54dc4
--- /dev/null
+++ b/srcpkgs/gnome-weather/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -59,7 +59,6 @@ endif
+ appdata_conf = configuration_data()
+ appdata_conf.set('app_id', weather_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: '@0@.appdata.xml.in.in'.format(default_id),
+     output: '@0@.appdata.xml.in'.format(default_id),

From 700a785ce31610fe6093015964cb0c758ca11a95 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:31:37 +0100
Subject: [PATCH 0504/2561] gnote: fix for meson 0.61

---
 srcpkgs/gnote/patches/meson-0.61.patch | 36 ++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnote/patches/meson-0.61.patch

diff --git a/srcpkgs/gnote/patches/meson-0.61.patch b/srcpkgs/gnote/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e5575c0fa3f7
--- /dev/null
+++ b/srcpkgs/gnote/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:53:17 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:4:0: ERROR: Function does not take positional arguments.
+data/meson.build:41:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index a6138165..8d16368a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ install_man('gnote.1')
+ 
+ desktop_file = 'org.gnome.Gnote.desktop'
+ gnote_desktop_file = i18n.merge_file(
+-  desktop_file,
+   type: 'desktop',
+   input: desktop_file + '.in',
+   output: desktop_file,
+@@ -39,7 +38,6 @@ configure_file(
+ 
+ gnote_appdata = 'org.gnome.Gnote.appdata.xml'
+ appdata_file = i18n.merge_file(
+-  gnote_appdata,
+   input: gnote_appdata + '.in',
+   output: gnote_appdata,
+   po_dir: '../po',
+-- 
+GitLab
+

From 764925f29e53eeb54c0d335694fa4a765e651650 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0505/2561] gobject-introspection: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 294 ++++++++++++++++++
 1 file changed, 294 insertions(+)
 create mode 100644 srcpkgs/gobject-introspection/patches/meson-0.61.patch

diff --git a/srcpkgs/gobject-introspection/patches/meson-0.61.patch b/srcpkgs/gobject-introspection/patches/meson-0.61.patch
new file mode 100644
index 000000000000..44bf409b1164
--- /dev/null
+++ b/srcpkgs/gobject-introspection/patches/meson-0.61.patch
@@ -0,0 +1,294 @@
+From 827494d6415b696a98fa195cbd883b50cc893bfc Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Tue, 11 Jan 2022 15:47:50 +0000
+Subject: [PATCH] doctool: Add templates_dir CLI argument
+
+We can find the templates directory using the module file once
+installed, but when running uninstalled we need to have a way to specify
+where the templates can be found in the sources directory.
+---
+ giscanner/docmain.py   |  4 +++-
+ giscanner/docwriter.py | 14 ++++++++------
+ 2 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/giscanner/docmain.py b/giscanner/docmain.py
+index dab063ef..88430f05 100644
+--- a/giscanner/docmain.py
++++ b/giscanner/docmain.py
+@@ -51,6 +51,8 @@ def doc_main(args):
+     parser.add_argument("-s", "--write-sections-file",
+                         action="store_const", dest="format", const="sections",
+                         help="Backwards-compatible equivalent to -f sections")
++    parser.add_argument("--templates-dir",
++                        action="store")
+ 
+     args = parser.parse_args(args[1:])
+     if not args.output:
+@@ -74,7 +76,7 @@ def doc_main(args):
+         with open(args.output, 'w', encoding='utf-8') as fp:
+             write_sections_file(fp, sections_file)
+     else:
+-        writer = DocWriter(transformer, args.language, args.format)
++        writer = DocWriter(transformer, args.language, args.format, args.templates_dir)
+         writer.write(args.output)
+ 
+     return 0
+diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
+index d0cd610f..b72ab2ac 100644
+--- a/giscanner/docwriter.py
++++ b/giscanner/docwriter.py
+@@ -1288,7 +1288,7 @@ LANGUAGES = {
+ 
+ 
+ class DocWriter(object):
+-    def __init__(self, transformer, language, output_format):
++    def __init__(self, transformer, language, output_format, templates_dir=None):
+         self._transformer = transformer
+ 
+         try:
+@@ -1300,18 +1300,20 @@ class DocWriter(object):
+         self._formatter = formatter_class(self._transformer)
+         self._language = self._formatter.language
+         self._output_format = output_format
++        self._templates_dir = templates_dir
+ 
+         self._lookup = self._get_template_lookup()
+ 
+     def _get_template_lookup(self):
+-        if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
++        if self._templates_dir is not None:
++            srcdir = self._templates_dir
++        elif 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
+             top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR']
+-            srcdir = os.path.join(top_srcdir, 'giscanner')
++            srcdir = os.path.join(top_srcdir, 'giscanner', 'doctemplates')
+         else:
+-            srcdir = os.path.dirname(__file__)
++            srcdir = os.path.join(os.path.dirname(__file__), 'doctemplates')
+ 
+-        template_dir = os.path.join(srcdir, 'doctemplates',
+-                                    self._formatter.output_format)
++        template_dir = os.path.join(srcdir, self._formatter.output_format)
+ 
+         return TemplateLookup(directories=[template_dir],
+                               module_directory=tempfile.mkdtemp(),
+-- 
+GitLab
+
+From effb1e09dee263cdac4ec593e8caf316e6f01fe2 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Tue, 11 Jan 2022 15:51:10 +0000
+Subject: [PATCH] build: Avoid the doctemplates hack
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The hack that copies the doctemplates directory into the build
+directory has stopped working with newer versions of Meson; while it's
+possible to copy files, custom_target() cannot depend on a directory.
+Additionally, the dependency has always been broken.
+
+Instead, we enumerate the template files—after all, it's not like they
+change a lot—and then we list them as dependencies for the test targets.
+
+Fixes: #414
+---
+ giscanner/doctemplates/devdocs/meson.build | 19 +++++++
+ giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++
+ giscanner/meson.build                      | 14 ++---
+ tests/scanner/meson.build                  | 24 +++++----
+ 4 files changed, 98 insertions(+), 22 deletions(-)
+ create mode 100644 giscanner/doctemplates/devdocs/meson.build
+ create mode 100644 giscanner/doctemplates/mallard/meson.build
+
+diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build
+new file mode 100644
+index 00000000..2037182a
+--- /dev/null
++++ b/giscanner/doctemplates/devdocs/meson.build
+@@ -0,0 +1,19 @@
++doc_templates += files([
++  'Gjs/_doc.tmpl',
++  'Gjs/_index.tmpl',
++  'Gjs/_method.tmpl',
++  'Gjs/_methods.tmpl',
++  'Gjs/_properties.tmpl',
++  'Gjs/_signals.tmpl',
++  'Gjs/_staticmethods.tmpl',
++  'Gjs/_vfuncs.tmpl',
++  'Gjs/base.tmpl',
++  'Gjs/callback.tmpl',
++  'Gjs/class.tmpl',
++  'Gjs/default.tmpl',
++  'Gjs/enum.tmpl',
++  'Gjs/function.tmpl',
++  'Gjs/interface.tmpl',
++  'Gjs/method.tmpl',
++  'Gjs/namespace.tmpl',
++])
+diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build
+new file mode 100644
+index 00000000..5fe4e2af
+--- /dev/null
++++ b/giscanner/doctemplates/mallard/meson.build
+@@ -0,0 +1,63 @@
++base_templates = files([
++  'base.tmpl',
++  'class.tmpl',
++  'namespace.tmpl',
++])
++
++c_templates = files([
++  'C/callback.tmpl',
++  'C/class.tmpl',
++  'C/constructor.tmpl',
++  'C/default.tmpl',
++  'C/enum.tmpl',
++  'C/field.tmpl',
++  'C/function.tmpl',
++  'C/interface.tmpl',
++  'C/method.tmpl',
++  'C/namespace.tmpl',
++  'C/property.tmpl',
++  'C/record.tmpl',
++  'C/signal.tmpl',
++  'C/vfunc.tmpl',
++])
++
++gjs_templates = files([
++  'Gjs/callback.tmpl',
++  'Gjs/class.tmpl',
++  'Gjs/constructor.tmpl',
++  'Gjs/default.tmpl',
++  'Gjs/enum.tmpl',
++  'Gjs/field.tmpl',
++  'Gjs/function.tmpl',
++  'Gjs/interface.tmpl',
++  'Gjs/method.tmpl',
++  'Gjs/namespace.tmpl',
++  'Gjs/property.tmpl',
++  'Gjs/record.tmpl',
++  'Gjs/signal.tmpl',
++  'Gjs/vfunc.tmpl',
++])
++
++py_templates = files([
++  'Python/callback.tmpl',
++  'Python/class.tmpl',
++  'Python/constructor.tmpl',
++  'Python/default.tmpl',
++  'Python/enum.tmpl',
++  'Python/field.tmpl',
++  'Python/function.tmpl',
++  'Python/interface.tmpl',
++  'Python/method.tmpl',
++  'Python/namespace.tmpl',
++  'Python/property.tmpl',
++  'Python/record.tmpl',
++  'Python/signal.tmpl',
++  'Python/vfunc.tmpl',
++])
++
++doc_templates += [
++  base_templates,
++  c_templates,
++  gjs_templates,
++  py_templates,
++]
+diff --git a/giscanner/meson.build b/giscanner/meson.build
+index 41edcd44..3d7dc678 100644
+--- a/giscanner/meson.build
++++ b/giscanner/meson.build
+@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c',
+ 
+ install_subdir('doctemplates', install_dir: giscannerdir)
+ 
+-# XXX: this doesn't track the input, but there is nothing to copy many files
+-# in meson.
+-doc_templates = custom_target('copy-templates',
+-  input : 'doctemplates',
+-  output : 'doctemplates',
+-  command : [
+-    python, '-c',
+-      'import sys, shutil;' +
+-      'shutil.rmtree(sys.argv[2], ignore_errors=True);' +
+-      'shutil.copytree(sys.argv[1], sys.argv[2])',
+-    '@INPUT@', '@OUTPUT@'])
++doc_templates = []
++subdir('doctemplates/devdocs')
++subdir('doctemplates/mallard')
+ 
+ flex = find_program('flex', 'win_flex')
+ bison = find_program('bison', 'win_bison')
+diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build
+index 5176b957..b81b3fd5 100644
+--- a/tests/scanner/meson.build
++++ b/tests/scanner/meson.build
+@@ -525,19 +525,26 @@ foreach gir : test_girs
+ endforeach
+ 
+ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
++  doctool_env = environment()
++  doctool_env.set('srcdir', meson.current_source_dir())
++  doctool_env.set('builddir', meson.current_build_dir())
++
+   foreach language : ['C', 'Python', 'Gjs']
+     regress_docs = custom_target(
+       'generate-docs-' + language,
+       input: regress_gir,
+-      depends: [doc_templates],
++      depend_files: doc_templates,
+       build_by_default: not cairo_deps_found,
++      env: doctool_env,
+       output: 'Regress-1.0-' + language,
+       command: [
+         python, girdoctool,
+         '--add-include-path=' + join_paths(build_root, 'gir'),
+         '--add-include-path=' + meson.current_build_dir(),
+         '--language', language,
+-        '@INPUT@', '-o', '@OUTPUT@'],
++        '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'),
++        '@INPUT@', '-o', '@OUTPUT@',
++      ],
+     )
+ 
+     if cairo_deps_found
+@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+         python,
+         args: [gi_tester, 'Regress-1.0-' + language],
+         depends: [regress_docs],
+-        env: [
+-          'srcdir=' + meson.current_source_dir(),
+-          'builddir=' + meson.current_build_dir(),
+-        ],
++        env: doctool_env,
+       )
+     endif
+   endforeach
+@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+   regress_sections = custom_target(
+     'generate-docs-sections',
+     input: regress_gir,
+-    depends: [doc_templates],
++    depend_files: [doc_templates],
+     build_by_default: not cairo_deps_found,
+     output: 'Regress-1.0-sections.txt',
++    env: doctool_env,
+     command: [
+       python, girdoctool,
+       '--add-include-path=' + join_paths(build_root, 'gir'),
+@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+       python,
+       args: [gi_tester, 'Regress-1.0-sections.txt'],
+       depends: [regress_sections],
+-      env: [
+-        'srcdir=' + meson.current_source_dir(),
+-        'builddir=' + meson.current_build_dir(),
+-      ],
++      env: doctool_env,
+     )
+   endif
+ endif
+-- 
+GitLab
+

From 26e21357afad3848ca08915e882b90554108b21c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0506/2561] gthumb: fix for meson 0.61

---
 .../patches/linguas-remove-duplicate.patch    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/gthumb/patches/linguas-remove-duplicate.patch

diff --git a/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch
new file mode 100644
index 000000000000..00e9dde84669
--- /dev/null
+++ b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch
@@ -0,0 +1,24 @@
+From daef485dffd67319c114cf1bda453bf6157e11ff Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Tue, 11 Jan 2022 12:30:44 +0100
+Subject: [PATCH] LINGUAS: removed duplicated entry
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index b615195e..aabf71ac 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -9,7 +9,6 @@ eu
+ fr
+ hu
+ id
+-id
+ nl
+ oc
+ sl
+-- 
+GitLab
+

From d68bf8be05ab7d96c76c2bbc1e6ac0389e689d9b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:45:46 +0100
Subject: [PATCH 0507/2561] gtranslator: fix for meson 0.61

---
 srcpkgs/gtranslator/patches/meson-0.61.patch | 36 ++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch

diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..54063041fe16
--- /dev/null
+++ b/srcpkgs/gtranslator/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:57:43 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2ca0be0b..2ebbfb12 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@0@.desktop'.format(gtr_app_id),
+@@ -35,7 +34,6 @@ appdata_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata_in,
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 981232f57424bc5f2346c142a1d5e546dc3b0c30 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:19 +0100
Subject: [PATCH 0508/2561] gvfs: fix for meson 0.61

---
 srcpkgs/gvfs/patches/meson-0.61.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/gvfs/patches/meson-0.61.patch

diff --git a/srcpkgs/gvfs/patches/meson-0.61.patch b/srcpkgs/gvfs/patches/meson-0.61.patch
new file mode 100644
index 000000000000..38f04b2e894c
--- /dev/null
+++ b/srcpkgs/gvfs/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -366,7 +366,6 @@ if enable_admin
+   )
+ 
+   i18n.merge_file(
+-    policy,
+     input: policy_in,
+     output: '@BASENAME@',
+     po_dir: po_dir,

From 4a9855f980bd2a8f580ebe6b121ce88e3591b711 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 22 Mar 2022 22:42:58 +0100
Subject: [PATCH 0509/2561] harfbuzz: fix for meson 0.61

---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 894a1b7bf9fe..d5c501aa5413 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -3,7 +3,7 @@ pkgname=harfbuzz
 version=3.3.1
 revision=1
 build_style=meson
-build_helper=gir
+build_helper="gir qemu"
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"

From bf81c67f6aec7282a2e8c324090ed45c016d4d97 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:05 +0100
Subject: [PATCH 0510/2561] hitori: fix for meson 0.61

---
 srcpkgs/hitori/patches/meson-0.61.patch | 41 +++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 srcpkgs/hitori/patches/meson-0.61.patch

diff --git a/srcpkgs/hitori/patches/meson-0.61.patch b/srcpkgs/hitori/patches/meson-0.61.patch
new file mode 100644
index 000000000000..37adaa0116e6
--- /dev/null
+++ b/srcpkgs/hitori/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 2 Nov 2021 12:04:29 +0000
+Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Meson never took positional arguments in this function, but didn’t warn
+about it until Meson 0.60. Drop the unnecessary arguments to fix the
+warning.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 97b8e68..c66a233 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ subdir('icons')
+ 
+-desktop_file = i18n.merge_file('desktop-file',
++desktop_file = i18n.merge_file(
+   type: 'desktop',
+   input: '@0@.desktop.in'.format(application_id),
+   output: '@0@.desktop'.format(application_id),
+@@ -20,7 +20,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file('appdata-file',
++appdata_file = i18n.merge_file(
+   input: '@0@.appdata.xml.in'.format(application_id),
+   output: '@0@.appdata.xml'.format(application_id),
+   po_dir: join_paths(meson.source_root(), 'po'),
+-- 
+GitLab
+

From 80324346663e2b8129d050d8e7d9bfeab6b9a338 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 21:07:42 +0100
Subject: [PATCH 0511/2561] io.elementary.code: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/io.elementary.code/patches/meson-0.61.patch

diff --git a/srcpkgs/io.elementary.code/patches/meson-0.61.patch b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
new file mode 100644
index 000000000000..87a88aabff47
--- /dev/null
+++ b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
@@ -0,0 +1,22 @@
+From a2607cce3a6b1bb62d02456456d3cbc3c6530bb0 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:25 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#1165)
+
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c2ff0c2881..1f3940d481 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -64,7 +64,6 @@ if get_option ('have_pkexec')
+     )
+ 
+     i18n.merge_file(
+-        'policy',
+         input: policy_in,
+         output: meson.project_name() + '.policy',
+         po_dir: join_paths(meson.source_root (), 'po', 'extra'),

From 121dc8a3d278b70612de8d30bcf60488955d19ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 22:54:07 +0100
Subject: [PATCH 0512/2561] io.elementary.music: fix for meson 0.61

---
 .../patches/meson-0.61.patch                   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/io.elementary.music/patches/meson-0.61.patch

diff --git a/srcpkgs/io.elementary.music/patches/meson-0.61.patch b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
new file mode 100644
index 000000000000..17393cc5aa07
--- /dev/null
+++ b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -27,7 +27,6 @@ install_data(
+ 
+ i18n = import('i18n')
+ desktop_file = i18n.merge_file(
+-    'desktop',
+     input: meson.project_name() + '.desktop.in',
+     output: meson.project_name() + '.desktop',
+     install: true,
+@@ -37,7 +36,6 @@ desktop_file = i18n.merge_file(
+ )
+ 
+ appdata_file = i18n.merge_file(
+-    'appdata',
+     input: meson.project_name() + '.appdata.xml.in',
+     output: meson.project_name() + '.appdata.xml',
+     install: true,

From 88230ebd113ead4a2cd2e775433dcc5075b712cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 20:24:34 +0100
Subject: [PATCH 0513/2561] io.elementary.terminal: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/io.elementary.terminal/patches/meson-0.61.patch

diff --git a/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..7fd1fb455335
--- /dev/null
+++ b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 15e3ace08cb25e53941249fa1ee680a1e2f871b4 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:28 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#649)
+
+---
+ data/meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 435b84172..a64fc120e 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ install_data(
+ )
+ 
+ i18n.merge_file (
+-    'desktop',
+     input: meson.project_name() + '.desktop.in',
+     output: meson.project_name() + '.desktop',
+     install: true,
+@@ -14,7 +13,6 @@ i18n.merge_file (
+ )
+ 
+ i18n.merge_file (
+-    'desktop',
+     input: 'open-pantheon-terminal-here.desktop.in',
+     output: 'open-pantheon-terminal-here.desktop',
+     install: true,
+@@ -24,7 +22,6 @@ i18n.merge_file (
+ )
+ 
+ i18n.merge_file (
+-    'appdata',
+     input: meson.project_name() + '.appdata.xml.in',
+     output: meson.project_name() + '.appdata.xml',
+     install: true,

From 79dc00a609a16250381b39532621f2c31b0a866b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:07:09 +0100
Subject: [PATCH 0514/2561] libaccounts-glib: fix for meson 0.61

---
 srcpkgs/libaccounts-glib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template
index ad3a6e0621a9..9b86ed45ed91 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -17,9 +17,9 @@ checksum=eebb1c6debfcf929efb388a0f28d8cc8ec9b32f273e4abe4224a33e5d299cd73
 if [ "$CROSS_BUILD" ]; then
 	# Remove docs. During install of package, it will try
 	# to run target binary with host, which causes exec error
-		pre_build() {
-			vsed -e '/docs/d' -i meson.build
-		}
+	post_patch() {
+		vsed -e '/docs/d' -i meson.build
+	}
 fi
 
 libaccounts-glib-devel_package() {

From 68601e0dd2c9da50059aac809e18bb083207ceda Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:44:04 +0100
Subject: [PATCH 0515/2561] network-manager-applet: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch

diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
new file mode 100644
index 000000000000..1060e15b364a
--- /dev/null
+++ b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:34:09 +0100
+Subject: [PATCH] meson.build: address meson 0.61 failures
+
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 33adb632..6178c0eb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
+ 
+ foreach desktop: desktop_files
+   i18n.merge_file(
+-    desktop + '-desktop',
+     input: desktop + '.desktop.in',
+     output: desktop + '.desktop',
+     install: true,
+@@ -275,7 +274,6 @@ endforeach
+ appdata = 'nm-connection-editor.appdata.xml'
+ 
+ i18n.merge_file(
+-  'desktop',
+   input: appdata + '.in',
+   output: appdata,
+   install: true,
+-- 
+GitLab
+

From b58f07500e08720ee0756af905d3a9290856ccd3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:46:01 +0100
Subject: [PATCH 0516/2561] newsflash: fix for meson 0.61

---
 srcpkgs/newsflash/patches/meson-0.61.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/newsflash/patches/meson-0.61.patch

diff --git a/srcpkgs/newsflash/patches/meson-0.61.patch b/srcpkgs/newsflash/patches/meson-0.61.patch
new file mode 100644
index 000000000000..bfc8a67d0aa8
--- /dev/null
+++ b/srcpkgs/newsflash/patches/meson-0.61.patch
@@ -0,0 +1,20 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ subdir('icons')
+ 
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('com.gitlab.newsflash.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('com.gitlab.newsflash.appdata.xml.in.in'),
+     output: '@BASENAME@',

From b613a1b9c8aeafb05e1479cc863d3291f0066bf2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 11:35:35 +0100
Subject: [PATCH 0517/2561] orc: fix for meson 0.61

---
 srcpkgs/orc/template | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template
index 36311464556b..10f306289ddf 100644
--- a/srcpkgs/orc/template
+++ b/srcpkgs/orc/template
@@ -3,8 +3,9 @@ pkgname=orc
 version=0.4.32
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled -Dtests=disabled"
-hostmakedepends="pkg-config gtk-doc"
+build_helper="gir"
+configure_args="-Dexamples=disabled -Dtests=disabled -Dgtk_doc=$(vopt_if gtk_doc enabled disabled)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
 short_desc="Oild Runtime Compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
@@ -12,6 +13,12 @@ homepage="https://cgit.freedesktop.org/gstreamer/orc"
 distfiles="http://gstreamer.freedesktop.org/src/orc/orc-${version}.tar.xz"
 checksum=a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0
 
+build_options="gtk_doc"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
 post_install() {
 	vlicense COPYING
 }
@@ -25,6 +32,8 @@ orc-devel_package() {
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove usr/share/aclocal
-		vmove usr/share/gtk-doc
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 53f98fae795ab04647db233e8452c47971c33e45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:06:25 +0100
Subject: [PATCH 0518/2561] p11-kit: fix for meson 0.61

---
 srcpkgs/p11-kit/patches/meson-0.61.patch | 42 ++++++++++++++++++++++++
 srcpkgs/p11-kit/template                 | 14 ++++++--
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/p11-kit/patches/meson-0.61.patch

diff --git a/srcpkgs/p11-kit/patches/meson-0.61.patch b/srcpkgs/p11-kit/patches/meson-0.61.patch
new file mode 100644
index 000000000000..43e75620c40e
--- /dev/null
+++ b/srcpkgs/p11-kit/patches/meson-0.61.patch
@@ -0,0 +1,42 @@
+From 9f01a8a45ba913a9b65894cef9369b6010005096 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 23:25:05 -0500
+Subject: [PATCH] gtkdoc: remove dependencies on custom target files
+
+Sadly, the `dependencies` kwarg does not actually do what it seems to be
+trying to be used for, here. It is for listing dependency or library
+objects whose compiler flags should be added to gtkdoc-scangobj.
+
+It will not actually add ninja target dependencies. The similar kwarg in
+other meson functions (e.g. genmarshal and compile_schemas) that *do*
+allow adding target dependencies, is `depend_files`.
+
+Older versions of meson simply did nothing in an if/elif/elif block
+where these custom_targets never matched anything, and were thus
+silently ignored.
+
+Meson 0.61 type-validates the arguments and rejects CustomTarget as
+invalid:
+
+```
+doc/manual/meson.build:72:8: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget | PkgConfigDependency] but should have been array[Dependency | SharedLibrary | StaticLibrary]
+```
+
+Fixes #406
+---
+ doc/manual/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/manual/meson.build b/doc/manual/meson.build
+index cf8758db..560df8db 100644
+--- a/doc/manual/meson.build
++++ b/doc/manual/meson.build
+@@ -73,7 +73,7 @@ if get_option('gtk_doc')
+               main_xml: 'p11-kit-docs.xml',
+               namespace: 'p11_kit',
+               src_dir: 'p11-kit',
+-              dependencies: libffi_deps + dlopen_deps + xml_deps,
++              dependencies: libffi_deps + dlopen_deps,
+               scan_args: [
+                 '--ignore-headers=' + ' '.join(ignore_headers),
+                 '--rebuild-types',
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index cc0b11eb720f..63cdebc7563f 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -3,8 +3,9 @@ pkgname=p11-kit
 version=0.23.22
 revision=3
 build_style=meson
+build_helper="qemu"
 configure_args="-Dlibffi=enabled -Dsystemd=disabled -Dbash_completion=disabled
- -Dgtk_doc=true -Dman=true -Dnls=true -Dtrust_module=enabled
+ -Dman=true $(vopt_bool gtk_doc gtk_doc) -Dnls=true -Dtrust_module=enabled
  -Dtrust_paths=/etc/ssl/certs/ca-certificates.crt"
 hostmakedepends="pkg-config gettext gtk-doc libxslt libtasn1-tools"
 makedepends="libtasn1-devel libffi-devel"
@@ -22,6 +23,13 @@ else
 	configure_args+=" -Dtest=false"
 fi
 
+build_options="gtk_doc"
+build_options_default=""
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
 post_install() {
 	mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example \
 		${DESTDIR}/etc/pkcs11/pkcs11.conf
@@ -38,6 +46,8 @@ p11-kit-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gtk-doc
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 6464bd756a81ba1f33f7f91cddd61f4475b06b7a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:30:51 +0100
Subject: [PATCH 0519/2561] pantheon-screenshot: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/pantheon-screenshot/patches/meson-0.61.patch

diff --git a/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8a64e9f14a5f
--- /dev/null
+++ b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,29 @@
+From 80a5d942e813dd098e1ef0f6629b81d2ccef05ae Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Thu, 13 Jan 2022 13:51:48 +0800
+Subject: [PATCH] Fix data/meson.build (#241)
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index cb2adc80..76dad525 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,7 +20,6 @@ install_data(
+ )
+ 
+ i18n.merge_file (
+-    'desktop',
+     input: 'screenshot.desktop.in',
+     output: meson.project_name() + '.desktop',
+     install: true,
+@@ -30,7 +29,6 @@ i18n.merge_file (
+ )
+ 
+ i18n.merge_file (
+-    'appdata',
+     input: 'screenshot.appdata.xml.in',
+     output: meson.project_name() + '.appdata.xml',
+     install: true,

From d6e569617424d255da3b178e5d7214275f012a38 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:33:07 +0100
Subject: [PATCH 0520/2561] polari: fix for meson 0.61

---
 srcpkgs/polari/patches/meson-0.61.patch | 43 +++++++++++++++++++++++++
 srcpkgs/polari/template                 |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/polari/patches/meson-0.61.patch

diff --git a/srcpkgs/polari/patches/meson-0.61.patch b/srcpkgs/polari/patches/meson-0.61.patch
new file mode 100644
index 000000000000..a9ed3bc58032
--- /dev/null
+++ b/srcpkgs/polari/patches/meson-0.61.patch
@@ -0,0 +1,43 @@
+From 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:32:00 +0000
+Subject: [PATCH] meson: Drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/appdata/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+
+Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/242>
+---
+ data/appdata/meson.build | 2 +-
+ data/meson.build         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 88b4a0be..781ba22f 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,5 +1,5 @@
+ appdata_name = app_id + '.appdata.xml'
+-appdata = i18n.merge_file(appdata_name,
++appdata = i18n.merge_file(
+   input: appdata_name + '.in',
+   output: appdata_name,
+   po_dir: '../../po',
+diff --git a/data/meson.build b/data/meson.build
+index cedfd57b..655ae700 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ subdir('appdata')
+ subdir('icons')
+ 
+ desktop_filename = app_id + '.desktop'
+-desktop_file = i18n.merge_file(desktop_filename,
++desktop_file = i18n.merge_file(
+   input: desktop_filename + '.in',
+   output: desktop_filename,
+   po_dir: '../po',
+-- 
+GitLab
+
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index fda5f1945375..eb7c9d2dd3df 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -12,6 +12,7 @@ short_desc="GNOME IRC client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Polari"
+changelog="https://gitlab.gnome.org/GNOME/polari/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a3b05f81660370c67c942b6f44b298c7b78816feb38c926ec2212bde22ea40eb
 

From bf7bdaf21b22f97cbfc0a95baa13b73f2bf7f28c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:35:12 +0100
Subject: [PATCH 0521/2561] shotwell: fix for meson 0.61

---
 srcpkgs/shotwell/patches/meson-0.61.patch | 27 +++++++++++++++++++++++
 srcpkgs/shotwell/template                 |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/shotwell/patches/meson-0.61.patch

diff --git a/srcpkgs/shotwell/patches/meson-0.61.patch b/srcpkgs/shotwell/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f33fa2af1637
--- /dev/null
+++ b/srcpkgs/shotwell/patches/meson-0.61.patch
@@ -0,0 +1,27 @@
+From cc328b43ebb9a54a256ec73a86fb18381b2038e6 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 21:57:26 -0500
+Subject: [PATCH] fix duplicate languages causing meson 0.61 to error out
+
+It tried to create multiple targets with the same name and generating
+the same file. On older versions of meson, this was a run_target and
+just ran twice, but was still wrong.
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index 68f089c4..5352eecd 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -6,7 +6,6 @@ es
+ fr
+ hu
+ id
+-id
+ lv
+ pt_BR
+ sv
+-- 
+GitLab
+
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index b0c1878e31bb..386644d4939e 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -14,6 +14,7 @@ short_desc="Open source photo manager for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, CC-BY-SA-3.0"
 homepage="https://wiki.gnome.org/Apps/Shotwell"
+changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
 checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2
 lib32disabled=yes

From ce0d7ada224278ba863a273ad626fded813a1398 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:36:48 +0100
Subject: [PATCH 0522/2561] simple-scan: fix for meson 0.61

---
 srcpkgs/simple-scan/patches/meson-0.61.patch | 37 ++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 srcpkgs/simple-scan/patches/meson-0.61.patch

diff --git a/srcpkgs/simple-scan/patches/meson-0.61.patch b/srcpkgs/simple-scan/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e193747322c0
--- /dev/null
+++ b/srcpkgs/simple-scan/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Tue, 16 Nov 2021 02:43:11 +0800
+Subject: [PATCH] Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0 where
+it fails with "ERROR: Function does not take positional arguments".
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2b5a0ee3..cf6e4ae1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
+               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
+ meson.add_install_script ('meson_compile_gschema.py')
+ 
+-i18n.merge_file ('desktop-file',
+-                 input: 'simple-scan.desktop.in',
++i18n.merge_file (input: 'simple-scan.desktop.in',
+                  output: 'simple-scan.desktop',
+                  install: true,
+                  install_dir: join_paths (datadir, 'applications'),
+                  po_dir: '../po',
+                  type: 'desktop')
+ 
+-i18n.merge_file ('appdata-file',
+-                 input: 'simple-scan.appdata.xml.in',
++i18n.merge_file (input: 'simple-scan.appdata.xml.in',
+                  output: 'simple-scan.appdata.xml',
+                  install: true,
+                  install_dir: join_paths (datadir, 'metainfo'),
+-- 
+GitLab
+

From 0660cfa3c5cd23b589bc7f95523498dabbdf7168 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:39:25 +0100
Subject: [PATCH 0523/2561] sound-juicer: fix for meson 0.61

---
 srcpkgs/sound-juicer/patches/meson-0.61.patch | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/sound-juicer/patches/meson-0.61.patch

diff --git a/srcpkgs/sound-juicer/patches/meson-0.61.patch b/srcpkgs/sound-juicer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..662b7d631f61
--- /dev/null
+++ b/srcpkgs/sound-juicer/patches/meson-0.61.patch
@@ -0,0 +1,35 @@
+From 9f97ca1faca396099f52264a9729aa355f8d122e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 25 Jan 2022 12:15:31 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:31:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index ccff2d80..4dac8166 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,5 @@
+ # Desktop file
+ i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+     input: 'org.gnome.SoundJuicer.desktop.in.in',
+     output: 'org.gnome.SoundJuicer.desktop.in',
+@@ -29,7 +28,6 @@ configure_file(
+ 
+ # Metainfo
+ metainfo_file = i18n.merge_file(
+-  'metainfo',
+   input: files(join_paths('metainfo', 'org.gnome.SoundJuicer.metainfo.xml.in')),
+   output: 'org.gnome.SoundJuicer.metainfo.xml',
+   po_dir: po_dir,
+-- 
+GitLab
+

From b7d208a52dde3917d5915c33862e05b249693852 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:40:28 +0100
Subject: [PATCH 0524/2561] switchboard: fix for meson 0.61

---
 srcpkgs/switchboard/patches/meson-0.61.patch | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/switchboard/patches/meson-0.61.patch

diff --git a/srcpkgs/switchboard/patches/meson-0.61.patch b/srcpkgs/switchboard/patches/meson-0.61.patch
new file mode 100644
index 000000000000..cf29004ec332
--- /dev/null
+++ b/srcpkgs/switchboard/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+From ecf2a6c42122946cc84150f6927ef69c1f67c909 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 01:58:44 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#226)
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c456813..109554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ po_extra_dir = join_paths(meson.source_root(), 'po', 'extra')
+-i18n.merge_file('desktop',
++i18n.merge_file(
+     input: 'io.elementary.switchboard.desktop.in',
+     output: 'io.elementary.switchboard.desktop',
+     install: true,
+@@ -8,7 +8,7 @@ i18n.merge_file('desktop',
+     type: 'desktop'
+ )
+ 
+-i18n.merge_file('appdata',
++i18n.merge_file(
+     input: 'io.elementary.switchboard.appdata.xml.in',
+     output: 'io.elementary.switchboard.appdata.xml',
+     install: true,

From 7152f9055ad5b83a5a2e62508dcfeebcc833c6e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:05:03 +0100
Subject: [PATCH 0525/2561] tau: fix for meson 0.61

---
 srcpkgs/tau/patches/meson-0.61.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/tau/patches/meson-0.61.patch

diff --git a/srcpkgs/tau/patches/meson-0.61.patch b/srcpkgs/tau/patches/meson-0.61.patch
new file mode 100644
index 000000000000..d7ec3e3365bb
--- /dev/null
+++ b/srcpkgs/tau/patches/meson-0.61.patch
@@ -0,0 +1,17 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,4 +1,4 @@
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Tau.desktop.in.in'),
+@@ -22,7 +22,7 @@ if desktop_file_validate.found()
+     )
+ endif
+ 
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Tau.appdata.xml.in.in'),
+     output: 'org.gnome.Tau.appdata.xml.in',

From 8ce6fb7ff5ad7a152e588b8ced87641415909efc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 14:28:48 +0100
Subject: [PATCH 0526/2561] tilix: fix for meson 0.61

---
 srcpkgs/tilix/patches/meson-0.61.patch | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/tilix/patches/meson-0.61.patch

diff --git a/srcpkgs/tilix/patches/meson-0.61.patch b/srcpkgs/tilix/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c35c8d08ad05
--- /dev/null
+++ b/srcpkgs/tilix/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 7cb2c59a31891f6463d1b181f1ec461c9352d782 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 22 Feb 2022 12:06:23 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file() (#2081)
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:13:0: ERROR: Function does not take positional arguments.
+data/meson.build:46:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 81e9b410..c8b23e1b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -11,7 +11,6 @@ install_data(
+ 
+ # Install the desktop file
+ desktop_file = i18n.merge_file(
+-    '@0@.desktop'.format(project_id),
+     output: '@BASENAME@',
+     input: 'pkg/desktop/@0@.desktop.in'.format(project_id),
+     po_dir: meson.source_root() / 'po',
+@@ -44,7 +43,6 @@ metainfo_with_releases = custom_target('metainfo-news-merge',
+ 
+ # Install the MetaInfo file
+ metainfo_file = i18n.merge_file(
+-    tilix_metainfo_name,
+     output: tilix_metainfo_name,
+     input: metainfo_with_releases,
+     po_dir: meson.source_root() / 'po',

From 20b512e7f9b9c82ae000c067331a8952f6de0b47 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:09:00 +0100
Subject: [PATCH 0527/2561] totem: fix for meson 0.61

---
 srcpkgs/totem/patches/meson-0.61.patch | 39 ++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 srcpkgs/totem/patches/meson-0.61.patch

diff --git a/srcpkgs/totem/patches/meson-0.61.patch b/srcpkgs/totem/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8f05c5c7a015
--- /dev/null
+++ b/srcpkgs/totem/patches/meson-0.61.patch
@@ -0,0 +1,39 @@
+From 61e3a957cb7339c6614e764fcf1120d967d687e9 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 6 Jan 2022 17:21:28 +0100
+Subject: [PATCH] build: Remove unused i18n.merge_file() "name"
+
+data/meson.build:78:0: ERROR: Function does not take positional arguments.
+data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments.
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build         | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index c4d17e927..c2e646327 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ appdata = 'org.gnome.Totem.appdata.xml'
+ 
+ appdata_file = i18n.merge_file (
+-    'appdata',
+     input: appdata + '.in',
+     output: appdata,
+     install: true,
+diff --git a/data/meson.build b/data/meson.build
+index b31ce755c..8eebe3db1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -76,7 +76,6 @@ desktop_in = configure_file(
+ )
+ 
+ desktop_file = i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop_in,
+     output: desktop,
+-- 
+GitLab
+

From 8ff24b774c18a43930ea31840dc9cc983b501d31 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:14:03 +0100
Subject: [PATCH 0528/2561] virt-viewer: fix for meson 0.61

---
 srcpkgs/virt-viewer/patches/meson-0.61.patch | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/virt-viewer/patches/meson-0.61.patch

diff --git a/srcpkgs/virt-viewer/patches/meson-0.61.patch b/srcpkgs/virt-viewer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0b900e1f2128
--- /dev/null
+++ b/srcpkgs/virt-viewer/patches/meson-0.61.patch
@@ -0,0 +1,26 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ if host_machine.system() != 'windows'
+   desktop = 'remote-viewer.desktop'
+ 
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -14,7 +13,6 @@ if host_machine.system() != 'windows'
+   mimetypes = 'virt-viewer-mime.xml'
+ 
+   i18n.merge_file (
+-    mimetypes,
+     type: 'xml',
+     input: mimetypes + '.in',
+     output: mimetypes,
+@@ -27,7 +25,6 @@ if host_machine.system() != 'windows'
+   metainfo = 'remote-viewer.appdata.xml'
+ 
+   i18n.merge_file (
+-    metainfo,
+     type: 'xml',
+     input: metainfo + '.in',
+     output: metainfo,

From 27a3ca00a56c79147a36530db7cdff6fe5f32e7a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:45:18 +0100
Subject: [PATCH 0529/2561] janet: update to 1.21.0.

---
 srcpkgs/janet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index d7a6b871124f..30c4dc43db48 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.20.0
+version=1.21.0
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=cc2e617e2bdffaeca0fc330c890c73a83e2211b4ff65555d58973c47376bf5b1
+checksum=8e53efcdeda9b7519248bef5f0e744ad947e013b14960c66ba75967c5fb0a7fd
 
 post_install() {
 	vlicense LICENSE

From ea9b96920b641bfe3b04e5d0ab1b9b5e6d5446bb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:50:01 +0100
Subject: [PATCH 0530/2561] stress-ng: update to 0.13.12.

---
 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 5f94f17799ca..d13629b279bc 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.13.11
+version=0.13.12
 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="https://github.com/ColinIanKing/stress-ng/"
 distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=b7327cd0d01e331541648a545ec5a69c33202659afc26a8602042399e1fd4fdd
+checksum=16540d9cfa80d6a274fc0238d7251675ee38df6d5be805d14a67ce9efcb59ce9

From 237ea5dd655c3168da60723652f3587e62540e6d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:50:45 +0100
Subject: [PATCH 0531/2561] iana-etc: update to 20220325.

---
 srcpkgs/iana-etc/files/services | 7 +++++--
 srcpkgs/iana-etc/template       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index 511b3346bea4..94b9380da4f7 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -7628,6 +7628,7 @@ dsmipv6          4191/udp
 azeti            4192/tcp
 azeti-bd         4192/udp
 pvxplusio        4193/tcp
+spdm             4194/tcp
 aws-wsp          4195/tcp
 aws-wsp          4195/udp
 aws-wsp          4195/sctp
@@ -7664,6 +7665,8 @@ perrla           4313/tcp
 choiceview-agt   4314/tcp
 choiceview-clt   4316/tcp
 opentelemetry    4317/tcp
+fox-skytale      4319/tcp
+fox-skytale      4319/udp
 fdt-rcatp        4320/tcp
 fdt-rcatp        4320/udp
 rwhois           4321/tcp
@@ -8249,8 +8252,6 @@ strexec-s        5027/udp
 qvr              5028/tcp
 infobright       5029/tcp
 infobright       5029/udp
-surfpass         5030/tcp
-surfpass         5030/udp
 dmp              5031/udp
 signacert-agent  5032/tcp
 jtnetd-server    5033/tcp
@@ -9973,6 +9974,7 @@ espeech          8416/udp
 espeech-rtp      8417/tcp
 espeech-rtp      8417/udp
 aritts           8423/tcp
+pgbackrest       8432/tcp
 cybro-a-bus      8442/tcp
 cybro-a-bus      8442/udp
 pcsync-https     8443/tcp
@@ -11329,6 +11331,7 @@ ng-control      38412/sctp
 xn-control      38422/sctp
 e1-interface    38462/sctp
 f1-control      38472/sctp
+psqlmws         38638/tcp
 sruth           38800/tcp
 secrmmsafecopya 38865/tcp
 vroa            39063/tcp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index aca09e0e1e4b..e4d7a60c37cb 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=20211229
+version=20220325
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"

From 17e46d07e1642fd75ece91fa5b3ca38aaca321a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:54:12 +0100
Subject: [PATCH 0532/2561] coq: update to 8.15.1.

---
 srcpkgs/coq/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index b7ddbfe70a39..fcfbc92cb2f6 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,14 +1,14 @@
 # Template file for 'coq'
 pkgname=coq
-version=8.15.0
-revision=2
+version=8.15.1
+revision=1
 hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
 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=73466e61f229b23b4daffdd964be72bd7a110963b9d84bd4a86bb05c5dc19ef3
+checksum=513e953b7183d478acb75fd6e80e4dc32ac1a918cf4343ac31a859cfb4e9aad2
 nopie=yes
 nocross=yes
 

From ba7ce118edf45f4f71471808355654a6e993cffe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 14:04:06 +0100
Subject: [PATCH 0533/2561] erlang: update to 24.3.2.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index fc8bd893714e..d59eeb464e74 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.2.2
+version=24.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=b6adfc0bf14d94348146ae26cc38d09dca545f8e14ebab7ddcf9482a6e8d1162
+checksum=cdc9cf788d28a492eb6b24881fbd06a0a5c785dc374ad415b3be1db96326583c
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 8d8dec12ac11f1239652664ae03a6b4f01bbd585 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 15:38:16 +0100
Subject: [PATCH 0534/2561] python3-pipenv: update to 2022.3.24.

---
 srcpkgs/python3-pipenv/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index cae723465c04..4d0f0ec7e283 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.1.8
+version=2022.3.24
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -10,8 +10,9 @@ short_desc="Python Development Workflow for Humans"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/pypa/pipenv"
+changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=f84d7119239b22ab2ac2b8fbc7d619d83cf41135206d72a17c4f151cda529fd0
+checksum=800198d430e724f899e6db319cc640d5fd6da2acdbc301ceb1a1f967e990428b
 conflicts="python-pipenv>=0"
 
 post_extract() {
@@ -20,7 +21,4 @@ post_extract() {
 
 post_install() {
 	vlicense LICENSE
-	# remove files only valid for Python 2
-	rm -rf ${DESTDIR}/${py3_sitelib}/pipenv/patched/yaml2
-	rm -f ${DESTDIR}/${py3_sitelib}/pipenv/vendor/importlib_resources/_py2.py
 }

From 5bcdc745b69d6300e9ae03c654d6359c5ae34b3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 15:23:00 +0100
Subject: [PATCH 0535/2561] .github: improve the PR template

* avoid confusion with [skip CI] and [ci skip]
---
 .github/pull_request_template.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index cc4b5721590e..ef2a5d7637aa 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,7 +8,8 @@
 - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
 -->
 
-<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
+<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
+https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
 and test at least one native build and, if supported, at least one cross build.
 Ignore this section if this PR is not skipping CI.
 -->

From 1873930d24aaa3bcb9e81df12141a2b0c1265385 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 21:58:04 +0100
Subject: [PATCH 0536/2561] glib: update to 2.72.0.

---
 .../glib/patches/disable-broken-tests.patch   | 54 ++++++------
 srcpkgs/glib/patches/fix-formatd.patch        | 86 -------------------
 srcpkgs/glib/template                         |  6 +-
 3 files changed, 29 insertions(+), 117 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index c6bb8d96fadf..2a5263007503 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
+@@ -56,7 +56,6 @@ gio_tests = {
+     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
+     'should_fail' : host_system == 'darwin',
+   },
 -  'converter-stream' : {},
    'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+@@ -91,7 +90,6 @@ gio_tests = {
    'network-monitor' : {},
    'network-monitor-race' : {},
    'permission' : {},
@@ -16,15 +16,15 @@
    'power-profile-monitor' : {},
    'proxy-test' : {},
    'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
+@@ -174,7 +172,6 @@ endif
  #  Test programs buildable on UNIX only
  if host_machine.system() != 'windows'
    gio_tests += {
 -    'file' : {},
      'gdbus-peer' : {
        'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+       'install_rpath' : installed_tests_execdir,
+@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
        test_resources_binary2,
      ]
    endif
@@ -32,6 +32,8 @@
 -  gio_tests += {
 -    'resources' : {
 -      'extra_sources' : resources_extra_sources,
+-      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+-      'should_fail' : host_system == 'darwin',
 -    },
 -  }
  endif
@@ -39,29 +41,33 @@
  foreach test_name, extra_args : gio_tests
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,25 +11,17 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
+   'completion' : {},
    'cond' : {},
 -  'convert' : {},
    'cxx' : {
      'source' : ['cxx.cpp'],
    },
    'dataset' : {},
--  'date' : {},
+-  'date' : {
+-    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+-    'should_fail' : host_system == 'darwin',
+-  },
    'dir' : {},
-   'environment' : {},
+   'environment' : {
+     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+     'should_fail' : host_system == 'darwin',
+   },
 -  'error' : {},
-   'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
+-  'fileutils' : {},
+   'gdatetime' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+   },
+@@ -65,7 +57,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -69,11 +75,3 @@
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
-   'thread' : {},
-   'thread-pool' : {},
-   'timeout' : {},
--  'timer' : {},
-   'tree' : {},
-   'utf8-performance' : {},
-   'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
- 
- const guint16 * const g_ascii_table = ascii_table_data;
- 
--#if defined (HAVE_NEWLOCALE) && \
--    defined (HAVE_USELOCALE) && \
--    defined (HAVE_STRTOD_L) && \
--    defined (HAVE_STRTOULL_L) && \
--    defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+    defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
- 
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
-                 gchar      **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
- 
-   g_return_val_if_fail (nptr != NULL, 0);
- 
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
- #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
- 
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
- 
- static guint64
- g_parse_long_long (const gchar  *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
-     }
-   return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
- 
- /**
-  * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
-                   gchar      **endptr,
-                   guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
-   return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
-                  gchar      **endptr,
-                  guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
-   return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
--- 
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..d301dadb8990 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.2
+version=2.72.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -15,9 +15,9 @@ 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/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 9f1ee5def4372c7c1388054d7076d64c53bd13b5 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Thu, 3 Mar 2022 10:48:23 +0700
Subject: [PATCH 0537/2561] New package: upterm-0.7.6

---
 srcpkgs/upterm/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/upterm/template

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
new file mode 100644
index 000000000000..362f919c40ef
--- /dev/null
+++ b/srcpkgs/upterm/template
@@ -0,0 +1,21 @@
+# Template file for 'upterm'
+pkgname=upterm
+version=0.7.6
+revision=1
+build_style=go
+go_import_path="github.com/owenthereal/upterm"
+go_package="${go_import_path}/cmd/upterm"
+short_desc="Secure Terminal Sharing"
+maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
+license="Apache-2.0"
+homepage="https://github.com/owenthereal/upterm/"
+distfiles="https://github.com/owenthereal/upterm/archive/refs/tags/v$version.tar.gz"
+checksum=26ceb5eee035d4e1a08240aced75a20f2e54b1e192eef0bf5eb51d0195997f8c
+
+post_install() {
+	vcompletion etc/completion/upterm.zsh_completion zsh
+	vcompletion etc/completion/upterm.bash_completion.sh bash
+	for man in etc/man/man1/*.1; do
+		vman "${man}"
+	done
+}

From c7771ed62bb28849ea546867e348e747b4e93501 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Mar 2022 19:00:12 +0100
Subject: [PATCH 0538/2561] brasero: update to 3.12.3.

---
 srcpkgs/brasero/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index 9083a2ccb689..da86c9a66699 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
-version=3.12.2
-revision=6
+version=3.12.3
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -13,9 +13,10 @@ depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-
 short_desc="Application to burn CD/DVD for the Gnome Desktop"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/projects/brasero"
+homepage="https://wiki.gnome.org/Apps/Brasero"
+changelog="https://gitlab.gnome.org/GNOME/brasero/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
+checksum=87749eae33a141207d1b00be233b6d8045982ed3249ed4b98dae1f3a975fea15
 
 # Package build options
 build_options="gir"

From 539d964d8922993e5294b12f04f7ebec99c3ce3f Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sat, 26 Mar 2022 00:58:53 +0100
Subject: [PATCH 0539/2561] gitea: update to 1.16.5

---
 srcpkgs/gitea/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index f9eaa1b18732..c8b9b361ce2d 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.16.4
+version=1.16.5
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -30,9 +30,9 @@ short_desc="Git with a cup of Tea"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://gitea.io"
-changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
-distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=ef396b797d39a64867dfcd4532043c363dce3fe054afaa37bb97f8a2ea3f2a18
+changelog="https://raw.githubusercontent.com/go-gitea/gitea/main/CHANGELOG.md"
+distfiles="https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"
+checksum=d9aab2e8357ca1a22eaffb328356e4e355a8f851a4de6fb4e7eb54ca80f0187b
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From 01299f7549ff8adbceea65388954c26baebbb5c8 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 22 Mar 2022 11:44:40 -0400
Subject: [PATCH 0540/2561] helvum: clean up patch/template

upstream released pipewire-rs v0.5.0 that fixes the underlying issue,
but the Cargo.toml version requirement didn't allow it to be updated.
---
 srcpkgs/helvum/patches/i686-pipewire.patch | 33 +++++++---------------
 srcpkgs/helvum/template                    | 23 ++-------------
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
index 17f0f17f8875..bd08b0e217b3 100644
--- a/srcpkgs/helvum/patches/i686-pipewire.patch
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -1,24 +1,11 @@
-From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
-From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
-Date: Thu, 11 Nov 2021 11:41:09 +0000
-Subject: A possible fix for issue #27
-
----
- pipewire/src/loop_.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/helvum-0.3.4/pipewire/src/loop_.rs b/helvum-0.3.4/pipewire/src/loop_.rs
-index 3e0d9bd..353025f 100644
---- a/helvum-0.3.4/pipewire/src/loop_.rs
-+++ b/helvum-0.3.4/pipewire/src/loop_.rs
-@@ -411,7 +411,7 @@ where
-         fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
-             spa_sys::timespec {
-                 tv_sec: duration.as_secs().try_into().expect("Duration too long"),
--                tv_nsec: duration.subsec_nanos().into(),
-+                tv_nsec: duration.subsec_nanos().try_into().unwrap(),
-             }
-         }
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -14,7 +14,7 @@
+ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+ 
+ [dependencies]
+-pipewire = "0.4"
++pipewire = "0.5"
+ gtk = { version = "0.4.1", package = "gtk4" }
+ glib = { version = "0.15.1", features = ["log"] }
  
--- 
-
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 49ad2dd6013a..5a694dc43c29 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -1,12 +1,8 @@
 # Template file for 'helvum'
 pkgname=helvum
 version=0.3.4
-revision=1
-create_wrksrc=yes
-build_wrksrc="${pkgname}-${version}"
-_pipewire_rs_version=0.4.1
+revision=2
 build_style=cargo
-build_helper=rust
 hostmakedepends="pkg-config clang libclang"
 makedepends="gtk4-devel pipewire-devel glib-devel"
 depends="pipewire"
@@ -14,21 +10,8 @@ short_desc="GTK patchbay for pipewire"
 maintainer="classabbyamp <dev@kb6.ee>"
 license="GPL-3.0-only"
 homepage="https://gitlab.freedesktop.org/pipewire/helvum"
-distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz
- https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/archive/v${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
-checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
- 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
-
-# XXX: this should not be necessary once the next version of the pipewire crate has been released
-post_extract() {
-	pushd $build_wrksrc
-	echo "[patch.crates-io]" >> Cargo.toml
-	for crate in pipewire pipewire-sys libspa libspa-sys; do
-		mv ../pipewire-rs-*/$crate $crate
-		echo "$crate = { path = './$crate' }" >> Cargo.toml
-	done
-	popd
-}
+distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02"
 
 post_install() {
 	# Normally, meson would do this, but it's simpler to use the cargo build style and do this manually

From 3b75ee1aba87d9bfc0b5961a832cf74a58beb1ca Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 26 Mar 2022 14:28:28 -0400
Subject: [PATCH 0541/2561] pijul: remove unnecessary build_helper

---
 srcpkgs/pijul/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 581d77789c9c..53fb1c83ebe5 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -3,7 +3,6 @@ pkgname=pijul
 version=0.12.2
 revision=5
 build_style=cargo
-build_helper=rust
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
 makedepends="libsodium-devel openssl-devel nettle-devel"

From a85dda2b3ea474155b9fcdcfb573b4abcc6a8054 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 26 Mar 2022 14:29:26 -0400
Subject: [PATCH 0542/2561] rdedup: remove unnecessary build_helper

---
 srcpkgs/rdedup/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 6bd71cacfc46..0e67d278ca06 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -3,7 +3,6 @@ pkgname=rdedup
 version=3.2.1
 revision=1
 build_style=cargo
-build_helper=rust
 hostmakedepends="pkg-config clang"
 makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"

From 20908c2bc94515ffb23b4d58a15cbd40f42fa851 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sat, 19 Mar 2022 18:33:15 +0700
Subject: [PATCH 0543/2561] New package: v2ray-4.44.0

---
 srcpkgs/v2ray/files/v2ray/run                 |  3 ++
 ...equest-API-changed-since-go1.17-1370.patch | 47 +++++++++++++++++
 srcpkgs/v2ray/template                        | 52 +++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..3b1ac46ab240
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch b/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch
new file mode 100644
index 000000000000..2a35b075f0a0
--- /dev/null
+++ b/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch
@@ -0,0 +1,47 @@
+From 77b88171d6bd837b76a5ad6e6b23689391530ed6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E6=9C=B1=E8=81=96=E9=BB=8E=20=28Zhu=20Sheng=20Li=29?=
+ <digglife@gmail.com>
+Date: Sat, 6 Nov 2021 22:09:26 +0800
+Subject: [PATCH] fix: readRequest API changed since go1.17 (#1370)
+
+fixed: #1265
+---
+ transport/internet/headers/http/http.go              | 4 ++--
+ transport/internet/headers/http/linkedreadRequest.go | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/transport/internet/headers/http/http.go b/transport/internet/headers/http/http.go
+index c73f7a63..54611889 100644
+--- a/transport/internet/headers/http/http.go
++++ b/transport/internet/headers/http/http.go
+@@ -90,7 +90,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) {
+ 			buffer.Clear()
+ 			copy(buffer.Extend(lenEnding), leftover)
+ 
+-			if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != io.ErrUnexpectedEOF {
++			if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != io.ErrUnexpectedEOF {
+ 				return nil, err
+ 			}
+ 		}
+@@ -110,7 +110,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) {
+ 	}
+ 
+ 	// Parse the request
+-	if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != nil {
++	if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != nil {
+ 		return nil, err
+ 	} else { // nolint: golint
+ 		h.req = req
+diff --git a/transport/internet/headers/http/linkedreadRequest.go b/transport/internet/headers/http/linkedreadRequest.go
+index 35154b87..45773312 100644
+--- a/transport/internet/headers/http/linkedreadRequest.go
++++ b/transport/internet/headers/http/linkedreadRequest.go
+@@ -9,4 +9,4 @@ import (
+ )
+ 
+ //go:linkname readRequest net/http.readRequest
+-func readRequest(b *bufio.Reader, deleteHostHeader bool) (req *http.Request, err error)
++func readRequest(b *bufio.Reader) (req *http.Request, err error)
+-- 
+2.33.1
+
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..cf6cd28a534a
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,52 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.44.0
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-X github.com/v2fly/v2ray-core/v4.codename=$pkgname -X github.com/v2fly/v2ray-core/v4.version=$version -X github.com/v2fly/v2ray-core/v4.build=$SOURCE_DATE_EPOCH -s -w -buildid="
+short_desc="Platform for building proxies to bypass network restrictions"
+maintainer="ipkalm <ipkalm@outlook.com>"
+license="MIT"
+homepage="https://github.com/v2fly/v2ray-core"
+distfiles="https://github.com/v2fly/v2ray-core/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=d9973bafd3020f60a51fa3495b24ab417b08b3c8f9539a3748d00da6c68d0103
+conf_files="/etc/v2ray/config.json"
+
+system_accounts="_v2ray"
+
+export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+export CGO_ENABLED=0
+
+do_build() {
+	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
+	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ctl" -tags "confonly" ./infra/control/main
+}
+
+do_check() {
+	local pkgs=$(go list ./... | grep -v \
+		-e 'app/dns$' \
+		-e 'app/stats$' \
+		-e 'app/router$' \
+		-e 'app/router/command$' \
+		-e 'common/task$' \
+		-e 'common/signal$' \
+		-e 'testing/scenarios$' \
+		-e 'proxy/vmess$' \
+		-e 'transport/pipe$' \
+		-e 'transport/internet/websocket$' \
+		-e 'transport/internet/quic$' \
+		-e 'v4/infra/conf/rule$' \
+		-e 'v4/infra/conf/geodata/memconservative$' \
+		-e 'v4/transport/internet/kcp$' \
+		)
+	go test $pkgs
+}
+
+post_install() {
+	vlicense LICENSE
+	vmkdir etc/v2ray
+	vcopy release/config/*.json etc/v2ray/
+	vsv v2ray
+}

From 00d9d5adc7ecbf1a8de1fdd16bfdce8fb44de08c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 20:54:02 +0100
Subject: [PATCH 0544/2561] nq: update to 0.5.

---
 srcpkgs/nq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nq/template b/srcpkgs/nq/template
index 67e1d96222a6..7dcc1c03af98 100644
--- a/srcpkgs/nq/template
+++ b/srcpkgs/nq/template
@@ -1,6 +1,6 @@
 # Template file for 'nq'
 pkgname=nq
-version=0.4
+version=0.5
 revision=1
 build_style=gnu-makefile
 short_desc="Unix command line queue utility"
@@ -8,4 +8,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/leahneukirchen/nq"
 distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
-checksum=287d6700063b64cfa9db51df95e2a046736eb38c0d3b6e0af0a8e7da6df8880b
+checksum=3f01aaf0b8eee4f5080ed1cd71887cb6485d366257d4cf5470878da2b734b030

From 0fd79e6fb17c82f5c6c9a8dc36bd8f6c64b2b566 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 20:58:32 +0100
Subject: [PATCH 0545/2561] ii: update to 1.9.

Adopted.
---
 srcpkgs/ii/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ii/template b/srcpkgs/ii/template
index 13a7ef62682e..5ef7a1d6b9e7 100644
--- a/srcpkgs/ii/template
+++ b/srcpkgs/ii/template
@@ -1,20 +1,21 @@
 # Template file for 'ii'
 pkgname=ii
-version=1.8
-revision=4
+version=1.9
+revision=1
 build_style=gnu-makefile
 make_build_args="INCLUDES=-I. LIBS="
 short_desc="Minimalist FIFO IRC client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
-distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
-checksum=b9d9e1eae25e63071960e921af8b217ab1abe64210bd290994aca178a8dc68d2
+homepage="https://tools.suckless.org/ii"
+distfiles="https://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
+checksum=850cb323b583d261b51bda9993ee733334352a8e6ca1e2f02b57c154bf568c17
 
 pre_build() {
 	sed -i 's| -O0||g' config.mk
 	sed -i 's|^CFLAGS *=|override CFLAGS +=|g' config.mk
 	sed -i 's|^LDFLAGS *=|override LDFLAGS +=|g' config.mk
+	sed -i 's|^LIBS *=|override LIBS +=|g' config.mk
 }
 
 post_install() {

From 1cd3de4f8d7c6c9c24f7be8c4ae3d05aa9ddef0a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 26 Mar 2022 22:02:47 +0100
Subject: [PATCH 0546/2561] chromium: update to 99.0.4844.84.

---
 srcpkgs/chromium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 2708747046d7..f6154e223751 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=99.0.4844.51
+version=99.0.4844.84
 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="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=97c52e57eca0dc8b752d274047f38c88aaa86036c0587b26b056efbd3fb2bae3
+checksum=20ec184ed34bdc7e660ccf6c007b2db37007de423b3a5a51698a96aa29527515
 
 lib32disabled=yes
 

From a46c2f90b79167a0b0762e73d55bcc4bc7432c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 5 Oct 2021 23:05:33 +0200
Subject: [PATCH 0547/2561] New package: bees-0.7

---
 .../0001-don-t-run-tests-unless-asked.patch   | 44 +++++++++++++++
 .../patches/0002-move-sbin-into-bin.patch     | 37 +++++++++++++
 ...0003-start-work-on-cross-compilation.patch | 54 +++++++++++++++++++
 srcpkgs/bees/patches/series                   |  2 +
 srcpkgs/bees/template                         | 28 ++++++++++
 5 files changed, 165 insertions(+)
 create mode 100644 srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
 create mode 100644 srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
 create mode 100644 srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
 create mode 100644 srcpkgs/bees/patches/series
 create mode 100644 srcpkgs/bees/template

diff --git a/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
new file mode 100644
index 000000000000..4b1431b45873
--- /dev/null
+++ b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
@@ -0,0 +1,44 @@
+From e139a679d7cc3f04ad001054a6b1815b7afc92e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:04:15 +0200
+Subject: [PATCH 1/3] don't run tests unless asked
+
+---
+ Makefile | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9c840c4..d4c241e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,16 +14,12 @@ BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN)
+ 
+ DEFAULT_MAKE_TARGET ?= reallyall
+ 
+-ifeq ($(DEFAULT_MAKE_TARGET),reallyall)
+-	RUN_INSTALL_TESTS = test
+-endif
+-
+ include Defines.mk
+ 
+ default: $(DEFAULT_MAKE_TARGET)
+ 
+ all: lib src scripts
+-reallyall: all doc test
++reallyall: all doc
+ 
+ clean: ## Cleanup
+ 	git clean -dfx -e localconf
+@@ -55,7 +51,7 @@ install_tools: src
+ 	install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
+ 
+ install_bees: ## Install bees + libs
+-install_bees: src $(RUN_INSTALL_TESTS)
++install_bees: src
+ 	install -Dm755 bin/bees	$(DESTDIR)$(LIBEXEC_PREFIX)/bees
+ 
+ install_scripts: ## Install scipts
+-- 
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
new file mode 100644
index 000000000000..3d3b7fe22291
--- /dev/null
+++ b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
@@ -0,0 +1,37 @@
+From fc133aa8647fe34a41c70bd5915c7f7f655d3160 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:05:15 +0200
+Subject: [PATCH 2/3] move sbin/* into bin/*
+
+Void does not distinguis between bin and sbin, but this patch will
+likely not be upstreamable.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d4c241e..2694e78 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@ scripts: scripts/beesd scripts/beesd@.service
+ install_tools: ## Install support tools + libs
+ install_tools: src
+ 	install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
+-	install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
++	install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/bin/fiewalk
+ 
+ install_bees: ## Install bees + libs
+ install_bees: src
+@@ -56,7 +56,7 @@ install_bees: src
+ 
+ install_scripts: ## Install scipts
+ install_scripts: scripts
+-	install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd
++	install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd
+ 	install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample
+ ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),)
+ 	install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service
+-- 
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
new file mode 100644
index 000000000000..30f758460754
--- /dev/null
+++ b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
@@ -0,0 +1,54 @@
+From be64a6e50987dba582d8704d62cb1f9a3577645d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:06:54 +0200
+Subject: [PATCH 3/3] start work on cross compilation
+
+The tests have to be run on the host, so these shouldn't be cross
+compiled. This patch is not done yet, but it's included here anyway, so
+that whoever wants to continue on it doesn't have to start from scratch.
+---
+ makeflags     | 3 +++
+ test/Makefile | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/makeflags b/makeflags
+index c5b6951..29e0430 100644
+--- a/makeflags
++++ b/makeflags
+@@ -11,3 +11,6 @@ CCFLAGS += -I../include -D_FILE_OFFSET_BITS=64
+ 
+ BEES_CFLAGS   = $(CCFLAGS) -std=c99 $(CFLAGS)
+ BEES_CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast $(CXXFLAGS)
++
++BEES_CFLAGS_FOR_BUILD   = $(CCFLAGS_FOR_BUILD) -std=c99 $(CFLAGS_FOR_BUILD)
++BEES_CXXFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c++11 -Wold-style-cast $(CXXFLAGS_FOR_BUILD)
+diff --git a/test/Makefile b/test/Makefile
+index ae66a7c..3c70244 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -24,7 +24,7 @@ BEES_LDFLAGS = -L../lib $(LDFLAGS)
+ 	mkdir -p $@
+ 
+ .depends/%.dep: %.cc tests.h Makefile | .depends
+-	$(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
++	$(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) -M -MF $@ -MT $(<:.cc=.o) $<
+ 
+ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ 	cat $^ > $@.new
+@@ -33,10 +33,10 @@ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ include depends.mk
+ 
+ $(PROGRAMS:%=%.o): %.o: %.cc ../makeflags Makefile
+-	$(CXX) $(BEES_CXXFLAGS) -o $@ -c $<
++	$(CXX_FOR_BUILD) $(BEES_CXXFLAG_FOR_BUILDS) -o $@ -c $<
+ 
+ $(PROGRAMS): %: %.o ../makeflags Makefile ../lib/libcrucible.a
+-	$(CXX) $(BEES_CXXFLAGS) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
++	$(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
+ 
+ %.txt: % Makefile FORCE
+ 	./$< >$@ 2>&1 || (RC=$$?; cat $@; exit $$RC)
+-- 
+2.35.1
+
diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series
new file mode 100644
index 000000000000..d9a2837128f2
--- /dev/null
+++ b/srcpkgs/bees/patches/series
@@ -0,0 +1,2 @@
+0001-don-t-run-tests-unless-asked.patch
+0002-move-sbin-into-bin.patch
diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
new file mode 100644
index 000000000000..c9184f593e87
--- /dev/null
+++ b/srcpkgs/bees/template
@@ -0,0 +1,28 @@
+# Template file for 'bees'
+pkgname=bees
+version=0.7
+revision=1
+archs="~*-musl"
+build_style=gnu-makefile
+make_check_target="test"
+hostmakedepends="pkg-config"
+depends="btrfs-progs"
+short_desc="Best-Effort Extent-Same, a btrfs deduplication agent"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Zygo/bees"
+distfiles="https://github.com/Zygo/bees/archive/refs/tags/v${version}.tar.gz"
+checksum=2e67422b9f0d9ef665523b474fb27055efffceb263f8ccfdfda2a3aac9c6bdb1
+
+if [ "$CROSS_BUILD" ]; then
+# Tests don't work properly with cross compilation, because it doesn't
+# differentiate between host and target compilers correctly.
+#
+# There is a patch included which starts working on this, but I couldn't get it
+# to work properly, so it's not being applied right now.
+	make_check="no"
+fi
+
+pre_build() {
+	export BEES_VERSION="${version}"
+}

From b81deff4a68b0297a51a6177e4ca1d29ab108a3e Mon Sep 17 00:00:00 2001
From: KushBlazingJudah <59340248+KushBlazingJudah@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:34:01 -0300
Subject: [PATCH 0548/2561] wob: update to 0.13.

---
 srcpkgs/wob/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..6b68df4a5eff 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.13
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=555965ba2b4e5fa67c8342e42f7ccd5eea7c9aeb762684e2ea52ccff40cc7f56
 
 post_install() {
 	vlicense LICENSE

From 03b8c65a45bc1dd5c88d895b9d7a5126cef5def0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 22 Mar 2022 22:53:24 +0100
Subject: [PATCH 0549/2561] newsboat: update to 2.27.

---
 srcpkgs/newsboat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index 39c8eac9a7e0..09f30180a19c 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -1,6 +1,6 @@
 # Template file for 'newsboat'
 pkgname=newsboat
-version=2.26
+version=2.27
 revision=1
 build_style=configure
 build_helper="rust"
@@ -17,7 +17,7 @@ license="MIT"
 homepage="https://newsboat.org/"
 changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
 distfiles="https://newsboat.org/releases/${version}/newsboat-${version}.tar.xz"
-checksum=34a4834e00f06c0151c700d6af065f5b8776872227d9d4484d247ae7a4413c18
+checksum=fd5a40096689d4fc0f18441319197769fa377709821b1a3f1b2ba1f006625285
 
 # tests fail when run by superuser
 # they always fail on musl, see https://github.com/newsboat/newsboat/issues/1216

From a3c372befbe6caabfff5c2abd488ab03556311b8 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Sat, 26 Mar 2022 11:09:59 +0700
Subject: [PATCH 0550/2561] SweetHome3D: update to 6.6

---
 srcpkgs/SweetHome3D/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SweetHome3D/template b/srcpkgs/SweetHome3D/template
index 344aa9e903e6..169fe188e518 100644
--- a/srcpkgs/SweetHome3D/template
+++ b/srcpkgs/SweetHome3D/template
@@ -1,6 +1,6 @@
 # Template file for 'SweetHome3D'
 pkgname=SweetHome3D
-version=6.5.2
+version=6.6
 revision=1
 archs="i686 x86_64"
 wrksrc="SweetHome3D-${version}-src"
@@ -12,7 +12,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="www.sweethome3d.com"
 distfiles="${SOURCEFORGE_SITE}/sweethome3d/SweetHome3D-${version}-src.zip"
-checksum=e3323f078e49c72e575e2e771f1586a7c18475b42ea32982abb27756b7a81dc8
+checksum=0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b
 
 do_build() {
 	ant application textures furniture examples help java3dLibraries

From 44f9d8bc40e4a16f83342df722762a704da50a14 Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Fri, 25 Mar 2022 21:49:59 +0100
Subject: [PATCH 0551/2561] kirc: update to 0.3.1.

---
 srcpkgs/kirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirc/template b/srcpkgs/kirc/template
index fd25076500db..e49f4b1f2531 100644
--- a/srcpkgs/kirc/template
+++ b/srcpkgs/kirc/template
@@ -1,6 +1,6 @@
 # Template file for 'kirc'
 pkgname=kirc
-version=0.3.0
+version=0.3.1
 revision=1
 build_style=gnu-makefile
 short_desc="Tiny IRC client written in POSIX C99"
@@ -8,7 +8,7 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
 license="MIT"
 homepage="http://kirc.io"
 distfiles="https://github.com/mcpcpc/${pkgname}/archive/refs/tags/${version}.tar.gz"
-checksum=1b35c77f46466106b0fde52c0933866ccf5fd7c97569465297dcae018c4b4a16
+checksum=19bb058a9845eb5b2febe6e8d658dcd06c194b58669f37837dbdf37627c7d7dd
 
 post_install() {
 	vlicense LICENSE

From d6fb0aa7820af11ed390cbe129cf4757bfecd7e3 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Mon, 25 May 2020 03:17:12 -0700
Subject: [PATCH 0552/2561] New package: netris-0.1.8

---
 srcpkgs/netris/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/netris/template

diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
new file mode 100644
index 000000000000..0eb9abeb5b52
--- /dev/null
+++ b/srcpkgs/netris/template
@@ -0,0 +1,13 @@
+# Template file for 'netris'
+pkgname=netris
+version=0.1.8
+revision=1
+wrksrc=$pkgname-v$version
+build_style=go
+go_import_path=gitlab.com/tslocum/netris/cmd/netris
+short_desc="Multiplayer Tetris clone"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/tslocum/netris"
+distfiles="https://gitlab.com/tslocum/netris/-/archive/v${version}/netris-v${version}.tar.gz"
+checksum=3638d7bfce544fde9ab1dd15376586e12513187f7c3b51baf223846cce60a33e

From 8c949b8cbda899a2691b8d4c79b80ee050776b02 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Fri, 25 Mar 2022 11:47:50 +1000
Subject: [PATCH 0553/2561] kops: update to 1.23.0

---
 srcpkgs/kops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index d044b28cad1a..4ba82a05a2a3 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,6 +1,6 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.22.2
+version=1.23.0
 revision=1
 archs="x86_64*"
 build_wrksrc=src/k8s.io/kops

From 6d48a1b5c38d201f0d8abb9d0c0cc827971b228b Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Wed, 23 Mar 2022 17:56:44 -0500
Subject: [PATCH 0554/2561] Signal-Desktop: update to 5.36.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 038af9b6e175..55591ea4c82f 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.35.0
+version=5.36.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=12d4766356d50f4eaff907a738860be91bf4c012fd2db62d00757078923dca67
+checksum=de158a8f4b19e3f8b849abf07fbb3d1b2207a3a08fde31aac328635e66a8a956
 nostrip_files="signal-desktop"
 
 post_extract() {

From db62846d01a4d813e700a46ecaef7158e452c45b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 21 Mar 2022 10:56:40 +0100
Subject: [PATCH 0555/2561] dbeaver: update to 22.0.1.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index d20837b230c8..276af8802424 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=22.0.0
+version=22.0.1
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -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=c4e995ce3c46723f071faefe8dc68df54f001c634e757a9bf89c594fe3a55613
+checksum=2258f77b6e68fc0784dd7d92fc1297695b57e6ca22e3d454f21f328bf61e2bf0
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

From 55493c300314a815c2dd2c4b400d0708058e36ca Mon Sep 17 00:00:00 2001
From: Kyle Nusbaum <KyleJNusbaum@gmail.com>
Date: Sat, 19 Mar 2022 01:51:59 -0500
Subject: [PATCH 0556/2561] apache-kafka: update to 3.1.0.

---
 srcpkgs/apache-kafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache-kafka/template b/srcpkgs/apache-kafka/template
index 0e75af73152e..453b09923566 100644
--- a/srcpkgs/apache-kafka/template
+++ b/srcpkgs/apache-kafka/template
@@ -1,6 +1,6 @@
 # Template file for 'apache-kafka'
 pkgname=apache-kafka
-version=3.0.0
+version=3.1.0
 revision=1
 wrksrc="kafka-${version}-src"
 hostmakedepends="curl which tar openjdk8"
@@ -10,7 +10,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://kafka.apache.org"
 distfiles="https://dlcdn.apache.org/kafka/${version}/kafka-${version}-src.tgz"
-checksum=66a9efddcc2ce88984941020db012178efd51eb47c359c7fd1bab791416e39cd
+checksum=75265c6b103b73fa9c8a9897963bee6587f968309ec827ad795e48dea1a61aaf
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 2660110cf2dac08c3b01b6f6938310d2187d246d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Fri, 18 Mar 2022 11:59:16 +0100
Subject: [PATCH 0557/2561] zoom: update to 5.9.6.2225.

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 3ec023975ed8..aa16c7503ed4 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.9.3.1911
+version=5.9.6.2225
 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=6cbb3d72b6d84c2527e75b577959af5ea1992111fdaf37c56fd1fcc8725fcc87
+checksum=1e43ae0e43168586f5dd05ace1e646afe1455825b62b760e2dab0a3564da35e3
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 755b2c1fdd4fec0af90b281dd57ef7eb59d19d31 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 27 Mar 2022 11:08:07 -0400
Subject: [PATCH 0558/2561] libnma: update to 1.8.36.

---
 common/shlibs           | 1 +
 srcpkgs/libnma/template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7d323593a120..bba46e1678dc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.36_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c0a9791e5736..148ae51d6de9 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,12 +1,12 @@
 # Template file for 'libnma'
 pkgname=libnma
-version=1.8.34
+version=1.8.36
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dlibnma_gtk4=false"
+configure_args="-Dlibnma_gtk4=true"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
-makedepends="gcr-devel gtk+3-devel iso-codes
+makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes
  mobile-broadband-provider-info NetworkManager-devel"
 depends="NetworkManager iso-codes"
 short_desc="NetworkManager panel applet for GNOME - runtime library"
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libnma"
 changelog="https://gitlab.gnome.org/GNOME/libnma/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f5e2e738e0fca7f2a549079290b2d8017511d485a83220c36df380a3b4753304
+checksum=d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a
 replaces="libnm-gtk>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 150ba6617b2eca733bf0caeab8cec0d9af3e9fe0 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 27 Mar 2022 05:42:05 -0400
Subject: [PATCH 0559/2561] font-iosevka: update to 15.1.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 4f1c061d5764..e293af01166b 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=15.0.3
+version=15.1.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- 7c6a4d8e003cab1a46f86fdf43f8c49e4b9d6ce932961572476266ad9f351608
- 629dd3cf957f7ef255e7dccc3286c5a3b54c0a6a7cde8b93b3a7fdc9dffc4cbd"
+ 4bb10d12681546fa129f9105706d6f55c346b75418a19793fb300f0bd4e5991d
+ e05995a4b66592d5868b7e667bba8a5f1822499fc53c6cd7a8abf3e40f8b8895"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 7e8eeb5f1d3e3cfb2603d762206518a945705658 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Sun, 27 Mar 2022 18:24:31 +0700
Subject: [PATCH 0560/2561] vivaldi: update to 5.1.2567.73

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index d36738824694..9108f67a4d29 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.1.2567.66
+version=5.1.2567.73
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=e2631cfabdd2d916fd8ab05004afd86efeec4e47d50a86b8be4cd3b59f6430ed
+checksum=efc4a4d39724840cbcc78317ef1a0e5e300cb8b9d655defee8e746626f845f12
 repository=nonfree
 restricted=yes
 nostrip=yes

From 7457a8682a020d3249426a51dabbc4b5c8d261ea Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 12:45:16 +0100
Subject: [PATCH 0561/2561] freerdp: update to 2.6.1.

---
 srcpkgs/freerdp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index c4796b8c73c0..da6703547a83 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=b9eb850f27bed4362b9a1017d37f6e271f43428948f995e7815e039306cb6ddd
+checksum=2ff86a839c1cf678a24d9bf435c83745aafbd5f0d19b637b733e306acede96e3
 CFLAGS="-Wno-dev"
 
 case "$XBPS_TARGET_MACHINE" in

From 6b3156f047dd61b93fd8a908d860cfaad501b6c5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 27 Mar 2022 17:42:39 +0200
Subject: [PATCH 0562/2561] dxa: update to 0.1.5.

---
 srcpkgs/dxa/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dxa/template b/srcpkgs/dxa/template
index 4d4e05f1c450..9eeb0175f96a 100644
--- a/srcpkgs/dxa/template
+++ b/srcpkgs/dxa/template
@@ -1,14 +1,16 @@
 # Template file for 'dxa'
 pkgname=dxa
-version=0.1.4
+version=0.1.5
 revision=1
 build_style=gnu-makefile
+make_check_target="test"
+checkdepends="xa"
 short_desc="6502/R65C02 disassembler"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.floodgap.com/retrotech/xa/#dxa"
 distfiles="https://www.floodgap.com/retrotech/xa/dists/dxa-${version}.tar.gz"
-checksum=0b4ae0c0ae75223f446429bd19e8959d6224124b1ed1deb4a24f06f619b66b95
+checksum=8e40ed77816581f9ad95acac2ed69a2fb2ac7850e433d19cd684193a45826799
 
 do_install() {
 	vbin dxa

From 7393de55159c2dfd152d093604faa99310a178b7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 27 Mar 2022 17:43:28 +0200
Subject: [PATCH 0563/2561] xa: update to 2.3.13.

---
 srcpkgs/xa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xa/template b/srcpkgs/xa/template
index 913275ab347a..b6df10d76645 100644
--- a/srcpkgs/xa/template
+++ b/srcpkgs/xa/template
@@ -1,6 +1,6 @@
 # Template file for 'xa'
 pkgname=xa
-version=2.3.12
+version=2.3.13
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.floodgap.com/retrotech/xa/"
 distfiles="https://www.floodgap.com/retrotech/xa/dists/xa-${version}.tar.gz"
-checksum=f8fd1536012d676fc6cbfcdd6a91793e564c89b6ef747f8db8f467c178fb0704
+checksum=a9477af150b6c8a91cd3d41e1cf8c9df552d383326495576830271ca4467bd86
 
 post_extract() {
 	vsed -i 's/${LD}/${CC}/' src/Makefile

From 1e25d67496678a054080c714fd7a0ba6bacac921 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 27 Mar 2022 20:25:40 +0200
Subject: [PATCH 0564/2561] monit: update to 5.32.0.

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 3616fa0ee29b..b10596c639d6 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.31.0
+version=5.32.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=eae71f28941fb663eec74c1a59b69546c659529796550bd9c0c544e9b52ac055
+checksum=1077052d4c4e848ac47d14f9b37754d46419aecbe8c9a07e1f869c914faf3216
 
 pre_configure() {
 	./bootstrap

From c14fdc7a442e5866c1e2d4715d49036150b15a01 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Mon, 7 Mar 2022 21:29:14 +1000
Subject: [PATCH 0565/2561] kubernetes-helm: update to 3.8.1

---
 srcpkgs/kubernetes-helm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes-helm/template b/srcpkgs/kubernetes-helm/template
index 18c05630ce41..8e7eab5eea58 100644
--- a/srcpkgs/kubernetes-helm/template
+++ b/srcpkgs/kubernetes-helm/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes-helm'
 pkgname=kubernetes-helm
-version=3.7.2
+version=3.8.1
 revision=1
 wrksrc="helm-${version}"
 hostmakedepends="go make git mercurial tar"
@@ -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=d04175807c2948261517b58120a0810ec20b92c0058acb040e973d0b9de7b08d
+checksum=fed90e57113a6b6e50db03ee711358b04733bc2a50797e1b103a300b1f8a4b16
 conflicts="helm"
 nopie=true
 

From 74c61a7334ea0711a29a0498464d1b787835f555 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 28 Feb 2022 09:42:47 +0000
Subject: [PATCH 0566/2561] libuv: update to 1.43.0.

---
 srcpkgs/libuv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template
index 76a36863f4b9..2575d92da2ad 100644
--- a/srcpkgs/libuv/template
+++ b/srcpkgs/libuv/template
@@ -1,6 +1,6 @@
 # Template file for 'libuv'
 pkgname=libuv
-version=1.41.0
+version=1.43.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,7 @@ 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=6cfeb5f4bab271462b4a2cc77d4ecec847fdbdc26b72019c27ae21509e6f94fa
+checksum=9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d
 # the tests fail when run as root and as such break in the CI containers
 make_check="extended"
 

From afd2e9796211b688cde9620048182729d3fcc4ae Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 22 Feb 2022 12:51:36 -0500
Subject: [PATCH 0567/2561] micro: adopt.

---
 srcpkgs/micro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..4848d9338e90 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -9,7 +9,7 @@ go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
 short_desc="Modern and intuitive terminal-based text editor"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="0x5c <dev@0x5c.io>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"

From 46e4da677e57a006fcd0b2e64fd5d5b52f14aae6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 27 Mar 2022 22:27:59 +0200
Subject: [PATCH 0568/2561] janet: update to 1.21.1.

---
 common/shlibs          | 2 +-
 srcpkgs/janet/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bba46e1678dc..d3c9ab101c39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3899,7 +3899,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.9 libcbor-0.9.0_1
 libfido2.so.1 libfido2-1.6.0_2
-libjanet.so.1.20 janet-1.20.0_1
+libjanet.so.1.21 janet-1.21.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 30c4dc43db48..4301ab90c751 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.21.0
+version=1.21.1
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=8e53efcdeda9b7519248bef5f0e744ad947e013b14960c66ba75967c5fb0a7fd
+checksum=8c6eeabbc0c00ac901b66763676fa4bfdac96e5b6a3def85025b45126227c4e0
 
 post_install() {
 	vlicense LICENSE

From 459461c0763ca5299d5ed3e53058d9047754d8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 24 Feb 2022 22:26:49 +0100
Subject: [PATCH 0569/2561] bfs: update to 2.5.

---
 srcpkgs/bfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index c4d8b40be69b..799cd1d86bb6 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,9 +1,9 @@
 # Template file for 'bfs'
 pkgname=bfs
-version=2.3.1
+version=2.5
 revision=1
 build_style=gnu-makefile
-makedepends="acl-devel libcap-devel"
+makedepends="acl-devel libcap-devel oniguruma-devel"
 checkdepends="acl-progs libcap-progs"
 short_desc="Breadth-first version of the UNIX find command"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
@@ -11,7 +11,7 @@ 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=c3ed60001804ca79a3794935ab6b9927bd14df42dc34e475b34d62929fcc5a98
+checksum=410be5de74bfc5dece213731d3a8462310789118d299fb14f02bd9b0fdd66875
 
 post_install() {
 	vlicense LICENSE

From 07a3df4881e9ac3ebef9291c435421ac8b1fb54f Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sun, 27 Mar 2022 16:44:25 +0200
Subject: [PATCH 0570/2561] sqlite: update to 3.38.2.

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 0ef5405dfa66..e0be13546327 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.1
+version=3.38.2
 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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4
+checksum=e7974aa1430bad690a5e9f79a6ee5c8492ada8269dc675875ad0fb747d7cada4
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From 0a3de8f3c9776cad00ce49948001b2071810d68a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 26 Mar 2022 17:12:48 -0400
Subject: [PATCH 0571/2561] just: update to 1.1.1.

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 436ea6d5d455..7dc9fe4fbeb7 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.1.0
+version=1.1.1
 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/refs/tags/${version}.tar.gz"
-checksum=b0eaf3c7da507be9ad8e0ce050a10459eeead72b94d50bc3261e3dcda516b03a
+checksum=b985def8260965773422fc6c665fa37aeb7304280560dbf8f641479ba00e2da0
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 95fcb7ec42ecbb36b4dbf7b400282730b5c9a45d Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Fri, 25 Mar 2022 22:02:02 +0100
Subject: [PATCH 0572/2561] sfeed: update to 1.3.

---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 47ca1fd14112..46b4d83e558b 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.2
+version=1.3
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -11,7 +11,7 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=7d3cdaf8dcc6582f6655330f82f8a57ca37c4b9c84ff995b09b7b7fb9fe58b58
+checksum=49d32e98a47a80a2a6cbd5d816938057d4ca3910e0a6a814b2c2a6520fbda9ba
 
 post_install() {
 	vlicense LICENSE

From 6e0292db3f766df264a829dcd2081bc45f2d0973 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 24 Mar 2022 19:38:45 +1100
Subject: [PATCH 0573/2561] MoarVM: update to 2022.03.

---
 srcpkgs/MoarVM/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index f437404bd76c..9386751ab79a 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2022.02
+version=2022.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=4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96
+checksum=fb71cd13912464482b99b33f0c06e9fd7c51a151c6e632a9220cf93c5855fdaf
 nocross=yes
 shlib_provides="libmoar.so"

From 96391b37baaef517e2d95de0f71003db41a912c6 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 24 Mar 2022 19:40:33 +1100
Subject: [PATCH 0574/2561] nqp: update to 2022.03.

---
 srcpkgs/nqp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index e80e23f80ee6..52ec0153fe05 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2022.02
+version=2022.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=25d3c99745cd84f4049a9bd9cf26bb5dc817925abaafe71c9bdb68841cdb18b1
+checksum=a95e778970c4d09c091d2aa299c05036208ce4b4b0d3a7af373198c12258b306
 nocross=yes

From 24d4c7fb3f5878a0ecc32bdbc8de7261d739f06e Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 24 Mar 2022 19:42:26 +1100
Subject: [PATCH 0575/2561] rakudo: update to 2022.03.

---
 srcpkgs/rakudo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 979c33def794..6a0345b57907 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2022.02
+version=2022.03
 revision=1
 build_style=configure
 make_check_target=test
@@ -32,10 +32,10 @@ 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=6a6e9dbcc6d9a1610a34c6ec67e2d3f694d7b33e9e0a0f224543089fa7f71332
+checksum=03e215b001a879747618d6fc18eb7f89c0b812f5e543a43ed66c13439ea8a227
 nocross=yes
 provides="raku-${version}_${revision}"
 
 post_install() {
-	vbin tools/install-dist.p6 raku-install-dist
+	vbin tools/install-dist.raku raku-install-dist
 }

From 8132d47fa88984c7218f05926c05949eb7336110 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 00:13:18 +0100
Subject: [PATCH 0576/2561] nwipe: update to 0.33.

---
 srcpkgs/nwipe/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nwipe/template b/srcpkgs/nwipe/template
index acc1307e5f1e..5a82401a9d40 100644
--- a/srcpkgs/nwipe/template
+++ b/srcpkgs/nwipe/template
@@ -1,17 +1,18 @@
 # Template file for 'nwipe'
 pkgname=nwipe
-version=0.32
+version=0.33
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="libuuid-devel libparted-devel ncurses-devel"
+depends="smartmontools"
 short_desc="Utility to securely erase disks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/martijnvanbrummelen/nwipe"
 changelog="https://raw.githubusercontent.com/martijnvanbrummelen/nwipe/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=40b7a3833d60a28834ccc190174c97a28141fdd43d93652ae93bb4928f567a5c
+checksum=e771a6d36a6800a5cf0ad460591bfd7fe4c04a908afe3da5fd169c921195e489
 
 CFLAGS="-D_FILE_OFFSET_BITS=64"
 

From e20c23cb4d24e26b319ac148133c309890cf56ac Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 00:18:32 +0100
Subject: [PATCH 0577/2561] partclone: update to 0.3.19.

---
 srcpkgs/partclone/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index f7187bbff910..941c9e4bd529 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,6 +1,6 @@
 # Template file for 'partclone'
 pkgname=partclone
-version=0.3.18
+version=0.3.19
 revision=1
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
@@ -13,8 +13,8 @@ short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://partclone.org/"
-distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz"
-checksum=50070e29c2e00e991a3784f13339347acb46d2a293f43531d1f4f4f0dcb42311
+distfiles="https://github.com/Thomas-Tsai/partclone/archive/refs/tags/${version}.tar.gz"
+checksum=e15e399297b8efd74a4fd19f3caca28e5c1772b051acf7fc311f3c86296bcda4
 CFLAGS="-DBTRFS_DISABLE_BACKTRACE"
 
 pre_configure() {

From c7d8b46e58f20271e73ba083a223c0b2c068b4d4 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 22 Mar 2022 03:15:35 -0400
Subject: [PATCH 0578/2561] New package: ircdog-0.3.0

---
 srcpkgs/ircdog/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/ircdog/template

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
new file mode 100644
index 000000000000..e26b035a1382
--- /dev/null
+++ b/srcpkgs/ircdog/template
@@ -0,0 +1,16 @@
+# Template file for 'ircdog'
+pkgname=ircdog
+version=0.3.0
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ircdog"
+short_desc="Simple wrapper over the raw IRC protocol"
+maintainer="0x5c <dev@0x5c.io>"
+license="ISC"
+homepage="https://github.com/ergochat/ircdog"
+distfiles="https://github.com/ergochat/ircdog/archive/refs/tags/v${version}.tar.gz"
+checksum=ea58a3fb081e438eae834ed7a812cc7640e7d3440c3615b814b880fef0eab5f6
+
+post_install() {
+	vlicense LICENSE
+}

From 5095bc73f7d492db5311116e7006f291276be37a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 02:34:28 +0100
Subject: [PATCH 0579/2561] stagit: update to 1.0.

---
 srcpkgs/stagit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 7078a4f6c946..f5828d25ed5c 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,6 +1,6 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=0.9.6
+version=1.0
 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=d072f386f3a546ed0341e20f9c2dfd7756a761fab1c40316a96690cb2b3066d0
+checksum=10a0e31bb57d6da0dea84728cabed95b8f7d83fde13bb76e0ce18ef71ab68d8f
 LDFLAGS="-lgit2"
 
 post_install() {

From 935f9582e14ce4443a163fbcb2e4b8f0263c7383 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 22:06:02 +0100
Subject: [PATCH 0580/2561] imlib2: update to 1.8.1, adopt.

---
 srcpkgs/imlib2/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index dd9ac63e7cc8..b560ef27489c 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.8.0
+version=1.8.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -9,11 +9,11 @@ makedepends="freetype-devel libjpeg-turbo-devel libpng-devel libwebp-devel
  tiff-devel libid3tag-devel giflib-devel libXext-devel libSM-devel
  libheif-devel librsvg-devel"
 short_desc="Image manipulation library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
-distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=6f881c9a1eee040484d2f13070fefbf1d88270a75042e2d5de63fa22ea6e1c88
+distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.xz"
+checksum=522e1e70e65bc0eddfe207617d15c9a395662a7c090661daaa2c294fb7d9fdaa
 
 post_install() {
 	vlicense COPYING

From 8f20d19c6324d3edebc46e11f45d3aafacc6a60b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 19 May 2021 16:09:01 +0200
Subject: [PATCH 0581/2561] New package: perl-Math-Int64-0.54

---
 srcpkgs/perl-Math-Int64/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/perl-Math-Int64/template

diff --git a/srcpkgs/perl-Math-Int64/template b/srcpkgs/perl-Math-Int64/template
new file mode 100644
index 000000000000..f5554054e6f5
--- /dev/null
+++ b/srcpkgs/perl-Math-Int64/template
@@ -0,0 +1,15 @@
+# Template file for 'perl-Math-Int64'
+pkgname=perl-Math-Int64
+version=0.54
+revision=1
+wrksrc="${pkgname#perl-}-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="perl"
+depends="perl"
+short_desc="Add support for 64 bit integers, signed and unsigned, to Perl"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Math-Int64"
+distfiles="${CPAN_SITE}/Math/Math-Int64-${version}.tar.gz"
+checksum=dcfc51e698437ea6b9cefe0276215c56cdb6a7f85e3e24a2b6b4189f1960d351

From cd569924bc0ca5fe40145c349088f7bf283f7e0b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 19 May 2021 16:09:28 +0200
Subject: [PATCH 0582/2561] New package: perl-Math-Int128-0.22

---
 srcpkgs/perl-Math-Int128/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/perl-Math-Int128/template

diff --git a/srcpkgs/perl-Math-Int128/template b/srcpkgs/perl-Math-Int128/template
new file mode 100644
index 000000000000..eb4fb2e68fdc
--- /dev/null
+++ b/srcpkgs/perl-Math-Int128/template
@@ -0,0 +1,20 @@
+# Template file for 'perl-Math-Int128'
+pkgname=perl-Math-Int128
+version=0.22
+revision=1
+wrksrc="${pkgname#perl-}-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="perl"
+depends="perl perl-Math-Int64"
+checkdepends="perl-Math-Int64"
+short_desc="Add support for 128 bit integers, signed and unsigned, to Perl"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Math-Int64"
+distfiles="${CPAN_SITE}/Math/Math-Int128-${version}.tar.gz"
+checksum=a630ca401753866955f1173848ab5b4ac4ad5ca6ad9087f11cdf91dde85119bc
+
+if [ "$XBPS_TARGET_WORDSIZE" == "32" ]; then
+	broken="not supported on 32-bit architectures"
+fi

From b2b085e68231800daa48123a6db1dcdb18eba89d Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 19 May 2021 16:10:55 +0200
Subject: [PATCH 0583/2561] perl-Crypt-CBC: update to 3.04

---
 srcpkgs/perl-Crypt-CBC/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-CBC/template b/srcpkgs/perl-Crypt-CBC/template
index 5ddc77f0674e..f15cfc6013cb 100644
--- a/srcpkgs/perl-Crypt-CBC/template
+++ b/srcpkgs/perl-Crypt-CBC/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Crypt-CBC'
 pkgname=perl-Crypt-CBC
-version=3.01
+version=3.04
 revision=1
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
@@ -12,6 +12,6 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Crypt-CBC"
 distfiles="${CPAN_SITE}/Crypt/Crypt-CBC-${version}.tar.gz"
-checksum=de259c1c94fc1fd2731dfd276e8b05e31edfd2150848afdff09ac6ae9a03e624
+checksum=4026c57d0dbf6496c0d561a26f161b763d3b8edf351139c073492e21b5fbce07
 # check requires a lot of new cascading dependencies
 make_check=no

From f2c0d39b343c62d54bf853cf2f08846342b59f99 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 11 Feb 2022 19:40:45 +0100
Subject: [PATCH 0584/2561] lilypond: update to 2.23.6

---
 srcpkgs/lilypond/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 66d452bd7771..0cc74759a100 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.5
+version=2.23.6
 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=53fd289eac318356003bf19b2d9e8ec43cb32e2ea926363145c1b26482bd1678
+checksum=a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then

From 10ad50ccfd9d1072e937df776abd1e10e4554ffc Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 11 Feb 2022 19:41:08 +0100
Subject: [PATCH 0585/2561] lilypond-doc: update to 2.23.6

---
 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 89aa80f23fe4..f0ee3b262e90 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.5
+version=2.23.6
 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="https://lilypond.org/"
 distfiles="https://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=e2b528b3ce70058b634fd76b097f975760c0ad86148d9ec63b66c73a941b0afd
+checksum=1fada73c22dbcfa6224744a8ad87e10cced784f98fd9243768c96ee5bc0ee45d
 
 do_install() {
 	vmkdir usr

From 2a79cff956121263a32e241e145d3ab36a45fdda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 13:37:41 +0100
Subject: [PATCH 0586/2561] slop: update to 7.6.

---
 common/shlibs         | 2 +-
 srcpkgs/slop/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d3c9ab101c39..1b072c738a2e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2985,7 +2985,7 @@ libmutter-cogl-9.so.0 mutter-41.0_1
 libmutter-cogl-pango-9.so.0 mutter-41.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
+libslopy.so.7.6 slop-7.6_1
 libbcunit.so.1 bcunit-3.0_1
 libzbar.so.0 libzbar-0.10_1
 libzbargtk.so.0 libzbar-0.10_1
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bae6088a418a..9659f2818c1e 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
-version=7.5
-revision=5
+version=7.6
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
@@ -10,7 +10,7 @@ maintainer="Felipe Nogueira <contato.fnog@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/naelstrof/slop"
 distfiles="https://github.com/naelstrof/slop/archive/v${version}.tar.gz"
-checksum=94d8b6270217cd7f56ce7d4a9a75069025262830a2f91c3239b7fc07da5ea8da
+checksum=ec45f9a69d7a24df621f5c634d202451ddca987d550cf588c5c427b99106fb6b
 
 slop-devel_package() {
 	short_desc+=" - developments files"

From d1ae76f79dd12b79b440525ed0eda9b1442930c0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 13:38:14 +0100
Subject: [PATCH 0587/2561] maim: rebuild against slop-7.6

---
 srcpkgs/maim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index c9cfee875339..a3bbf381c466 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel

From 00ba982a7fe02664121d98f6a8f2be37b387d16c Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Sun, 6 Mar 2022 19:08:14 +0100
Subject: [PATCH 0588/2561] dumb_runtime_dir: update to 1.0.4.

---
 srcpkgs/dumb_runtime_dir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dumb_runtime_dir/template b/srcpkgs/dumb_runtime_dir/template
index 756fc018a264..f2b18817be65 100644
--- a/srcpkgs/dumb_runtime_dir/template
+++ b/srcpkgs/dumb_runtime_dir/template
@@ -1,6 +1,6 @@
 # Template file for 'dumb_runtime_dir'
 pkgname=dumb_runtime_dir
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="0BSD"
 homepage="https://github.com/ifreund/dumb_runtime_dir"
 distfiles="${homepage}/releases/download/v${version}/dumb_runtime_dir-${version}.tar.gz"
-checksum=92fe5c4b6a69eb9e1845b067aa7f71303a6faabea3be8110776b6072c1652718
+checksum=451e680ee2ad4bd268a2cc21571fd843eefde5ffd7a6847221f9a1449924acc0
 
 post_install() {
 	vlicense LICENSE

From 3d767321044fd2eba6416be55d6af3bcbbe5d6c6 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Mar 2022 12:14:35 +0100
Subject: [PATCH 0589/2561] skopeo: update to 1.6.1.

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index cd069e30431a..b568744c4b25 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.5.2
+version=1.6.1
 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=e15c189a8134dec62259e6fea2786e9fb55b34e55d26a8924de0d438fd3677c4
+checksum=304016ec4eb802bf1e1b350854db50bdc99a93dcbcc71f9d531dbb916dc146f3
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From 69e56be98ad31e9115f5d624f3622a10ef0e1c7f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 19:44:21 +0100
Subject: [PATCH 0590/2561] allegro5: update to 5.2.7.0.

---
 srcpkgs/allegro5/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/allegro5/template b/srcpkgs/allegro5/template
index f55a7eb6c144..e63d90e3e3fc 100644
--- a/srcpkgs/allegro5/template
+++ b/srcpkgs/allegro5/template
@@ -1,6 +1,6 @@
 # Template file for 'allegro5'
 pkgname=allegro5
-version=5.2.6.0
+version=5.2.7.0
 revision=1
 wrksrc="allegro-${version}"
 build_style=cmake
@@ -9,14 +9,14 @@ hostmakedepends="pkg-config"
 makedepends="zlib-devel alsa-lib-devel jack-devel libXpm-devel libXxf86vm-devel
  libXxf86dga-devel libXcursor-devel libvorbis-devel libpng-devel glu-devel
  libjpeg-turbo-devel libtheora-devel freetype-devel libflac-devel physfs-devel
- libopenal-devel gtk+-devel opus-devel opusfile-devel"
+ libopenal-devel gtk+3-devel opus-devel opusfile-devel"
 depends="virtual?libGL"
 short_desc="Portable library mainly aimed at video game and multimedia programming"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="Allegro License (MIT alike)"
 homepage="https://liballeg.org/"
 distfiles="https://github.com/liballeg/allegro5/releases/download/${version}/allegro-${version}.tar.gz"
-checksum=5de8189ec051e1865f359654f86ec68e2a12a94edd00ad06d1106caa5ff27763
+checksum=c1e3b319d99cb453b39d393572ba2b9f3de42a96de424aee7d4a1abceaaa970c
 
 post_install() {
 	vlicense LICENSE.txt

From dfe03d21928cce4328c3e11c686afcff0e37c87b Mon Sep 17 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, 18 Jan 2021 21:02:52 +0700
Subject: [PATCH 0591/2561] GitHub Action: build on push to branches designated
 for CI

---
 .github/workflows/build.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..503f1e1f4b68 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,6 +1,10 @@
-name: Check PR
+name: Check build
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - 'ci-**'
 
 jobs:
   # Lint changed templates.

From 8af71d9bbcd8611b21c58a39618a8637b609b200 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 14 Mar 2022 16:27:20 -0400
Subject: [PATCH 0592/2561] New package: aravis-0.8.21

---
 common/shlibs             |  1 +
 srcpkgs/aravis/template   | 47 +++++++++++++++++++++++++++++++++++++++
 srcpkgs/gstreamer1-aravis |  1 +
 srcpkgs/libaravis         |  1 +
 srcpkgs/libaravis-devel   |  1 +
 5 files changed, 51 insertions(+)
 create mode 100644 srcpkgs/aravis/template
 create mode 120000 srcpkgs/gstreamer1-aravis
 create mode 120000 srcpkgs/libaravis
 create mode 120000 srcpkgs/libaravis-devel

diff --git a/common/shlibs b/common/shlibs
index 1b072c738a2e..ccc55a1b3772 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4144,3 +4144,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
 librz_lang.so.0.3.4 rizin-0.3.4_1
 librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
+libaravis-0.8.so.0 libaravis-0.8.21_1
diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template
new file mode 100644
index 000000000000..2c67a954144a
--- /dev/null
+++ b/srcpkgs/aravis/template
@@ -0,0 +1,47 @@
+# Template file for 'aravis'
+pkgname=aravis
+version=0.8.21
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gobject-introspection gi-docgen gettext"
+makedepends="gtk+3-devel glib-devel libusb-devel zlib-devel libxml2-devel
+ gstreamer1-devel gst-plugins-base1-devel"
+checkdepends="python3-gobject"
+short_desc="Vision utilities for genicam based cameras"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/AravisProject/aravis"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=a53ce93cb082ac1c4215aed48aa9e05d5342d58811938065e9f503b07838dfb3
+# Network test causes timeout in CI
+make_check=ci-skip
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" glib-devel prelink-cross qemu-user-static"
+fi
+
+libaravis_package() {
+	short_desc="Vision library for genicam-based cameras"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vmove usr/lib/girepository-1.0
+	}
+}
+
+libaravis-devel_package() {
+	depends="libaravis>=${version}_${revision}"
+	short_desc="Vision library for genicam-based cameras - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+	}
+}
+
+gstreamer1-aravis_package() {
+	short_desc+=" - gstreamer plugin"
+	pkg_install() {
+		vmove usr/lib/gstreamer-1.0
+	}
+}
diff --git a/srcpkgs/gstreamer1-aravis b/srcpkgs/gstreamer1-aravis
new file mode 120000
index 000000000000..4309a30c365f
--- /dev/null
+++ b/srcpkgs/gstreamer1-aravis
@@ -0,0 +1 @@
+aravis
\ No newline at end of file
diff --git a/srcpkgs/libaravis b/srcpkgs/libaravis
new file mode 120000
index 000000000000..4309a30c365f
--- /dev/null
+++ b/srcpkgs/libaravis
@@ -0,0 +1 @@
+aravis
\ No newline at end of file
diff --git a/srcpkgs/libaravis-devel b/srcpkgs/libaravis-devel
new file mode 120000
index 000000000000..4309a30c365f
--- /dev/null
+++ b/srcpkgs/libaravis-devel
@@ -0,0 +1 @@
+aravis
\ No newline at end of file

From 00e64d969ea319822fa7f5dc5f2fcb39131c73e4 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 26 Mar 2022 21:18:06 +0530
Subject: [PATCH 0593/2561] New package: spotify-adblock-1.0.1

---
 srcpkgs/spotify-adblock/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/spotify-adblock/template

diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
new file mode 100644
index 000000000000..8d64a84df72f
--- /dev/null
+++ b/srcpkgs/spotify-adblock/template
@@ -0,0 +1,25 @@
+# Template file for 'spotify-adblock'
+pkgname=spotify-adblock
+version=1.0.1
+revision=1
+build_style=cargo
+conf_files="/etc/spotify-adblock/config.toml"
+short_desc="Adblocker for Spotify"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/abba23/spotify-adblock"
+distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${version}.tar.gz"
+checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360
+
+pre_install() {
+	{ sed -n '/<summary>Debian/q'
+	  sed -n '/^```$/q'
+	  sed -n '/^```$/q;s-/usr/local/lib/-/usr/lib/-;p'
+	} <README.md >spotify-adblock.desktop
+}
+
+do_install() {
+	vinstall config.toml 644 etc/spotify-adblock
+	vinstall spotify-adblock.desktop 644 usr/share/applications
+	vinstall "target/${RUST_TARGET}/release/libspotifyadblock.so" 644 usr/lib spotify-adblock.so
+}

From 9c0ae8074a7738186d884b96cdc2742da3177529 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 14 Mar 2022 21:18:11 -0500
Subject: [PATCH 0594/2561] kaffeine: plugins are not detected shlibs

---
 srcpkgs/kaffeine/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kaffeine/template b/srcpkgs/kaffeine/template
index 6b9f2ac96c99..e0356c9ad552 100644
--- a/srcpkgs/kaffeine/template
+++ b/srcpkgs/kaffeine/template
@@ -1,7 +1,7 @@
 # Template file for 'kaffeine'
 pkgname=kaffeine
 version=2.0.18
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config kcoreaddons"
@@ -9,6 +9,8 @@ makedepends="kidletime-devel kio-devel ksolid-devel vlc-devel
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
  qt5-plugin-sqlite qt5-plugin-tds
  $(vopt_if dvb 'v4l-utils-devel eudev-libudev-devel')"
+depends="qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
+ qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="KDE media player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 28b906488dfc4a78378cf6303586d9d59e807118 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 1 Oct 2021 18:23:28 -0500
Subject: [PATCH 0595/2561] enchant2: update to 2.3.2.

---
 srcpkgs/enchant2/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 8a48e4d61b8c..2d7a2e67e125 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
-version=2.2.15
-revision=5
+version=2.3.2
+revision=1
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -22,7 +22,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://abiword.github.io/enchant/"
 distfiles="https://github.com/AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz"
-checksum=3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03
+checksum=ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e
+make_check=no # tests broken
 
 enchant2-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 37a21660dbeaeb1e364141d3b809e350435f25f0 Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Mon, 21 Mar 2022 12:19:12 -0600
Subject: [PATCH 0596/2561] New package: qt6ct-0.5

---
 srcpkgs/qt6ct/files/qt6ct.sh |  6 ++++++
 srcpkgs/qt6ct/template       | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/qt6ct/files/qt6ct.sh
 create mode 100644 srcpkgs/qt6ct/template

diff --git a/srcpkgs/qt6ct/files/qt6ct.sh b/srcpkgs/qt6ct/files/qt6ct.sh
new file mode 100644
index 000000000000..e4e7708d8a29
--- /dev/null
+++ b/srcpkgs/qt6ct/files/qt6ct.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+export QT_QPA_PLATFORMTHEME=qt5ct
+if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+	export QT_QPA_PLATFORM=wayland
+fi
diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
new file mode 100644
index 000000000000..1e443df1dc20
--- /dev/null
+++ b/srcpkgs/qt6ct/template
@@ -0,0 +1,20 @@
+# Template file for 'qt6ct'
+pkgname=qt6ct
+version=0.5
+revision=1
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+depends="qt6-base qt6-svg"
+short_desc="Qt6 Configuration Tool"
+maintainer="Adam Pschorr <adampschorr13@aol.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/trialuser02/qt6ct"
+distfiles="https://github.com/trialuser02/qt6ct/archive/refs/tags/${version}.tar.gz"
+checksum=0fea8e5295e4ebebfae36f4862aaa67859238312d7a055b252cc53b281d69e0d
+
+post_install() {
+	vlicense COPYING
+	vinstall ${FILESDIR}/qt6ct.sh 644 etc/profile.d
+}

From 6d17376e0e44b3010283b62eb2897bac6c05f7ad Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 27 Mar 2022 22:52:23 -0500
Subject: [PATCH 0597/2561] berry: 0.1.11

---
 srcpkgs/berry/patches/fix-cross.patch | 48 +++++----------------------
 srcpkgs/berry/template                |  9 ++---
 2 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/srcpkgs/berry/patches/fix-cross.patch b/srcpkgs/berry/patches/fix-cross.patch
index 3756ccfa40c5..eace39b7a1ff 100644
--- a/srcpkgs/berry/patches/fix-cross.patch
+++ b/srcpkgs/berry/patches/fix-cross.patch
@@ -1,41 +1,11 @@
---- a/config.mk
-+++ b/config.mk
-@@ -9,11 +9,11 @@
- # Customize below to fit your system
+--- a/configure
++++ b/configure
+@@ -26,7 +26,7 @@
+ progs="CC=gcc CC=clang CC=cc INSTALL=install"
  
- # paths
--PREFIX = /usr/local
-+PREFIX = /usr
- MANPREFIX = ${PREFIX}/share/man
+ # Required dependencies
+-pkgs="x11 xinerama fontconfig xft"
++pkgs="x11 xinerama fontconfig xft freetype2"
  
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = $(XBPS_CROSS_BASE)/usr/include
-+X11LIB = $(XBPS_CROSS_BASE)/usr/lib
- 
- # Xinerama, comment if you don't want it
- XINERAMALIBS  = -lXinerama
-@@ -21,7 +21,7 @@
- 
- # freetype
- FREETYPELIBS = -lfontconfig -lXft
--FREETYPEINC = /usr/include/freetype2
-+FREETYPEINC = $(XBPS_CROSS_BASE)/usr/include/freetype2
- # OpenBSD (uncomment)
- #FREETYPEINC = ${X11INC}/freetype2
- 
-@@ -36,7 +36,7 @@
- # flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${DEBUG_CPPFLAGS}
- #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS}
--CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
-+CFLAGS   += -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
- LDFLAGS  = ${LIBS}
- 
- # Solaris
-@@ -44,4 +44,4 @@
- #LDFLAGS = ${LIBS}
- 
- # compiler and linker
--CC = cc
-+#CC = cc
+ # Default pkg flags to substitute when pkg-config is not found
+ pkg_libs="-lX11 -lXinerama -lfontconfig -lfreetype -lXft"
diff --git a/srcpkgs/berry/template b/srcpkgs/berry/template
index 05256589af24..7e2f79c09641 100644
--- a/srcpkgs/berry/template
+++ b/srcpkgs/berry/template
@@ -1,16 +1,17 @@
 # Template file for 'berry'
 pkgname=berry
-version=0.1.7
+version=0.1.11
 revision=1
-build_style=gnu-makefile
-make_use_env=yes
+build_style=configure
+configure_args="--prefix=/usr"
+hostmakedepends="pkg-config which"
 makedepends="libX11-devel libXinerama-devel libXft-devel freetype-devel"
 short_desc="Healthy, bite-sized window manager"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/JLErvin/berry"
 distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz"
-checksum=1d6de883a0cd96ceb167c5ad2e855b0b15fa84872d41a22e05d0fdf0cf4be6b8
+checksum=9beab0c1458fba7cf304dd45b710829640342bc42cfe61f0ae8c2b5391163142
 
 post_install() {
 	vlicense LICENSE

From f38096b3f4d0d8f0e8f1f8f1edfb50c3d6a9f55a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 27 Mar 2022 23:03:37 -0500
Subject: [PATCH 0598/2561] downloader-cli: update to 0.3.3.

---
 srcpkgs/downloader-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/downloader-cli/template b/srcpkgs/downloader-cli/template
index e390e31ed7b4..a7be8744ea34 100644
--- a/srcpkgs/downloader-cli/template
+++ b/srcpkgs/downloader-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'downloader-cli'
 pkgname=downloader-cli
-version=0.3.2
-revision=2
+version=0.3.3
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-urllib3 python3-downloader-cli"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/deepjyoti30/downloader-cli"
 distfiles="https://github.com/deepjyoti30/downloader-cli/archive/${version}.tar.gz"
-checksum=ad00b5ab905e57b8c275465c2b8bbeb187068ceff6614e68cf0b86de635acfe5
+checksum=212f87443574f4be7df750223ae15912e3a8f28470cd90aecc40701d109576f4
 
 post_install() {
 	vlicense LICENSE

From b08f7005cad017618b398bda9079037442bb6226 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 27 Mar 2022 23:05:43 -0500
Subject: [PATCH 0599/2561] ffuf: update to 1.4.0.

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 5430e121a532..6ceffafb0e55 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
 # Template file for 'ffuf'
 pkgname=ffuf
-version=1.3.1
+version=1.4.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=136df36154f17668fb726120f0c93059f696786a34e3c2047d61efc3a065c4ec
+checksum=cc741088f15b5cfdeb596f1630a015cce0b4b112dc6daf857cd9878e7a1734c1
 
 post_install() {
 	vlicense LICENSE

From b0af7625db0a47a3c3c65b80948b88776de059eb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 14:21:14 +0200
Subject: [PATCH 0600/2561] s-nail: update to 14.9.24.

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 2ba9e33f361c..7a171cea0d27 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,6 +1,6 @@
 # Template file for 's-nail'
 pkgname=s-nail
-version=14.9.23
+version=14.9.24
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-4-Clause, BSD-3-Clause, BSD-2-Clause, ISC"
 homepage="https://git.sdaoden.eu/cgit/s-nail.git"
 distfiles="https://www.sdaoden.eu/downloads/s-nail-${version}.tar.xz"
-checksum=2c717b22f4cd8719b82b6618640da6031382d2bf8eb51283bca2c6266957bca8
+checksum=2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c
 
 provides="mail-${version}_${revision}"
 

From 9704f6b283fd586b52f5473f716a164a699949e7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 14:22:18 +0200
Subject: [PATCH 0601/2561] weechat: update to 3.5.

---
 srcpkgs/weechat/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index c5898cbf3091..ebd25fa21547 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,6 +1,6 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=3.4.1
+version=3.5
 revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=7e088109ad5dfbcb08a9a6b1dd70ea8236093fed8a13ee9d9c98881d7b1aeae7
+checksum=ea904e4cec8edd0bd24f3ea17f6d6dff97ca00ee0571ee972e79e54c8c08170c
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"
@@ -32,10 +32,6 @@ if [ "$CROSS_BUILD" ]; then
 	 -DPERL_LFLAGS=-L$_perlpath"
 fi
 
-post_extract() {
-	vsed -i '/pkg_search_module/s/ruby-3.0/ruby-3.1 &/' cmake/FindRuby.cmake
-}
-
 weechat-aspell_package() {
 	lib32disabled=yes
 	depends="${sourcepkg}>=${version}_${revision}"

From c222254558023d05d52c5da17a91feb2db34fe25 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 14:22:29 +0200
Subject: [PATCH 0602/2561] python3-pyinfra: update to 1.7.2.

---
 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 7e633ebc3fe3..c4935c5e16b9 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.6.3
+version=1.7.2
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -14,7 +14,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=0db96b12a5dde2ca464a83b7dbbff74207775ad16de9162313a823320ec12488
+checksum=c7a2464ab50c5de865f0984e1978a9af37fbeca2260c4bf642db37fd0aed910d
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 47f150b25136b4a00257b071cc438a7486a42942 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 08:23:49 -0500
Subject: [PATCH 0603/2561] nfdump: update to 1.6.24.

---
 srcpkgs/nfdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nfdump/template b/srcpkgs/nfdump/template
index 1bdf3de252f2..348db854dbf4 100644
--- a/srcpkgs/nfdump/template
+++ b/srcpkgs/nfdump/template
@@ -1,6 +1,6 @@
 # Template file for 'nfdump'
 pkgname=nfdump
-version=1.6.23
+version=1.6.24
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake flex libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/phaag/nfdump"
 distfiles="https://github.com/phaag/nfdump/archive/v${version}.tar.gz"
-checksum=8c5a7959e66bb90fcbd8ad508933a14ebde4ccf7f4ae638d8f18c9473c63af33
+checksum=11ea7ecba405d57076c321f6f77491f1c64538062630131c98ac62dc4870545e
 configure_args+="--enable-sflow --enable-readpcap --enable-nfcapd"
 
 pre_configure() {

From 812d9329a805d303733909cd156124853fcd155c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 08:26:12 -0500
Subject: [PATCH 0604/2561] python3-simber: update to 0.2.4.

---
 srcpkgs/python3-simber/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-simber/template b/srcpkgs/python3-simber/template
index 27bd0df0d1f4..20d06df337b7 100644
--- a/srcpkgs/python3-simber/template
+++ b/srcpkgs/python3-simber/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-simber'
 pkgname=python3-simber
-version=0.2.3
-revision=2
+version=0.2.4
+revision=1
 wrksrc="simber-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://simber.deepjyoti30.dev/"
 distfiles="https://github.com/deepjyoti30/simber/archive/${version}.tar.gz"
-checksum=bf588394e26dcd45f4dba5f0c7b3cff8de3d66e22a5cd862979828295ea7f32a
+checksum=75c9e2fc915d470a4d9d36e5e5d003479d06af5d3a7e21b7ec30745f1845f8b9
 
 post_install() {
 	vlicense LICENSE

From bc0bc9cfbedd443b14e389868e5dcbef7404ecba Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 08:42:18 -0500
Subject: [PATCH 0605/2561] stellarium: update to 0.22.0.

---
 srcpkgs/stellarium/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template
index 0cfc788cdefa..c2a87b2847ad 100644
--- a/srcpkgs/stellarium/template
+++ b/srcpkgs/stellarium/template
@@ -1,16 +1,16 @@
 # Template file for 'stellarium'
 pkgname=stellarium
-version=0.21.3
+version=0.22.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"
+ qt5-serialport-devel qt5-tools-devel qt5-charts-devel"
 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=8ac6c054d12f136fe0d5c0deaaa8d7b69dd2a462be1711a187364574aef97e7f
+checksum=0b4dc23cf9054b5e76cd9bc5ad68e172eb221999e90af37e93667d04fe78c885
 replaces="stellarium-data>=0"

From dbdab73201148b11dc440e6159a15b81e8be2442 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 16:01:20 +0200
Subject: [PATCH 0606/2561] linux5.10: update to 5.10.109.

Enable
CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RANDOM_TRUST_BOOTLOADER=y
---
 srcpkgs/linux5.10/files/arm64-dotconfig   | 2 +-
 srcpkgs/linux5.10/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.10/files/ppc-dotconfig     | 2 +-
 srcpkgs/linux5.10/files/ppc64-dotconfig   | 4 ++--
 srcpkgs/linux5.10/files/ppc64le-dotconfig | 4 ++--
 srcpkgs/linux5.10/files/x86_64-dotconfig  | 4 ++--
 srcpkgs/linux5.10/template                | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index f5587464698f..acfc37c03510 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -4519,7 +4519,7 @@ CONFIG_XILLYBUS_OF=m
 # end of Character devices
 
 CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 3226507db584..e3ea24162dc7 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -4034,8 +4034,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index df90c0513f42..078ffac9ee09 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -3549,7 +3549,7 @@ CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index 0545b9d79c77..5d973825057c 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -4148,8 +4148,8 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index 5ae9914dc5bd..a5158c12dd3f 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -3969,8 +3969,8 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 6f07a461b3ab..fa04bb81b4dc 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -4104,8 +4104,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a3ccac15e158..0912977245d4 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.107
+version=5.10.109
 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=c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea
+checksum=18fb22ecb249669ea775474aee614dcb0697cab299068074fd9f0bafa32113dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 57cc31efe4bc28641c6009fa9a1cbfe810465148 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Fri, 11 Mar 2022 22:37:26 +0100
Subject: [PATCH 0607/2561] podman: add runit service

---
 srcpkgs/podman/files/podman-docker/finish | 3 +++
 srcpkgs/podman/files/podman-docker/run    | 4 ++++
 srcpkgs/podman/files/podman/log/run       | 1 +
 srcpkgs/podman/files/podman/run           | 4 ++++
 srcpkgs/podman/template                   | 4 +++-
 5 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/podman/files/podman-docker/finish
 create mode 100755 srcpkgs/podman/files/podman-docker/run
 create mode 120000 srcpkgs/podman/files/podman/log/run
 create mode 100755 srcpkgs/podman/files/podman/run

diff --git a/srcpkgs/podman/files/podman-docker/finish b/srcpkgs/podman/files/podman-docker/finish
new file mode 100755
index 000000000000..884b37f53b63
--- /dev/null
+++ b/srcpkgs/podman/files/podman-docker/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+[ "$(realpath /run/docker.sock)" = "/run/podman/podman.sock" ] && rm /run/docker.sock
diff --git a/srcpkgs/podman/files/podman-docker/run b/srcpkgs/podman/files/podman-docker/run
new file mode 100755
index 000000000000..3125a4f89ed9
--- /dev/null
+++ b/srcpkgs/podman/files/podman-docker/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+ln -sf /run/podman/podman.sock /run/docker.sock
+exec chpst -b podman-docker pause
diff --git a/srcpkgs/podman/files/podman/log/run b/srcpkgs/podman/files/podman/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/podman/files/podman/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/podman/files/podman/run b/srcpkgs/podman/files/podman/run
new file mode 100755
index 000000000000..8eb8f41752e4
--- /dev/null
+++ b/srcpkgs/podman/files/podman/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec podman --log-level info system service ${OPTS:---time=0} 2>&1
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index c719e4ca6057..95e0531abad8 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
@@ -34,4 +34,6 @@ post_install() {
 		vendor/github.com/containers/common/pkg/config/containers.conf \
 		>containers.cgfs.conf
 	vinstall containers.cgfs.conf 644 usr/share/containers containers.conf
+	vsv podman
+	vsv podman-docker
 }

From 557e0f3206195a26f7896e324420eaa45a18f26a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 16:33:53 +0200
Subject: [PATCH 0608/2561] linux5.15: update to 5.15.32.

Enable
CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RANDOM_TRUST_BOOTLOADER=y
---
 srcpkgs/linux5.15/files/arm64-dotconfig   | 2 +-
 srcpkgs/linux5.15/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.15/files/ppc-dotconfig     | 2 +-
 srcpkgs/linux5.15/files/ppc64-dotconfig   | 4 ++--
 srcpkgs/linux5.15/files/ppc64le-dotconfig | 4 ++--
 srcpkgs/linux5.15/files/x86_64-dotconfig  | 4 ++--
 srcpkgs/linux5.15/template                | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index f2091f4a8972..d086ed216153 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -4677,7 +4677,7 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
 CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 33ac63d097c5..db7fdf4d3bbd 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -4136,8 +4136,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig
index 3c19e95fb938..6ca79da60447 100644
--- a/srcpkgs/linux5.15/files/ppc-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc-dotconfig
@@ -3629,7 +3629,7 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS_CLASS=m
 # CONFIG_XILLYBUS is not set
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig
index 0261e73e9d87..355ff2fa768c 100644
--- a/srcpkgs/linux5.15/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64-dotconfig
@@ -4261,8 +4261,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig
index 59108825538b..5148c4e5cf55 100644
--- a/srcpkgs/linux5.15/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig
@@ -4078,8 +4078,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index b7655fcc219a..225e5c5022ee 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -4208,8 +4208,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 9b43d8ebf3e3..236c406a512b 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.30
+version=5.15.32
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 18059d8e3f01ab38b22ddf4c2e0a0a9db50926f6535649f51ee7a86a8542aff1"
+ eacc8609dfcecb637f813ef4d2e13f48bdeb6143be929358f3b3cb4254f9c563"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 0c302dc49cd3c688b43ad378f124fa6e29a098c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 16:36:50 +0200
Subject: [PATCH 0609/2561] linux5.16: update to 5.16.18.

Enable
CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RANDOM_TRUST_BOOTLOADER=y
---
 srcpkgs/linux5.16/files/arm64-dotconfig   | 2 +-
 srcpkgs/linux5.16/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.16/files/ppc-dotconfig     | 2 +-
 srcpkgs/linux5.16/files/ppc64-dotconfig   | 4 ++--
 srcpkgs/linux5.16/files/ppc64le-dotconfig | 4 ++--
 srcpkgs/linux5.16/files/x86_64-dotconfig  | 4 ++--
 srcpkgs/linux5.16/template                | 6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig
index 23f03c1e5630..e4b9d7a609af 100644
--- a/srcpkgs/linux5.16/files/arm64-dotconfig
+++ b/srcpkgs/linux5.16/files/arm64-dotconfig
@@ -4720,7 +4720,7 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
 CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/i386-dotconfig b/srcpkgs/linux5.16/files/i386-dotconfig
index 9356aea01812..a7c014b0984b 100644
--- a/srcpkgs/linux5.16/files/i386-dotconfig
+++ b/srcpkgs/linux5.16/files/i386-dotconfig
@@ -4167,8 +4167,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/ppc-dotconfig b/srcpkgs/linux5.16/files/ppc-dotconfig
index 50f83d578977..19463b4a9729 100644
--- a/srcpkgs/linux5.16/files/ppc-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc-dotconfig
@@ -3652,7 +3652,7 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS_CLASS=m
 # CONFIG_XILLYBUS is not set
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/ppc64-dotconfig b/srcpkgs/linux5.16/files/ppc64-dotconfig
index f030f728a84c..b204dc8f8a72 100644
--- a/srcpkgs/linux5.16/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64-dotconfig
@@ -4287,8 +4287,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/ppc64le-dotconfig b/srcpkgs/linux5.16/files/ppc64le-dotconfig
index 65d4298a56f0..564de8e60967 100644
--- a/srcpkgs/linux5.16/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64le-dotconfig
@@ -4104,8 +4104,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/x86_64-dotconfig b/srcpkgs/linux5.16/files/x86_64-dotconfig
index 8cc965f22722..dbffc48dfc42 100644
--- a/srcpkgs/linux5.16/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.16/files/x86_64-dotconfig
@@ -4240,8 +4240,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template
index 5775997c8c58..3f8c094faf24 100644
--- a/srcpkgs/linux5.16/template
+++ b/srcpkgs/linux5.16/template
@@ -1,6 +1,6 @@
-# Template file for 'linux5.16'
+# Template file for 'linux4.16'
 pkgname=linux5.16
-version=5.16.16
+version=5.16.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="027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb
- 9e7af5007d3596c1efee8556aaa1b1a2e40ddded107448b583624a1f305376db"
+ 3bb88aa87c3f7788ad84ca5cbf3946ed9fbb3fddb9fca2458944fba5ebd2ab16"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From d8b758998ef07074b94dc04f5d32a211649805e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 18:18:51 +0200
Subject: [PATCH 0610/2561] xtools: update to 0.64.

---
 srcpkgs/xtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index a9e48dc39cba..5392fb9a0602 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,6 +1,6 @@
 # Template file for 'xtools'
 pkgname=xtools
-version=0.63
+version=0.64
 revision=1
 build_style=gnu-makefile
 depends="bash curl findutils git make spdx-licenses-list xbps"
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://git.vuxu.org/xtools"
 distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
-checksum=6bc49a536488f3e911317a31f916df9f6778d34685db6aa2d7bd75be07f12995
+checksum=a49140066744d4aaaf856fb40d92df26d6d3f80b2aa03da1746c513e7eab40be

From 2e39697a117e7d0365e544e9412e5ab5cfde524b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 18:42:31 +0200
Subject: [PATCH 0611/2561] musl-obstack: update to 1.2.3.

---
 srcpkgs/musl-obstack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/musl-obstack/template b/srcpkgs/musl-obstack/template
index 7da24d223970..a808f53c121e 100644
--- a/srcpkgs/musl-obstack/template
+++ b/srcpkgs/musl-obstack/template
@@ -1,6 +1,6 @@
 # Template file for 'musl-obstack'
 pkgname=musl-obstack
-version=1.2.2
+version=1.2.3
 revision=1
 archs="*-musl"
 build_style=gnu-configure
@@ -10,7 +10,7 @@ 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"
-checksum=6eac88961c58a53f31cccd719b97d1b33c65436c51664e760a9582e2659c1314
+checksum=9ffb3479b15df0170eba4480e51723c3961dbe0b461ec289744622db03a69395
 
 CFLAGS="-fPIC"
 pre_configure() {

From c9698cf57b0ebbe5b44a87abdf5b3cb743ae1928 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:53 +0100
Subject: [PATCH 0612/2561] attica: update to 5.92.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 126c96c5cc71..1222f0cc9a60 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c05ee119f66d6dc60ecff5b7c6e883d4bc478aca547811b4edbc45eaf0f17b6b
+checksum=bf647c7736acbbb99ff1557339f71b5efd5a7591b2af83b482d37d35516bc933
 
 do_check() {
 	cd build

From 36269e49d152cbc96d5638371e2a7c0cb10c5f83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:54 +0100
Subject: [PATCH 0613/2561] baloo5: update to 5.92.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 6f14edf7a725..9f6d3c93f69a 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.91.0
+version=5.92.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=7574d63379c41d8cb0e6579a0d73ab4257967ecbfaa7affa01472dcca35a12b3
+checksum=283570583da0f85b2001ca600b9657e3a3fb9c2dcdd3ea8728553e212e50a475
 
 do_check() {
 	cd build

From 6370d0fcc5a469aa2466bc0dadadba4ef7bcccad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:56 +0100
Subject: [PATCH 0614/2561] bluez-qt5: update to 5.92.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 397fd96f10f0..2893e694f79c 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=595a9ebf11845b2a3f7da4b9db596f485760bbe1930fac368150f17b6b96675c
+checksum=f58d2483ed2db9cb77621bce3b3c6babd8d1153954030c0dc52ce399c6d28ab6
 
 do_check() {
 	cd build

From 9f33e7adeb12d5d59e95bf89376c806ed4c45068 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:58 +0100
Subject: [PATCH 0615/2561] breeze-icons: update to 5.92.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 6f8860791ca9..017805c60580 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.91.0
+version=5.92.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=c17db793b931a640f9db4466e1fee917127809f80ac8fc65b2273044ec23422a
+checksum=49e09663989fd3498d61cb7518c741c87a702689b6d6074097d628264a064366
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From 4e90c9a8090585551b9527e6c94318fceea3986f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:59 +0100
Subject: [PATCH 0616/2561] extra-cmake-modules: update to 5.92.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 b96991061327..9c034a06303f 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9717885e30aadf184fa71511930409cabbf08eb6627ea8b051de8804fbcec54c
+checksum=f89a238bc5f28738db25e29296b75b4f795e3e9bfe3a8f1f9390648749d303ef
 python_version=3
 
 do_check() {

From 1982a395aeee3a90d803d15bca5bef6d4f662329 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:01 +0100
Subject: [PATCH 0617/2561] frameworkintegration: update to 5.92.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 861978967fd4..9840b077f5cb 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7fbc8c3b949849d22161f78df453d759389319a91b4925ff235799e410c5e684
+checksum=bd8ef6f6656c9756a56fbfa1dc91273426ef3ea5fae3e7a4c7dbeddfbbe3ec5d
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 59aa681e1cff19f8e476519a72ebf450c1784b5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:03 +0100
Subject: [PATCH 0618/2561] kactivities5-stats: update to 5.92.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 32d213d3787e..8957274d1f85 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=98fdea4517529df0b1b733425a040a80df680d44bb7d27db10070828a9c3c420
+checksum=2206132e0edbb8271f77bb6c45e794b8d3baa3d9b4f94aba005556f9fa3ff751
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 9bd6ecf9e73a924250d9cd36394a43150aade1c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:04 +0100
Subject: [PATCH 0619/2561] kactivities5: update to 5.92.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 98ae1f92c4c5..75438b590eef 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=c0c811b91ff79cb23b99ec85b390ae331107a010f522ed45600ae6274f87c40f
+checksum=fc06b6fc111f5ed8450c1c1c96f36188328b2292001ca3bf3293d0f68678dbcd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From b48897809988a04ac90e753fe83f5f656f92b5cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:05 +0100
Subject: [PATCH 0620/2561] kapidox: update to 5.92.0.

---
 srcpkgs/kapidox/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 0bdfa70566af..164a36aa99a3 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,9 +1,9 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.91.0
+version=5.92.0
 revision=1
-build_style=cmake
-hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
+build_style=python3-module
+hostmakedepends="python3 python3-setuptools"
 makedepends="python3-Jinja2 python3-yaml"
 depends="python3-Jinja2 python3-yaml doxygen"
 short_desc="API documentation generation tool for KDE framework"
@@ -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=434daaf49056471af72a97043c054d0104f1341f92a4464f66a2256233a2b7f7
+checksum=4f5201de5878bc3fb24f9e2ebd387c0a12d7a27c407636bc878bab5a3999a56d
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 756930e30e162590a5225e9a4c6df1ba079e1563 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:07 +0100
Subject: [PATCH 0621/2561] karchive: update to 5.92.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 73aa932596b0..109cc7a0ec29 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a3602cbed2aaf4d446ff7af78b626042aa6fbce1df60eb2b8332b5f6ff214cce
+checksum=5076a28c3a10ab755454c752fa563a4be7ad890f391c43aaa2ee4ee4b6a99fae
 
 karchive-devel_package() {
 	short_desc+=" - development"

From bbc1bb559915203efb662edeffc75afc949ac628 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:09 +0100
Subject: [PATCH 0622/2561] kauth: update to 5.92.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index e8ec33646919..05ea13c55c39 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f865cb134cf4013496940d48f397eae6cf6bc5013dadf911340c23bd7ddb3a00
+checksum=44824bf68ee510d8aa0189a9d4b44568b0fe20d17ba45e3b739db1927bfa4728
 
 do_check() {
 	cd build

From 61ea87df4f5cf407580f73fb56502e16fd59c6ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:10 +0100
Subject: [PATCH 0623/2561] kbookmarks: update to 5.92.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index b8e10942ed96..c845e8909a62 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a42233135dc255a0ff0147f22f9446c2b5932e6b11198aa099fdadbbf5b30e47
+checksum=99504e761621b56e07a561e1caea196fe4623c9334b889f081e3da8e4a19d543
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 94aadf47acb507c138653c3b79db8a015bab5b93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:12 +0100
Subject: [PATCH 0624/2561] kcalendarcore: update to 5.92.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 1011f4c91672..3359712d3db9 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.91.0
+version=5.92.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=37f6975c0ebc8d1983f7c8bef96104dbad705a6a0fc59be53548fd317f05763e
+checksum=6ff2e68dfb8b92e0f181f3f19d20991bfd589b4a047b313af908c41391560b3a
 replaces="kcalcore>=0"
 
 do_check() {

From deaf7d0651e3e11ac3f2fee09d20113e95c980d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:13 +0100
Subject: [PATCH 0625/2561] kcmutils: update to 5.92.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 5e53a48e1b94..bf26425f364f 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a195d83a092c493f10f372e245107277c275a418563cbc443a884ef4e4e3901
+checksum=dd49e658fc85c215442a7fa9d2435819f0bef13c997a6c2a51557b82e1bc8d3a
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From f399c6ad993a5088cb06c8a91baa8a5fb170a196 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:15 +0100
Subject: [PATCH 0626/2561] kcodecs: update to 5.92.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index d2c0c19513e4..3ccc8f79b638 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3ec08377a1b2cbc30401ae9e43e1394c61635ab7537a37dc297cdc4deeda7c62
+checksum=d6e5b7a453948d5fa0482715eaf4a0c9abe5b902a0aca15540a04b1a1b60d275
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 4c649a38fb456a980df820b564fd241767d5142d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:16 +0100
Subject: [PATCH 0627/2561] kcompletion: update to 5.92.0.

---
 srcpkgs/kcompletion/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 5273d19526cf..8514a8625df8 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,20 +1,18 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-hostmakedepends="kcoreaddons extra-cmake-modules"
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
+hostmakedepends="kcoreaddons extra-cmake-modules
+ qt5-host-tools qt5-qmake qt5-tools-devel"
 makedepends="kconfig-devel kwidgetsaddons-devel"
 short_desc="KDE Powerful completion framework"
 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=2422485b10de631583b7e92e0778e5cf0c0ceec677bcd289cb7bc04c5441dfd0
-
-if [ "CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
-fi
+checksum=08f1525c6cee8babe399c941bb85d04be9dade0341d1d85c6beccd2e93dc7ceb
 
 kcompletion-devel_package() {
 	short_desc+=" - development"

From ee5895d5f9bea1456a925debd95b737e0a3c47ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:17 +0100
Subject: [PATCH 0628/2561] kconfig: update to 5.92.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ea135ef30580..44dc8ae429da 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a63c3feadc7b6b94d8e06ead5430289742f62da59dfa4f0ceaaf237523b6ad2b
+checksum=7801b641b88368a0c021272073c692337b42ee28f0025d106942c8ce873b0523
 
 do_check() {
 	cd build

From 7e8ec08d3ecc77cc6641b7aeb45e1526ed283b6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:19 +0100
Subject: [PATCH 0629/2561] kconfigwidgets: update to 5.92.0.

---
 srcpkgs/kconfigwidgets/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index d599b5212dcf..f14d66ae93ef 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,8 +1,9 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
  kconfig gettext kcoreaddons kdoctools"
 makedepends="qt5-devel kauth-devel kcodecs-devel kconfig-devel kguiaddons-devel
@@ -12,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=028493a1515a6c965ea0eecabc362340af1d2e8463760465539c980d03d8bb06
+checksum=4259eed35d9ac307ecc30e64833bad7a89ef58fc7125054eb39716d27a4a274a
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 0a8d97ecebea626a658e4ab61573021946d1312a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:20 +0100
Subject: [PATCH 0630/2561] kcontacts: update to 5.92.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index caba0dd7ac70..544ae3c7f4cd 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.91.0
+version=5.92.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=1b067820de0370a0da43b069f4c9cafb411bb201fcbb112b9743fb9d134b03b1
+checksum=1276006e50f507216a8241ca4b26b02c67c42e5bee26a6b391db6ae4f72533ce
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 7527c4319ab602b28df7d049da0d8f28818bf8a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:22 +0100
Subject: [PATCH 0631/2561] kcoreaddons: update to 5.92.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 78ba65403249..4838e315b9d0 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b
+checksum=df5f718f324aa2b58191438c8aa5f7498a7997eff990d16ffbc9f19efd1a6667
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 8b07d10a51a90208b1f768a5ab76b9de0612de1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:23 +0100
Subject: [PATCH 0632/2561] kcrash: update to 5.92.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index c29cb5cf7b89..b9fadfc544d0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=544996a31f616a274961c12023fc0650deeeb9ef50125dffbed10c556eb5b33d
+checksum=9bc5605b5026f55d9c2c1ca32c79842c3ad0f5c042e480fe1e7027b2692526c7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From e75059782dcbcdb650d56c28b4ac6fb1f8d2537f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:24 +0100
Subject: [PATCH 0633/2561] kdav: update to 5.92.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 5e01417e90cf..caa894c1356c 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.91.0
+version=5.92.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=5b8cdae0d401dc24bf0cd98cdf35de30501111968923953fa687552ae61adc08
+checksum=f3b16c473b104f83f6124f96f2b06a6c72a447eb19ba31a90e3f4725e732b1c4
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 204c9704d7b617e0b89246cabc627b93ba82c719 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:26 +0100
Subject: [PATCH 0634/2561] kdbusaddons: update to 5.92.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index f5048739ac11..741652529177 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3a726a9ba053c2e484b5d1d2e53b361bcfb039414df488d6bc7e29a281bc10a3
+checksum=7c03f33cc49ffa80e509f654f410cb142e917bceb2f35f08836dc46ed268ae54
 
 do_check() {
 	cd build

From 17fe35c99ecd93e0d4656685cbd5f703e0d804b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:27 +0100
Subject: [PATCH 0635/2561] kdeclarative: update to 5.92.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 6e7faaf667aa..2c6a351f34f3 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ffb8fb0edb1036aa310f1a80344e5a7209cfc9dc1bff086ed458fa0e58716da0
+checksum=fe964d77fea37c04eee3863d2b4227b76e33f16583906c284b532a461982d5b3
 
 do_check() {
 	cd build

From 93e0e1d785358f96ee7672b926256c9aba80f317 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:28 +0100
Subject: [PATCH 0636/2561] kded: update to 5.92.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index ab0aba43e07d..15d1ebbf684e 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e59e6d0fbdad184b2e0d59dccedd1e5be53ea21959d0e828e1bbab4f7bd420fe
+checksum=8335531b856cb361ab2e5b390b333eb3405bac4e2bc7c0305994704bd0540e6c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 5c0414b5ade7f078826d1966412ba83f3fccf8a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:30 +0100
Subject: [PATCH 0637/2561] kdelibs4support: update to 5.92.0.

---
 srcpkgs/kdelibs4support/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index cf84ec928b38..5e8bc71495b1 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,9 +1,9 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-configure_args="
+configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="kcoreaddons extra-cmake-modules perl-URI pkg-config
  gettext qt5-host-tools qt5-qmake python kdoctools kgendesignerplugin kded"
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=4f6448fc6d03801b8f0e440aecd12e299631ae375c5390b343719eb85374e38c
+checksum=292e5e84ad8d7de90f0666b51f085a25b7a9faf521c58379d470d2994004ede0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From bd14a9e3c34786bad72e3df8a8d79668c2308de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:31 +0100
Subject: [PATCH 0638/2561] kdesignerplugin: update to 5.92.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 4ebda348f4e7..8b811b777580 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d89cfb46171bb467de99bb22a56328cc881621a6ad1d091a4481ccc17cde9b1e
+checksum=066859b345da224f5edb601a5f448540330c9a286980b0c34169646c26a22a4e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 03acda9dd39e05b56e2baf7215e6cb6876814c1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:33 +0100
Subject: [PATCH 0639/2561] kdesu: update to 5.92.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index fdd9dd503c85..0ba31e7e1a34 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55da7ee8c24e49dfd8ae49e1d006e67f541d35d111df412c5eaa8180784a40f2
+checksum=4687dc87a9ada0675801e0c575467bb5f7f7fe21b67ae2ffd1fed80736f95efa
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From a122e73214dea2c6e4951be5e9d93fbefae5ca23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:34 +0100
Subject: [PATCH 0640/2561] kdewebkit: update to 5.92.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 8d09be212334..df9fd862a13f 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=18f361573109e95f39ca1fda04f973d9f64eb4f6ecba3dcea877e5df020796d6
+checksum=4d0a773cad86a642cb90d9844757569f2e2e9d1e96ccf78f73bee885c908d1b6
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From ba35b1a65a6cebccd2637c9752a024900e182be1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:35 +0100
Subject: [PATCH 0641/2561] kdnssd: update to 5.92.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index f1c7e00db25e..a48bf7f3e254 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f58dcaf51b7188cde16f3b0a9ccf5e7550fe09ca2d9defc3e0ffd4d0fe4bfea
+checksum=5f36af49faab84d8ae7ec46f1ba3300c9cdd3d8820dd1e7e48c5c37bcdd844d4
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From fd8415ece5d893bddc1dc0fab099f465215ae2d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:37 +0100
Subject: [PATCH 0642/2561] kdoctools: update to 5.92.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 3bb244a5efc3..5e38783fc1b3 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7620010ddfaec988715be343af4e35f8bac75b5e14d1fa9d3bdbbe620925990a
+checksum=86a3aeb8b91dec0e1cd81b646654ebd750a8aedfac9b4d53b9b0019a91720870
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From e4ac1bceea87c8aeb55a4ac4db978130946ea6ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:38 +0100
Subject: [PATCH 0643/2561] kemoticons: update to 5.92.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 49efd8397fd6..2a4fa32fee02 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10287a304fbe0bd6992afe29313c156883591639c9e80ec26e76e683709cf6cb
+checksum=fdcfe30941c18a9cb29b58459fbb2ae54a55fd5a0e8688f0c59a7cc7ebf09f07
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 1779f85b9cebdfa76b479bfdf960c4bcc0b31c70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:40 +0100
Subject: [PATCH 0644/2561] kfilemetadata5: update to 5.92.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 46d898853023..ab36e2d86496 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=380335d7f08653d0d85bdcde5b93e72d94c6101cd3719bc4c0b26ef6730403fc
+checksum=d624d3551094cf73d802b6e95bcd78577ce9eb1e9cbb9a8f340dcad066ea15ce
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From a1b1b624e5a229470a4ec001f98f18a16c85e0b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:41 +0100
Subject: [PATCH 0645/2561] kglobalaccel: update to 5.92.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index a5c99e6e1fca..2405d1b174d6 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c0610c5dfe078827594e0f32793f0fae87dcee21b75fee491850a7e0cc639a27
+checksum=be7b1e279b63678ec4042f896b159d11c115d05e9831cde6cd67ef4b8e581452
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From f9865931cfec3cfd310a2c912b2d5feff7d87123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:42 +0100
Subject: [PATCH 0646/2561] kguiaddons: update to 5.92.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index fb6041e3b4c7..ea01d37e9ab4 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.91.0
+version=5.92.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=7e56c2d826973632ee90b091c50aac53feb88409f5d2ad76d1214452efa6c83e
+checksum=0f6775a565f22900b0de53daa5fe73f7d7e592663e0bb442a8e26ffab27fdf5f
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From 6d19d945c47805ed2a35f5aae4163f5df4889c2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:44 +0100
Subject: [PATCH 0647/2561] kholidays: update to 5.92.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 42b08406e942..163b2dad1ca3 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.91.0
+version=5.92.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=b55535746cd3b56270fd19bf377f7256bea00b4f8690449e0580225f6275bb98
+checksum=0ed382c49fb10af87bfa3845a3919ed097c9f808f3a5dbb631ef4e68c86b4b10
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 45ed0918871b3f76207e9434c3fda3f2acad79e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:45 +0100
Subject: [PATCH 0648/2561] khtml: update to 5.92.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index d3e481756f67..7415d7e78a24 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.91.0
+version=5.92.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=a40056d988fd77bc4bd3749465ed5452701b7e4948e10dc67fb592925c98b3d1
+checksum=91a1d79ea382a25614810cd59f800f0a34c6e86c69ef6d0a08d2655f2a93171a
 
 khtml-devel_package() {
 	short_desc+=" - development"

From 2817324b17c988579671073b835632c57f287c41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:47 +0100
Subject: [PATCH 0649/2561] ki18n: update to 5.92.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 8d57346febf5..8b0d17610f56 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -13,7 +13,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=9e1a8be4e1c0b7bbae262dfb0fffb75c6ec9efe2bd2fbc3fcae3ebbf9f68ed85
+checksum=058032e8e9556f1dadcf0c2bd633da6cfc9673e966dd113388e2b8aee2395777
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 72d29b1a6e8a5f39f441e8e6824888ee491675dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:48 +0100
Subject: [PATCH 0650/2561] kiconthemes: update to 5.92.0.

---
 srcpkgs/kiconthemes/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index a1901117962c..65250bdb3ac6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,8 +1,9 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
  gettext python3"
 makedepends="kitemviews-devel qt5-svg-devel karchive-devel kconfigwidgets-devel"
@@ -11,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=820d592beab1547265fcc2a61f6262535b85d444a05fd67b4eb2f11d9f2510ce
+checksum=2128710ff8bf0a7bbb699fe3a45b231c6b4607ba3e3a3a5d03c25c809233cb23
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 641eb340a7b1f1b45d588d574d54ffb2fa27b3c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:50 +0100
Subject: [PATCH 0651/2561] kidletime: update to 5.92.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 4c57030015fc..e9ed68131b14 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1b23a2503defae1fca23bb1574439dcc24a2856c3603587c903f8e8b188f158b
+checksum=e12f14229f7ee587becb5a693374045c460d38c55d61e21eefd78b8db39280d7
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 42b92b51fcaa22e6ba64709f93dfd763606749d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:52 +0100
Subject: [PATCH 0652/2561] kimageformats: update to 5.92.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..ebd6e81db298 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
@@ -12,4 +12,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=aba371cbb11afba36c394beac443f1e8d3ab9d84801f44bcc252f13e868dc835
+checksum=ce049989125a49dc9bf8d2a2f2f5a2fec79e25a6343087b024fefd0131eca369

From 1f6ca315e22a5e273461f986d1e592dcd109667d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:53 +0100
Subject: [PATCH 0653/2561] kinit: update to 5.92.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index d84e3c0262cf..a0b0aaee9112 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=71c3d83e2303f01bfd936351260ee3a7e0e78de568c90dd9236f7d5e8998c2f8
+checksum=cb517912bf17d4b4f015cb1ab935eebadc52ece050f21b33fcb4e799b0c5f3ce
 
 kinit-devel_package() {
 	short_desc+=" - development"

From ba526da14acaf81c4889308855f289a8b7eced41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:55 +0100
Subject: [PATCH 0654/2561] kio: update to 5.92.0.

---
 srcpkgs/kio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 8062a9a9958d..ba96fa5e727d 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,9 +1,9 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-configure_args="
+configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="kcoreaddons extra-cmake-modules kauth gettext
  qt5-host-tools qt5-qmake python kdoctools libxml2 kcoreaddons"
@@ -16,7 +16,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=f2ddea299f3dc98835df445dd1d622d90233115ad0200e75da5e954523466293
+checksum=d4433f9890f71afe3d7d268e978e0ade96f506a38e41f7d57ffe832d96d44cb3
 
 do_check() {
 	: # Pain to get working in limited enviroment, excpects e.g. real disks

From df749d6d4909d49f6a9031b15eba82655f6e0fac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:58 +0100
Subject: [PATCH 0655/2561] kirigami2: update to 5.92.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 2022a2ec1501..1b85d94048f0 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.91.0
+version=5.92.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=8cd3675c5ba2c656648a7e54b6ad4d89f1dbc0d0ff36e59acd2252681497d445
+checksum=0adaff98ea70c577c9e6d7a688e5c52529a59f56a7d0c8ffce295f342e203d5c
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 99cd423fd6574bc773436fcac33c5c57eec7a5cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:00 +0100
Subject: [PATCH 0656/2561] kitemmodels: update to 5.92.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 4018125a9f3c..beaa9faddb9e 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=081c7fcf4ed9ec4034720bf87c9592b67603b6168e645c8f0129cb2d787e33a1
+checksum=e65c7f58d602b4b8160b34a3a841d1c7aac77695b73e53aa715765cf42a8e89b
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From c35b8c12061b7a228ccf1586dae916700df2f13f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:03 +0100
Subject: [PATCH 0657/2561] kitemviews: update to 5.92.0.

---
 srcpkgs/kitemviews/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index a0b0e70424b3..ab3405ab8350 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,20 +1,18 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-hostmakedepends="kcoreaddons extra-cmake-modules"
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
+hostmakedepends="kcoreaddons extra-cmake-modules
+ qt5-qmake qt5-host-tools qt5-tools-devel"
 makedepends="qt5-devel qt5-tools-devel"
 short_desc="Set of item views extending the Qt model-view framework"
 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=68883dbd26401dbde559ca60fe1163e881d679d9cb83697cd5f9d9b0eb279599
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
-fi
+checksum=058b4d4228387558b03aceb0ed286cbbe89ea07bb6fed968beba0b51678886d6
 
 kitemviews-devel_package() {
 	short_desc+=" - development"

From 7475d532c80f953698f2509b4ddcd177cbfcd68b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:05 +0100
Subject: [PATCH 0658/2561] kjobwidgets: update to 5.92.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 052dbf157349..cbe04600c928 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -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=5b909845e5707689e010d636cd36fb9b3b11fdddd37561b27d71a2234df3f392
+checksum=df24b96f77ddbd2f63a6c2a3c54c4e712ef11a63b93c0b02d949d85af2fb8526
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From c635c972150a783c60c2de2db5fb109b4eef407c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:07 +0100
Subject: [PATCH 0659/2561] kjs: update to 5.92.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index d919fb3c55d5..6990b50f3feb 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=322309164f54bcc7b0a8c338f8088160cf61ad6e5bdb95a77c1f72e4aaa57c49
+checksum=04072d527501c92f1e0144e9dcc114e108bfb5a2b50bed8a9b037474aaa6f118
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 1e70f0dea9980e899e6bf424a27d2f9e6f4d3694 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:09 +0100
Subject: [PATCH 0660/2561] kjsembed: update to 5.92.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 5d411c05ac57..f606b2123fb1 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=c0d07cba5fc4173279335f8bf696eb6e013696a19eadd3851f4f428942399e88
+checksum=d7c26538a0b7ac804565840d61df2681ea4b729abb6ecfbfcae3c20536ca6035
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 752f4997eed27126dfa4678f03b6ec1328dd4f92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:11 +0100
Subject: [PATCH 0661/2561] kmediaplayer: update to 5.92.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index cdd6be6a66e9..5c9a97d7230a 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=018aea7a06b09b9ebf7dcd6c1cf50caed144b91d0e449bfc31354c24f357c966
+checksum=fe38eb2ed593e2e68909129a042d52121b12b9350524a7a1463c24c9c58a97a6
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From aaf1b27aa632a36ae0bd829d382c692d218e6689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:14 +0100
Subject: [PATCH 0662/2561] knewstuff: update to 5.92.0.

---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index ab225ccd0e87..ba2a38d746ca 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5dd9fb32fe7e99b64f8dc4b8801bbdba5dc5ba2eda9bec2fb1fc563a53ec6a2a
+checksum=4b14aee55d7701c72d05030fad508a5cb89fee34656d4d84c2d977a3c2a66c3f
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 66c41b5297d79f250bfcf586f6fca6fcc130ddc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:16 +0100
Subject: [PATCH 0663/2561] knotifications: update to 5.92.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 0d5472d38369..27a83bf27de8 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f5f78ae7ca381524f990ead138ea68796a185418e608646dff216a846bcc0788
+checksum=8c4e095e3d96140f19e9f2e2dbc74df174e29416455671fc6680828038ea94b7
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From ca79d7c8488f65eb80e0ace388e6a81fbf3faca8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:18 +0100
Subject: [PATCH 0664/2561] knotifyconfig: update to 5.92.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 291c1b38c0d3..f33e7ca63304 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cedb0993e813f063a14b91b3db13d986a4501a5b8d52dc74992a57d4e0ada51e
+checksum=f7f452e3197886a2afdfaa5a2954d412eb0ae2bc47ce742902765c053239313a
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From a2cafbb91eb0e546971fff74d58f0c6bd2d16b9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:20 +0100
Subject: [PATCH 0665/2561] kpackage: update to 5.92.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 290c11ae3c2b..7488611aa6d5 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.91.0
+version=5.92.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/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=51309ab8fbb5774f04ef989b15674df63348cef97f349a293f202817b9a3888b
+checksum=361f75fb4e3dff46e6dab42d858488af58fd40f3af1f7a39881ea9240cd866ab
 
 post_install() {
 	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \

From 989812f67ecc6cebe24ec6677c11369bdf24259c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:22 +0100
Subject: [PATCH 0666/2561] kparts: update to 5.92.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 9e64fcbea098..681aec459145 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.91.0
+version=5.92.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=f2ff8a873ae20899233d7ff8936204814d1ccbe1786fa872b5922912c232d182
+checksum=094e18b2e9119f1c197c625235e639204ab5aa1910b13ae4317c8145b4fe3318
 
 do_check() {
 	: # test can not find packages assets?!

From 7d7448c24f50ded85abb165c282aa76ada5b7f4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:25 +0100
Subject: [PATCH 0667/2561] kpeople: update to 5.92.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 5dd2667bd74e..717d2756b92d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77bf43f6714e2b82029b7a45d9a72779e28540375dd6d0e63f0fddf418c28226
+checksum=b313729131bfbdb0ffd24ded926a2c6604dd06a18bd612c2ead6aa886f29c571
 
 do_check() {
 	cd build

From b9fa925c3460f3b5c19d52c89bfa1b8697493ce5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:27 +0100
Subject: [PATCH 0668/2561] kplotting: update to 5.92.0.

---
 srcpkgs/kplotting/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 1117f4d380fd..6b6fa4db6f88 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,8 +1,9 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
 makedepends="qt5-devel qt5-tools-devel"
 short_desc="QWidget-derived class for easy data-plotting"
@@ -10,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=46eb996698946d7b0dc60d69674b26a06278a7f8f8eb588504d1b1c423adf565
+checksum=c95d63e2e4c4abbf625ec1cfe749314c1a90dc5be4a90a1ea1617bc969071ed1
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 64cfdbea8d24d26feff180066ad4c8e97b28b676 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:29 +0100
Subject: [PATCH 0669/2561] kpty: update to 5.92.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index a9e42a08709e..28f4d371f530 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0da072117ddcded5de1d9befd2c1cf0b471711607902d03cb57bcf384d9ac1fb
+checksum=cb1dac5f8f7ba059ef967a2cf3d1580a29a8d7b373ef67e82e0ac4f0285ee052
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 3c8d987e5b6d88565193b36fb895b4b0451dee86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:31 +0100
Subject: [PATCH 0670/2561] kquickcharts: update to 5.92.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 8d60b9b72a24..d2d5278ba25c 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=930178d092b6e04394d739bf6ce11f1d89c5d7d167ad38ebeb689d226af511be
+checksum=1a430e2909b137466cf41c334a60ebc01e4cde82e71acbb167cd64d1f13e8678
 
 do_check() {
 	cd build

From 7a4df1365a5833ac25537fee4433c64637c2a68c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:33 +0100
Subject: [PATCH 0671/2561] kross: update to 5.92.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 55fc9c207165..14c6ba42f541 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=54e17773868cc6ecd91a5927ee475cce49ce225f5ee429ff725aee2a8110c819
+checksum=129e2840eb1f33c95d50cde79a82f784cf735c3f1ae636f15dcf695c0b0c1ebf
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f7c7a3173a717eddbfefd32772b58960a42fd834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:35 +0100
Subject: [PATCH 0672/2561] krunner: update to 5.92.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 48e0ed1e077e..4fab48018a19 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0677f9409d1d60e53608632cdbc04aa7454ed4355609bee6bbceff994be12a9e
+checksum=3fc80c5d66359e4593115b58fcd055ca9cab8f23376123094e13c5d4bdc48fed
 
 do_check() {
 	cd build

From 6d446ebc0249360680d1114cdd2dcddfbcf7d911 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:38 +0100
Subject: [PATCH 0673/2561] kservice: update to 5.92.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f5fe49932018..adda7f1fe8b9 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=779d11c436887c5300c6f3bf477ba334673444b3e9d3212a0cf12a1f653b9254
+checksum=52e2d9654bbade7db91c647192b78bc3ac1feedc0c279e9c371142aa5ec82ef8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 225b593cd19e8553e02b6e73e56ee197d1ccf095 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:40 +0100
Subject: [PATCH 0674/2561] ksolid: update to 5.92.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 840ffdae067a..d954a2e1318d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=4f561eaa048a6c0e35c3bb14b8bc1f637708afff689f464576bba2e7ab0293a8
+checksum=8926c859af4b6b14e0967fc3b76ca0e76de27d0ab544087eefdffe40518b5a9c
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From f25c18c5c4618718d4edc0e771b0f0d078a39112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:42 +0100
Subject: [PATCH 0675/2561] ktexteditor: update to 5.92.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3b5fdaee2411..3dcd6b5a7433 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,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=f532a1e0621d8a257387758fa616c43729dc2811c22894c656ddefe2c3367fae
+checksum=bcd01c3ca07d02106de1c68156e568ded7686ca9557b30a04f7b4e24cf43fb8c
 
 do_check() {
 	cd build

From 3de8627164ffa9323d1a6a79bc800c1b07787123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:45 +0100
Subject: [PATCH 0676/2561] ktextwidgets: update to 5.92.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 0e36a76dab5c..2768b6f1ddcb 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c41a6ae85345c33188c251e011a43672641fe489243c3436a1e1f15aa6cabf76
+checksum=fe867bf498a5170a9fba91dff652b68fa5cae2af8864dbe89a6e54638ff90b0c
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 8cd31cd13548e66491963dace77958d0824fdf1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:47 +0100
Subject: [PATCH 0677/2561] kunitconversion: update to 5.92.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 45b3b894cbc4..73f122a4fc6b 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.91.0
+version=5.92.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=57456b649efe2488f403e7b3cae73a734b3b459d32100b6b143f1c8d80035b58
+checksum=47e2b4c4b329562044954a67edda4d5ade953bd2a9760f6214c5f8f17239f09e
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 8e7817b0d3bbfd153e611e84af679ef0a3b7b9e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:49 +0100
Subject: [PATCH 0678/2561] kwallet: update to 5.92.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 3133eb1e48fc..6d2b98d6a7a3 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.91.0
+version=5.92.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=3736051cfc42598368704b36c36f41482f778c45ba22a4e591389725945938fc
+checksum=71aca76cb0edbf569827709b073bff2edb5c129a85638df4bc666d70786740e5
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 1518795002703bf6dfa23ad6edb623bbd9d38bb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:51 +0100
Subject: [PATCH 0679/2561] kwayland: update to 5.92.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index b23c3b67f2c3..41c3aee75184 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.91.0
+version=5.92.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=3efdfa6539fb0c053092ef5f178d0ea776a93a35754eefb1be348dcbd46403a8
+checksum=95e097cefbe4e260129d77ab9fe3013818b85b9aee6e4744acfa1ada96fed195
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From de8859745ec532b170c7fd831bbfc9fc7cd03c93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:53 +0100
Subject: [PATCH 0680/2561] kwidgetsaddons: update to 5.92.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 7fe825d363ed..324be77968b3 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e3b4dc3db4d608b2a725e9087ca3add1105e4027e7e47d10f96c2eff344af20e
+checksum=d0e3558d6a7ed550f31d319e6b52d6ed61d693a1aa50e6dd4f430a1324111f2c
 
 do_check() {
 	cd build

From fd883aa7861521f5795b14f477398ba93a72e8f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:55 +0100
Subject: [PATCH 0681/2561] kwindowsystem: update to 5.92.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 71e5dcbd752c..dd6ffc7afaab 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=257990566f0ef96ca23e84eaad7a66a28dd67493b6cd5c6fdb3a2fe5b613c0fb
+checksum=dcdbbd2b4f2372fc225141361a7d9ae4a8f28ed77a266dc22c20be473fdc7d80
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From ccbf59ed414962c68a020c390be5fe5c85f307e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:56 +0100
Subject: [PATCH 0682/2561] kxmlgui: update to 5.92.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 79b5b2b3e0f9..4f30b9703ae8 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2f68b187570e22c7037fdbcff83ebaad8b5c77fe1bec166c059da6d475149ce3
+checksum=e08b4c0d3cc39f788d918bd2ba331966a8af5208233c38a27f029f93a597b743
 
 do_check() {
 	cd build

From e8fa2a86d6aa7ee2b23cd8d40192516859243a20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:58 +0100
Subject: [PATCH 0683/2561] kxmlrpcclient: update to 5.92.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index e658982b3b62..619fe8a1d3e6 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=f0c2a92910283997c21c4f49b2bb074c1edede63706da89f965711cc8babdeae
+checksum=0e32dca201f8b3d241e985c8dd8854774569d08167a9f3f060a141551e19beab
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 782c5f85c7ffcd0c7827a82dfd1eddde7a180cd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:59 +0100
Subject: [PATCH 0684/2561] modemmanager-qt5: update to 5.92.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 c9a8158b6bfd..920b6b1f5705 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a2673f18c7866d39c9cedca2f86540c56baf966a2491a86ca06a5a0427358496
+checksum=7ed0b4f48a781fa9166e0446ac14fc21036195cb3d800ce21a546cac02fe5898
 
 do_check() {
 	cd build

From 7fcda432f4f43bf5620f8fc6eb4257df2af1fdb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:00 +0100
Subject: [PATCH 0685/2561] networkmanager-qt5: update to 5.92.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 1b0b32a2346e..bc475ea12153 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=2e20ffd995ce64a90b1133b594bab2b2292be54e538f62633e78e8296cc44738
+checksum=51ddc8ec0ea60c87c49d5a6709eed86fe1e066d57d059a7f9e774c97b81bfa64
 
 do_check() {
 	cd build

From 9794112eed51c28e826d727593ff9401617905f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:35 +0100
Subject: [PATCH 0686/2561] oxygen-icons5: update to 5.92.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 30893cc109ae..94d05f08582d 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=51713501fe067cd34d3c296bc2b891d62ed2e3c4f26ead36323f8adc3d157248
+checksum=ca88b03fdd961f9f8bfa449e1fe74e3ce66e11937be9a8f6d1569a46f6429ef1
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 670a9643a707472bc6a757ce223e3bf62e6a7bf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:37 +0100
Subject: [PATCH 0687/2561] plasma-framework: update to 5.92.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 fd74fc2a4057..2ab058fb3036 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f4471872b4f279e2979f661f2792f0afa8af5f15896bd9e6a08e1ec7ed85b079
+checksum=c6c2bc624564c74fd80bce170a1c763803d5207ef86108b5724fcba73c3506f7
 
 do_check() {
 	cd build

From f0ae5bbde0a0eadc19dac33d51ee7219a892d498 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:38 +0100
Subject: [PATCH 0688/2561] prison: update to 5.92.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index fa4b89d45a38..5f1e84c53f7d 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=8f61c6c351e018df29a837a2d276d088b61fc844af406ea2d4f221f8e5b83f4c
+checksum=7e6fee9fd56be6c4589c106a3c16a28a4aa5832a24dcefe88302a9ad113ee41e
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 6858410d8edf6d478f7d20433a107dc680f24375 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:40 +0100
Subject: [PATCH 0689/2561] purpose: update to 5.92.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index c4dbc383d75a..dc71877ba34b 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=952c012d347f0ca6f1dc1aaad7e0ab538699bcaf9099fe8b25ddafd4cebfdcfc
+checksum=94613e180550f9d15443ced1f2d93b566350d9a981205b4f98923714dc4f400a
 
 do_check() {
 	cd build

From 0345ad3f84c1598eff2c7fd21bb747c26b758ee3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:41 +0100
Subject: [PATCH 0690/2561] qqc2-desktop-style: update to 5.92.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 3ac4ebda2d10..5af0197811cd 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.91.0
+version=5.92.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=11d52dfd9f576ee4933b32c6dd2458c5e25836935d9dcc27f3c845e8dccea965
+checksum=97530813b9a80505b5484175a55be49cc020244fbe3b1bdaeef15845c3c9bdac
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 29e3471aacdaf12ca8fe9fe032bc2eac1eb69c56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:43 +0100
Subject: [PATCH 0691/2561] sonnet: update to 5.92.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 8270d62a11ef..b7d08f3d959b 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.91.0
+version=5.92.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/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bda19e339d19ffcfa6bfa74eb6f0cdaf75e2537450d2deed03f45f4a6b91fd18
+checksum=31fc1dda3db582337529922d38b6eac72b1551c4a0d86fb9307363e061d05722
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sonnet"

From 1d1ac939f94e41304e7c4111103b9602e135f1e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:44 +0100
Subject: [PATCH 0692/2561] syndication: update to 5.92.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 1fda9ff348ec..3a35ebf2c174 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.91.0
+version=5.92.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=fe05fc898c8e5adf23b977138e8b595448805fc2d48c62579881f500ab5953b8
+checksum=1c9ab9772103c001e56afbe0356ede04f953b07be8d2c2e2f2fff3e7b5bd5d46
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 4f20bd5a334d442b12a9a02a7178ef863102da3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:46 +0100
Subject: [PATCH 0693/2561] syntax-highlighting: update to 5.92.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 d390c1ae40ab..5ad6ec877834 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=370a45b274db90e8d2d34d61d3f665a3f1f9f552d4503ce5805a47f445c4f93a
+checksum=99347eaf9b2249f875cacd8319c77f2f8e110d0e7834f51f296ed911dcc7e50e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From a92cccf73057f145f17998307a31b7890fc8b2f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:47 +0100
Subject: [PATCH 0694/2561] threadweaver: update to 5.92.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index da71b23a4849..9d65ff2b49da 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=22485000cf28d4b28a46e7856532339df5e3e49180ee4a0493f3f3491f9e00a4
+checksum=48b0cf3d969437eaeb0839cbb16a35209336fc6e78c1540920f91bbab8b01101
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 1af1b237b1e35ce12dbfb55e075f73c3d5ae765b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 23:18:45 +0100
Subject: [PATCH 0695/2561] bluedevil: update to 5.24.3.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index d504a731df32..a3eb6e450432 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.24.2
+version=5.24.3
 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=24d7501e65149093e17c8545199d1bcae27fe828ded65d6a20446c8fffe1fa2a
+checksum=9dd1566eae8bb793330f2f54ab34cd75ed79e7f3924bf78149077b122cc49ec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 63bfaf2d78731b20289bddfd9601f3525de24c98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:42 +0100
Subject: [PATCH 0696/2561] breeze-gtk: update to 5.24.3.

---
 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 067afa6ce666..8e1a152f177e 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.24.2
+version=5.24.3
 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=2c1f02be02bac5d9098e90901b047ba587f57dc3827dd89b5a868ca80a2f2dc8
+checksum=2911bb2f99ad42ec820cc2adcbf1f8a6f18ba437f72ce216562e12584fd042a4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 4c1597747f7054d14aa6024bbb67fb86bf8af3b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:50 +0100
Subject: [PATCH 0697/2561] breeze: update to 5.24.3.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 9efe5daf780f..0317ba5620d4 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.24.2
+version=5.24.3
 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=5fee72b7bc88fe8d97b575f46de62037ac2f898c7a5ff024e62f1082d60984b9
+checksum=4b8f92e55c72ed59b7bdfe4be6044fcb0a0816fb6f1ea2bdd9884b58b9a92940
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From e44ec0acfea2f3a278561b95451e71cab2419f0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:52 +0100
Subject: [PATCH 0698/2561] kactivitymanagerd: update to 5.24.3.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index ddfa1727d026..879d45275ce3 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ 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=a14714645797114b45c4bd0d87fe2559f4c4b5d4625e100045b25c66fd25a958
+checksum=9cae3e136ee6743474fd96a573b235b6ca8653d4f61f412d9d3ec866861cae63

From 40175115adb77098c9f21e4e9e46d3ce50a00968 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:53 +0100
Subject: [PATCH 0699/2561] kde-cli-tools: update to 5.24.3.

---
 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 15d12bab1ed4..847a7213209e 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.24.2
+version=5.24.3
 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=9549c0474695df4855b66ee2196caa14a0bc3e0179920ae564d149bc5ecf6984
+checksum=fe64da7ce3ad7e7b2d743e06aec0f6666e1909d3ad08867a0173c5c262f7e803
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From ed74cc76fe647fa84bcfca5c9a61d328a794f81a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:55 +0100
Subject: [PATCH 0700/2561] kde-gtk-config5: update to 5.24.3.

---
 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 17151ae771cc..a68d66dbb124 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.24.2
+version=5.24.3
 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=eab1d06c3e3f5c02b3a6608f6b2bc8d20d82f7e2f3ea4c666d4d2f69f476776d
+checksum=fb4bcd30c93e15962153e81ca218f03465f02d1d2d011f267bb96946869ba05c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From c5cea2808e51b4f88d2f5f9c21d4beb4e5fc816f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:56 +0100
Subject: [PATCH 0701/2561] kdecoration: update to 5.24.3.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 5e422f52cb3f..a358d713d04a 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.24.2
+version=5.24.3
 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/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ac5f02324a5d64e81408c30f3c9d077da460b77278eed7f195344d3f5acc8d87
+checksum=bbfc3d83f76dc8d2568bbe2f5395af5887eaba79094fcb901930585f8b53f636
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 1825621146346276a677b9a2190b385a8972563e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:58 +0100
Subject: [PATCH 0702/2561] kdeplasma-addons5: update to 5.24.3.

---
 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 c083d1b0b01a..065f0fede44b 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.24.2
+version=5.24.3
 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=13e62f9091f26eeff7d4bf4a51569c2af561dd051d1c1d94b98071a7465d6cf3
+checksum=86fe08a744e31ce22124bca4337633f6a2523fbc87d915d3ffd42e65da66f23c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f0d099dd92926468fd868e506854d258c6138578 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:00 +0100
Subject: [PATCH 0703/2561] kgamma5: update to 5.24.3.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index a6345f6366eb..30fa3d8e6577 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.24.2
+version=5.24.3
 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/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a31bc51521cdfc55bbb29aee2f713378ba34fcee08326dbb10a2d6486a7a4957
+checksum=66da3bdfaaddb70c6bbf5739eaa970c8a7f67fd8295872ee201a1445c2df9867

From 5b210342d4b4d5a2024f5595c74d6210091235c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:02 +0100
Subject: [PATCH 0704/2561] khotkeys: update to 5.24.3.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 1fef1d71c1a8..1a59a447a853 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.24.2
+version=5.24.3
 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=05ef66dd409b7de9ce6711b2b8931e68cc9eb7978adcb7ed17576a788e5870b2
+checksum=17f45fa898147b7bd9e1bd4850aef10d03c25dbfe088ef46803a817f7348afcb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From a9f6f0a76e06d1d734fc5a398ca73a9b2efc3ac8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:03 +0100
Subject: [PATCH 0705/2561] kinfocenter: update to 5.24.3.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 338b9ec75c01..eac578309f8d 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.24.2
+version=5.24.3
 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-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af5dd1af07e308c42f55d5c2ec472ab5b4ab67bef03d29545f9bc5e6d03ebeda
+checksum=d2f5acb7a52434e6b539dc52d23cf09754e313411b32d169f36403ba0801e223
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 6736fbdc257b2a544c8a124f6a26966f5a634584 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:05 +0100
Subject: [PATCH 0706/2561] kmenuedit: update to 5.24.3.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 0b852ac0c1e5..02793528e9ee 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.24.2
+version=5.24.3
 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/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5e0eb1979bcfe4b66ff010197d8bcb0bcc3f9eab4c5d95c454c7b145d228a672
+checksum=8bc5d0dfef18e4e1f561cd86f2d023b8d5f951ffd7bcc497633e4ad263cb3bfa

From 7c8e51d49513cd23b426199b919126190b4b019b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:07 +0100
Subject: [PATCH 0707/2561] kscreen: update to 5.24.3.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index fcfff4f8cf80..00eb087ad0a1 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.24.2
+version=5.24.3
 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=f8549747eaaca0a7172e57d404207a684ef659ee107c2b2815526d5d5180f489
+checksum=0e814b3db2c952857bc399e9d3bc349b80ad7367ac755c22dae31004c7684bf2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 55c36676413595fccbee0fe010a12c261b557783 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:09 +0100
Subject: [PATCH 0708/2561] kscreenlocker: update to 5.24.3.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 26e5ea06f440..29b2b0c4f678 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.24.2
+version=5.24.3
 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/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcd9d5be26409819903b445d2ebe888ea2e7cba289304b80462e9d701e06d3e5
+checksum=03157ca122085fd6d8eeabb369c363ef706a773ad509eb5c08722a0e4bf903b6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From d90a2feaeb92d4054b479499207a1cea7094e457 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:10 +0100
Subject: [PATCH 0709/2561] ksshaskpass: update to 5.24.3.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 4c8ee2c30d3c..18b7a81583c3 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.24.2
+version=5.24.3
 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=3073957d9e0a18119466db2be4d9d066f3c8f594fa0459031040852c94c3950b
+checksum=3bbe16721dabd7fbae659be3f21b4a386d8ca0a6d288c94ccd3954ecbd4d7847
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 91f67039a8c9ec2a2b17625ef79d2370bcb9ef7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:12 +0100
Subject: [PATCH 0710/2561] ksystemstats: update to 5.24.3.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index f53ab6a923ce..65541c9fde51 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -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-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ff6befbea33add48a7a6fec574576cccbfc6eea6e28018fef06b16cbea2d2057
+checksum=4c303bd73bafb254ca8bb5dee0de3b7a2ec4123e719827d26268625047bb330e

From ddc7c52865edbcad794ddffe56c2be0860082931 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:13 +0100
Subject: [PATCH 0711/2561] kwallet-pam: update to 5.24.3.

---
 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 39d3bbcbe4d5..c32def9d2ba6 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.24.2
+version=5.24.3
 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=afa0dea0d9faaa25f1bb75901cb5d0f031ab55bd6287d75fcd26521f9e92586a
+checksum=33dd50c4d9258d1e3326980192e2523490754cd1724ff704c7e36984e5cdad7f

From 24d91daffddd4a4999cdb1e4edc8c68c522612e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:15 +0100
Subject: [PATCH 0712/2561] kwayland-integration: update to 5.24.3.

---
 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 22e58dc16ea5..95e908c22286 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.24.2
+version=5.24.3
 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"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fb8cab0a35b6fee268243481707613f6cea9715cda96d124a0a508e3b2a1ba93
+checksum=9f6f167fd16aebf550ae9bda176237ea80efae4a08826050ccbd2d7a73de05cf

From 472550825159890870ed569e85cf700c84c725d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:16 +0100
Subject: [PATCH 0713/2561] kwayland-server: update to 5.24.3.

---
 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 162db2394880..7bf6ed477fa5 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,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=147b0312fe456ca5018da641fb5758d94d55eca136d075729d322829634ee247
+checksum=560b20a15b459c5a1e8d0b38e9d53c3a75660bc798fa544e7a9d5c36260e063b
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f09f0027cbead1b21352e2a00ce85b474112075f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:19 +0100
Subject: [PATCH 0714/2561] kwin: update to 5.24.3.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 3630868e413e..435bcc4eb3af 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,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=2aabb59ef884cb2fb3f53b9577d651a1c39977a482bca93d6634ed3593054411
+checksum=d84db7e32a13177a0bd030e6c65907cc37c28efad51ee17c518e402235cbf46b
 
 build_options="pipewire"
 build_options_default="pipewire"

From cb77fc8861e46abe7f557369616f29325ca864cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:20 +0100
Subject: [PATCH 0715/2561] kwrited: update to 5.24.3.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 0b3ccbfeb3b5..5a556a8be1d2 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.24.2
+version=5.24.3
 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=9d88edeacece79f2a8a1cc989b36896c2ad911b31d1c8ba78b4c3406a9b97205
+checksum=2d768547e131aed99d165b0aee7b080e512a2a5ffab292bff8f71033631cede9

From a85318ee38e7891082e7504bc86515b01e24ae1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:22 +0100
Subject: [PATCH 0716/2561] layer-shell-qt: update to 5.24.3.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index a9786a4e56e9..3642d9819344 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=eefee96cf04cb1dbaede72b50354ddc7129915f1b88c340ff206724c29620f2c
+checksum=5de105ece2d7e6ca2d65305186462b0f9240930276adf7d5eedf77ffeaa67d40
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c00d64189eec051a9c97c2ae30844b9865d8ceef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:23 +0100
Subject: [PATCH 0717/2561] libkscreen: update to 5.24.3.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 5b3ab7883fad..5b76a89d08d8 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.24.2
+version=5.24.3
 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/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a64c2263a0de898a4a0e73f85949b4d3868aef87aa221d597e8c16f412103b04
+checksum=a6874f0f4066e16ea191341d4d7d73deaf304e117ab64306d311c862393de7a0
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From a34a928db74a13cfe3faf6251f2d8fcd43df2528 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:25 +0100
Subject: [PATCH 0718/2561] libksysguard: update to 5.24.3.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 4fe82b36bbfd..2fac80ddba4c 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ 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=13983f626906db864eda20bfa2e994ccbe4ddc534af7a052675b3475b7e9472f
+checksum=148651cf33c7400d7a0df507d0bb75a6924e1ae80f5a46eefeaeb44c848ff1a2
 
 build_options="webengine"
 

From 28bb7791f8e027eb60daf663ce4e8988d84f507b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:27 +0100
Subject: [PATCH 0719/2561] milou: update to 5.24.3.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index abe6af2c8b0c..05ef7d33c83c 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.24.2
+version=5.24.3
 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=9a8c4b0561ce85f37ccd4500b715c73b9ed77aec79aa46eb2b0e04d9b94381e4
+checksum=31d70b760653e0fe4b9c1b59d7601bb52d307a3d3be3b8f67550a4ea9d22bd1b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 37e4fac44c08279bff390b400e6ffaeace6732b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:29 +0100
Subject: [PATCH 0720/2561] oxygen: update to 5.24.3.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 521ae7f336b0..afd58f630f81 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.24.2
+version=5.24.3
 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=73d821a412a86df1511e6979d985de496d226ecc4201fe64e43b9400e1860cda
+checksum=018dbd3c276707bbcc8515424ae45a0133cd9a2e31ffd7a0bbc25522586e400a

From 3a37117353f6be908b8e555ca05508caec26136a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:31 +0100
Subject: [PATCH 0721/2561] plasma-browser-integration: update to 5.24.3.

---
 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 41d3d104a688..e7e64687c577 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e8a48296d1a713d8b8f002d559a4cd12cd7f4892c591ed985c5ce49f7bffe738
+checksum=40b07a0065bf24a78997fb210b0550642872ba8c41ba1df6c2cb6785d85851d7

From 78dbe028428abf6ba57c08ca4840a4956504bccd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:33 +0100
Subject: [PATCH 0722/2561] plasma-desktop: update to 5.24.3.

---
 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 fbef3a8d3997..58edbeb7f5d3 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ 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=524193c24c95f67137410786f94c70d3c96827bae133a48bb53226f32c33fa10
+checksum=583e7ecfd2e2b766d645284cf13605851d96e2ad7cf2e657b4665aa3f3fd91d3
 replaces="user-manager>=0"
 python_version=3

From 471889fc9af5580ec532200af25aa12e2800d2ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:35 +0100
Subject: [PATCH 0723/2561] plasma-disks: update to 5.24.3.

---
 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 bd58a31096c7..9498075cb52d 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.24.2
+version=5.24.3
 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=e2135701903316f46df042f8b0eade162a1f1412644d9f4d9fa0512856b81522
+checksum=9e71a018eb875dd70d7b30f23937098ae8d6d9eab2306b541f916ddf6b64745a

From ea2fb9d6111ea421f7ab3fd59a7b0a1046f9e139 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:36 +0100
Subject: [PATCH 0724/2561] plasma-firewall: update to 5.24.3.

---
 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 051b5af7faa0..474ae2d9cf17 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcmutils
@@ -11,4 +11,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=7ac775e652570c704d6d3e1b0809e10e3718c630f89fe4c2b11dd3f91f5c85d3
+checksum=bff36b7a922a6d0e5e20df539c6995d775f62a1d63c970b55bb430abd580ef64

From f0ac07d04c63f1054bd9d043e0ddbba97ff5dd30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:38 +0100
Subject: [PATCH 0725/2561] plasma-integration: update to 5.24.3.

---
 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 493d73cfbbd8..59c8998026ba 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.24.2
+version=5.24.3
 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=b6408b32e13b9713cd34f499c7aae216218a04b6c9655f37689d95f8b323f947
+checksum=7aef8f3b6234b402b978d12e72d9c5eb2b82cbe587afa32f288e2e160b103c0c

From b1dd6cb3c95cbb9e333695a466361ec833b3188e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:40 +0100
Subject: [PATCH 0726/2561] plasma-nm: update to 5.24.3.

---
 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 1404adc97bb3..cc71c9f54926 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.24.2
+version=5.24.3
 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=114ead32c90d521ae0504baee971da71a2c0f1a37d25bbf1868012ed030048cb
+checksum=2cf64e94ed921546bc0be44f50e3490033a353bf3f0ad7a5a513ef5585fc3bfd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 57e9b90e3fc721ae06d474d5aa3858bae6cd60cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:41 +0100
Subject: [PATCH 0727/2561] plasma-pa: update to 5.24.3.

---
 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 5285d7534394..dd3e8e33c8ac 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.24.2
+version=5.24.3
 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=015dff4f7561a0fdca28a0d49e98df3bb112300c9e29588f685e58ae037603e6
+checksum=e18fbe9cf9f2948c2d3567ba0bb71126ffef8d7c4df8084a8fa0fd48c0ca0759
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 6b8c8351b9f8994b33e666f3aa596af8c448fd2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:43 +0100
Subject: [PATCH 0728/2561] plasma-sdk: update to 5.24.3.

---
 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 3bf3208853f7..4d713043e9dc 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.24.2
+version=5.24.3
 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=83486883400fb837df6541f462df390b28df5d9a174a04e55e971ffe483c777b
+checksum=f9bad013598b8d4e8b0be4ceaa5ad5f1a3326911f7b41e754d57d7a5f1f5d63c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From be8c9f66f4c95d55a97699253baaefd598c7dbc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:45 +0100
Subject: [PATCH 0729/2561] plasma-systemmonitor: update to 5.24.3.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index e81d4b72595e..4cdb8fc83b47 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -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=16902047b659cbe7e3452e527699aa8891546323a54efc60d0fdcfac8fe0ccd4
+checksum=904c0cbf56469b4b021559cc898aef57917cbe36526317c5bc7d34f255c0439d

From 05c74fa16bbd570ec930be34ceb5ee220d476202 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:47 +0100
Subject: [PATCH 0730/2561] plasma-thunderbolt: update to 5.24.3.

---
 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 a8a79a05ae4b..7fbd11daa1a5 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.24.2
+version=5.24.3
 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=7111626252470f7c1de5b3c261b29db3ac9bdac5e1453b6853cda8aaaa5681be
+checksum=52bec310386158c7f85cd6a8a7db5bedabdb8494f4c6818d8466aa33a6dba5df
 
 do_check() {
 	: # Requires running dbus and bolt services

From ca9a6b14bb73f2ba03c57fc2295e9c1a511769c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:49 +0100
Subject: [PATCH 0731/2561] plasma-vault: update to 5.24.3.

---
 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 3c971780ddc0..980ab7d44e7e 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -14,4 +14,4 @@ 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=be8e517dff5e3fcfaeade1d9a992c5d44c52b3efbdeb345a79dad94141722e52
+checksum=8d4998fd105073ce8ae6012426c0bd024529e0ae67c3c3ea9178918fcf87be38

From dde02ab62c7035d08933a99a9bbd2613fda26554 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:05 +0100
Subject: [PATCH 0732/2561] plasma-workspace-wallpapers: update to 5.24.3.

---
 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 9522d47d2215..4d21268470de 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.24.2
+version=5.24.3
 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=3664b2cd1005f2632475e2024fcec623090407d4398e0bc70dcfe45dfbb8bf67
+checksum=da252edb70b3373c38fb30318a44f52f047d4f31cbbd26c01c30bf2398c43848

From 05333e50d70dd56e7e3054bfafeb262b889c5aac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:09 +0100
Subject: [PATCH 0733/2561] plasma-workspace: update to 5.24.3.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index e6609778d1ae..a8ae6f591b0a 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,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=e7fd2ad7c067710401f7322789ce796c3ad5e02a3813bdfb84ebd5dbd8787d11
+checksum=104c5c0ebb000f48c749a6bafdde4cbb1b06d188e1a23ef95a2d035cce442ab4
 
 build_options="pipewire"
 build_options_default="pipewire"

From de76946034cfc36028e548d2978d58b19a4125fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:11 +0100
Subject: [PATCH 0734/2561] polkit-kde-agent: update to 5.24.3.

---
 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 2dc1f55fbcfb..53ebff5a685c 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.24.2
+version=5.24.3
 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=43685eccd228edf74c7fee80f6cafb217159b540b487cda067c18e3ec6b7ba7d
+checksum=788d392c811ee7c8098d294ccc9fff7f7a695977689a66cb4a1cb52d6f4779d5

From 45dca5eef119b8ffb43a3156805e047608e6e742 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:13 +0100
Subject: [PATCH 0735/2561] powerdevil: update to 5.24.3.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 5bd44767528c..3eb123d13d50 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.24.2
+version=5.24.3
 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=8c742e057f19e3852ed6403e7a3f86fa70a478ae0c6c30a492491a5b02b7cd8d
+checksum=495275be84a96572d2e2a7ee343e1ab98c79e7c8eef402a7f26d86863e25f010

From 1e03b9d34a4e8d863e3caaa1c679ace4db93b686 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:14 +0100
Subject: [PATCH 0736/2561] sddm-kcm: update to 5.24.3.

---
 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 b44457380eb9..95d916cf3e1d 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.24.2
+version=5.24.3
 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=af95a174536c7deb01d4274c1e0efa71a06a8728dbafa144dc37a37b803c3e22
+checksum=d0d01ceda262734e87f0cfc28138a1b5478651722a703a55ac744c4e676ec696

From 059ac791abdefbef41cea2ac3bd10bc5d470d254 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:16 +0100
Subject: [PATCH 0737/2561] systemsettings: update to 5.24.3.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 1574038368cb..57c764dcde4e 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.24.2
+version=5.24.3
 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-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b31e3bbd0ed6c69718341e7290f8a8888e972ca3c1eae10f2a5da912b17d2e5c
+checksum=6200618137f9a1411007a78f9b50eaf78048ce9819428d997a44816d6093d585

From d698eb748765da2040ce4035f32753b6e6f24211 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:18 +0100
Subject: [PATCH 0738/2561] xdg-desktop-portal-kde: update to 5.24.3.

---
 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 10169eb0f394..23aaba046f68 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.24.2
+version=5.24.3
 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=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3
+checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b

From ca87c55165507db2905912ea3ae453b04614054e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:36:54 +0200
Subject: [PATCH 0739/2561] kcompletion: add cross patch

---
 srcpkgs/kcompletion/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kcompletion/patches/cross.patch

diff --git a/srcpkgs/kcompletion/patches/cross.patch b/srcpkgs/kcompletion/patches/cross.patch
new file mode 100644
index 000000000000..fdfcab160c0d
--- /dev/null
+++ b/srcpkgs/kcompletion/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 13:56:56.000000000 +0100
++++ -	2022-03-28 22:30:11.749301510 +0200
+@@ -45,7 +45,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)

From a5c8f257315cc565ea64a7efccd617d36a84ee69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:37:21 +0200
Subject: [PATCH 0740/2561] kconfigwidgets: add cross patch

---
 srcpkgs/kconfigwidgets/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kconfigwidgets/patches/cross.patch

diff --git a/srcpkgs/kconfigwidgets/patches/cross.patch b/srcpkgs/kconfigwidgets/patches/cross.patch
new file mode 100644
index 000000000000..cf9d7d54a873
--- /dev/null
+++ b/srcpkgs/kconfigwidgets/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 13:57:20.000000000 +0100
++++ -	2022-03-28 22:35:00.337296905 +0200
+@@ -41,7 +41,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ if (NOT ANDROID AND NOT WIN32)

From d00a2eccaa704737f03666f999f65243e1c79cd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:37:38 +0200
Subject: [PATCH 0741/2561] kiconthemes: add cross patch

---
 srcpkgs/kiconthemes/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kiconthemes/patches/cross.patch

diff --git a/srcpkgs/kiconthemes/patches/cross.patch b/srcpkgs/kiconthemes/patches/cross.patch
new file mode 100644
index 000000000000..48eb81784cdf
--- /dev/null
+++ b/srcpkgs/kiconthemes/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 14:01:35.000000000 +0100
++++ -	2022-03-28 22:31:40.368478068 +0200
+@@ -30,7 +30,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ ecm_setup_version(PROJECT

From cc3e6a2b5959c1f71c3f664f7cde87ee8e7345ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:38:04 +0200
Subject: [PATCH 0742/2561] kitemviews: add cross patch

---
 srcpkgs/kitemviews/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kitemviews/patches/cross.patch

diff --git a/srcpkgs/kitemviews/patches/cross.patch b/srcpkgs/kitemviews/patches/cross.patch
new file mode 100644
index 000000000000..4abaf14f3519
--- /dev/null
+++ b/srcpkgs/kitemviews/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 12:17:35.000000000 +0100
++++ -	2022-03-28 22:29:14.364077451 +0200
+@@ -30,7 +30,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ ecm_setup_version(PROJECT VARIABLE_PREFIX KPLOTTING

From af78a34532095c931bfecc4750953a008af729b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:38:17 +0200
Subject: [PATCH 0743/2561] kplotting: add cross patch

---
 srcpkgs/kplotting/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kplotting/patches/cross.patch

diff --git a/srcpkgs/kplotting/patches/cross.patch b/srcpkgs/kplotting/patches/cross.patch
new file mode 100644
index 000000000000..61e1c12c761d
--- /dev/null
+++ b/srcpkgs/kplotting/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 12:17:35.000000000 +0100
++++ -	2022-03-28 22:33:55.042066950 +0200
+@@ -30,7 +30,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ ecm_setup_version(PROJECT VARIABLE_PREFIX KPLOTTING

From b7a41c4e4ef9df7375da3e9c50de20f20a375436 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 15:52:15 -0500
Subject: [PATCH 0744/2561] New package: jc-1.18.6

Clsoes #35804.
---
 srcpkgs/jc/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/jc/template

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
new file mode 100644
index 000000000000..8f510a980bc2
--- /dev/null
+++ b/srcpkgs/jc/template
@@ -0,0 +1,14 @@
+# Template file for 'jc'
+pkgname=jc
+version=1.18.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments"
+checkdepends="python3-pytest $depends"
+short_desc="Convert to JSON"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/kellyjonbrazil/jc"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=5347188ed55762a0325d5d8f6a1ff3ec221b4ad548dee085fadc5fe10366af93

From b4f4dcd9f4b300d6a21adff9df4a45a3606285f3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 27 Mar 2022 21:19:56 +0200
Subject: [PATCH 0745/2561] zlib: backport upstream fix for CVE-2018-25032.

---
 srcpkgs/zlib/patches/CVE-2018-25032.patch | 343 ++++++++++++++++++++++
 srcpkgs/zlib/template                     |   2 +-
 2 files changed, 344 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/zlib/patches/CVE-2018-25032.patch

diff --git a/srcpkgs/zlib/patches/CVE-2018-25032.patch b/srcpkgs/zlib/patches/CVE-2018-25032.patch
new file mode 100644
index 000000000000..9f37ba5c583e
--- /dev/null
+++ b/srcpkgs/zlib/patches/CVE-2018-25032.patch
@@ -0,0 +1,343 @@
+From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Tue, 17 Apr 2018 22:09:22 -0700
+Subject: [PATCH] Fix a bug that can crash deflate on some input when using
+ Z_FIXED.
+
+This bug was reported by Danilo Ramos of Eideticom, Inc. It has
+lain in wait 13 years before being found! The bug was introduced
+in zlib 1.2.2.2, with the addition of the Z_FIXED option. That
+option forces the use of fixed Huffman codes. For rare inputs with
+a large number of distant matches, the pending buffer into which
+the compressed data is written can overwrite the distance symbol
+table which it overlays. That results in corrupted output due to
+invalid distances, and can result in out-of-bound accesses,
+crashing the application.
+
+The fix here combines the distance buffer and literal/length
+buffers into a single symbol buffer. Now three bytes of pending
+buffer space are opened up for each literal or length/distance
+pair consumed, instead of the previous two bytes. This assures
+that the pending buffer cannot overwrite the symbol table, since
+the maximum fixed code compressed length/distance is 31 bits, and
+since there are four bytes of pending space for every three bytes
+of symbol space.
+---
+ deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++---------------
+ deflate.h | 25 +++++++++----------
+ trees.c   | 50 +++++++++++--------------------------
+ 3 files changed, 79 insertions(+), 70 deletions(-)
+
+diff --git a/deflate.c b/deflate.c
+index 425babc00..19cba873a 100644
+--- a/deflate.c
++++ b/deflate.c
+@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+     int wrap = 1;
+     static const char my_version[] = ZLIB_VERSION;
+ 
+-    ushf *overlay;
+-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
+-     * output size for (length,distance) codes is <= 24 bits.
+-     */
+-
+     if (version == Z_NULL || version[0] != my_version[0] ||
+         stream_size != sizeof(z_stream)) {
+         return Z_VERSION_ERROR;
+@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+ 
+     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+ 
+-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+-    s->pending_buf = (uchf *) overlay;
+-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
++    /* We overlay pending_buf and sym_buf. This works since the average size
++     * for length/distance pairs over any compressed block is assured to be 31
++     * bits or less.
++     *
++     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
++     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
++     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
++     * possible fixed-codes length/distance pair is then 31 bits total.
++     *
++     * sym_buf starts one-fourth of the way into pending_buf. So there are
++     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
++     * in sym_buf is three bytes -- two for the distance and one for the
++     * literal/length. As each symbol is consumed, the pointer to the next
++     * sym_buf value to read moves forward three bytes. From that symbol, up to
++     * 31 bits are written to pending_buf. The closest the written pending_buf
++     * bits gets to the next sym_buf symbol to read is just before the last
++     * code is written. At that time, 31*(n-2) bits have been written, just
++     * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
++     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
++     * symbols are written.) The closest the writing gets to what is unread is
++     * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
++     * can range from 128 to 32768.
++     *
++     * Therefore, at a minimum, there are 142 bits of space between what is
++     * written and what is read in the overlain buffers, so the symbols cannot
++     * be overwritten by the compressed data. That space is actually 139 bits,
++     * due to the three-bit fixed-code block header.
++     *
++     * That covers the case where either Z_FIXED is specified, forcing fixed
++     * codes, or when the use of fixed codes is chosen, because that choice
++     * results in a smaller compressed block than dynamic codes. That latter
++     * condition then assures that the above analysis also covers all dynamic
++     * blocks. A dynamic-code block will only be chosen to be emitted if it has
++     * fewer bits than a fixed-code block would for the same set of symbols.
++     * Therefore its average symbol length is assured to be less than 31. So
++     * the compressed data for a dynamic block also cannot overwrite the
++     * symbols from which it is being constructed.
++     */
++
++    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
++    s->pending_buf_size = (ulg)s->lit_bufsize * 4;
+ 
+     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+         s->pending_buf == Z_NULL) {
+@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+         deflateEnd (strm);
+         return Z_MEM_ERROR;
+     }
+-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
++    s->sym_buf = s->pending_buf + s->lit_bufsize;
++    s->sym_end = (s->lit_bufsize - 1) * 3;
++    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
++     * on 16 bit machines and because stored blocks are restricted to
++     * 64K-1 bytes.
++     */
+ 
+     s->level = level;
+     s->strategy = strategy;
+@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
+ 
+     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+     s = strm->state;
+-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
++    if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
+         return Z_BUF_ERROR;
+     do {
+         put = Buf_size - s->bi_valid;
+@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source)
+ #else
+     deflate_state *ds;
+     deflate_state *ss;
+-    ushf *overlay;
+ 
+ 
+     if (deflateStateCheck(source) || dest == Z_NULL) {
+@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source)
+     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+-    ds->pending_buf = (uchf *) overlay;
++    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
+ 
+     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+         ds->pending_buf == Z_NULL) {
+@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source)
+     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+ 
+     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
++    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
+ 
+     ds->l_desc.dyn_tree = ds->dyn_ltree;
+     ds->d_desc.dyn_tree = ds->dyn_dtree;
+@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+diff --git a/deflate.h b/deflate.h
+index 23ecdd312..d4cf1a98b 100644
+--- a/deflate.h
++++ b/deflate.h
+@@ -217,7 +217,7 @@ typedef struct internal_state {
+     /* Depth of each subtree used as tie breaker for trees of equal frequency
+      */
+ 
+-    uchf *l_buf;          /* buffer for literals or lengths */
++    uchf *sym_buf;        /* buffer for distances and literals/lengths */
+ 
+     uInt  lit_bufsize;
+     /* Size of match buffer for literals/lengths.  There are 4 reasons for
+@@ -239,13 +239,8 @@ typedef struct internal_state {
+      *   - I can't count above 4
+      */
+ 
+-    uInt last_lit;      /* running index in l_buf */
+-
+-    ushf *d_buf;
+-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
+-     * the same number of elements. To use different lengths, an extra flag
+-     * array would be necessary.
+-     */
++    uInt sym_next;      /* running index in sym_buf */
++    uInt sym_end;       /* symbol table full when sym_next reaches this */
+ 
+     ulg opt_len;        /* bit length of current block with optimal trees */
+     ulg static_len;     /* bit length of current block with static trees */
+@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+ 
+ # define _tr_tally_lit(s, c, flush) \
+   { uch cc = (c); \
+-    s->d_buf[s->last_lit] = 0; \
+-    s->l_buf[s->last_lit++] = cc; \
++    s->sym_buf[s->sym_next++] = 0; \
++    s->sym_buf[s->sym_next++] = 0; \
++    s->sym_buf[s->sym_next++] = cc; \
+     s->dyn_ltree[cc].Freq++; \
+-    flush = (s->last_lit == s->lit_bufsize-1); \
++    flush = (s->sym_next == s->sym_end); \
+    }
+ # define _tr_tally_dist(s, distance, length, flush) \
+   { uch len = (uch)(length); \
+     ush dist = (ush)(distance); \
+-    s->d_buf[s->last_lit] = dist; \
+-    s->l_buf[s->last_lit++] = len; \
++    s->sym_buf[s->sym_next++] = dist; \
++    s->sym_buf[s->sym_next++] = dist >> 8; \
++    s->sym_buf[s->sym_next++] = len; \
+     dist--; \
+     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+     s->dyn_dtree[d_code(dist)].Freq++; \
+-    flush = (s->last_lit == s->lit_bufsize-1); \
++    flush = (s->sym_next == s->sym_end); \
+   }
+ #else
+ # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+diff --git a/trees.c b/trees.c
+index 4f4a65011..decaeb7c3 100644
+--- a/trees.c
++++ b/trees.c
+@@ -416,7 +416,7 @@ local void init_block(s)
+ 
+     s->dyn_ltree[END_BLOCK].Freq = 1;
+     s->opt_len = s->static_len = 0L;
+-    s->last_lit = s->matches = 0;
++    s->sym_next = s->matches = 0;
+ }
+ 
+ #define SMALLEST 1
+@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
+ 
+         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+-                s->last_lit));
++                s->sym_next / 3));
+ 
+         if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+ 
+@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+     unsigned dist;  /* distance of matched string */
+     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+ {
+-    s->d_buf[s->last_lit] = (ush)dist;
+-    s->l_buf[s->last_lit++] = (uch)lc;
++    s->sym_buf[s->sym_next++] = dist;
++    s->sym_buf[s->sym_next++] = dist >> 8;
++    s->sym_buf[s->sym_next++] = lc;
+     if (dist == 0) {
+         /* lc is the unmatched char */
+         s->dyn_ltree[lc].Freq++;
+@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+         s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+         s->dyn_dtree[d_code(dist)].Freq++;
+     }
+-
+-#ifdef TRUNCATE_BLOCK
+-    /* Try to guess if it is profitable to stop the current block here */
+-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
+-        /* Compute an upper bound for the compressed length */
+-        ulg out_length = (ulg)s->last_lit*8L;
+-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
+-        int dcode;
+-        for (dcode = 0; dcode < D_CODES; dcode++) {
+-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
+-                (5L+extra_dbits[dcode]);
+-        }
+-        out_length >>= 3;
+-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+-               s->last_lit, in_length, out_length,
+-               100L - out_length*100L/in_length));
+-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+-    }
+-#endif
+-    return (s->last_lit == s->lit_bufsize-1);
+-    /* We avoid equality with lit_bufsize because of wraparound at 64K
+-     * on 16 bit machines and because stored blocks are restricted to
+-     * 64K-1 bytes.
+-     */
++    return (s->sym_next == s->sym_end);
+ }
+ 
+ /* ===========================================================================
+@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree)
+ {
+     unsigned dist;      /* distance of matched string */
+     int lc;             /* match length or unmatched char (if dist == 0) */
+-    unsigned lx = 0;    /* running index in l_buf */
++    unsigned sx = 0;    /* running index in sym_buf */
+     unsigned code;      /* the code to send */
+     int extra;          /* number of extra bits to send */
+ 
+-    if (s->last_lit != 0) do {
+-        dist = s->d_buf[lx];
+-        lc = s->l_buf[lx++];
++    if (s->sym_next != 0) do {
++        dist = s->sym_buf[sx++] & 0xff;
++        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
++        lc = s->sym_buf[sx++];
+         if (dist == 0) {
+             send_code(s, lc, ltree); /* send a literal byte */
+             Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree)
+             }
+         } /* literal or match pair ? */
+ 
+-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
+-               "pendingBuf overflow");
++        /* Check that the overlay between pending_buf and sym_buf is ok: */
++        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
+ 
+-    } while (lx < s->last_lit);
++    } while (sx < s->sym_next);
+ 
+     send_code(s, END_BLOCK, ltree);
+ }
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index e8c44f9bdb8b..0a3cd6a4a30a 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
 # Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
-revision=4
+revision=5
 bootstrap=yes
 build_style=configure
 configure_args="--prefix=/usr --shared"

From f5a918dc4507e264a718e388ca6dd15d4d503928 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 16:40:22 -0500
Subject: [PATCH 0746/2561] proxychains-ng: update to 4.16.

---
 srcpkgs/proxychains-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/proxychains-ng/template b/srcpkgs/proxychains-ng/template
index 3cbb9a335e93..2473f4d45e35 100644
--- a/srcpkgs/proxychains-ng/template
+++ b/srcpkgs/proxychains-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'proxychains-ng'
 pkgname=proxychains-ng
-version=4.15
+version=4.16
 revision=1
 build_style=gnu-configure
 make_install_target="install install-config"
@@ -10,4 +10,4 @@ maintainer="David <kalichakra@zoho.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/rofl0r/proxychains-ng"
 distfiles="http://ftp.barfooze.de/pub/sabotage/tarballs/${pkgname}-${version}.tar.xz"
-checksum=3207ab7f1f053c3fdcdf5ac158bcdef0683e3b7d8427b602ce9c0abe6a369081
+checksum=37a9983d995857cc398cfeefb96739827b3d86a71e03a5193b99f1b097046812

From afc39903e6813561b96314fb0900dd99ef7ef5ed Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 28 Mar 2022 16:17:49 +0200
Subject: [PATCH 0747/2561] restic: update to 0.13.0.

---
 srcpkgs/restic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..18e2a8b1f406 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.13.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=b3c09137b462548f44d764f98909534bef6e85fe029d4daf60545642cdefd3dd
 
 post_install() {
 	vlicense LICENSE

From a462001c6a4e15252205a065fb960f3227baf259 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 05:50:52 +0200
Subject: [PATCH 0748/2561] bees: fix build

---
 srcpkgs/bees/patches/fix-build.patch | 12 ++++++++++++
 srcpkgs/bees/patches/series          |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 srcpkgs/bees/patches/fix-build.patch

diff --git a/srcpkgs/bees/patches/fix-build.patch b/srcpkgs/bees/patches/fix-build.patch
new file mode 100644
index 000000000000..3799e27e32ae
--- /dev/null
+++ b/srcpkgs/bees/patches/fix-build.patch
@@ -0,0 +1,12 @@
+--- a/src/fiemap.cc
++++ b/src/fiemap.cc
+@@ -28,7 +28,8 @@ main(int argc, char **argv)
+ 		if (argc > 2) { fm.fm_start = stoull(argv[2], nullptr, 0); }
+ 		if (argc > 3) { fm.fm_length = stoull(argv[3], nullptr, 0); }
+ 		if (argc > 4) { fm.fm_flags = stoull(argv[4], nullptr, 0); }
+-		fm.fm_length = min(fm.fm_length, FIEMAP_MAX_OFFSET - fm.fm_start);
++		using FU = decltype(fm.fm_length);
++		fm.fm_length = min(FU(fm.fm_length), FU(FIEMAP_MAX_OFFSET - fm.fm_start));
+ 		uint64_t stop_at = fm.fm_start + fm.fm_length;
+ 		uint64_t last_byte = fm.fm_start;
+ 		do {
diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series
index d9a2837128f2..068ccfc2db81 100644
--- a/srcpkgs/bees/patches/series
+++ b/srcpkgs/bees/patches/series
@@ -1,2 +1,3 @@
 0001-don-t-run-tests-unless-asked.patch
 0002-move-sbin-into-bin.patch
+fix-build.patch

From 4c3166028b9b2cf62bdbed0b0b918e0508fdff67 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 05:52:59 +0200
Subject: [PATCH 0749/2561] bees: also disable on platforms without 64-bit
 atomics

---
 srcpkgs/bees/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
index c9184f593e87..6f8783ea65fc 100644
--- a/srcpkgs/bees/template
+++ b/srcpkgs/bees/template
@@ -23,6 +23,10 @@ if [ "$CROSS_BUILD" ]; then
 	make_check="no"
 fi
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	broken="undefined reference to __atomic_fetch_add_8"
+fi
+
 pre_build() {
 	export BEES_VERSION="${version}"
 }

From 70f8aaea6e3989f0e15ca6f053ac7f2d2d5c91a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 29 Mar 2022 08:06:54 +0200
Subject: [PATCH 0750/2561] kpty: fix cross

---
 srcpkgs/kpty/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 28f4d371f530..47612b152d68 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -3,6 +3,7 @@ pkgname=kpty
 version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter"
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
 makedepends="kcoreaddons-devel ki18n-devel libutempter-devel"
 short_desc="KDE Interfacing with pseudo terminal devices"

From afd261aa9447e5c4aacf5752d5f21f4f43f9133e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 14:25:13 +0200
Subject: [PATCH 0751/2561] conduit: restrict archs (ring dependency)

---
 srcpkgs/conduit/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template
index c2e423e79891..cf972b13e25c 100644
--- a/srcpkgs/conduit/template
+++ b/srcpkgs/conduit/template
@@ -2,6 +2,8 @@
 pkgname=conduit
 version=0.3.0
 revision=1
+# needs ring/rustls
+archs="x86_64* i686* aarch64* armv[67]*"
 wrksrc="conduit-v${version}"
 build_style=cargo
 hostmakedepends="clang"

From 111521dce46ebcd583959d4bbdb12ea9e29fa8f1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 14:27:56 +0200
Subject: [PATCH 0752/2561] retroarch: fix checksum

---
 srcpkgs/retroarch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 6b89a54d89a2..bafac5d513a0 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=e426b8d30c25806e54c61f21d0d742695fa4f6bc6a271def4459db5460d28e8e
+checksum=c7d371208292aa58b295d639e550efbe412671e09a3d609540796709b17b9b8b
 
 build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"

From 275179dfc37debbfbef7a4cffc90cc62bcdf237d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 23:46:33 +0200
Subject: [PATCH 0753/2561] crash: use system readline, zlib.

---
 srcpkgs/crash/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index 82d9a3968c11..7f158c9ed635 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,11 +1,11 @@
 # Template file for 'crash'
 pkgname=crash
 version=8.0.0
-revision=1
+revision=2
 archs="i686 x86_64"  # broken on musl
 build_style=gnu-makefile
 hostmakedepends="flex tar wget texinfo"
-makedepends="lzo-devel ncurses-devel zlib-devel"
+makedepends="lzo-devel ncurses-devel zlib-devel readline-devel"
 depends="binutils"
 short_desc="Kernel crash dump debugger and live inspector"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -25,7 +25,7 @@ post_extract() {
 }
 
 do_build() {
-	make ${makejobs} lzo
+	make ${makejobs} lzo GDB_CONF_FLAGS="--with-system-readline --with-system-zlib"
 	make ${makejobs} extensions
 }
 

From b6c57bab0e0d7b2dba2219e53b8b362d7a894343 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 29 Mar 2022 14:08:01 +0200
Subject: [PATCH 0754/2561] expat: update to 2.4.8.

---
 srcpkgs/expat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index ccab77dad179..126ea7b3f474 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -1,6 +1,6 @@
 # Template file for 'expat'
 pkgname=expat
-version=2.4.7
+version=2.4.8
 revision=1
 build_style=gnu-configure
 short_desc="XML parser library written in C"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://libexpat.github.io/"
 distfiles="https://github.com/libexpat/libexpat/releases/download/R_${version//./_}/expat-${version}.tar.xz"
-checksum=9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d
+checksum=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25
 
 post_install() {
 	vlicense COPYING

From 86782b8be118b2c92c7f03732e14647c035177c4 Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lauri@hacktheplanet.fi>
Date: Thu, 20 Jan 2022 19:52:59 +0200
Subject: [PATCH 0755/2561] New package: acme-client-1.3.0

portable acme-client existed previously with a different upstream, which
was unmaintained - switch to one that is maintained.
---
 srcpkgs/acme-client/files/acme-client.conf | 31 ++++++++++++++++++++++
 srcpkgs/acme-client/template               | 23 ++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/acme-client/files/acme-client.conf
 create mode 100644 srcpkgs/acme-client/template

diff --git a/srcpkgs/acme-client/files/acme-client.conf b/srcpkgs/acme-client/files/acme-client.conf
new file mode 100644
index 000000000000..31dd96f00886
--- /dev/null
+++ b/srcpkgs/acme-client/files/acme-client.conf
@@ -0,0 +1,31 @@
+#
+# $OpenBSD: acme-client.conf,v 1.4 2020/09/17 09:13:06 florian Exp $
+#
+authority letsencrypt {
+	api url "https://acme-v02.api.letsencrypt.org/directory"
+	account key "/etc/acme/letsencrypt-privkey.pem"
+}
+
+authority letsencrypt-staging {
+	api url "https://acme-staging-v02.api.letsencrypt.org/directory"
+	account key "/etc/acme/letsencrypt-staging-privkey.pem"
+}
+
+authority buypass {
+	api url "https://api.buypass.com/acme/directory"
+	account key "/etc/acme/buypass-privkey.pem"
+	contact "mailto:me@example.com"
+}
+
+authority buypass-test {
+	api url "https://api.test4.buypass.no/acme/directory"
+	account key "/etc/acme/buypass-test-privkey.pem"
+	contact "mailto:me@example.com"
+}
+
+domain example.com {
+	alternative names { secure.example.com }
+	domain key "/etc/ssl/private/example.com.key"
+	domain full chain certificate "/etc/ssl/example.com.fullchain.pem"
+	sign with letsencrypt
+}
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
new file mode 100644
index 000000000000..da8fd65f1f4c
--- /dev/null
+++ b/srcpkgs/acme-client/template
@@ -0,0 +1,23 @@
+# Template file for 'acme-client'
+pkgname=acme-client
+version=1.3.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config sed"
+makedepends="openssl-devel"
+checkdepends="nginx curl"
+short_desc="Portable version of OpenBSD's acme-client"
+maintainer="Lauri Tirkkonen <lauri@hacktheplanet.fi>"
+license="GPL-2.0-only"
+homepage="https://git.sr.ht/~graywolf/acme-client-portable/"
+distfiles="https://data.wolfsden.cz/sources/acme-client-${version}.tar.gz"
+checksum=ac8796652393fa73f32dfda60ed3a437fc260867df1b81fa3c241bd95c5bc719
+make_check=no # requires https://github.com/letsencrypt/pebble which isn't packaged
+
+pre_install() {
+	sed -i 's,/etc/examples/,/usr/share/examples/acme-client/,g' usr.sbin/acme-client/acme-client.conf.5
+}
+
+post_install() {
+	vsconf ${FILESDIR}/acme-client.conf
+}

From 9d3e7b562af895349b29d58ca17420d16f8515f6 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 23:59:55 -0400
Subject: [PATCH 0756/2561] cura-fdm-materials: update to 4.13.0.

---
 srcpkgs/cura-fdm-materials/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template
index 2383b2c697a3..fb701a7510f0 100644
--- a/srcpkgs/cura-fdm-materials/template
+++ b/srcpkgs/cura-fdm-materials/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-fdm-materials'
 pkgname=cura-fdm-materials
 reverts="2019.08.21_1"
-version=4.12.0
+version=4.13.0
 revision=1
 wrksrc="fdm_materials-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="CC0-1.0"
 homepage="https://github.com/Ultimaker/fdm_materials"
 distfiles="https://github.com/Ultimaker/fdm_materials/archive/${version}.tar.gz"
-checksum=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From 488e180855df955ddc477e242f8d303fbb2bce8f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:00:21 -0400
Subject: [PATCH 0757/2561] libArcus: update to 4.13.1.

---
 srcpkgs/libArcus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index d560ee19b81d..21176dfdbcbe 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
-revision=2
+version=4.13.1
+revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libArcus"
 distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=51e865cb648750ad9ea315fa7632ee7016890273f911270f60d28c8a4bc50240
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6fc160b9e28ad6e40d862b84921952c3f7db6707 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 11:23:27 -0400
Subject: [PATCH 0758/2561] Uranium: update to 4.13.1.

---
 srcpkgs/Uranium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.1
 revision=1
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
@@ -15,7 +15,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Uranium"
 distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
-checksum=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From fa378224a57ffafc918a2884759d52edba485aca Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 11:23:57 -0400
Subject: [PATCH 0759/2561] cura-engine: update to 4.13.1.

---
 srcpkgs/cura-engine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 8c2822f73c0d..5cded6271dea 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.12.1
-revision=2
+version=4.13.1
+revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/CuraEngine"
 distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
 
 post_install() {
 	vlicense LICENSE

From f60cec5d6e34c6be1bb2d7a14bcca6c3728ca80a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 0760/2561] libSavitar: update to 4.13.1.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..eaffe92be8ce 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.1
 revision=1
 build_style=cmake
 hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libSavitar"
 distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz"
-checksum=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=0bd50f54d557bed70f2c8420405c690b819b287156e81e10b6f51651cebce2e9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From a844d48ae409331911f549236ac08b4075650696 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:18:57 -0400
Subject: [PATCH 0761/2561] New package: libCharon-4.13.0

---
 srcpkgs/libCharon/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/libCharon/template

diff --git a/srcpkgs/libCharon/template b/srcpkgs/libCharon/template
new file mode 100644
index 000000000000..b33e995d9dbe
--- /dev/null
+++ b/srcpkgs/libCharon/template
@@ -0,0 +1,14 @@
+# Template file for 'libCharon'
+pkgname=libCharon
+version=4.13.0
+revision=1
+build_style=cmake
+configure_args="INSTALL_SERVICE=OFF"
+hostmakedepends="python3"
+checkdepends="python3-pytest python3-mypy"
+short_desc="File metadata and streaming library"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Ultimaker/libCharon"
+distfiles="https://github.com/Ultimaker/libCharon/archive/${version}.tar.gz"
+checksum=efccb04a84b9a80fe4e154aa4b44c56b59061aeba25937be804277a5f21259ec

From a90b362b616abf8327f67b693873fe12c3e3854e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 0762/2561] cura: update to 4.13.1.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py
-index c29a0648d..dad67ba16 100644
---- a/cura/Arranging/Nest2DArrange.py
-+++ b/cura/Arranging/Nest2DArrange.py
-@@ -91,7 +91,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV
- 
-         if hull_polygon is not None and hull_polygon.getPoints() is not None and len(hull_polygon.getPoints()) > 2:  # numpy array has to be explicitly checked against None
-             for point in hull_polygon.getPoints():
--                converted_points.append(Point(point[0] * factor, point[1] * factor))
-+                converted_points.append(Point(int(point[0] * factor), int(point[1] * factor)))
-             item = Item(converted_points)
-             item.markAsFixedInBin(0)
-             node_items.append(item)
diff --git a/srcpkgs/cura/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cura/PickingPass.py b/cura/PickingPass.py
-index 54e886fe6..4d6ef671d 100644
---- a/cura/PickingPass.py
-+++ b/cura/PickingPass.py
-@@ -72,8 +72,8 @@ class PickingPass(RenderPass):
- 
-         window_size = self._renderer.getWindowSize()
- 
--        px = (0.5 + x / 2.0) * window_size[0]
--        py = (0.5 + y / 2.0) * window_size[1]
-+        px = int((0.5 + x / 2.0) * window_size[0])
-+        py = int((0.5 + y / 2.0) * window_size[1])
- 
-         if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1):
-             return -1
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index aa06dcd98b85..8e0cc09ab8d3 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry libCharon"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Cura"
 distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c

From 7ed6bbdbd7f7a589bb4a3d65dd4351137d5f32f5 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 17 Mar 2022 21:43:41 -0700
Subject: [PATCH 0763/2561] jetbrains-jdk-bin: update to 11.0.14.1b2043.17.

---
 srcpkgs/jetbrains-jdk-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index b2f4fe780d19..1f428e05bd3a 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'jetbrains-jdk-bin'
 pkgname=jetbrains-jdk-bin
-version=11.0.13b1890.3
+version=11.0.14.1b2043.17
 revision=1
 archs="x86_64"
 wrksrc="jbr"
@@ -11,7 +11,7 @@ homepage="https://github.com/JetBrains/JetBrainsRuntime"
 _jdk_ver=${version%b*}
 _jdk_build=${version#*b}
 distfiles="https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
-checksum=6dc1208c486ed023ddd9f79f66f099304cd6785895d4e782aaefe0603f47e621
+checksum=2c5b7398acb2b718cbdd8327e4c77e52b131fdf3424fee03d0c51afb3b315c10
 # This JDK appears to link to libs that do not exist, but functions well even in their absence.
 # Best guess is that they are optional. ¯\_(ツ)_/¯
 noverifyrdeps=yes

From c802180c2846d1fccd26b5f0289300570d104eb2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 13 Mar 2022 13:53:20 +0300
Subject: [PATCH 0764/2561] fish-shell: update to 3.4.1.

---
 srcpkgs/fish-shell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 657e5604c3d6..0fc86db7e7b0 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=3.3.1
+version=3.4.1
 revision=1
 wrksrc="fish-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 changelog="https://github.com/fish-shell/fish-shell/raw/master/CHANGELOG.rst"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=b5b4ee1a5269762cbbe993a4bd6507e675e4100ce9bbe84214a5eeb2b19fae89
+checksum=b6f23b3843b04db6b0a90fea1f6f0d0e40cc027b4a732098200863f2864a94ea
 register_shell="/bin/fish /usr/bin/fish"
 # tests don't work as root
 make_check=ci-skip

From f63dc314ed696e2756bbe4109bac854436619ab4 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 29 Mar 2022 20:05:35 +0200
Subject: [PATCH 0765/2561] linux5.4: update to 5.4.188.

---
 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 46c8f5c5c751..ac636bc1d2ff 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.187
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=189e3db3f2af8578037f9c8b4710e1002bdd56f318c5f8589b40de889be9a7b8
+checksum=9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 6bc4667fbf405f5a526805842e5494e9cd7bbd39 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 29 Mar 2022 20:08:57 +0200
Subject: [PATCH 0766/2561] linux4.19: update to 4.19.237.

---
 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 f2fb29a3cf0c..cb61654da418 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.236
+version=4.19.237
 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=002ef6adcafe8d90571f8882280a9bef28d1aa7cc9a3f35a50afc4cb2ebe31c0
+checksum=bafff35102cc486ec2bf94c6d908be8e24017b2e4a1873f52f24c855eb220cd8
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 630dc15af579962fa46ebe21ad18b5cd65006a92 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Mon, 28 Mar 2022 20:48:50 -0500
Subject: [PATCH 0767/2561] .github/workflows: Add a workflow for dealing with
 stale issues/prs

---
 .github/workflows/stale.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 000000000000..c759ef9459e0
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,20 @@
+---
+name: Stale Cleanup
+
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v4
+        with:
+          stale-issue-message: 'Issues become stale 90 days after last activity and are closed 7 days after that.  If this issue is still relevant bump it or assign it.'
+          stale-pr-message: 'Pull Requests become stale 90 days after last activity and are closed 7 days after that.  If this pull request is still relevant bump it or assign it.'
+          days-before-stale: 90
+          days-before-close: 7
+          debug-only: true
+          exempt-all-assignees: true
+          operations-per-run: 1000

From 27c6f695d62667df817255d31fafbb05a88c56c5 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Tue, 29 Mar 2022 21:49:29 -0500
Subject: [PATCH 0768/2561] .github/workflows: make stale comments workflow
 dispatchable

---
 .github/workflows/stale.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index c759ef9459e0..abdc83c9d383 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -2,6 +2,7 @@
 name: Stale Cleanup
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '30 1 * * *'
 

From 5fe6c61fbda87abef4f44877d309102aef08af64 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Tue, 29 Mar 2022 23:43:32 -0500
Subject: [PATCH 0769/2561] runit-void: update to 20220329.

---
 srcpkgs/runit-void/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index a0aef0484c0b..42eeab9a2929 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
-version=20210314
-revision=3
+version=20220329
+revision=1
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="CC0-1.0"
 homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
-checksum=9ac95a14b5e1aedfcf0b093b8992b08316448ac1afb7fd26501ac43c4ebf3847
+checksum=43037b1cbf177a3ee6d690cc652eedf819ca37f44636311b55aa716e159a4718
 
 depends="virtual?awk procps-ng runit"
 conf_files="

From 686c5cb93a34ca8c989a0f36f0c58521a181044b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 13:36:14 +0100
Subject: [PATCH 0770/2561] New package: yass-0.1.0

---
 srcpkgs/yass/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/yass/template

diff --git a/srcpkgs/yass/template b/srcpkgs/yass/template
new file mode 100644
index 000000000000..7b4577941ec3
--- /dev/null
+++ b/srcpkgs/yass/template
@@ -0,0 +1,20 @@
+# Template file for 'yass'
+pkgname=yass
+version=0.1.0
+revision=1
+build_wrksrc=source
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="clthreads-devel clxclient-devel freetype-devel jack-devel
+ libX11-devel libXft-devel"
+short_desc="Yet Another Scrolling Scope"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
+distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
+checksum=d247798b708303bc7622c3b6b96fb8190f3b3a07424a3b53c95d21ab8fc6d34a
+
+pre_build() {
+	# change pkgconf to pkg-config
+	vsed -i 's/pkgconf/pkg-config/' Makefile
+}

From 238238712da0c14067e8077adc792d718aace265 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 29 Mar 2022 14:27:58 +0200
Subject: [PATCH 0771/2561] zlib: update to 1.2.12.

---
 srcpkgs/zlib/patches/CVE-2018-25032.patch | 343 ----------------------
 srcpkgs/zlib/patches/cc.patch             |  24 ++
 srcpkgs/zlib/template                     |   6 +-
 3 files changed, 27 insertions(+), 346 deletions(-)
 delete mode 100644 srcpkgs/zlib/patches/CVE-2018-25032.patch
 create mode 100644 srcpkgs/zlib/patches/cc.patch

diff --git a/srcpkgs/zlib/patches/CVE-2018-25032.patch b/srcpkgs/zlib/patches/CVE-2018-25032.patch
deleted file mode 100644
index 9f37ba5c583e..000000000000
--- a/srcpkgs/zlib/patches/CVE-2018-25032.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Tue, 17 Apr 2018 22:09:22 -0700
-Subject: [PATCH] Fix a bug that can crash deflate on some input when using
- Z_FIXED.
-
-This bug was reported by Danilo Ramos of Eideticom, Inc. It has
-lain in wait 13 years before being found! The bug was introduced
-in zlib 1.2.2.2, with the addition of the Z_FIXED option. That
-option forces the use of fixed Huffman codes. For rare inputs with
-a large number of distant matches, the pending buffer into which
-the compressed data is written can overwrite the distance symbol
-table which it overlays. That results in corrupted output due to
-invalid distances, and can result in out-of-bound accesses,
-crashing the application.
-
-The fix here combines the distance buffer and literal/length
-buffers into a single symbol buffer. Now three bytes of pending
-buffer space are opened up for each literal or length/distance
-pair consumed, instead of the previous two bytes. This assures
-that the pending buffer cannot overwrite the symbol table, since
-the maximum fixed code compressed length/distance is 31 bits, and
-since there are four bytes of pending space for every three bytes
-of symbol space.
----
- deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++---------------
- deflate.h | 25 +++++++++----------
- trees.c   | 50 +++++++++++--------------------------
- 3 files changed, 79 insertions(+), 70 deletions(-)
-
-diff --git a/deflate.c b/deflate.c
-index 425babc00..19cba873a 100644
---- a/deflate.c
-+++ b/deflate.c
-@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-     int wrap = 1;
-     static const char my_version[] = ZLIB_VERSION;
- 
--    ushf *overlay;
--    /* We overlay pending_buf and d_buf+l_buf. This works since the average
--     * output size for (length,distance) codes is <= 24 bits.
--     */
--
-     if (version == Z_NULL || version[0] != my_version[0] ||
-         stream_size != sizeof(z_stream)) {
-         return Z_VERSION_ERROR;
-@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
- 
-     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
- 
--    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
--    s->pending_buf = (uchf *) overlay;
--    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-+    /* We overlay pending_buf and sym_buf. This works since the average size
-+     * for length/distance pairs over any compressed block is assured to be 31
-+     * bits or less.
-+     *
-+     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
-+     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
-+     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
-+     * possible fixed-codes length/distance pair is then 31 bits total.
-+     *
-+     * sym_buf starts one-fourth of the way into pending_buf. So there are
-+     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
-+     * in sym_buf is three bytes -- two for the distance and one for the
-+     * literal/length. As each symbol is consumed, the pointer to the next
-+     * sym_buf value to read moves forward three bytes. From that symbol, up to
-+     * 31 bits are written to pending_buf. The closest the written pending_buf
-+     * bits gets to the next sym_buf symbol to read is just before the last
-+     * code is written. At that time, 31*(n-2) bits have been written, just
-+     * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
-+     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
-+     * symbols are written.) The closest the writing gets to what is unread is
-+     * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
-+     * can range from 128 to 32768.
-+     *
-+     * Therefore, at a minimum, there are 142 bits of space between what is
-+     * written and what is read in the overlain buffers, so the symbols cannot
-+     * be overwritten by the compressed data. That space is actually 139 bits,
-+     * due to the three-bit fixed-code block header.
-+     *
-+     * That covers the case where either Z_FIXED is specified, forcing fixed
-+     * codes, or when the use of fixed codes is chosen, because that choice
-+     * results in a smaller compressed block than dynamic codes. That latter
-+     * condition then assures that the above analysis also covers all dynamic
-+     * blocks. A dynamic-code block will only be chosen to be emitted if it has
-+     * fewer bits than a fixed-code block would for the same set of symbols.
-+     * Therefore its average symbol length is assured to be less than 31. So
-+     * the compressed data for a dynamic block also cannot overwrite the
-+     * symbols from which it is being constructed.
-+     */
-+
-+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
-+    s->pending_buf_size = (ulg)s->lit_bufsize * 4;
- 
-     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-         s->pending_buf == Z_NULL) {
-@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-         deflateEnd (strm);
-         return Z_MEM_ERROR;
-     }
--    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
--    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-+    s->sym_buf = s->pending_buf + s->lit_bufsize;
-+    s->sym_end = (s->lit_bufsize - 1) * 3;
-+    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
-+     * on 16 bit machines and because stored blocks are restricted to
-+     * 64K-1 bytes.
-+     */
- 
-     s->level = level;
-     s->strategy = strategy;
-@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
- 
-     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-     s = strm->state;
--    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
-+    if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
-         return Z_BUF_ERROR;
-     do {
-         put = Buf_size - s->bi_valid;
-@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source)
- #else
-     deflate_state *ds;
-     deflate_state *ss;
--    ushf *overlay;
- 
- 
-     if (deflateStateCheck(source) || dest == Z_NULL) {
-@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source)
-     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
--    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
--    ds->pending_buf = (uchf *) overlay;
-+    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
- 
-     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-         ds->pending_buf == Z_NULL) {
-@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source)
-     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
- 
-     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
--    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
--    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-+    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
- 
-     ds->l_desc.dyn_tree = ds->dyn_ltree;
-     ds->d_desc.dyn_tree = ds->dyn_dtree;
-@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-diff --git a/deflate.h b/deflate.h
-index 23ecdd312..d4cf1a98b 100644
---- a/deflate.h
-+++ b/deflate.h
-@@ -217,7 +217,7 @@ typedef struct internal_state {
-     /* Depth of each subtree used as tie breaker for trees of equal frequency
-      */
- 
--    uchf *l_buf;          /* buffer for literals or lengths */
-+    uchf *sym_buf;        /* buffer for distances and literals/lengths */
- 
-     uInt  lit_bufsize;
-     /* Size of match buffer for literals/lengths.  There are 4 reasons for
-@@ -239,13 +239,8 @@ typedef struct internal_state {
-      *   - I can't count above 4
-      */
- 
--    uInt last_lit;      /* running index in l_buf */
--
--    ushf *d_buf;
--    /* Buffer for distances. To simplify the code, d_buf and l_buf have
--     * the same number of elements. To use different lengths, an extra flag
--     * array would be necessary.
--     */
-+    uInt sym_next;      /* running index in sym_buf */
-+    uInt sym_end;       /* symbol table full when sym_next reaches this */
- 
-     ulg opt_len;        /* bit length of current block with optimal trees */
-     ulg static_len;     /* bit length of current block with static trees */
-@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
- 
- # define _tr_tally_lit(s, c, flush) \
-   { uch cc = (c); \
--    s->d_buf[s->last_lit] = 0; \
--    s->l_buf[s->last_lit++] = cc; \
-+    s->sym_buf[s->sym_next++] = 0; \
-+    s->sym_buf[s->sym_next++] = 0; \
-+    s->sym_buf[s->sym_next++] = cc; \
-     s->dyn_ltree[cc].Freq++; \
--    flush = (s->last_lit == s->lit_bufsize-1); \
-+    flush = (s->sym_next == s->sym_end); \
-    }
- # define _tr_tally_dist(s, distance, length, flush) \
-   { uch len = (uch)(length); \
-     ush dist = (ush)(distance); \
--    s->d_buf[s->last_lit] = dist; \
--    s->l_buf[s->last_lit++] = len; \
-+    s->sym_buf[s->sym_next++] = dist; \
-+    s->sym_buf[s->sym_next++] = dist >> 8; \
-+    s->sym_buf[s->sym_next++] = len; \
-     dist--; \
-     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-     s->dyn_dtree[d_code(dist)].Freq++; \
--    flush = (s->last_lit == s->lit_bufsize-1); \
-+    flush = (s->sym_next == s->sym_end); \
-   }
- #else
- # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-diff --git a/trees.c b/trees.c
-index 4f4a65011..decaeb7c3 100644
---- a/trees.c
-+++ b/trees.c
-@@ -416,7 +416,7 @@ local void init_block(s)
- 
-     s->dyn_ltree[END_BLOCK].Freq = 1;
-     s->opt_len = s->static_len = 0L;
--    s->last_lit = s->matches = 0;
-+    s->sym_next = s->matches = 0;
- }
- 
- #define SMALLEST 1
-@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
- 
-         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
--                s->last_lit));
-+                s->sym_next / 3));
- 
-         if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
- 
-@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-     unsigned dist;  /* distance of matched string */
-     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
- {
--    s->d_buf[s->last_lit] = (ush)dist;
--    s->l_buf[s->last_lit++] = (uch)lc;
-+    s->sym_buf[s->sym_next++] = dist;
-+    s->sym_buf[s->sym_next++] = dist >> 8;
-+    s->sym_buf[s->sym_next++] = lc;
-     if (dist == 0) {
-         /* lc is the unmatched char */
-         s->dyn_ltree[lc].Freq++;
-@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-         s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-         s->dyn_dtree[d_code(dist)].Freq++;
-     }
--
--#ifdef TRUNCATE_BLOCK
--    /* Try to guess if it is profitable to stop the current block here */
--    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
--        /* Compute an upper bound for the compressed length */
--        ulg out_length = (ulg)s->last_lit*8L;
--        ulg in_length = (ulg)((long)s->strstart - s->block_start);
--        int dcode;
--        for (dcode = 0; dcode < D_CODES; dcode++) {
--            out_length += (ulg)s->dyn_dtree[dcode].Freq *
--                (5L+extra_dbits[dcode]);
--        }
--        out_length >>= 3;
--        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
--               s->last_lit, in_length, out_length,
--               100L - out_length*100L/in_length));
--        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
--    }
--#endif
--    return (s->last_lit == s->lit_bufsize-1);
--    /* We avoid equality with lit_bufsize because of wraparound at 64K
--     * on 16 bit machines and because stored blocks are restricted to
--     * 64K-1 bytes.
--     */
-+    return (s->sym_next == s->sym_end);
- }
- 
- /* ===========================================================================
-@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree)
- {
-     unsigned dist;      /* distance of matched string */
-     int lc;             /* match length or unmatched char (if dist == 0) */
--    unsigned lx = 0;    /* running index in l_buf */
-+    unsigned sx = 0;    /* running index in sym_buf */
-     unsigned code;      /* the code to send */
-     int extra;          /* number of extra bits to send */
- 
--    if (s->last_lit != 0) do {
--        dist = s->d_buf[lx];
--        lc = s->l_buf[lx++];
-+    if (s->sym_next != 0) do {
-+        dist = s->sym_buf[sx++] & 0xff;
-+        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
-+        lc = s->sym_buf[sx++];
-         if (dist == 0) {
-             send_code(s, lc, ltree); /* send a literal byte */
-             Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree)
-             }
-         } /* literal or match pair ? */
- 
--        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
--        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
--               "pendingBuf overflow");
-+        /* Check that the overlay between pending_buf and sym_buf is ok: */
-+        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
- 
--    } while (lx < s->last_lit);
-+    } while (sx < s->sym_next);
- 
-     send_code(s, END_BLOCK, ltree);
- }
diff --git a/srcpkgs/zlib/patches/cc.patch b/srcpkgs/zlib/patches/cc.patch
new file mode 100644
index 000000000000..0136071eabe7
--- /dev/null
+++ b/srcpkgs/zlib/patches/cc.patch
@@ -0,0 +1,24 @@
+From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Mon, 28 Mar 2022 18:34:10 -0700
+Subject: [PATCH] Fix configure issue that discarded provided CC definition.
+
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 52ff4a04e..3fa3e8618 100755
+--- a/configure
++++ b/configure
+@@ -174,7 +174,10 @@ if test -z "$CC"; then
+   else
+     cc=${CROSS_PREFIX}cc
+   fi
++else
++  cc=${CC}
+ fi
++
+ cflags=${CFLAGS-"-O3"}
+ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+ case "$cc" in
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 0a3cd6a4a30a..6dbe30032202 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
 # Template file for 'zlib'
 pkgname=zlib
-version=1.2.11
-revision=5
+version=1.2.12
+revision=1
 bootstrap=yes
 build_style=configure
 configure_args="--prefix=/usr --shared"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
-checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+checksum=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
 
 zlib-devel_package() {
 	depends="zlib>=${version}_${revision}"

From 789a4a78213c5b1b3f1004b4347e4f2cfd418eda Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 30 Mar 2022 14:18:27 +0200
Subject: [PATCH 0772/2561] sbcl: update to 2.2.3.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 7bcf793ec931..edd3cb36bf30 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.2.2
+version=2.2.3
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc texinfo"
@@ -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=8790dbbe97711dce14bb823125ce5b185b0073cf2f3cbf37bdd1ad380e7950f6
+checksum=de7f49e1f7750fd2cd89111ef70641cc5471355f621b737392ac68aa95f37f9f
 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+=" 77b7cfd4be60b6efa9b4166100f5e451d764e3751c1f1365ee83b3a9f220d5c8"
+	checksum+=" 8745f9358b686819209e188a93fb8cf5b4227a3f623af20504a68d129a314256"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From 283c746680f65bde85293062ebc2107e914dd346 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 30 Mar 2022 14:30:49 +0200
Subject: [PATCH 0773/2561] python3-pipenv: update to 2022.3.28.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 4d0f0ec7e283..707476ccc36d 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.3.24
+version=2022.3.28
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=800198d430e724f899e6db319cc640d5fd6da2acdbc301ceb1a1f967e990428b
+checksum=4e7aae62dad7679ce81b54cc3451be19fb2c469e269335b36b14132fe5ceecb3
 conflicts="python-pipenv>=0"
 
 post_extract() {

From f20a81ff86251a0b58f034622d54c12f33c39f31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 11:07:26 -0400
Subject: [PATCH 0774/2561] unison: update to 2.52.0.

---
 srcpkgs/unison/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 67c424a3b8af..783573c120ea 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,14 +1,14 @@
 # Template file for 'unison'
 pkgname=unison
-version=2.51.4
-revision=2
+version=2.52.0
+revision=1
 hostmakedepends="ocaml"
 short_desc="File-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.cis.upenn.edu/~bcpierce/unison/"
 distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
-checksum=d1ecc7581aaf2ed0f3403d4960f468acd7b9f1d92838a17c96e6d1df79b802d5
+checksum=a11389971212915328fe69101c92737b17664595c4318ebcb8da367e5ba63540
 nocross="OCaml does not cross compile"
 
 do_build() {

From c25b4ecb650e033b2b85088284c8defafe520eff Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 27 Mar 2022 14:55:32 +0200
Subject: [PATCH 0775/2561] praat: update to 6.2.10

---
 srcpkgs/praat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index ac2777a445cc..142f0d2661ae 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.2.09
+version=6.2.10
 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=3c38b8af267b152a3fda1af78fe8cc26a1717f70a886387e657c55746f666af1
+checksum=f6358b2c6a967afe89882720d503c74221b364c563e1e4316a2d73c9f0c22bcd
 
 # 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 704e8dc4d0b6a2c599a1719ae7786efdf056a0a4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 30 Mar 2022 18:18:45 +0200
Subject: [PATCH 0776/2561] sbcl: use clisp on i686.

---
 srcpkgs/sbcl/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index edd3cb36bf30..b78c25202981 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -22,10 +22,6 @@ x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
 	checksum+=" 8745f9358b686819209e188a93fb8cf5b4227a3f623af20504a68d129a314256"
 	;;
-i686)
-	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
-	checksum+=" 6bed7e31bb28e841da7bfc48c75adb8bef19e5e07d1d6f0fc7487f022c32f92c"
-	;;
 arm*)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"
 	checksum+=" a5fbf1d596a909a7719bc4a958f00e8537bf399fa051f83736baee950b21e56a"
@@ -34,7 +30,7 @@ aarch64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.3.9-arm64-linux-binary.tar.bz2"
 	checksum+=" 14c8fc0f3a03416b5d23763156e2bb28b690fb665af1e6f6112201fd0ddcd512"
 	;;
-ppc*|*-musl)
+i686*|ppc*|*-musl)
 	# ecl bootstrap is broken since 2.2.0:
 	# https://build.voidlinux.org/builders/x86_64-musl_builder/builds/39694/steps/shell_3/logs/stdio
 	makedepends+=" clisp"

From 22fbc679fc820ea36ebc981d190c14695550f647 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Wed, 30 Mar 2022 13:01:35 -0500
Subject: [PATCH 0777/2561] consul-template: update to 0.28.0.

---
 srcpkgs/consul-template/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index 00cd77f34169..4faeaf1c9ae5 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,6 +1,6 @@
 # Template file for 'consul-template'
 pkgname=consul-template
-version=0.25.1
+version=0.28.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
@@ -10,4 +10,4 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="MPL-2.0"
 homepage="https://github.com/hashicorp/consul-template"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=f8d214733961ef3333493ce912180c5c0311c87e4b1a116308f31283b6c77419
+checksum=61ce1b818ae9f555440a5a3a7a81590051c4871acfccd73001b4b087c66357e9

From 8801a042a0c2f8208f94509ebbbb303171d98431 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Tue, 29 Mar 2022 04:23:34 -0300
Subject: [PATCH 0778/2561] oil: update to 0.9.9

---
 srcpkgs/oil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index cf1cbccfefe5..7def1be36587 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.9.8
+version=0.9.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=3acaf17c9e5d17d027a60d6be878fe683d7de25f7d5fd621e2f219f91f9a1fc1
+checksum=6f6b4c4b9cf8a1e8e1dc2ff7bf39c85a11b871ddda9e9e51b9f7e1a0e46b2824
 register_shell="/usr/bin/osh"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From 9eba4120ccde3e636b500194e18bb13d7e775d69 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 28 Mar 2022 00:42:05 +0300
Subject: [PATCH 0779/2561] font-material-design-icons-ttf: merge with
 ttf-material-icons, rev bump

---
 srcpkgs/font-material-design-icons-ttf/template |  8 +++++++-
 srcpkgs/ttf-material-icons                      |  1 +
 srcpkgs/ttf-material-icons/template             | 16 ----------------
 3 files changed, 8 insertions(+), 17 deletions(-)
 create mode 120000 srcpkgs/ttf-material-icons
 delete mode 100644 srcpkgs/ttf-material-icons/template

diff --git a/srcpkgs/font-material-design-icons-ttf/template b/srcpkgs/font-material-design-icons-ttf/template
index fe3da363cc1e..d05b3c8a0a49 100644
--- a/srcpkgs/font-material-design-icons-ttf/template
+++ b/srcpkgs/font-material-design-icons-ttf/template
@@ -1,7 +1,7 @@
 # Template file for 'font-material-design-icons-ttf'
 pkgname=font-material-design-icons-ttf
 version=4.0.0
-revision=1
+revision=2
 wrksrc="material-design-icons-${version}"
 depends="font-util xbps-triggers"
 short_desc="Material Design icons by Google"
@@ -16,3 +16,9 @@ font_dirs="/usr/share/fonts/TTF"
 do_install() {
 	vinstall font/MaterialIcons-Regular.ttf 644 usr/share/fonts/TTF
 }
+
+ttf-material-icons_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
diff --git a/srcpkgs/ttf-material-icons b/srcpkgs/ttf-material-icons
new file mode 120000
index 000000000000..4d1e4bb1d94e
--- /dev/null
+++ b/srcpkgs/ttf-material-icons
@@ -0,0 +1 @@
+font-material-design-icons-ttf
\ No newline at end of file
diff --git a/srcpkgs/ttf-material-icons/template b/srcpkgs/ttf-material-icons/template
deleted file mode 100644
index b429c563c477..000000000000
--- a/srcpkgs/ttf-material-icons/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'ttf-material-icons'
-pkgname=ttf-material-icons
-version=4.0.0
-revision=1
-wrksrc=material-design-icons-${version}
-short_desc="Material Design icons by Google"
-maintainer="Michael Carlberg <c@rlberg.se>"
-license=CC
-homepage=http://google.github.io/material-design-icons/
-distfiles=https://github.com/google/material-design-icons/archive/${version}.tar.gz
-checksum=b1b068d625d5e15d6ec0059209cec67bc4c46e39c4611b859d6f6680dbf23934
-
-do_install() {
-	vinstall font/MaterialIcons-Regular.ttf  644 usr/share/fonts/TTF
-	vlicense LICENSE
-}

From 5bd8350335507fa0c3ba66e1ff181ca4462fdad3 Mon Sep 17 00:00:00 2001
From: Bas Ploeger <5904333+basploeger@users.noreply.github.com>
Date: Thu, 24 Mar 2022 23:09:10 +0100
Subject: [PATCH 0780/2561] html-xml-utils: update to 8.3.

---
 srcpkgs/html-xml-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/html-xml-utils/template b/srcpkgs/html-xml-utils/template
index ff073e7a740e..81fda5d90a25 100644
--- a/srcpkgs/html-xml-utils/template
+++ b/srcpkgs/html-xml-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'html-xml-utils'
 pkgname=html-xml-utils
-version=8.0
+version=8.3
 revision=1
 build_style=gnu-configure
 makedepends="libidn-devel"
@@ -9,4 +9,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="W3C"
 homepage="https://www.w3.org/Tools/HTML-XML-utils/README"
 distfiles="https://www.w3.org/Tools/HTML-XML-utils/${pkgname}-${version}.tar.gz"
-checksum=749059906c331c2c7fbaceee02466245a237b91bd408dff8f396d0734a060ae2
+checksum=a50c4d16dad660ad6792ef53bc77efa9d5729797623771a3fce52d8e23d3d08c

From 7d0536208bc4c4ddde671752c04ae4f29e2acc64 Mon Sep 17 00:00:00 2001
From: Vasteel <48246459+Vast-eel@users.noreply.github.com>
Date: Wed, 30 Mar 2022 12:56:17 +0200
Subject: [PATCH 0781/2561] font-sarasa-gothic: update to 0.36.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 534a4bf861fc..167c56b75ce8 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.34.3
+version=0.36.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=6938707af097f5bf899f570c886063860973193db9524468da0c27af4a36ce94
+checksum=cdc65aed713b5a991919755c712e0961e4388a7c3c636eed8e06b93bedf9a6f8
 
 font_dirs="/usr/share/fonts/TTF"
 

From b428b2a4621b664a4ca20a40a4abb98dc0558da1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 30 Mar 2022 16:39:24 -0500
Subject: [PATCH 0782/2561] fortune-mod: don't install offensive fortunes

Closes #36417.
---
 srcpkgs/fortune-mod/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fortune-mod/template b/srcpkgs/fortune-mod/template
index 59f0aa805009..e08c7d162d7f 100644
--- a/srcpkgs/fortune-mod/template
+++ b/srcpkgs/fortune-mod/template
@@ -1,7 +1,7 @@
 # Template file for 'fortune-mod'
 pkgname=fortune-mod
 version=1.99.1
-revision=6
+revision=7
 hostmakedepends="recode"
 makedepends="recode-devel"
 short_desc="Implementation of the BSDGames 'fortune' program"
@@ -11,6 +11,9 @@ homepage="http://www.redellipse.net/code/fortune"
 distfiles="${DEBIAN_SITE}/main/f/fortune-mod/${pkgname}_${version}.orig.tar.gz"
 checksum=fc51aee1f73c936c885f4e0f8b6b48f4f68103e3896eaddc6a45d2b71e14eace
 
+desc_option_offensive="Enable offensive fortunes"
+build_options="offensive"
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" fortune-mod"
 	_strfile="STRFILE=/usr/bin/strfile"
@@ -30,7 +33,7 @@ do_build() {
 }
 do_install() {
 	make prefix=${DESTDIR} FORTDIR=${DESTDIR}/usr/bin \
-		COOKIEDIR=$DESTDIR/usr/share/fortunes \
+		COOKIEDIR=$DESTDIR/usr/share/fortunes OFFENSIVE=$(vopt_if offensive 1 0) \
 		install
 	vlicense LICENSE
 }

From 470241ac32b364663f0992691bfb4b5f5c27a312 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:09:04 -0400
Subject: [PATCH 0783/2561] python3-Jinja2: update to 3.1.1.

---
 srcpkgs/python3-Jinja2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index caea80866dcc..d43e75d50b60 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-version=3.0.3
+version=3.1.1
 revision=1
 wrksrc="Jinja2-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
+checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
 
 post_install() {
 	vlicense LICENSE.rst

From d9411abe2c0fb7c48bbf4d186a4f702fa16a5db7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:09:19 -0400
Subject: [PATCH 0784/2561] python3-cppy: update to 1.2.1.

---
 srcpkgs/python3-cppy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cppy/template b/srcpkgs/python3-cppy/template
index 3afd8399c77a..d94c660c25cc 100644
--- a/srcpkgs/python3-cppy/template
+++ b/srcpkgs/python3-cppy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cppy'
 pkgname=python3-cppy
-version=1.2.0
+version=1.2.1
 revision=1
 wrksrc="cppy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://cppy.readthedocs.io"
 changelog="https://raw.githubusercontent.com/nucleic/cppy/master/releasenotes.rst"
 distfiles="${PYPI_SITE}/c/cppy/cppy-${version}.tar.gz"
-checksum=95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc
+checksum=83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b
 
 post_install() {
 	vlicense LICENSE

From a4717861f7d3e10385990110413305ddcc5321aa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:11:12 -0400
Subject: [PATCH 0785/2561] python3-ipython: update to 8.2.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 07bdc201821d..dfaae66b583d 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.1.1
+version=8.2.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=8138762243c9b3a3ffcf70b37151a2a35c23d3a29f9743878c33624f4207be3d
+checksum=70e5eb132cac594a34b5f799bd252589009905f05104728aea6a403ec2519dc1
 conflicts="python-ipython<=5.8.0_2"
 
 do_check() {

From d2671c1c3d50af8fafa484c3186b44c3d2ee4b8d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:19:08 -0400
Subject: [PATCH 0786/2561] python3-hypothesis: update to 6.40.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 15b9d0f9b0cf..df2addcb45d0 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.39.0
+version=6.40.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=09f2077d400640a936392edbf068f5dfe182b48f70ab3c8592d8274b4ee13e36
+checksum=e68589666b903461e7437ea49043a7bd09a6e2cfd1cc32970b4ee19ffe2ed434
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From f4e8411b6a6052bf3e1d34cc2e15a35ea2a4a438 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:19:42 -0400
Subject: [PATCH 0787/2561] python3-quart: update to 0.17.0.

---
 srcpkgs/python3-quart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template
index 5e3114877ce4..1033468c7c82 100644
--- a/srcpkgs/python3-quart/template
+++ b/srcpkgs/python3-quart/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-quart'
 pkgname=python3-quart
-version=0.16.3
+version=0.17.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-pep517
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://gitlab.com/pgjones/quart"
 changelog="https://gitlab.com/pgjones/quart/-/blob/master/CHANGELOG.rst"
 distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz"
-checksum=84eabcb0da8b84eebcec31c27c59396425c6727ea6f7e524e8f1afc1aa161bb8
+checksum=1f879256b09daa4f7e9a141e90746f11103ce1f3a386f9480709e1d982768a9a
 
 do_check() {
 	# Tests require dist-info on the package, which is only in the wheel.

From 913835a81a9d5275aaec9c8080ff97a33794a2f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:19:55 -0400
Subject: [PATCH 0788/2561] python3-tifffile: update to 2022.3.25.

---
 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 00d4c6c3f391..65b0d119adef 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.3.16
+version=2022.3.25
 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=2e51c805be3a77f472c0cca3f0c13e60eb110fbfc305a20e278dad3d4e4fe4bf
+checksum=620c68f3eeb2b1923e1b3a8bf8a8b7f79498bcd9cd34051ad567c44f0a404353
 # Tests require unpackaged fsspec
 make_check=no
 

From e031028c6c650f4eafcc15e8ef58f89fa2a3c1f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:22:51 -0400
Subject: [PATCH 0789/2561] vkQuake: update to 1.13.0.

---
 srcpkgs/vkQuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 6ae764cb6298..8c0174565c73 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
 # Template file for 'vkQuake'
 pkgname=vkQuake
-version=1.12.2
+version=1.13.0
 revision=1
 build_wrksrc="Quake"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Novum/vkQuake"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=6ce6d44dbc13d8d9b689efa32b19b2765257f3b859becf34cb2e894751ea046e
+checksum=baeab4fbea17bb41064b56a7e6e745f2856634c88d57ad86de97990399c24b3b
 
 do_install() {
 	vbin vkquake

From d2c46ca9e7c308ed230a2c2f70147768609410be Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Tue, 29 Mar 2022 23:59:51 +0530
Subject: [PATCH 0790/2561] wireplumber: add runit service

ahesford: add log sub-service, redirect stderr in run script
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>

Closes: #36416 [via git-merge-pr]
---
 srcpkgs/wireplumber/files/wireplumber/control/t |  2 ++
 srcpkgs/wireplumber/files/wireplumber/log/run   |  3 +++
 srcpkgs/wireplumber/files/wireplumber/run       | 10 ++++++++++
 srcpkgs/wireplumber/template                    |  3 ++-
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/wireplumber/files/wireplumber/control/t
 create mode 100644 srcpkgs/wireplumber/files/wireplumber/log/run
 create mode 100644 srcpkgs/wireplumber/files/wireplumber/run

diff --git a/srcpkgs/wireplumber/files/wireplumber/control/t b/srcpkgs/wireplumber/files/wireplumber/control/t
new file mode 100755
index 000000000000..a095b7bc777a
--- /dev/null
+++ b/srcpkgs/wireplumber/files/wireplumber/control/t
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid)
diff --git a/srcpkgs/wireplumber/files/wireplumber/log/run b/srcpkgs/wireplumber/files/wireplumber/log/run
new file mode 100644
index 000000000000..4dd58318870e
--- /dev/null
+++ b/srcpkgs/wireplumber/files/wireplumber/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -t wireplumber -p daemon.info
diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
new file mode 100644
index 000000000000..ae0cf99e200b
--- /dev/null
+++ b/srcpkgs/wireplumber/files/wireplumber/run
@@ -0,0 +1,10 @@
+#!/bin/sh
+# this service is experimental and most setups should start pipewire and wireplumber as a user,
+# for further information, please refer to the handbook
+
+sv check dbus >/dev/null 2>&1 || exit 1
+
+exec 2>&1
+
+export HOME=/var/run/pipewire
+exec chpst -u _pipewire:_pipewire:audio:video -P dbus-run-session wireplumber
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index e94c35b3eea5..dadbf62647fb 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.8
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -18,6 +18,7 @@ checksum=a7a84c21230c339a905704a9495dda10a4dec41a96bc115a9b33d24310a3f605
 
 post_install() {
 	vlicense LICENSE
+	vsv wireplumber
 }
 
 wireplumber-devel_package() {

From 4ae389fbd09b1840ba372e3d21653e0ac652c9a6 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 28 Mar 2022 19:49:52 +0530
Subject: [PATCH 0791/2561] mongoose: update to 7.6

Closes: #36395 [via git-merge-pr]
---
 srcpkgs/mongoose/patches/add-makefile.patch | 50 -----------------
 srcpkgs/mongoose/patches/fix-makefile.patch | 59 +++++++++++++++++++++
 srcpkgs/mongoose/patches/fix-tests.patch    | 17 ++++++
 srcpkgs/mongoose/template                   | 40 +++++++++++---
 4 files changed, 108 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/mongoose/patches/add-makefile.patch
 create mode 100644 srcpkgs/mongoose/patches/fix-makefile.patch
 create mode 100644 srcpkgs/mongoose/patches/fix-tests.patch

diff --git a/srcpkgs/mongoose/patches/add-makefile.patch b/srcpkgs/mongoose/patches/add-makefile.patch
deleted file mode 100644
index fd0b21095472..000000000000
--- a/srcpkgs/mongoose/patches/add-makefile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,47 @@
-+PROG		= mongoose
-+LIB         = lib$(PROG).so.0
-+
-+ifndef PREFIX
-+  PREFIX=/usr/local
-+endif
-+
-+ifndef DOCDIR
-+	DOCDIR=$(PREFIX)/share/$(PROG)/doc
-+endif
-+
-+CPPFLAGS+=-DMONGOOSE_ENABLE_THREADS -DMG_ENABLE_SSL
-+CFLAGS+=-fPIC -c -Wall
-+LDFLAGS+=-shared -lssl -pthread -lcrypto
-+
-+SRCS=mongoose.c
-+OBJS=mongoose.o
-+INCLUDE=.
-+
-+all: $(LIB)
-+
-+$(LIB): $(OBJS)
-+	$(CC) $(OBJS) $(LDFLAGS) -o $(LIB)
-+
-+$(OBJS): $(SRCS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDE) $(SRCS) -o $(OBJS)
-+
-+install: 
-+	install -d $(DESTDIR)$(PREFIX)/include
-+	install -m644 mongoose.h $(DESTDIR)$(PREFIX)/include
-+	install -d $(DESTDIR)$(PREFIX)/lib
-+	ln -sf $(LIB) $(LIB).0; cp -a $(LIB).0 $(DESTDIR)$(PREFIX)/lib
-+	ln -sf $(LIB) libmongoose.so; cp -a libmongoose.so $(DESTDIR)$(PREFIX)/lib
-+	install -m755 $(LIB) $(DESTDIR)$(PREFIX)/lib
-+	install -dm755 $(DESTDIR)$(DOCDIR)
-+	cp -a examples $(DESTDIR)$(DOCDIR)
-+	cp -a docs/* $(DESTDIR)$(DOCDIR)/
-+
-+	
-+test:
-+	$(MAKE) -C test/
-+clean:
-+	rm -f $(OBJS) $(LIB)
-+	$(MAKE) -C test/ clean
-+
-+.PHONY: clean test all
-+
diff --git a/srcpkgs/mongoose/patches/fix-makefile.patch b/srcpkgs/mongoose/patches/fix-makefile.patch
new file mode 100644
index 000000000000..d829ea8adc8c
--- /dev/null
+++ b/srcpkgs/mongoose/patches/fix-makefile.patch
@@ -0,0 +1,59 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,5 +5,5 @@ SRCS = mongoose.c test/unit_test.c test/packed_fs.c
+ OPTS ?= -O3 -g3
+ INCS ?= -Isrc -I.
+-CFLAGS ?= $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) $(EXTRA)
++CFLAGS := $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) $(CFLAGS)
+ SSL ?= MBEDTLS
+ CWD ?= $(realpath $(CURDIR))
+@@ -10,6 +10,9 @@ CWD ?= $(realpath $(CURDIR))
+ DOCKER ?= docker run --rm -e Tmp=. -e WINEDEBUG=-all -v $(CWD):$(CWD) -w $(CWD)
+ VCFLAGS = /nologo /W3 /O2 /I. $(DEFS) $(TFLAGS)
+ IPV6 ?= 1
++ifneq "$(NO_SANITIZE)" "1"
++SANITIZE = -fsanitize=address,undefined
++endif
+ ASAN_OPTIONS ?=
+ EXAMPLES := $(wildcard examples/*)
+ PREFIX ?= /usr/local
+@@ -19,12 +22,12 @@ VERSION ?= $(shell cut -d'"' -f2 src/version.h)
+ ifeq "$(SSL)" "MBEDTLS"
+ MBEDTLS ?= /usr
+ CFLAGS  += -DMG_ENABLE_MBEDTLS=1 -I$(MBEDTLS)/include -I/usr/include
+-LDFLAGS ?= -L$(MBEDTLS)/lib -lmbedtls -lmbedcrypto -lmbedx509
++LDFLAGS += -L$(MBEDTLS)/lib -lmbedtls -lmbedcrypto -lmbedx509
+ endif
+ ifeq "$(SSL)" "OPENSSL"
+ OPENSSL ?= /usr
+ CFLAGS  += -DMG_ENABLE_OPENSSL=1 -I$(OPENSSL)/include
+-LDFLAGS ?= -L$(OPENSSL)/lib -lssl -lcrypto
++LDFLAGS += -L$(OPENSSL)/lib -lssl -lcrypto
+ endif
+ 
+ all: mg_prefix unamalgamated unpacked test test++ arm examples vc98 vc2017 mingw mingw++ linux linux++ fuzz
+@@ -59,7 +62,7 @@ fuzz: fuzzer
+ 	$(RUN) ./fuzzer
+ 
+ # make CC=/usr/local/opt/llvm\@8/bin/clang ASAN_OPTIONS=detect_leaks=1
+-test: CFLAGS += -DMG_ENABLE_IPV6=$(IPV6) -fsanitize=address,undefined
++test: CFLAGS += -DMG_ENABLE_IPV6=$(IPV6) $(SANITIZE)
+ test: mongoose.h  Makefile $(SRCS)
+ 	$(CC) $(SRCS) $(CFLAGS) -coverage $(LDFLAGS) -g -o unit_test
+ 	ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./unit_test
+@@ -108,10 +111,12 @@ linux++: CC = g++
+ linux++: WARN += -Wno-missing-field-initializers
+ linux++: linux
+ 
+-linux-libs: CFLAGS += -fPIC
+-linux-libs: mongoose.o
+-	$(CC) mongoose.o $(LDFLAGS) -shared -o libmongoose.so.$(VERSION)
++.PHONY: linux-libs
++linux-libs: libmongoose.a libmongoose.so.$(VERSION)
++libmongoose.a: mongoose.o
+ 	$(AR) rcs libmongoose.a mongoose.o
++libmongoose.so.$(VERSION): mongoose.o
++	$(CC) mongoose.o $(LDFLAGS) -shared -o libmongoose.so.$(VERSION)
+ 
+ install: linux-libs
+ 	install -Dm644 libmongoose.a libmongoose.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib
diff --git a/srcpkgs/mongoose/patches/fix-tests.patch b/srcpkgs/mongoose/patches/fix-tests.patch
new file mode 100644
index 000000000000..8b25527492d5
--- /dev/null
+++ b/srcpkgs/mongoose/patches/fix-tests.patch
@@ -0,0 +1,17 @@
+Skip tests that want to connect to the internet
+
+--- a/test/unit_test.c
++++ b/test/unit_test.c
+@@ -1680,11 +1562,9 @@ int main(void) {
+   test_ws();
+   test_ws_fragmentation();
+   test_http_server();
+-  test_http_client();
+   test_http_no_content_length();
+   test_http_pipeline();
+   test_http_range();
+-  test_mqtt();
+   printf("SUCCESS. Total tests: %d\n", s_num_tests);
+   return EXIT_SUCCESS;
+ }
+
diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index eddadc647333..a81658710d7b 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,22 +1,44 @@
 # Template file for 'mongoose'
 pkgname=mongoose
-version=6.18
-revision=4
+version=7.6
+revision=1
 build_style=gnu-makefile
-make_use_env=compliant
+make_use_env=yes
+make_check_target=test
+make_build_target=linux-libs
 makedepends="openssl-devel"
-short_desc="Easy to use Web server"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="openssl-devel"
+short_desc="Embedded HTTP/WebSocket/MQTT library for C/C++"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
-homepage="https://cesanta.com/"
+homepage="https://mongoose.ws/"
 distfiles="https://github.com/cesanta/mongoose/archive/${version}.tar.gz"
-checksum=f5c10346abc9c72f7cac7885d853ca064fb09aad57580433941a8fd7a3543769
+checksum=1ef09d971b6de1a6317c109980d6fb5a9c19b39efef2506d6b76869644b3dafa
+
+# -Wno-error=unused-function: patched tests leave some functions unused
+# -Wno-error=sign-conversion: GCC falsely flags musl FD_{SET,ISSET,CLR}
+CFLAGS="-fPIC -Wno-error=sign-conversion -Wno-error=unused-function"
+
+export SSL=OPENSSL
+
+# libsanitizer-devel is currenly not available on musl
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	make_check_args+=" NO_SANITIZE=1"
+else
+	checkdepends+=" libsanitizer-devel"
+fi
+
+# GitHub CI runner doesn't support IPv6, causing tests to fail
+if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+	make_check_args+=" IPV6=0"
+fi
 
 mongoose-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
@@ -24,6 +46,8 @@ mongoose-devel_package() {
 mongoose-doc_package() {
 	short_desc+=" - documentation"
 	pkg_install() {
-		vmove usr/share
+		vmkdir "usr/share/${sourcepkg}/doc"
+		vcopy examples "usr/share/${sourcepkg}/doc"
+		vcopy "docs/*" "usr/share/${sourcepkg}/doc"
 	}
 }

From 5482c0476f4062afbe436ca9fecb1aa2eedfb8a3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 31 Mar 2022 02:59:29 +0200
Subject: [PATCH 0792/2561] qbittorrent: update to 4.4.2.

---
 srcpkgs/qbittorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index b7c236909ae5..b80695e80958 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.4.1
+version=4.4.2
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1386f000ce1d791469c3ea03e3951ca25f67f534e66896592bd12357dda9a8ec
+checksum=efa580924e96605bae916b9a8ae1f3fce82a5130647ae41d74d689761262463d
 
 do_extract() {
 	local n=${pkgname}-${version}

From 651e7a06fa587bf84a611655ef02f42563aacf40 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Mar 2022 13:45:35 +1100
Subject: [PATCH 0793/2561] iwd: update to 1.26.

---
 srcpkgs/iwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index c03b430976ed..66f55599c5e0 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.24
+version=1.26
 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=61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224
+checksum=0ff4541c2b7f14ec010c3cbd1f02350f1b58cb0c103412db22550e90d8040d6b
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From 3b67c089f69a6fb9671bb4cd34983569fbebeebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 31 Mar 2022 09:43:16 -0300
Subject: [PATCH 0794/2561] doxygen: update to 1.9.3.

---
 ...-Fix-memory-corruption-in-TextStream.patch | 40 -------------------
 srcpkgs/doxygen/template                      |  4 +-
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch

diff --git a/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch b/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch
deleted file mode 100644
index 80c7ff16d17e..000000000000
--- a/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-upstream PR: https://github.com/doxygen/doxygen/pull/8739
-
-What was happening is that the TextStream object is reused for multiple
-different files. Therefore, when one calls setStream(nullptr) or
-setFile(nullptr), m_f or m_s will, respectively, still contain a pointer
-to the previous member, which is used when one calls setFile() or
-setStream() again, since these methods will call flush().
-
-For example, a program doing
-
-   s.setFile(f1);
-   s.setStream(nullptr);
-   fclose(f1);
-   s.setFile(f2);
-
-will call fwrite(f1, ...). This pattern can be observed in many parts of
-Doxygen, so fixing it in TextStream itself by always zeroing the other
-pointer is the simplest fix.
-
-diff --git a/src/textstream.h b/src/textstream.h
-index 161ce7fe..38027ec0 100644
---- a/src/textstream.h
-+++ b/src/textstream.h
-@@ -67,11 +67,13 @@ class TextStream final
-     {
-       flush();
-       m_s = s;
-+      m_f = nullptr;
-     }
- 
-     void setFile(FILE *f)
-     {
-       flush();
-+      m_s = nullptr;
-       m_f = f;
-     }
- 
--- 
-2.33.0
-
diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index 8f5b986ceaf4..946ceeebcc11 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'doxygen'
 pkgname=doxygen
-version=1.9.2
+version=1.9.3
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="http://www.doxygen.org/"
 changelog="https://www.doxygen.nl/manual/changelog.html"
 distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz"
-checksum=060f254bcef48673cc7ccf542736b7455b67c110b30fdaa33512a5b09bbecee5
+checksum=f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0
 
 build_options="wizard"
 desc_option_wizard="build Qt5 GUI configuration tool, doxywizard"

From b85a05b00de5d2061db0e88854876d0030cca43a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 31 Mar 2022 09:43:28 -0300
Subject: [PATCH 0795/2561] libvarlink: update to 23.

---
 srcpkgs/libvarlink/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvarlink/template b/srcpkgs/libvarlink/template
index 0633adbb17b4..43eb3ab89812 100644
--- a/srcpkgs/libvarlink/template
+++ b/srcpkgs/libvarlink/template
@@ -1,6 +1,6 @@
 # Template file for 'libvarlink'
 pkgname=libvarlink
-version=22
+version=23
 revision=1
 build_style=meson
 short_desc="C implementation of the Varlink protocol and command line tool"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="Apache-2.0"
 homepage="https://varlink.org/"
 distfiles="https://github.com/varlink/libvarlink/archive/refs/tags/${version}.tar.gz"
-checksum=932c0d7c3d2d8acdf5878d8fd8006887c5855189688d19eb09125682740b99bb
+checksum=a5575e070e446e7c4486d424393950e6cb7a3b376ee20d517b0c13a876659a8d
 
 libvarlink-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From be78bff36442f16f10b5a4f166d20690a9aef7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 31 Mar 2022 09:43:31 -0300
Subject: [PATCH 0796/2561] kstars: update to 3.5.8.

---
 srcpkgs/kstars/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index 11ab05b13b06..0b14040aff2e 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,6 +1,6 @@
 # Template file for 'kstars'
 pkgname=kstars
-version=3.5.5
+version=3.5.8
 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=703df56050672af10fc8142296ceaa27134a6a00e8222f3f6677f18ff1ac6b43
+checksum=660d902837b7abf3810d6e24f72fd84f0444a29bd7d43e1896b19fece1c88c3f

From 29d8ed6e20570db507c40a0e7ead1d6888549a2e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 31 Mar 2022 14:21:35 +0200
Subject: [PATCH 0797/2561] libX11: update to 1.7.4.

---
 srcpkgs/libX11/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 83d21c86ad17..53bd34be6e08 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.7.3.1
-revision=2
+version=1.7.4
+revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
-checksum=2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989
+checksum=0e7d48bfa0b0ee5705d14fe140cf4310744ed131f0a6241b7cf03db06000fe51
 
 do_configure() {
 	./configure ${configure_args}

From 700abf1ce4feec05d6ec41df314016577017487a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 31 Mar 2022 10:12:26 -0400
Subject: [PATCH 0798/2561] Revert "python3-Jinja2: update to 3.1.1."

python3-jupyter_nbconvert-6.0.7 is incompatible with Jinja >= 3.1.0, so
hold back until that package can be updated.

This reverts commit ffcb1e6fb8349a0d15466f45487407708e0373f5.
---
 srcpkgs/python3-Jinja2/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index d43e75d50b60..6a4c28214cca 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,7 +1,8 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-version=3.1.1
-revision=1
+reverts="3.1.1_1"
+version=3.0.3
+revision=2
 wrksrc="Jinja2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +14,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
+checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
 
 post_install() {
 	vlicense LICENSE.rst

From 1f752268f523ceaab143115e0846b137406aab92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 19 Mar 2022 21:55:20 -0300
Subject: [PATCH 0799/2561] python3-sympy: update to 1.10.1.

Also fix integer_nthroot(2, 10**10) in 32 bit, reported upstream.
---
 .../patches/fix_integer_nthroot.patch         | 26 +++++++++++++++++++
 srcpkgs/python3-sympy/template                |  4 +--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch

diff --git a/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch b/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch
new file mode 100644
index 000000000000..0f4860a6c9e1
--- /dev/null
+++ b/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch
@@ -0,0 +1,26 @@
+Fix integer_nthroot(2, 10**10) in 32 bit.
+
+See: https://github.com/sympy/sympy/issues/18374#issuecomment-1081196879
+
+diff --git a/sympy/core/power.py b/sympy/core/power.py
+index 59ab7c53a4..ae3ee25c93 100644
+--- a/sympy/core/power.py
++++ b/sympy/core/power.py
+@@ -21,6 +21,8 @@
+
+ from mpmath.libmp import sqrtrem as mpmath_sqrtrem
+
++from ctypes import c_ulong
++ULONG_MAX = c_ulong(-1).value
+
+
+ def isqrt(n):
+@@ -74,7 +76,7 @@ def integer_nthroot(y, n):
+         raise ValueError("y must be nonnegative")
+     if n < 1:
+         raise ValueError("n must be positive")
+-    if HAS_GMPY and n < 2**63:
++    if HAS_GMPY and n <= ULONG_MAX:
+         # Currently it works only for n < 2**63, else it produces TypeError
+         # sympy issue: https://github.com/sympy/sympy/issues/18374
+         # gmpy2 issue: https://github.com/aleaxit/gmpy/issues/257
diff --git a/srcpkgs/python3-sympy/template b/srcpkgs/python3-sympy/template
index 807f0db5f1a2..3bb4df3bffdf 100644
--- a/srcpkgs/python3-sympy/template
+++ b/srcpkgs/python3-sympy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-sympy'
 pkgname=python3-sympy
-version=1.9
+version=1.10.1
 revision=1
 wrksrc="sympy-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://sympy.org/"
 distfiles="${PYPI_SITE}/s/sympy/sympy-${version}.tar.gz"
-checksum=c7a880e229df96759f955d4f3970d4cabce79f60f5b18830c08b90ce77cd5fdc
+checksum=5939eeffdf9e152172601463626c022a2c27e75cf6278de8d401d50c9d58787b
 
 post_install() {
 	vman doc/man/isympy.1

From 899939937c76f7084335ead47b63c7b112f10bb7 Mon Sep 17 00:00:00 2001
From: Petr Cizmar <xgt0322@xpc.ovh>
Date: Thu, 31 Mar 2022 16:40:10 +0200
Subject: [PATCH 0800/2561] New package: ctzcls-cups-1.5

---
 srcpkgs/ctzcls-cups/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/ctzcls-cups/template

diff --git a/srcpkgs/ctzcls-cups/template b/srcpkgs/ctzcls-cups/template
new file mode 100644
index 000000000000..38572c0fcbff
--- /dev/null
+++ b/srcpkgs/ctzcls-cups/template
@@ -0,0 +1,21 @@
+# Template file for 'ctzcls-cups'
+pkgname=ctzcls-cups
+version=1.5
+revision=1
+create_wrksrc=yes
+makedepends="cups-devel"
+short_desc="Citizen Sticker Printers driver for CUPS"
+maintainer="Petr Cizmar <xxb0322@xpc.ovh>"
+license="GPL-2.0-or-later"
+homepage="https://www.citizen-systems.co.jp/en/printer/download/driver-cups-source/"
+distfiles="https://www.citizen-systems.co.jp/en/printer/download/driver-cups-source/cups-ctzcls.tar.bz2"
+checksum=d3fe19aa253044c383df3a3869c9dac88b0ced374fe42eb24aabfe6a1ff72ff4
+
+do_build() {
+	$CC $CFLAGS -fPIC -o rastertocls rastertocls.c -lcupsimage -lcups $LDFLAGS
+}
+
+do_install() {
+	vinstall ctzcls.ppd 644 /usr/share/cups/model/
+	vinstall rastertocls 755 /usr/lib/cups/filter/
+}

From 6ade01013ba7ccc60c172b697138b5b027b4c783 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 20:44:27 +0200
Subject: [PATCH 0801/2561] meson: patch gtk-update-icon-cache detection

---
 ...me-fallback-to-gtk-update-icon-cache.patch | 26 +++++++++++++++++++
 srcpkgs/meson/template                        |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch

diff --git a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
new file mode 100644
index 000000000000..56a3f7cf3410
--- /dev/null
+++ b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
@@ -0,0 +1,26 @@
+From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Wed, 23 Mar 2022 22:15:11 +0100
+Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache
+
+Commit a0cade8f introduced a typo and wrongly check for
+gtk4-update-icon-cache twice.
+If gtk4-update-icon-cache (gtk4) is not found, look for
+gtk-update-icon-cache (gtk3) instead.
+---
+ mesonbuild/modules/gnome.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index 673a781a41d..501be9ae4da 100644
+--- a/mesonbuild/modules/gnome.py
++++ b/mesonbuild/modules/gnome.py
+@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: '
+             prog = state.find_program('gtk4-update-icon-cache', required=False)
+             found = isinstance(prog, build.Executable) or prog.found()
+             if not found:
+-                prog = state.find_program('gtk4-update-icon-cache')
++                prog = state.find_program('gtk-update-icon-cache')
+             icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
+             script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir])
+             script.skip_if_destdir = True
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 2f9ccaaa4691..adfa2d52f7ab 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
 version=0.61.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"

From a4a5ee77d2b470d28c7ee63001c2b1a362d43a36 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 31 Mar 2022 06:11:14 +0200
Subject: [PATCH 0802/2561] New package: helix-22.03

---
 srcpkgs/helix/files/hx                        |   2 +
 ...g-the-format-ident-Rust-feature-1881.patch | 104 ++++++++++++++++++
 srcpkgs/helix/template                        |  32 ++++++
 3 files changed, 138 insertions(+)
 create mode 100644 srcpkgs/helix/files/hx
 create mode 100644 srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch
 create mode 100644 srcpkgs/helix/template

diff --git a/srcpkgs/helix/files/hx b/srcpkgs/helix/files/hx
new file mode 100644
index 000000000000..a43e49fadc5b
--- /dev/null
+++ b/srcpkgs/helix/files/hx
@@ -0,0 +1,2 @@
+#!/bin/sh
+HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/hx "$@"
diff --git a/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch b/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch
new file mode 100644
index 000000000000..73eafa91cc1b
--- /dev/null
+++ b/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch
@@ -0,0 +1,104 @@
+From f2dd3d446914ec0953cd7e056d430fc3b959e75d Mon Sep 17 00:00:00 2001
+From: Marcin Puc <tranzystorek.io@protonmail.com>
+Date: Wed, 30 Mar 2022 02:08:30 +0200
+Subject: [PATCH] Avoid using the format ident Rust feature (#1881)
+
+---
+ helix-loader/src/grammar.rs      | 14 +++++++++-----
+ helix-term/src/commands/typed.rs |  4 ++--
+ helix-term/src/health.rs         |  9 +++++----
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
+index 299a06bf..f0c5ea28 100644
+--- a/helix-loader/src/grammar.rs
++++ b/helix-loader/src/grammar.rs
+@@ -63,12 +63,12 @@ pub fn get_language(name: &str) -> Result<Language> {
+     library_path.set_extension(DYLIB_EXTENSION);
+ 
+     let library = unsafe { Library::new(&library_path) }
+-        .with_context(|| format!("Error opening dynamic library {library_path:?}"))?;
++        .with_context(|| format!("Error opening dynamic library {:?}", library_path))?;
+     let language_fn_name = format!("tree_sitter_{}", name.replace('-', "_"));
+     let language = unsafe {
+         let language_fn: Symbol<unsafe extern "C" fn() -> Language> = library
+             .get(language_fn_name.as_bytes())
+-            .with_context(|| format!("Failed to load symbol {language_fn_name}"))?;
++            .with_context(|| format!("Failed to load symbol {}", language_fn_name))?;
+         language_fn()
+     };
+     std::mem::forget(library);
+@@ -133,7 +133,7 @@ where
+     // TODO: print all failures instead of the first one found.
+     rx.iter()
+         .find(|result| result.is_err())
+-        .map(|err| err.with_context(|| format!("Failed to {action} some grammar(s)")))
++        .map(|err| err.with_context(|| format!("Failed to {} some grammar(s)", action)))
+         .unwrap_or(Ok(()))
+ }
+ 
+@@ -238,12 +238,16 @@ fn build_grammar(grammar: GrammarConfiguration) -> Result<()> {
+     };
+ 
+     let grammar_dir_entries = grammar_dir.read_dir().with_context(|| {
+-        format!("Failed to read directory {grammar_dir:?}. Did you use 'hx --grammar fetch'?")
++        format!(
++            "Failed to read directory {:?}. Did you use 'hx --grammar fetch'?",
++            grammar_dir
++        )
+     })?;
+ 
+     if grammar_dir_entries.count() == 0 {
+         return Err(anyhow!(
+-            "Directory {grammar_dir:?} is empty. Did you use 'hx --grammar fetch'?"
++            "Directory {:?} is empty. Did you use 'hx --grammar fetch'?",
++            grammar_dir
+         ));
+     };
+ 
+diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
+index 8b7f481b..c921f85b 100644
+--- a/helix-term/src/commands/typed.rs
++++ b/helix-term/src/commands/typed.rs
+@@ -891,8 +891,8 @@ fn setting(
+     }
+     let (key, arg) = (&args[0].to_lowercase(), &args[1]);
+ 
+-    let key_error = || anyhow::anyhow!("Unknown key `{key}`");
+-    let field_error = |_| anyhow::anyhow!("Could not parse field `{arg}`");
++    let key_error = || anyhow::anyhow!("Unknown key `{}`", key);
++    let field_error = |_| anyhow::anyhow!("Could not parse field `{}`", arg);
+ 
+     let mut config = serde_json::to_value(&cx.editor.config().clone()).unwrap();
+     let pointer = format!("/{}", key.replace('.', "/"));
+diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs
+index f13d35f0..2a02e118 100644
+--- a/helix-term/src/health.rs
++++ b/helix-term/src/health.rs
+@@ -89,10 +89,11 @@ pub fn languages_all() {
+ 
+     let column = |item: &str, color: Color| {
+         let data = format!(
+-            "{:column_width$}",
++            "{:width$}",
+             item.get(..column_width - 2)
+-                .map(|s| format!("{s}…"))
+-                .unwrap_or_else(|| item.to_string())
++                .map(|s| format!("{}…", s))
++                .unwrap_or_else(|| item.to_string()),
++            width = column_width,
+         )
+         .stylize()
+         .with(color);
+@@ -158,7 +159,7 @@ pub fn language(lang_str: String) {
+     {
+         Some(l) => l,
+         None => {
+-            let msg = format!("Language '{lang_str}' not found");
++            let msg = format!("Language '{}' not found", lang_str);
+             println!("{}", msg.red());
+             let suggestions: Vec<&str> = syn_loader_conf
+                 .language
+-- 
+2.35.1
+
diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
new file mode 100644
index 000000000000..961a894092b7
--- /dev/null
+++ b/srcpkgs/helix/template
@@ -0,0 +1,32 @@
+# Template file for 'helix'
+pkgname=helix
+version=22.03
+revision=1
+build_style=cargo
+make_install_args="--path helix-term"
+hostmakedepends="git"
+short_desc="Post-modern modal text editor"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MPL-2.0"
+homepage="https://helix-editor.com/"
+changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md"
+distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz"
+checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4
+conflicts="hex>=0"
+
+# skip problematic doctests on i686
+case "$XBPS_TARGET_MACHINE" in
+	i686*) make_check_args="-- --skip src/";;
+	*) ;;
+esac
+
+post_install() {
+	rm runtime/grammars/.gitkeep
+	rm runtime/themes/README.md
+	rm -rf runtime/grammars/sources
+
+	vmkdir usr/lib/helix
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/
+	vcopy runtime usr/lib/helix
+	vbin ${FILESDIR}/hx
+}

From f6613f4d6d628b32858a22bb04d010a0b1da8e23 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 20:45:21 -0700
Subject: [PATCH 0803/2561] gtksourceview5: update to 5.4.0

---
 srcpkgs/gtksourceview5/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index c4c7d94f51e8..81be2e5248da 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
 # Template file for 'gtksourceview5'
 pkgname=gtksourceview5
-version=5.2.0
+version=5.4.0
 revision=1
 wrksrc="gtksourceview-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
- $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
 makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala)
  pcre2-devel"
 checkdepends="xvfb-run cantarell-fonts"
@@ -16,9 +16,10 @@ short_desc="Text widget that extends GTK4 GtkTextView widget"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GtkSourceView"
-changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-2/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS"
 distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=c9b34fa02654f56ce22fa08827d89db4ba81631b2e6d7d31ea65d13c729430e9
+checksum=003bc217e670a8ec8aa3aece994b70e70b7d6b8074938adda21718555d84e637
 
 # Package build options
 build_options="gir gtk_doc"
@@ -42,7 +43,7 @@ gtksourceview5-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0

From 303abe31123a778c9ca29a0fcf8ddf08593b3b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 31 Mar 2022 21:58:28 +0200
Subject: [PATCH 0804/2561] python3-libarchive-c: update to 4.0.

---
 srcpkgs/python3-libarchive-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index 1a4d1de77f2b..e84524799bda 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.2
+version=4.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=e09bd195f72646472f7514145f8f65fd371444d9c98123cd6ec7555048d57045
+checksum=5266797302af2707b6b61bce3b4ce417fe8a583fbeaaab5712dc6dcbf0de3c2b

From 18bd21c774ac3bcacc589cec95658daf262c433a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 31 Mar 2022 21:58:29 +0200
Subject: [PATCH 0805/2561] diffoscope: update to 209.

---
 srcpkgs/diffoscope/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 17a9cfd447be..9ce203fb8ff3 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=203
+version=209
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,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=d048dbbef81c6a77985f76b9a358e014461ac5c7b36920449fdc999e314654e7
+checksum=e845a0b6cd56c116fee670ae8497512489504dc911201bd77b7d65b8550618f6

From f68baba2eec0f52b68cc3baf6fc0566ca2b5a5d2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 18 Mar 2022 07:51:01 -0400
Subject: [PATCH 0806/2561] swaykbdd: update to 1.1.

---
 srcpkgs/swaykbdd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swaykbdd/template b/srcpkgs/swaykbdd/template
index 195b04475bc1..1434199c5f27 100644
--- a/srcpkgs/swaykbdd/template
+++ b/srcpkgs/swaykbdd/template
@@ -1,6 +1,6 @@
 # Template file for 'swaykbdd'
 pkgname=swaykbdd
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="MIT"
 homepage="https://github.com/artemsen/swaykbdd"
 distfiles="https://github.com/artemsen/swaykbdd/archive/v${version}.tar.gz"
-checksum=9de46256cafb2b002d4632e1a2f4ca2383e69b69de4d19d3d2d6f4825ef9fca2
+checksum=b1b0fa9ca43e177345a7761d0f9b705ff7d338fea48c1877a44767cf527b131c
 
 post_install() {
 	vlicense LICENSE

From d5f27a990383b93d5d299a144de43b9448edd978 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 21:09:07 +0200
Subject: [PATCH 0807/2561] gfbgraph: update to 0.2.5.

---
 srcpkgs/gfbgraph/template | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 85a7d27af6e8..63c6376122a2 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,51 +1,42 @@
 # Template file for 'gfbgraph'
 pkgname=gfbgraph
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool automake libtool gtk-doc which"
+configure_args="--disable-static $(vopt_enable gtk_doc gtk-doc)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
 makedepends="rest-devel json-glib-devel gnome-online-accounts-devel"
 short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GFBGraph"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379
+checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
+make_check=no # needs facebook credentials
 
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --disable-gtk-doc"
-else
-	configure_args+=" --enable-gtk-doc"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
 fi
 
-do_check() {
-	:
-}
-
-pre_configure() {
-	NOCONFIGURE=1 sh autogen.sh
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }
 
 gfbgraph-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ -z "$CROSS_BUILD" ]; then
+		if [ "$build_option_gtk_doc" ]; then
 			vmove usr/share/gtk-doc
 		fi
 		vmove "usr/lib/*.so"
-		if [ -z "$CROSS_BUILD" ]; then
+		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
 	}

From 518a04d7a4f9c0f86bee4e1c401ae89e293c911a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 31 Mar 2022 16:22:00 -0500
Subject: [PATCH 0808/2561] Amass: update to 3.19.0.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index a33e92ce1d2c..993c17d52c1c 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.18.3
+version=3.19.0
 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=66eee8ffd300e67a540e9962d2526377677df04b1a3b436471e0a930dd422a9f
+checksum=539c2207f844c81cc9a6286e436f26a1fc0690bf424ea1885844dd33002b7ef6

From b699d4f9f00743ca9c8cea2195c32197f0a4fdd1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 1 Apr 2022 00:09:11 +0200
Subject: [PATCH 0809/2561] libvirt-glib: remove unnecessary build deps

---
 srcpkgs/libvirt-glib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 032188df7f73..7ec4d9898239 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -6,9 +6,9 @@ build_helper="gir"
 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"
+hostmakedepends="pkg-config gettext glib-devel
+ $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
+makedepends="libglib-devel libvirt-devel libxml2-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 45a28a9085f1d58095eeb8b1c2388b82d41f3667 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 31 Mar 2022 17:18:12 -0500
Subject: [PATCH 0810/2561] jc: add missing depends

---
 srcpkgs/jc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index 8f510a980bc2..20a7438da19d 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,10 +1,10 @@
 # Template file for 'jc'
 pkgname=jc
 version=1.18.6
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-Pygments"
+depends="python3-Pygments python3-ruamel.yaml python3-xmltodict"
 checkdepends="python3-pytest $depends"
 short_desc="Convert to JSON"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 1e04633a6892b271f95ee2e6892fde63cb2de73c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 23:35:26 +0200
Subject: [PATCH 0811/2561] gnome-ssh-askpass: use gtk+3

---
 srcpkgs/gnome-ssh-askpass/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index fbd9174fae2f..558193ab2a19 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,10 +1,13 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
 version=8.9p1
-revision=1
+revision=2
 wrksrc="openssh-${version}"
+build_wrksrc="contrib"
+build_style=gnu-makefile
+make_build_target="gnome-ssh-askpass3"
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel"
+makedepends="gtk+3-devel"
 short_desc="GTK SSH passphrase grabber (from OpenSSH)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, BSD-2-Clause"
@@ -16,12 +19,7 @@ alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
 "
 
-do_build() {
-	cd contrib
-	${CC} ${CFLAGS} $(pkg-config --cflags gtk+-2.0) ${pkgname}2.c -o ${pkgname} $(pkg-config --libs gtk+-2.0) ${LDFLAGS} -lX11
-}
-
 do_install() {
-	vbin contrib/${pkgname}
-	vlicense LICENCE
+	vbin gnome-ssh-askpass3 gnome-ssh-askpass
+	vlicense ../LICENCE
 }

From c5c044cd7d41ea64814c02dc0f308a0ab8142de3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 16 Mar 2022 14:30:12 +0100
Subject: [PATCH 0812/2561] zellij: update to 0.27.0

---
 srcpkgs/zellij/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index e2ada810e570..72a9ab9e6e76 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,6 +1,6 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.26.0
+version=0.27.0
 revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
@@ -9,12 +9,12 @@ build_style=cargo
 build_helper=qemu
 checkdepends="openssl-devel pkg-config"
 short_desc="Terminal workspace with batteries included"
-maintainer="Marcin Puc <marcin.e.puc@gmail.com>"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="MIT"
 homepage="https://zellij.dev"
 changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz"
-checksum=f0b0cfe7b72ce842de80d5c32cc2abe624b3286fab16f313a4e43e226e95e87b
+checksum=6159482c25d3cb55b04d23230812f4450e88ff0975161594297a7deef8979a38
 
 post_build() {
 	ZELLIJ="target/${RUST_TARGET}/release/zellij"

From a5aec3609bdb8975a5733ac405c74f313cd37439 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 22:43:18 +0200
Subject: [PATCH 0813/2561] gtk4: update to 4.6.2.

---
 srcpkgs/gtk4/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index a689633bf4d5..ed86ad7bab4c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.6.1
+version=4.6.2
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -13,7 +13,7 @@ configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
  -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+hostmakedepends="gettext-devel glib-devel gi-docgen perl
  pkg-config sassc gettext libxslt docbook-xsl python3-docutils
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
@@ -29,7 +29,7 @@ license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-6/NEWS"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=d85508d21cbbcd63d568a7862af5ecd63b978d7d5799cbe404c91d2389d0ec5f
+checksum=ff263af609a50eb76056653592d929459aef4819a444c436f6d52c6f63c1faec
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11"

From 830ca9c569302d06214fc1fa117500063b2b25da Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 26 Mar 2022 20:51:35 -0400
Subject: [PATCH 0814/2561] network-manager-applet: update to 1.26.0.

---
 .../patches/meson-0.61.patch                  | 33 -------------------
 srcpkgs/network-manager-applet/template       |  4 +--
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch

diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
deleted file mode 100644
index 1060e15b364a..000000000000
--- a/srcpkgs/network-manager-applet/patches/meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 21 Jan 2022 22:34:09 +0100
-Subject: [PATCH] meson.build: address meson 0.61 failures
-
-https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
----
- meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 33adb632..6178c0eb 100644
---- a/meson.build
-+++ b/meson.build
-@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
- 
- foreach desktop: desktop_files
-   i18n.merge_file(
--    desktop + '-desktop',
-     input: desktop + '.desktop.in',
-     output: desktop + '.desktop',
-     install: true,
-@@ -275,7 +274,6 @@ endforeach
- appdata = 'nm-connection-editor.appdata.xml'
- 
- i18n.merge_file(
--  'desktop',
-   input: appdata + '.in',
-   output: appdata,
-   install: true,
--- 
-GitLab
-
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 958d5b228960..8a8915bef3ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,6 +1,6 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.24.0
+version=1.26.0
 revision=1
 build_style=meson
 configure_args="-Dselinux=false"
@@ -16,5 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58
+checksum=69611b29064adbd57395fe3e51a9ebde1ea794615f776900453a2bbe3d8cddfd
 lib32disabled=yes

From dd73edde66c6a2bc69bcf1c036fad6ef98c88569 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 1 Apr 2022 01:31:30 +0200
Subject: [PATCH 0815/2561] glib-networking: update to 2.72.0.

---
 srcpkgs/glib-networking/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 5adca78241c4..fc1cbf840354 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.70.1
+version=2.72.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,11 +13,8 @@ short_desc="Network-related giomodules for glib"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-72/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
+checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
 lib32disabled=yes
-make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/lib/systemd
-}

From 71610584c77f07c6c3f31d487dfbd698509c6d75 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Apr 2022 03:14:51 +0200
Subject: [PATCH 0816/2561] helix: broken on ppc32

---
 srcpkgs/helix/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index 961a894092b7..17a819728ef2 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -20,6 +20,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) ;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="no AtomicU64 in sync::atomic";;
+esac
+
 post_install() {
 	rm runtime/grammars/.gitkeep
 	rm runtime/themes/README.md

From 10c0dfc40fd7dd9791162d302d91c37fb9474522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:41:50 -0300
Subject: [PATCH 0817/2561] giac: update to 1.7.0.53.

---
 srcpkgs/giac/patches/micropy.patch | 18 ++++++++++++++++++
 srcpkgs/giac/template              |  5 +++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/giac/patches/micropy.patch

diff --git a/srcpkgs/giac/patches/micropy.patch b/srcpkgs/giac/patches/micropy.patch
new file mode 100644
index 000000000000..0e417a5a8ecb
--- /dev/null
+++ b/srcpkgs/giac/patches/micropy.patch
@@ -0,0 +1,18 @@
+--- a/src/icas.cc	2021-03-02 04:52:40.000000000 -0300
++++ b/src/icas.cc	2022-03-30 10:00:39.154056068 -0300
+@@ -1810,6 +1810,7 @@
+     cerr << "// Setting tex log" << '\n';
+     show_tex=true;
+   }
++#ifdef HAVE_LIBMICROPYTHON
+   if (getenv("GIAC_MICROPY")){
+     cerr << "Micropython mode\n";
+     python_compat(4 | python_compat(contextptr),contextptr);
+@@ -1821,6 +1822,7 @@
+       return 0;
+     }
+   }
++#endif
+ #ifdef HAVE_LIBREADLINE
+   if (ARGC==1){
+     int taillemax=1000;
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 2c192c2b858f..fbdadc31dde7 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,6 +1,6 @@
 # Template file for 'giac'
 pkgname=giac
-version=1.7.0.45
+version=1.7.0.53
 revision=1
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
@@ -12,8 +12,9 @@ short_desc="Free computer algebra system"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
+changelog="https://www-fourier.ujf-grenoble.fr/~parisse/install_en#new"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
-checksum=028b9e323d81a261a243c0768d5e12f3d76371eff05fd24cf2eb177b445f1da6
+checksum=74e5f98f63147c0197e4ce309601ae745312761be61c1a99c8a6bab4862e4a9f
 
 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"

From c3ca8565fe219c00589d971e2765bc45fbbb3361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:41:28 -0300
Subject: [PATCH 0818/2561] gp2c: update to 0.0.12pl1.

---
 srcpkgs/gp2c/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gp2c/template b/srcpkgs/gp2c/template
index da996ed0972d..f82cf95c2d90 100644
--- a/srcpkgs/gp2c/template
+++ b/srcpkgs/gp2c/template
@@ -1,6 +1,6 @@
 # Template file for 'gp2c'
 pkgname=gp2c
-version=0.0.12
+version=0.0.12pl1
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl"
@@ -10,5 +10,6 @@ short_desc="PARI/GP Computer Algebra System - gp2c compiler"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="http://pari.math.u-bordeaux.fr/"
+changelog="http://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=gp2c.git;a=blob_plain;f=ChangeLog;hb=HEAD"
 distfiles="${homepage}pub/pari/GP2C/${pkgname}-${version}.tar.gz"
-checksum=ee9ff63979670408d8c293902ce7ff6a825145f0e7e7c6323764733ef1b9310d
+checksum=79a8c46f7ad3331e4d8ae6af6b496c4742fd73a73b996b3ca7ead61452ca6e8d

From ebcd9ef66e0476c2762ae1eac978f868cba6c48f Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Thu, 31 Mar 2022 17:12:18 -0500
Subject: [PATCH 0819/2561] Signal-Desktop: update to 5.37.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 55591ea4c82f..a0b15428b926 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.36.0
+version=5.37.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=de158a8f4b19e3f8b849abf07fbb3d1b2207a3a08fde31aac328635e66a8a956
+checksum=bd674ea6ba0582862f26a8fed1557d21f68161ef05891e67ca4cb653bf0f8d1a
 nostrip_files="signal-desktop"
 
 post_extract() {

From ce927664c5959b7581c52b4e4d730bb6cfb5ecdb Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 31 Mar 2022 16:39:31 -0700
Subject: [PATCH 0820/2561] vte3: update to 0.68.0

---
 srcpkgs/vte3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index f88f797740b9..d75cd4edef2f 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.66.2
+version=0.68.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=e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976
+checksum=13e7d4789ca216a33780030d246c9b13ddbfd04094c6316eea7ff92284dd1749
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From 38171d59cbbbe85455c675163c653ca92c3ac590 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 13:40:10 -0500
Subject: [PATCH 0821/2561] podman: update to 4.0.3.

---
 srcpkgs/podman/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 95e0531abad8..a12ca2c32440 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
-version=4.0.2
-revision=3
+version=4.0.3
+revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://podman.io/"
 changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95
+checksum=e3b53fc9142d4f2dc085f17a377d92ffb8bfe7756c4f47b8128b38bcc3540cbc
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 8ebd46b4563c5064ad18338f5eab3d16d98fffcc Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 29 Mar 2022 05:26:18 -0400
Subject: [PATCH 0822/2561] onboard: fix SyntaxWarnings and disable tests

- A missing % operator was breaking a c-style format string, causing a
    SyntaxWarning to be trown twice at package install time (during
    byte-compilation).
- The tests were failing since they try to run 'killall' before executing
    onboard in xautomation(7), both not being possible in xbps-src.
---
 srcpkgs/onboard/patches/fix-brokenformat.patch | 15 +++++++++++++++
 srcpkgs/onboard/template                       |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/onboard/patches/fix-brokenformat.patch

diff --git a/srcpkgs/onboard/patches/fix-brokenformat.patch b/srcpkgs/onboard/patches/fix-brokenformat.patch
new file mode 100644
index 000000000000..e5d200208a93
--- /dev/null
+++ b/srcpkgs/onboard/patches/fix-brokenformat.patch
@@ -0,0 +1,15 @@
+Fix for https://bugs.launchpad.net/onboard/+bug/1948723
+
+
+--
+--- a/Onboard/LayoutLoaderSVG.py
++++ b/Onboard/LayoutLoaderSVG.py
+@@ -445,7 +445,7 @@
+             except KeyError as ex:
+                 (strerror) = ex
+                 raise Exceptions.LayoutFileError("Unrecognized modifier %s in" \
+-                    "definition of %s" (strerror, full_id))
++                    "definition of %s" % (strerror, full_id))
+ 
+         value = attributes.get("action")
+         if value:
diff --git a/srcpkgs/onboard/template b/srcpkgs/onboard/template
index c147bf58a65c..b138fae61897 100644
--- a/srcpkgs/onboard/template
+++ b/srcpkgs/onboard/template
@@ -1,7 +1,7 @@
 # Template file for 'onboard'
 pkgname=onboard
 version=1.4.1
-revision=9
+revision=10
 build_style=python3-module
 hostmakedepends="intltool pkg-config python3-distutils-extra"
 makedepends="dconf-devel eudev-libudev-devel gtk+3-devel hunspell-devel
@@ -14,3 +14,5 @@ license="GPL-3.0-or-later"
 homepage="https://launchpad.net/onboard"
 distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865
+# Tries to run onboard in tests, using xautomation(7)
+make_check=no

From ce907a5c949d2a005be14743a7f2bf87ca709b22 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 6 Mar 2022 15:12:54 -0500
Subject: [PATCH 0823/2561] go: update to 1.18.

Closes: #36013 [via git-merge-pr]
---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 990a575b7ae5..58f0b0fc2485 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.17.6
+version=1.18
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8
+checksum=38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6
 nostrip=yes
 noverifyrdeps=yes
 

From d24f7731917f6fbf617c7cd08d3f23cb2dc98bb9 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Wed, 30 Mar 2022 09:47:27 +0200
Subject: [PATCH 0824/2561] google-chrome: update to 100.0.4896.60

Closes: #36413 [via git-merge-pr]
---
 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 e6a568ca685d..a630fcdae463 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.84
+version=100.0.4896.60
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=96f260f798f1adb471a3a5b8e68702ef88237884e32f0e43baf15a78aed5b669
+checksum=05ba6d17d2704ffff1e1d554b40aaddabca9256b7e63ff73e99c469393de8a1f
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From ab23d76f5ce2f4917497a22a69ead7f906bfeeed Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:17:28 -0500
Subject: [PATCH 0825/2561] chronograf: update to 1.9.4.

---
 srcpkgs/chronograf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 50a08abafebb..db97744b814a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,6 +1,6 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.1
+version=1.9.4
 revision=1
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://www.influxdata.com/time-series-platform/chronograf/"
 distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz"
-checksum=df5600b2bd0b5ed0d3a3c548e5d72038b62fdda1501ad616eb1c1d82b054793a
+checksum=ff294f25a9de57140024b9953992c1a4d79ec88167ad28435645d888a0096c27
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"

From 5689e87546da0080620dd300666259799fadd314 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:23:58 -0500
Subject: [PATCH 0826/2561] libnss-cache: update to 0.20.

---
 srcpkgs/libnss-cache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnss-cache/template b/srcpkgs/libnss-cache/template
index 49b1cc767801..da8d918e3a75 100644
--- a/srcpkgs/libnss-cache/template
+++ b/srcpkgs/libnss-cache/template
@@ -1,6 +1,6 @@
 # Template file for 'libnss-cache'
 pkgname=libnss-cache
-version=0.17
+version=0.20
 revision=1
 wrksrc=$pkgname-version-$version
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="LGPL-3.0"
 homepage="https://github.com/google/libnss-cache"
 distfiles="https://github.com/google/libnss-cache/archive/version/$version.tar.gz"
-checksum=3777cbc46dc8d08144b99321d1f039718cd347d3be8ed66a8cb3722d3e6692f5
+checksum=71324b6035674028a0f39c98aedfbaed94adbcddd72dc1c4ab81308b135dd586
 
 case "$XBPS_TARGET_MACHINE" in
 	*musl)

From 7de394d922581f33b2b41712909da1f3747f613c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:35:20 -0500
Subject: [PATCH 0827/2561] libpam-policycache: update to 0.11.

---
 srcpkgs/libpam-policycache/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpam-policycache/template b/srcpkgs/libpam-policycache/template
index d40385708fe6..6777b0856dd6 100644
--- a/srcpkgs/libpam-policycache/template
+++ b/srcpkgs/libpam-policycache/template
@@ -1,7 +1,7 @@
 # Template file for 'libpam-policycache'
 pkgname=libpam-policycache
-version=0.10
-revision=2
+version=0.11
+revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="glib-devel libscrypt-devel pam-devel"
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/libpam-policycache"
 distfiles="https://github.com/google/libpam-policycache/archive/v$version.tar.gz"
-checksum=7a8210d4a64980af11ff770578e724f2eae2aca56b4cc5977902290468f5aaf0
+checksum=d1a074493d3a4076094a79093ec02c8fdd886069b9624d8b6765f7a1e840fae6
 CFLAGS="-Wno-error=deprecated-declarations"
 
 make_dirs="/etc/libpam-policycache.d 0755 root root

From e2c808123078519fceb98b420f8c31dcd5348e12 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:45:34 -0500
Subject: [PATCH 0828/2561] yarn-bin: update to 1.22.18.

---
 srcpkgs/yarn-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yarn-bin/template b/srcpkgs/yarn-bin/template
index 111cdd494574..01ce68263ade 100644
--- a/srcpkgs/yarn-bin/template
+++ b/srcpkgs/yarn-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'yarn-bin'
 pkgname=yarn-bin
-version=1.22.10
+version=1.22.18
 revision=1
 depends="virtual?nodejs-runtime"
 short_desc="Fast, reliable, and secure dependency management - precompiled binaries"
@@ -8,7 +8,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"
-checksum=7e433d4a77e2c79e6a7ae4866782608a8e8bcad3ec6783580577c59538381a6e
+checksum=816e5c073b3d35936a398d1fe769ebbcd517298e3510b649e8fc67cd3a62e113
 conflicts="yarn>=0"
 
 do_extract() {

From aaf18708d60b47f3ac57a2821aa8571d41ec970c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:51:16 -0500
Subject: [PATCH 0829/2561] yarn: update to 1.22.18.

---
 srcpkgs/yarn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yarn/template b/srcpkgs/yarn/template
index aa9f68e53c4c..834d72024cc7 100644
--- a/srcpkgs/yarn/template
+++ b/srcpkgs/yarn/template
@@ -1,6 +1,6 @@
 # Template file for 'yarn'
 pkgname=yarn
-version=1.22.10
+version=1.22.18
 revision=1
 hostmakedepends="yarn-bin nodejs tar"
 depends="virtual?nodejs-runtime"
@@ -9,7 +9,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/${pkgname}/archive/v${version}.tar.gz"
-checksum=66153f5fdd3078ce320c775990e4b4f03d5b596186f0e1fbceb34225abe3cd3e
+checksum=accb0911b05329220a6fe7fd14d091add3b62535811ea97503e8579ae5812c2e
 
 conflicts="yarn-bin>=0"
 

From c1355a72f324ff2d46e66317a46dad17d64f5b43 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:58:48 -0500
Subject: [PATCH 0830/2561] .github/workflows: clean up cycle check

---
 .github/workflows/{cron.yml => cycles.yml} | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
 rename .github/workflows/{cron.yml => cycles.yml} (84%)

diff --git a/.github/workflows/cron.yml b/.github/workflows/cycles.yml
similarity index 84%
rename from .github/workflows/cron.yml
rename to .github/workflows/cycles.yml
index 1b53808a7588..e75297ac937d 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cycles.yml
@@ -1,18 +1,10 @@
-name: 'Scheduled tasks'
+name: 'Cycle Check'
 
 on:
   schedule:
     - cron: '0 18 * * *'
 
 jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v2
-        with:
-          github-token: ${{ github.token }}
-          pr-lock-inactive-days: '90'
-          process-only: 'prs'
   cycles:
     runs-on: ubuntu-latest
     container:

From 0764d7d82d42bb857789491582ec4a8e182ebd44 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 11:44:15 +0100
Subject: [PATCH 0831/2561] kodi-addon-pvr-zattoo: update to 19.7.11.

---
 srcpkgs/kodi-addon-pvr-zattoo/template | 7 +++----
 srcpkgs/kodi-addon-pvr-zattoo/update   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index 79ebdc6c30a5..e532a1bfdbe5 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-pvr-zattoo'
 pkgname=kodi-addon-pvr-zattoo
-version=19.7.8.1
-revision=3
+version=19.7.11
+revision=1
 _kodi_release=Matrix
 wrksrc="pvr.zattoo-${version}-${_kodi_release}"
 build_style=cmake
@@ -14,8 +14,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://github.com/rbuehlma/pvr.zattoo"
 distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz"
-checksum=25dc4ea72b5315a65286ba606e6e26d281fb8eb830d5e0164b66b8d7ae90319a
-make_check=no # No target to "make test"
+checksum=07d96b1b0c3b464c0bf02279fa8cab9ccdf675344129f3a970b14bafce225fb4
 
 if [ -n "${CROSS_BUILD}" ]; then
 	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/update b/srcpkgs/kodi-addon-pvr-zattoo/update
index 86efd6c4989a..b7c348dae80a 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/update
+++ b/srcpkgs/kodi-addon-pvr-zattoo/update
@@ -1,2 +1,2 @@
-ignore="19.* 512"
+ignore="20* 512"
 pattern='\K[\d\.]+(?=-[A-Z][a-z])'

From 0ddab417bbdfb402f38e1fa88c21cd1f05de3f0c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 20:14:50 +0200
Subject: [PATCH 0832/2561] emacs-gtk2: remove package

---
 srcpkgs/emacs-gtk2                |  1 -
 srcpkgs/emacs/template            | 20 +-------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/emacs-gtk2

diff --git a/srcpkgs/emacs-gtk2 b/srcpkgs/emacs-gtk2
deleted file mode 120000
index a7642dd168d6..000000000000
--- a/srcpkgs/emacs-gtk2
+++ /dev/null
@@ -1 +0,0 @@
-emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 1cd4d18bd6aa..9c4405ffc88e 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -9,7 +9,7 @@ configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)
  $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)"
 hostmakedepends="pkg-config tar"
-makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel
+makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
  dbus-devel acl-devel
  $(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel)
  $(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel)
@@ -41,7 +41,6 @@ pre_configure() {
 	mkdir -p nox
 	mv * nox || true
 	cp -a nox x11
-	cp -a nox gtk2
 	cp -a nox gtk3
 }
 
@@ -54,9 +53,6 @@ do_configure() {
 		$(vopt_with dbus) --without-gconf --without-gsettings \
 		${configure_args}
 
-	cd $wrksrc/gtk2
-	./configure --with-x-toolkit=gtk2 ${configure_args}
-
 	cd $wrksrc/gtk3
 	./configure --with-x-toolkit=gtk3 --with-xwidgets ${configure_args}
 }
@@ -64,7 +60,6 @@ do_configure() {
 do_build() {
 	make ${makejobs} -C nox
 	make ${makejobs} -C x11
-	make ${makejobs} -C gtk2
 	make ${makejobs} -C gtk3
 }
 
@@ -101,19 +96,6 @@ emacs-x11_package() {
 	}
 }
 
-emacs-gtk2_package() {
-	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
-	provides="emacs-${version}_${revision}"
-	replaces="emacs>=0"
-	short_desc+=" - GTK+2 version"
-	pkg_install() {
-		make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk2 install
-		rm -f ${PKGDESTDIR}/usr/bin/ctags
-		rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info}
-		rm -rf ${PKGDESTDIR}/usr/lib
-	}
-}
-
 emacs-gtk3_package() {
 	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
 	provides="emacs-${version}_${revision}"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df264c9d7501..d5a5e66b8b1a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -68,6 +68,7 @@ replaces="
  eclipse-ecj<=4.9_3
  electron7<=7.3.3_1
  electron9<=9.4.1_1
+ emacs-gtk2<=27.2_1
  enventor<=1.0.0_2
  epstopdf<=2.27_3
  flickcurl-devel<=1.26_4

From e93be9a166b32715117dca75e17ecb8e833e2ada Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 12:11:22 +0200
Subject: [PATCH 0833/2561] glib: bump shlibs

---
 common/shlibs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ccc55a1b3772..9f5333c203da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -84,11 +84,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.70.0_1
-libglib-2.0.so.0 glib-2.70.0_1
-libgmodule-2.0.so.0 glib-2.70.0_1
-libgio-2.0.so.0 glib-2.70.0_1
-libgobject-2.0.so.0 glib-2.70.0_1
+libgthread-2.0.so.0 glib-2.72.0_1
+libglib-2.0.so.0 glib-2.72.0_1
+libgmodule-2.0.so.0 glib-2.72.0_1
+libgio-2.0.so.0 glib-2.72.0_1
+libgobject-2.0.so.0 glib-2.72.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

From ba97e4a7bce062528304558e727b1de6f0400f1d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 12:12:16 +0200
Subject: [PATCH 0834/2561] vte3: bump shlibs

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 9f5333c203da..7079375524fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -821,7 +821,7 @@ libvpx.so.6 libvpx6-1.8.0_1
 libXevie.so.1 libXevie-1.0.2_1
 libatspi.so.0 at-spi2-core-1.91.91_1
 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
-libvte-2.91.so.0 vte3-0.52.2_1
+libvte-2.91.so.0 vte3-0.68.0_1
 libpipeline.so.1 libpipeline-1.2.0_1
 libosp.so.5 opensp-1.5.2_1
 libogrove.so.0 openjade-1.3.2_1

From fcf4205b6b32639fd12df267728a3f61b08ed5a8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 31 Mar 2022 20:36:55 -0400
Subject: [PATCH 0835/2561] hex: change binary name to avoid conflict

---
 srcpkgs/helix/template | 3 +--
 srcpkgs/hex/template   | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index 17a819728ef2..b454cc8fa87c 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -1,7 +1,7 @@
 # Template file for 'helix'
 pkgname=helix
 version=22.03
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path helix-term"
 hostmakedepends="git"
@@ -12,7 +12,6 @@ homepage="https://helix-editor.com/"
 changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md"
 distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz"
 checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4
-conflicts="hex>=0"
 
 # skip problematic doctests on i686
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/hex/template b/srcpkgs/hex/template
index 6295e03ddffe..07bf3c269d26 100644
--- a/srcpkgs/hex/template
+++ b/srcpkgs/hex/template
@@ -1,7 +1,7 @@
 # Template file for 'hex'
 pkgname=hex
 version=0.4.2
-revision=1
+revision=2
 build_style=cargo
 short_desc="Futuristic take on hexdump"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -11,5 +11,7 @@ distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=a7cc1ece337fc19e77fbbbca145001bc5d447bde4118eb6de2c99407eb1a3b74
 
 post_install() {
+	# avoid conflict with helix
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/bin/hex
 	vlicense LICENSE
 }

From 1196b8f205bcac14c9984709b4c22e70673c6d96 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 10:17:21 +0100
Subject: [PATCH 0836/2561] radicale: update to 3.1.5.

- remove conf file entry, because it changes filerights after updates
---
 srcpkgs/radicale/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 8d81e3b61304..65eb085022c0 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,6 +1,6 @@
 # Template file for 'radicale'
 pkgname=radicale
-version=3.1.4
+version=3.1.5
 revision=1
 wrksrc="Radicale-${version}"
 build_style=python3-module
@@ -14,11 +14,10 @@ license="GPL-3.0-or-later"
 homepage="https://radicale.org"
 changelog="https://github.com/Kozea/Radicale/blob/master/CHANGELOG.md"
 distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.gz"
-checksum=7658db3bb78ddb5934b573a875d1ef3ca6cfe932a4a15dc0c781126bea7f41c1
+checksum=1d631d0c0efd049c05fb32876d8e4f5662df4fa91f8aa6f52a994608d9a3e12d
 conf_files="
  /etc/radicale/config
  /etc/radicale/rights
- /etc/radicale/users
  /etc/sv/radicale/log/run"
 make_dirs="
  /etc/radicale 755 root root
@@ -33,7 +32,6 @@ replaces="radicale2<3.0.6"
 post_install() {
 	vinstall config 644 etc/radicale/
 	vinstall rights 640 etc/radicale/
-	vinstall /dev/null 640 etc/radicale users
 	vinstall config 644 usr/share/examples/radicale
 	vinstall radicale.wsgi 644 usr/share/radicale
 	vsv radicale

From cc1084958289361c50e8ec7aa9e19094d16fce22 Mon Sep 17 00:00:00 2001
From: Wesley Chan <wesley.chan@posteo.org>
Date: Tue, 19 Oct 2021 16:03:13 +0800
Subject: [PATCH 0837/2561] New package: acme.sh-3.0.2

---
 srcpkgs/acme.sh/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/acme.sh/template

diff --git a/srcpkgs/acme.sh/template b/srcpkgs/acme.sh/template
new file mode 100644
index 000000000000..92092c41e3b5
--- /dev/null
+++ b/srcpkgs/acme.sh/template
@@ -0,0 +1,24 @@
+# Template file for 'acme.sh'
+pkgname=acme.sh
+version=3.0.2
+revision=1
+short_desc="Pure Unix shell script implementing ACME client protocol"
+maintainer="Wesley Chan <wesley.chan@posteo.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/acmesh-official/acme.sh"
+distfiles="https://github.com/acmesh-official/acme.sh/archive/refs/tags/${version}.tar.gz"
+checksum=d6cda672697fe02cfa2a61bf74ec1b472aa797b03baead6deec625158965cee0
+
+do_install() {
+	vmkdir usr/share/acme.sh/deploy
+	vmkdir usr/share/acme.sh/dnsapi
+	vmkdir usr/share/acme.sh/notify
+	vmkdir usr/bin
+
+	vinstall acme.sh 755 usr/share/acme.sh/
+	vcopy deploy/*.sh usr/share/acme.sh/deploy/
+	vcopy dnsapi/*.sh usr/share/acme.sh/dnsapi/
+	vcopy notify/*.sh usr/share/acme.sh/notify/
+
+	ln -sf /usr/share/acme.sh/acme.sh ${DESTDIR}/usr/bin/acme.sh
+}

From 55d49169d350cd4b82e8afa5cac828c36ab1dddf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 29 Mar 2022 23:12:55 +0200
Subject: [PATCH 0838/2561] gawk: fix tests

---
 srcpkgs/gawk/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template
index 0a79c2ca2c5e..b922097b01f7 100644
--- a/srcpkgs/gawk/template
+++ b/srcpkgs/gawk/template
@@ -21,6 +21,11 @@ alternatives="
 pre_check() {
 	vsed -i 's/done | more/done/g' test/Makefile
 
+	# This fixes tests on glibc, relevant tests on musl are disabled
+	# because the locale command doesn't exist.
+	vsed -i 's/en_US.ISO-8859-1//' test/localenl.sh
+	vsed -i '/^LC_ALL=en_US.ISO-8859-1 passed$/d' test/localenl.ok
+
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
 			vsed -i '/testext/d' test/Makefile

From 7205956db755d31dfd4b6403b86f0570f19a02fc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:16:03 +0200
Subject: [PATCH 0839/2561] snixembed: fix checksum

---
 srcpkgs/snixembed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/snixembed/template b/srcpkgs/snixembed/template
index bc8c37948a8d..aa6dedb561e6 100644
--- a/srcpkgs/snixembed/template
+++ b/srcpkgs/snixembed/template
@@ -11,7 +11,7 @@ maintainer="projectmoon <projectmoon@agnos.is>"
 license="ISC"
 homepage="https://git.sr.ht/~steef/snixembed"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=7f49fcd891ffa58be8b7e387a73cfd5b98a354aad3af1c76d9960a07cd92340e
+checksum=1e735384a3edd80dcdc8a6d2cac39c1f7fd48543ab9488820e72851e62b0880b
 
 post_install() {
 	vlicense LICENSE

From 484fbbfcaba5dfaf451c69e4f509ad2cadfcf5b2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 2 Apr 2022 18:15:57 +0300
Subject: [PATCH 0840/2561] mousepad: update to 0.5.9.

---
 srcpkgs/mousepad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 1a85167aeb8e..a471702954e6 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,6 +1,6 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.8
+version=0.5.9
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=921ebbcfdfd5e2e56f31a5177a2d26f46c758cc972595017bca9e0a6a3c3a721
+checksum=f108a8c167ec5727266ab67666f10dbd60e972d56ea03944302fdabb2167f473

From c6195aa0fbba1b2af872b5441e92c42b34d573f7 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 30 Mar 2022 02:05:43 -0400
Subject: [PATCH 0841/2561] Manual.md: document the check functions

The pre_/do_/post_check functions were not listed in the list of building
phase functions, and were not mentioned elsewhere (do_check was mentioned
once). This documents their existence.
---
 Manual.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Manual.md b/Manual.md
index af5f698debae..8ec755499bbe 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1101,7 +1101,13 @@ still be passed in if it's a GNU configure script.
 
 - `post_build()` Actions to execute after `do_build()`.
 
-- `pre_install()` Actions to execute after `post_build()`.
+- `pre_check()` Actions to execute after `post_build()`.
+
+- `do_check()` Actions to execute to run checks for the package.
+
+- `post_check()` Actions to execute after `do_check()`.
+
+- `pre_install()` Actions to execute after `post_check()`.
 
 - `do_install()` Actions to execute to install the package files into the `fake destdir`.
 

From 9a69e20a0891e1a8bbdb0030a99b7f4db88973ca Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 2 Apr 2022 18:12:35 +0300
Subject: [PATCH 0842/2561] eclipse: update to 4.23.

---
 srcpkgs/eclipse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index cb4c8cfff427..d365b6ff06e5 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,9 +1,9 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.22
+version=4.23
 revision=1
 #code name of version
-_release=2021-12
+_release=2022-03
 archs="x86_64"
 wrksrc="eclipse"
 depends="openjdk11 gtk+3 webkit2gtk libXtst
@@ -19,7 +19,7 @@ _patch=R
 _edition=java
 _mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
 distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
-checksum=6d70a896ad70ef79f527447e5b0d1b373ca00179653ab2361aa9550d0a87068d
+checksum=2905e74afac8ecbaaf2563d4c14a1a28100a7a03cb4b73b540df3607ee5bfa6f
 python_version=2
 
 do_install() {

From 682479b94c51a433d029594367badadc13d1de73 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:12:13 +0200
Subject: [PATCH 0843/2561] gupnp-dlna: add missing build dependency

---
 srcpkgs/gupnp-dlna/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template
index 6286c09fb117..d88090126ee3 100644
--- a/srcpkgs/gupnp-dlna/template
+++ b/srcpkgs/gupnp-dlna/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)"
 hostmakedepends="automake libtool pkg-config $(vopt_if vala vala)"
-makedepends="gst-plugins-base1-devel $(vopt_if vala vala)"
+makedepends="gst-plugins-base1-devel libxml2-devel $(vopt_if vala vala)"
 short_desc="GUPnP DLNA"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From a41dd6d3ca97ba51c65caa05c8459d73f7b88d87 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 13 Feb 2022 23:08:59 -0500
Subject: [PATCH 0844/2561] New Package: python3-jq-1.2.2

---
 srcpkgs/python3-jq/patches/jq-py-setup.patch | 143 +++++++++++++++++++
 srcpkgs/python3-jq/template                  |  23 +++
 2 files changed, 166 insertions(+)
 create mode 100644 srcpkgs/python3-jq/patches/jq-py-setup.patch
 create mode 100644 srcpkgs/python3-jq/template

diff --git a/srcpkgs/python3-jq/patches/jq-py-setup.patch b/srcpkgs/python3-jq/patches/jq-py-setup.patch
new file mode 100644
index 000000000000..1eb4f28e7aa9
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/jq-py-setup.patch
@@ -0,0 +1,143 @@
+From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
+From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
+Date: Fri, 7 May 2021 19:14:20 -0400
+Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
+
+---
+ setup.py | 98 +-------------------------------------------------------
+ 1 file changed, 1 insertion(+), 97 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 663792c..3ebcabe 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,113 +1,19 @@
+ #!/usr/bin/env python
+ 
+ import os
+-import subprocess
+-import tarfile
+-import shutil
+-import sysconfig
+ 
+-import requests
+ from setuptools import setup
+-from setuptools.command.build_ext import build_ext
+ from setuptools.extension import Extension
+ 
+ 
+-def urlretrieve(source_url, destination_path):
+-    response = requests.get(source_url, stream=True)
+-    if response.status_code != 200:
+-        raise Exception("status code was: {}".format(response.status_code))
+-
+-    with open(destination_path, "wb") as fileobj:
+-        for chunk in response.iter_content(chunk_size=128):
+-            fileobj.write(chunk)
+-
+-def path_in_dir(relative_path):
+-    return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path))
+-
+-def dependency_path(relative_path):
+-    return os.path.join(path_in_dir("_deps"), relative_path)
+-
+ def read(fname):
+     return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ 
+ 
+-jq_lib_tarball_path = dependency_path("jq-lib-1.6.tar.gz")
+-jq_lib_dir = dependency_path("jq-1.6")
+-
+-oniguruma_version = "6.9.4"
+-oniguruma_lib_tarball_path = dependency_path("onig-{}.tar.gz".format(oniguruma_version))
+-oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version))
+-oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version))
+-
+-class jq_build_ext(build_ext):
+-    def run(self):
+-        if not os.path.exists(dependency_path(".")):
+-            os.makedirs(dependency_path("."))
+-        self._build_oniguruma()
+-        self._build_libjq()
+-        build_ext.run(self)
+-
+-    def _build_oniguruma(self):
+-        self._build_lib(
+-            source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version),
+-            tarball_path=oniguruma_lib_tarball_path,
+-            lib_dir=oniguruma_lib_build_dir,
+-            commands=[
+-                ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir],
+-                ["make"],
+-                ["make", "install"],
+-            ])
+-
+-
+-    def _build_libjq(self):
+-        self._build_lib(
+-            source_url="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz",
+-            tarball_path=jq_lib_tarball_path,
+-            lib_dir=jq_lib_dir,
+-            commands=[
+-                ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
+-                ["make"],
+-            ])
+-
+-    def _build_lib(self, source_url, tarball_path, lib_dir, commands):
+-        self._download_tarball(
+-            source_url=source_url,
+-            tarball_path=tarball_path,
+-            lib_dir=lib_dir,
+-        )
+-
+-        macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
+-        if macosx_deployment_target:
+-            os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
+-
+-        def run_command(args):
+-            print("Executing: %s" % ' '.join(args))
+-            subprocess.check_call(args, cwd=lib_dir)
+-
+-        for command in commands:
+-            run_command(command)
+-
+-    def _download_tarball(self, source_url, tarball_path, lib_dir):
+-        if os.path.exists(tarball_path):
+-            os.unlink(tarball_path)
+-        print("Downloading {}".format(source_url))
+-        urlretrieve(source_url, tarball_path)
+-        print("Downloaded {}".format(source_url))
+-
+-        if os.path.exists(lib_dir):
+-            shutil.rmtree(lib_dir)
+-        tarfile.open(tarball_path, "r:gz").extractall(dependency_path("."))
+-
+-
+ jq_extension = Extension(
+     "jq",
+     sources=["jq.c"],
+-    include_dirs=[os.path.join(jq_lib_dir, "src")],
+-    extra_link_args=["-lm"],
+-    extra_objects=[
+-        os.path.join(jq_lib_dir, ".libs/libjq.a"),
+-        os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
+-    ],
++    libraries=["jq"]
+ )
+ 
+ setup(
+@@ -120,7 +26,6 @@ setup(
+     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+     license='BSD 2-Clause',
+     ext_modules = [jq_extension],
+-    cmdclass={"build_ext": jq_build_ext},
+     classifiers=[
+         'Development Status :: 5 - Production/Stable',
+         'Intended Audience :: Developers',
+@@ -137,4 +42,3 @@ setup(
+         'Programming Language :: Python :: 3.9',
+     ],
+ )
+-
+-- 
+2.29.3
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
new file mode 100644
index 000000000000..52702247c217
--- /dev/null
+++ b/srcpkgs/python3-jq/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-jq'
+pkgname=python3-jq
+version=1.2.2
+revision=1
+wrksrc="${pkgname#*-}.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel jq-devel"
+depends="python3"
+short_desc="Python bindings for jq"
+maintainer="RunningDroid <runningdroid@zoho.com>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/jq/"
+distfiles="https://github.com/mwilliamson/jq.py/archive/${version}.tar.gz"
+checksum=0b926078855b6daee6e8ae5366ebf11c06911195abae643a7cdd37fce087fa0e
+
+pre_build() {
+	cython jq.pyx
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 6fd23298459d697a8b04c3a3599fd788c5904621 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 27 Mar 2022 00:46:22 -0400
Subject: [PATCH 0845/2561] python3-minidb: update to 2.0.6.

And remove pycompile_module so xlint passes
---
 srcpkgs/python3-minidb/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-minidb/template b/srcpkgs/python3-minidb/template
index 7c63ae3ef621..f901265dbc39 100644
--- a/srcpkgs/python3-minidb/template
+++ b/srcpkgs/python3-minidb/template
@@ -1,10 +1,9 @@
 # Template file for 'python3-minidb'
 pkgname=python3-minidb
-version=2.0.2
-revision=5
+version=2.0.6
+revision=1
 wrksrc="minidb-${version}"
 build_style=python3-module
-pycompile_module="minidb.py"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Simple SQLite3 store for Python objects"
@@ -12,7 +11,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="ISC"
 homepage="https://thp.io/2010/minidb/"
 distfiles="https://github.com/thp/minidb/archive/${version}.tar.gz"
-checksum=40a1992281dbfb63a90616db328c1babc3aabadd8844fdd676369e8df09d3b9f
+checksum=7e4ef07d858d6e6118dfd000031e7698fb29b44bd8fe38e713d241fcaec6ee1e
 
 post_install() {
 	sed -n '/# Copyright/,/OF THIS SOFTWARE./p' minidb.py > COPYING

From 02cc445b84139aed7820a690dd9eb66dfe626356 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 13 Feb 2022 23:09:28 -0500
Subject: [PATCH 0846/2561] urlwatch: update to 2.25.

---
 srcpkgs/urlwatch/patches/test_handler.patch | 14 ++++++++++++++
 srcpkgs/urlwatch/template                   | 10 +++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/urlwatch/patches/test_handler.patch

diff --git a/srcpkgs/urlwatch/patches/test_handler.patch b/srcpkgs/urlwatch/patches/test_handler.patch
new file mode 100644
index 000000000000..73f301e49f9f
--- /dev/null
+++ b/srcpkgs/urlwatch/patches/test_handler.patch
@@ -0,0 +1,14 @@
+Work around https://github.com/thp/urlwatch/issues/677
+
+diff --git a/lib/urlwatch/tests/test_handler.py b/lib/urlwatch/tests/test_handler.py
+index 736536a..fac9449 100644
+--- a/lib/urlwatch/tests/test_handler.py
++++ b/lib/urlwatch/tests/test_handler.py
+@@ -89,6 +89,7 @@ def test_pep8_conformance():
+ 
+ class ConfigForTest(CommandConfig):
+     def __init__(self, config, urls, cache, hooks, verbose):
++        sys.argv = sys.argv[:1]
+         (prefix, bindir) = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))
+         super().__init__('urlwatch', os.path.dirname(__file__), bindir, prefix, config, urls, hooks, cache, verbose)
+ 
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index a10260a19af1..0d15244c6acb 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,7 +1,7 @@
 # Template file for 'urlwatch'
 pkgname=urlwatch
-version=2.23
-revision=2
+version=2.25
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-appdirs python3-keyring python3-minidb python3-requests
@@ -9,18 +9,18 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests
 # Check the Docs for optional packages:
 # https://urlwatch.readthedocs.io/en/latest/dependencies.html#optional-packages
 checkdepends="python3-pytest python3-pycodestyle python3-docutils
- python3-Pygments ${depends}"
+ python3-Pygments python3-jq ${depends}"
 short_desc="Tool for monitoring webpages for updates"
 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=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842
+checksum=6802297d3318286e7f3d36b9a4567a2fb09b0ae779d4b76811dd29a7281c1f8a
 
 do_check() {
 	# skip the tests that require python modules that aren't packaged
 	# (pdftotext & pytesseract)
-	pytest -k "not (pdf or ocr or json)" -v
+	pytest -k 'not (pdf or ocr)' -v
 }
 
 post_install() {

From 4752d5b560412ab8583ebef3f30b242de3d3a77d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 2 Apr 2022 19:44:02 +0200
Subject: [PATCH 0847/2561] knot: update to 3.1.7.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index bf1f6107ab5d..a8f43d8d92ae 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.6
+version=3.1.7
 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=e9ba1305d750dc08fb08687aec7ac55737ca073deaa0b867c884e0c0f2fdb753
+checksum=ffb6887e238ce4c7df0cc76bb55a5093465275201ac12156a3390782dc49857b
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From df39001d00ad0a12246ad010b3b09eed3d68959c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 2 Apr 2022 19:44:27 +0200
Subject: [PATCH 0848/2561] poke: update to 2.3.

---
 srcpkgs/poke/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poke/template b/srcpkgs/poke/template
index b562e96c8a4c..126a3fd67bbe 100644
--- a/srcpkgs/poke/template
+++ b/srcpkgs/poke/template
@@ -1,6 +1,6 @@
 # Template file for 'poke'
 pkgname=poke
-version=2.1
+version=2.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.jemarch.net/poke.html"
 changelog="https://www.jemarch.net/poke-${version}-relnotes.html"
 distfiles="${GNU_SITE}/poke/poke-${version}.tar.gz"
-checksum=cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670
+checksum=3690cf1116da7cb3a9ec6b4f7003e253e268b510212a288fd38aafed0ebcc766
 
 poke-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From b0dade0488953eace0c75baedf0e1273c9d2d595 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 2 Apr 2022 21:38:24 +0200
Subject: [PATCH 0849/2561] obs: update to 27.2.4.

---
 srcpkgs/obs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index f8599214a122..df6ee22e52ee 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
 # Template file for 'obs'
 pkgname=obs
-version=27.2.0
+version=27.2.4
 revision=1
 archs="i686* x86_64* ppc64le* aarch64*"
 wrksrc="obs-studio-${version}"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://obsproject.com"
 changelog="https://github.com/obsproject/obs-studio/releases"
 distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=c52d99cba6c536cb805e3e0f54663c33cfc43a1b7521bec97d241019499f9789
+checksum=f7297a7421cbfe2bb4bc6bf83659bb873bc8f1186667c35c34bdbaac3f0fd5fd
 
 obs-devel_package() {
 	short_desc+=" - development files"

From 530c405fb98acee5f464fc70b2274e220f5a3fac Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 18:09:45 -0400
Subject: [PATCH 0850/2561] python3-shapely: update to 1.8.1.

---
 srcpkgs/python3-shapely/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index 8a1cf7158476..7ca8f0ddd041 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-shapely'
 pkgname=python3-shapely
-version=1.8.0
-revision=2
-wrksrc="Shapely-${version}"
+version=1.8.1
+revision=1
+wrksrc="shapely-${version}"
 build_style=python3-module
 build_helper=numpy
+make_check_target=tests
 hostmakedepends="python3-setuptools python3-Cython geos"
 makedepends="python3-devel python3-numpy geos-devel"
 depends="python3"
@@ -12,9 +13,9 @@ checkdepends="python3-pytest"
 short_desc="Library for manipulation and analysis of geometric objects for Python3"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
-homepage="https://github.com/Toblerity/Shapely"
-distfiles="https://github.com/Toblerity/Shapely/archive/${version}.tar.gz"
-checksum=492d4207b20541e3d0f31c238e07d2f55fe5e00afcfd12390bf55737901fce91
+homepage="https://github.com/shapely/shapely"
+distfiles="https://github.com/shapely/shapely/archive/${version}.tar.gz"
+checksum=daf4d5ceae7d1e4053d96af760377b843787cae0b42e6d9d19eb832204c7c8a4
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -29,7 +30,3 @@ pre_configure() {
 post_install() {
 	vlicense LICENSE.txt LICENSE
 }
-
-do_check() {
-	python3 -m pytest tests/
-}

From 1e45dbc1d7d66f86ab3cb942aaf9fa4322682abe Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 13:16:51 -0400
Subject: [PATCH 0851/2561] python3-pycollada: update to 0.7.2.

---
 srcpkgs/python3-pycollada/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pycollada/template b/srcpkgs/python3-pycollada/template
index 7aae12006353..89e7c15a05b1 100644
--- a/srcpkgs/python3-pycollada/template
+++ b/srcpkgs/python3-pycollada/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycollada'
 pkgname=python3-pycollada
-version=0.7.1
-revision=3
+version=0.7.2
+revision=1
 wrksrc="pycollada-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://pycollada.readthedocs.io/en/latest/"
 distfiles="https://github.com/pycollada/pycollada/archive/v${version}.tar.gz"
-checksum=b0b8e1fd17e3e5a7c1befcb5ec4fa0ead1318c5ca340bb930f62f9809fbce8a1
+checksum=e3c29857a65b3dd9c0375c1074195195fc3dada95d6b5c78d246b005f2e85c93
 
 post_install() {
 	vlicense COPYING

From 42bdfe86987e4a4d6b6037ba9e6a9caf7cf03e1f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 14 Dec 2021 14:45:51 -0500
Subject: [PATCH 0852/2561] python3-trimesh: update to 3.10.7.

---
 srcpkgs/python3-trimesh/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index e716da771676..e51b6eb62f9d 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.34
+version=3.10.7
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -10,14 +10,13 @@ depends="python3-numpy python3-scipy python3-networkx python3-lxml
  python3-pyglet python3-shapely python3-rtree python3-Pillow python3-svg.path
  python3-jsonschema python3-psutil python3-chardet python3-sympy python3-msgpack
  python3-pycollada python3-requests"
-# unit tests fail on x86 https://github.com/mikedh/trimesh/issues/690
 checkdepends="$depends python3-pytest"
 short_desc="Python3 library for loading and using triangular meshes"
 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=713a959be0f93c049d0735f573b814cfa704c5bbfaf0c607facb61ede5a8ab2e
+checksum=e98fd2dff632729fc6fb963653b91d9f4a5a6a9a1f79493dd885e3e4d1f9c4da
 
 post_install() {
 	vlicense LICENSE.md
@@ -29,3 +28,8 @@ do_check() {
 	vsed -i 's/coveralls//' setup.py
 	python3 -m pytest
 }
+
+# disable tests for i686
+if [ "$XBPS_WORDSIZE" -eq "32" ]; then
+	make_check=no # https://github.com/mikedh/trimesh/issues/690;
+fi

From e8936df40068222f37f53a508495d0642e190958 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 00:12:43 +0300
Subject: [PATCH 0853/2561] gopls: update to 0.8.2.

---
 srcpkgs/gopls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 434fc7fd0de8..963253e7b4ee 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.4
+version=0.8.2
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=7ce445846ffb0a33faed244206b142f9d307f326a35d09d18c6267538203bcf7
+checksum=761aa768e82a958e6f803db39215c995fe0f263df825ed1cbb9f6b2989f0cd00
 
 post_install() {
 	vlicense ../LICENSE

From 2509f911c02fd8c6eb0a5d3e3b90e2a48df9b164 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 1 Apr 2022 19:40:47 +0400
Subject: [PATCH 0854/2561] calibre: update to 5.40.0.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 9f59df3a0350..036b195ac996 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.39.0
+version=5.40.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=2fbe45ec9d4dea481772cc290e27567efdba60cd9d2fe736713d9b1eb020582e
+checksum=e0ec0e2352926f165f4b9cbe67666ea2bd181f7cb702e98487391168a099d794
 python_version=3
 lib32disabled=yes
 nocross=yes

From dcf745ab28549db4668ebbf4216da608c66e9124 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sat, 2 Apr 2022 11:09:17 -0400
Subject: [PATCH 0855/2561] python3-svg.path: update to 5.1.

---
 srcpkgs/python3-svg.path/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template
index 6abf6ff8ca83..0d92697a0a9a 100644
--- a/srcpkgs/python3-svg.path/template
+++ b/srcpkgs/python3-svg.path/template
@@ -1,17 +1,20 @@
 # Template file for 'python3-svg.path'
 pkgname=python3-svg.path
-version=4.1
-revision=3
+version=5.1
+revision=1
 wrksrc="svg.path-${version}"
 build_style=python3-module
+# disable failing test
+make_check_args="-k not(ImageTest)"
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest-cov python3-Pillow"
 short_desc="Python3 SVG path parser"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://github.com/regebro/svg.path"
 distfiles="https://github.com/regebro/svg.path/archive/${version}.tar.gz"
-checksum=8fe78a5ff8f379c78dac4a3ba623068a8a2af434dace24103a053e06525d400d
+checksum=2ea5351a5886f8c55ae8fddb2f7182dca3d5760c03abade9cb256b91e4bb9bb4
 
 post_install() {
 	vlicense LICENSE.txt

From 3b7e2c547d28cefc3612f8887a6e88eb5c76df03 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 2 Apr 2022 16:07:02 +0300
Subject: [PATCH 0856/2561] qutebrowser: update to 2.5.0.

---
 srcpkgs/qutebrowser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 5dc61ab30aa9..4368870992a4 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.4.0
+version=2.5.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=f2cd9abb14ebabf9630573b2fb8447be192877787dc4e3964e1b55f72a8592ec
+checksum=e18442a230570f25918a2e89ad4d073ace46c4f59b5fdda2e80ab3c4764451fd
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures

From d2f0e8570532a144f0125de4c5c1a54a1efe0398 Mon Sep 17 00:00:00 2001
From: Bas Ploeger <5904333+basploeger@users.noreply.github.com>
Date: Fri, 1 Apr 2022 20:59:18 +0200
Subject: [PATCH 0857/2561] html-xml-utils: update to 8.4.

---
 srcpkgs/html-xml-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/html-xml-utils/template b/srcpkgs/html-xml-utils/template
index 81fda5d90a25..8086cc668499 100644
--- a/srcpkgs/html-xml-utils/template
+++ b/srcpkgs/html-xml-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'html-xml-utils'
 pkgname=html-xml-utils
-version=8.3
+version=8.4
 revision=1
 build_style=gnu-configure
 makedepends="libidn-devel"
@@ -9,4 +9,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="W3C"
 homepage="https://www.w3.org/Tools/HTML-XML-utils/README"
 distfiles="https://www.w3.org/Tools/HTML-XML-utils/${pkgname}-${version}.tar.gz"
-checksum=a50c4d16dad660ad6792ef53bc77efa9d5729797623771a3fce52d8e23d3d08c
+checksum=41bb9b14e1f4cd6102e3f8dfb79e7146a24c09693869873165c421769a57d137

From f74de9841cf86c158d4a6a886cfa377bbe50934f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 1 Apr 2022 20:08:19 +0400
Subject: [PATCH 0858/2561] libgcrypt: update to 1.10.1.

---
 srcpkgs/libgcrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index b3285e6f8edf..52cae3478601 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -1,6 +1,6 @@
 # Template file for 'libgcrypt'
 pkgname=libgcrypt
-version=1.10.0
+version=1.10.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-static --without-capabilities"
@@ -10,7 +10,7 @@ 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=6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81
+checksum=ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_sys_symbol_underscore=no"

From 23392c167181c06254ca06e10806337202373494 Mon Sep 17 00:00:00 2001
From: Ricardo Steijn <ricardo.steijn97@gmail.com>
Date: Sat, 2 Apr 2022 19:06:32 +0200
Subject: [PATCH 0859/2561] lutris: update to 0.5.10

---
 srcpkgs/lutris/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 431fcf6c59a2..a59268c0c167 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,6 +1,6 @@
 # Template file for 'lutris'
 pkgname=lutris
-version=0.5.9.1
+version=0.5.10
 revision=1
 build_style=meson
 hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
@@ -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=c140ec6ac62b4f9eeaa7065229dfa1c4fb08194bc0fb118c831d894c43914f88
+checksum=f174fdbff15bb26c4bdf531d4e75b9e3954f858297f811cb478f46a9d183f2d0

From 7add5479816c4b50d727a3fccd96bf2daf57cd7d Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 1 Apr 2022 16:00:59 +0200
Subject: [PATCH 0860/2561] qpwgraph: update to 0.2.4.

---
 srcpkgs/qpwgraph/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qpwgraph/template b/srcpkgs/qpwgraph/template
index cb19601bbb89..5e83972a7062 100644
--- a/srcpkgs/qpwgraph/template
+++ b/srcpkgs/qpwgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'qpwgraph'
 pkgname=qpwgraph
-version=0.2.2
+version=0.2.4
 revision=1
 wrksrc="qpwgraph-v${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.freedesktop.org/rncbc/qpwgraph"
 changelog="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/ChangeLog"
 distfiles="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/archive/v${version}/qpwgraph-v${version}.tar.gz"
-checksum=622592c7fab8be3281eefee8979706ea8a063c98eb0f48a0c4c87655c3de7abf
+checksum=5e2ad77e794367e3e1e6df5214e8770135941092ffac49bbbaaf7619decb54b5

From c675105503e4fc74cffd6926bf3ad292e67a4897 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 31 Mar 2022 02:49:32 +0200
Subject: [PATCH 0861/2561] shared-mime-info: update to 2.2.

---
 .../shared-mime-info/patches/meson-0.60.patch | 100 ------------------
 srcpkgs/shared-mime-info/template             |   8 +-
 2 files changed, 4 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/shared-mime-info/patches/meson-0.60.patch

diff --git a/srcpkgs/shared-mime-info/patches/meson-0.60.patch b/srcpkgs/shared-mime-info/patches/meson-0.60.patch
deleted file mode 100644
index 2faa59925845..000000000000
--- a/srcpkgs/shared-mime-info/patches/meson-0.60.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Mon, 8 Nov 2021 18:22:47 -0500
-Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating
- translated XML
-
-gettext upstream has supported this for a very long time (since 0.19.7
-via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015),
-and itstool is (mostly) a legacy of the time before gettext had proper
-support for these sorts of use cases.
-
-This is similar to the state of intltool, which is described at
-https://wiki.gnome.org/MigratingFromIntltoolToGettext
-
-During the port from autotools to meson, the legacy use of itstool was
-faithfully translated to meson in the only way possible: by jumping
-through hoops to run ninja inside ninja in order to generate the .mo
-files for itstool, because meson's i18n module used a flawed design and
-there was no "real" target to create those files, only a .PHONY
-run_target which other rules cannot depend on.
-
-Although meson 0.60.0 added support for real targets for the built .mo
-files, this changed the rules for output filenames, breaking the script.
-
-But msgfmt does not care, and anyways comes with builtin meson functions
-for convenient use with XML files. So let's take this opportunity to
-drop legacy dependencies and use the modern, builtin tooling, which
-fixes this bug as a side effect.
-
-Fixes #170
----
- .gitlab-ci.yml               |  2 --
- README.md                    |  2 +-
- data/freedesktop_generate.sh | 12 ------------
- data/meson.build             | 16 +++++-----------
- meson.build                  |  1 -
- 5 files changed, 6 insertions(+), 27 deletions(-)
- delete mode 100755 data/freedesktop_generate.sh
-
-diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh
-deleted file mode 100755
-index 62ccffa..0000000
---- a/data/freedesktop_generate.sh
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#!/bin/sh -e
--
--src_root="$1"
--build_root="$2"
--
--ninja -C "${build_root}" shared-mime-info-gmo
--
--itstool \
--    --its "${src_root}/data/its/shared-mime-info.its" \
--    --join "${src_root}/data/freedesktop.org.xml.in" \
--    -o "${build_root}/data/freedesktop.org.xml" \
--    "${build_root}/po/"*".gmo"
-diff --git a/data/meson.build b/data/meson.build
-index 24361c9..09ed7a9 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,18 +1,12 @@
- 
- install_man('update-mime-database.1')
- 
--freedesktop_org_xml = custom_target('freedesktop.org.xml',
--    input : files(
--        'freedesktop.org.xml.in',
--        'its/shared-mime-info.its',
--        'its/shared-mime-info.loc',
--    ),
-+freedesktop_org_xml = i18n.merge_file(
-+    input: 'freedesktop.org.xml.in',
-     output: 'freedesktop.org.xml',
--    command: [
--        find_program('freedesktop_generate.sh'),
--        meson.source_root(),
--        meson.build_root()
--    ],
-+    data_dirs: '.',
-+    po_dir: '../po',
-+    type: 'xml',
-     install: true,
-     install_dir: get_option('datadir') / 'mime' / 'packages',
- )
-diff --git a/meson.build b/meson.build
-index 0d08c8a..60f17ae 100644
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ config.set_quoted('VERSION', meson.project_version())
- ###############################################################################
- # Find tools
- 
--itstool = find_program('itstool')
- xmllint = find_program('xmllint')
- xmlto   = find_program('xmlto', required: false)
- 
--- 
-GitLab
-
diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template
index f5afb2dd54c9..0fd71959fff0 100644
--- a/srcpkgs/shared-mime-info/template
+++ b/srcpkgs/shared-mime-info/template
@@ -1,7 +1,7 @@
 # Template file for 'shared-mime-info'
 pkgname=shared-mime-info
-version=2.1
-revision=2
+version=2.2
+revision=1
 build_style=meson
 configure_args="-Dupdate-mimedb=false"
 hostmakedepends="pkg-config gettext xmlto"
@@ -11,5 +11,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://freedesktop.org/Software/shared-mime-info"
 changelog="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-${version}.tar.xz"
-checksum=b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563
+distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${version}/shared-mime-info-${version}.tar.gz"
+checksum=bcf5d552318136cf7b3ae259975f414fbcdc9ebce000c87cf1f0901ff14e619f

From 06393c7ba7219ccbd6f43477930ca9f3cfd76a18 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Mar 2022 19:28:16 +0200
Subject: [PATCH 0862/2561] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 -------------
 srcpkgs/chatterino2/patches/cmake.patch       | 36 ++++++++
 srcpkgs/chatterino2/template                  | 84 ++++++++++---------
 4 files changed, 92 insertions(+), 99 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch
 create mode 100644 srcpkgs/chatterino2/patches/cmake.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..9f41d03190b7
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- a/chatterino2/resources/com.chatterino.chatterino.desktop
++++ b/chatterino2/resources/com.chatterino.chatterino.desktop
+@@ -4,7 +4,7 @@ Version=1.0
+ Name=Chatterino
+ Comment=Chat client for Twitch
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
new file mode 100644
index 000000000000..a59d0a4eb9f0
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -0,0 +1,36 @@
+diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
+index 82905436..b0b89a4e 100644
+--- a/chatterino2/cmake/FindLRUCache.cmake
++++ b/chatterino2/cmake/FindLRUCache.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache)
++find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
+index 4671874c..119284c2 100644
+--- a/chatterino2/cmake/FindPajladaSerialize.cmake
++++ b/chatterino2/cmake/FindPajladaSerialize.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include)
++find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
+index f4c964ec..75efba20 100644
+--- a/chatterino2/cmake/FindPajladaSignals.cmake
++++ b/chatterino2/cmake/FindPajladaSignals.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include)
++find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR)
+ 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..e1f99ac9e9fc 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,57 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+create_wrksrc=yes
+build_wrksrc="chatterino2"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
+	LIBS="-latomic"
 fi
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	mv "chatterino2-${version}" "${build_wrksrc}"
+	rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \
+	      ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \
+	      ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \
+	      ${build_wrksrc}/lib/qtkeychain ${build_wrksrc}/cmake/sanitizers-cmake
+	mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni"
+	mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize"
+	mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings"
+	mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals"
+	mv "qtkeychain-${_qtkeychain_commit}" "${build_wrksrc}/lib/qtkeychain"
+	mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake"
 }
 
 post_install() {

From 546885448dfd2eb98e3af2fcd677710f2ab92ea5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 1 Apr 2022 21:45:08 +0200
Subject: [PATCH 0863/2561] sonic-visualiser: update to 4.5

---
 srcpkgs/sonic-visualiser/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index fbc1ea3067c2..a61f4cf5721e 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,7 +1,7 @@
 # Template file for 'sonic-visualiser'
 pkgname=sonic-visualiser
-version=4.4
-revision=2
+version=4.5
+revision=1
 build_style=meson
 hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
 makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.sonicvisualiser.org/"
 changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
 distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
-checksum=762d95cfceff5f2ba31bb632596f6c822ca5b4ee21f3e3615add20bfc24ae16e
+checksum=c57b8277b51e7b0accdc6c3b5a575d3961b43ed9e5e0661e053a6ac388ab82a3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 50224705238d257f8ef792465e1781519c5ebd34 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 Apr 2022 02:32:24 +0200
Subject: [PATCH 0864/2561] go: fix build on ppc64le-musl

---
 .../fix-ppc64le-startup-detection.patch       | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 srcpkgs/go/patches/fix-ppc64le-startup-detection.patch

diff --git a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
new file mode 100644
index 000000000000..6cc2ab337249
--- /dev/null
+++ b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
@@ -0,0 +1,81 @@
+From 946167906ed8646c433c257b074a10e01f0a7dab Mon Sep 17 00:00:00 2001
+From: "Paul E. Murphy" <murp@ibm.com>
+Date: Tue, 22 Mar 2022 11:52:02 -0500
+Subject: [PATCH] runtime: make static/dynamic startup detection work with musl
+ on ppc64le
+
+The glibc loader explicitly sets the first doubleword on the stack (R1)
+to $0 to indicate it was dynamically loaded.
+
+An ELFv2 ABI compliant loader will set R3/R4 to argc/argv when starting
+the process, and R13 to TLS. musl is not compliant. Instead it passes
+argc/argv like the kernel, but R3/R4 are in an undefined state and R13
+is valid.
+
+With the knowledge above, the startup code can be modified to
+dynamically handle all three cases when linked internally.
+
+Fixes #51787
+
+Change-Id: I5de33862c161900d9161817388bbc13a65fdc69c
+Reviewed-on: https://go-review.googlesource.com/c/go/+/394654
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Run-TryBot: Paul Murphy <murp@ibm.com>
+TryBot-Result: Gopher Robot <gobot@golang.org>
+Trust: Paul Murphy <murp@ibm.com>
+Trust: Lynn Boger <laboger@linux.vnet.ibm.com>
+---
+ src/runtime/rt0_linux_ppc64le.s | 32 +++++++++++++++++++++-----------
+ 1 file changed, 21 insertions(+), 11 deletions(-)
+
+diff --git a/src/runtime/rt0_linux_ppc64le.s b/src/runtime/rt0_linux_ppc64le.s
+index 4f7c6e6c99f6..66f7e7b22a41 100644
+--- a/go/src/runtime/rt0_linux_ppc64le.s
++++ b/go/src/runtime/rt0_linux_ppc64le.s
+@@ -147,25 +147,35 @@ TEXT _main<>(SB),NOSPLIT,$-8
+ 	// In a statically linked binary, the stack contains argc,
+ 	// argv as argc string pointers followed by a NULL, envv as a
+ 	// sequence of string pointers followed by a NULL, and auxv.
+-	// There is no TLS base pointer.
++	// The TLS pointer should be initialized to 0.
+ 	//
+-	// In a dynamically linked binary, r3 contains argc, r4
+-	// contains argv, r5 contains envp, r6 contains auxv, and r13
++	// In an ELFv2 compliant dynamically linked binary, R3 contains argc,
++	// R4 contains argv, R5 contains envp, R6 contains auxv, and R13
+ 	// contains the TLS pointer.
+ 	//
+-	// Figure out which case this is by looking at r4: if it's 0,
+-	// we're statically linked; otherwise we're dynamically
+-	// linked.
+-	CMP	R0, R4
+-	BNE	dlink
+-
+-	// Statically linked
++	// When loading via glibc, the first doubleword on the stack points
++	// to NULL a value. (that is *(uintptr)(R1) == 0). This is used to
++	// differentiate static vs dynamicly linked binaries.
++	//
++	// If loading with the musl loader, it doesn't follow the ELFv2 ABI. It
++	// passes argc/argv similar to the linux kernel, R13 (TLS) is
++	// initialized, and R3/R4 are undefined.
++	MOVD	(R1), R12
++	CMP	R0, R12
++	BEQ	tls_and_argcv_in_reg
++
++	// Arguments are passed via the stack (musl loader or a static binary)
+ 	MOVD	0(R1), R3 // argc
+ 	ADD	$8, R1, R4 // argv
++
++	// Did the TLS pointer get set? If so, don't change it (e.g musl).
++	CMP	R0, R13
++	BNE	tls_and_argcv_in_reg
++
+ 	MOVD	$runtime·m0+m_tls(SB), R13 // TLS
+ 	ADD	$0x7000, R13
+ 
+-dlink:
++tls_and_argcv_in_reg:
+ 	BR	main(SB)
+ 
+ TEXT main(SB),NOSPLIT,$-8

From 0d94d7ebc34f7d008754180077875b97c2f13a93 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 31 Mar 2022 02:45:46 +0200
Subject: [PATCH 0865/2561] chromium: update to 100.0.4896.60.

Closes https://github.com/void-linux/void-packages/pull/36433
---
 ...romium-100-SCTHashdanceMetadata-move.patch | 35 +++++++++
 .../disable-aarch64-memory-tagging.patch      | 16 -----
 ...x-aarch64-musl-memory-tagging-macros.patch | 29 ++++++++
 .../fix-build-break-with-system-libdrm.patch  | 62 ----------------
 .../patches/fix-stack-utils-with-musl.patch   | 12 ++--
 ...ne_MM_Var-in-CFX_Font-AdjustMMParams.patch | 71 -------------------
 .../patches/xxx-ppc64le-support.patch         | 12 ++--
 srcpkgs/chromium/template                     |  4 +-
 8 files changed, 78 insertions(+), 163 deletions(-)
 create mode 100644 srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
 delete mode 100644 srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch
 create mode 100644 srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch
 delete mode 100644 srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch
 delete mode 100644 srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch

diff --git a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
new file mode 100644
index 000000000000..903942906c7d
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
@@ -0,0 +1,35 @@
+From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 23 Feb 2022 12:18:57 +0100
+Subject: [PATCH] GCC: explicitely move return value of SCTHashdanceMetadata::ToValue
+
+GCC rejects to do Return Value Optimization in
+SCTHashdanceMetadata::ToValue, because the copy constructor is
+deleted, and in that scenario RVO is rejected in GCC:
+    ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ‘base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const’:
+    ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ‘base::Value::Value(const base::Value&)’
+      191 |   return value;
+          |          ^~~~~
+    In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14,
+                     from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5:
+    ../../base/values.h:254:3: note: declared here
+      254 |   Value(const Value&) = delete;
+          |   ^~~~~
+
+Bug: 819294
+Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166
+---
+
+diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc
+index a057e8e..365527b 100644
+--- a/services/network/sct_auditing/sct_auditing_reporter.cc
++++ b/services/network/sct_auditing/sct_auditing_reporter.cc
+@@ -188,7 +188,7 @@
+       kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id))));
+   value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd));
+   value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry));
+-  return value;
++  return std::move(value);
+ }
+ 
+ // static
diff --git a/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch b/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch
deleted file mode 100644
index 0596c6364a68..000000000000
--- a/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This is broken in the current release and would require a lot of patches to be
-backported. Remove this patch for the next release.
-
---- a/base/memory/tagging.h
-+++ b/base/memory/tagging.h
-@@ -14,10 +14,6 @@
- #include "base/compiler_specific.h"
- #include "build/build_config.h"
- 
--#if defined(ARCH_CPU_ARM64) && defined(__clang__) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID))
--#define HAS_MEMORY_TAGGING 1
--#endif
- 
- constexpr int kMemTagGranuleSize = 16u;
- #if defined(HAS_MEMORY_TAGGING)
diff --git a/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch b/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch
new file mode 100644
index 000000000000..afcdae179850
--- /dev/null
+++ b/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch
@@ -0,0 +1,29 @@
+--- a/base/allocator/partition_allocator/tagging.cc
++++ b/base/allocator/partition_allocator/tagging.cc
+@@ -28,13 +28,25 @@
+ #endif
+ #endif
+ 
+-#ifndef HAS_PR_MTE_MACROS
++#ifndef PR_MTE_TCF_SHIFT
+ #define PR_MTE_TCF_SHIFT 1
++#endif
++#ifndef PR_MTE_TCF_NONE
+ #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_SYNC
+ #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_ASYNC
+ #define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_MASK
+ #define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TAG_SHIFT
+ #define PR_MTE_TAG_SHIFT 3
++#endif
++#ifndef PR_MTE_TAG_MASK
+ #define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)
+ #endif
+ #endif
diff --git a/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch b/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch
deleted file mode 100644
index fe8eee6d1e94..000000000000
--- a/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 5b287e0be8d8d8475ec6ef81b16eaa61e19db078 Mon Sep 17 00:00:00 2001
-From: "Steinar H. Gunderson" <sesse@chromium.org>
-Date: Tue, 25 Jan 2022 19:14:53 +0000
-Subject: [PATCH] Fix build break with system libdrm.
-
-This patch is submitted on behalf of Andres Salomon
-<dilinger@queued.net> (on Cc). Also adding him to src/AUTHORS
-per policy, as he has signed the CLA.
-
-Original patch:
-https://salsa.debian.org/dilinger/chromium/-/commit/2333c2fb985ac1ef3d7331776a7833d965c63302
-
-Change-Id: I18bd60e2e80f2b9181e74ee7972c3f457ab33b10
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3401704
-Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
-Commit-Queue: Steinar H Gunderson <sesse@chromium.org>
-Auto-Submit: Steinar H Gunderson <sesse@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#963119}
----
- AUTHORS                                      | 1 +
- media/gpu/chromeos/BUILD.gn                  | 1 +
- media/gpu/chromeos/video_decoder_pipeline.cc | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/AUTHORS b/AUTHORS
-index 0eba3de5065..50edd3f6b38 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -93,6 +93,7 @@ Andreas Papacharalampous <andreas@apap04.com>
- Andrei Borza <andrei.borza@gmail.com>
- Andrei Parvu <andrei.prv@gmail.com>
- Andrei Parvu <parvu@adobe.com>
-+Andres Salomon <dilinger@queued.net>
- Andreu Botella <andreu@andreubotella.com>
- Andrew Boyarshin <andrew.boyarshin@gmail.com>
- Andrew Brampton <me@bramp.net>
-diff --git a/media/gpu/chromeos/BUILD.gn b/media/gpu/chromeos/BUILD.gn
-index 7cb4c3ea39a..6fe21c15ecc 100644
---- a/media/gpu/chromeos/BUILD.gn
-+++ b/media/gpu/chromeos/BUILD.gn
-@@ -25,6 +25,7 @@ source_set("chromeos") {
- 
-   deps = [
-     "//base",
-+    "//build/config/linux/libdrm",
-     "//media",
-     "//media/gpu:buildflags",
-     "//media/gpu:command_buffer_helper",
-diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc
-index d2f154ea0d8..416b9434a8d 100644
---- a/media/gpu/chromeos/video_decoder_pipeline.cc
-+++ b/media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -28,8 +28,8 @@
- #include "third_party/abseil-cpp/absl/types/optional.h"
- 
- #if BUILDFLAG(USE_VAAPI)
-+#include <drm_fourcc.h>
- #include "media/gpu/vaapi/vaapi_video_decoder.h"
--#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
- #elif BUILDFLAG(USE_V4L2_CODEC)
- #include "media/gpu/v4l2/v4l2_video_decoder.h"
- #else
diff --git a/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch b/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch
index bb48d95312b3..7936aa6e0db4 100644
--- a/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch
+++ b/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch
@@ -4,17 +4,17 @@
  // 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)
+-#elif defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
+     BUILDFLAG(IS_FUCHSIA)
    // pthread_getattr_np() can fail if the thread is not invoked by
    // pthread_create() (e.g., the main thread of blink_unittests).
 @@ -97,7 +97,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)
+-#if defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
+     BUILDFLAG(IS_FUCHSIA)
    pthread_attr_t attr;
    int error;
diff --git a/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch b/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch
deleted file mode 100644
index 2cdbd02a8269..000000000000
--- a/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From ffeb67faf715475f6e463d65c368f556780adf19 Mon Sep 17 00:00:00 2001
-From: Lei Zhang <thestig@chromium.org>
-Date: Mon, 31 Jan 2022 22:42:35 +0000
-Subject: [PATCH] Use FT_Done_MM_Var() in CFX_Font::AdjustMMParams() when
- possible.
-
-When FreeType has FT_Done_MM_Var(), use that to free memory in
-CFX_Font::AdjustMMParams() to avoid mismatched alloc/free functions.
-
-Bug: pdfium:1400
-Change-Id: I044540893103921fc64cdd53fcd628cfebf2c9db
-Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/90130
-Reviewed-by: Nigi <nigi@chromium.org>
-Commit-Queue: Lei Zhang <thestig@chromium.org>
----
- core/fxge/cfx_font.cpp | 28 ++++++++++++++++++++++++++--
- 1 file changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp
-index c08fe9608..8b3a72700 100644
---- a/third_party/pdfium/core/fxge/cfx_font.cpp
-+++ b/third_party/pdfium/core/fxge/cfx_font.cpp
-@@ -44,6 +44,30 @@ struct OUTLINE_PARAMS {
-   float m_CoordUnit;
- };
- 
-+// TODO(crbug.com/pdfium/1400): When FT_Done_MM_Var() is more likely to be
-+// available to all users in the future, remove FreeMMVar() and use
-+// FT_Done_MM_Var() directly.
-+//
-+// Use weak symbols to check if FT_Done_MM_Var() is available at runtime.
-+#if !BUILDFLAG(IS_WIN)
-+extern "C" __attribute__((weak)) decltype(FT_Done_MM_Var) FT_Done_MM_Var;
-+#endif
-+
-+void FreeMMVar(FXFT_FaceRec* rec, FXFT_MM_VarPtr variation_desc) {
-+#if BUILDFLAG(IS_WIN)
-+  // Assume `use_system_freetype` GN var is never set on Windows.
-+  constexpr bool has_ft_done_mm_var_func = true;
-+#else
-+  static const bool has_ft_done_mm_var_func = !!FT_Done_MM_Var;
-+#endif
-+  if (has_ft_done_mm_var_func) {
-+    FT_Done_MM_Var(CFX_GEModule::Get()->GetFontMgr()->GetFTLibrary(),
-+                   variation_desc);
-+  } else {
-+    FXFT_Free(rec, variation_desc);
-+  }
-+}
-+
- FX_RECT FXRectFromFTPos(FT_Pos left, FT_Pos top, FT_Pos right, FT_Pos bottom) {
-   return FX_RECT(pdfium::base::checked_cast<int32_t>(left),
-                  pdfium::base::checked_cast<int32_t>(top),
-@@ -645,7 +669,7 @@ void CFX_Font::AdjustMMParams(int glyph_index,
-     FT_Pos max_width = FXFT_Get_Glyph_HoriAdvance(m_Face->GetRec()) * 1000 /
-                        FXFT_Get_Face_UnitsPerEM(m_Face->GetRec());
-     if (max_width == min_width) {
--      FXFT_Free(m_Face->GetRec(), pMasters);
-+      FreeMMVar(m_Face->GetRec(), pMasters);
-       return;
-     }
-     FT_Pos param = min_param + (max_param - min_param) *
-@@ -653,7 +677,7 @@ void CFX_Font::AdjustMMParams(int glyph_index,
-                                    (max_width - min_width);
-     coords[1] = param;
-   }
--  FXFT_Free(m_Face->GetRec(), pMasters);
-+  FreeMMVar(m_Face->GetRec(), pMasters);
-   FT_Set_MM_Design_Coordinates(m_Face->GetRec(), 2, coords);
- }
- 
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index b95e58c834b1..0be29c1a4eec 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3403,10 +3403,10 @@ index 9ab5e00b8..ad3feffee 100755
    template_sources = _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
+diff --git a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
 index 0b4bd72f0..a0caa5e71 100644
---- a/third_party/dav1d/libdav1d/src/ppc/types.h
-+++ b/third_party/dav1d/libdav1d/src/ppc/types.h
+--- a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
++++ b/third_party/dav1d/libdav1d/src/ppc/dav1d_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))
@@ -3520,17 +3520,17 @@ diff --git a/third_party/skia/src/sksl/SkSLString.cpp b/third_party/skia/src/sks
 index ec3e56964..4cf8999a2 100644
 --- a/third_party/skia/src/sksl/SkSLString.cpp
 +++ b/third_party/skia/src/sksl/SkSLString.cpp
-@@ -234,7 +234,12 @@ String to_string(double value) {
+@@ -37,7 +37,12 @@ String to_string(double value) {
      if (needsDotZero) {
          buffer << ".0";
      }
--    return String(buffer.str().c_str());
+-    return buffer.str();
 +
 +    std::string ret(buffer.str());
 +    if (signbit(value) && ret[0] == '.') {
 +        ret[0] = '-';
 +    }
-+    return String(ret.c_str());
++    return ret;
  }
  
  bool stod(const StringFragment& s, SKSL_FLOAT* value) {
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index f6154e223751..96b34227a323 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=99.0.4844.84
+version=100.0.4896.60
 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="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=20ec184ed34bdc7e660ccf6c007b2db37007de423b3a5a51698a96aa29527515
+checksum=0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc
 
 lib32disabled=yes
 

From 34e38ea463b4e796ff049da1322cc4b42b2522e7 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Wed, 18 Aug 2021 23:10:00 -0400
Subject: [PATCH 0866/2561] New package: LimeSuite-20.10.0

---
 common/shlibs              |  1 +
 srcpkgs/LimeSuite-devel    |  1 +
 srcpkgs/LimeSuite-doc      |  1 +
 srcpkgs/LimeSuite/template | 87 ++++++++++++++++++++++++++++++++++++++
 srcpkgs/SoapyLMS7          |  1 +
 5 files changed, 91 insertions(+)
 create mode 120000 srcpkgs/LimeSuite-devel
 create mode 120000 srcpkgs/LimeSuite-doc
 create mode 100644 srcpkgs/LimeSuite/template
 create mode 120000 srcpkgs/SoapyLMS7

diff --git a/common/shlibs b/common/shlibs
index 7079375524fc..b0c6fe696e5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4145,3 +4145,4 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
 librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
+libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
diff --git a/srcpkgs/LimeSuite-devel b/srcpkgs/LimeSuite-devel
new file mode 120000
index 000000000000..4431f3d5064a
--- /dev/null
+++ b/srcpkgs/LimeSuite-devel
@@ -0,0 +1 @@
+LimeSuite
\ No newline at end of file
diff --git a/srcpkgs/LimeSuite-doc b/srcpkgs/LimeSuite-doc
new file mode 120000
index 000000000000..4431f3d5064a
--- /dev/null
+++ b/srcpkgs/LimeSuite-doc
@@ -0,0 +1 @@
+LimeSuite
\ No newline at end of file
diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template
new file mode 100644
index 000000000000..44f119784ffd
--- /dev/null
+++ b/srcpkgs/LimeSuite/template
@@ -0,0 +1,87 @@
+# Template file for 'LimeSuite'
+pkgname=LimeSuite
+version=20.10.0
+revision=1
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+configure_args="
+ -DENABLE_SIMD_FLAGS=none
+ -DENABLE_UTILITIES=True
+ -DENABLE_LIME_UTIL=True
+ -DCMAKE_SKIP_RPATH=True
+ -DENABLE_DESKTOP=False
+ -DENABLE_SOAPY_LMS7=True
+ -DENABLE_PCIE_XILLYBUS=True
+ -DENABLE_QUICKTEST=True
+ -DENABLE_MCU_TESTBENCH=True
+ -DENABLE_FTDI=True
+ -DENABLE_FX3=True
+ -DENABLE_STREAM_UNITE=True
+ -DENABLE_EXAMPLES=True
+ -DENABLE_HEADERS=True
+ -DENABLE_GUI=True
+ -DENABLE_API_DOXYGEN=True
+ $(vopt_bool octave ENABLE_OCTAVE)
+ -DLIME_SUITE_EXTVER=${version}_${revision}"
+hostmakedepends="doxygen"
+makedepends="gnuplot wxWidgets-gtk3-devel libusb-devel SoapySDR-devel libfreeglut-devel
+ fltk-devel glew-devel sqlite-devel libgomp-devel $(vopt_if octave octave)"
+depends="wget"
+short_desc="Driver and GUI for LimeSDR/LMS7002M-based SDR platforms"
+maintainer="classabbyamp <dev@kb6.ee>"
+license="Apache-2.0"
+homepage="https://myriadrf.org/projects/lime-suite/"
+distfiles="https://github.com/myriadrf/LimeSuite/archive/refs/tags/v${version}.tar.gz"
+checksum=f6d79dc67cb52a5aea839d1dc00e65f85367cb2c275d77f149833d32cf79b467
+shlib_provides="libLimeSuite.so.20.10-1"
+
+build_options="octave"
+desc_option_octave="Enable the LimeSuite Octave plugin"
+
+# Octave is not built on arm, so don't enable the build option by default on those archs
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch64*) build_options_default="" ;;
+	*) build_options_default="octave" ;;
+esac
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+post_install() {
+	vinstall udev-rules/64-limesuite.rules 644 usr/lib/udev/rules.d
+
+	for res in 16 22 32 48 64 128; do
+		_icon_dir="usr/share/icons/hicolor/${res}x${res}/apps"
+		vmkdir $_icon_dir
+		vinstall Desktop/lime-suite-$res.png 644 $_icon_dir lime-suite.png
+	done
+	vinstall Desktop/lime-suite.desktop 755 usr/share/applications
+}
+
+LimeSuite-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"
+	}
+}
+
+LimeSuite-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vdoc docs/lms7_api_quick_start_guide.pdf
+		vdoc docs/StreamProtocol.pdf
+		vcopy docs/LMS_API_Documentation usr/share/doc/$pkgname
+	}
+}
+
+SoapyLMS7_package() {
+	short_desc="SoapySDR module for LimeSDR/LMS7002M"
+	pkg_install() {
+		vmove usr/lib/SoapySDR/modules0.7/libLMS7Support.so
+	}
+}
diff --git a/srcpkgs/SoapyLMS7 b/srcpkgs/SoapyLMS7
new file mode 120000
index 000000000000..4431f3d5064a
--- /dev/null
+++ b/srcpkgs/SoapyLMS7
@@ -0,0 +1 @@
+LimeSuite
\ No newline at end of file

From 01175cd988503f46da0d130d1b596b870b7496db Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 4 Jan 2022 19:19:19 -0600
Subject: [PATCH 0867/2561] wireshark: update to 3.6.3.

---
 common/shlibs                                 |  6 ++--
 .../patches/HAVE_C99_VSNPRINTF.patch          | 35 +++++++++++++++++++
 srcpkgs/wireshark/patches/cross.patch         |  2 +-
 srcpkgs/wireshark/template                    | 29 ++++++++++++---
 4 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch

diff --git a/common/shlibs b/common/shlibs
index b0c6fe696e5e..1007c400288a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1573,9 +1573,9 @@ 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
+libwiretap.so.12 libwireshark-3.6.3_1
+libwireshark.so.15 libwireshark-3.6.3_1
+libwsutil.so.13 libwireshark-3.6.3_1
 libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1
 libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1
 libKF5Prison.so.5 prison-5.43.0_1
diff --git a/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch b/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch
new file mode 100644
index 000000000000..b500598fd360
--- /dev/null
+++ b/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch
@@ -0,0 +1,35 @@
+--- a/ConfigureChecks.cmake	2021-12-29 13:12:48.000000000 -0600
++++ b/ConfigureChecks.cmake	2022-01-06 06:45:07.907628761 -0600
+@@ -104,32 +104,6 @@
+ check_symbol_exists(tzname "time.h" HAVE_TZNAME)
+ 
+ #
+-# Check if the libc vsnprintf() conforms to C99. If this fails we may
+-# need to fall-back on GLib I/O.
+-#
+-check_c_source_runs("
+-	#include <stdio.h>
+-	int main(void)
+-	{
+-		/* Check that snprintf() and vsnprintf() don't return
+-		 * -1 if the buffer is too small. C99 says this value
+-		 * is the length that would be written not including
+-		 * the nul byte. */
+-		char buf[3];
+-		return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1;
+-	}"
+-	HAVE_C99_VSNPRINTF
+-)
+-if (NOT HAVE_C99_VSNPRINTF)
+-	message(FATAL_ERROR
+-"Building Wireshark requires a C99 compliant vsnprintf() and this \
+-target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \
+-using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \
+-developers at wireshark-dev@wireshark.org."
+-	)
+-endif()
+-
+-#
+ # *If* we found libnl, check if we can use nl80211 stuff with it.
+ #
+ if (NL_FOUND)
diff --git a/srcpkgs/wireshark/patches/cross.patch b/srcpkgs/wireshark/patches/cross.patch
index 46dcc949c72e..d454505b8279 100644
--- a/srcpkgs/wireshark/patches/cross.patch
+++ b/srcpkgs/wireshark/patches/cross.patch
@@ -33,7 +33,7 @@ Upstream: no
            # These files are generated as side-effect
            ${_out}.h
            ${_out}.out
--         COMMAND lemon
+-         COMMAND $<TARGET_FILE:lemon>
 +         COMMAND ${EXECUTABLE_OUTPUT_PATH}/lemon
             -T${_lemonpardir}/lempar.c
             -d.
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index fae420888bfe..4d0d23c7ed50 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,11 +1,10 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=3.4.5
+version=3.6.3
 revision=1
 build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=None"
 hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
-qt5-tools qt5-host-tools qt5-qmake"
+qt5-tools qt5-host-tools qt5-qmake ruby-asciidoctor"
 makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel
  libmaxminddb-devel libgcrypt-devel libcap-devel sbc-devel c-ares-devel libxml2-devel
  libssh-devel libnl3-devel spandsp-devel tiff-devel libcap-progs liblz4-devel
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.wireshark.org"
 distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"
-checksum=de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333
+checksum=b60364a4c0068a10811ab3fd075ca6c1eb0e75d44600271b88a20ed93a2ef631
 system_groups="wireshark"
 
 CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2"
@@ -33,6 +32,26 @@ pre_check() {
 	ninja -C build test-programs
 }
 
+if [ "${XBPS_ALLOW_CHROOT_BREAKOUT}" = "yes" ]; then
+do_check() {
+	# Many tests fail when run as root (i.e. in CI)
+	test/test.py --disable-capture -p build/run \
+		suite_decryption \
+		suite_dissectors.group_asterix \
+		suite_extcaps \
+		suite_fileformats \
+		suite_follow \
+		suite_follow_dccp \
+		suite_follow_multistream \
+		suite_io \
+		suite_mergecap \
+		suite_netperfmeter \
+		suite_release \
+		suite_text2pcap \
+		suite_unittests
+}
+fi
+
 post_install() {
 	rm -f -- "${DESTDIR}/usr/bin/lemon"
 	rm -f -- "${DESTDIR}/usr/lib/wireshark/cmake/UseLemon.cmake"
@@ -77,6 +96,6 @@ wireshark-qt_package() {
 	pkg_install() {
 		vmove usr/bin/wireshark
 		vmove usr/share/man/man1/wireshark.1
-		vmove usr/share/applications/wireshark.desktop
+		vmove usr/share/applications/org.wireshark.Wireshark.desktop
 	}
 }

From f9e58902da019dd0d21526e534cf1757f4568e49 Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Fri, 1 Apr 2022 07:58:16 +0200
Subject: [PATCH 0868/2561] emptty: update to 0.7.1.

---
 srcpkgs/emptty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 6fccd5d53e14..2bbbbf4a11e5 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.2
+version=0.7.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=a750c5cbaeda6b4d0367d18cedf27d884e6fb9a0c7b20819dc878cf7d5a5013b
+checksum=1d86dc0623773d43f9ced8c699ee82c812065ba18ecf277061210392fb2ec56a
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From f92e0c9588d97899f2be0e8a97198e35c08fc54b Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Thu, 31 Mar 2022 23:21:56 +0100
Subject: [PATCH 0869/2561] StyLua: update to 0.13.0.

---
 srcpkgs/StyLua/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index ab22a3c92973..b6dc22c3875d 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
 # Template file for 'StyLua'
 pkgname=StyLua
-version=0.12.4
+version=0.13.0
 revision=1
 build_style=cargo
 configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')"
@@ -10,7 +10,7 @@ license="MPL-2.0"
 homepage="https://github.com/JohnnyMorganz/StyLua"
 changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md"
 distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
-checksum=ce6b4a6767b17f8d609e8c9d666c5f6f5c2863edd0638e70392bfe55f99b4fd0
+checksum=ad74d1f47b0337810459dab9b49694bd5bd6c8c7381a35dcab7866752652988b
 
 build_options="lua52 luau"
 build_options_default="lua52 luau"

From 1204eeeab547e165c5947ec246101f41ce07718c Mon Sep 17 00:00:00 2001
From: Savoy <git@liberation.red>
Date: Mon, 7 Feb 2022 12:29:38 -0600
Subject: [PATCH 0870/2561] New package: mandown-0.1.2

---
 srcpkgs/mandown/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/mandown/template

diff --git a/srcpkgs/mandown/template b/srcpkgs/mandown/template
new file mode 100644
index 000000000000..5ae9b32020dd
--- /dev/null
+++ b/srcpkgs/mandown/template
@@ -0,0 +1,11 @@
+# Template file for 'mandown'
+pkgname=mandown
+version=0.1.2
+revision=1
+build_style=cargo
+short_desc="Create man pages from markdown markup"
+maintainer="Savoy <git@liberation.red>"
+license="Apache-2.0"
+homepage="https://gitlab.com/kornelski/mandown"
+distfiles="https://gitlab.com/kornelski/mandown/-/archive/$version/mandown-$version.tar.gz"
+checksum=ea26e2bf0ab1ebf4bea858072aa582b11d667a07e05b61bc50cfe5c2b382894a

From 01ee7a79a43a675f39ef2dbaeb92d7634a062d14 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 2 Apr 2022 23:06:14 -0400
Subject: [PATCH 0871/2561] vpsm: update upstream, clean suid bit

- The suid permission bit was incorrectly being set. It is now gone. See #32156
- The upstream README indicates a move to a new GH account.
---
 srcpkgs/vpsm/patches/setuid-fix.patch | 19 +++++++++++++++++++
 srcpkgs/vpsm/template                 |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vpsm/patches/setuid-fix.patch

diff --git a/srcpkgs/vpsm/patches/setuid-fix.patch b/srcpkgs/vpsm/patches/setuid-fix.patch
new file mode 100644
index 000000000000..3a2ec1a1c405
--- /dev/null
+++ b/srcpkgs/vpsm/patches/setuid-fix.patch
@@ -0,0 +1,19 @@
+Do not apply the setuid permission bit on the vpsm script
+
+See https://github.com/void-linux/void-packages/issues/32156
+see https://github.com/sineto/vpsm/pull/2
+
+
+--
+
+--- a/Makefile
++++ b/Makefile
+@@ -16,7 +16,7 @@
+ 
+ .PHONY: install
+ install:
+-	install -Dm4755 vpsm $(DESTDIR)$(PREFIX)/bin/vpsm
++	install -Dm755 vpsm $(DESTDIR)$(PREFIX)/bin/vpsm
+ 	install -Dm644 man/vpsm.1 $(DESTDIR)/$(PREFIX)/share/man/man1/vpsm.1
+ 
+ .PHONY: uninstall
diff --git a/srcpkgs/vpsm/template b/srcpkgs/vpsm/template
index 62805298d065..ead8e89e6ba8 100644
--- a/srcpkgs/vpsm/template
+++ b/srcpkgs/vpsm/template
@@ -1,13 +1,13 @@
 # Template file for 'vpsm'
 pkgname=vpsm
 version=0.1.2
-revision=1
+revision=2
 build_style=gnu-makefile
 depends="bash xtools ripgrep hub"
 short_desc="Void-Packages Sources Management wrapper for XBPS-SRC"
 maintainer="Sinésio Neto <sinetoami@gmail.com>"
 license="MIT"
-homepage="https://github.com/sinetoami/vpsm"
+homepage="https://github.com/sineto/vpsm"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=7317439096f56371397eb1250a81ff83e53740c14163993cf6668e9f0c4bdc2f
 

From bb7a6a534ada27ab0b0a4ae3e545a30fa41f2b89 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 0872/2561] vala: update to 0.56.0

---
 common/shlibs         | 2 +-
 srcpkgs/vala/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 1007c400288a..20fd11e04231 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 shlib_provides="libvalaccodegen.so"
 make_check=extended
 

From b52d3a282d7e0a99f23c470f30abc08e7e724d75 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 0873/2561] valadoc: update to 0.56.0

---
 common/shlibs            | 2 +-
 srcpkgs/valadoc/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 20fd11e04231..307cb13347fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3128,7 +3128,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 
 pre_configure() {
 	autoreconf -if

From 3df461a130cbbc3402e3626852b7980f9cee2550 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:30 +0200
Subject: [PATCH 0874/2561] io.elementary.code: revbump for vala 0.56.0

---
 srcpkgs/io.elementary.code/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index c47d667b8a96..80be5d38c501 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=6.1.0
-revision=1
+revision=2
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala gettext polkit glib-devel"

From e7342286d5f974416c56459d9c8f82db7c5388fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:30 +0200
Subject: [PATCH 0875/2561] valabind: revbump for vala 0.56.0

---
 srcpkgs/valabind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index c7b8bf305d27..a9a7765a9bd6 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,7 +1,7 @@
 # Template file for 'valabind'
 pkgname=valabind
 version=1.8.0
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
 makedepends="vala-devel glib-devel"

From 8b289e7adce8a08de34166e86ad9db6b05ec76f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:31 +0200
Subject: [PATCH 0876/2561] vala-language-server: revbump for vala 0.56.0

---
 srcpkgs/vala-language-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 1693c8fc0b7f..037fa94852da 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
 version=0.48.4
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"

From df837cf19c4a4b08b30f4fe1ddd40d32c27bf1f6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:19:54 +0200
Subject: [PATCH 0877/2561] five-or-more: update to 3.32.3.

---
 srcpkgs/five-or-more/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/five-or-more/template b/srcpkgs/five-or-more/template
index bb137c32d42c..8f871a5ddb8f 100644
--- a/srcpkgs/five-or-more/template
+++ b/srcpkgs/five-or-more/template
@@ -1,6 +1,6 @@
 # Template file for 'five-or-more'
 pkgname=five-or-more
-version=3.32.2
+version=3.32.3
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -9,5 +9,6 @@ short_desc="GNOME align five or more objects game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Five%20or%20more"
+changelog="https://gitlab.gnome.org/GNOME/five-or-more/-/raw/gnome-3-32/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=311a2693dd04226d32b6d7a02e4c739341bf5bd3492e3285c3910db73e47eea6
+checksum=2d10d72eefdeb324b447d632af0c32496e25fc15a3c01db7d2f00c9b51d09ef4

From 95c2d51508b4e34550fecc4f54ad9284f5e63efa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:41:45 +0200
Subject: [PATCH 0878/2561] folks: update to 0.15.5.

---
 srcpkgs/folks/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 90fdec6fff48..fbc56862bde7 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,11 +1,11 @@
 # Template file for 'folks'
 pkgname=folks
-version=0.15.4
+version=0.15.5
 revision=1
 build_style=meson
-build_helper="gir qemu"
+build_helper="gir"
 configure_args="-Db_lto=false"
-hostmakedepends="pkg-config intltool glib-devel python3 python3-dbusmock
+hostmakedepends="pkg-config gettext glib-devel python3-dbusmock
  evolution-data-server-devel $(vopt_if gir vala)"
 makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
  libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
@@ -14,8 +14,9 @@ short_desc="GObject Library to aggregate people into metacontacts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Folks"
+changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e71099afc9e88fad4e757ae134bc3fd63e12b901ad62b0ed5536afb79124af5f
+checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
 
 build_options="gir"
 build_options_default="gir"

From a6b3bafe5b491777a1c22b8e72501ba807e86870 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:50:33 +0200
Subject: [PATCH 0879/2561] go-for-it: fix for vala 0.56

---
 srcpkgs/go-for-it/patches/vala-0.56.patch | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/go-for-it/patches/vala-0.56.patch

diff --git a/srcpkgs/go-for-it/patches/vala-0.56.patch b/srcpkgs/go-for-it/patches/vala-0.56.patch
new file mode 100644
index 000000000000..76929f6cfa5f
--- /dev/null
+++ b/srcpkgs/go-for-it/patches/vala-0.56.patch
@@ -0,0 +1,30 @@
+From 4be5ff4ff5ef7db9ab320945cd78a2b2e853695c Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 2 Apr 2022 18:53:20 +0200
+Subject: [PATCH] Fix build with vala 0.56
+
+~/Go-For-It-1.9.6/src/Services/TaskTimer.vala:35.42-35.50: error: value is less accessible than constant `GOFI.TaskTimer.UPDATE_INTERVAL'
+   35 |     public const int64 UPDATE_INTERVAL = 60 * US_C;
+      |                                          ^~~~~~~~~
+
+Closes #172
+---
+ src/Services/TaskTimer.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Services/TaskTimer.vala b/src/Services/TaskTimer.vala
+index 8f14f25..2231dc9 100644
+--- a/src/Services/TaskTimer.vala
++++ b/src/Services/TaskTimer.vala
+@@ -32,7 +32,7 @@ public class GOFI.TaskTimer {
+ 
+     private const int64 US_C = 1000000; // μs<->s conversion
+ 
+-    public const int64 UPDATE_INTERVAL = 60 * US_C;
++    private const int64 UPDATE_INTERVAL = 60 * US_C;
+ 
+     /**
+      * A proxy attribute, that does not store any data itself, but provides
+-- 
+2.35.1
+

From 0d43596ce9210450208fa3035f43eb7b8973fcce Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:01:07 +0200
Subject: [PATCH 0880/2561] gradio: remove package

---
 srcpkgs/gradio/template | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 srcpkgs/gradio/template

diff --git a/srcpkgs/gradio/template b/srcpkgs/gradio/template
deleted file mode 100644
index a1c4db39151e..000000000000
--- a/srcpkgs/gradio/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'gradio'
-pkgname=gradio
-version=7.2
-revision=1
-wrksrc="Gradio-${version}"
-build_style=meson
-hostmakedepends="automake intltool itstool yelp-tools glib-devel
- pkg-config gettext gettext-devel vala"
-makedepends="gtk+3-devel gettext-devel vala-devel
- gst-plugins-base1-devel json-glib-devel libsoup-devel
- appstream-glib-devel"
-depends="desktop-file-utils gst-plugins-bad1 gst-plugins-good1
- gst-plugins-ugly1"
-short_desc="GTK3 app for finding and listening to internet radio stations"
-maintainer="Logen Kain <logen@sudotask.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/haecker-felix/gradio"
-distfiles="https://github.com/haecker-felix/${pkgname}/archive/v${version}.tar.gz"
-checksum=5a85d7d4afb1424e46c935114b268e4a65de2629d60f48eccd75d67ff4b113d2

From e9fc152df0ed8e6f014ba3fe9604a7f7ab780d21 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:19:08 +0200
Subject: [PATCH 0881/2561] io.elementary.photos: fix for vala 0.56

---
 .../patches/vala-0.56.patch                   | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 srcpkgs/io.elementary.photos/patches/vala-0.56.patch

diff --git a/srcpkgs/io.elementary.photos/patches/vala-0.56.patch b/srcpkgs/io.elementary.photos/patches/vala-0.56.patch
new file mode 100644
index 000000000000..08d7d6feaaa8
--- /dev/null
+++ b/srcpkgs/io.elementary.photos/patches/vala-0.56.patch
@@ -0,0 +1,51 @@
+From 6594f1323726fb0d38519a7bdafe16f9170353cb Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Mon, 14 Mar 2022 19:50:16 +0800
+Subject: [PATCH] Fix build with vala 0.56 (#711)
+
+---
+ src/main.vala    |  2 +-
+ vapi/config.vapi | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/main.vala b/src/main.vala
+index 875d35ec7..57c88cf9c 100644
+--- a/src/main.vala
++++ b/src/main.vala
+@@ -273,7 +273,7 @@ namespace CommandlineOptions {
+     bool show_version = false;
+     bool debug_enabled = false;
+ 
+-    public const OptionEntry[] APP_OPTIONS = {
++    const OptionEntry[] APP_OPTIONS = {
+         { "datadir", 'd', 0, OptionArg.FILENAME, out data_dir, N_("Path to Photos' private data"), N_("DIRECTORY")},
+         { "no-runtime-monitoring", 0, 0, OptionArg.NONE, out no_runtime_monitoring, N_("Do not monitor library directory at runtime for changes"), null},
+         { "no-startup-progress", 0, 0, OptionArg.NONE, out no_startup_progress, N_("Don't display startup progress meter"), null},
+diff --git a/vapi/config.vapi b/vapi/config.vapi
+index 15c8d8b12..36f0acb78 100644
+--- a/vapi/config.vapi
++++ b/vapi/config.vapi
+@@ -5,16 +5,16 @@
+  */
+ 
+ [CCode (cheader_filename="config.h")]
+-extern const string _PREFIX;
++public const string _PREFIX;
+ [CCode (cheader_filename="config.h")]
+-extern const string _VERSION;
++public const string _VERSION;
+ [CCode (cheader_filename="config.h")]
+-extern const string GETTEXT_PACKAGE;
++public const string GETTEXT_PACKAGE;
+ [CCode (cheader_filename="config.h")]
+-extern const string LOCALEDIR;
++public const string LOCALEDIR;
+ [CCode (cheader_filename="config.h")]
+-extern const string _LIB;
++public const string _LIB;
+ [CCode (cheader_filename="config.h")]
+-extern const string _LIBEXECDIR;
++public const string _LIBEXECDIR;
+ [CCode (cheader_filename="config.h")]
+-extern const string PROJECT_NAME;
++public const string PROJECT_NAME;

From 2aa9152f9059c9af7b5b2e7fba4392cce17710cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:24:17 +0200
Subject: [PATCH 0882/2561] libgnome-games-support: update to 1.8.2.

---
 srcpkgs/libgnome-games-support/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libgnome-games-support/template b/srcpkgs/libgnome-games-support/template
index 60a1aba20271..92db8d92bc3d 100644
--- a/srcpkgs/libgnome-games-support/template
+++ b/srcpkgs/libgnome-games-support/template
@@ -1,16 +1,17 @@
 # Template file for 'libgnome-games-support'
 pkgname=libgnome-games-support
-version=1.8.0
+version=1.8.2
 revision=1
 build_style=meson
-hostmakedepends="intltool pkg-config gobject-introspection vala"
+hostmakedepends="gettext pkg-config gobject-introspection vala"
 makedepends="gtk+3-devel libgee08-devel"
 short_desc="GNOME games shared code"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://git.gnome.org/browse/libgnome-games-support/"
+homepage="https://gitlab.gnome.org/GNOME/libgnome-games-support/"
+changelog="https://gitlab.gnome.org/GNOME/libgnome-games-support/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=abdde538a14fd6078fe6b7e6e93f38a33491d9bec711a116d8b47530184cb3dd
+checksum=28434604a7b038731ac0231731388ff104f565bb2330cc24e78cda04cfd3ef7d
 
 libgnome-games-support-devel_package() {
 	short_desc+=" - development files"

From 7e892d25e9b1b7077f662e3cad13b4eb4d440230 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:43:48 -0700
Subject: [PATCH 0883/2561] shotwell: fix build with vala 0.56.0

---
 .../patches/shotwell-0.54.1-vapi_fixes.patch  | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch

diff --git a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
new file mode 100644
index 000000000000..f39f988f9645
--- /dev/null
+++ b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
@@ -0,0 +1,67 @@
+From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 30 Nov 2021 15:09:17 +0100
+Subject: [PATCH] Fix accessibility issues with initializer of constants
+
+---
+ src/International.vala |  2 --
+ src/Resources.vala     |  7 -------
+ vapi/version.vapi      | 17 ++++++++++++++---
+ 3 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/src/International.vala b/src/International.vala
+index 555a91f8..73f07639 100644
+--- a/src/International.vala
++++ b/src/International.vala
+@@ -4,8 +4,6 @@
+  * See the COPYING file in this distribution.
+  */
+ 
+-extern const string _LANG_SUPPORT_DIR;
+-
+ public const string TRANSLATABLE = "translatable";
+ 
+ namespace InternationalSupport {
+diff --git a/src/Resources.vala b/src/Resources.vala
+index 6d2b8851..86f0eb65 100644
+--- a/src/Resources.vala
++++ b/src/Resources.vala
+@@ -4,13 +4,6 @@
+  * See the COPYING file in this distribution.
+  */
+ 
+-// defined by ./configure or Makefile and included by gcc -D
+-extern const string _PREFIX;
+-extern const string _VERSION;
+-extern const string GETTEXT_PACKAGE;
+-extern const string _LIB;
+-extern const string _LIBEXECDIR;
+-
+ namespace Resources {
+     public const string APP_TITLE = "Shotwell";
+     public const string APP_LIBRARY_ROLE = _("Photo Manager");
+diff --git a/vapi/version.vapi b/vapi/version.vapi
+index 06974c84..e191f2f7 100644
+--- a/vapi/version.vapi
++++ b/vapi/version.vapi
+@@ -1,3 +1,14 @@
+-[CCode (cheader_filename="version.h")]
+-extern const string? _GIT_VERSION;
+-
++[CCode (cheader_filename = "version.h")]
++public const string? _GIT_VERSION;
++[CCode (cheader_filename = "config.h")]
++public const string _PREFIX;
++[CCode (cheader_filename = "config.h")]
++public const string _VERSION;
++[CCode (cheader_filename = "config.h")]
++public const string GETTEXT_PACKAGE;
++[CCode (cheader_filename = "config.h")]
++public const string _LIB;
++[CCode (cheader_filename = "config.h")]
++public const string _LIBEXECDIR;
++[CCode (cheader_filename = "config.h")]
++public const string _LANG_SUPPORT_DIR;
+-- 
+GitLab
+

From de04eb138e3fa3d30435cd18adf17ff6f0050d28 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:28:08 +0200
Subject: [PATCH 0884/2561] planner: fix for vala 0.56

---
 srcpkgs/planner/patches/vala-0.56.patch | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/planner/patches/vala-0.56.patch

diff --git a/srcpkgs/planner/patches/vala-0.56.patch b/srcpkgs/planner/patches/vala-0.56.patch
new file mode 100644
index 000000000000..bff39d43cc1b
--- /dev/null
+++ b/srcpkgs/planner/patches/vala-0.56.patch
@@ -0,0 +1,25 @@
+From 87be3e27ccc8f9a1ef7fbeec9600459eb4569200 Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Mon, 14 Mar 2022 23:36:21 +0800
+Subject: [PATCH] Fix build with vala 0.56
+
+Otherwise build fails with
+
+../src/Application.vala:45.50-55.5: error: value is less accessible than constant `Planner.PLANNER_OPTIONS'
+---
+ src/Application.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Application.vala b/src/Application.vala
+index 8c1c9ddb..ebd8f726 100644
+--- a/src/Application.vala
++++ b/src/Application.vala
+@@ -42,7 +42,7 @@ public class Planner : Gtk.Application {
+     private static bool clear_database = false;
+     private static string lang = "";
+ 
+-    public const OptionEntry[] PLANNER_OPTIONS = {
++    private const OptionEntry[] PLANNER_OPTIONS = {
+         { "version", 'v', 0, OptionArg.NONE, ref version,
+         "Display version number", null },
+         { "reset", 'r', 0, OptionArg.NONE, ref clear_database,

From 35cc0ed9ebb28c502ce07f8aa7bd85e1d2db4011 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:35:16 +0200
Subject: [PATCH 0885/2561] tootle: fix for vala 0.56

---
 srcpkgs/tootle/patches/vala-0.56.patch | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/tootle/patches/vala-0.56.patch

diff --git a/srcpkgs/tootle/patches/vala-0.56.patch b/srcpkgs/tootle/patches/vala-0.56.patch
new file mode 100644
index 000000000000..38adf0ff0930
--- /dev/null
+++ b/srcpkgs/tootle/patches/vala-0.56.patch
@@ -0,0 +1,23 @@
+From 11d94c05d4c4a2350801294f155230e899048ab5 Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Sat, 19 Mar 2022 16:59:31 +0800
+Subject: [PATCH] Application: make app_entries private
+
+Fixes compilation with latest valac.
+---
+ src/Application.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Application.vala b/src/Application.vala
+index 57d0fd7..b48cb53 100644
+--- a/src/Application.vala
++++ b/src/Application.vala
+@@ -43,7 +43,7 @@ namespace Tootle {
+ 			{ null }
+ 		};
+ 
+-		public const GLib.ActionEntry[] app_entries = {
++		private const GLib.ActionEntry[] app_entries = {
+ 			{ "about", about_activated },
+ 			{ "compose", compose_activated },
+ 			{ "back", back_activated },

From e9f97b22319c2f83df2123116852616cd2dbba8b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:44:54 +0200
Subject: [PATCH 0886/2561] simple-scan: fix for vala 0.56

---
 srcpkgs/simple-scan/patches/vala-0.56.patch | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/simple-scan/patches/vala-0.56.patch

diff --git a/srcpkgs/simple-scan/patches/vala-0.56.patch b/srcpkgs/simple-scan/patches/vala-0.56.patch
new file mode 100644
index 000000000000..0820cee20e40
--- /dev/null
+++ b/srcpkgs/simple-scan/patches/vala-0.56.patch
@@ -0,0 +1,25 @@
+From c50802b213c325cfa957d66955f6de96908710d9 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 6 Nov 2021 19:46:07 +0100
+Subject: [PATCH] Fix accessibility conflict of constant and its value
+
+---
+ src/simple-scan.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/simple-scan.vala b/src/simple-scan.vala
+index c15a5418..71f32de9 100644
+--- a/src/simple-scan.vala
++++ b/src/simple-scan.vala
+@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Application
+     static bool show_version;
+     static bool debug_enabled;
+     static string? fix_pdf_filename = null;
+-    public const OptionEntry[] options =
++    const OptionEntry[] options =
+     {
+         { "version", 'v', 0, OptionArg.NONE, ref show_version,
+           /* Help string for command line --version flag */
+-- 
+GitLab
+

From 58504546dda0dc74237ab10dde5144100b61d623 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 22:59:04 +0200
Subject: [PATCH 0887/2561] geary: fix for vala 0.56

---
 srcpkgs/geary/patches/vala-0.56a.patch | 25 ++++++++++++++++
 srcpkgs/geary/patches/vala-0.56b.patch | 40 ++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 srcpkgs/geary/patches/vala-0.56a.patch
 create mode 100644 srcpkgs/geary/patches/vala-0.56b.patch

diff --git a/srcpkgs/geary/patches/vala-0.56a.patch b/srcpkgs/geary/patches/vala-0.56a.patch
new file mode 100644
index 000000000000..df2c3902db14
--- /dev/null
+++ b/srcpkgs/geary/patches/vala-0.56a.patch
@@ -0,0 +1,25 @@
+From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 30 Jan 2022 19:54:11 +0100
+Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument
+
+---
+ src/client/util/util-cache.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
+index f054e32e5..ecc275e84 100644
+--- a/src/client/util/util-cache.vala
++++ b/src/client/util/util-cache.vala
+@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
+     private class CacheEntry<T> {
+ 
+ 
+-        public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
++        public static int lru_compare(CacheEntry a, CacheEntry b) {
+             if (a.key == b.key) {
+                 return 0;
+             }
+-- 
+GitLab
+
diff --git a/srcpkgs/geary/patches/vala-0.56b.patch b/srcpkgs/geary/patches/vala-0.56b.patch
new file mode 100644
index 000000000000..2d071a133751
--- /dev/null
+++ b/srcpkgs/geary/patches/vala-0.56b.patch
@@ -0,0 +1,40 @@
+From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 30 Nov 2021 15:31:31 +0100
+Subject: [PATCH] Fix accessibility issues with initializer of constants
+
+---
+ src/client/application/application-client.vala | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
+index 6ce19ce2a..e6ba85331 100644
+--- a/src/client/application/application-client.vala
++++ b/src/client/application/application-client.vala
+@@ -8,16 +8,16 @@
+ 
+ // Defined by CMake build script.
+ extern const string GETTEXT_PACKAGE;
+-extern const string _APP_ID;
+-extern const string _BUILD_ROOT_DIR;
+-extern const string _GSETTINGS_DIR;
+-extern const string _INSTALL_PREFIX;
+-extern const string _NAME_SUFFIX;
++public extern const string _APP_ID;
++public extern const string _BUILD_ROOT_DIR;
++public extern const string _GSETTINGS_DIR;
++public extern const string _INSTALL_PREFIX;
++public extern const string _NAME_SUFFIX;
+ extern const string _PLUGINS_DIR;
+ extern const string _PROFILE;
+ extern const string _REVNO;
+-extern const string _SOURCE_ROOT_DIR;
+-extern const string _VERSION;
++public extern const string _SOURCE_ROOT_DIR;
++public extern const string _VERSION;
+ extern const string _WEB_EXTENSIONS_DIR;
+ 
+ 
+-- 
+GitLab
+

From d45def79b56aee694e077422d747957ff4476b1e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 3 Apr 2022 15:19:05 +0200
Subject: [PATCH 0888/2561] zellij: build manpage

---
 srcpkgs/zellij/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 72a9ab9e6e76..911ba18464eb 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,12 +1,13 @@
 # Template file for 'zellij'
 pkgname=zellij
 version=0.27.0
-revision=1
+revision=2
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
 archs="x86_64* aarch64* i686*"
 build_style=cargo
 build_helper=qemu
+hostmakedepends="mandown"
 checkdepends="openssl-devel pkg-config"
 short_desc="Terminal workspace with batteries included"
 maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
@@ -21,6 +22,8 @@ post_build() {
 	vtargetrun ${ZELLIJ} setup --generate-completion bash > zellij.bash
 	vtargetrun ${ZELLIJ} setup --generate-completion zsh > zellij.zsh
 	vtargetrun ${ZELLIJ} setup --generate-completion fish > zellij.fish
+
+	mandown docs/MANPAGE.md > zellij.1
 }
 
 post_install() {
@@ -30,4 +33,5 @@ post_install() {
 
 	vlicense LICENSE.md
 	vdoc README.md
+	vman zellij.1
 }

From 6ab7740de60834be4d9bd5a292be644a9500bd44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 3 Apr 2022 12:56:10 +0200
Subject: [PATCH 0889/2561] lf: update to r27.

---
 srcpkgs/lf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 896673e297d6..00a4cbec79fb 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,6 +1,6 @@
 # Template file for 'lf'
 pkgname=lf
-version=r26
+version=r27
 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=dccd1ad67d2639e47fe0cbc93d74f202d6d6f0c3759fb0237affb7b1a2b1379e
+checksum=cdd132e33387423ef9f9448e21d3f1e5c9a5319b34fdfb53cb5f49351ebac005
 
 post_install() {
 	vlicense LICENSE

From 4f1837d1e4d4751f59a2679ec5aa7af2a3922fd6 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:34:52 +0300
Subject: [PATCH 0890/2561] skopeo: update to 1.6.2.

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index b568744c4b25..d8015fbcd92c 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.6.1
+version=1.6.2
 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=304016ec4eb802bf1e1b350854db50bdc99a93dcbcc71f9d531dbb916dc146f3
+checksum=48a1b3d18bde9d7af94756d546b0472e90416f05926281f7e533badfb5fcbd7b
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From 3d0847d936e159cd927233542f63753b0809907e Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:39:57 +0300
Subject: [PATCH 0891/2561] crun: update to 1.4.4.

---
 srcpkgs/crun/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 5b36ee6226bf..f08f3920334b 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=1.4
+version=1.4.4
 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=fbdf93c31e215c61a9cb97490527ec69c9993e369955e56b0d82cfedc32090ef
+checksum=49eeb7ed921428f06094ab02233bb2f95ddfc4bf59a40bcabe8a2823085a0c12
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"

From 13f8f8cd6251355b82d126b5341475635680a729 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:44:01 +0300
Subject: [PATCH 0892/2561] buildah: update to 1.24.3.

---
 srcpkgs/buildah/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index f3854fe931e7..b56a4ea1dff4 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,6 +1,6 @@
 # Template file for 'buildah'
 pkgname=buildah
-version=1.23.1
+version=1.24.3
 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="https://github.com/containers/buildah/archive/refs/tags/v${version}.tar.gz"
-checksum=a19eac2762afb0f83b9d5eec3c00e6ecd95d8d8083da599e894c712d9fb6af26
+checksum=664e2aec0e07df9668c6d41de540e84dc2447950cf952851ca9717a10cc46124
 
 post_build() {
 	make -C docs GOMD2MAN=go-md2man

From 12e3a9a6a13a7b2874d1997dfb1324ac31e78b3e Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:57:58 +0300
Subject: [PATCH 0893/2561] packer: update to 1.8.0.

---
 srcpkgs/packer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 09f3bc8a6a6a..5e39d679ec43 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,6 +1,6 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.7.10
+version=1.8.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/packer"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="http://www.packer.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=80ed60c492f6765265223f715f26529c8eeb5ce4cee9c4bd7372fd83a9e10493
+checksum=3df688cb488e746df529474f08a430adf0c7c839c4ed3de2022a094eadc515fd
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From 376c3f7d52f6dafb3d8ee593aa786e5a16669ee4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 26 Mar 2022 17:21:04 -0400
Subject: [PATCH 0894/2561] pango: update to 1.50.6.

---
 srcpkgs/pango/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index ff2978731c8c..4d410dbc72b0 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,6 +1,6 @@
 # Template file for 'pango'
 pkgname=pango
-version=1.50.3
+version=1.50.6
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,8 @@ license="LGPL-2.1-or-later"
 homepage="https://www.pango.org/"
 changelog="https://gitlab.gnome.org/GNOME/pango/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c
+checksum=a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a
+make_check=no  # doesn't pass its own tests
 
 # Package build options
 build_options="gir"

From 87c72c6f541b0a7ebd1a3830240b70f4b16d3343 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:46:51 +0200
Subject: [PATCH 0895/2561] libbsd: update to 0.11.6.

---
 srcpkgs/libbsd/patches/tests-musl.patch | 18 ------------------
 srcpkgs/libbsd/template                 |  4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/libbsd/patches/tests-musl.patch

diff --git a/srcpkgs/libbsd/patches/tests-musl.patch b/srcpkgs/libbsd/patches/tests-musl.patch
deleted file mode 100644
index ada3a923c879..000000000000
--- a/srcpkgs/libbsd/patches/tests-musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/test/fpurge.c
-+++ b/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 769256c0b9ae..6363215e4457 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -1,6 +1,6 @@
 # Template file for 'libbsd'
 pkgname=libbsd
-version=0.11.5
+version=0.11.6
 revision=1
 build_style=gnu-configure
 makedepends="libmd-devel"
@@ -9,7 +9,7 @@ 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=1a9c952525635c1bb6770cb22e969b938d8e6a9d7912362b98ee8370599b0efd
+checksum=19b38f3172eaf693e6e1c68714636190c7e48851e45224d720b3b5bc0499b5df
 
 post_install() {
 	vlicense COPYING

From 5767c78aa0de133c7db29857ba4068ac47e11f22 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:48:37 +0200
Subject: [PATCH 0896/2561] openfortivpn: update to 1.17.2.

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 46e3fb7900f8..64cbf60f2916 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=c674c59cf3201a55d56cb503053982752fb641b13a85ea406b8a7e7df301e30f
+checksum=0f3f3c767cb8bf81418a0fc7c6ab7636c574840c3b6a95c50901c3e1a09c079a
 
 conf_files="/etc/openfortivpn/config"
 

From 52275bcfd57e09c69d34b511e3cc040d15ad1bd6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:51:43 +0200
Subject: [PATCH 0897/2561] squashfs-tools-ng: update to 1.1.4.

---
 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 3a6e48497035..e05075284fc9 100644
--- a/srcpkgs/squashfs-tools-ng/template
+++ b/srcpkgs/squashfs-tools-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'squashfs-tools-ng'
 pkgname=squashfs-tools-ng
-version=1.1.3
+version=1.1.4
 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=abce0fcf9a8ae1c3352e4e5e87e1b077f54411da517332ea83b5e7ce948dd70d
+checksum=6f3f7864f17b250453df31fe3925ce7d1430cf6b1d514112641d734fe3c8f61a
 
 squashfs-tools-ng-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 768b19e142f62b6573a171eb7da6204fa2fe94cf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:53:42 +0200
Subject: [PATCH 0898/2561] youtube-viewer: update to 3.9.9.

---
 srcpkgs/youtube-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index bdf304f9de86..af6941e45319 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.7
+version=3.9.9
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=0b7ccf18e7aa71b2b82214e3a5614e3036bc98d94951b9bd7aba8da952486257
+checksum=29a326b6496bc6e96840d3c854d79a3ffb9e6006a033f11478c1633c1ac48a8b
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 42c066667a6a90fb8def1296741c8fec46100faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 2 Apr 2022 22:57:04 +0200
Subject: [PATCH 0899/2561] peshming: update to 0.5.0.

---
 srcpkgs/peshming/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template
index 299d243509fe..0b07235208a9 100644
--- a/srcpkgs/peshming/template
+++ b/srcpkgs/peshming/template
@@ -1,6 +1,6 @@
 # Template file for 'peshming'
 pkgname=peshming
-version=0.4.0
+version=0.5.0
 revision=1
 wrksrc="peshming"
 build_style=cargo
@@ -10,15 +10,26 @@ 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=fd2d3eae35746f513006a34757d00e50d15042df54187f886c553e748985319d
+checksum=9b737124e38d4dc6ac91f0e8bc07aab4d5acbbb019c544feb1aa92d6ab0ea8c5
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	ppc*) broken="missing AtomicU64";;
 esac
 
+pre_build() {
+	export PESHMING_MAN_DIR=man
+	export PESHMING_COMPLETIONS_DIR=completions
+}
+
 post_install() {
 	vlicense LICENSE
 	vdoc README.md
 	vsconf config.toml.sample
+
+	vcompletion "completions/_peshming" zsh
+	vcompletion "completions/peshming.fish" fish
+	vcompletion "completions/peshming.bash" bash
+
+	vman "man/peshming.1"
 }

From ac3d8054c83dc5b13e8a25687a8cc06270ab0526 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH 0900/2561] New package: dsda-doom-0.24.3

---
 srcpkgs/dsda-doom/patches/affinity-hack.patch | 165 ++++++++++++++++++
 srcpkgs/dsda-doom/template                    |  20 +++
 2 files changed, 185 insertions(+)
 create mode 100644 srcpkgs/dsda-doom/patches/affinity-hack.patch
 create mode 100644 srcpkgs/dsda-doom/template

diff --git a/srcpkgs/dsda-doom/patches/affinity-hack.patch b/srcpkgs/dsda-doom/patches/affinity-hack.patch
new file mode 100644
index 000000000000..2155ab116b82
--- /dev/null
+++ b/srcpkgs/dsda-doom/patches/affinity-hack.patch
@@ -0,0 +1,165 @@
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index d317ddec..c86f76b0 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -53,6 +53,15 @@ endif()
+ check_symbol_exists(getopt "unistd.h" HAVE_GETOPT)
+ check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
+ check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING)
++if(NOT WIN32)
++    set(CMAKE_REQUIRED_DEFINITIONS_PREV ${CMAKE_REQUIRED_DEFINITIONS})
++    set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE)
++    check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
++    set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_PREV})
++    if(HAVE_SCHED_SETAFFINITY)
++        add_definitions(-D_GNU_SOURCE)
++    endif()
++endif()
+ check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL)
+ check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+ 
+diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin
+index f92f3d88..2ad70033 100644
+--- a/prboom2/cmake/config.h.cin
++++ b/prboom2/cmake/config.h.cin
+@@ -11,6 +11,7 @@
+ #cmakedefine HAVE_GETOPT
+ #cmakedefine HAVE_MMAP
+ #cmakedefine HAVE_CREATE_FILE_MAPPING
++#cmakedefine HAVE_SCHED_SETAFFINITY
+ #cmakedefine HAVE_STRSIGNAL
+ #cmakedefine HAVE_MKSTEMP
+ 
+diff --git a/prboom2/src/SDL/i_main.c b/prboom2/src/SDL/i_main.c
+index 7537c53f..670f3dbd 100644
+--- a/prboom2/src/SDL/i_main.c
++++ b/prboom2/src/SDL/i_main.c
+@@ -45,6 +45,9 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask);
++#else
++#include <sched.h>
+ #endif
+ 
+ #include <errno.h>
+@@ -373,6 +376,83 @@ static void I_Quit (void)
+ uid_t stored_euid = -1;
+ #endif
+ 
++//
++// Ability to use only the allowed CPUs
++//
++
++static void I_SetAffinityMask(void)
++{
++  // This was only set for the sdl music backend,
++  //   but now the backend changes based on the music type.
++  // Not sure what the consequences are for this...
++  process_affinity_mask = 1;
++
++  // Set the process affinity mask so that all threads
++  // run on the same processor.  This is a workaround for a bug in
++  // SDL_mixer that causes occasional crashes.
++  if (process_affinity_mask)
++  {
++    const char *errbuf = NULL;
++#ifdef _WIN32
++    HMODULE kernel32_dll;
++    SetAffinityFunc SetAffinity = NULL;
++    int ok = false;
++
++    // Find the kernel interface DLL.
++    kernel32_dll = LoadLibrary("kernel32.dll");
++
++    if (kernel32_dll)
++    {
++      // Find the SetProcessAffinityMask function.
++      SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask");
++
++      // If the function was not found, we are on an old (Win9x) system
++      // that doesn't have this function.  That's no problem, because
++      // those systems don't support SMP anyway.
++
++      if (SetAffinity)
++      {
++        ok = SetAffinity(GetCurrentProcess(), process_affinity_mask);
++      }
++    }
++
++    if (!ok)
++    {
++      errbuf = WINError();
++    }
++#elif defined(HAVE_SCHED_SETAFFINITY)
++    // POSIX version:
++    int i;
++    {
++      cpu_set_t set;
++
++      CPU_ZERO(&set);
++
++      for(i = 0; i < 16; i++)
++      {
++        CPU_SET((process_affinity_mask>>i)&1, &set);
++      }
++
++      if (sched_setaffinity(getpid(), sizeof(set), &set) == -1)
++      {
++        errbuf = strerror(errno);
++      }
++    }
++#else
++    return;
++#endif
++
++    if (errbuf == NULL)
++    {
++      lprintf(LO_INFO, "I_SetAffinityMask: manual affinity mask is %d\n", process_affinity_mask);
++    }
++    else
++    {
++      lprintf(LO_ERROR, "I_SetAffinityMask: failed to set process affinity mask (%s)\n", errbuf);
++    }
++  }
++}
++
+ //
+ // Sets the priority class for the prboom-plus process
+ //
+@@ -482,6 +562,9 @@ int main(int argc, char **argv)
+   signal(SIGABRT, I_SignalHandler);
+ #endif
+ 
++  // Ability to use only the allowed CPUs
++  I_SetAffinityMask();
++
+   // Priority class for the prboom-plus process
+   I_SetProcessPriority();
+ 
+diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c
+index 5a564a5a..9b68aee7 100644
+--- a/prboom2/src/SDL/i_video.c
++++ b/prboom2/src/SDL/i_video.c
+@@ -895,6 +895,7 @@ static void I_ClosestResolution (int *width, int *height)
+   }
+ }
+ 
++int process_affinity_mask;
+ int process_priority;
+ 
+ // e6y
+diff --git a/prboom2/src/i_video.h b/prboom2/src/i_video.h
+index 46f0fb71..c39a197e 100644
+--- a/prboom2/src/i_video.h
++++ b/prboom2/src/i_video.h
+@@ -109,6 +109,8 @@ void I_UpdateRenderSize(void);	// Handle potential
+ extern int renderW;		// resolution scaling
+ extern int renderH;		// - DTIED
+ 
++// Set the process affinity mask so that all threads
++extern int process_affinity_mask;
+ // Priority class for the prboom-plus process
+ extern int process_priority;
+ // Use vanilla keybaord mapping
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..51dcbbf26d34
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,20 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=d4cfc82eea029068329d6b6a2dcbe0b316b31a60af12e6dc5ad3e1d2c359d913
+nocross=yes
+
+post_install() {
+	vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+	vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}

From 9bb15e4e9b7b00541b7cf2659b363cfc5dbe08ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Sun, 3 Apr 2022 04:24:39 +0200
Subject: [PATCH 0901/2561] wireplumber: update to 0.4.9

---
 srcpkgs/wireplumber/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index dadbf62647fb..acbffa27fd8c 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
-version=0.4.8
-revision=2
+version=0.4.9
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://pipewire.pages.freedesktop.org/wireplumber"
 changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
-checksum=a7a84c21230c339a905704a9495dda10a4dec41a96bc115a9b33d24310a3f605
+checksum=0b25774a2821286a1fa31afb7db8db0573f493b35c40a7031b6e5a30cec0bbe3
 
 post_install() {
 	vlicense LICENSE

From 17c524017aa74074d3f4700c267941f7a759564a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 Apr 2022 20:30:06 +0200
Subject: [PATCH 0902/2561] dhcpcd: fix privsep on ppc64le

---
 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch

diff --git a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
new file mode 100644
index 000000000000..38a4264a59cd
--- /dev/null
+++ b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
@@ -0,0 +1,23 @@
+commit 156383a2ff84c01b347579ec8651a0a21384adf4
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Sun Apr 3 20:18:51 2022 +0200
+
+    use correct SECCOMP_AUDIT_ARCH
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index 9534fb0..b866bce 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -213,7 +213,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
+ #elif defined(__or1k__)
+ #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
+ #elif defined(__powerpc64__)
+-#  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
++#  ifdef __LITTLE_ENDIAN__
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
++#  else
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
++#  endif
+ #elif defined(__powerpc__)
+ #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
+ #elif defined(__riscv)

From 9452711b98c739d9882b7673d1c69a01884b286a Mon Sep 17 00:00:00 2001
From: governorgoat <governorgoat@fastmail.com>
Date: Sat, 2 Apr 2022 22:04:52 -0400
Subject: [PATCH 0903/2561] cronie: update to 1.6.0

---
 srcpkgs/cronie/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template
index 6c1c7adb523d..526f59b4d835 100644
--- a/srcpkgs/cronie/template
+++ b/srcpkgs/cronie/template
@@ -1,6 +1,6 @@
 # Template file for 'cronie'
 pkgname=cronie
-version=1.5.7
+version=1.6.0
 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=538bcfaf2e986e5ae1edf6d1472a77ea8271d6a9005aee2497a9ed6e13320eb3
+checksum=3f7cc263d21838b53a9943eb2a26b862059e2ae36c3f11789ac33cd6818e3628
 make_dirs="
 	/etc/cron.d 0755 root root
 	/etc/cron.hourly 0755 root root

From b9702ab78bdd9574d37063b79c3c9bd4484999d7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:31:30 +0200
Subject: [PATCH 0904/2561] janet: update to 1.21.2.

---
 srcpkgs/janet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 4301ab90c751..8c3612e4dd77 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.21.1
+version=1.21.2
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=8c6eeabbc0c00ac901b66763676fa4bfdac96e5b6a3def85025b45126227c4e0
+checksum=52db8d18f93351256d0731810e8bea95516db8142f51eeb31664f7884bf63088
 
 post_install() {
 	vlicense LICENSE

From 417c6ee429f0143b514a265e62baa31c98de2ec5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:35:28 +0200
Subject: [PATCH 0905/2561] ugrep: update to 3.7.7.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 8af468ccc9bc..795927e8ab52 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.6
+version=3.7.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=8288af9eb9f5a5638134911e9e81c8b37d02f29223d473dd96a2046c228cd5d4
+checksum=5490d6491267bb1aaaeac27a0ba41d502f4b1c1b8998b8cc377c91374603932d
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From b53fba7fd7c22764c397cf7694747c103fe7ca54 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:35:30 +0200
Subject: [PATCH 0906/2561] netpbm: update to 10.98.0.0.

---
 .../netpbm/files/netpbm-security-code.patch   |  94 -------
 .../files/netpbm-security-scripts.patch       | 266 ------------------
 srcpkgs/netpbm/template                       |   6 +-
 3 files changed, 3 insertions(+), 363 deletions(-)
 delete mode 100644 srcpkgs/netpbm/files/netpbm-security-scripts.patch

diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch
index 408b566ef412..6f7c4976114b 100644
--- a/srcpkgs/netpbm/files/netpbm-security-code.patch
+++ b/srcpkgs/netpbm/files/netpbm-security-code.patch
@@ -804,65 +804,6 @@ diff -up netpbm-10.58.01/other/pnmcolormap.c.security-code netpbm-10.58.01/other
      }
      {
          unsigned int const intQuotient = colormap.size / pamP->width;
-diff -up netpbm-10.58.01/urt/README.security-code netpbm-10.58.01/urt/README
---- netpbm-10.58.01/urt/README.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/urt/README	2012-04-09 15:40:03.231619438 +0200
-@@ -18,3 +18,8 @@ in its initializer in the original.  But
- defines stdout as a variable, so that wouldn't compile.  So I changed
- it to NULL and added a line to rle_hdr_init to set that field to
- 'stdout' dynamically.  2000.06.02 BJH.
-+
-+Redid the code to check for maths overflows and other crawly horrors.
-+Removed pipe through and compress support (unsafe)
-+
-+Alan Cox <alan@redhat.com>
-diff -up netpbm-10.58.01/urt/rle_addhist.c.security-code netpbm-10.58.01/urt/rle_addhist.c
---- netpbm-10.58.01/urt/rle_addhist.c.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/urt/rle_addhist.c	2012-04-09 15:40:03.231619438 +0200
-@@ -14,6 +14,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_addhist.c - Add to the HISTORY comment in header
-@@ -71,13 +73,19 @@ rle_addhist(char *          argv[],
-         return;
-     
-     length = 0;
--    for (i = 0; argv[i]; ++i)
-+    for (i = 0; argv[i]; ++i) {
-+	overflow_add(length, strlen(argv[i]));
-+	overflow_add(length+1, strlen(argv[i]));
-         length += strlen(argv[i]) +1;   /* length of each arg plus space. */
-+    }
- 
-     time(&temp);
-     timedate = ctime(&temp);
-     length += strlen(timedate);        /* length of date and time in ASCII. */
- 
-+    overflow_add(strlen(padding), 4);
-+    overflow_add(strlen(histoire), strlen(padding) + 4);
-+    overflow_add(length, strlen(histoire) + strlen(padding) + 4);
-     length += strlen(padding) + 3 + strlen(histoire) + 1;
-         /* length of padding, "on "  and length of history name plus "="*/
-     if (in_hdr) /* if we are interested in the old comments... */
-@@ -85,9 +93,12 @@ rle_addhist(char *          argv[],
-     else
-         old = NULL;
-     
--    if (old && *old)
-+    if (old && *old) {
-+	overflow_add(length, strlen(old));
-         length += strlen(old);       /* add length if there. */
-+    }
- 
-+    overflow_add(length, 1);
-     ++length;                               /*Cater for the null. */
- 
-     MALLOCARRAY(newc, length);
 diff -up netpbm-10.58.01/urt/rle.h.security-code netpbm-10.58.01/urt/rle.h
 --- netpbm-10.58.01/urt/rle.h.security-code	2012-04-09 15:31:45.000000000 +0200
 +++ netpbm-10.58.01/urt/rle.h	2012-04-09 15:40:03.233619414 +0200
@@ -922,41 +863,6 @@ diff -up netpbm-9.58.01/urt/rle_putcom.c.security-code netpbm-10.58.01/urt/rle_p
          /* Not found */
          /* Can't realloc because somebody else might be pointing to this
           * comments block.  Of course, if this were true, then the
-diff -up netpbm-10.58.01/urt/Runput.c.security-code netpbm-10.58.01/urt/Runput.c
---- netpbm-10.58.01/urt/Runput.c.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/urt/Runput.c	2012-04-09 15:40:03.235619390 +0200
-@@ -17,6 +17,8 @@
-  *
-  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
-  *  to have all "void" functions so declared.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * Runput.c - General purpose Run Length Encoding.
-@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr)
-     if ( the_hdr->background != 0 )
-     {
- 	register int i;
--	register rle_pixel *background =
--	    (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
-+	register rle_pixel *background;
- 	register int *bg_color;
-+
-+	overflow_add(the_hdr->ncolors,1);
-+	background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
- 	/* 
- 	 * If even number of bg color bytes, put out one more to get to 
- 	 * 16 bit boundary.
-@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr)
- 	/* Big-endian machines are harder */
- 	register int i, nmap = (1 << the_hdr->cmaplen) *
- 			       the_hdr->ncmap;
--	register char *h_cmap = (char *)malloc( nmap * 2 );
-+	register char *h_cmap = (char *)malloc2( nmap, 2 );
- 	if ( h_cmap == NULL )
- 	{
- 	    fprintf( stderr,
 --- netpbm-10.58.01/lib/libpbm1.c.orig	2014-06-16 21:12:28.499230631 -0400
 +++ netpbm-10.58.01/lib/libpbm1.c	2014-06-16 21:12:55.932519324 -0400
 @@ -78,6 +78,7 @@
diff --git a/srcpkgs/netpbm/files/netpbm-security-scripts.patch b/srcpkgs/netpbm/files/netpbm-security-scripts.patch
deleted file mode 100644
index b26f1d4eac10..000000000000
--- a/srcpkgs/netpbm/files/netpbm-security-scripts.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ppmfade
---- netpbm-10.47.05/editor/ppmfade.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmfade	2010-03-16 21:28:09.000000000 +0100
-@@ -14,6 +14,7 @@
- #
- #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
- use strict;
-+use File::Temp "tempdir";
- 
- my $SPREAD =  1;
- my $SHIFT =   2;
-@@ -111,20 +112,26 @@ if ($first_file ne "undefined") {
- 
- print("Frames are " . $width . "W x " . $height . "H\n");
- 
-+#
-+# We create a tmp-directory right here
-+#
-+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
-+
-+
- if ($first_file eq "undefined") {
-     print "Fading from black to ";
--    system("ppmmake \\#000 $width $height >junk1$$.ppm");
-+    system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
- } else {
-     print "Fading from $first_file to ";
--    system("cp", $first_file, "junk1$$.ppm");
-+    system("cp", $first_file, "$tmpdir/junk1$$.ppm");
- }
- 
- if ($last_file eq "undefined") {
-     print "black.\n";
--    system("ppmmake \\#000 $width $height >junk2$$.ppm");
-+    system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
- } else {
-     print "$last_file\n";
--    system("cp", $last_file, "junk2$$.ppm");
-+    system("cp", $last_file, "$tmpdir/junk2$$.ppm");
- }
- 
- #
-@@ -132,14 +139,14 @@ if ($last_file eq "undefined") {
- #
- 
- # Here's what our temporary files are:
--#   junk1$$.ppm: The original (fade-from) image
--#   junk2$$.ppm: The target (fade-from) image
--#   junk3$$.ppm: The frame of the fade for the current iteration of the 
--#                the for loop.
--#   junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
--#                 image to another, this is the first frame of that 
--#                 sequence.
--#   junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
-+#   $tmpdir/junk1$$.ppm: The original (fade-from) image
-+#   $tmpdir/junk2$$.ppm: The target (fade-from) image
-+#   $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the 
-+#                	 the for loop.
-+#   $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
-+#                         image to another, this is the first frame of that 
-+#                         sequence.
-+#   $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
- 
- my $i;    # Frame number
- for ($i = 1; $i <= $nframes; $i++) {
-@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) {
-     if ($mode eq $SPREAD) {
-         if ($i <= 10) {
-             my $n = $spline20[$i] * 100;
--            system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
-+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n;
-             $n = $spline20[$i] * 100;
--            system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
-+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
-             $n = (1-$spline20[$i-10]) * 100;
--            system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
-+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
-             $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = (1-$spline20[$i-10])*100;
--            system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
-+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-     } elsif ($mode eq $SHIFT) {
-         if ($i <= 10) {
-             my $n = $spline20[$i] * 100;
--            system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
-+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n;
-             $n = $spline20[$i] * 100;
--            system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
-+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
-             $n = (1-$spline20[$i-10])*100;
--            system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
-+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
-             $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = (1-$spline20[$i-10]) * 100;
--            system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
-+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-     } elsif ($mode eq $RELIEF) {
-         if ($i == 1) {
--            system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
-+            system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
-+            system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
-         }
-     } elsif ($mode eq $OIL) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         }
-     } elsif ($mode eq $EDGE) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         } 
-     } elsif ($mode eq $BENTLEY) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         }
-     } elsif ($mode eq $BLOCK) {
-         if ($i <= 10) {
-             my $n = 1 - 1.9*$spline20[$i];
--            system("pamscale $n junk1$$.ppm | " .
--                   "pamscale -width $width -height $height >junk3$$.ppm");
-+            system("pamscale $n $tmpdir/junk1$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = 1 - 1.9*$spline20[31-$i];
--            system("pamscale $n junk2$$.ppm | " .
--                   "pamscale -width $width -height $height >junk3$$.ppm");
-+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("cp", "junk3$$.ppm", "junk1a$$.ppm");
--            system("pamscale $n junk2$$.ppm | " .
--                   "pamscale -width $width -height $height >junk2a$$.ppm");
-+            system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
-+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
-         }    
-     } elsif ($mode eq $MIX) {
-         my $fade_factor = sqrt(1/($nframes-$i+1));
--        system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
-+        system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-     } else {
-         print("Internal error: impossible mode value '$mode'\n");
-     }
- 
-     my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
--    system("cp", "junk3$$.ppm", $outfile);
-+    system("cp", "$tmpdir/junk3$$.ppm", $outfile);
- }
- 
- #
- #  Clean up shop.
- #
--system("rm junk*$$.ppm");
-+system("rm $tmpdir/junk*$$.ppm");
- 
- exit(0);
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index d72721bd9eb3..61728c4c7d28 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.97.06
+version=10.98.0.0
 revision=1
-_githash=f336dfc59346a26a045f7e0df0ecba32d904c55e
+_githash=772c4792d998deb70f1719c1a2ad82f2defde5f0
 _githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79
 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="9cd658ec9081b980a98fb44f02aa5289ba9ca17ad7e9a699627bf6f2a85c5612
+checksum="f53f8e57e1dec64edddec971f13a1cdcbc17d07110e4699b3090de7a79e3f75a
  30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde"
 
 post_extract() {

From d1f4d38ccb05d84962dfafbf910a759bc96d551c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:36:46 +0200
Subject: [PATCH 0907/2561] collectl: update to 4.3.3.

---
 srcpkgs/collectl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template
index 9ade016be223..ebc778450bc6 100644
--- a/srcpkgs/collectl/template
+++ b/srcpkgs/collectl/template
@@ -1,6 +1,6 @@
 # Template file for 'collectl'
 pkgname=collectl
-version=4.3.2
+version=4.3.3
 revision=1
 wrksrc="${pkgname}"
 conf_files="/etc/collectl.conf"
@@ -11,7 +11,7 @@ license="Artistic-1.0-Perl, GPL-2.0-only"
 homepage="http://collectl.sourceforge.net/"
 changelog="http://collectl.sourceforge.net/Releases.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.src.tar.gz"
-checksum=9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750
+checksum=3e87f9aa6cf1b585ce7cec6ee0e2cde652397fdf871b03b9609c56678f8b4dba
 
 do_install() {
 	export DESTDIR

From f5caa52d899cf6b3f2a244394a96ff9fa306281d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:37:24 +0200
Subject: [PATCH 0908/2561] skaffold: update to 1.37.1.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 4f54c6c05e98..faa9823d1cc6 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.37.0
+version=1.37.1
 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=a97a6f6cbf571f342183e5cf65c30932ade282b182fc92f108cb2a160a46779b
+checksum=8dfea015256761525d8c0e54713642bcd7ead3e3c96ff58e301d0b77b9ef3bd5

From 15c6a5c8166537510538fdae4cae80e4ee58046c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 19:11:39 +0200
Subject: [PATCH 0909/2561] twm: update to 1.0.12.

---
 srcpkgs/twm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/twm/template b/srcpkgs/twm/template
index 32a2efeeb004..94cbd1e4f511 100644
--- a/srcpkgs/twm/template
+++ b/srcpkgs/twm/template
@@ -1,6 +1,6 @@
 # Template file for 'twm'
 pkgname=twm
-version=1.0.11
+version=1.0.12
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros bison"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/twm.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
-checksum=f4e8a842dec410e79741f25ed4dfac09df080835d0bba2e3983b5914569b68c7
+checksum=aaf201d4de04c1bb11eed93de4bee0147217b7bdf61b7b761a56b2fdc276afe4
 
 post_install() {
 	vlicense COPYING

From 19e5c63ebfb530c2db28397032444bdc480fc94c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 3 Apr 2022 19:53:32 -0400
Subject: [PATCH 0910/2561] python3-progress: update to 1.6.

---
 srcpkgs/python3-progress/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-progress/template b/srcpkgs/python3-progress/template
index 4a4ec6e0a5a2..8883c784127f 100644
--- a/srcpkgs/python3-progress/template
+++ b/srcpkgs/python3-progress/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-progress'
 pkgname=python3-progress
-version=1.5
-revision=5
+version=1.6
+revision=1
 wrksrc="progress-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/verigak/progress"
 distfiles="${PYPI_SITE}/p/progress/progress-${version}.tar.gz"
-checksum=69ecedd1d1bbe71bf6313d88d1e6c4d2957b7f1d4f71312c211257f7dae64372
+checksum=c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd
+# Tests are only useful on interactive terminals
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 5ce3de8cd21767474fc91cb2d77190b370d74f55 Mon Sep 17 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, 3 Apr 2022 14:51:11 +0700
Subject: [PATCH 0911/2561] nss: update to 3.77.

---
 srcpkgs/nss/patches/cpputil-databuffer.patch | 20 --------------------
 srcpkgs/nss/template                         |  6 +++---
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/nss/patches/cpputil-databuffer.patch

diff --git a/srcpkgs/nss/patches/cpputil-databuffer.patch b/srcpkgs/nss/patches/cpputil-databuffer.patch
deleted file mode 100644
index 44dd3f467882..000000000000
--- a/srcpkgs/nss/patches/cpputil-databuffer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1758478
-diff --git a/nss/cpputil/databuffer.h b/nss/cpputil/databuffer.h
-index 8d34e1a..6aee509 100644
---- a/nss/cpputil/databuffer.h
-+++ b/nss/cpputil/databuffer.h
-@@ -33,11 +33,9 @@ class DataBuffer {
-     return *this;
-   }
-   DataBuffer& operator=(DataBuffer&& other) {
--    if (this == &other) {
--      data_ = other.data_;
--      len_ = other.len_;
--      other.data_ = nullptr;
--      other.len_ = 0;
-+    if (this != &other) {
-+      std::swap(data_, other.data_);
-+      std::swap(len_, other.len_);
-     }
-     return *this;
-   }
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index f85cfe79a868..5cc04daf52c2 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,9 +3,9 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.76
+version=3.77
 revision=1
-hostmakedepends="perl"
+hostmakedepends="perl which"
 makedepends="nspr-devel sqlite-devel zlib-devel"
 depends="nspr>=${_nsprver}"
 short_desc="Mozilla Network Security Services"
@@ -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=1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630
+checksum=825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 142c1bc67243fba677f952a75d4a67dc922de322 Mon Sep 17 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, 3 Apr 2022 18:16:39 +0700
Subject: [PATCH 0912/2561] ca-certificates: update to 20211016+3.77.

---
 srcpkgs/ca-certificates/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 450772d160e2..eaa70fc7a22b 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,6 +1,6 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
-version=20211016+3.74
+version=20211016+3.77
 revision=1
 _nss_version=${version#*+}
 bootstrap=yes
@@ -16,7 +16,7 @@ homepage="https://wiki.mozilla.org/NSS:Root_certs"
 distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz
  ${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz"
 checksum="2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88
- 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056"
+ 825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd"
 
 post_extract() {
 	cp ${FILESDIR}/* $build_wrksrc/mozilla

From 1e82e3150f1a92909828fc34767a8a91ab96c276 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 15:45:11 +0200
Subject: [PATCH 0913/2561] texlive2021-bin: use historic texlive repository.

As texlive2022 has been released the default repository no longer
contains the 2021 version. Make the installer use the frozen
historic one.
---
 srcpkgs/texlive2021-bin/INSTALL  | 4 ++--
 srcpkgs/texlive2021-bin/template | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive2021-bin/INSTALL b/srcpkgs/texlive2021-bin/INSTALL
index 9a5b1df97deb..bc296786a54e 100644
--- a/srcpkgs/texlive2021-bin/INSTALL
+++ b/srcpkgs/texlive2021-bin/INSTALL
@@ -5,10 +5,10 @@ post)
 		cd opt/texlive2021-installer
 		case "${ARCH}" in
 			x86_64-musl)
-			./install-tl -profile void.profile -force-platform x86_64-linuxmusl
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile -force-platform x86_64-linuxmusl
 			;;
 			*)
-			./install-tl -profile void.profile
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile
 			;;
 		esac
 	esac
diff --git a/srcpkgs/texlive2021-bin/template b/srcpkgs/texlive2021-bin/template
index 5c9e334c788e..c7bbe1f9fdb8 100644
--- a/srcpkgs/texlive2021-bin/template
+++ b/srcpkgs/texlive2021-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive2021-bin'
 pkgname=texlive2021-bin
 version=2021
-revision=1
+revision=2
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv

From 62a93144f49705bac558d5f9450c4bfd15e04a93 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 15:45:46 +0200
Subject: [PATCH 0914/2561] New package: texlive2022-bin-2022

---
 srcpkgs/texlive2022-bin/INSTALL            | 15 ++++++++
 srcpkgs/texlive2022-bin/INSTALL.msg        | 25 ++++++++++++
 srcpkgs/texlive2022-bin/REMOVE             |  8 ++++
 srcpkgs/texlive2022-bin/files/void.profile |  8 ++++
 srcpkgs/texlive2022-bin/template           | 45 ++++++++++++++++++++++
 5 files changed, 101 insertions(+)
 create mode 100644 srcpkgs/texlive2022-bin/INSTALL
 create mode 100644 srcpkgs/texlive2022-bin/INSTALL.msg
 create mode 100644 srcpkgs/texlive2022-bin/REMOVE
 create mode 100644 srcpkgs/texlive2022-bin/files/void.profile
 create mode 100644 srcpkgs/texlive2022-bin/template

diff --git a/srcpkgs/texlive2022-bin/INSTALL b/srcpkgs/texlive2022-bin/INSTALL
new file mode 100644
index 000000000000..890ae6709c6e
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/INSTALL
@@ -0,0 +1,15 @@
+case "${ACTION}" in
+post)
+	case "${UPDATE}" in
+	no)
+		cd opt/texlive2022-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/texlive2022-bin/INSTALL.msg b/srcpkgs/texlive2022-bin/INSTALL.msg
new file mode 100644
index 000000000000..05a58d965c72
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/INSTALL.msg
@@ -0,0 +1,25 @@
+- TeXLive is free software see the files:
+
+  /usr/share/licenses/texlive2022-bin/LICENSE.TL
+  /usr/share/licenses/texlive2022-bin/LICENSE.CTAN
+
+=====================================================================
+
+  To update you TeXLive installation use only the program 
+
+  /opt/texlive/2022/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/texlive2022-bin/REMOVE b/srcpkgs/texlive2022-bin/REMOVE
new file mode 100644
index 000000000000..82df92619ea7
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/REMOVE
@@ -0,0 +1,8 @@
+# This script will clear the TeXLive directory  
+#
+case "${ACTION}" in
+post)
+	rm -rf opt/texlive/2022
+	rm -r opt/texlive2022-installer
+	;;
+esac
diff --git a/srcpkgs/texlive2022-bin/files/void.profile b/srcpkgs/texlive2022-bin/files/void.profile
new file mode 100644
index 000000000000..17ad30ed523d
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/files/void.profile
@@ -0,0 +1,8 @@
+# texlive.profile written for voidlinux
+TEXDIR ../texlive/2022
+TEXMFCONFIG ~/.texlive2022/texmf-config
+TEXMFHOME ~/texmf
+TEXMFLOCAL ../texlive/texmf-local
+TEXMFSYSCONFIG ../texlive/2022/texmf-config
+TEXMFSYSVAR ../texlive/2022/texmf-var
+TEXMFVAR ~/.texlive2022/texmf-var
diff --git a/srcpkgs/texlive2022-bin/template b/srcpkgs/texlive2022-bin/template
new file mode 100644
index 000000000000..902d4dc245d7
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/template
@@ -0,0 +1,45 @@
+# Template file for 'texlive2022-bin'
+pkgname=texlive2022-bin
+version=2022
+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="https://tug.org/texlive/"
+distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
+checksum=e67edec49df6b7c4a987a7d5a9b31bcf41258220f9ac841c7a836080cd334fb5
+
+# 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 28c4cf8c981d13b79323a05961dcecff89925dff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:25:10 +0200
Subject: [PATCH 0915/2561] xcalc: update to 1.1.1.

---
 srcpkgs/xcalc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xcalc/template b/srcpkgs/xcalc/template
index d73849df763e..90be0b7c5028 100644
--- a/srcpkgs/xcalc/template
+++ b/srcpkgs/xcalc/template
@@ -1,6 +1,6 @@
 # Template file for 'xcalc'
 pkgname=xcalc
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -9,8 +9,8 @@ short_desc="Scientific calculator for X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xcalc.1.html"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=d5d746954465afc3da1f355d721882806568fb04b4d059c027702c0d16a3b5eb
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=8cb08212c5322e8043f39b28699e13a43f000976c90b3c7fadd4fae2766326b4
 
 post_install() {
 	vlicense COPYING

From 0f2cf4348d1f464de5792095d1e8a2283cf52384 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:26:24 +0200
Subject: [PATCH 0916/2561] xclock: update to 1.1.0.

---
 srcpkgs/xclock/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xclock/template b/srcpkgs/xclock/template
index 68650d8d3ce1..6d214076f834 100644
--- a/srcpkgs/xclock/template
+++ b/srcpkgs/xclock/template
@@ -1,6 +1,6 @@
 # Template file for 'xclock'
 pkgname=xclock
-version=1.0.9
+version=1.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -9,8 +9,8 @@ short_desc="Analog and digital clock for X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xclock.1.html"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=00d1be08b3471a16b1239acad11e26b80545c49c34d9d20deab0ce14515e098f
 
 post_install() {
 	vlicense COPYING

From 3fd421bae3205168eb4ba8d114ef79e0640f202e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:27:47 +0200
Subject: [PATCH 0917/2561] xdm: update to 1.1.13.

---
 srcpkgs/xdm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xdm/template b/srcpkgs/xdm/template
index 8eb910bf6c8b..3a53a7ae30cf 100644
--- a/srcpkgs/xdm/template
+++ b/srcpkgs/xdm/template
@@ -1,7 +1,7 @@
 # Template file for 'xdm'
 pkgname=xdm
-version=1.1.12
-revision=5
+version=1.1.13
+revision=1
 build_style=gnu-configure
 configure_args="--with-random-device=/dev/urandom
  --with-utmp-file=/var/run/utmp
@@ -21,8 +21,8 @@ short_desc="X Display Manager"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=e58267e8f1478f2f5cd57cbcf2367a36973860c3131a450a3e0816585af03264
 
 post_install() {
 	vsv xdm

From 6992e535c71bf4c4256c5d06af3c4d8dee09adb3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:30:19 +0200
Subject: [PATCH 0918/2561] xedit: update to 1.2.3.

---
 srcpkgs/xedit/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xedit/template b/srcpkgs/xedit/template
index 99f2001b1611..5cdfccdeb594 100644
--- a/srcpkgs/xedit/template
+++ b/srcpkgs/xedit/template
@@ -1,7 +1,7 @@
 # Template build file for 'xedit'.
 pkgname=xedit
-version=1.2.2
-revision=3
+version=1.2.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXaw-devel"
@@ -9,8 +9,8 @@ short_desc="Simple text editor for X"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=69aa42885dfc06332ca22eb01cc7187e49206e6d65b74113a8ee4cc345fc2927
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=bdd33afeeca881622e55d2cf28f07b4a98f083d0a2573c0b9048f25bdd62db2f
 
 post_install() {
 	vlicense COPYING

From 70176e41c511d7d0a49164a927964de32dfdd87b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:31:06 +0200
Subject: [PATCH 0919/2561] xload: update to 1.1.4.

---
 srcpkgs/xload/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xload/template b/srcpkgs/xload/template
index 74cbd8bbf5ed..ea85f0afcc45 100644
--- a/srcpkgs/xload/template
+++ b/srcpkgs/xload/template
@@ -1,6 +1,6 @@
 # Template file for 'xload'
 pkgname=xload
-version=1.1.3
+version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config xorg-util-macros"
@@ -9,8 +9,8 @@ short_desc="System load average display for X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11, MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xload.1.html"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f34e4803871d771325cfe52bebd98cc5b6040d3f065184ec73de436f9a375907
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=8346b99120db24e0f42920f7f12e23e9b1b407d3a66ce419990387b608373031
 
 post_install() {
 	vlicense COPYING

From 9390a38f11624205c410188bbeae915b9c329c78 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:32:57 +0200
Subject: [PATCH 0920/2561] xlsfonts: update to 1.0.7.

Adopted.
---
 srcpkgs/xlsfonts/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xlsfonts/template b/srcpkgs/xlsfonts/template
index 27caf717e52d..830ae67c26f0 100644
--- a/srcpkgs/xlsfonts/template
+++ b/srcpkgs/xlsfonts/template
@@ -1,16 +1,16 @@
-# Template build file for 'xlsfonts'.
+# Template file for 'xlsfonts'
 pkgname=xlsfonts
-version=1.0.6
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel"
 short_desc="Server font list displayer for X"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-checksum=89b80b3a030006ab6cef717be286c12f2477894b227158b1e6133274f6ebd368
+homepage="http://xorg.freedesktop.org"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=7b726945a967b44c35cddee5edd74802907a239ce2e2e515730b8a32c8e50465
 
 post_install() {
 	vlicense COPYING

From 14b284c2a91e6407ccc3dd36aaa3ad8faadebdfa Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 13 Oct 2021 08:31:15 -0400
Subject: [PATCH 0921/2561] python3-zeroconf: update to 0.38.4.

---
 srcpkgs/python3-zeroconf/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index a08bf018db1d..acae59ecd99f 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,20 +1,21 @@
 # Template file for 'python3-zeroconf'
 pkgname=python3-zeroconf
-version=0.30.0
-revision=2
+version=0.38.4
+revision=1
 wrksrc="python-zeroconf-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-ifaddr"
-checkdepends="python3-pytest python3-mypy $depends"
+checkdepends="python3-pytest python3-pytest-cov python3-mypy
+ python3-pytest-asyncio $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=bbb5e15625a96ac4dc4fba33519227ea8a6d1991000af51e976d01d2917a8d82
+checksum=74ead61490a7573d1cab1e9e9ea6fe846be0843c4ddd55633788d4670837c0eb
 
 do_check() {
 	# IPv6 doesn't work on github CI
-	SKIP_IPV6=1 python3 -m pytest zeroconf/test.py
+	SKIP_IPV6=1 python3 -m pytest tests/
 }

From a4862d5a3b9bfb35f838d70704263af5bab2b37a Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 00:04:32 -0400
Subject: [PATCH 0922/2561] chezmoi: update to 2.15.0.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 464d7ccc07ca..abf8ff70d40f 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.14.0
+version=2.15.0
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=4d7a1baf7e3caa8f6976b1ea5e6ba81c75273b1dd1f0fc946134a82454720397
+checksum=d33a5df53bde7b94962c39788e44af41e52a7836bc6d43168c9b324da966996e
 
 export CGO_ENABLED=1
 

From 6d760371d59b152b34861a06507dbfdf759e1908 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:29:38 +0200
Subject: [PATCH 0923/2561] apostrophe: update to 2.6.2.

---
 srcpkgs/apostrophe/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index d130b8694cd4..54a80188bdae 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,6 +1,6 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.6.1
+version=2.6.2
 revision=1
 wrksrc="$pkgname-v$version"
 build_style=meson
@@ -9,9 +9,10 @@ hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext sassc"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
 depends="python3-gobject python3-chardet python3-setuptools python3-pypandoc
  gspell iso-codes libhandy1 webkit2gtk"
-short_desc="GTK+ based distraction free Markdown editor"
+short_desc="GTK based distraction free Markdown editor"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/World/apostrophe"
+changelog="https://gitlab.gnome.org/World/apostrophe/-/raw/main/NEWS"
 distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz"
-checksum=f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c
+checksum=b06ca4593ceb21bcd7f9734e41ba3fb69f632b5ab24afcdc66500d18d242c068

From 01b6783c11bd4396336651435ce25d187b83ff19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:45:19 +0200
Subject: [PATCH 0924/2561] streamlink: update to 3.2.0.

---
 srcpkgs/streamlink/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index 3d168cc74c79..5b8427c56e96 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=3.1.1
+version=3.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
 distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz"
-checksum=855cd31e900e3ae1d5328a37123bfffe2aec501a1d74bcdd12f0d2a2758060e4
+checksum=9770d2d83844c5378a73e14130dcb760abc856566caa0a41fc5b97a0ded5d926
 make_check=ci-skip # some tests fail when running as root
 
 post_install() {

From d1d000a28a7c2addf106e72c0c8e432032b44dbd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:48:10 +0200
Subject: [PATCH 0925/2561] xorg-server-xwayland: update to 22.1.1.

---
 srcpkgs/xorg-server-xwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index 0506654b4ca5..9cb01b318ddb 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=22.1.0
+version=22.1.1
 revision=1
 wrksrc="xserver-xwayland-$version"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=972d5456445049855a669c1418f20ecbc290c85b1b59602a01c6afa199203389
+checksum=42837e7b90e0d92aff4d7846f0609f8d3c0c6641bdd6add6e4e0c5c214371149
 make_check=no # needs xtest repository
 
 post_install() {

From a479197456f6aeb6274f38a624c9d607985da97d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:48:34 +0200
Subject: [PATCH 0926/2561] lagrange: update to 1.11.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0da2bdd614fd..41a9f935f8eb 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.11.1
+version=1.11.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=a303f62b6e7372396d334f25eeaaa745827c28ac926dc12305b2b41596d748e8
+checksum=4e9a9ed38bcfc7b04856f0e2667d7afd535a8e06e367e2e4368ef5fb9105791f
 
 post_install() {
 	vlicense LICENSE.md

From dee6c4167e973b148d29a367a156edfba031bab3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:51:01 +0200
Subject: [PATCH 0927/2561] python3-charset-normalizer: update to 2.0.12.

---
 srcpkgs/python3-charset-normalizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template
index 16fbe97b2ef2..7c8809724b1b 100644
--- a/srcpkgs/python3-charset-normalizer/template
+++ b/srcpkgs/python3-charset-normalizer/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-charset-normalizer'
 pkgname=python3-charset-normalizer
-version=2.0.11
+version=2.0.12
 revision=1
 wrksrc="charset_normalizer-$version"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://charset-normalizer.readthedocs.io/"
 changelog="https://raw.githubusercontent.com/Ousret/charset_normalizer/master/CHANGELOG.md"
 distfiles="https://github.com/Ousret/charset_normalizer/archive/refs/tags/$version.tar.gz"
-checksum=d7188036dd61de0e626717d0b5fe6365beac7ea03c77b354e874a1098ed2b18a
+checksum=8dd3a1a5444741208d627993344516cb62909c8c3f5c55deaa5bee6a305ead7a
 
 pre_check() {
 	vsed -i "s/--cov=charset_normalizer --cov-report=term-missing//" setup.cfg

From 7e3ec1f9e1c31d0dd412f7505f97ff2f998135b6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:51:06 +0200
Subject: [PATCH 0928/2561] easyeffects: update to 6.2.4.

---
 srcpkgs/easyeffects/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index bc1aaffed675..ac84ce15b068 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,6 +1,6 @@
 # Template file for 'easyeffects'
 pkgname=easyeffects
-version=6.2.3
+version=6.2.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/wwmm/easyeffects"
 changelog="https://raw.githubusercontent.com/wwmm/easyeffects/master/CHANGELOG.md"
 distfiles="https://github.com/wwmm/easyeffects/archive/v${version}.tar.gz"
-checksum=525cb56847c5d85589a2351e012712ff7f66c951f530ba50f5acb86a988584aa
+checksum=2d4e5638f209a887acb73b3d2bbea4bc5f83ded866bba40c1935ec40fb17658b
 
 pulseeffects_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f2e8c6c1e8cc7a63d60a7b14479f4fff31b821d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 3 Apr 2022 12:00:11 -0300
Subject: [PATCH 0929/2561] New package: threejs-sage-r122

---
 srcpkgs/threejs-sage/template | 16 ++++++++++++++++
 srcpkgs/threejs-sage/update   |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/threejs-sage/template
 create mode 100644 srcpkgs/threejs-sage/update

diff --git a/srcpkgs/threejs-sage/template b/srcpkgs/threejs-sage/template
new file mode 100644
index 000000000000..cb5c87a19c12
--- /dev/null
+++ b/srcpkgs/threejs-sage/template
@@ -0,0 +1,16 @@
+# Template file for 'threejs-sage'
+pkgname=threejs-sage
+version=r122
+revision=1
+short_desc="Custom build of three.js for sagemath"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/sagemath/threejs-sage/"
+distfiles="https://github.com/sagemath/threejs-sage/archive/refs/tags/${version}.tar.gz"
+checksum=718767ab55876a3e957d1cfe89a322c6d9fa680fc737b9ca668aee6a3eac3bb8
+
+do_install() {
+	vlicense LICENSE
+	vinstall version 644 usr/share/sagemath/threejs-sage
+	vinstall build/three.min.js 644 usr/share/sagemath/threejs-sage/$version
+}
diff --git a/srcpkgs/threejs-sage/update b/srcpkgs/threejs-sage/update
new file mode 100644
index 000000000000..05c0c7ecebe1
--- /dev/null
+++ b/srcpkgs/threejs-sage/update
@@ -0,0 +1 @@
+site=https://mirrors.mit.edu/sage/spkg/upstream/threejs/

From 7c6e100bed78f75d5975d68d6fa99b0029cf6d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 28 Feb 2022 12:03:22 -0300
Subject: [PATCH 0930/2561] lrcalc: update to 2.1.

---
 common/shlibs                         |  2 +-
 srcpkgs/lrcalc/patches/includes.patch | 90 ---------------------------
 srcpkgs/lrcalc/template               |  6 +-
 3 files changed, 4 insertions(+), 94 deletions(-)
 delete mode 100644 srcpkgs/lrcalc/patches/includes.patch

diff --git a/common/shlibs b/common/shlibs
index 307cb13347fc..e7af88140d1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4040,7 +4040,7 @@ libarb.so.2 arb-2.20.0_1
 libec.so.8 eclib-20210625_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
-liblrcalc.so.1 lrcalc-1.2_1
+liblrcalc.so.2 lrcalc-2.1_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/lrcalc/patches/includes.patch b/srcpkgs/lrcalc/patches/includes.patch
deleted file mode 100644
index 707da176a60f..000000000000
--- a/srcpkgs/lrcalc/patches/includes.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 4a5e1c8c3c11efdb1cbb4239825a6bf4bf1c52f8 Mon Sep 17 00:00:00 2001
-From: Anders Skovsted Buch <asbuch@math.rutgers.edu>
-Date: Sun, 29 Nov 2015 16:25:56 -0500
-Subject: [PATCH] Patch by Jeroen Demeyer to change include <vector.h> to
- "vector.h", plus similar cases.
-
----
- src/lrcalc.c   | 2 +-
- src/maple.c    | 4 ++--
- src/schublib.h | 2 +-
- src/symfcn.c   | 6 +++---
- src/symfcn.h   | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/lrcalc.c b/src/lrcalc.c
-index aff3f75..60df49e 100644
---- a/src/lrcalc.c
-+++ b/src/lrcalc.c
-@@ -8,7 +8,7 @@
- #include <stdlib.h>
- extern char *optarg;
- 
--#include <vectarg.h>
-+#include "vectarg.h"
- 
- #include "symfcn.h"
- #include "maple.h"
-diff --git a/src/maple.c b/src/maple.c
-index fdc0768..a5f4d14 100644
---- a/src/maple.c
-+++ b/src/maple.c
-@@ -4,8 +4,8 @@
-  */
- 
- #include <stdio.h>
--#include <vector.h>
--#include <hashtab.h>
-+#include "vector.h"
-+#include "hashtab.h"
- #include "maple.h"
- 
- 
-diff --git a/src/schublib.h b/src/schublib.h
-index a8e8511..864850c 100644
---- a/src/schublib.h
-+++ b/src/schublib.h
-@@ -1,7 +1,7 @@
- #ifndef _SCHUBLIB_H
- #define _SCHUBLIB_H
- 
--#include <hashtab.h>
-+#include "hashtab.h"
- 
- hashtab *trans(vector *w, int vars, hashtab *res);
- hashtab *monk(int i, hashtab *slc, int rank);
-diff --git a/src/symfcn.c b/src/symfcn.c
-index 4ffbe4b..fd5df5d 100644
---- a/src/symfcn.c
-+++ b/src/symfcn.c
-@@ -5,9 +5,9 @@
- 
- #include <stdio.h>
- 
--#include <alloc.h>
--#include <vector.h>
--#include <hashtab.h>
-+#include "alloc.h"
-+#include "vector.h"
-+#include "hashtab.h"
- 
- #include "symfcn.h"
- 
-diff --git a/src/symfcn.h b/src/symfcn.h
-index b8543b1..29bb00d 100644
---- a/src/symfcn.h
-+++ b/src/symfcn.h
-@@ -1,8 +1,8 @@
- #ifndef _SYMFCN_H
- #define _SYMFCN_H
- 
--#include <hashtab.h>
--#include <vector.h>
-+#include "hashtab.h"
-+#include "vector.h"
- 
- int part_itr_sz(vector *part);
- int part_itr_sub(vector *part, vector *outer);
--- 
-2.1.1.1.g1fb337f
-
diff --git a/srcpkgs/lrcalc/template b/srcpkgs/lrcalc/template
index 8b33c3cba6c8..afa889b6d6ad 100644
--- a/srcpkgs/lrcalc/template
+++ b/srcpkgs/lrcalc/template
@@ -1,14 +1,14 @@
 # Template file for 'lrcalc'
 pkgname=lrcalc
-version=1.2
-revision=2
+version=2.1
+revision=1
 build_style=gnu-configure
 short_desc="Littlewood-Richardson Calculator"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-or-later"
 homepage="https://sites.math.rutgers.edu/~asbuch/lrcalc/"
 distfiles="https://sites.math.rutgers.edu/~asbuch/lrcalc/lrcalc-$version.tar.gz"
-checksum=792dd538a0d19698be2c5b8c138730bbb4820e8a44e03b001ae14bd5f1d7040b
+checksum=996ac00e6ea8321ef09b34478f5379f613933c3254aeba624b6419b8afa5df57
 
 lrcalc-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 0fc4b2913662b329e75323bc4aa2cae64d2703b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 28 Feb 2022 14:06:21 -0300
Subject: [PATCH 0931/2561] New package: python3-lrcalc-2.1

---
 srcpkgs/python3-lrcalc/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-lrcalc/template

diff --git a/srcpkgs/python3-lrcalc/template b/srcpkgs/python3-lrcalc/template
new file mode 100644
index 000000000000..9f335dac35dd
--- /dev/null
+++ b/srcpkgs/python3-lrcalc/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-lrcalc'
+pkgname=python3-lrcalc
+version=2.1
+revision=1
+wrksrc=lrcalc-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel lrcalc-devel"
+short_desc="Python bindings for the Littlewood-Richardson Calculator library"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-or-later"
+homepage="https://math.rutgers.edu/~asbuch/lrcalc"
+distfiles="${PYPI_SITE}/l/lrcalc/lrcalc-${version}.tar.gz"
+checksum=e3a0509aeda487b412b391a52e817ca36b5c063a8305e09fd54d53259dd6aaa9

From 430a5b0eb620eeaae7a4ca35cf3cd8c0e06dc9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 22 Jan 2022 16:35:34 -0300
Subject: [PATCH 0932/2561] lcalc: ignore a version irrelevant for us

---
 srcpkgs/lcalc/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/lcalc/update

diff --git a/srcpkgs/lcalc/update b/srcpkgs/lcalc/update
new file mode 100644
index 000000000000..4cfe261c03b8
--- /dev/null
+++ b/srcpkgs/lcalc/update
@@ -0,0 +1,2 @@
+# this version only adds a fix for cygwin
+ignore=2.0.5

From ceb44152a82c802f432c873fbdad749bb77e3042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 22 Jan 2022 16:35:20 -0300
Subject: [PATCH 0933/2561] python3-gmpy2: ignore a version irrelevant for us

---
 srcpkgs/python3-gmpy2/update | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/python3-gmpy2/update b/srcpkgs/python3-gmpy2/update
index b5703618d280..0d9a7f7d2018 100644
--- a/srcpkgs/python3-gmpy2/update
+++ b/srcpkgs/python3-gmpy2/update
@@ -1 +1,3 @@
 ignore="*a[1-9] *b[1-9] *rc[1-9]"
+# this version only adds binary wheels for apple silicon
+ignore="$ignore 2.1.2"

From fb88da191774b937be7923ef452fb4f68bbce14a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 28 Feb 2022 14:06:28 -0300
Subject: [PATCH 0934/2561] sagemath: rebuild for package updates

 - compatibility with lrcalc 2.1 (trac #31355)
 - fix doctests for ipython-8.1 (trac #33170)
 - fix doctests for scipy-1.8 (trac #33336)
 - fix doctests for sympy-1.10 (trac #33398)
 - fix doctests when sphinx is installed (trac #33585)
 - use new package threejs-sage for 3d plots
---
 .../trac-31355-upgrade_lrcalc_to_2.1.patch    | 670 ++++++++++++++++++
 .../trac-33170-fix_doctest_ipython_8.patch    |  40 ++
 .../trac-33170b-fix_doctest_ipython_8.1.patch |  13 +
 .../trac-33336-fix_doctest_scipy_1.8.patch    |  19 +
 ...d9deaeaa6380ab2f0d50276d911233c00a04.patch |  99 +++
 ...ff347454ac7f07e5918470b20e97b8f2357e.patch |  29 +
 ...0a0b14f67f4804e7113c3db41bbcf8a58296.patch |  26 +
 .../patches/zzz-skip_doctest_no_threejs.patch |  13 -
 srcpkgs/sagemath/template                     |   9 +-
 9 files changed, 901 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch
 delete mode 100644 srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch

diff --git a/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch b/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch
new file mode 100644
index 000000000000..4bd6f4f4e2dc
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch
@@ -0,0 +1,670 @@
+As produced by `git diff 9.5 9.6.beta3 -- src/sage/libs/lrcalc`
+
+diff --git a/src/sage/libs/lrcalc/lrcalc.pxd b/src/sage/libs/lrcalc/lrcalc.pxd
+deleted file mode 100644
+index 10b88db93f2..00000000000
+--- a/src/sage/libs/lrcalc/lrcalc.pxd
++++ /dev/null
+@@ -1,77 +0,0 @@
+-# distutils: libraries = lrcalc
+-
+-cdef extern from "lrcalc/hashtab.h":
+-    ctypedef struct hashtab:
+-        pass
+-
+-    ctypedef struct hash_itr:
+-        pass
+-
+-    ctypedef unsigned long hashkey_t
+-    ctypedef int (*cmp_t) (void* a, void* b)
+-    ctypedef hashkey_t (*hash_t) (void* a)
+-
+-    hashtab* hash_new(cmp_t cm, hash_t hsh)
+-    void hash_free(hashtab *ht)
+-
+-    void* hash_lookup(hashtab *ht, void *key)
+-    void* hash_insert(hashtab *ht, void *key, void *value)
+-
+-    bint hash_good(hash_itr)
+-    void hash_first(hashtab* s, hash_itr itr)
+-    void hash_next(hash_itr itr)
+-    void* hash_key(hash_itr itr)
+-    void* hash_value(hash_itr itr)
+-    int hash_intvalue(hash_itr itr)
+-
+-cdef extern from "lrcalc/vector.h":
+-    ctypedef struct vector:
+-        size_t length
+-        int* array
+-
+-    vector* v_new(int length)
+-    void v_free(vector* v)
+-    void v_print(vector *v)
+-    int v_length(vector* v)
+-    int v_elem(vector* v, int i)
+-
+-    ctypedef struct vecpair:
+-        vector *first
+-        vector *second
+-
+-    vector* vp_first(vecpair* vp)
+-    vector* vp_second(vecpair* vp)
+-
+-cdef extern from "lrcalc/list.h":
+-    cdef struct _list:
+-        void **array
+-        size_t allocated
+-        size_t length
+-    void l_free(_list *lst)
+-
+-cdef extern from "lrcalc/symfcn.h":
+-    long long lrcoef_c "lrcoef"(vector* outer, vector* inner1, vector* inner2)
+-    hashtab* mult_c "mult"(vector *sh1, vector *sh2, int maxrows)
+-    hashtab* skew_c "skew"(vector *outer, vector *inner, int maxrows)
+-    hashtab* coprod_c "coprod"(vector *part, int all)
+-    void fusion_reduce_c "fusion_reduce"(hashtab* ht, int rows, int cols, int opt_zero)
+-    _list *quantum_reduce_c "quantum_reduce"(hashtab* ht, int rows, int col)
+-
+-    ctypedef struct skewtab:
+-        vector *outer
+-        vector *inner
+-        vector *conts
+-        int maxrows
+-        vector *conjugate
+-        int rows
+-        int cols
+-        int matrix[1]
+-
+-    skewtab *st_new(vector *outer, vector *inner, vector *conts, int maxrows)
+-    int st_next(skewtab *st)
+-    void st_print(skewtab *st)
+-    void st_free(skewtab *st)
+-
+-
+-cdef extern from "lrcalc/schublib.h":
+-    hashtab* mult_schubert_c "mult_schubert"(vector *sh1, vector *sh2, int rank)
+diff --git a/src/sage/libs/lrcalc/lrcalc.pyx b/src/sage/libs/lrcalc/lrcalc.py
+similarity index 60%
+rename from src/sage/libs/lrcalc/lrcalc.pyx
+rename to src/sage/libs/lrcalc/lrcalc.py
+index b591081ec4c..b541bfacd89 100644
+--- a/src/sage/libs/lrcalc/lrcalc.pyx
++++ b/src/sage/libs/lrcalc/lrcalc.py
+@@ -10,7 +10,8 @@ fusion products. All of the above are achieved by counting LR
+ appropriate shape and content by iterating through them.
+ Additionally, ``lrcalc`` handles products of Schubert polynomials.
+ 
+-The web page of ``lrcalc`` is `<http://sites.math.rutgers.edu/~asbuch/lrcalc/>`_.
++The web page of ``lrcalc`` is
++`<http://sites.math.rutgers.edu/~asbuch/lrcalc/>`_.
+ 
+ The following describes the Sage interface to this library.
+ 
+@@ -36,12 +37,13 @@ Schur expansion::
+      [4, 2]: 1}
+ 
+ Same product, but include only partitions with at most 3 rows.  This
+-corresponds to computing in the representation ring of gl(3)::
++corresponds to computing in the representation ring of `\mathfrak{gl}(3)`::
+ 
+     sage: lrcalc.mult([2,1], [2,1], 3)
+     {[2, 2, 2]: 1, [3, 2, 1]: 2, [3, 3]: 1, [4, 1, 1]: 1, [4, 2]: 1}
+ 
+-We can also compute the fusion product, here for sl(3) and level 2::
++We can also compute the fusion product, here for `\mathfrak{sl}(3)`
++and level 2::
+ 
+     sage: lrcalc.mult([3,2,1], [3,2,1], 3,2)
+     {[4, 4, 4]: 1, [5, 4, 3]: 1}
+@@ -77,42 +79,38 @@ Multiply two Schubert polynomials::
+      [6, 2, 1, 4, 3, 5]: 1}
+ 
+ Same product, but include only permutations of 5 elements in the result.
+-This corresponds to computing in the cohomology ring of Fl(5)::
++This corresponds to computing in the cohomology ring of `Fl(5)`::
+ 
+     sage: lrcalc.mult_schubert([4,2,1,3], [1,4,2,5,3], 5)
+     {[4, 5, 1, 3, 2]: 1, [5, 3, 1, 4, 2]: 1, [5, 4, 1, 2, 3]: 1}
+ 
+ List all Littlewood-Richardson tableaux of skew shape `\mu/\nu`; in
+ this example `\mu=[3,2,1]` and `\nu=[2,1]`. Specifying a third entry
+-`maxrows` restricts the alphabet to `\{1,2,\ldots,maxrows\}`::
++`M' = ``maxrows`` restricts the alphabet to `\{1,2,\ldots,M\}`::
+ 
+     sage: list(lrcalc.lrskew([3,2,1],[2,1]))
+     [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]],
+     [[None, None, 1], [None, 2], [1]], [[None, None, 1], [None, 2], [3]]]
+ 
+     sage: list(lrcalc.lrskew([3,2,1],[2,1],maxrows=2))
+-    [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]], [[None, None, 1], [None, 2], [1]]]
++    [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]],
++     [[None, None, 1], [None, 2], [1]]]
+ 
+ .. TODO::
+ 
+-    use this library in the :class:`SymmetricFunctions` code, to
++    Use this library in the :class:`SymmetricFunctions` code, to
+     make it easy to apply it to linear combinations of Schur functions.
+ 
+ .. SEEALSO::
+ 
+     - :func:`lrcoef`
+-
+     - :func:`mult`
+-
+     - :func:`coprod`
+-
+     - :func:`skew`
+-
+     - :func:`lrskew`
+-
+     - :func:`mult_schubert`
+ 
+-.. rubric:: Underlying algorithmic in lrcalc
++.. RUBRIC:: Underlying algorithmic in lrcalc
+ 
+ Here is some additional information regarding the main low-level
+ C-functions in `lrcalc`. Given two partitions ``outer`` and ``inner``
+@@ -187,180 +185,24 @@ AUTHORS:
+ #                  https://www.gnu.org/licenses/
+ # ****************************************************************************
+ 
+-from sage.rings.integer cimport Integer
+-from sage.structure.parent cimport Parent
+ from sage.combinat.partition import _Partitions
+ from sage.combinat.permutation import Permutation
+-from sage.combinat.skew_tableau import SkewTableau
+-
+-
+-cdef vector* iterable_to_vector(it):
+-    """
+-    Return an lrcalc vector (which is a list of integers) from a Python iterable.
+-
+-    TESTS::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector
+-        sage: x = test_iterable_to_vector(Partition([3,2,1])); x   #indirect doctest
+-        [3, 2, 1]
+-    """
+-    cdef vector* v
+-    cdef list itr = list(it)
+-    cdef int n = len(itr)
+-    cdef int i
+-    v = v_new(n)
+-    for i in range(n):
+-        v.array[i] = int(itr[i])
+-    return v
+-
+-
+-cdef list vector_to_list(vector *v):
+-    """
+-    Converts a lrcalc vector to Python list.
+-
+-    TESTS::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector
+-        sage: x = test_iterable_to_vector([]); x         #indirect doctest
+-        []
+-    """
+-    cdef int i, n
+-    n = v_length(v)
+-    cdef list result = [None]*n
+-    for i in range(n):
+-        result[i] = Integer(v_elem(v, i))
+-    return result
+-
+-
+-def test_iterable_to_vector(it):
+-    """
+-    A wrapper function for the cdef function ``iterable_to_vector``
+-    and ``vector_to_list``, to test that they are working correctly.
++from sage.combinat.skew_tableau import SemistandardSkewTableaux
++from sage.combinat.skew_partition import SkewPartition
++from sage.rings.integer import Integer
++import lrcalc
+ 
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector
+-        sage: x = test_iterable_to_vector([3,2,1]); x
+-        [3, 2, 1]
+-    """
+-    cdef vector *v = iterable_to_vector(it)
+-    result = vector_to_list(v)
+-    v_free(v)
+-    return result
+-
+-
+-cdef skewtab_to_SkewTableau(skewtab *st):
+-    """
+-    A wrapper function which transforms the data set ``st`` used in
+-    ``lrcalc`` to a ``SkewTableau`` in Sage.
++def _lrcalc_dict_to_sage(result):
++    r"""
++    Translate from lrcalc output format to Sage expected format.
+ 
+     TESTS::
+ 
+-        sage: from sage.libs.lrcalc.lrcalc import test_skewtab_to_SkewTableau
+-        sage: test_skewtab_to_SkewTableau([],[])
+-        []
+-    """
+-    inner = vector_to_list(st.inner)
+-    outer = vector_to_list(st.outer)
+-    return SkewTableau(expr=[[inner[y] for y in range(len(outer))],
+-                             [[st.matrix[x + y * st.cols] + 1
+-                                for x in range(inner[y], outer[y])]
+-                              for y in range(len(outer) - 1, -1, -1)]])
+-
+-
+-def test_skewtab_to_SkewTableau(outer, inner):
+-    """
+-    A wrapper function for the cdef function ``skewtab_to_SkewTableau``
+-    for testing purposes.
+-
+-    It constructs the first LR skew tableau of shape ``outer/inner``
+-    as an ``lrcalc`` ``skewtab``, and converts it to a
+-    :class:`SkewTableau`.
+-
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_skewtab_to_SkewTableau
+-        sage: test_skewtab_to_SkewTableau([3,2,1],[])
+-        [[1, 1, 1], [2, 2], [3]]
+-        sage: test_skewtab_to_SkewTableau([4,3,2,1],[1,1]).pp()
+-        .  1  1  1
+-        .  2  2
+-        1  3
+-        2
+-    """
+-    cdef vector* o = iterable_to_vector(outer)
+-    cdef vector* i = iterable_to_vector(inner+[0]*(len(outer)-len(inner)))
+-    cdef skewtab* st = st_new(o, i, NULL, 0)
+-    return skewtab_to_SkewTableau(st)
+-
+-
+-cdef dict sf_hashtab_to_dict(hashtab *ht):
+-    """
+-    Return a dictionary representing a Schur function. The keys are
+-    partitions and the values are integers <class 'sage.rings.integer.Integer'>.
+-
+-    EXAMPLES::
+-
+         sage: from sage.libs.lrcalc.lrcalc import mult
+-        sage: sorted(mult([1],[1]).items())        #indirect doctest
+-        [([1, 1], 1), ([2], 1)]
+-        sage: assert isinstance(mult([1],[1]),dict)#indirect doctest
+-    """
+-    cdef hash_itr itr
+-    cdef dict result = {}
+-    cdef list p
+-    hash_first(ht, itr)
+-    while hash_good(itr):
+-        p = vector_to_list(<vector*> hash_key(itr))
+-        result[_Partitions(p)] = Integer(hash_intvalue(itr))
+-        hash_next(itr)
+-    return result
+-
+-
+-cdef dict schubert_hashtab_to_dict(hashtab *ht):
+-    """
+-    Return a dictionary corresponding to a Schubert polynomial whose keys
+-    are permutations and whose values are integers <class 'sage.rings.integer.Integer'>.
+-
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import mult_schubert
+-        sage: mult_schubert([3,2,1], [1,2,3])      #indirect doctest
+-        {[3, 2, 1]: 1}
+-    """
+-    cdef hash_itr itr
+-    cdef dict result = {}
+-    hash_first(ht, itr)
+-    while hash_good(itr):
+-        p = vector_to_list(<vector*> hash_key(itr))
+-        result[Permutation(p)] = Integer(hash_intvalue(itr))
+-        hash_next(itr)
+-    return result
+-
+-
+-cdef dict vp_hashtab_to_dict(hashtab *ht):
+-    """
+-    Return a dictionary corresponding to the coproduct of a Schur function whose keys are
+-    pairs of partitions and whose values are integers <class 'sage.rings.integer.Integer'>.
+-
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import coprod
+-        sage: coprod([1])      #indirect doctest
+-        {([1], []): 1}
++        sage: mult([2,1],[3,2,1],3) # indirect doctest
++        {[3, 3, 3]: 1, [4, 3, 2]: 2, [4, 4, 1]: 1, [5, 2, 2]: 1, [5, 3, 1]: 1}
+     """
+-    cdef hash_itr itr
+-    cdef vecpair* vp
+-    cdef dict result = {}
+-    hash_first(ht, itr)
+-    while hash_good(itr):
+-        vp = <vecpair*> hash_key(itr)
+-        p1 = _Partitions(vector_to_list(vp_first(vp)))
+-        p2 = _Partitions(vector_to_list(vp_second(vp)))
+-        result[(p1, p2)] = Integer(hash_intvalue(itr))
+-        hash_next(itr)
+-    return result
+-
++    return {_Partitions(la): Integer(k) for la, k in result.items()}
+ 
+ def lrcoef_unsafe(outer, inner1, inner2):
+     r"""
+@@ -371,13 +213,11 @@ def lrcoef_unsafe(outer, inner1, inner2):
+ 
+     INPUT:
+ 
+-    - ``outer`` -- a partition (weakly decreasing list of non-negative integers).
+-
+-    - ``inner1`` -- a partition.
++    - ``outer`` -- a partition (weakly decreasing list of non-negative integers)
++    - ``inner1`` -- a partition
++    - ``inner2`` -- a partition
+ 
+-    - ``inner2`` -- a partition.
+-
+-    .. warning::
++    .. WARNING::
+ 
+        This function does not do any check on its input.  If you want
+        to use a safer version, use :func:`lrcoef`.
+@@ -392,18 +232,7 @@ def lrcoef_unsafe(outer, inner1, inner2):
+         sage: lrcoef_unsafe([2,1,1,1,1], [2,1], [2,1])
+         0
+     """
+-    cdef long long result
+-    cdef vector *o
+-    cdef vector *i1
+-    cdef vector *i2
+-    o = iterable_to_vector(outer)
+-    i1 = iterable_to_vector(inner1)
+-    i2 = iterable_to_vector(inner2)
+-    result = lrcoef_c(o, i1, i2)
+-    v_free(o)
+-    v_free(i1)
+-    v_free(i2)
+-    return Integer(result)
++    return Integer(lrcalc.lrcoef(outer, inner1, inner2))
+ 
+ 
+ def lrcoef(outer, inner1, inner2):
+@@ -415,11 +244,9 @@ def lrcoef(outer, inner1, inner2):
+ 
+     INPUT:
+ 
+-    - ``outer`` -- a partition (weakly decreasing list of non-negative integers).
+-
+-    - ``inner1`` -- a partition.
+-
+-    - ``inner2`` -- a partition.
++    - ``outer`` -- a partition (weakly decreasing list of non-negative integers)
++    - ``inner1`` -- a partition
++    - ``inner2`` -- a partition
+ 
+     .. NOTE::
+ 
+@@ -436,7 +263,6 @@ def lrcoef(outer, inner1, inner2):
+         1
+         sage: lrcoef([2,1,1,1,1], [2,1], [2,1])
+         0
+-
+     """
+     return lrcoef_unsafe(_Partitions(outer), _Partitions(inner1), _Partitions(inner2))
+ 
+@@ -451,13 +277,9 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None):
+     INPUT:
+ 
+     - ``part1`` -- a partition
+-
+     - ``part2`` -- a partition
+-
+     - ``maxrows`` -- (optional) an integer
+-
+     - ``level`` -- (optional) an integer
+-
+     - ``quantum`` -- (optional) an element of a ring
+ 
+     If ``maxrows`` is specified, then only partitions with at most
+@@ -479,7 +301,8 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None):
+         sage: sorted(mult([2],[2]).items())
+         [([2, 2], 1), ([3, 1], 1), ([4], 1)]
+         sage: sorted(mult([2,1],[2,1]).items())
+-        [([2, 2, 1, 1], 1), ([2, 2, 2], 1), ([3, 1, 1, 1], 1), ([3, 2, 1], 2), ([3, 3], 1), ([4, 1, 1], 1), ([4, 2], 1)]
++        [([2, 2, 1, 1], 1), ([2, 2, 2], 1), ([3, 1, 1, 1], 1),
++         ([3, 2, 1], 2), ([3, 3], 1), ([4, 1, 1], 1), ([4, 2], 1)]
+         sage: sorted(mult([2,1],[2,1],maxrows=2).items())
+         [([3, 3], 1), ([4, 2], 1)]
+         sage: mult([2,1],[3,2,1],3)
+@@ -510,44 +333,24 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None):
+     if quantum is not None and (level is None or maxrows is None):
+         raise ValueError('missing parameters maxrows or level')
+ 
+-    cdef vector* v1 = iterable_to_vector(part1)
+-    cdef vector* v2 = iterable_to_vector(part2)
+-    if maxrows is None:
+-        maxrows = 0
+-    cdef hashtab* ht = mult_c(v1, v2, int(maxrows))
+-    cdef hashtab* tab
+-    cdef dict result
+-
+     if quantum is None:
+         if level is not None:
+-            fusion_reduce_c(ht, int(maxrows), int(level), int(0))
+-        result = sf_hashtab_to_dict(ht)
+-        v_free(v1)
+-        v_free(v2)
+-        hash_free(ht)
+-        return result
++            return _lrcalc_dict_to_sage(lrcalc.mult_fusion(part1, part2, maxrows, level))
++        if maxrows is None:
++            maxrows = -1
++        return _lrcalc_dict_to_sage(lrcalc.mult(part1, part2, maxrows))
+ 
+     # Otherwise do quantum multiplication
+-    cdef _list *qlist
+-    cdef dict temp
+-    qlist = quantum_reduce_c(ht, int(maxrows), int(level))
+-    # The above call frees the memory associated with ht
+-    v_free(v1)
+-    v_free(v2)
+-
+-    cdef Parent P = quantum.parent()
+-    result = {}
+-    for i in range(qlist.length):
+-        tab = <hashtab*>(qlist.array[i])
+-        temp = sf_hashtab_to_dict(tab)
+-        for k in temp:
+-            result[k] = result.get(k, P.zero()) + quantum**i * temp[k]
+-        hash_free(tab)
+-    l_free(qlist)
+-    return result
+-
+-
+-def skew(outer, inner, maxrows=0):
++    result = lrcalc.mult_quantum(part1, part2, maxrows, level, degrees=True)
++    P = quantum.parent()
++    output = {}
++    for i,k in result.items():
++        la = _Partitions(i[0])
++        output[la] = output.get(la, P.zero()) + k * quantum**(i[1])
++    return output
++
++
++def skew(outer, inner, maxrows=-1):
+     """
+     Compute the Schur expansion of a skew Schur function.
+ 
+@@ -557,11 +360,9 @@ def skew(outer, inner, maxrows=0):
+ 
+     INPUT:
+ 
+-    - ``outer`` -- a partition.
+-
+-    - ``inner`` -- a partition.
+-
+-    - ``maxrows`` -- an integer or ``None``.
++    - ``outer`` -- a partition
++    - ``inner`` -- a partition
++    - ``maxrows`` -- an integer or ``None``
+ 
+     If ``maxrows`` is specified, then only partitions with at most
+     this number of rows are included in the result.
+@@ -572,14 +373,7 @@ def skew(outer, inner, maxrows=0):
+         sage: sorted(skew([2,1],[1]).items())
+         [([1, 1], 1), ([2], 1)]
+     """
+-    cdef vector* v1 = iterable_to_vector(outer)
+-    cdef vector* v2 = iterable_to_vector(inner)
+-    cdef hashtab* ht = skew_c(v1, v2, int(maxrows))
+-    result = sf_hashtab_to_dict(ht)
+-    v_free(v1)
+-    v_free(v2)
+-    hash_free(ht)
+-    return result
++    return _lrcalc_dict_to_sage(lrcalc.skew(outer, inner, maxrows))
+ 
+ 
+ def coprod(part, all=0):
+@@ -592,9 +386,8 @@ def coprod(part, all=0):
+ 
+     INPUT:
+ 
+-    - ``part`` -- a partition.
+-
+-    - ``all`` -- an integer.
++    - ``part`` -- a partition
++    - ``all`` -- an integer
+ 
+     If ``all`` is non-zero then all terms are included in the result.
+     If ``all`` is zero, then only pairs of partitions ``(part1,
+@@ -609,12 +402,9 @@ def coprod(part, all=0):
+         sage: sorted(coprod([2,1]).items())
+         [(([1, 1], [1]), 1), (([2], [1]), 1), (([2, 1], []), 1)]
+     """
+-    cdef vector* v1 = iterable_to_vector(part)
+-    cdef hashtab* ht = coprod_c(v1, int(all))
+-    result = vp_hashtab_to_dict(ht)
+-    v_free(v1)
+-    hash_free(ht)
+-    return result
++    result = lrcalc.coprod(part, all)
++    return {tuple([_Partitions(mu) for mu in la]): Integer(k)
++            for la, k in result.items()}
+ 
+ 
+ def mult_schubert(w1, w2, rank=0):
+@@ -627,11 +417,9 @@ def mult_schubert(w1, w2, rank=0):
+ 
+     INPUT:
+ 
+-    - ``w1`` -- a permutation.
+-
+-    - ``w2`` -- a permutation.
+-
+-    - ``rank`` -- an integer.
++    - ``w1`` -- a permutation
++    - ``w2`` -- a permutation
++    - ``rank`` -- an integer
+ 
+     If ``rank`` is non-zero, then only permutations from the symmetric
+     group `S(\mathrm{rank})` are included in the result.
+@@ -646,33 +434,24 @@ def mult_schubert(w1, w2, rank=0):
+          ([6, 4, 3, 1, 2, 5], 1), ([6, 5, 2, 1, 3, 4], 1),
+          ([7, 3, 4, 1, 2, 5, 6], 1), ([7, 4, 2, 1, 3, 5, 6], 1)]
+     """
+-    cdef vector* v1 = iterable_to_vector(w1)
+-    cdef vector* v2 = iterable_to_vector(w2)
+-    cdef hashtab* ht = mult_schubert_c(v1, v2, int(rank))
+-    result = schubert_hashtab_to_dict(ht)
+-    v_free(v1)
+-    v_free(v2)
+-    hash_free(ht)
+-    return result
++    result = lrcalc.schubmult(w1, w2, rank)
++    return {Permutation(list(la)):Integer(k) for la,k in result.items()}
+ 
+ 
+-def lrskew(outer, inner, weight=None, maxrows=0):
++def lrskew(outer, inner, weight=None, maxrows=-1):
+     r"""
+     Iterate over the skew LR tableaux of shape ``outer / inner``.
+ 
+     INPUT:
+ 
+     - ``outer`` -- a partition
+-
+     - ``inner`` -- a partition
+-
+     - ``weight`` -- a partition (optional)
+-
+-    - ``maxrows`` -- an integer (optional)
++    - ``maxrows`` -- a positive integer (optional)
+ 
+     OUTPUT: an iterator of :class:`SkewTableau`
+ 
+-    Specifying ``maxrows`` restricts the alphabet to `\{1,2,\ldots,maxrows\}`.
++    Specifying ``maxrows`` = `M` restricts the alphabet to `\{1,2,\ldots,M\}`.
+ 
+     Specifying ``weight`` returns only those tableaux of given content/weight.
+ 
+@@ -702,22 +481,40 @@ def lrskew(outer, inner, weight=None, maxrows=0):
+ 
+         sage: list(lrskew([3,2,1],[2], weight=[3,1]))
+         [[[None, None, 1], [1, 1], [2]]]
++
++    TESTS::
++
++        sage: from sage.libs.lrcalc.lrcalc import lrskew
++        sage: list(lrskew([3,2,1],[2], weight=[]))
++        []
++        sage: list(lrskew([3,2,1],[2], weight=[0]))
++        []
++        sage: list(lrskew([3,2,1],[3,2,1], weight=[]))
++        [[[None, None, None], [None, None], [None]]]
++        sage: list(lrskew([3,2,1],[3,2,1], weight=[0]))
++        [[[None, None, None], [None, None], [None]]]
++        sage: list(lrskew([3,2,1],[3,2,1], weight=[1]))
++        []
+     """
+-    cdef vector* o = iterable_to_vector(outer)
+-    cdef vector* i = iterable_to_vector(inner + [0]*(len(outer) - len(inner)))
+-    cdef skewtab* st = st_new(o, i, NULL, int(maxrows))
++    iterator = lrcalc.lr_iterator(outer, inner, maxrows)
++    shape = SkewPartition([outer, inner])
+ 
+     if weight is None:
+-        yield skewtab_to_SkewTableau(st)
+-        while st_next(st):
+-            yield skewtab_to_SkewTableau(st)
++        ST = SemistandardSkewTableaux(shape)
++        for data in iterator:
++            yield ST.from_shape_and_word(shape, [i+1 for i in data])
+     else:
+         wt = _Partitions(weight)
+-        r = skewtab_to_SkewTableau(st)
+-        if r.weight() == wt:
+-            yield r
+-        while st_next(st):
+-            r = skewtab_to_SkewTableau(st)
+-            if r.weight() == wt:
+-                yield r
+-    st_free(st)
++        ST = SemistandardSkewTableaux(shape, wt)
++        m = len(wt)
++        for data in iterator:
++            w = [0] * m
++            for j in data:
++                if j >= m:
++                    # We know they are not equal, so make the check below quick
++                    w = None
++                    break
++                w[j] += 1
++            if w == wt:
++                yield ST.from_shape_and_word(shape, [i+1 for i in data])
++
diff --git a/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch b/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch
new file mode 100644
index 000000000000..1e2e0ba90742
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch
@@ -0,0 +1,40 @@
+As produced by `git diff a90a3146{^^,}`
+
+diff --git a/src/sage/repl/interface_magic.py b/src/sage/repl/interface_magic.py
+index 8a455b69b0e..a93e1c9e04c 100644
+--- a/src/sage/repl/interface_magic.py
++++ b/src/sage/repl/interface_magic.py
+@@ -260,7 +260,7 @@ class InterfaceMagic(object):
+             2
+             120
+             sage: shell.run_cell('%%gap foo\n1+1;\n')
+-            ...File "<string>", line unknown
++            ...File...<string>...
+             SyntaxError: Interface magics have no options, got "foo"
+             <BLANKLINE>
+             sage: shell.run_cell('%%gap?')
+diff --git a/src/sage/repl/interpreter.py b/src/sage/repl/interpreter.py
+index 7468afe52d7..06c47b7374a 100644
+--- a/src/sage/repl/interpreter.py
++++ b/src/sage/repl/interpreter.py
+@@ -78,9 +78,9 @@ Check that Cython source code appears in tracebacks::
+     dummy line
+     ...
+     ZeroDivisionError...Traceback (most recent call last)
+-    <ipython-input-...> in <module>...
++    ...in <module>...
+     ----> 1 Integer(1)/Integer(0)
+-    .../sage/rings/integer.pyx in sage.rings.integer.Integer...div...
++    .../sage/rings/integer.pyx... in sage.rings.integer.Integer...div...
+     ...
+     -> ...                  raise ZeroDivisionError("rational division by zero")
+        ....:            x = <Rational> Rational.__new__(Rational)
+@@ -423,7 +423,7 @@ def SagePreparseTransformer(lines):
+         sage: from sage.repl.interpreter import get_test_shell
+         sage: shell = get_test_shell()
+         sage: shell.run_cell(bad_syntax)
+-          File "<string>", line unknown
++          File...<string>...
+         SyntaxError: Mismatched ']'
+         <BLANKLINE>
+         sage: shell.quit()
diff --git a/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch b/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch
new file mode 100644
index 000000000000..853813b0f5bd
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch
@@ -0,0 +1,13 @@
+Fix for ipython 8.1
+
+--- a/src/sage/repl/interpreter.py
++++ b/src/sage/repl/interpreter.py
+@@ -78,7 +78,7 @@ Check that Cython source code appears in tracebacks::
+     dummy line
+     ...
+     ZeroDivisionError...Traceback (most recent call last)
+-    ...in <module>...
++    ...
+     ----> 1 Integer(1)/Integer(0)
+     .../sage/rings/integer.pyx... in sage.rings.integer.Integer...div...
+     ...
diff --git a/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch b/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch
new file mode 100644
index 000000000000..19b69700a4f6
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch
@@ -0,0 +1,19 @@
+commit 9c8235e44ffb509efa8a3ca6cdb55154e2b5066d
+Author: Antonio Rojas <arojas@archlinux.org>
+Date:   Sun Feb 13 19:53:14 2022 +0100
+
+    Fix deprecation warning with scipy 1.8
+
+diff --git a/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py b/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py
+index e9b60dae5ec..7932167b41d 100644
+--- a/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py
++++ b/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py
+@@ -356,7 +356,7 @@ Sage example in ./linsolve.tex, line 2230::
+ 
+ Sage example in ./linsolve.tex, line 2609::
+ 
+-  sage: from scipy.sparse.linalg.dsolve import *
++  sage: from scipy.sparse.linalg import factorized
+   sage: from scipy.sparse import lil_matrix
+   sage: from numpy import array
+   sage: n = 200
diff --git a/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch
new file mode 100644
index 000000000000..9ba7ca5a6b7d
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch
@@ -0,0 +1,99 @@
+From 609dd9deaeaa6380ab2f0d50276d911233c00a04 Mon Sep 17 00:00:00 2001
+From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
+Date: Fri, 4 Mar 2022 16:07:09 -0800
+Subject: sage.manifolds: Update doctests for SymPy 1.10
+
+---
+ src/sage/manifolds/continuous_map.py              | 3 +--
+ src/sage/manifolds/differentiable/diff_form.py    | 4 ++--
+ src/sage/manifolds/differentiable/tensorfield.py  | 8 ++++----
+ src/sage/manifolds/vector_bundle_fiber_element.py | 2 +-
+ 4 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/src/sage/manifolds/continuous_map.py b/src/sage/manifolds/continuous_map.py
+index a6356e7..f6f9b6d 100644
+--- a/src/sage/manifolds/continuous_map.py
++++ b/src/sage/manifolds/continuous_map.py
+@@ -1357,8 +1357,7 @@ class ContinuousMap(Morphism):
+             sage: Phi.coord_functions(c_uv, c_xyz)
+             Coordinate functions (u*v, u/v, u + v) on the Chart (M, (u, v))
+             sage: Phi.coord_functions(c_UV, c_xyz)
+-            Coordinate functions (-U**2/4 + V**2/4, -(U + V)/(U - V), V)
+-             on the Chart (M, (U, V))
++            Coordinate functions (-U**2/4 + V**2/4, (-U - V)/(U - V), V) on the Chart (M, (U, V))
+             sage: Phi.coord_functions(c_UV, c_XYZ)
+             Coordinate functions ((-U**3 + U**2*V + U*V**2 + 2*U*V + 6*U - V**3
+              - 2*V**2 + 6*V)/(2*(U - V)), (U**3/4 - U**2*V/4 - U*V**2/4 + U*V
+diff --git a/src/sage/manifolds/differentiable/diff_form.py b/src/sage/manifolds/differentiable/diff_form.py
+index 70dd8fb..0aa3469 100644
+--- a/src/sage/manifolds/differentiable/diff_form.py
++++ b/src/sage/manifolds/differentiable/diff_form.py
+@@ -266,7 +266,7 @@ class DiffForm(TensorField):
+ 
+         sage: s = a.wedge(b)
+         sage: s.display(eU)
+-        a∧b = -x*(2*x*y + 1) dx∧dy
++        a∧b = x*(-2*x*y - 1) dx∧dy
+         sage: s.display(eV)
+         a∧b = (u**3/8 + u**2*v/8 - u*v**2/8 + u/4 - v**3/8 + v/4) du∧dv
+ 
+@@ -275,7 +275,7 @@ class DiffForm(TensorField):
+         sage: f = M.scalar_field({c_xy: (x+y)^2, c_uv: u^2}, name='f')
+         sage: s = f*a
+         sage: s.display(eU)
+-        f*a = -y*(x**2 + 2*x*y + y**2) dx + x*(x**2 + 2*x*y + y**2) dy
++        f*a = y*(-x**2 - 2*x*y - y**2) dx + x*(x**2 + 2*x*y + y**2) dy
+         sage: s.display(eV)
+         f*a = u**2*v/2 du - u**3/2 dv
+ 
+diff --git a/src/sage/manifolds/differentiable/tensorfield.py b/src/sage/manifolds/differentiable/tensorfield.py
+index 2775be9..6bc5c50 100644
+--- a/src/sage/manifolds/differentiable/tensorfield.py
++++ b/src/sage/manifolds/differentiable/tensorfield.py
+@@ -334,7 +334,7 @@ class TensorField(ModuleElementWithMutability):
+         sage: f.display()  # long time
+         t(a,b): S^2 → ℝ
+         on U: (x, y) ↦ -2*x*y - 3*x - y**2
+-        on V: (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++        on V: (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+ 
+     The vectors can be defined only on subsets of `S^2`, the domain of the
+     result is then the common subset::
+@@ -343,12 +343,12 @@ class TensorField(ModuleElementWithMutability):
+         sage: s.display()  # long time
+         t(a,b): U → ℝ
+            (x, y) ↦ -2*x*y - 3*x - y**2
+-        on W: (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++        on W: (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+         sage: s = t(a.restrict(U), b.restrict(W))  # long time
+         sage: s.display()  # long time
+         t(a,b): W → ℝ
+            (x, y) ↦ -2*x*y - 3*x - y**2
+-           (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++           (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+ 
+     The tensor itself can be defined only on some open subset of `S^2`,
+     yielding a result whose domain is this subset::
+@@ -356,7 +356,7 @@ class TensorField(ModuleElementWithMutability):
+         sage: s = t.restrict(V)(a,b)  # long time
+         sage: s.display()  # long time
+         t(a,b): V → ℝ
+-           (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++           (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+         on W: (x, y) ↦ -2*x*y - 3*x - y**2
+ 
+     Tests regarding the multiplication by a scalar field::
+diff --git a/src/sage/manifolds/vector_bundle_fiber_element.py b/src/sage/manifolds/vector_bundle_fiber_element.py
+index 29ee81d..048275a 100644
+--- a/src/sage/manifolds/vector_bundle_fiber_element.py
++++ b/src/sage/manifolds/vector_bundle_fiber_element.py
+@@ -110,4 +110,4 @@ class VectorBundleFiberElement(FiniteRankFreeModuleElement):
+             desc += str(self._name) + " "
+         desc += "in the fiber of {} at {}".format(self._vbundle._name,
+                                                   self._point)
+-        return desc
+\ No newline at end of file
++        return desc
+-- 
+cgit v1.0-1-gd88e
+
diff --git a/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch
new file mode 100644
index 000000000000..f5ac180baa90
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch
@@ -0,0 +1,29 @@
+From c49eff347454ac7f07e5918470b20e97b8f2357e Mon Sep 17 00:00:00 2001
+From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
+Date: Fri, 4 Mar 2022 15:14:43 -0800
+Subject: src/sage/calculus/calculus.py: Update laplace doctest for sympy 1.10
+
+---
+ src/sage/calculus/calculus.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py
+index 9c2f226..b335093 100644
+--- a/src/sage/calculus/calculus.py
++++ b/src/sage/calculus/calculus.py
+@@ -1639,9 +1639,9 @@ def laplace(ex, t, s, algorithm='maxima'):
+         sage: laplace(dirac_delta(t), t, s)
+         1
+         sage: F, a, cond = laplace(dirac_delta(t), t, s, algorithm='sympy')
+-        sage: a, cond
+-        (-oo, True)
+-        sage: F       # random - sympy <1.9 includes undefined heaviside(0) in answer
++        sage: a, cond  # random - sympy <1.10 gives (-oo, True)
++        (0, True)
++        sage: F        # random - sympy <1.9 includes undefined heaviside(0) in answer
+         1
+         sage: laplace(dirac_delta(t), t, s, algorithm='giac')
+         1
+-- 
+cgit v1.0-1-gd88e
+
diff --git a/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch b/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch
new file mode 100644
index 000000000000..8e7bb64f5b01
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch
@@ -0,0 +1,26 @@
+From a04a0a0b14f67f4804e7113c3db41bbcf8a58296 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
+Date: Mon, 28 Mar 2022 20:39:59 -0300
+Subject: Trac #33585: fix doctest when dochtml is missing...
+
+...but sphinx is available in PYTHONPATH.
+---
+ src/sage/misc/sagedoc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py
+index 4b3853f..08c4225 100644
+--- a/src/sage/misc/sagedoc.py
++++ b/src/sage/misc/sagedoc.py
+@@ -1401,7 +1401,7 @@ class _sage_doc:
+             "...**File:**...**Type:**...**Definition:** identity_matrix..."
+             sage: identity_matrix.__doc__ in browse_sage_doc(identity_matrix, 'rst')
+             True
+-            sage: browse_sage_doc(identity_matrix, 'html', False)             # optional - sphinx
++            sage: browse_sage_doc(identity_matrix, 'html', False)             # optional - sphinx sagemath_doc_html
+             '...div...File:...Type:...Definition:...identity_matrix...'
+ 
+         In the 'text' version, double colons have been replaced with
+-- 
+cgit v1.0-1-gd88e
+
diff --git a/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch b/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch
deleted file mode 100644
index 5cb62f56e902..000000000000
--- a/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
- - we don't have threejs in void
-
---- a/src/sage/repl/ipython_kernel/install.py
-+++ b/src/sage/repl/ipython_kernel/install.py
-@@ -124,7 +124,7 @@ class SageKernelSpec(object):
-             sage: spec = SageKernelSpec(prefix=tmp_dir())
-             sage: spec.use_local_threejs()
-             sage: threejs = os.path.join(spec.nbextensions_dir, 'threejs-sage')
--            sage: os.path.isdir(threejs)
-+            sage: os.path.isdir(threejs)    # optional - threejs
-             True
-         """
-         src = THREEJS_DIR
diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 710a9e80c052..0d793262d572 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
 version=9.5
-revision=1
+revision=2
 wrksrc=sage-$version
 build_wrksrc=pkgs/sagemath-standard
 build_style=python3-module
@@ -12,7 +12,7 @@ hostmakedepends="m4 pkg-config python3-Cython python3-Jinja2 python3-pkgconfig
 makedepends="arb-devel boost-devel brial-devel cliquer-devel ecl eclib-devel
  ecm-devel fflas-ffpack flintlib-devel gap-devel gd-devel giac-devel glpk-devel
  gsl-devel iml-devel lcalc-devel libbraiding-devel libhomfly-devel libmpc-devel
- libpng-devel linbox-devel lrcalc-devel m4ri-devel m4rie-devel mpfi-devel
+ libpng-devel linbox-devel m4ri-devel m4rie-devel mpfi-devel
  mpfr-devel ntl-devel openblas-devel pari-devel planarity-devel python3-cypari2
  python3-cysignals python3-devel python3-gmpy2 python3-memory_allocator
  python3-numpy rankwidth-devel singular symmetrica-devel zn_poly"
@@ -20,13 +20,13 @@ depends="FlintQS eclib-devel fflas-ffpack flintlib-devel gcc-fortran gd-devel
  gfan giac gsl-devel gzip libpng-devel linbox-devel m4ri-devel maxima-ecl
  mpfr-devel nauty ntl-devel palp pari-devel pari-elldata-small pari-galdata
  pari-galpol-small pari-seadata-small pkg-config python3-Cython python3-cypari2
- python3-cysignals python3-devel python3-fpylll python3-ipython
+ python3-cysignals python3-devel python3-fpylll python3-ipython python3-lrcalc
  python3-ipython_ipykernel python3-jupyter_ipywidgets python3-matplotlib
  python3-memory_allocator python3-networkx python3-pip python3-pkgconfig
  python3-pplpy python3-primecountpy python3-requests python3-scipy
  python3-sympy python3-traitlets sage-data-combinatorial_designs
  sage-data-conway_polynomials sage-data-elliptic_curves sage-data-graphs
- sage-data-polytopes_db sympow tachyon"
+ sage-data-polytopes_db sympow tachyon threejs-sage"
 checkdepends="$depends"
 short_desc="Open source mathematics software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -55,6 +55,7 @@ do_configure() {
 	COMBINATORIAL_DESIGN_DATA_DIR = "/usr/share/sagemath/combinatorial_designs"
 	CREMONA_MINI_DATA_DIR = "/usr/share/sagemath/cremona"
 	CREMONA_LARGE_DATA_DIR = "/usr/share/sagemath/cremona"
+	THREEJS_DIR = "/usr/share/sagemath/threejs-sage"
 	EOF
 
 	# don't install sage-venv-config: it is used to set SAGE_VENV=/usr and

From dee544fe197d170cb30e53f69210f0d5d4c17840 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:37 +0200
Subject: [PATCH 0935/2561] wike: update to 1.7.2.

---
 srcpkgs/wike/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wike/template b/srcpkgs/wike/template
index 32aa723af076..98faaf360b00 100644
--- a/srcpkgs/wike/template
+++ b/srcpkgs/wike/template
@@ -1,6 +1,6 @@
 # Template file for 'wike'
 pkgname=wike
-version=1.7.1
+version=1.7.2
 revision=1
 wrksrc="Wike-$version"
 build_style=meson
@@ -11,4 +11,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/hugolabe/Wike"
 distfiles="https://github.com/hugolabe/Wike/archive/refs/tags/$version.tar.gz"
-checksum=b3fa3c0600e7234f77465fd7052136de3b397e66ad5c636f8282556aa60a2742
+checksum=8434cec2ca44392fd96fa9ed1594be40c74d91490039405996aa4c6fa64bd26c

From 4db708380c53cecadf2d53e356c93536cc935958 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:24 +0200
Subject: [PATCH 0936/2561] python3-astroid: update to 2.11.2.

---
 srcpkgs/python3-astroid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4cfef4e92fd9..ca5db18ccc79 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.9.3
+version=2.11.2
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ 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="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=07234423c3722df6aa067c15f5fa60adf4f1d6ae659d2ab147acb40a8a1904f7
+checksum=4a275523e2600c928ac95cda3ed7c1307dff2e6fbe24ef95ed867bda0fcaeab8

From 21477cd30d4d5fe0fcc681658f43ac0060180c51 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:20 +0200
Subject: [PATCH 0937/2561] New package: python3-dill-0.3.4

---
 srcpkgs/python3-dill/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-dill/template

diff --git a/srcpkgs/python3-dill/template b/srcpkgs/python3-dill/template
new file mode 100644
index 000000000000..d40ce208e06d
--- /dev/null
+++ b/srcpkgs/python3-dill/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-dill'
+pkgname=python3-dill
+version=0.3.4
+revision=1
+wrksrc="dill-$version"
+build_style=python3-module
+depends="python3"
+short_desc="Serialize all of Python"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://dill.rtfd.io/"
+distfiles="${PYPI_SITE}/d/dill/dill-${version}.zip"
+checksum=9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675

From 9a28595272ac1889cf0bcb103e8bd44f7d9251e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:28 +0200
Subject: [PATCH 0938/2561] pylint: update to 2.13.4.

---
 srcpkgs/pylint/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index f052f05f08b7..54af1e2f085d 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,12 +1,12 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.12.2
-revision=2
+version=2.13.4
+revision=1
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml
- python3-platformdirs"
+depends="python3-astroid python3-isort python3-mccabe python3-tomli
+ python3-platformdirs python3-dill"
 checkdepends="$depends python3-pytest python3-tkinter python3-six
  python3-GitPython git"
 short_desc="Python code static checker"
@@ -15,11 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=411308682f3d4578bb769e7fa549c8f34edf1033871d2e8cd5c3ce16a5741c59
-
-post_patch() {
-	vsed -e 's/mccabe>=0.6,<0.7/mccabe>=0.6,<=0.7/' -i setup.cfg
-}
+checksum=34a5550bfe94f4ba04eee95367572224bc16dbd2456b3ece5fb92e15399f6cd8
 
 post_install() {
 	# install example config and emacs files

From 62abc44b6dc87fe237e69061810ff4c811e9cf3e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:17:56 +0200
Subject: [PATCH 0939/2561] python3-mypy: update to 0.942.

---
 srcpkgs/python3-mypy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index 663127eedbc0..a92e1c803e48 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
-version=0.931
+version=0.942
 revision=1
 wrksrc="mypy-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/python/mypy"
 distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=0038b21890867793581e4cb0d810829f5fd4441aa75796b53033af3aa30430ce
+checksum=17e44649fec92e9f82102b48a3bf7b4a5510ad0cd22fa21a104826b5db4903e2
 make_check=no # needs pytest-xdist and many tests fail
 
 post_install() {

From 0ee0f75c445413ab3319fafdd68e0ade95d6b787 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Mar 2022 12:52:26 +1100
Subject: [PATCH 0940/2561] bluez: update to 5.64.

---
 srcpkgs/bluez/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index e0a96039b6fb..e9827e8e1d95 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.63
+version=5.64
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
@@ -15,7 +15,7 @@ maintainer="Érico Nogueira <ericonr@disroot.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=9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76
+checksum=ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
 

From 613632034d27e006429f91304164aa03f95d36e7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 11:50:25 +0200
Subject: [PATCH 0941/2561] New package: d-spy-1.2.0

---
 srcpkgs/d-spy/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/d-spy/template

diff --git a/srcpkgs/d-spy/template b/srcpkgs/d-spy/template
new file mode 100644
index 000000000000..3d78d4d011c1
--- /dev/null
+++ b/srcpkgs/d-spy/template
@@ -0,0 +1,14 @@
+# Template file for 'd-spy'
+pkgname=d-spy
+version=1.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext glib-devel"
+makedepends="libadwaita-devel"
+short_desc="Like d-feet, but written in C and blisteringly fast"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/d-spy"
+changelog="https://gitlab.gnome.org/GNOME/d-spy/-/raw/main/NEWS"
+distfiles="https://gitlab.gnome.org/GNOME/d-spy/-/archive/$version/d-spy-$version.tar.gz"
+checksum=8be0a493e4a127f2c6052dd962162ba5f91c6da702f9b4cb77a9cbd6a1dbb4bc

From 97937530007de2b173404cd942b7c71a17100d96 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 4 Apr 2022 23:12:16 +0200
Subject: [PATCH 0942/2561] kodi: update to 19.4

---
 .../kodi/patches/add-missing-includes.patch   |  4 +-
 .../disable-static-texturepacker-build.patch  |  2 +-
 srcpkgs/kodi/patches/fix-fileemu.patch        | 16 ++++----
 srcpkgs/kodi/patches/fix-musl.patch           |  2 +-
 srcpkgs/kodi/patches/fmt8-support.patch       |  7 ----
 srcpkgs/kodi/patches/ppc64.patch              |  8 ++--
 srcpkgs/kodi/template                         | 38 +++++--------------
 7 files changed, 25 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch

diff --git a/srcpkgs/kodi/patches/add-missing-includes.patch b/srcpkgs/kodi/patches/add-missing-includes.patch
index 236bfa6fd0e1..1b9a4509744c 100644
--- a/srcpkgs/kodi/patches/add-missing-includes.patch
+++ b/srcpkgs/kodi/patches/add-missing-includes.patch
@@ -1,10 +1,10 @@
 --- a/xbmc/filesystem/ZipManager.h.orig
 +++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
+@@ -22,6 +22,7 @@
  #include <string>
  #include <vector>
  #include <map>
-+#include <stdint.h>
++#include <cstdint>
  
  class CURL;
  
diff --git a/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
index 369f1b24d76d..766cae2005c8 100644
--- a/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
+++ b/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
@@ -1,6 +1,6 @@
 --- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
 +++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
+@@ -38,7 +38,7 @@
  	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
  	cd $(PLATFORM); cp -a $(SOURCE)/* .
  	cd $(PLATFORM); ./autogen.sh
diff --git a/srcpkgs/kodi/patches/fix-fileemu.patch b/srcpkgs/kodi/patches/fix-fileemu.patch
index 6cce7a4d3524..a16fcb9ffa29 100644
--- a/srcpkgs/kodi/patches/fix-fileemu.patch
+++ b/srcpkgs/kodi/patches/fix-fileemu.patch
@@ -1,6 +1,6 @@
 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
 +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
+@@ -17,7 +17,7 @@
  #define _onexit_t void*
  #endif
  
@@ -11,8 +11,8 @@
  typedef off64_t __off64_t;
 --- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
 +++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
+@@ -23,7 +23,7 @@
+ #include <dirent.h>
  #include <dlfcn.h>
  
 -#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
@@ -29,8 +29,8 @@
 +#include <paths.h>
  #ifdef TARGET_POSIX
  #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
+ #endif
+@@ -1479,7 +1480,7 @@ extern "C"
      int ret;
  
      ret = dll_fgetpos64(stream, &tmpPos);
@@ -39,7 +39,7 @@
      *pos = (fpos_t)tmpPos;
  #else
      pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
+@@ -1492,8 +1493,9 @@ extern "C"
      CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
      if (pFile != NULL)
      {
@@ -51,7 +51,7 @@
  #else
        pos->__pos = pFile->GetPosition();
  #endif
-@@ -1509,8 +1511,9 @@
+@@ -1508,8 +1510,9 @@ extern "C"
      int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
      if (fd >= 0)
      {
@@ -63,7 +63,7 @@
  #else
        if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
  #endif
-@@ -1532,7 +1535,7 @@
+@@ -1531,7 +1534,7 @@ extern "C"
      if (fd >= 0)
      {
        fpos64_t tmpPos;
diff --git a/srcpkgs/kodi/patches/fix-musl.patch b/srcpkgs/kodi/patches/fix-musl.patch
index c2eb622c98a4..891204118411 100644
--- a/srcpkgs/kodi/patches/fix-musl.patch
+++ b/srcpkgs/kodi/patches/fix-musl.patch
@@ -1,6 +1,6 @@
 --- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
 +++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
+@@ -53,7 +53,7 @@
  #ifdef  __cplusplus
  extern "C" {
  #endif
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/patches/ppc64.patch b/srcpkgs/kodi/patches/ppc64.patch
index ab008d445a99..8bd3e7661ca4 100644
--- a/srcpkgs/kodi/patches/ppc64.patch
+++ b/srcpkgs/kodi/patches/ppc64.patch
@@ -1,9 +1,9 @@
 --- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
 +++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
+@@ -35,6 +35,12 @@
+   elseif(CPU MATCHES riscv64)
+     set(ARCH riscv64)
+     set(NEON False)
 +  elseif(CPU MATCHES ppc64le)
 +    set(ARCH ppc64le-linux)
 +    set(NEON False)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index a31240ff2766..da81c7e2d0a5 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
-version=19.0
-revision=4
+version=19.4
+revision=1
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kodi.tv"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=f7ef8a6f45862ae3b7ebfce4950d74f534be3cb4a0e67ce640963746b3f668f2
+checksum=cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da
 # Add CrossGUID dependency
 distfiles+=" http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz"
 checksum+=" 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10"
@@ -94,6 +94,8 @@ if [ -z "$CROSS_BUILD" ]; then
 else
 	hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel
 	 libwaylandpp-devel"
+	configure_args+=" -DWITH_JSONSCHEMABUILDER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/JsonSchemaBuilder
+	 -DWITH_TEXTUREPACKER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/TexturePacker"
 fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -111,35 +113,13 @@ pre_configure() {
 
 	. /etc/profile.d/10_openjdk11.sh
 
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
+	# Build tools needed to run on the host
 	if [ "$CROSS_BUILD" ]; then
 		for i in JsonSchemaBuilder TexturePacker; do
 			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+				make -C tools/depends/native/$i native/$i
+			mv tools/depends/native/$i/native/$i tools/$i
+			make -C tools/depends/native/$i distclean
 		done
 	fi
 }

From eaf6168d7efa8573990a870279afd034ba7e025e Mon Sep 17 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, 5 Apr 2022 07:50:05 +0700
Subject: [PATCH 0943/2561] python3-dill: fix build

---
 srcpkgs/python3-dill/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-dill/template b/srcpkgs/python3-dill/template
index d40ce208e06d..e27236c340df 100644
--- a/srcpkgs/python3-dill/template
+++ b/srcpkgs/python3-dill/template
@@ -4,6 +4,7 @@ version=0.3.4
 revision=1
 wrksrc="dill-$version"
 build_style=python3-module
+hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Serialize all of Python"
 maintainer="Michal Vasilek <michal@vasilek.cz>"

From 5abe3fd031a4f86d6193e6159d03c21e1b8dc7ac Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 04:35:38 +0200
Subject: [PATCH 0944/2561] keepalived: update to 2.2.7.

---
 srcpkgs/keepalived/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index c8dea3862abf..1d2ef18ca470 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,6 +1,6 @@
 # Template file for 'keepalived'
 pkgname=keepalived
-version=2.2.4
+version=2.2.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-sha1"
@@ -10,8 +10,9 @@ short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.keepalived.org/"
+changelog="https://www.keepalived.org/release-notes/Release-${version}.html"
 distfiles="https://www.keepalived.org/software/keepalived-${version}.tar.gz"
-checksum=0138d69087d44beaaa589527f0cfa6885958b320a837147d02b6b7df73ebc1df
+checksum=c61940d874154a560a54627ecf7ef47adebdf832164368d10bf242a4d9b7d49d
 
 conf_files="/etc/keepalived/keepalived.conf"
 
@@ -20,4 +21,5 @@ post_install() {
 	rm -rf ${DESTDIR}/etc/rc.d ${DESTDIR}/etc/sysconfig
 	vmkdir usr/share/examples/$pkgname
 	mv ${DESTDIR}/etc/$pkgname/samples/* ${DESTDIR}/usr/share/examples/$pkgname
+	mv ${DESTDIR}/etc/keepalived/keepalived.conf{.sample,}
 }

From aa1e7229f3e56918eb3675ecfe3d7e471b3e7543 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 04:40:25 +0200
Subject: [PATCH 0945/2561] mc: update to 4.8.28.

---
 srcpkgs/mc/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 646125d12851..1c293a9c6a26 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -1,6 +1,6 @@
 # Template file for 'mc'
 pkgname=mc
-version=4.8.27
+version=4.8.28
 revision=1
 build_style=gnu-configure
 configure_args="--with-screen=slang --without-x"
@@ -10,9 +10,10 @@ short_desc="User-friendly file manager and visual shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://midnight-commander.org/"
+changelog="https://midnight-commander.org/wiki/NEWS-${version}"
 distfiles="https://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
 #distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
-checksum=31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4
+checksum=e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803
 python_version=2
 
 conf_files="

From e45af29f0420d489b95704558b68d7ce9c66e95a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 28 Mar 2022 11:02:57 +0200
Subject: [PATCH 0946/2561] mutt: update to 2.2.2, build with zlib

also remove --with-regex (not recognized since 1.13, and was wrong even before)
---
 srcpkgs/mutt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 7ae82f76bd8c..6c0f0d04798b 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,16 +1,16 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.2.1
+version=2.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
- --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
+ --enable-gpgme --with-idn2 --with-ssl --with-sasl --enable-sidebar
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --sysconfdir=/etc/$pkgname
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="perl pkg-config"
 makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
- ncurses-devel"
+ ncurses-devel zlib-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -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=b76d30d42b6c90aa9abf9f330e41800934eedf7b858a32c120ee3ae63587abb5
+checksum=10de870cf37646c0b3f5bcf579c3cc2fd9285bda1d04be9ad7c33ec2ee820fcc
 
 post_install() {
 	# provided by mime-types

From 51c844a232fa9716f6c82565b9d03b5e623eaa17 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 16:55:26 +0200
Subject: [PATCH 0947/2561] syncthing: update to 1.19.2.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 6c2d860909cb..6a2673395275 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.19.1
+version=1.19.2
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=46319031c0805374baa382ee2b21290fb9dc595b70e905b97eb9a5643a78edc4
+checksum=81be2d3b22fa7282eee9cc1dc7569975fa62e7149700dcedaf03d372fb012a1e
 
 pre_build() {
 	GOARCH= go generate \

From e1ce278d79c1601d0a3aabfce48f434591f90c03 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:03:40 +0200
Subject: [PATCH 0948/2561] python3-boto3: update to 1.21.33.

---
 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 b96fa86eb165..c57a02f2fc2f 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.21.19
+version=1.21.33
 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=fb04acb6eb998652eb52381a580d3624490982a7b17d6080b0d78163874962b7
+checksum=873369a6b11334756f38ca0f310104e83c793c64a95d3b75581f2792582650d3
 
 post_install() {
 	vlicense LICENSE

From e8d932780ca138bd79853c8f18ada9369ce4238f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:03:43 +0200
Subject: [PATCH 0949/2561] python3-botocore: update to 1.24.33.

---
 srcpkgs/python3-botocore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
index 0271e9204c19..63ae178c40d6 100644
--- a/srcpkgs/python3-botocore/template
+++ b/srcpkgs/python3-botocore/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-botocore'
 pkgname=python3-botocore
-version=1.23.23
+version=1.24.33
 revision=1
 wrksrc="botocore-${version}"
 build_style=python3-module

From 6800b13f6ec17c3ddb41aed3995b40772692a554 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:03:46 +0200
Subject: [PATCH 0950/2561] aws-cli: update to 1.22.88.

---
 srcpkgs/aws-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index 0448d39f5a61..6e543f674359 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
-version=1.22.23
+version=1.22.88
 revision=1
 wrksrc="aws-cli-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aws/aws-cli"
 distfiles="https://github.com/aws/aws-cli/archive/${version}.tar.gz"
-checksum=d5424e05c87963547d6c98440391c6729e4e4f8eb7a4c64520ff7eefeffe41f3
+checksum=cc0961786a5020fbe4708506e8aa39c90a07199f625e9ac62c1f2d8db7e8bd69
 
 do_check() {
 	# integration tests want aws credentials, have some other issues not worth fixing

From b6b127c5c91d0ba4fea10bc5d0d3e0947170069b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:05:20 +0200
Subject: [PATCH 0951/2561] python3-botocore: fix hash.

---
 srcpkgs/python3-botocore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
index 63ae178c40d6..f28f9298954a 100644
--- a/srcpkgs/python3-botocore/template
+++ b/srcpkgs/python3-botocore/template
@@ -14,7 +14,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/boto/botocore"
 distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
-checksum=6b23a1e91387c1a461f10b17bde9ace15b3c128ed385646ab058644dfedd2c47
+checksum=df97ad5dd13847d2684597798214bc35603c1bd9df7fef04ba5d583cb4229629
 
 pre_check() {
 	rm -r tests/functional/leak # these 6 tests fail, probably fixable

From 33811506f2eb9cb5021ef7123c0199da9f443aa2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 17:42:18 +0200
Subject: [PATCH 0952/2561] emacs: update to 28.1.

Enable cairo and harfbuzz by default, as recommended by upstream.
---
 srcpkgs/emacs/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 9c4405ffc88e..644e44cf4d06 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,6 +1,6 @@
 # Template file for 'emacs'
 pkgname=emacs
-version=27.2
+version=28.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
@@ -24,7 +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=b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9
+checksum=28b1b3d099037a088f0a4ca251d7e7262eab5ea1677aabffa6c4426961ad75e1
 nocross=yes
 nopie=yes
 
@@ -33,7 +33,8 @@ build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus
 desc_option_xpm="Enable support for XPM images"
 desc_option_sound="Enable support for sound"
 desc_option_m17n="Enable support for m17n multilingual text processing"
-build_options_default="jpeg tiff gif png xpm svg xml gnutls sound m17n json gmp"
+build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n png sound
+ svg tiff xml xpm"
 
 pre_configure() {
 	# Just configuring in different directories results in

From f9b819b3c5d081b9f6c4da96f769e9831afffb85 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:28:08 +0200
Subject: [PATCH 0953/2561] xorg-cf-files: update to 1.0.7.

---
 srcpkgs/xorg-cf-files/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xorg-cf-files/template b/srcpkgs/xorg-cf-files/template
index b7b8a7c1dac2..4bec7c2ac82e 100644
--- a/srcpkgs/xorg-cf-files/template
+++ b/srcpkgs/xorg-cf-files/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-cf-files'
 pkgname=xorg-cf-files
-version=1.0.6
-revision=4
+version=1.0.7
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake xorg-util-macros font-util"
 short_desc="X.Org imake program and related utilities"
@@ -9,7 +9,7 @@ maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
 license="X11"
 homepage="https://www.x.org/wiki/"
 distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2"
-checksum=4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d
+checksum=74a771d5bb2189020399998dfa2329c3e038aa2e14dd3d4056144ed9a5976308
 
 pre_configure() {
 	autoreconf -fi

From 797cf1a0a9355e766b37aac49b3b1d304173257e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:29:48 +0200
Subject: [PATCH 0954/2561] msmtp: update to 1.8.20.

---
 srcpkgs/msmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 5f6d611259b3..eb687ece82c7 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'msmtp'
 pkgname=msmtp
-version=1.8.18
+version=1.8.20
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/msmtp/"
 distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=14fc62af37ebdcc5ed19a245a05eb8376efe7016118f00c9c594bc999d5560a5
+checksum=d93ae2aafc0f48af7dc9d0b394df1bb800588b8b4e8d096d8b3cf225344eb111
 
 build_options="idn sasl gnome msmtpd"
 build_options_default="idn sasl msmtpd"

From 4976b04254774dd779fd3f35f02190f041d8db65 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:30:37 +0200
Subject: [PATCH 0955/2561] xauth: update to 1.1.1.

Adopted.
---
 srcpkgs/xauth/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xauth/template b/srcpkgs/xauth/template
index 8569efad4d80..8cf9d80c6069 100644
--- a/srcpkgs/xauth/template
+++ b/srcpkgs/xauth/template
@@ -1,16 +1,16 @@
 # Template file for 'xauth'
 pkgname=xauth
-version=1.1
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xtrans libXau-devel libXext-devel libXmu-devel"
 short_desc="X authentication utility"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=6d1dd1b79dd185107c5b0fdd22d1d791ad749ad6e288d0cdf80964c4ffa7530c
+checksum=164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92
 
 post_install() {
 	vlicense COPYING

From a44267ed0210d2d431b6977c3497ecc71397f5a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:37:17 +0200
Subject: [PATCH 0956/2561] gnutls: update to 3.7.4.

---
 common/shlibs           | 2 +-
 srcpkgs/gnutls/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e7af88140d1a..836cacc49b89 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -224,7 +224,7 @@ libgpg-error.so.0 libgpg-error-1.6_1
 liblzo2.so.2 lzo-2.03_1
 libgcrypt.so.20 libgcrypt-1.6.1_1
 libgnutls.so.30 gnutls-3.4.13_1
-libgnutlsxx.so.28 gnutls-3.2.13_1
+libgnutlsxx.so.30 gnutls-3.7.4_1
 libgnutls-dane.so.0 gnutls-3.6.12_1
 libdevmapper.so.1.02 device-mapper-2.02.110_1
 libdevmapper-event.so.1.02 device-mapper-2.02.110_1
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 960a133cf248..9f2d7f905b7b 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,6 +1,6 @@
 # Template file for 'gnutls'
 pkgname=gnutls
-version=3.7.3
+version=3.7.4
 revision=1
 build_style=gnu-configure
 configure_args="--disable-guile --disable-static
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-2.1-or-later"
 homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
-checksum=fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a
+checksum=e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f
 
 pre_check() {
 	# same as $PASS in tests/cert-tests/certtool.sh

From 0e7bea73110d45729d3d1cee620932128b8aa8b1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:40:25 +0200
Subject: [PATCH 0957/2561] appres: update to 1.0.6.

---
 srcpkgs/appres/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/appres/template b/srcpkgs/appres/template
index 0d85dea763af..83e4b39f1bbc 100644
--- a/srcpkgs/appres/template
+++ b/srcpkgs/appres/template
@@ -1,6 +1,6 @@
 # Template build file for 'appres'.
 pkgname=appres
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="List X application resource database"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=ffad893712c81943b919e3cbfe46fc65259cc0d9eb96d5e658670e3fbb265928
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=8b2257e2a0a1ad8330323aec23f07c333075d7fe4e6efd88e0c18fba8223590b
 
 post_install() {
 	vlicense COPYING

From 1b5b7716ee1eb33b0aa0a4dfae7fd39267d8f307 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:41:04 +0200
Subject: [PATCH 0958/2561] editres: update to 1.0.8.

---
 srcpkgs/editres/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/editres/template b/srcpkgs/editres/template
index 4890cbd590ed..502eba67c066 100644
--- a/srcpkgs/editres/template
+++ b/srcpkgs/editres/template
@@ -1,6 +1,6 @@
 # Template build file for 'editres'.
 pkgname=editres
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Dynamic resource editor for X Toolkit applications"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=089ad34628e55a779b97e369f55fb12caefc96d684b508d9022eb9e12b775c11
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=83cf5dffb1883635fd9c6a8dc48ff9e560f6c6d8ce1a0e929d5f409cba18b6f9
 
 post_install() {
 	vlicense COPYING

From 1ac5dcef9ab6d2f0e18186c3686fee4bdc09a103 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:41:59 +0200
Subject: [PATCH 0959/2561] discount: update to 2.2.7b.

---
 srcpkgs/discount/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/discount/template b/srcpkgs/discount/template
index d47f46518415..a075e4ad5a3f 100644
--- a/srcpkgs/discount/template
+++ b/srcpkgs/discount/template
@@ -1,6 +1,6 @@
 # Template file for 'discount'
 pkgname=discount
-version=2.2.7
+version=2.2.7b
 revision=1
 build_style=configure
 configure_script="./configure.sh"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="http://www.pell.portland.or.us/~orc/Code/discount"
 distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz"
-checksum=72c1325ddfc40871d6810f1e272cf2d45b361f26357eb38f170fd04d737bb9f2
+checksum=48343272aa93ae913187ff678b3e52efa722f133e1efcaddc20cf775e8a517ec
 disable_parallel_build=yes
 
 do_install() {

From c6caea544d0073e86c1589b8cce66dee3bce8f16 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:42:38 +0200
Subject: [PATCH 0960/2561] fzf: update to 0.30.0.

---
 srcpkgs/fzf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 4b881ee7a6a6..ec60af9ddc64 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.29.0
+version=0.30.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=a287a8806ce56d764100c5a6551721e16649fd98325f6bf112e96fb09fe3031b
+checksum=a3428f510b7136e39104a002f19b2e563090496cb5205fa2e4c5967d34a20124
 
 post_install() {
 	cd ${wrksrc}

From 9b887b9c1f9012fa7a3d1a8a84eae81e2aef36e6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:44:11 +0200
Subject: [PATCH 0961/2561] libX11: update to 1.7.5.

---
 srcpkgs/libX11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 53bd34be6e08..e47acb6ecf69 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.7.4
+version=1.7.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
-checksum=0e7d48bfa0b0ee5705d14fe140cf4310744ed131f0a6241b7cf03db06000fe51
+checksum=5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151
 
 do_configure() {
 	./configure ${configure_args}

From 65dceebabcf4014ea8bf04cf75de7f6d5f7b328c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:45:44 +0200
Subject: [PATCH 0962/2561] listres: update to 1.0.5.

---
 srcpkgs/listres/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/listres/template b/srcpkgs/listres/template
index e1b1866ddcf3..00d1e32c60fc 100644
--- a/srcpkgs/listres/template
+++ b/srcpkgs/listres/template
@@ -1,6 +1,6 @@
 # Template build file for 'listres'.
 pkgname=listres
-version=1.0.4
+version=1.0.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="List resources in Xaw widgets"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=6a1229f478796e141d6658762f432ebbe1f6083b27550847d52239b3f7ec2b10
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=ce2a00bbe7d2eb8d75177006f343c80443a22d52570c48a43c6fe70ea074dc9d
 
 post_install() {
 	vlicense COPYING

From c618ec195c9dcb60d9c5124fe97cfd5dff6fe477 Mon Sep 17 00:00:00 2001
From: Florian Wagner <florian@wagner-flo.net>
Date: Mon, 4 Apr 2022 23:07:36 +0200
Subject: [PATCH 0963/2561] claws-mail: update to 4.1.0

---
 srcpkgs/claws-mail/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..118b7d607108 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=4.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -16,8 +16,9 @@ short_desc="GTK+ based, user-friendly, lightweight, and fast email client"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
+changelog="https://claws-mail.org/NEWS"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=0e1a9ca0db8d2a9e058ae30cdc7fc919779214ec3c56ee0c8a7f88cc23817a8e
 
 claws-mail-devel_package() {
 	depends="${makedepends}"

From 3dc3eba754eff4caa412f62fe1bfd5b9dfbb07aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Tue, 5 Apr 2022 21:24:30 +0200
Subject: [PATCH 0964/2561] glfw: update to 3.3.7

Also add changelog url and update download URL to github project.
---
 srcpkgs/glfw/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glfw/template b/srcpkgs/glfw/template
index a9168faffc67..968accbe50d2 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.6
+version=3.3.7
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -11,8 +11,9 @@ short_desc="Multi-platform library for creating windows with OpenGL contexts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=4e08897813668584b252065dc8bcb5a3cbcdd19918ede4dbc847fad7e35db7ec
+changelog="https://www.glfw.org/changelog.html"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=fd21a5f65bcc0fc3c76e0f8865776e852de09ef6fbc3620e09ce96d2b2807e04
 
 glfw-devel_package() {
 	depends="glfw>=${version}_${revision} $makedepends"

From 284e7077af61dc521a1d4f3a02a05303950598a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Tue, 5 Apr 2022 21:25:52 +0200
Subject: [PATCH 0965/2561] glfw-wayland: update to 3.3.7

Also add changelog url and update download URL to github project.
---
 srcpkgs/glfw-wayland/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glfw-wayland/template b/srcpkgs/glfw-wayland/template
index 720899cf56f7..f2abe3a8a608 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.6
+version=3.3.7
 revision=1
 wrksrc=glfw-${version}
 build_style=cmake
@@ -12,8 +12,9 @@ short_desc="Multi-platform library for creating windows with OpenGL contexts"
 maintainer="q66 <daniel@octaforge.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
-distfiles="${SOURCEFORGE_SITE}/glfw/glfw-${version}.tar.bz2"
-checksum=4e08897813668584b252065dc8bcb5a3cbcdd19918ede4dbc847fad7e35db7ec
+changelog="https://www.glfw.org/changelog.html"
+distfiles="https://github.com/glfw/glfw/archive/${version}.tar.gz"
+checksum=fd21a5f65bcc0fc3c76e0f8865776e852de09ef6fbc3620e09ce96d2b2807e04
 provides="glfw-${version}_${revision}"
 replaces="glfw>=0"
 

From 8e2626cd8bd6cbd60372624bc32fdb00ad89450a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 10:15:05 -0400
Subject: [PATCH 0966/2561] python3-phonenumbers: update to 8.12.46.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index c4dd9b71d037..0a952e920922 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.45
+version=8.12.46
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=94e30f59b2be6c4310a90f3d5da53d49900bdb440484506f3333c694ebb0cdab
+checksum=1c440f6336cb49893ff1a8326c70b4df693802ae981f210f545cd4215ac48133

From 988c6a8b7fe42e9b2a928b81c5b8b1d36fbf9376 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 10:17:04 -0400
Subject: [PATCH 0967/2561] python3-frozendict: update to 2.3.1.

---
 srcpkgs/python3-frozendict/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index a212fa1c7c89..3946c2ee05b1 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.3.0
+version=2.3.1
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=da4231adefc5928e7810da2732269d3ad7b5616295b3e693746392a8205ea0b5
+checksum=bc91c69233eb916bb6ebc40988b6d849735770240efc9c60be45b4ab919c1bde
 
 do_check() {
 	PYTHONPATH="$(cd build/lib* && pwd)" pytest3

From 461e245ebd39538d8492cd8e7509678fc790e054 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 10:13:41 -0400
Subject: [PATCH 0968/2561] synapse: update to 1.56.0.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 1c07111f4247..984ad56e0a8a 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.55.2
+version=1.56.0
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -21,7 +21,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=8e06cb264d1631d2518f2f726c89d62c5ed7148b73fbb8190a9c120d3166e7c4
+checksum=7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 5be411cf625f0786111cfc36dd1f434f045290f4 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 5 Apr 2022 11:25:36 +0200
Subject: [PATCH 0969/2561] slack-desktop: 4.25.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 b90525004d6c..ae1b738b622f 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.24.0
+version=4.25.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://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=b557d264ae68cafe383d647dfd26f366ee94315f77132f64bff8f9ef44635197
+checksum=e88160a02ca489f0d54afca5bba1aeb17c886b6458eadcad73bffd959c85422c
 restricted=yes
 repository="nonfree"
 nopie=yes

From 4665dab3dc06cfbde98de4889dbde2784183ca66 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 5 Apr 2022 10:22:19 +0200
Subject: [PATCH 0970/2561] google-chrome: update to 100.0.4896.75

---
 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 a630fcdae463..5f9e67c864f2 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=100.0.4896.60
+version=100.0.4896.75
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=05ba6d17d2704ffff1e1d554b40aaddabca9256b7e63ff73e99c469393de8a1f
+checksum=856934272783e5a48fa63e30eb896040f5b46d6f394c1b3aa2e461cbf89b395b
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 44bffdcc28ce8ec3fc9b31c873381253d12adcd1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Apr 2022 08:31:56 +0200
Subject: [PATCH 0971/2561] libvirt: update to 8.2.0.

---
 srcpkgs/libvirt/patches/823a62ec.patch | 48 --------------------------
 srcpkgs/libvirt/template               |  6 ++--
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/libvirt/patches/823a62ec.patch

diff --git a/srcpkgs/libvirt/patches/823a62ec.patch b/srcpkgs/libvirt/patches/823a62ec.patch
deleted file mode 100644
index 5fcc644d3e5a..000000000000
--- a/srcpkgs/libvirt/patches/823a62ec.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Tue, 1 Mar 2022 18:47:59 +0100
-Subject: [PATCH] qemu: segmentation fault in virtqemud executing
- qemuDomainUndefineFlags
-
-Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
-
-Stack trace of thread 664419:
- #0  0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
- #1  0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
- #2  0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
-        at src/remote/remote_daemon_dispatch_stubs.h:13080
- #3  remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
-        at src/remote/remote_daemon_dispatch_stubs.h:13059
- #4  0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
-        at ../src/rpc/virnetserverprogram.c:428
- #5  virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
- #6  0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
- #7  virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
- #8  0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
- #9  0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
- #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
- #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index bcd9bdb436..8337eed510 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
-         }
-     }
- 
--    if (vm->def->os.loader->nvram) {
-+    if (vm->def->os.loader && vm->def->os.loader->nvram) {
-         nvram_path = g_strdup(vm->def->os.loader->nvram);
-     } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
-         qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
--- 
-GitLab
-
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index bf08aa899e00..e73c337822e7 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=8.1.0
-revision=2
+version=8.2.0
+revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
  -Dpolkit=enabled"
@@ -20,7 +20,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=3c6c43becffeb34a3f397c616206aa69a893ff8bf5e8208393c84e8e75352934
+checksum=0ecd9c7dd52db7a2d124155ffa5e11de2fbd05014eceffbd1972b022d21becba
 # At least one test times out on CI but works locally
 make_check=ci-skip
 

From ef31a7f55eb7412fed16590a1462a158f45bb01f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Apr 2022 08:34:02 +0200
Subject: [PATCH 0972/2561] libvirt-python3: update to 8.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 f74de9d9c8f0..2aea5df86fec 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=8.1.0
+version=8.2.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ 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=a21ecfab6d29ac1bdd1bfd4aa3ef58447f9f70919aefecd03774613f65914e43
+checksum=f8b8cea67ff0d64d63029cc3410a4656e04ee9f26837a856bc0c287da55d053a
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest

From 24931ba2329d26bf0e90673c79db3cc2ec507a2b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 6 Apr 2022 16:57:59 +0200
Subject: [PATCH 0973/2561] gscan2pdf: update to 2.12.6.

---
 srcpkgs/gscan2pdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template
index 295488de54ba..c6486bd905f9 100644
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'.
 pkgname=gscan2pdf
-version=2.12.5
+version=2.12.6
 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=305596f434c9fecbed80dddf6f0fb3786a60837a602280bd8d9d47906e69eac7
+checksum=f67b695043376ee4f71219de5f3f46f1b89bbf33a710ae97b748c9713bcb293d
 nocross=yes
 
 do_check() {

From 58ac31433988f27799c57e5f7e6f29dae1dd10a3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 6 Apr 2022 16:58:52 +0200
Subject: [PATCH 0974/2561] wine-mono: update to 7.2.0.

---
 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 06f2e20dd7ea..ec9fa01077c7 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=7.1.1
+version=7.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 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=9dc8e5603b7bc64354eb94ae4ea0f6821424767a3ff44ff0d19e346a490c11ea
+checksum=5f06eafbae3a49ecc31dfcea777075bd44f0cc126e4fb4e28ecefa06eb436323
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever

From 5b83c62e881f4138c36abfa577e8391757091fb4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 17:15:45 +0200
Subject: [PATCH 0975/2561] firefox: update to 99.0.

---
 ...ktop-icon-path.patch => fix-firefox-desktop.patch} | 11 ++++++++---
 srcpkgs/firefox/template                              |  7 ++++---
 2 files changed, 12 insertions(+), 6 deletions(-)
 rename srcpkgs/firefox/patches/{fix-desktop-icon-path.patch => fix-firefox-desktop.patch} (64%)

diff --git a/srcpkgs/firefox/patches/fix-desktop-icon-path.patch b/srcpkgs/firefox/patches/fix-firefox-desktop.patch
similarity index 64%
rename from srcpkgs/firefox/patches/fix-desktop-icon-path.patch
rename to srcpkgs/firefox/patches/fix-firefox-desktop.patch
index c4664d3da7ce..3f0273cba366 100644
--- a/srcpkgs/firefox/patches/fix-desktop-icon-path.patch
+++ b/srcpkgs/firefox/patches/fix-firefox-desktop.patch
@@ -1,6 +1,6 @@
---- a/taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:31:39.428839442 +0100
-+++ b/taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:32:20.689063456 +0100
-@@ -154,7 +154,7 @@
+--- a/taskcluster/docker/firefox-snap/firefox.desktop
++++ b/taskcluster/docker/firefox-snap/firefox.desktop
+@@ -154,11 +154,12 @@
  Terminal=false
  X-MultipleArgs=false
  Type=Application
@@ -9,3 +9,8 @@
  Categories=GNOME;GTK;Network;WebBrowser;
  MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
  StartupNotify=true
+ Actions=NewWindow;NewPrivateWindow;
++StartupWMClass=Firefox
+ 
+ [Desktop Action NewWindow]
+ Name=Open a New Window
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 6c1596b19e06..8ee3b78f809b 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=98.0
+version=99.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd
+checksum=513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327
 
 lib32disabled=yes
 
@@ -32,7 +32,6 @@ build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 
 case $XBPS_TARGET_MACHINE in
 	armv[56]*) broken="required NEON extensions are not supported on armv6" ;;
-	armv7*) broken="currently broken" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
 esac
@@ -73,6 +72,8 @@ post_patch() {
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
+	echo "MOZ_APP_REMOTINGNAME=Firefox" >>.mozconfig
+
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		echo "ac_add_options --disable-jemalloc" >>.mozconfig

From 82c081cd53554ae1f3ea836a2e4d8df7aad8d00b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 17:15:53 +0200
Subject: [PATCH 0976/2561] firefox-i18n: update to 99.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 713c5914d0ab..0e98d438bd21 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=98.0
+version=99.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="dff169f590c9ba54034df42a131d067a30e6ed967fc0e5142705df22d8ea977f
- b73f738bae53b0afbe28d087a889ab7c98e3b325cfd5122cc60eea59a7db8616
- 4f13f00bda1aafc6a2d97041fcb3740a4e8c1c049bba151b3791924d73d3ef06
- 02ab060f05a1a2af373c2a3fe48ef891fa6d1835ddee77ba9678f22bb4782e86
- b02d91316af55caf87abd7650b286f9c181eb7added7d021446ae2976ff69bbd
- dfb07ae1cfc143166fdada9e378cb4f22e4ddda92d0e2c66e6a1d2742c51d0c0
- 4a0409fdc266d1e819a178d558d90b3209c8423cf2794ca0fce3eedea947faa6
- 567e77ed85bacaafbf82fbc90dfabae6e31be8acec5a2db8cfd28197d5bd1815
- b92173bf696785e4f64f74871996c75c9fe96854e3194ebf7ff1dcc9f817b0d8
- bbd223abe4457a1e7425f0cf035c7b6de33e26440d30af8655320ff9c68b124b
- 8e98b9083a77a97886affbbf089e842b0286539fd93df18b031c8d7e8ac92d30
- d4a94e6f5753e5f4d2a777830a0cb23ac94298278328bd3579606ceb47d949eb
- 360dc9fd3a91eac883ca28efd02c218d7365d889146278129ea27424ba452a58
- cd9bc801f9807b0b8f1dcb3ff8bed985cbe291ee95f25963617845d1d7de57b2
- fd5b0f3d1d81c74ebd53b4e2f221cc79dbe9c2a936e73b6a983cb666d6c8f7a6
- e2b37b8fa911c4bca068b0fce10db9fa28490c939c15fb8ffda785d396e6f33b
- 2a0993286c9e5f1350a660636ec2b43c9c7d974ac9d1c2c979df888f81a90141
- 2fc6465bc4dd66c23deacfa7d055a2bf50eb2db9a0a10c20f6f3b5321879e33e
- b88cd11ed43a4f67897434281a4ebd7ef7cb3f4c4d041822fb672d0812d98a2d
- 9d3de3237d2e12e72f9244151ff9c24caccbd7e1a560718f8f41a0bb7e96e2c9
- 1cb6d182af78f237d0d01edba2263b01173377ddc0c9b1e7f5db1cf593765da8
- 52a7d3401c0d333fcf98b33bff2fddc88ae017476e0be74c73359c01d9f7eaee
- 661374e104b98180fba058d4ab6574246d4d9244739decdfcece493338f1ed3f
- ba74a4dba80b8cde6a4105cd6179a72005123d1c92898496a2793479c1921676
- c6259edeb1da7d3ca05ca4b3565408d02e48e3c7f7a254d56b41fdb3639cb56f
- fddfbe98c0d309323981b685b134f000cc9c69518efc365c5c559ffd2c05b602
- bee9c9a60147bcf86f55bccace7fe63316fb79af7cd45b8ffe43abba980db8b9
- 8a4536988167922619e06721229fc91d087d56177ce2ad1a417dd52bc218814f
- 1c11f7b7d2349d8bf0cbd3f6133d1f93b70b6d0176555d538e0bfb7774ea0de9
- 52bc04a4c244de19b4e02a60b79fd760df35a2b825363a1e94c5becd535413ec
- d19315771ccaf194add0459e85a44a8a11dc04f2d9b426201fd4c7000e4defe0
- 3e0df7a54beb78791adfb9f56cc62c5cd01126e964fa90cc1bb65331b2d572f6
- 49b38e6fe6746b2c3e4bcf8a1b7bc828ac8c5784dbe5b1039edde51d2e942dd3
- 97751019d9f01120a0acf4153b3b06c2e476b83d5da8561bac349cdcba5fe095
- bb222cce7ff359eeef5cbaad871aa42214ab5b62872deead6cc57068d0f1fd8b
- fcff68e01cbf4740e7816fb61a15853f9be14034b3fdde1a67b22f80dd43ff33
- bc7c2beadf026cd535635b540c2a8ca7953662b154b9e128378b6ab51ac62953
- b1f207489d09eec55d486b467ceb88bd289b7238ff506a01318d797811121f95
- 08dacf388f2a04796450d37c2a7db5270b3515c38ef0f0426ecc59915ae6b812
- cc7e4230277d9b54f114048f951880aaf4ed88af03a5791e0dc091ecb947e956
- cd6024b8bc6780265146720559fb1f828e36688eeec919044a62d365b440ba97
- 33c1d05921e6041db7d09279da354e2d406798ffd14c67b9cf204e339fc1caee
- 0264439a560fef95488a5aa05783b24e39d16acbed6f1b389a75864ac60f3267
- f174f19aacd50078adceb236e9432feccaf0edc8aae9632191a4c38dab22b206
- 596b84ba309ed661429c8fe5a13baa38e773f40b3b17c997d61834afec92b535
- 6e2e243496089c084844868744ed2a736e621fc14fe95cdf3b5b7507d56b022e
- 91449d6929c9c3068d0c724315e00d412f25c7ca72fddba53ac97c24f4214189
- 138ca2aaf0f0a2decba98db228ac835b1299c841932bf683deb635a8cf226616
- 299bacaffa3b2f8bc359b7bd33a9e4b5588546f7b75ea323ab63b6a25152ace1
- c9eaa1d9e843a07eed355db514c10f8df0e898f9f177dc96eb721643218c6314
- 5231901059f7a9d7b5bd7ff15168c469f2f7813c85c7266b70c20661e2eeb838
- c2d0f151ffd2e9daf33bbffc2d069fd65c258d7c69b29f38785e2e395d8ff6c0
- c2edbea7c2037a57524c4899a888eb0a3007593f0b39e8686a049b5dda10a768
- 95acf4112f5b67f22f8df330e53e6cf764e1648f6fbbebc7feb316dc3eb6cf8f
- 22224ae5b1818b86a5ce7b5872ebcea1c071009a6fe1abcfcf26cfe36b53c6b8
- 035658f37f5a9c025db1386a89f5c05b72895b73c1a6826656055117afbd5239
- 627d5f227d5e39c98802dabf68096f2588ee988afcdb13b95470457bb1f1c44c
- 7d5f86ab7a0f47947ccfebf496e7e8164d433ee7560c39661a0f3d88995d72c4
- 9623353017b1f980f43eae284662dbd2cd0b1ea1d8864e4fa6f86c83d78e7c06
- 1fb1f82cbaca4a5463b8375709dc2e865dae4492ef294c7c39324fb867e58272
- ad7df8473b55cc460476e05f265e7c496f711dbd6635b594e3d1cdd435ff6504
- 38416b1b2ca89bec7e71e2143ba27e64b2c3319ef45499346b47dc30fbca793c
- b55d6775b6bb9254b87692e244fd7078ec93c031efa51b6d205cff98a1651484
- 66318b8528b59acba6be065989e51b5187a8735cc1be87fb25c835d9f5ae37af
- 423f5a30c7174d2b41f5fcd38beaa232967990f66aec84769ce501402f5881a3
- 7933dfd5d65816c54c8ab3da1455d6810c4d1532790d95c54b0bc4adc055ff40
- a44392970b81bbc639822aaa9f73f7da4e64e39b91a402483d5bf98538fd88e4
- 0cf1c29300b3fee8659c630bd37867323c42422b50bd429e9ca196025fbf090c
- ff56285588b4bcc927db05ac856e2bf69d4f6b31c63d254242551c0315719854
- cc1de1d246c39e1214186cbe88932b70e8e60121739faf9c88f24446e74445b8
- b97123397c9f1419bd6ce9c62a7be178c35683b64fe3c20046ee4aeeadd2f83b
- b09681f50489150130ae682139d6427f1fc77c2cb2a9debdd5db9fc4ae307a1c
- 84f5dc461c256fd058522acf368c5d83a4560a8a478be5f5d551a1a194598374
- 336a044de2b47ee875f27627059bef2dea0862908b2bd937416a2765ec91eeda
- 3154deee82fe4fa24df33713a2a9688c1028c39df791732af097419dca83e3f6
- 973e3de5de51533ebd699879ec1679525e7b35a0a74218f68c29a1b4d2280c2d
- 18344197c44ed32c4cf31df5c4424d0128b6791a57fb910ce42e1f68d282e13d
- 87c4014428af7f4303f9accc16951be16dc7122a191d1465d0a5e0b60486ef80
- 6ca8549d8c1c91ca2136e49458b935974354640aa6bab2a8d2255868d56d87ed
- 2a18628d8955170725121f5f5a2b4262e39456e9fd4a007bd387f2a14e235a50
- 96cbf50ad97ada93a6e0156557911911e46c7963b34951cfe5abd0be3dbfaade
- ba6fd1a48128dfa48a1f3c70b28181e658abbbf549e104d08df3f27197475dcc
- 7bb5c17d1f1e25cfc735867f005563ead7de99c19e27f05a0efeced067ab50be
- b3712f4146b50e243a6b2056d062045a14c9d8057ba1430f5c2662dac06ac34e
- 8f1c167582e3d46cf2d24887b47dd4830f0dd084aefd7371b61ef716932db352
- 29563c43673308e83437984ebe46e650a56e11be5fe2e1298946bc232287e121
- 9badcf85535fc5b2282bdaea3fc6ac15d0f9f560524015321f0ed5c075fe7e5b
- 1b6c1b1374e257cb5f699f71dbd1d2d1a287588548610272598a85b8133fcaef
- 3aed734f122676a568c68a98a3243570dea7b06cf5a65f1be1ce060da2fe6804
- a365cac889289ede9cf61a0fb73b8efe7cccf758167354ff43b29b3845777c82
- 20c519b8cf6f16eac1fbc00b93178eb78c076f10518faf4c43f9606de6fbab83
- 138ef57dc8947ef1580ee7fb0edc3459cd49a16ec296edabcfa913c784ee7320
- 1b4fd65008d7780b9af4857ef91b9d4eccb97cb3469d90a982713812ab7c1b11
- 1930509ac41ac78987f50332f9e44b66d0e27ad59fea56e933e05d4475012196
- d6c16dec9ea82842f64e11ff7f6b4194f9b513f904423291ec8e7782ab7024f8
- 54af90457d760ea7ac38b1b6d7b532996542192d0541004f9da9386fb5ea91ea"
+checksum="e398f1b14ae79fcd74639a81b27c4cd38b09282ca625d1b72c69df09fc4ec1fc
+ a8cbef3ba5c35e33c0f1e02dcd2781cc362315d5b63e9e6065a22afbe460581f
+ 35b4f32eabd40875d518cb174858bb6d8ecff272f4ee677e0c108d8395707960
+ 4f1a97c404347121c53799efd2a986860e030b7789e66e252d92b6a78012b681
+ 580e9e9fde913ce410774d366bad95af3a67df52c688a6ad64ad59e8d33eab47
+ 91236c6ecd7ee99927d5b69566cc30f4b1de6e7caca3336386f3e7bb995c96e2
+ fa36e967b14e530993e3a50fcdc5f32e686f5b110f6cdee59b8c555c82294517
+ c88a65b1f3c10085b0d5236a3e687b70cd9a620803393caf81b4ee0677330ef0
+ c12d138948d4e5cebce1051f0cc750f8f9bfb23f733417e7e7b9596ee74a6980
+ e4b9cdcb7c08beceecfef7d8b94d70a24e3f24404c73cd7cf5aed6572e293bf6
+ 75d09dfb5c0b55b670c912feecd48bfdc7f936f31c41d8e4b2ede0e46d16f749
+ 8780f97e115fbe8f156412757d1980517b85dc409fbbc8e0266bdcc7d0568c83
+ 815c9a81efce33b19b9bcabd46093ea92bd062698575c83ea127f20a3495c984
+ 76e9a327a69960f4ebd857b5b204d435d60461b7129aa70db90ebb28411ffaee
+ 8fdd5adfec75310172819a959a2b68ad3ecb614c94298be315804e730b43a160
+ 8947c35c94f08bbb61a3beb8b106a776d0f0a3b2f247b9e49619ab9b9416bb19
+ 7851a711a8de28c6e6c3c07814ef995263f4c3a48981742f1aa481389dab3897
+ 8bb525f9045c91b3f539103eb398da1d1f71a580971a1adcc780198da36a2623
+ 04cfc4a69fba8f3838d385179511954277cf1f6d8243663f338941c1e86a49ca
+ cd9f142ac06d16919b5f1102ae53f1241574057c75012198fe1dbdb7a8d63a8c
+ 8ff53385252becfbc2f15354ea57b873251584444129c137350e974dc488318c
+ 9a58559be92950e33051625e49dd3f5bae36c225b9a7030bec9a6aa78d45ba93
+ 6e0f538d93f8b2d189c667c2aac37c6d1eb50fb802c4ee2ff310db15da57de56
+ 2c051ea90460cda20296b1a69037e037b82258fe382c9031594974e75cbc10eb
+ 053dfbb9ad0feb3b54cab94bd8f5ac544ec598f9b819a7d163496f838104b8a5
+ faa25b7302f249b9aaea768a7cf61f78f67e3637e9a62906361a1fae257d0161
+ 54f02a1e948d2944b3889152b093200a0d31358df28f7309e5fb5d490616d317
+ 7c104e3c70024163fc0fe7597df0a995b2e813319dc23268fe36e04f09f2ced7
+ 2cf6b8e82042208407bfdbad01a3d5113c87f0bd37acb082452f1f6c22bf1485
+ da05a0fe7a65ce243f0ec69ad60d93a3bc988383f983343a66b399a2de1a10a0
+ 13da03264b7d522bcbb77cfb1fece6606f9efe742822325ced7627fe28add070
+ 0d835b249070428d8d5e1c251ab46b19df71cc2858b69843a41eee897c27b396
+ 5dbbe35e45b15dca15ba5de15aa55b4fce44d33fb456ca8184270c0f162567d7
+ 9e6b2c13f0c2347fe27e189dea6dd8a3c5b23aaac668010213258bd26e0d3da7
+ 1aa07979f8bb7d6039a11f64b3c93b3c70332def967af6fb426897b7c65fdba2
+ c21b99ea6049d498bb446770801e3c9f8041bd11e0ae8164bd16a016f14f5578
+ ed537abf79efa484fc920902d59ea1b840c6acf6fa540f435722f5c75a1bca90
+ e9517bb3330ec5cb2a743dd56a69c912a35b6dafe6a7abeadfe1532a17963549
+ cf97f81502f30c807fde8127c6f8ac1a9ea58508ba8d243ea0d6fbabe2ddc8b1
+ 85b90f53e79bc2961b3f0c702ba5762ba7559c366d7682bc66b20514769c2a92
+ bd31d635b44f039ad2f89e4ad1cd0f7fcbcec7e0d6d381f8bf89e17bb74aa952
+ 10d597d44d8261cd0eebe024de51ba803c94792d13c5732d43ed9bec4db72783
+ 33da29355095f9ae0383e21ae0c6d300d6a7f298c7e126e8747c71277b1175be
+ 84ff5d1b88c4205eba0f04e89daf4d91e9f25da4590367050917a6d34c629147
+ 4de39e8b907391f197fe5d138f87985d74d3a34796c3963f2e33142164696f84
+ 47e8c5ece6643d5c6cac713799c841e73c0bda691243ccd346b5e85b0a4810d1
+ c196be8854dded19c2a85c5bb7f3ff3123da0d91852da7b16f844cb44e9d11fa
+ 7f97921badcf0c7ffeb92c6f1d1d2ada3afd0069e8e80a524ad3b7c0c1220f0a
+ 79d845fccaa1916f07dfd821c3ed95dd5647b70bd9a39e485caa66cc65a077f7
+ 40ce23e0cc6e4fa5192e987bc835c1408d958a2fcfb8875370db517ff64c92a4
+ 8f6f739077a383884d400c3062925e0e848be4942e3be0e378e589bfa3941c9c
+ 9f014d8807130a01ae008997393deb4c865c70482a4fe75f3cee0e9f8071246a
+ 240aa4b7091065ef0495c8f52eeb91b5a0cae03676c6ea4cedee9260e204dd6f
+ 788f7ab9bfbb7b692d4d28efad9ae3de964ef7bfa4e30f6f50a3bd178ac004ee
+ 04a7fbbc1b0769a5b66bb068385482e50c5f70298eba250235d259bc4aa3ea99
+ 30a1707f4a57a2ba738eb27f5525daa12f0713e3bb7b1a3ebe2c710ac6e37a27
+ bdc752daf3b4e8f8ea3980d98a01d7249f38dddf183909eb55a8c50ad30368e1
+ 48332123774a79eed86d1e826021a05a3921ac5f95ca54e086f173c8e1e72fd1
+ 31f2f1c2adabe35fd353d3720eb8458716f926e57c9d782518f943533cd1a72d
+ 4756150d141a8ce3e2bdca7fdb1b343466b19cb9a19adbfa25d86c39d0f7c933
+ 024f3b186772c5381a458dda4a6b914fb2695f8c16e648c58d463072f10f5b57
+ 8160d89f88b3c7d9e967377e513b8fc18e4a19faa55f95371db3553564db65bf
+ 6d2816247894f2e73ecb0258ee5a9b85b650542bac46a8587d547c8824e2d280
+ d3e017f003c34a6768670ae2c8bbd5e3500f452647e36193614810ced595b2b3
+ 7ceafc2a330620665c51e8b394d296ddb190d97f4cebcd0a247d0278d3a54274
+ 6b6992a92df788fbd119446aabd9329b7edd1643a8dd1e3ca7b60dc7976b3b60
+ 8dee92aa771ca1b0deb233b974f844b8025d4b25f2ff8be41d91c636565eb7f0
+ b4fc00a30204c8c5b19c92bd3164b98955d9591366f89c194fe248bdbc0ce580
+ 406335d53b11c42f34446adc68d6836a6841fc34af3c2f1fa621ddc2026017b4
+ 7ac66cef872878f6e5568266d9c807da1cc4041ae51723cf387590954f73cf7d
+ 74c5306c711a4150cb6f89289067533a5438495a251d63cb06f586d27eafbeb4
+ f3e67b76944280de1eb8df059bec0f0eafd06a4bc4e7c93e98c434a17192c084
+ e13b87e04ee3fbf7ea0c02e4b176d6dc66dbd234b59cb245dfd225e65c5cdcd3
+ bfab113c2dde187aaabfd89957c7dc840bbbb25c4f27b31fb422c9817035eaa8
+ 7bde7feb01a40d3b89b78928154fcfc0eff8c77b086e360b940f61d45d7eadb0
+ 18f2267d16b30aecfd2b6f9437cc79bca68084680b2770820323a968fd20c93e
+ 5bd5138456fae929520bbd821beddd1f934d156e3c99916e47df31b7bedaa32a
+ eb4db96ab4b78dede2d92db7c0c3dd4084971178f101a342655348a4b90a6487
+ 07a06be606d6adacf1cb57cbf448ff18a7c13c90df9e11768ac3fe3e200569a2
+ 090e6759314eb16b2169bd1f89387963ba81a0e565f1d77143f2da0e6d267e28
+ 38cf5fa44116bc15f12db4506db386b147762838f25d991a0c39cdcd236533f6
+ 448a4ab5be3d9f246f961705a02f31abcaa8c616351c4d05857c3db41ba83154
+ 3fcfcc54f9ec4762b4b78ce0db9351ac59a717e4931d6267cacafa16d3d41057
+ 7349863f4edfd79321be9b214384138596cbe16ecd2107cee58501e2511c438a
+ 4a50c82c68898c25dfdfcb95079750a455ba2e4d1397d5e51cc2991dce1be60b
+ 275ab1a945003153a10fd5bbebf8ce9af346e5ad2068c83eebdcd60ecf0ce99e
+ cce68831a20669468b108e3dd58dbc34cd981c874bdd299b715df838ba5ca0f9
+ d6cdb55b0f8d7f3c9c4f3bc7906feb123f84243bfbd719eab75a6894cf455582
+ 74012d5c8c22cc2f5780ae55020cdbe3c74f21671a2769fde907dbd63e0281bb
+ 14a02938f76ce51767746ecc104ff571f2da0429144ee981cd28af8b4eda3518
+ dc05af8f59bdbf1c77d6d45dc1bf6bba634b782533e245993d852e39f145cfc9
+ 557444ed827906476ec3385ffae1e1952acc5b3234840fc645ff892c9753b2f3
+ 9925d116300b43f82061e1c04deae6c241cfb121d46364aa1f206e0d8bd9732a
+ aaf3249f295362530f04f23c00e309baa5a7a89c70bbf1a3a763b8ef66631ac8
+ d289624c73955ff377057be150ff8d52118810a4adaf861fe51b7f0a0b80dbbf
+ 2f07d98e74625892478c321161f62db8c790d978dd4e5c3633c5cf5ef5d8d6b4"

From c2728dc35a475d2c603ebb270fe525864200f45b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 14:45:55 +0100
Subject: [PATCH 0977/2561] meson: update to 0.62.0.

---
 srcpkgs/meson/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index adfa2d52f7ab..2a4453076e8f 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.61.4
-revision=2
+version=0.62.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
+checksum=06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -40,8 +40,6 @@ post_install() {
 	vmkdir usr/share/vim/vimfiles
 	cp -rt ${DESTDIR}/usr/share/vim/vimfiles data/syntax-highlighting/vim/*/
 
-	vinstall data/syntax-highlighting/emacs/meson.el 644 usr/share/emacs/site-lisp
-
 	vcompletion data/shell-completions/bash/meson bash
 	vcompletion data/shell-completions/zsh/_meson zsh
 }

From d1cc9e3fece55696fdefc94834b3605e010a63ff Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:07:16 +0100
Subject: [PATCH 0978/2561] accountsservice: fix for meson 0.62

---
 srcpkgs/accountsservice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index c00a4077d8f7..804d57e9e421 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -6,7 +6,7 @@ build_style=meson
 build_helper="gir"
 configure_args="-Dsystemdsystemunitdir=no
  $(vopt_bool gir introspection) $(vopt_bool elogind elogind)"
-hostmakedepends="glib-devel pkg-config polkit"
+hostmakedepends="glib-devel pkg-config polkit gettext"
 makedepends="polkit-devel $(vopt_if elogind elogind-devel)"
 short_desc="D-Bus interfaces for querying and manipulating user account information"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 6bb59c1a622ce95cc0d8d78fd44012efac86b755 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:12:33 +0100
Subject: [PATCH 0979/2561] atomix: fix for meson 0.62

---
 srcpkgs/atomix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index a59e134ebd91..31f34e1efc59 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -3,7 +3,7 @@ pkgname=atomix
 version=3.34.0
 revision=1
 build_style=meson
-hostmakedepends="glib-devel itstool pkg-config"
+hostmakedepends="glib-devel itstool pkg-config gettext"
 makedepends="libgnome-games-support-devel"
 short_desc="GNOME puzzle game where you build molecules"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f19e4dfdcff73ca65578d3d583affd7000859c58 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:21:38 +0100
Subject: [PATCH 0980/2561] babl: fix for meson 0.62

---
 srcpkgs/babl/patches/meson-0.62.patch | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/babl/patches/meson-0.62.patch

diff --git a/srcpkgs/babl/patches/meson-0.62.patch b/srcpkgs/babl/patches/meson-0.62.patch
new file mode 100644
index 000000000000..a105c98cb0db
--- /dev/null
+++ b/srcpkgs/babl/patches/meson-0.62.patch
@@ -0,0 +1,33 @@
+From b05b2826365a7dbc6ca1bf0977b848055cd0cbb6 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Sun, 13 Mar 2022 20:26:05 -0400
+Subject: [PATCH] meson: fix misspelled kwarg name
+
+set10 doesn't have a `Description` kwarg, it does have a `description`
+kwarg though.
+
+This caused the conf variable to not have a description when it should
+have one, and newer versions of Meson with better argument validation
+error out with:
+
+meson.build:58:5: ERROR: configuration_data.set10 got unknown keyword arguments "Description"
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 55054f441..8c93be9d1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -55,7 +55,7 @@ lib_name    = meson.project_name() + '-' + api_version
+ stability_version_number = (major_version != 0 ? minor_version : micro_version)
+ stable = (stability_version_number % 2 == 0)
+ 
+-conf.set10('BABL_UNSTABLE', not stable, Description:
++conf.set10('BABL_UNSTABLE', not stable, description:
+   'Define to 1 if this is an unstable version of BABL.')
+ 
+ conf.set       ('BABL_MAJOR_VERSION',    '@0@'.format(major_version))
+-- 
+GitLab
+

From a67e6fa4a29cd9059b596bd6a9be0027923152d1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:33:02 +0100
Subject: [PATCH 0981/2561] cawbird: fix for meson 0.62

---
 srcpkgs/cawbird/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
index a307ed212e54..85c5d621bcc0 100644
--- a/srcpkgs/cawbird/template
+++ b/srcpkgs/cawbird/template
@@ -3,7 +3,7 @@ pkgname=cawbird
 version=1.3.2
 revision=2
 build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
 makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
  json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel
  sqlite-devel"

From be6e613ee9c7189fb52279a62fa317e1d496a60b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:54:30 +0100
Subject: [PATCH 0982/2561] clipped: fix for meson 0.62

---
 srcpkgs/clipped/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clipped/template b/srcpkgs/clipped/template
index 3ced5834bfc8..9386038b3f42 100644
--- a/srcpkgs/clipped/template
+++ b/srcpkgs/clipped/template
@@ -3,7 +3,7 @@ pkgname=clipped
 version=1.1.1
 revision=1
 build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
 makedepends="libgee08-devel libXtst-devel sqlite-devel gtk+3-devel"
 short_desc="Clipboard manager"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From b572237bbe43eb2b9f312c35cf480727da9d7dca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 18:01:30 +0100
Subject: [PATCH 0983/2561] eolie: fix for meson 0.62

---
 srcpkgs/eolie/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template
index 52c0f08d2f45..d709b2c7cfce 100644
--- a/srcpkgs/eolie/template
+++ b/srcpkgs/eolie/template
@@ -6,7 +6,7 @@ _eolie_hash=bb4aad19272cc636bd17f2f6602127fe
 build_style=meson
 pycompile_module="eolie"
 hostmakedepends="appstream-glib desktop-file-utils glib-devel pkg-config
- gobject-introspection python3-MarkupSafe"
+ gobject-introspection python3-MarkupSafe gettext"
 makedepends="gtk+3-devel libglib-devel python3-gobject-devel webkit2gtk-devel"
 depends="gtkspell3 python3-dateutil python3-gobject webkit2gtk python3-PyFxA"
 short_desc="Web browser for GNOME"

From e42fcdc81bc74c0ef6b8fc10fb3c6d475a8f7ee4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 19:03:54 +0100
Subject: [PATCH 0984/2561] gamehub: fix for meson 0.62

---
 srcpkgs/gamehub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index e8f110b3eb8d..7e8b35ef9af0 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -4,7 +4,7 @@ version=0.16.1
 revision=1
 wrksrc="GameHub-${version}-2-master"
 build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
 makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
  libgee08-devel libsoup-devel sqlite-devel libxml2-devel polkit-devel
  libmanette-devel libX11-devel libXtst-devel"

From 00459c9ba5afbcfa6f9cd612500d275293db089f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:24 +0200
Subject: [PATCH 0985/2561] gnome-multi-writer: fix for meson 0.62

---
 srcpkgs/gnome-multi-writer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-multi-writer/template b/srcpkgs/gnome-multi-writer/template
index 7d0e5085a6ab..cc21737d0601 100644
--- a/srcpkgs/gnome-multi-writer/template
+++ b/srcpkgs/gnome-multi-writer/template
@@ -4,7 +4,7 @@ version=3.32.1
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="docbook2mdoc glib-devel pkg-config polkit"
+hostmakedepends="docbook2mdoc glib-devel pkg-config polkit gettext"
 makedepends="gtk+3-devel libgusb-devel udisks2-devel polkit-devel libcanberra-devel"
 short_desc="Writes ISO files to multiple USB devices at once"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 25f3426d46b407f724b322c8779e85b0f14bf38c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 10:46:12 +0200
Subject: [PATCH 0986/2561] gnome-passbook: fix for meson 0.62

---
 srcpkgs/gnome-passbook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template
index 7348a1944502..30cd8e93b721 100644
--- a/srcpkgs/gnome-passbook/template
+++ b/srcpkgs/gnome-passbook/template
@@ -5,7 +5,7 @@ revision=3
 _release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9
 wrksrc="passbook-${version}"
 build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
 makedepends="gobject-introspection gtk+3-devel libglib-devel"
 depends="python3-pykeepass python3-gobject gtk+3"
 short_desc="Password manager for GNOME"

From 9e4b8f4294226aa0d91e0ba62be2f3d5c13e62ff Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:42 +0200
Subject: [PATCH 0987/2561] gnome-power-manager: fix for meson 0.62

---
 srcpkgs/gnome-power-manager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template
index 58422cd9da3b..0c3c1ff4306c 100644
--- a/srcpkgs/gnome-power-manager/template
+++ b/srcpkgs/gnome-power-manager/template
@@ -3,7 +3,7 @@ pkgname=gnome-power-manager
 version=3.32.0
 revision=1
 build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
 makedepends="gtk+3-devel upower-devel"
 depends="desktop-file-utils hicolor-icon-theme upower"
 short_desc="GNOME power management tool"

From f8608807a757e8ae675ced72d574ee7f02ec36ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 14:17:00 +0200
Subject: [PATCH 0988/2561] gupnp-tools: fix for meson 0.62

---
 srcpkgs/gupnp-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template
index 09507922f46c..cad194d50f86 100644
--- a/srcpkgs/gupnp-tools/template
+++ b/srcpkgs/gupnp-tools/template
@@ -3,7 +3,7 @@ pkgname=gupnp-tools
 version=0.10.0
 revision=2
 build_style=meson
-hostmakedepends="pkg-config glib-devel gobject-introspection"
+hostmakedepends="pkg-config glib-devel gobject-introspection gettext"
 makedepends="gupnp-av-devel gtk+3-devel gtksourceview4-devel
  libxml2-devel libsoup-devel"
 short_desc="Free replacements of Intel UPnP tools that use GUPnP"

From ef86c89358ee93b5a708cf3dd5f24f392ad05f03 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:58 +0200
Subject: [PATCH 0989/2561] io.elementary.icons: fix for meson 0.62

---
 srcpkgs/io.elementary.icons/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index 95dbc0ca3ddb..1e1945d0bb73 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -4,7 +4,7 @@ version=6.1.0
 revision=1
 wrksrc="icons-${version}"
 build_style=meson
-hostmakedepends="xcursorgen librsvg-utils"
+hostmakedepends="xcursorgen librsvg-utils gettext"
 # gdk-pixbuf needs librsvg to render SVG icons
 depends="librsvg"
 short_desc="Named, vector icons for elementary OS"

From a54eb25d5e8772c7b2ef5d5504d5ae1729223d2e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:34:06 +0200
Subject: [PATCH 0990/2561] quickDocs: fix for meson 0.62

---
 srcpkgs/quickDocs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template
index c4a22e6bbe7d..b2cbb667c8d1 100644
--- a/srcpkgs/quickDocs/template
+++ b/srcpkgs/quickDocs/template
@@ -3,7 +3,7 @@ pkgname=quickDocs
 version=2.2.6
 revision=2
 build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
 makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel"
 short_desc="Fast developer docs reader"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From 379405b8e0494725037f23df0a132ec92b6a73eb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:51 +0200
Subject: [PATCH 0991/2561] rygel: fix for meson 0.62

---
 srcpkgs/rygel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 06c85e2bcf4e..1493b825a564 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -6,7 +6,7 @@ build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=false -Dtests=false
  -Dsystemd-user-units-dir=none"
-hostmakedepends="pkg-config glib-devel vala docbook2x"
+hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
 makedepends="sqlite-devel gtk+3-devel libsoup-devel libgee08-devel
  gupnp-av-devel gupnp-dlna-devel tracker3-devel
  libmediaart-devel gssdp-devel gst1-editing-services-devel"

From 09b8be7a740f5877e7f1e3fc7b0837e93a06cd2c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:31 -0400
Subject: [PATCH 0992/2561] LimeSuite: update maintainer email

---
 srcpkgs/LimeSuite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template
index 44f119784ffd..11e0af2aa637 100644
--- a/srcpkgs/LimeSuite/template
+++ b/srcpkgs/LimeSuite/template
@@ -28,7 +28,7 @@ makedepends="gnuplot wxWidgets-gtk3-devel libusb-devel SoapySDR-devel libfreeglu
  fltk-devel glew-devel sqlite-devel libgomp-devel $(vopt_if octave octave)"
 depends="wget"
 short_desc="Driver and GUI for LimeSDR/LMS7002M-based SDR platforms"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="Apache-2.0"
 homepage="https://myriadrf.org/projects/lime-suite/"
 distfiles="https://github.com/myriadrf/LimeSuite/archive/refs/tags/v${version}.tar.gz"

From 6b9d3f8db839717d1fef83b509f92a93b07762e9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:32 -0400
Subject: [PATCH 0993/2561] chezmoi: update maintainer email

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index abf8ff70d40f..2f0fb2f144bc 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -8,7 +8,7 @@ go_build_tags="noembeddocs noupgrade"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}
  -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps"
 short_desc="Manage your dotfiles across multiple machines, securely"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"

From dbc27859ee847e83328bcd084315ac1dca455975 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:33 -0400
Subject: [PATCH 0994/2561] helvum: update maintainer email

---
 srcpkgs/helvum/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 5a694dc43c29..6c5e27bfefc1 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config clang libclang"
 makedepends="gtk4-devel pipewire-devel glib-devel"
 depends="pipewire"
 short_desc="GTK patchbay for pipewire"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-3.0-only"
 homepage="https://gitlab.freedesktop.org/pipewire/helvum"
 distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"

From d337b298148bbcd5e2581c8e04e58aa65fd6b017 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:34 -0400
Subject: [PATCH 0995/2561] hobbits: update maintainer email

---
 srcpkgs/hobbits/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index 42f5c20ce132..fe6c7f5adda7 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake python3"
 makedepends="fftw-devel libusb-devel libpcap-devel python3-devel qt5-devel"
 short_desc="Multi-platform GUI for bit-based analysis, processing and visualization"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT, GPL-2.0-or-later"
 homepage="https://mahlet-inc.github.io"
 changelog="https://raw.githubusercontent.com/Mahlet-Inc/hobbits/master/CHANGELOG.md"

From d6b3cadb62a2c6a7d86191633453f2089390c60c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:34 -0400
Subject: [PATCH 0996/2561] mininet: update maintainer email

---
 srcpkgs/mininet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mininet/template b/srcpkgs/mininet/template
index 18862aeebdf8..2ea62ca31ead 100644
--- a/srcpkgs/mininet/template
+++ b/srcpkgs/mininet/template
@@ -7,7 +7,7 @@ hostmakedepends="help2man python3-setuptools"
 depends="bash ethtool inetutils-telnet iperf iproute2 iputils libcgroup-utils
  net-tools openssh openvswitch psmisc python3-tkinter socat xbitmaps xhost xterm"
 short_desc="Emulator for rapid prototyping of Software Defined Networks"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="custom:MIT-like"
 homepage="http://mininet.org/"
 changelog="http://mininet.org/blog/categories/releases/"

From 0cc06967e30a73d9c559c45d1ebc5ab5e46f3780 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:35 -0400
Subject: [PATCH 0997/2561] openjdk12-bootstrap: update maintainer email

---
 srcpkgs/openjdk12-bootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 770fce5bb07e..4861ad1efc40 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 12)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"

From 24830ace107bdfe1b539bf7f54fdfbf2a3b19632 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:35 -0400
Subject: [PATCH 0998/2561] openjdk13-bootstrap: update maintainer email

---
 srcpkgs/openjdk13-bootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index ccbafa367962..82c34b7999f3 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 13)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"

From efb828c879c283f27df6377e0d1fbc357c0fd37f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:36 -0400
Subject: [PATCH 0999/2561] openjdk14-bootstrap: update maintainer email

---
 srcpkgs/openjdk14-bootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 62011285f35d..5c15ca3f32c0 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel openjdk13-bootstrap"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 14)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"

From e896731b15a6ec628de85dd10a47a7ec48ce0280 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:37 -0400
Subject: [PATCH 1000/2561] openjdk15-bootstrap: update maintainer email

---
 srcpkgs/openjdk15-bootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 70b38621be25..efbc69f9429e 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk14-bootstrap"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 15)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz

From be5bed693018c91183c7414ab2c29f6f34b95edf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:37 -0400
Subject: [PATCH 1001/2561] openjdk16-bootstrap: update maintainer email

---
 srcpkgs/openjdk16-bootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 876bfe6de81b..9bea476c6836 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk15-bootstrap"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 16)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz

From 6a9e1efb05d2b01ce4f1510aa7f78d7abccfbe6c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:38 -0400
Subject: [PATCH 1002/2561] openjdk17: update maintainer email

---
 srcpkgs/openjdk17/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 43f72e4d65c0..19fa38707f00 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 depends="${pkgname}-jre-${version}_${revision}"
 provides="java-environment-${version}_1"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz

From f53a6740157ac0dd41c8d5499fb2f7a3731cb6e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:38 -0400
Subject: [PATCH 1003/2561] webhook: update maintainer email

---
 srcpkgs/webhook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index fb8b2168566a..cf79527f9377 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -5,7 +5,7 @@ revision=1
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"
-maintainer="Abigail G <dev@kb6.ee>"
+maintainer="Abigail G <void@placeviolette.net>"
 license="MIT"
 homepage="https://github.com/adnanh/webhook"
 distfiles="https://github.com/adnanh/webhook/archive/${version}.tar.gz"

From abe3eebfec95a8392be0592ffc27a43b96833510 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Wed, 6 Apr 2022 18:39:31 +0700
Subject: [PATCH 1004/2561] vivaldi: update to 5.2.2623.24

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 9108f67a4d29..b7a701c92dde 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.1.2567.73
+version=5.2.2623.24
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=efc4a4d39724840cbcc78317ef1a0e5e300cb8b9d655defee8e746626f845f12
+checksum=a97eb6f3cfc9b80fd5a2f742b8d0c5af093ab6f5346552c7821129689e2485c0
 repository=nonfree
 restricted=yes
 nostrip=yes

From 6307881c42571034fb4e15793f37bfb9c6304729 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 1 Apr 2022 16:18:49 +0200
Subject: [PATCH 1005/2561] yq-go: update to 4.23.1.

---
 srcpkgs/yq-go/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 67a2a5c478c3..9342a11e5deb 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.21.1
+version=4.23.1
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -11,14 +11,14 @@ license="MIT"
 homepage="https://github.com/mikefarah/yq"
 changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=27ba049e24a2f40db4010ad6574ce866fa1d43f4cb064de286e344e3c7911ef0
+checksum=f55ffb9c6d7926b06d5862eb6a9e9ea942ec2883286df8e2e3d6f0716cc36eed
 
 do_check() {
 	go test -v
 }
 
 post_install() {
-	# this came after yq 'the jq wrapper for yaml' so yq has the right tp
+	# this came after yq 'the jq wrapper for yaml' so yq has the right to
 	# /usr/bin/yq, rename it to yq-go
 	mv -v "${DESTDIR}"/usr/bin/{yq,yq-go}
 

From 2c61996c416c5a587b54701497373cfd09099aa5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 2 Apr 2022 21:55:59 -0400
Subject: [PATCH 1006/2561] arduino: update to 1.8.19.

---
 .../patches/disable-dependency-build.patch    | 225 ------------------
 srcpkgs/arduino/template                      |   4 +-
 2 files changed, 2 insertions(+), 227 deletions(-)
 delete mode 100644 srcpkgs/arduino/patches/disable-dependency-build.patch

diff --git a/srcpkgs/arduino/patches/disable-dependency-build.patch b/srcpkgs/arduino/patches/disable-dependency-build.patch
deleted file mode 100644
index 6a7144c906c4..000000000000
--- a/srcpkgs/arduino/patches/disable-dependency-build.patch
+++ /dev/null
@@ -1,225 +0,0 @@
---- Arduino-1.8.13/build/build.xml.orig	2020-12-27 20:34:41.813419495 +0100
-+++ Arduino-1.8.13/build/build.xml	2020-12-27 20:32:58.075425211 +0100
-@@ -345,7 +345,7 @@
- 
-     <!-- figure out the IDE version number in base.java -->
-     <loadfile srcfile="../arduino-core/src/processing/app/BaseNoGui.java"
--        property="revision.base">
-+	      property="revision.base">
-       <filterchain>
-         <tokenfilter>
-           <linetokenizer />
-@@ -659,14 +659,6 @@
-   </target>
- 
-   <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-5.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
--      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
--      <param name="dest_folder" value="${staging_folder}" />
--    </antcall>
--    <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
--    <chmod perm="755" file="linux/work/lib/libastylej.so" />
- 
-     <antcall target="portable-${portable}">
-       <param name="parentdir" value="linux/work" />
-@@ -684,14 +676,6 @@
-   </target>
- 
-   <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-5.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
--      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
--      <param name="dest_folder" value="${staging_folder}" />
--    </antcall>
--    <copy file="linux/libastylej-2.05.1/libastylej_arm.so" tofile="linux/work/lib/libastylej.so" />
--    <chmod perm="755" file="linux/work/lib/libastylej.so" />
- 
-     <antcall target="portable-${portable}">
-       <param name="parentdir" value="linux/work" />
-@@ -715,26 +699,9 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-arm-linux-gnueabihf.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_arm.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux-libastyle-aarch64" depends="linux-build" description="Download libastyle.so for AArch64">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-5.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
--      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
--      <param name="dest_folder" value="${staging_folder}" />
--    </antcall>
--    <copy file="linux/libastylej-2.05.1/libastylej_aarch64.so" tofile="linux/work/lib/libastylej.so" />
--    <chmod perm="755" file="linux/work/lib/libastylej.so" />
- 
-     <antcall target="portable-${portable}">
-       <param name="parentdir" value="linux/work" />
-@@ -757,15 +724,6 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_aarch64.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
-@@ -775,15 +733,6 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_386.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
-@@ -793,15 +742,6 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_amd64.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux-jvm-noop"/>
-@@ -936,7 +876,7 @@
-   </target>
- 
-   <target name="linux-dist" depends="build"
--    description="Build .tar.xz of linux version">
-+	  description="Build .tar.xz of linux version">
- 
-     <move file="linux/work" tofile="linux/arduino-${version}" />
- 
-@@ -960,23 +900,23 @@
-   </target>
- 
-   <target name="linux32-dist" depends="linux-dist"
--    description="Build .tar.xz of linux x86_32 version" />
-+	  description="Build .tar.xz of linux x86_32 version" />
- 
-   <target name="linux64-dist" depends="linux-dist"
--    description="Build .tar.xz of linux x86_64 version" />
-+	  description="Build .tar.xz of linux x86_64 version" />
- 
-   <target name="linuxarm-dist" depends="linux-dist"
--    description="Build .tar.xz of linux armhf version" />
-+	  description="Build .tar.xz of linux armhf version" />
- 
-   <target name="linuxaarch64-dist" depends="linux-dist"
--    description="Build .tar.xz of linux aarch64 version" />
-+	  description="Build .tar.xz of linux aarch64 version" />
- 
-   <!-- - - - - - - - -->
-   <!-- Windows       -->
-   <!-- - - - - - - - -->
- 
-   <target name="windows-clean" depends="subprojects-clean"
--    description="Clean windows version">
-+	  description="Clean windows version">
-     <delete dir="windows/work" />
-     <delete>
-       <fileset dir="windows" includes="arduino-*windows*.zip"/>
-@@ -1014,8 +954,8 @@
-   </target>
- 
-   <target name="windows-build"
--    depends="revision-check, windows-checkos, subprojects-build"
--    description="Build windows version">
-+	  depends="revision-check, windows-checkos, subprojects-build"
-+	  description="Build windows version">
-     <mkdir dir="windows/work" />
-     <mkdir dir="windows/work/${staging_hardware_folder}" />
- 
-@@ -1130,12 +1070,12 @@
- 
-     <property name="launch4j.dir" value="windows/launcher/launch4j/" />
-     <taskdef name="launch4j"
--       classname="net.sf.launch4j.ant.Launch4jTask"
--       classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
-+	     classname="net.sf.launch4j.ant.Launch4jTask"
-+	     classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
- 
-     <copy todir="windows/work">
-       <fileset dir="windows/launcher"
--         includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini, wrapper-manifest.xml"/>
-+	       includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini, wrapper-manifest.xml"/>
-     </copy>
-     <launch4j configFile="windows/work/config.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
-     <launch4j configFile="windows/work/config_debug.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
-@@ -1206,22 +1146,22 @@
-   <!-- - - - - - - - -->
- 
-    <target name="source-dist" depends="revision-check"
--    description="Build .tar.gz of source code">
-+	  description="Build .tar.gz of source code">
-     <input message="Enter version number:"
--     addproperty="version"
--     defaultvalue="${revision}" />
-+	   addproperty="version"
-+	   defaultvalue="${revision}" />
- 
-     <tar compression="gzip" destfile="arduino-${version}-src.tar.gz">
-       <tarfileset dir="../"
--      prefix="arduino-${version}"
--      excludes="**/*.tgz,
--           **/*.bz2,
--           **/build/macosx/,
--           **/build/windows/,
--           **/work/,
--           **/.git/,
--           **/*.class"
--      />
-+		  prefix="arduino-${version}"
-+		  excludes="**/*.tgz,
-+			     **/*.bz2,
-+			     **/build/macosx/,
-+			     **/build/windows/,
-+			     **/work/,
-+			     **/.git/,
-+			     **/*.class"
-+		  />
-     </tar>
- 
-     <echo>
-@@ -1239,7 +1179,7 @@
-   <!-- - - - - - - - -->
- 
-   <target name="clean" description="Perform a spring cleaning"
--    depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
-+	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
-   </target>
- 
-   <target name="avr-toolchain-bundle" unless="light_bundle">
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index 5d6531ec93fc..19daa0c1b1e8 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -1,6 +1,6 @@
 # Template file for 'arduino'
 pkgname=arduino
-version=1.8.13
+version=1.8.19
 revision=1
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=$pkgname-$version
@@ -15,7 +15,7 @@ homepage="http://arduino.cc/"
 distfiles="
  https://github.com/arduino/Arduino/archive/${version}.tar.gz
  ${SOURCEFORGE_SITE}/astyle/astyle_3.0.1_linux.tar.gz"
-checksum="2a2a7bf0a93d36dff2e27f50e490529f10ff73337d6a0b7b222fa6b1a529c9f7
+checksum="17839eb2a9bc7aeed3bb2a315898efdb3075ed605f98210b4a2d3b54199cc571
  6c3ab029e0e4a75e2e603d449014374aa8269218fdd03a4aaa46ab743b1912fd"
 nostrip=yes
 nocross="cross build lacks essential libraries"

From 637b3a173b7f31a4f59af5bf6c825b31581c83b9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 2 Apr 2022 21:46:52 -0400
Subject: [PATCH 1007/2561] apache-storm: update to 2.4.0.

---
 srcpkgs/apache-storm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index bcb06f4ee08b..7167174dd079 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -1,14 +1,14 @@
 # Template file for 'apache-storm'
 pkgname=apache-storm
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 depends="virtual?java-runtime python3 bash"
 short_desc="Distributed realtime computation system"
 maintainer="bougyman <bougyman@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://storm.apache.org/"
 distfiles="http://apache.osuosl.org/storm/apache-storm-${version}/apache-storm-${version}.tar.gz"
-checksum=f621163f349a8e85130bc3d2fbb34e3b08f9c039ccac5474f3724e47a3a38675
+checksum=54535c68848f05130647997f3fafe91a72bb9470a50d6d80997274d20cf1c0c6
 python_version=3
 system_accounts="storm"
 storm_homedir="/var/lib/apache-storm"

From 7ca443f1053696e161b6012d8d6d79475a0f5ad6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 22 Mar 2022 02:07:12 -0400
Subject: [PATCH 1008/2561] sunxi-tools: update to 1.4.2, adopt.

---
 srcpkgs/sunxi-tools/template | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/sunxi-tools/template b/srcpkgs/sunxi-tools/template
index f4f547c7947d..001d83851248 100644
--- a/srcpkgs/sunxi-tools/template
+++ b/srcpkgs/sunxi-tools/template
@@ -1,31 +1,17 @@
 # Template file for 'sunxi-tools'
 pkgname=sunxi-tools
-reverts=20150526_1
-version=20150226
-revision=3
-_commit=b80e7ce7bd5c2015465c2fd0e5990d47c05c7f8e
-wrksrc="$pkgname-$_commit"
-hostmakedepends="pkg-config git"
+reverts="20140125_1 20150226_1 20150226_2 20150226_3 20150526_1"
+version=1.4.2
+revision=1
+build_style="gnu-makefile"
+make_build_target="tools misc"
+make_install_target="install-tools install-misc"
+hostmakedepends="pkg-config"
 makedepends="libusb-devel"
 short_desc="Tools to help hacking Allwinner AXX (aka sunxi) based devices"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linux-sunxi/sunxi-tools"
-distfiles="$homepage/archive/$_commit.tar.gz"
-checksum=93922d654df5153d468b0f7900f96fe858fe457894ff2dd0f5dfb5c94b65475b
-
-CFLAGS="-std=c99 -I./include"
-
-do_build() {
-	make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-}
-do_install() {
-	vinstall README 644 usr/share/doc/${pkgname}
-
-	for f in fexc bootinfo fel usb-boot fel-gpio pio nand-part; do
-		vbin ${f}
-	done
-	cd ${DESTDIR}/usr/bin
-	ln -s fexc fex2bin
-	ln -s fexc bin2fex
-}
+distfiles="https://github.com/linux-sunxi/sunxi-tools/archive/refs/tags/v${version}.tar.gz"
+checksum=81f48014a520cb83cac4e17f5ae627a637c4d6a422b60c693c5a705c92e43822
+make_check=no # it's a mess

From 00cc0fe527edf4f8ef324e20a6596e109d995771 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Apr 2022 19:46:43 +0200
Subject: [PATCH 1009/2561] u-boot-tools: update to 2022.04.

---
 srcpkgs/u-boot-tools/template | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index a25b02b4e512..d6aea6282b47 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,19 +1,19 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
-version=2022.01
+version=2022.04
 revision=1
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
-make_build_args="HOSTSTRIP=: STRIP=:"
-make_build_target="tools envtools"
-hostmakedepends="bison flex"
-makedepends="openssl-devel"
+make_build_args="HOSTSTRIP=: STRIP=: NO_SDL=1"
+make_build_target="tools-all tools-only envtools"
+hostmakedepends="bison flex which"
+makedepends="openssl-devel libuuid-devel gnutls-devel ncurses-libtinfo-devel"
 short_desc="Das U-Boot tools"
 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=81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413
+checksum=68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
@@ -39,12 +39,14 @@ do_check() {
 
 do_install() {
 	ln -sf fw_printenv tools/env/fw_setenv
-	for x in dumpimage fdtgrep fit_check_sign fit_info gen_eth_addr \
-		gen_ethaddr_crc ifwitool img2srec mkenvimage mkimage proftool \
-		spl_size_limit env/fw_printenv env/fw_setenv; do
+	for x in bmp_logo dumpimage fdtgrep fit_check_sign fit_info gen_eth_addr \
+		gen_ethaddr_crc ifwitool img2srec kwboot mkeficapsule mkenvimage mkimage \
+		proftool spl_size_limit env/fw_printenv env/fw_setenv; do
 		vbin "tools/$x"
+		if [ -r "doc/${x}.1" ]; then
+			vman "doc/${x}.1"
+		fi
 	done
-	vman doc/mkimage.1
 }
 
 uboot-mkimage_package() {

From 349fd1626e029a64e64b5ff3730c9623d67775b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:09:12 -0400
Subject: [PATCH 1010/2561] cpp-utilities: update to 5.14.0.

---
 srcpkgs/cpp-utilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 80d9c3228558..e4b44dd0bafc 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.13.0
+version=5.14.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=6ddca61b4ff38785a927eb5e2491e2edbf00eb8d003360f46f247cbb18eab970
+checksum=7a173bb2355a9b5fef17d3fe6795f026f58afe63b1295f8567c042422e2cde0e
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From 8fc4c52dc002b553e425dcc485c110fb23395680 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:09:45 -0400
Subject: [PATCH 1011/2561] qtutilities: update to 6.6.0.

---
 srcpkgs/qtutilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 8a7a238bc5b4..d0e2622414d5 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.3
+version=6.6.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=17b5bf0db407ff1408ba1d2be6be3fc80de5dbd3fab78f6a66f55b6c4c0b6e22
+checksum=2dda37fd6e1cd957f0a2b395ce424ca23cfc893310c0cebc82d89dc960239d13
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From ded765a10452524df6cee32ebf06f9ca859d8871 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:10:02 -0400
Subject: [PATCH 1012/2561] tagparser: update to 11.1.0.

---
 srcpkgs/tagparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1ca3a1761bcd..494b83e203eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=11.0.0
+version=11.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=be31354dbf3cf7342de68d28f1a0ba4bd1464e312b661383fe2b0d8abdbe3e32
+checksum=dc3bd56ee7ddd3220062d2637b89dffc27747c3027c4b223a4697d693e55e2f1
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From 603d3783f73292685e987abe807e67c6b6dba238 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:10:45 -0400
Subject: [PATCH 1013/2561] tageditor: update to 3.7.0.

---
 srcpkgs/tageditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 52b5fc0057b1..0f9ad2024a6d 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.6.1
+version=3.7.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/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=98ad461669e4528f6eb74d3b0c7a29401a0bb90a68bc63a4b60060ec02889b09
+checksum=e3814efdb9ca9bc386b51c602f8f4f507e8698ecdaf39a5849ed1795ddaa5c38
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 96a975812efbc42f148c14bd10f0dd7738aeb430 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:18:38 -0400
Subject: [PATCH 1014/2561] openmpi: update to 4.1.3.

---
 srcpkgs/openmpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index 1ed46e523216..08dc6cface80 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -1,6 +1,6 @@
 # Template file for 'openmpi'
 pkgname=openmpi
-version=4.1.2
+version=4.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr
@@ -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=9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527
+checksum=3d81d04c54efb55d3871a465ffb098d8d72c1f48ff1cbaf2580eb058567c0a3b
 nocross="configure attempts to run target binaries"
 lib32disabled=yes
 

From 5c87c98ed3f18cf3810ff60e9edfad9824310014 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:19:52 -0400
Subject: [PATCH 1015/2561] python3-Pillow: update to 9.1.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 7fb866d05e78..f0df1881e241 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pillow'
 pkgname=python3-Pillow
-version=9.0.1
+version=9.1.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=6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa
+checksum=f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97
 
 post_install() {
 	vlicense LICENSE

From b60c61b527fed958d13735edf042bd945915fb31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:24:10 -0400
Subject: [PATCH 1016/2561] python3-aioamqp: update to 0.15.0.

---
 .../patches/01-python-3.10.patch              | 345 -------------
 .../patches/02-pamqp-3.1.0.patch              | 469 ------------------
 srcpkgs/python3-aioamqp/template              |   6 +-
 3 files changed, 3 insertions(+), 817 deletions(-)
 delete mode 100644 srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
 delete mode 100644 srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch

diff --git a/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch b/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
deleted file mode 100644
index 8d369bf7a6db..000000000000
--- a/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-From a3ab4768a13540e8c8f566bca990a98f96cb3802 Mon Sep 17 00:00:00 2001
-From: dzen <benoit.calvez@polyconseil.fr>
-Date: Thu, 5 Mar 2020 14:40:50 +0100
-Subject: [PATCH 1/2] Support newer Python
-
-Combines upstream commits to suppress asyncio deprecations:
-- f004c52
-- 388d38f
-- 0cdfe91
-- b4f0120
-- 23d84ca
----
- .travis.yml                            |  6 ++---
- Dockerfile                             |  2 +-
- aioamqp/__init__.py                    |  4 ++--
- aioamqp/channel.py                     |  4 ++--
- aioamqp/protocol.py                    | 33 ++++++++++++++------------
- aioamqp/tests/test_basic.py            |  2 +-
- aioamqp/tests/test_connection_close.py |  2 +-
- aioamqp/tests/test_connection_lost.py  |  2 +-
- aioamqp/tests/test_protocol.py         |  4 ++--
- docs/changelog.rst                     |  4 ++++
- docs/introduction.rst                  |  2 +-
- setup.cfg                              |  2 +-
- setup.py                               |  2 +-
- tox.ini                                |  2 +-
- 14 files changed, 39 insertions(+), 32 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index 1069e7c..9d6e4ef 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -1,10 +1,10 @@
- language: python
--dist: bionic
-+dist: focal
- python:
--- 3.5
- - 3.6
--- 3.7-dev
-+- 3.7
- - 3.8
-+- 3.9
- services:
- - rabbitmq
- env:
-diff --git a/Dockerfile b/Dockerfile
-index 7ec4545..1ea92f1 100644
---- a/Dockerfile
-+++ b/Dockerfile
-@@ -1,4 +1,4 @@
--FROM python:3.5
-+FROM python:3.9
- 
- WORKDIR /usr/src/app
- 
-diff --git a/aioamqp/__init__.py b/aioamqp/__init__.py
-index 3e67936..030e7db 100644
---- a/aioamqp/__init__.py
-+++ b/aioamqp/__init__.py
-@@ -10,7 +10,7 @@ from .version import __packagename__
- 
- 
- async def connect(host='localhost', port=None, login='guest', password='guest',
--            virtualhost='/', ssl=None, login_method='AMQPLAIN', insist=False,
-+            virtualhost='/', ssl=None, login_method='PLAIN', insist=False,
-             protocol_factory=AmqpProtocol, *, loop=None, **kwargs):
-     """Convenient method to connect to an AMQP broker
- 
-@@ -69,7 +69,7 @@ async def connect(host='localhost', port=None, login='guest', password='guest',
- 
- 
- async def from_url(
--        url, login_method='AMQPLAIN', insist=False, protocol_factory=AmqpProtocol, **kwargs):
-+        url, login_method='PLAIN', insist=False, protocol_factory=AmqpProtocol, **kwargs):
-     """ Connect to the AMQP using a single url parameter and return the client.
- 
-         For instance:
-diff --git a/aioamqp/channel.py b/aioamqp/channel.py
-index 7f0f402..b58bd5a 100644
---- a/aioamqp/channel.py
-+++ b/aioamqp/channel.py
-@@ -31,7 +31,7 @@ class Channel:
-         self.cancellation_callbacks = []
-         self.return_callback = return_callback
-         self.response_future = None
--        self.close_event = asyncio.Event(loop=self._loop)
-+        self.close_event = asyncio.Event()
-         self.cancelled_consumers = set()
-         self.last_consumer_tag = None
-         self.publisher_confirms = False
-@@ -518,7 +518,7 @@ class Channel:
-         }
-         future = self._get_waiter('basic_consume' + ctag)
-         future.set_result(results)
--        self._ctag_events[ctag] = asyncio.Event(loop=self._loop)
-+        self._ctag_events[ctag] = asyncio.Event()
- 
-     async def basic_deliver(self, frame):
-         consumer_tag = frame.consumer_tag
-diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py
-index ddf1285..4938833 100644
---- a/aioamqp/protocol.py
-+++ b/aioamqp/protocol.py
-@@ -79,8 +79,8 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             self.connection_tunning['heartbeat'] = kwargs.get('heartbeat')
- 
-         self.connecting = asyncio.Future(loop=self._loop)
--        self.connection_closed = asyncio.Event(loop=self._loop)
--        self.stop_now = asyncio.Future(loop=self._loop)
-+        self.connection_closed = asyncio.Event()
-+        self.stop_now = asyncio.Event()
-         self.state = CONNECTING
-         self.version_major = None
-         self.version_minor = None
-@@ -91,14 +91,14 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         self.server_heartbeat = None
-         self._heartbeat_timer_recv = None
-         self._heartbeat_timer_send = None
--        self._heartbeat_trigger_send = asyncio.Event(loop=self._loop)
-+        self._heartbeat_trigger_send = asyncio.Event()
-         self._heartbeat_worker = None
-         self.channels = {}
-         self.server_frame_max = None
-         self.server_channel_max = None
-         self.channels_ids_ceil = 0
-         self.channels_ids_free = set()
--        self._drain_lock = asyncio.Lock(loop=self._loop)
-+        self._drain_lock = asyncio.Lock()
- 
-     def connection_made(self, transport):
-         super().connection_made(transport)
-@@ -171,16 +171,13 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             await self.wait_closed(timeout=timeout)
- 
-     async def wait_closed(self, timeout=None):
--        await asyncio.wait_for(self.connection_closed.wait(), timeout=timeout, loop=self._loop)
-+        await asyncio.wait_for(self.connection_closed.wait(), timeout=timeout)
-         if self._heartbeat_worker is not None:
-             try:
--                await asyncio.wait_for(self._heartbeat_worker, timeout=timeout, loop=self._loop)
-+                await asyncio.wait_for(self._heartbeat_worker, timeout=timeout)
-             except asyncio.CancelledError:
-                 pass
- 
--    async def close_ok(self, frame):
--        self._stream_writer.close()
--
-     async def start_connection(self, host, port, login, password, virtualhost, ssl=False,
-             login_method='PLAIN', insist=False):
-         """Initiate a connection at the protocol level
-@@ -188,7 +185,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         """
- 
-         if login_method != 'PLAIN':
--            logger.warning('only PLAIN login_method is supported, falling back to AMQPLAIN')
-+            logger.warning('login_method %s is not supported, falling back to PLAIN', login_method)
- 
-         self._stream_writer.write(amqp_constants.PROTOCOL_HEADER)
- 
-@@ -311,12 +308,12 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             channel.connection_closed(reply_code, reply_text, exception)
- 
-     async def run(self):
--        while not self.stop_now.done():
-+        while not self.stop_now.is_set():
-             try:
-                 await self.dispatch_frame()
-             except exceptions.AmqpClosedConnection as exc:
-                 logger.info("Close connection")
--                self.stop_now.set_result(None)
-+                self.stop_now.set()
- 
-                 self._close_channels(exception=exc)
-             except Exception:  # pylint: disable=broad-except
-@@ -329,7 +326,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         the rest of the AmqpProtocol class.  This is kept around for backwards
-         compatibility purposes only.
-         """
--        await self.stop_now
-+        await self.stop_now.wait()
- 
-     async def send_heartbeat(self):
-         """Sends an heartbeat message.
-@@ -403,6 +400,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         )
-         await self._write_frame(0, request)
- 
-+    async def close_ok(self, frame):
-+        """In response to server close confirmation"""
-+        self.stop_now.set()
-+        self._stream_writer.close()
-+
-     async def server_close(self, frame):
-         """The server is closing the connection"""
-         self.state = CLOSING
-@@ -414,6 +416,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             reply_text, reply_code, class_id, method_id)
-         self._close_channels(reply_code, reply_text)
-         await self._close_ok()
-+        self.stop_now.set()
-         self._stream_writer.close()
- 
-     async def _close_ok(self):
-@@ -456,11 +459,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         await self.ensure_open()
-         try:
-             channel_id = self.channels_ids_free.pop()
--        except KeyError:
-+        except KeyError as ex:
-             assert self.server_channel_max is not None, 'connection channel-max tuning not performed'
-             # channel-max = 0 means no limit
-             if self.server_channel_max and self.channels_ids_ceil > self.server_channel_max:
--                raise exceptions.NoChannelAvailable()
-+                raise exceptions.NoChannelAvailable() from ex
-             self.channels_ids_ceil += 1
-             channel_id = self.channels_ids_ceil
-         channel = self.CHANNEL_FACTORY(self, channel_id, **kwargs)
-diff --git a/aioamqp/tests/test_basic.py b/aioamqp/tests/test_basic.py
-index d59ce19..00ec880 100644
---- a/aioamqp/tests/test_basic.py
-+++ b/aioamqp/tests/test_basic.py
-@@ -58,7 +58,7 @@ class BasicCancelTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
- 
-         result = await self.channel.publish("payload", exchange_name, routing_key='')
- 
--        await asyncio.sleep(5, loop=self.loop)
-+        await asyncio.sleep(5)
- 
-         result = await self.channel.queue_declare(queue_name, passive=True)
-         self.assertEqual(result['message_count'], 1)
-diff --git a/aioamqp/tests/test_connection_close.py b/aioamqp/tests/test_connection_close.py
-index 9491548..c5d4188 100644
---- a/aioamqp/tests/test_connection_close.py
-+++ b/aioamqp/tests/test_connection_close.py
-@@ -22,7 +22,7 @@ class CloseTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-             # TODO: remove with python <3.4.4 support
-             self.assertTrue(transport._closing)
-         # make sure those 2 tasks/futures are properly set as finished
--        await amqp.stop_now
-+        await amqp.stop_now.wait()
-         await amqp.worker
- 
-     async def test_multiple_close(self):
-diff --git a/aioamqp/tests/test_connection_lost.py b/aioamqp/tests/test_connection_lost.py
-index 21c7819..d16d51b 100644
---- a/aioamqp/tests/test_connection_lost.py
-+++ b/aioamqp/tests/test_connection_lost.py
-@@ -24,7 +24,7 @@ class ConnectionLostTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-         self.assertEqual(amqp.state, OPEN)
-         self.assertTrue(channel.is_open)
-         amqp._stream_reader._transport.close()  # this should have the same effect as the tcp connection being lost
--        await asyncio.wait_for(amqp.worker, 1, loop=self.loop)
-+        await asyncio.wait_for(amqp.worker, 1)
-         self.assertEqual(amqp.state, CLOSED)
-         self.assertFalse(channel.is_open)
-         self.assertTrue(self.callback_called)
-diff --git a/aioamqp/tests/test_protocol.py b/aioamqp/tests/test_protocol.py
-index 766a5d9..80d4187 100644
---- a/aioamqp/tests/test_protocol.py
-+++ b/aioamqp/tests/test_protocol.py
-@@ -55,7 +55,7 @@ class ProtocolTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-             connect.assert_called_once_with(
-                 insist=False,
-                 password='pass',
--                login_method='AMQPLAIN',
-+                login_method='PLAIN',
-                 login='tom',
-                 host='example.com',
-                 protocol_factory=AmqpProtocol,
-@@ -74,7 +74,7 @@ class ProtocolTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-             connect.assert_called_once_with(
-                 insist=False,
-                 password='pass',
--                login_method='AMQPLAIN',
-+                login_method='PLAIN',
-                 ssl=ssl_context,
-                 login='tom',
-                 host='example.com',
-diff --git a/docs/changelog.rst b/docs/changelog.rst
-index 0939ca4..8ac4f7b 100644
---- a/docs/changelog.rst
-+++ b/docs/changelog.rst
-@@ -4,6 +4,10 @@ Changelog
- Next release
- ------------
- 
-+ * Add support for Python 3.9.
-+ * Drop support for Python 3.5.
-+ * Fix annoying auth method warning because of a wrong defined default argument (closes #214).
-+
- Aioamqp 0.14.0
- --------------
- 
-diff --git a/docs/introduction.rst b/docs/introduction.rst
-index ec86f61..d0e183a 100644
---- a/docs/introduction.rst
-+++ b/docs/introduction.rst
-@@ -7,7 +7,7 @@ Aioamqp library is a pure-Python implementation of the AMQP 0.9.1 protocol using
- Prerequisites
- -------------
- 
--Aioamqp works only with python >= 3.5 using asyncio library.
-+Aioamqp works only with python >= 3.6 using asyncio library.
- 
- Installation
- ------------
-diff --git a/setup.cfg b/setup.cfg
-index 0ab7d0b..9a9f5ab 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,2 +1,2 @@
- [bdist_wheel]
--python-tag = py35.py36.py37.py38
-+python-tag = py36.py37.py38.py39
-diff --git a/setup.py b/setup.py
-index a740243..ea0e79f 100644
---- a/setup.py
-+++ b/setup.py
-@@ -34,10 +34,10 @@ setuptools.setup(
-         "Operating System :: OS Independent",
-         "Programming Language :: Python",
-         "Programming Language :: Python :: 3",
--        "Programming Language :: Python :: 3.5",
-         "Programming Language :: Python :: 3.6",
-         "Programming Language :: Python :: 3.7",
-         "Programming Language :: Python :: 3.8",
-+        "Programming Language :: Python :: 3.9",
-     ],
-     platforms='all',
-     license='BSD'
-diff --git a/tox.ini b/tox.ini
-index 127cc7b..a1f5fcd 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -1,5 +1,5 @@
- [tox]
--envlist = py35, py36, py37, py38
-+envlist = py36, py37, py38, py39
- skipsdist = true
- skip_missing_interpreters = true
- 
--- 
-2.34.1
-
diff --git a/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch b/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch
deleted file mode 100644
index 6f604f6746e4..000000000000
--- a/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch
+++ /dev/null
@@ -1,469 +0,0 @@
-From bb59736dc0127f3bd5b632d0531058f7d98384f1 Mon Sep 17 00:00:00 2001
-From: dzen <benoit.calvez@polyconseil.fr>
-Date: Thu, 12 Mar 2020 08:32:29 +0100
-Subject: [PATCH 2/2] Require pamqp 3.1.0
-
-Combines upstream commits:
-- 6de2e1a
-- 95cb160
-- 9f08434
----
- aioamqp/channel.py        | 114 +++++++++++++++++++-------------------
- aioamqp/frame.py          |   1 -
- aioamqp/properties.py     |   6 +-
- aioamqp/protocol.py       |  22 ++++----
- aioamqp/tests/testcase.py |   2 +-
- setup.py                  |   3 +-
- 6 files changed, 76 insertions(+), 72 deletions(-)
-
-diff --git a/aioamqp/channel.py b/aioamqp/channel.py
-index b58bd5a..b87392d 100644
---- a/aioamqp/channel.py
-+++ b/aioamqp/channel.py
-@@ -9,7 +9,7 @@ import io
- from itertools import count
- import warnings
- 
--import pamqp.specification
-+import pamqp.commands
- 
- from . import frame as amqp_frame
- from . import exceptions
-@@ -78,35 +78,35 @@ class Channel:
- 
-     async def dispatch_frame(self, frame):
-         methods = {
--            pamqp.specification.Channel.OpenOk.name: self.open_ok,
--            pamqp.specification.Channel.FlowOk.name: self.flow_ok,
--            pamqp.specification.Channel.CloseOk.name: self.close_ok,
--            pamqp.specification.Channel.Close.name: self.server_channel_close,
--
--            pamqp.specification.Exchange.DeclareOk.name: self.exchange_declare_ok,
--            pamqp.specification.Exchange.BindOk.name: self.exchange_bind_ok,
--            pamqp.specification.Exchange.UnbindOk.name: self.exchange_unbind_ok,
--            pamqp.specification.Exchange.DeleteOk.name: self.exchange_delete_ok,
--
--            pamqp.specification.Queue.DeclareOk.name: self.queue_declare_ok,
--            pamqp.specification.Queue.DeleteOk.name: self.queue_delete_ok,
--            pamqp.specification.Queue.BindOk.name: self.queue_bind_ok,
--            pamqp.specification.Queue.UnbindOk.name: self.queue_unbind_ok,
--            pamqp.specification.Queue.PurgeOk.name: self.queue_purge_ok,
--
--            pamqp.specification.Basic.QosOk.name: self.basic_qos_ok,
--            pamqp.specification.Basic.ConsumeOk.name: self.basic_consume_ok,
--            pamqp.specification.Basic.CancelOk.name: self.basic_cancel_ok,
--            pamqp.specification.Basic.GetOk.name: self.basic_get_ok,
--            pamqp.specification.Basic.GetEmpty.name: self.basic_get_empty,
--            pamqp.specification.Basic.Deliver.name: self.basic_deliver,
--            pamqp.specification.Basic.Cancel.name: self.server_basic_cancel,
--            pamqp.specification.Basic.Ack.name: self.basic_server_ack,
--            pamqp.specification.Basic.Nack.name: self.basic_server_nack,
--            pamqp.specification.Basic.RecoverOk.name: self.basic_recover_ok,
--            pamqp.specification.Basic.Return.name: self.basic_return,
--
--            pamqp.specification.Confirm.SelectOk.name: self.confirm_select_ok,
-+            pamqp.commands.Channel.OpenOk.name: self.open_ok,
-+            pamqp.commands.Channel.FlowOk.name: self.flow_ok,
-+            pamqp.commands.Channel.CloseOk.name: self.close_ok,
-+            pamqp.commands.Channel.Close.name: self.server_channel_close,
-+
-+            pamqp.commands.Exchange.DeclareOk.name: self.exchange_declare_ok,
-+            pamqp.commands.Exchange.BindOk.name: self.exchange_bind_ok,
-+            pamqp.commands.Exchange.UnbindOk.name: self.exchange_unbind_ok,
-+            pamqp.commands.Exchange.DeleteOk.name: self.exchange_delete_ok,
-+
-+            pamqp.commands.Queue.DeclareOk.name: self.queue_declare_ok,
-+            pamqp.commands.Queue.DeleteOk.name: self.queue_delete_ok,
-+            pamqp.commands.Queue.BindOk.name: self.queue_bind_ok,
-+            pamqp.commands.Queue.UnbindOk.name: self.queue_unbind_ok,
-+            pamqp.commands.Queue.PurgeOk.name: self.queue_purge_ok,
-+
-+            pamqp.commands.Basic.QosOk.name: self.basic_qos_ok,
-+            pamqp.commands.Basic.ConsumeOk.name: self.basic_consume_ok,
-+            pamqp.commands.Basic.CancelOk.name: self.basic_cancel_ok,
-+            pamqp.commands.Basic.GetOk.name: self.basic_get_ok,
-+            pamqp.commands.Basic.GetEmpty.name: self.basic_get_empty,
-+            pamqp.commands.Basic.Deliver.name: self.basic_deliver,
-+            pamqp.commands.Basic.Cancel.name: self.server_basic_cancel,
-+            pamqp.commands.Basic.Ack.name: self.basic_server_ack,
-+            pamqp.commands.Basic.Nack.name: self.basic_server_nack,
-+            pamqp.commands.Basic.RecoverOk.name: self.basic_recover_ok,
-+            pamqp.commands.Basic.Return.name: self.basic_return,
-+
-+            pamqp.commands.Confirm.SelectOk.name: self.confirm_select_ok,
-         }
- 
-         if frame.name not in methods:
-@@ -144,7 +144,7 @@ class Channel:
- 
-     async def open(self):
-         """Open the channel on the server."""
--        request = pamqp.specification.Channel.Open()
-+        request = pamqp.commands.Channel.Open()
-         return (await self._write_frame_awaiting_response(
-             'open', self.channel_id, request, no_wait=False, check_open=False))
- 
-@@ -159,7 +159,7 @@ class Channel:
-         if not self.is_open:
-             raise exceptions.ChannelClosed("channel already closed or closing")
-         self.close_event.set()
--        request = pamqp.specification.Channel.Close(reply_code, reply_text, class_id=0, method_id=0)
-+        request = pamqp.commands.Channel.Close(reply_code, reply_text, class_id=0, method_id=0)
-         return (await self._write_frame_awaiting_response(
-             'close', self.channel_id, request, no_wait=False, check_open=False))
- 
-@@ -169,7 +169,7 @@ class Channel:
-         self.protocol.release_channel_id(self.channel_id)
- 
-     async def _send_channel_close_ok(self):
--        request = pamqp.specification.Channel.CloseOk()
-+        request = pamqp.commands.Channel.CloseOk()
-         await self._write_frame(self.channel_id, request)
- 
-     async def server_channel_close(self, frame):
-@@ -183,7 +183,7 @@ class Channel:
-         self.connection_closed(results['reply_code'], results['reply_text'])
- 
-     async def flow(self, active):
--        request = pamqp.specification.Channel.Flow(active)
-+        request = pamqp.commands.Channel.Flow(active)
-         return (await self._write_frame_awaiting_response(
-             'flow', self.channel_id, request, no_wait=False,
-             check_open=False))
-@@ -201,7 +201,7 @@ class Channel:
- 
-     async def exchange_declare(self, exchange_name, type_name, passive=False, durable=False,
-                          auto_delete=False, no_wait=False, arguments=None):
--        request = pamqp.specification.Exchange.Declare(
-+        request = pamqp.commands.Exchange.Declare(
-             exchange=exchange_name,
-             exchange_type=type_name,
-             passive=passive,
-@@ -222,7 +222,7 @@ class Channel:
-         return future
- 
-     async def exchange_delete(self, exchange_name, if_unused=False, no_wait=False):
--        request = pamqp.specification.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait)
-+        request = pamqp.commands.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait)
-         return await self._write_frame_awaiting_response(
-             'exchange_delete', self.channel_id, request, no_wait)
- 
-@@ -235,7 +235,7 @@ class Channel:
-                       no_wait=False, arguments=None):
-         if arguments is None:
-             arguments = {}
--        request = pamqp.specification.Exchange.Bind(
-+        request = pamqp.commands.Exchange.Bind(
-             destination=exchange_destination,
-             source=exchange_source,
-             routing_key=routing_key,
-@@ -255,7 +255,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Exchange.Unbind(
-+        request = pamqp.commands.Exchange.Unbind(
-             destination=exchange_destination,
-             source=exchange_source,
-             routing_key=routing_key,
-@@ -297,7 +297,7 @@ class Channel:
- 
-         if not queue_name:
-             queue_name = 'aioamqp.gen-' + str(uuid.uuid4())
--        request = pamqp.specification.Queue.Declare(
-+        request = pamqp.commands.Queue.Declare(
-             queue=queue_name,
-             passive=passive,
-             durable=durable,
-@@ -327,7 +327,7 @@ class Channel:
-                if_empty:       bool, the queue is deleted if it has no messages. Raise if not.
-                no_wait:        bool, if set, the server will not respond to the method
-         """
--        request = pamqp.specification.Queue.Delete(
-+        request = pamqp.commands.Queue.Delete(
-             queue=queue_name,
-             if_unused=if_unused,
-             if_empty=if_empty,
-@@ -346,7 +346,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Queue.Bind(
-+        request = pamqp.commands.Queue.Bind(
-             queue=queue_name,
-             exchange=exchange_name,
-             routing_key=routing_key,
-@@ -367,7 +367,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Queue.Unbind(
-+        request = pamqp.commands.Queue.Unbind(
-             queue=queue_name,
-             exchange=exchange_name,
-             routing_key=routing_key,
-@@ -383,7 +383,7 @@ class Channel:
-         logger.debug("Queue unbound")
- 
-     async def queue_purge(self, queue_name, no_wait=False):
--        request = pamqp.specification.Queue.Purge(
-+        request = pamqp.commands.Queue.Purge(
-             queue=queue_name, nowait=no_wait
-         )
-         return (await self._write_frame_awaiting_response(
-@@ -406,7 +406,7 @@ class Channel:
-         if properties is None:
-             properties = {}
- 
--        method_request = pamqp.specification.Basic.Publish(
-+        method_request = pamqp.commands.Basic.Publish(
-             exchange=exchange_name,
-             routing_key=routing_key,
-             mandatory=mandatory,
-@@ -417,7 +417,7 @@ class Channel:
- 
-         header_request = pamqp.header.ContentHeader(
-             body_size=len(payload),
--            properties=pamqp.specification.Basic.Properties(**properties)
-+            properties=pamqp.commands.Basic.Properties(**properties)
-         )
-         await self._write_frame(self.channel_id, header_request, drain=False)
- 
-@@ -446,7 +446,7 @@ class Channel:
-                                 settings should apply per-consumer channel; and global=true to mean
-                                 that the QoS settings should apply per-channel.
-         """
--        request = pamqp.specification.Basic.Qos(
-+        request = pamqp.commands.Basic.Qos(
-             prefetch_size, prefetch_count, connection_global
-         )
-         return (await self._write_frame_awaiting_response(
-@@ -490,7 +490,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Basic.Consume(
-+        request = pamqp.commands.Basic.Consume(
-             queue=queue_name,
-             consumer_tag=consumer_tag,
-             no_local=no_local,
-@@ -561,7 +561,7 @@ class Channel:
-                              callback, error)
- 
-     async def basic_cancel(self, consumer_tag, no_wait=False):
--        request = pamqp.specification.Basic.Cancel(consumer_tag, no_wait)
-+        request = pamqp.commands.Basic.Cancel(consumer_tag, no_wait)
-         return (await self._write_frame_awaiting_response(
-             'basic_cancel', self.channel_id, request, no_wait=no_wait)
-         )
-@@ -575,7 +575,7 @@ class Channel:
-         logger.debug("Cancel ok")
- 
-     async def basic_get(self, queue_name='', no_ack=False):
--        request = pamqp.specification.Basic.Get(queue=queue_name, no_ack=no_ack)
-+        request = pamqp.commands.Basic.Get(queue=queue_name, no_ack=no_ack)
-         return (await self._write_frame_awaiting_response(
-             'basic_get', self.channel_id, request, no_wait=False)
-         )
-@@ -606,11 +606,11 @@ class Channel:
-         future.set_exception(exceptions.EmptyQueue)
- 
-     async def basic_client_ack(self, delivery_tag, multiple=False):
--        request = pamqp.specification.Basic.Ack(delivery_tag, multiple)
-+        request = pamqp.commands.Basic.Ack(delivery_tag, multiple)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_client_nack(self, delivery_tag, multiple=False, requeue=True):
--        request = pamqp.specification.Basic.Nack(delivery_tag, multiple, requeue)
-+        request = pamqp.commands.Basic.Nack(delivery_tag, multiple, requeue)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_server_ack(self, frame):
-@@ -620,15 +620,15 @@ class Channel:
-         fut.set_result(True)
- 
-     async def basic_reject(self, delivery_tag, requeue=False):
--        request = pamqp.specification.Basic.Reject(delivery_tag, requeue)
-+        request = pamqp.commands.Basic.Reject(delivery_tag, requeue)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_recover_async(self, requeue=True):
--        request = pamqp.specification.Basic.RecoverAsync(requeue)
-+        request = pamqp.commands.Basic.RecoverAsync(requeue)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_recover(self, requeue=True):
--        request = pamqp.specification.Basic.Recover(requeue)
-+        request = pamqp.commands.Basic.Recover(requeue)
-         return (await self._write_frame_awaiting_response(
-             'basic_recover', self.channel_id, request, no_wait=False)
-         )
-@@ -681,7 +681,7 @@ class Channel:
-             delivery_tag = next(self.delivery_tag_iter)  # pylint: disable=stop-iteration-return
-             fut = self._set_waiter('basic_server_ack_{}'.format(delivery_tag))
- 
--        method_request = pamqp.specification.Basic.Publish(
-+        method_request = pamqp.commands.Basic.Publish(
-             exchange=exchange_name,
-             routing_key=routing_key,
-             mandatory=mandatory,
-@@ -689,7 +689,7 @@ class Channel:
-         )
-         await self._write_frame(self.channel_id, method_request, drain=False)
- 
--        properties = pamqp.specification.Basic.Properties(**properties)
-+        properties = pamqp.commands.Basic.Properties(**properties)
-         header_request = pamqp.header.ContentHeader(
-             body_size=len(payload), properties=properties
-         )
-@@ -710,7 +710,7 @@ class Channel:
-     async def confirm_select(self, *, no_wait=False):
-         if self.publisher_confirms:
-             raise ValueError('publisher confirms already enabled')
--        request = pamqp.specification.Confirm.Select(nowait=no_wait)
-+        request = pamqp.commands.Confirm.Select(nowait=no_wait)
- 
-         return (await self._write_frame_awaiting_response(
-             'confirm_select', self.channel_id, request, no_wait)
-diff --git a/aioamqp/frame.py b/aioamqp/frame.py
-index d70cfd7..af27ab5 100644
---- a/aioamqp/frame.py
-+++ b/aioamqp/frame.py
-@@ -42,7 +42,6 @@ import asyncio
- import socket
- 
- import pamqp.encode
--import pamqp.specification
- import pamqp.frame
- 
- from . import exceptions
-diff --git a/aioamqp/properties.py b/aioamqp/properties.py
-index 56a3484..4232040 100644
---- a/aioamqp/properties.py
-+++ b/aioamqp/properties.py
-@@ -1,4 +1,6 @@
- # pylint: disable=redefined-builtin
-+import datetime
-+
- from .constants import MESSAGE_PROPERTIES
- 
- 
-@@ -37,7 +39,9 @@ def from_pamqp(instance):
-     props.reply_to = instance.reply_to
-     props.expiration = instance.expiration
-     props.message_id = instance.message_id
--    props.timestamp = instance.timestamp
-+    if instance.timestamp is not None:
-+        # pamqp uses naive datetimes representing UTC, let's use TZ-aware datetimes
-+        props.timestamp = instance.timestamp.replace(tzinfo=datetime.timezone.utc)
-     props.message_type = instance.message_type
-     props.user_id = instance.user_id
-     props.app_id = instance.app_id
-diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py
-index 4938833..6465400 100644
---- a/aioamqp/protocol.py
-+++ b/aioamqp/protocol.py
-@@ -5,9 +5,9 @@
- import asyncio
- import logging
- 
-+import pamqp.commands
- import pamqp.frame
- import pamqp.heartbeat
--import pamqp.specification
- 
- from . import channel as amqp_channel
- from . import constants as amqp_constants
-@@ -159,7 +159,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         """Close connection (and all channels)"""
-         await self.ensure_open()
-         self.state = CLOSING
--        request = pamqp.specification.Connection.Close(
-+        request = pamqp.commands.Connection.Close(
-             reply_code=0,
-             reply_text='',
-             class_id=0,
-@@ -251,11 +251,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         """Dispatch the received frame to the corresponding handler"""
- 
-         method_dispatch = {
--            pamqp.specification.Connection.Close.name: self.server_close,
--            pamqp.specification.Connection.CloseOk.name: self.close_ok,
--            pamqp.specification.Connection.Tune.name: self.tune,
--            pamqp.specification.Connection.Start.name: self.start,
--            pamqp.specification.Connection.OpenOk.name: self.open_ok,
-+            pamqp.commands.Connection.Close.name: self.server_close,
-+            pamqp.commands.Connection.CloseOk.name: self.close_ok,
-+            pamqp.commands.Connection.Tune.name: self.tune,
-+            pamqp.commands.Connection.Start.name: self.start,
-+            pamqp.commands.Connection.OpenOk.name: self.open_ok,
-         }
-         if frame_channel is None and frame is None:
-             frame_channel, frame = await self.get_frame()
-@@ -392,7 +392,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         def credentials():
-             return '\0{LOGIN}\0{PASSWORD}'.format(**auth)
- 
--        request = pamqp.specification.Connection.StartOk(
-+        request = pamqp.commands.Connection.StartOk(
-             client_properties=client_properties,
-             mechanism=mechanism,
-             locale=locale,
-@@ -420,7 +420,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         self._stream_writer.close()
- 
-     async def _close_ok(self):
--        request = pamqp.specification.Connection.CloseOk()
-+        request = pamqp.commands.Connection.CloseOk()
-         await self._write_frame(0, request)
- 
-     async def tune(self, frame):
-@@ -429,7 +429,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         self.server_heartbeat = frame.heartbeat
- 
-     async def tune_ok(self, channel_max, frame_max, heartbeat):
--        request = pamqp.specification.Connection.TuneOk(
-+        request = pamqp.commands.Connection.TuneOk(
-             channel_max, frame_max, heartbeat
-         )
-         await self._write_frame(0, request)
-@@ -439,7 +439,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
- 
-     async def open(self, virtual_host, capabilities='', insist=False):
-         """Open connection to virtual host."""
--        request = pamqp.specification.Connection.Open(
-+        request = pamqp.commands.Connection.Open(
-             virtual_host, capabilities, insist
-         )
-         await self._write_frame(0, request)
-diff --git a/aioamqp/tests/testcase.py b/aioamqp/tests/testcase.py
-index 120104b..d6d702b 100644
---- a/aioamqp/tests/testcase.py
-+++ b/aioamqp/tests/testcase.py
-@@ -147,7 +147,7 @@ class RabbitTestCaseMixin:
-         if amqp is None:
-             amqp = self.amqp
- 
--        server_version = tuple(int(x) for x in amqp.server_properties['version'].decode().split('.'))
-+        server_version = tuple(int(x) for x in amqp.server_properties['version'].split('.'))
-         return server_version
- 
-     async def check_exchange_exists(self, exchange_name):
-diff --git a/setup.py b/setup.py
-index ea0e79f..1d0e923 100644
---- a/setup.py
-+++ b/setup.py
-@@ -25,8 +25,9 @@ setuptools.setup(
-         'aioamqp',
-     ],
-     install_requires=[
--        'pamqp>=2.2.0,<3',
-+        'pamqp>=3.1.0',
-     ],
-+    python_requires=">=3.6",
-     classifiers=[
-         "Development Status :: 4 - Beta",
-         "Intended Audience :: Developers",
--- 
-2.34.1
-
diff --git a/srcpkgs/python3-aioamqp/template b/srcpkgs/python3-aioamqp/template
index e85e1bcdf143..63f195e85343 100644
--- a/srcpkgs/python3-aioamqp/template
+++ b/srcpkgs/python3-aioamqp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aioamqp'
 pkgname=python3-aioamqp
-version=0.14.0
-revision=4
+version=0.15.0
+revision=1
 wrksrc="aioamqp-aioamqp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/polyconseil/aioamqp"
 distfiles="${homepage}/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=9fce69be1ed9bcc06b74683094f738556305215a1affd0fd7789c23a01c53ecd
+checksum=4d30fe210c742496b5b78de0337f49524571240701eb6c2dc348b1b9d8f819a9
 # Tests require unpackaged asynctest package
 make_check=no
 

From cc955012e9cefdcbd916dcff508158950c9c90bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:32:20 -0400
Subject: [PATCH 1017/2561] python3-hypothesis: update to 6.41.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 df2addcb45d0..d214e0ec6b62 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.40.0
+version=6.41.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=e68589666b903461e7437ea49043a7bd09a6e2cfd1cc32970b4ee19ffe2ed434
+checksum=0fa002e65956bedead5149d2ffa5875cbcb5ca1a3f95301fcf2ad5a241829d91
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From f0a13b809b08f3878ccc1c2f62ce6b66524738c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 22:43:05 -0400
Subject: [PATCH 1018/2561] python3-pandas: update to 1.4.2.

---
 srcpkgs/python3-pandas/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index c538445fc056..b1f2f60e6da7 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.4.1
+version=1.4.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=123bf45a5d7fbd2980d2e4c348f6913406970f1558658e7f221324234c6c4825
+checksum=e2d97255e7cd13b3d3931b49f7be50055e02ca6dff60a68e403b125f8f85c4d2
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
@@ -26,8 +26,8 @@ do_check() {
 	# S3 tests seem to require python3-pytest-xdist
 	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest pandas \
 		--skip-slow --skip-network --skip-db -x -r EX \
-		--ignore pandas/tests/io/parser/test_network.py \
-		-m 'not single' -k 'not test_raw_roundtrip and not _s3'
+		--ignore pandas/tests/io/parser/test_network.py -m 'not single' \
+		-k 'not test_raw_roundtrip and not _s3 and not test_show_versions'
 }
 
 post_install() {

From 72190eb452963f2a6b74ecced8fe22a614683b01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 22:45:13 -0400
Subject: [PATCH 1019/2561] python3-pybind11: update to 2.9.2.

---
 srcpkgs/python3-pybind11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pybind11/template b/srcpkgs/python3-pybind11/template
index 9d757b052b81..b0d551b293e4 100644
--- a/srcpkgs/python3-pybind11/template
+++ b/srcpkgs/python3-pybind11/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pybind11'
 pkgname=python3-pybind11
-version=2.9.1
+version=2.9.2
 revision=1
 wrksrc="pybind11-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pybind/pybind11"
 distfiles="https://github.com/pybind/pybind11/archive/v${version}.tar.gz"
-checksum=c6160321dc98e6e1184cc791fbeadd2907bb4a0ce0e447f2ea4ff8ab56550913
+checksum=6bd528c4dbe2276635dc787b6b1f2e5316cf6b49ee3e150264e455a0d68d19c1
 
 post_patch() {
 	# These dependencies are not packaged and don't affect the man page

From 3c3c85fb1f9215db8583269d3a9e549bf9718981 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Apr 2022 11:45:56 -0400
Subject: [PATCH 1020/2561] python3-prompt_toolkit: update to 3.0.29.

---
 .../patches/dont-handle-sigint.patch          | 51 +++++++++++++++++--
 srcpkgs/python3-prompt_toolkit/template       |  6 +--
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch b/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch
index 60ce287a63d1..4bcca9d16921 100644
--- a/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch
+++ b/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch
@@ -5,9 +5,10 @@ See:
  - https://github.com/prompt-toolkit/python-prompt-toolkit/issues/1576
  - https://trac.sagemath.org/ticket/33360#comment:3
 
---- a/prompt_toolkit/application/application.py	2022-02-11 05:06:37.000000000 -0300
-+++ b/prompt_toolkit/application/application.py	2022-02-21 10:43:13.828058001 -0300
-@@ -634,7 +634,7 @@
+diff -ur a/src/prompt_toolkit/application/application.py b/src/prompt_toolkit/application/application.py
+--- a/src/prompt_toolkit/application/application.py
++++ b/src/prompt_toolkit/application/application.py
+@@ -633,7 +633,7 @@
          self,
          pre_run: Optional[Callable[[], None]] = None,
          set_exception_handler: bool = True,
@@ -16,7 +17,7 @@ See:
          slow_callback_duration: float = 0.5,
      ) -> _AppResult:
          """
-@@ -859,7 +859,7 @@
+@@ -858,7 +858,7 @@
          self,
          pre_run: Optional[Callable[[], None]] = None,
          set_exception_handler: bool = True,
@@ -25,3 +26,45 @@ See:
          in_thread: bool = False,
      ) -> _AppResult:
          """
+diff -ur a/src/prompt_toolkit/application/dummy.py b/src/prompt_toolkit/application/dummy.py
+--- a/src/prompt_toolkit/application/dummy.py
++++ b/src/prompt_toolkit/application/dummy.py
+@@ -24,7 +24,7 @@
+         self,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+         in_thread: bool = False,
+     ) -> None:
+         raise NotImplementedError("A DummyApplication is not supposed to run.")
+@@ -33,7 +33,7 @@
+         self,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+         slow_callback_duration: float = 0.5,
+     ) -> None:
+         raise NotImplementedError("A DummyApplication is not supposed to run.")
+diff -ur a/src/prompt_toolkit/shortcuts/prompt.py b/src/prompt_toolkit/shortcuts/prompt.py
+--- a/src/prompt_toolkit/shortcuts/prompt.py
++++ b/src/prompt_toolkit/shortcuts/prompt.py
+@@ -900,7 +900,7 @@
+         accept_default: bool = False,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+         in_thread: bool = False,
+     ) -> _T:
+         """
+@@ -1135,7 +1135,7 @@
+         accept_default: bool = False,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+     ) -> _T:
+ 
+         if message is not None:
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 26bcb33e82bc..27fdeb83dab2 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.28
-revision=2
+version=3.0.29
+revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=9f1cd16b1e86c2968f2519d7fb31dd9d669916f515612c269d14e9ed52b51650
+checksum=bd640f60e8cecd74f0dc249713d433ace2ddc62b65ee07f96d358e0b152b6ea7
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From b4ed39ac8bbe150967c39646ebca93df26c87234 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Apr 2022 11:50:08 -0400
Subject: [PATCH 1021/2561] python3-ultrajson: update to 5.2.0.

---
 .../python3-ultrajson/patches/no-strip.patch    | 17 -----------------
 srcpkgs/python3-ultrajson/template              |  6 ++++--
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/python3-ultrajson/patches/no-strip.patch

diff --git a/srcpkgs/python3-ultrajson/patches/no-strip.patch b/srcpkgs/python3-ultrajson/patches/no-strip.patch
deleted file mode 100644
index 50fb8f8339c3..000000000000
--- a/srcpkgs/python3-ultrajson/patches/no-strip.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Effectively reverts
-
-    https://github.com/ultrajson/ultrajson/commit/682c6601569980e9a8a05378d3c1478db30384bc
-
-to preserve a meaningful debug package.
-
---- a/setup.py
-+++ b/setup.py
-@@ -20,7 +20,7 @@
-     ],
-     include_dirs=["./python", "./lib", "./deps/double-conversion/double-conversion"],
-     extra_compile_args=["-D_GNU_SOURCE"],
--    extra_link_args=["-lstdc++", "-lm"] + strip_flags,
-+    extra_link_args=["-lstdc++", "-lm"],
- )
- 
- with open("python/version_template.h") as f:
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 848f27d41e56..e7b0dd021f5a 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=5.1.0
+version=5.2.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,9 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=a88944d2f99db71a3ca0c63d81f37e55b660edde0b07216fb65a3e46403ef004
+checksum=163191b88842d874e081707d35de2e205e0e396e70fd068d1038879bca8b17ad
+
+export UJSON_BUILD_NO_STRIP=1
 
 post_install() {
 	vlicense LICENSE.txt

From a3f0e9e8013030a40fda4d93637b37f9d81505db Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Apr 2022 20:58:09 +0200
Subject: [PATCH 1022/2561] u-boot-tools: fix cross and musl builds

---
 srcpkgs/u-boot-tools/patches/musl.patch | 10 ++++++++++
 srcpkgs/u-boot-tools/template           |  5 +++++
 2 files changed, 15 insertions(+)
 create mode 100644 srcpkgs/u-boot-tools/patches/musl.patch

diff --git a/srcpkgs/u-boot-tools/patches/musl.patch b/srcpkgs/u-boot-tools/patches/musl.patch
new file mode 100644
index 000000000000..7cf89c52b8fb
--- /dev/null
+++ b/srcpkgs/u-boot-tools/patches/musl.patch
@@ -0,0 +1,10 @@
+--- a/tools/termios_linux.h
++++ b/tools/termios_linux.h
+@@ -30,6 +30,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <asm/termbits.h>
++#include <asm/ioctls.h>
+ 
+ #if defined(BOTHER) && defined(TCGETS2)
+ #define termios termios2
diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index d6aea6282b47..e7efda468852 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -17,6 +17,7 @@ checksum=68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	hostmakedepends+=" u-boot-tools"
 fi
 
 post_extract() {
@@ -25,6 +26,10 @@ post_extract() {
 		-i include/env.h \
 		-i tools/mkimage.h \
 		-i tools/proftool.c
+
+	if [ "$CROSS_BUILD" ]; then
+		vsed -e 's;^\t$(obj)/bmp_logo;\tbmp_logo;g' -i tools/Makefile
+	fi
 }
 
 do_configure() {

From 3fa723207af0a95050b4e9e9ba96af3602e08288 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Apr 2022 21:29:45 +0200
Subject: [PATCH 1023/2561] u-boot-tools: fix parallel build issues

---
 srcpkgs/u-boot-tools/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index e7efda468852..e3908d65dfc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -36,6 +36,12 @@ do_configure() {
 	make ${makejobs} ${make_build_args} tools-only_defconfig
 }
 
+do_build() {
+	make ${makejobs} ${make_build_args} tools-all
+	make ${makejobs} ${make_build_args} tools-only
+	make ${makejobs} ${make_build_args} envtools
+}
+
 do_check() {
 	# skip tests for now. requires some gymnastics to make the python scripts
 	# find libfdt. the most useful target appears to be "make tcheck"

From 6f8d78ccfc4e4f43d8d4307f49abe361dd1e0674 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Apr 2022 22:12:49 +0200
Subject: [PATCH 1024/2561] pylint: update to 2.13.5.

---
 srcpkgs/pylint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 54af1e2f085d..2d53ba7420f1 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,6 +1,6 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.13.4
+version=2.13.5
 revision=1
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=34a5550bfe94f4ba04eee95367572224bc16dbd2456b3ece5fb92e15399f6cd8
+checksum=5450fd8014baf1663fb4860b7e1dc4f4c4eb9649598a210d68e97be0973c783f
 
 post_install() {
 	# install example config and emacs files

From b61b6e5e586ed08b025a4c4a264d668194343a3e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Apr 2022 22:17:27 +0200
Subject: [PATCH 1025/2561] lagrange: update to 1.12.1.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 41a9f935f8eb..16787f411ee0 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.11.2
+version=1.12.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=4e9a9ed38bcfc7b04856f0e2667d7afd535a8e06e367e2e4368ef5fb9105791f
+checksum=8a342d9b7e980cd6d9771d72215dd543d411721685fb60fc2202e300cb5d6483
 
 post_install() {
 	vlicense LICENSE.md

From 9ecc0d2323fc8c367736ed59c1e62837da4cdb1f Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 31 Mar 2022 18:41:05 +0200
Subject: [PATCH 1026/2561] instaloader: update to 4.9.

---
 srcpkgs/instaloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 2252042b2091..9c5bed15f2ea 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8.4
+version=4.9
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=9615a12a5a01a8b6c9d99a2a047b21d81b341cfd77656b9261bda30ece0cd562
+checksum=7fa6147810eedcc1dedcdec8cfa1f220c9379ab8faeab6a336a7c181d944e2e4
 
 post_install() {
 	vlicense LICENSE

From 9c69aa04946bd2ca958ceef43ba5356cfd98d1e7 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 3 Apr 2022 16:22:31 +0200
Subject: [PATCH 1027/2561] pipe-viewer: update to 0.2.0.

---
 srcpkgs/pipe-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index 3797428bc415..670d4181ab17 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.1.8
+version=0.2.0
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,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=b8f722cdddf0686bb75676b5baa850c1101b54f9c32f562eaac04a6e1863fb8d
+checksum=3913ecfaa3006f645603fb76df9962829138ca62d4b0acaf8b8d4d2e58902f64
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From c8d81af562aef6bfa6b2e3a0e05c3179812d88bf Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Mon, 4 Apr 2022 20:44:14 -0700
Subject: [PATCH 1028/2561] runc: update to 1.1.1

---
 srcpkgs/runc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 2e40b2647d20..182e20b99857 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,6 +1,6 @@
 # Template file for 'runc'
 pkgname=runc
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=go
 go_import_path=github.com/opencontainers/runc
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/opencontainers/runc"
 distfiles="https://github.com/opencontainers/runc/releases/download/v${version}/runc.tar.xz"
-checksum=152e8975793aa45a6717e367bd1652f8147728d25adad339d2f70c4fd2ddc623
+checksum=75c1f0bb19b209412c52599e24b33ac306cf7caf772c97577b7ebe964837a54b
 
 post_build() {
 	make man

From 1f43bcfff0848dbe095476c4a8ad748466bd6375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 3 Apr 2022 21:57:24 +0200
Subject: [PATCH 1029/2561] sslscan: update to 2.0.13.

---
 srcpkgs/sslscan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sslscan/template b/srcpkgs/sslscan/template
index 6d9ceca254a2..2c19a8a0dc7d 100644
--- a/srcpkgs/sslscan/template
+++ b/srcpkgs/sslscan/template
@@ -1,6 +1,6 @@
 # Template file for 'sslscan'
 pkgname=sslscan
-version=2.0.12
+version=2.0.13
 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=6eeda19f564635818d6dd20a1e93174484d62acb24eca8944df07496d32b9c65
+checksum=34549613e16ba5dbfca3d988672041b7b0ece6f408515d6ba8819e2d804b5833
 # No test suite
 make_check=no

From 9d54979e6e938e3b43add100f076e2391be1b0f3 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 14:40:04 -0700
Subject: [PATCH 1030/2561] python3-pluggy: update to 1.0.0

---
 srcpkgs/python3-pluggy/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template
index efaa7e25d2a7..fa49c9826db0 100644
--- a/srcpkgs/python3-pluggy/template
+++ b/srcpkgs/python3-pluggy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pluggy'
 pkgname=python3-pluggy
-version=0.13.1
-revision=7
+version=1.0.0
+revision=1
 wrksrc="pluggy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -12,9 +12,12 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://github.com/pytest-dev/pluggy"
 distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
+checksum=4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159
 
 do_check() {
+	# Must export PYTHONPATH so subprocesses see the variable
+	local _pypath="${PYTHONPATH}"
+	export PYTHONPATH="${PWD}/src:${PYTHONPATH}"
 	python3 -m pytest
 }
 

From e03135123b9baec2a127e4ca4e315ed9d466d4fb Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:54:44 -0700
Subject: [PATCH 1031/2561] New package: python3-lsp-jsonrpc-1.0.0

---
 srcpkgs/python3-lsp-jsonrpc/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-lsp-jsonrpc/template

diff --git a/srcpkgs/python3-lsp-jsonrpc/template b/srcpkgs/python3-lsp-jsonrpc/template
new file mode 100644
index 000000000000..1455aa108797
--- /dev/null
+++ b/srcpkgs/python3-lsp-jsonrpc/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-lsp-jsonrpc'
+pkgname=python3-lsp-jsonrpc
+version=1.0.0
+revision=1
+wrksrc="${pkgname/3}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-ultrajson"
+checkdepends="python3-pytest python3-pytest-cov"
+short_desc="Python server implementation of the JSON RPC 2.0 protocol"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="MIT"
+homepage="https://github.com/python-lsp/python-lsp-jsonrpc"
+distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
+checksum=7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd
+
+post_install() {
+	vlicense LICENSE
+}
+
+do_check() {
+	python3 -m pytest --ignore=test/test_streams.py
+}

From b486f7aba837c8a9ef801b99a521eeadaa891a81 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:53:38 -0700
Subject: [PATCH 1032/2561] New package: python3-lsp-server-1.4.1

Substitute for python3-language-server

Fixes #34192
---
 srcpkgs/python3-language-server               |  1 +
 .../patches/jedi_compat.patch                 | 37 -----------------
 srcpkgs/python3-language-server/template      | 30 --------------
 srcpkgs/python3-lsp-server/template           | 40 +++++++++++++++++++
 4 files changed, 41 insertions(+), 67 deletions(-)
 create mode 120000 srcpkgs/python3-language-server
 delete mode 100644 srcpkgs/python3-language-server/patches/jedi_compat.patch
 delete mode 100644 srcpkgs/python3-language-server/template
 create mode 100644 srcpkgs/python3-lsp-server/template

diff --git a/srcpkgs/python3-language-server b/srcpkgs/python3-language-server
new file mode 120000
index 000000000000..9054a5e99f7e
--- /dev/null
+++ b/srcpkgs/python3-language-server
@@ -0,0 +1 @@
+python3-lsp-server
\ No newline at end of file
diff --git a/srcpkgs/python3-language-server/patches/jedi_compat.patch b/srcpkgs/python3-language-server/patches/jedi_compat.patch
deleted file mode 100644
index 52e7e3c59abe..000000000000
--- a/srcpkgs/python3-language-server/patches/jedi_compat.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/palantir/python-language-server/pull/901
-
-From: bnavigator <code@bnavigator.de>
-Date: Tue, 5 Jan 2021 01:17:33 +0100
-Subject: [PATCH] bump jedi compatibility: compare to Path-like object
-
----
- pyls/plugins/symbols.py | 2 +-
- setup.py                | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pyls/plugins/symbols.py b/pyls/plugins/symbols.py
-index 6468dd83..69a09fe9 100644
---- a/pyls/plugins/symbols.py
-+++ b/pyls/plugins/symbols.py
-@@ -37,7 +37,7 @@ def pyls_document_symbols(config, document):
-                         not sym_full_name.startswith('__main__')):
-                     continue
-
--        if _include_def(d) and document.path == d.module_path:
-+        if _include_def(d) and os.path.samefile(document.path, d.module_path):
-             tuple_range = _tuple_range(d)
-             if tuple_range in exclude:
-                 continue
-diff --git a/setup.py b/setup.py
-index 12782990..99d2b312 100755
---- a/setup.py
-+++ b/setup.py
-@@ -10,7 +10,7 @@
-         'configparser; python_version<"3.0"',
-         'future>=0.14.0; python_version<"3"',
-         'backports.functools_lru_cache; python_version<"3.2"',
--        'jedi>=0.17.2,<0.18.0',
-+        'jedi>=0.17.2,<0.19.0',
-         'python-jsonrpc-server>=0.4.0',
-         'pluggy',
-         'ujson<=2.0.3 ; platform_system!="Windows" and python_version<"3.0"',
diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template
deleted file mode 100644
index a443ec3fb514..000000000000
--- a/srcpkgs/python3-language-server/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python3-language-server'
-pkgname=python3-language-server
-version=0.36.2
-revision=1
-wrksrc="${pkgname/3}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson
- python3-setuptools"
-checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib
- python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle
- python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov
- python3-yapf"
-short_desc="Python implementation of the Language Server Protocol"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://github.com/palantir/python-language-server"
-distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
-checksum=9984c84a67ee2c5102c8e703215f407fcfa5e62b0ae86c9572d0ada8c4b417b0
-# Needs unpackaged rope and versioneer
-# https://github.com/palantir/python-language-server/blob/develop/setup.py#L51
-make_check=no
-
-post_patch() {
-	vsed -i setup.py -e 's/\bujson<=1.35\b/ujson/'
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-lsp-server/template b/srcpkgs/python3-lsp-server/template
new file mode 100644
index 000000000000..cda7c928052a
--- /dev/null
+++ b/srcpkgs/python3-lsp-server/template
@@ -0,0 +1,40 @@
+# Template file for 'python3-lsp-server'
+pkgname=python3-lsp-server
+version=1.4.1
+revision=1
+wrksrc="${pkgname/3}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel"
+depends="python3-jedi python3-pluggy python3-lsp-jsonrpc python3-ultrajson
+ python3-setuptools"
+checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib
+ python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle
+ python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov
+ python3-yapf flake8"
+short_desc="Python implementation of the Language Server Protocol"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="MIT"
+homepage="https://github.com/python-lsp/python-lsp-server"
+distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
+checksum=be7f83298af9f0951a93972cafc9db04fd7cf5c05f20812515275f0ba70e342f
+
+do_check() {
+	python3 -m pytest \
+		--ignore=test/plugins/test_completion.py \
+		--ignore=test/plugins/test_pydocstyle_lint.py \
+		--ignore=test/plugins/test_rope_rename.py
+}
+
+post_install() {
+	vlicense LICENSE
+	ln -s pylsp "${DESTDIR}/usr/bin/pyls"
+}
+
+python3-language-server_package() {
+	build_style=meta
+	depends="python3-lsp-server>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	pkg_install() {
+		vmove usr/bin/pyls
+	}
+}

From d80ea0bdf27ff87f722bf476dc15345c3af85c34 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:52:16 -0700
Subject: [PATCH 1033/2561] python3-jsonrpc-server: remove package

---
 srcpkgs/python3-jsonrpc-server/template | 22 ----------------------
 srcpkgs/removed-packages/template       |  3 ++-
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python3-jsonrpc-server/template

diff --git a/srcpkgs/python3-jsonrpc-server/template b/srcpkgs/python3-jsonrpc-server/template
deleted file mode 100644
index de96976ad0a2..000000000000
--- a/srcpkgs/python3-jsonrpc-server/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python3-jsonrpc-server'
-pkgname=python3-jsonrpc-server
-version=0.4.0
-revision=2
-wrksrc="${pkgname/3}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-ultrajson"
-short_desc="Python library implementing asynchronous JSON RPC server"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://github.com/palantir/python-jsonrpc-server"
-distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
-checksum=62c543e541f101ec5b57dc654efc212d2c2e3ea47ff6f54b2e7dcb36ecf20595
-
-post_patch() {
-	vsed -i setup.py -e 's/\bujson<=1\.35\b/ujson/'
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d5a5e66b8b1a..a76ad553cbf3 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=67
+revision=68
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -325,6 +325,7 @@ replaces="
  python3-docker-pycreds<=0.4.0_4
  python3-grako<=3.99.9_7
  python3-idna-ssl<=1.1.0_3
+ python3-jsonrpc-server<=0.4.0_2
  python3-keepalive<=0.5_6
  python3-pgpdump<=1.5_10
  python3-lockfile<=0.12.2_7

From 9472cf06801a94781dc9ac08d3e769ce263fb446 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 22 Mar 2022 20:47:59 +0100
Subject: [PATCH 1034/2561] dhcpcd: fix 'dhcpcd_open: Bad File Descriptor' with
 dhcpcd-qt.

---
 srcpkgs/dhcpcd/patches/revert-eloop.patch | 150 ++++++++++++++++++++++
 srcpkgs/dhcpcd/template                   |   2 +-
 2 files changed, 151 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dhcpcd/patches/revert-eloop.patch

diff --git a/srcpkgs/dhcpcd/patches/revert-eloop.patch b/srcpkgs/dhcpcd/patches/revert-eloop.patch
new file mode 100644
index 000000000000..e41beb84b62b
--- /dev/null
+++ b/srcpkgs/dhcpcd/patches/revert-eloop.patch
@@ -0,0 +1,150 @@
+From 2b4fe4c12b5d4366ff21fabf3a6c3799f8e4fa53 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 12 Nov 2021 16:24:32 +0000
+Subject: [PATCH] Revert "eloop: Allow eloop to process all fds returned from
+ poll(2)"
+
+This stops dumping leases when privsep is compiled out.
+This change works fine on master, but we also have eloop using
+more of a native poll(2) style interface.
+Easier for now to just revert this on the dhcpcd-9 branch.
+
+This reverts commit fe2b82eec25da908c3a1a71c2dc2402d9ff70e31.
+---
+ src/eloop.c | 56 ++++++++++++++++-------------------------------------
+ 1 file changed, 17 insertions(+), 39 deletions(-)
+
+diff --git a/src/eloop.c b/src/eloop.c
+index a6ab43fb..c3330817 100644
+--- a/src/eloop.c
++++ b/src/eloop.c
+@@ -32,7 +32,6 @@
+ #include <errno.h>
+ #include <limits.h>
+ #include <poll.h>
+-#include <stdbool.h>
+ #include <signal.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+@@ -137,7 +136,6 @@ struct eloop {
+ 	TAILQ_HEAD (event_head, eloop_event) events;
+ 	size_t nevents;
+ 	struct event_head free_events;
+-	bool events_need_setup;
+ 
+ 	struct timespec now;
+ 	TAILQ_HEAD (timeout_head, eloop_timeout) timeouts;
+@@ -284,16 +282,11 @@ eloop_reduce_timers(struct eloop *eloop)
+ static void
+ eloop_event_setup_fds(struct eloop *eloop)
+ {
+-	struct eloop_event *e, *ne;
++	struct eloop_event *e;
+ 	struct pollfd *pfd;
+ 
+ 	pfd = eloop->fds;
+-	TAILQ_FOREACH_SAFE(e, &eloop->events, next, ne) {
+-		if (e->fd == -1) {
+-			TAILQ_REMOVE(&eloop->events, e, next);
+-			TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
+-			continue;
+-		}
++	TAILQ_FOREACH(e, &eloop->events, next) {
+ #ifdef ELOOP_DEBUG
+ 		fprintf(stderr, "%s(%d) fd=%d, rcb=%p, wcb=%p\n",
+ 		    __func__, getpid(), e->fd, e->read_cb, e->write_cb);
+@@ -308,7 +301,6 @@ eloop_event_setup_fds(struct eloop *eloop)
+ 		pfd->revents = 0;
+ 		pfd++;
+ 	}
+-	eloop->events_need_setup = false;
+ }
+ 
+ size_t
+@@ -376,8 +368,7 @@ eloop_event_add_rw(struct eloop *eloop, int fd,
+ 	}
+ 
+ setup:
+-	e->pollfd = NULL;
+-	eloop->events_need_setup = true;
++	eloop_event_setup_fds(eloop);
+ 	return 0;
+ }
+ 
+@@ -403,10 +394,6 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
+ 	struct eloop_event *e;
+ 
+ 	assert(eloop != NULL);
+-	if (fd == -1) {
+-		errno = EINVAL;
+-		return -1;
+-	}
+ 
+ 	TAILQ_FOREACH(e, &eloop->events, next) {
+ 		if (e->fd == fd)
+@@ -422,17 +409,16 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
+ 			goto remove;
+ 		e->write_cb = NULL;
+ 		e->write_cb_arg = NULL;
+-		if (e->pollfd != NULL) {
+-			e->pollfd->events &= ~POLLOUT;
+-			e->pollfd->revents &= ~POLLOUT;
+-		}
+-		return 1;
++		goto done;
+ 	}
+ 
+ remove:
+-	e->fd = -1;
++	TAILQ_REMOVE(&eloop->events, e, next);
++	TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
+ 	eloop->nevents--;
+-	eloop->events_need_setup = true;
++
++done:
++	eloop_event_setup_fds(eloop);
+ 	return 1;
+ }
+ 
+@@ -750,9 +736,6 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
+ 		} else
+ 			tsp = NULL;
+ 
+-		if (eloop->events_need_setup)
+-			eloop_event_setup_fds(eloop);
+-
+ 		n = ppoll(eloop->fds, (nfds_t)eloop->nevents, tsp, signals);
+ 		if (n == -1) {
+ 			if (errno == EINTR)
+@@ -763,23 +746,18 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
+ 			continue;
+ 
+ 		TAILQ_FOREACH(e, &eloop->events, next) {
+-			/* Skip freshly added events */
+-			if (e->pollfd == NULL)
+-				continue;
+-			if (e->pollfd->revents)
+-				n--;
+-			if (e->fd != -1 && e->pollfd->revents & POLLOUT) {
+-				if (e->write_cb != NULL)
++			if (e->pollfd->revents & POLLOUT) {
++				if (e->write_cb != NULL) {
+ 					e->write_cb(e->write_cb_arg);
++					break;
++				}
+ 			}
+-			if (e->fd != -1 &&
+-			    e->pollfd != NULL && e->pollfd->revents)
+-			{
+-				if (e->read_cb != NULL)
++			if (e->pollfd->revents) {
++				if (e->read_cb != NULL) {
+ 					e->read_cb(e->read_cb_arg);
++					break;
++				}
+ 			}
+-			if (n == 0)
+-				break;
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 12be60c1efcf..0d26c1abfa5a 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
 version=9.4.1
-revision=1
+revision=2
 build_style=configure
 make_check_target=test
 configure_args="

From c7bd86639f11669bc358ce2712985079435b4c90 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Apr 2022 23:33:07 +0200
Subject: [PATCH 1035/2561] hwloc: update to 2.7.1.

---
 srcpkgs/hwloc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
index e96886b6cf50..52e01d23fb13 100644
--- a/srcpkgs/hwloc/template
+++ b/srcpkgs/hwloc/template
@@ -1,6 +1,6 @@
 # Template file for 'hwloc'
 pkgname=hwloc
-version=2.6.0
+version=2.7.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=e1f073e44e28c296ff848dead5e9bd6e2426b77f95ead1792358958e859fa83a
+checksum=0d4e1d36c3a72c5d61901bfd477337f5a4c7e0a975da57165237d00e35ef528d
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";;

From 62f785798a85386722907f14ac8ddcfbed329ec2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Apr 2022 23:35:26 +0200
Subject: [PATCH 1036/2561] bmake: update to 20220330.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 19c6c5aa3505..5eac7a6f158f 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20220303
+version=20220330
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=793754b93fec97a0cf6cade0b0ad597bb7ea5057fd24311d4a562432df3e91cb
+checksum=4b46d95b6ae4b3311ba805ff7d5a19b9e37ac0e86880e296e2111f565b545092
 python_version=3
 
 do_configure() {

From 964dcf80ad5b161afb56a35d26935616aedf3337 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:40:06 -0500
Subject: [PATCH 1037/2561] Amass: update to 3.19.1.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 993c17d52c1c..9293dab01c93 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.19.0
+version=3.19.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=539c2207f844c81cc9a6286e436f26a1fc0690bf424ea1885844dd33002b7ef6
+checksum=259dbef81ca63ceb85113c0f741c9212bacbac653bca2cd3e8022b256d08d426

From 46dd62dabf90acdd210f559a6391f112f5caa5cf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:41:08 -0500
Subject: [PATCH 1038/2561] python3-rich: update to 12.2.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 c394edfbeade..c3de71a5749a 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=12.0.1
+version=12.2.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=3fba9dd15ebe048e2795a02ac19baee79dc12cc50b074ef70f2958cd651b59a9
+checksum=ea74bc9dad9589d8eea3e3fd0b136d8bf6e428888955f215824c2894f0da8b47
 make_check=extended # some checks only work on windows
 
 post_install() {

From 7c755f6ffb4056a376d6776e3282dbb01f740178 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:43:25 -0500
Subject: [PATCH 1039/2561] ffuf: update to 1.4.1.

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 6ceffafb0e55..26f037749914 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
 # Template file for 'ffuf'
 pkgname=ffuf
-version=1.4.0
+version=1.4.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=cc741088f15b5cfdeb596f1630a015cce0b4b112dc6daf857cd9878e7a1734c1
+checksum=89b4bd4b3bbad7402d9c81d0d9f21b679c80d0a19bb9a190e45e395736058889
 
 post_install() {
 	vlicense LICENSE

From d37bb77b525a2d7cebd01e03a9f4e110a962dc11 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:54:30 -0500
Subject: [PATCH 1040/2561] python3-youtubesearch: update to 1.6.4.

---
 srcpkgs/python3-youtubesearch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 3d88fc1126aa..822d7eb70ee4 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
-version=1.6.3
+version=1.6.4
 revision=1
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/alexmercerind/youtube-search-python"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=bdb34757c5e390c4d20989d04317acbceffa94293693cbeecb493b079440dbd3
+checksum=a9dcc4536fd839beb29b12d93e59fb92b294a0d83b94b882b16a445158d1f8da
 make_check=no # no tests defined
 
 post_install() {

From eebeef9b769fd109bf428c7554039511309b569d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:55:41 -0500
Subject: [PATCH 1041/2561] sqlmap: update to 1.6.4.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index c77f23f03939..74ce3a2ca71e 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.3
+version=1.6.4
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a099cde73f57ba9e70ad7dd2f7473202a02929766471fc5701f64f2c16b304c2
+checksum=14585e4fc95006467e52685c4838f024654d7e23cbd84eb12762a55918b8d561
 python_version=3
 
 do_install() {

From a9c2379fabdb528304ca9ab9afec6d7af60dcc91 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 18:54:35 -0400
Subject: [PATCH 1042/2561] base-files: add plugdev group

Plugdev is used by many packages' udev rules for pluggable devices.
Currently, some of those packages use the system_groups trigger to add it,
some forget to add it, and others patch it to "users" or "uaccess"
(which breaks the packages on systems that don't use logind).

By adding plugdev to the default groups, we get rid of those problems.
---
 srcpkgs/base-files/files/group | 1 +
 srcpkgs/base-files/template    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/base-files/files/group b/srcpkgs/base-files/files/group
index 0797f31c14d9..b4e61903105c 100644
--- a/srcpkgs/base-files/files/group
+++ b/srcpkgs/base-files/files/group
@@ -22,6 +22,7 @@ scanner:x:20:
 network:x:21:
 kvm:x:24:
 input:x:25:
+plugdev:x:26:
 nogroup:x:99:
 users:x:100:
 xbuilder:x:101:
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 758cd54ad147..bf7b7ef242b0 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.142
-revision=11
+revision=12
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
@@ -29,7 +29,7 @@ conf_files="
 
 replaces="base-directories>=0"
 # New system groups
-system_groups="kvm:24"
+system_groups="kvm:24 plugdev:26"
 
 do_install() {
 	# Create bin and lib dirs and symlinks.

From f524358fb1f4dba048b8b30a67fcf162def89d01 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 19:17:56 -0400
Subject: [PATCH 1043/2561] openocd: drop system_groups

Now that we have plugdev as a system group, we don't need to create it here.
---
 srcpkgs/openocd/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/openocd/template b/srcpkgs/openocd/template
index 3c45ba54dd59..5537a78575c3 100644
--- a/srcpkgs/openocd/template
+++ b/srcpkgs/openocd/template
@@ -1,7 +1,7 @@
 # Template file for 'openocd'
 pkgname=openocd
 version=0.11.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --disable-werror
@@ -49,8 +49,6 @@ homepage="http://openocd.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d
 
-system_groups="plugdev"
-
 CFLAGS="-fcommon"
 
 post_install() {

From ed6b07111ae6a958d97b9fa627a9a889546680f4 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 19:23:15 -0400
Subject: [PATCH 1044/2561] wally-udev-rules: drop system_groups trigger

Now that we have plugdev as a system group, we don't need to create it here.
We also no longer need that INSTALL.msg
---
 srcpkgs/wally-udev-rules/INSTALL.msg | 3 ---
 srcpkgs/wally-udev-rules/template    | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 srcpkgs/wally-udev-rules/INSTALL.msg

diff --git a/srcpkgs/wally-udev-rules/INSTALL.msg b/srcpkgs/wally-udev-rules/INSTALL.msg
deleted file mode 100644
index 6313b5615bad..000000000000
--- a/srcpkgs/wally-udev-rules/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-Please add your user to the group 'plugdev' by executing the following:
-
-usermod -aG plugdev "$USER"
diff --git a/srcpkgs/wally-udev-rules/template b/srcpkgs/wally-udev-rules/template
index 83f37457047b..173a99733c56 100644
--- a/srcpkgs/wally-udev-rules/template
+++ b/srcpkgs/wally-udev-rules/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-udev-rules'
 pkgname=wally-udev-rules
 version=2.1.1
-revision=1
+revision=2
 build_style=fetch
 short_desc="Set of udev rules for ZSA keyboards, for usage with wally and oryx"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
@@ -14,7 +14,6 @@ checksum="6c7d4d27745080269115c58c4c5d863b23c534635975f3bca581c52687721c52
  269c9196bc65b2e62be549e3d34e56768fe702ff099b7780a1661ca4c92a0143
  d2841d63f4e0bdfda102390ab1ca09136230d22f88538863b24b0c7fc68e548e"
 conf_files="/usr/lib/udev/rules.d/50-wally.rules /usr/lib/udev/rules.d/50-oryx.rules"
-system_groups="plugdev"
 
 do_install() {
 	vlicense license.md

From 55533ec8395055d80ac33a5fbb91f1ba26adc6bd Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 19:30:36 -0400
Subject: [PATCH 1045/2561] openrazer-meta: drop system_groups trigger

Now that we have plugdev as a system group, we don't need to create it here.
---
 srcpkgs/openrazer-meta/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template
index 5713a84bbd15..3cd401cb9878 100644
--- a/srcpkgs/openrazer-meta/template
+++ b/srcpkgs/openrazer-meta/template
@@ -1,7 +1,7 @@
 # Template file for 'openrazer-meta'
 pkgname=openrazer-meta
 version=3.0.1
-revision=2
+revision=3
 wrksrc="openrazer-${version}"
 build_style=gnu-makefile
 make_install_target="setup_dkms udev_install daemon_install xdg_install
@@ -36,7 +36,6 @@ openrazer-driver-dkms_package() {
 	short_desc="Kernel driver for Razer devices (DKMS-variant)"
 	depends="dkms"
 	dkms_modules="openrazer-driver $version"
-	system_groups="plugdev"
 	pkg_install() {
 		vmove usr/lib/udev
 		vmove usr/src

From f334e2ccaef6b99001fce5be9a925fff4d3a7295 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 14:03:21 -0400
Subject: [PATCH 1046/2561] elasticsearch: remove package

- last updated in 2017
- contained vulnerable log4j
- licence is a mess
---
 srcpkgs/elasticsearch/INSTALL                 | 14 -----
 srcpkgs/elasticsearch/files/elasticsearch/run |  3 --
 srcpkgs/elasticsearch/template                | 52 -------------------
 srcpkgs/elasticsearch/update                  |  1 -
 srcpkgs/removed-packages/template             |  1 +
 5 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 srcpkgs/elasticsearch/INSTALL
 delete mode 100755 srcpkgs/elasticsearch/files/elasticsearch/run
 delete mode 100644 srcpkgs/elasticsearch/template
 delete mode 100644 srcpkgs/elasticsearch/update

diff --git a/srcpkgs/elasticsearch/INSTALL b/srcpkgs/elasticsearch/INSTALL
deleted file mode 100644
index 622fb85bda9a..000000000000
--- a/srcpkgs/elasticsearch/INSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-# INSTALL
-case "$ACTION" in
-post)
-    if [ "$UPDATE" != "yes" ]; then
-        # actions to execute if package is being installed.
-        install -d usr/share/elasticsearch/plugins
-        install -d -m0750 var/log/elasticsearch
-        install -d -m0750 var/lib/elasticsearch/data
-        chown -R elastic etc/elasticsearch
-        chown -R elastic var/lib/elasticsearch/data
-        chown -R elastic var/log/elasticsearch
-    fi
-    ;;
-esac
diff --git a/srcpkgs/elasticsearch/files/elasticsearch/run b/srcpkgs/elasticsearch/files/elasticsearch/run
deleted file mode 100755
index 6b04b1770817..000000000000
--- a/srcpkgs/elasticsearch/files/elasticsearch/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. /etc/profile # to pull in java path
-exec chpst -u elastic elasticsearch 2>&1
diff --git a/srcpkgs/elasticsearch/template b/srcpkgs/elasticsearch/template
deleted file mode 100644
index a149578d682c..000000000000
--- a/srcpkgs/elasticsearch/template
+++ /dev/null
@@ -1,52 +0,0 @@
-# Template file for 'elasticsearch'
-pkgname=elasticsearch
-version=5.1.2
-revision=2
-wrksrc="elasticsearch-${version}"
-# The only native part is libjnidispatch.so inside jna-*.jar, which is supplied
-# only for a few archs, namely arm (armv6l and better), aarch64, ppc64le, x86,
-# and x86_64; ppc64 is also supplied but elfv1 only, and all only for glibc.
-# We could recompile this, but someone would need to add code to do that.
-archs="i686 x86_64 aarch64 armv6l armv7l ppc64le"
-depends="virtual?java-runtime"
-short_desc="A distributed, open source search and analytics engine"
-maintainer="dota? =op <rogi@skylittlesystem.org>"
-license="Apache-2.0"
-homepage="http://www.elastic.co"
-distfiles="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${version}.tar.gz"
-checksum=74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42
-system_accounts="elastic"
-conf_files="/etc/elasticsearch/elasticsearch.yml /etc/elasticsearch/jvm.options /etc/elasticsearch/log4j2.properties"
-
-do_install() {
-	ES="usr/share/elasticsearch"
-
-	rm -f bin/*.{bat,exe}
-	vmkdir $ES
-
-	vcopy bin $ES
-	vcopy lib $ES
-	vcopy modules $ES
-	vcopy plugins $ES
-
-	vmkdir usr/bin
-
-	ln -sf /$ES/bin/elasticsearch "$DESTDIR/usr/bin"
-
-	vmkdir etc/elasticsearch
-	vcopy config/* etc/elasticsearch
-
-	ln -sf /etc/elasticsearch "$DESTDIR/$ES/config"
-
-	vmkdir var/lib/elasticsearch/data
-	ln -sf /var/lib/elasticsearch/data "$DESTDIR/$ES/data"
-
-	vmkdir var/log/elasticsearch
-	ln -sf /var/log/elasticsearch "$DESTDIR/$ES/logs"
-
-	vlicense LICENSE.txt
-	vlicense NOTICE.txt
-	vdoc README.textile
-
-	vsv elasticsearch
-}
diff --git a/srcpkgs/elasticsearch/update b/srcpkgs/elasticsearch/update
deleted file mode 100644
index 32de96485c8f..000000000000
--- a/srcpkgs/elasticsearch/update
+++ /dev/null
@@ -1 +0,0 @@
-site="https://www.elastic.co/downloads/elasticsearch"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a76ad553cbf3..240f1282f54c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -66,6 +66,7 @@ replaces="
  dtkwm<=2.0.12_1
  ebtables<=2.0.10.4_8
  eclipse-ecj<=4.9_3
+ elasticsearch<=5.1.2_2
  electron7<=7.3.3_1
  electron9<=9.4.1_1
  emacs-gtk2<=27.2_1

From 7fa81ab1f24e566f4a0e08e349d1378fb032bf46 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sun, 20 Mar 2022 00:41:04 -0400
Subject: [PATCH 1047/2561] libsigrok: fix on systems without logind

Fixes #23580
Closes #23581 (obsoletes the PR)
---
 srcpkgs/libsigrok/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libsigrok/template b/srcpkgs/libsigrok/template
index 87939ce82fa8..0243925a7312 100644
--- a/srcpkgs/libsigrok/template
+++ b/srcpkgs/libsigrok/template
@@ -1,7 +1,7 @@
 # Template file for 'libsigrok'
 pkgname=libsigrok
 version=0.5.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config doxygen python3"
 makedepends="glib-devel libzip-devel glibmm-devel libserialport-devel
@@ -20,6 +20,7 @@ esac
 post_install() {
 	vinstall contrib/60-libsigrok.rules 0644 /usr/lib/udev/rules.d
 	vinstall contrib/61-libsigrok-uaccess.rules 0644 /usr/lib/udev/rules.d
+	vinstall contrib/61-libsigrok-plugdev.rules 0644 /usr/lib/udev/rules.d
 }
 
 libsigrok-devel_package() {

From f06cdeaa605b228673ece7783b31cddd19926ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?=
 =?UTF-8?q?=EF=BD=94=EF=BD=89?= <hiljusti@so.dang.cool>
Date: Wed, 9 Mar 2022 01:07:08 -0800
Subject: [PATCH 1048/2561] New package: sigi-3.1.0

---
 srcpkgs/sigi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/sigi/template

diff --git a/srcpkgs/sigi/template b/srcpkgs/sigi/template
new file mode 100644
index 000000000000..d9fc482b8207
--- /dev/null
+++ b/srcpkgs/sigi/template
@@ -0,0 +1,22 @@
+# Template file for 'sigi'
+pkgname=sigi
+version=3.1.0
+revision=1
+build_style=cargo
+short_desc="Organization tool for people who hate organization"
+maintainer="J.R. Hill <hiljusti@so.dang.cool>"
+license="GPL-2.0-only"
+homepage="https://github.com/hiljusti/sigi"
+distfiles="https://crates.io/api/v1/crates/sigi/${version}/download>sigi-${version}.tar.gz"
+checksum=967e492a89f05c3a373929a48e0a1a7712d4742b150216228feff4a7869297e3
+
+pre_check() {
+	# CLI tests in the project rely on BATS (more than just bats-core) through
+	# git submodules. We skip those tests here until the other bats components
+	# are imported in Void or https://github.com/hiljusti/sigi/issues/19
+	export SKIP_BATS_TESTS=1
+}
+
+post_install() {
+	vman sigi.1
+}

From 80130c457008b3c34eef1668adea539919e83715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 5 Apr 2022 21:46:03 -0300
Subject: [PATCH 1049/2561] pari: update to 2.13.4.

---
 srcpkgs/pari/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 9543739472ac..8bac1e0343f8 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,6 +1,6 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.3
+version=2.13.4
 revision=1
 build_style=configure
 build_helper=qemu
@@ -16,8 +16,9 @@ short_desc="Fast computations library in number theory"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
+changelog="https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=blob_plain;f=CHANGES;hb=refs/heads/pari-${version%.*}"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=ccba7f1606c6854f1443637bb57ad0958d41c7f4753f8ae8459f1d64c267a1ca
+checksum=bcde9eceae1592814381c1697cdb7063567b6504201b1be47bb58920f3bce185
 
 build_options="x11 pthreads"
 build_options_default="x11 pthreads"

From 52a48462cc316550f4a5f3925b3e29a08a3c9ac1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 13:30:28 +0200
Subject: [PATCH 1050/2561] virt-manager: update to 4.0.0

Closes #35955
---
 ...le-compile-schemas-update-icon-cache.patch | 20 +++++++++++++++++++
 srcpkgs/virt-manager/template                 | 13 ++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch

diff --git a/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch b/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch
new file mode 100644
index 000000000000..ad8f6f798b20
--- /dev/null
+++ b/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch
@@ -0,0 +1,20 @@
+--- a/setup.py
++++ b/setup.py
+@@ -264,17 +264,6 @@ class my_install(setuptools.command.install.install):
+         setuptools.command.install.install.finalize_options(self)
+ 
+     def run(self):
+-        if not self.distribution.no_update_icon_cache:
+-            print("running gtk-update-icon-cache")
+-            icon_path = os.path.join(self.install_data, "share/icons/hicolor")
+-            self.spawn(["gtk-update-icon-cache", "-q", "-t", icon_path])
+-
+-        if not self.distribution.no_compile_schemas:
+-            print("compiling gsettings schemas")
+-            gschema_install = os.path.join(self.install_data,
+-                "share/glib-2.0/schemas")
+-            self.spawn(["glib-compile-schemas", gschema_install])
+-
+         setuptools.command.install.install.run(self)
+ 
+ 
diff --git a/srcpkgs/virt-manager/template b/srcpkgs/virt-manager/template
index f3f6a7424a1b..3b66b6fd8a90 100644
--- a/srcpkgs/virt-manager/template
+++ b/srcpkgs/virt-manager/template
@@ -1,10 +1,10 @@
 # Template file for 'virt-manager'
 pkgname=virt-manager
-version=3.2.0
-revision=2
+version=4.0.0
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/share/${pkgname}/virtManager"
-hostmakedepends="gettext python3-docutils gtk-update-icon-cache"
+hostmakedepends="gettext python3-docutils python3-setuptools"
 depends="virt-manager-tools>=${version}_${revision} libvirt-glib
  gtk-vnc spice-gtk gtksourceview4 dconf vte3 gir-freedesktop"
 _coredeps="python3-gobject libvirt-python3 libosinfo
@@ -16,14 +16,9 @@ license="GPL-2.0-or-later"
 homepage="https://virt-manager.org"
 changelog="https://raw.githubusercontent.com/virt-manager/virt-manager/master/NEWS.md"
 distfiles="https://virt-manager.org/download/sources/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86
+checksum=515aaa2021a4bf352b0573098fe6958319b1ba8ec508ea37e064803f97f17086
 python_version=3
 
-post_install() {
-	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
-		$DESTDIR/usr/share/icons/hicolor/icon-theme.cache
-}
-
 virt-manager-tools_package() {
 	short_desc="Programs to create and clone virtual machines"
 	depends="${_coredeps} python3-argcomplete"

From 7a6f0d9a8eab7ec0d29a9495f7ce4ce6abb4f105 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 7 Apr 2022 09:28:02 -0400
Subject: [PATCH 1051/2561] peek: undo compression of manual page

---
 srcpkgs/peek/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/peek/template b/srcpkgs/peek/template
index f5bd1845c83c..cc6ffed27c4d 100644
--- a/srcpkgs/peek/template
+++ b/srcpkgs/peek/template
@@ -1,7 +1,7 @@
 # Template file for 'peek'
 pkgname=peek
 version=1.5.1
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="glib-devel libxml2 gettext pkg-config txt2man vala"
 makedepends="gtk+3-devel libkeybinder3-devel"
@@ -12,3 +12,8 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/phw/peek"
 distfiles="https://github.com/phw/peek/archive/${version}.tar.gz"
 checksum=d2b52297d3941db2f10ad4dd00a6d5606728c0fee6af5f1594a036f88e478237
+
+post_install() {
+	# Manual page is actually compressed; make sure the post-install hook finds it
+	mv ${DESTDIR}/usr/share/man/man1/peek.{1,1.gz}
+}

From a73a1c8e28f2077f05fc178b573f9e2b52c68f6b Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 15:24:56 -0500
Subject: [PATCH 1052/2561] python3-utils: update to 3.1.0.

---
 srcpkgs/python3-utils/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-utils/template b/srcpkgs/python3-utils/template
index 44f31ded5733..a4db83649ac7 100644
--- a/srcpkgs/python3-utils/template
+++ b/srcpkgs/python3-utils/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-utils'
 pkgname=python3-utils
-version=2.5.6
-revision=2
+version=3.1.0
+revision=1
 wrksrc="python-utils-${version}"
 build_style=python3-module
+# skip coverage and mypy tests https://github.com/WoLpH/python-utils/issues/29
+make_check_args="-o addopts=--doctest-modules"
 hostmakedepends="python3-setuptools"
-depends="python3-six"
+checkdepends="python3-pytest python3-pytest-asyncio"
 short_desc="Convenient utilities not included with the standard Python3 install"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/WoLpH/python-utils"
 distfiles="https://github.com/WoLpH/python-utils/archive/v${version}.tar.gz"
-checksum=e35044706c5c7863110ac31afc9fac66f5dc47d6450ebe26a6ac26473ce09d90
+checksum=6f20e784af79dd0f2c330c88496b3d08fa29e27bcfba398ba78f73d8ae85f670
 
 post_install() {
 	vlicense LICENSE

From fd2a4b4d8053c5cf03ece257da2799f52895573a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 6 Apr 2022 19:27:08 -0400
Subject: [PATCH 1053/2561] python3-rtree: update to 1.0.0.

---
 srcpkgs/python3-rtree/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-rtree/template b/srcpkgs/python3-rtree/template
index 8fce4b16e21e..26812e0af5f9 100644
--- a/srcpkgs/python3-rtree/template
+++ b/srcpkgs/python3-rtree/template
@@ -1,9 +1,10 @@
 # Template file for 'python3-rtree'
 pkgname=python3-rtree
-version=0.9.5
-revision=4
+version=1.0.0
+revision=1
 wrksrc="rtree-${version}"
 build_style=python3-module
+make_check_target="tests"
 hostmakedepends="python3-setuptools libspatialindex-devel python3-wheel"
 makedepends="python3-devel libspatialindex-devel"
 depends="python3 libspatialindex"
@@ -13,12 +14,8 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://toblerity.org/rtree/"
 distfiles="https://github.com/Toblerity/rtree/archive/${version}.tar.gz"
-checksum=8d6eebab672d4ac58d10a8f13a200d47502ce70153d43700ddbbde145a217e01
+checksum=b9cc215197cffeb3c7b8becfc6833d382f431381942e5529bcf276a874028fec
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
 }
-
-do_check() {
-	python3 -m pytest tests/
-}

From 8dcbf93ed58a6c4c5040a96e3c8293b0aa48f5c4 Mon Sep 17 00:00:00 2001
From: *1is7ac3* Isaac Quiroz <isaac.qa13@gmail.com>
Date: Sun, 27 Mar 2022 19:33:22 -0300
Subject: [PATCH 1054/2561] python3-chromecast: update to 10.3.0.

---
 srcpkgs/python3-chromecast/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index cd54fcaf8977..72f891be6a1f 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-chromecast'
 pkgname=python3-chromecast
-version=8.1.0
-revision=2
+version=10.3.0
+revision=1
 wrksrc="pychromecast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-protobuf python3-zeroconf python3-casttube"
@@ -12,7 +12,7 @@ maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"
 homepage="https://github.com/home-assistant-libs/pychromecast"
 distfiles="https://github.com/home-assistant-libs/pychromecast/archive/${version}.tar.gz"
-checksum=f11d73cffa84b25417192c30e6ea46df470b65055e229c568f677372c4ded1de
+checksum=325d8cfa686b7127de1783221f7ef3e81988c0631619bbacf3679ce647b1db1f
 
 post_install() {
 	vlicense LICENSE

From ee679dcdf215e39eeded97e149eee9d098c1c300 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Fri, 25 Mar 2022 16:58:59 +0100
Subject: [PATCH 1055/2561] python3-Werkzeug: update to 2.0.3.

Closes: #36337 [via git-merge-pr]
---
 srcpkgs/python3-Werkzeug/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template
index e2b947031bb4..ed6980da99ea 100644
--- a/srcpkgs/python3-Werkzeug/template
+++ b/srcpkgs/python3-Werkzeug/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Werkzeug'
 pkgname=python3-Werkzeug
-version=2.0.2
+version=2.0.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Markus Berger <pulux@pf4sh.de>"
 license="BSD-3-Clause"
 homepage="https://palletsprojects.com/p/werkzeug/"
 distfiles="${PYPI_SITE}/W/Werkzeug/Werkzeug-${version}.tar.gz"
-checksum=aa2bb6fc8dee8d6c504c0ac1e7f5f7dc5810a9903e793b6f715a9f015bdadb9a
+checksum=b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c
 
 do_check() {
 	# Tests depend on xprocess and pytest-timeout, which aren't packaged

From 1886e1b8be0c5d8fc9d06e4aa51c8fa2d7411f75 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Fri, 25 Mar 2022 16:55:44 +0100
Subject: [PATCH 1056/2561] python3-itsdangerous: update to 2.1.2.

---
 srcpkgs/python3-itsdangerous/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-itsdangerous/template b/srcpkgs/python3-itsdangerous/template
index 6fa31a0342fd..b770f01eef0c 100644
--- a/srcpkgs/python3-itsdangerous/template
+++ b/srcpkgs/python3-itsdangerous/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-itsdangerous'
 pkgname=python3-itsdangerous
-version=2.0.1
-revision=2
+version=2.1.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Markus Berger <pulux@pf4sh.de>"
 license="BSD-3-Clause"
 homepage="http://github.com/mitsuhiko/itsdangerous"
 distfiles="${PYPI_SITE}/i/itsdangerous/itsdangerous-${version}.tar.gz"
-checksum=9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0
+checksum=5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a
 
 post_install() {
 	vlicense LICENSE.rst

From 08bf2902b64234321317f06dea4f64d9f5904713 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 19:11:32 +0100
Subject: [PATCH 1057/2561] python3-keyring: update to 23.5.0.

---
 srcpkgs/python3-keyring/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 2fbc05352aed..298460551bfd 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-keyring'
 pkgname=python3-keyring
-version=23.1.0
-revision=2
+version=23.5.0
+revision=1
 wrksrc="keyring-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+build_style=python3-pep517
+hostmakedepends="python3-wheel python3-setuptools_scm"
 depends="python3-SecretStorage python3-importlib_metadata"
 checkdepends="python3-importlib_metadata python3-pytest
  python3-pytest-flake8 python3-pytest-cov"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/jaraco/keyring"
 changelog="https://raw.githubusercontent.com/jaraco/keyring/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz"
-checksum=b7e0156667f5dcc73c1f63a518005cd18a4eb23fe77321194fefcc03748b21a4
+checksum=9012508e141a80bd1c0b6778d5c610dd9f8c464d75ac6774248500503f972fb9
 
 post_install() {
 	vlicense LICENSE

From 80d44846af3e975a0c37b0f9641129ba529c9f3c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 14:16:57 +0200
Subject: [PATCH 1058/2561] perl-LWP: update to 6.62.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index d3136bc16c9a..b878123cf002 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.61
+version=6.62
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=2f69069bd0df0ee222e25d41093bcc42e58d0a45885fba400356454c25621a5f
+checksum=569ac15eb69d54b2a8d932403610690b89c68d6a987eab2f627c0639bae7de18

From c3a421816c847938a223f6ca853b2ad47c5ab4d9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 14:21:11 +0200
Subject: [PATCH 1059/2561] tgt: update to 1.0.82.

---
 srcpkgs/tgt/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template
index 5bf3d09a7070..653ebf2dc358 100644
--- a/srcpkgs/tgt/template
+++ b/srcpkgs/tgt/template
@@ -1,6 +1,6 @@
 # Template file for 'tgt'
 pkgname=tgt
-version=1.0.81
+version=1.0.82
 revision=1
 build_style=gnu-makefile
 make_install_args="sbindir=/usr/bin"
@@ -13,17 +13,12 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/fujita/tgt"
 distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz"
-checksum=f8a285549456f13fecf628131a73934ffcbb701bacb7d5802acee7b515ab5452
+checksum=35156277465e0ced5f3ca7e301110a937a7a2b90bbb5aecbca1349b91ada1c2c
 
 post_extract() {
 	sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile
-	sed -i '/^LDFLAGS/d; /CC.*-o/s/$/ $(LDFLAGS)/' usr/Makefile
-	sed -i '1i#include <sys/user.h>' usr/tgtd.h usr/util.h
-	sed -i '1i#include <fcntl.h>' usr/libssc.c
-	sed -i '1i#include <sys/sysmacros.h>' usr/bs_sg.c
-	sed -i 's/__always_inline/inline/g' usr/util.h
-
 }
+
 post_install() {
 	for f in ${DESTDIR}/etc/tgt/examples/*; do
 		vsconf $f

From 12cf5d181646d4b00bfef0219e72134620abacc1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 14:21:50 +0200
Subject: [PATCH 1060/2561] ugrep: update to 3.7.8.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 795927e8ab52..2c25a04aa898 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.7
+version=3.7.8
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=5490d6491267bb1aaaeac27a0ba41d502f4b1c1b8998b8cc377c91374603932d
+checksum=b2e03615890b92df4487a2891bf47675429c469b1825d5d05600ed3a729b92c7
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From a56ef84094e04a228497b19930e7bd3ccc63e089 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 17:10:09 +0200
Subject: [PATCH 1061/2561] texlive2021-bin: fix repo url.

---
 srcpkgs/texlive2021-bin/INSTALL  | 4 ++--
 srcpkgs/texlive2021-bin/template | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive2021-bin/INSTALL b/srcpkgs/texlive2021-bin/INSTALL
index bc296786a54e..9b4952b0cc6d 100644
--- a/srcpkgs/texlive2021-bin/INSTALL
+++ b/srcpkgs/texlive2021-bin/INSTALL
@@ -5,10 +5,10 @@ post)
 		cd opt/texlive2021-installer
 		case "${ARCH}" in
 			x86_64-musl)
-			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile -force-platform x86_64-linuxmusl
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/tlnet-final/ -profile void.profile -force-platform x86_64-linuxmusl
 			;;
 			*)
-			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/tlnet-final/ -profile void.profile
 			;;
 		esac
 	esac
diff --git a/srcpkgs/texlive2021-bin/template b/srcpkgs/texlive2021-bin/template
index c7bbe1f9fdb8..3212ec2a5ff5 100644
--- a/srcpkgs/texlive2021-bin/template
+++ b/srcpkgs/texlive2021-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive2021-bin'
 pkgname=texlive2021-bin
 version=2021
-revision=2
+revision=3
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv

From 6a98c7b52b5235fa97bb94f7c57fcf9b7eb75ef8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 17:10:35 +0200
Subject: [PATCH 1062/2561] texlive-bin: update to 2022.

---
 srcpkgs/texlive-bin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template
index af5517c46ebd..26866c5e5841 100644
--- a/srcpkgs/texlive-bin/template
+++ b/srcpkgs/texlive-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'texlive-bin'
 pkgname=texlive-bin
-version=2021
+version=2022
 revision=1
 depends="texlive${version}-bin"
 short_desc="TeX Live Binary distribution through tl-install (newest version)"

From 063e2e65b604232e497968f819872727286a3424 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 18:08:58 +0200
Subject: [PATCH 1063/2561] cronie: backport upstream regression fix.

https://github.com/cronie-crond/cronie/commit/62e53f1cdb9c1e12a01ee7814c92cd937d50328d

Closes #36554.
---
 srcpkgs/cronie/patches/62e53f1.patch | 21 +++++++++++++++++++++
 srcpkgs/cronie/template              |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cronie/patches/62e53f1.patch

diff --git a/srcpkgs/cronie/patches/62e53f1.patch b/srcpkgs/cronie/patches/62e53f1.patch
new file mode 100644
index 000000000000..160c03116415
--- /dev/null
+++ b/srcpkgs/cronie/patches/62e53f1.patch
@@ -0,0 +1,21 @@
+From 62e53f1cdb9c1e12a01ee7814c92cd937d50328d Mon Sep 17 00:00:00 2001
+From: w30023233 <wangyuhang27@huawei.com>
+Date: Wed, 23 Mar 2022 15:40:01 +0800
+Subject: [PATCH] Fix regression in handling 1-5 crontab entries
+
+---
+ src/entry.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/entry.c b/src/entry.c
+index e9e258b..bb7cb62 100644
+--- a/src/entry.c
++++ b/src/entry.c
+@@ -595,6 +595,7 @@ get_range(bitstr_t * bits, int low, int high, const char *names[],
+ 				return (EOF);
+ 
+ 			case R_RANGE:
++				unget_char(ch, file);
+ 				if (get_number(&num2, low, names, file) != EOF) {
+ 					state = R_RANGE_NUM2;
+ 					break;
diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template
index 526f59b4d835..e8f45b3ff904 100644
--- a/srcpkgs/cronie/template
+++ b/srcpkgs/cronie/template
@@ -1,7 +1,7 @@
 # Template file for 'cronie'
 pkgname=cronie
 version=1.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-inotify --without-selinux --with-pam
  --enable-anacron --enable-pie --enable-relro"

From 5f702ed8c2b51bea3574ee3e0b67e616b2c273cf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 18:37:58 +0200
Subject: [PATCH 1064/2561] zlib: backport crc32 fix.

https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2

Closes #36537.
---
 srcpkgs/zlib/patches/crc32.patch | 51 ++++++++++++++++++++++++++++++++
 srcpkgs/zlib/template            |  2 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/zlib/patches/crc32.patch

diff --git a/srcpkgs/zlib/patches/crc32.patch b/srcpkgs/zlib/patches/crc32.patch
new file mode 100644
index 000000000000..85a6a7e3ab41
--- /dev/null
+++ b/srcpkgs/zlib/patches/crc32.patch
@@ -0,0 +1,51 @@
+From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Wed, 30 Mar 2022 11:14:53 -0700
+Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
+
+The previous releases of zlib were not sensitive to incorrect CRC
+inputs with bits set above the low 32. This commit restores that
+behavior, so that applications with such bugs will continue to
+operate as before.
+---
+ crc32.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crc32.c b/crc32.c
+index a1bdce5c2..451887bc7 100644
+--- a/crc32.c
++++ b/crc32.c
+@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+ 
+     /* Pre-condition the CRC */
+-    crc ^= 0xffffffff;
++    crc = (~crc) & 0xffffffff;
+ 
+     /* Compute the CRC up to a word boundary. */
+     while (len && ((z_size_t)buf & 7) != 0) {
+@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+ 
+     /* Pre-condition the CRC */
+-    crc ^= 0xffffffff;
++    crc = (~crc) & 0xffffffff;
+ 
+ #ifdef W
+ 
+@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+ #ifdef DYNAMIC_CRC_TABLE
+     once(&made, make_crc_table);
+ #endif /* DYNAMIC_CRC_TABLE */
+-    return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
++    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
+ }
+ 
+ /* ========================================================================= */
+@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
+     uLong crc2;
+     uLong op;
+ {
+-    return multmodp(op, crc1) ^ crc2;
++    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
+ }
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 6dbe30032202..d142f283fb0a 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
 # Template file for 'zlib'
 pkgname=zlib
 version=1.2.12
-revision=1
+revision=2
 bootstrap=yes
 build_style=configure
 configure_args="--prefix=/usr --shared"

From 7d71ba14bc360f2e09744dd4cd48bf3c3e6bc3fa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 17 Mar 2022 15:17:16 +0100
Subject: [PATCH 1065/2561] notion: update to 4.0.2.

- Fix homepage
- Fix musl (backport upstream patch)
- Fix nonfree, upstream should be proper LGPL-2.1-or-later now
- Use Lua 5.4
---
 srcpkgs/notion/patches/stdout.patch | 89 +++++++++++++++++++++++++++++
 srcpkgs/notion/template             | 18 +++---
 2 files changed, 97 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/notion/patches/stdout.patch

diff --git a/srcpkgs/notion/patches/stdout.patch b/srcpkgs/notion/patches/stdout.patch
new file mode 100644
index 000000000000..b4200f680d2e
--- /dev/null
+++ b/srcpkgs/notion/patches/stdout.patch
@@ -0,0 +1,89 @@
+From de9e19940c2c88c848b7f849fb014fafd77d7d93 Mon Sep 17 00:00:00 2001
+From: c0dev0id <sh+github@codevoid.de>
+Date: Sat, 10 Apr 2021 02:03:44 +0200
+Subject: [PATCH] Fix compilation on OpenBSD
+
+The variable name "stdout" is defined in stdio.h on OpenBSD already.
+---
+ mod_notionflux/mod_notionflux.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/mod_notionflux/mod_notionflux.c b/mod_notionflux/mod_notionflux.c
+index f2bd4427..51949e07 100644
+--- a/mod_notionflux/mod_notionflux.c
++++ b/mod_notionflux/mod_notionflux.c
+@@ -36,7 +36,7 @@
+ 
+ typedef struct{
+     int fd;
+-    FILE *stdout;
++    FILE *stdoutput;
+     int ndata;
+     char *data;
+ } Buf;
+@@ -64,9 +64,9 @@ static void close_conn(Buf *buf)
+     close(buf->fd);
+     buf->fd=-1;
+     buf->ndata=0;
+-    if(buf->stdout!=NULL){
+-        fclose(buf->stdout);
+-        buf->stdout=NULL;
++    if(buf->stdoutput!=NULL){
++        fclose(buf->stdoutput);
++        buf->stdoutput=NULL;
+     }
+     if(buf->data!=NULL){
+         free(buf->data);
+@@ -147,11 +147,11 @@ static void receive_data(int fd, void *buf_)
+     bool success=FALSE;
+     int idx=buf-bufs;
+ 
+-    if(buf->stdout==NULL){ /* no fd received yet, must be the very beginning */
+-        int stdout_fd=unix_recv_fd(fd);
+-        if(stdout_fd==-2)
++    if(buf->stdoutput==NULL){ /* no fd received yet, must be the very beginning */
++        int stdoutput_fd=unix_recv_fd(fd);
++        if(stdoutput_fd==-2)
+             goto closefd;
+-        if(stdout_fd==-3){
++        if(stdoutput_fd==-3){
+             char const *err="Magic number mismatch on notionflux socket - "
+                 "is notionflux the same version as notion?";
+             writes(fd, "E");
+@@ -160,13 +160,13 @@ static void receive_data(int fd, void *buf_)
+             goto closefd;
+         }
+ 
+-        if(stdout_fd==-1) {
++        if(stdoutput_fd==-1) {
+             if(errno==EWOULDBLOCK || errno==EAGAIN)
+                 return; /* try again later */
+             warn("No file descriptor received from notionflux, closing.");
+             goto closefd;
+         }
+-        if((buf->stdout=fdopen(stdout_fd, "w"))==NULL) {
++        if((buf->stdoutput=fdopen(stdoutput_fd, "w"))==NULL) {
+             warn("fdopen() failed on fd from notionflux");
+             goto closefd;
+         }
+@@ -239,9 +239,9 @@ EXTL_SAFE
+ EXTL_EXPORT
+ bool mod_notionflux_xwrite(int idx, const char *str)
+ {
+-    if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdout==NULL)
++    if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdoutput==NULL)
+         return FALSE;
+-    return fputs(str, bufs[idx].stdout)!=EOF;
++    return fputs(str, bufs[idx].stdoutput)!=EOF;
+ }
+ 
+ static void connection_attempt(int lfd, void *UNUSED(data))
+@@ -410,7 +410,7 @@ bool mod_notionflux_init()
+ 
+     for(i=0; i<MAX_SERVED; i++){
+         bufs[i].fd=-1;
+-        bufs[i].stdout=NULL;
++        bufs[i].stdoutput=NULL;
+         bufs[i].data=NULL;
+         bufs[i].ndata=0;
+     }
diff --git a/srcpkgs/notion/template b/srcpkgs/notion/template
index b0746f9b1c02..1246e0e9c6cd 100644
--- a/srcpkgs/notion/template
+++ b/srcpkgs/notion/template
@@ -1,17 +1,16 @@
 # Template file for 'notion'
-pkgname="notion"
-version=4.0.0
-revision=2
-archs="~*-musl"
+pkgname=notion
+version=4.0.2
+revision=1
+hostmakedepends="pkg-config gettext groff lua54"
+makedepends="libSM-devel libXext-devel libXft-devel libXinerama-devel
+ libXrandr-devel lua54-devel readline-devel"
 short_desc="Tabbed, tiling window manager"
-hostmakedepends="pkg-config gettext groff lua53"
-makedepends="lua53-devel libXext-devel libXft-devel libSM-devel libXinerama-devel libXrandr-devel"
 maintainer="Julian Wiesener <jw@vtoc.de>"
 license="LGPL-2.1-or-later"
-repository="nonfree"
-homepage="https://notionnm.net/"
+homepage="https://notionwm.net/"
 distfiles="https://github.com/raboof/notion/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=13ce5867667ad7a864c79f4cb1e322fa33ebcd872dfce6472026e4d69d1f4138
+checksum=dcefd620d028f6541c15879c3db218de081df7ce8d2e9cb4fc7ddd9b9253b698
 
 do_build() {
 	make CC=$CC PREFIX=/usr ETCDIR=/etc/notion
@@ -21,5 +20,4 @@ do_install() {
 	make DESTDIR=${DESTDIR} PREFIX=/usr ETCDIR=/etc/notion install
 	vman man/notion.1
 	vman man/notionflux.1
-	vlicense LICENSE
 }

From 9a36f4679c8cc935959766f856d7e3469444144d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 11 Mar 2022 16:00:18 +0100
Subject: [PATCH 1066/2561] xinit: remove skel files.

We shipped two skeleton files for ~/.xinitrc and ~/.xsession, but the
default behavior of xinit/startx is more useful than an .xinitrc that
doesn't start a window manager, and the .xsession had a bug calling
bash -i which resulted in appending the .xinitrc into the user history...
drop this unnecessary stuff.

Users can copy /etc/X11/xinit/xinitrc as a starting point.
---
 srcpkgs/xinit/files/xinitrc  | 17 -----------------
 srcpkgs/xinit/files/xsession | 10 ----------
 srcpkgs/xinit/template       |  8 ++------
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/xinit/files/xinitrc
 delete mode 100644 srcpkgs/xinit/files/xsession

diff --git a/srcpkgs/xinit/files/xinitrc b/srcpkgs/xinit/files/xinitrc
deleted file mode 100644
index dbd080d00361..000000000000
--- a/srcpkgs/xinit/files/xinitrc
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
diff --git a/srcpkgs/xinit/files/xsession b/srcpkgs/xinit/files/xsession
deleted file mode 100644
index a16dc0b8421f..000000000000
--- a/srcpkgs/xinit/files/xsession
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/bash --login -i ~/.xinitrc
-
diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template
index be836ebc94ad..b687c0ccd2c4 100644
--- a/srcpkgs/xinit/template
+++ b/srcpkgs/xinit/template
@@ -1,7 +1,7 @@
 # Template file for 'xinit'
 pkgname=xinit
 version=1.4.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-xinitdir=/etc/X11/xinit"
 hostmakedepends="pkg-config"
@@ -15,13 +15,9 @@ checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9
 
 conf_files="
 	/etc/X11/xinit/xinitrc
-	/etc/X11/xinit/xserverrc
-	/etc/skel/.xinitrc
-	/etc/skel/.xsession"
+	/etc/X11/xinit/xserverrc"
 
 post_install() {
-	vinstall ${FILESDIR}/xinitrc 644 etc/skel .xinitrc
-	vinstall ${FILESDIR}/xsession 644 etc/skel .xsession
 	vinstall ${FILESDIR}/xserverrc 644 etc/X11/xinit
 	vlicense COPYING
 }

From 1e74b8aa9925a4a81e924b759511c1d6d458e2d7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 19:10:10 +0100
Subject: [PATCH 1067/2561] xine-lib: update to 1.2.12.

---
 srcpkgs/xine-lib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template
index 51cbd363f7ba..f713eff49b07 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'xine-lib'
 pkgname=xine-lib
-version=1.2.11
+version=1.2.12
 revision=1
 build_style=gnu-configure
 configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.xine-project.org"
 changelog="https://sourceforge.net/projects/xine/files/xine-lib/${version}/README.txt/view"
 distfiles="${SOURCEFORGE_SITE}/xine/${pkgname}-${version}.tar.xz"
-checksum=ef51b21d10dda1045fa7d711bd9171cfdaf0a5a2874233bcf16ffdf28ec07005
+checksum=d606270468e1540c2a89c0d7f5fdf11e17ecc0c2698cc0bcb1065ff26abee098
 
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl)

From 499af9f9eaa687a96d4ce0671d9497dc43483854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 14 Mar 2022 08:37:19 +0100
Subject: [PATCH 1068/2561] New package: python3-subprocess-tee-0.3.5

---
 srcpkgs/python3-subprocess-tee/template | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/python3-subprocess-tee/template

diff --git a/srcpkgs/python3-subprocess-tee/template b/srcpkgs/python3-subprocess-tee/template
new file mode 100644
index 000000000000..39a0233dad70
--- /dev/null
+++ b/srcpkgs/python3-subprocess-tee/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-subprocess-tee'
+pkgname=python3-subprocess-tee
+version=0.3.5
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-pep517
+make_install_target="subprocess_tee-${version}-py3-none-any.whl"
+hostmakedepends="python3-wheel python3-toml"
+depends="python3"
+short_desc="Replacement for subprocess.run capturing output while still printing it"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/pycontribs/subprocess-tee"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577
+# requires molecule, which isn't packaged yet
+make_check=no
+
+post_patch() {
+	# scm versioning is broken in this release
+	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 17f7cdcd32c0bf48b4fdcbf7bba34035f95f5335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 14 Mar 2022 08:38:01 +0100
Subject: [PATCH 1069/2561] New package: python3-ansible-compat-2.0.0

---
 srcpkgs/python3-ansible-compat/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/python3-ansible-compat/template

diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
new file mode 100644
index 000000000000..bf03fe221d0a
--- /dev/null
+++ b/srcpkgs/python3-ansible-compat/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-ansible-compat'
+pkgname=python3-ansible-compat
+version=2.0.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-pep517
+make_install_target="ansible_compat-${version}-py3-none-any.whl"
+hostmakedepends="python3-wheel python3-toml"
+depends="python3-subprocess-tee"
+short_desc="Python package for working with various version of ansible"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/ansible-community/ansible-compat"
+distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=4027da4ec2b524c263a801cc2dc6da2b98c2996cec258cef118a30c790467ed2
+
+post_patch() {
+	# scm versioning is broken in this release
+	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 272402874dd69c8160f33b5dd7866f2c45cdc933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 14 Mar 2022 08:38:12 +0100
Subject: [PATCH 1070/2561] python3-ansible-lint: update to 6.0.2.

---
 srcpkgs/python3-ansible-lint/template | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index 78d31ea90639..00d8dc40f6a6 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,18 +1,25 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
-version=5.4.0
+version=6.0.2
 revision=1
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
 make_install_target="ansible_lint-${version}-py3-none-any.whl"
 hostmakedepends="python3-wheel python3-toml"
-depends="ansible-core python3-yamllint python3-six python3-yaml python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch"
+depends="ansible-core python3-yamllint python3-six python3-yaml
+ python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch
+ python3-ansible-compat"
 short_desc="Linter for Ansible files"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
-license="MIT"
+# Note about licensing from upstream:
+# The ansible-lint project is distributed as GPLv3 due to use of GPLv3 runtime
+# dependencies, like ansible and yamllint. For historical reasons, its own
+# code-base remains licensed under a more liberal MIT license and any
+# contributions made are accepted as being made under original MIT license.
+license="GPL-3.0-only"
 homepage="https://github.com/ansible-community/ansible-lint"
 distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=2160a60b4ab034c04006d701a1779340ffb0f6e28f030ff8de958e1062a88962
+checksum=b539bc22d13e6de0cc2e25758e1d28b2bc01561a414ae37ceda3708b5a2a79ed
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660
@@ -22,7 +29,3 @@ post_patch() {
 	# scm versioning is broken in this release
 	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
 }
-
-post_install() {
-	vlicense LICENSE
-}

From 2f891034ebf2c3e390f66bbb96381a16d4397118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 26 Mar 2022 12:20:51 +0100
Subject: [PATCH 1071/2561] ansible: update to 5.5.0.

---
 srcpkgs/ansible/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index eb132fa68380..063e24d1684a 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=5.4.0
+version=5.5.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ 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=2f0ecbd8a3232e520bf3e3bc23f40dda60b9ce7924ca194bd35f4de4027100fc
+checksum=b8a76d737889c9bfd0e6b0f2276dcf8d836da667067a355776f3504d7a66d518
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660

From 85c54a2c83e7f498c01817493146a054affadcb4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:25 -0400
Subject: [PATCH 1072/2561] openjdk12-bootstrap: fix version, xlint

---
 srcpkgs/openjdk12-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 4861ad1efc40..2b5d421a52f0 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk12-bootstrap'
-_java_ver=12
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=10
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk12-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=12.0.2+10
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 12)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
 

From e24c034e994ce1693e52bed84eab1bd0f70e8249 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:26 -0400
Subject: [PATCH 1073/2561] openjdk13-bootstrap: fix version, xlint

---
 srcpkgs/openjdk13-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 82c34b7999f3..4a61e102381d 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk13-bootstrap'
-_java_ver=13
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=8
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk13-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=13.0.2+8
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 13)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
 

From 550cb6940d2f51c572de0c36efa3aa2139abd887 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:27 -0400
Subject: [PATCH 1074/2561] openjdk14-bootstrap: fix version, xlint

---
 srcpkgs/openjdk14-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 5c15ca3f32c0..768b94633196 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk14-bootstrap'
-_java_ver=14
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=12
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk14-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=14.0.2+12
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel openjdk13-bootstrap"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 14)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
 
 # Build is still parallel, but don't use -jN.

From 19d077a8113365b4ad4764241b8b0a9430a57c7f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:28 -0400
Subject: [PATCH 1075/2561] openjdk15-bootstrap: fix version, xlint

---
 srcpkgs/openjdk15-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index efbc69f9429e..7608f4dd2658 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk15-bootstrap'
-_java_ver=15
-_java_min_ver=0
-_java_sec_ver=3
-_jdk_update=3
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk15-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=15.0.3+3
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -38,7 +35,6 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk14-bootstrap"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 15)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
@@ -47,6 +43,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
  https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
 checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
 
 # Build is still parallel, but don't use -jN.

From 8e3e1b093592b37fb94e49b749ce70a56542cafd Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:29 -0400
Subject: [PATCH 1076/2561] openjdk16-bootstrap: fix version, xlint

---
 srcpkgs/openjdk16-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 9bea476c6836..28e70a17fd2b 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk16-bootstrap'
-_java_ver=16
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=7
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk16-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=16.0.2+7
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --enable-unlimited-crypto
@@ -38,7 +35,6 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk15-bootstrap"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 16)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
@@ -47,6 +43,7 @@ distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.ta
  https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
 checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
 
 # Build is still parallel, but don't use -jN.

From 5b9d3ad0f2159d3ac92788a02edfc01f4b0fe9da Mon Sep 17 00:00:00 2001
From: Mizuno Jan Yuta <mjy@8x9.space>
Date: Fri, 8 Apr 2022 01:05:47 +0900
Subject: [PATCH 1077/2561] mdocml: fix readability issues in void-man-cgi.

Fix: #36557
---
 srcpkgs/mdocml/files/void.css | 37 +++++++++++++++++++++++++----------
 srcpkgs/mdocml/template       |  2 +-
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/mdocml/files/void.css b/srcpkgs/mdocml/files/void.css
index 289145066991..4e2f75357213 100644
--- a/srcpkgs/mdocml/files/void.css
+++ b/srcpkgs/mdocml/files/void.css
@@ -1,8 +1,24 @@
 
 /** Void style **/
-body { color: #333; }
-a { color: #478061; }
-a:hover { color: #000; }
+html {
+	--fg: #333;
+	--bg: #fff;
+	--fg-accent: #478061;
+	--nav-fg: #fff;
+	--nav-bg: #478061;
+}
+@media (prefers-color-scheme: dark) {
+	html {
+		--fg: #ccc;
+		--bg: #222;
+		--fg-accent: #62b086;
+		--nav-fg: #fff;
+		--nav-bg: #295340;
+	}
+}
+
+a, :link, :visited { color: var(--fg-accent); }
+a:hover { color: var(--fg); }
 
 html { max-width: 100% }
 body { margin: 0 }
@@ -11,29 +27,30 @@ body { margin: 0 }
 nav#void-nav {
 	width:100%;
 	min-height:50px;
-	background:#478061;
+	color:var(--nav-fg);
+	background-color:var(--nav-bg);
 	z-index:110;
 	font-size:14px
 }
 nav#void-nav ul {
-	float:right;
+	display:block;
 	list-style:none;
 	margin:0
 }
 nav#void-nav ul li {
-	float:left;
+	display:inline-block;
 	margin:0;
-	clear:initial
 }
 nav#void-nav ul li a {
-	display:block;
+	display:inline-block;
 	padding:15px;
 	line-height:20px;
 	font-size:1.2em;
-	color:#fff;
+	color:var(--nav-fg);
 	text-decoration: none
 }
 nav#void-nav ul li a:hover,nav#void-nav ul li a:focus {
-	background:#000;
+	color:#fff;
+	background-color:#000;
 	text-decoration:none
 }
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index 41e07f089ab2..e8aa98cdb158 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.14.6
-revision=1
+revision=2
 wrksrc="mandoc-${version}"
 build_style=configure
 make_build_args="all man.cgi"

From 4857bba691a580f07602ee009550b7b05d7d06e4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 19:01:04 +0200
Subject: [PATCH 1078/2561] mdocml: add padding to void-mang-cgi, limit line
 length.

---
 srcpkgs/mdocml/files/void.css | 2 +-
 srcpkgs/mdocml/template       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdocml/files/void.css b/srcpkgs/mdocml/files/void.css
index 4e2f75357213..89a9fb4b3211 100644
--- a/srcpkgs/mdocml/files/void.css
+++ b/srcpkgs/mdocml/files/void.css
@@ -22,7 +22,7 @@ a:hover { color: var(--fg); }
 
 html { max-width: 100% }
 body { margin: 0 }
-#mandoc { max-width: 65em; margin: 0.8em }
+.manual-text { max-width: 65em; padding: 0 1em; }
 
 nav#void-nav {
 	width:100%;
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index e8aa98cdb158..e18de8b7adf2 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.14.6
-revision=2
+revision=3
 wrksrc="mandoc-${version}"
 build_style=configure
 make_build_args="all man.cgi"

From 3bf85b998900a904482796646034e53eea8a6e51 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 7 Apr 2022 11:44:33 -0500
Subject: [PATCH 1079/2561] xmandump: update to 0.2.2.

---
 srcpkgs/xmandump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index ae17bbcefa49..b05027396eaf 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,6 +1,6 @@
 # Template file for 'xmandump'
 pkgname=xmandump
-version=0.2.1
+version=0.2.2
 revision=1
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="ISC"
 homepage="https://github.com/void-linux/xmandump"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ca261e075940c97cb3ad639e4c8b746fa93bc7559032bc1ada3858c63658d014
+checksum=c664b84b9eb26e6cf6d7bc0aceca9a2ccfcfb1c0a4e0611544117489941c00ca
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 8f4fadc49e05b654a298ced8b313dea0c73afc74 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sat, 2 Apr 2022 23:59:42 +0300
Subject: [PATCH 1080/2561] vault: update to 1.10.0.

---
 srcpkgs/vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 4746d4974195..49f6a4b405b9 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,6 +1,6 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.9.4
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=7ebae46e12ff353c3a9e861c4991410679a3c890d36c7c6fb17b43e9ea6f6115
+checksum=4b3303af72b9383369d6219dc88beaef3b343b262625e5d7c6a309ae9286d8c2
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0750 root _vault"

From 324e91944db82f636e5873c7f2f540eb73faccb7 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 2 Apr 2022 16:22:04 +0530
Subject: [PATCH 1081/2561] avrdude: update to 6.4, adopt

---
 srcpkgs/avrdude/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/avrdude/template b/srcpkgs/avrdude/template
index ec6866e05bab..5ebe45ae47e4 100644
--- a/srcpkgs/avrdude/template
+++ b/srcpkgs/avrdude/template
@@ -1,15 +1,21 @@
 # Template file for 'avrdude'
 pkgname=avrdude
-version=6.3
-revision=3
+version=6.4
+revision=1
 build_style=gnu-configure
+configure_args="$(vopt_enable gpio linuxgpio) $(vopt_enable spi linuxspi)"
 hostmakedepends="flex"
-makedepends="elfutils-devel libusb-devel libusb-compat-devel libftdi1-devel"
+makedepends="elfutils-devel libusb-devel libusb-compat-devel libftdi1-devel
+ hidapi-devel"
 depends="avr-libc"
 short_desc="Utility to manipulate ROM and EEPROM of AVR microcontrollers"
-maintainer="allan <mail@may.mooo.com>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://www.nongnu.org/avrdude/"
 distfiles="$NONGNU_SITE/$pkgname/${pkgname}-$version.tar.gz"
-checksum=0f9f731b6394ca7795b88359689a7fa1fba818c6e1d962513eb28da670e0a196
+checksum=a9be7066f70a9dcf4bf0736fcf531db6a3250aed1a24cc643add27641b7110f9
 conf_files="/etc/avrdude.conf"
+build_options="gpio spi"
+desc_option_spi="Enable LINUXSPI support"
+desc_option_gpio="Enable LINUXGPIO support"
+build_options_default="${build_options}"

From 74fdb4bb6bcbddc978ef99336fc8eb02a4cdfeb1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Mar 2022 12:08:58 +0200
Subject: [PATCH 1082/2561] exa: adopt and adjust dependencies

---
 srcpkgs/exa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index d2eb81a34ec0..660f997c809e 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -3,10 +3,10 @@ pkgname=exa
 version=0.10.1
 revision=1
 build_style=cargo
-hostmakedepends="pkg-config libgit2-devel"
+hostmakedepends="pkg-config"
 makedepends="libgit2-devel"
 short_desc="Modern replacement for ls"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="MIT"
 homepage="https://the.exa.website/"
 distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz

From 9e7b6410827fc1f9aff6993c499661d5c81f0702 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 12:47:25 +0100
Subject: [PATCH 1083/2561] muffin: update to 5.2.1.

---
 srcpkgs/muffin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 830922739b4f..cb8032a75d21 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
 # Template file for 'muffin'
 pkgname=muffin
-version=5.2.0
+version=5.2.1
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -15,8 +15,9 @@ short_desc="Cinnamon window manager based on Mutter"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/muffin"
+changelog="https://raw.githubusercontent.com/linuxmint/muffin/master/debian/changelog"
 distfiles="https://github.com/linuxmint/muffin/archive/${version}.tar.gz"
-checksum=8366569f27a62913dade9935e0688b3636ca11b8ee00a061c9fdcbb6b27f3e2f
+checksum=356a9fce1f4e9f39a6e0156c5dcab1e4190113a191cf1422d1ea08dbea4bfda4
 shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
  libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
 

From aeb0dbef0189a8802673577156da94bc46af439d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 16:12:00 +0100
Subject: [PATCH 1084/2561] libvdpau: update to 1.5.

---
 srcpkgs/libvdpau/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvdpau/template b/srcpkgs/libvdpau/template
index 8b1c817cfd07..fcc2b6fcfd58 100644
--- a/srcpkgs/libvdpau/template
+++ b/srcpkgs/libvdpau/template
@@ -1,6 +1,6 @@
 # Template file for 'libvdpau'
 pkgname=libvdpau
-version=1.4
+version=1.5
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://freedesktop.org/wiki/Software/VDPAU/"
 distfiles="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/libvdpau-${version}.tar.gz"
-checksum=240dd8f9ec08de707529917677827ba12e13b9fc299eeb3af13ea05e7fc74aba
+checksum=66490802f30426d30ff9e8af35263bbbbaa23b52d0a2d797d06959c3d19638fd
 
 post_install() {
 	vlicense COPYING

From b41da0dd2106574a41850f2a38d7f701b7745484 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 16:12:04 +0100
Subject: [PATCH 1085/2561] vdpauinfo: update to 1.4.

---
 srcpkgs/vdpauinfo/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/vdpauinfo/template b/srcpkgs/vdpauinfo/template
index 611b5d864010..9b71a655a935 100644
--- a/srcpkgs/vdpauinfo/template
+++ b/srcpkgs/vdpauinfo/template
@@ -1,16 +1,17 @@
 # Template file for 'vdpauinfo'
 pkgname=vdpauinfo
-version=1.0
-revision=3
+_glhash=8f047eac351672cc4316724edb6ad2b2
+version=1.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libvdpau-devel"
 short_desc="Command line utility for querying the capabilities of a VDPAU device"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://cgit.freedesktop.org/~aplattner/vdpauinfo"
-distfiles="http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${version}.tar.gz"
-checksum=4054960b7ae618c351ff1ce3e7831b5cbda964ae1fbf9969b7146404d3044bc4
+homepage="https://freedesktop.org/wiki/Software/VDPAU/"
+distfiles="https://gitlab.freedesktop.org/vdpau/vdpauinfo/uploads/${_glhash}/vdpauinfo-${version}.tar.gz"
+checksum=40188bc5671c139e58330dbcac2a6ced0064485cb4cdf368558feca17d7922a0
 
 post_install() {
 	vlicense COPYING

From 941d96f12c7405a78b8ff2e2758863ec33d3b905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 9 Feb 2022 17:53:05 +0100
Subject: [PATCH 1086/2561] cargo-deny: update to 0.11.3.

---
 srcpkgs/cargo-deny/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 6adc1fdd9cf2..4045e5a8c568 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.10.1
+version=0.11.3
 revision=1
 build_style=cargo
 configure_args="--no-default-features"
@@ -10,13 +10,18 @@ short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
+changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=136764d16b6d60fc9ddec4989ab4cb2bdcee9a096d0f3cd40b1c574bcc1b7f44
+checksum=d9e6adc8342d69b84b4c4e6b1d34eaaf0750b4680a9c675c8c74659a8c27cfc8
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"
 fi
 
+post_patch() {
+ 	cargo update --package autocfg --precise 1.1.0
+}
+
 post_install() {
 	vlicense LICENSE-APACHE
 	vlicense LICENSE-MIT

From 05e16fc4b8c207617ccc81ea89b228bc3e11c4bf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 16:11:31 +0100
Subject: [PATCH 1087/2561] libva: update to 2.14.0.

---
 srcpkgs/libva/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index bcf4c8003d75..093f7b86355b 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.13.0
+version=2.14.0
 revision=1
 build_style=meson
 configure_args="-Dwith_glx=no"
@@ -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=6b7ec7d4fa204dad3f266450981f1f0892400c03afd3e00ac11f8ccade5aaaa1
+checksum=f21152a2170edda9d1c4dd463d52eaf62b553e83e553c0a946654523cca86d5e
 
 build_options="wayland"
 build_options_default="wayland"

From 406058153fe75d2ef786f02f316c4f21bde532ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 16:11:35 +0100
Subject: [PATCH 1088/2561] libva-glx: update to 2.14.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 268daeda3f3e..b8411bcb09fb 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.13.0
+version=2.14.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=6b7ec7d4fa204dad3f266450981f1f0892400c03afd3e00ac11f8ccade5aaaa1
+checksum=f21152a2170edda9d1c4dd463d52eaf62b553e83e553c0a946654523cca86d5e
 
 post_install() {
 	# We are only interested in the glx component, remove everything else.

From 5ab306f5e972a03a03f6bd4d7b651a19bf562973 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 16:11:39 +0100
Subject: [PATCH 1089/2561] libva-utils: update to 2.14.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 0cf9bd48088c..b98e3e9f73a3 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.13.0
+version=2.14.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=128333faa9792a3b87586a80bfb70859dcdd81847ec9a722f785a601a48e1731
+checksum=0ad6410aaa27d7b15dadee0f4d775d54d6394b582bf315353a4657b49c78ac31
 
 post_install() {
 	vlicense COPYING

From 02ca1680af73fb0b6e57ca00c3804ae28358b871 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 13 Feb 2022 08:58:24 +0000
Subject: [PATCH 1090/2561] iproute2: update to 5.16.0.

---
 ...0001-lib-fix-ax25.h-include-for-musl.patch | 36 +++++++++++++++++++
 srcpkgs/iproute2/template                     |  4 +--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch

diff --git a/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch b/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
new file mode 100644
index 000000000000..401965b0a348
--- /dev/null
+++ b/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
@@ -0,0 +1,36 @@
+From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 13 Jan 2022 08:14:13 +0000
+Subject: [PATCH] lib: fix ax25.h include for musl
+
+ax25.h isn't guaranteed to be avilable in netax25/*;
+it's dependent on our choice of libc (it's not available
+on musl at least) [0].
+
+Let's use the version from linux-headers.
+
+[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers
+Bug: https://bugs.gentoo.org/831102
+
+Signed-off-by: Sam James <sam@gentoo.org>
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+---
+ lib/ax25_ntop.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c
+index cfd0e04b06f9..3a72a43e9b77 100644
+--- a/lib/ax25_ntop.c
++++ b/lib/ax25_ntop.c
+@@ -2,7 +2,7 @@
+ 
+ #include <errno.h>
+ #include <sys/socket.h>
+-#include <netax25/ax25.h>
++#include <linux/ax25.h>
+ 
+ #include "utils.h"
+ 
+-- 
+2.35.1
+
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 8f517150839a..9dbba00b6fe0 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=5.12.0
+version=5.16.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
 distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9d268db98a36ee2a0e3ff3b92b2efff66fc1138a51e409bdef6ab3cfe15f326f
+checksum=c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f
 
 conf_files="
  /etc/iproute2/ematch_map

From 7181bc3704bea6402682d7ae34b039895b18baa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 6 Feb 2022 12:01:07 -0300
Subject: [PATCH 1091/2561] findutils: update to 4.9.0.

---
 srcpkgs/findutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index b35980a49d9c..aae4919f2ee5 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -1,6 +1,6 @@
 # Template file for 'findutils'
 pkgname=findutils
-version=4.8.0
+version=4.9.0
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/findutils"
 changelog="https://git.savannah.gnu.org/cgit/findutils.git/plain/NEWS"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164
+checksum=a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From 32e93608261c8f5a3d8a7c0f6ad0e1208941c246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 1 Feb 2022 23:06:24 +0100
Subject: [PATCH 1092/2561] ethtool: update to 5.16.

---
 srcpkgs/ethtool/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index 66add241d5e2..26ea94680d6b 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
 # Template file for 'ethtool'
 pkgname=ethtool
-version=5.14
+version=5.16
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,6 +8,6 @@ makedepends="libmnl-devel"
 short_desc="Utility for controlling network drivers and hardware"
 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=bb13db91915cacd7a492b65b65df07a67e4b974ddbeaf76205b1945a23d27686
+homepage="https://www.kernel.org/pub/software/network/ethtool/"
+distfiles="https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=aa2fef1936dd4a11755dfa0bdb93f0ec5bea45208d27c9754bc3abe1aa42c1cb

From a57d04e13a6fd7643edff95b6bad11622cd5049c Mon Sep 17 00:00:00 2001
From: Bleznudd <bleznudd@pm.me>
Date: Thu, 17 Feb 2022 17:38:13 +0100
Subject: [PATCH 1093/2561] setzer: update to 0.4.4.

---
 srcpkgs/setzer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index dbf10bb07705..ab0d86c3ec3b 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,14 +1,14 @@
 # Template file for 'setzer'
 pkgname=setzer
-version=0.4.2
+version=0.4.4
 revision=1
 wrksrc=Setzer-${version}
 build_style=meson
 hostmakedepends="gettext"
-depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-pdfminer.six python3-pexpect"
+depends="poppler-glib virtual?tex gspell python3-gobject gtksourceview4 python3-pdfminer.six python3-pexpect"
 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=50b5d273120f81b1f0a7efbcc0ce1fb1623518fe18b23ded45a82e8166003d3b
+checksum=2b380c2d100970e25f851f42c354ed10e0c51de86c7b28ec1252173c22c393ce

From 46cf48ca18a7391d667813c296530798de5cf7ae Mon Sep 17 00:00:00 2001
From: Erica Z <zerica@tilde.team>
Date: Mon, 20 Dec 2021 19:57:16 +0100
Subject: [PATCH 1094/2561] font-ibm-plex-ttf: update to 6.0.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When there’s a choice between hinted and unhinted variants for a font
family, this template chooses the former. This is more or less an
arbitrary choice, since I’m unaware of any specific guidelines of this
sort. It’s impossible to include both, as the files themselves overlap,
and including neither (where applicable) would completely remove support
for some languages.
---
 srcpkgs/font-ibm-plex-ttf/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-ibm-plex-ttf/template b/srcpkgs/font-ibm-plex-ttf/template
index c5226d6761fd..b1717b8831c0 100644
--- a/srcpkgs/font-ibm-plex-ttf/template
+++ b/srcpkgs/font-ibm-plex-ttf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-ibm-plex-ttf'
 pkgname=font-ibm-plex-ttf
-version=5.2.1
+version=6.0.0
 revision=1
 wrksrc="plex-${version}"
 depends="font-util"
@@ -9,13 +9,14 @@ maintainer="Felipe Nogueira <contato.fnog@gmail.com>"
 license="OFL-1.1"
 homepage="https://github.com/IBM/plex"
 distfiles="https://github.com/IBM/plex/archive/v${version}.tar.gz"
-checksum=6b43a97a116a4beba474b9a9c646fb6ded8ba255fa8d3b252e669f67cbeb9d7f
+checksum=e78cc68cb40ccca0318facade727a0deb32f73e931a2e31bb2fcaf8a6d386dff
 
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
 	vmkdir usr/share/fonts/TTF
 	vcopy "IBM-Plex-*/fonts/complete/ttf/*.ttf" usr/share/fonts/TTF
+	vcopy "IBM-Plex-*/fonts/complete/ttf/hinted/*.ttf" usr/share/fonts/TTF
 }
 
 font-ibm-plex-otf_package() {
@@ -25,5 +26,6 @@ font-ibm-plex-otf_package() {
 	pkg_install() {
 		vmkdir usr/share/fonts/OTF
 		vcopy "IBM-Plex-*/fonts/complete/otf/*.otf" usr/share/fonts/OTF
+		vcopy "IBM-Plex-*/fonts/complete/otf/hinted/*.otf" usr/share/fonts/OTF
 	}
 }

From 2bb75a9cee21379846fe0295f5970df373d27920 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 19:21:41 +0200
Subject: [PATCH 1095/2561] e2fsprogs: update to 1.46.5.

---
 srcpkgs/e2fsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index f58472ff7a8d..a32c50b823b5 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
-version=1.46.4
+version=1.46.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-elf-shlibs --disable-fsck
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://e2fsprogs.sourceforge.net/"
 distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
-checksum=b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713
+checksum=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e
 conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
 
 do_check() {

From a3a3d111777b52f120344371f0eeb4caf90de83b Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH 1096/2561] musikcube: update to 0.97.0, adopt

- Added patch to fix MPRIS support detection
- Moved openmpt plugin to a separate package `musikcube-openmpt`
---
 srcpkgs/musikcube-openmpt                     |  1 +
 .../patches/fix-install-locations.patch       | 26 ++++++-------
 .../patches/fix-mpris-detection.patch         | 25 ++++++++++++
 srcpkgs/musikcube/template                    | 39 +++++++++++--------
 4 files changed, 62 insertions(+), 29 deletions(-)
 create mode 120000 srcpkgs/musikcube-openmpt
 create mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch

diff --git a/srcpkgs/musikcube-openmpt b/srcpkgs/musikcube-openmpt
new file mode 120000
index 000000000000..b3cc8e74bf48
--- /dev/null
+++ b/srcpkgs/musikcube-openmpt
@@ -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 63537349f450..590f27bf1a7d 100644
--- a/srcpkgs/musikcube/patches/fix-install-locations.patch
+++ b/srcpkgs/musikcube/patches/fix-install-locations.patch
@@ -1,11 +1,11 @@
 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 CMakeLists.txt CMakeLists.txt
-index d685695f..5ac43f1f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -208,7 +208,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+diff --git a/.cmake/InstallFiles.cmake b/.cmake/InstallFiles.cmake
+index 62d3c003..01ef58ac 100644
+--- a/.cmake/InstallFiles.cmake
++++ b/.cmake/InstallFiles.cmake
+@@ -4,7 +4,7 @@ if (APPLE)
    install(FILES ${plugins} DESTINATION share/musikcube/plugins)
  else ()
    file(GLOB plugins "bin/plugins/*.so")
@@ -13,9 +13,9 @@ index d685695f..5ac43f1f 100644
 +  install(FILES ${plugins} DESTINATION lib/musikcube/plugins)
  endif ()
  
- file(GLOB sdk_headers "src/musikcore/sdk/*.h")
-@@ -237,20 +237,12 @@ endif()
- if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ if (${BUILD_STANDALONE} MATCHES "true")
+@@ -43,20 +43,12 @@ endif()
+ if (APPLE)
    install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube)
  else()
 -  install(FILES "bin/libmusikcore.so" DESTINATION share/musikcube)
@@ -36,7 +36,7 @@ index d685695f..5ac43f1f 100644
    DESTINATION bin/
    PERMISSIONS
      OWNER_EXECUTE OWNER_READ OWNER_WRITE
-@@ -260,14 +252,6 @@ install(
+@@ -66,14 +58,6 @@ install(
  # executable and shell script for daemon
  install(
    FILES bin/musikcubed
@@ -51,12 +51,12 @@ index d685695f..5ac43f1f 100644
    DESTINATION bin/
    PERMISSIONS
      OWNER_EXECUTE OWNER_READ OWNER_WRITE
-diff --git src/musikcore/support/Common.cpp src/musikcore/support/Common.cpp
-index 58bc4d2f..1670c2f7 100644
+diff --git a/src/musikcore/support/Common.cpp b/src/musikcore/support/Common.cpp
+index 31703117..53aa8a88 100644
 --- a/src/musikcore/support/Common.cpp
 +++ b/src/musikcore/support/Common.cpp
-@@ -90,65 +90,11 @@ namespace musik { namespace core {
-     }
+@@ -82,65 +82,11 @@ static inline void silentDelete(const std::string fn) {
+ namespace musik { namespace core {
  
      std::string GetPluginDirectory() {
 -        std::string path(GetApplicationDirectory());
diff --git a/srcpkgs/musikcube/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
new file mode 100644
index 000000000000..dc7035d06693
--- /dev/null
+++ b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
@@ -0,0 +1,25 @@
+In Void linux, elogind provides libsystemd
+
+diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake
+index ce0eea9b..5b067671 100644
+--- a/.cmake/AddOsSpecificPlugins.cmake
++++ b/.cmake/AddOsSpecificPlugins.cmake
+@@ -6,7 +6,7 @@ endif()
+ 
+ # systemd / MPRIS detection
+ if (NOT ENABLE_MPRIS MATCHES "false")
+-  find_library(LIB_SYSTEMD NAMES systemd)
++  find_library(LIB_SYSTEMD NAMES elogind)
+   if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND")
+     message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD})
+     message(STATUS "[mpris] setting ENABLE_MPRIS=true")
+diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt
+index fdee62d2..7a941d08 100644
+--- a/src/plugins/mpris/CMakeLists.txt
++++ b/src/plugins/mpris/CMakeLists.txt
+@@ -6,4 +6,4 @@ find_package(PkgConfig)
+ pkg_check_modules (SYSTEMD REQUIRED libsystemd)
+ 
+ add_library(mpris SHARED ${mpris_SOURCES})
+-target_link_libraries(mpris systemd)
++target_link_libraries(mpris elogind)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index d8d4e73d6b4b..01afa616123a 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,40 +1,39 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.96.10
+version=0.97.0
 revision=1
 build_style=cmake
 make_cmd=make
-configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true
- -DENABLE_PIPEWIRE=true -DENABLE_BUNDLED_TAGLIB=false"
+configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=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 pipewire-devel"
+ sndio-devel pipewire-devel ncurses-libtinfo-devel libopenmpt-devel
+ $(vopt_if elogind elogind-devel)"
 short_desc="Terminal-based music player in c++"
-maintainer="eater <=@eater.me>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://musikcube.com/"
 distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=91fd984e68b6ef66f1be1ecdf0c84607453ec6ec80632ece688ac745c7719ea5
+checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5
+build_options="elogind"
+desc_option_elogind="Support MPRIS interface via elogind"
+build_options_default="elogind"
+
+export CMAKE_GENERATOR="Unix Makefiles"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'"
 fi
 
-export CMAKE_GENERATOR="Unix Makefiles"
-
-#XXX: Otherwise xbps-install ffmpeg-devel will complain about unresolving shlibs
-# SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
-makedepends+=" libglvnd"
-
 post_install() {
 	vlicense LICENSE.txt
 }
 
 musikcube-devel_package() {
-	depends="musikcube-${version}_${revision}"
+	depends="${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -42,7 +41,7 @@ musikcube-devel_package() {
 }
 
 musikcube-sndio_package() {
-	depends="musikcube>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - sndio output plugin"
 	pkg_install() {
 		vmove usr/lib/musikcube/plugins/libsndioout.so
@@ -50,9 +49,17 @@ musikcube-sndio_package() {
 }
 
 musikcube-pipewire_package() {
-	depends="musikcube>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - pipewire output plugin"
 	pkg_install() {
 		vmove usr/lib/musikcube/plugins/libpipewireout.so
 	}
 }
+
+musikcube-openmpt_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - openmpt decoder plugin"
+	pkg_install() {
+		vmove usr/lib/musikcube/plugins/libopenmptdecoder.so
+	}
+}

From b111a396d89bafab41d083e6629a6e943cb9dee4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Wed, 23 Mar 2022 11:54:41 +0100
Subject: [PATCH 1097/2561] btrbk: update depends from pv to mbuffer

---
 srcpkgs/btrbk/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template
index 5bc9c8d0ca3b..e4fa9196d218 100644
--- a/srcpkgs/btrbk/template
+++ b/srcpkgs/btrbk/template
@@ -1,11 +1,11 @@
 # Template file for 'btrbk'
 pkgname=btrbk
 version=0.31.3
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="BINDIR=/usr/bin"
 hostmakedepends="ruby-asciidoctor"
-depends="perl btrfs-progs openssh pv"
+depends="perl btrfs-progs mbuffer openssh"
 short_desc="Backup tool for btrfs subvolumes"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -14,7 +14,3 @@ changelog=https://github.com/digint/btrbk/blob/master/ChangeLog
 distfiles="http://digint.ch/download/btrbk/releases/${pkgname}-${version}.tar.xz"
 checksum=62f5494965dd594f81065e1ba17f9978d60343f72ee75ed18cda1a349cdda7d3
 conf_files="/etc/btrbk/*"
-
-post_install() {
-	rm -r $DESTDIR/usr/lib/systemd
-}

From 17e9533f67077627f0b829813231c8d8547780cf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Mar 2022 00:39:05 +0100
Subject: [PATCH 1098/2561] rspamd: remove gmime-devel build dependency

* not used since 1.5.0
---
 srcpkgs/rspamd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index e8df21abe54d..9d57ca1906c9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -7,8 +7,8 @@ build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
  -DDBDIR=/var/lib/rspamd"
 hostmakedepends="perl pkg-config ragel"
-makedepends="LuaJIT-devel fann-devel file-devel gd-devel gmime-devel
- hiredis-devel icu-devel libevent-devel sqlite-devel"
+makedepends="LuaJIT-devel fann-devel file-devel gd-devel
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
 short_desc="Fast, free and open-source spam filtering system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 5f91c65aec41cd0fc8bf6faec1a5cab0a09b6ec1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Mar 2022 00:40:02 +0100
Subject: [PATCH 1099/2561] grilo-plugins: remove useless build dependencies

* replace intltool with gettext
* remove gupnp-av-devel build dep, not used since 2014
* remove gmime-devel build dep, not used since 0.3.8
---
 srcpkgs/grilo-plugins/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 1cab3d09af26..65d0eb1640df 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,10 +3,10 @@ pkgname=grilo-plugins
 version=0.3.14
 revision=1
 build_style=meson
-hostmakedepends="pkg-config intltool itstool glib-devel gperf tracker3"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker3"
 # XXX missing plugins: fakemetadata.
-makedepends="grilo-devel gom-devel gupnp-av-devel json-glib-devel
- libquvi-devel rest-devel sqlite-devel libgcrypt-devel gmime-devel
+makedepends="grilo-devel gom-devel json-glib-devel
+ libquvi-devel rest-devel sqlite-devel libgcrypt-devel
  tracker3-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
  gstreamer1-devel libdmapsharing-devel lua53-devel gnome-online-accounts-devel
  avahi-glib-libs-devel"

From 84a5606a3bed33fc1da56f63a53020f85907064f Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 6 Apr 2022 11:55:29 -0700
Subject: [PATCH 1100/2561] python3-identify: update to 2.4.12

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/python3-identify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-identify/template b/srcpkgs/python3-identify/template
index 65fd70ec42c6..7d2c231b6727 100644
--- a/srcpkgs/python3-identify/template
+++ b/srcpkgs/python3-identify/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-identify'
 pkgname=python3-identify
-version=2.4.11
+version=2.4.12
 revision=1
 wrksrc="identify-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://github.com/chriskuehl/identify"
 distfiles="${PYPI_SITE}/i/identify/identify-${version}.tar.gz"
-checksum=2986942d3974c8f2e5019a190523b0b0e2a07cb8e89bf236727fb4b26f27f8fd
+checksum=3f3244a559290e7d3deb9e9adc7b33594c1bc85a9dd82e0f1be519bf12a1ec17
 
 post_install() {
 	vlicense LICENSE

From a494d40930259b56ced4049c2b6dcda8b4f41b1c Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 6 Apr 2022 11:56:29 -0700
Subject: [PATCH 1101/2561] pre-commit: fix update checks

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/pre-commit/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/pre-commit/update

diff --git a/srcpkgs/pre-commit/update b/srcpkgs/pre-commit/update
new file mode 100644
index 000000000000..c44d58c699eb
--- /dev/null
+++ b/srcpkgs/pre-commit/update
@@ -0,0 +1 @@
+pattern="pre_commit-\K[0-9.]+(?=.tar.gz)"

From 095b563c9931ae614c19836a9bfd6484883e6433 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 6 Apr 2022 11:56:57 -0700
Subject: [PATCH 1102/2561] pre-commit: update to 2.18.1

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/pre-commit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 3eecb71e1136..58e2730dde1f 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
 # Template file for 'pre-commit'
 pkgname=pre-commit
-version=2.17.0
+version=2.18.1
 revision=1
 wrksrc="pre_commit-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://pre-commit.com/"
 distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a
+checksum=5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10
 make_check=no   # No tests available
 
 post_install() {

From ee739fbd752b602e38267cb5548872c6c493f1be Mon Sep 17 00:00:00 2001
From: Anton Baranov <abaranov@linuxfoundation.org>
Date: Tue, 5 Apr 2022 12:37:54 -0400
Subject: [PATCH 1103/2561] New package: vcsh-2.0.4

Signed-off-by: Anton Baranov <abaranov@linuxfoundation.org>
---
 srcpkgs/vcsh/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/vcsh/template

diff --git a/srcpkgs/vcsh/template b/srcpkgs/vcsh/template
new file mode 100644
index 000000000000..59a8186aa754
--- /dev/null
+++ b/srcpkgs/vcsh/template
@@ -0,0 +1,14 @@
+# Template file for 'vcsh'
+pkgname=vcsh
+version=2.0.4
+revision=1
+build_style=gnu-configure
+hostmakedepends="git"
+depends="git"
+short_desc="Version Control System for home directory"
+maintainer="Anton Baranov <abaranov.anton@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/RichiH/vcsh"
+changelog="https://raw.githubusercontent.com/RichiH/vcsh/main/changelog"
+distfiles="${homepage}/releases/download/v${version}/vcsh-${version}.tar.xz"
+checksum=5bf425d89f474c340fbb47a5df8987573a9ef3928658b3e9876b07cae1333cf2

From 39758470d19566f5939f63b912ebd13a13605b4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 22:12:40 +0100
Subject: [PATCH 1104/2561] xbps-src: add strict mode

---
 common/environment/setup/vsed.sh |  7 ++++++-
 common/travis/build.sh           |  2 +-
 xbps-src                         | 11 ++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/common/environment/setup/vsed.sh b/common/environment/setup/vsed.sh
index 5b5bf427c239..c74c086a4ce8 100644
--- a/common/environment/setup/vsed.sh
+++ b/common/environment/setup/vsed.sh
@@ -57,8 +57,13 @@ vsed() {
 			newdigest="$($XBPS_DIGEST_CMD "$f")"
 			newdigest="${newdigest%% *}"
 
+			msgfunc=msg_warn
+			if [ -n "$XBPS_STRICT" ]; then
+				msgfunc=msg_error
+			fi
+
 			if [ "$olddigest" = "$newdigest" ]; then
-				msg_warn "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n"
+				$msgfunc "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n"
 			fi
 			olddigest="${newdigest}"
 		done
diff --git a/common/travis/build.sh b/common/travis/build.sh
index f5cf9cffc064..007a61f994d7 100755
--- a/common/travis/build.sh
+++ b/common/travis/build.sh
@@ -13,7 +13,7 @@ fi
 PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates))
 
 for pkg in ${PKGS}; do
-	/hostrepo/xbps-src -j$(nproc) -H "$HOME"/hostdir $arch $test pkg "$pkg"
+	/hostrepo/xbps-src -j$(nproc) -s -H "$HOME"/hostdir $arch $test pkg "$pkg"
 	[ $? -eq 1 ] && exit 1
 done
 
diff --git a/xbps-src b/xbps-src
index ff249015ed02..8488c5a3a49c 100755
--- a/xbps-src
+++ b/xbps-src
@@ -216,6 +216,9 @@ $(print_cross_targets)
     This alternative repository will also be used to resolve dependencies
     with highest priority order than others.
 
+-s
+    Make vsed warnings errors.
+
 -t  Create a temporary masterdir to not pollute the current one. Note that
     the existing masterdir must be fully populated with binary-bootstrap first.
     Once the target has finished, this temporary masterdir will be removed.
@@ -357,7 +360,7 @@ readonly XBPS_SRC_VERSION="113"
 export XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch)
 
 XBPS_OPTIONS=
-XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qQKr:tV"
+XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qsQKr:tV"
 
 # Preprocess arguments in order to allow options before and after XBPS_TARGET.
 eval set -- $(getopt "$XBPS_OPTSTRING" "$@");
@@ -389,6 +392,7 @@ while getopts "$XBPS_OPTSTRING" opt; do
         Q) XBPS_ARG_CHECK_PKGS=yes; XBPS_OPTIONS+=" -Q";;
         K) XBPS_ARG_CHECK_PKGS=full; XBPS_OPTIONS+=" -K";;
         r) XBPS_ARG_ALT_REPOSITORY="$OPTARG"; XBPS_OPTIONS+=" -r $OPTARG";;
+        s) XBPS_ARG_STRICT=yes; XBPS_OPTIONS+=" -s";;
         t) XBPS_ARG_TEMP_MASTERDIR=1; XBPS_OPTIONS+=" -t -C";;
         V) echo "xbps-src-$XBPS_SRC_VERSION $(xbps-uhelper -V)" && exit 0;;
         --) shift; break;;
@@ -471,6 +475,7 @@ fi
 [ -n "$XBPS_ARG_QUIET" ] && XBPS_QUIET=1
 [ -n "$XBPS_ARG_PRINT_VARIABLES" ] && XBPS_PRINT_VARIABLES="$XBPS_ARG_PRINT_VARIABLES"
 [ -n "$XBPS_ARG_ALT_REPOSITORY" ] && XBPS_ALT_REPOSITORY="$XBPS_ARG_ALT_REPOSITORY"
+[ -n "$XBPS_ARG_STRICT" ] && XBPS_STRICT="$XBPS_ARG_STRICT"
 [ -n "$XBPS_ARG_CROSS_BUILD" ] && XBPS_CROSS_BUILD="$XBPS_ARG_CROSS_BUILD"
 [ -n "$XBPS_ARG_CHECK_PKGS" ] && XBPS_CHECK_PKGS="$XBPS_ARG_CHECK_PKGS"
 [ -n "$XBPS_ARG_MAKEJOBS" ] && XBPS_MAKEJOBS="$XBPS_ARG_MAKEJOBS"
@@ -478,7 +483,7 @@ fi
 export XBPS_BUILD_ONLY_ONE_PKG XBPS_SKIP_REMOTEREPOS XBPS_BUILD_FORCEMODE \
        XBPS_INFORMATIVE_RUN XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \
        XBPS_USE_GIT_REVS XBPS_CHECK_PKGS XBPS_DEBUG_PKGS XBPS_SKIP_DEPS \
-       XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_CROSS_BUILD \
+       XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_CROSS_BUILD \
        XBPS_MAKEJOBS XBPS_PRINT_VARIABLES
 
 # The masterdir/hostdir variables are forced and readonly in chroot
@@ -626,7 +631,7 @@ readonly XBPS_CMPVER_CMD="xbps-uhelper cmpver"
 
 export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \
     XBPS_SRCPKGDIR XBPS_COMMONDIR XBPS_BUILDDIR \
-    XBPS_REPOSITORY XBPS_ALT_REPOSITORY XBPS_SRCDISTDIR XBPS_DIGEST_CMD \
+    XBPS_REPOSITORY XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_SRCDISTDIR XBPS_DIGEST_CMD \
     XBPS_UHELPER_CMD XBPS_INSTALL_CMD XBPS_QUERY_CMD XBPS_BUILD_ONLY_ONE_PKG \
     XBPS_RINDEX_CMD XBPS_RECONFIGURE_CMD XBPS_REMOVE_CMD XBPS_CHECKVERS_CMD \
     XBPS_CMPVER_CMD XBPS_FETCH_CMD XBPS_VERSION XBPS_BUILDSTYLEDIR \

From 0e71b46b8450599376838a3bebef7882b169b738 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 7 Mar 2022 10:48:07 +0200
Subject: [PATCH 1105/2561] CopyQ: update to 6.1.0.

---
 srcpkgs/CopyQ/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template
index c7fa15c9d05c..1c7e3e041f9e 100644
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=6.0.1
+version=6.1.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-tools-devel extra-cmake-modules pkg-config
@@ -14,4 +14,4 @@ license="GPL-3.0-or-later"
 homepage="https://hluk.github.io/CopyQ/"
 changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES.md"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=8d0b0fa840993fa100e888a5a1098e2769e3c234cd44236d75039e5c6e517645
+checksum=d235b31224264e7fa463020f1a934143aa287a4d9cb9bbb6883563ad66e84099

From 3d5bdfb97f61c7a945ac197ea05b6d7f5b75bfd6 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Thu, 17 Feb 2022 11:37:42 -0700
Subject: [PATCH 1106/2561] protonmail-bridge: update to 2.1.1.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/protonmail-bridge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index 05cb9f62a13a..056676f69b84 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,6 +1,6 @@
 # Template file for 'protonmail-bridge'
 pkgname=protonmail-bridge
-version=1.8.12
+version=2.1.1
 revision=1
 archs="x86_64"
 build_style=fetch
@@ -10,7 +10,7 @@ maintainer="Rich G <rich@richgannon.net>"
 license="GPL-3.0-or-later"
 homepage="https://protonmail.com/bridge"
 distfiles="https://protonmail.com/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=90eff7d27e4835e3a204019cafa7062467ec45688a1a6d407896976bdeb1f8ea
+checksum=9c6c1daa0dac1835e72c886064b0e9a38749f96bdf47719f08eaac787d43bca7
 
 restricted=yes
 noverifyrdeps=yes

From d1a41aec867bbd94bf878c2a89bc215b0df4e1ef Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 7 Apr 2022 21:20:06 +0200
Subject: [PATCH 1107/2561] New package: mokutil-0.5.0

---
 srcpkgs/mokutil/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/mokutil/template

diff --git a/srcpkgs/mokutil/template b/srcpkgs/mokutil/template
new file mode 100644
index 000000000000..06225c575530
--- /dev/null
+++ b/srcpkgs/mokutil/template
@@ -0,0 +1,17 @@
+# Template file for 'mokutil'
+pkgname=mokutil
+version=0.5.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="autoconf automake pkg-config"
+makedepends="keyutils-devel libefivar-devel openssl-devel"
+short_desc="Utility to manipulate machine owner keys"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/lcp/mokutil"
+distfiles="https://github.com/lcp/mokutil/archive/refs/tags/${version}.tar.gz"
+checksum=af7616855f817e7eb54043071e51c8651bc8cc479ac455fbfe35203d98de8181
+
+pre_configure() {
+	autoreconf -fi
+}

From 8467ad56a6a08a50a5dcb10574e445de33f64753 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 19:18:14 +0200
Subject: [PATCH 1108/2561] printrun: remove package

---
 srcpkgs/printrun/template         | 20 --------------------
 srcpkgs/printrun/update           |  1 -
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 srcpkgs/printrun/template
 delete mode 100644 srcpkgs/printrun/update

diff --git a/srcpkgs/printrun/template b/srcpkgs/printrun/template
deleted file mode 100644
index d18d21df3e69..000000000000
--- a/srcpkgs/printrun/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'printrun'
-pkgname=printrun
-version=1.6.0
-revision=4
-wrksrc="Printrun-printrun-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools python-pyserial"
-depends="python wxPython python-pyserial python-pyglet python-numpy"
-short_desc="3D printing host suite"
-maintainer="Jasper Chan <jasperchan515@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="http://www.pronterface.com"
-distfiles="https://github.com/kliment/Printrun/archive/printrun-${version}.tar.gz"
-checksum=fefcb4c5793fc77205a14263bc915616cde0523cd60704f356191b9ae34ba65d
-
-post_install() {
-	for file in ${DESTDIR}/usr/bin/*.py; do
-		mv -- "$file" "${file%%.py}"
-	done
-}
diff --git a/srcpkgs/printrun/update b/srcpkgs/printrun/update
deleted file mode 100644
index 091ee4faee75..000000000000
--- a/srcpkgs/printrun/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[12][0-9][0-9][0-9][01][0-9][0-3][0-9]"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 240f1282f54c..9940f101c83b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -266,6 +266,7 @@ replaces="
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3
  polkit-qt<=0.112.0_5
+ printrun<=1.6.0_4
  pritunl-client<=1.0.1865.25_2
  profile-sync-daemon<=5.75_4
  profont<=1.0_2

From fc58e184a49b226ae3dc634ca7507affba72c486 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 19:26:06 +0200
Subject: [PATCH 1109/2561] python-pyglet: remove package

---
 srcpkgs/python3-pyglet                        |  1 -
 .../template                                  | 22 ++++++-------------
 .../{python-pyglet => python3-pyglet}/update  |  0
 srcpkgs/removed-packages/template             |  1 +
 4 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/python3-pyglet
 rename srcpkgs/{python-pyglet => python3-pyglet}/template (54%)
 rename srcpkgs/{python-pyglet => python3-pyglet}/update (100%)

diff --git a/srcpkgs/python3-pyglet b/srcpkgs/python3-pyglet
deleted file mode 120000
index 0da9a8d712fa..000000000000
--- a/srcpkgs/python3-pyglet
+++ /dev/null
@@ -1 +0,0 @@
-python-pyglet
\ No newline at end of file
diff --git a/srcpkgs/python-pyglet/template b/srcpkgs/python3-pyglet/template
similarity index 54%
rename from srcpkgs/python-pyglet/template
rename to srcpkgs/python3-pyglet/template
index e5444022ba3e..cb8333021997 100644
--- a/srcpkgs/python-pyglet/template
+++ b/srcpkgs/python3-pyglet/template
@@ -1,27 +1,19 @@
-# Template file for 'python-pyglet'
-pkgname=python-pyglet
+# Template file for 'python3-pyglet'
+pkgname=python3-pyglet
 version=1.4.10
 revision=4
 wrksrc="pyglet-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools unzip"
-depends="python"
-short_desc="Cross-platform windowing and multimedia library for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools unzip"
+depends="python3"
+short_desc="Cross-platform windowing and multimedia library for Python3"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.pyglet.org"
 distfiles="${PYPI_SITE}/p/pyglet/pyglet-${version}.zip"
 checksum=c57e3e18246f45e4d6bb3d29e39d128d6e72b05f4212b10353adc3ba260ceb65
+make_check=no # pyglet requires an X server with GLX
 
 post_install() {
 	vlicense LICENSE
 }
-
-python3-pyglet_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python-pyglet/update b/srcpkgs/python3-pyglet/update
similarity index 100%
rename from srcpkgs/python-pyglet/update
rename to srcpkgs/python3-pyglet/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9940f101c83b..222727ba8e70 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,7 @@ replaces="
  python-pycryptodome<=3.9.7_3
  python-pydns<=2.3.6_4
  python-pyenet<=1.3.13.post7_2
+ python-pyglet<=1.4.10_4
  python-pyside<=1.2.2_7
  python-pystache<=0.5.4_6
  python-pytest-relaxed<=1.1.2_2

From 80722324054a1410cfc1869dc121f56a804a590f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:01:07 +0200
Subject: [PATCH 1110/2561] gradio: remove package

archived repository, doesn't build with vala 0.56

Closes: #32470
---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 222727ba8e70..e4808ef3d798 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -95,6 +95,7 @@ replaces="
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
  goproxy<=7.0_1
+ gradio<=7.2_1
  grv<=0.3.1_3
  gsettings-qt<=0.1+17.10.20170824_3
  gst1-python<=1.18.3_1

From d2ed0004ae8a665a926ae4332c29f0d53b4611e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 1 Apr 2022 01:03:42 +0200
Subject: [PATCH 1111/2561] vala-panel-appmenu: remove gtk2 subpackage

---
 common/shlibs                       |  1 -
 srcpkgs/appmenu-gtk-module          |  1 -
 srcpkgs/removed-packages/template   |  1 +
 srcpkgs/vala-panel-appmenu/template | 18 ++++--------------
 4 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/appmenu-gtk-module

diff --git a/common/shlibs b/common/shlibs
index 836cacc49b89..848b488bb2d0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3631,7 +3631,6 @@ libibverbs.so.1 rdma-core-22.1_1
 librdmacm.so.1 rdma-core-22.1_1
 libdvdcss.so.2 libdvdcss-1.4.2_1
 libvalapanel.so.0 vala-panel-0.4.87_1
-libappmenu-gtk2-parser.so.0 appmenu-gtk-module-0.7.1_1
 libappmenu-gtk3-parser.so.0 appmenu-gtk3-module-0.7.1_1
 libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
diff --git a/srcpkgs/appmenu-gtk-module b/srcpkgs/appmenu-gtk-module
deleted file mode 120000
index ae1083c7375d..000000000000
--- a/srcpkgs/appmenu-gtk-module
+++ /dev/null
@@ -1 +0,0 @@
-vala-panel-appmenu
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e4808ef3d798..57df15daae2b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -18,6 +18,7 @@ replaces="
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2
+ appmenu-gtk-module<=0.7.6_1
  arm-mem-git<=20131108_2
  arptables<=0.0.4_3
  atom<=1.44.0_1
diff --git a/srcpkgs/vala-panel-appmenu/template b/srcpkgs/vala-panel-appmenu/template
index 198254fdf474..b32b9c6d15c2 100644
--- a/srcpkgs/vala-panel-appmenu/template
+++ b/srcpkgs/vala-panel-appmenu/template
@@ -2,10 +2,10 @@
 pkgname=vala-panel-appmenu
 _glhash=18896e602f40b03fcb0a8437a2e197d4
 version=0.7.6
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config vala bamf glib-devel gettext"
-makedepends="vala-devel bamf-devel gtk+-devel gtk+3-devel
+makedepends="vala-devel bamf-devel gtk+3-devel
  libxkbcommon-devel libpeas-devel libdbusmenu-glib-devel
  xfce4-panel-devel xfconf-devel libmate-panel-devel libXt-devel
  vala-panel-devel"
@@ -19,26 +19,16 @@ checksum=2856added014bb6e5238aacda1016e2520d9a58d4ba6d7b33b2707ea48e1c592
 
 appmenu-gtk-module-devel_package() {
 	short_desc="GTK module for exposing menus - development files"
-	depends="appmenu-gtk-module-${version}_${revision}
-	 appmenu-gtk3-module-${version}_${revision}"
+	depends="appmenu-gtk3-module-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/libappmenu-gtk2*.so"
 		vmove "usr/lib/libappmenu-gtk3*.so"
 	}
 }
 
-appmenu-gtk-module_package() {
-	short_desc="GTK module for exposing menus"
-	pkg_install() {
-		vmove usr/lib/gtk-2.0
-		vmove "usr/lib/libappmenu-gtk2*.so.*"
-	}
-}
-
 appmenu-gtk3-module_package() {
-	short_desc="GTK3 module for exposing menus"
+	short_desc="GTK module for exposing menus"
 	pkg_install() {
 		vmove usr/lib/gtk-3.0
 		vmove "usr/lib/libappmenu-gtk3*.so.*"

From 3745d8620b2ec2c210197d34dad70d4561890c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 9 Feb 2022 18:08:48 +0100
Subject: [PATCH 1112/2561] gitui: update to 0.20.1.

---
 srcpkgs/gitui/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 929eca8cd19e..c2466612dd95 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,6 +1,6 @@
 # Template file for 'gitui'
 pkgname=gitui
-version=0.19.0
+version=0.20.1
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
@@ -11,7 +11,11 @@ license="MIT"
 homepage="https://github.com/extrawurst/gitui"
 changelog="https://github.com/extrawurst/gitui/blob/master/CHANGELOG.md"
 distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz"
-checksum=bcbffb592a5ae49658c79ac7b0daefe4bac3d2b988fdbaf0e868b8c308962f0d
+checksum=eccec120dfd4c5c33a74d331a53f3d0c6cb7200e26b0c4c7873278eb951bc379
+
+post_patch() {
+	cargo update --package autocfg --precise 1.1.0
+}
 
 post_install() {
 	vlicense LICENSE.md

From b7f2be86be6882f42ef72d9f2bd3181b07f1418f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:12:52 +0200
Subject: [PATCH 1113/2561] nemo: remove unused tracker build dependency

---
 srcpkgs/nemo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index 4f9acf52fab9..4144c409f778 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -7,7 +7,7 @@ build_helper=gir
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
 hostmakedepends="gettext-devel glib-devel intltool pkg-config"
 makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel tracker-devel xapps-devel libgsf-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel"
 depends="cinnamon-translations dconf gvfs"
 short_desc="Cinnamon file manager (nautilus fork)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7e3035dfe72e5020cb3c468f8b1aca776b7e52c5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 26 Dec 2021 18:21:26 +0100
Subject: [PATCH 1114/2561] New package: kalendar-0.4.0

---
 srcpkgs/kalendar/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/kalendar/template

diff --git a/srcpkgs/kalendar/template b/srcpkgs/kalendar/template
new file mode 100644
index 000000000000..0cdfbd27c3e4
--- /dev/null
+++ b/srcpkgs/kalendar/template
@@ -0,0 +1,19 @@
+# Template file for 'kalendar'
+pkgname=kalendar
+version=0.4.0
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
+ kcoreaddons kconfig"
+makedepends="qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel
+ qt5-svg-devel qt5-location-devel kirigami2-devel kdbusaddons-devel ki18n-devel
+ kcalendarcore-devel kconfigwidgets-devel kwindowsystem-devel kcoreaddons-devel
+ kcontacts-devel kitemmodels-devel kxmlgui-devel knotifications-devel
+ kiconthemes-devel kservice-devel akonadi5-devel akonadi-contacts-devel
+ calendarsupport-devel eventviews-devel"
+short_desc="Calendar application using Akonadi"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://invent.kde.org/pim/kalendar"
+distfiles="${KDE_SITE}/kalendar/kalendar-${version}.tar.xz"
+checksum=d64b19caab3e1365cce58ae27b76417b515cf3a07777ed1905f82cfbf0d1947a

From 96210e638add87a371e2baab1471507cd85e1250 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 01:07:40 +0200
Subject: [PATCH 1115/2561] gzip: update to 1.12.

---
 srcpkgs/gzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template
index d2cf4853c9ff..037dd3b27a4c 100644
--- a/srcpkgs/gzip/template
+++ b/srcpkgs/gzip/template
@@ -1,6 +1,6 @@
 # Template file for 'gzip'
 pkgname=gzip
-version=1.11
+version=1.12
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gzip/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907
+checksum=ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" DEFS=NO_ASM gl_cv_func_fflush_stdin=yes" ;;

From dfc8ae79f60a057a4b72ca0c6eab6946c7e4e06b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 8 Apr 2022 12:58:50 +0200
Subject: [PATCH 1116/2561] yt-dlp: update to 2022.04.08.

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 967cb7e75b0d..95c9db3e951c 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2022.03.08.1
+version=2022.04.08
 revision=1
 wrksrc="$pkgname"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=135fd7bbf81c2639419b191d8e5abb80cd8a9801b7ed8e92a331a4107e820ab2
+checksum=a9ea3753977dd82f051f0674fbdc3eb5ff49a67246f4bd3cac5745702828d1db
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 8860089295476baa345a15a791517acb1c956c1f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 8 Apr 2022 13:00:01 +0200
Subject: [PATCH 1117/2561] nemo: fix build

---
 srcpkgs/nemo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index 4144c409f778..75938f0d5c6c 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -7,7 +7,7 @@ build_helper=gir
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
 hostmakedepends="gettext-devel glib-devel intltool pkg-config"
 makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
 depends="cinnamon-translations dconf gvfs"
 short_desc="Cinnamon file manager (nautilus fork)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 625ad1fe0f34b262acbf42381f4ffeede79129ff Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 8 Apr 2022 14:20:31 +0200
Subject: [PATCH 1118/2561] whois: update to 5.5.13.

---
 srcpkgs/whois/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index 46bb8347a810..ecc647d81960 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,6 +1,6 @@
 # Template file for 'whois'
 pkgname=whois
-version=5.5.12
+version=5.5.13
 revision=1
 wrksrc=whois
 build_style=gnu-makefile
@@ -15,7 +15,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=f1c5bab781b7f2357dab1039e8875d41ff7b5d03a78c27443fa26351952a0822
+checksum=62e613f116d5635aea6684238db00b030a6602ffc79462e4a0a8e62cb184b5d7
 
 alternatives="
  whois:whois:/usr/bin/gwhois

From a8e7a8399844512d7775dbcca6f51e52735575aa Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 8 Apr 2022 17:03:17 +0200
Subject: [PATCH 1119/2561] nm-tray: update to 0.5.0.

---
 srcpkgs/nm-tray/patches/ftbfs.patch | 10 ----------
 srcpkgs/nm-tray/template            |  6 +++---
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/nm-tray/patches/ftbfs.patch

diff --git a/srcpkgs/nm-tray/patches/ftbfs.patch b/srcpkgs/nm-tray/patches/ftbfs.patch
deleted file mode 100644
index 1458bb63a9a0..000000000000
--- a/srcpkgs/nm-tray/patches/ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/nmmodel.cpp
-+++ b/src/nmmodel.cpp
-@@ -45,6 +45,7 @@ COPYRIGHT_HEADER*/
- #include <NetworkManagerQt/ConnectionSettings>
- #include <QDBusPendingCallWatcher>
- #include <QInputDialog>
-+#include <QMetaEnum>
- 
- namespace
- {
diff --git a/srcpkgs/nm-tray/template b/srcpkgs/nm-tray/template
index bda727cc43b9..03b6cd85e1be 100644
--- a/srcpkgs/nm-tray/template
+++ b/srcpkgs/nm-tray/template
@@ -1,7 +1,7 @@
 # Template file for 'nm-tray'
 pkgname=nm-tray
-version=0.4.3
-revision=2
+version=0.5.0
+revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-tools-devel networkmanager-qt5-devel"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/palinek/nm-tray"
 distfiles="https://github.com/palinek/nm-tray/archive/${version}.tar.gz"
-checksum=1611c053582189091efa74c2f26277afc872a57cfd4ec9e54463f68c25ad284b
+checksum=3db9fdfcf274392f040ee2e7370be41aaae5d700277979f661718e6d893c5ff5

From 9c7c71e6d60fb915559c8a9a208e9f1c086ac20c Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Mon, 10 Jan 2022 11:32:22 +0100
Subject: [PATCH 1120/2561] New package: PolyMC-1.1.1

---
 srcpkgs/PolyMC/files/README.voidlinux |  6 ++++++
 srcpkgs/PolyMC/template               | 30 +++++++++++++++++++++++++++
 srcpkgs/PolyMC/update                 |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/PolyMC/files/README.voidlinux
 create mode 100644 srcpkgs/PolyMC/template
 create mode 100644 srcpkgs/PolyMC/update

diff --git a/srcpkgs/PolyMC/files/README.voidlinux b/srcpkgs/PolyMC/files/README.voidlinux
new file mode 100644
index 000000000000..16ee7f91717b
--- /dev/null
+++ b/srcpkgs/PolyMC/files/README.voidlinux
@@ -0,0 +1,6 @@
+Void-specific instructions:
+============================
+
+You may not have the correct version of java installed for running specific
+versions of Minecraft. For Minecraft version 1.17 and up install openjdk17-jre
+and for older ones openjdk8-jre.
diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template
new file mode 100644
index 000000000000..3b3b0deb3466
--- /dev/null
+++ b/srcpkgs/PolyMC/template
@@ -0,0 +1,30 @@
+# Template file for 'PolyMC'
+pkgname=PolyMC
+version=1.1.1
+revision=1
+build_style=cmake
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_PORTABLE=0
+ -DLauncher_VERSION_BUILD=${revision}"
+hostmakedepends="openjdk8 qt5-host-tools qt5-qmake"
+makedepends="qt5-devel"
+depends="virtual?java-runtime qt5-imageformats xrandr"
+short_desc="Custom launcher for Minecraft"
+maintainer="Philipp David <pd@3b.pm>"
+license="GPL-3.0-only"
+homepage="https://polymc.org/"
+distfiles="https://github.com/PolyMC/PolyMC/releases/download/${version}/PolyMC-${version}.tar.gz"
+checksum=7ade9abc3a6f61ed27a129c10084c783cc9a3266484a53e29dabcc1cbb0ba5c4
+
+case "$XBPS_TARGET_MACHINE" in
+	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
+esac
+
+post_patch() {
+	vsed -i buildconfig/BuildConfig.cpp.in \
+		-e 's/"-" + QString/"_" + QString/'
+	rm -rf .git
+}
+
+post_install() {
+	vdoc ${FILESDIR}/README.voidlinux
+}
diff --git a/srcpkgs/PolyMC/update b/srcpkgs/PolyMC/update
new file mode 100644
index 000000000000..7517baa7a2f7
--- /dev/null
+++ b/srcpkgs/PolyMC/update
@@ -0,0 +1,2 @@
+site=https://github.com/PolyMC/PolyMC/tags
+pattern='tag/\K[\d]+\.[\d]+(\.[\d]+)?'

From 3cdf5c06c6b1c908bbfc9d72819641e77d27f798 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 9 Apr 2022 09:47:49 +0200
Subject: [PATCH 1121/2561] wine: update to 7.6.

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  | 8 ++++----
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 45cb7cbd5106..7546d45c7609 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index 4ed5e2642d9f..e0b6f8626637 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.5/configure
-+++ b/wine-7.5/configure
+--- a/wine-7.6/configure
++++ b/wine-7.6/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
---- a/wine-7.5/configure.ac
-+++ b/wine-7.5/configure.ac
+--- a/wine-7.6/configure.ac
++++ b/wine-7.6/configure.ac
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index a358997c3963..a95011e3cca0 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.5/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.5/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/wine-7.6/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/wine-7.6/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index e9598ba932a0..86d0acf0883b 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.5
+version=7.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="462c3185aedeec851067a5165d648f5499fb93c1b655f46b825f4bc11914e281
- 3b3a10654c90b210ab8dbf9d0aa2d2e3f4179a73e56e7c2101008e77903afead"
+checksum="eeab772f091328a3fb9db89aacab6be087c3d59c168ef2b41af5ec5010cf0328
+ bdd1a095b9c4cddce4663825e2ad331c5bf1ac8b2288b0b380a665d0ca987a23"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From fcf4dcb47a90cc481943e0a27e63a761fdfc79f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 10:56:14 +0200
Subject: [PATCH 1122/2561] peshming: update to 0.5.1.

---
 srcpkgs/peshming/template | 4 ++--
 srcpkgs/peshming/update   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/peshming/update

diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template
index 0b07235208a9..7db23fad88be 100644
--- a/srcpkgs/peshming/template
+++ b/srcpkgs/peshming/template
@@ -1,6 +1,6 @@
 # Template file for 'peshming'
 pkgname=peshming
-version=0.5.0
+version=0.5.1
 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=9b737124e38d4dc6ac91f0e8bc07aab4d5acbbb019c544feb1aa92d6ab0ea8c5
+checksum=b7b2999dbb75eb8915244cd7959a8f38f3e00f7f6e38f6c406a4d5e44aa372b4
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/peshming/update b/srcpkgs/peshming/update
new file mode 100644
index 000000000000..b0e921863949
--- /dev/null
+++ b/srcpkgs/peshming/update
@@ -0,0 +1,2 @@
+site=https://git.jcg.re/jcgruenhage/peshming/tags
+pattern='<a class="df ac" href="/jcgruenhage/peshming/src/tag/v\d.\d.\d" rel="nofollow">v\K\d.\d.\d(?=</a>)'

From dc897aafc453e5a338f9bfd54dd6391e5eb0d650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 12:22:33 +0200
Subject: [PATCH 1123/2561] topgrade: update to 8.3.0.

---
 srcpkgs/topgrade/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 461b88685248..f560ee845734 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=8.2.0
+version=8.3.0
 revision=1
 build_style=cargo
 short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else"
@@ -8,7 +8,7 @@ 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=54fe60ef70b21b34c50c0d342ec120aff3a9522ef44a9737f42d5700aed7a1c3
+checksum=a818cbdc64aafe77a589299d5717988fd5e5403af0998a9945b9d17a5b6f499b
 
 post_install() {
 	vman topgrade.8

From 4516c43a17b3b3576e4f9a135a9c51a27b33e3b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 12:29:59 +0200
Subject: [PATCH 1124/2561] cargo-about: update to 0.5.1.

---
 srcpkgs/cargo-about/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-about/template b/srcpkgs/cargo-about/template
index 048f21085fa3..2bfdb47d5c60 100644
--- a/srcpkgs/cargo-about/template
+++ b/srcpkgs/cargo-about/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-about'
 pkgname=cargo-about
-version=0.4.7
+version=0.5.1
 revision=1
 # depends on rustls/ring
 archs="x86_64* aarch64* i686* arm*"
@@ -11,7 +11,7 @@ license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-about"
 changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-about/main/CHANGELOG.md"
 distfiles="https://github.com/EmbarkStudios/cargo-about/archive/${version}.tar.gz"
-checksum=186e44af7edde48e682b2670ef52ef21687629900f5220bbd3742cb2d665bb49
+checksum=11808327e3702643b7d3f1756e6b28a49c1a963295a480818b3520d6c331b339
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	broken="broken on architectures without atomic8"

From 3d97db0169a9a08e2f88cc5631bd859ee247df76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 12:53:10 +0200
Subject: [PATCH 1125/2561] cargo-geiger: update to 0.11.2.

---
 srcpkgs/cargo-geiger/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index ffe49404187e..d88a94ef7cdd 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
-version=0.11.1
+version=0.11.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
@@ -12,10 +12,14 @@ 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=d3c88fc3bdb574108504a1a49ae7b8ee5b55b1744a47d58214d0f088d2b2ef00
+checksum=425638232f4c617a1dde1071f865c5140546bf9b6b61b9a9a186d0a5c146ac03
 
 post_install() {
 	vlicense LICENSE-MIT
 	vlicense LICENSE-APACHE
 	vdoc README.md
 }
+
+post_patch() {
+	cargo update -p autocfg:1.0.1 --precise 1.1.0
+}

From a207cc897556ab236d211216581356fa04628957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:27:32 +0200
Subject: [PATCH 1126/2561] ruplacer: update to 0.6.4.

---
 srcpkgs/ruplacer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruplacer/template b/srcpkgs/ruplacer/template
index 2a48b9af8196..226155a2452a 100644
--- a/srcpkgs/ruplacer/template
+++ b/srcpkgs/ruplacer/template
@@ -1,6 +1,6 @@
 # Template file for 'ruplacer'
 pkgname=ruplacer
-version=0.6.2
+version=0.6.4
 revision=1
 build_style=cargo
 short_desc="Find and replace text in source files"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="BSD-3-Clause"
 homepage="https://github.com/dmerejkowsky/ruplacer"
 distfiles="https://github.com/dmerejkowsky/ruplacer/archive/refs/tags/v${version}.tar.gz"
-checksum=54533bb5ee33a5580f6d1160e92f4adf436350937dd2705de14ed9af185ee875
+checksum=4f66e8970942e55dc287c585eef7a21394aefa49df746cef429f9e5bc6714c7a
 
 post_install() {
 	vlicense LICENSE

From 2031652713988d4b5d32123ba0d00383896c2c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:39:06 +0200
Subject: [PATCH 1127/2561] i3status-rust: update to 0.21.9.

---
 srcpkgs/i3status-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 6973e02571b4..9c358e111e57 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.21.8
+version=0.21.9
 revision=1
 build_style=cargo
 make_check_args="--bins"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=259fdcb3ce067c6f9089fc0d7e60b856d838fff3dfb7e7e4dc5c96742c1a1be1
+checksum=579d3479c3cbbc6c95e277a708cda6f72d906e269dda83409bb23c7cecb10d0e
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From 14fc3594a143fe1cf031fb72da3b38d99354d554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:46:19 +0200
Subject: [PATCH 1128/2561] onefetch: update to 2.12.0.

---
 srcpkgs/onefetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index 88f21bc3b351..1eda291b053f 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -1,6 +1,6 @@
 # Template file for 'onefetch'
 pkgname=onefetch
-version=2.11.0
+version=2.12.0
 revision=1
 build_style=cargo
 short_desc="Git repository summary on your terminal"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/o2sh/onefetch"
 distfiles="https://github.com/o2sh/onefetch/archive/v${version}.tar.gz"
-checksum=ffd3cc3bd24e299ede1fada2b2da8bf066d59219da167477e1997c860650c192
+checksum=f57b16dfa2bb95dd1fb805257a1761baa20d69eb9ce7c311d369609894c53897
 
 post_install() {
 	vlicense LICENSE.md

From 8072498f4da4e48b1958add3986a90c025f63058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:51:45 +0200
Subject: [PATCH 1129/2561] dua-cli: update to 2.17.1.

---
 srcpkgs/dua-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template
index 6db14e89464e..ea5c1c27dad2 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'dua-cli'
 pkgname=dua-cli
-version=2.17.0
+version=2.17.1
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/Byron/dua-cli"
 changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=f10bd2c7b69c7bed1f94554d92732d54c803677a6957d986701164989a8227b1
+checksum=d9af81b30f83d080472e91da3e07b42294904827ad5274d9aaf51d346072d2f1
 
 post_install() {
 	vlicense LICENSE

From 44d6a992f2159104cdfddc711a2f10141ad65456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:56:21 +0200
Subject: [PATCH 1130/2561] eva: update to 0.3.0.

---
 srcpkgs/eva/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eva/template b/srcpkgs/eva/template
index 08157fddc9bf..d364c98f9516 100644
--- a/srcpkgs/eva/template
+++ b/srcpkgs/eva/template
@@ -1,6 +1,6 @@
 # Template file for 'eva'
 pkgname=eva
-version=0.2.7
+version=0.3.0
 revision=1
 build_style=cargo
 short_desc="Simple calculator REPL, similar to bc(1)"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/NerdyPepper/eva"
 distfiles="https://github.com/NerdyPepper/eva/archive/v${version}.tar.gz"
-checksum=72b2e47e987102d67c9dcbb60e26c4ff0b20e6f844d0d2b9d91c3f073374aee0
+checksum=05e2cdcfd91e6abef91cb01ad3074583b8289f6e74054e070bfbf6a4e684865e
 
 post_install() {
 	vlicense LICENSE

From 562c1e0e054adc0b554faa149b4919db8ee7798b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 8 Apr 2022 13:51:25 +0200
Subject: [PATCH 1131/2561] exiftool: update to 12.41.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 5a0a83e5e79a..6cf6714bf0a7 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.40
+version=12.41
 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=7ae3f6e1183926aff8a0440eb8071bb5b2a335fc1522597f109780ab16617f5f
+checksum=654f401daab0045a8364fa59d3f69b6f9bf23bcef157a3c928e373884a6f9370

From f992099129bfb9b8ae4c77cdbd69d43336c778c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 8 Apr 2022 13:35:48 +0200
Subject: [PATCH 1132/2561] croc: update to 9.5.3.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 7e851d9af755..4ff52c773d40 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.5.2
+version=9.5.3
 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=9fcbb82fa78122b0a2279fe9b4c4c7ff6af7b0599f275c04481ad5ed162d2952
+checksum=7f8ac260c786bc3f1e3c577e6ac3d3e27d0d8cffa90d7a8d21cec85fe6f22abc
 
 post_install() {
 	vlicense LICENSE

From a7894835da5f1da979b37803150e7e47f703d5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 11:03:02 +0200
Subject: [PATCH 1133/2561] ansible-core: update to 2.12.4.

---
 srcpkgs/ansible-core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index 80236532b369..600682ca6939 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
-version=2.12.3
+version=2.12.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ 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-core/ansible-core-${version}.tar.gz"
-checksum=8a135a9f74c97cab67759293744ad34350f719523e8bd9bb9008df4cf953af20
+checksum=827af75985a6f04b980bd371027bf038cb187640628557298acb9983a8f2c2da
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
 # Tests are currently broken for ansible on python 3.10

From 30756f7f74eb7d5157058bf04d7a20eeefcf3753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 11:03:06 +0200
Subject: [PATCH 1134/2561] ansible: update to 5.6.0.

---
 srcpkgs/ansible/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 063e24d1684a..50439199bcdf 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=5.5.0
+version=5.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ 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=b8a76d737889c9bfd0e6b0f2276dcf8d836da667067a355776f3504d7a66d518
+checksum=acd30731434154da376ceeeb416ee1541cdfb8ea3c648023a55a34cb3ecaf9f3
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660

From e57bfd5f0ee0347dc5bd7f0a3acc9177ed56e06f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 3 Apr 2022 18:48:38 +0200
Subject: [PATCH 1135/2561] dust: update to 0.8.0.

---
 srcpkgs/dust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dust/template b/srcpkgs/dust/template
index 02468de2d8d6..b6f611ecc655 100644
--- a/srcpkgs/dust/template
+++ b/srcpkgs/dust/template
@@ -1,6 +1,6 @@
 # Template file for 'dust'
 pkgname=dust
-version=0.7.5
+version=0.8.0
 revision=1
 build_style=cargo
 short_desc="More intuitive version of du"
@@ -8,7 +8,7 @@ maintainer="Neel <neel@chot.ai>"
 license="Apache-2.0"
 homepage="https://github.com/bootandy/dust"
 distfiles="https://github.com/bootandy/dust/archive/v${version}.tar.gz"
-checksum=f892aaf7a0a7852e12d01b2ced6c2484fb6dc5fe7562abdf0c44a2d08aa52618
+checksum=dc033a6fb4f31520ab1bb403dd910aed04037964ab1406363cce2185a8bd3d3b
 
 post_install() {
 	vdoc README.md

From dcc911a110745f486191542b81c5624bc4d2d5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 11:38:45 +0200
Subject: [PATCH 1136/2561] python3-ansible-compat: update to 2.0.2.

---
 srcpkgs/python3-ansible-compat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
index bf03fe221d0a..919455b7e64b 100644
--- a/srcpkgs/python3-ansible-compat/template
+++ b/srcpkgs/python3-ansible-compat/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ansible-compat'
 pkgname=python3-ansible-compat
-version=2.0.0
+version=2.0.2
 revision=1
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
@@ -12,11 +12,11 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/ansible-community/ansible-compat"
 distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=4027da4ec2b524c263a801cc2dc6da2b98c2996cec258cef118a30c790467ed2
+checksum=c651995dc323ef145bab857fee6540febc881fb71b7feafe8163d49e273163a5
 
 post_patch() {
 	# scm versioning is broken in this release
-	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+	vsed -e "/name =/a version = ${version}" -i setup.cfg
 }
 
 post_install() {

From 732268f4f723e83349627c136768faebb937abed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 9 Apr 2022 11:24:41 +0200
Subject: [PATCH 1137/2561] gip: update to 0.7.1.

---
 srcpkgs/gip/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 83ebc476bc84..239695acc77a 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,7 +1,7 @@
 # Template file for 'gip'
 pkgname=gip
-version=0.7.0
-revision=2
+version=0.7.1
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/dalance/gip"
 distfiles="https://github.com/dalance/gip/archive/v${version}.tar.gz"
-checksum=69a23f438279a570293fab165f94a7e251a49b9b8de96703a0ab2542facffcb9
+checksum=b0cc949cbd25d6dc1e61d08092a78f95f65fb600601d03a407878774385a4060
 
 post_install() {
 	vlicense LICENSE-MIT

From 68168235ac5696fcd8026d1ad69580ec1948b2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 14:26:19 +0200
Subject: [PATCH 1138/2561] git-cliff: update to 0.6.1.

---
 srcpkgs/git-cliff/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 0d14d547541e..4d87260c9d27 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,8 +1,9 @@
 # Template file for 'git-cliff'
 pkgname=git-cliff
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=cargo
+build_helper=qemu
 make_install_args="--path git-cliff"
 make_check_args="-- --skip repo::test::git_log" # This test fails without a git repo
 short_desc="Changelog generator based on conventional commits"
@@ -11,8 +12,14 @@ license="GPL-3.0-only"
 homepage="https://github.com/orhun/git-cliff"
 changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
 distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
-checksum=451db5e7ce904f33cf5772cd67400015829e5b7b3d18955bc3e8f88977b63793
+checksum=045fb10ad0ee340172397f2bb6521c7ee0a83dca2c9f9d177300601f6c60184f
 
 post_install() {
 	vdoc README.md
+
+	OUT_DIR=${PWD} vtargetrun ${DESTDIR}/usr/bin/git-cliff-completions
+
+	vcompletion "_git-cliff" zsh
+	vcompletion "git-cliff.fish" fish
+	vcompletion "git-cliff.bash" bash
 }

From 6568b616afe10ab44263ce1386d86d06ba514b45 Mon Sep 17 00:00:00 2001
From: toluschr <toluschr@protonmail.com>
Date: Mon, 25 May 2020 19:49:29 +0200
Subject: [PATCH 1139/2561] New package: gamemode-1.6.1

---
 common/shlibs                               |  2 ++
 srcpkgs/gamemode/patches/001-fix-musl.patch | 10 ++++++
 srcpkgs/gamemode/template                   | 39 +++++++++++++++++++++
 srcpkgs/libgamemode                         |  1 +
 srcpkgs/libgamemode-devel                   |  1 +
 5 files changed, 53 insertions(+)
 create mode 100644 srcpkgs/gamemode/patches/001-fix-musl.patch
 create mode 100644 srcpkgs/gamemode/template
 create mode 120000 srcpkgs/libgamemode
 create mode 120000 srcpkgs/libgamemode-devel

diff --git a/common/shlibs b/common/shlibs
index 848b488bb2d0..673c62085f5b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3597,6 +3597,8 @@ libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
 libvkd3d-utils.so.1 vkd3d-1.1_1
 libvkd3d-shader.so.1 vkd3d-1.3_1
 libvkd3d.so.1 vkd3d-1.1_1
+libgamemode.so.0 libgamemode-1.6.1_1
+libgamemodeauto.so.0 libgamemode-1.6.1_1
 libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
diff --git a/srcpkgs/gamemode/patches/001-fix-musl.patch b/srcpkgs/gamemode/patches/001-fix-musl.patch
new file mode 100644
index 000000000000..c54c0bad41fe
--- /dev/null
+++ b/srcpkgs/gamemode/patches/001-fix-musl.patch
@@ -0,0 +1,10 @@
+--- a/daemon/gamemode-context.c
++++ b/daemon/gamemode-context.c
+@@ -50,6 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
+ #include <sys/time.h>
+ #include <systemd/sd-daemon.h> /* TODO: Move usage to gamemode-dbus.c */
+ #include <unistd.h>
++#include <signal.h>
+ 
+ /**
+  * The GameModeClient encapsulates the remote connection, providing a list
diff --git a/srcpkgs/gamemode/template b/srcpkgs/gamemode/template
new file mode 100644
index 000000000000..0bf9bea530ec
--- /dev/null
+++ b/srcpkgs/gamemode/template
@@ -0,0 +1,39 @@
+# Template file for 'gamemode'
+pkgname=gamemode
+version=1.6.1
+revision=1
+build_style=meson
+configure_args="-Dwith-sd-bus-provider=elogind"
+hostmakedepends="pkg-config"
+makedepends="inih-devel dbus-devel elogind-devel"
+depends="lib${pkgname}>=${version}_${revision}"
+short_desc="Optimise Linux system performance on demand"
+maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/FeralInteractive/gamemode"
+distfiles="https://github.com/FeralInteractive/gamemode/archive/${version}.tar.gz"
+checksum=4377b88b5147ebf8d3f9a7a1f94c6d00f1e9624cd171d5af942ce9766be3747f
+
+post_install() {
+	vsconf example/gamemode.ini
+	vlicense LICENSE.txt
+	vdoc README.md
+}
+
+libgamemode_package() {
+	short_desc+=" - shared libraries"
+	pkg_install() {
+		# For compatibility reasons, all shlibs should go in libgamemode
+		vmove "usr/lib/*.so*"
+	}
+}
+
+libgamemode-devel_package() {
+	short_desc+=" - development files"
+	depends="lib${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/libgamemode b/srcpkgs/libgamemode
new file mode 120000
index 000000000000..d1810c733eb8
--- /dev/null
+++ b/srcpkgs/libgamemode
@@ -0,0 +1 @@
+gamemode
\ No newline at end of file
diff --git a/srcpkgs/libgamemode-devel b/srcpkgs/libgamemode-devel
new file mode 120000
index 000000000000..d1810c733eb8
--- /dev/null
+++ b/srcpkgs/libgamemode-devel
@@ -0,0 +1 @@
+gamemode
\ No newline at end of file

From 783aac96242da0c4811a1208ed2e4126a5a499c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 22 Mar 2022 09:14:19 +0100
Subject: [PATCH 1140/2561] doctl: update to 1.73.0.

---
 srcpkgs/doctl/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 0580a504f27e..e42f75c749fd 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,13 +1,17 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.71.0
+version=1.73.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
-go_build_tags="v${version}"
+_maj_min=${version%*.*}
+_major=${_maj_min%.*}
+_minor=${_maj_min#*.}
+_patch=${version#*.*.*}
+go_ldflags="-X github.com/digitalocean/doctl.Major=$_major -X github.com/digitalocean/doctl.Minor=$_minor -X github.com/digitalocean/doctl.Patch=$_patch -X github.com/digitalocean/doctl.Label=voidlinux"
 short_desc="Command line tool for DigitalOcean services"
 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=62a14c05bd4b8442f0a610f9eba7237fe67e1afc397750893cdf2b741aebfd54
+checksum=cc7a6f91febf4d40f8afca0fe4ddfa7aa9be3572e3a0124fca2865e35b52ef00

From 6b1f3dcfba264c64655248d670d80c52d692eee4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 9 Apr 2022 12:37:47 +0200
Subject: [PATCH 1141/2561] libxmlb: update to 0.3.8.

---
 srcpkgs/libxmlb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libxmlb/template b/srcpkgs/libxmlb/template
index 6d8a900ae0aa..78b2d76bfdee 100644
--- a/srcpkgs/libxmlb/template
+++ b/srcpkgs/libxmlb/template
@@ -1,6 +1,6 @@
 # Template file for 'libxmlb'
 pkgname=libxmlb
-version=0.2.1
+version=0.3.8
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libxmlb"
 distfiles="https://github.com/hughsie/libxmlb/archive/${version}.tar.gz"
-checksum=2bf0cae179f1a9b6a63d294c06d324ea97266fc34656589b2865535ab2322529
+checksum=83b94d04b4bdff4f94abc9f078d1372422276cf47590cfd1935948d48021deda
 
 build_options="gir"
 build_options_default="gir"
@@ -23,13 +23,13 @@ post_install() {
 }
 
 libxmlb-devel_package() {
-	depends="libxmlb>=${version}_${revision} ${makedepends}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		if [ "$build_options_gir" ]; then
+		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
 	}

From b57bdb2c820a044063fa11d0f04bb560737252a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 9 Apr 2022 12:34:53 +0200
Subject: [PATCH 1142/2561] AppStream: update to 0.15.2.

---
 srcpkgs/AppStream/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index 9cba83f64c24..b2d920729249 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,6 +1,6 @@
 # Template file for 'AppStream'
 pkgname=AppStream
-version=0.14.6
+version=0.15.2
 revision=1
 wrksrc="appstream-${version}"
 build_style=meson
@@ -8,16 +8,16 @@ build_helper="gir qemu"
 configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi)
  -Dstemming=false -Dapidocs=false -Dqt=true"
 hostmakedepends="docbook-xsl gettext glib-devel gperf libxslt pkg-config
- qt5-host-tools $(vopt_if vala vala)"
-makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel lmdb-devel
+ qt5-host-tools $(vopt_if vala vala) itstool"
+makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel libxmlb-devel
  libsoup-devel libcurl-devel"
 short_desc="Tools and libraries to work with AppStream metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
 distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=fd71649aeefe1cb561f1921193b253033d21566bdcce849c93e37fdb21113560
+checksum=70c95545ac2cde87c9ba4a292648ed64ed1211fb24d792b5b9e84f870a83fe9d
 conf_files="/etc/appstream.conf"
 triggers="appstream-cache"
 

From b55efbf7a75c8a4ba8adee7cec8f59b8b7c48040 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 22:57:19 +0200
Subject: [PATCH 1143/2561] gnome: remove gnome-documents from gnome-apps

---
 srcpkgs/gnome/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 0984bf8205a6..0b2910094713 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
 version=41.0
-revision=1
+revision=2
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -58,7 +58,6 @@ _apps_depends="
  gnome-clocks>=40.0
  gnome-dictionary>=40.0
  gnome-disk-utility>=${version}
- gnome-documents>=3.34.0
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
  gnome-music>=${version}

From 775dad9d892aff3a8cfb705b9e16f3452902bfd5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:11 +0100
Subject: [PATCH 1144/2561] gnome-games: remove package

* archived project, uses tracker2
---
 srcpkgs/gnome-games/patches/meson-0.61.patch | 20 --------------------
 srcpkgs/gnome-games/template                 | 15 ---------------
 srcpkgs/removed-packages/template            |  1 +
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-games/template

diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch
deleted file mode 100644
index 0a3b006b227b..000000000000
--- a/srcpkgs/gnome-games/patches/meson-0.61.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -44,7 +44,7 @@ mime_types = [
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
- desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
--desktop_file = i18n.merge_file ('desktop-file',
-+desktop_file = i18n.merge_file (
-   type: 'desktop',
-   input: configure_file(
-     input: files('org.gnome.Games.desktop.in.in'),
-@@ -70,7 +70,7 @@ endif
- 
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
-   input: configure_file(
-     input: files('org.gnome.Games.appdata.xml.in.in'),
-     output: 'org.gnome.Games.appdata.xml.in',
diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template
deleted file mode 100644
index 61df4a3bc7f1..000000000000
--- a/srcpkgs/gnome-games/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gnome-games'
-pkgname=gnome-games
-version=40.0
-revision=1
-build_style=meson
-hostmakedepends="gettext glib-devel pkg-config vala-devel"
-makedepends="libarchive-devel grilo-devel gtk+3-devel libglib-devel
- libmanette-devel librsvg-devel libsoup-devel libxml2-devel retro-gtk-devel
- sqlite-devel tracker-devel libhandy1-devel"
-short_desc="Browse and play your games"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Games"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=32cd413f89292a74b0a84a5a30d0f4878ce42caea36374b1fb4dce3b4f6adf0f
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 57df15daae2b..6511980ca218 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2
  gnome-twitch<=0.4.2_1

From 58e49f35421cfb0838db5de1381ed7c33756c683 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:35 +0100
Subject: [PATCH 1145/2561] gnome-documents: remove package

* archived project, uses tracker2
---
 .../gnome-documents/patches/meson-0.61.patch  | 18 ---------------
 srcpkgs/gnome-documents/template              | 23 -------------------
 srcpkgs/removed-packages/template             |  1 +
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-documents/template

diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch
deleted file mode 100644
index 131d34509406..000000000000
--- a/srcpkgs/gnome-documents/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -56,7 +56,6 @@ foreach app: documents_apps
-   appdata = app + '.appdata.xml'
- 
-   appdata_file = i18n.merge_file(
--    appdata,
-     input: appdata + '.in',
-     output: appdata,
-     po_dir: po_dir,
-@@ -76,7 +75,6 @@ foreach app: documents_apps
-   desktop = app + '.desktop'
- 
-   desktop_file = i18n.merge_file(
--    desktop,
-     type: 'desktop',
-     input: desktop + '.in',
-     output: desktop,
diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template
deleted file mode 100644
index 7e45b825e712..000000000000
--- a/srcpkgs/gnome-documents/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-documents'
-pkgname=gnome-documents
-version=3.34.0
-revision=2
-build_helper="gir"
-build_style=meson
-hostmakedepends="docbook-xsl gettext itstool pkg-config glib-devel libxslt gdk-pixbuf
- librsvg"
-makedepends="clutter-gtk-devel evince-devel gjs-devel gnome-desktop-devel
- libgdata-devel libgepub-devel librsvg-devel libzapojit-devel tracker-devel
- vala-devel webkit2gtk-devel"
-depends="desktop-file-utils hicolor-icon-theme libgepub tracker tracker-miners
- gjs gnome-online-miners evince"
-short_desc="Documents Manager for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Documents"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d8a90e84aef3a78fcaa91dc12a24a473a5778a47eb4c2354d0e35d558f29f0e2
-lib32disabled=yes
-
-build_options="gir"
-build_options_default="gir"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6511980ca218..f1dcebc2b8cc 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-documents<=3.34.0_2
  gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2

From 736346765b4b429fdca20252b7d7b292c751493c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:29:56 +0200
Subject: [PATCH 1146/2561] gnome-online-miners: import a patch for tracker3

---
 .../patches/tracker3.patch                    | 1554 +++++++++++++++++
 srcpkgs/gnome-online-miners/template          |   11 +-
 2 files changed, 1562 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/gnome-online-miners/patches/tracker3.patch

diff --git a/srcpkgs/gnome-online-miners/patches/tracker3.patch b/srcpkgs/gnome-online-miners/patches/tracker3.patch
new file mode 100644
index 000000000000..c948f65c7953
--- /dev/null
+++ b/srcpkgs/gnome-online-miners/patches/tracker3.patch
@@ -0,0 +1,1554 @@
+From 53869ebc2783c9d08bb32d59c543ab692770c121 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:11:24 +0200
+Subject: [PATCH 1/5] Use GInitable interface for GomMiner class
+
+This allows for better error reporting.
+---
+ src/gom-application.c |  7 +++++-
+ src/gom-miner.c       | 58 +++++++++++++++++++++++++++++--------------
+ 2 files changed, 45 insertions(+), 20 deletions(-)
+
+diff --git a/src/gom-application.c b/src/gom-application.c
+index fadd388..bfa99ec 100644
+--- a/src/gom-application.c
++++ b/src/gom-application.c
+@@ -229,10 +229,15 @@ gom_application_constructed (GObject *object)
+ {
+   GomApplication *self = GOM_APPLICATION (object);
+   const gchar *display_name;
++  GError *error = NULL;
+ 
+   G_OBJECT_CLASS (gom_application_parent_class)->constructed (object);
+ 
+-  self->miner = g_object_new (self->miner_type, NULL);
++  self->miner = g_initable_new (self->miner_type, NULL, &error, NULL);
++
++  if (self->miner == NULL)
++    g_error ("%s", error->message);
++
+   display_name = gom_miner_get_display_name (self->miner);
+   gom_dbus_set_display_name (self->skeleton, display_name);
+ }
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 7147b33..1dd9bb8 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -28,7 +28,11 @@
+ 
+ #include "gom-miner.h"
+ 
+-G_DEFINE_TYPE (GomMiner, gom_miner, G_TYPE_OBJECT)
++static void gom_miner_initable_interface_init (GInitableIface *iface);
++
++G_DEFINE_TYPE_WITH_CODE (GomMiner, gom_miner, G_TYPE_OBJECT,
++                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gom_miner_initable_interface_init))
++
+ 
+ struct _GomMinerPrivate {
+   GoaClient *client;
+@@ -132,20 +136,21 @@ gom_miner_dispose (GObject *object)
+ }
+ 
+ static void
+-gom_miner_init_goa (GomMiner *self)
++gom_miner_init_goa (GomMiner  *self,
++                    GError   **error)
+ {
+   GoaAccount *account;
+   GoaObject *object;
+   const gchar *provider_type;
+   GList *accounts, *l;
+   GomMinerClass *miner_class = GOM_MINER_GET_CLASS (self);
++  GError *inner_error = NULL;
+ 
+-  self->priv->client = goa_client_new_sync (NULL, &self->priv->client_error);
++  self->priv->client = goa_client_new_sync (NULL, &inner_error);
+ 
+-  if (self->priv->client_error != NULL)
++  if (inner_error)
+     {
+-      g_critical ("Unable to create GoaClient: %s - indexing for %s will not work",
+-                  self->priv->client_error->message, miner_class->goa_provider_type);
++      g_propagate_error (error, inner_error);
+       return;
+     }
+ 
+@@ -170,16 +175,34 @@ gom_miner_init_goa (GomMiner *self)
+   g_list_free_full (accounts, g_object_unref);
+ }
+ 
+-static void
+-gom_miner_constructed (GObject *obj)
++static gboolean
++gom_miner_initable_init (GInitable     *initable,
++                         GCancellable  *cancellable,
++                         GError       **error)
+ {
+-  GomMiner *self = GOM_MINER (obj);
++  GError *inner_error = NULL;
++  GomMiner *self;
+ 
+-  G_OBJECT_CLASS (gom_miner_parent_class)->constructed (obj);
++  self = GOM_MINER (initable);
+ 
+-  gom_miner_init_goa (self);
++  self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error);
++  if (inner_error)
++    {
++      g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: ");
++      return FALSE;
++    }
++
++  gom_miner_init_goa (self, &inner_error);
++  if (inner_error)
++    {
++      g_propagate_prefixed_error (error, inner_error, "Unable to connect to GNOME Online Accounts: ");
++      return FALSE;
++    }
++
++  return TRUE;
+ }
+ 
++
+ static void
+ gom_miner_init (GomMiner *self)
+ {
+@@ -187,14 +210,12 @@ gom_miner_init (GomMiner *self)
+ 
+   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GOM_TYPE_MINER, GomMinerPrivate);
+   self->priv->display_name = g_strdup ("");
++}
+ 
+-  self->priv->connection = tracker_sparql_connection_get (NULL, &self->priv->connection_error);
+-  if (self->priv->connection_error != NULL)
+-    {
+-      g_critical ("Unable to create TrackerSparqlConnection: %s - indexing for %s will not work",
+-                  self->priv->connection_error->message,
+-                  klass->goa_provider_type);
+-    }
++static void
++gom_miner_initable_interface_init (GInitableIface *iface)
++{
++  iface->init = gom_miner_initable_init;
+ }
+ 
+ static void
+@@ -202,7 +223,6 @@ gom_miner_class_init (GomMinerClass *klass)
+ {
+   GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ 
+-  oclass->constructed = gom_miner_constructed;
+   oclass->dispose = gom_miner_dispose;
+ 
+   cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL);
+-- 
+GitLab
+
+
+From a2b53970e1c1486a61a1522010e345732ed6ca54 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:19:58 +0200
+Subject: [PATCH 2/5] Initial port to Tracker 3
+
+Each miner now stores its data in a private Tracker database, under
+the $XDG_CACHE_HOME/gnome-online-miners/$busname directory.
+
+Each miner now supports the org.freedesktop.Tracker3.Endpoint D-Bus
+interface which apps can use to query data directly from the miners.
+---
+ configure.ac          |   4 +-
+ src/gom-application.c |   4 +-
+ src/gom-miner.c       | 120 +++++++++++++++++++++++++++++++++++++++++-
+ src/gom-miner.h       |   1 +
+ src/gom-tracker.c     |   2 +-
+ 5 files changed, 125 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e91e4af..8ee6315 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,7 @@ AC_HEADER_STDC
+ 
+ GDATA_MIN_VERSION=0.15.2
+ GFBGRAPH_MIN_VERSION=0.2.2
+-GLIB_MIN_VERSION=2.35.1
++GLIB_MIN_VERSION=2.56.0
+ GOA_MIN_VERSION=3.13.3
+ GRILO_MIN_VERSION=0.3.0
+ ZAPOJIT_MIN_VERSION=0.0.2
+@@ -36,7 +36,7 @@ PKG_CHECK_MODULES(GIO, [gio-2.0 gio-unix-2.0])
+ PKG_CHECK_MODULES(GOA, [goa-1.0 >= $GOA_MIN_VERSION])
+ AC_DEFINE([GOA_API_IS_SUBJECT_TO_CHANGE], [], [We are aware that GOA's API can change])
+ 
+-PKG_CHECK_MODULES(TRACKER, [tracker-miner-2.0 tracker-sparql-2.0])
++PKG_CHECK_MODULES(TRACKER, [tracker-sparql-3.0])
+ 
+ # Facebook
+ AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook], [Enable Facebook miner])], [], [enable_facebook=yes])
+diff --git a/src/gom-application.c b/src/gom-application.c
+index bfa99ec..86546ed 100644
+--- a/src/gom-application.c
++++ b/src/gom-application.c
+@@ -233,7 +233,9 @@ gom_application_constructed (GObject *object)
+ 
+   G_OBJECT_CLASS (gom_application_parent_class)->constructed (object);
+ 
+-  self->miner = g_initable_new (self->miner_type, NULL, &error, NULL);
++  self->miner = g_initable_new (self->miner_type, NULL, &error,
++                                "bus-name", g_application_get_application_id (G_APPLICATION (self)),
++                                NULL);
+ 
+   if (self->miner == NULL)
+     g_error ("%s", error->message);
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 1dd9bb8..f349d01 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -38,7 +38,9 @@ struct _GomMinerPrivate {
+   GoaClient *client;
+   GError *client_error;
+ 
++  gchar *bus_name;
+   TrackerSparqlConnection *connection;
++  TrackerEndpointDBus *endpoint;
+   GError *connection_error;
+ 
+   gchar *display_name;
+@@ -62,6 +64,14 @@ typedef struct {
+   gpointer service;
+ } InsertSharedContentData;
+ 
++typedef enum
++{
++  PROP_BUS_NAME = 1,
++  N_PROPERTIES
++} GomMinerProperty;
++
++static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
++
+ static GThreadPool *cleanup_pool;
+ 
+ static void cleanup_job (gpointer data, gpointer user_data);
+@@ -135,6 +145,58 @@ gom_miner_dispose (GObject *object)
+   G_OBJECT_CLASS (gom_miner_parent_class)->dispose (object);
+ }
+ 
++static void
++gom_miner_init_database (GomMiner      *self,
++                         GCancellable  *cancellable,
++                         GError       **error)
++{
++  TrackerSparqlConnectionFlags flags;
++  g_autoptr (GFile) store_path = NULL;
++  g_autoptr (GDBusConnection) bus = NULL;
++  GError *inner_error = NULL;
++
++  flags = TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STEMMER |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_UNACCENT |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STOP_WORDS |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_IGNORE_NUMBERS;
++
++  store_path = g_file_new_build_filename (g_get_user_cache_dir (),
++                                          "gnome-online-miners",
++                                          self->priv->bus_name,
++                                          NULL);
++
++  self->priv->connection = tracker_sparql_connection_new (flags,
++                                                          store_path,
++                                                          tracker_sparql_get_ontology_nepomuk (),
++                                                          cancellable,
++                                                          &inner_error);
++
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++
++  bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &inner_error);
++
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++
++  self->priv->endpoint = tracker_endpoint_dbus_new (self->priv->connection,
++                                                    bus,
++                                                    NULL, /* object path */
++                                                    cancellable,
++                                                    &inner_error);
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++}
++
+ static void
+ gom_miner_init_goa (GomMiner  *self,
+                     GError   **error)
+@@ -185,10 +247,10 @@ gom_miner_initable_init (GInitable     *initable,
+ 
+   self = GOM_MINER (initable);
+ 
+-  self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error);
++  gom_miner_init_database (self, cancellable, &inner_error);
+   if (inner_error)
+     {
+-      g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: ");
++      g_propagate_prefixed_error (error, inner_error, "Unable to set up Tracker database: ");
+       return FALSE;
+     }
+ 
+@@ -212,6 +274,47 @@ gom_miner_init (GomMiner *self)
+   self->priv->display_name = g_strdup ("");
+ }
+ 
++static void
++gom_miner_set_property (GObject      *object,
++                        guint         property_id,
++                        const GValue *value,
++                        GParamSpec   *pspec)
++{
++  GomMiner *self = GOM_MINER (object);
++
++  switch ((GomMinerProperty) property_id)
++    {
++      case PROP_BUS_NAME:
++        g_free (self->priv->bus_name);
++        self->priv->bus_name = g_value_dup_string (value);
++        break;
++
++      default:
++        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++        break;
++    }
++}
++
++static void
++gom_miner_get_property (GObject    *object,
++                        guint       property_id,
++                        GValue     *value,
++                        GParamSpec *pspec)
++{
++  GomMiner *self = GOM_MINER (object);
++
++  switch ((GomMinerProperty) property_id)
++    {
++       case PROP_BUS_NAME:
++         g_value_set_string (value, self->priv->bus_name);
++         break;
++
++       default:
++         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++         break;
++    }
++}
++
+ static void
+ gom_miner_initable_interface_init (GInitableIface *iface)
+ {
+@@ -224,6 +327,19 @@ gom_miner_class_init (GomMinerClass *klass)
+   GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ 
+   oclass->dispose = gom_miner_dispose;
++  oclass->set_property = gom_miner_set_property;
++  oclass->get_property = gom_miner_get_property;
++
++  obj_properties[PROP_BUS_NAME] = g_param_spec_string ("bus-name",
++                                                       "Bus Name",
++                                                       "D-Bus name of the miner",
++                                                       NULL  /* default value */,
++                                                       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
++                                                       G_PARAM_STATIC_STRINGS);
++
++  g_object_class_install_properties (oclass,
++                                     N_PROPERTIES,
++                                     obj_properties);
+ 
+   cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL);
+ 
+diff --git a/src/gom-miner.h b/src/gom-miner.h
+index 8f83139..5dcfc8d 100644
+--- a/src/gom-miner.h
++++ b/src/gom-miner.h
+@@ -61,6 +61,7 @@ typedef struct _GomMinerPrivate GomMinerPrivate;
+ typedef struct {
+   GomMiner *miner;
+   TrackerSparqlConnection *connection;
++  gchar *bus_name;
+ 
+   GoaAccount *account;
+   GHashTable *services;
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 68818c4..5666c16 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -408,7 +408,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+   gchar *retval = NULL;
+   gchar *select = NULL;
+ 
+-  g_return_val_if_fail (TRACKER_SPARQL_IS_CONNECTION (connection), NULL);
++  g_return_val_if_fail (TRACKER_IS_SPARQL_CONNECTION (connection), NULL);
+   g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
+   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+   g_return_val_if_fail (make != NULL || model != NULL, NULL);
+-- 
+GitLab
+
+
+From 3e77eff8a677c1ecd9aa129094ed857da802d787 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:37:28 +0200
+Subject: [PATCH 3/5] Add DataObject class to our resources
+
+We need this to set nie:dataSource property. I don't understand
+how this worked in the past.
+---
+ src/gom-tracker.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 5666c16..63a4c29 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -208,7 +208,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   insert = g_string_new (NULL);
+   g_string_append_printf
+     (insert,
+-     "INSERT OR REPLACE %s { <%s> a nie:InformationElement ; %s %s }",
++     "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
+      graph_str, resource, property_name, quoted);
+   g_free (quoted);
+ 
+-- 
+GitLab
+
+
+From e742a60cf9dea1391d1ff409ce5696d21f423bed Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 02:13:11 +0200
+Subject: [PATCH 4/5] Organize data into content-based graphs
+
+Previously GOM used a graph per account and per resource but this
+cannot be done in Tracker 3.
+
+In Tracker 3, each graph is stored as a separate SQLite database
+and currently a maximum of ten graphs can be included in a single
+query due to SQLite's limitations.
+
+The new layout is modelled after how tracker-miner-fs uses graphs:
+we use a graph per content type (Contacts, Documents, Pictures),
+plus an extra graph to store accounts and folders/collections.
+---
+ src/gom-facebook-miner.c     | 12 ++---
+ src/gom-flickr-miner.c       | 24 +++++-----
+ src/gom-gdata-miner.c        | 31 ++++++------
+ src/gom-media-server-miner.c | 10 ++--
+ src/gom-miner.c              | 40 ++++++++++++----
+ src/gom-miner.h              |  1 -
+ src/gom-owncloud-miner.c     | 22 +++++----
+ src/gom-tracker.c            | 93 +++++++++++++++++-------------------
+ src/gom-tracker.h            | 14 +++++-
+ src/gom-zpj-miner.c          | 22 ++++-----
+ 10 files changed, 150 insertions(+), 119 deletions(-)
+
+diff --git a/src/gom-facebook-miner.c b/src/gom-facebook-miner.c
+index ff42ca5..fc89096 100644
+--- a/src/gom-facebook-miner.c
++++ b/src/gom-facebook-miner.c
+@@ -70,7 +70,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+@@ -239,7 +239,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", album_link);
+ 
+   if (*error != NULL)
+@@ -248,7 +248,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", album_description);
+ 
+   if (*error != NULL)
+@@ -257,7 +257,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", album_name);
+ 
+   if (*error != NULL)
+@@ -274,7 +274,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -284,7 +284,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", album_created_time);
+ 
+   if (*error != NULL)
+diff --git a/src/gom-flickr-miner.c b/src/gom-flickr-miner.c
+index 9ac338e..dc7349e 100644
+--- a/src/gom-flickr-miner.c
++++ b/src/gom-flickr-miner.c
+@@ -143,14 +143,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -166,7 +166,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_identifier,
++         TRACKER_PICTURES_GRAPH, parent_identifier,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_identifier);
+ 
+@@ -176,7 +176,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:isPartOf", parent_resource_urn);
+       g_free (parent_resource_urn);
+ 
+@@ -187,7 +187,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", grl_media_get_title (entry->media));
+ 
+   if (*error != NULL)
+@@ -202,7 +202,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   created_time = modification_date = grl_media_get_creation_date (entry->media);
+   new_mtime = g_date_time_to_unix (modification_date);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -221,7 +221,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:contentCreated", date);
+       g_free (date);
+     }
+@@ -233,7 +233,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", url);
+ 
+   if (*error != NULL)
+@@ -242,7 +242,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", grl_media_get_description (entry->media));
+ 
+   if (*error != NULL)
+@@ -254,7 +254,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:mimeType", mime);
+       g_free (mime);
+ 
+@@ -265,7 +265,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   contact_resource = gom_tracker_utils_ensure_contact_resource
+     (connection,
+      cancellable, error,
+-     datasource_urn, grl_media_get_author (entry->media));
++     TRACKER_PICTURES_GRAPH, grl_media_get_author (entry->media));
+ 
+   if (*error != NULL)
+     goto out;
+@@ -273,7 +273,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+diff --git a/src/gom-gdata-miner.c b/src/gom-gdata-miner.c
+index 7872431..d0deb80 100644
+--- a/src/gom-gdata-miner.c
++++ b/src/gom-gdata-miner.c
+@@ -120,7 +120,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_DOCUMENTS_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+@@ -187,7 +187,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_resource_id,
++         GOM_GRAPH, parent_resource_id,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_resource_id);
+ 
+@@ -219,7 +219,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_toggle_favorite
+     (connection,
+      cancellable, error,
+-     resource, starred);
++     TRACKER_PICTURES_GRAPH, resource, starred);
+ 
+   if (*error != NULL)
+     goto out;
+@@ -400,14 +400,14 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", "nmm:Photo", NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+   if (*error != NULL)
+     goto out;
+@@ -566,6 +566,7 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection,
+       equipment_resource = gom_tracker_utils_ensure_equipment_resource (connection,
+                                                                         cancellable,
+                                                                         error,
++                                                                        TRACKER_PICTURES_GRAPH,
+                                                                         make,
+                                                                         model);
+ 
+@@ -665,7 +666,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", "nfo:DataContainer",
+      NULL);
+ 
+@@ -674,7 +675,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+ 
+   gom_tracker_update_datasource
+     (connection, datasource_urn,
+-     resource_exists, identifier, resource,
++     resource_exists, TRACKER_PICTURES_GRAPH, resource,
+      cancellable, error);
+ 
+   if (*error != NULL)
+@@ -685,7 +686,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+    */
+   new_mtime = gdata_entry_get_updated (GDATA_ENTRY (album));
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -703,7 +704,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", alternate_uri);
+ 
+   if (*error != NULL)
+@@ -713,7 +714,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", summary);
+ 
+   if (*error != NULL)
+@@ -723,7 +724,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", title);
+ 
+   if (*error != NULL)
+@@ -743,7 +744,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -755,7 +756,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", date);
+   g_free (date);
+ 
+@@ -865,7 +866,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection,
+   if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection,
+                                                                cancellable,
+                                                                &local_error,
+-                                                               datasource_urn,
++                                                               TRACKER_PICTURES_GRAPH,
+                                                                source_urn,
+                                                                "nie:relatedTo",
+                                                                photo_resource_urn))
+@@ -878,7 +879,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection,
+   if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection,
+                                                                cancellable,
+                                                                &local_error,
+-                                                               datasource_urn,
++                                                               TRACKER_PICTURES_GRAPH,
+                                                                photo_resource_urn,
+                                                                "nie:links",
+                                                                source_urn))
+diff --git a/src/gom-media-server-miner.c b/src/gom-media-server-miner.c
+index 490869e..32e08c6 100644
+--- a/src/gom-media-server-miner.c
++++ b/src/gom-media-server-miner.c
+@@ -65,14 +65,14 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+   if (*error != NULL)
+     goto out;
+@@ -81,7 +81,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", photo->url);
+ 
+   if (*error != NULL)
+@@ -90,7 +90,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:mimeType", photo->mimetype);
+ 
+   if (*error != NULL)
+@@ -99,7 +99,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", photo->name);
+ 
+   if (*error != NULL)
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index f349d01..32892fa 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -376,7 +376,7 @@ gom_miner_ensure_datasource (GomMiner *self,
+                           "  <%s> a nie:DataSource ; nao:identifier \"%s\" . "
+                           "  <%s> a nie:InformationElement ; nie:rootElementOf <%s> ; nie:version \"%d\""
+                           "}",
+-                          datasource_urn,
++                          GOM_GRAPH,
+                           datasource_urn, klass->miner_identifier,
+                           root_element_urn, datasource_urn, klass->version);
+ 
+@@ -401,8 +401,8 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job,
+ 
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn nao:identifier(?urn) WHERE { ?urn nie:dataSource <%s> }",
+-                          job->datasource_urn);
++                          "SELECT ?urn ?id WHERE { GRAPH <%s> { ?urn nie:dataSource <%s> ; nao:identifier ?id . } }",
++                          GOM_GRAPH, job->datasource_urn);
+ 
+   cursor = tracker_sparql_connection_query (job->connection,
+                                             select->str,
+@@ -415,9 +415,21 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job,
+ 
+   while (tracker_sparql_cursor_next (cursor, cancellable, error))
+     {
+-      g_hash_table_insert (job->previous_resources,
+-                           g_strdup (tracker_sparql_cursor_get_string (cursor, 1, NULL)),
+-                           g_strdup (tracker_sparql_cursor_get_string (cursor, 0, NULL)));
++      const gchar *urn, *identifier;
++
++      urn = tracker_sparql_cursor_get_string (cursor, 0, NULL);
++      identifier = tracker_sparql_cursor_get_string (cursor, 1, NULL);
++
++      if (identifier != NULL)
++        {
++          g_hash_table_insert (job->previous_resources,
++                               g_strdup (identifier),
++                               g_strdup (urn));
++        }
++      else
++        {
++          g_warning ("Missing identifier for urn %s", urn);
++        }
+     }
+ 
+   g_object_unref (cursor);
+@@ -489,16 +501,19 @@ gom_account_miner_job (GTask *task,
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Querying existing accounts stored in database");
+   gom_account_miner_job_query_existing (job, &error);
+ 
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Querying remote server");
+   gom_account_miner_job_query (job, &error);
+ 
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Removing stale accounts");
+   gom_account_miner_job_cleanup_previous (job, &error);
+ 
+   if (error != NULL)
+@@ -752,10 +767,15 @@ cleanup_job (gpointer data,
+ 
+   /* find all our datasources in the tracker DB */
+   select = g_string_new (NULL);
+-  g_string_append_printf (select, "SELECT ?datasource nie:version(?root) WHERE { "
+-                          "?datasource a nie:DataSource . "
+-                          "?datasource nao:identifier \"%s\" . "
+-                          "OPTIONAL { ?root nie:rootElementOf ?datasource } }",
++  g_string_append_printf (select,
++                          "SELECT ?datasource nie:version(?root) WHERE { "
++                          "  GRAPH <%s> { "
++                          "    ?datasource a nie:DataSource . "
++                          "    ?datasource nao:identifier \"%s\" . "
++                          "    OPTIONAL { ?root nie:rootElementOf ?datasource } "
++                          "  }"
++                          "}",
++                          GOM_GRAPH,
+                           klass->miner_identifier);
+ 
+   cursor = tracker_sparql_connection_query (self->priv->connection,
+diff --git a/src/gom-miner.h b/src/gom-miner.h
+index 5dcfc8d..8f83139 100644
+--- a/src/gom-miner.h
++++ b/src/gom-miner.h
+@@ -61,7 +61,6 @@ typedef struct _GomMinerPrivate GomMinerPrivate;
+ typedef struct {
+   GomMiner *miner;
+   TrackerSparqlConnection *connection;
+-  gchar *bus_name;
+ 
+   GoaAccount *account;
+   GHashTable *services;
+diff --git a/src/gom-owncloud-miner.c b/src/gom-owncloud-miner.c
+index 34d303b..623f2e1 100644
+--- a/src/gom-owncloud-miner.c
++++ b/src/gom-owncloud-miner.c
+@@ -100,14 +100,14 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_DOCUMENTS_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_DOCUMENTS_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -117,7 +117,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   modification_time = g_date_time_new_from_timeval_local (&tv);
+   new_mtime = g_date_time_to_unix (modification_time);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_DOCUMENTS_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -133,7 +133,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_DOCUMENTS_GRAPH, resource,
+      "nie:url", uri);
+ 
+   if (*error != NULL)
+@@ -156,7 +156,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+             (connection, cancellable, error,
+              NULL,
+-             datasource_urn, parent_identifier,
++             GOM_GRAPH, parent_identifier,
+              "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+           g_checksum_reset (checksum);
+           g_free (parent_identifier);
+@@ -168,7 +168,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_DOCUMENTS_GRAPH, resource,
+              "nie:isPartOf", parent_resource_urn);
+           g_free (parent_resource_urn);
+ 
+@@ -182,7 +182,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_DOCUMENTS_GRAPH, resource,
+              "nie:mimeType", mime);
+ 
+           if (*error != NULL)
+@@ -194,7 +194,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_DOCUMENTS_GRAPH, resource,
+      "nfo:fileName", display_name);
+ 
+   if (*error != NULL)
+@@ -416,6 +416,11 @@ query_owncloud (GomAccountMinerJob *job,
+   mount = g_volume_get_mount (volume);
+   if (mount == NULL)
+     {
++      g_autofree gchar *volume_name;
++
++      volume_name = g_volume_get_name (volume);
++      g_debug ("Mounting Online Account volume %s", volume_name);
++
+       data.error = error;
+ 
+       context = g_main_context_new ();
+@@ -436,6 +441,7 @@ query_owncloud (GomAccountMinerJob *job,
+     }
+ 
+   root = g_mount_get_root (mount);
++  g_debug ("Got volume from gnome-online-accounts: root is %s", g_file_peek_path (root));
+   account_miner_job_traverse_dir (job, connection, previous_resources, datasource_urn, root, TRUE, cancellable, error);
+ 
+   g_object_unref (root);
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 63a4c29..0d1766c 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -26,16 +26,11 @@
+ #include "gom-tracker.h"
+ #include "gom-utils.h"
+ 
+-static gchar *
+-_tracker_utils_format_into_graph (const gchar *graph)
+-{
+-  return (graph != NULL) ? g_strdup_printf ("INTO <%s> ", graph) : g_strdup ("");
+-}
+-
+ static gboolean
+ gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *connection,
+                                                     GCancellable *cancellable,
+                                                     GError **error,
++                                                    const gchar *graph,
+                                                     const gchar *resource,
+                                                     const gchar *attribute,
+                                                     gchar **value)
+@@ -45,8 +40,8 @@ gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *con
+   const gchar *string_value = NULL;
+   gboolean res;
+ 
+-  g_string_append_printf (select, "SELECT ?val { <%s> %s ?val }",
+-                          resource, attribute);
++  g_string_append_printf (select, "SELECT ?val { GRAPH <%s> { <%s> %s ?val } }",
++                          graph, resource, attribute);
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+                                             cancellable, error);
+@@ -86,7 +81,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+                                                const gchar *class,
+                                                ...)
+ {
+-  GString *select, *insert, *inner;
++  GString *select, *inner;
++  gchar *insert;
+   va_list args;
+   const gchar *arg;
+   TrackerSparqlCursor *cursor;
+@@ -98,6 +94,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   gchar *key = NULL, *val = NULL;
+   gboolean exists = FALSE;
+ 
++  g_return_val_if_fail (graph != NULL, NULL);
++
+   /* build the inner query with all the classes */
+   va_start (args, class);
+   inner = g_string_new (NULL);
+@@ -112,7 +110,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   /* query if such a resource is already in the DB */
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn WHERE { ?urn %s }", inner->str);
++                          "SELECT ?urn WHERE { GRAPH <%s> { ?urn %s } }", graph, inner->str);
+ 
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+@@ -138,19 +136,12 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+     }
+ 
+   /* not found, create the resource */
+-  insert = g_string_new (NULL);
+-  graph_str = _tracker_utils_format_into_graph (graph);
+-
+-  g_string_append_printf (insert, "INSERT %s { _:res %s }",
+-                          graph_str, inner->str);
+-  g_free (graph_str);
+-  g_string_free (inner, TRUE);
+-
++  insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }",
++                            graph, inner->str);
+   insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert->str,
++    tracker_sparql_connection_update_blank (connection, insert,
+                                             G_PRIORITY_DEFAULT, NULL, error);
+-
+-  g_string_free (insert, TRUE);
++  g_free (insert);
+ 
+   if (*error != NULL)
+     goto out;
+@@ -194,10 +185,10 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+                                                         const gchar *property_value)
+ {
+   GString *insert;
+-  gchar *graph_str, *quoted;
++  gchar *quoted;
+   gboolean retval = TRUE;
+ 
+-  graph_str = _tracker_utils_format_into_graph (graph);
++  g_return_val_if_fail (graph != NULL, FALSE);
+ 
+   /* the "null" value must not be quoted */
+   if (property_value == NULL)
+@@ -208,8 +199,8 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   insert = g_string_new (NULL);
+   g_string_append_printf
+     (insert,
+-     "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
+-     graph_str, resource, property_name, quoted);
++     "INSERT OR REPLACE INTO <%s> { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
++     graph, resource, property_name, quoted);
+   g_free (quoted);
+ 
+   g_debug ("Insert or replace triple: query %s", insert->str);
+@@ -223,8 +214,6 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   if (*error != NULL)
+     retval = FALSE;
+ 
+-  g_free (graph_str);
+-
+   return retval;
+ }
+ 
+@@ -271,6 +260,7 @@ gboolean
+ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection,
+                                                GCancellable *cancellable,
+                                                GError **error,
++                                               const gchar *graph,
+                                                const gchar *resource,
+                                                gboolean favorite)
+ {
+@@ -279,15 +269,15 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti
+   gboolean retval = TRUE;
+ 
+   if (favorite)
+-    op_str = "INSERT OR REPLACE";
++    op_str = "INSERT OR REPLACE INTO";
+   else
+-    op_str = "DELETE";
++    op_str = "DELETE FROM";
+ 
+   update = g_string_new (NULL);
+   g_string_append_printf
+     (update,
+-     "%s { <%s> nao:hasTag nao:predefined-tag-favorite }",
+-     op_str, resource);
++     "%s <%s> { <%s> nao:hasTag nao:predefined-tag-favorite }",
++     op_str, graph, resource);
+ 
+   g_debug ("Toggle favorite: query %s", update->str);
+ 
+@@ -321,9 +311,13 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+   mail_uri = g_strconcat ("mailto:", email, NULL);
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn WHERE { ?urn a nco:Contact . "
+-                          "?urn nco:hasEmailAddress ?mail . "
+-                          "FILTER (fn:contains(?mail, \"%s\" )) }", mail_uri);
++                          "SELECT ?urn WHERE { "
++                          "  GRAPH <%s> { "
++                          "    ?urn a nco:Contact . "
++                          "    ?urn nco:hasEmailAddress ?mail . "
++                          "    FILTER (fn:contains(?mail, \"%s\" )) "
++                          "  }"
++                          "}", TRACKER_CONTACTS_GRAPH, mail_uri);
+ 
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+@@ -351,8 +345,9 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+   insert = g_string_new (NULL);
+ 
+   g_string_append_printf (insert,
+-                          "INSERT { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . "
++                          "INSERT INTO <%s> { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . "
+                           "_:res a nco:Contact ; nco:hasEmailAddress <%s> ; nco:fullname \"%s\" . }",
++                          TRACKER_CONTACTS_GRAPH,
+                           mail_uri, email,
+                           mail_uri, fullname);
+ 
+@@ -397,6 +392,7 @@ gchar *
+ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection,
+                                              GCancellable *cancellable,
+                                              GError **error,
++                                             const gchar *graph,
+                                              const gchar *make,
+                                              const gchar *model)
+ {
+@@ -416,7 +412,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+   equip_uri = tracker_sparql_escape_uri_printf ("urn:equipment:%s:%s:",
+                                                 make != NULL ? make : "",
+                                                 model != NULL ? model : "");
+-  select = g_strdup_printf ("SELECT <%s> WHERE { }", equip_uri);
++  select = g_strdup_printf ("ASK { GRAPH <%s> { <%s> a nfo:Equipment } }", graph, equip_uri);
+ 
+   local_error = NULL;
+   cursor = tracker_sparql_connection_query (connection, select, cancellable, &local_error);
+@@ -436,20 +432,19 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+ 
+   if (res)
+     {
+-      const gchar *cursor_uri;
+-
+-      cursor_uri = tracker_sparql_cursor_get_string (cursor, 0, NULL);
+-      if (g_strcmp0 (cursor_uri, equip_uri) == 0)
++      if (tracker_sparql_cursor_get_boolean (cursor, 0))
+         {
+-          /* return the found resource */
+-          retval = g_strdup (cursor_uri);
++          /* The resource exists */
++          retval = equip_uri;
++          equip_uri = NULL;
+           g_debug ("Found resource in the store: %s", retval);
+           goto out;
+         }
+     }
+ 
+   /* not found, create the resource */
+-  insert = g_strdup_printf ("INSERT { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }",
++  insert = g_strdup_printf ("INSERT INTO <%s> { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }",
++                            graph,
+                             equip_uri,
+                             make,
+                             model);
+@@ -480,7 +475,7 @@ void
+ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+                                const gchar              *datasource_urn,
+                                gboolean                  resource_exists,
+-                               const gchar              *identifier,
++                               const gchar              *graph,
+                                const gchar              *resource,
+                                GCancellable             *cancellable,
+                                GError                  **error)
+@@ -498,7 +493,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+ 
+       res = gom_tracker_sparql_connection_get_string_attribute
+         (connection, cancellable, error,
+-         resource, "nie:dataSource", &old_value);
++         graph, resource, "nie:dataSource", &old_value);
+       g_clear_error (error);
+ 
+       if (res)
+@@ -514,7 +509,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+   if (set_datasource)
+     gom_tracker_sparql_connection_set_triple
+       (connection, cancellable, error,
+-       identifier, resource,
++       graph, resource,
+        "nie:dataSource", datasource_urn);
+ }
+ 
+@@ -522,7 +517,7 @@ gboolean
+ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+                           gint64                    new_mtime,
+                           gboolean                  resource_exists,
+-                          const gchar              *identifier,
++                          const gchar              *graph,
+                           const gchar              *resource,
+                           GCancellable             *cancellable,
+                           GError                  **error)
+@@ -536,7 +531,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+     {
+       res = gom_tracker_sparql_connection_get_string_attribute
+         (connection, cancellable, error,
+-         resource, "nie:contentLastModified", &old_value);
++         graph, resource, "nie:contentLastModified", &old_value);
+       g_clear_error (error);
+ 
+       if (res)
+@@ -552,7 +547,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+   date = gom_iso8601_from_timestamp (new_mtime);
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection, cancellable, error,
+-     identifier, resource,
++     graph, resource,
+      "nie:contentLastModified", date);
+   g_free (date);
+ 
+diff --git a/src/gom-tracker.h b/src/gom-tracker.h
+index 94a39e8..a5ae6fd 100644
+--- a/src/gom-tracker.h
++++ b/src/gom-tracker.h
+@@ -29,6 +29,14 @@
+ 
+ G_BEGIN_DECLS
+ 
++/* The graph where we store account meta information */
++#define GOM_GRAPH "tracker.api.gnome.org/ontology/v3/gnome-online-miners"
++
++/* Graphs where we store content information */
++#define TRACKER_CONTACTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Contacts"
++#define TRACKER_DOCUMENTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Documents"
++#define TRACKER_PICTURES_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Pictures"
++
+ gchar *gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connection,
+                                                       GCancellable *cancellable,
+                                                       GError **error,
+@@ -57,6 +65,7 @@ gboolean gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *conn
+ gboolean gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection,
+                                                         GCancellable *cancellable,
+                                                         GError **error,
++                                                        const gchar *graph,
+                                                         const gchar *resource,
+                                                         gboolean favorite);
+ 
+@@ -69,20 +78,21 @@ gchar* gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *conne
+ gchar *gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection,
+                                                     GCancellable *cancellable,
+                                                     GError **error,
++                                                    const gchar *graph,
+                                                     const gchar *make,
+                                                     const gchar *model);
+ 
+ void gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+                                     const gchar              *datasource_urn,
+                                     gboolean                  resource_exists,
+-                                    const gchar              *identifier,
++                                    const gchar              *graph,
+                                     const gchar              *resource,
+                                     GCancellable             *cancellable,
+                                     GError                  **error);
+ gboolean gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+                                    gint64                    new_mtime,
+                                    gboolean                  resource_exists,
+-                                   const gchar              *identifier,
++                                   const gchar              *graph,
+                                    const gchar              *resource,
+                                    GCancellable             *cancellable,
+                                    GError                  **error);
+diff --git a/src/gom-zpj-miner.c b/src/gom-zpj-miner.c
+index 6dff947..1372de5 100644
+--- a/src/gom-zpj-miner.c
++++ b/src/gom-zpj-miner.c
+@@ -70,14 +70,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -86,7 +86,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   updated_time = zpj_skydrive_entry_get_updated_time (entry);
+   new_mtime = g_date_time_to_unix (updated_time);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -102,7 +102,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", identifier);
+ 
+   if (*error != NULL)
+@@ -119,7 +119,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_identifier,
++         TRACKER_PICTURES_GRAPH, parent_identifier,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_identifier);
+ 
+@@ -129,7 +129,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:isPartOf", parent_resource_urn);
+       g_free (parent_resource_urn);
+ 
+@@ -142,7 +142,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_PICTURES_GRAPH, resource,
+              "nie:mimeType", mime);
+           g_free (mime);
+ 
+@@ -154,7 +154,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", zpj_skydrive_entry_get_description (entry));
+ 
+   if (*error != NULL)
+@@ -163,7 +163,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nfo:fileName", name);
+ 
+   if (*error != NULL)
+@@ -180,7 +180,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -192,7 +192,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", date);
+   g_free (date);
+ 
+-- 
+GitLab
+
+
+From 34259944dd9e6e167663c97080142f6e8b7f00f2 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Mon, 27 Jul 2020 23:48:49 +0200
+Subject: [PATCH 5/5] Update for API changes in Tracker 2.99
+
+---
+ src/gom-miner.c   |  3 ---
+ src/gom-tracker.c | 22 ++++++----------------
+ 2 files changed, 6 insertions(+), 19 deletions(-)
+
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 32892fa..d9ccf67 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -382,7 +382,6 @@ gom_miner_ensure_datasource (GomMiner *self,
+ 
+   tracker_sparql_connection_update (self->priv->connection,
+                                     datasource_insert->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     error);
+ 
+@@ -469,7 +468,6 @@ gom_account_miner_job_cleanup_previous (GomAccountMinerJob *job,
+ 
+   tracker_sparql_connection_update (job->connection,
+                                     delete->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     error);
+ 
+@@ -709,7 +707,6 @@ cleanup_job_do_cleanup (CleanupJob *job, GCancellable *cancellable)
+ 
+   tracker_sparql_connection_update (self->priv->connection,
+                                     update->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     &error);
+   g_string_free (update, TRUE);
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 0d1766c..5f49f73 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -138,9 +138,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   /* not found, create the resource */
+   insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }",
+                             graph, inner->str);
+-  insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert,
+-                                            G_PRIORITY_DEFAULT, NULL, error);
++  insert_res = tracker_sparql_connection_update_blank (connection, insert, NULL, error);
+   g_free (insert);
+ 
+   if (*error != NULL)
+@@ -205,9 +203,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+ 
+   g_debug ("Insert or replace triple: query %s", insert->str);
+ 
+-  tracker_sparql_connection_update (connection, insert->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, insert->str, cancellable, error);
+ 
+   g_string_free (insert, TRUE);
+ 
+@@ -235,9 +231,7 @@ gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *connection,
+      "DELETE { <%s> %s ?val } WHERE { <%s> %s ?val }", resource,
+      property_name, resource, property_name);
+ 
+-  tracker_sparql_connection_update (connection, delete->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, delete->str, cancellable, error);
+ 
+   g_string_free (delete, TRUE);
+   if (*error != NULL)
+@@ -281,9 +275,7 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti
+ 
+   g_debug ("Toggle favorite: query %s", update->str);
+ 
+-  tracker_sparql_connection_update (connection, update->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, update->str, cancellable, error);
+ 
+   g_string_free (update, TRUE);
+ 
+@@ -351,9 +343,7 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+                           mail_uri, email,
+                           mail_uri, fullname);
+ 
+-  insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert->str,
+-                                            G_PRIORITY_DEFAULT, cancellable, error);
++  insert_res = tracker_sparql_connection_update_blank (connection, insert->str, cancellable, error);
+ 
+   g_string_free (insert, TRUE);
+ 
+@@ -450,7 +440,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+                             model);
+ 
+   local_error = NULL;
+-  tracker_sparql_connection_update (connection, insert, G_PRIORITY_DEFAULT, cancellable, &local_error);
++  tracker_sparql_connection_update (connection, insert, cancellable, &local_error);
+   if (local_error != NULL)
+     {
+       g_propagate_error (error, local_error);
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template
index 644ac3558c9f..a9b2f37d69a5 100644
--- a/srcpkgs/gnome-online-miners/template
+++ b/srcpkgs/gnome-online-miners/template
@@ -1,12 +1,13 @@
 # Template file for 'gnome-online-miners'
 pkgname=gnome-online-miners
 version=3.34.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel autoconf
+ automake libtool autoconf-archive"
 makedepends="libzapojit-devel libgdata-devel grilo-devel
- tracker-devel gfbgraph-devel gnome-online-accounts-devel"
+ tracker3-devel gfbgraph-devel gnome-online-accounts-devel"
 depends="libzapojit>=0.0.3_3"
 short_desc="GNOME service that crawls through your online content"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8
 lib32disabled=yes
+
+pre_configure() {
+	autoreconf -fi
+}

From 8c3513663bfbb187656e7d8d5915b00e579e54f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 9 Apr 2022 13:10:44 +0200
Subject: [PATCH 1147/2561] removed-packages: revbump

---
 srcpkgs/removed-packages/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f1dcebc2b8cc..5d6d2c153348 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=68
+revision=69
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From aa001007ae377006e5d8cb48a70e52a487dd1d1e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:46:34 +0200
Subject: [PATCH 1148/2561] fio: update to 3.30.

---
 srcpkgs/fio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index e5b15d2b6908..9bbb31a85740 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -1,6 +1,6 @@
 # Template file for 'fio'
 pkgname=fio
-version=3.29
+version=3.30
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/axboe/fio"
 distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=3ad22ee9c545afae914f399886e9637a43d1b3aa5dfcf6966ed83e633759acb7
+checksum=305647377527a2827223065582dd8a9269e69866426b341699d55bb4e4d3cc71
 python_version=3
 
 case "$XBPS_TARGET_MACHINE" in
@@ -30,7 +30,7 @@ do_configure() {
 }
 
 post_install() {
-	vdoc HOWTO
+	vdoc HOWTO.rst
 	for f in examples/*; do
 		vsconf "$f"
 	done

From fc6cb9ee78f40a8afb51716231fd245babd40979 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:48:06 +0200
Subject: [PATCH 1149/2561] xclock: update to 1.1.1.

---
 srcpkgs/xclock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xclock/template b/srcpkgs/xclock/template
index 6d214076f834..83dbebfea74e 100644
--- a/srcpkgs/xclock/template
+++ b/srcpkgs/xclock/template
@@ -1,6 +1,6 @@
 # Template file for 'xclock'
 pkgname=xclock
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xclock.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
-checksum=00d1be08b3471a16b1239acad11e26b80545c49c34d9d20deab0ce14515e098f
+checksum=df7ceabf8f07044a2fde4924d794554996811640a45de40cb12c2cf1f90f742c
 
 post_install() {
 	vlicense COPYING

From 59d92ed9900bafef185cd8907c1f8b0ab246dc97 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:50:53 +0200
Subject: [PATCH 1150/2561] scite: update to 5.2.2.

---
 srcpkgs/scite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 4943d99f3fcf..e48c6adadb41 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.2.1
+version=5.2.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=0e7a1daca03d9eea20b2857b722ffd57788799235803bb7b84694af5a1707e07
+checksum=ad33019fdcf001ed441e88169593c3efebe77542f10bbc3e5a20a34e196586e0
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile

From c4cfb4b5609efcacf70dd1545a86d4cbebd4e540 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Apr 2022 16:04:20 +0200
Subject: [PATCH 1151/2561] python3-pipenv: update to 2022.4.8.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 707476ccc36d..ea94ef51e087 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.3.28
+version=2022.4.8
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=4e7aae62dad7679ce81b54cc3451be19fb2c469e269335b36b14132fe5ceecb3
+checksum=53562bf69d9e5238f99a1e2101c356746b1c0aefa5dceb9b8a84a5a3e201de0d
 conflicts="python-pipenv>=0"
 
 post_extract() {

From fce0138c9bf9fcca83416170009629ee136e17e3 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 9 Apr 2022 10:02:29 -0500
Subject: [PATCH 1152/2561] xmandump: update to 0.2.3.

---
 srcpkgs/xmandump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index b05027396eaf..8ca5f3a280db 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,6 +1,6 @@
 # Template file for 'xmandump'
 pkgname=xmandump
-version=0.2.2
+version=0.2.3
 revision=1
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="ISC"
 homepage="https://github.com/void-linux/xmandump"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c664b84b9eb26e6cf6d7bc0aceca9a2ccfcfb1c0a4e0611544117489941c00ca
+checksum=d8c356bd2722558e9bfe1e55aefc0c44f6aecb52e998f4e7608e544a90cd6d89
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 19d5089044c83ed6cb9392315a55471a30cf58f9 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 2 Apr 2022 00:02:47 -0500
Subject: [PATCH 1153/2561] .github/workflows: Enable actions/stale

---
 .github/workflows/stale.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index abdc83c9d383..91ac19e4f638 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,10 +12,8 @@ jobs:
     steps:
       - uses: actions/stale@v4
         with:
-          stale-issue-message: 'Issues become stale 90 days after last activity and are closed 7 days after that.  If this issue is still relevant bump it or assign it.'
-          stale-pr-message: 'Pull Requests become stale 90 days after last activity and are closed 7 days after that.  If this pull request is still relevant bump it or assign it.'
+          stale-issue-message: 'Issues become stale 90 days after last activity and are closed 14 days after that.  If this issue is still relevant bump it or assign it.'
+          stale-pr-message: '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.'
           days-before-stale: 90
-          days-before-close: 7
-          debug-only: true
+          days-before-close: 14
           exempt-all-assignees: true
-          operations-per-run: 1000

From ac383c65dc65aa372692867205a1442dec0abd07 Mon Sep 17 00:00:00 2001
From: Erich Ericson <fakefakefans@gmail.com>
Date: Sun, 19 Dec 2021 18:41:33 +0100
Subject: [PATCH 1154/2561] MultiMC: remove package

---
 srcpkgs/MultiMC/files/MultiMC.sh  |  2 --
 srcpkgs/MultiMC/template          | 50 -------------------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/MultiMC/files/MultiMC.sh
 delete mode 100644 srcpkgs/MultiMC/template

diff --git a/srcpkgs/MultiMC/files/MultiMC.sh b/srcpkgs/MultiMC/files/MultiMC.sh
deleted file mode 100644
index 271794952e82..000000000000
--- a/srcpkgs/MultiMC/files/MultiMC.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/libexec/multimc/multimc -d ~/.multimc
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
deleted file mode 100644
index a842a76ac798..000000000000
--- a/srcpkgs/MultiMC/template
+++ /dev/null
@@ -1,50 +0,0 @@
-# Template file for 'MultiMC'
-pkgname=MultiMC
-version=0.6.13
-revision=1
-wrksrc="Launcher-${version}"
-_commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
-_nbtversion="multimc-0.6.1"
-_quazipversion="multimc-3"
-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 qt5-svg"
-short_desc="Instanced Minecraft client"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="http://multimc.org"
-distfiles="https://github.com/MultiMC/Launcher/archive/${version}.tar.gz
- https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
- https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="d77d07e77754875a8a4abd5a2f4d0e01593aa7ffb4860efe993eb2755e8a3164
- 36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
- ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
-skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"
-
-# Restricted since we don't have permissions to ship builds with the
-# MultiMC name, artwork or the API endpoints.
-restricted=yes
-
-case "$XBPS_TARGET_MACHINE" in
-	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
-esac
-
-pre_configure() {
-	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
-	export PATH=$PATH:$JAVA_HOME/bin
-	tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_nbtversion}.tar.gz" -C "${wrksrc}/libraries/libnbtplusplus" --strip-components 1
-	tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quazipversion}.tar.gz" -C "${wrksrc}/libraries/quazip" --strip-components 1
-}
-
-post_install() {
-	vmkdir usr/libexec/multimc
-	mv "${DESTDIR}/usr/bin/multimc" "${DESTDIR}/usr/libexec/multimc"
-	vbin "${FILESDIR}/MultiMC.sh" MultiMC
-	vinstall build/libMultiMC_nbt++.so 755 /usr/lib
-	vinstall build/libMultiMC_quazip.so 755 /usr/lib
-	vinstall launcher/package/linux/multimc.desktop 644 /usr/share/applications
-	vsed -i "${DESTDIR}/usr/share/applications/multimc.desktop" -e 's/Exec=multimc/Exec=MultiMC/'
-	vinstall launcher/resources/multimc/scalable/multimc.svg 644 /usr/share/pixmaps
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5d6d2c153348..6859fe29da93 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  ImageMagick6<=6.9.12.12_2
  MoinMoin<=1.9.11_1
+ MultiMC<=0.6.13_1
  Platinum9-theme<=0.0.0.20170720_3
  Venom<=0.5.5_1
  XorCurses<=0.2.2_1

From 193b256742a9ac3ae8adea7a12bc789f8b8af240 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:51:34 +0200
Subject: [PATCH 1155/2561] icdiff: update to 2.0.5.

---
 .../icdiff/patches/tests-disable-format-and-lint.patch | 10 ++++++++++
 srcpkgs/icdiff/template                                |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch

diff --git a/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch b/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch
new file mode 100644
index 000000000000..6e3daa16d903
--- /dev/null
+++ b/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch
@@ -0,0 +1,10 @@
+--- a/test.sh
++++ b/test.sh
+@@ -204,6 +204,7 @@
+   fi
+ }
+ 
++exit 0
+ ensure_installed "black"
+ echo 'Running black formatter...'
+ if ! black icdiff --line-length 79 --check; then
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 35e1d87c683c..14f656a597bf 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
-revision=2
+version=2.0.5
+revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=e1c278222891acde5d5b47e31b89f765fdf022b8908057f583032530982fe5b4
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"

From 46e615d25f4b73ff7d5812a09fc8cc6aa9b6c708 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:27 +0200
Subject: [PATCH 1156/2561] drumkv1: update to 0.9.25.

---
 srcpkgs/drumkv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template
index ff9633954f94..d26d6962543e 100644
--- a/srcpkgs/drumkv1/template
+++ b/srcpkgs/drumkv1/template
@@ -1,6 +1,6 @@
 # Template file for 'drumkv1'
 pkgname=drumkv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://drumkv1.sourceforge.io/"
 changelog="https://github.com/rncbc/drumkv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz"
-checksum=b3d7a4105e94c3b29235d2d00ae74d0be6a00d62e791c968056aa64ff7ac6012
+checksum=cc89d3aaf617ec86fba448b61bb5376445bc5a65b102dd797caad14f2659a05c

From 1091c88fb95ca37f9d36f707becf3bc869e7ec9f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:34 +0200
Subject: [PATCH 1157/2561] padthv1: update to 0.9.25.

---
 srcpkgs/padthv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template
index 59ab088017c8..c5f6158d1a2d 100644
--- a/srcpkgs/padthv1/template
+++ b/srcpkgs/padthv1/template
@@ -1,6 +1,6 @@
 # Template file for 'padthv1'
 pkgname=padthv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://padthv1.sourceforge.io/"
 changelog="https://github.com/rncbc/padthv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/padthv1/padthv1-${version}.tar.gz"
-checksum=abdbad3bae84f665bada488f0e41d2e75b810e88fa63b64e884856f8a9b8785c
+checksum=6acabd7a9ffa45a0ebab48715c6342bc7530491599936378d4b89d47d211ca85

From 5c9ad4583e2591ba16a4cd0df044b8a379cd579f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:39 +0200
Subject: [PATCH 1158/2561] samplv1: update to 0.9.25.

---
 srcpkgs/samplv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template
index c694da880baf..5e7a8ecec542 100644
--- a/srcpkgs/samplv1/template
+++ b/srcpkgs/samplv1/template
@@ -1,6 +1,6 @@
 # Template file for 'samplv1'
 pkgname=samplv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://samplv1.sourceforge.io/"
 changelog="https://github.com/rncbc/samplv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/samplv1/samplv1-${version}.tar.gz"
-checksum=ff0bfbaacfb514cb1a0194b0a43ca121f7679640a293f907fb1bbb2640d373b0
+checksum=acf035da8c0f38ccd0a9bd0327d250c6338d8af56c824bf20f90673b07580534

From ad7d21d886da99b9ab153a9d78179717a5c77fa7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:42 +0200
Subject: [PATCH 1159/2561] synthv1: update to 0.9.25.

---
 srcpkgs/synthv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template
index e835002bd2fc..6d8775be3be2 100644
--- a/srcpkgs/synthv1/template
+++ b/srcpkgs/synthv1/template
@@ -1,6 +1,6 @@
 # Template file for 'synthv1'
 pkgname=synthv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://synthv1.sourceforge.io/"
 changelog="https://github.com/rncbc/synthv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/synthv1/synthv1-${version}.tar.gz"
-checksum=74857bf2497023dd0ebe59222e548d870598312b18a5826c54f4033c0fbd3d55
+checksum=02f05fcd45c896d6194fb10cb8ec64329193e3c194ce7e0b13a5f2e4cc0026c4

From 0896f11df74290f8ad9c29d45e930e5720b9a5d4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 9 Apr 2022 09:02:28 -0700
Subject: [PATCH 1160/2561] eudev: add udev_dir pkg-config variable

---
 ...80239647d37e5cfe320c422cce879c2e0d2c.patch | 20 +++++++++++++++++++
 srcpkgs/eudev/template                        |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch

diff --git a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
new file mode 100644
index 000000000000..b36b84f75496
--- /dev/null
+++ b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
@@ -0,0 +1,20 @@
+From 9d9e80239647d37e5cfe320c422cce879c2e0d2c Mon Sep 17 00:00:00 2001
+From: oreo639 <31916379+Oreo639@users.noreply.github.com>
+Date: Sat, 9 Apr 2022 05:39:56 -0700
+Subject: [PATCH] udev: add udev_dir as synonym of udevdir
+
+---
+ src/udev/udev.pc.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in
+index 4a9d867b8..cccebb245 100644
+--- a/src/udev/udev.pc.in
++++ b/src/udev/udev.pc.in
+@@ -3,4 +3,5 @@ Description: eudev
+ Version: @UDEV_VERSION@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-udevdir=@udevlibexecdir@
++udev_dir=@udevlibexecdir@
++udevdir=${udev_dir}
diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
index df783c562bca..68c50149e028 100644
--- a/srcpkgs/eudev/template
+++ b/srcpkgs/eudev/template
@@ -4,7 +4,7 @@ _UDEV_VERSION="243" # compatible udev version provided
 
 pkgname=eudev
 version=3.2.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-hwdb --enable-manpages --disable-introspection"
 hostmakedepends="pkg-config gperf"

From 7fdb532dfc271c9d7b99a6549bc2654416f5cdea Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 10 Apr 2022 01:40:24 +0200
Subject: [PATCH 1161/2561] firefox: fix build on platforms like ppc*

---
 srcpkgs/firefox/patches/fix-build-tier3.patch | 366 ++++++++++++++++++
 1 file changed, 366 insertions(+)
 create mode 100644 srcpkgs/firefox/patches/fix-build-tier3.patch

diff --git a/srcpkgs/firefox/patches/fix-build-tier3.patch b/srcpkgs/firefox/patches/fix-build-tier3.patch
new file mode 100644
index 000000000000..c7f5b7ea1f7b
--- /dev/null
+++ b/srcpkgs/firefox/patches/fix-build-tier3.patch
@@ -0,0 +1,366 @@
+commit 8a0c895dee94b3c15e56557eb1dd0114477a6056
+Author: q66 <daniel@octaforge.org>
+Date:   Sun Apr 10 00:38:30 2022 +0200
+
+    fix build on tier 3 platforms
+    
+    https://bugzilla.mozilla.org/show_bug.cgi?id=1758610
+
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
+index 0fa127b..78c8961 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
+@@ -814,7 +814,7 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
+ #  ifdef MOZ_WAYLAND_USE_VAAPI
+     // Create VideoFramePool in case we need it.
+     if (!mVideoFramePool && mEnableHardwareDecoding) {
+-      mVideoFramePool = MakeUnique<VideoFramePool>();
++      mVideoFramePool = MakeUnique<VideoFramePool<LIBAV_VER>>();
+     }
+ 
+     // Release unused VA-API surfaces before avcodec_receive_frame() as
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
+index b1a2f73..c77d76f 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
+@@ -16,6 +16,9 @@
+ #if LIBAVCODEC_VERSION_MAJOR >= 57 && LIBAVUTIL_VERSION_MAJOR >= 56
+ #  include "mozilla/layers/TextureClient.h"
+ #endif
++#ifdef MOZ_WAYLAND_USE_VAAPI
++#  include "FFmpegVideoFramePool.h"
++#endif
+ 
+ struct _VADRMPRIMESurfaceDescriptor;
+ typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor;
+@@ -23,7 +26,6 @@ typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor;
+ namespace mozilla {
+ 
+ class ImageBufferWrapper;
+-class VideoFramePool;
+ 
+ template <int V>
+ class FFmpegVideoDecoder : public FFmpegDataDecoder<V> {};
+@@ -138,7 +140,7 @@ class FFmpegVideoDecoder<LIBAV_VER>
+   AVBufferRef* mVAAPIDeviceContext;
+   bool mEnableHardwareDecoding;
+   VADisplay mDisplay;
+-  UniquePtr<VideoFramePool> mVideoFramePool;
++  UniquePtr<VideoFramePool<LIBAV_VER>> mVideoFramePool;
+   static nsTArray<AVCodecID> mAcceleratedFormats;
+ #endif
+   RefPtr<KnowsCompositor> mImageAllocator;
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
+index 7943e09..673b3fc 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
+@@ -5,6 +5,7 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+ #include "FFmpegVideoFramePool.h"
++#include "PlatformDecoderModule.h"
+ #include "FFmpegLog.h"
+ #include "mozilla/widget/DMABufLibWrapper.h"
+ #include "libavutil/pixfmt.h"
+@@ -15,11 +16,11 @@
+ 
+ namespace mozilla {
+ 
+-RefPtr<layers::Image> VideoFrameSurfaceVAAPI::GetAsImage() {
++RefPtr<layers::Image> VideoFrameSurface<LIBAV_VER>::GetAsImage() {
+   return new layers::DMABUFSurfaceImage(mSurface);
+ }
+ 
+-VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface)
++VideoFrameSurface<LIBAV_VER>::VideoFrameSurface(DMABufSurface* aSurface)
+     : mSurface(aSurface),
+       mLib(nullptr),
+       mAVHWFramesContext(nullptr),
+@@ -30,22 +31,22 @@ VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface)
+   MOZ_ASSERT(mSurface);
+   MOZ_RELEASE_ASSERT(mSurface->GetAsDMABufSurfaceYUV());
+   mSurface->GlobalRefCountCreate();
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: creating surface UID = %d",
++  FFMPEG_LOG("VideoFrameSurface: creating surface UID = %d",
+              mSurface->GetUID());
+ }
+ 
+-void VideoFrameSurfaceVAAPI::LockVAAPIData(AVCodecContext* aAVCodecContext,
+-                                           AVFrame* aAVFrame,
+-                                           FFmpegLibWrapper* aLib) {
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI locking dmabuf surface UID = %d",
++void VideoFrameSurface<LIBAV_VER>::LockVAAPIData(AVCodecContext* aAVCodecContext,
++                                                 AVFrame* aAVFrame,
++                                                 FFmpegLibWrapper* aLib) {
++  FFMPEG_LOG("VideoFrameSurface: VAAPI locking dmabuf surface UID = %d",
+              mSurface->GetUID());
+   mLib = aLib;
+   mAVHWFramesContext = aLib->av_buffer_ref(aAVCodecContext->hw_frames_ctx);
+   mHWAVBuffer = aLib->av_buffer_ref(aAVFrame->buf[0]);
+ }
+ 
+-void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) {
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI releasing dmabuf surface UID = %d",
++void VideoFrameSurface<LIBAV_VER>::ReleaseVAAPIData(bool aForFrameRecycle) {
++  FFMPEG_LOG("VideoFrameSurface: VAAPI releasing dmabuf surface UID = %d",
+              mSurface->GetUID());
+ 
+   // It's possible to unref GPU data while IsUsed() is still set.
+@@ -67,43 +68,43 @@ void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) {
+   }
+ }
+ 
+-VideoFrameSurfaceVAAPI::~VideoFrameSurfaceVAAPI() {
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: deleting dmabuf surface UID = %d",
++VideoFrameSurface<LIBAV_VER>::~VideoFrameSurface() {
++  FFMPEG_LOG("VideoFrameSurface: deleting dmabuf surface UID = %d",
+              mSurface->GetUID());
+   // We're about to quit, no need to recycle the frames.
+   ReleaseVAAPIData(/* aForFrameRecycle */ false);
+ }
+ 
+-VideoFramePool::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {}
++VideoFramePool<LIBAV_VER>::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {}
+ 
+-VideoFramePool::~VideoFramePool() {
++VideoFramePool<LIBAV_VER>::~VideoFramePool() {
+   MutexAutoLock lock(mSurfaceLock);
+   mDMABufSurfaces.Clear();
+ }
+ 
+-void VideoFramePool::ReleaseUnusedVAAPIFrames() {
++void VideoFramePool<LIBAV_VER>::ReleaseUnusedVAAPIFrames() {
+   MutexAutoLock lock(mSurfaceLock);
+   for (const auto& surface : mDMABufSurfaces) {
+-    auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI();
+-    if (!vaapiSurface->IsUsed()) {
+-      vaapiSurface->ReleaseVAAPIData();
++    if (!surface->IsUsed()) {
++      surface->ReleaseVAAPIData();
+     }
+   }
+ }
+ 
+-RefPtr<VideoFrameSurface> VideoFramePool::GetFreeVideoFrameSurface() {
++RefPtr<VideoFrameSurface<LIBAV_VER>>
++VideoFramePool<LIBAV_VER>::GetFreeVideoFrameSurface() {
+   for (auto& surface : mDMABufSurfaces) {
+     if (surface->IsUsed()) {
+       continue;
+     }
+-    auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI();
+-    vaapiSurface->ReleaseVAAPIData();
++    surface->ReleaseVAAPIData();
+     return surface;
+   }
+   return nullptr;
+ }
+ 
+-RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
++RefPtr<VideoFrameSurface<LIBAV_VER>>
++VideoFramePool<LIBAV_VER>::GetVideoFrameSurface(
+     VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext,
+     AVFrame* aAVFrame, FFmpegLibWrapper* aLib) {
+   if (aVaDesc.fourcc != VA_FOURCC_NV12 && aVaDesc.fourcc != VA_FOURCC_YV12 &&
+@@ -113,7 +114,7 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
+   }
+ 
+   MutexAutoLock lock(mSurfaceLock);
+-  RefPtr<VideoFrameSurface> videoSurface = GetFreeVideoFrameSurface();
++  RefPtr<VideoFrameSurface<LIBAV_VER>> videoSurface = GetFreeVideoFrameSurface();
+   if (!videoSurface) {
+     RefPtr<DMABufSurfaceYUV> surface =
+         DMABufSurfaceYUV::CreateYUVSurface(aVaDesc);
+@@ -121,7 +122,7 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
+       return nullptr;
+     }
+     FFMPEG_LOG("Created new VA-API DMABufSurface UID = %d", surface->GetUID());
+-    RefPtr<VideoFrameSurfaceVAAPI> surf = new VideoFrameSurfaceVAAPI(surface);
++    RefPtr<VideoFrameSurface<LIBAV_VER>> surf = new VideoFrameSurface<LIBAV_VER>(surface);
+     if (!mTextureCreationWorks) {
+       mTextureCreationWorks = Some(surface->VerifyTextureCreation());
+     }
+@@ -138,11 +139,8 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
+     }
+     FFMPEG_LOG("Reusing VA-API DMABufSurface UID = %d", surface->GetUID());
+   }
+-
+-  auto* vaapiSurface = videoSurface->AsVideoFrameSurfaceVAAPI();
+-  vaapiSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
+-  vaapiSurface->MarkAsUsed();
+-
++  videoSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
++  videoSurface->MarkAsUsed();
+   return videoSurface;
+ }
+ 
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
+index c506d22..c89b418 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
+@@ -7,8 +7,9 @@
+ #ifndef __FFmpegVideoFramePool_h__
+ #define __FFmpegVideoFramePool_h__
+ 
+-#include "FFmpegVideoDecoder.h"
+ #include "FFmpegLibWrapper.h"
++#include "FFmpegLibs.h"
++#include "FFmpegLog.h"
+ 
+ #include "mozilla/layers/DMABUFSurfaceImage.h"
+ #include "mozilla/widget/DMABufLibWrapper.h"
+@@ -16,43 +17,16 @@
+ 
+ namespace mozilla {
+ 
+-class VideoFramePool;
+-class VideoFrameSurfaceVAAPI;
+-
+-class VideoFrameSurface {
+- public:
+-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface)
+-
+-  VideoFrameSurface() = default;
+-
+-  virtual VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() { return nullptr; }
+-
+-  virtual void SetYUVColorSpace(gfx::YUVColorSpace aColorSpace) = 0;
+-  virtual void SetColorRange(gfx::ColorRange aColorRange) = 0;
+-
+-  virtual RefPtr<DMABufSurfaceYUV> GetDMABufSurface() { return nullptr; };
+-  virtual RefPtr<layers::Image> GetAsImage() = 0;
+-
+-  // Don't allow VideoFrameSurface plain copy as it leads to
+-  // unexpected DMABufSurface/HW buffer releases and we don't want to
+-  // deep copy them.
+-  VideoFrameSurface(const VideoFrameSurface&) = delete;
+-  const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete;
+-
+- protected:
+-  virtual ~VideoFrameSurface(){};
+-};
+-
+-// VideoFrameSurfaceVAAPI holds a reference to GPU data with a video frame.
++// VideoFrameSurface holds a reference to GPU data with a video frame.
+ //
+ // Actual GPU pixel data are stored at DMABufSurface and
+ // DMABufSurface is passed to gecko GL rendering pipeline via.
+ // DMABUFSurfaceImage.
+ //
+-// VideoFrameSurfaceVAAPI can optionally hold VA-API ffmpeg related data to keep
++// VideoFrameSurface can optionally hold VA-API ffmpeg related data to keep
+ // GPU data locked untill we need them.
+ //
+-// VideoFrameSurfaceVAAPI is used for both HW accelerated video decoding
++// VideoFrameSurface is used for both HW accelerated video decoding
+ // (VA-API) and ffmpeg SW decoding.
+ //
+ // VA-API scenario
+@@ -72,13 +46,24 @@ class VideoFrameSurface {
+ // Unfortunately there isn't any obvious way how to mark particular VASurface
+ // as used. The best we can do is to hold a reference to particular AVBuffer
+ // from decoded AVFrame and AVHWFramesContext which owns the AVBuffer.
+-class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+-  friend class VideoFramePool;
++template <int V>
++class VideoFrameSurface {};
++template <>
++class VideoFrameSurface<LIBAV_VER>;
++
++template <int V>
++class VideoFramePool {};
++template <>
++class VideoFramePool<LIBAV_VER>;
++
++template <>
++class VideoFrameSurface<LIBAV_VER> {
++  friend class VideoFramePool<LIBAV_VER>;
+ 
+  public:
+-  explicit VideoFrameSurfaceVAAPI(DMABufSurface* aSurface);
++  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface)
+ 
+-  VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() final { return this; }
++  explicit VideoFrameSurface(DMABufSurface* aSurface);
+ 
+   void SetYUVColorSpace(mozilla::gfx::YUVColorSpace aColorSpace) {
+     mSurface->GetAsDMABufSurfaceYUV()->SetYUVColorSpace(aColorSpace);
+@@ -93,6 +78,12 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+ 
+   RefPtr<layers::Image> GetAsImage();
+ 
++  // Don't allow VideoFrameSurface plain copy as it leads to
++  // unexpected DMABufSurface/HW buffer releases and we don't want to
++  // deep copy them.
++  VideoFrameSurface(const VideoFrameSurface&) = delete;
++  const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete;
++
+  protected:
+   // Lock VAAPI related data
+   void LockVAAPIData(AVCodecContext* aAVCodecContext, AVFrame* aAVFrame,
+@@ -107,7 +98,7 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+   void MarkAsUsed() { mSurface->GlobalRefAdd(); }
+ 
+  private:
+-  virtual ~VideoFrameSurfaceVAAPI();
++  virtual ~VideoFrameSurface();
+ 
+   const RefPtr<DMABufSurface> mSurface;
+   const FFmpegLibWrapper* mLib;
+@@ -116,23 +107,24 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+ };
+ 
+ // VideoFramePool class is thread-safe.
+-class VideoFramePool final {
++template <>
++class VideoFramePool<LIBAV_VER> {
+  public:
+   VideoFramePool();
+   ~VideoFramePool();
+ 
+-  RefPtr<VideoFrameSurface> GetVideoFrameSurface(
++  RefPtr<VideoFrameSurface<LIBAV_VER>> GetVideoFrameSurface(
+       VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext,
+       AVFrame* aAVFrame, FFmpegLibWrapper* aLib);
+   void ReleaseUnusedVAAPIFrames();
+ 
+  private:
+-  RefPtr<VideoFrameSurface> GetFreeVideoFrameSurface();
++  RefPtr<VideoFrameSurface<LIBAV_VER>> GetFreeVideoFrameSurface();
+ 
+  private:
+   // Protect mDMABufSurfaces pool access
+   Mutex mSurfaceLock;
+-  nsTArray<RefPtr<VideoFrameSurfaceVAAPI>> mDMABufSurfaces;
++  nsTArray<RefPtr<VideoFrameSurface<LIBAV_VER>>> mDMABufSurfaces;
+   // We may fail to create texture over DMABuf memory due to driver bugs so
+   // check that before we export first DMABuf video frame.
+   Maybe<bool> mTextureCreationWorks;
+diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
+index de2611e..8ffdaae 100644
+--- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
++++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
+@@ -30,6 +30,9 @@ if CONFIG['MOZ_WAYLAND']:
+   CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
+   DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
+   USE_LIBS += ['mozva']
++  UNIFIED_SOURCES += [
++    '../FFmpegVideoFramePool.cpp',
++  ]
+ 
+ include("/ipc/chromium/chromium-config.mozbuild")
+ 
+diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
+index 7d28420..1da28a1 100644
+--- a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
++++ b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
+@@ -30,6 +30,9 @@ if CONFIG["MOZ_WAYLAND"]:
+     CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+     DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1
+     USE_LIBS += ["mozva"]
++    UNIFIED_SOURCES += [
++        "../FFmpegVideoFramePool.cpp",
++    ]
+ 
+ include("/ipc/chromium/chromium-config.mozbuild")
+ 

From 0645356ce48a5235f9bb779ea7ba57293a43ca95 Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 5 Jan 2022 13:08:39 -0800
Subject: [PATCH 1162/2561] ruby-build: update to 20211227.

---
 srcpkgs/ruby-build/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby-build/template b/srcpkgs/ruby-build/template
index 8ba698addb76..778d5e716505 100644
--- a/srcpkgs/ruby-build/template
+++ b/srcpkgs/ruby-build/template
@@ -1,6 +1,6 @@
 # Template file for 'ruby-build'
 pkgname=ruby-build
-version=20211203
+version=20211227
 revision=1
 depends="bash"
 short_desc="Compile and install Ruby"
@@ -8,7 +8,7 @@ maintainer="b-l-a-i-n-e <blaine.gilbreth@gmail.com>"
 license="MIT"
 homepage="https://github.com/rbenv/ruby-build"
 distfiles="https://github.com/rbenv/ruby-build/archive/refs/tags/v${version}.tar.gz"
-checksum=f6a9149b24c7452a512395bc43d9837171de5f43ef0cf191a4a24b013f6a2eed
+checksum=7a07eae6d6948f79a8ffecd7a493fb887e10326c429fe55cfe1bda65146db824
 
 do_install() {
 	vbin bin/ruby-build

From ec987378382c0eaed6abaff4ec6b510a53afdb3f Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 10 Apr 2022 01:26:47 -0400
Subject: [PATCH 1163/2561] neomutt: update to 20220408.

---
 srcpkgs/neomutt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 3e9e433395f9..3e703630df81 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20211029
+version=20220408
 revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
@@ -19,11 +19,11 @@ short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://neomutt.org/"
-_test_files_hash=8e4fc46e731da0863c04b005885f92aa925b6367
+_test_files_hash=dc9fb32a701eb9dce4fda93c27da1d9b5be23231
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="08245cfa7aec80b895771fd1adcbb7b86e9c0434dfa64574e3c8c4d692aaa078
- 818ff9642ac396e18854486078320ce03a58c8aa8f7d6af44d1b0b5de822ccc3"
+checksum="bb138adb09b1f164fe690749e991a5505bf4f50b6ad478ffb085c609d5617cc7
+ bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947"
 python_version=3
 
 # fix:

From 1945c59126245041615c77e9ae8be16739ae3a8d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH 1164/2561] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 38 ++++++------
 2 files changed, 77 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..654c901f129e 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,39 +1,36 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="gettext glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+homepage="https://gitlab.freedesktop.org/upower/upower"
+changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS"
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
@@ -49,9 +46,12 @@ upower-devel_package() {
 	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/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 7ed60c8ef7039a6bd0ae5fdcd5746eda71a83e9c Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 1 Apr 2022 11:00:05 +0200
Subject: [PATCH 1165/2561] vscode: update to 1.66.0.

---
 srcpkgs/vscode/patches/product.patch | 12 +++---------
 srcpkgs/vscode/patches/ripgrep.patch | 14 +++++++-------
 srcpkgs/vscode/template              | 10 +++++++---
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index a7e2b79925bf..624ca63afcbe 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,21 +1,15 @@
 diff --git a/product.json b/product.json
-index 9d630f23cd7..eea95dce319 100644
+index df18127dcc67..d3006752bd98 100644
 --- a/product.json
 +++ b/product.json
-@@ -27,6 +27,9 @@
+@@ -27,7 +27,15 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
 +	"quality": "stable",
 +	"documentationUrl": "https://github.com/microsoft/vscode-docs",
 +	"requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/",
- 	"extensionAllowedProposedApi": [
- 		"ms-vscode.vscode-js-profile-flame",
-@@ -34,6 +37,11 @@
- 		"GitHub.remotehub",
- 		"GitHub.remotehub-insiders"
- 	],
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/",
 +	"extensionsGallery": {
 +		"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
 +		"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index ff0dfc233e41..3fdc568a9e54 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -5,27 +5,27 @@ during build, which unbreaks build on platforms where MS deos not
 ship a prebuilt ripgrep.
 
 diff --git a/package.json b/package.json
-index 5d6022a2a40..f66ee44eef0 100644
+index de2cf9e04a9b..1995e3bb9a7e 100644
 --- a/package.json
 +++ b/package.json
-@@ -63,7 +63,7 @@
+@@ -62,7 +62,7 @@
+     "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
-     "@vscode/debugprotocol": "1.51.0",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
-     "@vscode/sqlite3": "4.0.12",
+     "@vscode/sqlite3": "5.0.7",
      "@vscode/sudo-prompt": "9.3.1",
      "@vscode/vscode-languagedetection": "1.0.21",
 diff --git a/remote/package.json b/remote/package.json
-index 4bc40998093..9d22d408c02 100644
+index c7fc7a2e931f..8842b784df2c 100644
 --- a/remote/package.json
 +++ b/remote/package.json
 @@ -6,7 +6,7 @@
      "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
      "@vscode/vscode-languagedetection": "1.0.21",
      "applicationinsights": "1.4.2",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 620c9a6928aa..0b9efda224d0 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,8 +1,9 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.65.2
+version=1.66.0
 revision=1
 _electronver=13.6.7
+_npmver=8.6.0
 hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep"
 makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13"
 depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
@@ -11,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
+checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -46,7 +47,10 @@ do_build() {
 	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
 	--target=$_electronver \
 	--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
-	yarn install --ignore-engines --arch=x64
+
+	npm install -g npm@${_npmver} && \
+		yarn install --ignore-engines --arch=x64
+
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min
 }

From c1be3d7768ebc5cc991f7c7c3ec539941f147873 Mon Sep 17 00:00:00 2001
From: octeep <octeep@pm.me>
Date: Fri, 1 Apr 2022 17:55:08 +0100
Subject: [PATCH 1166/2561] New package: wireproxy-1.0.1

---
 srcpkgs/wireproxy/files/wireproxy/run |  7 +++++++
 srcpkgs/wireproxy/template            | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 srcpkgs/wireproxy/files/wireproxy/run
 create mode 100644 srcpkgs/wireproxy/template

diff --git a/srcpkgs/wireproxy/files/wireproxy/run b/srcpkgs/wireproxy/files/wireproxy/run
new file mode 100644
index 000000000000..7ba16434072e
--- /dev/null
+++ b/srcpkgs/wireproxy/files/wireproxy/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+export HOME=/var/lib/wireproxy
+
+exec chpst -u _wireproxy wireproxy --config ${CONFFILE:-/etc/wireproxy/config}
diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
new file mode 100644
index 000000000000..984027a4f69e
--- /dev/null
+++ b/srcpkgs/wireproxy/template
@@ -0,0 +1,24 @@
+# Template file for 'wireproxy'
+pkgname=wireproxy
+version=1.0.1
+revision=1
+build_style=go
+go_import_path="github.com/octeep/wireproxy"
+go_package="${go_import_path}/cmd/wireproxy"
+short_desc="Wireguard client that exposes itself as a socks5 proxy"
+maintainer="Wind Wong <octeep@pm.me>"
+license="ISC"
+homepage="https://github.com/octeep/wireproxy"
+distfiles="https://github.com/octeep/wireproxy/archive/v${version}.tar.gz"
+checksum=e21eac22ef1b12dc2d7b3e5b58dcff183af9c1547be3e55a7e6c71394f053e1e
+make_dirs="
+ /etc/wireproxy 0750 root _wireproxy
+ /var/lib/wireproxy 0700 _wireproxy _wireproxy"
+
+system_accounts="_wireproxy"
+_wireproxy_homedir="/var/lib/wireproxy"
+
+post_install() {
+	vsv wireproxy
+	vlicense LICENSE
+}

From 1a52dd83016ed92d6f925b90a5862d0d158a0c38 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Mar 2022 00:38:27 +0200
Subject: [PATCH 1167/2561] patch_args: allow use of --directory parameter

patch(1) has a -d/--directory parameter which allows us to specify a directory
where the patch will be applied. This is especially useful when we have
multiple distfiles and want to patch in $build_wrksrc because that's where the
patch is usually applied.

Problem is, that the -i parameter is also relative to the the -d parameter and
thus fails to find the patch, when -d is set. We solve that by using standard
input instead of -i.
---
 common/hooks/do-patch/00-patches.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hooks/do-patch/00-patches.sh b/common/hooks/do-patch/00-patches.sh
index 9f7e21f017dc..64659dc30280 100644
--- a/common/hooks/do-patch/00-patches.sh
+++ b/common/hooks/do-patch/00-patches.sh
@@ -31,7 +31,7 @@ _process_patch() {
 
 	cd "$wrksrc"
 	msg_normal "$pkgver: patching: ${_patch}.\n"
-	patch -s ${_args} -i ${_patch} 2>/dev/null
+	patch -s ${_args} <${_patch} 2>/dev/null
 }
 
 hook() {

From 4c8c6b32766d891e81c4fdc63ff1821ca94db12b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Mar 2022 00:57:00 +0200
Subject: [PATCH 1168/2561] wine: patch into $build_wrksrc

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  | 9 +++++++--
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 3 +++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 7546d45c7609..6a46158221b4 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index e0b6f8626637..f522f7ecea2d 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.6/configure
-+++ b/wine-7.6/configure
+--- a/configure
++++ b/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,13 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
+<<<<<<< HEAD
 --- a/wine-7.6/configure.ac
 +++ b/wine-7.6/configure.ac
+=======
+--- a/configure.ac
++++ b/configure.ac
+>>>>>>> 6dccb4ef9c (wine: patch into $build_wrksrc)
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index a95011e3cca0..ac8dfca3bb2f 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.6/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.6/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 86d0acf0883b..beb10898af92 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -25,6 +25,8 @@ desc_option_xshm="Enable support for the X Shared Memory Extension"
 lib32mode=full
 archs="i686* x86_64*"
 
+patch_args="-Np1 --directory=${build_wrksrc}"
+
 _nopie=no
 if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 	# build system adds -fno-PIC for 32bit builds, which,
@@ -48,6 +50,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}"
+# This testsuite might hang indefinitely
 make_check=extended
 
 case $XBPS_TARGET_MACHINE in

From 8b15d675bc5512f6086e5c67b0b516713c4d3db7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 9 Apr 2022 13:38:04 +0200
Subject: [PATCH 1169/2561] chatterino2: patch into $build_wrksrc

---
 .../patches/0001-fix-desktop-icon-name.patch         |  4 ++--
 srcpkgs/chatterino2/patches/cmake.patch              | 12 ++++++------
 srcpkgs/chatterino2/template                         |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
index 9f41d03190b7..1b0a6d6140e4 100644
--- a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -1,7 +1,7 @@
 diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
 index 6ee45354..ece81f5c 100644
---- a/chatterino2/resources/com.chatterino.chatterino.desktop
-+++ b/chatterino2/resources/com.chatterino.chatterino.desktop
+--- a/resources/com.chatterino.chatterino.desktop
++++ b/resources/com.chatterino.chatterino.desktop
 @@ -4,7 +4,7 @@ Version=1.0
  Name=Chatterino
  Comment=Chat client for Twitch
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
index a59d0a4eb9f0..8a5643566957 100644
--- a/srcpkgs/chatterino2/patches/cmake.patch
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -1,7 +1,7 @@
 diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
 index 82905436..b0b89a4e 100644
---- a/chatterino2/cmake/FindLRUCache.cmake
-+++ b/chatterino2/cmake/FindLRUCache.cmake
+--- a/cmake/FindLRUCache.cmake
++++ b/cmake/FindLRUCache.cmake
 @@ -1,6 +1,6 @@
  include(FindPackageHandleStandardArgs)
  
@@ -12,8 +12,8 @@ index 82905436..b0b89a4e 100644
  
 diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
 index 4671874c..119284c2 100644
---- a/chatterino2/cmake/FindPajladaSerialize.cmake
-+++ b/chatterino2/cmake/FindPajladaSerialize.cmake
+--- a/cmake/FindPajladaSerialize.cmake
++++ b/cmake/FindPajladaSerialize.cmake
 @@ -1,6 +1,6 @@
  include(FindPackageHandleStandardArgs)
  
@@ -24,8 +24,8 @@ index 4671874c..119284c2 100644
  
 diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
 index f4c964ec..75efba20 100644
---- a/chatterino2/cmake/FindPajladaSignals.cmake
-+++ b/chatterino2/cmake/FindPajladaSignals.cmake
+--- a/cmake/FindPajladaSignals.cmake
++++ b/cmake/FindPajladaSignals.cmake
 @@ -1,6 +1,6 @@
  include(FindPackageHandleStandardArgs)
  
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index e1f99ac9e9fc..7bf7d6a37d04 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -9,7 +9,7 @@ _signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
 _qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
 _sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
 create_wrksrc=yes
-build_wrksrc="chatterino2"
+build_wrksrc="chatterino2-${version}"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
@@ -40,8 +40,9 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LIBS="-latomic"
 fi
 
+patch_args="-Np1 --directory=${build_wrksrc}"
+
 post_extract() {
-	mv "chatterino2-${version}" "${build_wrksrc}"
 	rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \
 	      ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \
 	      ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \

From f8621b9e658f888c0f7bbe2285bb93d7d1bd7275 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 16 Mar 2022 15:29:25 +0200
Subject: [PATCH 1170/2561] goodvibes: update to 0.7.3.

---
 srcpkgs/goodvibes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index 1a73cd225234..97c1ae97171f 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,6 +1,6 @@
 # Template file for 'goodvibes'
 pkgname=goodvibes
-version=0.7.2
+version=0.7.4
 revision=1
 wrksrc="goodvibes-v${version}"
 build_style=meson
@@ -14,7 +14,7 @@ license="GPL-3.0-only"
 homepage="https://gitlab.com/goodvibes/goodvibes"
 changelog="https://gitlab.com/goodvibes/goodvibes/-/raw/master/NEWS"
 distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=5f96ba7b8654f331181c8ee0e697d042a195406712a547e7954159e5d66795ba
+checksum=9940c56cb18064f966c2f881fbc7876004eba06f1ea249e01c652477853017cf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"

From 9f7eb6665a441ce30a01b2704b91cdc5c3c0909d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 02:50:03 +0100
Subject: [PATCH 1171/2561] screenkey: update to 1.5.

---
 srcpkgs/screenkey/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/screenkey/template b/srcpkgs/screenkey/template
index 4541a207058c..f199b36bc9ef 100644
--- a/srcpkgs/screenkey/template
+++ b/srcpkgs/screenkey/template
@@ -1,15 +1,15 @@
 # Template file for 'screenkey'
 pkgname=screenkey
-version=1.4
-revision=2
+version=1.5
+revision=1
 build_style=python3-module
-hostmakedepends="intltool python3-setuptools python3-distutils-extra
- python3-Babel"
-depends="gtk+3 libX11 python3-gobject"
-checkdepends="${depends} libXtst"
+hostmakedepends="python3-setuptools python3-Babel"
+depends="gtk+3 libX11 python3-gobject python3-cairo python3-dbus"
+checkdepends="$depends"
 short_desc="Screencast tool to display your keys"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://www.thregr.org/~wavexx/software/screenkey"
+homepage="https://www.thregr.org/~wavexx/software/screenkey"
+changelog="https://www.thregr.org/~wavexx/software/screenkey/NEWS.html"
 distfiles="${homepage}/releases/screenkey-${version}.tar.gz"
-checksum=d7347e31fab4a5b18da431e3fc26f39700e99a505eb0c0168295adc12c8dd4f7
+checksum=cc8471b83f7ba7a754e1da0631cfa9c32b9217da93597afc1c3283e3a1ae4112

From 1f11e2ecfb87a382ae5c30fdd312622a7c8a87bc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 27 Mar 2022 22:35:11 +0200
Subject: [PATCH 1172/2561] New package: orage-4.16.0

---
 srcpkgs/orage/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/orage/template

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
new file mode 100644
index 000000000000..0cfc8994c78c
--- /dev/null
+++ b/srcpkgs/orage/template
@@ -0,0 +1,17 @@
+# Template file for 'orage'
+pkgname=orage
+version=4.16.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool flex glib-devel dbus-glib-devel"
+makedepends="libical-devel libnotify-devel gtk+3-devel popt-devel
+ libxfce4util-devel libxfce4ui-devel xfce4-panel-devel"
+depends="hicolor-icon-theme desktop-file-utils"
+short_desc="Simple calendar application for Xfce"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://docs.xfce.org/apps/orage/start"
+changelog="https://gitlab.xfce.org/apps/orage/-/raw/master/NEWS"
+distfiles="https://archive.xfce.org/src/apps/orage/${version%.*}/orage-$version.tar.bz2"
+checksum=26111a3b6a2007c82f1e0a1e0591b774a0b132f3a7f1cde53d9be661b2f11700

From ad0bbdea9da8f494555a8b020227edf7987c2bb1 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Fri, 8 Apr 2022 10:47:59 +0700
Subject: [PATCH 1173/2561] upterm: update to 0.8.2

---
 srcpkgs/upterm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 362f919c40ef..fd99190dedb9 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,6 +1,6 @@
 # Template file for 'upterm'
 pkgname=upterm
-version=0.7.6
+version=0.8.2
 revision=1
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
@@ -10,7 +10,7 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="Apache-2.0"
 homepage="https://github.com/owenthereal/upterm/"
 distfiles="https://github.com/owenthereal/upterm/archive/refs/tags/v$version.tar.gz"
-checksum=26ceb5eee035d4e1a08240aced75a20f2e54b1e192eef0bf5eb51d0195997f8c
+checksum=4b85cf8207ffce051f2c391905fd58514c98c3fd5ff890d7340fcfd3a0ea7b8e
 
 post_install() {
 	vcompletion etc/completion/upterm.zsh_completion zsh

From b8e1ed4fd17015eb3cd016a6f151a155ac970926 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 7 Apr 2022 18:42:16 -0400
Subject: [PATCH 1174/2561] dendrite: update to 0.8.1.

---
 srcpkgs/dendrite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 1bef12b95642..fffd933f62c1 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.7.0
+version=0.8.1
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=26c378bff1738b0e8422c7bd425be4763f22225f422ae1854c78644e4ca8bc42
+checksum=e26d306b008c9a88da31449e51df4c97e991d99b7954ab130f4fcf00371aa503
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"

From 930ffa322a2b2a6cc4925ad16d0723b914077236 Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Thu, 7 Apr 2022 16:43:47 -0500
Subject: [PATCH 1175/2561] Signal-Desktop: update to 5.38.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index a0b15428b926..05be4f346a92 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.37.0
+version=5.38.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=bd674ea6ba0582862f26a8fed1557d21f68161ef05891e67ca4cb653bf0f8d1a
+checksum=da693cf3fd7535f8569bbdc6f64387e274daab49c2798cacc804c784e401115d
 nostrip_files="signal-desktop"
 
 post_extract() {

From 7ae6d1f50fe2108f437d632f389ff6c4070ba7c0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 6 Apr 2022 22:31:09 -0400
Subject: [PATCH 1176/2561] just: update to 1.1.2.

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 7dc9fe4fbeb7..f3857ec4f01f 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.1.1
+version=1.1.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/refs/tags/${version}.tar.gz"
-checksum=b985def8260965773422fc6c665fa37aeb7304280560dbf8f641479ba00e2da0
+checksum=5f04ce85dc2de7609d68c336a7c51f477f8ff079d8b209a0d72183615e3f1e55
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 2e39b91734a96a55962ae0e025fa632059161db8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 4 Apr 2022 12:40:05 +0200
Subject: [PATCH 1177/2561] qjackctl: update to 0.9.7.

---
 srcpkgs/qjackctl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index 4e746124bdd0..8fb8a4ad5350 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -1,6 +1,6 @@
 # Template file for 'qjackctl'
 pkgname=qjackctl
-version=0.9.6
+version=0.9.7
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool jack_session CONFIG_JACK_SESSION)"
@@ -11,8 +11,9 @@ short_desc="JACK Audio Connection Kit - Qt GUI Interface"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://qjackctl.sourceforge.io"
+changelog="https://qjackctl.sourceforge.io/qjackctl-downloads.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=39ca2b9d83acfdd16a4c9b3eccd80e1483e1f9a446626f5d00ac297e6f8a166b
+checksum=524843618152070c90a40a18d0e9a16e784424ce54231aff5c0ced12f2769080
 
 build_options="jack_session"
 build_options_default="jack_session"

From dd5839408b8b6c656a15a385577ddc62ba8d0cd8 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 2 Apr 2022 21:39:14 +0530
Subject: [PATCH 1178/2561] CPU-X: update to 4.3.0, adopt

---
 .../CPU-X/patches/musl-ctrl-not-defined.patch | 15 --------
 srcpkgs/CPU-X/template                        | 36 ++++++++++---------
 2 files changed, 19 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch

diff --git a/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch b/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch
deleted file mode 100644
index 77b7abec77bc..000000000000
--- a/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/tui_ncurses.c	2021-10-07 14:38:03.886862860 -0400
-+++ b/src/tui_ncurses.c	2021-10-07 14:49:43.258142532 -0400
-@@ -262,6 +262,12 @@
- /* Convert keys when an alternative mapping is used */
- #define ALT_CODE 27
- #define ALT(x)   (x & ALT_CODE)
-+
-+/* glibc's term.h pulls in sys/ttydefaults.h which has it, but musl's does not. */
-+#ifndef CTRL
-+#define CTRL(x)	(x&037)
-+#endif
-+
- static int convert_char(int ch)
- {
- 	int i = 0;
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 19a01be5978c..36246fc521f9 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,30 +1,32 @@
 # Template file for 'CPU-X'
 pkgname=CPU-X
-version=4.2.0
+version=4.3.0
 revision=1
 archs="x86_64* i686*"
 build_style=cmake
-hostmakedepends="nasm pkg-config gettext"
-makedepends="libcpuid-devel ncurses-devel pciutils-devel
- procps-ng-devel glfw-devel $(vopt_if gtk3 'gtk+3-devel')"
+hostmakedepends="pkg-config nasm"
+makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
+ glfw-devel ocl-icd-devel procps-ng-devel libstatgrab
+ $(vopt_if gtk3 gtk+3-devel)"
+checkdepends="mawk nawk grep"
 short_desc="Free software that gathers information on CPU, motherboard and more"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://x0rg.github.io/CPU-X/"
 changelog="https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog.md"
 distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
-checksum=3bd8aabe98273012adc6fa25f31cf0f631f0a34c2ec39392fb5f6885551cee1f
-# tests depend on:
-# having mawk and nawk installed which breaks chroot-gawk
-# grep -P, which `chroot-grep` is compiled without
-make_check=no
-
+checksum=6ad7a8ac2d6c687a38a895fbbfbf2de690311676ac374d5857588bb983839433
 build_options="gtk3"
 build_options_default="gtk3"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		makedepends+=" libexecinfo-devel"
-		LDFLAGS="-lexecinfo"
-	;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	LDFLAGS="-lexecinfo"
+fi
+
+# Tests depend on the -P flag of grep, which is not available in chroot-grep
+# and installing grep as checkdepends breaks base-chroot.
+# So, only run tests in CI, where the masterdir is ephemeral anyway.
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+	make_check=no	# breaks base-chroot
+fi

From f7f966609d6626319b37211031212d5dd6134a2c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 25 Mar 2022 10:31:24 +0100
Subject: [PATCH 1179/2561] fluidsynth: update to 2.2.6.

---
 srcpkgs/fluidsynth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 146a550f658c..3f65b393d92b 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.2.5
+version=2.2.6
 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=9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8
+checksum=ca90fe675cacd9a7b442662783c4e7fa0e1fd638b28d64105a4e3fe0f618d20f
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From f5080a42775fc81920aa97264b18e84b69e132ce Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 2 Apr 2022 19:23:11 +0200
Subject: [PATCH 1180/2561] gotop: update to 4.1.3.

---
 srcpkgs/gotop/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..c8c7a842b4bb 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,19 +1,21 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.3
 revision=1
 build_style=go
+build_helper=qemu
 go_ldflags="-X main.Version=v${version}"
 go_import_path="github.com/xxxserxxx/gotop/v4"
 go_package="$go_import_path/cmd/gotop"
-hostmakedepends="git"
 short_desc="Terminal based graphical activity monitor"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=c0a02276e718b988d1220dc452063759c8634d42e1c01a04c021486c1e61612d
 
 post_install() {
 	vlicense LICENSE
+	vtargetrun ${DESTDIR}/usr/bin/gotop --create-manpage > gotop.1
+	vman gotop.1
 }

From 5b61fdb60def5431ab8171c345c2d7413550352c Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Thu, 31 Mar 2022 21:17:01 +0200
Subject: [PATCH 1181/2561] pgweb: update to 0.11.11.

---
 srcpkgs/pgweb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 9144e3d93eb2..2e511d41844a 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,6 +1,6 @@
 # Template file for 'pgweb'
 pkgname=pgweb
-version=0.11.10
+version=0.11.11
 revision=1
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
@@ -9,7 +9,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://sosedoff.github.io/pgweb"
 distfiles="https://github.com/sosedoff/pgweb/archive/v${version}.tar.gz"
-checksum=df2d16daa6f8fa9735b713199691ef74136f19fbbee14778248e41e247a1b93b
+checksum=4d8c64db7ec463a9366d404cbaf12215db855a5bdbf09253494d79dedd92db98
 
 post_install() {
 	vdoc README.md

From b58734b37ce223ed885e05585105f6e3fdc77cfc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 27 Mar 2022 20:44:36 +0200
Subject: [PATCH 1182/2561] x42-plugins: update to 20220327.

---
 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 8df0ec803309..328c03b09dec 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20220107
+version=20220327
 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/x42-plugins/x42-plugins-${version}.tar.xz"
-checksum=fa5ce09114077ba9a889dde1e9acff8aab765cbe6f6f2334063493c0c06f7772
+checksum=221b8fa939426c2c44c53e41f40bb8d91410978b0312fcfaf8786cb93d36295b
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

From 066951f749016de87a14891df846ec22dbf535b6 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Thu, 31 Mar 2022 11:13:14 +0700
Subject: [PATCH 1183/2561] mdBook: update to 0.4.17

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 465ff1a1bbbc..d2aa033512fa 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.14
+version=0.4.17
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=59fd3e417e9d09deac89e20467194dd9f93854c2f1a87e845816c5cec676765c
+checksum=9523d0bed63ce35eec5a8259eb963651cd7e37ec5644ef551134068a2fb72f89
 
 post_install() {
 	vlicense LICENSE

From 39b827937d126f00ea8ad47c31698c06fa46ebe6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Apr 2022 22:42:33 +0200
Subject: [PATCH 1184/2561] ugrep: update to 3.7.9.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 2c25a04aa898..5025d63a7ebd 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.8
+version=3.7.9
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=b2e03615890b92df4487a2891bf47675429c469b1825d5d05600ed3a729b92c7
+checksum=016e771756574a2a0b026ec50f7e7f3898d39cb61771ce98bc225c34d86a03be
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From ebe3b1305368d46d87d1cec1a6fca75a92c65052 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Apr 2022 14:30:56 +0200
Subject: [PATCH 1185/2561] libmnl: update to 1.0.5.

---
 srcpkgs/libmnl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libmnl/template b/srcpkgs/libmnl/template
index 9c624e2a3584..7ecb5b44a35d 100644
--- a/srcpkgs/libmnl/template
+++ b/srcpkgs/libmnl/template
@@ -1,14 +1,14 @@
 # Template file for 'libmnl'
 pkgname=libmnl
-version=1.0.4
-revision=2
+version=1.0.5
+revision=1
 build_style=gnu-configure
 short_desc="Minimalistic user-space library oriented to Netlink developers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.netfilter.org/projects/libmnl/"
 distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81
+checksum=274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525
 
 libmnl-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 758ff9707d0e82851e1224960806b0005a94c16a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Apr 2022 14:35:40 +0200
Subject: [PATCH 1186/2561] skaffold: update to 1.38.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index faa9823d1cc6..af2d37f0aeb6 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.37.1
+version=1.38.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=8dfea015256761525d8c0e54713642bcd7ead3e3c96ff58e301d0b77b9ef3bd5
+checksum=42f8f8a6f8f55f8031c87de3c3d35334f2e1f71c2a2120d3cc1a15f8ed71ba31

From b270af78002aa9d91b1e74d6eaef4917a634a045 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 8 Apr 2022 01:03:06 +0200
Subject: [PATCH 1187/2561] revive: update to 1.2.1.

---
 srcpkgs/revive/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index 55a011447362..38f2018570e8 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,16 +1,16 @@
 # Template file for 'revive'
 pkgname=revive
-version=1.1.4
+version=1.2.1
 revision=1
 build_style=go
-go_ldflags="-X main.version=$version -X main.builtBy=xbps"
+go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"
 short_desc="Drop-in replacement for golint"
 maintainer="Roberto Ricci <ricci@disroot.org>"
 license="MIT"
 homepage="https://revive.run/"
 distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz"
-checksum=afe0d11a614d5ca706485b7f6ca1e53b374b45017ea75f14149a4434d3ef74b5
+checksum=47e9f371e934fe4dfce44098fd54a0aaeaa47079184a14ad263990a24fab1b35
 
 do_check() {
 	go test -v ./...

From 87318dd5f7b6415bd6c0109ee371edc5b4289cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 7 Apr 2022 22:26:45 -0300
Subject: [PATCH 1188/2561] New package: python3-fastjsonschema-2.15.3

---
 srcpkgs/python3-fastjsonschema/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-fastjsonschema/template

diff --git a/srcpkgs/python3-fastjsonschema/template b/srcpkgs/python3-fastjsonschema/template
new file mode 100644
index 000000000000..290431fadfc1
--- /dev/null
+++ b/srcpkgs/python3-fastjsonschema/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-fastjsonschema'
+pkgname=python3-fastjsonschema
+version=2.15.3
+revision=1
+wrksrc=python-fastjsonschema-${version}
+build_style=python3-module
+make_check_args="--deselect tests/benchmarks/test_benchmark.py"
+hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest"
+short_desc="Fastest Python implementation of JSON schema"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/seznam/python-fastjsonschema"
+changelog="https://raw.githubusercontent.com/horejsek/python-fastjsonschema/master/CHANGELOG.txt"
+distfiles="https://github.com/horejsek/python-fastjsonschema/archive/refs/tags/v${version}.tar.gz"
+checksum=94e59a36c0efbf75a1a790fed15b51c9876b81204a5184c0c89075c68b10e7ec
+
+post_install() {
+	vlicense LICENSE
+}

From 094416a8ffb6523faa8e890ab11c766a47f9fc73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:34 -0300
Subject: [PATCH 1189/2561] python3-jupyter_nbformat: update to 5.3.0.

---
 srcpkgs/python3-jupyter_nbformat/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
index 4bea7989e2a2..27f3267b4594 100644
--- a/srcpkgs/python3-jupyter_nbformat/template
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -1,26 +1,22 @@
 # Template file for 'python3-jupyter_nbformat'
 pkgname=python3-jupyter_nbformat
-version=5.1.3
-revision=2
+version=5.3.0
+revision=1
 wrksrc="nbformat-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jsonschema python3-traitlets
- python3-ipython_genutils python3-jupyter_core"
+ python3-ipython_genutils python3-jupyter_core
+ python3-fastjsonschema"
 checkdepends="python3-pytest python3-testpath $depends"
 short_desc="Jupyter notebook format"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/nbformat"
 distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz"
-checksum=b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8
+checksum=fcc5ab8cb74e20b19570b5be809e2dba9b82836fd2761a89066ad43394ba29f5
 conflicts="python-jupyter_nbformat<=4.4.0_3"
 
-do_check() {
-	# Tests require a non-existent notebook file
-	python3 -m pytest -k 'not test_upgrade_v4_to_4_dot_5 and not test_sample_notebook'
-}
-
 post_install() {
 	vlicense COPYING.md LICENSE
 }

From 4b522bc57841b319d9ca2359ab242a9409bdd64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:37 -0300
Subject: [PATCH 1190/2561] python3-jupyter_nbconvert: update to 6.4.5.

---
 srcpkgs/python3-jupyter_nbconvert/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index ee8f7f8ba368..baebe44c04ca 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,13 +1,16 @@
 # Template file for 'python3-jupyter_nbconvert'
 pkgname=python3-jupyter_nbconvert
-version=6.0.7
-revision=2
+version=6.4.5
+revision=1
 wrksrc="nbconvert-${version}"
 build_style=python3-module
+# WebPDF export depends on unpackaged pyppeteer
+make_check_args="-m not(network) -k not(test_webpdf_without_chromium)"
 hostmakedepends="python3-setuptools"
 depends="python3-mistune python3-Jinja2 python3-jupyterlab_pygments
  python3-nbclient python3-jupyter_core python3-entrypoints python3-testpath
- python3-bleach python3-pandocfilters python3-defusedxml"
+ python3-bleach python3-pandocfilters python3-defusedxml
+ python3-BeautifulSoup4"
 checkdepends="python3-pytest python3-ipython_ipykernel
  python3-jupyter_ipywidgets python3-Pebble pandoc inkscape $depends"
 short_desc="Converting Jupyter notebooks"
@@ -15,14 +18,9 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/nbconvert"
 distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz"
-checksum=cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002
+checksum=21163a8e2073c07109ca8f398836e45efdba2aacea68d6f75a8a545fef070d4e
 conflicts="python-jupyter_nbconvert<=5.4.1_2"
 
-do_check() {
-	# WebPDF export depends on unpackaged pyppeteer
-	python3 -m pytest -k 'not TestWebPDFExporter and not test_webpdf_with_chromium'
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 992bfcfd962ff98113c4890eb852c2d1125c08bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:41 -0300
Subject: [PATCH 1191/2561] python3-jupyter_notebook: update to 6.4.10.

---
 srcpkgs/python3-jupyter_notebook/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
index ca9e1d43df21..d7e7230fdf93 100644
--- a/srcpkgs/python3-jupyter_notebook/template
+++ b/srcpkgs/python3-jupyter_notebook/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_notebook'
 pkgname=python3-jupyter_notebook
-version=6.3.0
-revision=2
+version=6.4.10
+revision=1
 wrksrc="notebook-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -15,7 +15,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org/"
 distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz"
-checksum=cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d
+checksum=2408a76bc6289283a8eecfca67e298ec83c67db51a4c2e1b713dd180bb39e90e
 conflicts="python-jupyter_notebook<=5.7.0_2"
 # Tests require unpackaged selenium
 make_check=no

From 3c14b79c3d326c5d843bfd1c6419873648e0ac6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:57:15 -0300
Subject: [PATCH 1192/2561] python3-Jinja2: update to 3.1.1.

This update was reverted earlier (3d6eb58) because of an incompatibility
with nbconvert-6.0.7 which is fixed in current nbconvert-6.4.5.
---
 srcpkgs/python3-Jinja2/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index 6a4c28214cca..5fbc7ee2fa87 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,7 +1,6 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-reverts="3.1.1_1"
-version=3.0.3
+version=3.1.1
 revision=2
 wrksrc="Jinja2-${version}"
 build_style=python3-module
@@ -14,7 +13,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
+checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
 
 post_install() {
 	vlicense LICENSE.rst

From 1fd79929b6b650d11b1d65f837a60f01cda13a69 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 10 Apr 2022 17:32:13 -0400
Subject: [PATCH 1193/2561] qwt: update to 6.2.0.

---
 common/shlibs        | 2 +-
 srcpkgs/qwt/template | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 673c62085f5b..0ac24701898d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1981,7 +1981,7 @@ libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
 libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
-libqwt.so.6 qwt-6.1.3_1
+libqwt.so.6.2 qwt-6.2.0_1
 liblxqt-qt5.so.0 liblxqt-0.8.0_1
 liblxqt-globalkeys-qt5.so.0 lxqt-globalkeys-0.8.0_1
 liblxqt-globalkeys-ui-qt5.so.0 lxqt-globalkeys-0.8.0_1
diff --git a/srcpkgs/qwt/template b/srcpkgs/qwt/template
index f03bbd1af605..b5fdae7aa7fd 100644
--- a/srcpkgs/qwt/template
+++ b/srcpkgs/qwt/template
@@ -1,6 +1,6 @@
 # Template file for 'qwt'
 pkgname=qwt
-version=6.1.5
+version=6.2.0
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="LGPL-2.1-only, Qwt-exception-1.0"
 homepage="https://qwt.sourceforge.io/"
 distfiles="https://sourceforge.net/projects/${pkgname}/files/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=4076de63ec2b5e84379ddfebf27c7b29b8dc9074f3db7e2ca61d11a1d8adc041
+checksum=9194f6513955d0fd7300f67158175064460197abab1a92fa127a67a4b0b71530
 
 post_patch() {
 	vsed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \
@@ -31,6 +31,8 @@ qwt-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
+		vmove usr/lib/qt5
+		vmove usr/lib/pkgconfig
 	}
 }
 
@@ -39,5 +41,6 @@ qwt-doc_package() {
 	short_desc+=" - doc files"
 	pkg_install() {
 		vmove usr/share/doc
+		mv "${PKGDESTDIR}/usr/share/doc/qwt/man" "${PKGDESTDIR}/usr/share"
 	}
 }

From f220cad984d3c4abb1589ea42569796f7548f69e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 10 Apr 2022 17:35:00 -0400
Subject: [PATCH 1194/2561] linssid: rebuild for qwt

---
 srcpkgs/linssid/patches/project.patch |  6 ++++--
 srcpkgs/linssid/patches/qwt-6.2.patch | 28 +++++++++++++++++++++++++++
 srcpkgs/linssid/template              |  2 +-
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/linssid/patches/qwt-6.2.patch

diff --git a/srcpkgs/linssid/patches/project.patch b/srcpkgs/linssid/patches/project.patch
index dd03c910c7b1..8adc2028ec41 100644
--- a/srcpkgs/linssid/patches/project.patch
+++ b/srcpkgs/linssid/patches/project.patch
@@ -1,8 +1,10 @@
 --- a/linssid-app/linssid-app.pro
 +++ b/linssid-app/linssid-app.pro
-@@ -5,7 +5,7 @@
+@@ -3,9 +3,9 @@
+ TARGET = linssid
+ VERSION = 3.6
  CONFIG -= debug_and_release app_bundle lib_bundle
--CONFIG += release
+-CONFIG += release 
 +CONFIG += release qwt
  PKGCONFIG +=
 -QT = core gui widgets svg
diff --git a/srcpkgs/linssid/patches/qwt-6.2.patch b/srcpkgs/linssid/patches/qwt-6.2.patch
new file mode 100644
index 000000000000..c05221ea6e1a
--- /dev/null
+++ b/srcpkgs/linssid/patches/qwt-6.2.patch
@@ -0,0 +1,28 @@
+--- a/linssid-app/MainForm.cpp
++++ b/linssid-app/MainForm.cpp
+@@ -31,6 +31,7 @@
+ #include <qwt_plot_marker.h>
+ #include <QPointF>
+ #include <qwt_scale_draw.h>
++#include <qwt_text.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+@@ -1036,7 +1037,7 @@
+                     MainForm::cellDataRay[tbi].signal ) );
+             }
+         } else {
+-            MainForm::cellDataRay[tbi].pBandCurve->setSamples(0, 0, 0);
++            MainForm::cellDataRay[tbi].pBandCurve->setSamples(static_cast<double *>(NULL), static_cast<double *>(NULL), 0);
+         }
+         // now the signal history plot
+         int ixStart;
+@@ -1055,7 +1056,7 @@
+                     &(MainForm::cellDataRay[tbi].pHistory->signal[ixStart]), ixLength);
+         } else {
+ 
+-            MainForm::cellDataRay[tbi].pTimeCurve->setSamples(0, 0, 0);
++            MainForm::cellDataRay[tbi].pTimeCurve->setSamples(static_cast<double *>(NULL), static_cast<double *>(NULL), 0);
+         }
+     }
+     MainForm::mainFormWidget.chan24Plot->replot();
diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template
index 3347f193c3e7..937c8a0745e0 100644
--- a/srcpkgs/linssid/template
+++ b/srcpkgs/linssid/template
@@ -1,7 +1,7 @@
 # Template file for 'linssid'
 pkgname=linssid
 version=3.6
-revision=3
+revision=4
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="boost-devel qwt-devel"

From f39f61a1c0b673ecfbd60f501cb3d0fac73797f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 29 Dec 2021 18:36:58 -0300
Subject: [PATCH 1195/2561] libmtp: update to 1.1.19.

Also: use group `plugdev` to grant r/w permission to mtp devices.
---
 srcpkgs/libmtp/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template
index 5bf05cd6bbe3..1114a4d7bb85 100644
--- a/srcpkgs/libmtp/template
+++ b/srcpkgs/libmtp/template
@@ -1,9 +1,10 @@
 # Template file for 'libmtp'
 pkgname=libmtp
-version=1.1.18
+version=1.1.19
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static --with-udev=/usr/lib/udev"
+configure_args="--disable-static --with-udev=/usr/lib/udev
+ --with-udev-group=plugdev"
 hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel libusb-devel"
 short_desc="Library for Microsoft's Media Transfer Protocol (MTP)"
@@ -11,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://libmtp.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0
+checksum=deb4af6f63f5e71215cfa7fb961795262920b4ec6cb4b627f55b30b18aa33228
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX needs host mtp-hotplug

From 51991963b37a6d447a5439b946342c30f87e009f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 10 Apr 2022 21:36:20 -0400
Subject: [PATCH 1196/2561] Revert "python3-Jinja2: update to 3.1.1."

Removal of jinja2.Markup still breaks salt; back to 3.0.3 *again*.

This reverts commit 5369dc2b4869326e36a8c6ba6e3c36f8c8ba2c6a.
---
 srcpkgs/python3-Jinja2/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index 5fbc7ee2fa87..fb6d7e585a92 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,7 +1,8 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-version=3.1.1
-revision=2
+reverts="3.1.1_1 3.1.1_2"
+version=3.0.3
+revision=3
 wrksrc="Jinja2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +14,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
+checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
 
 post_install() {
 	vlicense LICENSE.rst

From ebf46365c64b6ccf1008fcaf4b916c388f3217f3 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Mon, 11 Apr 2022 09:40:43 +0200
Subject: [PATCH 1197/2561] vscode: update to 1.66.1

+ fix issue with node-gyp compilation, which may also depend on npm
---
 srcpkgs/vscode/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 0b9efda224d0..3e3956fa5644 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.66.0
+version=1.66.1
 revision=1
 _electronver=13.6.7
 _npmver=8.6.0
@@ -11,8 +11,8 @@ short_desc="Microsoft Code for Linux"
 maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
-distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7
+distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz"
+checksum=243a25d7214ceba5abf510dc890c64a8cc36ccacd97f4b8c666b8b7bab9c5a28
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -38,6 +38,9 @@ do_configure() {
 }
 
 do_build() {
+	# Update to a more recent npm version to fix some issues
+	npm install -g npm@${_npmver}
+
 	# The default memory limit may be too low for current versions of node
 	# to successfully build vscode.  This sets it to 4GB, but
 	# change this number if it still doesn't work for your system.
@@ -48,8 +51,7 @@ do_build() {
 	--target=$_electronver \
 	--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
 
-	npm install -g npm@${_npmver} && \
-		yarn install --ignore-engines --arch=x64
+	yarn install --ignore-engines --arch=x64
 
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min

From bc54b168f6d4e7f4bcba98ffdff46bef38ea62b4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 19 Feb 2022 10:51:01 +0100
Subject: [PATCH 1198/2561] New package: cocogitto-5.0.1

---
 srcpkgs/cocogitto/template | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 srcpkgs/cocogitto/template

diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
new file mode 100644
index 000000000000..79a78e4b5971
--- /dev/null
+++ b/srcpkgs/cocogitto/template
@@ -0,0 +1,34 @@
+# Template file for 'cocogitto'
+pkgname=cocogitto
+version=5.0.1
+revision=1
+build_style=cargo
+build_helper=qemu
+hostmakedepends="pkg-config"
+makedepends="libgit2-devel"
+short_desc="Conventional Commits toolbox"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MIT"
+homepage="https://github.com/cocogitto/cocogitto"
+changelog="https://github.com/cocogitto/cocogitto/blob/main/CHANGELOG.md"
+distfiles="https://github.com/cocogitto/cocogitto/archive/${version}.tar.gz"
+checksum=fee00736ec4b8ce72c8d8f904d0b734372b11ce7c3711166814eca38bf0cda8f
+# Test suite is not atomic, relies on user environment such as git user configuration
+make_check=no
+
+post_build() {
+	TARGET_DIR="target/${RUST_TARGET}/release"
+
+	for shell in bash zsh fish; do
+		vtargetrun ${TARGET_DIR}/cog generate-completions ${shell} > cog.${shell}
+	done
+}
+
+post_install() {
+	vlicense LICENSE
+	vdoc README.md
+
+	for shell in bash zsh fish; do
+		vcompletion cog.${shell} ${shell} cog
+	done
+}

From 0d5220540225d801d9f83459375e442b74284e3f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:31 +0200
Subject: [PATCH 1199/2561] certbot: update to 1.26.0.

---
 srcpkgs/certbot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index aa8de157d59b..a6eea0f1837f 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.25.0
+version=1.26.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=9633d21051fe7fd076d64cb41963de61d300d7c30f4b491c8d18cb8306357509
+checksum=9d136fab6968829db9774a264a96a7923a5482d0c90894b009253f374d480693

From b2602837cd301e28ca7f282126e348ba1492e331 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:33 +0200
Subject: [PATCH 1200/2561] certbot-apache: update to 1.26.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 1f5c098c802d..50396f46779e 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.25.0
+version=1.26.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=91dbd326c5ee4fe7a2ef5f1c3c525863a7f4ed5f228e1c7c10048d18fe18d0a1
+checksum=efb573a1fd926ecf74618286d21ac3f7539b2be426face7f1364dcca8b0e316e

From 4ee5c82adf0572faaeb163c90f3e18ea73076dc4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:36 +0200
Subject: [PATCH 1201/2561] certbot-nginx: update to 1.26.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 b635785e5d0a..b9df8e8b1c90 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.25.0
+version=1.26.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=433a7237e841c462a67f9195fb7d7711ac6ed6d27bedb981c71238ef5348d62b
+checksum=c9f2ee27dfb98525e507f516f8c1cd37a5b61f3090bcf64284fee95cfcf6ab10

From 42ce65eec05a522836f38dbdb3221627a418feda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:40 +0200
Subject: [PATCH 1202/2561] python3-acme: update to 1.26.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 19e374d105a8..ab158b8dccc8 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.25.0
+version=1.26.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=e3fbe36fcfa27ec46f450369498f3486370ab53a0fd7db91557a23d58b3969fa
+checksum=7269209192189c5b0bd5bc69388229737e23e52e8422315e2fcd3aff4c8e13c8

From 35513d2d0f15e5186507279ff2c0c5c518189c1c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Apr 2022 16:38:22 +0200
Subject: [PATCH 1203/2561] minify: update to 2.11.1.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 198a6c4ab9e8..7131527fa009 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.10.0
+version=2.11.1
 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=a26c531d5071c6bd5d2300b4906fd2c7e227a19c23549219ccfae2c20114c60e
+checksum=f238ffcb9ed6ff3c413442e3c5bfe9409809cc3de67db29ebc541d83168a09ea
 
 post_install() {
 	vlicense LICENSE

From 6e4b6b82b59e0507c498ef99d254d7066ae4293a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Apr 2022 16:47:02 +0200
Subject: [PATCH 1204/2561] perl-Config-General: update to 2.65.

---
 srcpkgs/perl-Config-General/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/perl-Config-General/template b/srcpkgs/perl-Config-General/template
index b1162c8191c0..97eacd23613b 100644
--- a/srcpkgs/perl-Config-General/template
+++ b/srcpkgs/perl-Config-General/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Config-General'
 pkgname=perl-Config-General
-version=2.63
-revision=3
+version=2.65
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Config::General - Generic Config Module"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Artistic-1.0-Perl, GPL-1.0-or-later"
+license="Artistic-2.0"
 homepage="https://metacpan.org/release/Config-General"
 distfiles="${CPAN_SITE}/Config/${pkgname/perl-/}-$version.tar.gz"
-checksum=0a9bf977b8aabe76343e88095d2296c8a422410fd2a05a1901f2b20e2e1f6fad
+checksum=4d6d5754be3a9f30906836f0cc10e554c8832e14e7a1341efb15b05d706fc58f

From 64984f7633d012fd1d2054ffc6e017fe4addd629 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 11 Apr 2022 10:01:49 -0400
Subject: [PATCH 1205/2561] greetd: set shell for agreety, change default vt

---
 srcpkgs/greetd/patches/change-default-vt.patch | 13 +++++++++++++
 srcpkgs/greetd/patches/fix-shell.patch         | 17 +++++++++++++++++
 srcpkgs/greetd/template                        |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/greetd/patches/change-default-vt.patch
 create mode 100644 srcpkgs/greetd/patches/fix-shell.patch

diff --git a/srcpkgs/greetd/patches/change-default-vt.patch b/srcpkgs/greetd/patches/change-default-vt.patch
new file mode 100644
index 000000000000..3dad61740587
--- /dev/null
+++ b/srcpkgs/greetd/patches/change-default-vt.patch
@@ -0,0 +1,13 @@
+diff --git a/config.toml b/config.toml
+index 3768a6e315..2a933309b4 100644
+--- a/config.toml
++++ b/config.toml
+@@ -1,7 +1,7 @@
+ [terminal]
+ # The VT to run the greeter on. Can be "next", "current" or a number
+ # designating the VT.
+-vt = 1
++vt = 7
+ 
+ # The default session, also known as the greeter.
+ [default_session]
diff --git a/srcpkgs/greetd/patches/fix-shell.patch b/srcpkgs/greetd/patches/fix-shell.patch
new file mode 100644
index 000000000000..fbe416cbed8d
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-shell.patch
@@ -0,0 +1,17 @@
+# $SHELL is not set, use /bin/sh because it's available
+diff --git a/config.toml b/config.toml
+index 3768a6e..c323af2 100644
+--- a/config.toml
++++ b/config.toml
+@@ -6,9 +6,9 @@ vt = 1
+ # The default session, also known as the greeter.
+ [default_session]
+ 
+-# `agreety` is the bundled agetty/login-lookalike. You can replace `$SHELL`
++# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh`
+ # with whatever you want started, such as `sway`.
+-command = "agreety --cmd $SHELL"
++command = "agreety --cmd /bin/sh"
+ 
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
index cf5f3c400b0c..0f5e9c88f501 100644
--- a/srcpkgs/greetd/template
+++ b/srcpkgs/greetd/template
@@ -1,7 +1,7 @@
 # Template file for 'greetd'
 pkgname=greetd
 version=0.8.0
-revision=1
+revision=2
 build_style=cargo
 conf_files="/etc/greetd/config.toml"
 hostmakedepends="pkg-config scdoc"

From 9f519c8b6386f67d55deee6d7e5766aecdf4a5d9 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 3 Apr 2022 22:33:58 +0530
Subject: [PATCH 1206/2561] Waybar: update to 0.9.12

---
 srcpkgs/Waybar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index c6470c6d330d..fd4fb7928d0d 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,6 +1,6 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.9
+version=0.9.12
 revision=1
 _date_version=3.0.0
 build_style=meson
@@ -29,7 +29,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="23a94538538f43a6db4c1c5f7e09e75ab743ded1ccfc737e1f3e0971fe4cdd87
+checksum="1f3f6692de99567c43939e7ad2e96f8c6a5ef83f760ad6f77865e46a3c6811d6
  87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
  6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
 

From 0118fa23389af7cdbd0310894e6a441529eac619 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:40:10 +0200
Subject: [PATCH 1207/2561] chatterino2: update to 2.3.5.

---
 srcpkgs/chatterino2/template | 25 +++++++++++--------------
 srcpkgs/chatterino2/update   |  2 ++
 2 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/chatterino2/update

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 7bf7d6a37d04..977fa9771498 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,19 +1,19 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.3.4
+version=2.3.5
 revision=1
-_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_libcommuni_commit="a7b32cd6fa0640721b6114b31d37d79ebf832411"
 _serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
-_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
-_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
-_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_settings_commit="04792d853c7f83c9d7ab4df00279442a658d3be3"
+_signals_commit="25e4ec3b8d6ea94a5e65a26e7cfcbbce3b87c5d6"
 _sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
 create_wrksrc=yes
 build_wrksrc="chatterino2-${version}"
 build_style=cmake
+configure_args="-DUSE_SYSTEM_QTKEYCHAIN=ON"
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
- boost-devel openssl-devel rapidjson websocketpp"
+ qtkeychain-qt5-devel boost-devel openssl-devel rapidjson websocketpp"
 depends="qt5-imageformats qt5-svg"
 short_desc="Chat client for twitch.tv"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -25,14 +25,12 @@ distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${versio
  https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
  https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
- https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
  https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
-checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
- ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+checksum="f1fff3523f5a3f633430d44f7ca6c6c718a515258d50004a855e69e4aa989b4e
+ d6fd560851357d1e52f93604314215c75b291104e054c84a16c34d7d83d40f14
  d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
- 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
- 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
- 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ 702e97d8f2fcaec65256e6f691c3ed055924430ce64b29ebe74f3769a9d50d71
+ ae098841b0f33079366eff8bc44fe3f2f2f65e70259c1cc9ff8d727c4edf974c
  f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -46,12 +44,11 @@ post_extract() {
 	rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \
 	      ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \
 	      ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \
-	      ${build_wrksrc}/lib/qtkeychain ${build_wrksrc}/cmake/sanitizers-cmake
+	      ${build_wrksrc}/cmake/sanitizers-cmake
 	mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni"
 	mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize"
 	mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings"
 	mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals"
-	mv "qtkeychain-${_qtkeychain_commit}" "${build_wrksrc}/lib/qtkeychain"
 	mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake"
 }
 
diff --git a/srcpkgs/chatterino2/update b/srcpkgs/chatterino2/update
new file mode 100644
index 000000000000..16563536cb32
--- /dev/null
+++ b/srcpkgs/chatterino2/update
@@ -0,0 +1,2 @@
+site="https://github.com/Chatterino/chatterino2/releases"
+pattern="v\K[0-9.]+(?=\.tar\.gz)"

From 0571862809b92ddfa40a8483fe9db26ae86a7809 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:22:52 +0200
Subject: [PATCH 1208/2561] arc-theme: update to 20220405.

---
 srcpkgs/arc-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template
index 4839b87942fe..86b487ffa9aa 100644
--- a/srcpkgs/arc-theme/template
+++ b/srcpkgs/arc-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'arc-theme'
 pkgname=arc-theme
-version=20220223
+version=20220405
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config gnome-shell sassc inkscape cinnamon"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jnsh/arc-theme"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b9a58efc296c3036905b9f8d19518c5c815e5140dd399ad9b81cc17d319a9093
+checksum=657d6cc743facba0f7f56939653b3d0ed4c55b2ce17fef0d050ed32c1aae5f1e

From 60cd63efee050231744c8311122ccda73d63d9d8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 11:38:40 +0100
Subject: [PATCH 1209/2561] protontricks: update to 1.8.1.

---
 srcpkgs/protontricks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 208a55032a36..f7d7182b65ca 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,18 +1,18 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.8.0
+version=1.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-vdf winetricks python3-setuptools"
+checkdepends="$depends"
 short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
 changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d56b53c4ea4286ae20588072433c30193143a75654ea216db389503a63661b09
-make_check=no # no tests in pypi tarball
+checksum=2a2f1349fd7263b4a82b8443f9c423f79ce104697a87e9a53fb2fae21d7ce5ac
 
 post_install() {
 	# Remove `protontricks-desktop-install`, since we

From d6cf680c8286295f63bd84608ddef14ff5553d98 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 10 Apr 2022 14:49:44 -0400
Subject: [PATCH 1210/2561] chezmoi: update to 2.15.1.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 2f0fb2f144bc..bacfc8c9b294 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.15.0
+version=2.15.1
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=d33a5df53bde7b94962c39788e44af41e52a7836bc6d43168c9b324da966996e
+checksum=0100dcf8b70774595f56859e5d1b635319ba584ad7b280946352be328f36d679
 
 export CGO_ENABLED=1
 

From 8d1a54fadf36729f120162d39f8fc37bb9ea38d8 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Thu, 31 Mar 2022 21:48:32 +0200
Subject: [PATCH 1211/2561] aml: update to 0.2.1

---
 srcpkgs/aml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template
index 5c1754fc6d7b..cc0598dfe914 100644
--- a/srcpkgs/aml/template
+++ b/srcpkgs/aml/template
@@ -1,6 +1,6 @@
 # Template file for 'aml'
 pkgname=aml
-version=0.1.0
+version=0.2.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="ISC"
 homepage="https://github.com/any1/aml"
 distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz"
-checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+checksum=c5af3f690b64a7f4dc7141b11f23a4bef190a921f9d71ce70ce0698b5ec58eb0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 2926d37a7364e3bdf41e72b56c6de6bfbc837b05 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Thu, 31 Mar 2022 21:48:50 +0200
Subject: [PATCH 1212/2561] neatvnc: update to 0.4.0

---
 srcpkgs/neatvnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template
index a861c8e63569..8dd902a8cb4c 100644
--- a/srcpkgs/neatvnc/template
+++ b/srcpkgs/neatvnc/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvnc'
 pkgname=neatvnc
-version=0.3.2
+version=0.4.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="ISC"
 homepage="https://github.com/any1/neatvnc"
 distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz"
-checksum=8329354f83bcc654146082a8a9f2d0be4bac5bd8c76b6c31790b7b9c5857e318
+checksum=8a833d488f579e4acf7abb1c7832f8e571bddd6da054e71ed9be3b8396955a81
 
 post_install() {
 	vlicense COPYING

From 82fbb6368ba980cb38be434e8680af7d31674267 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Thu, 31 Mar 2022 21:49:20 +0200
Subject: [PATCH 1213/2561] wayvnc: update to 0.4.1

---
 srcpkgs/wayvnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template
index bf948d97827c..196e986fe9a7 100644
--- a/srcpkgs/wayvnc/template
+++ b/srcpkgs/wayvnc/template
@@ -1,6 +1,6 @@
 # Template file for 'wayvnc'
 pkgname=wayvnc
-version=0.3.1
+version=0.4.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config ninja scdoc wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="ISC"
 homepage="https://github.com/any1/wayvnc"
 distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz"
-checksum=7b68af5bfa5e19352aaa5140e6c2418f90bfe6a949775bd236b06796c56e27f5
+checksum=1813a22644a9043f96a53756bfee68d65f976de8b8f65c86f56782d22286d271
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 3741a31cf3ee693337d96f45d2f4c103b9f32d76 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 8 Apr 2022 23:36:03 +0300
Subject: [PATCH 1214/2561] notcurses: update to 3.0.8.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 9581a8e3de89..724e7b7f2475 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=3.0.7
+version=3.0.8
 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=db461c6ba07a8e3735a51a1d2e706d249ae30436519f543fa5931d414019c770
+checksum=56c33ffe2a2bc4d0b6e3ac14bdf620cf41e3293789135f76825057d0166974fd
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From aafb5382db6513fd0bfb240e0179f431ac6d9a4a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 10 Apr 2022 15:27:41 +0200
Subject: [PATCH 1215/2561] vultr-cli: update to 2.12.2.

---
 srcpkgs/vultr-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index 34e0073e1734..20612aeff1c8 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
-version=2.12.1
+version=2.12.2
 revision=1
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
@@ -8,6 +8,6 @@ short_desc="Official command line tool for Vultr services"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="Apache-2.0"
 homepage="https://github.com/vultr/vultr-cli"
-changelog="https://github.com/vultr/vultr-cli/blob/master/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/vultr/vultr-cli/master/CHANGELOG.md"
 distfiles="https://github.com/vultr/vultr-cli/archive/refs/tags/v${version}.tar.gz"
-checksum=e2a9c7243d48d44f88917cbc241512774f8f2c6e305ef5aaaf026177a2620ae6
+checksum=875a273d573ef53ab3329d3ecd9e3745d7d8963e0b3ff992435fb20881ea49a7

From 5b26daa9dcce8590febf0b651ed5fe6d8e442e21 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 3 Apr 2022 00:58:37 -0400
Subject: [PATCH 1216/2561] hobbits: update to 0.53.1.

---
 srcpkgs/hobbits/patches/backports.patch      | 78 ++++++++++++++++++++
 srcpkgs/hobbits/patches/python_version.patch | 11 ---
 srcpkgs/hobbits/template                     | 39 ++++++++--
 3 files changed, 109 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/hobbits/patches/backports.patch
 delete mode 100644 srcpkgs/hobbits/patches/python_version.patch

diff --git a/srcpkgs/hobbits/patches/backports.patch b/srcpkgs/hobbits/patches/backports.patch
new file mode 100644
index 000000000000..3348b37ae5f2
--- /dev/null
+++ b/srcpkgs/hobbits/patches/backports.patch
@@ -0,0 +1,78 @@
+Backports some changes sent upstream to better support plain cmake builds
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1cc283d..5795a97 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,10 @@ if (UNIX AND NOT APPLE)
+     set(LINUX TRUE)
+ endif()
+ 
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.version")
++if (DEFINED BUILD_VERSION)
++    message("Using build version from command-line")
++    set(VERSION_STRING "${BUILD_VERSION}")
++elseif (EXISTS "${CMAKE_SOURCE_DIR}/.version")
+     message("Getting build version from .version file")
+     file (STRINGS "${CMAKE_SOURCE_DIR}/.version" BUILD_VERSION)
+     string(REGEX REPLACE "\n$" "" BUILD_VERSION "${BUILD_VERSION}")
+@@ -106,7 +143,13 @@ else()
+ 	endif()
+ 
+ 	# PFFFT
+-	find_package(PFFFT REQUIRED)
++	option(USE_SYSTEM_PFFFT "Use a system-provided version of pffft" OFF)
++	if(USE_SYSTEM_PFFFT)
++		message(STATUS "Using system pffft")
++		find_package(PFFFT REQUIRED)
++	else()
++		add_subdirectory(external)
++	endif()
+ 
+ endif()
+ 
+@@ -124,7 +167,7 @@ elseif( MANUAL_PYTHON_PATH )
+ 	set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" )
+ endif()
+ 
+-find_package (Python3 3.9 EXACT COMPONENTS Interpreter Development REQUIRED)
++find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED)
+ message("Python3 Libs: ${Python3_LIBRARIES}")
+ 
+ #
+diff --git a/cmake/PackExternalDeps.cmake b/cmake/PackExternalDeps.cmake
+index 4be07c7..330be03 100644
+--- a/cmake/PackExternalDeps.cmake
++++ b/cmake/PackExternalDeps.cmake
+@@ -145,7 +145,7 @@ endfunction(pack_python)
+ function(pack_pffft)
+ 	install(FILES ${PFFFT_LIBRARIES}
+ 			DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-endfunction(pack_pcap)
++endfunction(pack_pffft)
+ 
+ function(pack_pcap)
+     if (LINUX)
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+new file mode 100644
+index 0000000..ea1c9a3
+--- /dev/null
++++ b/external/CMakeLists.txt
+@@ -0,0 +1,17 @@
++
++# can't assume the target system has the required SIMD instructions
++option(PFFFT_ENABLE_SIMD "Enable SIMD support for pffft" OFF)
++
++message(STATUS "Using bundled pffft")
++add_library(pffft STATIC pffft/pffft.c)
++if(PFFFT_ENABLE_SIMD)
++    message(STATUS "Enabling SIMD support for pffft")
++else()
++    message(STATUS "Disabling SIMD support for pffft")
++    target_compile_definitions(pffft PUBLIC PFFFT_SIMD_DISABLE)
++endif()
++target_compile_options(pffft PUBLIC "${PFFFT_CFLAGS}")
++target_link_libraries(pffft m)
++target_include_directories(pffft INTERFACE pffft)
++
++add_library(PFFFT::PFFFT ALIAS pffft)
diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
deleted file mode 100644
index 47b1490c4b0a..000000000000
--- a/srcpkgs/hobbits/patches/python_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2021-10-07 11:31:22.000000000 -0400
-+++ b/CMakeLists.txt	2021-10-25 21:16:59.429406408 -0400
-@@ -124,7 +124,7 @@
- 	set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" )
- endif()
- 
--find_package (Python3 3.9 EXACT COMPONENTS Interpreter Development REQUIRED)
-+find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED)
- message("Python3 Libs: ${Python3_LIBRARIES}")
- 
- #
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index fe6c7f5adda7..8260fa1988d0 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,51 @@
 # Template file for 'hobbits'
 pkgname=hobbits
-version=0.52.0
+version=0.53.1
 revision=1
+_pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215
+_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
+create_wrksrc=yes
+build_wrksrc="hobbits-${version}"
 build_style=cmake
+configure_args="-DBUILD_VERSION=${version} $(vopt_bool simd PFFFT_ENABLE_SIMD)"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake python3"
-makedepends="fftw-devel libusb-devel libpcap-devel python3-devel qt5-devel"
+makedepends="libusb-devel libpcap-devel python3-devel qt5-devel"
 short_desc="Multi-platform GUI for bit-based analysis, processing and visualization"
 maintainer="classabbyamp <void@placeviolette.net>"
-license="MIT, GPL-2.0-or-later"
+license="MIT, custom:FFTPACK"
 homepage="https://mahlet-inc.github.io"
 changelog="https://raw.githubusercontent.com/Mahlet-Inc/hobbits/master/CHANGELOG.md"
-distfiles="https://github.com/Mahlet-Inc/hobbits/archive/refs/tags/v${version}.tar.gz"
-checksum=3332e02380ab46649f0ec2066b63b6e0fb04b55cdca973d28880f1607ebbf27e
+distfiles="https://github.com/Mahlet-Inc/hobbits/archive/refs/tags/v${version}.tar.gz
+ https://bitbucket.org/jpommier/pffft/get/${_pffft_commit}.tar.gz"
+checksum="e63c51228c3f00f56a2ebf79fec1975544b1c6c986d58dff69643da46148316b
+ @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8"
+patch_args="-Np1 --directory=${build_wrksrc}"
+
+build_options="simd"
+desc_option_simd="Enable SIMD support (SSE, Altivec, or NEON)"
+
+# by default, don't use SIMD on unsupported platforms
+# SSE, Altivec, or NEON support is needed to enable this
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*|ppc64*|x86_64*) build_options_default="simd"
+esac
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
 esac
 
-pre_configure() {
-	# upstream provides no way to set the version through configure_args
-	echo "${version}" > .version
+post_extract() {
+	# until upstream merges Mahlet-Inc/hobbits#143 and releases a new version,
+	# the directory must be added, instead of removing the submodule
+	# rm -rf ${build_wrksrc}/external/pffft
+	mkdir ${build_wrksrc}/external
+	mv ${_pffft_dir} ${build_wrksrc}/external/pffft
 }
 
 post_install() {
 	vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
+	# capture the FFTPACK license from the header comment of pffft.c
+	sed -E '/\*\//,$d; 1s/\/\* //; s/^[[:blank:]]+//' external/pffft/pffft.c > LICENSE.pffft
+	vlicense LICENSE.pffft
 	vlicense LICENSE.txt
 }

From 9d905a30d7abb63bbffc1e48f1c16fdf4378a95b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Apr 2022 00:05:11 +0200
Subject: [PATCH 1217/2561] onefetch: broken on big endian

---
 srcpkgs/onefetch/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index 1eda291b053f..82a46672d356 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -10,6 +10,10 @@ homepage="https://github.com/o2sh/onefetch"
 distfiles="https://github.com/o2sh/onefetch/archive/v${version}.tar.gz"
 checksum=f57b16dfa2bb95dd1fb805257a1761baa20d69eb9ce7c311d369609894c53897
 
+if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
+	broken="exr crate unimplemented for BE"
+fi
+
 post_install() {
 	vlicense LICENSE.md
 }

From 4b5b242fe98391ee507fcdedb369e3b3ba67ce2f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Apr 2022 17:37:16 +0200
Subject: [PATCH 1218/2561] ruby: update to 3.1.2.

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 85524a7796b2..4c62a19620d0 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -2,7 +2,7 @@
 _ruby_abiver=3.1.0
 
 pkgname=ruby
-version=3.1.1
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
@@ -16,7 +16,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.xz"
-checksum=7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa
+checksum=ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally

From eb940c82cf8a48a16a95a49d261638882b83c2ea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Apr 2022 19:39:32 +0200
Subject: [PATCH 1219/2561] yj: update to 5.1.0.

---
 srcpkgs/yj/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index 895e663988d1..395a2c6b15b9 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,13 +1,13 @@
 # Template file for 'yj'
 pkgname=yj
-version=5.0.0
+version=5.1.0
 revision=1
 build_style=go
-go_import_path="github.com/sclevine/yj"
+go_import_path="github.com/sclevine/yj/v${version%%.*}"
 hostmakedepends="git"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/sclevine/yj"
 distfiles="https://github.com/sclevine/yj/archive/v${version}.tar.gz"
-checksum=df9a4f5b6d067842ea3da68ff92c374b98560dce1086337d39963a1346120574
+checksum=9a3e9895181d1cbd436a1b02ccf47579afacd181c73f341e697a8fe74f74f99d

From 83ab5191c8816141d0d94c7d03bdd1727ded913d Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Fri, 8 Apr 2022 02:18:39 +0300
Subject: [PATCH 1220/2561] pcsc-tools: update to 1.6.0.

---
 srcpkgs/pcsc-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsc-tools/template b/srcpkgs/pcsc-tools/template
index 0825d36dd719..b29c25b70ce1 100644
--- a/srcpkgs/pcsc-tools/template
+++ b/srcpkgs/pcsc-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsc-tools'
 pkgname=pcsc-tools
-version=1.5.8
+version=1.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ludovic.rousseau.free.fr/softwares/pcsc-tools"
 distfiles="http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=87c1edbdb8c9735063f688aa3e05e3893a88e78b322dc69af80757ed90282212
+checksum=651c8dd74bcb33db4c16935ce5d80dd1aa6eb20ba9d5c4b9631a098326ef8b9f

From b190724b7eac9a2c61bf9e533d8693bcff9d10af Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 12 Apr 2022 01:27:48 -0400
Subject: [PATCH 1221/2561] dbeaver: force jdk11 regardless of alternatives
 setting

fixes #34857
---
 srcpkgs/dbeaver/patches/force-jdk11.patch | 11 +++++++++++
 srcpkgs/dbeaver/template                  |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dbeaver/patches/force-jdk11.patch

diff --git a/srcpkgs/dbeaver/patches/force-jdk11.patch b/srcpkgs/dbeaver/patches/force-jdk11.patch
new file mode 100644
index 000000000000..47290b3e8639
--- /dev/null
+++ b/srcpkgs/dbeaver/patches/force-jdk11.patch
@@ -0,0 +1,11 @@
+--- a/product/community/DBeaver.product
++++ b/product/community/DBeaver.product
+@@ -9,7 +9,7 @@
+     </configIni>
+ 
+     <launcherArgs>
+-        <programArgs></programArgs>
++        <programArgs>-vm /usr/lib/jvm/openjdk11/bin</programArgs>
+         <programArgsMac>-vm ../Eclipse/jre/Contents/Home/bin/java</programArgsMac>
+ 
+         <vmArgs>-XX:+IgnoreUnrecognizedVMOptions --add-modules=ALL-SYSTEM -Dosgi.requiredJavaVersion=11 -Xms64m -Xmx1024m</vmArgs>
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 276af8802424..74a67e77e4f6 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,7 +1,7 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
 version=22.0.1
-revision=1
+revision=2
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
 hostmakedepends="apache-maven"

From aee4280221f840028bbdaa366cba3647ecb09651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 12 Apr 2022 00:00:38 -0300
Subject: [PATCH 1222/2561] iperf: update to 2.1.7.

---
 .../iperf/patches/fix-gettcpinfo-musl.patch   | 20 -------------
 .../patches/reorder-includes-for-musl.patch   | 28 -------------------
 srcpkgs/iperf/template                        | 12 ++++++--
 3 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
 delete mode 100644 srcpkgs/iperf/patches/reorder-includes-for-musl.patch

diff --git a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch b/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
deleted file mode 100644
index 71d8abf70585..000000000000
--- a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-It seems there was a broken commit meant to fix compilation on win32,
-but this broke compilation on musl.
-
-See:
-
-https://sourceforge.net/p/iperf2/code/ci/c8f861a0a07b0606a581f2658c71959ad9417923/
-
-for the broken commit. The current patch fixes that by completing the
-definition of gettcpinfo() to what it was before the broken commit.
-
---- a/compat/gettcpinfo.c	2021-12-05 17:49:56.000000000 -0300
-+++ b/compat/gettcpinfo.c	2021-12-11 19:29:24.850947483 -0300
-@@ -99,4 +99,7 @@
- };
- #else
- inline void gettcpinfo (int sock, struct ReportStruct *sample) {
-+    sample->tcpstats.rtt = 1;
-+    sample->tcpstats.isValid  = false;
-+};
- #endif
diff --git a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch b/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
deleted file mode 100644
index 066620c8666c..000000000000
--- a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Change order of includes to fix compilation with musl libc
-
---- a/include/headers.h	2021-08-16 14:27:51.000000000 -0300
-+++ b/include/headers.h	2021-10-01 23:42:09.471528972 -0300
-@@ -106,11 +106,6 @@
- #include <net/if.h>
- #endif
- 
--#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
--#include <linux/if_tun.h>
--#include <sys/ioctl.h>
--#endif
--
- 
- // AF_PACKET HEADERS
- #if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_AF_PACKET)
-@@ -146,6 +141,11 @@
- #define  IPV6HDRLEN 40
- #endif // HAVE_AF_PACKET
- 
-+#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
-+#include <linux/if_tun.h>
-+#include <sys/ioctl.h>
-+#endif
-+
- #ifdef WIN32
- 
- /* Windows config file */
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index 555b5670914f..7157ebba77cd 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -1,6 +1,6 @@
 # Template file for 'iperf'
 pkgname=iperf
-version=2.1.6
+version=2.1.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-multicast --enable-threads
@@ -9,8 +9,16 @@ short_desc="Perform network throughput tests"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="NCSA"
 homepage="https://iperf.fr/"
+changelog="https://sourceforge.net/p/iperf2/code/ci/master/tree/doc/RELEASE_NOTES?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
-checksum=4a43e44439b95622aebeee55754a17d1c94076032e90620dfc1ab9908cb9e080
+checksum=1aba2e1d7aa43641ef841951ed88e16cffba898460e0c51e6b2806f3ff20e9d4
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	# do not define struct ethhdr in <linux/if_ether.h> to avoid
+	# redefinition in <netinet/if_ether.h>
+	CFLAGS="-D__UAPI_DEF_ETHHDR=0"
+	CXXFLAGS="-D__UAPI_DEF_ETHHDR=0"
+fi
 
 post_install() {
 	vlicense COPYING LICENSE

From fd5b63dd7f1ecf9c3726f7c26a713062f69f6e70 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 12 Apr 2022 03:32:14 +0200
Subject: [PATCH 1223/2561] stagit: update to 1.1.

* take over maintainership
---
 srcpkgs/stagit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index f5828d25ed5c..7e78e61ac80d 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,16 +1,16 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=1.0
+version=1.1
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
 makedepends="libgit2-devel"
 short_desc="Static git page generator"
-maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="MIT"
 homepage="https://codemadness.org/git/stagit/log.html"
 distfiles="https://codemadness.org/releases/stagit/${pkgname}-${version}.tar.gz"
-checksum=10a0e31bb57d6da0dea84728cabed95b8f7d83fde13bb76e0ce18ef71ab68d8f
+checksum=66f6ad1be3d6b6455faf9cfdd29329644b7ff2aa3123fbf1375169c60bda75c5
 LDFLAGS="-lgit2"
 
 post_install() {

From 4928835aedc691120039fd56d222ccc03d9f5c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 11 Apr 2022 17:49:21 -0300
Subject: [PATCH 1224/2561] threejs-sage: make it available as a jupyter
 nbextension

Adds a symlink in /usr/share/jupyter/nbextensions, so that the js is
available in a jupyter notebook.

Otherwise, using 3d plots in the jupyter notebook will hit jsdelivr.net.
---
 srcpkgs/threejs-sage/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/threejs-sage/template b/srcpkgs/threejs-sage/template
index cb5c87a19c12..9cdb0fb3848d 100644
--- a/srcpkgs/threejs-sage/template
+++ b/srcpkgs/threejs-sage/template
@@ -1,7 +1,7 @@
 # Template file for 'threejs-sage'
 pkgname=threejs-sage
 version=r122
-revision=1
+revision=2
 short_desc="Custom build of three.js for sagemath"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="MIT"
@@ -13,4 +13,8 @@ do_install() {
 	vlicense LICENSE
 	vinstall version 644 usr/share/sagemath/threejs-sage
 	vinstall build/three.min.js 644 usr/share/sagemath/threejs-sage/$version
+
+	# make threejs available as a jupyter notebook extension
+	vmkdir usr/share/jupyter/nbextensions
+	ln -s /usr/share/sagemath/threejs-sage ${DESTDIR}/usr/share/jupyter/nbextensions
 }

From 5ddcf0fc7792c37e4528685122af0b9d4ec6ece2 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 11 Apr 2022 22:30:18 +0400
Subject: [PATCH 1225/2561] libusb: update to 1.0.26.

---
 .../libusb/patches/late-transfer-free.patch   | 136 ------------------
 srcpkgs/libusb/template                       |   6 +-
 2 files changed, 3 insertions(+), 139 deletions(-)
 delete mode 100644 srcpkgs/libusb/patches/late-transfer-free.patch

diff --git a/srcpkgs/libusb/patches/late-transfer-free.patch b/srcpkgs/libusb/patches/late-transfer-free.patch
deleted file mode 100644
index f4d913bbbd84..000000000000
--- a/srcpkgs/libusb/patches/late-transfer-free.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 010691ff6fdf9fcfaa7f76c1417dfc1f7df124ca Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <bberg@redhat.com>
-Date: Tue, 15 Feb 2022 11:13:41 +0100
-Subject: [PATCH] io: Track device in usbi_transfer
-
-transfer->dev_handle currently has the behaviour that it will be unset
-if the device is closed. The sync API uses this fact to catch an error
-case.
-
-In other cases, transfer->dev_handle will keep its value, which means
-that if the transfer lives longer than the device handle, the pointer
-becomes invalid.
-
-The transfer does however keep a reference to the device, which owns the
-pointer to the context. As such, we can track this reference internal to
-the transfer, and it is set while the transfer is in-flight.
-
-With this, switch the logging infrastructure to use itransfer->dev->ctx
-while checking that itransfer->dev is non-NULL.
-
-Note that this was a regression caused by 6cae9c6dbd74 ("core: update
-usbi_dbg to take the context as an argument"), specifically when
-resolving the context while freeing a transfer after closing a device.
-
-Note that the transfer will now keep a reference to the device until it
-is free'ed. This allows it to use the correct context for logging even
-in libusb_free_transfer.
-
-The alternative to all this would be to just explicitly pass NULL to the
-log handler in libusb_free_transfer.
-
-Closes: #1038
----
- libusb/io.c      | 20 ++++++++++++--------
- libusb/libusbi.h | 11 ++++++++---
- 2 files changed, 20 insertions(+), 11 deletions(-)
-
-diff --git a/libusb/io.c b/libusb/io.c
-index 0d2ac9ea..b919e9d9 100644
---- a/libusb/io.c
-+++ b/libusb/io.c
-@@ -1344,6 +1344,8 @@ void API_EXPORTED libusb_free_transfer(struct libusb_transfer *transfer)
- 
- 	itransfer = LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
- 	usbi_mutex_destroy(&itransfer->lock);
-+	if (itransfer->dev)
-+		libusb_unref_device(itransfer->dev);
- 
- 	priv_size = PTR_ALIGN(usbi_backend.transfer_priv_size);
- 	ptr = (unsigned char *)itransfer - priv_size;
-@@ -1489,9 +1491,15 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
- {
- 	struct usbi_transfer *itransfer =
- 		LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
--	struct libusb_context *ctx = TRANSFER_CTX(transfer);
-+	struct libusb_context *ctx;
- 	int r;
- 
-+	assert(transfer->dev_handle);
-+	if (itransfer->dev)
-+		libusb_unref_device(itransfer->dev);
-+	itransfer->dev = libusb_ref_device(transfer->dev_handle->dev);
-+
-+	ctx = HANDLE_CTX(transfer->dev_handle);
- 	usbi_dbg(ctx, "transfer %p", transfer);
- 
- 	/*
-@@ -1551,8 +1559,6 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
- 	r = usbi_backend.submit_transfer(itransfer);
- 	if (r == LIBUSB_SUCCESS) {
- 		itransfer->state_flags |= USBI_TRANSFER_IN_FLIGHT;
--		/* keep a reference to this device */
--		libusb_ref_device(transfer->dev_handle->dev);
- 	}
- 	usbi_mutex_unlock(&itransfer->lock);
- 
-@@ -1659,7 +1665,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
- {
- 	struct libusb_transfer *transfer =
- 		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
--	struct libusb_device_handle *dev_handle = transfer->dev_handle;
- 	struct libusb_context *ctx = ITRANSFER_CTX(itransfer);
- 	uint8_t flags;
- 	int r;
-@@ -1693,7 +1698,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
- 	 * this point. */
- 	if (flags & LIBUSB_TRANSFER_FREE_TRANSFER)
- 		libusb_free_transfer(transfer);
--	libusb_unref_device(dev_handle->dev);
- 	return r;
- }
- 
-@@ -1727,10 +1731,10 @@ int usbi_handle_transfer_cancellation(struct usbi_transfer *itransfer)
-  * function will be called the next time an event handler runs. */
- void usbi_signal_transfer_completion(struct usbi_transfer *itransfer)
- {
--	libusb_device_handle *dev_handle = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)->dev_handle;
-+	struct libusb_device *dev = itransfer->dev;
- 
--	if (dev_handle) {
--		struct libusb_context *ctx = HANDLE_CTX(dev_handle);
-+	if (dev) {
-+		struct libusb_context *ctx = DEVICE_CTX(dev);
- 		unsigned int event_flags;
- 
- 		usbi_mutex_lock(&ctx->event_data_lock);
-diff --git a/libusb/libusbi.h b/libusb/libusbi.h
-index 158a9af5..7618236f 100644
---- a/libusb/libusbi.h
-+++ b/libusb/libusbi.h
-@@ -329,10 +329,11 @@ void usbi_log(struct libusb_context *ctx, enum libusb_log_level level,
- #endif /* ENABLE_LOGGING */
- 
- #define DEVICE_CTX(dev)		((dev)->ctx)
--#define HANDLE_CTX(handle)	(DEVICE_CTX((handle)->dev))
--#define TRANSFER_CTX(transfer)	(HANDLE_CTX((transfer)->dev_handle))
-+#define HANDLE_CTX(handle)	((handle) ? DEVICE_CTX((handle)->dev) : NULL)
- #define ITRANSFER_CTX(itransfer) \
--	(TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)))
-+	((itransfer)->dev ? DEVICE_CTX((itransfer)->dev) : NULL)
-+#define TRANSFER_CTX(transfer) \
-+	(ITRANSFER_CTX(LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer)))
- 
- #define IS_EPIN(ep)		(0 != ((ep) & LIBUSB_ENDPOINT_IN))
- #define IS_EPOUT(ep)		(!IS_EPIN(ep))
-@@ -562,6 +563,10 @@ struct usbi_transfer {
- 	uint32_t state_flags;   /* Protected by usbi_transfer->lock */
- 	uint32_t timeout_flags; /* Protected by the flying_stransfers_lock */
- 
-+	/* The device reference is held until destruction for logging
-+	 * even after dev_handle is set to NULL.  */
-+	struct libusb_device *dev;
-+
- 	/* this lock is held during libusb_submit_transfer() and
- 	 * libusb_cancel_transfer() (allowing the OS backend to prevent duplicate
- 	 * cancellation, submission-during-cancellation, etc). the OS backend
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 4f192264d4bc..ff718223a773 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,7 +1,7 @@
 # Template file for 'libusb'
 pkgname=libusb
-version=1.0.25
-revision=2
+version=1.0.26
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libusb.info"
 changelog="https://raw.githubusercontent.com/libusb/libusb/master/ChangeLog"
 distfiles="https://github.com/libusb/libusb/releases/download/v${version}/libusb-${version}.tar.bz2"
-checksum=8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849
+checksum=12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5
 
 libusb-devel_package() {
 	short_desc+=" - development files"

From 3e555b37fe11310b6f9364577befabe3f3cd9900 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Mon, 11 Apr 2022 12:14:44 -0600
Subject: [PATCH 1226/2561] yad: update to 11.1

---
 srcpkgs/yad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index 960ed74e8cc6..a9d75e6930e3 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,6 +1,6 @@
 # Template file for 'yad'
 pkgname=yad
-version=11.0
+version=11.1
 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=af20b5a7120ba303ca8845db62c9a7410ae5b5224a3eb3563cd70774a745b9f2
+checksum=ca61d422d6d464d7f473d1e5bd14d3ca05d311ef203f1c67bbea7c23bf0eae2f
 
 pre_configure() {
 	autoreconf -ivf

From a667c22c5b23c9f80bcdff13bddedb38cbd9f7ac Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 10 Apr 2022 23:45:27 -0400
Subject: [PATCH 1227/2561] polybar: update to 3.6.2, adopt.

---
 srcpkgs/polybar/template | 44 +++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index 169724754f55..9a2021d35381 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -1,31 +1,33 @@
 # Template file for 'polybar'
 pkgname=polybar
-version=3.5.7
+version=3.6.2
 revision=1
 build_style=cmake
-configure_args="
- -DENABLE_ALSA=$(vopt_if alsa ON OFF)
- -DENABLE_CURL=$(vopt_if curl ON OFF)
- -DENABLE_I3=$(vopt_if i3 ON OFF)
- -DENABLE_MPD=$(vopt_if mpd ON OFF)
- -DENABLE_NETWORK=$(vopt_if network ON OFF)
- -DENABLE_PULSEAUDIO=$(vopt_if pulseaudio ON OFF)
- -DWITH_XCOMPOSITE=ON"
-hostmakedepends="pkg-config xcb-proto python3 python3-Sphinx"
+configure_args="-DBUILD_CONFIG=OFF -DBUILD_DOC_HTML=OFF
+ $(vopt_bool alsa ENABLE_ALSA)
+ $(vopt_bool curl ENABLE_CURL)
+ $(vopt_bool i3 ENABLE_I3)
+ $(vopt_bool mpd ENABLE_MPD)
+ $(vopt_bool network ENABLE_NETWORK)
+ $(vopt_bool pulseaudio ENABLE_PULSEAUDIO)"
+hostmakedepends="pkg-config xcb-proto python3 python3-Sphinx python3-packaging"
 makedepends="cairo-devel xcb-util-image-devel xcb-util-wm-devel xcb-util-xrm-devel
- zlib-devel xcb-util-renderutil-devel xcb-util-cursor-devel libxcb-devel
+ zlib-devel xcb-util-renderutil-devel xcb-util-cursor-devel libxcb-devel libuv-devel
  $(vopt_if alsa "alsa-lib-devel")
  $(vopt_if curl "libcurl-devel")
  $(vopt_if i3 "i3-devel jsoncpp-devel")
  $(vopt_if mpd "libmpdclient-devel")
- $(vopt_if network "wireless_tools-devel")
+ $(vopt_if network "libnl3-devel")
  $(vopt_if pulseaudio "pulseaudio-devel")"
 short_desc="Fast and easy-to-use status bar"
-maintainer="Michael Carlberg <c@rlberg.se>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://github.com/polybar/polybar"
-distfiles="${homepage}/releases/download/${version}/polybar-${version}.tar.gz"
-checksum=73210e6d74217acb953b253990b4302343b7b6a7870fe1da9a1855daa44123db
+changelog="https://raw.githubusercontent.com/polybar/polybar/master/CHANGELOG.md"
+distfiles="https://github.com/polybar/polybar/releases/download/${version}/polybar-${version}.tar.gz"
+checksum=73becc942e7d2418bc72bd194f2037a2a86792219fd561b663a8509fd5f547a0
+# tries to download and build unstable/unreleased googletest during configure
+make_check=no
 
 build_options="alsa curl i3 mpd network pulseaudio"
 build_options_default="$build_options"
@@ -35,21 +37,13 @@ desc_option_i3="Enable support for i3"
 desc_option_mpd="Enable support for MPD"
 desc_option_network="Enable support for network"
 
-CXXFLAGS="-Wno-error=deprecated-declarations"
-
-if [ "$build_option_network" ]; then
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) CXXFLAGS+=" -D_LINUX_IF_ETHER_H" ;;
-	esac
-fi
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic'"
 fi
 
 post_install() {
-	rm -rf ${DESTDIR}/usr/share/doc/polybar
-	vdoc config
+	rm -r ${DESTDIR}/usr/share/doc/polybar
+	vsconf doc/config.ini
 	vlicense LICENSE
 }

From 040aa7a7bac176c934fc13161aba4664fb659d84 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 00:54:09 +0200
Subject: [PATCH 1228/2561] botan: update to 2.19.1.

drop update file as botan does semver for a long time now

Closes: #34285
Closes: #36646
---
 common/shlibs          |  2 +-
 srcpkgs/botan/template | 10 ++++------
 srcpkgs/botan/update   |  1 -
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0ac24701898d..fc5a031056fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2897,7 +2897,7 @@ libKDb3.so.4 kdb-3.1.0_1
 libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
-libbotan-2.so.16 botan-2.16.0_3
+libbotan-2.so.19 botan-2.19.1_1
 libswipl.so.8 swi-prolog-8.2.4_2
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 282bceabd3ce..65a626714fdf 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,10 +1,9 @@
 # Template file for 'botan'
 pkgname=botan
-version=2.16.0
-revision=4
+version=2.19.1
+revision=1
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
-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++"
@@ -12,11 +11,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://botan.randombit.net/"
 distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
-checksum=92ed6ebc918d86bd1b04221ca518af4cf29cc326c4760740bd2d22e61cea2628
+checksum=e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560
 python_version=3
 
 LDFLAGS="-pthread"
-CXXFLAGS="-O3"
 
 do_configure() {
 	local _args _cpu
@@ -78,7 +76,7 @@ do_configure() {
 }
 
 do_check() {
-	./botan-test
+	make check
 }
 
 post_install() {
diff --git a/srcpkgs/botan/update b/srcpkgs/botan/update
index 04f08c11ede7..e69de29bb2d1 100644
--- a/srcpkgs/botan/update
+++ b/srcpkgs/botan/update
@@ -1 +0,0 @@
-pattern='\K[0-9]+\.[0-9]*[02468]\.[0-9]+'

From def9ac9773d6e0facb60c4d6a898e4f8a8f0dee9 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 00:55:52 +0200
Subject: [PATCH 1229/2561] corectrl: update to 1.2.3.

---
 srcpkgs/corectrl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index 513afe8b595a..ad16c9a8de76 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,6 +1,6 @@
 # Template file for 'corectrl'
 pkgname=corectrl
-version=1.2.2
+version=1.2.3
 revision=1
 wrksrc=${pkgname}-v${version}
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/corectrl/corectrl"
 distfiles="${homepage}/-/archive/v${version}/corectrl-v${version}.tar.gz"
-checksum=ecfbdb3d99974a64fe6fab90f4bb543154ddc7004eeac14ef65b4ae6e661ca57
+checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a760d95112642d152140d3786b6351a250f5218d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 09:53:48 +0200
Subject: [PATCH 1230/2561] qownnotes: update to 22.4.0.

---
 srcpkgs/qownnotes/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index b55900e3023a..db79662ba4bf 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,6 +1,6 @@
 # Template file for 'qownnotes'
 pkgname=qownnotes
-version=21.12.3
+version=22.4.0
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -13,8 +13,8 @@ license="GPL-2.0-only"
 homepage="https://www.qownnotes.org"
 changelog="https://www.qownnotes.org/changelog.html"
 distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz"
-checksum=a92df38f9c88f381af77800c339fe6aa8196a7a260081b0a48f61f1ae4c28029
+checksum=96b682608ecdf303e2c5d5eb2341812db3c3848e15bc4832ba5d426f01bdbd66
 
 pre_build() {
-	sed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
+	vsed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
 }

From ebb3b3f4813ec69fe5f5070f591979a9121f38cc Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 21 Mar 2022 11:18:31 +0000
Subject: [PATCH 1231/2561] libluv: update to 1.43.0.0.

---
 srcpkgs/libluv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index ac7ef54a6ffa..191d877e10fa 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -1,6 +1,6 @@
 # Template file for 'libluv'
 pkgname=libluv
-version=1.41.0.0
+version=1.43.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="4018f293d71c2d75757b64fcdacf982729c9dc8b0bf8eda4015a8818a5a29321
+checksum="567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 

From e1ed1d339fdf3d19eca2ef2f803b069be2a471c5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 17:04:42 +0100
Subject: [PATCH 1232/2561] corectrl: add missing glxinfo dependency

and simplify libatomic handling

By Piraty: distilled from the PR

Closes: #36298 [via git-merge-pr]
---
 srcpkgs/corectrl/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index ad16c9a8de76..0cfa3f792982 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,7 +1,7 @@
 # Template file for 'corectrl'
 pkgname=corectrl
 version=1.2.3
-revision=1
+revision=2
 wrksrc=${pkgname}-v${version}
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake
 kcoreaddons kauth"
 makedepends="botan-devel kauth-devel karchive-devel qt5-charts-devel
 qt5-tools-devel libdrm-devel qt5-svg-devel"
-depends="dbus hicolor-icon-theme qt5-quickcontrols2 qt5-svg"
+depends="dbus hicolor-icon-theme qt5-quickcontrols2 qt5-svg glxinfo"
 short_desc="User-friendly hardware control application"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
@@ -19,6 +19,5 @@ checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	LIBS="-latomic"
 fi

From 4e73cc0b3d1c1394442e21082352e0c5b2b9638d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 12 Apr 2022 21:07:51 +0200
Subject: [PATCH 1233/2561] vscode: update to 1.66.2

---
 srcpkgs/vscode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 3e3956fa5644..6d3b3d72d00c 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.66.1
+version=1.66.2
 revision=1
 _electronver=13.6.7
 _npmver=8.6.0
@@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz"
-checksum=243a25d7214ceba5abf510dc890c64a8cc36ccacd97f4b8c666b8b7bab9c5a28
+checksum=1b70f202b570763e85f67abd8693eeb9c88c6a066a4b579aca5c0c42ecb1b47f
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 65d505f055bc7ef1f1c2e62e73ae66617979fb4d Mon Sep 17 00:00:00 2001
From: vikigenius <master.bvik@gmail.com>
Date: Tue, 12 Apr 2022 10:56:58 -0400
Subject: [PATCH 1234/2561] zola: update to 0.15.3

---
 srcpkgs/zola/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index dcf2a8701cff..460a4b9e4830 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.15.2
+version=0.15.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://raw.githubusercontent.com/getzola/zola/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=9f6b1527e728cef3536e42a18fbc06647b388fb34fc07cc7aca82e44f4fa3447
+checksum=89a590549249e60a01f1a1f66ee23fedc711afd4e9a669ee1328e5c99ea958c8
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 20817a15ed45b1aef2337524dc05c166db738026 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:32:51 +0300
Subject: [PATCH 1235/2561] python3-click-log: fix tests.

---
 srcpkgs/python3-click-log/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-click-log/template b/srcpkgs/python3-click-log/template
index 6f966c248fc9..07f1c5b0eba5 100644
--- a/srcpkgs/python3-click-log/template
+++ b/srcpkgs/python3-click-log/template
@@ -6,6 +6,7 @@ wrksrc="click-log-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Logging integration for Click (Python3)"
 maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="MIT"

From f7597fd84a5caee3866c743c6c430844f06e2eb4 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:33:13 +0300
Subject: [PATCH 1236/2561] python3-click-plugins: fix tests.

---
 srcpkgs/python3-click-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-click-plugins/template b/srcpkgs/python3-click-plugins/template
index 142900633bb6..3fffc0e849fc 100644
--- a/srcpkgs/python3-click-plugins/template
+++ b/srcpkgs/python3-click-plugins/template
@@ -4,9 +4,9 @@ version=1.1.1
 revision=4
 wrksrc="click-plugins-${version}"
 build_style=python3-module
-pycompile_module="click-plugins"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Python3-click module extension to register CLI commands"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-2-Clause"

From 61b26784c0ec24ea5e275c4090d3f7e5fcf788bf Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:33:43 +0300
Subject: [PATCH 1237/2561] python3-click-repl: disable tests.

---
 srcpkgs/python3-click-repl/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/python3-click-repl/template b/srcpkgs/python3-click-repl/template
index b5cf6e495fcb..d4c78ba72332 100644
--- a/srcpkgs/python3-click-repl/template
+++ b/srcpkgs/python3-click-repl/template
@@ -12,6 +12,8 @@ license="MIT"
 homepage="https://github.com/click-contrib/click-repl"
 distfiles="${PYPI_SITE}/c/click-repl/click-repl-${version}.tar.gz"
 checksum=b9f29d52abc4d6059f8e276132a111ab8d94980afe6a5432b9d996544afa95d5
+# The tarball from PyPI has no tests.
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 36bb6bfb91bca0ad3fd2c16bd4a6946d071866a8 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:35:14 +0300
Subject: [PATCH 1238/2561] python3-click-threading: fix tests.

---
 srcpkgs/python3-click-threading/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-click-threading/template b/srcpkgs/python3-click-threading/template
index b639065db3d6..66bd90de3fd8 100644
--- a/srcpkgs/python3-click-threading/template
+++ b/srcpkgs/python3-click-threading/template
@@ -6,6 +6,7 @@ wrksrc="click-threading-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Multithreaded Click apps made easy (Python3)"
 maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="MIT"

From a342199c85810400423fe1a8fe144b4a7af822d1 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:35:25 +0300
Subject: [PATCH 1239/2561] python3-userpath: fix tests.

---
 srcpkgs/python3-userpath/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template
index b557bc2528af..8fc30c9a52f5 100644
--- a/srcpkgs/python3-userpath/template
+++ b/srcpkgs/python3-userpath/template
@@ -4,9 +4,9 @@ version=1.7.0
 revision=2
 wrksrc="userpath-${version}"
 build_style=python3-module
-pycompile_module="userpath"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Cross-platform tool for adding locations to the user PATH"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, Apache-2.0"

From fe36934c77554fca6bbcc7dae71e4ef2baf75555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 13 Apr 2022 20:57:27 +0200
Subject: [PATCH 1240/2561] subversion: update to 1.14.2.

---
 srcpkgs/subversion/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index acf378142fd8..8ad178264942 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion-kwallet-auth".
 #
 pkgname=subversion
-version=1.14.1
-revision=3
+version=1.14.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-javahl --disable-static --config-cache
  --with-gnome-keyring --with-editor=vi --disable-mod-activation
@@ -21,7 +21,7 @@ license="Apache-2.0, BSD-3-Clause"
 homepage="http://subversion.apache.org/"
 changelog="https://subversion.apache.org/docs/release-notes/${version%.*}.html"
 distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
-checksum=2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9
+checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
 
 pre_configure() {
 	# Based on native build values

From d46e2f046c7a42228c6d2374c8ccf70cc102b4ca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 12:52:43 +0200
Subject: [PATCH 1241/2561] gucci: update to 1.5.4.

---
 srcpkgs/gucci/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index a4d816647e74..37773ceba896 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.3
+version=1.5.4
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -10,8 +10,8 @@ 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=f52c12fbf566d42e666618d24258488eac6035a76369c2db4b741fed8792de76
+distfiles="https://github.com/noqcks/gucci/archive/refs/tags/${version}.tar.gz"
+checksum=c6e30e088c341eb6988e2b50fc477deef81882d8a517e130a8eef22c81f32823
 
 post_install() {
 	vlicense LICENSE

From 2032d7bda3b9c0b951b6e25b22c88d2a7f179c9a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 27 Mar 2022 12:30:11 +0300
Subject: [PATCH 1242/2561] rssguard: update to 4.2.1.

Also:
- change build_style to cmake (upstream),
- adjust dependencies.
---
 srcpkgs/rssguard/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index f34e58087176..300f07694c43 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,18 +1,20 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=4.1.2
+version=4.2.1
 revision=1
-build_style=qmake
-configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-tools-devel kdeclarative-devel qt5-multimedia-devel"
+build_style=cmake
+configure_args="-DUSE_WEBENGINE="false""
+hostmakedepends="qt5-host-tools qt5-qmake"
+makedepends="qt5-tools-devel qt5-devel kdeclarative-devel qt5-multimedia-devel
+ qt5-plugin-sqlite qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-mysql
+ qt5-plugin-tds"
 depends="desktop-file-utils qt5-plugin-sqlite"
 short_desc="Simple (yet powerful) Qt5 feed reader"
 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=3e9c6b25cad846aa2047f737d961fe007c88873d9e9772ec8e238908c6f8df95
+checksum=b404e3d8310c58ffb337bf1d2eb2c7cc10a692b00ed2666af30bd0153413cc05
 
 post_install() {
 	# Install rssguard icon manually

From 8cad24b0103c23c65db3ffd9636b2636d25838fb Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 13 Apr 2022 17:43:00 +0200
Subject: [PATCH 1243/2561] setxkbmap: update to 1.3.3.

---
 srcpkgs/setxkbmap/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/setxkbmap/template b/srcpkgs/setxkbmap/template
index 9fafe9eb721d..02a6f5de2452 100644
--- a/srcpkgs/setxkbmap/template
+++ b/srcpkgs/setxkbmap/template
@@ -1,16 +1,16 @@
 # Template file for 'setxkbmap'
 pkgname=setxkbmap
-version=1.3.2
+version=1.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libX11-devel libxkbfile-devel"
+makedepends="libX11-devel libxkbfile-devel libXrandr-devel"
 short_desc="Set the keyboard map using the X Keyboard Extension"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/setxkbmap-${version}.tar.bz2"
-checksum=8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5
+homepage="https://gitlab.freedesktop.org/xorg/app/setxkbmap"
+distfiles="${XORG_SITE}/app/setxkbmap-${version}.tar.xz"
+checksum=b560c678da6930a0da267304fa3a41cc5df39a96a5e23d06f14984c87b6f587b
 
 post_install() {
 	vlicense COPYING

From 6b33e3644220f84194adbbfe14ec3ebe97b25e61 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 3 Apr 2022 16:14:08 +0200
Subject: [PATCH 1244/2561] font-cozette: update to 1.13.0

---
 srcpkgs/font-cozette/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index 7a2e57669380..ad6b3acd0d12 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -1,7 +1,7 @@
 # Template file for 'font-cozette'
 pkgname=font-cozette
-version=1.11.3
-revision=2
+version=1.13.0
+revision=1
 create_wrksrc=yes
 hostmakedepends="font-util bdftopcf"
 depends="font-util"
@@ -9,8 +9,9 @@ short_desc="Bitmap programming font optimized for coziness"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/slavfox/Cozette"
+changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md"
 distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"
-checksum=0976f61ba68b3a261568819bce0b89d43ae2892ad51e5da399dab8a5894cbbc8
+checksum=11590b29856d9ffb2dc6c606009168ea87a3ecde7bcbe9fe542bc34b406c868d
 font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
 
 do_install() {

From a0c2a9e63c0b62d8503027fafbefe7f5ebdb4b64 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 13 Apr 2022 17:38:50 +0200
Subject: [PATCH 1245/2561] cocogitto: update to 5.1.0

---
 srcpkgs/cocogitto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 79a78e4b5971..b20e575819ad 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,6 +1,6 @@
 # Template file for 'cocogitto'
 pkgname=cocogitto
-version=5.0.1
+version=5.1.0
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/cocogitto/cocogitto"
 changelog="https://github.com/cocogitto/cocogitto/blob/main/CHANGELOG.md"
 distfiles="https://github.com/cocogitto/cocogitto/archive/${version}.tar.gz"
-checksum=fee00736ec4b8ce72c8d8f904d0b734372b11ce7c3711166814eca38bf0cda8f
+checksum=662bb909c6468124ad19a90bc07a4f24345167486bd19542375ead7a8f20de02
 # Test suite is not atomic, relies on user environment such as git user configuration
 make_check=no
 

From 4e4c9be4679985a9f0b111ca02d7a9a6f974efdc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 13 Apr 2022 17:45:30 +0200
Subject: [PATCH 1246/2561] zellij: update to 0.28.1

---
 srcpkgs/zellij/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 911ba18464eb..20a338d9103e 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,7 +1,7 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.27.0
-revision=2
+version=0.28.1
+revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
 archs="x86_64* aarch64* i686*"
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://zellij.dev"
 changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz"
-checksum=6159482c25d3cb55b04d23230812f4450e88ff0975161594297a7deef8979a38
+checksum=8c9495e70b1c0179200d6137dd892776c7153b0b54115edf0f39fd732bb62efe
 
 post_build() {
 	ZELLIJ="target/${RUST_TARGET}/release/zellij"

From 57d863a5e1e6c21f3e08d1a45564f855e2d15b7c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 13 Apr 2022 21:12:54 +0200
Subject: [PATCH 1247/2561] github-cli: update to 2.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 e4ed029ac23b..35576bf8ee82 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.5.2
+version=2.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=cbf22fea4574047ca3a356ee4ef629d62b872f4c4ff4e4b78fe4f89ca431858e
+checksum=d4aed3f4325bc518cf4af6fc7989ab35b498e42e8f97ba0e6bb07d7e3b14886a
 
 pre_build() {
 	local _date

From bee6d83b0e80f0195b448ef2bedee05ac8315aea Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Wed, 13 Apr 2022 15:30:35 -0400
Subject: [PATCH 1248/2561] btop: update to 1.2.6.

---
 srcpkgs/btop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/btop/template b/srcpkgs/btop/template
index 4b2064c29e40..3667b71a317a 100644
--- a/srcpkgs/btop/template
+++ b/srcpkgs/btop/template
@@ -1,6 +1,6 @@
 # Template file for 'btop'
 pkgname=btop
-version=1.2.5
+version=1.2.6
 revision=1
 build_style=gnu-makefile
 short_desc="Monitor of resources"
@@ -9,4 +9,4 @@ license="Apache-2.0"
 homepage="https://github.com/aristocratos/btop"
 changelog="https://raw.githubusercontent.com/aristocratos/btop/main/CHANGELOG.md"
 distfiles="https://github.com/aristocratos/btop/archive/refs/tags/v${version}.tar.gz"
-checksum=93ff23276f2c626282037766542543dad5964fb6117c7902c4a4899607f8c95f
+checksum=3631f39c847c884064dd0babf34487a3b8b87a9d61d89aa5185418ffdc4741d8

From 693bdd114546c25412cb98420cd4550cf65d6b7d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 13 Apr 2022 10:32:50 +0200
Subject: [PATCH 1249/2561] mutt: update to 2.2.3.

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 6c0f0d04798b..4c65fcdec66b 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.2.2
+version=2.2.3
 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=10de870cf37646c0b3f5bcf579c3cc2fd9285bda1d04be9ad7c33ec2ee820fcc
+checksum=978addcdab454f447ed7d1de84b5767e714c30714285bf82e4a1745071d18d89
 
 post_install() {
 	# provided by mime-types

From 810ac6f70e285015e7347eeeb2c650e7c3bbf780 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 13 Apr 2022 20:58:41 +0200
Subject: [PATCH 1250/2561] links: update to 2.26

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index 554ef120c0b5..b1b4d5d6629b 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,6 +1,6 @@
 # Template file for 'links'
 pkgname=links
-version=2.25
+version=2.26
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c
+checksum=f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/share/doc/

From 1df18abaf81ed73a04ea87f780a83035cbfe3144 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 13 Apr 2022 20:59:13 +0200
Subject: [PATCH 1251/2561] links-x11: update to 2.26

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 6e37599354ab..83708d05a3cf 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,6 +1,6 @@
 # Template file for 'links-x11'
 pkgname=links-x11
-version=2.25
+version=2.26
 revision=1
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c
+checksum=f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb
 conflicts="links"
 
 post_install() {

From d5ec2a027c740ca2fcb80932d448099619c128db Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:45:24 +0200
Subject: [PATCH 1252/2561] ocaml: update to 4.14.0.

---
 srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 16 ++++++++--------
 srcpkgs/ocaml/template                           |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 333276741c7d..a26f6a639e18 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -18,25 +18,25 @@
          .globl  caml_system__frametable
          .type   caml_system__frametable, @object
  caml_system__frametable:
---- ocaml-4.11.0/configure.ac
-+++ ocaml-4.11.0/configure.ac
+--- ocaml-4.14.0/configure.ac
++++ ocaml-4.14.0/configure.ac
 @@ -1006,7 +1006,7 @@ AS_IF([test $arch != "none" && $arch64 ],
  # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
  
  AS_CASE([$arch],
--  [amd64|s390x|none],
-+  [amd64|s390x|power|none],
+-  [amd64|arm64|s390x|none],
++  [amd64|arm64|s390x|power|none],
      # ocamlopt generates PIC code or doesn't generate code at all
      [],
    [AS_CASE([$host],
---- ocaml-4.11.0/configure
-+++ ocaml-4.11.0/configure
+--- ocaml-4.14.0/configure
++++ ocaml-4.14.0/configure
 @@ -13886,7 +13886,7 @@
  # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
  
  case $arch in #(
--  amd64|s390x|none) :
-+  amd64|s390x|power|none) :
+-  amd64|arm64|s390x|none) :
++  amd64|arm64|s390x|power|none) :
      # ocamlopt generates PIC code or doesn't generate code at all
       ;; #(
    *) :
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 629c13791dfe..7de25d70b827 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml'
 pkgname=ocaml
-version=4.13.1
-revision=2
+version=4.14.0
+revision=1
 build_style="gnu-configure"
 configure_args="--with-pic --libdir=/usr/lib/ocaml"
 make_build_target="world.opt"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="QPL-1.0, LGPL-2.1-only"
 homepage="http://ocaml.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4
+checksum=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8
 nocross=yes
 
 export ASPP="cc -c"

From 37d7e5082b060d26c3219ae28a5e1df4d36da095 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:47:06 +0200
Subject: [PATCH 1253/2561] ocaml-findlib: update to 1.9.3.

---
 srcpkgs/ocaml-findlib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 73cca5a2cafa..04be12e64f51 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
-version=1.9.1
-revision=3
+version=1.9.3
+revision=1
 wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
@@ -12,7 +12,7 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="MIT"
 homepage="http://projects.camlcity.org/projects/findlib.html"
 distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
+checksum=c310fcb62838d9e50f0b6d6c5ceefcbe4fe056f72496950ae7d5c6cdaae2cc41
 nocross=yes
 nopie=yes
 disable_parallel_build=yes

From c8b21b7833b291993a55a396a252bb6013e2f645 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:48:00 +0200
Subject: [PATCH 1254/2561] ocaml-num: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocaml-num/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index bfce4e7baf91..739ffcf5d419 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-num'
 pkgname=ocaml-num
 version=1.4
-revision=3
+revision=4
 wrksrc="num-${version}"
 build_style=gnu-makefile
 make_install_target="findlib-install"

From 43e2dc03dc1ec6ea481524e7d6a89613eec17047 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:49:19 +0200
Subject: [PATCH 1255/2561] ocaml-zarith: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocaml-zarith/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index d6c12772723d..936b5cd3f607 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-zarith'
 pkgname=ocaml-zarith
 version=1.12
-revision=3
+revision=4
 wrksrc="Zarith-release-${version}"
 build_style=configure
 make_check_target="tests"

From 3cfcbe98c07609c1caa3f21c59aa28a850cc3bb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:50:43 +0200
Subject: [PATCH 1256/2561] ocamlbuild: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocamlbuild/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 077d5cc7f632..b1349909f784 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'ocamlbuild'
 pkgname=ocamlbuild
 version=0.14.1
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
 make_install_args="PREFIX=/usr"
@@ -13,3 +13,5 @@ homepage="https://github.com/ocaml/ocamlbuild"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
 checksum=4e1279ff0ef80c862eaa5207a77020d741e89ef94f0e4a92a37c4188dbf08256
 nocross=yes
+
+export CHECK_IF_PREINSTALLED=false

From 41aee4b2c765e17073f6a047a277b5ecb82bf582 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:51:59 +0200
Subject: [PATCH 1257/2561] ocaml-stdcompat: update to 18.

---
 srcpkgs/ocaml-stdcompat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
index 2035a9a2c4fa..65a0d6fbc78f 100644
--- a/srcpkgs/ocaml-stdcompat/template
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-stdcompat'
 pkgname=ocaml-stdcompat
-version=16
-revision=2
+version=18
+revision=1
 wrksrc="stdcompat-${version}"
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib/ocaml"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/thierry-martinez/stdcompat"
 distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
-checksum=100152e25f138351cb265146cd8717fa9dbfbff54b48ce771e30a4e05fc1ec09
+checksum=483a8d526eb19709a1a3092fb8978302e3a9d3bb783d807fb9ee53d96c3ec607
 nocross=yes
 disable_parallel_build=yes
 

From 856bb89e79650603012e24fce6da3a99e68cd9d6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:13 +0200
Subject: [PATCH 1258/2561] hivex: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/hivex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 448c06ddc9fa..f6f12d1b70f3 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.21
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"

From 7c9a0d7e1935fcf16898ad4467c31855c33fd0f4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:32 +0200
Subject: [PATCH 1259/2561] opam: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/opam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 236a2f963b70..ca5c64092ac8 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"

From df885c62dbbb4913afee6c6f06ea4615a9ed3f43 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:52 +0200
Subject: [PATCH 1260/2561] ocaml-lablgtk2: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocaml-lablgtk2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index c835e6b19d5d..6ff864eb1720 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-lablgtk2'
 pkgname=ocaml-lablgtk2
 version=2.18.10
-revision=4
+revision=5
 wrksrc="lablgtk-${version}"
 build_style=gnu-configure
 configure_args="--without-glade --without-gnomeui --without-gtksourceview"

From b03989c1960dc2f68a1f0e24f915f55a247afe3d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:12 +0200
Subject: [PATCH 1261/2561] pdfsandwich: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/pdfsandwich/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index f3603e064c90..82f2f934fdc1 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfsandwich'
 pkgname=pdfsandwich
 version=0.1.7
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="ocaml perl"
 makedepends="ocaml"

From b579252558da36616770d63a3810b94f5beb3e07 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:17 +0200
Subject: [PATCH 1262/2561] supermin: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/supermin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 357fc3f255f8..5f80c3515b3d 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
 version=5.2.2
-revision=1
+revision=2
 _release_series=5.2-stable
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"

From 5ab7f08bab6f937aa4ad98ab4481e45340379c5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:24 +0200
Subject: [PATCH 1263/2561] z3: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/z3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 2d5bf7a80954..dea059c98d0c 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
 version=4.8.15
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"

From ff9136a4841117d3383b394b068f83c1c642400b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:01:53 +0200
Subject: [PATCH 1264/2561] coccinelle: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/coccinelle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 211c9bdb4394..709b45fd2f69 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
 # Template file for 'coccinelle'
 pkgname=coccinelle
 version=1.1.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-pdflatex --enable-release --enable-opt
  --with-python=/usr/bin/python3"

From 14e30704aead5b046068c7ee852569a998e89245 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:03:56 +0200
Subject: [PATCH 1265/2561] libguestfs: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/libguestfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 8d669017077e..c6c56f8142b7 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.48.0
-revision=1
+revision=2
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"

From 61a10cd4955a8220369d042a901c9306850c0702 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:04:56 +0200
Subject: [PATCH 1266/2561] unison: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/unison/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 783573c120ea..97eb209e2e8c 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
 # Template file for 'unison'
 pkgname=unison
 version=2.52.0
-revision=1
+revision=2
 hostmakedepends="ocaml"
 short_desc="File-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"

From d425d32a12892cebc1281f912775fd5570856401 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:08:51 +0200
Subject: [PATCH 1267/2561] camlp5: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/camlp5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 2d07ecc842b4..74e0809e16d1 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
 # Template file for 'camlp5'
 pkgname=camlp5
 version=8.00.03
-revision=1
+revision=2
 wrksrc="camlp5-rel${version}"
 build_style=configure
 configure_args="-mandir /usr/share/man"

From 6be264d2d8cdea9631fd4d81529437ad70de14a8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:12:31 +0200
Subject: [PATCH 1268/2561] dune: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/dune/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 178746cfc292..30c34cb44c00 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
 # Template file for 'dune'
 pkgname=dune
 version=3.0.3
-revision=1
+revision=2
 makedepends="ocaml"
 depends="ocaml"
 short_desc="Composable build system for OCaml"

From ba92a5434b08c7e08b9e6f3bfda470c5f6b27997 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:18:07 +0200
Subject: [PATCH 1269/2561] New package: ocaml-camlp-streams-5.0

---
 srcpkgs/ocaml-camlp-streams/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/ocaml-camlp-streams/template

diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template
new file mode 100644
index 000000000000..ce728427d280
--- /dev/null
+++ b/srcpkgs/ocaml-camlp-streams/template
@@ -0,0 +1,22 @@
+# Template file for 'ocaml-camlp-streams'
+pkgname=ocaml-camlp-streams
+version=5.0
+revision=1
+wrksrc="camlp-streams-${version}"
+makedepends="ocaml dune"
+short_desc="Stream and Genlex libraries for use with Camlp4 and Camlp5"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only,OCaml-LGPL-linking-exception"
+homepage="https://github.com/ocaml/camlp-streams"
+distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz"
+checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226
+nocross=yes
+disable_parallel_build=yes
+
+do_build() {
+	dune build --display=short
+}
+do_install() {
+	dune install --prefix=/usr --destdir="$DESTDIR" \
+		--libdir=/usr/lib/ocaml --docdir=/usr/share/doc
+}

From 3b8a67704c3b37480bb1b91fa4f14bd3be608fac Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:36 +0200
Subject: [PATCH 1270/2561] camlp5: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/camlp5/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 74e0809e16d1..1118f618ba1f 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,11 +1,12 @@
 # Template file for 'camlp5'
 pkgname=camlp5
 version=8.00.03
-revision=2
+revision=3
 wrksrc="camlp5-rel${version}"
 build_style=configure
 configure_args="-mandir /usr/share/man"
 hostmakedepends="ocaml perl ocaml-findlib"
+makedepends="ocaml-camlp-streams"
 short_desc="OCaml preprocessor and pretty-printer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From df05ccda3562dfda0e7454f53542f8029d432b26 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:46 +0200
Subject: [PATCH 1271/2561] coq: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/coq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index fcfbc92cb2f6..5db6a99c5e5e 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
 # Template file for 'coq'
 pkgname=coq
 version=8.15.1
-revision=1
+revision=2
 hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 22b8989d6c4498e47d4774a7cbd4f1913768ba02 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:30:50 +0200
Subject: [PATCH 1272/2561] mathcomp: rebuild for coq-8.15.1_2.

---
 srcpkgs/mathcomp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 5946de08e18b..9bdea51dcf48 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.14.0
-revision=1
+revision=2
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From 3c6c6653c0812e65fc9dc22c57e8777042a0160c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:48:14 +0200
Subject: [PATCH 1273/2561] xen: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/xen/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index deb572fe8b9c..cca4b6211bec 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=5
+revision=6
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64
@@ -10,8 +10,9 @@ build_style=gnu-configure
 configure_args="$(vopt_enable stubdom) --disable-systemd
  --with-system-seabios=/usr/share/seabios/bios.bin
  --with-sysconfig-leaf-dir=conf.d --with-rundir=/run"
-hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
- ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
+hostmakedepends="acpica-utils automake bin86 bison fig2dev flex gettext
+ ghostscript git ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar
+ texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
  libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel

From c479cf8eff924bbbf0d8b2a73615edac744a10c2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 22:03:19 +0200
Subject: [PATCH 1274/2561] zeroinstall: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index eb8e1ea24280..40d8740b1300 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,7 +1,7 @@
 # Template file for 'zeroinstall'
 pkgname=zeroinstall
 version=2.17
-revision=5
+revision=6
 wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"

From 4598b950e607198ea644a429ac9e37810a899aa8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 14:27:09 +0200
Subject: [PATCH 1275/2561] opam: disable tests in ci.

---
 srcpkgs/opam/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index ca5c64092ac8..dd27afd02a0d 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -17,6 +17,7 @@ distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
 checksum=735e717532f135064940fe3fef573acce6b1bbdc5e146470c2ac20fc8510a470
 nocross=yes
 disable_parallel_build=yes
+make_check=ci-skip # uses bwrap
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc

From 47d61961a8f6add2ba8363b7abfca5c5212da36d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 11:59:21 -0400
Subject: [PATCH 1276/2561] python3-pyppmd: update to 0.18.2.

enable tests by ignoring/disabling pytest-benchmark
---
 srcpkgs/python3-pyppmd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
index 4034cde05478..a80c2a5f0382 100644
--- a/srcpkgs/python3-pyppmd/template
+++ b/srcpkgs/python3-pyppmd/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pyppmd'
 pkgname=python3-pyppmd
-version=0.17.3
+version=0.18.2
 revision=1
 wrksrc="pyppmd-${version}"
 build_style=python3-module
+make_check_args="--noconftest --ignore=tests/test_benchmark.py"
 hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest python3-py-cpuinfo python3-hypothesis"
 short_desc="Python interface for PPM variation H and I.2"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/miurahr/pyppmd"
 changelog="https://raw.githubusercontent.com/miurahr/pyppmd/main/Changelog.rst"
 distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
-checksum=05a4765833623d5cc1c9afc27d9b05fb64f0319711beffe0b44d9695eb1beb0a
-# testing requires unpackaged plugin pytest-benchmark
-make_check=no
+checksum=732b28ea25afa41a282c986178b29e60ea5ec2e2b67f66997af943f73d4673e0

From 6a2d22b8ea12f9d4ccf761a656991cdda6868df5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 11:59:34 -0400
Subject: [PATCH 1277/2561] python3-pyzstd: update to 0.15.2.

fix tests with custom do_check
---
 .../patches/support_pytest.patch              | 30 +++++++++++++++++++
 srcpkgs/python3-pyzstd/template               |  8 ++---
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-pyzstd/patches/support_pytest.patch

diff --git a/srcpkgs/python3-pyzstd/patches/support_pytest.patch b/srcpkgs/python3-pyzstd/patches/support_pytest.patch
new file mode 100644
index 000000000000..05ffa75fab5b
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/patches/support_pytest.patch
@@ -0,0 +1,30 @@
+From b7ff78fc31ea054339693d6bf835134b8b9fbaa3 Mon Sep 17 00:00:00 2001
+From: Ma Lin <malincns@163.com>
+Date: Tue, 12 Apr 2022 13:00:30 +0800
+Subject: [PATCH] unittests supports pytest
+
+<more-tests>
+---
+ tests/test_zstd.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/tests/test_zstd.py b/tests/test_zstd.py
+index 263a753..0d254b9 100644
+--- a/tests/test_zstd.py
++++ b/tests/test_zstd.py
+@@ -3231,9 +3231,6 @@ def cb(a,b,c,d):
+         compress_stream(io.BytesIO(b''), io.BytesIO(), callback=cb)
+         decompress_stream(io.BytesIO(b''), io.BytesIO(), callback=cb)
+ 
+-def test_main():
+-    unittest.main()
+-
+ # uncompressed size 130KB, more than a zstd block.
+ # with a frame epilogue, 4 bytes checksum.
+ TEST_DAT_130KB = (b'(\xb5/\xfd\xa4\x00\x08\x02\x00\xcc\x87\x03:\xaaYN4pf\xc8\xae\x06b\x02'
+@@ -4419,4 +4416,4 @@ def test_main():
+  b'\xb7\x99\x1b\xce\xc9\t*\x98\x97\xb43z\x01h\x9fu\xf1')
+ 
+ if __name__ == "__main__":
+-    test_main()
++    unittest.main()
diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
index 708b8a193d9b..c097aeb44a09 100644
--- a/srcpkgs/python3-pyzstd/template
+++ b/srcpkgs/python3-pyzstd/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzstd'
 pkgname=python3-pyzstd
-version=0.15.0
+version=0.15.2
 revision=1
 wrksrc="pyzstd-${version}"
 build_style=python3-module
@@ -8,14 +8,14 @@ make_build_args="--dynamic-link-zstd"
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel libzstd-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Python bindings to zstd, API is similar to bz2/lzma/zlib module"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://github.com/animalize/pyzstd"
+changelog="https://raw.githubusercontent.com/animalize/pyzstd/dev/README.rst"
 distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
-checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
-# test is broken and can't be run by setup.py or pytest
-make_check=no
+checksum=eda9d2874a8f3823eea882125f304620f592693b3af0101c484bfc75726c8c59
 
 post_install() {
 	vlicense LICENSE

From 60fd2f95d7c45fb752942bd30cd9d2eb20bf6801 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 12:00:01 -0400
Subject: [PATCH 1278/2561] python3-pybcj: update to 0.5.1.

enable tests with pytest
---
 srcpkgs/python3-pybcj/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template
index 9e0e806f9583..a0776b796627 100644
--- a/srcpkgs/python3-pybcj/template
+++ b/srcpkgs/python3-pybcj/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-pybcj'
 pkgname=python3-pybcj
-version=0.5.0
+version=0.5.1
 revision=1
 wrksrc="pybcj-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest python3-hypothesis"
 short_desc="BCJ(Branch-Call-Jump) filter for python"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/pybcj"
 distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz"
-checksum=8de74f338874c698e405a72181eb0ea2e011ed5a6567e0feca524275f113bb0f
+checksum=376d039200639a52cba47fb04ffda39aad39715d9e988405fee0e5d60080d111

From 60efb772a3271f4370a4bfa611a2aebb7e5ca2f5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 13:39:53 -0400
Subject: [PATCH 1279/2561] New package: python3-zipfile-deflate64-0.2.0

---
 srcpkgs/python3-zipfile-deflate64/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-zipfile-deflate64/template

diff --git a/srcpkgs/python3-zipfile-deflate64/template b/srcpkgs/python3-zipfile-deflate64/template
new file mode 100644
index 000000000000..5f2c506b3e15
--- /dev/null
+++ b/srcpkgs/python3-zipfile-deflate64/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-zipfile-deflate64'
+pkgname=python3-zipfile-deflate64
+version=0.2.0
+revision=1
+wrksrc="zipfile-deflate64-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Extract Deflate64 ZIP archives with Python's zipfile API"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/brianhelba/zipfile-deflate64"
+distfiles="${PYPI_SITE}/z/zipfile-deflate64/zipfile-deflate64-${version}.tar.gz"
+checksum=875a3299de102edf1c17f8cafcc528b1ca80b62dc4814b9cb56867ec59fbfd18
+make_check=no # no tests included

From 89920fa2952524961c0e4b9c936f7665a119f2a4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 12:00:36 -0400
Subject: [PATCH 1280/2561] python3-py7zr: update to 0.18.3.

enable tests by ignoring/disabling pytest-benchmark

Closes: #36538 [via git-merge-pr]
---
 srcpkgs/python3-py7zr/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
index 7dcdc642f601..0113cb1dec27 100644
--- a/srcpkgs/python3-py7zr/template
+++ b/srcpkgs/python3-py7zr/template
@@ -1,20 +1,19 @@
 # Template file for 'python3-py7zr'
 pkgname=python3-py7zr
-version=0.16.4
-revision=2
+version=0.18.3
+revision=1
 wrksrc="py7zr-${version}"
 build_style=python3-module
+make_check_args="--ignore=tests/test_benchmark.py --noconftest"
 hostmakedepends="python3-setuptools_scm"
 depends="python3-texttable python3-pycryptodomex
  python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj
- python3-multivolumefile"
+ python3-multivolumefile python3-zipfile-deflate64"
+checkdepends="python3-pytest python3-pytest-timeout python3-py-cpuinfo $depends"
 short_desc="7zip in python3 with various compressions, and AES encryption"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/py7zr"
 changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/Changelog.rst"
 distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
-checksum=9b584dcd71b0e8c385cc66ae8e370bdbc29d1f07139d5cee770dc221fa338cf9
-# testing requires unpackaged modules:
-# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
-make_check=no
+checksum=d5bdc81536316f209a3ca4e1ce6e2ef11d8a519d613be47bcdd084bf655f400f

From deaa1da6b175180f7f0aca47dc0a6330d1119e49 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 23:34:55 +0100
Subject: [PATCH 1281/2561] libqalculate: update to 4.1.

previously 'qalculate', rearranged subpackages in a way which makes more sense.
---
 srcpkgs/libqalculate                         |  1 -
 srcpkgs/libqalculate-devel                   |  2 +-
 srcpkgs/{qalculate => libqalculate}/template | 27 ++++++++++----------
 srcpkgs/qalculate                            |  1 +
 4 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/libqalculate
 rename srcpkgs/{qalculate => libqalculate}/template (59%)
 create mode 120000 srcpkgs/qalculate

diff --git a/srcpkgs/libqalculate b/srcpkgs/libqalculate
deleted file mode 120000
index 2cf8203b7872..000000000000
--- a/srcpkgs/libqalculate
+++ /dev/null
@@ -1 +0,0 @@
-qalculate
\ No newline at end of file
diff --git a/srcpkgs/libqalculate-devel b/srcpkgs/libqalculate-devel
index 2cf8203b7872..2822077292df 120000
--- a/srcpkgs/libqalculate-devel
+++ b/srcpkgs/libqalculate-devel
@@ -1 +1 @@
-qalculate
\ No newline at end of file
+libqalculate
\ No newline at end of file
diff --git a/srcpkgs/qalculate/template b/srcpkgs/libqalculate/template
similarity index 59%
rename from srcpkgs/qalculate/template
rename to srcpkgs/libqalculate/template
index d24fcba07f06..0414d879df42 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/libqalculate/template
@@ -1,29 +1,28 @@
-# Template file for 'qalculate'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
-pkgname=qalculate
-version=3.20.1
-revision=3
-wrksrc="lib${pkgname}-${version}"
+# Template file for 'libqalculate'
+# NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt'
+pkgname=libqalculate
+version=4.1.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
 makedepends="libxml2-devel cln-devel readline-devel libcurl-devel icu-devel
  mpfr-devel"
-short_desc="Multi-purpose desktop calculator"
+short_desc="Multi-purpose desktop calculator library"
 maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
+changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=d943e5285bdc0b3cd77b8f7a10391d7c753fc19b0ddd48e5d4179decf709d6ff
 
-libqalculate_package() {
-	short_desc+=" - library files"
-	replaces="libqalculate-data>=0"
+qalculate_package() {
+	short_desc="Multi-purpose desktop calculator - CLI version"
 	pkg_install() {
-		vmove usr/lib/libqalculate.so.*
-		vmove usr/share/qalculate
+		vmove usr/bin/qalc
+		vmove usr/share/man/man1/qalc.1
 	}
 }
+
 libqalculate-devel_package() {
 	short_desc+=" - development files"
 	depends="libqalculate>=${version}_${revision} libxml2-devel cln-devel gmp-devel mpfr-devel"
diff --git a/srcpkgs/qalculate b/srcpkgs/qalculate
new file mode 120000
index 000000000000..2822077292df
--- /dev/null
+++ b/srcpkgs/qalculate
@@ -0,0 +1 @@
+libqalculate
\ No newline at end of file

From 6bc1f19fdba28b2966ad14fbaf685fc49a5cd4cc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 23:35:05 +0100
Subject: [PATCH 1282/2561] qalculate-gtk: update to 4.1.0.

---
 srcpkgs/qalculate-gtk/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..642bd9e5da80 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
+# NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-qt'
 pkgname=qalculate-gtk
-version=3.20.1
+version=4.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,5 +11,6 @@ short_desc="Multi-purpose desktop calculator - GTK+ version"
 maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
+changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=8bab126f4f87e9321572f10e9262bf095c7e72470d4b61e2a173d273673bdeca

From b9ef8f837e8badf3552decfcbb7a232e5ed3f217 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 23:35:06 +0100
Subject: [PATCH 1283/2561] qalculate-qt: update to 4.1.0.

Closes: #36179 [via git-merge-pr]
---
 srcpkgs/qalculate-qt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
index c960ee0eed61..d1995bdec691 100644
--- a/srcpkgs/qalculate-qt/template
+++ b/srcpkgs/qalculate-qt/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
+# NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-gtk'
 pkgname=qalculate-qt
-version=3.20.1
+version=4.1.0
 revision=1
 build_style=qmake
 hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
@@ -12,5 +11,6 @@ short_desc="Multi-purpose desktop calculator - QT version"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
+changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
+checksum=b54b880750bf75e756f074c1fb6a38dcfe23ad9a53954b83a8a86981c6cb824e

From 4e9e09885038a9f61abfb1f0b01a5e4a31034c0f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Thu, 14 Apr 2022 10:32:13 +0200
Subject: [PATCH 1284/2561] kalendar: update to 1.0.0, add deps, do check

---
 srcpkgs/kalendar/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kalendar/template b/srcpkgs/kalendar/template
index 0cdfbd27c3e4..6ab596817804 100644
--- a/srcpkgs/kalendar/template
+++ b/srcpkgs/kalendar/template
@@ -1,6 +1,6 @@
 # Template file for 'kalendar'
 pkgname=kalendar
-version=0.4.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -10,10 +10,17 @@ makedepends="qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel
  kcalendarcore-devel kconfigwidgets-devel kwindowsystem-devel kcoreaddons-devel
  kcontacts-devel kitemmodels-devel kxmlgui-devel knotifications-devel
  kiconthemes-devel kservice-devel akonadi5-devel akonadi-contacts-devel
- calendarsupport-devel eventviews-devel"
+ calendarsupport-devel eventviews-devel qqc2-desktop-style-devel kio-devel"
+depends="qqc2-desktop-style kdepim-runtime qt5-location kirigami2"
+checkdepends="dbus kdepim-runtime"
 short_desc="Calendar application using Akonadi"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/pim/kalendar"
 distfiles="${KDE_SITE}/kalendar/kalendar-${version}.tar.xz"
-checksum=d64b19caab3e1365cce58ae27b76417b515cf3a07777ed1905f82cfbf0d1947a
+checksum=ca4e840dc17a4e39111f5fb16bfcab29e34a10b9c840d22b81c52890f0c9fae0
+
+do_check() {
+	cd build
+	dbus-run-session ctest --output-on-failure --force-new-ctest-process
+}

From b572bc2ce56a7eacad961850c15bf6936e2cf34b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 14:53:31 +0200
Subject: [PATCH 1285/2561] xsnow: update to 3.5.0.

---
 srcpkgs/xsnow/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index a4f26810b137..198362e39ddf 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,18 +1,19 @@
 # Template file for 'xsnow'
 pkgname=xsnow
-version=3.4.4
+version=3.5.0
 revision=1
 build_style=gnu-configure
 build_helper=qemu
 hostmakedepends="pkg-config"
-makedepends="libXext-devel libXpm-devel libXt-devel libX11-devel gtk+3-devel"
+makedepends="gsl-devel gtk+3-devel libX11-devel libXext-devel libXpm-devel
+ libXt-devel"
 short_desc="Snow for your X11 sessions"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
 changelog="https://ratrabbit.nl/ratrabbit/xsnow/changelog/index.html"
 distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
-checksum=7cf332e40c4ab29164716a617ff22331cfd942d6b29634e12b16dc32dbce8d17
+checksum=884bb7478f839c120ebd031642fdae54b1f700352faac87b509a2ff221a57ff9
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then

From aa52bccffd7662631bc5194c7c65a3d6362e7613 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 16:32:43 +0200
Subject: [PATCH 1286/2561] mathcomp: mark nocross.

---
 srcpkgs/mathcomp/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 9bdea51dcf48..073327450800 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -12,6 +12,7 @@ license="CECILL-B"
 homepage="https://github.com/math-comp/math-comp"
 distfiles="https://github.com/math-comp/math-comp/archive/${pkgname}-${version}.tar.gz"
 checksum=d259cc95a2f8f74c6aa5f3883858c9b79c6e87f769bde9a415115fa4876ebb31
+nocross="ocaml"
 
 do_install() {
 	make install DESTDIR="${DESTDIR}" 'COQLIB:=$(shell coqtop -where)/'

From d54c247c79391ba06d0ac7bfd35250a7abaee2aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 17:19:17 +0200
Subject: [PATCH 1287/2561] linux5.10: update to 5.10.111.

---
 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 0912977245d4..28935f5c70d2 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.109
+version=5.10.111
 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=18fb22ecb249669ea775474aee614dcb0697cab299068074fd9f0bafa32113dc
+checksum=1831b3d8765592ce91e51441bb179d908f6bcfe8c78d03c2bec8c675c4a0ab1a
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 75934f29905d81f8535f3cf6aaa1bd2c368a7cd5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 17:21:09 +0200
Subject: [PATCH 1288/2561] linux5.15: update to 5.15.34.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 236c406a512b..9b2bc0aed3f9 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.32
+version=5.15.34
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- eacc8609dfcecb637f813ef4d2e13f48bdeb6143be929358f3b3cb4254f9c563"
+ b1a34733513b1080e763532101def34af73b4ca5e4f9b442c3e7d378a1598088"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From ee7a3f854967ca076601035323e67452ac14ead1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 17:30:18 +0200
Subject: [PATCH 1289/2561] linux5.16: update to 5.16.20.

---
 srcpkgs/linux5.16/files/arm64-dotconfig   | 3 ++-
 srcpkgs/linux5.16/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.16/files/ppc64-dotconfig   | 5 +++--
 srcpkgs/linux5.16/files/ppc64le-dotconfig | 5 +++--
 srcpkgs/linux5.16/files/x86_64-dotconfig  | 3 ++-
 srcpkgs/linux5.16/template                | 4 ++--
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig
index e4b9d7a609af..a5f05f407ac7 100644
--- a/srcpkgs/linux5.16/files/arm64-dotconfig
+++ b/srcpkgs/linux5.16/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.16.16 Kernel Configuration
+# Linux/arm64 5.16.20 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -3277,6 +3277,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 CONFIG_NET_DSA_REALTEK_SMI=m
 CONFIG_NET_DSA_SMSC_LAN9303=m
 CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
diff --git a/srcpkgs/linux5.16/files/i386-dotconfig b/srcpkgs/linux5.16/files/i386-dotconfig
index a7c014b0984b..bd1d764ded60 100644
--- a/srcpkgs/linux5.16/files/i386-dotconfig
+++ b/srcpkgs/linux5.16/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.16.11 Kernel Configuration
+# Linux/i386 5.16.20 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2911,6 +2911,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
@@ -10031,7 +10032,6 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_HEADERS_INSTALL is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_VMLINUX_MAP is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
diff --git a/srcpkgs/linux5.16/files/ppc64-dotconfig b/srcpkgs/linux5.16/files/ppc64-dotconfig
index b204dc8f8a72..b451a42c14c8 100644
--- a/srcpkgs/linux5.16/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.16.11 Kernel Configuration
+# Linux/powerpc 5.16.20 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc64-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -2922,6 +2922,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
diff --git a/srcpkgs/linux5.16/files/ppc64le-dotconfig b/srcpkgs/linux5.16/files/ppc64le-dotconfig
index 564de8e60967..ac8f74360c67 100644
--- a/srcpkgs/linux5.16/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64le-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.16.11 Kernel Configuration
+# Linux/powerpc 5.16.20 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc64le-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -2801,6 +2801,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
diff --git a/srcpkgs/linux5.16/files/x86_64-dotconfig b/srcpkgs/linux5.16/files/x86_64-dotconfig
index dbffc48dfc42..b8c5717c6eae 100644
--- a/srcpkgs/linux5.16/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.16/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.16.11 Kernel Configuration
+# Linux/x86_64 5.16.20 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2968,6 +2968,7 @@ CONFIG_NET_DSA_SJA1105=m
 # CONFIG_NET_DSA_XRS700X_I2C is not set
 # CONFIG_NET_DSA_XRS700X_MDIO is not set
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template
index 3f8c094faf24..71cb0aba3ca5 100644
--- a/srcpkgs/linux5.16/template
+++ b/srcpkgs/linux5.16/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.16'
 pkgname=linux5.16
-version=5.16.18
+version=5.16.20
 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="027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb
- 3bb88aa87c3f7788ad84ca5cbf3946ed9fbb3fddb9fca2458944fba5ebd2ab16"
+ 619cd0e39db62b581107cd71dbc1fc52654f94d4306fd02e806ab599f06d0cd8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 95b13cde6fa5d0f09257aee3c5b7034476e811f3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Thu, 14 Apr 2022 14:33:43 -0400
Subject: [PATCH 1290/2561] .github/workflows/build.yaml: only run on changes
 in srcpkgs/

---
 .github/workflows/build.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 503f1e1f4b68..2ae7a3e728fa 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -2,9 +2,13 @@ name: Check build
 
 on:
   pull_request:
+    paths:
+      - 'srcpkgs/**'
   push:
     branches:
       - 'ci-**'
+    paths:
+      - 'srcpkgs/**'
 
 jobs:
   # Lint changed templates.

From 25af251d69ff2651d7a4959e6052f5b6a35b8ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 14 Apr 2022 16:18:18 -0300
Subject: [PATCH 1291/2561] tiptop: fix homepage and distfiles

---
 srcpkgs/tiptop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tiptop/template b/srcpkgs/tiptop/template
index 140198908629..93c71833c5ac 100644
--- a/srcpkgs/tiptop/template
+++ b/srcpkgs/tiptop/template
@@ -8,8 +8,8 @@ makedepends="ncurses-devel libxml2-devel"
 short_desc="Performance monitoring tool using hardware counters"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
-homepage="http://tiptop.gforge.inria.fr/"
-distfiles="http://tiptop.gforge.inria.fr/releases/${pkgname}-${version}.tar.gz"
+homepage="https://gitlab.inria.fr/rohou/tiptop"
+distfiles="https://files.inria.fr/pacap/tiptop/tiptop-$version.tar.gz"
 checksum=51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 

From 31ab82db0568d242876ab4a35fa0c61823b7420f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Thu, 14 Apr 2022 13:04:10 -0400
Subject: [PATCH 1292/2561] github-cli: add manpages

fixes #36689
---
 srcpkgs/github-cli/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 35576bf8ee82..28c6acf2aaf5 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.8.0
-revision=1
+revision=2
 wrksrc="cli-${version}"
 build_style=go
 build_helper=qemu
@@ -24,6 +24,7 @@ pre_build() {
 }
 
 post_build() {
+	CGO_ENABLED=0 GOARCH="" go run script/build.go manpages
 	gh=$(find $GOPATH/bin -name gh)
 	for shell in bash fish zsh; do
 		vtargetrun $gh completion -s $shell > github-cli.$shell
@@ -33,6 +34,7 @@ post_build() {
 post_install() {
 	vlicense LICENSE
 
+	vcopy share/man usr/share
 	for shell in bash fish zsh; do
 		vcompletion github-cli.$shell $shell gh
 	done

From ff22a38b7c4cabc0adf8b4063613f101f6ebe1bf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 14 Apr 2022 16:34:08 +0200
Subject: [PATCH 1293/2561] pianobar: update to 2022.04.01.

---
 srcpkgs/pianobar/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index b7d991fef5a4..a9b29e91993f 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -1,6 +1,6 @@
 # Template file for 'pianobar'
 pkgname=pianobar
-version=2020.11.28
+version=2022.04.01
 revision=1
 build_style=gnu-makefile
 make_build_args="V=1"
@@ -11,8 +11,9 @@ short_desc="Free/open-source, console-based client for Pandora radio"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"
 homepage="https://6xq.net/pianobar/"
-distfiles="https://github.com/PromyLOPh/pianobar/archive/${version}.tar.gz"
-checksum=f8cdd564e2a12ee0740c54e8bc4028b328e9afb041d9ea40bcb762e08034b9e9
+changelog="https://raw.githubusercontent.com/PromyLOPh/pianobar/master/ChangeLog"
+distfiles="https://6xq.net/pianobar/pianobar-${version}.tar.bz2"
+checksum=1670b28865a8b82a57bb6dfea7f16e2fa4145d2f354910bb17380b32c9b94763
 
 post_install() {
 	vlicense COPYING

From de12a821142a11dc20c2c257e31c04fbcfd7309b Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 13 Apr 2022 10:56:22 +0200
Subject: [PATCH 1294/2561] go: update to 1.18.1.

---
 .../fix-ppc64le-startup-detection.patch       | 81 -------------------
 srcpkgs/go/template                           |  4 +-
 2 files changed, 2 insertions(+), 83 deletions(-)
 delete mode 100644 srcpkgs/go/patches/fix-ppc64le-startup-detection.patch

diff --git a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
deleted file mode 100644
index 6cc2ab337249..000000000000
--- a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 946167906ed8646c433c257b074a10e01f0a7dab Mon Sep 17 00:00:00 2001
-From: "Paul E. Murphy" <murp@ibm.com>
-Date: Tue, 22 Mar 2022 11:52:02 -0500
-Subject: [PATCH] runtime: make static/dynamic startup detection work with musl
- on ppc64le
-
-The glibc loader explicitly sets the first doubleword on the stack (R1)
-to $0 to indicate it was dynamically loaded.
-
-An ELFv2 ABI compliant loader will set R3/R4 to argc/argv when starting
-the process, and R13 to TLS. musl is not compliant. Instead it passes
-argc/argv like the kernel, but R3/R4 are in an undefined state and R13
-is valid.
-
-With the knowledge above, the startup code can be modified to
-dynamically handle all three cases when linked internally.
-
-Fixes #51787
-
-Change-Id: I5de33862c161900d9161817388bbc13a65fdc69c
-Reviewed-on: https://go-review.googlesource.com/c/go/+/394654
-Reviewed-by: Cherry Mui <cherryyz@google.com>
-Run-TryBot: Paul Murphy <murp@ibm.com>
-TryBot-Result: Gopher Robot <gobot@golang.org>
-Trust: Paul Murphy <murp@ibm.com>
-Trust: Lynn Boger <laboger@linux.vnet.ibm.com>
----
- src/runtime/rt0_linux_ppc64le.s | 32 +++++++++++++++++++++-----------
- 1 file changed, 21 insertions(+), 11 deletions(-)
-
-diff --git a/src/runtime/rt0_linux_ppc64le.s b/src/runtime/rt0_linux_ppc64le.s
-index 4f7c6e6c99f6..66f7e7b22a41 100644
---- a/go/src/runtime/rt0_linux_ppc64le.s
-+++ b/go/src/runtime/rt0_linux_ppc64le.s
-@@ -147,25 +147,35 @@ TEXT _main<>(SB),NOSPLIT,$-8
- 	// In a statically linked binary, the stack contains argc,
- 	// argv as argc string pointers followed by a NULL, envv as a
- 	// sequence of string pointers followed by a NULL, and auxv.
--	// There is no TLS base pointer.
-+	// The TLS pointer should be initialized to 0.
- 	//
--	// In a dynamically linked binary, r3 contains argc, r4
--	// contains argv, r5 contains envp, r6 contains auxv, and r13
-+	// In an ELFv2 compliant dynamically linked binary, R3 contains argc,
-+	// R4 contains argv, R5 contains envp, R6 contains auxv, and R13
- 	// contains the TLS pointer.
- 	//
--	// Figure out which case this is by looking at r4: if it's 0,
--	// we're statically linked; otherwise we're dynamically
--	// linked.
--	CMP	R0, R4
--	BNE	dlink
--
--	// Statically linked
-+	// When loading via glibc, the first doubleword on the stack points
-+	// to NULL a value. (that is *(uintptr)(R1) == 0). This is used to
-+	// differentiate static vs dynamicly linked binaries.
-+	//
-+	// If loading with the musl loader, it doesn't follow the ELFv2 ABI. It
-+	// passes argc/argv similar to the linux kernel, R13 (TLS) is
-+	// initialized, and R3/R4 are undefined.
-+	MOVD	(R1), R12
-+	CMP	R0, R12
-+	BEQ	tls_and_argcv_in_reg
-+
-+	// Arguments are passed via the stack (musl loader or a static binary)
- 	MOVD	0(R1), R3 // argc
- 	ADD	$8, R1, R4 // argv
-+
-+	// Did the TLS pointer get set? If so, don't change it (e.g musl).
-+	CMP	R0, R13
-+	BNE	tls_and_argcv_in_reg
-+
- 	MOVD	$runtime·m0+m_tls(SB), R13 // TLS
- 	ADD	$0x7000, R13
- 
--dlink:
-+tls_and_argcv_in_reg:
- 	BR	main(SB)
- 
- TEXT main(SB),NOSPLIT,$-8
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 58f0b0fc2485..44423832896f 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.18
+version=1.18.1
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6
+checksum=efd43e0f1402e083b73a03d444b7b6576bb4c539ac46208b63a916b69aca4088
 nostrip=yes
 noverifyrdeps=yes
 

From 99c340e5c32472b9f7bf4cb558b401ba871c6465 Mon Sep 17 00:00:00 2001
From: blackbeard420 <blackbeard@blackbeard420.me>
Date: Mon, 11 Apr 2022 18:03:40 -0400
Subject: [PATCH 1295/2561] kitty: update to 0.25.0

---
 srcpkgs/kitty/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 2c012bece185..7f4507a6f0aa 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.24.4
+version=0.25.0
 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=d8cd0b4967bb61e2a3427b57cb9f45f278813fb6b986f97b370c8c50aa058d18
+checksum=1a2c81bf46687d4141d3182dc984bbc0330791705af152199e5b5815dae933de
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
@@ -27,10 +27,6 @@ do_build() {
 	if [ "$CROSS_BUILD" ]; then
 		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
 	fi
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			vsed -e 's/pow10/pow_10/g' -i kitty/parser.c;;
-	esac
 	python3 setup.py linux-package --prefix=${DESTDIR}/usr --update-check-interval=0 --verbose
 }
 

From 8f84755de08efc7596d977fcf285644a66e716f3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 12 Apr 2022 02:44:55 +0200
Subject: [PATCH 1296/2561] budgie-desktop: update to 10.6.1.

---
 srcpkgs/budgie-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index a65c395c994b..02d90c307eaf 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
-version=10.6
+version=10.6.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
 distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=ba297a10b547e6d7bf164406750b5c5dae98a7524978b30b4ad3cba9624def9e
+checksum=b320cfdff8fab37286f0ca6669ef2907f551fa2a38cabd764cbf7b9e6181e166
 
 budgie-desktop-devel_package() {
 	short_desc+=" - development files"

From 376915ca95d90eafaa2528193e8742fc0fc21232 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 12 Apr 2022 02:44:58 +0200
Subject: [PATCH 1297/2561] budgie-screensaver: update to 5.0.1.

---
 srcpkgs/budgie-screensaver/patches/musl.patch | 12 ------------
 srcpkgs/budgie-screensaver/template           |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/budgie-screensaver/patches/musl.patch

diff --git a/srcpkgs/budgie-screensaver/patches/musl.patch b/srcpkgs/budgie-screensaver/patches/musl.patch
deleted file mode 100644
index 6f5c265f83ae..000000000000
--- a/srcpkgs/budgie-screensaver/patches/musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/subprocs.c b/src/subprocs.c
-index a378658..ba37650 100644
---- a/src/subprocs.c
-+++ b/src/subprocs.c
-@@ -36,6 +36,7 @@
- # define fork  vfork
- #endif /* VMS */
- 
-+#define _POSIX_SOURCE
- #include <signal.h>		/* for the signal names */
- 
- #include <glib.h>
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index b877543d33a0..16ed0e384e8a 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'budgie-screensaver'
 pkgname=budgie-screensaver
-version=5.0
+version=5.0.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/BuddiesOfBudgie/budgie-screensaver"
 distfiles="https://github.com/BuddiesOfBudgie/budgie-screensaver/releases/download/v${version}/budgie-screensaver-v${version}.tar.xz"
-checksum=611969a9f53e5d3148cad7445e95c94bfff6ea61c2f339969ecb5d9b51f6b871
+checksum=81fe6cccd938d9ef8d6cd46bbbad654ab8f7d108bbf1f96e9bf89b3ed5bafa0a

From b4c2a52930b4c6532f73413b11050774efce90ac Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 9 Apr 2022 20:54:53 -0400
Subject: [PATCH 1298/2561] libnma: update to 1.8.38.

---
 srcpkgs/libnma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index 148ae51d6de9..9d2a53119d01 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,6 +1,6 @@
 # Template file for 'libnma'
 pkgname=libnma
-version=1.8.36
+version=1.8.38
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libnma"
 changelog="https://gitlab.gnome.org/GNOME/libnma/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a
+checksum=5ed93eae18456ff5a8a4f408178c1ee198dc8d3a46c65f9075b101916e64e8b4
 replaces="libnm-gtk>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 107e3f4ebaf78d2b51ad38cf799744039fba5dea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 23:47:14 +0200
Subject: [PATCH 1299/2561] ocaml-findlib: remove ocamlbuild/META, it's part of
 ocamlbuild.

---
 srcpkgs/ocaml-findlib/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 04be12e64f51..20c083271677 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
 version=1.9.3
-revision=1
+revision=2
 wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
@@ -21,4 +21,6 @@ do_install() {
 	make prefix="$DESTDIR" install
 	vbin src/findlib/ocamlfind_opt
 	vlicense LICENSE
+
+	rm -rf ${DESTDIR}/usr/lib/ocaml/ocamlbuild
 }

From 5f5424ebff7092c0857af7e5b12e5d3aab7d4008 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Thu, 14 Apr 2022 19:30:06 -0400
Subject: [PATCH 1300/2561] .github/workflows/stale.yml: increase operations
 limit

By setting `ascending` to `true`, the most stale issues and PRs will be
caught first. By increasing the operations limit from the default (30)
to 250, more stale issues/PRs will be caught each run, increasing the
speed of the burndown.
---
 .github/workflows/stale.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 91ac19e4f638..9dbb76cd2a3d 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -17,3 +17,5 @@ jobs:
           days-before-stale: 90
           days-before-close: 14
           exempt-all-assignees: true
+          ascending: true
+          operations-per-run: 250

From 674a67bba8abde7c6489d1da49cd4d491107cc13 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 10 Apr 2022 04:47:01 +0200
Subject: [PATCH 1301/2561] .github/workflows/stale.yml: don't tag issues with
 request label as stale

Closes: #36609 [via git-merge-pr]
---
 .github/workflows/stale.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 9dbb76cd2a3d..160897fedef1 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -19,3 +19,4 @@ jobs:
           exempt-all-assignees: true
           ascending: true
           operations-per-run: 250
+          exempt-issue-labels: request

From 2b5419be165fed5a496ec1ad13ecd05eabe715de Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 14 Apr 2022 15:37:27 -0500
Subject: [PATCH 1302/2561] Signal-Desktop: update to 5.39.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 05be4f346a92..c02e6864b8a1 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.38.0
+version=5.39.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=da693cf3fd7535f8569bbdc6f64387e274daab49c2798cacc804c784e401115d
+checksum=0e5f237bd2db6f9e32d58d28c99727bdd069cffb6abf9c68b62c30c8a6ca83d9
 nostrip_files="signal-desktop"
 
 post_extract() {

From c11c8527230396378f06da1815af357a32067490 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Apr 2022 10:05:48 +0200
Subject: [PATCH 1303/2561] New package: Mousai-0.6.6

---
 srcpkgs/Mousai/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/Mousai/template

diff --git a/srcpkgs/Mousai/template b/srcpkgs/Mousai/template
new file mode 100644
index 000000000000..1b97a3851557
--- /dev/null
+++ b/srcpkgs/Mousai/template
@@ -0,0 +1,13 @@
+# Template file for 'Mousai'
+pkgname=Mousai
+version=0.6.6
+revision=1
+build_style=meson
+hostmakedepends="python3 gettext glib-devel pkg-config"
+depends="python3-gobject python3-requests libadwaita"
+short_desc="Identify any songs in seconds"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/SeaDve/Mousai"
+distfiles="https://github.com/SeaDve/Mousai/archive/refs/tags/v$version.tar.gz"
+checksum=a1e5cb29ad16405abcab8b5e1eec82fc170e5f535f8c55b57f18c80acb18a0ae

From 7c66e344992b748d2daf5a1fd44af393f2bb017a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:36:44 +0200
Subject: [PATCH 1304/2561] openssh: update to 9.0p1.

---
 srcpkgs/openssh/patches/ppoll_time64.patch | 26 ----------------------
 srcpkgs/openssh/template                   |  6 ++---
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/openssh/patches/ppoll_time64.patch

diff --git a/srcpkgs/openssh/patches/ppoll_time64.patch b/srcpkgs/openssh/patches/ppoll_time64.patch
deleted file mode 100644
index 199361c69024..000000000000
--- a/srcpkgs/openssh/patches/ppoll_time64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001
-From: Darren Tucker <dtucker@dtucker.net>
-Date: Sat, 26 Feb 2022 14:06:14 +1100
-Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox.
-
-Should fix sandbox violations on (some? at least i386 and armhf) 32bit
-Linux platforms.  Patch from chutzpahu at gentoo.org and cjwatson at
-debian.org via bz#3396.
----
- sandbox-seccomp-filter.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index 2e065ba3ed..4ce80cb2a7 100644
---- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = {
- #ifdef __NR_ppoll
- 	SC_ALLOW(__NR_ppoll),
- #endif
-+#ifdef __NR_ppoll_time64
-+	SC_ALLOW(__NR_ppoll_time64),
-+#endif
- #ifdef __NR_poll
- 	SC_ALLOW(__NR_poll),
- #endif
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index fe446fc131d4..02a2dec35f42 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=8.9p1
-revision=2
+version=9.0p1
+revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -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=fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7
+checksum=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a
 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 91776896fd974db4ed6d52247864b4b5f00629f6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:36:36 +0200
Subject: [PATCH 1305/2561] gnome-ssh-askpass: update to 9.0p1.

---
 srcpkgs/gnome-ssh-askpass/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index 558193ab2a19..692556f6836b 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
-version=8.9p1
-revision=2
+version=9.0p1
+revision=1
 wrksrc="openssh-${version}"
 build_wrksrc="contrib"
 build_style=gnu-makefile
@@ -13,7 +13,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=fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7
+checksum=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a
 
 alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass

From afcfec5d4607bdab129a48001f6c424430badf5d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:28:12 +0100
Subject: [PATCH 1306/2561] bctoolbox: update to 5.1.17.

---
 srcpkgs/bctoolbox/template | 4 ++--
 srcpkgs/bctoolbox/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/bctoolbox/update

diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 128235dc7d32..3d6b1bf167a0 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,6 +1,6 @@
 # Template file for 'bctoolbox'
 pkgname=bctoolbox
-version=5.0.55
+version=5.1.17
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://gitlab.linphone.org/BC/public/bctoolbox"
 distfiles="https://gitlab.linphone.org/BC/public/bctoolbox/-/archive/${version}/bctoolbox-${version}.tar.gz"
-checksum=64409771baf978f826eb052c0349fd9350b5aef8fd4135c988627dc6489ace81
+checksum=cbfea331dde994122a8bf04f05c03da6592aa53612f1da93eca3932d5460f231
 
 bctoolbox-devel_package() {
 	depends="bctoolbox-${version}_${revision}"
diff --git a/srcpkgs/bctoolbox/update b/srcpkgs/bctoolbox/update
new file mode 100644
index 000000000000..d81a9df130ed
--- /dev/null
+++ b/srcpkgs/bctoolbox/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/bctoolbox/-/tags

From f4f0ce2aa08dabed229fcb71b028f7866373800e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:28:23 +0100
Subject: [PATCH 1307/2561] belcard: update to 5.1.12.

---
 srcpkgs/belcard/template | 4 ++--
 srcpkgs/belcard/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/belcard/update

diff --git a/srcpkgs/belcard/template b/srcpkgs/belcard/template
index 292ec35f1891..1d117f953d91 100644
--- a/srcpkgs/belcard/template
+++ b/srcpkgs/belcard/template
@@ -1,6 +1,6 @@
 # Template file for 'belcard'
 pkgname=belcard
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=FALSE -DENABLE_UNIT_TESTS=FALSE"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belcard/-/archive/${version}/belcard-${version}.tar.gz"
-checksum=6b8f6188630eb5aeec671c8c9d417aa37b04a2d3b0b0944866bcbf6a3b2baec2
+checksum=529c6cc7edbc505495a850713020eb4d09a6aaa8d19983322f68ef0705081efe
 
 belcard-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/belcard/update b/srcpkgs/belcard/update
new file mode 100644
index 000000000000..b9a3c00d7d74
--- /dev/null
+++ b/srcpkgs/belcard/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/belcard/-/tags

From a147668ee8e444dac4a60ab4df335822df817cc7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:05 +0100
Subject: [PATCH 1308/2561] belle-sip: update to 5.1.12.

---
 srcpkgs/belle-sip/template | 4 ++--
 srcpkgs/belle-sip/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/belle-sip/update

diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index d1d46c11bd3b..ccf66d4b985c 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,6 +1,6 @@
 # Template file for 'belle-sip'
 pkgname=belle-sip
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DANTLR3_JAR_PATH=/usr/share/java/antlr3.jar -DENABLE_STRICT=OFF
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belle-sip/-/archive/${version}/belle-sip-${version}.tar.gz"
-checksum=f97e1dd8ab8eea4363187128d4ccf0223701c6efcd1e382226da25bd62ca3b24
+checksum=1a827db2d42eadd6825dc12f8c413ca3cf925e8084e5821d94f66d49b5c6f2db
 
 belle-sip-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/belle-sip/update b/srcpkgs/belle-sip/update
new file mode 100644
index 000000000000..f1c298cb081a
--- /dev/null
+++ b/srcpkgs/belle-sip/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/belle-sip/-/tags

From 7ddcb9a3601f404206ac7359ed3ffabeee7dda73 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:08 +0100
Subject: [PATCH 1309/2561] belr: update to 5.1.12.

---
 srcpkgs/belr/template | 4 ++--
 srcpkgs/belr/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/belr/update

diff --git a/srcpkgs/belr/template b/srcpkgs/belr/template
index 2e93a5492da2..299dc179a41b 100644
--- a/srcpkgs/belr/template
+++ b/srcpkgs/belr/template
@@ -1,6 +1,6 @@
 # Template file for 'belr'
 pkgname=belr
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=FALSE -DENABLE_TESTS=NO"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belr/-/archive/${version}/belr-${version}.tar.gz"
-checksum=6ef5ea9b730d5206cf278f6dd0dc0e3c87ab61a222f08cee50148b6868f6023b
+checksum=77f86470e12f8371a77c9b911705b585f97e0b983c31f33d529d3d19dc97fb56
 
 belr-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/belr/update b/srcpkgs/belr/update
new file mode 100644
index 000000000000..881207190078
--- /dev/null
+++ b/srcpkgs/belr/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/belr/-/tags

From 7710e410b2dd572d8025d809579eb8b083dc9610 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:15 +0100
Subject: [PATCH 1310/2561] bzrtp: update to 5.1.12.

---
 srcpkgs/bzrtp/template | 4 ++--
 srcpkgs/bzrtp/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/bzrtp/update

diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index 8f0b9823668d..463d7f82ec96 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,6 +1,6 @@
 # Template file for 'bzrtp'
 pkgname=bzrtp
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=FALSE -DENABLE_STATIC=FALSE"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/bzrtp/-/archive/${version}/bzrtp-${version}.tar.gz"
-checksum=53e94486fdb2bece03ebe0daf49b5d476cab977babec364cd04407aca25be4c2
+checksum=c1b44db05ab6d4df7a29d53c6aaff9a6cd79ce73d46d406f01d737e3c4cfb01e
 
 bzrtp-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bzrtp/update b/srcpkgs/bzrtp/update
new file mode 100644
index 000000000000..31738d52c44c
--- /dev/null
+++ b/srcpkgs/bzrtp/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/bzrtp/-/tags

From 6bd98e1b5f37417b49f8533a2a55559c437c259a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:19 +0100
Subject: [PATCH 1311/2561] linphone: update to 5.1.21.

---
 srcpkgs/linphone/template | 7 +++----
 srcpkgs/linphone/update   | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/linphone/update

diff --git a/srcpkgs/linphone/template b/srcpkgs/linphone/template
index c98b8c7e950e..d1af2d791c39 100644
--- a/srcpkgs/linphone/template
+++ b/srcpkgs/linphone/template
@@ -1,10 +1,9 @@
 # Template file for 'linphone'
 pkgname=linphone
-version=5.0.56
-# 5.0.57 requires an unreleased mediastreamer2
+version=5.1.21
 revision=1
-build_style="cmake"
 wrksrc="liblinphone-${version}"
+build_style="cmake"
 configure_args="-DENABLE_STRICT=FALSE
  -DENABLE_ADVANCED_IM=FALSE -DENABLE_DB_STORAGE=FALSE
  -DENABLE_LIME=NO -DENABLE_LIME_X3DH=NO -DENABLE_UNIT_TESTS=NO
@@ -21,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/liblinphone/-/archive/${version}/liblinphone-${version}.tar.gz"
-checksum=56bc789cda2507644477c1fad84169b3a39b9c26bad859763c6be66fb705c2db
+checksum=1bf7e6642bd36c8002291eda62109daac4c8f7125952e874b95969b02ab43405
 
 pre_build() {
 	echo "#define MS2_GIT_VERSION=unknown" > coreapi/gitversion.h
diff --git a/srcpkgs/linphone/update b/srcpkgs/linphone/update
new file mode 100644
index 000000000000..ccc0e69a4e33
--- /dev/null
+++ b/srcpkgs/linphone/update
@@ -0,0 +1,2 @@
+pkgname=liblinphone
+site=https://gitlab.linphone.org/BC/public/liblinphone/-/tags

From a51cbb3e084e9fa0e93e70989cea32696b5c9382 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:26 +0100
Subject: [PATCH 1312/2561] mediastreamer: update to 5.1.20.

---
 srcpkgs/mediastreamer/template | 4 ++--
 srcpkgs/mediastreamer/update   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/mediastreamer/update

diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index ba8b3dcc19e0..42f7cf4824ea 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,6 +1,6 @@
 # Template file for 'mediastreamer'
 pkgname=mediastreamer
-version=5.0.55
+version=5.1.20
 revision=1
 wrksrc="mediastreamer2-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org/technical-corner/mediastreamer2"
 distfiles="https://gitlab.linphone.org/BC/public/mediastreamer2/-/archive/${version}/mediastreamer2-${version}.tar.gz"
-checksum=4c15baa786f637c630afa7989ebdd8c8f9d424548cb02400e03fb5fe2d61e1ee
+checksum=f3f86284d48610c58cc5c104a56f392039495f3aded64b180c904877f42ecdb0
 
 mediastreamer-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/mediastreamer/update b/srcpkgs/mediastreamer/update
new file mode 100644
index 000000000000..9fcd24e296b0
--- /dev/null
+++ b/srcpkgs/mediastreamer/update
@@ -0,0 +1,2 @@
+pkgname=mediastreamer2
+site=https://gitlab.linphone.org/BC/public/mediastreamer2/-/tags

From f10f0ab0388f73c51c38e36378aa6d2b6515e07a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:36 +0100
Subject: [PATCH 1313/2561] ortp: update to 5.1.12.

---
 srcpkgs/ortp/template | 4 ++--
 srcpkgs/ortp/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ortp/update

diff --git a/srcpkgs/ortp/template b/srcpkgs/ortp/template
index f8b08f2b9be9..f5092b2eeff2 100644
--- a/srcpkgs/ortp/template
+++ b/srcpkgs/ortp/template
@@ -1,6 +1,6 @@
 # Template file for 'ortp'
 pkgname=ortp
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=OFF"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://www.linphone.org/technical-corner/ortp"
 distfiles="https://gitlab.linphone.org/BC/public/ortp/-/archive/${version}/ortp-${version}.tar.gz"
-checksum=2851d825f06ecfeeac921b73d7a932e2c8fcdbf49c83b09cd600db3e8025bc28
+checksum=dcd1b7c4876e8ca808c8c827329e90997bda51e8646399d426b529cddd727ee4
 
 ortp-devel_package() {
 	depends="bctoolbox-devel ortp-${version}_${revision}"
diff --git a/srcpkgs/ortp/update b/srcpkgs/ortp/update
new file mode 100644
index 000000000000..b1ec91983b27
--- /dev/null
+++ b/srcpkgs/ortp/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/ortp/-/tags

From aa05dcf31944b2171ac49513952115f804d68455 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 22:17:06 +0100
Subject: [PATCH 1314/2561] linphone-desktop: update to 4.4.1.

---
 srcpkgs/linphone-desktop/template | 6 +++---
 srcpkgs/linphone-desktop/update   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linphone-desktop/template b/srcpkgs/linphone-desktop/template
index 8699388aa9fc..44d72fc1466e 100644
--- a/srcpkgs/linphone-desktop/template
+++ b/srcpkgs/linphone-desktop/template
@@ -1,20 +1,20 @@
 # Template file for 'linphone-desktop'
 pkgname=linphone-desktop
-version=4.3.2
+version=4.4.1
 revision=1
 build_wrksrc="linphone-app" # The root cmake is glue code for their vendored libs
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-declarative"
 makedepends="bctoolbox-devel belcard-devel belle-sip-devel linphone-devel
  mediastreamer-devel qt5-declarative-devel qt5-quickcontrols2-devel
- qt5-svg-devel qt5-tools-devel"
+ qt5-svg-devel qt5-tools-devel qt5-webview-devel"
 depends="qt5>=5.9_1 qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects"
 short_desc="Linphone qt desktop"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.linphone.org/"
 distfiles="https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/${version}/linphone-desktop-${version}.tar.gz"
-checksum=dc7580816b5c289d9a4f21e9b3392a9b4a1a947c64ffbd6af504c8c01e3af111
+checksum=589e8ccc82e64fb1b7dbdc70b841240e02686079896d02bbe7dff782cc30bf8f
 replaces="linphone-gui>=0"
 CFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\""
 CXXFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\""
diff --git a/srcpkgs/linphone-desktop/update b/srcpkgs/linphone-desktop/update
index 7510d1a49c26..aaa59859d2f8 100644
--- a/srcpkgs/linphone-desktop/update
+++ b/srcpkgs/linphone-desktop/update
@@ -1 +1 @@
-pkgname=linphoneqt
+site=https://gitlab.linphone.org/BC/public/linphone-desktop/-/tags

From 1da2212c4bce416a6e18def882bd020c799bfb10 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 15 Apr 2022 16:19:20 +0200
Subject: [PATCH 1315/2561] lollypop: update to 1.4.33.

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 569c4e291772..02145a66a808 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.30
+version=1.4.33
 revision=1
 build_style=meson
 hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config"
@@ -14,4 +14,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/lollypop-${version}.tar.xz"
-checksum=393c3ed6431026b3214f380b7aa74ee31b054203855f7f5c928b1d25ad1b8ef5
+checksum=b1f806b3b844400131c7dc1bfad46843fc9ffcfbbf1fdeeab6bc348a74803529

From 367db42379f67fdcfb8768c8691a9ec6b003f031 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Apr 2022 16:44:11 +0200
Subject: [PATCH 1316/2561] cloud-hypervisor: update to 23.0.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index 3ecf069b2b07..c94d8e45e3fa 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=22.1
+version=23.0
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=73675ed730b5f23c4ce585918acff7496dcb585a4b91a672981c485bc7d94c37
+checksum=80f058d3ae00e23f4762fcc1c7091f22a14801c5913298f54fbfb8591da52ba9
 
 post_install() {
 	vlicense LICENSE-APACHE

From c5b273b6d93adf6d4588c6874bd73921e18ef858 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Apr 2022 16:46:43 +0200
Subject: [PATCH 1317/2561] libavif: update to 0.10.1.

---
 common/shlibs            | 2 +-
 srcpkgs/libavif/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fc5a031056fc..0d2a9fcc9b8e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4069,7 +4069,7 @@ libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
 libprimecount.so.7 primecount-7.2_1
 libprimesieve.so.9 primesieve-7.7_1
-libavif.so.13 libavif-0.9.3_1
+libavif.so.14 libavif-0.10.1_1
 libkdumpfile.so.9 libkdumpfile-0.4.1_1
 libamd.so.2 SuiteSparse-5.10.1_1
 libcholmod.so.3 SuiteSparse-5.10.1_1
diff --git a/srcpkgs/libavif/template b/srcpkgs/libavif/template
index 8b62eac56af1..6b210252322e 100644
--- a/srcpkgs/libavif/template
+++ b/srcpkgs/libavif/template
@@ -1,6 +1,6 @@
 # Template file for 'libavif'
 pkgname=libavif
-version=0.9.3
+version=0.10.1
 revision=1
 build_style=cmake
 configure_args="-DAVIF_BUILD_APPS=ON -DAVIF_BUILD_GDK_PIXBUF=ON
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/AOMediaCodec/libavif"
 distfiles="https://github.com/AOMediaCodec/libavif/archive/refs/tags/v${version}.tar.gz"
-checksum=bcd9a1f57f982a9615eb7e2faf87236dc88eb1d0c886f3471c7440ead605060d
+checksum=66e82854ceb84a3e542bc140a343bc90e56c68f3ecb4fff63e636c136ed9a05e
 
 post_install() {
 	vlicense LICENSE

From 8a8f30d60c5a3bf4bddc64abb3cbe98f177dbc41 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Apr 2022 16:47:01 +0200
Subject: [PATCH 1318/2561] efl: rebuild for libavif-0.10.1_1.

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index b7267b1905f9..714080ade250 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.26.2
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false

From af51e42be0d0fe87ff395cb94446a84deb9a4e7e Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 21 Aug 2021 17:52:02 +0200
Subject: [PATCH 1319/2561] memtest86+: switch to upstream binary

source built package has been reported to fail with more than 4GB of RAM.

Closes: #11691
---
 .../patches/00.memtest86+-5.01-no-scp.patch   |  10 --
 .../01.memtest86+-5.01-no-optimization.patch  |  18 ----
 .../02.memtest86+-5.01-compile-fix.patch      |  27 -----
 .../03.memtest86+-5.01-crash-fix.patch        | 100 ------------------
 .../04.memtest86+-5.01-fgnu89-inline.patch    |  15 ---
 ....memtest86+-5.01-fno-stack-protector.patch |  11 --
 srcpkgs/memtest86+/template                   |  20 ++--
 7 files changed, 7 insertions(+), 194 deletions(-)
 delete mode 100644 srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
 delete mode 100644 srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
 delete mode 100644 srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
 delete mode 100644 srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
 delete mode 100644 srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
 delete mode 100644 srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch

diff --git a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch b/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
deleted file mode 100644
index d998fc5a418c..000000000000
--- a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -21,7 +21,6 @@ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       
- 
- all: clean memtest.bin memtest 
--		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
- 
- # Link it statically once so I know I don't have undefined
- # symbols and then link it dynamically so I have full
diff --git a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch b/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
deleted file mode 100644
index d6453654a2b4..000000000000
--- a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/Makefile~	2014-01-08 01:30:11.355900076 +0000
-+++ b/Makefile	2014-01-08 01:31:19.387555469 +0000
-@@ -12,7 +12,7 @@
- AS=as -32
- CC=gcc
- 
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-+CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
- 	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
- 	
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
diff --git a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch b/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
deleted file mode 100644
index 348d5b152d22..000000000000
--- a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/io.h~	2013-08-10 02:01:58.000000000 +0000
-+++ b/io.h	2014-01-08 01:29:12.404465515 +0000
-@@ -31,7 +31,7 @@
-  */
- 
- #define __OUT1(s,x) \
--extern inline void __out##s(unsigned x value, unsigned short port) {
-+static inline void __out##s(unsigned x value, unsigned short port) {
- 
- #define __OUT2(s,s1,s2) \
- __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
-@@ -43,7 +43,7 @@
- __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
- 
- #define __IN1(s) \
--extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
-+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
- 
- #define __IN2(s,s1,s2) \
- __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
diff --git a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch b/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
deleted file mode 100644
index 56f40d7bcfa6..000000000000
--- a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/controller.c
-+++ b/controller.c
-@@ -2,6 +2,8 @@
-  * MemTest86+ V5 Specific code (GPL V2.0)
-  * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
-  * http://www.canardpc.com - http://www.memtest.org
-+ *
-+ * Edited by David McInnis Oct 4, 2014
-  */
- 
- //#include "defs.h"
-@@ -292,7 +294,7 @@ static void setup_nhm(void)
- 
- 	/* First, locate the PCI bus where the MCH is located */
- 
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
-@@ -327,7 +329,7 @@ static void setup_nhm32(void)
- 	ctrl.mode = ECC_NONE;
- 
- 	/* First, locate the PCI bus where the MCH is located */
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
-@@ -1424,7 +1426,7 @@ static void poll_fsb_amd64(void) {
- 	unsigned long dramchr;
- 	float clockratio;
- 	double dramclock;
--	unsigned int dummy[3];
-+	unsigned int dummy[4];
- 	int ram_type;
- 
- 	float coef = 10;
-@@ -2851,13 +2853,13 @@ static void poll_timings_nf4ie(void) {
- 
- static void poll_timings_i875(void) {
- 
--	ulong dev6, dev62;
-+	ulong dev6;
- 	ulong temp;
- 	float cas;
- 	int rcd, rp, ras, chan;
- 	long *ptr, *ptr2;
- 
--	pci_conf_read( 0, 6, 0, 0x40, 4, &dev62);
-+	pci_conf_read( 0, 6, 0, 0x40, 4, &dev6);
- 	ptr2=(long*)(dev6+0x68);
- 
- 	/* Read the MMR Base Address & Define the pointer */
---- a/init.c
-+++ b/init.c
-@@ -7,6 +7,8 @@
-  *
-  * Released under version 2 of the Gnu Public License.
-  * By Chris Brady
-+ *
-+ * Edited by David McInnis October 4, 2014
-  */
-  
- 
-@@ -914,7 +916,6 @@ void cpu_type(void)
- 			default:
- 				cprint(0, COL_MID, "Unknown Intel");
-  				break;
--			break;
- 		    }
- 
- 		}
---- a/main.c
-+++ b/main.c
-@@ -422,7 +422,7 @@ void test_start(void)
- 		//initialise_cpus();
- 		btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0);
- 		/* Draw the screen and get system information */
--	  init();
-+		init();
- 
- 		/* Set defaults and initialize variables */
- 		set_defaults();
-@@ -737,7 +737,7 @@ void test_start(void)
- 			    /* Do the same test for each CPU */
- 			    if (++cpu_sel >= act_cpus) 
- 			    	{
--	            cpu_sel = 0;
-+				cpu_sel = 0;
- 			        next_test();
- 			    	} else {
- 			        continue;
diff --git a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch b/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
deleted file mode 100644
index d044e72094cd..000000000000
--- a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-"Fix compilation of inline assembly with new gcc"
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/Makefile
-+++ b/Makefile
-@@ -13,7 +13,7 @@ AS=as -32
- CC=gcc
- 
- CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
--	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
-+	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -fgnu89-inline
- 	
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \
diff --git a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch b/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
deleted file mode 100644
index ddb3d5968682..000000000000
--- a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile	2019-03-29 16:41:29.629879497 +0100
-+++ b/Makefile	2019-03-29 16:41:55.351031244 +0100
-@@ -53,7 +53,7 @@
- 	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector test.c
- 
- random.o: random.c
- 	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index c4850769d62e..ecffaa62c401 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -1,26 +1,20 @@
 # Template file for 'memtest86+'
 pkgname=memtest86+
 version=5.01
-revision=5
-archs="i686 x86_64"
-short_desc="Advanced Memory Diagnostic Tool"
+revision=6
+archs="i686* x86_64*"
+short_desc="Advanced Memory Diagnostic Tool - upstream binary"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.memtest.org"
-distfiles="http://www.memtest.org/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039
+distfiles="https://www.memtest.org/download/${version}/memtest86+-${version}.bin.gz"
+checksum=78f6625b093de69537d99ed68e35b2a9e5d666504cb2533affab1967bd888fc8
 
+create_wrksrc=yes
 nostrip=yes
 noverifyrdeps=yes
 
-if [ "$XBPS_MACHINE" = "x86_64" ]; then
-	makedepends="gcc-multilib"
-fi
-
-do_build() {
-	make
-}
 do_install() {
-	vinstall memtest.bin 755 boot memtest86+
+	vinstall memtest86+-5.01.bin 755 boot memtest86+
 	vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d
 }

From cbed9a22d421356010d00b65df5538acefc2233e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 15 Apr 2022 11:44:22 -0400
Subject: [PATCH 1320/2561] neomutt: update to 20220415.

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 3e703630df81..75fadd569cb2 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20220408
+version=20220415
 revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
@@ -22,7 +22,7 @@ homepage="https://neomutt.org/"
 _test_files_hash=dc9fb32a701eb9dce4fda93c27da1d9b5be23231
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="bb138adb09b1f164fe690749e991a5505bf4f50b6ad478ffb085c609d5617cc7
+checksum="84982cb4c2fed63e90d71fab45faa90738bfc58050430606135cbd8924d94682
  bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947"
 python_version=3
 

From e6942fb07d124e4a1dccba9276e4f8e4dda7753b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 15 Apr 2022 18:17:14 +0200
Subject: [PATCH 1321/2561] chromium: update to 100.0.4896.127.

---
 srcpkgs/chromium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 96b34227a323..f655d29f3ba0 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=100.0.4896.60
+version=100.0.4896.127
 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="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc
+checksum=4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d
 
 lib32disabled=yes
 

From d13e568018fbd64e4bdabc09bb94d8c30f063429 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 17:45:38 +0200
Subject: [PATCH 1322/2561] libqalculate: update to 4.1.1.

---
 srcpkgs/libqalculate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libqalculate/template b/srcpkgs/libqalculate/template
index 0414d879df42..f0f03656d4c0 100644
--- a/srcpkgs/libqalculate/template
+++ b/srcpkgs/libqalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'libqalculate'
 # NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt'
 pkgname=libqalculate
-version=4.1.0
+version=4.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=d943e5285bdc0b3cd77b8f7a10391d7c753fc19b0ddd48e5d4179decf709d6ff
+checksum=b5611a91293be40fbe8723a81937e25ffb54e6ad6e60f282d044ed92f2d97002
 
 qalculate_package() {
 	short_desc="Multi-purpose desktop calculator - CLI version"

From 4ac07dc44993c8893b5198bc0a65617445691e09 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 17:45:44 +0200
Subject: [PATCH 1323/2561] qalculate-qt: update to 4.1.1.

---
 srcpkgs/qalculate-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
index d1995bdec691..0f1ac9de8561 100644
--- a/srcpkgs/qalculate-qt/template
+++ b/srcpkgs/qalculate-qt/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate-qt'
 # NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-gtk'
 pkgname=qalculate-qt
-version=4.1.0
+version=4.1.1
 revision=1
 build_style=qmake
 hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=b54b880750bf75e756f074c1fb6a38dcfe23ad9a53954b83a8a86981c6cb824e
+checksum=463e506331e8a49ec5ee355fe74da25d7a5cae945f5228081603be1f6d31f49f

From 01374914fd662062ba6eb7f4e5e3d7150c090eee Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 17:45:46 +0200
Subject: [PATCH 1324/2561] qalculate-gtk: update to 4.1.1.

---
 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 642bd9e5da80..ca1ab2e7dd98 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 'libqalculate' and 'qalculate-qt'
 pkgname=qalculate-gtk
-version=4.1.0
+version=4.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=8bab126f4f87e9321572f10e9262bf095c7e72470d4b61e2a173d273673bdeca
+checksum=8bf7dee899ba480e4f82c70cb374ed1229da28f7d3b9b475a089630a8eeb32e5

From 3b5106c01490c39aaa0819448b90dd88e09f49e2 Mon Sep 17 00:00:00 2001
From: lane-brain <lane@mailbox.org>
Date: Wed, 13 Apr 2022 23:00:33 -0400
Subject: [PATCH 1325/2561] New package: libgccjit-10.2.1_pre1

---
 common/shlibs                                |   1 +
 srcpkgs/libgccjit-devel                      |   1 +
 srcpkgs/libgccjit/files/gccgo-musl.patch     |   1 +
 srcpkgs/libgccjit/files/libgccjit-musl.patch |  63 ++++++
 srcpkgs/libgccjit/files/libgnarl-musl.patch  |   1 +
 srcpkgs/libgccjit/files/libssp-musl.patch    |   1 +
 srcpkgs/libgccjit/patches                    |   1 +
 srcpkgs/libgccjit/template                   | 216 +++++++++++++++++++
 srcpkgs/libgccjit/update                     |   2 +
 9 files changed, 287 insertions(+)
 create mode 120000 srcpkgs/libgccjit-devel
 create mode 120000 srcpkgs/libgccjit/files/gccgo-musl.patch
 create mode 100644 srcpkgs/libgccjit/files/libgccjit-musl.patch
 create mode 120000 srcpkgs/libgccjit/files/libgnarl-musl.patch
 create mode 120000 srcpkgs/libgccjit/files/libssp-musl.patch
 create mode 120000 srcpkgs/libgccjit/patches
 create mode 100644 srcpkgs/libgccjit/template
 create mode 100644 srcpkgs/libgccjit/update

diff --git a/common/shlibs b/common/shlibs
index 0d2a9fcc9b8e..ae4bb44c57a3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -59,6 +59,7 @@ libitm.so.1 libitm-4.7.3_1
 liblto_plugin.so.0 gcc-4.7.3_1
 libgcc_s.so.1 libgcc-4.4.0_1
 libgo.so.16 libgo-10.2.0_1
+libgccjit.so.0 libgccjit-10.2.1pre1_1
 libperl.so.5.34 perl-5.34.0_1
 libgmp.so.10 gmp-5.0.1_1
 libgmpxx.so.4 gmpxx-6.0.0_2
diff --git a/srcpkgs/libgccjit-devel b/srcpkgs/libgccjit-devel
new file mode 120000
index 000000000000..ad6b9f7639f3
--- /dev/null
+++ b/srcpkgs/libgccjit-devel
@@ -0,0 +1 @@
+libgccjit
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/files/gccgo-musl.patch b/srcpkgs/libgccjit/files/gccgo-musl.patch
new file mode 120000
index 000000000000..a093af857738
--- /dev/null
+++ b/srcpkgs/libgccjit/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/files/libgccjit-musl.patch b/srcpkgs/libgccjit/files/libgccjit-musl.patch
new file mode 100644
index 000000000000..d2ed16928c82
--- /dev/null
+++ b/srcpkgs/libgccjit/files/libgccjit-musl.patch
@@ -0,0 +1,63 @@
+diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
+index 5bccf591a..35f5e35ef 100644
+--- a/gcc/jit/jit-playback.c
++++ b/gcc/jit/jit-playback.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "diagnostic.h"
+ #include "stmt.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-playback.h"
+ #include "jit-result.h"
+ #include "jit-builtins.h"
+diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
+index a237d574f..5785e3269 100644
+--- a/gcc/jit/jit-recording.c
++++ b/gcc/jit/jit-recording.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "pretty-print.h"
+ #include "toplev.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-builtins.h"
+ #include "jit-recording.h"
+ #include "jit-playback.h"
+diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
+index f9c33c63c..75f21d275 100644
+--- a/gcc/jit/libgccjit.c
++++ b/gcc/jit/libgccjit.c
+@@ -18,13 +18,13 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+ #include "timevar.h"
+ #include "typed-splay-tree.h"
+ #include "cppbuiltin.h"
+-#include <pthread.h>
+ 
+ #include "libgccjit.h"
+ #include "jit-recording.h"
diff --git a/srcpkgs/libgccjit/files/libgnarl-musl.patch b/srcpkgs/libgccjit/files/libgnarl-musl.patch
new file mode 120000
index 000000000000..33ccc9789f93
--- /dev/null
+++ b/srcpkgs/libgccjit/files/libgnarl-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/files/libssp-musl.patch b/srcpkgs/libgccjit/files/libssp-musl.patch
new file mode 120000
index 000000000000..37a7489360f8
--- /dev/null
+++ b/srcpkgs/libgccjit/files/libssp-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/patches b/srcpkgs/libgccjit/patches
new file mode 120000
index 000000000000..c42218ef09df
--- /dev/null
+++ b/srcpkgs/libgccjit/patches
@@ -0,0 +1 @@
+../gcc/patches
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/template b/srcpkgs/libgccjit/template
new file mode 100644
index 000000000000..6f1d6256dcd6
--- /dev/null
+++ b/srcpkgs/libgccjit/template
@@ -0,0 +1,216 @@
+# Template file for 'libgccjit'
+# Revbump libtool when updating gcc, since it hardcodes some internal compiler paths
+# which use the version number.
+
+pkgname=libgccjit
+# we are using a 10-stable git snapshot alpine is using in order
+# to get regression fixes not yet incorporate into a stable release
+# it should be possible to switch back to stable with 10.3 or 11
+version=10.2.1pre1
+revision=1
+_patchver="${version%pre*}"
+_minorver="${_patchver%.*}"
+_majorver="${_minorver%.*}"
+_gmp_version=6.2.0
+_mpfr_version=4.1.0
+_mpc_version=1.1.0
+_isl_version=0.21
+wrksrc=gcc-${version/pre/_pre}
+short_desc="Just-In-Time Compilation library for GCC"
+maintainer="Lane Biocini <lane@mailbox.org>"
+homepage="https://gcc.gnu.org"
+license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
+# *-musl builders have issues fetching https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
+distfiles="
+ https://dev.alpinelinux.org/~nenolod/gcc-${version/pre/_pre}.tar.xz
+ https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz
+ ${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
+ ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
+ ${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2"
+checksum="772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526
+ 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f
+ 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
+ d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859"
+nopie=yes
+lib32disabled=yes
+makedepends="zlib-devel"
+hostmakedepends="tar texinfo perl flex"
+depends="gcc"
+checkdepends="dejagnu"
+
+post_extract() {
+	mv ${XBPS_BUILDDIR}/gmp-${_gmp_version} ${wrksrc}/gmp
+	mv ${XBPS_BUILDDIR}/mpfr-${_mpfr_version} ${wrksrc}/mpfr
+	mv ${XBPS_BUILDDIR}/mpc-${_mpc_version} ${wrksrc}/mpc
+	mv ${XBPS_BUILDDIR}/isl-${_isl_version} ${wrksrc}/isl
+}
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		for p in ${FILESDIR}/*-musl.patch; do
+			patch -p1 -i $p
+		done
+	fi
+}
+
+do_configure() {
+	# Define triplet for gcc build target
+	case "$XBPS_TARGET_MACHINE" in
+		i686) _target_triplet="i686-pc-linux-gnu";;
+		i686-musl) _target_triplet="i686-linux-musl";;
+		x86_64) _target_triplet="x86_64-unknown-linux-gnu";;
+		x86_64-musl) _target_triplet="x86_64-linux-musl";;
+		armv5tel) _target_triplet="arm-linux-gnueabi";;
+		armv5tel-musl) _target_triplet="arm-linux-musleabi";;
+		armv6l) _target_triplet="arm-linux-gnueabihf";;
+		armv7l) _target_triplet="armv7l-linux-gnueabihf";;
+		armv6l-musl) _target_triplet="arm-linux-musleabihf";;
+		armv7l-musl) _target_triplet="armv7l-linux-musleabihf";;
+		aarch64) _target_triplet="aarch64-linux-gnu";;
+		aarch64-musl) _target_triplet="aarch64-linux-musl";;
+		ppc) _target_triplet="powerpc-linux-gnu";;
+		ppc-musl) _target_triplet="powerpc-linux-musl";;
+		ppcle) _target_triplet="powerpcle-linux-gnu";;
+		ppcle-musl) _target_triplet="powerpcle-linux-musl";;
+		ppc64le) _target_triplet="powerpc64le-linux-gnu";;
+		ppc64le-musl) _target_triplet="powerpc64le-linux-musl";;
+		ppc64) _target_triplet="powerpc64-linux-gnu";;
+		ppc64-musl) _target_triplet="powerpc64-linux-musl";;
+		mips-musl) _target_triplet="mips-linux-musl";;
+		mipshf-musl) _target_triplet="mips-linux-muslhf";;
+		mipsel-musl) _target_triplet="mipsel-linux-musl";;
+		mipselhf-musl) _target_triplet="mipsel-linux-muslhf";;
+	esac
+
+	local _langs _args _hash
+	_hash=gnu
+	case "$XBPS_TARGET_MACHINE" in
+		mipselhf-musl) _args+=" --with-arch=mips32r2 --with-float=hard"; _hash=sysv;;
+		mipsel-musl) _args+=" --with-arch=mips32r2 --with-float=soft"; _hash=sysv;;
+		mipshf-musl) _args+=" --with-arch=mips32r2 --with-float=hard";;
+		mips-musl) _args+=" --with-arch=mips32r2 --with-float=soft";;
+		armv5*) _args+=" --with-arch=armv5te --with-float=soft";;
+		armv6l*) _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard";;
+		armv7l*) _args+=" --with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard";;
+		aarch64*) _args+=" --with-arch=armv8-a";;
+		ppc64le*) _args+=" --with-abi=elfv2 --enable-secureplt --enable-targets=powerpcle-linux";;
+		ppc64*) _args+=" --with-abi=elfv2 --enable-secureplt --enable-targets=powerpc-linux";;
+		ppc*) _args+=" --enable-secureplt";;
+	esac
+
+	# fix: unknown long double size, cannot define BFP_FMT
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*-musl) _args+=" --disable-decimal-float";;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		export CC_FOR_TARGET="$CC"
+		export GCC_FOR_TARGET="$CC"
+		export CXX_FOR_TARGET="$CXX"
+
+		_args+=" --host=$XBPS_CROSS_TRIPLET"
+		_args+=" --with-build-sysroot=${XBPS_CROSS_BASE}"
+	elif [ -z "$CHROOT_READY" ]; then
+		export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib${XBPS_TARGET_WORDSIZE}"
+		_args+=" --build=${_target_triplet}"
+	else
+		_args+=" --build=${_target_triplet}"
+	fi
+
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		_args+=" --disable-gnu-unique-object"
+		_args+=" --disable-symvers"
+		_args+=" libat_cv_have_ifunc=no"
+	else
+		_args+=" --enable-gnu-unique-object"
+	fi
+
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*) _args+=" --disable-vtable-verify";;
+		*) _args+=" --enable-vtable-verify";;
+	esac
+
+	export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}"
+	export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}"
+
+	# Disable explicit -fno-PIE, gcc will figure this out itself.
+	export CFLAGS="${CFLAGS//-fno-PIE/}"
+	export CXXFLAGS="${CXXFLAGS//-fno-PIE/}"
+	export LDFLAGS="${LDFLAGS//-no-pie/}"
+
+	# Needs explicit -fPIC
+	export CFLAGS+=" -fPIC"
+	export CXXFLAGS+=" -fPIC"
+
+	_args+=" --prefix=/usr"
+	_args+=" --mandir=/usr/share/man"
+	_args+=" --infodir=/usr/share/info"
+	_args+=" --libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+	_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+	_args+=" --enable-threads=posix"
+	_args+=" --enable-__cxa_atexit"
+	_args+=" --disable-multilib"
+	_args+=" --with-system-zlib"
+	_args+=" --enable-shared"
+	_args+=" --enable-lto"
+	_args+=" --enable-plugins"
+	_args+=" --enable-linker-build-id"
+	_args+=" --disable-werror"
+	_args+=" --disable-nls"
+	_args+=" --enable-default-pie"
+	_args+=" --enable-default-ssp"
+	_args+=" --enable-checking=release"
+	_args+=" --disable-libstdcxx-pch"
+	_args+=" --with-isl"
+	_args+=" --with-linker-hash-style=$_hash"
+	_args+=" --disable-sjlj-exceptions"
+	_args+=" --disable-target-libiberty"
+
+	# libgccjit compilation specific
+	_args+=" --enable-host-shared"
+	_args+=" --disable-bootstrap"
+	_args+=" --disable-libquadmath"
+	_args+=" --disable-libquadmath-support"
+	_args+=" --disable-libgomp"
+	_args+=" --disable-liboffloadmic"
+	_args+=" --disable-libada"
+	_args+=" --disable-libvtv"
+	_args+=" --disable-libsanitizer"
+	_args+=" --with-bugurl='https://github.com/void-linux/void-packages/issues'"
+
+	mkdir -p build
+	cd build
+
+	# If we are checking packages, we need to have c++ compiled
+	[ -z "$XBPS_CHECK_PKGS" ] && _langs="jit" || _langs="jit,c++"
+	_args+=" --enable-languages=${_langs}"
+	CONFIG_SHELL=/bin/bash \
+		${wrksrc}/configure ${_args}
+}
+
+do_build() {
+	make -C build ${makejobs}
+}
+
+do_check() {
+	make -C build/gcc check-jit RUNTESTFLAGS="-v -v -v"
+}
+
+do_install() {
+	make -C build/gcc DESTDIR=${DESTDIR} jit.install-common jit.install-info
+}
+
+post_install() {
+	vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
+}
+
+libgccjit-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+		vmove usr/share/info
+	}
+}
diff --git a/srcpkgs/libgccjit/update b/srcpkgs/libgccjit/update
new file mode 100644
index 000000000000..fb8dd58f2044
--- /dev/null
+++ b/srcpkgs/libgccjit/update
@@ -0,0 +1,2 @@
+site="https://gcc.gnu.org/releases.html"
+pattern="GCC \K[\d.]+(?=\<)"

From 4311f48aa99d732f75e57de2cc150763507ee892 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 15:54:16 +0200
Subject: [PATCH 1326/2561] emacs: enable support for native-compilation.

This enables native-compilation and provides precompiled elisp files
for emacs-x11 and emacs-gtk3.  The plain console emacs stays without
support for native compilation to keep it lean, as native-compilation
pulls in libgccjit (27MB) and gcc (172MB + deps)
as well as emacs-common-eln (15MB).

On slow machines, native compilation can be disabled by setting
(setq comp-deferred-compilation nil)
in your .emacs.
---
 srcpkgs/emacs-common-eln |  1 +
 srcpkgs/emacs/template   | 46 +++++++++++++++++++++++++++++++---------
 2 files changed, 37 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/emacs-common-eln

diff --git a/srcpkgs/emacs-common-eln b/srcpkgs/emacs-common-eln
new file mode 120000
index 000000000000..a7642dd168d6
--- /dev/null
+++ b/srcpkgs/emacs-common-eln
@@ -0,0 +1 @@
+emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 644e44cf4d06..aae0e3f6d225 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,13 +1,14 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=28.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
  $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
  $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)
- $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)"
+ $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)
+ $(vopt_with nativecomp native-compilation)"
 hostmakedepends="pkg-config tar"
 makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
  dbus-devel acl-devel
@@ -17,7 +18,8 @@ makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
  $(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
  $(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel)
  $(vopt_if json jansson-devel) $(vopt_if harfbuzz harfbuzz-devel)
- $(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)"
+ $(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)
+ $(vopt_if nativecomp libgccjit-devel)"
 depends="emacs-common-${version}_${revision}"
 short_desc="GNU Emacs editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -29,12 +31,16 @@ nocross=yes
 nopie=yes
 
 # Package build options
-build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp"
-desc_option_xpm="Enable support for XPM images"
-desc_option_sound="Enable support for sound"
+build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp nativecomp"
+desc_option_cairo="Enable support for drawing with Cairo"
+desc_option_gmp="Enable support for big numbers using GMP"
+desc_option_json="Enable support for native JSON parsing"
 desc_option_m17n="Enable support for m17n multilingual text processing"
-build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n png sound
- svg tiff xml xpm"
+desc_option_nativecomp="Enable support for native compilation"
+desc_option_sound="Enable support for sound"
+desc_option_xpm="Enable support for XPM images"
+build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp
+ png sound svg tiff xml xpm"
 
 pre_configure() {
 	# Just configuring in different directories results in
@@ -47,7 +53,8 @@ pre_configure() {
 
 do_configure() {
 	cd $wrksrc/nox
-	./configure --without-x $(vopt_with dbus) ${configure_args}
+	./configure --without-x $(vopt_with dbus) ${configure_args} \
+		--without-native-compilation
 
 	cd $wrksrc/x11
 	./configure --with-x-toolkit=athena --without-toolkit-scroll-bars \
@@ -60,12 +67,13 @@ do_configure() {
 
 do_build() {
 	make ${makejobs} -C nox
-	make ${makejobs} -C x11
+	make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
 	make ${makejobs} -C gtk3
 }
 
 do_install() {
 	make DESTDIR=$DESTDIR -C ${wrksrc}/nox install
+	make DESTDIR=$DESTDIR -C ${wrksrc}/x11 install-eln
 	rm -f ${DESTDIR}/usr/bin/ctags
 	rm -f ${DESTDIR}/usr/lib/systemd/user/emacs.service
 	rm -f ${DESTDIR}/usr/share/man/man1/ctags.1*
@@ -84,8 +92,23 @@ emacs-common_package() {
 	}
 }
 
+emacs-common-eln_package() {
+	short_desc+=" - common precompiled elisp"
+	if [ -z "$build_option_nativecomp" ]; then
+		build_style=meta
+	fi
+	pkg_install() {
+		if [ "$build_option_nativecomp" ]; then
+			vmove usr/lib/emacs
+		fi
+	}
+}
+
 emacs-x11_package() {
 	depends="emacs-common-${version}_${revision}"
+	if [ "$build_option_nativecomp" ]; then
+		depends+=" emacs-common-eln-${version}_${revision}"
+	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - X11 version"
@@ -99,6 +122,9 @@ emacs-x11_package() {
 
 emacs-gtk3_package() {
 	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
+	if [ "$build_option_nativecomp" ]; then
+		depends+=" emacs-common-eln-${version}_${revision}"
+	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - GTK+3 version"

From ffb6f9dd3d68e966fd5cc71efcb653767c0cefae Mon Sep 17 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, 16 Apr 2022 23:00:09 +0700
Subject: [PATCH 1327/2561] chroot-git: update to 2.35.2.

---
 srcpkgs/chroot-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 08a014086a96..94331ab41a8d 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.35.1
+version=2.35.2
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
@@ -10,7 +10,7 @@ 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=d768528e6443f65a203036266f1ca50f9d127ba89751e32ead37117ed9191080
+checksum=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From ac96a8763fa33a5cc66064dc054d5804c346e20a Mon Sep 17 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, 16 Apr 2022 22:59:30 +0700
Subject: [PATCH 1328/2561] git: update to 2.35.2.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 929472b982b2..865c814fca51 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.35.1
+version=2.35.2
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -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=d768528e6443f65a203036266f1ca50f9d127ba89751e32ead37117ed9191080
+checksum=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 534d93f8c40c548c8b0a708cb326d749bf119239 Mon Sep 17 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, 16 Apr 2022 23:05:27 +0700
Subject: [PATCH 1329/2561] chroot-git: update to 2.35.3.

---
 srcpkgs/chroot-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 94331ab41a8d..18efb65c4f67 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.35.2
+version=2.35.3
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
@@ -10,7 +10,7 @@ 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=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
+checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From d38c4e8dc3ca5679149952618ae8900f7a431aea Mon Sep 17 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, 16 Apr 2022 23:05:31 +0700
Subject: [PATCH 1330/2561] git: update to 2.35.3.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 865c814fca51..8b05a0f58024 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.35.2
+version=2.35.3
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -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=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
+checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From e58512eff1a361316d90985a53264a7cc1b24ae0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 20:17:28 +0300
Subject: [PATCH 1331/2561] checkbashisms: update to 2.22.1.

---
 srcpkgs/checkbashisms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template
index 69f7fbfbb7dd..1da339030ffe 100644
--- a/srcpkgs/checkbashisms/template
+++ b/srcpkgs/checkbashisms/template
@@ -1,6 +1,6 @@
 # Template file for 'checkbashisms'
 pkgname=checkbashisms
-version=2.21.7
+version=2.22.1
 revision=1
 wrksrc="devscripts-${version}"
 depends="perl"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/devscripts"
 changelog="https://salsa.debian.org/debian/devscripts/-/raw/master/debian/changelog"
 distfiles="${DEBIAN_SITE}/main/d/devscripts/devscripts_${version}.tar.xz"
-checksum=b03ae9a3214ea5492aa51519deddf0d46f8e59996b66aea1ed0dc1a1c5466ab1
+checksum=35dd5e6029d27be35b96e8c6e38b8aa6fba791a21371dac2de0f8cdee5fe33d5
 
 pre_install() {
 	vsed -i "s|###VERSION###|${version}|" scripts/checkbashisms.pl

From f3573670d4c29bf8bf41194718cd58592fd3e5f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Apr 2022 18:31:18 +0200
Subject: [PATCH 1332/2561] emacs: remove emacs-common-eln, put eln into binary
 packages.

The builds have different hashes, so the .eln files cannot be shared.
---
 srcpkgs/emacs-common-eln |  1 -
 srcpkgs/emacs/template   | 28 +++++-----------------------
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 120000 srcpkgs/emacs-common-eln

diff --git a/srcpkgs/emacs-common-eln b/srcpkgs/emacs-common-eln
deleted file mode 120000
index a7642dd168d6..000000000000
--- a/srcpkgs/emacs-common-eln
+++ /dev/null
@@ -1 +0,0 @@
-emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index aae0e3f6d225..b3130b1198d5 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=28.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
@@ -68,12 +68,11 @@ do_configure() {
 do_build() {
 	make ${makejobs} -C nox
 	make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
-	make ${makejobs} -C gtk3
+	make ${makejobs} -C gtk3 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
 }
 
 do_install() {
 	make DESTDIR=$DESTDIR -C ${wrksrc}/nox install
-	make DESTDIR=$DESTDIR -C ${wrksrc}/x11 install-eln
 	rm -f ${DESTDIR}/usr/bin/ctags
 	rm -f ${DESTDIR}/usr/lib/systemd/user/emacs.service
 	rm -f ${DESTDIR}/usr/share/man/man1/ctags.1*
@@ -84,6 +83,7 @@ do_install() {
 
 emacs-common_package() {
 	short_desc+=" - common files"
+	replaces="emacs-common-eln>=0"
 	pkg_install() {
 		vmove usr/share/emacs
 		vmove usr/share/man
@@ -92,23 +92,8 @@ emacs-common_package() {
 	}
 }
 
-emacs-common-eln_package() {
-	short_desc+=" - common precompiled elisp"
-	if [ -z "$build_option_nativecomp" ]; then
-		build_style=meta
-	fi
-	pkg_install() {
-		if [ "$build_option_nativecomp" ]; then
-			vmove usr/lib/emacs
-		fi
-	}
-}
-
 emacs-x11_package() {
 	depends="emacs-common-${version}_${revision}"
-	if [ "$build_option_nativecomp" ]; then
-		depends+=" emacs-common-eln-${version}_${revision}"
-	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - X11 version"
@@ -116,15 +101,12 @@ emacs-x11_package() {
 		make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/x11 install
 		rm -f ${PKGDESTDIR}/usr/bin/ctags
 		rm -rf ${PKGDESTDIR}/usr/share
-		rm -rf ${PKGDESTDIR}/usr/lib
+		rm -rf ${PKGDESTDIR}/usr/lib/systemd
 	}
 }
 
 emacs-gtk3_package() {
 	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
-	if [ "$build_option_nativecomp" ]; then
-		depends+=" emacs-common-eln-${version}_${revision}"
-	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - GTK+3 version"
@@ -132,6 +114,6 @@ emacs-gtk3_package() {
 		make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk3 install
 		rm -f ${PKGDESTDIR}/usr/bin/ctags
 		rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info}
-		rm -rf ${PKGDESTDIR}/usr/lib
+		rm -rf ${PKGDESTDIR}/usr/lib/systemd
 	}
 }

From af44b115d7ae9940547f5a0d4a32351db714f974 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Apr 2022 20:17:15 +0200
Subject: [PATCH 1333/2561] gzip: restore zless.

Don't depend on less to reduce bootstrap size.
---
 srcpkgs/gzip/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template
index 037dd3b27a4c..a01bc8cc5114 100644
--- a/srcpkgs/gzip/template
+++ b/srcpkgs/gzip/template
@@ -1,9 +1,10 @@
 # Template file for 'gzip'
 pkgname=gzip
 version=1.12
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
+configure_args="ac_cv_prog_LESS=less"
 short_desc="GNU compression utility (replacement for compress)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 59453a587d7dec153fcb8cf8fb5c68d6a3b4a246 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sat, 16 Apr 2022 14:39:39 -0400
Subject: [PATCH 1334/2561] common/travis/fetch_upstream.sh: fix CI for new git
 version

---
 common/travis/fetch_upstream.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index 45315563e0b1..5c0256fdbe17 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -8,5 +8,8 @@ elif command -v git >/dev/null 2>&1; then
 	GIT_CMD=$(command -v git)
 fi
 
+# required by git 2.35.2+
+$GIT_CMD config --global --add safe.directory /__w/void-packages/void-packages
+
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
 $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From 1acd655227d82f1b133f533884d3673284fb5161 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Apr 2022 05:25:00 +0200
Subject: [PATCH 1335/2561] emacs: disable nativecomp on 32-bit ppc

---
 srcpkgs/emacs/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index b3130b1198d5..d876ebfe1682 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -39,9 +39,15 @@ desc_option_m17n="Enable support for m17n multilingual text processing"
 desc_option_nativecomp="Enable support for native compilation"
 desc_option_sound="Enable support for sound"
 desc_option_xpm="Enable support for XPM images"
-build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp
+build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n
  png sound svg tiff xml xpm"
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) build_options_default+=" nativecomp";;
+	ppc*) ;; # assembler errors
+	*) build_options_default+=" nativecomp";;
+esac
+
 pre_configure() {
 	# Just configuring in different directories results in
 	# spurious emacs rebuilds with incompatible build numbers.

From 62e482edcf9c982d7814bfa5f5860bda6b3b0b9c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Apr 2022 21:06:11 +0300
Subject: [PATCH 1336/2561] xfce4-terminal: update to 1.0.1.

---
 srcpkgs/xfce4-terminal/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index b25c1f0ab755..07c3bfaa46e5 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
-version=0.8.10
-revision=3
+version=1.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,5 +11,6 @@ short_desc="Modern terminal emulator primarly for the Xfce desktop environment"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/xfce4-terminal/start"
+changelog="https://gitlab.xfce.org/apps/xfce4-terminal/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=7a3337c198e01262a0412384823185753ac8a0345be1d6776a7e9bbbcbf33dc7
+checksum=1d3690871d3fe97f8be0908ace0443819e513f6366f851682aafe17059e1eba5

From 286562b2b19fea31b555884e81f2a175a6d57ef2 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 17 Apr 2022 04:22:01 -0400
Subject: [PATCH 1337/2561] font-iosevka: update to 15.2.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index e293af01166b..c971135ce5fb 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=15.1.0
+version=15.2.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- 4bb10d12681546fa129f9105706d6f55c346b75418a19793fb300f0bd4e5991d
- e05995a4b66592d5868b7e667bba8a5f1822499fc53c6cd7a8abf3e40f8b8895"
+ b6b6bb50cd3c3db49739bea9fb5c92c22647631eb1b5a35aa7f48358c07ef529
+ 45c853ac53b638457d943c0ccf7cf12ca77219ba7e092d7ac17ed965c5482da9"
 
 font_dirs="/usr/share/fonts/TTF"
 

From e9b0680d3e68a63a8bf023e0fc7621999be7a106 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 17 Apr 2022 19:15:57 +0200
Subject: [PATCH 1338/2561] gettext: fix build with automake 1.16.4

Closes: #34866, #34810
---
 srcpkgs/gettext/patches/automake-1.16.4.patch | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 srcpkgs/gettext/patches/automake-1.16.4.patch

diff --git a/srcpkgs/gettext/patches/automake-1.16.4.patch b/srcpkgs/gettext/patches/automake-1.16.4.patch
new file mode 100644
index 000000000000..9de0e0b1208f
--- /dev/null
+++ b/srcpkgs/gettext/patches/automake-1.16.4.patch
@@ -0,0 +1,52 @@
+From d1836dbbd6a90b4c0ab79bc5292c023f08b49511 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sun, 8 Aug 2021 02:08:43 +0200
+Subject: [PATCH] libtextstyle: Make gl_INIT_PACKAGE work with Automake >=
+ 1.16.4.
+
+Reported and analyzed by Nicole Mazzuca <mazzucan@outlook.com> in
+<https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00002.html>.
+
+* m4/init-package-version.m4 (gl_INIT_PACKAGE): Use a new macro gl_INIT_EMPTY.
+(gl_INIT_DUMMY): Expand to empty in two steps, via a new macro gl_INIT_DUMMY2.
+---
+ libtextstyle/m4/init-package-version.m4 | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/libtextstyle/m4/init-package-version.m4 b/libtextstyle/m4/init-package-version.m4
+index f131a844f..a26b1ab88 100644
+--- a/libtextstyle/m4/init-package-version.m4
++++ b/libtextstyle/m4/init-package-version.m4
+@@ -1,5 +1,5 @@
+-# init-package-version.m4 serial 1 (gettext-0.18)
+-dnl Copyright (C) 1992-2009 Free Software Foundation, Inc.
++# init-package-version.m4 serial 2
++dnl Copyright (C) 1992-2021 Free Software Foundation, Inc.
+ dnl This file is free software, distributed under the terms of the GNU
+ dnl General Public License.  As a special exception to the GNU General
+ dnl Public License, this file may be distributed as part of a program
+@@ -77,7 +77,7 @@ AC_DEFUN([gl_INIT_PACKAGE],
+             m4_bpatsubst(m4_dquote(
+                 m4_defn([AM_INIT_AUTOMAKE])),
+               [AC_PACKAGE_NAME], [gl_INIT_DUMMY])),
+-          [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])),
++          [AC_PACKAGE_TARNAME], [gl_INIT_EMPTY])),
+       [AC_PACKAGE_VERSION], [gl_INIT_DUMMY])
+     [AC_SUBST([PACKAGE], [$1])
+      AC_SUBST([VERSION], [$2])
+@@ -85,7 +85,11 @@ AC_DEFUN([gl_INIT_PACKAGE],
+   m4_define([AM_INIT_AUTOMAKE],
+     m4_defn([gl_RPL_INIT_AUTOMAKE]))
+ ])
+-m4_define([gl_INIT_DUMMY], [])
++m4_define([gl_INIT_EMPTY], [])
++dnl Automake 1.16.4 no longer accepts an empty value for gl_INIT_DUMMY.
++dnl But a macro that later expands to empty works.
++m4_define([gl_INIT_DUMMY], [gl_INIT_DUMMY2])
++m4_define([gl_INIT_DUMMY2], [])
+ AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [
+   m4_ifval([$2],
+     [m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])])
+-- 
+2.17.1
+

From de2f93ce1d2ab34d15496f5c60f18641e8e51511 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 15 Dec 2021 22:38:17 +0100
Subject: [PATCH 1339/2561] xbps-src: make -E ignore remote repositories with
 -N

---
 common/xbps-src/shutils/common.sh | 10 +++++++++-
 xbps-src                          |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 47ff365e9ff2..36038af980c9 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -472,7 +472,15 @@ setup_pkg() {
     fi
     makejobs="-j$XBPS_MAKEJOBS"
     if [ -n "$XBPS_BINPKG_EXISTS" ]; then
-        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)"
+        local extraflags=""
+        if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
+            extraflags="-i"
+            # filter out remote repositories
+            for repo in $(xbps-query -L | awk '{ print $2 }' | grep '^/host/'); do
+                extraflags+=" --repository=$repo"
+            done
+        fi
+        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver $extraflags 2>/dev/null)"
         if [ "$_binpkgver" = "$pkgver" ]; then
             if [ -z "$XBPS_DEPENDENCY" ]; then
                 local _repo="$($XBPS_QUERY_XCMD -R -prepository $pkgver 2>/dev/null)"
diff --git a/xbps-src b/xbps-src
index 8488c5a3a49c..47023a723539 100755
--- a/xbps-src
+++ b/xbps-src
@@ -157,7 +157,7 @@ $(print_cross_targets)
 -C  Do not remove build directory, automatic dependencies and
     package destdir after successful install.
 
--E  If a binary package exists in a local repository for the target package,
+-E  If a binary package exists in a repository for the target package,
     do not try to build it, exit immediately.
 
 -f  Force running the specified stage (configure/build/install/pkg)

From 7b2f324c806506514ffb32b1a99d3bfdc41db10c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:37 +0200
Subject: [PATCH 1340/2561] attica: update to 5.93.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 1222f0cc9a60..47179ef8bd69 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bf647c7736acbbb99ff1557339f71b5efd5a7591b2af83b482d37d35516bc933
+checksum=81c18009911beb07d1868de78dd7fc1c4b1e8312bd95d916f4d4a80a800592e1
 
 do_check() {
 	cd build

From c3e83af15812f8dee9a7e175d11656751e40bd81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:39 +0200
Subject: [PATCH 1341/2561] baloo5: update to 5.93.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 9f6d3c93f69a..f687851bcda5 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.92.0
+version=5.93.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=283570583da0f85b2001ca600b9657e3a3fb9c2dcdd3ea8728553e212e50a475
+checksum=25d11569fddb8ad0dddbaa91cedd3d96f0ad58a2cc23de920950db6ba3aed5cd
 
 do_check() {
 	cd build

From c37b86fb51c3566cc343ee821f45be243ceb53f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:41 +0200
Subject: [PATCH 1342/2561] bluez-qt5: update to 5.93.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 2893e694f79c..e6939e618cf3 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f58d2483ed2db9cb77621bce3b3c6babd8d1153954030c0dc52ce399c6d28ab6
+checksum=ab5d84eaa37791b57c8379282a3c3afd7ef0b2ebbef83c3f12f6b3bfd9123624
 
 do_check() {
 	cd build

From 00b5584166bc9208fc00b103ff72778bbbe3d756 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:42 +0200
Subject: [PATCH 1343/2561] breeze-icons: update to 5.93.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 017805c60580..4aa9c5c952b8 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.92.0
+version=5.93.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=49e09663989fd3498d61cb7518c741c87a702689b6d6074097d628264a064366
+checksum=4367dfa6b48aa645a3680489be96e03a9a6fc20f57277b3ca5e37ce8df4d03e6
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From a99cb53cfa33a854fa47fe4c1883c34a0d7b5f45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:44 +0200
Subject: [PATCH 1344/2561] extra-cmake-modules: update to 5.93.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 9c034a06303f..19615d19ee47 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f89a238bc5f28738db25e29296b75b4f795e3e9bfe3a8f1f9390648749d303ef
+checksum=093dea7b11647bc5f74e6971d47ef15b5c410cba2b4620acae00f008d5480b21
 python_version=3
 
 do_check() {

From 461ecd7f4b370c307a3edeb78a502551d8f25a80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:45 +0200
Subject: [PATCH 1345/2561] frameworkintegration: update to 5.93.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 9840b077f5cb..130a97e3755a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bd8ef6f6656c9756a56fbfa1dc91273426ef3ea5fae3e7a4c7dbeddfbbe3ec5d
+checksum=156e54c9ee679bda943a279c28c6a834ca02e991b3f53a1b92f8c3931388a2a6
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 7a28aa70658babebe1f8aab9470308d3115ec897 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:47 +0200
Subject: [PATCH 1346/2561] kactivities5-stats: update to 5.93.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 8957274d1f85..5fa940f06eee 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=2206132e0edbb8271f77bb6c45e794b8d3baa3d9b4f94aba005556f9fa3ff751
+checksum=f1069872228e05aea349a0d3f7961da27d1aad3e4c28d0a408fceb98edef03a8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 3e774b987a473a82b2149a013a290cfa7d4d8033 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:48 +0200
Subject: [PATCH 1347/2561] kactivities5: update to 5.93.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 75438b590eef..467b2ed2fed8 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=fc06b6fc111f5ed8450c1c1c96f36188328b2292001ca3bf3293d0f68678dbcd
+checksum=eb6b204382d3bba1b32b5752a3e8382a5a7bbd8be4b95b774c68c501a2f16843
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From fd00f48b612eb47e9a5e329c382fe6440ce3e8b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:50 +0200
Subject: [PATCH 1348/2561] kapidox: update to 5.93.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 164a36aa99a3..5e8664d5b6e6 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=python3-module
 hostmakedepends="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=4f5201de5878bc3fb24f9e2ebd387c0a12d7a27c407636bc878bab5a3999a56d
+checksum=4228326a35342de8f0a301ed8afa379ef2102d99588a79808e7e86f2a4f81d5b
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From dcf6afe8aaa78fc04b2f24b38392ecc917502525 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:51 +0200
Subject: [PATCH 1349/2561] karchive: update to 5.93.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 109cc7a0ec29..dcc4a9d14cb5 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5076a28c3a10ab755454c752fa563a4be7ad890f391c43aaa2ee4ee4b6a99fae
+checksum=61e326a840860270b7f8b9e8966462085b4f309be5c3a84c3b265eb95694c7fb
 
 karchive-devel_package() {
 	short_desc+=" - development"

From cc7ba37ca5c439f0e4b7f46193ca26d50d154c70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:53 +0200
Subject: [PATCH 1350/2561] kauth: update to 5.93.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 05ea13c55c39..8877514c6a7c 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44824bf68ee510d8aa0189a9d4b44568b0fe20d17ba45e3b739db1927bfa4728
+checksum=34580078bfdf631835f3ac52955f2149209908b935a7cfec6fe5b4956c3ada6c
 
 do_check() {
 	cd build

From a9e799f594772e5c7106c0e0bafbd683a9450ff6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:55 +0200
Subject: [PATCH 1351/2561] kbookmarks: update to 5.93.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index c845e8909a62..cf60805f2206 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99504e761621b56e07a561e1caea196fe4623c9334b889f081e3da8e4a19d543
+checksum=3eeff795ff99be90b0d59c6e5fbef02022e9fb48c9b4dab098a3c27e10fd863f
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 223f25295acac5199d5bdc387ce9794ae128d483 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:56 +0200
Subject: [PATCH 1352/2561] kcalendarcore: update to 5.93.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 3359712d3db9..4e7766af00c4 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.92.0
+version=5.93.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=6ff2e68dfb8b92e0f181f3f19d20991bfd589b4a047b313af908c41391560b3a
+checksum=1609bc141739fce0abed59a353a0e356f4fa7a1b3659d3bc77737010875c1d3f
 replaces="kcalcore>=0"
 
 do_check() {

From 84d4f22225e2e3d7c0005846e723ad7463e482b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:58 +0200
Subject: [PATCH 1353/2561] kcmutils: update to 5.93.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index bf26425f364f..19bea8671950 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dd49e658fc85c215442a7fa9d2435819f0bef13c997a6c2a51557b82e1bc8d3a
+checksum=1445f978b7ffd69fd7c25d965812755679c4fdba23eb9837da37a8b5b2d30d6d
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 7b036b62d535048a9c9e0b29c18aa3fa0b49fd16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:59 +0200
Subject: [PATCH 1354/2561] kcodecs: update to 5.93.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ccc8f79b638..0a5c8577d249 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6e5b7a453948d5fa0482715eaf4a0c9abe5b902a0aca15540a04b1a1b60d275
+checksum=0efc5c8baab3142f8a0ab9369b255061772a57a80fb616b7305bf98235b2288b
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 036c275d586be816419ab5b286904edc5e1fc1cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:00 +0200
Subject: [PATCH 1355/2561] kcompletion: update to 5.93.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 8514a8625df8..fb4b7970b807 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,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=08f1525c6cee8babe399c941bb85d04be9dade0341d1d85c6beccd2e93dc7ceb
+checksum=7f8c9355e8875b619ca852741e972f41c252aa2e95b439161acc7b32d9e8fb9c
 
 kcompletion-devel_package() {
 	short_desc+=" - development"

From eed885d78c8544986988f9f9e9c4bf9fb95a9e6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:02 +0200
Subject: [PATCH 1356/2561] kconfig: update to 5.93.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 44dc8ae429da..402cf928ecbb 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7801b641b88368a0c021272073c692337b42ee28f0025d106942c8ce873b0523
+checksum=71857c20d4829017c22dd6d46ae5a642c86344960e21bc1520458fb76d02c06e
 
 do_check() {
 	cd build

From 2a09e6772bf9de5ea68a8ca15101a9423026aad8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:03 +0200
Subject: [PATCH 1357/2561] kconfigwidgets: update to 5.93.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index f14d66ae93ef..a8fec7e42dbb 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=4259eed35d9ac307ecc30e64833bad7a89ef58fc7125054eb39716d27a4a274a
+checksum=db18e0f2217ead6dd6f5877551902d5da86aa026686e3c564f5f96be279f24bb
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 8bbfbb556049d3a61022ed3f7847a44b95c3cb7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:05 +0200
Subject: [PATCH 1358/2561] kcontacts: update to 5.93.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 544ae3c7f4cd..bf35f07ce999 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.92.0
+version=5.93.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=1276006e50f507216a8241ca4b26b02c67c42e5bee26a6b391db6ae4f72533ce
+checksum=5d7c8c6c6ccfa99188d9e4d7ab6165ec5b2bceea59a01edc6b309910fd604c75
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 5577f4824beada26a5fb4524236de42196f5549b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:06 +0200
Subject: [PATCH 1359/2561] kcoreaddons: update to 5.93.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 4838e315b9d0..0db03a77e30b 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df5f718f324aa2b58191438c8aa5f7498a7997eff990d16ffbc9f19efd1a6667
+checksum=920a278af97dea3add06770a6f3604744c20d667973cb71cf477145785dbf043
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From df36f947307bc6492cf2534155e9f61c5314248c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:07 +0200
Subject: [PATCH 1360/2561] kcrash: update to 5.93.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index b9fadfc544d0..c05bc4600336 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9bc5605b5026f55d9c2c1ca32c79842c3ad0f5c042e480fe1e7027b2692526c7
+checksum=2ff8d6c6924b2b752ef4a929390606bb55ce2aa55c582927269bd65556992dd6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 201bacdd2293d40298726238aae3b60c434ce219 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:09 +0200
Subject: [PATCH 1361/2561] kdav: update to 5.93.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index caa894c1356c..32b1865fbe2d 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.92.0
+version=5.93.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=f3b16c473b104f83f6124f96f2b06a6c72a447eb19ba31a90e3f4725e732b1c4
+checksum=a7d3d40120f0a1b20f8492ea1635507a95e041582f5496a133de24720934ad68
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 8b488a4a813481c4a0cecc4f07079a188e526896 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:10 +0200
Subject: [PATCH 1362/2561] kdbusaddons: update to 5.93.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 741652529177..5e03127aa8a2 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7c03f33cc49ffa80e509f654f410cb142e917bceb2f35f08836dc46ed268ae54
+checksum=cc2c74501e65b97af1849ff454e51393f3a07755c155854bdee741a006822ad9
 
 do_check() {
 	cd build

From a8137788083d5774de5fd6e0016bf9b92a8f83ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:11 +0200
Subject: [PATCH 1363/2561] kdeclarative: update to 5.93.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 2c6a351f34f3..96902ea275a9 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe964d77fea37c04eee3863d2b4227b76e33f16583906c284b532a461982d5b3
+checksum=08a945c793aa8d89d87c42d29c9c11e7c28c47916ae728369ab478892d325067
 
 do_check() {
 	cd build

From b5e2c1b79679b95e518cbb2279c89c6e17748e77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:13 +0200
Subject: [PATCH 1364/2561] kded: update to 5.93.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 15d1ebbf684e..30238cc5f878 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8335531b856cb361ab2e5b390b333eb3405bac4e2bc7c0305994704bd0540e6c
+checksum=1992310921cccaf8fa2ca1abc8328aec5bc2e60a3d9f562f25b30885378159df
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From f089ef914d6b6b361d690d3eede51f83ac061df7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:15 +0200
Subject: [PATCH 1365/2561] kdelibs4support: update to 5.93.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index 5e8bc71495b1..ae42683b9b16 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=292e5e84ad8d7de90f0666b51f085a25b7a9faf521c58379d470d2994004ede0
+checksum=6a3e1d80cc6babc12930f24f9afd1ed10b46ae58ea71d44a466178212b07377c
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From baefe64d34a1b8af866eec53766e58a63df458a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:16 +0200
Subject: [PATCH 1366/2561] kdesignerplugin: update to 5.93.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 8b811b777580..b81b6562cf66 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=066859b345da224f5edb601a5f448540330c9a286980b0c34169646c26a22a4e
+checksum=f19ab4fc1ed58b89642d8f9f75a5da2f2ef0093c97183f336ffeb7208e628aaf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From db7c87d1fbe35b7bba59e1a27193d4e2747585d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:17 +0200
Subject: [PATCH 1367/2561] kdesu: update to 5.93.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 0ba31e7e1a34..1271d28ade36 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4687dc87a9ada0675801e0c575467bb5f7f7fe21b67ae2ffd1fed80736f95efa
+checksum=7f029d9a8959f0e2ca516ab3fb6b4ebd49ca0f0d19c72369451b6894d8138dbf
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 5d4882fffb104eed57c7a07d8d35335c403888a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:19 +0200
Subject: [PATCH 1368/2561] kdewebkit: update to 5.93.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index df9fd862a13f..c667f015e07b 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=4d0a773cad86a642cb90d9844757569f2e2e9d1e96ccf78f73bee885c908d1b6
+checksum=a2fe9b5660763d4dd74244c00bf7b1a407438279a81f2a3ef3813ea250fd2f55
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From ec59ac67b502214d7c0bd540f1888efe09f90a84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:20 +0200
Subject: [PATCH 1369/2561] kdnssd: update to 5.93.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index a48bf7f3e254..42554c854079 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f36af49faab84d8ae7ec46f1ba3300c9cdd3d8820dd1e7e48c5c37bcdd844d4
+checksum=dc97364f14b5867ea5bb2986f6ad3c84ab1acc952f50d460b3e9aed03f2f903b
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 752f1c83c83877ca0ab0626a8029d240215be746 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:21 +0200
Subject: [PATCH 1370/2561] kdoctools: update to 5.93.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 5e38783fc1b3..a43404728d1c 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=86a3aeb8b91dec0e1cd81b646654ebd750a8aedfac9b4d53b9b0019a91720870
+checksum=25e83ff151c53667b94e25a5c41993796164683a43913820a5651f3610b65d5c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From 1127da4b3c2180fd63777bc756cfb73398c10bd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:23 +0200
Subject: [PATCH 1371/2561] kemoticons: update to 5.93.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 2a4fa32fee02..5b7281e3bca7 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fdcfe30941c18a9cb29b58459fbb2ae54a55fd5a0e8688f0c59a7cc7ebf09f07
+checksum=83ca3df374935cf103a8fdaa85900d0acadbffc9d3aa8bfed073e804cd5ae410
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 87ed5bb7c3b6f1efbef2b3a87c645595110d3821 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:25 +0200
Subject: [PATCH 1372/2561] kfilemetadata5: update to 5.93.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index ab36e2d86496..eb162fdff6d0 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d624d3551094cf73d802b6e95bcd78577ce9eb1e9cbb9a8f340dcad066ea15ce
+checksum=3015c071a5f068f6e45d36238aa0243d3788a95ec84362ba79ed0369e676a816
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 1c462cb0acbcbe2c3b7c8369183a534112980dfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:26 +0200
Subject: [PATCH 1373/2561] kglobalaccel: update to 5.93.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 2405d1b174d6..7df12f5a2476 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=be7b1e279b63678ec4042f896b159d11c115d05e9831cde6cd67ef4b8e581452
+checksum=c806b8f2b029c7632d99c55cb711f9f4c1697555fde53ad4f67167efee97b712
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From f56724f9ae030841b3a61b1f8d3f2b6719a3d034 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:27 +0200
Subject: [PATCH 1374/2561] kguiaddons: update to 5.93.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index ea01d37e9ab4..72f3ba0d1e74 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.92.0
+version=5.93.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=0f6775a565f22900b0de53daa5fe73f7d7e592663e0bb442a8e26ffab27fdf5f
+checksum=27f26392140bd1abcb86c154fd6fd87e50b2493787827b2b1cacaf76544af40a
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From 8c88ccaca462781546d12fd7897e07b4316fcdc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:29 +0200
Subject: [PATCH 1375/2561] kholidays: update to 5.93.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 163b2dad1ca3..eaa54144eb21 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.92.0
+version=5.93.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=0ed382c49fb10af87bfa3845a3919ed097c9f808f3a5dbb631ef4e68c86b4b10
+checksum=0d4a1fb823501ee73b2c4d80468777adedf93c80f36b3a680cad91cc6704b841
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 8a561c4ae6c24fe970742559019dea702717cd42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:30 +0200
Subject: [PATCH 1376/2561] khtml: update to 5.93.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 7415d7e78a24..de17fc72af8e 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.92.0
+version=5.93.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=91a1d79ea382a25614810cd59f800f0a34c6e86c69ef6d0a08d2655f2a93171a
+checksum=31bfb6752ed7248b98e2bdc723e8e10c11b5fc9f7bf7edd8dedad1162f86614b
 
 khtml-devel_package() {
 	short_desc+=" - development"

From ec62269e26cd951a5ffe1f5d61a7bdcda9e0c882 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:32 +0200
Subject: [PATCH 1377/2561] ki18n: update to 5.93.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 8b0d17610f56..956d6aa70406 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -13,7 +13,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=058032e8e9556f1dadcf0c2bd633da6cfc9673e966dd113388e2b8aee2395777
+checksum=c2705400d175f18612dfe1afb28dc14accf614f7cfd65409dfa7fdcde5237339
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 22da28f8fa2eac50a94240864c261eeeae79b31e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:34 +0200
Subject: [PATCH 1378/2561] kiconthemes: update to 5.93.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 65250bdb3ac6..532d5ec8121e 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=2128710ff8bf0a7bbb699fe3a45b231c6b4607ba3e3a3a5d03c25c809233cb23
+checksum=75f7c5b34f4f1a228b4cbd81a284dbfdc0c0810ddd3a39e69f9363ab3598e2b4
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 621deb5360495ae07607b8e6ad6fc712f7d74992 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:35 +0200
Subject: [PATCH 1379/2561] kidletime: update to 5.93.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index e9ed68131b14..0556c9a0e3d0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e12f14229f7ee587becb5a693374045c460d38c55d61e21eefd78b8db39280d7
+checksum=4d9315dfe1faaeb62eae5ba60f683483de56317826d9b8da2bd58feebcb7b7d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 0994945e7426be6857463041bbfdd6b1800fb14c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:37 +0200
Subject: [PATCH 1380/2561] kimageformats: update to 5.93.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index ebd6e81db298..bc8b9f09a2c6 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
@@ -12,4 +12,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=ce049989125a49dc9bf8d2a2f2f5a2fec79e25a6343087b024fefd0131eca369
+checksum=15b0ed9de57af95979e0e40496b980f243cd81e2a400d5f64d12478e1dddc7d0

From 7b34c005c2a1069ccb1f0b46cbc62ceeb0ec6199 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:39 +0200
Subject: [PATCH 1381/2561] kinit: update to 5.93.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index a0b0aaee9112..f94cc0038dd6 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cb517912bf17d4b4f015cb1ab935eebadc52ece050f21b33fcb4e799b0c5f3ce
+checksum=db36a3bd5b30163b7a4ed8c7a907bec585acab841306755b0d8d32ef3d1ce498
 
 kinit-devel_package() {
 	short_desc+=" - development"

From e1a139716aee41294483b239dedbf8a42f1dfeb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:41 +0200
Subject: [PATCH 1382/2561] kio: update to 5.93.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index ba96fa5e727d..3047212a7964 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -16,7 +16,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=d4433f9890f71afe3d7d268e978e0ade96f506a38e41f7d57ffe832d96d44cb3
+checksum=d290a4bcfb5ec9eb9047c84a7c420df831131b92ab6c9d28a3aa0eef9f5d4c44
 
 do_check() {
 	: # Pain to get working in limited enviroment, excpects e.g. real disks

From 2ae16a6b10051aabbc99ad6f11b8ff1d45d51b1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:42 +0200
Subject: [PATCH 1383/2561] kirigami2: update to 5.93.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 1b85d94048f0..f504292b6363 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.92.0
+version=5.93.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=0adaff98ea70c577c9e6d7a688e5c52529a59f56a7d0c8ffce295f342e203d5c
+checksum=a7c2a824eb776011ae9dc94698588e8c6988ac399669723631fab26edd47ab8f
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 03574aed01165a528acd438d7265140d7bb9b988 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:44 +0200
Subject: [PATCH 1384/2561] kitemmodels: update to 5.93.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index beaa9faddb9e..bbf9bbf094c8 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e65c7f58d602b4b8160b34a3a841d1c7aac77695b73e53aa715765cf42a8e89b
+checksum=5bb9918b92ac37f1bc52c5abe04e8dbea54f31fa0101edad6d9e92c3a9f0485b
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 00322bc6929bd8517fde5aedbbc40b8f3b1d50ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:45 +0200
Subject: [PATCH 1385/2561] kitemviews: update to 5.93.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index ab3405ab8350..4518704713d6 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,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=058b4d4228387558b03aceb0ed286cbbe89ea07bb6fed968beba0b51678886d6
+checksum=93f01dec3b795b28cc6f6859873ebb941a9504eaafd13ff9f72b987d71e55abf
 
 kitemviews-devel_package() {
 	short_desc+=" - development"

From c772362e490ab2aac6c7f9a221e30e01b4ef59cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:46 +0200
Subject: [PATCH 1386/2561] kjobwidgets: update to 5.93.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index cbe04600c928..c79eb99642d6 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -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=df24b96f77ddbd2f63a6c2a3c54c4e712ef11a63b93c0b02d949d85af2fb8526
+checksum=62449b747d6fa5b32a1cb317b2b614172e42be3b85f39b02d6a07adc267c39fb
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From aff46c0d361faa2da339dbad3ec1128cc39c61ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:48 +0200
Subject: [PATCH 1387/2561] kjs: update to 5.93.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index 6990b50f3feb..263bf627d7ab 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=04072d527501c92f1e0144e9dcc114e108bfb5a2b50bed8a9b037474aaa6f118
+checksum=85aa01de9c2775564c895d3efbcfb8cc68da9a84f511176fef16742cbbf90942
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 0f5d4aa77976dca6cd80e1f9acce7865f926e610 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:49 +0200
Subject: [PATCH 1388/2561] kjsembed: update to 5.93.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index f606b2123fb1..d93a1a3b818c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d7c26538a0b7ac804565840d61df2681ea4b729abb6ecfbfcae3c20536ca6035
+checksum=fa55d3bf0b3f9026eb573cc909b1fbe53bea7090f3da465e9bb293dc0f81d424
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 23608c5c8203cd15b7e4378290e4af422f328385 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:50 +0200
Subject: [PATCH 1389/2561] kmediaplayer: update to 5.93.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 5c9a97d7230a..5ebec5415b18 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=fe38eb2ed593e2e68909129a042d52121b12b9350524a7a1463c24c9c58a97a6
+checksum=ada8afb5b0fea3af2112812792eff062d3830dfde4d8784b7e1fc3711e74830a
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 9b58792b358a9127ea17cad496032f251be47490 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:52 +0200
Subject: [PATCH 1390/2561] knewstuff: update to 5.93.0.

---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index ba2a38d746ca..dc604a8611cc 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b14aee55d7701c72d05030fad508a5cb89fee34656d4d84c2d977a3c2a66c3f
+checksum=2adc48e26c04c05f61f6ff1007f77ea43036b76d769535617e88d3f35ebb5759
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 1296b4f0777c8748f017c91398ee3ecdd766321e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:53 +0200
Subject: [PATCH 1391/2561] knotifications: update to 5.93.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 27a83bf27de8..782d259b261b 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c4e095e3d96140f19e9f2e2dbc74df174e29416455671fc6680828038ea94b7
+checksum=fe191b1fe55881d7e212a3b70fe08d53e47c32793d38f5d5a4d82b796796da4b
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 03da393ea576be8733bbfc8d9280a2e31e653cb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:54 +0200
Subject: [PATCH 1392/2561] knotifyconfig: update to 5.93.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index f33e7ca63304..1ac13b7254db 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f7f452e3197886a2afdfaa5a2954d412eb0ae2bc47ce742902765c053239313a
+checksum=cc9de166631555451965cd007b82f0ab529d6b909bc259e26e59feee586619cd
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 81dbcb6b1ea31877ec662f322f37aa34886b8dba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:56 +0200
Subject: [PATCH 1393/2561] kpackage: update to 5.93.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 7488611aa6d5..0c03af3cb837 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.92.0
+version=5.93.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/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=361f75fb4e3dff46e6dab42d858488af58fd40f3af1f7a39881ea9240cd866ab
+checksum=8de6ecd6ed1cf746b9919d93283aa650922211b51bb2d22027102f67c42ec5cd
 
 post_install() {
 	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \

From db8f8949469d0d70ed8829e1b07242559b8d3974 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:57 +0200
Subject: [PATCH 1394/2561] kparts: update to 5.93.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 681aec459145..9ed54c4d5bd5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.92.0
+version=5.93.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=094e18b2e9119f1c197c625235e639204ab5aa1910b13ae4317c8145b4fe3318
+checksum=c888e9664cc71a2f52904fa42d6bcedaa76c50c720ef0bee8d8b0c98bbcd1675
 
 do_check() {
 	: # test can not find packages assets?!

From 61cabb92ea0df66463ed97a5e4cba5348245e327 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:59 +0200
Subject: [PATCH 1395/2561] kpeople: update to 5.93.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 717d2756b92d..b6d0c7054015 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b313729131bfbdb0ffd24ded926a2c6604dd06a18bd612c2ead6aa886f29c571
+checksum=d3e1266982fa2abdd7b216d018569ea83c71312e2cfa35a0bee845e8bb49f371
 
 do_check() {
 	cd build

From 71be7d6466e33fab07815b58885cb49d7d5e2fc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:00 +0200
Subject: [PATCH 1396/2561] kplotting: update to 5.93.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 6b6fa4db6f88..a39daf53e9c9 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=c95d63e2e4c4abbf625ec1cfe749314c1a90dc5be4a90a1ea1617bc969071ed1
+checksum=586d1b694213f55259ffb6a96a10648baff6e3ce45c58d7c44734d6096b6a26d
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From e3ec4e575f950b79eb5208e235ff23d9fe354346 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:01 +0200
Subject: [PATCH 1397/2561] kpty: update to 5.93.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 47612b152d68..c5e5c306e492 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter"
@@ -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=cb1dac5f8f7ba059ef967a2cf3d1580a29a8d7b373ef67e82e0ac4f0285ee052
+checksum=2a05154dbf9eb082f32f33b494dc36c3b24a59c14521167f3306a04c3649ec12
 
 kpty-devel_package() {
 	short_desc+=" - development"

From c525cc7952943770967de73152f0080c7f486390 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:03 +0200
Subject: [PATCH 1398/2561] kquickcharts: update to 5.93.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index d2d5278ba25c..4fe68d7329a9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=1a430e2909b137466cf41c334a60ebc01e4cde82e71acbb167cd64d1f13e8678
+checksum=24346ac484d1d785bff27e0de5d29a7f7d3d73568074f8bdaeb869ff1004a848
 
 do_check() {
 	cd build

From b4548c1aee5349ab2f7bb56103629b737ee512f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:04 +0200
Subject: [PATCH 1399/2561] kross: update to 5.93.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 14c6ba42f541..31a60cd2c56f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=129e2840eb1f33c95d50cde79a82f784cf735c3f1ae636f15dcf695c0b0c1ebf
+checksum=2ba6fd2438731b1704537889120c0dcdf1eb36bffd1e921736e85834a5551ac3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From d00c83e90a72eaf2fcb1683f0d77237d4777241c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:05 +0200
Subject: [PATCH 1400/2561] krunner: update to 5.93.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 4fab48018a19..6eb7f598ef04 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3fc80c5d66359e4593115b58fcd055ca9cab8f23376123094e13c5d4bdc48fed
+checksum=2dc6b9169d415d87f5e2d82e2263183f42589cc1e962c9d6d0c60b6dfa48c991
 
 do_check() {
 	cd build

From 07e5130f3fdfec75c62f968e9c8fe1cd9c2a8041 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:07 +0200
Subject: [PATCH 1401/2561] kservice: update to 5.93.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index adda7f1fe8b9..de717b3257a9 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=52e2d9654bbade7db91c647192b78bc3ac1feedc0c279e9c371142aa5ec82ef8
+checksum=46cf92f837fb890e311c5affaaa8b01d1d66b47dd272a30ae148472ef3e67431
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 84faefb09cf30a0d76a5045d8475efde9ef3edc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:08 +0200
Subject: [PATCH 1402/2561] ksolid: update to 5.93.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index d954a2e1318d..d38f0b79b185 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=8926c859af4b6b14e0967fc3b76ca0e76de27d0ab544087eefdffe40518b5a9c
+checksum=22eff3f94608793fecb532e097d9022a14c828a0ffad0f73666088153f0d6bea
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From b387924adab89525777023a0d70643da0710528f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:10 +0200
Subject: [PATCH 1403/2561] ktexteditor: update to 5.93.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3dcd6b5a7433..6e0d131bcd2c 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,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=bcd01c3ca07d02106de1c68156e568ded7686ca9557b30a04f7b4e24cf43fb8c
+checksum=7af437b882cd2da9cf9780cb660f9242b9c2400a5ff55cf6ca8608b6e62bd6c3
 
 do_check() {
 	cd build

From 0017c9e51c8647f82164022e087233e01275aac8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:11 +0200
Subject: [PATCH 1404/2561] ktextwidgets: update to 5.93.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 2768b6f1ddcb..d685d6d0a91a 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe867bf498a5170a9fba91dff652b68fa5cae2af8864dbe89a6e54638ff90b0c
+checksum=e27f588929db35f485ebbd6ddec45ec0c56f86844935013f8a39df8bdfb7c215
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From f1c28a7ae91c2ea9d5c0224c0b083a04d1b5c82c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:12 +0200
Subject: [PATCH 1405/2561] kunitconversion: update to 5.93.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 73f122a4fc6b..0629a5319eb0 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.92.0
+version=5.93.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=47e2b4c4b329562044954a67edda4d5ade953bd2a9760f6214c5f8f17239f09e
+checksum=9baefb6aed92d2b32727f9492f1322a9e0b17b609c2d82296f4ee10b55a02fc8
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From dba230aaaef61ff8a3b9cc31cee9afe36a7883d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:14 +0200
Subject: [PATCH 1406/2561] kwallet: update to 5.93.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 6d2b98d6a7a3..9df7aac1b7ec 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.92.0
+version=5.93.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=71aca76cb0edbf569827709b073bff2edb5c129a85638df4bc666d70786740e5
+checksum=ed56f6477efb250b454f7b7861a16a5ea972487c1373647b7094047ce20fddeb
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 075630ae6d0e0902fa41fb86ef101a3e40aad4dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:15 +0200
Subject: [PATCH 1407/2561] kwayland: update to 5.93.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 41c3aee75184..f67e288b91a6 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.92.0
+version=5.93.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=95e097cefbe4e260129d77ab9fe3013818b85b9aee6e4744acfa1ada96fed195
+checksum=1648a273ad1c0c1895a0edff9a3e97eb151e1e3533362e0f01d72706ac0a7abe
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 5112b7b06800c1766d65df59e68812fed721499b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:17 +0200
Subject: [PATCH 1408/2561] kwidgetsaddons: update to 5.93.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 324be77968b3..1b80c8140b81 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d0e3558d6a7ed550f31d319e6b52d6ed61d693a1aa50e6dd4f430a1324111f2c
+checksum=9c35e17d8c6faae58bfd48180bf968b813e6bfe2d49041b3285f8e326842a410
 
 do_check() {
 	cd build

From 8ef0f015fa96300fe30cb80e0a7adba7896ab7b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:18 +0200
Subject: [PATCH 1409/2561] kwindowsystem: update to 5.93.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index dd6ffc7afaab..f33ceba374d1 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dcdbbd2b4f2372fc225141361a7d9ae4a8f28ed77a266dc22c20be473fdc7d80
+checksum=97cb223a4d1a7487a3ed496e10ff5e8c320ea7458eb34cbe4ed114bc19ebe4a1
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 562d8bde0d7eea08caaf14c2545c3a9c819e6e53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:20 +0200
Subject: [PATCH 1410/2561] kxmlgui: update to 5.93.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 4f30b9703ae8..92a6b2d152d9 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e08b4c0d3cc39f788d918bd2ba331966a8af5208233c38a27f029f93a597b743
+checksum=74ba65d95fac0cd09cb66e14d199efc739e1a8c9aec25812f41cfc64d7f4b099
 
 do_check() {
 	cd build

From 82fb360a95f1006ceed9740c9a4451a6ea20358e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:21 +0200
Subject: [PATCH 1411/2561] kxmlrpcclient: update to 5.93.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 619fe8a1d3e6..20010cf52f3a 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0e32dca201f8b3d241e985c8dd8854774569d08167a9f3f060a141551e19beab
+checksum=0cb41aff9f5660d95ee6d669f9c70692b55c089d0e1b9705e19b19fc2c49376c
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 88f5563342d75e82a9cf473d0efe8f2bf565b9d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:22 +0200
Subject: [PATCH 1412/2561] modemmanager-qt5: update to 5.93.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 920b6b1f5705..b669557f11b8 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=7ed0b4f48a781fa9166e0446ac14fc21036195cb3d800ce21a546cac02fe5898
+checksum=3aedde6936524b9d0dea07ead34f44fcff50da2ccc0da73d6208893e270a67a8
 
 do_check() {
 	cd build

From e0ffde4b86727a14b9856421a75d3a24fbe17ec0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:24 +0200
Subject: [PATCH 1413/2561] networkmanager-qt5: update to 5.93.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 bc475ea12153..de46374e6511 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=51ddc8ec0ea60c87c49d5a6709eed86fe1e066d57d059a7f9e774c97b81bfa64
+checksum=b8588ce2d811094682f51ea6150f3c58baa398fc91339bcb511bf60bc0eba960
 
 do_check() {
 	cd build

From 6df31a640383507e83436b4768c567e382d03ce1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:57 +0200
Subject: [PATCH 1414/2561] bluedevil: update to 5.24.4.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index a3eb6e450432..b76585975dd1 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.24.3
+version=5.24.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=9dd1566eae8bb793330f2f54ab34cd75ed79e7f3924bf78149077b122cc49ec2
+checksum=83778e9cd952c6efeb786395d3fb9f5d4e6aa65d2ef2bc02ad7d256a3201f0d6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 6cd2c98f0b9d241439cf648235e4c8ef645fc4d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:59 +0200
Subject: [PATCH 1415/2561] breeze-gtk: update to 5.24.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 8e1a152f177e..20473061da4b 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.24.3
+version=5.24.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=2911bb2f99ad42ec820cc2adcbf1f8a6f18ba437f72ce216562e12584fd042a4
+checksum=b2fe8150a8576fb39d26b809e6b9cb06e2c2d2b039558ad75307d62ed857a168
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 0095bd5665a65563c55cf3b0fb8645851b67bc0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:03 +0200
Subject: [PATCH 1416/2561] plasma-framework: update to 5.93.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 2ab058fb3036..2ccf8a0c2973 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6c2bc624564c74fd80bce170a1c763803d5207ef86108b5724fcba73c3506f7
+checksum=d4a2c687ea2ea8dfe7c256eb58441fc458102ed4b445dc24685513dd96b5c322
 
 do_check() {
 	cd build

From 48119e5fcbe076ce245de3d8bb55a788cfbbca69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:05 +0200
Subject: [PATCH 1417/2561] prison: update to 5.93.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 5f1e84c53f7d..fdd1d0b1a115 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=7e6fee9fd56be6c4589c106a3c16a28a4aa5832a24dcefe88302a9ad113ee41e
+checksum=1f43de6622cf263c6b71f9a801174e2791c09b5a0d52c602715659ddfb82fb56
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 1b609141cfa3cde8644d006e83d55bae715bab61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:06 +0200
Subject: [PATCH 1418/2561] purpose: update to 5.93.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index dc71877ba34b..4c9f91568f25 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94613e180550f9d15443ced1f2d93b566350d9a981205b4f98923714dc4f400a
+checksum=dc0bc0c7c5d9b27e21856132ceeb3893555a36f3944ebc97da2eb76a74e92cc4
 
 do_check() {
 	cd build

From 132ce8fac6efaf703e456271af22a4542bc68cf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:07 +0200
Subject: [PATCH 1419/2561] breeze: update to 5.24.4.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 0317ba5620d4..64bc70e3be00 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.24.3
+version=5.24.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=4b8f92e55c72ed59b7bdfe4be6044fcb0a0816fb6f1ea2bdd9884b58b9a92940
+checksum=e369ee21e6aab1d5e3ae222ecd84bdb59f3d29ce3b61965b498bbfe84c949805
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From df12cc62b5c816577689f216d514103d84938d58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:08 +0200
Subject: [PATCH 1420/2561] qqc2-desktop-style: update to 5.93.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 5af0197811cd..ee40061fe5d0 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.92.0
+version=5.93.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=97530813b9a80505b5484175a55be49cc020244fbe3b1bdaeef15845c3c9bdac
+checksum=161ec085a529e23532badb7723c78051e7b4c3a3fe11d3c4ab8bab93213ba9a8
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f6c683f5df75bec3a3efe5a3d3a1a34b061f3121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:09 +0200
Subject: [PATCH 1421/2561] kactivitymanagerd: update to 5.24.4.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 879d45275ce3..e8fc45c00005 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ 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=9cae3e136ee6743474fd96a573b235b6ca8653d4f61f412d9d3ec866861cae63
+checksum=8128371fd75f7dd4ccb2203ad775e6f12db28bbb64047d0fd63eb745d8735529

From 1682ef6c4423b40b5a46d0caea06749a10ca5e16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:09 +0200
Subject: [PATCH 1422/2561] sonnet: update to 5.93.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index b7d08f3d959b..ae917562a6e1 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.92.0
+version=5.93.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/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=31fc1dda3db582337529922d38b6eac72b1551c4a0d86fb9307363e061d05722
+checksum=3c146ba45edee43bf2e8bc48b116a38e0c28d2294fe61b44dc8254b881210d9c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sonnet"

From 8e392920247d36f3e5cfdd89885f3ac5179745c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:10 +0200
Subject: [PATCH 1423/2561] kde-cli-tools: update to 5.24.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 847a7213209e..0f61ce9efc66 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.24.3
+version=5.24.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=fe64da7ce3ad7e7b2d743e06aec0f6666e1909d3ad08867a0173c5c262f7e803
+checksum=ffe4c8d3f4e97c57801360ba32cb70c961ad5796d56d4f0bae10ab2ec68759f0
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 654cbea6179779df2e590734b65b4bd66846271e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:11 +0200
Subject: [PATCH 1424/2561] syndication: update to 5.93.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 3a35ebf2c174..bbb411538569 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.92.0
+version=5.93.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=1c9ab9772103c001e56afbe0356ede04f953b07be8d2c2e2f2fff3e7b5bd5d46
+checksum=35f14e36076760170df44785df39f522407f58cfa36faf91564696587d8eda23
 
 syndication-devel_package() {
 	short_desc+=" - development"

From ba9ef96603e77331a5191f503173a1ba269622d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:11 +0200
Subject: [PATCH 1425/2561] kde-gtk-config5: update to 5.24.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 a68d66dbb124..ca92bc05101a 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.24.3
+version=5.24.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=fb4bcd30c93e15962153e81ca218f03465f02d1d2d011f267bb96946869ba05c
+checksum=b17aaad5f96890426a8864ba51f026732007e47fd42c4ce4df3e469b455f570b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 0c66b9893c341f719bc1cdac78cda16544a26fe9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:12 +0200
Subject: [PATCH 1426/2561] syntax-highlighting: update to 5.93.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 5ad6ec877834..0f92ee3b944a 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99347eaf9b2249f875cacd8319c77f2f8e110d0e7834f51f296ed911dcc7e50e
+checksum=ebdb51f8922d2bc97457c7df376e6600d5ee9805fdc1ac7f7d6be35a3fec711b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 833ebc5e08bfb7e8a53e5c1b3c59f679c7fe5636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:13 +0200
Subject: [PATCH 1427/2561] kdecoration: update to 5.24.4.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index a358d713d04a..511d4d627094 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.24.3
+version=5.24.4
 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/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bbfc3d83f76dc8d2568bbe2f5395af5887eaba79094fcb901930585f8b53f636
+checksum=2c999206c51a6a6c5ecda211773276438f0069a2e1c81d4903ae5712c6f28c15
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 876acaa09aebbae146a3d84cc44e28939ba46a47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:14 +0200
Subject: [PATCH 1428/2561] threadweaver: update to 5.93.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 9d65ff2b49da..89e6a9a71b90 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=48b0cf3d969437eaeb0839cbb16a35209336fc6e78c1540920f91bbab8b01101
+checksum=6c0db7d276052ebc4d512b43792ae2127cb5fafb1cfee890b5f20bd05c06f185
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 1871bd797daad85e54d5897d4237474877cc9e4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:14 +0200
Subject: [PATCH 1429/2561] kdeplasma-addons5: update to 5.24.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 065f0fede44b..22c2981a4dd1 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.24.3
+version=5.24.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=86fe08a744e31ce22124bca4337633f6a2523fbc87d915d3ffd42e65da66f23c
+checksum=d721d32d16f34ef1066bdf2fcb781d5bc1aca7cf5cdf3a71c6fef2dfe668680d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From a8c266a3186e56f28b14f83ee3327030865d8287 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:15 +0200
Subject: [PATCH 1430/2561] kgamma5: update to 5.24.4.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 30fa3d8e6577..75f1ab3613c3 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.24.3
+version=5.24.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/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=66da3bdfaaddb70c6bbf5739eaa970c8a7f67fd8295872ee201a1445c2df9867
+checksum=73ed9897b2281a8ddd7b47f063d548fa71b683662a63b5648ba590160bcf3f7c

From ec0437fb89cfcd6075ec68356fa1b0240631a9af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:17 +0200
Subject: [PATCH 1431/2561] khotkeys: update to 5.24.4.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 1a59a447a853..38c24c59dde9 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.24.3
+version=5.24.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=17f45fa898147b7bd9e1bd4850aef10d03c25dbfe088ef46803a817f7348afcb
+checksum=5aac75b05f0b5a63ea924b02645bbfacfe18fef3d5c23182b482ebc5d17f6d0c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 112d7644616916ecf5aac7c0c7c85d0eb72c1c97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:18 +0200
Subject: [PATCH 1432/2561] kinfocenter: update to 5.24.4.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index eac578309f8d..34fe68536c24 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.24.3
+version=5.24.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-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d2f5acb7a52434e6b539dc52d23cf09754e313411b32d169f36403ba0801e223
+checksum=dc5b84964de4b68e45300477039c656d622a9546340e997eb8249de6a532b838
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 392e362bb26fa002a9c3299609679068961de513 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:20 +0200
Subject: [PATCH 1433/2561] kmenuedit: update to 5.24.4.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 02793528e9ee..3f4a699195b2 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.24.3
+version=5.24.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/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8bc5d0dfef18e4e1f561cd86f2d023b8d5f951ffd7bcc497633e4ad263cb3bfa
+checksum=147a7e9a15393375c2b22b5dfb025a87f3356cf756cf3b17615ba989bb443466

From 6836c1c558f41b20ccee8157dfdef9d3744935c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:21 +0200
Subject: [PATCH 1434/2561] kscreen: update to 5.24.4.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 00eb087ad0a1..c7f235baf15e 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.24.3
+version=5.24.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=0e814b3db2c952857bc399e9d3bc349b80ad7367ac755c22dae31004c7684bf2
+checksum=3048edb7e1231b0d7a33b2e10a202e6fce34e34f47079fc87f8177d7aa871b6a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From ad41903d1f3aa10e0d29b1c9d8977ae73764c072 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:22 +0200
Subject: [PATCH 1435/2561] kscreenlocker: update to 5.24.4.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 29b2b0c4f678..4b50eb78ee55 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.24.3
+version=5.24.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/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=03157ca122085fd6d8eeabb369c363ef706a773ad509eb5c08722a0e4bf903b6
+checksum=fb226273064422f9f73b6b091e26396349e0cfd53a88398b79fa2acd1540ecf7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From a6f3dcfa403f09f49c31d419b65099acd73526e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:24 +0200
Subject: [PATCH 1436/2561] ksshaskpass: update to 5.24.4.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 18b7a81583c3..4deaf3217e6c 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.24.3
+version=5.24.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=3bbe16721dabd7fbae659be3f21b4a386d8ca0a6d288c94ccd3954ecbd4d7847
+checksum=34c5d4f196d09c4ebe8990d3761bc70059436e272ad46a761e71b5910e0f44dd
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 425991fa6af0cfe6d92bda3680b8dc878fffb68b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:25 +0200
Subject: [PATCH 1437/2561] ksystemstats: update to 5.24.4.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 65541c9fde51..f912db7fea5e 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -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-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c303bd73bafb254ca8bb5dee0de3b7a2ec4123e719827d26268625047bb330e
+checksum=8dc735e9133ab01e537d71121b0e76e078f4fffce2d86b4c5d62c85878ee47dd

From b3205c8b86b0a3a301dc463c3e8a9b77e9eb9fd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:27 +0200
Subject: [PATCH 1438/2561] kwallet-pam: update to 5.24.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 c32def9d2ba6..9e206f9e5cc6 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.24.3
+version=5.24.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=33dd50c4d9258d1e3326980192e2523490754cd1724ff704c7e36984e5cdad7f
+checksum=99d4e1acc24e89376f6eb5fad78f6055b4c3a9fff73459845af32841743bdf68

From 8034483425a67318eba05e39549524e385b04cbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:27 +0200
Subject: [PATCH 1439/2561] oxygen-icons5: update to 5.93.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 94d05f08582d..62aa2f6abdb6 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca88b03fdd961f9f8bfa449e1fe74e3ce66e11937be9a8f6d1569a46f6429ef1
+checksum=734e3f44dc3be665350ac5de7f333ab954d3e3b777765b691603b3647c353005
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 8b657a9a98c61691e7892e7ae30ed78f9ce78026 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:28 +0200
Subject: [PATCH 1440/2561] kwayland-integration: update to 5.24.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 95e908c22286..d4dc57cef6d6 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.24.3
+version=5.24.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"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9f6f167fd16aebf550ae9bda176237ea80efae4a08826050ccbd2d7a73de05cf
+checksum=d2e74baa0e2966b92330b8df7567b0b1cc85a71ea24c3f453da39aed035aceb2

From 26d6f1d5f48b492799cdde5c8e12918ec06c5e77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:29 +0200
Subject: [PATCH 1441/2561] kwayland-server: update to 5.24.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 7bf6ed477fa5..19bd5a8345ab 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,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=560b20a15b459c5a1e8d0b38e9d53c3a75660bc798fa544e7a9d5c36260e063b
+checksum=d1790bd7584dce9a36a432819b170ce72d34d5df79083b1b41dfe3e021b6e988
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e56bcb4a0617c168dacffdde6f2951a7cde373ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:32 +0200
Subject: [PATCH 1442/2561] kwin: update to 5.24.4.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 435bcc4eb3af..855d5bcaa842 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,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=d84db7e32a13177a0bd030e6c65907cc37c28efad51ee17c518e402235cbf46b
+checksum=e2142321a9b1189665354838a66baeb2189235b705efca2364777bc3a3698ce3
 
 build_options="pipewire"
 build_options_default="pipewire"

From 487665f9c404feb89074a283e388821a4f15d378 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:33 +0200
Subject: [PATCH 1443/2561] kwrited: update to 5.24.4.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 5a556a8be1d2..38a32a832c3f 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.24.3
+version=5.24.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=2d768547e131aed99d165b0aee7b080e512a2a5ffab292bff8f71033631cede9
+checksum=62d700b673102f2740ed34e305902260c7035f5c8cc6ef19494a98f3088c0649

From e8d07f95e527e5a13c5611b230715dacfe96da9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:34 +0200
Subject: [PATCH 1444/2561] layer-shell-qt: update to 5.24.4.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 3642d9819344..0249259ea03e 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5de105ece2d7e6ca2d65305186462b0f9240930276adf7d5eedf77ffeaa67d40
+checksum=a0979fdb2f61a6d2c68fe2d93573d5b46597021600d748a379d18cb9af711e0f
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f91a8308fb7714b85c017faf383e8f8d03c2e9b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:36 +0200
Subject: [PATCH 1445/2561] libkscreen: update to 5.24.4.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 5b76a89d08d8..1b82bcea1033 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.24.3
+version=5.24.4
 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/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a6874f0f4066e16ea191341d4d7d73deaf304e117ab64306d311c862393de7a0
+checksum=016dec6d912b2a733ebdd26bfe5e31029651bd5b4e476d95a541765a68dd67f7
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From dc08951e801779107e19d23700a1f31bd1ad366d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:37 +0200
Subject: [PATCH 1446/2561] libksysguard: update to 5.24.4.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 2fac80ddba4c..c5cc1f764300 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ 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=148651cf33c7400d7a0df507d0bb75a6924e1ae80f5a46eefeaeb44c848ff1a2
+checksum=76da2a7fb7f760c55111db756d91dd3041721baa8a1f8863ad9e0bc0a6a02402
 
 build_options="webengine"
 

From c35639fee26e3fb83cb9234bb1a722ebfd014446 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:38 +0200
Subject: [PATCH 1447/2561] milou: update to 5.24.4.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 05ef7d33c83c..fe5a63847469 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.24.3
+version=5.24.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=31d70b760653e0fe4b9c1b59d7601bb52d307a3d3be3b8f67550a4ea9d22bd1b
+checksum=3109ad6c97415d74fccdfd26681360ff0925e58af7a1c72905437eb99faff37c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 0954cf3754487bc5d33d1cb7ee87895264b68a9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:40 +0200
Subject: [PATCH 1448/2561] oxygen: update to 5.24.4.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index afd58f630f81..2bfa8498a225 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.24.3
+version=5.24.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=018dbd3c276707bbcc8515424ae45a0133cd9a2e31ffd7a0bbc25522586e400a
+checksum=804d033afab3f16319d92a8e5dacfb2a5797f8661a64029ee9e9b3c0b0f87ab4

From ffdfaa5ec46b8cd424ac4ed7a5627db5069c95c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:42 +0200
Subject: [PATCH 1449/2561] plasma-browser-integration: update to 5.24.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 e7e64687c577..ad1a10231bed 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 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=40b07a0065bf24a78997fb210b0550642872ba8c41ba1df6c2cb6785d85851d7
+checksum=677af76b6f7072312d63bd8230af6e6920d7b69942ad69cdf0a29356ce695bc1

From 5f57710424a436455679c679db6f017898b58598 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:44 +0200
Subject: [PATCH 1450/2561] plasma-desktop: update to 5.24.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 58edbeb7f5d3..6d2b3752e213 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ 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=583e7ecfd2e2b766d645284cf13605851d96e2ad7cf2e657b4665aa3f3fd91d3
+checksum=b0e23046300e49acf93d9181d0c8dda2008a9a843a441af2528a91abc5c7d025
 replaces="user-manager>=0"
 python_version=3

From 676515510b110ec7c17b9687fd8878f3789713fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:46 +0200
Subject: [PATCH 1451/2561] plasma-disks: update to 5.24.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 9498075cb52d..025d7ab6e172 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.24.3
+version=5.24.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=9e71a018eb875dd70d7b30f23937098ae8d6d9eab2306b541f916ddf6b64745a
+checksum=cf8a33e81b8d3b6b2d94374eb673adec19639eef8c2df803e1721630c67525d6

From 78c14507db04d99fc1d6a0cb2edba3cf5edd3a45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:47 +0200
Subject: [PATCH 1452/2561] plasma-firewall: update to 5.24.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 474ae2d9cf17..be8466cd08c3 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcmutils
@@ -11,4 +11,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=bff36b7a922a6d0e5e20df539c6995d775f62a1d63c970b55bb430abd580ef64
+checksum=a2bae12766e6536b7cd6d6445368f8249bf79d488d30dc5d57e2aed6442d2f39

From 54c2bcc3e7e8ffeec057b934e591a158c56b99d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:48 +0200
Subject: [PATCH 1453/2561] plasma-integration: update to 5.24.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 59c8998026ba..b5f6098c11dd 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.24.3
+version=5.24.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=7aef8f3b6234b402b978d12e72d9c5eb2b82cbe587afa32f288e2e160b103c0c
+checksum=73d4993d2c7aeabbb068e8d28821566d04f2dcb882dd1d92feadc2062b3b4db4

From 29770f0b1020d9bc0d0f2237bfebac8361e0d6cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:50 +0200
Subject: [PATCH 1454/2561] plasma-nm: update to 5.24.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 cc71c9f54926..ee283ed3c555 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.24.3
+version=5.24.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=2cf64e94ed921546bc0be44f50e3490033a353bf3f0ad7a5a513ef5585fc3bfd
+checksum=086c28cfdaa6f4de785662ccd8123cd48b2a333fbaa2ca70b2a6d9dc3622ec2f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 115d8c59789a8d00c5c0b588207989794de78a3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:51 +0200
Subject: [PATCH 1455/2561] plasma-pa: update to 5.24.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 dd3e8e33c8ac..36cffcd23b04 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.24.3
+version=5.24.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=e18fbe9cf9f2948c2d3567ba0bb71126ffef8d7c4df8084a8fa0fd48c0ca0759
+checksum=ffe5b915e5e1d2e5d4de719502793dd5b91cd9715cc44f82c88fc5ff0556d325
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 18cf3aee0cec491af85073a458ebf9d77c32e2fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:53 +0200
Subject: [PATCH 1456/2561] plasma-sdk: update to 5.24.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 4d713043e9dc..98e9f404e1c2 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.24.3
+version=5.24.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=f9bad013598b8d4e8b0be4ceaa5ad5f1a3326911f7b41e754d57d7a5f1f5d63c
+checksum=ecf35743a28c350aada480248bbc138b726315e53f36bb39afe5fba0d27d6ffe
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From d25b6691c363ca37875a139eb391d54cceb5ac58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:54 +0200
Subject: [PATCH 1457/2561] plasma-systemmonitor: update to 5.24.4.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 4cdb8fc83b47..8a77dfdc1496 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -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=904c0cbf56469b4b021559cc898aef57917cbe36526317c5bc7d34f255c0439d
+checksum=1ff2853be75349892642a0144cc64a15c5f1bffacb0637e8b5c269055ead9a49

From ccb318d24ddb85bb6b717617530ad7c25ad4b8c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:55 +0200
Subject: [PATCH 1458/2561] plasma-thunderbolt: update to 5.24.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 7fbd11daa1a5..6dc40e6212fa 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.24.3
+version=5.24.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=52bec310386158c7f85cd6a8a7db5bedabdb8494f4c6818d8466aa33a6dba5df
+checksum=1efecdd4b5e3302b37ae28964cd371d404189f7879a9752f000b6df4745b0ab3
 
 do_check() {
 	: # Requires running dbus and bolt services

From 916aaeb6153e72fe9f0e09b14a4ce0eadd269b4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:57 +0200
Subject: [PATCH 1459/2561] plasma-vault: update to 5.24.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 980ab7d44e7e..7010aff50a86 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -14,4 +14,4 @@ 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=8d4998fd105073ce8ae6012426c0bd024529e0ae67c3c3ea9178918fcf87be38
+checksum=0169c2b8d48fbfccf132317f62cec342d2f1cbc7352e52a513ca575198f84966

From 27337e27613b8e87e814535aabc98183d6a58310 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:09 +0200
Subject: [PATCH 1460/2561] plasma-workspace-wallpapers: update to 5.24.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 4d21268470de..f0f8e072fbeb 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.24.3
+version=5.24.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=da252edb70b3373c38fb30318a44f52f047d4f31cbbd26c01c30bf2398c43848
+checksum=243cf6bb613d30ccb92e183938dcd3e02c1c7a11624a447c35c56a5eac3def42

From 26be55875f8e6cd8ae4dd5612aa5cd1cdef0f061 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:13 +0200
Subject: [PATCH 1461/2561] plasma-workspace: update to 5.24.4.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index a8ae6f591b0a..ac82a06c4a9e 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,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=104c5c0ebb000f48c749a6bafdde4cbb1b06d188e1a23ef95a2d035cce442ab4
+checksum=5b0e40b090d6bd1fe1f902a60633e4417ce711b34c32bfd2fce5b16bb9b2ec70
 
 build_options="pipewire"
 build_options_default="pipewire"

From 26f704c75f75bdb106582725c3073e78ab023d3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:14 +0200
Subject: [PATCH 1462/2561] polkit-kde-agent: update to 5.24.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 53ebff5a685c..84ef537290aa 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.24.3
+version=5.24.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=788d392c811ee7c8098d294ccc9fff7f7a695977689a66cb4a1cb52d6f4779d5
+checksum=955246c593d0332bfbe386e81aaf7714e9ac8b8e7743c8c2e4f334b28dd685ad

From 1f91867be5c7daf8ead309401b43aef87b1d88ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:16 +0200
Subject: [PATCH 1463/2561] powerdevil: update to 5.24.4.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 3eb123d13d50..32ac96524c8f 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.24.3
+version=5.24.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=495275be84a96572d2e2a7ee343e1ab98c79e7c8eef402a7f26d86863e25f010
+checksum=ef70c00e36d4ddbaedeb0efeba68523289e6e112b12951460c8d36075de9546a

From b0c8c4e9be538453c387ddc3baf34254453304cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:17 +0200
Subject: [PATCH 1464/2561] sddm-kcm: update to 5.24.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 95d916cf3e1d..e0b11b4e4cdc 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.24.3
+version=5.24.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=d0d01ceda262734e87f0cfc28138a1b5478651722a703a55ac744c4e676ec696
+checksum=bef347b9e066a756d71263b19552fbbf9b8a1d6d22861060bdfd1ead5ab9d85d

From 24ddd6dfe317f0e46f7bcf60117cd92c920ef1e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:19 +0200
Subject: [PATCH 1465/2561] systemsettings: update to 5.24.4.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 57c764dcde4e..b18700451dd6 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.24.3
+version=5.24.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-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6200618137f9a1411007a78f9b50eaf78048ce9819428d997a44816d6093d585
+checksum=69921f98956b3559f8c37821b67d32ac8d6aef254888c15df8f86f99903e1533

From 971a33660897cf7e11f6123f614f9abb77c50232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:20 +0200
Subject: [PATCH 1466/2561] xdg-desktop-portal-kde: update to 5.24.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 23aaba046f68..9f3a47148a1b 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.24.3
+version=5.24.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=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b
+checksum=11684916288bb4a452b75004e2d122a4a1264a562f7945af98d466e49c59dc1e

From 488b93432224208888d8b1e510453a9024b11bbb Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:05:33 -0300
Subject: [PATCH 1467/2561] New package: uucp-1.07

This package contains the standard UUCP package from the Free Software Foundation, with uucico, uusched, uuxqt, uux, uucp, uustat, uulog, uuname, uuto, uupick and cu.

Added files

Added install files, man manuals and patches.

Fixed whitespace and using vman

Removed -R

Added suggested changes

Added underlining

 New suggested changes
---
 srcpkgs/uucp/INSTALL                          |    7 +
 srcpkgs/uucp/files/uulog.1                    |   53 +
 srcpkgs/uucp/files/uuname.1                   |   33 +
 srcpkgs/uucp/files/uupick.1                   |   34 +
 srcpkgs/uucp/files/uusched.8                  |   20 +
 srcpkgs/uucp/files/uuto.1                     |   21 +
 srcpkgs/uucp/patches/compiler-warnings.patch  |   15 +
 srcpkgs/uucp/patches/manpage.patch            |  189 +
 srcpkgs/uucp/patches/no-sleep.patch           |   65 +
 .../option-to-not-force-hw-control.patch      |  321 +
 srcpkgs/uucp/patches/spelling.patch           |   28 +
 srcpkgs/uucp/patches/uucp-alt-misc.patch      |  111 +
 srcpkgs/uucp/patches/uucp-org.patch           | 8833 +++++++++++++++++
 .../patches/wait-for-correct-parent.patch     |   19 +
 .../uucp/patches/zpipe-improved-pipe.patch    |   40 +
 srcpkgs/uucp/template                         |   39 +
 16 files changed, 9828 insertions(+)
 create mode 100644 srcpkgs/uucp/INSTALL
 create mode 100644 srcpkgs/uucp/files/uulog.1
 create mode 100644 srcpkgs/uucp/files/uuname.1
 create mode 100644 srcpkgs/uucp/files/uupick.1
 create mode 100644 srcpkgs/uucp/files/uusched.8
 create mode 100644 srcpkgs/uucp/files/uuto.1
 create mode 100644 srcpkgs/uucp/patches/compiler-warnings.patch
 create mode 100644 srcpkgs/uucp/patches/manpage.patch
 create mode 100644 srcpkgs/uucp/patches/no-sleep.patch
 create mode 100644 srcpkgs/uucp/patches/option-to-not-force-hw-control.patch
 create mode 100644 srcpkgs/uucp/patches/spelling.patch
 create mode 100644 srcpkgs/uucp/patches/uucp-alt-misc.patch
 create mode 100644 srcpkgs/uucp/patches/uucp-org.patch
 create mode 100644 srcpkgs/uucp/patches/wait-for-correct-parent.patch
 create mode 100644 srcpkgs/uucp/patches/zpipe-improved-pipe.patch
 create mode 100644 srcpkgs/uucp/template

diff --git a/srcpkgs/uucp/INSTALL b/srcpkgs/uucp/INSTALL
new file mode 100644
index 000000000000..b82c17321a29
--- /dev/null
+++ b/srcpkgs/uucp/INSTALL
@@ -0,0 +1,7 @@
+case ${ACTION} in
+post)
+	# fix permissions and owners
+	chown _uucp:_uucp usr/bin/uucico usr/bin/uuxqt usr/bin/uux usr/bin/uucp usr/bin/uustat usr/bin/uuname	usr/bin/cu
+	chmod 4555 usr/bin/uucico usr/bin/uuxqt usr/bin/uux usr/bin/uucp usr/bin/uustat usr/bin/uuname	usr/bin/cu
+	;;
+esac
diff --git a/srcpkgs/uucp/files/uulog.1 b/srcpkgs/uucp/files/uulog.1
new file mode 100644
index 000000000000..001c9bb6993d
--- /dev/null
+++ b/srcpkgs/uucp/files/uulog.1
@@ -0,0 +1,53 @@
+.\" This is under the same license as uulog itself
+.TH UULOG 1
+.SH NAME
+uulog \- Display the UUCP log file.
+.SH SYNOPSIS
+.B uulog
+[\fI\-n number\fR] [\fI\-sf system\fR] [\fI\-u user\fR] [\fI\-DSF\fR] 
+[\fI\-I file\fR] [\fI\-X debug\fR]
+.SH DESCRIPTION
+.I Uulog
+is a program that displays the log file for the Taylor UUCP service.  
+.SH OPTIONS
+.TP
+\fB-n\fR, \fB--lines\fR \fInumber\fR
+Show the given number of lines from the end of the log.
+.TP
+\fB-s\fR, \fB--system\fR \fIsystem\fR
+Print entries for the named system.
+.TP
+\fB-f\fR \fIsystem\fR, \fB--follow\fR=\fIsystem\fR
+Follow entries for the named system.
+.TP
+\fB-u\fR, \fB--user\fR \fIuser\fR
+Print entries for the named user.
+.TP
+\fB-F\fR, \fB--follow\fR
+Follow entries for any system.
+.TP
+\fB-S\fR, \fB--statslog\fR
+Show the statistics file.
+.TP
+\fB-D\fR, \fB--debuglog\fR
+Show the debugging file.
+.TP
+\fB-X\fR, \fB--debug\fR \fIdebug\fR
+Set the debugging level.
+.TP
+\fB-I\fR, \fB--config\fR \fIfile\fR
+Set the configuration file to use.
+.TP
+\fB-v\fR, \fB--version\fR
+Print the software version and exit.
+.TP
+\fB--help\fR
+Print a help screen and exit.
+.SH BUGS
+According to comments in the source, this is a pretty bad implementation 
+of uulog.  It only takes a single \-s and/or \-u switch.
+.SH "SEE ALSO"
+.BR uucp(1) 
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>, by making a manpage out of \fBuulog\fR \fI--help\fR.
diff --git a/srcpkgs/uucp/files/uuname.1 b/srcpkgs/uucp/files/uuname.1
new file mode 100644
index 000000000000..3a23e9407f56
--- /dev/null
+++ b/srcpkgs/uucp/files/uuname.1
@@ -0,0 +1,33 @@
+.\" This is under the same license as uuname itself
+.TH UUNAME 1
+.SH NAME
+uuname \- List the names of the known remote UUCP sites.
+.SH SYNOPSIS
+.B uuname
+[\fI\-a\fR] [\fI\-l\fR] [\fI\-I file\fR]
+.SH DESCRIPTION
+.I Uuname
+is a program that lists the names of the known remote UUCP sites.
+.SH OPTIONS
+.TP
+\fB-a\fR, \fB--aliases\fR
+Display aliases.
+.TP
+\fB-l\fR, \fB--local\fR
+Print the local name.
+.TP
+\fB-I\fR, \fB--config\fR \fIfile\fR
+Set the configuration file to use.
+.TP
+\fB-v\fR, \fB--version\fR
+Print the software version and exit.
+.TP
+\fB--help\fR
+Print a help screen and exit.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucp(1) 
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>, by making a manpage out of \fBuuname\fR \fI--help\fR.
diff --git a/srcpkgs/uucp/files/uupick.1 b/srcpkgs/uucp/files/uupick.1
new file mode 100644
index 000000000000..d2b9377d08ff
--- /dev/null
+++ b/srcpkgs/uucp/files/uupick.1
@@ -0,0 +1,34 @@
+.\" This is under the same license as uupick itself
+.TH UUPICK 1
+.SH NAME
+uupick \- Get files stored in the public directory by uucp \-t.
+.SH SYNOPSIS
+.B uupick
+[\fI\-s system\fR] [\fI\-x debug\fR] [\fI\-I file\fR]
+.SH DESCRIPTION
+.I Uupick
+is a program that gets the files stored in the public directory 
+by uucp \-t.
+.SH OPTIONS
+.TP
+\fB-s\fR, \fB--system\fR \fIsystem\fR
+Only consider files from named system.
+.TP
+\fB-x\fR, \fB--debug\fR \fIdebug\fR
+Set the debugging level.
+.TP
+\fB-I\fR, \fB--config\fR \fIfile\fR
+Set the configuration file to use.
+.TP
+\fB-v\fR, \fB--version\fR
+Print the software version and exit.
+.TP
+\fB--help\fR
+Print a help screen and exit.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucp(1) 
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>, by making a manpage out of \fBuupick\fR \fI--help\fR.
diff --git a/srcpkgs/uucp/files/uusched.8 b/srcpkgs/uucp/files/uusched.8
new file mode 100644
index 000000000000..17a00d68ee25
--- /dev/null
+++ b/srcpkgs/uucp/files/uusched.8
@@ -0,0 +1,20 @@
+.\" This is under the same license as uusched itself
+.TH UUSCHED 8
+.SH NAME
+uusched \- Call all systems which have work in a random order. 
+.SH SYNOPSIS
+.B uusched 
+.SH DESCRIPTION
+.I Uusched
+is a program that calls all systems which have work in a random order. 
+.SH OPTIONS
+Since this a simply a shell script which execs uucico(8), see that manpage 
+for further options.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucico(8),
+.BR sh(1)
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>.
diff --git a/srcpkgs/uucp/files/uuto.1 b/srcpkgs/uucp/files/uuto.1
new file mode 100644
index 000000000000..1d35efff7c41
--- /dev/null
+++ b/srcpkgs/uucp/files/uuto.1
@@ -0,0 +1,21 @@
+.\" This is under the same license as uuto itself
+.TH UUTO 1
+.SH NAME
+uuto \- Send files to a user on another system.
+.SH SYNOPSIS
+.B uuto
+\fIsystem!user\fR
+.SH DESCRIPTION
+.I Uuto
+is a program that sends files to a user on another system.
+.SH OPTIONS
+Since this a simply a shell script that execs uucp(1), see that manpage 
+for further options.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucp(1),
+.BR sh(1)
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>.
diff --git a/srcpkgs/uucp/patches/compiler-warnings.patch b/srcpkgs/uucp/patches/compiler-warnings.patch
new file mode 100644
index 000000000000..5e9dc93d04f5
--- /dev/null
+++ b/srcpkgs/uucp/patches/compiler-warnings.patch
@@ -0,0 +1,15 @@
+Description: remove compiler warnings that nowadays result in errors
+Author: Thorsten Alteholz <debian@alteholz.de>
+Index: uucp/uuconv.c
+===================================================================
+--- uucp.orig/uuconv.c	2013-04-26 16:06:16.000000000 +0200
++++ uucp/uuconv.c	2013-05-08 10:49:06.000000000 +0200
+@@ -676,7 +676,7 @@
+     {
+       if ((*pz)[0] != '-' && pz != pzarg)
+ 	fprintf (e, " ");
+-      fprintf (e, *pz);
++      fprintf (e, "%s", *pz);
+     }
+ }
+ 
diff --git a/srcpkgs/uucp/patches/manpage.patch b/srcpkgs/uucp/patches/manpage.patch
new file mode 100644
index 000000000000..573deb3f2c79
--- /dev/null
+++ b/srcpkgs/uucp/patches/manpage.patch
@@ -0,0 +1,189 @@
+Description: lintian detects some issues with these manpages
+Author: Thorsten Alteholz <debian@alteholz.de>
+Index: uucp-1.07/contrib/uurate.man
+===================================================================
+--- uucp-1.07.orig/contrib/uurate.man	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/contrib/uurate.man	2019-01-12 19:51:27.927352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uurate.man,v 1.4 1993/09/28 17:38:31 kdburg Rel $
++.\" ''' $Id: uurate.man,v 1.4 1993/09/28 17:38:31 kdburg Rel $
+ .TH uurate 1
+ .SH NAME
+ uurate \- Report Taylor UUCP statistics
+Index: uucp-1.07/uucp.1
+===================================================================
+--- uucp-1.07.orig/uucp.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uucp.1	2019-01-12 19:52:26.547350782 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $
++.\"''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $
+ .TH uucp 1 "Taylor UUCP 1.07"
+ .SH NAME
+ uucp \- Unix to Unix copy
+@@ -67,10 +67,10 @@
+ .I uucico
+ (8) daemon, the copy will fail.  The files must be readable by the
+ .I uucico
+-(8) daemon, and by the invoking user.
++(8) daemon, and by the invoking user.   This is the default.
+ .TP 5
+ .B \-C, \-\-copy
+-Copy local source files to the spool directory.  This is the default.
++Copy local source files to the spool directory.
+ .TP 5
+ .B \-d, \-\-directories
+ Create all necessary directories when doing the copy.  This is the
+Index: uucp-1.07/uustat.1
+===================================================================
+--- uucp-1.07.orig/uustat.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uustat.1	2019-01-12 19:51:27.927352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $
++.\" ''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $
+ .TH uustat 1 "Taylor UUCP 1.07"
+ .SH NAME
+ uustat \- UUCP status inquiry and control
+@@ -404,7 +404,7 @@
+ .SH EXAMPLES
+ .br
+ .nf
+-uustat --all
++uustat \-\-all
+ .fi
+ Display status of all jobs.  A sample output line is as follows:
+ .br
+@@ -441,7 +441,7 @@
+ 
+ .br
+ .nf
+-uustat --executions
++uustat \-\-executions
+ .fi
+ Display status of queued up execution requests.  A sample output line
+ is as follows:
+@@ -472,7 +472,7 @@
+ 
+ .br
+ .nf
+-uustat --list
++uustat \-\-list
+ .fi
+ Display status for all systems with queued up commands.  A sample
+ output line is as follows:
+@@ -489,7 +489,7 @@
+ 
+ .br
+ .nf
+-uustat --status
++uustat \-\-status
+ .fi
+ Display conversation status for all remote systems.  A sample output
+ line is as follows:
+@@ -509,7 +509,7 @@
+ 
+ .br
+ .nf
+-uustat --ps
++uustat \-\-ps
+ .fi
+ Display the status of all processes holding UUCP locks.  The output
+ format is system dependent, as
+@@ -521,7 +521,7 @@
+ .br
+ .in +0.5i
+ .nf
+-uustat --command rmail --older-than 168 --kill-all --no-list --mail --notify --comment "Queued for over 1 week"
++uustat \-\-command rmail \-\-older\-than 168 \-\-kill\-all \-\-no\-list \-\-mail \-\-notify \-\-comment "Queued for over 1 week"
+ .fi
+ .in -0.5i
+ This will kill all
+Index: uucp-1.07/cu.1
+===================================================================
+--- uucp-1.07.orig/cu.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/cu.1	2019-01-12 19:58:34.000000000 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $
++.\" ''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $
+ .TH cu 1 "Taylor UUCP 1.07"
+ .SH NAME
+ cu \- Call up another system
+Index: uucp-1.07/uucico.8
+===================================================================
+--- uucp-1.07.orig/uucico.8	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uucico.8	2019-01-12 19:51:27.927352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $
++.\" ''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $
+ .TH uucico 8 "Taylor UUCP 1.07"
+ .SH NAME
+ uucico \- UUCP file transfer daemon
+@@ -56,7 +56,7 @@
+ .I uucico
+ will normally refuse to retry the
+ call until a certain (configurable) amount of time
+-has passed.  This may be overriden by the
++has passed.  This may be overridden by the
+ .B -f,
+ .B --force,
+ or
+@@ -175,11 +175,11 @@
+ .B \-\-system,
+ or 
+ .B \-S
+-is specifed, or to all systems which have work when just
++is specified, or to all systems which have work when just
+ .B \-r1
+ or
+ .B \-\-master
+-is specifed), begin an endless loop as with
++is specified), begin an endless loop as with
+ .B \-\-loop.
+ .TP 5
+ .B \-q, \-\-nouuxqt
+Index: uucp-1.07/uux.1
+===================================================================
+--- uucp-1.07.orig/uux.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uux.1	2019-01-12 19:51:27.931352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $
++.\" ''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $
+ .TH uux 1 "Taylor UUCP 1.07"
+ .SH NAME
+ uux \- Remote command execution over UUCP
+@@ -202,7 +202,7 @@
+ .SH EXAMPLES
+ .br
+ .nf
+-uux -z - sys1!rmail user1
++uux \-z \- sys1!rmail user1
+ .fi
+ Execute the command ``rmail user1'' on the system sys1, giving it as
+ standard input whatever is given to
+@@ -213,7 +213,7 @@
+ 
+ .br
+ .nf
+-uux 'diff -c sys1!~user1/file1 sys2!~user2/file2 >!file.diff'
++uux 'diff \-c sys1!~user1/file1 sys2!~user2/file2 >!file.diff'
+ .fi
+ Fetch the two named files from system sys1 and system sys2 and execute
+ .I diff
+Index: uucp-1.07/uuxqt.8
+===================================================================
+--- uucp-1.07.orig/uuxqt.8	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uuxqt.8	2019-01-12 19:51:27.931352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $
++.\" ''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $
+ .TH uuxqt 8 "Taylor UUCP 1.07"
+ .SH NAME
+ uuxqt \- UUCP execution daemon
+@@ -41,7 +41,7 @@
+ .br
+ .in +0.5i
+ .nf
+-uuxqt --command rmail
++uuxqt \-\-command rmail
+ .fi
+ .in -0.5i
+ .TP 5
diff --git a/srcpkgs/uucp/patches/no-sleep.patch b/srcpkgs/uucp/patches/no-sleep.patch
new file mode 100644
index 000000000000..b8b43350770f
--- /dev/null
+++ b/srcpkgs/uucp/patches/no-sleep.patch
@@ -0,0 +1,65 @@
+Description: avoid sleeps
+Author: Frank Heckenbach
+Index: uucp-1.07/prott.c
+===================================================================
+--- uucp-1.07.orig/prott.c	2017-09-27 12:24:15.963165757 +0200
++++ uucp-1.07/prott.c	2017-09-27 12:24:15.959165687 +0200
+@@ -88,7 +88,7 @@
+   zTbuf[0] = 0;
+   zTbuf[1] = 0;
+   fTfile = FALSE;
+-  usysdep_sleep (2);
++  // usysdep_sleep (2);  -- why? protocol t is meant to be used over an error-free connection
+   return TRUE;
+ }
+ \f
+Index: uucp-1.07/unix/pipe.c
+===================================================================
+--- uucp-1.07.orig/unix/pipe.c	2017-09-27 12:24:15.963165757 +0200
++++ uucp-1.07/unix/pipe.c	2017-09-27 12:24:15.959165687 +0200
+@@ -165,10 +165,43 @@
+   if (qsysdep->ipid >= 0)
+     {
+       if (kill (qsysdep->ipid, SIGHUP) == 0)
+-        usysdep_sleep (2);
++        {
++          #if defined (HAVE_USLEEP) && defined (HAVE_WAITPID)
++          /* Avoid wasting 4 seconds (including the SIGPIPE case below).
++             Quick and dirty work-around to avoid depending on SIGCHLD:
++             Just sleep up to 20 times 0.1s as long as the child exists. */
++          int i, status;
++          for (i = 20; i > 0; i--)
++            {
++              if (waitpid (qsysdep->ipid, &status, WNOHANG) == qsysdep->ipid)
++                {
++                  qsysdep->ipid = -1;
++                  return fret;
++                }
++              usleep (100000);
++            }
++          #else
++          usysdep_sleep (2);
++          #endif
++        }
+ #ifdef SIGPIPE
+       if (kill (qsysdep->ipid, SIGPIPE) == 0)
+-        usysdep_sleep (2);
++        {
++          #if HAVE_USLEEP
++          int i, status;
++          for (i = 20; i > 0; i--)
++            {
++              if (waitpid (qsysdep->ipid, &status, WNOHANG) == qsysdep->ipid)
++                {
++                  qsysdep->ipid = -1;
++                  return fret;
++                }
++              usleep (100000);
++            }
++          #else
++          usysdep_sleep (2);
++          #endif
++        }
+ #endif
+       if (kill (qsysdep->ipid, SIGKILL) < 0 && errno == EPERM)
+ 	{
diff --git a/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch b/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch
new file mode 100644
index 000000000000..3a7e4ea91fa2
--- /dev/null
+++ b/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch
@@ -0,0 +1,321 @@
+Description: avoid forcing hw control
+Author: Michal Suchanek
+Index: uucp-1.07/conn.h
+===================================================================
+--- uucp-1.07.orig/conn.h	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/conn.h	2013-12-04 11:20:26.022181350 +0100
+@@ -117,7 +117,7 @@
+   boolean (*pfunlock) P((struct sconnection *qconn));
+   /* Open the connection.  */
+   boolean (*pfopen) P((struct sconnection *qconn, long ibaud,
+-		       boolean fwait, boolean fuser));
++		       boolean fwait, boolean fuser, boolean nortscts));
+   /* Close the connection.  */
+   boolean (*pfclose) P((struct sconnection *qconn,
+ 			pointer puuconf,
+@@ -198,7 +198,7 @@
+    than the effective permissions.  */
+ extern boolean fconn_open P((struct sconnection *qconn, long ibaud,
+ 			     long ihighbaud, boolean fwait,
+-			     boolean fuser));
++			     boolean fuser, boolean nortscts));
+ 
+ /* Close a connection.  The fsuccess argument is TRUE if the
+    conversation completed normally, FALSE if it is being aborted.  */
+Index: uucp-1.07/cu.c
+===================================================================
+--- uucp-1.07.orig/cu.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/cu.c	2013-12-04 11:27:03.353425764 +0100
+@@ -223,6 +223,7 @@
+   { "baud", required_argument, NULL, 's' },
+   { "mapcr", no_argument, NULL, 't' },
+   { "nostop", no_argument, NULL, 3 },
++  { "nortscts", no_argument, NULL, 'f' },
+   { "system", required_argument, NULL, 'z' },
+   { "config", required_argument, NULL, 'I' },
+   { "debug", required_argument, NULL, 'x' },
+@@ -258,6 +259,8 @@
+   enum txonxoffsetting txonxoff = XONXOFF_ON;
+   /* -I: configuration file name.  */
+   const char *zconfig = NULL;
++  /* -f: no hardware flow control */
++  boolean nortscts = FALSE;
+   int iopt;
+   pointer puuconf;
+   int iuuconf;
+@@ -295,7 +298,7 @@
+ 	}
+     }
+ 
+-  while ((iopt = getopt_long (argc, argv, "a:c:deE:hnI:l:op:s:tvx:z:",
++  while ((iopt = getopt_long (argc, argv, "a:c:deE:fhnI:l:op:s:tvx:z:",
+ 			      asCulongopts, (int *) NULL)) != EOF)
+     {
+       switch (iopt)
+@@ -322,6 +325,11 @@
+ 	  zCuvar_escape = optarg;
+ 	  break;
+ 
++	case 'f':
++	  /* No hardware flow control.  */
++	  nortscts = TRUE;
++	  break;
++
+ 	case 'h':
+ 	  /* Local echo.  */
+ 	  fCulocalecho = TRUE;
+@@ -682,7 +690,7 @@
+ 	}
+ 
+       /* Here we have locked a connection to use.  */
+-      if (! fconn_open (&sconn, iusebaud, ihighbaud, FALSE, sinfo.fdirect))
++      if (! fconn_open (&sconn, iusebaud, ihighbaud, FALSE, sinfo.fdirect, nortscts))
+ 	ucuabort ();
+ 
+       fCuclose_conn = TRUE;
+Index: uucp-1.07/conn.c
+===================================================================
+--- uucp-1.07.orig/conn.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/conn.c	2013-12-04 11:20:26.026181299 +0100
+@@ -114,12 +114,13 @@
+ /* Open a connection.  */
+ 
+ boolean
+-fconn_open (qconn, ibaud, ihighbaud, fwait, fuser)
++fconn_open (qconn, ibaud, ihighbaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      long ihighbaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   boolean fret;
+ 
+@@ -177,7 +178,7 @@
+   else
+     ulog_device (qconn->qport->uuconf_zname);
+ 
+-  fret = (*qconn->qcmds->pfopen) (qconn, ibaud, fwait, fuser);
++  fret = (*qconn->qcmds->pfopen) (qconn, ibaud, fwait, fuser, nortscts);
+ 
+   if (! fret)
+     ulog_device ((const char *) NULL);
+Index: uucp-1.07/uucico.c
+===================================================================
+--- uucp-1.07.orig/uucico.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/uucico.c	2013-12-04 11:20:26.026181299 +0100
+@@ -695,7 +695,7 @@
+ 
+       if (fret)
+ 	{
+-	  if (! fconn_open (&sconn, (long) 0, (long) 0, TRUE, FALSE))
++	  if (! fconn_open (&sconn, (long) 0, (long) 0, TRUE, FALSE, FALSE))
+ 	    fret = FALSE;
+ 	  qConn = &sconn;
+ 	}
+@@ -714,7 +714,7 @@
+ 				     (struct uuconf_dialer *) NULL,
+ 				     TRUE)
+ 		      || ! fconn_open (&sconn, (long) 0, (long) 0, TRUE,
+-				       FALSE))
++				       FALSE, FALSE))
+ 		    break;
+ 		}
+ 	      fret = FALSE;
+@@ -1176,7 +1176,7 @@
+     }
+ 
+   if (! fconn_open (&sconn, qsys->uuconf_ibaud, qsys->uuconf_ihighbaud,
+-		    FALSE, FALSE))
++		    FALSE, FALSE, FALSE))
+     {
+       terr = STATUS_PORT_FAILED;
+       fret = FALSE;
+Index: uucp-1.07/unix/pipe.c
+===================================================================
+--- uucp-1.07.orig/unix/pipe.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/pipe.c	2013-12-04 11:20:26.026181299 +0100
+@@ -49,7 +49,7 @@
+ 
+ static void uspipe_free P((struct sconnection *qconn));
+ static boolean fspipe_open P((struct sconnection *qconn, long ibaud,
+-			      boolean fwait, boolean fuser));
++			      boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fspipe_close P((struct sconnection *qconn,
+ 			       pointer puuconf,
+ 			       struct uuconf_dialer *qdialer,
+@@ -115,11 +115,12 @@
+ 
+ /*ARGSUSED*/
+ static boolean
+-fspipe_open (qconn, ibaud, fwait, fuser)
++fspipe_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn ATTRIBUTE_UNUSED;
+      long ibaud ATTRIBUTE_UNUSED;
+      boolean fwait;
+      boolean fuser ATTRIBUTE_UNUSED;
++     boolean nortscts ATTRIBUTE_UNUSED;
+ {
+   /* We don't do incoming waits on pipes.  */
+   if (fwait)
+Index: uucp-1.07/unix/serial.c
+===================================================================
+--- uucp-1.07.orig/unix/serial.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/serial.c	2013-12-04 11:20:26.026181299 +0100
+@@ -246,11 +246,11 @@
+ 				boolean fwait, boolean fuser,
+ 				enum tclocal_setting tlocal));
+ static boolean fsstdin_open P((struct sconnection *qconn, long ibaud,
+-			       boolean fwait, boolean fuser));
++			       boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fsmodem_open P((struct sconnection *qconn, long ibaud,
+-			       boolean fwait, boolean fuser));
++			       boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fsdirect_open P((struct sconnection *qconn, long ibaud,
+-				boolean fwait, boolean fuser));
++				boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fsblock P((struct ssysdep_conn *q, boolean fblock));
+ static boolean fsserial_close P((struct ssysdep_conn *q));
+ static boolean fsstdin_close P((struct sconnection *qconn,
+@@ -1308,11 +1308,12 @@
+    call to fsblock.  */
+ 
+ static boolean
+-fsstdin_open (qconn, ibaud, fwait, fuser)
++fsstdin_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   struct ssysdep_conn *q;
+ 
+@@ -1323,6 +1324,9 @@
+   q->o = q->ord;
+   if (! fsserial_open (qconn, ibaud, fwait, fuser, IGNORE_CLOCAL))
+     return FALSE;
++  if (nortscts
++      && ! fsserial_hardflow (qconn, FALSE))
++    return FALSE;
+   q->iwr_flags = fcntl (q->owr, F_GETFL, 0);
+   if (q->iwr_flags < 0)
+     {
+@@ -1335,11 +1339,12 @@
+ /* Open a modem port.  */
+ 
+ static boolean
+-fsmodem_open (qconn, ibaud, fwait, fuser)
++fsmodem_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   struct uuconf_modem_port *qm;
+ 
+@@ -1356,7 +1361,10 @@
+      out, because some modems don't assert the necessary signals until
+      they see carrier.  Instead, we turn on hardware flow control in
+      fsmodem_carrier.  */
+-  if (fwait
++  if (nortscts
++      && ! fsserial_hardflow (qconn, FALSE))
++    return FALSE;
++  else if (fwait
+       && ! fsserial_hardflow (qconn, qm->uuconf_fhardflow))
+     return FALSE;
+ 
+@@ -1366,11 +1374,12 @@
+ /* Open a direct port.  */
+ 
+ static boolean
+-fsdirect_open (qconn, ibaud, fwait, fuser)
++fsdirect_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   struct uuconf_direct_port *qd;
+ 
+@@ -1383,7 +1392,7 @@
+ 
+   /* Always turn on hardware flow control for a direct port when it is
+      opened.  There is no other sensible time to turn it on.  */
+-  return fsserial_hardflow (qconn, qd->uuconf_fhardflow);
++  return fsserial_hardflow (qconn, qd->uuconf_fhardflow && ! nortscts);
+ }
+ \f
+ /* Change the blocking status of the port.  We keep track of the
+Index: uucp-1.07/unix/tcp.c
+===================================================================
+--- uucp-1.07.orig/unix/tcp.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/tcp.c	2013-12-04 11:20:26.026181299 +0100
+@@ -78,7 +78,7 @@
+ #endif
+ static boolean ftcp_set_flags P((struct ssysdep_conn *qsysdep));
+ static boolean ftcp_open P((struct sconnection *qconn, long ibaud,
+-			    boolean fwait, boolean fuser));
++			    boolean fwait, boolean fuser, boolean nortscts));
+ static boolean ftcp_close P((struct sconnection *qconn,
+ 			     pointer puuconf,
+ 			     struct uuconf_dialer *qdialer,
+@@ -208,11 +208,12 @@
+    system.  */
+ 
+ static boolean
+-ftcp_open (qconn, ibaud, fwait, fuser)
++ftcp_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud ATTRIBUTE_UNUSED;
+      boolean fwait;
+      boolean fuser ATTRIBUTE_UNUSED;
++     boolean nortscts ATTRIBUTE_UNUSED;
+ {
+   struct ssysdep_conn *qsysdep;
+   const char *zport;
+Index: uucp-1.07/unix/tli.c
+===================================================================
+--- uucp-1.07.orig/unix/tli.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/tli.c	2013-12-04 11:20:26.026181299 +0100
+@@ -106,7 +106,7 @@
+ static void utli_free P((struct sconnection *qconn));
+ static boolean ftli_push P((struct sconnection *qconn));
+ static boolean ftli_open P((struct sconnection *qconn, long ibaud,
+-			    boolean fwait, boolean fuser));
++			    boolean fwait, boolean fuser, boolean nortscts));
+ static boolean ftli_close P((struct sconnection *qconn,
+ 			     pointer puuconf,
+ 			     struct uuconf_dialer *qdialer,
+@@ -238,11 +238,12 @@
+    system.  */
+ 
+ static boolean
+-ftli_open (qconn, ibaud, fwait, fuser)
++ftli_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser ATTRIBUTE_UNUSED;
++     boolean nortscts ATTRIBUTE_UNUSED;
+ {
+   struct ssysdep_conn *qsysdep;
+   const char *zdevice;
+Index: uucp-1.07/cu.1
+===================================================================
+--- uucp-1.07.orig/cu.1	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/cu.1	2013-12-04 11:20:26.026181299 +0100
+@@ -231,6 +231,9 @@
+ .B \-\-nostop
+ Turn off XON/XOFF handling (it is on by default).
+ .TP 5
++.B \-f, \-\-nortscts
++Do not use hardware flow control.
++.TP 5
+ .B \-E char, \-\-escape char
+ Set the escape character.  Initially
+ .B ~
diff --git a/srcpkgs/uucp/patches/spelling.patch b/srcpkgs/uucp/patches/spelling.patch
new file mode 100644
index 000000000000..b96223fcd235
--- /dev/null
+++ b/srcpkgs/uucp/patches/spelling.patch
@@ -0,0 +1,28 @@
+Author: Thorsten Alteholz <debian@alteholz.de>
+Description: correct spelling error in binary
+Index: uucp-1.07/cu.c
+===================================================================
+--- uucp-1.07.orig/cu.c	2019-01-12 19:50:00.447355162 +0100
++++ uucp-1.07/cu.c	2019-01-12 19:50:00.435355162 +0100
+@@ -1756,7 +1756,7 @@
+     zfrom = zbufcpy (argv[1]);
+   else
+     {
+-      zfrom = zsysdep_terminal_line ("Remote file to retreive: ");
++      zfrom = zsysdep_terminal_line ("Remote file to retrieve: ");
+       if (zfrom == NULL)
+ 	ucuabort ();
+       zfrom[strcspn (zfrom, " \t\n")] = '\0';
+Index: uucp-1.07/uuxqt.c
+===================================================================
+--- uucp-1.07.orig/uuxqt.c	2003-05-29 08:08:48.000000000 +0200
++++ uucp-1.07/uuxqt.c	2019-01-12 19:50:32.907354189 +0100
+@@ -1517,7 +1517,7 @@
+ 	  az[i++] = zQcmd;
+ 	  az[i++] = "\n";
+ 
+-	  (void) fsysdep_mail (zmail, "Execution succeded", i, az);
++	  (void) fsysdep_mail (zmail, "Execution succeeded", i, az);
+ 	}
+ 
+       /* Now we may have to uucp the output to some other machine.  */
diff --git a/srcpkgs/uucp/patches/uucp-alt-misc.patch b/srcpkgs/uucp/patches/uucp-alt-misc.patch
new file mode 100644
index 000000000000..841b2e212831
--- /dev/null
+++ b/srcpkgs/uucp/patches/uucp-alt-misc.patch
@@ -0,0 +1,111 @@
+--- uucp-1.07.orig/policy.h	2003-05-29 03:08:45.000000000 -0300
++++ uucp-1.07.orig/policy.h	2020-03-09 03:48:58.317291375 -0300
+@@ -240,8 +240,8 @@
+    the sendmail choice below.  Otherwise, select one of the other
+    choices as appropriate.  */
+ #if 1
+-#define MAIL_PROGRAM "/usr/lib/sendmail -t"
+-/* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
++/* #define MAIL_PROGRAM "/usr/lib/sendmail -t" */
++#define MAIL_PROGRAM "/usr/sbin/sendmail -t" 
+ #define MAIL_PROGRAM_TO_BODY 1
+ #define MAIL_PROGRAM_SUBJECT_BODY 1
+ #endif
+@@ -302,7 +302,7 @@
+ /* #define LOCKDIR "/usr/spool/locks" */
+ /* #define LOCKDIR "/usr/spool/uucp/LCK" */
+ /* #define LOCKDIR "/var/spool/lock" */
+-/* #define LOCKDIR "/var/lock" */
++#define LOCKDIR "/var/lock/serial"
+ 
+ /* You must also specify the format of the lock files by setting
+    exactly one of the following macros to 1.  Check an existing lock
+@@ -466,8 +466,8 @@
+    When looking something up (a system, a port, etc.) the new style
+    configuration files will be read first, followed by the V2
+    configuration files, followed by the HDB configuration files.  */
+-#define HAVE_V2_CONFIG 0
+-#define HAVE_HDB_CONFIG 0
++#define HAVE_V2_CONFIG 1
++#define HAVE_HDB_CONFIG 1
+ 
+ /* Exactly one of the following macros must be set to 1.  The exact
+    format of the spool directories is explained in unix/spool.c.
+@@ -572,16 +572,16 @@
+ /* The name of the default spool directory.  If HAVE_TAYLOR_CONFIG is
+    set to 1, this may be overridden by the ``spool'' command in the
+    configuration file.  */
+-#define SPOOLDIR "/usr/spool/uucp"
+-/* #define SPOOLDIR "/var/spool/uucp" */
++/* #define SPOOLDIR "/usr/spool/uucp" */
++#define SPOOLDIR "/var/spool/uucp" 
+ 
+ /* The name of the default public directory.  If HAVE_TAYLOR_CONFIG is
+    set to 1, this may be overridden by the ``pubdir'' command in the
+    configuration file.  Also, a particular system may be given a
+    specific public directory by using the ``pubdir'' command in the
+    system file.  */
+-#define PUBDIR "/usr/spool/uucppublic"
+-/* #define PUBDIR "/var/spool/uucppublic" */
++/* #define PUBDIR "/usr/spool/uucppublic" */
++#define PUBDIR "/var/spool/uucppublic" 
+ 
+ /* The default command path.  This is a space separated list of
+    directories.  Remote command executions requested by uux are looked
+@@ -644,24 +644,23 @@
+ /* The default log file when using HAVE_TAYLOR_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+    command in the configuration file.  */
+-#define LOGFILE "/usr/spool/uucp/Log"
++/* #define LOGFILE "/usr/spool/uucp/Log" */
+ /* #define LOGFILE "/var/spool/uucp/Log" */
+-/* #define LOGFILE "/var/log/uucp/Log" */
++#define LOGFILE "/var/log/uucp/Log" 
+ 
+ /* The default statistics file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``statfile'' command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/Stats"
++/* #define STATFILE "/usr/spool/uucp/Stats" */
+ /* #define STATFILE "/var/spool/uucp/Stats" */
+-/* #define STATFILE "/var/log/uucp/Stats" */
++#define STATFILE "/var/log/uucp/Stats" 
+ 
+ /* The default debugging file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``debugfile'' command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/Debug"
++/* #define DEBUGFILE "/usr/spool/uucp/Debug" */
+ /* #define DEBUGFILE "/var/spool/uucp/Debug" */
+-/* #define DEBUGFILE "/var/log/uucp/Debug" */
+-
++#define DEBUGFILE "/var/log/uucp/Debug" 
+ #endif /* HAVE_TAYLOR_LOGGING */
+ 
+ #if HAVE_V2_LOGGING
+@@ -669,17 +668,23 @@
+ /* The default log file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+    command in the configuration file.  */
+-#define LOGFILE "/usr/spool/uucp/LOGFILE"
++ /* #define LOGFILE "/usr/spool/uucp/Log" */
++ /* #define LOGFILE "/var/spool/uucp/Log" */
++#define LOGFILE "/var/log/uucp/Log"
+ 
+ /* The default statistics file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``statfile''
+    command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/SYSLOG"
++ /* #define STATFILE "/usr/spool/uucp/Stats" */
++ /* #define STATFILE "/var/spool/uucp/Stats" */
++#define STATFILE "/var/log/uucp/Stats"
+ 
+ /* The default debugging file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``debugfile''
+    command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/DEBUG"
++ /* #define DEBUGFILE "/usr/spool/uucp/Debug" */
++ /* #define DEBUGFILE "/var/spool/uucp/Debug" */
++#define DEBUGFILE "/var/log/uucp/Debug"
+ 
+ #endif /* HAVE_V2_LOGGING */
diff --git a/srcpkgs/uucp/patches/uucp-org.patch b/srcpkgs/uucp/patches/uucp-org.patch
new file mode 100644
index 000000000000..d6294342cd77
--- /dev/null
+++ b/srcpkgs/uucp/patches/uucp-org.patch
@@ -0,0 +1,8833 @@
+Description: Changes from previous version
+ This patch contains all changes from previous versions.
+Author: Thorsten Alteholz <debian@alteholz.de>
+--- uucp-1.07.orig/uucico.c
++++ uucp-1.07/uucico.c
+@@ -125,6 +125,9 @@ struct spass
+   struct sconnection *qconn;
+ };
+ 
++/* min. grade set on commandline */
++static char cmdlgrade = '\0';
++
+ /* Local functions.  */
+ 
+ static void uusage P((void));
+@@ -175,6 +178,7 @@ static const struct option asLongopts[]
+   { "nodetach", no_argument, NULL, 'D' },
+   { "loop", no_argument, NULL, 'e' },
+   { "force", no_argument, NULL, 'f'},
++  { "grade", required_argument, NULL, 'g'},
+   { "stdin", required_argument, NULL, 'i' },
+   { "prompt", no_argument, NULL, 'l' },
+   { "port", required_argument, NULL, 'p' },
+@@ -249,9 +253,9 @@ main (argc, argv)
+     ++zProgram;
+ 
+ #if COHERENT_C_OPTION
+-  zopts = "c:CDefi:I:lp:qr:s:S:u:x:X:vwz";
++  zopts = "c:CDefg:i:I:lp:qr:s:S:u:x:X:vwz";
+ #else
+-  zopts = "cCDefi:I:lp:qr:s:S:u:x:X:vwz";
++  zopts = "cCDefg:i:I:lp:qr:s:S:u:x:X:vwz";
+ #endif
+ 
+   while ((iopt = getopt_long (argc, argv, zopts,
+@@ -292,6 +296,14 @@ main (argc, argv)
+ 	     failed call.  */
+ 	  fforce = TRUE;
+ 	  break;
++	
++	case 'g':
++	  /* Force a grade */
++	  if (isalpha(optarg[0]))
++	     cmdlgrade = optarg[0];
++	  else
++	     fprintf (stderr, "%s: invalid grade \n", zProgram);
++	  break;
+ 
+ 	case 'i':
+ 	  /* Type of port to use for standard input.  Only TLI is
+@@ -796,6 +808,7 @@ uhelp ()
+   printf ("Usage: %s [options]\n", zProgram);
+   printf (" -s,-S,--system system: Call system (-S implies -f)\n");
+   printf (" -f,--force: Force call despite system status\n");
++  printf (" -g,--grade: limit outgoing call to a given grade\n");
+   printf (" -r state: 1 for master, 0 for slave (default)\n");
+   printf (" --master: Act as master\n");
+   printf (" --slave: Act as slave (default)\n");
+@@ -1369,12 +1382,18 @@ fdo_call (qdaemon, qstat, qdialer, pfcal
+     boolean fret;
+ 
+     /* Determine the grade we should request of the other system.  A
+-       '\0' means that no restrictions have been made.  */
+-    if (! ftimespan_match (qsys->uuconf_qcalltimegrade, &ival,
+-			   (int *) NULL))
+-      bgrade = '\0';
++       '\0' means that no restrictions have been made.
++       If a grade is set on the command line, the calltimegrade-value
++       is overwritten.  */
++       
++    if (cmdlgrade != '\0')
++      bgrade = cmdlgrade;
+     else
+-      bgrade = (char) ival;
++      if (! ftimespan_match (qsys->uuconf_qcalltimegrade, &ival,
++			   (int *) NULL))
++         bgrade = '\0';
++      else
++         bgrade = (char) ival;
+ 
+     /* Determine the name we will call ourselves.  */
+     if (qsys->uuconf_zlocalname != NULL)
+--- uucp-1.07.orig/uucp.info-2
++++ uucp-1.07/uucp.info-2
+@@ -1,4 +1,6 @@
+-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
++
++INFO-DIR-SECTION Networking tools
+ 
+ START-INFO-DIR-ENTRY
+ * UUCP: (uucp).                 Transfer mail and news across phone lines.
+@@ -25,1247 +27,1119 @@ versions, except that the section entitl
+ a translation approved by the author instead of in the original English.
+ 
+ \x1f
+-File: uucp.info,  Node: Invoking cu,  Next: Invoking uucico,  Prev: Invoking uupick,  Up: Invoking the UUCP Programs
+-
+-Invoking cu
+-===========
+-
+-* Menu:
+-
+-* cu Description::              Description of cu
+-* cu Commands::                 Commands Supported by cu
+-* cu Variables::                Variables Supported by cu
+-* cu Options::                  Options Supported by cu
+-
+-\x1f
+-File: uucp.info,  Node: cu Description,  Next: cu Commands,  Prev: Invoking cu,  Up: Invoking cu
+-
+-cu Description
+---------------
+-
+-     cu [options] [system | phone | "dir"]
+-
+-   The `cu' program is used to call up another system and act as a dial
+-in terminal.  It can also do simple file transfers with no error
+-checking.
+-
+-   The `cu' program takes a single non-option argument.
+-
+-   If the argument is the string `dir' cu will make a direct connection
+-to the port.  This may only be used by users with write access to the
+-port, as it permits reprogramming the modem.
+-
+-   Otherwise, if the argument begins with a digit, it is taken to be a
+-phone number to call.
+-
+-   Otherwise, it is taken to be the name of a system to call.
+-
+-   The `-z' or `--system' options may be used to name a system
+-beginning with a digit, and the `-c' or `--phone' options may be used
+-to name a phone number that does not begin with a digit.
+-
+-   The `cu' program locates a port to use in the UUCP configuration
+-files.  If a simple system name is given, it will select a port
+-appropriate for that system.  The `-p', `--port', `-l', `--line', `-s',
+-and `--speed' options may be used to control the port selection.
+-
+-   When a connection is made to the remote system, `cu' forks into two
+-processes.  One reads from the port and writes to the terminal, while
+-the other reads from the terminal and writes to the port.
+-
+-\x1f
+-File: uucp.info,  Node: cu Commands,  Next: cu Variables,  Prev: cu Description,  Up: Invoking cu
+-
+-cu Commands
+------------
+-
+-   The `cu' program provides several commands that may be used during
+-the conversation.  The commands all begin with an escape character,
+-which by default is `~' (tilde).  The escape character is only
+-recognized at the beginning of a line.  To send an escape character to
+-the remote system at the start of a line, it must be entered twice.  All
+-commands are either a single character or a word beginning with `%'
+-(percent sign).
+-
+-   The `cu' program recognizes the following commands.
+-
+-`~.'
+-     Terminate the conversation.
+-
+-`~! command'
+-     Run command in a shell.  If command is empty, starts up a shell.
+-
+-`~$ command'
+-     Run command, sending the standard output to the remote system.
+-
+-`~| command'
+-     Run command, taking the standard input from the remote system.
+-
+-`~+ command'
+-     Run command, taking the standard input from the remote system and
+-     sending the standard output to the remote system.
+-
+-`~#, ~%break'
+-     Send a break signal, if possible.
+-
+-`~c directory, ~%cd directory'
+-     Change the local directory.
+-
+-`~> file'
+-     Send a file to the remote system.  This just dumps the file over
+-     the communication line.  It is assumed that the remote system is
+-     expecting it.
+-
+-`~<'
+-     Receive a file from the remote system.  This prompts for the local
+-     file name and for the remote command to execute to begin the file
+-     transfer.  It continues accepting data until the contents of the
+-     `eofread' variable are seen.
+-
+-`~p from to'
+-`~%put from to'
+-     Send a file to a remote Unix system.  This runs the appropriate
+-     commands on the remote system.
+-
+-`~t from to'
+-`~%take from to'
+-     Retrieve a file from a remote Unix system.  This runs the
+-     appropriate commands on the remote system.
+-
+-`~s variable value'
+-     Set a `cu' variable to the given value.  If value is not given, the
+-     variable is set to `true'.
+-
+-`~! variable'
+-     Set a `cu' variable to `false'.
+-
+-`~z'
+-     Suspend the cu session.  This is only supported on some systems.
+-     On systems for which `^Z' may be used to suspend a job, `~^Z' will
+-     also suspend the session.
+-
+-`~%nostop'
+-     Turn off XON/XOFF handling.
+-
+-`~%stop'
+-     Turn on XON/XOFF handling.
+-
+-`~v'
+-     List all the variables and their values.
+-
+-`~?'
+-     List all commands.
+-
+-\x1f
+-File: uucp.info,  Node: cu Variables,  Next: cu Options,  Prev: cu Commands,  Up: Invoking cu
+-
+-cu Variables
+-------------
+-
+-   The `cu' program also supports several variables.  They may be
+-listed with the `~v' command, and set with the `~s' or `~!'  commands.
+-
+-`escape'
+-     The escape character.  The default is `~' (tilde).
+-
+-`delay'
+-     If this variable is true, `cu' will delay for a second, after
+-     recognizing the escape character, before printing the name of the
+-     local system.  The default is true.
+-
+-`eol'
+-     The list of characters which are considered to finish a line.  The
+-     escape character is only recognized after one of these is seen.
+-     The default is `carriage return', `^U', `^C', `^O', `^D', `^S',
+-     `^Q', `^R'.
+-
+-`binary'
+-     Whether to transfer binary data when sending a file.  If this is
+-     false, then newlines in the file being sent are converted to
+-     carriage returns.  The default is false.
+-
+-`binary-prefix'
+-     A string used before sending a binary character in a file
+-     transfer, if the `binary' variable is true.  The default is `^V'.
+-
+-`echo-check'
+-     Whether to check file transfers by examining what the remote system
+-     echoes back.  This probably doesn't work very well.  The default is
+-     false.
+-
+-`echonl'
+-     The character to look for after sending each line in a file.  The
+-     default is carriage return.
+-
+-`timeout'
+-     The timeout to use, in seconds, when looking for a character,
+-     either when doing echo checking or when looking for the `echonl'
+-     character.  The default is 30.
+-
+-`kill'
+-     The character to use delete a line if the echo check fails.  The
+-     default is `^U'.
+-
+-`resend'
+-     The number of times to resend a line if the echo check continues to
+-     fail.  The default is 10.
+-
+-`eofwrite'
+-     The string to write after sending a file with the `~>' command.
+-     The default is `^D'.
+-
+-`eofread'
+-     The string to look for when receiving a file with the ` ~<'
+-     command.  The default is `$', which is intended to be a typical
+-     shell prompt.
+-
+-`verbose'
+-     Whether to print accumulated information during a file transfer.
+-     The default is true.
+-
+-\x1f
+-File: uucp.info,  Node: cu Options,  Prev: cu Variables,  Up: Invoking cu
+-
+-cu Options
+-----------
+-
+-   The following options may be given to `cu'.
+-
+-`-e'
+-`--parity=even'
+-     Use even parity.
+-
+-`-o'
+-`--parity=odd'
+-     Use odd parity.
+-
+-`--parity=none'
+-     Use no parity.  No parity is also used if both `-e' and `-o' are
+-     given.
+-
+-`-h'
+-`--halfduplex'
+-     Echo characters locally (half-duplex mode).
+-
+-`--nostop'
+-     Turn off XON/XOFF handling (it is on by default).
+-
+-`-E char'
+-`--escape char'
+-     Set the escape character.  Initially `~' (tilde).  To eliminate the
+-     escape character, use `-E '''.
+-
+-`-z system'
+-`--system system'
+-     The system to call.
+-
+-`-c phone-number'
+-`--phone phone-number'
+-     The phone number to call.
+-
+-`-p port'
+-`-a port'
+-`--port port'
+-     Name the port to use.
+-
+-`-l line'
+-`--line line'
+-     Name the line to use by giving a device name.  This may be used to
+-     dial out on ports that are not listed in the UUCP configuration
+-     files.  Write access to the device is required.
+-
+-`-s speed'
+-`-#'
+-`--speed speed'
+-     The speed (baud rate) to use.  Here, `-#' means an actual number;
+-     e.g., `-9600'.
+-
+-`-n'
+-`--prompt'
+-     Prompt for the phone number to use.
+-
+-`-d'
+-     Enter debugging mode.  Equivalent to `--debug all'.
+-
+-`-x type'
+-`--debug type'
+-`-I file'
+-`--config file'
+-`-v'
+-`--version'
+-`--help'
+-     *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uucico,  Next: Invoking uuxqt,  Prev: Invoking cu,  Up: Invoking the UUCP Programs
+-
+-Invoking uucico
+-===============
+-
+-* Menu:
+-
+-* uucico Description::          Description of uucico
+-* uucico Options::              Options Supported by uucico
+-
+-\x1f
+-File: uucp.info,  Node: uucico Description,  Next: uucico Options,  Prev: Invoking uucico,  Up: Invoking uucico
+-
+-uucico Description
+-------------------
+-
+-     uucico [options]
+-
+-   The `uucico' daemon processes file transfer requests queued by
+-`uucp' and `uux'.  It is started when `uucp' or `uux' is run (unless
+-they are given the `-r' or `--nouucico' options).  It is also typically
+-started periodically using entries in the `crontab' table(s).
+-
+-   When `uucico' is invoked with `-r1', `--master', `-s', `--system',
+-or `-S', the daemon will place a call to a remote system, running in
+-master mode.  Otherwise the daemon will start in slave mode, accepting
+-a call from a remote system.  Typically a special login name will be
+-set up for UUCP which automatically invokes `uucico' when a remote
+-system calls in and logs in under that name.
+-
+-   When `uucico' terminates, it invokes the `uuxqt' daemon, unless the
+-`-q' or `--nouuxqt' options were given; `uuxqt' executes any work
+-orders created by `uux' on a remote system, and any work orders created
+-locally which have received remote files for which they were waiting.
+-
+-   If a call fails, `uucico' will normally refuse to retry the call
+-until a certain (configurable) amount of time has passed.  This may be
+-overriden by the `-f', `--force', or `-S' options.
+-
+-   The `-l', `--prompt', `-e', or `--loop' options may be used to force
+-`uucico' to produce its own prompts of `login: ' and `Password:'.  When
+-another `uucico' daemon calls in, it will see these prompts and log in
+-as usual.  The login name and password will normally be checked against
+-a separate list kept specially for `uucico', rather than the
+-`/etc/passwd' file (*note Configuration File Names::).  It is possible,
+-on some systems, to configure `uucico' to use `/etc/passwd'.  The `-l'
+-or `--prompt' options will prompt once and then exit; in this mode the
+-UUCP administrator, or the superuser, may use the `-u' or `--login'
+-option to force a login name, in which case `uucico' will not prompt
+-for one.  The `-e' or `--loop' options will prompt again after the
+-first session is over; in this mode `uucico' will permanently control a
+-port.
+-
+-   If `uucico' receives a `SIGQUIT', `SIGTERM' or `SIGPIPE' signal, it
+-will cleanly abort any current conversation with a remote system and
+-exit.  If it receives a `SIGHUP' signal it will abort any current
+-conversation, but will continue to place calls to (if invoked with
+-`-r1' or `--master') and accept calls from (if invoked with `-e' or
+-`--loop') other systems.  If it receives a `SIGINT' signal it will
+-finish the current conversation, but will not place or accept any more
+-calls.
+-
+-\x1f
+-File: uucp.info,  Node: uucico Options,  Prev: uucico Description,  Up: Invoking uucico
+-
+-uucico Options
+---------------
+-
+-   The following options may be given to `uucico'.
+-
+-`-r1'
+-`--master'
+-     Start in master mode: call out to a remote system.  Implied by
+-     `-s', `--system', or `-S'.  If no system is specified,
+-     sequentially call every system for which work is waiting to be
+-     done.
+-
+-`-r0'
+-`--slave'
+-     Start in slave mode.  This is the default.
+-
+-`-s system'
+-`--system system'
+-     Call the specified system.
+-
+-`-S system'
+-     Call the specified system, ignoring any required wait.  This is
+-     equivalent to `-s system -f'.
+-
+-`-f'
+-`--force'
+-     Ignore any required wait for any systems to be called.
+-
+-`-l'
+-`--prompt'
+-     Prompt for login name and password using `login: ' and
+-     `Password:'.  This allows `uucico' to be easily run from `inetd'.
+-     The login name and password are checked against the UUCP password
+-     file, which need not be `/etc/passwd'.  The `--login' option may
+-     be used to force a login name, in which cause `uucico' will only
+-     prompt for a password.
+-
+-`-p port'
+-`--port port'
+-     Specify a port to call out on or to listen to.
+-
+-`-e'
+-`--loop'
+-     Enter an endless loop of login/password prompts and slave mode
+-     daemon execution.  The program will not stop by itself; you must
+-     use `kill' to shut it down.
+-
+-`-w'
+-`--wait'
+-     After calling out (to a particular system when `-s', `--system',
+-     or `-S' is specifed, or to all systems which have work when just
+-     `-r1' or `--master' is specifed), begin an endless loop as with
+-     `--loop'.
+-
+-`-q'
+-`--nouuxqt'
+-     Do not start the `uuxqt' daemon when finished.
+-
+-`-c'
+-`--quiet'
+-     If no calls are permitted at this time, then don't make the call,
+-     but also do not put an error message in the log file and do not
+-     update the system status (as reported by `uustat').  This can be
+-     convenient for automated polling scripts, which may want to simply
+-     attempt to call every system rather than worry about which
+-     particular systems may be called at the moment.  This option also
+-     suppresses the log message indicating that there is no work to be
+-     done.
+-
+-`-C'
+-`--ifwork'
+-     Only call the system named by `-s', `--system', or `-S' if there
+-     is work for that system.
+-
+-`-D'
+-`--nodetach'
+-     Do not detach from the controlling terminal.  Normally `uucico'
+-     detaches from the terminal before each call out to another system
+-     and before invoking `uuxqt'.  This option prevents this.
+-
+-`-u name'
+-`--login name'
+-     Set the login name to use instead of that of the invoking user.
+-     This option may only be used by the UUCP administrator or the
+-     superuser.  If used with `--prompt', this will cause `uucico' to
+-     prompt only for the password, not the login name.
+-
+-`-z'
+-`--try-next'
+-     If a call fails after the remote system is reached, try the next
+-     alternate rather than simply exiting.
+-
+-`-i type'
+-`--stdin type'
+-     Set the type of port to use when using standard input.  The only
+-     supported port type is TLI, and this is only available on machines
+-     which support the TLI networking interface.  Specifying `-i TLI'
+-     causes `uucico' to use TLI calls to perform I/O.
+-
+-`-X type'
+-     Same as the standard option `-x type'.  Provided for historical
+-     compatibility.
+-
+-`-x type'
+-`--debug type'
+-`-I file'
+-`--config file'
+-`-v'
+-`--version'
+-`--help'
+-     *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uuxqt,  Next: Invoking uuchk,  Prev: Invoking uucico,  Up: Invoking the UUCP Programs
+-
+-Invoking uuxqt
+-==============
+-
+-     uuxqt [-c command] [-s system] [--command command] [--system system]
+-
+-   The `uuxqt' daemon executes commands requested by `uux' from either
+-the local system or from remote systems.  It is started automatically
+-by the `uucico' daemon (unless `uucico' is given the `-q' or
+-`--nouuxqt' options).
+-
+-   There is normally no need to run `uuxqt', since it will be invoked
+-by `uucico'.  However, `uuxqt' can be invoked directly to provide
+-greater control over the processing of the work queue.
+-
+-   Multiple invocations of `uuxqt' may be run at once, as controlled by
+-the `max-uuxqts' configuration command; see *Note Miscellaneous
+-(config)::.
+-
+-   The following options may be given to `uuxqt'.
+-
+-`-c command'
+-`--command command'
+-     Only execute requests for the specified command.  For example,
+-     `uuxqt --command rmail'.
+-
+-`-s system'
+-`--system system'
+-     Only execute requests originating from the specified system.
+-
+-`-x type'
+-`--debug type'
+-`-I file'
+-`--config'
+-`-v'
+-`--version'
+-`--help'
+-     *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uuchk,  Next: Invoking uuconv,  Prev: Invoking uuxqt,  Up: Invoking the UUCP Programs
+-
+-Invoking uuchk
+-==============
+-
+-     uuchk [-s system] [--system system]
+-
+-   The `uuchk' program displays information read from the UUCP
+-configuration files.  It should be used to ensure that UUCP has been
+-configured correctly.
+-
+-   The `-s' or `--system' options may be used to display the
+-configuration for just the specified system, rather than for all
+-systems.  The `uuchk' program also supports the standard UUCP program
+-options; see *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uuconv,  Next: Invoking uusched,  Prev: Invoking uuchk,  Up: Invoking the UUCP Programs
+-
+-Invoking uuconv
+-===============
+-
+-     uuconv -i type -o type [-p program] [--program program]
+-     uuconv --input type --output type [-p program] [--program program]
+-
+-   The `uuconv' program converts UUCP configuration files from one
+-format to another.  The type of configuration file to read is specified
+-using the `-i' or `--input' options.  The type of configuration file to
+-write is specified using the `-o' or `--output' options.
+-
+-   The supported configuration file types are `taylor', `v2', and
+-`hdb'.  For a description of the `taylor' configuration files, see
+-*Note Configuration Files::.  The other types of configuration files
+-are used by traditional UUCP packages, and are not described in this
+-manual.
+-
+-   An input configuration of type `v2' or `hdb' is read from a compiled
+-in directory (specified by `oldconfigdir' in `Makefile').  An input
+-configuration of type `taylor' is read from a compiled in directory by
+-default, but may be overridden with the standard `-I' or `--config'
+-options (*note Standard Options::).
+-
+-   The output configuration is written to files in the directory in
+-which `uuconv' is run.
+-
+-   Some information in the input files may not be representable in the
+-desired output format, in which case `uuconv' will silently discard it.
+-The output of `uuconv' should be carefully checked before it is used.
+-The `uuchk' program may be used for this purpose; see *Note Invoking
+-uuchk::.
+-
+-   The `-p' or `--program' option may be used to convert specific `cu'
+-configuration information, rather than the default of only converting
+-the `uucp' configuration information; see *Note config File::.
+-
+-   The `uuchk' program also supports the standard UUCP program options;
+-see *Note Standard Options::.
++File: uucp.info,  Node: j Protocol,  Next: x Protocol,  Prev: i Protocol,  Up: Protocols
+ 
+-\x1f
+-File: uucp.info,  Node: Invoking uusched,  Prev: Invoking uuconv,  Up: Invoking the UUCP Programs
++6.12 UUCP `j' Protocol
++======================
+ 
+-Invoking uusched
+-================
++The `j' protocol is a variant of the `i' protocol.  It was also written
++by Ian Lance Taylor, and first appeared in Taylor UUCP version 1.04.
+ 
+-   The `uusched' program is actually just a shell script which invokes
+-the `uucico' daemon.  It is provided for backward compatibility.  It
+-causes `uucico' to call all systems for which there is work.  Any
+-option which may be given to `uucico' may also be given to `uusched'.
+-*Note Invoking uucico::.
++   The `j' protocol is a version of the `i' protocol designed for
++communication links which intercept a few characters, such as XON or
++XOFF.  It is not efficient to use it on a link which intercepts many
++characters, such as a seven bit link.  The `j' protocol performs no
++error correction or detection; that is presumed to be the responsibility
++of the `i' protocol.
++
++   When the `j' protocol starts up, each system sends a printable ASCII
++string indicating which characters it wants to avoid using.  The string
++begins with the ASCII character `^' (octal 136) and ends with the ASCII
++character `~' (octal 176).  After sending this string, each system
++looks for the corresponding string from the remote system.  The strings
++are composed of escape sequences: `\ooo', where `o' is an octal digit.
++For example, sending the string `^\021\023~' means that the ASCII XON
++and XOFF characters should be avoided.  The union of the characters
++described in both strings (the string which is sent and the string
++which is received) is the set of characters which must be avoided in
++this conversation.  Avoiding a printable ASCII character (octal 040 to
++octal 176, inclusive) is not permitted.
++
++   After the exchange of characters to avoid, the normal `i' protocol
++start up is done, and the rest of the conversation uses the normal `i'
++protocol.  However, each `i' protocol packet is wrapped to become a `j'
++protocol packet.
++
++   Each `j' protocol packet consists of a seven byte header, followed
++by data bytes, followed by index bytes, followed by a one byte trailer.
++The packet header looks like this:
++
++`^'
++     Every packet begins with the ASCII character `^', octal 136.
++
++HIGH
++LOW
++     These two characters give the total number of bytes in the packet.
++     Both HIGH and LOW are printable ASCII characters.  The length of
++     the packet is `(HIGH - 040) * 0100 + (LOW - 040)', where `040 <=
++     HIGH < 0177' and `040 <= LOW < 0140'.  This permits a length of
++     6079 bytes, but there is a further restriction on packet size
++     described below.
++
++`='
++     The ASCII character `=', octal 075.
++
++DATA-HIGH
++DATA-LOW
++     These two characters give the total number of data bytes in the
++     packet.  The encoding is as described for HIGH and LOW.  The number
++     of data bytes is the size of the `i' protocol packet wrapped inside
++     this `j' protocol packet.
++
++`@'
++     The ASCII character `@', octal 100.
++
++   The header is followed by the number of data bytes given in
++DATA-HIGH and DATA-LOW.  These data bytes are the `i' protocol packet
++which is being wrapped in the `j' protocol packet.  However, each
++character in the `i' protocol packet which the `j' protocol must avoid
++is transformed into a printable ASCII character (recall that avoiding a
++printable ASCII character is not permitted).  Two index bytes are used
++for each character which must be transformed.
++
++   The index bytes immediately follow the data bytes.  The index bytes
++are created in pairs.  Each pair of index bytes encodes the location of
++a character in the `i' protocol packet which was transformed to become
++a printable ASCII character.  Each pair of index bytes also encodes the
++precise transformation which was performed.
++
++   When the sender finds a character which must be avoided, it will
++transform it using one or two operations.  If the character is 0200 or
++greater, it will subtract 0200.  If the resulting character is less than
++020, or is equal to 0177, it will xor by 020.  The result is a printable
++ASCII character.
++
++   The zero based byte index of the character within the `i' protocol
++packet is determined.  This index is turned into a two byte printable
++ASCII index, INDEX-HIGH and INDEX-LOW, such that the index is
++`(INDEX-HIGH - 040) * 040 + (INDEX-LOW - 040)'.  INDEX-LOW is
++restricted such that `040 <= INDEX-LOW < 0100'.  INDEX-HIGH is not
++permitted to be 0176, so `040 <= INDEX-HIGH < 0176'.  INDEX-LOW is then
++modified to encode the transformation:
++
++   * If the character transformation only had to subtract 0200, then
++     INDEX-LOW is used as is.
++
++   * If the character transformation only had to xor by 020, then 040
++     is added to INDEX-LOW.
++
++   * If both operations had to be performed, then 0100 is added to
++     INDEX-LOW.  However, if the value of INDEX-LOW was initially 077,
++     then adding 0100 would result in 0177, which is not a printable
++     ASCII character.  For that special case, INDEX-HIGH is set to
++     0176, and INDEX-LOW is set to the original value of INDEX-HIGH.
++
++   The receiver decodes the index bytes as follows (this is the reverse
++of the operations performed by the sender, presented here for additional
++clarity):
++
++   * The first byte in the index is INDEX-HIGH, and the second is
++     INDEX-LOW.
++
++   * If `040 <= INDEX-HIGH < 0176', the index refers to the data byte
++     at position `(INDEX-HIGH - 040) * 040 + INDEX-LOW % 040'.
++
++   * If `040 <= INDEX-LOW < 0100', then 0200 must be added to indexed
++     byte.
++
++   * If `0100 <= INDEX-LOW < 0140', then 020 must be xor'ed to the
++     indexed byte.
++
++   * If `0140 <= INDEX-LOW < 0177', then 0200 must be added to the
++     indexed byte, and 020 must be xor'ed to the indexed byte.
++
++   * If `INDEX-HIGH == 0176', the index refers to the data byte at
++     position `(INDEX-LOW - 040) * 040 + 037'.  0200 must be added to
++     the indexed byte, and 020 must be xor'ed to the indexed byte.
++
++   This means the largest `i' protocol packet which may be wrapped
++inside a `j' protocol packet is `(0175 - 040) * 040 + (077 - 040) ==
++3007' bytes.
++
++   The final character in a `j' protocol packet, following the index
++bytes, is the ASCII character `~' (octal 176).
++
++   The motivation behind using an indexing scheme, rather than escape
++characters, is to avoid data movement.  The sender may simply add a
++header and a trailer to the `i' protocol packet.  Once the receiver has
++loaded the `j' protocol packet, it may scan the index bytes,
++transforming the data bytes, and then pass the data bytes directly on to
++the `i' protocol routine.
++
++\x1f
++File: uucp.info,  Node: x Protocol,  Next: y Protocol,  Prev: j Protocol,  Up: Protocols
++
++6.13 UUCP `x' Protocol
++======================
++
++The `x' protocol is used in Europe (and probably elsewhere) with
++machines that contain an builtin X.25 card and can send eight bit data
++transparently across X.25 circuits, without interference from the X.28
++or X.29 layers.  The protocol sends packets of 512 bytes, and relies on
++a write of zero bytes being read as zero bytes without stopping
++communication.  It first appeared in the original System V UUCP
++implementation.
++
++\x1f
++File: uucp.info,  Node: y Protocol,  Next: d Protocol,  Prev: x Protocol,  Up: Protocols
++
++6.14 UUCP `y' Protocol
++======================
++
++The `y' protocol was developed by Jorge Cwik for use in FX UUCICO, a PC
++uucico program.  It is designed for communication lines which handle
++error correction and flow control.  It requires an eight bit clean
++connection.  It performs error detection, but not error correction:
++when an error is detected, the line is dropped.  It is a streaming
++protocol, like the `f' protocol; there are no packet acknowledgements,
++so the protocol is efficient over a half-duplex communication line such
++as PEP.
++
++   Every packet contains a six byte header:
++
++sequence low byte
++sequence high byte
++     A two byte sequence number, in little endian order.  The first
++     sequence number is 0.  Since the first packet is always a sync
++     packet (described below) the sequence number of the first data
++     packet is always 1.  Each system counts sequence numbers
++     independently.
++
++length low byte
++length high byte
++     A two byte data length, in little endian order.  If the high bit
++     of the sixteen bit field is clear, this is the number of data
++     bytes which follow the six byte header.  If the high bit is set,
++     there is no data, and the length field is a type of control packet.
++
++checksum low byte
++checksum high byte
++     A two byte checksum, in little endian order.  The checksum is
++     computed over the data bytes.  The checksum algorithm is described
++     below.  If there are no data bytes, the checksum is sent as 0.
++
++   When the protocol starts up, each side must send a sync packet.
++This is a packet with a normal six byte header followed by data.  The
++sequence number of the sync packet should be 0.  Currently at least
++four bytes of data must be sent with the sync packet.  Additional bytes
++should be ignored.  They are defined as follows:
++
++version
++     The version number of the protocol.  Currently this must be 1.
++     Larger numbers should be ignored; it is the responsibility of the
++     newer version to accommodate the older one.
++
++packet size
++     The maximum data length to use divided by 256.  This is sent as a
++     single byte.  The maximum data length permitted is 32768, which
++     would be sent as 128.  Customarily both systems will use the same
++     maximum data length, the lower of the two requested.
++
++flags low byte
++flags high byte
++     Two bytes of flags.  None are currently defined.  These bytes
++     should be sent as 0, and ignored by the receiver.
++
++   A length field with the high bit set is a control packet.  The
++following control packet types are defined:
++
++0xfffe `YPKT_ACK'
++     Acknowledges correct receipt of a file.
++
++0xfffd `YPKT_ERR'
++     Indicates an incorrect checksum.
++
++0xfffc `YPKT_BAD'
++     Indicates a bad sequence number, an invalid length, or some other
++     error.
++
++   If a control packet other than `YPKT_ACK' is received, the
++connection is dropped.  If a checksum error is detected for a received
++packet, a `YPKT_ERR' control packet is sent, and the connection is
++dropped.  If a packet is received out of sequence, a `YPKT_BAD' control
++packet is sent, and the connection is dropped.
++
++   The checksum is initialized to 0xffff.  For each data byte in a
++packet it is modified as follows (where B is the byte before it has been
++transformed as described above):
++
++           /* Rotate the checksum left.  */
++           if ((ichk & 0x8000) == 0)
++             ichk <<= 1;
++           else
++             {
++               ichk <<= 1;
++               ++ichk;
++             }
++
++           /* Add the next byte into the checksum.  */
++           ichk += B;
++
++   This is the same algorithm as that used by the `f' protocol.
++
++   A command is sent as a sequence of data packets followed by a null
++byte.  In the normal case, a command will fit into a single packet.
++The packet should be exactly the length of the command plus a null
++byte.  If the command is too long, more packets are sent as required.
++
++   A file is sent as a sequence of data packets, ending with a zero
++length packet.  The data packets may be of any length greater than zero
++and less than or equal to the maximum permitted packet size specified
++in the initial sync packet.
++
++   After the zero length packet ending a file transfer has been
++received, the receiving system sends a `YPKT_ACK' control packet.  The
++sending system waits for the `YPKT_ACK' control packet before
++continuing; this wait should be done with a large timeout, since there
++may be a considerable amount of data buffered on the communication path.
++
++\x1f
++File: uucp.info,  Node: d Protocol,  Next: h Protocol,  Prev: y Protocol,  Up: Protocols
++
++6.15 UUCP `d' Protocol
++======================
++
++The `d' protocol is apparently used for DataKit muxhost (not RS-232)
++connections.  No file size is sent.  When a file has been completely
++transferred, a write of zero bytes is done; this must be read as zero
++bytes on the other end.
++
++\x1f
++File: uucp.info,  Node: h Protocol,  Next: v Protocol,  Prev: d Protocol,  Up: Protocols
++
++6.16 UUCP `h' Protocol
++======================
++
++The `h' protocol is apparently used in some places with HST modems.  It
++does no error checking, and is not that different from the `t'
++protocol.  I don't know the details.
++
++\x1f
++File: uucp.info,  Node: v Protocol,  Prev: h Protocol,  Up: Protocols
++
++6.17 UUCP `v' Protocol
++======================
++
++The `v' protocol is used by UUPC/extended, a PC UUCP program.  It is
++simply a version of the `g' protocol which supports packets of any
++size, and also supports sending packets of different sizes during the
++same conversation.  There are many `g' protocol implementations which
++support both, but there are also many which do not.  Using `v' ensures
++that everything is supported.
+ 
+ \x1f
+-File: uucp.info,  Node: Installing Taylor UUCP,  Next: Using Taylor UUCP,  Prev: Invoking the UUCP Programs,  Up: Top
++File: uucp.info,  Node: Hacking,  Next: Acknowledgements,  Prev: Protocols,  Up: Top
+ 
+-Installing Taylor UUCP
+-**********************
++7 Hacking Taylor UUCP
++*********************
+ 
+-   These are the installation instructions for the Taylor UUCP package.
++This chapter provides the briefest of guides to the Taylor UUCP source
++code itself.
+ 
+ * Menu:
+ 
+-* Compilation::                 Compiling Taylor UUCP
+-* Testing the Compilation::     Testing the Compilation
+-* Installing the Binaries::     Installing the Binaries
+-* Configuration::               Configuring Taylor UUCP
+-* Testing the Installation::    Testing the Installation
++* System Dependence::           System Dependence
++* Naming Conventions::          Naming Conventions
++* Patches::                     Patches
+ 
+ \x1f
+-File: uucp.info,  Node: Compilation,  Next: Testing the Compilation,  Prev: Installing Taylor UUCP,  Up: Installing Taylor UUCP
++File: uucp.info,  Node: System Dependence,  Next: Naming Conventions,  Prev: Hacking,  Up: Hacking
+ 
+-Compiling Taylor UUCP
++7.1 System Dependence
+ =====================
+ 
+-   If you have a source code distribution, you must first compile it for
+-your system.  Free versions of Unix, such as Linux, NetBSD, or FreeBSD,
+-often come with pre-compiled binary distributions of UUCP.  If you are
+-using a binary distribution, you may skip to the configuration section
+-(*note Configuration::).
+-
+-   Follow these steps to compile the source code.
+-
+-  1. Take a look at the top of `Makefile.in' and set the appropriate
+-     values for your system.  These control where the programs are
+-     installed and which user on the system owns them (normally they
+-     will be owned by a special user `uucp' rather than a real person;
+-     they should probably not be owned by `root').
+-
+-  2. Run the shell script `configure'.  This script was generated using
+-     the `autoconf' program written by David MacKenzie of the Free
+-     Software Foundation.  It takes a while to run.  It will generate
+-     the file `config.h' based on `config.h.in', and, for each source
+-     code directory, will generate `Makefile' based on `Makefile.in'.
+-
+-     You can pass certain arguments to `configure' in the environment.
+-     Because `configure' will compile little test programs to see what
+-     is available on your system, you must tell it how to run your
+-     compiler.  It recognizes the following environment variables:
+-
+-    `CC'
+-          The C compiler.  If this is not set, then if `configure' can
+-          find `gcc' it will use it, otherwise it will use `cc'.
+-
+-    `CFLAGS'
+-          Flags to pass to the C compiler when compiling the actual
+-          code.  If this is not set, `configure' will use `-g'.
+-
+-    `LDFLAGS'
+-          Flags to pass to the C compiler when only linking, not
+-          compiling.  If this is not set, `configure' will use the
+-          empty string.
+-
+-    `LIBS'
+-          Libraries to pass to the C compiler.  If this is not set,
+-          `configure' will use the empty string.
+-
+-    `INSTALL'
+-          The program to run to install UUCP in the binary directory.
+-          If this is not set, then if `configure' finds the BSD
+-          `install' program, it will set this to `install -c';
+-          otherwise, it will use `cp'.
+-
+-     Suppose, for example, you want to set the environment variable `CC'
+-     to `rcc'.  If you are using `sh', `bash', or `ksh', invoke
+-     `configure' as `CC=rcc configure'.  If you are using `csh', do
+-     `setenv CC rcc; sh configure'.
+-
+-     On some systems you will want to use `LIBS=-lmalloc'.  On Xenix
+-     derived versions of Unix do not use `LIBS=-lx' because this will
+-     bring in the wrong versions of certain routines; if you want to use
+-     `-lx' you must specify `LIBS=-lc -lx'.
+-
+-     You can also pass other arguments to `configure' on the command
+-     line.  Use `configure --help' for a complete list.  Of particular
+-     interest:
+-    `--prefix=DIRNAME'
+-          The directory under which all files are installed.  Default
+-          `/usr/local'.
+-
+-    `--with-newconfigdir=DIRNAME'
+-          The directory in which to find new style configuration files.
+-          Default `PREFIX/conf/uucp'.
+-
+-    `--with-oldconfigdir=DIRNAME'
+-          The directory in which to find old style configuration files.
+-          Default `/usr/lib/uucp'.
+-
+-     If `configure' fails for some reason, or if you have a very weird
+-     system, you may have to configure the package by hand.  To do
+-     this, copy the file `config.h.in' to `config.h' and edit it for
+-     your system.  Then for each source directory (the top directory,
+-     and the subdirectories `lib', `unix', and `uuconf') copy
+-     `Makefile.in' to `Makefile', find the words within `@' characters,
+-     and set them correctly for your system.
+-
+-  3. Igor V. Semenyuk provided this (lightly edited) note about ISC
+-     Unix 3.0.  The `configure' script will default to passing `-posix'
+-     to `gcc'.  However, using `-posix' changes the environment to
+-     POSIX, and on ISC 3.0, at least, the default for `POSIX_NO_TRUNC'
+-     is 1.  This can lead to a problem when `uuxqt' executes `rmail'.
+-     `IDA sendmail' has dbm configuration files named
+-     `mailertable.{dir,pag}'.  Notice these names are 15 characters
+-     long.  When `uuxqt' compiled with the `-posix' executes `rmail',
+-     which in turn executes `sendmail', the later is run under the
+-     POSIX environment too.  This leads to `sendmail' bombing out with
+-     `'error opening 'M' database: name too long' (mailertable.dir)'.
+-     It's rather obscure behaviour, and it took me a day to find out
+-     the cause.  I don't use the `-posix' switch; instead, I run `gcc'
+-     with `-D_POSIX_SOURCE', and add `-lcposix' to `LIBS'.
+-
+-  4. On some versions of BSDI there is a bug in the shell which causes
+-     the default value for `CFLAGS' to be set incorrectly.  If `echo
+-     ${CFLAGS--g}' echoes `g' rather than `-g', then you must set
+-     `CFLAGS' in the environment before running configure.  There is a
+-     patch available from BSDI for this bug.  (Reported by David Vrona).
+-
+-  5. On AIX 3.2.5, and possibly other versions, `cc -E' does not work,
+-     reporting `Option NOROCONST is not valid'.  Test this before
+-     running configure by doing something like `touch /tmp/foo.c; cc -E
+-     /tmp/foo.c'.  This may give a warning about the file being empty,
+-     but it should not give the `Option NOROCONST' warning.  The
+-     workaround is to remove the `,noroconst' entry from the `options'
+-     clause in the `cc' stanza in `/etc/xlc.cfg'.  (Reported by Chris
+-     Lewis).
+-
+-  6. You should verify that `configure' worked correctly by checking
+-     `config.h' and the instances of `Makefile'.
+-
+-  7. Edit `policy.h' for your local system.  The comments explain the
+-     various choices.  The default values are intended to be
+-     reasonable, so you may not have to make any changes.
+-
+-     You must decide what type of configuration files to use; for more
+-     information on the choices, see *Note Configuration::.
+-
+-     You must also decide what sort of spool directory you want to use.
+-     If this is a new installation, I recommend `SPOOLDIR_TAYLOR';
+-     otherwise, select the spool directory corresponding to your
+-     existing UUCP package.
+-
+-  8. Type `make' to compile everything.
+-
+-     The `tstuu.c' file is not particularly portable; if you can't
+-     figure out how to compile it you can safely ignore it, as it is
+-     only used for testing.  To use STREAMS pseudo-terminals, tstuu.c
+-     must be compiled with `-DHAVE_STREAMS_PTYS'; this is not
+-     determined by the configure script.
+-
+-     If you have any other problems there is probably a bug in the
+-     `configure' script.
+-
+-  9. Please report any problems you have.  That is the only way they
+-     will get fixed for other people.  Supply a patch if you can (*note
+-     Patches::), or just ask for help.
+-
+-
+-\x1f
+-File: uucp.info,  Node: Testing the Compilation,  Next: Installing the Binaries,  Prev: Compilation,  Up: Installing Taylor UUCP
+-
+-Testing the Compilation
+-=======================
+-
+-   If your system supports pseudo-terminals, and you compiled the code
+-to support the new style of configuration files (`HAVE_TAYLOR_CONFIG'
+-was set to 1 in `policy.h'), you should be able to use the `tstuu'
+-program to test the `uucico' daemon.  If your system supports STREAMS
+-based pseudo-terminals, you must compile tstuu.c with
+-`-DHAVE_STREAMS_PTYS'.  (The STREAMS based code was contributed by Marc
+-Boucher).
+-
+-   To run `tstuu', just type `tstuu' with no arguments.  You must run
+-it in the compilation directory, since it runs `./uucp', `./uux' and
+-`./uucico'.  The `tstuu' program will run a lengthy series of tests (it
+-takes over ten minutes on a slow VAX).  You will need a fair amount of
+-space available in `/usr/tmp'.  You will probably want to put it in the
+-background.  Do not use `^Z', because the program traps on `SIGCHLD'
+-and winds up dying.  The `tstuu' program will create a directory
+-`/usr/tmp/tstuu' and fill it with configuration files, and create spool
+-directories `/usr/tmp/tstuu/spool1' and `/usr/tmp/tstuu/spool2'.
+-
+-   If your system does not support the `FIONREAD' call, the `tstuu'
+-program will run very slowly.  This may or may not get fixed in a later
+-version.
+-
+-   The `tstuu' program will finish with an execute file named
+-`X.SOMETHING' and a data file named `D.SOMETHING' in the directory
+-`/usr/tmp/tstuu/spool1' (or, more likely, in subdirectories, depending
+-on the choice of `SPOOLDIR' in `policy.h').  Two log files will be
+-created in the directory `/usr/tmp/tstuu'.  They will be named `Log1'
+-and `Log2', or, if you have selected `HAVE_HDB_LOGGING' in `policy.h',
+-`Log1/uucico/test2' and `Log2/uucico/test1'.  There should be no errors
+-in the log files.
+-
+-   You can test `uuxqt' with `./uuxqt -I /usr/tmp/tstuu/Config1'.  This
+-should leave a command file `C.SOMETHING' and a data file `D.SOMETHING'
+-in `/usr/tmp/tstuu/spool1' or in subdirectories.  Again, there should
+-be no errors in the log file.
+-
+-   Assuming you compiled the code with debugging enabled, the `-x'
+-switch can be used to set debugging modes; see the `debug' command for
+-details (*note Debugging Levels::).  Use `-x all' to turn on all
+-debugging and generate far more output than you will ever want to see.
+-The `uucico' daemons will put debugging output in the files `Debug1'
+-and `Debug2' in the directory `/usr/tmp/tstuu'.  After that, you're
+-pretty much on your own.
+-
+-   On some systems you can also use `tstuu' to test `uucico' against
+-the system `uucico', by using the `-u' switch.  For this to work,
+-change the definitions of `ZUUCICO_CMD' and `UUCICO_EXECL' at the top
+-of `tstuu.c' to something appropriate for your system.  The definitions
+-in `tstuu.c' are what I used for Ultrix 4.0, on which
+-`/usr/lib/uucp/uucico' is particularly obstinate about being run as a
+-child; I was only able to run it by creating a login name with no
+-password whose shell was `/usr/lib/uucp/uucico'.  Calling login in this
+-way will leave fake entries in `wtmp' and `utmp'; if you compile
+-`tstout.c' (in the `contrib' directory) as a setuid `root' program,
+-`tstuu' will run it to clear those entries out.  On most systems, such
+-hackery should not be necessary, although on SCO I had to su to `root'
+-(`uucp' might also have worked) before I could run
+-`/usr/lib/uucp/uucico'.
+-
+-   You can test `uucp' and `uux' (give them the `-r' switch to keep
+-them from starting `uucico') to make sure they create the right sorts
+-of files.  Unfortunately, if you don't know what the right sorts of
+-files are, I'm not going to tell you here.
+-
+-   If you can not run `tstuu', or if it fails inexplicably, don't worry
+-about it too much.  On some systems `tstuu' will fail because of
+-problems using pseudo terminals, which will not matter in normal use.
+-The real test of the package is talking to another system.
+-
+-\x1f
+-File: uucp.info,  Node: Installing the Binaries,  Next: Configuration,  Prev: Testing the Compilation,  Up: Installing Taylor UUCP
++The code is carefully segregated into a system independent portion and a
++system dependent portion.  The system dependent code is in the `unix'
++subdirectory, and also in the file `sysh.unx' (also known as
++`sysdep.h').
+ 
+-Installing the Binaries
+-=======================
++   With the right configuration parameters, the system independent code
++calls only ANSI C functions.  Some of the less common ANSI C functions
++are also provided in the `lib' directory.  The replacement function
++`strtol' in `lib/strtol.c' assumes that the characters `A' to `F' and
++`a' to `f' appear in strictly sequential order.  The function
++`igradecmp' in `uuconf/grdcmp.c' assumes that the upper and lower case
++letters appear in order.  Both assumptions are true for ASCII and
++EBCDIC, but neither is guaranteed by ANSI C.  Disregarding these
++caveats, I believe that the system independent portion of the code is
++strictly conforming.
+ 
+-   You can install the executable files by becoming `root' and typing
+-`make install'.  Or you can look at what `make install' does and do it
+-by hand.  It tries to preserve your old programs, if any, but it only
+-does this the first time Taylor UUCP is installed (so that if you
+-install several versions of Taylor UUCP, you can still go back to your
+-original UUCP programs).  You can retrieve the original programs by
+-typing `make uninstall'.
+-
+-   Note that by default the programs are compiled with debugging
+-information, and they are not stripped when they are installed.  You may
+-want to strip the installed programs to save disk space.  For more
+-information, see your system documentation for the `strip' program.
++   That's not too exciting, since all the work is done in the system
++dependent code.  I think that this code can conform to POSIX 1003.1,
++given the right compilation parameters.  I'm a bit less certain about
++this, though.
+ 
+-   Of course, simply installing the executable files is not enough.  You
+-must also arrange for them to be used correctly.
++   The code has been used on a 16 bit segmented system with no function
++prototypes, so I'm fairly certain that all casts to long and pointers
++are done when necessary.
+ 
+ \x1f
+-File: uucp.info,  Node: Configuration,  Next: Testing the Installation,  Prev: Installing the Binaries,  Up: Installing Taylor UUCP
+-
+-Configuring Taylor UUCP
+-=======================
++File: uucp.info,  Node: Naming Conventions,  Next: Patches,  Prev: System Dependence,  Up: Hacking
+ 
+-   You will have to decide what types of configuration files you want to
+-use.  This package supports a new sort of configuration file; see *Note
+-Configuration Files::.  It also supports V2 configuration files
+-(`L.sys', `L-devices', etc.) and HDB configuration files (`Systems',
+-`Devices', etc.).  No documentation is provided for V2 or HDB
+-configuration files.  All types of configuration files can be used at
+-once, if you are so inclined.  Currently using just V2 configuration
+-files is not really possible, because there is no way to specify a
+-dialer (there are no built in dialers, and the program does not know
+-how to read `acucap' or `modemcap'); however, V2 configuration files
+-can be used with a new style dial file (*note dial File::), or with a
+-HDB `Dialers' file.
+-
+-   Use of HDB configuration files has two known bugs.  A blank line in
+-the middle of an entry in the `Permissions' file will not be ignored as
+-it should be.  Dialer programs, as found in some versions of HDB, are
+-not recognized directly.  If you must use a dialer program, rather than
+-an entry in `Devices', you must use the `chat-program' command in a new
+-style dial file; see *Note dial File::.  You will have to invoke the
+-dialer program via a shell script or another program, since an exit
+-code of 0 is required to recognize success; the `dialHDB' program in
+-the `contrib' directory may be used for this purpose.
+-
+-   The `uuconv' (*note Invoking uuconv::) program can be used to
+-convert from V2 or HDB configuration files to the new style (it can also
+-do the reverse translation, if you are so inclined).  It will not do all
+-of the work, and the results should be carefully checked, but it can be
+-quite useful.
+-
+-   If you are installing a new system, you will, of course, have to
+-write the configuration files; see *Note Configuration Files:: for
+-details on how to do this.
++7.2 Naming Conventions
++======================
+ 
+-   After writing the configuration files, use the `uuchk' program to
+-verify that they are what you expect; see *Note Invoking uuchk::.
+-
+-\x1f
+-File: uucp.info,  Node: Testing the Installation,  Prev: Configuration,  Up: Installing Taylor UUCP
++I use a modified Hungarian naming convention for my variables and
++functions.  As with all naming conventions, the code is rather opaque if
++you are not familiar with it, but becomes clear and easy to use with
++time.
+ 
+-Testing the Installation
+-========================
+-
+-   After you have written the configuration files, and verified them
+-with the `uuchk' program (*note Invoking uuchk::), you must check that
+-UUCP can correctly contact another system.
+-
+-   Tell `uucico' to dial out to the system by using the `-s' system
+-switch (e.g., `uucico -s uunet').  The log file should tell you what
+-happens.  The exact location of the log file depends upon the settings
+-in `policy.h' when you compiled the program, and on the use of the
+-`logfile' command in the `config' file.  Typical locations are
+-`/usr/spool/uucp/Log' or a subdirectory under `/usr/spool/uucp/.Log'.
+-
+-   If you compiled the code with debugging enabled, you can use
+-debugging mode to get a great deal of information about what sort of
+-data is flowing back and forth; the various possibilities are described
+-with the `debug' command (*note Debugging Levels::).  When initially
+-setting up a connection `-x chat' is probably the most useful (e.g.,
+-`uucico -s uunet -x chat'); you may also want to use `-x
+-handshake,incoming,outgoing'.  You can use `-x' multiple times on one
+-command line, or you can give it comma separated arguments as in the
+-last example.  Use `-x all' to turn on all possible debugging
+-information.
+-
+-   The debugging information is written to a file, normally
+-`/usr/spool/uucp/Debug', although the default can be changed in
+-`policy.h', and the `config' file can override the default with the
+-`debugfile' command.  The debugging file may contain passwords and some
+-file contents as they are transmitted over the line, so the debugging
+-file is only readable by the `uucp' user.
+-
+-   You can use the `-f' switch to force `uucico' to call out even if
+-the last call failed recently; using `-S' when naming a system has the
+-same effect.  Otherwise the status file (in the `.Status' subdirectory
+-of the main spool directory, normally `/usr/spool/uucp') (*note Status
+-Directory::) will prevent too many attempts from occurring in rapid
+-succession.
+-
+-   On older System V based systems which do not have the `setreuid'
+-system call, problems may arise if ordinary users can start an execution
+-of `uuxqt', perhaps indirectly via `uucp' or `uux'.  UUCP jobs may wind
+-up executing with a real user ID of the user who invoked `uuxqt', which
+-can cause problems if the UUCP job checks the real user ID for security
+-purposes.  On such systems, it is safest to put `run-uuxqt never'
+-(*note Miscellaneous (config)::) in the `config' file, so that `uucico'
+-never starts `uuxqt', and invoke `uuxqt' directly from a `crontab' file.
+-
+-   Please let me know about any problems you have and how you got around
+-them.  If you do report a problem, please include the version number of
+-the package you are using, the operating system you are running it on,
+-and a sample of the debugging file showing the problem (debugging
+-information is usually what is needed, not just the log file).  General
+-questions such as "why doesn't `uucico' dial out" are impossible to
+-answer without much more information.
+-
+-\x1f
+-File: uucp.info,  Node: Using Taylor UUCP,  Next: Configuration Files,  Prev: Installing Taylor UUCP,  Up: Top
++   The first character indicates the type of the variable (or function
++return value).  Sometimes additional characters are used.  I use the
++following type prefixes:
+ 
+-Using Taylor UUCP
+-*****************
++`a'
++     array; the next character is the type of an element
+ 
+-* Menu:
++`b'
++     byte or character
+ 
+-* Calling Other Systems::       Calling Other Systems
+-* Accepting Calls::             Accepting Calls
+-* Mail and News::               Using UUCP for Mail and News
+-* The Spool Directory Layout::  The Spool Directory Layout
+-* Spool Directory Cleaning::    Cleaning the UUCP Spool Directory
++`c'
++     count of something
+ 
+-\x1f
+-File: uucp.info,  Node: Calling Other Systems,  Next: Accepting Calls,  Prev: Using Taylor UUCP,  Up: Using Taylor UUCP
++`e'
++     stdio FILE *
+ 
+-Calling Other Systems
+-=====================
++`f'
++     boolean
+ 
+-   By default `uucp' and `uux' will automatically start up `uucico' to
+-call another system whenever work is queued up.  However, the call may
+-fail, or you may have put in time restrictions which prevent the call
+-at that time (perhaps because telephone rates are high) (*note When to
+-Call::).  Also, a remote system may have work queued up for your
+-system, but may not be calling you for some reason (perhaps you have
+-agreed that your system should always place the call).  To make sure
+-that work gets transferred between the systems withing a reasonable
+-time period, you should arrange to periodically invoke `uucico'.
+-
+-   These periodic invocations are normally triggered by entries in the
+-`crontab' file.  The exact format of `crontab' files, and how new
+-entries are added, varies from system to system; check your local
+-documentation (try `man cron').
+-
+-   To attempt to call all systems with outstanding work, use the command
+-`uucico -r1'.  To attempt to call a particular system, use the command
+-`uucico -s SYSTEM'.  To attempt to call a particular system, but only
+-if there is work for it, use the command `uucico -C -s SYSTEM'.  (*note
+-Invoking uucico::).
+-
+-   A common case is to want to try to call a system at a certain time,
+-with periodic retries if the call fails.  A simple way to do this is to
+-create an empty UUCP command file, known as a "poll file".  If a poll
+-file exists for a system, then `uucico -r1' will place a call to it.
+-If the call succeeds, the poll file will be deleted.
+-
+-   A poll file can be easily created using the `uux' command, by
+-requesting the execution of an empty command.  To create a poll file for
+-SYSTEM, just do something like this:
+-     uux -r SYSTEM!
+-   The `-r' tells `uux' to not start up `uucico' immediately.  Of
+-course, if you do want `uucico' to start up right away, omit the `-r';
+-if the call fails, the poll file will be left around to cause a later
+-call.
+-
+-   For example, I use the following crontab entries locally:
+-
+-     45 * * * * /bin/echo /usr/lib/uucp/uucico -r1 | /bin/su uucpa
+-     40 4,10,15 * * * /usr/bin/uux -r uunet!
+-
+-   Every hour, at 45 minutes past, this will check if there is any work
+-to be done, and, if there is, will call the appropriate system.  Also,
+-at 4:40am, 10:40am, and 3:40pm, this will create a poll file file for
+-`uunet', forcing the next run of `uucico' to call `uunet'.
++`i'
++     generic integer
+ 
+-\x1f
+-File: uucp.info,  Node: Accepting Calls,  Next: Mail and News,  Prev: Calling Other Systems,  Up: Using Taylor UUCP
++`l'
++     double
+ 
+-Accepting Calls
+-===============
++`o'
++     file descriptor (as returned by open, creat, etc.)
+ 
+-   To accept calls from another system, you must arrange matters such
+-that when that system calls in, it automatically invokes `uucico' on
+-your system.
+-
+-   The most common arrangement is to create a special user name and
+-password for incoming UUCP calls.  This user name typically uses the
+-same user ID as the regular `uucp' user (Unix permits several user
+-names to share the same user ID).  The shell for this user name should
+-be set to `uucico'.
+-
+-   Here is a sample `/etc/passwd' line to accept calls from a remote
+-system named airs:
+-     Uairs:PASSWORD:4:8:airs UUCP:/usr/spool/uucp:/usr/lib/uucp/uucico
+-   The details may vary on your system.  You must use reasonable user
+-and group ID's.  You must use the correct file name for `uucico'.  The
+-PASSWORD must appear in the UUCP configuration files on the remote
+-system, but will otherwise never be seen or typed by a human.
+-
+-   Note that `uucico' appears as the login shell, and that it will be
+-run with no arguments.  This means that it will start in slave mode and
+-accept an incoming connection.  *Note Invoking uucico::.
+-
+-   On some systems, creating an empty file named `.hushlogin' in the
+-home directory will skip the printing of various bits of information
+-when the remote `uucico' logs in, speeding up the UUCP connection
+-process.
+-
+-   For the greatest security, each system which calls in should use a
+-different user name, each with a different password, and the
+-`called-login' command should be used in the `sys' file to ensure that
+-the correct login name is used.  *Note Accepting a Call::, and see
+-*Note Security::.
+-
+-   If you never need to dial out from your system, but only accept
+-incoming calls, you can arrange for `uucico' to handle logins itself,
+-completely controlling the port, by using the `--endless' option.
+-*Note Invoking uucico::.
++`p'
++     generic pointer
+ 
+-\x1f
+-File: uucp.info,  Node: Mail and News,  Next: The Spool Directory Layout,  Prev: Accepting Calls,  Up: Using Taylor UUCP
++`q'
++     pointer to structure
+ 
+-Using UUCP for Mail and News.
+-=============================
++`s'
++     structure
+ 
+-   Taylor UUCP does not include a mail package.  All Unix systems come
+-with some sort of mail delivery agent, typically `sendmail' or `MMDF'.
+-Source code is available for some alternative mail delivery agents,
+-such as `IDA sendmail' and `smail'.
+-
+-   Taylor UUCP also does not include a news package.  The two major Unix
+-news packages are `C-news' and `INN'.  Both are available in source
+-code form.
+-
+-   Configuring and using mail delivery agents is a notoriously complex
+-topic, and I will not be discussing it here.  Configuring news systems
+-is usually simpler, but I will not be discussing that either.  I will
+-merely describe the interactions between the mail and news systems and
+-UUCP.
++`u'
++     void (function return values only)
+ 
+-   A mail or news system interacts with UUCP in two ways: sending and
+-receiving.
++`z'
++     character string
+ 
+-* Menu:
++   A generic pointer (`p') is sometimes a `void *', sometimes a
++function pointer in which case the prefix is pf, and sometimes a pointer
++to another type, in which case the next character is the type to which
++it points (pf is overloaded).
+ 
+-* Sending mail or news::        Sending mail or news via UUCP
+-* Receiving mail or news::      Receiving mail or news via UUCP
++   An array of strings (`char *[]') would be named `az' (array of
++string).  If this array were passed to a function, the function
++parameter would be named `paz' (pointer to array of string).
+ 
+-\x1f
+-File: uucp.info,  Node: Sending mail or news,  Next: Receiving mail or news,  Prev: Mail and News,  Up: Mail and News
++   Note that the variable name prefixes do not necessarily indicate the
++type of the variable.  For example, a variable prefixed with `i' may be
++int, long or short.  Similarly, a variable prefixed with `b' may be a
++char or an int; for example, the return value of `getchar' would be
++caught in an int variable prefixed with `b'.
+ 
+-Sending mail or news via UUCP
+------------------------------
++   For a non-local variable (extern or file static), the first character
++after the type prefix is capitalized.
+ 
+-   When mail is to be sent from your machine to another machine via
+-UUCP, the mail delivery agent will invoke `uux'.  It will generally run
+-a command such as `uux - SYSTEM!rmail ADDRESS', where SYSTEM is the
+-remote system to which the mail is being sent.  It may pass other
+-options to `uux', such as `-r' or `-g' (*note Invoking uux::).
+-
+-   The news system also invokes `uux' in order to transfer articles to
+-another system.  The only difference is that news will use `uux' to
+-invoke `rnews' on the remote system, rather than `rmail'.
+-
+-   You should arrange for your mail and news systems to invoke the
+-Taylor UUCP version of `uux'.  If you only have Taylor UUCP, or if you
+-simply replace any existing version of `uux' with the Taylor UUCP
+-version, this will probably happen automatically.  However, if you have
+-two UUCP packages installed on your system, you will probably have to
+-modify the mail and news configuration files in some way.
+-
+-   Actually, if both the system UUCP and Taylor UUCP are using the same
+-spool directory format, the system `uux' will probably work fine with
+-the Taylor `uucico' (the reverse is not the case: the Taylor `uux'
+-requires the Taylor `uucico').  However, data transfer will be somewhat
+-more efficient if the Taylor `uux' is used.
++   Most static variables and functions use another letter after the type
++prefix to indicate which module they come from.  This is to help
++distinguish different names in the debugger.  For example, all static
++functions in `protg.c', the `g' protocol source code, use a module
++prefix of `g'.  This isn't too useful, as a number of modules use a
++module prefix of `s'.
+ 
+ \x1f
+-File: uucp.info,  Node: Receiving mail or news,  Prev: Sending mail or news,  Up: Mail and News
++File: uucp.info,  Node: Patches,  Prev: Naming Conventions,  Up: Hacking
+ 
+-Receiving mail or news via UUCP
+--------------------------------
++7.3 Patches
++===========
+ 
+-   To receive mail, all that is necessary is for UUCP to invoke
+-`rmail'.  Any mail delivery agent will provide an appropriate version
+-of `rmail'; you must simply make sure that it is in the command path
+-used by UUCP (it almost certainly already is).  The default command
+-path is set in `policy.h', and it may be overridden for a particular
+-system by the `command-path' command (*note Miscellaneous (sys)::).
+-
+-   Similarly, for news UUCP must be able to invoke `rnews'.  Any news
+-system will provide a version of `rnews', and you must ensure that is
+-in a directory on the path that UUCP will search.
++I am always grateful for any patches sent in.  Much of the flexibility
++and portability of the code is due to other people.  Please do not
++hesitate to send me any changes you have found necessary or useful.
++
++   When sending a patch, please send the output of the Unix `diff'
++program invoked with the `-c' option (if you have the GNU version of
++`diff', use the `-p' option).  Always invoke `diff' with the original
++file first and the modified file second.
++
++   If your `diff' does not support `-c' (or you don't have `diff'),
++send a complete copy of the modified file (if you have just changed a
++single function, you can just send the new version of the function).
++In particular, please do not send `diff' output without the `-c'
++option, as it is useless.
++
++   If you have made a number of changes, it is very convenient for me if
++you send each change as a separate mail message.  Sometimes I will think
++that one change is useful but another one is not.  If they are in
++different messages it is much easier for me to apply one but not the
++other.
++
++   I rarely apply the patches directly.  Instead I work my way through
++the hunks and apply each one separately.  This ensures that the naming
++remains consistent, and that I understand all the code.
++
++   If you can not follow all these rules, then don't.  But if you do, it
++makes it more likely that I will incorporate your changes.  I am not
++paid for my UUCP work, and my available time is unfortunately very
++restricted.  The package is important to me, and I do what I can, but I
++can not do all that I would like, much less all that everybody else
++would like.
++
++   Finally, please do not be offended if I do not reply to messages for
++some time, even a few weeks.  I am often behind on my mail, and if I
++think your message deserves a considered reply I will often put it aside
++until I have time to deal with it.
++
++\x1f
++File: uucp.info,  Node: Acknowledgements,  Next: Index (concepts),  Prev: Hacking,  Up: Top
++
++8 Acknowledgements
++******************
++
++This is a list of people who gave help or suggestions while I was
++working on the Taylor UUCP project.  Appearance on this list does not
++constitute endorsement of the program, particularly since some of the
++comments were criticisms.  I've probably left some people off, and I
++apologize for any oversight; it does not mean your contribution was
++unappreciated.
++
++   First of all, I would like to thank the people at Infinity
++Development Systems (formerly AIRS, which lives on in the domain name)
++for permitting me to use their computers and `uunet' access.  I would
++also like to thank Richard Stallman <rms@gnu.org> for founding the Free
++Software Foundation, and John Gilmore <gnu@toad.com> for writing the
++initial version of gnuucp (based on uuslave) which was a direct
++inspiration for this somewhat larger project.  Chip Salzenberg
++<chip@tct.com> has contributed many patches.  Franc,ois Pinard
++<pinard@iro.umontreal.ca> tirelessly tested the code and suggested many
++improvements.  He also put together the initial version of this manual.
++Doug Evans contributed the zmodem protocol.  Marc Boucher
++<marc@CAM.ORG> contributed the code supporting the pipe port type.
++Jorge Cwik <jorge@laser.satlink.net> contributed the `y' protocol code.
++Finally, Verbus M. Counts <verbus@westmark.com> and Centel Federal
++Systems, Inc., deserve special thanks, since they actually paid me
++money to port this code to System III.
++
++   In alphabetical order:
++
++     Meno Abels <Meno.Abels@Technical.Adviser.com>
++     "Earle F. Ake - SAIC" <ake@Dayton.SAIC.COM>
++     <mra@searchtech.com> (Michael Almond)
++     <cambler@zeus.calpoly.edu> (Christopher J. Ambler)
++     Brian W. Antoine <briana@tau-ceti.isc-br.com>
++     <jantypas@soft21.s21.com> (John Antypas)
++     <james@bigtex.cactus.org> (James Van Artsdalen)
++     <jima@netcom.com> (Jim Avera)
++     <nba@sysware.DK> (Niels Baggesen)
++     <uunet!hotmomma!sdb> (Scott Ballantyne)
++     Zacharias Beckman <zac@dolphin.com>
++     <mike@mbsun.ann-arbor.mi.us> (Mike Bernson)
++     <bob@usixth.sublink.org> (Roberto Biancardi)
++     <statsci!scott@coco.ms.washington.edu> (Scott Blachowicz)
++     <bag%wood2.cs.kiev.ua@relay.ussr.eu.net> (Andrey G Blochintsev)
++     <spider@Orb.Nashua.NH.US> (Spider Boardman)
++     Gregory Bond <gnb@bby.com.au>
++     Marc Boucher <marc@CAM.ORG>
++     Ard van Breemen <ard@cstmel.hobby.nl>
++     <dean@coplex.com> (Dean Brooks)
++     <jbrow@radical.com> (Jim Brownfield)
++     <dave@dlb.com> (Dave Buck)
++     <gordon@sneaky.lonestar.org> (Gordon Burditt)
++     <dburr@sbphy.physics.ucsb.edu> (Donald Burr)
++     <mib@gnu.ai.mit.edu> (Michael I Bushnell)
++     Brian Campbell <brianc@quantum.on.ca>
++     Andrew A. Chernov <ache@astral.msk.su>
++     <jhc@iscp.bellcore.com> (Jonathan Clark)
++     <mafc!frank@bach.helios.de> (Frank Conrad)
++     Ed Carp <erc@apple.com>
++     <mpc@mbs.linet.org> (Mark Clements)
++     <verbus@westmark.westmark.com> (Verbus M. Counts)
++     <cbmvax!snark.thyrsus.com!cowan> (John Cowan)
++     Bob Cunningham <bob@soest.hawaii.edu>
++     <jorge@laser.satlink.net> (Jorge Cwik)
++     <kdburg@incoahe.hanse.de> (Klaus Dahlenburg)
++     Damon <d@exnet.co.uk>
++     <celit!billd@UCSD.EDU> (Bill Davidson)
++     <hubert@arakis.fdn.org> (Hubert Delahaye)
++     <markd@bushwire.apana.org.au> (Mark Delany)
++     Allen Delaney <allen@brc.ubc.ca>
++     Gerriet M. Denkmann <gerriet@hazel.north.de>
++     <denny@dakota.alisa.com> (Bob Denny)
++     Drew Derbyshire <ahd@kew.com>
++     <ssd@nevets.oau.org> (Steven S. Dick)
++     <gert@greenie.gold.sub.org> (Gert Doering)
++     <gemini@geminix.in-berlin.de> (Uwe Doering)
++     Hans-Dieter Doll <hd2@Insel.DE>
++     <deane@deane.teleride.on.ca> (Dean Edmonds)
++     Mark W. Eichin <eichin@cygnus.com>
++     <erik@pdnfido.fidonet.org>
++     Andrew Evans <andrew@airs.com>
++     <dje@cygnus.com> (Doug Evans)
++     Marc Evans <marc@synergytics.com>
++     Dan Everhart <dan@dyndata.com>
++     <kksys!kegworks!lfahnoe@cs.umn.edu> (Larry Fahnoe)
++     Matthew Farwell <dylan@ibmpcug.co.uk>
++     <fenner@jazz.psu.edu> (Bill Fenner)
++     <jaf@inference.com> (Jose A. Fernandez)
++     "David J. Fiander" <golem!david@news.lsuc.on.ca>
++     Thomas Fischer <batman@olorin.dark.sub.org>
++     Mister Flash <flash@sam.imash.ras.ru>
++     <louis@marco.de> (Ju"rgen Fluk)
++     <erik@eab.retix.com> (Erik Forsberg)
++     <andy@scp.caltech.edu> (Andy Fyfe)
++     Lele Gaifax <piggy@idea.sublink.org>
++     <Peter.Galbavy@micromuse.co.uk>
++     <hunter@phoenix.pub.uu.oz.au> (James Gardiner [hunter])
++     Terry Gardner <cphpcom!tjg01>
++     <dgilbert@gamiga.guelphnet.dweomer.org> (David Gilbert)
++     <ol@infopro.spb.su> (Oleg Girko)
++     <jimmy@tokyo07.info.com> (Jim Gottlieb)
++     Benoit Grange <ben@fizz.fdn.org>
++     <elg@elgamy.jpunix.com> (Eric Lee Green)
++     <ryan@cs.umb.edu> (Daniel R. Guilderson)
++     <greg@gagme.chi.il.us> (Gregory Gulik)
++     Richard H. Gumpertz <rhg@cps.com>
++     Scott Guthridge <scooter@cube.rain.com>
++     Michael Haberler <mah@parrot.prv.univie.ac.at>
++     Daniel Hagerty <hag@eddie.mit.edu>
++     <jh@moon.nbn.com> (John Harkin)
++     <guy@auspex.auspex.com> (Guy Harris)
++     <hsw1@papa.attmail.com> (Stephen Harris)
++     Tom Ivar Helbekkmo <tih@Norway.EU.net>
++     Petri Helenius <pete@fidata.fi>
++     <gabe@edi.com> (B. Gabriel Helou)
++     Bob Hemedinger <bob@dalek.mwc.com>
++     Andrew Herbert <andrew@werple.pub.uu.oz.au>
++     <kherron@ms.uky.edu> (Kenneth Herron)
++     Peter Honeyman <honey@citi.umich.edu>
++     <jhood@smoke.marlboro.vt.us> (John Hood)
++     Mark Horsburgh <markh@kcbbs.gen.nz>
++     John Hughes <john@Calva.COM>
++     Mike Ipatow <mip@fido.itc.e-burg.su>
++     Bill Irwin <bill@twg.bc.ca>
++     <pmcgw!personal-media.co.jp!ishikawa> (Chiaki Ishikawa)
++     <ai@easy.in-chemnitz.de> (Andreas Israel)
++     <iverson@lionheart.com> (Tim Iverson)
++     <bei@dogface.austin.tx.us> (Bob Izenberg)
++     <djamiga!djjames@fsd.com> (D.J.James)
++     Rob Janssen <cmgit!rob@relay.nluug.nl>
++     <harvee!esj> (Eric S Johansson)
++     Kevin Johnson <kjj@pondscum.phx.mcd.mot.com>
++     <rj@rainbow.in-berlin.de> (Robert Joop)
++     Alan Judge <aj@dec4ie.IEunet.ie>
++     <chris@cj_net.in-berlin.de> (Christof Junge)
++     Romain Kang <romain@pyramid.com>
++     <tron@Veritas.COM> (Ronald S. Karr)
++     Brendan Kehoe <brendan@cs.widener.edu>
++     <warlock@csuchico.edu> (John Kennedy)
++     <kersing@nlmug.nl.mugnet.org> (Jac Kersing)
++     <ok@daveg.PFM-Mainz.de> (Olaf Kirch)
++     Gabor Kiss <kissg@sztaki.hu>
++     <gero@gkminix.han.de> (Gero Kuhlmann)
++     <rob@pact.nl> (Rob Kurver)
++     "C.A. Lademann" <cal@zls.gtn.com>
++     <kent@sparky.IMD.Sterling.COM> (Kent Landfield)
++     Tin Le <tin@saigon.com>
++     <lebaron@inrs-telecom.uquebec.ca>  (Gregory LeBaron)
++     <karl@sugar.NeoSoft.Com> (Karl Lehenbauer)
++     <alex@hal.rhein-main.de> (Alexander Lehmann)
++     <merlyn@digibd.com> (Merlyn LeRoy)
++     <clewis@ferret.ocunix.on.ca> (Chris Lewis)
++     <gdonl@ssi1.com> (Don Lewis)
++     <libove@libove.det.dec.com> (Jay Vassos-Libove)
++     <bruce%blilly@Broadcast.Sony.COM> (Bruce Lilly)
++     Godfrey van der Linden <Godfrey_van_der_Linden@NeXT.COM>
++     Ted Lindgreen <tlindgreen@encore.nl>
++     <andrew@cubetech.com> (Andrew Loewenstern)
++     "Arne Ludwig" <arne@rrzbu.hanse.de>
++     Matthew Lyle <matt@mips.mitek.com>
++     <djm@eng.umd.edu> (David J. MacKenzie)
++     John R MacMillan <chance!john@sq.sq.com>
++     <jum@helios.de> (Jens-Uwe Mager)
++     Giles D Malet <shrdlu!gdm@provar.kwnet.on.ca>
++     <mem@mv.MV.COM> (Mark E. Mallett)
++     <pepe@dit.upm.es> (Jose A. Manas)
++     <peter@xpoint.ruessel.sub.org> (Peter Mandrella)
++     <martelli@cadlab.sublink.org> (Alex Martelli)
++     W Christopher Martin <wcm@geek.ca.geac.com>
++     Yanek Martinson <yanek@mthvax.cs.miami.edu>
++     <thomasm@mechti.wupper.de> (Thomas Mechtersheimer)
++     <jm@aristote.univ-paris8.fr> (Jean Mehat)
++     <me@halfab.freiburg.sub.org> (Udo Meyer)
++     <les@chinet.chi.il.us> (Leslie Mikesell)
++     <bug@cyberdex.cuug.ab.ca> (Trever Miller)
++     <mmitchel@digi.lonestar.org> (Mitch Mitchell)
++     Emmanuel Mogenet <mgix@krainte.jpn.thomson-di.fr>
++     <rmohr@infoac.rmi.de> (Rupert Mohr)
++     Jason Molenda <molenda@sequent.com>
++     <ianm@icsbelf.co.uk> (Ian Moran)
++     <jmorriso@bogomips.ee.ubc.ca> (John Paul Morrison)
++     <brian@ilinx.wimsey.bc.ca> (Brian J. Murrell)
++     <service@infohh.rmi.de> (Dirk Musstopf)
++     <lyndon@cs.athabascau.ca> (Lyndon Nerenberg)
++     <rolf@saans.north.de> (Rolf Nerstheimer)
++     <tom@smart.bo.open.de> (Thomas Neumann)
++     <mnichols@pacesetter.com>
++     Richard E. Nickle <trystro!rick@Think.COM>
++     <stephan@sunlab.ka.sub.org> (Stephan Niemz)
++     <raymond@es.ele.tue.nl> (Raymond Nijssen)
++     <nolan@helios.unl.edu> (Michael Nolan)
++     david nugent <david@csource.oz.au>
++     Jim O'Connor <jim@bahamut.fsc.com>
++     <kevin%kosman.uucp@nrc.com> (Kevin O'Gorman)
++     Petri Ojala <ojala@funet.fi>
++     <oneill@cs.ulowell.edu> (Brian 'Doc' O'Neill)
++     <Stephen.Page@prg.oxford.ac.uk>
++     Peter Palfrader <peter@palfrader.org>
++     <abekas!dragoman!mikep@decwrl.dec.com> (Mike Park)
++     Tim Peiffer <peiffer@cs.umn.edu>
++     <don@blkhole.resun.com> (Don Phillips)
++     "Mark Pizzolato 415-369-9366" <mark@infocomm.com>
++     John Plate <plate@infotek.dk>
++     <dplatt@ntg.com> (Dave Platt)
++     <eldorado@tharr.UUCP> (Mark Powell)
++     Mark Powell <mark@inet-uk.co.uk>
++     <pozar@kumr.lns.com> (Tim Pozar)
++     <joey@tessi.UUCP> (Joey Pruett)
++     Paul Pryor <ptp@fallschurch-acirs2.army.mil>
++     <putsch@uicc.com> (Jeff Putsch)
++     <ar@nvmr.robin.de> (Andreas Raab)
++     Vadim Radionov <rvp@zfs.lg.ua>
++     Jarmo Raiha <jarmo@ksvltd.FI>
++     James Revell <revell@uunet.uu.net>
++     Scott Reynolds <scott@clmqt.marquette.Mi.US>
++     <mcr@Sandelman.OCUnix.On.Ca> (Michael Richardson)
++     Kenji Rikitake <kenji@rcac.astem.or.jp>
++     <arnold@cc.gatech.edu> (Arnold Robbins)
++     <steve@Nyongwa.cam.org> (Steve M. Robbins)
++     Ollivier Robert <Ollivier.Robert@keltia.frmug.fr.net>
++     Serge Robyns <sr@denkart.be>
++     Lawrence E. Rosenman <ler@lerami.lerctr.org>
++     Jeff Ross <jeff@wisdom.bubble.org>
++     Aleksey P. Rudnev <alex@kiae.su>
++     "Heiko W.Rupp" <hwr@pilhuhn.ka.sub.org>
++     <wolfgang@wsrcc.com> (Wolfgang S. Rupprecht)
++     <tbr@tfic.bc.ca> (Tom Rushworth)
++     Peter Rye <prye@picu-sgh.demon.co.uk>
++     <jsacco@ssl.com> (Joseph E. Sacco)
++     <rsalz@bbn.com> (Rich Salz)
++     Curt Sampson <curt@portal.ca>
++     <sojurn!mike@hobbes.cert.sei.cmu.edu> (Mike Sangrey)
++     Nickolay Saukh <nms@ussr.EU.net>
++     Ignatios Souvatzis <is@jocelyn.rhein.de>
++     <heiko@lotte.sax.de> (Heiko Schlittermann)
++     Eric Schnoebelen <eric@cirr.com>
++     <russell@alpha3.ersys.edmonton.ab.ca> (Russell Schulz)
++     <scott@geom.umn.edu>
++     Igor V. Semenyuk <iga@argrd0.argonaut.su>
++     Christopher Sawtell <chris@gerty.equinox.gen.nz>
++     <schuler@bds.sub.org> (Bernd Schuler)
++     <uunet!gold.sub.org!root> (Christian Seyb)
++     Marcus Shang <marcus.shang@canada.cdev.com>
++     <s4mjs!mjs@nirvo.nirvonics.com> (M. J. Shannon Jr.)
++     <shields@tembel.org> (Michael Shields)
++     <peter@ficc.ferranti.com> (Peter da Silva)
++     <vince@victrola.sea.wa.us> (Vince Skahan)
++     <frumious!pat> (Patrick Smith)
++     <roscom!monty@bu.edu> (Monty Solomon)
++     <sommerfeld@orchard.medford.ma.us> (Bill Sommerfeld)
++     Julian Stacey <stacey@guug.de>
++     <evesg@etlrips.etl.go.jp> (Gjoen Stein)
++     Harlan Stenn <harlan@mumps.pfcs.com>
++     Ralf Stephan <ralf@ark.abg.sub.org>
++     <johannes@titan.westfalen.de> (Johannes Stille)
++     <chs@antic.apu.fi> (Hannu Strang)
++     <ralf@reswi.ruhr.de> (Ralf E. Stranzenbach)
++     <sullivan@Mathcom.com> (S. Sullivan)
++     Shigeya Suzuki <shigeya@dink.foretune.co.jp>
++     <kls@ditka.Chicago.COM> (Karl Swartz)
++     <swiers@plains.NoDak.edu>
++     Oleg Tabarovsky <olg@olghome.pccentre.msk.su>
++     <ikeda@honey.misystems.co.jp> (Takatoshi Ikeda)
++     John Theus <john@theus.rain.com>
++     <rd@aii.com> (Bob Thrush)
++     ppKarsten Thygesen <karthy@dannug.dk>
++     Graham Toal <gtoal@pizzabox.demon.co.uk>
++     <rmtodd@servalan.servalan.com> (Richard Todd)
++     Michael Ju. Tokarev <mjt@tls.msk.ru>
++     Martin Tomes <mt00@controls.eurotherm.co.uk>
++     Len Tower <tower-prep@ai.mit.edu>
++     Mark Towfiq <justice!towfiq@Eingedi.Newton.MA.US>
++     <mju@mudos.ann-arbor.mi.us> (Marc Unangst)
++     Matthias Urlichs <urlichs@smurf.noris.de>
++     Tomi Vainio <tomppa@fidata.fi>
++     <a3@a3.xs4all.nl> (Adri Verhoef)
++     Andrew Vignaux <ajv@ferrari.datamark.co.nz>
++     <vogel@omega.ssw.de> (Andreas Vogel)
++     Dima Volodin <dvv@hq.demos.su>
++     <jos@bull.nl> (Jos Vos)
++     <jv@nl.net> (Johan Vromans)
++     David Vrona <dave@sashimi.wwa.com>
++     <Marcel.Waldvogel@nice.usergroup.ethz.ch> (Marcel Waldvogel)
++     <steve@nshore.org> (Stephen J. Walick)
++     <syd@dsinc.dsi.com> (Syd Weinstein)
++     <gerben@rna.indiv.nluug.nl> (Gerben Wierda)
++     <jbw@cs.bu.edu> (Joe Wells)
++     <frnkmth!twwells.com!bill> (T. William Wells)
++     Peter Wemm <Peter_Wemm@zeus.dialix.oz.au>
++     <mauxci!eci386!woods@apple.com> (Greg A. Woods)
++     <John.Woods@proteon.com> (John Woods)
++     Michael Yu.Yaroslavtsev <mike@yaranga.ipmce.su>
++     Alexei K. Yushin <root@july.elis.crimea.ua>
++     <jon@console.ais.org> (Jon Zeeff)
++     Matthias Zepf <agnus@amylnd.stgt.sub.org>
++     Eric Ziegast <uunet!ziegast>
+ 
+ \x1f
+-File: uucp.info,  Node: The Spool Directory Layout,  Next: Spool Directory Cleaning,  Prev: Mail and News,  Up: Using Taylor UUCP
+-
+-The Spool Directory Layout
+-==========================
++File: uucp.info,  Node: Index (concepts),  Next: Index (configuration file),  Prev: Acknowledgements,  Up: Top
+ 
+-   In general, the layout of the spool directory may be safely ignored.
+-However, it is documented here for the curious.  This description only
+-covers the `SPOOLDIR_TAYLOR' layout.  The ways in which the other spool
+-directory layouts differ are described in the source file
+-`unix/spool.c'.
+-
+-   Directories and files are only created when they are needed, so a
+-typical system will not have all of the entries described here.
++Concept Index
++*************
+ 
++\0\b[index\0\b]
+ * Menu:
+ 
+-* System Spool Directories::    System Spool Directories
+-* Status Directory::            Status Spool Directory
+-* Execution Subdirectories::    Execution Spool Subdirectories
+-* Other Spool Subdirectories::  Other Spool Subdirectories
+-* Spool Lock Files::            Spool Directory Lock Files
++* .Corrupt:                              Execution Subdirectories.
++                                                               (line 21)
++* .Failed:                               Execution Subdirectories.
++                                                               (line 26)
++* .Preserve:                             Other Spool Subdirectories.
++                                                               (line 30)
++* .Received:                             Other Spool Subdirectories.
++                                                               (line 38)
++* .Sequence:                             Other Spool Subdirectories.
++                                                               (line  7)
++* .Status:                               Status Directory.     (line  7)
++* .Temp:                                 Other Spool Subdirectories.
++                                                               (line 14)
++* .Xqtdir:                               Execution Subdirectories.
++                                                               (line  7)
++* /usr/spool/uucp:                       Miscellaneous (config).
++                                                               (line 14)
++* /usr/spool/uucppublic:                 Miscellaneous (config).
++                                                               (line 20)
++* accepting calls:                       Accepting Calls.      (line  6)
++* anonymous UUCP:                        config File Examples. (line 41)
++* call configuration file:               Configuration File Names.
++                                                               (line 47)
++* call in login name:                    Configuration File Names.
++                                                               (line 64)
++* call in password:                      Configuration File Names.
++                                                               (line 64)
++* call out file:                         Configuration File Names.
++                                                               (line 47)
++* call out login name:                   Configuration File Names.
++                                                               (line 47)
++* call out password:                     Configuration File Names.
++                                                               (line 47)
++* calling in:                            Accepting Calls.      (line  6)
++* calling out:                           Calling Other Systems.
++                                                               (line  6)
++* changing spool directory:              config File Examples. (line 26)
++* chat scripts:                          Chat Scripts.         (line  6)
++* cleaning the spool directory:          Spool Directory Cleaning.
++                                                               (line  6)
++* config file:                           config File.          (line  6)
++* config file examples:                  config File Examples. (line  6)
++* configuration file (call):             Configuration File Names.
++                                                               (line 47)
++* configuration file (config):           config File.          (line  6)
++* configuration file (dial):             dial File.            (line  6)
++* configuration file (dialcode):         Configuration File Names.
++                                                               (line 30)
++* configuration file (passwd):           Configuration File Names.
++                                                               (line 64)
++* configuration file (port):             port File.            (line  6)
++* configuration file (sys):              sys File.             (line  6)
++* d protocol:                            d Protocol.           (line  6)
++* debugging file:                        Log File Names.       (line 19)
++* dial file:                             dial File.            (line  6)
++* dialcode configuration file:           Configuration File Names.
++                                                               (line 30)
++* dialcode file:                         Configuration File Names.
++                                                               (line 30)
++* dialer configuration file:             dial File.            (line  6)
++* e protocol:                            e Protocol.           (line  6)
++* E UUCP protocol command:               The E Command.        (line  6)
++* execution file format:                 Execution File Format.
++                                                               (line  6)
++* f protocol:                            f Protocol.           (line  6)
++* final handshake:                       The Final Handshake.  (line  6)
++* G protocol:                            Big G Protocol.       (line  6)
++* g protocol:                            g Protocol.           (line  6)
++* gateway:                               Gateway Example.      (line  6)
++* grades:                                When to Call.         (line 25)
++* grades implementation:                 UUCP Grades.          (line  6)
++* h protocol:                            h Protocol.           (line  6)
++* H UUCP protocol command:               The H Command.        (line  6)
++* i protocol:                            i Protocol.           (line  6)
++* initial handshake:                     The Initial Handshake.
++                                                               (line  6)
++* j protocol:                            j Protocol.           (line  6)
++* L.XXX:                                 Spool Lock Files.     (line 43)
++* LCK..SYS:                              Spool Lock Files.     (line 16)
++* LCK.XQT.NN:                            Spool Lock Files.     (line 28)
++* leaf site:                             Leaf Example.         (line  6)
++* lock directory:                        Miscellaneous (config).
++                                                               (line 27)
++* lock files:                            UUCP Lock Files.      (line  6)
++* lock files in spool directory:         Spool Lock Files.     (line  6)
++* log file:                              Log File Names.       (line  7)
++* LXQ.CMD:                               Spool Lock Files.     (line 36)
++* mail:                                  Mail and News.        (line  6)
++* main configuration file:               config File.          (line  6)
++* news:                                  Mail and News.        (line  6)
++* parity in login names:                 Miscellaneous (config).
++                                                               (line 43)
++* passwd configuration file:             Configuration File Names.
++                                                               (line 64)
++* passwd file:                           Configuration File Names.
++                                                               (line 64)
++* port configuration file:               port File.            (line  6)
++* port file:                             port File.            (line  6)
++* protocol d:                            d Protocol.           (line  6)
++* protocol e:                            e Protocol.           (line  6)
++* protocol f:                            f Protocol.           (line  6)
++* protocol G:                            Big G Protocol.       (line  6)
++* protocol g:                            g Protocol.           (line  6)
++* protocol h:                            h Protocol.           (line  6)
++* protocol i:                            i Protocol.           (line  6)
++* protocol j:                            j Protocol.           (line  6)
++* protocol t:                            t Protocol.           (line  6)
++* protocol v:                            v Protocol.           (line  6)
++* protocol x:                            x Protocol.           (line  6)
++* protocol y:                            y Protocol.           (line  6)
++* protocol, UUCP:                        UUCP Protocol.        (line  6)
++* public directory:                      Miscellaneous (config).
++                                                               (line 20)
++* R UUCP protocol command:               The R Command.        (line  6)
++* S UUCP protocol command:               The S Command.        (line  6)
++* spool directory:                       The Spool Directory Layout.
++                                                               (line  6)
++* spool directory, changing:             config File Examples. (line 26)
++* spool directory, cleaning:             Spool Directory Cleaning.
++                                                               (line  6)
++* spool directory, setting:              Miscellaneous (config).
++                                                               (line 14)
++* statistics file:                       Log File Names.       (line 14)
++* status files:                          Status Directory.     (line  7)
++* sys file:                              sys File.             (line  6)
++* sys file example (gateway):            Gateway Example.      (line  6)
++* sys file example (leaf):               Leaf Example.         (line  6)
++* system configuration file:             sys File.             (line  6)
++* system lock files:                     Spool Lock Files.     (line 16)
++* system name:                           Miscellaneous (config).
++                                                               (line  9)
++* system spool directories:              System Spool Directories.
++                                                               (line  6)
++* t protocol:                            t Protocol.           (line  6)
++* time strings:                          Time Strings.         (line  6)
++* unknown systems:                       Miscellaneous (config).
++                                                               (line 36)
++* UUCP protocol:                         UUCP Protocol.        (line  6)
++* UUCP protocol E command:               The E Command.        (line  6)
++* UUCP protocol H command:               The H Command.        (line  6)
++* UUCP protocol R command:               The R Command.        (line  6)
++* UUCP protocol S command:               The S Command.        (line  6)
++* UUCP protocol X command:               The X Command.        (line  6)
++* UUCP system name:                      Miscellaneous (config).
++                                                               (line  9)
++* uucppublic:                            Miscellaneous (config).
++                                                               (line 20)
++* v protocol:                            v Protocol.           (line  6)
++* x protocol:                            x Protocol.           (line  6)
++* X UUCP protocol command:               The X Command.        (line  6)
++* X.* file format:                       Execution File Format.
++                                                               (line  6)
++* y protocol:                            y Protocol.           (line  6)
+ 
+ \x1f
+-File: uucp.info,  Node: System Spool Directories,  Next: Status Directory,  Prev: The Spool Directory Layout,  Up: The Spool Directory Layout
+-
+-System Spool Directories
+-------------------------
++File: uucp.info,  Node: Index (configuration file),  Prev: Index (concepts),  Up: Top
+ 
+-`SYSTEM'
+-     There is a subdirectory of the main spool directory for each remote
+-     system.
+-
+-`SYSTEM/C.'
+-     This directory stores files describing file transfer commands to
+-     be sent to the SYSTEM.  Each file name starts with `C.G', where G
+-     is the job grade.  Each file contains one or more commands.  For
+-     details of the commands, see *Note UUCP Protocol Commands::.
+-
+-`SYSTEM/D.'
+-     This directory stores data files.  Files with names like
+-     `D.GSSSS', where G is the grade and SSSS is a sequence number, are
+-     waiting to be transferred to the SYSTEM, as directed by the files
+-     in the `SYSTEM/C.' directory.  Files with other names, typically
+-     `D.SYSTEMGSSSS', have been received from SYSTEM and are waiting to
+-     be processed by an execution file in the `SYSTEM/X.' directory.
+-
+-`SYSTEM/D.X'
+-     This directory stores data files which will become execution files
+-     on the remote system.  In current practice, this directory rarely
+-     exists, because most simple executions, including typical uses of
+-     `rmail' and `rnews', send an `E' command rather than an execution
+-     file (*note The E Command::).
+-
+-`SYSTEM/X.'
+-     This directory stores execution files which have been received from
+-     SYSTEM.  This directory normally exists, even though the
+-     corresponding `D.X' directory does not, because `uucico' will
+-     create an execution file on the fly when it receives an `E'
+-     command.
+-
+-`SYSTEM/SEQF'
+-     This file holds the sequence number of the last job sent to
+-     SYSTEM.  The sequence number is used to ensure that file names are
+-     unique in the remote system spool directory.  The file is four
+-     bytes long.  Sequence numbers are composed of digits and the upper
+-     case letters.
++Configuration File Index
++************************
+ 
+-\x1f
+-File: uucp.info,  Node: Status Directory,  Next: Execution Subdirectories,  Prev: System Spool Directories,  Up: The Spool Directory Layout
+-
+-Status Directory
+-----------------
++\0\b[index\0\b]
++* Menu:
+ 
+-`.Status'
+-     This directory holds status files for each remote system.  The
+-     name of the status file is the name of the system which it
+-     describes.  Each status file describes the last conversation with
+-     the system.  Running `uustat --status' basically just formats and
+-     prints the contents of the status files (*note uustat Examples::).
+-
+-     Each status file has a single text line with six fields.
+-
+-    code
+-          A code indicating the status of the last conversation.  The
+-          following values are defined, though not all are actually
+-          used.
+-         `0'
+-               Conversation completed normally.
+-
+-         `1'
+-               `uucico' was unable to open the port.
+-
+-         `2'
+-               The last call to the system failed while dailing.
+-
+-         `3'
+-               The last call to the system failed while logging in.
+-
+-         `4'
+-               The last call to the system failed during the initial
+-               UUCP protocol handshake (*note The Initial Handshake::).
+-
+-         `5'
+-               The last call to the system failed after the initial
+-               handshake.
+-
+-         `6'
+-               `uucico' is currently talking to the system.
+-
+-         `7'
+-               The last call to the system failed because it was the
+-               wrong time to call (this is not used if calling the
+-               system is never permitted).
+-
+-    retries
+-          The number of retries since the last successful call.
+-
+-    time of last call
+-          The time of the last call, in seconds since the epoch (as
+-          returned by the `time' system call).
+-
+-    wait
+-          If the last call failed, this is the number of seconds since
+-          the last call before `uucico' may attempt another call.  This
+-          is set based on the retry time; see *Note When to Call::.
+-          The `-f' or `-S' options to `uucico' direct it to ignore this
+-          wait time; see *Note Invoking uucico::.
+-
+-    description
+-          A text description of the status, corresponding to the code
+-          in the first field.  This may contain spaces.
++* abort:                                 dial File.           (line 137)
++* abort-chat:                            dial File.           (line 123)
++* abort-chat-fail:                       dial File.           (line 127)
++* abort-chat-program:                    dial File.           (line 131)
++* abort-chat-seven-bit:                  dial File.           (line 129)
++* abort-chat-timeout:                    dial File.           (line 125)
++* address:                               Placing the Call.    (line  46)
++* alias:                                 Naming the System.   (line  24)
++* alternate:                             Naming the System.   (line  11)
++* baud in port file:                     port File.           (line  86)
++* baud in sys file:                      Placing the Call.    (line   9)
++* baud-range:                            port File.           (line  94)
++* call-local-size:                       File Transfer Control.
++                                                              (line  33)
++* call-login:                            Logging In.          (line  67)
++* call-password:                         Logging In.          (line  75)
++* call-remote-size:                      File Transfer Control.
++                                                              (line  48)
++* call-timegrade:                        When to Call.        (line  70)
++* call-transfer:                         File Transfer Control.
++                                                              (line  19)
++* callback:                              Accepting a Call.    (line  34)
++* called-chat:                           Accepting a Call.    (line  39)
++* called-chat-fail:                      Accepting a Call.    (line  43)
++* called-chat-program:                   Accepting a Call.    (line  47)
++* called-chat-seven-bit:                 Accepting a Call.    (line  45)
++* called-chat-timeout:                   Accepting a Call.    (line  41)
++* called-local-size:                     File Transfer Control.
++                                                              (line  55)
++* called-login:                          Accepting a Call.    (line   7)
++* called-remote-size:                    File Transfer Control.
++                                                              (line  62)
++* called-timegrade:                      When to Call.        (line  89)
++* called-transfer:                       File Transfer Control.
++                                                              (line  24)
++* callfile:                              Configuration File Names.
++                                                              (line  47)
++* carrier in dial file:                  dial File.           (line  85)
++* carrier in port file:                  port File.           (line 107)
++* carrier-wait:                          dial File.           (line  92)
++* chat:                                  Chat Scripts.        (line  21)
++* chat in dial file:                     dial File.           (line  20)
++* chat in sys file:                      Logging In.          (line   7)
++* chat-fail:                             Chat Scripts.        (line 144)
++* chat-fail in dial file:                dial File.           (line  24)
++* chat-fail in sys file:                 Logging In.          (line  11)
++* chat-program:                          Chat Scripts.        (line 172)
++* chat-program in dial file:             dial File.           (line  28)
++* chat-program in sys file:              Logging In.          (line  15)
++* chat-seven-bit:                        Chat Scripts.        (line 163)
++* chat-seven-bit in dial file:           dial File.           (line  26)
++* chat-seven-bit in sys file:            Logging In.          (line  13)
++* chat-timeout:                          Chat Scripts.        (line 138)
++* chat-timeout in dial file:             dial File.           (line  22)
++* chat-timeout in sys file:              Logging In.          (line   9)
++* command:                               port File.           (line 235)
++* command-path:                          Miscellaneous (sys). (line  13)
++* commands:                              Miscellaneous (sys). (line  19)
++* complete:                              dial File.           (line 118)
++* complete-chat:                         dial File.           (line 104)
++* complete-chat-fail:                    dial File.           (line 108)
++* complete-chat-program:                 dial File.           (line 112)
++* complete-chat-seven-bit:               dial File.           (line 110)
++* complete-chat-timeout:                 dial File.           (line 106)
++* debug in config file:                  Debugging Levels.    (line   7)
++* debug in sys file:                     Miscellaneous (sys). (line  45)
++* debugfile:                             Log File Names.      (line  19)
++* default-alternates:                    Naming the System.   (line  19)
++* device:                                port File.           (line  78)
++* dial-device:                           port File.           (line 124)
++* dialcodefile:                          Configuration File Names.
++                                                              (line  30)
++* dialer in dial file:                   dial File.           (line  17)
++* dialer in port file:                   port File.           (line 129)
++* dialer-sequence:                       port File.           (line 144)
++* dialfile:                              Configuration File Names.
++                                                              (line  23)
++* dialtone:                              dial File.           (line  74)
++* dtr-toggle:                            dial File.           (line  97)
++* forward:                               File Transfer Control.
++                                                              (line 127)
++* forward-from:                          File Transfer Control.
++                                                              (line 118)
++* forward-to:                            File Transfer Control.
++                                                              (line 109)
++* free-space:                            Miscellaneous (sys). (line  25)
++* half-duplex in dial file:              dial File.           (line 160)
++* half-duplex in port file:              port File.           (line  73)
++* hardflow:                              port File.           (line 118)
++* hdb-files:                             Miscellaneous (config).
++                                                              (line 115)
++* hostname:                              Miscellaneous (config).
++                                                              (line   8)
++* local-receive:                         File Transfer Control.
++                                                              (line  98)
++* local-send:                            File Transfer Control.
++                                                              (line  69)
++* lockdir:                               Miscellaneous (config).
++                                                              (line  27)
++* lockname:                              port File.           (line 183)
++* logfile:                               Log File Names.      (line   7)
++* max-file-time:                         File Transfer Control.
++                                                              (line 132)
++* max-remote-debug:                      Miscellaneous (sys). (line  55)
++* max-retries:                           When to Call.        (line  58)
++* max-uuxqts:                            Miscellaneous (config).
++                                                              (line  61)
++* myname:                                Naming the System.   (line  30)
++* nodename:                              Miscellaneous (config).
++                                                              (line   7)
++* passwdfile:                            Configuration File Names.
++                                                              (line  64)
++* pause:                                 dial File.           (line  80)
++* phone:                                 Placing the Call.    (line  45)
++* port in port file:                     port File.           (line  23)
++* port in sys file:                      Placing the Call.    (line  24)
++* portfile:                              Configuration File Names.
++                                                              (line  15)
++* protocol in port file:                 port File.           (line  51)
++* protocol in sys file:                  Protocol Selection.  (line   7)
++* protocol-parameter in dial file:       dial File.           (line 142)
++* protocol-parameter in port file:       port File.           (line  57)
++* protocol-parameter in sys file:        Protocol Selection.  (line  90)
++* pubdir in config file:                 Miscellaneous (config).
++                                                              (line  20)
++* pubdir in sys file:                    Miscellaneous (sys). (line  37)
++* push:                                  port File.           (line 208)
++* receive-request:                       File Transfer Control.
++                                                              (line  11)
++* reliable in dial file:                 dial File.           (line 155)
++* reliable in port file:                 port File.           (line  67)
++* remote-receive:                        File Transfer Control.
++                                                              (line 102)
++* remote-send:                           File Transfer Control.
++                                                              (line  93)
++* request:                               File Transfer Control.
++                                                              (line  15)
++* run-uuxqt:                             Miscellaneous (config).
++                                                              (line  72)
++* send-request:                          File Transfer Control.
++                                                              (line   7)
++* sequence:                              Miscellaneous (sys). (line   7)
++* server-address:                        port File.           (line 215)
++* service:                               port File.           (line 193)
++* seven-bit in dial file:                dial File.           (line 148)
++* seven-bit in port file:                port File.           (line  61)
++* speed in port file:                    port File.           (line  84)
++* speed in sys file:                     Placing the Call.    (line   7)
++* speed-range:                           port File.           (line  92)
++* spool:                                 Miscellaneous (config).
++                                                              (line  14)
++* statfile:                              Log File Names.      (line  14)
++* stream:                                port File.           (line 211)
++* strip-login:                           Miscellaneous (config).
++                                                              (line  43)
++* strip-proto:                           Miscellaneous (config).
++                                                              (line  53)
++* sysfile:                               Configuration File Names.
++                                                              (line   7)
++* system:                                Naming the System.   (line   7)
++* time:                                  When to Call.        (line   7)
++* timegrade:                             When to Call.        (line  25)
++* timetable:                             Miscellaneous (config).
++                                                              (line  91)
++* transfer:                              File Transfer Control.
++                                                              (line  29)
++* type:                                  port File.           (line  26)
++* unknown:                               Miscellaneous (config).
++                                                              (line  36)
++* uuname:                                Miscellaneous (config).
++                                                              (line   9)
++* v2-files:                              Miscellaneous (config).
++                                                              (line 109)
++* version:                               port File.           (line 200)
+ 
+-    system name
+-          The name of the remote system.
+ 
+--- uucp-1.07.orig/uucp.texi
++++ uucp-1.07/uucp.texi
+@@ -5,6 +5,8 @@
+ @setchapternewpage odd
+ @c %**end of header
+ 
++@dircategory Networking tools
++
+ @iftex
+ @finalout
+ @end iftex
+--- uucp-1.07.orig/uucp.info
++++ uucp-1.07/uucp.info
+@@ -1,4 +1,6 @@
+-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
++
++INFO-DIR-SECTION Networking tools
+ 
+ START-INFO-DIR-ENTRY
+ * UUCP: (uucp).                 Transfer mail and news across phone lines.
+@@ -26,132 +28,126 @@ a translation approved by the author ins
+ 
+ \x1f
+ Indirect:
+-uucp.info-1: 1096
+-uucp.info-2: 50839
+-uucp.info-3: 100147
+-uucp.info-4: 149117
+-uucp.info-5: 197494
+-uucp.info-6: 241473
+-uucp.info-7: 285750
+-uucp.info-8: 333507
++uucp.info-1: 1132
++uucp.info-2: 295451
+ \x1f
+ Tag Table:
+ (Indirect)
+-Node: Top\x7f1096
+-Node: Copying\x7f8521
+-Node: Introduction\x7f10769
+-Node: Invoking the UUCP Programs\x7f19718
+-Node: Standard Options\x7f20638
+-Node: Invoking uucp\x7f22051
+-Node: uucp Description\x7f22320
+-Node: uucp Options\x7f24342
+-Node: Invoking uux\x7f26952
+-Node: uux Description\x7f27270
+-Node: uux Options\x7f30313
+-Node: uux Examples\x7f33052
+-Node: Invoking uustat\x7f33967
+-Node: uustat Description\x7f34302
+-Node: uustat Options\x7f36064
+-Node: uustat Examples\x7f42643
+-Node: Invoking uuname\x7f45411
+-Node: Invoking uulog\x7f46370
+-Node: Invoking uuto\x7f48579
+-Node: Invoking uupick\x7f49533
+-Node: Invoking cu\x7f50839
+-Node: cu Description\x7f51215
+-Node: cu Commands\x7f52601
+-Node: cu Variables\x7f54985
+-Node: cu Options\x7f57140
+-Node: Invoking uucico\x7f58510
+-Node: uucico Description\x7f58786
+-Node: uucico Options\x7f61428
+-Node: Invoking uuxqt\x7f64880
+-Node: Invoking uuchk\x7f66058
+-Node: Invoking uuconv\x7f66644
+-Node: Invoking uusched\x7f68492
+-Node: Installing Taylor UUCP\x7f68930
+-Node: Compilation\x7f69460
+-Node: Testing the Compilation\x7f76413
+-Node: Installing the Binaries\x7f80373
+-Node: Configuration\x7f81395
+-Node: Testing the Installation\x7f83569
+-Node: Using Taylor UUCP\x7f86701
+-Node: Calling Other Systems\x7f87150
+-Node: Accepting Calls\x7f89674
+-Node: Mail and News\x7f91636
+-Node: Sending mail or news\x7f92729
+-Node: Receiving mail or news\x7f94178
+-Node: The Spool Directory Layout\x7f94942
+-Node: System Spool Directories\x7f95857
+-Node: Status Directory\x7f97807
+-Node: Execution Subdirectories\x7f100147
+-Node: Other Spool Subdirectories\x7f101426
+-Node: Spool Lock Files\x7f104404
+-Node: Spool Directory Cleaning\x7f106953
+-Node: Configuration Files\x7f108145
+-Node: Configuration Overview\x7f109728
+-Node: Configuration File Format\x7f111880
+-Node: Configuration Examples\x7f113553
+-Node: config File Examples\x7f114122
+-Node: Leaf Example\x7f118001
+-Node: Gateway Example\x7f120687
+-Node: Time Strings\x7f125052
+-Node: Chat Scripts\x7f126868
+-Node: config File\x7f136057
+-Node: Miscellaneous (config)\x7f137121
+-Node: Configuration File Names\x7f142943
+-Node: Log File Names\x7f147880
+-Node: Debugging Levels\x7f149117
+-Node: sys File\x7f151983
+-Node: Defaults and Alternates\x7f152863
+-Node: Naming the System\x7f155955
+-Node: Calling Out\x7f157796
+-Node: When to Call\x7f158153
+-Node: Placing the Call\x7f163763
+-Node: Logging In\x7f167285
+-Node: Accepting a Call\x7f170896
+-Node: Protocol Selection\x7f173708
+-Node: File Transfer Control\x7f187452
+-Node: Miscellaneous (sys)\x7f193744
+-Node: Default sys File Values\x7f196872
+-Node: port File\x7f197494
+-Node: dial File\x7f209257
+-Node: UUCP Over TCP\x7f215278
+-Node: TCP Client\x7f215782
+-Node: TCP Server\x7f217554
+-Node: Security\x7f219008
+-Node: Protocols\x7f224051
+-Node: UUCP Protocol Sources\x7f225671
+-Node: UUCP Grades\x7f227919
+-Node: UUCP Lock Files\x7f232212
+-Node: Execution File Format\x7f235609
+-Node: UUCP Protocol\x7f240973
+-Node: The Initial Handshake\x7f241473
+-Node: UUCP Protocol Commands\x7f249866
+-Node: The S Command\x7f251888
+-Node: The R Command\x7f258938
+-Node: The X Command\x7f263032
+-Node: The E Command\x7f264950
+-Node: The H Command\x7f268063
+-Node: The Final Handshake\x7f268896
+-Node: g Protocol\x7f269558
+-Node: f Protocol\x7f279982
+-Node: t Protocol\x7f283060
+-Node: e Protocol\x7f284114
+-Node: Big G Protocol\x7f284902
+-Node: i Protocol\x7f285750
+-Node: j Protocol\x7f294764
+-Node: x Protocol\x7f301031
+-Node: y Protocol\x7f301587
+-Node: d Protocol\x7f306138
+-Node: h Protocol\x7f306503
+-Node: v Protocol\x7f306807
+-Node: Hacking\x7f307298
+-Node: System Dependence\x7f307666
+-Node: Naming Conventions\x7f309054
+-Node: Patches\x7f311229
+-Node: Acknowledgements\x7f313179
+-Node: Index (concepts)\x7f326563
+-Node: Index (configuration file)\x7f333507
++Node: Top\x7f1132
++Node: Copying\x7f8554
++Node: Introduction\x7f10799
++Node: Invoking the UUCP Programs\x7f19753
++Node: Standard Options\x7f20674
++Node: Invoking uucp\x7f22092
++Node: uucp Description\x7f22369
++Node: uucp Options\x7f24403
++Node: Invoking uux\x7f27022
++Node: uux Description\x7f27348
++Node: uux Options\x7f30403
++Node: uux Examples\x7f33151
++Node: Invoking uustat\x7f34075
++Node: uustat Description\x7f34418
++Node: uustat Options\x7f36192
++Node: uustat Examples\x7f42780
++Node: Invoking uuname\x7f45557
++Node: Invoking uulog\x7f46524
++Node: Invoking uuto\x7f48741
++Node: Invoking uupick\x7f49703
++Node: Invoking cu\x7f51017
++Node: cu Description\x7f51401
++Node: cu Commands\x7f52799
++Node: cu Variables\x7f55192
++Node: cu Options\x7f57356
++Node: Invoking uucico\x7f58735
++Node: uucico Description\x7f59021
++Node: uucico Options\x7f61677
++Node: Invoking uuxqt\x7f65140
++Node: Invoking uuchk\x7f66328
++Node: Invoking uuconv\x7f66924
++Node: Invoking uusched\x7f68782
++Node: Installing Taylor UUCP\x7f69228
++Node: Compilation\x7f69759
++Node: Testing the Compilation\x7f76717
++Node: Installing the Binaries\x7f80681
++Node: Configuration\x7f81708
++Node: Testing the Installation\x7f83887
++Node: Using Taylor UUCP\x7f87024
++Node: Calling Other Systems\x7f87477
++Node: Accepting Calls\x7f90006
++Node: Mail and News\x7f91973
++Node: Sending mail or news\x7f93071
++Node: Receiving mail or news\x7f94529
++Node: The Spool Directory Layout\x7f95301
++Node: System Spool Directories\x7f96221
++Node: Status Directory\x7f98183
++Node: Execution Subdirectories\x7f100535
++Node: Other Spool Subdirectories\x7f101826
++Node: Spool Lock Files\x7f104816
++Node: Spool Directory Cleaning\x7f107374
++Node: Configuration Files\x7f108571
++Node: Configuration Overview\x7f110155
++Node: Configuration File Format\x7f112312
++Node: Configuration Examples\x7f113990
++Node: config File Examples\x7f114564
++Node: Leaf Example\x7f118452
++Node: Gateway Example\x7f121113
++Node: Time Strings\x7f125352
++Node: Chat Scripts\x7f127174
++Node: config File\x7f136369
++Node: Miscellaneous (config)\x7f137438
++Node: Configuration File Names\x7f143273
++Node: Log File Names\x7f148223
++Node: Debugging Levels\x7f149473
++Node: sys File\x7f152352
++Node: Defaults and Alternates\x7f153237
++Node: Naming the System\x7f156338
++Node: Calling Out\x7f158192
++Node: When to Call\x7f158558
++Node: Placing the Call\x7f164185
++Node: Logging In\x7f167724
++Node: Accepting a Call\x7f171352
++Node: Protocol Selection\x7f174177
++Node: File Transfer Control\x7f187934
++Node: Miscellaneous (sys)\x7f194239
++Node: Default sys File Values\x7f197380
++Node: port File\x7f198011
++Node: dial File\x7f209779
++Node: UUCP Over TCP\x7f215806
++Node: TCP Client\x7f216317
++Node: TCP Server\x7f218099
++Node: Security\x7f219564
++Node: Protocols\x7f224614
++Node: UUCP Protocol Sources\x7f226235
++Node: UUCP Grades\x7f228488
++Node: UUCP Lock Files\x7f232786
++Node: Execution File Format\x7f236188
++Node: UUCP Protocol\x7f241557
++Node: The Initial Handshake\x7f242062
++Node: UUCP Protocol Commands\x7f250464
++Node: The S Command\x7f252495
++Node: The R Command\x7f259558
++Node: The X Command\x7f263668
++Node: The E Command\x7f265602
++Node: The H Command\x7f268731
++Node: The Final Handshake\x7f269580
++Node: g Protocol\x7f270251
++Node: f Protocol\x7f280645
++Node: t Protocol\x7f283723
++Node: e Protocol\x7f284782
++Node: Big G Protocol\x7f285575
++Node: i Protocol\x7f286430
++Node: j Protocol\x7f295451
++Node: x Protocol\x7f301725
++Node: y Protocol\x7f302288
++Node: d Protocol\x7f306841
++Node: h Protocol\x7f307213
++Node: v Protocol\x7f307525
++Node: Hacking\x7f308023
++Node: System Dependence\x7f308392
++Node: Naming Conventions\x7f309785
++Node: Patches\x7f311965
++Node: Acknowledgements\x7f313920
++Node: Index (concepts)\x7f327305
++Node: Index (configuration file)\x7f338389
+ \x1f
+ End Tag Table
+--- uucp-1.07.orig/proty.c
++++ uucp-1.07/proty.c
+@@ -606,12 +606,7 @@ fywait_for_packet (qdaemon, pfexit)
+ #endif
+ #endif
+ 
+-#ifdef I386_ASM
+-#define ROTATE(i) \
+-	asm ("rolw $1,%0" : "=g" (i) : "g" (i))
+-#else
+ #define ROTATE(i) i += i + ((i & 0x8000) >> 15)
+-#endif
+ 
+ static unsigned short
+ iychecksum (z, c)
+--- uucp-1.07.orig/uucp.info-1
++++ uucp-1.07/uucp.info-1
+@@ -1,4 +1,6 @@
+-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
++
++INFO-DIR-SECTION Networking tools
+ 
+ START-INFO-DIR-ENTRY
+ * UUCP: (uucp).                 Transfer mail and news across phone lines.
+@@ -30,7 +32,7 @@ File: uucp.info,  Node: Top,  Next: Copy
+ Taylor UUCP 1.07
+ ****************
+ 
+-   This is the documentation for the Taylor UUCP package, version 1.07.
++This is the documentation for the Taylor UUCP package, version 1.07.
+ The programs were written by Ian Lance Taylor.  The author can be
+ reached at <ian@airs.com>.
+ 
+@@ -41,7 +43,7 @@ is answered by the majordomo program.  T
+ message `subscribe ADDRESS' where ADDRESS is your e-mail address.  To
+ send a message to the list, send it to <taylor-uucp@gnu.org>.  There is
+ an archive of all messages sent to the mailing list at
+-<http://lists.cirr.com>.
++`http://lists.cirr.com'.
+ 
+ * Menu:
+ 
+@@ -230,7 +232,7 @@ File: uucp.info,  Node: Copying,  Next:
+ Taylor UUCP Copying Conditions
+ ******************************
+ 
+-   This package is covered by the GNU Public License.  See the file
++This package is covered by the GNU Public License.  See the file
+ `COPYING' for details.  If you would like to do something with this
+ package that you feel is reasonable, but you feel is prohibited by the
+ license, contact me to see if we can work it out.
+@@ -274,12 +276,12 @@ Public Licenses that accompany them.
+ \x1f
+ File: uucp.info,  Node: Introduction,  Next: Invoking the UUCP Programs,  Prev: Copying,  Up: Top
+ 
+-Introduction to Taylor UUCP
+-***************************
++1 Introduction to Taylor UUCP
++*****************************
+ 
+-   General introductions to UUCP are available, and perhaps one day I
+-will write one.  In the meantime, here is a very brief one that
+-concentrates on the programs provided by Taylor UUCP.
++General introductions to UUCP are available, and perhaps one day I will
++write one.  In the meantime, here is a very brief one that concentrates
++on the programs provided by Taylor UUCP.
+ 
+    Taylor UUCP is a complete UUCP package.  It is covered by the GNU
+ Public License, which means that the source code is always available.
+@@ -293,7 +295,7 @@ are based on earlier UUCP packages.
+      file name.  For example, to copy the file `notes.txt' to the system
+      `airs', you would say `uucp notes.txt airs!~/notes.txt'.  In this
+      example `~' is used to name the UUCP public directory on `airs'.
+-     For more details, see *Note uucp: Invoking uucp.
++     For more details, see *note uucp: Invoking uucp.
+ 
+ `uux'
+      The `uux' program is used to request the execution of a program on
+@@ -303,7 +305,8 @@ are based on earlier UUCP packages.
+      on `airs', passing it standard input, you would say `uux -
+      airs!rnews'.  The `-' means to read standard input and set things
+      up such that when `rnews' runs on `airs' it will receive the same
+-     standard input.  For more details, see *Note uux: Invoking uux.
++     standard input.  For more details, see *note uux: Invoking uux.
++
+ 
+    Neither `uucp' nor `uux' actually do any work immediately.  Instead,
+ they queue up requests for later processing.  They then start a daemon
+@@ -323,19 +326,19 @@ that if anything goes wrong it might be
+      connection status of all the remote systems your system knows
+      about.  The system administrator can use `uustat' to automatically
+      discard old jobs while sending mail to the user who requested
+-     them.  For more details, see *Note uustat: Invoking uustat.
++     them.  For more details, see *note uustat: Invoking uustat.
+ 
+ `uuname'
+      The `uuname' program by default lists all the remote systems your
+      system knows about.  You can also use it to get the name of your
+      local system.  It is mostly useful for shell scripts.  For more
+-     details, see *Note uuname: Invoking uuname.
++     details, see *note uuname: Invoking uuname.
+ 
+ `uulog'
+      The `uulog' program can be used to display entries in the UUCP log
+      file.  It can select the entries for a particular system or a
+      particular user.  You can use it to see what has happened to your
+-     queued jobs in the past.  For more details, see *Note uulog:
++     queued jobs in the past.  For more details, see *note uulog:
+      Invoking uulog.
+ 
+ `uuto'
+@@ -345,14 +348,15 @@ that if anything goes wrong it might be
+      transfer a file, or the contents of a directory, to a remote
+      system, and notify a particular user on the remote system when it
+      arrives.  The remote user can then retrieve the file(s) with
+-     `uupick'.  For more details, see *Note uuto: Invoking uuto, and
+-     see *Note uupick: Invoking uupick.
++     `uupick'.  For more details, see *note uuto: Invoking uuto, and
++     see *note uupick: Invoking uupick.
+ 
+ `cu'
+      The `cu' program can be used to call up another system and
+      communicate with it as though you were directly connected.  It can
+      also do simple file transfers, though it does not provide any
+-     error checking.  For more details, *Note cu: Invoking cu.
++     error checking.  For more details, *note cu: Invoking cu.
++
+ 
+    These eight programs just described, `uucp', `uux', `uuto',
+ `uupick', `uustat', `uuname', `uulog', and `cu' are the user programs
+@@ -376,16 +380,17 @@ normally run automatically rather than b
+      requests in the queue and goes on to the next system to call.  It
+      is also possible to force `uucico' to call a remote system even if
+      there is no work to be done for it, so that it can pick up any
+-     work that may be queued up remotely.  For more details, see *Note
++     work that may be queued up remotely.  For more details, see *note
+      uucico: Invoking uucico.
+ 
+ `uuxqt'
+      The `uuxqt' daemon processes execution requests made by the `uux'
+      program on remote systems.  It also processes requests made on the
+      local system which require files from a remote system.  It is
+-     normally started by `uucico'.  For more details, see *Note uuxqt:
++     normally started by `uucico'.  For more details, see *note uuxqt:
+      Invoking uuxqt.
+ 
++
+    Suppose you, on the system `bantam', want to copy a file to the
+ system `airs'.  You would run the `uucp' command locally, with a
+ command like `uucp notes.txt airs!~/notes.txt'.  This would queue up a
+@@ -421,7 +426,7 @@ installing and configuring UUCP.
+      The `uuchk' program reads the UUCP configuration files and
+      displays a rather lengthy description of what it finds.  This is
+      useful when configuring UUCP to make certain that the UUCP package
+-     will do what you expect it to do.  For more details, see *Note
++     will do what you expect it to do.  For more details, see *note
+      uuchk: Invoking uuchk.
+ 
+ `uuconv'
+@@ -430,13 +435,13 @@ installing and configuring UUCP.
+      administrators converting from an older UUCP package.  Taylor UUCP
+      is able to read and use old configuration file formats, but some
+      new features can not be selected using the old formats.  For more
+-     details, see *Note uuconv: Invoking uuconv.
++     details, see *note uuconv: Invoking uuconv.
+ 
+ `uusched'
+      The `uusched' script is provided for compatibility with older UUCP
+      releases.  It starts `uucico' to call, one at a time, all the
+      systems for which work has been queued.  For more details, see
+-     *Note uusched: Invoking uusched.
++     *note uusched: Invoking uusched.
+ 
+ `tstuu'
+      The `tstuu' program is a test harness for the UUCP package; it can
+@@ -444,15 +449,16 @@ installing and configuring UUCP.
+      correctly.  However, it uses pseudo-terminals, which means that it
+      is less portable than the rest of the package.  If it works, it
+      can be useful when initially installing Taylor UUCP.  For more
+-     details, see *Note tstuu: Testing the Compilation.
++     details, see *note tstuu: Testing the Compilation.
++
+ 
+ \x1f
+ File: uucp.info,  Node: Invoking the UUCP Programs,  Next: Installing Taylor UUCP,  Prev: Introduction,  Up: Top
+ 
+-Invoking the UUCP Programs
+-**************************
++2 Invoking the UUCP Programs
++****************************
+ 
+-   This chapter describes how to run the UUCP programs.
++This chapter describes how to run the UUCP programs.
+ 
+ * Menu:
+ 
+@@ -474,10 +480,10 @@ Invoking the UUCP Programs
+ \x1f
+ File: uucp.info,  Node: Standard Options,  Next: Invoking uucp,  Prev: Invoking the UUCP Programs,  Up: Invoking the UUCP Programs
+ 
+-Standard Options
+-================
++2.1 Standard Options
++====================
+ 
+-   All of the UUCP programs support a few standard options.
++All of the UUCP programs support a few standard options.
+ 
+ `-x type'
+ `--debug type'
+@@ -514,8 +520,8 @@ Standard Options
+ \x1f
+ File: uucp.info,  Node: Invoking uucp,  Next: Invoking uux,  Prev: Standard Options,  Up: Invoking the UUCP Programs
+ 
+-Invoking uucp
+-=============
++2.2 Invoking uucp
++=================
+ 
+ * Menu:
+ 
+@@ -525,8 +531,8 @@ Invoking uucp
+ \x1f
+ File: uucp.info,  Node: uucp Description,  Next: uucp Options,  Prev: Invoking uucp,  Up: Invoking uucp
+ 
+-uucp Description
+-----------------
++2.2.1 uucp Description
++----------------------
+ 
+      uucp [options] `source-file' `destination-file'
+      uucp [options] `source-file'... `destination-directory'
+@@ -570,10 +576,10 @@ resulting file is owned by the uucp user
+ \x1f
+ File: uucp.info,  Node: uucp Options,  Prev: uucp Description,  Up: Invoking uucp
+ 
+-uucp Options
+-------------
++2.2.2 uucp Options
++------------------
+ 
+-   The following options may be given to `uucp'.
++The following options may be given to `uucp'.
+ 
+ `-c'
+ `--nocopy'
+@@ -643,7 +649,7 @@ uucp Options
+ 
+ `-t'
+ `--uuto'
+-     This option is used by the `uuto' shell script; see *Note Invoking
++     This option is used by the `uuto' shell script; see *note Invoking
+      uuto::.  It causes `uucp' to interpret the final argument as
+      `system!user'.  The file(s) are sent to `~/receive/USER/LOCAL' on
+      the remote system, where USER is from the final argument and LOCAL
+@@ -662,8 +668,8 @@ uucp Options
+ \x1f
+ File: uucp.info,  Node: Invoking uux,  Next: Invoking uustat,  Prev: Invoking uucp,  Up: Invoking the UUCP Programs
+ 
+-Invoking uux
+-============
++2.3 Invoking uux
++================
+ 
+ * Menu:
+ 
+@@ -674,8 +680,8 @@ Invoking uux
+ \x1f
+ File: uucp.info,  Node: uux Description,  Next: uux Options,  Prev: Invoking uux,  Up: Invoking uux
+ 
+-uux Description
+----------------
++2.3.1 uux Description
++---------------------
+ 
+      uux [options] command
+ 
+@@ -730,7 +736,7 @@ on a remote system.
+ `uux'.  Many permit only the execution of `rmail' and `rnews'.
+ 
+    A request to execute an empty command (e.g., `uux sys!') will create
+-a poll file for the specified system; see *Note Calling Other Systems::
++a poll file for the specified system; see *note Calling Other Systems::
+ for an example of why this might be useful.
+ 
+    The exit status of `uux' is one of the codes found in the header
+@@ -740,10 +746,10 @@ file `sysexits.h'.  In particular, `EX_O
+ \x1f
+ File: uucp.info,  Node: uux Options,  Next: uux Examples,  Prev: uux Description,  Up: Invoking uux
+ 
+-uux Options
+------------
++2.3.2 uux Options
++-----------------
+ 
+-   The following options may be given to `uux'.
++The following options may be given to `uux'.
+ 
+ `-'
+ `-p'
+@@ -822,10 +828,10 @@ uux Options
+ \x1f
+ File: uucp.info,  Node: uux Examples,  Prev: uux Options,  Up: Invoking uux
+ 
+-uux Examples
+-------------
++2.3.3 uux Examples
++------------------
+ 
+-   Here are some examples of using `uux'.
++Here are some examples of using `uux'.
+ 
+      uux -z - sys1!rmail user1
+    This will execute the command `rmail user1' on the system `sys1',
+@@ -846,8 +852,8 @@ writable by the `uuxqt' daemon for this
+ \x1f
+ File: uucp.info,  Node: Invoking uustat,  Next: Invoking uuname,  Prev: Invoking uux,  Up: Invoking the UUCP Programs
+ 
+-Invoking uustat
+-===============
++2.4 Invoking uustat
++===================
+ 
+ * Menu:
+ 
+@@ -858,8 +864,8 @@ Invoking uustat
+ \x1f
+ File: uucp.info,  Node: uustat Description,  Next: uustat Options,  Prev: Invoking uustat,  Up: Invoking uustat
+ 
+-uustat Description
+-------------------
++2.4.1 uustat Description
++------------------------
+ 
+      uustat -a
+      uustat --all
+@@ -899,10 +905,10 @@ group of jobs, such as all jobs more tha
+ \x1f
+ File: uucp.info,  Node: uustat Options,  Next: uustat Examples,  Prev: uustat Description,  Up: Invoking uustat
+ 
+-uustat Options
+---------------
++2.4.2 uustat Options
++--------------------
+ 
+-   The following options may be given to `uustat'.
++The following options may be given to `uustat'.
+ 
+ `-a'
+ `--all'
+@@ -1077,11 +1083,11 @@ uustat Options
+ \x1f
+ File: uucp.info,  Node: uustat Examples,  Prev: uustat Options,  Up: Invoking uustat
+ 
+-uustat Examples
+----------------
++2.4.3 uustat Examples
++---------------------
+ 
+      uustat --all
+-   Display status of all jobs.  A sample output line is as follows:
++Display status of all jobs.  A sample output line is as follows:
+      bugsA027h bugs ian 04-01 13:50 Executing rmail ian@airs.com (sending 12 bytes)
+    The format is
+      jobid system user queue-date command (size)
+@@ -1138,8 +1144,8 @@ will be error messages.
+ \x1f
+ File: uucp.info,  Node: Invoking uuname,  Next: Invoking uulog,  Prev: Invoking uustat,  Up: Invoking the UUCP Programs
+ 
+-Invoking uuname
+-===============
++2.5 Invoking uuname
++===================
+ 
+      uuname [-a] [--aliases]
+      uuname -l
+@@ -1178,8 +1184,8 @@ local system.
+ \x1f
+ File: uucp.info,  Node: Invoking uulog,  Next: Invoking uuto,  Prev: Invoking uuname,  Up: Invoking the UUCP Programs
+ 
+-Invoking uulog
+-==============
++2.6 Invoking uulog
++==================
+ 
+      uulog [-#] [-n lines] [-sf system] [-u user] [-DSF] [--lines lines]
+            [--system system] [--user user] [--debuglog] [--statslog]
+@@ -1251,8 +1257,8 @@ If the UUCP programs have been compiled
+ \x1f
+ File: uucp.info,  Node: Invoking uuto,  Next: Invoking uupick,  Prev: Invoking uulog,  Up: Invoking the UUCP Programs
+ 
+-Invoking uuto
+-=============
++2.7 Invoking uuto
++=================
+ 
+      uuto files... system!user
+ 
+@@ -1274,8 +1280,8 @@ Invoking uucp::.
+ \x1f
+ File: uucp.info,  Node: Invoking uupick,  Next: Invoking cu,  Prev: Invoking uuto,  Up: Invoking the UUCP Programs
+ 
+-Invoking uupick
+-===============
++2.8 Invoking uupick
++===================
+ 
+      uupick [-s system] [--system system]
+ 
+@@ -1313,6 +1319,5702 @@ action to take.  One of the following co
+ 
+    The `-s' or `--system' option may be used to restrict `uupick' to
+ only present files transferred from a particular system.  The `uupick'
+-program also supports the standard UUCP program options; see *Note
++program also supports the standard UUCP program options; see *note
+ Standard Options::.
+ 
++\x1f
++File: uucp.info,  Node: Invoking cu,  Next: Invoking uucico,  Prev: Invoking uupick,  Up: Invoking the UUCP Programs
++
++2.9 Invoking cu
++===============
++
++* Menu:
++
++* cu Description::              Description of cu
++* cu Commands::                 Commands Supported by cu
++* cu Variables::                Variables Supported by cu
++* cu Options::                  Options Supported by cu
++
++\x1f
++File: uucp.info,  Node: cu Description,  Next: cu Commands,  Prev: Invoking cu,  Up: Invoking cu
++
++2.9.1 cu Description
++--------------------
++
++     cu [options] [system | phone | "dir"]
++
++   The `cu' program is used to call up another system and act as a dial
++in terminal.  It can also do simple file transfers with no error
++checking.
++
++   The `cu' program takes a single non-option argument.
++
++   If the argument is the string `dir' cu will make a direct connection
++to the port.  This may only be used by users with write access to the
++port, as it permits reprogramming the modem.
++
++   Otherwise, if the argument begins with a digit, it is taken to be a
++phone number to call.
++
++   Otherwise, it is taken to be the name of a system to call.
++
++   The `-z' or `--system' options may be used to name a system
++beginning with a digit, and the `-c' or `--phone' options may be used
++to name a phone number that does not begin with a digit.
++
++   The `cu' program locates a port to use in the UUCP configuration
++files.  If a simple system name is given, it will select a port
++appropriate for that system.  The `-p', `--port', `-l', `--line', `-s',
++and `--speed' options may be used to control the port selection.
++
++   When a connection is made to the remote system, `cu' forks into two
++processes.  One reads from the port and writes to the terminal, while
++the other reads from the terminal and writes to the port.
++
++\x1f
++File: uucp.info,  Node: cu Commands,  Next: cu Variables,  Prev: cu Description,  Up: Invoking cu
++
++2.9.2 cu Commands
++-----------------
++
++The `cu' program provides several commands that may be used during the
++conversation.  The commands all begin with an escape character, which
++by default is `~' (tilde).  The escape character is only recognized at
++the beginning of a line.  To send an escape character to the remote
++system at the start of a line, it must be entered twice.  All commands
++are either a single character or a word beginning with `%' (percent
++sign).
++
++   The `cu' program recognizes the following commands.
++
++`~.'
++     Terminate the conversation.
++
++`~! command'
++     Run command in a shell.  If command is empty, starts up a shell.
++
++`~$ command'
++     Run command, sending the standard output to the remote system.
++
++`~| command'
++     Run command, taking the standard input from the remote system.
++
++`~+ command'
++     Run command, taking the standard input from the remote system and
++     sending the standard output to the remote system.
++
++`~#, ~%break'
++     Send a break signal, if possible.
++
++`~c directory, ~%cd directory'
++     Change the local directory.
++
++`~> file'
++     Send a file to the remote system.  This just dumps the file over
++     the communication line.  It is assumed that the remote system is
++     expecting it.
++
++`~<'
++     Receive a file from the remote system.  This prompts for the local
++     file name and for the remote command to execute to begin the file
++     transfer.  It continues accepting data until the contents of the
++     `eofread' variable are seen.
++
++`~p from to'
++`~%put from to'
++     Send a file to a remote Unix system.  This runs the appropriate
++     commands on the remote system.
++
++`~t from to'
++`~%take from to'
++     Retrieve a file from a remote Unix system.  This runs the
++     appropriate commands on the remote system.
++
++`~s variable value'
++     Set a `cu' variable to the given value.  If value is not given, the
++     variable is set to `true'.
++
++`~! variable'
++     Set a `cu' variable to `false'.
++
++`~z'
++     Suspend the cu session.  This is only supported on some systems.
++     On systems for which `^Z' may be used to suspend a job, `~^Z' will
++     also suspend the session.
++
++`~%nostop'
++     Turn off XON/XOFF handling.
++
++`~%stop'
++     Turn on XON/XOFF handling.
++
++`~v'
++     List all the variables and their values.
++
++`~?'
++     List all commands.
++
++\x1f
++File: uucp.info,  Node: cu Variables,  Next: cu Options,  Prev: cu Commands,  Up: Invoking cu
++
++2.9.3 cu Variables
++------------------
++
++The `cu' program also supports several variables.  They may be listed
++with the `~v' command, and set with the `~s' or `~!'  commands.
++
++`escape'
++     The escape character.  The default is `~' (tilde).
++
++`delay'
++     If this variable is true, `cu' will delay for a second, after
++     recognizing the escape character, before printing the name of the
++     local system.  The default is true.
++
++`eol'
++     The list of characters which are considered to finish a line.  The
++     escape character is only recognized after one of these is seen.
++     The default is `carriage return', `^U', `^C', `^O', `^D', `^S',
++     `^Q', `^R'.
++
++`binary'
++     Whether to transfer binary data when sending a file.  If this is
++     false, then newlines in the file being sent are converted to
++     carriage returns.  The default is false.
++
++`binary-prefix'
++     A string used before sending a binary character in a file
++     transfer, if the `binary' variable is true.  The default is `^V'.
++
++`echo-check'
++     Whether to check file transfers by examining what the remote system
++     echoes back.  This probably doesn't work very well.  The default is
++     false.
++
++`echonl'
++     The character to look for after sending each line in a file.  The
++     default is carriage return.
++
++`timeout'
++     The timeout to use, in seconds, when looking for a character,
++     either when doing echo checking or when looking for the `echonl'
++     character.  The default is 30.
++
++`kill'
++     The character to use delete a line if the echo check fails.  The
++     default is `^U'.
++
++`resend'
++     The number of times to resend a line if the echo check continues to
++     fail.  The default is 10.
++
++`eofwrite'
++     The string to write after sending a file with the `~>' command.
++     The default is `^D'.
++
++`eofread'
++     The string to look for when receiving a file with the ` ~<'
++     command.  The default is `$', which is intended to be a typical
++     shell prompt.
++
++`verbose'
++     Whether to print accumulated information during a file transfer.
++     The default is true.
++
++\x1f
++File: uucp.info,  Node: cu Options,  Prev: cu Variables,  Up: Invoking cu
++
++2.9.4 cu Options
++----------------
++
++The following options may be given to `cu'.
++
++`-e'
++`--parity=even'
++     Use even parity.
++
++`-o'
++`--parity=odd'
++     Use odd parity.
++
++`--parity=none'
++     Use no parity.  No parity is also used if both `-e' and `-o' are
++     given.
++
++`-h'
++`--halfduplex'
++     Echo characters locally (half-duplex mode).
++
++`--nostop'
++     Turn off XON/XOFF handling (it is on by default).
++
++`-E char'
++`--escape char'
++     Set the escape character.  Initially `~' (tilde).  To eliminate the
++     escape character, use `-E '''.
++
++`-z system'
++`--system system'
++     The system to call.
++
++`-c phone-number'
++`--phone phone-number'
++     The phone number to call.
++
++`-p port'
++`-a port'
++`--port port'
++     Name the port to use.
++
++`-l line'
++`--line line'
++     Name the line to use by giving a device name.  This may be used to
++     dial out on ports that are not listed in the UUCP configuration
++     files.  Write access to the device is required.
++
++`-s speed'
++`-#'
++`--speed speed'
++     The speed (baud rate) to use.  Here, `-#' means an actual number;
++     e.g., `-9600'.
++
++`-n'
++`--prompt'
++     Prompt for the phone number to use.
++
++`-d'
++     Enter debugging mode.  Equivalent to `--debug all'.
++
++`-x type'
++`--debug type'
++`-I file'
++`--config file'
++`-v'
++`--version'
++`--help'
++     *Note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uucico,  Next: Invoking uuxqt,  Prev: Invoking cu,  Up: Invoking the UUCP Programs
++
++2.10 Invoking uucico
++====================
++
++* Menu:
++
++* uucico Description::          Description of uucico
++* uucico Options::              Options Supported by uucico
++
++\x1f
++File: uucp.info,  Node: uucico Description,  Next: uucico Options,  Prev: Invoking uucico,  Up: Invoking uucico
++
++2.10.1 uucico Description
++-------------------------
++
++     uucico [options]
++
++   The `uucico' daemon processes file transfer requests queued by
++`uucp' and `uux'.  It is started when `uucp' or `uux' is run (unless
++they are given the `-r' or `--nouucico' options).  It is also typically
++started periodically using entries in the `crontab' table(s).
++
++   When `uucico' is invoked with `-r1', `--master', `-s', `--system',
++or `-S', the daemon will place a call to a remote system, running in
++master mode.  Otherwise the daemon will start in slave mode, accepting
++a call from a remote system.  Typically a special login name will be
++set up for UUCP which automatically invokes `uucico' when a remote
++system calls in and logs in under that name.
++
++   When `uucico' terminates, it invokes the `uuxqt' daemon, unless the
++`-q' or `--nouuxqt' options were given; `uuxqt' executes any work
++orders created by `uux' on a remote system, and any work orders created
++locally which have received remote files for which they were waiting.
++
++   If a call fails, `uucico' will normally refuse to retry the call
++until a certain (configurable) amount of time has passed.  This may be
++overriden by the `-f', `--force', or `-S' options.
++
++   The `-l', `--prompt', `-e', or `--loop' options may be used to force
++`uucico' to produce its own prompts of `login: ' and `Password:'.  When
++another `uucico' daemon calls in, it will see these prompts and log in
++as usual.  The login name and password will normally be checked against
++a separate list kept specially for `uucico', rather than the
++`/etc/passwd' file (*note Configuration File Names::).  It is possible,
++on some systems, to configure `uucico' to use `/etc/passwd'.  The `-l'
++or `--prompt' options will prompt once and then exit; in this mode the
++UUCP administrator, or the superuser, may use the `-u' or `--login'
++option to force a login name, in which case `uucico' will not prompt
++for one.  The `-e' or `--loop' options will prompt again after the
++first session is over; in this mode `uucico' will permanently control a
++port.
++
++   If `uucico' receives a `SIGQUIT', `SIGTERM' or `SIGPIPE' signal, it
++will cleanly abort any current conversation with a remote system and
++exit.  If it receives a `SIGHUP' signal it will abort any current
++conversation, but will continue to place calls to (if invoked with
++`-r1' or `--master') and accept calls from (if invoked with `-e' or
++`--loop') other systems.  If it receives a `SIGINT' signal it will
++finish the current conversation, but will not place or accept any more
++calls.
++
++\x1f
++File: uucp.info,  Node: uucico Options,  Prev: uucico Description,  Up: Invoking uucico
++
++2.10.2 uucico Options
++---------------------
++
++The following options may be given to `uucico'.
++
++`-r1'
++`--master'
++     Start in master mode: call out to a remote system.  Implied by
++     `-s', `--system', or `-S'.  If no system is specified,
++     sequentially call every system for which work is waiting to be
++     done.
++
++`-r0'
++`--slave'
++     Start in slave mode.  This is the default.
++
++`-s system'
++`--system system'
++     Call the specified system.
++
++`-S system'
++     Call the specified system, ignoring any required wait.  This is
++     equivalent to `-s system -f'.
++
++`-f'
++`--force'
++     Ignore any required wait for any systems to be called.
++
++`-l'
++`--prompt'
++     Prompt for login name and password using `login: ' and
++     `Password:'.  This allows `uucico' to be easily run from `inetd'.
++     The login name and password are checked against the UUCP password
++     file, which need not be `/etc/passwd'.  The `--login' option may
++     be used to force a login name, in which cause `uucico' will only
++     prompt for a password.
++
++`-p port'
++`--port port'
++     Specify a port to call out on or to listen to.
++
++`-e'
++`--loop'
++     Enter an endless loop of login/password prompts and slave mode
++     daemon execution.  The program will not stop by itself; you must
++     use `kill' to shut it down.
++
++`-w'
++`--wait'
++     After calling out (to a particular system when `-s', `--system',
++     or `-S' is specifed, or to all systems which have work when just
++     `-r1' or `--master' is specifed), begin an endless loop as with
++     `--loop'.
++
++`-q'
++`--nouuxqt'
++     Do not start the `uuxqt' daemon when finished.
++
++`-c'
++`--quiet'
++     If no calls are permitted at this time, then don't make the call,
++     but also do not put an error message in the log file and do not
++     update the system status (as reported by `uustat').  This can be
++     convenient for automated polling scripts, which may want to simply
++     attempt to call every system rather than worry about which
++     particular systems may be called at the moment.  This option also
++     suppresses the log message indicating that there is no work to be
++     done.
++
++`-C'
++`--ifwork'
++     Only call the system named by `-s', `--system', or `-S' if there
++     is work for that system.
++
++`-D'
++`--nodetach'
++     Do not detach from the controlling terminal.  Normally `uucico'
++     detaches from the terminal before each call out to another system
++     and before invoking `uuxqt'.  This option prevents this.
++
++`-u name'
++`--login name'
++     Set the login name to use instead of that of the invoking user.
++     This option may only be used by the UUCP administrator or the
++     superuser.  If used with `--prompt', this will cause `uucico' to
++     prompt only for the password, not the login name.
++
++`-z'
++`--try-next'
++     If a call fails after the remote system is reached, try the next
++     alternate rather than simply exiting.
++
++`-i type'
++`--stdin type'
++     Set the type of port to use when using standard input.  The only
++     supported port type is TLI, and this is only available on machines
++     which support the TLI networking interface.  Specifying `-i TLI'
++     causes `uucico' to use TLI calls to perform I/O.
++
++`-X type'
++     Same as the standard option `-x type'.  Provided for historical
++     compatibility.
++
++`-x type'
++`--debug type'
++`-I file'
++`--config file'
++`-v'
++`--version'
++`--help'
++     *Note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uuxqt,  Next: Invoking uuchk,  Prev: Invoking uucico,  Up: Invoking the UUCP Programs
++
++2.11 Invoking uuxqt
++===================
++
++     uuxqt [-c command] [-s system] [--command command] [--system system]
++
++   The `uuxqt' daemon executes commands requested by `uux' from either
++the local system or from remote systems.  It is started automatically
++by the `uucico' daemon (unless `uucico' is given the `-q' or
++`--nouuxqt' options).
++
++   There is normally no need to run `uuxqt', since it will be invoked
++by `uucico'.  However, `uuxqt' can be invoked directly to provide
++greater control over the processing of the work queue.
++
++   Multiple invocations of `uuxqt' may be run at once, as controlled by
++the `max-uuxqts' configuration command; see *note Miscellaneous
++(config)::.
++
++   The following options may be given to `uuxqt'.
++
++`-c command'
++`--command command'
++     Only execute requests for the specified command.  For example,
++     `uuxqt --command rmail'.
++
++`-s system'
++`--system system'
++     Only execute requests originating from the specified system.
++
++`-x type'
++`--debug type'
++`-I file'
++`--config'
++`-v'
++`--version'
++`--help'
++     *Note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uuchk,  Next: Invoking uuconv,  Prev: Invoking uuxqt,  Up: Invoking the UUCP Programs
++
++2.12 Invoking uuchk
++===================
++
++     uuchk [-s system] [--system system]
++
++   The `uuchk' program displays information read from the UUCP
++configuration files.  It should be used to ensure that UUCP has been
++configured correctly.
++
++   The `-s' or `--system' options may be used to display the
++configuration for just the specified system, rather than for all
++systems.  The `uuchk' program also supports the standard UUCP program
++options; see *note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uuconv,  Next: Invoking uusched,  Prev: Invoking uuchk,  Up: Invoking the UUCP Programs
++
++2.13 Invoking uuconv
++====================
++
++     uuconv -i type -o type [-p program] [--program program]
++     uuconv --input type --output type [-p program] [--program program]
++
++   The `uuconv' program converts UUCP configuration files from one
++format to another.  The type of configuration file to read is specified
++using the `-i' or `--input' options.  The type of configuration file to
++write is specified using the `-o' or `--output' options.
++
++   The supported configuration file types are `taylor', `v2', and
++`hdb'.  For a description of the `taylor' configuration files, see
++*note Configuration Files::.  The other types of configuration files
++are used by traditional UUCP packages, and are not described in this
++manual.
++
++   An input configuration of type `v2' or `hdb' is read from a compiled
++in directory (specified by `oldconfigdir' in `Makefile').  An input
++configuration of type `taylor' is read from a compiled in directory by
++default, but may be overridden with the standard `-I' or `--config'
++options (*note Standard Options::).
++
++   The output configuration is written to files in the directory in
++which `uuconv' is run.
++
++   Some information in the input files may not be representable in the
++desired output format, in which case `uuconv' will silently discard it.
++The output of `uuconv' should be carefully checked before it is used.
++The `uuchk' program may be used for this purpose; see *note Invoking
++uuchk::.
++
++   The `-p' or `--program' option may be used to convert specific `cu'
++configuration information, rather than the default of only converting
++the `uucp' configuration information; see *note config File::.
++
++   The `uuchk' program also supports the standard UUCP program options;
++see *note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uusched,  Prev: Invoking uuconv,  Up: Invoking the UUCP Programs
++
++2.14 Invoking uusched
++=====================
++
++The `uusched' program is actually just a shell script which invokes the
++`uucico' daemon.  It is provided for backward compatibility.  It causes
++`uucico' to call all systems for which there is work.  Any option which
++may be given to `uucico' may also be given to `uusched'.  *Note
++Invoking uucico::.
++
++\x1f
++File: uucp.info,  Node: Installing Taylor UUCP,  Next: Using Taylor UUCP,  Prev: Invoking the UUCP Programs,  Up: Top
++
++3 Installing Taylor UUCP
++************************
++
++These are the installation instructions for the Taylor UUCP package.
++
++* Menu:
++
++* Compilation::                 Compiling Taylor UUCP
++* Testing the Compilation::     Testing the Compilation
++* Installing the Binaries::     Installing the Binaries
++* Configuration::               Configuring Taylor UUCP
++* Testing the Installation::    Testing the Installation
++
++\x1f
++File: uucp.info,  Node: Compilation,  Next: Testing the Compilation,  Prev: Installing Taylor UUCP,  Up: Installing Taylor UUCP
++
++3.1 Compiling Taylor UUCP
++=========================
++
++If you have a source code distribution, you must first compile it for
++your system.  Free versions of Unix, such as Linux, NetBSD, or FreeBSD,
++often come with pre-compiled binary distributions of UUCP.  If you are
++using a binary distribution, you may skip to the configuration section
++(*note Configuration::).
++
++   Follow these steps to compile the source code.
++
++  1. Take a look at the top of `Makefile.in' and set the appropriate
++     values for your system.  These control where the programs are
++     installed and which user on the system owns them (normally they
++     will be owned by a special user `uucp' rather than a real person;
++     they should probably not be owned by `root').
++
++  2. Run the shell script `configure'.  This script was generated using
++     the `autoconf' program written by David MacKenzie of the Free
++     Software Foundation.  It takes a while to run.  It will generate
++     the file `config.h' based on `config.h.in', and, for each source
++     code directory, will generate `Makefile' based on `Makefile.in'.
++
++     You can pass certain arguments to `configure' in the environment.
++     Because `configure' will compile little test programs to see what
++     is available on your system, you must tell it how to run your
++     compiler.  It recognizes the following environment variables:
++
++    `CC'
++          The C compiler.  If this is not set, then if `configure' can
++          find `gcc' it will use it, otherwise it will use `cc'.
++
++    `CFLAGS'
++          Flags to pass to the C compiler when compiling the actual
++          code.  If this is not set, `configure' will use `-g'.
++
++    `LDFLAGS'
++          Flags to pass to the C compiler when only linking, not
++          compiling.  If this is not set, `configure' will use the
++          empty string.
++
++    `LIBS'
++          Libraries to pass to the C compiler.  If this is not set,
++          `configure' will use the empty string.
++
++    `INSTALL'
++          The program to run to install UUCP in the binary directory.
++          If this is not set, then if `configure' finds the BSD
++          `install' program, it will set this to `install -c';
++          otherwise, it will use `cp'.
++
++     Suppose, for example, you want to set the environment variable `CC'
++     to `rcc'.  If you are using `sh', `bash', or `ksh', invoke
++     `configure' as `CC=rcc configure'.  If you are using `csh', do
++     `setenv CC rcc; sh configure'.
++
++     On some systems you will want to use `LIBS=-lmalloc'.  On Xenix
++     derived versions of Unix do not use `LIBS=-lx' because this will
++     bring in the wrong versions of certain routines; if you want to use
++     `-lx' you must specify `LIBS=-lc -lx'.
++
++     You can also pass other arguments to `configure' on the command
++     line.  Use `configure --help' for a complete list.  Of particular
++     interest:
++    `--prefix=DIRNAME'
++          The directory under which all files are installed.  Default
++          `/usr/local'.
++
++    `--with-newconfigdir=DIRNAME'
++          The directory in which to find new style configuration files.
++          Default `PREFIX/conf/uucp'.
++
++    `--with-oldconfigdir=DIRNAME'
++          The directory in which to find old style configuration files.
++          Default `/usr/lib/uucp'.
++
++     If `configure' fails for some reason, or if you have a very weird
++     system, you may have to configure the package by hand.  To do
++     this, copy the file `config.h.in' to `config.h' and edit it for
++     your system.  Then for each source directory (the top directory,
++     and the subdirectories `lib', `unix', and `uuconf') copy
++     `Makefile.in' to `Makefile', find the words within `@' characters,
++     and set them correctly for your system.
++
++  3. Igor V. Semenyuk provided this (lightly edited) note about ISC
++     Unix 3.0.  The `configure' script will default to passing `-posix'
++     to `gcc'.  However, using `-posix' changes the environment to
++     POSIX, and on ISC 3.0, at least, the default for `POSIX_NO_TRUNC'
++     is 1.  This can lead to a problem when `uuxqt' executes `rmail'.
++     `IDA sendmail' has dbm configuration files named
++     `mailertable.{dir,pag}'.  Notice these names are 15 characters
++     long.  When `uuxqt' compiled with the `-posix' executes `rmail',
++     which in turn executes `sendmail', the later is run under the
++     POSIX environment too.  This leads to `sendmail' bombing out with
++     `'error opening 'M' database: name too long' (mailertable.dir)'.
++     It's rather obscure behaviour, and it took me a day to find out
++     the cause.  I don't use the `-posix' switch; instead, I run `gcc'
++     with `-D_POSIX_SOURCE', and add `-lcposix' to `LIBS'.
++
++  4. On some versions of BSDI there is a bug in the shell which causes
++     the default value for `CFLAGS' to be set incorrectly.  If `echo
++     ${CFLAGS--g}' echoes `g' rather than `-g', then you must set
++     `CFLAGS' in the environment before running configure.  There is a
++     patch available from BSDI for this bug.  (Reported by David Vrona).
++
++  5. On AIX 3.2.5, and possibly other versions, `cc -E' does not work,
++     reporting `Option NOROCONST is not valid'.  Test this before
++     running configure by doing something like `touch /tmp/foo.c; cc -E
++     /tmp/foo.c'.  This may give a warning about the file being empty,
++     but it should not give the `Option NOROCONST' warning.  The
++     workaround is to remove the `,noroconst' entry from the `options'
++     clause in the `cc' stanza in `/etc/xlc.cfg'.  (Reported by Chris
++     Lewis).
++
++  6. You should verify that `configure' worked correctly by checking
++     `config.h' and the instances of `Makefile'.
++
++  7. Edit `policy.h' for your local system.  The comments explain the
++     various choices.  The default values are intended to be
++     reasonable, so you may not have to make any changes.
++
++     You must decide what type of configuration files to use; for more
++     information on the choices, see *note Configuration::.
++
++     You must also decide what sort of spool directory you want to use.
++     If this is a new installation, I recommend `SPOOLDIR_TAYLOR';
++     otherwise, select the spool directory corresponding to your
++     existing UUCP package.
++
++  8. Type `make' to compile everything.
++
++     The `tstuu.c' file is not particularly portable; if you can't
++     figure out how to compile it you can safely ignore it, as it is
++     only used for testing.  To use STREAMS pseudo-terminals, tstuu.c
++     must be compiled with `-DHAVE_STREAMS_PTYS'; this is not
++     determined by the configure script.
++
++     If you have any other problems there is probably a bug in the
++     `configure' script.
++
++  9. Please report any problems you have.  That is the only way they
++     will get fixed for other people.  Supply a patch if you can (*note
++     Patches::), or just ask for help.
++
++
++\x1f
++File: uucp.info,  Node: Testing the Compilation,  Next: Installing the Binaries,  Prev: Compilation,  Up: Installing Taylor UUCP
++
++3.2 Testing the Compilation
++===========================
++
++If your system supports pseudo-terminals, and you compiled the code to
++support the new style of configuration files (`HAVE_TAYLOR_CONFIG' was
++set to 1 in `policy.h'), you should be able to use the `tstuu' program
++to test the `uucico' daemon.  If your system supports STREAMS based
++pseudo-terminals, you must compile tstuu.c with `-DHAVE_STREAMS_PTYS'.
++(The STREAMS based code was contributed by Marc Boucher).
++
++   To run `tstuu', just type `tstuu' with no arguments.  You must run
++it in the compilation directory, since it runs `./uucp', `./uux' and
++`./uucico'.  The `tstuu' program will run a lengthy series of tests (it
++takes over ten minutes on a slow VAX).  You will need a fair amount of
++space available in `/usr/tmp'.  You will probably want to put it in the
++background.  Do not use `^Z', because the program traps on `SIGCHLD'
++and winds up dying.  The `tstuu' program will create a directory
++`/usr/tmp/tstuu' and fill it with configuration files, and create spool
++directories `/usr/tmp/tstuu/spool1' and `/usr/tmp/tstuu/spool2'.
++
++   If your system does not support the `FIONREAD' call, the `tstuu'
++program will run very slowly.  This may or may not get fixed in a later
++version.
++
++   The `tstuu' program will finish with an execute file named
++`X.SOMETHING' and a data file named `D.SOMETHING' in the directory
++`/usr/tmp/tstuu/spool1' (or, more likely, in subdirectories, depending
++on the choice of `SPOOLDIR' in `policy.h').  Two log files will be
++created in the directory `/usr/tmp/tstuu'.  They will be named `Log1'
++and `Log2', or, if you have selected `HAVE_HDB_LOGGING' in `policy.h',
++`Log1/uucico/test2' and `Log2/uucico/test1'.  There should be no errors
++in the log files.
++
++   You can test `uuxqt' with `./uuxqt -I /usr/tmp/tstuu/Config1'.  This
++should leave a command file `C.SOMETHING' and a data file `D.SOMETHING'
++in `/usr/tmp/tstuu/spool1' or in subdirectories.  Again, there should
++be no errors in the log file.
++
++   Assuming you compiled the code with debugging enabled, the `-x'
++switch can be used to set debugging modes; see the `debug' command for
++details (*note Debugging Levels::).  Use `-x all' to turn on all
++debugging and generate far more output than you will ever want to see.
++The `uucico' daemons will put debugging output in the files `Debug1'
++and `Debug2' in the directory `/usr/tmp/tstuu'.  After that, you're
++pretty much on your own.
++
++   On some systems you can also use `tstuu' to test `uucico' against
++the system `uucico', by using the `-u' switch.  For this to work,
++change the definitions of `ZUUCICO_CMD' and `UUCICO_EXECL' at the top
++of `tstuu.c' to something appropriate for your system.  The definitions
++in `tstuu.c' are what I used for Ultrix 4.0, on which
++`/usr/lib/uucp/uucico' is particularly obstinate about being run as a
++child; I was only able to run it by creating a login name with no
++password whose shell was `/usr/lib/uucp/uucico'.  Calling login in this
++way will leave fake entries in `wtmp' and `utmp'; if you compile
++`tstout.c' (in the `contrib' directory) as a setuid `root' program,
++`tstuu' will run it to clear those entries out.  On most systems, such
++hackery should not be necessary, although on SCO I had to su to `root'
++(`uucp' might also have worked) before I could run
++`/usr/lib/uucp/uucico'.
++
++   You can test `uucp' and `uux' (give them the `-r' switch to keep
++them from starting `uucico') to make sure they create the right sorts
++of files.  Unfortunately, if you don't know what the right sorts of
++files are, I'm not going to tell you here.
++
++   If you can not run `tstuu', or if it fails inexplicably, don't worry
++about it too much.  On some systems `tstuu' will fail because of
++problems using pseudo terminals, which will not matter in normal use.
++The real test of the package is talking to another system.
++
++\x1f
++File: uucp.info,  Node: Installing the Binaries,  Next: Configuration,  Prev: Testing the Compilation,  Up: Installing Taylor UUCP
++
++3.3 Installing the Binaries
++===========================
++
++You can install the executable files by becoming `root' and typing
++`make install'.  Or you can look at what `make install' does and do it
++by hand.  It tries to preserve your old programs, if any, but it only
++does this the first time Taylor UUCP is installed (so that if you
++install several versions of Taylor UUCP, you can still go back to your
++original UUCP programs).  You can retrieve the original programs by
++typing `make uninstall'.
++
++   Note that by default the programs are compiled with debugging
++information, and they are not stripped when they are installed.  You may
++want to strip the installed programs to save disk space.  For more
++information, see your system documentation for the `strip' program.
++
++   Of course, simply installing the executable files is not enough.  You
++must also arrange for them to be used correctly.
++
++\x1f
++File: uucp.info,  Node: Configuration,  Next: Testing the Installation,  Prev: Installing the Binaries,  Up: Installing Taylor UUCP
++
++3.4 Configuring Taylor UUCP
++===========================
++
++You will have to decide what types of configuration files you want to
++use.  This package supports a new sort of configuration file; see *note
++Configuration Files::.  It also supports V2 configuration files
++(`L.sys', `L-devices', etc.) and HDB configuration files (`Systems',
++`Devices', etc.).  No documentation is provided for V2 or HDB
++configuration files.  All types of configuration files can be used at
++once, if you are so inclined.  Currently using just V2 configuration
++files is not really possible, because there is no way to specify a
++dialer (there are no built in dialers, and the program does not know
++how to read `acucap' or `modemcap'); however, V2 configuration files
++can be used with a new style dial file (*note dial File::), or with a
++HDB `Dialers' file.
++
++   Use of HDB configuration files has two known bugs.  A blank line in
++the middle of an entry in the `Permissions' file will not be ignored as
++it should be.  Dialer programs, as found in some versions of HDB, are
++not recognized directly.  If you must use a dialer program, rather than
++an entry in `Devices', you must use the `chat-program' command in a new
++style dial file; see *note dial File::.  You will have to invoke the
++dialer program via a shell script or another program, since an exit
++code of 0 is required to recognize success; the `dialHDB' program in
++the `contrib' directory may be used for this purpose.
++
++   The `uuconv' (*note Invoking uuconv::) program can be used to
++convert from V2 or HDB configuration files to the new style (it can also
++do the reverse translation, if you are so inclined).  It will not do all
++of the work, and the results should be carefully checked, but it can be
++quite useful.
++
++   If you are installing a new system, you will, of course, have to
++write the configuration files; see *note Configuration Files:: for
++details on how to do this.
++
++   After writing the configuration files, use the `uuchk' program to
++verify that they are what you expect; see *note Invoking uuchk::.
++
++\x1f
++File: uucp.info,  Node: Testing the Installation,  Prev: Configuration,  Up: Installing Taylor UUCP
++
++3.5 Testing the Installation
++============================
++
++After you have written the configuration files, and verified them with
++the `uuchk' program (*note Invoking uuchk::), you must check that UUCP
++can correctly contact another system.
++
++   Tell `uucico' to dial out to the system by using the `-s' system
++switch (e.g., `uucico -s uunet').  The log file should tell you what
++happens.  The exact location of the log file depends upon the settings
++in `policy.h' when you compiled the program, and on the use of the
++`logfile' command in the `config' file.  Typical locations are
++`/usr/spool/uucp/Log' or a subdirectory under `/usr/spool/uucp/.Log'.
++
++   If you compiled the code with debugging enabled, you can use
++debugging mode to get a great deal of information about what sort of
++data is flowing back and forth; the various possibilities are described
++with the `debug' command (*note Debugging Levels::).  When initially
++setting up a connection `-x chat' is probably the most useful (e.g.,
++`uucico -s uunet -x chat'); you may also want to use `-x
++handshake,incoming,outgoing'.  You can use `-x' multiple times on one
++command line, or you can give it comma separated arguments as in the
++last example.  Use `-x all' to turn on all possible debugging
++information.
++
++   The debugging information is written to a file, normally
++`/usr/spool/uucp/Debug', although the default can be changed in
++`policy.h', and the `config' file can override the default with the
++`debugfile' command.  The debugging file may contain passwords and some
++file contents as they are transmitted over the line, so the debugging
++file is only readable by the `uucp' user.
++
++   You can use the `-f' switch to force `uucico' to call out even if
++the last call failed recently; using `-S' when naming a system has the
++same effect.  Otherwise the status file (in the `.Status' subdirectory
++of the main spool directory, normally `/usr/spool/uucp') (*note Status
++Directory::) will prevent too many attempts from occurring in rapid
++succession.
++
++   On older System V based systems which do not have the `setreuid'
++system call, problems may arise if ordinary users can start an execution
++of `uuxqt', perhaps indirectly via `uucp' or `uux'.  UUCP jobs may wind
++up executing with a real user ID of the user who invoked `uuxqt', which
++can cause problems if the UUCP job checks the real user ID for security
++purposes.  On such systems, it is safest to put `run-uuxqt never'
++(*note Miscellaneous (config)::) in the `config' file, so that `uucico'
++never starts `uuxqt', and invoke `uuxqt' directly from a `crontab' file.
++
++   Please let me know about any problems you have and how you got around
++them.  If you do report a problem, please include the version number of
++the package you are using, the operating system you are running it on,
++and a sample of the debugging file showing the problem (debugging
++information is usually what is needed, not just the log file).  General
++questions such as "why doesn't `uucico' dial out" are impossible to
++answer without much more information.
++
++\x1f
++File: uucp.info,  Node: Using Taylor UUCP,  Next: Configuration Files,  Prev: Installing Taylor UUCP,  Up: Top
++
++4 Using Taylor UUCP
++*******************
++
++* Menu:
++
++* Calling Other Systems::       Calling Other Systems
++* Accepting Calls::             Accepting Calls
++* Mail and News::               Using UUCP for Mail and News
++* The Spool Directory Layout::  The Spool Directory Layout
++* Spool Directory Cleaning::    Cleaning the UUCP Spool Directory
++
++\x1f
++File: uucp.info,  Node: Calling Other Systems,  Next: Accepting Calls,  Prev: Using Taylor UUCP,  Up: Using Taylor UUCP
++
++4.1 Calling Other Systems
++=========================
++
++By default `uucp' and `uux' will automatically start up `uucico' to
++call another system whenever work is queued up.  However, the call may
++fail, or you may have put in time restrictions which prevent the call
++at that time (perhaps because telephone rates are high) (*note When to
++Call::).  Also, a remote system may have work queued up for your
++system, but may not be calling you for some reason (perhaps you have
++agreed that your system should always place the call).  To make sure
++that work gets transferred between the systems withing a reasonable
++time period, you should arrange to periodically invoke `uucico'.
++
++   These periodic invocations are normally triggered by entries in the
++`crontab' file.  The exact format of `crontab' files, and how new
++entries are added, varies from system to system; check your local
++documentation (try `man cron').
++
++   To attempt to call all systems with outstanding work, use the command
++`uucico -r1'.  To attempt to call a particular system, use the command
++`uucico -s SYSTEM'.  To attempt to call a particular system, but only
++if there is work for it, use the command `uucico -C -s SYSTEM'.  (*note
++Invoking uucico::).
++
++   A common case is to want to try to call a system at a certain time,
++with periodic retries if the call fails.  A simple way to do this is to
++create an empty UUCP command file, known as a "poll file".  If a poll
++file exists for a system, then `uucico -r1' will place a call to it.
++If the call succeeds, the poll file will be deleted.
++
++   A poll file can be easily created using the `uux' command, by
++requesting the execution of an empty command.  To create a poll file for
++SYSTEM, just do something like this:
++     uux -r SYSTEM!
++   The `-r' tells `uux' to not start up `uucico' immediately.  Of
++course, if you do want `uucico' to start up right away, omit the `-r';
++if the call fails, the poll file will be left around to cause a later
++call.
++
++   For example, I use the following crontab entries locally:
++
++     45 * * * * /bin/echo /usr/lib/uucp/uucico -r1 | /bin/su uucpa
++     40 4,10,15 * * * /usr/bin/uux -r uunet!
++
++   Every hour, at 45 minutes past, this will check if there is any work
++to be done, and, if there is, will call the appropriate system.  Also,
++at 4:40am, 10:40am, and 3:40pm, this will create a poll file file for
++`uunet', forcing the next run of `uucico' to call `uunet'.
++
++\x1f
++File: uucp.info,  Node: Accepting Calls,  Next: Mail and News,  Prev: Calling Other Systems,  Up: Using Taylor UUCP
++
++4.2 Accepting Calls
++===================
++
++To accept calls from another system, you must arrange matters such that
++when that system calls in, it automatically invokes `uucico' on your
++system.
++
++   The most common arrangement is to create a special user name and
++password for incoming UUCP calls.  This user name typically uses the
++same user ID as the regular `uucp' user (Unix permits several user
++names to share the same user ID).  The shell for this user name should
++be set to `uucico'.
++
++   Here is a sample `/etc/passwd' line to accept calls from a remote
++system named airs:
++     Uairs:PASSWORD:4:8:airs UUCP:/usr/spool/uucp:/usr/lib/uucp/uucico
++   The details may vary on your system.  You must use reasonable user
++and group ID's.  You must use the correct file name for `uucico'.  The
++PASSWORD must appear in the UUCP configuration files on the remote
++system, but will otherwise never be seen or typed by a human.
++
++   Note that `uucico' appears as the login shell, and that it will be
++run with no arguments.  This means that it will start in slave mode and
++accept an incoming connection.  *Note Invoking uucico::.
++
++   On some systems, creating an empty file named `.hushlogin' in the
++home directory will skip the printing of various bits of information
++when the remote `uucico' logs in, speeding up the UUCP connection
++process.
++
++   For the greatest security, each system which calls in should use a
++different user name, each with a different password, and the
++`called-login' command should be used in the `sys' file to ensure that
++the correct login name is used.  *Note Accepting a Call::, and see
++*note Security::.
++
++   If you never need to dial out from your system, but only accept
++incoming calls, you can arrange for `uucico' to handle logins itself,
++completely controlling the port, by using the `--endless' option.
++*Note Invoking uucico::.
++
++\x1f
++File: uucp.info,  Node: Mail and News,  Next: The Spool Directory Layout,  Prev: Accepting Calls,  Up: Using Taylor UUCP
++
++4.3 Using UUCP for Mail and News.
++=================================
++
++Taylor UUCP does not include a mail package.  All Unix systems come with
++some sort of mail delivery agent, typically `sendmail' or `MMDF'.
++Source code is available for some alternative mail delivery agents,
++such as `IDA sendmail' and `smail'.
++
++   Taylor UUCP also does not include a news package.  The two major Unix
++news packages are `C-news' and `INN'.  Both are available in source
++code form.
++
++   Configuring and using mail delivery agents is a notoriously complex
++topic, and I will not be discussing it here.  Configuring news systems
++is usually simpler, but I will not be discussing that either.  I will
++merely describe the interactions between the mail and news systems and
++UUCP.
++
++   A mail or news system interacts with UUCP in two ways: sending and
++receiving.
++
++* Menu:
++
++* Sending mail or news::        Sending mail or news via UUCP
++* Receiving mail or news::      Receiving mail or news via UUCP
++
++\x1f
++File: uucp.info,  Node: Sending mail or news,  Next: Receiving mail or news,  Prev: Mail and News,  Up: Mail and News
++
++4.3.1 Sending mail or news via UUCP
++-----------------------------------
++
++When mail is to be sent from your machine to another machine via UUCP,
++the mail delivery agent will invoke `uux'.  It will generally run a
++command such as `uux - SYSTEM!rmail ADDRESS', where SYSTEM is the
++remote system to which the mail is being sent.  It may pass other
++options to `uux', such as `-r' or `-g' (*note Invoking uux::).
++
++   The news system also invokes `uux' in order to transfer articles to
++another system.  The only difference is that news will use `uux' to
++invoke `rnews' on the remote system, rather than `rmail'.
++
++   You should arrange for your mail and news systems to invoke the
++Taylor UUCP version of `uux'.  If you only have Taylor UUCP, or if you
++simply replace any existing version of `uux' with the Taylor UUCP
++version, this will probably happen automatically.  However, if you have
++two UUCP packages installed on your system, you will probably have to
++modify the mail and news configuration files in some way.
++
++   Actually, if both the system UUCP and Taylor UUCP are using the same
++spool directory format, the system `uux' will probably work fine with
++the Taylor `uucico' (the reverse is not the case: the Taylor `uux'
++requires the Taylor `uucico').  However, data transfer will be somewhat
++more efficient if the Taylor `uux' is used.
++
++\x1f
++File: uucp.info,  Node: Receiving mail or news,  Prev: Sending mail or news,  Up: Mail and News
++
++4.3.2 Receiving mail or news via UUCP
++-------------------------------------
++
++To receive mail, all that is necessary is for UUCP to invoke `rmail'.
++Any mail delivery agent will provide an appropriate version of `rmail';
++you must simply make sure that it is in the command path used by UUCP
++(it almost certainly already is).  The default command path is set in
++`policy.h', and it may be overridden for a particular system by the
++`command-path' command (*note Miscellaneous (sys)::).
++
++   Similarly, for news UUCP must be able to invoke `rnews'.  Any news
++system will provide a version of `rnews', and you must ensure that is
++in a directory on the path that UUCP will search.
++
++\x1f
++File: uucp.info,  Node: The Spool Directory Layout,  Next: Spool Directory Cleaning,  Prev: Mail and News,  Up: Using Taylor UUCP
++
++4.4 The Spool Directory Layout
++==============================
++
++In general, the layout of the spool directory may be safely ignored.
++However, it is documented here for the curious.  This description only
++covers the `SPOOLDIR_TAYLOR' layout.  The ways in which the other spool
++directory layouts differ are described in the source file
++`unix/spool.c'.
++
++   Directories and files are only created when they are needed, so a
++typical system will not have all of the entries described here.
++
++* Menu:
++
++* System Spool Directories::    System Spool Directories
++* Status Directory::            Status Spool Directory
++* Execution Subdirectories::    Execution Spool Subdirectories
++* Other Spool Subdirectories::  Other Spool Subdirectories
++* Spool Lock Files::            Spool Directory Lock Files
++
++\x1f
++File: uucp.info,  Node: System Spool Directories,  Next: Status Directory,  Prev: The Spool Directory Layout,  Up: The Spool Directory Layout
++
++4.4.1 System Spool Directories
++------------------------------
++
++`SYSTEM'
++     There is a subdirectory of the main spool directory for each remote
++     system.
++
++`SYSTEM/C.'
++     This directory stores files describing file transfer commands to
++     be sent to the SYSTEM.  Each file name starts with `C.G', where G
++     is the job grade.  Each file contains one or more commands.  For
++     details of the commands, see *note UUCP Protocol Commands::.
++
++`SYSTEM/D.'
++     This directory stores data files.  Files with names like
++     `D.GSSSS', where G is the grade and SSSS is a sequence number, are
++     waiting to be transferred to the SYSTEM, as directed by the files
++     in the `SYSTEM/C.' directory.  Files with other names, typically
++     `D.SYSTEMGSSSS', have been received from SYSTEM and are waiting to
++     be processed by an execution file in the `SYSTEM/X.' directory.
++
++`SYSTEM/D.X'
++     This directory stores data files which will become execution files
++     on the remote system.  In current practice, this directory rarely
++     exists, because most simple executions, including typical uses of
++     `rmail' and `rnews', send an `E' command rather than an execution
++     file (*note The E Command::).
++
++`SYSTEM/X.'
++     This directory stores execution files which have been received from
++     SYSTEM.  This directory normally exists, even though the
++     corresponding `D.X' directory does not, because `uucico' will
++     create an execution file on the fly when it receives an `E'
++     command.
++
++`SYSTEM/SEQF'
++     This file holds the sequence number of the last job sent to
++     SYSTEM.  The sequence number is used to ensure that file names are
++     unique in the remote system spool directory.  The file is four
++     bytes long.  Sequence numbers are composed of digits and the upper
++     case letters.
++
++\x1f
++File: uucp.info,  Node: Status Directory,  Next: Execution Subdirectories,  Prev: System Spool Directories,  Up: The Spool Directory Layout
++
++4.4.2 Status Directory
++----------------------
++
++`.Status'
++     This directory holds status files for each remote system.  The
++     name of the status file is the name of the system which it
++     describes.  Each status file describes the last conversation with
++     the system.  Running `uustat --status' basically just formats and
++     prints the contents of the status files (*note uustat Examples::).
++
++     Each status file has a single text line with six fields.
++
++    code
++          A code indicating the status of the last conversation.  The
++          following values are defined, though not all are actually
++          used.
++         `0'
++               Conversation completed normally.
++
++         `1'
++               `uucico' was unable to open the port.
++
++         `2'
++               The last call to the system failed while dailing.
++
++         `3'
++               The last call to the system failed while logging in.
++
++         `4'
++               The last call to the system failed during the initial
++               UUCP protocol handshake (*note The Initial Handshake::).
++
++         `5'
++               The last call to the system failed after the initial
++               handshake.
++
++         `6'
++               `uucico' is currently talking to the system.
++
++         `7'
++               The last call to the system failed because it was the
++               wrong time to call (this is not used if calling the
++               system is never permitted).
++
++    retries
++          The number of retries since the last successful call.
++
++    time of last call
++          The time of the last call, in seconds since the epoch (as
++          returned by the `time' system call).
++
++    wait
++          If the last call failed, this is the number of seconds since
++          the last call before `uucico' may attempt another call.  This
++          is set based on the retry time; see *note When to Call::.
++          The `-f' or `-S' options to `uucico' direct it to ignore this
++          wait time; see *note Invoking uucico::.
++
++    description
++          A text description of the status, corresponding to the code
++          in the first field.  This may contain spaces.
++
++    system name
++          The name of the remote system.
++
++\x1f
++File: uucp.info,  Node: Execution Subdirectories,  Next: Other Spool Subdirectories,  Prev: Status Directory,  Up: The Spool Directory Layout
++
++4.4.3 Execution Subdirectories
++------------------------------
++
++`.Xqtdir'
++     When `uuxqt' executes a job requested by `uux', it first changes
++     the working directory to the `.Xqtdir' subdirectory.  This permits
++     the job to create any sort of temporary file without worrying
++     about overwriting other files in the spool directory.  Any files
++     left in the `.Xqtdir' subdirectory are removed after each
++     execution is complete.
++
++`.XqtdirNNNN'
++     When several instances of `uuxqt' are executing simultaneously,
++     each one executes jobs in a separate directory.  The first uses
++     `.Xqtdir', the second uses `.Xqtdir0001', the third uses
++     `.Xqtdir0002', and so forth.
++
++`.Corrupt'
++     If `uuxqt' encounters an execution file which it is unable to
++     parse, it saves it in the `.Corrupt' directory, and sends mail
++     about it to the UUCP administrator.
++
++`.Failed'
++     If `uuxqt' executes a job, and the job fails, and there is enough
++     disk space to hold the command file and all the data files, then
++     `uuxqt' saves the files in the `.Failed' directory, and sends mail
++     about it to the UUCP administrator.
++
++\x1f
++File: uucp.info,  Node: Other Spool Subdirectories,  Next: Spool Lock Files,  Prev: Execution Subdirectories,  Up: The Spool Directory Layout
++
++4.4.4 Other Spool Subdirectories
++--------------------------------
++
++`.Sequence'
++     This directory holds conversation sequence number files.  These
++     are used if the `sequence' command is used for a system (*note
++     Miscellaneous (sys)::).  The sequence number for the system SYSTEM
++     is stored in the file `.Sequence/SYSTEM'.  It is simply stored as
++     a printable number.
++
++`.Temp'
++     This directory holds data files as they are being received from a
++     remote system, before they are moved to their final destination.
++     For file send requests which use a valid temporary file name in
++     the TEMP field of the `S' or `E' command (*note The S Command::),
++     `uucico' receives the file into `.Temp/SYSTEM/TEMP', where SYSTEM
++     is the name of the remote system, and TEMP is the temporary file
++     name.  If a conversation fails during a file transfer, these files
++     are used to automatically restart the file transfer from the point
++     of failure.
++
++     If the `S' or `E' command does not include a temporary file name,
++     automatic restart is not possible.  In this case, the files are
++     received into a randomly named file in the `.Temp' directory
++     itself.
++
++`.Preserve'
++     This directory holds data files which could not be transferred to a
++     remote system for some reason (for example, the data file might be
++     large, and exceed size restrictions imposed by the remote system).
++     When a locally requested file transfer fails, `uucico' will store
++     the data file in the `.Preserve' directory, and send mail to the
++     requestor describing the failure and naming the saved file.
++
++`.Received'
++     This directory records which files have been received.  If a
++     conversation fails just after `uucico' acknowledges receipt of a
++     file, it is possible for the acknowledgement to be lost.  If this
++     happens, the remote system will resend the file.  If the file were
++     an execution request, and `uucico' did not keep track of which
++     files it had already received, this could lead to the execution
++     being performed twice.
++
++     To avoid this problem, when a conversation fails, `uucico' records
++     each file that has been received, but for which the remote system
++     may not have received the acknowledgement.  It records this
++     information by creating an empty file with the name
++     `.Received/SYSTEM/TEMP', where SYSTEM is the name of the remote
++     system, and TEMP is the TEMP field of the `S' or `E' command from
++     the remote system (*note The S Command::).  Then, if the remote
++     system offers the file again in the next conversation, `uucico'
++     refuses the send request and deletes the record in the `.Received'
++     directory.  This approach only works for file sends which use a
++     temporary file name, but this is true of all execution requests.
++
++\x1f
++File: uucp.info,  Node: Spool Lock Files,  Prev: Other Spool Subdirectories,  Up: The Spool Directory Layout
++
++4.4.5 Lock Files in the Spool Directory
++---------------------------------------
++
++Lock files for devices and systems are stored in the lock directory,
++which may or may not be the same as the spool directory.  The lock
++directory is set at compilation time by `LOCKDIR' in `policy.h', which
++may be overridden by the `lockdir' command in the `config' file (*note
++Miscellaneous (config)::).
++
++   For a description of the names used for device lock files, and the
++format of the contents of a lock file, see *note UUCP Lock Files::.
++
++`LCK..SYS'
++     A lock file for a system, where SYS is the system name.  As noted
++     above, these lock files are kept in the lock directory, which may
++     not be the spool directory.  These lock files are created by
++     `uucico' while talking to a remote system, and are used to prevent
++     multiple simultaneous conversations with a system.
++
++     On systems which limit file names to 14 characters, only the first
++     eight characters of the system name are used in the lock file
++     name.  This requires that the names of each directly connected
++     remote system be unique in the first eight characters.
++
++`LCK.XQT.NN'
++     When `uuxqt' starts up, it uses lock files to determine how many
++     other `uuxqt' daemons are currently running.  It first tries to
++     lock `LCK.XQT.0', then `LCK.XQT.1', and so forth.  This is used to
++     implement the `max-uuxqts' command (*note Miscellaneous
++     (config)::).  It is also used to parcel out the `.Xqtdir'
++     subdirectories (*note Execution Subdirectories::).
++
++`LXQ.CMD'
++     When `uuxqt' is invoked with the `-c' or `--command' option (*note
++     Invoking uuxqt::), it creates a lock file named after the command
++     it is executing.  For example, `uuxqt -c rmail' will create the
++     lock file `LXQ.rmail'.  This prevents other `uuxqt' daemons from
++     executing jobs of the specified type.
++
++`SYSTEM/X./L.XXX'
++     While `uuxqt' is executing a particular job, it creates a lock file
++     with the same name as the `X.' file describing the job, but
++     replacing the initial `X' with `L'.  This ensures that if multiple
++     `uuxqt' daemons are running, they do not simultaneously execute
++     the same job.
++
++`LCK..SEQ'
++     This lock file is used to control access to the sequence files for
++     each system (*note System Spool Directories::).  It is only used
++     on systems which do not support POSIX file locking using the
++     `fcntl' system call.
++
++\x1f
++File: uucp.info,  Node: Spool Directory Cleaning,  Prev: The Spool Directory Layout,  Up: Using Taylor UUCP
++
++4.5 Cleaning the Spool Directory
++================================
++
++The spool directory may need to be cleaned up periodically.  Under some
++circumstances, files may accumulate in various subdirectories, such as
++`.Preserve' (*note Other Spool Subdirectories::) or `.Corrupt' (*note
++Execution Subdirectories::).
++
++   Also, if a remote system stops calling in, you may want to arrange
++for any queued up mail to be returned to the sender.  This can be done
++using the `uustat' command (*note Invoking uustat::).
++
++   The `contrib' directory includes a simple `uuclean' script which may
++be used as an example of a clean up script.  It can be run daily out of
++`crontab'.
++
++   You should periodically trim the UUCP log files, as they will
++otherwise grow without limit.  The names of the log files are set in
++`policy.h', and may be overridden in the configuration file (*note
++config File::).  By default they are are `/usr/spool/uucp/Log' and
++`/usr/spool/uucp/Stats'.  You may find the `savelog' program in the
++`contrib' directory to be of use.  There is a manual page for it in
++`contrib' as well.
++
++\x1f
++File: uucp.info,  Node: Configuration Files,  Next: Protocols,  Prev: Using Taylor UUCP,  Up: Top
++
++5 Taylor UUCP Configuration Files
++*********************************
++
++This chapter describes the configuration files accepted by the Taylor
++UUCP package if compiled with `HAVE_TAYLOR_CONFIG' set to 1 in
++`policy.h'.
++
++   The configuration files are normally found in the directory
++NEWCONFIGDIR, which is defined by the `configure' option
++`--with-newconfigdir'; by default NEWCONFIGDIR is
++`/usr/local/conf/uucp'.  However, the main configuration file,
++`config', is the only one which must be in that directory, since it may
++specify a different location for any or all of the other files.  You
++may run any of the UUCP programs with a different main configuration
++file by using the `-I' or `--config' option; this can be useful when
++testing a new configuration.  When you use the `-I' option the programs
++will revoke any setuid privileges.
++
++* Menu:
++
++* Configuration Overview::      Configuration File Overview
++* Configuration File Format::   Configuration File Format
++* Configuration Examples::      Examples of Configuration Files
++* Time Strings::                How to Write Time Strings
++* Chat Scripts::                How to Write Chat Scripts
++* config File::                 The Main Configuration File
++* sys File::                    The System Configuration File
++* port File::                   The Port Configuration Files
++* dial File::                   The Dialer Configuration Files
++* UUCP Over TCP::               UUCP Over TCP
++* Security::                    Security Issues
++
++\x1f
++File: uucp.info,  Node: Configuration Overview,  Next: Configuration File Format,  Prev: Configuration Files,  Up: Configuration Files
++
++5.1 Configuration File Overview
++===============================
++
++UUCP uses several different types of configuration files, each
++describing a different kind of information.  The commands permitted in
++each file are described in detail below.  This section is a brief
++description of some of the different types of files.
++
++   The `config' file is the main configuration file.  It describes
++general information not associated with a particular remote system, such
++as the location of various log files.  There are reasonable defaults for
++everything that may be specified in the `config' file, so you may not
++actually need one on your system.
++
++   There may be only one `config' file, but there may be one or more of
++each other type of file.  The default is one file for each type, but
++more may be listed in the `config' file.
++
++   The `sys' files are used to describe remote systems.  Each remote
++system to which you connect must be listed in a `sys' file.  A `sys'
++file will include information for a system, such as the speed (baud
++rate) to use, or when to place calls.
++
++   For each system you wish to call, you must describe one or more
++ports; these ports may be defined directly in the `sys' file, or they
++may be defined in a `port' file.
++
++   The `port' files are used to describe ports.  A port is a particular
++hardware connection on your computer.  You would normally define as
++many ports as there are modems attached to your computer.  A TCP
++connection is also described using a port.
++
++   The `dial' files are used to describe dialers.  Dialer is
++essentially another word for modem.  The `dial' file describes the
++commands UUCP should use to dial out on a particular type of modem.  You
++would normally define as many dialers as there are types of modems
++attached to your computer.  For example, if you have three Telebit
++modems used for UUCP, you would probably define three ports and one
++dialer.
++
++   There are other types of configuration files, but these are the
++important ones.  The other types are described below.
++
++\x1f
++File: uucp.info,  Node: Configuration File Format,  Next: Configuration Examples,  Prev: Configuration Overview,  Up: Configuration Files
++
++5.2 Configuration File Format
++=============================
++
++All the configuration files follow a simple line-oriented `KEYWORD
++VALUE' format.  Empty lines are ignored, as are leading spaces; unlike
++HDB, lines with leading spaces are read.  The first word on each line
++is a keyword.  The rest of the line is interpreted according to the
++keyword.  Most keywords are followed by numbers, boolean values or
++simple strings with no embedded spaces.
++
++   The `#' character is used for comments.  Everything from a `#' to
++the end of the line is ignored unless the `#' is preceded by a `\'
++(backslash); if the `#' is preceeded by a `\', the `\' is removed but
++the `#' remains in the line.  This can be useful for a phone number
++containing a `#'.  To enter the sequence `\#', use `\\#'.
++
++   The backslash character may be used to continue lines.  If the last
++character in a line is a backslash, the backslash is removed and the
++line is continued by the next line.  The second line is attached to the
++first with no intervening characters; if you want any whitespace between
++the end of the first line and the start of the second line, you must
++insert it yourself.
++
++   However, the backslash is not a general quoting character.  For
++example, you cannot use it to get an embedded space in a string
++argument.
++
++   Everything after the keyword must be on the same line.  A BOOLEAN
++may be specified as `y', `Y', `t', or `T' for true and `n', `N', `f',
++or `F' for false; any trailing characters are ignored, so `true',
++`false', etc., are also acceptable.
++
++\x1f
++File: uucp.info,  Node: Configuration Examples,  Next: Time Strings,  Prev: Configuration File Format,  Up: Configuration Files
++
++5.3 Examples of Configuration Files
++===================================
++
++This section provides few typical examples of configuration files.
++There are also sample configuration files in the `sample' subdirectory
++of the distribution.
++
++* Menu:
++
++* config File Examples::        Examples of the Main Configuration File
++* Leaf Example::                Call a Single Remote Site
++* Gateway Example::             The Gateway for Several Local Systems
++
++\x1f
++File: uucp.info,  Node: config File Examples,  Next: Leaf Example,  Prev: Configuration Examples,  Up: Configuration Examples
++
++5.3.1 config File Examples
++--------------------------
++
++To start with, here are some examples of uses of the main configuration
++file, `config'.  For a complete description of the commands that are
++permitted in `config', see *note config File::.
++
++   In many cases you will not need to create a `config' file at all.
++The most common reason to create one is to give your machine a special
++UUCP name.  Other reasons might be to change the UUCP spool directory,
++or to permit any remote system to call in.
++
++   If you have an internal network of machines, then it is likely that
++the internal name of your UUCP machine is not the name you want to use
++when calling other systems.  For example, here at `airs.com' our
++mail/news gateway machine is named `elmer.airs.com' (it is one of
++several machines all named `LOCALNAME.airs.com').  If we did not
++provide a `config' file, then our UUCP name would be `elmer'; however,
++we actually want it to be `airs'.  Therefore, we use the following line
++in `config':
++
++     nodename airs
++
++   The UUCP spool directory name is set in `policy.h' when the code is
++compiled.  You might at some point decide that it is appropriate to move
++the spool directory, perhaps to put it on a different disk partition.
++You would use the following commands in `config' to change to
++directories on the partition `/uucp':
++
++     spool /uucp/spool
++     pubdir /uucp/uucppublic
++     logfile /uucp/spool/Log
++     debugfile /uucp/spool/Debug
++
++   You would then move the contents of the current spool directory to
++`/uucp/spool'.  If you do this, make sure that no UUCP processes are
++running while you change `config' and move the spool directory.
++
++   Suppose you wanted to permit any system to call in to your system and
++request files.  This is generally known as "anonymous UUCP", since the
++systems which call in are effectively anonymous.  By default, unknown
++systems are not permitted to call in.  To permit this you must use the
++`unknown' command in `config'.  The `unknown' command is followed by
++any command that may appear in the system file; for full details, see
++*note sys File::.
++
++   I will show two possible anonymous UUCP configurations.  The first
++will let any system call in and download files, but will not permit
++them to upload files to your system.
++
++     # No files may be transferred to this system
++     unknown receive-request no
++     # The public directory is /usr/spool/anonymous
++     unknown pubdir /usr/spool/anonymous
++     # Only files in the public directory may be sent (the default anyhow)
++     unknown remote-send ~
++
++Setting the public directory is convenient for the systems which call
++in.  It permits to request a file by prefixing it with `~/'.  For
++example, assuming your system is known as `server', then to retrieve
++the file `/usr/spool/anonymous/INDEX' a user on a remote site could
++just enter `uucp server!~/INDEX ~'; this would transfer `INDEX' from
++`server''s public directory to the user's local public directory.  Note
++that when using `csh' or `bash' the `!' and the second `~' must be
++quoted.
++
++   The next example will permit remote systems to upload files to a
++special directory named `/usr/spool/anonymous/upload'.  Permitting a
++remote system to upload files permits it to send work requests as well;
++this example is careful to prohibit commands from unknown systems.
++
++     # No commands may be executed (the list of permitted commands is empty)
++     unknown commands
++     # The public directory is /usr/spool/anonymous
++     unknown pubdir /usr/spool/anonymous
++     # Only files in the public directory may be sent; users may not download
++     # files from the upload directory
++     unknown remote-send ~ !~/upload
++     # May only upload files into /usr/spool/anonymous/upload
++     unknown remote-receive ~/upload
++
++\x1f
++File: uucp.info,  Node: Leaf Example,  Next: Gateway Example,  Prev: config File Examples,  Up: Configuration Examples
++
++5.3.2 Leaf Example
++------------------
++
++A relatively common simple case is a "leaf site", a system which only
++calls or is called by a single remote site.  Here is a typical `sys'
++file that might be used in such a case.  For full details on what
++commands can appear in the `sys' file, see *note sys File::.
++
++   This is the `sys' file that is used at `airs.com'.  We use a single
++modem to dial out to `uunet'.  This example shows how you can specify
++the port and dialer information directly in the `sys' file for simple
++cases.  It also shows the use of the following:
++
++`call-login'
++     Using `call-login' and `call-password' allows the default login
++     chat script to be used.  In this case, the login name is specified
++     in the call-out login file (*note Configuration File Names::).
++
++`call-timegrade'
++     `uunet' is requested to not send us news during the daytime.
++
++`chat-fail'
++     If the modem returns `BUSY' or `NO CARRIER' the call is
++     immediately aborted.
++
++`protocol-parameter'
++     Since `uunet' tends to be slow, the default timeout has been
++     increased.
++
++
++   This `sys' file relies on certain defaults.  It will allow `uunet'
++to queue up `rmail' and `rnews' commands.  It will allow users to
++request files from `uunet' into the UUCP public directory.  It will
++also allow `uunet' to request files from the UUCP public directory; in
++fact `uunet' never requests files, but for additional security we could
++add the line `request false'.
++
++     # The following information is for uunet
++     system uunet
++
++     # The login name and password are kept in the callout password file
++     call-login *
++     call-password *
++
++     # We can send anything at any time.
++     time any
++
++     # During the day we only accept grade `Z' or above; at other times
++     # (not mentioned here) we accept all grades.  uunet queues up news
++     # at grade `d', which is lower than `Z'.
++     call-timegrade Z Wk0755-2305,Su1655-2305
++
++     # The phone number.
++     phone 7389449
++
++     # uunet tends to be slow, so we increase the timeout
++     chat-timeout 120
++
++     # We are using a preconfigured Telebit 2500.
++     port type modem
++     port device /dev/ttyd0
++     port speed 19200
++     port carrier true
++     port dialer chat "" ATZ\r\d\c OK ATDT\D CONNECT
++     port dialer chat-fail BUSY
++     port dialer chat-fail NO\sCARRIER
++     port dialer complete \d\d+++\d\dATH\r\c
++     port dialer abort \d\d+++\d\dATH\r\c
++
++     # Increase the timeout and the number of retries.
++     protocol-parameter g timeout 20
++     protocol-parameter g retries 10
++
++\x1f
++File: uucp.info,  Node: Gateway Example,  Prev: Leaf Example,  Up: Configuration Examples
++
++5.3.3 Gateway Example
++---------------------
++
++Many organizations have several local machines which are connected by
++UUCP, and a single machine which connects to the outside world.  This
++single machine is often referred to as a "gateway" machine.
++
++   For this example I will assume a fairly simple case.  It should still
++provide a good general example.  There are three machines, `elmer',
++`comton' and `bugs'.  `elmer' is the gateway machine for which I will
++show the configuration file.  `elmer' calls out to `uupsi'.  As an
++additional complication, `uupsi' knows `elmer' as `airs'; this will
++show how a machine can have one name on an internal network but a
++different name to the external world.  `elmer' has two modems.  It also
++has an TCP connection to `uupsi', but since that is supposed to be
++reserved for interactive work (it is, perhaps, only a 9600 baud SLIP
++line) it will only use it if the modems are not available.
++
++   A network this small would normally use a single `sys' file.
++However, for pedagogical purposes I will show two separate `sys' files,
++one for the local systems and one for `uupsi'.  This is done with the
++`sysfile' command in the `config' file.  Here is the `config' file.
++
++     # This is config
++     # The local sys file
++     sysfile /usr/local/lib/uucp/sys.local
++     # The remote sys file
++     sysfile /usr/local/lib/uucp/sys.remote
++
++   Using the defaults feature of the `sys' file can greatly simplify
++the listing of local systems.  Here is `sys.local'.  Note that this
++assumes that the local systems are trusted; they are permited to request
++any world readable file and to write files into any world writable
++directory.
++
++     # This is sys.local
++     # Get the login name and password to use from the call-out file
++     call-login *
++     call-password *
++
++     # The systems must use a particular login
++     called-login Ulocal
++
++     # Permit sending any world readable file
++     local-send /
++     remote-send /
++
++     # Permit receiving into any world writable directory
++     local-receive /
++     remote-receive /
++
++     # Call at any time
++     time any
++
++     # Use port1, then port2
++     port port1
++
++     alternate
++
++     port port2
++
++     # Now define the systems themselves.  Because of all the defaults we
++     # used, there is very little to specify for the systems themselves.
++
++     system comton
++     phone 5551212
++
++     system bugs
++     phone 5552424
++
++   The `sys.remote' file describes the `uupsi' connection.  The
++`myname' command is used to change the UUCP name to `airs' when talking
++to `uupsi'.
++
++     # This is sys.remote
++     # Define uupsi
++     system uupsi
++
++     # The login name and password are in the call-out file
++     call-login *
++     call-password *
++
++     # We can call out at any time
++     time any
++
++     # uupsi uses a special login name
++     called-login Uuupsi
++
++     # uuspi thinks of us as `airs'
++     myname airs
++
++     # The phone number
++     phone 5554848
++
++     # We use port2 first, then port1, then TCP
++
++     port port2
++
++     alternate
++
++     port port1
++
++     alternate
++
++     # We don't bother to make a special entry in the port file for TCP, we
++     # just describe the entire port right here.  We use a special chat
++     # script over TCP because the usual one confuses some TCP servers.
++     port type TCP
++     address uu.psi.com
++     chat ogin: \L word: \P
++
++   The ports are defined in the file `port' (*note port File::).  For
++this example they are both connected to the same type of 2400 baud
++Hayes-compatible modem.
++
++     # This is port
++
++     port port1
++     type modem
++     device /dev/ttyd0
++     dialer hayes
++     speed 2400
++
++     port port2
++     type modem
++     device /dev/ttyd1
++     dialer hayes
++     speed 2400
++
++   Dialers are described in the `dial' file (*note dial File::).
++
++     # This is dial
++
++     dialer hayes
++
++     # The chat script used to dial the phone.  \D is the phone number.
++     chat "" ATZ\r\d\c OK ATDT\D CONNECT
++
++     # If we get BUSY or NO CARRIER we abort the dial immediately
++     chat-fail BUSY
++     chat-fail NO\sCARRIER
++
++     # When the call is over we make sure we hangup the modem.
++     complete \d\d+++\d\dATH\r\c
++     abort \d\d+++\d\dATH\r\c
++
++\x1f
++File: uucp.info,  Node: Time Strings,  Next: Chat Scripts,  Prev: Configuration Examples,  Up: Configuration Files
++
++5.4 Time Strings
++================
++
++Several commands use time strings to specify a range of times.  This
++section describes how to write time strings.
++
++   A time string may be a list of simple time strings separated with a
++vertical bar `|' or a comma `,'.
++
++   Each simple time string must begin with `Su', `Mo', `Tu', `We',
++`Th', `Fr', or `Sa', or `Wk' for any weekday, or `Any' for any day.
++
++   Following the day may be a range of hours separated with a hyphen
++using 24 hour time.  The range of hours may cross 0; for example
++`2300-0700' means any time except 7 AM to 11 PM.  If no time is given,
++calls may be made at any time on the specified day(s).
++
++   The time string may also be the single word `Never', which does not
++match any time.  The time string may also be a single word with a name
++defined in a previous `timetable' command (*note Miscellaneous
++(config)::).
++
++   Here are a few sample time strings with an explanation of what they
++mean.
++
++`Wk2305-0855,Sa,Su2305-1655'
++     This means weekdays before 8:55 AM or after 11:05 PM, any time
++     Saturday, or Sunday before 4:55 PM or after 11:05 PM.  These are
++     approximately the times during which night rates apply to phone
++     calls in the U.S.A.  Note that this time string uses, for example,
++     `2305' rather than `2300'; this will ensure a cheap rate phone
++     call even if the computer clock is running up to five minutes
++     ahead of the real time.
++
++`Wk0905-2255,Su1705-2255'
++     This means weekdays from 9:05 AM to 10:55 PM, or Sunday from 5:05
++     PM to 10:55 PM.  This is approximately the opposite of the
++     previous example.
++
++`Any'
++     This means any day.  Since no time is specified, it means any time
++     on any day.
++
++
++\x1f
++File: uucp.info,  Node: Chat Scripts,  Next: config File,  Prev: Time Strings,  Up: Configuration Files
++
++5.5 Chat Scripts
++================
++
++Chat scripts are used in several different places, such as dialing out
++on modems or logging in to remote systems.  Chat scripts are made up of
++pairs of strings.  The program waits until it sees the first string,
++known as the "expect" string, and then sends out the second string, the
++"send" string.
++
++   Each chat script is defined using a set of commands.  These commands
++always end in a string beginning with `chat', but may start with
++different strings.  For example, in the `sys' file there is one set of
++commands beginning with `chat' and another set beginning with
++`called-chat'.  The prefixes are only used to disambiguate different
++types of chat scripts, and this section ignores the prefixes when
++describing the commands.
++
++`chat STRINGS'
++     Specify a chat script.  The arguments to the `chat' command are
++     pairs of strings separated by whitespace.  The first string of
++     each pair is an expect string, the second is a send string.  The
++     program will wait for the expect string to appear; when it does,
++     the program will send the send string.  If the expect string does
++     not appear within a certain number of seconds (as set by the
++     `chat-timeout' command), the chat script fails and, typically, the
++     call is aborted.  If the final expect string is seen (and the
++     optional final send string has been sent), the chat script is
++     successful.
++
++     An expect string may contain additional subsend and subexpect
++     strings, separated by hyphens.  If the expect string is not seen,
++     the subsend string is sent and the chat script continues by
++     waiting for the subexpect string.  This means that a hyphen may
++     not appear in an expect string; on an ASCII system, use `\055'
++     instead.
++
++     An expect string may simply be `""', meaning to skip the expect
++     phase.  Otherwise, the following escape characters may appear in
++     expect strings:
++
++    `\b'
++          a backspace character
++
++    `\n'
++          a newline or line feed character
++
++    `\N'
++          a null character (for HDB compatibility)
++
++    `\r'
++          a carriage return character
++
++    `\s'
++          a space character
++
++    `\t'
++          a tab character
++
++    `\\'
++          a backslash character
++
++    `\DDD'
++          character DDD, where DDD are up to three octal digits
++
++    `\xDDD'
++          character DDD, where DDD are hexadecimal digits.
++
++     As in C, there may be up to three octal digits following a
++     backslash, but the hexadecimal escape sequence continues as far as
++     possible.  To follow a hexadecimal escape sequence with a hex
++     digit, interpose a send string of `""'.
++
++     A chat script expect string may also specify a timeout.  This is
++     done by using the escape sequence `\WSECONDS'.  This escape
++     sequence may only appear at the very end of the expect string.  It
++     temporarily overrides the timeout set by `chat-timeout' (described
++     below) only for the expect string to which it is attached.
++
++     A send string may simply be `""' to skip the send phase.
++     Otherwise, all of the escape characters legal for expect strings
++     may be used, and the following escape characters are also
++     permitted:
++
++    `EOT'
++          send an end of transmission character (`^D')
++
++    `BREAK'
++          send a break character (may not work on all systems)
++
++    `\c'
++          suppress trailing carriage return at end of send string
++
++    `\d'
++          delay sending for 1 or 2 seconds
++
++    `\e'
++          disable echo checking
++
++    `\E'
++          enable echo checking
++
++    `\K'
++          same as `BREAK'
++
++    `\p'
++          pause sending for a fraction of a second
++
++    `\M'
++          do not require carrier signal
++
++    `\m'
++          require carrier signal (fail if not present)
++
++     Some specific types of chat scripts also define additional escape
++     sequences that may appear in the send string.  For example, the
++     login chat script defines `\L' and `\P' to send the login name and
++     password, respectively.
++
++     A carriage return will be sent at the end of each send string,
++     unless the `\c' escape sequence appears in the string.  Note that
++     some UUCP packages use `\b' for break, but here it means backspace.
++
++     Echo checking means that after writing each character the program
++     will wait until the character is echoed.  Echo checking must be
++     turned on separately for each send string for which it is desired;
++     it will be turned on for characters following `\E' and turned off
++     for characters following `\e'.
++
++     When used with a port which does not support the carrier signal,
++     as set by the `carrier' command in the port file, `\M' and `\m'
++     are ignored.  Similarly, when used in a dialer chat script with a
++     dialer which does not support the carrier signal, as set by the
++     `carrier' command in the dial file, `\M' and `\m' are ignored.
++
++`chat-timeout NUMBER'
++     The number of seconds to wait for an expect string in the chat
++     script, before timing out and sending the next subsend, or failing
++     the chat script entirely.  The default value is 10 for a login
++     chat or 60 for any other type of chat.
++
++`chat-fail STRING'
++     If the STRING is seen at any time during a chat script, the chat
++     script is aborted.  The string may not contain any whitespace
++     characters: escape sequences must be used for them.  Multiple
++     `chat-fail' commands may appear in a single chat script.  The
++     default is to have none.
++
++     This permits a chat script to be quickly aborted if an error
++     string is seen.  For example, a script used to dial out on a modem
++     might use the command `chat-fail BUSY' to stop the chat script
++     immediately if the string `BUSY' was seen.
++
++     The `chat-fail' strings are considered in the order they are
++     listed, so if one string is a suffix of another the longer one
++     should be listed first.  This affects the error message which will
++     be logged.  Of course, if one string is contained within another,
++     but is not a suffix, the smaller string will always be found
++     before the larger string could match.
++
++`chat-seven-bit BOOLEAN'
++     If the argument is true, all incoming characters are stripped to
++     seven bits when being compared to the expect string.  Otherwise
++     all eight bits are used in the comparison.  The default is true,
++     because some Unix systems generate parity bits during the login
++     prompt which must be ignored while running a chat script.  This
++     has no effect on any `chat-program', which must ignore parity by
++     itself if necessary.
++
++`chat-program STRINGS'
++     Specify a program to run before executing the chat script.  This
++     program could run its own version of a chat script, or it could do
++     whatever it wants.  If both `chat-program' and `chat' are
++     specified, the program is executed first followed by the chat
++     script.
++
++     The first argument to the `chat-program' command is the program
++     name to run.  The remaining arguments are passed to the program.
++     The following escape sequences are recognized in the arguments:
++
++    `\Y'
++          port device name
++
++    `\S'
++          port speed
++
++    `\\'
++          backslash
++
++     Some specific uses of `chat-program' define additional escape
++     sequences.
++
++     Arguments other than escape sequences are passed exactly as they
++     appear in the configuration file, except that sequences of
++     whitespace are compressed to a single space character (this
++     exception may be removed in the future).
++
++     If the `chat-program' command is not used, no program is run.
++
++     On Unix, the standard input and standard output of the program
++     will be attached to the port in use.  Anything the program writes
++     to standard error will be written to the UUCP log file.  No other
++     file descriptors will be open.  If the program does not exit with
++     a status of 0, it will be assumed to have failed.  This means that
++     the dialing programs used by some versions of HDB may not be used
++     directly, but you may be able to run them via the `dialHDB'
++     program in the `contrib' directory.
++
++     The program will be run as the `uucp' user, and the environment
++     will be that of the process that started `uucico', so care must be
++     taken to maintain security.
++
++     No search path is used to find the program; a full file name must
++     be given.  If the program is an executable shell script, it will
++     be passed to `/bin/sh' even on systems which are unable to execute
++     shell scripts.
++
++
++   Here is a simple example of a chat script that might be used to
++reset a Hayes compatible modem.
++
++     chat "" ATZ OK-ATZ-OK
++
++   The first expect string is `""', so it is ignored.  The chat script
++then sends `ATZ'.  If the modem responds with `OK', the chat script
++finishes.  If 60 seconds (the default timeout) pass before seeing `OK',
++the chat script sends another `ATZ'.  If it then sees `OK', the chat
++script succeeds.  Otherwise, the chat script fails.
++
++   For a more complex chat script example, see *note Logging In::.
++
++\x1f
++File: uucp.info,  Node: config File,  Next: sys File,  Prev: Chat Scripts,  Up: Configuration Files
++
++5.6 The Main Configuration File
++===============================
++
++The main configuration file is named `config'.
++
++   Since all the values that may be specified in the main configuration
++file also have defaults, there need not be a main configuration file at
++all.
++
++   Each command in `config' may have a program prefix, which is a
++separate word appearing at the beginning of the line.  The currently
++supported prefixes are `uucp' and `cu'.  Any command prefixed by `uucp'
++will not be read by the `cu' program.  Any command prefixed by `cu'
++will only be read by the `cu' program.  For example, to use a list of
++systems known only to `cu', list them in a separate file `FILE' and put
++`cu sysfile `FILE'' in `config'.
++
++* Menu:
++
++* Miscellaneous (config)::      Miscellaneous config File Commands
++* Configuration File Names::    Using Different Configuration Files
++* Log File Names::              Using Different Log Files
++* Debugging Levels::            Debugging Levels
++
++\x1f
++File: uucp.info,  Node: Miscellaneous (config),  Next: Configuration File Names,  Prev: config File,  Up: config File
++
++5.6.1 Miscellaneous config File Commands
++----------------------------------------
++
++`nodename STRING'
++`hostname STRING'
++`uuname STRING'
++     These keywords are equivalent.  They specify the UUCP name of the
++     local host.  If there is no configuration file, an appropriate
++     system function will be used to get the host name, if possible.
++
++`spool STRING'
++     Specify the spool directory.  The default is from `policy.h'.  This
++     is where UUCP files are queued.  Status files and various sorts of
++     temporary files are also stored in this directory and
++     subdirectories of it.
++
++`pubdir STRING'
++     Specify the public directory.  The default is from `policy.h'.
++     When a file is named using a leading `~/', it is taken from or to
++     the public directory.  Each system may use a separate public
++     directory by using the `pubdir' command in the system
++     configuration file; see *note Miscellaneous (sys)::.
++
++`lockdir STRING'
++     Specify the directory to place lock files in.  The default is from
++     `policy.h'; see the information in that file.  Normally the lock
++     directory should be set correctly in `policy.h', and not changed
++     here.  However, changing the lock directory is sometimes useful for
++     testing purposes.  This only affects lock files for devices and
++     systems; it does not affect certain internal lock files which are
++     stored in the spool directory (*note Spool Lock Files::).
++
++`unknown STRING ...'
++     The STRING and subsequent arguments are treated as though they
++     appeared in the system file (*note sys File::).  They are used to
++     apply to any unknown systems that may call in, probably to set
++     file transfer permissions and the like.  If the `unknown' command
++     is not used, unknown systems are not permitted to call in.
++
++`strip-login BOOLEAN'
++     If the argument is true, then, when `uucico' is doing its own
++     login prompting with the `-e', `-l', or `-w' switches, it will
++     strip the parity bit when it reads the login name and password.
++     Otherwise all eight bits will be used when checking the strings
++     against the UUCP password file.  The default is true, since some
++     other UUCP packages send parity bits with the login name and
++     password, and few systems use eight bit characters in the password
++     file.
++
++`strip-proto BOOLEAN'
++     If the argument is true, then `uucico' will strip the parity bit
++     from incoming UUCP protocol commands.  Otherwise all eight bits
++     will be used.  This only applies to commands which are not
++     encapsulated in a link layer protocol.  The default is true, which
++     should always be correct unless your UUCP system names use eight
++     bit characters.
++
++`max-uuxqts NUMBER'
++     Specify the maximum number of `uuxqt' processes which may run at
++     the same time.  Having several `uuxqt' processes running at once
++     can significantly slow down a system, but, since `uuxqt' is
++     automatically started by `uucico', it can happen quite easily.  The
++     default for `max-uuxqts' is 0, which means that there is no limit.
++     If HDB configuration files are being read and the code was compiled
++     without `HAVE_TAYLOR_CONFIG', then, if the file `Maxuuxqts' in the
++     configuration directory contains a readable number, it will be used
++     as the value for `max-uuxqts'.
++
++`run-uuxqt STRING or NUMBER'
++     Specify when `uuxqt' should be run by `uucico'.  This may be a
++     positive number, in which case `uucico' will start a `uuxqt'
++     process whenever it receives the given number of execution files
++     from the remote system, and, if necessary, at the end of the call.
++     The argument may also be one of the strings `once', `percall', or
++     `never'.  The string `once' means that `uucico' will start `uuxqt'
++     once at the end of execution.  The string `percall' means that
++     `uucico' will start `uuxqt' once per call that it makes (this is
++     only different from `once' when `uucico' is invoked in a way that
++     causes it to make multiple calls, such as when the `-r1' option is
++     used without the `-s' option).  The string `never' means that
++     `uucico' will never start `uuxqt', in which case `uuxqt' should be
++     periodically run via some other mechanism.  The default depends
++     upon which type of configuration files are being used; if
++     `HAVE_TAYLOR_CONFIG' is used the default is `once', otherwise if
++     `HAVE_HDB_CONFIG' is used the default is `percall', and otherwise,
++     for `HAVE_V2_CONFIG', the default is `10'.
++
++`timetable STRING STRING'
++     The `timetable' defines a timetable that may be used in
++     subsequently appearing time strings; see *note Time Strings::.
++     The first string names the timetable entry; the second is a time
++     string.
++
++     The following `timetable' commands are predefined.  The NonPeak
++     timetable is included for compatibility.  It originally described
++     the offpeak hours of Tymnet and Telenet, but both have since
++     changed their schedules.
++
++          timetable Evening Wk1705-0755,Sa,Su
++          timetable Night Wk2305-0755,Sa,Su2305-1655
++          timetable NonPeak Wk1805-0655,Sa,Su
++
++     If this command does not appear, then, obviously, no additional
++     timetables will be defined.
++
++`v2-files BOOLEAN'
++     If the code was compiled to be able to read V2 configuration
++     files, a false argument to this command will prevent them from
++     being read.  This can be useful while testing.  The default is
++     true.
++
++`hdb-files BOOLEAN'
++     If the code was compiled to be able to read HDB configuration
++     files, a false argument to this command will prevent them from
++     being read.  This can be useful while testing.  The default is
++     true.
++
++
++\x1f
++File: uucp.info,  Node: Configuration File Names,  Next: Log File Names,  Prev: Miscellaneous (config),  Up: config File
++
++5.6.2 Configuration File Names
++------------------------------
++
++`sysfile STRINGS'
++     Specify the system file(s).  The default is the file `sys' in the
++     directory NEWCONFIGDIR.  These files hold information about other
++     systems with which this system communicates; see *note sys File::.
++     Multiple system files may be given on the line, and the `sysfile'
++     command may be repeated; each system file has its own set of
++     defaults.
++
++`portfile STRINGS'
++     Specify the port file(s).  The default is the file `port' in the
++     directory NEWCONFIGDIR.  These files describe ports which are used
++     to call other systems and accept calls from other systems; see
++     *note port File::.  No port files need be named at all.  Multiple
++     port files may be given on the line, and the `portfile' command
++     may be repeated.
++
++`dialfile STRINGS'
++     Specify the dial file(s).  The default is the file `dial' in the
++     directory NEWCONFIGDIR.  These files describe dialing devices
++     (modems); see *note dial File::.  No dial files need be named at
++     all.  Multiple dial files may be given on the line, and the
++     `dialfile' command may be repeated.
++
++`dialcodefile STRINGS'
++     Specify the dialcode file(s).  The default is the file `dialcode'
++     in the directory NEWCONFIGDIR.  These files specify dialcodes that
++     may be used when sending phone numbers to a modem.  This permits
++     using the same set of phone numbers in different area-codes or
++     with different phone systems, by using dialcodes to specify the
++     calling sequence.  When a phone number goes through dialcode
++     translation, the leading alphabetic characters are stripped off.
++     The dialcode files are read line by line, just like any other
++     configuration file, and when a line is found whose first word is
++     the same as the leading characters from the phone number, the
++     second word on the line (which would normally consist of numbers)
++     replaces the dialcode in the phone number.  No dialcode file need
++     be used.  Multiple dialcode files may be specified on the line,
++     and the `dialcodefile' command may be repeated; all the dialcode
++     files will be read in turn until a dialcode is located.
++
++`callfile STRINGS'
++     Specify the call out login name and password file(s).  The default
++     is the file `call' in the directory NEWCONFIGDIR.  If the call out
++     login name or password for a system are given as `*' (*note
++     Logging In::), these files are read to get the real login name or
++     password.  Each line in the file(s) has three words: the system
++     name, the login name, and the password.  The login name and
++     password may contain escape sequences like those in a chat script
++     expect string (*note Chat Scripts::).  This file is only used when
++     placing calls to remote systems; the password file described under
++     `passwdfile' below is used for incoming calls.  The intention of
++     the call out file is to permit the system file to be publically
++     readable; the call out files must obviously be kept secure.  These
++     files need not be used.  Multiple call out files may be specified
++     on the line, and the `callfile' command may be repeated; all the
++     files will be read in turn until the system is found.
++
++`passwdfile STRINGS'
++     Specify the password file(s) to use for login names when `uucico'
++     is doing its own login prompting, which it does when given the
++     `-e', `-l' or `-w' switches.  The default is the file `passwd' in
++     the directory NEWCONFIGDIR.  Each line in the file(s) has two
++     words: the login name and the password (e.g., `Ufoo foopas').
++     They may contain escape sequences like those in a chat script
++     expect string (*note Chat Scripts::).  The login name is accepted
++     before the system name is known, so these are independent of which
++     system is calling in; a particular login may be required for a
++     system by using the `called-login' command in the system file
++     (*note Accepting a Call::).  These password files are optional,
++     although one must exist if `uucico' is to present its own login
++     prompts.
++
++     As a special exception, a colon may be used to separate the login
++     name from the password, and a colon may be used to terminate the
++     password.  This means that the login name and password may not
++     contain a colon.  This feature, in conjunction with the
++     `HAVE_ENCRYPTED_PASSWORDS' macro in `policy.h', permits using a
++     standard Unix `/etc/passwd' as a UUCP password file, providing the
++     same set of login names and passwords for both `getty' and
++     `uucico'.
++
++     Multiple password files may be specified on the line, and the
++     `passwdfile' command may be repeated; all the files will be read in
++     turn until the login name is found.
++
++
++\x1f
++File: uucp.info,  Node: Log File Names,  Next: Debugging Levels,  Prev: Configuration File Names,  Up: config File
++
++5.6.3 Log File Names
++--------------------
++
++`logfile STRING'
++     Name the log file.  The default is from `policy.h'.  Logging
++     information is written to this file.  If `HAVE_HDB_LOGGING' is
++     defined in `policy.h', then by default a separate log file is used
++     for each system; using this command to name a log file will cause
++     all the systems to use it.
++
++`statfile STRING'
++     Name the statistics file.  The default is from `policy.h'.
++     Statistical information about file transfers is written to this
++     file.
++
++`debugfile STRING'
++     Name the file to which all debugging information is written.  The
++     default is from `policy.h'.  This command is only effective if the
++     code has been compiled to include debugging (this is controlled by
++     the `DEBUG' macro in `policy.h').  If debugging is on, messages
++     written to the log file are also written to the debugging file to
++     make it easier to keep the order of actions straight.  The
++     debugging file is different from the log file because information
++     such as passwords can appear in it, so it must be not be
++     publically readable.
++
++
++\x1f
++File: uucp.info,  Node: Debugging Levels,  Prev: Log File Names,  Up: config File
++
++5.6.4 Debugging Levels
++----------------------
++
++`debug STRING ...'
++     Set the debugging level.  This command is only effective if the
++     code has been compiled to include debugging.  The default is to
++     have no debugging.  The arguments are strings which name the types
++     of debugging to be turned on.  The following types of debugging
++     are defined:
++
++    `abnormal'
++          Output debugging messages for abnormal situations, such as
++          recoverable errors.
++
++    `chat'
++          Output debugging messages for chat scripts.
++
++    `handshake'
++          Output debugging messages for the initial handshake.
++
++    `uucp-proto'
++          Output debugging messages for the UUCP session protocol.
++
++    `proto'
++          Output debugging messages for the individual link protocols.
++
++    `port'
++          Output debugging messages for actions on the communication
++          port.
++
++    `config'
++          Output debugging messages while reading the configuration
++          files.
++
++    `spooldir'
++          Output debugging messages for actions in the spool directory.
++
++    `execute'
++          Output debugging messages whenever another program is
++          executed.
++
++    `incoming'
++          List all incoming data in the debugging file.
++
++    `outgoing'
++          List all outgoing data in the debugging file.
++
++    `all'
++          All of the above.
++
++     The debugging level may also be specified as a number.  A 1 will
++     set `chat' debugging, a 2 will set both `chat' and `handshake'
++     debugging, and so on down the possibilities.  Currently an 11 will
++     turn on all possible debugging, since there are 11 types of
++     debugging messages listed above; more debugging types may be added
++     in the future.  The `debug' command may be used several times in
++     the configuration file; every debugging type named will be turned
++     on.  When running any of the programs, the `-x' switch (actually,
++     for `uulog' it's the `-X' switch) may be used to turn on
++     debugging.  The argument to the `-x' switch is one of the strings
++     listed above, or a number as described above, or a comma separated
++     list of strings (e.g., `-x chat,handshake').  The `-x' switch may
++     also appear several times on the command line, in which case all
++     named debugging types will be turned on.  The `-x' debugging is in
++     addition to any debugging specified by the `debug' command; there
++     is no way to cancel debugging information.  The debugging level
++     may also be set specifically for calls to or from a specific
++     system with the `debug' command in the system file (*note
++     Miscellaneous (sys)::).
++
++     The debugging messages are somewhat idiosyncratic; it may be
++     necessary to refer to the source code for additional information
++     in some cases.
++
++
++\x1f
++File: uucp.info,  Node: sys File,  Next: port File,  Prev: config File,  Up: Configuration Files
++
++5.7 The System Configuration File
++=================================
++
++By default there is a single system configuration, named `sys' in the
++directory NEWCONFIGDIR.  This may be overridden by the `sysfile'
++command in the main configuration file; see *note Configuration File
++Names::.
++
++   These files describe all remote systems known to the UUCP package.
++
++* Menu:
++
++* Defaults and Alternates::     Using Defaults and Alternates
++* Naming the System::           Naming the System
++* Calling Out::                 Calling Out
++* Accepting a Call::            Accepting a Call
++* Protocol Selection::          Protocol Selection
++* File Transfer Control::       File Transfer Control
++* Miscellaneous (sys)::         Miscellaneous sys File Commands
++* Default sys File Values::     Default Values
++
++\x1f
++File: uucp.info,  Node: Defaults and Alternates,  Next: Naming the System,  Prev: sys File,  Up: sys File
++
++5.7.1 Defaults and Alternates
++-----------------------------
++
++The first set of commands in the file, up to the first `system'
++command, specify defaults to be used for all systems in that file.  Each
++`sys' file uses a different set of defaults.
++
++   Subsequently, each set of commands from `system' up to the next
++`system' command describe a particular system.  Default values may be
++overridden for specific systems.
++
++   Each system may then have a series of alternate choices to use when
++calling out or calling in.  The first set of commands for a particular
++system, up to the first `alternate' command, provide the first choice.
++Subsequently, each set of commands from `alternate' up to the next
++`alternate' command describe an alternate choice for calling out or
++calling in.
++
++   When a system is called, the commands before the first `alternate'
++are used to select a phone number, port, and so forth; if the call fails
++for some reason, the commands between the first `alternate' and the
++second are used, and so forth.  Well, not quite.  Actually, each
++succeeding alternate will only be used if it is different in some
++relevant way (different phone number, different chat script, etc.).  If
++you want to force the same alternate to be used again (to retry a phone
++call more than once, for example), enter the phone number (or any other
++relevant field) again to make it appear different.
++
++   The alternates can also be used to give different permissions to an
++incoming call based on the login name.  This will only be done if the
++first set of commands, before the first `alternate' command, uses the
++`called-login' command.  The list of alternates will be searched, and
++the first alternate with a matching `called-login' command will be
++used.  If no alternates match, the call will be rejected.
++
++   The `alternate' command may also be used in the file-wide defaults
++(the set of commands before the first `system' command).  This might be
++used to specify a list of ports which are available for all systems
++(for an example of this, see *note Gateway Example::) or to specify
++permissions based on the login name used by the remote system when it
++calls in.  The first alternate for each system will default to the
++first alternate for the file-wide defaults (as modified by the commands
++used before the first `alternate' command for this system), the second
++alternate for each system to the second alternate for the file-wide
++defaults (as modified the same way), and so forth.  If a system
++specifies more alternates than the file-wide defaults, the trailing
++ones will default to the last file-wide default alternate.  If a system
++specifies fewer alternates than the file-wide defaults, the trailing
++file-wide default alternates will be used unmodified.  The
++`default-alternates' command may be used to modify this behaviour.
++
++   This can all get rather confusing, although it's easier to use than
++to describe concisely; the `uuchk' program may be used to ensure that
++you are getting what you want.
++
++\x1f
++File: uucp.info,  Node: Naming the System,  Next: Calling Out,  Prev: Defaults and Alternates,  Up: sys File
++
++5.7.2 Naming the System
++-----------------------
++
++`system STRING'
++     Specify the remote system name.  Subsequent commands up to the next
++     `system' command refer to this system.
++
++`alternate [STRING]'
++     Start an alternate set of commands (*note Defaults and
++     Alternates::).  An optional argument may be used to name the
++     alternate.  This name will be recorded in the log file if the
++     alternate is used to call the system.  There is no way to name the
++     first alternate (the commands before the first `alternate'
++     command).
++
++`default-alternates BOOLEAN'
++     If the argument is false, any remaining default alternates (from
++     the defaults specified at the top of the current system file) will
++     not be used.  The default is true.
++
++`alias STRING'
++     Specify an alias for the current system.  The alias may be used by
++     local `uucp' and `uux' commands, as well as by the remote system
++     (which can be convenient if a remote system changes its name).
++     The default is to have no aliases.
++
++`myname STRING'
++     Specifies a different system name to use when calling the remote
++     system.  Also, if `called-login' is used and is not `ANY', then,
++     when a system logs in with that login name, STRING is used as the
++     local system name.  Because the local system name must be
++     determined before the remote system has identified itself, using
++     `myname' and `called-login' together for any system will set the
++     local name for that login; this means that each locally used
++     system name must have a unique login name associated with it.
++     This allows a system to have different names for an external and
++     an internal network.  The default is to not use a special local
++     name.
++
++
++\x1f
++File: uucp.info,  Node: Calling Out,  Next: Accepting a Call,  Prev: Naming the System,  Up: sys File
++
++5.7.3 Calling Out
++-----------------
++
++This section describes commands used when placing a call to another
++system.
++
++* Menu:
++
++* When to Call::                When to Call
++* Placing the Call::            Placing the Call
++* Logging In::                  Logging In
++
++\x1f
++File: uucp.info,  Node: When to Call,  Next: Placing the Call,  Prev: Calling Out,  Up: Calling Out
++
++5.7.3.1 When to Call
++....................
++
++`time STRING [NUMBER]'
++     Specify when the system may be called.  The first argument is a
++     time string; see *note Time Strings::.  The optional second
++     argument specifies a retry time in minutes.  If a call made during
++     a time that matches the time string fails, no more calls are
++     permitted until the retry time has passed.  By default an
++     exponentially increasing retry time is used: after each failure
++     the next retry period is longer.  A retry time specified in the
++     `time' command is always a fixed amount of time.
++
++     The `time' command may appear multiple times in a single alternate,
++     in which case if any time string matches the system may be called.
++     When the `time' command is used for a particular system, any `time'
++     or `timegrade' commands that appeared in the system defaults are
++     ignored.
++
++     The default time string is `Never'.
++
++`timegrade CHARACTER STRING [NUMBER]'
++     The CHARACTER specifies a grade.  It must be a single letter or
++     digit.  The STRING is a time string (*note Time Strings::).  All
++     jobs of grade CHARACTER or higher (where `0' > `9' > `A' > `Z' >
++     `a' > `z') may be run at the specified time.  An ordinary `time'
++     command is equivalent to using `timegrade' with a grade of `z',
++     permitting all jobs.  If there are no jobs of a sufficiently high
++     grade according to the time string, the system will not be called.
++     Giving the `-s' switch to `uucico' to force it to call a system
++     causes it to assume there is a job of grade `0' waiting to be run.
++
++     The optional third argument specifies a retry time in minutes.
++     See the `time' command, above, for more details.
++
++     Note that the `timegrade' command serves two purposes: 1) if there
++     is no job of sufficiently high grade the system will not be
++     called, and 2) if the system is called anyway (because the `-s'
++     switch was given to `uucico') only jobs of sufficiently high grade
++     will be transferred.  However, if the other system calls in, the
++     `timegrade' commands are ignored, and jobs of any grade may be
++     transferred (but see `call-timegrade' and `called-timegrade',
++     below).  Also, the `timegrade' command will not prevent the other
++     system from transferring any job it chooses, regardless of who
++     placed the call.
++
++     The `timegrade' command may appear multiple times without using
++     `alternate'.  When the `timegrade' command is used for a
++     particular system, any `time' or `timegrade' commands that
++     appeared in the system defaults are ignored.
++
++     If this command does not appear, there are no restrictions on what
++     grade of work may be done at what time.
++
++`max-retries NUMBER'
++     Gives the maximum number of times this system may be retried.  If
++     this many calls to the system fail, it will be called at most once
++     a day whatever the retry time is.  The default is 26.
++
++`success-wait NUMBER'
++     A retry time, in seconds, which applies after a successful call.
++     This can be used to put a limit on how frequently the system is
++     called.  For example, an argument of 1800 means that the system
++     will not be called more than once every half hour.  The default is
++     0, which means that there is no limit.
++
++`call-timegrade CHARACTER STRING'
++     The CHARACTER is a single character `A' to `Z', `a' to `z', or `0'
++     to `9' and specifies a grade.  The STRING is a time string (*note
++     Time Strings::).  If a call is placed to the other system during a
++     time which matches the time string, the remote system will be
++     requested to only run jobs of grade CHARACTER or higher.
++     Unfortunately, there is no way to guarantee that the other system
++     will obey the request (this UUCP package will, but there are
++     others which will not); moreover, job grades are historically
++     somewhat arbitrary, so specifying a grade will only be meaningful
++     if the other system cooperates in assigning grades.  This grade
++     restriction only applies when the other system is called, not when
++     the other system calls in.
++
++     The `call-timegrade' command may appear multiple times without
++     using `alternate'.  If this command does not appear, or if none of
++     the time strings match, the remote system will be allowed to send
++     whatever grades of work it chooses.
++
++`called-timegrade CHARACTER STRING'
++     The CHARACTER is a single character `A' to `Z', `a' to `z', or `0'
++     to `9' and specifies a grade.  The STRING is a time string (*note
++     Time Strings::).  If a call is received from the other system
++     during a time which matches the time string, only jobs of grade
++     CHARACTER or higher will be sent to the remote system.  This
++     allows the job grade to be set for incoming calls, overriding any
++     request made by the remote uucico.  As noted above, job grades are
++     historically somewhat arbitrary, so specifying a grade will only be
++     meaningful if the other system cooperates in assigning grades.
++     This grade restriction only applies to jobs on the local system;
++     it does not affect the jobs transferred by the remote system.
++     This grade restriction only applies when the other system calls
++     in, not when the other system is called.
++
++     The `called-timegrade' command may appear multiple times.  If this
++     command does not appear, or if none of the time strings match, any
++     grade may be sent to the remote system upon receiving a call.
++
++
++\x1f
++File: uucp.info,  Node: Placing the Call,  Next: Logging In,  Prev: When to Call,  Up: Calling Out
++
++5.7.3.2 Placing the Call
++........................
++
++`speed NUMBER'
++
++`baud NUMBER'
++     Specify the speed (the term "baud" is technically incorrect, but
++     widely understood) at which to call the system.  This will try all
++     available ports with that speed until an unlocked port is found.
++     The ports are defined in the port file.  If both `speed' and
++     `port' commands appear, both are used when selecting a port.  To
++     allow calls at more than one speed, the `alternate' command must be
++     used (*note Defaults and Alternates::).  If this command does not
++     appear, there is no default; the speed may be specified in the port
++     file, but if it is not then the natural speed of the port will be
++     used (whatever that means on the system).  Specifying an explicit
++     speed of 0 will request the natural speed of the port (whatever
++     the system sets it to), overriding any default speed from the
++     defaults at the top of the file.
++
++`port STRING'
++     Name a particular port or type of port to use when calling the
++     system.  The information for this port is obtained from the port
++     file.  If this command does not appear, there is no default; a
++     port must somehow be specified in order to call out (it may be
++     specified implicitly using the `speed' command or explicitly using
++     the next version of `port').  There may be many ports with the
++     same name; each will be tried in turn until an unlocked one is
++     found which matches the desired speed.
++
++`port STRING ...'
++     If more than one string follows the `port' command, the strings are
++     treated as a command that might appear in the port file (*note
++     port File::).  If a port is named (by using a single string
++     following `port') these commands are ignored; their purpose is to
++     permit defining the port completely in the system file rather than
++     always requiring entries in two different files.  In order to call
++     out, a port must be specified using some version of the `port'
++     command, or by using the `speed' command to select ports from the
++     port file.
++
++`phone STRING'
++`address STRING'
++     Give a phone number to call (when using a modem port) or a remote
++     host to contact (when using a TCP or TLI port).  The commands
++     `phone' and `address' are equivalent; the duplication is intended
++     to provide a mnemonic choice depending on the type of port in use.
++
++     When used with a modem port, an `=' character in the phone number
++     means to wait for a secondary dial tone (although only some modems
++     support this); a `-' character means to pause while dialing for 1
++     second (again, only some modems support this).  If the system has
++     more than one phone number, each one must appear in a different
++     alternate.  The `phone' command must appear in order to call out
++     on a modem; there is no default.
++
++     When used with a TCP port, the string names the host to contact.
++     It may be a domain name or a numeric Internet address.  If no
++     address is specified, the system name is used.
++
++     When used with a TLI port, the string is treated as though it were
++     an expect string in a chat script, allowing the use of escape
++     characters (*note Chat Scripts::).  The `dialer-sequence' command
++     in the port file may override this address (*note port File::).
++
++     When used with a port that not a modem or TCP or TLI, this command
++     is ignored.
++
++
++\x1f
++File: uucp.info,  Node: Logging In,  Prev: Placing the Call,  Up: Calling Out
++
++5.7.3.3 Logging In
++..................
++
++`chat STRINGS'
++
++`chat-timeout NUMBER'
++
++`chat-fail STRING'
++
++`chat-seven-bit BOOLEAN'
++
++`chat-program STRINGS'
++     These commands describe a chat script to use when logging on to a
++     remote system.  This login chat script is run after any chat
++     script defined in the `dial' file (*note dial File::).  Chat
++     scripts are explained in *note Chat Scripts::.
++
++     Two additional escape sequences may be used in send strings.
++
++    `\L'
++          Send the login name, as set by the `call-login' command.
++
++    `\P'
++          Send the password, as set by the `call-password' command.
++
++     Three additional escape sequences may be used with the
++     `chat-program' command.  These are `\L' and `\P', which become the
++     login name and password, respectively, and `\Z', which becomes the
++     name of the system of being called.
++
++     The default chat script is:
++
++          chat "" \r\c ogin:-BREAK-ogin:-BREAK-ogin: \L word: \P
++
++     This will send a carriage return (the `\c' suppresses the
++     additional trailing carriage return that would otherwise be sent)
++     and waits for the string `ogin:' (which would be the last part of
++     the `login:' prompt supplied by a Unix system).  If it doesn't see
++     `ogin:', it sends a break and waits for `ogin:' again.  If it
++     still doesn't see `ogin:', it sends another break and waits for
++     `ogin:' again.  If it still doesn't see `ogin:', the chat script
++     aborts and hangs up the phone.  If it does see `ogin:' at some
++     point, it sends the login name (as specified by the `call-login'
++     command) followed by a carriage return (since all send strings are
++     followed by a carriage return unless `\c' is used) and waits for
++     the string `word:' (which would be the last part of the
++     `Password:' prompt supplied by a Unix system).  If it sees
++     `word:', it sends the password and a carriage return, completing
++     the chat script.  The program will then enter the handshake phase
++     of the UUCP protocol.
++
++     This chat script will work for most systems, so you will only be
++     required to use the `call-login' and `call-password' commands.  In
++     fact, in the file-wide defaults you could set defaults of
++     `call-login *' and `call-password *'; you would then just have to
++     make an entry for each system in the call-out login file.
++
++     Some systems seem to flush input after the `login:' prompt, so they
++     may need a version of this chat script with a `\d' before the
++     `\L'.  When using UUCP over TCP, some servers will not be handle
++     the initial carriage return sent by this chat script; in this case
++     you may have to specify the simple chat script `ogin: \L word: \P'.
++
++`call-login STRING'
++     Specify the login name to send with `\L' in the chat script.  If
++     the string is `*' (e.g., `call-login *') the login name will be
++     fetched from the call out login name and password file (*note
++     Configuration File Names::).  The string may contain escape
++     sequences as though it were an expect string in a chat script
++     (*note Chat Scripts::).  There is no default.
++
++`call-password STRING'
++     Specify the password to send with `\P' in the chat script.  If the
++     string is `*' (e.g., `call-password *') the password will be
++     fetched from the call-out login name and password file (*note
++     Configuration File Names::).  The string may contain escape
++     sequences as though it were an expect string in a chat script
++     (*note Chat Scripts::).  There is no default.
++
++
++\x1f
++File: uucp.info,  Node: Accepting a Call,  Next: Protocol Selection,  Prev: Calling Out,  Up: sys File
++
++5.7.4 Accepting a Call
++----------------------
++
++`called-login STRINGS'
++     The first STRING specifies the login name that the system must use
++     when calling in.  If it is `ANY' (e.g., `called-login ANY') any
++     login name may be used; this is useful to override a file-wide
++     default and to indicate that future alternates may have different
++     login names.  Case is significant.  The default value is `ANY'.
++
++     Different alternates (*note Defaults and Alternates::) may use
++     different `called-login' commands, in which case the login name
++     will be used to select which alternate is in effect; this will
++     only work if the first alternate (before the first `alternate'
++     command) uses the `called-login' command.
++
++     Additional strings may be specified after the login name; they are
++     a list of which systems are permitted to use this login name.  If
++     this feature is used, then normally the login name will only be
++     given in a single `called-login' command.  Only systems which
++     appear on the list, or which use an explicit `called-login'
++     command, will be permitted to use that login name.  If the same
++     login name is used more than once with a list of systems, all the
++     lists are concatenated together.  This feature permits you to
++     restrict a login name to a particular set of systems without
++     requiring you to use the `called-login' command for every single
++     system; you can achieve a similar effect by using a different
++     system file for each permitted login name with an appropriate
++     `called-login' command in the file-wide defaults.
++
++`callback BOOLEAN'
++     If BOOLEAN is true, then when the remote system calls `uucico'
++     will hang up the connection and prepare to call it back.  The
++     default is false.
++
++`called-chat STRINGS'
++
++`called-chat-timeout NUMBER'
++
++`called-chat-fail STRING'
++
++`called-chat-seven-bit BOOLEAN'
++
++`called-chat-program STRINGS'
++     These commands may be used to define a chat script (*note Chat
++     Scripts::) that is run whenever the local system is called by the
++     system being defined.  The chat script defined by the `chat'
++     command (*note Logging In::), on the other hand, is used when the
++     remote system is called.  This called chat script might be used to
++     set special modem parameters that are appropriate to a particular
++     system.  It is run after protocol negotiation is complete, but
++     before the protocol has been started.  For additional escape
++     sequence which may be used besides those defined for all chat
++     scripts, see *note Logging In::.  There is no default called chat
++     script.  If the called chat script fails, the incoming call will
++     be aborted.
++
++
++\x1f
++File: uucp.info,  Node: Protocol Selection,  Next: File Transfer Control,  Prev: Accepting a Call,  Up: sys File
++
++5.7.5 Protocol Selection
++------------------------
++
++`protocol STRING'
++     Specifies which protocols to use for the other system, and in which
++     order to use them.  This would not normally be used.  For example,
++     `protocol tfg'.
++
++     The default depends on the characteristics of the port and the
++     dialer, as specified by the `seven-bit' and `reliable' commands.
++     If neither the port nor the dialer use either of these commands,
++     the default is to assume an eight-bit reliable connection.  The
++     commands `seven-bit true' or `reliable false' might be used in
++     either the port or the dialer to change this.  Each protocol has
++     particular requirements that must be met before it will be
++     considered during negotiation with the remote side.
++
++     The `t' and `e' protocols are intended for use over TCP or some
++     other communication path with end to end reliability, as they do no
++     checking of the data at all.  They will only be considered on a
++     TCP port which is both reliable and eight bit.  For technical
++     details, see *note t Protocol::, and *note e Protocol::.
++
++     The `i' protocol is a bidirectional protocol.  It requires an
++     eight-bit connection.  It will run over a half-duplex link, such as
++     Telebit modems in PEP mode, but for efficient use of such a
++     connection you must use the `half-duplex' command (*note port
++     File::).  *Note i Protocol::.
++
++     The `g' protocol is robust, but requires an eight-bit connection.
++     *Note g Protocol::.
++
++     The `G' protocol is the System V Release 4 version of the `g'
++     protocol.  *Note Big G Protocol::.
++
++     The `a' protocol is a Zmodem like protocol, contributed by Doug
++     Evans.  It requires an eight-bit connection, but unlike the `g' or
++     `i' protocol it will work if certain control characters may not be
++     transmitted.
++
++     The `j' protocol is a variant of the `i' protocol which can avoid
++     certain control characters.  The set of characters it avoids can
++     be set by a parameter.  While it technically does not require an
++     eight bit connection (it could be configured to avoid all
++     characters with the high bit set) it would be very inefficient to
++     use it over one.  It is useful over a eight-bit connection that
++     will not transmit certain control characters.  *Note j Protocol::.
++
++     The `f' protocol is intended for use with X.25 connections; it
++     checksums each file as a whole, so any error causes the entire
++     file to be retransmitted.  It requires a reliable connection, but
++     only uses seven-bit transmissions.  It is a streaming protocol,
++     so, while it can be used on a serial port, the port must be
++     completely reliable and flow controlled; many aren't.  *Note f
++     Protocol::.
++
++     The `v' protocol is the `g' protocol as used by the DOS program
++     UUPC/Extended.  It is provided only so that UUPC/Extended users
++     can use it; there is no particular reason to select it.  *Note v
++     Protocol::.
++
++     The `y' protocol is an efficient streaming protocol.  It does error
++     checking, but when it detects an error it immediately aborts the
++     connection.  This requires a reliable, flow controlled, eight-bit
++     connection.  In practice, it is only useful on a connection that is
++     nearly always error-free.  Unlike the `t' and `e' protocols, the
++     connection need not be entirely error-free, so the `y' protocol
++     can be used on a serial port.  *Note y Protocol::.
++
++     The protocols will be considered in the order shown above.  This
++     means that if neither the `seven-bit' nor the `reliable' command
++     are used, the `t' protocol will be used over a TCP connection and
++     the `i' protocol will be used over any other type of connection
++     (subject, of course, to what is supported by the remote system; it
++     may be assumed that all systems support the `g' protocol).
++
++     Note that currently specifying both `seven-bit true' and `reliable
++     false' will not match any protocol.  If this occurs through a
++     combination of port and dialer specifications, you will have to
++     use the `protocol' command for the system or no protocol will be
++     selected at all (the only reasonable choice would be `protocol f').
++
++     A protocol list may also be specified for a port (*note port
++     File::), but, if there is a list for the system, the list for the
++     port is ignored.
++
++`protocol-parameter CHARACTER STRING ...'
++     CHARACTER is a single character specifying a protocol.  The
++     remaining strings are a command specific to that protocol which
++     will be executed if that protocol is used.  A typical command is
++     something like `window 7'.  The particular commands are protocol
++     specific.
++
++     The `i' protocol supports the following commands, all of which take
++     numeric arguments:
++
++    `window'
++          The window size to request the remote system to use.  This
++          must be between 1 and 16 inclusive.  The default is 16.
++
++    `packet-size'
++          The packet size to request the remote system to use.  This
++          must be between 1 and 4095 inclusive.  The default is 1024.
++
++    `remote-packet-size'
++          If this is between 1 and 4095 inclusive, the packet size
++          requested by the remote system is ignored, and this is used
++          instead.  The default is 0, which means that the remote
++          system's request is honored.
++
++    `sync-timeout'
++          The length of time, in seconds, to wait for a SYNC packet
++          from the remote system.  SYNC packets are exchanged when the
++          protocol is started.  The default is 10.
++
++    `sync-retries'
++          The number of times to retry sending a SYNC packet before
++          giving up.  The default is 6.
++
++    `timeout'
++          The length of time, in seconds, to wait for an incoming
++          packet before sending a negative acknowledgement.  The
++          default is 10.
++
++    `retries'
++          The number of times to retry sending a packet or a negative
++          acknowledgement before giving up and closing the connection.
++          The default is 6.
++
++    `errors'
++          The maximum number of errors to permit before closing the
++          connection.  The default is 100.
++
++    `error-decay'
++          The rate at which to ignore errors.  Each time this many
++          packets are received, the error count is decreased by one, so
++          that a long connection with an occasional error will not
++          exceed the limit set by `errors'.  The default is 10.
++
++    `ack-frequency'
++          The number of packets to receive before sending an
++          acknowledgement.  The default is half the requested window
++          size, which should provide good performance in most cases.
++
++     The `g', `G' and `v' protocols support the following commands, all
++     of which take numeric arguments, except `short-packets' which
++     takes a boolean argument:
++
++    `window'
++          The window size to request the remote system to use.  This
++          must be between 1 and 7 inclusive.  The default is 7.
++
++    `packet-size'
++          The packet size to request the remote system to use.  This
++          must be a power of 2 between 32 and 4096 inclusive.  The
++          default is 64 for the `g' and `G' protocols and 1024 for the
++          `v' protocol.  Many older UUCP packages do not support packet
++          sizes larger than 64, and many others do not support packet
++          sizes larger than 128.  Some UUCP packages will even dump
++          core if a larger packet size is requested.  The packet size
++          is not a negotiation, and it may be different in each
++          direction.  If you request a packet size larger than the
++          remote system supports, you will not be able to send any
++          files.
++
++    `startup-retries'
++          The number of times to retry the initialization sequence.
++          The default is 8.
++
++    `init-retries'
++          The number of times to retry one phase of the initialization
++          sequence (there are three phases).  The default is 4.
++
++    `init-timeout'
++          The timeout in seconds for one phase of the initialization
++          sequence.  The default is 10.
++
++    `retries'
++          The number of times to retry sending either a data packet or
++          a request for the next packet.  The default is 6.
++
++    `timeout'
++          The timeout in seconds when waiting for either a data packet
++          or an acknowledgement.  The default is 10.
++
++    `garbage'
++          The number of unrecognized bytes to permit before dropping the
++          connection.  This must be larger than the packet size.  The
++          default is 10000.
++
++    `errors'
++          The number of errors (malformed packets, out of order
++          packets, bad checksums, or packets rejected by the remote
++          system) to permit before dropping the connection.  The
++          default is 100.
++
++    `error-decay'
++          The rate at which to ignore errors.  Each time this many
++          packets are received, the error count is decreased by one, so
++          that a long connection with an occasional error will not
++          exceed the limit set by `errors'.  The default is 10.
++
++    `remote-window'
++          If this is between 1 and 7 inclusive, the window size
++          requested by the remote system is ignored and this is used
++          instead.  This can be useful when dealing with some poor UUCP
++          packages.  The default is 0, which means that the remote
++          system's request is honored.
++
++    `remote-packet-size'
++          If this is between 32 and 4096 inclusive the packet size
++          requested by the remote system is ignored and this is used
++          instead.  There is probably no good reason to use this.  The
++          default is 0, which means that the remote system's request is
++          honored.
++
++    `short-packets'
++          If this is true, then the code will optimize by sending
++          shorter packets when there is less data to send.  This
++          confuses some UUCP packages, such as System V Release 4 (when
++          using the `G' protocol) and Waffle; when connecting to such a
++          package, this parameter must be set to false.  The default is
++          true for the `g' and `v' protocols and false for the `G'
++          protocol.
++
++     The `a' protocol is a Zmodem like protocol contributed by Doug
++     Evans.  It supports the following commands, all of which take
++     numeric arguments except for `escape-control', which takes a
++     boolean argument:
++
++    `timeout'
++          Number of seconds to wait for a packet to arrive.  The
++          default is 10.
++
++    `retries'
++          The number of times to retry sending a packet.  The default
++          is 10.
++
++    `startup-retries'
++          The number of times to retry sending the initialization
++          packet.  The default is 4.
++
++    `garbage'
++          The number of garbage characters to accept before closing the
++          connection.  The default is 2400.
++
++    `send-window'
++          The number of characters that may be sent before waiting for
++          an acknowledgement.  The default is 1024.
++
++    `escape-control'
++          Whether to escape control characters.  If this is true, the
++          protocol may be used over a connection which does not
++          transmit certain control characters, such as `XON' or `XOFF'.
++          The connection must still transmit eight bit characters other
++          than control characters.  The default is false.
++
++     The `j' protocol can be used over an eight bit connection that will
++     not transmit certain control characters.  It accepts the same
++     protocol parameters that the `i' protocol accepts, as well as one
++     more:
++
++    `avoid'
++          A list of characters to avoid.  This is a string which is
++          interpreted as an escape sequence (*note Chat Scripts::).
++          The protocol does not have a way to avoid printable ASCII
++          characters (byte values from 32 to 126, inclusive); only
++          ASCII control characters and eight-bit characters may be
++          avoided.  The default value is `\021\023'; these are the
++          characters `XON' and `XOFF', which many connections use for
++          flow control.  If the package is configured to use
++          `HAVE_BSD_TTY', then on some versions of Unix you may have to
++          avoid `\377' as well, due to the way some implementations of
++          the BSD terminal driver handle signals.
++
++     The `f' protocol is intended for use with error-correcting modems
++     only; it checksums each file as a whole, so any error causes the
++     entire file to be retransmitted.  It supports the following
++     commands, both of which take numeric arguments:
++
++    `timeout'
++          The timeout in seconds before giving up.  The default is 120.
++
++    `retries'
++          How many times to retry sending a file.  The default is 2.
++
++     The `t' and `e' protocols are intended for use over TCP or some
++     other communication path with end to end reliability, as they do no
++     checking of the data at all.  They both support a single command,
++     which takes a numeric argument:
++
++    `timeout'
++          The timeout in seconds before giving up.  The default is 120.
++
++     The `y' protocol is a streaming protocol contributed by Jorge Cwik.
++     It supports the following commands, both of which take numeric
++     arguments:
++
++    `timeout'
++          The timeout in seconds when waiting for a packet.  The
++          default is 60.
++
++    `packet-size'
++          The packet size to use.  The default is 1024.
++
++     The protocol parameters are reset to their default values after
++     each call.
++
++
++\x1f
++File: uucp.info,  Node: File Transfer Control,  Next: Miscellaneous (sys),  Prev: Protocol Selection,  Up: sys File
++
++5.7.6 File Transfer Control
++---------------------------
++
++`send-request BOOLEAN'
++     The BOOLEAN determines whether the remote system is permitted to
++     request files from the local system.  The default is yes.
++
++`receive-request BOOLEAN'
++     The BOOLEAN determines whether the remote system is permitted to
++     send files to the local system.  The default is yes.
++
++`request BOOLEAN'
++     A shorthand command, equivalent to specifying both `send-request
++     BOOLEAN' and `receive-request BOOLEAN'.
++
++`call-transfer BOOLEAN'
++     The BOOLEAN is checked when the local system places the call.  It
++     determines whether the local system may do file transfers queued
++     up for the remote system.  The default is yes.
++
++`called-transfer BOOLEAN'
++     The BOOLEAN is checked when the remote system calls in.  It
++     determines whether the local system may do file transfers queued
++     up for the remote system.  The default is yes.
++
++`transfer BOOLEAN'
++     A shorthand command, equivalent to specifying both `call-transfer
++     BOOLEAN' and `called-transfer BOOLEAN'.
++
++`call-local-size NUMBER STRING'
++     The STRING is a time string (*note Time Strings::).  The NUMBER is
++     the size in bytes of the largest file that should be transferred
++     at a time matching the time string, if the local system placed the
++     call and the request was made by the local system.  This command
++     may appear multiple times in a single alternate.  If this command
++     does not appear, or if none of the time strings match, there are
++     no size restrictions.
++
++     With all the size control commands, the size of a file from the
++     remote system (as opposed to a file from the local system) will
++     only be checked if the other system is running this package: other
++     UUCP packages will not understand a maximum size request, nor will
++     they provide the size of remote files.
++
++`call-remote-size NUMBER STRING'
++     Specify the size in bytes of the largest file that should be
++     transferred at a given time by remote request, when the local
++     system placed the call.  This command may appear multiple times in
++     a single alternate.  If this command does not appear, there are no
++     size restrictions.
++
++`called-local-size NUMBER STRING'
++     Specify the size in bytes of the largest file that should be
++     transferred at a given time by local request, when the remote
++     system placed the call.  This command may appear multiple times in
++     a single alternate. If this command does not appear, there are no
++     size restrictions.
++
++`called-remote-size NUMBER STRING'
++     Specify the size in bytes of the largest file that should be
++     transferred at a given time by remote request, when the remote
++     system placed the call.  This command may appear multiple times in
++     a single alternate. If this command does not appear, there are no
++     size restrictions.
++
++`local-send STRINGS'
++     Specifies that files in the directories named by the STRINGS may
++     be sent to the remote system when requested locally (using `uucp'
++     or `uux').  The directories in the list should be separated by
++     whitespace.  A `~' may be used for the public directory.  On a
++     Unix system, this is typically `/usr/spool/uucppublic'; the public
++     directory may be set with the `pubdir' command.  Here is an
++     example of `local-send':
++
++          local-send ~ /usr/spool/ftp/pub
++
++     Listing a directory allows all files within the directory and all
++     subdirectories to be sent.  Directories may be excluded by
++     preceding them with an exclamation point.  For example:
++
++          local-send /usr/ftp !/usr/ftp/private ~
++
++     means that all files in `/usr/ftp' or the public directory may be
++     sent, except those files in `/usr/ftp/private'.  The list of
++     directories is read from left to right, and the last directory to
++     apply takes effect; this means that directories should be listed
++     from top down.  The default is the root directory (i.e., any file
++     at all may be sent by local request).
++
++`remote-send STRINGS'
++     Specifies that files in the named directories may be sent to the
++     remote system when requested by the remote system.  The default is
++     `~'.
++
++`local-receive STRINGS'
++     Specifies that files may be received into the named directories
++     when requested by a local user.  The default is `~'.
++
++`remote-receive STRINGS'
++     Specifies that files may be received into the named directories
++     when requested by the remote system.  The default is `~'.  On
++     Unix, the remote system may only request that files be received
++     into directories that are writeable by the world, regardless of
++     how this is set.
++
++`forward-to STRINGS'
++     Specifies a list of systems to which files may be forwarded.  The
++     remote system may forward files through the local system on to any
++     of the systems in this list.  The string `ANY' may be used to
++     permit forwarding to any system.  The default is to not permit
++     forwarding to other systems.  Note that if the remote system is
++     permitted to execute the `uucp' command, it effectively has the
++     ability to forward to any system.
++
++`forward-from STRINGS'
++     Specifies a list of systems from which files may be forwarded.  The
++     remote system may request files via the local system from any of
++     the systems in this list.  The string `ANY' may be used to permit
++     forwarding to any system.  The default is to not permit forwarding
++     from other systems.  Note that if a remote system is permitted to
++     execute the `uucp' command, it effectively has the ability to
++     request files from any system.
++
++`forward STRINGS'
++     Equivalent to specifying both `forward-to STRINGS' and
++     `forward-from STRINGS'.  This would normally be used rather than
++     either of the more specific commands.
++
++`max-file-time NUMBER'
++     The maximum amount of time which will be sent sending any one file
++     if there are other files to send.  This will only be effective
++     when using a protocol which permits interrupting one file send to
++     send another file.  This is true of the `i' and `j' protocols.
++     The default is to have no maximum.
++
++
++\x1f
++File: uucp.info,  Node: Miscellaneous (sys),  Next: Default sys File Values,  Prev: File Transfer Control,  Up: sys File
++
++5.7.7 Miscellaneous sys File Commands
++-------------------------------------
++
++`sequence BOOLEAN'
++     If BOOLEAN is true, then conversation sequencing is automatically
++     used for the remote system, so that if somebody manages to spoof
++     as the remote system, it will be detected the next time the remote
++     system actually calls.  This is false by default.
++
++`command-path STRINGS'
++     Specifies the path (a list of whitespace separated directories) to
++     be searched to locate commands to execute.  This is only used for
++     commands requested by `uux', not for chat programs.  The default
++     is from `policy.h'.
++
++`commands STRINGS'
++     The list of commands which the remote system is permitted to
++     execute locally.  For example: `commands rnews rmail'.  If the
++     value is `ALL' (case significant), all commands may be executed.
++     The default is `rnews rmail'.
++
++`free-space NUMBER'
++     Specify the minimum amount of file system space (in bytes) to
++     leave free after receiving a file.  If the incoming file will not
++     fit, it will be rejected.  This initial rejection will only work
++     when talking to another instance of this package, since older UUCP
++     packages do not provide the file size of incoming files.  Also,
++     while a file is being received, `uucico' will periodically check
++     the amount of free space.  If it drops below the amount given by
++     the `free-space' command, the file transfer will be aborted.  The
++     default amount of space to leave free is from `policy.h'.  This
++     file space checking may not work on all systems.
++
++`pubdir STRING'
++     Specifies the public directory that is used when `~' is specifed in
++     a file transfer or a list of directories.  This essentially
++     overrides the public directory specified in the main configuration
++     file for this system only.  The default is the public directory
++     specified in the main configuration file (which defaults to a
++     value from `policy.h').
++
++`debug STRING ...'
++     Set additional debugging for calls to or from the system.  This
++     may be used to debug a connection with a specific system.  It is
++     particularly useful when debugging incoming calls, since debugging
++     information will be generated whenever the call comes in.  See the
++     `debug' command in the main configuration file (*note Debugging
++     Levels::) for more details.  The debugging information specified
++     here is in addition to that specified in the main configuration
++     file or on the command line.
++
++`max-remote-debug STRING ...'
++     When the system calls in, it may request that the debugging level
++     be set to a certain value.  The `max-remote-debug' command may be
++     used to put a limit on the debugging level which the system may
++     request, to avoid filling up the disk with debugging information.
++     Only the debugging types named in the `max-remote-debug' command
++     may be turned on by the remote system.  To prohibit any debugging,
++     use `max-remote-debug none'.
++
++
++\x1f
++File: uucp.info,  Node: Default sys File Values,  Prev: Miscellaneous (sys),  Up: sys File
++
++5.7.8 Default sys File Values
++-----------------------------
++
++The following are used as default values for all systems; they can be
++considered as appearing before the start of the file.
++
++     time Never
++     chat "" \r\c ogin:-BREAK-ogin:-BREAK-ogin: \L word: \P
++     chat-timeout 10
++     callback n
++     sequence n
++     request y
++     transfer y
++     local-send /
++     remote-send ~
++     local-receive ~
++     remove-receive ~
++     command-path [ from `policy.h' ]
++     commands rnews rmail
++     max-remote-debug abnormal,chat,handshake
++
++\x1f
++File: uucp.info,  Node: port File,  Next: dial File,  Prev: sys File,  Up: Configuration Files
++
++5.8 The Port Configuration File
++===============================
++
++The port files may be used to name and describe ports.  By default there
++is a single port file, named `port' in the directory NEWCONFIGDIR.
++This may be overridden by the `portfile' command in the main
++configuration file; see *note Configuration File Names::.
++
++   Any commands in a port file before the first `port' command specify
++defaults for all ports in the file; however, since the `type' command
++must appear before all other commands for a port, the defaults are only
++useful if all ports in the file are of the same type (this restriction
++may be lifted in a later version).  All commands after a `port' command
++up to the next `port' command then describe that port.  There are
++different types of ports; each type supports its own set of commands.
++Each command indicates which types of ports support it.  There may be
++many ports with the same name; if a system requests a port by name then
++each port with that name will be tried until an unlocked one is found.
++
++`port STRING'
++     Introduces and names a port.
++
++`type STRING'
++     Define the type of port.  The default is `modem'.  If this command
++     appears, it must immediately follow the `port' command.  The type
++     defines what commands are subsequently allowed.  Currently the
++     types are:
++
++    `modem'
++          For a modem hookup.
++
++    `stdin'
++          For a connection through standard input and standard output,
++          as when `uucico' is run as a login shell.
++
++    `direct'
++          For a direct connection to another system.
++
++    `tcp'
++          For a connection using TCP.
++
++    `tli'
++          For a connection using TLI.
++
++    `pipe'
++          For a connection through a pipe running another program.
++
++`protocol STRING'
++     Specify a list of protocols to use for this port.  This is just
++     like the corresponding command for a system (*note Protocol
++     Selection::).  A protocol list for a system takes precedence over
++     a list for a port.
++
++`protocol-parameter CHARACTER STRINGS [ any type ]'
++     The same command as the `protocol-parameter' command used for
++     systems (*note Protocol Selection::).  This one takes precedence.
++
++`seven-bit BOOLEAN [ any type ]'
++     This is only used during protocol negotiation; if the argument is
++     true, it forces the selection of a protocol which works across a
++     seven-bit link.  It does not prevent eight bit characters from
++     being transmitted.  The default is false.
++
++`reliable BOOLEAN [ any type ]'
++     This is only used during protocol negotiation; if the argument is
++     false, it forces the selection of a protocol which works across an
++     unreliable communication link.  The default is true.  It would be
++     more common to specify this for a dialer rather than a port.
++
++`half-duplex BOOLEAN [ any type ]'
++     If the argument is true, it means that the port only supports
++     half-duplex connections.  This only affects bidirectional
++     protocols, and causes them to not do bidirectional transfers.
++
++`device STRING [ modem, direct and tli only ]'
++     Names the device associated with this port.  If the device is not
++     named, the port name is taken as the device.  Device names are
++     system dependent.  On Unix, a modem or direct connection might be
++     something like `/dev/ttyd0'; a TLI port might be `/dev/inet/tcp'.
++
++`speed NUMBER [modem and direct only ]'
++
++`baud NUMBER [ modem and direct only ]'
++     The speed this port runs at.  If a system specifies a speed but no
++     port name, then all ports which match the speed will be tried in
++     order.  If the speed is not specified here and is not specified by
++     the system, the natural speed of the port will be used by default.
++
++`speed-range NUMBER NUMBER [ modem only ]'
++
++`baud-range NUMBER NUMBER [ modem only ]'
++     Specify a range of speeds this port can run at.  The first number
++     is the minimum speed, the second number is the maximum speed.
++     These numbers will be used when matching a system which specifies
++     a desired speed.  The simple `speed' (or `baud') command is still
++     used to determine the speed to run at if the system does not
++     specify a speed.  For example, the command `speed-range 300 19200'
++     means that the port will match any system which uses a speed from
++     300 to 19200 baud (and will use the speed specified by the
++     system); this could be combined with `speed 2400', which means
++     that when this port is used with a system that does not specify a
++     speed, the port will be used at 2400 baud.
++
++`carrier BOOLEAN [ modem and direct only ]'
++     The argument indicates whether the port supports carrier.
++
++     If a modem port does not support carrier, the carrier detect
++     signal will never be required on this port, regardless of what the
++     modem chat script indicates.  The default for a modem port is true.
++
++     If a direct port supports carrier, the port will be set to expect
++     carrier whenever it is used.  The default for a direct port is
++     false.
++
++`hardflow BOOLEAN [ modem and direct only ]'
++     The argument indicates whether the port supports hardware flow
++     control.  If it does not, hardware flow control will not be turned
++     on for this port.  The default is true.  Hardware flow control is
++     only supported on some systems.
++
++`dial-device STRING [ modem only ]'
++     Dialing instructions should be output to the named device, rather
++     than to the normal port device.  The default is to output to the
++     normal port device.
++
++`dialer STRING [ modem only ]'
++     Name a dialer to use.  The information is looked up in the dial
++     file.  There is no default.  Some sort of dialer information must
++     be specified to call out on a modem.
++
++`dialer STRING ... [ modem only ]'
++     If more than one string follows the `dialer' command, the strings
++     are treated as a command that might appear in the dial file (*note
++     dial File::).  If a dialer is named (by using the first form of
++     this command, described just above), these commands are ignored.
++     They may be used to specify dialer information directly in simple
++     situations without needing to go to a separate file.  There is no
++     default.  Some sort of dialer information must be specified to
++     call out on a modem.
++
++`dialer-sequence STRINGS [ modem or tcp or tli only ]'
++     Name a sequence of dialers and tokens (phone numbers) to use.  The
++     first argument names a dialer, and the second argument names a
++     token.  The third argument names another dialer, and so on.  If
++     there are an odd number of arguments, the phone number specified
++     with a `phone' command in the system file is used as the final
++     token.  The token is what is used for `\D' or `\T' in the dialer
++     chat script.  If the token in this string is `\D', the system
++     phone number will be used; if it is `\T', the system phone number
++     will be used after undergoing dialcodes translation.  A missing
++     final token is taken as `\D'.
++
++     This command currently does not work if `dial-device' is specified;
++     to handle this correctly will require a more systematic notion of
++     chat scripts.  Moreover, the `complete' and `abort' chat scripts,
++     the protocol parameters, and the `carrier' and `dtr-toggle'
++     commands are ignored for all but the first dialer.
++
++     This command basically lets you specify a sequence of chat scripts
++     to use.  For example, the first dialer might get you to a local
++     network and the second dialer might describe how to select a
++     machine from the local network.  This lets you break your dialing
++     sequence into simple modules, and may make it easier to share
++     dialer entries between machines.
++
++     This command is to only way to use a chat script with a TCP port.
++     This can be useful when using a modem which is accessed via TCP.
++
++     When this command is used with a TLI port, then if the first
++     dialer is `TLI' or `TLIS' the first token is used as the address to
++     connect to.  If the first dialer is something else, or if there is
++     no token, the address given by the `address' command is used
++     (*note Placing the Call::).  Escape sequences in the address are
++     expanded as they are for chat script expect strings (*note Chat
++     Scripts::).  The different between `TLI' and `TLIS' is that the
++     latter implies the command `stream true'.  These contortions are
++     all for HDB compatibility.  Any subsequent dialers are treated as
++     they are for a TCP port.
++
++`lockname STRING [ modem and direct only ]'
++     Give the name to use when locking this port.  On Unix, this is the
++     name of the file that will be created in the lock directory.  It
++     is used as is, so on Unix it should generally start with `LCK..'.
++     For example, if a single port were named both `/dev/ttycu0' and
++     `/dev/tty0' (perhaps with different characteristics keyed on the
++     minor device number), then the command `lockname LCK..ttycu0' could
++     be used to force the latter to use the same lock file name as the
++     former.
++
++`service STRING [ tcp only ]'
++     Name the TCP port number to use.  This may be a number.  If not,
++     it will be looked up in `/etc/services'.  If this is not
++     specified, the string `uucp' is looked up in `/etc/services'.  If
++     it is not found, port number 540 (the standard UUCP-over-TCP port
++     number) will be used.
++
++`version STRING [ tcp only ]'
++     Specify the IP version number to use.  The default is `0', which
++     permits any version.  The other possible choices are `4', which
++     requires `IPv4', or `6', which requires `IPv6'.  Normally it is
++     not necessary to use this command, but in some cases, as `IPv6' is
++     rolled out across the Internet, it may be necessary to require
++     UUCP to use a particular type of connection.
++
++`push STRINGS [ tli only ]'
++     Give a list of modules to push on to the TLI stream.
++
++`stream BOOLEAN [ tli only ]'
++     If this is true, and the `push' command was not used, the `tirdwr'
++     module is pushed on to the TLI stream.
++
++`server-address STRING [ tli only ]'
++     Give the address to use when running as a TLI server.  Escape
++     sequences in the address are expanded as they are for chat script
++     expect strings (*note Chat Scripts::).
++
++     The string is passed directly to the TLI `t_bind' function.  The
++     value needed may depend upon your particular TLI implementation.
++     Check the manual pages, and, if necessary, try writing some sample
++     programs.
++
++     For AT&T 3B2 System V Release 3 using the Wollongong TCP/IP stack,
++     which is probably typical, the format of TLI string is `SSPPIIII',
++     where `SS' is the service number (for TCP, this is 2), `PP' is the
++     TCP port number, and `IIII' is the Internet address.  For example,
++     to accept a connection from on port 540 from any interface, use
++     `server-address \x00\x02\x02\x1c\x00\x00\x00\x00'.  To only accept
++     connections from a particular interface, replace the last four
++     digits with the network address of the interface.  (Thanks to Paul
++     Pryor for the information in this paragraph).
++
++`command STRINGS [ pipe only ]'
++     Give the command, with arguments, to run when using a pipe port
++     type.  When a port of this type is used, the command is executed
++     and `uucico' communicates with it over a pipe.  This permits
++     `uucico' or `cu' to communicate with another system which can only
++     be reached through some unusual means.  A sample use might be
++     `command /bin/rlogin -E -8 -l LOGIN SYSTEM'.  The command is run
++     with the full privileges of UUCP; it is responsible for
++     maintaining security.
++
++
++\x1f
++File: uucp.info,  Node: dial File,  Next: UUCP Over TCP,  Prev: port File,  Up: Configuration Files
++
++5.9 The Dialer Configuration File
++=================================
++
++The dialer configuration files define dialers.  By default there is a
++single dialer file, named `dial' in the directory NEWCONFIGDIR.  This
++may be overridden by the `dialfile' command in the main configuration
++file; see *note Configuration File Names::.
++
++   Any commands in the file before the first `dialer' command specify
++defaults for all the dialers in the file.  All commands after a
++`dialer' command up to the next `dialer' command are associated with
++the named dialer.
++
++`dialer STRING'
++     Introduces and names a dialer.
++
++`chat STRINGS'
++
++`chat-timeout NUMBER'
++
++`chat-fail STRING'
++
++`chat-seven-bit BOOLEAN'
++
++`chat-program STRINGS'
++     Specify a chat script to be used to dial the phone.  This chat
++     script is used before the login chat script in the `sys' file, if
++     any (*note Logging In::).  For full details on chat scripts, see
++     *note Chat Scripts::.
++
++     The `uucico' daemon will sleep for one second between attempts to
++     dial out on a modem.  If your modem requires a longer wait period,
++     you must start your chat script with delays (`\d' in a send
++     string).
++
++     The chat script will be read from and sent to the port specified
++     by the `dial-device' command for the port, if there is one.
++
++     The following escape addition escape sequences may appear in send
++     strings:
++
++    `\D'
++          send phone number without dialcode translation
++
++    `\T'
++          send phone number with dialcode translation
++
++     See the description of the dialcodes file (*note Configuration
++     File Names::) for a description of dialcode translation.
++
++     If both the port and the dialer support carrier, as set by the
++     `carrier' command in the port file and the `carrier' command in
++     the dialer file, then every chat script implicitly begins with
++     `\M' and ends with `\m'.
++
++     There is no default chat script for dialers.
++
++     The following additional escape sequences may be used in
++     `chat-program':
++
++    `\D'
++          phone number without dialcode translation
++
++    `\T'
++          phone number with dialcode translation
++
++     If the program changes the port in any way (e.g., sets parity) the
++     changes will be preserved during protocol negotiation, but once the
++     protocol is selected it will change the port settings.
++
++`dialtone STRING'
++     A string to output when dialing the phone number which causes the
++     modem to wait for a secondary dial tone.  This is used to
++     translate the `=' character in a phone number.  The default is a
++     comma.
++
++`pause STRING'
++     A string to output when dialing the phone number which causes the
++     modem to wait for 1 second.  This is used to translate the `-'
++     character in a phone number.  The default is a comma.
++
++`carrier BOOLEAN'
++     An argument of true means that the dialer supports the modem
++     carrier signal.  After the phone number is dialed, `uucico' will
++     require that carrier be on.  One some systems, it will be able to
++     wait for it.  If the argument is false, carrier will not be
++     required.  The default is true.
++
++`carrier-wait NUMBER'
++     If the port is supposed to wait for carrier, this may be used to
++     indicate how many seconds to wait.  The default is 60 seconds.
++     Only some systems support waiting for carrier.
++
++`dtr-toggle BOOLEAN BOOLEAN'
++     If the first argument is true, then DTR is toggled before using
++     the modem.  This is only supported on some systems and some ports.
++     The second BOOLEAN need not be present; if it is, and it is true,
++     the program will sleep for 1 second after toggling DTR.  The
++     default is to not toggle DTR.
++
++`complete-chat STRINGS'
++
++`complete-chat-timeout NUMBER'
++
++`complete-chat-fail STRING'
++
++`complete-chat-seven-bit BOOLEAN'
++
++`complete-chat-program STRINGS'
++     These commands define a chat script (*note Chat Scripts::) which
++     is run when a call is finished normally.  This allows the modem to
++     be reset.  There is no default.  No additional escape sequences
++     may be used.
++
++`complete STRING'
++     This is a simple use of `complete-chat'.  It is equivalent to
++     `complete-chat "" STRING'; this has the effect of sending STRING
++     to the modem when a call finishes normally.
++
++`abort-chat STRINGS'
++
++`abort-chat-timeout NUMBER'
++
++`abort-chat-fail STRING'
++
++`abort-chat-seven-bit BOOLEAN'
++
++`abort-chat-program STRINGS'
++     These commands define a chat script (*note Chat Scripts::) to be
++     run when a call is aborted.  They may be used to interrupt and
++     reset the modem.  There is no default.  No additional escape
++     sequences may be used.
++
++`abort STRING'
++     This is a simple use of `abort-chat'.  It is equivalent to
++     `abort-chat "" STRING'; this has the effect of sending STRING to
++     the modem when a call is aborted.
++
++`protocol-parameter CHARACTER STRINGS'
++     Set protocol parameters, just like the `protocol-parameter' command
++     in the system configuration file or the port configuration file;
++     see *note Protocol Selection::.  These parameters take precedence,
++     then those for the port, then those for the system.
++
++`seven-bit BOOLEAN'
++     This is only used during protocol negotiation; if it is true, it
++     forces selection of a protocol which works across a seven-bit
++     link.  It does not prevent eight bit characters from being
++     transmitted.  The default is false.  It would be more common to
++     specify this for a port than for a dialer.
++
++`reliable BOOLEAN'
++     This is only used during protocol negotiation; if it is false, it
++     forces selection of a protocol which works across an unreliable
++     communication link.  The default is true.
++
++`half-duplex BOOLEAN [ any type ]'
++     If the argument is true, it means that the dialer only supports
++     half-duplex connections.  This only affects bidirectional
++     protocols, and causes them to not do bidirectional transfers.
++
++
++\x1f
++File: uucp.info,  Node: UUCP Over TCP,  Next: Security,  Prev: dial File,  Up: Configuration Files
++
++5.10 UUCP Over TCP
++==================
++
++If your system has a Berkeley style socket library, or a System V style
++TLI interface library, you can compile the code to permit making
++connections over TCP.  Specifying that a system should be reached via
++TCP is easy, but nonobvious.
++
++* Menu:
++
++* TCP Client::                  Connecting to Another System Over TCP
++* TCP Server::                  Running a TCP Server
++
++\x1f
++File: uucp.info,  Node: TCP Client,  Next: TCP Server,  Prev: UUCP Over TCP,  Up: UUCP Over TCP
++
++5.10.1 Connecting to Another System Over TCP
++--------------------------------------------
++
++If you are using the new style configuration files (*note Configuration
++Files::), add the line `port type tcp' to the entry in the `sys' file.
++By default UUCP will get the port number by looking up `uucp' in
++`/etc/services'; if the `uucp' service is not defined, port 540 will be
++used.  You can set the port number to use with the command `port
++service XXX', where XXX can be either a number or a name to look up in
++`/etc/services'.  You can specify the address of the remote host with
++`address A.B.C'; if you don't give an address, the remote system name
++will be used.  You should give an explicit chat script for the system
++when you use TCP; the default chat script begins with a carriage
++return, which will not work with some UUCP TCP servers.
++
++   If you are using V2 configuration files, add a line like this to
++`L.sys':
++     SYS Any TCP uucp HOST.DOMAIN chat-script
++   This will make an entry for system SYS, to be called at any time,
++over TCP, using port number `uucp' (as found in `/etc/services'; this
++may be specified as a number), using remote host `HOST.DOMAIN', with
++some chat script.
++
++   If you are using HDB configuration files, add a line like this to
++Systems:
++     SYS Any TCP - HOST.DOMAIN chat-script
++   and a line like this to `Devices':
++     TCP uucp - -
++   You only need one line in `Devices' regardless of how many systems
++you contact over TCP.  This will make an entry for system SYS, to be
++called at any time, over TCP, using port number `uucp' (as found in
++`/etc/services'; this may be specified as a number), using remote host
++`HOST.DOMAIN', with some chat script.
++
++\x1f
++File: uucp.info,  Node: TCP Server,  Prev: TCP Client,  Up: UUCP Over TCP
++
++5.10.2 Running a TCP Server
++---------------------------
++
++The `uucico' daemon may be run as a TCP server.  To use the default
++port number, which is a reserved port, `uucico' must be invoked by the
++superuser (or it must be set user ID to the superuser, but I don't
++recommend doing that).
++
++   You must define a port, either using the port file (*note port
++File::), if you are using the new configuration method, or with an
++entry in `Devices' if you are using HDB; there is no way to define a
++port using V2.  If you are using HDB the port must be named `TCP'; a
++line as shown above will suffice.  You can then start `uucico' as
++`uucico -p TCP' (after the `-p', name the port; in HDB it must be
++`TCP').  This will wait for incoming connections, and fork off a child
++for each one.  Each connection will be prompted with `login:' and
++`Password:'; the results will be checked against the UUCP (not the
++system) password file (*note Configuration File Names::).
++
++   Another way to run a UUCP TCP server is to use the BSD `uucpd'
++program.
++
++   Yet another way to run a UUCP TCP server is to use `inetd'.  Arrange
++for `inetd' to start up `uucico' with the `-l' switch.  This will cause
++`uucico' to prompt with `login:' and `Password:' and check the results
++against the UUCP (not the system) password file (you may want to also
++use the `-D' switch to avoid a fork, which in this case is unnecessary).
++
++\x1f
++File: uucp.info,  Node: Security,  Prev: UUCP Over TCP,  Up: Configuration Files
++
++5.11 Security
++=============
++
++This discussion of UUCP security applies only to Unix.  It is a bit
++cursory; suggestions for improvement are solicited.
++
++   UUCP is traditionally not very secure.  Taylor UUCP addresses some
++security issues, but is still far from being a secure system.
++
++   If security is very important to you, then you should not permit any
++external access to your computer, including UUCP.  Any opening to the
++outside world is a potential security risk.
++
++   When local users use UUCP to transfer files, Taylor UUCP can do
++little to secure them from each other.  You can allow somewhat increased
++security by putting the owner of the UUCP programs (normally `uucp')
++into a separate group; the use of this is explained in the following
++paragraphs, which refer to this separate group as `uucp-group'.
++
++   When the `uucp' program is invoked to copy a file to a remote
++system, it will, by default, copy the file into the UUCP spool
++directory.  When the `uux' program is used, the `-C' switch must be
++used to copy the file into the UUCP spool directory.  In any case, once
++the file has been copied into the spool directory, other local users
++will not be able to access it.
++
++   When a file is requested from a remote system, UUCP will only permit
++it to be placed in a directory which is writable by the requesting user.
++The directory must also be writable by UUCP.  A local user can create a
++directory with a group of `uucp-group' and set the mode to permit group
++write access.  This will allow the file be requested without permitting
++it to be viewed by any other user.
++
++   There is no provision for security for `uucp' requests (as opposed
++to `uux' requests) made by a user on a remote system.  A file sent over
++by a remote request may only be placed in a directory which is world
++writable, and the file will be world readable and writable.  This will
++permit any local user to destroy or replace the contents of the file.
++A file requested by a remote system must be world readable, and the
++directory it is in must be world readable.  Any local user will be able
++to examine, although not necessarily modify, the file before it is sent.
++
++   There are some security holes and race conditions that apply to the
++above discussion which I will not elaborate on.  They are not hidden
++from anybody who reads the source code, but they are somewhat technical
++and difficult (though scarcely impossible) to exploit.  Suffice it to
++say that even under the best of conditions UUCP is not completely
++secure.
++
++   For many sites, security from remote sites is a more important
++consideration.  Fortunately, Taylor UUCP does provide some support in
++this area.
++
++   The greatest security is provided by always dialing out to the other
++site.  This prevents anybody from pretending to be the other site.  Of
++course, only one side of the connection can do this.
++
++   If remote dialins must be permitted, then it is best if the dialin
++line is used only for UUCP.  If this is the case, then you should
++create a call-in password file (*note Configuration File Names::) and
++let `uucico' do its own login prompting.  For example, to let remote
++sites log in on a port named `entry' in the port file (*note port
++File::), you might invoke `uucico -e -p entry'.  This would cause
++`uucico' to enter an endless loop of login prompts and daemon
++executions.  The advantage of this approach is that even if remote users
++break into the system by guessing or learning the password, they will
++only be able to do whatever `uucico' permits them to do.  They will not
++be able to start a shell on your system.
++
++   If remote users can dial in and log on to your system, then you have
++a security hazard more serious than that posed by UUCP.  But then, you
++probably knew that already.
++
++   Once your system has connected with the remote UUCP, there is a fair
++amount of control you can exercise.  You can use the `remote-send' and
++`remote-receive' commands to control the directories the remote UUCP
++can access.  You can use the `request' command to prevent the remote
++UUCP from making any requests of your system at all; however, if you do
++this it will not even be able to send you mail or news.  If you do
++permit remote requests, you should be careful to restrict what commands
++may be executed at the remote system's request.  The default is `rmail'
++and `rnews', which will suffice for most systems.
++
++   If different remote systems call in and they must be granted
++different privileges (perhaps some systems are within the same
++organization and some are not) then the `called-login' command should
++be used for each system to require that they use different login names.
++Otherwise, it would be simple for a remote system to use the `myname'
++command and pretend to be a different system.  The `sequence' command
++can be used to detect when one system pretended to be another, but,
++since the sequence numbers must be reset manually after a failed
++handshake, this can sometimes be more trouble than it's worth.
++
++\x1f
++File: uucp.info,  Node: Protocols,  Next: Hacking,  Prev: Configuration Files,  Up: Top
++
++6 UUCP Protocol Internals
++*************************
++
++This chapter describes how the various UUCP protocols work, and
++discusses some other internal UUCP issues.
++
++   This chapter is quite technical.  You do not need to understand it,
++or even read it, in order to use Taylor UUCP.  It is intended for people
++who are interested in how the UUCP code works.
++
++   The information in this chapter is posted monthly to the Usenet
++newsgroups `comp.mail.uucp', `news.answers', and `comp.answers'.  The
++posting is available from any `news.answers' archive site, such as
++`rtfm.mit.edu'.  If you plan to use this information to write a UUCP
++program, please make sure you get the most recent version of the
++posting, in case there have been any corrections.
++
++* Menu:
++
++* UUCP Protocol Sources::       Sources for UUCP Protocol Information
++* UUCP Grades::                 UUCP Grades
++* UUCP Lock Files::             UUCP Lock Files
++* Execution File Format::       Execution File Format
++* UUCP Protocol::               UUCP Protocol
++* g Protocol::                  g protocol
++* f Protocol::                  f protocol
++* t Protocol::                  t protocol
++* e Protocol::                  e protocol
++* Big G Protocol::              G protocol
++* i Protocol::                  i protocol
++* j Protocol::                  j protocol
++* x Protocol::                  x protocol
++* y Protocol::                  y protocol
++* d Protocol::                  d protocol
++* h Protocol::                  h protocol
++* v Protocol::                  v protocol
++
++\x1f
++File: uucp.info,  Node: UUCP Protocol Sources,  Next: UUCP Grades,  Prev: Protocols,  Up: Protocols
++
++6.1 UUCP Protocol Sources
++=========================
++
++     "Unix-to-Unix Copy Program," said PDP-1.  "You will never find a
++     more wretched hive of bugs and flamers.  We must be cautious."
++                                                              --DECWars
++
++I took a lot of the information from Jamie E. Hanrahan's paper in the
++Fall 1990 DECUS Symposium, and from `Managing UUCP and Usenet' by Tim
++O'Reilly and Grace Todino (with contributions by several other people).
++The latter includes most of the former, and is published by
++     O'Reilly & Associates, Inc.
++     103 Morris Street, Suite A
++     Sebastopol, CA 95472
++   It is currently in its tenth edition.  The ISBN number is
++`0-937175-93-5'.
++
++   Some information is originally due to a Usenet article by Chuck
++Wegrzyn.  The information on execution files comes partially from Peter
++Honeyman.  The information on the `g' protocol comes partially from a
++paper by G.L. Chesson of Bell Laboratories, partially from Jamie E.
++Hanrahan's paper, and partially from source code by John Gilmore.  The
++information on the `f' protocol comes from the source code by Piet
++Berteema.  The information on the `t' protocol comes from the source
++code by Rick Adams.  The information on the `e' protocol comes from a
++Usenet article by Matthias Urlichs.  The information on the `d'
++protocol comes from Jonathan Clark, who also supplied information about
++QFT.  The UUPlus information comes straight from Christopher J. Ambler,
++of UUPlus Development; it applies to version 1.52 and up of the
++shareware version of UUPlus Utilities, called FSUUCP 1.52, but referred
++to in this article as UUPlus.
++
++   Although there are few books about UUCP, there are many about
++networks and protocols in general.  I recommend two non-technical books
++which describe the sorts of things that are available on the network:
++`The Whole Internet', by Ed Krol, and `Zen and the Art of the
++Internet', by Brendan P. Kehoe.  Good technical discussions of
++networking issues can be found in `Internetworking with TCP/IP', by
++Douglas E. Comer and David L. Stevens and in `Design and Validation of
++Computer Protocols' by Gerard J. Holzmann.
++
++\x1f
++File: uucp.info,  Node: UUCP Grades,  Next: UUCP Lock Files,  Prev: UUCP Protocol Sources,  Up: Protocols
++
++6.2 UUCP Grades
++===============
++
++Modern UUCP packages support a priority grade for each command.  The
++grades generally range from `A' (the highest) to `Z' followed by `a' to
++`z'.  Some UUCP packages (including Taylor UUCP) also support `0' to
++`9' before `A'.  Some UUCP packages may permit any ASCII character as a
++grade.
++
++   On Unix, these grades are encoded in the name of the command file
++created by `uucp' or `uux'.  A command file name generally has the form
++`C.nnnngssss' where `nnnn' is the remote system name for which the
++command is queued, `g' is a single character grade, and `ssss' is a
++four character sequence number.  For example, a command file created
++for the system `airs' at grade `Z' might be named `C.airsZ2551'.
++
++   The remote system name will be truncated to seven characters, to
++ensure that the command file name will fit in the 14 character file
++name limit of the traditional Unix file system.  UUCP packages which
++have no other means of distinguishing which command files are intended
++for which systems thus require all systems they connect to to have
++names that are unique in the first seven characters.  Some UUCP
++packages use a variant of this format which truncates the system name
++to six characters.  HDB and Taylor UUCP use a different spool directory
++format, which allows up to fourteen characters to be used for each
++system name.
++
++   The sequence number in the command file name may be a decimal
++integer, or it may be a hexadecimal integer, or it may contain any
++alphanumeric character.  Different UUCP packages are different.  Taylor
++UUCP uses any alphanumeric character.
++
++   UUPlus Utilities (as FSUUCP, a shareware DOS based UUCP and news
++package) uses up to 8 characters for file names in the spool (this is a
++DOS file system limitation; actually, with the extension, 11 characters
++are available, but FSUUCP reserves that for future use).  FSUUCP
++defaults mail to grade `D', and news to grade `N', except that when the
++grade of incoming mail can be determined, that grade is preserved if
++the mail is forwarded to another system. The default grades may be
++changed by editing the `LIB/MAILRC' file for mail, or the `UUPLUS.CFG'
++file for news.
++
++   UUPC/extended for DOS, OS/2 and Windows NT handles mail at grade
++`C', news at grade `d', and file transfers at grade `n'.  The
++UUPC/extended `UUCP' and `RMAIL' commands accept grades to override the
++default, the others do not.
++
++   I do not know how command grades are handled in other non-Unix UUCP
++packages.
++
++   Modern UUCP packages allow you to restrict file transfer by grade
++depending on the time of day.  Typically this is done with a line in
++the `Systems' (or `L.sys') file like this:
++         airs Any/Z,Any2305-0855 ...
++   This allows grades `Z' and above to be transferred at any time.
++Lower grades may only be transferred at night.  I believe that this
++grade restriction applies to local commands as well as to remote
++commands, but I am not sure.  It may only apply if the UUCP package
++places the call, not if it is called by the remote system.
++
++   Taylor UUCP can use the `timegrade' and `call-timegrade' commands to
++achieve the same effect.  *Note When to Call::.  It supports the above
++format when reading `Systems' or `L.sys'.
++
++   UUPC/extended provides the `symmetricgrades' option to announce the
++current grade in effect when calling the remote system.
++
++   UUPlus allows specification of the highest grade accepted on a
++per-call basis with the `-g' option in `UUCICO'.
++
++   This sort of grade restriction is most useful if you know what grades
++are being used at the remote site.  The default grades used depend on
++the UUCP package.  Generally `uucp' and `uux' have different defaults.
++A particular grade can be specified with the `-g' option to `uucp' or
++`uux'.  For example, to request execution of `rnews' on `airs' with
++grade `d', you might use something like
++         uux -gd - airs!rnews < article
++
++   Uunet queues up mail at grade `C', but increases the grade based on
++the size.  News is queued at grade `d', and file transfers at grade
++`n'.  The example above would allow mail (below some large size) to be
++received at any time, but would only permit news to be transferred at
++night.
++
++\x1f
++File: uucp.info,  Node: UUCP Lock Files,  Next: Execution File Format,  Prev: UUCP Grades,  Up: Protocols
++
++6.3 UUCP Lock Files
++===================
++
++This discussion applies only to Unix.  I have no idea how UUCP locks
++ports on other systems.
++
++   UUCP creates files to lock serial ports and systems.  On most, if not
++all, systems, these same lock files are also used by `cu' to coordinate
++access to serial ports.  On some systems `getty' also uses these lock
++files, often under the name `uugetty'.
++
++   The lock file normally contains the process ID of the locking
++process.  This makes it easy to determine whether a lock is still
++valid.  The algorithm is to create a temporary file and then link it to
++the name that must be locked.  If the link fails because a file with
++that name already exists, the existing file is read to get the process
++ID.  If the process still exists, the lock attempt fails.  Otherwise
++the lock file is deleted and the locking algorithm is retried.
++
++   Older UUCP packages put the lock files in the main UUCP spool
++directory, `/usr/spool/uucp'.  HDB UUCP generally puts the lock files
++in a directory of their own, usually `/usr/spool/locks' or `/etc/locks'.
++
++   The original UUCP lock file format encodes the process ID as a four
++byte binary number.  The order of the bytes is host-dependent.  HDB UUCP
++stores the process ID as a ten byte ASCII decimal number, with a
++trailing newline.  For example, if process 1570 holds a lock file, it
++would contain the eleven characters space, space, space, space, space,
++space, one, five, seven, zero, newline.  Some versions of UUCP add a
++second line indicating which program created the lock (`uucp', `cu', or
++`getty/uugetty').  I have also seen a third type of UUCP lock file
++which does not contain the process ID at all.
++
++   The name of the lock file is traditionally `LCK..' followed by the
++base name of the device.  For example, to lock `/dev/ttyd0' the file
++`LCK..ttyd0' would be created.  On SCO Unix, the last letter of the
++lock file name is always forced to lower case even if the device name
++ends with an upper case letter.
++
++   System V Release 4 UUCP names the lock file using the major and minor
++device numbers rather than the device name.  The file is named
++`LK.XXX.YYY.ZZZ', where XXX, YYY and ZZZ are all three digit decimal
++numbers.  XXX is the major device number of the device holding the
++directory holding the device file (e.g., `/dev').  YYY is the major
++device number of the device file itself.  ZZZ is the minor device
++number of the device file itself.  If `s' holds the result of passing
++the device to the stat system call (e.g., `stat ("/dev/ttyd0", &s)'),
++the following line of C code will print out the corresponding lock file
++name:
++         printf ("LK.%03d.%03d.%03d", major (s.st_dev),
++                 major (s.st_rdev), minor (s.st_rdev));
++   The advantage of this system is that even if there are several links
++to the same device, they will all use the same lock file name.
++
++   When two or more instances of `uuxqt' are executing, some sort of
++locking is needed to ensure that a single execution job is only started
++once.  I don't know how most UUCP packages deal with this.  Taylor UUCP
++uses a lock file for each execution job.  The name of the lock file is
++the same as the name of the `X.*' file, except that the initial `X' is
++changed to an `L'.  The lock file holds the process ID as described
++above.
++
++\x1f
++File: uucp.info,  Node: Execution File Format,  Next: UUCP Protocol,  Prev: UUCP Lock Files,  Up: Protocols
++
++6.4 Execution File Format
++=========================
++
++UUCP `X.*' files control program execution.  They are created by `uux'.
++They are transferred between systems just like any other file.  The
++`uuxqt' daemon reads them to figure out how to execute the job
++requested by `uux'.
++
++   An `X.*' file is simply a text file.  The first character of each
++line is a command, and the remainder of the line supplies arguments.
++The following commands are defined:
++
++`C command'
++     This gives the command to execute, including the program and all
++     arguments.  For example, `rmail ian@airs.com'.
++
++`U user system'
++     This names the user who requested the command, and the system from
++     which the request came.
++
++`I standard-input'
++     This names the file from which standard input is taken.  If no
++     standard input file is given, the standard input will probably be
++     attached to `/dev/null'.  If the standard input file is not from
++     the system on which the execution is to occur, it will also appear
++     in an `F' command.
++
++`O standard-output [system]'
++     This names the standard output file.  The optional second argument
++     names the system to which the file should be sent.  If there is no
++     second argument, the file should be created on the executing
++     system.
++
++`F required-file [filename-to-use]'
++     The `F' command can appear multiple times.  Each `F' command names
++     a file which must exist before the execution can proceed.  This
++     will usually be a file which is transferred from the system on
++     which `uux' was executed, but it can also be a file from the local
++     system or some other system.  If the file is not from the local
++     system, then the command will usually name a file in the spool
++     directory.  If the optional second argument appears, then the file
++     should be copied to the execution directory under that name.  This
++     is necessary for any file other than the standard input file.  If
++     the standard input file is not from the local system, it will
++     appear in both an `F' command and an `I' command.
++
++`R requestor-address'
++     This is the address to which mail about the job should be sent.
++     It is relative to the system named in the `U' command.  If the `R'
++     command does not appear, then mail is sent to the user named in the
++     `U' command.
++
++`Z'
++     This command takes no arguments.  It means that a mail message
++     should be sent if the command failed.  This is the default
++     behaviour for most modern UUCP packages, and for them the `Z'
++     command does not actually do anything.
++
++`N'
++     This command takes no arguments.  It means that no mail message
++     should be sent, even if the command failed.
++
++`n'
++     This command takes no arguments.  It means that a mail message
++     should be sent if the command succeeded.  Normally a message is
++     sent only if the command failed.
++
++`B'
++     This command takes no arguments.  It means that the standard input
++     should be returned with any error message.  This can be useful in
++     cases where the input would otherwise be lost.
++
++`e'
++     This command takes no arguments.  It means that the command should
++     be processed with `/bin/sh'.  For some packages this is the default
++     anyhow.  Most packages will refuse to execute complex commands or
++     commands containing wildcards, because of the security holes this
++     opens.
++
++`E'
++     This command takes no arguments.  It means that the command should
++     be processed with the `execve' system call.  For some packages
++     this is the default anyhow.
++
++`M status-file'
++     This command means that instead of mailing a message, the message
++     should be copied to the named file on the system named by the `U'
++     command.
++
++`Q'
++     This command takes no arguments.  It means that the string
++     arguments to all the other commands are backslash quoted.  Any
++     backslash in one of the strings should be followed by either a
++     backslash or three octal digits.  The backslash quoting is
++     interpreted as in a C string.  If the `Q' command does not appear,
++     backslashes in the strings are not treated specially.  The `Q'
++     command was introduced in Taylor UUCP version 1.07.
++
++`# comment'
++     This command is ignored, as is any other unrecognized command.
++
++   Here is an example.  Given the following command executed on system
++test1
++         uux - test2!cat - test2!~ian/bar !qux '>~/gorp'
++   (this is only an example, as most UUCP systems will not permit the
++cat command to be executed) Taylor UUCP will produce something like the
++following `X.'  file:
++     U ian test1
++     F D.test1N003r qux
++     O /usr/spool/uucppublic/gorp test1
++     F D.test1N003s
++     I D.test1N003s
++     C cat - ~ian/bar qux
++   The standard input will be read into a file and then transferred to
++the file `D.test1N003s' on system `test2'.  The file `qux' will be
++transferred to `D.test1N003r' on system `test2'.  When the command is
++executed, the latter file will be copied to the execution directory
++under the name `qux'.  Note that since the file `~ian/bar' is already
++on the execution system, no action need be taken for it.  The standard
++output will be collected in a file, then copied to the file
++`/usr/spool/uucppublic/gorp' on the system `test1'.
++
++\x1f
++File: uucp.info,  Node: UUCP Protocol,  Next: g Protocol,  Prev: Execution File Format,  Up: Protocols
++
++6.5 UUCP Protocol
++=================
++
++The UUCP protocol is a conversation between two UUCP packages.  A UUCP
++conversation consists of three parts: an initial handshake, a series of
++file transfer requests, and a final handshake.
++
++* Menu:
++
++* The Initial Handshake::       The Initial Handshake
++* UUCP Protocol Commands::      UUCP Protocol Commands
++* The Final Handshake::         The Final Handshake
++
++\x1f
++File: uucp.info,  Node: The Initial Handshake,  Next: UUCP Protocol Commands,  Prev: UUCP Protocol,  Up: UUCP Protocol
++
++6.5.1 The Initial Handshake
++---------------------------
++
++Before the initial handshake, the caller will usually have logged in the
++called machine and somehow started the UUCP package there.  On Unix this
++is normally done by setting the shell of the login name used to
++`/usr/lib/uucp/uucico'.
++
++   All messages in the initial handshake begin with a `^P' (a byte with
++the octal value `\020') and end with a null byte (`\000').  A few
++systems end these messages with a line feed character (`\012') instead
++of a null byte; the examples below assume a null byte is being used.
++
++   Some options below are supported by QFT, which stands for Queued File
++Transfer, and is (or was) an internal Bell Labs version of UUCP.
++
++   Taylor UUCP size negotiation was introduced by Taylor UUCP, and is
++also supported by DOS based UUPlus and Amiga based wUUCP and UUCP-1.17.
++
++   The initial handshake goes as follows.  It is begun by the called
++machine.
++
++called: `\020Shere=hostname\000'
++     The hostname is the UUCP name of the called machine.  Older UUCP
++     packages do not output it, and simply send `\020Shere\000'.
++
++caller: `\020Shostname options\000'
++     The hostname is the UUCP name of the calling machine.  The
++     following options may appear (or there may be none):
++
++    `-QSEQ'
++          Report sequence number for this conversation.  The sequence
++          number is stored at both sites, and incremented after each
++          call.  If there is a sequence number mismatch, something has
++          gone wrong (somebody may have broken security by pretending
++          to be one of the machines) and the call is denied.  If the
++          sequence number changes on one of the machines, perhaps
++          because of an attempted breakin or because a disk backup was
++          restored, the sequence numbers on the two machines must be
++          reconciled manually.
++
++    `-xLEVEL'
++          Requests the called system to set its debugging level to the
++          specified value.  This is not supported by all systems.
++
++    `-pGRADE'
++    `-vgrade=GRADE'
++          Requests the called system to only transfer files of the
++          specified grade or higher.  This is not supported by all
++          systems.  Some systems support `-p', some support `-vgrade='.
++          UUPlus allows either `-p' or `-v' to be specified on a
++          per-system basis in the `SYSTEMS' file (`gradechar' option).
++
++    `-R'
++          Indicates that the calling UUCP understands how to restart
++          failed file transmissions.  Supported only by System V
++          Release 4 UUCP, QFT, and Taylor UUCP.
++
++    `-ULIMIT'
++          Reports the ulimit value of the calling UUCP.  The limit is
++          specified as a base 16 number in C notation (e.g.,
++          `-U0x1000000').  This number is the number of 512 byte blocks
++          in the largest file which the calling UUCP can create.  The
++          called UUCP may not transfer a file larger than this.
++          Supported only by System V Release 4 UUCP, QFT and UUPlus.
++          UUPlus reports the lesser of the available disk space on the
++          spool directory drive and the ulimit variable in
++          `UUPLUS.CFG'.  Taylor UUCP understands this option, but does
++          not generate it.
++
++    `-N[NUMBER]'
++          Indicates that the calling UUCP understands the Taylor UUCP
++          size negotiation extension.  Not supported by traditional
++          UUCP packages.  Supported by UUPlus.  The optional number is
++          a bitmask of features supported by the calling UUCP, and is
++          described below.
++
++called: `\020ROK\000'
++     There are actually several possible responses.
++    `ROK'
++          The calling UUCP is acceptable, and the handshake proceeds to
++          the protocol negotiation.  Some options may also appear; see
++          below.
++
++    `ROKN[NUMBER]'
++          The calling UUCP is acceptable, it specified `-N', and the
++          called UUCP also understands the Taylor UUCP size limiting
++          extensions.  The optional number is a bitmask of features
++          supported by the called UUCP, and is described below.
++
++    `RLCK'
++          The called UUCP already has a lock for the calling UUCP,
++          which normally indicates the two machines are already
++          communicating.
++
++    `RCB'
++          The called UUCP will call back.  This may be used to avoid
++          impostors (but only one machine out of each pair should call
++          back, or no conversation will ever begin).
++
++    `RBADSEQ'
++          The call sequence number is wrong (see the `-Q' discussion
++          above).
++
++    `RLOGIN'
++          The calling UUCP is using the wrong login name.
++
++    `RYou are unknown to me'
++          The calling UUCP is not known to the called UUCP, and the
++          called UUCP does not permit connections from unknown systems.
++          Some versions of UUCP just drop the line rather than sending
++          this message.
++
++     If the response is `ROK', the following options are supported by
++     System V Release 4 UUCP and QFT.
++    `-R'
++          The called UUCP knows how to restart failed file
++          transmissions.
++
++    `-ULIMIT'
++          Reports the ulimit value of the called UUCP.  The limit is
++          specified as a base 16 number in C notation.  This number is
++          the number of 512 byte blocks in the largest file which the
++          called UUCP can create.  The calling UUCP may not send a file
++          larger than this.  Also supported by UUPlus.  Taylor UUCP
++          understands this option, but does not generate it.
++
++    `-xLEVEL'
++          I'm not sure just what this means.  It may request the
++          calling UUCP to set its debugging level to the specified
++          value.
++
++     If the response is not `ROK' (or `ROKN') both sides hang up the
++     phone, abandoning the call.
++
++called: `\020Pprotocols\000'
++     Note that the called UUCP outputs two strings in a row.  The
++     protocols string is a list of UUCP protocols supported by the
++     caller.  Each UUCP protocol has a single character name.  These
++     protocols are discussed in more detail later in this document.
++     For example, the called UUCP might send `\020Pgf\000'.
++
++caller: `\020Uprotocol\000'
++     The calling UUCP selects which protocol to use out of the protocols
++     offered by the called UUCP.  If there are no mutually supported
++     protocols, the calling UUCP sends `\020UN\000' and both sides hang
++     up the phone.  Otherwise the calling UUCP sends something like
++     `\020Ug\000'.
++
++   Most UUCP packages will consider each locally supported protocol in
++turn and select the first one supported by the called UUCP.  With some
++versions of HDB UUCP, this can be modified by giving a list of protocols
++after the device name in the `Devices' file or the `Systems' file.  For
++example, to select the `e' protocol in `Systems',
++         airs Any ACU,e ...
++   or in Devices,
++         ACU,e ttyXX ...
++   Taylor UUCP provides the `protocol' command which may be used either
++for a system (*note Protocol Selection::) or a port (*note port File::).
++UUPlus allows specification of the protocol string on a per-system basis
++in the `SYSTEMS' file.
++
++   The optional number following a `-N' sent by the calling system, or
++an `ROKN' sent by the called system, is a bitmask of features supported
++by the UUCP package.  The optional number was introduced in Taylor UUCP
++version 1.04.  The number is sent as an octal number with a leading
++zero.  The following bits are currently defined.  A missing number
++should be taken as `011'.
++
++`01'
++     UUCP supports size negotiation.
++
++`02'
++     UUCP supports file restart.
++
++`04'
++     UUCP supports the `E' command.
++
++`010'
++     UUCP requires the file size in the `S' and `R' commands to be in
++     base 10.  This bit is used by default if no number appears, but
++     should not be explicitly sent.
++
++`020'
++     UUCP expects a dummy string between the notify field and the size
++     field in an `S' command.  This is true of SVR4 UUCP.  This bit
++     should not be used.
++
++`040'
++     UUCP supports the `q' option in the `S', `R', `X', and `E'
++     commands.
++
++   After the protocol has been selected and the initial handshake has
++been completed, both sides turn on the selected protocol.  For some
++protocols (notably `g') a further handshake is done at this point.
++
++\x1f
++File: uucp.info,  Node: UUCP Protocol Commands,  Next: The Final Handshake,  Prev: The Initial Handshake,  Up: UUCP Protocol
++
++6.5.2 UUCP Protocol Commands
++----------------------------
++
++Each protocol supports a method for sending a command to the remote
++system.  This method is used to transmit a series of commands between
++the two UUCP packages.  At all times, one package is the master and the
++other is the slave.  Initially, the calling UUCP is the master.
++
++   If a protocol error occurs during the exchange of commands, both
++sides move immediately to the final handshake.
++
++   The master will send one of five commands: `S', `R', `X', `E', or
++`H'.
++
++   Any file name referred to below is either an absolute file name
++beginning with `/', a public directory file name beginning with `~/', a
++file name relative to a user's home directory beginning with `~USER/',
++or a spool directory file name.  File names in the spool directory are
++not absolute, but instead are converted to file names within the spool
++directory by UUCP.  They always begin with `C.' (for a command file
++created by `uucp' or `uux'), `D.' (for a data file created by `uucp',
++`uux' or by an execution, or received from another system for an
++execution), or `X.' (for an execution file created by `uux' or received
++from another system).
++
++   All the commands other than the `H' command support options.  The
++`q' option indicates that the command argument strings are backslash
++quoted.  If the `q' option appears, then any backslash in one of the
++arguments should be followed by either a backslash or three octal
++digits.  The backslash quoting is interpreted as in a C string.  If the
++`q' option does not appear, backslashes in the strings are not treated
++specially.  The `q' option was introduced in Taylor UUCP version 1.07.
++
++* Menu:
++
++* The S Command::               The S Command
++* The R Command::               The R Command
++* The X Command::               The X Command
++* The E Command::               The E Command
++* The H Command::               The H Command
++
++\x1f
++File: uucp.info,  Node: The S Command,  Next: The R Command,  Prev: UUCP Protocol Commands,  Up: UUCP Protocol Commands
++
++6.5.2.1 The S Command
++.....................
++
++master: `S FROM TO USER -OPTIONS TEMP MODE NOTIFY SIZE'
++     The `S' and the `-' are literal characters.  This is a request by
++     the master to send a file to the slave.
++
++    FROM
++          The name of the file to send.  If the `C' option does not
++          appear in OPTIONS, the master will actually open and send
++          this file.  Otherwise the file has been copied to the spool
++          directory, where it is named TEMP.  The slave ignores this
++          field unless TO is a directory, in which case the basename of
++          FROM will be used as the file name.  If FROM is a spool
++          directory filename, it must be a data file created for or by
++          an execution, and must begin with `D.'.
++
++    TO
++          The name to give the file on the slave.  If this field names
++          a directory the file is placed within that directory with the
++          basename of FROM.  A name ending in `/' is taken to be a
++          directory even if one does not already exist with that name.
++          If TO begins with `X.', an execution file will be created on
++          the slave.  Otherwise, if TO begins with `D.' it names a data
++          file to be used by some execution file.  Otherwise, TO should
++          not be in the spool directory.
++
++    USER
++          The name of the user who requested the transfer.
++
++    OPTIONS
++          A list of options to control the transfer.  The following
++          options are defined (all options are single characters):
++         `C'
++               The file has been copied to the spool directory (the
++               master should use TEMP rather than FROM).
++
++         `c'
++               The file has not been copied to the spool directory
++               (this is the default).
++
++         `d'
++               The slave should create directories as necessary (this
++               is the default).
++
++         `f'
++               The slave should not create directories if necessary,
++               but should fail the transfer instead.
++
++         `m'
++               The master should send mail to USER when the transfer is
++               complete.
++
++         `n'
++               The slave should send mail to NOTIFY when the transfer is
++               complete.
++
++         `q'
++               Backslash quoting is applied to the FROM, TO, USER, and
++               NOTIFY arguments.  *Note UUCP Protocol Commands::.  This
++               option was introduced in Taylor UUCP version 1.07.
++
++    TEMP
++          If the `C' option appears in OPTIONS, this names the file to
++          be sent.  Otherwise if FROM is in the spool directory, TEMP
++          is the same as FROM.  Otherwise TEMP may be a dummy string,
++          such as `D.0'.  After the transfer has been succesfully
++          completed, the master will delete the file TEMP.
++
++    MODE
++          This is an octal number giving the mode of the file on the
++          master.  If the file is not in the spool directory, the slave
++          will always create it with mode 0666, except that if (MODE &
++          0111) is not zero (the file is executable), the slave will
++          create the file with mode 0777.  If the file is in the spool
++          directory, some UUCP packages will use the algorithm above
++          and some will always create the file with mode 0600.  This
++          field is ignored by UUPlus, since it is meaningless on DOS;
++          UUPlus uses 0666 for outgoing files.
++
++    NOTIFY
++          This field may not be present, and in any case is only
++          meaningful if the `n' option appears in OPTIONS.  If the `n'
++          option appears, then, when the transfer is successfully
++          completed, the slave will send mail to NOTIFY, which must be
++          a legal mailing address on the slave.  If a SIZE field will
++          appear but the `n' option does not appear, NOTIFY will always
++          be present, typically as the string `dummy' or simply a pair
++          of double quotes.
++
++    SIZE
++          This field is only present when doing Taylor UUCP or SVR4
++          UUCP size negotiation.  It is the size of the file in bytes.
++          Taylor UUCP version 1.03 sends the size as a decimal integer,
++          while versions 1.04 and up, and all other UUCP packages that
++          support size negotiation, send the size in base 16 with a
++          leading 0x.
++
++     The slave then responds with an `S' command response.
++
++    `SY START'
++          The slave is willing to accept the file, and file transfer
++          begins.  The START field will only be present when using file
++          restart.  It specifies the byte offset into the file at which
++          to start sending.  If this is a new file, START will be 0x0.
++
++    `SN2'
++          The slave denies permission to transfer the file.  This can
++          mean that the destination directory may not be accessed, or
++          that no requests are permitted.  It implies that the file
++          transfer will never succeed.
++
++    `SN4'
++          The slave is unable to create the necessary temporary file.
++          This implies that the file transfer might succeed later.
++
++    `SN6'
++          This is only used by Taylor UUCP size negotiation.  It means
++          that the slave considers the file too large to transfer at
++          the moment, but it may be possible to transfer it at some
++          other time.
++
++    `SN7'
++          This is only used by Taylor UUCP size negotiation.  It means
++          that the slave considers the file too large to ever transfer.
++
++    `SN8'
++          This is only used by Taylor UUCP.  It means that the file was
++          already received in a previous conversation.  This can happen
++          if the receive acknowledgement was lost after it was sent by
++          the receiver but before it was received by the sender.
++
++    `SN9'
++          This is only used by Taylor UUCP (versions 1.05 and up) and
++          UUPlus (versions 2.0 and up).  It means that the remote
++          system was unable to open another channel (see the discussion
++          of the `i' protocol for more information about channels).
++          This implies that the file transfer might succeed later.
++
++    `SN10'
++          This is reportedly used by SVR4 UUCP to mean that the file
++          size is too large.
++
++     If the slave responds with `SY', a file transfer begins.  When the
++     file transfer is complete, the slave sends a `C' command response.
++
++    `CY'
++          The file transfer was successful.
++
++    `CYM'
++          The file transfer was successful, and the slave wishes to
++          become the master; the master should send an `H' command,
++          described below.
++
++    `CN5'
++          The temporary file could not be moved into the final
++          location.  This implies that the file transfer will never
++          succeed.
++
++After the `C' command response has been received (in the `SY' case) or
++immediately (in an `SN' case) the master will send another command.
++
++\x1f
++File: uucp.info,  Node: The R Command,  Next: The X Command,  Prev: The S Command,  Up: UUCP Protocol Commands
++
++6.5.2.2 The R Command
++.....................
++
++master: `R FROM TO USER -OPTIONS SIZE'
++     The `R' and the `-' are literal characters.  This is a request by
++     the master to receive a file from the slave.  I do not know how
++     SVR4 UUCP or QFT implement file transfer restart in this case.
++
++    FROM
++          This is the name of the file on the slave which the master
++          wishes to receive.  It must not be in the spool directory,
++          and it may not contain any wildcards.
++
++    TO
++          This is the name of the file to create on the master.  I do
++          not believe that it can be a directory.  It may only be in
++          the spool directory if this file is being requested to
++          support an execution either on the master or on some system
++          other than the slave.
++
++    USER
++          The name of the user who requested the transfer.
++
++    OPTIONS
++          A list of options to control the transfer.  The following
++          options are defined (all options are single characters):
++         `d'
++               The master should create directories as necessary (this
++               is the default).
++
++         `f'
++               The master should not create directories if necessary,
++               but should fail the transfer instead.
++
++         `m'
++               The master should send mail to USER when the transfer is
++               complete.
++
++         `q'
++               Backslash quoting is applied to the FROM, TO, and USER
++               arguments.  *Note UUCP Protocol Commands::.  This option
++               was introduced in Taylor UUCP version 1.07.
++
++    SIZE
++          This only appears if Taylor UUCP size negotiation is being
++          used.  It specifies the largest file which the master is
++          prepared to accept (when using SVR4 UUCP or QFT, this was
++          specified in the `-U' option during the initial handshake).
++
++     The slave then responds with an `R' command response.  UUPlus does
++     not support `R' requests, and always responds with `RN2'.
++
++    `RY MODE [SIZE]'
++          The slave is willing to send the file, and file transfer
++          begins.  The MODE argument is the octal mode of the file on
++          the slave.  The master treats this just as the slave does the
++          MODE argument in the send command, q.v.  I am told that SVR4
++          UUCP sends a trailing SIZE argument.  For some versions of
++          BSD UUCP, the MODE argument may have a trailing `M' character
++          (e.g., `RY 0666M').  This means that the slave wishes to
++          become the master.
++
++    `RN2'
++          The slave is not willing to send the file, either because it
++          is not permitted or because the file does not exist.  This
++          implies that the file request will never succeed.
++
++    `RN6'
++          This is only used by Taylor UUCP size negotiation.  It means
++          that the file is too large to send, either because of the
++          size limit specifies by the master or because the slave
++          considers it too large.  The file transfer might succeed
++          later, or it might not (this may be cleared up in a later
++          release of Taylor UUCP).
++
++    `RN9'
++          This is only used by Taylor UUCP (versions 1.05 and up) and
++          FSUUCP (versions 1.5 and up).  It means that the remote
++          system was unable to open another channel (see the discussion
++          of the `i' protocol for more information about channels).
++          This implies that the file transfer might succeed later.
++
++     If the slave responds with `RY', a file transfer begins.  When the
++     file transfer is complete, the master sends a `C' command.  The
++     slave pretty much ignores this, although it may log it.
++
++    `CY'
++          The file transfer was successful.
++
++    `CN5'
++          The temporary file could not be moved into the final location.
++
++     After the `C' command response has been sent (in the `RY' case) or
++     immediately (in an `RN' case) the master will send another command.
++
++\x1f
++File: uucp.info,  Node: The X Command,  Next: The E Command,  Prev: The R Command,  Up: UUCP Protocol Commands
++
++6.5.2.3 The X Command
++.....................
++
++master: `X FROM TO USER -OPTIONS'
++     The `X' and the `-' are literal characters.  This is a request by
++     the master to, in essence, execute uucp on the slave.  The slave
++     should execute `uucp FROM TO'.
++
++    FROM
++          This is the name of the file or files on the slave which the
++          master wishes to transfer.  Any wildcards are expanded on the
++          slave.  If the master is requesting that the files be
++          transferred to itself, the request would normally contain
++          wildcard characters, since otherwise an `R' command would
++          suffice.  The master can also use this command to request
++          that the slave transfer files to a third system.
++
++    TO
++          This is the name of the file or directory to which the files
++          should be transferred.  This will normally use a UUCP name.
++          For example, if the master wishes to receive the files
++          itself, it would use `master!path'.
++
++    USER
++          The name of the user who requested the transfer.
++
++    OPTIONS
++          A list of options to control the transfer.  As far as I know,
++          only one option is defined:
++         `q'
++               Backslash quoting is applied to the FROM, TO, and USER
++               arguments.  *Note UUCP Protocol Commands::.  This option
++               was introduced in Taylor UUCP version 1.07.
++
++     The slave then responds with an `X' command response.  FSUUCP does
++     not support `X' requests, and always responds with `XN'.
++
++    `XY'
++          The request was accepted, and the appropriate file transfer
++          commands have been queued up for later processing.
++
++    `XN'
++          The request was denied.  No particular reason is given.
++
++     In either case, the master will then send another command.
++
++\x1f
++File: uucp.info,  Node: The E Command,  Next: The H Command,  Prev: The X Command,  Up: UUCP Protocol Commands
++
++6.5.2.4 The E Command
++.....................
++
++master: `E FROM TO USER -OPTIONS TEMP MODE NOTIFY SIZE COMMAND'
++     The `E' command is only supported by Taylor UUCP 1.04 and up.  It
++     is used to make an execution request without requiring a separate
++     `X.*' file.  *Note Execution File Format::.  It is only used when
++     the command to be executed requires a single input file which is
++     passed to it as standard input.
++
++     All the fields have the same meaning as they do for an `S' command,
++     except for OPTIONS and COMMAND.
++
++    OPTIONS
++          A list of options to control the transfer.  The following
++          options are defined (all options are single characters):
++         `C'
++               The file has been copied to the spool directory (the
++               master should use TEMP rather than FROM).
++
++         `c'
++               The file has not been copied to the spool directory
++               (this is the default).
++
++         `N'
++               No mail message should be sent, even if the command
++               fails.  This is the equivalent of the `N' command in an
++               `X.*' file.
++
++         `Z'
++               A mail message should be sent if the command fails (this
++               is generally the default in any case).  This is the
++               equivalent of the `Z' command in an `X.*' file.
++
++         `R'
++               Mail messages about the execution should be sent to the
++               address in the NOTIFY field.  This is the equivalent of
++               the `R' command in an `X.*' file.
++
++         `e'
++               The execution should be done with `/bin/sh'.  This is the
++               equivalent of the `e' command in an `X.*' file.
++
++         `q'
++               Backslash quoting is applied to the FROM, TO, USER, and
++               NOTIFY arguments.  *Note UUCP Protocol Commands::.  This
++               option was introduced in Taylor UUCP version 1.07.  Note
++               that the COMMAND argument is not backslash quoted--that
++               argument is defined as the remainder of the line, and so
++               is already permitted to contain any character.
++
++    COMMAND
++          The command which should be executed.  This is the equivalent
++          of the `C' command in an `X.*' file.
++
++     The slave then responds with an `E' command response.  These are
++     the same as the `S' command responses, but the initial character is
++     `E' rather than `S'.
++
++     If the slave responds with `EY', the file transfer begins.  When
++     the file transfer is complete, the slave sends a `C' command
++     response, just as for the `S' command.  After a successful file
++     transfer, the slave is responsible for arranging for the command
++     to be executed.  The transferred file is passed as standard input,
++     as though it were named in the `I' and `F' commands of an `X.*'
++     file.
++
++     After the `C' command response has been received (in the `EY'
++     case) or immediately (in an `EN' case) the master will send another
++     command.
++
++\x1f
++File: uucp.info,  Node: The H Command,  Prev: The E Command,  Up: UUCP Protocol Commands
++
++6.5.2.5 The H Command
++.....................
++
++master: `H'
++     This is used by the master to hang up the connection.  The slave
++     will respond with an `H' command response.
++
++    `HY'
++          The slave agrees to hang up the connection.  In this case the
++          master sends another `HY' command.  In some UUCP packages the
++          slave will then send a third `HY' command.  At this point the
++          protocol is shut down, and the final handshake is begun.
++
++    `HN'
++          The slave does not agree to hang up.  In this case the master
++          and the slave exchange roles.  The next command will be sent
++          by the former slave, which is the new master.  The roles may
++          be reversed several times during a single connection.
++
++\x1f
++File: uucp.info,  Node: The Final Handshake,  Prev: UUCP Protocol Commands,  Up: UUCP Protocol
++
++6.5.3 The Final Handshake
++-------------------------
++
++After the protocol has been shut down, the final handshake is performed.
++This handshake has no real purpose, and some UUCP packages simply drop
++the connection rather than do it (in fact, some will drop the connection
++immediately after both sides agree to hangup, without even closing down
++the protocol).
++
++caller: `\020OOOOOO\000'
++
++called: `\020OOOOOOO\000'
++
++   That is, the calling UUCP sends six `O' characters and the called
++UUCP replies with seven `O' characters.  Some UUCP packages always send
++six `O' characters.
++
++\x1f
++File: uucp.info,  Node: g Protocol,  Next: f Protocol,  Prev: UUCP Protocol,  Up: Protocols
++
++6.6 UUCP `g' Protocol
++=====================
++
++The `g' protocol is a packet based flow controlled error correcting
++protocol that requires an eight bit clear connection.  It is the
++original UUCP protocol, and is supported by all UUCP implementations.
++Many implementations of it are only able to support small window and
++packet sizes, specifically a window size of 3 and a packet size of 64
++bytes, but the protocol itself can support up to a window size of 7 and
++a packet size of 4096 bytes.  Complaints about the inefficiency of the
++`g' protocol generally refer to specific implementations, rather than
++to the correctly implemented protocol.
++
++   The `g' protocol was originally designed for general packet drivers,
++and thus contains some features that are not used by UUCP, including an
++alternate data channel and the ability to renegotiate packet and window
++sizes during the communication session.
++
++   The `g' protocol is spoofed by many Telebit modems.  When spoofing
++is in effect, each Telebit modem uses the `g' protocol to communicate
++with the attached computer, but the data between the modems is sent
++using a Telebit proprietary error correcting protocol.  This allows for
++very high throughput over the Telebit connection, which, because it is
++half-duplex, would not normally be able to handle the `g' protocol very
++well at all.  When a Telebit is spoofing the `g' protocol, it forces
++the packet size to be 64 bytes and the window size to be 3.
++
++   This discussion of the `g' protocol explains how it works, but does
++not discuss useful error handling techniques.  Some discussion of this
++can be found in Jamie E. Hanrahan's paper, cited above (*note UUCP
++Protocol Sources::).
++
++   All `g' protocol communication is done with packets.  Each packet
++begins with a six byte header.  Control packets consist only of the
++header.  Data packets contain additional data.
++
++   The header is as follows:
++
++`\020'
++     Every packet begins with a `^P'.
++
++K (1 <= K <= 9)
++     The K value is always 9 for a control packet.  For a data packet,
++     the K value indicates how much data follows the six byte header.
++     The amount of data is 2 ** (K + 4), where ** indicates
++     exponentiation.  Thus a K value of 1 means 32 data bytes and a K
++     value of 8 means 4096 data bytes.  The K value for a data packet
++     must be between 1 and 8 inclusive.
++
++checksum low byte
++checksum high byte
++     The checksum value is described below.
++
++control byte
++     The control byte indicates the type of packet, and is described
++     below.
++
++xor byte
++     This byte is the xor of K, the checksum low byte, the checksum
++     high byte and the control byte (i.e., the second, third, fourth and
++     fifth header bytes).  It is used to ensure that the header data is
++     valid.
++
++   The control byte in the header is composed of three bit fields,
++referred to here as TT (two bits), XXX (three bits) and YYY (three
++bits).  The control is TTXXXYYY, or `(TT << 6) + (XXX << 3) + YYY'.
++
++   The TT field takes on the following values:
++
++`0'
++     This is a control packet.  In this case the K byte in the header
++     must be 9.  The XXX field indicates the type of control packet;
++     these types are described below.
++
++`1'
++     This is an alternate data channel packet.  This is not used by
++     UUCP.
++
++`2'
++     This is a data packet, and the entire contents of the attached data
++     field (whose length is given by the K byte in the header) are
++     valid.  The XXX and YYY fields are described below.
++
++`3'
++     This is a short data packet.  Let the length of the data field (as
++     given by the K byte in the header) be L.  Let the first byte in
++     the data field be B1.  If B1 is less than 128 (if the most
++     significant bit of B1 is 0), then there are `L - B1' valid bytes
++     of data in the data field, beginning with the second byte.  If `B1
++     >= 128', let B2 be the second byte in the data field.  Then there
++     are `L - ((B1 & 0x7f) + (B2 << 7))' valid bytes of data in the
++     data field, beginning with the third byte.  In all cases L bytes
++     of data are sent (and all data bytes participate in the checksum
++     calculation) but some of the trailing bytes may be dropped by the
++     receiver.  The XXX and YYY fields are described below.
++
++   In a data packet (short or not) the XXX field gives the sequence
++number of the packet.  Thus sequence numbers can range from 0 to 7,
++inclusive.  The YYY field gives the sequence number of the last
++correctly received packet.
++
++   Each communication direction uses a window which indicates how many
++unacknowledged packets may be transmitted before waiting for an
++acknowledgement.  The window may range from 1 to 7, and may be different
++in each direction. For example, if the window is 3 and the last packet
++acknowledged was packet number 6, packet numbers 7, 0 and 1 may be sent
++but the sender must wait for an acknowledgement before sending packet
++number 2.  This acknowledgement could come as the YYY field of a data
++packet, or as the YYY field of a `RJ' or `RR' control packet (described
++below).
++
++   Each packet must be transmitted in order (the sender may not skip
++sequence numbers).  Each packet must be acknowledged, and each packet
++must be acknowledged in order.
++
++   In a control packet, the XXX field takes on the following values:
++
++1 `CLOSE'
++     The connection should be closed immediately.  This is typically
++     sent when one side has seen too many errors and wants to give up.
++     It is also sent when shutting down the protocol.  If an unexpected
++     `CLOSE' packet is received, a `CLOSE' packet should be sent in
++     reply and the `g' protocol should halt, causing UUCP to enter the
++     final handshake.
++
++2 `RJ' or `NAK'
++     The last packet was not received correctly.  The YYY field
++     contains the sequence number of the last correctly received packet.
++
++3 `SRJ'
++     Selective reject.  The YYY field contains the sequence number of a
++     packet that was not received correctly, and should be
++     retransmitted.  This is not used by UUCP, and most implementations
++     will not recognize it.
++
++4 `RR' or `ACK'
++     Packet acknowledgement.  The YYY field contains the sequence
++     number of the last correctly received packet.
++
++5 `INITC'
++     Third initialization packet.  The YYY field contains the maximum
++     window size to use.
++
++6 `INITB'
++     Second initialization packet.  The YYY field contains the packet
++     size to use.  It requests a size of 2 ** (YYY + 5).  Note that
++     this is not the same coding used for the K byte in the packet
++     header (it is 1 less).  Most UUCP implementations that request a
++     packet size larger than 64 bytes can handle any packet size up to
++     that specified.
++
++7 `INITA'
++     First initialization packet.  The YYY field contains the maximum
++     window size to use.
++
++   To compute the checksum, call the control byte (the fifth byte in the
++header) C.
++
++   The checksum of a control packet is simply `0xaaaa - C'.
++
++   The checksum of a data packet is `0xaaaa - (CHECK ^ C)', where `^'
++denotes exclusive or, and CHECK is the result of the following routine
++as run on the contents of the data field (every byte in the data field
++participates in the checksum, even for a short data packet).  Below is
++the routine used by an early version of Taylor UUCP; it is a slightly
++modified version of a routine which John Gilmore patched from G.L.
++Chesson's original paper.  The `z' argument points to the data and the
++`c' argument indicates how much data there is.
++
++     int
++     igchecksum (z, c)
++          register const char *z;
++          register int c;
++     {
++       register unsigned int ichk1, ichk2;
++
++       ichk1 = 0xffff;
++       ichk2 = 0;
++
++       do
++         {
++           register unsigned int b;
++
++           /* Rotate ichk1 left.  */
++           if ((ichk1 & 0x8000) == 0)
++             ichk1 <<= 1;
++           else
++             {
++               ichk1 <<= 1;
++               ++ichk1;
++             }
++
++           /* Add the next character to ichk1.  */
++           b = *z++ & 0xff;
++           ichk1 += b;
++
++           /* Add ichk1 xor the character position in the buffer counting from
++              the back to ichk2.  */
++           ichk2 += ichk1 ^ c;
++
++           /* If the character was zero, or adding it to ichk1 caused an
++              overflow, xor ichk2 to ichk1.  */
++           if (b == 0 || (ichk1 & 0xffff) < b)
++             ichk1 ^= ichk2;
++         }
++       while (--c > 0);
++
++       return ichk1 & 0xffff;
++     }
++
++   When the `g' protocol is started, the calling UUCP sends an `INITA'
++control packet with the window size it wishes the called UUCP to use.
++The called UUCP responds with an `INITA' packet with the window size it
++wishes the calling UUCP to use.  Pairs of `INITB' and `INITC' packets
++are then similarly exchanged.  When these exchanges are completed, the
++protocol is considered to have been started.
++
++   Note that the window and packet sizes are not a negotiation.  Each
++system announces the window and packet size which the other system
++should use.  It is possible that different window and packet sizes will
++be used in each direction.  The protocol works this way on the theory
++that each system knows how much data it can accept without getting
++overrun.  Therefore, each system tells the other how much data to send
++before waiting for an acknowledgement.
++
++   When a UUCP package transmits a command, it sends one or more data
++packets.  All the data packets will normally be complete, although some
++UUCP packages may send the last one as a short packet.  The command
++string is sent with a trailing null byte, to let the receiving package
++know when the command is finished.  Some UUCP packages require the last
++byte of the last packet sent to be null, even if the command ends
++earlier in the packet.  Some packages may require all the trailing bytes
++in the last packet to be null, but I have not confirmed this.
++
++   When a UUCP package sends a file, it will send a sequence of data
++packets.  The end of the file is signalled by a short data packet
++containing zero valid bytes (it will normally be preceeded by a short
++data packet containing the last few bytes in the file).
++
++   Note that the sequence numbers cover the entire communication
++session, including both command and file data.
++
++   When the protocol is shut down, each UUCP package sends a `CLOSE'
++control packet.
++
++\x1f
++File: uucp.info,  Node: f Protocol,  Next: t Protocol,  Prev: g Protocol,  Up: Protocols
++
++6.7 UUCP `f' Protocol
++=====================
++
++The `f' protocol is a seven bit protocol which checksums an entire file
++at a time.  It only uses the characters between `\040' and `\176'
++(ASCII `space' and `~') inclusive, as well as the carriage return
++character.  It can be very efficient for transferring text only data,
++but it is very inefficient at transferring eight bit data (such as
++compressed news).  It is not flow controlled, and the checksum is
++fairly insecure over large files, so using it over a serial connection
++requires handshaking (XON/XOFF can be used) and error correcting
++modems.  Some people think it should not be used even under those
++circumstances.
++
++   I believe that the `f' protocol originated in BSD versions of UUCP.
++It was originally intended for transmission over X.25 PAD links.
++
++   The `f' protocol has no startup or finish protocol.  However, both
++sides typically sleep for a couple of seconds before starting up,
++because they switch the terminal into XON/XOFF mode and want to allow
++the changes to settle before beginning transmission.
++
++   When a UUCP package transmits a command, it simply sends a string
++terminated by a carriage return.
++
++   When a UUCP package transmits a file, each byte B of the file is
++translated according to the following table:
++
++            0 <= B <=  037: 0172, B + 0100 (0100 to 0137)
++          040 <= B <= 0171:       B        ( 040 to 0171)
++         0172 <= B <= 0177: 0173, B - 0100 ( 072 to  077)
++         0200 <= B <= 0237: 0174, B - 0100 (0100 to 0137)
++         0240 <= B <= 0371: 0175, B - 0200 ( 040 to 0171)
++         0372 <= B <= 0377: 0176, B - 0300 ( 072 to  077)
++
++   That is, a byte between `\040' and `\171' inclusive is transmitted
++as is, and all other bytes are prefixed and modified as shown.
++
++   When all the file data is sent, a seven byte sequence is sent: two
++bytes of `\176' followed by four ASCII bytes of the checksum as printed
++in base 16 followed by a carriage return.  For example, if the checksum
++was 0x1234, this would be sent: `\176\1761234\r'.
++
++   The checksum is initialized to 0xffff.  For each byte that is sent
++it is modified as follows (where B is the byte before it has been
++transformed as described above):
++
++           /* Rotate the checksum left.  */
++           if ((ichk & 0x8000) == 0)
++             ichk <<= 1;
++           else
++             {
++               ichk <<= 1;
++               ++ichk;
++             }
++
++           /* Add the next byte into the checksum.  */
++           ichk += B;
++
++   When the receiving UUCP sees the checksum, it compares it against its
++own calculated checksum and replies with a single character followed by
++a carriage return.
++
++`G'
++     The file was received correctly.
++
++`R'
++     The checksum did not match, and the file should be resent from the
++     beginning.
++
++`Q'
++     The checksum did not match, but too many retries have occurred and
++     the communication session should be abandoned.
++
++   The sending UUCP checks the returned character and acts accordingly.
++
++\x1f
++File: uucp.info,  Node: t Protocol,  Next: e Protocol,  Prev: f Protocol,  Up: Protocols
++
++6.8 UUCP `t' Protocol
++=====================
++
++The `t' protocol is intended for use on links which provide reliable
++end-to-end connections, such as TCP.  It does no error checking or flow
++control, and requires an eight bit clear channel.
++
++   I believe the `t' protocol originated in BSD versions of UUCP.
++
++   When a UUCP package transmits a command, it first gets the length of
++the command string, C.  It then sends `((C / 512) + 1) * 512' bytes
++(the smallest multiple of 512 which can hold C bytes plus a null byte)
++consisting of the command string itself followed by trailing null bytes.
++
++   When a UUCP package sends a file, it sends it in blocks.  Each block
++contains at most 1024 bytes of data.  Each block consists of four bytes
++containing the amount of data in binary (most significant byte first,
++the same format as used by the Unix function `htonl') followed by that
++amount of data.  The end of the file is signalled by a block containing
++zero bytes of data.
++
++\x1f
++File: uucp.info,  Node: e Protocol,  Next: Big G Protocol,  Prev: t Protocol,  Up: Protocols
++
++6.9 UUCP `e' Protocol
++=====================
++
++The `e' protocol is similar to the `t' protocol.  It does no flow
++control or error checking and is intended for use over networks
++providing reliable end-to-end connections, such as TCP.
++
++   The `e' protocol originated in versions of HDB UUCP.
++
++   When a UUCP package transmits a command, it simply sends the command
++as an ASCII string terminated by a null byte.
++
++   When a UUCP package transmits a file, it sends the complete size of
++the file as an ASCII decimal number.  The ASCII string is padded out to
++20 bytes with null bytes (i.e. if the file is 1000 bytes long, it sends
++`1000\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0').  It then sends the entire file.
++
++\x1f
++File: uucp.info,  Node: Big G Protocol,  Next: i Protocol,  Prev: e Protocol,  Up: Protocols
++
++6.10 UUCP `G' Protocol
++======================
++
++The `G' protocol is used by SVR4 UUCP.  It is identical to the `g'
++protocol, except that it is possible to modify the window and packet
++sizes.  The SVR4 implementation of the `g' protocol reportedly is fixed
++at a packet size of 64 and a window size of 7.  Supposedly SVR4 chose
++to implement a new protocol using a new letter to avoid any potential
++incompatibilities when using different packet or window sizes.
++
++   Most implementations of the `g' protocol that accept packets larger
++than 64 bytes will also accept packets smaller than whatever they
++requested in the `INITB' packet.  The SVR4 `G' implementation is an
++exception; it will only accept packets of precisely the size it
++requests in the INITB packet.
++
++\x1f
++File: uucp.info,  Node: i Protocol,  Next: j Protocol,  Prev: Big G Protocol,  Up: Protocols
++
++6.11 UUCP `i' Protocol
++======================
++
++The `i' protocol was written by Ian Lance Taylor (who also wrote this
++manual).  It was first used by Taylor UUCP version 1.04.
++
++   It is a sliding window packet protocol, like the `g' protocol, but
++it supports bidirectional transfers (i.e., file transfers in both
++directions simultaneously).  It requires an eight bit clear connection.
++Several ideas for the protocol were taken from the paper `A
++High-Throughput Message Transport System' by P. Lauder.  I don't know
++where the paper was published, but the author's e-mail address is
++<piers@cs.su.oz.au>.  The `i' protocol does not adopt his main idea,
++which is to dispense with windows entirely.  This is because some links
++still do require flow control and, more importantly, because using
++windows sets a limit to the amount of data which the protocol must be
++able to resend upon request.  To reduce the costs of window
++acknowledgements, the protocol uses a large window and only requires an
++ack at the halfway point.
++
++   Each packet starts with a six byte header, optionally followed by
++data bytes with a four byte checksum.  There are currently five defined
++packet types (`DATA', `SYNC', `ACK', `NAK', `SPOS', `CLOSE') which are
++described below.  Although any packet type may include data, any data
++provided with an `ACK', `NAK' or `CLOSE' packet is ignored.
++
++   Every `DATA', `SPOS' and `CLOSE' packet has a sequence number.  The
++sequence numbers are independent for each side.  The first packet sent
++by each side is always number 1.  Each packet is numbered one greater
++than the previous packet, modulo 32.
++
++   Every packet has a local channel number and a remote channel number.
++For all packets at least one channel number is zero.  When a UUCP
++command is sent to the remote system, it is assigned a non-zero local
++channel number.  All packets associated with that UUCP command sent by
++the local system are given the selected local channel number.  All
++associated packets sent by the remote system are given the selected
++number as the remote channel number.  This permits each UUCP command to
++be uniquely identified by the channel number on the originating system,
++and therefore each UUCP package can associate all file data and UUCP
++command responses with the appropriate command.  This is a requirement
++for bidirectional UUCP transfers.
++
++   The protocol maintains a single global file position, which starts
++at 0.  For each incoming packet, any associated data is considered to
++occur at the current file position, and the file position is
++incremented by the amount of data contained.  The exception is a packet
++of type `SPOS', which is used to change the file position.  The reason
++for keeping track of the file position is described below.
++
++   The header is as follows:
++
++`\007'
++     Every packet begins with `^G'.
++
++`(PACKET << 3) + LOCCHAN'
++     The five bit packet number combined with the three bit local
++     channel number.  `DATA', `SPOS' and `CLOSE' packets use the packet
++     sequence number for the PACKET field.  `NAK' packet types use the
++     PACKET field for the sequence number to be resent.  `ACK' and
++     `SYNC' do not use the PACKET field, and generally leave it set to
++     0.  Packets which are not associated with a UUCP command from the
++     local system use a local channel number of 0.
++
++`(ACK << 3) + REMCHAN'
++     The five bit packet acknowledgement combined with the three bit
++     remote channel number.  The packet acknowledgement is the number
++     of the last packet successfully received; it is used by all packet
++     types.  Packets which are not sent in response to a UUCP command
++     from the remote system use a remote channel number of 0.
++
++`(TYPE << 5) + (CALLER << 4) + LEN1'
++     The three bit packet type combined with the one bit packet
++     direction combined with the upper four bits of the data length.
++     The packet direction bit is always 1 for packets sent by the
++     calling UUCP, and 0 for packets sent by the called UUCP.  This
++     prevents confusion caused by echoed packets.
++
++LEN2
++     The lower eight bits of the data length.  The twelve bits of data
++     length permit packets ranging in size from 0 to 4095 bytes.
++
++CHECK
++     The exclusive or of the second through fifth bytes of the header.
++     This provides an additional check that the header is valid.
++
++   If the data length is non-zero, the packet is immediately followed by
++the specified number of data bytes.  The data bytes are followed by a
++four byte CRC 32 checksum, with the most significant byte first.  The
++CRC is calculated over the contents of the data field.
++
++   The defined packet types are as follows:
++
++0 `DATA'
++     This is a plain data packet.
++
++1 `SYNC'
++     `SYNC' packets are exchanged when the protocol is initialized, and
++     are described further below.  `SYNC' packets do not carry sequence
++     numbers (that is, the PACKET field is ignored).
++
++2 `ACK'
++     This is an acknowledgement packet.  Since `DATA' packets also carry
++     packet acknowledgements, `ACK' packets are only used when one side
++     has no data to send.  `ACK' packets do not carry sequence numbers.
++
++3 `NAK'
++     This is a negative acknowledgement.  This is sent when a packet is
++     received incorrectly, and means that the packet number appearing
++     in the PACKET field must be resent.  `NAK' packets do not carry
++     sequence numbers (the PACKET field is already used).
++
++4 `SPOS'
++     This packet changes the file position.  The packet contains four
++     bytes of data holding the file position, most significant byte
++     first.  The next packet received will be considered to be at the
++     named file position.
++
++5 `CLOSE'
++     When the protocol is shut down, each side sends a `CLOSE' packet.
++     This packet does have a sequence number, which could be used to
++     ensure that all packets were correctly received (this is not
++     needed by UUCP, however, which uses the higher level `H' command
++     with an `HY' response).
++
++   When the protocol starts up, both systems send a `SYNC' packet.  The
++`SYNC' packet includes at least three bytes of data.  The first two
++bytes are the maximum packet size the remote system should send, most
++significant byte first.  The third byte is the window size the remote
++system should use.  The remote system may send packets of any size up
++to the maximum.  If there is a fourth byte, it is the number of
++channels the remote system may use (this must be between 1 and 7,
++inclusive).  Additional data bytes may be defined in the future.
++
++   The window size is the number of packets that may be sent before a
++packet is acknowledged.  There is no requirement that every packet be
++acknowledged; any acknowledgement is considered to acknowledge all
++packets through the number given.  In the current implementation, if one
++side has no data to send, it sends an `ACK' when half the window is
++received.
++
++   Note that the `NAK' packet corresponds to the unused `g' protocol
++`SRJ' packet type, rather than to the `RJ' packet type.  When a `NAK'
++is received, only the named packet should be resent, not any subsequent
++packets.
++
++   Note that if both sides have data to send, but a packet is lost, it
++is perfectly reasonable for one side to continue sending packets, all of
++which will acknowledge the last packet correctly received, while the
++system whose packet was lost will be unable to send a new packet because
++the send window will be full.  In this circumstance, neither side will
++time out and one side of the communication will be effectively shut down
++for a while.  Therefore, any system with outstanding unacknowledged
++packets should arrange to time out and resend a packet even if data is
++being received.
++
++   Commands are sent as a sequence of data packets with a non-zero local
++channel number.  The last data packet for a command includes a trailing
++null byte (normally a command will fit in a single data packet).  Files
++are sent as a sequence of data packets ending with one of length zero.
++
++   The channel numbers permit a more efficient implementation of the
++UUCP file send command.  Rather than send the command and then wait for
++the `SY' response before sending the file, the file data is sent
++beginning immediately after the `S' command is sent.  If an `SN'
++response is received, the file send is aborted, and a final data packet
++of length zero is sent to indicate that the channel number may be
++reused.  If an `SY' reponse with a file position indicator is received,
++the file send adjusts to the file position; this is why the protocol
++maintains a global file position.
++
++   Note that the use of channel numbers means that each UUCP system may
++send commands and file data simultaneously.  Moreover, each UUCP system
++may send multiple files at the same time, using the channel number to
++disambiguate the data.  Sending a file before receiving an
++acknowledgement for the previous file helps to eliminate the round trip
++delays inherent in other UUCP protocols.
++
+--- uucp-1.07.orig/unix/pipe.c
++++ uucp-1.07/unix/pipe.c
+@@ -199,6 +199,7 @@ fspipe_dial (qconn, puuconf, qsys, zphon
+   struct ssysdep_conn *q;
+   int aidescs[3];
+   const char **pzprog;
++  char **p;
+ 
+   q = (struct ssysdep_conn *) qconn->psysdep;
+ 
+@@ -211,6 +212,11 @@ fspipe_dial (qconn, puuconf, qsys, zphon
+       ulog (LOG_ERROR, "No command for pipe connection");
+       return FALSE;
+     }
++  
++  /* Look for a string \H and replaced it by the address given for this system */
++  for (p=pzprog; *p; p++)
++    if (!strcmp(*p, "\\H"))
++      *p = zphone;
+ 
+   aidescs[0] = SPAWN_WRITE_PIPE;
+   aidescs[1] = SPAWN_READ_PIPE;
+--- uucp-1.07.orig/contrib/uurate.c
++++ uucp-1.07/contrib/uurate.c
+@@ -216,7 +216,7 @@ struct Protocol_Summary
+ struct Host_entry
+     {
+     struct Host_entry *next;
+-    char Hostname[32];
++    char Hostname[MAXHOSTNAMELEN];
+     struct Execution_Command *cmds;      /* Local Activities */
+     struct Phone_Call call[2];            /* In & Out Activities */
+     struct Protocol_Summary *proto;
+--- uucp-1.07.orig/contrib/Makefile.uurt
++++ uucp-1.07/contrib/Makefile.uurt
+@@ -17,9 +17,9 @@ MAN=$(prefix)/man/man1
+ newconfigdir = $(prefix)/conf/uucp
+ 
+ # Flags to use when compiling uurate
+-CC=gcc -O2
+-CFLAGS=-I.. -Wall
+-LDFLAGS=-s -lm
++CC=gcc
++CFLAGS+=-I..
++LDFLAGS=-lm
+ 
+ SHELL=/bin/sh
+ PROGS=uurate
+ 
diff --git a/srcpkgs/uucp/patches/wait-for-correct-parent.patch b/srcpkgs/uucp/patches/wait-for-correct-parent.patch
new file mode 100644
index 000000000000..50bbcd9ed8ac
--- /dev/null
+++ b/srcpkgs/uucp/patches/wait-for-correct-parent.patch
@@ -0,0 +1,19 @@
+Description: wait for correct parent to die
+Author: Jörg Sommer <joerg@jo-so.de>
+Index: uucp-1.07/unix/detach.c
+===================================================================
+--- uucp-1.07.orig/unix/detach.c	2019-03-02 16:36:11.238947732 +0100
++++ uucp-1.07/unix/detach.c	2019-03-02 16:37:21.850946777 +0100
+@@ -98,10 +98,8 @@
+       if (ipid != 0)
+ 	_exit (EXIT_SUCCESS);
+ 
+-      /* We'll always wind up as a child of process number 1, right?
+-	 Right?  We have to wait for our parent to die before
+-	 reenabling SIGHUP.  */
+-      while (getppid () != 1)
++      /* We have to wait for our parent to die before reenabling SIGHUP. */
++      while (getppid () == igrp)
+ 	sleep (1);
+ 
+       ipid = getpid ();
diff --git a/srcpkgs/uucp/patches/zpipe-improved-pipe.patch b/srcpkgs/uucp/patches/zpipe-improved-pipe.patch
new file mode 100644
index 000000000000..fef1c42a2c52
--- /dev/null
+++ b/srcpkgs/uucp/patches/zpipe-improved-pipe.patch
@@ -0,0 +1,40 @@
+Author: Rafael Diniz <rafael@rhizomatica.org>
+Description: 
+ remove ATTRIBUTE_UNUSED of the parameter uucp-org.patch uses
+ add the possibility to send the system name to be called in pipe command
+ (use \Z as place holder for the system name)
+Index: uucp-1.07/unix/pipe.c
+===================================================================
+--- uucp-1.07.orig/unix/pipe.c	2019-08-17 23:06:47.774519770 +0200
++++ uucp-1.07/unix/pipe.c	2019-08-17 23:06:47.742519770 +0200
+@@ -225,8 +225,8 @@
+ fspipe_dial (qconn, puuconf, qsys, zphone, qdialer, ptdialer)
+      struct sconnection *qconn;
+      pointer puuconf;
+-     const struct uuconf_system *qsys ATTRIBUTE_UNUSED;
+-     const char *zphone ATTRIBUTE_UNUSED;
++     const struct uuconf_system *qsys;
++     const char *zphone;
+      struct uuconf_dialer *qdialer;
+      enum tdialerfound *ptdialer;
+ {
+@@ -246,12 +246,17 @@
+       ulog (LOG_ERROR, "No command for pipe connection");
+       return FALSE;
+     }
+-  
+-  /* Look for a string \H and replaced it by the address given for this system */
++
++  /* Look for a string \H and replace it by the address given for this system */
+   for (p=pzprog; *p; p++)
+     if (!strcmp(*p, "\\H"))
+       *p = zphone;
+ 
++  /* Look for a string \Z and replace by the system name to be called */
++  for (p=pzprog; *p; p++)
++    if (!strcmp(*p, "\\Z"))
++      *p = qsys->uuconf_zname;
++
+   aidescs[0] = SPAWN_WRITE_PIPE;
+   aidescs[1] = SPAWN_READ_PIPE;
+   aidescs[2] = SPAWN_NULL;
diff --git a/srcpkgs/uucp/template b/srcpkgs/uucp/template
new file mode 100644
index 000000000000..2b2b6f758fae
--- /dev/null
+++ b/srcpkgs/uucp/template
@@ -0,0 +1,39 @@
+# Template file for 'uucp'
+pkgname=uucp
+version=1.07
+revision=1
+build_style=gnu-configure
+conf_files="/etc/uucp/config /etc/uucp/sys1 /etc/uucp/port"
+makedepends="wget"
+short_desc="Taylor UUCP is a free implementation of UUCP"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://www.gnu.org/software/uucp/uucp.html"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c
+patch_args="-Np1"
+
+system_accounts="_uucp"
+_uucp_homedir="/var/spool/uucp"
+
+make_dirs="
+	/var/spool/uucp		0750 uucp uucp
+	/var/spool/uucppublic	0750 uucp uucp"
+
+pre_configure() {
+	sed -i 's|${CC-cc} -E|${CC-cc} -E|g' configure
+}
+do_install() {
+	make DESTDIR=${DESTDIR} install
+	vmkdir etc/uucp/
+	vinstall sample/config 0644 etc/uucp/
+	vinstall sample/sys1 0644 etc/uucp/
+	vinstall sample/port 0644 etc/uucp/
+	sed -i 's|\$\*|"$@"|' ${DESTDIR}/usr/bin/{uuto,uusched}
+	chmod u+w ${DESTDIR}/usr/bin/*
+	vman ${FILESDIR}/uulog.1
+	vman ${FILESDIR}/uuname.1
+	vman ${FILESDIR}/uupick.1
+	vman ${FILESDIR}/uuto.1
+	vman ${FILESDIR}/uusched.8
+}

From bb1088509bdab933631fa56e1ff62e00ec7e4d32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 12:28:43 +0200
Subject: [PATCH 1468/2561] krita: update to 5.0.5.

---
 srcpkgs/krita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..68e67ccb8157 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=5.0.2
+version=5.0.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -22,7 +22,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=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
+checksum=162fff4596484e688655d4636373b1a77bcea39824c655b477afc1463aaf2dae
 python_version=3
 replaces="calligra-krita>=0"
 make_check=no

From 1b23a594103926162505e36b6855afe9c90901af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 12:30:15 +0200
Subject: [PATCH 1469/2561] pioneer: update to 20220203.

---
 srcpkgs/pioneer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..9614ba1f1ade 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20220203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=415b55bab7f011f7244348428e13006fa67a926b9be71f2c4ad24e92cfeb051c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"

From c1493eeadf63fb428ed12ca8f24e5134bad5fc64 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Mon, 18 Apr 2022 12:09:41 -0500
Subject: [PATCH 1470/2561] google-chrome: update to 100.0.4896.127

---
 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 5f9e67c864f2..b20753366d95 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=100.0.4896.75
+version=100.0.4896.127
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=856934272783e5a48fa63e30eb896040f5b46d6f394c1b3aa2e461cbf89b395b
+checksum=d012bc3e5e000bffbd83cf20c48add187c52b065cc37408862c42d127aa4a656
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From a6c95c3aa98ab472e72f00364c1b0916943f6e24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 19:40:56 +0200
Subject: [PATCH 1471/2561] krita: remove patch

---
 ...5beaa1fdba03d38f887b93a15a58fc0830c7.patch | 50 -------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch

diff --git a/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch b/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch
deleted file mode 100644
index 6c9c71d4fca2..000000000000
--- a/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
-From: Sharaf Zaman <shzam@sdf.org>
-Date: Wed, 27 Oct 2021 22:19:07 +0000
-Subject: [PATCH] Fix build on linux clang targets
-
-In CheckAtomic.cmake we include is_lock_free because these routines
-don't seem to be included in the compiler's "simple atomics". This
-triggers a failure in clang toolchain, forcing it to link libatomic.
-
-Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
-
-CCBUG:444247
-CCBUG:444547
----
- cmake/modules/CheckAtomic.cmake | 1 +
- libs/image/CMakeLists.txt       | 6 ++----
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
-index b061e2d65b..df6b70504c 100644
---- a/cmake/modules/CheckAtomic.cmake
-+++ b/cmake/modules/CheckAtomic.cmake
-@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
- 	std::atomic<uint64_t> x (0);
- 	int main() {
- 		uint64_t i = x.load(std::memory_order_relaxed);
-+		x.is_lock_free();
- 		return 0;
- 	}
- 	" ${varname})
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index e883c7f1c8..43c945fad3 100644
---- a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
- 
- target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
- 
--if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
--    if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
--        target_link_libraries(kritaimage PUBLIC atomic)
--    endif()
-+if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
-+   target_link_libraries(kritaimage PUBLIC atomic)
- endif()
- 
- if(OpenEXR_FOUND)
--- 
-GitLab
-

From f579263d4ec79f983fe0bd2d8ee9446a20d72ff5 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sat, 9 Apr 2022 10:10:18 -0400
Subject: [PATCH 1472/2561] python3-trimesh: update to 3.10.8.

---
 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 e51b6eb62f9d..0a162818e7cb 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.10.7
+version=3.10.8
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -16,7 +16,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=e98fd2dff632729fc6fb963653b91d9f4a5a6a9a1f79493dd885e3e4d1f9c4da
+checksum=465d30b17e1f62c467283422eb932b70ff4807f9346f3012195ac94675c837f3
 
 post_install() {
 	vlicense LICENSE.md

From 462aa7eb9fb81b3538d844de142516543daf2832 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 18 Apr 2022 16:07:28 +0200
Subject: [PATCH 1473/2561] celluloid: update to 0.23.

---
 srcpkgs/celluloid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template
index c9f0461fb42e..739911562045 100644
--- a/srcpkgs/celluloid/template
+++ b/srcpkgs/celluloid/template
@@ -1,6 +1,6 @@
 # Template file for 'celluloid'
 pkgname=celluloid
-version=0.22
+version=0.23
 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=5fded5b7bbf15ef110548bcc980ceec981f5f1a70df77ad3f10e3ca4a449e5a1
+checksum=b22d1963d03f0215bce07c2de8e77892c322f500ae5c0fd6e2e84d2e13f04374
 
 gnome-mpv_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 456d5d37ebc225525b076cc5b2a50bead9ef40e8 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 18 Apr 2022 12:21:09 +0700
Subject: [PATCH 1474/2561] mdBook: update to 0.4.18

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index d2aa033512fa..d4b97f2a5d03 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.17
+version=0.4.18
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=9523d0bed63ce35eec5a8259eb963651cd7e37ec5644ef551134068a2fb72f89
+checksum=ce357327f4443189fde307103f8008f43410ca8b738c5c61401ada9a54b8b5b5
 
 post_install() {
 	vlicense LICENSE

From fc3ce7eaa157a9d882758839ccc083ec982f56d3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 18 Apr 2022 15:41:44 +0200
Subject: [PATCH 1475/2561] jpegoptim: update to 1.4.7.

---
 srcpkgs/jpegoptim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jpegoptim/template b/srcpkgs/jpegoptim/template
index d11aa4be4f78..13dbf5ffaedd 100644
--- a/srcpkgs/jpegoptim/template
+++ b/srcpkgs/jpegoptim/template
@@ -1,6 +1,6 @@
 # Template file for 'jpegoptim'
 pkgname=jpegoptim
-version=1.4.6
+version=1.4.7
 revision=1
 wrksrc="${pkgname}-RELEASE.${version}"
 build_style=gnu-configure
@@ -10,4 +10,4 @@ maintainer="archaeme <normandy@firemail.cc>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/tjko/jpegoptim"
 distfiles="https://github.com/tjko/jpegoptim/archive/RELEASE.${version}.tar.gz"
-checksum=c44dcfac0a113c3bec13d0fc60faf57a0f9a31f88473ccad33ecdf210b4c0c52
+checksum=9d2a13b7c531d122f360209422645206931c74ada76497c4aeb953610f0d70c1

From 6dcf5953c36fddaebc642bf1fe2e118c3ea9d5ff Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 17 Apr 2022 20:25:38 +0200
Subject: [PATCH 1476/2561] xh: update to 0.16.0

---
 srcpkgs/xh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xh/template b/srcpkgs/xh/template
index eddc9c125106..e40a27df688d 100644
--- a/srcpkgs/xh/template
+++ b/srcpkgs/xh/template
@@ -1,6 +1,6 @@
 # Template file for 'xh'
 pkgname=xh
-version=0.14.1
+version=0.16.0
 revision=1
 # depends on ring
 archs="x86_64* i686* armv[67]* aarch64*"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/ducaale/xh"
 changelog="https://raw.githubusercontent.com/ducaale/xh/master/CHANGELOG.md"
 distfiles="https://github.com/ducaale/xh/archive/v${version}.tar.gz"
-checksum=ca89e8a9a230ff16cc0bba5bd7ebdceb986eac84638e15b4928d737b9ec12776
+checksum=d6ec84977da567dd36a4c59d624dc1e2b1c77a21e2b0a10e463216120be8112d
 
 post_install() {
 	ln -sf ${pkgname} ${DESTDIR}/usr/bin/${pkgname}s

From c7a7678bd8f487e5379b00c02f73d9c79b5b474f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Apr 2022 19:34:19 +0200
Subject: [PATCH 1477/2561] sfeed: update to 1.4.

---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 46b4d83e558b..fd5f0fe156d7 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.3
+version=1.4
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -11,7 +11,7 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=49d32e98a47a80a2a6cbd5d816938057d4ca3910e0a6a814b2c2a6520fbda9ba
+checksum=3c90f4bef1becdf583cc0ae201e694459edcd024e1d76bfeed3f417ecc163498
 
 post_install() {
 	vlicense LICENSE

From a30821d190974a1f037742947926e14c92651893 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Apr 2022 19:10:10 +0200
Subject: [PATCH 1478/2561] xfce4-panel: update to 4.16.4.

---
 srcpkgs/xfce4-panel/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 210113d3d67d..ce83d56a6c70 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
-version=4.16.3
-revision=2
+version=4.16.4
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-locales-dir=/usr/share/locale
@@ -12,9 +12,9 @@ makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel
 short_desc="Next generation panel for the XFCE desktop environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://xfce.org/"
+homepage="https://docs.xfce.org/xfce/xfce4-panel/start"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=5934eaed8a76da52c29b734ccd79600255420333dd6ebd8fd9f066379af1e092
+checksum=1faf51a81a655244dba4c6ac9dd33e3ab0d78a9ee096c218b38fed6642c9cd84
 
 # Package build options
 build_options="gir"

From 66b32fbacf1af5a5a37173af717bec91c0c85d96 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 18:09:35 +0200
Subject: [PATCH 1479/2561] gnome-settings-daemon: remove pulseaudio dependency

---
 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 9f8c9857eec6..c8be36b2a457 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
 version=41.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -11,7 +11,7 @@ makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-dev
  libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel
  polkit-devel pulseaudio-devel startup-notification-devel upower-devel
  xf86-input-wacom-devel libXfixes-devel"
-depends="hicolor-icon-theme pulseaudio"
+depends="hicolor-icon-theme"
 checkdepends="elogind libnotify python3-dbusmock python3-gobject
  python3-pycodestyle which hwids eudev"
 short_desc="GNOME settings daemon"

From 1a20b58285290bac7ea62ab623bc134d28d6d8d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 18:09:35 +0200
Subject: [PATCH 1480/2561] mkchromecast: remove pulseaudio dependency

---
 srcpkgs/mkchromecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkchromecast/template b/srcpkgs/mkchromecast/template
index 161210796b90..306abdb6613f 100644
--- a/srcpkgs/mkchromecast/template
+++ b/srcpkgs/mkchromecast/template
@@ -1,11 +1,11 @@
 # Template file for 'mkchromecast'
 pkgname=mkchromecast
 version=0.3.8.1
-revision=4
+revision=5
 pycompile_dirs="/usr/share/mkchromecast/mkchromecast"
 depends="python3-Flask python3-netifaces python3-setuptools python3-requests
  python3-mutagen python3-psutil python3-PyQt5 python3-SoCo python3-chromecast
- python3-gobject pulseaudio python3-youtube-dl ffmpeg"
+ python3-gobject python3-youtube-dl ffmpeg"
 short_desc="Cast Linux Audio/Video to Google cast and Sonos devices"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From d1d7e6380871c117d0e1cbedb3d8af72cf6e13f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 18:09:35 +0200
Subject: [PATCH 1481/2561] pasystray: remove pulseaudio dependency

---
 srcpkgs/pasystray/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/pasystray/template b/srcpkgs/pasystray/template
index a25bcc5af5b8..fc553ddc05fe 100644
--- a/srcpkgs/pasystray/template
+++ b/srcpkgs/pasystray/template
@@ -1,12 +1,11 @@
 # Template file for 'pasystray'
 pkgname=pasystray
 version=0.7.1
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool automake"
 makedepends="gtk+3-devel pulseaudio-devel libnotify-devel"
-depends="pulseaudio"
 short_desc="PulseAudio System Tray"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"

From 110be3b92986eeb5d1f63f30c06904085720aa6d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 15:55:01 -0700
Subject: [PATCH 1482/2561] kitinerary: temporarily ignore test failure

This test was fixed upstream, so this should be
 able to be removed after the next update
---
 .../temporarily-disable-broken-test.patch        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch

diff --git a/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch b/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch
new file mode 100644
index 000000000000..4e7bb1ce88bd
--- /dev/null
+++ b/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch
@@ -0,0 +1,16 @@
+Temporarily disable the calendarhandler test.
+This test has been fixed upstream, so this should be able to be
+ removed in the next release.
+
+diff -Naur a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+--- a/autotests/CMakeLists.txt	2022-04-18 11:34:57.356111303 -0700
++++ b/autotests/CMakeLists.txt	2022-04-18 11:33:56.175938220 -0700
+@@ -35,7 +35,7 @@
+ ecm_add_test(postprocessortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
+ ecm_add_test(extractorvalidatortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
+ if (TARGET KF5::CalendarCore)
+-    ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
++   #ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
+     ecm_add_test(extractortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary KPim::PkPass)
+ endif()
+ ecm_add_test(documentutiltest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)

From 0f29e7b0520757e55303a1677abecbab6f3c0fde Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 18 Apr 2022 15:22:04 +0700
Subject: [PATCH 1483/2561] signond: update to 8.61

---
 srcpkgs/signond/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/signond/template b/srcpkgs/signond/template
index 9a2f0cff8c26..6a3bb44122ab 100644
--- a/srcpkgs/signond/template
+++ b/srcpkgs/signond/template
@@ -1,7 +1,7 @@
 # Template file for 'signond'
 pkgname=signond
-version=8.60
-revision=3
+version=8.61
+revision=1
 wrksrc="signond-VERSION_${version}"
 build_style=qmake
 configure_args="LIBDIR=/usr/lib"
@@ -13,7 +13,7 @@ maintainer="John Rowley <enterthevoid@codesector.co>"
 license="LGPL-2.1-only"
 homepage="https://gitlab.com/accounts-sso/signond"
 distfiles="${homepage}/-/archive/VERSION_${version}/signond-VERSION_${version}.tar.gz"
-checksum=0da2a080e4b01f44855d1a519f828007a5c756ee93827db9098a1b4b880f28fe
+checksum=3dd57c25e1bf1583b2cb857f96831e38e73d40264ff66ca43e63bb7233f76828
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then

From 454e6d330e94b23777c35f52570370cd72939975 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 18:17:16 +0200
Subject: [PATCH 1484/2561] aisleriot: update to 3.22.22.

---
 srcpkgs/aisleriot/patches/guile-2.2.patch | 36 -----------------------
 srcpkgs/aisleriot/template                |  4 +--
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/aisleriot/patches/guile-2.2.patch

diff --git a/srcpkgs/aisleriot/patches/guile-2.2.patch b/srcpkgs/aisleriot/patches/guile-2.2.patch
deleted file mode 100644
index eb2ce5610b44..000000000000
--- a/srcpkgs/aisleriot/patches/guile-2.2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5e9b538db5304ccfed6c0d048a94d8c47dd27e31 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jeremy.bicha@canonical.com>
-Date: Thu, 17 Feb 2022 23:51:15 +0100
-Subject: [PATCH] games: Only use -Ono-letrectify with guile 3.0
-
-This fixes a build failure on guile 2.2 where this flag is unknown.
-
-Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/925
----
- games/meson.build | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/games/meson.build b/games/meson.build
-index e552beab..56819b4d 100644
---- a/games/meson.build
-+++ b/games/meson.build
-@@ -122,9 +122,13 @@ guile_warnings = [
-   '-W1',
- ]
- 
--guile_flags = [
--  '-Ono-letrectify',
--]
-+guile_flags = []
-+
-+if guile_version.version_compare('>= 3.0')
-+  guile_flags += [
-+    '-Ono-letrectify',
-+  ]
-+endif
- 
- # FIXME: this should use files('...') (allowed as per docs),
- # but that crashes meson, see https://gitlab.gnome.org/chpe/meson/issues/2
--- 
-GitLab
-
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d4d178b13c9e..11ad75cf3ad8 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.21
+version=3.22.22
 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=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655
+checksum=0666b7b35037f796334cda104be5bda65977053f3cab0a3928624da7f236f8ae
 replaces="aisleriot-data>=0"

From c15cfb1f413178d8f83eebd3de865c377a0aabb8 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Fri, 15 Apr 2022 15:27:17 +0200
Subject: [PATCH 1485/2561] qtractor: update to 0.9.26

---
 srcpkgs/qtractor/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index b9df4028f2ac..9ccd9cb666b7 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -1,8 +1,8 @@
 # Template file for 'qtractor'
 pkgname=qtractor
-version=0.9.24
+version=0.9.26
 revision=1
-_vst3sdk_tag=3.7.3_build_20
+_vst3sdk_tag=3.7.4_build_25
 wrksrc="qtractor-qtractor_${version//./_}"
 create_wrksrc=yes
 build_wrksrc="qtractor-qtractor_${version//./_}"
@@ -24,11 +24,11 @@ distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.ta
  https://github.com/steinbergmedia/vst3_base/archive/v$_vst3sdk_tag.tar.gz>vst3_base-v${_vst3sdk_tag}.tar.gz
  https://github.com/steinbergmedia/vst3_pluginterfaces/archive/v$_vst3sdk_tag.tar.gz>vst3_pluginterfaces-v${_vst3sdk_tag}.tar.gz
  https://github.com/steinbergmedia/vst3_public_sdk/archive/v$_vst3sdk_tag.tar.gz>vst3_public_sdk-v${_vst3sdk_tag}.tar.gz"
-checksum="724b80587f844cfc7c58c22d69d6ff1cd30c7752c2116e55837f468edb6bf4d1
- 815e51e84e6ed900f6103f00e847bee175c2dc95b16a73ae60719daa0e24ad95
- d69d28a6a932d3c946749c9aeb6220b028d7af7ab10f83e4e732e760347fe796
- 313f3e8c8f080d514763b3e88964a0820851d81f1159219628e1ed188fdb7303
- 63cd7e3bf0be8ec9b3934ebdc145e13af84004c988071ecbed1aa5c8f8277d80"
+checksum="bf1f89a805166e99ca4b9bfc66f8bb1d71a258bf611b1e9e90613cd46799e6a4
+ 24f79a670d8f3c7aac34e1340f2d12763beabc9229d61b6f806d850675c8c5f6
+ ee333bd17ad533135481c163d85c99fe4d3cdb3e49214eb5adb17ffb1897a423
+ 59326a77b5df73ec6a35925a4005874ee3e29a2dbd6e6b88905d03b90fc9c3a5
+ 3b321b7f2289c7204bceae1f6640d74b6cf35b474f98da7a50ed36c24e019831"
 
 post_extract() {
 	cd $wrksrc

From aa34d71e5518e54f88639f61bd7a83fcb22c607e Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Fri, 15 Apr 2022 12:21:27 +0200
Subject: [PATCH 1486/2561] mkvtoolnix: update to 67.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 98317332f361..7f84979ecc3f 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=66.0.0
+version=67.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ 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=73a3f6c39b3580f28233f93555d282d07d5f51a8bbeb8b0bee09b820de80692c
+checksum=db68be91ee8a0b688d924cc00d3bac9349306d54c29ce44a555728c1abb7d3ec
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 327a6833319bc7a4438e6a3c38ef18deca6e4c36 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 18 Mar 2022 17:42:40 +0200
Subject: [PATCH 1487/2561] yaru: update to 22.04.4.

---
 srcpkgs/yaru/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yaru/template b/srcpkgs/yaru/template
index c2bf7e2503af..94264394ad6d 100644
--- a/srcpkgs/yaru/template
+++ b/srcpkgs/yaru/template
@@ -1,6 +1,6 @@
 # Template file for 'yaru'
 pkgname=yaru
-version=22.04.1
+version=22.04.4
 revision=1
 build_style=meson
 configure_args="-Dxfwm4=true"
@@ -11,4 +11,4 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://github.com/ubuntu/yaru"
 distfiles="https://github.com/ubuntu/yaru/archive/$version.tar.gz"
-checksum=fbd4c19c16817eec74845d9723ebffb90f1897e0d085384f31f4b4d6c32a91ee
+checksum=e8b85d3b1965b4611b4280b4d53b8deafdac754f795a8aad43c22ddb3308025e

From 3088cbae527e41fba57664197a38d51ba19c70bf Mon Sep 17 00:00:00 2001
From: Barbaross <cullenrss@gmail.com>
Date: Mon, 18 Apr 2022 09:54:39 -0400
Subject: [PATCH 1488/2561] vit: update to 2.2.0

---
 srcpkgs/vit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vit/template b/srcpkgs/vit/template
index 173648d69b95..9eb3596b5d31 100644
--- a/srcpkgs/vit/template
+++ b/srcpkgs/vit/template
@@ -1,17 +1,17 @@
 # Template file for 'vit'
 pkgname=vit
-version=2.1.0
+version=2.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="task python3-pytz python3-urwid python3-tzlocal python3-tasklib"
+depends="task python3-urwid python3-tasklib"
 checkdepends="python3-pytest $depends"
 short_desc="Visual Interactive Taskwarrior full-screen terminal interface"
 maintainer="Cullen Ross <cullenrss@gmail.com>"
 license="MIT"
 homepage="https://github.com/vit-project/vit"
 distfiles="${PYPI_SITE}/v/vit/vit-${version}.tar.gz"
-checksum=fd34f0b827953dfdecdc39f8416d41c50c24576c33a512a047a71c1263eb3e0f
+checksum=e866c8739822b9e73152ab30c9a009c3aef947533c06f7a5cb244d15c4ea296f
 
 do_check() {
 	TERM=linux python3 -m pytest

From d38d67699eb5801d507ddc7a43675843ff120bd3 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 15 Apr 2022 07:54:08 +0200
Subject: [PATCH 1489/2561] pyradio: update to 0.8.9.16

---
 srcpkgs/pyradio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 1c2670682351..042fd3d257ee 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.8.9.14
+version=0.8.9.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="http://www.coderholic.com/pyradio/"
 changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=76e06934926a1acfd7bba3735d8e0b387d7985dd38a398376877b6fd7da71940
+checksum=2ccd644ea93a0538162fa673863d68e5934edd82350b2dacfffc33b2396f8aeb
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 76420c6b95f0bf9973185b0aa3250d400e7c1cfe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 17 Apr 2022 21:56:07 +0200
Subject: [PATCH 1490/2561] stress-ng: update to 0.14.00.

---
 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 d13629b279bc..986b096bf1c4 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.13.12
+version=0.14.00
 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="https://github.com/ColinIanKing/stress-ng/"
 distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=16540d9cfa80d6a274fc0238d7251675ee38df6d5be805d14a67ce9efcb59ce9
+checksum=d0cc53073e0c2499e15044fbd5a0df0176521575ea13fba01f67834b9e07d19d

From 06b828d490664c9e7f2819d31ae4484fe580bdbf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Apr 2022 14:14:36 +0200
Subject: [PATCH 1491/2561] babashka: update to 0.8.1.

---
 srcpkgs/babashka/template | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 5a2292af27bf..a8fbeff23b0d 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.7.8
+version=0.8.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -10,14 +10,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
 changelog="https://github.com/babashka/babashka/blob/master/CHANGELOG.md"
-_sci_commit=4eb8e99e18942ba9c3b7ec3c4707d8237f970035
-_babashka_curl_commit=3d3d117ea0f8a143a06e3cace92e4e8b6a5782df
+_sci_commit=2af989d0eb80741b026fd2355442033b05a3b181
+_babashka_curl_commit=8a27e6060a739c7580cc89ba2bfddf48881e7178
 _babashka_nrepl_commit=d3fce67198b042707f01d841c032f841cc57ab7f
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=5db9560eab698f9773537acb0167f38d6fd0d322
-_pods_commit=538fc6f4147badf3a457b3eb8f9f95dd3bc947b1
-_deps_clj_commit=6636890388cdf779708806a93110b165577cd226
-_fs_commit=2bf527f797d69b3f14247940958e0d7b509f3ce2
+_process_commit=1eebafc696e9bac7538c296d5a7c1fde977ad523
+_pods_commit=e075b13bfe3666a73f82c12817bdf5f1d6c692e3
+_deps_clj_commit=c948c2f5c1e240c0e0ea4201877695f729ee309e
+_fs_commit=dc73460e63ff10c701c353227f2689b3d7c33a43
 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
@@ -29,15 +29,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
  https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="23a08adcc9237be9f24c1781cb646514434dbcb651aac00c3eedca763ca25086
- 0766f0a8be23e94efefbfc16c5987f1dab4520da3294f1bccef402f97898c490
- 45abdaa5e4effd3bcfea777d02844d4634f1f80a592843eca9ec7d3544b7e16d
+checksum="e7084426aa86f79684e66b1ee112da26f2b9e05b259d7d19acbb1a7c8d380338
+ 0d8c40688df17c3441a1a6c1005dc11538ed841fc74fa12396d6057fdf88a5e2
+ d8e57bc67f237a5cfea90a6c38f9e303c1591250624087e348600af72e8910fa
  b56a06bf113bcd85084d48f595541447014308860d9c45efcde5b02e859c934c
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- b6671246a1f0742bd4ae4d1f7b0afe4101d6c8907060455e0473c2ef966e370c
- 7fea6762ecbb31d454e0b5c194d12e1e6d4ec301972aa33daf617b571e097678
- fee3f84f935d141cf7343d7bab19c3eef56fdb2f3dac4a950db71c9b083e0d17
- e5b92a25221b735941861968a5570a4169da1aee7f2a7545975afe930cb8574f
+ 09ea197a0381a1f5be268da5c1470646bef01eef85add16541e32e0bb2da5d1f
+ 4aca4c1e15576309f33352bbed9dd9e7f0af5eca9f725dd8593ae1cb32cae8c3
+ af8a90dba22d980e536a901b833ccf38816c8944b72b32c10d3134869eced4e2
+ af930f686933ef74b0d857abb0f763d6fe0d5b0452a4c13e5b10207288feae86
  bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"

From 0e23910758c807f7ef1f6d51b78a70c920aba407 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Apr 2022 14:15:48 +0200
Subject: [PATCH 1492/2561] jet: update to 0.1.1.

---
 srcpkgs/jet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template
index 58b209817581..0a0bb5113cf8 100644
--- a/srcpkgs/jet/template
+++ b/srcpkgs/jet/template
@@ -1,6 +1,6 @@
 # Template file for 'jet'
 pkgname=jet
-version=0.1.0
+version=0.1.1
 revision=1
 hostmakedepends="mandrel leiningen"
 makedepends="zlib-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://github.com/borkdude/jet"
 distfiles="https://github.com/borkdude/jet/archive/refs/tags/v${version}.tar.gz"
-checksum=faed01c3d31631332fa60fd6f1bb39ae4a2f6cfc396a8747d5cfce4f1053a99c
+checksum=2085cd757607eebfdcc6107f507e362b88952f5cd7139127ba9c47708bbd91c4
 nocross="mandrel"
 
 do_build() {

From 32b6746a2e0239871bb7188765fce00d5587d8e5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Apr 2022 14:17:16 +0200
Subject: [PATCH 1493/2561] bmake: update to 20220414.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 5eac7a6f158f..58cf70979203 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20220330
+version=20220414
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=4b46d95b6ae4b3311ba805ff7d5a19b9e37ac0e86880e296e2111f565b545092
+checksum=10ee07a7be26b22ce6a3bbc386e2916ca8e51b0ed2d256c271a7135e3c94f2a7
 python_version=3
 
 do_configure() {

From 5b515e8c6091c60eb460dca4c74f75ad0890fa89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 22 Sep 2020 23:20:57 +0200
Subject: [PATCH 1494/2561] yaboot: fix build w/ gcc10 and host i686/x86_64

The -fcommon is required for gcc10 to build yaboot.
Adding --build=$XBPS_TRIPLET seems to be a good idea in any case
according to the autoconf manual, see the document at:
https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Hosts-and-Cross_002dCompilation.html

Still gives an error for me trying to build for ppc-musl using any
x86 host environment, be it glibc or musl libc.

More patches required or something else may be wrong?
---
 srcpkgs/yaboot/patches/0003-build-system.patch | 6 ++++--
 srcpkgs/yaboot/template                        | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yaboot/patches/0003-build-system.patch b/srcpkgs/yaboot/patches/0003-build-system.patch
index 8fdf419f1870..6dcd018b34c2 100644
--- a/srcpkgs/yaboot/patches/0003-build-system.patch
+++ b/srcpkgs/yaboot/patches/0003-build-system.patch
@@ -22,7 +22,7 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
  # command used to get root (needed for tarball creation)
  GETROOT = fakeroot
  
-@@ -32,14 +32,17 @@ LD		:= $(CROSS)ld
+@@ -32,14 +32,18 @@ LD		:= $(CROSS)ld
  AS		:= $(CROSS)as
  OBJCOPY		:= $(CROSS)objcopy
  
@@ -39,10 +39,11 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
  YBCFLAGS += -DKERNELADDR=$(KERNELADDR)
 -YBCFLAGS += -Werror -fdiagnostics-show-option
 +YBCFLAGS += -fgnu89-inline -fno-builtin-malloc -fno-stack-protector -no-pie
++YBCFLAGS += -fcommon
  YBCFLAGS += -I ./include
  YBCFLAGS += -fno-strict-aliasing
  
-@@ -69,12 +72,12 @@ LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux
+@@ -69,12 +72,13 @@ LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux
  
  # Libraries
  #
@@ -54,6 +55,7 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
  UCFLAGS = -Os $(CFLAGS) -Wall -I/usr/include
 -UCFLAGS += -Werror -fdiagnostics-show-option
 +UCFLAGS += -fdiagnostics-show-option
++UCFLAGS += -fcommon
  
  # For compiling build-tools that run on the host.
  #
diff --git a/srcpkgs/yaboot/template b/srcpkgs/yaboot/template
index 8d2adf264b73..a61158c899fd 100644
--- a/srcpkgs/yaboot/template
+++ b/srcpkgs/yaboot/template
@@ -58,6 +58,7 @@ _build_e2fsprogs() {
 		if [ -n "$_need_cross" -o -n "$CROSS_BUILD" ]; then
 			# using a crosscompiler, set up configure/compiler for that
 			_args+=" --host=${_need_cross:-$XBPS_CROSS_TRIPLET}"
+			_args+=" --build=$XBPS_TRIPLET"
 			_ecc="${_need_cross:-$XBPS_CROSS_TRIPLET}-gcc"
 			_ear="${_need_cross:-$XBPS_CROSS_TRIPLET}-ar"
 		fi

From f9d9ae26fea02fa32882616d6d249b3ac6501447 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:17:39 +0200
Subject: [PATCH 1495/2561] xpdf: update to 4.04.

---
 srcpkgs/xpdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xpdf/template b/srcpkgs/xpdf/template
index 3c66f615f115..854150d56eb5 100644
--- a/srcpkgs/xpdf/template
+++ b/srcpkgs/xpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'xpdf'
 pkgname=xpdf
-version=4.03
+version=4.04
 revision=1
 build_style=cmake
 configure_args="-DSYSTEM_XPDFRC=/etc/xpdfrc"
@@ -13,10 +13,10 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://www.xpdfreader.com/"
 distfiles="https://dl.xpdfreader.com/xpdf-${version}.tar.gz"
-checksum=0fe4274374c330feaadcebb7bd7700cb91203e153b26aa95952f02bf130be846
+checksum=63ce23fcbf76048f524c40be479ac3840d7a2cbadb6d1e0646ea77926656bade
 
 post_extract() {
-	sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
+	vsed -i -e 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
 }
 
 post_install() {

From 11e43047762198fa9cfb24891b759839ae091bfa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:18:24 +0200
Subject: [PATCH 1496/2561] spectre-meltdown-checker: update to 0.45.

---
 srcpkgs/spectre-meltdown-checker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectre-meltdown-checker/template b/srcpkgs/spectre-meltdown-checker/template
index 23e3f2c00bdf..b3a5163801c3 100644
--- a/srcpkgs/spectre-meltdown-checker/template
+++ b/srcpkgs/spectre-meltdown-checker/template
@@ -1,6 +1,6 @@
 # Template file for 'spectre-meltdown-checker'
 pkgname=spectre-meltdown-checker
-version=0.44
+version=0.45
 revision=1
 short_desc="Spectre & Meltdown vulnerability/mitigation checker for Linux"
 depends="binutils"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/speed47/spectre-meltdown-checker"
 distfiles="https://github.com/speed47/spectre-meltdown-checker/archive/v${version}.tar.gz"
-checksum=96765d765275476c36a146da123fa7e9eb310a84e84ae71b179c9ace3b6ab0c8
+checksum=32db6b73b9a3b08c165cac39446c856a07ac3d17c6b556ce08a9e99dd5600ea7
 
 do_install() {
 	vbin spectre-meltdown-checker.sh spectre-meltdown-checker

From 5df3e041cbee755d61fd1a06bd558e46fcac8574 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:19:28 +0200
Subject: [PATCH 1497/2561] makedumpfile: update to 1.7.1.

---
 srcpkgs/makedumpfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/makedumpfile/template b/srcpkgs/makedumpfile/template
index ba00074bc4e1..e91ab999560d 100644
--- a/srcpkgs/makedumpfile/template
+++ b/srcpkgs/makedumpfile/template
@@ -1,6 +1,6 @@
 # Template file for 'makedumpfile'
 pkgname=makedumpfile
-version=1.7.0
+version=1.7.1
 revision=1
 makedepends="elfutils-devel zlib-devel bzip2-devel liblzma-devel lzo-devel"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/makedumpfile/makedumpfile"
 distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
-checksum=8985f8df249087ea68c6051dec6dac3ef0703fe2aa87d0266f3951f93aa8da5e
+checksum=cb04b1bd0e750d0d0ac1b43b759b326d4a3797b0af08e0c269d1b155893fb664
 
 post_extract() {
 	sed -i '/#define PAGESIZE/i#undef PAGESIZE' makedumpfile.h

From 6b129a5feae38c31313af5d4f09420c4f3d13892 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:19:56 +0200
Subject: [PATCH 1498/2561] mcelog: update to 181.

---
 srcpkgs/mcelog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index 9707998bd78b..90429083870c 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
 # Template file for 'mcelog'
 pkgname=mcelog
-version=180
+version=181
 revision=1
 archs="i686* x86_64*"
 hostmakedepends="python3"
@@ -10,7 +10,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=e9c82b565da06673c2630f9e6bc668634ad7d2c7f13c70db1900cce110ae62dc
+checksum=924e84e235231fd2b5e6ad527e87fd8977113cf170d8bd4ebac5d4781ff7b172
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From cf069c7508bf5d7671cfd777af4dcf6e01382a1f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 18 Apr 2022 19:50:48 +0200
Subject: [PATCH 1499/2561] linux5.4: update to 5.4.189.

---
 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 ac636bc1d2ff..770cb9be83ad 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.188
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc
+checksum=8485d536531833cd2dbca0a7f267daff69ede5c9831cb693acc8318447e568c6
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 7704a7c08628b7d885bfc86142c7bfbfbfebfbb8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 18 Apr 2022 19:54:03 +0200
Subject: [PATCH 1500/2561] linux4.19: update to 4.19.238.

---
 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 cb61654da418..d6916078343b 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.237
+version=4.19.238
 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=bafff35102cc486ec2bf94c6d908be8e24017b2e4a1873f52f24c855eb220cd8
+checksum=83b74545c5d380384e09955c26e786bf9ee81a44bcf9347f2ca2ad3d31b46b7a
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 6e40130ca426c30ce45036815fbd2d988c755791 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Apr 2022 14:02:47 +0200
Subject: [PATCH 1501/2561] texlive2022-bin: install infraonly by default,
 tweak INSTALL.msg.

---
 srcpkgs/texlive2022-bin/INSTALL.msg | 18 +++++-------------
 srcpkgs/texlive2022-bin/template    | 11 +++++++----
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/texlive2022-bin/INSTALL.msg b/srcpkgs/texlive2022-bin/INSTALL.msg
index 05a58d965c72..1ccb0429afc2 100644
--- a/srcpkgs/texlive2022-bin/INSTALL.msg
+++ b/srcpkgs/texlive2022-bin/INSTALL.msg
@@ -1,11 +1,4 @@
-- TeXLive is free software see the files:
-
-  /usr/share/licenses/texlive2022-bin/LICENSE.TL
-  /usr/share/licenses/texlive2022-bin/LICENSE.CTAN
-
-=====================================================================
-
-  To update you TeXLive installation use only the program 
+  To update your TeX Live installation use only the program 
 
   /opt/texlive/2022/bin/<arch>/tlmgr
 
@@ -13,13 +6,12 @@
     - x86_64-linux  ==> x86_64 architecture
     - i386-linux    ==> i386 architecture
 
-  see:
-
+  for details 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
+  WARNING: To avoid messing up your TeX Live installation, DON'T use
   the installation scripts in /opt/texlive-installer.
 
+  This package only installs TeX Live infrastructure now, not TeX Live itself.
+  For a basic installation (previous default), run "tlmgr install scheme-basic".
   For a full installation, run "tlmgr install scheme-full".
diff --git a/srcpkgs/texlive2022-bin/template b/srcpkgs/texlive2022-bin/template
index 902d4dc245d7..679a1e4e4bdd 100644
--- a/srcpkgs/texlive2022-bin/template
+++ b/srcpkgs/texlive2022-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive2022-bin'
 pkgname=texlive2022-bin
 version=2022
-revision=1
+revision=2
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
@@ -15,8 +15,9 @@ distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>$
 checksum=e67edec49df6b7c4a987a7d5a9b31bcf41258220f9ac841c7a836080cd334fb5
 
 # Package build options
-build_options="basic small medium full"
-build_options_default="small"
+build_options="infraonly basic small medium full"
+build_options_default="infraonly"
+desc_option_infraonly="Install TeXLive infrastructure only"
 desc_option_basic="Install TeXLive using scheme-basic"
 desc_option_small="Install TeXLive using scheme-small"
 desc_option_medium="Install TeXLive using scheme-medium"
@@ -31,7 +32,9 @@ 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
+	if [ "$build_option_infraonly" ]; then
+		echo "selected_scheme scheme-infraonly"
+	elif [ "$build_option_basic" ]; then
 		echo "selected_scheme scheme-basic"
 	elif [ "$build_option_small" ]; then
 		echo "selected_scheme scheme-small"

From b2ff2e4c4067285dca3c42763f5dd4f348374448 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:38:58 -0400
Subject: [PATCH 1502/2561] openjdk17: update to 17.0.3+5.

---
 srcpkgs/openjdk17/template | 43 +++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 19fa38707f00..7e368f9b687e 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,15 +1,14 @@
 # Template file for 'openjdk17'
-_java_ver=17
-_java_min_ver=0
-_java_sec_ver=3
-_jdk_update=1
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk17
-version="${_base_version}+${_jdk_update}"
+version=17.0.3+5
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}"
+_gtest_ver=1.8.1
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+create_wrksrc=yes
+build_wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --enable-unlimited-crypto
@@ -19,8 +18,9 @@ configure_args="--disable-warnings-as-errors
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-gtest=${XBPS_BUILDDIR}/googletest-release-1.8.1
+ --with-gtest=../googletest-release-${_gtest_ver}
  --with-debug-level=release
+ --with-native-debug-symbols=internal
  --with-jobs=${XBPS_ORIG_MAKEJOBS}
  --with-version-pre=
  --with-version-build=${_jdk_update}
@@ -38,15 +38,16 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
 depends="${pkgname}-jre-${version}_${revision}"
-provides="java-environment-${version}_1"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
- https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
-checksum="0fac6d90091fc16678a14349e578f6c1cf29738d55508f9f723fbb69469f6867
+ https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
+checksum="a557f4d2972bbbbcdc12fa7e167ad60b4ee1461a9bc7ad259a003172c34e6331
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+provides="java-environment-${version}_1"
+patch_args="-Np1 --directory=$build_wrksrc"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -79,10 +80,6 @@ else
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk17"
 fi
 
-if [ -n "$XBPS_DEBUG_PKGS" ]; then
-	configure_args+=" --with-native-debug-symbols=internal"
-fi
-
 alternatives="
  java:/usr/bin/java:/${_jdk_home}/bin/java
  java:/usr/bin/jfr:/${_jdk_home}/bin/jfr
@@ -120,9 +117,9 @@ alternatives="
 "
 
 post_extract() {
-	chmod +x configure
+	chmod +x $build_wrksrc/configure
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		rm -r src/jdk.hotspot.agent
+		rm -r $build_wrksrc/src/jdk.hotspot.agent
 	fi
 }
 
@@ -171,11 +168,6 @@ post_install() {
 	rm -rf ./ca
 }
 
-do_clean() {
-	# clean up gtest
-	rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
-
 subpackages="openjdk17-src openjdk17-jre openjdk17-doc"
 
 openjdk17-jre_package() {
@@ -213,11 +205,10 @@ openjdk17-doc_package() {
 	noshlibprovides=yes
 	short_desc+=" - documentation"
 	pkg_install() {
-		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			local _docdir=usr/share/doc/openjdk$_java_ver
 			vmkdir $_docdir
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir
+			cp -a $wrksrc/$build_wrksrc/build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir
 		fi
 		vmove $_jdk_home/man/man1
 	}

From c39a847694bf39377cb924015d5062c127b25e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 19 Apr 2022 16:58:10 +0200
Subject: [PATCH 1503/2561] postfix: update to 3.7.1.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 38a7e61f2171..466de1f19105 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.7.0
+version=3.7.1
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="https://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=645c6a74959703f8dff5b696b2df2e8bc0c91ac530127a21c998e3defbb9528c
+checksum=25c3e7ec09955af873407af3070fd259da8477b80e2f4663c5fdc00a2cc947ee
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From df84c57f29206cfa772bb6fd3f116af5c606267f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 18 Apr 2022 16:04:34 +0200
Subject: [PATCH 1504/2561] font-unifont-bdf: update to 14.0.03.

---
 srcpkgs/font-unifont-bdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template
index ce94f9be9c3c..675429a16aa2 100644
--- a/srcpkgs/font-unifont-bdf/template
+++ b/srcpkgs/font-unifont-bdf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-unifont-bdf'
 pkgname=font-unifont-bdf
-version=14.0.01
+version=14.0.03
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://unifoundry.com/unifont/index.html"
 distfiles="http://unifoundry.com/pub/unifont/unifont-${version}/font-builds/unifont-${version}.bdf.gz"
-checksum=391d194f6307fcd0915daafd360509a734e26f3e4013e63d47deb2530d59e66e
+checksum=6323f50b1b0b50224988e5f7aec2bd26bd78563bbb7e05c417dc5b7b4a06acb5
 font_dirs=/usr/share/fonts/misc
 
 do_install() {

From e3cb5643d3a0bf9ca87914f9cc7b8d9dae1292c8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 17 Apr 2022 16:31:52 +0300
Subject: [PATCH 1505/2561] skype: update to 8.83.0.408.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 7760c535079c..5305633214e0 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.82.0.403
+version=8.83.0.408
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=df903a805c3db301d8846e5fcfe2ec5acbea720c49f3031edb50d416f5a52a24
+checksum=f6dc153980f74b3b75241b2c4d0c1c866391963778af5d96fa0aa28b24a693c2
 repository="nonfree"
 nostrip="yes"
 

From 509115c1d7e34e6395b401a93b023e56e8588ab2 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Wed, 13 Apr 2022 18:28:10 +0100
Subject: [PATCH 1506/2561] thunderbird-i18n: update to 91.8.0.

---
 srcpkgs/thunderbird-i18n/template | 110 +++++++++++++++---------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index f95f0e304a80..0a299d66d969 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=91.5.0
+version=91.8.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -95,57 +95,57 @@ _pkgtmpl() {
 	}
 }
 
-checksum="153b74896853e462e9ae9cf9098f0b6f34116559975861e6c9f04e8010c0842a
- fd018fcbeceace184dc1f4b1e1623511eb0a8ecc1ae1b956ffa170842fefcc73
- 550f2310775beb5ce913b6bfa593fa04776c1927c87cf8079eaaf10f6d8b0537
- 99c61014976faafeb2e813ad74b1678e2128ddc0a76bfcbba7cf6c602c11a223
- 7aeb9c9c9aaaacb2a84a5491aff9588c8b426ea08e0a43d2c63c091b47cfc5d0
- a30026739c7e130ad1d9196c19da72eea6c16c7571f6073aea4c0f80f10d8f3c
- 7941933c4c80d4f1109db2a3f584518c6995aa8746b0f4ab4a6f70706becb0de
- 1840fbf5e814853fdd976e20bb4a432c210321bdf8cdc5b5c26a593afea41d94
- d04205f28a0ffed85aa1b11de42d46063db482392a71e0ad8f5074b142c6deb8
- 1dc362d91c8699a81ec4070af6422f97bd275ef01acda4dd41634c1af6415609
- 9207a8c1a98ca2fa51efb54f12a79d9cae0e03faf5941bfc6cd66b0f02bddd40
- fac6239a5e043b75ff595fa670b23f0520e93bd3c8e4aabce0340db72dab1909
- 4642127f3e521d130d246acbe8df7f2f8b2b461cd357839773bc0f73b76ddf82
- adce6a6c77997f9e9fe08a20012ce8ed88116963599c348763d36a0c196af1a1
- 6608e4c2bb3c396cb35794d5b90eec5c3403b319e3d220088331b7b3fb5f45e6
- d6cbd9e7089f05928202cb95340d94322714036cdf2bd50777e09300d60b35e2
- 965b43d20a9abaabe8f7d07dd5bf2c522d73754e52dc9eb4e917568e14f03ef4
- 17a78d93de483a0097504683b29752449ea1cdd0578313428b39c9d6959b4fc2
- 75238449104d85368cfbefb2d06fe92113f4ba719fbfa1d4da5fe46a3be63d0f
- f8765c44569a1eead7f96c30cae8e34557597c03ae0778859135e637370f6769
- 1675ad25f3d7372fe8e004f1a5df4eeb4d11042574d67546d99c696f76bb416b
- 17d1c9c752a31c0d123de4fa84b5c0a06bdadb7ecfb3fedab4cad22289ac2cba
- eaeedd14c00ffb253b6d6ccf66f131940a44e190c77e232ded88a13b6b7e3b59
- 5ab29c16330c3951236839af54081d282cf0de17f18e1421b7e6d812cafefff4
- d6a9ab1ca1a3f9613a00f1f6296568d3da6ce850a7e797ce377e9516c8b78837
- 38bba476644a2f0ccc636ac176e501b85f3ef8c912c7ff9b9cc4ebac74d83cdd
- 4338ff7ef6adfaf0308616128bf00d190372b8818d421527dc5742d8f3ed4918
- 38d88509c005ad62601a368a284b745570e33a9724da1a1ff41e6feaaa4273fc
- 031b23573ec355d23ebe18615a86216ab30a95e04525ace23f7f4d7ba8245c41
- cc95bfa23f1468ca5a670dea7d67b579d18166332fc17942c4733ce249a882ce
- b21a892bd65dbd12e6f047079bfa8e6175c58167e7c8defc3ee285eefd738d41
- 494796c4657fa6283400b9cd9ff54bed947068222f9e94d0131033d953d37176
- 44e135062450c53044b412447b6d0a722fc5a99658ed7ec3c741dbbe91ecd736
- ea62afd388cc7c30c0a1a2e161e1154742e535b1177c718ca0620de7e296fe61
- 67d954bd71dc1a21d28bd410a0c633c4c3d93bcb53095d349c470a270c242d39
- 6a63ff0bbf96411935ba101baa7286315e70ccbc0bbc1e8f5ede822c901a23b2
- 18d6578ffebd4867b01918f7a154a317b054d5fd55418f61657cac05a995ee1a
- 22bdf3404e59627ab73ee64394efb0275741b7b9c1d31d134d5612242e1858e6
- 9eb94a5b380f084625e605f20a388a9b75455c07e49bc73ab4bc94e2d52baee8
- 60ed67eb52c673b168b42f385ac05e4f0cec906002f46dd0dabbf807777c3302
- 6711681f44fd41ee493c7ccd618d98ecce24354073d72ca59ca60df1a3b53f2b
- f0fe96cec503d05033651489aa6251f8279fa0f0323818df9f17fce56cdeebb6
- b012c406274bb8a4131546cf363d4828a7e55f1e6221559d5313137de886bf7f
- bce8e92d31183afb48fba2b78339d9404cf87b67a9d2f13db09672fc8539dacf
- 6a3c56c782219a0f3951d90700f3c63cc69266f8d4546f19281194cc3101588b
- a8bfaa012718716c45727f207fadfebdf1dc06a66628d284bc60d8d37087caa6
- cfecad5b1cf8c233ad01af7489959d5d680028851fb676356ace00cb737b7eae
- 8a0aea8d91a3978378166219f5aaebe7aca91b199fcfe3227752ed3f443d3612
- 6ff82ddcf1974b8bc7a44789e1d4238e92a8d5cea2c14daf1a4f57f6ae98c983
- 9483d7dca9c450483c9be9c21ff77e191f62e41120fdc186fe766bfedec805af
- 14eccd3edf9c4be0ece562c4bda88bb0512d846c79e5480478569493268a6a6f
- 3be16dd793abe690471bdfc633c41bad85172603aeb78145ca5290332ece9ff6
- f886871be3055d85d9bfdff63b5d24209af97a04d8504f5afb631ef0a1372088
- abd7ff3fae4d2d3459bff96bdde26cc62f045edbaf9eba8b457ade3c17f7a57e"
+checksum="e338b3f00ce13b8b98213d9fb53dbdeaef8082517a2cda06a62c59d8f4021e1e
+ 0c6339b23d2de88b0cea5473289c05820d44fd89999037285ed19b6394e5d221
+ 4f8254201247e6d8e01924715d101e4bce8f53d3799f129a0003b528cd994839
+ f7c99eb62ab9ade49d2022edca802b4ebbdf53a753c378315cccf9bf2126bff3
+ 13191acb9cec0bdd45527e09e1f28205fad9e4b67682018f9f0aa6d096b40a7d
+ 08e7f631467b5b1aca8d35c38936c854c3b8bbba975d1b30b5d43637e1b1cc3d
+ 8b40a658dd14af8b268bef3ae656524165c9e432f2df882c21a083b477379a76
+ 68247d9f9e33f803446ba4c114d5db8173dc46aa93bf06c828a2d154c69e4ce6
+ da155c974f591a6f7b29f42ddb82ed94fee8db34b0b7c67a18d747c38138fb7b
+ 3cf905249aeb0676d8a6206746c1d0ee03fba579bd39d9ec8e9cdc8a23ba6232
+ 2afa46cf5301607dc1b18933bd3877842ffcb86563bb8ddf859114aa74bacf1c
+ d437fd884c900cdce7c22bfdf445819ebe8f27d6d2b32392e6ab4291188403b5
+ 458ff1cd1a3a3357d6592f04fadc5bb6c06a1a8ae4e095de599c0a4b4f3f4c39
+ 5a3cc430c53f3a2e7258be9c4dc90002e74b1df4fedd57d748034facdf09462f
+ aa41718568841dd4b2487023d7c68b88a7d4cce6634c2c8b2af5a5024e910491
+ 8e08fca9f5b4284cd78cd80f54f2005cfaa9db9b2df596aabff3cf85fed3b032
+ 00647c73c5d834c2daa7b1c04c152ba70e530f8917a88b48b876634e6735a08d
+ 3b367c2aeb5c0b7e7158570cba56473f36f0e4e2105528f6cff6424a8bb1b188
+ 602f80592d721c0d1157845c9cf83547b4497842cfd37ae5466190d5f89fc2ca
+ 310a50fbd029f0bbb5d7b3b80b9f0882ddf03667caa2c93a1f2c878c32bd1404
+ cf75c1a2992d11b2ea5f4160d34f793fd00d7eae2c3604fe35a96303bdd5b6d0
+ 39255ccf6c1661287fab017e95a3c1eb74619d408bdce09dd359fd58f2303ca4
+ 41e9b2df204081b13ff2adb391f0414b2b0ba4bf83bf2118a30c21265b19983e
+ f6be5a2cf4006b31459a887e14f69e61505e3577ece674e81356ae53b025b4ab
+ 22575da8459ceb57e1dd3e02c9a5e7219b894767438d810b94dfd6c4e97bb3ae
+ 27487ba8f1115f1aff0245629fdc1b785391d5af98521e58937677f173eb0f45
+ 666bd43ccbdb37f097477273aa8ca11b9716c024f8c162bb81a1b07006044bc0
+ 1907c178beac70dafdab55acbc87e56a9913142ffaa85be6cbe541361d53d24c
+ 20e7464b43f12dcdcb3892a6e9c7d7c46a2385a82953c388599cbeeabc362786
+ 6a7e2ee51d92aa5db52816de0dbf103ce2abf40a34411498fb7b2380dc87101d
+ 2d2be878ba6d5afcb6823f58a6939ebe895290a925b13234ed2c63d013ad5165
+ d329c730c338b7d9e4a3fc07fae4537dd0be0b86317db42b1270daaeb7025f98
+ 51ead8dd506cc5aaf4dfb58be942b3061869c9c26bfec9b29930d0a627c32aa9
+ ba4191dca0ec8a9eb70cc3d9d0a20d50fa87a5c0be3190db0ef5867532ef8318
+ 4e849ddec5f68004315b93dc8e382774101a815e9bf476f10c8e804a9657aa2e
+ 04b06a1a5842962116ef0eae6dfa263197e04b5a560ce7386f786322b5199364
+ 8f81e86174d6126e0e0551b1431713f09ca66e3dc546cd5a7838d17c2cddf52e
+ 1ca4983cf2de4a0ac8debdfba0c0e3844cd5020199f4ab054864dda7ae2170da
+ f625cda77e82c13e358d33df96d613ea8145a170b54ce399bfe960e0b88ef146
+ 93b79805973de19cd0beaea81add9a0f40e3746b88648c6c7e90a0fbba857777
+ 368b268f6b08b5e1d0f1ffeeb662ab4460bc3b60d6c3ced54a6efff44e6bec2e
+ 8de648e97c00fc1988ae5788944c3821304c49f49a669797e3bdc4c3637ff336
+ 1489f343e79064d24549556f7d7164ea0e9e0e65256290f8287a00fdd256bd04
+ 0f004c54f4fce861b709d6f0d394c6ebb01a16aedc29e6599f56c7d043e18936
+ 8f7a814d8a47efa9fe1509b0ea450697e2e6007beb5b78e2937b3f2b133402b3
+ 7db9b294668932d2e59309c452ab74d0d737eb6c8220f6fa5aafd7be66ea42dd
+ b9c81d14520928957f95e40faa80a8ed63e76758652fb3a73458a848d9703ac7
+ 1129915d753dc68c4d4e23e6d4dea5de7c911f7d3204448b231f8755d7447c70
+ 76badde28f93f4d8e05c163a357223bf1a85e9301cf6221b222553f637e33532
+ c50d5aa28e33dee903a31b1ea73c01575d7d784cc86dfec0f853dc51e31bef40
+ 6b897ca847c9d497895d2dc2164582836407902c2784219617ce14b80b140739
+ 4cd25edb40fd1309d1121cb582001d580605eb12ec414fe4125d580b809927c9
+ 2b822f814877d3b20ced442e466ff78cc0e2effa971b5e7b16ddd6bb9500c7c3
+ b2962ead550ab841c4981a70a0f80f1baeb2d10165dc7536d069598643f3d4d5"

From f5e4d0ed66fe8d5163eaf3fb21b1137f79512575 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Wed, 13 Apr 2022 18:28:13 +0100
Subject: [PATCH 1507/2561] thunderbird: update to 91.8.0.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 6ce073f6f0f9..bf03d0a2eb61 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=91.5.0
+version=91.8.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=b89a8e1b57d5be828a7346e817120d7c763a258a2397a23393b7ceb3ce810ab2
+checksum=4a93d1773e17aa110341428165581f0176c347d55dd7f6cbed789ca8369da6fa
 
 lib32disabled=yes
 

From 12e4a1df372e3c2e5ac58ce16aab03d2b25dbfad Mon Sep 17 00:00:00 2001
From: Tung Anh Vu <vu.tunganh96@gmail.com>
Date: Tue, 15 Mar 2022 20:50:59 +0100
Subject: [PATCH 1508/2561] texlive: Pull latexmk into a subpackage

---
 srcpkgs/texlive-latexmk  |  1 +
 srcpkgs/texlive/template | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/texlive-latexmk

diff --git a/srcpkgs/texlive-latexmk b/srcpkgs/texlive-latexmk
new file mode 120000
index 000000000000..c6cca627ba90
--- /dev/null
+++ b/srcpkgs/texlive-latexmk
@@ -0,0 +1 @@
+texlive
\ No newline at end of file
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index cf3fa5c8044e..b8bb1919fded 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20210325
-revision=2
+revision=3
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
@@ -71,7 +71,7 @@ makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel
  harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel
  poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel
  libXaw-devel"
-depends="dialog ghostscript perl-Tk texlive-core xbps-triggers"
+depends="dialog ghostscript perl-Tk texlive-core texlive-latexmk xbps-triggers"
 short_desc="TeX Live"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
@@ -393,3 +393,12 @@ texlive-PythonTeX_package() {
 		vmove usr/share/texmf-dist/scripts/pythontex
 	}
 }
+
+texlive-latexmk_package() {
+	depends="perl"
+	short_desc+=" - script for compiling the correct number of times"
+	pkg_install() {
+		vmove usr/bin/latexmk
+		vmove usr/share/texmf-dist/scripts/latexmk
+	}
+}

From 7333d3b25e1c91a0a1d822a5f79cde40c0a54e87 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Tue, 19 Apr 2022 20:14:14 +0200
Subject: [PATCH 1509/2561] stockfish: update to 15

---
 srcpkgs/stockfish/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index ab86e2e00d8d..4a0284fce9a4 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,8 +1,8 @@
 # Template file for 'stockfish'
 pkgname=stockfish
-version=14.1
+version=15
 revision=1
-_net_file=nn-13406b1dcbe0.nnue
+_net_file=nn-6877cd24400e.nnue
 wrksrc="Stockfish-sf_${version}"
 build_wrksrc=src
 build_style=gnu-makefile
@@ -10,13 +10,13 @@ make_build_target=build
 make_use_env=yes
 hostmakedepends="tar"
 short_desc="Free UCI chess engine derived from Glaurung"
-maintainer="cipr3s <cipr3s@gmx.com>"
+maintainer="shtayerc <david.murko@mailbox.org>"
 license="GPL-3.0-or-later"
 homepage="http://stockfishchess.org/"
 distfiles="https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz
  https://tests.stockfishchess.org/api/nn/${_net_file}"
-checksum="11d71018af47ba047175f846be72d8d9878df698e9b5d708ab158cf530633600
- 13406b1dcbe0a36dfc5e07da51d8db38b7a45d7da43078ec25a7624c2b83236f"
+checksum="0553fe53ea57ce6641048049d1a17d4807db67eecd3531a3749401362a27c983
+ 6877cd24400e01b19ff12ae3068ae242152802bdd330e66f7b6703865251d6e3"
 skip_extraction="${_net_file}"
 
 LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"

From 317163ec2e6e63bb1a92d4a1fcc565973598a22c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 7 Apr 2022 23:08:41 +0200
Subject: [PATCH 1510/2561] dbeaver: update to 22.0.3.

---
 srcpkgs/dbeaver/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 74a67e77e4f6..a1e7ca0c3004 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,7 +1,7 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=22.0.1
-revision=2
+version=22.0.3
+revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
 hostmakedepends="apache-maven"
@@ -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=2258f77b6e68fc0784dd7d92fc1297695b57e6ca22e3d454f21f328bf61e2bf0
+checksum=5af628ec7cd4c0e63fd074dd92d5668788136321cc273f778f20ff8c7907323a
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

From 1ee348ca940cb9a980222d96a2208b19f41e48f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:18:10 -0400
Subject: [PATCH 1511/2561] maturin: update to 0.12.12.

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index a6c1cbdd3d71..64140c2f5fe7 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.11
+version=0.12.12
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="4d39f15fae9c01f2f23a544fc26b20c68693ec03f820b30ca5f505647c452be1
+checksum="0da8b649dc91278363d6a07fee26ea53b8f2d9cd06139034dea3a5506baf12a0
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From ab5faee633eb605ae3a2c25e097557a85494c07d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:19:36 -0400
Subject: [PATCH 1512/2561] python3-imageio: update to 2.17.0.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index b129927d534f..a5167cbc45e8 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.16.1
+version=2.17.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=97f6d150d3a4b2424810fd3042ab794af45365f168031aee6f0be21c00e90d2f
+checksum=34173213c7e90096743bf077d888dd1c0300e8ebfad8184ee24a968cc860af5c
 
 post_install() {
 	vlicense LICENSE

From 1fa411e82c8212bae6a8477386051a70a3d0f07f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:27:26 -0400
Subject: [PATCH 1513/2561] python3-hypothesis: update to 6.43.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 d214e0ec6b62..fd24d4f52491 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.41.0
+version=6.43.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=0fa002e65956bedead5149d2ffa5875cbcb5ca1a3f95301fcf2ad5a241829d91
+checksum=57e04ecd3fb433604a17dbcf535947734f98bcced562a71c67513d98919d1d3b
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 9daa6681e5a23a59d1290c4c18b76dc904281de8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:35:18 -0400
Subject: [PATCH 1514/2561] python3-typing_extensions: update to 4.2.0.

---
 srcpkgs/python3-typing_extensions/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-typing_extensions/template b/srcpkgs/python3-typing_extensions/template
index a9917a177428..413acfdb1c3a 100644
--- a/srcpkgs/python3-typing_extensions/template
+++ b/srcpkgs/python3-typing_extensions/template
@@ -1,14 +1,14 @@
 # Template file for 'python3-typing_extensions'
 pkgname=python3-typing_extensions
-version=3.10.0.2
+version=4.2.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
 depends="python3"
 short_desc="Backported and Experimental Type Hints for Python 3.5+"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="Python-2.0"
 homepage="https://github.com/python/typing"
 distfiles="${PYPI_SITE}/t/typing_extensions/typing_extensions-${version}.tar.gz"
-checksum=49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e
+checksum=f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376

From 04a5acf2fcfc10b87d1b40cc1d5eb64d3a01124c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:37:24 -0400
Subject: [PATCH 1515/2561] python3-pytools: update to 2022.1.4.

---
 srcpkgs/python3-pytools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 1cbf56dc08dd..6a57301a4d61 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.2
+version=2022.1.4
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-decorator python3-appdirs python3-six python3-numpy"
-checkdepends="python3-pytest python3-mpi4py $depends"
+depends="python3-platformdirs python3-numpy python3-typing_extensions"
+checkdepends="python3-pytest $depends"
 short_desc="Python utilities from Andreas Kloeckner"
 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=5e824101880a246354756365880a65bb416f6a8cab6513b68fcbb48fba090fcb
+checksum=ae25f7c9b196fcd0d15e53bfe05236fe7bc5efd923810fbaeeee1a4bc4b6764a
 
 post_install() {
 	vlicense LICENSE

From 8b0c6ce593a5e03229f3480535e6b63d5bc7fdf4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:40:20 -0400
Subject: [PATCH 1516/2561] python3-pyopencl: update to 2022.1.3.

---
 srcpkgs/python3-pyopencl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 7f3c35a88e9d..ccd4812bcfea 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2022.1
+version=2022.1.3
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
 makedepends="opencl2-headers ocl-icd-devel python3-pybind11"
-depends="python3-pytools"
+depends="python3-numpy python3-pytools python3-platformdirs"
 short_desc="OpenCL bindings for Python 3"
 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=24c6d9a0a1ff7609f3d7365ebd8778616a5433c426566c2c8e35ffab00ef22c4
+checksum=18386938b54855696460b4b19a210300f241a28eb3255748be5f279aef664d6d
 # Tests require a working OpenCL platform
 make_check=no
 

From c30c5c81849f6b34ceb699b578083fd491364eea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:40:33 -0400
Subject: [PATCH 1517/2561] python3-tifffile: update to 2022.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 65b0d119adef..b8fb29af1782 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.3.25
+version=2022.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=620c68f3eeb2b1923e1b3a8bf8a8b7f79498bcd9cd34051ad567c44f0a404353
+checksum=f4dafa604c949ebedc60a0fd41be0048399fea72b529efcff6330a29590ee5f6
 # Tests require unpackaged fsspec
 make_check=no
 

From 5234a5b670e75b019f314d66ef1bea5c3868807b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:40:46 -0400
Subject: [PATCH 1518/2561] python3-websockets: update to 10.3.

---
 srcpkgs/python3-websockets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-websockets/template b/srcpkgs/python3-websockets/template
index 08f829cf4b39..7c02b7ec8ed7 100644
--- a/srcpkgs/python3-websockets/template
+++ b/srcpkgs/python3-websockets/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-websockets'
 pkgname=python3-websockets
-version=10.2
+version=10.3
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://websockets.readthedocs.io/en/stable/"
 changelog="https://websockets.readthedocs.io/en/stable/project/changelog.html"
 distfiles="${PYPI_SITE}/w/websockets/websockets-${version}.tar.gz"
-checksum=8351c3c86b08156337b0e4ece0e3c5ec3e01fcd14e8950996832a23c99416098
+checksum=fc06cc8073c8e87072138ba1e431300e2d408f054b27047d047b549455066ff4
 # Package ships no tests
 make_check=no
 

From 5a64f28c9806c037137f0c79c1f0385e28cfca47 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 19 Apr 2022 22:49:40 +0200
Subject: [PATCH 1519/2561] keepassxc: update to 2.7.1.

upstream
* switched from libsodium to botan
* switched from quazip to minizip
* relies on vendored (patched) ykcore [1]

[1]: quote droidmonkey from IRC (keepassxc developer)
> KeePassXC bundles the ykcore code due to lack of support from Yubico and
> stratification of version across various operating system distros.
> Additionally, KeePassXC has modified the API of ykcore to make it more
> functional when using non-YubiKey keys (ie, OnlyKey)

Closes: https://github.com/void-linux/void-packages/pull/36662
---
 ...001-Link-ykcore-against-pthread-7807.patch | 33 +++++++++++++++++++
 srcpkgs/keepassxc/template                    | 24 ++++++++------
 2 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch

diff --git a/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch b/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch
new file mode 100644
index 000000000000..cad44dae05d8
--- /dev/null
+++ b/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch
@@ -0,0 +1,33 @@
+From 7edeceec0376513002813efb7bf723fbcbe6752d Mon Sep 17 00:00:00 2001
+From: Piraty <piraty1@inbox.ru>
+Date: Fri, 15 Apr 2022 08:27:04 +0000
+Subject: [PATCH] Link ykcore against pthread (#7807)
+
+---
+ src/thirdparty/ykcore/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/thirdparty/ykcore/CMakeLists.txt b/src/thirdparty/ykcore/CMakeLists.txt
+index 47191ea7..103349f2 100644
+--- a/src/thirdparty/ykcore/CMakeLists.txt
++++ b/src/thirdparty/ykcore/CMakeLists.txt
+@@ -27,13 +27,15 @@ if(WIN32)
+ elseif(UNIX AND NOT APPLE)
+     target_sources(ykcore PRIVATE ykcore_libusb-1.0.c)
+ 
++    find_package(Threads REQUIRED)
++
+     find_library(LIBUSB_LIBRARY NAMES usb-1.0)
+     find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb")
+     if(NOT LIBUSB_LIBRARY OR NOT LIBUSB_INCLUDE_DIR)
+         message(FATAL_ERROR "libusb-1.0 dev package required, but not found")
+     endif()
+ 
+-    target_link_libraries(ykcore PRIVATE ${LIBUSB_LIBRARY})
++    target_link_libraries(ykcore PRIVATE Threads::Threads ${LIBUSB_LIBRARY})
+     target_include_directories(ykcore PRIVATE ${LIBUSB_INCLUDE_DIR})
+     target_compile_definitions(ykcore PRIVATE _GNU_SOURCE)
+ elseif(APPLE)
+-- 
+2.35.1
+
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index f3543633d6da..a4839235260d 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,6 +1,6 @@
 # Template file for 'keepassxc'
 pkgname=keepassxc
-version=2.6.6
+version=2.7.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
@@ -8,16 +8,17 @@ configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
  -DWITH_XC_BROWSER=$(vopt_if browser ON OFF)
  -DWITH_XC_FDOSECRETS=$(vopt_if fdosecrets ON OFF)
  -DWITH_XC_KEESHARE=$(vopt_if keeshare ON OFF)
- -DWITH_XC_KEESHARE_SECURE=$(vopt_if keeshare ON OFF)
  -DWITH_XC_NETWORKING=$(vopt_if network ON OFF)
  -DWITH_XC_SSHAGENT=$(vopt_if sshagent ON OFF)
  -DWITH_XC_YUBIKEY=$(vopt_if yubikey ON OFF)"
-hostmakedepends="qt5-qmake qt5-host-tools ruby-asciidoctor"
-makedepends="qt5-tools-devel qt5-svg-devel libgcrypt-devel libargon2-devel
- qrencode-devel readline-devel libsodium-devel
- $(vopt_if autotype 'qt5-x11extras-devel libXtst-devel libXi-devel')
- $(vopt_if keeshare quazip-devel)
- $(vopt_if yubikey 'libykpers-devel libyubikey-devel')"
+hostmakedepends="qt5-devel ruby-asciidoctor"
+makedepends="qt5-tools-devel qt5-svg-devel botan-devel libargon2-devel
+ qrencode-devel readline-devel pcsclite-devel
+ qt5-x11extras-devel
+ $(vopt_if autotype 'libXtst-devel libXi-devel')
+ $(vopt_if keeshare minizip-devel)
+ $(vopt_if yubikey 'libusb-devel')"
+checkdepends="xvfb-run"
 short_desc="KeePassXC is a cross-platform port of “Keepass Password Safe”"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,
@@ -25,9 +26,8 @@ license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,
 homepage="https://keepassxc.org/"
 changelog="https://raw.githubusercontent.com/keepassxreboot/keepassxc/${version}/CHANGELOG.md"
 distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz"
-checksum=3603b11ac39b289c47fac77fa150e05fd64b393d8cfdf5732dc3ef106650a4e2
+checksum=6001ba626c35c316dbda6de35736f012a2264f95139fcb4a094b8eb49b15d3e7
 
-# https://github.com/keepassxreboot/keepassxc/blob/a775031fe9471310e50232d1861d4991e2803aff/CMakeLists.txt#L46
 build_options="autotype browser fdosecrets keeshare network sshagent yubikey"
 desc_option_autotype="Include auto-type"
 desc_option_browser="Include browser integration with keepassxc-browser-plugin"
@@ -43,3 +43,7 @@ post_install() {
 	vlicense LICENSE.BSD
 	vlicense LICENSE.MIT
 }
+
+do_check() {
+	xvfb-run ninja -C build test || : #XXX: TestCli::testClip() fails
+}

From 16b191d24e94f3db85db77244263e86075ca0793 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:23:50 +0200
Subject: [PATCH 1520/2561] gstreamer1: update to 1.20.1

---
 srcpkgs/gstreamer1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index cc540feaf0b7..ababbeeb987d 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,7 +1,7 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
-version=1.18.5
-revision=2
+version=1.20.1
+revision=1
 wrksrc="gstreamer-${version}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,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=55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a
+checksum=de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031
 
 pre_check() {
 	# gst_gstdatetime is known to fail according to LFS

From d80ea3376a82ddc3da8fe13e07772a48cbc7b205 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:24:18 +0200
Subject: [PATCH 1521/2561] gst-plugins-base1: update to 1.20.1

---
 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 fc954cc96cf5..6ab6210e6605 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.5
+version=1.20.1
 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=960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3
+checksum=96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204
 
 build_options="cdparanoia gir sndio"
 build_options_default="cdparanoia gir"

From a25ec622829f307370e054acc6d2fa70e6fa50c6 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:28:16 +0200
Subject: [PATCH 1522/2561] gst-plugins-base1: update to 1.20.1

---
 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 974cdbc22c41..0ce7d1bce5c9 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.5
+version=1.20.1
 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=3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b
+checksum=3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa
 
 build_options="gtk3"
 build_options_default="gtk3"

From 9972c6d395fa9e80738b085df2015b701e88500a Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:49:44 +0200
Subject: [PATCH 1523/2561] gst-plugins-ugly1: update to 1.20.1

---
 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 8f3e16d98f81..ad8c128ef726 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.5
+version=1.20.1
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
@@ -16,4 +16,4 @@ 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=df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9
+checksum=42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19

From b5c29e93178540bf915d9bb61e415ec92589826a Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:51:56 +0200
Subject: [PATCH 1524/2561] gst-plugins-bad1: update to 1.20.1

---
 srcpkgs/gst-plugins-bad1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 451f73cb9f55..f7d203133212 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.5
+version=1.20.1
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
@@ -9,7 +9,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
  -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
  -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled
  -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
- -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
+ -Dmplex=disabled -Dmusepack=disabled -Dopenexr=disabled
  -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled
  -Dsrt=disabled -Dteletext=disabled -Dvoaacenc=disabled -Dvoamrwbenc=disabled
  -Dwildmidi=disabled -Dwpe=disabled -Ddirectfb=disabled
@@ -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=a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e
+checksum=09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848
 
 build_options="gir gme"
 build_options_default="gir"

From 3a3f184e15603e0978d78aa1f38b1939a0a5f9a2 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:54:36 +0200
Subject: [PATCH 1525/2561] gst-libav: update to 1.20.1

---
 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 dc77de85702b..333636d0657a 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.5
+version=1.20.1
 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=822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548
+checksum=91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Required by musl for M_SQRT1_2

From 824da444a771758566e1d7cf7170dd0eda5f3fa8 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:56:44 +0200
Subject: [PATCH 1526/2561] gst-omx: update to 1.20.1

---
 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 5e78c4c68549..d657aff289a7 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.5
+version=1.20.1
 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=2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42
+checksum=86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c

From 68a1182380abaa10e3bd2a171d8ba2884ab4cf72 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:59:29 +0200
Subject: [PATCH 1527/2561] gst1-python3: update to 1.20.1

---
 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 5f2fe61a6968..4f6ead444091 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.5
+version=1.20.1
 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=533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52
+checksum=ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422

From 75a7e2ae64cb93910efc0a089299e944b40f5304 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 20:05:05 +0200
Subject: [PATCH 1528/2561] gstreamer-vaapi: update to 1.20.1

---
 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 90a3a0a7579b..1a934c852d1b 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.5
+version=1.20.1
 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=4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b
+checksum=87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137
 
 pre_check() {
 	# Seems to need certain hardware to pass

From 1dacd0ec947e8ba7930a9f1849f85baadc0882eb Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 20:09:30 +0200
Subject: [PATCH 1529/2561] gst1-editing-services: update to 1.20.1

---
 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 1613a7ababfd..ad2318c059ae 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.5
+version=1.20.1
 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=8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5
+checksum=6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df
 
 do_check() {
 	: # Tests fail in older versions as well

From 707b6f9671bb8e5ce841e4ae2319bf044ae64cc8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 19 Apr 2022 23:48:56 +0200
Subject: [PATCH 1530/2561] mkvtoolnix: broken on 32-bit ppc

---
 srcpkgs/mkvtoolnix/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 7f84979ecc3f..52d67b0a6c87 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -23,6 +23,11 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="assembler shits itself";;
+esac
+
 pre_configure() {
 	./autogen.sh
 }

From a14c41ea230690974ca6870ded4bbb5c4b5d5f94 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 30 Mar 2022 21:10:51 -0400
Subject: [PATCH 1531/2561] cgminer: remove package

Upstream is archived and hasn't had a commit or release since 2018
---
 srcpkgs/cgminer/files/cgminer/run |  2 --
 srcpkgs/cgminer/template          | 41 -------------------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 srcpkgs/cgminer/files/cgminer/run
 delete mode 100644 srcpkgs/cgminer/template

diff --git a/srcpkgs/cgminer/files/cgminer/run b/srcpkgs/cgminer/files/cgminer/run
deleted file mode 100644
index b9f9b29ae3d6..000000000000
--- a/srcpkgs/cgminer/files/cgminer/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec cgminer -T --config /etc/cgminer.conf --syslog
diff --git a/srcpkgs/cgminer/template b/srcpkgs/cgminer/template
deleted file mode 100644
index c8add74d08fb..000000000000
--- a/srcpkgs/cgminer/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'cgminer'
-pkgname=cgminer
-version=4.11.1
-revision=1
-build_style=gnu-configure
-configure_args="
- --enable-avalon --enable-avalon2 --enable-bflsc --enable-bitfury \
- --enable-cointerra --enable-drillbit --enable-hashfast --enable-hashratio \
- --enable-icarus --enable-klondike --with-system-libusb"
-hostmakedepends="pkg-config automake libtool yasm"
-makedepends="libcurl-devel libusb-devel jansson-devel eudev-libudev-devel ncurses-devel"
-conf_files="/etc/cgminer.conf"
-short_desc="Multi-threaded multi-pool CPU and GPU miner for bitcoin"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/ckolivas/cgminer"
-distfiles="http://ck.kolivas.org/apps/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=a8f3e244343eda8c3410e6d27188ee941de25c54bd76412e5b4d17de9f30ac18
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	# We have latest jansson and libusb - just use them
-	sed	-e 's|^AC_CONFIG_SUBDIRS.*compat/jansson.*||' \
-		-e 's|JANSSON_LIBS=\".*\"|JANSSON_LIBS=-ljansson|' \
-		-e 's|compat/Makefile||' \
-		-i configure.ac
-
-	sed	-e 's|^JANSSON_CPPFLAGS= .*||' \
-		-e "s|^USBUTILS_CPPFLAGS = .*|USBUTILS_CPPFLAGS = -I${XBPS_CROSS_BASE}/usr/include/libusb-1.0|" \
-		-e 's|^SUBDIRS.*|SUBDIRS = lib ccan|' \
-		-i Makefile.am
-
-	rm -r compat
-	autoreconf -fi
-}
-post_install() {
-	vsv cgminer
-	vconf example.conf cgminer.conf
-	sed -i 's#/usr/local/bin#/usr/bin#g' ${DESTDIR}/etc/cgminer.conf
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6859fe29da93..0923c53cfc05 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -35,6 +35,7 @@ replaces="
  california<=0.4.0_4
  capstone-python<=4.0.2_3
  captain-ballard<=1.0.0_2
+ cgminer<=4.11.1_1
  clamz<=0.5_4
  couchdb<=1.7.1_2
  cracklib-python<=2.9.7_1

From 2f9553307a926db46ea62484df217a3aba82c523 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 14 Apr 2022 19:09:44 -0400
Subject: [PATCH 1532/2561] python3-svg.path: update to 6.0.

---
 srcpkgs/python3-svg.path/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template
index 0d92697a0a9a..a98cae8cfe78 100644
--- a/srcpkgs/python3-svg.path/template
+++ b/srcpkgs/python3-svg.path/template
@@ -1,11 +1,9 @@
 # Template file for 'python3-svg.path'
 pkgname=python3-svg.path
-version=5.1
+version=6.0
 revision=1
 wrksrc="svg.path-${version}"
 build_style=python3-module
-# disable failing test
-make_check_args="-k not(ImageTest)"
 hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest-cov python3-Pillow"
@@ -14,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://github.com/regebro/svg.path"
 distfiles="https://github.com/regebro/svg.path/archive/${version}.tar.gz"
-checksum=2ea5351a5886f8c55ae8fddb2f7182dca3d5760c03abade9cb256b91e4bb9bb4
+checksum=3c460dfb366c3cb70f26eb7e22c092144e24f4f62028632289fa703f8dc25630
 
 post_install() {
 	vlicense LICENSE.txt

From 448636537039eccb4d1cde84a9da3a254706b740 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 19 Apr 2022 18:56:06 -0500
Subject: [PATCH 1533/2561] Amass: update to 3.19.2.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 9293dab01c93..7106a5c312fd 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.19.1
+version=3.19.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=259dbef81ca63ceb85113c0f741c9212bacbac653bca2cd3e8022b256d08d426
+checksum=ef2b5303b3e92debe68ea72c03c4f60320c34f0281f50b5f7108750c7e1a7491

From e95cb755e594d635834acfbb68b8583c0b2059be Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 19 Apr 2022 19:12:59 -0500
Subject: [PATCH 1534/2561] stellarium: update to 0.22.1.

---
 srcpkgs/stellarium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template
index c2a87b2847ad..657b3a6e97b1 100644
--- a/srcpkgs/stellarium/template
+++ b/srcpkgs/stellarium/template
@@ -1,6 +1,6 @@
 # Template file for 'stellarium'
 pkgname=stellarium
-version=0.22.0
+version=0.22.1
 revision=1
 build_style=cmake
 hostmakedepends="perl qt5-qmake qt5-host-tools"
@@ -12,5 +12,5 @@ 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=0b4dc23cf9054b5e76cd9bc5ad68e172eb221999e90af37e93667d04fe78c885
+checksum=61a595ecc345dcc7517359573d0dc772e67ecaf6d52fefab142a77c92cf3fa24
 replaces="stellarium-data>=0"

From 15553f6e0fa1eb565088df31863bf966ebeef64f Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Tue, 19 Apr 2022 23:31:19 -0500
Subject: [PATCH 1535/2561] iperf3: update to 3.11.

---
 srcpkgs/iperf3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iperf3/template b/srcpkgs/iperf3/template
index 81ba349c49be..d71d870ac7c8 100644
--- a/srcpkgs/iperf3/template
+++ b/srcpkgs/iperf3/template
@@ -1,6 +1,6 @@
 # Template file for 'iperf3'
 pkgname=iperf3
-version=3.10.1
+version=3.11
 revision=1
 wrksrc="iperf-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://software.es.net/iperf/"
 changelog="https://raw.githubusercontent.com/esnet/iperf/master/RELNOTES.md"
 distfiles="https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"
-checksum=03bc9760cc54a245191d46bfc8edaf8a4750f0e87abca6764486972044d6715a
+checksum=de8cb409fad61a0574f4cb07eb19ce1159707403ac2dc01b5d175e91240b7e5f
 
 post_install() {
 	vlicense LICENSE

From 05ed17e997466f29b2730a15d3b0ce9c3d4444ee Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Apr 2022 11:04:22 -0400
Subject: [PATCH 1536/2561] python3-signedjson: update to 1.1.4.

---
 .../patches/importlib_metadata.patch          | 39 -------------------
 srcpkgs/python3-signedjson/template           |  4 +-
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/python3-signedjson/patches/importlib_metadata.patch

diff --git a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch b/srcpkgs/python3-signedjson/patches/importlib_metadata.patch
deleted file mode 100644
index d7553958cc15..000000000000
--- a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c40c83f844fee3c1c7b0c5d1508f87052334b4e5 Mon Sep 17 00:00:00 2001
-From: MeggyCal <MeggyCal@users.noreply.github.com>
-Date: Tue, 21 Apr 2020 18:55:37 +0200
-Subject: [PATCH] Do not require importlib_metadata on python 3.8. (#9)
-
----
- setup.py               | 2 +-
- signedjson/__init__.py | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 9c09760..c1cc299 100755
---- a/setup.py
-+++ b/setup.py
-@@ -41,7 +41,7 @@ def read_file(path_segments):
-         "pynacl>=0.3.0",
-         "typing_extensions>=3.5",
-         'typing>=3.5;python_version<"3.5"',
--        "importlib_metadata",
-+        'importlib_metadata;python_version<"3.8"',
-     ],
-     long_description=read_file(("README.rst",)),
-     keywords="json",
-diff --git a/signedjson/__init__.py b/signedjson/__init__.py
-index 6641e64..62faa5e 100644
---- a/signedjson/__init__.py
-+++ b/signedjson/__init__.py
-@@ -12,7 +12,10 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--from importlib_metadata import version, PackageNotFoundError
-+try:
-+    from importlib.metadata import version, PackageNotFoundError
-+except ImportError:  # pragma: nocover
-+    from importlib_metadata import version, PackageNotFoundError
- 
- try:
-     __version__ = version(__name__)
diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index bf9a8ddc1255..8acbaa32ab11 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-signedjson'
 pkgname=python3-signedjson
-version=1.1.1
+version=1.1.4
 revision=1
 wrksrc="signedjson-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-signedjson"
 distfiles="${PYPI_SITE}/s/signedjson/signedjson-${version}.tar.gz"
-checksum=350586e7570ba208f7729dcda09d43f554ead0207a15e3e3695533ef3f720009
+checksum=cd91c56af53f169ef032c62e9c4a3292dc158866933318d0592e3462db3d6492

From 9935530e654669865a1cc5e350d29cdee816ea5f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Apr 2022 11:02:53 -0400
Subject: [PATCH 1537/2561] synapse: update to 1.57.0.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 984ad56e0a8a..22ad01847677 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.56.0
+version=1.57.0
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -21,7 +21,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=7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373
+checksum=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From e5c266d80d28f722e5ef9254d4fcd8d0fc54834b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Apr 2022 14:10:55 +0200
Subject: [PATCH 1538/2561] xauth: update to 1.1.2.

---
 srcpkgs/xauth/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xauth/template b/srcpkgs/xauth/template
index 8cf9d80c6069..b663ef7b1ed9 100644
--- a/srcpkgs/xauth/template
+++ b/srcpkgs/xauth/template
@@ -1,6 +1,6 @@
 # Template file for 'xauth'
 pkgname=xauth
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="X authentication utility"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=78ba6afd19536ced1dddb3276cba6e9555a211b468a06f95f6a97c62ff8ee200
 
 post_install() {
 	vlicense COPYING

From 83aacf89c2a12064145d55b510b27c4b9f18b481 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 20 Apr 2022 17:16:56 +0200
Subject: [PATCH 1539/2561] elixir: update to 1.13.4.

---
 srcpkgs/elixir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 5a8b5d7c1e9d..8f721e3a3337 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.13.3
+version=1.13.4
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -13,7 +13,7 @@ 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=652779f7199f5524e2df1747de0e373d8b9f1d1206df25b2e551cd0ad33f8440
+checksum=95daf2dd3052e6ca7d4d849457eaaba09de52d65ca38d6933c65bc1cdf6b8579
 
 do_check() {
 	ERL_EPMD_PORT=5369 make ${make_check_target}

From 8d874f160f0b1c8b338e73f4ff172a5e25eadd49 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 20 Apr 2022 10:36:14 -0500
Subject: [PATCH 1540/2561] jadx: update to 1.3.5.

---
 srcpkgs/jadx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template
index 71467e34044c..dba5153c9961 100644
--- a/srcpkgs/jadx/template
+++ b/srcpkgs/jadx/template
@@ -1,6 +1,6 @@
 # Template file for 'jadx'
 pkgname=jadx
-version=1.3.4
+version=1.3.5
 revision=1
 hostmakedepends="openjdk8 gradle"
 short_desc="Decompiler for Dalvik bytecode"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/skylot/jadx"
 distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz"
-checksum=9f7f05c647a287fe4a572d85f14715559513e864d27f6bf6b19852529da8efdc
+checksum=ed556c32b87f6f6cc1ef6ea35bc6881da1a6ad538bb81f9dad1c16969435ea24
 
 do_build() {
 	gradle copyArtifacts

From 2904f5489c36ae6505bddfa980c1f68783b98459 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 20 Apr 2022 10:44:59 -0500
Subject: [PATCH 1541/2561] python3-easygui: update to 0.98.3.

---
 srcpkgs/python3-easygui/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-easygui/template b/srcpkgs/python3-easygui/template
index 3a35dad07d78..87188a537d51 100644
--- a/srcpkgs/python3-easygui/template
+++ b/srcpkgs/python3-easygui/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-easygui'
 pkgname=python3-easygui
-version=0.98.1
-revision=5
+version=0.98.3
+revision=1
 wrksrc="easygui-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-tkinter"
+checkdepends="$depends"
 short_desc="Simple, very easy GUI programming in Python"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/robertlugg/easygui"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b46d1f06b85a2de2b15129906d21bb42bc66a6e800315fed57e634cf151fc083
+distfiles="${PYPI_SITE}/e/easygui/easygui-${version}.tar.gz"
+checksum=d653ff79ee1f42f63b5a090f2f98ce02335d86ad8963b3ce2661805cafe99a04
+make_check=no # Requires X connection
 
 post_install() {
 	sed -n '29,74p' easygui/easygui.py > LICENSE

From d70f3af4e9227111a1de23da5ee4421852e0b53c Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 13 Feb 2022 12:36:33 +0200
Subject: [PATCH 1542/2561] shadow: increase maximum group name length to 32
 (from 16).

This is already the case for usernames, so why not groups?
---
 srcpkgs/shadow/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index f01181a49bd6..c59d92bfeb54 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,12 +1,13 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin --sbindir=/usr/bin
  --enable-shared --disable-static
  --with-libpam --without-selinux --with-acl --with-attr --without-su
- --disable-nls --enable-subordinate-ids --disable-account-tools-setuid"
+ --disable-nls --enable-subordinate-ids --disable-account-tools-setuid
+ --with-group-name-max-length=32"
 hostmakedepends="libtool"
 makedepends="acl-devel pam-devel"
 depends="pam"

From 9791498d7dff8be5324198f383838352d0e7e95f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 19 Apr 2022 10:48:20 +0200
Subject: [PATCH 1543/2561] platformio: update to 5.2.5.

Closes: #36762 [via git-merge-pr]
---
 srcpkgs/platformio/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/platformio/template b/srcpkgs/platformio/template
index 4aec9f82cc5a..9dbceafd89f5 100644
--- a/srcpkgs/platformio/template
+++ b/srcpkgs/platformio/template
@@ -1,7 +1,7 @@
 # Template file for 'platformio'
 pkgname=platformio
-version=5.1.1
-revision=2
+version=5.2.5
+revision=1
 wrksrc="platformio-core-${version}"
 build_style=python3-module
 # According to https://github.com/platformio/platformio-core/blob/9c20ab81cb68f1ffb7a8cac22ce95c4c797643ec/Makefile#L13
@@ -11,14 +11,14 @@ depends="python3-bottle python3-click python3-colorama python3-marshmallow
  python3-pyelftools python3-pyserial python3-requests
  python3-semanticversion python3-setuptools python3-tabulate"
 checkdepends="python3-pytest python3-jsondiff python3-wheel python3-pip
- python3-Twisted python3-certifi git $depends"
+ python3-Twisted python3-certifi git python3-zeroconf $depends"
 short_desc="Ecosystem for embedded development"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 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=f312c4cb535dc52c96b754cb54df3fee8001ab960894c7f2f9edd0e50d416aed
+checksum=26cc5b61d113250519257c156ae693ab8f6aea891283b28f1c4c67ffc81fb574
 
 post_install() {
 	vinstall scripts/99-platformio-udev.rules 644 usr/lib/udev/rules.d

From f40c7d77a616eebf23992ceb88f156a959846205 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 21 Apr 2022 00:59:24 +0200
Subject: [PATCH 1544/2561] qt5: rebuild against gstreamer-1.20.1

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 3a6841ed69b4..f6c03777d993 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20220222
 # commit fcca82ca40a5d8a02a4ddd90846d070f2c58cfad
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From ed94af3a280b97aa0a3ddf463f45d8639d162f4f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 10 Apr 2022 15:00:08 +0200
Subject: [PATCH 1545/2561] pipewire: update to 0.3.50.

---
 srcpkgs/pipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 5ed1ee1d3bd6..6427e0b66e77 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.48
+version=0.3.50
 revision=1
 _pms_version=0.4.1
 build_style=meson
@@ -32,7 +32,7 @@ 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
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="0d218be86b3d2b548c06259c47ad8d110ee1c09f071e17c4393eeef5c880fa6f
+checksum="a4bd81e9046f0bd19ecc18402b44199c6c4c54305670e43111c7fbdfe4d17bdf
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

From da97da0bcac91a7c9bfbec387efeba32a36bec29 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 16 Apr 2022 16:34:02 +0200
Subject: [PATCH 1546/2561] Carla: update to 2.4.3.

---
 srcpkgs/Carla/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 83b8224861ae..6d25e6bb0482 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,6 +1,6 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.4.2
+version=2.4.3
 revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
@@ -14,9 +14,9 @@ depends="python3 python3-PyQt5 python3-PyQt5-svg pyliblo which"
 short_desc="Audio plugin host"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
+homepage="https://kx.studio/Applications:Carla"
 distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
-checksum=376884965e685242953cab757818dde262209c651bd563a04eade0678c6b9f39
+checksum=0092926e5167f3a5eb592f0055e5491803354ae42947e706db0dc548d9e786d3
 python_version=3
 
 case $XBPS_TARGET_MACHINE in
@@ -29,15 +29,14 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" Carla-devel"
 fi
 
-pre_build() {
-	vsed -e '1,1i#include <unistd.h>' \
-		-i source/modules/water/text/CharacterFunctions.h
-
+post_patch() {
 	if [ "$CROSS_BUILD" ]; then
 		vsed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \
 			source/plugin/Makefile
 	fi
+}
 
+pre_build() {
 	make ${make_build_args} features
 }
 

From ca76560170e69aed9cd92592fea98f9f5dde786f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:38:26 +0200
Subject: [PATCH 1547/2561] python3-fasteners: add python3 to dependencies

---
 srcpkgs/python3-fasteners/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-fasteners/template b/srcpkgs/python3-fasteners/template
index d1d2c75ca2e2..0e5b8bed2c28 100644
--- a/srcpkgs/python3-fasteners/template
+++ b/srcpkgs/python3-fasteners/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-fasteners'
 pkgname=python3-fasteners
 version=0.17.3
-revision=1
+revision=2
 wrksrc="fasteners-${version}"
 build_style=python3-pep517
 hostmakedepends="python3 python3-wheel"
+depends="python3"
 short_desc="Python3 package that provides useful locks"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From e7ab16cc4e6a66f2ae9ff0c9c2b14cc346fab1f9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:38:26 +0200
Subject: [PATCH 1548/2561] python3-listparser: add python3 to dependencies

---
 srcpkgs/python3-listparser/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-listparser/template b/srcpkgs/python3-listparser/template
index dfe7ba100839..55bcd24119af 100644
--- a/srcpkgs/python3-listparser/template
+++ b/srcpkgs/python3-listparser/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-listparser'
 pkgname=python3-listparser
 version=0.18
-revision=1
+revision=2
 wrksrc="listparser-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
+depends="python3"
 short_desc="Parse subscription lists in Python"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-3.0-or-later"

From 72ef671650cc55f97dbbaf400dd40d2c99564300 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:39:03 +0200
Subject: [PATCH 1549/2561] python3-pylast: fix dependencies

---
 srcpkgs/python3-pylast/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index 63b2e0104e61..76e57a27f4cf 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-pylast'
 pkgname=python3-pylast
 version=4.1.0
-revision=3
+revision=4
 wrksrc="pylast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3"
+depends="python3-setuptools"
 short_desc="Python3 interface to last.fm and libre.fm"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pylast/pylast"
 distfiles="${PYPI_SITE}/p/pylast/pylast-${version}.tar.gz"
 checksum=ad084aec1bf7e307bc42d7cc1a003851f5bee1ad24fb697a9fdc300bbfe63932
+make_check=no # The 'pylast' distribution was not found and is required by the application

From 7599e78edb1290b89511095d0dae01f227e61718 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:39:04 +0200
Subject: [PATCH 1550/2561] python3-soupsieve: fix dependencies

---
 srcpkgs/python3-soupsieve/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index 14449f20c47f..83862532f658 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-soupsieve'
 pkgname=python3-soupsieve
 version=1.9.5
-revision=6
+revision=7
 wrksrc="soupsieve-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-pytest python3-lxml python3-html5lib python3-BeautifulSoup4"
+depends="python3-BeautifulSoup4"
+checkdepends="python3-pytest python3-lxml python3-html5lib $depends"
 short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"

From 24e0b169c4e71e83b0951428e0788cf9c1cc359d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:39:04 +0200
Subject: [PATCH 1551/2561] python3-readability-lxml: fix dependencies

---
 srcpkgs/python3-readability-lxml/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-readability-lxml/template b/srcpkgs/python3-readability-lxml/template
index 798cc9c5f4cc..dfb4b0fb6b25 100644
--- a/srcpkgs/python3-readability-lxml/template
+++ b/srcpkgs/python3-readability-lxml/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-readability-lxml'
 pkgname=python3-readability-lxml
 version=0.8.1
-revision=4
+revision=5
 wrksrc="readability-lxml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lxml"
+depends="python3-lxml python3-chardet python3-cssselect"
 short_desc="Fast html to text parser"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/buriy/python-readability"
 distfiles="${PYPI_SITE}/r/readability-lxml/readability-lxml-${version}.tar.gz"
 checksum=e51fea56b5909aaf886d307d48e79e096293255afa567b7d08bca94d25b1a4e1
+make_check=no # needs unpackaged timeout_decorator

From 4996d152242dcc44ad980a5c93f74e83157d438e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:05:43 -0400
Subject: [PATCH 1552/2561] New package: openjdk17-jmods-17.0.3+5

---
 srcpkgs/openjdk17-jmods    |  1 +
 srcpkgs/openjdk17/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk17-jmods

diff --git a/srcpkgs/openjdk17-jmods b/srcpkgs/openjdk17-jmods
new file mode 120000
index 000000000000..99ab1cb1b0d2
--- /dev/null
+++ b/srcpkgs/openjdk17-jmods
@@ -0,0 +1 @@
+openjdk17
\ No newline at end of file
diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 7e368f9b687e..9dba58b0d0d7 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -168,7 +168,7 @@ post_install() {
 	rm -rf ./ca
 }
 
-subpackages="openjdk17-src openjdk17-jre openjdk17-doc"
+subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods"
 
 openjdk17-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -223,3 +223,11 @@ openjdk17-src_package() {
 		vmove "$_jdk_home/lib/src.zip"
 	}
 }
+
+openjdk17-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From be533af960b33eb2f39412737341091592cfc556 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:06:37 -0400
Subject: [PATCH 1553/2561] openjdk17: update to 17.0.3+7.

also disable for armv5 and 6, the arch is not supported
---
 srcpkgs/openjdk17/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 9dba58b0d0d7..2554e49c54ea 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,6 +1,6 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
-version=17.0.3+5
+version=17.0.3+7
 revision=1
 _gtest_ver=1.8.1
 _java_ver="${version%%.*}"
@@ -44,7 +44,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
  https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
-checksum="a557f4d2972bbbbcdc12fa7e167ad60b4ee1461a9bc7ad259a003172c34e6331
+checksum="22575340d080a396442658356583d9c7dc0c44cefa52842fbfcf23eef23c39a0
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1"
 patch_args="-Np1 --directory=$build_wrksrc"
@@ -53,10 +53,11 @@ patch_args="-Np1 --directory=$build_wrksrc"
 disable_parallel_build=yes
 build_options="docs"
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then
@@ -81,11 +82,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jfr:/${_jdk_home}/bin/jfr
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
-
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
  jdk:/usr/bin/java:/${_jdk_home}/bin/java

From 0c00f7eca1c83b0f4b03eec61a4489e745ef5d0b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:38 -0400
Subject: [PATCH 1554/2561] openjdk9-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk9-bootstrap/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 48cc14fb712c..c82f0761166a 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -50,10 +50,11 @@ checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  9cba7f03ebeda4d3cfaffb015f9bf967fcca2c3c113604836073556df6a7b9aa
  c939de46f903ecb283c02155e1415cee98ab66803e17eae0403c399c1a475647"
 
-# no hotspot JIT for arm32 and ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	arm*|ppc*) _use_zero=yes ;;
+	# no hotspot JIT for arm32 and ppc32
+	armv7*|ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 0cef4c954f67190f47c1f7850bb0ccc6af71dfd6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:40 -0400
Subject: [PATCH 1555/2561] openjdk10-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk10-bootstrap/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 3d99cd14af98..1c673dc748d1 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -35,10 +35,11 @@ distfiles="http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-${_repo_ver
 checksum="374f7ae35f0a7439a40bd2c765d1f410607c75c6c1e788f1a344a42e59431f51"
 lib32disabled=yes
 
-# no hotspot JIT for arm32 and ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	arm*|ppc*) _use_zero=yes ;;
+	# no hotspot JIT for arm32 and ppc32
+	armv7*|ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 79e1657bdebd920167760c954d25d9ee5ff31618 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:41 -0400
Subject: [PATCH 1556/2561] openjdk12-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk12-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 2b5d421a52f0..1f20483ecbd4 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -47,10 +47,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From ff5e50fdffd236e9df2434d9c1e311ab70c861dd Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:41 -0400
Subject: [PATCH 1557/2561] openjdk13-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk13-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 4a61e102381d..6a6b3340ffcd 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -47,10 +47,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From ec803b07277af1681b865dc9a8d79281937edd02 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:42 -0400
Subject: [PATCH 1558/2561] openjdk14-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk14-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 768b94633196..341818dc5cf9 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -46,10 +46,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 75077cc88a70d502286cb4856ec8bda27c47b2fa Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:43 -0400
Subject: [PATCH 1559/2561] openjdk15-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk15-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 7608f4dd2658..1430f205d1b9 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -49,10 +49,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 873ff286963e54d5905dfde53426d391cd72d33b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:43 -0400
Subject: [PATCH 1560/2561] openjdk16-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk16-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 28e70a17fd2b..2c8566bb1c31 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -49,10 +49,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From f4c7ccb907c5ec1b8a576aff371bd3f77ce907da Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 22:12:21 -0400
Subject: [PATCH 1561/2561] openjdk8: update to 8u322b04, enable debug.

---
 .../openjdk8/patches/006_8197981-pr3548.patch |  32 ----
 srcpkgs/openjdk8/patches/010_pr1869.patch     |  33 ----
 .../patches/999-native-no-sysroot.patch       |  10 +-
 srcpkgs/openjdk8/template                     | 161 ++++++++----------
 4 files changed, 77 insertions(+), 159 deletions(-)
 delete mode 100644 srcpkgs/openjdk8/patches/006_8197981-pr3548.patch
 delete mode 100644 srcpkgs/openjdk8/patches/010_pr1869.patch

diff --git a/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch b/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch
deleted file mode 100644
index 5f6d9ce9e4b5..000000000000
--- a/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518667645 0
-#      Thu Feb 15 04:07:25 2018 +0000
-# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
-# Parent  999983606f5c61b093c6f6316a7b26c4cd4ca79e
-8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -457,6 +457,7 @@
-     long long unsigned int oldval,
-     long long unsigned int newval) {
-     ShouldNotCallThis();
-+    return 0;
-   }
- };
- #endif // !_LP64
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -498,6 +498,7 @@
-     long long unsigned int oldval,
-     long long unsigned int newval) {
-     ShouldNotCallThis();
-+    return 0;
-   }
- };
- #endif // !_LP64
diff --git a/srcpkgs/openjdk8/patches/010_pr1869.patch b/srcpkgs/openjdk8/patches/010_pr1869.patch
deleted file mode 100644
index 26f8c8e14bd6..000000000000
--- a/srcpkgs/openjdk8/patches/010_pr1869.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1405461315 -3600
-#      Tue Jul 15 22:55:15 2014 +0100
-# Node ID 967ae4d849eb20b4b63c399bc3f376dfc0f9d2cc
-# Parent  84854c983fd81cf1a1598f8c069a2db010abc05c
-PR1869: Avoid x86 workaround when running Zero rather than a JIT
-Contributed-by: Matthias Klose <doko@ubuntu.com>
-
-diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2019-04-11 03:36:49.000000000 +0100
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2019-04-19 17:15:35.194017652 +0100
-@@ -5139,7 +5139,7 @@
- 
-   Linux::capture_initial_stack(JavaThread::stack_size_at_create());
- 
--#if defined(IA32)
-+#if defined(IA32) && !defined(ZERO)
-   workaround_expand_exec_shield_cs_limit();
- #endif
- 
-diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2019-04-11 03:36:49.000000000 +0100
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2019-04-19 17:15:58.329656663 +0100
-@@ -890,7 +890,7 @@
-  * updates (JDK-8023956).
-  */
- void os::workaround_expand_exec_shield_cs_limit() {
--#if defined(IA32)
-+#if defined(IA32) && !defined(ZERO)
-   size_t page_size = os::vm_page_size();
- 
-   /*
diff --git a/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch b/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch
index 52c8194b0bca..aabc19835d5c 100644
--- a/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch
+++ b/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch
@@ -2,11 +2,9 @@ By default, OpenJDK 8 passes sysroot flags to native compiler. This is wrong,
 as it will then use target include files when calling the native compiler.
 Newer versions of OpenJDK have seemingly fixed this, 8 has not.
 
-diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
-index d961cf3..9679f97 100644
 --- a/make/common/NativeCompilation.gmk
 +++ b/make/common/NativeCompilation.gmk
-@@ -383,10 +383,6 @@ define SetupNativeCompilation
+@@ -384,10 +384,6 @@
      $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
    endif
  
@@ -17,12 +15,12 @@ index d961cf3..9679f97 100644
    # Now call add_native_source for each source file we are going to compile.
    $$(foreach p,$$($1_SRCS), \
        $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
-@@ -432,8 +428,6 @@ define SetupNativeCompilation
+@@ -433,8 +429,6 @@
      $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
    endif
  
 -  $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS)
 -
+   # Need to make sure TARGET is first on list
    $1 := $$($1_TARGET)
-   ifneq (,$$($1_LIBRARY))
-     # Generating a dynamic library.
+   ifeq ($$($1_STATIC_LIBRARY),)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index c10b5216435b..9cced29b4be9 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -3,13 +3,12 @@
 # TODO: make -headless versions
 # TODO: config files?
 pkgname=openjdk8
-version=8u272b02
+version=8u322b04
 revision=1
-_jdk_update=272
 _jdk_update="${version#*u}"
 _jdk_update="${_jdk_update%b*}"
 _jdk_build="${version#*b}"
-_final_jdk_home="usr/lib/jvm/java-1.8-openjdk"
+_jdk_home="usr/lib/jvm/java-1.8-openjdk"
 # we're using aarch64 port repo to get aarch64 JIT; the repo is
 # otherwise the same as the normal one, just with aarch64 port added
 _repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
@@ -19,6 +18,8 @@ configure_args="
  --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
  --with-update-version=${_jdk_update}
  --with-build-number=b${_jdk_build}
+ --with-debug-level=release
+ --with-native-debug-symbols=internal
  --with-milestone=fcs
  --enable-unlimited-crypto
  --with-zlib=system
@@ -53,14 +54,14 @@ distfiles="
  http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/${_repo_ver}.tar.gz>langtools-${_repo_ver}.tar.gz
  http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/${_repo_ver}.tar.gz>nashorn-${_repo_ver}.tar.gz"
 
-checksum="bb931ea723a8b6c418ef6a8dc7b33c9a082ce240f607e33d260951bdc52d1294
- 655a3f4875f4ea4d6d7083c65e3bffbd694114af25a7e25bb4276c63f606328d
- 2c6bc905ffe04659e89806514f10848e4ff548209c8e4407a5f37a3358a8cb78
- 9543a96eb3f60171cebbf0652190942c0b0a78560fae19c7c7aff7a72e14daa5
- 7a610a834483650660a98828420cd3bb36f17e077cc0eaf30c4d01db97ee0efd
- 330f52d045993ca98f6c6376bb67e5c085937553db80fd21503129f9fcdd144d
- 04d6b61009f7373c49a5381281cae2d4c06d4c5bc42991b3bccfb8b820b95bba
- 48aac240d50cb3fa651b2299b6add1376f31624fd7666b74ba23761bb535fab7"
+checksum="1b93adf81488be199243f684398d616c20e68bd3bef990d9eafb3d607ab3d02e
+ 03a7e0fc8ce0ed938c80c69890812e1dbad423df1718115e28f930908a9b5f9b
+ 2213194f9b3aef81340710ca63fd00fbabc42a82b6b30d6955640e66293ab497
+ 80646bf709598067622227c982efdbd88b3c6e8da0024e6f9a264145d942a99c
+ 8c8fc97a8c056cc520472d292b85dbe25a7edbfa4545a8c45275b7b378b0fb65
+ 2d659ba2c64b19dba192ed1be1e6033efb7445809f8e6966439619a417975a73
+ 16cc13cc5234ac1ed3dcebc8c8586a4e31b43cf5c9a4b496fd1f29279fa6b827
+ 68357e18386d833a882a9a988bf4535e5ce8dfa90beeeed7a1939aa75c0e991f"
 
 build_options="docs"
 desc_option_docs="Build documentation"
@@ -81,75 +82,59 @@ fi
 
 provides="java-environment-${version}_1"
 
-if [ -n "$XBPS_DEBUG_PKGS" ]; then
-	configure_args+=" --with-native-debug-symbols=internal"
-fi
-
 if [ ! "$CROSS_BUILD" ]; then
 	hostmakedepends+=" openjdk7-bootstrap"
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-1.7-openjdk"
 else
 	hostmakedepends+=" openjdk8"
-	configure_args+=" --with-boot-jdk=/${_final_jdk_home}"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 # enabling ccache segfaults gcc
 export CCACHE_DISABLE=1
 
 alternatives="
- java:/usr/bin/java:/${_final_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_final_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_final_jdk_home}/bin/keytool
- java:/usr/bin/orbd:/${_final_jdk_home}/bin/orbd
- java:/usr/bin/pack200:/${_final_jdk_home}/bin/pack200
- java:/usr/bin/policytool:/${_final_jdk_home}/bin/policytool
- java:/usr/bin/rmid:/${_final_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_final_jdk_home}/bin/rmiregistry
- java:/usr/bin/servertool:/${_final_jdk_home}/bin/servertool
- java:/usr/bin/tnameserv:/${_final_jdk_home}/bin/tnameserv
- java:/usr/bin/unpack200:/${_final_jdk_home}/bin/unpack200
-
- jdk:/usr/bin/appletviewer:/${_final_jdk_home}/bin/appletviewer
- jdk:/usr/bin/extcheck:/${_final_jdk_home}/bin/extcheck
- jdk:/usr/bin/idlj:/${_final_jdk_home}/bin/idlj
- jdk:/usr/bin/jar:/${_final_jdk_home}/bin/jar
- jdk:/usr/bin/jarsigner:/${_final_jdk_home}/bin/jarsigner
- jdk:/usr/bin/java:/${_final_jdk_home}/bin/java
- jdk:/usr/bin/java-rmi.cgi:/${_final_jdk_home}/bin/java-rmi.cgi
- jdk:/usr/bin/javac:/${_final_jdk_home}/bin/javac
- jdk:/usr/bin/javadoc:/${_final_jdk_home}/bin/javadoc
- jdk:/usr/bin/javah:/${_final_jdk_home}/bin/javah
- jdk:/usr/bin/javap:/${_final_jdk_home}/bin/javap
- jdk:/usr/bin/jcmd:/${_final_jdk_home}/bin/jcmd
- jdk:/usr/bin/jconsole:/${_final_jdk_home}/bin/jconsole
- jdk:/usr/bin/jdb:/${_final_jdk_home}/bin/jdb
- jdk:/usr/bin/jdeps:/${_final_jdk_home}/bin/jdeps
- jdk:/usr/bin/jhat:/${_final_jdk_home}/bin/jhat
- jdk:/usr/bin/jinfo:/${_final_jdk_home}/bin/jinfo
- jdk:/usr/bin/jjs:/${_final_jdk_home}/bin/jjs
- jdk:/usr/bin/jmap:/${_final_jdk_home}/bin/jmap
- jdk:/usr/bin/jps:/${_final_jdk_home}/bin/jps
- jdk:/usr/bin/jrunscript:/${_final_jdk_home}/bin/jrunscript
- jdk:/usr/bin/jsadebugd:/${_final_jdk_home}/bin/jsadebugd
- jdk:/usr/bin/jstack:/${_final_jdk_home}/bin/jstack
- jdk:/usr/bin/jstat:/${_final_jdk_home}/bin/jstat
- jdk:/usr/bin/jstatd:/${_final_jdk_home}/bin/jstatd
- jdk:/usr/bin/keytool:/${_final_jdk_home}/bin/keytool
- jdk:/usr/bin/native2ascii:/${_final_jdk_home}/bin/native2ascii
- jdk:/usr/bin/orbd:/${_final_jdk_home}/bin/orbd
- jdk:/usr/bin/pack200:/${_final_jdk_home}/bin/pack200
- jdk:/usr/bin/policytool:/${_final_jdk_home}/bin/policytool
- jdk:/usr/bin/rmic:/${_final_jdk_home}/bin/rmic
- jdk:/usr/bin/rmid:/${_final_jdk_home}/bin/rmid
- jdk:/usr/bin/rmiregistry:/${_final_jdk_home}/bin/rmiregistry
- jdk:/usr/bin/schemagen:/${_final_jdk_home}/bin/schemagen
- jdk:/usr/bin/serialver:/${_final_jdk_home}/bin/serialver
- jdk:/usr/bin/servertool:/${_final_jdk_home}/bin/servertool
- jdk:/usr/bin/tnameserv:/${_final_jdk_home}/bin/tnameserv
- jdk:/usr/bin/unpack200:/${_final_jdk_home}/bin/unpack200
- jdk:/usr/bin/wsgen:/${_final_jdk_home}/bin/wsgen
- jdk:/usr/bin/wsimport:/${_final_jdk_home}/bin/wsimport
- jdk:/usr/bin/xjc:/${_final_jdk_home}/bin/xjc
+ jdk:/usr/bin/appletviewer:/${_jdk_home}/bin/appletviewer
+ jdk:/usr/bin/extcheck:/${_jdk_home}/bin/extcheck
+ jdk:/usr/bin/idlj:/${_jdk_home}/bin/idlj
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/java-rmi.cgi:/${_jdk_home}/bin/java-rmi.cgi
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javah:/${_jdk_home}/bin/javah
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhat:/${_jdk_home}/bin/jhat
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jsadebugd:/${_jdk_home}/bin/jsadebugd
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/native2ascii:/${_jdk_home}/bin/native2ascii
+ jdk:/usr/bin/orbd:/${_jdk_home}/bin/orbd
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/policytool:/${_jdk_home}/bin/policytool
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/schemagen:/${_jdk_home}/bin/schemagen
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/servertool:/${_jdk_home}/bin/servertool
+ jdk:/usr/bin/tnameserv:/${_jdk_home}/bin/tnameserv
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+ jdk:/usr/bin/wsgen:/${_jdk_home}/bin/wsgen
+ jdk:/usr/bin/wsimport:/${_jdk_home}/bin/wsimport
+ jdk:/usr/bin/xjc:/${_jdk_home}/bin/xjc
 "
 
 post_extract() {
@@ -219,11 +204,11 @@ post_install() {
 
 	# unify the install prefix
 	mv ${DESTDIR}/usr/lib/jvm/openjdk-1.8.0_${_jdk_update} \
-	   ${DESTDIR}/${_final_jdk_home}
+	   ${DESTDIR}/${_jdk_home}
 
-	vmkdir ${_final_jdk_home}/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/${_final_jdk_home}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/${_final_jdk_home}/lib/security/
+	vmkdir ${_jdk_home}/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/${_jdk_home}/bin/keytool"
+	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/${_jdk_home}/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 
@@ -237,23 +222,23 @@ openjdk8-jre_package() {
 	short_desc+=" - runtime components"
 	provides="java-runtime-${version}_1"
 	alternatives="
-	 java:/usr/bin/java:/${_final_jdk_home}/jre/bin/java
-	 java:/usr/bin/jjs:/${_final_jdk_home}/jre/bin/jjs
-	 java:/usr/bin/keytool:/${_final_jdk_home}/jre/bin/keytool
-	 java:/usr/bin/orbd:/${_final_jdk_home}/jre/bin/orbd
-	 java:/usr/bin/pack200:/${_final_jdk_home}/jre/bin/pack200
-	 java:/usr/bin/policytool:/${_final_jdk_home}/jre/bin/policytool
-	 java:/usr/bin/rmid:/${_final_jdk_home}/jre/bin/rmid
-	 java:/usr/bin/rmiregistry:/${_final_jdk_home}/jre/bin/rmiregistry
-	 java:/usr/bin/servertool:/${_final_jdk_home}/jre/bin/servertool
-	 java:/usr/bin/tnameserv:/${_final_jdk_home}/jre/bin/tnameserv
-	 java:/usr/bin/unpack200:/${_final_jdk_home}/jre/bin/unpack200
+	 java:/usr/bin/java:/${_jdk_home}/jre/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/jre/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/jre/bin/keytool
+	 java:/usr/bin/orbd:/${_jdk_home}/jre/bin/orbd
+	 java:/usr/bin/pack200:/${_jdk_home}/jre/bin/pack200
+	 java:/usr/bin/policytool:/${_jdk_home}/jre/bin/policytool
+	 java:/usr/bin/rmid:/${_jdk_home}/jre/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/jre/bin/rmiregistry
+	 java:/usr/bin/servertool:/${_jdk_home}/jre/bin/servertool
+	 java:/usr/bin/tnameserv:/${_jdk_home}/jre/bin/tnameserv
+	 java:/usr/bin/unpack200:/${_jdk_home}/jre/bin/unpack200
 	"
 	pkg_install() {
-		vmove ${_final_jdk_home}/jre
+		vmove ${_jdk_home}/jre
 		vmkdir etc/profile.d
 		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk8.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/${_final_jdk_home}/jre}
+export JAVA_HOME=\${JAVA_HOME=/${_jdk_home}/jre}
 EOF
 	}
 }
@@ -264,7 +249,7 @@ openjdk8-src_package() {
 	noshlibprovides=yes
 	short_desc+=" - source code"
 	pkg_install() {
-		vmove ${_final_jdk_home}/src.zip
+		vmove ${_jdk_home}/src.zip
 	}
 }
 
@@ -279,6 +264,6 @@ openjdk8-doc_package() {
 			vmkdir usr/share/doc/openjdk8
 			cp -a build/linux-*/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk8
 		fi
-		vmove ${_final_jdk_home}/man/man1
+		vmove ${_jdk_home}/man/man1
 	}
 }

From e906d3bed0475f598f08e5125ef507ba205ecfca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Apr 2022 12:15:20 +0200
Subject: [PATCH 1562/2561] python3-pwntools: update to 4.8.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 e57c1bed3007..f61ad95fa813 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.7.0
+version=4.8.0
 revision=1
 wrksrc="pwntools-${version}"
 build_style=python3-module
@@ -17,7 +17,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=74388e28675e7a1929f763df5a1cec6a3d589641049b6cf476bb1c56ec50a88e
+checksum=42052e2d883710e4e1da041e91675a6d719fb4e5ef2dd245cb2853da11269290
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From cbaf517bbb78ea16af46a1bb836d358ecf258514 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Apr 2022 14:20:52 +0200
Subject: [PATCH 1563/2561] gst-plugins-base1: ensure wayland winsys is built

This is a regression from previous state.
---
 srcpkgs/gst-plugins-base1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 6ab6210e6605..fcb7c07b06ab 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
 version=1.20.1
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
@@ -9,12 +9,13 @@ configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
  -Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled)"
-hostmakedepends="gettext pkg-config glib-devel orc"
+hostmakedepends="gettext pkg-config glib-devel orc wayland-devel"
 makedepends="gstreamer1-devel glib-devel libxml2-devel pango-devel
  cairo-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel
  libvisual-devel libgudev-devel libtheora-devel libvorbis-devel
  libSM-devel orc-devel $(vopt_if cdparanoia libcdparanoia-devel)
- opus-devel MesaLib-devel $(vopt_if sndio sndio-devel) graphene-devel"
+ opus-devel MesaLib-devel $(vopt_if sndio sndio-devel) graphene-devel
+ wayland-devel wayland-protocols"
 depends="orc>=0.4.18 gstreamer1>=${version}"
 checkdepends="mesa-dri"
 short_desc="GStreamer Base Plug-ins (v1.x)"

From 68c1db90d9b191d5c3d3cbb7fa8883a79b3454f4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Apr 2022 14:25:20 +0200
Subject: [PATCH 1564/2561] gst-plugins-good1: rebuild against fixed
 gst-plugins-base1

---
 srcpkgs/gst-plugins-good1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 0ce7d1bce5c9..aba03519e450 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-good1'
 pkgname=gst-plugins-good1
 version=1.20.1
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled

From 488111a2d9229acac6c26dbfa43c8299d4067583 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Apr 2022 14:28:46 +0200
Subject: [PATCH 1565/2561] qt5: rebuild again against fixed gstreamer

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f6c03777d993..ee788fad2019 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20220222
 # commit fcca82ca40a5d8a02a4ddd90846d070f2c58cfad
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From ac2bb3ee233d4c9acf28f433f7ff24b60b1e3f52 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Apr 2022 15:36:44 +0200
Subject: [PATCH 1566/2561] clojure: update to 1.11.1.1105.

---
 srcpkgs/clojure/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 7fdaa6090b67..ac65080ef7af 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,6 +1,6 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.1029
+version=1.11.1.1105
 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=422986f259608c049fcff7147222c713b5563a9f0c6e74e0a0dae4a076478091
+checksum=991cad02a2ac459dc4222c9f8233e2145458ed8576a254b64c262798cae40567
 
 do_install() {
 	vmkdir /usr/lib/clojure

From f24b584a55cf63a7c745d75ff29b95073b51b62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 13 Apr 2022 21:13:37 +0200
Subject: [PATCH 1567/2561] xbps-src: sort and deduplicate packages at
 update-sys

---
 common/xbps-src/shutils/bulk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 8eb6e920f04f..c0228f10ac2b 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -68,7 +68,7 @@ bulk_build() {
 
     # Compare installed pkg versions vs srcpkgs
     if [[ $sys ]]; then
-        xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR
+        bulk_sortdeps $(xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR)
         return $?
     fi
     # compare repo pkg versions vs srcpkgs

From 3f7c0af70a2cac282b5d469c5dc14fa6613456f2 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 14:08:15 +0200
Subject: [PATCH 1568/2561] lxqt: update to 1.1.0.

---
 srcpkgs/lxqt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lxqt/template b/srcpkgs/lxqt/template
index a510106d65db..d30d711e9561 100644
--- a/srcpkgs/lxqt/template
+++ b/srcpkgs/lxqt/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt'
 pkgname=lxqt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=meta
 depends="
@@ -21,15 +21,15 @@ depends="
 	obconf-qt
 	pcmanfm-qt>=${version}
 	lximage-qt>=${version}
-	lxmenu-data
 	lxqt-archiver
 	qterminal>=${version}
 	openbox
 	breeze-icons
+	xdg-desktop-portal-lxqt
 	xdg-utils
 	elogind
 	upower"
 short_desc="LXQt meta-package for Void Linux"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="BSD-2-Clause" # Suppress xlint warning: vlicense
-homepage="https://www.lxqt.org/"
+homepage="https://lxqt-project.org"

From 01853cacd185d0f63bdd7672e9f23bb666a8bf98 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 14:25:28 +0200
Subject: [PATCH 1569/2561] lxqt-build-tools: update to 0.11.0.

---
 srcpkgs/lxqt-build-tools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-build-tools/template b/srcpkgs/lxqt-build-tools/template
index 8b88c28e20c2..179cfee67e7f 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.10.0
+version=0.11.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config"
@@ -8,9 +8,9 @@ makedepends="qt5-devel"
 short_desc="LXQt build tools"
 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=facb86b0bf3bd4fd20306d3ae965a148ed59785eaf7d73169a82a97473d03bea
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-build-tools/archive/${version}.tar.gz"
+checksum=95da1309ae0111e3b97f775788465f82548a3de09b0e9d5e0a26e5fe715075b2
 
 post_install() {
 	vlicense BSD-3-Clause LICENSE

From 5040b48632299eae45d9be31d566786e1b988060 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 14:44:10 +0200
Subject: [PATCH 1570/2561] libqtxdg: update to 3.9.0.

---
 srcpkgs/libqtxdg/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template
index a9c665844f3c..b8bea143f360 100644
--- a/srcpkgs/libqtxdg/template
+++ b/srcpkgs/libqtxdg/template
@@ -1,6 +1,6 @@
 # Template file for 'libqtxdg'
 pkgname=libqtxdg
-version=3.8.0
+version=3.9.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools lxqt-build-tools"
@@ -8,9 +8,9 @@ makedepends="qt5-svg-devel"
 short_desc="Qt implementation of freedesktop.org XDG specifications"
 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=ce824fb2dda47758b44e57e8e4b63437a5bc5bd476cf37dbba61442990d7ccec
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/libqtxdg/archive/${version}.tar.gz"
+checksum=4dc7e3e65e6bcd50010647ef781ef5601b08ce024b0b1155e6a68316696c5a58
 
 libqtxdg-devel_package() {
 	short_desc+=" - development files"

From 60edc970d26e22e46fdf9b239cdd03a4e3ca83ee Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:05:52 +0200
Subject: [PATCH 1571/2561] liblxqt: update to 1.1.0.

---
 srcpkgs/liblxqt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/liblxqt/template b/srcpkgs/liblxqt/template
index c39a0398f965..5e5734ad61c5 100644
--- a/srcpkgs/liblxqt/template
+++ b/srcpkgs/liblxqt/template
@@ -1,6 +1,6 @@
 # Template file for 'liblxqt'
 pkgname=liblxqt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools
@@ -10,9 +10,9 @@ makedepends="kwindowsystem-devel libqtxdg-devel libXScrnSaver-devel
 short_desc="Core utility library for all LXQt components"
 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=d62820a94839637aedd6a0ceecc232f85d8ccd2173d4ec655cd92c9cbcbcc98c
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/liblxqt/archive/${version}.tar.gz"
+checksum=3b4672cef3906f82444da886557fe0504bf53066e7741c2215592119fbafbb42
 
 liblxqt-devel_package() {
 	short_desc+=" - development files"

From c14754d865de646969d0a40958deefbdf459d42b Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:26:14 +0200
Subject: [PATCH 1572/2561] lxqt-config: update to 1.1.0.

---
 srcpkgs/lxqt-config/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lxqt-config/template b/srcpkgs/lxqt-config/template
index c38f2486029f..8372521a2c32 100644
--- a/srcpkgs/lxqt-config/template
+++ b/srcpkgs/lxqt-config/template
@@ -1,14 +1,14 @@
 # Template file for 'lxqt-config'
 pkgname=lxqt-config
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
-hostmakedepends="pkgconf lxqt-build-tools qt5-qmake qt5-host-tools perl"
+hostmakedepends="pkg-config 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"
 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=64d7dd43e5ec1f98f0ba41e99f4438bb1f881fcbc2b2931f798cc82643c2d8a5
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-config/archive/${version}.tar.gz"
+checksum=debe3f51c30e37a8bca37bfdaa0187a68ddd57dad0ecefef169a32c2b042cc58

From 7ceb4c66f7f81282acdcc60910e20e5915e7a64d Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:36:44 +0200
Subject: [PATCH 1573/2561] lxqt-policykit: update to 1.1.0.

---
 srcpkgs/lxqt-policykit/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-policykit/template b/srcpkgs/lxqt-policykit/template
index ef972dba1961..ad81878cab8a 100644
--- a/srcpkgs/lxqt-policykit/template
+++ b/srcpkgs/lxqt-policykit/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-policykit'
 pkgname=lxqt-policykit
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools polkit-qt5-devel perl"
@@ -8,7 +8,7 @@ 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=8e3ae58196c55c28a5a231f44154a83d6697aa5f6b40dffdedb6b9ea776b4d35
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-policykit/archive/${version}.tar.gz"
+checksum=4866bb843657206b0bb55cc063474941a6d81db578fe3d5143d3760f438b033d
 replaces="lxqt-common>=0"

From 3942237ce49686951a76f706dc4feae289aa9c31 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:48:19 +0200
Subject: [PATCH 1574/2561] lxqt-session: update to 1.1.0.

---
 srcpkgs/lxqt-session/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lxqt-session/template b/srcpkgs/lxqt-session/template
index 3afe6da177f3..3b30d410cc33 100644
--- a/srcpkgs/lxqt-session/template
+++ b/srcpkgs/lxqt-session/template
@@ -1,16 +1,16 @@
 # Template file for 'lxqt-session'
 pkgname=lxqt-session
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools xdg-user-dirs
  perl"
-makedepends="liblxqt-devel xdg-user-dirs procps-ng-devel"
+makedepends="kwindowsystem-devel liblxqt-devel 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=3245457cb4a1e59ec62802308c872173baa300fa0f8e517fe14f45112733a6c1
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-session/archive/${version}.tar.gz"
+checksum=6ff41d1c95464fe7b00d3b5493f259323ecad61ae72865cf251ad5db9ae68e4e
 replaces="lxqt-common>=0"

From e45b2ead50ae34104f15abc65cc927d583011b9f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:54:04 +0200
Subject: [PATCH 1575/2561] lxqt-about: update to 1.1.0.

---
 srcpkgs/lxqt-about/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-about/template b/srcpkgs/lxqt-about/template
index 4103f1a6038e..447c2a945f8b 100644
--- a/srcpkgs/lxqt-about/template
+++ b/srcpkgs/lxqt-about/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-about'
 pkgname=lxqt-about
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,6 +8,6 @@ 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=1c14f68bf65099fbd46b062ffc6c92656620aa1a9eec5a0fd2d1b11888939203
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-about/archive/${version}.tar.gz"
+checksum=d8b5bb348c73e59e000151c5569b46496299155019a3cf9ce7e21a8f641d42b4

From 99f432f5aa87000937bddc84a2f0511a1acd7acc Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 17:21:23 +0200
Subject: [PATCH 1576/2561] lxqt-admin: update to 1.1.0.

---
 srcpkgs/lxqt-admin/patches/systemd.patch |  9 +++++++++
 srcpkgs/lxqt-admin/template              | 14 ++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/lxqt-admin/patches/systemd.patch

diff --git a/srcpkgs/lxqt-admin/patches/systemd.patch b/srcpkgs/lxqt-admin/patches/systemd.patch
new file mode 100644
index 000000000000..097c7669b1bf
--- /dev/null
+++ b/srcpkgs/lxqt-admin/patches/systemd.patch
@@ -0,0 +1,9 @@
+lxqt-admin-time depends on systemd-{timedated,timesyncd}
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,5 +38,4 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD
+     message(WARNING "${CMAKE_SYSTEM_NAME} is not supported by lxqt-admin-time")
+ else()
+     add_subdirectory(lxqt-admin-user)
+-    add_subdirectory(lxqt-admin-time)
+ endif()
diff --git a/srcpkgs/lxqt-admin/template b/srcpkgs/lxqt-admin/template
index 9bf02478a149..cba72e16fbce 100644
--- a/srcpkgs/lxqt-admin/template
+++ b/srcpkgs/lxqt-admin/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-admin'
 pkgname=lxqt-admin
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools polkit-qt5-devel
@@ -9,12 +9,6 @@ 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=f6eebb0da1563f14e9e4d39d3ff2622ee1c8ffa5b130ba26321cfe5261c1411e
-
-post_install() {
-	# depends on systemd-{timedated,timesyncd}
-	rm -f ${DESTDIR}/usr/bin/lxqt-admin-time
-	rm -f ${DESTDIR}/usr/share/applications/lxqt-admin-time.desktop
-}
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-admin/archive/${version}.tar.gz"
+checksum=cf6c41a63b861caacae5ace8bef4781f502cfb0f559fe56afbffe60d13a74775

From 41b9c71054293381b0112c61d6260ae69e1f5631 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 17:31:34 +0200
Subject: [PATCH 1577/2561] lxqt-archiver: update to 0.6.0.

---
 srcpkgs/lxqt-archiver/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-archiver/template b/srcpkgs/lxqt-archiver/template
index 5a5dd96932b2..076965fb01bb 100644
--- a/srcpkgs/lxqt-archiver/template
+++ b/srcpkgs/lxqt-archiver/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-archiver'
 pkgname=lxqt-archiver
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools pkg-config qt5-host-tools qt5-qmake perl"
@@ -8,6 +8,6 @@ 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=8ae5259ec00761b1f178e54b9e99bcf64685a6000a148501c4bbe862b4b08fc7
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/${pkgname}/archive/${version}.tar.gz"
+checksum=63029ed0c22dccaa30a7dd7866b6739e7746904cfa97deac836b40da6d56eb8c

From a7bd670fcd4fef54d1a65da628cbbf70c246be79 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 17:43:05 +0200
Subject: [PATCH 1578/2561] libfm-qt: update to 1.1.0.

---
 common/shlibs             | 2 +-
 srcpkgs/libfm-qt/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..11328b15a9cc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1990,7 +1990,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.10 libfm-qt-1.0.0_1
+libfm-qt.so.11 libfm-qt-1.1.0_1
 libqtermwidget5.so.1 qtermwidget-1.0.0_1
 libQt6Core.so.6 qt6-core-6.0.0_1
 libQt6OpenGL.so.6 qt6-gui-6.0.0_1
diff --git a/srcpkgs/libfm-qt/template b/srcpkgs/libfm-qt/template
index 9b2009242a83..bd7343fac83d 100644
--- a/srcpkgs/libfm-qt/template
+++ b/srcpkgs/libfm-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'libfm-qt'
 pkgname=libfm-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,9 +9,9 @@ makedepends="qt5-tools-devel qt5-x11extras-devel libexif-devel
 short_desc="Core library of PCManFM-Qt"
 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=743d9c8fc30d065d7fefc12e72f31085891733184f1320ba3ade890dae54993b
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/libfm-qt/archive/${version}.tar.gz"
+checksum=8ba16e0db696bb938f675b6d5394ec96726585e8b6130e6a2718a4ffde073d62
 replaces="libfm-qt5>=0"
 
 libfm-qt-devel_package() {

From 4e06ac1511e601501c20a581d1d2190cb3c25075 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:09:10 +0200
Subject: [PATCH 1579/2561] pcmanfm-qt: update to 1.1.0.

---
 srcpkgs/pcmanfm-qt/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/pcmanfm-qt/template b/srcpkgs/pcmanfm-qt/template
index fc09b2987170..5a5341a6c5f6 100644
--- a/srcpkgs/pcmanfm-qt/template
+++ b/srcpkgs/pcmanfm-qt/template
@@ -1,15 +1,15 @@
 # Template file for 'pcmanfm-qt'
 pkgname=pcmanfm-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel perl"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-qt-devel perl"
 makedepends="qt5-tools-devel qt5-x11extras-devel libfm-qt-devel"
 depends="qt5-translations"
-short_desc="LXQt pcmanfm Qt frontend"
+short_desc="Qt port of PCManFM"
 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=fa45cc0d3e870db3fb56f474e854aa1284576023082b770b3e4a44410f22cce3
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/pcmanfm-qt/archive/${version}.tar.gz"
+checksum=28b5ff1fb71d9259ae73962892ce04142a750794aa35c4840ed575da08972b9d
 replaces="lxqt-common>=0"

From 8a94987a0e2ada5b55a40411a94cf73aba85af92 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:16:28 +0200
Subject: [PATCH 1580/2561] lximage-qt: update to 1.1.0.

---
 srcpkgs/lximage-qt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lximage-qt/template b/srcpkgs/lximage-qt/template
index b64d2568b9d4..503990ab93db 100644
--- a/srcpkgs/lximage-qt/template
+++ b/srcpkgs/lximage-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'lximage-qt'
 pkgname=lximage-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,6 +9,6 @@ makedepends="qt5-x11extras-devel qt5-tools-devel qt5-svg-devel libfm-qt-devel
 short_desc="LXQt image viewer"
 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=04fdff9d0d20dbfeddca2ca8166f7dd14b691badb6ca65909ca8bce75c4a7225
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lximage-qt/archive/${version}.tar.gz"
+checksum=cd1eb058af1c927fac9ac4d2d31435cf46572b2f017cbb0d0b099ad6106c8b91

From 3cea76ba6855701d80d08cca83da05d9f2451fee Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:23:45 +0200
Subject: [PATCH 1581/2561] lxqt-globalkeys: update to 1.1.0.

---
 srcpkgs/lxqt-globalkeys/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-globalkeys/template b/srcpkgs/lxqt-globalkeys/template
index 97537e06f8ae..dcffc9ba5257 100644
--- a/srcpkgs/lxqt-globalkeys/template
+++ b/srcpkgs/lxqt-globalkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-globalkeys'
 pkgname=lxqt-globalkeys
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,9 +8,9 @@ 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=b81944cc8d8f20f1eeedb3cd54d4e6ad86a1697d71b4212cf60110af43559a45
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-globalkeys/archive/${version}.tar.gz"
+checksum=ce0cbdbfbddef4ea9b2018b61fb6fc03caeea57fc31bc6f4bb54a04619edb2aa
 replaces="lxqt-common>=0"
 
 lxqt-globalkeys-devel_package() {

From 6c0b50e7f1fcc6c87a2148e18f69dc8944420d45 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:30:32 +0200
Subject: [PATCH 1582/2561] lxqt-notificationd: update to 1.1.0.

---
 srcpkgs/lxqt-notificationd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-notificationd/template b/srcpkgs/lxqt-notificationd/template
index 0158f56a3364..57cd26eed5a8 100644
--- a/srcpkgs/lxqt-notificationd/template
+++ b/srcpkgs/lxqt-notificationd/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-notificationd'
 pkgname=lxqt-notificationd
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,7 +8,7 @@ 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=94c10fd904995d3eea3b587dd521ed01b839d863ff80205af0af8cab6cb2a660
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-notificationd/archive/${version}.tar.gz"
+checksum=6b29f0163541ba734bcb8d21f0f3579bc36c868fa8afee44d8b7e56ea8ca23ee
 replaces="lxqt-common>=0"

From ea535e2ae357ea0e8d8f7af245fed650a84a9b07 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:31:58 +0200
Subject: [PATCH 1583/2561] lxqt-openssh-askpass: update to 1.1.0.

---
 srcpkgs/lxqt-openssh-askpass/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-openssh-askpass/template b/srcpkgs/lxqt-openssh-askpass/template
index 57fe03004c15..566f1741e329 100644
--- a/srcpkgs/lxqt-openssh-askpass/template
+++ b/srcpkgs/lxqt-openssh-askpass/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-openssh-askpass'
 pkgname=lxqt-openssh-askpass
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,7 +9,7 @@ depends="openssh"
 short_desc="LXQt ssh-agent helper"
 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=9de22a06646cfa50b0ddeef26ac87b510f820501ff8832dc80c7d88a55d878b5
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-openssh-askpass/archive/${version}.tar.gz"
+checksum=77578faf1aaf3e273cd8f92b84ad9570d7aacc88b44663c3373517e790c606b6
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/lxqt-openssh-askpass"

From fca95f2aba4c91afeb4640bb9375b95444e03ce9 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:42:14 +0200
Subject: [PATCH 1584/2561] lxqt-panel: update to 1.1.0.

---
 srcpkgs/lxqt-panel/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lxqt-panel/template b/srcpkgs/lxqt-panel/template
index f486e3e3a258..f5524550a6ed 100644
--- a/srcpkgs/lxqt-panel/template
+++ b/srcpkgs/lxqt-panel/template
@@ -1,16 +1,17 @@
 # Template file for 'lxqt-panel'
 pkgname=lxqt-panel
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 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
- libqtxdg-devel libXdamage-devel"
+ libsensors-devel libsysstat-devel libdbusmenu-qt5-devel
+ libqtxdg-devel libxcb-devel libXtst-devel xcb-util-image-devel"
+depends="lxmenu-data"
 short_desc="LXQt desktop panel"
 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=ea63939c557fa639d2ab3fae48341c1a59ae8baae1a79d11f15e4bc0e38468d5
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-panel/archive/${version}.tar.gz"
+checksum=f80ccdeb59933d32aab1a425301b9b68458bf0c55567befe1c03263afad20d6d

From 172cb7a27aa9064e9e513e3b40eff3ad17558539 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:47:30 +0200
Subject: [PATCH 1585/2561] lxqt-powermanagement: update to 1.1.0.

---
 srcpkgs/lxqt-powermanagement/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-powermanagement/template b/srcpkgs/lxqt-powermanagement/template
index f7c8b8d85e8f..b083469ecbbd 100644
--- a/srcpkgs/lxqt-powermanagement/template
+++ b/srcpkgs/lxqt-powermanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-powermanagement'
 pkgname=lxqt-powermanagement
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,6 +8,6 @@ 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=c0a444faeed60337c966bfd562e65e936f132f578762c2f01f136038a3f058ee
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-powermanagement/archive/${version}.tar.gz"
+checksum=df59e7b93392863874250a49769dcd7ed395f98548428f9ef6a5b1e728d32e86

From 43d774d163a1cd34bd4a50e81945b10292ed6782 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:53:50 +0200
Subject: [PATCH 1586/2561] lxqt-qtplugin: update to 1.1.0.

---
 srcpkgs/lxqt-qtplugin/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lxqt-qtplugin/template b/srcpkgs/lxqt-qtplugin/template
index 8148c7119f10..eaddfdf3d70b 100644
--- a/srcpkgs/lxqt-qtplugin/template
+++ b/srcpkgs/lxqt-qtplugin/template
@@ -1,13 +1,13 @@
 # Template file for 'lxqt-qtplugin'
 pkgname=lxqt-qtplugin
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel"
-makedepends="liblxqt-devel libdbusmenu-qt5-devel libfm-qt-devel"
+makedepends="liblxqt-devel libdbusmenu-qt5-devel libfm-qt-devel libqtxdg-devel"
 short_desc="LXQt Qt theme plugin"
 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=8e789430e1f3b6a354f61d496440a59b797f699320bb8c001d8ef7ac8e1db05e
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-qtplugin/archive/${version}.tar.gz"
+checksum=20eda3ac9319e793c4b1236413f119058771d34915483bed4a048591a59ae990

From 814912c42403fe35e9098e38f822f151b340d44a Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:00:22 +0200
Subject: [PATCH 1587/2561] lxqt-runner: update to 1.1.0.

---
 srcpkgs/lxqt-runner/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-runner/template b/srcpkgs/lxqt-runner/template
index e85e2f5a7602..e96c3b6950f5 100644
--- a/srcpkgs/lxqt-runner/template
+++ b/srcpkgs/lxqt-runner/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-runner'
 pkgname=lxqt-runner
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,6 +8,6 @@ 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=24daa86680ef78daf8753b60b3a0c6df391e760b851796a0abeddeed61ae13b9
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-runner/archive/${version}.tar.gz"
+checksum=7c253d338019cb162cddcb606429faa016ac148a16bf720e87e28f756698b731

From 7dcb133944534c6cabe98902376ab2b0794d2329 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:04:18 +0200
Subject: [PATCH 1588/2561] lxqt-sudo: update to 1.1.0.

---
 srcpkgs/lxqt-sudo/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-sudo/template b/srcpkgs/lxqt-sudo/template
index 88b8389b1968..5ffd63acec36 100644
--- a/srcpkgs/lxqt-sudo/template
+++ b/srcpkgs/lxqt-sudo/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-sudo'
 pkgname=lxqt-sudo
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,6 +9,6 @@ depends="sudo"
 short_desc="LXQt GUI frontend for sudo"
 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=6072f6914942fff5884388be9c7c5d38d259fed14358c4c2a9103d0cdd0a43f0
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-sudo/archive/${version}.tar.gz"
+checksum=c31332d056355ff888175ba10556639f436b314579349ca90e555da849ebe22b

From 1c85f55e17409fb896388b59a05bfe055fa302c1 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:07:53 +0200
Subject: [PATCH 1589/2561] lxqt-themes: update to 1.1.0.

---
 srcpkgs/lxqt-themes/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-themes/template b/srcpkgs/lxqt-themes/template
index 01038f959c5d..a3c9b9c6a671 100644
--- a/srcpkgs/lxqt-themes/template
+++ b/srcpkgs/lxqt-themes/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-themes'
 pkgname=lxqt-themes
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools perl"
@@ -8,7 +8,7 @@ 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=e3a6c96311bbf471ce0af72953b2f34ecf15461ab5e57a6f5b924de41758562b
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-themes/archive/${version}.tar.gz"
+checksum=aeb24c1570ae350e4c4ecdea9fb1b67208f641966476bbafd1817a816f665efe
 replaces="lxqt-common>=0"

From 272fad7fe0feda36a7e4043c63763f19aef8c4d8 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:17:29 +0200
Subject: [PATCH 1590/2561] qtermwidget: update to 1.1.0.

---
 srcpkgs/qtermwidget/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qtermwidget/template b/srcpkgs/qtermwidget/template
index 938f79879735..273705963a64 100644
--- a/srcpkgs/qtermwidget/template
+++ b/srcpkgs/qtermwidget/template
@@ -1,6 +1,6 @@
 # Template file for 'qtermwidget'
 pkgname=qtermwidget
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
@@ -8,9 +8,9 @@ makedepends="qt5-tools-devel"
 short_desc="Terminal widget for QTerminal"
 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=2af0e9f212932cb36bbbf20722eaf4a1d3acf640dfed9b763ca7d388af8b7fd2
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/qtermwidget/archive/${version}.tar.gz"
+checksum=b062e5169bee35c3a8c1d0f67b78b43d63f1041d11e3a5a717f6a54a016bd734
 
 qtermwidget-devel_package() {
 	short_desc+=" - development files"

From 6409605fb236592b7f7e83cf2d25c4a31b96099a Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:30:33 +0200
Subject: [PATCH 1591/2561] qterminal: update to 1.1.0.

---
 srcpkgs/qterminal/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qterminal/template b/srcpkgs/qterminal/template
index 079c89b00a15..7469a365b367 100644
--- a/srcpkgs/qterminal/template
+++ b/srcpkgs/qterminal/template
@@ -1,14 +1,13 @@
 # Template file for 'qterminal'
 pkgname=qterminal
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 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"
 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=f169a5279ae5afe386ec3016385c7692b551fea1bae639a8ae438ec90165a643
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/qterminal/archive/${version}.tar.gz"
+checksum=5a72a6f3deb5326618183ddae59989316aa78c86163220f26895df677cbc4479

From 09e0bef6e2652f2287fd85f573d876ab6f06aeae Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 20:08:13 +0200
Subject: [PATCH 1592/2561] pavucontrol-qt: update to 1.1.0.

---
 srcpkgs/pavucontrol-qt/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pavucontrol-qt/template b/srcpkgs/pavucontrol-qt/template
index 2faef3430dc0..0be80a6c17c8 100644
--- a/srcpkgs/pavucontrol-qt/template
+++ b/srcpkgs/pavucontrol-qt/template
@@ -1,13 +1,13 @@
 # Template file for 'pavucontrol-qt'
 pkgname=pavucontrol-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 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>"
+maintainer="Enrico Belleri <idesmi@protonmail.com>"
 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=2407aa55a2d3dc0fdc7074b461c02b97fd455514fbbf9f5b711e68fadd45ac69
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/pavucontrol-qt/archive/${version}.tar.gz"
+checksum=8e4017c584c357fbff75d849e3210fa446edc6e53655b6920221891b8e3dc403

From 2636207f945bc69aff617dfb1c5cd28945ea6ab8 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 20:13:58 +0200
Subject: [PATCH 1593/2561] qps: update to 2.5.0.

---
 srcpkgs/qps/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qps/template b/srcpkgs/qps/template
index 4934c280c4db..264e1eeda9da 100644
--- a/srcpkgs/qps/template
+++ b/srcpkgs/qps/template
@@ -1,6 +1,6 @@
 # Template file for 'qps'
 pkgname=qps
-version=2.4.0
+version=2.5.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools perl qt5-qmake qt5-host-tools"
@@ -8,6 +8,6 @@ makedepends="liblxqt-devel"
 short_desc="Qt process manager"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/lxqt/qps"
-distfiles="https://github.com/lxqt/qps/releases/download/${version}/qps-${version}.tar.xz"
-checksum=c2a6c1d5e40e96997cca834f88ca1104aa179bef576a1a8b355b987eaaac69cd
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/qps/archive/${version}.tar.gz"
+checksum=c5f3a27b731eccfae59734c4a3048f9d8632827444e35b773c1a112702666b6a

From f6d24a08133b8c4864e14c427bcd75f296edd699 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 20:40:11 +0200
Subject: [PATCH 1594/2561] New package: xdg-desktop-portal-lxqt-0.2.0

---
 srcpkgs/xdg-desktop-portal-lxqt/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-lxqt/template

diff --git a/srcpkgs/xdg-desktop-portal-lxqt/template b/srcpkgs/xdg-desktop-portal-lxqt/template
new file mode 100644
index 000000000000..297e1769a1f5
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-lxqt/template
@@ -0,0 +1,14 @@
+# Template file for 'xdg-desktop-portal-lxqt'
+pkgname=xdg-desktop-portal-lxqt
+version=0.2.0
+revision=1
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="kwindowsystem-devel libfm-qt-devel"
+short_desc="Backend implementation for xdg-desktop-portal using Qt/KF5/libfm-qt"
+maintainer="Enrico Belleri <idesmi@protonmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/lxqt/xdg-desktop-portal-lxqt"
+changelog="https://github.com/lxqt/xdg-desktop-portal-lxqt/raw/master/CHANGELOG"
+distfiles="https://github.com/lxqt/xdg-desktop-portal-lxqt/archive/${version}.tar.gz"
+checksum=9d7ac6fd6980293cb184518642dcc57d842b67105b3d236f893189bd30911ad7

From 7e94f037e9b6d6e133c6cbc8db39b8c7b33bdf17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 29 Mar 2022 21:41:02 +0200
Subject: [PATCH 1595/2561] qtcreator: update to 7.0.0.

---
 .../qtcreator/patches/QTCREATORBUG-26910.diff | 39 -------------------
 srcpkgs/qtcreator/template                    | 31 +++++++--------
 2 files changed, 15 insertions(+), 55 deletions(-)
 delete mode 100644 srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff

diff --git a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff b/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
deleted file mode 100644
index 8c07c72ccf10..000000000000
--- a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001
-From: Marco Bubke <marco.bubke@qt.io>
-Date: Mon, 24 Jan 2022 14:38:29 +0100
-Subject: [PATCH] QmlDesigner: Fix 32 bit
-
-Because std::ptrdiff_t and int are the same under 32 bit the constructor
-is changed to a template. The class is private so it is very unlikely
-that it leads to errors.
-
-Task-number: QTCREATORBUG-26910
-Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd
-Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
-Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
----
-
-diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-index 747c3d9..27d2905 100644
---- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-+++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-@@ -67,15 +67,8 @@
- 
-         StorageCacheIndex(const char *) = delete;
- 
--        constexpr explicit StorageCacheIndex(int id) noexcept
--            : id{id}
--        {}
--
--        constexpr explicit StorageCacheIndex(std::size_t id) noexcept
--            : id{static_cast<int>(id)}
--        {}
--
--        constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
-+        template<typename IntegerType>
-+        constexpr explicit StorageCacheIndex(IntegerType id) noexcept
-             : id{static_cast<int>(id)}
-         {}
- 
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 988491ec6496..912c6c00c4c5 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,14 +1,16 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=6.0.2
+version=7.0.0
 revision=1
 wrksrc="qt-creator-opensource-src-${version}"
-build_style=qmake
-make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
+build_style=cmake
+configure_args="$(vopt_bool qbs BUILD_QBS)"
 hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
- qt5-host-tools"
+ qt5-host-tools qt5-tools"
 makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
- qt5-quickcontrols qt5-svg-devel clang llvm"
+ qt5-quickcontrols qt5-svg-devel qt5-plugin-odbc qt5-plugin-sqlite
+ qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
+ clang llvm clang-tools-extra"
 depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
 short_desc="Cross-platform IDE for Qt developers"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -16,24 +18,21 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa
+checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9
 replaces="qtcreator-data>=0"
 python_version=3
 
+build_options="qbs"
+desc_option_qbs="Build vendored Qbs"
+
+if [ -z "$XBPS_CROSS_BUILD" ]; then
+	build_options_default="qbs"
+fi
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
-pre_configure() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vsed -i src/plugins/qmldesigner/qmldesignerplugin.pro \
-			src/plugins/clangformat/clangformat.pro \
-			-e "/LIBS += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
-		vsed -i src/plugins/debugger/debugger.pro \
-			-e "/RESOURCES += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
-	fi
-}
-
 post_install() {
 	# Install the license with the annotation for
 	# the Qt Company GPL Exception 1.0

From 9545e8dec5112238ecd29e1b1c89682de0662039 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 20 Apr 2022 20:15:38 +0200
Subject: [PATCH 1596/2561] grim: update to 1.4.0.

---
 srcpkgs/grim/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template
index 89af643b6a7f..f42ed188f1f4 100644
--- a/srcpkgs/grim/template
+++ b/srcpkgs/grim/template
@@ -1,18 +1,22 @@
 # Template file for 'grim'
 pkgname=grim
-version=1.3.2
+version=1.4.0
 revision=1
+wrksrc="grim-v${version}"
 build_style=meson
 configure_args="-Djpeg=enabled -Dwerror=false"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wayland-devel wayland-protocols cairo-devel libjpeg-turbo-devel"
+makedepends="wayland-devel wayland-protocols pixman-devel libjpeg-turbo-devel
+ libpng-devel"
 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/grim/archive/v${version}.tar.gz"
-checksum=42c2952e98389506156c08e40e0c37afdc2ec5ef4d55a5a4febde6acdac4d1c8
+distfiles="https://git.sr.ht/~emersion/grim/archive/v${version}.tar.gz"
+checksum=66729ae654546404f50ed163055310dd23ed52cc5a881d39752c0cd076e3d7aa
 
 post_install() {
 	vlicense LICENSE
+	vcompletion contrib/completions/bash/grim.bash bash
+	vcompletion contrib/completions/fish/grim.fish fish
 }

From e657fd5c3b0ebe019eb79f60c891556e08e30040 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 21 Apr 2022 17:43:24 -0500
Subject: [PATCH 1597/2561] Signal-Desktop: update to 5.40.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index c02e6864b8a1..8bcfe617ab40 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.39.0
+version=5.40.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=0e5f237bd2db6f9e32d58d28c99727bdd069cffb6abf9c68b62c30c8a6ca83d9
+checksum=57bb0ebbf4b3fb9d6dfbaa84166ecf668ce0df8a0afa0f69907680804dd064c4
 nostrip_files="signal-desktop"
 
 post_extract() {

From 53df20b3fc6f2815d69ffcf44a7aab31e4bacf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 20 Apr 2022 12:41:47 +0200
Subject: [PATCH 1598/2561] New package: dasel-1.24.1

---
 srcpkgs/dasel/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/dasel/template

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
new file mode 100644
index 000000000000..6d913b08ba62
--- /dev/null
+++ b/srcpkgs/dasel/template
@@ -0,0 +1,19 @@
+# Template file for 'dasel'
+pkgname=dasel
+version=1.24.1
+revision=1
+build_style=go
+go_import_path=github.com/tomwright/dasel
+go_package="${go_import_path}/cmd/dasel"
+go_ldflags="-X ${go_import_path}/internal.Version=${version}"
+short_desc="Query and modify data structures using selector strings"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="MIT"
+homepage="https://daseldocs.tomwright.me/"
+changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md"
+distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz"
+checksum=ca1fa030f41abcd3659e76d7413ce14c551f40d41769e7a000a46f4fea6d0b64
+
+post_install() {
+	vlicense LICENSE
+}

From 5084d6a26efd71c7f6362da860c5049ef2ff1f06 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 11 Apr 2022 09:26:30 +0200
Subject: [PATCH 1599/2561] python3-tweepy: update to 4.8.0.

---
 srcpkgs/python3-tweepy/template | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-tweepy/template b/srcpkgs/python3-tweepy/template
index d71fa028f64f..fc13e91d8d57 100644
--- a/srcpkgs/python3-tweepy/template
+++ b/srcpkgs/python3-tweepy/template
@@ -1,21 +1,18 @@
 # Template file for 'python3-tweepy'
 pkgname=python3-tweepy
-version=3.9.0
-revision=2
+version=4.8.0
+revision=1
 wrksrc="tweepy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-requests-oauthlib python3-six python3-pysocks"
+depends="python3-requests-oauthlib python3-pysocks"
 short_desc="Twitter library for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tweepy/tweepy"
 distfiles="https://github.com/tweepy/tweepy/archive/v${version}.tar.gz"
-checksum=2b7ec06cc5d143396423a5eae16b198e69b93df2bc6044f1365270c805e940b7
-
-do_check() {
-	: # requires packages not provided by Void
-}
+checksum=6ca49718d9cd0e73080f780062e050dd8ca777201365fb50b935d727f7c1fc18
+make_check=no # requires packages not provided by Void
 
 post_install() {
 	vlicense LICENSE

From 918c842c552efb79bf1f147397553bc2444ed9a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 10 Apr 2022 22:31:50 +0200
Subject: [PATCH 1600/2561] gdu: update to 5.13.2.

---
 srcpkgs/gdu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 9c47a649b805..9ef80a2f5a7d 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,6 +1,6 @@
 # Template file for 'gdu'
 pkgname=gdu
-version=5.12.1
+version=5.13.2
 revision=1
 build_style=go
 go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
@@ -9,7 +9,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/dundee/gdu"
 distfiles="https://github.com/dundee/gdu/archive/v${version}.tar.gz"
-checksum=81471d80aedcf20c84bcee67814d34ab2cf43477b831ffa320b7721d481c64ab
+checksum=f4f237f6da470599f6393591282cfd67922a963325859a939ca40ba7e18024a8
 
 post_install() {
 	vman gdu.1

From 4e5db53dc43ae226d0158cadb44e65f9623a7a1b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 22 Apr 2022 16:41:56 +0200
Subject: [PATCH 1601/2561] zchunk: update to 1.2.2.

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index e8679bcbabc4..c4812272d3ca 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,6 +1,6 @@
 # Template file for 'zchunk'
 pkgname=zchunk
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -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=9639942cf36f4f36d3b635d36d5164682249cc0240015569ac948db1584499b5
+checksum=bc36f13b1bcb2ab52d046bfc3ec04a9bd1f89b070b4e8fca52eded235a583526
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"

From b369712dc922afe013253e425d04a938c0416491 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Apr 2022 17:01:48 +0200
Subject: [PATCH 1602/2561] virt-what: update to 1.22.

---
 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 6403a915bec3..e6562de073cc 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.21
+version=1.22
 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=12cb455334aa4cfd53ab78f27e2252e94d1f676dd093f48327ed94d8080d1f7b
+checksum=e175df6109e537da1e18006f03d74a2e6dab76b5caf410dedafef188f1ee4561

From 25f311af3a24f6f251d9f6f63220a84472b7b732 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Apr 2022 17:20:41 +0200
Subject: [PATCH 1603/2561] bmake: update to 20220418.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 58cf70979203..babb5d6d3938 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20220414
+version=20220418
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=10ee07a7be26b22ce6a3bbc386e2916ca8e51b0ed2d256c271a7135e3c94f2a7
+checksum=6ea7de515cba74f173dc14ee17b1488ae032582028d2e86ea12f70369cc896f5
 python_version=3
 
 do_configure() {

From 279ed3feb55aeb34001e46235d0aab4631dc5598 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Apr 2022 18:19:58 +0200
Subject: [PATCH 1604/2561] rsync: update to 3.2.4.

---
 srcpkgs/rsync/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 928aa4824a2a..2f79c20f8f6b 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,7 +1,7 @@
 # Template file for 'rsync'
 pkgname=rsync
-version=3.2.3
-revision=3
+version=3.2.4
+revision=1
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
@@ -13,7 +13,7 @@ license="GPL-3.0-only"
 homepage="https://rsync.samba.org/"
 changelog="https://download.samba.org/pub/rsync/NEWS"
 distfiles="https://www.samba.org/ftp/rsync/src/rsync-$version.tar.gz"
-checksum=becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e
+checksum=6f761838d08052b0b6579cf7f6737d93e47f01f4da04c5d24d3447b7f2a5fad1
 
 # Force enable IPv6 on musl - upstream bug https://bugzilla.samba.org/show_bug.cgi?id=10715
 CFLAGS="-DINET6"

From 6a7167a2202604e9c5105fe805cc1cf7e51dd238 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Apr 2022 18:55:18 -0400
Subject: [PATCH 1605/2561] sof-firmware: update to 2.1.1.

---
 srcpkgs/sof-firmware/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 5e6399eca917..5436fb1db1ef 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
-version=1.9.2
+version=2.1.1
 revision=1
 archs="i686* x86_64*"
 wrksrc="sof-bin-${version}"
@@ -11,7 +11,7 @@ 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/refs/tags/v${version}.tar.gz"
-checksum=8eac925c129d195072237dcd28f4bbe80cf63eb00fd8b23bdc0719cd1ee9b395
+checksum=97c51c03bfb0a8cfc0a33d795e051e8f0608a3bfb3e07cd84de6fd7e9511f208
 
 do_install() {
 	vmkdir usr/lib/firmware/intel/sof

From c43cc06146d0d12829b11777311618014a9da18e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Apr 2022 20:35:39 -0400
Subject: [PATCH 1606/2561] pango: update to 1.50.7.

---
 srcpkgs/pango/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 4d410dbc72b0..5d49a2f7ed58 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,6 +1,6 @@
 # Template file for 'pango'
 pkgname=pango
-version=1.50.6
+version=1.50.7
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://www.pango.org/"
 changelog="https://gitlab.gnome.org/GNOME/pango/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a
+checksum=0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33
 make_check=no  # doesn't pass its own tests
 
 # Package build options

From 13765e0f8eab6e0aa891d44a861c3fc2557a428f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:33 +0200
Subject: [PATCH 1607/2561] filelight: update to 22.04.0.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index cdf212f14ef7..30e825e0eee5 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=28fc076caf94217f732b7228e0c77dc40b5d490bcbb3df7866c2e772130578f0
+checksum=434fa7439732905c4655cc376d2c89e86a5fcc5371ee6fda16400917a8e4e587

From fce29cc49f178826b619d42514aa685513ffefd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:34 +0200
Subject: [PATCH 1608/2561] kaccounts-integration: update to 22.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 846027947d2f..7a8b45b2da07 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=eb428cd94bf33910546527bad8a56ddaafd2a7fa894c9fcdba6da364e969048f
+checksum=3e5197c1c7ddce92dd5bdcdcc05492f3c63c468e3c1e743c6e747114d34d08b8
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From c9325bb7b0abe21db54ae98ada6485bb57da2529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:35 +0200
Subject: [PATCH 1609/2561] kaccounts-providers: update to 22.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 00cd5f36950d..09f7d22603b9 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=a09eed6a35e5f1909e4f8cdb9016ed0cd1fb33c34f5545f4c1e2a005d4dd9e4d
+checksum=297a55bcfa26379e9501b70f17da238a4ae23fd908b3afaa0052853a1cca0e34
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From c9bf6eedfac897c01755a3abdb15ce09982933bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:36 +0200
Subject: [PATCH 1610/2561] kcachegrind: update to 22.04.0.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 5b96b2e4e879..d46aefe7cb9b 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -13,5 +13,5 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=ddcf3722211d47c90616528607ebc4573835faa52a57e2e9d6763968b9975ab3
+checksum=aed09ea5dc01ace24c76ed69edef5111c47f53992ba45896365b53cd3fc8890d
 python_version=2

From 9d33f533359f8c4e8f278ebe3c9c939f69b4c8e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:37 +0200
Subject: [PATCH 1611/2561] kcron: update to 22.04.0.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index af6f042ab5e6..636aad34dab9 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=f556c6afbdf4a060dd52db64d36ebc13fcf7dcdaa6a7013b697e866b6338cc39
+checksum=d8ace47c86633ba677b64c765efe0b6f3de27cb75c17ae2434c498b07f3c0648

From aae5113feff04485e3be71633c4597538ae6bb79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:38 +0200
Subject: [PATCH 1612/2561] kdialog: update to 22.04.0.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index b1975e4203e7..64efbaad5e8b 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=a370f03edd88913d7cecf2bc9b61e2bd1466418fa1534a8f415a0057186ea111
+checksum=ac47479b576b87e8a82d62f4b685941b6ab54a44a06391c4c0762db159930589

From 70bd1a0c2408d932c15d30003cd80e69d3d01531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:39 +0200
Subject: [PATCH 1613/2561] keditbookmarks: update to 22.04.0.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index a67fbd7881c3..5291ab00f990 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=d356285aaeb12cdadf70c456a43d4e31f94a5f15c9dc01bae0ae4148833ccb71
+checksum=d6daabf60acec49cac1401da1019f965a96e8fd41b967694b2c8fd6723b87327

From 11da1781158931fc296e99d462d9430e3cb933a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:40 +0200
Subject: [PATCH 1614/2561] kfind: update to 22.04.0.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 766f1d9fee4f..06de53b604a9 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=a0ff3b4a44b938f7f336d4c2fbc302d8a55612b089ee954b2d98ec5f97ee3eec
+checksum=5133cad0be64fb3fc3f9666b01b4cff8141016f31c244ed39a3e21fc298b6935

From 72a0eb2d6cebbcbdb6054fc25a0a0b944b776a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:41 +0200
Subject: [PATCH 1615/2561] kig: update to 22.04.0.

---
 srcpkgs/kig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 33b5ad292bad..3f291745d311 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kig"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=b6a9ec8981c6983df2295ad0a8a53732928a8bb40c6c92305030392d5bf88066
+checksum=6dd9e280e3f0bca4c900f9fd8ef2e138eb8f1b021adf4ffe4e29804adddc7965

From f9f44182fc0a3f119c25a1225b95d71c85d95124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:42 +0200
Subject: [PATCH 1616/2561] kio-gdrive: update to 22.04.0.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 5bf3a6225a95..d1e301180476 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=07c1c20ed3ec8b96691d85a408997a94a76e0a61a50b056df3e21f6cde61a32e
+checksum=9f910baa87f707d1f28c9da5d3f1b104b992f7c7b3ca2ca532cb3646d92c84ec

From 54a4c11240aaee3eead289509aac7c299ccd4765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:42 +0200
Subject: [PATCH 1617/2561] kmag: update to 22.04.0.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 8dffb97af131..a68adf873813 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=548f9b4c13eda644c0fb182eb78f6326c57f6cb7dc8a185fcb09dd585f31fd18
+checksum=e65aaaa3e480c215384bae721afb36d7e50a7f8ab27aa4013eb46de1f43d97af

From d5b19636a73808e0d93bdd04b31727133d48eec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:44 +0200
Subject: [PATCH 1618/2561] kmix: update to 22.04.0.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 902b798dc250..e4bf7c548be8 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=13c1336f9e8e7a64f3e89a0558b9f16547a33e37f917bd491dfb061d25ed62fe
+checksum=3f41a53cb7033fde10ae92b693a6b84c0da045e570e83136dbc659afa89e5e7a

From 9acf29631779cbeeb02ab66440bc8e58327774b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:45 +0200
Subject: [PATCH 1619/2561] kolourpaint: update to 22.04.0.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index bf7598673a41..5a81652e6b04 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d2199ded688d768d8066a262d7a6b706b72a880fab9a394ffe64ae31be447f4d
+checksum=aeb2e439f32d9b1d7556e807c0902c870b90691f84764266e3f7fd92af5d9163
 
 post_install() {
 	vlicense COPYING

From 83a002c168d3c0bd0e8b398575060681336f03df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:45 +0200
Subject: [PATCH 1620/2561] kompare: update to 22.04.0.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 4219b5b650ad..457830d20119 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=9008fb78e238dc34233b5eb063bc0b54553dfa70b22d4164b39adef82b57ea24
+checksum=e2e0ee484b2eb098d9315ea26a0b68abce64ae02572baab998a5711f609c018d

From 222bd999e336d97c0e9a16a5687316693537d5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:46 +0200
Subject: [PATCH 1621/2561] konversation: update to 22.04.0.

---
 srcpkgs/konversation/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 877672e7ec18..5358aed5c724 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,17 +1,17 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel qca-qt5-devel qt5-multimedia-devel"
 short_desc="User friendly IRC client for KDE"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=00e16ff398e4ff19c8485f5d5078faea018c7b11c25d535d5949fca6eefcbd15
+checksum=f89c3854edd6dabcceff7a3615b532ac34d5b4769be1e125789e41d67e7f9b8a
 python_version=3

From 78a127deaf10c3006e0a8e6cd5a5988c5106d5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:47 +0200
Subject: [PATCH 1622/2561] kpat: update to 22.04.0.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 71cda890586b..e3d3d8d5ad3b 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -14,4 +14,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=68353dba09757a2696fce36f802a5bca3b7a5492de4d690d15ad04074f21a9c9
+checksum=275e2e4508980dbc53bd598c7abd05a21dd5c50b255e750436639cc75f67a44d

From ba43f502020ea8c7164ba3a6d13fb36398621a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:48 +0200
Subject: [PATCH 1623/2561] kruler: update to 22.04.0.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 74bc40f901b4..8c70ce207278 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=f95725a73d3bbb4fd59dfeadf6c070ed3d64e36995168300d2a0cb03921aab4a
+checksum=f4f189b606813fb2f42e40f7664adafafdcd210e474909b9e93ff30eba18cd45

From aca58bac51ba4bd6b5e9dac03e0f04ecd994727f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:49 +0200
Subject: [PATCH 1624/2561] ksystemlog: update to 22.04.0.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 72a178b4d0db..53c40ccabd7c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=a90af7b6116301eea4bd74a61e5e4e2a854c7ab91a103d54d7fcd30e7a066d4a
+checksum=25525e28756928ddb014ccec6f352c7378473ad417971608989818484b2847a4

From e704053cf2bc208f4210c9f0a2b5abb9630e8f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:50 +0200
Subject: [PATCH 1625/2561] kteatime: update to 22.04.0.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 5b5a6c75b194..dc8dbc935798 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=a4c0994170a877b14b8b66e68021a6ef03e5e427380c135caf99218f54d07744
+checksum=f3098313f7df6de082490c11ae6f840d3f73d2c3be22fb56d4bb0c15baf81df6

From 70356e37c285fc126aaaea4d3121b843b01bf031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:51 +0200
Subject: [PATCH 1626/2561] kturtle: update to 22.04.0.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index d9f82442461b..f3be87556605 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=43bc3de793f0971b75bf11a96e5af7961ccbc29a2a57417325953731f9d40999
+checksum=fd42b1380e7e46d6c1e5bc4cbe538edcf9ed9bfc5abf54141393adc28fe38427

From 87b7c89e7ef584bf3b8a64cf0e9df260e593fb4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:52 +0200
Subject: [PATCH 1627/2561] kwalletmanager: update to 22.04.0.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 18dce3c40633..902061e38dca 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=271db1bd744e9d9b183663b8a0239590f81f9997ff67cab51833861f0971b107
+checksum=d33824ae0abc7972fed9d7dad6acea9f67e7274ee5b15c0bb1df72b1a24aec17

From c7ce0a0f6f4477325750eb077c667496324b24f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:53 +0200
Subject: [PATCH 1628/2561] libkcddb: update to 22.04.0.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 555cba64b240..fbcc0153671e 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,7 +12,7 @@ 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"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=62709f9ccd8463208b905a3b935be1ba80102c451728e9f5c77e83eaf4afc191
+checksum=ddc91cc5112c5a749fccf18bb9a6b169279f6d5658fed3b4d60646d9ccbb0775
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From 65629881c8fe11ae1964f4e921d40a221c2f0c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:54 +0200
Subject: [PATCH 1629/2561] libkdegames: update to 22.04.0.

---
 srcpkgs/libkdegames/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index bb7f34a7fb8e..7aafa5cf73fd 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=4b2f3fb2af0866f7aba1ae679b505faeb7577b0ab50bd619ecb642c48ae0b574
+checksum=4dd8d80dbfd2806d420bb6efc2df64a175e8273d9ea34b9c61a0a7daae342e76
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f248a902f5f3eb4b9b09bf1dc93800d6cb648817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:55 +0200
Subject: [PATCH 1630/2561] libkomparediff2: update to 22.04.0.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 7c7f2de89c1e..5f3b036be599 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=a2815b6c9fc08172b4e39b27c25764baa96de40d6ca298544085fba692a323c9
+checksum=9c9ff478d4e31cc0b0dc980238956d92f683e6ff55dc1c6b67e3212c7e7e0711
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 32ebecef2cb9ddb925f04c6636adb4e0ec3a8155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:56 +0200
Subject: [PATCH 1631/2561] marble5: update to 22.04.0.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 4bc5bdaa1d27..841cb976ad1d 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.12.3
+version=22.04.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=442925b9024c0d7d470aa1523b0647c8fdce9ce69a0a2c6b29133d43596ad86c
+checksum=eb39219936b387dae4743638fe8ac5cf7f5654f4b4aff06a7c7b67e177799962
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From d92f21a716ba54bf1dd9f8adb293442ddf5b593e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:57 +0200
Subject: [PATCH 1632/2561] signon-kwallet-extension: update to 22.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 7cc3e0d56453..4361bac6029b 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=7579e0434114c33eb5fea3f232bbd414658e2715f3f3a3a220a4f5be4079606b
+checksum=33d19b1b758a21e568ce508cc168e568e34716f148cd83e214fb8a3f3194d2e8

From 9b453eb4b735a4de1ec2f00ddee14693d7e7e412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:58 +0200
Subject: [PATCH 1633/2561] svgpart: update to 22.04.0.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 54ceffce29ea..a0b9d95a6ce2 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=12fd83a8a4fafcc81d3bb0bfd9bc72da84a2fc3edc06e38d3acbfdf483d5e879
+checksum=923bda29e6610fb4dfd2b4f98e14045271c099ab1ed3988d52fefdc0b408df9a

From 36df8c7304912b2da6ab84f1f02ea973d5a96158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:59 +0200
Subject: [PATCH 1634/2561] umbrello: update to 22.04.0.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 6fc35aa3b336..da2757161229 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=c6c5f6107870b397dcc60932cbdc1767cc2d6a2f5223dc5e0314226b61a124c5
+checksum=f4f681daedbefdeb0e6b0da0fd718c20031491d3b088e0523ff5bbfab3de72d8
 python_version=2
 
 pre_configure() {

From 991dd3e3f0dac1ef45e4156008d1ad091a06e9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:42:00 +0200
Subject: [PATCH 1635/2561] yakuake: update to 22.04.0.

---
 srcpkgs/yakuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index 44a2f4000ebe..dd56e9afefb1 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=09667eb9aaaf7d072a0cd78b55b441691726686441b83a04d0c2c9b935cab382
+checksum=b7f96b48fd5baa75dd8fe53c8886f8cb0628f6a77a33232dc5bf06f45f6b2006

From a61e6af8768d0f742efec35c79b266199f2568c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 31 Aug 2021 21:00:01 +0200
Subject: [PATCH 1636/2561] hooks/99-pkglint.sh: make missing shlib entry not a
 warning

---
 common/hooks/pre-pkg/99-pkglint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index ea73c961ec5b..325938f5d541 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -182,7 +182,7 @@ hook() {
 			if [ -z "$found" ]; then
 				_myshlib="${libname}.so"
 				[ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
-				msg_warn "${pkgver}: ${_myshlib} not found in common/shlibs!\n"
+				msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
 			fi;
 		}
 	done

From 00ecf7810b5603d8235f239ad7cfdbc4aa2f8bde Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 22 Apr 2022 01:08:59 -0500
Subject: [PATCH 1637/2561] New package: step-certificates-0.19.0.

---
 srcpkgs/step-certificates/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/step-certificates/template

diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
new file mode 100644
index 000000000000..4d616f9450af
--- /dev/null
+++ b/srcpkgs/step-certificates/template
@@ -0,0 +1,22 @@
+# Template file for 'step-certificates'
+pkgname=step-certificates
+version=0.19.0
+revision=1
+wrksrc=certificates-$version
+build_style=go
+go_import_path=github.com/smallstep/certificates
+go_package="$go_import_path/cmd/step-ca
+ $go_import_path/cmd/step-awskms-init
+ $go_import_path/cmd/step-cloudkms-init
+ $go_import_path/cmd/step-pkcs11-init
+ $go_import_path/cmd/step-yubikey-init"
+go_ldflags="-w -X main.Version=$version"
+hostmakedepends="pkg-config"
+makedepends="pcsclite-devel"
+short_desc="Private CA and ACME server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://smallstep.com/certificates/"
+changelog="https://raw.githubusercontent.com/smallstep/certificates/master/CHANGELOG.md"
+distfiles="https://github.com/smallstep/certificates/archive/refs/tags/v$version.tar.gz"
+checksum=edf8aeaabff2cae9fed4e27177d755be522c20a94a3fd7346de1ec42614d1d46

From 3cb27b2a526b1f9eb0faa6bfbff498c2aa7cdb73 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 22 Apr 2022 01:18:55 -0500
Subject: [PATCH 1638/2561] New package: step-cli-0.19.0.

---
 srcpkgs/step-cli/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/step-cli/template

diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
new file mode 100644
index 000000000000..0fe5dc2dd34e
--- /dev/null
+++ b/srcpkgs/step-cli/template
@@ -0,0 +1,15 @@
+# Template file for 'step-cli'
+pkgname=step-cli
+version=0.19.0
+revision=1
+wrksrc=cli-$version
+build_style=go
+go_import_path=github.com/smallstep/cli
+go_package=$go_import_path/cmd/step
+short_desc="Zero trust swiss army knife"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://smallstep.com/cli"
+changelog="https://raw.githubusercontent.com/smallstep/cli/master/CHANGELOG.md"
+distfiles="https://github.com/smallstep/cli/archive/refs/tags/v$version.tar.gz"
+checksum=a58e63acbfd65a5df84f85715253aa88b566a13af26e2fa1353ae5766b3687d5

From cfe1690d05ef2ca4cc8656798d73fc4039cad90e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 08:20:02 +0200
Subject: [PATCH 1639/2561] linux5.4: update to 5.4.190.

---
 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 770cb9be83ad..25d8aeea2d8f 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.189
+version=5.4.190
 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=8485d536531833cd2dbca0a7f267daff69ede5c9831cb693acc8318447e568c6
+checksum=81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From a1eb07e98593b1b28267cbcfa7803291399327b8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 08:22:35 +0200
Subject: [PATCH 1640/2561] linux4.19: update to 4.19.239.

---
 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 d6916078343b..a44ed5b0cd25 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.238
+version=4.19.239
 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=83b74545c5d380384e09955c26e786bf9ee81a44bcf9347f2ca2ad3d31b46b7a
+checksum=bf7c5dc26c9a3113e43e4d32f73228788f8f6f005b9ddba379378786bc4c593b
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 4f80e5af3325780694b4a390a2f4a63a9167457d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 08:25:43 +0200
Subject: [PATCH 1641/2561] kore: update to 4.2.2.

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index 52b7dbe718a2..cb2063a8adf6 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,6 +1,6 @@
 # Template file for 'kore'
 pkgname=kore
-version=4.2.1
+version=4.2.2
 revision=1
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"
 homepage="https://kore.io"
 distfiles="https://kore.io/releases/kore-${version}.tar.gz"
-checksum=f76b108a4eefa27c89123f5d6a36b493b171e429be7a85d3dd1466ac87e7f15a
+checksum=77c12d80bb76fe774b16996e6bac6d4ad950070d0816c3409dc0397dfc62725f
 disable_parallel_build=yes
 
 export TARGET_PLATFORM=${XBPS_TARGET_MACHINE}

From 7183674284ef15a91f530fc291113bcab607c893 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Thu, 21 Apr 2022 15:17:48 +0200
Subject: [PATCH 1642/2561] k3b: update to 22.04.0

---
 srcpkgs/k3b/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 1994bc5ccec9..c2eab8d7964d 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
@@ -16,4 +16,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#k3b"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=acdbf40e1bccff837c50ba0a9d5e83370c24bc759c51d61385429ac3bf59f845
+checksum=5856d71fd5cf7f14eb646107f76e521869b4ac99df3411257c9f3427267b6504

From d7e4a10a76d71142f33ae47824744ef6e1cd6fec Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 21 Apr 2022 16:00:28 +0300
Subject: [PATCH 1643/2561] git: update to 2.36.0.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 8b05a0f58024..e45663f9ff9b 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.35.3
+version=2.36.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -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=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
+checksum=af5ebfc1658464f5d0d45a2bfd884c935fb607a10cc021d95bc80778861cc1d3
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 509ff4db020396ceaf16f17c53fc5bd2b9c216d8 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 22 Apr 2022 19:53:11 -0700
Subject: [PATCH 1644/2561] skopeo: update to 1.7.0

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index d8015fbcd92c..b3106205abb8 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.6.2
+version=1.7.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=48a1b3d18bde9d7af94756d546b0472e90416f05926281f7e533badfb5fcbd7b
+checksum=453bdcce16767696ed71046b60ad7b34358b183b50eb5aa708ced0b5ea2927b1
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From bcb543f02f6c1c1cfce01241584150947b79f718 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 23 Apr 2022 00:55:42 +0200
Subject: [PATCH 1645/2561] droidcam: update to 1.8.2.

---
 srcpkgs/droidcam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1357308432ef..1207bdec5cea 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,6 +1,6 @@
 # Template file for 'droidcam'
 pkgname=droidcam
-version=1.8.1
+version=1.8.2
 revision=1
 build_style=gnu-makefile
 make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
@@ -13,7 +13,7 @@ maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.dev47apps.com/"
 distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
-checksum=27724a3b3a94b0e5282628c85f0f9db1492df073cba331bd1e0a07f60290de71
+checksum=9f18c6768572571c59bfe08ac70e24612e08fc3d887c127ff47899252d3dc662
 
 post_patch() {
 	vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -e "s,/local,," -i droidcam.desktop

From 9d72a18f7ad4d845bb4176ddc4e2fe4930ed30ab Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 09:09:15 +0200
Subject: [PATCH 1646/2561] vlc: update to 3.0.17.4.

---
 srcpkgs/vlc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 14a00043a651..bdcf4ff726cd 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.17.3
+version=3.0.17.4
 revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
@@ -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="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz"
-checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014
+checksum=8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133
 
 lib32disabled=yes
 

From da3f66a000c696ed0206950435c10cbbb79c0e49 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 09:13:07 +0200
Subject: [PATCH 1647/2561] libkdcraw5: update to 22.04.0.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 8d69a674cdfb..f71d7b6c6ac4 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.12.3
+version=22.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=6acfd4ca20417e525c1676c2b77beb26a683b346afa309cd5b9db3e894d2d8df
+checksum=f92cee9a87fdef59f12bde784e1ec2b13b2677c82634e303f20ed8055ddb3e79
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6a0da893082f86730fd3051733d4eb84172c7f95 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 09:38:44 +0200
Subject: [PATCH 1648/2561] gwenview: update to 22.04.0.

---
 srcpkgs/gwenview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index aa6d3facb994..a9eafcc90cf1 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -16,4 +16,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=28d10e121394e4c710c77f2d46e18fc881c57613603ed65bfd892d4e79f67a7d
+checksum=73683096898c59388cd566cc8f71d7677fd0b22a2ab42a6d5f82f1232372ab05

From 9f7102ef6694298c0f0a9ad9a75cc0733de924f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 23 Apr 2022 08:01:08 +0000
Subject: [PATCH 1649/2561] python3-soupsieve: fix dependency cycle

---
 srcpkgs/python3-soupsieve/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index 83862532f658..aa8f81af5a6e 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-soupsieve'
 pkgname=python3-soupsieve
 version=1.9.5
-revision=7
+revision=8
 wrksrc="soupsieve-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-BeautifulSoup4"
-checkdepends="python3-pytest python3-lxml python3-html5lib $depends"
+depends="python3"
+checkdepends="python3-pytest python3-lxml python3-html5lib
+ python3-BeautifulSoup4"
 short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"

From 91f81262e3e1abbf46314837136f8f2988c642b0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 16:34:01 +0200
Subject: [PATCH 1650/2561] wine: update to 7.7.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index beb10898af92..b08032957c49 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.6
+version=7.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="eeab772f091328a3fb9db89aacab6be087c3d59c168ef2b41af5ec5010cf0328
- bdd1a095b9c4cddce4663825e2ad331c5bf1ac8b2288b0b380a665d0ca987a23"
+checksum="52a4d06ba77080df4a4b022bf9c2cc05cfa1d79bd4bb08c6b88f7c3ae09d1464
+ 9a8c18196ea346cdce84bd87693e911ecb505c1324b85bdbf60b115f8c487ab7"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 14b5d164168bf3347ae7448528d6287f239d9b9f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 23 Apr 2022 15:53:43 +0200
Subject: [PATCH 1651/2561] xfce4-terminal: update to 1.0.2.

---
 srcpkgs/xfce4-terminal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 07c3bfaa46e5..418817a0ac32 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
-version=1.0.1
+version=1.0.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/xfce4-terminal/start"
 changelog="https://gitlab.xfce.org/apps/xfce4-terminal/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=1d3690871d3fe97f8be0908ace0443819e513f6366f851682aafe17059e1eba5
+checksum=ac1543167b43322ad2483ffb033a7e74669ecb59f4b63016a3c183d96141d326

From 1b064e1fa77d7fa71ade10c3971b20a72779c730 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Apr 2022 23:46:12 +0200
Subject: [PATCH 1652/2561] perl-local-lib: update to 2.000029.

---
 srcpkgs/perl-local-lib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-local-lib/template b/srcpkgs/perl-local-lib/template
index 9990e7e7c0d4..3f9ad808f0ba 100644
--- a/srcpkgs/perl-local-lib/template
+++ b/srcpkgs/perl-local-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-local-lib'
 pkgname=perl-local-lib
-version=2.000028
+version=2.000029
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/local-lib"
 distfiles="${CPAN_SITE}/lib/HAARG/local-lib-${version}.tar.gz"
-checksum=408317d67a59f9f91e23e3000b82de4f529cf9cf0896e228f3a27d6f607bfe3d
+checksum=8df87a10c14c8e909c5b47c5701e4b8187d519e5251e87c80709b02bb33efdd7

From a7ca9b50a760101805bbb7124cabf43a56d744b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 24 Apr 2022 00:11:41 +0200
Subject: [PATCH 1653/2561] neovim: update to 0.7.0.

---
 srcpkgs/neovim/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 28cbc7e363cb..63c9247030f7 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,10 +1,10 @@
 # Template file for 'neovim'
 pkgname=neovim
-version=0.6.1
+version=0.7.0
 revision=1
 build_style=cmake
 build_helper="qemu"
-configure_args="-DCMAKE_BUILD_TYPE=Release"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCOMPILE_LUA=OFF"
 hostmakedepends="pkg-config gettext gperf LuaJIT lua51-lpeg lua51-mpack"
 makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel
  LuaJIT-devel libluv-devel tree-sitter-devel"
@@ -14,7 +14,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="Apache-2.0, custom:Vim"
 homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
-checksum=dd882c21a52e5999f656cae3f336b5fc702d52addd4d9b5cd3dc39cfff35e864
+checksum=792a9c55d5d5f4a5148d475847267df309d65fb20f05523f21c1319ea8a6c7df
 
 alternatives="
  vi:vi:/usr/bin/nvim
@@ -30,5 +30,5 @@ pre_configure() {
 }
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.txt
 }

From 0beedabfc5f0cec7443a054bfdb5bec9bd9ac476 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 23 Apr 2022 20:36:57 -0700
Subject: [PATCH 1654/2561] gtksourceview5: update to 5.4.1

---
 srcpkgs/gtksourceview5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index 81be2e5248da..2f056edbeeab 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
 # Template file for 'gtksourceview5'
 pkgname=gtksourceview5
-version=5.4.0
+version=5.4.1
 revision=1
 wrksrc="gtksourceview-${version}"
 build_style=meson
@@ -19,7 +19,7 @@ homepage="https://wiki.gnome.org/Projects/GtkSourceView"
 #changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS"
 distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=003bc217e670a8ec8aa3aece994b70e70b7d6b8074938adda21718555d84e637
+checksum=eb3584099cfa0adc9a0b1ede08def6320bd099e79e74a2d0aefb4057cd93d68e
 
 # Package build options
 build_options="gir gtk_doc"

From 197452d93b537bb24692da7dac17db2772c9b714 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 23 Apr 2022 22:06:09 +0200
Subject: [PATCH 1655/2561] yq-go: update to 4.24.5.

---
 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 9342a11e5deb..fa1737d4e916 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.23.1
+version=4.24.5
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/mikefarah/yq"
 changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=f55ffb9c6d7926b06d5862eb6a9e9ea942ec2883286df8e2e3d6f0716cc36eed
+checksum=8ffab12d2d527f0ac62823777201f8e5e78c9af5c754914274db2733da98c796
 
 do_check() {
 	go test -v

From 541f22fab1897414d2f7b1da1b64e363b02b2810 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Fri, 22 Apr 2022 15:24:10 -0500
Subject: [PATCH 1656/2561] Signal-Desktop: update to 5.40.1.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 8bcfe617ab40..448189474620 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.40.0
+version=5.40.1
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=57bb0ebbf4b3fb9d6dfbaa84166ecf668ce0df8a0afa0f69907680804dd064c4
+checksum=d80d210554e0296d916f7e25d9a49afc58340ab03ef7a1e7ae21017e80e9de7b
 nostrip_files="signal-desktop"
 
 post_extract() {

From 385e829fe58520e216ec3df8b9b4c6e2bffb5824 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Wed, 20 Apr 2022 23:41:51 -0500
Subject: [PATCH 1657/2561] intel-ucode: update to 20220419

---
 srcpkgs/intel-ucode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index 642dee9f7c27..e7e57d0f6588 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-ucode'
 pkgname=intel-ucode
-version=20220207
+version=20220419
 revision=1
 archs="i686* x86_64*"
 wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}"
@@ -9,7 +9,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom: Proprietary"
 homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
 distfiles="${homepage}/archive/microcode-${version}.tar.gz"
-checksum=532527bd17f3ea6664452b536699818a3bf896e4ace689a43a73624711b7c921
+checksum=b8838d300e749c1dd55d8865bdd49dee5153beb5e29d4b0e613aee475e0c0881
 repository=nonfree
 
 do_install() {

From 7aeb9faefe0ec0effd39738c5d00015e11f32250 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 16 Apr 2022 16:17:52 +0530
Subject: [PATCH 1658/2561] New package: libnvme-0.1

---
 common/shlibs                                 |  1 +
 srcpkgs/libnvme-devel                         |  1 +
 srcpkgs/libnvme-doc                           |  1 +
 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 +++++++
 srcpkgs/libnvme/template                      | 39 +++++++++++++++++++
 srcpkgs/python3-libnvme                       |  1 +
 6 files changed, 56 insertions(+)
 create mode 120000 srcpkgs/libnvme-devel
 create mode 120000 srcpkgs/libnvme-doc
 create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
 create mode 100644 srcpkgs/libnvme/template
 create mode 120000 srcpkgs/python3-libnvme

diff --git a/common/shlibs b/common/shlibs
index 11328b15a9cc..073830fc1442 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,4 @@ librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
+libnvme.so.1 libnvme-1.0_1
diff --git a/srcpkgs/libnvme-devel b/srcpkgs/libnvme-devel
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-devel
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme-doc b/srcpkgs/libnvme-doc
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-doc
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ 		nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+ 
+ 	const char *scope = NULL;
+-	char *p = strchr(tmp, SCOPE_DELIMITER);
++	char *p = strchr(tmp, '%');
+ 	if (p) {
+ 		*p = '\0';
+ 		scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..aafe21aa9aa5
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,39 @@
+# Template file for 'libnvme'
+pkgname=libnvme
+version=1.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man"
+hostmakedepends="pkg-config swig"
+makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
+short_desc="C Library for NVM Express on Linux"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/linux-nvme/libnvme"
+distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
+checksum=387524b1c24a4091a88bfb258c98c054f716da210e77702f0709164740370807
+
+libnvme-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	depends+=" json-c-devel libuuid-devel openssl-devel"	# otherwise 'pkgconf libnvme' doesn't work
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
+
+libnvme-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share
+	}
+}
+
+python3-libnvme_package() {
+	short_desc+=" - Python3 bindings"
+	pkg_install() {
+		vmove "usr/lib/python*"
+	}
+}
diff --git a/srcpkgs/python3-libnvme b/srcpkgs/python3-libnvme
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/python3-libnvme
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file

From 22ea2c3466dd92687098452f3d3b129d043fef44 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 16 Apr 2022 16:55:09 +0530
Subject: [PATCH 1659/2561] nvme-cli: update to 2.0, adopt

---
 srcpkgs/nvme-cli/patches/dracut-warning.patch |  5 ----
 srcpkgs/nvme-cli/template                     | 28 ++++++++-----------
 2 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch

diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch
deleted file mode 100644
index ef0b0b4df244..000000000000
--- a/srcpkgs/nvme-cli/patches/dracut-warning.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:37:06.346511231 +0700
-+++ b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:38:01.351158511 +0700
-@@ -1 +1 @@
--install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"
-+install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules "
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 0da50f2663ef..9b142b02de0f 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,28 +1,22 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=1.13
-revision=2
-build_style=gnu-makefile
-# yeah, it must be 0 to enable
-make_build_args="LIBUUID=0"
-make_install_args="SBINDIR=/usr/bin UDEVDIR=/usr/lib/udev"
-make_install_target="install-spec"
-makedepends="libuuid-devel"
+version=2.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
+hostmakedepends="pkg-config"
+makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel libhugetlbfs-devel"
 short_desc="NVMe management command line interface"
-maintainer="Peter Froehlich <peter.hans.froehlich@gmail.com>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://nvmexpress.org"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=03f4875f3e68d326b0280e16df2f027ca6b086cfa148c34e8569df61319b4b85
+checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c
 conf_files="/etc/nvme/*.conf"
 
 post_install() {
-	# these files are touch'd by install, remove so they aren't registered
-	# by the package (which would cause trouble during removal)
-	rm -f "${DESTDIR}/etc/nvme/hostnqn"
-	rm -f "${DESTDIR}/etc/nvme/hostid"
-	rm -rf "${DESTDIR}/etc/udev/rules.d"
-	rm -f "${DESTDIR}/usr/sbin/nvme"
-	# no need for systemd files
+	# remove files that are systemd-only
 	rm -rf "${DESTDIR}/usr/lib/systemd"
+	rm -rf "${DESTDIR}/usr/lib/udev/rules.d/70-nvmf-autoconnect.rules"         # calls systemctl
+	rm -rf "${DESTDIR}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf"  # needs 70-nvmf-autoconnect.rules
 }

From df6257526cc2d36040b99ec815fe5a984f5a03d7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:05:17 +0200
Subject: [PATCH 1660/2561] parallel: update to 20220422.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 030875ae0ffd..27a4c2a2b059 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20220322
+version=20220422
 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=df93ccf6a9f529ad2126b7042aef0486603e938c77b405939c41702d38a4e6d8
+checksum=96e4b73fff1302fc141a889ae43ab2e93f6c9e86ac60ef62ced02dbe70b73ca7
 
 pre_configure() {
 	# no html and pdf doc

From 9d7a8ac0dacccf8b25711a3ed4fa9c623333d1ee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 17:35:37 +0200
Subject: [PATCH 1661/2561] public-inbox: update to 1.8.0.

---
 srcpkgs/public-inbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/public-inbox/template b/srcpkgs/public-inbox/template
index d95bb6f3a0b2..d8bd1f5ce727 100644
--- a/srcpkgs/public-inbox/template
+++ b/srcpkgs/public-inbox/template
@@ -1,6 +1,6 @@
 # Template file for 'public-inbox'
 pkgname=public-inbox
-version=1.7.0
+version=1.8.0
 revision=1
 wrksrc="${pkgname}-${version/pre/-pre}"
 build_style=perl-module
@@ -18,7 +18,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="AGPL-3.0-or-later"
 homepage="https://public-inbox.org/"
 distfiles="https://public-inbox.org/public-inbox.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=8504a998014556e3e65d9bdceeaeb23f966197cea86abf3738b6059fee36c8c9
+checksum=95a24e38293935e7081967acbf80f7d1c2c67e28d01d591ea39e5e36a34acdec
 
 pre_check() {
 	mkdir -p ~/.public-inbox

From 93201be2a61e82179aafa8074150087e6c0a3fa1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:31:46 +0200
Subject: [PATCH 1662/2561] dune: update to 3.1.1.

---
 srcpkgs/dune/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 30c34cb44c00..bc2898d2cd4c 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
 # Template file for 'dune'
 pkgname=dune
-version=3.0.3
-revision=2
+version=3.1.1
+revision=1
 makedepends="ocaml"
 depends="ocaml"
 short_desc="Composable build system for OCaml"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://dune.build/"
 distfiles="https://github.com/ocaml/dune/archive/refs/tags/${version}.tar.gz"
-checksum=8f5e1570e68f7b2e0a8d1ffea77318e058f125f4cb8ea9a4af9cf9afe4ced893
+checksum=176c7095b2fcb59ca5c8fba880cf32dd3010144e926b99fc01f7a89e973b895d
 nocross="ocaml"
 
 _dune_release_pkgs="dune dune-action-plugin dune-build-info dune-configurator

From 91f058a7daf0ec8d4c8280dfee952ad69ae3309a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:41:50 +0200
Subject: [PATCH 1663/2561] z3: update to 4.8.16.

---
 srcpkgs/z3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index dea059c98d0c..d322211cbd9b 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.15
-revision=2
+version=4.8.16
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
 distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=2abe7f5ecb7c8023b712ffba959c55b4515f4978522a6882391de289310795ac
+checksum=75f95e09f3f35fef746e571d5ec88a4efba27f1bc8f1a0ef1117167486ec3dc6
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"

From b2fbe98903e8af13db337e48be7513f83ec090c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:47:16 +0200
Subject: [PATCH 1664/2561] python3-pyinfra: update to 2.0.2.

---
 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 c4935c5e16b9..b5b66a212d18 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.7.2
+version=2.0.2
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -14,7 +14,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=c7a2464ab50c5de865f0984e1978a9af37fbeca2260c4bf642db37fd0aed910d
+checksum=d5775bbd7060a67184092f6d29d7ee9f08ad76035cad7328e2fd63824c6fa649
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From aa210d2c24d6e1f95114f05498f5405d96b76f15 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:48:05 +0200
Subject: [PATCH 1665/2561] python3-pywinrm: update to 0.4.3.

---
 srcpkgs/python3-pywinrm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pywinrm/template b/srcpkgs/python3-pywinrm/template
index 24c8b63fec06..642166e13b6e 100644
--- a/srcpkgs/python3-pywinrm/template
+++ b/srcpkgs/python3-pywinrm/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pywinrm'
 pkgname=python3-pywinrm
-version=0.4.2
-revision=2
+version=0.4.3
+revision=1
 wrksrc="pywinrm-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/diyan/pywinrm"
 distfiles="https://github.com/diyan/pywinrm/archive/v${version}.tar.gz"
-checksum=c2a0d839f524a3cf4548923c29f85f909174405ac4339df45813410aae759b44
+checksum=253d2af9a6f1ec1ae8e21919a174e178b2e0475060956e3add0746584520ae84
 
 post_install() {
 	vlicense LICENSE

From f8a1bfb1ad9caad0a3e4b613a6e0fe2ee904662b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:48:43 +0200
Subject: [PATCH 1666/2561] python3-pipenv: update to 2022.4.21.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index ea94ef51e087..2c0c939cf5f7 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.4.8
+version=2022.4.21
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=53562bf69d9e5238f99a1e2101c356746b1c0aefa5dceb9b8a84a5a3e201de0d
+checksum=3f93229de25a4c3a658249f48407b80f347f076640a9fd50c476a2876212f781
 conflicts="python-pipenv>=0"
 
 post_extract() {

From 673c7ddc5b828eda304d31f6ca4fa53fb00940a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 23 Apr 2022 15:34:59 +0200
Subject: [PATCH 1667/2561] python3-pwntools: disable tests

---
 srcpkgs/python3-pwntools/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template
index f61ad95fa813..d062f213cf17 100644
--- a/srcpkgs/python3-pwntools/template
+++ b/srcpkgs/python3-pwntools/template
@@ -18,6 +18,7 @@ license="MIT, BSD-2-Clause"
 homepage="https://github.com/Gallopsled/pwntools"
 distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz"
 checksum=42052e2d883710e4e1da041e91675a6d719fb4e5ef2dd245cb2853da11269290
+#make_check=no # needs unpackaged rpyc
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From d5092f3af8fe03aaa5a70388971ca798b499a1bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 22:33:45 +0200
Subject: [PATCH 1668/2561] libinput: update to 1.20.1.

---
 srcpkgs/libinput/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 38fe908dbb36..1736a1f91f39 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.20.0
+version=1.20.1
 revision=1
 build_style=meson
 configure_args="-Dtests=false"
@@ -13,7 +13,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="https://gitlab.freedesktop.org/libinput/libinput/-/archive/${version}/libinput-${version}.tar.gz"
-checksum=04d27bce1eb8387e99740e43224b0de7ea65161826d120199bf96230132e5186
+checksum=fbbfe95c5cf20a1790c077b703db86ff0811c04a040b15f2a8579518e8a58064
 
 CFLAGS="-UNDEBUG"
 

From 6a5e0307fc35e3770737f136ca30506dfddde6b6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 22:33:50 +0200
Subject: [PATCH 1669/2561] pp: fix checksum

---
 srcpkgs/pp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index c1a59659fb65..4865bcd96d92 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -9,7 +9,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=3c85716c05145c85f281478c82f445d9a808faad0497b438a8bfcbfdfd055665
+checksum=3b4726a2d2e78349fd5512ea8d4c4f5e8417d5a81e511f74e7efb5f4e03e978c
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"

From 2cdad05a673ef11a9b2b1c270c60b4d8b9dae7e3 Mon Sep 17 00:00:00 2001
From: ThePademelon <zomanom@gmail.com>
Date: Sun, 24 Apr 2022 16:22:20 +1000
Subject: [PATCH 1670/2561] blanket: update to 0.6.0.

---
 srcpkgs/blanket/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 57d75b5ba8d1..9db5a1d5a3c9 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -1,14 +1,14 @@
 # Template file for 'blanket'
 pkgname=blanket
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"
-depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libhandy1"
+depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libadwaita"
 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/refs/tags/${version}.tar.gz"
-checksum=5af1d417d31bafff7c13a48e26bc4daae58a537f312b4ffb6911ae1b8b09a1d1
+checksum=710a3b733da5eb349bf8dc3c37ef0afeb301c8299c22e7fad3c753576f33f7f4
 python_version=3

From 42687ce1a2ac3d66b7818862f7bb2107cd78d5a4 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Sat, 23 Apr 2022 21:47:40 +0200
Subject: [PATCH 1671/2561] volta: update to 1.0.7

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 7874993281ec..e624659785b0 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,6 +1,6 @@
 # Template file for 'volta'
 pkgname=volta
-version=1.0.6
+version=1.0.7
 revision=1
 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=0f66edcb2639bee2c1668efd119c2937a77fbbe564c9d63827e8eaf37dbee4b9
+checksum=7e38691c56d77b4d4b466247bc9f10672d4f8f6b98cf53c50fdab6c34526aa91
 
 post_install() {
 	vlicense LICENSE

From f2322f2a62ab50806d20c41bc21fd2bef703335a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 21 Apr 2022 17:40:59 +0300
Subject: [PATCH 1672/2561] StyLua: update to 0.13.1.

---
 srcpkgs/StyLua/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index b6dc22c3875d..90ef1beb0f3c 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
 # Template file for 'StyLua'
 pkgname=StyLua
-version=0.13.0
+version=0.13.1
 revision=1
 build_style=cargo
 configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')"
@@ -10,7 +10,7 @@ license="MPL-2.0"
 homepage="https://github.com/JohnnyMorganz/StyLua"
 changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md"
 distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
-checksum=ad74d1f47b0337810459dab9b49694bd5bd6c8c7381a35dcab7866752652988b
+checksum=21158028569158ec7c1ad71352f3cb1906a005eb797508aa2b0b4a861162cf72
 
 build_options="lua52 luau"
 build_options_default="lua52 luau"

From fe6dff3774e7420949ee7ca98c9b23d670d46d70 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Thu, 21 Apr 2022 12:34:46 -0300
Subject: [PATCH 1673/2561] thefuck: update to 3.32.

---
 srcpkgs/thefuck/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 267a27d7789a..7704ab2a6a68 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=2
+version=3.32
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,12 +12,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=76cbb014473672d1c384922857f8fbc1f6f7774f74f784149ad88751854ecfdf
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
 	x86_64*|i686*|armv[67]*|aarch64*|ppc64le*) checkdepends+=" go" ;;
-	*) make_check=no ;;
+	*) make_check=no ;; # go is not available
 esac
 
 pre_check() {

From 0de8ad16968f04d3bb44493f222374de0219cda3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 18:00:25 +0200
Subject: [PATCH 1674/2561] linux-firmware: update to 20220411.

---
 srcpkgs/linux-firmware/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 018f08f95099..dde0c93b3fb4 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20220310
+version=20220411
 revision=1
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=f4c34a7ba8144b52fd7f6dd0b1dea2998f140ab1139372f8fbdb76f4557ff228
+checksum=533ae621b3eacf6a4696dab52a9dbc5727403a175c413b1682ab3f9cfb37872f
 python_version=3
 nostrip=yes
 

From df34168c5e51cfaa54d37822836d6ac05640e3b5 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 9 Apr 2022 14:10:43 +0200
Subject: [PATCH 1675/2561] img2pdf: update to 0.4.4.

---
 srcpkgs/img2pdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index a24ea1f1b610..d3b30d5af5da 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'img2pdf'
 pkgname=img2pdf
-version=0.4.3
+version=0.4.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
@@ -10,5 +10,5 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
-checksum=8e51c5043efa95d751481b516071a006f87c2a4059961a9ac43ec238915de09f
+checksum=8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c
 make_check=no # need to patch out some bitdepth checks

From 11c22cfbaeb4b8de0d15897b954ca51af38674b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 23 Apr 2022 12:39:03 +0200
Subject: [PATCH 1676/2561] dasel: update to 1.24.3.

---
 srcpkgs/dasel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index 6d913b08ba62..1f4e0d9fb800 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,6 +1,6 @@
 # Template file for 'dasel'
 pkgname=dasel
-version=1.24.1
+version=1.24.3
 revision=1
 build_style=go
 go_import_path=github.com/tomwright/dasel
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://daseldocs.tomwright.me/"
 changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md"
 distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz"
-checksum=ca1fa030f41abcd3659e76d7413ce14c551f40d41769e7a000a46f4fea6d0b64
+checksum=86d497e7dcfe63901ef0aeddb31e3989959d60d785a04f98fc6a88b6f497980a
 
 post_install() {
 	vlicense LICENSE

From 8b689f2e07c0d0c5a8570a992b9a8221dfa75868 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Fri, 22 Apr 2022 17:28:47 -0400
Subject: [PATCH 1677/2561] tailscale: update to 1.24.0.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 27a3611b7296..9b6db1157ae8 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.22.2
+version=1.24.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -13,7 +13,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=3e7b5b8073a7b94d84ff6677a9f110070b808c8d35c5b7da0c6e6fe639444e58
+checksum=3c8fe851c440d5dbd9dba2f3242924a7d99e7df37b5ae098507a8feb3663c76f
 
 post_install() {
 	vlicense LICENSE

From aea843e2d64fc341fa7764598bc7fce246504674 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Fri, 22 Apr 2022 18:27:05 +0200
Subject: [PATCH 1678/2561] ncmpc: update to 0.46.

Also, remove unneeded boost-devel dependency and
bump to pcre2.
---
 srcpkgs/ncmpc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index a7d76aa3ce9e..0c9c46bf8400 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,18 +1,18 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
-version=0.45
-revision=2
+version=0.46
+revision=1
 build_style=meson
 configure_args="-Dlirc=disabled -Dhtml_manual=false"
 hostmakedepends="pkg-config python3-Sphinx"
-makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel"
+makedepends="libmpdclient-devel ncurses-devel pcre2-devel"
 short_desc="Ncurses-based mpd client"
 maintainer="Getty Ritter <gettyritter@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/clients/ncmpc/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/master/NEWS"
 distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"
-checksum=17ff446447e002f2ed4342b7324263a830df7d76bcf177dce928f7d3a6f1f785
+checksum=177f77cf09dd4ab914e8438be399cdd5d83c9aa992abc8d9abac006bb092934e
 
 post_install() {
 	vmkdir usr/share/examples/ncmpc

From 3f0d8373730fd1635720870ad8cd1f19236cc23f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 23 Apr 2022 21:21:38 +0200
Subject: [PATCH 1679/2561] gst-plugins-base1: fix -devel dependencies

---
 srcpkgs/gst-plugins-base1/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index fcb7c07b06ab..538f4111a74e 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
 version=1.20.1
-revision=2
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
@@ -53,7 +53,10 @@ do_check() {
 }
 
 gst-plugins-base1-devel_package() {
-	depends="gstreamer1-devel>=${version} ${sourcepkg}>=${version}_${revision} orc-devel"
+	depends="gstreamer1-devel>=${version} ${sourcepkg}>=${version}_${revision}
+	 libX11-devel libdrm-devel libgbm-devel libglib-devel libglvnd-devel
+	 libgudev-devel orc-devel wayland-devel zlib-devel"
+
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 131318255a1fe46452db477083c6c7e7d96dc9fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 21:54:18 +0200
Subject: [PATCH 1680/2561] btrfs-progs: move .pc file to libbtrfsutil-devel

---
 srcpkgs/btrfs-progs/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 971267a50435..5be94b6daaff 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
 version=5.14.1
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -65,6 +65,7 @@ libbtrfsutil-devel_package() {
 	short_desc+=" - libbtrfsutil development files"
 	pkg_install() {
 		vmove usr/include/btrfsutil.h
+		vmove usr/lib/pkgconfig/libbtrfsutil.pc
 		vmove usr/lib/libbtrfsutil.a
 		vmove usr/lib/libbtrfsutil.so
 	}

From bcb06f08631a8df25f597d65db7b24a3a574abe1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 25 Apr 2022 14:10:53 +0200
Subject: [PATCH 1681/2561] kubefwd: update to 1.22.2.

---
 srcpkgs/kubefwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 734b9c732c88..8aa2f1b456d8 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,6 +1,6 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
-version=1.22.0
+version=1.22.2
 revision=1
 build_style=go
 go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/txn2/kubefwd"
 distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz"
-checksum=38a36dfe7182b4a9a4515d49c6dbeeceb101397cc5c11fbf720d2570cb0b86ef
+checksum=ce7ed2d054a594c9471b1ef777d024186ac427f7d0db8422fda96ede26238f9e
 
 post_install() {
 	vlicense NOTICE

From 76b3bf2db3574f4390f558d03a7357c899c58405 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sun, 24 Apr 2022 19:15:20 +1100
Subject: [PATCH 1682/2561] muse: update to 4.1.0.

---
 srcpkgs/muse/patches/i686.patch | 22 ++++++++++++++++++++++
 srcpkgs/muse/template           |  7 +++----
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/muse/patches/i686.patch

diff --git a/srcpkgs/muse/patches/i686.patch b/srcpkgs/muse/patches/i686.patch
new file mode 100644
index 000000000000..e15bce630026
--- /dev/null
+++ b/srcpkgs/muse/patches/i686.patch
@@ -0,0 +1,22 @@
+From 40afa0ad60e221c7b02fb8febbf9baff42c13cdc Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 25 Apr 2022 10:19:30 +0200
+Subject: [PATCH] Fix intptr_t was not declared in this scope on i386
+
+---
+ src/al/dsp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/al/dsp.cpp b/src/al/dsp.cpp
+index 8a4803e4c..3f601dc63 100644
+--- a/src/al/dsp.cpp
++++ b/src/al/dsp.cpp
+@@ -21,7 +21,7 @@
+ //=============================================================================
+ 
+ #include <stdio.h>
+-//#include <stdint.h>
++#include <stdint.h>
+ //#include "config.h"
+ #include "al.h"
+ #include "dsp.h"
diff --git a/srcpkgs/muse/template b/srcpkgs/muse/template
index c1289802a6b6..bfc011eb1037 100644
--- a/srcpkgs/muse/template
+++ b/srcpkgs/muse/template
@@ -1,8 +1,7 @@
 # Template file for 'muse'
 pkgname=muse
-version=4.0.0
-revision=2
-wrksrc="muse-${version}"
+version=4.1.0
+revision=1
 build_wrksrc=src
 build_style=cmake
 build_helper=qmake
@@ -19,7 +18,7 @@ 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
+checksum=b5462cdebd84326b0ffc0aa0b2c27f5eab55362dcc04e17796de866fcee4f391
 python_version=3
 
 build_options="alsa python"

From 120a9e27bbf43f7d32d745eb961afeef100b21e2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Apr 2022 21:19:00 -0400
Subject: [PATCH 1683/2561] mdcat: update to 0.27.1.

---
 srcpkgs/mdcat/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index c07dbd3b3913..84a8294986a9 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,18 +1,20 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.26.1
+version=0.27.1
 revision=1
 wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config ruby-asciidoctor"
 makedepends="openssl-devel"
+depends="shared-mime-info"
+checkdepends="shared-mime-info"
 short_desc="Cat for markdown"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MPL-2.0"
 homepage="https://codeberg.org/flausch/mdcat/"
 changelog="https://codeberg.org/flausch/mdcat/raw/branch/main/CHANGELOG.md"
 distfiles="https://codeberg.org/flausch/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=1120c4f3b5b517075b6347dbfe76a2211a91837b4d0242c0b72cdbc19e6886dd
+checksum=79961e0a842ee0f68aee3d54b39458352664c67388e56175a9d18d80f357bf14
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From a5110d908c95a9539edf1ba812f6476c6a3784f3 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 10 Apr 2022 12:03:13 +0200
Subject: [PATCH 1684/2561] praat: update to 6.2.12

and enable check
---
 srcpkgs/praat/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 142f0d2661ae..c40c093208ec 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,18 +1,19 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.2.10
+version=6.2.12
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if jack jack-devel)
  $(vopt_if pulseaudio 'alsa-lib-devel pulseaudio-devel')"
+checkdepends="cantarell-fonts"
 short_desc="Speech analysis, synthesis, and manipulation"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 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=f6358b2c6a967afe89882720d503c74221b364c563e1e4316a2d73c9f0c22bcd
+checksum=b6f1e09ffc8d0c89e3a892d997af0766a49f7d863cdeae857a9b5ea7f95f5650
 
 # 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
@@ -59,6 +60,12 @@ do_install() {
 	vbin praat_nogui
 }
 
+do_check() {
+	cd "${pkgname}-${version}/test"
+	../../praat --run runAllTests_batch.praat
+	../../praat_nogui --run runAllTests_batch.praat
+}
+
 praat-nogui_package() {
 	short_desc+=" (nogui)"
 	pkg_install() {

From bd7338f82e16854e970360b9d8809cb7cf35f31e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 20 Apr 2022 13:50:04 -0400
Subject: [PATCH 1685/2561] python3-pybcj: update to 0.5.2.

---
 srcpkgs/python3-pybcj/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template
index a0776b796627..c6cef8f80b03 100644
--- a/srcpkgs/python3-pybcj/template
+++ b/srcpkgs/python3-pybcj/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pybcj'
 pkgname=python3-pybcj
-version=0.5.1
+version=0.5.2
 revision=1
 wrksrc="pybcj-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/pybcj"
 distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz"
-checksum=376d039200639a52cba47fb04ffda39aad39715d9e988405fee0e5d60080d111
+checksum=050e7bf780b82b0c6ba4368c4a78953a1cf5922cef50e8b251fb8b87f0483ad7

From 323aabb095a849e79718bc6066262e21ae39b6c6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 20 Apr 2022 13:50:30 -0400
Subject: [PATCH 1686/2561] python3-py7zr: update to 0.18.4.

---
 srcpkgs/python3-py7zr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
index 0113cb1dec27..e6e8e05ec41a 100644
--- a/srcpkgs/python3-py7zr/template
+++ b/srcpkgs/python3-py7zr/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-py7zr'
 pkgname=python3-py7zr
-version=0.18.3
+version=0.18.4
 revision=1
 wrksrc="py7zr-${version}"
 build_style=python3-module
@@ -16,4 +16,4 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/py7zr"
 changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/Changelog.rst"
 distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
-checksum=d5bdc81536316f209a3ca4e1ce6e2ef11d8a519d613be47bcdd084bf655f400f
+checksum=6986e90ca4ca1f4999d57987a54d891673c9f8befa02c9c6cd8201893a17442c

From 7ae49fba54d5bdd94d892580e8637a17392c5041 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:08:31 -0400
Subject: [PATCH 1687/2561] protobuf: update to 3.20.1.

---
 common/shlibs             | 6 +++---
 srcpkgs/protobuf/template | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 073830fc1442..a437c5742ede 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3100,9 +3100,9 @@ libm17n-flt.so.0 m17n-lib-1.7.0_1
 libm17n-gui.so.0 m17n-lib-1.7.0_1
 libm17n-core.so.0 m17n-lib-1.7.0_1
 libm17n.so.0 m17n-lib-1.7.0_1
-libprotobuf-lite.so.30 libprotobuf-lite-3.19.4_1
-libprotoc.so.30 libprotoc-3.19.4_1
-libprotobuf.so.30 libprotobuf-3.19.4_1
+libprotobuf-lite.so.31 libprotobuf-lite-3.20.1_1
+libprotoc.so.31 libprotoc-3.20.1_1
+libprotobuf.so.31 libprotobuf-3.20.1_1
 libsombok.so.3 sombok-2.4.0_1
 libdeviceclient.so.0 pragha-1.3.3_1
 libguile-srfi-srfi-1-v-3.so.3 guile1.8-1.8.8_1
diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template
index 14ffcfb820e2..25a15ced0975 100644
--- a/srcpkgs/protobuf/template
+++ b/srcpkgs/protobuf/template
@@ -1,6 +1,6 @@
 # Template file for 'protobuf'
 pkgname=protobuf
-version=3.19.4
+version=3.20.1
 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=3bd7828aa5af4b13b99c191e8b1e884ebfa9ad371b0ce264605d347f135d2568
+checksum=8b28fdd45bab62d15db232ec404248901842e5340299a57765e48abe8a80d930
 # Checks rely on googletest
 make_check=no
 

From 99ef0df438cd28358526ad038d876172beb5e121 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:12:32 -0400
Subject: [PATCH 1688/2561] python3-protobuf: update to 3.20.1.

---
 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 64e2f45c305f..7c27f55ec180 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.19.4
+version=3.20.1
 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=9df0c10adf3e83015ced42a9a7bd64e13d06c4cf45c340d2c63020ea04499d0a
+checksum=adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9
 
 build_options="cppext"
 build_options_default="cppext"

From c09a3ded2240c11c1b56aef627f77708c3618d3d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1689/2561] protobuf-c: update to 1.4.0.

---
 srcpkgs/protobuf-c/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template
index 16b4e155b6b6..8faaf9f8ea46 100644
--- a/srcpkgs/protobuf-c/template
+++ b/srcpkgs/protobuf-c/template
@@ -1,17 +1,17 @@
 # Template file for 'protobuf-c'
 pkgname=protobuf-c
-version=1.3.3
-revision=10
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable protoc)"
-hostmakedepends="pkg-config protobuf"
+hostmakedepends="pkg-config protobuf protobuf-devel"
 makedepends="protobuf-devel boost-devel $(vopt_if protoc libprotoc-devel)"
 short_desc="C implementation of the Google Protocol Buffers"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/protobuf-c/protobuf-c"
 distfiles="${homepage}/releases/download/v${version}/protobuf-c-${version}.tar.gz"
-checksum=22956606ef50c60de1fabc13a78fbc50830a0447d780467d3c519f84ad527e78
+checksum=26d98ee9bf18a6eba0d3f855ddec31dbe857667d269bc0b6017335572f85bbcb
 
 build_options="protoc"
 build_options_default="protoc"

From 3366cc85007b144575cb44b47d2f7b65f612d406 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:39 -0400
Subject: [PATCH 1690/2561] Bear: rebuild for protobuf-3.20.1

---
 srcpkgs/Bear/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index abd76cbcd534..c8c6efebccf2 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
 # Template file for 'Bear'
 pkgname=Bear
 version=3.0.18
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="pkg-config protobuf protobuf-devel grpc"
 makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"

From b58c6ce394854ee66faadcafe03a6eea68ef5f34 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:39 -0400
Subject: [PATCH 1691/2561] EternalTerminal: rebuild for protobuf-3.20.1

---
 srcpkgs/EternalTerminal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/EternalTerminal/template b/srcpkgs/EternalTerminal/template
index 659e1e69df84..ae3f21ee709a 100644
--- a/srcpkgs/EternalTerminal/template
+++ b/srcpkgs/EternalTerminal/template
@@ -1,7 +1,7 @@
 # Template file for 'EternalTerminal'
 pkgname=EternalTerminal
 version=6.0.13
-revision=5
+revision=6
 wrksrc="${pkgname}-et-v${version}"
 build_style=cmake
 hostmakedepends="protobuf"

From 27e71c64e03fa9f2c92495bd23eccccb7c64a510 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:39 -0400
Subject: [PATCH 1692/2561] android-tools: rebuild for protobuf-3.20.1

---
 srcpkgs/android-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index b1b47376caa1..51a783085b73 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'android-tools'
 pkgname=android-tools
 version=31.0.3p1
-revision=2
+revision=3
 archs="armv* aarch64* x86_64* i686* ppc64le*"
 build_style=cmake
 hostmakedepends="perl go protobuf pkg-config"

From 5a17917d111f70a94c6d1741917fbaf977a1a25e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1693/2561] astroid: rebuild for protobuf-3.20.1

---
 srcpkgs/astroid/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 1021eb482068..1207eacbacc1 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
 # Template file for 'astroid'
 pkgname=astroid
 version=0.16
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
 makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel

From 40484407f7d9de109257994804feceab278179f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1694/2561] bloaty: rebuild for protobuf-3.20.1

---
 srcpkgs/bloaty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bloaty/template b/srcpkgs/bloaty/template
index eb432b02e6d4..1334dc8715df 100644
--- a/srcpkgs/bloaty/template
+++ b/srcpkgs/bloaty/template
@@ -1,7 +1,7 @@
 # Template file for 'bloaty'
 pkgname=bloaty
 version=1.1
-revision=8
+revision=9
 build_style=cmake
 hostmakedepends="pkg-config protobuf"
 makedepends="capstone-devel protobuf-devel re2-devel zlib-devel"

From 524b4c6bcba9dcbf1cb8301037251c16e2e015ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1695/2561] clementine: rebuild for protobuf-3.20.1

---
 srcpkgs/clementine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template
index af56ba9852ab..9615d5fe8b44 100644
--- a/srcpkgs/clementine/template
+++ b/srcpkgs/clementine/template
@@ -1,7 +1,7 @@
 # Template file for 'clementine'
 pkgname=clementine
 version=1.4.0rc1
-revision=7
+revision=8
 _fullver=$version-343-gb49afcc5b
 wrksrc=${pkgname}-${_fullver}
 build_style=cmake

From 466499dca136e25af1bb1af92e94583ac06d6817 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1696/2561] cura-engine: rebuild for protobuf-3.20.1

---
 srcpkgs/cura-engine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 5cded6271dea..f5c611d2c5fe 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
 version=4.13.1
-revision=1
+revision=2
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"

From c944839c4d8d9652c49e04a777f0ca9f76d42a31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1697/2561] grpc: rebuild for protobuf-3.20.1

---
 srcpkgs/grpc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index 4805cc956328..9b35682fdb17 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
 # Template file for 'grpc'
 pkgname=grpc
 version=1.39.1
-revision=4
+revision=5
 _abseilver=997aaf3a28308eba1b9156aa35ab7bca9688e9f6
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON

From be7386bed07c7d7751218287e40fb2c24d3bc0db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1698/2561] kismet: rebuild for protobuf-3.20.1

---
 srcpkgs/kismet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kismet/template b/srcpkgs/kismet/template
index fc851637ef5f..eb243e3f27c4 100644
--- a/srcpkgs/kismet/template
+++ b/srcpkgs/kismet/template
@@ -1,7 +1,7 @@
 # Template file for 'kismet'
 pkgname=kismet
 version=2022.02.R1
-revision=2
+revision=3
 _realver="${version//./-}"
 wrksrc="${pkgname}-${_realver}"
 build_style=gnu-configure

From c7e46183e9ab5fb7259c757d30aef28408ee3332 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1699/2561] libArcus: rebuild for protobuf-3.20.1

---
 srcpkgs/libArcus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 21176dfdbcbe..30a87aec8742 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
 version=4.13.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"

From 4b7a88cdee156aa9c15d4698db0abe7b8d5e77b6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:40 -0400
Subject: [PATCH 1700/2561] libcompizconfig: rebuild for protobuf-3.20.1

---
 srcpkgs/libcompizconfig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcompizconfig/template b/srcpkgs/libcompizconfig/template
index f8c8b185ef78..102a1483e694 100644
--- a/srcpkgs/libcompizconfig/template
+++ b/srcpkgs/libcompizconfig/template
@@ -1,7 +1,7 @@
 # Template file for 'libcompizconfig'
 pkgname=libcompizconfig
 version=0.8.18
-revision=8
+revision=9
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="automake intltool libtool pkg-config protobuf"

From 981bd696febf5570f49f92a6dad0035b0417baec Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1701/2561] libphonenumber: rebuild for protobuf-3.20.1

---
 srcpkgs/libphonenumber/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 5f1d01690030..a3b2436f07d1 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
 # Template file for 'libphonenumber'
 pkgname=libphonenumber
 version=8.12.39
-revision=3
+revision=4
 build_wrksrc=cpp
 build_style=cmake
 build_helper=qemu

From cb3cfa075b775830f8364d5b6a03a8bddd6675d1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1702/2561] litecoin: rebuild for protobuf-3.20.1

---
 srcpkgs/litecoin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index ed98488c14b1..1e973e9cdc77 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
 # Template file for 'litecoin'
 pkgname=litecoin
 version=0.18.1
-revision=5
+revision=6
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
  --disable-tests --with-openssl"

From 7618aaa31dda0bf3913b0082b0688db16c94c9da Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1703/2561] mixxx: rebuild for protobuf-3.20.1

---
 srcpkgs/mixxx/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 9eedd269bc7e..712ce645098b 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
 # Template file for 'mixxx'
 pkgname=mixxx
 version=2.2.4
-revision=11
+revision=12
 wrksrc="mixxx-release-${version}"
 build_style=scons
 hostmakedepends="pkg-config protobuf"

From ed24dcd1280cfbc2e97901a14befe8d965f8bae4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1704/2561] mosh: rebuild for protobuf-3.20.1

---
 srcpkgs/mosh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 3ff5d593ea64..ddfdb29fd43a 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,7 +1,7 @@
 # Template file for 'mosh'
 pkgname=mosh
 version=1.3.2
-revision=24
+revision=25
 build_style=gnu-configure
 hostmakedepends="pkg-config protobuf"
 makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"

From acd06af77ba2814cfd0bbf45d958f2a530403000 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1705/2561] mozc: rebuild for protobuf-3.20.1

---
 srcpkgs/mozc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index 3b0a01c254da..8a43596a41d5 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -3,7 +3,7 @@ pkgname=mozc
 # src/data/version/mozc_version_template.bzl
 # revision is always 102, template always says 100 ;)
 version=2.26.4632.102
-revision=2
+revision=3
 _commit=06024d8567dd96eea7a1745e82a5d699a56f4ba5
 _abseil=20211102.0
 create_wrksrc=yes

From 249ea1ce037390407078184a9026224b6516970f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1706/2561] mumble: rebuild for protobuf-3.20.1

---
 srcpkgs/mumble/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index 9c158c6e8efd..24f30f5e019d 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
 # Template file for 'mumble'
 pkgname=mumble
 version=1.4.230
-revision=3
+revision=4
 wrksrc=mumble-${version}.src
 build_style=cmake
 make_cmd=make

From 63322b48b8b4007d45e799393214ba4680423533 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:41 -0400
Subject: [PATCH 1707/2561] nsjail: rebuild for protobuf-3.20.1

---
 srcpkgs/nsjail/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index ed03a8949a64..673f1882b97f 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -1,7 +1,7 @@
 # Template file for 'nsjail'
 pkgname=nsjail
 version=3.0
-revision=7
+revision=8
 build_style=gnu-makefile
 hostmakedepends="bison flex pkg-config protobuf which"
 makedepends="libnl3-devel protobuf-devel"

From 3a4ffee1479f454f1071bc9291e50b040d14bd4f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:42 -0400
Subject: [PATCH 1708/2561] strawberry: rebuild for protobuf-3.20.1

---
 srcpkgs/strawberry/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 31e5da77a346..c9eb95bbd85e 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -1,7 +1,7 @@
 # Template file for 'strawberry'
 pkgname=strawberry
 version=0.9.3
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config protobuf gettext"
 makedepends="alsa-lib-devel boost-devel gnutls-devel fftw-devel

From 8b57a8a5521c114389985d9482cd42be71083497 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:42 -0400
Subject: [PATCH 1709/2561] sysdig: rebuild for protobuf-3.20.1

---
 srcpkgs/sysdig/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index e0c59ec03489..b375b8b95491 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
 # Template file for 'sysdig'
 pkgname=sysdig
 version=0.28.0
-revision=4
+revision=5
 build_style=cmake
 configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
  -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF

From 3e6fd759757f54456ef56d9d1baf0e4ce7b5865b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:42 -0400
Subject: [PATCH 1710/2561] usbguard: rebuild for protobuf-3.20.1

---
 srcpkgs/usbguard/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index e5039446e584..1c2a323c8f42 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
 # Template file for 'usbguard'
 pkgname=usbguard
 version=1.0.0
-revision=6
+revision=7
 build_style=gnu-configure
 configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
 conf_files="/etc/usbguard/*"

From 5c9291b308545a3ae42ea0b086248f72bca45ddd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 08:18:42 -0400
Subject: [PATCH 1711/2561] vlc: rebuild for protobuf-3.20.1

---
 srcpkgs/vlc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index bdcf4ff726cd..69d14f330ed5 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=3.0.17.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
  --enable-live555 --disable-fluidsynth --enable-dvdread

From 29d559800b62fa2c122846a44ffd3e40d4813aa2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 25 Apr 2022 23:12:48 -0400
Subject: [PATCH 1712/2561] kubefwd: fix linking on cross

---
 srcpkgs/kubefwd/template | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 8aa2f1b456d8..e779e7ae9ff3 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -12,6 +12,9 @@ homepage="https://github.com/txn2/kubefwd"
 distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz"
 checksum=ce7ed2d054a594c9471b1ef777d024186ac427f7d0db8422fda96ede26238f9e
 
+# fix: collect2: fatal error: cannot find 'ld'
+export LDFLAGS="-fuse-ld=bfd"
+
 post_install() {
 	vlicense NOTICE
 }

From 29750b4604279113866169f46f3b1365d01b45ff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:02:55 +0200
Subject: [PATCH 1713/2561] libtls: update to 3.5.2.

---
 common/shlibs           | 2 +-
 srcpkgs/libtls/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index a437c5742ede..58db2bb112f5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3539,7 +3539,7 @@ libmanette-0.2.so.0 libmanette-0.2.1_1
 libfmt.so.8 fmt-8.0.1_1
 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
 libolm.so.3 olm-3.0.0_1
-libtls.so.22 libtls-3.4.1_1
+libtls.so.25 libtls-3.5.2_1
 libxmlb.so.2 libxmlb-0.2.1_1
 libvoikko.so.1 libvoikko-4.2_1
 libfstrcmp.so.0 libfstrcmp-0.7.D001_1
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index f8217c020c65..4fa641e00827 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,6 +1,6 @@
 # Template file for 'libtls'
 pkgname=libtls
-version=3.4.3
+version=3.5.2
 revision=1
 wrksrc="libressl-${version}"
 build_style=gnu-configure
@@ -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=ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d
+checksum=56feab8e21c3fa6549f8b7d7511658b8e98518162838a795314732654adf3e5f
 _lssl_asm_ver="1.2.0"
 replaces="libtls20>0"
 

From e700d24869a1d435107e00512fd51b475fe71b3d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:01:50 +0200
Subject: [PATCH 1714/2561] catgirl: rebuild for libtls-3.5.2.

---
 srcpkgs/catgirl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index d110f03f1fbc..9025181a1bb6 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,7 +1,7 @@
 # Template file for 'catgirl'
 pkgname=catgirl
 version=2.1
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"

From fd9f4ae4e1ad673430cd2eaed9d68125d361d123 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:02:03 +0200
Subject: [PATCH 1715/2561] litterbox: rebuild for libtls-3.5.2.

---
 srcpkgs/litterbox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index 03f412ee709c..433697392dc9 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,7 +1,7 @@
 # Template file for 'litterbox'
 pkgname=litterbox
 version=1.8
-revision=2
+revision=3
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"

From a39055b78a5e436a8b4e947386029b5f54b272f7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:02:12 +0200
Subject: [PATCH 1716/2561] openntpd: rebuild for libtls-3.5.2.

---
 srcpkgs/openntpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index 17565797cec7..d910495a7ea4 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,7 +1,7 @@
 # Template file for 'openntpd'
 pkgname=openntpd
 version=6.8p1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-privsep-user=openntpd --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"

From 4c508ed1f4e8f442e2f053cf8f4cc7f14efe3857 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:02:22 +0200
Subject: [PATCH 1717/2561] pounce: rebuild for libtls-3.5.2.

---
 srcpkgs/pounce/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 3ac742851872..4fec47dc7ba7 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,7 +1,7 @@
 # Template file for 'pounce'
 pkgname=pounce
 version=3.0
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_target="all"
 hostmakedepends="pkg-config"

From 1683fda3362e036195c837414c19d760bf88b53f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:02:34 +0200
Subject: [PATCH 1718/2561] sacc: rebuild for libtls-3.5.2.

---
 srcpkgs/sacc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sacc/template b/srcpkgs/sacc/template
index 39e1edb01681..c07aef1a4c3b 100644
--- a/srcpkgs/sacc/template
+++ b/srcpkgs/sacc/template
@@ -1,7 +1,7 @@
 # Template file for 'sacc'
 pkgname=sacc
 version=1.05
-revision=1
+revision=2
 build_style="gnu-makefile"
 makedepends="ncurses-devel libtls-devel"
 short_desc="Terminal gopher client"

From 0ce9252dfd8cdeaf3a6fe65bed828c3820d53930 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Apr 2022 13:41:52 +0200
Subject: [PATCH 1719/2561] crash: update to 8.0.1.

---
 srcpkgs/crash/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index 7f158c9ed635..fadb3fcbcb6c 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,7 +1,7 @@
 # Template file for 'crash'
 pkgname=crash
-version=8.0.0
-revision=2
+version=8.0.1
+revision=1
 archs="i686 x86_64"  # broken on musl
 build_style=gnu-makefile
 hostmakedepends="flex tar wget texinfo"
@@ -13,8 +13,9 @@ 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=caab49b7b6d442f60c41360e0ec80cf852dc64e89303b41d704d7661cef43e68
+checksum=233208b1433a49e1d5a063fa88e6fc9772b99fbb7b30ae79a2115d1b8f0dfc52
 nocross=yes
+disable_parallel_build=yes
 LDFLAGS=-llzo2
 
 post_extract() {

From 8496892c977b13d291d182994aa1fe49f8af38b1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Apr 2022 13:43:53 +0200
Subject: [PATCH 1720/2561] pax-utils: update to 1.3.4.

---
 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 757227de499a..75d38b714cbe 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.3.3
+version=1.3.4
 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=eeca7fbd98bc66bead4a77000c2025d9f17ea8201b84245882406ce00b9b6b14
+checksum=8baed2f9c5ae8e0cda1b9c75990864101afc64fad0a4616e10f3ff8ef891040b

From 2bdc2572b907393be94a4580c314809236616785 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Apr 2022 13:44:41 +0200
Subject: [PATCH 1721/2561] perl-LWP: update to 6.63.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index b878123cf002..c3fe1fd7ac9f 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.62
+version=6.63
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=569ac15eb69d54b2a8d932403610690b89c68d6a987eab2f627c0639bae7de18
+checksum=6e6a9479affdf23d7de91b6e2e1b903669af6296840a88c41e86d18067db7f17

From bc00ac8217138fbb0c560fc64148189046fcaca5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 26 Apr 2022 13:52:49 +0200
Subject: [PATCH 1722/2561] chez-scheme: update to 9.5.8.

---
 srcpkgs/chez-scheme/template | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/chez-scheme/template b/srcpkgs/chez-scheme/template
index e2369c47543c..3fe0b0a5d0d0 100644
--- a/srcpkgs/chez-scheme/template
+++ b/srcpkgs/chez-scheme/template
@@ -1,9 +1,8 @@
 # Template file for 'chez-scheme'
 pkgname=chez-scheme
-version=9.5.6
+version=9.5.8
 revision=1
-_nanopass_version=1.9.2
-wrksrc="ChezScheme-${version}"
+wrksrc="csv${version}"
 build_style=gnu-configure
 hostmakedepends="git libX11-devel liblz4-devel libuuid-devel ncurses-devel zlib-devel"
 makedepends="${hostmakedepends}"
@@ -11,10 +10,8 @@ short_desc="Compiler and run-time system for R6RS Scheme"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="http://scheme.com/"
-distfiles="https://github.com/cisco/ChezScheme/archive/v${version}.tar.gz
- https://github.com/nanopass/nanopass-framework-scheme/archive/v${_nanopass_version}.tar.gz"
-checksum="e23c556493f9a661852ea046f3317500feac5f223ea6ef3aa3b9234567e14c0e
- 46d3ab75f425ef93a6ac31f0b0b2f893b9cb3154219832ad52ea044dd36b021c"
+distfiles="https://github.com/cisco/ChezScheme/releases/download/v${version}/csv${version}.tar.gz"
+checksum=af83e80cbfe1a9a7c868e7c069a40c449fadd5e2a1737fd0f1260fc9d4159906
 alternatives="
  scheme:scheme:/usr/bin/chez-scheme
  scheme:scheme.1:/usr/share/man/man1/chez-scheme.1
@@ -34,19 +31,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*) broken="unsupported target platform";;
 esac
 
-post_extract() {
-	sed -i '/xlocale\.h/d' c/expeditor.c
-
-	# Create a dummy git repo and hack out submodules.
-	# Its presence stops 'configure' from downloading its own versions of nanopass etc.
-
-	mkdir .git
-	sed -i '/git submodule/s/^/: #/' configure
-
-	rmdir nanopass
-	mv ../nanopass-framework-scheme-${_nanopass_version} nanopass
-}
-
 do_configure() {
 	# Configure such that scheme uses the zlib and lz4 system shared libs.
 	# ZLIB and LZ4 is used when building the scheme kernel and use the full path.

From 7a4454468cfef6a9502d9f86867c229337b66d42 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 26 Apr 2022 18:41:20 +0200
Subject: [PATCH 1723/2561] cppcheck: update to 2.7.5.

---
 srcpkgs/cppcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index 13f7e7256004..4c3c71be5336 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -1,6 +1,6 @@
 # Template file for 'cppcheck'
 pkgname=cppcheck
-version=2.7
+version=2.7.5
 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=5fd20549bb2fabf9a8026f772779d8cc6a5782c8f17500408529f7747afbc526
+checksum=6c7ac29e57fa8b3ac7be224510200e579d5a90217e2152591ef46ffc947d8f78
 
 post_install() {
 	vman cppcheck.1

From c8574cdfb5d3e65d9aa24b8d2f6a2e196e2bdf96 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 26 Apr 2022 14:13:40 +0200
Subject: [PATCH 1724/2561] github-cli: update to 2.9.0

---
 srcpkgs/github-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 28c6acf2aaf5..744f8c4ddb11 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.8.0
-revision=2
+version=2.9.0
+revision=1
 wrksrc="cli-${version}"
 build_style=go
 build_helper=qemu
@@ -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=d4aed3f4325bc518cf4af6fc7989ab35b498e42e8f97ba0e6bb07d7e3b14886a
+checksum=730b600d33afb67d84af4dca1af80cb1fbff79d302ac4f840fc8e9e4c25fceb7
 
 pre_build() {
 	local _date

From 753ae346619f6fb3294bcc33e30070aa3dc835b1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 25 Apr 2022 14:28:55 -0400
Subject: [PATCH 1725/2561] .github/workflows/cycle.yml: fix error message
 related to git 2.35.2+

---
 .github/workflows/cycles.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index e75297ac937d..72c8d83b2c82 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -28,6 +28,7 @@ jobs:
          common/travis/prepare.sh
       - name: Find cycles and open issues
         run: |
+         git config --global --add safe.directory "$PWD"
          common/scripts/xbps-cycles.py | tee cycles
          grep 'Cycle:' cycles | while read -r line; do
              if gh issue list -R "$GITHUB_REPOSITORY" -S "$line" | grep .; then

From 6e2a7a8ac0bd92cac2bdf72220021cef55d3c130 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 26 Apr 2022 13:50:36 -0400
Subject: [PATCH 1726/2561] common/travis/fetch_upstream.sh: fix checkout dir

---
 common/travis/fetch_upstream.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index 5c0256fdbe17..049cfd69e54d 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -9,7 +9,7 @@ elif command -v git >/dev/null 2>&1; then
 fi
 
 # required by git 2.35.2+
-$GIT_CMD config --global --add safe.directory /__w/void-packages/void-packages
+$GIT_CMD config --global --add safe.directory "$PWD"
 
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
 $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From db13076f7da879ddbd019ca672de63d982da7247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 23 Apr 2022 13:12:36 +0200
Subject: [PATCH 1727/2561] xbps-src: add flag to build broken packages

helps to check if build can be fixed
---
 common/xbps-src/shutils/common.sh    | 33 +++++++++++++++++++++-------
 common/xbps-src/shutils/pkgtarget.sh |  3 +--
 xbps-src                             | 10 ++++++---
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 36038af980c9..a640528f4d6a 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -147,6 +147,23 @@ msg_normal() {
     fi
 }
 
+report_broken() {
+    if [ "$show_problems" = "ignore-problems" ]; then
+        return
+    fi
+    if [ -z "$XBPS_IGNORE_BROKENNESS" ]; then
+        for line in "$@"; do
+            msg_red "$line"
+        done
+        exit 2
+    elif [ "$XBPS_IGNORE_BROKENNESS" != reported ]; then
+        for line in "$@"; do
+            msg_warn "$line"
+        done
+        XBPS_IGNORE_BROKENNESS=reported
+    fi
+}
+
 msg_normal_append() {
     [ -n "$NOCOLORS" ] || printf "\033[1m"
     printf "$@"
@@ -644,14 +661,14 @@ setup_pkg() {
         wrksrc="$XBPS_BUILDDIR/$wrksrc"
     fi
 
-    if [ "$cross" -a "$nocross" -a "$show_problems" != "ignore-problems" ]; then
-        msg_red "$pkgver: cannot be cross compiled, exiting...\n"
-        msg_red "$pkgver: $nocross\n"
-        exit 2
-    elif [ "$broken" -a "$show_problems" != "ignore-problems" ]; then
-        msg_red "$pkgver: cannot be built, it's currently broken; see the build log:\n"
-        msg_red "$pkgver: $broken\n"
-        exit 2
+    if [ "$cross" -a "$nocross" ]; then
+        report_broken \
+            "$pkgver: cannot be cross compiled...\n" \
+            "$pkgver: $nocross\n"
+    elif [ "$broken" ]; then
+        report_broken \
+            "$pkgver: cannot be built, it's currently broken; see the build log:\n" \
+            "$pkgver: $broken\n"
     fi
 
     if [ -n "$restricted" -a -z "$XBPS_ALLOW_RESTRICTED" -a "$show_problems" != "ignore-problems" ]; then
diff --git a/common/xbps-src/shutils/pkgtarget.sh b/common/xbps-src/shutils/pkgtarget.sh
index 06fbcd844cc0..ba8c63bca8aa 100644
--- a/common/xbps-src/shutils/pkgtarget.sh
+++ b/common/xbps-src/shutils/pkgtarget.sh
@@ -34,8 +34,7 @@ check_pkg_arch() {
             esac
         done
         if [ -z "$nonegation" -a -n "$match" ] || [ -n "$nonegation" -a -z "$match" ]; then
-            msg_red "${pkgname}-${version}_${revision}: this package cannot be built for ${_arch}.\n"
-            exit 2
+            report_broken "${pkgname}-${version}_${revision}: this package cannot be built for ${_arch}.\n"
         fi
     fi
 }
diff --git a/xbps-src b/xbps-src
index 47023a723539..dfa059927cc2 100755
--- a/xbps-src
+++ b/xbps-src
@@ -150,6 +150,8 @@ Options:
 
 $(print_cross_targets)
 
+-b  Build packages even if marked as broken, nocross, or excluded with archs.
+
 -c  <configuration>
     If specified, etc/conf.<configuration> will be used as the primary config
     file name; etc/conf will only be attempted if that does not exist.
@@ -360,7 +362,7 @@ readonly XBPS_SRC_VERSION="113"
 export XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch)
 
 XBPS_OPTIONS=
-XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qsQKr:tV"
+XBPS_OPTSTRING="1a:bc:CEfgGhH:iIj:Lm:No:p:qsQKr:tV"
 
 # Preprocess arguments in order to allow options before and after XBPS_TARGET.
 eval set -- $(getopt "$XBPS_OPTSTRING" "$@");
@@ -372,6 +374,7 @@ while getopts "$XBPS_OPTSTRING" opt; do
     case $opt in
         1) XBPS_ARG_BUILD_ONLY_ONE_PKG=yes; XBPS_OPTIONS+=" -1";;
         a) XBPS_ARG_CROSS_BUILD="$OPTARG"; XBPS_OPTIONS+=" -a $OPTARG";;
+        b) XBPS_ARG_IGNORE_BROKENNESS=yes; XBPS_OPTIONS+=" -b";;
         c) XBPS_ARG_CONFIG="$OPTARG"; XBPS_OPTIONS+=" -c $OPTARG";;
         C) XBPS_ARG_KEEP_ALL=1; XBPS_OPTIONS+=" -C";;
         E) XBPS_ARG_BINPKG_EXISTS=1; XBPS_OPTIONS+=" -E";;
@@ -463,6 +466,7 @@ fi
 
 # Set options passed on command line, after configuration files have been read
 [ -n "$XBPS_ARG_BUILD_ONLY_ONE_PKG" ] && XBPS_BUILD_ONLY_ONE_PKG=yes
+[ -n "$XBPS_ARG_IGNORE_BROKENNESS" ] && XBPS_IGNORE_BROKENNESS=1
 [ -n "$XBPS_ARG_SKIP_REMOTEREPOS" ] && XBPS_SKIP_REMOTEREPOS=1
 [ -n "$XBPS_ARG_BUILD_FORCEMODE" ] && XBPS_BUILD_FORCEMODE=1
 [ -n "$XBPS_ARG_INFORMATIVE_RUN" ] && XBPS_INFORMATIVE_RUN=1
@@ -484,7 +488,7 @@ export XBPS_BUILD_ONLY_ONE_PKG XBPS_SKIP_REMOTEREPOS XBPS_BUILD_FORCEMODE \
        XBPS_INFORMATIVE_RUN XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \
        XBPS_USE_GIT_REVS XBPS_CHECK_PKGS XBPS_DEBUG_PKGS XBPS_SKIP_DEPS \
        XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_CROSS_BUILD \
-       XBPS_MAKEJOBS XBPS_PRINT_VARIABLES
+       XBPS_MAKEJOBS XBPS_PRINT_VARIABLES XBPS_IGNORE_BROKENNESS
 
 # The masterdir/hostdir variables are forced and readonly in chroot
 if [ -z "$IN_CHROOT" ]; then
@@ -644,7 +648,7 @@ export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \
     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_BUILD_ENVIRONMENT \
-    XBPS_PRESERVE_PKGS
+    XBPS_PRESERVE_PKGS XBPS_IGNORE_BROKENNESS
 
 for i in REPOSITORY DESTDIR BUILDDIR SRCDISTDIR; do
     eval val="\$XBPS_$i"

From dcb2c9e502a6b1b9fde3d3bae9d132953f09adc9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 26 Apr 2022 15:31:22 -0400
Subject: [PATCH 1728/2561] .github/workflows/cycles.yml: fix git command
 detection

---
 .github/workflows/cycles.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 72c8d83b2c82..d57976cbeed2 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -28,7 +28,13 @@ jobs:
          common/travis/prepare.sh
       - name: Find cycles and open issues
         run: |
-         git config --global --add safe.directory "$PWD"
+         if command -v chroot-git >/dev/null 2>&1; then
+             GIT_CMD=$(command -v chroot-git)
+         elif command -v git >/dev/null 2>&1; then
+            GIT_CMD=$(command -v git)
+         fi
+         # required by git 2.35.2+
+         $GIT_CMD config --global --add safe.directory "$PWD"
          common/scripts/xbps-cycles.py | tee cycles
          grep 'Cycle:' cycles | while read -r line; do
              if gh issue list -R "$GITHUB_REPOSITORY" -S "$line" | grep .; then

From 07e417fb4861b95063118b68ae596e982a24bd0b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 26 Apr 2022 15:36:00 -0500
Subject: [PATCH 1729/2561] ghidra: update to 10.1.3.

---
 srcpkgs/ghidra/template | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/ghidra/template b/srcpkgs/ghidra/template
index fc41784b2bca..0c8a621cae26 100644
--- a/srcpkgs/ghidra/template
+++ b/srcpkgs/ghidra/template
@@ -1,8 +1,8 @@
 # Template file for 'ghidra'
 pkgname=ghidra
-version=10.1.2
+version=10.1.3
 revision=1
-_commit=7d843ec229d43c2d1a8178aaa892be90e37e95a2
+_commit=939210dab2570714944ac35a4daef9633fd842b3
 archs="x86_64* aarch64*"
 # Other 64bit archs should be easily patchable,
 # grep for linux_arm_64 to find all places in need of patching
@@ -28,20 +28,20 @@ distfiles="https://github.com/NationalSecurityAgency/ghidra/archive/Ghidra_${ver
  https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vs2019_x86.fidb
  https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x64.fidb
  https://github.com/NationalSecurityAgency/ghidra-data/raw/${_commit}/FunctionID/vsOlder_x86.fidb"
-checksum="eac2ed632394f542da82a08578873f01e3890e2917f7d16ccb849f8b114a781c
+checksum="b1f8d68ba878a100da5205973e05f604f97c0a1f509150303cc47767a21e02e0
  7907eb4d6e9280b6e17ddce7ee0507eae2ef161ee29f70a10dbc6944fdca75bc
  430fb7901bd0fd52a5b90bd0cbd89e9d334077eb72a9b26896f465de1e593a99
  00ed038eb6abaf6ddec8d202a3ed7a81b521458f4cd459948115cfd02ff59d6d
- f26548a6df6b6963a418d8c83ac216d9e196b180d944a52b8123c457d472b7c9
- 0a8962cf3699d5b8d4b3a79400382462519edc26570a46b2085200e38534f900
- 187248f87fc1deb695bc3051b2d92f9b7482023a356821154db22478eed13088
- 1d05afa070e9c09b83ee15d544c8559ed0d2b53d7eac476f8f5f8849543b3812
- 1784ad6b25571177ff8212871867559998c6b8256bb1dbaeee864b580c1b2d6a
- bc9bf30621190e0eb56c4db5ec30ad0401ca7be0311f5a2ce3d894178eafd19c
- aab04eefd1142f7b3c3f86c8d766abe361b167b4fe4157c36fad18777b2a6fbd
- 0a2282ac3479ffc022e6cdb4e32e057bc10f0394cfb0f8016d7145be0167f5f7
- fe1856c0acad297d9ba4fb6a2df1d32ba34df766d9f1a2a16da0ca2b375e23dd
- 46e56bc82ba68ad4e9a3c6a2e4ecd3428e2c390c7de0a379fa0165a58d46e115"
+ 80d1c31c636b1775dd06001747dfb7e2ff60ff716299a8fcc232b8d2faa53a21
+ 8fc7ea9451b3a201ac3623b4a0924427cbb6bba410bdf9ebba4f2dfe8e77dfad
+ c3c16d23517c233d6950d5d43e34cdfa1b15c1ee2e066c8e9a53b4f75a907a87
+ 6fc0a61e935a0060ab33bd6406c9ca5f215ac3dff655f83c18f3d144ad389fe5
+ 5b0f8b8dee110d8c54fc27ed808ea28c2c675e95f3809e33eb99f03672741833
+ 2a81615d588aa80043f7bc3a35db04580c990c90398e77399fcffc66f053e5ac
+ 80413b57ae20fc1850d15a401d1cec87ac61b1809a1dafc2fa4403bf2029ec94
+ 68b96a4e13ee2c157517636aa1c7841f750fbfc0026188f6123af017f3fa3117
+ 2466595f6e74d9599e16095cc61c6de769461c935c20a442db1d2dfd2d7bde9b
+ 5b97f786eaebc785aaa365f17eb7cc9a1dd2b5a15b277a5229157ea76945fdc1"
 skip_extraction="AXMLPrinter2.jar  vs2012_x64.fidb vs2015_x64.fidb vs2017_x64.fidb vs2019_x64.fidb
  vsOlder_x64.fidb vsOlder_x86.fidb vs2012_x86.fidb vs2015_x86.fidb vs2017_x86.fidb vs2019_x86.fidb"
 nopie=yes

From e90a5efa5a2b2cdaa98f9e7feb5e362910165e14 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 26 Apr 2022 15:37:50 -0500
Subject: [PATCH 1730/2561] jc: update to 1.18.7.

---
 srcpkgs/jc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index 20a7438da19d..992b2ebc206c 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,7 +1,7 @@
 # Template file for 'jc'
 pkgname=jc
-version=1.18.6
-revision=2
+version=1.18.7
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-Pygments python3-ruamel.yaml python3-xmltodict"
@@ -11,4 +11,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/kellyjonbrazil/jc"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=5347188ed55762a0325d5d8f6a1ff3ec221b4ad548dee085fadc5fe10366af93
+checksum=eece56f592b04ddd19fb1fbac3ac6f0b27d6a731a05fb902813ccf0c0c78510d

From 5e2c1ed1534891e53e7509da584cd33d87191aa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 23:23:17 +0100
Subject: [PATCH 1731/2561] libvpx: rename subpackages to libvpx6-*

---
 srcpkgs/{libvpx-devel => libvpx6-devel} | 0
 srcpkgs/{libvpx-tools => libvpx6-tools} | 0
 srcpkgs/libvpx6/template                | 6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename srcpkgs/{libvpx-devel => libvpx6-devel} (100%)
 rename srcpkgs/{libvpx-tools => libvpx6-tools} (100%)

diff --git a/srcpkgs/libvpx-devel b/srcpkgs/libvpx6-devel
similarity index 100%
rename from srcpkgs/libvpx-devel
rename to srcpkgs/libvpx6-devel
diff --git a/srcpkgs/libvpx-tools b/srcpkgs/libvpx6-tools
similarity index 100%
rename from srcpkgs/libvpx-tools
rename to srcpkgs/libvpx6-tools
diff --git a/srcpkgs/libvpx6/template b/srcpkgs/libvpx6/template
index 8084243cc21d..a0e31b29ab81 100644
--- a/srcpkgs/libvpx6/template
+++ b/srcpkgs/libvpx6/template
@@ -4,7 +4,7 @@
 pkgname=libvpx6
 reverts="1.10.0_1"
 version=1.9.0
-revision=2
+revision=3
 wrksrc=libvpx-${version}
 hostmakedepends="perl yasm"
 short_desc="VP8 and VP9 video codec"
@@ -44,14 +44,14 @@ do_install() {
 	vlicense LICENSE
 }
 
-libvpx-tools_package() {
+libvpx6-tools_package() {
 	short_desc+=" - tools"
 	pkg_install() {
 		vmove usr/bin
 	}
 }
 
-libvpx-devel_package() {
+libvpx6-devel_package() {
 	depends="libvpx6>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {

From cef69c25141ec4bf9ea44dba8438705a663101b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 15:30:50 +0100
Subject: [PATCH 1732/2561] New package: libvpx7-1.11.0

---
 common/shlibs            |  1 +
 srcpkgs/libvpx-devel     |  1 +
 srcpkgs/libvpx-tools     |  1 +
 srcpkgs/libvpx7/template | 61 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+)
 create mode 120000 srcpkgs/libvpx-devel
 create mode 120000 srcpkgs/libvpx-tools
 create mode 100644 srcpkgs/libvpx7/template

diff --git a/common/shlibs b/common/shlibs
index 58db2bb112f5..6cba857e95a9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -819,6 +819,7 @@ libchamplain-0.12.so.0 libchamplain-0.12.5_2
 libchamplain-gtk-0.12.so.0 libchamplain-0.12.5_2
 libvpx.so.5 libvpx5-1.7.0_1
 libvpx.so.6 libvpx6-1.8.0_1
+libvpx.so.7 libvpx7-1.11.0_1
 libXevie.so.1 libXevie-1.0.2_1
 libatspi.so.0 at-spi2-core-1.91.91_1
 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
diff --git a/srcpkgs/libvpx-devel b/srcpkgs/libvpx-devel
new file mode 120000
index 000000000000..c7fce52cd7e0
--- /dev/null
+++ b/srcpkgs/libvpx-devel
@@ -0,0 +1 @@
+libvpx7
\ No newline at end of file
diff --git a/srcpkgs/libvpx-tools b/srcpkgs/libvpx-tools
new file mode 120000
index 000000000000..c7fce52cd7e0
--- /dev/null
+++ b/srcpkgs/libvpx-tools
@@ -0,0 +1 @@
+libvpx7
\ No newline at end of file
diff --git a/srcpkgs/libvpx7/template b/srcpkgs/libvpx7/template
new file mode 100644
index 000000000000..3526e2d28538
--- /dev/null
+++ b/srcpkgs/libvpx7/template
@@ -0,0 +1,61 @@
+# Template file for 'libvpx7'
+# updates generally break abi, so if you update this,
+# have fun rebuilding everything
+pkgname=libvpx7
+version=1.11.0
+revision=1
+wrksrc=libvpx-${version}
+hostmakedepends="perl yasm"
+short_desc="VP8 and VP9 video codec"
+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=965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83
+
+do_configure() {
+	export LD="$CC"
+	local target args
+
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) target="x86_64-linux-gcc" ;;
+		i686*) target="x86-linux-gcc" ;;
+		armv7*) target="armv7-linux-gcc"; args="--disable-neon" ;;
+		aarch64*) target="arm64-linux-gcc" ;;
+		*) target="generic-gnu";;
+	esac
+	CFLAGS+=" -fPIC"
+
+	./configure --enable-vp8 --enable-vp9 \
+		--enable-experimental \
+		--enable-runtime-cpu-detect --enable-shared \
+		--enable-postproc --enable-pic --disable-install-docs \
+		--disable-install-srcs --as=yasm ${args} --target=${target}
+}
+
+do_build() {
+	make ${makejobs}
+}
+
+do_install() {
+	make DIST_DIR=${DESTDIR}/usr install
+	vlicense LICENSE
+}
+
+libvpx-tools_package() {
+	short_desc+=" - tools"
+	pkg_install() {
+		vmove usr/bin
+	}
+}
+
+libvpx-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 53be5d5b7091af1c4ff58f7e00ba8dfa52111b50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 14:50:31 +0100
Subject: [PATCH 1733/2561] telegram-desktop: update to 3.7.3.

---
 srcpkgs/telegram-desktop/patches/cross.patch | 11 +++++++++++
 srcpkgs/telegram-desktop/template            | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/telegram-desktop/patches/cross.patch

diff --git a/srcpkgs/telegram-desktop/patches/cross.patch b/srcpkgs/telegram-desktop/patches/cross.patch
new file mode 100644
index 000000000000..47fcb4bbb338
--- /dev/null
+++ b/srcpkgs/telegram-desktop/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/cmake/external/kwayland/CMakeLists.txt	2022-04-19 14:57:00.000000000 +0200
++++ -	2022-04-26 18:18:21.919838146 +0200
+@@ -32,6 +32,8 @@
+         -DCMAKE_INSTALL_PREFIX=<BINARY_DIR>
+         -DCMAKE_INSTALL_DATADIR=share
+         -DBUILD_TESTING=OFF
++	-DQT_HOST_PATH=/usr
++	-DQtWaylandScanner_EXECUTABLE=/usr/lib/qt6/libexec/qtwaylandscanner
+     BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR>
+     COMMAND ${CMAKE_COMMAND} --install <BINARY_DIR>
+     STEP_TARGETS build
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index d778d218ef30..0199fe9ddceb 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'telegram-desktop'
 pkgname=telegram-desktop
-version=3.4.8
+version=3.7.3
 revision=1
 wrksrc="tdesktop-${version}-full"
 build_style=cmake
@@ -11,23 +11,23 @@ configure_args="-DTDESKTOP_API_ID=209235
  -DTDESKTOP_LAUNCHER_BASENAME=org.telegram.desktop.desktop
  -DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true')
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
- -DDESKTOP_APP_QT6=OFF"
-hostmakedepends="pkg-config qt5-qmake qt5-host-tools python extra-cmake-modules
- wayland-devel qt5-devel qt5-wayland-devel"
+ -DQT_HOST_PATH=/usr"
+hostmakedepends="pkg-config qt6-base-devel python3 extra-cmake-modules
+ qt6-wayland-devel wayland-devel"
 makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
- minizip-devel opus-devel xxHash-devel pulseaudio-devel qt5-devel range-v3
- qt5-svg-devel libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel
- MesaLib-devel libdbusmenu-qt5-devel qt5-wayland-devel libatomic-devel
+ minizip-devel opus-devel xxHash-devel pulseaudio-devel range-v3
+ qt6-svg-devel libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel
+ MesaLib-devel qt6-wayland-devel qt6-qt5compat-devel libatomic-devel
  xcb-util-keysyms-devel $(vopt_if spellcheck hunspell-devel)
- kwayland-devel glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel"
-depends="qt5-imageformats qt5-svg qt5-core>=5.15.2<5.16.0 ttf-opensans"
+ glibmm-devel tg_owt webkit2gtk-devel rnnoise-devel jemalloc-devel"
+depends="qt6-imageformats ttf-opensans"
 short_desc="Telegram Desktop messaging app"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later, OpenSSL"
 homepage="https://desktop.telegram.org/"
 changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt"
 distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"
-checksum=6a962a1110bc15c21999832b0151af8125f33a3b6e978461b8f446217c76876e
+checksum=9735f30610ff62b01cbdb0b945d32c494cec245961023c9860d9dd5268b9fe1e
 
 build_options="spellcheck"
 build_options_default="spellcheck"

From 2d82ed877a76104e2a9fd3f08d2e07e8fe55a02d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 23:18:52 +0100
Subject: [PATCH 1734/2561] tg_owt: update to 0.0.0.20220413.

---
 srcpkgs/tg_owt/template | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 6afa56d321e4..3022048a7e76 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,10 +1,9 @@
 # Template file for 'tg_owt'
 pkgname=tg_owt
-version=0.0.0.20211207
+version=0.0.0.20220413
 revision=1
-_commit=d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589
+_commit=63a934db1ed212ebf8aaaa20f0010dd7b0d7b396
 _libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
-_libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
 wrksrc="tg_owt-$_commit"
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=OFF -DTG_OWT_ARCH_ARMV7_USE_NEON=OFF"
@@ -12,19 +11,18 @@ hostmakedepends="pkg-config yasm protobuf"
 makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
  pipewire-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel
  libevent-devel libXcomposite-devel libXrandr-devel libXdamage-devel
- libXrender-devel libglib-devel"
+ libepoxy-devel libdrm-devel libXrender-devel libglib-devel libgbm-devel
+ libvpx-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="@693bf80128946881c9dd357218c806c7e98f02daec02e076f1d123d3e6afc525
- @ea967f58e720be3a8f8105d48fedb983570679c8ced8ffbad48fb673089c7ed9
+checksum="@677f3dff8619e8e9e38ece55579ad10a5e162145644ec9afa11ac45dcd96904e
  @1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3"
-skip_extraction="${_libvpx_commit}.tar.gz ${_libyuv_commit}.tar.gz"
+skip_extraction="${_libyuv_commit}.tar.gz"
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
@@ -36,5 +34,4 @@ 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 7b6ca258af6ad1a60271aad7e3e742635ebb7346 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:30:57 +0200
Subject: [PATCH 1735/2561] qt6-3d: update to 6.3.0.

---
 srcpkgs/qt6-3d/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-3d/template b/srcpkgs/qt6-3d/template
index 06017e74ef5e..666f57559532 100644
--- a/srcpkgs/qt6-3d/template
+++ b/srcpkgs/qt6-3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-3d'
 pkgname=qt6-3d
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qt3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt3d-everywhere-src-${version}.tar.xz"
-checksum=ce5088048f151be2dd41600aa1132faa6cf8accfaaf4c40e60572384aef396ad
+checksum=74e762380dad34887878b9124dbfb981d5cf4b8b807281ff8bff311145b54de1
 
 qt6-3d-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 886b08de621d7b4b655c609f0851880ad572a201 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:30:59 +0200
Subject: [PATCH 1736/2561] qt6-base: update to 6.3.0.

---
 srcpkgs/qt6-base/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 3f840bf17c09..1f514441a7e8 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-base'
 pkgname=qt6-base
-version=6.2.2
-revision=2
+version=6.3.0
+revision=1
 wrksrc="qtbase-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DINSTALL_DATADIR=share/qt6
@@ -29,7 +29,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only WITH Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
-checksum=85ab9180180c2eaf84cd11ae4c6d5a6a69f2f8fd7260aaccfd91a3e7e7232c1a
+checksum=b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 124d956e78de6b5a855a131381764f50aaaddabb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:00 +0200
Subject: [PATCH 1737/2561] qt6-charts: update to 6.3.0.

---
 srcpkgs/qt6-charts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-charts/template b/srcpkgs/qt6-charts/template
index 0da284b2f9b0..79cb8a220401 100644
--- a/srcpkgs/qt6-charts/template
+++ b/srcpkgs/qt6-charts/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-charts'
 pkgname=qt6-charts
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtcharts-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtcharts-everywhere-src-${version}.tar.xz"
-checksum=8ffe724433af53a09892cce4e13b242cfcb6c67fef68295b0f29374460f16e7a
+checksum=672762c5f641ccc88a30aeedefb63f03c0f837649b334f46eea57592e87e36cd
 
 qt6-charts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 423555c03f872668814c3819ba6f1b9023ccc142 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:01 +0200
Subject: [PATCH 1738/2561] qt6-declarative: update to 6.3.0.

---
 srcpkgs/qt6-declarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-declarative/template b/srcpkgs/qt6-declarative/template
index fafd1f1505a9..e0bd28d9e383 100644
--- a/srcpkgs/qt6-declarative/template
+++ b/srcpkgs/qt6-declarative/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-declarative'
 pkgname=qt6-declarative
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtdeclarative-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtdeclarative-everywhere-src-${version}.tar.xz"
-checksum=1a04ef0092b31354e0fded0d8391865719cb58f9ca5dc604da2b1f62c742cf28
+checksum=d294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37
 replaces="qt6-quickcontrols2>=0"
 
 if [ "$CROSS_BUILD" ]; then

From f2ae31bca270df53adfbb243dbce13558d9d827b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:02 +0200
Subject: [PATCH 1739/2561] qt6-imageformats: update to 6.3.0.

---
 srcpkgs/qt6-imageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-imageformats/template b/srcpkgs/qt6-imageformats/template
index db47b21186d8..eaca95243c48 100644
--- a/srcpkgs/qt6-imageformats/template
+++ b/srcpkgs/qt6-imageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-imageformats'
 pkgname=qt6-imageformats
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtimageformats-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtimageformats-everywhere-src-${version}.tar.xz"
-checksum=214f6d552391a70d72ff534295ef06c59dba756b6323762967820963a15bd267
+checksum=025d0d17ed75b42a7eb6b523731ab8f17025421a8810cade25caffe05d93abef

From 9a304fdde408cdd38ab053a4320ac35131d0f161 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:03 +0200
Subject: [PATCH 1740/2561] qt6-location: update to 6.3.0.

---
 srcpkgs/qt6-location/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-location/template b/srcpkgs/qt6-location/template
index 9a895b81c63a..b7397f5f8942 100644
--- a/srcpkgs/qt6-location/template
+++ b/srcpkgs/qt6-location/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-location'
 pkgname=qt6-location
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtpositioning-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtpositioning-everywhere-src-${version}.tar.xz"
-checksum=26231545eae383089510b236e88bbee8a6d338c06c170b674e8f36a57a0ba09a
+checksum=e9ed50f6b245a346db34d625d0012774ef0ec8e7fd65037127ec26758708236e
 
 qt6-location-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From cf484013975ae1bce056ef2d59935918baa41ce0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:04 +0200
Subject: [PATCH 1741/2561] qt6-lottie: update to 6.3.0.

---
 srcpkgs/qt6-lottie/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-lottie/template b/srcpkgs/qt6-lottie/template
index 75a2d476e08c..1c97cd5f4f32 100644
--- a/srcpkgs/qt6-lottie/template
+++ b/srcpkgs/qt6-lottie/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-lottie'
 pkgname=qt6-lottie
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtlottie-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtlottie-everywhere-src-${version}.tar.xz"
-checksum=9c2ac91b9f5dc860d211ed9f3c1e3965dbb4665ace4af735e96b6328990fd74f
+checksum=39db570bbba5b527a1eb6a5774bed47398ace2f7217bbf45b1194ada6cf97deb
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From b3594a0cb90753c2ea266b883c03060044c85bda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:05 +0200
Subject: [PATCH 1742/2561] qt6-networkauth: update to 6.3.0.

---
 srcpkgs/qt6-networkauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-networkauth/template b/srcpkgs/qt6-networkauth/template
index bc7e7fd8b4cc..e934beada9b0 100644
--- a/srcpkgs/qt6-networkauth/template
+++ b/srcpkgs/qt6-networkauth/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-networkauth'
 pkgname=qt6-networkauth
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtnetworkauth-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtnetworkauth-everywhere-src-${version}.tar.xz"
-checksum=c8217c740167b9e96c3fabcc92d781864220c553c7a23254c16bd8f09f05e9e1
+checksum=203a98942919028520038f90a20cd7ee32b537233545d11e429c3e2c1ad9069f
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 988af82f19c03621e88eaa013b7fd83159491313 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:06 +0200
Subject: [PATCH 1743/2561] qt6-qt5compat: update to 6.3.0.

---
 srcpkgs/qt6-qt5compat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index 5900458ab145..641b746c2176 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
 # Template file for 'qt6-qt5compat'
 pkgname=qt6-qt5compat
-version=6.2.2
-revision=2
+version=6.3.0
+revision=1
 wrksrc="qt5compat-everywhere-src-${version}"
 build_style=cmake
 configure_args="-DQT_HOST_PATH=/usr"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qt5compat-everywhere-src-${version}.tar.xz"
-checksum=a5bb33d9df1d99e5afc21b0d0a36b79aa98829e2b1bee03c811ad69b79276bad
+checksum=2b199be780c50d9214512b922d94cb240b0412fd63f459e356b76102cad1713e
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 873a5b1f4be1b68f3a45cc28f243ca3c4a4512cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:08 +0200
Subject: [PATCH 1744/2561] qt6-quick3d: update to 6.3.0.

---
 common/shlibs                | 2 ++
 srcpkgs/qt6-quick3d/template | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 6cba857e95a9..60b4402c8bd2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2037,6 +2037,8 @@ libQt6Quick3DUtils.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DAssetImport.so.6 qt6-quick3d-6.0.0_1
 libQt6Quick3DIblBaker.so.6 qt6-quick3d-6.0.3_1
 libQt6Quick3DParticles.so.6 qt6-quick3d-6.1.0_1
+libQt6Quick3DGlslParser.so.6 qt6-quick3d-6.3.0_1
+libQt6Quick3DAssetUtils.so.6 qt6-quick3d-6.1.0_1
 libQt6QuickControls2Impl.so.6 qt6-declarative-6.0.0_1
 libQt6QuickControls2.so.6 qt6-declarative-6.0.0_1
 libQt6QuickTemplates2.so.6 qt6-declarative-6.0.0_1
diff --git a/srcpkgs/qt6-quick3d/template b/srcpkgs/qt6-quick3d/template
index 2bafca923bef..0f7ef336a3ff 100644
--- a/srcpkgs/qt6-quick3d/template
+++ b/srcpkgs/qt6-quick3d/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quick3d'
 pkgname=qt6-quick3d
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtquick3d-everywhere-src-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtquick3d-everywhere-src-${version}.tar.xz"
-checksum=be7ef8a36e84cb2f05edfd238d98899478eefbd56a5fecc7d570ce5848b5364b
+checksum=0ad05bd1ee1f784b18220a2d2625ee8de91662c88fdc7b798662953d86eb327e
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	# possibly a qt6-shadertools bug, actually

From 148e5fccc7b18bae072a73a518f023b2c8ae8dae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:09 +0200
Subject: [PATCH 1745/2561] qt6-quicktimeline: update to 6.3.0.

---
 srcpkgs/qt6-quicktimeline/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-quicktimeline/template b/srcpkgs/qt6-quicktimeline/template
index ad3155c453e0..15aa7a8e5819 100644
--- a/srcpkgs/qt6-quicktimeline/template
+++ b/srcpkgs/qt6-quicktimeline/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-quicktimeline'
 pkgname=qt6-quicktimeline
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtquicktimeline-everywhere-src-${version/rc/-rc}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version/rc/-rc}/submodules/qtquicktimeline-everywhere-src-${version/rc/-rc}.tar.xz"
-checksum=939d5479b035f674dd669b3e084ec9688eaea62763d2a7ad134630ff20efd479
+checksum=9ff0a931159efc6be5bd9f8a1e4a16a70e2dab37cf22ad85c6d330ccfdf31c1a
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From c0fed8e7ec2451e5467e89472e91d1f194d950dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:10 +0200
Subject: [PATCH 1746/2561] qt6-scxml: update to 6.3.0.

---
 srcpkgs/qt6-scxml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-scxml/template b/srcpkgs/qt6-scxml/template
index eaf992803dbd..112baca0ab83 100644
--- a/srcpkgs/qt6-scxml/template
+++ b/srcpkgs/qt6-scxml/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-scxml'
 pkgname=qt6-scxml
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtscxml-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtscxml-everywhere-src-${version}.tar.xz"
-checksum=b71d438c5e4106532cf48833116241bc48c0c4effe617770ae80e34bb77e92ed
+checksum=09b0dbd6ac367920fb1ba96a39dcd4c9d33eb0820dcc79538992825d588a70f0
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 6fd13040740c52bd50e5fc9eb4fec050904feeee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:11 +0200
Subject: [PATCH 1747/2561] qt6-serialport: update to 6.3.0.

---
 srcpkgs/qt6-serialport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-serialport/template b/srcpkgs/qt6-serialport/template
index e4763e3f4162..0804671ca57b 100644
--- a/srcpkgs/qt6-serialport/template
+++ b/srcpkgs/qt6-serialport/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-serialport'
 pkgname=qt6-serialport
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtserialport-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtserialport-everywhere-src-${version}.tar.xz"
-checksum=5555aae0332df90c7d955381a758a2b918b6e65e2148da8003c1fb2f9cf9640a
+checksum=eebd6934d48cc044b8c87795a4fd91bb81f7195d4b5a2ddb12802f343d5db64f
 
 qt6-serialport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From b3f609c7df36856c78a4b8b8c19f3c1a4332649a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:12 +0200
Subject: [PATCH 1748/2561] qt6-shadertools: update to 6.3.0.

---
 srcpkgs/qt6-shadertools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-shadertools/template b/srcpkgs/qt6-shadertools/template
index 72cfb47e50a9..9c1ec210a96a 100644
--- a/srcpkgs/qt6-shadertools/template
+++ b/srcpkgs/qt6-shadertools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-shadertools'
 pkgname=qt6-shadertools
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtshadertools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtshadertools-everywhere-src-${version}.tar.xz"
-checksum=f97505e72358c1fa2a2131c3a9a5b3497a2b9ea65b75a5beaf7f46c4b56a89e5
+checksum=5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c
 
 qt6-shadertools-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 75a80f51f12f92ca4fef6c56b05164b1663c91f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:13 +0200
Subject: [PATCH 1749/2561] qt6-svg: update to 6.3.0.

---
 srcpkgs/qt6-svg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-svg/template b/srcpkgs/qt6-svg/template
index 51ad5f24aea3..aa8e6b745109 100644
--- a/srcpkgs/qt6-svg/template
+++ b/srcpkgs/qt6-svg/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-svg'
 pkgname=qt6-svg
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtsvg-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtsvg-everywhere-src-${version}.tar.xz"
-checksum=e1bd63932fa16468bc737a38b0060431f67a6073f4101ede188eb47a191abd75
+checksum=3164504d7e3f640439308235739b112605ab5fc9cc517ca0b28f9fb93a8db0e3
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 95d3c0a8da297954f4f5f124ad5888a8c5e1b353 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:14 +0200
Subject: [PATCH 1750/2561] qt6-tools: update to 6.3.0.

---
 srcpkgs/qt6-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index 768fc552fb75..f875dff5c046 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qttools-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
-checksum=c0542ecb4a0aec21246a1cb5cd9f8f51b368929ce2065a455b13c3b47a94ecd1
+checksum=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 02b3f80222d8801b78f198e5c1a11349dc7aa2ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:15 +0200
Subject: [PATCH 1751/2561] qt6-translations: update to 6.3.0.

---
 srcpkgs/qt6-translations/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-translations/template b/srcpkgs/qt6-translations/template
index ee844d48b010..be0a74ca74e2 100644
--- a/srcpkgs/qt6-translations/template
+++ b/srcpkgs/qt6-translations/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-translations'
 pkgname=qt6-translations
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qttranslations-everywhere-src-${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttranslations-everywhere-src-${version}.tar.xz"
-checksum=fc9244224c6e9930035e7efc8b6b541c739aa4cccf46de9779bc3f64d8e94c8f
+checksum=e4dd4ef892a34a9514a19238f189a33ed85c76f31dcad6599ced93b1e33440b3

From 0646d14bee5c466d6021c0cf46caf1b96acbdeb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:16 +0200
Subject: [PATCH 1752/2561] qt6-virtualkeyboard: update to 6.3.0.

---
 srcpkgs/qt6-virtualkeyboard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-virtualkeyboard/template b/srcpkgs/qt6-virtualkeyboard/template
index 1fba027d4582..67ecef145ea1 100644
--- a/srcpkgs/qt6-virtualkeyboard/template
+++ b/srcpkgs/qt6-virtualkeyboard/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-virtualkeyboard'
 pkgname=qt6-virtualkeyboard
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtvirtualkeyboard-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtvirtualkeyboard-everywhere-src-${version}.tar.xz"
-checksum=9973c1a703e717936858a8e81eeef1372e6830127f9729013f9da3c2870561a5
+checksum=89aaf15acf5432af8f5cf4ec45cb32d87a3348906215dd56e81cb294eb276573
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 773f6605d2c5d22b4f5e66061ecd290291598fad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:17 +0200
Subject: [PATCH 1753/2561] qt6-wayland: update to 6.3.0.

---
 srcpkgs/qt6-wayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-wayland/template b/srcpkgs/qt6-wayland/template
index a13e6e52ff52..b71a273009b9 100644
--- a/srcpkgs/qt6-wayland/template
+++ b/srcpkgs/qt6-wayland/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-wayland'
 pkgname=qt6-wayland
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtwayland-everywhere-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwayland-everywhere-src-${version}.tar.xz"
-checksum=2d3652b3ecb5d8c9493c938b3d379dd700800859bb19033e8024e29d8deb3618
+checksum=e7b567f6e43ffc5918d4aa825ce1eced66a00cb0a87133b2912ba5c1b2a02190
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"

From 5bf701e48f530da803c065fd45a3037d0bf67464 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Apr 2022 23:31:18 +0200
Subject: [PATCH 1754/2561] qt6-websockets: update to 6.3.0.

---
 srcpkgs/qt6-websockets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt6-websockets/template b/srcpkgs/qt6-websockets/template
index a8a471e485fb..c2e674aacb31 100644
--- a/srcpkgs/qt6-websockets/template
+++ b/srcpkgs/qt6-websockets/template
@@ -1,6 +1,6 @@
 # Template file for 'qt6-websockets'
 pkgname=qt6-websockets
-version=6.2.2
+version=6.3.0
 revision=1
 wrksrc="qtwebsockets-everywhere-src-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="(LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only) AND GPL-3.0-only with Qt-GPL-exception-1.0"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtwebsockets-everywhere-src-${version}.tar.xz"
-checksum=8847a8bf0da6741b0bb22883c760037488c2d336fccc8cdb0b4e368f034c2076
+checksum=e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361
 
 qt6-websockets-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} qt6-base-devel>=${version}_1"

From 3c7b0b3161d07001e8a35c85cc364d63c4622efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 26 Apr 2022 19:24:22 +0200
Subject: [PATCH 1755/2561] doctl: update to 1.73.1.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index e42f75c749fd..23fbb957a0b4 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.73.0
+version=1.73.1
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -14,4 +14,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=cc7a6f91febf4d40f8afca0fe4ddfa7aa9be3572e3a0124fca2865e35b52ef00
+checksum=cada668df915bf4eaa7ef271ab0920002b2bc7f9b6b3cbd8598481646c52d4e8

From ab57ee6539a54841a3c1de66a2455b576fd8eb21 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 27 Apr 2022 04:23:40 +0200
Subject: [PATCH 1756/2561] nvme-cli: fix build on musl

---
 srcpkgs/nvme-cli/patches/musl.patch | 18 ++++++++++++++++++
 srcpkgs/nvme-cli/template           |  8 +++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/nvme-cli/patches/musl.patch

diff --git a/srcpkgs/nvme-cli/patches/musl.patch b/srcpkgs/nvme-cli/patches/musl.patch
new file mode 100644
index 000000000000..4ebfba11d38f
--- /dev/null
+++ b/srcpkgs/nvme-cli/patches/musl.patch
@@ -0,0 +1,18 @@
+commit ddf3610e8326d014360c9550d54a73f97b40e862
+Author: q66 <daniel@octaforge.org>
+Date:   Wed Apr 27 04:20:41 2022 +0200
+
+    fix build on musl
+
+diff --git a/util/base64.c b/util/base64.c
+index e386c11..dad4492 100644
+--- a/util/base64.c
++++ b/util/base64.c
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <sys/types.h>
+ 
+ static const char base64_table[65] =
+ 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 9b142b02de0f..d4e7bc892403 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -5,7 +5,7 @@ revision=1
 build_style=meson
 configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
 hostmakedepends="pkg-config"
-makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel libhugetlbfs-devel"
+makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel"
 short_desc="NVMe management command line interface"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
@@ -14,6 +14,12 @@ distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
 checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c
 conf_files="/etc/nvme/*.conf"
 
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+	makedepends+=" libhugetlbfs-devel"
+else
+	CFLAGS="-D_GNU_SOURCE"
+fi
+
 post_install() {
 	# remove files that are systemd-only
 	rm -rf "${DESTDIR}/usr/lib/systemd"

From 452134c63e40e7ff4b67bc11905ba751a31d2c1a Mon Sep 17 00:00:00 2001
From: atweiden <atweiden@ioiojo.com>
Date: Wed, 27 Apr 2022 04:59:12 +0800
Subject: [PATCH 1757/2561] MoarVM: update to 2022.04.

---
 srcpkgs/MoarVM/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index 9386751ab79a..e48fd6c8af8e 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2022.03
+version=2022.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=fb71cd13912464482b99b33f0c06e9fd7c51a151c6e632a9220cf93c5855fdaf
+checksum=ae06f50ba5562721a4e5eb6457e2fea2d07eda63e2abaa8c939c9daf70774804
 nocross=yes
 shlib_provides="libmoar.so"

From 42deac25abbe51d5193bcda286e8525cfd620410 Mon Sep 17 00:00:00 2001
From: atweiden <atweiden@ioiojo.com>
Date: Wed, 27 Apr 2022 05:00:16 +0800
Subject: [PATCH 1758/2561] nqp: update to 2022.04.

---
 srcpkgs/nqp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index 52ec0153fe05..4d698dd1aa73 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2022.03
+version=2022.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=a95e778970c4d09c091d2aa299c05036208ce4b4b0d3a7af373198c12258b306
+checksum=556d458e25d3c0464af9f04ea3e92bbde10046066b329188a88663943bd4e79c
 nocross=yes

From db6260402c69d9113d87f58be8cb4c18b959ac38 Mon Sep 17 00:00:00 2001
From: atweiden <atweiden@ioiojo.com>
Date: Wed, 27 Apr 2022 05:01:19 +0800
Subject: [PATCH 1759/2561] rakudo: update to 2022.04.

---
 srcpkgs/rakudo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 6a0345b57907..67fd64f1ebb5 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2022.03
+version=2022.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=03e215b001a879747618d6fc18eb7f89c0b812f5e543a43ed66c13439ea8a227
+checksum=7e13a8cc927efbe86b8ff7b19155a60a6f6e2b6e2952bd690dcacef2d02a1c74
 nocross=yes
 provides="raku-${version}_${revision}"
 

From 7ce7ce007857f53cd56748a805f1c1d747d29271 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 25 Apr 2022 14:48:04 +0300
Subject: [PATCH 1760/2561] gawk: update to 5.1.1.

---
 srcpkgs/gawk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template
index b922097b01f7..b5f624bebf45 100644
--- a/srcpkgs/gawk/template
+++ b/srcpkgs/gawk/template
@@ -1,6 +1,6 @@
 # Template file for 'gawk'
 pkgname=gawk
-version=5.1.0
+version=5.1.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-readline"
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=cf5fea4ac5665fd5171af4716baab2effc76306a9572988d5ba1078f196382bd
+checksum=d87629386e894bbea11a5e00515fc909dc9b7249529dad9e6a3a2c77085f7ea2
 lib32disabled=yes
 
 provides="awk-0_1"

From f6c5e16a6d7b0394113512634a94294e15f373d5 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 22 Apr 2022 08:43:08 -0400
Subject: [PATCH 1761/2561] hexedit: update to 1.6.

---
 srcpkgs/hexedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hexedit/template b/srcpkgs/hexedit/template
index a7840b7a3ddd..eb73aa150c1c 100644
--- a/srcpkgs/hexedit/template
+++ b/srcpkgs/hexedit/template
@@ -1,6 +1,6 @@
 # Template file for 'hexedit'
 pkgname=hexedit
-version=1.5
+version=1.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake"
@@ -10,7 +10,7 @@ maintainer="Jim Westfall <jwestfall@surrealistic.net>"
 license="GPL-2.0-or-later"
 homepage="http://rigaux.org"
 distfiles="https://github.com/pixel/hexedit/archive/${version}.tar.gz"
-checksum=27a2349f659e995d7731ad672450f61a2e950330049a6fb59b77490c5e0015ac
+checksum=598906131934f88003a6a937fab10542686ce5f661134bc336053e978c4baae3
 
 pre_configure() {
 	./autogen.sh

From 64e60be91e27c2ea83fe705e72f0c819bafe0e80 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Sat, 23 Apr 2022 18:26:03 +0200
Subject: [PATCH 1762/2561] texlive-bin: export MANPATH

---
 srcpkgs/texlive-bin/INSTALL.msg      | 18 +++++++++---------
 srcpkgs/texlive-bin/files/texlive.sh |  4 +++-
 srcpkgs/texlive-bin/template         |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/texlive-bin/INSTALL.msg b/srcpkgs/texlive-bin/INSTALL.msg
index 72c1e0fe9a33..58930b757fd0 100644
--- a/srcpkgs/texlive-bin/INSTALL.msg
+++ b/srcpkgs/texlive-bin/INSTALL.msg
@@ -1,29 +1,29 @@
-- TeXLive is free software see the files:
+- TeX Live is free software see the files:
 
   /usr/share/licenses/texlive-bin/LICENSE.TL
   /usr/share/licenses/texlive-bin/LICENSE.CTAN
 
 =====================================================================
 
-  This package sets the location of TeXLive binary using the file: 
-  /etc/profile.d/texlive.sh.
+  This package sets the location of TeX Live binaries and manual
+  pages using the file: /etc/profile.d/texlive.sh.
 
   see  http://www.tug.org/texlive/quickinstall.html for details 
 
-  Check if your PATH is update correctly with:
+  Check if your PATH and MANPATH are updated correctly with:
 
   $ printenv
 
-  You may need to reboot to ensure that PATH is update correctly,
-  for the impatients, if you want you can type
+  You may need to reboot to ensure that the paths are updated
+  correctly, for the impatients, if you want you can type
 
   $ source /etc/profile
 
-  and check the PATH.
+  and check PATH and MANPATH.
 
 =====================================================================
 
-  To update you TeXLive installation use only the program 
+  To update you TeX Live installation use only the program
 
   /opt/texlive/${VERSION}/bin/<arch>/tlmgr.
 
@@ -37,5 +37,5 @@
   
   for the details and the documentation in 
     		 		 
-  WARNING: To avoid messing up your TeXLive installation, DON'T use
+  WARNING: To avoid messing up your TeX Live installation, DON'T use
   the installation scripts in /opt/texlive-installer.
diff --git a/srcpkgs/texlive-bin/files/texlive.sh b/srcpkgs/texlive-bin/files/texlive.sh
index c868d50fe1e7..fdf6faf899c6 100644
--- a/srcpkgs/texlive-bin/files/texlive.sh
+++ b/srcpkgs/texlive-bin/files/texlive.sh
@@ -1,2 +1,4 @@
-#location of the TeXLive binaries
+# location of the TeXLive binaries
 export PATH=$PATH:/opt/texlive/@@VERSION@@/bin/@@ARCH@@
+# and manual pages
+export MANPATH=$MANPATH:/opt/texlive/@@VERSION@@/texmf-dist/doc/man
diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template
index 26866c5e5841..05c3c33e1825 100644
--- a/srcpkgs/texlive-bin/template
+++ b/srcpkgs/texlive-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive-bin'
 pkgname=texlive-bin
 version=2022
-revision=1
+revision=2
 depends="texlive${version}-bin"
 short_desc="TeX Live Binary distribution through tl-install (newest version)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 1322810e8209c88218fd51cda937a5fe81b39c35 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 23 Apr 2022 10:59:41 +0200
Subject: [PATCH 1763/2561] iw: update to 5.16.

---
 srcpkgs/iw/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iw/template b/srcpkgs/iw/template
index e82a6792b111..8c63c60873cf 100644
--- a/srcpkgs/iw/template
+++ b/srcpkgs/iw/template
@@ -1,6 +1,6 @@
 # Template file for 'iw'
 pkgname=iw
-version=5.9
+version=5.16
 revision=1
 hostmakedepends="pkg-config libnl3-devel"
 makedepends="libnl3-devel"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="ISC"
 homepage="http://wireless.kernel.org/en/users/Documentation/iw"
 distfiles="http://www.kernel.org/pub/software/network/iw/iw-${version}.tar.xz"
-checksum=293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2
+checksum=4c44e42762f903f9094ba5a598998c800a97a62afd6fd31ec1e0a799e308659c
 
 do_build() {
 	make V=1 CC=$CC ${makejobs}

From 71a6b885e071a92adc556c87c79291a7d1324e7b Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Sat, 23 Apr 2022 02:48:27 -0500
Subject: [PATCH 1764/2561] telegram-tg: update to 0.19.0

---
 srcpkgs/telegram-tg/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/telegram-tg/template b/srcpkgs/telegram-tg/template
index 16f22a8419ce..49ede65ab6c1 100644
--- a/srcpkgs/telegram-tg/template
+++ b/srcpkgs/telegram-tg/template
@@ -1,7 +1,7 @@
 # Template file for 'telegram-tg'
 pkgname=telegram-tg
-version=0.17.0
-revision=3
+version=0.19.0
+revision=1
 wrksrc=tg-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,6 +11,6 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Unlicense"
 homepage="https://github.com/paul-nameless/tg"
 distfiles="${PYPI_SITE}/t/tg/tg-${version}.tar.gz"
-checksum=aab22b1e40a28710b6e3dbe4f3bba67ff02e36d612d8388f9400e4c34feab221
+checksum=2f1ad2fd1af78e10dfe50663cc9b1f31af531fcd27f630f6a1fc1aa2d5b569cb
 # There are no tests to run
 make_check=no

From 37585090203857b00daf89502f08f8acf0a6d14e Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 22 Apr 2022 17:21:50 +0200
Subject: [PATCH 1765/2561] minizip: update to 1.2.12.

---
 srcpkgs/minizip/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/minizip/template b/srcpkgs/minizip/template
index 7f674f50744d..f3938368a139 100644
--- a/srcpkgs/minizip/template
+++ b/srcpkgs/minizip/template
@@ -1,7 +1,7 @@
 # Template file for 'minizip'
 pkgname=minizip
-version=1.2.11
-revision=3
+version=1.2.12
+revision=1
 wrksrc="zlib-${version}"
 build_wrksrc="contrib/${pkgname}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ maintainer="ojab <ojab@ojab.ru>"
 license="Zlib"
 homepage="http://www.winimage.com/zLibDll/minizip.html"
 distfiles="http://www.zlib.net/zlib-${version}.tar.gz"
-checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+checksum=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
 
 pre_configure() {
 	autoreconf -i
@@ -23,7 +23,6 @@ post_install() {
 	rm ${DESTDIR}/usr/include/minizip/crypt.h
 }
 
-
 minizip-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}-${version}_${revision}"

From 0a070a8d3d74c77ec1c32654526496574e4c7620 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Apr 2022 13:05:36 +0200
Subject: [PATCH 1766/2561] netpbm: update to 10.98.02.

---
 srcpkgs/netpbm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index 61728c4c7d28..91c85332c50a 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.98.0.0
+version=10.98.02
 revision=1
-_githash=772c4792d998deb70f1719c1a2ad82f2defde5f0
+_githash=5991a720c260e171c145d035014609f18cb2eaf3
 _githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79
 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="f53f8e57e1dec64edddec971f13a1cdcbc17d07110e4699b3090de7a79e3f75a
+checksum="7ed7fdfc8cae0a11f15ace63715296917a4a1f61017c06f3d09ead2d39d83320
  30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde"
 
 post_extract() {

From c85f08b2b934430a600e060651dfeb350e18f872 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Apr 2022 15:46:51 +0200
Subject: [PATCH 1767/2561] linux5.10: update to 5.10.113.

---
 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 28935f5c70d2..e2bf0b9cae3d 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.111
+version=5.10.113
 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=1831b3d8765592ce91e51441bb179d908f6bcfe8c78d03c2bec8c675c4a0ab1a
+checksum=82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 4a4e6018a44e115cf0e1202e2570439cc752182a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 27 Apr 2022 15:50:44 +0200
Subject: [PATCH 1768/2561] linux5.15: update to 5.15.36.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 9b2bc0aed3f9..ae0410039d0c 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.34
+version=5.15.36
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- b1a34733513b1080e763532101def34af73b4ca5e4f9b442c3e7d378a1598088"
+ a40a27adb37c5ac569428c517f3eb51ce1148258db5b8a42aadb79128197d4a0"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 502a69e14ef74b32bc4805de090085e1cc57580c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 27 Apr 2022 11:17:45 -0400
Subject: [PATCH 1769/2561] dendrite: update to 0.8.2.

---
 srcpkgs/dendrite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index fffd933f62c1..998442981fcf 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=e26d306b008c9a88da31449e51df4c97e991d99b7954ab130f4fcf00371aa503
+checksum=c09c53964434785d9828482a00e3300a7e54692a0052c71f6a245e147b46cd01
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"

From 1881a1dec420a1602b094508148c5699d8566122 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 Apr 2022 22:58:39 +0200
Subject: [PATCH 1770/2561] telegram-desktop: "fix cross" for arm*-musl

Still needs proper investigation at why this is only breaking on
arm*-musl, and in general some cleanup of qt6 cmake cross
---
 srcpkgs/telegram-desktop/patches/cross.patch | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/telegram-desktop/patches/cross.patch b/srcpkgs/telegram-desktop/patches/cross.patch
index 47fcb4bbb338..e1fef852c391 100644
--- a/srcpkgs/telegram-desktop/patches/cross.patch
+++ b/srcpkgs/telegram-desktop/patches/cross.patch
@@ -9,3 +9,11 @@
      BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR>
      COMMAND ${CMAKE_COMMAND} --install <BINARY_DIR>
      STEP_TARGETS build
+@@ -83,6 +82,7 @@
+         -DCMAKE_PREFIX_PATH=${CMAKE_CURRENT_BINARY_DIR}
+         -DECM_DIR=${extra_cmake_modules_binary_dir}/share/ECM/cmake
+         -DPlasmaWaylandProtocols_DIR=${plasma_wayland_protocols_binary_dir}/lib/cmake/PlasmaWaylandProtocols
++	-D_qtpaths_executable=/usr/lib/qt6/bin/qtpaths
+     STEP_TARGETS build
+     EXCLUDE_FROM_ALL TRUE
+     BUILD_BYPRODUCTS <BINARY_DIR>/lib/libKF5WaylandClient.a

From 06dc73d852a68572914cda776c2393e07a1102cf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:15:17 -0400
Subject: [PATCH 1771/2561] openjdk11: clean up template

---
 srcpkgs/openjdk11/template | 112 ++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index bd38c0c5c010..a7e3ed176e19 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,9 +1,9 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+5
-revision=2
+revision=3
 _java_ver="${version%%.*}"
-_openjdk_version="openjdk-${_java_ver}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
@@ -32,7 +32,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
 depends="fontconfig"
-short_desc="OpenJDK Java Development Kit"
+short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
@@ -68,50 +68,50 @@ if [ ! "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-10-openjdk"
 else
 	hostmakedepends+=" openjdk11"
-	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk11"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- java:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- java:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- java:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- java:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ java:/usr/bin/java:/${_jdk_home}/bin/java
+ java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 
- jdk:/usr/bin/jaotc:/usr/lib/jvm/openjdk11/bin/jaotc
- jdk:/usr/bin/jar:/usr/lib/jvm/openjdk11/bin/jar
- jdk:/usr/bin/jarsigner:/usr/lib/jvm/openjdk11/bin/jarsigner
- jdk:/usr/bin/java:/usr/lib/jvm/openjdk11/bin/java
- jdk:/usr/bin/javac:/usr/lib/jvm/openjdk11/bin/javac
- jdk:/usr/bin/javadoc:/usr/lib/jvm/openjdk11/bin/javadoc
- jdk:/usr/bin/javap:/usr/lib/jvm/openjdk11/bin/javap
- jdk:/usr/bin/jcmd:/usr/lib/jvm/openjdk11/bin/jcmd
- jdk:/usr/bin/jconsole:/usr/lib/jvm/openjdk11/bin/jconsole
- jdk:/usr/bin/jdb:/usr/lib/jvm/openjdk11/bin/jdb
- jdk:/usr/bin/jdeprscan:/usr/lib/jvm/openjdk11/bin/jdeprscan
- jdk:/usr/bin/jdeps:/usr/lib/jvm/openjdk11/bin/jdeps
- jdk:/usr/bin/jhsdb:/usr/lib/jvm/openjdk11/bin/jhsdb
- jdk:/usr/bin/jimage:/usr/lib/jvm/openjdk11/bin/jimage
- jdk:/usr/bin/jinfo:/usr/lib/jvm/openjdk11/bin/jinfo
- jdk:/usr/bin/jjs:/usr/lib/jvm/openjdk11/bin/jjs
- jdk:/usr/bin/jlink:/usr/lib/jvm/openjdk11/bin/jlink
- jdk:/usr/bin/jmap:/usr/lib/jvm/openjdk11/bin/jmap
- jdk:/usr/bin/jmod:/usr/lib/jvm/openjdk11/bin/jmod
- jdk:/usr/bin/jps:/usr/lib/jvm/openjdk11/bin/jps
- jdk:/usr/bin/jrunscript:/usr/lib/jvm/openjdk11/bin/jrunscript
- jdk:/usr/bin/jshell:/usr/lib/jvm/openjdk11/bin/jshell
- jdk:/usr/bin/jstack:/usr/lib/jvm/openjdk11/bin/jstack
- jdk:/usr/bin/jstat:/usr/lib/jvm/openjdk11/bin/jstat
- jdk:/usr/bin/jstatd:/usr/lib/jvm/openjdk11/bin/jstatd
- jdk:/usr/bin/keytool:/usr/lib/jvm/openjdk11/bin/keytool
- jdk:/usr/bin/pack200:/usr/lib/jvm/openjdk11/bin/pack200
- jdk:/usr/bin/rmic:/usr/lib/jvm/openjdk11/bin/rmic
- jdk:/usr/bin/rmid:/usr/lib/jvm/openjdk11/bin/rmid
- jdk:/usr/bin/rmiregistry:/usr/lib/jvm/openjdk11/bin/rmiregistry
- jdk:/usr/bin/serialver:/usr/lib/jvm/openjdk11/bin/serialver
- jdk:/usr/bin/unpack200:/usr/lib/jvm/openjdk11/bin/unpack200
+ jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeprscan:/${_jdk_home}/bin/jdeprscan
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhsdb:/${_jdk_home}/bin/jhsdb
+ jdk:/usr/bin/jimage:/${_jdk_home}/bin/jimage
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jlink:/${_jdk_home}/bin/jlink
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jmod:/${_jdk_home}/bin/jmod
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jshell:/${_jdk_home}/bin/jshell
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
 "
 
 post_extract() {
@@ -151,11 +151,11 @@ do_configure() {
 }
 
 do_install() {
-	vmkdir usr/lib/jvm/openjdk${_java_ver}
-	vcopy build/*-normal-*-release/images/jdk/* "usr/lib/jvm/openjdk${_java_ver}"
-	vmkdir usr/lib/jvm/$_openjdk_version/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/usr/lib/jvm/openjdk${_java_ver}/lib/security/
+	vmkdir $_jdk_home
+	vcopy build/*-normal-*-release/images/jdk/* $_jdk_home
+	vmkdir $_jdk_home/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k $DESTDIR/$_jdk_home/bin/keytool
+	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 	vmkdir etc/profile.d
@@ -170,14 +170,14 @@ openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- documentation"
+	short_desc+=" - documentation"
 	pkg_install() {
 		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			vmkdir usr/share/doc/openjdk11
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk11
+			cp -a build/linux-*/images/docs/* $PKGDESTDIR/usr/share/doc/openjdk11
 		fi
-		vmove usr/lib/jvm/openjdk11/man/man1
+		vmove $_jdk_home/man/man1
 	}
 }
 
@@ -185,17 +185,17 @@ openjdk11-src_package() {
 	nostrip=yes
 	noverifyrdeps=yes
 	noshlibprovides=yes
-	short_desc+=" -- sources"
+	short_desc+=" - sources"
 	pkg_install() {
-		vmove "usr/lib/jvm/openjdk11/lib/src.zip"
+		vmove $_jdk_home/lib/src.zip
 	}
 }
 
 openjdk11-static-libs_package() {
 	notstrip=yes
-	short_desc+=" -- static libs"
+	short_desc+=" - static libs"
 	pkg_install() {
-		vmkdir usr/lib/jvm/openjdk${_java_ver}
-		vcopy build/*-normal-*-release/images/static-libs/lib "usr/lib/jvm/openjdk${_java_ver}"
+		vmkdir $_jdk_home
+		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }

From dd60fe2c91552036f04503911591c33bc518e26c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:25:32 -0400
Subject: [PATCH 1772/2561] New package: openjdk11-jre-11.0.12+5.

---
 common/shlibs              | 12 +++++------
 srcpkgs/openjdk11-jre      |  1 +
 srcpkgs/openjdk11/template | 44 ++++++++++++++++++++++++++++++++------
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/openjdk11-jre

diff --git a/common/shlibs b/common/shlibs
index 60b4402c8bd2..4114151662fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1811,12 +1811,12 @@ libawt_xawt.so openjdk8-jre-8u20_1
 libjava.so openjdk8-jre-8u20_1
 libjli.so openjdk8-jre-8u20_1
 libjvm.so openjdk8-jre-8u20_1
-libjawt.so openjdk11-11.0.5+10_1
-libawt.so openjdk11-11.0.5+10_1
-libawt_xawt.so openjdk11-11.0.5+10_1
-libjava.so openjdk11-11.0.5+10_1
-libjli.so openjdk11-11.0.5+10_1
-libjvm.so openjdk11-11.0.5+10_1
+libjawt.so openjdk11-jre-11.0.5+10_1
+libawt.so openjdk11-jre-11.0.5+10_1
+libawt_xawt.so openjdk11-jre-11.0.5+10_1
+libjava.so openjdk11-jre-11.0.5+10_1
+libjli.so openjdk11-jre-11.0.5+10_1
+libjvm.so openjdk11-jre-11.0.5+10_1
 libjawt.so openjdk7-bootstrap-7u221b02_1
 libawt.so openjdk7-bootstrap-7u221b02_1
 libawt_xawt.so openjdk7-bootstrap-7u221b02_1
diff --git a/srcpkgs/openjdk11-jre b/srcpkgs/openjdk11-jre
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jre
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index a7e3ed176e19..f0b16258cf9f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -31,15 +31,14 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-depends="fontconfig"
+depends="${pkgname}-jre-${version}_${revision}"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
-provides="java-environment-${version}_1 java-runtime-${version}_1"
-shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -158,14 +157,45 @@ do_install() {
 	mv ./ca/etc/pki/tls/java/cacerts $DESTDIR/$_jdk_home/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
-	vmkdir etc/profile.d
-	cat >>${DESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
 	vlicense ASSEMBLY_EXCEPTION
 	vlicense LICENSE
 }
 
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+
+openjdk11-jre_package() {
+	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
+	short_desc+=" - runtime components"
+	provides="java-runtime-${version}_1"
+	depends="fontconfig"
+	alternatives="
+	 java:/usr/bin/java:/${_jdk_home}/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+	 java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+	 java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+	 java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+	"
+	pkg_install() {
+		for bf in java jjs keytool pack200 rmid rmiregistry unpack200; do
+			vmove $_jdk_home/bin/$bf
+		done
+
+		for f in lib legal conf release; do
+			vmove $_jdk_home/$f
+		done
+
+		vmkdir etc/profile.d
+		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
+export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
+EOF
+
+		vlicense ASSEMBLY_EXCEPTION
+		vlicense LICENSE
+	}
+}
+
 openjdk11-doc_package() {
 	nostrip=yes
 	noverifyrdeps=yes

From 5d3041d2c3eca51f5110e1c3e5bfb3006dfc4663 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:53:06 -0400
Subject: [PATCH 1773/2561] New package: openjdk11-jmods-11.0.12+5

fixes #25183
---
 srcpkgs/openjdk11-jmods    |  1 +
 srcpkgs/openjdk11/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk11-jmods

diff --git a/srcpkgs/openjdk11-jmods b/srcpkgs/openjdk11-jmods
new file mode 120000
index 000000000000..8213494c49ed
--- /dev/null
+++ b/srcpkgs/openjdk11-jmods
@@ -0,0 +1 @@
+openjdk11
\ No newline at end of file
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f0b16258cf9f..ba11f44a43c9 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -161,7 +161,7 @@ do_install() {
 	vlicense LICENSE
 }
 
-subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-static-libs"
+subpackages="openjdk11-src openjdk11-jre openjdk11-doc openjdk11-jmods openjdk11-static-libs"
 
 openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -229,3 +229,11 @@ openjdk11-static-libs_package() {
 		vcopy build/*-normal-*-release/images/static-libs/lib $_jdk_home
 	}
 }
+
+openjdk11-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From 79afe33fbd28f96e3f328993614f54b97b342ffd Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:24:39 -0400
Subject: [PATCH 1774/2561] openjdk11: disable on armv[56]*

fixes #29457
---
 srcpkgs/openjdk11/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index ba11f44a43c9..f164f5de741f 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -44,10 +44,11 @@ provides="java-environment-${version}_1"
 disable_parallel_build=yes
 build_options="docs"
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 04cf1a6db03b08d8038fe5cad714e9256cb696ef Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 20:14:58 -0400
Subject: [PATCH 1775/2561] openjdk11: update to 11.0.12+7, enable debug.

---
 srcpkgs/openjdk11/template | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index f164f5de741f..711376c10824 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
-version=11.0.12+5
-revision=3
+version=11.0.12+7
+revision=1
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -16,14 +16,14 @@ configure_args="
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-native-debug-symbols=none
+ --with-native-debug-symbols=internal
  --with-version-pre=
- --with-version-opt="void-r$revision"
+ --with-version-opt=void-r$revision
  --with-version-build=${version#*+}
- --with-vendor-name="Void"
- --with-vendor-url="https://voidlinux.org/"
- --with-vendor-bug-url="https://github.com/void-linux/void-packages/issues"
- --with-vendor-vm-bug-url="https://github.com/void-linux/void-packages/issues""
+ --with-vendor-name=Void
+ --with-vendor-url=https://voidlinux.org/
+ --with-vendor-bug-url=https://github.com/void-linux/void-packages/issues
+ --with-vendor-vm-bug-url=https://github.com/void-linux/void-packages/issues"
 make_build_args="images static-libs-image $(vopt_if docs docs)"
 make_check_target="test-hotspot-gtest"
 hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
@@ -37,7 +37,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
-checksum=ff0edaf800c76ae435840365a9205a5f7277a5a2fd3c79ad874522a15c213559
+checksum=06ad7b39625374c30a8d8be9e7e18f37663ba6fe44c2a66aa7b7987b140d069a
 provides="java-environment-${version}_1"
 
 # Build is still parallel, but don't use -jN.
@@ -72,14 +72,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/pack200:/${_jdk_home}/bin/pack200
- java:/usr/bin/rmid:/${_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
- java:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
-
  jdk:/usr/bin/jaotc:/${_jdk_home}/bin/jaotc
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner

From a18bf9fbba24aab56faff9230e830b537bfe69c7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Apr 2022 21:57:06 -0400
Subject: [PATCH 1776/2561] sshuttle: update to 1.1.0.

---
 srcpkgs/sshuttle/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sshuttle/template b/srcpkgs/sshuttle/template
index b029f2575cf6..078fd6e6821c 100644
--- a/srcpkgs/sshuttle/template
+++ b/srcpkgs/sshuttle/template
@@ -1,7 +1,7 @@
 # Template file for 'sshuttle'
 pkgname=sshuttle
-version=1.0.5
-revision=2
+version=1.1.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm python3-Sphinx"
 depends="python3-psutil"
@@ -12,7 +12,7 @@ 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=fd8c691aac2cb80933aae7f94d9d9e271a820efc5c48e73408f1a90da426a1bd
+checksum=21fb91bdf392b50e78db6b8d75e95b73ac9dafd361e2657e784e674561219315
 
 post_extract() {
 	# BUG: wrong permissions (https://github.com/sshuttle/sshuttle/issues/217)

From f8d0c23417ba7d3a69c7be2c9685ff3218df5a0c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 18 Mar 2022 17:33:46 +0100
Subject: [PATCH 1777/2561] ghc: update to 9.0.2

---
 .../ghc/patches/no-atomic-64-on-32bit.patch   |  58 -------
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch      | 159 ++++++++----------
 srcpkgs/ghc/template                          |   4 +-
 3 files changed, 72 insertions(+), 149 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch

diff --git a/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch b/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
deleted file mode 100644
index 05ca275ea9df..000000000000
--- a/srcpkgs/ghc/patches/no-atomic-64-on-32bit.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 5c5aa87d50dc4ea97e76e13f285a7b5dd71fcd88 Mon Sep 17 00:00:00 2001
-From: Ilias Tsitsimpis <iliastsi@debian.org>
-Date: Sun, 1 Mar 2020 16:25:13 +0200
-Subject: [PATCH] Do not define hs_atomic{read,write}64() on non-64bit
-
-Do not define hs_atomicread64() and hs_atomicwrite64() on machines where
-WORD_SIZE_IN_BITS is less than 64, just like we do with the rest of the atomic
-functions which work on 64-bit values.
-
-Without this, compilation fails on MIPSel and PowerPC with the following error:
-
-/usr/bin/ld: /<<PKGBUILDDIR>>/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3_p.a(atomic.p_o): in function `hs_atomicread64':
-atomic.c:(.text.hs_atomicread64+0x8): undefined reference to `__sync_add_and_fetch_8'
-/usr/bin/ld: /<<PKGBUILDDIR>>/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3_p.a(atomic.p_o): in function `hs_atomicwrite64':
-atomic.c:(.text.hs_atomicwrite64+0x38): undefined reference to `__sync_bool_compare_and_swap_8'
-
-Fixes #17886.
----
- libraries/ghc-prim/cbits/atomic.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/libraries/ghc-prim/cbits/atomic.c b/libraries/ghc-prim/cbits/atomic.c
-index ac2e608ec2..01037d70ee 100644
---- a/libraries/ghc-prim/cbits/atomic.c
-+++ b/libraries/ghc-prim/cbits/atomic.c
-@@ -361,6 +361,7 @@ hs_atomicread32(StgWord x)
- #endif
- }
- 
-+#if WORD_SIZE_IN_BITS == 64
- extern StgWord64 hs_atomicread64(StgWord x);
- StgWord64
- hs_atomicread64(StgWord x)
-@@ -371,6 +372,7 @@ hs_atomicread64(StgWord x)
-   return __sync_add_and_fetch((StgWord64 *) x, 0);
- #endif
- }
-+#endif
- 
- // AtomicWriteByteArrayOp_Int
- // Implies a full memory barrier (see compiler/prelude/primops.txt.pp)
-@@ -409,6 +411,7 @@ hs_atomicwrite32(StgWord x, StgWord val)
- #endif
- }
- 
-+#if WORD_SIZE_IN_BITS == 64
- extern void hs_atomicwrite64(StgWord x, StgWord64 val);
- void
- hs_atomicwrite64(StgWord x, StgWord64 val)
-@@ -420,3 +423,5 @@ hs_atomicwrite64(StgWord x, StgWord64 val)
- #endif
- }
- #endif
-+
-+#endif
--- 
-GitLab
-
diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index 275444e828b7..df1a0bfe15ba 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -1,36 +1,24 @@
-From fd191973558cf4aeb0d5ca107357defd6f837c38 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Tue, 5 Jan 2021 04:10:25 +0100
+From 587edc0d9786aff3c7a4728ba941f6a993e59bdc Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Thu, 28 Apr 2022 00:48:04 +0200
 Subject: [PATCH] fix up runtime for ppc64 BE ELFv2 + ensure it's used
 
 ---
- aclocal.m4                        |  2 +-
  configure                         |  2 +-
  libraries/ghci/GHCi/InfoTable.hsc | 36 ++++++++++++-------------------
- rts/Adjustor.c                    | 12 +++++------
+ m4/fptools.m4                     |  2 +-
  rts/AdjustorAsm.S                 |  2 +-
  rts/StgCRun.c                     |  4 ++--
  rts/StgCRunAsm.S                  |  2 +-
- 7 files changed, 26 insertions(+), 34 deletions(-)
+ rts/adjustor/NativeIA64.c         |  2 +-
+ rts/adjustor/NativePowerPC.c      |  2 +-
+ 8 files changed, 22 insertions(+), 30 deletions(-)
 
-diff --git a/aclocal.m4 b/aclocal.m4
-index 41cecf0..ba08bd2 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -199,7 +199,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_V
-             test -z "[$]2" || eval "[$]2=ArchPPC"
-             ;;
-         powerpc64)
--            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V1}\""
-+            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
-             ;;
-         powerpc64le)
-             test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
 diff --git a/configure b/configure
-index 183e661..8aae1bc 100755
+index 8310e6f..eac1124 100755
 --- a/configure
 +++ b/configure
-@@ -10296,7 +10296,7 @@ $as_echo "done" >&6; }
+@@ -10508,7 +10508,7 @@ printf "%s\n" "no" >&6; }
              test -z "$2" || eval "$2=ArchPPC"
              ;;
          powerpc64)
@@ -40,10 +28,10 @@ index 183e661..8aae1bc 100755
          powerpc64le)
              test -z "$2" || eval "$2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
 diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
-index ec3c18a..0359be7 100644
+index ad4eb4d..e4f1c0c 100644
 --- a/libraries/ghci/GHCi/InfoTable.hsc
 +++ b/libraries/ghci/GHCi/InfoTable.hsc
-@@ -228,30 +228,22 @@ mkJumpToAddr a = case platform of
+@@ -231,30 +231,22 @@ mkJumpToAddr' platform a = case platform of
                  , fromIntegral w64
                  , fromIntegral (w64 `shiftR` 32) ]
      ArchPPC64 ->
@@ -85,103 +73,96 @@ index ec3c18a..0359be7 100644
 +        in Right [ 0x3D800000 .|. hi16 w32,
 +                   0x618C0000 .|. lo16 w32,
 +                   0x7D8903A6, 0x4E800420 ]
-
+ 
      ArchPPC64LE ->
          -- The ABI requires r12 to point to the function's entry point.
-diff --git a/rts/Adjustor.c b/rts/Adjustor.c
-index d360cfe..ab7ede7 100644
---- a/rts/Adjustor.c
-+++ b/rts/Adjustor.c
-@@ -49,7 +49,7 @@ Haskell side.
-
- #if defined(i386_HOST_ARCH)
- extern void adjustorCode(void);
--#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
-+#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
- // from AdjustorAsm.s
- // not declared as a function so that AIX-style
- // fundescs can never get in the way.
-@@ -278,7 +278,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
- extern void obscure_ccall_ret_code(void);
- #endif
-
--#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
-+#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
- #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
-
- /* !!! !!! WARNING: !!! !!!
-@@ -318,7 +318,7 @@ typedef struct AdjustorStub {
- } AdjustorStub;
- #endif
-
--#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
-+#if defined(i386_HOST_ARCH) || defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
- static int totalArgumentSize(char *typeString)
- {
-     int sz = 0;
-@@ -351,7 +351,7 @@ void*
- createAdjustor(int cconv, StgStablePtr hptr,
-                StgFunPtr wptr,
-                char *typeString
--#if !defined(powerpc_HOST_ARCH) && !defined(powerpc64_HOST_ARCH) && !defined(x86_64_HOST_ARCH)
-+#if !defined(powerpc_HOST_ARCH) && (!defined(powerpc64_HOST_ARCH) || (_CALL_ELF == 2)) && !defined(x86_64_HOST_ARCH)
-                   STG_UNUSED
- #endif
-               )
-@@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
-    return;
-  }
-  freeStablePtr(((StgStablePtr*)ptr)[1]);
--#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
-+#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-  if ( ((AdjustorStub*)ptr)->code != (StgFunPtr) &adjustorCode ) {
-    errorBelch("freeHaskellFunctionPtr: not for me, guv! %p\n", ptr);
-    return;
+diff --git a/m4/fptools.m4 b/m4/fptools.m4
+index 8c6c9b7..eb25c37 100644
+--- a/m4/fptools.m4
++++ b/m4/fptools.m4
+@@ -201,7 +201,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
+             test -z "[$]2" || eval "[$]2=ArchPPC"
+             ;;
+         powerpc64)
+-            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V1}\""
++            test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
+             ;;
+         powerpc64le)
+             test -z "[$]2" || eval "[$]2=\"ArchPPC_64 {ppc_64ABI = ELF_V2}\""
 diff --git a/rts/AdjustorAsm.S b/rts/AdjustorAsm.S
 index 2795b83..63cfe91 100644
 --- a/rts/AdjustorAsm.S
 +++ b/rts/AdjustorAsm.S
 @@ -2,7 +2,7 @@
-
+ 
  /* ******************************** PowerPC ******************************** */
-
+ 
 -#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
  #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
      /* The following code applies, with some differences,
         to all powerpc platforms except for powerpc32-linux,
 diff --git a/rts/StgCRun.c b/rts/StgCRun.c
-index 934926e..2ff8662 100644
+index f43227a..927d44a 100644
 --- a/rts/StgCRun.c
 +++ b/rts/StgCRun.c
-@@ -726,7 +726,7 @@ StgRunIsImplementedInAssembler(void)
+@@ -724,7 +724,7 @@ StgRunIsImplementedInAssembler(void)
     Everything is in assembler, so we don't have to deal with GCC...
     -------------------------------------------------------------------------- */
-
+ 
 -#if defined(powerpc64_HOST_ARCH)
 +#if defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2)
-
- static void GNUC3_ATTRIBUTE(used)
- StgRunIsImplementedInAssembler(void)
-@@ -851,7 +851,7 @@ StgRunIsImplementedInAssembler(void)
-
+ /* 64-bit PowerPC ELF ABI 1.9
+  *
+  * Stack frame organization (see Figure 3-17, ELF ABI 1.9, p 14)
+@@ -792,7 +792,7 @@ StgRunIsImplementedInAssembler(void)
+ 
  #endif
-
+ 
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  /* -----------------------------------------------------------------------------
     PowerPC 64 little endian architecture
-
+ 
 diff --git a/rts/StgCRunAsm.S b/rts/StgCRunAsm.S
-index 9274a44..3b4fc33 100644
+index 60f1bf9..c6794d7 100644
 --- a/rts/StgCRunAsm.S
 +++ b/rts/StgCRunAsm.S
 @@ -5,7 +5,7 @@
   * then functions StgRun/StgReturn are implemented in file StgCRun.c */
  #if !defined(USE_MINIINTERPRETER)
-
+ 
 -#if defined(powerpc64le_HOST_ARCH)
 +#if defined(powerpc64le_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF == 2))
  # if defined(linux_HOST_OS)
- # define STACK_FRAME_SIZE RESERVED_C_STACK_BYTES+304
- 	.file	"StgCRun.c"
+ /* 64-bit PowerPC ELF V2 ABI Revision 1.4
+  *
+diff --git a/rts/adjustor/NativeIA64.c b/rts/adjustor/NativeIA64.c
+index 9fd1991..816b3ef 100644
+--- a/rts/adjustor/NativeIA64.c
++++ b/rts/adjustor/NativeIA64.c
+@@ -39,7 +39,7 @@ void*
+ createAdjustor(int cconv, StgStablePtr hptr,
+                StgFunPtr wptr,
+                char *typeString
+-#if !defined(powerpc_HOST_ARCH) && !defined(powerpc64_HOST_ARCH) && !defined(x86_64_HOST_ARCH)
++#if !defined(powerpc_HOST_ARCH) && (!defined(powerpc64_HOST_ARCH) || (_CALL_ELF == 2)) && !defined(x86_64_HOST_ARCH)
+                STG_UNUSED
+ #endif
+     )
+diff --git a/rts/adjustor/NativePowerPC.c b/rts/adjustor/NativePowerPC.c
+index 2e5d605..caef5d3 100644
+--- a/rts/adjustor/NativePowerPC.c
++++ b/rts/adjustor/NativePowerPC.c
+@@ -29,7 +29,7 @@ __asm__("obscure_ccall_ret_code:\n\t"
+ extern void obscure_ccall_ret_code(void);
+ #endif /* defined(linux_HOST_OS) */
+ 
+-#if defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
++#if defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
+ #if !(defined(powerpc_HOST_ARCH) && defined(linux_HOST_OS))
+ 
+ /* !!! !!! WARNING: !!! !!!
+-- 
+2.35.1
+
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index b8b16f67b433..c4bbb3e4e3b1 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.7
+version=9.0.2
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
+checksum=140e42b96346322d1a39eb17602bcdc76e292028ad4a69286b230bab188a9197
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"
 _bindir="/usr/lib/${pkgname}-${version}/bin"

From 498151684cd2abd1f67bf5a626e9658a0c02df6d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 19 Mar 2022 10:48:13 +0100
Subject: [PATCH 1778/2561] cabal-install: update to 3.6.3.0

Technically, this is only upgrading Cabal (the library) to 3.6.3.0, as
the installed version of cabal-install is still 3.6.2.0.  This is,
however, necessary for GHC 9.x support.
---
 srcpkgs/cabal-install/files/linux-9.0.2.json | 1 +
 srcpkgs/cabal-install/template               | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/cabal-install/files/linux-9.0.2.json

diff --git a/srcpkgs/cabal-install/files/linux-9.0.2.json b/srcpkgs/cabal-install/files/linux-9.0.2.json
new file mode 100644
index 000000000000..f3cb6b4aeeb5
--- /dev/null
+++ b/srcpkgs/cabal-install/files/linux-9.0.2.json
@@ -0,0 +1 @@
+{"builtin":[{"package":"rts","version":"1.0.2"},{"package":"ghc-prim","version":"0.7.0"},{"package":"ghc-bignum","version":"1.1"},{"package":"base","version":"4.15.1.0"},{"package":"array","version":"0.5.4.0"},{"package":"deepseq","version":"1.4.5.0"},{"package":"bytestring","version":"0.10.12.1"},{"package":"containers","version":"0.6.4.1"},{"package":"binary","version":"0.8.8.0"},{"package":"filepath","version":"1.4.2.1"},{"package":"time","version":"1.9.3"},{"package":"unix","version":"2.7.2.2"},{"package":"directory","version":"1.3.6.2"},{"package":"transformers","version":"0.5.6.2"},{"package":"mtl","version":"2.2.2"},{"package":"ghc-boot-th","version":"9.0.2"},{"package":"pretty","version":"1.1.3.6"},{"package":"template-haskell","version":"2.17.0.0"},{"package":"text","version":"1.2.5.0"},{"package":"parsec","version":"3.1.14.0"},{"package":"process","version":"1.6.13.2"},{"package":"stm","version":"2.5.0.0"}],"dependencies":[{"cabal_sha256":null,"flags":["-bundled-binary-generic"],"package":"Cabal","revision":null,"source":"local","src_sha256":null,"version":"3.6.3.0"},{"cabal_sha256":"714a55fd28d3e2533bd5b49e74f604ef8e5d7b06f249c8816f6c54aed431dcf1","flags":["-optimised-mixer"],"package":"splitmix","revision":0,"source":"hackage","src_sha256":"6d065402394e7a9117093dbb4530a21342c9b1e2ec509516c8a8d0ffed98ecaa","version":"0.1.0.4"},{"cabal_sha256":"8bee24dc0c985a90ee78d94c61f8aed21c49633686f0f1c14c5078d818ee43a2","flags":[],"package":"random","revision":0,"source":"hackage","src_sha256":"265c768fc5f2ca53cde6a87e706b4448cad474c3deece933c103f24453661457","version":"1.2.1"},{"cabal_sha256":"3a2beeafb220f9de706568a7e4a5b3c762cc4c9f25c94d7ef795b8c2d6a691d7","flags":["+integer-gmp","-random-initial-seed"],"package":"hashable","revision":1,"source":"hackage","src_sha256":"baaad82cd4271b197016bdbe76f22d5c3d3913fe38534cec7d817db9bae19886","version":"1.3.5.0"},{"cabal_sha256":"b83dec34a53520de84c6dd3dc7aae45d22409b46eb471c478b98108215a370f0","flags":["-bench"],"package":"async","revision":1,"source":"hackage","src_sha256":"484df85be0e76c4fed9376451e48e1d0c6e97952ce79735b72d54297e7e0a725","version":"2.2.4"},{"cabal_sha256":"037d70bb091c49f68726dde920f6a003b646835a86cdcb5b5ad58ad9af3207d9","flags":[],"package":"Cabal-syntax","revision":0,"source":"hackage","src_sha256":"ca25e5fc601397565fa857f1aa477740fac7f43d659e77c4d9b1485dca239251","version":"3.6.0.0"},{"cabal_sha256":"d8699f46b485f105eea9c7158f3d432ca578e6bbe5d68751184e9899a41d430d","flags":["-old-bytestring","-old-time"],"package":"tar","revision":4,"source":"hackage","src_sha256":"b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de","version":"0.5.1.1"},{"cabal_sha256":"e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568","flags":["-devel"],"package":"network","revision":0,"source":"hackage","src_sha256":"7f7620fef1a1af3d3d6747f510e73223a5c600e7d7fd9ace073d1222bdc63d85","version":"3.1.2.7"},{"cabal_sha256":"a16dd922947a6877defe52c4c38d1ab48ed3f85a826930f5d1a568741d619993","flags":[],"package":"th-compat","revision":0,"source":"hackage","src_sha256":"6b5059caf6714f47da92953badf2f556119877e09708c14e206b3ae98b8681c6","version":"0.1.3"},{"cabal_sha256":"a4765164ed0a2d1668446eb2e03460ce98645fbf083598c690846af79b7de10d","flags":[],"package":"network-uri","revision":0,"source":"hackage","src_sha256":"57856db93608a4d419f681b881c9b8d4448800d5a687587dc37e8a9e0b223584","version":"2.6.4.1"},{"cabal_sha256":"6042643c15a0b43e522a6693f1e322f05000d519543a84149cb80aeffee34f71","flags":["-conduit10","-mtl1","+network-uri","-warn-as-error","-warp-tests"],"package":"HTTP","revision":1,"source":"hackage","src_sha256":"d6091c037871ac3d08d021c906206174567499d5a26a6cb804cf530cd590fe2d","version":"4000.3.16"},{"cabal_sha256":"64abad7816ab8cabed8489e29f807b3a6f828e0b2cec0eae404323d69d36df9a","flags":[],"package":"base16-bytestring","revision":0,"source":"hackage","src_sha256":"1d5a91143ef0e22157536093ec8e59d226a68220ec89378d5dcaeea86472c784","version":"1.0.2.0"},{"cabal_sha256":"50ec0e229255d4c45cbdd568da011311b8887f304b931564886016f4984334d8","flags":[],"package":"base64-bytestring","revision":0,"source":"hackage","src_sha256":"fbf8ed30edde271eb605352021431d8f1b055f95a56af31fe2eacf6bdfdc49c9","version":"1.2.1.0"},{"cabal_sha256":"188d0b5a0491e8b686b32d9b144c9287760ba333d2509bf3f17e3d846fbc2332","flags":["-exe","+use-cbits"],"package":"cryptohash-sha256","revision":0,"source":"hackage","src_sha256":"73a7dc7163871a80837495039a099967b11f5c4fe70a118277842f7a713c6bf6","version":"0.11.102.1"},{"cabal_sha256":"ccce771562c49a2b29a52046ca68c62179e97e8fbeacdae32ca84a85445e8f42","flags":["-example"],"package":"echo","revision":0,"source":"hackage","src_sha256":"c9fe1bf2904825a65b667251ec644f197b71dc5c209d2d254be5de3d496b0e43","version":"0.1.4"},{"cabal_sha256":"4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee","flags":[],"package":"edit-distance","revision":1,"source":"hackage","src_sha256":"3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a","version":"0.2.2.1"},{"cabal_sha256":"24ac7b5f3d9fa3c2f70262b329f2a75f24e7fd829f88c189b388efa1bcd67eb2","flags":["+no-donna","+test-doctests","+test-hlint","+test-properties"],"package":"ed25519","revision":5,"source":"hackage","src_sha256":"d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d","version":"0.0.5.0"},{"cabal_sha256":"c084c043a40632d3cafcac50fb5eeff84d91edb070a54baa94945f1c976f97c0","flags":["+ofd-locking"],"package":"lukko","revision":2,"source":"hackage","src_sha256":"a80efb60cfa3dae18682c01980d76d5f7e413e191cd186992e1bf7388d48ab1f","version":"0.1.1.3"},{"cabal_sha256":"262a93dbf370be59f4ee57f3b1a51b338bc2c309797daa37c14f2262ae61dae4","flags":["-bundled-c-zlib","-non-blocking-ffi","-pkg-config"],"package":"zlib","revision":1,"source":"hackage","src_sha256":"807f6bddf9cb3c517ce5757d991dde3c7e319953a22c86ee03d74534bd5abc88","version":"0.6.2.3"},{"cabal_sha256":"eb34c3e2fa39f9819293045c03e56148a7125573c1de265cdfe5d967f1d71c6e","flags":["+base48","-cabal-syntax","+lukko","-mtl21","-old-directory","+use-network-uri"],"package":"hackage-security","revision":1,"source":"hackage","src_sha256":"bf22cd16dde7d6b7130463f4d7324b64a2964d9ef3f523df97d7cb98544d64a8","version":"0.6.2.1"},{"cabal_sha256":"2561adac8ce373910948066debe090a22b336b129ba5af18c0332524d16e72ce","flags":[],"package":"regex-base","revision":0,"source":"hackage","src_sha256":"7b99408f580f5bb67a1c413e0bc735886608251331ad36322020f2169aea2ef1","version":"0.94.0.2"},{"cabal_sha256":"b6421e5356766b0c0a78b6094ae2e3a6259b42c147b717283c03c1cb09163dca","flags":["-_regex-posix-clib"],"package":"regex-posix","revision":0,"source":"hackage","src_sha256":"c7827c391919227711e1cff0a762b1678fd8739f9c902fc183041ff34f59259c","version":"0.96.0.1"},{"cabal_sha256":"2088eb9368b920f80bbe4e3b03c3b8484090208f5c3b31645bd67a9ef7d26db4","flags":[],"package":"resolv","revision":4,"source":"hackage","src_sha256":"81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671","version":"0.1.2.0"},{"cabal_sha256":null,"flags":["-debug-conflict-sets","-debug-expensive-assertions","-debug-tracetree","+lukko","+native-dns"],"package":"cabal-install","revision":null,"source":"local","src_sha256":null,"version":"3.6.2.0"}]}
\ No newline at end of file
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index d6d718709993..6a4b0ad7fc0e 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,6 +1,6 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.6.2.0
+version=3.6.3.0
 revision=1
 wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
 distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
-checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
+checksum=dea086acad6d9fe5fe22d838b95b4e988022e8519f38d41609119ea32bfb7466
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,13 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-9.0.2.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
+	cp "${FILESDIR}/linux-9.0.2.json" bootstrap/
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-9.0.2.json
 }
 do_install() {
 	vbin _build/bin/cabal

From 368e54f72210a8f171fc01ae861599c9d62c8abb Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 19 Mar 2022 12:54:36 +0100
Subject: [PATCH 1779/2561] stack: update stackage resolver to lts-19.0

Related: https://github.com/commercialhaskell/stack/pull/5559
---
 srcpkgs/stack/patches/ghc9.0.2.patch   | 212 +++++++++++++++++++++++++
 srcpkgs/stack/patches/persistent.patch |  46 ++++++
 srcpkgs/stack/template                 |   6 +-
 3 files changed, 261 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/stack/patches/ghc9.0.2.patch
 create mode 100644 srcpkgs/stack/patches/persistent.patch

diff --git a/srcpkgs/stack/patches/ghc9.0.2.patch b/srcpkgs/stack/patches/ghc9.0.2.patch
new file mode 100644
index 000000000000..bdd77de58c6b
--- /dev/null
+++ b/srcpkgs/stack/patches/ghc9.0.2.patch
@@ -0,0 +1,212 @@
+From cb7e56842a25f93142545fad21306a7c1750fbbf Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 16:26:22 -0700
+Subject: [PATCH 1/6] Use Cabal 3.4.0.0
+
+---
+ stack.yaml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/stack.yaml b/stack.yaml
+index 005bd19f4..9472509be 100644
+--- a/stack.yaml
++++ b/stack.yaml
+@@ -20,6 +20,9 @@ flags:
+ ghc-options:
+    "$locals": -fhide-source-paths
+
++extra-deps:
++- Cabal-3.4.0.0
++
+ drop-packages:
+ # See https://github.com/commercialhaskell/stack/pull/4712
+ - cabal-install
+
+From 11e11ab0edeba033b40a7fc62434be58dea82ce2 Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 16:40:56 -0700
+Subject: [PATCH 2/6] Fix Flag => PackageFlag
+
+---
+ src/Stack/BuildPlan.hs | 2 +-
+ src/Stack/Package.hs   | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Stack/BuildPlan.hs b/src/Stack/BuildPlan.hs
+index 36f82236e..c5c80efc6 100644
+--- a/src/Stack/BuildPlan.hs
++++ b/src/Stack/BuildPlan.hs
+@@ -224,7 +224,7 @@ selectPackageBuildPlan platform compiler pool gpd =
+     flagCombinations :: NonEmpty [(FlagName, Bool)]
+     flagCombinations = mapM getOptions (genPackageFlags gpd)
+       where
+-        getOptions :: C.Flag -> NonEmpty (FlagName, Bool)
++        getOptions :: C.PackageFlag -> NonEmpty (FlagName, Bool)
+         getOptions f
+             | flagManual f = (fname, flagDefault f) :| []
+             | flagDefault f = (fname, True) :| [(fname, False)]
+diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
+index 4db50d2a4..d9bca7af5 100644
+--- a/src/Stack/Package.hs
++++ b/src/Stack/Package.hs
+@@ -128,7 +128,7 @@ resolvePackage packageConfig gpkg =
+         (resolvePackageDescription packageConfig gpkg)
+
+ packageFromPackageDescription :: PackageConfig
+-                              -> [D.Flag]
++                              -> [PackageFlag]
+                               -> PackageDescriptionPair
+                               -> Package
+ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkgNoMod pkg) =
+@@ -935,9 +935,9 @@ resolvePackageDescription packageConfig (GenericPackageDescription desc defaultF
+ -- | Make a map from a list of flag specifications.
+ --
+ -- What is @flagManual@ for?
+-flagMap :: [Flag] -> Map FlagName Bool
++flagMap :: [PackageFlag] -> Map FlagName Bool
+ flagMap = M.fromList . map pair
+-  where pair :: Flag -> (FlagName, Bool)
++  where pair :: PackageFlag -> (FlagName, Bool)
+         pair = flagName &&& flagDefault
+
+ data ResolveConditions = ResolveConditions
+@@ -986,7 +986,7 @@ resolveConditions rc addDeps (CondNode lib deps cs) = basic <> children
+                   case v of
+                     OS os -> os == rcOS rc
+                     Arch arch -> arch == rcArch rc
+-                    Flag flag ->
++                    PackageFlag flag ->
+                       fromMaybe False $ M.lookup flag (rcFlags rc)
+                       -- NOTE:  ^^^^^ This should never happen, as all flags
+                       -- which are used must be declared. Defaulting to
+
+From 8facd731ec3f2bbc15a083750740929167b33bb2 Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 16:55:30 -0700
+Subject: [PATCH 3/6] Fix CabalSpecVersion
+
+---
+ src/Stack/Package.hs | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
+index d9bca7af5..fca039140 100644
+--- a/src/Stack/Package.hs
++++ b/src/Stack/Package.hs
+@@ -32,6 +32,7 @@ import           Data.List (find, isPrefixOf, unzip)
+ import qualified Data.Map.Strict as M
+ import qualified Data.Set as S
+ import qualified Data.Text as T
++import           Distribution.CabalSpecVersion (CabalSpecVersion, cabalSpecMinimumLibraryVersion)
+ import           Distribution.Compiler
+ import           Distribution.ModuleName (ModuleName)
+ import qualified Distribution.ModuleName as Cabal
+@@ -190,7 +191,7 @@ packageFromPackageDescription packageConfig pkgFlags (PackageDescriptionPair pkg
+           (library pkg)
+     , packageBuildType = buildType pkg
+     , packageSetupDeps = msetupDeps
+-    , packageCabalSpec = either orLaterVersion id $ specVersionRaw pkg
++    , packageCabalSpec = orLaterVersion $ mkVersion $ cabalSpecMinimumLibraryVersion $ specVersion pkg
+     }
+   where
+     extraLibNames = S.union subLibNames foreignLibNames
+@@ -696,7 +697,7 @@ packageDescModulesAndFiles pkg = do
+
+ -- | Resolve globbing of files (e.g. data files) to absolute paths.
+ resolveGlobFiles
+-  :: Version -- ^ cabal file version
++  :: CabalSpecVersion -- ^ cabal file version
+   -> [String]
+   -> RIO Ctx (Set (Path Abs File))
+ resolveGlobFiles cabalFileVersion =
+
+From 004f14652409b7d0645215d354b2e599eb7f76bc Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 16:55:40 -0700
+Subject: [PATCH 4/6] Fix GenericPackageDescription
+
+---
+ src/Stack/Build.hs   | 2 +-
+ src/Stack/Package.hs | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Stack/Build.hs b/src/Stack/Build.hs
+index 23b9a9719..856903bed 100644
+--- a/src/Stack/Build.hs
++++ b/src/Stack/Build.hs
+@@ -358,7 +358,7 @@ checkComponentsBuildable lps =
+ checkSubLibraryDependencies :: HasLogFunc env => [ProjectPackage] -> RIO env ()
+ checkSubLibraryDependencies proj = do
+   forM_ proj $ \p -> do
+-    C.GenericPackageDescription _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p
++    C.GenericPackageDescription _ _ _ lib subLibs foreignLibs exes tests benches <- liftIO $ cpGPD . ppCommon $ p
+
+     let dependencies = concatMap getDeps subLibs <>
+                        concatMap getDeps foreignLibs <>
+diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs
+index fca039140..39aad4d2f 100644
+--- a/src/Stack/Package.hs
++++ b/src/Stack/Package.hs
+@@ -863,7 +863,7 @@ data PackageDescriptionPair = PackageDescriptionPair
+ resolvePackageDescription :: PackageConfig
+                           -> GenericPackageDescription
+                           -> PackageDescriptionPair
+-resolvePackageDescription packageConfig (GenericPackageDescription desc defaultFlags mlib subLibs foreignLibs' exes tests benches) =
++resolvePackageDescription packageConfig (GenericPackageDescription desc _ defaultFlags mlib subLibs foreignLibs' exes tests benches) =
+     PackageDescriptionPair
+       { pdpOrigBuildable = go False
+       , pdpModifiedBuildable = go True
+
+From 820797b566ef981936907f4d19658259d4a635a8 Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 17:01:01 -0700
+Subject: [PATCH 5/6] Fix generatePackageVersionMacros
+
+---
+ src/Stack/Build/Execute.hs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
+index 1e381dd21..aedd7fee5 100644
+--- a/src/Stack/Build/Execute.hs
++++ b/src/Stack/Build/Execute.hs
+@@ -1214,7 +1214,7 @@ withSingleContext ActionContext {..} ee@ExecuteEnv {..} task@Task {..} allDeps m
+                             let macroDeps = mapMaybe snd matchedDeps
+                                 cppMacrosFile = setupDir </> relFileSetupMacrosH
+                                 cppArgs = ["-optP-include", "-optP" ++ toFilePath cppMacrosFile]
+-                            writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros macroDeps)))
++                            writeBinaryFileAtomic cppMacrosFile (encodeUtf8Builder (T.pack (C.generatePackageVersionMacros (packageVersion package) macroDeps)))
+                             return (packageDBArgs ++ depsArgs ++ cppArgs)
+
+                         -- This branch is usually taken for builds, and
+
+From 336ab515e30f03c274f89ebe1cbc6aa1e597c2a4 Mon Sep 17 00:00:00 2001
+From: Brandon Chinn <brandon@leapyear.io>
+Date: Fri, 4 Jun 2021 17:04:16 -0700
+Subject: [PATCH 6/6] Fix ModuleReexport
+
+---
+ src/Stack/Script.hs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs
+index 6bb67c049..9ebd2173d 100644
+--- a/src/Stack/Script.hs
++++ b/src/Stack/Script.hs
+@@ -18,6 +18,7 @@ import           Distribution.Compiler      (CompilerFlavor (..))
+ import           Distribution.ModuleName    (ModuleName)
+ import qualified Distribution.PackageDescription as PD
+ import qualified Distribution.Types.CondTree as C
++import qualified Distribution.Types.ModuleReexport as ModuleReexport
+ import           Distribution.Types.PackageName (mkPackageName)
+ import           Distribution.Types.VersionRange (withinRange)
+ import           Distribution.System        (Platform (..))
+@@ -280,7 +281,7 @@ allExposedModules gpd = do
+       mlibrary = snd . C.simplifyCondTree checkCond <$> PD.condLibrary gpd
+   pure $ case mlibrary  of
+     Just lib -> PD.exposedModules lib ++
+-                map PD.moduleReexportName (PD.reexportedModules lib)
++                map ModuleReexport.moduleReexportName (PD.reexportedModules lib)
+     Nothing  -> mempty
+
+ -- | The Stackage project introduced the concept of hidden packages,
diff --git a/srcpkgs/stack/patches/persistent.patch b/srcpkgs/stack/patches/persistent.patch
new file mode 100644
index 000000000000..cf462d7b80c2
--- /dev/null
+++ b/srcpkgs/stack/patches/persistent.patch
@@ -0,0 +1,46 @@
+commit 188d7ece06ee06ed6ccaf0df0c46285bd43898f4
+Author: q66 <daniel@octaforge.org>
+Date:   Thu Apr 28 05:02:09 2022 +0200
+
+    constrain persistent to fix build
+
+diff --git a/stack.cabal b/stack.cabal
+index dba5bf0..e221321 100644
+--- a/stack.cabal
++++ b/stack.cabal
+@@ -281,7 +281,7 @@ library
+         pantry >=0.5.3,
+         path >=0.7.0,
+         path-io >=1.6.3,
+-        persistent >=2.11.0.4,
++        persistent >=2.11.0.4 && <2.14.0.0,
+         persistent-sqlite >=2.11.1.0,
+         persistent-template >=2.9.1.0,
+         pretty >=1.1.3.6,
+@@ -407,7 +407,7 @@ executable stack
+         pantry >=0.5.3,
+         path >=0.7.0,
+         path-io >=1.6.3,
+-        persistent >=2.11.0.4,
++        persistent >=2.11.0.4 && <2.14.0.0,
+         persistent-sqlite >=2.11.1.0,
+         persistent-template >=2.9.1.0,
+         pretty >=1.1.3.6,
+@@ -537,7 +537,7 @@ executable stack-integration-test
+         pantry >=0.5.3,
+         path >=0.7.0,
+         path-io >=1.6.3,
+-        persistent >=2.11.0.4,
++        persistent >=2.11.0.4 && <2.14.0.0,
+         persistent-sqlite >=2.11.1.0,
+         persistent-template >=2.9.1.0,
+         pretty >=1.1.3.6,
+@@ -672,7 +672,7 @@ test-suite stack-test
+         pantry >=0.5.3,
+         path >=0.7.0,
+         path-io >=1.6.3,
+-        persistent >=2.11.0.4,
++        persistent >=2.11.0.4 && <2.14.0.0,
+         persistent-sqlite >=2.11.1.0,
+         persistent-template >=2.9.1.0,
+         pretty >=1.1.3.6,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index 9e53b95ca633..15c38039684d 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
 version=2.7.5
-revision=1
-_stackage="lts-18.14"
+revision=2
+_stackage="lts-19.0"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -13,7 +13,7 @@ homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
 checksum="9ddd44c2a62e9404194d69e7dc1c94e707910620316b66d6ac0b3201a8f37e80
- 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
+ 6b9983f6448eb825231f65fe955d6d85516f482f0d26fee84183a1a79c6b0646"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From 7eb641c94400f8dd73a73c5703cb881b3e00959e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 09:17:26 +0100
Subject: [PATCH 1780/2561] cgrep: bump for stackage lts-19.0

---
 srcpkgs/cgrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index e57106f3fa26..1c54fe367396 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.7.1
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-18.15"
+stackage="lts-19.0"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

From 847994a0c60f0eaf50fe78aa04fc86808084cb35 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 09:23:26 +0100
Subject: [PATCH 1781/2561] git-mediate: bump for stackage lts-19.0

---
 srcpkgs/git-mediate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index 0c9ec10241e5..705df7843b8e 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,9 +1,9 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
 version=1.0.8.1
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-18.14"
+stackage="lts-19.0"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From 5c55a956d539fd7579f85c060ddd9db5522bb264 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 09:51:34 +0100
Subject: [PATCH 1782/2561] hlint: update to 3.3.6

---
 srcpkgs/hlint/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fd72c1bbea58..0109be25805f 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,16 +1,16 @@
 # Template file for 'hlint'
 pkgname=hlint
-version=3.2.7
-revision=2
+version=3.3.6
+revision=1
 build_style=haskell-stack
-stackage="lts-18.14"
+stackage="lts-19.0"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
 homepage="https://github.com/ndmitchell/hlint"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=fcdeefcc79a52206add44b409abcab48c5fe2adff9d5aff077acbc43c702b54e
+checksum=7d536c03f77a0c259efb2b00b525ef34578ca8a4a95ccb412708e8c7172e2e6a
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/hlint"
 

From 9d5e12c0cfdbb649f34091b99261bce55ef34161 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 11:38:44 +0100
Subject: [PATCH 1783/2561] pandoc: update to 2.17.1.1

+ Fix compilation of `pandoc-crossref` for musl systems.
+ Remove the `system-lua` flag, as `pkg-config` already implies it [1].

Related: https://github.com/lierdakil/pandoc-crossref/issues/342
[1]: https://github.com/hslua/hslua/blob/main/lua/README.md?plain=1#L39-L40
---
 srcpkgs/pandoc/files/pandoc-crossref.cabal | 154 +++++++++++++++++++++
 srcpkgs/pandoc/template                    |  43 +++---
 2 files changed, 173 insertions(+), 24 deletions(-)
 create mode 100644 srcpkgs/pandoc/files/pandoc-crossref.cabal

diff --git a/srcpkgs/pandoc/files/pandoc-crossref.cabal b/srcpkgs/pandoc/files/pandoc-crossref.cabal
new file mode 100644
index 000000000000..7aacc47278f3
--- /dev/null
+++ b/srcpkgs/pandoc/files/pandoc-crossref.cabal
@@ -0,0 +1,154 @@
+cabal-version: 2.0
+
+-- This file has been generated from package.yaml by hpack version 0.34.6.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: 20655cd6263e9fe7e5737ee81b093c8c6f5eae67e260ddd3a821ac6ef5e35e69
+
+name:           pandoc-crossref
+version:        0.3.13.0
+synopsis:       Pandoc filter for cross-references
+description:    pandoc-crossref is a pandoc filter for numbering figures, equations, tables and cross-references to them.
+category:       Text
+homepage:       https://github.com/lierdakil/pandoc-crossref#readme
+bug-reports:    https://github.com/lierdakil/pandoc-crossref/issues
+author:         Nikolay Yakimov
+maintainer:     root@livid.pp.ru
+license:        GPL-2
+license-file:   LICENSE
+build-type:     Simple
+
+source-repository head
+  type: git
+  location: https://github.com/lierdakil/pandoc-crossref
+
+flag enable_flaky_tests
+  description: Some tests rely on specific behaviour of pandoc, which may change between minor versions. These are still useful indicators for the developer, but not necessarily indicating there's a problem with the package itself. Enable if you know what you are doing.
+  manual: True
+  default: False
+
+library
+  exposed-modules:
+      Text.Pandoc.CrossRef
+  other-modules:
+      Text.Pandoc.CrossRef.References
+      Text.Pandoc.CrossRef.References.Blocks
+      Text.Pandoc.CrossRef.References.List
+      Text.Pandoc.CrossRef.References.Refs
+      Text.Pandoc.CrossRef.References.Types
+      Text.Pandoc.CrossRef.Util.CodeBlockCaptions
+      Text.Pandoc.CrossRef.Util.CustomLabels
+      Text.Pandoc.CrossRef.Util.Meta
+      Text.Pandoc.CrossRef.Util.ModifyMeta
+      Text.Pandoc.CrossRef.Util.Options
+      Text.Pandoc.CrossRef.Util.Settings
+      Text.Pandoc.CrossRef.Util.Settings.Gen
+      Text.Pandoc.CrossRef.Util.Settings.Template
+      Text.Pandoc.CrossRef.Util.Template
+      Text.Pandoc.CrossRef.Util.Util
+  hs-source-dirs:
+      lib
+      lib-internal
+  ghc-options: -Wall
+  build-depends:
+      base >=4.11 && <5
+    , containers >=0.1 && <0.7
+    , data-default >=0.4 && <0.8
+    , directory >=1 && <1.4
+    , filepath >=1.1 && <1.5
+    , microlens >=0.4.12.0 && <0.5.0.0
+    , microlens-mtl >=0.2.0.1 && <0.3.0.0
+    , microlens-th >=0.4.3.10 && <0.5.0.0
+    , mtl >=1.1 && <2.3
+    , pandoc >=2.10 && <2.18
+    , pandoc-types >=1.21 && <1.23
+    , roman-numerals ==0.5.*
+    , syb >=0.4 && <0.8
+    , template-haskell >=2.7.0.0 && <3.0.0.0
+    , text >=1.2.2 && <1.3
+    , utility-ht >=0.0.11 && <0.1.0
+  default-language: Haskell2010
+
+executable pandoc-crossref
+  main-is: pandoc-crossref.hs
+  other-modules:
+      ManData
+  hs-source-dirs:
+      src
+  ghc-options: -Wall -threaded
+  build-depends:
+      base >=4.11 && <5
+    , deepseq ==1.4.*
+    , gitrev >=1.3.1 && <1.4
+    , open-browser ==0.2.*
+    , optparse-applicative >=0.13 && <0.17
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , template-haskell >=2.7.0.0 && <3.0.0.0
+    , temporary >=1.2 && <1.4
+    , text >=1.2.2 && <1.3
+  default-language: Haskell2010
+
+test-suite test-integrative
+  type: exitcode-stdio-1.0
+  main-is: test-integrative.hs
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -fno-warn-unused-do-bind -threaded
+  build-depends:
+      base >=4.11 && <5
+    , directory >=1 && <1.4
+    , filepath >=1.1 && <1.5
+    , hspec >=2.4.4 && <3
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , text >=1.2.2 && <1.3
+  if flag(enable_flaky_tests)
+    cpp-options: -DFLAKY
+  default-language: Haskell2010
+
+test-suite test-pandoc-crossref
+  type: exitcode-stdio-1.0
+  main-is: test-pandoc-crossref.hs
+  other-modules:
+      Native
+      Paths_pandoc_crossref
+  autogen-modules:
+      Paths_pandoc_crossref
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -fno-warn-unused-do-bind -threaded
+  build-depends:
+      base >=4.11 && <5
+    , containers >=0.1 && <0.7
+    , data-default >=0.4 && <0.8
+    , hspec >=2.4.4 && <3
+    , microlens >=0.4.12.0 && <0.5.0.0
+    , mtl >=1.1 && <2.3
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , text >=1.2.2 && <1.3
+  if flag(enable_flaky_tests)
+    cpp-options: -DFLAKY
+  default-language: Haskell2010
+
+benchmark simple
+  type: exitcode-stdio-1.0
+  main-is: bench-simple.hs
+  other-modules:
+      Native
+  hs-source-dirs:
+      test
+  ghc-options: -Wall -fno-warn-unused-do-bind -threaded
+  build-depends:
+      base >=4.11 && <5
+    , criterion >=1.5.9.0 && <1.6
+    , pandoc >=2.10 && <2.18
+    , pandoc-crossref
+    , pandoc-types >=1.21 && <1.23
+    , text >=1.2.2 && <1.3
+  default-language: Haskell2010
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 8628b1d1f3c2..9bdf32ef3c53 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -1,18 +1,18 @@
 # Template file for 'pandoc'
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
-version=2.14.0.3
-revision=3
-_sidenote_version=0.20.0.0
+version=2.17.1.1
+revision=1
+_sidenote_version=0.22.1.0
 _monad_gen_version=0.3.0.1
 _crossref_version=0.3.12.2
 _roman_numerals_version=0.5.1.5
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.14"
+stackage="lts-19.0"
 make_build_args="
- --flag pandoc:embed_data_files --flag=hslua:system-lua
- --flag=hslua:pkg-config"
+ --flag pandoc:embed_data_files
+ --flag=lua:pkg-config"
 hostmakedepends="pkg-config unzip wget"
 makedepends="zlib-devel lua53-devel tar"
 short_desc="Universal converter between markup formats"
@@ -21,33 +21,28 @@ license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="http://johnmacfarlane.net/pandoc/"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://hackage.haskell.org/package/${pkgname}-sidenote-${_sidenote_version}/${pkgname}-sidenote-${_sidenote_version}.tar.gz
- https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
-checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
- 91f8e96d8470722d677d31d4bbf16c2ac6902567d818ed7a2715bad2617a4cdb
- be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
-subpackages="pandoc-sidenote"
-nocross=yes
-nopie_files="
- /usr/bin/pandoc
- /usr/bin/pandoc-sidenote"
-
-# pandoc-crossref is currently broken on musl. See lierdakil/pandoc-crossref#342 and commercialhaskell/stack#5683
-if [ "$XBPS_TARGET_LIBC" != "musl" ]; then
-	distfiles+="
+ https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz
  https://hackage.haskell.org/package/${pkgname}-crossref-${_crossref_version}/${pkgname}-crossref-${_crossref_version}.tar.gz
  https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz"
-	checksum+="
+checksum="649ec528d1413130c5ce304b826ff473b3696269eea8834d908589e775bd1ad1
+ c39dd7343b9cb4dc5b1c91c9e47c3d357874e9e1a30b8d377bbea0b1d50323b2
+ be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465
  94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4
  b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
-	nopie_files+="
- /usr/bin/pandoc-crossref"
-	subpackages+="
+subpackages="
+ pandoc-sidenote
  pandoc-crossref"
-fi
+nocross=yes
+nopie_files="
+ /usr/bin/pandoc
+ /usr/bin/pandoc-sidenote
+ /usr/bin/pandoc-crossref"
 
 post_extract() {
 	sed -i 's/tasty .*,/tasty,/' pandoc-*/pandoc.cabal
 	sed -i 's/zip-archive .*,/zip-archive,/' pandoc-*/pandoc.cabal
+	# See https://github.com/lierdakil/pandoc-crossref/issues/342#issuecomment-1073256586
+	cp "${FILESDIR}/pandoc-crossref.cabal" pandoc-crossref-${_crossref_version}
 }
 
 post_install() {

From 422c3d0d9d788a76223762fb24b2bbf9b3e5bb3d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 12:15:01 +0100
Subject: [PATCH 1784/2561] shellcheck: bump for stackage lts-19.0

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 70eee6c2854b..903d703488d6 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.8.0
-revision=2
+revision=3
 build_style=haskell-stack
-stackage="lts-18.14"
+stackage="lts-19.0"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 7e0354d6a9a97faf0645be5d55448d945399a67e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 12:52:11 +0100
Subject: [PATCH 1785/2561] hoogle: update to 5.0.18.3

---
 srcpkgs/hoogle/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 4c3e80186494..dc487cab4017 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,16 +1,16 @@
 # Template file for 'hoogle'
 pkgname=hoogle
-version=5.0.18.2
-revision=2
+version=5.0.18.3
+revision=1
 build_style=haskell-stack
-stackage="lts-18.14"
+stackage="lts-19.0"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
 license="BSD-3-Clause"
 homepage="https://hoogle.haskell.org/"
 distfiles="https://github.com/ndmitchell/${pkgname}/archive/v${version}.tar.gz"
-checksum=9f8f0afde52fe602100ab7828fad230c2f5e94050dda9fe1e2a9f0a93f7fe617
+checksum=a2765fcbaf99fe67a64ef29fe50e69fb380cce07807cddeb0836c148b1ae472b
 nopie_files="/usr/bin/hoogle"
 nocross=yes # Can't yet cross compile Haskell
 

From c7abbe190c4357413ff582a8cecc5dca5cda2d3e Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 13:33:12 +0100
Subject: [PATCH 1786/2561] xmobar: update to 0.42

Also enable most flags during compilation in order to be less surprising
with regards to what features xmobar supports out of the box.
---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 47544eb729d8..7e0956374142 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-18.13
+resolver: lts-19.0
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index b97c9f268d68..6a12a9ed7055 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
-version=0.39
-revision=2
+version=0.42
+revision=1
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel
@@ -15,10 +15,10 @@ maintainer="xaltsc <xaltsc@protonmail.ch>"
 license="BSD-3-Clause"
 homepage="https://xmobar.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz"
-checksum=46f37b90dd3ba3348dbe7de716b88606c7f0f0dd22a3580176b5cd089c1b36cc
+checksum=53f4a06d79c3db32ef1a498ec7b764b17d03ebf9bca3126c6b8259595492769b
 build_options="dbus threaded utf8 xft mpd mpris inotify iwlib alsa datezone
  xpm uvmeter weather nl80211"
-build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm"
+build_options_default="threaded utf8 xft inotify nl80211 datezone weather xpm alsa mpris mpd dbus"
 nopie_files="/usr/bin/xmobar"
 nocross=yes
 vopt_hflag() {

From 1dea1a9e78506fc33a7a73948cdb6b01e26465a1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 20 Mar 2022 18:09:34 +0100
Subject: [PATCH 1787/2561] hledger: update to 1.25

---
 srcpkgs/hledger/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index fdcab180a6de..32d39207fd82 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,8 +1,9 @@
 # Template file for 'hledger'
 pkgname=hledger
-version=1.23
-revision=2
+version=1.25
+revision=1
 build_style=haskell-stack
+stackage="lts-19.0"
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"
 maintainer="Inokentiy Babushkin <twk@twki.de>"
@@ -10,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://hledger.org/"
 changelog="https://hackage.haskell.org/package/hledger-${version}/changelog"
 distfiles="https://github.com/simonmichael/${pkgname}/archive/${version}.tar.gz"
-checksum=7252d78aafbae488b113a6350518a702186cacc4e746cec2b31f8321b4dddcb4
+checksum=4c947c2a7d243d2a56efc1fa02994a118e995df025a412f6d2daeadfd78338ee
 nopie_files="/usr/bin/hledger"
 nocross=yes # Can't yet cross compile Haskell
 

From 05579e84dfe4cbfb6d4925e4a302bc2ce552e472 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 21 Mar 2022 08:19:29 +0100
Subject: [PATCH 1788/2561] haskell-language-server: update to 1.6.1.0

---
 srcpkgs/haskell-language-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index 0182c9b95757..0c7b2187c5ca 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.4.0
+version=1.6.1.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.7.yaml"
+make_build_args="--stack-yaml stack-9.0.2.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=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
+checksum=e5c336ad2de8d021c882cdac5bbc26bf6427df8d2a5bd244c05cf18296a9bfdc
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 5882afbf32036ecb461f4ed3193a62c3ebcec764 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Mon, 21 Mar 2022 15:48:58 +0100
Subject: [PATCH 1789/2561] git-annex: update to 10.20220222

---
 srcpkgs/git-annex/files/stack.yaml | 33 ++++++++++++++++++++++++++++++
 srcpkgs/git-annex/template         |  5 +++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/git-annex/files/stack.yaml

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
new file mode 100644
index 000000000000..4935307f48cf
--- /dev/null
+++ b/srcpkgs/git-annex/files/stack.yaml
@@ -0,0 +1,33 @@
+flags:
+  git-annex:
+    production: true
+    assistant: true
+    pairing: true
+    torrentparser: true
+    webapp: true
+    magicmime: false
+    dbus: false
+    debuglocks: false
+    benchmark: true
+    networkbsd: true
+    gitlfs: true
+    httpclientrestricted: true
+packages:
+  - '.'
+resolver: lts-19.0
+extra-deps:
+  - IfElse-0.85
+  - aws-0.22
+  - bloomfilter-2.0.1.0
+  - git-lfs-1.2.0
+  - http-client-restricted-0.0.4
+  - network-multicast-0.3.2
+  - sandi-0.5
+  - torrent-10000.1.1
+  - base16-bytestring-0.1.1.7
+  - base64-bytestring-1.0.0.3
+  - bencode-0.6.1.1
+  - aeson-1.5.6.0@sha256:5003bb6fd260d2e2d5a51dee2bf5c8e8f29e4e0e0288fef805c22dcc80ecab06,6788
+  - http-client-0.7.11@sha256:3f59ac8ffe2a3768846cdda040a0d1df2a413960529ba61c839861c948871967,5756
+explicit-setup-deps:
+    git-annex: true
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index 1cf2ab14789f..7b788bc5861e 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,8 +1,9 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20211028
+version=10.20220222
 revision=1
 build_style=haskell-stack
+stackage="lts-19.0"
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
  lsof rsync git ncurses-devel"
 # depends are utilities required by git-annex
@@ -12,7 +13,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=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d
+checksum=1fb9f75a83feb16f7515122135c0f3abe6aa77544d8d778792296cbc053d2c85
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From b40a6cc9f5f97405be0cc5f19f60f5fe539b9807 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 23 Mar 2022 09:14:58 +0100
Subject: [PATCH 1790/2561] darcs: bump for stackage lts-19.0

---
 srcpkgs/darcs/files/stack.yaml | 7 ++-----
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index 5ae0f5313b8d..6e459703764a 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,7 +1,4 @@
-resolver: lts-18.14
+resolver: lts-19.0
 packages:
 - .
-extra-deps:
-- graphviz-2999.20.1.0
-- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
-- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
+allow-newer: true
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index f9fcac534d46..15a8f71f9021 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.5
-revision=2
+revision=3
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 40d3c4dc32d0825d601a149e9fe6131e16f2c253 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 24 Mar 2022 11:50:45 +0100
Subject: [PATCH 1791/2561] debug-me: update to 1.20220324

---
 srcpkgs/debug-me/files/stack.yaml        |  8 +++---
 srcpkgs/debug-me/patches/ghc8.10.4.patch | 33 ------------------------
 srcpkgs/debug-me/template                |  7 ++---
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/debug-me/patches/ghc8.10.4.patch

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index ad8b055bb33e..f2b1a79d70c6 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,8 +1,6 @@
 packages:
 - '.'
-resolver: lts-18.14
+resolver: lts-19.0
 extra-deps:
-- posix-pty-0.2.1.1
-- graphviz-2999.20.1.0
-- sandi-0.5
-- protobuf-0.2.1.3@sha256:d8ed3c73027c6b7e7583c6a94ee1835beee8a755a875b06bbf51bc667d53ab69,3048
+  - posix-pty-0.2.1.1
+  - sandi-0.5@sha256:b278d072ca717706ea38f9bd646e023f7f2576a778fb43565b434f93638849aa,3010
diff --git a/srcpkgs/debug-me/patches/ghc8.10.4.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch
deleted file mode 100644
index bfcff16a4438..000000000000
--- a/srcpkgs/debug-me/patches/ghc8.10.4.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/Val.hs	2020-03-31 11:00:33.329814064 +0200
-+++ b/Val.hs	2020-03-31 11:00:24.602711845 +0200
-@@ -42,7 +42,7 @@
- b64 :: B.ByteString -> T.Text
- b64 = T.decodeUtf8 . B64.encode
-
--unb64 :: Monad m => T.Text -> m B.ByteString
-+unb64 :: MonadFail m => T.Text -> m B.ByteString
- unb64 t = either
- 	(\_ -> fail "bad base64 data")
- 	return
---- a/Server.hs	2020-03-31 12:53:45.860509650 +0200
-+++ b/Server.hs	2020-03-31 12:52:34.873835069 +0200
-@@ -105,7 +105,7 @@
- 		-- (Workaround for
- 		-- https://github.com/jaspervdj/websockets/issues/140)
- 		setHost "*6" $
--		setPort (serverPort o) $
-+		setPort (CmdLine.serverPort o) $
- 		defaultSettings
-
- checkEnv :: ServerOpts -> IO ServerOpts
---- a/debug-me.cabal
-+++ b/debug-me.cabal
-@@ -64,7 +64,7 @@
-     , stm-chans (>= 3.0)
-     , posix-pty (>= 0.2.1)
-     , terminal-size (>= 0.3)
--    , aeson (>= 0.11 && < 1.5)
-+    , aeson (>= 0.11 && < 1.6)
-     , sandi (>= 0.4)
-     , text (>= 1.2.2)
-     , optparse-applicative (>= 0.12)
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 86ac0037311a..f971f2156c77 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,15 +1,16 @@
 # Template file for 'debug-me'
 pkgname=debug-me
-version=1.20200820
-revision=3
+version=1.20220324
+revision=1
 build_style=haskell-stack
+stackage="lts-19.0"
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://debug-me.branchable.com/"
 distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=9497dc9b85a58e5c499ea25fa1bed9f4fd6cdd2f57564f52a0e4152ad4fdc102
+checksum=9fd6256aa34408106ff095e0560850aca3558a774be4ce19de6ab6e81fbfdb9f
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/debug-me"
 

From ba8220827211385a683a9870501cab8e5898b527 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 25 Mar 2022 14:40:52 +0100
Subject: [PATCH 1792/2561] ghc-bin: update to 9.0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sigrid Solveig Haflínudóttir <ftrvxmtrx@gmail.com>
---
 srcpkgs/ghc-bin/template | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 3949ee3fa1aa..d05dcd821f37 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.7
+version=9.0.2
 revision=1
 archs="i686 x86_64* ppc64le* ppc64"
 wrksrc="ghc-${version%[!0-9]}"
@@ -15,29 +15,29 @@ noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
-	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
+	distfiles="https://downloads.haskell.org/ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
+	checksum=805f5628ce6cec678ba77ff48c924831ebdf75ec2c66368e8935a618913a150e
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
+	checksum=e21eaddeffcd5de7abe43b1f3982a3bc2c5b5f408d2574857cb2b0368106e12c
 	;;
 i686)
-	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
+	distfiles="https://downloads.haskell.org/ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
+	checksum=fdeb9f8928fbe994064778a8e1e85bb1a58a6cd3dd7b724fcc2a1dcfda6cad47
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"
-	checksum=4662c88bc642941d9d463fd4878fc799e081c6fc5b10d2df5fa48e0cadea888c
+	checksum=7de8114c991f9a2a3b0f5e472da76e3956be6447efec4b1157f14e707049f22d
 	;;
 ppc64le-musl)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux-musl.tar.xz"
-	checksum=c01b2d9d4c7b05a62f79b24e374413ac524116cbe5fb7c20673d62b8c3eebf10
+	checksum=37de8e069712307c9b2039e92f56e540e80ca1390dd27aa247ebe18c40e0c629
 	;;
 ppc64)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz"
-	checksum=b8578e602abd4b453845303fb9cfed0b2186f86f60e3aa45869026ea833726c8
+	checksum=6eb8684fdbede0cded7e3f7b93574b968f5f66dd2fcd4ec30ac5f0c402af6602
 	;;
 *)
 	broken="No distfiles available for this target"

From 04a0c4ea8784141a2b2b72d8ffcdee6fafd6fa56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Thu, 24 Mar 2022 09:27:25 +0100
Subject: [PATCH 1793/2561] ghc, ghc-bin: Add aarch64* support

---
 srcpkgs/ghc-bin/template | 12 +++++++++++-
 srcpkgs/ghc/template     |  8 ++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index d05dcd821f37..996be0fb5f53 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -2,7 +2,7 @@
 pkgname=ghc-bin
 version=9.0.2
 revision=1
-archs="i686 x86_64* ppc64le* ppc64"
+archs="i686 x86_64* ppc64le* ppc64 aarch64*"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
@@ -39,6 +39,16 @@ ppc64)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz"
 	checksum=6eb8684fdbede0cded7e3f7b93574b968f5f66dd2fcd4ec30ac5f0c402af6602
 	;;
+aarch64)
+	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux.tar.xz"
+	checksum=44a20a896246dce64392b7d0feedd0a28a9d733245a803e95dbe4b4b7e15b4fd
+	depends+=" llvm"
+	;;
+aarch64-musl)
+	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-aarch64-void-linux-musl.tar.xz"
+	checksum=de98e2ff33a25cb32a28c738066fecacb736a33cac12688876eec4eb96d88607
+	depends+=" llvm"
+	;;
 *)
 	broken="No distfiles available for this target"
 	;;
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index c4bbb3e4e3b1..d0b1600987be 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -54,6 +54,14 @@ elif [ "${XBPS_MACHINE%-*}" != "${XBPS_TARGET_MACHINE%-*}" ]; then
 	configure_args+=" --host=${XBPS_TRIPLET} --target=${XBPS_CROSS_TRIPLET}"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+aarch64*)
+	# GHC uses LLVM to generate code on aarch64
+	hostmakedepends+=" llvm"
+	depends+=" llvm"
+	;;
+esac
+
 # Recent safe to use tarball
 # GHC's bundled tarball is from 2017, buggy on some archs
 _ffi_rev=4d6d2866ae43e55325e8ee96561221804602cd7a

From 7a888d46c488b583f6106bc662d23f9c48269635 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 24 Mar 2022 14:27:41 +0100
Subject: [PATCH 1794/2561] kmonad: update to
 65b501defdd0049563752f8af8c8c57f5a1ae38b

The reason for updating to an unreleased version is that the author
(and core maintainer) of the project is chronically ill[1] and unable
to spend a lot of time on kmonad.  At the same time, there is a rather
large refactor on the way, without which a new release would not make
too much sense[2].  As such, updating to what's essentially HEAD makes
sense in this case; it is not any less stable than 0.4.1 (I've
personally been running this for months without any problems).  As a
bonus, we get GHC 9.0.2 compatibility for free and do not need to
cherry pick the relevant commits.

[1]: https://github.com/kmonad/kmonad#disclaimer
[2]: https://github.com/kmonad/kmonad/pull/372
---
 srcpkgs/kmonad/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index c93d2bee4c4f..829d96a535eb 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,15 +1,15 @@
 # Template file for 'kmonad'
 pkgname=kmonad
-version=0.4.1
-revision=3
+version=65b501defdd0049563752f8af8c8c57f5a1ae38b
+revision=1
 build_style=haskell-stack
-stackage=lts-18.14
+stackage=lts-19.0
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"
 homepage="https://github.com/david-janssen/kmonad"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=cb66f0c6d4c304c7e3c48cefd0c50ea00b156ffc361e278e1fc5c6070317d927
+checksum=2b0cb0c5d1575bf61b1c442476ad24103028c309d103fedb56214a3bb30f8c0f
 nopie_files="/usr/bin/kmonad"
 nocross=yes
 

From 04c12e8951fe90edc70c82e17c816987cae565cd Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Apr 2022 15:23:36 +0200
Subject: [PATCH 1795/2561] minify: update to 2.11.2.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 7131527fa009..9be3e9620c49 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.11.1
+version=2.11.2
 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=f238ffcb9ed6ff3c413442e3c5bfe9409809cc3de67db29ebc541d83168a09ea
+checksum=de1bcdf33c8bb3fafa2286f71d28c4639dcba044dae1707232eb53ed6980a33a
 
 post_install() {
 	vlicense LICENSE

From e8ce7a1cbbab8905e485cfb91b69040c08569424 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Apr 2022 15:24:56 +0200
Subject: [PATCH 1796/2561] xrootconsole: update to 0.6.5.

---
 srcpkgs/xrootconsole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xrootconsole/template b/srcpkgs/xrootconsole/template
index 029212328a27..a9ee30ed0758 100644
--- a/srcpkgs/xrootconsole/template
+++ b/srcpkgs/xrootconsole/template
@@ -1,7 +1,7 @@
 # Template file for 'xrootconsole'
 pkgname=xrootconsole
 reverts=0.6r3_3
-version=0.6.4
+version=0.6.5
 revision=1
 create_wrksrc=yes
 build_wrksrc="xrootconsole-${version%.*}"
@@ -14,7 +14,7 @@ homepage="https://packages.debian.org/source/sid/xrootconsole"
 distfiles="${DEBIAN_SITE}/main/x/xrootconsole/xrootconsole_${version%.*}.orig.tar.gz
  ${DEBIAN_SITE}/main/x/xrootconsole/xrootconsole_${version%.*}-${version##*.}.debian.tar.xz"
 checksum="8306de6f4d3f39677334ee65214e46729cf2dd89aeff1705df3c499738a4076d
- 4d9429c1588d3be7b47eeba6f06371184e71562a439ec9fcacc340776b845f41"
+ 332e080e61f02290454147f14624a94803e4664a996271cfab124633b48f9bcf"
 
 post_extract() {
 	for p in debian/patches/*.patch; do

From cc63d36237818712b0ee22354513d25ee341b298 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Apr 2022 19:09:02 +0200
Subject: [PATCH 1797/2561] ghc-bin: mark nocross.

---
 srcpkgs/ghc-bin/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index 996be0fb5f53..21847afbecb5 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -10,6 +10,7 @@ short_desc="Glorious Haskell Compiler - precompiled binaries"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
+nocross=yes
 nostrip=yes
 noshlibprovides=yes
 conflicts="ghc>=0 ghc-doc>=0"

From eb5f5f0d328f9c36cf18d68f251fcfa688f15ac0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Apr 2022 19:11:08 +0200
Subject: [PATCH 1798/2561] cabal-install: fix build.

---
 srcpkgs/cabal-install/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 6a4b0ad7fc0e..e50dba1d51b2 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,7 +1,7 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
 version=3.6.3.0
-revision=1
+revision=2
 wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
@@ -15,6 +15,10 @@ checksum=dea086acad6d9fe5fe22d838b95b4e988022e8519f38d41609119ea32bfb7466
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
+post_extract() {
+	cp "${FILESDIR}/linux-9.0.2.json" bootstrap/
+}
+
 post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
@@ -24,7 +28,6 @@ post_patch() {
 }
 
 do_build() {
-	cp "${FILESDIR}/linux-9.0.2.json" bootstrap/
 	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-9.0.2.json
 }
 do_install() {

From a7320f4db2370bcbaebf5a38c9e6e814df3af103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 28 Apr 2022 17:36:17 +0200
Subject: [PATCH 1799/2561] postfix: update to 3.7.2.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 466de1f19105..a9994b1233fa 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.7.1
+version=3.7.2
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="https://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=25c3e7ec09955af873407af3070fd259da8477b80e2f4663c5fdc00a2cc947ee
+checksum=3785f76c2924a02873c0be0f0cd124a9166fc1aaf77ea2a06bd4ad795a6ed416
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From 39a11e377bc8a67db38b66cddc37a58230b37028 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 28 Apr 2022 11:54:19 +0200
Subject: [PATCH 1800/2561] sqlite: update to 3.38.3.

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index e0be13546327..17f75a5f22a0 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.2
+version=3.38.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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=e7974aa1430bad690a5e9f79a6ee5c8492ada8269dc675875ad0fb747d7cada4
+checksum=61f2dd93a2e38c33468b7125967c3218bf9f4dd8365def6025e314f905dc942e
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From 39767fdf345d82582d91c238edd376b2fd51fe92 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 28 Apr 2022 22:44:39 +0200
Subject: [PATCH 1801/2561] curl: update to 7.83.0.

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 16a1abd02150..74358a24969d 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,6 +1,6 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.82.0
+version=7.83.0
 revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
@@ -24,7 +24,7 @@ license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=46d9a0400a33408fd992770b04a44a7434b3036f2e8089ac28b57573d59d371f
+checksum=247c7ec7521c4258e65634e529270d214fe32969971cccb72845e7aa46831f96
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssh ssl zstd"
 vopt_conflict ssl gnutls

From 414cf525401da080010cdc5eb50041d601654e17 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Fri, 29 Apr 2022 00:20:49 +0200
Subject: [PATCH 1802/2561] teams-bin: update to 1.5.00.10453.

---
 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 43a0d6e8d907..92e7fe8bd41e 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.26453
+version=1.5.00.10453
 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=ee15b57793aa6b79ccda744d5232da670335abd931bae2a020f5043a129ab859
+checksum=7cb570d9ac5231eb6e6a84738e0fb1e0345863c58fe5341b2fb2db7c5e8b15f0
 
 repository=nonfree
 restricted=yes

From 790a62011b55f8bedb446e804f49e02467607fa2 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sun, 24 Apr 2022 15:24:40 -0500
Subject: [PATCH 1803/2561] lazarus: update to 2.2.0.

---
 srcpkgs/lazarus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lazarus/template b/srcpkgs/lazarus/template
index 92c904cceb9a..cf12477f758d 100644
--- a/srcpkgs/lazarus/template
+++ b/srcpkgs/lazarus/template
@@ -1,9 +1,9 @@
 # Template file for 'lazarus'
 pkgname=lazarus
-version=2.0.10
+version=2.2.0
 revision=1
 # For adding a revision suffix to version on the source tarball file
-_version_revision_suffix="-2"
+_version_revision_suffix="-0"
 archs="x86_64 i686"
 wrksrc=lazarus
 hostmakedepends="fpc rsync"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, MPL-2.0, LGPL-2.0-or-later"
 homepage="http://www.lazarus.freepascal.org"
 distfiles="${SOURCEFORGE_SITE}/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${_version_revision_suffix}.tar.gz"
-checksum=64d5626468dd24a3332b205f3abd0a581ab7de1b060a2d57e21864066cfd43b7
+checksum=b6b5d516511e3dfb34910d7656db068d4bba80f009692500aebbcae79cb12160
 nopie=yes
 lib32disabled=yes
 

From a73225da2951e5e1389269700ac2e596908bc68e Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 28 Apr 2022 17:29:34 -0500
Subject: [PATCH 1804/2561] Signal-Desktop: update to 5.41.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 448189474620..43e11503bd50 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.40.1
+version=5.41.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=d80d210554e0296d916f7e25d9a49afc58340ab03ef7a1e7ae21017e80e9de7b
+checksum=55a201912f5a41c1a76d210d3942078e734ac619df7ffb56083149ce4995e949
 nostrip_files="signal-desktop"
 
 post_extract() {

From 05268673f7f7d1b32adf0d27fc2ced8c06d78ca1 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Mon, 18 Apr 2022 13:30:56 +0200
Subject: [PATCH 1805/2561] PolyMC: update to 1.2.1.

---
 srcpkgs/PolyMC/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template
index 3b3b0deb3466..91b439b6b529 100644
--- a/srcpkgs/PolyMC/template
+++ b/srcpkgs/PolyMC/template
@@ -1,9 +1,9 @@
 # Template file for 'PolyMC'
 pkgname=PolyMC
-version=1.1.1
+version=1.2.1
 revision=1
 build_style=cmake
-configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_PORTABLE=0
+configure_args="-DLauncher_BUILD_PLATFORM=Void
  -DLauncher_VERSION_BUILD=${revision}"
 hostmakedepends="openjdk8 qt5-host-tools qt5-qmake"
 makedepends="qt5-devel"
@@ -13,7 +13,11 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-only"
 homepage="https://polymc.org/"
 distfiles="https://github.com/PolyMC/PolyMC/releases/download/${version}/PolyMC-${version}.tar.gz"
-checksum=7ade9abc3a6f61ed27a129c10084c783cc9a3266484a53e29dabcc1cbb0ba5c4
+checksum=cec7b0175bd0dc3ff2a43e822d1218772e0833332026ae681c81ecc5c51bf608
+
+if [ -z "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBUILD_TESTING=0"
+fi
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;

From 55ad9305b8d7a8a835fe3f9a56c5114e77574248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Thu, 28 Apr 2022 18:13:25 +0200
Subject: [PATCH 1806/2561] pipewire: update to 0.3.51

---
 srcpkgs/pipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 6427e0b66e77..4cf367d32675 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.50
+version=0.3.51
 revision=1
 _pms_version=0.4.1
 build_style=meson
@@ -32,7 +32,7 @@ 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
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="a4bd81e9046f0bd19ecc18402b44199c6c4c54305670e43111c7fbdfe4d17bdf
+checksum="f18e7a2cd2fcd75482c3df4e736e01435bd20779ddf63da63b0a086d3a9735ac
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

From c336303cdb3dfc32d659738ec5e0aaf68f1e45f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 28 Apr 2022 17:24:48 +0200
Subject: [PATCH 1807/2561] croc: update to 9.5.4.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 4ff52c773d40..5a4e8dcb6556 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.5.3
+version=9.5.4
 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=7f8ac260c786bc3f1e3c577e6ac3d3e27d0d8cffa90d7a8d21cec85fe6f22abc
+checksum=b89b9d1c2e27e5ca710a7c524f70361122b8b0fd374c0be18f1e7337acca7d07
 
 post_install() {
 	vlicense LICENSE

From c53cb7e3b81b1ed419ad4f3f86818bc2da6b4b7d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:15:34 -0400
Subject: [PATCH 1808/2561] New package: php8.0-8.0.18

---
 srcpkgs/php8.0-apache                         |   1 +
 srcpkgs/php8.0-cgi                            |   1 +
 srcpkgs/php8.0-devel                          |   1 +
 srcpkgs/php8.0-embed                          |   1 +
 srcpkgs/php8.0-enchant                        |   1 +
 srcpkgs/php8.0-ffi                            |   1 +
 srcpkgs/php8.0-fpm                            |   1 +
 srcpkgs/php8.0-gd                             |   1 +
 srcpkgs/php8.0-intl                           |   1 +
 srcpkgs/php8.0-ldap                           |   1 +
 srcpkgs/php8.0-mysql                          |   1 +
 srcpkgs/php8.0-odbc                           |   1 +
 srcpkgs/php8.0-pgsql                          |   1 +
 srcpkgs/php8.0-phpdbg                         |   1 +
 srcpkgs/php8.0-snmp                           |   1 +
 srcpkgs/php8.0-sodium                         |   1 +
 srcpkgs/php8.0-sqlite                         |   1 +
 srcpkgs/php8.0-tidy                           |   1 +
 srcpkgs/php8.0-xsl                            |   1 +
 srcpkgs/php8.0/files/apache.conf              |  13 +
 srcpkgs/php8.0/files/php-fpm8.0/run           |   3 +
 srcpkgs/php8.0/patches/php-706-crypt.patch    |  15 +
 srcpkgs/php8.0/patches/php-cross-config.patch |  41 +++
 srcpkgs/php8.0/patches/php-fpm.patch          |  13 +
 .../patches/php-ltmain-sysroot-support.patch  |  39 ++
 .../php8.0/patches/php-opcache-cross.patch    |  14 +
 srcpkgs/php8.0/patches/php-pear-cross.patch   |  23 ++
 srcpkgs/php8.0/patches/php-phar-cross.patch   |  29 ++
 .../patches/php-phpize-sysroot-support.patch  |  28 ++
 srcpkgs/php8.0/patches/php.ini.patch          |  24 ++
 srcpkgs/php8.0/template                       | 337 ++++++++++++++++++
 srcpkgs/php8.0/update                         |   2 +
 32 files changed, 600 insertions(+)
 create mode 120000 srcpkgs/php8.0-apache
 create mode 120000 srcpkgs/php8.0-cgi
 create mode 120000 srcpkgs/php8.0-devel
 create mode 120000 srcpkgs/php8.0-embed
 create mode 120000 srcpkgs/php8.0-enchant
 create mode 120000 srcpkgs/php8.0-ffi
 create mode 120000 srcpkgs/php8.0-fpm
 create mode 120000 srcpkgs/php8.0-gd
 create mode 120000 srcpkgs/php8.0-intl
 create mode 120000 srcpkgs/php8.0-ldap
 create mode 120000 srcpkgs/php8.0-mysql
 create mode 120000 srcpkgs/php8.0-odbc
 create mode 120000 srcpkgs/php8.0-pgsql
 create mode 120000 srcpkgs/php8.0-phpdbg
 create mode 120000 srcpkgs/php8.0-snmp
 create mode 120000 srcpkgs/php8.0-sodium
 create mode 120000 srcpkgs/php8.0-sqlite
 create mode 120000 srcpkgs/php8.0-tidy
 create mode 120000 srcpkgs/php8.0-xsl
 create mode 100644 srcpkgs/php8.0/files/apache.conf
 create mode 100755 srcpkgs/php8.0/files/php-fpm8.0/run
 create mode 100644 srcpkgs/php8.0/patches/php-706-crypt.patch
 create mode 100644 srcpkgs/php8.0/patches/php-cross-config.patch
 create mode 100644 srcpkgs/php8.0/patches/php-fpm.patch
 create mode 100644 srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch
 create mode 100644 srcpkgs/php8.0/patches/php-opcache-cross.patch
 create mode 100644 srcpkgs/php8.0/patches/php-pear-cross.patch
 create mode 100644 srcpkgs/php8.0/patches/php-phar-cross.patch
 create mode 100644 srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch
 create mode 100644 srcpkgs/php8.0/patches/php.ini.patch
 create mode 100644 srcpkgs/php8.0/template
 create mode 100644 srcpkgs/php8.0/update

diff --git a/srcpkgs/php8.0-apache b/srcpkgs/php8.0-apache
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-apache
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-cgi b/srcpkgs/php8.0-cgi
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-cgi
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-devel b/srcpkgs/php8.0-devel
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-devel
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-embed b/srcpkgs/php8.0-embed
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-embed
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-enchant b/srcpkgs/php8.0-enchant
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-enchant
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-ffi b/srcpkgs/php8.0-ffi
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-ffi
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-fpm b/srcpkgs/php8.0-fpm
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-fpm
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-gd b/srcpkgs/php8.0-gd
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-gd
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-intl b/srcpkgs/php8.0-intl
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-intl
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-ldap b/srcpkgs/php8.0-ldap
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-ldap
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-mysql b/srcpkgs/php8.0-mysql
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-mysql
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-odbc b/srcpkgs/php8.0-odbc
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-odbc
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-pgsql b/srcpkgs/php8.0-pgsql
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-pgsql
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-phpdbg b/srcpkgs/php8.0-phpdbg
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-phpdbg
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-snmp b/srcpkgs/php8.0-snmp
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-snmp
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-sodium b/srcpkgs/php8.0-sodium
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-sodium
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-sqlite b/srcpkgs/php8.0-sqlite
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-sqlite
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-tidy b/srcpkgs/php8.0-tidy
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-tidy
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0-xsl b/srcpkgs/php8.0-xsl
new file mode 120000
index 000000000000..104f2d35908d
--- /dev/null
+++ b/srcpkgs/php8.0-xsl
@@ -0,0 +1 @@
+php8.0
\ No newline at end of file
diff --git a/srcpkgs/php8.0/files/apache.conf b/srcpkgs/php8.0/files/apache.conf
new file mode 100644
index 000000000000..17a0ad5f6fa4
--- /dev/null
+++ b/srcpkgs/php8.0/files/apache.conf
@@ -0,0 +1,13 @@
+# Required modules: dir_module, php8.0_module
+
+<IfModule dir_module>
+	<IfModule php8.0_module>
+		DirectoryIndex index.php index.html
+		<FilesMatch "\.php$">
+			SetHandler application/x-httpd-php
+		</FilesMatch>
+		<FilesMatch "\.phps$">
+			SetHandler application/x-httpd-php-source
+		</FilesMatch>
+	</IfModule>
+</IfModule>
diff --git a/srcpkgs/php8.0/files/php-fpm8.0/run b/srcpkgs/php8.0/files/php-fpm8.0/run
new file mode 100755
index 000000000000..f1c712335ab8
--- /dev/null
+++ b/srcpkgs/php8.0/files/php-fpm8.0/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec php-fpm8.0 --nodaemonize ${OPTS}
diff --git a/srcpkgs/php8.0/patches/php-706-crypt.patch b/srcpkgs/php8.0/patches/php-706-crypt.patch
new file mode 100644
index 000000000000..254f1d2187c2
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-706-crypt.patch
@@ -0,0 +1,15 @@
+--- a/ext/standard/crypt.c	2016-04-28 14:13:00.000000000 -0400
++++ b/ext/standard/crypt.c	2016-04-28 21:45:24.340955313 -0400
+@@ -267,6 +267,12 @@
+ 	}
+ # elif defined(HAVE_CRYPT)
+ 	crypt_res = crypt(password, salt);
++	if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
++		return NULL;
++	} else {
++		result = zend_string_init(crypt_res, strlen(crypt_res), 0);
++		return result;
++	}
+ # else
+ #  error No crypt() implementation
+ # endif
diff --git a/srcpkgs/php8.0/patches/php-cross-config.patch b/srcpkgs/php8.0/patches/php-cross-config.patch
new file mode 100644
index 000000000000..24de8c58cbdd
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-cross-config.patch
@@ -0,0 +1,41 @@
+--- a/configure	2020-03-17 11:40:20.000000000 +0100
++++ b/configure	2020-04-12 19:51:57.216350534 +0200
+@@ -6374,10 +6374,12 @@ IFS="- /.
+     as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5
+   fi
+ 
++  APXS_PREFIX='$(INSTALL_ROOT)'/usr
+   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+   if test -z `$APXS -q SYSCONFDIR`; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
++                       -S PREFIX='$APXS_PREFIX' \
+                        -i -n php"
+   else
+     APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+@@ -6385,6 +6387,7 @@ IFS="- /.
+                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
++                       -S PREFIX='$APXS_PREFIX' \
+                        -i -a -n php"
+   fi
+ 
+@@ -57170,7 +57173,7 @@ $as_echo_n "checking for pg_config... "
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+@@ -58821,7 +58824,7 @@ $as_echo_n "checking for pg_config... "
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ $as_echo "$PG_CONFIG" >&6; }
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.0/patches/php-fpm.patch b/srcpkgs/php8.0/patches/php-fpm.patch
new file mode 100644
index 000000000000..5e55e179f8a4
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-fpm.patch
@@ -0,0 +1,13 @@
+--- a/sapi/fpm/Makefile.frag	2017-04-15 23:58:56.965737425 +0200
++++ b/sapi/fpm/Makefile.frag	2017-04-16 00:00:57.814831649 +0200
+@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
+ 	else \
+ 		echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
+ 		$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+-		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+-		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
+ 	fi
+ 	
+ 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
diff --git a/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch
new file mode 100644
index 000000000000..bbe0a514a9e8
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-ltmain-sysroot-support.patch
@@ -0,0 +1,39 @@
+--- a/build/ltmain.sh	2021-09-09 15:19:14.822208365 +0200
++++ b/build/ltmain.sh	2021-09-09 15:47:55.397011151 +0200
+@@ -2375,6 +2375,13 @@ EOF
+ 	*) . ./$lib ;;
+ 	esac
+ 
++        newdependency_libs=
++        for deplib in $dependency_libs; do
++            deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
++            newdependency_libs="$newdependency_libs $deplib"
++        done
++        dependency_libs=${newdependency_libs}
++
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -5750,6 +5757,13 @@ fi\
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
++
++          newdependency_libs=
++          for deplib in $dependency_libs; do
++              deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
++              newdependency_libs="$newdependency_libs $deplib"
++          done
++
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -5767,7 +5781,7 @@ library_names='$library_names'
+ old_library='$old_library'
+ 
+ # Libraries that this one depends upon.
+-dependency_libs='$dependency_libs'
++dependency_libs='$newdependency_libs'
+ 
+ # Version information for $libname.
+ current=$current
diff --git a/srcpkgs/php8.0/patches/php-opcache-cross.patch b/srcpkgs/php8.0/patches/php-opcache-cross.patch
new file mode 100644
index 000000000000..5d8a8c5ceed5
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-opcache-cross.patch
@@ -0,0 +1,14 @@
+diff --git a/configure b/configure.new
+index 1159224b4c..29f763aa05 100755
+--- a/configure
++++ b/configure.new
+@@ -51689,7 +51689,8 @@ $as_echo "$have_shm_ipc" >&6; }
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5
+ $as_echo_n "checking for mmap() using MAP_ANON shared memory support... " >&6; }
+   if test "$cross_compiling" = yes; then :
+-  have_shm_mmap_anon=no
++$as_echo "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
++  have_shm_mmap_anon=yes
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
diff --git a/srcpkgs/php8.0/patches/php-pear-cross.patch b/srcpkgs/php8.0/patches/php-pear-cross.patch
new file mode 100644
index 000000000000..f9191a50a0b5
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-pear-cross.patch
@@ -0,0 +1,23 @@
+--- a/pear/Makefile.frag	2020-03-17 11:40:21.000000000 +0100
++++ b/pear/Makefile.frag	2020-04-12 22:29:31.846943414 +0200
+@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null`
+ PEAR_PREFIX = -dp a${program_prefix}
+ PEAR_SUFFIX = -ds a$(program_suffix)
+ PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
++PEAR_PHP ?= $(top_builddir)/sapi/cli/php
+ 
+ install-pear-installer: $(SAPI_CLI_PATH)
+-	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
++	@$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
+ 
+ install-pear:
+ 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
+@@ -23,7 +24,7 @@ install-pear:
+ 			elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
+ 				"$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
+ 			else \
+-				$(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
++				$(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
+ 			fi \
+ 		fi \
+ 	fi
diff --git a/srcpkgs/php8.0/patches/php-phar-cross.patch b/srcpkgs/php8.0/patches/php-phar-cross.patch
new file mode 100644
index 000000000000..1e4e627ec65b
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-phar-cross.patch
@@ -0,0 +1,29 @@
+--- a/ext/phar/Makefile.frag	2020-04-13 12:18:23.998801926 +0200
++++ b/ext/phar/Makefile.frag	2020-04-13 12:20:58.031795293 +0200
+@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p
+ 
+ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
+ 
++PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH)
++PHAR_PHP_MODULES ?= $(top_builddir)/modules
+ PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
+ PHP_PHARCMD_EXECUTABLE = ` \
+-	if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
+-		$(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
++	if test -x "$(PHAR_PHP)"; then \
++		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \
+ 		if test "x$(PHP_MODULES)" != "x"; then \
+-		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
++		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \
+ 		for i in bz2 zlib phar; do \
+ 			if test -f "$(top_builddir)/modules/$$i.la"; then \
+ 				. $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
+ 		done; \
+ 		fi; \
+ 	else \
+-		$(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
++		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \
+ 	fi;`
+ PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
+ 
diff --git a/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch
new file mode 100644
index 000000000000..76cff3f81664
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php-phpize-sysroot-support.patch
@@ -0,0 +1,28 @@
+--- a/scripts/phpize.m4	2020-03-17 11:40:21.000000000 +0100
++++ b/scripts/phpize.m4	2020-04-15 12:27:36.400466387 +0200
+@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir],
+   [lib],
+   [no])
+ 
++PHP_ARG_WITH([sysroot],,
++  [AS_HELP_STRING([--with-sysroot=NAME],
++    [System sysroot])],
++    [no],
++    [no])
++
+ PHP_RUNPATH_SWITCH
+ PHP_SHLIB_SUFFIX_NAMES
+ 
+@@ -58,7 +64,11 @@ dnl For BC.
+ PHP_CONFIG=$PHP_PHP_CONFIG
+ prefix=`$PHP_CONFIG --prefix 2>/dev/null`
+ phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
+-INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++if test "x$PHP_SYSROOT" = xno; then :
++	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++else
++	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"`
++fi
+ EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
+ PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
+ 
diff --git a/srcpkgs/php8.0/patches/php.ini.patch b/srcpkgs/php8.0/patches/php.ini.patch
new file mode 100644
index 000000000000..07e38a04cf4f
--- /dev/null
+++ b/srcpkgs/php8.0/patches/php.ini.patch
@@ -0,0 +1,24 @@
+diff --git php.ini-production php.ini-production
+index 794d3e8ddb..c7acf9c883 100644
+--- a/php.ini-production
++++ b/php.ini-production
+@@ -729,7 +729,7 @@ default_charset = "UTF-8"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
++include_path = ".:/usr/share/pear"
+ ;
+ ; Windows: "\path1;\path2"
+ ;include_path = ".;c:\php\includes"
+@@ -752,9 +752,7 @@ user_dir =
+ 
+ ; Directory in which the loadable extensions (modules) reside.
+ ; http://php.net/extension-dir
+-;extension_dir = "./"
+-; On windows:
+-;extension_dir = "ext"
++extension_dir = "/usr/lib/php8.0/modules/"
+ 
+ ; Directory where the temporary files should be placed.
+ ; Defaults to the system default (see sys_get_temp_dir)
diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
new file mode 100644
index 000000000000..2ddb350061f3
--- /dev/null
+++ b/srcpkgs/php8.0/template
@@ -0,0 +1,337 @@
+# Template file for 'php8.0'
+pkgname=php8.0
+version=8.0.18
+revision=1
+_php_version=8.0
+wrksrc="php-${version}"
+hostmakedepends="bison pkg-config apache-devel curl"
+makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
+ gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
+ libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
+ postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
+ libffi-devel oniguruma-devel gd-devel"
+short_desc="HTML-embedded scripting language"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://www.php.net"
+distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
+checksum=cd980f5a2f422362f8c52d314ed25140c6f472877c5442c4f3304205f54e192a
+
+fetch_cmd="curl -O"
+
+conf_files="/etc/php${_php_version}/php.ini"
+
+lib32disabled=yes
+
+if [ -n "$CROSS_BUILD" ]; then
+	# phar needs php to build
+	hostmakedepends+=" php${_php_version}"
+	CFLAGS+=" -DHAVE_LIBDL
+		 -DHAVE_DLOPEN
+		 -DHAVE_DLSYM
+		 -DHAVE_SHM_IPC
+		 -DHAVE_SHM_MMAP_ANON
+		 -DHAVE_SHM_MMAP_ZERO
+		 -DHAVE_SHM_MMAP_POSIX
+		 -DHAVE_SHM_MMAP_FILE"
+fi
+
+do_build() {
+	local _phpconfig="--srcdir=.. \
+		--config-cache \
+		--prefix=/usr \
+		--sbindir=/usr/bin \
+		--sysconfdir=/etc/php${_php_version} \
+		--localstatedir=/var \
+		--with-layout=GNU \
+		--with-config-file-path=/etc/php${_php_version} \
+		--with-config-file-scan-dir=/etc/php${_php_version}/conf.d \
+		--disable-rpath \
+		--mandir=/usr/share/man \
+		--libdir=/usr/lib/php${_php_version} \
+		--datarootdir=/usr/share/php${_php_version} \
+		--datadir=/usr/share/php${_php_version} \
+		--program-suffix=${_php_version} \
+		--includedir=/usr/include/php${_php_version} \
+		"
+
+	local _phpextensions="--enable-bcmath=shared \
+		--enable-calendar=shared \
+		--enable-exif=shared \
+		--enable-ftp=shared \
+		--enable-intl=shared \
+		--enable-mbstring \
+		--enable-opcache \
+		--enable-pcntl \
+		--enable-phar=shared \
+		--enable-posix=shared \
+		--enable-shmop=shared \
+		--enable-soap=shared \
+		--enable-sockets=shared \
+		--enable-sysvmsg=shared \
+		--enable-sysvsem=shared \
+		--enable-sysvshm=shared \
+		--enable-mysqlnd \
+		--enable-gd=shared \
+		--with-external-gd \
+		--with-ffi=shared \
+		--with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
+		--with-curl=shared \
+		--with-db4=$XBPS_CROSS_BASE/usr \
+		--with-enchant=shared,$XBPS_CROSS_BASE/usr \
+		--with-gdbm=$XBPS_CROSS_BASE/usr \
+		--with-gettext=shared \
+		--with-gmp=shared \
+		--with-iconv=shared \
+		--with-ldap=shared,$XBPS_CROSS_BASE/usr \
+		--with-ldap-sasl \
+		--with-sodium=shared \
+		--with-mhash \
+		--with-mysql-sock=/run/mysqld/mysqld.sock \
+		--with-mysqli=shared,mysqlnd \
+		--with-openssl=shared \
+		--with-external-pcre \
+		--without-pear \
+		--with-pdo-mysql=shared,mysqlnd \
+		--with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
+		--with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
+		--with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
+		--with-pgsql=shared,$XBPS_CROSS_BASE/usr \
+		--with-readline=$XBPS_CROSS_BASE/usr \
+		--with-snmp=shared,$XBPS_CROSS_BASE/usr \
+		--with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
+		--with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
+		--with-xsl=shared,$XBPS_CROSS_BASE/usr \
+		--with-tidy=shared,$XBPS_CROSS_BASE/usr \
+		--with-zip=shared \
+		--with-zlib \
+		${configure_args} \
+		"
+	if [ -n "$CROSS_BUILD" ]; then
+		local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules"
+	fi
+
+	EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
+	export EXTENSION_DIR
+	PEAR_INSTALLDIR=/usr/share/pear
+	export PEAR_INSTALLDIR
+	EXTRA_LIBS="-ldl"
+	export EXTRA_LIBS
+
+	# cgi,cli,embed,fcgi,fpm
+	mkdir -p build
+	cd build
+	ln -s ${wrksrc}/configure
+	./configure ${_phpconfig} \
+		--host=${XBPS_CROSS_TRIPLET} \
+		--enable-cgi \
+		--enable-fpm \
+		--with-fpm-user=http \
+		--with-fpm-group=http \
+		--enable-embed=shared \
+		${_phpextensions}
+	make ${makejobs} ${_make_env}
+
+	# apache
+	# reuse the previous run; this will save us a lot of time
+	cp -a ${wrksrc}/build ${wrksrc}/build-apache
+	cd ${wrksrc}/build-apache
+	./configure ${_phpconfig} \
+		--host=${XBPS_CROSS_TRIPLET} \
+		--with-apxs2 \
+		${_phpextensions}
+	make ${makejobs} ${_make_env}
+}
+
+do_install() {
+	cd ${wrksrc}/build
+	local _env="INSTALL_ROOT=${DESTDIR}"
+	if [ -n "$CROSS_BUILD" ]; then
+		_env+=" PHAR_PHP=/usr/bin/php${_php_version}"
+	fi
+	make ${_env} install-{modules,cli,build,headers,programs,pharcmd}
+
+	# install php.ini
+	vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
+	# remove static modules
+	rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
+}
+
+php8.0-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/php${_php_version}/build"
+		vmove "usr/bin/php-config${_php_version}"
+		vmove "usr/bin/phpize${_php_version}"
+		vmove "usr/share/man/man1/phpize${_php_version}.1"
+		vmove "usr/share/man/man1/php-config${_php_version}.1"
+	}
+}
+
+php8.0-phpdbg_package() {
+	short_desc+=" - interactive debugger"
+	depends="php${_php_version}-${version}_${revision}"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
+	}
+}
+
+php8.0-cgi_package() {
+	short_desc+=' - CGI and FCGI SAPI'
+	depends="php${_php_version}-${version}_${revision}"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-cgi
+	}
+}
+
+php8.0-apache_package() {
+	short_desc+=' - Apache SAPI'
+	depends="php${_php_version}-${version}_${revision}"
+	conf_files="/etc/apache/extra/php${_php_version}_module.conf"
+	pkg_install() {
+		vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
+		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"
+	}
+}
+
+php8.0-fpm_package() {
+	short_desc+=' - FastCGI Process Manager'
+	depends="php${_php_version}-${version}_${revision}"
+	conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-fpm
+		vsv "php-fpm${_php_version}"
+	}
+}
+
+php8.0-embed_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - Embed SAPI'
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi
+		mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so
+	}
+}
+
+php8.0-enchant_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - enchant module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/enchant.so"
+	}
+}
+
+php8.0-gd_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - gd module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/gd.so"
+	}
+}
+
+php8.0-intl_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - Internationalization module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/intl.so"
+	}
+}
+
+php8.0-ldap_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - LDAP module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/ldap.so"
+	}
+}
+
+php8.0-mysql_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - MySQL modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*mysql*.so"
+	}
+}
+
+php8.0-odbc_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - ODBC modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*odbc.so"
+	}
+}
+
+php8.0-pgsql_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - PostgreSQL modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*pgsql.so"
+	}
+}
+
+php8.0-snmp_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - snmp module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/snmp.so"
+	}
+}
+
+php8.0-sqlite_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - sqlite module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*sqlite*.so"
+	}
+}
+
+php8.0-tidy_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - tidy HTML module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*tidy*.so"
+	}
+}
+
+php8.0-xsl_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - XSL module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/xsl.so"
+	}
+}
+
+php8.0-sodium_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - sodium module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/sodium.so"
+	}
+}
+
+php8.0-ffi_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - FFI module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/ffi.so"
+	}
+}
diff --git a/srcpkgs/php8.0/update b/srcpkgs/php8.0/update
new file mode 100644
index 000000000000..c4d9bc5958ca
--- /dev/null
+++ b/srcpkgs/php8.0/update
@@ -0,0 +1,2 @@
+pkgname=php
+ignore="8.[1-9].*"

From b8739a96f606fc67abd96151aabc6cc64d8f51dc Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:32:37 -0400
Subject: [PATCH 1809/2561] New package: php8.0-apcu-5.1.21

---
 srcpkgs/php8.0-apcu/INSTALL.msg |  3 +++
 srcpkgs/php8.0-apcu/template    | 29 +++++++++++++++++++++++++++++
 srcpkgs/php8.0-apcu/update      |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/php8.0-apcu/INSTALL.msg
 create mode 100644 srcpkgs/php8.0-apcu/template
 create mode 100644 srcpkgs/php8.0-apcu/update

diff --git a/srcpkgs/php8.0-apcu/INSTALL.msg b/srcpkgs/php8.0-apcu/INSTALL.msg
new file mode 100644
index 000000000000..9da8a70ccc2b
--- /dev/null
+++ b/srcpkgs/php8.0-apcu/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable APCu add the following line to your php.ini:
+
+	extension=apcu.so
diff --git a/srcpkgs/php8.0-apcu/template b/srcpkgs/php8.0-apcu/template
new file mode 100644
index 000000000000..0409dd840ff5
--- /dev/null
+++ b/srcpkgs/php8.0-apcu/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.0-apcu'
+pkgname=php8.0-apcu
+version=5.1.21
+revision=1
+wrksrc="apcu-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.0"
+make_check_target=test
+hostmakedepends="autoconf php8.0-devel"
+makedepends="php8.0-devel pcre2-devel"
+depends="php8.0"
+short_desc="In-memory key-value store for PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/APCu"
+distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
+checksum=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+
+pre_configure() {
+	phpize8.0
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+	rm -r $DESTDIR/usr/include
+}
diff --git a/srcpkgs/php8.0-apcu/update b/srcpkgs/php8.0-apcu/update
new file mode 100644
index 000000000000..ad899519e313
--- /dev/null
+++ b/srcpkgs/php8.0-apcu/update
@@ -0,0 +1,2 @@
+site="https://pecl.php.net/package/APCu"
+pattern="apcu-\K[\d\.]*(?=\.tgz)"

From 90985ae0359257f6d075a1a9b5bfb4de2c54ddbd Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:30:18 -0400
Subject: [PATCH 1810/2561] New package: php8.0-ast-1.0.16

---
 srcpkgs/php8.0-ast/INSTALL.msg |  2 ++
 srcpkgs/php8.0-ast/template    | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/php8.0-ast/INSTALL.msg
 create mode 100644 srcpkgs/php8.0-ast/template

diff --git a/srcpkgs/php8.0-ast/INSTALL.msg b/srcpkgs/php8.0-ast/INSTALL.msg
new file mode 100644
index 000000000000..0dd0b5df2d96
--- /dev/null
+++ b/srcpkgs/php8.0-ast/INSTALL.msg
@@ -0,0 +1,2 @@
+To enable the ast extension please add the following to php.ini:
+	extension=ast.so 
diff --git a/srcpkgs/php8.0-ast/template b/srcpkgs/php8.0-ast/template
new file mode 100644
index 000000000000..7f7a3bda75d2
--- /dev/null
+++ b/srcpkgs/php8.0-ast/template
@@ -0,0 +1,25 @@
+# Template file for 'php8.0-ast'
+pkgname=php8.0-ast
+version=1.0.16
+revision=1
+wrksrc="ast-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.0"
+hostmakedepends="php8.0-devel autoconf"
+makedepends="php8.0-devel"
+depends="php8.0"
+short_desc="Exposes the abstract syntax tree generated by PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/nikic/php-ast"
+distfiles="https://pecl.php.net/get/ast-${version}.tgz"
+checksum=45bda34b780c4661ce77cf65cd8a504fb56526d4b456edcc97d791c86f3879ce
+
+pre_configure() {
+	phpize8.0
+}
+
+do_install() {
+	make INSTALL_ROOT=${DESTDIR} install
+	vlicense LICENSE
+}

From fdef0d97030546738f48b5c3f85bad9217bd2331 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:29:14 -0400
Subject: [PATCH 1811/2561] New package: php8.0-igbinary-3.2.7

---
 srcpkgs/php8.0-igbinary/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/php8.0-igbinary/template

diff --git a/srcpkgs/php8.0-igbinary/template b/srcpkgs/php8.0-igbinary/template
new file mode 100644
index 000000000000..f74c6f88186c
--- /dev/null
+++ b/srcpkgs/php8.0-igbinary/template
@@ -0,0 +1,25 @@
+# Template file for 'php8.0-igbinary'
+pkgname=php8.0-igbinary
+version=3.2.7
+revision=1
+wrksrc="igbinary-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.0"
+hostmakedepends="autoconf php8.0-devel"
+makedepends="php8.0-devel"
+depends="php8.0"
+short_desc="Igbinary is a drop in replacement for the standard php serializer"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/igbinary/igbinary/"
+distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
+checksum=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+
+pre_configure() {
+	phpize8.0
+}
+
+do_install() {
+	make INSTALL_ROOT="${DESTDIR}" install
+	vlicense COPYING
+}

From acb96a19f3b4bb6434f31762d90c7ee6ff06eea8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:31:34 -0400
Subject: [PATCH 1812/2561] New package: php8.0-imagick-3.7.0

---
 srcpkgs/php8.0-imagick/INSTALL.msg            |  3 ++
 ...le-libmagick-header-file-search-path.patch | 17 +++++++++++
 srcpkgs/php8.0-imagick/template               | 29 +++++++++++++++++++
 srcpkgs/php8.0-imagick/update                 |  1 +
 4 files changed, 50 insertions(+)
 create mode 100644 srcpkgs/php8.0-imagick/INSTALL.msg
 create mode 100644 srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
 create mode 100644 srcpkgs/php8.0-imagick/template
 create mode 100644 srcpkgs/php8.0-imagick/update

diff --git a/srcpkgs/php8.0-imagick/INSTALL.msg b/srcpkgs/php8.0-imagick/INSTALL.msg
new file mode 100644
index 000000000000..00497519fcee
--- /dev/null
+++ b/srcpkgs/php8.0-imagick/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the Imagick extension add the following line to your php.ini:
+
+	extension=imagick.so
diff --git a/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
new file mode 100644
index 000000000000..16b8aaa57371
--- /dev/null
+++ b/srcpkgs/php8.0-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
@@ -0,0 +1,17 @@
+--- a/imagemagick.m4	2021-09-09 10:53:42.287881616 +0200
++++ b/imagemagick.m4	2021-09-09 11:14:47.662312430 +0200
+@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
+   
+     AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h])
+ 
++  elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
++
++    IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
++    IM_HEADER_STYLE="SEVEN"
++    AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header])
++
++    AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h])
++
+   elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
+ 
+     IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
diff --git a/srcpkgs/php8.0-imagick/template b/srcpkgs/php8.0-imagick/template
new file mode 100644
index 000000000000..9b0e0ba248c5
--- /dev/null
+++ b/srcpkgs/php8.0-imagick/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.0-imagick'
+pkgname=php8.0-imagick
+version=3.7.0
+revision=1
+wrksrc="imagick-$version"
+build_style=gnu-configure
+configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
+ --with-php-config=/usr/bin/php-config8.0"
+hostmakedepends="php8.0-devel autoconf pkg-config"
+makedepends="php8.0-devel pcre2-devel libmagick-devel"
+depends="php8.0"
+short_desc="Provides a PHP wrapper to the ImageMagick library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/imagick"
+distfiles="https://pecl.php.net/get/imagick-$version.tgz"
+checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
+
+pre_configure() {
+	phpize8.0
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+	rm -r $DESTDIR/usr/include
+}
diff --git a/srcpkgs/php8.0-imagick/update b/srcpkgs/php8.0-imagick/update
new file mode 100644
index 000000000000..fb47044a964d
--- /dev/null
+++ b/srcpkgs/php8.0-imagick/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'

From 18a0d6ef85823b1b9e224a78e53568c53759068f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:45:45 -0400
Subject: [PATCH 1813/2561] New package: composer8.0-2.3.5

---
 srcpkgs/composer8.0/files/composer8.0 |  2 ++
 srcpkgs/composer8.0/template          | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/composer8.0/files/composer8.0
 create mode 100644 srcpkgs/composer8.0/template

diff --git a/srcpkgs/composer8.0/files/composer8.0 b/srcpkgs/composer8.0/files/composer8.0
new file mode 100644
index 000000000000..2a3236b4a5ff
--- /dev/null
+++ b/srcpkgs/composer8.0/files/composer8.0
@@ -0,0 +1,2 @@
+#!/bin/sh
+php8.0 -f /usr/libexec/composer.phar8.0 "$@"
diff --git a/srcpkgs/composer8.0/template b/srcpkgs/composer8.0/template
new file mode 100644
index 000000000000..dfc9de6993bd
--- /dev/null
+++ b/srcpkgs/composer8.0/template
@@ -0,0 +1,26 @@
+# Template file for 'composer8.0'
+pkgname=composer8.0
+version=2.3.5
+revision=1
+build_style=fetch
+depends="php8.0"
+short_desc="Dependency manager for PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://getcomposer.org/"
+changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
+distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
+ https://raw.githubusercontent.com/composer/composer/main/LICENSE"
+checksum="3b3b5a899c06a46aec280727bdf50aad14334f6bc40436ea76b07b650870d8f4
+ 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
+
+do_install() {
+	vbin ${FILESDIR}/composer8.0
+
+	vinstall composer.phar 644 usr/libexec composer.phar8.0
+	vlicense LICENSE
+
+	vmkdir /etc/php8.0/conf.d
+	printf 'extension=%s\n' phar iconv openssl zip \
+		>${DESTDIR}/etc/php8.0/conf.d/composer.ini
+}

From ba14caa3b8f88b8e70260e6f0c25e65499902099 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 14:20:19 -0400
Subject: [PATCH 1814/2561] New package: xdebug8.0-3.1.4

---
 srcpkgs/xdebug8.0/INSTALL.msg |  1 +
 srcpkgs/xdebug8.0/template    | 29 +++++++++++++++++++++++++++++
 srcpkgs/xdebug8.0/update      |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/xdebug8.0/INSTALL.msg
 create mode 100644 srcpkgs/xdebug8.0/template
 create mode 100644 srcpkgs/xdebug8.0/update

diff --git a/srcpkgs/xdebug8.0/INSTALL.msg b/srcpkgs/xdebug8.0/INSTALL.msg
new file mode 100644
index 000000000000..04e3343216f7
--- /dev/null
+++ b/srcpkgs/xdebug8.0/INSTALL.msg
@@ -0,0 +1 @@
+You should add 'zend_extension="xdebug.so"' to php.ini
diff --git a/srcpkgs/xdebug8.0/template b/srcpkgs/xdebug8.0/template
new file mode 100644
index 000000000000..159f30cd5299
--- /dev/null
+++ b/srcpkgs/xdebug8.0/template
@@ -0,0 +1,29 @@
+# Template file for 'xdebug8.0'
+pkgname=xdebug8.0
+version=3.1.4
+revision=1
+wrksrc="xdebug-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.0"
+hostmakedepends="autoconf"
+makedepends="php8.0-devel"
+short_desc="PHP debugging extension"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.0"
+homepage="http://xdebug.org"
+changelog="https://xdebug.org/updates"
+distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
+checksum=4195926f9f6c4e802ff749bb2ca85ac50636719a72e5389e372e35ef523505f9
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" php8.0-devel"
+fi
+
+pre_configure() {
+	phpize8.0
+}
+
+do_install() {
+	make INSTALL_ROOT=${DESTDIR} install
+	vlicense LICENSE
+}
diff --git a/srcpkgs/xdebug8.0/update b/srcpkgs/xdebug8.0/update
new file mode 100644
index 000000000000..280b0bc7e3ac
--- /dev/null
+++ b/srcpkgs/xdebug8.0/update
@@ -0,0 +1,2 @@
+site="https://xdebug.org/updates"
+pattern='<dt><a name=.*></a>.*Xdebug \K[\d.]+(?=</dt>)'

From 78ebd016f1c7bbde56b0beb3e0433acf13b3157a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:13:12 -0400
Subject: [PATCH 1815/2561] New package: php8.1-8.1.5

---
 srcpkgs/php8.1-apache                         |   1 +
 srcpkgs/php8.1-cgi                            |   1 +
 srcpkgs/php8.1-devel                          |   1 +
 srcpkgs/php8.1-embed                          |   1 +
 srcpkgs/php8.1-enchant                        |   1 +
 srcpkgs/php8.1-ffi                            |   1 +
 srcpkgs/php8.1-fpm                            |   1 +
 srcpkgs/php8.1-gd                             |   1 +
 srcpkgs/php8.1-intl                           |   1 +
 srcpkgs/php8.1-ldap                           |   1 +
 srcpkgs/php8.1-mysql                          |   1 +
 srcpkgs/php8.1-odbc                           |   1 +
 srcpkgs/php8.1-pgsql                          |   1 +
 srcpkgs/php8.1-phpdbg                         |   1 +
 srcpkgs/php8.1-snmp                           |   1 +
 srcpkgs/php8.1-sodium                         |   1 +
 srcpkgs/php8.1-sqlite                         |   1 +
 srcpkgs/php8.1-tidy                           |   1 +
 srcpkgs/php8.1-xsl                            |   1 +
 srcpkgs/php8.1/files/apache.conf              |  13 +
 srcpkgs/php8.1/files/php-fpm8.1/run           |   3 +
 srcpkgs/php8.1/patches/php-706-crypt.patch    |  15 +
 srcpkgs/php8.1/patches/php-cross-config.patch |  22 ++
 srcpkgs/php8.1/patches/php-fpm.patch          |  13 +
 .../patches/php-ltmain-sysroot-support.patch  |  39 ++
 srcpkgs/php8.1/patches/php-pear-cross.patch   |  23 ++
 srcpkgs/php8.1/patches/php-phar-cross.patch   |  29 ++
 .../patches/php-phpize-sysroot-support.patch  |  28 ++
 srcpkgs/php8.1/patches/php.ini.patch          |  24 ++
 srcpkgs/php8.1/template                       | 337 ++++++++++++++++++
 srcpkgs/php8.1/update                         |   2 +
 31 files changed, 567 insertions(+)
 create mode 120000 srcpkgs/php8.1-apache
 create mode 120000 srcpkgs/php8.1-cgi
 create mode 120000 srcpkgs/php8.1-devel
 create mode 120000 srcpkgs/php8.1-embed
 create mode 120000 srcpkgs/php8.1-enchant
 create mode 120000 srcpkgs/php8.1-ffi
 create mode 120000 srcpkgs/php8.1-fpm
 create mode 120000 srcpkgs/php8.1-gd
 create mode 120000 srcpkgs/php8.1-intl
 create mode 120000 srcpkgs/php8.1-ldap
 create mode 120000 srcpkgs/php8.1-mysql
 create mode 120000 srcpkgs/php8.1-odbc
 create mode 120000 srcpkgs/php8.1-pgsql
 create mode 120000 srcpkgs/php8.1-phpdbg
 create mode 120000 srcpkgs/php8.1-snmp
 create mode 120000 srcpkgs/php8.1-sodium
 create mode 120000 srcpkgs/php8.1-sqlite
 create mode 120000 srcpkgs/php8.1-tidy
 create mode 120000 srcpkgs/php8.1-xsl
 create mode 100644 srcpkgs/php8.1/files/apache.conf
 create mode 100755 srcpkgs/php8.1/files/php-fpm8.1/run
 create mode 100644 srcpkgs/php8.1/patches/php-706-crypt.patch
 create mode 100644 srcpkgs/php8.1/patches/php-cross-config.patch
 create mode 100644 srcpkgs/php8.1/patches/php-fpm.patch
 create mode 100644 srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch
 create mode 100644 srcpkgs/php8.1/patches/php-pear-cross.patch
 create mode 100644 srcpkgs/php8.1/patches/php-phar-cross.patch
 create mode 100644 srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch
 create mode 100644 srcpkgs/php8.1/patches/php.ini.patch
 create mode 100644 srcpkgs/php8.1/template
 create mode 100644 srcpkgs/php8.1/update

diff --git a/srcpkgs/php8.1-apache b/srcpkgs/php8.1-apache
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-apache
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-cgi b/srcpkgs/php8.1-cgi
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-cgi
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-devel b/srcpkgs/php8.1-devel
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-devel
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-embed b/srcpkgs/php8.1-embed
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-embed
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-enchant b/srcpkgs/php8.1-enchant
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-enchant
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-ffi b/srcpkgs/php8.1-ffi
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-ffi
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-fpm b/srcpkgs/php8.1-fpm
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-fpm
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-gd b/srcpkgs/php8.1-gd
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-gd
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-intl b/srcpkgs/php8.1-intl
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-intl
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-ldap b/srcpkgs/php8.1-ldap
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-ldap
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-mysql b/srcpkgs/php8.1-mysql
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-mysql
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-odbc b/srcpkgs/php8.1-odbc
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-odbc
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-pgsql b/srcpkgs/php8.1-pgsql
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-pgsql
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-phpdbg b/srcpkgs/php8.1-phpdbg
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-phpdbg
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-snmp b/srcpkgs/php8.1-snmp
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-snmp
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-sodium b/srcpkgs/php8.1-sodium
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-sodium
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-sqlite b/srcpkgs/php8.1-sqlite
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-sqlite
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-tidy b/srcpkgs/php8.1-tidy
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-tidy
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1-xsl b/srcpkgs/php8.1-xsl
new file mode 120000
index 000000000000..4ad857cc7c08
--- /dev/null
+++ b/srcpkgs/php8.1-xsl
@@ -0,0 +1 @@
+php8.1
\ No newline at end of file
diff --git a/srcpkgs/php8.1/files/apache.conf b/srcpkgs/php8.1/files/apache.conf
new file mode 100644
index 000000000000..f321ec12d31b
--- /dev/null
+++ b/srcpkgs/php8.1/files/apache.conf
@@ -0,0 +1,13 @@
+# Required modules: dir_module, php8.1_module
+
+<IfModule dir_module>
+	<IfModule php8.1_module>
+		DirectoryIndex index.php index.html
+		<FilesMatch "\.php$">
+			SetHandler application/x-httpd-php
+		</FilesMatch>
+		<FilesMatch "\.phps$">
+			SetHandler application/x-httpd-php-source
+		</FilesMatch>
+	</IfModule>
+</IfModule>
diff --git a/srcpkgs/php8.1/files/php-fpm8.1/run b/srcpkgs/php8.1/files/php-fpm8.1/run
new file mode 100755
index 000000000000..5928ea5103ef
--- /dev/null
+++ b/srcpkgs/php8.1/files/php-fpm8.1/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec php-fpm8.1 --nodaemonize ${OPTS}
diff --git a/srcpkgs/php8.1/patches/php-706-crypt.patch b/srcpkgs/php8.1/patches/php-706-crypt.patch
new file mode 100644
index 000000000000..254f1d2187c2
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-706-crypt.patch
@@ -0,0 +1,15 @@
+--- a/ext/standard/crypt.c	2016-04-28 14:13:00.000000000 -0400
++++ b/ext/standard/crypt.c	2016-04-28 21:45:24.340955313 -0400
+@@ -267,6 +267,12 @@
+ 	}
+ # elif defined(HAVE_CRYPT)
+ 	crypt_res = crypt(password, salt);
++	if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
++		return NULL;
++	} else {
++		result = zend_string_init(crypt_res, strlen(crypt_res), 0);
++		return result;
++	}
+ # else
+ #  error No crypt() implementation
+ # endif
diff --git a/srcpkgs/php8.1/patches/php-cross-config.patch b/srcpkgs/php8.1/patches/php-cross-config.patch
new file mode 100644
index 000000000000..169c43f1df93
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-cross-config.patch
@@ -0,0 +1,22 @@
+diff --git a/configure b/configure
+index e4b82d1..1a8678f 100755
+--- a/configure
++++ b/configure
+@@ -62424,7 +62424,7 @@ printf %s "checking for pg_config... " >&6; }
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ printf "%s\n" "$PG_CONFIG" >&6; }
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
+@@ -63948,7 +63948,7 @@ printf %s "checking for pg_config... " >&6; }
+     fi
+   done
+ 
+-  if test -n "$PG_CONFIG"; then
++  if test -n "$PG_CONFIG" && test "x$cross_compiling" != "xyes"; then
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
+ printf "%s\n" "$PG_CONFIG" >&6; }
+     PGSQL_INCLUDE=`$PG_CONFIG --includedir`
diff --git a/srcpkgs/php8.1/patches/php-fpm.patch b/srcpkgs/php8.1/patches/php-fpm.patch
new file mode 100644
index 000000000000..5e55e179f8a4
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-fpm.patch
@@ -0,0 +1,13 @@
+--- a/sapi/fpm/Makefile.frag	2017-04-15 23:58:56.965737425 +0200
++++ b/sapi/fpm/Makefile.frag	2017-04-16 00:00:57.814831649 +0200
+@@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH)
+ 	else \
+ 		echo "Installing PHP FPM defconfig:     $(INSTALL_ROOT)$(sysconfdir)/" && \
+ 		$(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \
+-		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \
+-		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \
++		$(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
++		$(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
+ 	fi
+ 	
+ 	@echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
diff --git a/srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch b/srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch
new file mode 100644
index 000000000000..bbe0a514a9e8
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-ltmain-sysroot-support.patch
@@ -0,0 +1,39 @@
+--- a/build/ltmain.sh	2021-09-09 15:19:14.822208365 +0200
++++ b/build/ltmain.sh	2021-09-09 15:47:55.397011151 +0200
+@@ -2375,6 +2375,13 @@ EOF
+ 	*) . ./$lib ;;
+ 	esac
+ 
++        newdependency_libs=
++        for deplib in $dependency_libs; do
++            deplib=$(echo "$deplib" | sed "s#^=\(.*\)#$(${CC} --print-sysroot)\1#")
++            newdependency_libs="$newdependency_libs $deplib"
++        done
++        dependency_libs=${newdependency_libs}
++
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+ 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -5750,6 +5757,13 @@ fi\
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
++
++          newdependency_libs=
++          for deplib in $dependency_libs; do
++              deplib=$(echo "$deplib" | sed "s#^$(${CC} --print-sysroot)#=#")
++              newdependency_libs="$newdependency_libs $deplib"
++          done
++
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -5767,7 +5781,7 @@ library_names='$library_names'
+ old_library='$old_library'
+ 
+ # Libraries that this one depends upon.
+-dependency_libs='$dependency_libs'
++dependency_libs='$newdependency_libs'
+ 
+ # Version information for $libname.
+ current=$current
diff --git a/srcpkgs/php8.1/patches/php-pear-cross.patch b/srcpkgs/php8.1/patches/php-pear-cross.patch
new file mode 100644
index 000000000000..f9191a50a0b5
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-pear-cross.patch
@@ -0,0 +1,23 @@
+--- a/pear/Makefile.frag	2020-03-17 11:40:21.000000000 +0100
++++ b/pear/Makefile.frag	2020-04-12 22:29:31.846943414 +0200
+@@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null`
+ PEAR_PREFIX = -dp a${program_prefix}
+ PEAR_SUFFIX = -ds a$(program_suffix)
+ PEAR_INSTALLER_URL = https://pear.php.net/install-pear-nozlib.phar
++PEAR_PHP ?= $(top_builddir)/sapi/cli/php
+ 
+ install-pear-installer: $(SAPI_CLI_PATH)
+-	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
++	@$(PEAR_PHP) $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
+ 
+ install-pear:
+ 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
+@@ -23,7 +24,7 @@ install-pear:
+ 			elif test ! -z "$(FETCH)" && test -x "$(FETCH)"; then \
+ 				"$(FETCH)" -o $(builddir)/ "${PEAR_INSTALLER_URL}"; \
+ 			else \
+-				$(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
++				$(PEAR_PHP) -n $(srcdir)/fetch.php "${PEAR_INSTALLER_URL}" $(builddir)/install-pear-nozlib.phar; \
+ 			fi \
+ 		fi \
+ 	fi
diff --git a/srcpkgs/php8.1/patches/php-phar-cross.patch b/srcpkgs/php8.1/patches/php-phar-cross.patch
new file mode 100644
index 000000000000..1e4e627ec65b
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-phar-cross.patch
@@ -0,0 +1,29 @@
+--- a/ext/phar/Makefile.frag	2020-04-13 12:18:23.998801926 +0200
++++ b/ext/phar/Makefile.frag	2020-04-13 12:20:58.031795293 +0200
+@@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p
+ 
+ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
+ 
++PHAR_PHP ?= $(top_builddir)/$(SAPI_CLI_PATH)
++PHAR_PHP_MODULES ?= $(top_builddir)/modules
+ PHP_PHARCMD_SETTINGS = -n -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0
+ PHP_PHARCMD_EXECUTABLE = ` \
+-	if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
+-		$(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
++	if test -x "$(PHAR_PHP)"; then \
++		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP) -n"; \
+ 		if test "x$(PHP_MODULES)" != "x"; then \
+-		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
++		$(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(PHAR_PHP_MODULES)"; \
+ 		for i in bz2 zlib phar; do \
+ 			if test -f "$(top_builddir)/modules/$$i.la"; then \
+ 				. $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+@@ -21,7 +23,7 @@ PHP_PHARCMD_EXECUTABLE = ` \
+ 		done; \
+ 		fi; \
+ 	else \
+-		$(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
++		$(top_srcdir)/build/shtool echo -n -- "$(PHAR_PHP)"; \
+ 	fi;`
+ PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
+ 
diff --git a/srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch b/srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch
new file mode 100644
index 000000000000..76cff3f81664
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php-phpize-sysroot-support.patch
@@ -0,0 +1,28 @@
+--- a/scripts/phpize.m4	2020-03-17 11:40:21.000000000 +0100
++++ b/scripts/phpize.m4	2020-04-15 12:27:36.400466387 +0200
+@@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir],
+   [lib],
+   [no])
+ 
++PHP_ARG_WITH([sysroot],,
++  [AS_HELP_STRING([--with-sysroot=NAME],
++    [System sysroot])],
++    [no],
++    [no])
++
+ PHP_RUNPATH_SWITCH
+ PHP_SHLIB_SUFFIX_NAMES
+ 
+@@ -58,7 +64,11 @@ dnl For BC.
+ PHP_CONFIG=$PHP_PHP_CONFIG
+ prefix=`$PHP_CONFIG --prefix 2>/dev/null`
+ phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
+-INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++if test "x$PHP_SYSROOT" = xno; then :
++	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
++else
++	INCLUDES=`$PHP_CONFIG --includes 2>/dev/null | sed "s#-I#-I$PHP_SYSROOT#g"`
++fi
+ EXTENSION_DIR=`$PHP_CONFIG --extension-dir 2>/dev/null`
+ PHP_EXECUTABLE=`$PHP_CONFIG --php-binary 2>/dev/null`
+ 
diff --git a/srcpkgs/php8.1/patches/php.ini.patch b/srcpkgs/php8.1/patches/php.ini.patch
new file mode 100644
index 000000000000..186898f63fab
--- /dev/null
+++ b/srcpkgs/php8.1/patches/php.ini.patch
@@ -0,0 +1,24 @@
+diff --git a/php.ini-production b/php.ini-production
+index b39a960..68f14a6 100644
+--- a/php.ini-production
++++ b/php.ini-production
+@@ -737,7 +737,7 @@ default_charset = "UTF-8"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
++include_path = ".:/usr/share/pear"
+ ;
+ ; Windows: "\path1;\path2"
+ ;include_path = ".;c:\php\includes"
+@@ -760,9 +760,7 @@ user_dir =
+ 
+ ; Directory in which the loadable extensions (modules) reside.
+ ; https://php.net/extension-dir
+-;extension_dir = "./"
+-; On windows:
+-;extension_dir = "ext"
++extension_dir = "/usr/lib/php8.1/modules/"
+ 
+ ; Directory where the temporary files should be placed.
+ ; Defaults to the system default (see sys_get_temp_dir)
diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
new file mode 100644
index 000000000000..16da7be3f32c
--- /dev/null
+++ b/srcpkgs/php8.1/template
@@ -0,0 +1,337 @@
+# Template file for 'php8.1'
+pkgname=php8.1
+version=8.1.5
+revision=1
+_php_version=8.1
+wrksrc="php-${version}"
+hostmakedepends="bison pkg-config apache-devel curl"
+makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
+ gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
+ libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
+ postgresql-libs-devel readline-devel sqlite-devel unixodbc-devel pcre2-devel
+ libffi-devel oniguruma-devel gd-devel"
+short_desc="HTML-embedded scripting language"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://www.php.net"
+distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
+checksum=44d637627746082395d5d3d3d6ae7d71e780b82a8d55a0228887158c4316bf11
+
+fetch_cmd="curl -O"
+
+conf_files="/etc/php${_php_version}/php.ini"
+
+lib32disabled=yes
+
+if [ -n "$CROSS_BUILD" ]; then
+	# phar needs php to build
+	hostmakedepends+=" php${_php_version}"
+	CFLAGS+=" -DHAVE_LIBDL
+		 -DHAVE_DLOPEN
+		 -DHAVE_DLSYM
+		 -DHAVE_SHM_IPC
+		 -DHAVE_SHM_MMAP_ANON
+		 -DHAVE_SHM_MMAP_ZERO
+		 -DHAVE_SHM_MMAP_POSIX
+		 -DHAVE_SHM_MMAP_FILE"
+fi
+
+do_build() {
+	local _phpconfig="--srcdir=.. \
+		--config-cache \
+		--prefix=/usr \
+		--sbindir=/usr/bin \
+		--sysconfdir=/etc/php${_php_version} \
+		--localstatedir=/var \
+		--with-layout=GNU \
+		--with-config-file-path=/etc/php${_php_version} \
+		--with-config-file-scan-dir=/etc/php${_php_version}/conf.d \
+		--disable-rpath \
+		--mandir=/usr/share/man \
+		--libdir=/usr/lib/php${_php_version} \
+		--datarootdir=/usr/share/php${_php_version} \
+		--datadir=/usr/share/php${_php_version} \
+		--program-suffix=${_php_version} \
+		--includedir=/usr/include/php${_php_version} \
+		"
+
+	local _phpextensions="--enable-bcmath=shared \
+		--enable-calendar=shared \
+		--enable-exif=shared \
+		--enable-ftp=shared \
+		--enable-intl=shared \
+		--enable-mbstring \
+		--enable-opcache \
+		--enable-pcntl \
+		--enable-phar=shared \
+		--enable-posix=shared \
+		--enable-shmop=shared \
+		--enable-soap=shared \
+		--enable-sockets=shared \
+		--enable-sysvmsg=shared \
+		--enable-sysvsem=shared \
+		--enable-sysvshm=shared \
+		--enable-mysqlnd \
+		--enable-gd=shared \
+		--with-external-gd \
+		--with-ffi=shared \
+		--with-bz2=shared,$XBPS_CROSS_BASE/usr/ \
+		--with-curl=shared \
+		--with-db4=$XBPS_CROSS_BASE/usr \
+		--with-enchant=shared,$XBPS_CROSS_BASE/usr \
+		--with-gdbm=$XBPS_CROSS_BASE/usr \
+		--with-gettext=shared \
+		--with-gmp=shared \
+		--with-iconv=shared \
+		--with-ldap=shared,$XBPS_CROSS_BASE/usr \
+		--with-ldap-sasl \
+		--with-sodium=shared \
+		--with-mhash \
+		--with-mysql-sock=/run/mysqld/mysqld.sock \
+		--with-mysqli=shared,mysqlnd \
+		--with-openssl=shared \
+		--with-external-pcre \
+		--without-pear \
+		--with-pdo-mysql=shared,mysqlnd \
+		--with-pdo-odbc=shared,unixODBC,$XBPS_CROSS_BASE/usr \
+		--with-pdo-pgsql=shared,$XBPS_CROSS_BASE/usr \
+		--with-pdo-sqlite=shared,$XBPS_CROSS_BASE/usr \
+		--with-pgsql=shared,$XBPS_CROSS_BASE/usr \
+		--with-readline=$XBPS_CROSS_BASE/usr \
+		--with-snmp=shared,$XBPS_CROSS_BASE/usr \
+		--with-sqlite3=shared,$XBPS_CROSS_BASE/usr \
+		--with-unixODBC=shared,$XBPS_CROSS_BASE/usr \
+		--with-xsl=shared,$XBPS_CROSS_BASE/usr \
+		--with-tidy=shared,$XBPS_CROSS_BASE/usr \
+		--with-zip=shared \
+		--with-zlib \
+		${configure_args} \
+		"
+	if [ -n "$CROSS_BUILD" ]; then
+		local _make_env="PHAR_PHP=/usr/bin/php${_php_version} PHAR_PHP_MODULES=/usr/lib/php${_php_version}/modules"
+	fi
+
+	EXTENSION_DIR="/usr/lib/php${_php_version}/modules"
+	export EXTENSION_DIR
+	PEAR_INSTALLDIR=/usr/share/pear
+	export PEAR_INSTALLDIR
+	EXTRA_LIBS="-ldl"
+	export EXTRA_LIBS
+
+	# cgi,cli,embed,fcgi,fpm
+	mkdir -p build
+	cd build
+	ln -s ${wrksrc}/configure
+	./configure ${_phpconfig} \
+		--host=${XBPS_CROSS_TRIPLET} \
+		--enable-cgi \
+		--enable-fpm \
+		--with-fpm-user=http \
+		--with-fpm-group=http \
+		--enable-embed=shared \
+		${_phpextensions}
+	make ${makejobs} ${_make_env}
+
+	# apache
+	# reuse the previous run; this will save us a lot of time
+	cp -a ${wrksrc}/build ${wrksrc}/build-apache
+	cd ${wrksrc}/build-apache
+	./configure ${_phpconfig} \
+		--host=${XBPS_CROSS_TRIPLET} \
+		--with-apxs2 \
+		${_phpextensions}
+	make ${makejobs} ${_make_env}
+}
+
+do_install() {
+	cd ${wrksrc}/build
+	local _env="INSTALL_ROOT=${DESTDIR}"
+	if [ -n "$CROSS_BUILD" ]; then
+		_env+=" PHAR_PHP=/usr/bin/php${_php_version}"
+	fi
+	make ${_env} install-{modules,cli,build,headers,programs,pharcmd}
+
+	# install php.ini
+	vinstall ${wrksrc}/php.ini-production 644 "etc/php${_php_version}" php.ini
+	# remove static modules
+	rm -f "${DESTDIR}/usr/lib/php${_php_version}/modules/*.a"
+}
+
+php8.1-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/php${_php_version}/build"
+		vmove "usr/bin/php-config${_php_version}"
+		vmove "usr/bin/phpize${_php_version}"
+		vmove "usr/share/man/man1/phpize${_php_version}.1"
+		vmove "usr/share/man/man1/php-config${_php_version}.1"
+	}
+}
+
+php8.1-phpdbg_package() {
+	short_desc+=" - interactive debugger"
+	depends="php${_php_version}-${version}_${revision}"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-phpdbg
+	}
+}
+
+php8.1-cgi_package() {
+	short_desc+=' - CGI and FCGI SAPI'
+	depends="php${_php_version}-${version}_${revision}"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-cgi
+	}
+}
+
+php8.1-apache_package() {
+	short_desc+=' - Apache SAPI'
+	depends="php${_php_version}-${version}_${revision}"
+	conf_files="/etc/apache/extra/php${_php_version}_module.conf"
+	pkg_install() {
+		vinstall ${wrksrc}/build-apache/libs/libphp.so 755 usr/libexec/httpd/modules "libphp${_php_version}.so"
+		vinstall ${FILESDIR}/apache.conf 644 etc/apache/extra "php${_php_version}_module.conf"
+	}
+}
+
+php8.1-fpm_package() {
+	short_desc+=' - FastCGI Process Manager'
+	depends="php${_php_version}-${version}_${revision}"
+	conf_files="/etc/php${_php_version}/php-fpm.conf /etc/php${_php_version}/php-fpm.d/*"
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} install-fpm
+		vsv "php-fpm${_php_version}"
+	}
+}
+
+php8.1-embed_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - Embed SAPI'
+	pkg_install() {
+		cd ${wrksrc}/build
+		make INSTALL_ROOT=${PKGDESTDIR} PHP_SAPI=embed install-sapi
+		mv ${PKGDESTDIR}/usr/lib/libphp.so ${PKGDESTDIR}/usr/lib/libphp${_php_version}.so
+	}
+}
+
+php8.1-enchant_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - enchant module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/enchant.so"
+	}
+}
+
+php8.1-gd_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - gd module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/gd.so"
+	}
+}
+
+php8.1-intl_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - Internationalization module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/intl.so"
+	}
+}
+
+php8.1-ldap_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - LDAP module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/ldap.so"
+	}
+}
+
+php8.1-mysql_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - MySQL modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*mysql*.so"
+	}
+}
+
+php8.1-odbc_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - ODBC modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*odbc.so"
+	}
+}
+
+php8.1-pgsql_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - PostgreSQL modules'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*pgsql.so"
+	}
+}
+
+php8.1-snmp_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - snmp module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/snmp.so"
+	}
+}
+
+php8.1-sqlite_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - sqlite module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*sqlite*.so"
+	}
+}
+
+php8.1-tidy_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - tidy HTML module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/*tidy*.so"
+	}
+}
+
+php8.1-xsl_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - XSL module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/xsl.so"
+	}
+}
+
+php8.1-sodium_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - sodium module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/sodium.so"
+	}
+}
+
+php8.1-ffi_package() {
+	lib32disabled=yes
+	depends="php${_php_version}-${version}_${revision}"
+	short_desc+=' - FFI module'
+	pkg_install() {
+		vmove "usr/lib/php${_php_version}/modules/ffi.so"
+	}
+}
diff --git a/srcpkgs/php8.1/update b/srcpkgs/php8.1/update
new file mode 100644
index 000000000000..0c2792ec963f
--- /dev/null
+++ b/srcpkgs/php8.1/update
@@ -0,0 +1,2 @@
+pkgname=php
+ignore="8.[2-9].*"

From ae0b40f2befa27717216e18d42cb4d80786e0084 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:29:51 -0400
Subject: [PATCH 1816/2561] New package: php8.1-apcu-5.1.21

---
 srcpkgs/php8.1-apcu/INSTALL.msg |  3 +++
 srcpkgs/php8.1-apcu/template    | 29 +++++++++++++++++++++++++++++
 srcpkgs/php8.1-apcu/update      |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/php8.1-apcu/INSTALL.msg
 create mode 100644 srcpkgs/php8.1-apcu/template
 create mode 100644 srcpkgs/php8.1-apcu/update

diff --git a/srcpkgs/php8.1-apcu/INSTALL.msg b/srcpkgs/php8.1-apcu/INSTALL.msg
new file mode 100644
index 000000000000..9da8a70ccc2b
--- /dev/null
+++ b/srcpkgs/php8.1-apcu/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable APCu add the following line to your php.ini:
+
+	extension=apcu.so
diff --git a/srcpkgs/php8.1-apcu/template b/srcpkgs/php8.1-apcu/template
new file mode 100644
index 000000000000..60d5ca79143d
--- /dev/null
+++ b/srcpkgs/php8.1-apcu/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.1-apcu'
+pkgname=php8.1-apcu
+version=5.1.21
+revision=1
+wrksrc="apcu-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.1"
+make_check_target=test
+hostmakedepends="autoconf php8.1-devel"
+makedepends="php8.1-devel pcre2-devel"
+depends="php8.1"
+short_desc="In-memory key-value store for PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/APCu"
+distfiles="https://pecl.php.net/get/apcu-${version}.tgz"
+checksum=1033530448696ee7cadec85050f6df5135fb1330072ef2a74569392acfecfbc1
+
+pre_configure() {
+	phpize8.1
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+	rm -r $DESTDIR/usr/include
+}
diff --git a/srcpkgs/php8.1-apcu/update b/srcpkgs/php8.1-apcu/update
new file mode 100644
index 000000000000..ad899519e313
--- /dev/null
+++ b/srcpkgs/php8.1-apcu/update
@@ -0,0 +1,2 @@
+site="https://pecl.php.net/package/APCu"
+pattern="apcu-\K[\d\.]*(?=\.tgz)"

From 95129d84cf176db2058245457a4cba43c66b4b82 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:30:37 -0400
Subject: [PATCH 1817/2561] New package: php8.1-ast-1.0.16

---
 srcpkgs/php8.1-ast/INSTALL.msg |  2 ++
 srcpkgs/php8.1-ast/template    | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/php8.1-ast/INSTALL.msg
 create mode 100644 srcpkgs/php8.1-ast/template

diff --git a/srcpkgs/php8.1-ast/INSTALL.msg b/srcpkgs/php8.1-ast/INSTALL.msg
new file mode 100644
index 000000000000..0dd0b5df2d96
--- /dev/null
+++ b/srcpkgs/php8.1-ast/INSTALL.msg
@@ -0,0 +1,2 @@
+To enable the ast extension please add the following to php.ini:
+	extension=ast.so 
diff --git a/srcpkgs/php8.1-ast/template b/srcpkgs/php8.1-ast/template
new file mode 100644
index 000000000000..549b8fcc1bce
--- /dev/null
+++ b/srcpkgs/php8.1-ast/template
@@ -0,0 +1,25 @@
+# Template file for 'php8.1-ast'
+pkgname=php8.1-ast
+version=1.0.16
+revision=1
+wrksrc="ast-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.1"
+hostmakedepends="php8.1-devel autoconf"
+makedepends="php8.1-devel"
+depends="php8.1"
+short_desc="Exposes the abstract syntax tree generated by PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/nikic/php-ast"
+distfiles="https://pecl.php.net/get/ast-${version}.tgz"
+checksum=45bda34b780c4661ce77cf65cd8a504fb56526d4b456edcc97d791c86f3879ce
+
+pre_configure() {
+	phpize8.1
+}
+
+do_install() {
+	make INSTALL_ROOT=${DESTDIR} install
+	vlicense LICENSE
+}

From 4c6d73b469e2874c4643b7ca5033a3bab858b05f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:31:06 -0400
Subject: [PATCH 1818/2561] New package: php8.1-igbinary-3.2.7

---
 srcpkgs/php8.1-igbinary/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/php8.1-igbinary/template

diff --git a/srcpkgs/php8.1-igbinary/template b/srcpkgs/php8.1-igbinary/template
new file mode 100644
index 000000000000..14fadb10e252
--- /dev/null
+++ b/srcpkgs/php8.1-igbinary/template
@@ -0,0 +1,25 @@
+# Template file for 'php8.1-igbinary'
+pkgname=php8.1-igbinary
+version=3.2.7
+revision=1
+wrksrc="igbinary-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.1"
+hostmakedepends="autoconf php8.1-devel"
+makedepends="php8.1-devel"
+depends="php8.1"
+short_desc="Igbinary is a drop in replacement for the standard php serializer"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/igbinary/igbinary/"
+distfiles="https://pecl.php.net/get/igbinary-${version}.tgz"
+checksum=d0dc0d0b56a985f4f52cea20717133d3da05368876bc0f94317c1e60e0319e7d
+
+pre_configure() {
+	phpize8.1
+}
+
+do_install() {
+	make INSTALL_ROOT="${DESTDIR}" install
+	vlicense COPYING
+}

From 622054bde23275a8b7eddac06cbf4cbe1faa3051 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:31:33 -0400
Subject: [PATCH 1819/2561] New package: php8.1-imagick-3.7.0

---
 srcpkgs/php8.1-imagick/INSTALL.msg            |  3 ++
 ...le-libmagick-header-file-search-path.patch | 17 +++++++++++
 srcpkgs/php8.1-imagick/template               | 29 +++++++++++++++++++
 srcpkgs/php8.1-imagick/update                 |  1 +
 4 files changed, 50 insertions(+)
 create mode 100644 srcpkgs/php8.1-imagick/INSTALL.msg
 create mode 100644 srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
 create mode 100644 srcpkgs/php8.1-imagick/template
 create mode 100644 srcpkgs/php8.1-imagick/update

diff --git a/srcpkgs/php8.1-imagick/INSTALL.msg b/srcpkgs/php8.1-imagick/INSTALL.msg
new file mode 100644
index 000000000000..00497519fcee
--- /dev/null
+++ b/srcpkgs/php8.1-imagick/INSTALL.msg
@@ -0,0 +1,3 @@
+To enable the Imagick extension add the following line to your php.ini:
+
+	extension=imagick.so
diff --git a/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch b/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
new file mode 100644
index 000000000000..16b8aaa57371
--- /dev/null
+++ b/srcpkgs/php8.1-imagick/patches/0001-fix-cross-compile-libmagick-header-file-search-path.patch
@@ -0,0 +1,17 @@
+--- a/imagemagick.m4	2021-09-09 10:53:42.287881616 +0200
++++ b/imagemagick.m4	2021-09-09 11:14:47.662312430 +0200
+@@ -167,6 +167,14 @@ AC_DEFUN([IM_FIND_IMAGEMAGICK],[
+   
+     AC_MSG_RESULT([user location ${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/wand/MagickWand.h])
+ 
++  elif test -r "${IM_IMAGEMAGICK_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
++
++    IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
++    IM_HEADER_STYLE="SEVEN"
++    AC_DEFINE([IM_MAGICKWAND_HEADER_STYLE_SEVEN], [1], [ImageMagick 7.x style header])
++
++    AC_MSG_RESULT([${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h])
++
+   elif test -r "${IM_PREFIX}/include/ImageMagick-${IM_MAJOR_VERSION}/MagickWand/MagickWand.h"; then
+ 
+     IM_INCLUDE_FORMAT="MagickWand/MagickWand.h"
diff --git a/srcpkgs/php8.1-imagick/template b/srcpkgs/php8.1-imagick/template
new file mode 100644
index 000000000000..6cd0c4098d69
--- /dev/null
+++ b/srcpkgs/php8.1-imagick/template
@@ -0,0 +1,29 @@
+# Template file for 'php8.1-imagick'
+pkgname=php8.1-imagick
+version=3.7.0
+revision=1
+wrksrc="imagick-$version"
+build_style=gnu-configure
+configure_args="--with-imagick=${XBPS_CROSS_BASE}/usr \
+ --with-php-config=/usr/bin/php-config8.1"
+hostmakedepends="php8.1-devel autoconf pkg-config"
+makedepends="php8.1-devel pcre2-devel libmagick-devel"
+depends="php8.1"
+short_desc="Provides a PHP wrapper to the ImageMagick library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.01"
+homepage="https://pecl.php.net/package/imagick"
+distfiles="https://pecl.php.net/get/imagick-$version.tgz"
+checksum=5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e
+
+pre_configure() {
+	phpize8.1
+}
+
+pre_install() {
+	make_install_args="INSTALL_ROOT=$DESTDIR"
+}
+
+post_install() {
+	rm -r $DESTDIR/usr/include
+}
diff --git a/srcpkgs/php8.1-imagick/update b/srcpkgs/php8.1-imagick/update
new file mode 100644
index 000000000000..fb47044a964d
--- /dev/null
+++ b/srcpkgs/php8.1-imagick/update
@@ -0,0 +1 @@
+pattern='<th.*Release \K[\d.]+(?=:</th>)'

From 062bf7244a6968a7aa0ea3f4c083673321d53736 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:29:23 -0400
Subject: [PATCH 1820/2561] New package: composer8.1-2.3.5

---
 srcpkgs/composer8.1/files/composer8.1 |  2 ++
 srcpkgs/composer8.1/template          | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/composer8.1/files/composer8.1
 create mode 100644 srcpkgs/composer8.1/template

diff --git a/srcpkgs/composer8.1/files/composer8.1 b/srcpkgs/composer8.1/files/composer8.1
new file mode 100644
index 000000000000..a3f41b8b5578
--- /dev/null
+++ b/srcpkgs/composer8.1/files/composer8.1
@@ -0,0 +1,2 @@
+#!/bin/sh
+php8.1 -f /usr/libexec/composer.phar8.1 "$@"
diff --git a/srcpkgs/composer8.1/template b/srcpkgs/composer8.1/template
new file mode 100644
index 000000000000..9ae0765cf0d4
--- /dev/null
+++ b/srcpkgs/composer8.1/template
@@ -0,0 +1,26 @@
+# Template file for 'composer8.1'
+pkgname=composer8.1
+version=2.3.5
+revision=1
+build_style=fetch
+depends="php8.1"
+short_desc="Dependency manager for PHP"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://getcomposer.org/"
+changelog="https://raw.githubusercontent.com/composer/composer/main/CHANGELOG.md"
+distfiles="https://github.com/composer/composer/releases/download/${version}/composer.phar
+ https://raw.githubusercontent.com/composer/composer/main/LICENSE"
+checksum="3b3b5a899c06a46aec280727bdf50aad14334f6bc40436ea76b07b650870d8f4
+ 7855ac293067aebe7e51afdd23b9dea54b8be24187dbecc9b9142581c37f596c"
+
+do_install() {
+	vbin ${FILESDIR}/composer8.1
+
+	vinstall composer.phar 644 usr/libexec composer.phar8.1
+	vlicense LICENSE
+
+	vmkdir /etc/php8.1/conf.d
+	printf 'extension=%s\n' phar iconv openssl zip \
+		>${DESTDIR}/etc/php8.1/conf.d/composer.ini
+}

From b754d469e6672679a6474c9c9cc87beda86514fb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 15 Mar 2022 15:31:58 -0400
Subject: [PATCH 1821/2561] New package: xdebug8.1-3.1.4

---
 srcpkgs/xdebug8.1/INSTALL.msg |  1 +
 srcpkgs/xdebug8.1/template    | 29 +++++++++++++++++++++++++++++
 srcpkgs/xdebug8.1/update      |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 srcpkgs/xdebug8.1/INSTALL.msg
 create mode 100644 srcpkgs/xdebug8.1/template
 create mode 100644 srcpkgs/xdebug8.1/update

diff --git a/srcpkgs/xdebug8.1/INSTALL.msg b/srcpkgs/xdebug8.1/INSTALL.msg
new file mode 100644
index 000000000000..04e3343216f7
--- /dev/null
+++ b/srcpkgs/xdebug8.1/INSTALL.msg
@@ -0,0 +1 @@
+You should add 'zend_extension="xdebug.so"' to php.ini
diff --git a/srcpkgs/xdebug8.1/template b/srcpkgs/xdebug8.1/template
new file mode 100644
index 000000000000..62fa2b795f40
--- /dev/null
+++ b/srcpkgs/xdebug8.1/template
@@ -0,0 +1,29 @@
+# Template file for 'xdebug8.1'
+pkgname=xdebug8.1
+version=3.1.4
+revision=1
+wrksrc="xdebug-${version}"
+build_style=gnu-configure
+configure_args="--with-php-config=/usr/bin/php-config8.1"
+hostmakedepends="autoconf"
+makedepends="php8.1-devel"
+short_desc="PHP debugging extension"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="PHP-3.0"
+homepage="http://xdebug.org"
+changelog="https://xdebug.org/updates"
+distfiles="http://xdebug.org/files/xdebug-${version}.tgz"
+checksum=4195926f9f6c4e802ff749bb2ca85ac50636719a72e5389e372e35ef523505f9
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" php8.1-devel"
+fi
+
+pre_configure() {
+	phpize8.1
+}
+
+do_install() {
+	make INSTALL_ROOT=${DESTDIR} install
+	vlicense LICENSE
+}
diff --git a/srcpkgs/xdebug8.1/update b/srcpkgs/xdebug8.1/update
new file mode 100644
index 000000000000..280b0bc7e3ac
--- /dev/null
+++ b/srcpkgs/xdebug8.1/update
@@ -0,0 +1,2 @@
+site="https://xdebug.org/updates"
+pattern='<dt><a name=.*></a>.*Xdebug \K[\d.]+(?=</dt>)'

From 587a412fede402a1103c364f7986a36eab817a5d Mon Sep 17 00:00:00 2001
From: PaperStork <vincent.hour.del@gmail.com>
Date: Thu, 28 Apr 2022 14:30:05 +0200
Subject: [PATCH 1822/2561] scaleway-cli: update to 2.5.1.

---
 srcpkgs/scaleway-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scaleway-cli/template b/srcpkgs/scaleway-cli/template
index 89407918a7a0..caad6e99dde0 100644
--- a/srcpkgs/scaleway-cli/template
+++ b/srcpkgs/scaleway-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'scaleway-cli'
 pkgname=scaleway-cli
-version=2.4.0
+version=2.5.1
 revision=1
 build_style=go
 go_import_path=github.com/scaleway/scaleway-cli
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/scaleway/scaleway-cli"
 distfiles="https://github.com/scaleway/scaleway-cli/archive/v${version}.tar.gz"
-checksum=7baa6d7af5602703bc9b1f54beb5a36642151cc12d6584d6ab76df8bb088365e
+checksum=af926168122c192b10a19d701f2a03a41f14897b2a6c654499203edd2aafcafe
 
 post_install() {
 	vdoc README.md README

From df7be75ce79972e10abcbe322feee4370a704cf0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Apr 2022 12:30:31 +0200
Subject: [PATCH 1823/2561] cpanminus: update to 1.7046.

---
 srcpkgs/cpanminus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpanminus/template b/srcpkgs/cpanminus/template
index 49ee16c6124a..caa1f64e9baa 100644
--- a/srcpkgs/cpanminus/template
+++ b/srcpkgs/cpanminus/template
@@ -1,6 +1,6 @@
 # Template file for 'cpanminus'
 pkgname=cpanminus
-version=1.7045
+version=1.7046
 revision=1
 wrksrc="App-${pkgname}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/App-cpanminus"
 distfiles="${CPAN_SITE}/App/App-${pkgname}-${version}.tar.gz"
-checksum=ac4e4adc23fec0ab54f088aca511f5a57d95e6c97a12a1cb98eed1fe0fe0e99c
+checksum=3e8c9d9b44a7348f9acc917163dbfc15bd5ea72501492cea3a35b346440ff862

From a0e12bd3854a699bcb365937089a68b4639e0d12 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 29 Apr 2022 12:39:21 +0200
Subject: [PATCH 1824/2561] xorgproto: update to 2022.1.

---
 srcpkgs/xorgproto/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index e5a9b43ba341..525ac1826589 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,16 +1,16 @@
 # Template file for 'xorgproto'
 pkgname=xorgproto
-version=2021.5
+version=2022.1
 revision=1
-build_style=gnu-configure
-configure_args="--enable-legacy"
+build_style=meson
+configure_args="-Dlegacy=true"
 hostmakedepends="xorg-util-macros"
 short_desc="Combined X.Org X11 Protocol headers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.gz"
-checksum=be6ddd6590881452fdfa170c1c9ff87209a98d36155332cbf2ccbc431add86ff
+checksum=2a399e77d98fe53e9056726a1934b62cbaa6c41d7b1f41a354911b0925363343
 replaces="bigreqsproto>=0 compositeproto>=0 damageproto>=0 dmxproto>=0 dri2proto>=0
  dri3proto>=0 fixesproto>=0 fontsproto>=0 glproto>=0 inputproto>=0 kbproto>=0 presentproto>=0
  printproto>=0 randrproto>=0 recordproto>=0 renderproto>=0 resourceproto>=0 scrnsaverproto>=0
@@ -32,11 +32,6 @@ provides="bigreqsproto-${version}_${revision} compositeproto-${version}_${revisi
  xproto-${version}_${revision} xf86bigfontproto-${version}_${revision}
  fontcacheproto-${version}_${revision}"
 
-post_configure() {
-	# man/Xprint.7 is can't be generated thus remove the rule
-	sed -i Makefile -e "s;\(miscman_DATA =\).*;\1;"
-}
-
 post_install() {
 	for license in COPYING-* ; do
 		vlicense $license

From 3ab49d24753bc1958ea65bd1f8ebeeabade78d6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Wed, 27 Apr 2022 19:28:54 +0200
Subject: [PATCH 1825/2561] libopenal: update to 1.22.0, adopt

---
 srcpkgs/libopenal/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template
index c89016a3584b..a396607b7ea6 100644
--- a/srcpkgs/libopenal/template
+++ b/srcpkgs/libopenal/template
@@ -1,19 +1,19 @@
 # Template file for 'libopenal'
 pkgname=libopenal
-version=1.21.0
+version=1.22.0
 revision=1
 wrksrc="openal-soft-${version}"
 build_style=cmake
-configure_args="-DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF"
+configure_args="-DALSOFT_EXAMPLES=OFF"
 hostmakedepends="pkg-config"
 makedepends="zlib-devel alsa-lib-devel pulseaudio-devel SDL2-devel ffmpeg-devel
  jack-devel $(vopt_if sndio sndio-devel)"
 short_desc="Cross-platform 3D audio library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Sigrid Solveig Haflínudóttir <ftrvxmtrx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://openal-soft.org/"
 distfiles="http://openal-soft.org/openal-releases/openal-soft-${version}.tar.bz2"
-checksum=2916b4fc24e23b0271ce0b3468832ad8b6d8441b1830215b28cc4fee6cc89297
+checksum=ce0f9300de3de7bc737b0be2a995619446e493521d070950eea53eddd533fc9b
 
 build_options="sndio"
 build_options_default="sndio"

From 15fd10503b2108bf7bde10a10e0b0c67d479fc71 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Fri, 29 Apr 2022 13:34:34 +0100
Subject: [PATCH 1826/2561] inspircd: update to 3.13.0.

---
 srcpkgs/inspircd/INSTALL.msg |  2 +-
 srcpkgs/inspircd/template    | 26 ++++++++++----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/inspircd/INSTALL.msg b/srcpkgs/inspircd/INSTALL.msg
index 8f2d589b175c..28be2fc456b1 100644
--- a/srcpkgs/inspircd/INSTALL.msg
+++ b/srcpkgs/inspircd/INSTALL.msg
@@ -1,2 +1,2 @@
 You need to create a configuration file before running inspircd.
-Example configuration can be found at /etc/inspircd/examples/
+Example configuration can be found at /usr/share/doc/inspircd
diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 86a42adea5a4..d80ffdef2907 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,20 +1,21 @@
 # Template file for 'inspircd'
 pkgname=inspircd
-version=3.10.0
+version=3.13.0
 revision=1
 build_style=gnu-makefile
 hostmakedepends="perl pkg-config"
-makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
+makedepends="gnutls-devel libmaxminddb-devel openssl-devel sqlite-devel"
 short_desc="Modular Internet Relay Chat server"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
 license="GPL-2.0-only"
 homepage="http://www.inspircd.org/"
 distfiles="https://github.com/inspircd/inspircd/archive/v${version}.tar.gz"
-checksum=9bbf3581fc1a9443ef4c4595b208e5b8852483cb78b20fe3e98d225fa4538982
+checksum=0a4534114f5db1602c53ca4cfbb5ad623b9f990737d8c8f85890d8de47165729
 
 system_accounts="inspircd"
 inspircd_homedir="/var/lib/inspircd"
 make_dirs="
+ /run/inspircd     0750 ${pkgname} ${pkgname}
  /var/log/inspircd 0750 ${pkgname} ${pkgname}
  /var/lib/inspircd 0750 ${pkgname} ${pkgname}"
 
@@ -26,24 +27,17 @@ pre_configure() {
 }
 
 do_configure() {
-	./configure --enable-extras=m_ssl_openssl.cpp,m_regex_posix.cpp,m_sqlite3.cpp
 	./configure \
-		--prefix=/usr \
-		--config-dir=/etc/inspircd \
-		--log-dir=/var/log/inspircd \
-		--data-dir=/var/lib/inspircd \
-		--manual-dir=/usr/share/man/man1 \
-		--module-dir=/usr/lib/${pkgname}/modules \
-		--binary-dir=/usr/bin \
+		--enable-extras "geo_maxmind regex_posix regex_stdlib ssl_gnutls ssl_openssl sslrehashsignal sqlite3"
+	./configure \
+		--binary-dir /usr/bin \
+		--disable-auto-extras \
+		--disable-ownership \
 		--distribution-label voidlinux-${revision} \
-		--gid 0 \
-		--uid 0 \
-		--disable-interactive
+		--system
 	vsed -i 's/-ldl/& -lm/' GNUmakefile
 }
 
 post_install() {
 	vsv inspircd
-	rm ${DESTDIR}/usr/${pkgname}
-	rm ${DESTDIR}/usr/inspircd.service
 }

From 321b2ef22a8afcbc515f08d03f080296a30a6c8c Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Fri, 29 Apr 2022 11:17:11 -0500
Subject: [PATCH 1827/2561] oksh: update to 7.1

---
 srcpkgs/oksh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oksh/template b/srcpkgs/oksh/template
index d41bc21f75f3..79f73084b930 100644
--- a/srcpkgs/oksh/template
+++ b/srcpkgs/oksh/template
@@ -1,6 +1,6 @@
 # Template file for 'oksh'
 pkgname=oksh
-version=7.0
+version=7.1
 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=21d5891f38ffea3a5d1aa8c494f0a5579c93778535e0a92275b102dec3221da1
+checksum=9dc0b0578d9d64d10c834f9757ca11f526b562bc5454da64b2cb270122f52064
 register_shell="/bin/oksh"
 
 alternatives="

From 24b4c0f9542c52ebc246c6491dbc811c8445a485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 30 Apr 2022 06:39:15 +0200
Subject: [PATCH 1828/2561] you-get: update to 0.4.1602.

---
 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 c376e137b6cd..71de2bf4e560 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.1555
+version=0.4.1602
 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=99282aca720c7ee1d9ef4b63bbbd226e906ea170b789a459fafd5b0627b0b15f
+checksum=4706c06cc4b9080ea93b4f13b9a4dbebb60cfe12d191c78e17b0fa895d17708f
 
 post_install() {
 	vlicense LICENSE.txt

From 7081c61b7182276b0fcc14d0aa199dc366eec1e0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 30 Apr 2022 08:02:25 +0200
Subject: [PATCH 1829/2561] linux5.4: update to 5.4.191.

---
 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 25d8aeea2d8f..1380552916af 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.190
+version=5.4.191
 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=81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194
+checksum=288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 5495f5a7a1d797e0e9212e7435025f20b7c50895 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 30 Apr 2022 08:25:09 +0200
Subject: [PATCH 1830/2561] linux4.19: update to 4.19.240.

---
 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 a44ed5b0cd25..725d28a4a212 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.239
+version=4.19.240
 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=bf7c5dc26c9a3113e43e4d32f73228788f8f6f005b9ddba379378786bc4c593b
+checksum=72ac1fd5bdf9b1d0a6da1237692a0570028cb994e750f99992d374eb9fdd46c2
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From f7e3a5724d7f18ceeea3625ea21cc94b0f666601 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Apr 2022 16:33:34 +0200
Subject: [PATCH 1831/2561] sbcl: update to 2.2.4.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index b78c25202981..984a1f24ac07 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.2.3
+version=2.2.4
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc texinfo"
@@ -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=de7f49e1f7750fd2cd89111ef70641cc5471355f621b737392ac68aa95f37f9f
+checksum=fcdd251cbc65f7f808ed0ad77246848d1be166aa69a17f7499600184b7a57202
 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+=" 8745f9358b686819209e188a93fb8cf5b4227a3f623af20504a68d129a314256"
+	checksum+=" 33b0d3ec4e71855b3c5c564ccc0759c09b3ed7ab65e7c4d7e80c519107635851"
 	;;
 arm*)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"

From d47d2919f3b26f7f23cc9a1d6652e166d7617007 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Apr 2022 16:36:13 +0200
Subject: [PATCH 1832/2561] perl-LWP: update to 6.64.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index c3fe1fd7ac9f..a093660fbdaa 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.63
+version=6.64
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=6e6a9479affdf23d7de91b6e2e1b903669af6296840a88c41e86d18067db7f17
+checksum=48335e0992b4875bd73c6661439f3506c2c6d92b5dd601582b8dc22e767d3dae

From d398ce8dfeeb44430f1f1c266d60fb1a170ca54c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Apr 2022 16:38:20 +0200
Subject: [PATCH 1833/2561] perl-WWW-Mechanize: update to 2.07.

---
 srcpkgs/perl-WWW-Mechanize/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-WWW-Mechanize/template b/srcpkgs/perl-WWW-Mechanize/template
index 6df7be5b4baf..6b2e839a781b 100644
--- a/srcpkgs/perl-WWW-Mechanize/template
+++ b/srcpkgs/perl-WWW-Mechanize/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-WWW-Mechanize'
 pkgname=perl-WWW-Mechanize
-version=2.06
+version=2.07
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -16,4 +16,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/WWW-Mechanize"
 distfiles="${CPAN_SITE}/WWW/${pkgname/perl-/}-${version}.tar.gz"
-checksum=d97cd31e35fd1ff7078d3f568b62e3fe3911843a64d3c2d078eebd3ff9b8b38d
+checksum=9863cedcffc6b032664992c27fe7cb4bf5f9ce89452e77dc960d1a4a3349e783

From 68dfd33e7a1e79c2f2341eedddb72089a4f3f4ce Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 30 Apr 2022 16:49:27 +0200
Subject: [PATCH 1834/2561] knot: update to 3.1.8.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index a8f43d8d92ae..13dcf355e6e6 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.7
+version=3.1.8
 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=ffb6887e238ce4c7df0cc76bb55a5093465275201ac12156a3390782dc49857b
+checksum=767e458a56277a1270b359294c3be6c63fd734884d62a045e01756a46507aa94
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From b36348bfada07567c1c43e018b3c4d4b9c77a8b7 Mon Sep 17 00:00:00 2001
From: Quentin Rameau <quinq@fifth.space>
Date: Sat, 30 Apr 2022 09:17:05 +0200
Subject: [PATCH 1835/2561] loksh: Update to 7.1

---
 srcpkgs/loksh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/loksh/template b/srcpkgs/loksh/template
index 634269418f41..da0f03e5ee22 100644
--- a/srcpkgs/loksh/template
+++ b/srcpkgs/loksh/template
@@ -1,6 +1,6 @@
 # Template file for 'loksh'
 pkgname=loksh
-version=7.0
+version=7.1
 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=413275c9a259629bbdb4ce97c610c45bc14a589f73cd51571ed82eec58e45840
+checksum=ab7d274a057b83bc64643664094031126641aa91ee440a96765279991aab6938
 register_shell="/bin/loksh"
 
 alternatives="

From 5540057be13211a3e87962aa8c918b8972cfc841 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 30 Apr 2022 17:14:00 +0200
Subject: [PATCH 1836/2561] cwm: update to 7.1.

---
 srcpkgs/cwm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cwm/template b/srcpkgs/cwm/template
index 4dcc6e11819f..ce893dcec72e 100644
--- a/srcpkgs/cwm/template
+++ b/srcpkgs/cwm/template
@@ -1,6 +1,6 @@
 # Template file for 'cwm'
 pkgname=cwm
-version=6.7
+version=7.1
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config bison"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="ISC"
 homepage="http://man.openbsd.org/cwm"
 distfiles="https://github.com/leahneukirchen/cwm/archive/v${version}.tar.gz"
-checksum=fdd3d5b4fe9b1b03e1fc270d3dd5a031218589a8e40170e8438d2b9c44a35f08
+checksum=4a58c5cb4312d8d0f03ba657d7656c12d8d7c1277aeb1c05272984501597bd90
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 51ca80ea1f67bf81e215cd4615e01bcff11a4481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 30 Apr 2022 23:36:17 -0300
Subject: [PATCH 1837/2561] tree-sitter: update to 0.20.6.

post_patch update for autocfg can be removed once [1] is merged.

[1] https://github.com/tree-sitter/tree-sitter/pull/1731
---
 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 aae7b848d6ec..660cf7043a62 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.20.2
+version=0.20.6
 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/tree-sitter/archive/v${version}.tar.gz"
-checksum=2a0445f8172bbf83db005aedb4e893d394e2b7b33251badd3c94c2c5cc37c403
+checksum=4d37eaef8a402a385998ff9aca3e1043b4a3bba899bceeff27a7178e1165b9de
 make_check=no # tests require generating fixtures from remote repositories
 
 post_patch() {

From 18aee389ad88cccb3cfb1f9d36a2c655f0767548 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sat, 30 Apr 2022 23:57:06 -0300
Subject: [PATCH 1838/2561] elfutils: update to 0.187.

Update checkdepends for glibc; for musl, tests no longer compile
properly due to using error(3) functions. To avoid uncaught test
failures, add conditional so glibc with debug packages enabled results
in failures if tests error out.
---
 ...ompilation-on-platforms-without-erro.patch | 35 -------------------
 srcpkgs/elfutils/template                     | 17 ++++++---
 2 files changed, 12 insertions(+), 40 deletions(-)
 delete mode 100644 srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch

diff --git a/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch b/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
deleted file mode 100644
index 329baac25378..000000000000
--- a/srcpkgs/elfutils/patches/0001-debuginfod-fix-compilation-on-platforms-without-erro.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Wed, 10 Nov 2021 21:11:55 -0300
-Subject: [PATCH] debuginfod: fix compilation on platforms without <error.h>
-
-"system.h" only declares the error() function, so it needs to be in an
-'extern "C"' block, otherwise linking fails.
-
-Since we are here, use quotes for "system.h" header, since it's a local
-header, not a system one.
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- debuginfod/debuginfod.cxx | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
-index 521cb529..764e7b94 100644
---- a/debuginfod/debuginfod.cxx
-+++ b/debuginfod/debuginfod.cxx
-@@ -33,11 +33,11 @@
- 
- extern "C" {
- #include "printversion.h"
-+#include "system.h"
- }
- 
- #include "debuginfod.h"
- #include <dwarf.h>
--#include <system.h>
- 
- #include <argp.h>
- #ifdef __GNUC__
--- 
-2.33.1
-
diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template
index 5d37eb20eeb8..1fe41abe92d3 100644
--- a/srcpkgs/elfutils/template
+++ b/srcpkgs/elfutils/template
@@ -1,6 +1,6 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.186
+version=0.187
 revision=1
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
@@ -8,13 +8,13 @@ hostmakedepends="automake libtool pkg-config"
 _devel_depends="bzip2-devel liblzma-devel zlib-devel libzstd-devel"
 makedepends="${_devel_depends} libcurl-devel libarchive-devel sqlite-devel
  libmicrohttpd-devel"
-checkdepends="zstd bzip2 curl rpm cpio"
+checkdepends="zstd bzip2 curl rpm cpio iproute2 procps-ng"
 short_desc="Utilities to handle ELF object files"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://sourceware.org/elfutils/"
 distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
-checksum=7f6fb9149b1673d38d9178a0d3e0fb8a1ec4f53a9f4c2ff89469609879641177
+checksum=e70b0dfbe610f90c4d1fe0d71af142a4e25c3c4ef9ebab8d2d72b65159d454c8
 # subpackages require explicit ordering
 subpackages="debuginfod libdebuginfod libelf elfutils-devel"
 
@@ -31,8 +31,15 @@ fi
 
 do_check() {
 	# test failures also expected if building with debug disabled
-	make check ${makejobs} ||
-		msg_warn "Failure in testsuite, expected on musl systems, at least\n"
+	make check ${makejobs} || {
+		if [ "$XBPS_TARGET_LIBC" = musl ]; then
+			msg_warn "Expected testsuite failure: using musl\n"
+		elif [ -z "$XBPS_DEBUG_PKGS" ]; then
+			msg_warn "Expected testsuite failure: debug is disabled\n"
+		else
+			msg_error "Testsuite failure\n"
+		fi
+	}
 }
 
 libdebuginfod_package() {

From 9c10367c581ce74c57a3720606976cc578614747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 00:53:56 -0300
Subject: [PATCH 1839/2561] python3-md2gemini: update to 1.9.0.

---
 srcpkgs/python3-md2gemini/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-md2gemini/template b/srcpkgs/python3-md2gemini/template
index 4b4f88c7233d..6ae29b77849b 100644
--- a/srcpkgs/python3-md2gemini/template
+++ b/srcpkgs/python3-md2gemini/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-md2gemini'
 pkgname=python3-md2gemini
-version=1.8.1
-revision=2
+version=1.9.0
+revision=1
 wrksrc="md2gemini-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-mistune2 python3-cjkwrap
@@ -13,7 +13,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="LGPL-3.0-only"
 homepage="https://github.com/makeworld-the-better-one/md2gemini"
 distfiles="${PYPI_SITE}/m/md2gemini/md2gemini-${version}.tar.gz"
-checksum=3ef2bd2d9e2b4968a844a2858f721348429f3a0b5976bd1c324198538103ca55
+checksum=775cee2be36aa0f4b7ea2861f2ac7d80e113f78b40a58f92192b6c73f6c84e75
 
 post_install() {
 	# remove tests directory polluting site-packages

From e77f42cc9783e62b2baf483eae9b9fd1ff4c90b8 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Sat, 23 Apr 2022 03:02:01 -0500
Subject: [PATCH 1840/2561] python3-telegram: update to 0.15.0

---
 srcpkgs/python3-telegram/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-telegram/template b/srcpkgs/python3-telegram/template
index b9eebe0fde9a..13b971bbd6b9 100644
--- a/srcpkgs/python3-telegram/template
+++ b/srcpkgs/python3-telegram/template
@@ -1,20 +1,23 @@
 # Template file for 'python3-telegram'
 pkgname=python3-telegram
-version=0.14.0
-revision=3
+version=0.15.0
+revision=1
 wrksrc=python-telegram-${version}
 build_style=python3-module
-hostmakedepends="python3"
+hostmakedepends="python3-setuptools"
 depends="libtd python3-setuptools"
+checkdepends="python3-pytest $depends"
 short_desc="Python library for building Telegram clients"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/alexander-akhmetov/python-telegram"
 distfiles="https://github.com/alexander-akhmetov/python-telegram/archive/${version}.tar.gz"
-checksum=11b0a2387bae642eb7f134fe35b9ef67b8183aa961412bcdfa86ff404beed897
+checksum=eaa9c883e9a6415590eaada88b39817247361ee2ba959526081a14f3e66ecc0b
 
 post_extract() {
-	rm -r telegram/lib
+	# mocked_resource.assert_called_once_with('telegram', 'lib/linux/libtdjson.so')
+	# AssertionError: Expected 'mock' to be called once. Called 0 times.
+	rm tests/test_tdjson.py
 }
 
 post_install() {

From a1e6ed8aadcaf67a0efbf4041a8623a2466bebe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Sat, 30 Apr 2022 06:51:47 +0200
Subject: [PATCH 1841/2561] croc: update to 9.5.5.

---
 srcpkgs/croc/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 5a4e8dcb6556..5683587f7355 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,16 +1,15 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.5.4
+version=9.5.5
 revision=1
 build_style=go
 go_import_path=github.com/schollz/croc/v${version%%.*}
-hostmakedepends="git"
 short_desc="Easily and securely send things from one computer to another"
 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=b89b9d1c2e27e5ca710a7c524f70361122b8b0fd374c0be18f1e7337acca7d07
+checksum=221ebf034e05ef8c06b2e2290dfb83c6f8b4b3f8a9168d6d826b87ed3c62d51a
 
 post_install() {
 	vlicense LICENSE

From b85429fef1759051986624d684505120b3fa97c1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Thu, 28 Apr 2022 01:02:44 -0400
Subject: [PATCH 1842/2561] tailscale: update to 1.24.2.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 9b6db1157ae8..d2411f209214 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.24.0
+version=1.24.2
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -13,7 +13,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=3c8fe851c440d5dbd9dba2f3242924a7d99e7df37b5ae098507a8feb3663c76f
+checksum=f1fe7770b4e372ace47c5b0ac4cbe21af95c3a6fb1828ee4f407fcfe35b7958f
 
 post_install() {
 	vlicense LICENSE

From 92197768a52a8da2c197f0e9874d5903ef495bd4 Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Sat, 30 Apr 2022 19:13:28 +0200
Subject: [PATCH 1843/2561] emptty: update to 0.8.0.

---
 srcpkgs/emptty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 2bbbbf4a11e5..9ba3fd93c742 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.7.1
+version=0.8.0
 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=1d86dc0623773d43f9ced8c699ee82c812065ba18ecf277061210392fb2ec56a
+checksum=b1c67e1661f6cde6c3d9723f6602d2ec9e7dbe8f11caf72f06102750ebd2c636
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From 2e34e6d15f405dad8ab4f56d9311c96d513d5372 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 30 Apr 2022 17:43:45 +0300
Subject: [PATCH 1844/2561] rssguard: update to 4.2.2.

---
 srcpkgs/rssguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index 300f07694c43..9a775b634fd8 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,6 +1,6 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=4.2.1
+version=4.2.2
 revision=1
 build_style=cmake
 configure_args="-DUSE_WEBENGINE="false""
@@ -14,7 +14,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=b404e3d8310c58ffb337bf1d2eb2c7cc10a692b00ed2666af30bd0153413cc05
+checksum=8f92257efa9321c1d511a977870c9ad053778256fd3cd8e7b1003d49c97e7af8
 
 post_install() {
 	# Install rssguard icon manually

From b1fe7c077eaf39fe9554f31f0bfb5c4108b94dd1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Apr 2022 21:13:28 +0300
Subject: [PATCH 1845/2561] Thunar: update to 4.16.11.

---
 srcpkgs/Thunar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 70631d39f65d..4656fbc6226d 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.10
+version=4.16.11
 revision=1
 wrksrc=thunar-${version}
 build_style=gnu-configure
@@ -16,9 +16,9 @@ short_desc="Thunar File Manager"
 maintainer="Ulf <void@uw.anonaddy.com>"
 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"
+changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=f105c8f5abc50c411f6218f913561ae3a485826bd0cd09503a4772d015899c92
+checksum=f47dde90b2e5e3e31920a4f57ddd3670282d0a90870a45e89148fce41b2a8a1b
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/lib/systemd

From 83366cadee3d11818edf4763fe54323b3418a1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Thu, 28 Apr 2022 17:52:51 +0200
Subject: [PATCH 1846/2561] SDL2: update to 2.0.22, adopt

---
 srcpkgs/SDL2/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index db3afefab3ce..640b57bbee14 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.20
+version=2.0.22
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -10,12 +10,12 @@ hostmakedepends="pkg-config nasm"
 makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
  libsamplerate-devel"
 short_desc="Simple DirectMedia Layer (version 2)"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Sigrid Solveig Haflínudóttir <ftrvxmtrx@gmail.com>"
 license="Zlib"
 homepage="https://www.libsdl.org/"
 changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
 distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06
+checksum=fe7cbf3127882e3fc7259a75a0cb585620272c51745d3852ab9dd87960697f2e
 
 # Package build options
 build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"

From 1475785c9324210ebee09ac85bd74e080bb49aa9 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Thu, 28 Apr 2022 02:53:19 +0300
Subject: [PATCH 1847/2561] spotify: update to 1.1.84.

---
 srcpkgs/spotify/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 32d439d290f8..0dba9c4293c0 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,8 +1,8 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.1.80
+version=1.1.84
 revision=1
-_ver="${version}.699.gc3dac750_amd64"
+_ver="${version}.716.gc5f8b819_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=19f80255b89d768969ff9d6a05d90091a30c05f65eabdd968592d47a7754b80e
+checksum=08e6b2666dc2a39624890e553a3046d05ecebe17bcc2fe930d49314b2fb812c7
 _license_checksum=4465d0bba5deb87866184b04ba76604cd93561c0dc9cd21cacdf5b0295bdae3a
 repository=nonfree
 restricted=yes

From 0bd7352cd9b4c92322c9e3726134964ccedffdc2 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 30 Apr 2022 10:38:10 +0200
Subject: [PATCH 1848/2561] apache: update to 2.4.53, adopt.

Fixes CVE-2022-23943, CVE-2022-22721, CVE-2022-22720,
CVE-2022-22719.
---
 srcpkgs/apache/patches/libressl.patch | 11 -----------
 srcpkgs/apache/template               | 15 +++++++++------
 2 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/apache/patches/libressl.patch

diff --git a/srcpkgs/apache/patches/libressl.patch b/srcpkgs/apache/patches/libressl.patch
deleted file mode 100644
index 300bd7ee1fa6..000000000000
--- a/srcpkgs/apache/patches/libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/modules/ssl/ssl_engine_init.c.orig  2018-10-30 16:25:09.084840429 +0100
-+++ b/modules/ssl/ssl_engine_init.c       2018-10-30 16:25:55.019411636 +0100
-@@ -1492,7 +1492,7 @@
-     X509_STORE_CTX *sctx;
-     X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx);
-
--#if OPENSSL_VERSION_NUMBER >= 0x1010100fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER)
-     /* For OpenSSL >=1.1.1, turn on client cert support which is
-      * otherwise turned off by default (by design).
-      * https://github.com/openssl/openssl/issues/6933 */
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 2cdb6ca2f449..812286b52f20 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,6 +1,6 @@
 # Template file for 'apache'
 pkgname=apache
-version=2.4.52
+version=2.4.53
 revision=1
 wrksrc="httpd-${version}"
 build_style=gnu-configure
@@ -19,24 +19,23 @@ configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
  --enable-dav --enable-info --enable-cgi --enable-cgid --enable-dav-fs
  --enable-dav-lock --enable-vhost-alias --enable-imagemap --enable-so
  --enable-rewrite --enable-layout=XBPS --sysconfdir=/etc/${pkgname}
- --enable-mpms-shared=all --with-pcre=${XBPS_CROSS_BASE}/usr
- --with-z=${XBPS_CROSS_BASE}/usr"
+ --enable-mpms-shared=all --with-z=${XBPS_CROSS_BASE}/usr"
 conf_files="
 	/etc/${pkgname}/extra/*.conf
 	/etc/${pkgname}/httpd.conf
 	/etc/${pkgname}/magic
 	/etc/${pkgname}/mime.types"
 hostmakedepends="pkg-config perl apr-util-devel"
-makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
+makedepends="zlib-devel libuuid-devel pcre2-devel nghttp2-devel
  openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
 depends="apache-htpasswd"
 short_desc="Apache http server"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="ologantr <mrphyber@protonmail.com>"
 license="Apache-2.0"
 homepage="http://httpd.apache.org/"
 changelog="http://www.apache.org/dist/httpd/CHANGES_2.4"
 distfiles="https://dlcdn.apache.org/httpd/httpd-${version}.tar.bz2"
-checksum=0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9
+checksum=d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63
 
 system_accounts="_apache"
 _apache_homedir="/srv/www/$pkgname"
@@ -63,6 +62,10 @@ pre_configure() {
 
 	cat ${FILESDIR}/xbps.layout >> config.layout
 	if [ "$CROSS_BUILD" ]; then
+		# pcre{,2}-config detection doesn't work on cross
+		# since httpd-2.4.53, manually export PCRE_CONFIG
+		# to let configure know where it is
+		export PCRE_CONFIG="${XBPS_CROSS_BASE}/usr/bin/pcre2-config"
 		configure_args+=" --with-apr=$XBPS_WRAPPERDIR/apr-1-config
 		 --with-apr-util=$XBPS_WRAPPERDIR/apu-1-config"
 	else

From c4a3914cb75bb7aabef0d5b0cd67309c913877a8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 May 2022 12:55:30 +0200
Subject: [PATCH 1849/2561] bitmap: update to 1.1.0.

---
 srcpkgs/bitmap/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bitmap/template b/srcpkgs/bitmap/template
index 95b2d1556c28..a6455eeee1b9 100644
--- a/srcpkgs/bitmap/template
+++ b/srcpkgs/bitmap/template
@@ -1,6 +1,6 @@
 # Template file for 'bitmap'
 pkgname=bitmap
-version=1.0.9
+version=1.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Bitmap editor and converter utilities for X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=e0f3afad5272d796f54c33fa1b5bd1fb3f62843a54b28c87196d06a35123e5f5
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=8e86879c2feeece3f10e189330479cf51da0dd268355d1e3ee8a8497ab833690
 conflicts="mesa-demos>0"
 
 post_install() {

From 47ae6d65dae6ee7d9c2915aea425a50bc7f07679 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 May 2022 12:57:47 +0200
Subject: [PATCH 1850/2561] libX11: update to 1.8.

---
 srcpkgs/libX11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index e47acb6ecf69..4940467c5a25 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.7.5
+version=1.8
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
-checksum=5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151
+checksum=081bf42ebab023aa92cfdb20c7af8c5ae13d13e88a5e22f90f4453ef80bbdde4
 
 do_configure() {
 	./configure ${configure_args}

From 6f43d912aaa3e039ab3015b42c82a831eb1820d9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 May 2022 13:00:08 +0200
Subject: [PATCH 1851/2561] slurm: update to 0.4.4.

---
 srcpkgs/slurm/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/slurm/template b/srcpkgs/slurm/template
index 64ade843fce4..c75b8ea1a667 100644
--- a/srcpkgs/slurm/template
+++ b/srcpkgs/slurm/template
@@ -1,22 +1,19 @@
 # Template file for 'slurm'
 pkgname=slurm
-version=0.4.3
-revision=5
+version=0.4.4
+revision=1
 wrksrc="${pkgname}-upstream-${version}"
-build_style="cmake"
+build_style="meson"
 makedepends="ncurses-devel"
 short_desc="Yet another network load monitor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/mattthias/slurm"
 distfiles="https://github.com/mattthias/slurm/archive/upstream/${version}.tar.gz"
-checksum=b960c0d215927be1d02c176e1b189321856030226c91f840284886b727d3a3ac
+checksum=2f846c9aa16f86cc0d3832c5cd1122b9d322a189f9e6acf8e9646dee12f9ac02
 
 post_patch() {
 	vsed -i '/<sys\/sysctl.h>/d' os.h
 	vsed -i 's,<net/ppp_defs.h>,<linux/ppp_defs.h>,g' os.h
 	vsed -i 's,<net/if_ppp.h>,<linux/if_ppp.h>,g' os.h
 }
-post_install() {
-	vman slurm.1
-}

From 103cc166bb976ade09f19ac9c8566c52b0ea0c45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 13:47:39 +0200
Subject: [PATCH 1852/2561] apostrophe: update to 2.6.3.

---
 srcpkgs/apostrophe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 54a80188bdae..ac880ca649a2 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,6 +1,6 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.6.2
+version=2.6.3
 revision=1
 wrksrc="$pkgname-v$version"
 build_style=meson
@@ -15,4 +15,4 @@ license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/World/apostrophe"
 changelog="https://gitlab.gnome.org/World/apostrophe/-/raw/main/NEWS"
 distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz"
-checksum=b06ca4593ceb21bcd7f9734e41ba3fb69f632b5ab24afcdc66500d18d242c068
+checksum=6f73c80146af0820ec705ec8b32ec64f0f323f51de6b6a4cfd4d02f0719876f3

From 48fbddca3efe79d642f9867d43e8aa8b7af6c1c4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 13:47:42 +0200
Subject: [PATCH 1853/2561] AppStream: update to 0.15.3.

---
 srcpkgs/AppStream/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index b2d920729249..d30e54263353 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,6 +1,6 @@
 # Template file for 'AppStream'
 pkgname=AppStream
-version=0.15.2
+version=0.15.3
 revision=1
 wrksrc="appstream-${version}"
 build_style=meson
@@ -17,7 +17,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
 distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=70c95545ac2cde87c9ba4a292648ed64ed1211fb24d792b5b9e84f870a83fe9d
+checksum=349b4753c5e6d8118c8ea3883547b1fde11a8217ffd61248a181f18bdfc1670c
 conf_files="/etc/appstream.conf"
 triggers="appstream-cache"
 

From dbb8b56824b451b6f04f7045bfa56a791044c10a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:21:14 +0200
Subject: [PATCH 1854/2561] libadwaita: update to 1.1.1.

---
 srcpkgs/libadwaita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index aef0032bfb7c..9a48617f470a 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
+checksum=491169d4f6a11765328996bc088272d05c7235453bc0ee73c20dfd4bd67b401c
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 21c888f1f4ff68b638029d2c08a724f77b636052 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:22:00 +0200
Subject: [PATCH 1855/2561] lagrange: update to 1.12.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 16787f411ee0..12a3938f5212 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.12.1
+version=1.12.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=8a342d9b7e980cd6d9771d72215dd543d411721685fb60fc2202e300cb5d6483
+checksum=cef0ef9543a87d3a4cc8ad83955f9a4e62af7bef4e786642c1ab5ec85ff8b950
 
 post_install() {
 	vlicense LICENSE.md

From b273f155861c69f75913c2685e74b1030db8c752 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:33:15 +0200
Subject: [PATCH 1856/2561] python3-mypy: update to 0.950.

---
 srcpkgs/python3-mypy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index a92e1c803e48..ba0df7ee09d3 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
-version=0.942
+version=0.950
 revision=1
 wrksrc="mypy-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/python/mypy"
 distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=17e44649fec92e9f82102b48a3bf7b4a5510ad0cd22fa21a104826b5db4903e2
+checksum=1b333cfbca1762ff15808a0ef4f71b5d3eed8528b23ea1c3fb50543c867d68de
 make_check=no # needs pytest-xdist and many tests fail
 
 post_install() {

From 9596910f8631b49f6b2476a87cc5d2c3cb0dad5d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:33:12 +0200
Subject: [PATCH 1857/2561] python3-astroid: update to 2.11.3.

---
 srcpkgs/python3-astroid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index ca5db18ccc79..8b0c64e88833 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.11.2
+version=2.11.3
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ 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="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=4a275523e2600c928ac95cda3ed7c1307dff2e6fbe24ef95ed867bda0fcaeab8
+checksum=455d18bfb08cec3bb61d273306c82cffc1de494c2ad4c67410494ebe6e192bc5

From ecc1de38e297fec87c5b0f314fce7933b9c9b843 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:23:03 +0200
Subject: [PATCH 1858/2561] pylint: update to 2.13.7.

---
 srcpkgs/pylint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 2d53ba7420f1..3a6db1a7ce36 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,6 +1,6 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.13.5
+version=2.13.7
 revision=1
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=5450fd8014baf1663fb4860b7e1dc4f4c4eb9649598a210d68e97be0973c783f
+checksum=c497a2b29e9c78322324e88b2303b388c28ed57a81601e365393ba68d976bc50
 
 post_install() {
 	# install example config and emacs files

From cfa4c59c3ea6ecbef7173e839c62bb60daf639b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 15:47:47 +0200
Subject: [PATCH 1859/2561] gtk4: update to 4.6.3.

---
 srcpkgs/gtk4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index ed86ad7bab4c..d26e4a18c432 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.6.2
+version=4.6.3
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -29,7 +29,7 @@ license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-6/NEWS"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=ff263af609a50eb76056653592d929459aef4819a444c436f6d52c6f63c1faec
+checksum=a57acd0e4482981700fdf86596c7413cb61ef47f75e4747fda809e8231b8d96c
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11"

From bf7c078027178022f04db6e63727cbb08aee50e8 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 10 Apr 2022 15:30:13 +0200
Subject: [PATCH 1860/2561] qpwgraph: update to 0.2.6.

---
 srcpkgs/qpwgraph/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qpwgraph/template b/srcpkgs/qpwgraph/template
index 5e83972a7062..3ecbdfb9e081 100644
--- a/srcpkgs/qpwgraph/template
+++ b/srcpkgs/qpwgraph/template
@@ -1,15 +1,15 @@
 # Template file for 'qpwgraph'
 pkgname=qpwgraph
-version=0.2.4
+version=0.2.6
 revision=1
 wrksrc="qpwgraph-v${version}"
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
-makedepends="alsa-lib-devel pipewire-devel qt5-devel"
+makedepends="alsa-lib-devel pipewire-devel qt5-devel qt5-svg-devel"
 short_desc="Graph manager for PipeWire"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.freedesktop.org/rncbc/qpwgraph"
 changelog="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/ChangeLog"
 distfiles="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/archive/v${version}/qpwgraph-v${version}.tar.gz"
-checksum=5e2ad77e794367e3e1e6df5214e8770135941092ffac49bbbaaf7619decb54b5
+checksum=d9f8109ef87d947948f5d61f60480968d925d7a93fcf15e7fca8c45f194e2f90

From 236db21f3adbd80b4865d278126edd85d386eb4d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1861/2561] httpstat: update to 1.1.0.

---
 srcpkgs/httpstat/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/httpstat/template b/srcpkgs/httpstat/template
index c6ecf6bf23a0..ef084155b7b9 100644
--- a/srcpkgs/httpstat/template
+++ b/srcpkgs/httpstat/template
@@ -1,16 +1,16 @@
 # Template file for 'httpstat'
 pkgname=httpstat
-version=1.0.0
-revision=12
+version=1.1.0
+revision=1
 build_style=go
+go_ldflags="-X=main.version=$version"
 go_import_path="github.com/davecheney/httpstat"
-hostmakedepends="git"
 short_desc="It's like curl -v, with colours"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/davecheney/httpstat"
 distfiles="https://github.com/davecheney/httpstat/archive/v${version}.tar.gz"
-checksum=3a9e89141bb773ca5fa35b9b0ddd4832c17b317849471bacd0f1130333bbcd7b
+checksum=58260ab0a56557d0c2509ea09ee3fe54fe21a49f95d94189efdd64caec84fa67
 
 post_install() {
 	vlicense LICENSE

From c7beaf252fa17a18689b6afb816849867aca9c97 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 21:52:50 +0200
Subject: [PATCH 1862/2561] gettext: fix non-cross builds

---
 srcpkgs/gettext/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index dfb11a1f886c..2ab568366d26 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -14,7 +14,7 @@ configure_args="--disable-java --disable-native-java --disable-csharp
 # Either:
 # - Have xz in hostmakedepends; or
 # - Let gettext-devel depends on bzip2
-hostmakedepends="xz"
+hostmakedepends="xz automake libtool"
 short_desc="Internationalized Message Handling Library and tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -36,12 +36,9 @@ else
 	conflicts="gettext-libs>=0"
 fi
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" automake libtool"
-	pre_configure() {
-		autoreconf -fi
-	}
-fi
+pre_configure() {
+	autoreconf -fi
+}
 
 post_install() {
 	# don't overwrite musl's header

From 299d929e57c2ea501fec98b6278e2a243968b69a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 1 May 2022 18:43:10 +0200
Subject: [PATCH 1863/2561] libX11: revert to to 1.7.5.

Due to upstream issue:
https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/157
---
 srcpkgs/libX11/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 4940467c5a25..a47190eca09b 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,8 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.8
-revision=1
+reverts="1.8.0_1"
+version=1.7.5
+revision=2
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
@@ -12,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
-checksum=081bf42ebab023aa92cfdb20c7af8c5ae13d13e88a5e22f90f4453ef80bbdde4
+checksum=5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151
 
 do_configure() {
 	./configure ${configure_args}

From b9f1c9cb1b8f6dc87bb07f3123a128fcadab6b72 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 19:09:04 +0200
Subject: [PATCH 1864/2561] libX11: fix $reverts

---
 srcpkgs/libX11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index a47190eca09b..6b81e23b0d1f 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,8 +1,8 @@
 # Template file for 'libX11'
 pkgname=libX11
-reverts="1.8.0_1"
+reverts="1.8_1"
 version=1.7.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"

From 080baea3d3703c75d4c61014be0c080853e2ced8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 27 Apr 2022 20:18:58 +0200
Subject: [PATCH 1865/2561] chromium: update to 101.0.4951.41.

Co-Authored-By: q66 <daniel@octaforge.org>

Closes https://github.com/void-linux/void-packages/pull/36887
---
 ...romium-100-SCTHashdanceMetadata-move.patch | 35 -------------
 .../patches/chromium-libxml-unbundle.patch    | 10 ++++
 .../fix-missing-cstdint-include-musl.patch    | 10 ++++
 ...ebcodecs-stop-using-AudioOpusEncoder.patch | 49 -------------------
 .../patches/xxx-ppc64le-support.patch         |  6 +--
 srcpkgs/chromium/template                     |  4 +-
 6 files changed, 25 insertions(+), 89 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
 create mode 100644 srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch
 delete mode 100644 srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch

diff --git a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
deleted file mode 100644
index 903942906c7d..000000000000
--- a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Wed, 23 Feb 2022 12:18:57 +0100
-Subject: [PATCH] GCC: explicitely move return value of SCTHashdanceMetadata::ToValue
-
-GCC rejects to do Return Value Optimization in
-SCTHashdanceMetadata::ToValue, because the copy constructor is
-deleted, and in that scenario RVO is rejected in GCC:
-    ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ‘base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const’:
-    ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ‘base::Value::Value(const base::Value&)’
-      191 |   return value;
-          |          ^~~~~
-    In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14,
-                     from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5:
-    ../../base/values.h:254:3: note: declared here
-      254 |   Value(const Value&) = delete;
-          |   ^~~~~
-
-Bug: 819294
-Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166
----
-
-diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc
-index a057e8e..365527b 100644
---- a/services/network/sct_auditing/sct_auditing_reporter.cc
-+++ b/services/network/sct_auditing/sct_auditing_reporter.cc
-@@ -188,7 +188,7 @@
-       kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id))));
-   value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd));
-   value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry));
--  return value;
-+  return std::move(value);
- }
- 
- // static
diff --git a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
new file mode 100644
index 000000000000..5699bc8f8eaf
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
@@ -0,0 +1,10 @@
+--- a/build/linux/unbundle/libxml.gn
++++ b/build/linux/unbundle/libxml.gn
+@@ -19,6 +19,7 @@ static_library("libxml_utils") {
+     ":xml_reader",
+     ":xml_writer",
+     "//base/test:test_support",
++    "//services/data_decoder:lib",
+     "//services/data_decoder:xml_parser_fuzzer_deps",
+   ]
+   sources = [
diff --git a/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch b/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch
new file mode 100644
index 000000000000..baa48c8f2a78
--- /dev/null
+++ b/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch
@@ -0,0 +1,10 @@
+--- a/net/third_party/quiche/src/http2/adapter/window_manager.h
++++ b/net/third_party/quiche/src/http2/adapter/window_manager.h
+@@ -3,6 +3,7 @@
+ 
+ #include <stddef.h>
+ 
++#include <cstdint>
+ #include <functional>
+ 
+ #include "common/platform/api/quiche_export.h"
diff --git a/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch b/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch
deleted file mode 100644
index 32957d32fa37..000000000000
--- a/srcpkgs/chromium/patches/webcodecs-stop-using-AudioOpusEncoder.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001
-From: Eugene Zemtsov <eugene@chromium.org>
-Date: Thu, 24 Feb 2022 23:17:20 +0000
-Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo
- audio encoder
-
-AudioOpusEncoder was only used here for testing. Let's not let it get
-comfortable. We'll use MF AAC encoder here when we have it. (Soon...)
-
-Bug: 1259883
-Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449
-Commit-Queue: Eugene Zemtsov <eugene@chromium.org>
-Auto-Submit: Eugene Zemtsov <eugene@chromium.org>
-Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
-Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#974895}
----
- media/mojo/services/gpu_mojo_media_client.cc | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc
-index 8f83a4d6cf6..40cdaff8d3a 100644
---- a/media/mojo/services/gpu_mojo_media_client.cc
-+++ b/media/mojo/services/gpu_mojo_media_client.cc
-@@ -13,7 +13,6 @@
- #include "build/chromeos_buildflags.h"
- #include "gpu/ipc/service/gpu_channel.h"
- #include "media/audio/audio_features.h"
--#include "media/audio/audio_opus_encoder.h"
- #include "media/base/audio_decoder.h"
- #include "media/base/cdm_factory.h"
- #include "media/base/media_switches.h"
-@@ -119,14 +118,7 @@ std::unique_ptr<AudioEncoder> GpuMojoMediaClient::CreateAudioEncoder(
-     scoped_refptr<base::SequencedTaskRunner> task_runner) {
-   if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder))
-     return nullptr;
--  // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on
--  // we'll create a real platform encoder here.
--  auto opus_encoder = std::make_unique<AudioOpusEncoder>();
--  auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner(
--      {base::TaskPriority::USER_BLOCKING});
--  return std::make_unique<OffloadingAudioEncoder>(std::move(opus_encoder),
--                                                  std::move(encoding_runner),
--                                                  std::move(task_runner));
-+  return nullptr;
- }
- 
- VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() {
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index 0be29c1a4eec..79a1e2a17568 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -2248,12 +2248,12 @@ index 7a1b2763c..beda8da9e 100644
 --- a/third_party/crashpad/crashpad/snapshot/capture_memory.cc
 +++ b/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) {
+   for (size_t i = 0; i < std::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) {
++  for (size_t i = 0; i < std::size(context.ppc64->regs); ++i) {
 +    MaybeCaptureMemoryAround(delegate, context.ppc64->regs[i]);
 +  }
  #else
@@ -3527,7 +3527,7 @@ index ec3e56964..4cf8999a2 100644
 -    return buffer.str();
 +
 +    std::string ret(buffer.str());
-+    if (signbit(value) && ret[0] == '.') {
++    if (std::signbit(value) && ret[0] == '.') {
 +        ret[0] = '-';
 +    }
 +    return ret;
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index f655d29f3ba0..0dce8772fdb8 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=100.0.4896.127
+version=101.0.4951.41
 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="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d
+checksum=099863882e88b9a035fcb6b63dd5288554f6b27558e0ebce93e0d804465efa37
 
 lib32disabled=yes
 

From 4b2da33f92daf013acdf1c1457ee2e5cb9f1619e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 19 Apr 2022 16:42:30 +0200
Subject: [PATCH 1866/2561] homebank: update to 5.5.5.

---
 srcpkgs/homebank/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 57eca4181c43..84f52ed2fa7a 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,6 +1,6 @@
 # Template file for 'homebank'
 pkgname=homebank
-version=5.5.4
+version=5.5.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
@@ -11,7 +11,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
-checksum=0d0669bca099340ae5c213ea13cb2b93283bfc8a0e4cf7a5902c1829366e5765
+checksum=bece05ecb52392147424aa1e5a179389777b82bf468abebd73eb70b2af9c9e67
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure

From 81db43f8a3f960a2b22fe33988a8d7702b575e22 Mon Sep 17 00:00:00 2001
From: David Flatz <david@upcs.at>
Date: Mon, 2 May 2022 15:35:51 +0200
Subject: [PATCH 1867/2561] base-files: add alacritty to DIR_COLORS.256color

---
 srcpkgs/base-files/files/DIR_COLORS.256color | 1 +
 srcpkgs/base-files/template                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/base-files/files/DIR_COLORS.256color b/srcpkgs/base-files/files/DIR_COLORS.256color
index 34fbe33a8712..0e96e50eab58 100644
--- a/srcpkgs/base-files/files/DIR_COLORS.256color
+++ b/srcpkgs/base-files/files/DIR_COLORS.256color
@@ -20,6 +20,7 @@ COLOR tty
 OPTIONS -F -T 0
 
 # Below, there should be one TERM entry for each termtype that is colorizable
+TERM alacritty
 TERM putty-256color
 TERM rxvt-256color
 TERM screen-256color
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index bf7b7ef242b0..2249d002f3f9 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.142
-revision=12
+revision=13
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"

From 49bf1198573518d87a9b48adf2ad74449b7719ea Mon Sep 17 00:00:00 2001
From: Brihadeesh S <brihadeesh.santharam@gmail.com>
Date: Mon, 2 May 2022 12:15:26 +0530
Subject: [PATCH 1868/2561] e16: update to 1.0.24.

e16: update to 1.0.24
---
 srcpkgs/e16/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/e16/template b/srcpkgs/e16/template
index 246087e36b57..30a4bc9b281e 100644
--- a/srcpkgs/e16/template
+++ b/srcpkgs/e16/template
@@ -1,6 +1,6 @@
 # Template file for 'e16'
 pkgname=e16
-version=1.0.23
+version=1.0.24
 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=5b441bebf0c733e724ebe753f0c74aa632d0fead2bced67a3a7e988dc5de3336
+checksum=e5309b1a77595a5fe9c29231bf91057093b0b96eb592d2d6805fb6e556a2735a
 
 post_install() {
 	# install gnome and kde session scripts

From 8489dbceacaa5f82c7b3b7fbd4107f2b268eb0fa Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 1 May 2022 11:00:38 -0400
Subject: [PATCH 1869/2561] chezmoi: update to 2.15.2, cleanup.

remove unnecessary variable, make more reproducible.
---
 srcpkgs/chezmoi/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index bacfc8c9b294..531370c90298 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,20 +1,25 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.15.1
+version=2.15.2
 revision=1
 build_style=go
 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.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps"
+go_ldflags="-X main.version=${version} -X main.commit=v${version} -X main.builtBy=xbps"
 short_desc="Manage your dotfiles across multiple machines, securely"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=0100dcf8b70774595f56859e5d1b635319ba584ad7b280946352be328f36d679
+checksum=c06c62feeaa95d735191db19fb9f4ef473b7144e01004e789b03d9a3c9c5b4b6
 
-export CGO_ENABLED=1
+pre_build() {
+	local _date
+	if [ "$SOURCE_DATE_EPOCH" ]; then
+		_date="$(date --utc --date "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d")"
+		go_ldflags+=" -X main.date=${_date}"
+	fi
+}
 
 post_install() {
 	vlicense LICENSE

From 45369687efdda99012c25f24989e7746766f3666 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 2 May 2022 13:05:10 -0400
Subject: [PATCH 1870/2561] nano: update to 6.3.

---
 srcpkgs/nano/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template
index c168a9b2b9cf..6efd3dcd6d1e 100644
--- a/srcpkgs/nano/template
+++ b/srcpkgs/nano/template
@@ -1,6 +1,6 @@
 # Template file for 'nano'
 pkgname=nano
-version=6.2
+version=6.3
 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=2bca1804bead6aaf4ad791f756e4749bb55ed860eec105a97fba864bc6a77cb3
+checksum=eb532da4985672730b500f685dbaab885a466d08fbbf7415832b95805e6f8687
 
 post_install() {
 	vsconf syntax/nanorc.nanorc

From 02d8fc31b4ec282a65a7bdbe7540f200f692f535 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 25 Apr 2022 16:22:44 +0530
Subject: [PATCH 1871/2561] spotify-adblock: update to 1.0.2

---
 srcpkgs/spotify-adblock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
index 8d64a84df72f..ee363eab2c70 100644
--- a/srcpkgs/spotify-adblock/template
+++ b/srcpkgs/spotify-adblock/template
@@ -1,6 +1,6 @@
 # Template file for 'spotify-adblock'
 pkgname=spotify-adblock
-version=1.0.1
+version=1.0.2
 revision=1
 build_style=cargo
 conf_files="/etc/spotify-adblock/config.toml"
@@ -9,7 +9,7 @@ maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/abba23/spotify-adblock"
 distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${version}.tar.gz"
-checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360
+checksum=a0b5124573b95548e2f5ae36fc74fdab4fab9282d755affba754641e561aeac6
 
 pre_install() {
 	{ sed -n '/<summary>Debian/q'

From 0a3d92a6d73caa3b742b91739535151eabe4bd18 Mon Sep 17 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, 3 May 2022 11:24:20 +0700
Subject: [PATCH 1872/2561] tzutils: update to 2022a.

---
 srcpkgs/tzutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 814693a3a56f..d0d6cf99dd95 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,6 +1,6 @@
 # Template file for 'tzutils'
 pkgname=tzutils
-version=2021e
+version=2022a
 revision=1
 bootstrap=yes
 wrksrc="tz-${version}"
@@ -9,7 +9,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="Public Domain, BSD-3-Clause"
 homepage="https://www.iana.org/time-zones"
 distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz"
-checksum=11908a7f18530ca3013c8458d902a54cdd3382276bdd56891db074b1af4a26b8
+checksum=e9d82a851a15bb5db2cbaae2c3fc633743ad9edc069e3738c5e8908978064ed8
 
 do_build() {
 	echo "$version" >version

From 0e2e959548a432eef44d5cf2ec56ac5864ed54c4 Mon Sep 17 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, 3 May 2022 11:24:16 +0700
Subject: [PATCH 1873/2561] tzdata: update to 2022a.

---
 srcpkgs/tzdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 576f199552d3..fe7ca90f5ac8 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -1,6 +1,6 @@
 # Template file for 'tzdata'
 pkgname=tzdata
-version=2021e
+version=2022a
 revision=1
 bootstrap=yes
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 homepage="http://www.iana.org/time-zones"
 distfiles="http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"
-checksum=07ec42b737d0d3c6be9c337f8abb5f00554a0f9cc4fcf01a703d69403b6bb2b1
+checksum=ef7fffd9f4f50f4f58328b35022a32a5a056b245c5cb3d6791dddb342f871664
 
 do_install() {
 	local timezones="africa antarctica asia australasia europe northamerica \

From 8db5fd087cf3100f8dc6803c6640e17409843316 Mon Sep 17 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, 3 May 2022 11:23:38 +0700
Subject: [PATCH 1874/2561] nss: update to 3.78.

---
 srcpkgs/nss/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 5cc04daf52c2..31d1b847a9d1 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.77
+version=3.78
 revision=1
 hostmakedepends="perl which"
 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=825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd
+checksum=f455f341e787c1167328e80a84f77b9a557d595066dda6486a1874d72da68800
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 6938acf5559a1e99d6fe010c171290897bd998e7 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <aldridge.mac@gmail.com>
Date: Tue, 3 May 2022 02:06:10 -0500
Subject: [PATCH 1875/2561] goreleaser: update to 1.8.3.

---
 srcpkgs/goreleaser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goreleaser/template b/srcpkgs/goreleaser/template
index cdeae7a06171..2062a8d28d04 100644
--- a/srcpkgs/goreleaser/template
+++ b/srcpkgs/goreleaser/template
@@ -1,6 +1,6 @@
 # Template file for 'goreleaser'
 pkgname=goreleaser
-version=1.2.5
+version=1.8.3
 revision=1
 build_style=go
 go_import_path=github.com/goreleaser/goreleaser
@@ -9,7 +9,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"
 homepage="https://goreleaser.com/"
 distfiles="https://github.com/goreleaser/goreleaser/archive/refs/tags/v$version.tar.gz"
-checksum=f6ad356f4b53a3e4742bb429c636b974f04aab8d5d12f5fc6919526c83665d1a
+checksum=3ac091dacf81357a83b5c8bf17bbcb325371111b88bc59fa79c8354be2273145
 
 post_install() {
 	vlicense LICENSE.md

From bd4fe0baf46a0f001689712b80fe9320d21b05b8 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <aldridge.mac@gmail.com>
Date: Tue, 3 May 2022 02:09:01 -0500
Subject: [PATCH 1876/2561] xlunch: update to 4.7.3.

---
 srcpkgs/xlunch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlunch/template b/srcpkgs/xlunch/template
index 36c568aafa8f..c3e9ed018c47 100644
--- a/srcpkgs/xlunch/template
+++ b/srcpkgs/xlunch/template
@@ -1,6 +1,6 @@
 # Template file for 'xlunch'
 pkgname=xlunch
-version=4.7.1
+version=4.7.3
 revision=1
 build_style=gnu-makefile
 make_build_target=xlunch
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://xlunch.org/"
 distfiles="https://github.com/Tomas-M/xlunch/archive/v${version}.tar.gz"
-checksum=9ee401638fde606539bb36e7754af83d5827e4764d4e8fcbe95f25d19338bf33
+checksum=9bc03634e8889f47d5727a8f3f49462cebc2c3576337593ffd9832801ea63e6c
 
 do_install() {
 	vbin xlunch

From 56183724e96c2de65eecd58110caf71ed7a26eea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sat, 30 Apr 2022 09:49:24 -0400
Subject: [PATCH 1877/2561] maturin: update to 0.12.14.

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 64140c2f5fe7..4bb299175cae 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.12
+version=0.12.14
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="0da8b649dc91278363d6a07fee26ea53b8f2d9cd06139034dea3a5506baf12a0
+checksum="4b45ef2f5a63d7dde7700556f60d82222c7ccba64cea70950f909b06e8355249
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From 7fffb535506b7c3b79fc562553872bb482947bb0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:04:13 -0400
Subject: [PATCH 1878/2561] python3-Pygments: update to 2.12.0.

---
 srcpkgs/python3-Pygments/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Pygments/template b/srcpkgs/python3-Pygments/template
index 5ac883fda323..89335f3d551a 100644
--- a/srcpkgs/python3-Pygments/template
+++ b/srcpkgs/python3-Pygments/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pygments'
 pkgname=python3-Pygments
-version=2.11.2
+version=2.12.0
 revision=1
 wrksrc="Pygments-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="BSD-2-Clause"
 homepage="https://pygments.org"
 changelog="https://raw.githubusercontent.com/pygments/pygments/master/CHANGES"
 distfiles="${PYPI_SITE}/P/Pygments/Pygments-${version}.tar.gz"
-checksum=4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a
+checksum=5eb116118f9612ff1ee89ac96437bb6b49e8f04d8a13b514ba26f620208e26eb
 alternatives="pygments:pygmentize:/usr/bin/pygmentize3"
 
 post_install() {

From 15222637164ceee51646ba2bf10b1d31e6ccb260 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:04:32 -0400
Subject: [PATCH 1879/2561] python3-cryptography_vectors: update to 37.0.1.

---
 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 c31863f52ad7..4576117879de 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=36.0.2
+version=37.0.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -11,7 +11,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=2a7924449a03025faf7f8754a6f4200001cab210734a6ce6ac1f6bdacd3a68e4
+checksum=66c9a714232be730fe822bd7e4e9da6231ff9e537ee4feb0f092c06b8ea4d94a
 
 post_install() {
 	vlicense LICENSE

From fe716c3fa793393f7d664a22f5b5f71706cf8f00 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:21:03 -0400
Subject: [PATCH 1880/2561] python3-cryptography: update to 37.0.1.

---
 srcpkgs/python3-cryptography/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 278446d27efb..12fd50551a13 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=36.0.2
+version=37.0.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 build_helper="rust"
+make_check_args="--ignore tests/bench/test_x509.py"
 hostmakedepends="python3-setuptools-rust python3-cffi cargo"
 makedepends="python3-devel openssl-devel"
 depends="python3-cffi"
@@ -16,7 +17,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=70f8f4f7bb2ac9f340655cbac89d68c527af5bb4387522a8413e841e3e6628c9
+checksum=d610d0ee14dd9109006215c7c0de15eee91230b70a9bce2263461cf7c3720b83
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"
@@ -24,6 +25,10 @@ if [ "$CROSS_BUILD" ]; then
 	export PYO3_CROSS_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include"
 fi
 
+pre_check() {
+	vsed -i '/addopts/d' pyproject.toml
+}
+
 post_install() {
 	vlicense LICENSE
 	vlicense LICENSE.BSD

From 6d0cd81b25c7d5d85e96301cd57ea375fe8c4c4e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:22:16 -0400
Subject: [PATCH 1881/2561] python3-imageio: update to 2.19.0.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index a5167cbc45e8..17b159983528 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.17.0
+version=2.19.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=34173213c7e90096743bf077d888dd1c0300e8ebfad8184ee24a968cc860af5c
+checksum=df6f0f80b7e7dbad66e80d223ecfdcb6285c800716251aabc49fcf756b516168
 
 post_install() {
 	vlicense LICENSE

From fe98419be05faca4a793397c6583ddc5d40a683f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:30:04 -0400
Subject: [PATCH 1882/2561] python3-hypothesis: update to 6.46.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 fd24d4f52491..f4017b40bb79 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.43.0
+version=6.46.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=57e04ecd3fb433604a17dbcf535947734f98bcced562a71c67513d98919d1d3b
+checksum=47a115c01f40afa137747b3ddd8c2d7394be86da1318222eeecc66c227b49d38
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 400ad5219e2c5d9a5006bdc3f6f8cad2111126f1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:32:00 -0400
Subject: [PATCH 1883/2561] python3-ipython: update to 8.3.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 dfaae66b583d..99b847586a12 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.2.0
+version=8.3.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=70e5eb132cac594a34b5f799bd252589009905f05104728aea6a403ec2519dc1
+checksum=807ae3cf43b84693c9272f70368440a9a7eaa2e7e6882dad943c32fbf7e51402
 conflicts="python-ipython<=5.8.0_2"
 
 do_check() {

From abfcec13b7141f710ca456870133510fdb428e43 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:32:21 -0400
Subject: [PATCH 1884/2561] python3-pytools: update to 2022.1.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 6a57301a4d61..1367b8ec31b1 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.4
+version=2022.1.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=ae25f7c9b196fcd0d15e53bfe05236fe7bc5efd923810fbaeeee1a4bc4b6764a
+checksum=9271dc8a65da02fa3fe342e2be7979b2d10f792f3b54fb115e51bf10386eb770
 
 post_install() {
 	vlicense LICENSE

From b9c59f981fbfe79be826bae09813e5ccec3ff5b4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:32:35 -0400
Subject: [PATCH 1885/2561] python3-setuptools-rust: update to 1.3.0.

---
 srcpkgs/python3-setuptools-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index c2a506773cae..19b7dea26647 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools-rust'
 pkgname=python3-setuptools-rust
-version=1.2.0
+version=1.3.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/PyO3/setuptools-rust"
 changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=0a4ada479e8c7e3d8bd7cb56e1a29acc2b2bb98c2325051b0cdcb57d7f056de8
+checksum=958c5bf4ab6483d59dab888538121871cc5006354a42fb0fbd50acf03caad1de
 # Tests have unpackaged dependencies
 make_check=no
 

From 9fcd2403c690d7c2c6a47e560c37882ffc7f573f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:32:47 -0400
Subject: [PATCH 1886/2561] python3-tifffile: update to 2022.4.28.

---
 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 b8fb29af1782..a34273322530 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.4.8
+version=2022.4.28
 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=f4dafa604c949ebedc60a0fd41be0048399fea72b529efcff6330a29590ee5f6
+checksum=5ee740afa64bfc8da5b1e7badc5d4e20766f7631adb48792e5ee72978ba0fcff
 # Tests require unpackaged fsspec
 make_check=no
 

From 81319ca9c8089a58786e0d7b7f8c45a98d1b9464 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 1 May 2022 22:43:00 -0400
Subject: [PATCH 1887/2561] xpra: update to 4.3.3.

---
 srcpkgs/xpra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 5bc9ea89fdff..d9485ca78e2f 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -1,6 +1,6 @@
 # Template file for 'xpra'
 pkgname=xpra
-version=4.3.2
+version=4.3.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=1e548b8d20c243fba40692abb0aa2759e3bd3f2d3b6b51a160f82746cdf1d782
+checksum=06009ea2cd41b3ffaab51b01e29bb4d9e635ead795d378575f5379e5cb166a83
 conf_files="/etc/xpra/xpra.conf /etc/xpra/xorg.conf /etc/xpra/conf.d/*"
 
 system_groups="xpra"

From 21b86f3165f0c9a0d4ac56668eb042966660bd30 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 3 May 2022 08:09:38 -0400
Subject: [PATCH 1888/2561] python3-matplotlib: update to 3.5.2.

---
 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 b4b1852b2e58..e4e03bc540ba 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.5.1
+version=3.5.2
 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=9683da9a0c84d1c42d1bf92ecf6e012d302406a38fd987e3dfbcb7b58b2eea2d
+checksum=c81325d1b0d822ef75fd71d243f98478cdca1f800a838a2a1bc8e4e17b8df93c
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From 70a08af4f56b8fe9a92d83d95cbece1311d0fb16 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 3 May 2022 08:45:00 +0200
Subject: [PATCH 1889/2561] kmonad: correct version to 0.4.1.20220321.

Fixes: 78955200f6 ("kmonad: update to 65b501defdd0049563752f8af8c8c57f5a1ae38b")
---
 srcpkgs/kmonad/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 829d96a535eb..bddd3b33b893 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,14 +1,17 @@
 # Template file for 'kmonad'
 pkgname=kmonad
-version=65b501defdd0049563752f8af8c8c57f5a1ae38b
+reverts="65b501defdd0049563752f8af8c8c57f5a1ae38b_1"
+_githash=65b501defdd0049563752f8af8c8c57f5a1ae38b
+version=0.4.1.20220321
 revision=1
+wrksrc="${pkgname}-${_githash}"
 build_style=haskell-stack
 stackage=lts-19.0
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"
 homepage="https://github.com/david-janssen/kmonad"
-distfiles="${homepage}/archive/${version}.tar.gz"
+distfiles="${homepage}/archive/${_githash}.tar.gz"
 checksum=2b0cb0c5d1575bf61b1c442476ad24103028c309d103fedb56214a3bb30f8c0f
 nopie_files="/usr/bin/kmonad"
 nocross=yes

From 623115405c7ddbe3028262a38b91d2be22b341f9 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 28 Apr 2022 15:44:54 -0400
Subject: [PATCH 1890/2561] python3-trimesh: update to 3.11.2.

---
 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 0a162818e7cb..3bd4a284eca9 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.10.8
+version=3.11.2
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -16,7 +16,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=465d30b17e1f62c467283422eb932b70ff4807f9346f3012195ac94675c837f3
+checksum=bee21e9aa5b6c98f46dde34d490a0082e5c209f99288435282e145d328f14672
 
 post_install() {
 	vlicense LICENSE.md

From 3a504284f421aecffc14ae7713d75edaac64fffc Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sun, 1 May 2022 15:48:38 -0400
Subject: [PATCH 1891/2561] python3-zeroconf: update to 0.38.5.

---
 srcpkgs/python3-zeroconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index acae59ecd99f..0a32bfc59f8b 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-zeroconf'
 pkgname=python3-zeroconf
-version=0.38.4
+version=0.38.5
 revision=1
 wrksrc="python-zeroconf-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ 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=74ead61490a7573d1cab1e9e9ea6fe846be0843c4ddd55633788d4670837c0eb
+checksum=54fa609011b5d2b2ff3a689471a2af16a4bc20edcc4077360e94e93ec4fbea98
 
 do_check() {
 	# IPv6 doesn't work on github CI

From c5a6aff768523f090ff16ebc68a08e3ac5ea5add Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 2 May 2022 18:07:41 +0200
Subject: [PATCH 1892/2561] gnumeric: update to 1.12.52.

---
 srcpkgs/gnumeric/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 51992c67f473..c516b93e1ae9 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,17 +1,17 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
-version=1.12.51
+version=1.12.52
 revision=1
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config"
-makedepends="goffice-devel librsvg-devel libxslt-devel"
+makedepends="goffice-devel librsvg-devel libxslt-devel libxml2-devel"
 short_desc="GNOME Spreadsheet Program"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://gnumeric.org/"
 changelog="https://github.com/GNOME/gnumeric/raw/mainline/NEWS"
 distfiles="${GNOME_SITE}/gnumeric/${version%.*}/gnumeric-${version}.tar.xz"
-checksum=a00e6c6e4ecddadabd9b0ae18013d7b05937fdcb8f9aad5a73b95923c7aeb1dd
+checksum=73cf73049a22a1d828506275b2c9378ec37c5ff37b68bb1f2f494f0d6400823b
 
 # This isn't a direct dependency but when soname bumping perl it will
 # cause build failures

From 37cdcf494215bf670b7f861a1cafe8cbc6dd1eeb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 3 May 2022 17:33:26 +0200
Subject: [PATCH 1893/2561] syncthing: update to 1.20.0.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 6a2673395275..10166603a685 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.19.2
+version=1.20.0
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=81be2d3b22fa7282eee9cc1dc7569975fa62e7149700dcedaf03d372fb012a1e
+checksum=27d9b52f18ebd833938731ffaaeed4f34ced534ef3d1ed2bc126a495764f753d
 
 pre_build() {
 	GOARCH= go generate \

From 387095d99a6994e82a45a2ff04f0dcbe8fab4c3c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 2 May 2022 19:09:34 +0200
Subject: [PATCH 1894/2561] python3-pipenv: update to 2022.4.30.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 2c0c939cf5f7..0b0975137e1d 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.4.21
+version=2022.4.30
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=3f93229de25a4c3a658249f48407b80f347f076640a9fd50c476a2876212f781
+checksum=e26ded6ab90a7900676a1db9955d5ee714115f443aecc072b09497153ed237c7
 conflicts="python-pipenv>=0"
 
 post_extract() {

From 2d857ed38b488bb920ad37160335791016e105d9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 3 May 2022 15:28:06 -0400
Subject: [PATCH 1895/2561] armadillo: update to 11.0.1.

---
 common/shlibs                                 |  2 +-
 .../patches/9.700.2--include_dirs.patch       | 40 -------------------
 srcpkgs/armadillo/template                    | 18 +++++++--
 3 files changed, 15 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/armadillo/patches/9.700.2--include_dirs.patch

diff --git a/common/shlibs b/common/shlibs
index 4114151662fb..a2d858413fda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3722,7 +3722,7 @@ libdrumstick-rt.so.1 drumstick-1.1.2_1
 libnozzle.so.1 libnozzle1-1.11_4
 libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
 libluv.so.1 libluv-1.30.1.0_1
-libarmadillo.so.9 armadillo-9.700.2_1
+libarmadillo.so.11 armadillo-11.0.1_1
 libvarnishapi.so.2 libvarnishapi-6.3.0_1
 libicns.so.1 libicns-0.8.1_1
 librabbitmq.so.4 rabbitmq-c-0.10.0_2
diff --git a/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch b/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
deleted file mode 100644
index a19472dff135..000000000000
--- a/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a65f29c4cddccd22545746b077e6bd19d56e6bfb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 24 Jul 2020 23:07:44 +0200
-Subject: [PATCH] Absolute paths can't match both cross and native use
-
-
-diff --git include/armadillo_bits/config.hpp.cmake include/armadillo_bits/config.hpp.cmake
-index be42243..a285e35 100644
---- a/include/armadillo_bits/config.hpp.cmake
-+++ b/include/armadillo_bits/config.hpp.cmake
-@@ -50,7 +50,7 @@
- #endif
- 
- #if !defined(ARMA_SUPERLU_INCLUDE_DIR)
--#define ARMA_SUPERLU_INCLUDE_DIR ${ARMA_SUPERLU_INCLUDE_DIR}/
-+#define ARMA_SUPERLU_INCLUDE_DIR ./
- //// If you're using SuperLU and want to explicitly include the SuperLU headers,
- //// uncomment the above define and specify the appropriate include directory.
- //// Make sure the directory has a trailing /
-@@ -94,7 +94,7 @@
- //// ARMA_BLAS_LONG, ARMA_BLAS_LONG_LONG, ARMA_USE_FORTRAN_HIDDEN_ARGS
- 
- #cmakedefine ARMA_USE_ATLAS
--#define ARMA_ATLAS_INCLUDE_DIR ${ARMA_ATLAS_INCLUDE_DIR}/
-+#define ARMA_ATLAS_INCLUDE_DIR ./
- //// If you're using ATLAS and the compiler can't find cblas.h and/or clapack.h
- //// uncomment the above define and specify the appropriate include directory.
- //// Make sure the directory has a trailing /
-@@ -140,7 +140,7 @@
-   #undef  ARMA_USE_HDF5
-   #define ARMA_USE_HDF5
-   
--  #define ARMA_HDF5_INCLUDE_DIR ${ARMA_HDF5_INCLUDE_DIR}/
-+  #define ARMA_HDF5_INCLUDE_DIR ./
- #endif
- 
- #if !defined(ARMA_MAT_PREALLOC)
--- 
-2.27.0
-
diff --git a/srcpkgs/armadillo/template b/srcpkgs/armadillo/template
index 9407c3aa8b48..7117b47a3129 100644
--- a/srcpkgs/armadillo/template
+++ b/srcpkgs/armadillo/template
@@ -1,9 +1,10 @@
 # Template file for 'armadillo'
 pkgname=armadillo
-version=9.900.2
+version=11.0.1
 revision=1
 build_style=cmake
-configure_args="-DDETECT_HDF5=$(vopt_if hdf5 ON OFF)"
+configure_args="-DOPENBLAS_PROVIDES_LAPACK=true
+ -DDETECT_HDF5=$(vopt_if hdf5 ON OFF)"
 hostmakedepends="pkg-config"
 makedepends="openblas-devel superlu-devel $(vopt_if hdf5 hdf5-devel)"
 short_desc="C++ linear algebra library"
@@ -11,15 +12,24 @@ maintainer="Julien Dehos <dehos@lisic.univ-littoral.fr>"
 license="Apache-2.0"
 homepage="http://arma.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/arma/${pkgname}-${version}.tar.xz"
-checksum=d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05
+checksum=e43d4449376c1fc8b562095431bb82cf9c4ff98a791a22a25d0f96e5e7937c22
 
 build_options="hdf5"
 desc_option_hdf5="HDF5 support"
-# hd5 is nocross
+
+# hdf5 is nocross
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default="hdf5"
 fi
 
+post_install() {
+	# Strip cross prefix from default header paths in config.hpp
+	if [ "$CROSS_BUILD" ]; then
+		vsed -e "s@${XBPS_CROSS_BASE}/@/@" \
+			-i "${DESTDIR}/usr/include/armadillo_bits/config.hpp"
+	fi
+}
+
 armadillo-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From c3a3d6d3bfcfdb9df19e37be8e461f3ba2728e47 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 4 May 2022 00:12:44 +0200
Subject: [PATCH 1896/2561] New package: opendht-2.3.1

---
 common/shlibs            |  1 +
 srcpkgs/opendht-devel    |  1 +
 srcpkgs/opendht/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/opendht-devel
 create mode 100644 srcpkgs/opendht/template

diff --git a/common/shlibs b/common/shlibs
index a2d858413fda..353e291f59d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -992,6 +992,7 @@ libmdbsql.so.0 libmdb-0.5_1
 libkmod.so.2 libkmod-5_1
 libestr.so.0 libestr-0.1.2_1
 libee.so.0 libee-0.3.2_1
+libopendht.so.2 opendht-2.3.1_1
 libobt.so.2 libopenbox-3.5.2_1
 libobrender.so.32 libopenbox-3.6.1_1
 libgssglue.so.1 libgssglue-0.3_1
diff --git a/srcpkgs/opendht-devel b/srcpkgs/opendht-devel
new file mode 120000
index 000000000000..6e5a7c5ebfb0
--- /dev/null
+++ b/srcpkgs/opendht-devel
@@ -0,0 +1 @@
+opendht
\ No newline at end of file
diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
new file mode 100644
index 000000000000..c24ee3c55943
--- /dev/null
+++ b/srcpkgs/opendht/template
@@ -0,0 +1,31 @@
+# Template file for 'opendht'
+pkgname=opendht
+version=2.3.1
+revision=1
+build_style=cmake
+configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
+ -DOPENDHT_TESTS_NETWORK=OFF"
+hostmakedepends="pkg-config"
+makedepends="gnutls-devel msgpack-devel readline-devel libargon2-devel asio"
+short_desc="Distributed Hash Table implementation"
+maintainer="Piraty <piraty1@inbox.ru>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/savoirfairelinux/opendht"
+distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/${version}.tar.gz"
+checksum=9a75db4f119761d6524964b27d3a49aa809a6cb08bde963edc2f338458433c78
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+opendht-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/cmake"
+		vmove "usr/lib/pkgconfig"
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

From baad326726337376306b0f713f6dde452417a767 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 2 May 2022 15:32:43 +0200
Subject: [PATCH 1897/2561] zellij: update to 0.29.1

---
 srcpkgs/zellij/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 20a338d9103e..293238e95a38 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,6 +1,6 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.28.1
+version=0.29.1
 revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://zellij.dev"
 changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz"
-checksum=8c9495e70b1c0179200d6137dd892776c7153b0b54115edf0f39fd732bb62efe
+checksum=340f5241c9b1abb5652b1531167f837fc573b9cfdefa551363a48930f8f1d4dd
 
 post_build() {
 	ZELLIJ="target/${RUST_TARGET}/release/zellij"

From 86d4231aef11d68368d33c1959a4dfad236fefce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 10 Apr 2022 21:03:22 -0300
Subject: [PATCH 1898/2561] owncloudclient: update to 2.10.1, adopt.

---
 srcpkgs/owncloudclient/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template
index d2297995cd1a..3772509dcdda 100644
--- a/srcpkgs/owncloudclient/template
+++ b/srcpkgs/owncloudclient/template
@@ -1,6 +1,6 @@
 # Template file for 'owncloudclient'
 pkgname=owncloudclient
-version=2.10.0
+version=2.10.1
 revision=1
 wrksrc=client-${version}
 build_style=cmake
@@ -12,12 +12,12 @@ makedepends="qtkeychain-qt5-devel sqlite-devel qt5-declarative-devel
 depends="qt5-plugin-sqlite qt5-svg"
 conf_files="/etc/ownCloud/sync-exclude.lst"
 short_desc="Connect to ownCloud servers"
-maintainer="Nathan Owens <ndowens@artixlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://www.owncloud.org"
 changelog="https://raw.githubusercontent.com/owncloud/client/master/CHANGELOG.md"
 distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz"
-checksum=fc3248eb9afa67bba946cf788319d6dcc419d155700cb10baebb19f6ccf6b583
+checksum=cd79c46e0c13b606ec08527f9f5f35fe295d4655c12510aa6805ccb797119c49
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel"

From 2544aef7d2afbf07dffb8760fcc07601daaa9943 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 29 Apr 2022 17:25:53 +0200
Subject: [PATCH 1899/2561] fwupd-efi: update to 1.3

---
 srcpkgs/fwupd-efi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fwupd-efi/template b/srcpkgs/fwupd-efi/template
index 663782fa1da5..78a543fec1dd 100644
--- a/srcpkgs/fwupd-efi/template
+++ b/srcpkgs/fwupd-efi/template
@@ -1,6 +1,6 @@
 # Template file for 'fwupd-efi'
 pkgname=fwupd-efi
-version=1.2
+version=1.3
 revision=1
 archs="x86_64* i686* arm* aarch64*"
 build_style=meson
@@ -15,7 +15,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/fwupd/fwupd-efi"
 distfiles="https://github.com/fwupd/fwupd-efi/archive/refs/tags/${version}.tar.gz"
-checksum=568fa4a9eb884821661d47d0c04ad5681ffe26346a1f8186a068efe56854b77b
+checksum=0e76057c178e221f63eaf9142fa1d06780a8eb3df7cf0c11f92660138dec5c83
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -Defi-cc=/usr/bin/${XBPS_CROSS_TRIPLET}-gcc"

From 01e3ef3b6ea293a9795d411b83fbe260b968dffa Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Fri, 29 Apr 2022 17:26:06 +0200
Subject: [PATCH 1900/2561] fwupd: update to 1.8.0

---
 srcpkgs/fwupd/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 9f15e0a43ddc..189a8780874c 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,7 +1,7 @@
 # Template file for 'fwupd'
 pkgname=fwupd
-version=1.7.5
-revision=2
+version=1.8.0
+revision=1
 build_style=meson
 build_helper="gir"
 configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true
@@ -20,9 +20,9 @@ conf_files="
 short_desc="Daemon to allow session software to update firmware"
 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=1acbec6727967ceb6dff9408a9312bb9eba5a7ebd0fde655122921a62d1d396c
+homepage="https://github.com/fwupd/fwupd"
+distfiles="https://github.com/fwupd/fwupd/archive/${version}.tar.gz"
+checksum=1616394b6d23b5696b91ebfcd83fef537be21e9600daca3ec3a09519074385bd
 replaces="fwupdate>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From 7463f0be00e4c401739d498a44652e096c089eb0 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sun, 1 May 2022 23:18:20 -0400
Subject: [PATCH 1901/2561] podman-compose: update to 1.0.3.

---
 srcpkgs/podman-compose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman-compose/template b/srcpkgs/podman-compose/template
index 4e1722d64ea6..7f92015f8ecf 100644
--- a/srcpkgs/podman-compose/template
+++ b/srcpkgs/podman-compose/template
@@ -1,6 +1,6 @@
 # Template file for 'podman-compose'
 pkgname=podman-compose
-version=1.0.2
+version=1.0.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,6 +10,6 @@ maintainer="juan <juan@horlux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/containers/podman-compose"
 distfiles="https://github.com/containers/podman-compose/archive/v${version}.tar.gz"
-checksum=8eae5f2d89a423c66c26377c29955e077e7c90532e1a63989e8f04d973181c76
+checksum=b28e5792a50feee987e7864e0df1b6e8929c923c010e1f65493fe29b4c2aedcf
 # Source distribution does not script unit tests
 make_check=no

From b1b05e409a7114225cb285111a7e8e7d22dcf7ef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 3 May 2022 12:40:00 +0200
Subject: [PATCH 1902/2561] Chipmunk2D: update to 7.0.3.

---
 .../patches/backport-zero-division.patch      | 35 -------------------
 srcpkgs/Chipmunk2D/template                   |  6 ++--
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/Chipmunk2D/patches/backport-zero-division.patch

diff --git a/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch b/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch
deleted file mode 100644
index 2ced601be100..000000000000
--- a/srcpkgs/Chipmunk2D/patches/backport-zero-division.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6a5767cc5a6c8f88f8cc689c0916ddc0111308fe Mon Sep 17 00:00:00 2001
-From: Bram Stolk <b.stolk@gmail.com>
-Date: Fri, 30 Mar 2018 19:21:26 -0700
-Subject: [PATCH] Fix issue #144 of division by zero when setting zero mass,
- zero moment.
-
----
- src/cpBody.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git src/cpBody.c src/cpBody.c
-index a8e0797..8ad2bc9 100644
---- a/src/cpBody.c
-+++ b/src/cpBody.c
-@@ -258,7 +258,7 @@ cpBodySetMass(cpBody *body, cpFloat mass)
- 	
- 	cpBodyActivate(body);
- 	body->m = mass;
--	body->m_inv = 1.0f/mass;
-+	body->m_inv = mass == 0.0f ? INFINITY : 1.0f/mass;
- 	cpAssertSaneBody(body);
- }
- 
-@@ -275,7 +275,7 @@ cpBodySetMoment(cpBody *body, cpFloat moment)
- 	
- 	cpBodyActivate(body);
- 	body->i = moment;
--	body->i_inv = 1.0f/moment;
-+	body->i_inv = moment == 0.0f ? INFINITY : 1.0f/moment;
- 	cpAssertSaneBody(body);
- }
- 
--- 
-2.21.0
-
diff --git a/srcpkgs/Chipmunk2D/template b/srcpkgs/Chipmunk2D/template
index 142051ec0a4a..e4342835ac7d 100644
--- a/srcpkgs/Chipmunk2D/template
+++ b/srcpkgs/Chipmunk2D/template
@@ -1,6 +1,6 @@
 # Template file for 'Chipmunk2D'
 pkgname=Chipmunk2D
-version=7.0.2
+version=7.0.3
 revision=1
 wrksrc="Chipmunk2D-Chipmunk-${version}"
 build_style=cmake
@@ -8,9 +8,9 @@ configure_args="-DBUILD_DEMOS=NO"
 short_desc="Fast and lightweight 2D game physics library"
 maintainer="Ekaterina Vaartis <vaartis@cock.li>"
 license="MIT"
-homepage="http://chipmunk-physics.net/"
+homepage="https://chipmunk-physics.net/"
 distfiles="https://github.com/slembcke/Chipmunk2D/archive/Chipmunk-${version}.tar.gz"
-checksum=6b6d8d5d910c4442fb9c8c4c46a178126d8c21d075cdb3ce439a7f8d8757b0ca
+checksum=1e6f093812d6130e45bdf4cb80280cb3c93d1e1833d8cf989d554d7963b7899a
 
 post_install() {
 	vlicense LICENSE.txt

From e10b293a44c42ab8cdc704893533125a98b7b1c6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 3 May 2022 13:18:55 +0200
Subject: [PATCH 1903/2561] python3-astroid: update to 2.11.4.

---
 srcpkgs/python3-astroid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 8b0c64e88833..bc3440d167b2 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.11.3
+version=2.11.4
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ 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="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=455d18bfb08cec3bb61d273306c82cffc1de494c2ad4c67410494ebe6e192bc5
+checksum=08a17987045eda03c7088e12d54317a0bb28e60404634ab7a7808e644a667ad6

From 77ed68fdd82e46831dc482394a6f0156bbaf841d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 3 May 2022 13:18:59 +0200
Subject: [PATCH 1904/2561] pylint: update to 2.13.8.

---
 srcpkgs/pylint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 3a6db1a7ce36..7abac2cbef15 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,6 +1,6 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.13.7
+version=2.13.8
 revision=1
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=c497a2b29e9c78322324e88b2303b388c28ed57a81601e365393ba68d976bc50
+checksum=7bd4cfc0e3e4332f0f3d8f8fc9e967d2e2946912ca7a336f36d3f2ac99c5cd42
 
 post_install() {
 	# install example config and emacs files

From d896d0da0ad440480f899c8dfbaf2f12ede34875 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 3 May 2022 13:27:38 +0200
Subject: [PATCH 1905/2561] stig: update to 0.12.3a0.

---
 srcpkgs/stig/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stig/template b/srcpkgs/stig/template
index 8f6f7cc177b5..59d37e89baa3 100644
--- a/srcpkgs/stig/template
+++ b/srcpkgs/stig/template
@@ -1,7 +1,7 @@
 # Template file for 'stig'
 pkgname=stig
-version=0.12.2a0
-revision=2
+version=0.12.3a0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-blinker python3-natsort python3-xdg python3-aiohttp
@@ -11,5 +11,5 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rndusr/stig"
 distfiles="https://github.com/rndusr/stig/archive/v${version}.tar.gz"
-checksum=f3a7b39d39bc8dae8661db9f24bbf6e9dacccf5e04f35c6bed1290e5c5120ddc
+checksum=49cf2b8d73fa7f61a500672d02cd18a7155d842907b09450a5f92a9b360c6575
 make_check=no # needs python3-asynctest which is not packaged

From 87cec7ccb1c07489ea22211e0974d7010d4e9020 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 3 May 2022 13:31:19 +0200
Subject: [PATCH 1906/2561] lagrange: update to 1.13.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 12a3938f5212..0e7f419708ae 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.12.2
+version=1.13.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=cef0ef9543a87d3a4cc8ad83955f9a4e62af7bef4e786642c1ab5ec85ff8b950
+checksum=f84c5fe078734df06ada747f87760ea8863369be5519d1e56992c7c5278395da
 
 post_install() {
 	vlicense LICENSE.md

From b489b962aae30e82789ab886af31249d079e2cef Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:00 +0200
Subject: [PATCH 1907/2561] NetAuth-ldap: remove git build dep

---
 srcpkgs/NetAuth-ldap/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth-ldap/template b/srcpkgs/NetAuth-ldap/template
index ef3429113f67..299cbb22ae47 100644
--- a/srcpkgs/NetAuth-ldap/template
+++ b/srcpkgs/NetAuth-ldap/template
@@ -6,7 +6,6 @@ wrksrc=ldap-$version
 build_style=go
 go_import_path=github.com/netauth/ldap
 go_ldflags="-X github.com/netauth/ldap/internal/buildinfo.Version=${version}"
-hostmakedepends="git"
 short_desc="LDAP Proxy for NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

From 746943d3d9043181c72da1b7ef1ca4ed13db90a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1908/2561] NetAuth-localizer: remove git build dep

---
 srcpkgs/NetAuth-localizer/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth-localizer/template b/srcpkgs/NetAuth-localizer/template
index 7039dd37cbea..dc57f91921b6 100644
--- a/srcpkgs/NetAuth-localizer/template
+++ b/srcpkgs/NetAuth-localizer/template
@@ -6,7 +6,6 @@ wrksrc=localizer-$version
 build_style=go
 go_import_path=github.com/netauth/localizer
 go_package=${go_import_path}/cmd/localize
-hostmakedepends="git"
 depends="snooze"
 short_desc="Make NetAuth accounts local in Linux"
 maintainer="Michael Aldridge <maldridge@netauth.org>"

From d7b77abd4e15aaf0c263195ae490d92d7d993c15 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1909/2561] NetAuth-nsscache: remove git build dep

---
 srcpkgs/NetAuth-nsscache/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth-nsscache/template b/srcpkgs/NetAuth-nsscache/template
index b7d171889aaf..bb441ae25d41 100644
--- a/srcpkgs/NetAuth-nsscache/template
+++ b/srcpkgs/NetAuth-nsscache/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc="nsscache-$version"
 build_style=go
 go_import_path="github.com/netauth/nsscache"
-hostmakedepends="git"
 short_desc="NetAuth nsscache implementation"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

From 500e9b5e8be5579da0804497343348c41afbfe69 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1910/2561] NetAuth-pam-helper: remove git build dep

---
 srcpkgs/NetAuth-pam-helper/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth-pam-helper/template b/srcpkgs/NetAuth-pam-helper/template
index 8c961a56b403..763a72035eef 100644
--- a/srcpkgs/NetAuth-pam-helper/template
+++ b/srcpkgs/NetAuth-pam-helper/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc=pam-helper-$version
 build_style=go
 go_import_path="github.com/netauth/pam-helper"
-hostmakedepends="git"
 short_desc="Helper executable to use with pam_exec"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

From 96b06c64ace3833e13704eadabcf016059e9235f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1911/2561] NetAuth-sftpgo-hook: remove git build dep

---
 srcpkgs/NetAuth-sftpgo-hook/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth-sftpgo-hook/template b/srcpkgs/NetAuth-sftpgo-hook/template
index aab25468a2c4..51862cc53980 100644
--- a/srcpkgs/NetAuth-sftpgo-hook/template
+++ b/srcpkgs/NetAuth-sftpgo-hook/template
@@ -5,7 +5,6 @@ revision=2
 wrksrc=sftpgo-hook-$version
 build_style=go
 go_import_path=github.com/netauth/sftpgo-hook
-hostmakedepends="git"
 depends="sftpgo"
 short_desc="External authorization hook for SFTPGo using NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"

From e476dd949edf99c486d394eb800ca46b7d1c24ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1912/2561] NetAuth: remove git build dep

---
 srcpkgs/NetAuth/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetAuth/template b/srcpkgs/NetAuth/template
index 4a227be08ea2..4586019d0690 100644
--- a/srcpkgs/NetAuth/template
+++ b/srcpkgs/NetAuth/template
@@ -7,7 +7,6 @@ build_style="go"
 go_import_path="github.com/netauth/netauth"
 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@netauth.org>"
 license="MIT"

From c59aa31855538c4f17036570b8e81d82b71105b8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1913/2561] NetKeys: remove git build dep

---
 srcpkgs/NetKeys/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/NetKeys/template b/srcpkgs/NetKeys/template
index 9d5c4a4385dc..cb0ef063efb2 100644
--- a/srcpkgs/NetKeys/template
+++ b/srcpkgs/NetKeys/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc=netkeys-$version
 build_style=go
 go_import_path="github.com/netauth/netkeys"
-hostmakedepends="git"
 short_desc="Key retrieval daemon for NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"
 license="MIT"

From e50809777a23c64928bd3db25e12a5d4b5767349 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1914/2561] TerraState: remove git build dep

---
 srcpkgs/TerraState/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/TerraState/template b/srcpkgs/TerraState/template
index 5c87d1706917..01ed55bb41ca 100644
--- a/srcpkgs/TerraState/template
+++ b/srcpkgs/TerraState/template
@@ -7,7 +7,6 @@ make_dirs="/var/lib/terrastate 0750 _terrastate _terrastate"
 build_style=go
 go_import_path="github.com/the-maldridge/terrastate"
 go_package="${go_import_path}/cmd/terrastate"
-hostmakedepends="git"
 short_desc="Remote state for Terraform"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MIT"

From 9ffbdb7b56470f8f586aafd874e20f076fc9cff9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:01 +0200
Subject: [PATCH 1915/2561] antibody: remove git build dep

---
 srcpkgs/antibody/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index cb109f0b1837..df466c33a9ca 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -4,7 +4,6 @@ version=6.1.1
 revision=1
 build_style=go
 go_import_path=github.com/getantibody/antibody
-hostmakedepends="git"
 short_desc="Fast and lightweight shell plugin manager"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"

From a8360ad4864e767b250896c0e681dc777862c28c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1916/2561] browserpass: remove git build dep

---
 srcpkgs/browserpass/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/browserpass/template b/srcpkgs/browserpass/template
index b6426a249756..63537def3f40 100644
--- a/srcpkgs/browserpass/template
+++ b/srcpkgs/browserpass/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc="browserpass-native-${version}"
 build_style=go
 go_import_path=github.com/browserpass/browserpass-native
-hostmakedepends="git"
 short_desc="Browser extension for pass"
 maintainer="John <me@johnnynator.dev>"
 license="MIT"

From d1df979351ff9b60d7a1c1833cc9fff42d209917 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1917/2561] cdetect: remove git build dep

---
 srcpkgs/cdetect/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/cdetect/template b/srcpkgs/cdetect/template
index b02df3a496e5..e859340a9cb3 100644
--- a/srcpkgs/cdetect/template
+++ b/srcpkgs/cdetect/template
@@ -4,7 +4,6 @@ version=0.5.4
 revision=1
 build_style=go
 go_import_path=github.com/xyproto/cdetect
-hostmakedepends="git"
 short_desc="Detects the compiler (and version) used to compile an ELF binary"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From eb14c3e596bbf96ce473ed19e0efec43f185b81c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1918/2561] chroma: remove git build dep

---
 srcpkgs/chroma/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/chroma/template b/srcpkgs/chroma/template
index b549685882ce..e2ae9e6a677f 100644
--- a/srcpkgs/chroma/template
+++ b/srcpkgs/chroma/template
@@ -6,7 +6,6 @@ build_wrksrc="cmd/chroma"
 build_style=go
 go_import_path="github.com/alecthomas/chroma/cmd/chroma"
 go_ldflags="-X main.version=${version} -X main.date=$(date +%Y.%m.%d)"
-hostmakedepends="git"
 short_desc="General purpose syntax highlighter"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"

From facf6b1275a089481375e477b4f7f4791085c785 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1919/2561] consul-template: remove git build dep

---
 srcpkgs/consul-template/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index 4faeaf1c9ae5..d144f447c7bc 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -4,7 +4,6 @@ version=0.28.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
-hostmakedepends="git"
 short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="MPL-2.0"

From 68e55ebd11b2b55583507901670b494296c64f6b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1920/2561] consul: remove git build dep

---
 srcpkgs/consul/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index fc0e80502879..d31feecc270f 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -9,7 +9,6 @@ go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
 go_mod_mode=default
-hostmakedepends="git"
 short_desc="Distributed solution to connect and configure applications"
 maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"

From 669394cded0ed111ca4f2dbb79da81c047225a8c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1921/2561] crane: remove git build dep

---
 srcpkgs/crane/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index edb04e896ae5..5a304a9faf73 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -3,7 +3,6 @@ pkgname=crane
 version=3.6.0
 revision=1
 build_style=go
-hostmakedepends="git"
 short_desc="Lift containers with ease"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From 80ac6db206ee8423c0a7cc9cbd053691015fd702 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1922/2561] distrobuilder: remove git build dep

---
 srcpkgs/distrobuilder/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/distrobuilder/template b/srcpkgs/distrobuilder/template
index fd58594e1748..05f805c1ac1f 100644
--- a/srcpkgs/distrobuilder/template
+++ b/srcpkgs/distrobuilder/template
@@ -6,7 +6,6 @@ wrksrc="distrobuilder-distrobuilder-${version}"
 build_style=go
 go_import_path="github.com/lxc/distrobuilder"
 go_package="github.com/lxc/distrobuilder/distrobuilder"
-hostmakedepends="git"
 depends="debootstrap gnupg squashfs-tools"
 short_desc="System container image builder for LXC and LXD"
 maintainer="Robert Lowry <bobertlo@gmail.com>"

From 0801a2ecdc90786872c5598ae0ea01f1c23ef123 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1923/2561] dlayer: remove git build dep

---
 srcpkgs/dlayer/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/dlayer/template b/srcpkgs/dlayer/template
index 527800ebc58b..b909474e3932 100644
--- a/srcpkgs/dlayer/template
+++ b/srcpkgs/dlayer/template
@@ -4,7 +4,6 @@ version=0.3.1
 revision=1
 build_style=go
 go_import_path=github.com/orisano/dlayer
-hostmakedepends="git"
 short_desc="Dlayer is a docker layer analyzer"
 maintainer="Mate GABRI <iam@theguy.io>"
 license="MIT"

From a7d57bf719e3544891988115e67008aef4ca9754 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1924/2561] elfinfo: remove git build dep

---
 srcpkgs/elfinfo/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/elfinfo/template b/srcpkgs/elfinfo/template
index 189d842b0012..b354ced06d81 100644
--- a/srcpkgs/elfinfo/template
+++ b/srcpkgs/elfinfo/template
@@ -4,7 +4,6 @@ version=1.1.0
 revision=1
 build_style=go
 go_import_path=github.com/xyproto/elfinfo
-hostmakedepends="git"
 short_desc="Emit basic information about an ELF file"
 maintainer="Alexander F. Rødseth <xyproto@archlinux.org>"
 license="MIT"

From 4eae7643fee6d72c9926cd6686d14b168ede17c0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1925/2561] ensure-access: remove git build dep

---
 srcpkgs/ensure-access/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/ensure-access/template b/srcpkgs/ensure-access/template
index b5187c8bb4f4..9d3abe476303 100644
--- a/srcpkgs/ensure-access/template
+++ b/srcpkgs/ensure-access/template
@@ -4,7 +4,6 @@ version=0.1.0
 revision=1
 build_style=go
 go_import_path=github.com/Noah-Huppert/ensure-access
-hostmakedepends="git"
 short_desc="Tool which ensures permissions exists for files and directories"
 maintainer="Noah Huppert <contact@noahh.io>"
 license="MIT"

From d6eeafd50408113af92658888e7e65728f0d6114 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1926/2561] exercism: remove git build dep

---
 srcpkgs/exercism/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/exercism/template b/srcpkgs/exercism/template
index eb696027500b..5869f87dbce0 100644
--- a/srcpkgs/exercism/template
+++ b/srcpkgs/exercism/template
@@ -6,7 +6,6 @@ wrksrc="cli-${version}"
 build_style=go
 go_import_path="github.com/exercism/cli"
 go_package="${go_import_path}/exercism"
-hostmakedepends="git"
 short_desc="Command line tool for exercism.io"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"

From 7bb656d656731aa5703c6b653b5f54e9b7d43d1f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1927/2561] figurine: remove git build dep

---
 srcpkgs/figurine/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/figurine/template b/srcpkgs/figurine/template
index bef430fa4ba2..bf412358486a 100644
--- a/srcpkgs/figurine/template
+++ b/srcpkgs/figurine/template
@@ -4,7 +4,6 @@ version=1.0.1
 revision=1
 build_style=go
 go_import_path=github.com/arsham/figurine
-hostmakedepends="git"
 short_desc="Print your name in style"
 maintainer="travankor <travankor@tuta.io>"
 license="Apache-2.0"

From 787756012c0092abfbae623cc3b04b0aa8bda1cd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1928/2561] flint: remove git build dep

---
 srcpkgs/flint/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index 9a6b0d8c0aac..a04ca9e022d5 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -3,7 +3,6 @@ pkgname=flint
 version=0.1.0
 revision=9
 build_style=go
-hostmakedepends="git"
 short_desc="Check your project for common sources of contributor friction"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From fcca9068b6829db0b4f0e9ae66566fd448b693c3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:04 +0200
Subject: [PATCH 1929/2561] fzf: remove git build dep

---
 srcpkgs/fzf/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index ec60af9ddc64..86789e858d66 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -4,7 +4,6 @@ version=0.30.0
 revision=1
 build_style=go
 go_import_path="github.com/junegunn/fzf"
-hostmakedepends="git"
 makedepends="ncurses-devel"
 short_desc="Command-line fuzzy finder"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 112b512dafeb0ef1db0cba7f8dc6294f7d58c878 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:04 +0200
Subject: [PATCH 1930/2561] ghq: remove git build dep

---
 srcpkgs/ghq/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/ghq/template b/srcpkgs/ghq/template
index 50202b42a260..fbe3c19e4517 100644
--- a/srcpkgs/ghq/template
+++ b/srcpkgs/ghq/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=github.com/x-motemen/ghq
 go_package="$go_import_path"
-hostmakedepends="git"
 depends="git"
 short_desc="Remote repository management made easy"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"

From f748aeb7da77a68806c599af68836f4240b20dc1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:04 +0200
Subject: [PATCH 1931/2561] gitbatch: remove git build dep

---
 srcpkgs/gitbatch/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gitbatch/template b/srcpkgs/gitbatch/template
index 4464729f2b8f..df26ed89b193 100644
--- a/srcpkgs/gitbatch/template
+++ b/srcpkgs/gitbatch/template
@@ -4,7 +4,6 @@ version=0.5.0
 revision=1
 build_style=go
 go_import_path=github.com/isacikgoz/gitbatch
-hostmakedepends="git"
 short_desc="Command line tool to manage your git repositories in one place"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="MIT"

From 9c74466654d837e489aa98686496046436001253 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:04 +0200
Subject: [PATCH 1932/2561] glide: remove git build dep

---
 srcpkgs/glide/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/glide/template b/srcpkgs/glide/template
index 635084f70988..15948753606e 100644
--- a/srcpkgs/glide/template
+++ b/srcpkgs/glide/template
@@ -4,7 +4,6 @@ version=0.13.3
 revision=1
 build_style=go
 go_import_path="github.com/Masterminds/glide"
-hostmakedepends="git"
 depends="go git"
 short_desc="Vendor package management for golang"
 maintainer="ananteris <ananteris@protonmail.ch>"

From 068f3d5a0f8924ee29009ddad5448c14e68de809 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:04 +0200
Subject: [PATCH 1933/2561] glider: remove git build dep

---
 srcpkgs/glider/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/glider/template b/srcpkgs/glider/template
index e132cfda4b72..362825602699 100644
--- a/srcpkgs/glider/template
+++ b/srcpkgs/glider/template
@@ -4,7 +4,6 @@ version=0.13.0
 revision=1
 build_style=go
 go_import_path=github.com/nadoo/glider
-hostmakedepends="git"
 short_desc="Forward proxy with multiple protocols support"
 maintainer="whoami <whoami@systemli.org>"
 license="GPL-3.0-or-later"

From fe6ce9bdc829a75adbc1ccc0396f41c5df2c03ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1934/2561] go-md2man: remove git build dep

---
 srcpkgs/go-md2man/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index e1094a54cbe0..5f5feb187d3b 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -4,7 +4,6 @@ version=2.0.1
 revision=1
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
-hostmakedepends="git"
 short_desc="Convert md to manpages"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"

From 17e1b2c93b8f7b2733d7bb6d58a3dcae23fbdfce Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1935/2561] go-review: remove git build dep

---
 srcpkgs/go-review/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/go-review/template b/srcpkgs/go-review/template
index b352545bedb9..907a214d4019 100644
--- a/srcpkgs/go-review/template
+++ b/srcpkgs/go-review/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/heppu/go-review"
 go_package="${go_import_path}/cmd/${pkgname}"
-hostmakedepends="git"
 short_desc="Publish reports from different Go linters as gerrit reviews"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"

From 43d83e96e3ecc98d993f06e7965d70f5f94d2f39 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1936/2561] gobuster: remove git build dep

---
 srcpkgs/gobuster/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gobuster/template b/srcpkgs/gobuster/template
index c5427cd4339b..60e075b3182a 100644
--- a/srcpkgs/gobuster/template
+++ b/srcpkgs/gobuster/template
@@ -4,7 +4,6 @@ version=3.1.0
 revision=2
 build_style=go
 go_import_path=github.com/OJ/gobuster/v3
-hostmakedepends="git"
 short_desc="Directory, file and DNS busting tool"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"

From 34f4399fed93f343f3dc394af48456255f9accc0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1937/2561] goimapnotify: remove git build dep

---
 srcpkgs/goimapnotify/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/goimapnotify/template b/srcpkgs/goimapnotify/template
index 4b54689a434d..208db03d00ec 100644
--- a/srcpkgs/goimapnotify/template
+++ b/srcpkgs/goimapnotify/template
@@ -4,7 +4,6 @@ version=2.3.7
 revision=1
 build_style=go
 go_import_path="gitlab.com/shackra/goimapnotify"
-hostmakedepends="git"
 short_desc="Execute scripts on IMAP idle notifications (Go version)"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-3.0-only"

From 0bab38490459c82950ab67386fc42c7dc53df28c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1938/2561] gomatrix: remove git build dep

---
 srcpkgs/gomatrix/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gomatrix/template b/srcpkgs/gomatrix/template
index fae7a4343ed7..eb9d6e7bedac 100644
--- a/srcpkgs/gomatrix/template
+++ b/srcpkgs/gomatrix/template
@@ -4,7 +4,6 @@ version=101.0.0
 revision=1
 build_style=go
 go_import_path=github.com/GeertJohan/gomatrix
-hostmakedepends="git"
 short_desc="Terminal Matrix display in golang"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-2-Clause"

From ab6cd8adf6ce2ac4461265168bfb65e42c532e8b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1939/2561] gotty: remove git build dep

---
 srcpkgs/gotty/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gotty/template b/srcpkgs/gotty/template
index 0e5d268e9926..58fc0572197c 100644
--- a/srcpkgs/gotty/template
+++ b/srcpkgs/gotty/template
@@ -4,7 +4,6 @@ version=1.0.1
 revision=8
 build_style=go
 go_import_path="github.com/yudai/gotty"
-hostmakedepends="git"
 short_desc="Share your terminal as a web application"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="MIT"

From d468d993edb6d802620c10d43827e4824a27f45c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1940/2561] goversion: remove git build dep

---
 srcpkgs/goversion/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/goversion/template b/srcpkgs/goversion/template
index 390551d2b425..ac45067873fe 100644
--- a/srcpkgs/goversion/template
+++ b/srcpkgs/goversion/template
@@ -4,7 +4,6 @@ version=1.2.0
 revision=3
 build_style=go
 go_import_path=rsc.io/goversion
-hostmakedepends="git"
 short_desc="Print version used to build Go executables"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 32d4d36a71538208613032d39d4fbf42bdd1ef6c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1941/2561] gucci: remove git build dep

---
 srcpkgs/gucci/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index 37773ceba896..09992b5b65ad 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -5,7 +5,6 @@ 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"

From b8d1996e3b6f2b8f65f872f13cbc5b73733e26c2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:05 +0200
Subject: [PATCH 1942/2561] gx: remove git build dep

---
 srcpkgs/gx/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gx/template b/srcpkgs/gx/template
index ff3ea0267c88..7414b6bab10a 100644
--- a/srcpkgs/gx/template
+++ b/srcpkgs/gx/template
@@ -4,7 +4,6 @@ version=0.14.3
 revision=1
 build_style=go
 go_import_path="github.com/whyrusleeping/gx"
-hostmakedepends="git"
 short_desc="Language-agnostic, universal package manager around IPFS"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="MIT"

From 76367ce980f8a8682633ac5595773b7d8969abf2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1943/2561] hey: remove git build dep

---
 srcpkgs/hey/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/hey/template b/srcpkgs/hey/template
index 84954e36b76b..52427108dc60 100644
--- a/srcpkgs/hey/template
+++ b/srcpkgs/hey/template
@@ -4,7 +4,6 @@ version=0.1.4
 revision=1
 build_style=go
 go_import_path=github.com/rakyll/hey
-hostmakedepends="git"
 short_desc="HTTP load generator"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"

From d0a6e9bd0c36bba78f89712210064f7d4b385e5d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1944/2561] hooktftp: remove git build dep

---
 srcpkgs/hooktftp/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/hooktftp/template b/srcpkgs/hooktftp/template
index 2cba14aec605..d9482c378c75 100644
--- a/srcpkgs/hooktftp/template
+++ b/srcpkgs/hooktftp/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/tftp-go-team/hooktftp"
 go_package="github.com/tftp-go-team/hooktftp/cmd/hooktftp"
-hostmakedepends="git"
 short_desc="Hook based tftp server"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="MIT"

From 2d118fdf53f3f7ca40aac5f10d6e3e2e42a7a505 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1945/2561] hydroxide: remove git build dep

---
 srcpkgs/hydroxide/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 5f63ded6f759..c7fc20b5de90 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=github.com/emersion/hydroxide
 go_package=$go_import_path/cmd/hydroxide
-hostmakedepends="git"
 short_desc="Third-party, open-source ProtonMail CardDAV, IMAP and SMTP bridge"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="MIT"

From e34edb5c8cf81c251df28d840ee2a059a6addfc8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1946/2561] immortal: remove git build dep

---
 srcpkgs/immortal/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/immortal/template b/srcpkgs/immortal/template
index 76c1d8c6dabd..e693e767adb5 100644
--- a/srcpkgs/immortal/template
+++ b/srcpkgs/immortal/template
@@ -7,7 +7,6 @@ go_import_path=github.com/immortal/immortal
 go_package="${go_import_path}/cmd/immortal ${go_import_path}/cmd/immortalctl
  ${go_import_path}/cmd/immortaldir"
 go_ldflags="-X main.Version=v${version}"
-hostmakedepends="git"
 short_desc="*nix cross-platform (OS agnostic) supervisor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 9ef1eb73704e8bb731e291a7294efdf1c10ce3d0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1947/2561] ipfs-cluster: remove git build dep

---
 srcpkgs/ipfs-cluster/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index ebb062d409c7..27e6d6aad94b 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/ipfs/ipfs-cluster"
 go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"
-hostmakedepends="git"
 depends="go-ipfs"
 short_desc="Collective pinning and composition for IPFS"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From 92bdb7480b884f67028e08f844c6cf7cf4c95d0d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1948/2561] jid: remove git build dep

---
 srcpkgs/jid/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/jid/template b/srcpkgs/jid/template
index abce00a83532..52055ab9f9ee 100644
--- a/srcpkgs/jid/template
+++ b/srcpkgs/jid/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=github.com/simeji/jid
 go_package=github.com/simeji/jid/cmd/jid
-hostmakedepends="git"
 short_desc="Drill down JSON interactively by using filtering queries"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 2cc925a11c36420672a1ab5e8845140d57b04250 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1949/2561] joker: remove git build dep

---
 srcpkgs/joker/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/joker/template b/srcpkgs/joker/template
index a66fffbab258..2682f33a5dfa 100644
--- a/srcpkgs/joker/template
+++ b/srcpkgs/joker/template
@@ -4,7 +4,6 @@ version=0.14.1
 revision=1
 build_style=go
 go_import_path=github.com/candid82/joker
-hostmakedepends="git"
 short_desc="Interpreted dialect of Clojure written in Go and Clojure(Script) linter"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="EPL-1.0"

From ca8953aa63f58dc3b72d34a6b967ccec8b376475 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:06 +0200
Subject: [PATCH 1950/2561] jump: remove git build dep

---
 srcpkgs/jump/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/jump/template b/srcpkgs/jump/template
index b31f01bba494..9c4a258d56a3 100644
--- a/srcpkgs/jump/template
+++ b/srcpkgs/jump/template
@@ -4,7 +4,6 @@ version=0.40.0
 revision=1
 build_style=go
 go_import_path=github.com/gsamokovarov/jump
-hostmakedepends="git"
 short_desc="Fuzzy directory jumper that learns your habits"
 maintainer="Arthur Weagel <arthur.contrib@gmail.com>"
 license="MIT"

From e6aa56cc32288d14b126bc6ccf3cd699d0b605d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1951/2561] keybase: remove git build dep

---
 srcpkgs/keybase/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/keybase/template b/srcpkgs/keybase/template
index 3e86e92e2f84..d0c5ace0df38 100644
--- a/srcpkgs/keybase/template
+++ b/srcpkgs/keybase/template
@@ -10,7 +10,6 @@ ${go_import_path}/go/kbfs/kbfsfuse
 ${go_import_path}/go/kbfs/kbfsgit/git-remote-keybase
 ${go_import_path}/go/kbfs/kbfstool ${go_import_path}/go/kbfs/redirector"
 go_build_tags="production"
-hostmakedepends="git"
 depends="gnupg2"
 short_desc="Client for keybase.io"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

From e0be4fe325c970778aabe6b60927585e8151b095 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1952/2561] lego: remove git build dep

---
 srcpkgs/lego/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index 6d46cd6a6e67..9605311ef9b0 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/go-acme/lego/v4"
 go_package="${go_import_path}/cmd/lego"
-hostmakedepends="git"
 short_desc="Let's Encrypt client and ACME library written in Go"
 maintainer="Anachron <gith@cron.world>"
 license="MIT"

From cec05a78bdc9abec4cabfaa50cc645de531432cf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1953/2561] licensechecker: remove git build dep

---
 srcpkgs/licensechecker/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/licensechecker/template b/srcpkgs/licensechecker/template
index ec09ba9751f9..f04bcd1fe4d4 100644
--- a/srcpkgs/licensechecker/template
+++ b/srcpkgs/licensechecker/template
@@ -5,7 +5,6 @@ revision=5
 wrksrc="lc-${version}"
 build_style=go
 go_import_path=github.com/boyter/lc
-hostmakedepends="git"
 short_desc="Identify software licenses used on a source tree"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From fa4cb5fff63a2c6b495f01af5b973f76cc7289cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1954/2561] massren: remove git build dep

---
 srcpkgs/massren/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index d3f4250b2ecb..d98fce7395b0 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -3,7 +3,6 @@ pkgname=massren
 version=1.5.4
 revision=7
 build_style=go
-hostmakedepends="git"
 short_desc="Massive renamer from command line"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"

From c7a2f46b9064ef332514ff5fa8a9b3fdbdaa0126 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1955/2561] minify: remove git build dep

---
 srcpkgs/minify/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 9be3e9620c49..095c1e5a242d 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/tdewolff/minify/v2"
 go_package="${go_import_path}/cmd/minify"
-hostmakedepends="git"
 short_desc="Go minifiers for web formats"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"

From 120efde7ef0024c75746057d53e606153936b733 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:07 +0200
Subject: [PATCH 1956/2561] minio: remove git build dep

---
 srcpkgs/minio/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/minio/template b/srcpkgs/minio/template
index 58d745f326b1..06cf90aec4a5 100644
--- a/srcpkgs/minio/template
+++ b/srcpkgs/minio/template
@@ -7,7 +7,6 @@ wrksrc=${pkgname}-RELEASE.${_version}
 build_style=go
 go_import_path="github.com/minio/minio"
 conf_files="/etc/default/minio /etc/minio/config.json"
-hostmakedepends="git"
 short_desc="Object storage server compatible with Amazon S3"
 maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="Apache-2.0"

From a78427e491ecdd9b4ab045be1f353b718ffa1c6f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1957/2561] mountain-backup: remove git build dep

---
 srcpkgs/mountain-backup/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/mountain-backup/template b/srcpkgs/mountain-backup/template
index 309cbda5305e..bfbd5cb3cc01 100644
--- a/srcpkgs/mountain-backup/template
+++ b/srcpkgs/mountain-backup/template
@@ -4,7 +4,6 @@ version=0.2.0
 revision=1
 build_style=go
 go_import_path=github.com/Noah-Huppert/mountain-backup
-hostmakedepends="git"
 short_desc="File backup tool"
 maintainer="Noah Huppert <contact@noahh.io>"
 license="MIT"

From 573efc35fe247130204cb9f050ed18cbc994f787 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1958/2561] nebula: remove git build dep

---
 srcpkgs/nebula/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/nebula/template b/srcpkgs/nebula/template
index 888e436ae614..8e67012d17c2 100644
--- a/srcpkgs/nebula/template
+++ b/srcpkgs/nebula/template
@@ -7,7 +7,6 @@ make_dirs="/etc/nebula 0750 root root"
 go_import_path=github.com/slackhq/nebula
 go_package="${go_import_path}/cmd/nebula ${go_import_path}/cmd/nebula-cert"
 go_ldflags="-X main.Build=${version}"
-hostmakedepends="git"
 short_desc="Scalable overlay networking tool"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="MIT"

From d213d8363676441362697ed9a8147c668d4e382b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1959/2561] node_exporter: remove git build dep

---
 srcpkgs/node_exporter/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index f84cae0d6a1c..baec4cfc14d5 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -8,7 +8,6 @@ go_ldflags="-X ${go_import_path}/version.Version=${version}
  -X ${go_import_path}/version.Revision=${version}
  -X ${go_import_path}/version.Branch=${version}
  -X ${go_import_path}/version.BuildUser=VoidLinux"
-hostmakedepends="git"
 short_desc="Exporter for machine metrics"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"

From aeef7daf7427e41224c109cec0fb6456eaabd99d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1960/2561] nomad: remove git build dep

---
 srcpkgs/nomad/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 8707ada37bf9..7b53596b1aed 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -7,7 +7,6 @@ go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
 _git_commit=95514d569610f15ce49b4a7a1a6bfd3e7b3e7b4f
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
-hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"

From a4987271d1b0aa0196e177db80773f4f312ddabd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1961/2561] obfs4proxy: remove git build dep

---
 srcpkgs/obfs4proxy/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/obfs4proxy/template b/srcpkgs/obfs4proxy/template
index 1b9dd7e0b53e..c38ce754ce86 100644
--- a/srcpkgs/obfs4proxy/template
+++ b/srcpkgs/obfs4proxy/template
@@ -7,7 +7,6 @@ wrksrc="${_pkgname}-${version}"
 build_style=go
 go_import_path=gitlab.com/yawning/obfs4.git
 go_package="${go_import_path}/obfs4proxy"
-hostmakedepends="git"
 short_desc="Pluggable transport proxy for Tor, implementing obfs4"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="BSD-2-Clause"

From c3272754ea7474f558707297b31ede84f4469b3d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1962/2561] oh: remove git build dep

---
 srcpkgs/oh/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/oh/template b/srcpkgs/oh/template
index 03149b3ed692..1f9a346883ca 100644
--- a/srcpkgs/oh/template
+++ b/srcpkgs/oh/template
@@ -4,7 +4,6 @@ version=0.8.0
 revision=1
 build_style=go
 go_import_path="github.com/michaelmacinnis/oh"
-hostmakedepends="git"
 short_desc="Surprisingly powerful Unix shell"
 maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="MIT"

From 6a9215b5f0945bddf20f8c1a4494c9389ce5288d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1963/2561] pam_netauth: remove git build dep

---
 srcpkgs/pam_netauth/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/pam_netauth/template b/srcpkgs/pam_netauth/template
index 09a33291eb8e..7c300852f696 100644
--- a/srcpkgs/pam_netauth/template
+++ b/srcpkgs/pam_netauth/template
@@ -4,7 +4,6 @@ version=0.3.5
 revision=1
 build_style=go
 go_import_path="github.com/netauth/pam_netauth"
-hostmakedepends="git"
 makedepends=pam-devel
 short_desc="PAM plugin for NetAuth"
 maintainer="Michael Aldridge <maldridge@netauth.org>"

From 97d117f0768746e3812b3de263d075c4188c3fdc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:08 +0200
Subject: [PATCH 1964/2561] peco: remove git build dep

---
 srcpkgs/peco/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 0fc04b8036bc..6f5679e73ca9 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/peco/peco"
 go_package="${go_import_path}/cmd/peco"
-hostmakedepends="git"
 short_desc="Simplistic interactive filtering tool"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"

From 4c185e5157b3c038d6306a17895aa2e16ebc8134 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1965/2561] pst: remove git build dep

---
 srcpkgs/pst/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/pst/template b/srcpkgs/pst/template
index 9aa71e758390..b1d3888ae8bc 100644
--- a/srcpkgs/pst/template
+++ b/srcpkgs/pst/template
@@ -4,7 +4,6 @@ version=1.3.2
 revision=1
 build_style=go
 go_import_path=github.com/skanehira/pst
-hostmakedepends="git"
 short_desc="TUI process monitor"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"

From 488ce6c2da852ceaf4ab38f2ea2e5434d3775786 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1966/2561] pwget: remove git build dep

---
 srcpkgs/pwget/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/pwget/template b/srcpkgs/pwget/template
index ddc85de35f0b..64cdcae14fb9 100644
--- a/srcpkgs/pwget/template
+++ b/srcpkgs/pwget/template
@@ -4,7 +4,6 @@ version=2.0
 revision=1
 build_style=go
 go_import_path="github.com/majewsky/pwget"
-hostmakedepends="git"
 short_desc="Single-binary stateless password manager"
 maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
 license="GPL-3.0-or-later"

From 452a0e0c4a89778066edcd658e348c53776bc093 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1967/2561] s: remove git build dep

---
 srcpkgs/s/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 76a7da458242..8dd517674760 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -5,7 +5,6 @@ revision=1
 build_helper=qemu
 build_style=go
 go_import_path=github.com/zquestz/s
-hostmakedepends="git"
 short_desc="Web search from the terminal"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"

From a803aa4ff4096d9ce99e1a531f5c0360f21e8904 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1968/2561] saml2aws: remove git build dep

---
 srcpkgs/saml2aws/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/saml2aws/template b/srcpkgs/saml2aws/template
index 43cd823b7b57..a3afe9ed49fb 100644
--- a/srcpkgs/saml2aws/template
+++ b/srcpkgs/saml2aws/template
@@ -6,7 +6,6 @@ build_style=go
 go_import_path=github.com/versent/saml2aws/v2
 go_package="$go_import_path/cmd/saml2aws"
 go_ldflags="-X main.Version=${version}"
-hostmakedepends="git"
 depends="aws-cli"
 short_desc="Get AWS temporary credentials from SAML provider"
 maintainer="Mate GABRI <iam@theguy.io>"

From b964ea2b2ee646736191c7d0a14595dec55368f5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1969/2561] sampler: remove git build dep

---
 srcpkgs/sampler/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/sampler/template b/srcpkgs/sampler/template
index 8612da45a6ac..be43f33416cd 100644
--- a/srcpkgs/sampler/template
+++ b/srcpkgs/sampler/template
@@ -4,7 +4,6 @@ version=1.1.0
 revision=1
 build_style=go
 go_import_path="github.com/sqshq/sampler"
-hostmakedepends="git"
 makedepends="alsa-lib-devel"
 short_desc="Tool for shell commands execution, visualization and alerting"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"

From 2d694a75f19475d894fbbc7c2010aa008bae2bd7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1970/2561] seaweedfs: remove git build dep

---
 srcpkgs/seaweedfs/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/seaweedfs/template b/srcpkgs/seaweedfs/template
index 4c3a91e3a89f..af07c3694fae 100644
--- a/srcpkgs/seaweedfs/template
+++ b/srcpkgs/seaweedfs/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/chrislusf/seaweedfs"
 go_package="github.com/chrislusf/seaweedfs/weed"
-hostmakedepends="git"
 short_desc="Simple and highly scalable distributed file system"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="Apache-2.0"

From c72a3fa7786d329814171a4bbefb45948b4427ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:09 +0200
Subject: [PATCH 1971/2561] shadowfox-updater: remove git build dep

---
 srcpkgs/shadowfox-updater/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/shadowfox-updater/template b/srcpkgs/shadowfox-updater/template
index 37e613755302..fb2eadb6f541 100644
--- a/srcpkgs/shadowfox-updater/template
+++ b/srcpkgs/shadowfox-updater/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=github.com/SrKomodo/shadowfox-updater
 go_ldflags="-X main.version=v${version}"
-hostmakedepends="git"
 short_desc="Auto-updater for ShadowFox"
 maintainer="Renato Aguiar <renato@renag.me>"
 license="MIT"

From b684a61baba49da59921449f741a53710becac71 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1972/2561] sops: remove git build dep

---
 srcpkgs/sops/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index f1215b6c3eb7..ade18a059c57 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
 go_package="${go_import_path}/cmd/sops"
-hostmakedepends="git"
 short_desc="Simple and flexible tool for managing secrets"
 maintainer="Noel Cower <ncower@nil.dev>"
 license="MPL-2.0"

From 974aade4666ee706e1d90b7e1e88462124cda845 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1973/2561] syncthing: remove git build dep

---
 srcpkgs/syncthing/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 10166603a685..d1cdcc490bb2 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -10,7 +10,6 @@ go_package="
  ${go_import_path}/cmd/syncthing"
 go_build_tags="noupgrade"
 go_ldflags="-X github.com/syncthing/syncthing/lib/build.Version=v${version}"
-hostmakedepends="git"
 short_desc="Open Source Continuous File Synchronization"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0"

From c3973bf8813b4e53d89d38ad654ed3a501f165ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1974/2561] termshark: remove git build dep

---
 srcpkgs/termshark/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 4656690cb609..73a8d1976c52 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path="github.com/gcla/termshark/v2"
 go_package="${go_import_path}/cmd/termshark"
-hostmakedepends="git"
 depends="wireshark"
 short_desc="Terminal UI for tshark, inspired by Wireshark"
 maintainer="Piraty <piraty1@inbox.ru>"

From be204dcb13cb038faa223ee58d0023689aad42ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1975/2561] terragrunt: remove git build dep

---
 srcpkgs/terragrunt/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index b99451213534..2c5080b61c3c 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -4,7 +4,6 @@ version=0.36.1
 revision=1
 build_style=go
 go_import_path="github.com/gruntwork-io/terragrunt"
-hostmakedepends="git"
 depends="terraform"
 short_desc="Thin wrapper for Terraform that provides extra tools"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"

From b176ff46724c135fbd3bfb4b4df0b09b6ec4f3c9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1976/2561] tml: remove git build dep

---
 srcpkgs/tml/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/tml/template b/srcpkgs/tml/template
index 46ab37c0a3d2..21810a85215f 100644
--- a/srcpkgs/tml/template
+++ b/srcpkgs/tml/template
@@ -6,7 +6,6 @@ build_style=go
 go_import_path="github.com/liamg/tml"
 go_package="github.com/liamg/tml/tml"
 go_ldflags="-X github.com/liamg/tml/version.Version=${TRAVIS_TAG}"
-hostmakedepends="git"
 short_desc="Tiny markup language for terminal output"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Unlicense"

From 22057779400761d1079b977dd39878028ce56315 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1977/2561] up: remove git build dep

---
 srcpkgs/up/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/up/template b/srcpkgs/up/template
index dbaf768841d9..3907504ad47b 100644
--- a/srcpkgs/up/template
+++ b/srcpkgs/up/template
@@ -4,7 +4,6 @@ version=0.4
 revision=1
 build_style=go
 go_import_path=github.com/akavel/up
-hostmakedepends="git"
 short_desc="Ultimate Plumber - write Linux pipes interactively"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="Apache-2.0"

From 77e7b45c968045bb8f3f1e13f42ee7e84e8496d2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:10 +0200
Subject: [PATCH 1978/2561] usql: remove git build dep

---
 srcpkgs/usql/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/usql/template b/srcpkgs/usql/template
index f5705bd21b3a..45687345c30c 100644
--- a/srcpkgs/usql/template
+++ b/srcpkgs/usql/template
@@ -4,7 +4,6 @@ version=0.9.5
 revision=1
 build_style=go
 go_import_path=github.com/xo/usql
-hostmakedepends="git"
 short_desc="Universal command-line interface for SQL databases"
 maintainer="Alan Brown <adbrown@rocketmail.com>"
 license="MIT"

From d4a26865edb7f7330bd04e787ed31457438a7646 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1979/2561] vault: remove git build dep

---
 srcpkgs/vault/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 49f6a4b405b9..111feb18627e 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -7,7 +7,6 @@ go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
 _git_commit=fcbe948b2542a13ee8036ad07dd8ebf8554f56cb
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
-hostmakedepends="git"
 depends="libcap-progs"
 short_desc="Manage Secrets and Protect Sensitive Data"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"

From 291df4d4b81ecef4853a2d53a533f788df20bfcf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1980/2561] websocketd: remove git build dep

---
 srcpkgs/websocketd/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index 110a42b2a91b..f6e09cd762d4 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -4,7 +4,6 @@ version=0.4.1
 revision=1
 build_style=go
 go_import_path="github.com/joewalnes/websocketd"
-hostmakedepends="git"
 short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="BSD-2-Clause"

From b24c5875b95430c84ae0022ef4cac243fd6518cc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1981/2561] wego: remove git build dep

---
 srcpkgs/wego/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/wego/template b/srcpkgs/wego/template
index 5e806bb83653..a02b1253a235 100644
--- a/srcpkgs/wego/template
+++ b/srcpkgs/wego/template
@@ -2,7 +2,6 @@
 pkgname=wego
 version=2.1
 revision=1
-hostmakedepends="git"
 build_style=go
 go_import_path=github.com/schachmat/wego
 short_desc="Weather client for the terminal"

From 7f74c2f0b3248be41d4d671cc9a86ec274059221 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1982/2561] xurls: remove git build dep

---
 srcpkgs/xurls/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/xurls/template b/srcpkgs/xurls/template
index 03a9960c67d5..797420fe7824 100644
--- a/srcpkgs/xurls/template
+++ b/srcpkgs/xurls/template
@@ -5,7 +5,6 @@ revision=2
 build_style=go
 go_import_path="mvdan.cc/xurls/v2"
 go_package="${go_import_path}/cmd/xurls"
-hostmakedepends="git"
 short_desc="Extract urls from text"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

From 2898d1a89f9fab6b7cb8af7b0e82eec3c13097eb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1983/2561] yggdrasil: remove git build dep

---
 srcpkgs/yggdrasil/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/yggdrasil/template b/srcpkgs/yggdrasil/template
index ce580cd52950..0839a7cda8ad 100644
--- a/srcpkgs/yggdrasil/template
+++ b/srcpkgs/yggdrasil/template
@@ -5,7 +5,6 @@ revision=1
 wrksrc="yggdrasil-go-${version}"
 build_style=go
 go_import_path=github.com/yggdrasil-network/yggdrasil-go
-hostmakedepends="git"
 short_desc="Experiment in scalable routing as an encrypted IPv6 overlay network"
 maintainer="Jan Christian Gruenhage <jan.christian@gruenhage.xyz>"
 license="LGPL-3.0-only"

From 46318d641df7b5946f24cfac9396e08a6f7adf69 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1984/2561] yj: remove git build dep

---
 srcpkgs/yj/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index 395a2c6b15b9..1574254ace3e 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -4,7 +4,6 @@ version=5.1.0
 revision=1
 build_style=go
 go_import_path="github.com/sclevine/yj/v${version%%.*}"
-hostmakedepends="git"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 1c46f87c31ce0f450c6d81fb5ab9d5feb5cb3467 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:11 +0200
Subject: [PATCH 1985/2561] zrepl: remove git build dep

---
 srcpkgs/zrepl/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/zrepl/template b/srcpkgs/zrepl/template
index dd4b712b8e46..a989c805ab8f 100644
--- a/srcpkgs/zrepl/template
+++ b/srcpkgs/zrepl/template
@@ -5,7 +5,6 @@ revision=1
 build_style=go
 go_import_path=github.com/zrepl/zrepl
 go_ldflags="-X github.com/zrepl/zrepl/version.zreplVersion=void-${version}_${revision}"
-hostmakedepends="git"
 depends="zfs"
 short_desc="One-stop ZFS backup & replication solution"
 maintainer="Frans Bergman <frans@tankernn.eu>"

From acea52bb27cb2f414a76fc499396433eb12999fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:03 +0200
Subject: [PATCH 1986/2561] dep: remove git build dep

---
 srcpkgs/dep/template | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index 79cce5410597..65981b673f88 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -6,7 +6,6 @@ build_style=go
 go_import_path=github.com/golang/dep
 go_package="${go_import_path}/cmd/dep"
 go_ldflags="-X main.version=v${version}"
-hostmakedepends="git"
 depends="git go"
 short_desc="Go dependency management tool"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
@@ -15,10 +14,6 @@ homepage="https://github.com/golang/dep"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=929c8f759838f98323211ba408a831ea80d93b75beda8584b6d950f393a3298a
 
-pre_build() {
-	git config --global http.https://gopkg.in.followRedirects true
-}
-
 post_install() {
 	vlicense LICENSE
 }

From a759b2178fd5c1320f597bbc0a1b6b7f51007bf5 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Tue, 3 May 2022 01:15:52 +0200
Subject: [PATCH 1987/2561] go-md2man: update to 2.0.2.

---
 srcpkgs/go-md2man/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go-md2man/template b/srcpkgs/go-md2man/template
index 5f5feb187d3b..c6771ad1f193 100644
--- a/srcpkgs/go-md2man/template
+++ b/srcpkgs/go-md2man/template
@@ -1,6 +1,6 @@
 # Template file for 'go-md2man'
 pkgname=go-md2man
-version=2.0.1
+version=2.0.2
 revision=1
 build_style=go
 go_import_path=github.com/cpuguy83/go-md2man/v2
@@ -9,7 +9,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/cpuguy83/go-md2man"
 distfiles="https://github.com/cpuguy83/go-md2man/archive/v${version}.tar.gz"
-checksum=889309ecf43e40d3a76d666b0259dcd71b340ea0fad003784ff3fe0b6c21990e
+checksum=2f52e37101ea2734b02f2b54a53c74305b95b3a9a27792fdac962b5354aa3e4a
 
 post_install() {
 	vlicense LICENSE.md

From 9850b986c73a377b86810c081e98d955304b0b71 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Tue, 3 May 2022 01:00:53 +0200
Subject: [PATCH 1988/2561] dragon: update to 1.2.0.

---
 srcpkgs/dragon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dragon/template b/srcpkgs/dragon/template
index 61e86f39408b..6e19adab1dc9 100644
--- a/srcpkgs/dragon/template
+++ b/srcpkgs/dragon/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon'
 pkgname=dragon
-version=1.1.1
+version=1.2.0
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/mwh/dragon"
 distfiles="https://github.com/mwh/dragon/archive/v${version}.tar.gz"
-checksum=010a508c539c35bd128c54bbe57ad7c17c078e1b95e7bd3457a8589973e0b171
+checksum=9bda28e96d715c759c8a1db754bdfde5e7d83671e13cd25a892f6b5e29357994
 
 do_install() {
 	vbin dragon

From 9ae537d58891844c0f4eb1f42260069245d61e8a Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 May 2022 18:30:12 +0200
Subject: [PATCH 1989/2561] dbeaver: update to 22.0.4.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index a1e7ca0c3004..5890f3e34d22 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=22.0.3
+version=22.0.4
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -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=5af628ec7cd4c0e63fd074dd92d5668788136321cc273f778f20ff8c7907323a
+checksum=ebb6c99d5875a7d68e7a6adb3dc99f2868096208f97137560ba6dbbfb3a06f37
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

From f42e2007ac4bfcf122303eddf47527f678a09aff Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Tue, 3 May 2022 01:07:02 +0200
Subject: [PATCH 1990/2561] s: update to 0.6.6.

---
 srcpkgs/s/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s/template b/srcpkgs/s/template
index 8dd517674760..18c984fc28b3 100644
--- a/srcpkgs/s/template
+++ b/srcpkgs/s/template
@@ -1,6 +1,6 @@
 # Template file for 's'
 pkgname=s
-version=0.6.4
+version=0.6.6
 revision=1
 build_helper=qemu
 build_style=go
@@ -10,7 +10,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/zquestz/s"
 distfiles="https://github.com/zquestz/s/archive/v${version}.tar.gz"
-checksum=5829a18da40cb5a936f32240b4244d2a0543cb85dc3d5e013ae5aa08557c148f
+checksum=d91c8d2935f55dc6f241b7abc0325863846bdeac07a8f3bfa99b4a932d20ace3
 
 post_build() {
 	s_cli=$(find $GOPATH/bin -name s)

From cb516291e7b26fe25247525e4edaf3764e3ba3fc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 13:41:23 +0200
Subject: [PATCH 1991/2561] New package: python3-versioningit-1.1.1

---
 srcpkgs/python3-versioningit/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-versioningit/template

diff --git a/srcpkgs/python3-versioningit/template b/srcpkgs/python3-versioningit/template
new file mode 100644
index 000000000000..4751d63ffa00
--- /dev/null
+++ b/srcpkgs/python3-versioningit/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-versioningit'
+pkgname=python3-versioningit
+version=1.1.1
+revision=1
+wrksrc="versioningit-$version"
+build_style=python3-pep517
+hostmakedepends="python3-wheel"
+depends="python3-packaging python3-setuptools python3-tomli"
+short_desc="Versioning It with your Version In Git"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="MIT"
+homepage="https://github.com/jwodder/versioningit"
+changelog="https://raw.githubusercontent.com/jwodder/versioningit/master/CHANGELOG.md"
+distfiles="https://github.com/jwodder/versioningit/archive/refs/tags/v$version.tar.gz"
+checksum=45d611fa50f3ef25f678468927b6295e27e295f39d55a5d8c0c426a0fae69445
+
+post_install() {
+	vlicense LICENSE
+}

From ba1d7eff892fcc3576fac88a68e7e2016fb3eb99 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 13:44:17 +0200
Subject: [PATCH 1992/2561] streamlink: update to 4.0.1.

---
 srcpkgs/streamlink/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index 5b8427c56e96..ee0a31a9aa05 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,10 +1,10 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=3.2.0
+version=4.0.1
 revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-lxml python3-pycryptodome python3-pycountry
+build_style=python3-pep517
+hostmakedepends="python3-wheel python3-versioningit"
+depends="python3-lxml python3-pycryptodome python3-pycountry
  python3-pysocks python3-requests python3-websocket-client python3-isodate"
 checkdepends="$depends python3-pytest python3-mock python3-requests-mock
  python3-freezegun"
@@ -13,8 +13,8 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
-distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz"
-checksum=9770d2d83844c5378a73e14130dcb760abc856566caa0a41fc5b97a0ded5d926
+distfiles="https://github.com/streamlink/streamlink/releases/download/$version/streamlink-$version.tar.gz"
+checksum=f38a4fd5c45b1628e7ebee43ba7f8522be5045565aa7c64009740baf853f20f5
 make_check=ci-skip # some tests fail when running as root
 
 post_install() {

From 5928314206ff1473699388a12289452aabfe3009 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 1 May 2022 12:52:02 +0200
Subject: [PATCH 1993/2561] blush: update to 0.6.0.

---
 srcpkgs/blush/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/blush/template b/srcpkgs/blush/template
index c62c1a7bde85..6e6d068746ea 100644
--- a/srcpkgs/blush/template
+++ b/srcpkgs/blush/template
@@ -1,16 +1,15 @@
 # Template file for 'blush'
 pkgname=blush
-version=0.5.3
-revision=3
+version=0.6.0
+revision=1
 build_style=go
 go_import_path=github.com/arsham/blush
-hostmakedepends="git"
 short_desc="Grep with colours"
 maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://github.com/arsham/blush"
 distfiles="https://github.com/arsham/blush/archive/v${version}.tar.gz"
-checksum=1d96e080e7db9d57bb3aee1a7fae3df2aaa3a3f85cf41077e8235c78840ae740
+checksum=6db6b033bb5d4c4ac350b36b82d79447d5b91509db3a5eceb72ecb9484495e54
 
 post_install() {
 	vlicense LICENSE

From 926e8b41d73664a6c32c5539b11931b7eb815a22 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 28 Feb 2022 14:40:07 +0100
Subject: [PATCH 1994/2561] xbps-src: add make_check_pre

$make_check_pre can be used for wrapper commands like xvfb-run or
dbus-run-session which are common ways to make tests work. This way many
templates can avoid defining their own do_check function.
---
 Manual.md                              | 3 +++
 common/build-style/cargo.sh            | 2 +-
 common/build-style/cmake.sh            | 2 +-
 common/build-style/configure.sh        | 2 +-
 common/build-style/gnu-configure.sh    | 2 +-
 common/build-style/gnu-makefile.sh     | 2 +-
 common/build-style/meson.sh            | 2 +-
 common/build-style/perl-ModuleBuild.sh | 2 +-
 common/build-style/perl-module.sh      | 2 +-
 common/build-style/python-module.sh    | 2 +-
 common/build-style/python3-module.sh   | 4 ++--
 common/build-style/python3-pep517.sh   | 2 +-
 common/build-style/raku-dist.sh        | 2 +-
 common/environment/setup/sourcepkg.sh  | 2 +-
 14 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Manual.md b/Manual.md
index 8ec755499bbe..1ce07792f546 100644
--- a/Manual.md
+++ b/Manual.md
@@ -600,6 +600,9 @@ path of the Python wheel produced by the build phase that will be installed; whe
 `python-pep517` build style will look for a wheel matching the package name and version in the
 current directory with respect to the install.
 
+- `make_check_pre` The expression in front of `${make_cmd}`. This can be used for wrapper commands
+or for setting environment variables for the check command. By default empty.
+
 - `patch_args` The arguments to be passed in to the `patch(1)` command when applying
 patches to the package sources during `do_patch()`. Patches are stored in
 `srcpkgs/<pkgname>/patches` and must be in `-p1` format. By default set to `-Np1`.
diff --git a/common/build-style/cargo.sh b/common/build-style/cargo.sh
index 53c489772e7f..573a69003614 100644
--- a/common/build-style/cargo.sh
+++ b/common/build-style/cargo.sh
@@ -11,7 +11,7 @@ do_build() {
 do_check() {
 	: ${make_cmd:=cargo}
 
-	${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \
+	${make_check_pre} ${make_cmd} test --release --target ${RUST_TARGET} ${configure_args} \
 		${make_check_args}
 }
 
diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index 33a556be0011..7d1d675c3aba 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -116,7 +116,7 @@ do_check() {
 
 	: ${make_check_target:=test}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/configure.sh b/common/build-style/configure.sh
index 0963fc347934..6f2c94ace694 100644
--- a/common/build-style/configure.sh
+++ b/common/build-style/configure.sh
@@ -29,7 +29,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=check}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/gnu-configure.sh b/common/build-style/gnu-configure.sh
index 8121136cd121..f66b081955e2 100644
--- a/common/build-style/gnu-configure.sh
+++ b/common/build-style/gnu-configure.sh
@@ -30,7 +30,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=check}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/gnu-makefile.sh b/common/build-style/gnu-makefile.sh
index d7ea148fc483..2492749bd84a 100644
--- a/common/build-style/gnu-makefile.sh
+++ b/common/build-style/gnu-makefile.sh
@@ -30,7 +30,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=check}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh
index ab9f2cacfd0a..a7bd901e9760 100644
--- a/common/build-style/meson.sh
+++ b/common/build-style/meson.sh
@@ -138,7 +138,7 @@ do_check() {
 	: ${make_check_target:=test}
 	: ${meson_builddir:=build}
 
-	${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/perl-ModuleBuild.sh b/common/build-style/perl-ModuleBuild.sh
index a84373b5b0bf..f21d2b0efb4c 100644
--- a/common/build-style/perl-ModuleBuild.sh
+++ b/common/build-style/perl-ModuleBuild.sh
@@ -41,7 +41,7 @@ do_check() {
 	if [ ! -x ./Build ]; then
 		msg_error "$pkgver: cannot find ./Build script!\n"
 	fi
-	./Build test
+	${make_check_pre} ./Build test
 }
 
 do_install() {
diff --git a/common/build-style/perl-module.sh b/common/build-style/perl-module.sh
index b9a01b13cfa9..9126091cb2cf 100644
--- a/common/build-style/perl-module.sh
+++ b/common/build-style/perl-module.sh
@@ -79,7 +79,7 @@ do_check() {
 	: ${make_cmd:=make}
 	: ${make_check_target:=test}
 
-	${make_cmd} ${make_check_args} ${make_check_target}
+	${make_check_pre} ${make_cmd} ${make_check_args} ${make_check_target}
 }
 
 do_install() {
diff --git a/common/build-style/python-module.sh b/common/build-style/python-module.sh
index 15cf7577adb2..b80801a67247 100644
--- a/common/build-style/python-module.sh
+++ b/common/build-style/python-module.sh
@@ -49,7 +49,7 @@ do_check() {
 			fi
 		fi
 
-		python${pyver} setup.py ${make_check_target:-test} ${make_check_args}
+		${make_check_pre} python${pyver} setup.py ${make_check_target:-test} ${make_check_args}
 		rm build
 	done
 }
diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh
index 093bdae8a006..8daf40e69219 100644
--- a/common/build-style/python3-module.sh
+++ b/common/build-style/python3-module.sh
@@ -25,7 +25,7 @@ do_build() {
 
 do_check() {
 	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		PYTHONPATH="$(cd build/lib* && pwd)" \
+		${make_check_pre} PYTHONPATH="$(cd build/lib* && pwd)" \
 			python3 -m pytest ${make_check_args} ${make_check_target}
 	else
 		# Fall back to deprecated setup.py test orchestration without pytest
@@ -37,7 +37,7 @@ do_check() {
 		fi
 
 		: ${make_check_target:=test}
-		python3 setup.py ${make_check_target} ${make_check_args}
+		${make_check_pre} python3 setup.py ${make_check_target} ${make_check_args}
 	fi
 }
 
diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh
index 075f954a1a69..a733a521fb3d 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -14,7 +14,7 @@ do_build() {
 
 do_check() {
 	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		python3 -m pytest ${make_check_args} ${make_check_target}
+		${make_check_pre} python3 -m pytest ${make_check_args} ${make_check_target}
 	else
 		msg_warn "Unable to determine tests for PEP517 Python templates"
 		return 0
diff --git a/common/build-style/raku-dist.sh b/common/build-style/raku-dist.sh
index 3b1f28d6421b..bbbba96e7140 100644
--- a/common/build-style/raku-dist.sh
+++ b/common/build-style/raku-dist.sh
@@ -3,7 +3,7 @@
 #
 
 do_check() {
-	RAKULIB=lib prove -r -e raku t/
+	${make_check_pre} RAKULIB=lib prove -r -e raku t/
 }
 
 do_install() {
diff --git a/common/environment/setup/sourcepkg.sh b/common/environment/setup/sourcepkg.sh
index bc06f745b78a..e0e16d7915cb 100644
--- a/common/environment/setup/sourcepkg.sh
+++ b/common/environment/setup/sourcepkg.sh
@@ -7,7 +7,7 @@ unset -v archs distfiles checksum build_style build_helper nocross broken
 unset -v configure_script configure_args wrksrc build_wrksrc create_wrksrc
 unset -v make_build_args make_check_args make_install_args
 unset -v make_build_target make_check_target make_install_target
-unset -v make_cmd meson_cmd gem_cmd fetch_cmd
+unset -v make_cmd meson_cmd gem_cmd fetch_cmd make_check_pre
 unset -v python_version stackage
 unset -v cmake_builddir meson_builddir
 unset -v meson_crossfile

From 4977c0573ac08058ab824f7b46976b5d3caeb198 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 28 Feb 2022 14:41:46 +0100
Subject: [PATCH 1995/2561] totem: fix tests

---
 srcpkgs/totem/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index c3e8c0911ba3..bccea7f2a7c3 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -12,21 +12,19 @@ makedepends="clutter-gst3-devel clutter-gtk-devel dbus-glib-devel
  gst-plugins-ugly1 libSM-devel libXtst-devel libepc-devel libpeas-devel
  nautilus-devel zeitgeist-devel gst-plugins-base1-devel"
 depends="grilo-plugins gst-libav gst-plugins-good1 gst-plugins-ugly1 tracker3"
+checkdepends="xvfb-run"
 short_desc="GNOME integrated movie player based on Gstreamer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Videos"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=fce562e2b26cbcfc0c678538dcc81f9dc15ce60d5a89ee4358907bf634304c40
+make_check_pre="xvfb-run"
 
 # XXX xulrunner plugin.
 # XXX reenable python plugin if pylint pkg exists.
 #pycompile_dirs="usr/lib/totem/plugins"
 
-do_check() {
-	:
-}
-
 libtotem_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {

From 5e1585b70ac93606064d465852057f7edbf3ee83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 08:57:55 -0300
Subject: [PATCH 1996/2561] SuiteSparse: update to 5.12.0.

---
 .../patches/skip-demo-on-build.patch          | 22 +++++++++++++++++++
 srcpkgs/SuiteSparse/template                  |  7 +++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch

diff --git a/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch b/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch
new file mode 100644
index 000000000000..9ec775229ed6
--- /dev/null
+++ b/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch
@@ -0,0 +1,22 @@
+This is to avoid running demos on `make install`, which break cross compile
+
+--- a/Makefile
++++ b/Makefile
+@@ -294,7 +294,7 @@ endif
+ # just compile GraphBLAS
+ gb:
+ 	echo $(CMAKE_OPTIONS)
+-	( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
++	( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+ 
+ # compile and install GraphBLAS libgraphblas_renamed, for MATLAB
+ gbrenamed:
+@@ -309,7 +309,7 @@ gbrenamed:
+ 
+ # just compile Mongoose
+ mon:
+-	( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' )
++	( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library )
+ 
+ # compile and install Mongoose
+ moninstall: mon
diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template
index ab5c829e3ab7..b304dfc8f786 100644
--- a/srcpkgs/SuiteSparse/template
+++ b/srcpkgs/SuiteSparse/template
@@ -1,7 +1,7 @@
 # Template file for 'SuiteSparse'
 pkgname=SuiteSparse
-version=5.10.1
-revision=2
+version=5.12.0
+revision=1
 # XXX: re-enable TBB=-ltbb -DSPQR_CONFIG=-DHAVE_TBB when updating, if possible
 make_build_args="BLAS=-lblas LAPACK=-llapack"
 hostmakedepends="cmake chrpath"
@@ -10,8 +10,9 @@ short_desc="Suite of sparse matrix software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="custom:multiple"
 homepage="https://people.engr.tamu.edu/davis/suitesparse.html"
+changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog"
 distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz"
-checksum=acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee
+checksum=5fb0064a3398111976f30c5908a8c0b40df44c6dd8f0cc4bfa7b9e45d8c647de
 
 do_build() {
 	make config library $make_build_args JOBS=$XBPS_MAKEJOBS

From ad93afe053ddd8c8dfb1f48ee1683dc94d67c51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:25:55 -0300
Subject: [PATCH 1997/2561] igraph: update to 0.9.8.

---
 srcpkgs/igraph/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/igraph/template b/srcpkgs/igraph/template
index f131886aae63..983de0006d3b 100644
--- a/srcpkgs/igraph/template
+++ b/srcpkgs/igraph/template
@@ -1,6 +1,6 @@
 # Template file for 'igraph'
 pkgname=igraph
-version=0.9.6
+version=0.9.8
 revision=1
 build_style=cmake
 configure_args="-DIGRAPH_ENABLE_TLS=on -DIGRAPH_ENABLE_LTO=on -DBUILD_SHARED_LIBS=ON"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://igraph.org/c/"
 changelog="https://raw.githubusercontent.com/igraph/igraph/master/CHANGELOG.md"
 distfiles="https://github.com/igraph/igraph/releases/download/${version}/igraph-${version}.tar.gz"
-checksum=7c299ec54eecfe413758c332a42c4cb71d02d2951b2ac232584d317c5792f387
+checksum=f9a83473cea3e037b605b79b336be656b00dcf3037b233b4b250bd9270f36397
 
 igraph-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From af9059f7acfa61fcc4ffcf0ca7828af5f9788db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:39:35 -0300
Subject: [PATCH 1998/2561] planarity: update to 3.0.2.0.

---
 srcpkgs/planarity/template | 4 ++--
 srcpkgs/planarity/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/planarity/template b/srcpkgs/planarity/template
index aab5ce4a08fc..fe5d9e08c9f9 100644
--- a/srcpkgs/planarity/template
+++ b/srcpkgs/planarity/template
@@ -1,6 +1,6 @@
 # Template file for 'planarity'
 pkgname=planarity
-version=3.0.1.1
+version=3.0.2.0
 revision=1
 build_style=gnu-configure
 short_desc="Graph algorithms for planar embedding and related algorithms"
@@ -8,7 +8,7 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-3-Clause"
 homepage="https://github.com/graph-algorithms/edge-addition-planarity-suite/"
 distfiles="https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_${version}/planarity-${version}.tar.gz"
-checksum=50b686fce6e67ba3a4d0634632c16566539a95d7e51afd066f6b1d5ae0eab284
+checksum=b4897df8f323e660197242e0aa273a542a59782cad783d7334111a9ad49b9e08
 
 post_install() {
 	vlicense LICENSE.TXT
diff --git a/srcpkgs/planarity/update b/srcpkgs/planarity/update
index 315139e84f6e..3dffcc02a424 100644
--- a/srcpkgs/planarity/update
+++ b/srcpkgs/planarity/update
@@ -1 +1,2 @@
 site=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases
+ignore=*.WindowsExe

From fba36d22caebcb066423d3c586aec13a28f4ef86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:41:43 -0300
Subject: [PATCH 1999/2561] python3-cvxopt: update to 1.3.0.

Also:
 - fix support for gsl
 - enable support for fftw
---
 srcpkgs/python3-cvxopt/patches/fix-gsl.patch | 11 +++++++++++
 srcpkgs/python3-cvxopt/template              |  8 +++++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/python3-cvxopt/patches/fix-gsl.patch

diff --git a/srcpkgs/python3-cvxopt/patches/fix-gsl.patch b/srcpkgs/python3-cvxopt/patches/fix-gsl.patch
new file mode 100644
index 000000000000..e32dc2fbf1e1
--- /dev/null
+++ b/srcpkgs/python3-cvxopt/patches/fix-gsl.patch
@@ -0,0 +1,11 @@
+--- a/setup.py	2022-03-07 18:58:58.000000000 -0300
++++ b/setup.py	2022-04-14 22:25:18.860887901 -0300
+@@ -129,7 +129,7 @@
+ # optional modules
+ 
+ if BUILD_GSL:
+-    gsl = Extension('gsl', libraries = M_LIB + ['gsl'] + BLAS_LIB,
++    gsl = Extension('gsl', libraries = M_LIB + ['gsl', 'gslcblas'],
+         include_dirs = [ GSL_INC_DIR ],
+         library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ],
+         define_macros = GSL_MACROS,
diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template
index 0fb769b294e0..d89abbcafa5f 100644
--- a/srcpkgs/python3-cvxopt/template
+++ b/srcpkgs/python3-cvxopt/template
@@ -1,20 +1,22 @@
 # Template file for 'python3-cvxopt'
 pkgname=python3-cvxopt
-version=1.2.7
+version=1.3.0
 revision=1
 wrksrc="cvxopt-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-makedepends="python3-devel blas-devel lapack-devel SuiteSparse-devel gsl-devel glpk-devel"
+makedepends="python3-devel blas-devel lapack-devel SuiteSparse-devel gsl-devel
+ glpk-devel fftw-devel"
 checkdepends="python3-pytest"
 short_desc="Python software for convex optimization"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-or-later"
 homepage="http://cvxopt.org/"
 distfiles="${PYPI_SITE}/c/cvxopt/cvxopt-${version}.tar.gz"
-checksum=3f9db1f4d4e820aaea81d6fc21054c89dc6327c84f935dd5a1eda1af11e1d504
+checksum=00b1b232f9d1f902d578a9d75814b67fa020758d5ae422e28ca8cef6269fa5c6
 
 pre_build() {
 	export CVXOPT_BUILD_GSL=1
 	export CVXOPT_BUILD_GLPK=1
+	export CVXOPT_BUILD_FFTW=1
 }

From 0a24c5ac2db4cf306729e764460e93eece5a5686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 8 Apr 2022 20:57:31 -0300
Subject: [PATCH 2000/2561] giac: update to 1.9.0.7.

---
 srcpkgs/giac/patches/fgamma.patch  |  2 +-
 srcpkgs/giac/patches/micropy.patch | 18 ------------------
 srcpkgs/giac/template              | 10 ++++++++--
 3 files changed, 9 insertions(+), 21 deletions(-)
 delete mode 100644 srcpkgs/giac/patches/micropy.patch

diff --git a/srcpkgs/giac/patches/fgamma.patch b/srcpkgs/giac/patches/fgamma.patch
index 665803db13f3..8cdc5fda88ac 100644
--- a/srcpkgs/giac/patches/fgamma.patch
+++ b/srcpkgs/giac/patches/fgamma.patch
@@ -1,7 +1,7 @@
 --- a/src/first.h	2017-09-22 20:44:12.000000000 +0200
 +++ b/src/first.h	2017-11-14 15:26:53.529711489 +0100
 @@ -503,7 +503,7 @@
- #if defined(__MINGW_H) || defined(VISUALC) // FIXME gamma, not used
+ #if defined(__MINGW_H) || defined(VISUALC) || defined(FXCG)// FIXME gamma, not used
  inline float fgamma(float f1){ return f1; }
  #else
 -inline float fgamma(float f1){ return gammaf(f1); } // or tgammaf(f1) on some versions of emscripten
diff --git a/srcpkgs/giac/patches/micropy.patch b/srcpkgs/giac/patches/micropy.patch
deleted file mode 100644
index 0e417a5a8ecb..000000000000
--- a/srcpkgs/giac/patches/micropy.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/icas.cc	2021-03-02 04:52:40.000000000 -0300
-+++ b/src/icas.cc	2022-03-30 10:00:39.154056068 -0300
-@@ -1810,6 +1810,7 @@
-     cerr << "// Setting tex log" << '\n';
-     show_tex=true;
-   }
-+#ifdef HAVE_LIBMICROPYTHON
-   if (getenv("GIAC_MICROPY")){
-     cerr << "Micropython mode\n";
-     python_compat(4 | python_compat(contextptr),contextptr);
-@@ -1821,6 +1822,7 @@
-       return 0;
-     }
-   }
-+#endif
- #ifdef HAVE_LIBREADLINE
-   if (ARGC==1){
-     int taillemax=1000;
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index fbdadc31dde7..e892c8bf7506 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,6 +1,6 @@
 # Template file for 'giac'
 pkgname=giac
-version=1.7.0.53
+version=1.9.0.7
 revision=1
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
@@ -14,11 +14,17 @@ license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 changelog="https://www-fourier.ujf-grenoble.fr/~parisse/install_en#new"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
-checksum=74e5f98f63147c0197e4ce309601ae745312761be61c1a99c8a6bab4862e4a9f
+checksum=72016988b7180e9b630ecabecc60969213e7b61418c2598c91acbaec139fd740
 
 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"
 
+post_extract() {
+	# remove a binary that works only for x86_64 host
+	# the binary will be rebuilt using host compiler
+	rm src/mkjs
+}
+
 post_install() {
 	# remove duplicates
 	rm -r ${DESTDIR}/usr/share/doc

From 0e25add3634076850347b137aab27ab0a05fc20f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 15 Apr 2022 13:51:02 -0300
Subject: [PATCH 2001/2561] pari-nflistdata: update to 20220326.

---
 srcpkgs/pari-nflistdata/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pari-nflistdata/template b/srcpkgs/pari-nflistdata/template
index c6e66f228b98..c4089cdb84a3 100644
--- a/srcpkgs/pari-nflistdata/template
+++ b/srcpkgs/pari-nflistdata/template
@@ -1,6 +1,6 @@
 # Template file for 'pari-nflistdata'
 pkgname=pari-nflistdata
-version=20210527
+version=20220326
 revision=1
 create_wrksrc=yes
 short_desc="PARI/GP database needed by nflist"
@@ -8,10 +8,10 @@ maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr/packages.html"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/packages/${pkgname#pari-}.tgz>${pkgname}-${version}.tar.gz"
-checksum=a123b2a6776a6579108254f5dbe9fd720ddbc7e46456b45e90a69e92a73b0597
+checksum=f298af350a0d329bb3b8d4ff6880865be213098d106b484d5477b1dc2e06b90f
 
 do_build() {
-	# compressed data files work ok (install-size: 4.1M -> 2.9M)
+	# compressed data files work ok (install-size: 15M -> 8.8M)
 	find data -type f -size +4k -print0 | xargs -0 gzip -9
 }
 

From b53626cd9d0ca73ba16712915ac91628f4f3da34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 28 Apr 2022 11:24:39 -0300
Subject: [PATCH 2002/2561] flintlib: update to 2.8.5.

Also, enable openblas (used for matrix multiplication)
---
 srcpkgs/flintlib/template | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template
index cebf8e300812..57a4a2de4f42 100644
--- a/srcpkgs/flintlib/template
+++ b/srcpkgs/flintlib/template
@@ -1,21 +1,24 @@
 # Template file for 'flintlib'
 pkgname=flintlib
-version=2.8.4
+version=2.8.5
 revision=1
 wrksrc="flint-${version}"
 build_style=configure
-configure_args="--prefix=/usr --with-gmp=/usr --with-mpfr=/usr $(vopt_if ntl --with-ntl=/usr)"
-makedepends="mpfr-devel $(vopt_if ntl ntl-devel)"
+configure_args="--prefix=/usr $(vopt_with ntl)
+ $(vopt_if openblas --with-blas=${XBPS_CROSS_BASE}/usr/include/openblas)"
+makedepends="mpfr-devel $(vopt_if ntl ntl-devel)
+ $(vopt_if openblas openblas-devel)"
 short_desc="Fast Library for Number Theory"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="LGPL-2.1-or-later"
 homepage="https://flintlib.org"
 changelog="https://raw.githubusercontent.com/wbhart/flint2/trunk/NEWS"
 distfiles="https://flintlib.org/flint-${version}.tar.gz"
-checksum=61df92ea8c8e9dc692d46c71d7f50aaa09a33d4ba08d02a1784730a445e5e4be
+checksum=5911fedff911100f15781f35e3a4fa934fe60e4aea02a8c10cc8918101c1eed8
 
-build_options="ntl"
+build_options="ntl openblas"
 desc_option_ntl="enable NTL support"
+build_options_default="openblas"
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" ntl"

From 7c2cbf307db72425189c612021a9c2ceb51cd8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 3 May 2022 23:07:32 -0300
Subject: [PATCH 2003/2561] primesieve: update to 7.9.

---
 srcpkgs/primesieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/primesieve/template b/srcpkgs/primesieve/template
index 2737e1b3013c..7bfb5bc29c28 100644
--- a/srcpkgs/primesieve/template
+++ b/srcpkgs/primesieve/template
@@ -1,6 +1,6 @@
 # Template file for 'primesieve'
 pkgname=primesieve
-version=7.8
+version=7.9
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTS=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
 homepage="https://github.com/kimwalisch/primesieve"
 changelog="https://raw.githubusercontent.com/kimwalisch/primesieve/master/ChangeLog"
 distfiles="https://github.com/kimwalisch/primesieve/archive/refs/tags/v${version}.tar.gz"
-checksum=0cd0490259e6e919c6e3dd3f3e69ac6d91e6cbe616e22a219abe4006d9293d5d
+checksum=c567f2a1a9d46a70020f920eb2c794142528a31a055995500e7fcb19642b7c91
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From df614f43dc0d686c0aa4ea40d0975ba0bbeaf476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 3 May 2022 23:07:36 -0300
Subject: [PATCH 2004/2561] primecount: update to 7.3.

---
 srcpkgs/primecount/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/primecount/template b/srcpkgs/primecount/template
index 09a43b602f19..b20c0897c523 100644
--- a/srcpkgs/primecount/template
+++ b/srcpkgs/primecount/template
@@ -1,6 +1,6 @@
 # Template file for 'primecount'
 pkgname=primecount
-version=7.2
+version=7.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTS=ON -DBUILD_LIBPRIMESIEVE=OFF
@@ -10,8 +10,9 @@ short_desc="Fast prime counting function"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="BSD-2-Clause"
 homepage="https://github.com/kimwalisch/primecount/"
+changelog="https://raw.githubusercontent.com/kimwalisch/primecount/master/ChangeLog"
 distfiles="https://github.com/kimwalisch/primecount/archive/refs/tags/v${version}.tar.gz"
-checksum=54c1eec33e665a780002dda20cf39ba0cefa8e846fdeda44734fb2265cba9257
+checksum=471fe21461e42e5f28404e17ff840fb527b3ec4064853253ee22cf4a81656332
 
 build_options="native_build"
 

From e55f8c21ea3c214c92e5ab0e93348fb54847c9f0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 May 2022 19:40:52 +0200
Subject: [PATCH 2005/2561] syncthing: update to 1.20.1.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index d1cdcc490bb2..7d5c7893b3e2 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.20.0
+version=1.20.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
 homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=27d9b52f18ebd833938731ffaaeed4f34ced534ef3d1ed2bc126a495764f753d
+checksum=4b355eda64b9f52d53b34ab99a1ff73dc3d5ad5e43086223e7fc7f4d05a58a05
 
 pre_build() {
 	GOARCH= go generate \

From 6ecffafdebd59a887dfdd7f162104c0650ea75bb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 May 2022 19:43:32 +0200
Subject: [PATCH 2006/2561] lollypop: update to 1.4.34.

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 02145a66a808..d30ca5dbb206 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.33
+version=1.4.34
 revision=1
 build_style=meson
 hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config"
@@ -14,4 +14,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/lollypop-${version}.tar.xz"
-checksum=b1f806b3b844400131c7dc1bfad46843fc9ffcfbbf1fdeeab6bc348a74803529
+checksum=b1e6786c331c61232a26fbeca281cb47242ca56754fef4492aa79b9b0f4d1fae

From 5864b2982be158653f597991fd0233b129cd7dd6 Mon Sep 17 00:00:00 2001
From: Kyra Zimmer <me@nonchip.de>
Date: Tue, 3 May 2022 10:35:41 +0200
Subject: [PATCH 2007/2561] sublime-merge-bin: update to 2071.

---
 srcpkgs/sublime-merge-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sublime-merge-bin/template b/srcpkgs/sublime-merge-bin/template
index 8c5cd2e290fe..73583df6b1ef 100644
--- a/srcpkgs/sublime-merge-bin/template
+++ b/srcpkgs/sublime-merge-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'sublime-merge-bin'
 pkgname=sublime-merge-bin
-version=2068
+version=2071
 revision=1
 archs="x86_64"
 wrksrc=sublime_merge
@@ -12,7 +12,7 @@ license="custom:EULA"
 homepage="https://www.sublimemerge.com"
 changelog="https://www.sublimemerge.com/download"
 distfiles="https://download.sublimetext.com/sublime_merge_build_${version}_x64.tar.xz"
-checksum=0ac7994208eaafc07ae9295fff215966c9d115cdf3a8218a140cd274c45074d2
+checksum=c58564e45c7a55da07cdfd1c6e68702b212be470c46603e00e8056420fed4b45
 _license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
 nopie=yes
 repository=nonfree

From 3d515e8147b4e3945f57237e4149a4cc555dea9e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 4 May 2022 17:35:51 -0500
Subject: [PATCH 2008/2561] nvidia: fix broken symlink

---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 3707accdab6e..1ff0e8dbc33b 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
 version=510.60.02
-revision=1
+revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com"
@@ -136,7 +136,7 @@ do_install() {
 	vinstall 15_nvidia_gbm.json 755 usr/share/glvnd/egl_vendor.d
 
 	vmkdir usr/lib/gbm
-	ln -sf libnvidia-allocator.so.${version} \
+	ln -sf /usr/lib/libnvidia-allocator.so.${version} \
 		${DESTDIR}/usr/lib/gbm/nvidia-drm_gbm.so
 
 	vinstall 10_nvidia.json 755 usr/share/glvnd/egl_vendor.d

From 81815370ef8f7cd5dc808a1238f42803ffb3d016 Mon Sep 17 00:00:00 2001
From: Markus Uhlin <markus.uhlin@bredband.net>
Date: Wed, 4 May 2022 22:00:53 +0200
Subject: [PATCH 2009/2561] swirc: update to 3.3.4.

---
 srcpkgs/swirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 2f56d62942bf..5a4b6482a3b7 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,6 +1,6 @@
 # Template file for 'swirc'
 pkgname=swirc
-version=3.3.3
+version=3.3.4
 revision=1
 build_style=configure
 configure_args="$(vopt_with notify libnotify)"
@@ -15,7 +15,7 @@ license="BSD-3-Clause, ISC, MIT"
 homepage="https://www.nifty-networks.net/swirc"
 changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md"
 distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz"
-checksum="29bd8ece384527ab22ee994c000049ba4623e8ce6e0ca8023e1386ba60e72acf"
+checksum="2a8404965e796a67555b10b54aaf53d32bbd63e1707cd8364c572a5ed7e3f837"
 
 build_options="notify"
 

From 61c3f401380d8eb043497294e47dab186cd56ff8 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 4 May 2022 11:04:05 -0400
Subject: [PATCH 2010/2561] polybar: update to 3.6.3.

---
 srcpkgs/polybar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index 9a2021d35381..b59ed9cd039a 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -1,6 +1,6 @@
 # Template file for 'polybar'
 pkgname=polybar
-version=3.6.2
+version=3.6.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_CONFIG=OFF -DBUILD_DOC_HTML=OFF
@@ -25,7 +25,7 @@ license="MIT"
 homepage="https://github.com/polybar/polybar"
 changelog="https://raw.githubusercontent.com/polybar/polybar/master/CHANGELOG.md"
 distfiles="https://github.com/polybar/polybar/releases/download/${version}/polybar-${version}.tar.gz"
-checksum=73becc942e7d2418bc72bd194f2037a2a86792219fd561b663a8509fd5f547a0
+checksum=f25758573567208fc7b6f4d4115a6117a87389cbcc094cf605d079775be95fa5
 # tries to download and build unstable/unreleased googletest during configure
 make_check=no
 

From 53b56e2c33d725271b1b1eb30cea8e6205268ec7 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Wed, 27 Apr 2022 09:27:20 +0200
Subject: [PATCH 2011/2561] google-chrome: update to 101.0.4951.41

---
 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 b20753366d95..c6614dbcd27b 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=100.0.4896.127
+version=101.0.4951.41
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=d012bc3e5e000bffbd83cf20c48add187c52b065cc37408862c42d127aa4a656
+checksum=78d24e94017eb94ab771d49bcd4dd0684f86ca05bc40250fe3151040aefedf8a
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From a1c80e91f71115a98d2253d045bac54d24b57641 Mon Sep 17 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, 17 Apr 2022 00:16:10 +0700
Subject: [PATCH 2012/2561] refind: update to 0.13.3.1.

---
 .../patches/refind-install-abs-path.patch     | 113 ++++++++++++++++++
 srcpkgs/refind/template                       |  56 ++++-----
 2 files changed, 134 insertions(+), 35 deletions(-)
 create mode 100644 srcpkgs/refind/patches/refind-install-abs-path.patch

diff --git a/srcpkgs/refind/patches/refind-install-abs-path.patch b/srcpkgs/refind/patches/refind-install-abs-path.patch
new file mode 100644
index 000000000000..22f30cbce019
--- /dev/null
+++ b/srcpkgs/refind/patches/refind-install-abs-path.patch
@@ -0,0 +1,113 @@
+Index: refind-0.13.3.1/refind-install
+===================================================================
+--- refind-0.13.3.1.orig/refind-install
++++ refind-0.13.3.1/refind-install
+@@ -342,19 +342,8 @@ DeterminePlatform() {
+ # $ThisDir to point to the directory in which this script resides,
+ # and $RefindDir to point to where the rEFInd binaries live
+ CheckForFiles() {
+-   # Note: $ThisDir points to real (not symlinked) script home on Linux,
+-   # enabling creating a symlink in /usr/sbin (or wherever); but on OS X,
+-   # "readlink" doesn't do the same thing as under Linux, so the script
+-   # must not be a symlink under OS X.
+-   case "$OSTYPE" in
+-      darwin*)
+-           ThisDir="$( cd -P "${BASH_SOURCE%/*}" && pwd )"
+-           ;;
+-      linux*)
+-           ThisDir="$(dirname "$(readlink -f "$0")")"
+-           ;;
+-   esac
+-   RefindDir="$ThisDir/refind"
++   ThisDir="/do/not/use/this/var"
++   RefindDir="/usr/share/refind"
+ 
+    if [[ ! -f "$RefindDir/refind_$Platform.efi" ]] ; then
+       echo "The rEFInd binary file is missing! Aborting installation!"
+@@ -363,8 +352,6 @@ CheckForFiles() {
+ 
+    if [[ -f "$RefindDir/refind.conf-sample" ]] ; then
+       ConfFile="$RefindDir/refind.conf-sample"
+-   elif [[ -f "$ThisDir/refind.conf-sample" ]] ; then
+-      ConfFile="$ThisDir/refind.conf-sample"
+    else
+       echo "The sample configuration file is missing! Aborting installation!"
+       exit 1
+@@ -372,8 +359,6 @@ CheckForFiles() {
+ 
+    if [[ -d "$RefindDir/icons" ]] ; then
+       IconsDir="$RefindDir/icons"
+-   elif [[ -d "$ThisDir/icons" ]] ; then
+-      IconsDir="$ThisDir/icons"
+    else
+       echo "The icons directory is missing! Aborting installation!"
+       exit 1
+@@ -603,7 +588,6 @@ SetBootFS() {
+ CopyDrivers() {
+    if [[ $InstallDrivers == "all" ]] ; then
+       mkdir -p "$InstallDir/$TargetDir/drivers_$1"
+-      cp "$ThisDir"/drivers_"$1"/*_"$1".efi "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null
+       cp "$RefindDir"/drivers_"$1"/*_"$1".efi "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null
+    elif [[ "$InstallDrivers" == "boot" ]] ; then
+       SetBootFS
+@@ -628,7 +612,6 @@ CopyDrivers() {
+       if [[ -n $BootFS ]] ; then
+          echo "Installing driver for $BootFS (${DriverType}_$1.efi)"
+          mkdir -p "$InstallDir/$TargetDir/drivers_$1"
+-         cp "$ThisDir/drivers_$1/${DriverType}_$1.efi" "$InstallDir/$TargetDir/drivers_$1/" 2> /dev/null
+          cp "$RefindDir/drivers_$1/${DriverType}_$1.efi" "$InstallDir/$TargetDir/drivers_$1"/ 2> /dev/null
+       fi
+    fi
+@@ -669,7 +652,6 @@ CopyRefindFiles() {
+       fi
+       if [[ $InstallDrivers == "all" ]] ; then
+          cp -r "$RefindDir"/drivers_* "$InstallDir/$TargetDir/" 2> /dev/null
+-         cp -r "$ThisDir"/drivers_* "$InstallDir/$TargetDir/" 2> /dev/null
+       elif [[ $Upgrade == 1 || $InstallToEspOnMac == 1 ]] ; then
+          CopyDrivers "$Platform"
+          CopyTools "$Platform"
+@@ -693,8 +675,8 @@ CopyRefindFiles() {
+          if [[ $LocalKeys == 0 ]] ; then
+             echo "Storing copies of rEFInd Secure Boot public keys in $EtcKeysDir"
+             mkdir -p "$EtcKeysDir"
+-            cp "$ThisDir/keys/refind.cer" "$EtcKeysDir" 2> /dev/null
+-            cp "$ThisDir/keys/refind.crt" "$EtcKeysDir" 2> /dev/null
++            cp "$RefindDir/keys/refind.cer" "$EtcKeysDir" 2> /dev/null
++            cp "$RefindDir/keys/refind.crt" "$EtcKeysDir" 2> /dev/null
+          fi
+       fi
+       if [[ "$TargetDir" == '/System/Library/CoreServices' ]] ; then
+@@ -731,7 +713,7 @@ CopyRefindFiles() {
+       Problems=1
+    fi
+    mkdir -p "$InstallDir/$TargetDir/keys"
+-   cp -rf "$ThisDir"/keys/*.[cd]er "$InstallDir/$TargetDir/keys/" 2> /dev/null
++   cp -rf "$RefindDir"/keys/*.[cd]er "$InstallDir/$TargetDir/keys/" 2> /dev/null
+    cp -rf "$EtcKeysDir"/*.[cd]er "$InstallDir/$TargetDir/keys/" 2> /dev/null
+    if [[ -f "$InstallDir/$TargetDir/refind.conf" ]] ; then
+       echo "Existing refind.conf file found; copying sample file as refind.conf-sample"
+@@ -1139,14 +1121,12 @@ ReSignBinaries() {
+    GenerateKeys
+    mkdir -p "$TempDir/drivers_$Platform"
+    cp "$RefindDir/refind.conf-sample $TempDir" 2> /dev/null
+-   cp "$ThisDir/refind.conf-sample $TempDir" 2> /dev/null
+    cp "$RefindDir/refind_ia32.efi $TempDir" 2> /dev/null
+    cp -a "$RefindDir/drivers_ia32 $TempDir" 2> /dev/null
+-   cp -a "$ThisDir/drivers_ia32 $TempDir" 2> /dev/null
+    SignOneBinary "$RefindDir/refind_$Platform.efi" "$TempDir/refind_$Platform.efi"
+    SaveIFS=$IFS
+    IFS=$(echo -en "\n\b")
+-   for Driver in $(ls "$RefindDir"/drivers_$Platform/*.efi "$ThisDir"/drivers_$Platform/*.efi 2> /dev/null) ; do
++   for Driver in $(ls "$RefindDir"/drivers_$Platform/*.efi 2> /dev/null) ; do
+       TempName=$(basename "$Driver")
+       SignOneBinary "$Driver" "$TempDir/drivers_$Platform/$TempName"
+    done
+@@ -1403,7 +1383,7 @@ InstallSBKey() {
+     if [ "$LocalKeys" == "1" ] ; then
+         UsedDerKey="$DerKey"
+     else
+-        UsedDerKey="$ThisDir/keys/refind.cer"
++        UsedDerKey="$RefindDir/keys/refind.cer"
+     fi
+     if command -v mokutil &>/dev/null ; then
+        if mokutil --test-key "$UsedDerKey" &> /dev/null ; then
diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template
index 49d462907523..bec621c4e3a1 100644
--- a/srcpkgs/refind/template
+++ b/srcpkgs/refind/template
@@ -1,6 +1,6 @@
 # Template file for 'refind'
 pkgname=refind
-version=0.13.2
+version=0.13.3.1
 revision=1
 archs="x86_64* i686* aarch64*"
 makedepends="gnu-efi-libs"
@@ -10,27 +10,10 @@ 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=dd58944854a42df5a2a943f15e5dcfd995808f28580df96ad39d68fb1e48c970
+checksum=7a3e3f0f81bd4ae95f24e120f44e01319231f488fef7cc8bf03a1aea23c6cfd1
 python_version=2
 conf_files="/etc/default/refind-kernel-hook.conf"
-
-post_extract() {
-	vsed -e 's|RefindDir=\"\$ThisDir/refind\"|RefindDir="/usr/share/refind"|g' \
-		-i refind-install
-
-	# Patch paths to libaries and includes for cross-compiling
-	vsed \
-		-e "s|^EFIINC.*|EFIINC = ${XBPS_CROSS_BASE}/usr/include/efi|" \
-		-e "s|^GNUEFILIB.*|GNUEFILIB = ${XBPS_CROSS_BASE}/usr/lib|" \
-		-e "s|^EFILIB.*|EFILIB = ${XBPS_CROSS_BASE}/usr/lib|" \
-		-e "s|^EFICRT0.*|EFICRT0 = ${XBPS_CROSS_BASE}/usr/lib|" \
-		-i Make.common
-
-	# Only this file is written in python3
-	# All other files are python2
-	vsed -e '1s,^.*python3$,#!/usr/bin/python3,' \
-			-i refind-mkdefault
-}
+make_dirs="/etc/refind.d/keys 0755 root root"
 
 do_build() {
 	unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
@@ -44,7 +27,12 @@ do_build() {
 		export CROSS_COMPILE="${XBPS_CROSS_TRIPLET}-"
 	fi
 
-	make ARCH=${_ARCH} gnuefi fs_gnuefi
+	make ARCH=${_ARCH} \
+		EFIINC=${XBPS_CROSS_BASE}/usr/include/efi \
+		GNUEFILIB=${XBPS_CROSS_BASE}/usr/lib \
+		EFILIB=${XBPS_CROSS_BASE}/usr/lib \
+		EFICRT0=${XBPS_CROSS_BASE}/usr/lib \
+		gnuefi fs_gnuefi
 }
 
 do_install() {
@@ -67,27 +55,25 @@ do_install() {
 	vdoc README.txt
 	vdoc CREDITS.txt
 	vdoc NEWS.txt
-	vcopy docs/refind /usr/share/doc/refind
-	vcopy docs/Styles /usr/share/doc/refind
+	vcopy docs/refind usr/share/doc/refind
+	vcopy docs/Styles usr/share/doc/refind
 
 	vman docs/man/mkrlconf.8
 	vman docs/man/mvrefind.8
 	vman docs/man/refind-install.8
 	vman docs/man/refind-mkdefault.8
 
-	vmkdir usr/share/refind
-	vcopy refind/refind_${_EFI_ARCH}.efi /usr/share/refind/
-	vcopy refind.conf-sample /usr/share/refind/
-	vcopy fonts /usr/share/refind/
-	vcopy icons /usr/share/refind/
-	vcopy banners /usr/share/refind/
-	vcopy images /usr/share/refind/
-	vcopy drivers_${_EFI_ARCH} /usr/share/refind/
-	vmkdir usr/share/refind/tools_${_EFI_ARCH}
-	vcopy gptsync/gptsync_${_EFI_ARCH}.efi /usr/share/refind/tools_${_EFI_ARCH}/
+	vinstall refind/refind_${_EFI_ARCH}.efi 644 usr/share/refind/
+	vinstall refind.conf-sample 644 usr/share/refind/
+	vcopy keys usr/share/refind
+	vcopy fonts usr/share/refind/
+	vcopy icons usr/share/refind/
+	vcopy banners usr/share/refind/
+	vcopy images usr/share/refind/
+	vcopy drivers_${_EFI_ARCH} usr/share/refind/
+	vinstall gptsync/gptsync_${_EFI_ARCH}.efi 644 \
+		usr/share/refind/tools_${_EFI_ARCH}/
 
-	vmkdir etc/refind.d
-	vcopy keys /etc/refind.d/
 
 	vinstall "${FILESDIR}/refind-kernel-hook.conf" 644 etc/default
 	vinstall ${FILESDIR}/kernel.post-install 744 \

From c7d14cdaaf5dffc4f563cf66a26e9d090cc57620 Mon Sep 17 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, 5 May 2022 09:42:16 +0700
Subject: [PATCH 2013/2561] gnu-efi-libs: update to 3.0.14.

---
 srcpkgs/gnu-efi-libs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template
index 0b8c679b5225..a0e5ad82d53b 100644
--- a/srcpkgs/gnu-efi-libs/template
+++ b/srcpkgs/gnu-efi-libs/template
@@ -1,7 +1,7 @@
 # Template file for 'gnu-efi-libs'
 pkgname=gnu-efi-libs
 reverts="3.0w_1" # Not an actual revert, xbps considers 3.0w higher than 3.0.8
-version=3.0.12
+version=3.0.14
 revision=1
 wrksrc="gnu-efi-${version}"
 makedepends="pciutils-devel"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://sourceforge.net/projects/gnu-efi/"
 distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2"
-checksum=0196f2e1fd3c334b66e610a608a0e59233474c7a01bec7bc53989639aa327669
+checksum=b73b643a0d5697d1f396d7431448e886dd805668789578e3e1a28277c9528435
 nostrip=yes
 
 # If we are cross-building we need to pass the cross-compilation triplet

From 48795603830b051ceba29a22e467e556d79b5822 Mon Sep 17 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, 5 May 2022 09:42:29 +0700
Subject: [PATCH 2014/2561] mutt: update to 2.2.4.

---
 srcpkgs/mutt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 4c65fcdec66b..ba747971293e 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.2.3
+version=2.2.4
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
@@ -8,7 +8,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --sysconfdir=/etc/$pkgname
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
-hostmakedepends="perl pkg-config"
+hostmakedepends="perl pkg-config gettext"
 makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel zlib-devel"
 depends="cyrus-sasl-modules mime-types"
@@ -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=978addcdab454f447ed7d1de84b5767e714c30714285bf82e4a1745071d18d89
+checksum=b82776bebff0e10820a33fa1e7eafa5cba4ab3a011b08e83b66ed62d75c6e060
 
 post_install() {
 	# provided by mime-types

From 202cab4cc15c6543925ec8c21da5d2f3189f1789 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 20 Mar 2022 16:09:47 -0400
Subject: [PATCH 2015/2561] xbps-triggers: add openjdk-profile trigger

This removes the need for each openjdk package to provide their own
/etc/profile.d entry, and fixes the conflict caused by each providing
their own.
---
 Manual.md                                   |  8 +++++
 srcpkgs/xbps-triggers/files/openjdk-profile | 39 +++++++++++++++++++++
 srcpkgs/xbps-triggers/template              |  2 +-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/xbps-triggers/files/openjdk-profile

diff --git a/Manual.md b/Manual.md
index 1ce07792f546..8afe781f0ec1 100644
--- a/Manual.md
+++ b/Manual.md
@@ -62,6 +62,7 @@ packages for XBPS, the `Void Linux` native packaging system.
 		* [kernel-hooks](#triggers_kernel_hooks)
 		* [mimedb](#triggers_mimedb)
 		* [mkdirs](#triggers_mkdirs)
+		* [openjdk-profile](#triggers_openjdk_profile)
 		* [pango-modules](#triggers_pango_module)
 		* [pycompile](#triggers_pycompile)
 		* [register-shell](#triggers_register_shell)
@@ -2000,6 +2001,13 @@ During removal it will delete the directory using `rmdir`.
 To include this trigger use the `make_dirs` variable, as the trigger won't do anything
 unless it is defined.
 
+<a id="triggers_openjdk_profile"></a>
+#### openjdk-profile
+
+The openjdk-profile trigger is responsible for creating an entry in /etc/profile.d that
+sets the `JAVA_HOME` environment variable to the currently-selected alternative for
+`/usr/bin/java` on installation. This trigger must be manually requested.
+
 <a id="triggers_pango_module"></a>
 #### pango-modules
 
diff --git a/srcpkgs/xbps-triggers/files/openjdk-profile b/srcpkgs/xbps-triggers/files/openjdk-profile
new file mode 100755
index 000000000000..007d9cd9eedf
--- /dev/null
+++ b/srcpkgs/xbps-triggers/files/openjdk-profile
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# Adds an entry to /etc/profile.d for setting $JAVA_HOME.
+#
+# Arguments:	$ACTION = [run/targets]
+#		$TARGET = [post-install/pre-remove]
+#		$PKGNAME
+#		$VERSION
+#		$UPDATE = [yes/no]
+#
+ACTION="$1"
+TARGET="$2"
+PKGNAME="$3"
+VERSION="$4"
+UPDATE="$5"
+
+jdkprofile=etc/profile.d/openjdk.sh
+
+case "$ACTION" in
+targets)
+	echo "post-install"
+	;;
+run)
+	[ -f "$jdkprofile" ] && exit 0
+
+	cat > "$jdkprofile" <<'EOF'
+if _java_bin=$(readlink -e /usr/bin/java); then
+	_java_bin="${_java_bin%/bin/java}"
+	[ -d "${_java_bin}" ] && export JAVA_HOME="${JAVA_HOME:=${_java_bin}}"
+fi
+unset _java_bin
+EOF
+	;;
+*)
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index 5de97d53c210..b1e4f34a4dde 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
-version=0.121
+version=0.122
 revision=1
 bootstrap=yes
 short_desc="XBPS triggers for Void Linux"

From fb57e2b092bb0ad6289553e3412d651a88dd3a31 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 20 Mar 2022 16:12:02 -0400
Subject: [PATCH 2016/2561] openjdk8: move /etc/profile.d/10-openjdk*.sh to
 trigger

---
 srcpkgs/openjdk8/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 9cced29b4be9..9832b18555a6 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -4,7 +4,7 @@
 # TODO: config files?
 pkgname=openjdk8
 version=8u322b04
-revision=1
+revision=2
 _jdk_update="${version#*u}"
 _jdk_update="${_jdk_update%b*}"
 _jdk_build="${version#*b}"
@@ -221,6 +221,8 @@ openjdk8-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 	short_desc+=" - runtime components"
 	provides="java-runtime-${version}_1"
+	depends="xbps-triggers>=0.122_1"
+	triggers="openjdk-profile"
 	alternatives="
 	 java:/usr/bin/java:/${_jdk_home}/jre/bin/java
 	 java:/usr/bin/jjs:/${_jdk_home}/jre/bin/jjs
@@ -236,10 +238,6 @@ openjdk8-jre_package() {
 	"
 	pkg_install() {
 		vmove ${_jdk_home}/jre
-		vmkdir etc/profile.d
-		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk8.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/${_jdk_home}/jre}
-EOF
 	}
 }
 

From 1246f0280bf9065a8ca9a1734d7b25bda4edf09f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 20 Mar 2022 16:12:04 -0400
Subject: [PATCH 2017/2561] openjdk11: move /etc/profile.d/10-openjdk*.sh to
 trigger

---
 srcpkgs/openjdk11/template | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 711376c10824..45c775856fa9 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk11'
 pkgname=openjdk11
 version=11.0.12+7
-revision=1
+revision=2
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
@@ -160,7 +160,8 @@ openjdk11-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 	short_desc+=" - runtime components"
 	provides="java-runtime-${version}_1"
-	depends="fontconfig"
+	depends="fontconfig xbps-triggers>=0.122_1"
+	triggers="openjdk-profile"
 	alternatives="
 	 java:/usr/bin/java:/${_jdk_home}/bin/java
 	 java:/usr/bin/jjs:/${_jdk_home}/bin/jjs
@@ -179,11 +180,6 @@ openjdk11-jre_package() {
 			vmove $_jdk_home/$f
 		done
 
-		vmkdir etc/profile.d
-		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk11.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/usr/lib/jvm/openjdk${_java_ver}}
-EOF
-
 		vlicense ASSEMBLY_EXCEPTION
 		vlicense LICENSE
 	}

From c6ae034c7f9eba47ca7aa0be03ebc222e7986aa6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 20 Mar 2022 16:12:05 -0400
Subject: [PATCH 2018/2561] openjdk17: move /etc/profile.d/10-openjdk*.sh to
 trigger

---
 srcpkgs/openjdk17/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 2554e49c54ea..f60e96f79082 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,7 +1,7 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
 version=17.0.3+7
-revision=1
+revision=2
 _gtest_ver=1.8.1
 _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
@@ -170,6 +170,8 @@ openjdk17-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
 	short_desc+=" - runtime components"
 	provides="java-runtime-${version}_1"
+	depends="xbps-triggers>=0.122_1"
+	triggers="openjdk-profile"
 	alternatives="
 	 java:/usr/bin/java:/${_jdk_home}/bin/java
 	 java:/usr/bin/jfr:/${_jdk_home}/bin/jfr
@@ -185,11 +187,6 @@ openjdk17-jre_package() {
 			vmove $_jdk_home/$f
 		done
 
-		vmkdir etc/profile.d
-		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk17.sh <<-EOF
-export JAVA_HOME=\${JAVA_HOME=/$_jdk_home}
-EOF
-
 		vlicense ASSEMBLY_EXCEPTION
 		vlicense LICENSE
 	}

From 599fd022ddd888619e7bb368e2cf7e90ea234726 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:32 -0400
Subject: [PATCH 2019/2561] apache-fop: fix name of
 etc/profile.d/10_openjdk*.sh in template

---
 srcpkgs/apache-fop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template
index 96ab59bce8b3..3b7c917a7c09 100644
--- a/srcpkgs/apache-fop/template
+++ b/srcpkgs/apache-fop/template
@@ -1,7 +1,7 @@
 # Template file for 'apache-fop'
 pkgname=apache-fop
 version=2.5
-revision=2
+revision=3
 wrksrc="fop-${version}"
 build_wrksrc="fop"
 hostmakedepends="openjdk8 apache-ant"
@@ -18,7 +18,7 @@ conf_files="/etc/fop.conf"
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/10_openjdk8.sh
+	. /etc/profile.d/openjdk.sh
 	ant package
 }
 do_install() {

From 893db6771d3636ed0cfedf1034e23f427b82b82f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:35 -0400
Subject: [PATCH 2020/2561] apache-maven: fix name of
 etc/profile.d/10_openjdk*.sh in template

---
 srcpkgs/apache-maven/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template
index c9603329c2cd..cc1e3e561634 100644
--- a/srcpkgs/apache-maven/template
+++ b/srcpkgs/apache-maven/template
@@ -1,7 +1,7 @@
 # Template file for 'apache-maven'
 pkgname=apache-maven
 version=3.6.3
-revision=2
+revision=3
 hostmakedepends="openjdk8"
 depends="virtual?java-environment which"
 short_desc="Software project management and comprehension tool"
@@ -15,7 +15,7 @@ checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07
 replaces="apache-maven-bin>=0"
 
 do_build() {
-	source /etc/profile.d/10_openjdk8.sh
+	source /etc/profile.d/openjdk.sh
 	./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname}
 }
 

From c887045c54d1b0194ca9aad2a9d3e45a7375af9d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:36 -0400
Subject: [PATCH 2021/2561] arduino: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/arduino/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index 19daa0c1b1e8..485d24ad5a28 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino'
 pkgname=arduino
 version=1.8.19
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=$pkgname-$version
 create_wrksrc=yes
@@ -27,7 +27,7 @@ fi
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/10_openjdk8.sh
+	. /etc/profile.d/openjdk.sh
 
 	export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include/linux"
 	export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/lib/jvm/java-1.8-openjdk/include"

From 39bc9a8a559eb297f394232717feb18668bfa015 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:37 -0400
Subject: [PATCH 2022/2561] bibletime: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/bibletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template
index 559755a9dd6f..af3301e02365 100644
--- a/srcpkgs/bibletime/template
+++ b/srcpkgs/bibletime/template
@@ -4,7 +4,7 @@
 # to start.
 pkgname=bibletime
 version=3.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=/usr/share/xsl/docbook/html/chunk.xsl
  -DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=/usr/share/xsl/docbook/fo/docbook.xsl"
@@ -20,7 +20,7 @@ distfiles="https://github.com/bibletime/bibletime/releases/download/v${version}/
 checksum=d6beef62ad44b255e3dc4c5e89214bf01a0e85c9136073b0be12fca3d2b22622
 
 pre_build() {
-	. /etc/profile.d/10_openjdk11.sh
+	. /etc/profile.d/openjdk.sh
 	if [ "$XBPS_WORDSIZE" = "32" ]; then
 		export _JAVA_OPTIONS="-Xmx1024m"
 	fi

From 75ef1e284ecdd0806c43a3bf2df7176bf89a694a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:37 -0400
Subject: [PATCH 2023/2561] davmail: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/davmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/davmail/template b/srcpkgs/davmail/template
index 0482c0dce531..b739bf6b8bb6 100644
--- a/srcpkgs/davmail/template
+++ b/srcpkgs/davmail/template
@@ -1,7 +1,7 @@
 # Template file for 'davmail'
 pkgname=davmail
 version=5.5.1
-revision=2
+revision=3
 _commit=3299
 wrksrc=davmail-src-${version}-${_commit}
 hostmakedepends="openjdk8 apache-ant"
@@ -13,7 +13,7 @@ distfiles="${SOURCEFORGE_SITE}/davmail/davmail-src-${version}-${_commit}.tgz"
 checksum=63e14eeda3fed2a1a5c55f864a8832f8842d597e797ca1e8874c9b66b811f508
 
 do_build() {
-	. /etc/profile.d/10_openjdk8.sh
+	. /etc/profile.d/openjdk.sh
 	. /etc/profile.d/apache-ant.sh
 
 	ant jar

From bce908b9952f733afae88bec20d7d0b6ce7a06a1 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:38 -0400
Subject: [PATCH 2024/2561] freeplane: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/freeplane/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 2e7adb76ea4a..fa4eeb5e80ba 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,7 +1,7 @@
 # Template file for 'freeplane'
 pkgname=freeplane
 version=1.9.12
-revision=1
+revision=2
 wrksrc="freeplane-release-${version}"
 hostmakedepends="apache-ant openjdk8 unzip gradle"
 depends="virtual?java-runtime"
@@ -23,7 +23,7 @@ esac
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/10_openjdk8.sh
+	. /etc/profile.d/openjdk.sh
 
 	gradle format_translation binZip -x test
 }

From 3922ba12880b491a98c3d7f6b7cb4f8fe8de7169 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:38 -0400
Subject: [PATCH 2025/2561] freerouting: fix name of
 etc/profile.d/10_openjdk*.sh in template

---
 srcpkgs/freerouting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freerouting/template b/srcpkgs/freerouting/template
index f643eabdb6fe..bfde02fc9e29 100644
--- a/srcpkgs/freerouting/template
+++ b/srcpkgs/freerouting/template
@@ -1,7 +1,7 @@
 # Template file for 'freerouting'
 pkgname=freerouting
 version=1.4.5.1
-revision=1
+revision=2
 hostmakedepends="dos2unix gradle openjdk11"
 depends="openjdk11"
 short_desc="Advanced PCB autorouter"
@@ -21,7 +21,7 @@ post_extract() {
 }
 
 do_build() {
-	. /etc/profile.d/10_openjdk11.sh
+	. /etc/profile.d/openjdk.sh
 	gradle assemble
 }
 

From 5b161aa0006822d579b17e800e6f8ea28eaebd3c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:39 -0400
Subject: [PATCH 2026/2561] java-commons-io: fix name of
 etc/profile.d/10_openjdk*.sh in template

---
 srcpkgs/java-commons-io/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/java-commons-io/template b/srcpkgs/java-commons-io/template
index e91dcc87b8b5..5b8413e2a03d 100644
--- a/srcpkgs/java-commons-io/template
+++ b/srcpkgs/java-commons-io/template
@@ -2,7 +2,7 @@
 _origname=commons-io
 pkgname=java-commons-io
 version=2.6
-revision=2
+revision=3
 wrksrc="${_origname}-${version}-src"
 hostmakedepends="openjdk8 apache-maven which"
 depends="virtual?java-runtime"
@@ -19,7 +19,7 @@ case "$XBPS_MACHINE" in
 esac
 
 do_build() {
-	source /etc/profile.d/10_openjdk8.sh
+	source /etc/profile.d/openjdk.sh
 	mvn package -Dmaven.test.skip=true
 }
 

From 5d110f2fc41ccafb62ecad298a7afdeeab1c0dba Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:39 -0400
Subject: [PATCH 2027/2561] jedit: fix name of /etc/profile.d/10_openjdk*.sh,
 hard-code openjdk11

---
 srcpkgs/jedit/files/jedit | 4 +---
 srcpkgs/jedit/template    | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/jedit/files/jedit b/srcpkgs/jedit/files/jedit
index 622bb9171864..706d2f8dd45c 100644
--- a/srcpkgs/jedit/files/jedit
+++ b/srcpkgs/jedit/files/jedit
@@ -1,10 +1,8 @@
 #!/bin/sh
 
 # openjdk11 is required
-. /etc/profile.d/10_openjdk11.sh
-
 # default to gtk3, use antialiased fonts
-exec "${JAVA_HOME}/bin/java" \
+exec "/usr/lib/jvm/openjdk11/bin/java" \
     -Djdk.gtk.version=3 \
     -Dawt.useSystemAAFontSettings=on \
     -Dswing.aatext=true \
diff --git a/srcpkgs/jedit/template b/srcpkgs/jedit/template
index cf7ac8cdd201..19ca4ac3df1f 100644
--- a/srcpkgs/jedit/template
+++ b/srcpkgs/jedit/template
@@ -1,7 +1,7 @@
 # Template file for 'jedit'
 pkgname=jedit
 version=5.6.0
-revision=1
+revision=2
 wrksrc=jEdit
 hostmakedepends="apache-ant openjdk11 docbook-xsl"
 depends="openjdk11 desktop-file-utils"
@@ -19,7 +19,7 @@ post_patch() {
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh
-	. /etc/profile.d/10_openjdk11.sh
+	. /etc/profile.d/openjdk.sh
 
 	ant -propertyfile ${FILESDIR}/build.properties build
 	ant -propertyfile ${FILESDIR}/build.properties docs-html

From e6d3160a0edec85dd232f9aac73a5047cac2f467 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:40 -0400
Subject: [PATCH 2028/2561] kodi: fix name of etc/profile.d/10_openjdk*.sh in
 template

---
 srcpkgs/kodi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index da81c7e2d0a5..b4eeacdab624 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=19.4
-revision=1
+revision=2
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -111,7 +111,7 @@ pre_configure() {
 		xargs sed -i  -e "s;-isystem;-I;g"
 	fi
 
-	. /etc/profile.d/10_openjdk11.sh
+	. /etc/profile.d/openjdk.sh
 
 	# Build tools needed to run on the host
 	if [ "$CROSS_BUILD" ]; then

From 548b25bb232e114ea90fafe254849592c45c295e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:40 -0400
Subject: [PATCH 2029/2561] lightzone: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/lightzone/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightzone/template b/srcpkgs/lightzone/template
index 13242f01cc77..261626fb9dff 100644
--- a/srcpkgs/lightzone/template
+++ b/srcpkgs/lightzone/template
@@ -1,7 +1,7 @@
 # Template file for 'lightzone'
 pkgname=lightzone
 version=4.2.2
-revision=1
+revision=2
 _ivy_version=2.4.0
 wrksrc=LightZone-${version}
 hostmakedepends="automake git openjdk11 apache-ant javahelp2 rsync pkg-config"
@@ -29,7 +29,7 @@ do_build() {
 	vsed -i lightcrafts/jnisrc/tiff/GNUmakefile \
 		-e "s;\./configure;& --host=${XBPS_MACHINE%-musl};"
 
-	. /etc/profile.d/10_openjdk11.sh
+	. /etc/profile.d/openjdk.sh
 	cd linux
 	TARGET=${XBPS_TARGET_MACHINE%-musl} ant jar
 }

From a21a638a61d3928b800b6e583998368c4df43062 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 2 Apr 2022 22:28:44 -0400
Subject: [PATCH 2030/2561] plantuml: fix name of etc/profile.d/10_openjdk*.sh
 in template

---
 srcpkgs/plantuml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plantuml/template b/srcpkgs/plantuml/template
index fff4ec18b203..85259ce2ca6b 100644
--- a/srcpkgs/plantuml/template
+++ b/srcpkgs/plantuml/template
@@ -2,7 +2,7 @@
 pkgname=plantuml
 reverts="8047_1 8053_1 8059_1"
 version=1.2021.14
-revision=1
+revision=2
 create_wrksrc=yes
 hostmakedepends="apache-ant openjdk8"
 depends="virtual?java-environment graphviz"
@@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/plantuml/plantuml-gplv2-${version}.tar.gz"
 checksum=468aeaaea0742d8312d0f2f709df140e599967d8284fc0555f842fd0a6fe6941
 
 do_build() {
-	. /etc/profile.d/10_openjdk8.sh
+	. /etc/profile.d/openjdk.sh
 	. /etc/profile.d/apache-ant.sh
 	ant
 	mv ${pkgname}.jar ${pkgname}-${version}.jar

From 6eb62252fe1f05d94cce46a317343e1c04a54ca1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 5 May 2022 00:01:06 -0400
Subject: [PATCH 2031/2561] apache-maven: fix distfiles

---
 srcpkgs/apache-maven/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template
index cc1e3e561634..e793e240b2c0 100644
--- a/srcpkgs/apache-maven/template
+++ b/srcpkgs/apache-maven/template
@@ -8,8 +8,8 @@ short_desc="Software project management and comprehension tool"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://maven.apache.org/"
-distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/source/${pkgname}-${version}-src.tar.gz
- https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz"
+distfiles="https://dlcdn.apache.org/maven/maven-3/${version}/source/${pkgname}-${version}-src.tar.gz
+ https://dlcdn.apache.org/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz"
 checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07
  26ad91d751b3a9a53087aefa743f4e16a17741d3915b219cf74112bf87a438c5"
 replaces="apache-maven-bin>=0"

From 7d2538d922d5e7193f3cf46a2cc3fdb58227ef21 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 5 May 2022 00:09:42 -0400
Subject: [PATCH 2032/2561] apache-fop: fix distfiles

---
 srcpkgs/apache-fop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache-fop/template b/srcpkgs/apache-fop/template
index 3b7c917a7c09..82997c3555dc 100644
--- a/srcpkgs/apache-fop/template
+++ b/srcpkgs/apache-fop/template
@@ -10,8 +10,8 @@ short_desc="Java print formatter driven by XSL formatting objects (XSL-FO)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="http://xmlgraphics.apache.org/fop/"
-distfiles="http://mirror.dkd.de/apache/xmlgraphics/fop/source/fop-${version}-src.tar.gz
- http://mirror.dkd.de/apache/xmlgraphics/fop/binaries/fop-${version}-bin.tar.gz"
+distfiles="https://archive.apache.org/dist/xmlgraphics/fop/source/fop-${version}-src.tar.gz
+ https://archive.apache.org/dist/xmlgraphics/fop/binaries/fop-${version}-bin.tar.gz"
 checksum="783077318139d581d5f485566d1b08bfc576003c53cfbf5beaeba503a24b4005
  6a3c5f8915be5ef90fff202c818152d8252bb45b96d9c5d6550594903739e5ed"
 conf_files="/etc/fop.conf"

From 59a1d5b535013782c7c88f341ea912d8b1b0f88f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 5 May 2022 00:34:26 -0400
Subject: [PATCH 2033/2561] bibletime: explicitly require JRE to ensure profile
 is available to source

---
 srcpkgs/bibletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bibletime/template b/srcpkgs/bibletime/template
index af3301e02365..d8be23d33be6 100644
--- a/srcpkgs/bibletime/template
+++ b/srcpkgs/bibletime/template
@@ -8,8 +8,8 @@ revision=3
 build_style=cmake
 configure_args="-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=/usr/share/xsl/docbook/html/chunk.xsl
  -DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=/usr/share/xsl/docbook/fo/docbook.xsl"
-hostmakedepends="pkg-config qt5-host-tools qt5-qmake apache-fop po4a
- docbook-xsl docbook-xml libxslt"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake openjdk8-jre apache-fop
+ po4a docbook-xsl docbook-xml libxslt"
 makedepends="clucene-devel libcurl-devel qt5-devel qt5-tools-devel
  qt5-svg-devel qt5-webkit-devel sword-devel zlib-devel qt5-declarative-devel"
 short_desc="Powerful cross platform Bible study tool"

From 135bbf31e171217f2a72b0b3d7a73094f1303722 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 5 May 2022 01:05:08 -0400
Subject: [PATCH 2034/2561] freeplane: mark broken

---
 srcpkgs/freeplane/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index fa4eeb5e80ba..67a233224e9a 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -11,6 +11,7 @@ license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="https://github.com/freeplane/freeplane/archive/release-${version}.tar.gz"
 checksum=200002b5cbe3e3286a7595847d28356d3efd8498ff930fa05e5e90af622e544f
+broken="https://build.voidlinux.org/builders/x86_64_builder/builds/37505/steps/shell_3/logs/stdio"
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root

From d722db310b3b5f409d4bffbd9da7afd61adacfc0 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Wed, 4 May 2022 22:48:32 +0200
Subject: [PATCH 2035/2561] mat2: update to 0.12.4.

---
 srcpkgs/mat2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mat2/template b/srcpkgs/mat2/template
index 8ee8a477aa2a..5a662f0b45ec 100644
--- a/srcpkgs/mat2/template
+++ b/srcpkgs/mat2/template
@@ -1,6 +1,6 @@
 # Template file for 'mat2'
 pkgname=mat2
-version=0.12.3
+version=0.12.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,4 +10,4 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="LGPL-3.0-or-later"
 homepage="https://0xacab.org/jvoisin/mat2"
 distfiles="https://0xacab.org/jvoisin/mat2/-/archive/${version}/mat2-${version}.tar.gz"
-checksum=6e7e8a87a0932a890455626d8b73e9c52288bc30761cce46bd17c60815e8bb54
+checksum=00c163bf05cc5d282e420dbf53113ae48a63e1cace90dc1d0ca44e23005d28a5

From fcaed3290910f4f1f4d0fb249a1a536f8a542edb Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 5 May 2022 09:13:48 +0200
Subject: [PATCH 2036/2561] opendht: update to 2.4.4.

---
 srcpkgs/opendht/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opendht/template b/srcpkgs/opendht/template
index c24ee3c55943..ebdbdde002cf 100644
--- a/srcpkgs/opendht/template
+++ b/srcpkgs/opendht/template
@@ -1,6 +1,6 @@
 # Template file for 'opendht'
 pkgname=opendht
-version=2.3.1
+version=2.4.4
 revision=1
 build_style=cmake
 configure_args="-DOPENDHT_SYSTEMD=OFF -DOPENDHT_TOOLS=OFF
@@ -12,7 +12,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/savoirfairelinux/opendht"
 distfiles="https://github.com/savoirfairelinux/opendht/archive/refs/tags/${version}.tar.gz"
-checksum=9a75db4f119761d6524964b27d3a49aa809a6cb08bde963edc2f338458433c78
+checksum=a4b452423f9a55f3c53ceaeeb43ec50f2747fdc89a546caa74cd79b93b6ede08
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f5259207dfb69e77ecff9c6b55fb16fb7e86c582 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Thu, 5 May 2022 09:14:07 +0200
Subject: [PATCH 2037/2561] qtox: update to 1.17.6.

---
 srcpkgs/qtox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtox/template b/srcpkgs/qtox/template
index f3fa78acb915..63d1196bd1aa 100644
--- a/srcpkgs/qtox/template
+++ b/srcpkgs/qtox/template
@@ -1,6 +1,6 @@
 # Template file for 'qtox'
 pkgname=qtox
-version=1.17.4
+version=1.17.6
 revision=1
 wrksrc="qTox-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.tox.chat/clients/qtox"
 changelog="https://raw.githubusercontent.com/qTox/qTox/master/CHANGELOG.md"
 distfiles="https://github.com/qTox/qTox/archive/v${version}.tar.gz"
-checksum=3d2fe2a344c83c50e6603d2a4070f2cc0c6ccd13fa5e77457eff96f57ee6f8c2
+checksum=cd0781241b4ea536da90ce8c72ad9f2aa9bbdf9fbae5d38ee645e30d790fa7f2
 
 build_options="snorenotify"
 build_options_default="snorenotify"

From 6abe8038aefb8dd2d6b6d77cbce3959a34c441b9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 5 May 2022 10:59:26 -0500
Subject: [PATCH 2038/2561] yara: update to 4.2.1.

---
 srcpkgs/yara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index fe171d75b35d..df2a2f39937f 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.2.0
+version=4.2.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
@@ -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=6f567d4e4b79a210cd57a820f59f19ee69b024188ef4645b1fc11488a4660951
+checksum=f26d9c481e6789181431ac410665f6ba25d551c2948995f84c9e17df7a93731a
 
 pre_configure() {
 	autoreconf -fi

From eaefa647ed85a44acd5280717ecc402a7ec2db3e Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 5 May 2022 11:00:00 -0500
Subject: [PATCH 2039/2561] sqlmap: update to 1.6.5.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index 74ce3a2ca71e..67335427c811 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.4
+version=1.6.5
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=14585e4fc95006467e52685c4838f024654d7e23cbd84eb12762a55918b8d561
+checksum=534194953d8a95ff1d28d1a19f9b2c1b6d021fe9bc3ea7368ecab2084ceba714
 python_version=3
 
 do_install() {

From cc1da059590536b95b7c93007e831fb197b39a38 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 5 May 2022 11:01:59 -0500
Subject: [PATCH 2040/2561] python3-rich: update to 12.3.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 c3de71a5749a..f9cd79d81ea9 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=12.2.0
+version=12.3.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=ea74bc9dad9589d8eea3e3fd0b136d8bf6e428888955f215824c2894f0da8b47
+checksum=7e8700cda776337036a712ff0495b04052fb5f957c7dfb8df997f88350044b64
 make_check=extended # some checks only work on windows
 
 post_install() {

From e166313e0c9b17a77968bdcddf157ad6de2c5423 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 5 May 2022 11:06:29 -0500
Subject: [PATCH 2041/2561] jc: update to 1.18.8.

---
 srcpkgs/jc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index 992b2ebc206c..24a52a65f655 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,6 +1,6 @@
 # Template file for 'jc'
 pkgname=jc
-version=1.18.7
+version=1.18.8
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/kellyjonbrazil/jc"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=eece56f592b04ddd19fb1fbac3ac6f0b27d6a731a05fb902813ccf0c0c78510d
+checksum=a2cb40099cec38961477fbbbe14a8c3f41c9d3998e4cc402d9ae3d21171ff924

From 89e493dc4b1125978976aa6f9365532cc1da80ff Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 5 May 2022 11:07:15 -0500
Subject: [PATCH 2042/2561] python3-youtubesearch: update to 1.6.5.

---
 srcpkgs/python3-youtubesearch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 822d7eb70ee4..494188c3a466 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
-version=1.6.4
+version=1.6.5
 revision=1
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/alexmercerind/youtube-search-python"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=a9dcc4536fd839beb29b12d93e59fb92b294a0d83b94b882b16a445158d1f8da
+checksum=5e47c2bd09829aa830bc7f855693c20dfe49d2390c3041b0a44422cc743b3f00
 make_check=no # no tests defined
 
 post_install() {

From 5ec34a44f7c26da3e7917583ccd7de2fcb358da3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 May 2022 17:15:40 +0200
Subject: [PATCH 2043/2561] firefox: update to 100.0.

---
 srcpkgs/firefox/patches/fix-build-tier3.patch | 366 ------------------
 srcpkgs/firefox/patches/sndio.patch           |  52 ---
 srcpkgs/firefox/template                      |   8 +-
 3 files changed, 4 insertions(+), 422 deletions(-)
 delete mode 100644 srcpkgs/firefox/patches/fix-build-tier3.patch
 delete mode 100644 srcpkgs/firefox/patches/sndio.patch

diff --git a/srcpkgs/firefox/patches/fix-build-tier3.patch b/srcpkgs/firefox/patches/fix-build-tier3.patch
deleted file mode 100644
index c7f5b7ea1f7b..000000000000
--- a/srcpkgs/firefox/patches/fix-build-tier3.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-commit 8a0c895dee94b3c15e56557eb1dd0114477a6056
-Author: q66 <daniel@octaforge.org>
-Date:   Sun Apr 10 00:38:30 2022 +0200
-
-    fix build on tier 3 platforms
-    
-    https://bugzilla.mozilla.org/show_bug.cgi?id=1758610
-
-diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-index 0fa127b..78c8961 100644
---- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
-@@ -814,7 +814,7 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
- #  ifdef MOZ_WAYLAND_USE_VAAPI
-     // Create VideoFramePool in case we need it.
-     if (!mVideoFramePool && mEnableHardwareDecoding) {
--      mVideoFramePool = MakeUnique<VideoFramePool>();
-+      mVideoFramePool = MakeUnique<VideoFramePool<LIBAV_VER>>();
-     }
- 
-     // Release unused VA-API surfaces before avcodec_receive_frame() as
-diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
-index b1a2f73..c77d76f 100644
---- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
-+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
-@@ -16,6 +16,9 @@
- #if LIBAVCODEC_VERSION_MAJOR >= 57 && LIBAVUTIL_VERSION_MAJOR >= 56
- #  include "mozilla/layers/TextureClient.h"
- #endif
-+#ifdef MOZ_WAYLAND_USE_VAAPI
-+#  include "FFmpegVideoFramePool.h"
-+#endif
- 
- struct _VADRMPRIMESurfaceDescriptor;
- typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor;
-@@ -23,7 +26,6 @@ typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor;
- namespace mozilla {
- 
- class ImageBufferWrapper;
--class VideoFramePool;
- 
- template <int V>
- class FFmpegVideoDecoder : public FFmpegDataDecoder<V> {};
-@@ -138,7 +140,7 @@ class FFmpegVideoDecoder<LIBAV_VER>
-   AVBufferRef* mVAAPIDeviceContext;
-   bool mEnableHardwareDecoding;
-   VADisplay mDisplay;
--  UniquePtr<VideoFramePool> mVideoFramePool;
-+  UniquePtr<VideoFramePool<LIBAV_VER>> mVideoFramePool;
-   static nsTArray<AVCodecID> mAcceleratedFormats;
- #endif
-   RefPtr<KnowsCompositor> mImageAllocator;
-diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
-index 7943e09..673b3fc 100644
---- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
-+++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
-@@ -5,6 +5,7 @@
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
- #include "FFmpegVideoFramePool.h"
-+#include "PlatformDecoderModule.h"
- #include "FFmpegLog.h"
- #include "mozilla/widget/DMABufLibWrapper.h"
- #include "libavutil/pixfmt.h"
-@@ -15,11 +16,11 @@
- 
- namespace mozilla {
- 
--RefPtr<layers::Image> VideoFrameSurfaceVAAPI::GetAsImage() {
-+RefPtr<layers::Image> VideoFrameSurface<LIBAV_VER>::GetAsImage() {
-   return new layers::DMABUFSurfaceImage(mSurface);
- }
- 
--VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface)
-+VideoFrameSurface<LIBAV_VER>::VideoFrameSurface(DMABufSurface* aSurface)
-     : mSurface(aSurface),
-       mLib(nullptr),
-       mAVHWFramesContext(nullptr),
-@@ -30,22 +31,22 @@ VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface)
-   MOZ_ASSERT(mSurface);
-   MOZ_RELEASE_ASSERT(mSurface->GetAsDMABufSurfaceYUV());
-   mSurface->GlobalRefCountCreate();
--  FFMPEG_LOG("VideoFrameSurfaceVAAPI: creating surface UID = %d",
-+  FFMPEG_LOG("VideoFrameSurface: creating surface UID = %d",
-              mSurface->GetUID());
- }
- 
--void VideoFrameSurfaceVAAPI::LockVAAPIData(AVCodecContext* aAVCodecContext,
--                                           AVFrame* aAVFrame,
--                                           FFmpegLibWrapper* aLib) {
--  FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI locking dmabuf surface UID = %d",
-+void VideoFrameSurface<LIBAV_VER>::LockVAAPIData(AVCodecContext* aAVCodecContext,
-+                                                 AVFrame* aAVFrame,
-+                                                 FFmpegLibWrapper* aLib) {
-+  FFMPEG_LOG("VideoFrameSurface: VAAPI locking dmabuf surface UID = %d",
-              mSurface->GetUID());
-   mLib = aLib;
-   mAVHWFramesContext = aLib->av_buffer_ref(aAVCodecContext->hw_frames_ctx);
-   mHWAVBuffer = aLib->av_buffer_ref(aAVFrame->buf[0]);
- }
- 
--void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) {
--  FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI releasing dmabuf surface UID = %d",
-+void VideoFrameSurface<LIBAV_VER>::ReleaseVAAPIData(bool aForFrameRecycle) {
-+  FFMPEG_LOG("VideoFrameSurface: VAAPI releasing dmabuf surface UID = %d",
-              mSurface->GetUID());
- 
-   // It's possible to unref GPU data while IsUsed() is still set.
-@@ -67,43 +68,43 @@ void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) {
-   }
- }
- 
--VideoFrameSurfaceVAAPI::~VideoFrameSurfaceVAAPI() {
--  FFMPEG_LOG("VideoFrameSurfaceVAAPI: deleting dmabuf surface UID = %d",
-+VideoFrameSurface<LIBAV_VER>::~VideoFrameSurface() {
-+  FFMPEG_LOG("VideoFrameSurface: deleting dmabuf surface UID = %d",
-              mSurface->GetUID());
-   // We're about to quit, no need to recycle the frames.
-   ReleaseVAAPIData(/* aForFrameRecycle */ false);
- }
- 
--VideoFramePool::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {}
-+VideoFramePool<LIBAV_VER>::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {}
- 
--VideoFramePool::~VideoFramePool() {
-+VideoFramePool<LIBAV_VER>::~VideoFramePool() {
-   MutexAutoLock lock(mSurfaceLock);
-   mDMABufSurfaces.Clear();
- }
- 
--void VideoFramePool::ReleaseUnusedVAAPIFrames() {
-+void VideoFramePool<LIBAV_VER>::ReleaseUnusedVAAPIFrames() {
-   MutexAutoLock lock(mSurfaceLock);
-   for (const auto& surface : mDMABufSurfaces) {
--    auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI();
--    if (!vaapiSurface->IsUsed()) {
--      vaapiSurface->ReleaseVAAPIData();
-+    if (!surface->IsUsed()) {
-+      surface->ReleaseVAAPIData();
-     }
-   }
- }
- 
--RefPtr<VideoFrameSurface> VideoFramePool::GetFreeVideoFrameSurface() {
-+RefPtr<VideoFrameSurface<LIBAV_VER>>
-+VideoFramePool<LIBAV_VER>::GetFreeVideoFrameSurface() {
-   for (auto& surface : mDMABufSurfaces) {
-     if (surface->IsUsed()) {
-       continue;
-     }
--    auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI();
--    vaapiSurface->ReleaseVAAPIData();
-+    surface->ReleaseVAAPIData();
-     return surface;
-   }
-   return nullptr;
- }
- 
--RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
-+RefPtr<VideoFrameSurface<LIBAV_VER>>
-+VideoFramePool<LIBAV_VER>::GetVideoFrameSurface(
-     VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext,
-     AVFrame* aAVFrame, FFmpegLibWrapper* aLib) {
-   if (aVaDesc.fourcc != VA_FOURCC_NV12 && aVaDesc.fourcc != VA_FOURCC_YV12 &&
-@@ -113,7 +114,7 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
-   }
- 
-   MutexAutoLock lock(mSurfaceLock);
--  RefPtr<VideoFrameSurface> videoSurface = GetFreeVideoFrameSurface();
-+  RefPtr<VideoFrameSurface<LIBAV_VER>> videoSurface = GetFreeVideoFrameSurface();
-   if (!videoSurface) {
-     RefPtr<DMABufSurfaceYUV> surface =
-         DMABufSurfaceYUV::CreateYUVSurface(aVaDesc);
-@@ -121,7 +122,7 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
-       return nullptr;
-     }
-     FFMPEG_LOG("Created new VA-API DMABufSurface UID = %d", surface->GetUID());
--    RefPtr<VideoFrameSurfaceVAAPI> surf = new VideoFrameSurfaceVAAPI(surface);
-+    RefPtr<VideoFrameSurface<LIBAV_VER>> surf = new VideoFrameSurface<LIBAV_VER>(surface);
-     if (!mTextureCreationWorks) {
-       mTextureCreationWorks = Some(surface->VerifyTextureCreation());
-     }
-@@ -138,11 +139,8 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
-     }
-     FFMPEG_LOG("Reusing VA-API DMABufSurface UID = %d", surface->GetUID());
-   }
--
--  auto* vaapiSurface = videoSurface->AsVideoFrameSurfaceVAAPI();
--  vaapiSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
--  vaapiSurface->MarkAsUsed();
--
-+  videoSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
-+  videoSurface->MarkAsUsed();
-   return videoSurface;
- }
- 
-diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
-index c506d22..c89b418 100644
---- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
-+++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
-@@ -7,8 +7,9 @@
- #ifndef __FFmpegVideoFramePool_h__
- #define __FFmpegVideoFramePool_h__
- 
--#include "FFmpegVideoDecoder.h"
- #include "FFmpegLibWrapper.h"
-+#include "FFmpegLibs.h"
-+#include "FFmpegLog.h"
- 
- #include "mozilla/layers/DMABUFSurfaceImage.h"
- #include "mozilla/widget/DMABufLibWrapper.h"
-@@ -16,43 +17,16 @@
- 
- namespace mozilla {
- 
--class VideoFramePool;
--class VideoFrameSurfaceVAAPI;
--
--class VideoFrameSurface {
-- public:
--  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface)
--
--  VideoFrameSurface() = default;
--
--  virtual VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() { return nullptr; }
--
--  virtual void SetYUVColorSpace(gfx::YUVColorSpace aColorSpace) = 0;
--  virtual void SetColorRange(gfx::ColorRange aColorRange) = 0;
--
--  virtual RefPtr<DMABufSurfaceYUV> GetDMABufSurface() { return nullptr; };
--  virtual RefPtr<layers::Image> GetAsImage() = 0;
--
--  // Don't allow VideoFrameSurface plain copy as it leads to
--  // unexpected DMABufSurface/HW buffer releases and we don't want to
--  // deep copy them.
--  VideoFrameSurface(const VideoFrameSurface&) = delete;
--  const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete;
--
-- protected:
--  virtual ~VideoFrameSurface(){};
--};
--
--// VideoFrameSurfaceVAAPI holds a reference to GPU data with a video frame.
-+// VideoFrameSurface holds a reference to GPU data with a video frame.
- //
- // Actual GPU pixel data are stored at DMABufSurface and
- // DMABufSurface is passed to gecko GL rendering pipeline via.
- // DMABUFSurfaceImage.
- //
--// VideoFrameSurfaceVAAPI can optionally hold VA-API ffmpeg related data to keep
-+// VideoFrameSurface can optionally hold VA-API ffmpeg related data to keep
- // GPU data locked untill we need them.
- //
--// VideoFrameSurfaceVAAPI is used for both HW accelerated video decoding
-+// VideoFrameSurface is used for both HW accelerated video decoding
- // (VA-API) and ffmpeg SW decoding.
- //
- // VA-API scenario
-@@ -72,13 +46,24 @@ class VideoFrameSurface {
- // Unfortunately there isn't any obvious way how to mark particular VASurface
- // as used. The best we can do is to hold a reference to particular AVBuffer
- // from decoded AVFrame and AVHWFramesContext which owns the AVBuffer.
--class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
--  friend class VideoFramePool;
-+template <int V>
-+class VideoFrameSurface {};
-+template <>
-+class VideoFrameSurface<LIBAV_VER>;
-+
-+template <int V>
-+class VideoFramePool {};
-+template <>
-+class VideoFramePool<LIBAV_VER>;
-+
-+template <>
-+class VideoFrameSurface<LIBAV_VER> {
-+  friend class VideoFramePool<LIBAV_VER>;
- 
-  public:
--  explicit VideoFrameSurfaceVAAPI(DMABufSurface* aSurface);
-+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface)
- 
--  VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() final { return this; }
-+  explicit VideoFrameSurface(DMABufSurface* aSurface);
- 
-   void SetYUVColorSpace(mozilla::gfx::YUVColorSpace aColorSpace) {
-     mSurface->GetAsDMABufSurfaceYUV()->SetYUVColorSpace(aColorSpace);
-@@ -93,6 +78,12 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
- 
-   RefPtr<layers::Image> GetAsImage();
- 
-+  // Don't allow VideoFrameSurface plain copy as it leads to
-+  // unexpected DMABufSurface/HW buffer releases and we don't want to
-+  // deep copy them.
-+  VideoFrameSurface(const VideoFrameSurface&) = delete;
-+  const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete;
-+
-  protected:
-   // Lock VAAPI related data
-   void LockVAAPIData(AVCodecContext* aAVCodecContext, AVFrame* aAVFrame,
-@@ -107,7 +98,7 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
-   void MarkAsUsed() { mSurface->GlobalRefAdd(); }
- 
-  private:
--  virtual ~VideoFrameSurfaceVAAPI();
-+  virtual ~VideoFrameSurface();
- 
-   const RefPtr<DMABufSurface> mSurface;
-   const FFmpegLibWrapper* mLib;
-@@ -116,23 +107,24 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
- };
- 
- // VideoFramePool class is thread-safe.
--class VideoFramePool final {
-+template <>
-+class VideoFramePool<LIBAV_VER> {
-  public:
-   VideoFramePool();
-   ~VideoFramePool();
- 
--  RefPtr<VideoFrameSurface> GetVideoFrameSurface(
-+  RefPtr<VideoFrameSurface<LIBAV_VER>> GetVideoFrameSurface(
-       VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext,
-       AVFrame* aAVFrame, FFmpegLibWrapper* aLib);
-   void ReleaseUnusedVAAPIFrames();
- 
-  private:
--  RefPtr<VideoFrameSurface> GetFreeVideoFrameSurface();
-+  RefPtr<VideoFrameSurface<LIBAV_VER>> GetFreeVideoFrameSurface();
- 
-  private:
-   // Protect mDMABufSurfaces pool access
-   Mutex mSurfaceLock;
--  nsTArray<RefPtr<VideoFrameSurfaceVAAPI>> mDMABufSurfaces;
-+  nsTArray<RefPtr<VideoFrameSurface<LIBAV_VER>>> mDMABufSurfaces;
-   // We may fail to create texture over DMABuf memory due to driver bugs so
-   // check that before we export first DMABuf video frame.
-   Maybe<bool> mTextureCreationWorks;
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-index de2611e..8ffdaae 100644
---- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
-@@ -30,6 +30,9 @@ if CONFIG['MOZ_WAYLAND']:
-   CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
-   DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
-   USE_LIBS += ['mozva']
-+  UNIFIED_SOURCES += [
-+    '../FFmpegVideoFramePool.cpp',
-+  ]
- 
- include("/ipc/chromium/chromium-config.mozbuild")
- 
-diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-index 7d28420..1da28a1 100644
---- a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-+++ b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
-@@ -30,6 +30,9 @@ if CONFIG["MOZ_WAYLAND"]:
-     CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
-     DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1
-     USE_LIBS += ["mozva"]
-+    UNIFIED_SOURCES += [
-+        "../FFmpegVideoFramePool.cpp",
-+    ]
- 
- include("/ipc/chromium/chromium-config.mozbuild")
- 
diff --git a/srcpkgs/firefox/patches/sndio.patch b/srcpkgs/firefox/patches/sndio.patch
deleted file mode 100644
index fa3b6fa8ab6b..000000000000
--- a/srcpkgs/firefox/patches/sndio.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/old-configure.in
-+++ b/old-configure.in
-@@ -2818,6 +2818,22 @@
-     _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
- fi
- 
-+dnl ==================================
-+dnl = Check sndio availability
-+dnl ==================================
-+
-+MOZ_ARG_ENABLE_BOOL(sndio,
-+[  --enable-sndio         Enable sndio support],
-+   MOZ_SNDIO=1,
-+   MOZ_SNDIO=)
-+
-+if test -n "$MOZ_SNDIO"; then
-+    MOZ_SNDIO_LIBS="-lsndio"
-+    AC_SUBST_LIST(MOZ_SNDIO_LIBS)
-+fi
-+
-+AC_SUBST(MOZ_SNDIO)
-+
- dnl ========================================================
- dnl =
- dnl = Maintainer debug option (no --enable equivalent)
---- a/media/libcubeb/src/moz.build
-+++ b/media/libcubeb/src/moz.build
-@@ -44,11 +44,13 @@
-     ]
-     DEFINES['USE_JACK'] = True
- 
--if CONFIG['OS_ARCH'] == 'OpenBSD':
-+if CONFIG['MOZ_SNDIO']:
-     SOURCES += [
-         'cubeb_sndio.c',
-     ]
-     DEFINES['USE_SNDIO'] = True
-+
-+if CONFIG['OS_ARCH'] == 'OpenBSD':
-     DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True
- 
- if CONFIG['OS_TARGET'] == 'Darwin':
---- a/build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
-+++ b/build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
-@@ -88,6 +88,7 @@
- @old_configure_options(
-     "--cache-file",
-     "--datadir",
-+    "--enable-sndio",
-     "--enable-official-branding",
-     "--includedir",
-     "--libdir",
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8ee3b78f809b..021bb6aee82b 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=99.0
+version=100.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327
+checksum=664c0cc4e0fb70886aa4e652d144996045d533a18eebc7d61093103cbb2d5e7f
 
 lib32disabled=yes
 
@@ -172,7 +172,7 @@ do_build() {
 	export MOZ_MAKE_FLAGS="${makejobs}"
 	export MOZ_NOSPAM=1
 	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
-	export MACH_USE_SYSTEM_PYTHON=1
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 
 	export AS=$CC
 
@@ -191,7 +191,7 @@ ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' '
 	./mach build
 }
 do_install() {
-	export MACH_USE_SYSTEM_PYTHON=1
+	export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
 	export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild"
 	DESTDIR="$DESTDIR" ./mach install
 

From 5907d6f58d72eaa1fb707faa49f8525554d6aa42 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 4 May 2022 17:18:04 +0200
Subject: [PATCH 2044/2561] firefox-i18n: update to 100.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 0e98d438bd21..f13acdfd6d5d 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=99.0
+version=100.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="e398f1b14ae79fcd74639a81b27c4cd38b09282ca625d1b72c69df09fc4ec1fc
- a8cbef3ba5c35e33c0f1e02dcd2781cc362315d5b63e9e6065a22afbe460581f
- 35b4f32eabd40875d518cb174858bb6d8ecff272f4ee677e0c108d8395707960
- 4f1a97c404347121c53799efd2a986860e030b7789e66e252d92b6a78012b681
- 580e9e9fde913ce410774d366bad95af3a67df52c688a6ad64ad59e8d33eab47
- 91236c6ecd7ee99927d5b69566cc30f4b1de6e7caca3336386f3e7bb995c96e2
- fa36e967b14e530993e3a50fcdc5f32e686f5b110f6cdee59b8c555c82294517
- c88a65b1f3c10085b0d5236a3e687b70cd9a620803393caf81b4ee0677330ef0
- c12d138948d4e5cebce1051f0cc750f8f9bfb23f733417e7e7b9596ee74a6980
- e4b9cdcb7c08beceecfef7d8b94d70a24e3f24404c73cd7cf5aed6572e293bf6
- 75d09dfb5c0b55b670c912feecd48bfdc7f936f31c41d8e4b2ede0e46d16f749
- 8780f97e115fbe8f156412757d1980517b85dc409fbbc8e0266bdcc7d0568c83
- 815c9a81efce33b19b9bcabd46093ea92bd062698575c83ea127f20a3495c984
- 76e9a327a69960f4ebd857b5b204d435d60461b7129aa70db90ebb28411ffaee
- 8fdd5adfec75310172819a959a2b68ad3ecb614c94298be315804e730b43a160
- 8947c35c94f08bbb61a3beb8b106a776d0f0a3b2f247b9e49619ab9b9416bb19
- 7851a711a8de28c6e6c3c07814ef995263f4c3a48981742f1aa481389dab3897
- 8bb525f9045c91b3f539103eb398da1d1f71a580971a1adcc780198da36a2623
- 04cfc4a69fba8f3838d385179511954277cf1f6d8243663f338941c1e86a49ca
- cd9f142ac06d16919b5f1102ae53f1241574057c75012198fe1dbdb7a8d63a8c
- 8ff53385252becfbc2f15354ea57b873251584444129c137350e974dc488318c
- 9a58559be92950e33051625e49dd3f5bae36c225b9a7030bec9a6aa78d45ba93
- 6e0f538d93f8b2d189c667c2aac37c6d1eb50fb802c4ee2ff310db15da57de56
- 2c051ea90460cda20296b1a69037e037b82258fe382c9031594974e75cbc10eb
- 053dfbb9ad0feb3b54cab94bd8f5ac544ec598f9b819a7d163496f838104b8a5
- faa25b7302f249b9aaea768a7cf61f78f67e3637e9a62906361a1fae257d0161
- 54f02a1e948d2944b3889152b093200a0d31358df28f7309e5fb5d490616d317
- 7c104e3c70024163fc0fe7597df0a995b2e813319dc23268fe36e04f09f2ced7
- 2cf6b8e82042208407bfdbad01a3d5113c87f0bd37acb082452f1f6c22bf1485
- da05a0fe7a65ce243f0ec69ad60d93a3bc988383f983343a66b399a2de1a10a0
- 13da03264b7d522bcbb77cfb1fece6606f9efe742822325ced7627fe28add070
- 0d835b249070428d8d5e1c251ab46b19df71cc2858b69843a41eee897c27b396
- 5dbbe35e45b15dca15ba5de15aa55b4fce44d33fb456ca8184270c0f162567d7
- 9e6b2c13f0c2347fe27e189dea6dd8a3c5b23aaac668010213258bd26e0d3da7
- 1aa07979f8bb7d6039a11f64b3c93b3c70332def967af6fb426897b7c65fdba2
- c21b99ea6049d498bb446770801e3c9f8041bd11e0ae8164bd16a016f14f5578
- ed537abf79efa484fc920902d59ea1b840c6acf6fa540f435722f5c75a1bca90
- e9517bb3330ec5cb2a743dd56a69c912a35b6dafe6a7abeadfe1532a17963549
- cf97f81502f30c807fde8127c6f8ac1a9ea58508ba8d243ea0d6fbabe2ddc8b1
- 85b90f53e79bc2961b3f0c702ba5762ba7559c366d7682bc66b20514769c2a92
- bd31d635b44f039ad2f89e4ad1cd0f7fcbcec7e0d6d381f8bf89e17bb74aa952
- 10d597d44d8261cd0eebe024de51ba803c94792d13c5732d43ed9bec4db72783
- 33da29355095f9ae0383e21ae0c6d300d6a7f298c7e126e8747c71277b1175be
- 84ff5d1b88c4205eba0f04e89daf4d91e9f25da4590367050917a6d34c629147
- 4de39e8b907391f197fe5d138f87985d74d3a34796c3963f2e33142164696f84
- 47e8c5ece6643d5c6cac713799c841e73c0bda691243ccd346b5e85b0a4810d1
- c196be8854dded19c2a85c5bb7f3ff3123da0d91852da7b16f844cb44e9d11fa
- 7f97921badcf0c7ffeb92c6f1d1d2ada3afd0069e8e80a524ad3b7c0c1220f0a
- 79d845fccaa1916f07dfd821c3ed95dd5647b70bd9a39e485caa66cc65a077f7
- 40ce23e0cc6e4fa5192e987bc835c1408d958a2fcfb8875370db517ff64c92a4
- 8f6f739077a383884d400c3062925e0e848be4942e3be0e378e589bfa3941c9c
- 9f014d8807130a01ae008997393deb4c865c70482a4fe75f3cee0e9f8071246a
- 240aa4b7091065ef0495c8f52eeb91b5a0cae03676c6ea4cedee9260e204dd6f
- 788f7ab9bfbb7b692d4d28efad9ae3de964ef7bfa4e30f6f50a3bd178ac004ee
- 04a7fbbc1b0769a5b66bb068385482e50c5f70298eba250235d259bc4aa3ea99
- 30a1707f4a57a2ba738eb27f5525daa12f0713e3bb7b1a3ebe2c710ac6e37a27
- bdc752daf3b4e8f8ea3980d98a01d7249f38dddf183909eb55a8c50ad30368e1
- 48332123774a79eed86d1e826021a05a3921ac5f95ca54e086f173c8e1e72fd1
- 31f2f1c2adabe35fd353d3720eb8458716f926e57c9d782518f943533cd1a72d
- 4756150d141a8ce3e2bdca7fdb1b343466b19cb9a19adbfa25d86c39d0f7c933
- 024f3b186772c5381a458dda4a6b914fb2695f8c16e648c58d463072f10f5b57
- 8160d89f88b3c7d9e967377e513b8fc18e4a19faa55f95371db3553564db65bf
- 6d2816247894f2e73ecb0258ee5a9b85b650542bac46a8587d547c8824e2d280
- d3e017f003c34a6768670ae2c8bbd5e3500f452647e36193614810ced595b2b3
- 7ceafc2a330620665c51e8b394d296ddb190d97f4cebcd0a247d0278d3a54274
- 6b6992a92df788fbd119446aabd9329b7edd1643a8dd1e3ca7b60dc7976b3b60
- 8dee92aa771ca1b0deb233b974f844b8025d4b25f2ff8be41d91c636565eb7f0
- b4fc00a30204c8c5b19c92bd3164b98955d9591366f89c194fe248bdbc0ce580
- 406335d53b11c42f34446adc68d6836a6841fc34af3c2f1fa621ddc2026017b4
- 7ac66cef872878f6e5568266d9c807da1cc4041ae51723cf387590954f73cf7d
- 74c5306c711a4150cb6f89289067533a5438495a251d63cb06f586d27eafbeb4
- f3e67b76944280de1eb8df059bec0f0eafd06a4bc4e7c93e98c434a17192c084
- e13b87e04ee3fbf7ea0c02e4b176d6dc66dbd234b59cb245dfd225e65c5cdcd3
- bfab113c2dde187aaabfd89957c7dc840bbbb25c4f27b31fb422c9817035eaa8
- 7bde7feb01a40d3b89b78928154fcfc0eff8c77b086e360b940f61d45d7eadb0
- 18f2267d16b30aecfd2b6f9437cc79bca68084680b2770820323a968fd20c93e
- 5bd5138456fae929520bbd821beddd1f934d156e3c99916e47df31b7bedaa32a
- eb4db96ab4b78dede2d92db7c0c3dd4084971178f101a342655348a4b90a6487
- 07a06be606d6adacf1cb57cbf448ff18a7c13c90df9e11768ac3fe3e200569a2
- 090e6759314eb16b2169bd1f89387963ba81a0e565f1d77143f2da0e6d267e28
- 38cf5fa44116bc15f12db4506db386b147762838f25d991a0c39cdcd236533f6
- 448a4ab5be3d9f246f961705a02f31abcaa8c616351c4d05857c3db41ba83154
- 3fcfcc54f9ec4762b4b78ce0db9351ac59a717e4931d6267cacafa16d3d41057
- 7349863f4edfd79321be9b214384138596cbe16ecd2107cee58501e2511c438a
- 4a50c82c68898c25dfdfcb95079750a455ba2e4d1397d5e51cc2991dce1be60b
- 275ab1a945003153a10fd5bbebf8ce9af346e5ad2068c83eebdcd60ecf0ce99e
- cce68831a20669468b108e3dd58dbc34cd981c874bdd299b715df838ba5ca0f9
- d6cdb55b0f8d7f3c9c4f3bc7906feb123f84243bfbd719eab75a6894cf455582
- 74012d5c8c22cc2f5780ae55020cdbe3c74f21671a2769fde907dbd63e0281bb
- 14a02938f76ce51767746ecc104ff571f2da0429144ee981cd28af8b4eda3518
- dc05af8f59bdbf1c77d6d45dc1bf6bba634b782533e245993d852e39f145cfc9
- 557444ed827906476ec3385ffae1e1952acc5b3234840fc645ff892c9753b2f3
- 9925d116300b43f82061e1c04deae6c241cfb121d46364aa1f206e0d8bd9732a
- aaf3249f295362530f04f23c00e309baa5a7a89c70bbf1a3a763b8ef66631ac8
- d289624c73955ff377057be150ff8d52118810a4adaf861fe51b7f0a0b80dbbf
- 2f07d98e74625892478c321161f62db8c790d978dd4e5c3633c5cf5ef5d8d6b4"
+checksum="05fc947ff479288182364d39a343fb33276f37266be02c17c6c2adb15c9209c4
+ 8ffad9c79427474069ab2b5dc4cf772947a34b7988d68adb576e79b8a23ab67a
+ 523277c631901519063d41b63333aac3ac874b3e6a453566c0c1ea3fbb7a90aa
+ deb96111e07746d8ddc99e961dfc1e545cc9fd50e4eaade71fa40f5f575f9ac4
+ dd1672b8e38ac2a29fe3be20b11a73c7935dae71ef2624fe92e755763a639d7c
+ 5e10c7080c772a441d3e3116cc964e162d6a5a2ced953bf5a6c59c303fdbcdf0
+ edcb679e72e4ffd3b8fddcf231bcb07a5c0d44b2e1c32982b752f40cafaa625f
+ c4670cc9456a9c170b71b85a1a2486c10d9046f3fec7fd807555a32335d2fa9e
+ 57dcb0e6af8b0573a1188cbc4509e4a30fd1d027b686d73a6b793f6b21e86df2
+ 5c385dede7eaa4e248a15f918c7f64e9125899ef742817bb39571ae0b37b34c4
+ ff15f4844392d0cb50527bdf48d4873f55ba08d8500306ec9ca83405a704fbdc
+ eeefc55c1f80988ebf4c759e4f19092fae79b6335f450d24616c3b3db4985170
+ ccb517a28a85c6aca804ae46bfeba7a0a3fa577111328ccb7bbfda2cb67cb055
+ bb657cc31e3a2eaca1aa19df8532baa4c05d86c4eedb2dad41e1c85a977193fe
+ caea7efda0efd010947fef5260726cd1412d222faccab12a7017c6053e355fff
+ 1b2667186c51e750fdaf05efcf724a932d4b3e10f839396b36bf35c7b8fb58c9
+ e079ce25240d5d286af227c19175446328174082e7f24db3da3366933b213327
+ b534df3b5798fc73ec0989c7e2acadec5d96dc5c29f599ca34b6e3fc2d063ebe
+ 3b232b2de0b99a6d1cb4f0afa203edfb62896065de9aaf351860cca222f22327
+ 520b578228ab2efb7880477276c2b9db430a77efacf590c75bd16cefb5a96d67
+ 10ef072059fb1ed982d7e5a4e90f741f99213d15b94eeeb398d09d7f651aff3d
+ 9b882019ca6e4de58c8f229b344888814424b079e939dd362ea77cf50c9ed059
+ f389a84de1dd7ff8375c66694168a1479697f9ce64e6d4c2824a585076b5aee0
+ f4f3eedcbe27ee556a8e58cd0d07c9c530b0a83b68ada75e74a1d91977333b89
+ 4d67fca1b1f12f4e5c8ac9e5f70140bda20e8c608ee77df4eb4dc97f9f984eaa
+ b73da525fa7ed072e2f2ef2d68eeba037de126942d1190d875d359de77f7006c
+ 4d2253d1d31a6740b24046c066a8342d240599a096585e848e7c065d0912d80e
+ 309eed3a6b60de8b338ae464d29db444320f55d31adf0a8b00885d0cca43ad93
+ c92d925cd81c692f7180cc71fae28d77b3ff7466e365169d92e4288d40249a08
+ 50b1fbc60bea33b12fc5d3fa676503c8417708db0451b9afaff604892612a23b
+ a42141c5c6c00be51e947f9a49ede93e2283050487200e28e71901480b845ff7
+ fa552045ce9cd1b1ca47ef0a0aab50d1095ec9b2f46d3103efd957cdeeccb751
+ 3974ecc24feab6d577d23bd27427136cb0389104011ff796d68d02a69d71789f
+ ca5eb3b04b1c4b32aeefbda17949a358257fe389d48dab1c886b9cec884fe0f9
+ 846ad932823fd5764540e72d2e8854f87963f8caf4685eb60012bfb5923a75fd
+ f5a05fb9a4607f1589096e13b47f985d26253cb5bb5da1cb918865e9654e550e
+ 6717b235fa616b1b9d6684ef50863926d7ee3571811c215d226518916ad3e95f
+ a767439949302a6eb682c58c72c35920fb143deaac708ae72bad47bb42430945
+ 985cd6fb46031859fb238c8b8ca3ae64f8583bab09e6719704c427d2589525c1
+ 7c6b502db9cfa306bc214a3d17c5931b071072ab4326c6ce8bd7498ae126282a
+ e4d00cf895acdac207b1ed4f62280927850d3621ae6ed959bc0dd4adf377bfd7
+ cc11c9b95bfb4e3ce0782c9f2c7e4c7fd92a3b0cc3f6f7bd1390921df1b59ac0
+ 2951c4030c25c59407be23d4c8b203f68c302dee756b895a3ef1c21df1830146
+ e659f2a38763062004fe34968fcdb805b00bf440e4b576ee7028c12a7d8493a4
+ ed29465a92aeb657fa04c226fe3fac1edbe73f69f5001d18b379b21ceaf7f98f
+ b3c38d2d016017b6449bf73f55f63d67e0a9ebf8ba6df059e7d378f953b2a9f2
+ 516d885123c351b24ed093ee1ac194d7297530852ef2bdc23b20903790d060a5
+ 2744519881bda9cd1fc210629a4366886b55e840877e7fbcc11211c281d4668d
+ dff4045c796f34b4d31a55fb59aecae4b8dce24a12ed552d146707e9cc51187c
+ 3862311cc49c8e6d8e8f0f2f03303a0a137654f5cc6511f7f8931a50215f838c
+ d0cb5d6b31eaa479a903fcef3a9f014ba8939c446ef7a44e8d40b0a6760a17b6
+ 7701f6381976c0f1c15c80f3661c6ef20a9953d5cefd64710da7814e875deccd
+ 9757690f40ea70ec1ed6ca4791cf7fafa4d7f9f58a4b1683cfe0be229c3c656a
+ 2d076430aea914ed0fe8c6cf3c9f61a2f7b5b6fefb87fa0631f3b1fca2274eec
+ a32477149c8bdf30590b7dfe931dba18bf9589271d01ffa58d47389dd6ecfe3d
+ 9da35b91db26edb8b8c48cbbd8b953fd7b7fbd74c2233a004c8a35de4fe473f3
+ 5bee5ac2905748ba2ba0f0488f2ecfc409112e626b2e1580f21f1a6dfc685d6a
+ b362ca18cb856bec6aedd2a05b3dfcdfdc78ecdee19866f8aab6047c1603ae88
+ 7a044e5236ba024e80065a8a159dc18c61fd938d39902e4f626615f927038783
+ 26e198549ddf1df25f22801c74cba3c18440d17f1e9b90d96a83c38498213aba
+ 2ca078ccb32f81356f58db590a95ba27fda61dc2ce88d939bbb68d5392b4677b
+ 1b183032cf35b4c3ccc088ba63d83bbde55e1d1a14a0da756957345875a3a695
+ 1dba115cf55edd6082e3e68366fa5aa679deae0262621f8ef574f6f6f7f3f5f0
+ 915c75c205383edf6e31325b9717769dad24f6f457a390a80cf9063bd38fb29c
+ 055866db316ecf278f682a6389f9a42c422c3eda5fa3c5f4223adb18511c5c61
+ f7ffd0af9d3f401e6fdb1425c19de890cfcf2077fadefb77aa9514d83701aefc
+ 9a518360c83589f326252c0096d0a7b766f271f40cf8ae99394cef5a46120306
+ 2ed7c8a352d064d5813121238e385de73d02c70260a3622b774892c003d4fdcc
+ 4bce9dd4f8eac65f13f447976c61142aa9e227ebd79ef84e2205abbf383dc096
+ 1f51826364ba69823a7c56c87523f5aadbf4e577c6d4934bc96021083efe2083
+ d5b38929489bb0da1688c9f31d35051f5801a4111d60b49521bd736512a5812b
+ 31494871d4ee110921cca19eafd2ddc089ab51edb96e67de6d5e75b2293262b0
+ 11166cc8dcbae00aaf39c58f23f1e357a942cf9fae1873e486aadefdd33bf933
+ 9ff85ed3a21d63785e7c2475577097bd8a53cf4eaa7122bbf78225078abb7c96
+ 82102671cd03006743333b73dae07f4cf0702ac96ecccdb86fa7b40e9ea85c74
+ 8c9096f28cbce9b40d534cddab6ce9c3dd1003120b7201490d936743763af12d
+ c11653e2d1f845360c176a698f77b196230b7ad108f6e86033ba24b8fe7f8e1f
+ f728c9850b153bcd15d3fde9f134177d58db1cacd4ef42a9e9baccf5981c5195
+ 2683e367a49ca9e3c9c278970a5b8a56f5718d948dc73c1fc26c5340cac4d005
+ 96b0327b8766a6e3e40097cdcef6cdbb4498df256c9a0a43cb20bc7543fdf9fa
+ 9936f3f4a9a1c86ae0123c714f71b8652e7217f58c3e529d6f3e4737a930c044
+ 5e6d54c42b0fc394142449727aea373cef5dec109c857d3f7de2576abc55394d
+ 7092c55e961b30bc42941730ed4ee831445c5d8682e51af8af1a134aa0a6be1b
+ 670723fe5f0d50cc59e1d4af1c8d3176ef6d2a4b61c56274a9a805c084bba72c
+ a04627bfb97a249b166c625630e4ba5875400e9fd6cd9f54e8d9c94dc43ec7e0
+ c7c7bf41ad8a745da097fde5c9e06885f520cd8f2cb4bde06fee8b029ee85888
+ 485d48e4c86c82c1812f603a7a02ac390134adccdfa25e86a6d0f75643bc5f2a
+ 55598530db9d7640fc73ee9881fb5c43b2a50b3b075454dc4e59baef93b4f70f
+ d4afee4357c8e49ac06d66b24606ed1265b8cb14979125e0e0d326335238779d
+ 28d511b6de7c0c92730c79523710624427e6cd320225827a49cc217c06e1d612
+ 5c587ab32b4f5a835992f03ed47f875f962da36ecc48a6b4cd999de6f944e7e1
+ 949ab674459d323cc04364ab6a8a141d1976d22c08c8705d434276405fada9fb
+ 1e7a6048da7b760b85301927b9a57ad7da041046df179126cd0126df97029927
+ d3af2b83e1349e9db60b8caf47141f3e9ff339651823909f6ee98fdeb7b1134e
+ 53dd63b3de2a325b278084825883a19de8e7fdc8bc4fff88f24b052a64731094
+ d4da572047b11729bc29c3f7f9c9afa68ea308b0f0d03515037c9bac77dfdb37"

From f9a0011f773a7fc4a4ed847509531a4ad7d5c540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 4 May 2022 21:44:51 +0200
Subject: [PATCH 2045/2561] common/: add script finding file conflicts

---
 common/scripts/lint-conflicts | 195 ++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)
 create mode 100755 common/scripts/lint-conflicts

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
new file mode 100755
index 000000000000..bb0e2b2fd6b3
--- /dev/null
+++ b/common/scripts/lint-conflicts
@@ -0,0 +1,195 @@
+#!/usr/bin/env bash
+
+# Report packages installing same file and not marked with
+# conflicts or replaces.
+# Without argument, find conflicts between packages in local
+# repository at hostdir/binpkgs and packages indexed in xlocate.
+# With single path as argument, read that local repository.
+# With -a flag, find conflicts between packages indexed in xlocate.
+
+if [ "$#" = 0 ]; then
+	binpkgs="$PWD/hostdir/binpkgs"
+elif [ "$1" = -a ]; then
+	all=1
+elif [ -d "$1" ]; then
+	binpkgs="$1"
+else
+	echo "Usage:"
+	echo "$0"
+	echo "  check packages in ./hostdir/binpkgs"
+	echo "$0 path/to/hostdir/binpkgs"
+	echo "  check packages there"
+	echo "$0 -a"
+	echo "  check all packages indexed in xlocate"
+	exit 1
+fi
+
+declare -A newly_built conflicts_cache providers_cache pairs owners
+repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+rv=0
+
+template_exists() {
+	[ -f "srcpkgs/$1/template" ]
+}
+
+partial_check() {
+	[ -z "$all" ]
+}
+
+providers_of() {
+	# print the pkgname and packages that `provides` it
+	local pkgname=$1
+	if [ "${providers_cache[$pkgname]}" = '' ]; then
+		local line provider_pkgver provided_pkgver provider_pkgname provided_pkgname
+		local -A providers
+		providers[$pkgname]=$pkgname
+		while read -r line; do
+			line=${line%%'('*}
+			provider_pkgver=${line%': '*}
+			provided_pkgver=${line#*': '}
+			provider_pkgname=${provider_pkgver%-*}
+			provided_pkgname=${provided_pkgver%-*}
+			# comes from $(xbps-query -s $pkgname), so $pkgname can be substring
+			if [ "$provided_pkgname" = "$pkgname" ]; then
+				providers[$provider_pkgname]=$provider_pkgname
+			fi
+		done < <(xbps-query "${repositories[@]}" -p provides -R -s "$pkgname")
+		# leading space ensures ${[]} != ''
+		providers_cache[$pkgname]=" ${providers[*]}"
+	fi
+	echo ${providers_cache[$pkgname]}
+}
+
+conflicts_of() {
+	# print list of packages that are _marked_ as conflicting with given one
+	local pkgname=$1
+	if [ "${conflicts_cache[$pkgname]}" = '' ]; then
+		local in_conflict provider
+		local -A all
+		while read -r in_conflict; do
+			in_conflict=${in_conflict%'<'*}
+			in_conflict=${in_conflict%'>'*}
+			providers_of "$in_conflict" > /dev/null # executing in same process to fill cache
+			for provider in $(providers_of "$in_conflict"); do
+				all[$provider]=$provider
+			done
+		done < <(xbps-query "${repositories[@]}" -p conflicts,replaces -R "$pkgname")
+		# leading space ensures ${[]} != ''
+		conflicts_cache[$pkgname]=" ${all[*]}"
+	fi
+	echo ${conflicts_cache[$pkgname]}
+}
+
+conflict_between() {
+	# exit successfully if packages are _marked_ as conflicting
+	conflicts_of "$1" > /dev/null # executing in same process to fill cache
+	case " $(conflicts_of "$1") " in
+		*" $2 "*) return 0
+	esac
+	conflicts_of "$2" > /dev/null # executing in same process to fill cache
+	case " $(conflicts_of "$2") " in
+		*" $1 "*) return 0
+	esac
+	return 1
+}
+
+list_newly_built_files() {
+	# print one line per file in newly built packages
+	# each line contains pkgname and file path
+	local pkgver pkgname
+	while read -r pkgver; do
+		pkgname=${pkgver%-*}
+		xbps-query "${repositories[@]}" -i -f "$pkgname" | sed s'/ -> .*//;'" s/^/$pkgname /"
+	done < <(xbps-query "${repositories[@]}" -i -R -s '' | cut -d' ' -f 2)
+}
+
+list_interesting_files() {
+	# list files potentially contained in more than one package
+	# each line contains pkgver/pkgname and file path
+	if partial_check; then
+		list_newly_built_files
+	else
+		xlocate / | sed s'/ -> .*//' | grep -F -f <(xlocate / | cut -f 2- | sed s'/ -> .*//' | sort | uniq -d)
+	fi
+}
+
+group_by_file_full() {
+	# create associative array `owners` mapping file to list of packages
+	# for packages potentially conflicting with newly built ones
+	local pkgver file pkgname
+	while read -r pkgver file; do
+		pkgname=${pkgver%-*}
+		if template_exists "$pkgname"; then
+			owners[$file]+=" $pkgname"
+		fi
+	done < <(list_interesting_files)
+}
+
+group_by_file_partial() {
+	# create associative array `owners` mapping file to list of packages
+	# for all packages in xlocate
+	local pkgname file
+	## newly built packages
+	while read -r pkgname file; do
+		owners[$file]+=" $pkgname"
+		newly_built[$pkgname]=$pkgname
+	done < <(list_newly_built_files)
+	## rest of repository
+	while read -r pkgver file; do
+		pkgname=${pkgver%-*}
+		if [ -z "${newly_built[$pkgname]}" ] && template_exists "$pkgname"; then
+			owners[$file]+=" $pkgname"
+		fi
+	done < <(xlocate / | sed s'/ -> .*//' | grep -F -f <(list_newly_built_files | cut -d ' ' -f 2-))
+}
+
+group_by_pair() {
+	# find package pairs owning same file and not marked as conflicting
+	local pkg file a b
+	while read -r pkg file; do
+		for a in ${owners[$file]}; do
+			for b in ${owners[$file]}; do
+				if ! [ "$a" "<" "$b" ]; then
+					continue
+				fi
+				if partial_check && [ -z "${newly_built[$a]}" ] && [ -z "${newly_built[$b]}" ]; then
+					continue
+				fi
+				if ! conflict_between "$a" "$b"; then
+					unset pair_files
+					local -A pair_files
+					eval "${pairs["$a $b"]}"
+					pair_files[$file]="$file"
+					pairs["$a $b"]="${pair_files[@]@A}"
+				fi
+			done
+		done
+	done < <(list_interesting_files)
+}
+
+print_out() {
+	local pair file
+	if [ "${#pairs[@]}" = 0 ]; then
+		echo 1>&2 "No conflicts found in" "${repositories[@]#*=}"
+		exit 0
+	fi
+	while read -r pair; do
+		rv=1
+		echo "${pair% *} and ${pair#* } conflict for"
+		unset pair_files
+		eval "${pairs[$pair]}"
+		for file in "${pair_files[@]}"; do
+			echo "  $file"
+		done | sort
+	done < <(printf '%s\n' "${!pairs[@]}" | sort)
+}
+
+if partial_check; then
+	group_by_file_partial
+else
+	group_by_file_full
+fi
+group_by_pair
+print_out
+
+exit $rv

From cb3068477c99f0a2d174f8c245d9043334e777b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 4 May 2022 21:44:51 +0200
Subject: [PATCH 2046/2561] .github: check file conflicts in x86_64 build job

---
 .github/workflows/build.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2ae7a3e728fa..e4619a3f3c4b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -94,6 +94,12 @@ jobs:
           "$here/common/travis/show_files.sh" "$BOOTSTRAP" "$ARCH"
           )
 
+      - name: Check file conflicts
+        if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
+        run: |
+          xlocate -S &&
+          common/scripts/lint-conflicts $HOME/hostdir/binpkgs
+
       - name: Verify repository state
         run: |
           (

From 486135a1197e8d37ac7f0305b1ff242cec0ede35 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 2 May 2022 00:58:34 -0400
Subject: [PATCH 2047/2561] common/travis/xlint.sh: print Github annotations

Turns xlint, version lint, and commit lint messages into warning or error
annotaions. All are printed with special highlighting in the action log and
summary. Xlint and version lint annotations are shown inline in the changes tab
and commit view. Annotations without line number are shown at line 1.
---
 common/scripts/lint-commits         | 10 +++++-----
 common/scripts/lint2annotations.awk | 11 +++++++++++
 common/travis/xlint.sh              |  5 +++--
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 common/scripts/lint2annotations.awk

diff --git a/common/scripts/lint-commits b/common/scripts/lint-commits
index 01c4eda17007..7207ed81d5aa 100755
--- a/common/scripts/lint-commits
+++ b/common/scripts/lint-commits
@@ -35,18 +35,18 @@ do
 	/^$/ && !msg { msg = 1; next }
 	!msg { next }
 	# 3: long-line-is-banned-except-footnote-like-this-for-url
-	(NF > 2) && (length > 80) { print C ": long line: " $0; exit 1 }
+	(NF > 2) && (length > 80) { print "::error title=Commit Lint::" C ": long line: " $0; exit 1 }
 	!subject {
-		if (length > 50) { print C ": subject is a bit long" }
-		if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print C ": subject does not follow CONTRIBUTING.md guildelines"; exit 1 }
+		if (length > 50) { print "::warning title=Commit Lint::" C ": subject is a bit long" }
+		if (!($0 ~ ":" || $0 ~ "^Take over maintainership " || $0 ~ "^Orphan ")) { print "::error title=Commit Lint::" C ": subject does not follow CONTRIBUTING.md guildelines"; exit 1 }
 		# Below check is too noisy?
 		# if (!($0 ~ "^New package:" || $0 ~ ".*: update to")) {
-		# 	print C ": not new package/update/removal?"
+		# 	print "::warning title=Commit Lint::" C ": not new package/update/removal?"
 		# }
 		subject = 1; next
 	}
 	/^$/ { body = 1; next }
-	!body { print C ": second line must be blank"; exit 1 }
+	!body { print "::error title=Commit Lint::" C ": second line must be blank"; exit 1 }
 	' || status=1
 done
 exit $status
diff --git a/common/scripts/lint2annotations.awk b/common/scripts/lint2annotations.awk
new file mode 100644
index 000000000000..5405d6971535
--- /dev/null
+++ b/common/scripts/lint2annotations.awk
@@ -0,0 +1,11 @@
+# Converts xlint/etc format lints into GH Actions annotations
+# The original line is printed alongside the annotation command
+{
+	split($0, a, ": ")
+	split(a[1], b, ":")
+	msg = substr($0, index($0, ": ") + 2)
+	if (b[2]) {
+		line = ",line=" b[2]
+	}
+	printf "::error title=Template Lint,file=%s%s::%s\n", b[1], line, msg
+}
diff --git a/common/travis/xlint.sh b/common/travis/xlint.sh
index 6b3d9e91c90a..327417c1c327 100755
--- a/common/travis/xlint.sh
+++ b/common/travis/xlint.sh
@@ -11,7 +11,8 @@ common/scripts/lint-commits $base $tip || EXITCODE=$?
 
 for t in $(awk '{ print "srcpkgs/" $0 "/template" }' /tmp/templates); do
 	/bin/echo -e "\x1b[32mLinting $t...\x1b[0m"
-	xlint "$t" || EXITCODE=$?
-	common/scripts/lint-version-change "$t" $base $tip || EXITCODE=$?
+	xlint "$t" > /tmp/xlint_out || EXITCODE=$?
+	common/scripts/lint-version-change "$t" $base $tip > /tmp/vlint_out || EXITCODE=$?
+	awk -f common/scripts/lint2annotations.awk /tmp/xlint_out /tmp/vlint_out
 done
 exit $EXITCODE

From d8be2e7c53ab260a76edd6160cdb893810c3542a Mon Sep 17 00:00:00 2001
From: Bas Ploeger <5904333+basploeger@users.noreply.github.com>
Date: Sat, 2 Apr 2022 22:00:49 +0200
Subject: [PATCH 2048/2561] New package: apcupsd-3.14.14

---
 srcpkgs/apcupsd/files/apcupsd/run |  3 +++
 srcpkgs/apcupsd/template          | 40 +++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 srcpkgs/apcupsd/files/apcupsd/run
 create mode 100644 srcpkgs/apcupsd/template

diff --git a/srcpkgs/apcupsd/files/apcupsd/run b/srcpkgs/apcupsd/files/apcupsd/run
new file mode 100644
index 000000000000..2c0b807da287
--- /dev/null
+++ b/srcpkgs/apcupsd/files/apcupsd/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+[ -r conf] && . ./conf
+exec apcupsd -b ${OPTS}
diff --git a/srcpkgs/apcupsd/template b/srcpkgs/apcupsd/template
new file mode 100644
index 000000000000..ba1394b2d9d0
--- /dev/null
+++ b/srcpkgs/apcupsd/template
@@ -0,0 +1,40 @@
+# Template file for 'apcupsd'
+pkgname=apcupsd
+version=3.14.14
+revision=1
+build_style=gnu-configure
+configure_args="
+ --disable-install-distdir
+ --enable-modbus-usb
+ --enable-usb
+ --sysconfdir=/etc/apcupsd
+ --with-dev=
+ --with-halpolicydir=
+ --with-pwrfail-dir=/etc/apcupsd
+ --with-upscable=usb
+ --with-upstype=usb"
+hostmakedepends="autoconf automake pkg-config"
+makedepends="libusb-compat-devel net-snmp-devel"
+depends="libusb-compat net-snmp nullmailer"
+conf_files="/etc/apcupsd/*"
+short_desc="APC UPS daemon with integrated tcp/ip remote shutdown"
+maintainer="Bas Ploeger <s.c.w.ploeger@gmail.com>"
+license="GPL-2.0-only"
+homepage="http://www.apcupsd.org/"
+distfiles="${SOURCEFORGE_SITE}/apcupsd/apcupsd-${version}.tar.gz"
+checksum="db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867"
+
+# Avoid passing an invalid arg 'strip' to the install command for the binaries.
+make_install_args="STRIP="
+
+pre_configure() {
+	export SHUTDOWN=/usr/bin/shutdown
+	export WALL=/usr/bin/wall
+	export APCUPSD_MAIL=/usr/bin/mail
+}
+
+post_install() {
+	# This binary is not needed and conflicts with a binary from an other package.
+	rm ${DESTDIR}/usr/bin/smtp
+	vsv apcupsd
+}

From c4b39fa3e89005a615e1aeb097a07ce4e362baad Mon Sep 17 00:00:00 2001
From: Brihadeesh S <brihadeesh.santharam@gmail.com>
Date: Mon, 2 May 2022 17:02:32 +0530
Subject: [PATCH 2049/2561] New package: paleta-1.0.2

---
 srcpkgs/paleta/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/paleta/template

diff --git a/srcpkgs/paleta/template b/srcpkgs/paleta/template
new file mode 100644
index 000000000000..f61a1c05dcbf
--- /dev/null
+++ b/srcpkgs/paleta/template
@@ -0,0 +1,19 @@
+# Template file for 'paleta'
+pkgname=paleta
+version=1.0.2
+revision=1
+build_style=gnu-makefile
+short_desc="Change terminal colors on-the-fly independent of terminal emulator"
+maintainer="Brihadeesh <brihadeesh@protonmail.com>"
+license="MIT"
+homepage="https://github.com/dylanaraps/paleta"
+distfiles="https://github.com/dylanaraps/paleta/archive/${version}.tar.gz"
+checksum=b6a44653266598cd4e027703b0b06acb3a753f632abf87ea30732d139cf1bd16
+
+post_install() {
+	# copying palettes provided to package files
+	vmkdir /usr/share/paleta
+	vcopy palettes /usr/share/paleta/
+
+	vlicense LICENSE
+}

From d3810d0f42c7d3659da5b1252a9da1f8b94b6ee3 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Thu, 5 May 2022 17:15:34 +0200
Subject: [PATCH 2050/2561] sqlite: update to 3.38.4.

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 17f75a5f22a0..956daec63b5c 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.3
+version=3.38.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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=61f2dd93a2e38c33468b7125967c3218bf9f4dd8365def6025e314f905dc942e
+checksum=1935751066c2fd447404caa78cfb8b2b701fad3f6b1cf40b3d658440f6cc7563
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From f54839b4898e718250ffca18f8dd9e991adee05a Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Fri, 6 May 2022 01:05:17 +0100
Subject: [PATCH 2051/2561] nnn: update to 4.5.

---
 srcpkgs/nnn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nnn/template b/srcpkgs/nnn/template
index ac5827f0e9af..d8d3d2f57088 100644
--- a/srcpkgs/nnn/template
+++ b/srcpkgs/nnn/template
@@ -1,6 +1,6 @@
 # Template file for 'nnn'
 pkgname=nnn
-version=4.4
+version=4.5
 revision=1
 build_style=gnu-makefile
 make_install_target="install install-desktop"
@@ -12,7 +12,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=e04a3f0f0c2af1e18cb6f005d18267c7703644274d21bb93f03b30e4fd3d1653
+checksum=fadc15bd6d4400c06e5ccc47845b42e60774f368570e475bd882767ee18749aa
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel"

From adf21b2d150f02edba3462d7f3a4504999a131ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 6 May 2022 18:11:09 +0700
Subject: [PATCH 2052/2561] Revert "git: update to 2.36.0."

This reverts commit 0a0487fc3090b5b96e507f4ee2019293f95dd0b3.

See: https://lore.kernel.org/git/xmqqlevfdbiq.fsf@gitster.g/
---
 srcpkgs/git/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index e45663f9ff9b..dc2146690ab2 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,7 +1,8 @@
 # Template file for 'git'
 pkgname=git
-version=2.36.0
-revision=1
+reverts="2.36.0_1"
+version=2.35.3
+revision=2
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
@@ -14,7 +15,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=af5ebfc1658464f5d0d45a2bfd884c935fb607a10cc021d95bc80778861cc1d3
+checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 18b9da150481d8d8d824490571cc1c98b02d9371 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 5 May 2022 20:01:45 +0200
Subject: [PATCH 2053/2561] z3: update to 4.8.17.

---
 srcpkgs/z3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index d322211cbd9b..598d15032a9d 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,6 +1,6 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.16
+version=4.8.17
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
 distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=75f95e09f3f35fef746e571d5ec88a4efba27f1bc8f1a0ef1117167486ec3dc6
+checksum=1e57637ce8d5212fd38453df28e2730a18e0a633f723682267be87f5b858a126
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"

From 6beecaa19e2b615eadd2b41456207349a9fbf559 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 May 2022 17:41:04 +0200
Subject: [PATCH 2054/2561] ecm: update to 7.0.5.

---
 srcpkgs/ecm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ecm/template b/srcpkgs/ecm/template
index 6750b25dbeca..496636f06cea 100644
--- a/srcpkgs/ecm/template
+++ b/srcpkgs/ecm/template
@@ -1,7 +1,7 @@
 # Template file for 'ecm'
 pkgname=ecm
-version=7.0.4
-revision=3
+version=7.0.5
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --enable-openmp"
 hostmakedepends="m4"
@@ -10,8 +10,8 @@ short_desc="Elliptic Curve Method for Integer Factorization"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.inria.fr/zimmerma/ecm"
-distfiles="https://gitlab.inria.fr/zimmerma/ecm/uploads/00c4c691a1ef8605b65bdf794a71539d/ecm-${version}.tar.gz"
-checksum=0cf7b3eee8462cc6f98b418b47630e1eb6b3f4f8c3fc1fb005b08e2a1811ba43
+distfiles="https://gitlab.inria.fr/zimmerma/ecm/uploads/89f6f0d65d3e980cef33dc922004e4b2/ecm-${version}.tar.gz"
+checksum=c721dd22e557c4a5dac9ac7e156a400cd2298812dd1f9b56e89966de01471ba8
 
 # ppc64 asm only provided for BE and ELFv1, we're ELFv2 for BE and LE
 case "$XBPS_TARGET_MACHINE" in

From cc9de2f7aaa760221b96a3e3cd4c2286c15ff7c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 6 May 2022 17:42:14 +0200
Subject: [PATCH 2055/2561] pgn-extract: update to 22.07.

---
 srcpkgs/pgn-extract/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgn-extract/template b/srcpkgs/pgn-extract/template
index 1b0d78af839e..387cb7803032 100644
--- a/srcpkgs/pgn-extract/template
+++ b/srcpkgs/pgn-extract/template
@@ -1,6 +1,6 @@
 # Template file for 'pgn-extract'
 pkgname=pgn-extract
-version=22.05
+version=22.07
 revision=1
 wrksrc="pgn-extract"
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.cs.kent.ac.uk/people/staff/djb/pgn-extract/"
 changelog="https://www.cs.kent.ac.uk/people/staff/djb/pgn-extract/changes.html"
 distfiles="https://www.cs.kent.ac.uk/~djb/pgn-extract/pgn-extract-${version/./-}.tgz"
-checksum=73bbc4e011cc3a92330c0e0f8a6783a1c61b1a2c93165b3090b44a34980be40a
+checksum=51dda2d8cca7a6390c82d7f928263e3885b4ab62eb7e16a4431877af903ea7a6
 
 post_extract() {
 	sed -i '/^CC=/d' Makefile

From 4fb769c8b5c82b6eedaf9e5f39ba4e823bfe91f2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 18 Mar 2022 17:30:11 +0200
Subject: [PATCH 2056/2561] opera: update to 86.0.4363.50.

---
 srcpkgs/opera/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index f3965df0408d..1be0482067b9 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=84.0.4316.31
+version=86.0.4363.50
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -10,8 +10,8 @@ short_desc="Fast, secure, easy to use browser"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
-distfiles="https://rpm.opera.com/rpm/opera_stable-${version}-linux-release-x64-signed.rpm"
-checksum=6ae3c4ff44a4ae627724a8df3fcb2d5663ca8677a5eb62b5354b99fe21688608
+distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
+checksum=94b73abd6e1d2a710ddbd437e11a1702d487cc9497258b90a131332123ce28a5
 repository="nonfree"
 nostrip=yes
 
@@ -27,7 +27,6 @@ do_install() {
 	# Link executable in path
 	ln -s ../lib/opera/opera "${DESTDIR}/usr/bin/opera"
 
-	# Install licenses
-	vlicense usr/lib64/opera/resources/eula_desktop_eea.txt
-	vlicense usr/lib64/opera/resources/eula_desktop_row.txt
+	# Install 3rd-party licenses
+	vlicense usr/lib64/opera/opera_autoupdate.licenses
 }

From 8f1776d2637397ce7f4efc296d6687f0e566d8e4 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 17:17:06 -0500
Subject: [PATCH 2057/2561] nvidia390: update homepage

---
 srcpkgs/nvidia390/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia390/template b/srcpkgs/nvidia390/template
index c44d128eb279..903c74f394fe 100644
--- a/srcpkgs/nvidia390/template
+++ b/srcpkgs/nvidia390/template
@@ -7,7 +7,7 @@ version=390.147
 revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
-homepage="https://www.nvidia.com"
+homepage="https://www.nvidia.com/en-us/drivers/unix/"
 
 archs="i686 x86_64"
 nopie=yes

From 4a744fcf20d2501867214ff5fe2713a09d962e4d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 17:17:21 -0500
Subject: [PATCH 2058/2561] nvidia390: fix update check

---
 srcpkgs/nvidia390/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia390/update b/srcpkgs/nvidia390/update
index b74fe6d69aaf..0a48e18e1154 100644
--- a/srcpkgs/nvidia390/update
+++ b/srcpkgs/nvidia390/update
@@ -1,2 +1,2 @@
-site="http://www.nvidia.com/object/unix.html"
-pattern='390.+>\K[\d.]+(?=</A>)'
+site='https://forums.developer.nvidia.com/t/current-graphics-driver-releases/28500'
+pattern='\K390[\d.]+(?=</A>)'

From c6442e58cab09eec70c973a3fd7f109cf0474058 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 15:29:46 -0500
Subject: [PATCH 2059/2561] nvidia470: update homepage

---
 srcpkgs/nvidia470/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index 20b23dfd4dcc..d746210cc92f 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -7,7 +7,7 @@ version=470.103.01
 revision=3
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
-homepage="https://www.nvidia.com"
+homepage="https://www.nvidia.com/en-us/drivers/unix/"
 
 archs="x86_64"
 nopie=yes

From 1fa21cf385fb8e7982b8d31ac8d9f345411a03ba Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 15:29:57 -0500
Subject: [PATCH 2060/2561] nvidia470: fix update check

---
 srcpkgs/nvidia470/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia470/update b/srcpkgs/nvidia470/update
index d33b1d9a141f..e0f201851c73 100644
--- a/srcpkgs/nvidia470/update
+++ b/srcpkgs/nvidia470/update
@@ -1,2 +1,2 @@
-site="http://www.nvidia.com/object/unix.html"
-pattern='Branch Version.+>\K[\d.]+(?=</A>)'
+site='https://forums.developer.nvidia.com/t/current-graphics-driver-releases/28500'
+pattern='\K470[\d.]+(?=</A>)'

From 5889ea50c509e466b7ab92cfdcb5cdebd643b9aa Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 15:30:11 -0500
Subject: [PATCH 2061/2561] nvidia: update homepage

---
 srcpkgs/nvidia/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 1ff0e8dbc33b..94482a9de0e2 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -7,7 +7,7 @@ version=510.60.02
 revision=2
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
-homepage="https://www.nvidia.com"
+homepage="https://www.nvidia.com/en-us/drivers/unix/"
 
 archs="x86_64"
 nopie=yes

From a9bf21a4132a86917b2f0d8ca304cf4a006ba19b Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 17:23:41 -0500
Subject: [PATCH 2062/2561] nvidia: fix update check

---
 srcpkgs/nvidia/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/update b/srcpkgs/nvidia/update
index d33b1d9a141f..c6ae1d281ec6 100644
--- a/srcpkgs/nvidia/update
+++ b/srcpkgs/nvidia/update
@@ -1,2 +1,2 @@
-site="http://www.nvidia.com/object/unix.html"
-pattern='Branch Version.+>\K[\d.]+(?=</A>)'
+site="https://forums.developer.nvidia.com/t/current-graphics-driver-releases/28500"
+pattern='Current production branch release: \K[\d.]+(?= \(x86)'

From 87dfb79cc25e586d6f220e58415c876f3adc4e70 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 6 May 2022 00:05:05 +0300
Subject: [PATCH 2063/2561] htop: update to 3.2.0.

---
 srcpkgs/htop/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template
index 3b3cd7ade73c..4edcd93cf2ed 100644
--- a/srcpkgs/htop/template
+++ b/srcpkgs/htop/template
@@ -1,21 +1,14 @@
 # Template file for 'htop'
 pkgname=htop
-version=3.1.2
+version=3.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-unicode --enable-sensors"
-hostmakedepends="automake"
 makedepends="ncurses-devel libsensors-devel"
 short_desc="Interactive process viewer"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-only"
 homepage="https://htop.dev/"
-changelog="https://github.com/htop-dev/htop/blob/master/ChangeLog"
-distfiles="https://github.com/htop-dev/htop/archive/${version}.tar.gz"
-checksum=fe9559637c8f21f5fd531a4c072048a404173806acbdad1359c6b82fd87aa001
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	./autogen.sh
-}
+changelog="https://raw.githubusercontent.com/htop-dev/htop/main/ChangeLog"
+distfiles="https://github.com/htop-dev/htop/releases/download/${version}/htop-${version}.tar.xz"
+checksum=e0f645d4ac324f2c4c48aaa7a3a96d007b95516559550be0b56e423fc5b6d783

From bd974d054a7788d42c6748062b17b9b7ad2ca5dc Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Thu, 5 May 2022 11:41:49 -0400
Subject: [PATCH 2064/2561] freeplane: update to 1.9.14, hard-code jdk11

---
 srcpkgs/freeplane/patches/jdk11-default.patch | 15 +++++++++++++++
 srcpkgs/freeplane/template                    | 11 +++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/freeplane/patches/jdk11-default.patch

diff --git a/srcpkgs/freeplane/patches/jdk11-default.patch b/srcpkgs/freeplane/patches/jdk11-default.patch
new file mode 100644
index 000000000000..2f27d35af84a
--- /dev/null
+++ b/srcpkgs/freeplane/patches/jdk11-default.patch
@@ -0,0 +1,15 @@
+freeplane does not work with jdk17, so set jdk11 as the default.
+This can be overridden by the upstream-created method still.
+
+--- a/freeplane_framework/script/freeplane.sh
++++ b/freeplane_framework/script/freeplane.sh
+@@ -5,6 +5,9 @@
+ 	set -x
+ fi
+ 
++# set openjdk11 as the default, regardless of xbps-alternatives
++[ -z "$FREEPLANE_JAVA_HOME" ] && FREEPLANE_JAVA_HOME=/usr/lib/jvm/openjdk11
++
+ ########## FUNCTIONS DEFINITIONS #######################################
+ 
+ _debug() {
diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template
index 67a233224e9a..1c65ce682b38 100644
--- a/srcpkgs/freeplane/template
+++ b/srcpkgs/freeplane/template
@@ -1,17 +1,16 @@
 # Template file for 'freeplane'
 pkgname=freeplane
-version=1.9.12
-revision=2
+version=1.9.14
+revision=1
 wrksrc="freeplane-release-${version}"
-hostmakedepends="apache-ant openjdk8 unzip gradle"
-depends="virtual?java-runtime"
+hostmakedepends="apache-ant openjdk11 unzip gradle"
+depends="openjdk11-jre"
 short_desc="Application for Mind Mapping, Knowledge Management, Project Management"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://freeplane.sourceforge.net/"
 distfiles="https://github.com/freeplane/freeplane/archive/release-${version}.tar.gz"
-checksum=200002b5cbe3e3286a7595847d28356d3efd8498ff930fa05e5e90af622e544f
-broken="https://build.voidlinux.org/builders/x86_64_builder/builds/37505/steps/shell_3/logs/stdio"
+checksum=8c463c997675b0e351724673e9ca6357f4ef47bd9df0c49b73645090fb19cd7f
 
 make_dirs="
 /usr/share/freeplane/fwdir/condperm/ 755 root root

From b9cbcc0c254e504d5dd8c9e188369518d5a63098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 6 May 2022 15:56:55 +0200
Subject: [PATCH 2065/2561] doctl: update to 1.74.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 23fbb957a0b4..81d5feb1d6e9 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.73.1
+version=1.74.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -14,4 +14,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=cada668df915bf4eaa7ef271ab0920002b2bc7f9b6b3cbd8598481646c52d4e8
+checksum=3b0fcd2daff4cdce575f7a833a36c3a63a66c0dbb9af50baafe3ec9fe02c3872

From c7a3fa3e669de817b7fc2a10b9a97323b67bc726 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 6 May 2022 21:37:38 -0400
Subject: [PATCH 2066/2561] just: update to 1.1.3.

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index f3857ec4f01f..eecc1f7890cc 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.1.2
+version=1.1.3
 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/refs/tags/${version}.tar.gz"
-checksum=5f04ce85dc2de7609d68c336a7c51f477f8ff079d8b209a0d72183615e3f1e55
+checksum=571f35b2b08d0e0617028854a8c2781b822544c58b8a081f4fc795a779c80878
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From b96df6aa663aee0fe10a701d933ff57ec3a9c38a Mon Sep 17 00:00:00 2001
From: Imran Khan <imrankhan@teknik.io>
Date: Fri, 6 May 2022 22:32:16 +0600
Subject: [PATCH 2067/2561] fselect: update to 0.8.0.

---
 srcpkgs/fselect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index bdb1a6071b02..5c35c5be539f 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -1,6 +1,6 @@
 # Template file for 'fselect'
 pkgname=fselect
-version=0.7.7
+version=0.8.0
 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=0dc6749a0c15a79639a183d44be630f59c7ce7c1af5a835fe0fd31c0eab4a653
+checksum=33dfcbbf7e598bce479b1fb5c17429af1bb309beab2e4bc95642e9f4b5c2ffbd
 
 post_install() {
 	vlicense LICENSE-MIT

From 074ab2b843232e3e741e4e5b570b8363e173b90e Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 5 May 2022 17:05:48 +0200
Subject: [PATCH 2068/2561] master-pdf-editor: update to 5.8.52.

---
 srcpkgs/master-pdf-editor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/master-pdf-editor/template b/srcpkgs/master-pdf-editor/template
index 49f1604d8a0d..8ffcc363e6d9 100644
--- a/srcpkgs/master-pdf-editor/template
+++ b/srcpkgs/master-pdf-editor/template
@@ -1,6 +1,6 @@
 # Template file for 'master-pdf-editor'
 pkgname=master-pdf-editor
-version=5.8.33
+version=5.8.52
 revision=1
 archs="x86_64"
 wrksrc="master-pdf-editor-5"
@@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="custom:Proprietary"
 homepage="https://code-industry.net/free-pdf-editor/"
 distfiles="https://code-industry.net/public/${pkgname}-${version}-qt5.x86_64.tar.gz"
-checksum=b202c5fcda5a36590be6203597b43332260ac1170c0eed831dd4c869e1ceb5f2
+checksum=dba3e36371c897ebd463e59366d37a77c091f59fb1a73d7b58eb0213c2bff3e7
 nostrip=yes
 repository=nonfree
 restricted=yes

From e99feb6db08f49219dda247a981e56e033f4bcaf Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Thu, 5 May 2022 10:45:59 +0200
Subject: [PATCH 2069/2561] google-chrome: update to 101.0.4951.54

---
 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 c6614dbcd27b..94cd9a30ad4a 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=101.0.4951.41
+version=101.0.4951.54
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=78d24e94017eb94ab771d49bcd4dd0684f86ca05bc40250fe3151040aefedf8a
+checksum=bedc9782f008645c3bcda9edbeeabf52ef15ed1d736a697819e56f2e5c37dad4
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From d9ecf803d5bebe337fc1f39990dda3dc5296c084 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 May 2022 09:16:28 +0200
Subject: [PATCH 2070/2561] alkimia: update to 8.1.1.

---
 srcpkgs/alkimia/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/alkimia/template b/srcpkgs/alkimia/template
index 5b385025413a..b8f46d0139d5 100644
--- a/srcpkgs/alkimia/template
+++ b/srcpkgs/alkimia/template
@@ -1,12 +1,12 @@
 # Template file for 'alkimia'
 pkgname=alkimia
-version=8.1.0
+version=8.1.1
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson
  -DSHARE_INSTALL_DIR=/usr/share -DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
- kcoreaddons gettext"
+ kcoreaddons gettext kpackage"
 makedepends="qt5-devel gmp-devel gmpxx-devel qt5-webkit-devel
  qt5-declarative-devel kconfig-devel kcoreaddons-devel kdelibs4support-devel
  kpackage-devel plasma-framework-devel knewstuff-devel"
@@ -15,7 +15,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="LGPL-2.1-or-later"
 homepage="https://www.linux-apps.com/content/show.php/libalkimia?content=137323"
 distfiles="${KDE_SITE}/alkimia/${version}/alkimia-${version}.tar.xz"
-checksum=916807352707b0490cdd9ca65682eff73b00ca523029bda6fe7a2749a1bc927c
+checksum=957adc63c0be54dd433e3268a37323be5456e5ab84ece27f73a1616a92db86d5
 
 libalkimia-devel_package() {
 	short_desc+=" - development files"

From 0ffbfb58f765111524776276346d346a3d8479e5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 May 2022 09:26:50 +0200
Subject: [PATCH 2071/2561] libvirt: update to 8.3.0.

---
 srcpkgs/libvirt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index e73c337822e7..e6af657a3b8b 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=8.2.0
+version=8.3.0
 revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
@@ -20,7 +20,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=0ecd9c7dd52db7a2d124155ffa5e11de2fbd05014eceffbd1972b022d21becba
+checksum=be229b9ad1d48be7007e7bf341fc990c65e24aea624c16db6b36d02c820df5eb
 # At least one test times out on CI but works locally
 make_check=ci-skip
 

From 2dc77d60eba867c9666ee4c9a6bc6f627b2606f5 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 May 2022 09:29:31 +0200
Subject: [PATCH 2072/2561] libvirt-python3: update to 8.3.0.

---
 srcpkgs/libvirt-python3/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libvirt-python3/template b/srcpkgs/libvirt-python3/template
index 2aea5df86fec..e9d77cf43598 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,10 +1,11 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=8.2.0
+version=8.3.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
-hostmakedepends="pkg-config python3-devel libvirt-devel libapparmor-devel"
+hostmakedepends="pkg-config python3-devel python3-setuptools libvirt-devel
+ libapparmor-devel"
 makedepends="libvirt-devel python3-devel"
 checkdepends="python3-pytest python3-lxml python3-nose"
 short_desc="Libvirt virtualization API Python3 binding"
@@ -12,7 +13,7 @@ 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=f8b8cea67ff0d64d63029cc3410a4656e04ee9f26837a856bc0c287da55d053a
+checksum=e936ff747c1d72b6618eebb7236ae69c255ca9e0de6e4153d95d8b9c6b2ecfc1
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest

From 54c7ee81981ae20181bbaffba38f3700ffcb1faa Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 May 2022 09:41:52 +0200
Subject: [PATCH 2073/2561] linux4.19: update to 4.19.241.

---
 srcpkgs/linux4.19/files/i386-dotconfig    | 5 ++---
 srcpkgs/linux4.19/files/ppc-dotconfig     | 4 ++--
 srcpkgs/linux4.19/files/ppc64-dotconfig   | 5 ++---
 srcpkgs/linux4.19/files/ppc64le-dotconfig | 5 ++---
 srcpkgs/linux4.19/files/x86_64-dotconfig  | 5 ++---
 srcpkgs/linux4.19/template                | 4 ++--
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/linux4.19/files/i386-dotconfig b/srcpkgs/linux4.19/files/i386-dotconfig
index 3a63fc470876..4552d18061c8 100644
--- a/srcpkgs/linux4.19/files/i386-dotconfig
+++ b/srcpkgs/linux4.19/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 4.19.230 Kernel Configuration
+# Linux/i386 4.19.241 Kernel Configuration
 #
 
 #
@@ -2003,6 +2003,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3237,8 +3238,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig
index c58c80497acd..b5025b4536cf 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.230 Kernel Configuration
+# Linux/powerpc 4.19.241 Kernel Configuration
 #
 
 #
@@ -1649,6 +1649,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_MAC_FLOPPY=y
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
@@ -2931,7 +2932,6 @@ CONFIG_MISDN_W6692=m
 # CONFIG_MISDN_NETJET is not set
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
-# CONFIG_NVM is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux4.19/files/ppc64-dotconfig b/srcpkgs/linux4.19/files/ppc64-dotconfig
index ad7f89793eff..ca44b106df42 100644
--- a/srcpkgs/linux4.19/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.230 Kernel Configuration
+# Linux/powerpc 4.19.241 Kernel Configuration
 #
 
 #
@@ -2018,6 +2018,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3317,8 +3318,6 @@ CONFIG_IEEE802154_HWSIM=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux4.19/files/ppc64le-dotconfig b/srcpkgs/linux4.19/files/ppc64le-dotconfig
index 195a7ef89b4d..0c14831463ab 100644
--- a/srcpkgs/linux4.19/files/ppc64le-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64le-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.230 Kernel Configuration
+# Linux/powerpc 4.19.241 Kernel Configuration
 #
 
 #
@@ -1929,6 +1929,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3171,8 +3172,6 @@ CONFIG_IEEE802154_HWSIM=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux4.19/files/x86_64-dotconfig b/srcpkgs/linux4.19/files/x86_64-dotconfig
index 43c483127f5b..0bcdb8d876cb 100644
--- a/srcpkgs/linux4.19/files/x86_64-dotconfig
+++ b/srcpkgs/linux4.19/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.19.230 Kernel Configuration
+# Linux/x86_64 4.19.241 Kernel Configuration
 #
 
 #
@@ -2053,6 +2053,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3308,8 +3309,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 725d28a4a212..d58249cf182a 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.240
+version=4.19.241
 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=72ac1fd5bdf9b1d0a6da1237692a0570028cb994e750f99992d374eb9fdd46c2
+checksum=4c6269d3c14e593151b035a55227110e632642d848032ef6992135c18488fe13
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 6ca0500ccdfa55ae3c98d355888f086501c95c53 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 7 May 2022 10:26:17 +0200
Subject: [PATCH 2074/2561] wine: update to 7.8.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index b08032957c49..6fa72d3b0d65 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.7
+version=7.8
 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="52a4d06ba77080df4a4b022bf9c2cc05cfa1d79bd4bb08c6b88f7c3ae09d1464
- 9a8c18196ea346cdce84bd87693e911ecb505c1324b85bdbf60b115f8c487ab7"
+checksum="8f76e9c96b50f2ac8e24e5deedfa3e0d9596a5706709226f65a94c6a160019b8
+ 2561142889a700534b1d710d000cd6d819b9ed23c55b0f66b5af878b4a29a587"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 4c1655aa024bcfb8c2122b050bacd3477c1576c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 May 2022 11:36:48 +0200
Subject: [PATCH 2075/2561] libfido2: update to 1.11.0.

---
 srcpkgs/libfido2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index b1ac557296c8..85f27e57bfa2 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,6 +1,6 @@
 # Template file for 'libfido2'
 pkgname=libfido2
-version=1.10.0
+version=1.11.0
 revision=1
 build_style=cmake
 configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
@@ -11,7 +11,7 @@ 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=526efd3d56af706c05d09f3d21f18ee3b0b15ac0c1f5c5da1acbc27c2730b99b
+checksum=0830c5853e3b44099a97166e0cec54a65b54b7faaac07071872f77b8e4d7b302
 # 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"

From c2ea76e48c40bb45654b36b6306c2fd312b4b5ee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 7 May 2022 11:37:50 +0200
Subject: [PATCH 2076/2561] carton: update to 1.0.35.

---
 srcpkgs/carton/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/carton/template b/srcpkgs/carton/template
index 4ae5b32d16e5..27d383712926 100644
--- a/srcpkgs/carton/template
+++ b/srcpkgs/carton/template
@@ -1,7 +1,7 @@
 # Template file for 'carton'
 pkgname=carton
-version=1.0.34
-revision=2
+version=1.0.35
+revision=1
 wrksrc="Carton-v${version}"
 build_style=perl-module
 hostmakedepends="perl perl-Class-Tiny perl-JSON perl-Menlo-Legacy
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="https://metacpan.org/release/Carton"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 distfiles="${CPAN_SITE}/XML/MIYAGAWA/Carton-v${version}.tar.gz"
-checksum=77d42b92732bcfc18a59d341e56ce476205b1c4d380eab3a07224f5745c23e45
+checksum=9c4558ca97cd08b69fdfb52b28c3ddc2043ef52f0627b90e53d05a4087344175

From 51f377fe00368a3c7f1c4aeb9356c9e459915a33 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 7 May 2022 14:17:27 +0200
Subject: [PATCH 2077/2561] sqlite: update to 3.38.5.

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 956daec63b5c..5ca279068b5d 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.4
+version=3.38.5
 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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=1935751066c2fd447404caa78cfb8b2b701fad3f6b1cf40b3d658440f6cc7563
+checksum=5af07de982ba658fd91a03170c945f99c971f6955bc79df3266544373e39869c
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From d42a65860172d29b04dd8b53a2432ecb7cc6b987 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 May 2022 22:51:24 +0300
Subject: [PATCH 2078/2561] New package: s6-portable-utils-man-pages-2.2.4.0.1

---
 srcpkgs/s6-portable-utils-man-pages/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/s6-portable-utils-man-pages/template

diff --git a/srcpkgs/s6-portable-utils-man-pages/template b/srcpkgs/s6-portable-utils-man-pages/template
new file mode 100644
index 000000000000..b040275bc53c
--- /dev/null
+++ b/srcpkgs/s6-portable-utils-man-pages/template
@@ -0,0 +1,16 @@
+# Template file for 's6-portable-utils-man-pages'
+pkgname=s6-portable-utils-man-pages
+version=2.2.4.0.1
+revision=1
+build_style=gnu-makefile
+hostmakedepends="mdocml"
+short_desc="Documentation for s6-portable-utils in mdoc(7) format"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="ISC"
+homepage="https://github.com/flexibeast/s6-portable-utils-man-pages"
+distfiles="https://github.com/flexibeast/s6-portable-utils-man-pages/archive/refs/tags/v${version}.tar.gz"
+checksum=c5d7cd6ed2d9c91f92784e5d6dd80161e6a5195b4b90477083e07ba424eb6720
+
+post_install() {
+	vlicense LICENSE
+}

From cdad530d65a25baec51e86c776f72fbab479770c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 6 May 2022 22:43:39 +0300
Subject: [PATCH 2079/2561] execline-man-pages: update to 2.8.3.0.2.

---
 srcpkgs/execline-man-pages/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/execline-man-pages/template b/srcpkgs/execline-man-pages/template
index fb3a1885cae1..3bebd8f3ba1e 100644
--- a/srcpkgs/execline-man-pages/template
+++ b/srcpkgs/execline-man-pages/template
@@ -1,6 +1,6 @@
 # Template file for 'execline-man-pages'
 pkgname=execline-man-pages
-version=2.8.1.0.4
+version=2.8.3.0.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="mdocml"
@@ -9,7 +9,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://github.com/flexibeast/execline-man-pages"
 distfiles="https://github.com/flexibeast/execline-man-pages/archive/v${version}.tar.gz"
-checksum=b535b83dc840b5285a19b9ee0ac3cd739912b069b3c4f3547d8b2ef6c6bcb98b
+checksum=7862c8918faa3e82ff0a65b5c108498a2b0b3b07b3ebfb8a7e6491890e0e84b4
 
 post_install() {
 	vlicense LICENSE

From b831d7e9540a1313dd5b9e7eee41bfa41df358cb Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 6 May 2022 20:59:47 +0300
Subject: [PATCH 2080/2561] lynx: update to 2.9.0dev.10.

---
 srcpkgs/lynx/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index 6ec7a39b4e7a..4266c099e153 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -1,17 +1,17 @@
 # Template file for 'lynx'
 pkgname=lynx
-version=2.9.0dev.9
+version=2.9.0dev.10
 revision=1
 wrksrc="lynx${version}"
 build_style=gnu-configure
 configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
 makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
-short_desc="A text browser for the World Wide Web"
+short_desc="Text browser for the World Wide Web"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lynx.invisible-island.net/"
 distfiles="http://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${version}.tar.bz2"
-checksum=6fd6dd3f57681ad58d3397c273b430a411ae049b367fd4909b3d70b722da501a
+checksum=898ac82bcfcbd4b20ea39afdf66fd659b8773c7549623b0f8802bf392a41a912
 
 pre_configure() {
 	sed -i configure \

From ade8702575e3cc6d7e545e55857814985c7e4a0c Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Tue, 3 May 2022 11:55:59 -0500
Subject: [PATCH 2081/2561] gptfdisk: update to 1.0.9.

---
 srcpkgs/gptfdisk/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gptfdisk/template b/srcpkgs/gptfdisk/template
index c1278f5d47db..a760af49bcc0 100644
--- a/srcpkgs/gptfdisk/template
+++ b/srcpkgs/gptfdisk/template
@@ -1,6 +1,6 @@
 # Template file for 'gptfdisk'
 pkgname=gptfdisk
-version=1.0.8
+version=1.0.9
 revision=1
 build_style=gnu-makefile
 make_check_target=test
@@ -8,9 +8,9 @@ makedepends="ncurses-devel popt-devel libuuid-devel"
 short_desc="GPT fdisk text-mode partitioning tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.rodsbooks.com/gdisk/"
+homepage="https://www.rodsbooks.com/gdisk/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=95d19856f004dabc4b8c342b2612e8d0a9eebdd52004297188369f152e9dc6df
+checksum=dafead2693faeb8e8b97832b23407f6ed5b3219bc1784f482dd855774e2d50c2
 
 pre_build() {
 	vsed -i 's#<ncursesw/ncurses.h>#<ncurses.h>#' gptcurses.cc

From 1a9685a366ec727d547b44f441e95eb4b43bc037 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 6 May 2022 18:21:38 +0300
Subject: [PATCH 2082/2561] mupdf: update to 1.19.1.

I also switched from a `tar.gz` tarball to a `tar.xz` one since it's
smaller in size (87 MB vs 62 MB).
---
 srcpkgs/mupdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index c6331d120357..93286959c402 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,6 +1,6 @@
 # Template file for 'mupdf'
 pkgname=mupdf
-version=1.19.0
+version=1.19.1
 revision=1
 wrksrc="${pkgname}-${version}-source"
 hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
@@ -14,8 +14,8 @@ short_desc="Lightweight PDF and XPS viewer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://mupdf.com"
-distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.gz"
-checksum=21affcd4fcabf1cc7a896db95ba971552ba9df229ebec7720313a8803185deed
+distfiles="https://mupdf.com/downloads/archive/${pkgname}-${version}-source.tar.xz"
+checksum=b5eac663fe74f33c430eda342f655cf41fa73d71610f0884768a856a82e3803e
 
 pre_build() {
 	# libmupdf-{threads,pkcs7}.a are required by fbpdf

From ef97b3e743d2b802bff3cacb8d7eac9c682021e5 Mon Sep 17 00:00:00 2001
From: Mat Boehlke <mtboehlke@gmail.com>
Date: Thu, 14 Apr 2022 10:44:44 -0500
Subject: [PATCH 2083/2561] dropbear: update to 2022.82.

---
 srcpkgs/dropbear/patches/test-without-pip.patch | 15 +++++++++++++++
 srcpkgs/dropbear/template                       | 12 ++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/dropbear/patches/test-without-pip.patch

diff --git a/srcpkgs/dropbear/patches/test-without-pip.patch b/srcpkgs/dropbear/patches/test-without-pip.patch
new file mode 100644
index 000000000000..f726be40a34e
--- /dev/null
+++ b/srcpkgs/dropbear/patches/test-without-pip.patch
@@ -0,0 +1,15 @@
+diff --git a/test/Makefile.in b/test/Makefile.in
+index b2c8d43..5747310 100644
+--- a/test/Makefile.in
++++ b/test/Makefile.in
+@@ -13,9 +13,7 @@ one: venv/bin/pytest fakekey
+ fakekey:
+ 	../dropbearkey -t ecdsa -f $@
+ 
+-venv/bin/pytest: $(srcdir)/requirements.txt
++venv/bin/pytest:
+ 	python3 -m venv init venv
+-	./venv/bin/pip install --upgrade pip
+-	./venv/bin/pip install -r $(srcdir)/requirements.txt
+ 
+ .PHONY: test
diff --git a/srcpkgs/dropbear/template b/srcpkgs/dropbear/template
index 69981dcfe9e5..8b792314536d 100644
--- a/srcpkgs/dropbear/template
+++ b/srcpkgs/dropbear/template
@@ -1,19 +1,27 @@
 # Template file for 'dropbear'
 pkgname=dropbear
-version=2020.81
+version=2022.82
 revision=1
 build_style=gnu-configure
 configure_args="--enable-zlib --disable-bundled-libtom"
 makedepends="zlib-devel libtommath-devel libtomcrypt-devel"
+checkdepends="python3-pytest python3-parsing python3-psutil openssh"
 short_desc="Small SSH server and client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://matt.ucc.asn.au/dropbear/dropbear.html"
 changelog="https://matt.ucc.asn.au/dropbear/CHANGES"
 distfiles="https://matt.ucc.asn.au/${pkgname}/releases/${pkgname}-${version}.tar.bz2"
-checksum=48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b
+checksum=3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1
 make_dirs="/etc/dropbear 0755 root root"
 
+# These tests don't work from within xbps-src
+# and probably should not be run from there
+pre_check() {
+	rm test/test_aslr.py
+	rm test/test_channels.py
+}
+
 post_install() {
 	vsv dropbear
 	vlicense LICENSE

From 6d43cc36c23380286eaafe61e447a46f106a36b1 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 4 May 2022 16:45:42 +0200
Subject: [PATCH 2084/2561] python3-pivy: update to 0.6.7.

Closes: #36984 [via git-merge-pr]
---
 srcpkgs/python3-pivy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pivy/template b/srcpkgs/python3-pivy/template
index 6105058d9982..a442b6a94c87 100644
--- a/srcpkgs/python3-pivy/template
+++ b/srcpkgs/python3-pivy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pivy'
 pkgname=python3-pivy
-version=0.6.6
-revision=3
+version=0.6.7
+revision=1
 wrksrc="pivy-${version}"
 build_style=cmake
 hostmakedepends="python3-devel swig"
@@ -12,7 +12,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
 license="ISC"
 homepage="https://github.com/coin3d/pivy"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=27204574d894cc12aba5df5251770f731f326a3e7de4499e06b5f5809cc5659e
+checksum=37e33d85117aac27640e011df74ddcd77f270428300df916b46ee5c50645d582
 
 # still relevant with pivy 0.6.6 ?
 case "$XBPS_TARGET_MACHINE" in

From e5d8050e8c44870c28417d43d730c97ccf39cc25 Mon Sep 17 00:00:00 2001
From: Caleb Heydon <caleb.heydon@gmail.com>
Date: Sat, 9 Apr 2022 16:53:19 -0400
Subject: [PATCH 2085/2561] freecad: update to 0.19.4.

Closes: #36607 [via git-merge-pr]
---
 srcpkgs/freecad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index a2f04bd91f1b..1e2aec024fd7 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
 # Template file for 'freecad'
 pkgname=freecad
-version=0.19.2
-revision=4
+version=0.19.4
+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=47e39e3d6fcafe6e0c68923fb1b86acda16986268e5e6011694057b940139fba
+checksum=e40a1c343956e13c56cc8578d025ae83d68d9d20acda1732953bc8a3883e9722
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" libexecinfo-devel"

From 392deacdefbca037fe6c33d475ff3f91c18472a8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Oct 2021 14:43:08 -0400
Subject: [PATCH 2086/2561] New package: activityrelay-0.2.0

---
 .../activityrelay/files/activityrelay/log/run |  1 +
 srcpkgs/activityrelay/files/activityrelay/run |  5 +++
 srcpkgs/activityrelay/template                | 36 +++++++++++++++++++
 srcpkgs/activityrelay/update                  |  2 ++
 4 files changed, 44 insertions(+)
 create mode 120000 srcpkgs/activityrelay/files/activityrelay/log/run
 create mode 100755 srcpkgs/activityrelay/files/activityrelay/run
 create mode 100644 srcpkgs/activityrelay/template
 create mode 100644 srcpkgs/activityrelay/update

diff --git a/srcpkgs/activityrelay/files/activityrelay/log/run b/srcpkgs/activityrelay/files/activityrelay/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/activityrelay/files/activityrelay/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/activityrelay/files/activityrelay/run b/srcpkgs/activityrelay/files/activityrelay/run
new file mode 100755
index 000000000000..2082710dd442
--- /dev/null
+++ b/srcpkgs/activityrelay/files/activityrelay/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+exec 2>&1
+exec chpst -u _activityrelay:_activityrelay activityrelay \
+	-c ${CONFIG_FILE:-/etc/activityrelay/activityrelay.yaml}
diff --git a/srcpkgs/activityrelay/template b/srcpkgs/activityrelay/template
new file mode 100644
index 000000000000..dc8271c846d2
--- /dev/null
+++ b/srcpkgs/activityrelay/template
@@ -0,0 +1,36 @@
+# Template file for 'activityrelay'
+pkgname=activityrelay
+version=0.2.0
+revision=1
+wrksrc="relay-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-aiohttp python3-cachetools python3-click python3-pycryptodome
+ python3-yaml"
+short_desc="Generic LitePub relay (works with LitePub consumers and Mastodon)"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="AGPL-3.0-or-later"
+homepage="https://git.pleroma.social/pleroma/relay"
+distfiles="https://git.pleroma.social/pleroma/relay/-/archive/${version}/relay-${version}.tar.gz"
+checksum=32db6e1084ddc5b000d45e8f5f7e098132082ea04eb538fc4927e94f49ac2a50
+make_check=no # no tests specified
+
+system_accounts="_activityrelay"
+_activityrelay_homedir="/var/lib/activityrelay"
+
+make_dirs="/var/lib/activityrelay 0700 _activityrelay _activityrelay
+ /etc/activityrelay 0755 _activityrelay _activityrelay"
+
+post_patch() {
+	vsed -i 's,relay.jsonld,/var/lib/activityrelay/relay.jsonld,' relay.yaml.example
+}
+
+post_install() {
+	vsv activityrelay
+	vsconf installation/relay.caddy
+	vsconf installation/relay.nginx
+	vsconf relay.yaml.example
+	vsconf Dockerfile
+
+	vlicense LICENSE
+}
diff --git a/srcpkgs/activityrelay/update b/srcpkgs/activityrelay/update
new file mode 100644
index 000000000000..2a4e4176fdc7
--- /dev/null
+++ b/srcpkgs/activityrelay/update
@@ -0,0 +1,2 @@
+site="https://git.pleroma.social/pleroma/relay/-/tags"
+pkgname="relay"

From 1fd99f707600db7661730da5ed5e2f7291dfcaed Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Tue, 4 Jan 2022 16:11:43 -0800
Subject: [PATCH 2087/2561] New package: R-cran-RInside-0.2.16

---
 common/shlibs                   | 16 ++++++++++++++++
 srcpkgs/R-cran-RInside/template | 12 ++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/R-cran-RInside/template

diff --git a/common/shlibs b/common/shlibs
index 353e291f59d6..784375c7c9aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4153,3 +4153,19 @@ librz_bin.so.0.3.4 rizin-0.3.4_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
 libnvme.so.1 libnvme-1.0_1
+libRInside.so R-cran-RInside-0.2.16_1
+libXrdUtils.so.3 xrootd-5.4.0_1
+libXrdCl.so.3 xrootd-5.4.0_1
+libXrdServer.so.3 xrootd-5.4.0_1
+libXrdCrypto.so.2 xrootd-5.4.0_1
+libXrdPosix.so.3 xrootd-5.4.0_1
+libXrdHttpUtils.so.2 xrootd-5.4.0_1
+libXrdSsiLib.so.2 xrootd-5.4.0_1
+libXrdCryptoLite.so.2 xrootd-5.4.0_1
+libCore.so root-6.24.06_1
+libTree.so root-6.24.06_1
+libRIO.so root-6.24.06_1
+libMatrix.so root-6.24.06_1
+libThread.so root-6.24.06_1
+libTMVA.so root-6.24.06_1
+libMathCore.so root-6.24.06_1
diff --git a/srcpkgs/R-cran-RInside/template b/srcpkgs/R-cran-RInside/template
new file mode 100644
index 000000000000..9bd19d893cd1
--- /dev/null
+++ b/srcpkgs/R-cran-RInside/template
@@ -0,0 +1,12 @@
+# Template file for 'R-cran-RInside'
+pkgname=R-cran-RInside
+version=0.2.17
+revision=1
+build_style=R-cran
+makedepends="R-cran-Rcpp"
+short_desc="C++ classes to embed R in C++ (and C) applications"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://CRAN.R-project.org/package=RInside"
+checksum=0be28c44ee34cba669a7264d2b99c289230645598ca78e21682559dc31824348
+shlib_provides="libRInside.so"

From 08c17c6a4f699edffd6207ce4c7cd49def1150a1 Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Tue, 11 Jan 2022 12:36:46 -0800
Subject: [PATCH 2088/2561] New package: xrootd-5.4.0

---
 srcpkgs/xrootd/patches/musl.patch | 227 ++++++++++++++++++++++++++++++
 srcpkgs/xrootd/template           |  21 +++
 2 files changed, 248 insertions(+)
 create mode 100644 srcpkgs/xrootd/patches/musl.patch
 create mode 100644 srcpkgs/xrootd/template

diff --git a/srcpkgs/xrootd/patches/musl.patch b/srcpkgs/xrootd/patches/musl.patch
new file mode 100644
index 000000000000..7dccd97d6c45
--- /dev/null
+++ b/srcpkgs/xrootd/patches/musl.patch
@@ -0,0 +1,227 @@
+diff --git a/src/Xrd/XrdConfig.hh b/src/Xrd/XrdConfig.hh
+index a06ad462f..702403d82 100644
+--- a/src/Xrd/XrdConfig.hh
++++ b/src/Xrd/XrdConfig.hh
+@@ -34,6 +34,11 @@
+ #include "Xrd/XrdProtLoad.hh"
+ #include "Xrd/XrdProtocol.hh"
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++#define __NEED_mode_t
++#include <bits/alltypes.h>
++#endif
++
+ class XrdSysError;
+ class XrdTcpMonInfo;
+ class XrdNetSecurity;
+diff --git a/src/XrdAcc/XrdAccGroups.cc b/src/XrdAcc/XrdAccGroups.cc
+index e663fdd35..14c3b19d6 100644
+--- a/src/XrdAcc/XrdAccGroups.cc
++++ b/src/XrdAcc/XrdAccGroups.cc
+@@ -46,6 +46,14 @@
+ #include "XrdAcc/XrdAccGroups.hh"
+ #include "XrdAcc/XrdAccPrivs.hh"
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++int innetgr(const char *netgroup, const char *host, const char *user,
++             const char *domain)
++{
++   return 0;
++}
++#endif
++
+ // Additionally, this routine does not support a user in more than
+ // NGROUPS_MAX groups. This is a standard unix limit defined in limits.h.
+   
+diff --git a/src/XrdCl/XrdClFileStateHandler.hh b/src/XrdCl/XrdClFileStateHandler.hh
+index 9f9d8b91f..5ff49cbbc 100644
+--- a/src/XrdCl/XrdClFileStateHandler.hh
++++ b/src/XrdCl/XrdClFileStateHandler.hh
+@@ -42,6 +42,12 @@
+ #include <sys/uio.h>
+ #include <cstdint>
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++#define __NEED_suseconds_t
++#define __NEED_struct_timeval
++#include <bits/alltypes.h>
++#endif
++
+ namespace
+ {
+   class PgReadHandler;
+diff --git a/src/XrdCl/XrdClMonitor.hh b/src/XrdCl/XrdClMonitor.hh
+index 2fc753777..d22c3c275 100644
+--- a/src/XrdCl/XrdClMonitor.hh
++++ b/src/XrdCl/XrdClMonitor.hh
+@@ -43,6 +43,12 @@
+ 
+ #include "XrdCl/XrdClFileSystem.hh"
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++#define __NEED_suseconds_t
++#define __NEED_struct_timeval
++#include <bits/alltypes.h>
++#endif
++
+ namespace XrdCl
+ {
+   class URL;
+diff --git a/src/XrdNet/XrdNetSecurity.cc b/src/XrdNet/XrdNetSecurity.cc
+index 0f8451127..e39b1ef4b 100644
+--- a/src/XrdNet/XrdNetSecurity.cc
++++ b/src/XrdNet/XrdNetSecurity.cc
+@@ -40,12 +40,14 @@
+ #include <sys/types.h>
+ #include <Winsock2.h>
+ #include <io.h>
++#include "XrdSys/XrdWin32.hh"
++#endif
++#if WIN32 || defined(__linux__) && !defined(__GLIBC__)
+ int innetgr(const char *netgroup, const char *host, const char *user,
+              const char *domain)
+ {
+    return 0;
+ }
+-#include "XrdSys/XrdWin32.hh"
+ #endif
+ 
+ #include "XrdNet/XrdNetAddr.hh"
+diff --git a/src/XrdPosix/XrdPosix.cc b/src/XrdPosix/XrdPosix.cc
+index 0f32dc2ee..b6dea957f 100644
+--- a/src/XrdPosix/XrdPosix.cc
++++ b/src/XrdPosix/XrdPosix.cc
+@@ -37,6 +37,9 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/uio.h>
++#if defined(__linux__) && !defined(_IO_ERR_SEEN)
++#include <stdio_ext.h>
++#endif
+ 
+ #include "XrdSys/XrdSysHeaders.hh"
+ #include "XrdPosix/XrdPosixLinkage.hh"
+@@ -311,8 +314,12 @@ size_t XrdPosix_Fread(void *ptr, size_t size, size_t nitems, FILE *stream)
+         if (bytes > 0 && size) rc = bytes/size;
+ #ifndef SUNX86
+ #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
++#ifdef _IO_ERR_SEEN
+    else if (bytes < 0) stream->_flags |= _IO_ERR_SEEN;
+    else                stream->_flags |= _IO_EOF_SEEN;
++#else
++   else if (bytes < 0) __fseterr(stream);
++#endif
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+    else if (bytes < 0) stream->_flags |= __SEOF;
+    else                stream->_flags |= __SERR;
+@@ -482,7 +489,11 @@ size_t XrdPosix_Fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream
+    if (bytes > 0 && size) rc = bytes/size;
+ #ifndef SUNX86
+ #if defined(__linux__) || defined(__GNU__) || (defined(__FreeBSD_kernel__) && defined(__GLIBC__))
++#ifdef _IO_ERR_SEEN
+       else stream->_flags |= _IO_ERR_SEEN;
++#else
++      else  __fseterr(stream);
++#endif
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+       else stream->_flags |= __SERR;
+ #else
+diff --git a/src/XrdPosix/XrdPosixLinkage.hh b/src/XrdPosix/XrdPosixLinkage.hh
+index 903153252..b5cc6d4b4 100644
+--- a/src/XrdPosix/XrdPosixLinkage.hh
++++ b/src/XrdPosix/XrdPosixLinkage.hh
+@@ -40,6 +40,7 @@
+ #include <unistd.h>
+ 
+ #include "XrdPosix/XrdPosixOsDep.hh"
++#include "XrdPosix/XrdPosixXrootd.hh"
+ #include "XrdSys/XrdSysPlatform.hh"
+ 
+ /******************************************************************************/
+diff --git a/src/XrdPosix/XrdPosixMap.hh b/src/XrdPosix/XrdPosixMap.hh
+index ac2da483a..a15602787 100644
+--- a/src/XrdPosix/XrdPosixMap.hh
++++ b/src/XrdPosix/XrdPosixMap.hh
+@@ -36,6 +36,11 @@
+ #include "XrdCl/XrdClFileSystem.hh"
+ #include "XrdCl/XrdClXRootDResponses.hh"
+ 
++#if defined(__linux__) && !defined(__GLIBC__)
++#define __NEED_dev_t
++#include <bits/alltypes.h>
++#endif
++
+ class XrdPosixMap
+ {
+ public:
+diff --git a/src/XrdPosix/XrdPosixPreload.cc b/src/XrdPosix/XrdPosixPreload.cc
+index 867b73479..d967c53b3 100644
+--- a/src/XrdPosix/XrdPosixPreload.cc
++++ b/src/XrdPosix/XrdPosixPreload.cc
+@@ -42,6 +42,22 @@
+ 
+ #include "XrdPosix/XrdPosixExtern.hh"
+  
++#ifdef creat64
++#undef creat64
++#undef fseeko64
++#undef ftello64
++#undef ftruncate64
++#undef lseek64
++#undef open64
++#undef pread64
++#undef pwrite64
++#undef readdir64
++#undef readdir64_r
++#undef statfs64
++#undef statvfs64
++#undef truncate64
++#endif
++
+ /******************************************************************************/
+ /*                   G l o b a l   D e c l a r a t i o n s                    */
+ /******************************************************************************/
+diff --git a/src/XrdSys/XrdSysPlatform.hh b/src/XrdSys/XrdSysPlatform.hh
+index a1ac544ad..eaeaeabac 100644
+--- a/src/XrdSys/XrdSysPlatform.hh
++++ b/src/XrdSys/XrdSysPlatform.hh
+@@ -241,16 +241,8 @@ extern "C"
+ #if defined(_AIX) || \
+    (defined(XR__SUNGCC3) && !defined(__arch64__))
+ #   define SOCKLEN_t size_t
+-#elif defined(XR__GLIBC) || \
+-   defined(__FreeBSD__) || \
+-   (defined(__FreeBSD_kernel__) && defined(__GLIBC__)) || \
+-   (defined(XR__SUNGCC3) && defined(__arch64__)) || defined(__APPLE__) || \
+-   (defined(__sun) && defined(_SOCKLEN_T))
+-#   ifndef SOCKLEN_t
+-#      define SOCKLEN_t socklen_t
+-#   endif
+ #elif !defined(SOCKLEN_t)
+-#   define SOCKLEN_t int
++#   define SOCKLEN_t socklen_t
+ #endif
+ 
+ #ifdef _LP64
+diff --git a/src/XrdSys/XrdSysPthread.hh b/src/XrdSys/XrdSysPthread.hh
+index 17f8fd0be..78741a7dc 100644
+--- a/src/XrdSys/XrdSysPthread.hh
++++ b/src/XrdSys/XrdSysPthread.hh
+@@ -351,7 +351,7 @@ enum PrefType {prefWR=1};
+ 
+         XrdSysRWLock(PrefType ptype)
+                     {
+-#ifdef __linux__
++#ifdef __GLIBC__
+                      pthread_rwlockattr_t attr;
+                      pthread_rwlockattr_setkind_np(&attr,
+                              PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
+@@ -367,7 +367,7 @@ enum PrefType {prefWR=1};
+ inline void ReInitialize(PrefType ptype)
+ {
+   pthread_rwlock_destroy(&lock);
+-#ifdef __linux__
++#ifdef __GLIBC__
+   pthread_rwlockattr_t attr;
+   pthread_rwlockattr_setkind_np(&attr,
+                      PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
diff --git a/srcpkgs/xrootd/template b/srcpkgs/xrootd/template
new file mode 100644
index 000000000000..2bd0b59714c2
--- /dev/null
+++ b/srcpkgs/xrootd/template
@@ -0,0 +1,21 @@
+# Template file for 'xrootd'
+pkgname=xrootd
+version=5.4.2
+revision=1
+build_style=cmake
+makedepends="zlib-devel openssl-devel libuuid-devel readline-devel"
+short_desc="Low latency, scalable and fault tolerant access to data"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://xrootd.slac.stanford.edu"
+distfiles="http://xrootd.org/download/v${version}/xrootd-${version}.tar.gz"
+checksum=d868ba5d8b71ec38f7a113d2d8f3e25bbcedc1bc23d21bba1686ddfdb2b900c1
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo"
+	makedepends+=" libexecinfo-devel"
+fi
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic"
+	makedepends+=" libatomic-devel"
+fi

From 4bdf656cf4fcb72b2561df71f7356444cd12b99f Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Tue, 11 Jan 2022 12:38:46 -0800
Subject: [PATCH 2089/2561] New package: libvdt-0.4.3

---
 srcpkgs/libvdt-devel    |  1 +
 srcpkgs/libvdt/template | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 120000 srcpkgs/libvdt-devel
 create mode 100644 srcpkgs/libvdt/template

diff --git a/srcpkgs/libvdt-devel b/srcpkgs/libvdt-devel
new file mode 120000
index 000000000000..25fca34b3833
--- /dev/null
+++ b/srcpkgs/libvdt-devel
@@ -0,0 +1 @@
+libvdt
\ No newline at end of file
diff --git a/srcpkgs/libvdt/template b/srcpkgs/libvdt/template
new file mode 100644
index 000000000000..3caa629d6eb2
--- /dev/null
+++ b/srcpkgs/libvdt/template
@@ -0,0 +1,28 @@
+# Template file for 'libvdt'
+pkgname=libvdt
+version=0.4.3
+revision=1
+wrksrc="vdt-${version}"
+build_style=cmake
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*|arm*)
+	configure_args="-DSSE=OFF -DNEON=OFF"
+	make_cmd=make
+	export CMAKE_GENERATOR="Unix Makefiles"
+	;;
+esac
+hostmakedepends="python3"
+short_desc="Collection of fast and inline implementations of mathematical functions"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/dpiparo/vdt"
+distfiles="https://github.com/dpiparo/vdt/archive/refs/tags/v${version}.tar.gz"
+checksum=705674612ebb5c182b65a8f61f4d173eb7fe7cdeee2235b402541a492e08ace1
+
+libvdt-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+	}
+}

From bc1e8f7d602a1fe76a32a91ad7cb6baf1fd0e82f Mon Sep 17 00:00:00 2001
From: Ben Jargowsky <benjar63@gmail.com>
Date: Mon, 20 Dec 2021 23:55:36 -0500
Subject: [PATCH 2090/2561] New package: root-6.26.02

---
 srcpkgs/python3-pyroot          |  1 +
 srcpkgs/root-R                  |  1 +
 srcpkgs/root/INSTALL.msg        |  3 ++
 srcpkgs/root/patches/musl.patch | 21 +++++++++++
 srcpkgs/root/template           | 66 +++++++++++++++++++++++++++++++++
 5 files changed, 92 insertions(+)
 create mode 120000 srcpkgs/python3-pyroot
 create mode 120000 srcpkgs/root-R
 create mode 100644 srcpkgs/root/INSTALL.msg
 create mode 100644 srcpkgs/root/patches/musl.patch
 create mode 100644 srcpkgs/root/template

diff --git a/srcpkgs/python3-pyroot b/srcpkgs/python3-pyroot
new file mode 120000
index 000000000000..93ca1422a8da
--- /dev/null
+++ b/srcpkgs/python3-pyroot
@@ -0,0 +1 @@
+root
\ No newline at end of file
diff --git a/srcpkgs/root-R b/srcpkgs/root-R
new file mode 120000
index 000000000000..93ca1422a8da
--- /dev/null
+++ b/srcpkgs/root-R
@@ -0,0 +1 @@
+root
\ No newline at end of file
diff --git a/srcpkgs/root/INSTALL.msg b/srcpkgs/root/INSTALL.msg
new file mode 100644
index 000000000000..4d92c4ced6bc
--- /dev/null
+++ b/srcpkgs/root/INSTALL.msg
@@ -0,0 +1,3 @@
+Before using ROOT, source 'thisroot.sh' to set up environmental variables.
+
+$ source /usr/bin/thisroot.sh # also available: thisroot.{csh,fish}
diff --git a/srcpkgs/root/patches/musl.patch b/srcpkgs/root/patches/musl.patch
new file mode 100644
index 000000000000..7605e91675a3
--- /dev/null
+++ b/srcpkgs/root/patches/musl.patch
@@ -0,0 +1,21 @@
+diff --git a/core/thread/src/TPosixThread.cxx b/core/thread/src/TPosixThread.cxx
+index 1e879c1c3a..4e1245baeb 100644
+--- a/core/thread/src/TPosixThread.cxx
++++ b/core/thread/src/TPosixThread.cxx
+@@ -37,13 +37,13 @@ Int_t TPosixThread::Run(TThread *th, const int affinity)
+    pthread_attr_init(attr);
+    
+    if (affinity >= 0) {
+-   #ifdef R__MACOSX
+-      Warning("Run", "Affinity setting not yet implemented on MacOS");
+-   #else
++   #ifdef __GLIBC__
+       cpu_set_t cpuset;
+       CPU_ZERO(&cpuset);
+       CPU_SET(affinity, &cpuset);
+       pthread_attr_setaffinity_np(attr, sizeof(cpu_set_t), &cpuset);
++   #else
++      Warning("Run", "Affinity setting not yet implemented on this platform");
+    #endif
+    }
+ 
diff --git a/srcpkgs/root/template b/srcpkgs/root/template
new file mode 100644
index 000000000000..bfc8cb6d8a3b
--- /dev/null
+++ b/srcpkgs/root/template
@@ -0,0 +1,66 @@
+# Template file for 'root'
+pkgname=root
+version=6.26.02
+revision=1
+# Only i686 and x86_64 seem to be officially supported
+archs="i686* x86_64*"
+build_style=cmake
+configure_args="-Dgnuinstall=ON -Druntime_cxxmodules=OFF
+ -Dclad=OFF $(vopt_if fortran '-Dfortran=ON')
+ -DXROOTD_XrdCl_LIBRARY=/usr/lib/libXrdCl.so.3
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib/root -Dr=ON
+ -DCMAKE_INSTALL_SYSCONFDIR='libexec/root'
+ $(vopt_if root7 '-Droot7=ON -DCMAKE_CXX_STANDARD=17 -Dwebgui=ON')
+ -DCMAKE_INSTALL_PYTHONDIR=${py3_sitelib/'usr/'}"
+hostmakedepends="gcc-fortran"
+makedepends="libX11-devel libXpm-devel libXft-devel libXext-devel
+ openssl-devel libpng-devel readline-devel tbb-devel liblz4-devel
+ pcre-devel xxHash-devel libzstd-devel liblzma-devel libvdt-devel
+ libxml2-devel python3-devel python3-numpy R-cran-Rcpp R-cran-RInside
+ xrootd"
+depends="gcc"
+case "$XBPS_TARGET_MACHINE" in
+	*-musl)
+	configure_args+=" -Dssl=OFF"
+	;;
+esac
+short_desc="C++ framework for data processing created by CERN"
+maintainer="Ben Jargowsky <benjar63@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://root.cern"
+distfiles="https://root.cern/download/root_v${version}.source.tar.gz"
+checksum=7ba96772271a726079506c5bf629c3ceb21bf0682567ed6145be30606d7cd9bb
+build_options="fortran root7"
+build_options_default="fortran"
+python_version=3
+shlib_provides="libCore.so libTree.so libRIO.so libMatrix.so libThread.so
+ libTMVA.so libMathCore.so"
+
+post_install() {
+	rm -v ${DESTDIR}/usr/share/root/fonts/LICENSE
+	rm -v ${DESTDIR}/usr/share/root/fonts/[a-mt-z]*.ttf
+}
+
+python3-pyroot_package() {
+	short_desc="Python interface to ROOT"
+	depends="root>=${version}_${revision} python3"
+	pkg_install() {
+		vmove ${py3_sitelib}
+	}
+}
+root-R_package() {
+	short_desc="ROOT interface to R"
+	depends="root>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/root/RExports.h
+		vmove usr/include/root/TRDataFrame.h
+		vmove usr/include/root/TRFunctionExport.h
+		vmove usr/include/root/TRFunctionImport.h
+		vmove usr/include/root/TRInterface.h
+		vmove usr/include/root/TRInternalFunction.h
+		vmove usr/include/root/TRObject.h
+		vmove usr/lib/root/libRInterface.so
+		vmove usr/lib/root/libRMVA.so
+		vmove usr/lib/root/libRtools.so
+	}
+}

From 18513cc3d1e002f82f8ffb8efd6aeb0f7932639c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 27 Mar 2022 21:26:45 +0300
Subject: [PATCH 2091/2561] anydesk: use the generic upstream tarball for the
 license.

That fixes the issue with the eula checksums,
thanks @tibequadorian.
---
 srcpkgs/anydesk/template | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/anydesk/template b/srcpkgs/anydesk/template
index ba95d8775fe1..d22134033508 100644
--- a/srcpkgs/anydesk/template
+++ b/srcpkgs/anydesk/template
@@ -1,10 +1,11 @@
 # Template file for 'anydesk'
 pkgname=anydesk
 version=6.1.1
-revision=1
+revision=2
 archs="x86_64"
-create_wrksrc=yes
-hostmakedepends="patchelf rpmextract w3m"
+create_wrksrc="yes"
+hostmakedepends="patchelf rpmextract"
+depends="hicolor-icon-theme"
 short_desc="Fast remote desktop application"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
@@ -13,28 +14,18 @@ homepage="https://anydesk.com/remote-desktop"
 nopie=yes
 restricted=yes
 
-distfiles="https://download.anydesk.com/linux/anydesk_$version-1_x86_64.rpm"
-checksum=93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a
+distfiles="https://download.anydesk.com/linux/anydesk_${version}-1_x86_64.rpm
+	https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz"
+checksum="93f8ffb2ec46b7601be7682a4096a23ac19768bc5bcd88afb28a88c90f38867a
+ 102e72c75502a4779083320322dd047e2b0c00a25ead7444a00aad1db54325aa"
 
-_eula_digest=cf42c51d94d40c5890b103a1b2c5b62b5faad7af1e14933cab98dea8066175e8
-
-post_extract() {
-	$XBPS_FETCH_CMD -o eula.html https://anydesk.com/en/terms
-	< eula.html w3m -dump -I utf-8 -T text/html |
-	sed -n '/envelope.p/q;/Terms [&] Conditions/,$p' >eula.txt
-
-	filesum="$($XBPS_DIGEST_CMD eula.txt)"
-	if [ "$filesum" != $_eula_digest ]; then
-		msg_error "EULA changed, new digest: $filesum\n"
-	fi
-}
 
 do_build() {
 	patchelf --remove-needed libpangox-1.0.so.0 usr/bin/anydesk
 }
 
 do_install() {
-	vcopy usr/share usr
-	vbin usr/bin/anydesk
-	vlicense eula.txt
+	vlicense "${pkgname}-${version}"/copyright
+	rm -rf "${pkgname}-${version}"
+	vcopy "*" /
 }

From 421c26bd111aae7d62e14d97273729cf92617c51 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 7 May 2022 19:19:31 +0200
Subject: [PATCH 2092/2561] xarcan: update to 0.6.1.

---
 srcpkgs/xarcan/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index fef279d8e4ba..fbd3d7e6e867 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,20 +1,20 @@
 # Template file for 'xarcan'
 pkgname=xarcan
-version=0.6.0
-revision=3
+version=0.6.1
+revision=1
 build_style=meson
 configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
  -Ddefault_font_path=/usr/share/fonts/X11"
 hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
 makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
  libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
- xorgproto libxshmfence-devel"
+ xorgproto libxshmfence-devel xcb-util-wm-devel"
 short_desc="Patched Xserver that bridges connections to Arcan"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/letoram/xarcan"
 distfiles="https://github.com/letoram/xarcan/archive/${version}.tar.gz"
-checksum=db582bf9c412842fb263d4eb5118f4c1eb6e7b579042a179044d9467fdb98193
+checksum=b31c053a3b33e0af37528b8388f5687fe0d4af572bda0e507667dc7dd80ee1ba
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/{include,lib,share}

From 8c48e3b75c3cb6581779bd09660841670dcc7bab Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 7 May 2022 19:21:44 +0200
Subject: [PATCH 2093/2561] acfgfs: update to 0.6.1.

---
 srcpkgs/acfgfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/acfgfs/template b/srcpkgs/acfgfs/template
index 0e1ced9d4f06..91daf6055354 100644
--- a/srcpkgs/acfgfs/template
+++ b/srcpkgs/acfgfs/template
@@ -1,7 +1,7 @@
 # Template file for 'acfgfs'
 # !! keep synced with arcan
 pkgname=acfgfs
-version=0.6.0.1
+version=0.6.1
 revision=1
 wrksrc=arcan-${version}
 build_wrksrc=src/tools/acfgfs
@@ -13,7 +13,7 @@ maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-3-Clause"
 homepage="https://arcan-fe.com"
 distfiles="https://github.com/letoram/arcan/archive/${version}.tar.gz"
-checksum=7ae00a9dee79f9b58ac2bacbf532ff0631280297cfde30e8996382a3f42a52ed
+checksum=ca8a9b82000eef60970901641be1130b19c51a1cc2a17278e2365ca3e3a13551
 
 case "${XBPS_TARGET_MACHINE}" in
 	i686|armv6l|armv7l|ppc)

From bdb6fe3c3c3ce2e388705967b020f7d5e563889c Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sat, 7 May 2022 19:23:43 +0200
Subject: [PATCH 2094/2561] exo: add changelog, fix homepage

---
 srcpkgs/exo/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index 5dd6fc3c2a1f..df5c22224d59 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,7 +1,7 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
@@ -10,7 +10,8 @@ depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Extension library for the Xfce desktop environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
-homepage="https://xfce.org/"
+homepage="https://docs.xfce.org/xfce/exo/start"
+changelog="https://gitlab.xfce.org/xfce/exo/-/blob/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2"
 checksum=722dff3c3fe23f0a65405e63889cf247c99d092d3f9fb16dec78d062cfb8fae6
 

From fa6d2e4272ed0bb0366d40245f9930de394762cb Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:57:36 -0400
Subject: [PATCH 2095/2561] common/travis/xpkgdiff.sh: add CI script to compare
 pkgs with xpkgdiff

---
 .github/workflows/build.yaml |  8 ++++++++
 common/travis/xpkgdiff.sh    | 24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100755 common/travis/xpkgdiff.sh

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e4619a3f3c4b..f527ce1f897d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -94,6 +94,14 @@ jobs:
           "$here/common/travis/show_files.sh" "$BOOTSTRAP" "$ARCH"
           )
 
+      - name: Compare to previous
+        run: |
+          (
+          here="$(pwd)"
+          cd /
+          "$here/common/travis/xpkgdiff.sh" "$BOOTSTRAP" "$ARCH"
+          )
+
       - name: Check file conflicts
         if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
         run: |
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
new file mode 100755
index 000000000000..a36fd76e5d88
--- /dev/null
+++ b/common/travis/xpkgdiff.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# xpkgdiff.sh
+
+export XBPS_TARGET_ARCH="$2" XBPS_DISTDIR=/hostrepo XBPS_HOSTDIR="$HOME/hostdir"
+export DIFF='diff --unified=0 --report-identical-files --suppress-common-lines
+ --color=always --label REPO --label BUILT'
+
+while read -r pkg; do
+	for subpkg in $(xsubpkg $pkg); do
+		if xbps-query --repository=$HOME/hostdir/binpkgs \
+					  --repository=$HOME/hostdir/binpkgs/nonfree \
+					  -i "$subpkg" >&/dev/null; then
+			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"
+			xpkgdiff -f $subpkg
+			/bin/echo -e "\x1b[34mMetadata Diff of $subpkg:\x1b[0m"
+			xpkgdiff -S $subpkg
+			/bin/echo -e "\x1b[34mDependency Diff of $subpkg:\x1b[0m"
+			xpkgdiff -x $subpkg
+		else
+			/bin/echo -e "\x1b[33m$subpkg wasn't found\x1b[0m"
+		fi
+	done
+done < /tmp/templates

From fdd5a4e3393387079a828b4f5e15a7b0624a819e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 7 May 2022 23:12:44 +0200
Subject: [PATCH 2096/2561] lagrange: update to 1.13.3.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0e7f419708ae..a430d64fda49 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.13.2
+version=1.13.3
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=f84c5fe078734df06ada747f87760ea8863369be5519d1e56992c7c5278395da
+checksum=a25c48bb4c5c9eb81ba0e93609a5b0e350194eddab27bc55a5b86ae7b749259b
 
 post_install() {
 	vlicense LICENSE.md

From 72c5f1b11e0cf71666651b15877419cb9ffce58e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 2097/2561] New package: robin-hood-hashing-3.11.5

---
 srcpkgs/robin-hood-hashing/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/robin-hood-hashing/template

diff --git a/srcpkgs/robin-hood-hashing/template b/srcpkgs/robin-hood-hashing/template
new file mode 100644
index 000000000000..63a9db6c3f89
--- /dev/null
+++ b/srcpkgs/robin-hood-hashing/template
@@ -0,0 +1,16 @@
+# Template file for 'robin-hood-hashing'
+pkgname=robin-hood-hashing
+version=3.11.5
+revision=1
+build_style=cmake
+configure_args=" -DRH_STANDALONE_PROJECT=OFF"
+short_desc="Fast & memory efficient hashtable based on robin hood hashing for C++"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="MIT"
+homepage="https://github.com/martinus/robin-hood-hashing"
+distfiles="https://github.com/martinus/robin-hood-hashing/archive/${version}.tar.gz"
+checksum=3693e44dda569e9a8b87ce8263f7477b23af448a3c3600c8ab9004fe79c20ad0
+
+post_install() {
+	vlicense LICENSE
+}

From 1a2d471f6fb97d31cd2da79b4491c48f18bac98b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 2098/2561] SPIRV-Tools: update to 2022.1.

---
 srcpkgs/SPIRV-Tools/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template
index 70d13dfb6da5..ffb2fe25efaf 100644
--- a/srcpkgs/SPIRV-Tools/template
+++ b/srcpkgs/SPIRV-Tools/template
@@ -1,6 +1,6 @@
 # Template file for 'SPIRV-Tools'
 pkgname=SPIRV-Tools
-version=2020.6
+version=2022.1
 revision=1
 build_style=cmake
 configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
@@ -8,11 +8,12 @@ configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
 hostmakedepends="python3"
 makedepends="SPIRV-Headers"
 short_desc="API and commands for processing SPIR-V modules"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/SPIRV-Tools"
+changelog="https://raw.githubusercontent.com/KhronosGroup/SPIRV-Tools/master/CHANGES"
 distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz"
-checksum=de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3
+checksum=844c0f590a0ab9237cec947e27cfc75bd14f39a68fc3b37d8f1b9e1b21490a58
 
 SPIRV-Tools-devel_package() {
 	depends="SPIRV-Tools-${version}_${revision}"

From e7b35ae09d4dccb6937745e352007ae6e81a4cd2 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 2099/2561] SPIRV-Headers: update to 1.3.204.1.

---
 srcpkgs/SPIRV-Headers/template | 16 +++++++++++-----
 srcpkgs/SPIRV-Headers/update   |  1 +
 2 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/SPIRV-Headers/update

diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template
index 5dcf457c04c7..8f3e68ba87c3 100644
--- a/srcpkgs/SPIRV-Headers/template
+++ b/srcpkgs/SPIRV-Headers/template
@@ -1,11 +1,17 @@
 # Template file for 'SPIRV-Headers'
 pkgname=SPIRV-Headers
-version=1.5.4.raytracing.fixed
+reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1"
+version=1.3.204.1
 revision=1
+wrksrc="SPIRV-Headers-sdk-${version}"
 build_style=cmake
 short_desc="Machine-readable files for the SPIR-V Registry"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="MIT"
 homepage="https://github.com/KhronosGroup/SPIRV-Headers"
-distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/${version}.tar.gz"
-checksum=df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6
+distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-${version}.tar.gz"
+checksum=262864053968c217d45b24b89044a7736a32361894743dd6cfe788df258c746c
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/SPIRV-Headers/update b/srcpkgs/SPIRV-Headers/update
new file mode 100644
index 000000000000..2fa65238787a
--- /dev/null
+++ b/srcpkgs/SPIRV-Headers/update
@@ -0,0 +1 @@
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From ad13785536d6f2242b7cb710e3014bbe81187b72 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 2100/2561] Vulkan-Headers: update to 1.3.204.1.

---
 srcpkgs/Vulkan-Headers/template | 9 +++++----
 srcpkgs/Vulkan-Headers/update   | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template
index d619f96e2362..cb69e012e7a2 100644
--- a/srcpkgs/Vulkan-Headers/template
+++ b/srcpkgs/Vulkan-Headers/template
@@ -1,11 +1,12 @@
 # Template file for 'Vulkan-Headers'
 pkgname=Vulkan-Headers
-version=1.2.182
+version=1.3.204.1
 revision=1
+wrksrc="Vulkan-Headers-sdk-${version}"
 build_style=cmake
 short_desc="Vulkan header files"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${version}.tar.gz"
-checksum=38d1c953de7bb2d839556226851feeb690f0d23bc22ac46c823dcb66c97bfdc8
+distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-${version}.tar.gz"
+checksum=9c4d33f71467c915749fbf48c0c3a8ee7833f15babf398e3463cd88791fb592e
diff --git a/srcpkgs/Vulkan-Headers/update b/srcpkgs/Vulkan-Headers/update
index 995551ef357b..2fa65238787a 100644
--- a/srcpkgs/Vulkan-Headers/update
+++ b/srcpkgs/Vulkan-Headers/update
@@ -1,2 +1 @@
-pkgname=sdk
-pattern="/$pkgname-\K[0-9.]+(?=.tar.gz)"
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From 23441783d1a9dc429e727db6f4bc528ccdbebf03 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 2101/2561] Vulkan-Tools: update to 1.3.204.1.

---
 srcpkgs/Vulkan-Tools/template | 12 ++++++------
 srcpkgs/Vulkan-Tools/update   |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template
index 8d5c74629cb8..8b80e1ec890e 100644
--- a/srcpkgs/Vulkan-Tools/template
+++ b/srcpkgs/Vulkan-Tools/template
@@ -1,20 +1,20 @@
 # Template file for 'Vulkan-Tools'
 pkgname=Vulkan-Tools
-version=1.2.182
+version=1.3.204.1
 revision=1
-wrksrc="${pkgname}-${version}"
+wrksrc="Vulkan-Tools-sdk-${version}"
 build_style=cmake
 configure_args="-DGLSLANG_INSTALL_DIR=/usr -DBUILD_CUBE=$(vopt_if cube ON OFF)
  -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -Wno-dev"
 hostmakedepends="python3 pkg-config $(vopt_if cube glslang)"
 makedepends="Vulkan-Headers vulkan-loader libxcb-devel libxkbcommon-devel
- wayland-devel libXrandr-devel"
+ wayland-devel wayland-protocols libXrandr-devel"
 short_desc="Official Vulkan tools and utilities"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/v${version}.tar.gz"
-checksum=50c959851230d1daba20235167faced7b7686ebe5d9e626dfb1fe5c92fa30b9e
+distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-${version}.tar.gz"
+checksum=3242f9ad158d02af9cc44186cbd415982387356a2dd8c0492af2fdace8c22f49
 
 build_options="cube"
 desc_option_cube="Build cube vulkan demo"
diff --git a/srcpkgs/Vulkan-Tools/update b/srcpkgs/Vulkan-Tools/update
index 75a4ad43aa6d..2fa65238787a 100644
--- a/srcpkgs/Vulkan-Tools/update
+++ b/srcpkgs/Vulkan-Tools/update
@@ -1,2 +1 @@
-site=https://github.com/KhronosGroup/Vulkan-Tools/releases
-pkgname=sdk
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From 30f52ca9a4003dacf63f5c6b734eda1cd22ce75f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 2102/2561] Vulkan-ValidationLayers: update to 1.3.204.1.

---
 srcpkgs/Vulkan-ValidationLayers/template | 14 +++++++-------
 srcpkgs/Vulkan-ValidationLayers/update   |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/Vulkan-ValidationLayers/update

diff --git a/srcpkgs/Vulkan-ValidationLayers/template b/srcpkgs/Vulkan-ValidationLayers/template
index d89eb414b126..330c8e3169f0 100644
--- a/srcpkgs/Vulkan-ValidationLayers/template
+++ b/srcpkgs/Vulkan-ValidationLayers/template
@@ -1,16 +1,16 @@
 # Template file for 'Vulkan-ValidationLayers'
 pkgname=Vulkan-ValidationLayers
-version=1.2.162
+version=1.3.204.1
 revision=1
+wrksrc="Vulkan-ValidationLayers-sdk-${version}"
 build_style=cmake
-configure_args="-Wno-dev -DSPIRV_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
- -DGLSLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_LAYER_SUPPORT_FILES=ON"
+configure_args="-Wno-dev -DBUILD_LAYER_SUPPORT_FILES=ON"
 hostmakedepends="pkg-config"
 makedepends="Vulkan-Headers libXrandr-devel wayland-devel glslang-devel
- SPIRV-Tools-devel SPIRV-Headers"
+ SPIRV-Tools-devel SPIRV-Headers robin-hood-hashing"
 short_desc="Khronos official Vulkan validation layers"
-maintainer="Colin Gillespie <colin@breavyn.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/${pkgname}/archive/v${version}.tar.gz"
-checksum=83619b81a86e733383a71ea54f0f5e64e194bf596ee8ec4e36217bb0b29b8917
+distfiles="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-${version}.tar.gz"
+checksum=a5e658a4c1f504ae38488acdbe2ab2799e2ae4b626104d76776f1c24b079f341
diff --git a/srcpkgs/Vulkan-ValidationLayers/update b/srcpkgs/Vulkan-ValidationLayers/update
new file mode 100644
index 000000000000..2fa65238787a
--- /dev/null
+++ b/srcpkgs/Vulkan-ValidationLayers/update
@@ -0,0 +1 @@
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From 88b2d9a3c0fff08f0caaef1f07f2f2f23732cfd3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 2103/2561] vulkan-loader: update to 1.3.204.1.

---
 srcpkgs/vulkan-loader/template | 10 +++++-----
 srcpkgs/vulkan-loader/update   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/vulkan-loader/template b/srcpkgs/vulkan-loader/template
index 383d90ddd350..fb866dcb3ecd 100644
--- a/srcpkgs/vulkan-loader/template
+++ b/srcpkgs/vulkan-loader/template
@@ -1,8 +1,8 @@
 # Template file for 'vulkan-loader'
 pkgname=vulkan-loader
-version=1.2.182
+version=1.3.204.1
 revision=1
-wrksrc="Vulkan-Loader-${version}"
+wrksrc="Vulkan-Loader-sdk-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
  -DBUILD_TESTS=OFF"
@@ -10,8 +10,8 @@ hostmakedepends="python3 pkg-config"
 makedepends="Vulkan-Headers libxcb-devel libxkbcommon-devel wayland-devel
  libXrandr-devel"
 short_desc="Vulkan Installable Client Driver (ICD) loader"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${version}.tar.gz"
-checksum=0d1f9fde9d21642526e9baa55d30364c95035c4fe3c6db96836631991b44dd90
+distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-${version}.tar.gz"
+checksum=5dcd42b564804f4c01891ddd429a4a5028113c4cf39b44256689e8f543773134
diff --git a/srcpkgs/vulkan-loader/update b/srcpkgs/vulkan-loader/update
index 46acb07cbe81..c21c479d0e53 100644
--- a/srcpkgs/vulkan-loader/update
+++ b/srcpkgs/vulkan-loader/update
@@ -1,3 +1,3 @@
 _pkgname=Vulkan-Loader
-site="https://github.com/KhronosGroup/${_pkgname}/releases"
+site="https://github.com/KhronosGroup/${_pkgname}/tags"
 pattern="/releases/tag/sdk-\K\d.\d.\d+.\d(?=)"

From 89f22b4f7f791f37f28feee1d3c22cca6d5204f9 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 18:30:16 +0300
Subject: [PATCH 2104/2561] FeatherPad: update to 1.2.0.

---
 srcpkgs/FeatherPad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/FeatherPad/template b/srcpkgs/FeatherPad/template
index 17c9bfbe5018..a1c43cc24aee 100644
--- a/srcpkgs/FeatherPad/template
+++ b/srcpkgs/FeatherPad/template
@@ -1,6 +1,6 @@
 # Template file for 'FeatherPad'
 pkgname=FeatherPad
-version=1.1.1
+version=1.2.0
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/tsujan/FeatherPad"
 changelog="https://github.com/tsujan/FeatherPad/raw/master/ChangeLog"
 distfiles="https://github.com/tsujan/FeatherPad/archive/V${version}.tar.gz"
-checksum=8f2943224f04a1ee4b30b5b7f5b60f34d10d6fe9000e786e1b3a38369d293f8f
+checksum=3926f496ff3a3e65d9d3ebf9f76cfa43a0a225580cbd3d1c362f37e3b13a60e8

From 219761892fcf18ffb93ddfd3805ecb8ac2e370e4 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 18:46:12 +0300
Subject: [PATCH 2105/2561] cmst: update to 2022.05.01.

---
 srcpkgs/cmst/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cmst/template b/srcpkgs/cmst/template
index a7df44131f8e..3acc6ff6b22f 100644
--- a/srcpkgs/cmst/template
+++ b/srcpkgs/cmst/template
@@ -1,6 +1,6 @@
 # Template file for 'cmst'
 pkgname=cmst
-version=2022.01.05
+version=2022.05.01
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="Jonathan Lee <vjon207@gmail.com>"
 license="MIT"
 homepage="https://github.com/andrew-bibb/cmst"
 distfiles="https://github.com/andrew-bibb/cmst/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
-checksum=6ddc0e3a702592ec98b80164aa2b5ad1edb66d3f8dce18a545f26a67a46dc13a
+checksum=61c4ad7acad302814a677b0dd94092e336d47f55def2829c825e9128c9378dc4
 post_install() {
 	vlicense text/LICENSE
 }

From a9ae44a9d23a74e7bc0244f43a1adad0e369674d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 25 Mar 2022 10:37:33 +0100
Subject: [PATCH 2106/2561] New package: python3-hcloud-1.16.0

---
 srcpkgs/python3-hcloud/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-hcloud/template

diff --git a/srcpkgs/python3-hcloud/template b/srcpkgs/python3-hcloud/template
new file mode 100644
index 000000000000..e0556027cb01
--- /dev/null
+++ b/srcpkgs/python3-hcloud/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-hcloud'
+pkgname=python3-hcloud
+version=1.16.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-future python3-dateutil"
+checkdepends="${depends} python3-pytest-flake8 python3-isort python3-mock tox black"
+short_desc="Official Hetzner Cloud python library"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/hetznercloud/hcloud-python"
+distfiles="${PYPI_SITE}/h/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=c8b94557d93bcfe437f20a8176693ea4f54358b74986cc19d94ebc23f48e40cc
+
+post_install() {
+	vlicense LICENSE
+}

From ce8cd755e9a256e89190be5b60bb78d451867fac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 25 Apr 2022 08:47:29 +0200
Subject: [PATCH 2107/2561] New package: rink-0.6.3

---
 srcpkgs/rink/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/rink/template

diff --git a/srcpkgs/rink/template b/srcpkgs/rink/template
new file mode 100644
index 000000000000..7772630d24bc
--- /dev/null
+++ b/srcpkgs/rink/template
@@ -0,0 +1,16 @@
+# Template file for 'rink'
+pkgname=rink
+version=0.6.3
+revision=1
+wrksrc=rink-rs-${version}
+build_style=cargo
+make_install_args="--path ./cli"
+hostmakedepends="pkg-config"
+makedepends="openssl-devel"
+short_desc="Unit-aware calculator and conversion tool"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MPL-2.0, GPL-3.0-only"
+homepage="https://github.com/tiffany352/rink-rs"
+changelog="https://github.com/tiffany352/rink-rs/releases"
+distfiles="https://github.com/tiffany352/rink-rs/archive/refs/tags/v${version}.tar.gz"
+checksum=49431c12f57d58090b9f5f7f899e98bebffaeed8ca69b5ee140aad4b1c1d9dc8

From e25a8bf9d90fd5c1350d734546c3a7119668b187 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 18 Apr 2022 16:24:23 +0200
Subject: [PATCH 2108/2561] pmbootstrap: update to 1.43.0.

---
 srcpkgs/pmbootstrap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 8d6ae321ef05..474961425930 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,6 +1,6 @@
 # Template file for 'pmbootstrap'
 pkgname=pmbootstrap
-version=1.42.0
+version=1.43.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,5 +10,5 @@ maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://postmarketos.org"
 distfiles="https://gitlab.com/postmarketOS/pmbootstrap/-/archive/${version}/pmbootstrap-${version}.tar.gz"
-checksum=c3df501a52f8deb2a982960b9ef604bf58b4f4bf8b63598707883933a3ac66cd
+checksum=65f720fe8c8436cc13780e74978e2dfa66c4ca72e9e8567004015ff6f8a536a3
 make_check=no # tests require chroot

From 827ca5ff222cf52d78f4a9539a4fd932e2e86b24 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 7 May 2022 11:33:14 +0400
Subject: [PATCH 2109/2561] python3-regex: update to 2022.4.24.

---
 srcpkgs/python3-regex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 57e5b7f4fb02..923919c05941 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2022.3.15
+version=2022.4.24
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=0a7b75cc7bb4cc0334380053e4671c560e31272c9d2d5a6c4b8e9ae2c9bd0f82
+checksum=92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 32a69232d27dd15af25a903457177b1bd2b286fe Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 6 May 2022 21:12:55 +0300
Subject: [PATCH 2110/2561] .github: remove extraneous whitespace

---
 .github/issue_template.md        | 2 +-
 .github/pull_request_template.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/issue_template.md b/.github/issue_template.md
index 25a0538174cc..10a72b0729c2 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -1,4 +1,4 @@
-<!-- Don't request update of package. We have a script for that. https://alpha.de.repo.voidlinux.org/void-updates/void-updates.txt . However, a quality pull request may help. -->
+<!-- Don't request update of package. We have a script for that. https://alpha.de.repo.voidlinux.org/void-updates/void-updates.txt. However, a quality pull request may help. -->
 ### System
 
 * xuname:  
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index ef2a5d7637aa..8a9e2348494d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -13,7 +13,7 @@ https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuo
 and test at least one native build and, if supported, at least one cross build.
 Ignore this section if this PR is not skipping CI.
 -->
-<!-- 
+<!--
 #### Local build testing
 - I built this PR locally for my native architecture, (ARCH-LIBC)
 - I built this PR locally for these architectures (if supported. mark crossbuilds):

From d2743fd63463e9dc728e6bfc2ce7041d927f37b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 8 May 2022 08:12:03 +0700
Subject: [PATCH 2111/2561] common/do_check: move make_check_pre behind env
 setting

All environment variables setting in command execution must be put
before any non-variables-like, otherwise, they're intepretted as
something else.

Fix: 71b11fdbdb, (xbps-src: add make_check_pre, 2022-02-28)
---
 common/build-style/python3-module.sh | 3 ++-
 common/build-style/raku-dist.sh      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh
index 8daf40e69219..6ec5225d6aab 100644
--- a/common/build-style/python3-module.sh
+++ b/common/build-style/python3-module.sh
@@ -25,7 +25,8 @@ do_build() {
 
 do_check() {
 	if python3 -c 'import pytest' >/dev/null 2>&1; then
-		${make_check_pre} PYTHONPATH="$(cd build/lib* && pwd)" \
+		PYTHONPATH="$(cd build/lib* && pwd)" \
+			${make_check_pre} \
 			python3 -m pytest ${make_check_args} ${make_check_target}
 	else
 		# Fall back to deprecated setup.py test orchestration without pytest
diff --git a/common/build-style/raku-dist.sh b/common/build-style/raku-dist.sh
index bbbba96e7140..67350161b938 100644
--- a/common/build-style/raku-dist.sh
+++ b/common/build-style/raku-dist.sh
@@ -3,7 +3,7 @@
 #
 
 do_check() {
-	${make_check_pre} RAKULIB=lib prove -r -e raku t/
+	RAKULIB=lib ${make_check_pre} prove -r -e raku t/
 }
 
 do_install() {

From ac1fc41b944200c6d5e6ca79051450b167b8c9e3 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Mon, 25 Apr 2022 19:43:57 +0200
Subject: [PATCH 2112/2561] caddy: update to 2.5.1.

---
 srcpkgs/caddy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index 762a36749b46..d2d08682696b 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -1,7 +1,7 @@
 # Template file for 'caddy'
 pkgname=caddy
-version=2.4.6
-revision=2
+version=2.5.1
+revision=1
 build_style=go
 go_import_path=github.com/caddyserver/caddy/v2
 go_package="${go_import_path}/cmd/caddy"
@@ -11,7 +11,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="Apache-2.0"
 homepage="https://caddyserver.com"
 distfiles="https://github.com/caddyserver/caddy/archive/v${version}.tar.gz"
-checksum=5a450a4ff0d2dbd165d62f957ecdaebdc4bd0445c66a06a27d0025a82843402d
+checksum=841f5524e2e107bff278b604c544843564a4a1ef0c3803eeae588e79e4ea5d06
 
 system_accounts="caddy"
 caddy_homedir="/var/lib/caddy"

From 7781bfb99383f521150009ac591acddae97573ce Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 8 May 2022 16:47:20 +0200
Subject: [PATCH 2113/2561] python3-hcloud: remove unnecessary checkdepends

---
 srcpkgs/python3-hcloud/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-hcloud/template b/srcpkgs/python3-hcloud/template
index e0556027cb01..5b2584860022 100644
--- a/srcpkgs/python3-hcloud/template
+++ b/srcpkgs/python3-hcloud/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-requests python3-future python3-dateutil"
-checkdepends="${depends} python3-pytest-flake8 python3-isort python3-mock tox black"
+checkdepends="${depends} python3-pytest python3-mock"
 short_desc="Official Hetzner Cloud python library"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"

From 00992eb8d01f312a1cd61e35b70e128a2cb819b3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 8 May 2022 17:06:45 +0200
Subject: [PATCH 2114/2561] mokutil: update to 0.6.0.

---
 srcpkgs/mokutil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mokutil/template b/srcpkgs/mokutil/template
index 06225c575530..06cabe2116f3 100644
--- a/srcpkgs/mokutil/template
+++ b/srcpkgs/mokutil/template
@@ -1,6 +1,6 @@
 # Template file for 'mokutil'
 pkgname=mokutil
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/lcp/mokutil"
 distfiles="https://github.com/lcp/mokutil/archive/refs/tags/${version}.tar.gz"
-checksum=af7616855f817e7eb54043071e51c8651bc8cc479ac455fbfe35203d98de8181
+checksum=6cc4be216ac083ee19dc986e8a510e1d74f6f4080baa4b5fdc7c503eb483f569
 
 pre_configure() {
 	autoreconf -fi

From 694c3986067dc69e215867a73acf5102ccc1945c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 8 May 2022 17:35:08 +0200
Subject: [PATCH 2115/2561] libbluray: only build java support on supported
 targets

---
 srcpkgs/libbluray/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libbluray/template b/srcpkgs/libbluray/template
index 070c351ee279..28c0b342155a 100644
--- a/srcpkgs/libbluray/template
+++ b/srcpkgs/libbluray/template
@@ -4,7 +4,7 @@ version=1.3.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-optimizations"
-hostmakedepends="pkg-config apache-ant openjdk8"
+hostmakedepends="pkg-config"
 makedepends="libxml2-devel fontconfig-devel"
 short_desc="Library to access Blu-Ray disks for video playback"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -13,6 +13,13 @@ homepage="https://www.videolan.org/developers/libbluray.html"
 distfiles="${VIDEOLAN_SITE}/libbluray/${version}/libbluray-${version}.tar.bz2"
 checksum=e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|arm*|aarch64*|ppc64*)
+		hostmakedepends+=" apache-ant openjdk8"
+		;;
+	*) configure_args+=" --disable-bdjava-jar";;
+esac
+
 pre_build() {
 	export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk"
 }

From 5ec124fc8fd84c057d4b8409eae3467d3f8233f4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 8 May 2022 17:36:27 +0200
Subject: [PATCH 2116/2561] openjdk*: disable on ppc32

---
 srcpkgs/openjdk10-bootstrap/template | 1 +
 srcpkgs/openjdk11/template           | 1 +
 srcpkgs/openjdk12-bootstrap/template | 1 +
 srcpkgs/openjdk13-bootstrap/template | 1 +
 srcpkgs/openjdk14-bootstrap/template | 1 +
 srcpkgs/openjdk15-bootstrap/template | 1 +
 srcpkgs/openjdk16-bootstrap/template | 1 +
 srcpkgs/openjdk17/template           | 1 +
 srcpkgs/openjdk7-bootstrap/template  | 1 +
 srcpkgs/openjdk8/template            | 1 +
 srcpkgs/openjdk9-bootstrap/template  | 1 +
 11 files changed, 11 insertions(+)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 1c673dc748d1..1cbc8a618e18 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -4,6 +4,7 @@ pkgname=openjdk10-bootstrap
 version=10.0.2p13
 revision=2
 _repo_ver=${version/p/+}
+archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc="jdk10u-jdk-${_repo_ver}"
 build_style=gnu-configure
 configure_args="
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index 45c775856fa9..48be7fa6bfc8 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -4,6 +4,7 @@ version=11.0.12+7
 revision=2
 _java_ver="${version%%.*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version}"
 build_style=gnu-configure
 configure_args="
diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 1f20483ecbd4..0d546a254aa7 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -6,6 +6,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 6a6b3340ffcd..29dad64f6101 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -6,6 +6,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 341818dc5cf9..50c1282cbf49 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -6,6 +6,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 1430f205d1b9..6dce37796018 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -6,6 +6,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 2c8566bb1c31..011612e0a966 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -6,6 +6,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index f60e96f79082..03ac17c81b4d 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -7,6 +7,7 @@ _java_ver="${version%%.*}"
 _jdk_update="${version#*+}"
 _base_version="${version%+*}"
 _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+archs="x86_64* i686* aarch64* armv7* ppc64*"
 create_wrksrc=yes
 build_wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index 1e40e5803c7f..c5ef9bc1b52a 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -7,6 +7,7 @@ _bootstrap_jdk_home="/usr/lib/jvm/java-1.5-gcj"
 _final_jdk_home="/usr/lib/jvm/java-1.7-openjdk"
 version=7u221b02
 revision=3
+archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc=icedtea-${_icedtea_ver}
 build_style=gnu-configure
 configure_args="
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 9832b18555a6..ebf8aa2b56a6 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -12,6 +12,7 @@ _jdk_home="usr/lib/jvm/java-1.8-openjdk"
 # we're using aarch64 port repo to get aarch64 JIT; the repo is
 # otherwise the same as the normal one, just with aarch64 port added
 _repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
+archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc="jdk8u-shenandoah-aarch64-shenandoah-jdk8u${_jdk_update}-b${_jdk_build}"
 build_style=gnu-configure
 configure_args="
diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index c82f0761166a..78292991d9e5 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -4,6 +4,7 @@ pkgname=openjdk9-bootstrap
 version=9.0.4p12
 revision=2
 _repo_ver=${version/p/+}
+archs="x86_64* i686* aarch64* arm* ppc64*"
 wrksrc="jdk9u-jdk-${_repo_ver}"
 build_style=gnu-configure
 configure_args="

From 503c18bb0b1b388cff9b286f4f4757eee9081163 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Wed, 20 Apr 2022 15:10:57 -0700
Subject: [PATCH 2117/2561] lxc: update to 4.0.12

Also add update file.
---
 srcpkgs/lxc/template | 8 ++++----
 srcpkgs/lxc/update   | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/lxc/update

diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 679ec36e4363..1c10303f00d7 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,21 +1,21 @@
 # Template file for 'lxc'
 pkgname=lxc
-version=4.0.6
-revision=2
+version=4.0.12
+revision=1
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --enable-apparmor --with-distro=none
  --with-rootfs-path=/var/lxc/containers --with-log-path=/var/lxc/log"
 hostmakedepends="automake libtool pkg-config docbook2x"
 makedepends="libcap-devel libseccomp-devel gnutls-devel libapparmor-devel"
-depends="xz wget gnupg"
+depends="xz wget"
 _desc="Linux Containers"
 short_desc="${_desc} - utilities"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://linuxcontainers.org"
 distfiles="https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"
-checksum=9165dabc0bb6ef7f2fda2009aee90b20fbefe77ed8008347e9f06048eba1e463
+checksum=db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef
 
 conf_files="/etc/lxc/default.conf"
 make_dirs="
diff --git a/srcpkgs/lxc/update b/srcpkgs/lxc/update
new file mode 100644
index 000000000000..a02626079abf
--- /dev/null
+++ b/srcpkgs/lxc/update
@@ -0,0 +1 @@
+site="https://linuxcontainers.org/lxc/downloads/"

From 42906d050a403cd33d9fd397491294f7f5a9bebc Mon Sep 17 00:00:00 2001
From: "Soc Virnyl S. Estela" <socvirnyl.estela@gmail.com>
Date: Mon, 2 May 2022 13:49:24 +0800
Subject: [PATCH 2118/2561] leftwm: update to 0.3.0

---
 srcpkgs/leftwm/patches/fix-arm-builds.patch | 31 ---------------------
 srcpkgs/leftwm/patches/series               |  1 -
 srcpkgs/leftwm/template                     |  4 +--
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/leftwm/patches/fix-arm-builds.patch
 delete mode 100644 srcpkgs/leftwm/patches/series

diff --git a/srcpkgs/leftwm/patches/fix-arm-builds.patch b/srcpkgs/leftwm/patches/fix-arm-builds.patch
deleted file mode 100644
index 9337bc90ec52..000000000000
--- a/srcpkgs/leftwm/patches/fix-arm-builds.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 876216bcc0398fb869240cd51d5ea0d12ba699b1 Mon Sep 17 00:00:00 2001
-From: pkubaj <pkubaj@anongoth.pl>
-Date: Tue, 14 Dec 2021 06:37:11 +0000
-Subject: [PATCH] Fix build errors on architectures with u8 (#623)
-
----
- .../src/display_servers/xlib_display_server/xwrap/getters.rs  | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs b/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs
-index 2fe20d3a..b8a90495 100644
---- a/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs
-+++ b/leftwm-core/src/display_servers/xlib_display_server/xwrap/getters.rs
-@@ -3,7 +3,7 @@ use super::{Screen, WindowHandle, XlibError, MAX_PROPERTY_VALUE_LEN};
- use crate::models::{DockArea, WindowState, WindowType, XyhwChange};
- use crate::XWrap;
- use std::ffi::CString;
--use std::os::raw::{c_int, c_long, c_uchar, c_uint, c_ulong};
-+use std::os::raw::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong};
- use std::slice;
- use x11_dl::xlib;
- 
-@@ -575,7 +575,7 @@ impl XWrap {
-             if status == 0 {
-                 return Err(XlibError::FailedStatus);
-             }
--            if let Ok(s) = CString::from_raw(text_prop.value.cast::<i8>()).into_string() {
-+            if let Ok(s) = CString::from_raw(text_prop.value.cast::<c_char>()).into_string() {
-                 return Ok(s);
-             }
-         };
diff --git a/srcpkgs/leftwm/patches/series b/srcpkgs/leftwm/patches/series
deleted file mode 100644
index 5f8e5e089321..000000000000
--- a/srcpkgs/leftwm/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-arm-builds.patch
diff --git a/srcpkgs/leftwm/template b/srcpkgs/leftwm/template
index 6da896578e3b..1c416bae1a65 100644
--- a/srcpkgs/leftwm/template
+++ b/srcpkgs/leftwm/template
@@ -1,6 +1,6 @@
 # Template file for 'leftwm'
 pkgname=leftwm
-version=0.2.11
+version=0.3.0
 revision=1
 build_style=cargo
 makedepends="libX11-devel libXinerama-devel libXrandr-devel xorg-server-devel"
@@ -10,7 +10,7 @@ maintainer="Soc Virnyl S. Estela <socvirnyl.estela@gmail.com>"
 license="MIT"
 homepage="https://github.com/leftwm/leftwm"
 distfiles="https://github.com/leftwm/leftwm/archive/${version}.tar.gz"
-checksum=3a2bd59f12566d94b6be3b162c95d280acbaec1b40da415cb42fe07332a5b709
+checksum=d69d3ec8ea49b4a23e145d42a2f66f5c38642378c762919fce6c56b818fad8c7
 
 do_install() {
 	vdoc README.md

From 81eee09d77c04e47ca4de19f2a12da50fb31c441 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 May 2022 09:41:05 +0300
Subject: [PATCH 2119/2561] ncdu: update to 1.17.

---
 srcpkgs/ncdu/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ncdu/template b/srcpkgs/ncdu/template
index 4189b2ac0e11..1f3991b1d2fd 100644
--- a/srcpkgs/ncdu/template
+++ b/srcpkgs/ncdu/template
@@ -1,16 +1,16 @@
 # Template file for 'ncdu'
 pkgname=ncdu
-version=1.16
+version=1.17
 revision=1
 build_style=gnu-configure
 makedepends="ncurses-devel"
 short_desc="NCurses Disk Usage utility"
 maintainer="teldra <teldra@rotce.de>"
 license="MIT"
-homepage="http://dev.yorhel.nl/ncdu"
+homepage="https://dev.yorhel.nl/ncdu"
 changelog="https://dev.yorhel.nl/ncdu/changes"
-distfiles="http://dev.yorhel.nl/download/${pkgname}-${version}.tar.gz"
-checksum=2b915752a183fae014b5e5b1f0a135b4b408de7488c716e325217c2513980fd4
+distfiles="https://dev.yorhel.nl/download/${pkgname}-${version}.tar.gz"
+checksum=810745a8ed1ab3788c87d3aea4cc1a14edf6ee226f764bcc383e024ba56adbf1
 
 post_install() {
 	vlicense COPYING

From 710d11675261cf6e91e3091dd82b5dfa9fb824ef Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 19 Apr 2022 13:56:35 -0400
Subject: [PATCH 2120/2561] python3-pgspecial: update to 1.13.1, adopt.

---
 srcpkgs/python3-pgspecial/template | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/python3-pgspecial/template b/srcpkgs/python3-pgspecial/template
index e0279616a906..8d52e1238aa2 100644
--- a/srcpkgs/python3-pgspecial/template
+++ b/srcpkgs/python3-pgspecial/template
@@ -1,24 +1,20 @@
 # Template file for 'python3-pgspecial'
 pkgname=python3-pgspecial
-version=1.11.9
-revision=4
+version=1.13.1
+revision=1
 wrksrc="pgspecial-${version}"
 build_style=python3-module
-pycompile_module="pgspecial"
 hostmakedepends="python3-setuptools"
 depends="python3-click python3-sqlparse python3-psycopg2"
 checkdepends="${depends} python3-pytest"
 short_desc="Meta-commands handler for PostgreSQL"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://www.dbcli.com"
+changelog="https://raw.githubusercontent.com/dbcli/pgspecial/main/changelog.rst"
 distfiles="${PYPI_SITE}/p/pgspecial/pgspecial-${version}.tar.gz"
-checksum=77f8651450ccbde7d3036cfe93486a4eeeb5ade28d1ebc4b2ba186fea0023c56
-
-do_check() {
-	# pgspecial tests require a PostgreSQL server; skip them.
-	:
-}
+checksum=d5dab96690908275916dc2c622efae217f142e08165fa366949d41cbc5658701
+make_check=no # pgspecial tests require a PostgreSQL server; skip them.
 
 post_install() {
 	vlicense License.txt

From 0f5228bc097f1cb97b3cbec68e76b57f44638429 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 19 Apr 2022 13:53:22 -0400
Subject: [PATCH 2121/2561] pgcli: update to 3.4.1, adopt.

---
 srcpkgs/pgcli/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pgcli/template b/srcpkgs/pgcli/template
index 0ff6f5079c4d..6f651301e0d4 100644
--- a/srcpkgs/pgcli/template
+++ b/srcpkgs/pgcli/template
@@ -1,6 +1,6 @@
 # Template file for 'pgcli'
 pkgname=pgcli
-version=3.4.0
+version=3.4.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -8,12 +8,12 @@ depends="python3-pgspecial python3-click python3-Pygments python3-prompt_toolkit
  python3-psycopg2 python3-sqlparse python3-configobj python3-pendulum
  python3-cli_helpers python3-setproctitle"
 short_desc="PostgreSQL CLI with autocompletion and syntax highlighting"
-maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://www.pgcli.com"
-changelog="https://github.com/dbcli/pgcli/blob/main/changelog.rst"
+changelog="https://raw.githubusercontent.com/dbcli/pgcli/main/changelog.rst"
 distfiles="${PYPI_SITE}/p/pgcli/pgcli-${version}.tar.gz"
-checksum=d566c6eda99aad1a27680bdfd74657e25bc0586d04eaf0b1626bb58bde75cfb6
+checksum=f03930187e27d60df658ca8a04fb601ec5d7476c735f2b1542c6adec5cac8fe2
 make_check=no # pgcli tests require a PostgreSQL server; skip them.
 
 post_install() {

From 0f50028f42fca15329d649a92e7848663bebbb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 29 Mar 2021 14:46:19 +0200
Subject: [PATCH 2122/2561] New package: mdbook-mermaid-0.10.0

---
 srcpkgs/mdbook-mermaid/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/mdbook-mermaid/template

diff --git a/srcpkgs/mdbook-mermaid/template b/srcpkgs/mdbook-mermaid/template
new file mode 100644
index 000000000000..ec8acd019132
--- /dev/null
+++ b/srcpkgs/mdbook-mermaid/template
@@ -0,0 +1,15 @@
+# Template file for 'mdbook-mermaid'
+pkgname=mdbook-mermaid
+version=0.10.0
+revision=1
+build_style=cargo
+short_desc="Prepocessor for mdbook to add mermaid support"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MPL-2.0"
+homepage="https://github.com/badboy/mdbook-mermaid"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=7b62ac139c8ece9f21cfdf0b3cd11aabf0d6fdfdfb71848918a028a4cb8de24c
+
+post_install() {
+	vlicense LICENSE
+}

From acd7d4687e3f25ec5282aa90bf36de74b03631eb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sat, 7 May 2022 20:21:07 -0400
Subject: [PATCH 2123/2561] botan: drop unneeded update file

---
 srcpkgs/botan/update | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 srcpkgs/botan/update

diff --git a/srcpkgs/botan/update b/srcpkgs/botan/update
deleted file mode 100644
index e69de29bb2d1..000000000000

From 9867c3c2171c83c8cf39af68f3efb0ebb258e4b3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sat, 7 May 2022 20:21:38 -0400
Subject: [PATCH 2124/2561] boinc: set update to ignore android-specic release
 series

---
 srcpkgs/boinc/update | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/boinc/update b/srcpkgs/boinc/update
index a9205555e786..432eb766178b 100644
--- a/srcpkgs/boinc/update
+++ b/srcpkgs/boinc/update
@@ -1,2 +1,3 @@
 site=http://boinc.berkeley.edu/download.php
 pattern="\K[\d]+\.[\d]+\.[\d]+"
+ignore="7.18.*" # android-specific release series

From db9ab8282278da1c11f19a846dc08bdae745cb40 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sat, 7 May 2022 20:22:22 -0400
Subject: [PATCH 2125/2561] VirtualGL: set update to ignore development series

---
 srcpkgs/VirtualGL/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/VirtualGL/update

diff --git a/srcpkgs/VirtualGL/update b/srcpkgs/VirtualGL/update
new file mode 100644
index 000000000000..4251f46cbd68
--- /dev/null
+++ b/srcpkgs/VirtualGL/update
@@ -0,0 +1 @@
+ignore="2.6.[9][0-9]"

From e5712f483fdf2f891ce31201626d85acb2dff1f0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sat, 7 May 2022 20:22:47 -0400
Subject: [PATCH 2126/2561] asio: set update to ignore development series

---
 srcpkgs/asio/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/asio/update

diff --git a/srcpkgs/asio/update b/srcpkgs/asio/update
new file mode 100644
index 000000000000..b09e17332b0a
--- /dev/null
+++ b/srcpkgs/asio/update
@@ -0,0 +1 @@
+ignore="*1.*[13579].*" # development release series

From b170dc9134f09db4669c36ec7ded9a2a52a2a128 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sat, 7 May 2022 20:23:20 -0400
Subject: [PATCH 2127/2561] gnupg: set update to ignore development series (odd
 numbered versions)

---
 srcpkgs/gnupg/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/gnupg/update

diff --git a/srcpkgs/gnupg/update b/srcpkgs/gnupg/update
new file mode 100644
index 000000000000..0164c3462a52
--- /dev/null
+++ b/srcpkgs/gnupg/update
@@ -0,0 +1 @@
+ignore="*.[13579].*" # development release series

From 4041ba51580041010476f2b3ed7d6e95cd998ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:32 -0300
Subject: [PATCH 2128/2561] kicad: update to 6.0.5.

---
 srcpkgs/kicad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index cd60f0ad49dd..aaf6b16f3b14 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad'
 pkgname=kicad
-version=6.0.1
+version=6.0.5
 revision=1
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
@@ -18,7 +18,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz"
-checksum=946173455db986cc79050a8c1983193690f14eb538785b21c1584d5999b864e4
+checksum=4bea4d329995d0fe7a0253f25be136ddbff3cdcfde2e21eef834a1dfe37f6157
 python_version=3
 replaces="kicad-i18n>=0"
 

From bb595e3f0d4958502110d3c6846ea9f379df2825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:31 -0300
Subject: [PATCH 2129/2561] kicad-footprints: update to 6.0.5.

---
 srcpkgs/kicad-footprints/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kicad-footprints/template b/srcpkgs/kicad-footprints/template
index aa8062df6655..6a6282de56d6 100644
--- a/srcpkgs/kicad-footprints/template
+++ b/srcpkgs/kicad-footprints/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-footprints'
 pkgname=kicad-footprints
-version=6.0.1
+version=6.0.5
 revision=1
 build_style=cmake
 depends="kicad"
@@ -9,9 +9,4 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
 license="CC-BY-SA-4.0"
 homepage="http://kicad.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=c2b825f346b5eb60faaa7b39c64855c47d80e1ef950e4df08c58e843783bc9a6
-
-post_install() {
-	# otherwise KiCad will complain about a missing library when launched
-	touch $DESTDIR/usr/share/kicad/footprints/Connector_Multicomp.pretty/.empty
-}
+checksum=9a842d1b78cbccec6290e449e00c70ed76a8d4dbaed6c58afabe165471e88199

From 7bd875c6a3ead3d49988e2bcd97b8cc3ff6349d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:34 -0300
Subject: [PATCH 2130/2561] kicad-symbols: update to 6.0.5.

---
 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 4580597c8f23..36238be4a13d 100644
--- a/srcpkgs/kicad-symbols/template
+++ b/srcpkgs/kicad-symbols/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-symbols'
 pkgname=kicad-symbols
-version=6.0.1
+version=6.0.5
 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.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=56593ff7dfae14ce4e5afa2b0477a8fb832dbf5ae81abec831ebbae7568f0433
+checksum=bc7669a84b9541fba5592016d6ac95bff10e36e7a852913df32737267c75e789

From 575340075f672e18227b552b00790ae258285a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:30 -0300
Subject: [PATCH 2131/2561] kicad-packages3D: update to 6.0.5.

---
 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 bc7dfc81abc6..3f6cb166ce03 100644
--- a/srcpkgs/kicad-packages3D/template
+++ b/srcpkgs/kicad-packages3D/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-packages3D'
 pkgname=kicad-packages3D
-version=6.0.1
+version=6.0.5
 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.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.bz2"
-checksum=caf3359cf474b4f71fa2b62a5128d594f92285a92817adbcd6be99f199ac36da
+checksum=af10545c315474495e8be2137f25172d16103430133e91437cd4cf4f9d382436

From 2eaf1d8f95876425c555fa8b112bf8e4b111993f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:32 -0300
Subject: [PATCH 2132/2561] kicad-templates: update to 6.0.5.

---
 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 9d3319894ca4..d186df2fe18c 100644
--- a/srcpkgs/kicad-templates/template
+++ b/srcpkgs/kicad-templates/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-templates'
 pkgname=kicad-templates
-version=6.0.1
+version=6.0.5
 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.org"
 distfiles="https://gitlab.com/kicad/libraries/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
-checksum=590d77e693d9f54d740e75f8e504e02227da44461f3ef3e69ff2ef9c3d6d78ee
+checksum=00e152c4e708e91ee6d14d8b3d6fca597fb8aa024a2e7da9943e3eeda058c14e

From 32f01c626117bb32cb38d75e1c5e96cba0ef806b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:34 -0300
Subject: [PATCH 2133/2561] kicad-doc: update to 6.0.5.

---
 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 4591eb3b08ad..7b3243238a91 100644
--- a/srcpkgs/kicad-doc/template
+++ b/srcpkgs/kicad-doc/template
@@ -1,13 +1,13 @@
 # Template file for 'kicad-doc'
 pkgname=kicad-doc
-version=6.0.1
+version=6.0.5
 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.org"
 distfiles="https://kicad-downloads.s3.cern.ch/docs/${pkgname}-${version}.tar.gz"
-checksum=6093c99cfde827fb42fc351ef301f0dcad805f0c256ef02a0e82d9daafc238d3
+checksum=9e2959f0410e1262c868274d9a4dbddcf96113915fe288364066919661e31a7b
 
 if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
 	broken="kicad not available"

From feadf6c1e66bc59eb85e30fa46440c3fee901737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 1 May 2022 03:27:33 -0300
Subject: [PATCH 2134/2561] kicad-library: update to 6.0.5.

---
 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 ab472215f802..77ed42dcf830 100644
--- a/srcpkgs/kicad-library/template
+++ b/srcpkgs/kicad-library/template
@@ -1,6 +1,6 @@
 # Template file for 'kicad-library'
 pkgname=kicad-library
-version=6.0.1
+version=6.0.5
 revision=1
 build_style=meta
 depends="kicad-footprints>=${version} kicad-packages3D>=${version}

From ff492d4df2653c65f4b095ccde6f586bbea3ac6b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 9 May 2022 04:37:29 +0200
Subject: [PATCH 2135/2561] SuiteSparse: fix ppc32 build

---
 srcpkgs/SuiteSparse/patches/ppc32.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/SuiteSparse/patches/ppc32.patch

diff --git a/srcpkgs/SuiteSparse/patches/ppc32.patch b/srcpkgs/SuiteSparse/patches/ppc32.patch
new file mode 100644
index 000000000000..234fa06d0130
--- /dev/null
+++ b/srcpkgs/SuiteSparse/patches/ppc32.patch
@@ -0,0 +1,22 @@
+commit e483b8506640797a09ea30c126c081ea4070b2e2
+Author: q66 <daniel@octaforge.org>
+Date:   Mon Feb 28 19:15:39 2022 +0100
+
+    prevent cpu_features from shitting itself on ppc32
+
+diff --git a/GraphBLAS/cpu_features/src/impl_ppc_linux.c b/GraphBLAS/cpu_features/src/impl_ppc_linux.c
+index 13a381a..fa72eee 100644
+--- a/GraphBLAS/cpu_features/src/impl_ppc_linux.c
++++ b/GraphBLAS/cpu_features/src/impl_ppc_linux.c
+@@ -69,6 +69,11 @@
+   LINE(PPC_SCV, scv, "scv", 0, PPC_FEATURE2_SCV)                               \
+   LINE(PPC_HTM_NO_SUSPEND, htm_no_suspend, "htm-no-suspend", 0,                \
+        PPC_FEATURE2_HTM_NO_SUSPEND)
++
++#ifdef PPC
++#undef PPC
++#endif
++
+ #define INTROSPECTION_PREFIX PPC
+ #define INTROSPECTION_ENUM_PREFIX PPC
+ #include "define_introspection_and_hwcaps.inl"

From 07538c6fbb0332468e09f2b0e1495e6fec0948a8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 9 May 2022 04:41:16 +0200
Subject: [PATCH 2136/2561] libvdt: fix template for non-x86

---
 srcpkgs/libvdt/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libvdt/template b/srcpkgs/libvdt/template
index 3caa629d6eb2..d989e8c7d247 100644
--- a/srcpkgs/libvdt/template
+++ b/srcpkgs/libvdt/template
@@ -5,7 +5,8 @@ revision=1
 wrksrc="vdt-${version}"
 build_style=cmake
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*|arm*)
+	x86_64*|i686*) ;;
+	*)
 	configure_args="-DSSE=OFF -DNEON=OFF"
 	make_cmd=make
 	export CMAKE_GENERATOR="Unix Makefiles"

From 08b6ccca26855be039f590e2391878e9d541b7d0 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 9 May 2022 04:44:24 +0200
Subject: [PATCH 2137/2561] flintlib: only enable openblas where supported

---
 srcpkgs/flintlib/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/flintlib/template b/srcpkgs/flintlib/template
index 57a4a2de4f42..968dbcb525c2 100644
--- a/srcpkgs/flintlib/template
+++ b/srcpkgs/flintlib/template
@@ -18,12 +18,16 @@ checksum=5911fedff911100f15781f35e3a4fa934fe60e4aea02a8c10cc8918101c1eed8
 
 build_options="ntl openblas"
 desc_option_ntl="enable NTL support"
-build_options_default="openblas"
+build_options_default=""
 
 if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" ntl"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|i686*|aarch64*|arm*|ppc64*) build_options_default+=" openblas";;
+esac
+
 CFLAGS="-D_GNU_SOURCE" # needed for cpu_set_t
 
 flintlib-devel_package() {

From d03a388ec9491084b50d4faa70da0f3222afe1e8 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Mon, 9 May 2022 00:00:12 +0200
Subject: [PATCH 2138/2561] chezmoi: update to 2.15.3

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 531370c90298..7f416e873786 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.15.2
+version=2.15.3
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -11,7 +11,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=c06c62feeaa95d735191db19fb9f4ef473b7144e01004e789b03d9a3c9c5b4b6
+checksum=2c0239c643795a13420f815c7e906720cd98594152b6d6fa546b0242462adc9e
 
 pre_build() {
 	local _date

From 66566680dac7df023df2b3d3d380849dfaaabdcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 1 May 2022 18:17:53 +0200
Subject: [PATCH 2139/2561] scrcpy: update to 1.24.

---
 srcpkgs/scrcpy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/scrcpy/template b/srcpkgs/scrcpy/template
index 42f57c3fb663..e1140b975f5c 100644
--- a/srcpkgs/scrcpy/template
+++ b/srcpkgs/scrcpy/template
@@ -1,6 +1,6 @@
 # Template file for 'scrcpy'
 pkgname=scrcpy
-version=1.23
+version=1.24
 revision=1
 build_style=meson
 configure_args="-Dcompile_server=false
@@ -14,8 +14,8 @@ license="Apache-2.0"
 homepage="https://github.com/Genymobile/scrcpy"
 distfiles="${homepage}/archive/v${version}.tar.gz
  ${homepage}/releases/download/v${version}/scrcpy-server-v${version}"
-checksum="47686af76e2314404deda0eea58761ca1378a6a1567408b4560683461c7ea18b
- 2a913fd47478c0b306fca507cb0beb625e49a19ff9fc7ab904e36ef5b9fe7e68"
+checksum="e3054ad453ac577b941f8df0eabc94e842affc6e1d10ba8d21cededfa2eacc73
+ ae74a81ea79c0dc7250e586627c278c0a9a8c5de46c9fb5c38c167fb1a36f056"
 skip_extraction="scrcpy-server-v${version}"
 
 post_install() {

From 07cbc2d1ccd5f8c324e63da6a80b7375fc047a8e Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 25 Feb 2022 19:49:40 +0100
Subject: [PATCH 2140/2561] rosegarden: update to 21.12

and disable failing test test_notationview_selection
---
 srcpkgs/rosegarden/template | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/rosegarden/template b/srcpkgs/rosegarden/template
index d9331e27f413..e909cd4173b5 100644
--- a/srcpkgs/rosegarden/template
+++ b/srcpkgs/rosegarden/template
@@ -1,6 +1,6 @@
 # Template file for 'rosegarden'
 pkgname=rosegarden
-version=21.06.1
+version=21.12
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config shared-mime-info"
@@ -12,7 +12,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://rosegardenmusic.com/"
 distfiles="${SOURCEFORGE_SITE}/rosegarden/rosegarden/${version/*.*.*/${version%.*}}/rosegarden-${version}.tar.bz2"
-checksum=87750dc0b55ae27e07acc4effdc25ae5c4f6ba4ccf81ac5112abb0fed211397a
+checksum=dc3ed3db064e754de9fe830b69df40a53dc7157fbfa8a206ca82e5e41c262809
 
 if [ -n "${CROSS_BUILD}" ]; then
 	hostmakedepends+=" qt5-devel qt5-host-tools"
@@ -20,10 +20,7 @@ fi
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'
-}
-
-pre_check() {
-	mkdir  -p ${wrksrc}/check_xdg_runtime_dir
-	chmod 700 ${wrksrc}/check_xdg_runtime_dir
-	export XDG_RUNTIME_DIR=${wrksrc}/check_xdg_runtime_dir
+	# disable failing test, see
+	# https://bugs.gentoo.org/show_bug.cgi?id=701682
+	vsed -i test/CMakeLists.txt -e '/\s*test_notationview_selection/d'
 }

From c0c7eaad92b31efa6b2d8811c1366ac13592ff5d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:13:14 -0400
Subject: [PATCH 2141/2561] python3-frozendict: update to 2.3.2.

---
 srcpkgs/python3-frozendict/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index 3946c2ee05b1..4badb45e2d89 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.3.1
+version=2.3.2
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=bc91c69233eb916bb6ebc40988b6d849735770240efc9c60be45b4ab919c1bde
+checksum=7fac4542f0a13fbe704db4942f41ba3abffec5af8b100025973e59dff6a09d0d
 
 do_check() {
 	PYTHONPATH="$(cd build/lib* && pwd)" pytest3

From 47f9005779980b8ba40307028501aeb60cb03548 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:14:03 -0400
Subject: [PATCH 2142/2561] python3-phonenumbers: update to 8.12.47.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 0a952e920922..5b4179baaacf 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.46
+version=8.12.47
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=1c440f6336cb49893ff1a8326c70b4df693802ae981f210f545cd4215ac48133
+checksum=56fd605d2f5460e1df2117085b653bb38322295ec658e6acaafc9c976867d522

From 000eeeee8d7851aa48e86b722c444ea4414eab97 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 3 May 2022 07:58:38 -0400
Subject: [PATCH 2143/2561] python3-canonicaljson: update to 1.6.1.

---
 srcpkgs/python3-canonicaljson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index b9535436442b..2124a48c545b 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
-version=1.6.0
+version=1.6.1
 revision=1
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=8739d5fd91aca7281d425660ae65af7663808c8177778965f67e90b16a2b2427
+checksum=a93664f698556dbd4bab9c3fc4fb35834cf2535da1ea00b6b7758d8fe2bbb824

From de9d3acc8b36606ab26ea615902b813715fd2426 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 26 Apr 2022 10:17:05 -0400
Subject: [PATCH 2144/2561] synapse: update to 1.58.0.

upstream dropped support for setup.py
---
 srcpkgs/synapse/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 22ad01847677..5e23260063e5 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,10 +1,11 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.57.0
+version=1.58.0
 revision=1
-build_style=python3-module
+build_style=python3-pep517
 make_check_target=tests
-hostmakedepends="python3-setuptools"
+make_install_target="matrix_synapse-${version}-*-*-*.whl"
+hostmakedepends="python3-poetry-core"
 depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-signedjson python3-pynacl python3-service_identity python3-Twisted
  python3-openssl python3-yaml python3-pyasn1 python3-pyasn1-modules
@@ -14,14 +15,14 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
  python3-typing_extensions python3-ijson python3-matrix-common
  python3-packaging"
-checkdepends="$depends python3-parameterized python3-pytest"
+checkdepends="$depends python3-parameterized python3-pytest unzip"
 short_desc="Matrix reference homeserver"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 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=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a
+checksum=f859c3c426aff099360c84cfb580ba23b9d784b1a1b0e7b68965428f17e697ab
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"
@@ -31,6 +32,10 @@ make_dirs="
 	/etc/synapse 755 synapse synapse
 	/var/log/synapse 0755 synapse synapse"
 
+pre_check() {
+	unzip ${make_install_target} "*.dist-info/*"
+}
+
 post_install() {
 	vsv synapse
 

From b85538f4b5a6fa660f32c950a0b82886ba67b8f3 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 27 Apr 2022 04:15:09 -0400
Subject: [PATCH 2145/2561] net-tools: update to 2.10, adopt.

Also cleaned up the template and made the build system behave slightly better.
---
 srcpkgs/net-tools/template | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/net-tools/template b/srcpkgs/net-tools/template
index 384feba77fb9..b320c3183b32 100644
--- a/srcpkgs/net-tools/template
+++ b/srcpkgs/net-tools/template
@@ -1,15 +1,15 @@
 # Template file for 'net-tools'
 pkgname=net-tools
-version=1.60.20181103git
+version=2.10
 revision=1
-_githash=0eebece8c964e3cfa8a018f42b2e7e751a7009a0
-wrksrc="${pkgname}-${_githash}"
+build_style="gnu-makefile"
+make_use_env=yes
 short_desc="Basic networking tools"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="0x5c <dev@0x5c.io>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ecki/net-tools"
-distfiles="https://github.com/ecki/net-tools/archive/${_githash}.tar.gz"
-checksum=795cb4dd2618ed7ff9a48b9cb63b33780b47dfd7464c8e52ba734e6796cbab17
+distfiles="https://github.com/ecki/net-tools/archive/refs/tags/v${version}.tar.gz"
+checksum=8e186f65f0ff304989b3dc8b0067c3a07d36ae777da60667bdd6ccb2730908d2
 
 alternatives="
  ifconfig:ifconfig:/usr/bin/${pkgname}-ifconfig
@@ -17,9 +17,10 @@ alternatives="
  hostname:hostname:/usr/bin/${pkgname}-hostname
  hostname:/usr/share/man/man1/hostname.1:/usr/share/man/man8/${pkgname}-hostname.1"
 
-pre_build() {
-	vsed -i "s#/sbin#/bin#" Makefile
-	vsed -i "s#/usr##" man/Makefile
+post_patch() {
+	# Hacky and flaky, but upstream does not support $PREFIX !
+	vsed -e "s|/sbin|/bin|" -i Makefile
+	vsed -e "s|/bin|/usr/bin|" -i Makefile
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
 			# HZ is defined in <asm/param.h>
@@ -27,20 +28,18 @@ pre_build() {
 				-e "/#include <sys\/param.h>/a #include <asm\/param.h>"
 			vsed -i ${wrksrc}/netstat.c \
 				-e "/#include <sys\/param.h>/a #include <asm\/param.h>"
-
 			# Need <termios.h> for tty constants and structure
 			vsed -i ${wrksrc}/slattach.c \
 				-e "/#include <limits.h>/a #include <termios.h>"
 	esac
 }
 
-do_build() {
+do_configure() {
 	replace_interpreter bash configure.sh
-	yes "" | make
+	yes "" | make config
 }
 
-do_install() {
-	make DESTDIR=${DESTDIR}/usr update
+post_install() {
 	# Rename ifconfig for alternatives.
 	mv ${DESTDIR}/usr/bin/{ifconfig,${pkgname}-ifconfig}
 	mv ${DESTDIR}/usr/share/man/man8/{ifconfig,${pkgname}-ifconfig}.8

From 61a12faa105a9367428ba57dfa61633761e9c5e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 8 May 2022 17:12:18 +0200
Subject: [PATCH 2146/2561] erlang: update to 24.3.4.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index d59eeb464e74..fb0fa77fc4c4 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.3.2
+version=24.3.4
 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=cdc9cf788d28a492eb6b24881fbd06a0a5c785dc374ad415b3be1db96326583c
+checksum=e59bedbb871af52244ca5284fd0a572d52128abd4decf4347fe2aef047b65c58
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From a8c78d79fd25ad6f161dfe080d378beb5cf5df34 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 9 May 2022 14:36:33 +0200
Subject: [PATCH 2147/2561] ugrep: update to 3.7.10.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 5025d63a7ebd..fda7c355b64a 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.9
+version=3.7.10
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=016e771756574a2a0b026ec50f7e7f3898d39cb61771ce98bc225c34d86a03be
+checksum=733503055e309e83898a403481d92357fc3b02d4642acdb51026dd2dd44e0477
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 27fd8b53411e869c9a624cce32e6fd9f42b37283 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 17:56:52 -0500
Subject: [PATCH 2148/2561] nvidia: update to 510.68.02.

Also update conflicts.
---
 srcpkgs/nvidia/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 94482a9de0e2..026ef02110ff 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,8 +3,8 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=510.60.02
-revision=2
+version=510.68.02
+revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -15,11 +15,11 @@ repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
 hostmakedepends="tar"
-conflicts="xserver-abi-video>25_1"
+conflicts="xserver-abi-video>25_1 nvidia470>=0 nvidia390>=0"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=a800dfc0549078fd8c6e8e6780efb8eee87872e6055c7f5f386a4768ce07e003
+checksum=bd2c344ac92b2fc12b06043590a4fe8d4eb0ccb74d0c49352f004cf2d299f4c5
 # 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}
@@ -279,6 +279,7 @@ do_install() {
 
 nvidia-gtklibs_package() {
 	short_desc="${_desc} - GTK+ libraries"
+	conflicts="nvidia470-gtklibs>=0 nvidia390-gtklibs>=0"
 	pkg_install() {
 		vmove "usr/lib/lib*gtk*.so*"
 	}
@@ -288,6 +289,7 @@ nvidia-libs-32bit_package() {
 	short_desc="${_desc} - common libraries (32bit)"
 	# manually set 32bit depends for libglvnd
 	depends="glibc-32bit>=0 libX11-32bit>=0 libXext-32bit>=0 libglvnd-32bit>=0"
+	conflicts="nvidia470-libs-32bit>=0 nvidia390-libs-32bit>=0"
 	repository="multilib/nonfree"
 	pkg_install() {
 		vmove usr/lib32
@@ -298,6 +300,7 @@ nvidia-libs_package() {
 	short_desc="${_desc} - common libraries"
 	depends="libglvnd"
 	nostrip_files="gsp.bin"
+	conflicts="nvidia470-libs>=0 nvidia390-libs>=0"
 	pkg_install() {
 		vmove usr/lib
 	}
@@ -309,6 +312,7 @@ nvidia-dkms_package() {
 	dkms_modules="nvidia ${version}"
 	# dkms must be before initramfs-regenerate to build modules before images
 	triggers="dkms initramfs-regenerate"
+	conflicts="nvidia470-dkms>=0 nvidia390-dkms>=0"
 
 	pkg_install() {
 		vmove usr/src
@@ -319,6 +323,7 @@ nvidia-dkms_package() {
 nvidia-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
 	depends="ocl-icd"
+	conflicts="nvidia470-opencl>=0 nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

From 1dfc345e944a3b428631d692d8d9b2899a2a31b9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 6 May 2022 18:14:22 -0500
Subject: [PATCH 2149/2561] nvidia470: update conflicts

---
 srcpkgs/nvidia470/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia470/template b/srcpkgs/nvidia470/template
index d746210cc92f..def3fee02786 100644
--- a/srcpkgs/nvidia470/template
+++ b/srcpkgs/nvidia470/template
@@ -4,7 +4,7 @@ _desc="NVIDIA drivers (GKxxx “Kepler”)"
 
 pkgname=nvidia470
 version=470.103.01
-revision=3
+revision=4
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
 homepage="https://www.nvidia.com/en-us/drivers/unix/"
@@ -15,7 +15,7 @@ repository="nonfree"
 create_wrksrc=yes
 short_desc="${_desc} - Libraries and Utilities"
 hostmakedepends="tar"
-conflicts="xserver-abi-video>25_1"
+conflicts="xserver-abi-video>25_1 nvidia390>=0"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
@@ -263,6 +263,7 @@ do_install() {
 
 nvidia470-gtklibs_package() {
 	short_desc="${_desc} - GTK+ libraries"
+	conflicts="nvidia390-gtklibs>=0"
 	pkg_install() {
 		vmove "usr/lib/lib*gtk*.so*"
 	}
@@ -273,6 +274,7 @@ nvidia470-libs-32bit_package() {
 	# manually set 32bit depends for libglvnd
 	depends="glibc-32bit>=0 libX11-32bit>=0 libXext-32bit>=0 libglvnd-32bit>=0"
 	repository="multilib/nonfree"
+	conflicts="nvidia390-libs-32bit>=0"
 	pkg_install() {
 		vmove usr/lib32
 	}
@@ -282,6 +284,7 @@ nvidia470-libs_package() {
 	short_desc="${_desc} - common libraries"
 	depends="libglvnd"
 	nostrip_files="gsp.bin"
+	conflicts="nvidia390-libs>=0"
 	pkg_install() {
 		vmove usr/lib
 	}
@@ -293,6 +296,7 @@ nvidia470-dkms_package() {
 	dkms_modules="nvidia ${version}"
 	# dkms must be before initramfs-regenerate to build modules before images
 	triggers="dkms initramfs-regenerate"
+	conflicts="nvidia390-dkms>=0"
 
 	pkg_install() {
 		vmove usr/src
@@ -303,6 +307,7 @@ nvidia470-dkms_package() {
 nvidia470-opencl_package() {
 	short_desc="${_desc} - OpenCL implementation"
 	depends="ocl-icd"
+	conflicts="nvidia390-opencl>=0"
 	pkg_install() {
 		vmove "usr/lib/libnvidia-compiler*"
 		vmove "usr/lib/libnvidia-opencl*"

From bd668c8c32b4a03992e0c4d66619b1c0ae35b42b Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Fri, 29 Apr 2022 11:10:13 +0200
Subject: [PATCH 2150/2561] xf86-video-amdgpu: update to 22.0.0.

---
 srcpkgs/xf86-video-amdgpu/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xf86-video-amdgpu/template b/srcpkgs/xf86-video-amdgpu/template
index 6ca8bc71b554..d31626a071df 100644
--- a/srcpkgs/xf86-video-amdgpu/template
+++ b/srcpkgs/xf86-video-amdgpu/template
@@ -1,7 +1,7 @@
 # Template file for 'xf86-video-amdgpu'
 pkgname=xf86-video-amdgpu
-version=21.0.0
-revision=2
+version=22.0.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorgproto eudev-libudev-devel libpciaccess-devel libdrm-devel
@@ -11,8 +11,8 @@ short_desc="Xorg AMD Radeon RXXX video driver (amdgpu kernel module)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://wiki.freedesktop.org/xorg"
-distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=607823034defba6152050e5eb1c4df94b38819ef764291abadd81b620bc2ad88
+distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.xz"
+checksum=9d23fb602915dc3ccde92aa4d1e9485e7e54eaae2f41f485e55eb20761778266
 
 lib32disabled=yes
 LDFLAGS="-Wl,-z,lazy"

From 588cd63bcfdc033f5441813041a5a87270a7b97a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 7 May 2022 18:34:14 +0300
Subject: [PATCH 2151/2561] sakura: update to 3.8.5.

---
 srcpkgs/sakura/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sakura/template b/srcpkgs/sakura/template
index 36627625740f..6b0bda6d0a13 100644
--- a/srcpkgs/sakura/template
+++ b/srcpkgs/sakura/template
@@ -1,6 +1,6 @@
 # Template file for 'sakura'
 pkgname=sakura
-version=3.8.4
+version=3.8.5
 revision=1
 build_style=cmake
 hostmakedepends="perl pkg-config gettext"
@@ -11,4 +11,4 @@ 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=c3f610168796b3d44f69a6431f7b0d032be958ca42f7117a17380869bb1816b5
+checksum=d55fe959ea50b5e5cefc6bf30c890e747199cc98e443a2193e6cafe6f2540d34

From b5d022f8fe0fc28137a7179a9dd4146672c29648 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 7 May 2022 11:24:57 +0400
Subject: [PATCH 2152/2561] unrar: update to 6.1.7.

---
 srcpkgs/unrar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template
index cb408ad13c23..de70a410fada 100644
--- a/srcpkgs/unrar/template
+++ b/srcpkgs/unrar/template
@@ -1,6 +1,6 @@
 # Template file for 'unrar'
 pkgname=unrar
-version=6.1.6
+version=6.1.7
 revision=1
 wrksrc=unrar
 short_desc="Unarchiver for .rar files (non-free version)"
@@ -8,7 +8,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="custom:freeware"
 homepage="https://www.rarlab.com/rar_add.htm"
 distfiles="https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"
-checksum=67f4ab891c062218c2badfaac9c8cab5c8bfd5e96dabfca56c8faa3d209a801d
+checksum=de75b6136958173fdfc530d38a0145b72342cf0d3842bf7bb120d336602d88ed
 repository=nonfree
 
 do_build() {

From 10241d5196447cbd8a5e77b6f531f660c95ac773 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 9 May 2022 08:25:54 -0500
Subject: [PATCH 2153/2561] impacket: update to 0.10.0.

---
 srcpkgs/impacket/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/impacket/template b/srcpkgs/impacket/template
index 008b4c5d4f25..42c058f9d464 100644
--- a/srcpkgs/impacket/template
+++ b/srcpkgs/impacket/template
@@ -1,6 +1,6 @@
 # Template file for 'impacket'
 pkgname=impacket
-version=0.9.24
+version=0.10.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,12 +13,9 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-1.1, MIT"
 homepage="https://www.secureauth.com/labs/open-source-tools/impacket/"
 distfiles="https://github.com/SecureAuthCorp/impacket/releases/download/impacket_${version//./_}/impacket-${version}.tar.gz"
-checksum=18d557d387f4914fafa739813b9172bc3f8bd9c036e93bf589a8e0ebb7304bba
+checksum=b8eb020a2cbb47146669cfe31c64bb2e7d6499d049c493d6418b9716f5c74583
 make_check=extended
 
 post_install() {
 	vlicense LICENSE
-
-	rm ${DESTDIR}/usr/bin/PoC.py    \
-	   ${DESTDIR}/usr/bin/PoC2.py
 }

From df1ace075513ff6349cebacdbec9fcb79656b151 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 9 May 2022 08:26:38 -0500
Subject: [PATCH 2154/2561] python3-rich: update to 12.4.1.

---
 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 f9cd79d81ea9..377a89153322 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=12.3.0
+version=12.4.1
 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=7e8700cda776337036a712ff0495b04052fb5f957c7dfb8df997f88350044b64
+checksum=d239001c0fb7de985e21ec9a4bb542b5150350330bbc1849f835b9cbc8923b91
 make_check=extended # some checks only work on windows
 
 post_install() {

From 5fd29271c1ea6000e323f753e1dcc635eb34a872 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 9 May 2022 16:21:14 +0200
Subject: [PATCH 2155/2561] rink: broken on big endian ppc64

---
 srcpkgs/rink/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/rink/template b/srcpkgs/rink/template
index 7772630d24bc..9191abe6af4e 100644
--- a/srcpkgs/rink/template
+++ b/srcpkgs/rink/template
@@ -14,3 +14,8 @@ homepage="https://github.com/tiffany352/rink-rs"
 changelog="https://github.com/tiffany352/rink-rs/releases"
 distfiles="https://github.com/tiffany352/rink-rs/archive/refs/tags/v${version}.tar.gz"
 checksum=49431c12f57d58090b9f5f7f899e98bebffaeed8ca69b5ee140aad4b1c1d9dc8
+
+case "$XBPS_TARGET_MACHINE" in
+	ppc64le*) ;;
+	ppc64*) broken="lots of unresolved imports for some reason";;
+esac

From 1d3fb7afd86c85403d1ca704d94d4539844c679b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 9 May 2022 17:12:40 +0200
Subject: [PATCH 2156/2561] fselect: fix build on ppc64le-musl

---
 srcpkgs/fselect/template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/fselect/template b/srcpkgs/fselect/template
index 5c35c5be539f..9f26f6100bf0 100644
--- a/srcpkgs/fselect/template
+++ b/srcpkgs/fselect/template
@@ -10,6 +10,16 @@ homepage="https://github.com/jhspetersson/fselect"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=33dfcbbf7e598bce479b1fb5c17429af1bb309beab2e4bc95642e9f4b5c2ffbd
 
+post_patch() {
+	# in rustix-0.32.x:
+	#
+	# libc::BLKSSZGET as c::c_ulong,
+	# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u64`
+	#
+	# remove on next version update
+	cargo update --package fd-lock --precise 3.0.5
+}
+
 post_install() {
 	vlicense LICENSE-MIT
 }

From 2fa35595a08c5ad1bf3111e168492f35b1f2ec60 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 9 May 2022 20:04:19 +0200
Subject: [PATCH 2157/2561] libguestfs: update to 1.48.1.

---
 srcpkgs/libguestfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index c6c56f8142b7..48d521d89d19 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
-version=1.48.0
-revision=2
+version=1.48.1
+revision=1
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"
@@ -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=1681fddedfcf484ca6deec54230330a32defbd30c2ab1f81788e252cb5d04829
+checksum=4c3e84ae257b48fa6628734c8b305e3a0b8653928aef02caa423341413a90f1f
 
 conf_files="etc/libguestfs-tools.conf"
 

From 9cf44086a3bf81c31f8762a7585d8a2fa89e4690 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 9 May 2022 20:13:22 +0200
Subject: [PATCH 2158/2561] perl-Template-Toolkit: update to 3.100.

---
 srcpkgs/perl-Template-Toolkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Template-Toolkit/template b/srcpkgs/perl-Template-Toolkit/template
index 453f8262144c..24712b0359a2 100644
--- a/srcpkgs/perl-Template-Toolkit/template
+++ b/srcpkgs/perl-Template-Toolkit/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Template-Toolkit'
 pkgname=perl-Template-Toolkit
-version=3.010
+version=3.100
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -12,4 +12,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Template-Toolkit"
 distfiles="${CPAN_SITE}/Template/Template-Toolkit-${version}.tar.gz"
-checksum=f4b65e93364088aa850887820652e467b0bce1493760fd3690268520b37d82cc
+checksum=cec7c20af57ed4b0d8131599a41027f56e22b544c8083704afad6a13cd483ffc

From 6d7b017868e59e3a9fa9a9ebff66034b5ed1f431 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 9 May 2022 20:13:35 +0200
Subject: [PATCH 2159/2561] python-b2sdk: update to 1.16.0.

---
 srcpkgs/python-b2sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index 7b0578b60926..bdc6d758e732 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'python-b2sdk'
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
-version=1.14.1
+version=1.16.0
 revision=1
 wrksrc="b2sdk-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://pypi.org/project/b2sdk"
 distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=7d839eca12a6f66453eb535c41569714a7910bc012f657c864c3bfb3a88569e8
+checksum=cbffff1163bb8e7cc920c76b29f5e889369d7f5ef1b7b53c89fd5bb79f5ea9c5
 
 post_install() {
 	vlicense LICENSE

From 02fe28cd7521d75fa59129f83a06e9d2b9bb0f54 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Mon, 9 May 2022 20:14:24 +0200
Subject: [PATCH 2160/2561] texmaker: update to 5.1.3.

---
 srcpkgs/texmaker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/texmaker/template b/srcpkgs/texmaker/template
index 5a2f65a3be81..d7a71964ac45 100644
--- a/srcpkgs/texmaker/template
+++ b/srcpkgs/texmaker/template
@@ -1,6 +1,6 @@
 # Template file for 'texmaker'
 pkgname=texmaker
-version=5.1.2
+version=5.1.3
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
@@ -10,4 +10,4 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://www.xm1math.net/texmaker/index.html"
 distfiles="http://www.xm1math.net/$pkgname/$pkgname-$version.tar.bz2"
-checksum=526896f2c1ae561130eec7aae815b9dcda9e8eeb772b6541d0dc94ce91a71044
+checksum=bfa52e5e0e3c61d5258ea8c69ea527f6bd20f0e23fe2da43b80aee00b2609f61

From 712a593267e70cfa97dc6836fe59206b9070320b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 21 Dec 2021 19:19:59 -0500
Subject: [PATCH 2161/2561] New package: gotify-cli-2.2.1

---
 srcpkgs/gotify-cli/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/gotify-cli/template

diff --git a/srcpkgs/gotify-cli/template b/srcpkgs/gotify-cli/template
new file mode 100644
index 000000000000..50754553ec46
--- /dev/null
+++ b/srcpkgs/gotify-cli/template
@@ -0,0 +1,21 @@
+# Template file for 'gotify-cli'
+pkgname=gotify-cli
+version=2.2.1
+revision=1
+wrksrc="cli-$version"
+build_style=go
+go_import_path="github.com/gotify/cli/v2"
+go_ldflags="-w -s -X main.Version=${version} \
+ -X main.BuildDate=${SOURCE_DATE_EPOCH} \
+ -X main.Mode=prod"
+short_desc="Command line interface for pushing messages to a Gotify server"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gotify.net"
+distfiles="https://github.com/gotify/cli/archive/v${version}.tar.gz"
+checksum=9013f4afdcc717932e71ab217e09daf4c48e153b23454f5e732ad0f74a8c8979
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/cli ${DESTDIR}/usr/bin/gotify-cli
+	vlicense LICENSE
+}

From ab87e02e966042ed9f0260d6b33f6a58b1c6cb74 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 20 Feb 2022 18:37:39 -0500
Subject: [PATCH 2162/2561] New package: gotify-server-2.1.4

---
 .../gotify-server/files/gotify-server/log/run |  1 +
 srcpkgs/gotify-server/files/gotify-server/run |  3 ++
 srcpkgs/gotify-server/template                | 44 +++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/gotify-server/files/gotify-server/log/run
 create mode 100755 srcpkgs/gotify-server/files/gotify-server/run
 create mode 100644 srcpkgs/gotify-server/template

diff --git a/srcpkgs/gotify-server/files/gotify-server/log/run b/srcpkgs/gotify-server/files/gotify-server/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/gotify-server/files/gotify-server/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/gotify-server/files/gotify-server/run b/srcpkgs/gotify-server/files/gotify-server/run
new file mode 100755
index 000000000000..6d4d3243be2f
--- /dev/null
+++ b/srcpkgs/gotify-server/files/gotify-server/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec chpst -u _gotify:_gotify gotify-server
diff --git a/srcpkgs/gotify-server/template b/srcpkgs/gotify-server/template
new file mode 100644
index 000000000000..9a0dad5ea6e9
--- /dev/null
+++ b/srcpkgs/gotify-server/template
@@ -0,0 +1,44 @@
+# Template file for 'gotify-server'
+pkgname=gotify-server
+version=2.1.4
+revision=1
+wrksrc="server-$version"
+build_style=go
+go_import_path="github.com/gotify/server/v2"
+go_ldflags="-w -s -extldflags=-fuse-ld=bfd \
+ -X main.Version=${version} \
+ -X main.BuildDate=${SOURCE_DATE_EPOCH} \
+ -X main.Mode=prod"
+hostmakedepends="yarn packr2"
+short_desc="Simple server for sending and receiving messages"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gotify.net"
+distfiles="https://github.com/gotify/server/archive/v${version}.tar.gz"
+checksum=141e16147dadc34264c4ec9fb1e28df229148d87fa73deaad3ac5b2ecbb0dfb3
+conf_files="/etc/gotify/config.yml"
+
+system_accounts="_gotify"
+_gotify_homedir="/var/lib/gotify"
+make_dirs="/var/lib/gotify 0750 _gotify _gotify"
+
+post_patch() {
+	vsed 's,data/,/var/lib/gotify/,' -i config.example.yml
+}
+
+pre_build() {
+	cd ui
+	yarn
+	yarn build
+
+	cd "$wrksrc"
+	packr2
+}
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/server ${DESTDIR}/usr/bin/gotify-server
+	vlicense LICENSE
+	vinstall config.example.yml 644 etc/gotify config.yml
+
+	vsv gotify-server
+}

From 31ae3878c31984d3396e07fe6fde5370fba06414 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 20 Feb 2022 18:37:51 -0500
Subject: [PATCH 2163/2561] New package: up_rewrite-1.1.1

---
 srcpkgs/up_rewrite/files/up_rewrite/log/run |  1 +
 srcpkgs/up_rewrite/files/up_rewrite/run     |  3 +++
 srcpkgs/up_rewrite/template                 | 23 +++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/up_rewrite/files/up_rewrite/log/run
 create mode 100755 srcpkgs/up_rewrite/files/up_rewrite/run
 create mode 100644 srcpkgs/up_rewrite/template

diff --git a/srcpkgs/up_rewrite/files/up_rewrite/log/run b/srcpkgs/up_rewrite/files/up_rewrite/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/up_rewrite/files/up_rewrite/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/up_rewrite/files/up_rewrite/run b/srcpkgs/up_rewrite/files/up_rewrite/run
new file mode 100755
index 000000000000..6db9c1c3f962
--- /dev/null
+++ b/srcpkgs/up_rewrite/files/up_rewrite/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec chpst -u _up_rewrite:_up_rewrite up_rewrite -c /etc/up_rewrite/config.toml
diff --git a/srcpkgs/up_rewrite/template b/srcpkgs/up_rewrite/template
new file mode 100644
index 000000000000..33037f90984c
--- /dev/null
+++ b/srcpkgs/up_rewrite/template
@@ -0,0 +1,23 @@
+# Template file for 'up_rewrite'
+pkgname=up_rewrite
+version=1.1.1
+revision=1
+wrksrc="common-proxies-${version}"
+build_style=go
+go_import_path="github.com/karmanyaahm/up_rewrite"
+go_ldflags="-X $go_import_path/config.Version=$version"
+short_desc="Rewrite Proxy for UnifiedPush written in Go"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://unifiedpush.org"
+distfiles="https://github.com/UnifiedPush/common-proxies/archive/v${version}.tar.gz"
+checksum=178d99a053afeeb64bff7149415d14a5f9b809af4d2c081ec4fbfe33ae55428f
+conf_files="/etc/up_rewrite/config.toml"
+
+system_accounts="_up_rewrite"
+
+post_install() {
+	vinstall example-config.toml 644 etc/up_rewrite config.toml
+	vlicense LICENSE
+	vsv up_rewrite
+}

From 331e45a53a9527f6f1b7eebc4b19feba8e1bf871 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 29 Apr 2022 22:59:01 +0200
Subject: [PATCH 2164/2561] f2fs-tools: remove unnecessary git build dep

---
 srcpkgs/f2fs-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/f2fs-tools/template b/srcpkgs/f2fs-tools/template
index 32d2b94ba650..f885bf580849 100644
--- a/srcpkgs/f2fs-tools/template
+++ b/srcpkgs/f2fs-tools/template
@@ -3,8 +3,8 @@ pkgname=f2fs-tools
 version=1.14.0
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static ac_cv_file__git=yes"
-hostmakedepends="automake libtool pkg-config git"
+configure_args="--disable-static"
+hostmakedepends="automake libtool pkg-config"
 makedepends="libuuid-devel libblkid-devel"
 short_desc="Tools for the Linux Flash-Friendly File System (F2FS)"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 693a42e1f91e16b05ba0142cfd22633d47d2f49b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 May 2022 21:07:49 +0200
Subject: [PATCH 2165/2561] gtk4: fix update-check

---
 srcpkgs/gtk4/update | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk4/update b/srcpkgs/gtk4/update
index f925f98e9eea..20fb052fc29a 100644
--- a/srcpkgs/gtk4/update
+++ b/srcpkgs/gtk4/update
@@ -1,2 +1,2 @@
-site=https://download.gnome.org/sources/gtk/cache.json
-pattern='4\.(\d|[1-8]\d)\.\d*(?=.tar)'
+pkgname="gtk"
+pattern="4\.[0-9]*[02468]\.[0-9]*"

From 14daa5eb1f2d4ed7ad6bc4ec2a1922d04e098eae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 9 May 2022 21:19:14 +0200
Subject: [PATCH 2166/2561] nv-codec-headers: fix update-check

---
 srcpkgs/nv-codec-headers/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/nv-codec-headers/update

diff --git a/srcpkgs/nv-codec-headers/update b/srcpkgs/nv-codec-headers/update
new file mode 100644
index 000000000000..0ef66a085297
--- /dev/null
+++ b/srcpkgs/nv-codec-headers/update
@@ -0,0 +1 @@
+pattern=">n\K[\d\.]+(?=</a>)"

From 3afda925b18eac9fec3844a2512fe45b138b0942 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Mon, 30 Aug 2021 09:47:14 -0700
Subject: [PATCH 2167/2561] pinebookpro-kernel: update to 5.15.38

Add patch series for dpaltmode support
Add patch series for gamma adjustment support
---
 .../pinebookpro-kernel/files/DocBook/Makefile |  282 ---
 srcpkgs/pinebookpro-kernel/files/dotconfig    | 1644 +++++++++--------
 ...-es8316-Run-micdetect-only-if-jack-s.patch |   30 -
 ...chip-support-gamma-control-on-RK3399.patch |  667 +++++++
 .../patches/pbp-dpaltmode.patch               |  854 +++++++++
 srcpkgs/pinebookpro-kernel/template           |   72 +-
 6 files changed, 2470 insertions(+), 1079 deletions(-)
 delete mode 100644 srcpkgs/pinebookpro-kernel/files/DocBook/Makefile
 delete mode 100644 srcpkgs/pinebookpro-kernel/patches/0005-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
 create mode 100644 srcpkgs/pinebookpro-kernel/patches/drm-rockchip-support-gamma-control-on-RK3399.patch
 create mode 100644 srcpkgs/pinebookpro-kernel/patches/pbp-dpaltmode.patch

diff --git a/srcpkgs/pinebookpro-kernel/files/DocBook/Makefile b/srcpkgs/pinebookpro-kernel/files/DocBook/Makefile
deleted file mode 100644
index 85916f13d330..000000000000
--- a/srcpkgs/pinebookpro-kernel/files/DocBook/Makefile
+++ /dev/null
@@ -1,282 +0,0 @@
-###
-# This makefile is used to generate the kernel documentation,
-# primarily based on in-line comments in various source files.
-# See Documentation/kernel-doc-nano-HOWTO.txt for instruction in how
-# to document the SRC - and how to read it.
-# To add a new book the only step required is to add the book to the
-# list of DOCBOOKS.
-
-DOCBOOKS := z8530book.xml  \
-	    kernel-hacking.xml kernel-locking.xml \
-	    networking.xml \
-	    filesystems.xml lsm.xml kgdb.xml \
-	    libata.xml mtdnand.xml librs.xml rapidio.xml \
-	    s390-drivers.xml scsi.xml \
-	    sh.xml w1.xml
-
-ifeq ($(DOCBOOKS),)
-
-# Skip DocBook build if the user explicitly requested no DOCBOOKS.
-.DEFAULT:
-	@echo "  SKIP    DocBook $@ target (DOCBOOKS=\"\" specified)."
-else
-ifneq ($(SPHINXDIRS),)
-
-# Skip DocBook build if the user explicitly requested a sphinx dir
-.DEFAULT:
-	@echo "  SKIP    DocBook $@ target (SPHINXDIRS specified)."
-else
-
-
-###
-# The build process is as follows (targets):
-#              (xmldocs) [by docproc]
-# file.tmpl --> file.xml +--> file.ps   (psdocs)   [by db2ps or xmlto]
-#                        +--> file.pdf  (pdfdocs)  [by db2pdf or xmlto]
-#                        +--> DIR=file  (htmldocs) [by xmlto]
-#                        +--> man/      (mandocs)  [by xmlto]
-
-
-# for PDF and PS output you can choose between xmlto and docbook-utils tools
-PDF_METHOD	= $(prefer-db2x)
-PS_METHOD	= $(prefer-db2x)
-
-
-targets += $(DOCBOOKS)
-BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
-xmldocs: $(BOOKS)
-sgmldocs: xmldocs
-
-PS := $(patsubst %.xml, %.ps, $(BOOKS))
-psdocs: $(PS)
-
-PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
-pdfdocs: $(PDF)
-
-HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
-htmldocs: $(HTML)
-	$(call cmd,build_main_index)
-
-MAN := $(patsubst %.xml, %.9, $(BOOKS))
-mandocs: $(MAN)
-	find $(obj)/man -name '*.9' | xargs gzip -nf
-
-# Default location for installed man pages
-export INSTALL_MAN_PATH = $(objtree)/usr
-
-installmandocs: mandocs
-	mkdir -p $(INSTALL_MAN_PATH)/man/man9/
-	find $(obj)/man -name '*.9.gz' -printf '%h %f\n' | \
-		sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \
-		xargs install -m 644 -t $(INSTALL_MAN_PATH)/man/man9/
-
-# no-op for the DocBook toolchain
-epubdocs:
-latexdocs:
-linkcheckdocs:
-
-###
-#External programs used
-KERNELDOCXMLREF = $(srctree)/scripts/kernel-doc-xml-ref
-KERNELDOC       = $(srctree)/scripts/kernel-doc
-DOCPROC         = $(objtree)/scripts/docproc
-CHECK_LC_CTYPE = $(objtree)/scripts/check-lc_ctype
-
-# Use a fixed encoding - UTF-8 if the C library has support built-in
-# or ASCII if not
-LC_CTYPE := $(call try-run, LC_CTYPE=C.UTF-8 $(CHECK_LC_CTYPE),C.UTF-8,C)
-export LC_CTYPE
-
-XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl
-XMLTOFLAGS += --skip-validation
-
-###
-# DOCPROC is used for two purposes:
-# 1) To generate a dependency list for a .tmpl file
-# 2) To preprocess a .tmpl file and call kernel-doc with
-#     appropriate parameters.
-# The following rules are used to generate the .xml documentation
-# required to generate the final targets. (ps, pdf, html).
-quiet_cmd_docproc = DOCPROC $@
-      cmd_docproc = SRCTREE=$(srctree)/ $(DOCPROC) doc $< >$@
-define rule_docproc
-	set -e;								\
-        $(if $($(quiet)cmd_$(1)),echo '  $($(quiet)cmd_$(1))';) 	\
-        $(cmd_$(1)); 							\
-        ( 								\
-          echo 'cmd_$@ := $(cmd_$(1))'; 				\
-          echo $@: `SRCTREE=$(srctree) $(DOCPROC) depend $<`; 		\
-        ) > $(dir $@).$(notdir $@).cmd
-endef
-
-%.xml: %.tmpl $(KERNELDOC) $(DOCPROC) $(KERNELDOCXMLREF) FORCE
-	$(call if_changed_rule,docproc)
-
-# Tell kbuild to always build the programs
-always := $(hostprogs-y)
-
-notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
-		   exit 1
-db2xtemplate = db2TYPE -o $(dir $@) $<
-xmltotemplate = xmlto TYPE $(XMLTOFLAGS) -o $(dir $@) $<
-
-# determine which methods are available
-ifeq ($(shell which db2ps >/dev/null 2>&1 && echo found),found)
-	use-db2x = db2x
-	prefer-db2x = db2x
-else
-	use-db2x = notfound
-	prefer-db2x = $(use-xmlto)
-endif
-ifeq ($(shell which xmlto >/dev/null 2>&1 && echo found),found)
-	use-xmlto = xmlto
-	prefer-xmlto = xmlto
-else
-	use-xmlto = notfound
-	prefer-xmlto = $(use-db2x)
-endif
-
-# the commands, generated from the chosen template
-quiet_cmd_db2ps = PS      $@
-      cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))
-%.ps : %.xml
-	$(call cmd,db2ps)
-
-quiet_cmd_db2pdf = PDF     $@
-      cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))
-%.pdf : %.xml
-	$(call cmd,db2pdf)
-
-
-index = index.html
-main_idx = $(obj)/$(index)
-quiet_cmd_build_main_index = HTML    $(main_idx)
-      cmd_build_main_index = rm -rf $(main_idx); \
-		   echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \
-		   echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
-		   cat $(HTML) >> $(main_idx)
-
-quiet_cmd_db2html = HTML    $@
-      cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
-		echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \
-		$(patsubst %.html,%,$(notdir $@))</a><p>' > $@
-
-###
-# Rules to create an aux XML and .db, and use them to re-process the DocBook XML
-# to fill internal hyperlinks
-       gen_aux_xml = :
- quiet_gen_aux_xml = echo '  XMLREF  $@'
-silent_gen_aux_xml = :
-%.aux.xml: %.xml
-	@$($(quiet)gen_aux_xml)
-	@rm -rf $@
-	@(cat $< | egrep "^<refentry id" | egrep -o "\".*\"" | cut -f 2 -d \" > $<.db)
-	@$(KERNELDOCXMLREF) -db $<.db $< > $@
-.PRECIOUS: %.aux.xml
-
-%.html:	%.aux.xml
-	@(which xmlto > /dev/null 2>&1) || \
-	 (echo "*** You need to install xmlto ***"; \
-	  exit 1)
-	@rm -rf $@ $(patsubst %.html,%,$@)
-	$(call cmd,db2html)
-	@if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \
-            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
-
-quiet_cmd_db2man = MAN     $@
-      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man/$(*F) $< ; fi
-%.9 : %.xml
-	@(which xmlto > /dev/null 2>&1) || \
-	 (echo "*** You need to install xmlto ***"; \
-	  exit 1)
-	$(Q)mkdir -p $(obj)/man/$(*F)
-	$(call cmd,db2man)
-	@touch $@
-
-###
-# Rules to generate postscripts and PNG images from .fig format files
-quiet_cmd_fig2eps = FIG2EPS $@
-      cmd_fig2eps = fig2dev -Leps $< $@
-
-%.eps: %.fig
-	@(which fig2dev > /dev/null 2>&1) || \
-	 (echo "*** You need to install transfig ***"; \
-	  exit 1)
-	$(call cmd,fig2eps)
-
-quiet_cmd_fig2png = FIG2PNG $@
-      cmd_fig2png = fig2dev -Lpng $< $@
-
-%.png: %.fig
-	@(which fig2dev > /dev/null 2>&1) || \
-	 (echo "*** You need to install transfig ***"; \
-	  exit 1)
-	$(call cmd,fig2png)
-
-###
-# Rule to convert a .c file to inline XML documentation
-       gen_xml = :
- quiet_gen_xml = echo '  GEN     $@'
-silent_gen_xml = :
-%.xml: %.c
-	@$($(quiet)gen_xml)
-	@(                            \
-	   echo "<programlisting>";   \
-	   expand --tabs=8 < $< |     \
-	   sed -e "s/&/\\&amp;/g"     \
-	       -e "s/</\\&lt;/g"      \
-	       -e "s/>/\\&gt;/g";     \
-	   echo "</programlisting>")  > $@
-
-endif # DOCBOOKS=""
-endif # SPHINDIR=...
-
-###
-# Help targets as used by the top-level makefile
-dochelp:
-	@echo  ' Linux kernel internal documentation in different formats (DocBook):'
-	@echo  '  htmldocs        - HTML'
-	@echo  '  pdfdocs         - PDF'
-	@echo  '  psdocs          - Postscript'
-	@echo  '  xmldocs         - XML DocBook'
-	@echo  '  mandocs         - man pages'
-	@echo  '  installmandocs  - install man pages generated by mandocs to INSTALL_MAN_PATH'; \
-	 echo  '                    (default: $(INSTALL_MAN_PATH))'; \
-	 echo  ''
-	@echo  '  cleandocs       - clean all generated DocBook files'
-	@echo
-	@echo  '  make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'
-	@echo  '  valid values for DOCBOOKS are: $(DOCBOOKS)'
-	@echo
-	@echo  "  make DOCBOOKS=\"\" [target] Don't generate docs from Docbook"
-	@echo  '     This is useful to generate only the ReST docs (Sphinx)'
-
-
-###
-# Temporary files left by various tools
-clean-files := $(DOCBOOKS) \
-	$(patsubst %.xml, %.dvi,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.aux,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.tex,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.log,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.out,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.ps,      $(DOCBOOKS)) \
-	$(patsubst %.xml, %.pdf,     $(DOCBOOKS)) \
-	$(patsubst %.xml, %.html,    $(DOCBOOKS)) \
-	$(patsubst %.xml, %.9,       $(DOCBOOKS)) \
-	$(patsubst %.xml, %.aux.xml, $(DOCBOOKS)) \
-	$(patsubst %.xml, %.xml.db,  $(DOCBOOKS)) \
-	$(patsubst %.xml, %.xml,     $(DOCBOOKS)) \
-	$(patsubst %.xml, .%.xml.cmd, $(DOCBOOKS)) \
-	$(index)
-
-clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
-
-cleandocs:
-	$(Q)rm -f $(call objectify, $(clean-files))
-	$(Q)rm -rf $(call objectify, $(clean-dirs))
-
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable so we can use it in if_changed and friends.
-
-.PHONY: $(PHONY)
diff --git a/srcpkgs/pinebookpro-kernel/files/dotconfig b/srcpkgs/pinebookpro-kernel/files/dotconfig
index 2c383ae77363..a4b353fa6e5e 100644
--- a/srcpkgs/pinebookpro-kernel/files/dotconfig
+++ b/srcpkgs/pinebookpro-kernel/files/dotconfig
@@ -1,17 +1,21 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.9 Kernel Configuration
+# Linux/arm64 5.15.28 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
-CONFIG_LD_VERSION=235010000
 CONFIG_CLANG_VERSION=0
+CONFIG_AS_IS_GNU=y
+CONFIG_AS_VERSION=23501
+CONFIG_LD_IS_BFD=y
+CONFIG_LD_VERSION=23501
 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_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -21,6 +25,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 #
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
+# CONFIG_WERROR is not set
 CONFIG_LOCALVERSION="_1"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
@@ -61,7 +66,6 @@ CONFIG_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_DEBUGFS=y
 # end of IRQ subsystem
 
-CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
@@ -79,9 +83,26 @@ CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 # end of Timers subsystem
 
+CONFIG_BPF=y
+CONFIG_HAVE_EBPF_JIT=y
+CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
+
+#
+# BPF subsystem
+#
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+CONFIG_BPF_JIT_DEFAULT_ON=y
+# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
+CONFIG_USERMODE_DRIVER=y
+# CONFIG_BPF_PRELOAD is not set
+# end of BPF subsystem
+
 # CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PREEMPT is not set
+# CONFIG_SCHED_CORE is not set
 
 #
 # CPU/Task time and stats accounting
@@ -123,6 +144,7 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=23
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=14
 CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=15
+# CONFIG_PRINTK_INDEX is not set
 CONFIG_GENERIC_SCHED_CLOCK=y
 
 #
@@ -155,6 +177,7 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_BPF=y
+CONFIG_CGROUP_MISC=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_SOCK_CGROUP_DATA=y
 CONFIG_NAMESPACES=y
@@ -184,7 +207,6 @@ CONFIG_LD_ORPHAN_WARN=y
 CONFIG_SYSCTL=y
 CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_BPF=y
 CONFIG_EXPERT=y
 CONFIG_UID16=y
 CONFIG_MULTIUSER=y
@@ -193,7 +215,6 @@ CONFIG_SYSFS_SYSCALL=y
 CONFIG_FHANDLE=y
 CONFIG_POSIX_TIMERS=y
 CONFIG_PRINTK=y
-CONFIG_PRINTK_NMI=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
 CONFIG_BASE_FULL=y
@@ -212,14 +233,9 @@ CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_BASE_RELATIVE=y
-CONFIG_BPF_SYSCALL=y
-CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y
-# CONFIG_BPF_JIT_ALWAYS_ON is not set
-CONFIG_BPF_JIT_DEFAULT_ON=y
-CONFIG_USERMODE_DRIVER=y
-# CONFIG_BPF_PRELOAD is not set
 # CONFIG_USERFAULTFD is not set
 CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_KCMP=y
 CONFIG_RSEQ=y
 # CONFIG_DEBUG_RSEQ is not set
 # CONFIG_EMBEDDED is not set
@@ -235,7 +251,6 @@ CONFIG_PERF_EVENTS=y
 
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
@@ -245,6 +260,7 @@ CONFIG_SLAB_FREELIST_RANDOM=y
 # CONFIG_SLAB_FREELIST_HARDENED is not set
 # CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
 CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 # end of General setup
 
@@ -261,16 +277,12 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA32=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
 CONFIG_SMP=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
@@ -282,10 +294,11 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 # Platform selection
 #
 # CONFIG_ARCH_ACTIONS is not set
-# CONFIG_ARCH_AGILEX is not set
 # CONFIG_ARCH_SUNXI is not set
 # CONFIG_ARCH_ALPINE is not set
+# CONFIG_ARCH_APPLE is not set
 # CONFIG_ARCH_BCM2835 is not set
+# CONFIG_ARCH_BCM4908 is not set
 # CONFIG_ARCH_BCM_IPROC is not set
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_BITMAIN is not set
@@ -307,7 +320,7 @@ CONFIG_ARCH_PROC_KCORE_TEXT=y
 CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_S32 is not set
 # CONFIG_ARCH_SEATTLE is not set
-# CONFIG_ARCH_STRATIX10 is not set
+# CONFIG_ARCH_INTEL_SOCFPGA is not set
 # CONFIG_ARCH_SYNQUACER is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_SPRD is not set
@@ -317,7 +330,6 @@ CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_VEXPRESS is not set
 # CONFIG_ARCH_VISCONTI is not set
 # CONFIG_ARCH_XGENE is not set
-# CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set
 # end of Platform selection
 
@@ -337,6 +349,7 @@ CONFIG_ARM64_ERRATUM_832075=y
 CONFIG_ARM64_ERRATUM_834220=y
 CONFIG_ARM64_ERRATUM_845719=y
 CONFIG_ARM64_ERRATUM_843419=y
+CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
 CONFIG_ARM64_ERRATUM_1024718=y
 CONFIG_ARM64_ERRATUM_1418040=y
 CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
@@ -359,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
 
@@ -377,32 +391,25 @@ CONFIG_SCHED_SMT=y
 CONFIG_NR_CPUS=256
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_NUMA is not set
-CONFIG_HOLES_IN_ZONE=y
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
 # CONFIG_CRASH_DUMP is not set
+CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -418,15 +425,15 @@ CONFIG_SETEND_EMULATION=y
 #
 CONFIG_ARM64_HW_AFDBM=y
 CONFIG_ARM64_PAN=y
+CONFIG_AS_HAS_LDAPR=y
+CONFIG_AS_HAS_LSE_ATOMICS=y
 CONFIG_ARM64_LSE_ATOMICS=y
 CONFIG_ARM64_USE_LSE_ATOMICS=y
-CONFIG_ARM64_VHE=y
 # end of ARMv8.1 architectural features
 
 #
 # ARMv8.2 architectural features
 #
-CONFIG_ARM64_UAO=y
 # CONFIG_ARM64_PMEM is not set
 CONFIG_ARM64_RAS_EXTN=y
 CONFIG_ARM64_CNP=y
@@ -436,6 +443,7 @@ CONFIG_ARM64_CNP=y
 # ARMv8.3 architectural features
 #
 CONFIG_ARM64_PTR_AUTH=y
+CONFIG_ARM64_PTR_AUTH_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
 CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
 CONFIG_AS_HAS_PAC=y
@@ -453,6 +461,7 @@ CONFIG_ARM64_TLB_RANGE=y
 #
 # ARMv8.5 architectural features
 #
+CONFIG_AS_HAS_ARMV8_5=y
 CONFIG_ARM64_BTI=y
 CONFIG_ARM64_BTI_KERNEL=y
 CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
@@ -462,6 +471,12 @@ CONFIG_ARM64_AS_HAS_MTE=y
 CONFIG_ARM64_MTE=y
 # end of ARMv8.5 architectural features
 
+#
+# ARMv8.7 architectural features
+#
+CONFIG_ARM64_EPAN=y
+# end of ARMv8.7 architectural features
+
 CONFIG_ARM64_SVE=y
 CONFIG_ARM64_MODULE_PLTS=y
 # CONFIG_ARM64_PSEUDO_NMI is not set
@@ -482,7 +497,6 @@ CONFIG_DMI=y
 # end of Boot options
 
 CONFIG_SYSVIPC_COMPAT=y
-CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 
 #
 # Power management options
@@ -564,56 +578,11 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=y
 CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_ACPI_CPPC_CPUFREQ=y
+CONFIG_ACPI_CPPC_CPUFREQ_FIE=y
 CONFIG_ARM_SCPI_CPUFREQ=y
 # end of CPU Frequency scaling
 # end of CPU Power Management
 
-#
-# Firmware Drivers
-#
-# CONFIG_ARM_SCMI_PROTOCOL is not set
-CONFIG_ARM_SCPI_PROTOCOL=y
-CONFIG_ARM_SCPI_POWER_DOMAIN=y
-# CONFIG_ARM_SDE_INTERFACE is not set
-# CONFIG_FIRMWARE_MEMMAP is not set
-CONFIG_DMIID=y
-CONFIG_DMI_SYSFS=y
-# CONFIG_ISCSI_IBFT is not set
-# CONFIG_FW_CFG_SYSFS is not set
-# CONFIG_GOOGLE_FIRMWARE is not set
-
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_VARS_PSTORE=y
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_GENERIC_STUB=y
-# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
-CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
-CONFIG_EFI_BOOTLOADER_CONTROL=y
-# CONFIG_EFI_CAPSULE_LOADER is not set
-# CONFIG_EFI_TEST is not set
-# CONFIG_RESET_ATTACK_MITIGATION is not set
-# CONFIG_EFI_DISABLE_PCI_DMA is not set
-# end of EFI (Extensible Firmware Interface) Support
-
-CONFIG_EFI_EARLYCON=y
-CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
-CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
-CONFIG_HAVE_ARM_SMCCC=y
-CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
-CONFIG_ARM_SMCCC_SOC_ID=y
-
-#
-# Tegra firmware driver
-#
-# end of Tegra firmware driver
-# end of Firmware Drivers
-
 CONFIG_ARCH_SUPPORTS_ACPI=y
 CONFIG_ACPI=y
 CONFIG_ACPI_GENERIC_GSI=y
@@ -665,7 +634,8 @@ CONFIG_HAVE_KVM_ARCH_TLB_FLUSH_ALL=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
-CONFIG_KVM_ARM_PMU=y
+CONFIG_KVM_XFER_TO_GUEST_WORK=y
+# CONFIG_NVHE_EL2_DEBUG is not set
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRYPTO_SHA256_ARM64=y
 CONFIG_CRYPTO_SHA512_ARM64=y
@@ -691,7 +661,6 @@ CONFIG_CRYPTO_AES_ARM64_BS=y
 # General architecture-dependent options
 #
 CONFIG_CRASH_CORE=y
-CONFIG_SET_FS=y
 CONFIG_KPROBES=y
 CONFIG_JUMP_LABEL=y
 # CONFIG_STATIC_KEYS_SELFTEST is not set
@@ -701,6 +670,7 @@ CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
 CONFIG_HAVE_NMI=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
@@ -710,6 +680,7 @@ CONFIG_ARCH_HAS_KEEPINITRD=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_NO_INSTR=y
 CONFIG_HAVE_ASM_MODVERSIONS=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
@@ -730,16 +701,23 @@ CONFIG_HAVE_ARCH_SECCOMP=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
+# CONFIG_SECCOMP_CACHE_DEBUG is not set
 CONFIG_HAVE_ARCH_STACKLEAK=y
 CONFIG_HAVE_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR=y
 CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG=y
+CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y
+CONFIG_LTO_NONE=y
+CONFIG_ARCH_SUPPORTS_CFI_CLANG=y
 CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PUD=y
 CONFIG_HAVE_MOVE_PMD=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_RELA=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@@ -754,6 +732,8 @@ CONFIG_COMPAT_OLD_SIGACTION=y
 CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
+CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y
+# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
@@ -764,6 +744,8 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
+CONFIG_HAVE_ARCH_PFN_VALID=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
 #
 # GCOV-based kernel profiling
@@ -788,27 +770,28 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
 # CONFIG_MODULE_SRCVERSION_ALL is not set
 # CONFIG_MODULE_SIG is not set
-CONFIG_MODULE_COMPRESS=y
+# CONFIG_MODULE_COMPRESS_NONE is not set
 CONFIG_MODULE_COMPRESS_GZIP=y
 # CONFIG_MODULE_COMPRESS_XZ is not set
+# CONFIG_MODULE_COMPRESS_ZSTD is not set
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
-CONFIG_UNUSED_SYMBOLS=y
+CONFIG_MODPROBE_PATH="/sbin/modprobe"
+# CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
-CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_CGROUP_RWSTAT=y
-CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSG_COMMON=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_INTEGRITY_T10=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
-CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_WBT=y
+CONFIG_BLK_WBT_MQ=y
 # CONFIG_BLK_CGROUP_IOLATENCY is not set
 # CONFIG_BLK_CGROUP_IOCOST is not set
-CONFIG_BLK_WBT_MQ=y
+# CONFIG_BLK_CGROUP_IOPRIO is not set
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_DEBUG_FS_ZONED=y
 CONFIG_BLK_SED_OPAL=y
@@ -844,6 +827,7 @@ CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
+CONFIG_BLOCK_HOLDER_DEPRECATED=y
 
 #
 # IO Schedulers
@@ -939,9 +923,6 @@ CONFIG_COREDUMP=y
 #
 # Memory Management options
 #
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_EXTREME=y
 CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
@@ -949,16 +930,19 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_FAST_GUP=y
 CONFIG_ARCH_KEEP_MEMBLOCK=y
 CONFIG_MEMORY_ISOLATION=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 # CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_PAGE_REPORTING=y
 CONFIG_MIGRATION=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
 CONFIG_CONTIG_ALLOC=y
 CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_BOUNCE=y
 CONFIG_MMU_NOTIFIER=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -970,6 +954,7 @@ CONFIG_FRONTSWAP=y
 CONFIG_CMA=y
 # CONFIG_CMA_DEBUG is not set
 CONFIG_CMA_DEBUGFS=y
+# CONFIG_CMA_SYSFS is not set
 CONFIG_CMA_AREAS=7
 CONFIG_ZSWAP=y
 # CONFIG_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set
@@ -992,12 +977,22 @@ CONFIG_ZSMALLOC=y
 CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_PTE_DEVMAP=y
-CONFIG_FRAME_VECTOR=y
+CONFIG_ARCH_HAS_ZONE_DMA_SET=y
+CONFIG_ZONE_DMA=y
+CONFIG_ZONE_DMA32=y
 CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
 # CONFIG_PERCPU_STATS is not set
-# CONFIG_GUP_BENCHMARK is not set
+# CONFIG_GUP_TEST is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
+CONFIG_SECRETMEM=y
+
+#
+# Data Access Monitoring
+#
+# CONFIG_DAMON is not set
+# end of Data Access Monitoring
 # end of Memory Management options
 
 CONFIG_NET=y
@@ -1014,6 +1009,7 @@ CONFIG_PACKET=y
 CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
 CONFIG_UNIX_SCM=y
+CONFIG_AF_UNIX_OOB=y
 CONFIG_UNIX_DIAG=m
 CONFIG_TLS=m
 # CONFIG_TLS_DEVICE is not set
@@ -1118,6 +1114,7 @@ CONFIG_IPV6_SEG6_LWTUNNEL=y
 CONFIG_IPV6_SEG6_HMAC=y
 CONFIG_IPV6_SEG6_BPF=y
 # CONFIG_IPV6_RPL_LWTUNNEL is not set
+# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
 CONFIG_NETLABEL=y
 # CONFIG_MPTCP is not set
 # CONFIG_NETWORK_SECMARK is not set
@@ -1134,13 +1131,13 @@ CONFIG_NETFILTER_INGRESS=y
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_FAMILY_BRIDGE=y
 CONFIG_NETFILTER_FAMILY_ARP=y
+# CONFIG_NETFILTER_NETLINK_HOOK is not set
 CONFIG_NETFILTER_NETLINK_ACCT=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_NETFILTER_NETLINK_OSF=m
 CONFIG_NF_CONNTRACK=m
-CONFIG_NF_LOG_COMMON=m
-CONFIG_NF_LOG_NETDEV=m
+CONFIG_NF_LOG_SYSLOG=m
 CONFIG_NETFILTER_CONNCOUNT=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
@@ -1209,9 +1206,11 @@ CONFIG_NF_DUP_NETDEV=m
 CONFIG_NFT_DUP_NETDEV=m
 CONFIG_NFT_FWD_NETDEV=m
 CONFIG_NFT_FIB_NETDEV=m
+# CONFIG_NFT_REJECT_NETDEV is not set
 CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
 CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XTABLES_COMPAT=y
 
 #
 # Xtables combined modules
@@ -1348,6 +1347,7 @@ CONFIG_IP_VS_SH=m
 CONFIG_IP_VS_MH=m
 CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
+# CONFIG_IP_VS_TWOS is not set
 
 #
 # IPVS SH scheduler
@@ -1448,7 +1448,6 @@ CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_TABLES_BRIDGE=m
 # CONFIG_NFT_BRIDGE_META is not set
 CONFIG_NFT_BRIDGE_REJECT=m
-CONFIG_NF_LOG_BRIDGE=m
 # CONFIG_NF_CONNTRACK_BRIDGE is not set
 CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BRIDGE_EBT_BROUTE=m
@@ -1525,23 +1524,28 @@ CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 # CONFIG_BRIDGE_MRP is not set
-CONFIG_HAVE_NET_DSA=y
+# CONFIG_BRIDGE_CFM is not set
 CONFIG_NET_DSA=m
 # CONFIG_NET_DSA_TAG_AR9331 is not set
 CONFIG_NET_DSA_TAG_BRCM_COMMON=m
 CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_LEGACY=m
 CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+# CONFIG_NET_DSA_TAG_HELLCREEK is not set
 # CONFIG_NET_DSA_TAG_GSWIP is not set
+CONFIG_NET_DSA_TAG_DSA_COMMON=m
 CONFIG_NET_DSA_TAG_DSA=m
 CONFIG_NET_DSA_TAG_EDSA=m
 # CONFIG_NET_DSA_TAG_MTK is not set
 # CONFIG_NET_DSA_TAG_KSZ is not set
 # CONFIG_NET_DSA_TAG_RTL4_A is not set
 # CONFIG_NET_DSA_TAG_OCELOT is not set
+# CONFIG_NET_DSA_TAG_OCELOT_8021Q is not set
 CONFIG_NET_DSA_TAG_QCA=m
 # CONFIG_NET_DSA_TAG_LAN9303 is not set
 # CONFIG_NET_DSA_TAG_SJA1105 is not set
 CONFIG_NET_DSA_TAG_TRAILER=m
+# CONFIG_NET_DSA_TAG_XRS700X is not set
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_VLAN_8021Q_MVRP=y
@@ -1678,9 +1682,7 @@ CONFIG_BATMAN_ADV_BLA=y
 CONFIG_BATMAN_ADV_DAT=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_MCAST=y
-CONFIG_BATMAN_ADV_DEBUGFS=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
-# CONFIG_BATMAN_ADV_SYSFS is not set
 CONFIG_OPENVSWITCH=m
 CONFIG_OPENVSWITCH_GRE=m
 CONFIG_OPENVSWITCH_VXLAN=m
@@ -1701,14 +1703,15 @@ CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_L3_MASTER_DEV=y
 # CONFIG_QRTR is not set
 # CONFIG_NET_NCSI is not set
+CONFIG_PCPU_DEV_REFCNT=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
+CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_XPS=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
-CONFIG_BPF_JIT=y
 CONFIG_BPF_STREAM_PARSER=y
 CONFIG_NET_FLOW_LIMIT=y
 
@@ -1767,6 +1770,7 @@ CONFIG_CAN_CC770=m
 CONFIG_CAN_CC770_PLATFORM=m
 # CONFIG_CAN_IFI_CANFD is not set
 CONFIG_CAN_M_CAN=m
+# CONFIG_CAN_M_CAN_PCI is not set
 # CONFIG_CAN_M_CAN_PLATFORM is not set
 # CONFIG_CAN_M_CAN_TCAN4X5X is not set
 # CONFIG_CAN_PEAK_PCIEFD is not set
@@ -1795,6 +1799,7 @@ CONFIG_CAN_SOFTING=m
 CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB2=m
+# CONFIG_CAN_ETAS_ES58X is not set
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 # CONFIG_CAN_MCBA_USB is not set
@@ -1818,6 +1823,7 @@ CONFIG_BT_LE=y
 CONFIG_BT_6LOWPAN=m
 # CONFIG_BT_LEDS is not set
 # CONFIG_BT_MSFTEXT is not set
+# CONFIG_BT_AOSPEXT is not set
 CONFIG_BT_DEBUGFS=y
 # CONFIG_BT_SELFTEST is not set
 
@@ -1858,11 +1864,13 @@ CONFIG_BT_ATH3K=m
 # CONFIG_BT_MTKSDIO is not set
 # CONFIG_BT_MTKUART is not set
 CONFIG_BT_HCIRSI=m
+# CONFIG_BT_VIRTIO is not set
 # end of Bluetooth device drivers
 
 # CONFIG_AF_RXRPC is not set
 # CONFIG_AF_KCM is not set
 CONFIG_STREAM_PARSER=y
+# CONFIG_MCTP is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
@@ -1898,7 +1906,6 @@ CONFIG_MAC80211_DEBUGFS=y
 # CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
-# CONFIG_WIMAX is not set
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 CONFIG_RFKILL_INPUT=y
@@ -1924,6 +1931,7 @@ CONFIG_NFC_SHDLC=y
 # CONFIG_NFC_TRF7970A is not set
 CONFIG_NFC_SIM=m
 CONFIG_NFC_PORT100=m
+# CONFIG_NFC_VIRTUAL_NCI is not set
 # CONFIG_NFC_FDP is not set
 CONFIG_NFC_PN544=m
 CONFIG_NFC_PN544_I2C=m
@@ -1941,6 +1949,7 @@ CONFIG_NFC_ST21NFCA_I2C=m
 # CONFIG_NFC_ST_NCI_SPI is not set
 # CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_S3FWRN5_I2C is not set
+# CONFIG_NFC_S3FWRN82_UART is not set
 # CONFIG_NFC_ST95HF is not set
 # end of Near Field Communication (NFC) devices
 
@@ -1950,12 +1959,12 @@ CONFIG_LWTUNNEL=y
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
+CONFIG_NET_SELFTESTS=y
 CONFIG_NET_SOCK_MSG=y
 CONFIG_NET_DEVLINK=y
 CONFIG_PAGE_POOL=y
 CONFIG_FAILOVER=m
 CONFIG_ETHTOOL_NETLINK=y
-CONFIG_HAVE_EBPF_JIT=y
 
 #
 # Device Drivers
@@ -1976,7 +1985,6 @@ CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 # 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
@@ -2015,6 +2023,7 @@ CONFIG_PCI_XGENE_MSI=y
 # CONFIG_PCI_HOST_THUNDER_ECAM is not set
 CONFIG_PCIE_ROCKCHIP=y
 CONFIG_PCIE_ROCKCHIP_HOST=y
+# CONFIG_PCIE_MICROCHIP_HOST is not set
 
 #
 # DesignWare PCI Core Support
@@ -2024,6 +2033,7 @@ CONFIG_PCIE_DW_HOST=y
 CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_PCI_HISI=y
+# CONFIG_PCIE_ROCKCHIP_DW_HOST is not set
 # CONFIG_PCIE_KIRIN is not set
 # CONFIG_PCI_MESON is not set
 # CONFIG_PCIE_AL is not set
@@ -2032,7 +2042,6 @@ CONFIG_PCI_HISI=y
 #
 # Mobiveil PCIe Core Support
 #
-# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set
 # end of Mobiveil PCIe Core Support
 
 #
@@ -2055,12 +2064,14 @@ CONFIG_PCI_HISI=y
 # CONFIG_PCI_SW_SWITCHTEC is not set
 # end of PCI switch controller drivers
 
+# CONFIG_CXL_BUS is not set
 # CONFIG_PCCARD is not set
 # CONFIG_RAPIDIO is not set
 
 #
 # Generic Driver Options
 #
+CONFIG_AUXILIARY_BUS=y
 # CONFIG_UEVENT_HELPER is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
@@ -2088,9 +2099,8 @@ CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_GENERIC_CPU_VULNERABILITIES=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_SPI=y
-CONFIG_REGMAP_SPMI=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
@@ -2105,13 +2115,68 @@ CONFIG_ARM_CCI=y
 CONFIG_ARM_CCI400_COMMON=y
 # CONFIG_BRCMSTB_GISB_ARB is not set
 # CONFIG_MOXTET is not set
-CONFIG_SIMPLE_PM_BUS=y
 CONFIG_VEXPRESS_CONFIG=y
 # CONFIG_MHI_BUS is not set
 # end of Bus devices
 
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
+
+#
+# Firmware Drivers
+#
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
+
+CONFIG_ARM_SCPI_PROTOCOL=y
+CONFIG_ARM_SCPI_POWER_DOMAIN=y
+# CONFIG_ARM_SDE_INTERFACE is not set
+# CONFIG_FIRMWARE_MEMMAP is not set
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+# CONFIG_ISCSI_IBFT is not set
+# CONFIG_FW_CFG_SYSFS is not set
+CONFIG_SYSFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
+# CONFIG_ARM_FFA_TRANSPORT is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_PARAMS_FROM_FDT=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_GENERIC_STUB=y
+# CONFIG_EFI_ARMSTUB_DTB_LOADER is not set
+CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=y
+CONFIG_EFI_BOOTLOADER_CONTROL=y
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+# CONFIG_RESET_ATTACK_MITIGATION is not set
+# CONFIG_EFI_DISABLE_PCI_DMA is not set
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_EFI_EARLYCON=y
+CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y
+CONFIG_ARM_PSCI_FW=y
+# CONFIG_ARM_PSCI_CHECKER is not set
+CONFIG_HAVE_ARM_SMCCC=y
+CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
+CONFIG_ARM_SMCCC_SOC_ID=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
 # CONFIG_GNSS is not set
 CONFIG_MTD=y
 # CONFIG_MTD_TESTS is not set
@@ -2132,6 +2197,10 @@ CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 # CONFIG_MTD_BLOCK_RO is not set
+
+#
+# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK.
+#
 # CONFIG_FTL is not set
 # CONFIG_NFTL is not set
 # CONFIG_INFTL is not set
@@ -2182,6 +2251,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_DATAFLASH is not set
 # CONFIG_MTD_MCHP23K256 is not set
+# CONFIG_MTD_MCHP48L640 is not set
 # CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
@@ -2199,10 +2269,7 @@ CONFIG_MTD_PHYSMAP_OF=y
 #
 CONFIG_MTD_NAND_CORE=y
 # CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_NAND_ECC_SW_HAMMING=y
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
 CONFIG_MTD_RAW_NAND=y
-# CONFIG_MTD_NAND_ECC_SW_BCH is not set
 
 #
 # Raw/parallel NAND flash controllers
@@ -2216,6 +2283,8 @@ CONFIG_MTD_RAW_NAND=y
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_NAND_CADENCE is not set
 # CONFIG_MTD_NAND_ARASAN is not set
+# CONFIG_MTD_NAND_INTEL_LGM is not set
+# CONFIG_MTD_NAND_ROCKCHIP is not set
 
 #
 # Misc
@@ -2229,6 +2298,9 @@ CONFIG_MTD_RAW_NAND=y
 # ECC engine support
 #
 CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
 # end of ECC engine support
 # end of NAND
 
@@ -2240,6 +2312,9 @@ CONFIG_MTD_NAND_ECC=y
 
 CONFIG_MTD_SPI_NOR=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set
+CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y
+# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_LIMIT=20
@@ -2256,7 +2331,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 # CONFIG_OF_OVERLAY is not set
 # CONFIG_PARPORT is not set
@@ -2272,16 +2346,21 @@ CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_CDROM=y
 # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set
 CONFIG_ZRAM=m
+CONFIG_ZRAM_DEF_COMP_LZORLE=y
+# CONFIG_ZRAM_DEF_COMP_ZSTD is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4 is not set
+# CONFIG_ZRAM_DEF_COMP_LZO is not set
+# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set
+# CONFIG_ZRAM_DEF_COMP_842 is not set
+CONFIG_ZRAM_DEF_COMP="lzo-rle"
 # CONFIG_ZRAM_WRITEBACK is not set
 # CONFIG_ZRAM_MEMORY_TRACKING is not set
-CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
 CONFIG_BLK_DEV_DRBD=m
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SKD=m
 CONFIG_BLK_DEV_SX8=m
 CONFIG_BLK_DEV_RAM=m
 CONFIG_BLK_DEV_RAM_COUNT=16
@@ -2317,6 +2396,7 @@ CONFIG_TIFM_CORE=y
 CONFIG_TIFM_7XX1=m
 # CONFIG_ICS932S401 is not set
 CONFIG_ENCLOSURE_SERVICES=m
+# CONFIG_HI6421V600_IRQ is not set
 # CONFIG_HP_ILO is not set
 CONFIG_APDS9802ALS=m
 CONFIG_ISL29003=m
@@ -2328,9 +2408,9 @@ CONFIG_SENSORS_APDS990X=m
 # CONFIG_DS1682 is not set
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 CONFIG_SRAM=y
+# CONFIG_DW_XDATA_PCIE is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 # CONFIG_XILINX_SDFEC is not set
-# CONFIG_PVPANIC is not set
 # CONFIG_HISI_HIKEY_USB is not set
 # CONFIG_C2PORT is not set
 
@@ -2358,18 +2438,16 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 # end of Texas Instruments shared transport line discipline
 
 CONFIG_SENSORS_LIS3_I2C=m
-
-#
-# Altera FPGA firmware download module (requires I2C)
-#
 CONFIG_ALTERA_STAPL=m
 # CONFIG_GENWQE is not set
 CONFIG_ECHO=m
+# CONFIG_BCM_VK is not set
 # CONFIG_MISC_ALCOR_PCI is not set
 # CONFIG_MISC_RTSX_PCI is not set
 # CONFIG_MISC_RTSX_USB is not set
 # CONFIG_HABANA_AI is not set
 # CONFIG_UACCE is not set
+# CONFIG_PVPANIC is not set
 # end of Misc devices
 
 #
@@ -2377,6 +2455,7 @@ CONFIG_ECHO=m
 #
 CONFIG_SCSI_MOD=y
 CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_COMMON=y
 CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 CONFIG_SCSI_NETLINK=y
@@ -2389,6 +2468,7 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 CONFIG_BLK_DEV_SR=y
 CONFIG_CHR_DEV_SG=y
+CONFIG_BLK_DEV_BSG=y
 CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_CONSTANTS=y
@@ -2440,6 +2520,7 @@ CONFIG_MEGARAID_LEGACY=m
 CONFIG_MEGARAID_SAS=m
 # CONFIG_SCSI_MPT3SAS is not set
 # CONFIG_SCSI_MPT2SAS is not set
+# CONFIG_SCSI_MPI3MR is not set
 # CONFIG_SCSI_SMARTPQI is not set
 CONFIG_SCSI_UFSHCD=y
 CONFIG_SCSI_UFSHCD_PCI=m
@@ -2448,6 +2529,7 @@ CONFIG_SCSI_UFSHCD_PLATFORM=y
 # CONFIG_SCSI_UFS_CDNS_PLATFORM is not set
 # CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
 # CONFIG_SCSI_UFS_BSG is not set
+# CONFIG_SCSI_UFS_HPB is not set
 CONFIG_SCSI_HPTIOP=m
 # CONFIG_SCSI_MYRB is not set
 # CONFIG_SCSI_MYRS is not set
@@ -2458,7 +2540,6 @@ CONFIG_SCSI_SNIC=m
 # CONFIG_SCSI_SNIC_DEBUG_FS is not set
 CONFIG_SCSI_DMX3191D=m
 # CONFIG_SCSI_FDOMAIN_PCI is not set
-# CONFIG_SCSI_GDTH is not set
 # CONFIG_SCSI_IPS is not set
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
@@ -2477,6 +2558,7 @@ CONFIG_TCM_QLA2XXX=m
 # CONFIG_TCM_QLA2XXX_DEBUG is not set
 CONFIG_SCSI_QLA_ISCSI=m
 # CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_EFCT is not set
 CONFIG_SCSI_DC395x=m
 CONFIG_SCSI_AM53C974=m
 CONFIG_SCSI_WD719X=m
@@ -2635,6 +2717,7 @@ CONFIG_DM_MULTIPATH=m
 CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 # CONFIG_DM_MULTIPATH_HST is not set
+# CONFIG_DM_MULTIPATH_IOA is not set
 CONFIG_DM_DELAY=m
 CONFIG_DM_DUST=m
 CONFIG_DM_INIT=y
@@ -2722,11 +2805,12 @@ CONFIG_NET_DSA_MV88E6060=m
 # CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set
 # CONFIG_NET_DSA_MICROCHIP_KSZ8795 is not set
 CONFIG_NET_DSA_MV88E6XXX=m
-CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_MV88E6XXX_PTP=y
 # CONFIG_NET_DSA_MSCC_SEVILLE is not set
 # CONFIG_NET_DSA_AR9331 is not set
 # CONFIG_NET_DSA_SJA1105 is not set
+# CONFIG_NET_DSA_XRS700X_I2C is not set
+# CONFIG_NET_DSA_XRS700X_MDIO is not set
 CONFIG_NET_DSA_QCA8K=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
@@ -2764,7 +2848,6 @@ CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
-# CONFIG_NET_VENDOR_AURORA is not set
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -2831,7 +2914,10 @@ CONFIG_I40EVF=m
 # CONFIG_ICE is not set
 CONFIG_FM10K=m
 # CONFIG_IGC is not set
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
+CONFIG_NET_VENDOR_LITEX=y
+# CONFIG_LITEX_LITEETH is not set
 CONFIG_NET_VENDOR_MARVELL=y
 CONFIG_MVMDIO=m
 CONFIG_SKGE=m
@@ -2851,6 +2937,7 @@ CONFIG_MLX4_CORE_GEN2=y
 # CONFIG_MLX5_CORE is not set
 # CONFIG_MLXSW_CORE is not set
 # CONFIG_MLXFW is not set
+# CONFIG_MLXBF_GIGE is not set
 CONFIG_NET_VENDOR_MICREL=y
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851 is not set
@@ -2925,6 +3012,7 @@ CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_ROCKCHIP=m
 # CONFIG_DWMAC_INTEL_PLAT is not set
+# CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_STMMAC_PCI is not set
 # CONFIG_NET_VENDOR_SUN is not set
 CONFIG_NET_VENDOR_SYNOPSYS=y
@@ -2940,6 +3028,7 @@ CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_VELOCITY=m
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_NET_VENDOR_XILINX=y
+# CONFIG_XILINX_EMACLITE is not set
 # CONFIG_XILINX_AXI_EMAC is not set
 # CONFIG_XILINX_LL_TEMAC is not set
 # CONFIG_FDDI is not set
@@ -2958,7 +3047,7 @@ CONFIG_SFP=m
 CONFIG_AMD_PHY=m
 # CONFIG_ADIN_PHY is not set
 # CONFIG_AQUANTIA_PHY is not set
-# CONFIG_AX88796B_PHY is not set
+CONFIG_AX88796B_PHY=m
 CONFIG_BROADCOM_PHY=m
 # CONFIG_BCM54140_PHY is not set
 CONFIG_BCM7XXX_PHY=m
@@ -2974,11 +3063,16 @@ CONFIG_LXT_PHY=m
 CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_MARVELL_10G_PHY=m
+# CONFIG_MARVELL_88X2222_PHY is not set
+# CONFIG_MAXLINEAR_GPHY is not set
+# CONFIG_MEDIATEK_GE_PHY is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
 # CONFIG_MICROCHIP_T1_PHY is not set
 # CONFIG_MICROSEMI_PHY is not set
+# CONFIG_MOTORCOMM_PHY is not set
 CONFIG_NATIONAL_PHY=m
+# CONFIG_NXP_C45_TJA11XX_PHY is not set
 # CONFIG_NXP_TJA11XX_PHY is not set
 CONFIG_AT803X_PHY=m
 CONFIG_QSEMI_PHY=m
@@ -2998,7 +3092,9 @@ CONFIG_VITESSE_PHY=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_BUS=y
+CONFIG_FWNODE_MDIO=y
 CONFIG_OF_MDIO=y
+CONFIG_ACPI_MDIO=y
 CONFIG_MDIO_DEVRES=y
 CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BCM_UNIMAC=m
@@ -3087,8 +3183,8 @@ CONFIG_USB_SIERRA_NET=m
 CONFIG_USB_VL600=m
 CONFIG_USB_NET_CH9200=m
 # CONFIG_USB_NET_AQC111 is not set
+# CONFIG_USB_RTL8153_ECM is not set
 CONFIG_WLAN=y
-# CONFIG_WIRELESS_WDS is not set
 CONFIG_WLAN_VENDOR_ADMTEK=y
 CONFIG_ADM8211=m
 CONFIG_ATH_COMMON=m
@@ -3248,7 +3344,6 @@ CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
 # CONFIG_P54_SPI is not set
 CONFIG_P54_LEDS=y
-CONFIG_PRISM54=m
 CONFIG_WLAN_VENDOR_MARVELL=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
@@ -3275,6 +3370,7 @@ CONFIG_MT7601U=m
 # CONFIG_MT7663U is not set
 # CONFIG_MT7663S is not set
 # CONFIG_MT7915E is not set
+# CONFIG_MT7921E is not set
 CONFIG_WLAN_VENDOR_MICROCHIP=y
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
@@ -3362,10 +3458,6 @@ CONFIG_QTNFMAC_PCIE=m
 CONFIG_MAC80211_HWSIM=m
 CONFIG_USB_NET_RNDIS_WLAN=m
 # CONFIG_VIRT_WIFI is not set
-
-#
-# Enable WiMAX (Networking options) to see the WiMAX drivers
-#
 # CONFIG_WAN is not set
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKELB=m
@@ -3377,12 +3469,18 @@ CONFIG_IEEE802154_ATUSB=m
 # CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_IEEE802154_MCR20A is not set
 # CONFIG_IEEE802154_HWSIM is not set
+
+#
+# Wireless WAN
+#
+# CONFIG_WWAN is not set
+# end of Wireless WAN
+
 # CONFIG_VMXNET3 is not set
 # CONFIG_FUJITSU_ES is not set
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -3390,7 +3488,6 @@ CONFIG_NET_FAILOVER=m
 CONFIG_INPUT=y
 CONFIG_INPUT_LEDS=y
 CONFIG_INPUT_FF_MEMLESS=m
-# CONFIG_INPUT_POLLDEV is not set
 CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_MATRIXKMAP=y
 
@@ -3445,12 +3542,15 @@ CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_BYD=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
 CONFIG_MOUSE_PS2_CYPRESS=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
 CONFIG_MOUSE_PS2_SENTELIC=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
@@ -3492,25 +3592,23 @@ CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
 # CONFIG_JOYSTICK_PSXPAD_SPI is not set
 # CONFIG_JOYSTICK_PXRC is not set
+# CONFIG_JOYSTICK_QWIIC is not set
 # CONFIG_JOYSTICK_FSIA6B is not set
 CONFIG_INPUT_TABLET=y
 CONFIG_TABLET_USB_ACECAD=m
 CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
 CONFIG_TABLET_USB_HANWANG=m
 CONFIG_TABLET_USB_KBTAB=m
 CONFIG_TABLET_USB_PEGASUS=m
 CONFIG_TABLET_SERIAL_WACOM4=m
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_PROPERTIES=y
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_ADC is not set
 # CONFIG_TOUCHSCREEN_AR1021_I2C is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
-# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
-CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_BU21013 is not set
 # CONFIG_TOUCHSCREEN_BU21029 is not set
 # CONFIG_TOUCHSCREEN_CHIPONE_ICN8318 is not set
@@ -3519,38 +3617,40 @@ CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
 # CONFIG_TOUCHSCREEN_CYTTSP_CORE is not set
 # CONFIG_TOUCHSCREEN_CYTTSP4_CORE is not set
-CONFIG_TOUCHSCREEN_DYNAPRO=m
+# CONFIG_TOUCHSCREEN_DYNAPRO is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
+# CONFIG_TOUCHSCREEN_EETI is not set
+# CONFIG_TOUCHSCREEN_EGALAX is not set
 # CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
 # CONFIG_TOUCHSCREEN_EXC3000 is not set
-CONFIG_TOUCHSCREEN_FUJITSU=m
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
 # CONFIG_TOUCHSCREEN_GOODIX is not set
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
-CONFIG_TOUCHSCREEN_ILI210X=m
+# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set
+# CONFIG_TOUCHSCREEN_ILI210X is not set
+# CONFIG_TOUCHSCREEN_ILITEK is not set
 # CONFIG_TOUCHSCREEN_S6SY761 is not set
-CONFIG_TOUCHSCREEN_GUNZE=m
+# CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_EKTF2127 is not set
-CONFIG_TOUCHSCREEN_ELAN=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_WACOM_I2C=m
+# CONFIG_TOUCHSCREEN_ELAN is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_WACOM_I2C is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MMS114=m
+# CONFIG_TOUCHSCREEN_MCS5000 is not set
+# CONFIG_TOUCHSCREEN_MMS114 is not set
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
-CONFIG_TOUCHSCREEN_MTOUCH=m
+# CONFIG_TOUCHSCREEN_MSG2638 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_EDT_FT5X06=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_PIXCIR=m
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_EDT_FT5X06 is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_PIXCIR is not set
 # CONFIG_TOUCHSCREEN_WDT87XX_I2C is not set
-# CONFIG_TOUCHSCREEN_WM97XX is not set
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
 CONFIG_TOUCHSCREEN_USB_EGALAX=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -3570,24 +3670,22 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
 # CONFIG_TOUCHSCREEN_TSC2004 is not set
 # CONFIG_TOUCHSCREEN_TSC2005 is not set
-CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
 # CONFIG_TOUCHSCREEN_RM_TS is not set
 # CONFIG_TOUCHSCREEN_SILEAD is not set
 # CONFIG_TOUCHSCREEN_SIS_I2C is not set
-CONFIG_TOUCHSCREEN_ST1232=m
+# CONFIG_TOUCHSCREEN_ST1232 is not set
 # CONFIG_TOUCHSCREEN_STMFTS is not set
 # CONFIG_TOUCHSCREEN_SUR40 is not set
 # CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
 # CONFIG_TOUCHSCREEN_SX8654 is not set
 # CONFIG_TOUCHSCREEN_TPS6507X is not set
 # CONFIG_TOUCHSCREEN_ZET6223 is not set
-CONFIG_TOUCHSCREEN_ZFORCE=m
-# CONFIG_TOUCHSCREEN_COLIBRI_VF50 is not set
+# CONFIG_TOUCHSCREEN_ZFORCE is not set
 # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set
 # CONFIG_TOUCHSCREEN_IQS5XX is not set
 # CONFIG_TOUCHSCREEN_ZINITIX is not set
@@ -3614,9 +3712,11 @@ CONFIG_INPUT_PWM_BEEPER=m
 # CONFIG_INPUT_PWM_VIBRA is not set
 CONFIG_INPUT_RK805_PWRKEY=m
 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+# CONFIG_INPUT_DA7280_HAPTICS is not set
 # CONFIG_INPUT_ADXL34X is not set
 # CONFIG_INPUT_IMS_PCU is not set
 # CONFIG_INPUT_IQS269A is not set
+# CONFIG_INPUT_IQS626A is not set
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
 # CONFIG_INPUT_SOC_BUTTON_ARRAY is not set
@@ -3716,9 +3816,9 @@ CONFIG_SERIAL_JSM=m
 # CONFIG_SERIAL_SIFIVE is not set
 # CONFIG_SERIAL_SCCNXP is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
+# CONFIG_SERIAL_BCM63XX is not set
 # CONFIG_SERIAL_ALTERA_JTAGUART is not set
 # CONFIG_SERIAL_ALTERA_UART is not set
-# CONFIG_SERIAL_IFX6X60 is not set
 # CONFIG_SERIAL_XILINX_PS_UART is not set
 CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
@@ -3732,19 +3832,13 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
 # CONFIG_MOXA_INTELLIO is not set
 # CONFIG_MOXA_SMARTIO is not set
-CONFIG_SYNCLINKMP=m
 CONFIG_SYNCLINK_GT=m
-# CONFIG_ISI is not set
 CONFIG_N_HDLC=m
 CONFIG_N_GSM=m
 CONFIG_NOZOMI=m
 # CONFIG_NULL_TTY is not set
-# CONFIG_TRACE_SINK is not set
 CONFIG_HVC_DRIVER=y
 # CONFIG_HVC_DCC is not set
 CONFIG_SERIAL_DEV_BUS=y
@@ -3765,19 +3859,18 @@ CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 # CONFIG_HW_RANDOM_BA431 is not set
 CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_HW_RANDOM_HISI_V2=y
 CONFIG_HW_RANDOM_CAVIUM=y
 # CONFIG_HW_RANDOM_CCTRNG is not set
 # CONFIG_HW_RANDOM_XIPHERA is not set
+CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
 # CONFIG_APPLICOM is not set
 CONFIG_DEVMEM=y
-CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=8192
 CONFIG_DEVPORT=y
 CONFIG_TCG_TPM=y
 CONFIG_HW_RANDOM_TPM=y
 # CONFIG_TCG_TIS is not set
 # CONFIG_TCG_TIS_SPI is not set
+# CONFIG_TCG_TIS_I2C_CR50 is not set
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
 CONFIG_TCG_TIS_I2C_INFINEON=m
 # CONFIG_TCG_TIS_I2C_NUVOTON is not set
@@ -3788,15 +3881,16 @@ CONFIG_TCG_ATMEL=m
 # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
 # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
 # CONFIG_XILLYBUS is not set
-# end of Character devices
-
+# CONFIG_XILLYUSB is not set
 # CONFIG_RANDOM_TRUST_CPU is not set
 # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+# end of Character devices
 
 #
 # I2C support
 #
-CONFIG_I2C=m
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
 CONFIG_I2C_CHARDEV=m
@@ -3863,6 +3957,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO=m
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+# CONFIG_I2C_HISI is not set
 # CONFIG_I2C_NOMADIK is not set
 # CONFIG_I2C_OCORES is not set
 CONFIG_I2C_PCA_PLATFORM=m
@@ -3875,6 +3970,7 @@ CONFIG_I2C_SIMTEC=m
 # External I2C/SMBus adapter drivers
 #
 CONFIG_I2C_DIOLAN_U2C=m
+# CONFIG_I2C_CP2615 is not set
 # CONFIG_I2C_ROBOTFUZZ_OSIF is not set
 # CONFIG_I2C_TAOS_EVM is not set
 CONFIG_I2C_TINY_USB=m
@@ -3884,6 +3980,7 @@ CONFIG_I2C_VIPERBOARD=m
 # Other I2C/SMBus bus drivers
 #
 CONFIG_I2C_CROS_EC_TUNNEL=m
+# CONFIG_I2C_VIRTIO is not set
 # end of I2C Hardware Bus support
 
 CONFIG_I2C_STUB=m
@@ -3910,6 +4007,7 @@ CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_HISI_KUNPENG is not set
 # CONFIG_SPI_HISI_SFC_V3XX is not set
 CONFIG_SPI_NXP_FLEXSPI=y
 CONFIG_SPI_GPIO=y
@@ -3918,6 +4016,7 @@ CONFIG_SPI_GPIO=y
 CONFIG_SPI_PL022=y
 # CONFIG_SPI_PXA2XX is not set
 CONFIG_SPI_ROCKCHIP=y
+# CONFIG_SPI_ROCKCHIP_SFC is not set
 # CONFIG_SPI_SC18IS602 is not set
 # CONFIG_SPI_SIFIVE is not set
 # CONFIG_SPI_MXIC is not set
@@ -3941,6 +4040,7 @@ CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_SLAVE is not set
 CONFIG_SPI_DYNAMIC=y
 CONFIG_SPMI=y
+# CONFIG_SPMI_HISI3670 is not set
 # CONFIG_HSI is not set
 CONFIG_PPS=m
 # CONFIG_PPS_DEBUG is not set
@@ -3960,10 +4060,13 @@ CONFIG_PPS_CLIENT_GPIO=m
 # PTP clock support
 #
 CONFIG_PTP_1588_CLOCK=m
+CONFIG_PTP_1588_CLOCK_OPTIONAL=m
 CONFIG_DP83640_PHY=m
 # CONFIG_PTP_1588_CLOCK_INES is not set
+CONFIG_PTP_1588_CLOCK_KVM=m
 # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
 # CONFIG_PTP_1588_CLOCK_IDTCM is not set
+# CONFIG_PTP_1588_CLOCK_OCP is not set
 # end of PTP clock support
 
 CONFIG_PINCTRL=y
@@ -3978,9 +4081,11 @@ CONFIG_PINCTRL_AMD=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 CONFIG_PINCTRL_ROCKCHIP=y
 CONFIG_PINCTRL_SINGLE=y
+# CONFIG_PINCTRL_SX150X is not set
 # CONFIG_PINCTRL_STMFX is not set
 CONFIG_PINCTRL_RK805=m
 # CONFIG_PINCTRL_OCELOT is not set
+# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
 
 #
 # Renesas pinctrl drivers
@@ -4010,10 +4115,12 @@ CONFIG_GPIO_DWAPB=y
 # CONFIG_GPIO_FTGPIO010 is not set
 CONFIG_GPIO_GENERIC_PLATFORM=y
 # CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_HISI is not set
 # CONFIG_GPIO_HLWD is not set
 # CONFIG_GPIO_LOGICVC is not set
 # CONFIG_GPIO_MB86S7X is not set
 CONFIG_GPIO_PL061=y
+CONFIG_GPIO_ROCKCHIP=y
 # CONFIG_GPIO_SAMA5D2_PIOBU is not set
 # CONFIG_GPIO_SIFIVE is not set
 CONFIG_GPIO_SYSCON=y
@@ -4067,8 +4174,14 @@ CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_VIPERBOARD=m
 # end of USB GPIO expanders
 
+#
+# Virtual GPIO drivers
+#
 # CONFIG_GPIO_AGGREGATOR is not set
 # CONFIG_GPIO_MOCKUP is not set
+# CONFIG_GPIO_VIRTIO is not set
+# end of Virtual GPIO drivers
+
 CONFIG_W1=m
 CONFIG_W1_CON=y
 
@@ -4112,6 +4225,7 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 # CONFIG_POWER_RESET_LTC2952 is not set
+# CONFIG_POWER_RESET_REGULATOR is not set
 CONFIG_POWER_RESET_RESTART=y
 CONFIG_POWER_RESET_VEXPRESS=y
 CONFIG_POWER_RESET_XGENE=y
@@ -4136,10 +4250,7 @@ CONFIG_BATTERY_SBS=m
 CONFIG_CHARGER_SBS=m
 CONFIG_MANAGER_SBS=m
 # CONFIG_BATTERY_BQ27XXX is not set
-CONFIG_CHARGER_AXP20X=m
-# CONFIG_BATTERY_AXP20X is not set
 # CONFIG_AXP20X_POWER is not set
-# CONFIG_AXP288_FUEL_GAUGE is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -4149,6 +4260,7 @@ CONFIG_CHARGER_AXP20X=m
 CONFIG_CHARGER_GPIO=y
 # CONFIG_CHARGER_MANAGER is not set
 # CONFIG_CHARGER_LT3651 is not set
+# CONFIG_CHARGER_LTC4162L is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
@@ -4157,10 +4269,14 @@ CONFIG_CHARGER_GPIO=y
 # CONFIG_CHARGER_BQ2515X is not set
 # CONFIG_CHARGER_BQ25890 is not set
 # CONFIG_CHARGER_BQ25980 is not set
+# CONFIG_CHARGER_BQ256XX is not set
 CONFIG_CHARGER_SMB347=m
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
+# CONFIG_BATTERY_GOLDFISH is not set
+# CONFIG_BATTERY_RT5033 is not set
 # CONFIG_CHARGER_RT9455 is not set
 CONFIG_CHARGER_CROS_USBPD=m
+# CONFIG_CHARGER_CROS_PCHG is not set
 # CONFIG_CHARGER_UCS1002 is not set
 # CONFIG_CHARGER_BD99954 is not set
 CONFIG_HWMON=y
@@ -4187,6 +4303,8 @@ CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ADT7462=m
 CONFIG_SENSORS_ADT7470=m
 CONFIG_SENSORS_ADT7475=m
+# CONFIG_SENSORS_AHT10 is not set
+# CONFIG_SENSORS_AQUACOMPUTER_D5NEXT is not set
 # CONFIG_SENSORS_AS370 is not set
 CONFIG_SENSORS_ASC7621=m
 # CONFIG_SENSORS_AXI_FAN_CONTROL is not set
@@ -4194,6 +4312,7 @@ CONFIG_SENSORS_ARM_SCPI=y
 # CONFIG_SENSORS_ASPEED is not set
 CONFIG_SENSORS_ATXP1=m
 # CONFIG_SENSORS_CORSAIR_CPRO is not set
+# CONFIG_SENSORS_CORSAIR_PSU is not set
 # CONFIG_SENSORS_DRIVETEMP is not set
 CONFIG_SENSORS_DS620=m
 CONFIG_SENSORS_DS1621=m
@@ -4219,6 +4338,7 @@ CONFIG_SENSORS_LTC2945=m
 # CONFIG_SENSORS_LTC2947_I2C is not set
 # CONFIG_SENSORS_LTC2947_SPI is not set
 # CONFIG_SENSORS_LTC2990 is not set
+# CONFIG_SENSORS_LTC2992 is not set
 CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4222=m
@@ -4226,6 +4346,7 @@ CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4260=m
 CONFIG_SENSORS_LTC4261=m
 # CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX127 is not set
 CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
 CONFIG_SENSORS_MAX1668=m
@@ -4240,6 +4361,7 @@ CONFIG_SENSORS_MAX6697=m
 # CONFIG_SENSORS_MAX31790 is not set
 CONFIG_SENSORS_MCP3021=m
 # CONFIG_SENSORS_TC654 is not set
+# CONFIG_SENSORS_TPS23861 is not set
 # CONFIG_SENSORS_MR75203 is not set
 # CONFIG_SENSORS_ADCXX is not set
 CONFIG_SENSORS_LM63=m
@@ -4266,6 +4388,7 @@ CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NCT7802=m
 CONFIG_SENSORS_NCT7904=m
 # CONFIG_SENSORS_NPCM7XX is not set
+# CONFIG_SENSORS_NZXT_KRAKEN2 is not set
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 CONFIG_SENSORS_PCF8591=m
 CONFIG_PMBUS=m
@@ -4273,9 +4396,13 @@ CONFIG_SENSORS_PMBUS=m
 # CONFIG_SENSORS_ADM1266 is not set
 CONFIG_SENSORS_ADM1275=m
 # CONFIG_SENSORS_BEL_PFE is not set
+# CONFIG_SENSORS_BPA_RS600 is not set
+# CONFIG_SENSORS_FSP_3Y is not set
 # CONFIG_SENSORS_IBM_CFFPS is not set
+# CONFIG_SENSORS_DPS920AB is not set
 # CONFIG_SENSORS_INSPUR_IPSPS is not set
 # CONFIG_SENSORS_IR35221 is not set
+# CONFIG_SENSORS_IR36021 is not set
 # CONFIG_SENSORS_IR38064 is not set
 # CONFIG_SENSORS_IRPS5401 is not set
 # CONFIG_SENSORS_ISL68137 is not set
@@ -4283,6 +4410,7 @@ CONFIG_SENSORS_LM25066=m
 CONFIG_SENSORS_LTC2978=m
 # CONFIG_SENSORS_LTC2978_REGULATOR is not set
 # CONFIG_SENSORS_LTC3815 is not set
+# CONFIG_SENSORS_MAX15301 is not set
 CONFIG_SENSORS_MAX16064=m
 # CONFIG_SENSORS_MAX16601 is not set
 # CONFIG_SENSORS_MAX20730 is not set
@@ -4290,8 +4418,13 @@ CONFIG_SENSORS_MAX16064=m
 # CONFIG_SENSORS_MAX31785 is not set
 CONFIG_SENSORS_MAX34440=m
 CONFIG_SENSORS_MAX8688=m
+# CONFIG_SENSORS_MP2888 is not set
 # CONFIG_SENSORS_MP2975 is not set
+# CONFIG_SENSORS_PIM4328 is not set
+# CONFIG_SENSORS_PM6764TR is not set
 # CONFIG_SENSORS_PXE1610 is not set
+# CONFIG_SENSORS_Q54SJ108A2 is not set
+# CONFIG_SENSORS_STPDDC60 is not set
 CONFIG_SENSORS_TPS40422=m
 # CONFIG_SENSORS_TPS53679 is not set
 CONFIG_SENSORS_UCD9000=m
@@ -4299,9 +4432,12 @@ CONFIG_SENSORS_UCD9200=m
 # CONFIG_SENSORS_XDPE122 is not set
 CONFIG_SENSORS_ZL6100=m
 CONFIG_SENSORS_PWM_FAN=m
+# CONFIG_SENSORS_SBTSI is not set
+# CONFIG_SENSORS_SBRMI is not set
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
+# CONFIG_SENSORS_SHT4x is not set
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_SIS5595=m
 CONFIG_SENSORS_DME1737=m
@@ -4381,6 +4517,7 @@ CONFIG_WATCHDOG_CORE=y
 CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
 CONFIG_WATCHDOG_OPEN_TIMEOUT=0
 # CONFIG_WATCHDOG_SYSFS is not set
+# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set
 
 #
 # Watchdog Pretimeout Governors
@@ -4443,6 +4580,10 @@ CONFIG_BCMA_DRIVER_GPIO=y
 #
 CONFIG_MFD_CORE=y
 # CONFIG_MFD_ACT8945A is not set
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_MFD_AS3722 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
 # CONFIG_MFD_BCM590XX is not set
@@ -4451,7 +4592,10 @@ CONFIG_MFD_AXP20X=m
 CONFIG_MFD_AXP20X_I2C=m
 CONFIG_MFD_CROS_EC_DEV=y
 # CONFIG_MFD_MADERA is not set
+# CONFIG_PMIC_DA903X is not set
 # CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
@@ -4461,65 +4605,98 @@ CONFIG_MFD_CROS_EC_DEV=y
 # CONFIG_MFD_MC13XXX_I2C is not set
 # CONFIG_MFD_MP2629 is not set
 # CONFIG_MFD_HI6421_PMIC is not set
+# CONFIG_MFD_HI6421_SPMI is not set
 # CONFIG_HTC_PASIC3 is not set
+# CONFIG_HTC_I2CPLD is not set
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
+# CONFIG_MFD_INTEL_PMT is not set
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77620 is not set
 # CONFIG_MFD_MAX77650 is not set
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
 # CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_MT6360 is not set
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_MENF21BMC is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_MFD_CPCAP is not set
 CONFIG_MFD_VIPERBOARD=m
+# CONFIG_MFD_NTXEC is not set
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_PCF50633 is not set
-# CONFIG_UCB1400_CORE is not set
 # CONFIG_MFD_RDC321X is not set
+# CONFIG_MFD_RT4831 is not set
 # CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RC5T583 is not set
 CONFIG_MFD_RK808=m
 # CONFIG_MFD_RN5T618 is not set
+# CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 # CONFIG_MFD_SKY81452 is not set
-# CONFIG_ABX500_CORE is not set
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
+# CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_TI_LMU is not set
+# CONFIG_MFD_PALMAS is not set
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
 # CONFIG_TPS6507X is not set
 # CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
 # CONFIG_MFD_TPS65217 is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TI_LP87565 is not set
 # CONFIG_MFD_TPS65218 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
 # CONFIG_MFD_TPS65912_I2C is not set
 # CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
 CONFIG_MFD_WL1273_CORE=m
 # CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TQMX86 is not set
 CONFIG_MFD_VX855=m
+# CONFIG_MFD_LOCHNAGAR is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
+# CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_ROHM_BD70528 is not set
+# CONFIG_MFD_ROHM_BD71828 is not set
+# CONFIG_MFD_ROHM_BD957XMUF is not set
+# CONFIG_MFD_STPMIC1 is not set
 # CONFIG_MFD_STMFX is not set
+# CONFIG_MFD_ATC260X_I2C is not set
 # CONFIG_MFD_KHADAS_MCU is not set
+# CONFIG_MFD_QCOM_PM8008 is not set
 CONFIG_MFD_VEXPRESS_SYSREG=y
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_MFD_INTEL_M10_BMC is not set
+# CONFIG_MFD_RSMU_I2C is not set
+# CONFIG_MFD_RSMU_SPI is not set
 # end of Multifunction device drivers
 
 CONFIG_REGULATOR=y
@@ -4532,6 +4709,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_AD5398 is not set
 CONFIG_REGULATOR_AXP20X=m
 # CONFIG_REGULATOR_CROS_EC is not set
+# CONFIG_REGULATOR_DA9121 is not set
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
 CONFIG_REGULATOR_FAN53555=m
@@ -4548,6 +4726,7 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
+# CONFIG_REGULATOR_MAX8893 is not set
 # CONFIG_REGULATOR_MAX8952 is not set
 # CONFIG_REGULATOR_MAX8973 is not set
 # CONFIG_REGULATOR_MAX77826 is not set
@@ -4557,7 +4736,9 @@ CONFIG_REGULATOR_GPIO=y
 # CONFIG_REGULATOR_MP886X is not set
 # CONFIG_REGULATOR_MPQ7920 is not set
 # CONFIG_REGULATOR_MT6311 is not set
+# CONFIG_REGULATOR_MT6315 is not set
 # CONFIG_REGULATOR_PCA9450 is not set
+# CONFIG_REGULATOR_PF8X00 is not set
 CONFIG_REGULATOR_PFUZE100=m
 # CONFIG_REGULATOR_PV88060 is not set
 # CONFIG_REGULATOR_PV88080 is not set
@@ -4568,7 +4749,11 @@ CONFIG_REGULATOR_QCOM_SPMI=y
 # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set
 CONFIG_REGULATOR_RK808=m
 # CONFIG_REGULATOR_RT4801 is not set
+# CONFIG_REGULATOR_RT6160 is not set
+# CONFIG_REGULATOR_RT6245 is not set
+# CONFIG_REGULATOR_RTQ2134 is not set
 # CONFIG_REGULATOR_RTMV20 is not set
+# CONFIG_REGULATOR_RTQ6752 is not set
 # CONFIG_REGULATOR_SLG51000 is not set
 # CONFIG_REGULATOR_SY8106A is not set
 # CONFIG_REGULATOR_SY8824X is not set
@@ -4652,13 +4837,13 @@ CONFIG_MEDIA_TEST_SUPPORT=y
 #
 CONFIG_VIDEO_DEV=y
 CONFIG_MEDIA_CONTROLLER=y
-CONFIG_DVB_CORE=m
+CONFIG_DVB_CORE=y
 # end of Media core support
 
 #
 # Video4Linux options
 #
-CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2=y
 CONFIG_VIDEO_V4L2_I2C=y
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
@@ -4697,7 +4882,6 @@ CONFIG_DVB_DYNAMIC_MINORS=y
 #
 # Media drivers
 #
-CONFIG_TTPCI_EEPROM=m
 CONFIG_MEDIA_USB_SUPPORT=y
 
 #
@@ -4874,7 +5058,6 @@ CONFIG_VIDEO_TW68=m
 # Media capture/analog TV support
 #
 CONFIG_VIDEO_IVTV=m
-# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV_ALSA=m
 CONFIG_VIDEO_FB_IVTV=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
@@ -4910,14 +5093,10 @@ CONFIG_VIDEO_SAA7164=m
 #
 # Media digital TV PCI Adapters
 #
-CONFIG_DVB_AV7110_IR=y
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_BUDGET_CORE=m
 CONFIG_DVB_BUDGET=m
 CONFIG_DVB_BUDGET_CI=m
 CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
 CONFIG_DVB_B2C2_FLEXCOP_PCI=m
 # CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
 CONFIG_DVB_PLUTO2=m
@@ -4960,6 +5139,7 @@ CONFIG_MEDIA_COMMON_OPTIONS=y
 #
 CONFIG_VIDEO_CX2341X=m
 CONFIG_VIDEO_TVEEPROM=m
+CONFIG_TTPCI_EEPROM=m
 CONFIG_CYPRESS_FIRMWARE=m
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_V4L2=m
@@ -4979,6 +5159,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_CADENCE is not set
 # CONFIG_VIDEO_ASPEED is not set
 # CONFIG_VIDEO_MUX is not set
+# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
 # CONFIG_VIDEO_XILINX is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
@@ -5106,13 +5287,18 @@ CONFIG_VIDEO_M52790=m
 # Camera sensor devices
 #
 # CONFIG_VIDEO_HI556 is not set
+# CONFIG_VIDEO_IMX208 is not set
 # CONFIG_VIDEO_IMX214 is not set
 # CONFIG_VIDEO_IMX219 is not set
 # CONFIG_VIDEO_IMX258 is not set
 # CONFIG_VIDEO_IMX274 is not set
 # CONFIG_VIDEO_IMX290 is not set
 # CONFIG_VIDEO_IMX319 is not set
+# CONFIG_VIDEO_IMX334 is not set
+# CONFIG_VIDEO_IMX335 is not set
 # CONFIG_VIDEO_IMX355 is not set
+# CONFIG_VIDEO_IMX412 is not set
+# CONFIG_VIDEO_OV02A10 is not set
 # CONFIG_VIDEO_OV2640 is not set
 # CONFIG_VIDEO_OV2659 is not set
 # CONFIG_VIDEO_OV2680 is not set
@@ -5121,6 +5307,7 @@ CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_OV5640 is not set
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_OV5647 is not set
+# CONFIG_VIDEO_OV5648 is not set
 # CONFIG_VIDEO_OV6650 is not set
 # CONFIG_VIDEO_OV5670 is not set
 # CONFIG_VIDEO_OV5675 is not set
@@ -5131,8 +5318,11 @@ CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_OV7670 is not set
 # CONFIG_VIDEO_OV7740 is not set
 # CONFIG_VIDEO_OV8856 is not set
+# CONFIG_VIDEO_OV8865 is not set
+# CONFIG_VIDEO_OV9282 is not set
 # CONFIG_VIDEO_OV9640 is not set
 # CONFIG_VIDEO_OV9650 is not set
+# CONFIG_VIDEO_OV9734 is not set
 # CONFIG_VIDEO_OV13858 is not set
 # CONFIG_VIDEO_VS6624 is not set
 # CONFIG_VIDEO_MT9M001 is not set
@@ -5148,12 +5338,13 @@ CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_NOON010PC30 is not set
 # CONFIG_VIDEO_M5MOLS is not set
 # CONFIG_VIDEO_RDACM20 is not set
+# CONFIG_VIDEO_RDACM21 is not set
 # CONFIG_VIDEO_RJ54N1 is not set
 # CONFIG_VIDEO_S5K6AA is not set
 # CONFIG_VIDEO_S5K6A3 is not set
 # CONFIG_VIDEO_S5K4ECGX is not set
 # CONFIG_VIDEO_S5K5BAF is not set
-# CONFIG_VIDEO_SMIAPP is not set
+# CONFIG_VIDEO_CCS is not set
 # CONFIG_VIDEO_ET8EK8 is not set
 # CONFIG_VIDEO_S5C73M3 is not set
 # end of Camera sensor devices
@@ -5188,7 +5379,7 @@ CONFIG_VIDEO_M52790=m
 CONFIG_CXD2880_SPI_DRV=m
 # end of Media SPI Adapters
 
-CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER=y
 
 #
 # Customize TV tuners
@@ -5291,7 +5482,6 @@ CONFIG_DVB_TDA10071=m
 #
 # DVB-T (terrestrial) frontends
 #
-CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
@@ -5346,6 +5536,7 @@ CONFIG_DVB_AU8522=m
 CONFIG_DVB_AU8522_DTV=m
 CONFIG_DVB_AU8522_V4L=m
 CONFIG_DVB_S5H1411=m
+CONFIG_DVB_MXL692=m
 
 #
 # ISDB-T (terrestrial) frontends
@@ -5410,24 +5601,19 @@ CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_BUS=m
 # CONFIG_DRM_DP_AUX_CHARDEV is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_KMS_FB_HELPER=y
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 # CONFIG_DRM_DP_CEC is not set
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TTM_DMA_PAGE_POOL=y
-CONFIG_DRM_VRAM_HELPER=m
-CONFIG_DRM_TTM_HELPER=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_GEM_SHMEM_HELPER=y
-CONFIG_DRM_VM=y
 CONFIG_DRM_SCHED=m
 
 #
@@ -5455,39 +5641,44 @@ CONFIG_DRM_VGEM=m
 # CONFIG_DRM_VKMS is not set
 CONFIG_DRM_ROCKCHIP=m
 CONFIG_ROCKCHIP_ANALOGIX_DP=y
-# CONFIG_ROCKCHIP_CDN_DP is not set
+CONFIG_ROCKCHIP_CDN_DP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_DW_MIPI_DSI=y
 CONFIG_ROCKCHIP_INNO_HDMI=y
 CONFIG_ROCKCHIP_LVDS=y
 CONFIG_ROCKCHIP_RGB=y
 # CONFIG_ROCKCHIP_RK3066_HDMI is not set
+# CONFIG_DRM_VMWGFX is not set
 CONFIG_DRM_UDL=m
-CONFIG_DRM_AST=m
-CONFIG_DRM_MGAG200=m
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
-CONFIG_DRM_QXL=m
-CONFIG_DRM_BOCHS=m
-CONFIG_DRM_VIRTIO_GPU=m
+# CONFIG_DRM_QXL is not set
+# CONFIG_DRM_VIRTIO_GPU is not set
 CONFIG_DRM_PANEL=y
 
 #
 # Display Panels
 #
+# CONFIG_DRM_PANEL_ABT_Y030XX067A is not set
 # CONFIG_DRM_PANEL_ARM_VERSATILE is not set
 # CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596 is not set
 # CONFIG_DRM_PANEL_BOE_HIMAX8279D is not set
 # CONFIG_DRM_PANEL_BOE_TV101WUM_NL6 is not set
+# CONFIG_DRM_PANEL_DSI_CM is not set
 # CONFIG_DRM_PANEL_LVDS is not set
 CONFIG_DRM_PANEL_SIMPLE=m
 # CONFIG_DRM_PANEL_ELIDA_KD35T133 is not set
 # CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02 is not set
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
+# CONFIG_DRM_PANEL_INNOLUX_EJ030NA is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_KHADAS_TS050 is not set
 # CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set
 # CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829 is not set
@@ -5496,6 +5687,7 @@ CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT35510 is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_MANTIX_MLAF057WE51 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@@ -5506,12 +5698,15 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set
 # CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set
 # CONFIG_DRM_PANEL_RONBO_RB070D30 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_ATNA33XC20 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_DB7430 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
@@ -5521,11 +5716,13 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX424AKP is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
+# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
 # CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set
 # CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 # CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set
+# CONFIG_DRM_PANEL_WIDECHIPS_WS2401 is not set
 # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set
 # end of Display Panels
 
@@ -5536,9 +5733,14 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 # CONFIG_DRM_CDNS_DSI is not set
+# CONFIG_DRM_CHIPONE_ICN6211 is not set
 # CONFIG_DRM_CHRONTEL_CH7033 is not set
+# CONFIG_DRM_CROS_EC_ANX7688 is not set
 # CONFIG_DRM_DISPLAY_CONNECTOR is not set
+# CONFIG_DRM_LONTIUM_LT8912B is not set
 # CONFIG_DRM_LONTIUM_LT9611 is not set
+# CONFIG_DRM_LONTIUM_LT9611UXC is not set
+# CONFIG_DRM_ITE_IT66121 is not set
 # CONFIG_DRM_LVDS_CODEC is not set
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_NWL_MIPI_DSI is not set
@@ -5556,11 +5758,13 @@ CONFIG_DRM_TOSHIBA_TC358767=m
 # CONFIG_DRM_TOSHIBA_TC358768 is not set
 # CONFIG_DRM_TOSHIBA_TC358775 is not set
 CONFIG_DRM_TI_TFP410=m
+# CONFIG_DRM_TI_SN65DSI83 is not set
 # CONFIG_DRM_TI_SN65DSI86 is not set
 # CONFIG_DRM_TI_TPD12S015 is not set
 # CONFIG_DRM_ANALOGIX_ANX6345 is not set
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_DRM_ANALOGIX_DP=m
+# CONFIG_DRM_ANALOGIX_ANX7625 is not set
 CONFIG_DRM_I2C_ADV7511=m
 CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_I2C_ADV7511_CEC=y
@@ -5573,12 +5777,14 @@ CONFIG_DRM_DW_MIPI_DSI=m
 # end of Display Interface Bridges
 
 # CONFIG_DRM_ETNAVIV is not set
-# CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_HISI_HIBMC is not set
-CONFIG_DRM_HISI_KIRIN=m
+# CONFIG_DRM_HISI_KIRIN is not set
 # CONFIG_DRM_MXSFB is not set
-CONFIG_DRM_CIRRUS_QEMU=m
+# CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_BOCHS is not set
+# CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_GM12U320 is not set
+# CONFIG_DRM_SIMPLEDRM is not set
 # CONFIG_TINYDRM_HX8357D is not set
 # CONFIG_TINYDRM_ILI9225 is not set
 # CONFIG_TINYDRM_ILI9341 is not set
@@ -5587,16 +5793,12 @@ CONFIG_DRM_CIRRUS_QEMU=m
 # CONFIG_TINYDRM_REPAPER is not set
 # CONFIG_TINYDRM_ST7586 is not set
 # CONFIG_TINYDRM_ST7735R is not set
-CONFIG_DRM_PL111=m
+# CONFIG_DRM_PL111 is not set
 # CONFIG_DRM_LIMA is not set
 CONFIG_DRM_PANFROST=m
 # CONFIG_DRM_TIDSS is not set
-CONFIG_DRM_LEGACY=y
-# CONFIG_DRM_TDFX is not set
-# CONFIG_DRM_R128 is not set
-# CONFIG_DRM_MGA is not set
-# CONFIG_DRM_VIA is not set
-# CONFIG_DRM_SAVAGE is not set
+# CONFIG_DRM_GUD is not set
+# CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
 
 #
@@ -5687,7 +5889,7 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_BACKLIGHT_ADP8870 is not set
 # CONFIG_BACKLIGHT_LM3630A is not set
 # CONFIG_BACKLIGHT_LM3639 is not set
-CONFIG_BACKLIGHT_LP855X=m
+# CONFIG_BACKLIGHT_LP855X is not set
 CONFIG_BACKLIGHT_GPIO=m
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
@@ -5705,6 +5907,7 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
 CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
@@ -5742,20 +5945,17 @@ CONFIG_SND_DEBUG=y
 CONFIG_SND_DEBUG_VERBOSE=y
 # CONFIG_SND_PCM_XRUN_DEBUG is not set
 # CONFIG_SND_CTL_VALIDATION is not set
+# CONFIG_SND_JACK_INJECTION_DEBUG is not set
 CONFIG_SND_VMASTER=y
+CONFIG_SND_CTL_LED=m
 CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
 # CONFIG_SND_SEQUENCER_OSS is not set
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_SEQ_MIDI_EVENT=m
 CONFIG_SND_SEQ_MIDI=m
-CONFIG_SND_SEQ_MIDI_EMUL=m
 CONFIG_SND_SEQ_VIRMIDI=m
 CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_DRIVERS=y
 CONFIG_SND_DUMMY=m
 CONFIG_SND_ALOOP=m
@@ -5763,75 +5963,70 @@ CONFIG_SND_VIRMIDI=m
 # CONFIG_SND_MTPAV is not set
 CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_MPU401=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
 CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
+# CONFIG_SND_AD1889 is not set
 # CONFIG_SND_ALS300 is not set
 # CONFIG_SND_ALI5451 is not set
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
 # CONFIG_SND_AW2 is not set
 # CONFIG_SND_AZT3328 is not set
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CTXFI is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGOIOX is not set
+# CONFIG_SND_INDIGODJX is not set
 # CONFIG_SND_EMU10K1 is not set
 # CONFIG_SND_EMU10K1X is not set
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
 # CONFIG_SND_ES1938 is not set
 # CONFIG_SND_ES1968 is not set
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
 # CONFIG_SND_ICE1712 is not set
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LOLA=m
-CONFIG_SND_LX6464ES=m
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_LOLA is not set
+# CONFIG_SND_LX6464ES is not set
 # CONFIG_SND_MAESTRO3 is not set
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SE6X is not set
 # CONFIG_SND_SONICVIBES is not set
 # CONFIG_SND_TRIDENT is not set
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
 
 #
 # HD-Audio
@@ -5850,6 +6045,7 @@ CONFIG_SND_HDA_CODEC_SIGMATEL=m
 CONFIG_SND_HDA_CODEC_VIA=m
 CONFIG_SND_HDA_CODEC_HDMI=m
 CONFIG_SND_HDA_CODEC_CIRRUS=m
+# CONFIG_SND_HDA_CODEC_CS8409 is not set
 CONFIG_SND_HDA_CODEC_CONEXANT=m
 CONFIG_SND_HDA_CODEC_CA0110=m
 CONFIG_SND_HDA_CODEC_CA0132=m
@@ -5866,26 +6062,24 @@ CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_PREALLOC_SIZE=4096
 CONFIG_SND_INTEL_NHLT=y
 CONFIG_SND_INTEL_DSP_CONFIG=m
-CONFIG_SND_SPI=y
+CONFIG_SND_INTEL_SOUNDWIRE_ACPI=m
+# CONFIG_SND_SPI is not set
 CONFIG_SND_USB=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
-CONFIG_SND_USB_UA101=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_6FIRE=m
-CONFIG_SND_USB_HIFACE=m
+# CONFIG_SND_USB_UA101 is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_USB_6FIRE is not set
+# CONFIG_SND_USB_HIFACE is not set
 # CONFIG_SND_BCD2000 is not set
-CONFIG_SND_USB_LINE6=m
-CONFIG_SND_USB_POD=m
-CONFIG_SND_USB_PODHD=m
-CONFIG_SND_USB_TONEPORT=m
-CONFIG_SND_USB_VARIAX=m
+# CONFIG_SND_USB_POD is not set
+# CONFIG_SND_USB_PODHD is not set
+# CONFIG_SND_USB_TONEPORT is not set
+# CONFIG_SND_USB_VARIAX is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
-CONFIG_SND_SOC_AMD_ACP=m
-# CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH is not set
-# CONFIG_SND_SOC_AMD_CZ_RT5645_MACH is not set
+# CONFIG_SND_SOC_ADI is not set
+# CONFIG_SND_SOC_AMD_ACP is not set
 # CONFIG_SND_ATMEL_SOC is not set
 # CONFIG_SND_BCM63XX_I2S_WHISTLER is not set
 # CONFIG_SND_DESIGNWARE_I2S is not set
@@ -5904,6 +6098,8 @@ CONFIG_SND_SOC_AMD_ACP=m
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
 # CONFIG_SND_SOC_FSL_MICFIL is not set
+# CONFIG_SND_SOC_FSL_XCVR is not set
+# CONFIG_SND_SOC_FSL_RPMSG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # end of SoC Audio for Freescale CPUs
 
@@ -5929,13 +6125,14 @@ CONFIG_SND_SOC_RK3399_GRU_SOUND=m
 # CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
 # CONFIG_SND_SOC_XILINX_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
-# CONFIG_ZX_TDM is not set
-CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_I2C_AND_SPI=y
 
 #
 # CODEC drivers
 #
 # CONFIG_SND_SOC_AC97_CODEC is not set
+# CONFIG_SND_SOC_ADAU1372_I2C is not set
+# CONFIG_SND_SOC_ADAU1372_SPI is not set
 # CONFIG_SND_SOC_ADAU1701 is not set
 # CONFIG_SND_SOC_ADAU1761_I2C is not set
 # CONFIG_SND_SOC_ADAU1761_SPI is not set
@@ -5953,7 +6150,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_BD28623 is not set
 # CONFIG_SND_SOC_BT_SCO is not set
-CONFIG_SND_SOC_CROS_EC_CODEC=m
+# CONFIG_SND_SOC_CROS_EC_CODEC is not set
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 # CONFIG_SND_SOC_CS35L34 is not set
@@ -5986,6 +6183,7 @@ CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_GTM601 is not set
+# CONFIG_SND_SOC_ICS43432 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98088 is not set
 CONFIG_SND_SOC_MAX98090=m
@@ -5996,8 +6194,8 @@ CONFIG_SND_SOC_MAX98357A=m
 # CONFIG_SND_SOC_MAX98373_I2C is not set
 # CONFIG_SND_SOC_MAX98390 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=y
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=y
+# CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set
+# CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_PCM1681 is not set
 # CONFIG_SND_SOC_PCM1789_I2C is not set
 # CONFIG_SND_SOC_PCM179X_I2C is not set
@@ -6006,23 +6204,27 @@ CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=y
 # CONFIG_SND_SOC_PCM186X_SPI is not set
 # CONFIG_SND_SOC_PCM3060_I2C is not set
 # CONFIG_SND_SOC_PCM3060_SPI is not set
-CONFIG_SND_SOC_PCM3168A=m
-CONFIG_SND_SOC_PCM3168A_I2C=m
+# CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM5102A is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
 # CONFIG_SND_SOC_PCM512x_SPI is not set
-CONFIG_SND_SOC_RK3328=m
+# CONFIG_SND_SOC_RK3328 is not set
+# CONFIG_SND_SOC_RK817 is not set
 CONFIG_SND_SOC_RL6231=m
 CONFIG_SND_SOC_RT5514=m
 CONFIG_SND_SOC_RT5514_SPI=m
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
+# CONFIG_SND_SOC_RT5640 is not set
 CONFIG_SND_SOC_RT5645=m
+# CONFIG_SND_SOC_RT5659 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
-# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
+# CONFIG_SND_SOC_SIMPLE_MUX is not set
 # CONFIG_SND_SOC_SPDIF is not set
 # CONFIG_SND_SOC_SSM2305 is not set
+# CONFIG_SND_SOC_SSM2518 is not set
 # CONFIG_SND_SOC_SSM2602_SPI is not set
 # CONFIG_SND_SOC_SSM2602_I2C is not set
 # CONFIG_SND_SOC_SSM4567 is not set
@@ -6039,12 +6241,14 @@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_TAS6424 is not set
 # CONFIG_SND_SOC_TDA7419 is not set
 # CONFIG_SND_SOC_TFA9879 is not set
+# CONFIG_SND_SOC_TFA989X is not set
 # CONFIG_SND_SOC_TLV320AIC23_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC23_SPI is not set
 # CONFIG_SND_SOC_TLV320AIC31XX is not set
 # CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set
-# CONFIG_SND_SOC_TLV320AIC3X is not set
+# CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
+# CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
 # CONFIG_SND_SOC_TLV320ADCX140 is not set
 CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_TSCS42XX is not set
@@ -6074,22 +6278,26 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_WM8978 is not set
 # CONFIG_SND_SOC_WM8985 is not set
 # CONFIG_SND_SOC_ZL38060 is not set
-# CONFIG_SND_SOC_ZX_AUD96P22 is not set
 # CONFIG_SND_SOC_MAX9759 is not set
 # CONFIG_SND_SOC_MT6351 is not set
 # CONFIG_SND_SOC_MT6358 is not set
 # CONFIG_SND_SOC_MT6660 is not set
+# CONFIG_SND_SOC_NAU8315 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
 # CONFIG_SND_SOC_NAU8824 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
+# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
+# CONFIG_SND_SOC_LPASS_RX_MACRO is not set
+# CONFIG_SND_SOC_LPASS_TX_MACRO is not set
 # end of CODEC drivers
 
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
-CONFIG_AC97_BUS=m
+# CONFIG_SND_VIRTIO is not set
 
 #
 # HID support
@@ -6131,6 +6339,7 @@ CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_ELO=m
 CONFIG_HID_EZKEY=m
+# CONFIG_HID_FT260 is not set
 CONFIG_HID_GEMBIRD=m
 CONFIG_HID_GFRM=m
 # CONFIG_HID_GLORIOUS is not set
@@ -6181,11 +6390,13 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PLANTRONICS=m
+# CONFIG_HID_PLAYSTATION is not set
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_RETRODE=m
 CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
 CONFIG_HID_SAMSUNG=m
+# CONFIG_HID_SEMITEK is not set
 CONFIG_HID_SONY=m
 CONFIG_SONY_FF=y
 CONFIG_HID_SPEEDLINK=m
@@ -6227,7 +6438,9 @@ CONFIG_USB_HIDDEV=y
 #
 # I2C HID support
 #
-CONFIG_I2C_HID=m
+# CONFIG_I2C_HID_ACPI is not set
+# CONFIG_I2C_HID_OF is not set
+# CONFIG_I2C_HID_OF_GOODIX is not set
 # end of I2C HID support
 # end of HID support
 
@@ -6332,7 +6545,7 @@ CONFIG_USBIP_VHCI_NR_HCS=1
 CONFIG_USBIP_HOST=m
 CONFIG_USBIP_VUDC=m
 # CONFIG_USBIP_DEBUG is not set
-# CONFIG_USB_CDNS3 is not set
+# CONFIG_USB_CDNS_SUPPORT is not set
 CONFIG_USB_MUSB_HDRC=y
 # CONFIG_USB_MUSB_HOST is not set
 # CONFIG_USB_MUSB_GADGET is not set
@@ -6432,7 +6645,6 @@ CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SYMBOL=m
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_WWAN=m
 CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_SERIAL_OMNINET=m
@@ -6442,6 +6654,7 @@ CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_UPD78F0730=m
+# CONFIG_USB_SERIAL_XR is not set
 CONFIG_USB_SERIAL_DEBUG=m
 
 #
@@ -6600,11 +6813,12 @@ CONFIG_TYPEC_TCPM=y
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_TYPEC_RT1711H is not set
 # CONFIG_TYPEC_TCPCI_MAXIM is not set
-CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_FUSB302=y
 # CONFIG_TYPEC_UCSI is not set
-# CONFIG_TYPEC_HD3SS3220 is not set
 # CONFIG_TYPEC_TPS6598X is not set
+# CONFIG_TYPEC_HD3SS3220 is not set
 # CONFIG_TYPEC_STUSB160X is not set
+CONFIG_TYPEC_EXTCON=y
 
 #
 # USB Type-C Multiplexer/DeMultiplexer Switch support
@@ -6695,9 +6909,7 @@ CONFIG_LEDS_CLASS_FLASH=m
 #
 # LED drivers
 #
-# CONFIG_LEDS_AAT1290 is not set
 # CONFIG_LEDS_AN30259A is not set
-# CONFIG_LEDS_AS3645A is not set
 # CONFIG_LEDS_AW2013 is not set
 # CONFIG_LEDS_BCM6328 is not set
 # CONFIG_LEDS_BCM6358 is not set
@@ -6707,7 +6919,6 @@ CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM3532 is not set
 # CONFIG_LEDS_LM3642 is not set
 # CONFIG_LEDS_LM3692X is not set
-# CONFIG_LEDS_LM3601X is not set
 # CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_LP3944=m
@@ -6726,7 +6937,6 @@ CONFIG_LEDS_LT3593=m
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_TLC591XX is not set
 # CONFIG_LEDS_LM355x is not set
-# CONFIG_LEDS_KTD2692 is not set
 # CONFIG_LEDS_IS31FL319X is not set
 # CONFIG_LEDS_IS31FL32XX is not set
 
@@ -6739,6 +6949,16 @@ CONFIG_LEDS_SYSCON=y
 CONFIG_LEDS_USER=m
 # CONFIG_LEDS_SPI_BYTE is not set
 # CONFIG_LEDS_TI_LMU_COMMON is not set
+
+#
+# Flash and Torch LED drivers
+#
+# CONFIG_LEDS_AAT1290 is not set
+# CONFIG_LEDS_AS3645A is not set
+# CONFIG_LEDS_KTD2692 is not set
+# CONFIG_LEDS_LM3601X is not set
+# CONFIG_LEDS_RT4505 is not set
+# CONFIG_LEDS_RT8515 is not set
 # CONFIG_LEDS_SGM3140 is not set
 
 #
@@ -6765,6 +6985,7 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 CONFIG_LEDS_TRIGGER_NETDEV=y
 CONFIG_LEDS_TRIGGER_PATTERN=m
 CONFIG_LEDS_TRIGGER_AUDIO=m
+# CONFIG_LEDS_TRIGGER_TTY is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 
@@ -6844,12 +7065,11 @@ CONFIG_RTC_DRV_EM3027=m
 # CONFIG_RTC_DRV_MAX6916 is not set
 # CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RX4581 is not set
-# CONFIG_RTC_DRV_RX6110 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_PCF2123 is not set
 # CONFIG_RTC_DRV_MCP795 is not set
-CONFIG_RTC_I2C_AND_SPI=m
+CONFIG_RTC_I2C_AND_SPI=y
 
 #
 # SPI and I2C RTC drivers
@@ -6859,6 +7079,7 @@ CONFIG_RTC_DRV_DS3232_HWMON=y
 CONFIG_RTC_DRV_PCF2127=m
 CONFIG_RTC_DRV_RV3029C2=m
 CONFIG_RTC_DRV_RV3029_HWMON=y
+# CONFIG_RTC_DRV_RX6110 is not set
 
 #
 # Platform RTC drivers
@@ -6899,6 +7120,7 @@ CONFIG_RTC_DRV_PL031=y
 # HID Sensor RTC drivers
 #
 # CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+# CONFIG_RTC_DRV_GOLDFISH is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set
 
@@ -6943,14 +7165,17 @@ CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
+# CONFIG_DMABUF_DEBUG is not set
 # CONFIG_DMABUF_SELFTESTS is not set
 # CONFIG_DMABUF_HEAPS is not set
+# CONFIG_DMABUF_SYSFS_STATS is not set
 # end of DMABUF options
 
 CONFIG_AUXDISPLAY=y
 # CONFIG_HD44780 is not set
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_HT16K33 is not set
+# CONFIG_LCD2S is not set
 # CONFIG_CHARLCD_BL_OFF is not set
 # CONFIG_CHARLCD_BL_ON is not set
 CONFIG_CHARLCD_BL_FLASH=y
@@ -6964,13 +7189,14 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_MF624 is not set
+CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_VIRQFD=m
-CONFIG_VFIO=m
 # CONFIG_VFIO_NOIOMMU is not set
-CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_CORE=m
 CONFIG_VFIO_PCI_MMAP=y
 CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PLATFORM=m
 CONFIG_VFIO_AMBA=m
 CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m
@@ -6978,6 +7204,7 @@ CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m
 # CONFIG_VFIO_MDEV is not set
 # CONFIG_VIRT_DRIVERS is not set
 CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI_LIB=y
 CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
@@ -6986,7 +7213,6 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_VIRTIO_INPUT=m
 CONFIG_VIRTIO_MMIO=m
 # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
-CONFIG_VIRTIO_DMA_SHARED_BUFFER=m
 # CONFIG_VDPA is not set
 CONFIG_VHOST_IOTLB=m
 CONFIG_VHOST=m
@@ -6999,22 +7225,18 @@ CONFIG_VHOST_VSOCK=m
 #
 # Microsoft Hyper-V guest support
 #
+# CONFIG_HYPERV is not set
 # end of Microsoft Hyper-V guest support
 
 # CONFIG_GREYBUS is not set
-CONFIG_STAGING=y
-CONFIG_PRISM2_USB=m
 # CONFIG_COMEDI is not set
-CONFIG_RTL8192U=m
-CONFIG_RTLLIB=m
-CONFIG_RTLLIB_CRYPTO_CCMP=m
-CONFIG_RTLLIB_CRYPTO_TKIP=m
-CONFIG_RTLLIB_CRYPTO_WEP=m
-CONFIG_RTL8192E=m
+CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
+# CONFIG_RTL8192U is not set
+# CONFIG_RTLLIB is not set
 # CONFIG_RTL8723BS is not set
-CONFIG_R8712U=m
-CONFIG_R8188EU=m
-CONFIG_88EU_AP_MODE=y
+# CONFIG_R8712U is not set
+# CONFIG_R8188EU is not set
 # CONFIG_RTS5208 is not set
 # CONFIG_VT6655 is not set
 # CONFIG_VT6656 is not set
@@ -7048,7 +7270,6 @@ CONFIG_ADT7316_I2C=m
 #
 # Capacitance to digital converters
 #
-CONFIG_AD7150=m
 CONFIG_AD7746=m
 # end of Capacitance to digital converters
 
@@ -7086,68 +7307,30 @@ CONFIG_VIDEO_HANTRO=m
 CONFIG_VIDEO_HANTRO_ROCKCHIP=y
 CONFIG_VIDEO_ROCKCHIP_VDEC=m
 # CONFIG_VIDEO_ZORAN is not set
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_SP8870=m
 
 #
 # Android
 #
 CONFIG_ASHMEM=y
-# CONFIG_ION is not set
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_GS_FPGABOOT is not set
 # CONFIG_UNISYSSPAR is not set
-CONFIG_FB_TFT=m
-CONFIG_FB_TFT_AGM1264K_FL=m
-CONFIG_FB_TFT_BD663474=m
-CONFIG_FB_TFT_HX8340BN=m
-CONFIG_FB_TFT_HX8347D=m
-CONFIG_FB_TFT_HX8353D=m
-CONFIG_FB_TFT_HX8357D=m
-CONFIG_FB_TFT_ILI9163=m
-CONFIG_FB_TFT_ILI9320=m
-CONFIG_FB_TFT_ILI9325=m
-CONFIG_FB_TFT_ILI9340=m
-CONFIG_FB_TFT_ILI9341=m
-CONFIG_FB_TFT_ILI9481=m
-CONFIG_FB_TFT_ILI9486=m
-CONFIG_FB_TFT_PCD8544=m
-CONFIG_FB_TFT_RA8875=m
-CONFIG_FB_TFT_S6D02A1=m
-CONFIG_FB_TFT_S6D1121=m
-# CONFIG_FB_TFT_SEPS525 is not set
-CONFIG_FB_TFT_SH1106=m
-CONFIG_FB_TFT_SSD1289=m
-CONFIG_FB_TFT_SSD1305=m
-CONFIG_FB_TFT_SSD1306=m
-CONFIG_FB_TFT_SSD1331=m
-CONFIG_FB_TFT_SSD1351=m
-CONFIG_FB_TFT_ST7735R=m
-CONFIG_FB_TFT_ST7789V=m
-CONFIG_FB_TFT_TINYLCD=m
-CONFIG_FB_TFT_TLS8204=m
-CONFIG_FB_TFT_UC1611=m
-CONFIG_FB_TFT_UC1701=m
-CONFIG_FB_TFT_UPD161704=m
-CONFIG_FB_TFT_WATTEROTT=m
+# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set
+# CONFIG_FB_TFT is not set
 # CONFIG_KS7010 is not set
 # CONFIG_PI433 is not set
-
-#
-# Gasket devices
-#
-# CONFIG_STAGING_GASKET_FRAMEWORK is not set
-# end of Gasket devices
-
 # CONFIG_XIL_AXIS_FIFO is not set
 # CONFIG_FIELDBUS_DEV is not set
-# CONFIG_KPC2000 is not set
 # CONFIG_QLGE is not set
 # CONFIG_WFX is not set
-# CONFIG_SPMI_HISI3670 is not set
-# CONFIG_MFD_HI6421_SPMI is not set
 # CONFIG_GOLDFISH is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_TBMC=m
@@ -7167,10 +7350,20 @@ CONFIG_CROS_EC_TYPEC=y
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CROS_USBPD_NOTIFY=y
 # CONFIG_MELLANOX_PLATFORM is not set
+# CONFIG_SURFACE_PLATFORMS is not set
 CONFIG_HAVE_CLK=y
-CONFIG_CLKDEV_LOOKUP=y
 CONFIG_HAVE_CLK_PREPARE=y
 CONFIG_COMMON_CLK=y
+
+#
+# Clock driver for ARM Reference designs
+#
+# CONFIG_ICST is not set
+# CONFIG_CLK_SP810 is not set
+# CONFIG_CLK_VEXPRESS_OSC is not set
+# end of Clock driver for ARM Reference designs
+
+# CONFIG_LMK04832 is not set
 # CONFIG_COMMON_CLK_MAX9485 is not set
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SCPI=y
@@ -7182,22 +7375,19 @@ CONFIG_COMMON_CLK_SCPI=y
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_CLK_QORIQ is not set
+# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
 CONFIG_COMMON_CLK_XGENE=y
 CONFIG_COMMON_CLK_PWM=y
 # CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_FIXED_MMIO is not set
 CONFIG_COMMON_CLK_ROCKCHIP=y
-CONFIG_CLK_PX30=y
-CONFIG_CLK_RV110X=y
-CONFIG_CLK_RK3036=y
-CONFIG_CLK_RK312X=y
-CONFIG_CLK_RK3188=y
-CONFIG_CLK_RK322X=y
-CONFIG_CLK_RK3308=y
-CONFIG_CLK_RK3328=y
-CONFIG_CLK_RK3368=y
+# CONFIG_CLK_PX30 is not set
+# CONFIG_CLK_RK3308 is not set
+# CONFIG_CLK_RK3328 is not set
+# CONFIG_CLK_RK3368 is not set
 CONFIG_CLK_RK3399=y
+# CONFIG_CLK_RK3568 is not set
+# CONFIG_XILINX_VCU is not set
 CONFIG_HWSPINLOCK=y
 
 #
@@ -7219,6 +7409,7 @@ CONFIG_ARM64_ERRATUM_858921=y
 
 CONFIG_MAILBOX=y
 CONFIG_ARM_MHU=y
+# CONFIG_ARM_MHU_V2 is not set
 CONFIG_PLATFORM_MHU=y
 # CONFIG_PL320_MBOX is not set
 CONFIG_ROCKCHIP_MBOX=y
@@ -7240,6 +7431,8 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 # end of Generic IOMMU Pagetable Support
 
 # CONFIG_IOMMU_DEBUGFS is not set
+CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
+# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
@@ -7263,6 +7456,7 @@ CONFIG_REMOTEPROC=y
 #
 CONFIG_RPMSG=y
 CONFIG_RPMSG_CHAR=y
+# CONFIG_RPMSG_NS is not set
 CONFIG_RPMSG_QCOM_GLINK=y
 CONFIG_RPMSG_QCOM_GLINK_RPM=y
 # CONFIG_RPMSG_VIRTIO is not set
@@ -7279,11 +7473,6 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y
 #
 # end of Amlogic SoC drivers
 
-#
-# Aspeed SoC drivers
-#
-# end of Aspeed SoC drivers
-
 #
 # Broadcom SoC drivers
 #
@@ -7302,6 +7491,12 @@ CONFIG_RPMSG_QCOM_GLINK_RPM=y
 #
 # end of i.MX SoC drivers
 
+#
+# Enable LiteX SoC Builder specific drivers
+#
+# CONFIG_LITEX_SOC_CONTROLLER is not set
+# end of Enable LiteX SoC Builder specific drivers
+
 #
 # Qualcomm SoC drivers
 #
@@ -7315,7 +7510,6 @@ CONFIG_ROCKCHIP_PM_DOMAINS=y
 #
 # Xilinx SoC drivers
 #
-# CONFIG_XILINX_VCU is not set
 # end of Xilinx SoC drivers
 # end of SOC (System On Chip) specific Drivers
 
@@ -7350,6 +7544,7 @@ CONFIG_EXTCON_GPIO=y
 # CONFIG_EXTCON_SM5502 is not set
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON_USBC_CROS_EC=y
+# CONFIG_EXTCON_USBC_TUSB320 is not set
 CONFIG_MEMORY=y
 # CONFIG_ARM_PL172_MPMC is not set
 CONFIG_IIO=y
@@ -7370,118 +7565,109 @@ CONFIG_IIO_TRIGGERED_EVENT=m
 #
 # Accelerometers
 #
-CONFIG_ADIS16201=m
-CONFIG_ADIS16209=m
-CONFIG_ADXL345=m
-CONFIG_ADXL345_I2C=m
-CONFIG_ADXL345_SPI=m
-CONFIG_ADXL372=m
-CONFIG_ADXL372_SPI=m
-CONFIG_ADXL372_I2C=m
-CONFIG_BMA180=m
-CONFIG_BMA220=m
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADXL345_I2C is not set
+# CONFIG_ADXL345_SPI is not set
+# CONFIG_ADXL372_SPI is not set
+# CONFIG_ADXL372_I2C is not set
+# CONFIG_BMA180 is not set
+# CONFIG_BMA220 is not set
 # CONFIG_BMA400 is not set
-CONFIG_BMC150_ACCEL=m
-CONFIG_BMC150_ACCEL_I2C=m
-CONFIG_BMC150_ACCEL_SPI=m
-CONFIG_DA280=m
-CONFIG_DA311=m
-CONFIG_DMARD06=m
-CONFIG_DMARD09=m
-CONFIG_DMARD10=m
-CONFIG_HID_SENSOR_ACCEL_3D=m
-CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
-CONFIG_IIO_ST_ACCEL_3AXIS=m
-CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
-CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
-CONFIG_KXSD9=m
-CONFIG_KXSD9_SPI=m
-CONFIG_KXSD9_I2C=m
-CONFIG_KXCJK1013=m
-CONFIG_MC3230=m
-CONFIG_MMA7455=m
-CONFIG_MMA7455_I2C=m
-CONFIG_MMA7455_SPI=m
-CONFIG_MMA7660=m
-CONFIG_MMA8452=m
-CONFIG_MMA9551_CORE=m
-CONFIG_MMA9551=m
-CONFIG_MMA9553=m
-CONFIG_MXC4005=m
-CONFIG_MXC6255=m
-CONFIG_SCA3000=m
-CONFIG_STK8312=m
-CONFIG_STK8BA50=m
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_BMI088_ACCEL is not set
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD06 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
+# CONFIG_FXLS8962AF_I2C is not set
+# CONFIG_FXLS8962AF_SPI is not set
+# CONFIG_HID_SENSOR_ACCEL_3D is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
+# CONFIG_MMA7660 is not set
+# CONFIG_MMA8452 is not set
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_SCA3300 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
 # end of Accelerometers
 
 #
 # Analog to digital converters
 #
-CONFIG_AD_SIGMA_DELTA=m
 # CONFIG_AD7091R5 is not set
-CONFIG_AD7124=m
-CONFIG_AD7192=m
-CONFIG_AD7266=m
-CONFIG_AD7291=m
+# CONFIG_AD7124 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7291 is not set
 # CONFIG_AD7292 is not set
-CONFIG_AD7298=m
-CONFIG_AD7476=m
-CONFIG_AD7606=m
-CONFIG_AD7606_IFACE_PARALLEL=m
-CONFIG_AD7606_IFACE_SPI=m
-CONFIG_AD7766=m
-CONFIG_AD7768_1=m
-CONFIG_AD7780=m
-CONFIG_AD7791=m
-CONFIG_AD7793=m
-CONFIG_AD7887=m
-CONFIG_AD7923=m
-CONFIG_AD7949=m
-CONFIG_AD799X=m
-# CONFIG_AD9467 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606_IFACE_PARALLEL is not set
+# CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7766 is not set
+# CONFIG_AD7768_1 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD7949 is not set
+# CONFIG_AD799X is not set
 # CONFIG_ADI_AXI_ADC is not set
-CONFIG_AXP20X_ADC=m
-CONFIG_AXP288_ADC=m
-CONFIG_CC10001_ADC=m
-CONFIG_ENVELOPE_DETECTOR=m
-CONFIG_HI8435=m
-CONFIG_HX711=m
-CONFIG_INA2XX_ADC=m
-CONFIG_LTC2471=m
-CONFIG_LTC2485=m
+# CONFIG_AXP20X_ADC is not set
+# CONFIG_AXP288_ADC is not set
+# CONFIG_CC10001_ADC is not set
+# CONFIG_ENVELOPE_DETECTOR is not set
+# CONFIG_HI8435 is not set
+# CONFIG_HX711 is not set
+# CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2471 is not set
+# CONFIG_LTC2485 is not set
 # CONFIG_LTC2496 is not set
-CONFIG_LTC2497=m
-CONFIG_MAX1027=m
-CONFIG_MAX11100=m
-CONFIG_MAX1118=m
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
 # CONFIG_MAX1241 is not set
-CONFIG_MAX1363=m
-CONFIG_MAX9611=m
-CONFIG_MCP320X=m
-CONFIG_MCP3422=m
-CONFIG_MCP3911=m
-CONFIG_NAU7802=m
-CONFIG_QCOM_VADC_COMMON=y
-CONFIG_QCOM_SPMI_IADC=m
-CONFIG_QCOM_SPMI_VADC=y
-CONFIG_QCOM_SPMI_ADC5=m
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX9611 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP3911 is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_QCOM_SPMI_IADC is not set
+# CONFIG_QCOM_SPMI_VADC is not set
+# CONFIG_QCOM_SPMI_ADC5 is not set
 CONFIG_ROCKCHIP_SARADC=m
-CONFIG_SD_ADC_MODULATOR=m
-CONFIG_TI_ADC081C=m
-CONFIG_TI_ADC0832=m
-CONFIG_TI_ADC084S021=m
-CONFIG_TI_ADC12138=m
-CONFIG_TI_ADC108S102=m
-CONFIG_TI_ADC128S052=m
-CONFIG_TI_ADC161S626=m
-CONFIG_TI_ADS1015=m
-CONFIG_TI_ADS7950=m
-CONFIG_TI_ADS8344=m
-CONFIG_TI_ADS8688=m
-CONFIG_TI_ADS124S08=m
-CONFIG_TI_TLC4541=m
-CONFIG_VF610_ADC=m
-CONFIG_VIPERBOARD_ADC=m
+# CONFIG_SD_ADC_MODULATOR is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+# CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS7950 is not set
+# CONFIG_TI_ADS8344 is not set
+# CONFIG_TI_ADS8688 is not set
+# CONFIG_TI_ADS124S08 is not set
+# CONFIG_TI_ADS131E08 is not set
+# CONFIG_TI_TLC4541 is not set
+# CONFIG_TI_TSC2046 is not set
+# CONFIG_VF610_ADC is not set
+# CONFIG_VIPERBOARD_ADC is not set
 # CONFIG_XILINX_XADC is not set
 # end of Analog to digital converters
 
@@ -7494,30 +7680,34 @@ CONFIG_IIO_RESCALE=m
 #
 # Amplifiers
 #
-CONFIG_AD8366=m
+# CONFIG_AD8366 is not set
 # CONFIG_HMC425 is not set
 # end of Amplifiers
 
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# end of Capacitance to digital converters
+
 #
 # Chemical Sensors
 #
-CONFIG_ATLAS_PH_SENSOR=m
+# CONFIG_ATLAS_PH_SENSOR is not set
 # CONFIG_ATLAS_EZO_SENSOR is not set
-CONFIG_BME680=m
-CONFIG_BME680_I2C=m
-CONFIG_BME680_SPI=m
-CONFIG_CCS811=m
-CONFIG_IAQCORE=m
-CONFIG_PMS7003=m
+# CONFIG_BME680 is not set
+# CONFIG_CCS811 is not set
+# CONFIG_IAQCORE is not set
+# CONFIG_PMS7003 is not set
 # CONFIG_SCD30_CORE is not set
-CONFIG_SENSIRION_SGP30=m
-CONFIG_SPS30=m
-CONFIG_VZ89X=m
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SENSIRION_SGP40 is not set
+# CONFIG_SPS30_I2C is not set
+# CONFIG_SPS30_SERIAL is not set
+# CONFIG_VZ89X is not set
 # end of Chemical Sensors
 
-CONFIG_IIO_CROS_EC_SENSORS_CORE=m
-CONFIG_IIO_CROS_EC_SENSORS=m
-# CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE is not set
+# CONFIG_IIO_CROS_EC_SENSORS_CORE is not set
 
 #
 # Hid Sensor IIO Common
@@ -7526,7 +7716,10 @@ CONFIG_HID_SENSOR_IIO_COMMON=m
 CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # end of Hid Sensor IIO Common
 
-CONFIG_IIO_MS_SENSORS_I2C=m
+#
+# IIO SCMI Sensors
+#
+# end of IIO SCMI Sensors
 
 #
 # SSP Sensor Common
@@ -7534,49 +7727,44 @@ CONFIG_IIO_MS_SENSORS_I2C=m
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # end of SSP Sensor Common
 
-CONFIG_IIO_ST_SENSORS_I2C=m
-CONFIG_IIO_ST_SENSORS_SPI=m
-CONFIG_IIO_ST_SENSORS_CORE=m
-
 #
 # Digital to analog converters
 #
-CONFIG_AD5064=m
-CONFIG_AD5360=m
-CONFIG_AD5380=m
-CONFIG_AD5421=m
-CONFIG_AD5446=m
-CONFIG_AD5449=m
-CONFIG_AD5592R_BASE=m
-CONFIG_AD5592R=m
-CONFIG_AD5593R=m
-CONFIG_AD5504=m
-CONFIG_AD5624R_SPI=m
-CONFIG_AD5686=m
-CONFIG_AD5686_SPI=m
-CONFIG_AD5696_I2C=m
-CONFIG_AD5755=m
-CONFIG_AD5758=m
-CONFIG_AD5761=m
-CONFIG_AD5764=m
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5766 is not set
 # CONFIG_AD5770R is not set
-CONFIG_AD5791=m
-CONFIG_AD7303=m
-CONFIG_AD8801=m
-CONFIG_DPOT_DAC=m
-CONFIG_DS4424=m
-CONFIG_LTC1660=m
-CONFIG_LTC2632=m
-CONFIG_M62332=m
-CONFIG_MAX517=m
-CONFIG_MAX5821=m
-CONFIG_MCP4725=m
-CONFIG_MCP4922=m
-CONFIG_TI_DAC082S085=m
-CONFIG_TI_DAC5571=m
-CONFIG_TI_DAC7311=m
-CONFIG_TI_DAC7612=m
-CONFIG_VF610_DAC=m
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DPOT_DAC is not set
+# CONFIG_DS4424 is not set
+# CONFIG_LTC1660 is not set
+# CONFIG_LTC2632 is not set
+# CONFIG_M62332 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MAX5821 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
+# CONFIG_TI_DAC5571 is not set
+# CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7612 is not set
+# CONFIG_VF610_DAC is not set
 # end of Digital to analog converters
 
 #
@@ -7592,13 +7780,13 @@ CONFIG_VF610_DAC=m
 #
 # Clock Generator/Distribution
 #
-CONFIG_AD9523=m
+# CONFIG_AD9523 is not set
 # end of Clock Generator/Distribution
 
 #
 # Phase-Locked Loop (PLL) frequency synthesizers
 #
-CONFIG_ADF4350=m
+# CONFIG_ADF4350 is not set
 # CONFIG_ADF4371 is not set
 # end of Phase-Locked Loop (PLL) frequency synthesizers
 # end of Frequency Synthesizers DDS/PLL
@@ -7606,25 +7794,18 @@ CONFIG_ADF4350=m
 #
 # Digital gyroscope sensors
 #
-CONFIG_ADIS16080=m
-CONFIG_ADIS16130=m
-CONFIG_ADIS16136=m
-CONFIG_ADIS16260=m
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS290 is not set
-CONFIG_ADXRS450=m
-CONFIG_BMG160=m
-CONFIG_BMG160_I2C=m
-CONFIG_BMG160_SPI=m
-CONFIG_FXAS21002C=m
-CONFIG_FXAS21002C_I2C=m
-CONFIG_FXAS21002C_SPI=m
-CONFIG_HID_SENSOR_GYRO_3D=m
-CONFIG_MPU3050=m
-CONFIG_MPU3050_I2C=m
-CONFIG_IIO_ST_GYRO_3AXIS=m
-CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
-CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
-CONFIG_ITG3200=m
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+# CONFIG_FXAS21002C is not set
+# CONFIG_HID_SENSOR_GYRO_3D is not set
+# CONFIG_MPU3050_I2C is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
 # end of Digital gyroscope sensors
 
 #
@@ -7634,50 +7815,45 @@ CONFIG_ITG3200=m
 #
 # Heart Rate Monitors
 #
-CONFIG_AFE4403=m
-CONFIG_AFE4404=m
-CONFIG_MAX30100=m
-CONFIG_MAX30102=m
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
 # end of Heart Rate Monitors
 # end of Health Sensors
 
 #
 # Humidity sensors
 #
-CONFIG_AM2315=m
-CONFIG_DHT11=m
-CONFIG_HDC100X=m
+# CONFIG_AM2315 is not set
+# CONFIG_DHT11 is not set
+# CONFIG_HDC100X is not set
 # CONFIG_HDC2010 is not set
-CONFIG_HID_SENSOR_HUMIDITY=m
-CONFIG_HTS221=m
-CONFIG_HTS221_I2C=m
-CONFIG_HTS221_SPI=m
-CONFIG_HTU21=m
-CONFIG_SI7005=m
-CONFIG_SI7020=m
+# CONFIG_HID_SENSOR_HUMIDITY is not set
+# CONFIG_HTS221 is not set
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
 # end of Humidity sensors
 
 #
 # Inertial measurement units
 #
-CONFIG_ADIS16400=m
+# CONFIG_ADIS16400 is not set
 # CONFIG_ADIS16460 is not set
 # CONFIG_ADIS16475 is not set
-CONFIG_ADIS16480=m
-CONFIG_BMI160=m
-CONFIG_BMI160_I2C=m
-CONFIG_BMI160_SPI=m
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
 # CONFIG_FXOS8700_I2C is not set
 # CONFIG_FXOS8700_SPI is not set
-CONFIG_KMX61=m
+# CONFIG_KMX61 is not set
 # CONFIG_INV_ICM42600_I2C is not set
 # CONFIG_INV_ICM42600_SPI is not set
-CONFIG_INV_MPU6050_IIO=m
-CONFIG_INV_MPU6050_I2C=m
-CONFIG_INV_MPU6050_SPI=m
-CONFIG_IIO_ST_LSM6DSX=m
-CONFIG_IIO_ST_LSM6DSX_I2C=m
-CONFIG_IIO_ST_LSM6DSX_SPI=m
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
+# CONFIG_IIO_ST_LSM9DS0 is not set
 # end of Inertial measurement units
 
 CONFIG_IIO_ADIS_LIB=m
@@ -7686,80 +7862,74 @@ CONFIG_IIO_ADIS_LIB_BUFFER=y
 #
 # Light sensors
 #
-CONFIG_ACPI_ALS=m
-CONFIG_ADJD_S311=m
+# CONFIG_ACPI_ALS is not set
+# CONFIG_ADJD_S311 is not set
 # CONFIG_ADUX1020 is not set
 # CONFIG_AL3010 is not set
-CONFIG_AL3320A=m
-CONFIG_APDS9300=m
-CONFIG_APDS9960=m
+# CONFIG_AL3320A is not set
+# CONFIG_APDS9300 is not set
+# CONFIG_APDS9960 is not set
 # CONFIG_AS73211 is not set
-CONFIG_BH1750=m
-CONFIG_BH1780=m
-CONFIG_CM32181=m
-CONFIG_CM3232=m
-CONFIG_CM3323=m
-CONFIG_CM3605=m
-CONFIG_CM36651=m
-CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+# CONFIG_BH1750 is not set
+# CONFIG_BH1780 is not set
+# CONFIG_CM32181 is not set
+# CONFIG_CM3232 is not set
+# CONFIG_CM3323 is not set
+# CONFIG_CM3605 is not set
+# CONFIG_CM36651 is not set
 # CONFIG_GP2AP002 is not set
-CONFIG_GP2AP020A00F=m
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_ISL29125=m
-CONFIG_HID_SENSOR_ALS=m
-CONFIG_HID_SENSOR_PROX=m
-CONFIG_JSA1212=m
-CONFIG_RPR0521=m
-CONFIG_LTR501=m
-CONFIG_LV0104CS=m
-CONFIG_MAX44000=m
-CONFIG_MAX44009=m
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
+# CONFIG_HID_SENSOR_ALS is not set
+# CONFIG_HID_SENSOR_PROX is not set
+# CONFIG_JSA1212 is not set
+# CONFIG_RPR0521 is not set
+# CONFIG_LTR501 is not set
+# CONFIG_LV0104CS is not set
+# CONFIG_MAX44000 is not set
+# CONFIG_MAX44009 is not set
 # CONFIG_NOA1305 is not set
-CONFIG_OPT3001=m
-CONFIG_PA12203001=m
-CONFIG_SI1133=m
-CONFIG_SI1145=m
-CONFIG_STK3310=m
-CONFIG_ST_UVIS25=m
-CONFIG_ST_UVIS25_I2C=m
-CONFIG_ST_UVIS25_SPI=m
-CONFIG_TCS3414=m
-CONFIG_TCS3472=m
-CONFIG_SENSORS_TSL2563=m
-CONFIG_TSL2583=m
-CONFIG_TSL2772=m
-CONFIG_TSL4531=m
-CONFIG_US5182D=m
-CONFIG_VCNL4000=m
-CONFIG_VCNL4035=m
+# CONFIG_OPT3001 is not set
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1133 is not set
+# CONFIG_SI1145 is not set
+# CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+# CONFIG_SENSORS_TSL2563 is not set
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2591 is not set
+# CONFIG_TSL2772 is not set
+# CONFIG_TSL4531 is not set
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VCNL4035 is not set
 # CONFIG_VEML6030 is not set
-CONFIG_VEML6070=m
-CONFIG_VL6180=m
-CONFIG_ZOPT2201=m
+# CONFIG_VEML6070 is not set
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
 # end of Light sensors
 
 #
 # Magnetometer sensors
 #
-CONFIG_AK8974=m
+# CONFIG_AK8974 is not set
 CONFIG_AK8975=m
-CONFIG_AK09911=m
-CONFIG_BMC150_MAGN=m
-CONFIG_BMC150_MAGN_I2C=m
-CONFIG_BMC150_MAGN_SPI=m
-CONFIG_MAG3110=m
-CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
-CONFIG_MMC35240=m
-CONFIG_IIO_ST_MAGN_3AXIS=m
-CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
-CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
-CONFIG_SENSORS_HMC5843=m
-CONFIG_SENSORS_HMC5843_I2C=m
-CONFIG_SENSORS_HMC5843_SPI=m
-CONFIG_SENSORS_RM3100=m
-CONFIG_SENSORS_RM3100_I2C=m
-CONFIG_SENSORS_RM3100_SPI=m
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+# CONFIG_SENSORS_RM3100_I2C is not set
+# CONFIG_SENSORS_RM3100_SPI is not set
+# CONFIG_YAMAHA_YAS530 is not set
 # end of Magnetometer sensors
 
 #
@@ -7787,102 +7957,96 @@ CONFIG_IIO_SYSFS_TRIGGER=m
 #
 # Linear and angular position sensors
 #
+# CONFIG_HID_SENSOR_CUSTOM_INTEL_HINGE is not set
 # end of Linear and angular position sensors
 
 #
 # Digital potentiometers
 #
-CONFIG_AD5272=m
-CONFIG_DS1803=m
+# CONFIG_AD5110 is not set
+# CONFIG_AD5272 is not set
+# CONFIG_DS1803 is not set
 # CONFIG_MAX5432 is not set
-CONFIG_MAX5481=m
-CONFIG_MAX5487=m
-CONFIG_MCP4018=m
-CONFIG_MCP4131=m
-CONFIG_MCP4531=m
-CONFIG_MCP41010=m
-CONFIG_TPL0102=m
+# CONFIG_MAX5481 is not set
+# CONFIG_MAX5487 is not set
+# CONFIG_MCP4018 is not set
+# CONFIG_MCP4131 is not set
+# CONFIG_MCP4531 is not set
+# CONFIG_MCP41010 is not set
+# CONFIG_TPL0102 is not set
 # end of Digital potentiometers
 
 #
 # Digital potentiostats
 #
-CONFIG_LMP91000=m
+# CONFIG_LMP91000 is not set
 # end of Digital potentiostats
 
 #
 # Pressure sensors
 #
-CONFIG_ABP060MG=m
-CONFIG_BMP280=m
-CONFIG_BMP280_I2C=m
-CONFIG_BMP280_SPI=m
-CONFIG_IIO_CROS_EC_BARO=m
+# CONFIG_ABP060MG is not set
+# CONFIG_BMP280 is not set
 # CONFIG_DLHL60D is not set
 # CONFIG_DPS310 is not set
-CONFIG_HID_SENSOR_PRESS=m
-CONFIG_HP03=m
+# CONFIG_HID_SENSOR_PRESS is not set
+# CONFIG_HP03 is not set
 # CONFIG_ICP10100 is not set
-CONFIG_MPL115=m
-CONFIG_MPL115_I2C=m
-CONFIG_MPL115_SPI=m
-CONFIG_MPL3115=m
-CONFIG_MS5611=m
-CONFIG_MS5611_I2C=m
-CONFIG_MS5611_SPI=m
-CONFIG_MS5637=m
-CONFIG_IIO_ST_PRESS=m
-CONFIG_IIO_ST_PRESS_I2C=m
-CONFIG_IIO_ST_PRESS_SPI=m
-CONFIG_T5403=m
-CONFIG_HP206C=m
-CONFIG_ZPA2326=m
-CONFIG_ZPA2326_I2C=m
-CONFIG_ZPA2326_SPI=m
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
 # end of Pressure sensors
 
 #
 # Lightning sensors
 #
-CONFIG_AS3935=m
+# CONFIG_AS3935 is not set
 # end of Lightning sensors
 
 #
 # Proximity and distance sensors
 #
-CONFIG_ISL29501=m
-CONFIG_LIDAR_LITE_V2=m
-CONFIG_MB1232=m
+# CONFIG_CROS_EC_MKBP_PROXIMITY is not set
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_MB1232 is not set
 # CONFIG_PING is not set
-CONFIG_RFD77402=m
-CONFIG_SRF04=m
+# CONFIG_RFD77402 is not set
+# CONFIG_SRF04 is not set
 # CONFIG_SX9310 is not set
-CONFIG_SX9500=m
-CONFIG_SRF08=m
+# CONFIG_SX9500 is not set
+# CONFIG_SRF08 is not set
 # CONFIG_VCNL3020 is not set
-CONFIG_VL53L0X_I2C=m
+# CONFIG_VL53L0X_I2C is not set
 # end of Proximity and distance sensors
 
 #
 # Resolver to digital converters
 #
-CONFIG_AD2S90=m
-CONFIG_AD2S1200=m
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
 # end of Resolver to digital converters
 
 #
 # Temperature sensors
 #
 # CONFIG_LTC2983 is not set
-CONFIG_MAXIM_THERMOCOUPLE=m
-CONFIG_HID_SENSOR_TEMP=m
-CONFIG_MLX90614=m
-CONFIG_MLX90632=m
-CONFIG_TMP006=m
-CONFIG_TMP007=m
-CONFIG_TSYS01=m
-CONFIG_TSYS02D=m
-CONFIG_MAX31856=m
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_HID_SENSOR_TEMP is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+# CONFIG_TMP006 is not set
+# CONFIG_TMP007 is not set
+# CONFIG_TMP117 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+# CONFIG_MAX31856 is not set
 # end of Temperature sensors
 
 # CONFIG_NTB is not set
@@ -7890,7 +8054,9 @@ CONFIG_MAX31856=m
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
 # CONFIG_PWM_DEBUG is not set
+# CONFIG_PWM_ATMEL_TCB is not set
 CONFIG_PWM_CROS_EC=m
+# CONFIG_PWM_DWC is not set
 # CONFIG_PWM_FSL_FTM is not set
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_ROCKCHIP=y
@@ -7912,8 +8078,6 @@ CONFIG_PARTITION_PERCPU=y
 # CONFIG_IPACK_BUS is not set
 CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 CONFIG_RESET_CONTROLLER=y
-# CONFIG_RESET_BRCMSTB_RESCAL is not set
-# CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_TI_SYSCON is not set
 
 #
@@ -7922,7 +8086,7 @@ CONFIG_RESET_CONTROLLER=y
 CONFIG_GENERIC_PHY=y
 CONFIG_GENERIC_PHY_MIPI_DPHY=y
 CONFIG_PHY_XGENE=y
-# CONFIG_USB_LGM_PHY is not set
+# CONFIG_PHY_CAN_TRANSCEIVER is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_TORRENT is not set
 # CONFIG_PHY_CADENCE_DPHY is not set
@@ -7942,6 +8106,7 @@ CONFIG_PHY_ROCKCHIP_DP=y
 CONFIG_PHY_ROCKCHIP_EMMC=y
 CONFIG_PHY_ROCKCHIP_INNO_HDMI=y
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+# CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY is not set
 # CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set
 CONFIG_PHY_ROCKCHIP_PCIE=y
 CONFIG_PHY_ROCKCHIP_TYPEC=y
@@ -7952,6 +8117,7 @@ CONFIG_PHY_ROCKCHIP_TYPEC=y
 
 CONFIG_POWERCAP=y
 # CONFIG_IDLE_INJECT is not set
+# CONFIG_DTPM is not set
 # CONFIG_MCB is not set
 
 #
@@ -7967,6 +8133,7 @@ CONFIG_ARM_PMU_ACPI=y
 # CONFIG_ARM_SMMU_V3_PMU is not set
 # CONFIG_ARM_DSU_PMU is not set
 # CONFIG_ARM_SPE_PMU is not set
+# CONFIG_ARM_DMC620_PMU is not set
 CONFIG_HISI_PMU=y
 # end of Performance monitor support
 
@@ -7998,6 +8165,7 @@ CONFIG_NVMEM_SYSFS=y
 # CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_ROCKCHIP_EFUSE=y
 # CONFIG_ROCKCHIP_OTP is not set
+# CONFIG_NVMEM_RMEM is not set
 
 #
 # HW tracing support
@@ -8087,16 +8255,18 @@ CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
 # CONFIG_F2FS_FS_COMPRESSION is not set
+CONFIG_F2FS_IOSTAT=y
 # CONFIG_ZONEFS_FS is not set
 # CONFIG_FS_DAX is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
 CONFIG_FS_ENCRYPTION=y
 CONFIG_FS_ENCRYPTION_ALGS=y
-# CONFIG_FS_VERITY is not set
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
@@ -8125,14 +8295,13 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 # Caches
 #
+CONFIG_NETFS_SUPPORT=m
+CONFIG_NETFS_STATS=y
 CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
-# CONFIG_FSCACHE_HISTOGRAM is not set
 # CONFIG_FSCACHE_DEBUG is not set
-CONFIG_FSCACHE_OBJECT_LIST=y
 CONFIG_CACHEFILES=m
 # CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
 # end of Caches
 
 #
@@ -8158,6 +8327,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_NTFS_FS=m
 # CONFIG_NTFS_DEBUG is not set
 CONFIG_NTFS_RW=y
+# CONFIG_NTFS3_FS is not set
 # end of DOS/FAT/EXFAT/NT Filesystems
 
 #
@@ -8174,6 +8344,7 @@ CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_TMPFS_INODE64 is not set
+CONFIG_ARCH_SUPPORTS_HUGETLBFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_MEMFD_CREATE=y
@@ -8234,6 +8405,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_BOTH is not set
 CONFIG_ROMFS_ON_BLOCK=y
 CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240
 CONFIG_PSTORE_DEFLATE_COMPRESS=y
 # CONFIG_PSTORE_LZO_COMPRESS is not set
 # CONFIG_PSTORE_LZ4_COMPRESS is not set
@@ -8263,7 +8435,7 @@ CONFIG_NFS_V4_1=y
 CONFIG_NFS_V4_2=y
 CONFIG_PNFS_FILE_LAYOUT=y
 CONFIG_PNFS_BLOCK=y
-CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=y
 CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
 # CONFIG_NFS_V4_1_MIGRATION is not set
 CONFIG_NFS_V4_SECURITY_LABEL=y
@@ -8288,6 +8460,7 @@ CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
+CONFIG_NFS_V4_2_SSC_HELPER=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_SUNRPC_BACKCHANNEL=y
@@ -8302,7 +8475,6 @@ CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
-CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
@@ -8310,7 +8482,10 @@ CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
 CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_SWN_UPCALL is not set
 CONFIG_CIFS_FSCACHE=y
+# CONFIG_SMB_SERVER is not set
+CONFIG_SMBFS_COMMON=m
 CONFIG_CODA_FS=m
 # CONFIG_AFS_FS is not set
 CONFIG_9P_FS=m
@@ -8404,7 +8579,9 @@ CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
 CONFIG_SECURITY_YAMA=y
 # CONFIG_SECURITY_SAFESETID is not set
 # CONFIG_SECURITY_LOCKDOWN_LSM is not set
+# CONFIG_SECURITY_LANDLOCK is not set
 # CONFIG_INTEGRITY is not set
+# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
 CONFIG_DEFAULT_SECURITY_APPARMOR=y
 # CONFIG_DEFAULT_SECURITY_DAC is not set
 CONFIG_LSM="yama,apparmor"
@@ -8472,10 +8649,11 @@ CONFIG_CRYPTO_ENGINE=m
 #
 # Public-key cryptography
 #
-CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_RSA=y
 CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECDSA=m
 # CONFIG_CRYPTO_ECRDSA is not set
 # CONFIG_CRYPTO_SM2 is not set
 CONFIG_CRYPTO_CURVE25519=m
@@ -8530,17 +8708,13 @@ CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_SHA3=y
 CONFIG_CRYPTO_SM3=y
 # CONFIG_CRYPTO_STREEBOG is not set
-CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
 
 #
@@ -8559,7 +8733,6 @@ CONFIG_CRYPTO_CAST6=m
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_CHACHA20=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
@@ -8617,6 +8790,7 @@ CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
 CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
 # CONFIG_CRYPTO_DEV_ATMEL_SHA204A is not set
@@ -8635,6 +8809,7 @@ CONFIG_CRYPTO_DEV_CCREE=m
 # CONFIG_CRYPTO_DEV_HISI_SEC2 is not set
 # CONFIG_CRYPTO_DEV_HISI_ZIP is not set
 # CONFIG_CRYPTO_DEV_HISI_HPRE is not set
+# CONFIG_CRYPTO_DEV_HISI_TRNG is not set
 # CONFIG_CRYPTO_DEV_AMLOGIC_GXL is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
@@ -8642,6 +8817,8 @@ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
 # CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
 CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
 
 #
 # Certificates for signature checking
@@ -8653,6 +8830,8 @@ CONFIG_SYSTEM_TRUSTED_KEYS=""
 # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 # end of Certificates for signature checking
 
+CONFIG_BINARY_PRINTF=y
+
 #
 # Library routines
 #
@@ -8665,6 +8844,7 @@ CONFIG_HAVE_ARCH_BITREVERSE=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
 CONFIG_CORDIC=m
 # CONFIG_PRIME_NUMBERS is not set
 CONFIG_RATIONAL=y
@@ -8745,6 +8925,7 @@ CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y
 CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y
 CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y
 CONFIG_SWIOTLB=y
+# CONFIG_DMA_RESTRICTED_POOL is not set
 CONFIG_DMA_NONCOHERENT_MMAP=y
 CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_REMAP=y
@@ -8762,6 +8943,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MAX is not set
 CONFIG_CMA_ALIGNMENT=8
 # CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DMA_MAP_BENCHMARK is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
@@ -8788,9 +8970,11 @@ CONFIG_SG_POOL=y
 CONFIG_MEMREGION=y
 CONFIG_ARCH_STACKWALK=y
 CONFIG_SBITMAP=y
-# CONFIG_STRING_SELFTEST is not set
 # end of Library routines
 
+CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_ASN1_ENCODER=m
+
 #
 # Kernel hacking
 #
@@ -8800,6 +8984,7 @@ CONFIG_SBITMAP=y
 #
 CONFIG_PRINTK_TIME=y
 # CONFIG_PRINTK_CALLER is not set
+# CONFIG_STACKTRACE_BUILD_ID is not set
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
@@ -8814,16 +8999,16 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # Compile-time checks and compiler options
 #
 # CONFIG_DEBUG_INFO is not set
-CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_HEADERS_INSTALL is not set
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set
+# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
+# CONFIG_VMLINUX_MAP is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # end of Compile-time checks and compiler options
 
@@ -8882,9 +9067,13 @@ CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
+CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
+CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
 CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
 # CONFIG_KASAN is not set
+CONFIG_HAVE_ARCH_KFENCE=y
+# CONFIG_KFENCE is not set
 # end of Memory Debugging
 
 # CONFIG_DEBUG_SHIRQ is not set
@@ -8937,10 +9126,10 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 # CONFIG_CSD_LOCK_WAIT_DEBUG is not set
 # end of Lock Debugging (spinlocks, mutexes, etc...)
 
+# CONFIG_DEBUG_IRQFLAGS is not set
 CONFIG_STACKTRACE=y
 # CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
-CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 
 #
 # Debug kernel data structures
@@ -8967,7 +9156,6 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # end of RCU Debugging
 
 # CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
 # CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
 # CONFIG_LATENCYTOP is not set
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -8980,7 +9168,6 @@ CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACING_SUPPORT=y
 # CONFIG_FTRACE is not set
 # CONFIG_SAMPLES is not set
-CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_IO_STRICT_DEVMEM is not set
 
@@ -9003,6 +9190,7 @@ CONFIG_ARCH_HAS_KCOV=y
 CONFIG_CC_HAS_SANCOV_TRACE_PC=y
 # CONFIG_KCOV is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
+CONFIG_ARCH_USE_MEMTEST=y
 # CONFIG_MEMTEST is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
diff --git a/srcpkgs/pinebookpro-kernel/patches/0005-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch b/srcpkgs/pinebookpro-kernel/patches/0005-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
deleted file mode 100644
index 2dff40be4b93..000000000000
--- a/srcpkgs/pinebookpro-kernel/patches/0005-sound-soc-codecs-es8316-Run-micdetect-only-if-jack-s.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From bdf0ad5977e37d8415f53011f8f8495e0ebce152 Mon Sep 17 00:00:00 2001
-From: Tobias Schramm <t.schramm@manjaro.org>
-Date: Thu, 28 May 2020 14:34:47 +0200
-Subject: [PATCH 5/8] sound: soc: codecs: es8316: Run micdetect only if jack
- status asserted
-
-Think this is (was?) required to prevent flapping of detection status on
-the PBP.
-
-Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
----
- sound/soc/codecs/es8316.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
-index f9ec5cf82599..04bba9442060 100644
---- a/sound/soc/codecs/es8316.c
-+++ b/sound/soc/codecs/es8316.c
-@@ -688,7 +688,7 @@ static void es8316_disable_jack_detect(struct snd_soc_component *component)
- 	snd_soc_component_update_bits(component, ES8316_GPIO_DEBOUNCE,
- 				      ES8316_GPIO_ENABLE_INTERRUPT, 0);
- 
--	if (es8316->jack->status & SND_JACK_MICROPHONE) {
-+	if (es8316->jack && (es8316->jack->status & SND_JACK_MICROPHONE)) {
- 		es8316_disable_micbias_for_mic_gnd_short_detect(component);
- 		snd_soc_jack_report(es8316->jack, 0, SND_JACK_BTN_0);
- 	}
--- 
-2.29.2
-
diff --git a/srcpkgs/pinebookpro-kernel/patches/drm-rockchip-support-gamma-control-on-RK3399.patch b/srcpkgs/pinebookpro-kernel/patches/drm-rockchip-support-gamma-control-on-RK3399.patch
new file mode 100644
index 000000000000..7969b640d8a2
--- /dev/null
+++ b/srcpkgs/pinebookpro-kernel/patches/drm-rockchip-support-gamma-control-on-RK3399.patch
@@ -0,0 +1,667 @@
+Source: https://patchwork.kernel.org/project/linux-rockchip/patch/20211019215843.42718-2-sigmaris@gmail.com/
+Upstream: no
+
+From patchwork Tue Oct 19 21:58:41 2021
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Hugh Cole-Baker <sigmaris@gmail.com>
+X-Patchwork-Id: 12571177
+Return-Path: 
+ <SRS0=otL+=PH=lists.infradead.org=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@kernel.org>
+X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
+	aws-us-west-2-korg-lkml-1.web.codeaurora.org
+Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
+	by smtp.lore.kernel.org (Postfix) with ESMTP id EF2BCC43217
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 21:59:16 +0000 (UTC)
+Received: from bombadil.infradead.org (bombadil.infradead.org
+ [198.137.202.133])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by mail.kernel.org (Postfix) with ESMTPS id BADCF60FDA
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 21:59:16 +0000 (UTC)
+DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BADCF60FDA
+Authentication-Results: mail.kernel.org;
+ dmarc=fail (p=none dis=none) header.from=gmail.com
+Authentication-Results: mail.kernel.org;
+ spf=none smtp.mailfrom=lists.infradead.org
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+	d=lists.infradead.org; s=bombadil.20210309; h=Sender:
+	Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:
+	List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
+	Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:
+	Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
+	List-Owner; bh=EqcGhTXNHxLjs4GeNeyEmq5LQRaq+Myjxe15Omdo3zg=; b=WipF8awV3GyV0e
+	kgWAQIrKxNxmI+xZhPVMfYQrDKseHUh5l4MTVbElfsNAZnP6UY9y2RciAwS1T6QE6g7cWBToK+kSd
+	tgP1fTozzC6ykiWD4rvkUEDsthGCT1OC/xPjfMIBPVQk1TDVRY40iKHnmGz9kCRWsa09nkFDeslMW
+	ZoAV7QxTXvFpqflmFTe887J37+PxeSsqAtjUZwjrdTip6oybHVhd9q6eVrVPNz0c3EzopeFx/kOOm
+	Wvt2AWng+UCxTZoTZugNQBOBfOsv/QQgLfg0q9V6kNHycJtcevP6GsyYGZ+0LabMaqckOh9RK7O4x
+	Co47MeIsJRvrSAP295ng==;
+Received: from localhost ([::1] helo=bombadil.infradead.org)
+	by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))
+	id 1mcx8a-002irO-35; Tue, 19 Oct 2021 21:59:12 +0000
+Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e])
+ by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))
+ id 1mcx8J-002ihZ-Mf; Tue, 19 Oct 2021 21:58:57 +0000
+Received: by mail-wm1-x32e.google.com with SMTP id
+ z77-20020a1c7e50000000b0030db7b70b6bso5870939wmc.1;
+ Tue, 19 Oct 2021 14:58:54 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
+ h=from:to:cc:subject:date:message-id:in-reply-to:references
+ :mime-version:content-transfer-encoding;
+ bh=Ws77StmGP8OqTFmlkQUufLolF3RfQn4nI0VMLqEcX8s=;
+ b=dGZQ8Q3orJrTzIZ4Gs9rn9dr9PAu9PCjkmUK5Lr6UkhpNzYMcMd3020nPpiG6Sqqpy
+ iLRrSxDSXQ7kSYllOPk2BtvQUGsDdBHD7NGzfb5c2CazkxrvtoLOMJXxZabDfp9dJ33y
+ Nc6l+vslIYyFBqsf5MjBRyT1WWM8BbqdLViNK1jE0RWT9LaZ+QLmNI1goCpLxyjClx5q
+ BHWHbXcWTtSRVC5h7zAbVkeTp5sxkU/JgDJP/NlgaeLhv5fT3vRPg7iwOgHc91kIXC5y
+ UrXcfWoKPWR5+n9loBQ6PqrQbibvW07GBRJNMSRCw72SB0r9diQgYYeWronJNwIqWDmB
+ vHpg==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20210112;
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
+ :references:mime-version:content-transfer-encoding;
+ bh=Ws77StmGP8OqTFmlkQUufLolF3RfQn4nI0VMLqEcX8s=;
+ b=sxveNLJpyeHIxAc0lLGzMi6dTwpuj5EC2Nq5+ypLTJu+vH83R/yV+whpVpI4yQbNQZ
+ uZfjds+vUF8T/kr+k9v72xQGg5VmtKIm4Al4j8+OdPupdsjUqwymsp40RUA476Pc1yX+
+ DjIRdfFWS6YDp5foNGlLXHefuI4S/4fvGmW53BI7ZoEGldia25la5PCHUspe2VZI4Lgn
+ ZchGK4aT1RbEL0KBThFjSVt4mGon+KeHk8bjW5CI4EUuAAf4/jpppC69B5Cy+myMU/WE
+ Tujt2FKA0MGVxprviL1MniA81m5IEvewvG5eZhO59TnXKq+XY47lK0n5TGag9jEdT2LT
+ fcsg==
+X-Gm-Message-State: AOAM533AZaW6ntLxS4JBa7mC0O7lveBcmLsJQF9kcmDdUxInS38G3xBI
+ I/e9THNRFXBr5BPQpV/GwEc=
+X-Google-Smtp-Source: 
+ ABdhPJxlnImj2nZarYrS7pboEsot76oZv/a0I0DfIZ6Yn6Tqye98tM7z2na6Er6vRQMM1xsYYiNxOg==
+X-Received: by 2002:adf:97d0:: with SMTP id
+ t16mr45716779wrb.124.1634680732995;
+ Tue, 19 Oct 2021 14:58:52 -0700 (PDT)
+Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165])
+ by smtp.gmail.com with ESMTPSA id s3sm178540wrm.40.2021.10.19.14.58.52
+ (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
+ Tue, 19 Oct 2021 14:58:52 -0700 (PDT)
+From: Hugh Cole-Baker <sigmaris@gmail.com>
+To: heiko@sntech.de,
+	hjc@rock-chips.com
+Cc: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org,
+ linux-arm-kernel@lists.infradead.org, ezequiel@collabora.com,
+ Hugh Cole-Baker <sigmaris@gmail.com>
+Subject: [PATCH v2 1/3] drm/rockchip: define gamma registers for RK3399
+Date: Tue, 19 Oct 2021 22:58:41 +0100
+Message-Id: <20211019215843.42718-2-sigmaris@gmail.com>
+X-Mailer: git-send-email 2.24.3 (Apple Git-128)
+In-Reply-To: <20211019215843.42718-1-sigmaris@gmail.com>
+References: <20211019215843.42718-1-sigmaris@gmail.com>
+MIME-Version: 1.0
+X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
+X-CRM114-CacheID: sfid-20211019_145855_763472_DAE885F2 
+X-CRM114-Status: GOOD (  15.39  )
+X-BeenThere: linux-rockchip@lists.infradead.org
+X-Mailman-Version: 2.1.34
+Precedence: list
+List-Id: Upstream kernel work for Rockchip platforms
+ <linux-rockchip.lists.infradead.org>
+List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=unsubscribe>
+List-Archive: <http://lists.infradead.org/pipermail/linux-rockchip/>
+List-Post: <mailto:linux-rockchip@lists.infradead.org>
+List-Help: <mailto:linux-rockchip-request@lists.infradead.org?subject=help>
+List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=subscribe>
+Sender: "Linux-rockchip" <linux-rockchip-bounces@lists.infradead.org>
+Errors-To: 
+ linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org
+
+The VOP on RK3399 has a different approach from previous versions for
+setting a gamma lookup table, using an update_gamma_lut register. As
+this differs from RK3288, give RK3399 its own set of "common" register
+definitions.
+
+Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com>
+---
+
+Changes from v1: no changes in this patch
+
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.h |  2 ++
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 24 +++++++++++++++++++--
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.h |  1 +
+ 3 files changed, 25 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
+index 857d97cdc67c..14179e89bd21 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
++++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h
+@@ -99,6 +99,8 @@ struct vop_common {
+ 	struct vop_reg dither_down_en;
+ 	struct vop_reg dither_up;
+ 	struct vop_reg dsp_lut_en;
++	struct vop_reg update_gamma_lut;
++	struct vop_reg lut_buffer_index;
+ 	struct vop_reg gate_en;
+ 	struct vop_reg mmu_en;
+ 	struct vop_reg out_mode;
+diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+index ca7cc82125cb..bfb7e130f09b 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
++++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c
+@@ -865,6 +865,24 @@ static const struct vop_output rk3399_output = {
+ 	.mipi_dual_channel_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 3),
+ };
+ 
++static const struct vop_common rk3399_common = {
++	.standby = VOP_REG_SYNC(RK3399_SYS_CTRL, 0x1, 22),
++	.gate_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 23),
++	.mmu_en = VOP_REG(RK3399_SYS_CTRL, 0x1, 20),
++	.dither_down_sel = VOP_REG(RK3399_DSP_CTRL1, 0x1, 4),
++	.dither_down_mode = VOP_REG(RK3399_DSP_CTRL1, 0x1, 3),
++	.dither_down_en = VOP_REG(RK3399_DSP_CTRL1, 0x1, 2),
++	.pre_dither_down = VOP_REG(RK3399_DSP_CTRL1, 0x1, 1),
++	.dither_up = VOP_REG(RK3399_DSP_CTRL1, 0x1, 6),
++	.dsp_lut_en = VOP_REG(RK3399_DSP_CTRL1, 0x1, 0),
++	.update_gamma_lut = VOP_REG(RK3399_DSP_CTRL1, 0x1, 7),
++	.lut_buffer_index = VOP_REG(RK3399_DBG_POST_REG1, 0x1, 1),
++	.data_blank = VOP_REG(RK3399_DSP_CTRL0, 0x1, 19),
++	.dsp_blank = VOP_REG(RK3399_DSP_CTRL0, 0x3, 18),
++	.out_mode = VOP_REG(RK3399_DSP_CTRL0, 0xf, 0),
++	.cfg_done = VOP_REG_SYNC(RK3399_REG_CFG_DONE, 0x1, 0),
++};
++
+ static const struct vop_yuv2yuv_phy rk3399_yuv2yuv_win01_data = {
+ 	.y2r_coefficients = {
+ 		VOP_REG(RK3399_WIN0_YUV2YUV_Y2R + 0, 0xffff, 0),
+@@ -944,7 +962,7 @@ static const struct vop_data rk3399_vop_big = {
+ 	.version = VOP_VERSION(3, 5),
+ 	.feature = VOP_FEATURE_OUTPUT_RGB10,
+ 	.intr = &rk3366_vop_intr,
+-	.common = &rk3288_common,
++	.common = &rk3399_common,
+ 	.modeset = &rk3288_modeset,
+ 	.output = &rk3399_output,
+ 	.afbc = &rk3399_vop_afbc,
+@@ -952,6 +970,7 @@ static const struct vop_data rk3399_vop_big = {
+ 	.win = rk3399_vop_win_data,
+ 	.win_size = ARRAY_SIZE(rk3399_vop_win_data),
+ 	.win_yuv2yuv = rk3399_vop_big_win_yuv2yuv_data,
++	.lut_size = 1024,
+ };
+ 
+ static const struct vop_win_data rk3399_vop_lit_win_data[] = {
+@@ -970,13 +989,14 @@ static const struct vop_win_yuv2yuv_data rk3399_vop_lit_win_yuv2yuv_data[] = {
+ static const struct vop_data rk3399_vop_lit = {
+ 	.version = VOP_VERSION(3, 6),
+ 	.intr = &rk3366_vop_intr,
+-	.common = &rk3288_common,
++	.common = &rk3399_common,
+ 	.modeset = &rk3288_modeset,
+ 	.output = &rk3399_output,
+ 	.misc = &rk3368_misc,
+ 	.win = rk3399_vop_lit_win_data,
+ 	.win_size = ARRAY_SIZE(rk3399_vop_lit_win_data),
+ 	.win_yuv2yuv = rk3399_vop_lit_win_yuv2yuv_data,
++	.lut_size = 256,
+ };
+ 
+ static const struct vop_win_data rk3228_vop_win_data[] = {
+diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h
+index 0b3cd65ba5c1..406e981c75bd 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h
++++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h
+@@ -628,6 +628,7 @@
+ #define RK3399_YUV2YUV_WIN			0x02c0
+ #define RK3399_YUV2YUV_POST			0x02c4
+ #define RK3399_AUTO_GATING_EN			0x02cc
++#define RK3399_DBG_POST_REG1			0x036c
+ #define RK3399_WIN0_CSC_COE			0x03a0
+ #define RK3399_WIN1_CSC_COE			0x03c0
+ #define RK3399_WIN2_CSC_COE			0x03e0
+
+From patchwork Tue Oct 19 21:58:42 2021
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Hugh Cole-Baker <sigmaris@gmail.com>
+X-Patchwork-Id: 12571179
+Return-Path: 
+ <SRS0=otL+=PH=lists.infradead.org=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@kernel.org>
+X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
+	aws-us-west-2-korg-lkml-1.web.codeaurora.org
+Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
+	by smtp.lore.kernel.org (Postfix) with ESMTP id 85B47C433F5
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 21:59:33 +0000 (UTC)
+Received: from bombadil.infradead.org (bombadil.infradead.org
+ [198.137.202.133])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by mail.kernel.org (Postfix) with ESMTPS id 595856113D
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 21:59:33 +0000 (UTC)
+DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 595856113D
+Authentication-Results: mail.kernel.org;
+ dmarc=fail (p=none dis=none) header.from=gmail.com
+Authentication-Results: mail.kernel.org;
+ spf=none smtp.mailfrom=lists.infradead.org
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+	d=lists.infradead.org; s=bombadil.20210309; h=Sender:
+	Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:
+	List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
+	Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:
+	Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
+	List-Owner; bh=tHyvTqRKxrtKIbj34MYknHzX+yLAnQqh47VxQue4tCk=; b=jZnpTJ3DoyBMFy
+	53BFSj7Q2F7I6UvGzGrARdwtdy/GdZOQriN9rtqp0Jw6BHj/n2ercvi7m71vOUSovvx5MTV4NmCHa
+	UDHYDeQJSdRDxwq86bhU3kAZWb4EPkIrrXqZ0uEhA0f5w7dEwSw3r+3PpE15K6XFrVytUJNtcOxmZ
+	LUmJC4Q/ngOkxLB5um91h4YwdKXvfQkioiuaDwY49q0TzExLe5l9Ujt3HYxIvs1DcKJkbP+PtKO5W
+	K7osyX7sJvMa1NDDZf3Od/aDgOx0wAeiSetnxvN5vEdcirsNTfBcizUMdSrJMJOX+6rl1qKXe+MDu
+	1q72eLFjWmMphhJFlPGg==;
+Received: from localhost ([::1] helo=bombadil.infradead.org)
+	by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))
+	id 1mcx8r-002j2z-88; Tue, 19 Oct 2021 21:59:29 +0000
+Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333])
+ by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))
+ id 1mcx8P-002ikY-5a; Tue, 19 Oct 2021 21:59:03 +0000
+Received: by mail-wm1-x333.google.com with SMTP id
+ n40-20020a05600c3ba800b0030da2439b21so5894295wms.0;
+ Tue, 19 Oct 2021 14:59:01 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
+ h=from:to:cc:subject:date:message-id:in-reply-to:references
+ :mime-version:content-transfer-encoding;
+ bh=Q2/puQXisdIHy96scnY39dLOhAgOrf8qFIVS4zmDucw=;
+ b=mdJBK7nOU5EfOez2g0KuQcjPX1mqo1Yu1pyUoN+Yonchoy51OiK+gS5SHgjrEoxpOG
+ sDimMoXQXXfpFuyMt5InbeCA1ma78VxZZywXFdfahXW4HKbUjs2tnVUa+itAc40a/Lut
+ NxF/KtplJGjsU6gnEIouvEaFfzpcZMzpxv8D9kRUTed0sDtlerGTRROHvnHK6Pw2okZY
+ QRFluqjW3Vn4uKF7VXKbxGVFIj+s47JoFGFp45q5EuEIhsZUbBnh5vSeuhbfmUIGk//P
+ gFNhLcrUXRMbHK5TsyZLzZ7hZifip4eO5zDxP0adM8Pl2bLFIKMZ31phyOxVwysjxCxu
+ PDWg==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20210112;
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
+ :references:mime-version:content-transfer-encoding;
+ bh=Q2/puQXisdIHy96scnY39dLOhAgOrf8qFIVS4zmDucw=;
+ b=jn+JsIGvDA601iU5jMDQWABrrTP4pgk3O2OZBgof0QYw8ggY8zxTe/efUUPyXJIGTE
+ 2m3iE3Pcv5gj7Dcj4PIhzOg8zqSe1DU6P0hNO2BUxjZtLbEFis1NIct0ETnSFadB1BQB
+ ysjv58mVj+CNTkOB4SC7pZG3YnB9kiALfn5srFP5QIZbH7zEkUmlcC68MCiTovkam5VZ
+ edpald9X31meuqO248k3kWflmGaPoFpYgKDGHB1+gHVwrz/zdHEOfyW+ywMCqhAz9Ips
+ bHdQrFXJhfBm73e/YpzMo+CGW2pKgwVwKvgfaYk70AaV21ZQwmVchdrKL+JbaqB3Pb8M
+ q98A==
+X-Gm-Message-State: AOAM5310Qyqstssdsu0x76uWY5DcBoeRppvU7QgcaPxDqN1ox6+rbUCB
+ 8ZjpkAW88saV2ZLk3LFE/SY=
+X-Google-Smtp-Source: 
+ ABdhPJyH6EYKD5Zz7cAvlgR25QY6isGkEOndRqrg115y3IbztxMbNkQ417bBT6OIYq5kolH2WJ4Otw==
+X-Received: by 2002:a05:600c:1d05:: with SMTP id
+ l5mr7158510wms.97.1634680737804;
+ Tue, 19 Oct 2021 14:58:57 -0700 (PDT)
+Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165])
+ by smtp.gmail.com with ESMTPSA id s3sm178540wrm.40.2021.10.19.14.58.57
+ (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
+ Tue, 19 Oct 2021 14:58:57 -0700 (PDT)
+From: Hugh Cole-Baker <sigmaris@gmail.com>
+To: heiko@sntech.de,
+	hjc@rock-chips.com
+Cc: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org,
+ linux-arm-kernel@lists.infradead.org, ezequiel@collabora.com,
+ Hugh Cole-Baker <sigmaris@gmail.com>
+Subject: [PATCH v2 2/3] drm/rockchip: support gamma control on RK3399
+Date: Tue, 19 Oct 2021 22:58:42 +0100
+Message-Id: <20211019215843.42718-3-sigmaris@gmail.com>
+X-Mailer: git-send-email 2.24.3 (Apple Git-128)
+In-Reply-To: <20211019215843.42718-1-sigmaris@gmail.com>
+References: <20211019215843.42718-1-sigmaris@gmail.com>
+MIME-Version: 1.0
+X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
+X-CRM114-CacheID: sfid-20211019_145901_258532_1013C062 
+X-CRM114-Status: GOOD (  23.54  )
+X-BeenThere: linux-rockchip@lists.infradead.org
+X-Mailman-Version: 2.1.34
+Precedence: list
+List-Id: Upstream kernel work for Rockchip platforms
+ <linux-rockchip.lists.infradead.org>
+List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=unsubscribe>
+List-Archive: <http://lists.infradead.org/pipermail/linux-rockchip/>
+List-Post: <mailto:linux-rockchip@lists.infradead.org>
+List-Help: <mailto:linux-rockchip-request@lists.infradead.org?subject=help>
+List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=subscribe>
+Sender: "Linux-rockchip" <linux-rockchip-bounces@lists.infradead.org>
+Errors-To: 
+ linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org
+
+The RK3399 has a 1024-entry gamma LUT with 10 bits per component on its
+"big" VOP and a 256-entry, 8 bit per component LUT on the "little" VOP.
+Compared to the RK3288, it no longer requires disabling gamma while
+updating the LUT. On the RK3399, the LUT can be updated at any time as
+the hardware has two LUT buffers, one can be written while the other is
+in use. A swap of the buffers is triggered by writing 1 to the
+update_gamma_lut register.
+
+Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com>
+---
+
+Changes from v1: Moved the vop_crtc_gamma_set call to the end of
+vop_crtc_atomic_enable after the clocks and CRTC are enabled.
+
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 105 +++++++++++++-------
+ 1 file changed, 71 insertions(+), 34 deletions(-)
+
+diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+index ba9e14da41b4..e2c97f1b26da 100644
+--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
++++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+@@ -9,6 +9,7 @@
+ #include <linux/delay.h>
+ #include <linux/iopoll.h>
+ #include <linux/kernel.h>
++#include <linux/log2.h>
+ #include <linux/module.h>
+ #include <linux/of.h>
+ #include <linux/of_device.h>
+@@ -66,6 +67,9 @@
+ #define VOP_REG_SET(vop, group, name, v) \
+ 		    vop_reg_set(vop, &vop->data->group->name, 0, ~0, v, #name)
+ 
++#define VOP_HAS_REG(vop, group, name) \
++		(!!(vop->data->group->name.mask))
++
+ #define VOP_INTR_SET_TYPE(vop, name, type, v) \
+ 	do { \
+ 		int i, reg = 0, mask = 0; \
+@@ -1204,17 +1208,22 @@ static bool vop_dsp_lut_is_enabled(struct vop *vop)
+ 	return vop_read_reg(vop, 0, &vop->data->common->dsp_lut_en);
+ }
+ 
++static u32 vop_lut_buffer_index(struct vop *vop)
++{
++	return vop_read_reg(vop, 0, &vop->data->common->lut_buffer_index);
++}
++
+ static void vop_crtc_write_gamma_lut(struct vop *vop, struct drm_crtc *crtc)
+ {
+ 	struct drm_color_lut *lut = crtc->state->gamma_lut->data;
+-	unsigned int i;
++	unsigned int i, bpc = ilog2(vop->data->lut_size);
+ 
+ 	for (i = 0; i < crtc->gamma_size; i++) {
+ 		u32 word;
+ 
+-		word = (drm_color_lut_extract(lut[i].red, 10) << 20) |
+-		       (drm_color_lut_extract(lut[i].green, 10) << 10) |
+-			drm_color_lut_extract(lut[i].blue, 10);
++		word = (drm_color_lut_extract(lut[i].red, bpc) << (2 * bpc)) |
++		       (drm_color_lut_extract(lut[i].green, bpc) << bpc) |
++			drm_color_lut_extract(lut[i].blue, bpc);
+ 		writel(word, vop->lut_regs + i * 4);
+ 	}
+ }
+@@ -1224,38 +1233,66 @@ static void vop_crtc_gamma_set(struct vop *vop, struct drm_crtc *crtc,
+ {
+ 	struct drm_crtc_state *state = crtc->state;
+ 	unsigned int idle;
++	u32 lut_idx, old_idx;
+ 	int ret;
+ 
+ 	if (!vop->lut_regs)
+ 		return;
+-	/*
+-	 * To disable gamma (gamma_lut is null) or to write
+-	 * an update to the LUT, clear dsp_lut_en.
+-	 */
+-	spin_lock(&vop->reg_lock);
+-	VOP_REG_SET(vop, common, dsp_lut_en, 0);
+-	vop_cfg_done(vop);
+-	spin_unlock(&vop->reg_lock);
+ 
+-	/*
+-	 * In order to write the LUT to the internal memory,
+-	 * we need to first make sure the dsp_lut_en bit is cleared.
+-	 */
+-	ret = readx_poll_timeout(vop_dsp_lut_is_enabled, vop,
+-				 idle, !idle, 5, 30 * 1000);
+-	if (ret) {
+-		DRM_DEV_ERROR(vop->dev, "display LUT RAM enable timeout!\n");
+-		return;
+-	}
++	if (!state->gamma_lut || !VOP_HAS_REG(vop, common, update_gamma_lut)) {
++		/*
++		 * To disable gamma (gamma_lut is null) or to write
++		 * an update to the LUT, clear dsp_lut_en.
++		 */
++		spin_lock(&vop->reg_lock);
++		VOP_REG_SET(vop, common, dsp_lut_en, 0);
++		vop_cfg_done(vop);
++		spin_unlock(&vop->reg_lock);
+ 
+-	if (!state->gamma_lut)
+-		return;
++		/*
++		 * In order to write the LUT to the internal memory,
++		 * we need to first make sure the dsp_lut_en bit is cleared.
++		 */
++		ret = readx_poll_timeout(vop_dsp_lut_is_enabled, vop,
++					 idle, !idle, 5, 30 * 1000);
++		if (ret) {
++			DRM_DEV_ERROR(vop->dev, "display LUT RAM enable timeout!\n");
++			return;
++		}
++
++		if (!state->gamma_lut)
++			return;
++	} else {
++		/*
++		 * On RK3399 the gamma LUT can updated without clearing dsp_lut_en,
++		 * by setting update_gamma_lut then waiting for lut_buffer_index change
++		 */
++		old_idx = vop_lut_buffer_index(vop);
++	}
+ 
+ 	spin_lock(&vop->reg_lock);
+ 	vop_crtc_write_gamma_lut(vop, crtc);
+ 	VOP_REG_SET(vop, common, dsp_lut_en, 1);
++	VOP_REG_SET(vop, common, update_gamma_lut, 1);
+ 	vop_cfg_done(vop);
+ 	spin_unlock(&vop->reg_lock);
++
++	if (VOP_HAS_REG(vop, common, update_gamma_lut)) {
++		ret = readx_poll_timeout(vop_lut_buffer_index, vop,
++					 lut_idx, lut_idx != old_idx, 5, 30 * 1000);
++		if (ret) {
++			DRM_DEV_ERROR(vop->dev, "gamma LUT update timeout!\n");
++			return;
++		}
++
++		/*
++		 * update_gamma_lut is auto cleared by HW, but write 0 to clear the bit
++		 * in our backup of the regs.
++		 */
++		spin_lock(&vop->reg_lock);
++		VOP_REG_SET(vop, common, update_gamma_lut, 0);
++		spin_unlock(&vop->reg_lock);
++	}
+ }
+ 
+ static void vop_crtc_atomic_begin(struct drm_crtc *crtc,
+@@ -1305,14 +1342,6 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc,
+ 		return;
+ 	}
+ 
+-	/*
+-	 * If we have a GAMMA LUT in the state, then let's make sure
+-	 * it's updated. We might be coming out of suspend,
+-	 * which means the LUT internal memory needs to be re-written.
+-	 */
+-	if (crtc->state->gamma_lut)
+-		vop_crtc_gamma_set(vop, crtc, old_state);
+-
+ 	mutex_lock(&vop->vop_lock);
+ 
+ 	WARN_ON(vop->event);
+@@ -1403,6 +1432,14 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc,
+ 
+ 	VOP_REG_SET(vop, common, standby, 0);
+ 	mutex_unlock(&vop->vop_lock);
++
++	/*
++	 * If we have a GAMMA LUT in the state, then let's make sure
++	 * it's updated. We might be coming out of suspend,
++	 * which means the LUT internal memory needs to be re-written.
++	 */
++	if (crtc->state->gamma_lut)
++		vop_crtc_gamma_set(vop, crtc, old_state);
+ }
+ 
+ static bool vop_fs_irq_is_pending(struct vop *vop)
+@@ -2125,8 +2162,8 @@ static int vop_bind(struct device *dev, struct device *master, void *data)
+ 
+ 	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ 	if (res) {
+-		if (!vop_data->lut_size) {
+-			DRM_DEV_ERROR(dev, "no gamma LUT size defined\n");
++		if (vop_data->lut_size != 1024 && vop_data->lut_size != 256) {
++			DRM_DEV_ERROR(dev, "unsupported gamma LUT size %d\n", vop_data->lut_size);
+ 			return -EINVAL;
+ 		}
+ 		vop->lut_regs = devm_ioremap_resource(dev, res);
+
+From patchwork Tue Oct 19 21:58:43 2021
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Hugh Cole-Baker <sigmaris@gmail.com>
+X-Patchwork-Id: 12571181
+Return-Path: 
+ <SRS0=otL+=PH=lists.infradead.org=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@kernel.org>
+X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
+	aws-us-west-2-korg-lkml-1.web.codeaurora.org
+Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
+	by smtp.lore.kernel.org (Postfix) with ESMTP id 6D49BC433F5
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 22:00:01 +0000 (UTC)
+Received: from bombadil.infradead.org (bombadil.infradead.org
+ [198.137.202.133])
+	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by mail.kernel.org (Postfix) with ESMTPS id 2FA4660FDA
+	for <linux-rockchip@archiver.kernel.org>;
+ Tue, 19 Oct 2021 22:00:01 +0000 (UTC)
+DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2FA4660FDA
+Authentication-Results: mail.kernel.org;
+ dmarc=fail (p=none dis=none) header.from=gmail.com
+Authentication-Results: mail.kernel.org;
+ spf=none smtp.mailfrom=lists.infradead.org
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+	d=lists.infradead.org; s=bombadil.20210309; h=Sender:
+	Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:
+	List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
+	Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:
+	Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
+	List-Owner; bh=x6/d2diqqgTC0AwbnyEkOK36w4vwRzp43AaTU68aj5M=; b=wkiGia5/EwS6cQ
+	SuVhyaTwREo92OuMyUFAEaHlaZXJMke3RttvX7iZ6ppbhCetp+wP0NzQTHAgryAGolioWpRPr8Bqa
+	yjYRAS/Lt6PEyPQAWwK8AgGZTi+ZjtP+eJiH4GMdXd/D0puZXnwfWZK/HvZDtTk882s6clzgQylG5
+	nzNX86FCOLlAsuwNDZ6nOLDw3W+A2X5Ii++oF/gAjegyzYxXoton/PnPqq4eLXggmefeHypIfo4Sk
+	HzWEL/d4eWtI2Jwyi+q8LkuTKcnhdYhDlDcvdX771PJCkq/YhcpC+i65AWiL5hB2opn5q/Z6FozHW
+	7viWXFDhM90u9a/5zWJg==;
+Received: from localhost ([::1] helo=bombadil.infradead.org)
+	by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))
+	id 1mcx9I-002jH5-CN; Tue, 19 Oct 2021 21:59:56 +0000
+Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332])
+ by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))
+ id 1mcx8P-002ikX-LK; Tue, 19 Oct 2021 21:59:04 +0000
+Received: by mail-wm1-x332.google.com with SMTP id
+ a140-20020a1c7f92000000b0030d8315b593so5820655wmd.5;
+ Tue, 19 Oct 2021 14:59:00 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
+ h=from:to:cc:subject:date:message-id:in-reply-to:references
+ :mime-version:content-transfer-encoding;
+ bh=uCZAM1vvyZIsuTswhisB5UCt6gNS7FCdaVGaaFS3YV4=;
+ b=N9x2DcoC3Zq7l+EXYxzzDvYTGb6e0oKBL/owgOeCIM34js4lC6qA/TCA1k1opUXEUK
+ iJyLxAfyGd/1irS6OFaK6/VaWbkuhUSrXcg5VejFWZOTCNEheBAERgim9vZebgpODSTB
+ 0zfpE8VREGwYumyR5wQB7OI+ZVttjvlGw4zUdGt1trfhORiUkTkmFI/a6PYbJB9TlFRb
+ I4/WknNvC/do0cuW/idOQdbadmwvcobJTrlHbgf+cZmrX4RxL7vwtJjMvYku0e8WGnjY
+ iS38SlU6UOMwxnLaCRBqu8RVDT19yUl9mcbSU9vrJpfbI91HZeeKpD3RKOsshqR4E+dm
+ lwBQ==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20210112;
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
+ :references:mime-version:content-transfer-encoding;
+ bh=uCZAM1vvyZIsuTswhisB5UCt6gNS7FCdaVGaaFS3YV4=;
+ b=ZtozeJ/Sb8WHJMd0KU8pz9+jU0TGMxtub9urEkLpu0peP+z2iuJ2IC1R1fHuveNHM9
+ qHCTWYIko+2U8h6BiSzTBkwKYqtNCH+3e85ImJhtwyX6QbEcNfwrOrShf+PSsYkfunx1
+ 0CBcvHQB3SMQ983RS4X8YXtjeKYhUhJtCq45tsXs2DiMPP1/NiiNRQvqFnX+mlbRos0f
+ 1XrbESWVB/tYzAtCRK2IIyD7dtp8BYkhoudKR0Z0Hc1Q6BomDWFG9H0VV3yNWRgHwdp3
+ FN+/YFLCLWmVhGZclMvqFYxIKZpr9nWPpTx6TYTWKFpPCTm4wtv3+U6EakPiCKZdZ84f
+ SKJw==
+X-Gm-Message-State: AOAM532tmkKpoFPpmG1bg92UfYgCYfs57494dXW9qNEbXkobGNhzn4uH
+ U3AFIO+Y+oMp3e1o2nrxeyTtLUEVnPd/ho9y
+X-Google-Smtp-Source: 
+ ABdhPJxx3QAL6lyP35xXPqTB47LPyaFAa19cRinJBEnDBpBQBMv+2xmSW5ECPRIbVOY9Eer57KphDw==
+X-Received: by 2002:adf:a413:: with SMTP id
+ d19mr48203915wra.246.1634680739774;
+ Tue, 19 Oct 2021 14:58:59 -0700 (PDT)
+Received: from apple.sigmaris.info (ebrouter.sigmaris.info. [82.69.107.165])
+ by smtp.gmail.com with ESMTPSA id s3sm178540wrm.40.2021.10.19.14.58.59
+ (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
+ Tue, 19 Oct 2021 14:58:59 -0700 (PDT)
+From: Hugh Cole-Baker <sigmaris@gmail.com>
+To: heiko@sntech.de,
+	hjc@rock-chips.com
+Cc: dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org,
+ linux-arm-kernel@lists.infradead.org, ezequiel@collabora.com,
+ Hugh Cole-Baker <sigmaris@gmail.com>
+Subject: [PATCH v2 3/3] arm64: dts: rockchip: enable gamma control on RK3399
+Date: Tue, 19 Oct 2021 22:58:43 +0100
+Message-Id: <20211019215843.42718-4-sigmaris@gmail.com>
+X-Mailer: git-send-email 2.24.3 (Apple Git-128)
+In-Reply-To: <20211019215843.42718-1-sigmaris@gmail.com>
+References: <20211019215843.42718-1-sigmaris@gmail.com>
+MIME-Version: 1.0
+X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
+X-CRM114-CacheID: sfid-20211019_145901_757551_331C36C9 
+X-CRM114-Status: GOOD (  11.48  )
+X-BeenThere: linux-rockchip@lists.infradead.org
+X-Mailman-Version: 2.1.34
+Precedence: list
+List-Id: Upstream kernel work for Rockchip platforms
+ <linux-rockchip.lists.infradead.org>
+List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=unsubscribe>
+List-Archive: <http://lists.infradead.org/pipermail/linux-rockchip/>
+List-Post: <mailto:linux-rockchip@lists.infradead.org>
+List-Help: <mailto:linux-rockchip-request@lists.infradead.org?subject=help>
+List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-rockchip>,
+ <mailto:linux-rockchip-request@lists.infradead.org?subject=subscribe>
+Sender: "Linux-rockchip" <linux-rockchip-bounces@lists.infradead.org>
+Errors-To: 
+ linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org
+
+Define the memory region on RK3399 VOPs containing the gamma LUT at
+base+0x2000.
+
+Signed-off-by: Hugh Cole-Baker <sigmaris@gmail.com>
+---
+
+Changes from v1: no changes in this patch
+
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+index 3871c7fd83b0..9cbf6ccdd256 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+@@ -1619,7 +1619,7 @@ i2s2: i2s@ff8a0000 {
+ 
+ 	vopl: vop@ff8f0000 {
+ 		compatible = "rockchip,rk3399-vop-lit";
+-		reg = <0x0 0xff8f0000 0x0 0x3efc>;
++		reg = <0x0 0xff8f0000 0x0 0x2000>, <0x0 0xff8f2000 0x0 0x400>;
+ 		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
+ 		assigned-clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
+ 		assigned-clock-rates = <400000000>, <100000000>;
+@@ -1676,7 +1676,7 @@ vopl_mmu: iommu@ff8f3f00 {
+ 
+ 	vopb: vop@ff900000 {
+ 		compatible = "rockchip,rk3399-vop-big";
+-		reg = <0x0 0xff900000 0x0 0x3efc>;
++		reg = <0x0 0xff900000 0x0 0x2000>, <0x0 0xff902000 0x0 0x1000>;
+ 		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
+ 		assigned-clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
+ 		assigned-clock-rates = <400000000>, <100000000>;
diff --git a/srcpkgs/pinebookpro-kernel/patches/pbp-dpaltmode.patch b/srcpkgs/pinebookpro-kernel/patches/pbp-dpaltmode.patch
new file mode 100644
index 000000000000..4b65ea4e41e4
--- /dev/null
+++ b/srcpkgs/pinebookpro-kernel/patches/pbp-dpaltmode.patch
@@ -0,0 +1,854 @@
+Source: https://megous.com/git/linux
+Upstream: no
+
+From 1fc012b18f91abf70e9ab8cbdef2f0e47e80c14e Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sun, 7 Nov 2021 19:28:27 +0100
+Subject: usb: typec: fusb302: Set the current before enabling pullups
+
+This seems more reasonable and should avoid short period of incorrect
+current setting being applied to CC pin.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/tcpm/fusb302.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
+index 72f9001b0792..776a949ef6e3 100644
+--- a/drivers/usb/typec/tcpm/fusb302.c
++++ b/drivers/usb/typec/tcpm/fusb302.c
+@@ -635,6 +635,14 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
+ 		goto done;
+ 	}
+ 
++	/* adjust current for SRC */
++	ret = fusb302_set_src_current(chip, cc_src_current[cc]);
++	if (ret < 0) {
++		fusb302_log(chip, "cannot set src current %s, ret=%d",
++			    typec_cc_status_name[cc], ret);
++		goto done;
++	}
++
+ 	ret = fusb302_i2c_mask_write(chip, FUSB_REG_SWITCHES0,
+ 				     switches0_mask, switches0_data);
+ 	if (ret < 0) {
+@@ -645,14 +653,6 @@ static int tcpm_set_cc(struct tcpc_dev *dev, enum typec_cc_status cc)
+ 	chip->cc1 = TYPEC_CC_OPEN;
+ 	chip->cc2 = TYPEC_CC_OPEN;
+ 
+-	/* adjust current for SRC */
+-	ret = fusb302_set_src_current(chip, cc_src_current[cc]);
+-	if (ret < 0) {
+-		fusb302_log(chip, "cannot set src current %s, ret=%d",
+-			    typec_cc_status_name[cc], ret);
+-		goto done;
+-	}
+-
+ 	/* enable/disable interrupts, BC_LVL for SNK and COMP_CHNG for SRC */
+ 	switch (cc) {
+ 	case TYPEC_CC_RP_DEF:
+-- 
+cgit v1.2.3
+
+From cd26cebee9bf5e0a1a064d391195db761dbf40a6 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Tue, 23 Nov 2021 17:57:06 +0100
+Subject: usb: typec: fusb302: Update VBUS state even if VBUS interrupt is not
+ triggered
+
+This seems to improve robustness.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/tcpm/fusb302.c | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
+index 70b0e15992af..1d5affaabcf3 100644
+--- a/drivers/usb/typec/tcpm/fusb302.c
++++ b/drivers/usb/typec/tcpm/fusb302.c
+@@ -1716,14 +1716,16 @@ static void fusb302_irq_work(struct work_struct *work)
+ 
+ 	fusb302_print_state(chip);
+ 
+-	if (interrupt & FUSB_REG_INTERRUPT_VBUSOK) {
+-		vbus_present = !!(status0 & FUSB_REG_STATUS0_VBUSOK);
++	vbus_present = !!(status0 & FUSB_REG_STATUS0_VBUSOK);
++	if (interrupt & FUSB_REG_INTERRUPT_VBUSOK)
+ 		fusb302_log(chip, "IRQ: VBUS_OK, vbus=%s",
+ 			    vbus_present ? "On" : "Off");
+-		if (vbus_present != chip->vbus_present) {
+-			chip->vbus_present = vbus_present;
+-			tcpm_vbus_change(chip->tcpm_port);
+-		}
++	if (vbus_present != chip->vbus_present) {
++		chip->vbus_present = vbus_present;
++		if (!(interrupt & FUSB_REG_INTERRUPT_VBUSOK))
++		fusb302_log(chip, "IRQ: VBUS changed without interrupt, vbus=%s",
++			    vbus_present ? "On" : "Off");
++		tcpm_vbus_change(chip->tcpm_port);
+ 	}
+ 
+ 	if (interrupta & FUSB_REG_INTERRUPTA_TOGDONE) {
+-- 
+cgit v1.2.3
+
+From a8e657e94f489297fa7d80767980730207ebb1bd Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sun, 14 Nov 2021 01:14:25 +0100
+Subject: usb: typec: fusb302: Add OF extcon support
+
+It's possible to create a dependency cycle between fusb302 and
+other drivers via extcon device, so we retrieve the device on
+demand after probe and not during probe.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/tcpm/fusb302.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
+index ae3b930d774f..0c5dd0058f5e 100644
+--- a/drivers/usb/typec/tcpm/fusb302.c
++++ b/drivers/usb/typec/tcpm/fusb302.c
+@@ -518,6 +518,16 @@ static int tcpm_get_current_limit(struct tcpc_dev *dev)
+ 	int current_limit = 0;
+ 	unsigned long timeout;
+ 
++	/*
++	 * To avoid cycles in OF dependencies, we get extcon when necessary
++	 * outside of probe function.
++	 */
++	if (of_property_read_bool(chip->dev->of_node, "extcon") && !chip->extcon) {
++		chip->extcon = extcon_get_edev_by_phandle(chip->dev, 0);
++		if (IS_ERR(chip->extcon))
++			chip->extcon = NULL;
++	}
++
+ 	if (!chip->extcon)
+ 		return 0;
+ 
+-- 
+cgit v1.2.3
+
+From b6d4f583034b4098587497cd0e138223b6697a25 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sat, 20 Nov 2021 14:33:58 +0100
+Subject: usb: typec: fusb302: Fix register definitions
+
+MEASURE_VBUS bit is at position 6. MDAC bits are also wrong.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/tcpm/fusb302_reg.h | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/usb/typec/tcpm/fusb302_reg.h b/drivers/usb/typec/tcpm/fusb302_reg.h
+index edc0e4b0f1e6..f37d226c5027 100644
+--- a/drivers/usb/typec/tcpm/fusb302_reg.h
++++ b/drivers/usb/typec/tcpm/fusb302_reg.h
+@@ -27,14 +27,13 @@
+ #define FUSB_REG_SWITCHES1_TXCC2_EN		BIT(1)
+ #define FUSB_REG_SWITCHES1_TXCC1_EN		BIT(0)
+ #define FUSB_REG_MEASURE			0x04
+-#define FUSB_REG_MEASURE_MDAC5			BIT(7)
+-#define FUSB_REG_MEASURE_MDAC4			BIT(6)
+-#define FUSB_REG_MEASURE_MDAC3			BIT(5)
+-#define FUSB_REG_MEASURE_MDAC2			BIT(4)
+-#define FUSB_REG_MEASURE_MDAC1			BIT(3)
+-#define FUSB_REG_MEASURE_MDAC0			BIT(2)
+-#define FUSB_REG_MEASURE_VBUS			BIT(1)
+-#define FUSB_REG_MEASURE_XXXX5			BIT(0)
++#define FUSB_REG_MEASURE_VBUS			BIT(6)
++#define FUSB_REG_MEASURE_MDAC5			BIT(5)
++#define FUSB_REG_MEASURE_MDAC4			BIT(4)
++#define FUSB_REG_MEASURE_MDAC3			BIT(3)
++#define FUSB_REG_MEASURE_MDAC2			BIT(2)
++#define FUSB_REG_MEASURE_MDAC1			BIT(1)
++#define FUSB_REG_MEASURE_MDAC0			BIT(0)
+ #define FUSB_REG_CONTROL0			0x06
+ #define FUSB_REG_CONTROL0_TX_FLUSH		BIT(6)
+ #define FUSB_REG_CONTROL0_INT_MASK		BIT(5)
+@@ -105,7 +104,6 @@
+ #define FUSB_REG_STATUS0A_RX_SOFT_RESET		BIT(1)
+ #define FUSB_REG_STATUS0A_RX_HARD_RESET		BIT(0)
+ #define FUSB_REG_STATUS1A			0x3D
+-#define FUSB_REG_STATUS1A_TOGSS			BIT(3)
+ #define FUSB_REG_STATUS1A_TOGSS_RUNNING		0x0
+ #define FUSB_REG_STATUS1A_TOGSS_SRC1		0x1
+ #define FUSB_REG_STATUS1A_TOGSS_SRC2		0x2
+-- 
+cgit v1.2.3
+
+From 5f43c360ba28cb7f53c35f0e4221cd0e9abd1624 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sat, 20 Nov 2021 14:35:10 +0100
+Subject: usb: typec: fusb302: Clear interrupts before we start toggling
+
+This is recommended by the datasheet.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/tcpm/fusb302.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
+index 0c5dd0058f5e..011dce5e73a2 100644
+--- a/drivers/usb/typec/tcpm/fusb302.c
++++ b/drivers/usb/typec/tcpm/fusb302.c
+@@ -586,6 +586,7 @@ static int fusb302_set_toggling(struct fusb302_chip *chip,
+ 				enum toggling_mode mode)
+ {
+ 	int ret = 0;
++	u8 reg;
+ 
+ 	/* first disable toggling */
+ 	ret = fusb302_i2c_clear_bits(chip, FUSB_REG_CONTROL2,
+@@ -644,6 +645,12 @@ static int fusb302_set_toggling(struct fusb302_chip *chip,
+ 	} else {
+ 		/* Datasheet says vconn MUST be off when toggling */
+ 		WARN(chip->vconn_on, "Vconn is on during toggle start");
++
++		/* clear interrupts */
++                ret = fusb302_i2c_read(chip, FUSB_REG_INTERRUPT, &reg);
++		if (ret < 0)
++			return ret;
++
+ 		/* unmask TOGDONE interrupt */
+ 		ret = fusb302_i2c_clear_bits(chip, FUSB_REG_MASKA,
+ 					     FUSB_REG_MASKA_TOGDONE);
+-- 
+cgit v1.2.3
+
+From c9c0c64a3ecabb48594a6da29bed7b70e7c1cbb9 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sun, 7 Nov 2021 19:24:40 +0100
+Subject: usb: typec: typec-extcon: Add typec -> extcon bridge driver
+
+This bridge connects standard Type C port interfaces for controling
+muxes, switches and usb roles to muxes, switches and usb role
+drivers controlled via extcon interface.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/usb/typec/Kconfig        |   7 +
+ drivers/usb/typec/Makefile       |   1 +
+ drivers/usb/typec/typec-extcon.c | 337 +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 345 insertions(+)
+ create mode 100644 drivers/usb/typec/typec-extcon.c
+
+diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
+index ab480f38523a..01ecc5e590f1 100644
+--- a/drivers/usb/typec/Kconfig
++++ b/drivers/usb/typec/Kconfig
+@@ -88,6 +88,13 @@ config TYPEC_QCOM_PMIC
+ 	  It will also enable the VBUS output to connected devices when a
+ 	  DFP connection is made.
+ 
++config TYPEC_EXTCON
++	tristate "Type-C switch/mux -> extcon interface bridge driver"
++	depends on USB_ROLE_SWITCH
++	help
++	  Say Y or M here if your system needs bridging between typec class
++	  and extcon interfaces.
++
+ source "drivers/usb/typec/mux/Kconfig"
+ 
+ source "drivers/usb/typec/altmodes/Kconfig"
+diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
+index a0adb8947a30..d9d829386b73 100644
+--- a/drivers/usb/typec/Makefile
++++ b/drivers/usb/typec/Makefile
+@@ -8,4 +8,5 @@ obj-$(CONFIG_TYPEC_TPS6598X)	+= tipd/
+ obj-$(CONFIG_TYPEC_HD3SS3220)	+= hd3ss3220.o
+ obj-$(CONFIG_TYPEC_QCOM_PMIC)	+= qcom-pmic-typec.o
+ obj-$(CONFIG_TYPEC_STUSB160X) 	+= stusb160x.o
++obj-$(CONFIG_TYPEC_EXTCON)	+= typec-extcon.o
+ obj-$(CONFIG_TYPEC)		+= mux/
+diff --git a/drivers/usb/typec/typec-extcon.c b/drivers/usb/typec/typec-extcon.c
+new file mode 100644
+index 000000000000..143ff2486f2f
+--- /dev/null
++++ b/drivers/usb/typec/typec-extcon.c
+@@ -0,0 +1,337 @@
++/*
++ * typec -> extcon bridge
++ * Copyright (c) 2021 Ondřej Jirman <megi@xff.cz>
++ *
++ * This driver bridges standard type-c interfaces to drivers that
++ * expect extcon interface.
++ */
++
++#include <linux/delay.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/power_supply.h>
++#include <linux/platform_device.h>
++#include <linux/usb/pd.h>
++#include <linux/usb/role.h>
++#include <linux/usb/typec.h>
++#include <linux/usb/typec_dp.h>
++#include <linux/usb/typec_mux.h>
++#include <linux/extcon-provider.h>
++
++struct typec_extcon {
++        struct device *dev;
++
++	/* consumers */
++	struct usb_role_switch *role_sw;
++        struct typec_switch *sw;
++        struct typec_mux *mux;
++
++	/* providers */
++	struct extcon_dev *extcon;
++	struct notifier_block extcon_nb;
++
++	/* cached state from typec controller */
++	enum usb_role role;
++	enum typec_orientation orientation;
++	struct typec_altmode alt;
++	unsigned long mode;
++	bool has_alt;
++	struct mutex lock;
++};
++
++static const unsigned int typec_extcon_cable[] = {
++	EXTCON_DISP_DP,
++
++	EXTCON_USB,
++	EXTCON_USB_HOST,
++
++	EXTCON_CHG_USB_SDP,
++	EXTCON_CHG_USB_CDP,
++	EXTCON_CHG_USB_DCP,
++	EXTCON_CHG_USB_ACA,
++
++	EXTCON_NONE,
++};
++
++static void typec_extcon_set_cable(struct typec_extcon *tce, int id, bool on,
++				   union extcon_property_value prop_ss,
++				   union extcon_property_value prop_or)
++{
++	union extcon_property_value cur_ss, cur_or;
++	bool prop_diff = false;
++	int ret;
++
++	ret = extcon_get_property(tce->extcon, id,
++				  EXTCON_PROP_USB_SS, &cur_ss);
++	if (ret || cur_ss.intval != prop_ss.intval)
++		prop_diff = true;
++
++	ret = extcon_get_property(tce->extcon, id,
++				  EXTCON_PROP_USB_TYPEC_POLARITY, &cur_or);
++	if (ret || cur_or.intval != prop_or.intval)
++		prop_diff = true;
++
++	if (!on && extcon_get_state(tce->extcon, id)) {
++		extcon_set_state_sync(tce->extcon, id, false);
++	} else if (on && (!extcon_get_state(tce->extcon, id) || prop_diff)) {
++		extcon_set_state(tce->extcon, id, true);
++		extcon_set_property(tce->extcon, id,
++				    EXTCON_PROP_USB_SS, prop_ss);
++		extcon_set_property(tce->extcon, id,
++				    EXTCON_PROP_USB_TYPEC_POLARITY, prop_or);
++		extcon_sync(tce->extcon, id);
++	}
++}
++
++static int typec_extcon_sync_extcon(struct typec_extcon *tce)
++{
++	union extcon_property_value prop_ss, prop_or;
++	bool has_dp = false;
++
++        mutex_lock(&tce->lock);
++
++	/* connector is disconnected */
++	if (tce->orientation == TYPEC_ORIENTATION_NONE) {
++		typec_extcon_set_cable(tce, EXTCON_USB, false, prop_ss, prop_or);
++		typec_extcon_set_cable(tce, EXTCON_USB_HOST, false, prop_ss, prop_or);
++		typec_extcon_set_cable(tce, EXTCON_DISP_DP, false, prop_ss, prop_or);
++
++		extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_SDP, false);
++		extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_DCP, false);
++		extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_CDP, false);
++		extcon_set_state_sync(tce->extcon, EXTCON_CHG_USB_ACA, false);
++
++                goto out_unlock;
++	}
++
++	prop_or.intval = tce->orientation == TYPEC_ORIENTATION_NORMAL ? 0 : 1;
++	prop_ss.intval = 0;
++
++	if (tce->has_alt && tce->alt.svid == USB_TYPEC_DP_SID) {
++		switch (tce->mode) {
++		case TYPEC_STATE_SAFE:
++			break;
++		case TYPEC_DP_STATE_C:
++		case TYPEC_DP_STATE_E:
++			has_dp = true;
++			break;
++		case TYPEC_DP_STATE_D:
++			has_dp = true;
++			fallthrough;
++		case TYPEC_STATE_USB:
++			prop_ss.intval = 1;
++			break;
++		default:
++			dev_err(tce->dev, "unhandled mux mode=%lu\n", tce->mode);
++			break;
++		}
++	}
++
++	typec_extcon_set_cable(tce, EXTCON_USB,
++			tce->role == USB_ROLE_DEVICE, prop_ss, prop_or);
++	typec_extcon_set_cable(tce, EXTCON_USB_HOST,
++			tce->role == USB_ROLE_HOST, prop_ss, prop_or);
++
++	typec_extcon_set_cable(tce, EXTCON_DISP_DP, has_dp, prop_ss, prop_or);
++
++out_unlock:
++	mutex_unlock(&tce->lock);
++	return 0;
++}
++
++static int typec_extcon_sw_set(struct typec_switch *sw,
++			       enum typec_orientation orientation)
++{
++        struct typec_extcon *tce = typec_switch_get_drvdata(sw);
++
++	dev_dbg(tce->dev, "SW SET: orientation=%d\n", orientation);
++
++        mutex_lock(&tce->lock);
++	tce->orientation = orientation;
++        mutex_unlock(&tce->lock);
++
++	typec_extcon_sync_extcon(tce);
++
++        return 0;
++}
++
++static int typec_extcon_mux_set(struct typec_mux *mux,
++				struct typec_mux_state *state)
++{
++        struct typec_extcon *tce = typec_mux_get_drvdata(mux);
++	struct typec_altmode *alt = state->alt;
++
++	dev_dbg(tce->dev, "MUX SET: state->mode=%lu\n", state->mode);
++	if (alt)
++		dev_dbg(tce->dev, "      ...alt: svid=%04hx mode=%d vdo=%08x active=%u\n",
++			alt->svid, alt->mode, alt->vdo, alt->active);
++
++        mutex_lock(&tce->lock);
++	tce->mode = state->mode;
++	tce->has_alt = alt != NULL;
++        if (alt)
++		tce->alt = *alt;
++	mutex_unlock(&tce->lock);
++
++	typec_extcon_sync_extcon(tce);
++
++        return 0;
++}
++
++static int typec_extcon_usb_set_role(struct usb_role_switch *sw,
++				     enum usb_role role)
++{
++        struct typec_extcon *tce = usb_role_switch_get_drvdata(sw);
++
++	dev_dbg(tce->dev, "ROLE SET: role=%d\n", role);
++
++        mutex_lock(&tce->lock);
++	tce->role = role;
++	mutex_unlock(&tce->lock);
++
++	typec_extcon_sync_extcon(tce);
++
++        return 0;
++}
++
++static int typec_extcon_notifier(struct notifier_block *nb,
++					 unsigned long action, void *data)
++{
++	struct typec_extcon *tce = container_of(nb, struct typec_extcon, extcon_nb);
++
++	bool sdp = extcon_get_state(tce->extcon, EXTCON_CHG_USB_SDP);
++	bool cdp = extcon_get_state(tce->extcon, EXTCON_CHG_USB_CDP);
++	bool dcp = extcon_get_state(tce->extcon, EXTCON_CHG_USB_DCP);
++	bool usb = extcon_get_state(tce->extcon, EXTCON_USB);
++	bool usb_host = extcon_get_state(tce->extcon, EXTCON_USB_HOST);
++	bool dp = extcon_get_state(tce->extcon, EXTCON_DISP_DP);
++
++	dev_info(tce->dev, "extcon changed sdp=%d cdp=%d dcp=%d usb=%d usb_host=%d dp=%d\n",
++		 sdp, cdp, dcp, usb, usb_host, dp);
++
++	return NOTIFY_OK;
++}
++
++static int typec_extcon_probe(struct platform_device *pdev)
++{
++        struct typec_switch_desc sw_desc = { };
++        struct typec_mux_desc mux_desc = { };
++        struct usb_role_switch_desc role_desc = { };
++        struct device *dev = &pdev->dev;
++        struct typec_extcon *tce;
++        int ret = 0;
++
++        tce = devm_kzalloc(dev, sizeof(*tce), GFP_KERNEL);
++        if (!tce)
++                return -ENOMEM;
++
++        tce->dev = &pdev->dev;
++	mutex_init(&tce->lock);
++	tce->mode = TYPEC_STATE_SAFE;
++
++	sw_desc.drvdata = tce;
++	sw_desc.fwnode = dev->fwnode;
++	sw_desc.set = typec_extcon_sw_set;
++
++	tce->sw = typec_switch_register(dev, &sw_desc);
++	if (IS_ERR(tce->sw))
++		return dev_err_probe(dev, PTR_ERR(tce->sw),
++				     "Error registering typec switch\n");
++
++	mux_desc.drvdata = tce;
++	mux_desc.fwnode = dev->fwnode;
++	mux_desc.set = typec_extcon_mux_set;
++
++	tce->mux = typec_mux_register(dev, &mux_desc);
++	if (IS_ERR(tce->mux)) {
++		ret = dev_err_probe(dev, PTR_ERR(tce->mux),
++				    "Error registering typec mux\n");
++		goto err_sw;
++	}
++
++	role_desc.driver_data = tce;
++	role_desc.fwnode = dev->fwnode;
++	role_desc.name = fwnode_get_name(dev->fwnode);
++	role_desc.set = typec_extcon_usb_set_role;
++
++	tce->role_sw = usb_role_switch_register(dev, &role_desc);
++	if (IS_ERR(tce->role_sw)) {
++		ret = dev_err_probe(dev, PTR_ERR(tce->role_sw),
++				    "Error registering USB role switch\n");
++		goto err_mux;
++	}
++
++	tce->extcon = devm_extcon_dev_allocate(dev, typec_extcon_cable);
++	if (IS_ERR(tce->extcon)) {
++		ret = PTR_ERR(tce->extcon);
++		goto err_role;
++	}
++
++	ret = devm_extcon_dev_register(dev, tce->extcon);
++	if (ret) {
++		ret = dev_err_probe(dev, ret, "failed to register extcon device\n");
++		goto err_role;
++	}
++
++	extcon_set_property_capability(tce->extcon, EXTCON_USB,
++				       EXTCON_PROP_USB_SS);
++	extcon_set_property_capability(tce->extcon, EXTCON_USB,
++				       EXTCON_PROP_USB_TYPEC_POLARITY);
++	extcon_set_property_capability(tce->extcon, EXTCON_USB_HOST,
++				       EXTCON_PROP_USB_SS);
++	extcon_set_property_capability(tce->extcon, EXTCON_USB_HOST,
++				       EXTCON_PROP_USB_TYPEC_POLARITY);
++	extcon_set_property_capability(tce->extcon, EXTCON_DISP_DP,
++				       EXTCON_PROP_USB_SS);
++	extcon_set_property_capability(tce->extcon, EXTCON_DISP_DP,
++				       EXTCON_PROP_USB_TYPEC_POLARITY);
++
++	tce->extcon_nb.notifier_call = typec_extcon_notifier;
++	ret = devm_extcon_register_notifier_all(dev, tce->extcon, &tce->extcon_nb);
++	if (ret) {
++		dev_err_probe(dev, ret, "Failed to register extcon notifier\n");
++		goto err_role;
++	}
++
++	return 0;
++
++err_role:
++	usb_role_switch_unregister(tce->role_sw);
++err_mux:
++	typec_mux_unregister(tce->mux);
++err_sw:
++	typec_switch_unregister(tce->sw);
++	return ret;
++}
++
++static int typec_extcon_remove(struct platform_device *pdev)
++{
++        struct typec_extcon *tce = platform_get_drvdata(pdev);
++
++	usb_role_switch_unregister(tce->role_sw);
++	typec_mux_unregister(tce->mux);
++	typec_switch_unregister(tce->sw);
++
++        return 0;
++}
++
++static struct of_device_id typec_extcon_of_match_table[] = {
++        { .compatible = "linux,typec-extcon-bridge" },
++        { },
++};
++MODULE_DEVICE_TABLE(of, typec_extcon_of_match_table);
++
++static struct platform_driver typec_extcon_driver = {
++        .driver = {
++                .name = "typec-extcon",
++                .of_match_table = typec_extcon_of_match_table,
++        },
++        .probe = typec_extcon_probe,
++        .remove = typec_extcon_remove,
++};
++
++module_platform_driver(typec_extcon_driver);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Ondrej Jirman <megous@megous.com>");
++MODULE_DESCRIPTION("typec -> extcon bridge driver");
+-- 
+cgit v1.2.3
+
+From 4f9167affd8b3647ebc1b13cc3a0ff1b949b0c49 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Tue, 23 Nov 2021 17:32:18 +0100
+Subject: phy: rockchip-typec: Make sure the plug orientation is respected
+
+RK3399 TRM says about bit 8:
+
+typec_conn_dir_sel: TypeC connect direction select
+
+- 0: select typec_conn_dir (bit0 of this register) to TypeC PHY
+- 1: select TCPC ouput typec_con_dir to TypeC PHY (default value)
+
+This means that by default, typec_conn_dir bit is not respected.
+Fix setting of typec_conn_dir by setting typec_conn_dir to 0 first.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ drivers/phy/rockchip/phy-rockchip-typec.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c
+index d2bbdc96a167..fa10ee9a5794 100644
+--- a/drivers/phy/rockchip/phy-rockchip-typec.c
++++ b/drivers/phy/rockchip/phy-rockchip-typec.c
+@@ -350,6 +350,7 @@ struct usb3phy_reg {
+  * struct rockchip_usb3phy_port_cfg - usb3-phy port configuration.
+  * @reg: the base address for usb3-phy config.
+  * @typec_conn_dir: the register of type-c connector direction.
++ * @typec_conn_dir_sel: the register of type-c connector direction source.
+  * @usb3tousb2_en: the register of type-c force usb2 to usb2 enable.
+  * @external_psm: the register of type-c phy external psm clock.
+  * @pipe_status: the register of type-c phy pipe status.
+@@ -360,6 +361,7 @@ struct usb3phy_reg {
+ struct rockchip_usb3phy_port_cfg {
+ 	unsigned int reg;
+ 	struct usb3phy_reg typec_conn_dir;
++	struct usb3phy_reg typec_conn_dir_sel;
+ 	struct usb3phy_reg usb3tousb2_en;
+ 	struct usb3phy_reg external_psm;
+ 	struct usb3phy_reg pipe_status;
+@@ -434,6 +436,7 @@ static const struct rockchip_usb3phy_port_cfg rk3399_usb3phy_port_cfgs[] = {
+ 	{
+ 		.reg = 0xff7c0000,
+ 		.typec_conn_dir	= { 0xe580, 0, 16 },
++		.typec_conn_dir_sel	= { 0xe580, 8, 16+8 },
+ 		.usb3tousb2_en	= { 0xe580, 3, 19 },
+ 		.external_psm	= { 0xe588, 14, 30 },
+ 		.pipe_status	= { 0xe5c0, 0, 0 },
+@@ -444,6 +447,7 @@ static const struct rockchip_usb3phy_port_cfg rk3399_usb3phy_port_cfgs[] = {
+ 	{
+ 		.reg = 0xff800000,
+ 		.typec_conn_dir	= { 0xe58c, 0, 16 },
++		.typec_conn_dir_sel	= { 0xe58c, 8, 16+8 },
+ 		.usb3tousb2_en	= { 0xe58c, 3, 19 },
+ 		.external_psm	= { 0xe594, 14, 30 },
+ 		.pipe_status	= { 0xe5c0, 16, 16 },
+@@ -739,6 +743,7 @@ static int tcphy_phy_init(struct rockchip_typec_phy *tcphy, u8 mode)
+ 
+ 	reset_control_deassert(tcphy->tcphy_rst);
+ 
++	property_enable(tcphy, &cfg->typec_conn_dir_sel, 0);
+ 	property_enable(tcphy, &cfg->typec_conn_dir, tcphy->flip);
+ 	tcphy_dp_aux_set_flip(tcphy);
+ 
+-- 
+cgit v1.2.3
+
+From 331a9126d98c94f315482f14eed307d184a26f72 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Wed, 2 Dec 2020 12:09:45 +0100
+Subject: arm64: dts: rk3399-pinebook-pro: Fix USB-PD charging
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+index c2f021a1a18f..d7fe1d99b546 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+@@ -713,9 +713,9 @@
+ 			op-sink-microwatt = <1000000>;
+ 			power-role = "dual";
+ 			sink-pdos =
+-				<PDO_FIXED(5000, 2500, PDO_FIXED_USB_COMM)>;
++				<PDO_FIXED(5000, 2500, PDO_FIXED_USB_COMM | PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP)>;
+ 			source-pdos =
+-				<PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM)>;
++				<PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM | PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP)>;
+ 			try-power-role = "sink";
+ 
+ 			ports {
+-- 
+cgit v1.2.3
+
+From 6947a3f43482268bc96d2eb6a7fc51323a83d9f7 Mon Sep 17 00:00:00 2001
+From: Ondrej Jirman
+Date: Sun, 14 Nov 2021 01:16:51 +0100
+Subject: arm64: dts: rk3399-pinebook-pro: Improve Type-C support on Pinebook
+ Pro
+
+This is using the same extcon bridge developed by me for Pinephone Pro.
+
+Signed-off-by: Ondrej Jirman <megous@megous.com>
+---
+ .../boot/dts/rockchip/rk3399-pinebook-pro.dts      | 51 +++++++++++++++++++---
+ 1 file changed, 46 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+index d7fe1d99b546..ae175ee3f4c3 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+@@ -345,7 +345,7 @@
+ 
+ 	/* Regulators supplied by vcc5v0_usb */
+ 	/* Type C port power supply regulator */
+-	vbus_5vout: vbus_typec: vbus-5vout {
++	vbus_5vout: vbus-5vout {
+ 		compatible = "regulator-fixed";
+ 		enable-active-high;
+ 		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
+@@ -384,6 +384,14 @@
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&dc_det_pin>;
+ 	};
++
++	typec_extcon_bridge: typec-extcon {
++		compatible = "linux,typec-extcon-bridge";
++		usb-role-switch;
++		orientation-switch;
++		mode-switch;
++		svid = /bits/ 16 <0xff01>;
++	};
+ };
+ 
+ &cpu_b0 {
+@@ -410,6 +418,12 @@
+ 	cpu-supply = <&vdd_cpu_l>;
+ };
+ 
++&cdn_dp {
++	status = "okay";
++	extcon = <&typec_extcon_bridge>;
++	phys = <&tcphy0_dp>;
++};
++
+ &edp {
+ 	force-hpd;
+ 	pinctrl-names = "default";
+@@ -704,7 +718,9 @@
+ 		interrupts = <RK_PA2 IRQ_TYPE_LEVEL_LOW>;
+ 		pinctrl-names = "default";
+ 		pinctrl-0 = <&fusb0_int_pin>;
+-		vbus-supply = <&vbus_typec>;
++		vbus-supply = <&vbus_5vout>;
++		usb-role-switch = <&typec_extcon_bridge>;
++		extcon = <&typec_extcon_bridge>;
+ 
+ 		connector {
+ 			compatible = "usb-c-connector";
+@@ -717,6 +733,15 @@
+ 			source-pdos =
+ 				<PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM | PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP)>;
+ 			try-power-role = "sink";
++			mode-switch = <&typec_extcon_bridge>;
++			orientation-switch = <&typec_extcon_bridge>;
++
++			altmodes {
++				dp {
++					svid = <0xff01>;
++					vdo = <0x0c0046>;
++				};
++			};
+ 
+ 			ports {
+ 				#address-cells = <1>;
+@@ -984,6 +1009,7 @@
+ };
+ 
+ &tcphy0 {
++	extcon = <&typec_extcon_bridge>;
+ 	status = "okay";
+ };
+ 
+@@ -1017,13 +1043,20 @@
+ 
+ &u2phy0 {
+ 	status = "okay";
++	extcon = <&typec_extcon_bridge>;
+ 
+ 	u2phy0_otg: otg-port {
++		/*
++		 * Type-C port on the left side of the chasis.
++		 */
+ 		status = "okay";
+ 	};
+ 
+ 	u2phy0_host: host-port {
+-		phy-supply = <&vcc5v0_otg>;
++		/*
++		 * USB 2.0 host port for the keyboard (internally connected).
++		 */
++		phy-supply = <&vcc5v0_usb>;
+ 		status = "okay";
+ 	};
+ 
+@@ -1038,11 +1071,18 @@
+ 	status = "okay";
+ 
+ 	u2phy1_otg: otg-port {
++		/*
++		 * USB 3.0 A port on the left side of the chasis.
++		 */
+ 		status = "okay";
+ 	};
+ 
+ 	u2phy1_host: host-port {
+-		phy-supply = <&vcc5v0_otg>;
++		/*
++		 * To the HUB that has USB camera and USB 2.0 port on the right
++		 * side of the chasis.
++		 */
++		phy-supply = <&vcc5v0_usb>;
+ 		status = "okay";
+ 	};
+ };
+@@ -1093,7 +1133,8 @@
+ };
+ 
+ &usbdrd_dwc3_0 {
+-	dr_mode = "host";
++	dr_mode = "otg";
++	extcon = <&typec_extcon_bridge>;
+ 	status = "okay";
+ };
+ 
+-- 
+cgit v1.2.3
+
diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index c8b1255026de..8c88917e5a77 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -1,15 +1,18 @@
 # Template file for 'pinebookpro-kernel'
 pkgname=pinebookpro-kernel
-version=5.10.46
+version=5.15.38
 revision=1
 archs="aarch64*"
-wrksrc="linux-${version}"
+wrksrc="linux-${version%.*}"
 short_desc="Linux kernel for Pinebook Pro"
 maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 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=569122a39c6b325befb9ac1c07da0c53e6363b3baacd82081d131b06c1dc1415
+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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
+ b62b570af247d884dd0232f509e4e33c5edf57240b1712733e61c37a1d4b4424"
+skip_extraction="patch-${version}.xz"
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually
@@ -19,7 +22,7 @@ noshlibprovides=yes
 preserve=yes
 
 hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- openssl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
 
 _kernver="${version}_${revision}"
 triggers="kernel-hooks"
@@ -28,6 +31,7 @@ kernel_hooks_version="${_kernver}"
 # These files could be modified when an external module is built.
 mutable_files="
  /usr/lib/modules/${_kernver}/modules.builtin.bin
+ /usr/lib/modules/${_kernver}/modules.builtin.alias.bin
  /usr/lib/modules/${_kernver}/modules.softdep
  /usr/lib/modules/${_kernver}/modules.dep
  /usr/lib/modules/${_kernver}/modules.dep.bin
@@ -37,40 +41,40 @@ mutable_files="
  /usr/lib/modules/${_kernver}/modules.alias.bin
  /usr/lib/modules/${_kernver}/modules.devname"
 
-do_configure() {
-	# 5.4 misses Documentation/DocBook. We ship the directory from 4.12 here.
-	cp -a $FILESDIR/DocBook -t Documentation
+# reproducible build
+export KBUILD_BUILD_TIMESTAMP=$(LC_ALL=C date -ud @${SOURCE_DATE_EPOCH:-0})
+export KBUILD_BUILD_USER=voidlinux
+export KBUILD_BUILD_HOST=voidlinux
 
-	local arch subarch _args
+if [ "$CROSS_BUILD" ]; then
+	_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+fi
 
-	arch=arm64
+pre_patch() {
+	xzcat $XBPS_SRCDISTDIR/$pkgname-$version/patch-${version}.xz | patch -Np1
+}
 
-	if [ "$CROSS_BUILD" ]; then
-		_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
+do_configure() {
+	local arch
+
+	arch=arm64
 
 	cp -f ${FILESDIR}/dotconfig .config
-	make ${makejobs} ARCH=$arch ${_args} oldconfig
+	make ${makejobs} ARCH=$arch ${_cross} oldconfig
 
 	# Always use our revision to CONFIG_LOCALVERSION to match our pkg version.
 	sed -i -e "s|^\(CONFIG_LOCALVERSION=\).*|\1\"_${revision}\"|" .config
 }
 
 do_build() {
-	local arch _cross _args
+	local arch _args
 
 	_args="Image modules dtbs"
 	arch=arm64
 
-	if [ "$CROSS_BUILD" ]; then
-		_cross="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
-	fi
-	if [ "${_patchver}" ]; then
-		_version="EXTRAVERSION=${_patchver}"
-	fi
 	export LDFLAGS=
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} prepare
-	make ARCH=$arch ${_version} ${_cross} ${makejobs} ${_args}
+	make ARCH=$arch ${_cross} ${makejobs} prepare
+	make ARCH=$arch ${_cross} ${makejobs} ${_args}
 }
 
 do_install() {
@@ -82,7 +86,7 @@ do_install() {
 	sed -i '2iexit 0' scripts/depmod.sh
 
 	# Install kernel, firmware and modules
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} modules_install
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_MOD_PATH=${DESTDIR} ${_cross} modules_install
 
 	hdrdest=${DESTDIR}/usr/src/kernel-headers-${_kernver}
 
@@ -90,7 +94,7 @@ do_install() {
 	vinstall System.map 644 boot System.map-${_kernver}
 
 	vinstall arch/arm64/boot/Image 644 boot vmlinux-${_kernver}
-	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} dtbs_install
+	make ${makejobs} ARCH=${subarch:-$arch} INSTALL_DTBS_PATH=${DESTDIR}/boot/dtbs/dtbs-${_kernver} ${_cross} dtbs_install
 
 	# Switch to /usr.
 	vmkdir usr
@@ -109,7 +113,7 @@ do_install() {
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
-	for file in $(find arch/${subarch:-$arch} -name module.lds -o -name Kbuild.platforms -o -name Platform); do
+	for file in $(find arch/${subarch:-$arch} scripts -name module.lds -o -name Kbuild.platforms -o -name Platform); do
 		mkdir -p ${hdrdest}/$(dirname $file)
 		install -Dm644 $file ${hdrdest}/${file}
 	done
@@ -117,7 +121,7 @@ do_install() {
 	# Remove firmware stuff provided by the "linux-firmware" pkg.
 	rm -rf ${DESTDIR}/usr/lib/firmware
 
-	for i in acpi asm-generic clocksource config crypto drm generated linux \
+	for i in acpi asm-generic clocksource config crypto drm generated linux vdso \
 		math-emu media net pcmcia scsi sound trace uapi video xen dt-bindings; do
 		if [ -d include/$i ]; then
 			cp -a include/$i ${hdrdest}/include
@@ -132,7 +136,7 @@ do_install() {
 	# if generated files from the scripts/ directory need to be included,
 	# they need to be copied to ${hdrdest} before this step
 	if [ "$CROSS_BUILD" ]; then
-		make ${makejobs} ARCH=${subarch:-$arch} _mrproper_scripts
+		make ${makejobs} ARCH=${subarch:-$arch} ${_cross} _mrproper_scripts
 		# remove host specific objects as well
 		find scripts -name '*.o' -delete
 	fi
@@ -170,10 +174,6 @@ do_install() {
 		cp -a drivers/media/i2c/${i}/*.h ${hdrdest}/drivers/media/i2c/${i}
 	done
 
-	# Add docbook makefile
-	install -Dm644 Documentation/DocBook/Makefile \
-		${hdrdest}/Documentation/DocBook/Makefile
-
 	# Add md headers
 	mkdir -p ${hdrdest}/drivers/md
 	cp drivers/md/*.h ${hdrdest}/drivers/md
@@ -186,14 +186,7 @@ do_install() {
 	mkdir -p ${hdrdest}/net/mac80211/
 	cp net/mac80211/*.h ${hdrdest}/net/mac80211
 
-	# add dvb headers for external modules
-	mkdir -p ${hdrdest}/include/config/dvb/
-	cp include/config/dvb/*.h ${hdrdest}/include/config/dvb/
-
 	# add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-	mkdir -p ${hdrdest}/drivers/media/dvb-frontends
-	cp drivers/media/dvb-frontends/lgdt330x.h \
-		${hdrdest}/drivers/media/dvb-frontends/
 	cp drivers/media/i2c/msp3400-driver.h ${hdrdest}/drivers/media/i2c/
 
 	# add dvb headers
@@ -249,5 +242,6 @@ pinebookpro-kernel-dbg_package() {
 	short_desc+=" - debugging symbols"
 	pkg_install() {
 		vmove usr/lib/debug
+		vmove "boot/System.map-${_kernver}"
 	}
 }

From 70f26f72602a25000db63799feda63aed2f92c3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Mar 2022 00:50:30 +0100
Subject: [PATCH 2168/2561] gmime: rename from gmime3

* drop gmime(2), it's not used by anything
* make gmime3{,-devel} a transitional subpackage
---
 common/shlibs                            |  3 +-
 srcpkgs/gmime/files/iconv-detect.h       |  1 +
 srcpkgs/gmime/files/musl-iconv-detect.h  |  1 +
 srcpkgs/gmime/template                   | 87 ++++++++++++++++--------
 srcpkgs/gmime/update                     |  1 -
 srcpkgs/gmime3                           |  1 +
 srcpkgs/gmime3-devel                     |  2 +-
 srcpkgs/gmime3/files/iconv-detect.h      |  6 --
 srcpkgs/gmime3/files/musl-iconv-detect.h |  6 --
 srcpkgs/gmime3/template                  | 68 ------------------
 srcpkgs/gmime3/update                    |  1 -
 11 files changed, 63 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/gmime/update
 create mode 120000 srcpkgs/gmime3
 delete mode 100644 srcpkgs/gmime3/files/iconv-detect.h
 delete mode 100644 srcpkgs/gmime3/files/musl-iconv-detect.h
 delete mode 100644 srcpkgs/gmime3/template
 delete mode 100644 srcpkgs/gmime3/update

diff --git a/common/shlibs b/common/shlibs
index 784375c7c9aa..d75ecdda38dc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -745,7 +745,6 @@ libpulsecore-15.0.so libpulseaudio-15.0_1
 libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
-libgmime-2.6.so.0 gmime-2.6.4_1
 libtotem-plparser.so.18 totem-pl-parser-3.26.1_1
 libtotem-plparser-mini.so.18 libtotem-plparser-mini-3.26.1_1
 libgladeui-2.so.13 libgladeui3-3.38.0_1
@@ -3574,7 +3573,7 @@ libcloudproviders.so.0 libcloudproviders-0.2.5_2
 libKF5KDEGames.so.7 libkdegames-18.08.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
+libgmime-3.0.so.0 gmime-3.2.3_1
 libgetdns.so.10 getdns-1.5.1_7
 libgetdns_ext_event.so.10 getdns-1.5.1_7
 libgetdns_ext_ev.so.10 getdns-1.5.1_7
diff --git a/srcpkgs/gmime/files/iconv-detect.h b/srcpkgs/gmime/files/iconv-detect.h
index 714cb5aa9dd4..6d9dd05b59e2 100644
--- a/srcpkgs/gmime/files/iconv-detect.h
+++ b/srcpkgs/gmime/files/iconv-detect.h
@@ -2,4 +2,5 @@
 
 #define ICONV_ISO_INT_FORMAT "iso-%u-%u"
 #define ICONV_ISO_STR_FORMAT "iso-%u-%s"
+#define ICONV_SHIFT_JIS "shift-jis"
 #define ICONV_10646 "iso-10646"
diff --git a/srcpkgs/gmime/files/musl-iconv-detect.h b/srcpkgs/gmime/files/musl-iconv-detect.h
index 9f431bf9ff00..569da106b943 100644
--- a/srcpkgs/gmime/files/musl-iconv-detect.h
+++ b/srcpkgs/gmime/files/musl-iconv-detect.h
@@ -2,4 +2,5 @@
 
 #define ICONV_ISO_INT_FORMAT "iso-%u-%u"
 #define ICONV_ISO_STR_FORMAT "iso-%u-%s"
+#define ICONV_SHIFT_JIS "shift-jis"
 #define ICONV_10646 "UCS-4BE"
diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template
index 697cbd0ab67a..57718cac3bf0 100644
--- a/srcpkgs/gmime/template
+++ b/srcpkgs/gmime/template
@@ -1,43 +1,57 @@
 # Template file for 'gmime'
 pkgname=gmime
-version=2.6.23
-revision=4
+version=3.2.7
+revision=2
+wrksrc="gmime-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --disable-mono --enable-smime
- --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="automake pkg-config intltool libtool
- $(vopt_if gir gobject-introspection)"
-makedepends="glib-devel gpgme-devel"
+configure_args="--disable-static --enable-crypto $(vopt_enable vala)
+ $(vopt_enable gir introspection)"
+hostmakedepends="pkg-config $(vopt_if vala vala)"
+makedepends="glib-devel gpgme-devel libidn2-devel
+ $(vopt_if vala vala)"
+checkdepends="gnupg2"
 short_desc="GNOME Core mime parsing library"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/jstedfast/gmime"
 distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
-checksum=7149686a71ca42a1390869b6074815106b061aaeaaa8f2ef8c12c191d9a79f6a
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" am_cv_func_iconv=yes am_cv_func_iconv_works=yes"
-	configure_args+=" am_cv_lib_iconv=no ac_cv_have_iconv_detect_h=yes"
-	configure_args+=" am_cv_proto_iconv_arg1="
-fi
-
-pre_build() {
-	if [ -z "$CROSS_BUILD" ]; then
-		:
-	elif [ "$XBPS_TARGET_LIBC" = musl ]; then
+checksum=2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44
+
+build_options="gir vala"
+build_options_default="gir vala"
+
+pre_configure() {
+	[ -z "$CROSS_BUILD" ] && return 0
+
+	configure_args+=" ac_cv_have_iconv_detect_h=yes"
+
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
 		cp ${FILESDIR}/musl-iconv-detect.h ${wrksrc}/iconv-detect.h
 	else
-		cp ${FILESDIR}/iconv-detect.h ${wrksrc}
+		cp ${FILESDIR}/iconv-detect.h ${wrksrc}/iconv-detect.h
+	fi
+}
+
+do_check() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		make check VERBOSITY=-vv |
+		awk '
+			1
+			# utf-8 to iso-2022-jp is stateless
+			/GMimeFilterCharset.*utf-8.*iso-2022-jp/ { next }
+			# euc-kr has not been supported
+			/euc-kr to UTF-8/ { next }
+			$NF == "FAILED" { e = 1 }
+			END { exit e }
+		'
+	else
+		make check
 	fi
 }
 
 gmime-devel_package() {
-	depends="libglib-devel zlib-devel gmime>=${version}_${revision}"
+	depends="libglib-devel zlib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -45,7 +59,22 @@ gmime-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
 		if [ "$build_option_gir" ]; then
-			vmove "usr/share/gir-*"
+			vmove usr/share/gir-1.0
+		fi
+		if [ "$build_option_vala" ]; then
+			vmove usr/share/vala
 		fi
 	}
 }
+
+gmime3_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+gmime3-devel_package() {
+	depends="${sourcepkg}-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
diff --git a/srcpkgs/gmime/update b/srcpkgs/gmime/update
deleted file mode 100644
index 4ee52a63831a..000000000000
--- a/srcpkgs/gmime/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="3*" # Packages in gmime3
diff --git a/srcpkgs/gmime3 b/srcpkgs/gmime3
new file mode 120000
index 000000000000..4173041bbe71
--- /dev/null
+++ b/srcpkgs/gmime3
@@ -0,0 +1 @@
+gmime
\ No newline at end of file
diff --git a/srcpkgs/gmime3-devel b/srcpkgs/gmime3-devel
index 8029aee6f9f9..4173041bbe71 120000
--- a/srcpkgs/gmime3-devel
+++ b/srcpkgs/gmime3-devel
@@ -1 +1 @@
-gmime3
\ No newline at end of file
+gmime
\ No newline at end of file
diff --git a/srcpkgs/gmime3/files/iconv-detect.h b/srcpkgs/gmime3/files/iconv-detect.h
deleted file mode 100644
index 6d9dd05b59e2..000000000000
--- a/srcpkgs/gmime3/files/iconv-detect.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This is an auto-generated header, DO NOT EDIT! */
-
-#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
-#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
-#define ICONV_SHIFT_JIS "shift-jis"
-#define ICONV_10646 "iso-10646"
diff --git a/srcpkgs/gmime3/files/musl-iconv-detect.h b/srcpkgs/gmime3/files/musl-iconv-detect.h
deleted file mode 100644
index 569da106b943..000000000000
--- a/srcpkgs/gmime3/files/musl-iconv-detect.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* This is an auto-generated header, DO NOT EDIT! */
-
-#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
-#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
-#define ICONV_SHIFT_JIS "shift-jis"
-#define ICONV_10646 "UCS-4BE"
diff --git a/srcpkgs/gmime3/template b/srcpkgs/gmime3/template
deleted file mode 100644
index 43e04197d50d..000000000000
--- a/srcpkgs/gmime3/template
+++ /dev/null
@@ -1,68 +0,0 @@
-# Template file for 'gmime3'
-pkgname=gmime3
-version=3.2.7
-revision=1
-wrksrc="gmime-${version}"
-build_style=gnu-configure
-build_helper="gir"
-configure_args="--disable-static --enable-crypto $(vopt_enable vala)
- $(vopt_enable gir introspection)"
-hostmakedepends="pkg-config $(vopt_if vala vala)"
-makedepends="glib-devel gpgme-devel libidn2-devel
- $(vopt_if vala vala)"
-checkdepends="gnupg2"
-short_desc="GNOME Core mime parsing library"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://github.com/jstedfast/gmime"
-distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
-checksum=2aea96647a468ba2160a64e17c6dc6afe674ed9ac86070624a3f584c10737d44
-
-build_options="gir vala"
-build_options_default="gir vala"
-
-pre_configure() {
-	[ -z "$CROSS_BUILD" ] && return 0
-
-	configure_args+=" ac_cv_have_iconv_detect_h=yes"
-
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		cp ${FILESDIR}/musl-iconv-detect.h ${wrksrc}/iconv-detect.h
-	else
-		cp ${FILESDIR}/iconv-detect.h ${wrksrc}/iconv-detect.h
-	fi
-}
-
-do_check() {
-	if [ "$XBPS_TARGET_LIBC" = musl ]; then
-		make check VERBOSITY=-vv |
-		awk '
-			1
-			# utf-8 to iso-2022-jp is stateless
-			/GMimeFilterCharset.*utf-8.*iso-2022-jp/ { next }
-			# euc-kr has not been supported
-			/euc-kr to UTF-8/ { next }
-			$NF == "FAILED" { e = 1 }
-			END { exit e }
-		'
-	else
-		make check
-	fi
-}
-
-gmime3-devel_package() {
-	depends="libglib-devel zlib-devel ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		vmove usr/share/gtk-doc
-		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
-			vmove usr/share/vala
-		fi
-	}
-}
diff --git a/srcpkgs/gmime3/update b/srcpkgs/gmime3/update
deleted file mode 100644
index 0b6f335b26fa..000000000000
--- a/srcpkgs/gmime3/update
+++ /dev/null
@@ -1 +0,0 @@
-pkgname=gmime

From 3f9ef139f62efdbc1674a696d96995f78464fd67 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 28 Apr 2022 17:44:53 -0700
Subject: [PATCH 2169/2561] wayfire: update to 0.7.3.

---
 srcpkgs/wayfire/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index 9b0026c58565..6a9e874d1723 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -1,13 +1,13 @@
 # Template file for 'wayfire'
 pkgname=wayfire
-version=0.7.2
-revision=2
+version=0.7.3
+revision=1
 _utils_commit=889fdafa7b09fc6ce70313fd3f067cfc8c21a2ac
 _touch_commit=8974eb0f6a65464b63dd03b842795cb441fb6403
 build_style=meson
 configure_args="-Dprint_trace=false"
 hostmakedepends="pkg-config wayland-devel"
-makedepends="wf-config-devel wlroots0.14-devel cairo-devel
+makedepends="wf-config-devel wlroots-devel cairo-devel
  $(vopt_if image 'libjpeg-turbo-devel libpng-devel')"
 depends="xorg-server-xwayland"
 short_desc="3D wayland compositor"
@@ -17,7 +17,7 @@ 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="e45fddcc22b7149d793fea08763c5b3dc0edf7c0be9d094575a32cf847560fd4
+checksum="72575b6d598087d6fe737a8066db5405d7cff88a3041447f56b83313ac9a0684
  bbde37e1a8b5ecb322096b32891593c14264800291be8773f7f0708fc110ed2f
  09061c8a4d3d964e8dcfd1a7b97f7dc43d0fc30743b0993585439c6923ce422f"
 

From ced501b2ff041346b34194a51683ca697f23d489 Mon Sep 17 00:00:00 2001
From: travankor <travankor@tuta.io>
Date: Thu, 28 Apr 2022 17:45:55 -0700
Subject: [PATCH 2170/2561] wayfire-plugins-extra: fix build for wayfire update

---
 .../wayfire-plugins-extra/patches/mag.patch   | 99 +++++++++++++++++++
 srcpkgs/wayfire-plugins-extra/template        |  2 +-
 2 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/wayfire-plugins-extra/patches/mag.patch

diff --git a/srcpkgs/wayfire-plugins-extra/patches/mag.patch b/srcpkgs/wayfire-plugins-extra/patches/mag.patch
new file mode 100644
index 000000000000..0cb71ad5d86b
--- /dev/null
+++ b/srcpkgs/wayfire-plugins-extra/patches/mag.patch
@@ -0,0 +1,99 @@
+diff --git a/src/mag.cpp b/src/mag.cpp
+index 1ed4d73..f03cf7c 100644
+--- a/src/mag.cpp
++++ b/src/mag.cpp
+@@ -35,16 +35,6 @@
+ #include "wayfire/opengl.hpp"
+ #include <glm/gtc/matrix_transform.hpp>
+ 
+-extern "C"
+-{
+-#define static
+-#include <wlr/config.h>
+-#include <wlr/render/gles2.h>
+-#include <wlr/render/wlr_renderer.h>
+-#include <wlr/types/wlr_matrix.h>
+-#undef static
+-}
+-
+ #include <wayfire/util/log.hpp>
+ 
+ 
+@@ -171,19 +161,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
+ 
+     wf::effect_hook_t post_hook = [=] ()
+     {
+-        wlr_dmabuf_attributes dmabuf_attribs;
+-
+-        /* This plugin only works if this function succeeds. It will not
+-         * work with the x11 backend but works with drm, for example. */
+-        if (!wlr_output_export_dmabuf(output->handle, &dmabuf_attribs))
+-        {
+-            LOGE("Failed reading output contents");
+-            deactivate();
+-            active = false;
+-
+-            return;
+-        }
+-
+         auto cursor_position = output->get_cursor_position();
+ 
+         auto ortho = output->render->get_target_framebuffer()
+@@ -201,9 +178,6 @@ class wayfire_magnifier : public wf::plugin_interface_t
+         float y = cursor.y;
+ 
+         auto og = output->get_relative_geometry();
+-        gl_geometry src_geometry = {0, 0, (float)og.width, (float)og.height};
+-        auto transform = output->render->get_target_framebuffer().transform;
+-        transform = glm::inverse(transform);
+ 
+         width  = og.width;
+         height = og.height;
+@@ -220,6 +194,9 @@ class wayfire_magnifier : public wf::plugin_interface_t
+         /* Compute zoom_box, forcing the zoom to stay on the output */
+         gl_geometry zoom_box;
+ 
++        /* Y-invert */
++        y = 1.0 - y;
++
+         zoom_box.x1 = x - level;
+         zoom_box.y1 = y - level;
+         zoom_box.x2 = x + level;
+@@ -249,27 +226,25 @@ class wayfire_magnifier : public wf::plugin_interface_t
+             zoom_box.y2  = 1.0;
+         }
+ 
++        zoom_box.x1 *= width - 1;
++        zoom_box.x2 *= width - 1;
++        zoom_box.y1 *= height - 1;
++        zoom_box.y2 *= height - 1;
++
+         /* Copy zoom_box part of the output to our own texture to be
+          * read by the mag_view_t. */
+-        auto wlr_texture = wlr_texture_from_dmabuf(
+-            wf::get_core().renderer, &dmabuf_attribs);
+-
+-        wf::texture_t texture{wlr_texture};
+ 
+         OpenGL::render_begin();
+         mag_view->mag_tex.allocate(width, height);
+         mag_view->mag_tex.geometry = og;
+         mag_view->mag_tex.bind();
+-
+-        OpenGL::render_transformed_texture(texture, src_geometry, zoom_box,
+-            transform * mag_view->mag_tex.get_orthographic_projection(),
+-            glm::vec4(1.0),
+-            OpenGL::TEXTURE_USE_TEX_GEOMETRY);
++        GL_CALL(glBindFramebuffer(GL_READ_FRAMEBUFFER,
++            output->render->get_target_framebuffer().fb));
++        GL_CALL(glBlitFramebuffer(zoom_box.x1, zoom_box.y2, zoom_box.x2, zoom_box.y1,
++            0, 0, width, height,
++            GL_COLOR_BUFFER_BIT, GL_LINEAR));
+         OpenGL::render_end();
+ 
+-        wlr_texture_destroy(wlr_texture);
+-        wlr_dmabuf_attributes_finish(&dmabuf_attribs);
+-
+         mag_view->damage();
+     };
+ 
diff --git a/srcpkgs/wayfire-plugins-extra/template b/srcpkgs/wayfire-plugins-extra/template
index 79b40857cf0e..a666281e177a 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=5
+revision=6
 build_style=meson
 hostmakedepends="pkg-config wayland-devel"
 makedepends="wayfire-devel glibmm-devel"

From 071eb7364890f6215bd3ac301dc8252e6029ff3d Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 8 May 2022 13:31:20 -0700
Subject: [PATCH 2171/2561] podman: update to 4.1.0

---
 srcpkgs/podman/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index a12ca2c32440..bc2e8cce46cb 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,6 +1,6 @@
 # Template file for 'podman'
 pkgname=podman
-version=4.0.3
+version=4.1.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v4"
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://podman.io/"
 changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=e3b53fc9142d4f2dc085f17a377d92ffb8bfe7756c4f47b8128b38bcc3540cbc
+checksum=f814e12a7311d486c1ccdc4eb021bc6dd24499569de7a572e436342876f70e95
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
@@ -30,9 +30,10 @@ post_install() {
 	mv "${DESTDIR}/usr/bin/rootlessport" "${DESTDIR}/usr/libexec/podman/rootlessport"
 	make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
 	make install.completions DESTDIR="${DESTDIR}" PREFIX="/usr"
-	sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
-		vendor/github.com/containers/common/pkg/config/containers.conf \
-		>containers.cgfs.conf
+	cp vendor/github.com/containers/common/pkg/config/containers.conf \
+		containers.cgfs.conf
+	vsed -i -e 's|#cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
+		containers.cgfs.conf
 	vinstall containers.cgfs.conf 644 usr/share/containers containers.conf
 	vsv podman
 	vsv podman-docker

From 3d005855d69d7ec07f53bc12690437c3a887436e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Mon, 9 May 2022 12:50:19 -0400
Subject: [PATCH 2172/2561] dendrite: update to 0.8.3.

---
 srcpkgs/dendrite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 998442981fcf..7e8f9fd27312 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.8.2
+version=0.8.3
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=c09c53964434785d9828482a00e3300a7e54692a0052c71f6a245e147b46cd01
+checksum=2d61dc970bf812e13f7a81c65e811811ef950dad02631380650191214f2b5d5d
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"

From 366325a6a11d212ce742b9866e1177245732059a Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Mon, 9 May 2022 12:28:03 -0400
Subject: [PATCH 2173/2561] font-iosevka: update to 15.3.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index c971135ce5fb..479289115363 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=15.2.0
+version=15.3.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- b6b6bb50cd3c3db49739bea9fb5c92c22647631eb1b5a35aa7f48358c07ef529
- 45c853ac53b638457d943c0ccf7cf12ca77219ba7e092d7ac17ed965c5482da9"
+ 0ebdabed87473163055f2fbe6927e210c9259a94efdeac3ed54976bb0873ce0c
+ dc08f215c57fd3e3d9f4a69a600a2a0d92bd56bac47e6099c47374e7cee0b7ae"
 
 font_dirs="/usr/share/fonts/TTF"
 

From bd880a6cf2f55f028aeaecadb8409223bbb9dba4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 9 May 2022 19:23:31 -0400
Subject: [PATCH 2174/2561] chezmoi: update to 2.15.4.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 7f416e873786..119bcf35e55a 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.15.3
+version=2.15.4
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -11,7 +11,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=2c0239c643795a13420f815c7e906720cd98594152b6d6fa546b0242462adc9e
+checksum=879ce990f1655124af7e3bbf95dd3fb79453f8c1047d6f4ad5af30d86a674843
 
 pre_build() {
 	local _date

From eaf91ed51183a7b97a3748e3c966ff5ab959182b Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Tue, 10 May 2022 08:31:33 +0200
Subject: [PATCH 2175/2561] PolyMC: update to 1.2.2.

---
 srcpkgs/PolyMC/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template
index 91b439b6b529..c3a336ce02ab 100644
--- a/srcpkgs/PolyMC/template
+++ b/srcpkgs/PolyMC/template
@@ -1,6 +1,6 @@
 # Template file for 'PolyMC'
 pkgname=PolyMC
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=cmake
 configure_args="-DLauncher_BUILD_PLATFORM=Void
@@ -13,7 +13,7 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-only"
 homepage="https://polymc.org/"
 distfiles="https://github.com/PolyMC/PolyMC/releases/download/${version}/PolyMC-${version}.tar.gz"
-checksum=cec7b0175bd0dc3ff2a43e822d1218772e0833332026ae681c81ecc5c51bf608
+checksum=4ce46406040b5315a598e412feecb70e5248cfc07fac9e3086597af12c102137
 
 if [ -z "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DBUILD_TESTING=0"

From bfe0d445d31b1d942ac8e831c2ceacce1d67400c Mon Sep 17 00:00:00 2001
From: Noel Cower <ncower@nil.dev>
Date: Mon, 9 May 2022 15:23:05 -0700
Subject: [PATCH 2176/2561] sops: update to 3.7.3.

---
 srcpkgs/sops/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index ade18a059c57..09a33de74f58 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,6 +1,6 @@
 # Template file for 'sops'
 pkgname=sops
-version=3.7.0
+version=3.7.3
 revision=1
 build_style=go
 go_import_path="go.mozilla.org/sops/v3"
@@ -10,4 +10,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=909496eaed98f6ff4fadc216ad904ef2d2a82ff229e6af6cc0cb1625e2df5d83
+checksum=0e563f0c01c011ba52dd38602ac3ab0d4378f01edfa83063a00102587410ac38

From 8ea6108c6878d509d53954fd6a7d13da56f2faf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 10 May 2022 18:58:53 +0200
Subject: [PATCH 2177/2561] .github/: skip file conflicts check if no packages
 are built

workflow was limited to branches modifying srcpkgs/, but this
still triggered when modifying only update files or removing template
---
 .github/workflows/build.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f527ce1f897d..177944e1c03c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -105,8 +105,10 @@ jobs:
       - name: Check file conflicts
         if: matrix.config.arch == 'x86_64' # the arch indexed in xlocate
         run: |
-          xlocate -S &&
-          common/scripts/lint-conflicts $HOME/hostdir/binpkgs
+          if [ -s /tmp/templates ]; then
+              xlocate -S &&
+              common/scripts/lint-conflicts $HOME/hostdir/binpkgs
+          fi
 
       - name: Verify repository state
         run: |

From 2a88d3061c0a15ee7ddfce2c0ee9329c45612fae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 10 May 2022 20:33:18 +0200
Subject: [PATCH 2178/2561] common/scripts/lint-conflicts: handle emptied
 packages

---
 common/scripts/lint-conflicts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index bb0e2b2fd6b3..2917f72a89a6 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -130,9 +130,12 @@ group_by_file_partial() {
 	# for all packages in xlocate
 	local pkgname file
 	## newly built packages
+	while read -r pkgver; do
+		pkgname=${pkgver%-*}
+		newly_built[$pkgname]=$pkgname
+	done < <(xbps-query "${repositories[@]}" -i -R -s '' | cut -d' ' -f 2)
 	while read -r pkgname file; do
 		owners[$file]+=" $pkgname"
-		newly_built[$pkgname]=$pkgname
 	done < <(list_newly_built_files)
 	## rest of repository
 	while read -r pkgver file; do

From cd5e4c65675664f51b63be3ab82f35da8afb8862 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 10 May 2022 15:33:46 -0500
Subject: [PATCH 2179/2561] python3-oletools: update to 0.60.1.

---
 srcpkgs/python3-oletools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-oletools/template b/srcpkgs/python3-oletools/template
index 08b132fac61b..9e09720167dd 100644
--- a/srcpkgs/python3-oletools/template
+++ b/srcpkgs/python3-oletools/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-oletools'
 pkgname=python3-oletools
-version=0.60
-revision=2
+version=0.60.1
+revision=1
 wrksrc="oletools-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/decalage2/oletools"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=85500022ebf58e9bd514e295270cb5ac2b061b2e59912432a3a7ceffd88db3e0
+checksum=34cef47d88488126952f994be7b4c20d2758203b64f69335d3d8179ad3ae0992
 
 post_install() {
 	vlicense oletools/LICENSE.txt

From 55cb8ffa90491b2e5d04f885c195b8082f5dd013 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 10 May 2022 16:13:00 -0500
Subject: [PATCH 2180/2561] python3-ytmusicapi: update to 0.22.0.

---
 srcpkgs/python3-ytmusicapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index b791bcb33c0b..faec190cff1c 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=0.21.0
+version=0.22.0
 revision=1
 wrksrc="ytmusicapi-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
-checksum=338941fb2fb52078a69fa47a34456574e4e9998caead56d27e440bacacdb917c
+checksum=5240fc8862a6bf7fd602bc420a0b48d81fae389acad6ff1ee8eeb5ed32ae09b9
 
 post_install() {
 	vlicense LICENSE

From 039f5acc79a161fc63c81a00b39304fe13c6fdc5 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 10 May 2022 21:30:17 +0200
Subject: [PATCH 2181/2561] google-chrome: update to 101.0.4951.64

---
 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 94cd9a30ad4a..c95d625d5853 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=101.0.4951.54
+version=101.0.4951.64
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=bedc9782f008645c3bcda9edbeeabf52ef15ed1d736a697819e56f2e5c37dad4
+checksum=1b6dfea8fc0232ad88a02c997facb28b06c000d9d27cedfdbde278018fcc3292
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From c8d9e12bcbfa8fd59b68680656d9eb784d1e2839 Mon Sep 17 00:00:00 2001
From: Henry Precheur <henry@precheur.org>
Date: Mon, 9 May 2022 09:14:51 -0700
Subject: [PATCH 2182/2561] zoom: update to 5.10.4.2845

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index aa16c7503ed4..796df0c7ea2f 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.9.6.2225
+version=5.10.4.2845
 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=1e43ae0e43168586f5dd05ace1e646afe1455825b62b760e2dab0a3564da35e3
+checksum=b206618eacbae117eda78a0cfcd8986a553412dbba8f1891660e12c3366ad802
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From b1690aea027d02c131e6fd90fdb05bb2e54cf205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 9 May 2022 17:38:45 +0700
Subject: [PATCH 2183/2561] git: update to 2.36.1.

---
 srcpkgs/git/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index dc2146690ab2..702dca4ef81f 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,8 +1,7 @@
 # Template file for 'git'
 pkgname=git
-reverts="2.36.0_1"
-version=2.35.3
-revision=2
+version=2.36.1
+revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
@@ -15,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=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
+checksum=405d4a0ff6e818d1f12b3e92e1ac060f612adcb454f6299f70583058cb508370
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From c5e296b793a71fbb012946ea1c378d89026ba7a0 Mon Sep 17 00:00:00 2001
From: Tung Anh Vu <vu.tunganh96@gmail.com>
Date: Mon, 9 May 2022 14:55:24 +0200
Subject: [PATCH 2184/2561] ipe: Add qt5-svg to depends

Icons in toolbars (and possibly elsewhere) are not displayed without
qt5-svg.

Close: #37058
---
 srcpkgs/ipe/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index fbd500a3dc94..a84d5c036b2f 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,11 +1,12 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.24
-revision=5
+revision=6
 _tools_commit=v7.2.20.1
 hostmakedepends="pkg-config doxygen qt5-qmake qt5-tools qt5-host-tools"
 makedepends="cairo-devel gsl-devel libcurl-devel libjpeg-turbo-devel
  lua53-devel poppler-devel qt5-devel libspiro-devel"
+depends="qt5-svg"
 short_desc="Drawing editor for creating figures in PDF or EPS formats"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"

From 0c329ac6d822145059de3198b2f5078e7740eab9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 May 2022 14:13:43 +0200
Subject: [PATCH 2185/2561] ugrep: update to 3.7.11.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index fda7c355b64a..eb86699fa39a 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.10
+version=3.7.11
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=733503055e309e83898a403481d92357fc3b02d4642acdb51026dd2dd44e0477
+checksum=47cf3eee0a6eb759a5ee53b8e0e09d5d1843c5597cfd83e9c88f1b29e6873b2b
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From a196e1eb267a9945d1c46f575d1ee6009faeb119 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 May 2022 14:51:03 +0200
Subject: [PATCH 2186/2561] cloud-hypervisor: update to 23.1.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index c94d8e45e3fa..3305b00cc909 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=23.0
+version=23.1
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=80f058d3ae00e23f4762fcc1c7091f22a14801c5913298f54fbfb8591da52ba9
+checksum=c4e04a7f8af27517f3a07aee04a5eea4e81780f4ed5fa21876d282de0f998354
 
 post_install() {
 	vlicense LICENSE-APACHE

From 1d0732e6321bafbc882635e35daacd64d67c6b8e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 May 2022 14:56:09 +0200
Subject: [PATCH 2187/2561] dovecot: update to 2.3.19.

---
 srcpkgs/dovecot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index bfee0c1db554..abce7c8b3878 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot'
 # revbump dovecot-plugin-pigeonhole when updating dovecot!
 pkgname=dovecot
-version=2.3.18
+version=2.3.19
 revision=1
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://dovecot.org/"
 distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz"
-checksum=06e73f668c6c093c45bdeeeb7c20398ab8dc49317234f4b5781ac5e2cc5d6c33
+checksum=0173f693d441b6248b8a62aa5fd690021a1f04a12902653e0bf2e5b012fe437b
 keep_libtool_archives=yes
 
 if [ "$CROSS_BUILD" ]; then

From 8955c4c7725833ab169423bfadd2e56e0b2dabc5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 11 May 2022 15:42:28 +0200
Subject: [PATCH 2188/2561] dovecot-plugin-pigeonhole: update to 0.5.19.

---
 srcpkgs/dovecot-plugin-pigeonhole/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 97c54750ab02..d3b68337604c 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -1,6 +1,6 @@
 # Template file for 'dovecot-plugin-pigeonhole'
 pkgname=dovecot-plugin-pigeonhole
-version=0.5.18
+version=0.5.19
 revision=1
 wrksrc="dovecot-2.3-pigeonhole-${version}"
 build_style=gnu-configure
@@ -19,7 +19,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="https://pigeonhole.dovecot.org"
 distfiles="${homepage}/releases/2.3/${wrksrc}.tar.gz"
-checksum=a6d828f8d6f2decba5105343ece5c7a65245bd94e46a8ae4432a6d97543108a5
+checksum=10b923efcc6f3c4d92ecdbb780e12a5c33e6d0fdbe3aba5fcd3ecde4179c730c
 
 dovecot-plugin-pigeonhole-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From deab4a9f275567412c73c707e6be8e962e038281 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 11 May 2022 20:56:38 +0200
Subject: [PATCH 2189/2561] youtube-viewer: update to 3.10.0.

---
 srcpkgs/youtube-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index af6941e45319..c7d726cdbf9c 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.9
+version=3.10.0
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=29a326b6496bc6e96840d3c854d79a3ffb9e6006a033f11478c1633c1ac48a8b
+checksum=68a2bd03c1f9a01809505e9beef75b4f64119f3709b3fb9ae6343d8b50c0bc85
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From cd7376b1144a9f30f1a7f25186ac11d3928f3797 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:20:28 -0400
Subject: [PATCH 2190/2561] intel-ucode: update to 20220510.

---
 srcpkgs/intel-ucode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index e7e57d0f6588..22516894871f 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-ucode'
 pkgname=intel-ucode
-version=20220419
+version=20220510
 revision=1
 archs="i686* x86_64*"
 wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}"
@@ -9,7 +9,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom: Proprietary"
 homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
 distfiles="${homepage}/archive/microcode-${version}.tar.gz"
-checksum=b8838d300e749c1dd55d8865bdd49dee5153beb5e29d4b0e613aee475e0c0881
+checksum=254ddc71b598fbb8dbb200ceb3af29aeb22f6bf50bc609e8f953cf9c8d286d2a
 repository=nonfree
 
 do_install() {

From c1b845992af8e7dc0f8d202990e2210dbcb8c229 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:41:25 -0400
Subject: [PATCH 2191/2561] maturin: update to 0.12.15.

---
 srcpkgs/maturin/patches/add-ppc-tier3.patch | 60 ++++++++++++---------
 srcpkgs/maturin/template                    |  4 +-
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch
index 5b5b7c2021a1..b19d2ada15ed 100644
--- a/srcpkgs/maturin/patches/add-ppc-tier3.patch
+++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch
@@ -1,7 +1,7 @@
-diff -ur setup.py setup.py
+diff -u a/setup.py b/setup.py
 --- a/setup.py
 +++ b/setup.py
-@@ -69,7 +69,7 @@
+@@ -71,7 +71,7 @@
                  "--message-format=json",
              ]
  
@@ -10,19 +10,33 @@ diff -ur setup.py setup.py
                  sys.platform == "win32" and platform.machine() == "ARM64"
              ):
                  cargo_args.extend(
-diff -ur src/target.rs src/target.rs
+diff -u a/src/auditwheel/policy.rs b/src/auditwheel/policy.rs
+--- a/src/auditwheel/policy.rs
++++ b/src/auditwheel/policy.rs
+@@ -100,6 +100,8 @@
+                 Arch::Armv7L => "libc.musl-armv7.so.1",
+                 Arch::Powerpc64Le => "libc.musl-ppc64le.so.1",
+                 Arch::Powerpc64 => "", // musllinux doesn't support ppc64
++                Arch::PowerpcLe => "", // musllinux doesn't support ppcle
++                Arch::Powerpc => "", // musllinux doesn't support ppc
+                 Arch::X86 => "libc.musl-x86.so.1",
+                 Arch::X86_64 => "libc.musl-x86_64.so.1",
+                 Arch::S390X => "libc.musl-s390x.so.1",
+diff -u a/src/target.rs.orig b/src/target.rs
 --- a/src/target.rs
 +++ b/src/target.rs
-@@ -40,6 +40,8 @@
-     Armv7L,
+@@ -52,6 +52,10 @@
      Powerpc64Le,
+     #[serde(alias = "ppc64")]
      Powerpc64,
++    #[serde(alias = "ppcle")]
 +    PowerpcLe,
++    #[serde(alias = "ppc")]
 +    Powerpc,
+     #[serde(alias = "i686")]
      X86,
      X86_64,
-     S390X,
-@@ -52,6 +54,8 @@
+@@ -65,6 +69,8 @@
              Arch::Armv7L => write!(f, "armv7l"),
              Arch::Powerpc64Le => write!(f, "ppc64le"),
              Arch::Powerpc64 => write!(f, "ppc64"),
@@ -31,7 +45,7 @@ diff -ur src/target.rs src/target.rs
              Arch::X86 => write!(f, "i686"),
              Arch::X86_64 => write!(f, "x86_64"),
              Arch::S390X => write!(f, "s390x"),
-@@ -67,6 +71,8 @@
+@@ -80,6 +86,8 @@
              Arch::Armv7L,
              Arch::Powerpc64,
              Arch::Powerpc64Le,
@@ -40,7 +54,7 @@ diff -ur src/target.rs src/target.rs
              Arch::S390X,
              Arch::X86,
              Arch::X86_64,
-@@ -123,6 +129,8 @@
+@@ -154,6 +162,8 @@
              target_lexicon::Architecture::Aarch64(_) => Arch::Aarch64,
              target_lexicon::Architecture::Powerpc64 => Arch::Powerpc64,
              target_lexicon::Architecture::Powerpc64le => Arch::Powerpc64Le,
@@ -49,16 +63,25 @@ diff -ur src/target.rs src/target.rs
              target_lexicon::Architecture::S390x => Arch::S390X,
              unsupported => bail!("The architecture {} is not supported", unsupported),
          };
-@@ -200,7 +208,7 @@
-     /// Returns the default Manylinux tag for this architecture
-     pub fn get_default_manylinux_tag(&self) -> PlatformTag {
+@@ -303,6 +313,8 @@
+             Arch::Armv7L => "armv7l",
+             Arch::Powerpc64Le => "powerpc64le",
+             Arch::Powerpc64 => "powerpc64",
++            Arch::PowerpcLe => "powerpcle",
++            Arch::Powerpc => "powerpc",
+             Arch::X86 => "i386",
+             Arch::X86_64 => "x86_64",
+             Arch::S390X => "s390x",
+@@ -327,7 +339,7 @@
+     /// Returns the oldest possible Manylinux tag for this architecture
+     pub fn get_minimum_manylinux_tag(&self) -> PlatformTag {
          match self.arch {
 -            Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::S390X => {
 +            Arch::Aarch64 | Arch::Armv7L | Arch::Powerpc64 | Arch::Powerpc64Le | Arch::PowerpcLe | Arch::Powerpc | Arch::S390X => {
                  PlatformTag::manylinux2014()
              }
              Arch::X86 | Arch::X86_64 => PlatformTag::manylinux2010(),
-@@ -214,6 +222,8 @@
+@@ -341,6 +353,8 @@
              Arch::Armv7L => 32,
              Arch::Powerpc64 => 64,
              Arch::Powerpc64Le => 64,
@@ -67,14 +90,3 @@ diff -ur src/target.rs src/target.rs
              Arch::X86 => 32,
              Arch::X86_64 => 64,
              Arch::S390X => 64,
---- a/src/auditwheel/policy.rs
-+++ b/src/auditwheel/policy.rs
-@@ -110,6 +110,8 @@
-                 Arch::Armv7L => "libc.musl-armv7.so.1",
-                 Arch::Powerpc64Le => "libc.musl-ppc64le.so.1",
-                 Arch::Powerpc64 => "", // musllinux doesn't support ppc64
-+                Arch::PowerpcLe => "", // musllinux doesn't support ppcle
-+                Arch::Powerpc => "", // musllinux doesn't support ppc
-                 Arch::X86 => "libc.musl-x86.so.1",
-                 Arch::X86_64 => "libc.musl-x86_64.so.1",
-                 Arch::S390X => "libc.musl-s390x.so.1",
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 4bb299175cae..fa332fc42822 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.14
+version=0.12.15
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="4b45ef2f5a63d7dde7700556f60d82222c7ccba64cea70950f909b06e8355249
+checksum="aa640e1620dc466778cd48f0c9cefe08a9ade265c7f0582b005c25e9f1518be4
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From b45add7ce07d6cf0c82ca7c5677d448c6184b032 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:43:32 -0400
Subject: [PATCH 2192/2561] python3-cryptography_vectors: update to 37.0.2.

---
 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 4576117879de..e626eebdca96 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=37.0.1
+version=37.0.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -11,7 +11,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=66c9a714232be730fe822bd7e4e9da6231ff9e537ee4feb0f092c06b8ea4d94a
+checksum=7c65d3de51756f418142df605417ec2c6e961c364f70cc8a103030889d5a3219
 
 post_install() {
 	vlicense LICENSE

From e567df74fb7258ea71fba8ec5571caa9ddc3a267 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:45:53 -0400
Subject: [PATCH 2193/2561] python3-cryptography: update to 37.0.2.

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 12fd50551a13..97c7c0f59f72 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=37.0.1
+version=37.0.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -17,7 +17,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=d610d0ee14dd9109006215c7c0de15eee91230b70a9bce2263461cf7c3720b83
+checksum=f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 02538f0f64014d612ebc7fb0fd43219badba7b8a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:47:06 -0400
Subject: [PATCH 2194/2561] python3-imageio: update to 2.19.1.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index 17b159983528..6966116f3b8a 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.19.0
+version=2.19.1
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=df6f0f80b7e7dbad66e80d223ecfdcb6285c800716251aabc49fcf756b516168
+checksum=1c8ee257e71c544e663e824a6082bfbc080d1c673a7230487acc3f99112d9135
 
 post_install() {
 	vlicense LICENSE

From 9cf3c8487a30868b72d795f58de6b327bb803a84 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:47:30 -0400
Subject: [PATCH 2195/2561] python3-more-itertools: update to 8.13.0.

---
 srcpkgs/python3-more-itertools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template
index 59676a780535..914d46f0a695 100644
--- a/srcpkgs/python3-more-itertools/template
+++ b/srcpkgs/python3-more-itertools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-more-itertools'
 pkgname=python3-more-itertools
-version=8.12.0
+version=8.13.0
 revision=1
 wrksrc="more-itertools-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/erikrose/more-itertools"
 distfiles="${PYPI_SITE}/m/more-itertools/more-itertools-${version}.tar.gz"
-checksum=7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064
+checksum=a42901a0a5b169d925f6f217cd5a190e32ef54360905b9c39ee7db5313bfec0f
 
 post_install() {
 	vlicense LICENSE

From d8409b2761a524ba8ef400782fe7b4c8eb12daa6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:47:47 -0400
Subject: [PATCH 2196/2561] python3-pip: update to 22.1.

---
 srcpkgs/python3-pip/template | 4 ++--
 srcpkgs/python3-pip/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-pip/update

diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template
index 51b892eb0596..2f0080bc1ebb 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=22.0.4
+version=22.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=b3a9de2c6ef801e9247d1527a4b16f92f2cc141cd1489f3fffaf6a9e96729764
+checksum=2debf847016cfe643fa1512e2d781d3ca9e5c878ba0652583842d50cc2bcc605
 # Tests have unpackaged dependencies
 make_check=no
 
diff --git a/srcpkgs/python3-pip/update b/srcpkgs/python3-pip/update
new file mode 100644
index 000000000000..e9b0a0a5ea4c
--- /dev/null
+++ b/srcpkgs/python3-pip/update
@@ -0,0 +1 @@
+ignore="*b*"

From a98bf4e10d9006ff8965fff4cf4dba4388aceba1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:48:09 -0400
Subject: [PATCH 2197/2561] python3-pytools: update to 2022.1.7.

---
 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 1367b8ec31b1..f019ed703836 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.6
+version=2022.1.7
 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=9271dc8a65da02fa3fe342e2be7979b2d10f792f3b54fb115e51bf10386eb770
+checksum=9083e8b6e617560eebb7e0c22c01545b1599eb1c048fe72ca2796f22c040a317
 
 post_install() {
 	vlicense LICENSE

From f6059917139e95fbdd4adb4ed16984e0fe8cc6d0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:48:22 -0400
Subject: [PATCH 2198/2561] python3-tifffile: update to 2022.5.4.

---
 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 a34273322530..eee1d7dcc283 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.4.28
+version=2022.5.4
 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=5ee740afa64bfc8da5b1e7badc5d4e20766f7631adb48792e5ee72978ba0fcff
+checksum=352ed08a1b0d91bccd0246139da8eec9b98ed8f7dd6c3f548fe2940fb67541e2
 # Tests require unpackaged fsspec
 make_check=no
 

From f142a36e6ed31c2771f8e64dab52d92918746ad8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:53:10 -0400
Subject: [PATCH 2199/2561] qtutilities: update to 6.6.1.

---
 srcpkgs/qtutilities/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index d0e2622414d5..07c824a44a0c 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,17 +1,22 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.6.0
+version=6.6.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel cpp-utilities-devel"
+checkdepends="xvfb-run"
 short_desc="Qt helper routines, including dialogs, widgets, and models"
 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=2dda37fd6e1cd957f0a2b395ce424ca23cfc893310c0cebc82d89dc960239d13
+checksum=118df63a255a181c14cf1588c6abddda73bc545125a8406aa8e0e4f9fa98a13d
+
+pre_check() {
+	ninja -C build tests
+}
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From f43f618e0a849a07a3abd877f7aa56eeeeb134bf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:54:02 -0400
Subject: [PATCH 2200/2561] tagparser: update to 11.2.0.

---
 srcpkgs/tagparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 494b83e203eb..37fb00fc2c01 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=11.1.0
+version=11.2.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=dc3bd56ee7ddd3220062d2637b89dffc27747c3027c4b223a4697d693e55e2f1
+checksum=8f1ed6b15ec70f90d918c2c31f4ebbbca900cc8f35be76127d777316eb783f16
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From d4bdc480ca761a1f140d32f49fa718dc7726e391 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 09:54:36 -0400
Subject: [PATCH 2201/2561] tageditor: update to 3.7.1.

---
 srcpkgs/tageditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 0f9ad2024a6d..a97acf3a24c1 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.7.0
+version=3.7.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=e3814efdb9ca9bc386b51c602f8f4f507e8698ecdaf39a5849ed1795ddaa5c38
+checksum=df567627b91114da23664d4194f2fd2392cc24da7e59bd71e1e86f7638e2a5fb
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 4bb61e93f8caba3dd972e0fef82912483d959494 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 May 2022 20:03:26 +0200
Subject: [PATCH 2202/2561] perl-LWP: update to 6.65.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index a093660fbdaa..f61f2d0f0cb0 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.64
+version=6.65
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=48335e0992b4875bd73c6661439f3506c2c6d92b5dd601582b8dc22e767d3dae
+checksum=ae048023d275e1d6ad72882fa8b818f6e16d18d9cbda1f6f8e4012b93d4c834c

From 456e67900a61959cc162c63c707f4f86a891c981 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 12 May 2022 20:05:21 +0200
Subject: [PATCH 2203/2561] janet: update to 1.22.0.

---
 common/shlibs          | 2 +-
 srcpkgs/janet/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d75ecdda38dc..680ab7920513 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3904,7 +3904,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.9 libcbor-0.9.0_1
 libfido2.so.1 libfido2-1.6.0_2
-libjanet.so.1.21 janet-1.21.1_1
+libjanet.so.1.22 janet-1.22.0_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 8c3612e4dd77..83a1f7fb3d10 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.21.2
+version=1.22.0
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=52db8d18f93351256d0731810e8bea95516db8142f51eeb31664f7884bf63088
+checksum=7c6969f8e82badc7afa28aa1054555c1c91d2858f9f45c41a82557f5c5ce85bd
 
 post_install() {
 	vlicense LICENSE

From f2562c963f88c6ddab7c848f1afe91d208ffb00e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 12 May 2022 21:00:44 +0200
Subject: [PATCH 2204/2561] lagrange: update to 1.13.4.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index a430d64fda49..fad02e8df150 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.13.3
+version=1.13.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=a25c48bb4c5c9eb81ba0e93609a5b0e350194eddab27bc55a5b86ae7b749259b
+checksum=3bd9c3c370f23da3d2ae63d6560721799a07c05fab6c7b8c592e7e8b2e8d4434
 
 post_install() {
 	vlicense LICENSE.md

From 6b6fd71219690daf8fa4524c088340cf2e10b2b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 12 May 2022 21:07:54 +0200
Subject: [PATCH 2205/2561] mpdevil: update to 1.7.0.

---
 srcpkgs/mpdevil/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mpdevil/template b/srcpkgs/mpdevil/template
index 348f570c274c..4cf34103022d 100644
--- a/srcpkgs/mpdevil/template
+++ b/srcpkgs/mpdevil/template
@@ -1,13 +1,13 @@
 # Template file for 'mpdevil'
 pkgname=mpdevil
-version=1.4.1
+version=1.7.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"
+build_style=meson
+hostmakedepends="gettext pkg-config glib-devel"
+depends="python3-mpd2 python3-gobject gtk+3"
 short_desc="Simple music browser for MPD"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 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=6402fbc18dcefdd2e967f45690ea325112760cf9a87c644f3880ae14a654441d
+checksum=5821963a766d1ed35a96200d1d7153176e47c361579d70a9822377f8b1df2718

From bba99aa60f67ddbcf8da622a4c882d26154bb2f1 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 12 May 2022 12:52:28 +0200
Subject: [PATCH 2206/2561] pipe-viewer: update to 0.2.1

---
 srcpkgs/pipe-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index 670d4181ab17..1b6091d47ff9 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.2.0
+version=0.2.1
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,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=3913ecfaa3006f645603fb76df9962829138ca62d4b0acaf8b8d4d2e58902f64
+checksum=683b817415186f63cc0f7e0540a3935d965cf470d429525d17e1cefb2de22353
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From bf9ed3cb0a2d20b09c32b8cd275555abbb0732f8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 12 May 2022 22:52:22 +0200
Subject: [PATCH 2207/2561] nocache: update to 1.2.

---
 srcpkgs/nocache/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nocache/template b/srcpkgs/nocache/template
index 1c4198631e74..b864dbd5c6fc 100644
--- a/srcpkgs/nocache/template
+++ b/srcpkgs/nocache/template
@@ -1,17 +1,19 @@
 # Template file for 'nocache'
 pkgname=nocache
-version=1.1
+version=1.2
 revision=1
 build_style=gnu-makefile
+make_check_target="test"
+checkdepends="perl"
 short_desc="Minimize filesystem caching effects"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/Feh/nocache"
 distfiles="https://github.com/Feh/nocache/archive/v${version}.tar.gz"
-checksum=e5441b27f60e1af5551b76fe0c8a9da17b8c31675794d9d49bf59c7c47fbb9b9
+checksum=2f8c6adbc82da4477416e1eaf9d435cf52f602d07064602f433d4ba4ecad5fdd
 
 pre_build() {
-	sed -i -e '/#include <error.h>/d' cachedel.c cachestats.c
+	vsed -e '/#include <error.h>/d' -i cachedel.c -i cachestats.c
 }
 
 post_install() {

From 86c3a33e18fad9f88e54f41ecb0b5798acb1471c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 12 May 2022 20:31:00 -0400
Subject: [PATCH 2208/2561] Revert "python3-matplotlib: update to 3.5.2."

This update breaks event-loop integration with IPython, preventing
figures from updating without manually calling a draw function.

This reverts commit 69d5ad4bc9acd55d6190dcd4ea939eb6aefef0e3.
---
 srcpkgs/python3-matplotlib/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template
index e4e03bc540ba..e4d44cb11edc 100644
--- a/srcpkgs/python3-matplotlib/template
+++ b/srcpkgs/python3-matplotlib/template
@@ -1,7 +1,8 @@
 # Template file for 'python3-matplotlib'
 pkgname=python3-matplotlib
-version=3.5.2
-revision=1
+reverts="3.5.2_1"
+version=3.5.1
+revision=2
 wrksrc="matplotlib-${version}"
 build_style=python3-module
 build_helper="numpy"
@@ -14,7 +15,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=c81325d1b0d822ef75fd71d243f98478cdca1f800a838a2a1bc8e4e17b8df93c
+checksum=9683da9a0c84d1c42d1bf92ecf6e012d302406a38fd987e3dfbcb7b58b2eea2d
 replaces="python3-matplotlib-data>=0"
 # Comparison of images is too frail for validation
 make_check="no"

From afa0a6adc7fc137a4c382313aee7505c116bb63f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 13 May 2022 10:45:02 +0200
Subject: [PATCH 2209/2561] lagrange: disable SSE4.1

---
 srcpkgs/lagrange/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index fad02e8df150..584682270b78 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,8 +1,9 @@
 # Template file for 'lagrange'
 pkgname=lagrange
 version=1.13.4
-revision=1
+revision=2
 build_style=cmake
+configure_args="-DTFDN_ENABLE_SSE41=NO"
 hostmakedepends="pkg-config zip"
 makedepends="pcre-devel SDL2-devel openssl-devel zlib-devel libunistring-devel
  mpg123-devel libcurl-devel fribidi-devel harfbuzz-devel libwebp-devel"

From 9afe3aac3bf9a8b60dba492021b8fa0d9c00f335 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Mon, 9 May 2022 20:36:08 +0200
Subject: [PATCH 2210/2561] lazydocker: update to 0.18.1

---
 srcpkgs/lazydocker/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lazydocker/template b/srcpkgs/lazydocker/template
index caf9198328f6..50a36c7a5899 100644
--- a/srcpkgs/lazydocker/template
+++ b/srcpkgs/lazydocker/template
@@ -1,17 +1,18 @@
 # Template file for 'lazydocker'
 pkgname=lazydocker
-version=0.13
+version=0.18.1
 revision=1
 wrksrc="lazydocker-${version}"
 build_style=go
 go_import_path=github.com/jesseduffield/lazydocker
+go_ldflags="-X main.version=${version}"
 depends="docker docker-compose"
 short_desc="Simple terminal UI for docker and docker-compose, written in Go"
 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=4328ddcb3156ff57c1e21c0d2f9d9d67d48237a386d338f1d68831b6056dfe3e
+checksum=f5081b846d530818e1f04b9e8479c801f287ac77ebdf063425a142ff50fc395b
 
 post_install() {
 	vlicense LICENSE

From 3def04130592b405b049a94e8ea26064d42ab683 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 5 May 2022 15:18:37 -0500
Subject: [PATCH 2211/2561] Signal-Desktop: update to 5.43.0, adopt

---
 srcpkgs/Signal-Desktop/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 43e11503bd50..aee39932147e 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.41.0
+version=5.43.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -10,11 +10,11 @@ archs="x86_64"
 hostmakedepends="git git-lfs nodejs python3 tar yarn"
 depends="cairo gtk+3 libvips pango"
 short_desc="Signal Private Messenger for Linux"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="akierig <anelki@fastmail.de>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=55a201912f5a41c1a76d210d3942078e734ac619df7ffb56083149ce4995e949
+checksum=9239dfc0356cec3c0aaea93e09d0ac44030037f24c1dcc3725e1e417c74af419
 nostrip_files="signal-desktop"
 
 post_extract() {

From f0499c423293f1d75156c2197ed7ab883399a1eb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 13 May 2022 13:25:00 +0200
Subject: [PATCH 2212/2561] linux5.10: update to 5.10.115.

---
 srcpkgs/linux5.10/files/i386-dotconfig    | 5 ++---
 srcpkgs/linux5.10/files/ppc-dotconfig     | 4 ++--
 srcpkgs/linux5.10/files/ppc64-dotconfig   | 5 ++---
 srcpkgs/linux5.10/files/ppc64le-dotconfig | 5 ++---
 srcpkgs/linux5.10/files/x86_64-dotconfig  | 5 ++---
 srcpkgs/linux5.10/template                | 4 ++--
 6 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index e3ea24162dc7..70d61a837efd 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.10.99 Kernel Configuration
+# Linux/i386 5.10.115 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2237,6 +2237,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3563,8 +3564,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index 078ffac9ee09..4e8adac5af1d 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.99 Kernel Configuration
+# Linux/powerpc 5.10.115 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -1815,6 +1815,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_MAC_FLOPPY=y
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
@@ -3139,7 +3140,6 @@ CONFIG_MISDN_W6692=m
 # CONFIG_MISDN_NETJET is not set
 CONFIG_MISDN_IPAC=m
 CONFIG_MISDN_ISAR=m
-# CONFIG_NVM is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index 5d973825057c..7227a355e3c6 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.99 Kernel Configuration
+# Linux/powerpc 5.10.115 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2243,6 +2243,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3640,8 +3641,6 @@ CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index a5158c12dd3f..de9c8c54e6a7 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.10.99 Kernel Configuration
+# Linux/powerpc 5.10.115 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2143,6 +2143,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3475,8 +3476,6 @@ CONFIG_USB4_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index fa04bb81b4dc..1a5057ad0234 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.99 Kernel Configuration
+# Linux/x86_64 5.10.115 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2297,6 +2297,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3635,8 +3636,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index e2bf0b9cae3d..c5bd16c1ade3 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.113
+version=5.10.115
 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=82516a02bb52456f6e8057217dde6e02b78003b1e058117557c2ae9661696dfc
+checksum=f5e417b32f89318b6d0a230109a592ffd68997817463dc4692fa49ec7fe42f71
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From de8c22ab169befde6016ab96b0f00d2dc8180a52 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 13 May 2022 13:39:37 +0200
Subject: [PATCH 2213/2561] linux5.15: update to 5.15.39.

---
 srcpkgs/linux5.15/files/i386-dotconfig    | 30 ++++++++++-------------
 srcpkgs/linux5.15/files/ppc-dotconfig     | 24 +++++++++---------
 srcpkgs/linux5.15/files/ppc64-dotconfig   | 22 ++++++++---------
 srcpkgs/linux5.15/files/ppc64le-dotconfig | 22 ++++++++---------
 srcpkgs/linux5.15/files/x86_64-dotconfig  | 25 ++++++++++---------
 srcpkgs/linux5.15/template                |  4 +--
 6 files changed, 62 insertions(+), 65 deletions(-)

diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index db7fdf4d3bbd..0e497896cbbb 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.22 Kernel Configuration
+# Linux/i386 5.15.39 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2312,6 +2312,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -2934,6 +2935,7 @@ CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
+CONFIG_CX_ECAT=m
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -2952,8 +2954,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -2973,7 +2973,6 @@ CONFIG_CHELSIO_TLS_DEVICE=m
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_NET_VENDOR_CORTINA=y
-CONFIG_CX_ECAT=m
 CONFIG_DNET=m
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_TULIP=y
@@ -3027,7 +3026,6 @@ CONFIG_I40EVF=m
 # CONFIG_ICE is not set
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_NET_VENDOR_MARVELL=y
@@ -3083,9 +3081,12 @@ CONFIG_ENC28J60=m
 CONFIG_ENCX24J600=m
 # CONFIG_LAN743X is not set
 CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3098,8 +3099,6 @@ CONFIG_NFP=m
 # CONFIG_NFP_APP_FLOWER is not set
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NE2K_PCI=m
 CONFIG_NET_VENDOR_NVIDIA=y
@@ -3125,6 +3124,8 @@ CONFIG_QEDE=m
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCOM_EMAC=m
 CONFIG_RMNET=m
@@ -3145,6 +3146,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3153,11 +3159,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
@@ -4832,15 +4833,11 @@ CONFIG_DEVFREQ_THERMAL=y
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_THERMAL_VECTOR=y
 CONFIG_X86_PKG_TEMP_THERMAL=m
-CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 
 #
 # ACPI INT340X thermal drivers
 #
-CONFIG_INT340X_THERMAL=m
-CONFIG_ACPI_THERMAL_REL=m
-CONFIG_INT3406_THERMAL=m
 # end of ACPI INT340X thermal drivers
 
 CONFIG_INTEL_PCH_THERMAL=m
@@ -9955,7 +9952,6 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_HEADERS_INSTALL is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_VMLINUX_MAP is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig
index 6ca79da60447..ad1e046893d2 100644
--- a/srcpkgs/linux5.15/files/ppc-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.15.22 Kernel Configuration
+# Linux/powerpc 5.15.39 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -1865,7 +1865,6 @@ CONFIG_OF_EARLY_FLATTREE=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 # CONFIG_OF_OVERLAY is not set
 CONFIG_OF_DMA_DEFAULT_COHERENT=y
@@ -1882,6 +1881,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_MAC_FLOPPY=y
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
@@ -2479,8 +2479,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 # CONFIG_MACB is not set
 CONFIG_NET_VENDOR_CAVIUM=y
@@ -2566,7 +2564,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 # CONFIG_FM10K is not set
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -2608,9 +2605,12 @@ CONFIG_NET_VENDOR_MICROCHIP=y
 # CONFIG_ENCX24J600 is not set
 CONFIG_LAN743X=m
 CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -2621,8 +2621,6 @@ CONFIG_VXGE=m
 CONFIG_NET_VENDOR_NETRONOME=y
 CONFIG_NFP=m
 # CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-# CONFIG_NI_XGE_MANAGEMENT_ENET is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -2649,6 +2647,8 @@ CONFIG_QEDE=m
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 # CONFIG_QCA7000_SPI is not set
 # CONFIG_QCA7000_UART is not set
@@ -2669,17 +2669,17 @@ CONFIG_NET_VENDOR_ROCKER=y
 CONFIG_NET_VENDOR_SAMSUNG=y
 # CONFIG_SXGBE_ETH is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MCDI_MON=y
 CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig
index 355ff2fa768c..6e196ad358c3 100644
--- a/srcpkgs/linux5.15/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.15.22 Kernel Configuration
+# Linux/powerpc 5.15.39 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2310,7 +2310,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
@@ -2328,6 +2327,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -2967,8 +2967,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -3073,7 +3071,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -3130,9 +3127,11 @@ CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 # CONFIG_MSCC_OCELOT_SWITCH is not set
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3145,7 +3144,6 @@ CONFIG_NFP=m
 # CONFIG_NFP_APP_FLOWER is not set
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -3176,6 +3174,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -3198,6 +3198,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3206,11 +3211,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig
index 5148c4e5cf55..fb902ca0b43e 100644
--- a/srcpkgs/linux5.15/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.15.22 Kernel Configuration
+# Linux/powerpc 5.15.39 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2207,7 +2207,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
@@ -2224,6 +2223,7 @@ CONFIG_PARPORT_NOT_PC=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -2844,8 +2844,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -2926,7 +2924,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -2983,9 +2980,11 @@ CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 # CONFIG_MSCC_OCELOT_SWITCH is not set
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -2998,7 +2997,6 @@ CONFIG_NFP=m
 # CONFIG_NFP_APP_FLOWER is not set
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NE2K_PCI=m
 CONFIG_NET_VENDOR_NVIDIA=y
@@ -3025,6 +3023,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -3047,6 +3047,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3055,11 +3060,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 225e5c5022ee..32714ae96633 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.22 Kernel Configuration
+# Linux/x86_64 5.15.39 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2376,6 +2376,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -2991,6 +2992,7 @@ CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
 CONFIG_ALX=m
+CONFIG_CX_ECAT=m
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -3009,8 +3011,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -3037,7 +3037,6 @@ CONFIG_CHELSIO_TLS_DEVICE=m
 CONFIG_NET_VENDOR_CISCO=y
 CONFIG_ENIC=m
 CONFIG_NET_VENDOR_CORTINA=y
-CONFIG_CX_ECAT=m
 CONFIG_DNET=m
 CONFIG_NET_VENDOR_DEC=y
 CONFIG_NET_TULIP=y
@@ -3093,8 +3092,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
-CONFIG_MICROSOFT_MANA=m
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_NET_VENDOR_MARVELL=y
@@ -3151,10 +3148,13 @@ CONFIG_ENCX24J600=m
 CONFIG_LAN743X=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
+CONFIG_NET_VENDOR_MICROSOFT=y
+CONFIG_MICROSOFT_MANA=m
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_MYRI10GE_DCA=y
 CONFIG_FEALNX=m
+# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3167,7 +3167,6 @@ CONFIG_NFP=m
 # CONFIG_NFP_APP_FLOWER is not set
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-# CONFIG_NET_VENDOR_NI is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_NE2K_PCI=m
 CONFIG_NET_VENDOR_NVIDIA=y
@@ -3194,6 +3193,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCOM_EMAC=m
 CONFIG_RMNET=m
@@ -3214,6 +3215,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3222,11 +3228,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_EPIC100=m
 CONFIG_SMSC911X=m
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index ae0410039d0c..9f2e16a73927 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.36
+version=5.15.39
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- a40a27adb37c5ac569428c517f3eb51ce1148258db5b8a42aadb79128197d4a0"
+ b773d0ca695b0dbe1254f13396ae71120cb1e662fa89a698b29d828ba13a4b73"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 5baaa52adc0ae767b219b32161cc2e33344cfa6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 10:05:35 -0300
Subject: [PATCH 2214/2561] arduino-cli: update to 0.22.0.

---
 srcpkgs/arduino-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arduino-cli/template b/srcpkgs/arduino-cli/template
index 832daeaf2824..0653103ac372 100644
--- a/srcpkgs/arduino-cli/template
+++ b/srcpkgs/arduino-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'arduino-cli'
 pkgname=arduino-cli
-version=0.19.0
+version=0.22.0
 revision=1
 build_helper=qemu
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Henry Naguski <henry@nilsu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/arduino/arduino-cli"
 distfiles="https://github.com/arduino/arduino-cli/archive/${version}.tar.gz"
-checksum=2828bcfc113a45dd486e72968092967ce90dcd15aaaa5ca9b96863e8ec7dbc7f
+checksum=9b6bc045a0dbe8d34d90adbc5d32fdb29b1f1303c50c5893e47a2f2a517273e6
 
 case "$XBPS_TARGET_MACHINE" in
 	# the downloaded toolchains use glibc, this allows them to work on musl

From 9b538ae21f7590f7eb86656daa70f9c60fe27b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 10:14:28 -0300
Subject: [PATCH 2215/2561] thunderbird: update to 91.9.0.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index bf03d0a2eb61..d27434e30e22 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=91.8.0
+version=91.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=4a93d1773e17aa110341428165581f0176c347d55dd7f6cbed789ca8369da6fa
+checksum=616e48327c4b0cdd2fd3c6385bfa4d380ba5cc7c52ce6014ae39d389a19fd092
 
 lib32disabled=yes
 

From 5b67da7833a4b3a4b776f0df3be13970faa3db19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 10:14:32 -0300
Subject: [PATCH 2216/2561] thunderbird-i18n: update to 91.9.0.

---
 srcpkgs/thunderbird-i18n/template | 110 +++++++++++++++---------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index 0a299d66d969..b0492b7682fa 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=91.8.0
+version=91.9.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -95,57 +95,57 @@ _pkgtmpl() {
 	}
 }
 
-checksum="e338b3f00ce13b8b98213d9fb53dbdeaef8082517a2cda06a62c59d8f4021e1e
- 0c6339b23d2de88b0cea5473289c05820d44fd89999037285ed19b6394e5d221
- 4f8254201247e6d8e01924715d101e4bce8f53d3799f129a0003b528cd994839
- f7c99eb62ab9ade49d2022edca802b4ebbdf53a753c378315cccf9bf2126bff3
- 13191acb9cec0bdd45527e09e1f28205fad9e4b67682018f9f0aa6d096b40a7d
- 08e7f631467b5b1aca8d35c38936c854c3b8bbba975d1b30b5d43637e1b1cc3d
- 8b40a658dd14af8b268bef3ae656524165c9e432f2df882c21a083b477379a76
- 68247d9f9e33f803446ba4c114d5db8173dc46aa93bf06c828a2d154c69e4ce6
- da155c974f591a6f7b29f42ddb82ed94fee8db34b0b7c67a18d747c38138fb7b
- 3cf905249aeb0676d8a6206746c1d0ee03fba579bd39d9ec8e9cdc8a23ba6232
- 2afa46cf5301607dc1b18933bd3877842ffcb86563bb8ddf859114aa74bacf1c
- d437fd884c900cdce7c22bfdf445819ebe8f27d6d2b32392e6ab4291188403b5
- 458ff1cd1a3a3357d6592f04fadc5bb6c06a1a8ae4e095de599c0a4b4f3f4c39
- 5a3cc430c53f3a2e7258be9c4dc90002e74b1df4fedd57d748034facdf09462f
- aa41718568841dd4b2487023d7c68b88a7d4cce6634c2c8b2af5a5024e910491
- 8e08fca9f5b4284cd78cd80f54f2005cfaa9db9b2df596aabff3cf85fed3b032
- 00647c73c5d834c2daa7b1c04c152ba70e530f8917a88b48b876634e6735a08d
- 3b367c2aeb5c0b7e7158570cba56473f36f0e4e2105528f6cff6424a8bb1b188
- 602f80592d721c0d1157845c9cf83547b4497842cfd37ae5466190d5f89fc2ca
- 310a50fbd029f0bbb5d7b3b80b9f0882ddf03667caa2c93a1f2c878c32bd1404
- cf75c1a2992d11b2ea5f4160d34f793fd00d7eae2c3604fe35a96303bdd5b6d0
- 39255ccf6c1661287fab017e95a3c1eb74619d408bdce09dd359fd58f2303ca4
- 41e9b2df204081b13ff2adb391f0414b2b0ba4bf83bf2118a30c21265b19983e
- f6be5a2cf4006b31459a887e14f69e61505e3577ece674e81356ae53b025b4ab
- 22575da8459ceb57e1dd3e02c9a5e7219b894767438d810b94dfd6c4e97bb3ae
- 27487ba8f1115f1aff0245629fdc1b785391d5af98521e58937677f173eb0f45
- 666bd43ccbdb37f097477273aa8ca11b9716c024f8c162bb81a1b07006044bc0
- 1907c178beac70dafdab55acbc87e56a9913142ffaa85be6cbe541361d53d24c
- 20e7464b43f12dcdcb3892a6e9c7d7c46a2385a82953c388599cbeeabc362786
- 6a7e2ee51d92aa5db52816de0dbf103ce2abf40a34411498fb7b2380dc87101d
- 2d2be878ba6d5afcb6823f58a6939ebe895290a925b13234ed2c63d013ad5165
- d329c730c338b7d9e4a3fc07fae4537dd0be0b86317db42b1270daaeb7025f98
- 51ead8dd506cc5aaf4dfb58be942b3061869c9c26bfec9b29930d0a627c32aa9
- ba4191dca0ec8a9eb70cc3d9d0a20d50fa87a5c0be3190db0ef5867532ef8318
- 4e849ddec5f68004315b93dc8e382774101a815e9bf476f10c8e804a9657aa2e
- 04b06a1a5842962116ef0eae6dfa263197e04b5a560ce7386f786322b5199364
- 8f81e86174d6126e0e0551b1431713f09ca66e3dc546cd5a7838d17c2cddf52e
- 1ca4983cf2de4a0ac8debdfba0c0e3844cd5020199f4ab054864dda7ae2170da
- f625cda77e82c13e358d33df96d613ea8145a170b54ce399bfe960e0b88ef146
- 93b79805973de19cd0beaea81add9a0f40e3746b88648c6c7e90a0fbba857777
- 368b268f6b08b5e1d0f1ffeeb662ab4460bc3b60d6c3ced54a6efff44e6bec2e
- 8de648e97c00fc1988ae5788944c3821304c49f49a669797e3bdc4c3637ff336
- 1489f343e79064d24549556f7d7164ea0e9e0e65256290f8287a00fdd256bd04
- 0f004c54f4fce861b709d6f0d394c6ebb01a16aedc29e6599f56c7d043e18936
- 8f7a814d8a47efa9fe1509b0ea450697e2e6007beb5b78e2937b3f2b133402b3
- 7db9b294668932d2e59309c452ab74d0d737eb6c8220f6fa5aafd7be66ea42dd
- b9c81d14520928957f95e40faa80a8ed63e76758652fb3a73458a848d9703ac7
- 1129915d753dc68c4d4e23e6d4dea5de7c911f7d3204448b231f8755d7447c70
- 76badde28f93f4d8e05c163a357223bf1a85e9301cf6221b222553f637e33532
- c50d5aa28e33dee903a31b1ea73c01575d7d784cc86dfec0f853dc51e31bef40
- 6b897ca847c9d497895d2dc2164582836407902c2784219617ce14b80b140739
- 4cd25edb40fd1309d1121cb582001d580605eb12ec414fe4125d580b809927c9
- 2b822f814877d3b20ced442e466ff78cc0e2effa971b5e7b16ddd6bb9500c7c3
- b2962ead550ab841c4981a70a0f80f1baeb2d10165dc7536d069598643f3d4d5"
+checksum="0ce1beef54dbedfa0805ac3f5cad1520f60acb09d2a39711fdb33532645e2924
+ 6922131d1a57c6525a4ce4c495c809ecfe255f45c0b110dcccacf2137036153e
+ d039e0e8d4421c98eea04ca69fd48332c107ca3f57deec0b9985d8a3a60df5fa
+ 16a85769ebba4719732f10fde372c6363731d20ca228bd31d38db1b2dc7fe6e9
+ 5363483b71670f2dd418519c5e0a7d9abb01057e15c7f5c3893285c478c9b7d5
+ 7b49e28df13fc28691ab22223da98431f9b14c271a61fc863deda92512504d0f
+ acc349d2b4da8aeb7f554fe00efd75161919dde821b4dcb8170d7b74301a5274
+ af60b34b9e7b6a04c67c0c105fc9a757409e1d15e8ba5ae59e1b57ec70c2afe1
+ 99a7150815a0c8adf9eafa21779540ce08198f45a58566a4db149904659395bc
+ 6f5ac93dd4c69316ca3112db66c1da65a899ad94be13f135e96f4fca4b186a1a
+ 9adadd236b2095393ee811e0b952d70f034f816036dc90b31ca82cd3be4e2574
+ 35654dc18ef7363eb6d603f229b8f53c2b0eb506bb4414b42699344887b18477
+ e353e6d913c0b23863c3fcc1a91f37fb5cbeece2dcfbe4b45cad8d7673fa58d1
+ da884de1c02b92b5421c84ffa9b3e83939add60cb2cb79336e5ba58e8ef74cd3
+ cfae324fb7af7475baf1a7202e4da08dcfa422b09acc7fddde411322185ea5ce
+ b786362cf397dc5cec3d91ac592da033609c67a6d67a7e21a8133cdf52e9d604
+ 0e04c656b7a14c3800286d95bd513eec63566e7ba28aefbd7cc55073395cd906
+ e334ef8b569eb8eeaf8b95058b87c06c872edcda67cc5c7d3432b2021183469c
+ 001ae51d73e21e546da191b85596f3c33573cf1d81fc6141d329c9e6851e73c7
+ 972803d21adf67fa61464f6f701a5f254fe223fc2e83e83cc3e2e47ecaa88be4
+ c816a554eee3ebbbcde9efd991ca95c99d4402e87184ac13bb390c485048e9bb
+ 49328cf9998e464730a16dade381fbc8562457083fcdbe6a38814ef934a27d4e
+ 2039ca0bbaf1992d2709a010139106b09d38c32054402240e2e5cc66e6854598
+ 744e711200cf8a568ad4200c3c5ce086798495874fb6f6581f1636f0bf8bbbfb
+ dc284a451c2bb8df5121edcc1b68c823f5f9210c7a97d162ecc5ab3575df1219
+ 258b93a4bc5048c96e568f6d2bcd665ec8adfd47d82fd8247dd26bf9c6289f3c
+ e3b0cfdb2c428c3f6ba6dd589807245ed6cbfb6fe17cd27348a39e97151d2b40
+ e9f5c2338acce514e958d7d9c77ad9428930f7ef9ba39291d7a2efe8045f3bf9
+ 0ff0260f8a7456cee42b0528b45e3c9821cce159f8c81b057e53da027c6932e3
+ aea0bec5ecbf61d6a44acc6c6946ebf002acc80c95c034f913a53d5ce28491c5
+ 9f4982e6fa9c5deadf0f49116f79a5105ee5e9e623319e0a3f3fda6678a8ead4
+ 893d5851100e2bfd462529bdb6fe8ab19c42cbebd7e02725d3ea79f9cccc0f16
+ c44f697280b29c4961cb0f59dd4692068ba3bd80d56b3724288227bdbd227524
+ c04195860e0871d89f7b8c0977d34a676746a8b504a1c871062f635c1000a9cb
+ 08dc12dc180c59fe76787243c292bd4896193d56940bda3ef6aa723c9fbb855f
+ 1cb6fdddb41a038f7eefc41af1a06d4da287a7d4ed958298799fdf724883cd19
+ ece6218b8603fc7931bf2e3be52235b0448b0b418716c32323b9a118d9260f5c
+ 9e92c7a11b3e4d37d2377d5601a760f32ac79be0c7d2907a0cbabc340b141564
+ dac4ae0c976d806f0a0e325405153e93cb37e31febb45d4fc03a3b8f1578fdbe
+ 62b63c940f24a826d538305a9d3e108308edaf4421aaff73c02e5fc03fbc2259
+ 7eb08ab6108b8925229591368a33bb95dc880850860addaa914ea994f1e772c8
+ b9b73326aef68b2b547b2654f995fce7e99c085e0c4ebea394ae276b0bc87c14
+ d503a590b9e6b38b19574c71a95af806249f5ca7bab5a87256e6694bdcc17e08
+ 30269418942d78ebc5560ffcb81bcf31d14a0579e356b14699af46af8c19da30
+ 90113e8574ee41b463904012442bcd759147d6799ce743a9cbcf6860e6ae98b8
+ a86cb03c5eb8bc498127c6453a306e46d089cce36b99dabc747e3696d0740463
+ f014d4c67692dc424720f0ef23ac1f918a291cb904e31fd809bf4aff6c339c7e
+ fb1e4741305ec130ba7b06172ec34a08ca5b24c3e13a2e52249a21e1053482fd
+ 0d8120993a0430d3dacc71589495d1a9a811a8b17d2dd93cf2dc27e5613e2717
+ 361835a4ae3117a1c34b782d47001c46d632d46674eb59b8ccfb168ccf53737b
+ f9410e78a0f43e4dfb06859aa84b2ddeceb8719552fb9cce41ba43a8f95f1805
+ 4a1e7534982e55831056f0a59154c674025de11a332dbc083ad2fd66b9ea1e80
+ e69994d2b0fd425ba0a73b0971358988ce7a0aa62fdc370a180175c0ff848fb0
+ 2aedbe39ac0e555d0a27b6d266dc2e575dcb9e5ba057cf05dd6c6be8261571c7"

From 827c0b807985ed19da1bb7c5373c876296f9fbbf Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Tue, 12 Apr 2022 06:49:28 +0530
Subject: [PATCH 2217/2561] wireplumber: update to 0.4.10, fix service.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit 9f50345e006a3620a6142ffce4023229f8d42d7c added a runit service
for wireplumber but set HOME to a directory that doesn't persist across
boots.

wireplumber stores the state configuration in
${XDG_STATE_HOME:-$HOME/.local/state}/wireplumber and
pipewire-media-session (the default media router) uses /var/lib/pipewire
as persistent location, so we can use the same directory.

Co-authored-by: Érico Nogueira <erico.erc@gmail.com>

Closes: #36650 [via git-merge-pr]
---
 srcpkgs/wireplumber/files/wireplumber/run | 2 +-
 srcpkgs/wireplumber/template              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
index ae0cf99e200b..9a28ecdbe9a4 100644
--- a/srcpkgs/wireplumber/files/wireplumber/run
+++ b/srcpkgs/wireplumber/files/wireplumber/run
@@ -6,5 +6,5 @@ sv check dbus >/dev/null 2>&1 || exit 1
 
 exec 2>&1
 
-export HOME=/var/run/pipewire
+export XDG_STATE_HOME=/var/lib/pipewire
 exec chpst -u _pipewire:_pipewire:audio:video -P dbus-run-session wireplumber
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index acbffa27fd8c..1413d2ad84bc 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,6 +1,6 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
-version=0.4.9
+version=0.4.10
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://pipewire.pages.freedesktop.org/wireplumber"
 changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
-checksum=0b25774a2821286a1fa31afb7db8db0573f493b35c40a7031b6e5a30cec0bbe3
+checksum=bddc5bb3c47e97c170d27c712bc3c7912592aea1ea9df747e92685f5194456d4
 
 post_install() {
 	vlicense LICENSE

From d9ba91163db0247f8f99e739dbcc1d996157263c Mon Sep 17 00:00:00 2001
From: Omar Polo <op@void-live.homenet.telecomitalia.it>
Date: Mon, 2 May 2022 16:31:36 +0000
Subject: [PATCH 2218/2561] New package: got-0.70

---
 srcpkgs/got/patches/cross.patch | 18 ++++++++++++++++++
 srcpkgs/got/template            | 23 +++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 srcpkgs/got/patches/cross.patch
 create mode 100644 srcpkgs/got/template

diff --git a/srcpkgs/got/patches/cross.patch b/srcpkgs/got/patches/cross.patch
new file mode 100644
index 000000000000..377a34c8c475
--- /dev/null
+++ b/srcpkgs/got/patches/cross.patch
@@ -0,0 +1,18 @@
+--- got-portable-0.69/configure.ac.orig
++++ got-portable-0.69/configure.ac
+@@ -204,6 +204,7 @@
+ 		[return (reallocarray(NULL, 1, 1) == NULL);]
+ 	)],
+ 	AC_MSG_RESULT(yes),
++	[AC_LIBOBJ(reallocarray) AC_MSG_RESULT([no])],
+ 	[AC_LIBOBJ(reallocarray) AC_MSG_RESULT([no])]
+ )
+ AC_MSG_CHECKING([for working recallocarray])
+@@ -212,6 +213,7 @@
+ 		[return (recallocarray(NULL, 1, 1, 1) == NULL);]
+ 	)],
+ 	AC_MSG_RESULT(yes),
++	[AC_LIBOBJ(recallocarray) AC_MSG_RESULT([no])],
+ 	[AC_LIBOBJ(recallocarray) AC_MSG_RESULT([no])]
+ )
+ 
diff --git a/srcpkgs/got/template b/srcpkgs/got/template
new file mode 100644
index 000000000000..4c0b09d07b01
--- /dev/null
+++ b/srcpkgs/got/template
@@ -0,0 +1,23 @@
+# Template file for 'got'
+pkgname=got
+version=0.70
+revision=1
+wrksrc=got-portable-${version}
+build_style=gnu-configure
+hostmakedepends="automake byacc pkg-config"
+makedepends="libmd-devel zlib-devel libuuid-devel libbsd-devel ncurses-devel openssl-devel"
+short_desc="VCS which prioritizes ease of use and simplicity over flexibility"
+maintainer="Omar Polo <op@omarpolo.com>"
+license="ISC"
+homepage="https://gameoftrees.org"
+distfiles="https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"
+checksum="2e534ed89f794a61543e6d2cb306903ea04f93977ed241004585c6b85e8b074e"
+
+pre_configure() {
+	autoreconf -fi
+}
+
+post_install() {
+	sed -n '/Copyright/,/PERFORMANCE/p' got/got.c > LICENSE
+	vlicense LICENSE
+}

From 92deba6de5648230395a108de0ec3ca345ec09e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Thu, 12 May 2022 12:05:46 +0200
Subject: [PATCH 2219/2561] lux: update to 0.15.0.

---
 srcpkgs/lux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index c09f51778e30..9e738499f207 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,6 +1,6 @@
 # Template file for 'lux'
 pkgname=lux
-version=0.14.0
+version=0.15.0
 revision=1
 build_style=go
 go_import_path=github.com/iawia002/lux
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/iawia002/lux"
 distfiles="https://github.com/iawia002/lux/archive/v${version}.tar.gz"
-checksum=3d485c9703851f3fb5cdee9b029b5b6855f84bfd29b44cae310a031a6fa8c00f
+checksum=41e45542587caa27bf8180e66c72c6c77e83d00f8dcba2e952c5a9b04d382c6c
 
 post_install() {
 	vlicense LICENSE

From e8385fad3ab05d37ceafdc36ba2a8d4606d6fc09 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Thu, 12 May 2022 21:49:21 +0300
Subject: [PATCH 2220/2561] opera: update to 86.0.4363.59.

---
 srcpkgs/opera/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opera/template b/srcpkgs/opera/template
index 1be0482067b9..8bc185d34277 100644
--- a/srcpkgs/opera/template
+++ b/srcpkgs/opera/template
@@ -1,6 +1,6 @@
 # Template file for 'opera'
 pkgname=opera
-version=86.0.4363.50
+version=86.0.4363.59
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -11,7 +11,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:Proprietary"
 homepage="https://www.opera.com/computer"
 distfiles="https://get.geo.opera.com/pub/opera/desktop/${version}/linux/opera-stable_${version}_amd64.rpm"
-checksum=94b73abd6e1d2a710ddbd437e11a1702d487cc9497258b90a131332123ce28a5
+checksum=426ea69abdc724c3cd36dd44d68071c02212e81162cd4238677d2aa160b09554
 repository="nonfree"
 nostrip=yes
 

From 1f60fd499b0ffd3d6ab84778e5f5095d1aceea9b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 10 May 2022 19:43:43 +0200
Subject: [PATCH 2221/2561] github-cli: update to 2.10.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 744f8c4ddb11..86b6ad53bdf9 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.9.0
+version=2.10.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=730b600d33afb67d84af4dca1af80cb1fbff79d302ac4f840fc8e9e4c25fceb7
+checksum=a94ba6a731ad558f7937d0ac46ff8034b56214ec9e24a9ad70296331b1bb12ed
 
 pre_build() {
 	local _date

From 19851bdc873a364d60762f6078fed0bc74b2b994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Wed, 11 May 2022 12:36:23 +0200
Subject: [PATCH 2222/2561] doctl: update to 1.75.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 81d5feb1d6e9..63cb90f307ca 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.74.0
+version=1.75.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
@@ -14,4 +14,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=3b0fcd2daff4cdce575f7a833a36c3a63a66c0dbb9af50baafe3ec9fe02c3872
+checksum=3fe102d60f57ee8f9bd4a8f5094fd3ddfdf7af1bbaf35c7b8286a9ae3c8a8f3e

From 3caafb34c40abe05007ebeaa488f6ece31a85608 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Sun, 8 May 2022 21:41:00 +0200
Subject: [PATCH 2223/2561] tdrop: update to 0.5.0.

---
 srcpkgs/tdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tdrop/template b/srcpkgs/tdrop/template
index d2e9668b03a1..14dfbaa93eb3 100644
--- a/srcpkgs/tdrop/template
+++ b/srcpkgs/tdrop/template
@@ -1,6 +1,6 @@
 # Template file for 'tdrop'
 pkgname=tdrop
-version=0.4.0
+version=0.5.0
 revision=1
 depends="bash xdotool xprop xwininfo"
 short_desc="Turn terminal emulator or any program into dropdown window"
@@ -8,7 +8,7 @@ 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=ef4c644ad6c2c350b2e0f97ae2712e9871e13a6baef9065bcc1d8125eb073bb1
+checksum=ac37c76cb936d8e4c1c0aba5874999e09b8acbe07a2e23e8181114bd4a2a0a5d
 
 do_install() {
 	vbin tdrop

From a882e1d54867ff3ab7638ecc0a1cb929e2a4dfc1 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Sun, 8 May 2022 15:05:58 -0300
Subject: [PATCH 2224/2561] icewm: update to 2.9.7.

---
 srcpkgs/icewm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index f42cb153a7f1..1ad1fd904689 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,6 +1,6 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=2.9.6
+version=2.9.7
 revision=1
 build_style=cmake
 make_cmd=make
@@ -18,7 +18,7 @@ license="GPL-2.0-or-later"
 homepage="https://ice-wm.org/"
 changelog="https://raw.githubusercontent.com/ice-wm/icewm/master/NEWS"
 distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
-checksum=d1ff3ce7491d857c17ed0dc3dda47ddc5fdeee23ac910fa6c42ca55b7039d541
+checksum=c7ad8599dcd2912545fca9f72ab0b68d17bcb05bc11c1b3e1c7eb9f3761c4ea5
 # broken tests
 make_check=no
 

From dd19a28b0baa4edc48820b8f7e93636a795c6c2d Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Thu, 28 Apr 2022 00:06:39 +0200
Subject: [PATCH 2225/2561] util-linux-common: update to 2.38

Closes: #36775 [via git-merge-pr]
---
 srcpkgs/util-linux-common/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template
index 0d94f16d34e8..b6e0f73d6cf4 100644
--- a/srcpkgs/util-linux-common/template
+++ b/srcpkgs/util-linux-common/template
@@ -1,7 +1,7 @@
 # Template file for 'util-linux-common'
 # Keep this package sync with util-linux
 pkgname=util-linux-common
-version=2.37.2
+version=2.38
 revision=1
 wrksrc="util-linux-$version"
 build_style=gnu-configure
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.${version#*.*.}}/util-linux-${version}.tar.xz"
-checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
+checksum=6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64
 
 post_extract() {
 	# hung inside xbps-src

From 6cab37fe054b4b88cc9f9aec0479349e28011a48 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Thu, 28 Apr 2022 00:06:27 +0200
Subject: [PATCH 2226/2561] util-linux: update to 2.38

---
 ...t-before-reading-stdin-and-fix-unini.patch | 37 -------------------
 ...ush-stdout-before-reading-from-stdin.patch | 27 --------------
 ...w-flush-stdout-before-getting-answer.patch | 35 ------------------
 srcpkgs/util-linux/template                   |  6 +--
 4 files changed, 3 insertions(+), 102 deletions(-)
 delete mode 100644 srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
 delete mode 100644 srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
 delete mode 100644 srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch

diff --git a/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch b/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
deleted file mode 100644
index 0a99aa7fae56..000000000000
--- a/srcpkgs/util-linux/patches/chfn-flush-stdout-before-reading-stdin-and-fix-unini.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 05907d0d9e7c85f33e168feab1eb36b464425054 Mon Sep 17 00:00:00 2001
-From: Lorenzo Beretta <vc.net.loreb@gmail.com>
-Date: Mon, 25 Oct 2021 14:06:00 +0200
-Subject: [PATCH] chfn: flush stdout before reading stdin and fix uninitialized
- variable
-
-Same problem as described in https://github.com/karelzak/util-linux/pull/1481
-
-Signed-off-by: Lorenzo Beretta <vc.net.loreb@gmail.com>
----
- login-utils/chfn.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/login-utils/chfn.c b/login-utils/chfn.c
-index 2508e14c9..ece5cdce0 100644
---- a/login-utils/chfn.c
-+++ b/login-utils/chfn.c
-@@ -227,7 +227,7 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question,
- 			   char *def_val)
- {
- 	int len;
--	char *buf;
-+	char *buf = NULL; /* leave initialized to NULL or getline segfaults */
- #ifndef HAVE_LIBREADLINE
- 	size_t dummy = 0;
- #endif
-@@ -242,6 +242,7 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question,
- 		if ((buf = readline(" ")) == NULL)
- #else
- 		putchar(' ');
-+		fflush(stdout);
- 		if (getline(&buf, &dummy, stdin) < 0)
- #endif
- 			errx(EXIT_FAILURE, _("Aborted."));
--- 
-2.33.0
-
diff --git a/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch b/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
deleted file mode 100644
index 280c7fd0a62a..000000000000
--- a/srcpkgs/util-linux/patches/chsh-fflush-stdout-before-reading-from-stdin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0a08200bd5664d1849e477f7f776ab4d13bb8422 Mon Sep 17 00:00:00 2001
-From: Lorenzo Beretta <vc.net.loreb@gmail.com>
-Date: Mon, 25 Oct 2021 15:28:02 +0200
-Subject: [PATCH] chsh: fflush stdout before reading from stdin
-
-Same problem as described in https://github.com/karelzak/util-linux/pull/1481
-
-Signed-off-by: Lorenzo Beretta <vc.net.loreb@gmail.com>
----
- login-utils/chsh.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/chsh.c b/login-utils/chsh.c
-index 349712072..3b446beeb 100644
---- a/login-utils/chsh.c
-+++ b/login-utils/chsh.c
-@@ -210,6 +210,7 @@ static char *ask_new_shell(char *question, char *oldshell)
- 	if ((ans = readline(" ")) == NULL)
- #else
- 	putchar(' ');
-+	fflush(stdout);
- 	if (getline(&ans, &dummy, stdin) < 0)
- #endif
- 		return NULL;
--- 
-2.33.0
-
diff --git a/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch b/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch
deleted file mode 100644
index e17c31291bcf..000000000000
--- a/srcpkgs/util-linux/patches/vipw-flush-stdout-before-getting-answer.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 34a9b65587a7d704db0344e859511af4a6756c89 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Fri, 22 Oct 2021 14:28:50 -0300
-Subject: [PATCH] vipw: flush stdout before getting answer.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise the question is displayed only after the user presses Return,
-and the program looks like it's hanging.
-
-This happens at least on musl libc.
-
-Reported by @loreb.
-
-Signed-off-by: Érico Nogueira <erico.erc@gmail.com>
----
- login-utils/vipw.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/login-utils/vipw.c b/login-utils/vipw.c
-index 8e63efde2..f59948a44 100644
---- a/login-utils/vipw.c
-+++ b/login-utils/vipw.c
-@@ -353,6 +353,7 @@ int main(int argc, char *argv[])
- 		 * which means they can be translated. */
- 		printf(_("Would you like to edit %s now [y/n]? "), orig_file);
- 
-+		fflush(stdout);
- 		if (fgets(response, sizeof(response), stdin) &&
- 		    rpmatch(response) == RPMATCH_YES)
- 			edit_file(1);
--- 
-2.33.0
-
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index ae39761e102d..63b38ec67f4a 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,8 +1,8 @@
 # Template file for 'util-linux'
 # Keep this package sync with util-linux-common
 pkgname=util-linux
-version=2.37.2
-revision=2
+version=2.38
+revision=1
 build_style=gnu-configure
 configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown
  --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin
@@ -22,7 +22,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.kernel.org/pub/linux/utils/util-linux/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version%.${version#*.*.}}/${pkgname}-${version}.tar.xz"
-checksum=6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9
+checksum=6d111cbe4d55b336db2f1fbeffbc65b89908704c01136371d32aa9bec373eb64
 
 # Create uuidd system account for uuidd.
 system_accounts="_uuidd"

From 9b05168fd3ccf9c3bf8d8b26c71bf6f2ecb34e3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 22 Apr 2022 23:40:12 +0200
Subject: [PATCH 2227/2561] svt-av1: update to 1.0.0.

---
 common/shlibs            | 2 +-
 srcpkgs/svt-av1/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 680ab7920513..85b44e2cc5e8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4123,7 +4123,7 @@ libjvm.so openjdk17-jre-17.0.1+12_1
 librttopo.so.1 librttopo-1.1.0_1
 libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1
-libSvtAv1Enc.so.0 libsvt-av1-0.9.0_1
+libSvtAv1Enc.so.1 libsvt-av1-1.0.0_1
 libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
 librz_bp.so.0.3.4 rizin-0.3.4_1
 librz_reg.so.0.3.4 rizin-0.3.4_1
diff --git a/srcpkgs/svt-av1/template b/srcpkgs/svt-av1/template
index ab9386d90cb7..7b08bf9c309c 100644
--- a/srcpkgs/svt-av1/template
+++ b/srcpkgs/svt-av1/template
@@ -1,6 +1,6 @@
 # Template file for 'svt-av1'
 pkgname=svt-av1
-version=0.9.1
+version=1.0.0
 revision=1
 wrksrc="SVT-AV1-v${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ license="BSD-3-Clause-Clear"
 homepage="https://gitlab.com/AOMediaCodec/SVT-AV1"
 changelog="https://gitlab.com/AOMediaCodec/SVT-AV1/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${version}/SVT-AV1-v${version}.tar.gz"
-checksum=714154c08a90a5eb1f09c4d0d766621132711137af127468dc122c04ca9784ae
+checksum=84030ef7f33645ddfcdd2dc8a08277e49f3c4297fc53711958060c8ce51dc22d
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="32-bit is not supported"

From 5499016066d3264b9520de916f9965768e06d97a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 22 Apr 2022 23:40:50 +0200
Subject: [PATCH 2228/2561] ffmpeg: rebuild against svt-av1-1.0.0

---
 srcpkgs/ffmpeg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 213aae8bbfa0..8ffdd4401f2d 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.4.1
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From 72d8e75c902e0e0c679e7c4f9000100c0382f51d Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 8 May 2022 13:10:47 -0700
Subject: [PATCH 2229/2561] libslirp: update to 4.7.0

---
 srcpkgs/libslirp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libslirp/template b/srcpkgs/libslirp/template
index 17fc6fdc9f3d..b22560ec3b3a 100644
--- a/srcpkgs/libslirp/template
+++ b/srcpkgs/libslirp/template
@@ -1,6 +1,6 @@
 # Template file for 'libslirp'
 pkgname=libslirp
-version=4.6.1
+version=4.7.0
 revision=1
 wrksrc="libslirp-v${version}"
 build_style=meson
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://gitlab.freedesktop.org/slirp/libslirp"
 changelog="https://gitlab.freedesktop.org/slirp/libslirp/-/blob/master/CHANGELOG.md"
 distfiles="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${version}/libslirp-v${version}.tar.gz"
-checksum=69ad4df0123742a29cc783b35de34771ed74d085482470df6313b6abeb799b11
+checksum=9398f0ec5a581d4e1cd6856b88ae83927e458d643788c3391a39e61b75db3d3b
 
 pre_configure() {
 	printf '%s\n' "${version}" > .tarball-version

From ad000e688d4e6dfb1608e31d1b4a039551b38610 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 8 May 2022 13:20:05 -0700
Subject: [PATCH 2230/2561] slirp4netns: update to 1.2.0

---
 srcpkgs/slirp4netns/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/slirp4netns/template b/srcpkgs/slirp4netns/template
index 437145fa33dc..d96168c502d8 100644
--- a/srcpkgs/slirp4netns/template
+++ b/srcpkgs/slirp4netns/template
@@ -1,6 +1,6 @@
 # Template file for 'slirp4netns'
 pkgname=slirp4netns
-version=1.1.12
+version=1.2.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/rootless-containers/slirp4netns"
 distfiles="https://github.com/rootless-containers/slirp4netns/archive/v${version}.tar.gz"
-checksum=279dfe58a61b9d769f620b6c0552edd93daba75d7761f7c3742ec4d26aaa2962
+checksum=b584edde686d3cfbac210cbdb93c4b0ba5d8cc0a6a4d92b9dfc3c5baec99c727
 # tests fail due to use of unshare (unavailable with chroot util-linux)
 make_check=no
 

From d4a9674a7ef676dd9ce5eebb52383e67a8dfe25d Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 12 May 2022 19:54:47 -0400
Subject: [PATCH 2231/2561] gthumb: update to 3.12.2.

---
 .../patches/linguas-remove-duplicate.patch    | 24 -------------------
 srcpkgs/gthumb/template                       |  4 ++--
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 srcpkgs/gthumb/patches/linguas-remove-duplicate.patch

diff --git a/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch
deleted file mode 100644
index 00e9dde84669..000000000000
--- a/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From daef485dffd67319c114cf1bda453bf6157e11ff Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@src.gnome.org>
-Date: Tue, 11 Jan 2022 12:30:44 +0100
-Subject: [PATCH] LINGUAS: removed duplicated entry
-
----
- help/LINGUAS | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/help/LINGUAS b/help/LINGUAS
-index b615195e..aabf71ac 100644
---- a/help/LINGUAS
-+++ b/help/LINGUAS
-@@ -9,7 +9,6 @@ eu
- fr
- hu
- id
--id
- nl
- oc
- sl
--- 
-GitLab
-
diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template
index 13fb63a7fb13..6de1a2663ebe 100644
--- a/srcpkgs/gthumb/template
+++ b/srcpkgs/gthumb/template
@@ -1,6 +1,6 @@
 # Template file for 'gthumb'
 pkgname=gthumb
-version=3.12.0
+version=3.12.2
 revision=1
 build_style=meson
 hostmakedepends="gettext pkg-config itstool glib-devel"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/action/show/Apps/Gthumb"
 changelog="https://gitlab.gnome.org/GNOME/gthumb/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/gthumb/${version%.*}/gthumb-${version}.tar.xz"
-checksum=3deffc030384e64b57361c437c79b481ae1489ef44c87ae856e81bb10d8e383f
+checksum=97f8afe522535216541ebbf1e3b546d12a6beb38a8f0eb85f26e676934aad425
 
 LDFLAGS="-fPIC"
 

From d2f2d90b0275bbaa039779bfa5a145f259f39675 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Wed, 11 May 2022 18:07:15 -0700
Subject: [PATCH 2232/2561] runc: update to 1.1.2

Fixes CVE-2022-29162
---
 srcpkgs/runc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 182e20b99857..35f011484e72 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,6 +1,6 @@
 # Template file for 'runc'
 pkgname=runc
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=go
 go_import_path=github.com/opencontainers/runc
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/opencontainers/runc"
 distfiles="https://github.com/opencontainers/runc/releases/download/v${version}/runc.tar.xz"
-checksum=75c1f0bb19b209412c52599e24b33ac306cf7caf772c97577b7ebe964837a54b
+checksum=78ad532465ce4c2802480644a8756c30ae99c1bf779f0243af4bca11c4d041de
 
 post_build() {
 	make man

From 8a9f409cad8c41d84236e10c417faf4ef1ac28b3 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH 2233/2561] po4a: update to 0.66

---
 srcpkgs/po4a/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..8dd6a6ed641b 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
 # Template file for 'po4a'
 pkgname=po4a
-version=0.63
+version=0.66
 revision=1
 build_style=perl-ModuleBuild
 _perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,12 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
  libxslt docbook-xsl"
 makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
 depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
 short_desc="PO for anything (po4a) project to ease translations using gettext tools"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="https://po4a.org/"
+changelog="https://raw.githubusercontent.com/mquinson/po4a/master/NEWS"
 distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=8ae65c69b3a3e3911c449284aa9f07c80b74484fd211f6e2a7e6b57e09f3afd8
+make_check=ci-skip # cannot repoduce failure locally

From 4b49c87b8800e43488e80feb8d1002e086f32063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 12:00:29 -0300
Subject: [PATCH 2234/2561] curl: update to 7.83.1.

---
 srcpkgs/curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 74358a24969d..00cbfd709875 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,6 +1,6 @@
 # Template file for 'curl'
 pkgname=curl
-version=7.83.0
+version=7.83.1
 revision=1
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
@@ -24,7 +24,7 @@ license="MIT"
 homepage="https://curl.haxx.se"
 changelog="https://curl.haxx.se/changes.html#${version//./_}"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
-checksum=247c7ec7521c4258e65634e529270d214fe32969971cccb72845e7aa46831f96
+checksum=f539a36fb44a8260ec5d977e4e0dbdd2eee29ed90fcedaa9bc3c9f78a113bff0
 build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
 build_options_default="ssh ssl zstd"
 vopt_conflict ssl gnutls

From d84ddb181f1054b19f249dc13ed7d3467562892e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 12:00:32 -0300
Subject: [PATCH 2235/2561] doxygen: update to 1.9.4.

---
 srcpkgs/doxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index 946ceeebcc11..998bd04bcefe 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'doxygen'
 pkgname=doxygen
-version=1.9.3
+version=1.9.4
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="http://www.doxygen.org/"
 changelog="https://www.doxygen.nl/manual/changelog.html"
 distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz"
-checksum=f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0
+checksum=a15e9cd8c0d02b7888bc8356eac200222ecff1defd32f3fe05257d81227b1f37
 
 build_options="wizard"
 desc_option_wizard="build Qt5 GUI configuration tool, doxywizard"

From 03eda3bd6ef534c46cc27e63af3c4e63bced6d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 12:00:35 -0300
Subject: [PATCH 2236/2561] iwd: update to 1.27.

---
 srcpkgs/iwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index 66f55599c5e0..0b01bad5a239 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.26
+version=1.27
 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=0ff4541c2b7f14ec010c3cbd1f02350f1b58cb0c103412db22550e90d8040d6b
+checksum=013b4a0a79629c20d915954fc3b5d0620ef6e0d6065db3c342f4b3f9111f46ec
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From c01df37f049356bd350cffb9e5a7481e740cb41f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 12:00:37 -0300
Subject: [PATCH 2237/2561] ell: update to 0.50.

---
 srcpkgs/ell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ell/template b/srcpkgs/ell/template
index bb563505e80e..fdfbd4e413a1 100644
--- a/srcpkgs/ell/template
+++ b/srcpkgs/ell/template
@@ -1,7 +1,7 @@
 # Template file for 'ell'
 # ell ABI isn't stable! Always test dependants after updates and update common/shlibs
 pkgname=ell
-version=0.45
+version=0.50
 revision=1
 build_style=gnu-configure
 configure_args="--enable-glib"
@@ -13,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=fedfcceee56eb63ab1eb98bf120a3cfbecee50bcd893874328c889f1b381e7d7
+checksum=0fe51d51c6eddc2a2784092f1dfdd1143a5ef27f15c274ecfbadd680d3a72fd9
 # tests depend on kernel features
 make_check=extended
 

From e4a5c6120493a07068495cfdd9a84295edca1456 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 12 May 2022 17:41:51 -0400
Subject: [PATCH 2238/2561] libfilezilla: update to 0.37.2.

---
 common/shlibs                 | 2 +-
 srcpkgs/libfilezilla/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 85b44e2cc5e8..a143f5928c41 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2623,7 +2623,7 @@ libhwloc.so.15 libhwloc-2.0.4_1
 libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
 libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
 libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
-libfilezilla.so.24 libfilezilla-0.36.0_1
+libfilezilla.so.25 libfilezilla-0.37.2_1
 libtommath.so.1 libtommath-1.0_1
 libKF5ItemViews.so.5 kitemviews-5.26.0_1
 libunicorn.so.1 unicorn-1.0_1
diff --git a/srcpkgs/libfilezilla/template b/srcpkgs/libfilezilla/template
index de4331d8fcca..9c50531cbbb6 100644
--- a/srcpkgs/libfilezilla/template
+++ b/srcpkgs/libfilezilla/template
@@ -1,7 +1,7 @@
 # Template file for 'libfilezilla'
 # filezilla needs to be rebuilt when libfilezilla version changes, ABI is not stable
 pkgname=libfilezilla
-version=0.36.0
+version=0.37.2
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://lib.filezilla-project.org/"
 changelog="https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=c0271c18ede7fbbc826b21c972c2cb0ff96744ee5a15c91d8d74e9bc3853a872
+checksum=e51140ee63646ba92ae41969c1fbff25946dc452410d3c4daf91cd792bfee2d5
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From d82b58425126560a5bc473d30902634242578e7b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 12 May 2022 17:42:10 -0400
Subject: [PATCH 2239/2561] filezilla: update to 3.59.0.

---
 srcpkgs/filezilla/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template
index 0c5abd1a1b55..3d6a65eaf383 100644
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@@ -1,6 +1,6 @@
 # Template file for 'filezilla'
 pkgname=filezilla
-version=3.58.0
+version=3.59.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdatecheck
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
-checksum=d0fe7f72e01f7742baa06466818b186e8e91fff62d6ee7b2f0e884b6b3385d88
+checksum=ad82d70e55dca8e0e2b2e194c68f3c8f2e003a46b7920cf0b6d6e8433e911501
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"

From d0b3dc4e6d97e1c9c47033d4d0b8d5550db6ab2a Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 May 2022 17:10:34 +0200
Subject: [PATCH 2240/2561] libqtxdg: update to 3.9.1.

---
 srcpkgs/libqtxdg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template
index b8bea143f360..b4f1e5ab53aa 100644
--- a/srcpkgs/libqtxdg/template
+++ b/srcpkgs/libqtxdg/template
@@ -1,6 +1,6 @@
 # Template file for 'libqtxdg'
 pkgname=libqtxdg
-version=3.9.0
+version=3.9.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-project.org"
 distfiles="https://github.com/lxqt/libqtxdg/archive/${version}.tar.gz"
-checksum=4dc7e3e65e6bcd50010647ef781ef5601b08ce024b0b1155e6a68316696c5a58
+checksum=6866a9f5bf83ef46c436342a266ae4562f81823f8d053c028c0c87c2223332cb
 
 libqtxdg-devel_package() {
 	short_desc+=" - development files"

From c28379911d5565e31524f4e05abdda7bfa9189a3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 May 2022 17:13:36 +0200
Subject: [PATCH 2241/2561] libkdcraw5: update to 22.04.1.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index f71d7b6c6ac4..0e357c09c464 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=22.04.0
+version=22.04.1
 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=f92cee9a87fdef59f12bde784e1ec2b13b2677c82634e303f20ed8055ddb3e79
+checksum=62942d392519e86e880e5c5b0dc1bda124f245380546299536d755f4eb12a8a5
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 0be8911622c630facf03ffd280d4363e91da2eed Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 May 2022 18:22:04 +0200
Subject: [PATCH 2242/2561] gwenview: update to 22.04.1.

---
 srcpkgs/gwenview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index a9eafcc90cf1..c91d1866d19b 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -16,4 +16,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=73683096898c59388cd566cc8f71d7677fd0b22a2ab42a6d5f82f1232372ab05
+checksum=f99a8f6eb7c7e2ba8b3f434512a2050cf64e032c48830c3ad80dbbb6d5e9cc4a

From 43e46c6c7f33374e0fb875632f0a1cc74243671e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 May 2022 18:28:53 +0200
Subject: [PATCH 2243/2561] linux5.4: update to 5.4.193.

---
 srcpkgs/linux5.4/files/arm64-dotconfig  | 3 +--
 srcpkgs/linux5.4/files/x86_64-dotconfig | 5 ++---
 srcpkgs/linux5.4/template               | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index 2b70d687ce1a..21f6ee83333d 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.187 Kernel Configuration
+# Linux/arm64 5.4.193 Kernel Configuration
 #
 
 #
@@ -3835,7 +3835,6 @@ CONFIG_VMXNET3=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.4/files/x86_64-dotconfig b/srcpkgs/linux5.4/files/x86_64-dotconfig
index 42961c8c8ad8..0ecfe841959e 100644
--- a/srcpkgs/linux5.4/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.4/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.4.180 Kernel Configuration
+# Linux/x86_64 5.4.193 Kernel Configuration
 #
 
 #
@@ -2199,6 +2199,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3524,8 +3525,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 1380552916af..8c274c1b3653 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.191
+version=5.4.193
 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=288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a
+checksum=0d16d343956d311e3f4ab3f032fd626d8e6b67c0db94edd32f561407d374f2a0
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 7e49dfc39b6e7f43525d09b68580636326b6afd9 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 13 May 2022 18:30:58 +0200
Subject: [PATCH 2244/2561] linux4.19: update to 4.19.242.

---
 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 d58249cf182a..0b504065d4b7 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.241
+version=4.19.242
 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=4c6269d3c14e593151b035a55227110e632642d848032ef6992135c18488fe13
+checksum=59bcfd094ec26b03ca506199224cff53c13325e62d22bd4e31ef4ccafe7265a2
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 9af36aeb27959281a1fbaee3aa1d898b27356ea8 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 13 May 2022 18:32:01 +0200
Subject: [PATCH 2245/2561] remmina: update to 1.4.25.

---
 srcpkgs/remmina/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index a784eb1b6afc..77f5663cf476 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,6 +1,6 @@
 # Template file for 'remmina'
 pkgname=remmina
-version=1.4.24
+version=1.4.25
 revision=1
 wrksrc="Remmina-v${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ makedepends="avahi-glib-libs-devel avahi-ui-libs-devel freerdp-devel
  libsecret-devel libsodium-devel libsoup-devel libssh-devel libva-devel
  libvncserver-devel libxkbfile-devel opus-devel phodav-devel
  spice-gtk-devel spice-protocol telepathy-glib-devel usbredir-devel
- vte3-devel libappindicator-devel"
+ vte3-devel libappindicator-devel webkit2gtk-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="Remote desktop client written in GTK+"
 maintainer="Frank Steinborn <steinex@nognu.de>"
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://remmina.org"
 changelog="https://gitlab.com/Remmina/Remmina/-/raw/master/CHANGELOG.md"
 distfiles="https://gitlab.com/Remmina/Remmina/-/archive/v${version}/Remmina-v${version}.tar.bz2"
-checksum=76a42062689b32fb6e41c59084fd52135ac8ea7806b119a40e0e1134ff0231fe
+checksum=7c860c22b77b928fc93c5ab50cdb8af14a6a9160d17c548b9f084f66e634c9f2
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"

From 67438b5ac5190ec237ad756b87d509cb5cae5504 Mon Sep 17 00:00:00 2001
From: Elaine Gibson <ypsvlq@gmail.com>
Date: Sun, 24 Apr 2022 19:33:01 +0100
Subject: [PATCH 2246/2561] radare2: update to 5.6.8.

---
 common/shlibs                             | 45 ++++++++++++-----------
 srcpkgs/radare2-devel                     |  1 +
 srcpkgs/radare2/patches/sys_openssl.patch | 21 +++++++++++
 srcpkgs/radare2/patches/try.patch         | 20 ----------
 srcpkgs/radare2/template                  | 25 ++++++++++---
 5 files changed, 64 insertions(+), 48 deletions(-)
 create mode 120000 srcpkgs/radare2-devel
 create mode 100644 srcpkgs/radare2/patches/sys_openssl.patch
 delete mode 100644 srcpkgs/radare2/patches/try.patch

diff --git a/common/shlibs b/common/shlibs
index a143f5928c41..a95bc3054f14 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3184,28 +3184,29 @@ libkdeconnectinterfaces.so.21 kdeconnect-21.03.80_1
 libkdeconnectcore.so.21 kdeconnect-21.03.80_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
-libr_cons.so.5.0.0 radare2-5.0.0_1
-libr_util.so.5.0.0 radare2-5.0.0_1
-libr_flag.so.5.0.0 radare2-5.0.0_1
-libr_asm.so.5.0.0 radare2-5.0.0_1
-libr_bin.so.5.0.0 radare2-5.0.0_1
-libr_anal.so.5.0.0 radare2-5.0.0_1
-libr_lang.so.5.0.0 radare2-5.0.0_1
-libr_debug.so.5.0.0 radare2-5.0.0_1
-libr_egg.so.5.0.0 radare2-5.0.0_1
-libr_bp.so.5.0.0 radare2-5.0.0_1
-libr_search.so.5.0.0 radare2-5.0.0_1
-libr_io.so.5.0.0 radare2-5.0.0_1
-libr_hash.so.5.0.0 radare2-5.0.0_1
-libr_socket.so.5.0.0 radare2-5.0.0_1
-libr_parse.so.5.0.0 radare2-5.0.0_1
-libr_syscall.so.5.0.0 radare2-5.0.0_1
-libr_crypto.so.5.0.0 radare2-5.0.0_1
-libr_fs.so.5.0.0 radare2-5.0.0_1
-libr_magic.so.5.0.0 radare2-5.0.0_1
-libr_reg.so.5.0.0 radare2-5.0.0_1
+libr_core.so.5.6.8 radare2-5.6.8_1
+libr_config.so.5.6.8 radare2-5.6.8_1
+libr_cons.so.5.6.8 radare2-5.6.8_1
+libr_util.so.5.6.8 radare2-5.6.8_1
+libr_flag.so.5.6.8 radare2-5.6.8_1
+libr_asm.so.5.6.8 radare2-5.6.8_1
+libr_bin.so.5.6.8 radare2-5.6.8_1
+libr_anal.so.5.6.8 radare2-5.6.8_1
+libr_lang.so.5.6.8 radare2-5.6.8_1
+libr_debug.so.5.6.8 radare2-5.6.8_1
+libr_egg.so.5.6.8 radare2-5.6.8_1
+libr_bp.so.5.6.8 radare2-5.6.8_1
+libr_search.so.5.6.8 radare2-5.6.8_1
+libr_io.so.5.6.8 radare2-5.6.8_1
+libr_hash.so.5.6.8 radare2-5.6.8_1
+libr_socket.so.5.6.8 radare2-5.6.8_1
+libr_parse.so.5.6.8 radare2-5.6.8_1
+libr_syscall.so.5.6.8 radare2-5.6.8_1
+libr_crypto.so.5.6.8 radare2-5.6.8_1
+libr_fs.so.5.6.8 radare2-5.6.8_1
+libr_magic.so.5.6.8 radare2-5.6.8_1
+libr_reg.so.5.6.8 radare2-5.6.8_1
+libr_main.so.5.6.8 radare2-5.6.8_1
 libykpiv.so.1 libykpiv-2.1.1_2
 libykcs11.so.1 libykcs11-2.1.1_2
 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
diff --git a/srcpkgs/radare2-devel b/srcpkgs/radare2-devel
new file mode 120000
index 000000000000..fef4c7d8311a
--- /dev/null
+++ b/srcpkgs/radare2-devel
@@ -0,0 +1 @@
+radare2
\ No newline at end of file
diff --git a/srcpkgs/radare2/patches/sys_openssl.patch b/srcpkgs/radare2/patches/sys_openssl.patch
new file mode 100644
index 000000000000..1711c75aaa85
--- /dev/null
+++ b/srcpkgs/radare2/patches/sys_openssl.patch
@@ -0,0 +1,21 @@
+From bdaff5a9fdd628482cd03a384a8804f228eecf9a Mon Sep 17 00:00:00 2001
+From: ypsvlq <86775241+ypsvlq@users.noreply.github.com>
+Date: Tue, 10 May 2022 08:24:14 +0100
+Subject: [PATCH] Fix meson build with use_sys_openssl ##build
+
+---
+ libr/socket/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libr/socket/meson.build b/libr/socket/meson.build
+index 4e8614e9e57b..135c7b50efb9 100644
+--- a/libr/socket/meson.build
++++ b/libr/socket/meson.build
+@@ -20,7 +20,6 @@ endif
+ 
+ if use_sys_openssl
+   r_util_deps += [sys_openssl]
+-  r_util_static_deps += [sys_openssl]
+ endif
+ 
+ r_socket = library('r_socket', r_socket_sources,
diff --git a/srcpkgs/radare2/patches/try.patch b/srcpkgs/radare2/patches/try.patch
deleted file mode 100644
index 332d9e083192..000000000000
--- a/srcpkgs/radare2/patches/try.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/shlr/Makefile	2020-12-21 09:39:46.000000000 +0100
-+++ b/shlr/Makefile	2021-01-04 22:13:43.513442861 +0100
-@@ -122,7 +122,7 @@
- SDB_LIBA=sdb/src/libsdb.a
- 
- $(SDB_HOST):
--	$(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC)
-+	$(MAKE) sdb-host HOST_CC=$(HOST_CC) CC=$(HOST_CC) LD=ld
- 
- $(SDB_LIBA):
- 	$(MAKE) sdb-target
-@@ -136,7 +136,7 @@
- 	@echo ">>>>>>>>"
- 	@echo
- 	$(MAKE) -C sdb clean ; rm -f sdb/src/*.o sdb/src/sdb_version.h
--	$(MAKE) -C sdb/src "CC=${HOST_CC}" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin
-+	$(MAKE) -C sdb/src "CC=${HOST_CC}" "LD=ld" LDFLAGS='${HOST_LDFLAGS}' CPPFLAGS='' CFLAGS='${HOST_CFLAGS} ${PIC}' bin
- 	cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/src/.sdb${BUILD_EXT_EXE}
- 	cp -f sdb/src/sdb${BUILD_EXT_EXE} sdb/sdb$(BUILD_EXT_EXE)
- 	-file sdb/sdb$(BUILD_EXT_EXE)
diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template
index 39818e99e7f2..9baabf500146 100644
--- a/srcpkgs/radare2/template
+++ b/srcpkgs/radare2/template
@@ -1,19 +1,32 @@
 # Template file for 'radare2'
-# cutter needs to be bumped when radare2 is updated
 pkgname=radare2
-version=5.0.0
+version=5.6.8
 revision=1
 build_style=meson
-configure_args="-Duse_sys_capstone=true -Denable_tests=false"
+configure_args="-Denable_tests=false -Duse_sys_capstone=true
+ -Duse_sys_magic=true -Duse_sys_xxhash=true
+ -Duse_ssl=true -Duse_sys_openssl=true -Duse_libuv=true
+ -Duse_sys_zlib=true -Duse_sys_zip=true -Duse_sys_lz4=true"
 hostmakedepends="pkg-config"
-makedepends="capstone-devel"
+makedepends="capstone-devel file-devel xxHash-devel openssl-devel libuv-devel
+ zlib-devel libzip-devel liblz4-devel"
 short_desc="Advanced command line debugger and hexadecimal editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-only"
-homepage="http://www.radare.org"
+homepage="https://www.radare.org"
 distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz"
-checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae
+checksum=320d4f4733402cbc38303c7d37db04716e4376138da44d3664bb73adbdd77e0c
 
 case "$XBPS_TARGET_MACHINE" in
 	mips*) CFLAGS="-Os";;
 esac
+
+radare2-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 0d0f18f98cb3ed735d94d1d7e1f8cdec0b964d68 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 13 May 2022 09:34:24 -0400
Subject: [PATCH 2247/2561] dendrite: update to 0.8.5.

---
 srcpkgs/dendrite/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 7e8f9fd27312..283fce810710 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.8.3
+version=0.8.5
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=2d61dc970bf812e13f7a81c65e811811ef950dad02631380650191214f2b5d5d
+checksum=43b8197515a713bb2c0bb867abd0898104a53756f0c34b22601c4deebb898974
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"
@@ -25,11 +25,11 @@ make_dirs="
 pre_configure() {
 	vsed -e 's,\./logs,/var/log/dendrite,' \
 	 -e 's,: matrix_key.pem,: /etc/dendrite/matrix_key.pem,' \
-	 -i dendrite-config.yaml
+	 -i dendrite-sample.monolith.yaml
 }
 
 post_install() {
-	vsconf dendrite-config.yaml dendrite.yaml
+	vsconf dendrite-sample.monolith.yaml
 	vsv dendrite-monolith-server
 
 	cd "${DESTDIR}"/usr/bin

From ddb85096d3fad5bde7a996419f074337bfbfa1f6 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 13 May 2022 18:27:45 +0200
Subject: [PATCH 2248/2561] xfce4-terminal: update to 1.0.3.

---
 srcpkgs/xfce4-terminal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 418817a0ac32..d3aaada37900 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
-version=1.0.2
+version=1.0.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/xfce4-terminal/start"
 changelog="https://gitlab.xfce.org/apps/xfce4-terminal/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=ac1543167b43322ad2483ffb033a7e74669ecb59f4b63016a3c183d96141d326
+checksum=1c69a6d2edffbaf30d7123da82fd05c12259fc279caf7c491520158cc67ff5ed

From 3b27acc3ed69ee712b853605c5f6d10b2555604d Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 13 May 2022 18:30:28 +0200
Subject: [PATCH 2249/2561] ltris: update to 1.2.4.

---
 srcpkgs/ltris/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template
index 98846feaac3b..80d9f0a9f455 100644
--- a/srcpkgs/ltris/template
+++ b/srcpkgs/ltris/template
@@ -1,6 +1,6 @@
 # Template file for 'ltris'
 pkgname=ltris
-version=1.2.3
+version=1.2.4
 revision=1
 build_style=gnu-configure
 configure_args="--localstatedir=/var/games/ltris"
@@ -11,6 +11,6 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="http://lgames.sourceforge.net/index.php?project=LTris"
 distfiles="${SOURCEFORGE_SITE}/lgames/$pkgname-$version.tar.gz"
-checksum=0ec4ad053e066a296529e923c2f626fa0a19c094c5ae03e44359f9c9e50955a8
+checksum=d6eb7b301023278604d9292a92f2fd2f5103ee412a75a126d2550e2ec2368f83
 nocheckperms=yes # uses a world-writable .hscr file for global leaderboard
 CFLAGS+=" -fgnu89-inline"

From 407da321cca79f6c67d93e0b602e548edee0c0da Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 10 Apr 2022 15:32:56 +0200
Subject: [PATCH 2250/2561] chatty: update to 0.18.

---
 srcpkgs/chatty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index 32821e5277f3..58ab4862f6fc 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -1,6 +1,6 @@
 # Template file for 'chatty'
 pkgname=chatty
-version=0.17
+version=0.18
 revision=1
 hostmakedepends="gradle"
 depends="virtual?java-runtime"
@@ -9,7 +9,7 @@ maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-3.0-or-later"
 homepage="https://chatty.github.io/"
 distfiles="https://github.com/chatty/chatty/archive/v${version}.tar.gz"
-checksum=1d649d87fccb23b05136df387d4e23d79c2254b4c9f66ac09bc15c575d5680dd
+checksum=cbc4009a233168a751cf2732cd5da79d851151fe866a74f75651e8eab75dc4f7
 
 do_build() {
 	gradle shadowJar

From a22bc60a0046c34dbd2097b4b625082f92826efe Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 12 May 2022 14:03:23 +0200
Subject: [PATCH 2251/2561] bat: update to 0.21.0

---
 srcpkgs/bat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bat/template b/srcpkgs/bat/template
index e3f210b3cab2..11e11a56fd68 100644
--- a/srcpkgs/bat/template
+++ b/srcpkgs/bat/template
@@ -1,6 +1,6 @@
 # Template file for 'bat'
 pkgname=bat
-version=0.20.0
+version=0.21.0
 revision=1
 build_style=cargo
 hostmakedepends="cmake llvm clang"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Apache-2.0, MIT"
 homepage="https://github.com/sharkdp/bat"
 distfiles="https://github.com/sharkdp/bat/archive/v${version}.tar.gz"
-checksum=12eca3add56f21b8056a4c17cfb5bffc45e107f23f75a8e0f5de948d8e997c39
+checksum=3dff1e52d577d0a105f4afe3fe7722a4a2b8bb2eb3e7a6a5284ac7add586a3ee
 
 post_patch() {
 	# fixes an indexmap error when cross compiling

From 08b75a158a48063dd4abb0b49f47750e8f0d8ec8 Mon Sep 17 00:00:00 2001
From: Eloi Torrents <eloi.torrentsj@gmail.com>
Date: Sat, 30 Apr 2022 00:19:44 +0200
Subject: [PATCH 2252/2561] New Package: clickclack-0.2.3

---
 srcpkgs/clickclack/template | 16 ++++++++++++++++
 srcpkgs/clickclack/update   |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/clickclack/template
 create mode 100644 srcpkgs/clickclack/update

diff --git a/srcpkgs/clickclack/template b/srcpkgs/clickclack/template
new file mode 100644
index 000000000000..bb137432cd35
--- /dev/null
+++ b/srcpkgs/clickclack/template
@@ -0,0 +1,16 @@
+# Template file for 'clickclack'
+pkgname=clickclack
+version=0.2.3
+revision=1
+build_style=gnu-makefile
+makedepends="SDL2-devel"
+short_desc="Simple haptic feedback and audio feedback tool"
+maintainer="Eloi Torrents <eloitor@disroot.org>"
+license=MIT
+homepage=https://git.sr.ht/~proycon/clickclack
+distfiles="https://git.sr.ht/~proycon/clickclack/archive/${version}.tar.gz"
+checksum=940f13ae1aa8b33677d8153db4af848233cb45dbb755320463dc3f980c73cced
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/clickclack/update b/srcpkgs/clickclack/update
new file mode 100644
index 000000000000..963c41fa75bc
--- /dev/null
+++ b/srcpkgs/clickclack/update
@@ -0,0 +1 @@
+pattern='\s{12}\K[\d.]+'

From 9ef581c1581bb726b1d2948a4dc161068b21a90e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 12 Apr 2022 15:28:23 -0400
Subject: [PATCH 2253/2561] common/hooks/pre-pkg/04-generate-runtime-deps.sh:
 sort deps for reproducibility

fixes #36641
---
 common/hooks/pre-pkg/04-generate-runtime-deps.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index c8f8c04d4884..987b0cece9c5 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -34,15 +34,14 @@ add_rundep() {
 
 store_pkgdestdir_rundeps() {
         if [ -n "$run_depends" ]; then
-            : > ${PKGDESTDIR}/rdeps
             for f in ${run_depends}; do
                 _curdep="$(echo "$f" | sed -e 's,\(.*\)?.*,\1,')"
                 if [ -z "$($XBPS_UHELPER_CMD getpkgdepname ${_curdep} 2>/dev/null)" -a \
                      -z "$($XBPS_UHELPER_CMD getpkgname ${_curdep} 2>/dev/null)" ]; then
                     _curdep="${_curdep}>=0"
                 fi
-                printf -- "${_curdep} " >> ${PKGDESTDIR}/rdeps
-            done
+                printf -- "${_curdep}\n"
+            done | sort | xargs > ${PKGDESTDIR}/rdeps
         fi
 }
 
@@ -145,7 +144,7 @@ hook() {
 
         if [ "${_pkgname}" != "${pkgname}" ]; then
             echo "   SONAME: $f <-> ${_sdep}"
-            sorequires+="${f} "
+            sorequires+="${f}\n"
         else
             # Ignore libs by current pkg
             echo "   SONAME: $f <-> ${_rdep} (ignored)"
@@ -163,9 +162,9 @@ hook() {
     store_pkgdestdir_rundeps
 
     for f in ${shlib_requires}; do
-        sorequires+="${f} "
+        sorequires+="${f}\n"
     done
     if [ -n "${sorequires}" ]; then
-        echo "${sorequires}" > ${PKGDESTDIR}/shlib-requires
+        echo "${sorequires}" | sort | xargs > ${PKGDESTDIR}/shlib-requires
     fi
 }

From d76e5aac89895c815abfdddd6d1057ba411bb383 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Fri, 13 May 2022 16:13:57 -0400
Subject: [PATCH 2254/2561] common/hooks/pre-pkg/04-generate-runtime-deps.sh:
 fix sorequires

---
 common/hooks/pre-pkg/04-generate-runtime-deps.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 987b0cece9c5..eb19ebfe7081 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -144,7 +144,7 @@ hook() {
 
         if [ "${_pkgname}" != "${pkgname}" ]; then
             echo "   SONAME: $f <-> ${_sdep}"
-            sorequires+="${f}\n"
+            sorequires+="${f} "
         else
             # Ignore libs by current pkg
             echo "   SONAME: $f <-> ${_rdep} (ignored)"
@@ -162,9 +162,9 @@ hook() {
     store_pkgdestdir_rundeps
 
     for f in ${shlib_requires}; do
-        sorequires+="${f}\n"
+        sorequires+="${f} "
     done
     if [ -n "${sorequires}" ]; then
-        echo "${sorequires}" | sort | xargs > ${PKGDESTDIR}/shlib-requires
+        echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
     fi
 }

From 3b64f652fa6f4bd5d6bf2ce1432ea1a9406126d1 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 13 May 2022 18:17:57 +0200
Subject: [PATCH 2255/2561] node_exporter: update to 1.3.1.

---
 srcpkgs/node_exporter/template | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/node_exporter/template b/srcpkgs/node_exporter/template
index baec4cfc14d5..5be5dc50d5e5 100644
--- a/srcpkgs/node_exporter/template
+++ b/srcpkgs/node_exporter/template
@@ -1,7 +1,7 @@
 # Template file for 'node_exporter'
 pkgname=node_exporter
-version=1.1.2
-revision=2
+version=1.3.1
+revision=1
 build_style=go
 go_import_path="github.com/prometheus/node_exporter"
 go_ldflags="-X ${go_import_path}/version.Version=${version}
@@ -14,8 +14,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=edb40c783bd5767f174b916c89a768496ccae0f74811ba1d03c57c32cd250bbd
-python_version=3
+checksum=66856b6b8953e094c46d7dd5aabd32801375cf4d13d9fe388e320cbaeaff573a
 
 system_accounts="_node_exporter"
 
@@ -25,9 +24,3 @@ post_install() {
 	vsconf example-rules.yml
 	vsv node_exporter
 }
-
-# REMARKS:
-# The following remark is now obsolete:
-# ON UPDATE: Be sure to update the default list of collectors in the sv run
-# 	file. There is no easy way at 0.14.0 to go from the -h output
-# 	of node_exporter to taking the default list and appending runit.

From 54f3be47be6aa28a19a05894c279c859d9700806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 13 May 2022 23:58:58 +0200
Subject: [PATCH 2256/2561] mpd: update to 0.23.7.

---
 srcpkgs/mpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index b34c78c11815..944431faaf10 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,6 +1,6 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.23.6
+version=0.23.7
 revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
@@ -39,7 +39,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed
+checksum=960dcbac717c388f5dcc4fd945e3af19a476f2b15f367e9653d4c7a948768211
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From c9cbe89c400c4caf49ada4df65d3cce34fa29efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 8 May 2022 14:35:27 +0200
Subject: [PATCH 2257/2561] tor: update to 0.4.7.7.

---
 srcpkgs/tor/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index 025d10205848..ec1efb4fb8b3 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,6 +1,6 @@
 # Template file for 'tor'
 pkgname=tor
-version=0.4.6.10
+version=0.4.7.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-zstd"
@@ -14,11 +14,11 @@ license="BSD-3-Clause"
 homepage="https://www.torproject.org/"
 changelog="https://gitlab.torproject.org/tpo/core/tor/-/raw/main/ChangeLog"
 distfiles="https://dist.torproject.org/tor-${version}.tar.gz"
-checksum=94ccd60e04e558f33be73032bc84ea241660f92f58cfb88789bda6893739e31c
+checksum=3e131158b52b9435d7e43d1c47ef288b96d005342cc44b8c950bb403851a5b44
 
 conf_files="/etc/tor/torrc"
 system_accounts="tor"
-tor_homedir=/var/lib/tor
+tor_homedir="/var/lib/tor"
 make_dirs="/var/lib/tor 0700 tor tor"
 
 pre_configure() {

From a614bbf20b01bc2e852de65c23433e2b9b1ed270 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 9 May 2022 17:28:52 +0300
Subject: [PATCH 2258/2561] bleachbit: update to 4.4.2.

---
 srcpkgs/bleachbit/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template
index 20b148a472a1..7bca1dfd6a27 100644
--- a/srcpkgs/bleachbit/template
+++ b/srcpkgs/bleachbit/template
@@ -1,15 +1,15 @@
 # Template file for 'bleachbit'
 pkgname=bleachbit
-version=4.4.0
+version=4.4.2
 revision=1
 build_style=gnu-makefile
 make_install_args="prefix=/usr"
-hostmakedepends="python3 gettext"
-depends="python3-gobject python3-scandir gtk+3 desktop-file-utils hicolor-icon-theme"
+hostmakedepends="python3 gettext desktop-file-utils"
+depends="gtk+3 python3-gobject python3-scandir python3-chardet"
 short_desc="Deletes unneeded files to free disk space and maintain privacy"
 maintainer="graysky <graysky@archlinux.us>"
 license="GPL-3.0-or-later"
 homepage="https://www.bleachbit.org/"
 distfiles="https://github.com/bleachbit/bleachbit/archive/v${version}.tar.gz"
-checksum=c45dad54d8c1da90be315e6d2403cba4c6fc59453b107d6d8ce0ca975228146f
+checksum=6001c864688e36bd8f950c1341923c9347c2373149a9ce98dc26c39023b51997
 python_version=3

From 4a50acd134c814631d903d8868b73fb713804b57 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 8 May 2022 20:41:22 +0530
Subject: [PATCH 2259/2561] avrdude: update to 7.0, remove build options

Build options can be added back if anybody demands. Until then, they
aren't necessary.

Changelog should point to the latest changelog, so that users can see
what changes have been made before upgrading.
---
 srcpkgs/avrdude/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/avrdude/template b/srcpkgs/avrdude/template
index 5ebe45ae47e4..b30f9fb13724 100644
--- a/srcpkgs/avrdude/template
+++ b/srcpkgs/avrdude/template
@@ -1,9 +1,9 @@
 # Template file for 'avrdude'
 pkgname=avrdude
-version=6.4
+version=7.0
 revision=1
 build_style=gnu-configure
-configure_args="$(vopt_enable gpio linuxgpio) $(vopt_enable spi linuxspi)"
+configure_args="--enable-linuxspi --enable-linuxgpio --enable-parport"
 hostmakedepends="flex"
 makedepends="elfutils-devel libusb-devel libusb-compat-devel libftdi1-devel
  hidapi-devel"
@@ -12,10 +12,7 @@ short_desc="Utility to manipulate ROM and EEPROM of AVR microcontrollers"
 maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://www.nongnu.org/avrdude/"
+changelog="https://raw.githubusercontent.com/avrdudes/avrdude/master/NEWS"
 distfiles="$NONGNU_SITE/$pkgname/${pkgname}-$version.tar.gz"
-checksum=a9be7066f70a9dcf4bf0736fcf531db6a3250aed1a24cc643add27641b7110f9
+checksum=c0ef65d98d6040ca0b4f2b700d51463c2a1f94665441f39d15d97442dbb79b54
 conf_files="/etc/avrdude.conf"
-build_options="gpio spi"
-desc_option_spi="Enable LINUXSPI support"
-desc_option_gpio="Enable LINUXGPIO support"
-build_options_default="${build_options}"

From 9a03e3bd30d6a8c5ddfe709be23a129356d54ff3 Mon Sep 17 00:00:00 2001
From: Kyra Zimmer <me@nonchip.de>
Date: Thu, 12 May 2022 07:46:37 +0200
Subject: [PATCH 2260/2561] verilator: update to 4.222.

---
 srcpkgs/verilator/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/verilator/template b/srcpkgs/verilator/template
index dc61d2c8326d..3864a6ed8147 100644
--- a/srcpkgs/verilator/template
+++ b/srcpkgs/verilator/template
@@ -1,16 +1,16 @@
 # Template file for 'verilator'
 pkgname=verilator
-version=4.104
+version=4.222
 revision=1
 build_style=gnu-configure
-hostmakedepends="autoconf flex"
+hostmakedepends="autoconf flex python3"
 makedepends="libfl-devel"
 short_desc="SystemVerilog simulator and lint system"
 maintainer="Sasha Krassovsky <krassovskysasha@gmail.com>"
 license="LGPL-3.0-only"
 homepage="https://veripool.org/wiki/verilator"
 distfiles="https://github.com/verilator/verilator/archive/v${version}.tar.gz"
-checksum=6d42fa468234461e4a0c3154d5602cdded7b22d57f14be92c27a65d418a4a010
+checksum=15c60175807c0f3536c3c5b435f131c2b1e8725aefd30645efd946bf401b4c84
 
 pre_configure() {
 	autoconf

From 2ef4bb2069578204861de49e972e09118307c173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 21:45:36 -0300
Subject: [PATCH 2261/2561] manpages-pt-br: update to 4.14.0.

Also add new languages. Some of these were present already but not as
proper subpackages, instead in manpages-pt-br. This commit fixes that.
---
 srcpkgs/manpages-cs             |   1 +
 srcpkgs/manpages-da             |   1 +
 srcpkgs/manpages-el             |   1 +
 srcpkgs/manpages-es             |   1 +
 srcpkgs/manpages-fi             |   1 +
 srcpkgs/manpages-hu             |   1 +
 srcpkgs/manpages-id             |   1 +
 srcpkgs/manpages-it             |   1 +
 srcpkgs/manpages-mk             |   1 +
 srcpkgs/manpages-nb             |   1 +
 srcpkgs/manpages-pt-br/template | 107 ++++++++++++++++++++++++++++++--
 srcpkgs/manpages-sr             |   1 +
 srcpkgs/manpages-sv             |   1 +
 srcpkgs/manpages-uk             |   1 +
 srcpkgs/manpages-vi             |   1 +
 15 files changed, 117 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/manpages-cs
 create mode 120000 srcpkgs/manpages-da
 create mode 120000 srcpkgs/manpages-el
 create mode 120000 srcpkgs/manpages-es
 create mode 120000 srcpkgs/manpages-fi
 create mode 120000 srcpkgs/manpages-hu
 create mode 120000 srcpkgs/manpages-id
 create mode 120000 srcpkgs/manpages-it
 create mode 120000 srcpkgs/manpages-mk
 create mode 120000 srcpkgs/manpages-nb
 create mode 120000 srcpkgs/manpages-sr
 create mode 120000 srcpkgs/manpages-sv
 create mode 120000 srcpkgs/manpages-uk
 create mode 120000 srcpkgs/manpages-vi

diff --git a/srcpkgs/manpages-cs b/srcpkgs/manpages-cs
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-cs
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-da b/srcpkgs/manpages-da
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-da
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-el b/srcpkgs/manpages-el
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-el
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-es b/srcpkgs/manpages-es
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-es
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-fi b/srcpkgs/manpages-fi
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-fi
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-hu b/srcpkgs/manpages-hu
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-hu
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-id b/srcpkgs/manpages-id
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-id
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-it b/srcpkgs/manpages-it
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-it
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-mk b/srcpkgs/manpages-mk
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-mk
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-nb b/srcpkgs/manpages-nb
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-nb
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-pt-br/template b/srcpkgs/manpages-pt-br/template
index 8a053c3eeab2..f6e969138b25 100644
--- a/srcpkgs/manpages-pt-br/template
+++ b/srcpkgs/manpages-pt-br/template
@@ -1,9 +1,10 @@
 # Template file for 'manpages-pt-br'
 pkgname=manpages-pt-br
-version=4.11.0
+version=4.14.0
 revision=1
+_commit=2a0461feb98f408bac9454b87325aacb1dd014f2
 _prjname=manpages-l10n
-wrksrc=${_prjname}-v${version}
+wrksrc=${_prjname}-${version}-${_commit}
 build_style=gnu-configure
 make_build_args="comp_extension= compressor=cat"
 hostmakedepends="po4a"
@@ -12,8 +13,8 @@ short_desc="${_desc} - Brazilian Portuguese (Português Brasileiro)"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://manpages-l10n-team.pages.debian.net/manpages-l10n/"
-distfiles="https://salsa.debian.org/manpages-l10n-team/${_prjname}/-/archive/v${version}/${_prjname}-v${version}.tar.gz"
-checksum=e40e6ece56281f9d6075daff9c56f34b1d335414d4c88c0a081c27c852371b7d
+distfiles="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/${version}/${_prjname}-v${version}.tar.gz"
+checksum=33f9f867e958faa0b3a699d503809d56aed3eadfcc349d329a79b545071c544f
 
 post_install() {
 	find $DESTDIR -name '*systemd*' -delete
@@ -53,3 +54,101 @@ manpages-ro_package() {
 		vmove usr/share/man/ro
 	}
 }
+
+manpages-vi_package() {
+	short_desc+="${_desc} - Vietnamese (Tiếng Việt)"
+	pkg_install() {
+		vmove usr/share/man/vi
+	}
+}
+
+manpages-uk_package() {
+	short_desc+="${_desc} - Ukrainian (Украї́нська Мо́ва)"
+	pkg_install() {
+		vmove usr/share/man/uk
+	}
+}
+
+manpages-sv_package() {
+	short_desc+="${_desc} - Swedish (Svenska)"
+	pkg_install() {
+		vmove usr/share/man/sv
+	}
+}
+
+manpages-sr_package() {
+	short_desc+="${_desc} - Serbian (Српски Језик)"
+	pkg_install() {
+		vmove usr/share/man/sr
+	}
+}
+
+manpages-nb_package() {
+	short_desc+="${_desc} - Norwegian Bokmål (Bokmål)"
+	pkg_install() {
+		vmove usr/share/man/nb
+	}
+}
+
+manpages-mk_package() {
+	short_desc+="${_desc} - Macedonian (Македонски)"
+	pkg_install() {
+		vmove usr/share/man/mk
+	}
+}
+
+manpages-it_package() {
+	short_desc+="${_desc} - Italian (Italiano)"
+	pkg_install() {
+		vmove usr/share/man/it
+	}
+}
+
+manpages-id_package() {
+	short_desc+="${_desc} - Indonesian (Bahasa Indonesia)"
+	pkg_install() {
+		vmove usr/share/man/id
+	}
+}
+
+manpages-hu_package() {
+	short_desc+="${_desc} - Hungarian (Magyar Nyelv)"
+	pkg_install() {
+		vmove usr/share/man/hu
+	}
+}
+
+manpages-fi_package() {
+	short_desc+="${_desc} - Finnish (Suomi)"
+	pkg_install() {
+		vmove usr/share/man/fi
+	}
+}
+
+manpages-es_package() {
+	short_desc+="${_desc} - Spanish (Español)"
+	pkg_install() {
+		vmove usr/share/man/es
+	}
+}
+
+manpages-el_package() {
+	short_desc+="${_desc} - Greek (Ελληνικά)"
+	pkg_install() {
+		vmove usr/share/man/el
+	}
+}
+
+manpages-da_package() {
+	short_desc+="${_desc} - Danish (Dansk)"
+	pkg_install() {
+		vmove usr/share/man/da
+	}
+}
+
+manpages-cs_package() {
+	short_desc+="${_desc} - Czech (Čeština)"
+	pkg_install() {
+		vmove usr/share/man/cs
+	}
+}
diff --git a/srcpkgs/manpages-sr b/srcpkgs/manpages-sr
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-sr
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-sv b/srcpkgs/manpages-sv
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-sv
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-uk b/srcpkgs/manpages-uk
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-uk
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file
diff --git a/srcpkgs/manpages-vi b/srcpkgs/manpages-vi
new file mode 120000
index 000000000000..3cf72f5bb89a
--- /dev/null
+++ b/srcpkgs/manpages-vi
@@ -0,0 +1 @@
+manpages-pt-br
\ No newline at end of file

From 992af9e7daaf7d3bde305cb8497ccf3fc0abd92a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 13 May 2022 21:47:32 -0300
Subject: [PATCH 2262/2561] sdcc: update to 4.2.0.

---
 srcpkgs/sdcc/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sdcc/template b/srcpkgs/sdcc/template
index c1c1c055eaa4..85a0a7131c3e 100644
--- a/srcpkgs/sdcc/template
+++ b/srcpkgs/sdcc/template
@@ -1,8 +1,7 @@
 # Template file for 'sdcc'
 pkgname=sdcc
-version=4.1.0
+version=4.2.0
 revision=1
-wrksrc=sdcc
 build_style=gnu-configure
 configure_args="--enable-libgc $(vopt_enable nonfree non-free)"
 hostmakedepends="automake flex bison gputils texinfo"
@@ -12,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="http://sdcc.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/sdcc/${pkgname}-src-${version}.tar.bz2"
-checksum=81edf776d5a2dc61a4b5c3408929db7b25874d69c46e4a71b116be1322fd533f
+checksum=b49bae1d23bcd6057a82c4ffe5613f9cd0cbcfd1e940e9d84c4bfe9df0a8c053
 python_version=3
 nostrip=yes
 

From 0de7ccb5e6c3ae19630dd895d4f1b33931328624 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Sun, 8 May 2022 19:40:55 +0200
Subject: [PATCH 2263/2561] aerc: update to 0.10.0

---
 srcpkgs/aerc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 30a431484026..9741c99ba38a 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,6 +1,6 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.9.0
+version=0.10.0
 revision=1
 build_style=go
 go_import_path="git.sr.ht/~rjarry/aerc"
@@ -13,7 +13,7 @@ maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=b5901feb37a55edd1f713e76c1012ac3fc0757202ddacd7d388cc7ce60638023
+checksum=14d6c622a012069deb1a31b51ecdd187fd11041c8e46f396ac22830b00e4c114
 
 post_install() {
  	make PREFIX=/usr DESTDIR=${DESTDIR} install

From c1a741ebd5258637b4a9d52f78a69359eebc950a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 8 May 2022 09:10:57 +0300
Subject: [PATCH 2264/2561] bftpd: update to 6.1.

---
 srcpkgs/bftpd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bftpd/template b/srcpkgs/bftpd/template
index e153a1dac490..7c456ad4fc60 100644
--- a/srcpkgs/bftpd/template
+++ b/srcpkgs/bftpd/template
@@ -1,6 +1,6 @@
 # Template file for 'bftpd'
 pkgname=bftpd
-version=6.0
+version=6.1
 revision=1
 wrksrc="$pkgname"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ maintainer="Norbert Vegh <vegh@norvegh.com>"
 license="GPL-2.0-only"
 homepage="http://bftpd.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/bftpd/bftpd-${version}.tar.gz"
-checksum=b7e602cacebb76b60a703dc65f1495cd9a381d345902b22903a1287dec8f025c
+checksum=9721d0614e1a5d0fe6b80c9a8a04ada8efd42cbdfddd239e95a8059ae283aa6f
 
 CFLAGS="-fcommon"
 

From 06b3aa46adc3055e36356b6021d122a2dfd0d983 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Sat, 7 May 2022 17:17:34 -0300
Subject: [PATCH 2265/2561] oil: update to 0.10.0

---
 srcpkgs/oil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index 7def1be36587..8866e01d7f94 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.9.9
+version=0.10.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=6f6b4c4b9cf8a1e8e1dc2ff7bf39c85a11b871ddda9e9e51b9f7e1a0e46b2824
+checksum=cf7da9494ba9f0f101d27f0d0b5e248f8a54721ddeec13dd54652c9528580296
 register_shell="/usr/bin/osh"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From 44201b390354be0add38d69da07feaec7b6e2245 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Fri, 6 May 2022 20:39:07 +0300
Subject: [PATCH 2266/2561] krita: update to 5.0.6.

---
 srcpkgs/krita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index 68e67ccb8157..c388e3b0505b 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=5.0.5
+version=5.0.6
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -22,7 +22,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=162fff4596484e688655d4636373b1a77bcea39824c655b477afc1463aaf2dae
+checksum=edd76d1b3e5fd00cffb90c4fdaa4dafecc8bf3638d1f7bccf463ec11ea3e0e62
 python_version=3
 replaces="calligra-krita>=0"
 make_check=no

From ce78f6f3a4308c2f258b12eab304f1237dfdfb9e Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 5 May 2022 23:52:07 +0300
Subject: [PATCH 2267/2561] fribidi: update to 1.0.12.

---
 srcpkgs/fribidi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template
index 50f61f6e98c4..39f2fbc41ca9 100644
--- a/srcpkgs/fribidi/template
+++ b/srcpkgs/fribidi/template
@@ -1,6 +1,6 @@
 # Template file for 'fribidi'
 pkgname=fribidi
-version=1.0.11
+version=1.0.12
 revision=1
 build_style=gnu-configure
 configure_args="--disable-docs"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/fribidi/fribidi/"
 changelog="https://raw.githubusercontent.com/fribidi/fribidi/master/NEWS"
 distfiles="https://github.com/fribidi/fribidi/archive/v${version}.tar.gz"
-checksum=0e6d631c184e1012fb3ae86e80adabf26e46b4ffee2332e679eb308edd337398
+checksum=2e9e859876571f03567ac91e5ed3b5308791f31cda083408c2b60fa1fe00a39d
 disable_parallel_build=yes
 
 pre_configure() {

From 3b4e88c39b2e3d797a71832f715855f1e36a9bcb Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sun, 8 May 2022 16:09:45 +0200
Subject: [PATCH 2268/2561] yad: update to 12.0

---
 srcpkgs/yad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index a9d75e6930e3..a16f62311a4b 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,6 +1,6 @@
 # Template file for 'yad'
 pkgname=yad
-version=11.1
+version=12.0
 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=ca61d422d6d464d7f473d1e5bd14d3ca05d311ef203f1c67bbea7c23bf0eae2f
+checksum=65dbfa72a229f6cbd131470caf4f70fec98fe935a1436acb58c841fa2a8bddde
 
 pre_configure() {
 	autoreconf -ivf

From 3b2642884e4736210351cef1de4bdea490703101 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sun, 8 May 2022 15:34:13 +0200
Subject: [PATCH 2269/2561] gitea: update to 1.16.7

---
 srcpkgs/gitea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index c8b9b361ce2d..b24b3171b49a 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.16.5
+version=1.16.7
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -32,7 +32,7 @@ license="MIT"
 homepage="https://gitea.io"
 changelog="https://raw.githubusercontent.com/go-gitea/gitea/main/CHANGELOG.md"
 distfiles="https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"
-checksum=d9aab2e8357ca1a22eaffb328356e4e355a8f851a4de6fb4e7eb54ca80f0187b
+checksum=51599b16d1c2e16dd617e0e9b5d1cc314a1ef141394d582833d411b9ccd2ac48
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From ae4aae274d0d2d12927e295fab8cdd6a53e06606 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 13 May 2022 22:46:21 -0400
Subject: [PATCH 2270/2561] dua-cli: update to 2.17.5

---
 srcpkgs/dua-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template
index ea5c1c27dad2..31df51fc5c59 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'dua-cli'
 pkgname=dua-cli
-version=2.17.1
+version=2.17.5
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/Byron/dua-cli"
 changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=d9af81b30f83d080472e91da3e07b42294904827ad5274d9aaf51d346072d2f1
+checksum=805a911300bbb5234c25f607b25444988a97c260c03c02932844aeee0ba108e1
 
 post_install() {
 	vlicense LICENSE

From 3d97169b7b5217b4403069c293e37c8a02558702 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 13 May 2022 22:19:47 -0400
Subject: [PATCH 2271/2561] procs: update to 0.12.2

---
 srcpkgs/procs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index 84e47b23614b..350cb3742e03 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,6 +1,6 @@
 # Template file for 'procs'
 pkgname=procs
-version=0.12.1
+version=0.12.2
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/dalance/procs"
 changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md"
 distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz"
-checksum=ce84e98dd85cb8d5afda871ad2ddceb4faec077d9e019469aa668a75821e4fc2
+checksum=14be8440fe85dc46e544a3f7e89b887db455a61db981d5f75b91fd89b366d84f
 
 post_build() {
 	PROCS="target/${RUST_TARGET}/release/procs"

From 9a032054f01fe28992ef004211b074b9df0d192b Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 13 May 2022 21:53:57 -0400
Subject: [PATCH 2272/2561] fnott: update to 1.2.1

---
 srcpkgs/fnott/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fnott/template b/srcpkgs/fnott/template
index 713071aa9f0a..cb7c4c766ad8 100644
--- a/srcpkgs/fnott/template
+++ b/srcpkgs/fnott/template
@@ -1,6 +1,6 @@
 # Template file for 'fnott'
 pkgname=fnott
-version=1.2.0
+version=1.2.1
 revision=1
 wrksrc=$pkgname
 build_style=meson
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="MIT"
 homepage="https://codeberg.org/dnkl/fnott/"
 distfiles="https://codeberg.org/dnkl/fnott/archive/${version}.tar.gz"
-checksum=d6cfb7efcfad5e0aa95c5fd9632c638a53a0debfc17128e70922a1ba9f841470
+checksum=a4e72845cde23aff0653f9b218a32cb40ae628b3f690dc02333ea95469faf216
 
 post_install() {
 	vlicense LICENSE

From 71f96876ceec2a44402b01dc82331bf3e1c650a8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 13 May 2022 20:14:55 +0200
Subject: [PATCH 2273/2561] php: update to 7.4.29.

---
 srcpkgs/php/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 700226b020b4..c6a628cf6864 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,6 +1,6 @@
 # Template file for 'php'
 pkgname=php
-version=7.4.27
+version=7.4.29
 revision=1
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
@@ -13,7 +13,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="PHP-3.01"
 homepage="https://www.php.net"
 distfiles="http://www.php.net/distributions/php-${version}.tar.xz"
-checksum=3f8b937310f155822752229c2c2feb8cc2621e25a728e7b94d0d74c128c43d0c
+checksum=7d0f07869f33311ff3fe1138dc0d6c0d673c37fcb737eaed2c6c10a949f1aed6
 
 conf_files="/etc/php/php.ini"
 

From 280332e23bb9edcf314d3b1128c969d473619367 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 13 May 2022 20:14:57 +0200
Subject: [PATCH 2274/2561] php8.0: update to 8.0.19.

---
 srcpkgs/php8.0/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/php8.0/template b/srcpkgs/php8.0/template
index 2ddb350061f3..c4a6df3a389e 100644
--- a/srcpkgs/php8.0/template
+++ b/srcpkgs/php8.0/template
@@ -1,10 +1,10 @@
 # Template file for 'php8.0'
 pkgname=php8.0
-version=8.0.18
+version=8.0.19
 revision=1
 _php_version=8.0
 wrksrc="php-${version}"
-hostmakedepends="bison pkg-config apache-devel curl"
+hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
@@ -15,9 +15,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://www.php.net"
 distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=cd980f5a2f422362f8c52d314ed25140c6f472877c5442c4f3304205f54e192a
-
-fetch_cmd="curl -O"
+checksum=48e57634d350bcab4745d25d9d94ffa474649bf4f7e879fad163226c0d107bb5
 
 conf_files="/etc/php${_php_version}/php.ini"
 

From d5e60355f73c6b6ddbac5ccec106e44ca9b46683 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 13 May 2022 20:14:58 +0200
Subject: [PATCH 2275/2561] php8.1: update to 8.1.6.

---
 srcpkgs/php8.1/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/php8.1/template b/srcpkgs/php8.1/template
index 16da7be3f32c..9852f076d51b 100644
--- a/srcpkgs/php8.1/template
+++ b/srcpkgs/php8.1/template
@@ -1,10 +1,10 @@
 # Template file for 'php8.1'
 pkgname=php8.1
-version=8.1.5
+version=8.1.6
 revision=1
 _php_version=8.1
 wrksrc="php-${version}"
-hostmakedepends="bison pkg-config apache-devel curl"
+hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant2-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
  libsodium-devel libtidy5-devel libxslt-devel libzip-devel net-snmp-devel
@@ -15,9 +15,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="PHP-3.01"
 homepage="https://www.php.net"
 distfiles="https://www.php.net/distributions/php-${version}.tar.gz"
-checksum=44d637627746082395d5d3d3d6ae7d71e780b82a8d55a0228887158c4316bf11
-
-fetch_cmd="curl -O"
+checksum=e847745fd66fc8c57fac993a609fefcded93fddccd225f0620a26bb5ae5753c3
 
 conf_files="/etc/php${_php_version}/php.ini"
 

From b7ea21e9d4f3923bfa8e948a4353600daed7a825 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 15 Mar 2021 19:12:50 +0100
Subject: [PATCH 2276/2561] xbps-src/shutils/update_check.sh: change gitlab
 check to handle subgroups

The `/-/` sequence is always between e.g. archive and the repo path,
so this should work reliably for distfiles.
If gitlab is used only as a homepage, this still wroks if homepage
points to the base repo (which it usually does)
---
 common/xbps-src/shutils/update_check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 0a624274f500..1f0ed7b1fe4d 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -123,7 +123,7 @@ update_check() {
                 url="https://github.com/$pkgurlname/tags"
                 rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';;
             *//gitlab.*)
-                pkgurlname="$(printf %s "$url" | cut -d/ -f1-5)"
+                pkgurlname="$(printf %s "$url" | sed 's%/-/*%%g')"
                 url="$pkgurlname/tags"
                 rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';;
             *bitbucket.org*)

From 1ae84af6e10ac401906836d088d4464999fcb4f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 14 May 2022 15:36:27 +0200
Subject: [PATCH 2277/2561] xbps-src/shutils/update_check.sh: change gitlab
 check to handle old urls

---
 common/xbps-src/shutils/update_check.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index 1f0ed7b1fe4d..7348260f54af 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -123,7 +123,10 @@ update_check() {
                 url="https://github.com/$pkgurlname/tags"
                 rx='/archive/refs/tags/(v?|\Q'"$pkgname"'\E-)?\K[\d.]+(?=\.tar\.gz")';;
             *//gitlab.*)
-                pkgurlname="$(printf %s "$url" | sed 's%/-/*%%g')"
+                case "$url" in
+                    */-/*) pkgurlname="$(printf %s "$url" | sed -e 's%/-/.*%%g; s%/$%%')";;
+                    *) pkgurlname="$(printf %s "$url" | cut -d / -f 1-5)";;
+                esac
                 url="$pkgurlname/tags"
                 rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';;
             *bitbucket.org*)

From d9ff24ce9f305a37b78220d7a37d2cd2e0300ab7 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Fri, 22 Apr 2022 06:33:47 +0700
Subject: [PATCH 2278/2561] kamoso: update to 21.04.1, orphan package

---
 srcpkgs/kamoso/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kamoso/template b/srcpkgs/kamoso/template
index 5b065d6f5788..dd41855bf15d 100644
--- a/srcpkgs/kamoso/template
+++ b/srcpkgs/kamoso/template
@@ -1,6 +1,6 @@
 # Template file for 'kamoso'
 pkgname=kamoso
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -15,9 +15,9 @@ depends="
  gst-plugins-bad1 phonon-qt5 qt5-graphicaleffects qt5-quickcontrols kirigami2
  purpose"
 short_desc="Simple and friendly program to use your webcam recorder"
-maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://apps.kde.org/kamoso/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kamoso"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=2bde8e8e6de25673a412ba6a966e898959ee5625dcadadc1bc295c12ad7128e1
+checksum=5b8c58640624701b05cb8534c14b26fdccb43828c50eb347e114da9fb32d3d0d

From ea35a61b957c3568b6166bae44286ae7ab5315c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 14 May 2022 16:31:35 +0200
Subject: [PATCH 2279/2561] tcsh: update to 6.24.01.

---
 srcpkgs/tcsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tcsh/template b/srcpkgs/tcsh/template
index d9c9d0d7c8af..d18e79e784d2 100644
--- a/srcpkgs/tcsh/template
+++ b/srcpkgs/tcsh/template
@@ -1,6 +1,6 @@
 # Template file for 'tcsh'
 pkgname=tcsh
-version=6.24.00
+version=6.24.01
 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="https://www.tcsh.org/"
 distfiles="https://astron.com/pub/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=60be2c504bd8f1fa6e424b1956495d7e7ced52a2ac94db5fd27f4b6bfc8f74f0
+checksum=5659a1b973b1f947e36238cb17a00210ac4cff3b496f8f851acd77172ab91d7e
 register_shell="/bin/tcsh /bin/csh"
 
 post_extract() {

From 10f2c474169818b34ce2667e34b13390266cc3b3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 14 May 2022 16:32:41 +0200
Subject: [PATCH 2280/2561] spigot: update to 20220509.4b9cde0.

---
 srcpkgs/spigot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spigot/template b/srcpkgs/spigot/template
index 6f9899faa780..d4c744b18bd3 100644
--- a/srcpkgs/spigot/template
+++ b/srcpkgs/spigot/template
@@ -1,6 +1,6 @@
 # Template file for 'spigot'
 pkgname=spigot
-version=20210527.7dd3cfd
+version=20220509.4b9cde0
 revision=1
 build_style=cmake
 makedepends="gmp-devel ncurses-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://www.chiark.greenend.org.uk/~sgtatham/spigot/"
 distfiles="https://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=1014b79607cbb6cc8143c9b3a093f266144124d9a4552785e5779c1a072faadc
+checksum=d32514c9e3a16c5a58bfbc8cfbad076fa50c7744273237e0bba3d15dc6e2102d
 
 post_install() {
 	vlicense LICENCE

From db334c2993d57659ab686089c2285d8ff33e8546 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 14 May 2022 16:33:24 +0200
Subject: [PATCH 2281/2561] nsd: update to 4.5.0.

---
 srcpkgs/nsd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 74062c7a360a..2e42a1014fb0 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,6 +1,6 @@
 # Template file for 'nsd'
 pkgname=nsd
-version=4.4.0
+version=4.5.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
@@ -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=cfcd6fdd99344ca5a7ef7c2940c241bcef471fc3252ba3dcbd4c57e0638e8836
+checksum=5ae7a704ab92c8a49f3c8f3a29565ce194c51a721c29c75ea7d43c13372d79c5
 system_accounts="nsd"
 nsd_homedir=/var/db/nsd
 make_dirs="/var/db/nsd 0755 nsd nsd"

From 1de4c9a70d6b8dbeef43b56af8b5a313bbd4d26c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 14 May 2022 11:00:55 -0500
Subject: [PATCH 2282/2561] nomad: update to 1.3.0.

---
 srcpkgs/nomad/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 7b53596b1aed..6618e86058dd 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,18 +1,18 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.2.6
+version=1.3.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=95514d569610f15ce49b4a7a1a6bfd3e7b3e7b4f
+_git_commit=52e95d64113e01be05d585d8b4c07f6f19efebbc
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=c69ec89ae5f76704d4b3ecb842b130f3d90e579bfd31191721b5f2da99f95a93
+checksum=ce00994e1dbd89d0685237b6815322780e09c414fcc80b019e0d163ea1cb7ac0
 
 post_install() {
 	vlicense LICENSE

From 17113e071009e5a65c8fbbcd49ca5f93592e9b81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 21:35:45 +0200
Subject: [PATCH 2283/2561] perl-Stow: replace with stow

---
 srcpkgs/perl-Stow          |  1 +
 srcpkgs/perl-Stow/template | 15 ---------------
 srcpkgs/stow/template      |  8 +++++++-
 3 files changed, 8 insertions(+), 16 deletions(-)
 create mode 120000 srcpkgs/perl-Stow
 delete mode 100644 srcpkgs/perl-Stow/template

diff --git a/srcpkgs/perl-Stow b/srcpkgs/perl-Stow
new file mode 120000
index 000000000000..1466463c80cd
--- /dev/null
+++ b/srcpkgs/perl-Stow
@@ -0,0 +1 @@
+stow
\ No newline at end of file
diff --git a/srcpkgs/perl-Stow/template b/srcpkgs/perl-Stow/template
deleted file mode 100644
index 33dfbcc7cf05..000000000000
--- a/srcpkgs/perl-Stow/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'perl-Stow'
-pkgname=perl-Stow
-version=2.3.1
-revision=2
-wrksrc="Stow-v${version}"
-build_style=perl-ModuleBuild
-hostmakedepends="perl perl-Module-Build perl-Test-Output perl-IO-stringy"
-makedepends="${hostmakedepends}"
-depends="${makedepends}"
-short_desc="Perl module for managing symlinks"
-maintainer="Martin Harrigan <martinharrigan@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://metacpan.org/release/Stow"
-distfiles="${CPAN_SITE}/Finance/ASPIERS/Stow-v${version}.tar.gz"
-checksum=5062a1f8d0c03e38aca5cf46b72de0cba03f901279729338b7b2f93e518182d8
diff --git a/srcpkgs/stow/template b/srcpkgs/stow/template
index cb6eb1aa1199..f20c72acbc16 100644
--- a/srcpkgs/stow/template
+++ b/srcpkgs/stow/template
@@ -1,7 +1,7 @@
 # Template file for 'stow'
 pkgname=stow
 version=2.3.1
-revision=3
+revision=4
 build_style=gnu-configure
 make_check_target="test"
 hostmakedepends="perl"
@@ -14,3 +14,9 @@ license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/stow/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=09d5d99671b78537fd9b2c0b39a5e9761a7a0e979f6fdb7eabfa58ee45f03d4b
+
+perl-Stow_package() {
+	build_style=meta
+	depends="stow>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+}

From f74b843c0251d21c2e57025f52e98580c4e3ff70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 23:49:38 +0200
Subject: [PATCH 2284/2561] bash-completion: resolve conflict with pacman

---
 srcpkgs/bash-completion/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template
index 8908de525e82..74d80d5f5dde 100644
--- a/srcpkgs/bash-completion/template
+++ b/srcpkgs/bash-completion/template
@@ -1,7 +1,7 @@
 # Template file for 'bash-completion'
 pkgname=bash-completion
 version=2.11
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="profiledir=/etc/bash/bashrc.d"
 depends="bash"
@@ -60,3 +60,8 @@ pre_check() {
 	done
 	export PYTEST_ADDOPTS
 }
+
+post_install() {
+	# for slackware's that we don't have, conflicts with pacman's
+	rm ${DESTDIR}/usr/share/bash-completion/completions/makepkg
+}

From 4d612ba5f75f630fd0bb9efc5d45c8ffc5d395df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 23:50:21 +0200
Subject: [PATCH 2285/2561] bff-apankrat: resolve conflict with bff

---
 srcpkgs/bff-apankrat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bff-apankrat/template b/srcpkgs/bff-apankrat/template
index 452aa4c3f0b7..9355d1ef7e38 100644
--- a/srcpkgs/bff-apankrat/template
+++ b/srcpkgs/bff-apankrat/template
@@ -1,7 +1,7 @@
 # Template file for 'bff-apankrat'
 pkgname=bff-apankrat
 version=1.0.7
-revision=1
+revision=2
 wrksrc="bff-${version}"
 build_style=gnu-makefile
 short_desc="Moderately-optimizing brainfuck interpreter"
@@ -12,7 +12,7 @@ distfiles="https://github.com/apankrat/bff/archive/v${version}.tar.gz"
 checksum=1f8787f8bc12ae4282112dabc5b85f03002269dce57023ee0443250d5a68702f
 
 do_install() {
-	vbin bff
+	vbin bff bff-apankrat
 	head -n 13 bff.c > LICENSE
 	vlicense LICENSE
 }

From 2c137f0323000e2b4d6fd9258ecab23b0891f8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 23:54:43 +0200
Subject: [PATCH 2286/2561] nullmailer: provide smtp-server

- resolve conflict with other `smtp-server`s
- fix tests
---
 srcpkgs/nullmailer/template | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/nullmailer/template b/srcpkgs/nullmailer/template
index 16a0bc618ef8..0812b846f8ec 100644
--- a/srcpkgs/nullmailer/template
+++ b/srcpkgs/nullmailer/template
@@ -1,7 +1,7 @@
 # Template file for 'nullmailer'
 pkgname=nullmailer
 version=2.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-tls"
 conf_files="/etc/nullmailer/*"
@@ -10,6 +10,7 @@ make_dirs="
 	/var/spool/nullmailer/queue	0700	_nullmail	root
 	/var/spool/nullmailer/tmp	0700	_nullmail	root"
 makedepends="gnutls-devel"
+checkdepends="daemontools ucspi-tcp"
 short_desc="Simple relay-only mail transport agent"
 maintainer="Deneys S. Maartens <deneys.maartens@gmail.com>"
 license="GPL-2.0-or-later"
@@ -17,6 +18,13 @@ homepage="https://untroubled.org/nullmailer/"
 distfiles="https://untroubled.org/nullmailer/archive/nullmailer-${version}.tar.gz"
 checksum=9886fa627b7e7e775e2f09fbe789247b1ca304f152da04ff705e50079263a855
 system_accounts="_nullmail"
+provides="smtp-server-0_1"
+replaces="smtp-server>=0"
+
+pre_check() {
+	# Hangs, possibly missing test data
+	vsed  -i test/tests/smtp-auth -e '/Testing auth permanent failure with smtp/,/error/d'
+}
 
 post_install() {
 	for f in mailq sendmail; do

From 195a4bdbb1aad2f739e7e6419396b778f7f49084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 23:55:13 +0200
Subject: [PATCH 2287/2561] qdirstat-cache-writer: resolve conflict with
 qdirstat

---
 srcpkgs/qdirstat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template
index 5016c664a012..d297cd50e41a 100644
--- a/srcpkgs/qdirstat/template
+++ b/srcpkgs/qdirstat/template
@@ -1,7 +1,7 @@
 # Template file for 'qdirstat'
 pkgname=qdirstat
 version=1.8
-revision=3
+revision=4
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="zlib-devel qt5-devel"
@@ -21,6 +21,6 @@ qdirstat-cache-writer_package() {
 	depends="perl"
 	pkg_install() {
 		vmove usr/bin/qdirstat-cache-writer
-		vman man/qdirstat-cache-writer.1
+		vmove usr/share/man/man1/qdirstat-cache-writer.1.gz
 	}
 }

From 5851be76d35a234815dceff10d705d5edb4c5410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 11 May 2022 23:55:29 +0200
Subject: [PATCH 2288/2561] zsh-completions: resolve conflict with cheat

---
 srcpkgs/zsh-completions/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/zsh-completions/template b/srcpkgs/zsh-completions/template
index db1fa7a5f517..dfbb5cde85b8 100644
--- a/srcpkgs/zsh-completions/template
+++ b/srcpkgs/zsh-completions/template
@@ -1,7 +1,7 @@
 # Template file for 'zsh-completions'
 pkgname=zsh-completions
 version=0.33.0
-revision=1
+revision=2
 depends="zsh"
 short_desc="Additional completions for Zsh"
 maintainer="Alexander Gehrke <void@qwertyuiop.de>"
@@ -16,6 +16,7 @@ post_patch() {
 
 do_install() {
 	vmkdir usr/share/zsh/site-functions/
+	rm src/_cheat # cheat package includes better one
 	vcopy src/_* usr/share/zsh/site-functions/
 	vlicense LICENSE
 }

From 32c23abb8115de90c015ef6d7ec8ec62a306fe0f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 14 May 2022 18:28:39 +0300
Subject: [PATCH 2289/2561] toybox: update to 0.8.7.

---
 srcpkgs/toybox/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/toybox/template b/srcpkgs/toybox/template
index 74b0a779e296..722e17bc2307 100644
--- a/srcpkgs/toybox/template
+++ b/srcpkgs/toybox/template
@@ -1,6 +1,6 @@
 # Template file for 'toybox'
 pkgname=toybox
-version=0.8.5
+version=0.8.7
 revision=1
 create_wrksrc=yes
 short_desc="BSD-licensed alternative to busybox"
@@ -8,7 +8,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="0BSD"
 homepage="http://www.landley.net/toybox"
 distfiles="http://www.landley.net/toybox/downloads/toybox-${version}.tar.gz"
-checksum=bfd230c187726347f7e31a1fc5841705871dfe4f3cbc6628f512b54e57360949
+checksum=b508bf336f82cb0739b77111f945931d1a143b5a53905cb753cd2607cfdd1494
 
 post_extract() {
 	mv toybox-${version} toybox
@@ -40,6 +40,7 @@ _rm_failing_tests() {
 	rm tests/hostname.test
 	rm tests/losetup.test
 	rm tests/rmdir.test
+	rm tests/rm.test
 }
 
 do_check() {

From 68db6145e6b8f48e573aa9350e0d41c91be40e93 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 14 May 2022 18:23:39 +0300
Subject: [PATCH 2290/2561] pidgin: update to 2.14.9.

---
 srcpkgs/pidgin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template
index 7b38bc319060..d9010fb67b46 100644
--- a/srcpkgs/pidgin/template
+++ b/srcpkgs/pidgin/template
@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
-version=2.14.8
-revision=2
+version=2.14.9
+revision=1
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://pidgin.im/"
 distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2"
-checksum=3f8085c0211c4ca1ba9f8a03889b3d60738432c1673b57b0086070ef6e094cca
+checksum=1872d1629a26e9b775d9ec0bdd3d3fd348f721376f320b29bcd5ff3f0443222b
 python_version=2
 lib32disabled=yes
 

From a6124cb5fb82484b6f3bfefa74191bb13c15c1d1 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 3 May 2022 19:49:15 +0700
Subject: [PATCH 2291/2561] kdenlive: update to 22.04.1

- add opencv (for motion tracking)
- remove vlc (only as optional media player)
---
 srcpkgs/kdenlive/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdenlive/template b/srcpkgs/kdenlive/template
index a4871c0af642..1cc4793c923f 100644
--- a/srcpkgs/kdenlive/template
+++ b/srcpkgs/kdenlive/template
@@ -1,6 +1,6 @@
 # Template file for 'kdenlive'
 pkgname=kdenlive
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="
@@ -10,14 +10,14 @@ makedepends="
  kdeclarative-devel kfilemetadata5-devel knewstuff-devel knotifyconfig-devel
  kplotting-devel mlt7-devel qt5-multimedia-devel qt5-webkit-devel purpose-devel
  v4l-utils-devel ksolid-devel qt5-quickcontrols2-devel qt5-networkauth-devel"
-depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit qt5-quickcontrols vlc"
+depends="breeze-icons dvdauthor ffmpeg frei0r-plugins kinit opencv qt5-quickcontrols"
 checkdepends="$depends"
 short_desc="Non-linear video editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://kdenlive.org"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=7aa3fee6f2938664f2e35dae97a67ebfdedb6aec2bf4bbabfca5e7b1456c55c1
+checksum=ae879041f18ee89b3fef2dc85cbb6899bf184c433b234d0c2145085767952a4e
 # FIXME: Test #507: RunCMake.file-GET_RUNTIME_DEPENDENCIES fails
 make_check=extended
 

From ac0c0787408502ed366ba201ef2b620438ffb4b7 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 14 May 2022 21:12:51 -0500
Subject: [PATCH 2292/2561] consul: update to 1.12.0.

---
 srcpkgs/consul/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index d31feecc270f..9f3f4d50721c 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.11.4
+version=1.12.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=944e8ce64201ab2bbe923b207883d08a4dcff73a
+_git_commit=09a8cdb4a5c0c53201d7888d9fb618dde007cdd8
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -14,7 +14,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=253200fbf79aefee632c5cde9f90e6df6eddcb2766f2909b0d347c4438065126
+checksum=87b3fe01d0a772dc1cbab31cf38ab05d651d93cd1632aa289faf06988a65d617
 
 post_install() {
 	vlicense LICENSE

From 6e55bdde6c50c56449f9afd4f12d01c590630f34 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 14 May 2022 21:21:12 -0500
Subject: [PATCH 2293/2561] vault: update to 1.10.3.

---
 srcpkgs/vault/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 111feb18627e..c9243585313c 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.10.0
+version=1.10.3
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=fcbe948b2542a13ee8036ad07dd8ebf8554f56cb
+_git_commit=af866591ee60485f05d6e32dd63dde93df686dfb
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 depends="libcap-progs"
 short_desc="Manage Secrets and Protect Sensitive Data"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=4b3303af72b9383369d6219dc88beaef3b343b262625e5d7c6a309ae9286d8c2
+checksum=5f7d3d2fcd856b5595182e02c40c976b520658be3cca8638edac5a20869c8373
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0750 root _vault"

From aa969727d17040405afb5457185c65a3461d51a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 15 May 2022 00:29:14 -0300
Subject: [PATCH 2294/2561] linux5.4: update i686 config.

---
 srcpkgs/linux5.4/files/i386-dotconfig | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.4/files/i386-dotconfig b/srcpkgs/linux5.4/files/i386-dotconfig
index e27c6fe9edfc..fa6a30fd7091 100644
--- a/srcpkgs/linux5.4/files/i386-dotconfig
+++ b/srcpkgs/linux5.4/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.4.180 Kernel Configuration
+# Linux/i386 5.4.193 Kernel Configuration
 #
 
 #
@@ -2143,6 +2143,7 @@ CONFIG_PNPACPI=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_NULL_BLK=m
 CONFIG_BLK_DEV_FD=m
+# CONFIG_BLK_DEV_FD_RAWCMD is not set
 CONFIG_CDROM=m
 # CONFIG_PARIDE is not set
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
@@ -3449,8 +3450,6 @@ CONFIG_HYPERV_NET=m
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-CONFIG_NVM=y
-# CONFIG_NVM_PBLK is not set
 
 #
 # Input device support

From da01ef525063b30cad311d4171d8df4e1c177d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 15 May 2022 00:29:40 -0300
Subject: [PATCH 2295/2561] horizon: update to 2.3.0.

---
 srcpkgs/horizon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 8615a24596f8..1165f67ab713 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,6 +1,6 @@
 # Template file for 'horizon'
 pkgname=horizon
-version=2.1.0
+version=2.3.0
 revision=1
 build_style=gnu-makefile
 make_build_args="GOLD="
@@ -9,14 +9,14 @@ make_use_env=yes
 hostmakedepends="pkg-config glib-devel"
 makedepends="cairomm-devel librsvg-devel yaml-cpp-devel sqlite-devel boost-devel
  glm libgit2-devel libcurl-devel occt-devel cppzmq libpodofo-devel libzip-devel
- gtkmm-devel libepoxy-devel libsodium-devel"
+ gtkmm-devel libepoxy-devel libsodium-devel libarchive-devel libspnav-devel"
 short_desc="Free EDA package"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-only"
 homepage="https://horizon-eda.org/"
 changelog="https://raw.githubusercontent.com/horizon-eda/horizon/master/CHANGELOG.md"
 distfiles="https://github.com/horizon-eda/horizon/archive/v${version}.tar.gz"
-checksum=2ba7a64ef0d8f22ad12e6a5a9c108f865eeb468f954f51ee5fbc03e6a847549a
+checksum=32045e46ad54469cce926508c09d0d1701dc49fb6ab613be2bc99b0e0a0662b3
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" INC_OCE=-I$XBPS_CROSS_BASE/usr/include/opencascade"

From 07e870d551d8378278213c78386e1c652af7de97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:02 +0200
Subject: [PATCH 2296/2561] libtpms: update to 0.9.4.

---
 srcpkgs/libtpms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtpms/template b/srcpkgs/libtpms/template
index 9d8d52f00aa7..ad897ea2a623 100644
--- a/srcpkgs/libtpms/template
+++ b/srcpkgs/libtpms/template
@@ -1,6 +1,6 @@
 # Template file for 'libtpms'
 pkgname=libtpms
-version=0.9.1
+version=0.9.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="libtool automake pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause, custom:IBM"
 homepage="https://github.com/stefanberger/libtpms"
 distfiles="https://github.com/stefanberger/libtpms/archive/refs/tags/v${version}.tar.gz"
-checksum=9a4d1ed07b78142c394faad1a1481771d470048f5859e80593fe42c82e5635a5
+checksum=61d6f947a60686ec98e7cc5861f0999bd6cdaa1fc2b8901b8dc68d1a715b35cf
 
 pre_configure() {
 	autoreconf -f -i

From 13a11066449e3cf8a6be59ccf31c66817a4cb612 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:04 +0200
Subject: [PATCH 2297/2561] swtpm: update to 0.7.3.

---
 srcpkgs/swtpm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/swtpm/template b/srcpkgs/swtpm/template
index dd12bc9e41fd..d1eeb0a56a5f 100644
--- a/srcpkgs/swtpm/template
+++ b/srcpkgs/swtpm/template
@@ -1,6 +1,6 @@
 # Template file for 'swtpm'
 pkgname=swtpm
-version=0.7.0
+version=0.7.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-gnutls ac_cv_path_TCSD="
@@ -14,11 +14,11 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://github.com/stefanberger/swtpm"
 distfiles="https://github.com/stefanberger/swtpm/archive/refs/tags/v${version}.tar.gz"
-checksum=bed41871ad42ec852c450f5764be36b6c16456b943b912351eca9c29ce382976
+checksum=e856d1f5842fb3335164f02f2c545dd329efbc3416db20b7a327e991a4cd49c8
 # check expects that root directory is setup fully for swtpm with e.g. tss user created
 make_check=no
 ignore_elf_files="/usr/share/swtpm/swtpm-localca"
-make_dirs="/usr/lib/swtpm-localca 0750 tss root"
+make_dirs="/var/lib/swtpm-localca 0750 tss root"
 
 conf_files="/etc/swtpm-localca.conf
  /etc/swtpm-localca.options

From 8a711eb53b53140842f12dc1d9be8891361de08d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:13 +0200
Subject: [PATCH 2298/2561] bluedevil: update to 5.24.5.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index b76585975dd1..7c47f2823beb 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.24.4
+version=5.24.5
 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=83778e9cd952c6efeb786395d3fb9f5d4e6aa65d2ef2bc02ad7d256a3201f0d6
+checksum=c96999c1400804e8bddc8b9801c4951f82daca83110e036bdc9c89faaeb31efa
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 2b8cf72435bc80fca23a4d4579e545e12f69f5a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:14 +0200
Subject: [PATCH 2299/2561] breeze-gtk: update to 5.24.5.

---
 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 20473061da4b..403f6fb2677b 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.24.4
+version=5.24.5
 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=b2fe8150a8576fb39d26b809e6b9cb06e2c2d2b039558ad75307d62ed857a168
+checksum=23716cc08d570ddcf0e739fef2f585f3469d801313ab2c0ba89f494f93f94530
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 454894c08bbc6d376199241eb456404de032d5c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:54 +0200
Subject: [PATCH 2300/2561] breeze: update to 5.24.5.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 64bc70e3be00..3b55c9d71a52 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.24.4
+version=5.24.5
 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=e369ee21e6aab1d5e3ae222ecd84bdb59f3d29ce3b61965b498bbfe84c949805
+checksum=8525a6b50da5523c3d21c1223e0f2b8ad4a2d147e48e5d128e1c6ee06baaf0a3
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 5d6cb383aa9bb09f5ddb3f48280388bdf9477ac5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:56 +0200
Subject: [PATCH 2301/2561] kactivitymanagerd: update to 5.24.5.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index e8fc45c00005..d53668245c2f 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ 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=8128371fd75f7dd4ccb2203ad775e6f12db28bbb64047d0fd63eb745d8735529
+checksum=ea9276b022264b3b92a1307be83ca0030a5f12270d9ad5ff1e92f82c1928cd48

From 48cb83dd50e52ef1c97e618ac645a972ee5b602d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:09:59 +0200
Subject: [PATCH 2302/2561] kde-cli-tools: update to 5.24.5.

---
 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 0f61ce9efc66..d8774cbd926c 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.24.4
+version=5.24.5
 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=ffe4c8d3f4e97c57801360ba32cb70c961ad5796d56d4f0bae10ab2ec68759f0
+checksum=e7f0dd3469b7b3152e72514f1f6ce544514067011ebd0137cb0957d37ad6d329
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From d79457cd6c4ea3f75729e23fcd99c28939cf65d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:01 +0200
Subject: [PATCH 2303/2561] kde-gtk-config5: update to 5.24.5.

---
 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 ca92bc05101a..3bd609544f8e 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.24.4
+version=5.24.5
 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=b17aaad5f96890426a8864ba51f026732007e47fd42c4ce4df3e469b455f570b
+checksum=98a19c230fd4559818276c13295250bd3508e2869f979f8c8472d339299ee869
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 698800b7db545a10a758811b97b7603b377e094f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:03 +0200
Subject: [PATCH 2304/2561] kdecoration: update to 5.24.5.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 511d4d627094..cba7c08d1975 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.24.4
+version=5.24.5
 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/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=2c999206c51a6a6c5ecda211773276438f0069a2e1c81d4903ae5712c6f28c15
+checksum=273087d6345fd1f7bcefa570f56123cde4355832952dba6cb228fe04a6a152c2
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From e3643f5b0ac98f7ab5a9048309e977562f3897f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:05 +0200
Subject: [PATCH 2305/2561] kdeplasma-addons5: update to 5.24.5.

---
 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 22c2981a4dd1..169fbd46faa7 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.24.4
+version=5.24.5
 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=d721d32d16f34ef1066bdf2fcb781d5bc1aca7cf5cdf3a71c6fef2dfe668680d
+checksum=3db52bc3c594d92deea3cfcb3112b4fa6ce328b7481acaa79187dab274e5e80e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f8b77a4555f0e139de8b2af2a511fd2e7bb44483 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:07 +0200
Subject: [PATCH 2306/2561] kgamma5: update to 5.24.5.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 75f1ab3613c3..dd6c2e7ad48b 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.24.4
+version=5.24.5
 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/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=73ed9897b2281a8ddd7b47f063d548fa71b683662a63b5648ba590160bcf3f7c
+checksum=8086897a9faa9b1be0222a9505b05b6d2d89f2d730f1f461da63395c581bf1c4

From 724ae045573034119f0fe8fe182c2193586531a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:10 +0200
Subject: [PATCH 2307/2561] khotkeys: update to 5.24.5.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 38c24c59dde9..8e4d7a53334b 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.24.4
+version=5.24.5
 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=5aac75b05f0b5a63ea924b02645bbfacfe18fef3d5c23182b482ebc5d17f6d0c
+checksum=7a2307b4ca1dca1b240a59ea4bbbceb48b1f6759c9ce3bb36b3cab7274f6a71a
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 76976127e5e2f6e441000a88e83d1608f37ef529 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:13 +0200
Subject: [PATCH 2308/2561] kinfocenter: update to 5.24.5.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 34fe68536c24..9c0cf6f993ff 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.24.4
+version=5.24.5
 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-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=dc5b84964de4b68e45300477039c656d622a9546340e997eb8249de6a532b838
+checksum=c1d241c05ebc578633512bf304b7e5bf461c7e63e45285913e212786eac14b30
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 988fb2dabb7cac4be99f1a7a64ac88fd95924066 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:16 +0200
Subject: [PATCH 2309/2561] kmenuedit: update to 5.24.5.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 3f4a699195b2..b1a389b142a5 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.24.4
+version=5.24.5
 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/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=147a7e9a15393375c2b22b5dfb025a87f3356cf756cf3b17615ba989bb443466
+checksum=78a776a8cd6db98334335b68011ac887f9b27bb52cb4d0b504d14aafe032340a

From a7cedf11a79b8b3df1c1787cceb64b91063af8c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:18 +0200
Subject: [PATCH 2310/2561] kscreen: update to 5.24.5.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index c7f235baf15e..12e9a3fc2317 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.24.4
+version=5.24.5
 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=3048edb7e1231b0d7a33b2e10a202e6fce34e34f47079fc87f8177d7aa871b6a
+checksum=d9c351ad25783596aae466e305ad80de48ff3094a219ec6ffe08c7870ea3b5bc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 471d703456b8e5c23e1ca9de0a12e45a6c75278a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:19 +0200
Subject: [PATCH 2311/2561] kscreenlocker: update to 5.24.5.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 4b50eb78ee55..4f2877a5ae46 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.24.4
+version=5.24.5
 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/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fb226273064422f9f73b6b091e26396349e0cfd53a88398b79fa2acd1540ecf7
+checksum=3270a1845c9fc694a50db38de4c27586d2f488152e1bcf88be0088d6799bf98e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From 870189acc0758c6159427769683ac48e50159502 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:21 +0200
Subject: [PATCH 2312/2561] ksshaskpass: update to 5.24.5.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 4deaf3217e6c..15e89443b35e 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.24.4
+version=5.24.5
 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=34c5d4f196d09c4ebe8990d3761bc70059436e272ad46a761e71b5910e0f44dd
+checksum=3fe20b23ae5f777d7dd15069212c15826121ce70e5260283d61ad34bad8383cb
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From d540b1478f1a778d39d9a1c4dde48c54ffc48cdb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:23 +0200
Subject: [PATCH 2313/2561] ksystemstats: update to 5.24.5.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index f912db7fea5e..e4d9ab1e6343 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -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-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8dc735e9133ab01e537d71121b0e76e078f4fffce2d86b4c5d62c85878ee47dd
+checksum=0bacd8f8a494addb4afa37d59236429f8898ab5b80882abde44f41182aa759f7

From ed5411842fac3e12e7595fe8885147d7b33cb957 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:25 +0200
Subject: [PATCH 2314/2561] kwallet-pam: update to 5.24.5.

---
 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 9e206f9e5cc6..54376f6b8565 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.24.4
+version=5.24.5
 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=99d4e1acc24e89376f6eb5fad78f6055b4c3a9fff73459845af32841743bdf68
+checksum=238ed9b80fe3fc72d10a728801c873a0c85db9b9823f3a62ef7d39d6e9a4acea

From 83d11643e06fa73ddb503621e50b041b66879db6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:27 +0200
Subject: [PATCH 2315/2561] kwayland-integration: update to 5.24.5.

---
 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 d4dc57cef6d6..4c671829a5d1 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.24.4
+version=5.24.5
 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"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d2e74baa0e2966b92330b8df7567b0b1cc85a71ea24c3f453da39aed035aceb2
+checksum=806a9607bb70f95b08ccad55f28eaf0a85adc1439afa2d2717b7c9d6c33022ec

From 2cd87197f29693854a3672fd44512b0ba33346aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:29 +0200
Subject: [PATCH 2316/2561] kwayland-server: update to 5.24.5.

---
 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 19bd5a8345ab..3b1b1efb8d83 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.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,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=d1790bd7584dce9a36a432819b170ce72d34d5df79083b1b41dfe3e021b6e988
+checksum=2ddabe29794489d11096ed831ad4d5c1626130019322d4305d58df84c835b279
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 3a7e48ebface71bad27f762587846b997ff4dbea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:40 +0200
Subject: [PATCH 2317/2561] kwin: update to 5.24.5.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 855d5bcaa842..3aac33c97cd5 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,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=e2142321a9b1189665354838a66baeb2189235b705efca2364777bc3a3698ce3
+checksum=f35e15254cebeb8afc5eae1c694a603e04097fe3e7e0033a5f5fc255835eaf82
 
 build_options="pipewire"
 build_options_default="pipewire"

From e3965a8cec003949894a20297c07c88db2d16057 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:42 +0200
Subject: [PATCH 2318/2561] kwrited: update to 5.24.5.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 38a32a832c3f..b33f3a1963a1 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.24.4
+version=5.24.5
 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=62d700b673102f2740ed34e305902260c7035f5c8cc6ef19494a98f3088c0649
+checksum=6204a31fe1e160c8d664e68b30a1d91d31ead2bbfd7cd5841eeb39cb91dcd23d

From 5769a13dd8a734c61eb47f2967f962e8a1eae254 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:44 +0200
Subject: [PATCH 2319/2561] layer-shell-qt: update to 5.24.5.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 0249259ea03e..9fd4f43f7921 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a0979fdb2f61a6d2c68fe2d93573d5b46597021600d748a379d18cb9af711e0f
+checksum=f591600cc0697cc94ce765bd17b1f9e3ab52d3d58c4de89e2820de3a7377b279
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8ce57ee0437ba67afc9d582b83714489721f1883 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:45 +0200
Subject: [PATCH 2320/2561] libkscreen: update to 5.24.5.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 1b82bcea1033..108314ca7b5e 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.24.4
+version=5.24.5
 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/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=016dec6d912b2a733ebdd26bfe5e31029651bd5b4e476d95a541765a68dd67f7
+checksum=7ff118af3320e53d2c1cb9f324d2ee13d087062ef354d219f20503da5ac06fc9
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From 06268e46f44db91bce7185b1c196c30534ccdec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:47 +0200
Subject: [PATCH 2321/2561] libksysguard: update to 5.24.5.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index c5cc1f764300..d635b103f323 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ 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=76da2a7fb7f760c55111db756d91dd3041721baa8a1f8863ad9e0bc0a6a02402
+checksum=b06cb33a6e17c04c47ed4ded72a122acd6a2af60776c18719cdd74be27eb41ec
 
 build_options="webengine"
 

From 5a0801f1527ca5b5c3e24d1e58ed36e0fdfa4423 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:49 +0200
Subject: [PATCH 2322/2561] milou: update to 5.24.5.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index fe5a63847469..539e9435f370 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.24.4
+version=5.24.5
 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=3109ad6c97415d74fccdfd26681360ff0925e58af7a1c72905437eb99faff37c
+checksum=c1594e8b575d7de7b7cafe8a6f37dbe7c75d338075c6fa0fd8ec08d283ff05e6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 5daf7cf614d054128936ca544ef63d26258ab05f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:57 +0200
Subject: [PATCH 2323/2561] oxygen: update to 5.24.5.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 2bfa8498a225..4cf06488fa6a 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.24.4
+version=5.24.5
 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=804d033afab3f16319d92a8e5dacfb2a5797f8661a64029ee9e9b3c0b0f87ab4
+checksum=3b58ef1edd0d704113adacb50b163dbc34a71fcdd9762a97beb23d53393700be

From d89a5f47b279ce63d567cfb94aee49e0e959e85a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:10:59 +0200
Subject: [PATCH 2324/2561] plasma-browser-integration: update to 5.24.5.

---
 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 ad1a10231bed..8955230045ec 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.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 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=677af76b6f7072312d63bd8230af6e6920d7b69942ad69cdf0a29356ce695bc1
+checksum=1b67baf45996b66c63e88a6df5572c83a3f36b777a9df2802c192abd8df5cbf7

From 2c54b0f656a7cb269ec9f9b3f022a9d543eab12b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:09 +0200
Subject: [PATCH 2325/2561] plasma-desktop: update to 5.24.5.

---
 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 6d2b3752e213..9bc60832c68a 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.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ 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=b0e23046300e49acf93d9181d0c8dda2008a9a843a441af2528a91abc5c7d025
+checksum=af58796c43a7eb909d4c6782e899e428c9b569a9ab92eb34ba7391c763002c46
 replaces="user-manager>=0"
 python_version=3

From 388501d17ffdc0e99b326020995dc1027b4c65ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:11 +0200
Subject: [PATCH 2326/2561] plasma-disks: update to 5.24.5.

---
 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 025d7ab6e172..423c637a22b1 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.24.4
+version=5.24.5
 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=cf8a33e81b8d3b6b2d94374eb673adec19639eef8c2df803e1721630c67525d6
+checksum=139495ade44ac725856bb4567dfd503fa9eb92c0f7dcca268aa1286e59a974f4

From a34e4571950534798def407890a728a3bfc5652f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:14 +0200
Subject: [PATCH 2327/2561] plasma-firewall: update to 5.24.5.

---
 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 be8466cd08c3..9e3576a024c7 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.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcmutils
@@ -11,4 +11,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=a2bae12766e6536b7cd6d6445368f8249bf79d488d30dc5d57e2aed6442d2f39
+checksum=84a49688753645c234dec4ad84ac726a3aa2def18795e2f139cff21c16bd6956

From ff2cfe652b8d30e015759dbbf29a8a4893db82eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:16 +0200
Subject: [PATCH 2328/2561] plasma-integration: update to 5.24.5.

---
 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 b5f6098c11dd..f62cd0035065 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.24.4
+version=5.24.5
 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=73d4993d2c7aeabbb068e8d28821566d04f2dcb882dd1d92feadc2062b3b4db4
+checksum=cd4490e1e23276bd4f7827ec1c6a3dee6703b8065bd5b4f3fad8112b53eadf7a

From 2ad51eb75d31f58948a1657ff6e6d44fe032d766 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:18 +0200
Subject: [PATCH 2329/2561] plasma-nm: update to 5.24.5.

---
 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 ee283ed3c555..a6339194bc8a 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.24.4
+version=5.24.5
 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=086c28cfdaa6f4de785662ccd8123cd48b2a333fbaa2ca70b2a6d9dc3622ec2f
+checksum=ae1026cf7d2fb60f862ac9b985da4f7001f54267602062e461d0849f1d2fb429
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From e05d88188ecf7fd16970be5d57a5ea597ad6cb1c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:20 +0200
Subject: [PATCH 2330/2561] plasma-pa: update to 5.24.5.

---
 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 36cffcd23b04..98baa5aaf919 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.24.4
+version=5.24.5
 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=ffe5b915e5e1d2e5d4de719502793dd5b91cd9715cc44f82c88fc5ff0556d325
+checksum=068f0d393a87d3f3c8031eaecd1c2d2bdb17e73c510e020280ab18da3c15f8d1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From c73dc897ea3f264b6ab71e58130ac97482b3e8b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:22 +0200
Subject: [PATCH 2331/2561] plasma-sdk: update to 5.24.5.

---
 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 98e9f404e1c2..6af830b1aaea 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.24.4
+version=5.24.5
 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=ecf35743a28c350aada480248bbc138b726315e53f36bb39afe5fba0d27d6ffe
+checksum=1cd4db58018bc827572e5d2f08d6a9a037dd7a0cd0dd72c858e7c42d27d36534
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 9ed10bb8455b512c777a2f118fa9dc84aa40bd46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:24 +0200
Subject: [PATCH 2332/2561] plasma-systemmonitor: update to 5.24.5.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 8a77dfdc1496..d9ab9d8da698 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -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=1ff2853be75349892642a0144cc64a15c5f1bffacb0637e8b5c269055ead9a49
+checksum=156bd761c4e2e334475ed0e7d0de6bc6f5009197f168d53c846c5c5b67e1a0ef

From 866c30e088472359fca1f55ba8946680d084c83e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:26 +0200
Subject: [PATCH 2333/2561] plasma-thunderbolt: update to 5.24.5.

---
 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 6dc40e6212fa..8869f2df4f1c 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.24.4
+version=5.24.5
 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=1efecdd4b5e3302b37ae28964cd371d404189f7879a9752f000b6df4745b0ab3
+checksum=9485a89477c629083be0933f44ee96ec65f079c39b16a1ba5f131bb0044d19e0
 
 do_check() {
 	: # Requires running dbus and bolt services

From e589db1ed0f7485302890ee1c54443e6e3a8b63d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:11:28 +0200
Subject: [PATCH 2334/2561] plasma-vault: update to 5.24.5.

---
 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 7010aff50a86..04d057b95eb0 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.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -14,4 +14,4 @@ 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=0169c2b8d48fbfccf132317f62cec342d2f1cbc7352e52a513ca575198f84966
+checksum=8122c33727ce5b9c338bdbfe7a96086dedbe9932a73c08cfd39863fe9dff9e99

From 722b73025818f2304f18e7ef78d9499eb719dc56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:12:50 +0200
Subject: [PATCH 2335/2561] plasma-workspace-wallpapers: update to 5.24.5.

---
 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 f0f8e072fbeb..d9b6085b81d9 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.24.4
+version=5.24.5
 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=243cf6bb613d30ccb92e183938dcd3e02c1c7a11624a447c35c56a5eac3def42
+checksum=119b6732ac14447e49362d9544ff4431ed703dc03e7854926fbf72fd49ab4b29

From bf29892ec1148fcc6a4b2eb34b8107f39c716f74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:11 +0200
Subject: [PATCH 2336/2561] plasma-workspace: update to 5.24.5.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index ac82a06c4a9e..aa7680e4d8ce 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.24.4
+version=5.24.5
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,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=5b0e40b090d6bd1fe1f902a60633e4417ce711b34c32bfd2fce5b16bb9b2ec70
+checksum=b9912691e0becfa0839dbf7750ea24729b72bad0216bef27584f9faf882064f6
 
 build_options="pipewire"
 build_options_default="pipewire"

From 95c362bf5a51a67d2dda8a304df56eee4270e4fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:13 +0200
Subject: [PATCH 2337/2561] polkit-kde-agent: update to 5.24.5.

---
 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 84ef537290aa..56a84b2d2891 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.24.4
+version=5.24.5
 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=955246c593d0332bfbe386e81aaf7714e9ac8b8e7743c8c2e4f334b28dd685ad
+checksum=89a61cc4f2dee58dd420317b0732a67f954cd22f03d47c4bb33d9c6a5361e870

From c4e3df02e32eb2b18e1620ff16b74a93a6bf73f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:16 +0200
Subject: [PATCH 2338/2561] powerdevil: update to 5.24.5.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 32ac96524c8f..bb5713c0e601 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.24.4
+version=5.24.5
 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=ef70c00e36d4ddbaedeb0efeba68523289e6e112b12951460c8d36075de9546a
+checksum=964ca1b876005595c361add1eab5fa80c8d63da12c1201bdcd234914c6cc23f3

From 65f6d9335bb05b662d2e6d8c757c643ac43efd17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:18 +0200
Subject: [PATCH 2339/2561] sddm-kcm: update to 5.24.5.

---
 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 e0b11b4e4cdc..a25508f6fd38 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.24.4
+version=5.24.5
 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=bef347b9e066a756d71263b19552fbbf9b8a1d6d22861060bdfd1ead5ab9d85d
+checksum=cf9262036c4b3c149663335ab7b3770705924554e227e924dee3c4cfae83e597

From 38e0bff7fbc805f39b3bc534b796529cfe26d43d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:20 +0200
Subject: [PATCH 2340/2561] systemsettings: update to 5.24.5.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index b18700451dd6..8bdaf8cd638e 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.24.4
+version=5.24.5
 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-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=69921f98956b3559f8c37821b67d32ac8d6aef254888c15df8f86f99903e1533
+checksum=5b72b53f0bd8760b35844732a60f99713d45d0f80cecaca80de965e84effe9e5

From 8c7d0b8445b69d1c944dd26f39186e92a23b4b3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:21 +0200
Subject: [PATCH 2341/2561] xdg-desktop-portal-kde: update to 5.24.5.

---
 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 9f3a47148a1b..1d2fce78de3c 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.24.4
+version=5.24.5
 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=11684916288bb4a452b75004e2d122a4a1264a562f7945af98d466e49c59dc1e
+checksum=b59ccf65d29aef2ce6af9757a5c87eddd87b633fba2e45470f92b18b2ce5c6fe

From ff6729bdd9601f0ecd97ad3bb31130b40f31b014 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:32 +0200
Subject: [PATCH 2342/2561] attica: update to 5.94.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 47179ef8bd69..e7539d0176ee 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=81c18009911beb07d1868de78dd7fc1c4b1e8312bd95d916f4d4a80a800592e1
+checksum=f6293699da5794812080ba2d41b4ea05e830532678af324d8e852f508f2def65
 
 do_check() {
 	cd build

From d4071097aec0f1e32c1af2d3bc552e6e572ebab0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:34 +0200
Subject: [PATCH 2343/2561] baloo5: update to 5.94.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index f687851bcda5..48b4235f16bd 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.93.0
+version=5.94.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=25d11569fddb8ad0dddbaa91cedd3d96f0ad58a2cc23de920950db6ba3aed5cd
+checksum=9dc4182e5803c32a47d6a82588f6a6b36837fb44a90fe4404750886150b9273a
 
 do_check() {
 	cd build

From 3503e39ae664a3ded50794d3ddeb7669958a7e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:36 +0200
Subject: [PATCH 2344/2561] bluez-qt5: update to 5.94.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 e6939e618cf3..2bda9496bd7a 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.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=ab5d84eaa37791b57c8379282a3c3afd7ef0b2ebbef83c3f12f6b3bfd9123624
+checksum=7e776feb095e727abea0fec4b3ae3c81d704a0527b8ff3257d799feee2cc0632
 
 do_check() {
 	cd build

From 50f684a269ef23d1cd7b03a8415568dbb70460a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:41 +0200
Subject: [PATCH 2345/2561] breeze-icons: update to 5.94.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 4aa9c5c952b8..0a07951510a4 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.93.0
+version=5.94.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=4367dfa6b48aa645a3680489be96e03a9a6fc20f57277b3ca5e37ce8df4d03e6
+checksum=3e0b3fd2374dba82ca304c066938345f25b0eb85dca7169267c84f62bfb3a3bb
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From b296f1cf5443d3559924279873a5ba375c43f67e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:43 +0200
Subject: [PATCH 2346/2561] extra-cmake-modules: update to 5.94.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 19615d19ee47..2d483c20bf80 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.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=093dea7b11647bc5f74e6971d47ef15b5c410cba2b4620acae00f008d5480b21
+checksum=23548a8ce2b998cfa675fc00112bf93914ee25194f0bfdf832d283c8d678d279
 python_version=3
 
 do_check() {

From 7fd63d8a07eebcff5fb2aa7d1b72973b0ab9156f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:47 +0200
Subject: [PATCH 2347/2561] frameworkintegration: update to 5.94.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 130a97e3755a..d67f04101e31 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=156e54c9ee679bda943a279c28c6a834ca02e991b3f53a1b92f8c3931388a2a6
+checksum=9a64abebf8d242765ae759611fc9819a03403047ed56b8dd71aba7a0bbb4faa6
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From d4f223417926497d872d2dd2be1cd68bc5c5a356 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:49 +0200
Subject: [PATCH 2348/2561] kactivities5-stats: update to 5.94.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 5fa940f06eee..e3f3396b6dbc 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.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=f1069872228e05aea349a0d3f7961da27d1aad3e4c28d0a408fceb98edef03a8
+checksum=83fe7d109d830f348f18432949902700ee8a6a934cbaf3f89ae7bbfb28ef2340
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From fd0fbac769d2c35623ab1bbde421a164df992ea3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:51 +0200
Subject: [PATCH 2349/2561] kactivities5: update to 5.94.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 467b2ed2fed8..90e69f8f83a4 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=eb6b204382d3bba1b32b5752a3e8382a5a7bbd8be4b95b774c68c501a2f16843
+checksum=52dd5eba3daeb2a9bbb3a1865b3219277b3ca6357c2870c3570dfac10f445adf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From f8a1eab2a4fcd906b01bc829e41fcc5b8220f1e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:53 +0200
Subject: [PATCH 2350/2561] kapidox: update to 5.94.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 5e8664d5b6e6..0128d4be7da0 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=python3-module
 hostmakedepends="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=4228326a35342de8f0a301ed8afa379ef2102d99588a79808e7e86f2a4f81d5b
+checksum=1ca7520539bfe3179ae8b50b9a7c381478080d520a68f9fbb7e73b5946e55577
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 81a1ad5dec078eb38f19527c3d6b0e30e6c384a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:56 +0200
Subject: [PATCH 2351/2561] karchive: update to 5.94.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index dcc4a9d14cb5..9564f05437bc 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=61e326a840860270b7f8b9e8966462085b4f309be5c3a84c3b265eb95694c7fb
+checksum=55cd87a5437a649c168efbce4af132b992aa67dd9a3a8ced7cff0144f155e1e4
 
 karchive-devel_package() {
 	short_desc+=" - development"

From 117572a6229dddd432e1d31c70573019d33182d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:13:58 +0200
Subject: [PATCH 2352/2561] kauth: update to 5.94.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 8877514c6a7c..ccfb3ce26ecf 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=34580078bfdf631835f3ac52955f2149209908b935a7cfec6fe5b4956c3ada6c
+checksum=9cfed0ad69a8fa5df88273a5ef340d7b6dff1cd3e9d53bda16f3cf4afdd64159
 
 do_check() {
 	cd build

From d9760cb7d11160143f42bafb0fcd92322788a1eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:00 +0200
Subject: [PATCH 2353/2561] kbookmarks: update to 5.94.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index cf60805f2206..917bc5bdc970 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3eeff795ff99be90b0d59c6e5fbef02022e9fb48c9b4dab098a3c27e10fd863f
+checksum=8ccb99ab6f6e9babd503abd043ab183b849cfd9248d3b7d4e2805c75735f517c
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 7e1be21e852e59df240c3476f3905446d25d242b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:02 +0200
Subject: [PATCH 2354/2561] kcalendarcore: update to 5.94.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 4e7766af00c4..6c53e506cbb7 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.93.0
+version=5.94.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=1609bc141739fce0abed59a353a0e356f4fa7a1b3659d3bc77737010875c1d3f
+checksum=3bab1ae2e8214fb889b742d4a4f2c6acfd0bf40a4c4933cc91c66d21d77c042b
 replaces="kcalcore>=0"
 
 do_check() {

From b083445c79744b025c66dd8956ff43de7bc5c12d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:04 +0200
Subject: [PATCH 2355/2561] kcmutils: update to 5.94.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 19bea8671950..8d03cac1f90f 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1445f978b7ffd69fd7c25d965812755679c4fdba23eb9837da37a8b5b2d30d6d
+checksum=798cef6990cdcb22e4822ea12c3c0b9aa35797806e93fb474a2f58632cd53309
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From f6b85252b0814a3c96dac42356ff08559f9be9c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:06 +0200
Subject: [PATCH 2356/2561] kcodecs: update to 5.94.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 0a5c8577d249..48b83e786263 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0efc5c8baab3142f8a0ab9369b255061772a57a80fb616b7305bf98235b2288b
+checksum=bcc0e9fb1c1d259f05a326de160639a46c4bb6e0cce6fbc8244c39f251b8e7f9
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From fa39fca8753e6800be00e43553199a29552625bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:08 +0200
Subject: [PATCH 2357/2561] kcompletion: update to 5.94.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index fb4b7970b807..a38fc1a11a5c 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,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=7f8c9355e8875b619ca852741e972f41c252aa2e95b439161acc7b32d9e8fb9c
+checksum=1ad13d41650bbe352b0c2ecfd8c059015f9441cbf7534a2bcc9ed17a3bfa6ea4
 
 kcompletion-devel_package() {
 	short_desc+=" - development"

From d92d67b80950a3694785956703672c92e1d7595f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:10 +0200
Subject: [PATCH 2358/2561] kconfig: update to 5.94.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 402cf928ecbb..9b68611ec39a 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=71857c20d4829017c22dd6d46ae5a642c86344960e21bc1520458fb76d02c06e
+checksum=8e6d9104f070d94f083be000ea116acae3499b0dd110fa4c9c55f51ea91cb3d7
 
 do_check() {
 	cd build

From 79bde3b775f333cd1c6d549dcfd468ac098459bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:12 +0200
Subject: [PATCH 2359/2561] kconfigwidgets: update to 5.94.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index a8fec7e42dbb..830b2fdae6b2 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=db18e0f2217ead6dd6f5877551902d5da86aa026686e3c564f5f96be279f24bb
+checksum=35055f637ff44b0f0e67f9b5c79307d37f5c259289bf71b2a24c0203f82fb508
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 99760cfe9b0110c7087a5708d646a6f2b46e7962 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:14 +0200
Subject: [PATCH 2360/2561] kcontacts: update to 5.94.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index bf35f07ce999..a27b215a57e4 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.93.0
+version=5.94.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=5d7c8c6c6ccfa99188d9e4d7ab6165ec5b2bceea59a01edc6b309910fd604c75
+checksum=f7f317dfd9b270249cf168a699b39236490b5b21ec2ef1d186b59e29566252f8
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From bf81a23a62d381a84dd132fd4c5d8fd3f6dfad5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:16 +0200
Subject: [PATCH 2361/2561] kcoreaddons: update to 5.94.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 0db03a77e30b..8e0756322319 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=920a278af97dea3add06770a6f3604744c20d667973cb71cf477145785dbf043
+checksum=5c10b6ce070d6aa9b15abe7483b67f8802cec175e0eaeefc18a27c0e01ce110b
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 9d5bdc8d54c76f9cdca6ed931284a09c97256ff4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:18 +0200
Subject: [PATCH 2362/2561] kcrash: update to 5.94.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index c05bc4600336..c7c464516a7c 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2ff8d6c6924b2b752ef4a929390606bb55ce2aa55c582927269bd65556992dd6
+checksum=48c7792ca8c2ad6e9b6c8e9a260cdfcee5ed8d8769c4a8a199de7bf671f03cf5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From f1248b8b4a68c6035fa9b35ca4b1fa21e8966ec7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:19 +0200
Subject: [PATCH 2363/2561] kdav: update to 5.94.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 32b1865fbe2d..39533fd3bf13 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.93.0
+version=5.94.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=a7d3d40120f0a1b20f8492ea1635507a95e041582f5496a133de24720934ad68
+checksum=8b211ec6e1009f11ae5d0769e21947a473d6ca479ea8a16701a808aa57335b3e
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From e779d3711f22acf31f414cdb9ba5c77de62214e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:21 +0200
Subject: [PATCH 2364/2561] kdbusaddons: update to 5.94.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 5e03127aa8a2..247de9346fcc 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cc2c74501e65b97af1849ff454e51393f3a07755c155854bdee741a006822ad9
+checksum=0a1530117ccad6f1ea7b9db653bdf99adfe7f15f3f9394c3d885028f3ff4dae8
 
 do_check() {
 	cd build

From edc35b341011f1dc30d9356aa99c0127356614db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:23 +0200
Subject: [PATCH 2365/2561] kdeclarative: update to 5.94.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 96902ea275a9..5d853acf58f0 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=08a945c793aa8d89d87c42d29c9c11e7c28c47916ae728369ab478892d325067
+checksum=f2996ca7671994f42c9233897d10d6bc93ffc2b12865ae07e516a93812dd6b08
 
 do_check() {
 	cd build

From c787922bc86492cfdc0b8a46544b033d52431ee0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:25 +0200
Subject: [PATCH 2366/2561] kded: update to 5.94.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 30238cc5f878..f6cb6da3f191 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1992310921cccaf8fa2ca1abc8328aec5bc2e60a3d9f562f25b30885378159df
+checksum=2f4d61a3e8c64f81e5916558d48e381d0a3890c5ad388f27934944136c44f3c5
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 65ba4dc38c54c428d5afe1b5ea32d7cee333ad5e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:31 +0200
Subject: [PATCH 2367/2561] kdelibs4support: update to 5.94.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index ae42683b9b16..e3ec30c70a39 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=6a3e1d80cc6babc12930f24f9afd1ed10b46ae58ea71d44a466178212b07377c
+checksum=d726ebb00766d3d5ed39603601c4b9541659bebc4bb7b755eec25bffd8a76033
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From 1ea719dbb0ac749fc572cdde4d39400250f549c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:32 +0200
Subject: [PATCH 2368/2561] kdesignerplugin: update to 5.94.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index b81b6562cf66..6742406d5bc0 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=f19ab4fc1ed58b89642d8f9f75a5da2f2ef0093c97183f336ffeb7208e628aaf
+checksum=6bd051e47f3a9f301e26b876036b1a36ccf2a2c7e6747f3a96a157c0c3a78a03
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From e89c6f59a163779c2a814db806d57d65dbaba637 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:34 +0200
Subject: [PATCH 2369/2561] kdesu: update to 5.94.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 1271d28ade36..ecf34e383a62 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7f029d9a8959f0e2ca516ab3fb6b4ebd49ca0f0d19c72369451b6894d8138dbf
+checksum=90494323ebab4c8cdd93c068c2c4fe3a8457513cee21d7887fc4473028a9dce1
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 4a0dec2e540598bd3dbe5389dee44b6ce5ceaa8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:36 +0200
Subject: [PATCH 2370/2561] kdewebkit: update to 5.94.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index c667f015e07b..2fd81d121996 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=a2fe9b5660763d4dd74244c00bf7b1a407438279a81f2a3ef3813ea250fd2f55
+checksum=9bca73e8e67ccb89a044514ff6f6c02f6e65003cb34bc7e358a44182bc710d59
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From 015c1705cfeb04eefee2ee99082bc32bf3f9a31c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:38 +0200
Subject: [PATCH 2371/2561] kdnssd: update to 5.94.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index 42554c854079..4090acbb9e64 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dc97364f14b5867ea5bb2986f6ad3c84ab1acc952f50d460b3e9aed03f2f903b
+checksum=28eba2ff83d92bb80eac5bb771d5d5bf40c975d4b26a74d388092b034a964863
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From ddbdd09dbef147db01a47fa883d626f742c5effe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:40 +0200
Subject: [PATCH 2372/2561] kdoctools: update to 5.94.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index a43404728d1c..8abfa56316d1 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=25e83ff151c53667b94e25a5c41993796164683a43913820a5651f3610b65d5c
+checksum=f54e61ffe8c5e634e7d6e341020b63346d40b524d4a22565c86b9147033cd2f4
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From 6c27b63098bc0af89e3284c717c3fbd3a3ab41d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:44 +0200
Subject: [PATCH 2373/2561] kemoticons: update to 5.94.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 5b7281e3bca7..4525d35dceeb 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=83ca3df374935cf103a8fdaa85900d0acadbffc9d3aa8bfed073e804cd5ae410
+checksum=fa7db15d75a017e75514af4361ae3dd91a22ac9d9e2daf41a8e7e33bcce31302
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 97f288cbb6b61fb5d996e9799ced973b4edd6749 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:47 +0200
Subject: [PATCH 2374/2561] kfilemetadata5: update to 5.94.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index eb162fdff6d0..add84045349a 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3015c071a5f068f6e45d36238aa0243d3788a95ec84362ba79ed0369e676a816
+checksum=7f573b1a30349e331309dcf9e3374d7a304b6bdd0453a122366f7bd2574977e6
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From c2817804c7f914c06c7fc6ac9d35be42309a8fa2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:49 +0200
Subject: [PATCH 2375/2561] kglobalaccel: update to 5.94.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 7df12f5a2476..09ed09ffa793 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c806b8f2b029c7632d99c55cb711f9f4c1697555fde53ad4f67167efee97b712
+checksum=a34b00116a72d0973cdeb203a5d237da63cc307e9e294dfaedb00ff0a36835e9
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From dc236988081159982cada7c4601f9a8fdb085ec0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:51 +0200
Subject: [PATCH 2376/2561] kguiaddons: update to 5.94.0.

---
 srcpkgs/kguiaddons/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index 72f3ba0d1e74..db66b082a692 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,19 +1,19 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules
  wayland-devel qt5-wayland qt5-host-tools qt5-tools-devel"
 makedepends="qt5-tools-devel qt5-x11extras-devel xcb-util-devel
- qt5-wayland-devel wayland-devel"
+ plasma-wayland-protocols qt5-wayland-devel wayland-devel"
 short_desc="KDE frameworks - Addons to QtGui"
 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=27f26392140bd1abcb86c154fd6fd87e50b2493787827b2b1cacaf76544af40a
+checksum=f23182a7268d37cbc32eaa77bdc9dddc6429a8eff912f57841f6d96c71973873
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From d45a8aab1a87f7f8d4063fd63306e8fa2239df40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:52 +0200
Subject: [PATCH 2377/2561] kholidays: update to 5.94.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index eaa54144eb21..cc78337a49f7 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.93.0
+version=5.94.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=0d4a1fb823501ee73b2c4d80468777adedf93c80f36b3a680cad91cc6704b841
+checksum=e53735539c9d7658e3c18e0d8b0f81bc9ce27ff32a868bac32c19c12288a055d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 969b5116d8e1ba11cd01603ed91977585b19971b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:14:55 +0200
Subject: [PATCH 2378/2561] khtml: update to 5.94.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index de17fc72af8e..99705db8fbdb 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.93.0
+version=5.94.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=31bfb6752ed7248b98e2bdc723e8e10c11b5fc9f7bf7edd8dedad1162f86614b
+checksum=98bd2a284a2fbc1c2d93cd6719d18baeccd5258dfaa48b1fe74bb61e24fe9b79
 
 khtml-devel_package() {
 	short_desc+=" - development"

From 5a777647111a7ec78631951aec8ba73712ed25c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:00 +0200
Subject: [PATCH 2379/2561] ki18n: update to 5.94.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 956d6aa70406..5139b30bbdfb 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -13,7 +13,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=c2705400d175f18612dfe1afb28dc14accf614f7cfd65409dfa7fdcde5237339
+checksum=0c5a8332343570e8530469840d67c72a28a04a7257578e5a962c73824508944a
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 779a0906de640441ce49fb5773979bdc645186a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:02 +0200
Subject: [PATCH 2380/2561] kiconthemes: update to 5.94.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 532d5ec8121e..613b98a4f402 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=75f7c5b34f4f1a228b4cbd81a284dbfdc0c0810ddd3a39e69f9363ab3598e2b4
+checksum=d972d81dcd7ccb74ef4abd4db2a88512a07ea459a301b94e7a98b831ab814993
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 201025817e8511ee171c52c814273859c8d167ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:04 +0200
Subject: [PATCH 2381/2561] kidletime: update to 5.94.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 0556c9a0e3d0..02ad544802b1 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4d9315dfe1faaeb62eae5ba60f683483de56317826d9b8da2bd58feebcb7b7d9
+checksum=a61c3d545bcec8866cf6aeb8df00dc4f239f1725ace09b8ef1946839c4b4e3e8
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From d1ba35b6b0207f394ecf69ce465553ffd4d004e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:09 +0200
Subject: [PATCH 2382/2561] kimageformats: update to 5.94.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index bc8b9f09a2c6..d94eb968f1c7 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
@@ -12,4 +12,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=15b0ed9de57af95979e0e40496b980f243cd81e2a400d5f64d12478e1dddc7d0
+checksum=b189626c091dc9959d586a229c47ca36443b77d79706476ff89a50f9e8774e54

From c4eb786d6c6df3ccdfd759e251a6d83b67db2ccf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:11 +0200
Subject: [PATCH 2383/2561] kinit: update to 5.94.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index f94cc0038dd6..67433100a92e 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=db36a3bd5b30163b7a4ed8c7a907bec585acab841306755b0d8d32ef3d1ce498
+checksum=ee98f909cea837dc0e8cae363fda5891fac89de388aaf75388e3ae9f3e1ebc61
 
 kinit-devel_package() {
 	short_desc+=" - development"

From 9dcfa27da03013fb145a8759cc6e6b124be45b76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:14 +0200
Subject: [PATCH 2384/2561] kio: update to 5.94.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 3047212a7964..076fcc67cdbe 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -16,7 +16,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=d290a4bcfb5ec9eb9047c84a7c420df831131b92ab6c9d28a3aa0eef9f5d4c44
+checksum=85c0bf8e49d845730d95c85c0292330a5bf03ed63a008cbf02ec9d02f990d09b
 
 do_check() {
 	: # Pain to get working in limited enviroment, excpects e.g. real disks

From 6f19f1e65d2b0ac369c04335016b40336ae27c90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:16 +0200
Subject: [PATCH 2385/2561] kirigami2: update to 5.94.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index f504292b6363..ba0713080057 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.93.0
+version=5.94.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=a7c2a824eb776011ae9dc94698588e8c6988ac399669723631fab26edd47ab8f
+checksum=d7f27da3325feb339f4e1a3db78df44f05e4f505f36e15c7caeac04da0428e39
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From fd848d1664271488ffb2c9fa4257cfc3c1392827 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:19 +0200
Subject: [PATCH 2386/2561] kitemmodels: update to 5.94.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index bbf9bbf094c8..35f165bf1945 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5bb9918b92ac37f1bc52c5abe04e8dbea54f31fa0101edad6d9e92c3a9f0485b
+checksum=705ff2b97502b2ba436f9371b559e47f2a7634bf5b06d26c8243387d6a084f89
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 57a51a58f792ea5d2d044e25d9fd055cbd07479f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:21 +0200
Subject: [PATCH 2387/2561] kitemviews: update to 5.94.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index 4518704713d6..67d0d7e9ad9d 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,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=93f01dec3b795b28cc6f6859873ebb941a9504eaafd13ff9f72b987d71e55abf
+checksum=5b75334b719ce07f4aa33236ef4bd11829504ff381670818ef57a7526938b52e
 
 kitemviews-devel_package() {
 	short_desc+=" - development"

From e1f10d209f2018dd4fd2568bdb56e150a07172c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:22 +0200
Subject: [PATCH 2388/2561] kjobwidgets: update to 5.94.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index c79eb99642d6..b9db92ebb87a 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -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=62449b747d6fa5b32a1cb317b2b614172e42be3b85f39b02d6a07adc267c39fb
+checksum=014f45fca82886af463956c533f5ba868700ac7ec61733f35a7fabad0042b007
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From f5f95a90b7b190ee59a592a7c87d6140ffa1017d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:24 +0200
Subject: [PATCH 2389/2561] kjs: update to 5.94.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index 263bf627d7ab..46e552bf8993 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=85aa01de9c2775564c895d3efbcfb8cc68da9a84f511176fef16742cbbf90942
+checksum=f93e14a2deb978ccb8e7b0e7e6a2e4c3a23fe9ffe5a64d569c824302d93b3c1b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 8690ed4b33f9ed224c6c9c3f7a9bed46cb56e123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:26 +0200
Subject: [PATCH 2390/2561] kjsembed: update to 5.94.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index d93a1a3b818c..074c3ba9f1aa 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=fa55d3bf0b3f9026eb573cc909b1fbe53bea7090f3da465e9bb293dc0f81d424
+checksum=f3ce37479d0f579feeeebc837074b3d138a37989884149b92f12b107fedef62e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 376fe230cb0dbeccbd92743f81c1049897e7cd63 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:28 +0200
Subject: [PATCH 2391/2561] kmediaplayer: update to 5.94.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 5ebec5415b18..b803dbd9b428 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=ada8afb5b0fea3af2112812792eff062d3830dfde4d8784b7e1fc3711e74830a
+checksum=0bf1f6df0ce21d397ca168307b3b3e57d10c0fb90369cee03bbfbf9fa7d8208c
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From a39f6756cab27895b0d811d00f5463bb1ebfc377 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:32 +0200
Subject: [PATCH 2392/2561] knewstuff: update to 5.94.0.

---
 srcpkgs/knewstuff/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index dc604a8611cc..bc45f43afe24 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,18 +1,19 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
  kpackage qt5-host-tools qt5-qmake python3"
-makedepends="kio-devel kpackage-devel attica-devel"
+makedepends="kio-devel kpackage-devel attica-devel
+ syndication-devel kirigami2-devel"
 depends="kdeclarative qt5-quickcontrols"
 short_desc="KDE Framework for downloading and sharing additional application data"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2adc48e26c04c05f61f6ff1007f77ea43036b76d769535617e88d3f35ebb5759
+checksum=aacd014f99ab66d40ae98333cb56257244ca552bc4df0ce04de4e29bae90336f
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 30abaa5b4575ee970eba95a62dff602792f09f32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:33 +0200
Subject: [PATCH 2393/2561] knotifications: update to 5.94.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 782d259b261b..d7f8260d8a23 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe191b1fe55881d7e212a3b70fe08d53e47c32793d38f5d5a4d82b796796da4b
+checksum=c8d51ce32b65f096c75da3e7bdb033202086cabaa8faad3bcdd46730b74b43bf
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 02ff48a0fd8f26fe61198f4cab68e134b1fa91fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:35 +0200
Subject: [PATCH 2394/2561] knotifyconfig: update to 5.94.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 1ac13b7254db..e69a58ab9070 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cc9de166631555451965cd007b82f0ab529d6b909bc259e26e59feee586619cd
+checksum=ab85989a7482ab8e2feddd1d3c6a1f2f81a16af67894bd9dea725421c3ba8910
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 8ded6b1103440ea5ca8bbbbeba3def91dfa603e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:37 +0200
Subject: [PATCH 2395/2561] kpackage: update to 5.94.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 0c03af3cb837..c1214c00262d 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.93.0
+version=5.94.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/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8de6ecd6ed1cf746b9919d93283aa650922211b51bb2d22027102f67c42ec5cd
+checksum=4d4c9c2920c9b10f6879f2d8a29426615e9e6b13d78c0b751ea4a656b4baf414
 
 post_install() {
 	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \

From 962249920b91db3c96bacca4f35bce6441475cb0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:40 +0200
Subject: [PATCH 2396/2561] kparts: update to 5.94.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 9ed54c4d5bd5..ef2dd1d22be6 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.93.0
+version=5.94.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=c888e9664cc71a2f52904fa42d6bcedaa76c50c720ef0bee8d8b0c98bbcd1675
+checksum=05a5120f1a97dce84f5ea85d80eb4eb50793f800ce2af055d1d73ce61ed06bba
 
 do_check() {
 	: # test can not find packages assets?!

From a90a780556868f07c3f492874f876087bf226aff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:42 +0200
Subject: [PATCH 2397/2561] kpeople: update to 5.94.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index b6d0c7054015..d83af4e4af13 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d3e1266982fa2abdd7b216d018569ea83c71312e2cfa35a0bee845e8bb49f371
+checksum=217eba378c223e3518914512fc303a106101d26fa1a8fc57495abbd0d36a5274
 
 do_check() {
 	cd build

From 1f76de858e9e9a4fa2f939f4485384e24300106a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:44 +0200
Subject: [PATCH 2398/2561] kplotting: update to 5.94.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index a39daf53e9c9..6a66c890cbc0 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=586d1b694213f55259ffb6a96a10648baff6e3ce45c58d7c44734d6096b6a26d
+checksum=783d6d618601d58077c4ac7920a579af7b877b26a64a6f453570da36b57606aa
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 76a2c2218093e7a894cb7adf8d6d8e00825bdb77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:45 +0200
Subject: [PATCH 2399/2561] kpty: update to 5.94.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index c5e5c306e492..12a7ad77d5f7 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter"
@@ -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=2a05154dbf9eb082f32f33b494dc36c3b24a59c14521167f3306a04c3649ec12
+checksum=569a60318b54cca6a5c5fb1e182556010d2f4c052961b125ad852ffa015746ca
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 1667f14b16e208eadfc8a0701194f378a3bd103a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:47 +0200
Subject: [PATCH 2400/2561] kquickcharts: update to 5.94.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 4fe68d7329a9..1f407b752e41 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=24346ac484d1d785bff27e0de5d29a7f7d3d73568074f8bdaeb869ff1004a848
+checksum=3065fabdb4938b68194060794abc90feac19e73dcb7648591c58e2c9cfea9528
 
 do_check() {
 	cd build

From d61ad383ad1638cc79d2fdce9ee5c25a297bdf55 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:49 +0200
Subject: [PATCH 2401/2561] kross: update to 5.94.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 31a60cd2c56f..a307f5bdedad 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=2ba6fd2438731b1704537889120c0dcdf1eb36bffd1e921736e85834a5551ac3
+checksum=1d6925bd2530ded6ea97f832fda42de0e24d1d7302e52262171fd0461f642d49
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 1dff25a958dcbbe23127aefe76e42dba255d3681 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:51 +0200
Subject: [PATCH 2402/2561] krunner: update to 5.94.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 6eb7f598ef04..413b433ec694 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2dc6b9169d415d87f5e2d82e2263183f42589cc1e962c9d6d0c60b6dfa48c991
+checksum=32b0bcda190884f9de2f8a598c854ed2d29cab199dda5d341364913321b7cbd1
 
 do_check() {
 	cd build

From 115db2978fd246d9619c2e517ca9653ecda46bc4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:53 +0200
Subject: [PATCH 2403/2561] kservice: update to 5.94.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index de717b3257a9..27ba8af07487 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=46cf92f837fb890e311c5affaaa8b01d1d66b47dd272a30ae148472ef3e67431
+checksum=1aad105fc0a4060b1cbe6e29f96f93a01af254159c9263c080d94e4eeae43b32
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 7b9f06dab0c537779aeb02c01c018c1e790fc3b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:55 +0200
Subject: [PATCH 2404/2561] ksolid: update to 5.94.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index d38f0b79b185..0f787d3516bb 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=22eff3f94608793fecb532e097d9022a14c828a0ffad0f73666088153f0d6bea
+checksum=9d8ed401e36b6a4b9e51438c8e2d359129b9d6149deb8240cb894b1128fa1107
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From 95099864dfde75469c2a4c2c8ee48b6befff4a8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:15:57 +0200
Subject: [PATCH 2405/2561] ktexteditor: update to 5.94.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 6e0d131bcd2c..5fab6876dc1f 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,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=7af437b882cd2da9cf9780cb660f9242b9c2400a5ff55cf6ca8608b6e62bd6c3
+checksum=d82d9997167d718ab821dce40e8752205a5ab60f2e69a1bffaf2265455e1b3b6
 
 do_check() {
 	cd build

From 8dfa173faadc8619e67eba532f5b24e9680ff630 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:00 +0200
Subject: [PATCH 2406/2561] ktextwidgets: update to 5.94.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index d685d6d0a91a..a4a83792c67c 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e27f588929db35f485ebbd6ddec45ec0c56f86844935013f8a39df8bdfb7c215
+checksum=44fceedacb526f4c3c66c1d55257bb39881c7dcca55dae0deccefd84399ed866
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From de97f4bb9658b7ef5477d1e609027d664e47c78b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:02 +0200
Subject: [PATCH 2407/2561] kunitconversion: update to 5.94.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 0629a5319eb0..c126fc6841d0 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.93.0
+version=5.94.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=9baefb6aed92d2b32727f9492f1322a9e0b17b609c2d82296f4ee10b55a02fc8
+checksum=e4adf0f124db45134042e706b466c30e531398996f872294119887af9ca38049
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 4f76fc280865311df5e0e2ee63693c08363c5ae6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:04 +0200
Subject: [PATCH 2408/2561] kwallet: update to 5.94.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 9df7aac1b7ec..a66634cb13fa 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.93.0
+version=5.94.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=ed56f6477efb250b454f7b7861a16a5ea972487c1373647b7094047ce20fddeb
+checksum=01366b42754ee7543b67fe57deb39bc2a772923eda3e6ea70a59f8ef955e2a32
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 4ba0312d259330af664df8439e4569192f6ad0d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:06 +0200
Subject: [PATCH 2409/2561] kwayland: update to 5.94.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index f67e288b91a6..be5d66338cee 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.93.0
+version=5.94.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=1648a273ad1c0c1895a0edff9a3e97eb151e1e3533362e0f01d72706ac0a7abe
+checksum=b2a4d8e1b4d81ce798c991cfb34210ba095f6406a37f4714ae3ab64abaca2636
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 605e5342180e78db5eb4a680fbfc9044c05554e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:11 +0200
Subject: [PATCH 2410/2561] kwidgetsaddons: update to 5.94.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 1b80c8140b81..c6863ab7bb7a 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9c35e17d8c6faae58bfd48180bf968b813e6bfe2d49041b3285f8e326842a410
+checksum=678eed15c65d6298a5f720bc6dec1a6eed4e742431f7210a1d6bad261a003d32
 
 do_check() {
 	cd build

From 6c4a25de07c4cf31a6eb031512cc529309bba697 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:13 +0200
Subject: [PATCH 2411/2561] kwindowsystem: update to 5.94.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index f33ceba374d1..980bcbdf52b2 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=97cb223a4d1a7487a3ed496e10ff5e8c320ea7458eb34cbe4ed114bc19ebe4a1
+checksum=52ebb7d4e9ac3f24fadfd5265ff8cc390efbccf6fa6d084e5a573c3b2aa43c78
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 8c9f0f4f18c4407333c5c44f9f03848cac6cfbbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:15 +0200
Subject: [PATCH 2412/2561] kxmlgui: update to 5.94.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 92a6b2d152d9..8080e90da11e 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=74ba65d95fac0cd09cb66e14d199efc739e1a8c9aec25812f41cfc64d7f4b099
+checksum=43a31730ff0ed113320817aa35a04e53b6ec647ab94320cf3b075adc38619dd6
 
 do_check() {
 	cd build

From ccf783d0575366c1488db6d6cf7dd1db6a8e3946 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:17 +0200
Subject: [PATCH 2413/2561] kxmlrpcclient: update to 5.94.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 20010cf52f3a..c5e11b6709ad 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0cb41aff9f5660d95ee6d669f9c70692b55c089d0e1b9705e19b19fc2c49376c
+checksum=65ac95cb022d5c7ca54c1e601211969aba06858773d881feb0004628a3451f82
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 2656c13de31ceff720509a1fff297b6d4c411ae1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:19 +0200
Subject: [PATCH 2414/2561] modemmanager-qt5: update to 5.94.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 b669557f11b8..78f3c7a86a5f 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.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=3aedde6936524b9d0dea07ead34f44fcff50da2ccc0da73d6208893e270a67a8
+checksum=7928dc36bad38a9721305d59bb6d318e35118843001c21aa8802ce11ce11bff2
 
 do_check() {
 	cd build

From acdb6db1c049648eb80c8a5041e7894f54e96065 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:16:21 +0200
Subject: [PATCH 2415/2561] networkmanager-qt5: update to 5.94.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 de46374e6511..b80cd9d64821 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.93.0
+version=5.94.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=b8588ce2d811094682f51ea6150f3c58baa398fc91339bcb511bf60bc0eba960
+checksum=12208cc319ff0e77bbc1c37437e0fde57f62aa2a4d0f9e26110e8eb27b986502
 
 do_check() {
 	cd build

From 755515c9cfa8162beb3620e1fb642a170ac974b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:22 +0200
Subject: [PATCH 2416/2561] oxygen-icons5: update to 5.94.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 62aa2f6abdb6..8876060c0c95 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.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=734e3f44dc3be665350ac5de7f333ab954d3e3b777765b691603b3647c353005
+checksum=203d9dbc3fb783c8c31c3d3d59624e31b502a50beea31505dcc56d8c33fcd1d0
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 99cd0bc9a21ff5a6c00d8236456ebe422bed3e31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:23 +0200
Subject: [PATCH 2417/2561] plasma-framework: update to 5.94.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 2ccf8a0c2973..670f0892379a 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.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d4a2c687ea2ea8dfe7c256eb58441fc458102ed4b445dc24685513dd96b5c322
+checksum=6cebfb9e7b61062194119bf7c4ef0e9529cd7321c8e06fb68b68fa518815ed2a
 
 do_check() {
 	cd build

From 8870bebeb00819faedca522776007957e93a5626 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:25 +0200
Subject: [PATCH 2418/2561] prison: update to 5.94.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index fdd1d0b1a115..4abb24f2d9da 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=1f43de6622cf263c6b71f9a801174e2791c09b5a0d52c602715659ddfb82fb56
+checksum=99607978559f63dba65d796c5edaf6c54e8aee5d31882d856347ea5ada06d1cb
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 0d52f5ade7ac0b8d6621d75e65def5dfb1d988eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:26 +0200
Subject: [PATCH 2419/2561] purpose: update to 5.94.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index 4c9f91568f25..e826b58f213f 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dc0bc0c7c5d9b27e21856132ceeb3893555a36f3944ebc97da2eb76a74e92cc4
+checksum=73adff977f2a69624abaf6340d6609dde41f404600feb28e51e1c7db4541b3ab
 
 do_check() {
 	cd build

From 9338ee019e43f837b77105634a1c96717e4810bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:28 +0200
Subject: [PATCH 2420/2561] qqc2-desktop-style: update to 5.94.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 ee40061fe5d0..1f89a4a2948f 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.93.0
+version=5.94.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=161ec085a529e23532badb7723c78051e7b4c3a3fe11d3c4ab8bab93213ba9a8
+checksum=0b15210dbe93c22e423c876b27ca2f530f66cb72c6c5bcc7f854848ded0e7e48
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 515142617f6f9adfc82ffe06e7d5ade6be6650b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:29 +0200
Subject: [PATCH 2421/2561] sonnet: update to 5.94.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index ae917562a6e1..886f71fb6e1c 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.93.0
+version=5.94.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/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3c146ba45edee43bf2e8bc48b116a38e0c28d2294fe61b44dc8254b881210d9c
+checksum=8c570a64748d6bb6b91dff6fbf5e0cc5da7634c9a6f867944e99442066b7474c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sonnet"

From 6f4aab3cec6ea12587bceba37c8f7d9d9d32edf1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:31 +0200
Subject: [PATCH 2422/2561] syndication: update to 5.94.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index bbb411538569..d0715f91d152 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.93.0
+version=5.94.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=35f14e36076760170df44785df39f522407f58cfa36faf91564696587d8eda23
+checksum=458e12e4d4898d5e660ea6a3fe0d6158c208f5d4176451e1132423df2044685b
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 8d76b4f9c64306b3da829cc860774459e52b7141 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:33 +0200
Subject: [PATCH 2423/2561] syntax-highlighting: update to 5.94.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 0f92ee3b944a..72f6043303da 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.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ebdb51f8922d2bc97457c7df376e6600d5ee9805fdc1ac7f7d6be35a3fec711b
+checksum=cf871332a50355836919fdd833a82c32b3d5fe7fea8fa3e58714c39c8ddde5a6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 853b044348dc4e6e2cb9c3b0319531ea6decabaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:34 +0200
Subject: [PATCH 2424/2561] threadweaver: update to 5.94.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 89e6a9a71b90..d1798ff3ef40 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.93.0
+version=5.94.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6c0db7d276052ebc4d512b43792ae2127cb5fafb1cfee890b5f20bd05c06f185
+checksum=87d8431a62c53b7e433b49dfad4fd6cacb58356a50cfa17ac480c6bb00a8e1c5
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From ea289798f01acb8778686b1c5e3de4d98a126217 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:43 +0200
Subject: [PATCH 2425/2561] dolphin-plugins: update to 22.04.1.

---
 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 cc08eb66a548..b1dfd4dc672e 100644
--- a/srcpkgs/dolphin-plugins/template
+++ b/srcpkgs/dolphin-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin-plugins'
 pkgname=dolphin-plugins
-version=21.12.3
+version=22.04.1
 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=65b5aa7fcc6b1d07499596a220ab54f0eeff2e60b2079f4180e13094b8337f65
+checksum=81220b19a5224fe720a2c5755900519b29b625a89051fd9ce269d611b122b0ff

From 790f06dc79b9040e536e21abb2fd2fd27f0eaa98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:44 +0200
Subject: [PATCH 2426/2561] khelpcenter: update to 22.04.1.

---
 srcpkgs/khelpcenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khelpcenter/template b/srcpkgs/khelpcenter/template
index 905786760162..b6af1198f55a 100644
--- a/srcpkgs/khelpcenter/template
+++ b/srcpkgs/khelpcenter/template
@@ -1,6 +1,6 @@
 # Template file for 'khelpcenter'
 pkgname=khelpcenter
-version=21.12.3
+version=22.04.1
 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=193b2caf6a24bbb5f9f0d4e992cb58844258dd7691ac967a4e0068bc4e6141ba
+checksum=c87d35c5942d7f13b9889b777ade17c5f8e745b0c52a3173f5e645666b665272
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kconfig kdoctools python3 qt5-host-tools qt5-qmake"

From f8252020f692d6b182872379467dfac7019a1444 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:47 +0200
Subject: [PATCH 2427/2561] kate5: update to 22.04.1.

---
 srcpkgs/kate5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kate5/template b/srcpkgs/kate5/template
index 7f8402eddc19..dd4240f84fb4 100644
--- a/srcpkgs/kate5/template
+++ b/srcpkgs/kate5/template
@@ -1,6 +1,6 @@
 # Template file for 'kate5'
 pkgname=kate5
-version=21.12.3
+version=22.04.1
 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=afa5141fb2746fc18ea2d97bd80ec37c096589822fe0b0e7ec00c63d0198e0de
+checksum=f46ec33d7edf8032efcd489cc431ebf3f93e703e0e7d88a51e93941fd8509849
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From 331bc6c92c08fccfdec42b979c6126520ccbf675 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:48 +0200
Subject: [PATCH 2428/2561] konsole: update to 22.04.1.

---
 ...0c2b791275f3727f2240ca7fab9f58db943d.patch | 86 +++++++++++++++++++
 srcpkgs/konsole/template                      |  4 +-
 2 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch

diff --git a/srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch b/srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch
new file mode 100644
index 000000000000..f04148e72f89
--- /dev/null
+++ b/srcpkgs/konsole/patches/f6310c2b791275f3727f2240ca7fab9f58db943d.patch
@@ -0,0 +1,86 @@
+From f6310c2b791275f3727f2240ca7fab9f58db943d Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@kde.org>
+Date: Tue, 22 Mar 2022 22:08:10 +0100
+Subject: [PATCH] Detect the presence of malloc_trim to fix the build with musl
+
+malloc_trim is indeed a GNU extension, but an extension of glibc.
+Relying on __GNUC__ unfortunately doesn't help with that. Check for
+the actual presence of malloc_trim with cmake's check_function_exists
+instead.
+This fixes the build with musl libc, which doesn't come with
+malloc_trim.
+
+Co-authored-by: Ahmad Samir <a.samirh78@gmail.com>
+---
+ CMakeLists.txt             |  2 +-
+ src/Screen.cpp             | 17 +++++++----------
+ src/config-konsole.h.cmake |  4 ++--
+ 3 files changed, 10 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e6775aeef..9e990c37d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -94,7 +94,7 @@ set(HAVE_X11 ${X11_FOUND})
+ # Check for function GETPWUID
+ check_symbol_exists(getpwuid "pwd.h" HAVE_GETPWUID)
+ 
+-check_include_files(malloc.h      HAVE_MALLOC_H)
++check_function_exists(malloc_trim HAVE_MALLOC_TRIM)
+ 
+ # See above includes for defaults
+ add_definitions(
+diff --git a/src/Screen.cpp b/src/Screen.cpp
+index ad578b4fd..10876f988 100644
+--- a/src/Screen.cpp
++++ b/src/Screen.cpp
+@@ -28,13 +28,11 @@
+ #include "history/HistoryType.h"
+ #include "profile/Profile.h"
+ 
+-#ifdef HAVE_MALLOC_H
+-    // For malloc_trim, which is a GNU extension
+-    #ifdef __GNUC__
+-    extern "C" {
+-            #include <malloc.h>
+-    }
+-    #endif
++#ifdef HAVE_MALLOC_TRIM
++// For malloc_trim, which is a GNU extension
++extern "C" {
++#include <malloc.h>
++}
+ #endif
+ 
+ using namespace Konsole;
+@@ -1797,14 +1797,13 @@
+         t.scroll(_history);
+     }
+ 
+-#ifdef HAVE_MALLOC_H
++#ifdef HAVE_MALLOC_TRIM
++
+ #ifdef Q_OS_LINUX
+-#ifdef __GNUC__
+     // We might have been using gigabytes of memory, so make sure it is actually released
+     malloc_trim(0);
+ #endif
+ #endif
+-#endif
+ }
+ 
+ bool Screen::hasScroll() const
+diff --git a/src/config-konsole.h.cmake b/src/config-konsole.h.cmake
+index b74992b0a..4b1d9b515 100644
+--- a/src/config-konsole.h.cmake
++++ b/src/config-konsole.h.cmake
+@@ -15,5 +15,5 @@
+ 
+ #cmakedefine HAVE_GETPWUID ${HAVE_GETPWUID}
+ 
+-/* Define to 1 if you have the <malloc.h> header file. */
+-#cmakedefine HAVE_MALLOC_H 1
++/* Defined if system has the malloc_trim function, which is a GNU extension */
++#cmakedefine HAVE_MALLOC_TRIM
+-- 
+GitLab
diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template
index 61c59d3fc3c7..6483bcd8fe31 100644
--- a/srcpkgs/konsole/template
+++ b/srcpkgs/konsole/template
@@ -1,6 +1,6 @@
 # Template file for 'konsole'
 pkgname=konsole
-version=21.12.3
+version=22.04.1
 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=1a9727a1ab878bce3419a3fa9cedf41cf0ed778dc7d9ce5a66314755bba8581b
+checksum=8d049888a9be2464ec5c0c961fbab155fea679a714558f9ad6e13720c56822e3
 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 b9095136536466858f88f164b6f08757294ee23b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:50 +0200
Subject: [PATCH 2429/2561] baloo-widgets5: update to 22.04.1.

---
 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 c91a22fe9d31..8a9b4c13bbc7 100644
--- a/srcpkgs/baloo-widgets5/template
+++ b/srcpkgs/baloo-widgets5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo-widgets5'
 pkgname=baloo-widgets5
-version=21.12.3
+version=22.04.1
 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=1b66aa05d60e6523a9458977f50fa5bed4a9e908c0813cd428b1abf57475cc31
+checksum=680722c0124f9f149227221778fa4f3e30788e5bb6b202ac8cbcfd412d6e73ae
 
 baloo-widgets5-devel_package() {
 	short_desc+=" - development"

From d94a5f3dec79121f50875c3ec9e2408f7f38d26c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:51 +0200
Subject: [PATCH 2430/2561] kio-extras: update to 22.04.1.

---
 srcpkgs/kio-extras/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template
index ea210a9a562a..1ead831c057e 100644
--- a/srcpkgs/kio-extras/template
+++ b/srcpkgs/kio-extras/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-extras'
 pkgname=kio-extras
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp"
@@ -15,4 +15,4 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/network/kio-extras"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-extras-${version}.tar.xz"
-checksum=b1400209157f5ff21e0981a54c8bdb442a51764ccd88fecdd7e49f989bb4f787
+checksum=a4475107e06d740e0d3fb9e80fa3c58d389508d48d6434e4ab21d6cac25ff814

From 1e434c470658e199a9d01fdc4786abd9b2fb06d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:56 +0200
Subject: [PATCH 2431/2561] akonadi-calendar: update to 22.04.1.

---
 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 a600d71f87e5..2ea65468ed42 100644
--- a/srcpkgs/akonadi-calendar/template
+++ b/srcpkgs/akonadi-calendar/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-calendar'
 pkgname=akonadi-calendar
-version=21.12.3
+version=22.04.1
 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=78617cb53b3e9a4abdae34db63e57fb884ad412428fb722f9806a87e9337fe43
+checksum=359c86f9fe84ea0b66629f143244dda0c14b534e34feacf88971f5170ba111cb
 
 akonadi-calendar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From bd2315fc8be990780d7bc134b1cb9f728b0fa8c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:58 +0200
Subject: [PATCH 2432/2561] akonadi-contacts: update to 22.04.1.

---
 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 90a30d0eb2c2..0e4786133fa3 100644
--- a/srcpkgs/akonadi-contacts/template
+++ b/srcpkgs/akonadi-contacts/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-contacts'
 pkgname=akonadi-contacts
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kcmutils"
@@ -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=b5a50748877cac1209bbbfbb19cbd20441c0563924aceceaba081fa113903d12
+checksum=cdf2c60ab9d0d197eeddafc558506e3d1862c0e5648baf34eb6e43f87449390e
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kconfig"

From a3d6abfe60db5d9e760c249fad279ddf1971d97b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:18:59 +0200
Subject: [PATCH 2433/2561] akonadi-import-wizard: update to 22.04.1.

---
 srcpkgs/akonadi-import-wizard/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/akonadi-import-wizard/template b/srcpkgs/akonadi-import-wizard/template
index b664301805f3..5ab0a8f7095b 100644
--- a/srcpkgs/akonadi-import-wizard/template
+++ b/srcpkgs/akonadi-import-wizard/template
@@ -1,17 +1,18 @@
 # Template file for 'akonadi-import-wizard'
 pkgname=akonadi-import-wizard
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools qt5-host-tools qt5-qmake
  gettext"
-makedepends="kcontacts-devel mailcommon-devel mailimporter-devel messagelib-devel"
+makedepends="kcontacts-devel mailcommon-devel mailimporter-devel messagelib-devel
+ kcalutils-devel"
 short_desc="Import data from other mail clients to KMail"
 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=92f1f46a7e1eccc83ae738c9c3a0c3dddecb2c6385f4f62b4a17b3f647e97db9
+checksum=7244e9c7a1f61a3ebdfc4b5331ce42ecf678cb483c8f0a06d6dbbd52d0fff761
 
 akonadi-import-wizard-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6ff4ec1fac0e3bf1a29e9a37fcdf9948aeb50574 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:00 +0200
Subject: [PATCH 2434/2561] akonadi-mime: update to 22.04.1.

---
 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 c4b4df73fa1d..a749a2a614fa 100644
--- a/srcpkgs/akonadi-mime/template
+++ b/srcpkgs/akonadi-mime/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-mime'
 pkgname=akonadi-mime
-version=21.12.3
+version=22.04.1
 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=bbcf7ef38a113765176b5325c7c458562084bfd1a56e6680b8e584f48b5b99ad
+checksum=6f5808f19431c42654da7e8e729a8b0dad0e9ed1d0057efc035fd78c88347d0e
 
 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools kconfig"

From dc9edd43233fa5b0466eb594a5f199d0631976ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:02 +0200
Subject: [PATCH 2435/2561] akonadi-notes: update to 22.04.1.

---
 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 2468cd512209..8d7f87ab2748 100644
--- a/srcpkgs/akonadi-notes/template
+++ b/srcpkgs/akonadi-notes/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-notes'
 pkgname=akonadi-notes
-version=21.12.3
+version=22.04.1
 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=4ba78418ef7c866bb00db799069efcd445f3232751bc18197ddff5f763e26c76
+checksum=5363c67945a98bbe8d0c10c42870eb42ee6730efc6cfa59c98316944df3e3a85
 
 akonadi-notes-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 4b2583640a9874ac4edd07c1db016ba61d7c046f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:03 +0200
Subject: [PATCH 2436/2561] akonadi-search: update to 22.04.1.

---
 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 c8e9882dd472..bc270672f179 100644
--- a/srcpkgs/akonadi-search/template
+++ b/srcpkgs/akonadi-search/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi-search'
 pkgname=akonadi-search
-version=21.12.3
+version=22.04.1
 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=d76c0edccf2e25b9e86469d21a32015315e77cb05f489fc3bffb27d6e5ffa6c5
+checksum=731ecb9ead8fd2e4cffeb72199bf1b6165c71d69e3dddbb38a75521d4bab3e2b
 
 akonadi-search-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From a4139d6ca8b03ac7df5672ea61a39b3f525077bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:04 +0200
Subject: [PATCH 2437/2561] akonadi5: update to 22.04.1.

---
 srcpkgs/akonadi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akonadi5/template b/srcpkgs/akonadi5/template
index 6fd3230cdaa3..26a997672ed4 100644
--- a/srcpkgs/akonadi5/template
+++ b/srcpkgs/akonadi5/template
@@ -1,6 +1,6 @@
 # Template file for 'akonadi5'
 pkgname=akonadi5
-version=21.12.3
+version=22.04.1
 revision=1
 wrksrc="akonadi-${version}"
 build_style=cmake
@@ -19,7 +19,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM/Akonadi"
 distfiles="${KDE_SITE}/release-service/${version}/src/akonadi-${version}.tar.xz"
-checksum=4fe8ded706faf6ce87a48b7f164cbdd4eb71a342501eb9a0db40a87666cfda08
+checksum=daf8cde6cdfe3bebf1b56ffa33705deab479454d0622fcd824e839f89a213981
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From cd2cc61fb6b837d37e42134bf928489710d33397 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:06 +0200
Subject: [PATCH 2438/2561] akregator: update to 22.04.1.

---
 srcpkgs/akregator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/akregator/template b/srcpkgs/akregator/template
index 3319b8d9f643..15400416e8d7 100644
--- a/srcpkgs/akregator/template
+++ b/srcpkgs/akregator/template
@@ -1,6 +1,6 @@
 # Template file for 'akregator'
 pkgname=akregator
-version=21.12.3
+version=22.04.1
 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=c8a1fa0682123189b3c31c52c3f73d72c4f8a6dcaddad91a2391defe9360c5fb
+checksum=e29f8af6c6526591d87feb221481a6ba79141a1bd12ca87fc4af46c609fe56a1

From 96d1de14b544e62e59ea6448eafc918b7cef98bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:07 +0200
Subject: [PATCH 2439/2561] ark: update to 22.04.1.

---
 srcpkgs/ark/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ark/template b/srcpkgs/ark/template
index cf6c31c7756e..37061e10b14f 100644
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@@ -1,6 +1,6 @@
 # Template file for 'ark'
 pkgname=ark
-version=21.12.3
+version=22.04.1
 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=4817458000a8f0c241cc59aed1c52ae4338c9d3c5f4f65a57080abb1ec5b60dc
+checksum=765ecb081dbb0aaf3d41f53fabd27152ffee38bfff885bfd73a5b80150e66dc6
 
 do_check() {
 	cd build

From 7be9be79691a513b79cf13f4a3608b13186d7ca9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:09 +0200
Subject: [PATCH 2440/2561] calendarsupport: update to 22.04.1.

---
 srcpkgs/calendarsupport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calendarsupport/template b/srcpkgs/calendarsupport/template
index 01b884d25085..a70cae62110e 100644
--- a/srcpkgs/calendarsupport/template
+++ b/srcpkgs/calendarsupport/template
@@ -1,6 +1,6 @@
 # Template file for 'calendarsupport'
 pkgname=calendarsupport
-version=21.12.3
+version=22.04.1
 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=77a337bea4bf5cac162d09684794edca3e3f6997f30949857ae1b23340b4d62a
+checksum=10b395b52c3a892b32ec5ba6663a85536930cfa751d8d01fafb5429d0083aeab
 
 calendarsupport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 2d8be2b9277c51ef5e307b2f20833ff2dc79e84d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:10 +0200
Subject: [PATCH 2441/2561] dragon-player: update to 22.04.1.

---
 srcpkgs/dragon-player/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dragon-player/template b/srcpkgs/dragon-player/template
index fd0948ebc1c5..d2d506f5c336 100644
--- a/srcpkgs/dragon-player/template
+++ b/srcpkgs/dragon-player/template
@@ -1,6 +1,6 @@
 # Template file for 'dragon-player'
 pkgname=dragon-player
-version=21.12.3
+version=22.04.1
 revision=1
 wrksrc="dragon-${version}"
 build_style=cmake
@@ -13,4 +13,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.dragonplayer"
 distfiles="${KDE_SITE}/release-service/${version}/src/dragon-${version}.tar.xz"
-checksum=e1bae79adf88ae980a41ff475260c4d6e9f0b04b1f88df44d2bd4ab217e53c26
+checksum=37bd492b88480569a59f74e9788bf7a24cbda5c2153f33c02f8b2b6f7ca9035b

From 10e7dc10a60a8a2c99586b91c5784ca71caab4c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:12 +0200
Subject: [PATCH 2442/2561] elisa: update to 22.04.1.

---
 srcpkgs/elisa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elisa/template b/srcpkgs/elisa/template
index db7b9fae4ff9..186af4f1b6f1 100644
--- a/srcpkgs/elisa/template
+++ b/srcpkgs/elisa/template
@@ -1,6 +1,6 @@
 # Template file for 'elisa'
 pkgname=elisa
-version=21.12.3
+version=22.04.1
 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=8afd7c82af4b4e023bcab3b473997baf5cf7ab4153f497c3b698328706d9e931
+checksum=77bea9ed938ccda42818fc89612c86242e391fba435ba4a48a832404be155e05
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 7832a197387a70067b2346fc443fd7935b9ffc20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:13 +0200
Subject: [PATCH 2443/2561] eventviews: update to 22.04.1.

---
 srcpkgs/eventviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eventviews/template b/srcpkgs/eventviews/template
index d55340fe660e..63d0a86693ac 100644
--- a/srcpkgs/eventviews/template
+++ b/srcpkgs/eventviews/template
@@ -1,6 +1,6 @@
 # Template file for 'eventviews'
 pkgname=eventviews
-version=21.12.3
+version=22.04.1
 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=828bcb2263f72d931dfd0b74d86f18dcc8afaeb928b3ceeae42dd8ab3963a907
+checksum=ad0814c2bae3536dfd363f0b7bef7fd629944467a5aece0d033e70cb8f0f6e48
 
 eventviews-devel_package() {
 	short_desc+=" - development"

From d436fec464285abcc22cb71350d414b7a56b6094 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:14 +0200
Subject: [PATCH 2444/2561] ffmpegthumbs: update to 22.04.1.

---
 srcpkgs/ffmpegthumbs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffmpegthumbs/template b/srcpkgs/ffmpegthumbs/template
index 72f6ccaeedd0..0f28d432b1d5 100644
--- a/srcpkgs/ffmpegthumbs/template
+++ b/srcpkgs/ffmpegthumbs/template
@@ -1,6 +1,6 @@
 # Template file for 'ffmpegthumbs'
 pkgname=ffmpegthumbs
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ffmpegthumbs"
 distfiles="${KDE_SITE}/release-service/${version}/src/ffmpegthumbs-${version}.tar.xz"
-checksum=9a9b310eef45990f065449688801f435fbc9e0a936c83e6e307f7e0546bf4f74
+checksum=8c2f7bdccde8f6ee78f8c6fe77cd6d0558fcc0173fb6605f04fddf453c9d7875

From 5141006f54ec44040954daad8dededa9a1933155 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:16 +0200
Subject: [PATCH 2445/2561] filelight: update to 22.04.1.

---
 srcpkgs/filelight/patches/musl.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/filelight/template           |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/patches/musl.patch b/srcpkgs/filelight/patches/musl.patch
index e97ad3ffc1ba..56b36abac39c 100644
--- a/srcpkgs/filelight/patches/musl.patch
+++ b/srcpkgs/filelight/patches/musl.patch
@@ -39,3 +39,29 @@
 -#endif
 -
  #endif
+--- a/src/posixWalker.cpp	2022-05-09 04:52:35.000000000 +0200
++++ -	2022-05-15 17:20:54.296063960 +0200
+@@ -3,6 +3,10 @@
+ 
+ #include "posixWalker.h"
+ 
++#ifndef S_BLKSIZE
++#define S_BLKSIZE 512
++#endif
++
+ static void outputError(const QByteArray &path)
+ {
+     /// show error message that stat or opendir may give
+--- a/autotests/directoryIteratorTest.cpp	2022-05-09 04:52:35.000000000 +0200
++++ -	2022-05-15 17:21:05.992082135 +0200
+@@ -8,6 +8,10 @@
+ #include "directoryIterator.h"
+ #include "test-config.h"
+ 
++#ifndef S_BLKSIZE
++#define S_BLKSIZE 512
++#endif
++
+ class DirectoryIteratorTest : public QObject
+ {
+     Q_OBJECT
diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index 30e825e0eee5..fa8bade73616 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=434fa7439732905c4655cc376d2c89e86a5fcc5371ee6fda16400917a8e4e587
+checksum=b639aef7f2db474367e38b5ed2faee32b6affc7f78595d8d184e9f909172f91b

From 50398eddfced9473b3dd5eb9272d4e4de4447285 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:17 +0200
Subject: [PATCH 2446/2561] grantleetheme: update to 22.04.1.

---
 srcpkgs/grantleetheme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grantleetheme/template b/srcpkgs/grantleetheme/template
index b6db35eedbc5..03bab8a0d8a1 100644
--- a/srcpkgs/grantleetheme/template
+++ b/srcpkgs/grantleetheme/template
@@ -1,6 +1,6 @@
 # Template file for 'grantleetheme'
 pkgname=grantleetheme
-version=21.12.3
+version=22.04.1
 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=67d9d531e4f326ea4efd40a955c9d2c6e8e54b9a02678dcee4c10b3917d503f1
+checksum=7532503e0a3b090734217db20cc6461140c02cd0d00b85793064724f964e7a2a
 
 grantleetheme-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 2873c3248e9a4db19c1b0cbd7a3d337ea6683dbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:19 +0200
Subject: [PATCH 2447/2561] incidenceeditor: update to 22.04.1.

---
 srcpkgs/incidenceeditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/incidenceeditor/template b/srcpkgs/incidenceeditor/template
index 7490da76989f..82cdbe426759 100644
--- a/srcpkgs/incidenceeditor/template
+++ b/srcpkgs/incidenceeditor/template
@@ -1,6 +1,6 @@
 # Template file for 'incidenceeditor'
 pkgname=incidenceeditor
-version=21.12.3
+version=22.04.1
 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=aa278c3710a08622fedb2e38d329947aa03bbe30c4101ec7831ce2fb9ea36ee9
+checksum=832d5332caa888205e1680a6636b31429e77b5a0b0807445234ab74df3936340
 
 do_check() {
 	# failing tests are disabled

From a8cf22531a595762fbed11286d70e3bd382d0cb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:20 +0200
Subject: [PATCH 2448/2561] juk: update to 22.04.1.

---
 srcpkgs/juk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/juk/template b/srcpkgs/juk/template
index 08664e3fed32..c83a111c2c56 100644
--- a/srcpkgs/juk/template
+++ b/srcpkgs/juk/template
@@ -1,6 +1,6 @@
 # Template file for 'juk'
 pkgname=juk
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,4 +12,4 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://juk.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/juk-${version}.tar.xz"
-checksum=9a61b68b9993e1eb9551e1b899f0d4d616b74b5fdf0d9edc40d0a41406e8ffc6
+checksum=a0aeeafedacc9b9569152e334e83c76dcd1dbb9b201664ad52f56371da8b2cb1

From 2aa6bc2f3cae08025424cfdecbd83d55e787516a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:23 +0200
Subject: [PATCH 2449/2561] k3b: update to 22.04.1.

---
 srcpkgs/k3b/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index c2eab8d7964d..3c8c150df561 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
@@ -16,4 +16,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#k3b"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5856d71fd5cf7f14eb646107f76e521869b4ac99df3411257c9f3427267b6504
+checksum=d79037e95c7d567b9e6453f9f6cb72f4d764d43180aa8854ee935a338ed354fb

From 7cc9da2446151fe380974be9a9ffaeef54cde253 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:24 +0200
Subject: [PATCH 2450/2561] kaccounts-integration: update to 22.04.1.

---
 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 7a8b45b2da07..db39510102f4 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=3e5197c1c7ddce92dd5bdcdcc05492f3c63c468e3c1e743c6e747114d34d08b8
+checksum=72ed8df11b396ffaedb5196996ff3101051271432a7347952e19cdfe306144fa
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From 2624ea4ff23101acff0fb92c92ea2de5e1d6a4ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:26 +0200
Subject: [PATCH 2451/2561] kaccounts-providers: update to 22.04.1.

---
 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 09f7d22603b9..5e41147ff956 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=297a55bcfa26379e9501b70f17da238a4ae23fd908b3afaa0052853a1cca0e34
+checksum=b8533965489af122ad8d96d86dea3a0e4f7ff7771e8a1763b9b4b7ef9fb4f056
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From 01aa48641c5a09c113b3f01e244a7e7e520966a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:27 +0200
Subject: [PATCH 2452/2561] kaddressbook: update to 22.04.1.

---
 srcpkgs/kaddressbook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kaddressbook/template b/srcpkgs/kaddressbook/template
index 585719896ba2..f396dc86b9c9 100644
--- a/srcpkgs/kaddressbook/template
+++ b/srcpkgs/kaddressbook/template
@@ -1,6 +1,6 @@
 # Template file for 'kaddressbook'
 pkgname=kaddressbook
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -13,7 +13,7 @@ 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=ad02369e61e42b32cd8a302e6510cffb99a20115a83412389e81a6e49b03f8c3
+checksum=c0a467b6de83a07ef6b92aa1ff1f7eea8740185a269aaf5a1656e5439c5ae6d8
 
 kaddressbook-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 7e1555d6dfc21f7d91f4edd1dc34a4ae40b4906c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:29 +0200
Subject: [PATCH 2453/2561] kalarm: update to 22.04.1.

---
 srcpkgs/kalarm/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/kalarm/template b/srcpkgs/kalarm/template
index 9a40d89caf48..d7d8bae4232b 100644
--- a/srcpkgs/kalarm/template
+++ b/srcpkgs/kalarm/template
@@ -1,15 +1,16 @@
 # Template file for 'kalarm'
 pkgname=kalarm
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools libxslt kdoctools
  kauth kconfig gettext"
-makedepends="kalarmcal-devel mailcommon-devel messagelib-devel kidletime-devel
- knotifyconfig-devel"
+makedepends="mailcommon-devel messagelib-devel kidletime-devel
+ kcalutils-devel kholidays-devel knotifyconfig-devel"
 short_desc="Personal alarm scheduler"
 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=71cca4083a29d20485612d505b3ab99190722d3948af2cee52111a5263673cd6
+checksum=958106e7c537ee5d006c4bae49d4708eeb8e8a19aa1e8485d1d474feaa478f11
+replaces="kalarmcal>=0"

From 6207b63f816155f643a0a132e76304ffdf08801a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:30 +0200
Subject: [PATCH 2454/2561] kalarmcal: remove package

---
 common/shlibs              |  1 -
 srcpkgs/kalarmcal-devel    |  1 -
 srcpkgs/kalarmcal/template | 26 --------------------------
 3 files changed, 28 deletions(-)
 delete mode 120000 srcpkgs/kalarmcal-devel
 delete mode 100644 srcpkgs/kalarmcal/template

diff --git a/common/shlibs b/common/shlibs
index a95bc3054f14..7607a62859c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -512,7 +512,6 @@ libKF5CalendarSupport.so.5 calendarsupport-17.12.3_1
 libKF5AkonadiNotes.so.5 akonadi-notes-17.12.3_1
 libKPimKDAV.so.5 kdav-5.72.0_1
 libKF5DAV.so.5 kdav-5.72.0_1
-libKF5AlarmCalendar.so.5 kalarmcal-17.12.3_1
 libakonadi-singlefileresource.so.5 kdepim-runtime-17.12.3_1
 libkmindexreader.so.5 kdepim-runtime-17.12.3_1
 libkdexoauth2.so.3 kdepim-runtime-17.12.3_1
diff --git a/srcpkgs/kalarmcal-devel b/srcpkgs/kalarmcal-devel
deleted file mode 120000
index d1b3ef0bb316..000000000000
--- a/srcpkgs/kalarmcal-devel
+++ /dev/null
@@ -1 +0,0 @@
-kalarmcal
\ No newline at end of file
diff --git a/srcpkgs/kalarmcal/template b/srcpkgs/kalarmcal/template
deleted file mode 100644
index 7e5cf95394f9..000000000000
--- a/srcpkgs/kalarmcal/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'kalarmcal'
-pkgname=kalarmcal
-version=21.12.3
-revision=1
-build_style=cmake
-hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
- gettext kdoctools kdesignerplugin"
-makedepends="kidentitymanagement-devel kholidays-devel kcalendarcore-devel akonadi5-devel
- kdelibs4support-devel kcalutils-devel"
-short_desc="KAlarm client library"
-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=194f97ee30c8382ac7fd80432e72f04f5db3f3fe4a009ab487c82c014eae1798
-
-kalarmcal-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/cmake
-		vmove usr/lib/qt5/mkspecs
-		vmove "usr/lib/*.so"
-	}
-}

From 121c0a57c7e2cddd88585f4d86885a8d6a2e2873 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:32 +0200
Subject: [PATCH 2455/2561] kapman: update to 22.04.1.

---
 srcpkgs/kapman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapman/template b/srcpkgs/kapman/template
index 4e84c65b75cb..54a19dd74974 100644
--- a/srcpkgs/kapman/template
+++ b/srcpkgs/kapman/template
@@ -1,6 +1,6 @@
 # Template file for 'kapman'
 pkgname=kapman
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kapman"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kapman"
 distfiles="${KDE_SITE}/release-service/${version}/src/kapman-${version}.tar.xz"
-checksum=7318f2de85402da182d630e53890ac0fde78f21b0ef6013b226e533fdef9e4a4
+checksum=730a218d8a2fcd2b7f736b2c3875642ba7fc79590654125ab293d6aeeaafd5a8

From 227e9543b381eb40ba22d277626c0273f1bf25e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:34 +0200
Subject: [PATCH 2456/2561] kblocks: update to 22.04.1.

---
 srcpkgs/kblocks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kblocks/template b/srcpkgs/kblocks/template
index 9ef7a1b7e279..b3a1ce9eb28d 100644
--- a/srcpkgs/kblocks/template
+++ b/srcpkgs/kblocks/template
@@ -1,6 +1,6 @@
 # Template file for 'kblocks'
 pkgname=kblocks
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kblocks"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kblocks"
 distfiles="${KDE_SITE}/release-service/${version}/src/kblocks-${version}.tar.xz"
-checksum=91ae615c64645e7244e436aff487dcff8e6b126bc1d018e6430720cd4d6272d8
+checksum=6d34f530007087db2ab5dcf0fdfab2946d7075008e99696fb5bb2d27ef5df4b5

From 72f3335585795a71d2caa5246132c44a5f8b79af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:35 +0200
Subject: [PATCH 2457/2561] kcachegrind: update to 22.04.1.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index d46aefe7cb9b..3d1915bffa27 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -13,5 +13,5 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=aed09ea5dc01ace24c76ed69edef5111c47f53992ba45896365b53cd3fc8890d
+checksum=5af150fc24f36f67f4c86ccb7a5a85067619685c4639fa905195136e84a7785b
 python_version=2

From f316757d9f3e77a1e9c9fad8d361b8344d29848c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:36 +0200
Subject: [PATCH 2458/2561] kcalc: update to 22.04.1.

---
 srcpkgs/kcalc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalc/template b/srcpkgs/kcalc/template
index 877954b3dfb4..35ff05723e80 100644
--- a/srcpkgs/kcalc/template
+++ b/srcpkgs/kcalc/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalc'
 pkgname=kcalc
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kcalc"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcalc"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcalc-${version}.tar.xz"
-checksum=986ca84e82fda9325171a84c8efd7fd4eb2a82e3082af536473db24f33fcd897
+checksum=f4b1db0f7f1185e6060ef86538a1467ed25214d063703997e8b2ae026b65ce26

From 2b811c5c0d610c9804dc0116e9bc65385a551121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:38 +0200
Subject: [PATCH 2459/2561] kcalutils: update to 22.04.1.

---
 srcpkgs/kcalutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalutils/template b/srcpkgs/kcalutils/template
index 7f4328aeab8b..73f7f360f386 100644
--- a/srcpkgs/kcalutils/template
+++ b/srcpkgs/kcalutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcalutils'
 pkgname=kcalutils
-version=21.12.3
+version=22.04.1
 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=9a35191c4424ed195e697a0601b1e449654b740cd6d72aa85fa845ffe574da00
+checksum=d8ab231623f20d9014d9a77d480b06b4c1639d10d2e122b9e4c2651bfdf8fc6d
 
 kcalutils-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 67d21d83586b4e3acf4725c0159fc4b6d09a0200 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:39 +0200
Subject: [PATCH 2460/2561] kcharselect: update to 22.04.1.

---
 srcpkgs/kcharselect/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcharselect/template b/srcpkgs/kcharselect/template
index 81baec03474c..41a89b9994a5 100644
--- a/srcpkgs/kcharselect/template
+++ b/srcpkgs/kcharselect/template
@@ -1,6 +1,6 @@
 # Template file for 'kcharselect'
 pkgname=kcharselect
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons gettext"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.kcharselect"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcharselect"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcharselect-${version}.tar.xz"
-checksum=c713581d6d0b300d408208ecb69d9752f6c7ac75f704439070d5099f5cfa51a9
+checksum=69522b00031af8bc564dfcf17472d410683e560a0443e2e41a51370410769c68
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools python3 qt5-host-tools qt5-qmake"

From 50037cec2c0385ad61eb51186e57cd76a34884dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:41 +0200
Subject: [PATCH 2461/2561] kcolorchooser: update to 22.04.1.

---
 srcpkgs/kcolorchooser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcolorchooser/template b/srcpkgs/kcolorchooser/template
index be3e0741cc05..65cb65e4ecdd 100644
--- a/srcpkgs/kcolorchooser/template
+++ b/srcpkgs/kcolorchooser/template
@@ -1,6 +1,6 @@
 # Template file for 'kcolorchooser'
 pkgname=kcolorchooser
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons gettext"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://kde.org/applications/en/graphics/org.kde.kcolorchooser"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcolorchooser"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcolorchooser-${version}.tar.xz"
-checksum=fadc3df8e6b47de72681434ecc9370a92fc23cf2aa97c4988b60f524155fd64a
+checksum=f9e78bca7ce4ce3cd1cc4503542d9c7e6753aee0ba4fa5146a3fe09e4b3e32e9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"

From 73a880e83d06b54f3fd7017fd73b7f281333214a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:42 +0200
Subject: [PATCH 2462/2561] kcron: update to 22.04.1.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index 636aad34dab9..8568a91546c5 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=d8ace47c86633ba677b64c765efe0b6f3de27cb75c17ae2434c498b07f3c0648
+checksum=550e736e2d21c72bd83dbfb6b7d3bd435bc40bb7ff7b3d2de4ea0382fe98e595

From 7a8c16d7d0a7b33a592b1b397637314e85fb958e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:43 +0200
Subject: [PATCH 2463/2561] kdeconnect: update to 22.04.1.

---
 common/shlibs               | 6 +++---
 srcpkgs/kdeconnect/template | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7607a62859c1..829d4007b3d3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3179,9 +3179,9 @@ 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.21 kdeconnect-21.03.80_1
-libkdeconnectcore.so.21 kdeconnect-21.03.80_1
-libkpmcore.so.11 kpmcore-21.03.80_1
+libkdeconnectinterfaces.so.22 kdeconnect-22.04.1_1
+libkdeconnectcore.so.22 kdeconnect-22.04.1_1
+libkpmcore.so.12 kpmcore-22.04.1_1
 libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
 libr_core.so.5.6.8 radare2-5.6.8_1
 libr_config.so.5.6.8 radare2-5.6.8_1
diff --git a/srcpkgs/kdeconnect/template b/srcpkgs/kdeconnect/template
index a7b4fcf1e5b3..1f48792b51ca 100644
--- a/srcpkgs/kdeconnect/template
+++ b/srcpkgs/kdeconnect/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeconnect'
 pkgname=kdeconnect
-version=21.12.3
+version=22.04.1
 revision=1
 wrksrc="kdeconnect-kde-${version}"
 build_style=cmake
@@ -19,5 +19,5 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/KDE/kdeconnect-kde"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-kde-${version}.tar.xz"
-checksum=8fc84f22ad5fa1371a109679f283baaf8728c05a92b9a6f36629b8f8d9a933d9
+checksum=6dd9ba48bb80ba607e73097bf05fb8d914f3ccc1d10f8ea8e279a918c2b0a57a
 python_version=3

From 52a9cb634cb1bff3623b9a16515716b3c130198c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:45 +0200
Subject: [PATCH 2464/2561] kdegraphics-mobipocket: update to 22.04.1.

---
 srcpkgs/libqmobipocket                           |  1 -
 srcpkgs/libqmobipocket-devel                     |  2 +-
 .../template                                     | 16 +++++-----------
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/libqmobipocket
 rename srcpkgs/{kdegraphics-mobipocket => libqmobipocket}/template (72%)

diff --git a/srcpkgs/libqmobipocket b/srcpkgs/libqmobipocket
deleted file mode 120000
index b58879252b9f..000000000000
--- a/srcpkgs/libqmobipocket
+++ /dev/null
@@ -1 +0,0 @@
-kdegraphics-mobipocket
\ No newline at end of file
diff --git a/srcpkgs/libqmobipocket-devel b/srcpkgs/libqmobipocket-devel
index b58879252b9f..5b1b2b17ef7b 120000
--- a/srcpkgs/libqmobipocket-devel
+++ b/srcpkgs/libqmobipocket-devel
@@ -1 +1 @@
-kdegraphics-mobipocket
\ No newline at end of file
+libqmobipocket
\ No newline at end of file
diff --git a/srcpkgs/kdegraphics-mobipocket/template b/srcpkgs/libqmobipocket/template
similarity index 72%
rename from srcpkgs/kdegraphics-mobipocket/template
rename to srcpkgs/libqmobipocket/template
index 13f0ad0fbde7..eb665365282a 100644
--- a/srcpkgs/kdegraphics-mobipocket/template
+++ b/srcpkgs/libqmobipocket/template
@@ -1,7 +1,8 @@
-# Template file for 'kdegraphics-mobipocket'
-pkgname=kdegraphics-mobipocket
-version=21.12.3
+# Template file for 'libqmobipocket'
+pkgname=libqmobipocket
+version=22.04.1
 revision=1
+wrksrc="kdegraphics-mobipocket-${version}"
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons qt5-host-tools qt5-qmake gettext"
 makedepends="kio-devel"
@@ -11,14 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://projects.kde.org/projects/kde/kdegraphics-mobipocket"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdegraphics-mobipocket"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-mobipocket-${version}.tar.xz"
-checksum=58c4dc769972a1472a9cfe1d134a77a12e9a78357829247d247aa73bc8e83124
-
-libqmobipocket_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-	}
-}
+checksum=e7e31efa63d478b049aca107bf8fd9731fcc357b67fdc62dab3f3307f4d41f5d
 
 libqmobipocket-devel_package() {
 	short_desc+=" - development files"

From 44e066a491d3841fe0b7b12eea2f895772b62d76 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:46 +0200
Subject: [PATCH 2465/2561] kdegraphics-thumbnailers: update to 22.04.1.

---
 srcpkgs/kdegraphics-mobipocket            |  1 +
 srcpkgs/kdegraphics-thumbnailers/template | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 120000 srcpkgs/kdegraphics-mobipocket

diff --git a/srcpkgs/kdegraphics-mobipocket b/srcpkgs/kdegraphics-mobipocket
new file mode 120000
index 000000000000..3c1f23ee29e1
--- /dev/null
+++ b/srcpkgs/kdegraphics-mobipocket
@@ -0,0 +1 @@
+kdegraphics-thumbnailers
\ No newline at end of file
diff --git a/srcpkgs/kdegraphics-thumbnailers/template b/srcpkgs/kdegraphics-thumbnailers/template
index 7419cd1f4de8..a4d121047967 100644
--- a/srcpkgs/kdegraphics-thumbnailers/template
+++ b/srcpkgs/kdegraphics-thumbnailers/template
@@ -1,14 +1,20 @@
 # Template file for 'kdegraphics-thumbnailers'
 pkgname=kdegraphics-thumbnailers
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kconfig-devel pkg-config gettext"
-makedepends="qt5-devel kio-devel libkexiv25-devel"
+makedepends="qt5-devel kio-devel libkexiv25-devel libqmobipocket-devel"
 depends="ghostscript"
 short_desc="KDE Plasma 5 Thumbnailers for various graphics file formats"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/kdegraphics-thumbnailers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdegraphics-thumbnailers-${version}.tar.xz"
-checksum=0379a413575705c6ea412aca00c8488f3ae895f9c8d799258a449c600dcd0d6a
+checksum=1706ae5b009cd79c95674ed8fdfb48f6206948cdd280b59074ce7f55b29c19f9
+
+kdegraphics-mobipocket_package() {
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+	build_style=meta
+}

From ceae5910104e887d4be53984c732311f0ea4b95c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:48 +0200
Subject: [PATCH 2466/2561] kdepim-addons: update to 22.04.1.

---
 srcpkgs/kdepim-addons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdepim-addons/template b/srcpkgs/kdepim-addons/template
index 18142a0233e5..3bac99179a3f 100644
--- a/srcpkgs/kdepim-addons/template
+++ b/srcpkgs/kdepim-addons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdepim-addons'
 pkgname=kdepim-addons
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules python3 kdoctools kcoreaddons
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, AGPL-3.0-or-late
 homepage="https://invent.kde.org/pim/kdepim-addons"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdepim-addons"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=d0909026abf6aabbbf6720cb91120e2df955db2f5c50117e019db1243e4067df
+checksum=ae44004d989328a21476d3226a79c2a39667cd3bc820b779a83adb604df1af64
 
 do_check() {
 	# failing tests are disabled

From 386c9b116f3416a30369a1aaba36b339e73f4d96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:49 +0200
Subject: [PATCH 2467/2561] kdepim-runtime: update to 22.04.1.

---
 srcpkgs/kdepim-runtime/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template
index 4ab89aad0dae..5f5cc4ff8627 100644
--- a/srcpkgs/kdepim-runtime/template
+++ b/srcpkgs/kdepim-runtime/template
@@ -1,21 +1,21 @@
 # Template file for 'kdepim-runtime'
 pkgname=kdepim-runtime
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 # XXX KolabLibraries, Kolabxml
 hostmakedepends="extra-cmake-modules python3 kdoctools kdesignerplugin
  gettext qt5-qmake qt5-host-tools"
 makedepends="akonadi-calendar-devel akonadi-notes-devel knotifyconfig-devel
- pimcommon-devel kdav-devel libkgapi-devel kalarmcal-devel kmbox-devel
+ pimcommon-devel kdav-devel libkgapi-devel kmbox-devel
  qt5-networkauth-devel qca-qt5-devel qt5-webengine-devel
- qt5-webchannel-devel"
+ kholidays-devel qt5-webchannel-devel"
 short_desc="KDE PIM runtime applications/libraries"
 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=f5b00a947cd74a39ee18d61dbfbc59b9b8b5137b52674bb42905d89d98b519aa
+checksum=b5fb61f475ce441a9db5b8258b1cb510b26391d95d95a960305250f569fb903f
 
 post_install() {
 	for license in AGPL-3.0-or-later.txt BSD-3-Clause.txt BSD-2-Clause.txt; do

From 70aa4d68058e73255131135279920ffe46e7d80e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:51 +0200
Subject: [PATCH 2468/2561] kdevelop-php: update to 22.04.1.

---
 srcpkgs/kdevelop-php/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdevelop-php/template b/srcpkgs/kdevelop-php/template
index e3a2875e174f..88a48aaf7f7d 100644
--- a/srcpkgs/kdevelop-php/template
+++ b/srcpkgs/kdevelop-php/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop-php'
 pkgname=kdevelop-php
-version=21.12.3
+version=22.04.1
 revision=1
 wrksrc="kdev-php-${version}"
 build_style=cmake
@@ -16,4 +16,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kdevelop.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdev-php"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdev-php-${version}.tar.xz"
-checksum=4a85438a51bf6e3faedca3f64c2ffd08355d20fd4214c12fe010f003f5c3b17c
+checksum=5e40d2412accda564b56710eea25c165c776b0146449b1d79b45751c97ffbbb3

From e07615396906d9daaf29f4272230017eafdb31f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:53 +0200
Subject: [PATCH 2469/2561] kdevelop: update to 22.04.1.

---
 common/shlibs             | 30 +++++++++++++++---------------
 srcpkgs/kdevelop/template |  4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 829d4007b3d3..0fbd5ba82cce 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2680,21 +2680,21 @@ libvidstab.so.1.1 libvidstab-1.1.0_1
 libxdo.so.3 xdotool-3.20150503.1_1
 libabigail.so.0 libabigail-1.0.rc3_1
 libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1
-libKDevCMakeCommon.so.35 kdevelop-21.12.2_1
-libKDevClangPrivate.so.35 kdevelop-21.12.2_1
-libKDevCompileAnalyzerCommon.so.35 kdevelop-21.12.2_1
-libKDevPlatformDebugger.so.57 kdevelop-21.12.2_1
-libKDevPlatformDocumentation.so.57 kdevelop-21.12.2_1
-libKDevPlatformInterfaces.so.57 kdevelop-21.12.2_1
-libKDevPlatformLanguage.so.57 kdevelop-21.12.2_1
-libKDevPlatformOutputView.so.57 kdevelop-21.12.2_1
-libKDevPlatformProject.so.57 kdevelop-21.12.2_1
-libKDevPlatformSerialization.so.57 kdevelop-21.12.2_1
-libKDevPlatformShell.so.57 kdevelop-21.12.2_1
-libKDevPlatformSublime.so.57 kdevelop-21.12.2_1
-libKDevPlatformTests.so.57 kdevelop-21.12.2_1
-libKDevPlatformUtil.so.57 kdevelop-21.12.2_1
-libKDevPlatformVcs.so.57 kdevelop-21.12.2_1
+libKDevCMakeCommon.so.36 kdevelop-22.04.1_1
+libKDevClangPrivate.so.36 kdevelop-22.04.1_1
+libKDevCompileAnalyzerCommon.so.36 kdevelop-22.04.1_1
+libKDevPlatformDebugger.so.58 kdevelop-22.04.1_1
+libKDevPlatformDocumentation.so.58 kdevelop-22.04.1_1
+libKDevPlatformInterfaces.so.58 kdevelop-22.04.1_1
+libKDevPlatformLanguage.so.58 kdevelop-22.04.1_1
+libKDevPlatformOutputView.so.58 kdevelop-22.04.1_1
+libKDevPlatformProject.so.58 kdevelop-22.04.1_1
+libKDevPlatformSerialization.so.58 kdevelop-22.04.1_1
+libKDevPlatformShell.so.58 kdevelop-22.04.1_1
+libKDevPlatformSublime.so.58 kdevelop-22.04.1_1
+libKDevPlatformTests.so.58 kdevelop-22.04.1_1
+libKDevPlatformUtil.so.58 kdevelop-22.04.1_1
+libKDevPlatformVcs.so.58 kdevelop-22.04.1_1
 libts.so.0 tslib-1.6_1
 libobs.so.0 obs-0.14.1_2
 libobsglad.so.0 obs-0.14.1_2
diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template
index 010185849d80..8dee78d9f0c0 100644
--- a/srcpkgs/kdevelop/template
+++ b/srcpkgs/kdevelop/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop'
 pkgname=kdevelop
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.kdevelop.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdevelop"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdevelop-${version}.tar.xz"
-checksum=86f36502559675aaae2afc8f2d649ee29997cd75a32116acf63e9edce94717ea
+checksum=22f3f50d2d484c821ca39f66f953d61a7f77e596ce9d38b552a721f48366cdd8
 
 build_options="webengine"
 desc_option_webengine="Use Qt5 WebEngine for documentation"

From 7facd5d4b224919c58a00d3635fe67b445764123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:55 +0200
Subject: [PATCH 2470/2561] kdialog: update to 22.04.1.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index 64efbaad5e8b..5da6a6f830ef 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=ac47479b576b87e8a82d62f4b685941b6ab54a44a06391c4c0762db159930589
+checksum=95933b853cfc053c6881e27be945c96419a138994a57a28cf8dddab866de1763

From 0cc339ee38f3a0aef686febd19f6be34c93ab1fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:56 +0200
Subject: [PATCH 2471/2561] keditbookmarks: update to 22.04.1.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index 5291ab00f990..0ed901f95aa3 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=d6daabf60acec49cac1401da1019f965a96e8fd41b967694b2c8fd6723b87327
+checksum=c22b7649f0779cc51f64ac2dca95174b8e41da2b54f65cef02290ae021413d2e

From 5984257103d8175f6f4a58fdc9e561f440f28e58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:57 +0200
Subject: [PATCH 2472/2561] kfind: update to 22.04.1.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 06de53b604a9..d722b800a4a6 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=5133cad0be64fb3fc3f9666b01b4cff8141016f31c244ed39a3e21fc298b6935
+checksum=ac92abee62045f7eb97aaf12b6f8e272e3b066681f6b0f07976a5f456d9639d7

From fd3ec64174ac1ee4c8e148518c4668f49d91e005 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:19:59 +0200
Subject: [PATCH 2473/2561] kget: update to 22.04.1.

---
 srcpkgs/kget/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kget/template b/srcpkgs/kget/template
index 619e663138b2..cdf9e98935f3 100644
--- a/srcpkgs/kget/template
+++ b/srcpkgs/kget/template
@@ -1,6 +1,6 @@
 # Template file for 'kget'
 pkgname=kget
-version=21.12.3
+version=22.04.1
 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=9460f6890e66b252bc8cad5414e0aaf2d0d48070bddb1aec61ea90fff74b44f0
+checksum=2de3cd0cf8d1f4b2a54240b7c4e514acf5388b4573e7502c27dc7266c5d81bed

From 5744bbef9b5b287df81135483eec713425d36371 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:01 +0200
Subject: [PATCH 2474/2561] kgpg: update to 22.04.1.

---
 srcpkgs/kgpg/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgpg/template b/srcpkgs/kgpg/template
index 8487622df3ed..f837f1e425d6 100644
--- a/srcpkgs/kgpg/template
+++ b/srcpkgs/kgpg/template
@@ -1,6 +1,6 @@
 # Template file for 'kgpg'
 pkgname=kgpg
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext
@@ -18,4 +18,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/en/utilities/org.kde.kgpg"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kgpg"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=632bcf685fc9604ecc09933d0257533fd208177abba75bc14c853cdec91bf8d7
+checksum=c5bf5d77538bbb8a7ee6bd1b39cacc71fe67a7d7395799c47c75d57ae018ec35

From 150ea1e5d2c26159ef8618dd29236d9fdd629c0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:02 +0200
Subject: [PATCH 2475/2561] kidentitymanagement: update to 22.04.1.

---
 common/shlibs                        | 1 +
 srcpkgs/kidentitymanagement/template | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0fbd5ba82cce..ee2395bc2b07 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3230,6 +3230,7 @@ libKF5AkonadiWidgets.so.5 akonadi5-17.12.0_1
 libKF5AkonadiXml.so.5 akonadi5-17.12.0_1
 libKF5PimTextEdit.so.5 kpimtextedit-17.12.0_1
 libKF5IdentityManagement.so.5 kidentitymanagement-17.12.0_1
+libKF5IdentityManagementWidgets.so.5 kidentitymanagement-22.04.0_1
 libKChart.so.2 kdiagram-2.6.0_1
 libKGantt.so.2 kdiagram-2.6.0_1
 libscrypt.so.0 libscrypt-1.21_1
diff --git a/srcpkgs/kidentitymanagement/template b/srcpkgs/kidentitymanagement/template
index 4629eb5dc285..981eae91032c 100644
--- a/srcpkgs/kidentitymanagement/template
+++ b/srcpkgs/kidentitymanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'kidentitymanagement'
 pkgname=kidentitymanagement
-version=21.12.3
+version=22.04.1
 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=64e698618d4384fa98512d208776eb94abc2aa514356f162950546882bddbca3
+checksum=746a01e43dae1841ec412257f64cc25dd19139403e9119ff746882883ac80738
 
 kidentitymanagement-devel_package() {
 	short_desc+=" - development"

From 17778e331039ccd4b6ebb3f8a01cc72fe040219a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:04 +0200
Subject: [PATCH 2476/2561] kig: update to 22.04.1.

---
 srcpkgs/kig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 3f291745d311..6fa9a2b95ef3 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kig"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=6dd9e280e3f0bca4c900f9fd8ef2e138eb8f1b021adf4ffe4e29804adddc7965
+checksum=850c826c9823e3abaff4504c03874755565e2d6732982b4bdffcccedd841e2e3

From ba7ba24a261d40d3e08bc9c659dee63bdc929e49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:05 +0200
Subject: [PATCH 2477/2561] kimap: update to 22.04.1.

---
 srcpkgs/kimap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimap/template b/srcpkgs/kimap/template
index 8557da8b5f25..81987d3bab3c 100644
--- a/srcpkgs/kimap/template
+++ b/srcpkgs/kimap/template
@@ -1,6 +1,6 @@
 # Template file for 'kimap'
 pkgname=kimap
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kimap-${version}.tar.xz"
-checksum=fd96fa20b465ea442df960b57f5c27640e452b92d099a1f11bd051b7e74f4d86
+checksum=743f7e5b089233654467811008c7b8d4f9d697e26661c5aef2751733c02e2465
 
 do_check() {
 	: # XXX: QFATAL : FakeServerTest::testLoadScenario() Unable to start the server

From 6555b3d374eba35bad3bff8af1d1d5729a41ec70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:07 +0200
Subject: [PATCH 2478/2561] kio-gdrive: update to 22.04.1.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index d1e301180476..dba5da596c91 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=9f910baa87f707d1f28c9da5d3f1b104b992f7c7b3ca2ca532cb3646d92c84ec
+checksum=06160b034bce0fb29205e8d201a337129010b53137b00ebe30dd596045350b8b

From 81826af3ab72b1ec07ff5a97b38c854607e95187 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:08 +0200
Subject: [PATCH 2479/2561] kitinerary: update to 22.04.1.

---
 .../temporarily-disable-broken-test.patch        | 16 ----------------
 srcpkgs/kitinerary/template                      |  4 ++--
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch

diff --git a/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch b/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch
deleted file mode 100644
index 4e7bb1ce88bd..000000000000
--- a/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Temporarily disable the calendarhandler test.
-This test has been fixed upstream, so this should be able to be
- removed in the next release.
-
-diff -Naur a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
---- a/autotests/CMakeLists.txt	2022-04-18 11:34:57.356111303 -0700
-+++ b/autotests/CMakeLists.txt	2022-04-18 11:33:56.175938220 -0700
-@@ -35,7 +35,7 @@
- ecm_add_test(postprocessortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
- ecm_add_test(extractorvalidatortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
- if (TARGET KF5::CalendarCore)
--    ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
-+   #ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
-     ecm_add_test(extractortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary KPim::PkPass)
- endif()
- ecm_add_test(documentutiltest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
diff --git a/srcpkgs/kitinerary/template b/srcpkgs/kitinerary/template
index aa5ad07fe219..343ef64911d6 100644
--- a/srcpkgs/kitinerary/template
+++ b/srcpkgs/kitinerary/template
@@ -1,6 +1,6 @@
 # Template file for 'kitinerary'
 pkgname=kitinerary
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons pkg-config qt5-host-tools qt5-qmake qt5-tools-devel"
@@ -12,7 +12,7 @@ license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kitinerary"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=b15f8aac50ac7eaf2fc23e40c7a165283e99844f88d96cb2a45face8a3cc8c4d
+checksum=306a74c9be1b37dbba7e6876d81426b01af52f80ef139087949042bcc6956b7a
 
 kitinerary-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ce21f4eb7d5079fa523be10085f6ef179c4542e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:09 +0200
Subject: [PATCH 2480/2561] kldap: update to 22.04.1.

---
 srcpkgs/kldap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kldap/template b/srcpkgs/kldap/template
index e5eeb67963d9..b71d9ef2e341 100644
--- a/srcpkgs/kldap/template
+++ b/srcpkgs/kldap/template
@@ -1,6 +1,6 @@
 # Template file for 'kldap'
 pkgname=kldap
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kldap-${version}.tar.xz"
-checksum=0abce0ebca12a6ee71e6b93a727579d20900fdbc750f059283dbd1d4a1d3948e
+checksum=0bd291d6b2695e97813c00203c94a0d76f19d0898ab7ab70f0a7c59a10d806dc
 
 kldap-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 954ec62fc7308108f72c748a31c64d9ae9988289 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:11 +0200
Subject: [PATCH 2481/2561] kleopatra: update to 22.04.1.

---
 srcpkgs/kleopatra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kleopatra/template b/srcpkgs/kleopatra/template
index 4edaad7b4fc7..8d6f461297bd 100644
--- a/srcpkgs/kleopatra/template
+++ b/srcpkgs/kleopatra/template
@@ -1,6 +1,6 @@
 # Template file for 'kleopatra'
 pkgname=kleopatra
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
@@ -12,7 +12,7 @@ maintainer="Justin Jagieniak <justin@jagieniak.net>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later"
 homepage="https://www.kde.org/applications/utilities/kleopatra/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=9a4ad9c602d557c0547d47229def661749bfe213a34992ec8d18e88c410dc681
+checksum=d30e6335b78c6fce6ad22e5482032d0f8a02740b46fe9fdc3263d39ceaeaae23
 
 do_check() {
 	dbus-run-session ninja -C build test

From 92ddfe8160a5dbd576bf488cb8f55961ce152594 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:12 +0200
Subject: [PATCH 2482/2561] kmag: update to 22.04.1.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index a68adf873813..08027cfdcac0 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=e65aaaa3e480c215384bae721afb36d7e50a7f8ab27aa4013eb46de1f43d97af
+checksum=ff2341c12d3f4eeced74339912079120266a3830451e8486a810ffedf2e3316a

From c2a905c351dabb42a96a039e741b4ccf99ab78c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:14 +0200
Subject: [PATCH 2483/2561] kmail-account-wizard: update to 22.04.1.

---
 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 39c89a1b2607..d3dbeca761e3 100644
--- a/srcpkgs/kmail-account-wizard/template
+++ b/srcpkgs/kmail-account-wizard/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail-account-wizard'
 pkgname=kmail-account-wizard
-version=21.12.3
+version=22.04.1
 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=ef9227b88d842cb52bd6f96a1a5dd30fbfbc6377074cb56e745ac7b84dcd222b
+checksum=d3253e6395e27ef42904b50b8cd7abcc6797351efcf54d45b3ce12b41bba2f85

From 2c2e4d830dd702f927ba5288738a9cc99e52278b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:16 +0200
Subject: [PATCH 2484/2561] kmail: update to 22.04.1.

---
 srcpkgs/kmail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmail/template b/srcpkgs/kmail/template
index e75cd76144a9..054659f11f82 100644
--- a/srcpkgs/kmail/template
+++ b/srcpkgs/kmail/template
@@ -1,6 +1,6 @@
 # Template file for 'kmail'
 pkgname=kmail
-version=21.12.3
+version=22.04.1
 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=e023a8ced8bc6ea5fe40bc30a0a803812c04ce0245f0e8a5612d42711c33d0ce
+checksum=a44043a7c293981494ad5552db29f5aff1d8859013352c96791ccae3d15e93e8

From b22b9420185a768d49a292d9789b356c830cf1a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:17 +0200
Subject: [PATCH 2485/2561] kmailtransport: update to 22.04.1.

---
 srcpkgs/kmailtransport/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmailtransport/template b/srcpkgs/kmailtransport/template
index 51dbdef1525a..679f7343fd81 100644
--- a/srcpkgs/kmailtransport/template
+++ b/srcpkgs/kmailtransport/template
@@ -1,6 +1,6 @@
 # Template file for 'kmailtransport'
 pkgname=kmailtransport
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools python3
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://community.kde.org/KDE_PIM"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmailtransport-${version}.tar.xz"
-checksum=26ba38d87c0072f448d63966cab31914903c7dfa73817846d2d1a8808e7e7750
+checksum=8f1dc26f0dad28e81bce0f8ade3d83c811841bdb56a9b982032b1a233725add2
 
 kmailtransport-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 484d55ad48cb16aa605ad81d3efc91165d9d746b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:19 +0200
Subject: [PATCH 2486/2561] kmbox: update to 22.04.1.

---
 srcpkgs/kmbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmbox/template b/srcpkgs/kmbox/template
index bc35b8709de9..a6dade4ca180 100644
--- a/srcpkgs/kmbox/template
+++ b/srcpkgs/kmbox/template
@@ -1,6 +1,6 @@
 # Template file for 'kmbox'
 pkgname=kmbox
-version=21.12.3
+version=22.04.1
 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=19731646fccea7f1615e7b0a6d2a1682e6afdf444ff74a6d40f6a821e1149411
+checksum=91b89f23b98a1a86fbf25bac17318364241a05c5601d20bce7b4fdced6af2691
 
 kmbox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From dc9c0a575d2c9acee5e4e2fd026d1b96b97e6b0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:20 +0200
Subject: [PATCH 2487/2561] kmime: update to 22.04.1.

---
 srcpkgs/kmime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmime/template b/srcpkgs/kmime/template
index dd6b7a36145f..c783cf4a865c 100644
--- a/srcpkgs/kmime/template
+++ b/srcpkgs/kmime/template
@@ -1,6 +1,6 @@
 # Template file for 'kmime'
 pkgname=kmime
-version=21.12.3
+version=22.04.1
 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=fc5a1b86a18c0b0ef67759e3813cb49b3286b101f8494ce0497737ee29a1470f
+checksum=a7f94a60d204f7546a711551feafb05549caf25d5831ecb9942cad32caddca05
 
 if [ "CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"

From ee56629b996e50731a4bc7d877603ef09a0478bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:22 +0200
Subject: [PATCH 2488/2561] kmines: update to 22.04.1.

---
 srcpkgs/kmines/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmines/template b/srcpkgs/kmines/template
index fc5f71db232d..bfdd1048c312 100644
--- a/srcpkgs/kmines/template
+++ b/srcpkgs/kmines/template
@@ -1,6 +1,6 @@
 # Template file for 'kmines'
 pkgname=kmines
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools kconfig
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/org.kde.kmines"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmines"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmines-${version}.tar.xz"
-checksum=8cbef528fdffd990cbaa3836ac8c23aa591e88c33942e9badd7c8cf33d03bef3
+checksum=4450fadd3155108e25b308c86b1a5ef82d1080340369ba90528f025abb4f9de5

From 6b33104e005c0d1f4fc235b0d1c2f86295d17a10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:23 +0200
Subject: [PATCH 2489/2561] kmix: update to 22.04.1.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index e4bf7c548be8..34b494824b39 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=3f41a53cb7033fde10ae92b693a6b84c0da045e570e83136dbc659afa89e5e7a
+checksum=5cb779f8c899025d32893913ef5c7b54cb9091b20a7712a161a9ae309b1a8eba

From 5afe6c49be3ba107cb9e11690931bfbeb93d664b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:25 +0200
Subject: [PATCH 2490/2561] knights: update to 22.04.1.

---
 srcpkgs/knights/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knights/template b/srcpkgs/knights/template
index 40ccaef520dc..80992e62ff76 100644
--- a/srcpkgs/knights/template
+++ b/srcpkgs/knights/template
@@ -1,6 +1,6 @@
 # Template file for 'knights'
 pkgname=knights
-version=21.12.3
+version=22.04.1
 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=a4138f8ae91e587a749f930064fecb62d9eb210671977ac8e083b76cc28b4bd4
+checksum=5296758dbaf431283002ba1f5e6262c1835a78710ff339f1391637f88f470e05

From 873c01b1282b20c979806556cc45927e4960b850 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:26 +0200
Subject: [PATCH 2491/2561] knotes: update to 22.04.1.

---
 srcpkgs/knotes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotes/template b/srcpkgs/knotes/template
index a19c79190bd3..0acc654ef0c0 100644
--- a/srcpkgs/knotes/template
+++ b/srcpkgs/knotes/template
@@ -1,6 +1,6 @@
 # Template file for 'knotes'
 pkgname=knotes
-version=21.12.3
+version=22.04.1
 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://apps.kde.org/knotes/"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=a721328deea314066352a92bf99c22163cd7eb1f10f4d36b893d78cdb102f21e
+checksum=41b46d073bfa312bd69675d99d7b5b290ddf9d59c1ac21c0ff758c9674742ac0

From 590782ce722e81e0e07f0ccef32b73e2daa7cb65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:28 +0200
Subject: [PATCH 2492/2561] kolourpaint: update to 22.04.1.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index 5a81652e6b04..f717108dd44f 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=aeb2e439f32d9b1d7556e807c0902c870b90691f84764266e3f7fd92af5d9163
+checksum=4d5096c7e40a592583f597ff388b3bc7c64e5b75f1b12e73b18e4bd7b777afeb
 
 post_install() {
 	vlicense COPYING

From ec8daccaf6a4cd202b82d299a92dab91ce7c063c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:30 +0200
Subject: [PATCH 2493/2561] kompare: update to 22.04.1.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 457830d20119..812edd32644a 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=e2e0ee484b2eb098d9315ea26a0b68abce64ae02572baab998a5711f609c018d
+checksum=15fc7e13926dd0a994f50edc5b4ff17d7564f2f0781598a2106f6edb8bac534e

From 940e2a1a0216511f3497676822493176123471f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:32 +0200
Subject: [PATCH 2494/2561] konqueror: update to 22.04.1.

---
 srcpkgs/konqueror/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konqueror/template b/srcpkgs/konqueror/template
index 95df07305792..a8c83ec4e0c8 100644
--- a/srcpkgs/konqueror/template
+++ b/srcpkgs/konqueror/template
@@ -1,6 +1,6 @@
 # Template file for 'konqueror'
 pkgname=konqueror
-version=21.12.3
+version=22.04.1
 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=fd8e66566ac926dbbdf701fcaa3ff154b857d72f033df75ee9d75260c3c17f7c
+checksum=2744e2eaab3ebbd8949699cccfd6f849376b10b8a0f9cef00249207701e947ef
 
 do_check() {
 	:

From 4f435705d5c502561f65a4d75f4480aa40d88641 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:34 +0200
Subject: [PATCH 2495/2561] konquest: update to 22.04.1.

---
 srcpkgs/konquest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konquest/template b/srcpkgs/konquest/template
index 7005b60793a5..b241cd02d7c7 100644
--- a/srcpkgs/konquest/template
+++ b/srcpkgs/konquest/template
@@ -1,6 +1,6 @@
 # Template file for 'konquest'
 pkgname=konquest
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons kdoctools
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/games/org.kde.konquest"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konquest"
 distfiles="${KDE_SITE}/release-service/${version}/src/konquest-${version}.tar.xz"
-checksum=00793a5a0e9a88f7de2003ee620a65d7689221dbf731c21b113d83a313862a53
+checksum=b901d71ce47fe86c26e92e7d965002371cabc93a802d84cf23fa77e94de45265

From 49ff85e33959f5a91ae87c28f10d928459110047 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:35 +0200
Subject: [PATCH 2496/2561] kontact: update to 22.04.1.

---
 srcpkgs/kontact/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontact/template b/srcpkgs/kontact/template
index cdf7623d3285..0736368c0ff3 100644
--- a/srcpkgs/kontact/template
+++ b/srcpkgs/kontact/template
@@ -1,6 +1,6 @@
 # Template file for 'kontact'
 pkgname=kontact
-version=21.12.3
+version=22.04.1
 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=20b923182a5ea30540bb8ce6db0883d07434d0f3490f8ac80354654ac93ae19a
+checksum=962321abcf6d1f1aeed2368b98159e8afab0f71eef4c81ae7ce48c6267b479a6

From e4bbbbd43d7370c19829c59a880d939525808c18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:36 +0200
Subject: [PATCH 2497/2561] kontactinterface: update to 22.04.1.

---
 srcpkgs/kontactinterface/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kontactinterface/template b/srcpkgs/kontactinterface/template
index 57fb764a3bd6..fd38bf901eda 100644
--- a/srcpkgs/kontactinterface/template
+++ b/srcpkgs/kontactinterface/template
@@ -1,6 +1,6 @@
 # Template file for 'kontactinterface'
 pkgname=kontactinterface
-version=21.12.3
+version=22.04.1
 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=e8b0408b7e634e9802ae81caaba3e154a5474a5bfc0c1981386dccb508069de3
+checksum=a30ab91e4b38c691ef5e7f4b81dddb318ec6006faf5cb4a44823bd0ed618ca6b
 
 kontactinterface-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 52108a6f1bc503d85e12313357792abf751a1ad6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:38 +0200
Subject: [PATCH 2498/2561] konversation: update to 22.04.1.

---
 srcpkgs/konversation/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 5358aed5c724..a6934f6f1977 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,6 +1,6 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
@@ -13,5 +13,5 @@ license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=f89c3854edd6dabcceff7a3615b532ac34d5b4769be1e125789e41d67e7f9b8a
+checksum=d1b3f3ce151f0cc6a6ed566658ea24120e6b8539e35a15b20620b0b6c50efebf
 python_version=3

From 514428dfeb03b9df3f1fc6c8183a25fa581af772 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:40 +0200
Subject: [PATCH 2499/2561] korganizer: update to 22.04.1.

---
 srcpkgs/korganizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/korganizer/template b/srcpkgs/korganizer/template
index 1787addb124f..40b1223a296d 100644
--- a/srcpkgs/korganizer/template
+++ b/srcpkgs/korganizer/template
@@ -1,6 +1,6 @@
 # Template file for 'korganizer'
 pkgname=korganizer
-version=21.12.3
+version=22.04.1
 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=19c02adddade1a398fe77e30d56f03a4cb0433598e4212793d603734f4f7571c
+checksum=594ce6973ff95d278f546db012deac6dc454cecc05b92e499eaac88716d45534

From 3394091fe8a5010c9fc87643789fd3239f1fff49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:42 +0200
Subject: [PATCH 2500/2561] kpat: update to 22.04.1.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index e3d3d8d5ad3b..63cb7a7b143e 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -14,4 +14,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=275e2e4508980dbc53bd598c7abd05a21dd5c50b255e750436639cc75f67a44d
+checksum=ea9938aa038467e1f5c3356e9e6dd09cf394e6887a69a573ffd4d5d76d11a1f1

From a7126ec1a1bc2f1c907288f9c3d54e8f75c3c553 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:43 +0200
Subject: [PATCH 2501/2561] kpimtextedit: update to 22.04.1.

---
 srcpkgs/kpimtextedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpimtextedit/template b/srcpkgs/kpimtextedit/template
index e838f5d3ac54..f1f6c3dac9aa 100644
--- a/srcpkgs/kpimtextedit/template
+++ b/srcpkgs/kpimtextedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kpimtextedit'
 pkgname=kpimtextedit
-version=21.12.3
+version=22.04.1
 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=54f3e7bea55e051240a7b328553eb43131e6c0ce33bf67eb0e28decae4c219a6
+checksum=f6cedefcc351069e01d0f3f15d4eaefe0ecb2865aaab3e17811af54a39f9bfc7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-tools-devel"

From 01f212344b1acca7aa88c9b93f5bcbec1d128d27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:44 +0200
Subject: [PATCH 2502/2561] kpkpass: update to 22.04.1.

---
 srcpkgs/kpkpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpkpass/template b/srcpkgs/kpkpass/template
index c615112cdcea..8869dac35bf9 100644
--- a/srcpkgs/kpkpass/template
+++ b/srcpkgs/kpkpass/template
@@ -1,6 +1,6 @@
 # Template file for 'kpkpass'
 pkgname=kpkpass
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools shared-mime-info"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://kontact.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpkpass"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=678e79e450c5859d53c436ab991f4eadffd742dad129e4254953b98e2944c815
+checksum=5e5cadca3951f7e3439713f295d549e0ab2f5e4a013c604fb9a703ea9e99411d
 
 kpkpass-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 28993a4f83899c5217444a5dc4b018825f0d7ad5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:46 +0200
Subject: [PATCH 2503/2561] kpmcore: update to 22.04.1.

---
 srcpkgs/kpmcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpmcore/template b/srcpkgs/kpmcore/template
index cf275bae79cd..b78ba2611391 100644
--- a/srcpkgs/kpmcore/template
+++ b/srcpkgs/kpmcore/template
@@ -1,6 +1,6 @@
 # Template file for 'kpmcore'
 pkgname=kpmcore
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/system/org.kde.partitionmanager"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpmcore"
 distfiles="${KDE_SITE}/release-service/$version/src/$pkgname-$version.tar.xz"
-checksum=6ad7a6d04a1c28bca9e934a3d7664fcb91069f841a8292208764ff4eca5300a6
+checksum=70d043cc125bd040d6b2af091e3a038d1780702fa327cda070300e94027c64f8
 
 if [ -n "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From f06c7c4651de8d8386c493342ebd80849a469519 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:47 +0200
Subject: [PATCH 2504/2561] kqtquickcharts: update to 22.04.1.

---
 srcpkgs/kqtquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kqtquickcharts/template b/srcpkgs/kqtquickcharts/template
index 54a784cecaad..7c78e719d727 100644
--- a/srcpkgs/kqtquickcharts/template
+++ b/srcpkgs/kqtquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kqtquickcharts'
 pkgname=kqtquickcharts
-version=21.12.3
+version=22.04.1
 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=b9f6ee7a7028c29b43729028e4d78ed043f0acb3c40b4405108010eb3e62893e
+checksum=e85918af3a24aaedcabe9ba47c31cc50fd3227dc95ffd1d1a6dc2d1394e62c2c
 
 kqtquickcharts-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 311a2028d4595879babd78d141f9beb4ae1b34b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:49 +0200
Subject: [PATCH 2505/2561] krdc: update to 22.04.1.

---
 srcpkgs/krdc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krdc/template b/srcpkgs/krdc/template
index 95ad42e261aa..eaa9d65e8aa4 100644
--- a/srcpkgs/krdc/template
+++ b/srcpkgs/krdc/template
@@ -1,6 +1,6 @@
 # Template file for 'krdc'
 pkgname=krdc
-version=21.12.3
+version=22.04.1
 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=12088c5881c66897e698477d813cb5fa31f221b55cab74c53e94b6ba294bd726
+checksum=ff233533b9f4381262633f5d390cfbe00bd9b36f4a784210068ba5998b2a8f31
 
 krdc-devel_package() {
 	short_desc+=" - development files"

From b617e7bb3ce166ac97bbcb671ea7a4ea067ea6f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:50 +0200
Subject: [PATCH 2506/2561] krfb: update to 22.04.1.

---
 srcpkgs/krfb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krfb/template b/srcpkgs/krfb/template
index 795ecb6b26ea..4128d7ed1c91 100644
--- a/srcpkgs/krfb/template
+++ b/srcpkgs/krfb/template
@@ -1,6 +1,6 @@
 # Template file for 'krfb'
 pkgname=krfb
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -16,4 +16,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=16ec7684243d9488380abd621edf5dd6916a45a097fe780705b1a32fe0de14e5
+checksum=777b12e7abff962aad997377ffb377f46382d5f7265242a8e9643dcb2c1f0401

From ade0f16b1c44c3565d490533dea7b97479ee6a60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:51 +0200
Subject: [PATCH 2507/2561] kruler: update to 22.04.1.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 8c70ce207278..5446477eae29 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=f4f189b606813fb2f42e40f7664adafafdcd210e474909b9e93ff30eba18cd45
+checksum=f7848cac9c7a3c6c3d03edc90dc78ff7df97a1beff374e469419f9ca4112e16e

From 2535f7d7bb6d032884692679497b22638e745bd8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:53 +0200
Subject: [PATCH 2508/2561] ksmtp: update to 22.04.1.

---
 srcpkgs/ksmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksmtp/template b/srcpkgs/ksmtp/template
index 068a3a0db671..dc0ce4c75fde 100644
--- a/srcpkgs/ksmtp/template
+++ b/srcpkgs/ksmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'ksmtp'
 pkgname=ksmtp
-version=21.12.3
+version=22.04.1
 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=22da5a72c957d8a38d7b5792013edaa826da8d41eeba30db66ece9f0f42bbe4d
+checksum=f445692c54310c737d6afffeb8a2ce9d6c17164ca6145fc7f983f8adfe79f458
 
 ksmtp-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 253830688dc9bca5d611c8612694a6c4d11111bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:54 +0200
Subject: [PATCH 2509/2561] ksystemlog: update to 22.04.1.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 53c40ccabd7c..e342cd165a96 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=25525e28756928ddb014ccec6f352c7378473ad417971608989818484b2847a4
+checksum=d761a1e42d02479311bbe6a57724a2db5c9011615a8ce83813fe63fa9822eb36

From 9586f282f9ec9bfdc0edee780a4a5b0a703ed907 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:56 +0200
Subject: [PATCH 2510/2561] kteatime: update to 22.04.1.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index dc8dbc935798..e4df7b1d71fd 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=f3098313f7df6de082490c11ae6f840d3f73d2c3be22fb56d4bb0c15baf81df6
+checksum=d5bf75bdc3cafe4b7dc9b4ddff9baacf0f7f903d2a97fa45abf7739b9588655b

From 8baa96fa95b92acf8c2babda1eac0a58ebd82d5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:57 +0200
Subject: [PATCH 2511/2561] ktnef: update to 22.04.1.

---
 srcpkgs/ktnef/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktnef/template b/srcpkgs/ktnef/template
index fb8003e8f7f9..ab3214a40e68 100644
--- a/srcpkgs/ktnef/template
+++ b/srcpkgs/ktnef/template
@@ -1,6 +1,6 @@
 # Template file for 'ktnef'
 pkgname=ktnef
-version=21.12.3
+version=22.04.1
 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=d496cc88668646b9b4c13a07de26e1e82bd5dec973737001717d52856c48c9c6
+checksum=8938f4940ef6c65c67da761d1fe6e17bbcf36b37c4704bf6fff0f105258af6e6
 
 ktnef-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 018cbf23351c33c37dbad15a627464ebcb2e62ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:20:59 +0200
Subject: [PATCH 2512/2561] ktorrent: update to 22.04.1.

---
 srcpkgs/ktorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktorrent/template b/srcpkgs/ktorrent/template
index bf45561f7890..48c693f7284f 100644
--- a/srcpkgs/ktorrent/template
+++ b/srcpkgs/ktorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'ktorrent'
 pkgname=ktorrent
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_SYSTEM_GEOIP=ON"
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/internet/ktorrent"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ktorrent"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktorrent-${version}.tar.xz"
-checksum=ed97d2d4b58c8305cac04067988514442711447215d7e255816d92b918363d08
+checksum=f359d69fd8fd9125b2738d72c55a2ee286556b5c1fd25a0c8fdda1ffda08d8b2
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 6e08ad3dd9f5f32a4efc53326425d2b62d6533a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:01 +0200
Subject: [PATCH 2513/2561] ktouch: update to 22.04.1.

---
 srcpkgs/ktouch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktouch/template b/srcpkgs/ktouch/template
index 09d394c0760c..cd47e20ca075 100644
--- a/srcpkgs/ktouch/template
+++ b/srcpkgs/ktouch/template
@@ -1,6 +1,6 @@
 # Template file for 'ktouch'
 pkgname=ktouch
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons kdoctools
@@ -16,4 +16,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/education/org.kde.ktouch"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ktouch"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktouch-${version}.tar.xz"
-checksum=cd0ab11fff7cb03c40569f9cdcdef9db723044b87372bb2126baeb82f20b2072
+checksum=52cf92c131b75662c27d936a5811f1af13e428766deb4823df766cc07a3ae367

From 125ae62d0d56a04abba41acfce29959161e7c351 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:12 +0200
Subject: [PATCH 2514/2561] ktuberling: update to 22.04.1.

---
 srcpkgs/ktuberling/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktuberling/template b/srcpkgs/ktuberling/template
index 6fe6ec899db7..10b831fcde39 100644
--- a/srcpkgs/ktuberling/template
+++ b/srcpkgs/ktuberling/template
@@ -1,6 +1,6 @@
 # Template file for 'ktuberling'
 pkgname=ktuberling
-version=21.12.3
+version=22.04.1
 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/games/org.kde.ktuberling"
 distfiles="${KDE_SITE}/release-service/${version}/src/ktuberling-${version}.tar.xz"
-checksum=4fbffaeff31ab4c28919a825504f15dc90f89aa249e579bd7fcf265990b09aab
+checksum=4522ad76f14d82baff654556d9ef9be0b90d460e586a983e51cb13d7715139ac

From d7eee1b99ccaa11c70cc83b9671f126970bf1eee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:14 +0200
Subject: [PATCH 2515/2561] kturtle: update to 22.04.1.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index f3be87556605..2914d16c6711 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=fd42b1380e7e46d6c1e5bc4cbe538edcf9ed9bfc5abf54141393adc28fe38427
+checksum=15c6c08d2539e22d62524d0acad713397ddfce7fb7275a8b99eb76ea87c043bf

From 6e25f08c0618ee307e4265f66ae6c7af490ffe5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:15 +0200
Subject: [PATCH 2516/2561] kwalletmanager: update to 22.04.1.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 902061e38dca..47d52d3a5f8c 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=d33824ae0abc7972fed9d7dad6acea9f67e7274ee5b15c0bb1df72b1a24aec17
+checksum=289e181b2dadb9e2b1068e5ab9e844d5a99d05c6d83f47e492524befd2f70e5a

From 53e6e4b9960b82ff7d6f8df4194f4a635081653a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:16 +0200
Subject: [PATCH 2517/2561] libgravatar: update to 22.04.1.

---
 srcpkgs/libgravatar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgravatar/template b/srcpkgs/libgravatar/template
index 3319038eeb7d..15d0b46671b2 100644
--- a/srcpkgs/libgravatar/template
+++ b/srcpkgs/libgravatar/template
@@ -1,6 +1,6 @@
 # Template file for 'libgravatar'
 pkgname=libgravatar
-version=21.12.3
+version=22.04.1
 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=076ed85282b04eee4960072bf5ffaca514bb24f61510af9a3a8c3fe5daf030ae
+checksum=d6bbb3c449585a881fa49ca82d5ad9d189aabb7b698ca9d59e07ce3e2a14c53b
 
 libgravatar-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 5b6ebb4ae6ea8afa7c3833c589a998a934ee9972 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:18 +0200
Subject: [PATCH 2518/2561] libkcddb: update to 22.04.1.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index fbcc0153671e..23746ea0d697 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,7 +12,7 @@ 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"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=ddc91cc5112c5a749fccf18bb9a6b169279f6d5658fed3b4d60646d9ccbb0775
+checksum=10538a73e7e463fb8a7e98f4b43be6c995932402ce4f79345cc5b7779cc30b00
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From bbdcb526ec75abc2820458c64948f3f5768791d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:20 +0200
Subject: [PATCH 2519/2561] libkdegames: update to 22.04.1.

---
 srcpkgs/libkdegames/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index 7aafa5cf73fd..50767058c213 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=4dd8d80dbfd2806d420bb6efc2df64a175e8273d9ea34b9c61a0a7daae342e76
+checksum=0ce94753c590ac4019b3f11ca0b4de83d8bb0dc619de15fc73be7f3a820fd9e0
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 2285bea597b7ed436ba387ae09ce6d34bede706c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:22 +0200
Subject: [PATCH 2520/2561] libkdepim: update to 22.04.1.

---
 srcpkgs/libkdepim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdepim/template b/srcpkgs/libkdepim/template
index 72b396350b3f..a86488439dfe 100644
--- a/srcpkgs/libkdepim/template
+++ b/srcpkgs/libkdepim/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdepim'
 pkgname=libkdepim
-version=21.12.3
+version=22.04.1
 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=9c579e68c7686862988b9baf43a34e5952b2d00033b01e80c53e3959bee9323d
+checksum=963bbeb53f34576354fe5e040e79de80ea536dec342ee59058716b2708f74174
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 8109aaeb0326ed79e952672d3323f05c7cb55476 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:23 +0200
Subject: [PATCH 2521/2561] libkexiv25: update to 22.04.1.

---
 srcpkgs/libkexiv25/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkexiv25/template b/srcpkgs/libkexiv25/template
index ef84c329eb32..2eac31dc6f9f 100644
--- a/srcpkgs/libkexiv25/template
+++ b/srcpkgs/libkexiv25/template
@@ -1,6 +1,6 @@
 # Template file for 'libkexiv25'
 pkgname=libkexiv25
-version=21.12.3
+version=22.04.1
 revision=1
 wrksrc="libkexiv2-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Denis Revin <denis.revin@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/graphics/libkexiv2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkexiv2-${version}.tar.xz"
-checksum=491496b277fb3bebf17b1f2488fc8e905e08f888415edc4dcd26039e53335564
+checksum=376f38b3391f7a14e9ee1f41e97270b9003227c76ac5c4a9a3eb50d6075ed5da
 
 libkexiv25-devel_package() {
 	short_desc+=" - development files"

From 27a29dd0595450b4b6293eddc0374f360e9bf3eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:24 +0200
Subject: [PATCH 2522/2561] libkgapi: update to 22.04.1.

---
 srcpkgs/libkgapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template
index 0ed84474492d..3d6c363a21ee 100644
--- a/srcpkgs/libkgapi/template
+++ b/srcpkgs/libkgapi/template
@@ -1,6 +1,6 @@
 # Template file for 'libkgapi'
 pkgname=libkgapi
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-host-tools qt5-qmake python3
@@ -11,7 +11,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=5d06d1c4712991cfb7c51ff0f36d22a1d9078e38a9ea4552cd31cc6ad04173ed
+checksum=94e05f3a289b2a3db3d7119ea95063dcba0636a4ce148ea9913eeaf5051b0a9f
 
 do_check() {
 	:

From bc56cacdd78aa2795506d1a6b5418a743a2e0e34 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:26 +0200
Subject: [PATCH 2523/2561] libkipi5: update to 22.04.1.

---
 srcpkgs/libkipi5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkipi5/template b/srcpkgs/libkipi5/template
index 9355ee5134c9..32fb835efab2 100644
--- a/srcpkgs/libkipi5/template
+++ b/srcpkgs/libkipi5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkipi5'
 pkgname=libkipi5
-version=21.12.3
+version=22.04.1
 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=ec21153b3237c4f8a0bb9ce58498ae92d7e7d0362167772bace872d94ce45370
+checksum=ef15b74fed59d10dd584e452925027d927eeb7b738569089cb8da21b1e9c9afd
 conflicts="libkipi"
 
 libkipi5-devel_package() {

From 9124412d05d46aba561db14df0311ac471d2c0f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:27 +0200
Subject: [PATCH 2524/2561] libkleo: update to 22.04.1.

---
 srcpkgs/libkleo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkleo/template b/srcpkgs/libkleo/template
index 0fcab492f094..a2d797c51079 100644
--- a/srcpkgs/libkleo/template
+++ b/srcpkgs/libkleo/template
@@ -1,6 +1,6 @@
 # Template file for 'libkleo'
 pkgname=libkleo
-version=21.12.3
+version=22.04.1
 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=f47c65970564a0aeeabaa90714023d9f1f9737297900b68fbf5a81d8281201a7
+checksum=96d6058bab59c4b807548443d20dfc950f0a916c02aa84a96bf46ea2ecfe1807
 
 libkleo-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 16f8b8092cd9a2c5234c31cf3d73206e3878e292 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:28 +0200
Subject: [PATCH 2525/2561] libkomparediff2: update to 22.04.1.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 5f3b036be599..fcf4ae52ffd1 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=9c9ff478d4e31cc0b0dc980238956d92f683e6ff55dc1c6b67e3212c7e7e0711
+checksum=e404db3115a2a669edd3010dcfd2b45b140481c8b98be9df08fae11d8a0ce33f
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 2a2b9c23445b07c1259ecb7e063774582c441f50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:29 +0200
Subject: [PATCH 2526/2561] libksane: update to 22.04.1.

---
 srcpkgs/libksane/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksane/template b/srcpkgs/libksane/template
index b3978c672174..42205caeb79b 100644
--- a/srcpkgs/libksane/template
+++ b/srcpkgs/libksane/template
@@ -1,6 +1,6 @@
 # Template file for 'libksane'
 pkgname=libksane
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://kde.org/applications/graphics"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libksane"
 distfiles="${KDE_SITE}/release-service/${version}/src/libksane-${version}.tar.xz"
-checksum=ef8b823a11de933023061641627ab94b802d745ce5310c97469840ed09122232
+checksum=bb755d27682b0a0f4b23af8267165822bf5cad09c03cf24429d8f8b23b226480
 
 libksane-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 8d1cd48f0b0f5ee604847acf65ecc40a54ffa2f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:31 +0200
Subject: [PATCH 2527/2561] libksieve: update to 22.04.1.

---
 srcpkgs/libksieve/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksieve/template b/srcpkgs/libksieve/template
index cc0665cfda23..eaa9b59f997d 100644
--- a/srcpkgs/libksieve/template
+++ b/srcpkgs/libksieve/template
@@ -1,6 +1,6 @@
 # Template file for 'libksieve'
 pkgname=libksieve
-version=21.12.3
+version=22.04.1
 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=6d1faf32d2ae9e90b71590f77acc85fa77d2a4ae38088549257675e30b6329d2
+checksum=3dffbb22fcae637c6c458dfea69cd2ae840a79d9dc72ba4af6b2dfda0b8fd71b
 
 libksieve-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 6083f77a4429926269fc63f5e109cb46b8d3eec8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:32 +0200
Subject: [PATCH 2528/2561] libktorrent: update to 22.04.1.

---
 srcpkgs/libktorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template
index b238683af76b..787e5a7c40ee 100644
--- a/srcpkgs/libktorrent/template
+++ b/srcpkgs/libktorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'libktorrent'
 pkgname=libktorrent
-version=21.12.3
+version=22.04.1
 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=80cef9619c0ea9079f6ad351f9fdd81d363d40eeb32f4cef7a83e995a8322745
+checksum=57dd46edc9e10127bca69104b0288bdfa5f1dab261f89d8fa4b2161ab7e7ddca
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 1198410a84b2343cfb5463939500cf790009a556 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:34 +0200
Subject: [PATCH 2529/2561] mailcommon: update to 22.04.1.

---
 srcpkgs/mailcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailcommon/template b/srcpkgs/mailcommon/template
index 55ac94f2da05..b5267dbffa16 100644
--- a/srcpkgs/mailcommon/template
+++ b/srcpkgs/mailcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'mailcommon'
 pkgname=mailcommon
-version=21.12.3
+version=22.04.1
 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=4e8dcb2ece18dfca8e219838d85d8e402cb353e6a2ca8fa9d79bbcb4e1fc28fe
+checksum=5ac134dc7d4ff1c03fd192ff1f709a9839187a7bdd66b6ef033909730d95da75
 
 mailcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedpends}"

From 10b1fde03108e75841f989f3d7560f7f736f253e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:35 +0200
Subject: [PATCH 2530/2561] mailimporter: update to 22.04.1.

---
 srcpkgs/mailimporter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mailimporter/template b/srcpkgs/mailimporter/template
index 77c51b937fa7..5161c5cc317d 100644
--- a/srcpkgs/mailimporter/template
+++ b/srcpkgs/mailimporter/template
@@ -1,6 +1,6 @@
 # Template file for 'mailimporter'
 pkgname=mailimporter
-version=21.12.3
+version=22.04.1
 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=53dbab7697658d38dbbf6e7f31fbe97a88fcad1ca3a77cb540ce04d7fe4f9951
+checksum=866c77c85dbae71f7c6a3bac43d8fd19f1865155955a936660f7ba14d7a3f39d
 
 mailimporter-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From cde611e6c45a62dd440a2c37e5c4a691072fa7b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:44 +0200
Subject: [PATCH 2531/2561] marble5: update to 22.04.1.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 841cb976ad1d..702f8bfb99a8 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=22.04.0
+version=22.04.1
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=eb39219936b387dae4743638fe8ac5cf7f5654f4b4aff06a7c7b67e177799962
+checksum=359b14486376c387e990eb4836b058495e03a69791bbafd560f1034af0b9b857
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From a5d88baa5f72ecc6bc5c05acba05971409c1a3ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:47 +0200
Subject: [PATCH 2532/2561] messagelib: update to 22.04.1.

---
 srcpkgs/messagelib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/messagelib/template b/srcpkgs/messagelib/template
index f0ed61466d50..7e9a45f1d13e 100644
--- a/srcpkgs/messagelib/template
+++ b/srcpkgs/messagelib/template
@@ -1,6 +1,6 @@
 # Template file for 'messagelib'
 pkgname=messagelib
-version=21.12.3
+version=22.04.1
 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=5c57b5d7fcabaf8030f609e1458bc8d0ad436901a5ef45cff83a470cd5b43077
+checksum=a8029e5c87b67980952850c84a92a80604b8bf98159096576acfbafdfc2ddf46
 
 #TODO: fix build without qca-qt5
 

From 24ab32dc12040da2e63e5117560a44913fe1fdbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:49 +0200
Subject: [PATCH 2533/2561] okular: update to 22.04.1.

---
 common/shlibs           | 2 +-
 srcpkgs/okular/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ee2395bc2b07..8f5670e21484 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1777,7 +1777,7 @@ libspiro.so.1 libspiro-20190731_1
 libopenjp2.so.7 libopenjpeg2-2.1.0_1
 libcln.so.6 cln-1.3.3_1
 libchm.so.0 libchmlib-0.40_1
-libOkular5Core.so.9 libokular-18.04.1_1
+libOkular5Core.so.10 libokular-22.04.1_1
 libmnl.so.0 libmnl-1.0.3_1
 libnftnl.so.11 libnftnl-1.1.2_1
 libfcgi.so.0 fcgi-2.4.0_2
diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template
index 0933595722c1..fba4e72d0f84 100644
--- a/srcpkgs/okular/template
+++ b/srcpkgs/okular/template
@@ -1,6 +1,6 @@
 # Template file for 'okular'
 pkgname=okular
-version=21.12.3
+version=22.04.1
 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=63314864b1975b16ffadcce7c19b2ee4ae5477739639cfac165d4eac71fb9914
+checksum=cee20b2df2828728e9208406c9dec7a96b33a10eaac7b26c35788009e077163f
 
 do_check() {
 	cd build

From d38601e4cb873aa7ed5e29da5594fb5b3be77cd2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:51 +0200
Subject: [PATCH 2534/2561] palapeli: update to 22.04.1.

---
 srcpkgs/palapeli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/palapeli/template b/srcpkgs/palapeli/template
index 8debf3cedc2a..bc4908e81a6d 100644
--- a/srcpkgs/palapeli/template
+++ b/srcpkgs/palapeli/template
@@ -1,6 +1,6 @@
 # Template file for 'palapeli'
 pkgname=palapeli
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kdoctools
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games/palapeli"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#palapeli"
 distfiles="${KDE_SITE}/release-service/${version}/src/palapeli-${version}.tar.xz"
-checksum=0f55a6f34867b6e10df956061df25c9211181111e92cd91d2ca5eb84287ed11c
+checksum=ba116943e9f42983ca71104ae637526655759f0900d9deed281029021e060da9

From 73ab464d211e2afa63deff2a66197c9d550f0569 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:52 +0200
Subject: [PATCH 2535/2561] partitionmanager: update to 22.04.1.

---
 srcpkgs/partitionmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/partitionmanager/template b/srcpkgs/partitionmanager/template
index 335ea8f8f4f2..81b9559cd8e5 100644
--- a/srcpkgs/partitionmanager/template
+++ b/srcpkgs/partitionmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'partitionmanager'
 pkgname=partitionmanager
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
 homepage="https://kde.org/applications/system/org.kde.partitionmanager"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#partitionmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/partitionmanager-${version}.tar.xz"
-checksum=37c0b3e4c8252bd743e9540c219adb3d595704e042e2c7f63c8b3dbbf41e1374
+checksum=5620d9a193ddd5675d4ca3d01a4632f2d5ed9fc9870d50e7c394adf5fda6d722
 
 if [ -n "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 4cd4cfa7c8ddd9d9c68172fc0a2386dbfb5e9d35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:54 +0200
Subject: [PATCH 2536/2561] pim-data-exporter: update to 22.04.1.

---
 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 2f83487e9798..7a55eb8f98ed 100644
--- a/srcpkgs/pim-data-exporter/template
+++ b/srcpkgs/pim-data-exporter/template
@@ -1,6 +1,6 @@
 # Template file for 'pim-data-exporter'
 pkgname=pim-data-exporter
-version=21.12.3
+version=22.04.1
 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=b8e0cfaec06eeb26af7d08d3b0932fa3721ec8b83761e84a604fea4fd6d29c61
+checksum=71bde8eb1fde57087a20c63c38b4d774f93f580b7f3a356196b3fb77f0da6b96

From 342338dc61a996eccdbc6ac3223ca361715f03f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:55 +0200
Subject: [PATCH 2537/2561] pimcommon: update to 22.04.1.

---
 srcpkgs/pimcommon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pimcommon/template b/srcpkgs/pimcommon/template
index 30ba3411e0e3..f8cd8e62ec0e 100644
--- a/srcpkgs/pimcommon/template
+++ b/srcpkgs/pimcommon/template
@@ -1,6 +1,6 @@
 # Template file for 'pimcommon'
 pkgname=pimcommon
-version=21.12.3
+version=22.04.1
 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=27148d059cb6d55d523ec594e66c6a5ef4d475d75ad8eff9a3e7884c01082dcc
+checksum=2a94cdd9e4340a9ed0a793191b87bd50502683b5480db3dae9f360298fb48106
 
 pimcommon-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 38207ae2f448e5340a0ca355085fb89273d123ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:56 +0200
Subject: [PATCH 2538/2561] print-manager: update to 22.04.1.

---
 srcpkgs/print-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/print-manager/template b/srcpkgs/print-manager/template
index 8a86ae55f9d5..a534cb9f2811 100644
--- a/srcpkgs/print-manager/template
+++ b/srcpkgs/print-manager/template
@@ -1,6 +1,6 @@
 # Template file for 'print-manager'
 pkgname=print-manager
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/print-manager"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#print-manager"
 distfiles="${KDE_SITE}/release-service/${version}/src/print-manager-${version}.tar.xz"
-checksum=0b6dd52a7f1b1aabd95202b4cce227dba719fb51187506072a75479876d93be1
+checksum=f49c063ce442070f386fb1bb480a0c8450184f6c83274205155cff0f6e72b879
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DKF5_HOST_TOOLING=/usr/lib/cmake"

From bcedfaced301e7d3e48ea2a32388efea2adcf1f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:58 +0200
Subject: [PATCH 2539/2561] signon-kwallet-extension: update to 22.04.1.

---
 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 4361bac6029b..0adf1226c20d 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=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=33d19b1b758a21e568ce508cc168e568e34716f148cd83e214fb8a3f3194d2e8
+checksum=2cecc13cf9316f0697542894f0995ee3bde358ee503c153e0a9072e3df1bd08e

From ded1debdb388c2f9e332ec9dd7d4f8bac70f704b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:21:59 +0200
Subject: [PATCH 2540/2561] skanlite: update to 22.04.1.

---
 srcpkgs/skanlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skanlite/template b/srcpkgs/skanlite/template
index 1051d91a4943..d90d0b902f06 100644
--- a/srcpkgs/skanlite/template
+++ b/srcpkgs/skanlite/template
@@ -1,6 +1,6 @@
 # Template file for 'skanlite'
 pkgname=skanlite
-version=21.12.3
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/skanlite"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#skanlite"
 distfiles="${KDE_SITE}/release-service/${version}/src/skanlite-${version}.tar.xz"
-checksum=77e09cee9f57e8bda4905d358ecf296528df8ad73c93f722c6ec689d65abbc19
+checksum=69f7fe0850459c5f81767b4d3ba4d60ffcb3e495d9a2eaf1461bb95b56f013c8
 
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kdoctools python qt5-host-tools qt5-qmake"

From b5e7d2da995b25427c2f1473ca11794e829d157a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:22:01 +0200
Subject: [PATCH 2541/2561] spectacle: update to 22.04.1.

---
 srcpkgs/spectacle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectacle/template b/srcpkgs/spectacle/template
index ed5805b3279c..a5a0344ad34e 100644
--- a/srcpkgs/spectacle/template
+++ b/srcpkgs/spectacle/template
@@ -1,6 +1,6 @@
 # Template file for 'spectacle'
 pkgname=spectacle
-version=21.12.3
+version=22.04.1
 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=5b0ffca9ea43f5ffebd5c2d12090f0d81a9014742a20b1b806594e6a848dbd94
+checksum=335bc9ab70966d23bdd09614c373d73cf0d8ee09788b22637d5717919e443884

From d91561ad4c00c502a5bb1b7e1451bd707ec27237 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:22:02 +0200
Subject: [PATCH 2542/2561] svgpart: update to 22.04.1.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index a0b9d95a6ce2..a1d9cc612e30 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=923bda29e6610fb4dfd2b4f98e14045271c099ab1ed3988d52fefdc0b408df9a
+checksum=5e5b9314e06798177a3b4ada63236cfc6b65e229153b83b69a8c2699a6b8689c

From 576f4364cc17bc23614b2ed542e482a5c810be20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:22:04 +0200
Subject: [PATCH 2543/2561] umbrello: update to 22.04.1.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index da2757161229..d06ffb898648 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=f4f681daedbefdeb0e6b0da0fd718c20031491d3b088e0523ff5bbfab3de72d8
+checksum=bf2d65a6a1d08f695b3ca29c902e4fc52917870cd3d161b3a478e77b021f5306
 python_version=2
 
 pre_configure() {

From 2b53a78a12a256a6dd1c6690634d2ca7239b5e7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:22:06 +0200
Subject: [PATCH 2544/2561] yakuake: update to 22.04.1.

---
 srcpkgs/yakuake/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index dd56e9afefb1..1b8ba024c853 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,10 +1,10 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=22.04.0
+version=22.04.1
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
-makedepends="knewstuff-devel knotifyconfig-devel kparts-devel"
+makedepends="knewstuff-devel knotifyconfig-devel kparts-devel kwayland-devel"
 depends="konsole"
 short_desc="Drop-down terminal emulator based on KDE konsole technology"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=b7f96b48fd5baa75dd8fe53c8886f8cb0628f6a77a33232dc5bf06f45f6b2006
+checksum=53389837706aa62d56d3965bb846b435fc15a3083e3756c75a25aa86ee65c1b0

From 1efdc38124eeec90359e2ff118a3fab4dbbee4f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 01:51:47 +0200
Subject: [PATCH 2545/2561] plasma-wayland-protocols: update to 1.7.0.

---
 srcpkgs/plasma-wayland-protocols/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-wayland-protocols/template b/srcpkgs/plasma-wayland-protocols/template
index 2d8978e4a14c..ec9540317fa6 100644
--- a/srcpkgs/plasma-wayland-protocols/template
+++ b/srcpkgs/plasma-wayland-protocols/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-wayland-protocols'
 pkgname=plasma-wayland-protocols
-version=1.6.0
+version=1.7.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules"
@@ -9,7 +9,7 @@ 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=b74ffac969ef067e47180e748a67a3a1816b7157ff4ea620ed4432f59b70f01f
+checksum=084e2685caa61d94c6fe86dce006b22474d7bb4b34c4cb96bd763b97e305fad6
 
 post_install() {
 	vsed -e '/NOT CMAKE_SIZEOF_VOID_P STREQUAL/,+5d' \

From 59492d84bb83c62db84feded0011a0868b4477d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 15 May 2022 11:27:35 +0200
Subject: [PATCH 2546/2561] calligra: rebuild against libokular-22.04.1

---
 srcpkgs/calligra/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calligra/template b/srcpkgs/calligra/template
index 89d0b1648e9e..7c1411bf3da6 100644
--- a/srcpkgs/calligra/template
+++ b/srcpkgs/calligra/template
@@ -1,7 +1,7 @@
 # Template file for 'calligra'
 pkgname=calligra
 version=3.2.1
-revision=6
+revision=7
 build_style=cmake
 configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
  -DBUILD_TESTING=OFF"

From 5ee5f44b08a0b4d284e18db27b8345d812077baf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 16 May 2022 07:51:09 +0200
Subject: [PATCH 2547/2561] dolphin: update to 21.04.1.

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 70df61b65c45..2cfd8607589a 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.12.3
+version=21.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=5812238be9a4ee204e864cd30166285af599c6478eb9ce53cf9a552091c2b654
+checksum=292377aca0454189186d4046ed69785d7fda672270362c3b538a001c9daa826e
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From 2ea3cd622ab26560a3e4bb57839f349fda28f4db Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 May 2022 12:56:18 +0200
Subject: [PATCH 2548/2561] New package: bzip3-1.1.3

---
 srcpkgs/bzip3-devel    |  1 +
 srcpkgs/bzip3/template | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 120000 srcpkgs/bzip3-devel
 create mode 100644 srcpkgs/bzip3/template

diff --git a/srcpkgs/bzip3-devel b/srcpkgs/bzip3-devel
new file mode 120000
index 000000000000..c336c0baa420
--- /dev/null
+++ b/srcpkgs/bzip3-devel
@@ -0,0 +1 @@
+bzip3
\ No newline at end of file
diff --git a/srcpkgs/bzip3/template b/srcpkgs/bzip3/template
new file mode 100644
index 000000000000..b7de15d1c2ec
--- /dev/null
+++ b/srcpkgs/bzip3/template
@@ -0,0 +1,22 @@
+# Template file for 'bzip3'
+pkgname=bzip3
+version=1.1.3
+revision=1
+build_style=gnu-configure
+short_desc="Better and stronger spiritual successor to bzip2"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/kspalaiologos/bzip3"
+#changelog=""
+distfiles="https://github.com/kspalaiologos/bzip3/releases/download/${version}/bzip3-${version}.tar.xz"
+checksum=9ee90e5b07a81e581515a89e263917f1738d8d28dbec05b3ded4524c79977c3c
+
+bzip3-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.a
+		vmove usr/lib/*.so
+	}
+}

From 36f6606cd98425f48963188191adefaa616fb0ab Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 16 May 2022 14:20:12 +0200
Subject: [PATCH 2549/2561] zsh: update to 5.9.

---
 srcpkgs/zsh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template
index 1a1d9d9a4755..44550da3b66e 100644
--- a/srcpkgs/zsh/template
+++ b/srcpkgs/zsh/template
@@ -1,6 +1,6 @@
 # Template file for 'zsh'
 pkgname=zsh
-version=5.8.1
+version=5.9
 revision=1
 build_style=gnu-configure
 make_build_target="all info"
@@ -22,7 +22,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, GPL-3.0-or-later"
 homepage="http://www.zsh.org"
 distfiles="http://www.zsh.org/pub/zsh-${version}.tar.xz"
-checksum=b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919
+checksum=9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5
 register_shell="/bin/zsh /usr/bin/zsh"
 lib32disabled=yes
 conf_files="/etc/zsh/*"

From 8aa5d37c5358c0912478928ff6845af4e257f824 Mon Sep 17 00:00:00 2001
From: Johannes Daniel Nuemm <daniel.nuemm@blacktre.es>
Date: Fri, 18 Mar 2022 15:16:53 +0100
Subject: [PATCH 2550/2561] firefox-esr: update to 91.9.0.

---
 srcpkgs/firefox-esr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index a3d95e10b2cb..e259184e0247 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=91.6.0
+version=91.9.0
 revision=1
 wrksrc="firefox-${version}"
 build_helper="rust"
@@ -13,7 +13,7 @@ license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz
  https://github.com/chmeeedalf/gecko-dev/files/7729086/esrppcjit.tar.gz"
-checksum="7e802832152c39588b9a5c8392e90c1b00036bf948fa4a97a7af0d1435ba09a1
+checksum="b4beea934c2ff67d93539c0a4a563f7c5fb8e2d231b05f082b1d8a73ee54ba9c
  5e926a8be5d6d4949c3bc3eb98e2103692eaa26a98928db432b1d44b535f7241"
 
 lib32disabled=yes

From 2f60fdeedfcca759bd9595e585c49bc06312bdf4 Mon Sep 17 00:00:00 2001
From: Johannes Daniel Nuemm <daniel.nuemm@blacktre.es>
Date: Fri, 18 Mar 2022 20:32:13 +0100
Subject: [PATCH 2551/2561] firefox-esr-i18n: update to 91.9.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 6abafa19b37f..ff444f584a28 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=91.6.0
+version=91.9.0
 revision=1
 build_style=meta
 short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
 	}
 }
 
-checksum="26e349c4fce1e45bc461211fc99777e896e452649972e99bec1bd07c4d902f42
- 076463b82bb48b0a7f4ab030af3d0123a73140e3d01d01e9ddd61bc43ce642da
- c54688e23c96524c24ecd3ba896186003f6395f265283d8df0d6e0680f03e57f
- e442e5194859b2aa6ed2b931827974f2b325f7d2b496ca483d6a6d6e03fdcc3e
- 5c8761c72e7e260d69f3d0d9e5af87faa9c4c64d5bf936cdb18af59154070d3e
- 831c20161bf4d27448eeff447b0777cc9d9444e00e692f5612d25eca4d63ff16
- aae556cecfbb89918644b8a0a5d6517e89c22a2a6d1f81bea50d15d3d84b46ef
- 672a064959a60a99863552368c2547171e0a19a1d2a8e367e7bf510ada4f4de1
- fbc1b076abcf18184239cbde2e668d5437aa973ab2d610db7eff7af5e9c38ce1
- e041427003cb3cdcae0c01d0cfed0b30ed5e382a7e03d497ee3bee5ee689d090
- 395ee2ce266d96188d91a4580608326e877a3aef7c547b2af25ee42ac8338840
- ad334efd5ae9b95bdf9bc3738769535a06d8953864d67b187b8fd9d64c19f351
- 50213a9f6c2f32ffce964ada97c335d2aaf6bc022fe0ce2de27cb5b81ca1f5f9
- 0e37238869cf1746cde69b1dd0440b31a771bdaa47f6ddb844e960c64379f93a
- 7f6c48b5e89d3eb60920251c2988870f6e33e9fef36e48f44c35cf4b0a8851e8
- 959de89d58feb1e90ea2c12d02b44de9854a4deaa292d70068de6692a9398e31
- fd197b8191eabd69d1ecf1033e5a19d5420334eb3d6cf085a7fcc734a7f5f59d
- 684dbe393b4b01a7195dbfa1b5adb7bff308b88efc7ca92a1e0717d1e9082f3e
- badcd1fb341fd10d63398d765f75cf86029cf99549ab86eaa1f946d958e215b8
- 2cb08b847596e919a159eebb71d16731176156402f4282a0d7f3ea304bd038a1
- a06b9980e16492776e6dd2bb7323b362172e428a6e9309280dbce3d61bbd8dfd
- 5591a3f1b44af4d2aecbeba96ca40e02eeb368139c1ca060fdc2f8d1db490e36
- d95ebbf6ef473a7985346826bae396f49f1b0658d2bea3e608a6f86df017eb3f
- 54f512380853e88bfe8586135d6e1e5284bfa0765e2785971ba40129ee92c4e4
- 30c98ea5192bd5d0aefea9f93a2565ddce0534df4311fe27451e847232a978b5
- 6ef84347128571d9129ca238cdd88ee07cd4a05ea6c031c55a9499fb053af66e
- 4c30f6dd5fc7bf48032f04fe9433f717981a4bf2d2048c5e2cbae7b77f987f71
- 07139a074668572406604b6fc89d6426e0bbe653c6057b1f17b4ebd53f3127ad
- 2da9a5038bca016401e2c827a00812fc15fdcbfbc24e37b29b3a47fcaeeafad0
- 4a01835e6c6c7d8a298f54ab68c5c5d5815eec83bd651ce638697cf4f3b4af13
- 62db35ed290f007b5bebed9157d5dce24eb9cfaef6c7984444e2e5bbd57ef8b9
- c6c0a855a5d0356a8c576503be0500a311b81c5889e6d2eea9e3427bba39c8f6
- dcf7413fd9784a141720c0b5200fc46e33cf62b6e7189b2e2283052a4ce1c05f
- 6e6c2abb5f57095c416402a25d2be8dfac6c43713d3a7c34e4ef5854e49eea9b
- 9b9eb4f38ea40993890be5152f58221ff6a91742fad48e491f3d5610ab7a2258
- a6eb93ac5d2f6e3d06d3181794e6fb75ff99d9efafd0787813d2c072a684cc53
- d4ee6c181affa0404321fdd40b59b25b35aab10a87016ff262b0e8c9d69dd943
- b268a39f6182b32f9a122e0f50103ea8442b380a28476356ea235413120ffd91
- af308bc769012d9a909635daa79eac5bd11f8e55ffc78e4d6508dc51787c2adf
- 6031a2ebf4000f14cacb9f44faa6eb623d08d1ba7313bba71c95eef4f626562d
- 1195b4574c1c2b2c97742518187a3bca8acad0ee8c681efc9b90a068541a8f47
- d98320c38922ddb2984739726027bfb9de1a293c9c23a3b2405ab6eac1dd76b4
- ea5664de8b25e2b71276c3e21ea653b17969a8e514c791e439b2778975719e31
- 98ffbee7305778a0c76bb87e13b035b35fdd2c327dea9680b59cdb6151afc39c
- f75cf5a40464f6a4d68cfd5359cba5a26b3af9dc98d58329c41815eaf09ef96d
- 43b2f23ec429350eb43e55b6bb86450caa6bbc225e238252d748c201b6047435
- b4da39d2d04f63f6976ec152eff73db33917d22d6cee8f9796fa3e412f343369
- 17df7e3aa5a7820783781dcd3cff7ac67c6928e8dd24cda12f863dc0f244b9cb
- d5a5ec172b7f7b419d959312ee4f7188fd8c9d375930efba9587d0044b8ce3e4
- b25d34adb7b3c2e766da82602d5333534d71f73a7e2ef7289672f57f572a0cb5
- 7aeb7c6f0bc2703333d9725b9d6c46402945d387c089ac5df547cb57792f4238
- 3efa8cd779922500be67ff2649b48094273a4f6f2b971a25f6b686381578610f
- 4cfb95c8e62d9585ee11f5c0abd1198a8608347f4df1713c79372ba421b8f822
- e223b9d0b43fa8be974cfe09dccf881eb8b380229397cc0db2365b907dbb9602
- 30a6ef94763f5a7da8b0eba094d6689dc3dec4f5f0109145df4a081bfaa3d275
- 0a6b335ca4adfd53d7a7a3895df34b58fff7516388c52066492b717d9cb22a76
- 6350b5513131aa60858463bc0b34028b1ed965d1cb101ae77cab6b6e82b4ea8a
- 8e5d38a1bcc687b7bf838a8551ed01d6f8364d6e6d525989d354c19ab8fa5e13
- 576fcdf1610c839b19ac67d62908a246603755c714295b4597f57dd21f9998fa
- b689df1c96b238807a23be81e7bf3c90e8dfce93a000bcad6f62ba6b68c81947
- 48d49f4823c0416d17a8ef7ceade4b6308c1c9e1d64fd3ae73ca08bcb8b0de21
- 88268b81d50bea3189a738569e21360799aaf3235241aa7a7066b4a90c6bcda5
- 8973c7be7aace97d90c57651298254d484d57a88f9703ce96b3044206f0832f1
- f9e31af49fecb071f5b8fc818d1916c2b58e64a7d02507150dff176733573fea
- c3be99b059b88534930fc795bde952318dd766caa82354c43201fa4892c311ac
- 56e3718d4b5a8bf70b5857433cb97f228663728636cd6edd3e4e59e59a7efd19
- cc77ab370e68487e6909bf3fcebb17bdd200c3bcc19a32a36e2c72d1417e463b
- f0be0fe4dfc36bd95675643d37494747437bf250b82a65832dd6b11bc4e99490
- 05578860c05cb4a688fdec57f5720aa641d556257dc3c46b7530c31f57f4d174
- 66c3085c1d0929d3478da66fc383b2c45bf474233802f07010ad952255c38a93
- d0cb932951b4b088e5aaf2fa4115c51f2ada1661a958324b3e0e7be4912db7fa
- 53733713343dbbde77ec44c98ef1904377eb6bb75f0d66e5e0b2f18ce3bc93ba
- 0137da4588097a1e662c3cafe77d4e0ca0fe554ab342615629d8157f0f217b4e
- 09649a9fbb2f034c8ae7c9444278b0906dd831616abc886fe3b7032045711eef
- 37a6b6168082978d9503a6c58b0ce62799f7f070b70e19a7661ca4f794e0e86b
- 86dbc3b1c659489f9563dd15e85e94357f7ceefc828bcd333345936f3dc7f2bc
- eb710163923480c1bad315b3e4eaa61f1aaab3e30f659081291b52a0e2621093
- ad7924c0a473ed3c3a89c51ebf0d09b9def9cf2ec6f38db10598266fadcd6b56
- 1f2ce18e0f9033b8a84c30b3ca1d2d771d35658995344cd8e6b8fca09fd6048e
- 5b96b615350f84a44873125a6d1abdfe76dfa3df820c4f4aebcfd36f3d2d0c67
- f74dd9356810f9d3a1dca90d53e534dc0541a7a56c3e877e5234c0f12c39f7e0
- 0d260486d46c6e352a309860364c904f1687156f24a4ec474ad04acf7c800e5b
- 50aef56fa7faced30ecc1fc370d52c5d54c6e73708ce5705d70f38d0920946dc
- aee885b8a055800c2cce6e3b0ee4f604a016818d828d88fb249011e127853691
- 39ec3fc095961fca458bb81c5586255cf8a5c20716770d1d9cf3bbdd1bfb485b
- 1e556da079a2ef106e24a039bbc510969447223799619af075c7205191700435
- 9f15c26f67c5d9d2fb0d339cbfe9c6cabb859e8675a4e3c4c797fda64b7478a7
- 6a10daecf2d1fd23592cf2ff832120688a78ccd86d9e9510090ad2d3a40628f1
- a7f287d37ec3651d68a56f3b2a9d2a22ceeb76aacef95f14bcba91ad95e9ce75
- 8974f735c60699521430d7c0bc41ad4badc15d96c0eab810bcc8a547793f17e8
- e34c02a6c1bd51bc34b36f332346fcbbeb41e7d7c6b3a4928f5864a7c89ff153
- e0f79891a14e3d811685bc4ba88803affc01ff0348cbf596fb270dc4e0f1eaa6
- 45a9ec86fe0a9ae4ecf81f1dc320353d5ba3b1a50a1eec42b4fc32e8ae2257b3"
+checksum="2bc70d0cbda5bf23e166c13eb3500904135211f3931e7f47ddeb1fb45f5bbcae
+ 6919cb6c47fe39afb7a49414241f31590c935565f972f82c0d0c7038fba26563
+ 2877b443f701a73cee387e631b8f28f42c750851a2150710334bb82015c45427
+ 6660890b4ce3629b061475532f3295e72a1b7624bd937b3bcaf83fe794f9b390
+ 887ea64a54ef264a3f35612b9e3e0b9fd40b8fd6ee0a7fa9782888406fdb43f7
+ 148c555c47a0c47cc9683e6f469a8dc29a4efb2b869296b89f6f9b84077b98de
+ 8fc6459c9de31065fbfe9e64b36dda9f0355e624f8c3d2377d25794dfdf97674
+ 81d64dda58ea8602352c324284b0d6e28ef40e697f19357c6b6a73aee8c6e85d
+ 8008231903f276c3bdeac6fd720c33c7c9617cd866791f4132b87ba2b94967ac
+ 1fd22e04b47ccdfbce50f2c0ad312473e9fbeeed14316345ebf8702a2e0c0f9a
+ 27f4f5d115c0ae796ac348da5162bc3861204e3ce50414035f2d480dcfd0668f
+ 02d1e040d0c8e84abacf617ec41b6e128a15c1b88eb038a432da2b8fd3c194bd
+ ebf2d34382902b810ab46374df7e31e893520fe9751415d5fe63fec4fc775bb2
+ 993c6f8da2a00f801421e1dbd8981b67e26c4f01356c6a62177d2987c0b15cbe
+ c490d94b7595090ecd238cc1c8c84a3bfc2450ef2393bd95d954488f314f34b0
+ 530a1b09162dad6ff7fea360d232f628f1f67751e2cd21783207fc77c057464d
+ cdb58015b09a861f4b1c02d7fc9823d87974c3f4b13abd8e7c76bd249c61581b
+ 59c0ab8f08edaa9e430a5988fb1890cd3cd5a7dfa785303c8776fb6f38192efe
+ 37e221b2ccb512ead4445b2345a6527a3358075e011a58658158954f052784da
+ 580dc1641d96072ee44800af8c553eab82f158e36a0f13f795a7a51f1bb762ec
+ 9570ab68c643e612aa10818633b3d93607581d0d97ea764e0213f0b1e5769d4d
+ d2fd517a39874e8f8fb37458450db6ab496cfa1bc2baf0f71e883296bfbdde27
+ 2616aaf1722723003d91aab4e69b4381412f810a439feff4ef2a146e22d9f960
+ 21a06c320fb80e4e45b02ce8f084bcc8900764dd137e2ca4c8b7929c89e0c3d5
+ 59a6e10dedc26f6ebd7755477015d7b3e956ab34f29fd3954f12f7a4f5ee345d
+ eefd5a4d637fc86281cdbd43a06e07fbb76f8a01e9bdaff181daba5bd7cf46cc
+ fb50ad15895d27e30c54f1cc2fe848405a5c10917d3d73c71b82e1e93d658c8a
+ c04680483e96c0c8a77f07b18333b02b8dec4807de332ab77ec3a6446a866dfd
+ b38c3d132e74034d2659172f374b4eb6261b2346a705988823a9af56f906e155
+ a94238d8a7ed68b6170c49a07d8d1cc06d8c3a30b5b4746095d559856f30773d
+ 324bb76b3c95fe645796ec43962497ebb03b80b4a068e778b684fcf7a307bef0
+ 0f0df750b7e54edc132133d53d7dd9fd78fb828578d79d97097afc98b8de538a
+ e77a14ff78e90944d14439d1bb9ca5bd116a6cf71b5bf14e16d3cb593ff35b70
+ 143995923b153cbf6cc3a8d846afda70601c13ede25ef8b193db80fd9f1896e9
+ 446132041fe6f31bd5413735ca9813e86595ce35ed5fe499aae164775ba0f987
+ 0d5798050376c4b7aafc2bb78692056abcd1f441fc131591180e11647c276872
+ b2e4c9aa9452bd1af2e7fdade9752aa6019f28a2e4599bafbe9da9e9e1d5f01a
+ cdda19d8b15cf46d6c2141434969d7599ebbfb60b62b29940f52a79fd8cf072f
+ b6095ac9de172e6df5bc586afe934c327fd5602ed18aa1fed0d8ddb1387c7df9
+ 75fe7ab4377e3c212b256c3391fdff1a609d91cb58c14fd6cae453869fb334df
+ 46706eef7e7bb90fc055b002f627286c2de43ddd5a0caf2b9c06d032ad7d85d5
+ 203ca7b2bb45eb5cee5b1eeb9d24e25520379e7af1ff4aabd09ab25c5b3f3d8a
+ 2c643a1d8696037b047cc06ee0886e4696db55b4c8cacb69ce52066c35680bd9
+ b7309661250a56ed8a42619699efc8c9f8a388506ae3c5b38e5680d7c7d50f51
+ 0572d0fc5e88798a0f944e5e60e0c95365241f474ae201a85a0077d083812620
+ d52085185911557948c94e7f4f45e6ce50ad104f3031ba32e62d58b6b581df93
+ 5ea6410c8a42f3e558a3b73993e185778a3f91fcefe37dfb32881b884d9a7328
+ 67ff089e58616e50df99730c33bfa90071beff2c3715d5bcdc218a602346c8e3
+ 753cf07925bfe1c3b5fd6f2947a18b8f826d514d5c9b0d7f2d357fd033b66192
+ ab291fd924c16b7fe51dbfc06519bc9b1d02182bfa0dbd9523638c285615cc77
+ 9d31e9a493077b8c0409969e4d53102239f472467510b9dcdb7a227fdb6277a7
+ c9dc5c95b109c895c3cf0fc0f0eb46385634637bce107e000ba42a2f9b7907fe
+ 6b08f873fe1f9dc7d468b710b2dd8f3fe49138c3cdb4b4594a579d0379977271
+ ad3510d8b699dc71356f622f2e7b9c2dec12096fcf9741dfdfeec03d9382e0e0
+ 5d2afd46ea725d43357c0c9ac6d4d4db89aa9f0c49a4e1e9fc1c124390ea6e20
+ 9ca197bb00e23df520199bbbb49fe66d09e5d5741e7acbd4e93da0a642140ed6
+ 633879681627dcd34759732ceb40cf6b7f803690cd73ae7bcab39459993cc78c
+ f8830dbd04e1248220fcc7e6eba6e7903bc36dc097a4360279847fc8148df7fa
+ 2828ad3e3563ad3e4652ed19eedef1d3c96c12c295bdc1a6057302bd590da00a
+ 763cf455f806bb30eed4c8b25c3bbfdd500959b8fd0d26713f0c19b2a8429589
+ 2d84d2806ecaa9520f6d6575b6bf3f11e9431066dd133dd28882cd4b4bed3aa4
+ a70ace7c4803934c4207347a24910a4f7406b79936aa6289c2d078c174f95a1a
+ d1f0df1831f0fe552ee3b58d83740ee95dce560ecb5a595185dfbd7a11c9838d
+ 0d08b1365d603534d73fb756bd139a913c4b4042c9f40de545db56eb37dbe7d1
+ 79a49173ea82db7b36c019545adc2faafb07d6db31da1a100c7cbc61ca2c2ea8
+ 66fa26fed2113b1cb173170939a0f5376a61af168fd35fcce055078fabdb3288
+ 4b321e39baa8cebbf32ed9e53aa77c562445b9ee2504896272ed2da093f07e26
+ be1a45a7ea2f23addb28a767cb9a6a9a54cc8d8809d6ebf28a41a03d2d09ded8
+ fda6f1000b7a14b4e3200ae00597aaf0e5a0e769a1ba5af9c3b9f841e1adf534
+ 7f907551000f435586a43acc215eadf994c590fe454eef6f843949efbeb1b3e6
+ b7e58ea0c7c347e747f03531dfcdf13a2a70e2d08caaa704e4d8d0a9c139cb86
+ 8b6b6274781bfb5869bf81c0366b768e10b8642139910490adbe92658546115c
+ a70c758f52467b8f04bbda20d1cfdae79ae99a860b54e1b463d7005f267656b3
+ b0177a28695c8e2297fbda2f9fe7ccca9142fa2933d08ecfa607019f3a07e7f9
+ 23cb3211b6c66beccb8619606e62011a3aaa4a082b49abbe507d6d9ce081d6a5
+ 3af4c4f8ee80740aafbeffeec8a6a2ed3f091bd4d149f687a302e1d027bdeb9f
+ 467139c240ef5cdb8f522e04b05a1f87f82f0788ab65ee3b135b72b201f06050
+ 841fa5f1b1d810061c2f014bd942f626d30d27b35d07bc7712a323cbfbbb133b
+ 35ca0a96504d16ad7b542f457b137432737c49dbd972aea4188bb1be950d47e1
+ f837ac7a86a79db85a79b0d1acaac49fe9c18ca15072bd0dd88c70aa9d00c9ac
+ 07d40bfdf5ef1cb91b757f1d05679b18428edaa06aa6ede3eb259e596e08fa2b
+ 96c4523ea1d5285174ecf1ec1a5ef09daa3adcf60ecd8d2a196f741ad80461cd
+ f94199bb442b47cd8a5abd08a443d8b5ff21d73fd9a98eb93757ab3639ed1bd0
+ 2d09a80290021506b292326b7869d2818d17dac54f6cfa8aa3896dc044f76d90
+ 2fe0a1871ecb3f834ba677de34b5d991e1686681b4f7b4fbf4f03df26afe4768
+ 79bba3d52f9d3a8326b706e6289767e6aab2f6216e050557c787ed7bf395384f
+ 14aae95adc96b8b68f0e3d71a20407fca89c9256a6475517a54026683aae2bfc
+ af5477c70b190fa3b94eea570b1b8c52a2bac739ecfa37272f39d917ce5cad05
+ a60b318f6597cadad59728434d665a053f5ac80322e0b532416650443eca8f22
+ 428a8e350f67cf25413e59c97a069fa47a8f814e8073c4a82ba3ea0440d1f2ec
+ 87582b34d4c374b6d828e03282d2afe63513769abf0d4cc0b7f8da83f1510a03
+ 139c2d899969839508c0c05ca0b8d572a2f35d86a6b313ea023855cb9a77ad8b
+ b80cb04dc34f815e86dbb82d42338bef4c7cdac6a5e21969f39b594e707c7c99"

From 236a1005f7a0aa3e407fddd2b318ff2fedaffa68 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 16 May 2022 17:37:45 +0700
Subject: [PATCH 2552/2561] dolphin: fix typo version

---
 srcpkgs/dolphin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dolphin/template b/srcpkgs/dolphin/template
index 2cfd8607589a..dca073039742 100644
--- a/srcpkgs/dolphin/template
+++ b/srcpkgs/dolphin/template
@@ -1,6 +1,6 @@
 # Template file for 'dolphin'
 pkgname=dolphin
-version=21.04.1
+version=22.04.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://kde.org/applications/en/system/org.kde.dolphin"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#dolphin"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=292377aca0454189186d4046ed69785d7fda672270362c3b538a001c9daa826e
+checksum=9cf51ac21ffc3d12a919e99cca80f3bb14741eed2a3af54b4499332ccd979a7b
 
 if [ "$CROSS_BUILD" ]; then
 	LDFLAGS=" -Wl,-rpath-link,../bin"

From c3520b0f388b40b1055d0fcb45557be75bdc9807 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:26:50 -0400
Subject: [PATCH 2553/2561] build-style/python3-pep517.sh: improve default
 wheel selection

When naming wheels, hyphens are converted to underscores in package
names. Recognizing this in the build style eliminates manual definition
of `make_install_target` in several templates.
---
 common/build-style/python3-pep517.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh
index a733a521fb3d..62cfac7d67d3 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -23,7 +23,11 @@ do_check() {
 
 do_install() {
 	# As with do_build, no need to accommodate cross compilation here
-	: ${make_install_target:=${pkgname#python3-}-${version}-*-*-*.whl}
+	if [ -z "${make_install_target}" ]; then
+		# Default wheel name normalizes hyphens to underscores
+		local wheelbase="${pkgname#python3-}"
+		make_install_target="${wheelbase//-/_}-${version}-*-*-*.whl"
+	fi
 
 	# If do_build was overridden, make sure the TMPDIR exists
 	mkdir -p build

From 78fff044bf8189c4371f0b593da7b6456e1edb8b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:30:06 -0400
Subject: [PATCH 2554/2561] python3-more-itertools: fix build, use PEP-517

---
 srcpkgs/python3-more-itertools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-more-itertools/template b/srcpkgs/python3-more-itertools/template
index 914d46f0a695..2ab2b760ec37 100644
--- a/srcpkgs/python3-more-itertools/template
+++ b/srcpkgs/python3-more-itertools/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-more-itertools'
 pkgname=python3-more-itertools
 version=8.13.0
-revision=1
+revision=2
 wrksrc="more-itertools-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
 depends="python3"
 checkdepends="python3-pytest"
 short_desc="More Python3 routines for operating on itertables"

From a663d68d7a11c36a1d725e91b3007aaa4167ccdd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:34:25 -0400
Subject: [PATCH 2555/2561] python3-ansible-compat: fix build

---
 srcpkgs/python3-ansible-compat/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
index 919455b7e64b..5b5b64154f3f 100644
--- a/srcpkgs/python3-ansible-compat/template
+++ b/srcpkgs/python3-ansible-compat/template
@@ -1,12 +1,11 @@
 # Template file for 'python3-ansible-compat'
 pkgname=python3-ansible-compat
 version=2.0.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
-make_install_target="ansible_compat-${version}-py3-none-any.whl"
-hostmakedepends="python3-wheel python3-toml"
-depends="python3-subprocess-tee"
+hostmakedepends="python3-wheel python3-setuptools_scm"
+depends="python3-subprocess-tee python3-yaml"
 short_desc="Python package for working with various version of ansible"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
@@ -15,8 +14,7 @@ distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.t
 checksum=c651995dc323ef145bab857fee6540febc881fb71b7feafe8163d49e273163a5
 
 post_patch() {
-	# scm versioning is broken in this release
-	vsed -e "/name =/a version = ${version}" -i setup.cfg
+	vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml
 }
 
 post_install() {

From a74ef090b81518fbe4acccf215fefc42845cd4ed Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:34:25 -0400
Subject: [PATCH 2556/2561] python3-ansible-lint: fix build

---
 srcpkgs/python3-ansible-lint/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index 00d8dc40f6a6..7cded1c60322 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,11 +1,10 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
 version=6.0.2
-revision=1
+revision=2
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
-make_install_target="ansible_lint-${version}-py3-none-any.whl"
-hostmakedepends="python3-wheel python3-toml"
+hostmakedepends="python3-wheel python3-setuptools_scm"
 depends="ansible-core python3-yamllint python3-six python3-yaml
  python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch
  python3-ansible-compat"
@@ -26,6 +25,5 @@ checksum=b539bc22d13e6de0cc2e25758e1d28b2bc01561a414ae37ceda3708b5a2a79ed
 make_check=no
 
 post_patch() {
-	# scm versioning is broken in this release
-	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+	vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml
 }

From c25c32d87caf751afa6a6f133c91af78f39a124f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:34:25 -0400
Subject: [PATCH 2557/2561] python3-matrix-common: remove unnecessary
 make_install_target

---
 srcpkgs/python3-matrix-common/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/python3-matrix-common/template b/srcpkgs/python3-matrix-common/template
index c9f7a2d5c8e1..b216a122778a 100644
--- a/srcpkgs/python3-matrix-common/template
+++ b/srcpkgs/python3-matrix-common/template
@@ -4,7 +4,6 @@ version=1.1.0
 revision=1
 wrksrc="matrix-python-common-${version}"
 build_style=python3-pep517
-make_install_target="matrix_common-${version}-*-*-*.whl"
 hostmakedepends="python3-setuptools python3-wheel"
 depends="python3-attrs"
 short_desc="Common code for Synapse, Sydent and Sygnal"

From 3dda605bc16d2b6efad783f8ec701f2a6e0da0a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:34:25 -0400
Subject: [PATCH 2558/2561] python3-msoffcrypto-tool: remove unnecessary
 make_install_target

---
 srcpkgs/python3-msoffcrypto-tool/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/python3-msoffcrypto-tool/template b/srcpkgs/python3-msoffcrypto-tool/template
index 10672ed09241..fa80ef343248 100644
--- a/srcpkgs/python3-msoffcrypto-tool/template
+++ b/srcpkgs/python3-msoffcrypto-tool/template
@@ -4,7 +4,6 @@ version=5.0.0
 revision=2
 wrksrc="msoffcrypto-tool-${version}"
 build_style=python3-pep517
-make_install_target="msoffcrypto_tool-${version}-*-*-*.whl"
 hostmakedepends="python3-poetry-core"
 depends="python3-setuptools python3-olefile python3-cryptography"
 checkdepends="python3-pytest $depends"

From 4e31fa0f6f78a9bda9504b85a7e7967d397897d5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 16 May 2022 10:34:25 -0400
Subject: [PATCH 2559/2561] python3-subprocess-tee: fix build

---
 srcpkgs/python3-subprocess-tee/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-subprocess-tee/template b/srcpkgs/python3-subprocess-tee/template
index 39a0233dad70..e14060d2bffa 100644
--- a/srcpkgs/python3-subprocess-tee/template
+++ b/srcpkgs/python3-subprocess-tee/template
@@ -4,8 +4,7 @@ version=0.3.5
 revision=1
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
-make_install_target="subprocess_tee-${version}-py3-none-any.whl"
-hostmakedepends="python3-wheel python3-toml"
+hostmakedepends="python3-wheel python3-setuptools_scm"
 depends="python3"
 short_desc="Replacement for subprocess.run capturing output while still printing it"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
@@ -17,8 +16,7 @@ checksum=ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577
 make_check=no
 
 post_patch() {
-	# scm versioning is broken in this release
-	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+	vsed -e "/setuptools_scm_git_archive/d" -i pyproject.toml
 }
 
 post_install() {

From 91f269d098c6b30213296e37919704d1c9beff50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 16 May 2022 21:15:24 +0200
Subject: [PATCH 2560/2561] qtcreator: update to 7.0.1.

---
 srcpkgs/qtcreator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 912c6c00c4c5..a616a42d5e40 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,6 +1,6 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=7.0.0
+version=7.0.1
 revision=1
 wrksrc="qt-creator-opensource-src-${version}"
 build_style=cmake
@@ -18,7 +18,7 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9
+checksum=da78f293829851e32f6bf25540791697606809e47a32ca8439561fcbab96b22e
 replaces="qtcreator-data>=0"
 python_version=3
 

From 44dbd7e6f6c20befc6e0b1cc3808b26c3a3c9616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 16 May 2022 21:15:25 +0200
Subject: [PATCH 2561/2561] diffoscope: update to 211.

---
 srcpkgs/diffoscope/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 9ce203fb8ff3..e4eb386165e0 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=209
+version=211
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,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=e845a0b6cd56c116fee670ae8497512489504dc911201bd77b7d65b8550618f6
+checksum=8e75f3acb181096632e43935ba7a85304703ac54739810b4523919188367ec03

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 732 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-q5go-35831.patch --]
[-- Type: text/x-diff, Size: 3341664 bytes --]

From 39bb9e3fc7219db6a95bf0cfcf1ae91c1c6d83b8 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 23 Feb 2022 16:55:57 -0600
Subject: [PATCH 0001/1686] New package: q5go-2.12

---
 srcpkgs/q5go/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/q5go/template

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..a2cc898854f6
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,21 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

From 1b430d6d9f2e4a0a010b3af9a74ecc0e28e8d598 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Thu, 3 Mar 2022 08:14:29 +0100
Subject: [PATCH 0002/1686] gitea: update to 1.16.3

---
 srcpkgs/gitea/files/gitea/run | 14 ++++++++------
 srcpkgs/gitea/template        |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/gitea/files/gitea/run b/srcpkgs/gitea/files/gitea/run
index d24ce523bba7..6a621804bdd0 100755
--- a/srcpkgs/gitea/files/gitea/run
+++ b/srcpkgs/gitea/files/gitea/run
@@ -1,9 +1,11 @@
 #!/bin/sh
 
-# We cd here, because builtin SSH won't run without.
-cd /var/lib/gitea || exit 1
+# USER and HOME are needed because gitea doesn't actually check the user it
+# runs as, but instead just grabs the variables from the variables.
+export USER=_gitea
+export HOME=/var/lib/gitea
 
-# The USER variable is needed here because gitea doesn't actually
-# check what user its running as, it instead grabs the USER variable
-# from the environment.  HOME is set for the same reasons.
-USER=_gitea HOME=/var/lib/gitea GITEA_WORK_DIR=$HOME exec chpst -u _gitea:_gitea gitea web --config /etc/gitea.conf
+# gitea needs to run from its home for SSH to work properly
+export GITEA_WORK_DIR="${HOME}"
+
+exec chpst -u _gitea:_gitea gitea web --config /etc/gitea.conf
diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index e8843a9f1a37..75d8c4290fe4 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.16.1
+version=1.16.3
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -32,7 +32,7 @@ license="MIT"
 homepage="https://gitea.io"
 changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
 distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=09a27a06bf12cbef06ba823c516c6c9f7a06129e91dd7e64be5f6f0ca641d5b7
+checksum=913f3b095fcfd4c5012d17adcd8748b081950e3a7d17ace60f6a2f99c9b2e18b
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From f21811bc64350371c7d36f632c63e7d1218ee489 Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Tue, 8 Mar 2022 22:02:30 +0100
Subject: [PATCH 0003/1686] yt-dlp: update to 2022.03.08.1.

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 4bf37918a58a..967cb7e75b0d 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2022.02.04
+version=2022.03.08.1
 revision=1
 wrksrc="$pkgname"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=c8dd119c28a5d256322ddb3a2fff72bc02ace43fc5880c0065d97f7a48d7a8e3
+checksum=135fd7bbf81c2639419b191d8e5abb80cd8a9801b7ed8e92a331a4107e820ab2
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 2acc3caf125b6adc8fe6c0ed91c394b2f9fcc3c1 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 12:16:17 +0100
Subject: [PATCH 0004/1686] cflow: update to 1.7.

---
 srcpkgs/cflow/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cflow/template b/srcpkgs/cflow/template
index 974c82619b65..fef756128a24 100644
--- a/srcpkgs/cflow/template
+++ b/srcpkgs/cflow/template
@@ -1,6 +1,6 @@
 # Template file for 'cflow'
 pkgname=cflow
-version=1.6
+version=1.7
 revision=1
 build_style=gnu-configure
 short_desc="C source files control analyzer and grapher"
@@ -8,4 +8,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/cflow/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=34487b4116e9b7ecde142b24480ce036887921ed5defb2958068bb069c1fedd7
+checksum=d01146caf9001e266133417c2a8258a64b5fc16fcb082a14f6528204d0c97086

From b4838205c241a170bdb6c4e78088b647d56b3e75 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Tue, 22 Feb 2022 22:41:45 +0100
Subject: [PATCH 0005/1686] sqlite: update to 3.38.0.

Also remove -DSQLITE_ENABLE_JSON1 as JSON is now on by default,
and revbump sqlite common/shlibs entry.
---
 common/shlibs           | 2 +-
 srcpkgs/sqlite/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 250e1e0b8cb5..d60e60a87534 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -352,7 +352,7 @@ libpoppler-cpp.so.0 poppler-cpp-0.18.2_1
 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1
 libtcl8.6.so tcl-8.6.0_1
 libtk8.6.so tk-8.6.1_3
-libsqlite3.so.0 sqlite-3.31.1_3
+libsqlite3.so.0 sqlite-3.38.0_1
 libIDL-2.so.0 libIDL-0.8.13_1
 libnspr4.so nspr-4.8_1
 libplc4.so nspr-4.8_1
diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index a2cb06763b8d..8760d30aee97 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.37.2
+version=3.38.0
 revision=1
 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ })
 wrksrc="sqlite-autoconf-${_amalgamationver}"
@@ -13,10 +13,10 @@ license="Public Domain"
 homepage="https://sqlite.org/"
 changelog="https://www.sqlite.org/releaselog/${version//./_}.html"
 distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=4089a8d9b467537b3f246f217b84cd76e00b1d1a971fe5aca1e30e230e46b2d8
+checksum=1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
- -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_JSON1 \
+ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \
  -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 \
  -DSQLITE_ENABLE_FTS3_TOKENIZER=1 -DSQLITE_ENABLE_BATCH_ATOMIC_WRITE=1 \
  -DSQLITE_ENABLE_DESERIALIZE"

From 26f8a4565ee70308d54e91f9b2c851d5b1052a41 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 5 Mar 2022 21:26:06 +0100
Subject: [PATCH 0006/1686] fossil: update to 2.18.

Also, add --with-sqlite to configure_args in order to
use the system-provided sqlite.
---
 srcpkgs/fossil/patches/cross.patch | 2 +-
 srcpkgs/fossil/template            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/fossil/patches/cross.patch b/srcpkgs/fossil/patches/cross.patch
index 79ce61fcdcd7..2e5cc092a67a 100644
--- a/srcpkgs/fossil/patches/cross.patch
+++ b/srcpkgs/fossil/patches/cross.patch
@@ -8,6 +8,6 @@ index 9818cbd..1c248b8 100644
  
 -XBCC = $(BCC) $(BCCFLAGS)
 +XBCC = $(BCC) -Os
- XTCC = $(TCC) -I. -I$(SRCDIR) -I$(OBJDIR) $(TCCFLAGS)
+ XTCC = $(TCC) $(CFLAGS_INCLUDE) -I$(OBJDIR) $(TCCFLAGS)
  
  TESTFLAGS := -quiet
diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index 63323b9f1f02..7e266eb29fe2 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,9 +1,9 @@
 # Template file for 'fossil'
 pkgname=fossil
-version=2.17
+version=2.18
 revision=1
 build_style=configure
-configure_args="--disable-internal-sqlite --prefix=/usr"
+configure_args="--disable-internal-sqlite --prefix=/usr --with-sqlite=${XBPS_CROSS_BASE}/usr/include"
 hostmakedepends="tcl"
 makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
 short_desc="Simple, high-reliability, distributed software configuration management"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://www.fossil-scm.org"
 changelog="https://www.fossil-scm.org/home/doc/trunk/www/changes.wiki"
 distfiles="https://fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"
-checksum=21d6ee5187775113f74e55ab5ebcb1764f7226a8e59be1b2c7896cbe9dce6914
+checksum=e89cb9c726348bb14e7736e031d2b08574408c5d4db98e7d3fc814dadc6f3546
 
 post_extract() {
 	vsed -i 's/test_system_sqlite$/# &/' auto.def  # failing on cross

From 041d9aab4b5e542a40c123f33f48bec8990cf0c1 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Mar 2022 18:24:31 +0200
Subject: [PATCH 0007/1686] bc-gh: update to 5.2.2.

---
 srcpkgs/bc-gh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bc-gh/template b/srcpkgs/bc-gh/template
index 8804980eb9c9..3ae95d694e9c 100644
--- a/srcpkgs/bc-gh/template
+++ b/srcpkgs/bc-gh/template
@@ -1,6 +1,6 @@
 # Template file for 'bc-gh'
 pkgname=bc-gh
-version=5.2.1
+version=5.2.2
 revision=1
 wrksrc="bc-${version}"
 short_desc="Implementation of POSIX bc with GNU extensions"
@@ -9,7 +9,7 @@ license="BSD-2-Clause"
 homepage="https://git.yzena.com/gavin/bc"
 changelog="https://git.yzena.com/gavin/bc/raw/branch/master/NEWS.md"
 distfiles="https://github.com/gavinhoward/bc/releases/download/${version}/bc-${version}.tar.xz"
-checksum=bc031b68e5eafef37305697b76f6261abac4a94286e260fa339771f2484f1ecd
+checksum=480249fc0e6a54cb2dc0059734ce433bff344d27b40b8591ae410068e1573352
 alternatives="
  bc:bc:/usr/bin/bc-gh
  bc:bc.1:/usr/share/man/man1/bc-gh.1

From 2249be3f073be29d3e28b11b77e260e090f3de6e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 22:09:23 +0100
Subject: [PATCH 0008/1686] xosview: update to 1.23.

---
 srcpkgs/xosview/patches/musl-fix.patch | 22 ++++++++++------------
 srcpkgs/xosview/template               |  6 +++---
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/xosview/patches/musl-fix.patch b/srcpkgs/xosview/patches/musl-fix.patch
index 879008fe051f..26c5160162bc 100644
--- a/srcpkgs/xosview/patches/musl-fix.patch
+++ b/srcpkgs/xosview/patches/musl-fix.patch
@@ -1,14 +1,12 @@
---- a/linux/serialmeter.cc	2016-01-02 10:39:10.279496776 +0100
-+++ b/linux/serialmeter.cc	2016-01-02 10:37:54.667491325 +0100
-@@ -39,9 +39,11 @@
+diff --git a/linux/serialmeter.cc b/linux/serialmeter.cc
+index 8211316..50de182 100644
+--- a/linux/serialmeter.cc
++++ b/linux/serialmeter.cc
+@@ -25,7 +25,6 @@
+  */
+ #if defined(__i386__) || defined(__ia64__) || defined(__amd64__)
+ #include <sys/io.h>
+-#include <sys/perm.h>
+ #define HAVE_IOPERM
  #endif
- #else
- #if !defined(__alpha__) && !defined(__sparc__) && !defined(__powerpc__) && !defined(__ia64__) && !defined(__m68k__)
-+#if defined(HAVE_ASM_IO_H)
- #include <asm/io.h>
- #endif
- #endif
-+#endif
- #include <linux/serial.h>
- 
  
diff --git a/srcpkgs/xosview/template b/srcpkgs/xosview/template
index 3d6c3ab6c1f9..69715f530985 100644
--- a/srcpkgs/xosview/template
+++ b/srcpkgs/xosview/template
@@ -1,15 +1,15 @@
 # Template file for 'xosview'
 pkgname=xosview
-version=1.22
+version=1.23
 revision=1
 build_style=gnu-makefile
 makedepends="libXpm-devel"
-short_desc="A classic system monitoring tool"
+short_desc="Classic system monitoring tool"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.pogo.org.uk/~mark/xosview"
 distfiles="http://www.pogo.org.uk/~mark/xosview/releases/xosview-${version}.tar.gz"
-checksum=901b75af2676b11b28b88f0c79c5bd0f4f01de4790c0c5385edf6d71aee1f83a
+checksum=960acb68a8668e936e8dc71cc4e3926d879f47559b4a5f64555bdcc676c6739d
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# does not have asm/io.h

From fd34f7b5db9933727811cfd1f260670cd3bc5777 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 2 Mar 2022 20:49:50 +1100
Subject: [PATCH 0009/1686] MoarVM: update to 2022.02.

---
 srcpkgs/MoarVM/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index f2e7dd6dc664..f437404bd76c 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2021.12
+version=2022.02
 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=d49bbeb10d9616c2d87a7fadd1c6bb7a5ce11c19c7c44bbb8bef76f25b505c4f
+checksum=4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96
 nocross=yes
 shlib_provides="libmoar.so"

From 88a02c8d6d1feb47b5cb4641f731e93776fc3b03 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 2 Mar 2022 20:51:19 +1100
Subject: [PATCH 0010/1686] nqp: update to 2022.02.

---
 srcpkgs/nqp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index 392da8ee3e64..e80e23f80ee6 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2021.12
+version=2022.02
 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=0e1d534fd1ee61a4c8072309bafbc04660e9ae72d88618daa0e8f15022f0d913
+checksum=25d3c99745cd84f4049a9bd9cf26bb5dc817925abaafe71c9bdb68841cdb18b1
 nocross=yes

From 8ae5d84c1fe30a1e909b9d9716635c6c87ebc828 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Wed, 2 Mar 2022 20:52:51 +1100
Subject: [PATCH 0011/1686] rakudo: update to 2022.02.

---
 srcpkgs/rakudo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index ab23fedcaa48..979c33def794 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2021.12
+version=2022.02
 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=7f53d2c7138d13ab01692d5bd7dbc28f3f29ed86bd96d5280856f55a1ab05406
+checksum=6a6e9dbcc6d9a1610a34c6ec67e2d3f694d7b33e9e0a0f224543089fa7f71332
 nocross=yes
 provides="raku-${version}_${revision}"
 

From dff90fdda89b655b1d3b6c23d1bec77fb990d252 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Feb 2022 02:33:26 +0100
Subject: [PATCH 0012/1686] libjpeg-turbo: update to 2.1.3.

---
 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 935b5088f210..4f7f43cf1204 100644
--- a/srcpkgs/libjpeg-turbo/template
+++ b/srcpkgs/libjpeg-turbo/template
@@ -1,6 +1,6 @@
 # Template file for 'libjpeg-turbo'
 pkgname=libjpeg-turbo
-version=2.1.2
+version=2.1.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_JPEG8=1 -DCMAKE_INSTALL_LIBDIR=/usr/lib"
@@ -11,7 +11,7 @@ license="IJG, BSD-3-Clause, Zlib"
 homepage="https://libjpeg-turbo.org/"
 changelog="https://raw.githubusercontent.com/libjpeg-turbo/libjpeg-turbo/main/ChangeLog.md"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5
+checksum=467b310903832b033fe56cd37720d1b73a6a3bd0171dbf6ff0b620385f4f76d0
 
 provides="jpeg-8_1"
 replaces="jpeg>=0"

From 6643ad794bb09be57a2d7e2e4e8eed0e1846c4c4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Feb 2022 02:12:43 +0100
Subject: [PATCH 0013/1686] mplayer: update to 1.5.

---
 srcpkgs/mplayer/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template
index 6bf5f3d1b08d..e4ee92dee1dd 100644
--- a/srcpkgs/mplayer/template
+++ b/srcpkgs/mplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'mplayer'
 pkgname=mplayer
-version=1.4
-revision=6
+version=1.5
+revision=1
 wrksrc="MPlayer-${version}"
 build_style=configure
 hostmakedepends="pkg-config yasm"
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.mplayerhq.hu/"
 distfiles="http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz"
-checksum=82596ed558478d28248c7bc3828eb09e6948c099bbd76bb7ee745a0e3275b548
+checksum=650cd55bb3cb44c9b39ce36dac488428559799c5f18d16d98edb2b7256cbbf85
 
 nocross=yes
 
@@ -30,8 +30,6 @@ conf_files="
 	/etc/mplayer/codecs.conf"
 
 do_configure() {
-	sed 's|-march=i486||g' -i configure
-
 	# we tried runtime cpudetection for ppc32 but stuff's broken
 	case "$XBPS_TARGET_MACHINE" in
 		i686*|x86_64*|ppc64*) configure_args+=" --enable-vdpau --enable-runtime-cpudetection";;

From 324c84b8abae289d55bf362a02f5317135db6b86 Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Sat, 26 Feb 2022 11:48:49 +0100
Subject: [PATCH 0014/1686] cpuid: update to 20220224.

---
 srcpkgs/cpuid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpuid/template b/srcpkgs/cpuid/template
index 61d6868aaf8b..4c651ab451cd 100644
--- a/srcpkgs/cpuid/template
+++ b/srcpkgs/cpuid/template
@@ -1,6 +1,6 @@
 # Template file for 'cpuid'
 pkgname=cpuid
-version=20211210
+version=20220224
 revision=1
 archs="i686* x86_64*"
 build_style=gnu-makefile
@@ -10,4 +10,4 @@ maintainer="Gerardo Di Iorio  <arete74@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://www.etallen.com/cpuid.html"
 distfiles="http://www.etallen.com/cpuid/cpuid-${version}.src.tar.gz"
-checksum=e029895700de1a6f83360252804892cd58b54d1f5ff3af44b7bb6afe410e5f44
+checksum=4a19de2a118aee44f856cd1becfa5a192574b5957795372a86e37dca24da1f9d

From 3fe62c82c3fc388f77a5d088119be2873e5e87a8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 25 Feb 2022 21:36:09 +0200
Subject: [PATCH 0015/1686] mercurial: update to 6.0.3.

---
 srcpkgs/mercurial/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 87d80c12555a..778d60757cf6 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=5.9.3
+version=6.0.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-devel gettext"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=3b43f68977ad0fa75aa7f1e5c8f0a83ba935621ab2396129abb498e56d1be08e
+checksum=67f13647a46517a2b567cdcb73c98721d75d36a0432debb15022b77f9c138333
 
 pre_check() {
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then

From 9d102b10ef0b9825fbdb133fd0af427205172566 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 19 Feb 2022 14:04:14 +0200
Subject: [PATCH 0016/1686] python3-distro: update to 1.7.0.

---
 srcpkgs/python3-distro/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-distro/template b/srcpkgs/python3-distro/template
index d573bc5b60c8..12554d77cfb4 100644
--- a/srcpkgs/python3-distro/template
+++ b/srcpkgs/python3-distro/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-distro'
 pkgname=python3-distro
-version=1.6.0
-revision=2
+version=1.7.0
+revision=1
 wrksrc=distro-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,5 +12,6 @@ short_desc="OS platform information API"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="Apache-2.0"
 homepage="https://github.com/nir0s/distro"
+changelog="https://raw.githubusercontent.com/python-distro/distro/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/d/distro/distro-${version}.tar.gz"
-checksum=83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424
+checksum=151aeccf60c216402932b52e40ee477a939f8d58898927378a02abbe852c1c39

From 9e3a5db3dbcfddca48348637b57d9772187f8812 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Feb 2022 15:06:09 +0100
Subject: [PATCH 0017/1686] sigil: update to 1.9.0.

---
 srcpkgs/sigil/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index ce12835e5a53..8e6fdb0c959e 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.8.0
+version=1.9.0
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -18,8 +18,9 @@ short_desc="Multi-platform EPUB ebook editor"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
+changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=33d84331f259ab8d92fc2c5fed6f05fd5f011695c48f83537423635a7afdd2ec
+checksum=c44b0cf2472ef59c4d76178883a7795af39febf32496fb7af1e34f7a3977791f
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From cac513090b4d94c29c11c6e329698b126d8d6340 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Mar 2022 11:50:18 +0100
Subject: [PATCH 0018/1686] Komikku: update to 0.37.0.

---
 srcpkgs/Komikku/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Komikku/template b/srcpkgs/Komikku/template
index 91de9f9e4f0c..89da2026f68e 100644
--- a/srcpkgs/Komikku/template
+++ b/srcpkgs/Komikku/template
@@ -1,6 +1,6 @@
 # Template file for 'Komikku'
 pkgname=Komikku
-version=0.35.2
+version=0.37.0
 revision=1
 wrksrc=Komikku-v${version}
 build_style=meson
@@ -16,4 +16,4 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/valos/Komikku"
 distfiles="https://gitlab.com/valos/Komikku/-/archive/v${version}/Komikku-v${version}.tar.gz"
-checksum=b349c67a5b4ddf49b6edf87e5fb4a8f41a1f10a0967ff7d4fe4db40eb0b4eb72
+checksum=f126d91a21663d60c502a45ad9171bad933255839bc17a20b2f6c83500dfc4bf

From efb3e8ba81e13801a2f9d57b44dc968599d52c2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Mar 2022 12:04:35 +0100
Subject: [PATCH 0019/1686] Minder: update to 1.14.0.

---
 srcpkgs/Minder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index 2022aca4548d..da4f9b751c20 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,17 +1,17 @@
 # Template file for 'Minder'
 pkgname=Minder
-version=1.13.1
+version=1.14.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config glib-devel vala"
 makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
- libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel"
+ libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel json-glib-devel"
 short_desc="Mind-mapping application designed for Pantheon"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/phase1geo/Minder"
 distfiles="https://github.com/phase1geo/Minder/archive/${version}.tar.gz"
-checksum=f319501e40e53e7721864d73e8c071960acc40a4f32dd84e85646a2031be215a
+checksum=7561084a0ee51b51a1e25753dbdd34f48632cc340c89cd78c591a539d8cef653
 
 post_install() {
 	vinstall data/com.github.phase1geo.minder.desktop 644 /usr/share/applications/

From 0b72691c69b78ecfd92dc84cfd4b1368ce3e6ccc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Mar 2022 14:33:18 +0100
Subject: [PATCH 0020/1686] blanket: update to 0.5.0.

---
 srcpkgs/blanket/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 7bde1ef9e8fe..57d75b5ba8d1 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -1,7 +1,7 @@
 # Template file for 'blanket'
 pkgname=blanket
-version=0.4.1
-revision=2
+version=0.5.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"
 depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libhandy1"
@@ -10,5 +10,5 @@ maintainer="Reback00 <reback00@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/rafaelmardojai/blanket"
 distfiles="https://github.com/rafaelmardojai/blanket/archive/refs/tags/${version}.tar.gz"
-checksum=fbb5f34a704840c50bb5b29f6fae69a2f37677d88db717b79e6bf6fdd625d9eb
+checksum=5af1d417d31bafff7c13a48e26bc4daae58a537f312b4ffb6911ae1b8b09a1d1
 python_version=3

From 183ced720f95bbcf9e9aa6526b106fd31963e2d4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 8 Mar 2022 16:24:43 +0100
Subject: [PATCH 0021/1686] python3-py7zr: remove importlib_metadata dependency

* only required until Python 3.8
---
 srcpkgs/python3-py7zr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
index ecd53ab39117..7dcdc642f601 100644
--- a/srcpkgs/python3-py7zr/template
+++ b/srcpkgs/python3-py7zr/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-py7zr'
 pkgname=python3-py7zr
 version=0.16.4
-revision=1
+revision=2
 wrksrc="py7zr-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+depends="python3-texttable python3-pycryptodomex
  python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj
  python3-multivolumefile"
 short_desc="7zip in python3 with various compressions, and AES encryption"

From 2e8aa48a9b109e4691f5aeb07094a54967081ad5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 8 Mar 2022 21:51:57 +0100
Subject: [PATCH 0022/1686] avahi: remove intltool build dep

---
 srcpkgs/avahi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 080d04537e75..c6cbd3860135 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -28,7 +28,7 @@ checksum="060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
  83edd888ccc464ab032134a45b7ded3bc43cb1dda2cd921ff47b01949d98ed7c"
 skip_extraction="build-db.txt"
 
-hostmakedepends="pkg-config intltool python3"
+hostmakedepends="pkg-config gettext python3"
 makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel"
 conf_files="
 	/etc/avahi/services/ssh.service

From 342ff1f3cd04b6b7ad31dd4fbbf4fd2dd8b5656e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 9 Mar 2022 15:25:13 +0100
Subject: [PATCH 0023/1686] fontforge: update to 20220308.

---
 srcpkgs/fontforge/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/fontforge/template b/srcpkgs/fontforge/template
index 7c116429856d..f768483ba14c 100644
--- a/srcpkgs/fontforge/template
+++ b/srcpkgs/fontforge/template
@@ -1,14 +1,13 @@
 # Template file for 'fontforge'
 pkgname=fontforge
-version=20201107
-revision=2
+version=20220308
+revision=1
 build_style=cmake
 hostmakedepends="automake ca-certificates gettext libltdl-devel libtool m4
  pkg-config python3"
-makedepends="libltdl-devel python3-devel zlib-devel pango-devel readline-devel
- giflib-devel libpng-devel libjpeg-turbo-devel tiff-devel libxml2-devel
- libspiro-devel hicolor-icon-theme desktop-file-utils libuninameslist-devel
- gtk+3-devel"
+makedepends="desktop-file-utils giflib-devel gtk+3-devel hicolor-icon-theme
+ libjpeg-turbo-devel libltdl-devel libpng-devel libspiro-devel libxml2-devel
+ pango-devel python3-devel readline-devel tiff-devel woff2-devel zlib-devel"
 depends="desktop-files-utils"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Create and modify PostScript, TrueType and SVG fonts"
@@ -16,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="http://fontforge.github.io/en-US/"
 distfiles="https://github.com/fontforge/fontforge/archive/${version}.tar.gz"
-checksum=274f8c8cbd7b6a1c77d2a1c03d4d6cd3c9319db62be8b8c88fabbf597f7e863c
+checksum=58bbc759eb102263be835e6c006b1c16b508ba3d0252acd5389062826764f7a5
 
 post_extract() {
 	# Disable unused #include <execinfo.h>

From 544106603a8d05db63c101cf4ea2b8b486ed303f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 20:42:22 +0100
Subject: [PATCH 0024/1686] freshplayerplugin: remove.

---
 .../patches/addvoidpepper.patch               | 11 ----------
 .../freshplayerplugin/patches/ffmpeg4.patch   | 16 --------------
 srcpkgs/freshplayerplugin/template            | 21 -------------------
 srcpkgs/removed-packages/template             |  3 ++-
 4 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/freshplayerplugin/patches/addvoidpepper.patch
 delete mode 100644 srcpkgs/freshplayerplugin/patches/ffmpeg4.patch
 delete mode 100644 srcpkgs/freshplayerplugin/template

diff --git a/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch b/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch
deleted file mode 100644
index 8dacb2570781..000000000000
--- a/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/config_pepperflash.c
-+++ b/src/config_pepperflash.c
-@@ -80,6 +80,9 @@
-     // Chrome component update
-     "~/.config/google-chrome/PepperFlash/*/libpepflashplayer.so",
-
-+    // chromium-pepper-flash (Void Linux)
-+    "/usr/lib/chromium-pepper-flash",
-+
-     NULL,
- };
diff --git a/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch b/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch
deleted file mode 100644
index 53fd1a31acdd..000000000000
--- a/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/ppb_video_decoder.c.orig        2018-05-03 22:08:33.026677145 +0200
-+++ b/src/ppb_video_decoder.c     2018-05-03 22:09:26.176206079 +0200
-@@ -542,9 +542,9 @@
-         goto err;
-     }
-
--    if (vd->avcodec->capabilities & CODEC_CAP_TRUNCATED) {
--        trace_info("%s, codec have CODEC_CAP_TRUNCATED\n", __func__);
--        vd->avctx->flags |= CODEC_FLAG_TRUNCATED;
-+    if (vd->avcodec->capabilities & AV_CODEC_CAP_TRUNCATED) {
-+        trace_info("%s, codec have AV_CODEC_CAP_TRUNCATED\n", __func__);
-+        vd->avctx->flags |= AV_CODEC_FLAG_TRUNCATED;
-     }
-
-     vd->avctx->opaque = vd;
-
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
deleted file mode 100644
index f24272ef708f..000000000000
--- a/srcpkgs/freshplayerplugin/template
+++ /dev/null
@@ -1,21 +0,0 @@
-# Template file for 'freshplayerplugin'
-pkgname=freshplayerplugin
-version=0.3.9
-revision=9
-build_style=cmake
-hostmakedepends="pkg-config ragel"
-makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
- libvdpau-devel libva-devel ffmpeg-devel v4l-utils-devel libdrm-devel MesaLib-devel"
-short_desc="PPAPI2NPAPI compatibility layer for Pepper Flash"
-maintainer="Emanuel Serpa <emanuel@openmailbox.org>"
-license="MIT"
-homepage="https://github.com/i-rinat/freshplayerplugin"
-changelog="https://raw.githubusercontent.com/i-rinat/freshplayerplugin/master/ChangeLog"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=4fa4fe07e812f6e10784ff984e1389b9b444ca44b84101999c6fad8f55db59d9
-
-do_install() {
-	vinstall build/libfreshwrapper-flashplayer.so 755 usr/lib/mozilla/plugins
-	vsconf data/freshwrapper.conf.example
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index bd67947de02f..a7a19630a01a 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=63
+revision=64
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -70,6 +70,7 @@ replaces="
  enventor<=1.0.0_2
  epstopdf<=2.27_3
  fontmatrix<=0.6.0.20171228_2
+ freshplayerplugin<=0.3.9_9
  fuse-usmb<=20130204_7
  gconf-editor<=3.0.1_3
  gegl3<=0.3.28_2

From e3872b0f411da0aa88d2269f8cc490a9460098df Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:12:21 +0100
Subject: [PATCH 0025/1686] girara: fix distfiles location

---
 srcpkgs/girara/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/girara/template b/srcpkgs/girara/template
index c45def53b929..6bcbe95b8076 100644
--- a/srcpkgs/girara/template
+++ b/srcpkgs/girara/template
@@ -10,8 +10,8 @@ short_desc="Library implementing a user interface that focuses on minimalism"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
 homepage="https://pwmt.org/projects/girara/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=77132e9bd652f1c9e4260de046768ea449a7d977c4cd3d6d817d2d72b6f946e0
+distfiles="https://git.pwmt.org/pwmt/girara/-/archive/${version}/girara-${version}.tar.gz"
+checksum=41342213f8e745258f1db28cbb6ccc27a63009a5e001bf791bbe01ce436d4db7
 
 build_options="notify"
 build_options_default="notify"

From aedf0020bc498e6687e8c6cd65caf598a473726e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:07:53 +0100
Subject: [PATCH 0026/1686] fractal: fix cross

---
 srcpkgs/fractal/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index cd5ea935a87f..37461c7272bc 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -16,6 +16,11 @@ homepage="https://wiki.gnome.org/Apps/Fractal"
 distfiles="https://gitlab.gnome.org/World/fractal/-/archive/$version/$pkgname-$version.tar.gz"
 checksum=3c3ea4e67e6d8fbc2e7b220fef188dcde5229e83c2cfeeadee42137718b34e56
 
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
+
 post_patch() {
 	[ -z "$CROSS_BUILD" ] && return 0
 

From 1c780b126448195057b42ff6027ccab31b232860 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Wed, 9 Mar 2022 11:57:37 +0100
Subject: [PATCH 0027/1686] miniflux: update to 2.0.36.

---
 srcpkgs/miniflux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 41757c6201bf..886d40df8a9f 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,6 +1,6 @@
 # Template file for 'miniflux'
 pkgname=miniflux
-version=2.0.35
+version=2.0.36
 revision=1
 wrksrc="v2-${version}"
 build_style=go
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://miniflux.app"
 changelog="https://raw.githubusercontent.com/miniflux/v2/master/ChangeLog"
 distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
-checksum=8f9693380754072d1a74671c6b645abe7ddb0c8d22651ebc867b1af6dfcc4229
+checksum=15ac4ad4ab6f87de2143a85f52252e80d7c216a69aab334363e1972b81f231fd
 system_accounts="_miniflux"
 
 post_install() {

From 298e43cd18e1616b4e9b848b49c5d0e968f5db91 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 18:59:31 +0100
Subject: [PATCH 0028/1686] warzone2100: update to 4.2.7.

---
 srcpkgs/warzone2100/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index af3746aaffc1..9ef2297baeb7 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,6 +1,6 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
-version=4.2.6
+version=4.2.7
 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=b1d1dcfe2d5f7db4c063b7a13ba2ec21afa597e2c792e5c8c1cc13204398dbc8
+checksum=7f527ce00eda44099b1a7e3c303ede276f835f6d6ad945b0600a175ddabb00b0
 nocross="fails to detect SDL2 when cross-compiling"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 6abb0bba570774c825f201715b29b1cd813ee42c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 19:42:39 +0100
Subject: [PATCH 0029/1686] vlc: update to 3.0.17.

---
 srcpkgs/vlc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 2cd761b3ddb4..309477a2f775 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.16
-revision=6
+version=3.0.17
+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=ffae35fc64f625c175571d2346bc5f6207be99762517f15423e74f18399410f6
+checksum=48bd9bf337aa107a1524eba57c52dc4a91e29f5a97fbdee92f6a4dba90383cd0
 
 lib32disabled=yes
 

From 0d83ad81126aab7d0eed0c477bf8a0522cd8deb0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 19:46:14 +0100
Subject: [PATCH 0030/1686] linux5.4: update to 5.4.183.

---
 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 bc25dbd847b2..439a5538b1c1 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.182
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=b2f1201f64f010e9e3c85d6f303a559a7944a80a0244a86b8f5035bd23f1f40d
+checksum=2d4b0b77644835410b2a5f599b2893fe199d5542615684207f579753020cc99c
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 91aaeac67c3b85bb344ebe3bcbcefea230354492 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 9 Mar 2022 19:49:11 +0100
Subject: [PATCH 0031/1686] linux4.19: update to 4.19.233.

---
 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 b38210b714e2..5a274df27b39 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.232
+version=4.19.233
 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=4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c
+checksum=b8f665f020c2724a9f1e0368fdc0ea451b0b7d915ffae7ef4b9ec27a550fce37
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From ae2b035ae8d18ad00a85801750f4005ccd5f469d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:22:37 -0500
Subject: [PATCH 0032/1686] python3-numpy: update to 1.22.3.

Fixes #36062.
---
 srcpkgs/python3-numpy/template | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-numpy/template b/srcpkgs/python3-numpy/template
index 51bd23a1ec97..957551b64d91 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.22.2
+version=1.22.3
 revision=1
 wrksrc="numpy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://www.numpy.org/"
 distfiles="https://github.com/numpy/numpy/archive/v${version}.tar.gz"
-checksum=3428c3bd846beca1cd4417ebee6eab8bb62e987fc3101e5858d74c92b312d096
+checksum=c8f3ec591e3f17b939220f2b9eabb4c5e2db330f8af62c0a3aeee8a4d1a6c0db
 alternatives="numpy:f2py:/usr/bin/f2py3"
 # Tests do not function propery in a build directory
 make_check="no"
@@ -69,13 +69,8 @@ pre_build() {
 }
 
 post_install() {
-	# create compat symlinks for .h files
-	vmkdir ${py3_inc}
-	ln -sfr ${DESTDIR}/${py3_sitelib}/numpy/core/include/numpy \
-		${DESTDIR}/${py3_inc}
+	rm ${DESTDIR}/usr/bin/f2py
 
-	rm -f ${DESTDIR}/usr/bin/f2py
-
-	rm -f ${DESTDIR}/usr/lib/python*/site-packages/numpy/LICENSE.txt
+	rm ${DESTDIR}/${py3_sitelib}/numpy/LICENSE.txt
 	vlicense LICENSE.txt LICENSE
 }

From ad5dc1f2d8c3ff025e1f420264b7d512351237b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:54:45 -0500
Subject: [PATCH 0033/1686] maturin: update to 0.12.10.

---
 srcpkgs/maturin/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index d3c387fdfaa7..a7de61b7704a 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,15 +1,15 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.9
+version=0.12.10
 revision=1
 build_style=cargo
 build_helper=qemu
 # 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 log,upload,human-panic"
-hostmakedepends="python3-setuptools python3-toml"
+hostmakedepends="python3-setuptools python3-tomli"
 makedepends="openssl-devel"
-depends="python3-toml"
+depends="python3-tomli"
 short_desc="Build and publish crates as python packages"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Apache-2.0, MIT"
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="26b094c20c9939cc9df5632b4b8d8921c4086b27a4867b439297e616f5781716
+checksum="764d91bb35a41d0fa389f3e8179353c0a7e173fbb52c6d434e2877951f15e4a4
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From a1bf0516bb193721458bf4a9131518852653d2c1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:56:54 -0500
Subject: [PATCH 0034/1686] python3-ipython: update to 8.1.1.

---
 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 387bd59fbc55..07bdc201821d 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.1.0
+version=8.1.1
 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=42c23e90b2deaae631266885de1656a517a1673d7e1db57e8eb3a4bb6cd5ce1b
+checksum=8138762243c9b3a3ffcf70b37151a2a35c23d3a29f9743878c33624f4207be3d
 conflicts="python-ipython<=5.8.0_2"
 
 do_check() {

From bce3e8b0909ef318c5dfe6e1ddeb8c119adcd8e8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:57:11 -0500
Subject: [PATCH 0035/1686] python3-pip: update to 22.0.4.

---
 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 4ba92b54262e..51b892eb0596 100644
--- a/srcpkgs/python3-pip/template
+++ b/srcpkgs/python3-pip/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pip'
 pkgname=python3-pip
-version=22.0.3
+version=22.0.4
 revision=1
 wrksrc="pip-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://pip.pypa.io/"
 changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst"
 distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz"
-checksum=f29d589df8c8ab99c060e68ad294c4a9ed896624f6368c5349d70aa581b333d0
+checksum=b3a9de2c6ef801e9247d1527a4b16f92f2cc141cd1489f3fffaf6a9e96729764
 # Tests have unpackaged dependencies
 make_check=no
 

From f6764072e705d2dcc57b84deafb8c9d6d468d600 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:57:22 -0500
Subject: [PATCH 0036/1686] python3-pylru: update to 1.2.1.

---
 srcpkgs/python3-pylru/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pylru/template b/srcpkgs/python3-pylru/template
index a44b59ad2714..91c93a98d8d1 100644
--- a/srcpkgs/python3-pylru/template
+++ b/srcpkgs/python3-pylru/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pylru'
 pkgname=python3-pylru
-version=1.2.0
-revision=3
+version=1.2.1
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,4 +11,4 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/jlhutch/pylru"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c4dcf175f6317539199434db13ffea0f642a52fac1e547e2e5f0866686fc9292
+checksum=8d8d5ac67c5567137c53cf505a851a0c125666bd64402a111f141ae35db00859

From 13ab6857c81e6485277ef9612709a6b6a82f4312 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 9 Mar 2022 14:57:48 -0500
Subject: [PATCH 0037/1686] python3-pytools: update to 2022.1.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 25c3394ed9fb..3280c48dfb07 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1
+version=2022.1.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=197aacf6e1f5d60c715b92438792acb7702aed59ebbfb147fa84eda780e54fee
+checksum=3eebcc11923bf36fc42a9102d6e417a94817efb1aeb24d3149686dd5e3ec54d4
 
 post_install() {
 	vlicense LICENSE

From 1139b85622fd818fb68d220a40748076e6bf2b7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 9 Mar 2022 22:34:15 +0100
Subject: [PATCH 0038/1686] libvirt: fix virsh undefine

closes #36061
closes #35996
---
 srcpkgs/libvirt/patches/823a62ec.patch | 48 ++++++++++++++++++++++++++
 srcpkgs/libvirt/template               |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libvirt/patches/823a62ec.patch

diff --git a/srcpkgs/libvirt/patches/823a62ec.patch b/srcpkgs/libvirt/patches/823a62ec.patch
new file mode 100644
index 000000000000..5fcc644d3e5a
--- /dev/null
+++ b/srcpkgs/libvirt/patches/823a62ec.patch
@@ -0,0 +1,48 @@
+From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
+From: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Date: Tue, 1 Mar 2022 18:47:59 +0100
+Subject: [PATCH] qemu: segmentation fault in virtqemud executing
+ qemuDomainUndefineFlags
+
+Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
+
+Stack trace of thread 664419:
+ #0  0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
+ #1  0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
+ #2  0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
+        at src/remote/remote_daemon_dispatch_stubs.h:13080
+ #3  remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
+        at src/remote/remote_daemon_dispatch_stubs.h:13059
+ #4  0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
+        at ../src/rpc/virnetserverprogram.c:428
+ #5  virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
+ #6  0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
+ #7  virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
+ #8  0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
+ #9  0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
+ #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
+ #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
+
+Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
+Reviewed-by: Jim Fehlig <jfehlig@suse.com>
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ src/qemu/qemu_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index bcd9bdb436..8337eed510 100644
+--- a/src/qemu/qemu_driver.c
++++ b/src/qemu/qemu_driver.c
+@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
+         }
+     }
+ 
+-    if (vm->def->os.loader->nvram) {
++    if (vm->def->os.loader && vm->def->os.loader->nvram) {
+         nvram_path = g_strdup(vm->def->os.loader->nvram);
+     } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
+         qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
+-- 
+GitLab
+
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index 1568aa905a56..bf08aa899e00 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
 version=8.1.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
  -Dpolkit=enabled"

From 0383be72ab9b818eec1ad65cbea2957e2102979f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 23:06:26 +0100
Subject: [PATCH 0039/1686] jwm: remove faulty fix_dvorak.patch

was causing segfault when running `jwm -p`.
---
 srcpkgs/jwm/patches/fix_dvorak.patch | 31 ----------------------------
 srcpkgs/jwm/template                 |  2 +-
 2 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 srcpkgs/jwm/patches/fix_dvorak.patch

diff --git a/srcpkgs/jwm/patches/fix_dvorak.patch b/srcpkgs/jwm/patches/fix_dvorak.patch
deleted file mode 100644
index a8c1a02a9c5b..000000000000
--- a/srcpkgs/jwm/patches/fix_dvorak.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1aa74e96e32b4012ee0e13ada22b64811b519bab Mon Sep 17 00:00:00 2001
-From: Olga Ustuzhanina <me@laserbat.pw>
-Date: Thu, 24 Jan 2019 15:07:31 +0700
-Subject: [PATCH] fix desktop switching on dvorak layouts
-
----
- src/binding.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/binding.c b/src/binding.c
-index dc23b640..8c238717 100644
---- a/src/binding.c
-+++ b/src/binding.c
-@@ -18,6 +18,8 @@
- #include "root.h"
- #include "tray.h"
- 
-+#include <X11/XKBlib.h>
-+
- #define MASK_NONE    0
- #define MASK_SHIFT   (1 << ShiftMapIndex)
- #define MASK_LOCK    (1 << LockMapIndex)
-@@ -418,7 +420,7 @@ void InsertBinding(ActionType action, const char *modifiers,
- 
-             for(temp[offset] = '1'; temp[offset] <= '9'; temp[offset]++) {
- 
--               sym = ParseKeyString(temp);
-+               sym = XkbKeycodeToKeysym(display, temp[offset] - '1' + 10, 0, 0);
-                if(sym == NoSymbol) {
-                   Release(temp);
-                   return;
diff --git a/srcpkgs/jwm/template b/srcpkgs/jwm/template
index 3d052853912c..6595c27e2d6a 100644
--- a/srcpkgs/jwm/template
+++ b/srcpkgs/jwm/template
@@ -1,7 +1,7 @@
 # Template file for 'jwm'
 pkgname=jwm
 version=2.4.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config which"
 makedepends="

From c46a04dba7186b37ac5f040fd336c9fd6b6cf966 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 2 Mar 2022 10:29:49 -0500
Subject: [PATCH 0040/1686] python3-phonenumbers: update to 8.12.44.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index f84326ecff0f..9cb6d6a351f6 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.43
+version=8.12.44
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=1c8270a2e257d6c65458a42283f82d3eca7f7b9d925454a6966e2f04df75e1cf
+checksum=26cfd0257d1704fe2f88caff2caabb70d16a877b1e65b6aae51f9fbbe10aa8ce

From 856a1d32b3fabdce329308650dd988662d5e089a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 4 Mar 2022 21:03:26 -0500
Subject: [PATCH 0041/1686] python3-saml2: update to 7.1.2.

---
 srcpkgs/python3-saml2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-saml2/template b/srcpkgs/python3-saml2/template
index 673cfd1edac5..ce87ae737d8d 100644
--- a/srcpkgs/python3-saml2/template
+++ b/srcpkgs/python3-saml2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-saml2'
 pkgname=python3-saml2
-version=7.1.1
+version=7.1.2
 revision=1
 wrksrc="pysaml2-${version}"
 build_style=python3-module
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://github.com/IdentityPython/pysaml2"
 changelog="https://raw.githubusercontent.com/IdentityPython/pysaml2/master/CHANGELOG.md"
 distfiles="https://github.com/IdentityPython/pysaml2/archive/v${version}.tar.gz"
-checksum=ef271ad65d82dcb18f20b380003600f74e0b4c938596002befd79d63e09d87ec
+checksum=308934d5cd5f22a3ea7bd8d4fb5423ab0f5b0f08bf541e7c6b2cb0eb7302a3ab
 
 do_check() {
 	# Ignore tests that depend on unpackaged python dependency 'pymongo'

From bddd0775a5559e4542715c22a77d760c0e7b20e1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 4 Mar 2022 21:06:29 -0500
Subject: [PATCH 0042/1686] python3-canonicaljson: update to 1.6.0.

---
 srcpkgs/python3-canonicaljson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-canonicaljson/template b/srcpkgs/python3-canonicaljson/template
index 7dbdf1adb9d0..b9535436442b 100644
--- a/srcpkgs/python3-canonicaljson/template
+++ b/srcpkgs/python3-canonicaljson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-canonicaljson'
 pkgname=python3-canonicaljson
-version=1.5.0
+version=1.6.0
 revision=1
 wrksrc="canonicaljson-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-canonicaljson"
 distfiles="${PYPI_SITE}/c/canonicaljson/canonicaljson-${version}.tar.gz"
-checksum=5ebddcd74c5b066ee68ecca56465338e9b1380467e0a906f4797697c9fb381e2
+checksum=8739d5fd91aca7281d425660ae65af7663808c8177778965f67e90b16a2b2427

From f07008a5bc62a0d64c8b547ab1fe7a1be4115a8f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 8 Mar 2022 10:37:47 -0500
Subject: [PATCH 0043/1686] synapse: update to 1.54.0.

---
 srcpkgs/synapse/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 19153bc23bc3..f28f1313dcd0 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.53.0
+version=1.54.0
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -12,7 +12,8 @@ depends="python3-jsonschema python3-frozendict python3-canonicaljson
  python3-phonenumbers python3-prometheus_client python3-attrs python3-netaddr
  python3-setuptools python3-bleach python3-Jinja2 python3-psycopg2 python3-lxml
  python3-saml2 python3-treq python3-macaroons python3-sortedcontainers
- python3-typing_extensions python3-ijson python3-matrix-common"
+ python3-typing_extensions python3-ijson python3-matrix-common
+ python3-packaging"
 checkdepends="$depends python3-parameterized python3-pytest"
 short_desc="Matrix reference homeserver"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
@@ -20,7 +21,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=e9fb5c8d1178996e677f6ce8f44c11d9294da0a06297fffa34706879870f9bf4
+checksum=6e9ee5f0657fe01c5d141101b11c2c2da147003f7f8e684ef44d4f462125b7a1
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From b082ec0a720cce9297ba5924f1151bf4a8925a15 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Wed, 9 Mar 2022 15:20:44 -0600
Subject: [PATCH 0044/1686] New package: terraform-docs-0.16.0

---
 srcpkgs/terraform-docs/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/terraform-docs/template

diff --git a/srcpkgs/terraform-docs/template b/srcpkgs/terraform-docs/template
new file mode 100644
index 000000000000..cc03309e372b
--- /dev/null
+++ b/srcpkgs/terraform-docs/template
@@ -0,0 +1,16 @@
+# Template file for 'terraform-docs'
+pkgname=terraform-docs
+version=0.16.0
+revision=1
+build_style=go
+go_import_path="github.com/$pkgname/$pkgname"
+short_desc="Utility to generate documentation from Terraform modules"
+maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
+license="MIT"
+homepage="https://terraform-docs.io/"
+distfiles="https://$go_import_path/archive/v$version.tar.gz"
+checksum=e370fd106ca74caebc8632834cc28412a3a6a160952392da71f213515bba2085
+
+post_install() {
+	vlicense LICENSE
+}

From fa8b6ff5aaaac79299e5c19f41e45af2536c5b08 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Tue, 8 Mar 2022 20:51:53 -0500
Subject: [PATCH 0045/1686] delta: update to 0.12.1, restore cross

---
 srcpkgs/delta/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/delta/template b/srcpkgs/delta/template
index 32984c557cb7..dd9809f3f7e1 100644
--- a/srcpkgs/delta/template
+++ b/srcpkgs/delta/template
@@ -1,6 +1,6 @@
 # Template file for 'delta'
 pkgname=delta
-version=0.11.3
+version=0.12.1
 revision=1
 build_style=cargo
 checkdepends="git"
@@ -9,9 +9,12 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/dandavison/delta"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=cf68f43d4d26c10551c0137a7e718719958e52267d83f29a8f7794af12095b9e
-make_check=no  # TODO: Re-enable checks when Rust gets updated
-nocross=yes # fails with current rust
+checksum=1b97998841305909638008bd9fa3fca597907cb23830046fd2e610632cdabba3
+
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
 
 post_install() {
 	vlicense LICENSE

From c26798f5b7eecaa0db8ca6842300f71a297e5315 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 9 Mar 2022 01:20:54 +0100
Subject: [PATCH 0046/1686] sigil: update to 1.9.1.

---
 srcpkgs/sigil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 8e6fdb0c959e..47b8b14dd330 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.9.0
+version=1.9.1
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c44b0cf2472ef59c4d76178883a7795af39febf32496fb7af1e34f7a3977791f
+checksum=08a6c52a9043ecb5fa8314783191b81aa21346bd6b937a522ee417e7bb0dc773
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From 7bca3f0764210c01ae077e9702b12e11ea526b16 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 8 Mar 2022 15:19:04 +0100
Subject: [PATCH 0047/1686] dbeaver: update to 22.0.0.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index d6c1958bbb3e..d20837b230c8 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=21.3.5
+version=22.0.0
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -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=c6f822f4e88bffd37ba0b2525625bbd83156ec36725c2d29101c97f12e280d03
+checksum=c4e995ce3c46723f071faefe8dc68df54f001c634e757a9bf89c594fe3a55613
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

From 2ba10af44f02eb1cffb2795e55adb7031c9b2ec7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 20:01:58 +0100
Subject: [PATCH 0048/1686] libgsf: update to 1.14.48.

---
 srcpkgs/libgsf/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template
index a0d675a3de49..132ac53261b5 100644
--- a/srcpkgs/libgsf/template
+++ b/srcpkgs/libgsf/template
@@ -1,6 +1,6 @@
 # Template file for 'libgsf'
 pkgname=libgsf
-version=1.14.47
+version=1.14.48
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -12,8 +12,9 @@ short_desc="Structured File Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.gnome.org/"
+changelog="https://gitlab.gnome.org/GNOME/libgsf/-/raw/master/ChangeLog"
 distfiles="${GNOME_SITE}/libgsf/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d188ebd3787b5375a8fd38ee6f761a2007de5e98fa0cf5623f271daa67ba774d
+checksum=ff86d7f1d46dd0ebefb7bd830a74a41db64362b987bf8853fff6ab4c1132b837
 
 pre_configure() {
 	autoreconf -fi

From 7704d801e4cdf6465f621e6b7e9e87b557392d34 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 19:49:10 +0100
Subject: [PATCH 0049/1686] libidn2: update to 2.3.2.

---
 srcpkgs/libidn2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libidn2/template b/srcpkgs/libidn2/template
index c3c2ce9e6a26..e7f490959388 100644
--- a/srcpkgs/libidn2/template
+++ b/srcpkgs/libidn2/template
@@ -1,6 +1,6 @@
 # Template file for 'libidn2'
 pkgname=libidn2
-version=2.3.1
+version=2.3.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake gettext-devel libtool pkg-config"
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later, LGPL-3.0-or-later"
 homepage="https://www.gnu.org/software/libidn/#libidn2"
 changelog="https://gitlab.com/libidn/libidn2/-/raw/master/NEWS"
 distfiles="${GNU_SITE}/libidn/libidn2-${version}.tar.gz"
-checksum=8af684943836b8b53965d5f5b6714ef13c26c91eaa36ce7d242e3d21f5d40f2d
+checksum=76940cd4e778e8093579a9d195b25fff5e936e9dc6242068528b437a76764f91
 
 pre_configure() {
 	autoreconf -if

From 340c2b55686bf003b388d273d9e39ed6c22ddfaa Mon Sep 17 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, 10 Mar 2022 07:28:31 +0700
Subject: [PATCH 0050/1686] spotify-adblock-linux: clean-up

---
 .../files/spotify-adblock.desktop                     | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop

diff --git a/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop b/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
deleted file mode 100644
index 074ba5775a5b..000000000000
--- a/srcpkgs/spotify-adblock-linux/files/spotify-adblock.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Spotify (adblock)
-GenericName=Music Player
-Icon=spotify-client
-TryExec=spotify
-Exec=env LD_PRELOAD=/usr/lib/spotify-adblock.so spotify %U
-Terminal=false
-MimeType=x-scheme-handler/spotify;
-Categories=Audio;Music;Player;AudioVideo;
-StartupWMClass=spotify

From 5b2219d7d408aaf7832f9f9de3ec505a388e26e2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 9 Mar 2022 15:38:47 +0100
Subject: [PATCH 0051/1686] firefox: update to 98.0.

---
 srcpkgs/firefox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 0f1d1933c03e..8d4e8b1ecb2a 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=97.0.2
+version=98.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=c9f127741beabde78b021dc95b1740259d01677d461400682cb30e072126f075
+checksum=fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd
 
 lib32disabled=yes
 

From 7563325fd5add7a990e7335ae8c329a826d6b8eb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 9 Mar 2022 15:38:55 +0100
Subject: [PATCH 0052/1686] firefox-i18n: update to 98.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 bfdb1893da22..713c5914d0ab 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=97.0.2
+version=98.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="711d38544847e9ea74ec6c1adc2a87359f6114f7538a19a08aa9b39af6d86af2
- 8805946b3e3a76175bb6a32c7dd3a0525274b076afcf19f786362299aad282d3
- da191476f0f624a47bba2bc1382333dca67fd256cb3a541d97642304afd17fd6
- dc12c37abd5747e84aae8e4d942e721015813cea6da9fb2da398c8b88317ecae
- c83f1458f8003ea1e746a2bc0e7c33a9bfe1b61827b8ef48b7940e7dcb7266d8
- b6ddab275ccdd04881834a185e11c3b2a6e85b44b054d98c00e67d2044213fef
- ddd33119b4e0e80493d6fadb1bf0cd1275b469ded565da0303e78e46b591b4bb
- d6f9f5fbd5579631b0d824bc4d0654e5862ad62bebcbeec63edae3550773500e
- 39e4bf91ca90d77dcb97f3642dcdf04e12fc297f5e33969f557ce9d35f8a095b
- d1a126bfbf375114b12716b3b68e59458f4189ae87feda89c3d0f33ab80e66d2
- 2a823e92ea4a24a751040a6651b53dc3909353db84748d03d413e982d0d5b09c
- 1215642aad0c49fa4ce33fd55a92fc9948f50193ffcc0f705b69024c76c3e554
- 9f207a5a7ab721971251b00732ddc4af52937626719f561298bdf958b44b3b08
- 91eec747e15c744f199a829c9f04c3f88c32cb4edd084ae928d1bbaad62e3b79
- 07db181ed390bb6b77f816e4b5277ecf113b5648a132be0ba810f139e9237449
- a056a7d25c9e7b931f0195bd88e5e10df63a2f9bcbf6b3b6712e6f0b01a16806
- fac5ca4b7254bb78ea66c802105f6d501fcf373c058fe8af9a2182ff2ca8f03f
- 38b88252d9c2d8ee248c82d2191ee85b8702d46c3abc5b357dc688501bee1e34
- c0f3663bf61d61433541222eedd1cd37ca83ac01aeb5749a0cd5fb3193b0afa3
- 6de41349be51985aa19de40f9d09cbadbce5e333da3e0b7b54e32da522db5cda
- 8950a2c95e19913c5244d7639d80a74e4ba98d7c83ef7d1249af9d8b30b855ab
- d4867cdc49f6d53f45bbbeccb6fcbec4fb0acded1c946025a491756243f56001
- 1e531ade63594207d98e8720cee2d5cd34d8734cbd133ad646ea5f5459308b4f
- e5779b7142b9bf7b533e47e7fd47fc30068f2d7db979671c190518b9a306bca8
- ca51dbf1af8da13176b22d90feeade8c3eaead1f115b7da1be34a2e53ab1e937
- fd4bb194dbbca5c9f6537fccbe3856da41fc8c0e6c33b81bd037053bfed3e5a3
- abcb4ea5b585eb4a78781692ca80b75c73955a3b4526b30df707d7146e1a2107
- f9e1a0222c41dccb742309be1fb6cb22e217e117ca9460121ec898672bca9e2a
- 9c57c19591de2803766b9e9847745378c224b907b026d9a9146be1e6134274e4
- 457e512d642c7f80ad8638421019ae2fd371b528167e2be0cfe0becca911fc2b
- da11d9b3451f917aa388b342c829f00d6f81e219cfbd06605a8d922513849214
- da8d02366543bd36a29336fb203fba5011980b71847889fd24657626b61a8cbe
- ea49c349b6be0ff747fea4d08debdb0e4507307792ecd51c05f1929c646d5992
- 5015f52f2a061bd891d905b4d929915b57dd7440ddac59b62ee1389528523e09
- 661beeb7d220ad86e108be57cb032ec619fcfe735f78b6f96eb0f8d8b14d4ba2
- 1e80bdb89d96aa719363622f0a5960dae95b002a34d56f40f73817e50c9266a8
- be4f0af6b55af753315171b508c7aaca165ebbaaaf748cb6af36998b31df64b8
- 484dff3ca854329ef248c83df4413f4a41e1783f9e3ab44cb2b41e99b9788b0b
- 5a35b1184dadb6027960d1e0cd3acac6286f7ee3b67aecb93e0fe986803cf59f
- 61520b9337e75ea00b0c7e126fc36c4dcaf24564c5ee31f28a1209da75c7ec8a
- 775ccaacd49132212816313f4e881852374dd249dea2c7715935ef01f6123ccb
- db405bbe804d98b55d2aa526d7079c8702f0548d46ff83793ba238d2bf220d5f
- dd212faf00b2f48bf850f62c1f3615bb9ac6a3143217edad56b5812ae19ec15a
- 1aac0dbe4123b4fc88cf87255e7eb3b042e0415f49cd53e5fc910632ab614ccd
- f0faa8713a4ddd92d89ead3e202768c2ec448e060f18dc00fde87a7bc25dd76a
- b54474b2322b0845952e0a924a5f6e77195bebb5822c44c33622cf1061610b6a
- 2b6172294f78ee15a1c5fd751150132fe31cd8eb430e1f52d9e044a183473a92
- 00aaf9744109b74815042c5b1c8de65dbf6fe343dcb053567f4272c594da4257
- 71244a451478cda2dec27f8ec90890083ef735881f2c9704b98a9b6aefd84ce2
- 21434b8de86fe5248298e08722f11402f7840e68c019c93a6d215cb17dede252
- bb58afe4b2786da68441e919988b2203ab38ba25304d2d2223417655d0343c0b
- 91f9df67ed7b312cecd979d18041f6d395607a8564daa2bdeb16e74d2f60c1ae
- b8af6da30f2765375124fa213363c347590e11e5b7438605c1e0e0a9c347031d
- 1bd2f00d73573b568f1314a94246af52b5afd8dc509d620a9bc3021eaba75d37
- 200d15e3239f79fbec8a39e35f1f4139dcf434a9a1e9138a71d5c77535215b6a
- 4f4071649cf9b6e972bd3f7be36cea1939eefb4338aa5fa24cd9c6304fe74a62
- 7b9d7947fdd50a3ae7e49a26008c9fc8fafb443303ef4bfeb54e615483631989
- 2d9183491e5c460b8e662c495403e210e03a55a65cc3e57cb2d80c990e420d09
- b6655c5a9e2fb070508d70dd21d1a8da707d703335438ee8eccb76518d5273c8
- 3e4a696d97aa99c62f24bdf326c7cc628335f4b99e11aa242616509dd86ed50b
- dce0d2f0ced7865adb3cb34ce8295cfd23df5d796f7cce1da95ea084aed7063a
- a6fc74a8eeadb00237c21a0135681908a74b0a7dbc0a226f245bd4156cd2ec5b
- 0a1380c3993a7a275d8ef0a778784dbeeda62291010876378417e9511b47f982
- 0fdbd02fe36abeb72ed4aa728ab0e2c937d0224e583e464272d86f44d4609cbc
- f973ffbd380fce49db9edf64b5386ca57813b63d7a6f0435794f31f8c4a161fd
- 2ca75e3517ecd64125004806c98222dbc868c7a5ef8aef34ae5e81019b4591b5
- b228a9dc1a2e5b7b5fe78ce191d1c51e9db0013d05f580b80bc511d2618cf2ec
- 0ef7b62babd9ef2808490ee95dd6001d8a62c3106804c58757fb884fdf900410
- d985b8e7a677b694e64293f767f976ff4024763550e5b4150857724a7d5e36ee
- 8576c3c2d81f118f956a311fe54d5e4a45cf77c28d2aee30b62da7d27a266309
- cab9dc8fc76c26c82cd3c1a818e56f97524d413d6baaddb5fbfbc6446b0593f2
- c87bc1ae8c9c41cc61563f098fa88835bc67b947b7d8b8d8b2d2dc2fc941de1a
- 6bd7e96b564b99061f0f468d4b30ae77e72ef44909a5fee99ff5b2b2dd4f8706
- 81c4c1e7b9c9f315b8a3048bf784b990b0a71b38be837c1b73bf63945402d8c4
- f5ac4343c8bed58b9e018aac8964192a2b04cd10ebc95a6b1f37c306a47b85f7
- d8e0129850e4c1e312ffb9fdb3c42a2d671559387bc94e0668e93cf934273ba7
- 1264002195853450cdee6c7333775ed13fd26479d7fcb4e579113946fc97756a
- efe3fca2293b84d6b3eb28266677e0521fe7fc9e2985fcd5f6e0a3f6d6a46eeb
- ca496799f27d1566c3385e6f047f336fbf773bd9a6fa7e27bac97e853d17bed8
- a25e2715b447f329ccd749225a6155ae51b504908fed590f7e127ff6b5eb705f
- 0af4c3134d6c4362137406dfba47f3807ce582663a68362b32fb928a92f98580
- 1a4ad144cd1ba9773806bf8bf39b4b7bef26f35fc276e473c753d21a910a79d2
- 9c5bbe7d92835cb6b9ce9925352a74e95f22915930a39d17221e421cd0c1b948
- 92ebb48617b264736e1ea5b86b80dfc3f4fc3c517b29fe51fcfcb0f6bd5d10ed
- 0f1b1651f04f039d9fc55e183125a97b2806e7ab2654ad84fd0df050111f5bd9
- bb86e3d7e91f6102a4efbaff6f52ef24b277273185c46860fd7077017ac3dc8b
- 85e614958e4e9a59e88cb76ae1ff26c45e0f2aae1ac4545180e8bebeeb687327
- 4a3f9d8aaae340064bcf588455413387d9afee07737c9d62c65bae99004d5283
- 06fd12aade8ca116b7e33efdfd96d29701571bc9a966dd62ffcdb9243c155a7a
- 2038f234ba78e9a6ec5b97cabc445713369ac3ef14d9de7b152284a5c0b94ff4
- 4bb6828f28b425ccf1c73e08fef35db1ac065f062f64a8d2d6213b70554b2801
- bb51fd7d53e5ffd4b44967c0d1381a32777218be5cf4e1135cec05b8e07fdace
- ca95135eb63eb5bd9c4d63d92e9aae6af8ab44aea3730ac52b9382f65d7d1d90
- 54236cc83d40a305d35669c45ea670f6e07b2e3b0bacb01fb0f9f37149cb1478
- 1b18c0255e1f73ebad87795cea2bb8cffa62641c75476e4d9466088407bb66b5
- abb80985d3c25c6bd22d42643a74a5d585d77c7ff0c5264660a8bc06edbbf9d8"
+checksum="dff169f590c9ba54034df42a131d067a30e6ed967fc0e5142705df22d8ea977f
+ b73f738bae53b0afbe28d087a889ab7c98e3b325cfd5122cc60eea59a7db8616
+ 4f13f00bda1aafc6a2d97041fcb3740a4e8c1c049bba151b3791924d73d3ef06
+ 02ab060f05a1a2af373c2a3fe48ef891fa6d1835ddee77ba9678f22bb4782e86
+ b02d91316af55caf87abd7650b286f9c181eb7added7d021446ae2976ff69bbd
+ dfb07ae1cfc143166fdada9e378cb4f22e4ddda92d0e2c66e6a1d2742c51d0c0
+ 4a0409fdc266d1e819a178d558d90b3209c8423cf2794ca0fce3eedea947faa6
+ 567e77ed85bacaafbf82fbc90dfabae6e31be8acec5a2db8cfd28197d5bd1815
+ b92173bf696785e4f64f74871996c75c9fe96854e3194ebf7ff1dcc9f817b0d8
+ bbd223abe4457a1e7425f0cf035c7b6de33e26440d30af8655320ff9c68b124b
+ 8e98b9083a77a97886affbbf089e842b0286539fd93df18b031c8d7e8ac92d30
+ d4a94e6f5753e5f4d2a777830a0cb23ac94298278328bd3579606ceb47d949eb
+ 360dc9fd3a91eac883ca28efd02c218d7365d889146278129ea27424ba452a58
+ cd9bc801f9807b0b8f1dcb3ff8bed985cbe291ee95f25963617845d1d7de57b2
+ fd5b0f3d1d81c74ebd53b4e2f221cc79dbe9c2a936e73b6a983cb666d6c8f7a6
+ e2b37b8fa911c4bca068b0fce10db9fa28490c939c15fb8ffda785d396e6f33b
+ 2a0993286c9e5f1350a660636ec2b43c9c7d974ac9d1c2c979df888f81a90141
+ 2fc6465bc4dd66c23deacfa7d055a2bf50eb2db9a0a10c20f6f3b5321879e33e
+ b88cd11ed43a4f67897434281a4ebd7ef7cb3f4c4d041822fb672d0812d98a2d
+ 9d3de3237d2e12e72f9244151ff9c24caccbd7e1a560718f8f41a0bb7e96e2c9
+ 1cb6d182af78f237d0d01edba2263b01173377ddc0c9b1e7f5db1cf593765da8
+ 52a7d3401c0d333fcf98b33bff2fddc88ae017476e0be74c73359c01d9f7eaee
+ 661374e104b98180fba058d4ab6574246d4d9244739decdfcece493338f1ed3f
+ ba74a4dba80b8cde6a4105cd6179a72005123d1c92898496a2793479c1921676
+ c6259edeb1da7d3ca05ca4b3565408d02e48e3c7f7a254d56b41fdb3639cb56f
+ fddfbe98c0d309323981b685b134f000cc9c69518efc365c5c559ffd2c05b602
+ bee9c9a60147bcf86f55bccace7fe63316fb79af7cd45b8ffe43abba980db8b9
+ 8a4536988167922619e06721229fc91d087d56177ce2ad1a417dd52bc218814f
+ 1c11f7b7d2349d8bf0cbd3f6133d1f93b70b6d0176555d538e0bfb7774ea0de9
+ 52bc04a4c244de19b4e02a60b79fd760df35a2b825363a1e94c5becd535413ec
+ d19315771ccaf194add0459e85a44a8a11dc04f2d9b426201fd4c7000e4defe0
+ 3e0df7a54beb78791adfb9f56cc62c5cd01126e964fa90cc1bb65331b2d572f6
+ 49b38e6fe6746b2c3e4bcf8a1b7bc828ac8c5784dbe5b1039edde51d2e942dd3
+ 97751019d9f01120a0acf4153b3b06c2e476b83d5da8561bac349cdcba5fe095
+ bb222cce7ff359eeef5cbaad871aa42214ab5b62872deead6cc57068d0f1fd8b
+ fcff68e01cbf4740e7816fb61a15853f9be14034b3fdde1a67b22f80dd43ff33
+ bc7c2beadf026cd535635b540c2a8ca7953662b154b9e128378b6ab51ac62953
+ b1f207489d09eec55d486b467ceb88bd289b7238ff506a01318d797811121f95
+ 08dacf388f2a04796450d37c2a7db5270b3515c38ef0f0426ecc59915ae6b812
+ cc7e4230277d9b54f114048f951880aaf4ed88af03a5791e0dc091ecb947e956
+ cd6024b8bc6780265146720559fb1f828e36688eeec919044a62d365b440ba97
+ 33c1d05921e6041db7d09279da354e2d406798ffd14c67b9cf204e339fc1caee
+ 0264439a560fef95488a5aa05783b24e39d16acbed6f1b389a75864ac60f3267
+ f174f19aacd50078adceb236e9432feccaf0edc8aae9632191a4c38dab22b206
+ 596b84ba309ed661429c8fe5a13baa38e773f40b3b17c997d61834afec92b535
+ 6e2e243496089c084844868744ed2a736e621fc14fe95cdf3b5b7507d56b022e
+ 91449d6929c9c3068d0c724315e00d412f25c7ca72fddba53ac97c24f4214189
+ 138ca2aaf0f0a2decba98db228ac835b1299c841932bf683deb635a8cf226616
+ 299bacaffa3b2f8bc359b7bd33a9e4b5588546f7b75ea323ab63b6a25152ace1
+ c9eaa1d9e843a07eed355db514c10f8df0e898f9f177dc96eb721643218c6314
+ 5231901059f7a9d7b5bd7ff15168c469f2f7813c85c7266b70c20661e2eeb838
+ c2d0f151ffd2e9daf33bbffc2d069fd65c258d7c69b29f38785e2e395d8ff6c0
+ c2edbea7c2037a57524c4899a888eb0a3007593f0b39e8686a049b5dda10a768
+ 95acf4112f5b67f22f8df330e53e6cf764e1648f6fbbebc7feb316dc3eb6cf8f
+ 22224ae5b1818b86a5ce7b5872ebcea1c071009a6fe1abcfcf26cfe36b53c6b8
+ 035658f37f5a9c025db1386a89f5c05b72895b73c1a6826656055117afbd5239
+ 627d5f227d5e39c98802dabf68096f2588ee988afcdb13b95470457bb1f1c44c
+ 7d5f86ab7a0f47947ccfebf496e7e8164d433ee7560c39661a0f3d88995d72c4
+ 9623353017b1f980f43eae284662dbd2cd0b1ea1d8864e4fa6f86c83d78e7c06
+ 1fb1f82cbaca4a5463b8375709dc2e865dae4492ef294c7c39324fb867e58272
+ ad7df8473b55cc460476e05f265e7c496f711dbd6635b594e3d1cdd435ff6504
+ 38416b1b2ca89bec7e71e2143ba27e64b2c3319ef45499346b47dc30fbca793c
+ b55d6775b6bb9254b87692e244fd7078ec93c031efa51b6d205cff98a1651484
+ 66318b8528b59acba6be065989e51b5187a8735cc1be87fb25c835d9f5ae37af
+ 423f5a30c7174d2b41f5fcd38beaa232967990f66aec84769ce501402f5881a3
+ 7933dfd5d65816c54c8ab3da1455d6810c4d1532790d95c54b0bc4adc055ff40
+ a44392970b81bbc639822aaa9f73f7da4e64e39b91a402483d5bf98538fd88e4
+ 0cf1c29300b3fee8659c630bd37867323c42422b50bd429e9ca196025fbf090c
+ ff56285588b4bcc927db05ac856e2bf69d4f6b31c63d254242551c0315719854
+ cc1de1d246c39e1214186cbe88932b70e8e60121739faf9c88f24446e74445b8
+ b97123397c9f1419bd6ce9c62a7be178c35683b64fe3c20046ee4aeeadd2f83b
+ b09681f50489150130ae682139d6427f1fc77c2cb2a9debdd5db9fc4ae307a1c
+ 84f5dc461c256fd058522acf368c5d83a4560a8a478be5f5d551a1a194598374
+ 336a044de2b47ee875f27627059bef2dea0862908b2bd937416a2765ec91eeda
+ 3154deee82fe4fa24df33713a2a9688c1028c39df791732af097419dca83e3f6
+ 973e3de5de51533ebd699879ec1679525e7b35a0a74218f68c29a1b4d2280c2d
+ 18344197c44ed32c4cf31df5c4424d0128b6791a57fb910ce42e1f68d282e13d
+ 87c4014428af7f4303f9accc16951be16dc7122a191d1465d0a5e0b60486ef80
+ 6ca8549d8c1c91ca2136e49458b935974354640aa6bab2a8d2255868d56d87ed
+ 2a18628d8955170725121f5f5a2b4262e39456e9fd4a007bd387f2a14e235a50
+ 96cbf50ad97ada93a6e0156557911911e46c7963b34951cfe5abd0be3dbfaade
+ ba6fd1a48128dfa48a1f3c70b28181e658abbbf549e104d08df3f27197475dcc
+ 7bb5c17d1f1e25cfc735867f005563ead7de99c19e27f05a0efeced067ab50be
+ b3712f4146b50e243a6b2056d062045a14c9d8057ba1430f5c2662dac06ac34e
+ 8f1c167582e3d46cf2d24887b47dd4830f0dd084aefd7371b61ef716932db352
+ 29563c43673308e83437984ebe46e650a56e11be5fe2e1298946bc232287e121
+ 9badcf85535fc5b2282bdaea3fc6ac15d0f9f560524015321f0ed5c075fe7e5b
+ 1b6c1b1374e257cb5f699f71dbd1d2d1a287588548610272598a85b8133fcaef
+ 3aed734f122676a568c68a98a3243570dea7b06cf5a65f1be1ce060da2fe6804
+ a365cac889289ede9cf61a0fb73b8efe7cccf758167354ff43b29b3845777c82
+ 20c519b8cf6f16eac1fbc00b93178eb78c076f10518faf4c43f9606de6fbab83
+ 138ef57dc8947ef1580ee7fb0edc3459cd49a16ec296edabcfa913c784ee7320
+ 1b4fd65008d7780b9af4857ef91b9d4eccb97cb3469d90a982713812ab7c1b11
+ 1930509ac41ac78987f50332f9e44b66d0e27ad59fea56e933e05d4475012196
+ d6c16dec9ea82842f64e11ff7f6b4194f9b513f904423291ec8e7782ab7024f8
+ 54af90457d760ea7ac38b1b6d7b532996542192d0541004f9da9386fb5ea91ea"

From e217897ce8bcb170345bb9053096975f3211856f Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 17:57:12 -0600
Subject: [PATCH 0053/1686] Amass: update to 3.17.1.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 4f2e6ce8db16..271551b6b159 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.17.0
+version=3.17.1
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ 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=e1217f5a62f87bbde467bb772f7cdf8583db3de68cc7c1693402f450486b4c93
+checksum=5d11de26ce62dad9ddc4f36032a1192c2c126c4e23a31e1e04cb2d08098d5dfd
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From b5b518647a3c89d79980378fb8fbffd78e835ffc Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 17:58:17 -0600
Subject: [PATCH 0054/1686] eggdrop: update to 1.9.2.

---
 srcpkgs/eggdrop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index a2ec4f5e291c..fa8b5a4b163f 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,6 +1,6 @@
 # Template file for 'eggdrop'
 pkgname=eggdrop
-version=1.9.1
+version=1.9.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="tcl-devel"
@@ -10,7 +10,7 @@ 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=72916ff3b34d86b11c53317f8c91531c5ff5b64138b4f39aa10ee43aae01e884
+checksum=7e3667f31f9770708aa52a4dd6c7aa1f61b29cf62b90f7e13769aed28f7c5e39
 conf_files="/etc/eggdrop/text/banner /etc/eggdrop/text/motd"
 
 pre_build() {

From 812f686247b0822bf581ac917759bb5e417d54a9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 17:59:05 -0600
Subject: [PATCH 0055/1686] sqlmap: update to 1.6.3.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index e681d2086c4b..c77f23f03939 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.2
+version=1.6.3
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=e416cd76a5fc4a69a5e1b7924f95b9f2856272899a9db2fac475d4b3a7061e21
+checksum=a099cde73f57ba9e70ad7dd2f7473202a02929766471fc5701f64f2c16b304c2
 python_version=3
 
 do_install() {

From 7de9db1114e3544d8198f097e74f172ab8b8b63d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 18:01:22 -0600
Subject: [PATCH 0056/1686] python3-waitress: update to 2.1.0.

---
 srcpkgs/python3-waitress/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-waitress/template b/srcpkgs/python3-waitress/template
index d3cc687e412e..ae3ee23f6934 100644
--- a/srcpkgs/python3-waitress/template
+++ b/srcpkgs/python3-waitress/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-waitress'
 pkgname=python3-waitress
-version=2.0.0
+version=2.1.0
 revision=1
 wrksrc="waitress-${version}"
 build_style=python3-module
@@ -11,5 +11,5 @@ short_desc="Pure-Python WSGI server"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="ZPL-2.1"
 homepage="https://github.com/Pylons/waitress"
-distfiles="${PYPI_SITE}/w/waitress/waitress-2.0.0.tar.gz"
-checksum=69e1f242c7f80273490d3403c3976f3ac3b26e289856936d1f620ed48f321897
+distfiles="${PYPI_SITE}/w/waitress/waitress-${version}.tar.gz"
+checksum=ec8a8d9b6b15f3bb2c1a82b8f3929a029c333c35fcafb08c185a9e562d8cc9c2

From 7867d4289073b60bb4c51cada2ed99372dc06b02 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 7 Mar 2022 18:02:43 -0600
Subject: [PATCH 0057/1686] python3-ytmusicapi: update to 0.21.0.

---
 srcpkgs/python3-ytmusicapi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-ytmusicapi/template b/srcpkgs/python3-ytmusicapi/template
index 4c7faa119848..b791bcb33c0b 100644
--- a/srcpkgs/python3-ytmusicapi/template
+++ b/srcpkgs/python3-ytmusicapi/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ytmusicapi'
 pkgname=python3-ytmusicapi
-version=0.20.0
+version=0.21.0
 revision=1
 wrksrc="ytmusicapi-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/sigma67/ytmusicapi"
 distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
-checksum=16b986f687379f3e2411dac413316b789fb61a25df3209ed70e6b09d28908c6d
+checksum=338941fb2fb52078a69fa47a34456574e4e9998caead56d27e440bacacdb917c
 
 post_install() {
 	vlicense LICENSE

From 2930547bdef7cb878958b049ddda94ab1bee55ad Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 9 Mar 2022 19:46:43 -0500
Subject: [PATCH 0058/1686] just: update to 1.0.1, adopt.

---
 srcpkgs/just/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 0e9a5efa9f4f..156d04e3120d 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,15 +1,15 @@
 # Template file for 'just'
 pkgname=just
-version=1.0.0
+version=1.0.1
 revision=1
 build_style=cargo
 short_desc="Just a command runner"
-maintainer="Wilson Birney <wpb@360scada.com>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 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/refs/tags/${version}.tar.gz"
-checksum=19134e517976678a8f2e8fbff0eef79667c608ca09c0b7d3f96dd4197d9bb98b
+checksum=261532a3b72b34a79df01bb0c4a366bcc3fd870c5706340fec260faebddb42c6
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 9873ad8c43afdb8e3b888f2ad417bf4b97f1b998 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 9 Mar 2022 19:44:28 -0500
Subject: [PATCH 0059/1686] chezmoi: update to 2.14.0.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 286f3e1fb1ac..464d7ccc07ca 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.13.1
+version=2.14.0
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=52fba493bb9f987a7971bcc187e7af9c01277b00daa91e4113e2e1f68c634ae2
+checksum=4d7a1baf7e3caa8f6976b1ea5e6ba81c75273b1dd1f0fc946134a82454720397
 
 export CGO_ENABLED=1
 

From 982b0ee6d4aef27bf805c59bdf0a71a7f275dad4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 9 Mar 2022 19:11:23 -0500
Subject: [PATCH 0060/1686] mdcat: update to 0.26.1, restore cross, adopt.

---
 srcpkgs/mdcat/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index 9a3ea193604c..c07dbd3b3913 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,21 +1,20 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.25.0
+version=0.26.1
 revision=1
-wrksrc="${pkgname}-${pkgname}-${version}"
+wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config ruby-asciidoctor"
 makedepends="openssl-devel"
 short_desc="Cat for markdown"
-maintainer="Wilson Birney <wpb@360scada.com>"
+maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MPL-2.0"
-homepage="https://github.com/lunaryorn/mdcat"
-changelog="https://raw.githubusercontent.com/lunaryorn/mdcat/main/CHANGELOG.md"
-distfiles="https://github.com/lunaryorn/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=92fddabab24f2e7d673b06c1f31a7746abbb547c5581faaed17a8e3e1e5b17a5
+homepage="https://codeberg.org/flausch/mdcat/"
+changelog="https://codeberg.org/flausch/mdcat/raw/branch/main/CHANGELOG.md"
+distfiles="https://codeberg.org/flausch/mdcat/archive/mdcat-${version}.tar.gz"
+checksum=1120c4f3b5b517075b6347dbfe76a2211a91837b4d0242c0b72cdbc19e6886dd
 
 case "$XBPS_TARGET_MACHINE" in
-	armv6l|armv7l) broken="https://build.voidlinux.org/builders/armv7l_builder/builds/36158/steps/shell_3/logs/stdio" ;;
 	x86_64*|i686*|arm*|aarch64*) ;;
 	*) broken="ftbfs in ring" ;;
 esac

From b9ba38019a387198ff4d7a148028777ca6f65571 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 10 Mar 2022 13:24:44 +0100
Subject: [PATCH 0061/1686] nncp: update to 8.7.1.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index 43de7495a654..e6d62ac2f55f 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=8.7.0
+version=8.7.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=ed488ffd7d88028bdd64386bec4ad9116f7da0881fb1e628493d2f2bbbd1e868
+checksum=ceb4d197af5a8d9e93b749d5c0f50b53e6746a318af47b364bf5cb323d6c4ebd
 
 do_build() {
 	make

From fdd9356a23cab0d35d3f4b0b6e4ffc5b84b90bb3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 10 Mar 2022 13:25:22 +0100
Subject: [PATCH 0062/1686] mcomix: update to 2.0.1.

---
 srcpkgs/mcomix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mcomix/template b/srcpkgs/mcomix/template
index 3f26682f077e..6baf097d98dd 100644
--- a/srcpkgs/mcomix/template
+++ b/srcpkgs/mcomix/template
@@ -1,6 +1,6 @@
 # Template file for 'mcomix'
 pkgname=mcomix
-version=2.0.0
+version=2.0.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="http://sourceforge.net/projects/mcomix/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/MComix-${version}/${pkgname}-${version}.tar.gz"
-checksum=a3ef3d76ee34a82b67e91d3ea0e2b19b88179421698c73453829eceaca895d89
+checksum=57f97ebac913f8b9021b4cb52e135b205ef58353d16d9f838d62f55d0252eca0
 
 post_install() {
 	cp -r mcomix/images ${DESTDIR}/usr/lib/python3.*/site-packages/mcomix

From 5e3dcc63a071e7ecef3a57053d10ceef7ab13e02 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Wed, 9 Mar 2022 00:02:11 -0500
Subject: [PATCH 0063/1686] ghostscript: update to 9.55.0.

Remove patch for CVE-2021-3781 as it is included in the current release.

Include a patch for a typo in the current release:
https://bugs.ghostscript.com/show_bug.cgi?id=704501
---
 .../ghostscript/patches/CVE-2021-3781.patch   | 233 ------------------
 .../fix_gscms_transform_color_typo.patch      |  11 +
 srcpkgs/ghostscript/template                  |   7 +-
 3 files changed, 15 insertions(+), 236 deletions(-)
 delete mode 100644 srcpkgs/ghostscript/patches/CVE-2021-3781.patch
 create mode 100644 srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch

diff --git a/srcpkgs/ghostscript/patches/CVE-2021-3781.patch b/srcpkgs/ghostscript/patches/CVE-2021-3781.patch
deleted file mode 100644
index e9c34ee05b51..000000000000
--- a/srcpkgs/ghostscript/patches/CVE-2021-3781.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=a9bd3dec9fde
-
-From a9bd3dec9fde03327a4a2c69dad1036bf9632e20 Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Tue, 7 Sep 2021 20:36:12 +0100
-Subject: [PATCH] Bug 704342: Include device specifier strings in access
- validation
-
-for the "%pipe%", %handle%" and %printer% io devices.
-
-We previously validated only the part after the "%pipe%" Postscript device
-specifier, but this proved insufficient.
-
-This rebuilds the original file name string, and validates it complete. The
-slight complication for "%pipe%" is it can be reached implicitly using
-"|" so we have to check both prefixes.
-
-Addresses CVE-2021-3781
----
- base/gdevpipe.c | 22 +++++++++++++++-
- base/gp_mshdl.c | 11 +++++++-
- base/gp_msprn.c | 10 ++++++-
- base/gp_os2pr.c | 13 +++++++++-
- base/gslibctx.c | 69 ++++++++++---------------------------------------
- 5 files changed, 65 insertions(+), 60 deletions(-)
-
-diff --git a/base/gdevpipe.c b/base/gdevpipe.c
-index 96d71f5d8..5bdc485be 100644
---- a/base/gdevpipe.c
-+++ b/base/gdevpipe.c
-@@ -72,8 +72,28 @@ pipe_fopen(gx_io_device * iodev, const char *fname, const char *access,
- #else
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    /* The pipe device can be reached in two ways, explicltly with %pipe%
-+       or implicitly with "|", so we have to check for both
-+     */
-+    char f[gp_file_name_sizeof];
-+    const char *pipestr = "|";
-+    const size_t pipestrlen = strlen(pipestr);
-+    const size_t preflen = strlen(iodev->dname);
-+    const size_t nlen = strlen(fname);
-+    int code1;
-+
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(f, iodev->dname, preflen);
-+    memcpy(f + preflen, fname, nlen + 1);
-+
-+    code1 = gp_validate_path(mem, f, access);
-+
-+    memcpy(f, pipestr, pipestrlen);
-+    memcpy(f + pipestrlen, fname, nlen + 1);
- 
--    if (gp_validate_path(mem, fname, access) != 0)
-+    if (code1 != 0 && gp_validate_path(mem, f, access) != 0 )
-         return gs_error_invalidfileaccess;
- 
-     /*
-diff --git a/base/gp_mshdl.c b/base/gp_mshdl.c
-index 2b964ed74..8d87ceadc 100644
---- a/base/gp_mshdl.c
-+++ b/base/gp_mshdl.c
-@@ -95,8 +95,17 @@ mswin_handle_fopen(gx_io_device * iodev, const char *fname, const char *access,
-     long hfile;	/* Correct for Win32, may be wrong for Win64 */
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    char f[gp_file_name_sizeof];
-+    const size_t preflen = strlen(iodev->dname);
-+    const size_t nlen = strlen(fname);
- 
--    if (gp_validate_path(mem, fname, access) != 0)
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(f, iodev->dname, preflen);
-+    memcpy(f + preflen, fname, nlen + 1);
-+
-+    if (gp_validate_path(mem, f, access) != 0)
-         return gs_error_invalidfileaccess;
- 
-     /* First we try the open_handle method. */
-diff --git a/base/gp_msprn.c b/base/gp_msprn.c
-index ed4827968..746a974f7 100644
---- a/base/gp_msprn.c
-+++ b/base/gp_msprn.c
-@@ -168,8 +168,16 @@ mswin_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
-     uintptr_t *ptid = &((tid_t *)(iodev->state))->tid;
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    const size_t preflen = strlen(iodev->dname);
-+    const size_t nlen = strlen(fname);
- 
--    if (gp_validate_path(mem, fname, access) != 0)
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(pname, iodev->dname, preflen);
-+    memcpy(pname + preflen, fname, nlen + 1);
-+
-+    if (gp_validate_path(mem, pname, access) != 0)
-         return gs_error_invalidfileaccess;
- 
-     /* First we try the open_printer method. */
-diff --git a/base/gp_os2pr.c b/base/gp_os2pr.c
-index f852c71fc..ba54cde66 100644
---- a/base/gp_os2pr.c
-+++ b/base/gp_os2pr.c
-@@ -107,9 +107,20 @@ os2_printer_fopen(gx_io_device * iodev, const char *fname, const char *access,
-            FILE ** pfile, char *rfname, uint rnamelen)
- {
-     os2_printer_t *pr = (os2_printer_t *)iodev->state;
--    char driver_name[256];
-+    char driver_name[gp_file_name_sizeof];
-     gs_lib_ctx_t *ctx = mem->gs_lib_ctx;
-     gs_fs_list_t *fs = ctx->core->fs;
-+    const size_t preflen = strlen(iodev->dname);
-+    const int size_t = strlen(fname);
-+
-+    if (preflen + nlen >= gp_file_name_sizeof)
-+        return_error(gs_error_invalidaccess);
-+
-+    memcpy(driver_name, iodev->dname, preflen);
-+    memcpy(driver_name + preflen, fname, nlen + 1);
-+
-+    if (gp_validate_path(mem, driver_name, access) != 0)
-+        return gs_error_invalidfileaccess;
- 
-     /* First we try the open_printer method. */
-     /* Note that the loop condition here ensures we don't
-diff --git a/base/gslibctx.c b/base/gslibctx.c
-index 6dfed6cd5..318039fad 100644
---- a/base/gslibctx.c
-+++ b/base/gslibctx.c
-@@ -655,82 +655,39 @@ rewrite_percent_specifiers(char *s)
- int
- gs_add_outputfile_control_path(gs_memory_t *mem, const char *fname)
- {
--    char *fp, f[gp_file_name_sizeof];
--    const int pipe = 124; /* ASCII code for '|' */
--    const int len = strlen(fname);
--    int i, code;
-+    char f[gp_file_name_sizeof];
-+    int code;
- 
-     /* Be sure the string copy will fit */
--    if (len >= gp_file_name_sizeof)
-+    if (strlen(fname) >= gp_file_name_sizeof)
-         return gs_error_rangecheck;
-     strcpy(f, fname);
--    fp = f;
-     /* Try to rewrite any %d (or similar) in the string */
-     rewrite_percent_specifiers(f);
--    for (i = 0; i < len; i++) {
--        if (f[i] == pipe) {
--           fp = &f[i + 1];
--           /* Because we potentially have to check file permissions at two levels
--              for the output file (gx_device_open_output_file and the low level
--              fopen API, if we're using a pipe, we have to add both the full string,
--              (including the '|', and just the command to which we pipe - since at
--              the pipe_fopen(), the leading '|' has been stripped.
--            */
--           code = gs_add_control_path(mem, gs_permit_file_writing, f);
--           if (code < 0)
--               return code;
--           code = gs_add_control_path(mem, gs_permit_file_control, f);
--           if (code < 0)
--               return code;
--           break;
--        }
--        if (!IS_WHITESPACE(f[i]))
--            break;
--    }
--    code = gs_add_control_path(mem, gs_permit_file_control, fp);
-+
-+    code = gs_add_control_path(mem, gs_permit_file_control, f);
-     if (code < 0)
-         return code;
--    return gs_add_control_path(mem, gs_permit_file_writing, fp);
-+    return gs_add_control_path(mem, gs_permit_file_writing, f);
- }
- 
- int
- gs_remove_outputfile_control_path(gs_memory_t *mem, const char *fname)
- {
--    char *fp, f[gp_file_name_sizeof];
--    const int pipe = 124; /* ASCII code for '|' */
--    const int len = strlen(fname);
--    int i, code;
-+    char f[gp_file_name_sizeof];
-+    int code;
- 
-     /* Be sure the string copy will fit */
--    if (len >= gp_file_name_sizeof)
-+    if (strlen(fname) >= gp_file_name_sizeof)
-         return gs_error_rangecheck;
-     strcpy(f, fname);
--    fp = f;
-     /* Try to rewrite any %d (or similar) in the string */
--    for (i = 0; i < len; i++) {
--        if (f[i] == pipe) {
--           fp = &f[i + 1];
--           /* Because we potentially have to check file permissions at two levels
--              for the output file (gx_device_open_output_file and the low level
--              fopen API, if we're using a pipe, we have to add both the full string,
--              (including the '|', and just the command to which we pipe - since at
--              the pipe_fopen(), the leading '|' has been stripped.
--            */
--           code = gs_remove_control_path(mem, gs_permit_file_writing, f);
--           if (code < 0)
--               return code;
--           code = gs_remove_control_path(mem, gs_permit_file_control, f);
--           if (code < 0)
--               return code;
--           break;
--        }
--        if (!IS_WHITESPACE(f[i]))
--            break;
--    }
--    code = gs_remove_control_path(mem, gs_permit_file_control, fp);
-+    rewrite_percent_specifiers(f);
-+
-+    code = gs_remove_control_path(mem, gs_permit_file_control, f);
-     if (code < 0)
-         return code;
--    return gs_remove_control_path(mem, gs_permit_file_writing, fp);
-+    return gs_remove_control_path(mem, gs_permit_file_writing, f);
- }
- 
- int
--- 
-2.17.1
diff --git a/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch b/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
new file mode 100644
index 000000000000..9ffa2e09ba66
--- /dev/null
+++ b/srcpkgs/ghostscript/patches/fix_gscms_transform_color_typo.patch
@@ -0,0 +1,11 @@
+--- ./base/gsicc_lcms2.c.jlg	2021-09-27 03:44:02.000000000 -0400
++++ ./base/gsicc_lcms2.c	2021-10-05 10:50:03.428000000 -0400
+@@ -462,7 +462,7 @@
+ gscms_transform_color(gx_device *dev, gsicc_link_t *icclink, void *inputcolor,
+                              void *outputcolor, int num_bytes)
+ {
+-    return gscms_transformm_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
++    return gscms_transform_color_const(dev, icclink, inputcolor, outputcolor, num_bytes);
+ }
+ 
+ int
diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template
index 5d9e1aa9d410..8bce83846ad8 100644
--- a/srcpkgs/ghostscript/template
+++ b/srcpkgs/ghostscript/template
@@ -1,7 +1,7 @@
 # Template file for 'ghostscript'
 pkgname=ghostscript
-version=9.54.0
-revision=2
+version=9.55.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"
@@ -10,8 +10,9 @@ short_desc="Interpreter for the PostScript language"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-or-later, CPL-1.0"
 homepage="https://www.ghostscript.com/"
+changelog="https://www.ghostscript.com/doc/${version}/News.htm"
 distfiles="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${version//./}/ghostscript-${version}.tar.xz"
-checksum=c2b7b43cde600f4e70efb2cd95865f6d884a67315c3de235914697d8ccde6e3b
+checksum=6ee3057773646d6a2c6d117eb53a17d6752feadc513828e4322f68b7b7789ff6
 
 build_options="cups"
 build_options_default="cups"

From 2a7dd8964f11bffa8cf1e4ee0e582e8cc643d716 Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Thu, 10 Mar 2022 13:44:18 +0100
Subject: [PATCH 0064/1686] jless: update to 0.8.0

---
 srcpkgs/jless/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jless/template b/srcpkgs/jless/template
index 2d4cfa1f1865..0de4ebf061dc 100644
--- a/srcpkgs/jless/template
+++ b/srcpkgs/jless/template
@@ -1,14 +1,16 @@
 # Template file for 'jless'
 pkgname=jless
-version=0.7.2
+version=0.8.0
 revision=1
 build_style=cargo
+hostmakedepends="python3"
+makedepends="xcb-util-devel"
 short_desc="Pager for JSON data"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/PaulJuliusMartinez/jless"
 distfiles="https://github.com/PaulJuliusMartinez/jless/archive/refs/tags/v${version}.tar.gz"
-checksum=5d776cb6488743ccdaeeffb4bfc54d84862028170cee852a8bb5c156526ed263
+checksum=3f1168c9b2432f7f4fa9dd3c31b55e371ef9d6f822dc98a8cdce5318a112bf2d
 
 post_install() {
 	vlicense LICENSE

From 68e970f5642cd34905acef0f5c8bdce442f28656 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 10 Mar 2022 21:51:21 +0100
Subject: [PATCH 0065/1686] firefox: mark broken for armv7l*

---
 srcpkgs/firefox/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 8d4e8b1ecb2a..6c1596b19e06 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -32,6 +32,7 @@ build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 
 case $XBPS_TARGET_MACHINE in
 	armv[56]*) broken="required NEON extensions are not supported on armv6" ;;
+	armv7*) broken="currently broken" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
 esac

From cf8e09bed0e5849aab80ea9becb609ebecc601c1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 9 Mar 2022 18:50:46 -0600
Subject: [PATCH 0066/1686] bzflag: update to 2.4.24.

---
 srcpkgs/bzflag/patches/NetHandler-musl.patch | 11 -----------
 srcpkgs/bzflag/template                      |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/bzflag/patches/NetHandler-musl.patch

diff --git a/srcpkgs/bzflag/patches/NetHandler-musl.patch b/srcpkgs/bzflag/patches/NetHandler-musl.patch
deleted file mode 100644
index 75385ce3ca86..000000000000
--- a/srcpkgs/bzflag/patches/NetHandler-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/game/NetHandler.cxx	2018-01-22 12:28:31.043278572 -0600
-+++ b/src/game/NetHandler.cxx	2018-01-22 12:28:07.889568033 -0600
-@@ -135,7 +135,7 @@
-   uint16_t code;
-   while (true) {
-     n = recvfrom(udpSocket, buffer, MaxUDPPacketLen, 0, (struct sockaddr *) uaddr,
--		 &recvlen);
-+		 (socklen_t*)&recvlen);
-     if ((n < 0) || (n >= 4))
-       break;
-   }
diff --git a/srcpkgs/bzflag/template b/srcpkgs/bzflag/template
index d58270495975..59f664f1c059 100644
--- a/srcpkgs/bzflag/template
+++ b/srcpkgs/bzflag/template
@@ -1,6 +1,6 @@
 # Template file for 'bzflag'
 pkgname=bzflag
-version=2.4.22
+version=2.4.24
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="LGPL-2.1-only, MPL-2.0"
 homepage="https://www.bzflag.org"
 changelog="https://raw.githubusercontent.com/BZFlag-Dev/bzflag/2.4/ChangeLog"
 distfiles="https://download.bzflag.org/bzflag/source/${version}/bzflag-${version}.tar.bz2"
-checksum=9e64653302b657bd8b5f96fe1150a9ff80a1d53a6d7e8a35138c6b1b02006a4d
+checksum=5f8131beb7fc8ba51e323a06ecd7d8eab91537c342ce87a113e5eb6ea98ce3c4

From 80982d5347fa002966fe159240218b1b40b841f4 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Thu, 10 Mar 2022 02:02:43 +0200
Subject: [PATCH 0067/1686] spotify: update to 1.1.80.

Closes: #36073 [via git-merge-pr]
---
 srcpkgs/spotify/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 185d59ecdb5c..32d439d290f8 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,8 +1,8 @@
 # Template file for 'spotify'
 pkgname=spotify
-version=1.1.72
+version=1.1.80
 revision=1
-_ver="${version}.439.gc253025e_amd64"
+_ver="${version}.699.gc3dac750_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=c211a16b6ed6627c4b7d8ca6997376f8345dca638938696933c5495405ce9e16
+checksum=19f80255b89d768969ff9d6a05d90091a30c05f65eabdd968592d47a7754b80e
 _license_checksum=4465d0bba5deb87866184b04ba76604cd93561c0dc9cd21cacdf5b0295bdae3a
 repository=nonfree
 restricted=yes

From 9587b57212400294d8dc121c7c04bcb9972123fe Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 10 Mar 2022 16:26:06 -0600
Subject: [PATCH 0068/1686] xlockmore: update to 5.69.

---
 srcpkgs/xlockmore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xlockmore/template b/srcpkgs/xlockmore/template
index b79c581190bd..c520c4d7b4c6 100644
--- a/srcpkgs/xlockmore/template
+++ b/srcpkgs/xlockmore/template
@@ -1,6 +1,6 @@
 # Template file for 'xlockmore'
 pkgname=xlockmore
-version=5.68
+version=5.69
 revision=1
 build_style=gnu-configure
 configure_args="--with-xinerama $(vopt_if opengl '--with-opengl --with-mesa')"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="http://sillycycle.com/xlockmore.html"
 changelog="http://sillycycle.com/xlock/xlockmore.README"
 distfiles="http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"
-checksum=30731fdcb203f16eb5c1c43c05d42e452ad0eb4555c97c55566a6ecb1877cd6e
+checksum=ea92654c001226848765a251a73bcbc473ccef17b721cc18d5361f59dbd6d3b9
 CFLAGS="-D_DEFAULT_SOURCE"
 
 build_options="opengl"

From 5ca79ac0877db93e4821490e87e8127ca805e814 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 11 Mar 2022 00:18:57 +0100
Subject: [PATCH 0069/1686] plank: add dependencies to -devel subpkg

---
 srcpkgs/plank/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plank/template b/srcpkgs/plank/template
index 71793ba1429a..232f336c0d93 100644
--- a/srcpkgs/plank/template
+++ b/srcpkgs/plank/template
@@ -1,7 +1,7 @@
 # Template file for 'plank'
 pkgname=plank
 version=0.11.89
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="$(vopt_enable dbusmenu) --disable-apport"
 hostmakedepends="intltool libgee08-devel glib-devel pkg-config libxml2 vala
@@ -21,7 +21,8 @@ build_options_default="dbusmenu"
 
 plank-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} cairo-devel libgee08-devel
+	 libglib-devel gtk+3-devel gdk-pixbuf-devel bamf-devel"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

From d3ea27e31a24a13d08f1d3a90dafe6a01d259bd5 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:07:35 -0800
Subject: [PATCH 0070/1686] podman: update to 4.0.2

---
 srcpkgs/podman/patches/musl.patch | 47 -------------------------------
 srcpkgs/podman/template           | 11 +++++---
 2 files changed, 7 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/podman/patches/musl.patch

diff --git a/srcpkgs/podman/patches/musl.patch b/srcpkgs/podman/patches/musl.patch
deleted file mode 100644
index 2732d190233c..000000000000
--- a/srcpkgs/podman/patches/musl.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 1d781ccbeab3364ac18c487f66893847fe5e102f Mon Sep 17 00:00:00 2001
-From: Marc Nguyen <nguyen_marc@live.fr>
-Date: Fri, 10 Dec 2021 03:07:20 +0100
-Subject: [PATCH] [NO NEW TESTS NEEDED] rootless: declare TEMP_FAILURE_RETRY
- before usage (Fixes: #12563)
-
-Signed-off-by: Nguyen Marc <nguyen_marc@live.fr>
----
- pkg/rootless/rootless_linux.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c
-index e71d5d999fe..92f331ce493 100644
---- a/pkg/rootless/rootless_linux.c
-+++ b/pkg/rootless/rootless_linux.c
-@@ -19,6 +19,15 @@
- #include <sys/select.h>
- #include <stdio.h>
- 
-+#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
-+
- #define cleanup_free __attribute__ ((cleanup (cleanup_freep)))
- #define cleanup_close __attribute__ ((cleanup (cleanup_closep)))
- #define cleanup_dir __attribute__ ((cleanup (cleanup_dirp)))
-@@ -72,15 +81,6 @@ int rename_noreplace (int olddirfd, const char *oldpath, int newdirfd, const cha
-   return rename (oldpath, newpath);
- }
- 
--#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 const char *_max_user_namespaces = "/proc/sys/user/max_user_namespaces";
- static const char *_unprivileged_user_namespaces = "/proc/sys/kernel/unprivileged_userns_clone";
- 
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 8558180f3a4b..e83467c87f7c 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,9 +1,9 @@
 # Template file for 'podman'
 pkgname=podman
-version=3.4.4
+version=4.0.2
 revision=1
 build_style=go
-go_import_path="github.com/containers/podman/v3"
+go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman"
 go_build_tags="seccomp apparmor containers_image_ostree_stub"
 hostmakedepends="pkg-config go-md2man"
@@ -15,15 +15,18 @@ license="Apache-2.0"
 homepage="https://podman.io/"
 changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=718c9e1e734c2d374fcf3c59e4cc7c1755acb954fc7565093e1d636c04b72e3a
+checksum=cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"
 fi
 
+post_build() {
+	make docs
+}
+
 post_install() {
 	make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
-	make install.completions DESTDIR="${DESTDIR}" PREFIX="/usr"
 	sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
 		vendor/github.com/containers/common/pkg/config/containers.conf \
 		>containers.cgfs.conf

From 2040e40a4cf65e82ad934736a8c62b2dad615b8c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:15:51 -0800
Subject: [PATCH 0071/1686] fuse-overlayfs: update to 1.8.2

---
 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 ebf055c49202..0fb2a3a56503 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.8.1
+version=1.8.2
 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=99cc7fac93716527c054f90c86eea508b7b87ca2132776c30544660e5365aba2
+checksum=dfcadb2d7e1d109db42cca250fbe3341bbd463ac25f5950b2b56bd7618c0fc0f
 
 pre_configure() {
 	./autogen.sh

From 0c5e93c6b76b495558ca1b87d9f8fbf7d1811d7e Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:26:50 -0800
Subject: [PATCH 0072/1686] conmon: update to 2.1.0

---
 srcpkgs/conmon/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/conmon/template b/srcpkgs/conmon/template
index a165b519932c..6d26aed4983c 100644
--- a/srcpkgs/conmon/template
+++ b/srcpkgs/conmon/template
@@ -1,6 +1,6 @@
 # Template file for 'conmon'
 pkgname=conmon
-version=2.0.32
+version=2.1.0
 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=0ffd17a185322779d14d9a64c39120900f1e0cc3297b18679a933f5f6ba06a75
+checksum=874909d831feac75e452562087f6ea0eb39848ef144397bdd8f0daf579c5ee85
 
 do_install() {
 	vbin bin/conmon

From cceb3ab52c5c4a9843c8883f5d693715909b8a7a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 10 Mar 2022 11:37:49 +0100
Subject: [PATCH 0073/1686] revive: update to 1.1.4.

---
 srcpkgs/revive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index e6895a6daf1c..55a011447362 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,6 +1,6 @@
 # Template file for 'revive'
 pkgname=revive
-version=1.1.2
+version=1.1.4
 revision=1
 build_style=go
 go_ldflags="-X main.version=$version -X main.builtBy=xbps"
@@ -10,7 +10,7 @@ maintainer="Roberto Ricci <ricci@disroot.org>"
 license="MIT"
 homepage="https://revive.run/"
 distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz"
-checksum=b2dd477895e11de93ef076a7ad8186003c5ccc87416909e281eed63d8e26d1db
+checksum=afe0d11a614d5ca706485b7f6ca1e53b374b45017ea75f14149a4434d3ef74b5
 
 do_check() {
 	go test -v ./...

From e2c2e6d2985682e3fc2acfd588561dbd32346c4f Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sat, 9 Oct 2021 15:35:58 +0200
Subject: [PATCH 0074/1686] ghc: update to 8.10.7

Closes https://github.com/void-linux/void-packages/pull/33850
---
 srcpkgs/ghc/patches/ppc64-be-elfv2.patch |  9 ---------
 srcpkgs/ghc/patches/sphinx-unicode.patch | 17 -----------------
 srcpkgs/ghc/template                     |  4 ++--
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/ghc/patches/sphinx-unicode.patch

diff --git a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
index 41ad0ceb3463..275444e828b7 100644
--- a/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
+++ b/srcpkgs/ghc/patches/ppc64-be-elfv2.patch
@@ -128,15 +128,6 @@ index d360cfe..ab7ede7 100644
                    STG_UNUSED
  #endif
                )
-@@ -1007,7 +1007,7 @@ TODO: Depending on how much allocation overhead stgMallocBytes uses for
-         }
-     }
-
--#elif defined(powerpc_HOST_ARCH) || defined(powerpc64_HOST_ARCH)
-+#elif defined(powerpc_HOST_ARCH) || (defined(powerpc64_HOST_ARCH) && (_CALL_ELF != 2))
-
- #define OP_LO(op,lo)  ((((unsigned)(op)) << 16) | (((unsigned)(lo)) & 0xFFFF))
- #define OP_HI(op,hi)  ((((unsigned)(op)) << 16) | (((unsigned)(hi)) >> 16))
 @@ -1271,7 +1271,7 @@ freeHaskellFunctionPtr(void* ptr)
     return;
   }
diff --git a/srcpkgs/ghc/patches/sphinx-unicode.patch b/srcpkgs/ghc/patches/sphinx-unicode.patch
deleted file mode 100644
index 5a09de43bc0c..000000000000
--- a/srcpkgs/ghc/patches/sphinx-unicode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rpU2 ghc-8.8.4-orig/docs/users_guide/conf.py ghc-8.8.4/docs/users_guide/conf.py
---- ghc-8.8.4-orig/docs/users_guide/conf.py	2020-07-08 16:43:03.000000000 +0000
-+++ ghc-8.8.4/docs/users_guide/conf.py	2021-07-10 20:25:33.536928487 +0000
-@@ -101,5 +101,5 @@ latex_elements = {
-     'inputenc': '',
-     'utf8extra': '',
--    'preamble': '''
-+    'preamble': r'''
- \usepackage{fontspec}
- \usepackage{makeidx}
-@@ -107,5 +107,5 @@ latex_elements = {
- \setromanfont{DejaVu Serif}
- \setmonofont{DejaVu Sans Mono}
--\setlength{\\tymin}{45pt}
-+\setlength{\tymin}{45pt}
- ''',
- }
diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template
index 3bb7aa59f705..b8b16f67b433 100644
--- a/srcpkgs/ghc/template
+++ b/srcpkgs/ghc/template
@@ -1,7 +1,7 @@
 # Template file for 'ghc'
 pkgname=ghc
 # Keep this synchronized with http://www.stackage.org/lts
-version=8.10.4
+version=8.10.7
 revision=1
 wrksrc="ghc-${version%[!0-9]}"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="BSD-3-Clause"
 homepage="http://www.haskell.org/ghc/"
 distfiles="http://www.haskell.org/ghc/dist/${version%[!0-9]}/${pkgname}-${version%[!0-9]}-src.tar.xz"
-checksum=52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+checksum=e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d
 nocross=yes # this is conditionally unset for cross bindist
 nodebug=yes # work around assembler error "Fatal error: duplicate .debug_line sections"
 _bindir="/usr/lib/${pkgname}-${version}/bin"

From d53f93b5cda22e8b08323c5fcfa093e5f2efd8cb Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Sun, 10 Oct 2021 17:33:05 +0200
Subject: [PATCH 0075/1686] cabal-install: update to 3.6.2.0

As of version 3.6.0.0, Cabal does not issue separate versions of
`cabal-install` on GitHub anymore.  Hence, we have to change the
respective paths and wrksrc directories.
---
 .../patches/ghc-8.10.4-build.diff             | 43 -------------------
 srcpkgs/cabal-install/template                | 14 +++---
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff

diff --git a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff b/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
deleted file mode 100644
index a3eaaa90f4f1..000000000000
--- a/srcpkgs/cabal-install/patches/ghc-8.10.4-build.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/bootstrap/linux-8.10.1.json	2021-02-20 11:28:17.000000000 +0100
-+++ b/bootstrap/linux-8.10.1.json	2021-02-28 18:54:36.417761219 +0100
-@@ -14,7 +14,7 @@
-         },
-         {
-             "package": "base",
--            "version": "4.14.0.0"
-+            "version": "4.14.1.0"
-         },
-         {
-             "package": "array",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.10.10.0"
-+            "version": "0.10.12.0"
-         },
-         {
-             "package": "containers",
-@@ -62,7 +62,7 @@
-         },
-         {
-             "package": "text",
--            "version": "1.2.3.2"
-+            "version": "1.2.4.1"
-         },
-         {
-             "package": "parsec",
-@@ -74,11 +74,11 @@
-         },
-         {
-             "package": "process",
--            "version": "1.6.8.2"
-+            "version": "1.6.9.0"
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "8.10.1"
-+            "version": "8.10.4"
-         },
-         {
-             "package": "template-haskell",
diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template
index 18ce63f254c7..d6d718709993 100644
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@@ -1,8 +1,8 @@
 # Template file for 'cabal-install'
 pkgname=cabal-install
-version=3.4.0.0
-revision=2
-wrksrc=cabal-${pkgname}-${version}
+version=3.6.2.0
+revision=1
+wrksrc=cabal-Cabal-v${version}
 hostmakedepends="ghc curl tar which"
 makedepends="gmp-devel libffi-devel zlib-devel python3"
 depends="ghc"
@@ -10,8 +10,8 @@ short_desc="Command-line interface for Cabal and Hackage"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://hackage.haskell.org/package/cabal-install"
-distfiles="https://github.com/haskell/cabal/archive/${pkgname}-${version}.tar.gz"
-checksum=e4fbd5eb1d77400746a993679181f159aa415a37b931b26d67f5602f63ce971c
+distfiles="https://github.com/haskell/cabal/archive/Cabal-v${version}.tar.gz"
+checksum=dcf31e82cd85ea3236be18cc36c68058948994579ea7de18f99175821dbbcb64
 nopie_files="/usr/bin/cabal"
 nocross=yes
 
@@ -19,12 +19,12 @@ post_patch() {
 	case "${XBPS_TARGET_MACHINE}" in
 	i686*)
 		# https://github.com/haskell/cabal/issues/7313
-		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.1.json ;;
+		vsed -i -e 's/+ofd-locking/-ofd-locking/' bootstrap/linux-8.10.7.json ;;
 	esac
 }
 
 do_build() {
-	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.1.json
+	PREFIX=$PWD bootstrap/bootstrap.py -d bootstrap/linux-8.10.7.json
 }
 do_install() {
 	vbin _build/bin/cabal

From d940f0b7dad54a19f083a15b001dce73b53bf641 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 25 Oct 2021 10:39:23 +0200
Subject: [PATCH 0076/1686] stack: update to 2.7.5

---
 srcpkgs/stack/patches/aeson.patch | 46 +++++++++++++++++++++++++++++++
 srcpkgs/stack/template            |  8 +++---
 2 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/stack/patches/aeson.patch

diff --git a/srcpkgs/stack/patches/aeson.patch b/srcpkgs/stack/patches/aeson.patch
new file mode 100644
index 000000000000..68f267c30cc8
--- /dev/null
+++ b/srcpkgs/stack/patches/aeson.patch
@@ -0,0 +1,46 @@
+commit 09e233ed73aa3335642f97c080ef27e42047c527
+Author: q66 <daniel@octaforge.org>
+Date:   Fri Mar 11 04:37:15 2022 +0100
+
+    constrain aeson to prevent build failures
+
+diff --git a/stack.cabal b/stack.cabal
+index dba5bf0..0195f2c 100644
+--- a/stack.cabal
++++ b/stack.cabal
+@@ -231,7 +231,7 @@ library
+ 
+     build-depends:
+         Cabal >=3.2.1.0,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
+@@ -357,7 +357,7 @@ executable stack
+ 
+     build-depends:
+         Cabal >=3.2.1.0,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
+@@ -485,7 +485,7 @@ executable stack-integration-test
+ 
+     build-depends:
+         Cabal >=3.2.1.0,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
+@@ -621,7 +621,7 @@ test-suite stack-test
+     build-depends:
+         Cabal >=3.2.1.0,
+         QuickCheck >=2.14.2,
+-        aeson >=1.5.6.0,
++        aeson >=1.5.6.0 && <1.6,
+         annotated-wl-pprint >=0.7.0,
+         ansi-terminal >=0.10.3,
+         array >=0.5.4.0,
diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template
index f9d573ef5bfd..9e53b95ca633 100644
--- a/srcpkgs/stack/template
+++ b/srcpkgs/stack/template
@@ -1,8 +1,8 @@
 # Template file for 'stack'
 pkgname=stack
-version=2.7.3
+version=2.7.5
 revision=1
-_stackage="lts-18.5"
+_stackage="lts-18.14"
 hostmakedepends="cabal-install pkg-config unzip"
 makedepends="zlib-devel pcre-devel"
 depends="git gmp-devel iana-etc"
@@ -12,8 +12,8 @@ license="BSD-3-Clause"
 homepage="https://haskellstack.org"
 distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
  https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}"
-checksum="47caf8818352c7f663eb0364f48b1f4d80832ae25c31ca483416a4b74c2c5b44
- 322bc85f38bf6726af6e588dde381d72f0c3e89970939b6a7b5b975cabd05d1a"
+checksum="9ddd44c2a62e9404194d69e7dc1c94e707910620316b66d6ac0b3201a8f37e80
+ 78577c091074d78f9d6e09d6e31e7fc8ac2ddbb0dbc4ac65c606adcac4957d7f"
 skip_extraction="cabal.config-${_stackage}"
 nocross=yes
 nopie_files="/usr/bin/stack"

From b5edf4997b5b3738f8f22762a883942395fa11c1 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 27 Oct 2021 19:01:39 +0200
Subject: [PATCH 0077/1686] ghc-bin: update to 8.10.7

---
 srcpkgs/ghc-bin/template | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/ghc-bin/template b/srcpkgs/ghc-bin/template
index df74043ea188..3949ee3fa1aa 100644
--- a/srcpkgs/ghc-bin/template
+++ b/srcpkgs/ghc-bin/template
@@ -1,8 +1,8 @@
 # Template file for 'ghc-bin'
 pkgname=ghc-bin
-version=8.10.4
+version=8.10.7
 revision=1
-archs="i686 x86_64* ppc64le*"
+archs="i686 x86_64* ppc64le* ppc64"
 wrksrc="ghc-${version%[!0-9]}"
 hostmakedepends="perl libffi libnuma"
 depends="ncurses perl gcc libffi-devel gmp-devel"
@@ -16,26 +16,31 @@ conflicts="ghc>=0 ghc-doc>=0"
 case "$XBPS_TARGET_MACHINE" in
 x86_64)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-x86_64-deb9-linux.tar.xz"
-	checksum=5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+	checksum=ced9870ea351af64fb48274b81a664cdb6a9266775f1598a79cbb6fdd5770a23
 	;;
 x86_64-musl)
 	# create with "make binary-dist"
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-x86_64-void-linux-musl.tar.xz"
-	checksum=246485f18ceccaadaece6450ed7af46dd6b4d5d33e0b8dd1647c64dd8e50dc60
+	checksum=52f6492f39f13890f4ecd83784724ae9fff7a02fdc624a56c49872c912608a50
 	;;
 i686)
 	distfiles="https://downloads.haskell.org/~ghc/${version%[!0-9]}/ghc-${version}-i386-deb9-linux.tar.xz"
-	checksum=0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+	checksum=fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab
 	;;
 ppc64le)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux.tar.xz"
-	checksum=81065f401c5fc88d44be08db1cc0bdad473af4750bb0a19e54c9d15a5981406b
+	checksum=4662c88bc642941d9d463fd4878fc799e081c6fc5b10d2df5fa48e0cadea888c
 	;;
 ppc64le-musl)
 	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64le-void-linux-musl.tar.xz"
-	checksum=3a62e73a1a099a38e5e86f9eacc565db5393905b74af7e29a8790d6197e5ccd4
+	checksum=c01b2d9d4c7b05a62f79b24e374413ac524116cbe5fb7c20673d62b8c3eebf10
 	;;
-*) broken="No distfiles available for this target"
+ppc64)
+	distfiles="https://alpha.de.repo.voidlinux.org/distfiles/ghc-${version}-powerpc64-void-linux.tar.xz"
+	checksum=b8578e602abd4b453845303fb9cfed0b2186f86f60e3aa45869026ea833726c8
+	;;
+*)
+	broken="No distfiles available for this target"
 	;;
 esac
 

From fc3579d1f96f41a16dbf5a664323a98692bdebd8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 11 Mar 2022 14:34:56 +0100
Subject: [PATCH 0078/1686] srcpkgs/*: enable pandoc-using stuff for ppc64

---
 srcpkgs/amsynth/template       | 2 +-
 srcpkgs/bird_exporter/template | 2 +-
 srcpkgs/earlyoom/template      | 2 +-
 srcpkgs/growlight/template     | 2 +-
 srcpkgs/notcurses/template     | 2 +-
 srcpkgs/pelican/template       | 2 +-
 srcpkgs/vimpager/template      | 2 +-
 srcpkgs/xpra/template          | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/amsynth/template b/srcpkgs/amsynth/template
index 8a762ee4981f..dd936a7d784b 100644
--- a/srcpkgs/amsynth/template
+++ b/srcpkgs/amsynth/template
@@ -18,5 +18,5 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
diff --git a/srcpkgs/bird_exporter/template b/srcpkgs/bird_exporter/template
index 0143b41cd58d..897de17d226f 100644
--- a/srcpkgs/bird_exporter/template
+++ b/srcpkgs/bird_exporter/template
@@ -17,7 +17,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 post_build() {
diff --git a/srcpkgs/earlyoom/template b/srcpkgs/earlyoom/template
index deb392a098c9..1b93ee045982 100644
--- a/srcpkgs/earlyoom/template
+++ b/srcpkgs/earlyoom/template
@@ -18,7 +18,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 do_install() {
diff --git a/srcpkgs/growlight/template b/srcpkgs/growlight/template
index 3703defbdfef..876eb479b662 100644
--- a/srcpkgs/growlight/template
+++ b/srcpkgs/growlight/template
@@ -22,7 +22,7 @@ desc_option_man="Use pandoc for manpages"
 desc_option_zfs="Build with ZFS Support"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 pre_configure() {
diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 633896bf5515..9581a8e3de89 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -20,7 +20,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 notcurses-devel_package() {
diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template
index 70c34c55e834..6bca8b41203d 100644
--- a/srcpkgs/pelican/template
+++ b/srcpkgs/pelican/template
@@ -21,7 +21,7 @@ distfiles="https://github.com/getpelican/pelican/archive/${version}.tar.gz"
 checksum=b47c65f663bf6f2513b8ebc1f096e51f4d7865c17b36c370f83eadd80b6ba702
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) checkdepends+=" pandoc";;
+	x86_64*|i686|ppc64le*|ppc64) checkdepends+=" pandoc";;
 esac
 
 post_extract() {
diff --git a/srcpkgs/vimpager/template b/srcpkgs/vimpager/template
index 71ea5ec5e7ab..eb8697af94bb 100644
--- a/srcpkgs/vimpager/template
+++ b/srcpkgs/vimpager/template
@@ -15,7 +15,7 @@ build_options="man"
 desc_option_man="Use pandoc for manpages"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686|ppc64le*) build_options_default="man" ;;
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
 esac
 
 post_install() {
diff --git a/srcpkgs/xpra/template b/srcpkgs/xpra/template
index 296cbb9834b5..5bc9ea89fdff 100644
--- a/srcpkgs/xpra/template
+++ b/srcpkgs/xpra/template
@@ -26,7 +26,7 @@ build_options="docs"
 desc_option_docs="Enable documentation"
 
 case "$XBPS_MACHINE" in
-	x86_64*|i686*|ppc64le*) build_options_default="docs" ;;
+	x86_64*|i686*|ppc64le*|ppc64) build_options_default="docs" ;;
 esac
 
 if [ -z "$CROSS_BUILD" ]; then

From 6f136277779eccc4176479dd66ec90034e6d8318 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:05:38 +0200
Subject: [PATCH 0079/1686] kmonad: bump for ghc 8.10.7

---
 srcpkgs/kmonad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmonad/template b/srcpkgs/kmonad/template
index 8c34a920ba7d..c93d2bee4c4f 100644
--- a/srcpkgs/kmonad/template
+++ b/srcpkgs/kmonad/template
@@ -1,9 +1,9 @@
 # Template file for 'kmonad'
 pkgname=kmonad
 version=0.4.1
-revision=2
+revision=3
 build_style=haskell-stack
-stackage=lts-17.5
+stackage=lts-18.14
 short_desc="Keyboard remapping utility providing qmk-like functionality"
 maintainer="slotThe <soliditsallgood@mailbox.org>"
 license="MIT"

From f16c33cedb44f74e7a386cc74b93b88ab62c6fa0 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:28:25 +0200
Subject: [PATCH 0080/1686] haskell-language-server: update to 1.4.0

---
 srcpkgs/haskell-language-server/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/haskell-language-server/template b/srcpkgs/haskell-language-server/template
index ff0782a54ddb..0182c9b95757 100644
--- a/srcpkgs/haskell-language-server/template
+++ b/srcpkgs/haskell-language-server/template
@@ -1,16 +1,16 @@
 # Template file for 'haskell-language-server'
 pkgname=haskell-language-server
-version=1.3.0
+version=1.4.0
 revision=1
 build_style="haskell-stack"
-make_build_args="--stack-yaml stack-8.10.4.yaml"
+make_build_args="--stack-yaml stack-8.10.7.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=9be31ead3fb1c0ca761de80185a23665dfe167457baaba642cf62885df98f6a1
+checksum=c5d7dbf7fae9aa3ed2c1184b49e82d8ac623ca786494ef6602cfe11735d28db0
 nopie_files="
  /usr/bin/haskell-language-server
  /usr/bin/haskell-language-server-wrapper

From 5a7064dfc6a9b0ab6d282b09e209cd626d21f470 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:37:59 +0200
Subject: [PATCH 0081/1686] xmobar: bump for ghc 8.10.7

---
 srcpkgs/xmobar/files/stack.yaml | 2 +-
 srcpkgs/xmobar/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmobar/files/stack.yaml b/srcpkgs/xmobar/files/stack.yaml
index 52fd0e3e49fe..47544eb729d8 100644
--- a/srcpkgs/xmobar/files/stack.yaml
+++ b/srcpkgs/xmobar/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-17.5
+resolver: lts-18.13
 packages:
 - .
 extra-deps:
diff --git a/srcpkgs/xmobar/template b/srcpkgs/xmobar/template
index 708899ad4e24..b97c9f268d68 100644
--- a/srcpkgs/xmobar/template
+++ b/srcpkgs/xmobar/template
@@ -1,7 +1,7 @@
 # Template file for 'xmobar'
 pkgname=xmobar
 version=0.39
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libXinerama-devel libXrandr-devel libXScrnSaver-devel

From 20014b3d482539479e41b4b49743ff5274de72f7 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:39:46 +0200
Subject: [PATCH 0082/1686] hledger: bump for ghc 8.10.7

---
 srcpkgs/hledger/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hledger/template b/srcpkgs/hledger/template
index 3feab3fe200c..fdcab180a6de 100644
--- a/srcpkgs/hledger/template
+++ b/srcpkgs/hledger/template
@@ -1,7 +1,7 @@
 # Template file for 'hledger'
 pkgname=hledger
 version=1.23
-revision=1
+revision=2
 build_style=haskell-stack
 makedepends="zlib-devel ncurses-devel"
 short_desc="Simple, precise, plain text accounting"

From 7e6441b5168f667230b37e485fe0400b93608d40 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:40:29 +0200
Subject: [PATCH 0083/1686] hoogle: bump for ghc 8.10.7

---
 srcpkgs/hoogle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hoogle/template b/srcpkgs/hoogle/template
index 6bc425b0d002..4c3e80186494 100644
--- a/srcpkgs/hoogle/template
+++ b/srcpkgs/hoogle/template
@@ -1,9 +1,9 @@
 # Template file for 'hoogle'
 pkgname=hoogle
 version=5.0.18.2
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="zlib-devel"
 short_desc="Haskell API search engine"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 734157092d226217efda3b0cf2a96b745b87653c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:41:54 +0200
Subject: [PATCH 0084/1686] hlint: bump for ghc 8.10.7

---
 srcpkgs/hlint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hlint/template b/srcpkgs/hlint/template
index fb30f947a452..fd72c1bbea58 100644
--- a/srcpkgs/hlint/template
+++ b/srcpkgs/hlint/template
@@ -1,9 +1,9 @@
 # Template file for 'hlint'
 pkgname=hlint
 version=3.2.7
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 makedepends="ncurses-devel"
 short_desc="Haskell source code suggestions"
 maintainer="Inokentiy Babushkin <twk@twki.de>"

From 2e6bec6894ba1782a7ce688b45f9cabe6514dd6d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 29 Oct 2021 10:42:42 +0200
Subject: [PATCH 0085/1686] darcs: bump for ghc 8.10.7

---
 srcpkgs/darcs/files/stack.yaml | 4 +++-
 srcpkgs/darcs/template         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/darcs/files/stack.yaml b/srcpkgs/darcs/files/stack.yaml
index f5ca6078ed75..5ae0f5313b8d 100644
--- a/srcpkgs/darcs/files/stack.yaml
+++ b/srcpkgs/darcs/files/stack.yaml
@@ -1,5 +1,7 @@
-resolver: lts-17.5
+resolver: lts-18.14
 packages:
 - .
 extra-deps:
 - graphviz-2999.20.1.0
+- constraints-0.12@sha256:7edf1e72a92d0a6761da634f08be9123dfcc0dcec11c269cbf465a09721c3481,2322
+- cryptonite-0.27@sha256:c3a9c8ce11e654a9d5bee827b089d4b50587272828d0c52a85362a58667a916c,18163
diff --git a/srcpkgs/darcs/template b/srcpkgs/darcs/template
index ddf0cdbb0d1b..f9fcac534d46 100644
--- a/srcpkgs/darcs/template
+++ b/srcpkgs/darcs/template
@@ -1,7 +1,7 @@
 # Template file for 'darcs'
 pkgname=darcs
 version=2.16.5
-revision=1
+revision=2
 build_style=haskell-stack
 hostmakedepends="unzip"
 makedepends="zlib-devel libcurl-devel ncurses-devel"

From 6cc914138f9a2525d7f2171201a48cb4044b0dc4 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Tue, 2 Nov 2021 08:57:33 +0100
Subject: [PATCH 0086/1686] shellcheck: bump for ghc 8.10.7

---
 srcpkgs/shellcheck/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shellcheck/template b/srcpkgs/shellcheck/template
index 08e64456eda9..70eee6c2854b 100644
--- a/srcpkgs/shellcheck/template
+++ b/srcpkgs/shellcheck/template
@@ -1,9 +1,9 @@
 # Template file for 'shellcheck'
 pkgname=shellcheck
 version=0.8.0
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 hostmakedepends="pandoc"
 short_desc="Static analysis tool for shell scripts"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

From 71649f051003e955df8786aaa8c797155306f94d Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 08:35:15 +0100
Subject: [PATCH 0087/1686] pandoc: bump for ghc 8.10.7

---
 srcpkgs/pandoc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 0e487510497e..8628b1d1f3c2 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,14 +2,14 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=2.14.0.3
-revision=2
+revision=3
 _sidenote_version=0.20.0.0
 _monad_gen_version=0.3.0.1
 _crossref_version=0.3.12.2
 _roman_numerals_version=0.5.1.5
 create_wrksrc=yes
 build_style=haskell-stack
-stackage="lts-18.5"
+stackage="lts-18.14"
 make_build_args="
  --flag pandoc:embed_data_files --flag=hslua:system-lua
  --flag=hslua:pkg-config"

From 3dbf9fd62fbb23950c7ba568fd16eb733f60d670 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 19:17:39 +0100
Subject: [PATCH 0088/1686] cgrep: bump for ghc 8.10.7

---
 srcpkgs/cgrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cgrep/template b/srcpkgs/cgrep/template
index c987e67725b0..e57106f3fa26 100644
--- a/srcpkgs/cgrep/template
+++ b/srcpkgs/cgrep/template
@@ -1,9 +1,9 @@
 # Template file for 'cgrep'
 pkgname=cgrep
 version=6.7.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-18.6"
+stackage="lts-18.15"
 makedepends="pcre-devel pkg-config"
 short_desc="Context-aware grep for source codes"
 maintainer="slotThe <soliditsallgood@mailbox.org>"

From 19d2833a7c24bdaead8b891453232cef0414fc5c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Wed, 3 Nov 2021 21:11:14 +0100
Subject: [PATCH 0089/1686] git-mediate: bump for ghc 8.10.7

---
 srcpkgs/git-mediate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template
index 971a6236224f..0c9ec10241e5 100644
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@@ -1,9 +1,9 @@
 # Template file for 'git-mediate'
 pkgname=git-mediate
 version=1.0.8.1
-revision=1
+revision=2
 build_style=haskell-stack
-stackage="lts-17.5"
+stackage="lts-18.14"
 depends="git"
 short_desc="Tool to help resolving git conflicts"
 maintainer="Peter Wang <novalazy@gmail.com>"

From 6ccfdcdbc3e275073d3c7cbab85a77fbf03aaa94 Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Thu, 4 Nov 2021 09:34:26 +0100
Subject: [PATCH 0090/1686] debug-me: bump for ghc 8.10.7

---
 srcpkgs/debug-me/files/stack.yaml | 2 +-
 srcpkgs/debug-me/template         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index ecff9d9d18f2..ad8b055bb33e 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,6 +1,6 @@
 packages:
 - '.'
-resolver: lts-17.5
+resolver: lts-18.14
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.1.0
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index 797c52f1f479..86ac0037311a 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
 version=1.20200820
-revision=2
+revision=3
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"

From a2e833443ae71cd528081cbbe17c561de827da9c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@mailbox.org>
Date: Fri, 5 Nov 2021 07:22:52 +0100
Subject: [PATCH 0091/1686] git-annex: update to 8.20211028

---
 srcpkgs/git-annex/files/stack.yaml       | 32 ------------------------
 srcpkgs/git-annex/patches/ghc8.8.3.patch | 18 -------------
 srcpkgs/git-annex/template               |  6 ++---
 3 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 srcpkgs/git-annex/files/stack.yaml
 delete mode 100644 srcpkgs/git-annex/patches/ghc8.8.3.patch

diff --git a/srcpkgs/git-annex/files/stack.yaml b/srcpkgs/git-annex/files/stack.yaml
deleted file mode 100644
index 5d457bebde83..000000000000
--- a/srcpkgs/git-annex/files/stack.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-flags:
-  git-annex:
-    production: true
-    assistant: true
-    pairing: true
-    torrentparser: true
-    webapp: true
-    magicmime: false
-    dbus: false
-    debuglocks: false
-    benchmark: false
-    networkbsd: false
-    gitlfs: true
-    httpclientrestricted: true
-packages:
-- '.'
-extra-deps:
- - IfElse-0.85
- - aws-0.22
- - bloomfilter-2.0.1.0
- - filepath-bytestring-1.4.2.1.6
- - git-lfs-1.1.0
- - http-client-restricted-0.0.3
- - network-multicast-0.3.2
- - sandi-0.5
- - torrent-10000.1.1
- - bencode-0.6.1.1
- - network-3.1.0.1
-explicit-setup-deps:
-  git-annex: true
-resolver: lts-17.5
-allow-newer: true
diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch
deleted file mode 100644
index 27a1739c1119..000000000000
--- a/srcpkgs/git-annex/patches/ghc8.8.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
-+++ b/git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
-@@ -304,6 +304,7 @@
-   Build-Depends:
-    base (>= 4.11.1.0 && < 5.0),
-    network-uri (>= 2.6),
-+   network-bsd,
-    optparse-applicative (>= 0.14.1),
-    containers (>= 0.5.8),
-    exceptions (>= 0.6),
-@@ -404,3 +404,3 @@ if flag(NetworkBSD)
-     Build-Depends: network-bsd, network (>= 3.0.0.0)
-   else
--    Build-Depends: network (< 3.0.0.0), network (>= 2.6.3.0)
-+    Build-Depends: network (< 3.2.0.0), network (>= 2.6.3.0)
-
-   if flag(S3)
-     Build-Depends: aws (>= 0.20)
diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template
index cdcd6bb0f83c..1cf2ab14789f 100644
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@@ -1,10 +1,10 @@
 # Template file for 'git-annex'
 pkgname=git-annex
-version=8.20210330
+version=8.20211028
 revision=1
 build_style=haskell-stack
 makedepends="curl file-devel gnupg2 gnutls-devel gsasl-devel libxml2-devel
- lsof rsync git"
+ lsof rsync git ncurses-devel"
 # depends are utilities required by git-annex
 depends="git rsync curl lsof gnupg2"
 short_desc="Git addon for managing large files"
@@ -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=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d
+checksum=cf5efe15e68d467daad673bec10037a27a78da7e4af9b4a85e10980bd90ace2d
 nopie_files="/usr/bin/git-annex"
 nocross=yes
 

From ae2a21f271d303823dac6fc7f2f975921e82b0da Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 11 Mar 2022 19:21:25 +0100
Subject: [PATCH 0092/1686] cfitsio: enable reentrant multithreading

---
 srcpkgs/cfitsio/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/cfitsio/template b/srcpkgs/cfitsio/template
index 3545bb4299bd..55ff7d14e61d 100644
--- a/srcpkgs/cfitsio/template
+++ b/srcpkgs/cfitsio/template
@@ -1,8 +1,9 @@
 # Template file for 'cfitsio'
 pkgname=cfitsio
 version=4.0.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--enable-reentrant"
 makedepends="libcurl-devel"
 short_desc="Library for reading and writing data files in FITS data format"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"

From 19f3503eb8681371d1ce32e607d616c3211e3b6c Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 11 Mar 2022 10:44:13 -0800
Subject: [PATCH 0093/1686] podman: install rootlessport and completions

Fixes #36095
---
 srcpkgs/podman/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index e83467c87f7c..c719e4ca6057 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,10 +1,10 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.0.2
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/containers/podman/v4"
-go_package="${go_import_path}/cmd/podman"
+go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
 go_build_tags="seccomp apparmor containers_image_ostree_stub"
 hostmakedepends="pkg-config go-md2man"
 makedepends="gpgme-devel libseccomp-devel device-mapper-devel libbtrfs-devel"
@@ -26,7 +26,10 @@ post_build() {
 }
 
 post_install() {
+	vmkdir usr/libexec/podman
+	mv "${DESTDIR}/usr/bin/rootlessport" "${DESTDIR}/usr/libexec/podman/rootlessport"
 	make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
+	make install.completions DESTDIR="${DESTDIR}" PREFIX="/usr"
 	sed -e 's|# cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' \
 		vendor/github.com/containers/common/pkg/config/containers.conf \
 		>containers.cgfs.conf

From 50ddd3f969e48fe5b6ee4126018fd9a01268d9d7 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 12 Mar 2022 09:34:10 +0100
Subject: [PATCH 0094/1686] wine: update to 7.4.

---
 srcpkgs/wine/patches/musl-limits.patch |  4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  |  8 ++++----
 srcpkgs/wine/patches/musl-uid-t.patch  |  4 ++--
 srcpkgs/wine/template                  | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index a791710f0c77..b13cbe9ea48c 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.3/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.3/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index 8607cbe9929a..82f45cc1d171 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.3/configure
-+++ b/wine-7.3/configure
+--- a/wine-7.4/configure
++++ b/wine-7.4/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
---- a/wine-7.3/configure.ac
-+++ b/wine-7.3/configure.ac
+--- a/wine-7.4/configure.ac
++++ b/wine-7.4/configure.ac
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 9ee5a79e1637..2fe1c18c553b 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.3/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.3/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/wine-7.4/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/wine-7.4/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index f82741c2741d..8dfb8df9f6be 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.3
+version=7.4
 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="71fdffed747bd176ba414ebc49027df75aa2d45580a0338a7a36d974cd147a96
- 6175e8929e4594dcf23ef28f556cde87b122dbf2e2476006660d920cc121cc98"
+checksum="728e866d6e49ce92a2a0c514333e9ff08bdbf6c86f5ef4e6180143b8d2b7d416
+ c1688af87737f47337a8f7e24d501d99582a691a2a08ba8e71b9911abbfd8554"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"
@@ -43,8 +43,8 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
  libldap-devel alsa-lib-devel libgphoto2-devel glib-devel
  freetype-devel pulseaudio-devel libopenal-devel giflib-devel
  v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel
- libpcap-devel cups-devel ocl-icd-devel vulkan-loader vkd3d-devel
- gst-plugins-base1-devel SDL2-devel"
+ libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel
+ SDL2-devel"
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}"

From 22bebebfd34aaf5a460492c3ff0fca8da9141473 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 12 Mar 2022 09:36:33 +0100
Subject: [PATCH 0095/1686] linux5.4: update to 5.4.184.

---
 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 439a5538b1c1..983e18bdc0ba 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.183
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=2d4b0b77644835410b2a5f599b2893fe199d5542615684207f579753020cc99c
+checksum=8694ca39e6c665cac5a78c7f80acef83ad9b5b13f9688e94bfe39b3c71541489
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 0ee3846d76909a67dc121042d5403074339a7fed Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 12 Mar 2022 09:41:51 +0100
Subject: [PATCH 0096/1686] linux4.19: update to 4.19.234.

---
 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 5a274df27b39..64351dd2d235 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.233
+version=4.19.234
 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=b8f665f020c2724a9f1e0368fdc0ea451b0b7d915ffae7ef4b9ec27a550fce37
+checksum=0082966be4a476c42ed59996e072e7e9fa5282b742efe4ffabadd6cd91212d8b
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 90cfdaab2092208babf1dd741ee321464d6e144b Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:27:59 +0100
Subject: [PATCH 0097/1686] flannel: update to 0.17.0.

---
 srcpkgs/flannel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 7a65a2143779..14fdf5fbbda4 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -1,6 +1,6 @@
 # Template file for 'flannel'
 pkgname=flannel
-version=0.16.3
+version=0.17.0
 revision=1
 build_style=go
 short_desc="Etcd backed network fabric for containers"
@@ -10,7 +10,7 @@ license="Apache-2.0"
 go_import_path="github.com/coreos/flannel"
 homepage="https://$go_import_path"
 distfiles="$homepage/archive/v${version}.tar.gz"
-checksum=d78043adbd3933606ec728068369d0c5596c82309246ff36c3fcadb99561c5bb
+checksum=5a52113cfee3d54b6b906ab16ef64114efd1a3533ed79ab5e46d008bab669a07
 
 post_extract() {
 	ln -s $wrksrc vendor/$go_import_path

From 5602d4882728ce5ac59f93cc680dab6448abc8f4 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:29:26 +0100
Subject: [PATCH 0098/1686] hugo: update to 0.94.2.

---
 srcpkgs/hugo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 6732e2725b69..477c90d66393 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
 # Template file for 'hugo'
 pkgname=hugo
-version=0.92.2
+version=0.94.2
 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=00d61205f426587dcfc4e2844a6f9fb451c825b828c00f0b46e3d0930c132751
+checksum=315bc0d22977e84ba25125b1d23333648e36194a46a4d6ae4f4c6c683dc8979c
 
 post_install() {
 	vdoc README.md

From 966077d66e3c4aece8de5f17bcd64ddcab631517 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:39:16 +0100
Subject: [PATCH 0099/1686] python-b2sdk: update to 1.14.1.

---
 srcpkgs/python-b2sdk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index d7ccc8eb440f..7b0578b60926 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -1,7 +1,7 @@
 # Template file for 'python-b2sdk'
 # keep python-b2sdk name to revert this package
 pkgname=python-b2sdk
-version=1.14.0
+version=1.14.1
 revision=1
 wrksrc="b2sdk-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://pypi.org/project/b2sdk"
 distfiles="${PYPI_SITE}/b/b2sdk/b2sdk-${version}.tar.gz"
-checksum=900da60f9e569e02405b85db35541a79e1cac776ace5d054498b107982ea443c
+checksum=7d839eca12a6f66453eb535c41569714a7910bc012f657c864c3bfb3a88569e8
 
 post_install() {
 	vlicense LICENSE

From 04ccfe5253ac8dcdb4ab61b51533b34bb8d07881 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Sat, 12 Mar 2022 11:40:19 +0100
Subject: [PATCH 0100/1686] supermin: update to 5.2.2.

---
 srcpkgs/supermin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 09b45ddd429f..357fc3f255f8 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
-version=5.2.1
-revision=3
+version=5.2.2
+revision=1
 _release_series=5.2-stable
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"
@@ -12,5 +12,5 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-2.0-or-later"
 homepage="http://people.redhat.com/~rjones/supermin/"
 distfiles="http://download.libguestfs.org/supermin/${_release_series}/supermin-${version}.tar.gz"
-checksum=c45d8479b6da8ea55ca2c4b82b2c8bc7c2e6f724cf59c980df1dec93fb578ffb
+checksum=ce3921d3635c8168cfb7ca0c5a82b9d5cef5b2b271f84b776d63b8bbbeec358e
 nocross=yes

From 7ffbdb32121548f575bc7f0bb41ecd17e935d6e5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 15:00:14 +0100
Subject: [PATCH 0101/1686] ruby: update to 3.1.1.

---
 common/shlibs         |  2 +-
 srcpkgs/ruby/template | 34 ++++++++++++----------------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d60e60a87534..f26b9bab58fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -440,7 +440,7 @@ libKScreenLocker.so.5 kscreenlocker-5.8.4_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.89 ntfs-3g-2021.8.22_1
-libruby.so.3.0 ruby-3.0.2_1
+libruby.so.3.1 ruby-3.1.0_1
 librw.so.0 rankwidth-0.9_1
 libprocessui.so.9 libksysguard-5.18.90_1
 libksignalplotter.so.9 libksysguard-5.18.90_1
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index f9fb36a74dda..85524a7796b2 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -1,12 +1,12 @@
 # Template file for 'ruby'
-_ruby_abiver=3.0.0
+_ruby_abiver=3.1.0
 
 pkgname=ruby
-version=3.0.3
+version=3.1.1
 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"
+ PKG_CONFIG=/usr/bin/pkg-config"
 make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
 makedepends="zlib-devel readline-devel libffi-devel openssl-devel
@@ -16,7 +16,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.xz"
-checksum=88cc7f0f021f15c4cd62b1f922e3a401697f7943551fe45b1fdf4f2417a17a9c
+checksum=7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally
@@ -48,6 +48,12 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 post_patch() {
+	# https://bugs.ruby-lang.org/issues/18373#note-8
+	find .bundle -name extconf.rb -exec \
+		sed -i \
+			-e '/create_makefile/i \$arch_hdrdir = "$(hdrdir)/../.ext/include/$(arch)"' \
+			-e '/create_makefile/i \$DLDFLAGS << " -L#{$top_srcdir}"' {} \;
+
 	[ "$XBPS_TARGET_LIBC" = "glibc" ] && return 0
 
 	echo "Patching out using binary gems for non-glibc..."
@@ -55,29 +61,16 @@ post_patch() {
 }
 
 pre_configure() {
-	# this allows the test suite to pass without crashing
-	export CFLAGS+=" -fno-omit-frame-pointer -fno-strict-aliasing"
-	export CPPFLAGS+=" -fno-omit-frame-pointer -fno-strict-aliasing"
-
 	case "$XBPS_TARGET_MACHINE" in
 		ppc64le*) ;;
 		ppc*)
 			# Random segfaults otherwise
 			export CFLAGS+=" -Os"
-			export CPPFLAGS+=" -Os"
 			;;
 	esac
-
-	# force this to pass on systems with these as macros (musl)
-	export ac_cv_func_isnan=yes
-	export ac_cv_func_isinf=yes
 }
 
 pre_build() {
-	# Force getaddrinfo detection.
-	sed -e 's,\(checking_for("wide getaddrinfo") {try_\)run,\1link,' -i ext/socket/extconf.rb
-	# Hack for cross-builds.
-	touch ext/ripper/check
 	# Set -fno-stack-protector for i686* or otherwise linking fails with
 	# ...: undefined reference to '__stack_chk_fail_local'
 	case "$XBPS_TARGET_MACHINE" in
@@ -91,13 +84,10 @@ pre_build() {
 post_install() {
 	# Remove references to the cross compiler
 	if [ "$CROSS_BUILD" ]; then
-		sed -e "s,${XBPS_CROSS_TRIPLET}-,,g" -i ${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
+		vsed -e "s,${XBPS_CROSS_TRIPLET}-,,g" -i ${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
 	fi
 	# Replace reference to the install(1) wrapper
-	sed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
-		${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
-	# Remove references to hardening -specs.
-	sed -e "s|\(-specs=.*hardened-ld\)||g" -e "s|\(-specs=.*hardened-cc1\)||g" -i \
+	vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \
 		${DESTDIR}/usr/lib/ruby/${_ruby_abiver}/*/rbconfig.rb
 	vlicense COPYING
 }

From 2a3eb4022bc85a59fba494d19d22579b8cebef7b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:57:04 +0100
Subject: [PATCH 0102/1686] ruby-clocale: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-clocale/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-clocale/template b/srcpkgs/ruby-clocale/template
index a921bc084bc0..61691785300f 100644
--- a/srcpkgs/ruby-clocale/template
+++ b/srcpkgs/ruby-clocale/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-clocale'
 pkgname=ruby-clocale
 version=0.0.4
-revision=4
+revision=5
 build_style=gemspec
 short_desc="Ruby gem that wraps C locale functions"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 30a7e83648d14b6ccf9b7df9009be75bfc1bd357 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:57:23 +0100
Subject: [PATCH 0103/1686] ruby-ffi: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-ffi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-ffi/template b/srcpkgs/ruby-ffi/template
index efe3ca4f3f5f..11a8d58499ed 100644
--- a/srcpkgs/ruby-ffi/template
+++ b/srcpkgs/ruby-ffi/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-ffi'
 pkgname=ruby-ffi
 version=1.11.3
-revision=5
+revision=6
 wrksrc="ffi-${version}"
 build_style=gemspec
 hostmakedepends="libffi-devel"

From 38dad3fea5740d4f8d5d75dbc4bf473b74b087be Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:57:45 +0100
Subject: [PATCH 0104/1686] ruby-hpricot: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-hpricot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-hpricot/template b/srcpkgs/ruby-hpricot/template
index 1013a395fa57..40cdaabc73ff 100644
--- a/srcpkgs/ruby-hpricot/template
+++ b/srcpkgs/ruby-hpricot/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-hpricot'
 pkgname=ruby-hpricot
 version=0.8.6
-revision=6
+revision=7
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"

From cd4a5858de81e927119f48fda9e3f1367951cbd3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:58:19 +0100
Subject: [PATCH 0105/1686] ruby-rdiscount: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rdiscount/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rdiscount/template b/srcpkgs/ruby-rdiscount/template
index b784e7283e13..acd6dc4a494a 100644
--- a/srcpkgs/ruby-rdiscount/template
+++ b/srcpkgs/ruby-rdiscount/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rdiscount'
 pkgname=ruby-rdiscount
 version=2.2.0.1
-revision=7
+revision=8
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"

From 3c1a8994c2e579116f0779a34925af2edeff19b7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:58:57 +0100
Subject: [PATCH 0106/1686] vim: rebuild for ruby-3.1.0.

---
 srcpkgs/vim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index bd919ebdf9b7..252c84c21b18 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
 version=8.2.4221
-revision=1
+revision=2
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="acl-devel ncurses-devel
  $(vopt_if x11 libXt-devel)

From 071d4aa3b48b2a1eabb6023ce0c912ff05d2987b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 16:59:22 +0100
Subject: [PATCH 0107/1686] ruby-asciidoctor: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-asciidoctor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-asciidoctor/template b/srcpkgs/ruby-asciidoctor/template
index 8b0417bb3623..e9e7669f0f6c 100644
--- a/srcpkgs/ruby-asciidoctor/template
+++ b/srcpkgs/ruby-asciidoctor/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-asciidoctor'
 pkgname=ruby-asciidoctor
 version=2.0.15
-revision=2
+revision=3
 build_style=gem
 short_desc="Ruby implementation of AsciiDoc"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e882c298af5f04c7426c68211de331a19f865dfe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:01:12 +0100
Subject: [PATCH 0108/1686] weechat: rebuild for ruby-3.1.0.

---
 srcpkgs/weechat/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index 9395e73319cf..a496a6412e85 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
 version=3.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
@@ -32,6 +32,10 @@ if [ "$CROSS_BUILD" ]; then
 	 -DPERL_LFLAGS=-L$_perlpath"
 fi
 
+post_extract() {
+	vsed -i '/pkg_search_module/s/ruby-3.0/ruby-3.1 &/' cmake/FindRuby.cmake
+}
+
 weechat-aspell_package() {
 	lib32disabled=yes
 	depends="${sourcepkg}>=${version}_${revision}"

From 820eefa3b618b13fa9ed1bba45342bec1cbd0e0b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:02:18 +0100
Subject: [PATCH 0109/1686] ruby-sync: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-sync/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-sync/template b/srcpkgs/ruby-sync/template
index a76352acfaab..77569174612f 100644
--- a/srcpkgs/ruby-sync/template
+++ b/srcpkgs/ruby-sync/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-sync'
 pkgname=ruby-sync
 version=0.5.0
-revision=3
+revision=4
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 hostmakedepends="ruby"

From 6690229c4ab2405a140f25656a6150b06108fa6e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:02:39 +0100
Subject: [PATCH 0110/1686] ruby-concurrent-ruby: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-concurrent-ruby/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-concurrent-ruby/template b/srcpkgs/ruby-concurrent-ruby/template
index cb58198062a2..8117a8fef1c8 100644
--- a/srcpkgs/ruby-concurrent-ruby/template
+++ b/srcpkgs/ruby-concurrent-ruby/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-concurrent-ruby'
 pkgname=ruby-concurrent-ruby
 version=1.1.7
-revision=2
+revision=3
 build_style=gem
 hostmakedepends="ruby"
 depends="ruby"

From 56f4fb69b8fb8a2f121f6a41a15f322043817521 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:02:53 +0100
Subject: [PATCH 0111/1686] ruby-rubysl-singleton: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rubysl-singleton/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rubysl-singleton/template b/srcpkgs/ruby-rubysl-singleton/template
index d119521708b2..36945b5cf4f5 100644
--- a/srcpkgs/ruby-rubysl-singleton/template
+++ b/srcpkgs/ruby-rubysl-singleton/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rubysl-singleton'
 pkgname=ruby-rubysl-singleton
 version=2.0.0
-revision=4
+revision=5
 build_style=gemspec
 hostmakedepends="ruby"
 depends="ruby"

From 10a85aaa340b7269fd60592987280ab95d5d13b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:04:11 +0100
Subject: [PATCH 0112/1686] ruby-deep_merge: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-deep_merge/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-deep_merge/template b/srcpkgs/ruby-deep_merge/template
index 858e491f0a99..2f38c05c30ea 100644
--- a/srcpkgs/ruby-deep_merge/template
+++ b/srcpkgs/ruby-deep_merge/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-deep_merge'
 pkgname=ruby-deep_merge
 version=1.2.1
-revision=4
+revision=5
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 hostmakedepends="ruby"

From 7572ee22a6abf1eb843823f40ad27c11a846b097 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:04:46 +0100
Subject: [PATCH 0113/1686] ruby-addressable: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-addressable/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-addressable/template b/srcpkgs/ruby-addressable/template
index 89ee94646ec5..13097fcfe0be 100644
--- a/srcpkgs/ruby-addressable/template
+++ b/srcpkgs/ruby-addressable/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-addressable'
 pkgname=ruby-addressable
 version=2.7.0
-revision=5
+revision=6
 build_style=gem
 depends="ruby-public_suffix>=2.0.2 ruby-public_suffix<5.0"
 short_desc="Replacement for Ruby's standard library URI implementation"

From 77fd225a19273a85be53094ca4116f036ed39517 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:04:55 +0100
Subject: [PATCH 0114/1686] ruby-backports: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-backports/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-backports/template b/srcpkgs/ruby-backports/template
index adcf4bfdde06..355a40cfad75 100644
--- a/srcpkgs/ruby-backports/template
+++ b/srcpkgs/ruby-backports/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-backports'
 pkgname=ruby-backports
 version=3.15.0
-revision=4
+revision=5
 build_style=gem
 short_desc="Essential backports that enable many of the nice features of Ruby"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fb053355b3526d9f7ca78422f8399a26815585c6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:11 +0100
Subject: [PATCH 0115/1686] ruby-connection_pool: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-connection_pool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-connection_pool/template b/srcpkgs/ruby-connection_pool/template
index 6e0dc024cce7..a83d37b84ed5 100644
--- a/srcpkgs/ruby-connection_pool/template
+++ b/srcpkgs/ruby-connection_pool/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-connection_pool'
 pkgname=ruby-connection_pool
 version=2.2.2
-revision=5
+revision=6
 build_style=gem
 short_desc="Generic connection pool for Ruby"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ae79af67907882772be38cb0bc1ffb980d17aca1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:23 +0100
Subject: [PATCH 0116/1686] ruby-erubis: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-erubis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-erubis/template b/srcpkgs/ruby-erubis/template
index b79aff3062b8..5cc96909679e 100644
--- a/srcpkgs/ruby-erubis/template
+++ b/srcpkgs/ruby-erubis/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-erubis'
 pkgname=ruby-erubis
 version=2.7.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Erubis is an implementation of eRuby"
 maintainer="Orphaned <orphan@voidlinux.org>"

From fd3c8303ab5e95a4b145aa74900fc9fd1c4705a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:29 +0100
Subject: [PATCH 0117/1686] ruby-ethon: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-ethon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-ethon/template b/srcpkgs/ruby-ethon/template
index d6bbf0958c52..a3184cb3fc47 100644
--- a/srcpkgs/ruby-ethon/template
+++ b/srcpkgs/ruby-ethon/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-ethon'
 pkgname=ruby-ethon
 version=0.12.0
-revision=4
+revision=5
 build_style=gem
 depends="ruby-ffi>=1.3.0"
 short_desc="Lightweight wrapper around libcurl"

From 11dbb39a091b7e9d2566ca465bdc2d342d37f6d5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:44 +0100
Subject: [PATCH 0118/1686] ruby-faraday: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-faraday/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-faraday/template b/srcpkgs/ruby-faraday/template
index 5d8de2ac9e1c..6b8997a6425d 100644
--- a/srcpkgs/ruby-faraday/template
+++ b/srcpkgs/ruby-faraday/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-faraday'
 pkgname=ruby-faraday
 version=1.0.1
-revision=3
+revision=4
 build_style=gem
 depends="ruby-multipart-post>=1.2 ruby-multipart-post<3"
 short_desc="HTTP/REST API client library"

From 657f2f943ef6e31db60a99781150f3b23c65a6ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:51 +0100
Subject: [PATCH 0119/1686] ruby-faraday_middleware: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-faraday_middleware/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-faraday_middleware/template b/srcpkgs/ruby-faraday_middleware/template
index 6f6eadeb60af..b819c537ba5f 100644
--- a/srcpkgs/ruby-faraday_middleware/template
+++ b/srcpkgs/ruby-faraday_middleware/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-faraday_middleware'
 pkgname=ruby-faraday_middleware
 version=1.0.0
-revision=3
+revision=4
 build_style=gem
 depends="ruby-faraday>=1.0"
 short_desc="Various middleware for Faraday"

From 8b127773dda371a9cbffde76dad03ac488b2a7cb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:05:58 +0100
Subject: [PATCH 0120/1686] ruby-filesize: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-filesize/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-filesize/template b/srcpkgs/ruby-filesize/template
index 0d2c06a995d1..1a9939136b77 100644
--- a/srcpkgs/ruby-filesize/template
+++ b/srcpkgs/ruby-filesize/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-filesize'
 pkgname=ruby-filesize
 version=0.2.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Small class for handling filesizes"
 maintainer="Orphaned <orphan@voidlinux.org>"

From d3fecbe945e3a4846f0dad7cacd5766255cf98a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:07 +0100
Subject: [PATCH 0121/1686] ruby-gh: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-gh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-gh/template b/srcpkgs/ruby-gh/template
index fa43ad84d5f0..5758f646973d 100644
--- a/srcpkgs/ruby-gh/template
+++ b/srcpkgs/ruby-gh/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-gh'
 pkgname=ruby-gh
 version=0.15.1
-revision=5
+revision=6
 build_style=gem
 depends="ruby-addressable>=2.4.0 ruby-backports ruby-faraday>=0.8
  ruby-multi_json>=1.0 ruby-net-http-persistent>=2.9 ruby-net-http-pipeline"

From cfcba061ca5be1de65fea963a5830374d52dcdf4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:15 +0100
Subject: [PATCH 0122/1686] ruby-highline: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-highline/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-highline/template b/srcpkgs/ruby-highline/template
index aa00cf9b5bde..7e7e9bdd80ea 100644
--- a/srcpkgs/ruby-highline/template
+++ b/srcpkgs/ruby-highline/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-highline'
 pkgname=ruby-highline
 version=2.0.3
-revision=4
+revision=5
 build_style=gem
 short_desc="High-level IO library for comamndline interfaces"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 5330c08eadfa38eaa053ff95fd8047e0fb90ddf8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:23 +0100
Subject: [PATCH 0123/1686] ruby-httparty: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-httparty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-httparty/template b/srcpkgs/ruby-httparty/template
index 2df74d93b219..4b286f65f329 100644
--- a/srcpkgs/ruby-httparty/template
+++ b/srcpkgs/ruby-httparty/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-httparty'
 pkgname=ruby-httparty
 version=0.17.1
-revision=4
+revision=5
 build_style=gem
 depends="ruby-mime-types>=3.0 ruby-multi_xml>=0.5.2"
 short_desc="Makes http fun! Also, makes consuming restful web services dead easy"

From 59b5b9321827cdcca9ab0cf9cf2d23fb75640f0e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:33 +0100
Subject: [PATCH 0124/1686] ruby-launchy: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-launchy/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-launchy/template b/srcpkgs/ruby-launchy/template
index 0e2f076b4977..f8890626158c 100644
--- a/srcpkgs/ruby-launchy/template
+++ b/srcpkgs/ruby-launchy/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-launchy'
 pkgname=ruby-launchy
 version=2.4.3
-revision=5
+revision=6
 build_style=gem
 depends="ruby-addressable>=2.3 ruby-addressable<3.0"
 short_desc="Helper class for launching cross-platform applications"

From 0d0e28f77aa74f4146225f1a699f5b80014872c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:47 +0100
Subject: [PATCH 0125/1686] ruby-manpages: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-manpages/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-manpages/template b/srcpkgs/ruby-manpages/template
index 4fbc854f82f6..927f16b7068c 100644
--- a/srcpkgs/ruby-manpages/template
+++ b/srcpkgs/ruby-manpages/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-manpages'
 pkgname=ruby-manpages
 version=0.6.1
-revision=5
+revision=6
 build_style=gem
 short_desc="Gem to add man pages support to ruby gems"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 05f173bd57d1105beb56f149fcca0cd2c955bd47 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:06:56 +0100
Subject: [PATCH 0126/1686] ruby-mime-types: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-mime-types/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-mime-types/template b/srcpkgs/ruby-mime-types/template
index 4323b3617da1..94fa4f592d2a 100644
--- a/srcpkgs/ruby-mime-types/template
+++ b/srcpkgs/ruby-mime-types/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mime-types'
 pkgname=ruby-mime-types
 version=3.3
-revision=4
+revision=5
 build_style=gem
 depends="ruby-mime-types-data>=3.2015"
 short_desc="Library for registry and information about MIME types"

From 930f6834e7e638dc06dedc0d03258d05cbba940b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:01 +0100
Subject: [PATCH 0127/1686] ruby-mime-types-data: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-mime-types-data/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-mime-types-data/template b/srcpkgs/ruby-mime-types-data/template
index 8f4b85acebc1..64d444528873 100644
--- a/srcpkgs/ruby-mime-types-data/template
+++ b/srcpkgs/ruby-mime-types-data/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mime-types-data'
 pkgname=ruby-mime-types-data
 version=3.2019.1009
-revision=4
+revision=5
 build_style=gem
 short_desc="Registry for MIME media type definitions"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c72dbe711ff78ae60d998c4ec26baea4138213fa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:07 +0100
Subject: [PATCH 0128/1686] ruby-mini_portile2: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-mini_portile2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-mini_portile2/template b/srcpkgs/ruby-mini_portile2/template
index aacfb695d15c..f7c225545dc9 100644
--- a/srcpkgs/ruby-mini_portile2/template
+++ b/srcpkgs/ruby-mini_portile2/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mini_portile2'
 pkgname=ruby-mini_portile2
 version=2.4.0
-revision=4
+revision=5
 build_style=gem
 short_desc="Simplistic port-like solution for developers"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e58aa7603325a8863fc7f9c44c88c664d42574b4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:17 +0100
Subject: [PATCH 0129/1686] ruby-multi_json: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-multi_json/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-multi_json/template b/srcpkgs/ruby-multi_json/template
index 72d7a67451c9..006d7d578a16 100644
--- a/srcpkgs/ruby-multi_json/template
+++ b/srcpkgs/ruby-multi_json/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-multi_json'
 pkgname=ruby-multi_json
 version=1.14.1
-revision=4
+revision=5
 build_style=gem
 short_desc="Common interface for multiple JSON parsing libraries"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 9bf053abb28d9db11849f165220eabefbe087d53 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:26 +0100
Subject: [PATCH 0130/1686] ruby-multi_xml: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-multi_xml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-multi_xml/template b/srcpkgs/ruby-multi_xml/template
index 9df407b1c57e..fd23fbc227f5 100644
--- a/srcpkgs/ruby-multi_xml/template
+++ b/srcpkgs/ruby-multi_xml/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-multi_xml'
 pkgname=ruby-multi_xml
 version=0.6.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Swappable XML backends utilizing LibXML, Nokogiri, Ox, or REXML"
 maintainer="Orphaned <orphan@voidlinux.org>"

From c6852ce5d150302fb9fd43521bd4b7424a26e35c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:35 +0100
Subject: [PATCH 0131/1686] ruby-multipart-post: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-multipart-post/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-multipart-post/template b/srcpkgs/ruby-multipart-post/template
index 616e52195daf..c6baa24adf70 100644
--- a/srcpkgs/ruby-multipart-post/template
+++ b/srcpkgs/ruby-multipart-post/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-multipart-post'
 pkgname=ruby-multipart-post
 version=2.1.1
-revision=4
+revision=5
 build_style=gem
 short_desc="Use with Net::HTTP to do multipart form posts"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3bdb09b57c852917b1f0a8474d76bad48908b787 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:45 +0100
Subject: [PATCH 0132/1686] ruby-mustache: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-mustache/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-mustache/template b/srcpkgs/ruby-mustache/template
index ce9b567d0dd5..cf10ae6f107f 100644
--- a/srcpkgs/ruby-mustache/template
+++ b/srcpkgs/ruby-mustache/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-mustache'
 pkgname=ruby-mustache
 version=1.1.1
-revision=4
+revision=5
 build_style=gem
 short_desc="Framework-agnostic way to render logic-free views"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 8441d3b204652762730846f7d4c4303a1693e940 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:07:56 +0100
Subject: [PATCH 0133/1686] ruby-net-http-persistent: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-net-http-persistent/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-net-http-persistent/template b/srcpkgs/ruby-net-http-persistent/template
index a0f35fc709ae..943562acf325 100644
--- a/srcpkgs/ruby-net-http-persistent/template
+++ b/srcpkgs/ruby-net-http-persistent/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-net-http-persistent'
 pkgname=ruby-net-http-persistent
 version=4.0.1
-revision=1
+revision=2
 build_style=gem
 depends="ruby-connection_pool>=2.2 ruby-connection_pool<3.0"
 short_desc="Manages persistent connections using Net::HTTP"

From 92462d0a48fab9d63b263a881c625e3e124c3797 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:04 +0100
Subject: [PATCH 0134/1686] ruby-net-http-pipeline: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-net-http-pipeline/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-net-http-pipeline/template b/srcpkgs/ruby-net-http-pipeline/template
index c976e9b00208..a071ee510449 100644
--- a/srcpkgs/ruby-net-http-pipeline/template
+++ b/srcpkgs/ruby-net-http-pipeline/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-net-http-pipeline'
 pkgname=ruby-net-http-pipeline
 version=1.0.1
-revision=5
+revision=6
 build_style=gem
 short_desc="HTTP/1.1 pipelining implementation atop Net::HTTP"
 maintainer="Orphaned <orphan@voidlinux.org>"

From acfc4f5b76dabcfd234301de2f1c2e5e2e7f661b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:16 +0100
Subject: [PATCH 0135/1686] ruby-pkg-config: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-pkg-config/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-pkg-config/template b/srcpkgs/ruby-pkg-config/template
index cdfa408875dd..8c53cce12f49 100644
--- a/srcpkgs/ruby-pkg-config/template
+++ b/srcpkgs/ruby-pkg-config/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-pkg-config'
 pkgname=ruby-pkg-config
 version=1.4.0
-revision=4
+revision=5
 build_style=gem
 short_desc="Properly detect need libraries for compiling Ruby native extensions"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ac9bd1f84cc00b4fde588c464c552bf927b82d84 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:26 +0100
Subject: [PATCH 0136/1686] ruby-public_suffix: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-public_suffix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-public_suffix/template b/srcpkgs/ruby-public_suffix/template
index c68fd046d502..0e4eed0e0f02 100644
--- a/srcpkgs/ruby-public_suffix/template
+++ b/srcpkgs/ruby-public_suffix/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-public_suffix'
 pkgname=ruby-public_suffix
 version=4.0.2
-revision=4
+revision=5
 build_style=gem
 short_desc="Parse domain names into top level domain, domain and subdomains"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 1f204722a0e65c87a3a589da112288165d5bb09f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:34 +0100
Subject: [PATCH 0137/1686] ruby-pusher-client: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-pusher-client/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-pusher-client/template b/srcpkgs/ruby-pusher-client/template
index 90f0c3249f71..2d4e3c021e57 100644
--- a/srcpkgs/ruby-pusher-client/template
+++ b/srcpkgs/ruby-pusher-client/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-pusher-client'
 pkgname=ruby-pusher-client
 version=0.6.2
-revision=5
+revision=6
 build_style=gem
 depends="ruby-websocket>=1.0 ruby-websocket<2.0"
 short_desc="Client for consuming WebSockets from http://pusher.com"

From a49702f99655439b8d1a479e205b9d41a4627a3b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:47 +0100
Subject: [PATCH 0138/1686] ruby-rainbow: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rainbow/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rainbow/template b/srcpkgs/ruby-rainbow/template
index 6bc1fb209420..e9a41a7cf61f 100644
--- a/srcpkgs/ruby-rainbow/template
+++ b/srcpkgs/ruby-rainbow/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rainbow'
 pkgname=ruby-rainbow
 version=3.0.0
-revision=5
+revision=6
 build_style=gem
 short_desc="Colorize printed text on ANSI terminals"
 maintainer="Orphaned <orphan@voidlinux.org>"

From ac6ad09a42054ea6909ad695154405305e0ceed2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:08:51 +0100
Subject: [PATCH 0139/1686] ruby-rb-readline: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rb-readline/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rb-readline/template b/srcpkgs/ruby-rb-readline/template
index 9b35afe5be12..15beb60005a5 100644
--- a/srcpkgs/ruby-rb-readline/template
+++ b/srcpkgs/ruby-rb-readline/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rb-readline'
 pkgname=ruby-rb-readline
 version=0.5.5
-revision=5
+revision=6
 build_style=gem
 depends="ruby"
 short_desc="Pure Ruby implementation of GNU readline library"

From dd1d3cd493f173a7c1d6268c0eab02f906303083 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:11 +0100
Subject: [PATCH 0140/1686] ruby-rdiscount: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-rdiscount/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-rdiscount/template b/srcpkgs/ruby-rdiscount/template
index acd6dc4a494a..526af9a6dc2d 100644
--- a/srcpkgs/ruby-rdiscount/template
+++ b/srcpkgs/ruby-rdiscount/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-rdiscount'
 pkgname=ruby-rdiscount
 version=2.2.0.1
-revision=8
+revision=9
 wrksrc="${pkgname#ruby-}-${version}"
 build_style=gemspec
 makedepends="ruby-devel"

From ca4c785bcad1f6a6097ff18ea5378fa682cd5d69 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:29 +0100
Subject: [PATCH 0141/1686] ruby-ronn: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-ronn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-ronn/template b/srcpkgs/ruby-ronn/template
index 83516fe69653..d6a74ac864b6 100644
--- a/srcpkgs/ruby-ronn/template
+++ b/srcpkgs/ruby-ronn/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-ronn'
 pkgname=ruby-ronn
 version=0.7.3
-revision=5
+revision=6
 build_style=gem
 depends="ruby-hpricot ruby-mustache ruby-rdiscount groff"
 short_desc="Strick markdown-like format for manpages"

From 4d9b635c0d2cbdaae7a2890e83eac60824683eb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:37 +0100
Subject: [PATCH 0142/1686] ruby-thor: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-thor/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-thor/template b/srcpkgs/ruby-thor/template
index b7aefd3626c2..241ea78068e6 100644
--- a/srcpkgs/ruby-thor/template
+++ b/srcpkgs/ruby-thor/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-thor'
 pkgname=ruby-thor
 version=0.20.3
-revision=5
+revision=6
 build_style=gem
 short_desc="Toolkit for building powerful command-line interfaces"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 3b1344eed45bfcb88f7247a5417c1f7e1580f09d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:46 +0100
Subject: [PATCH 0143/1686] ruby-tmuxinator: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-tmuxinator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-tmuxinator/template b/srcpkgs/ruby-tmuxinator/template
index 57342385cb77..7d11374018a5 100644
--- a/srcpkgs/ruby-tmuxinator/template
+++ b/srcpkgs/ruby-tmuxinator/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-tmuxinator'
 pkgname=ruby-tmuxinator
 version=0.16.0
-revision=4
+revision=5
 build_style=gem
 depends="ruby-erubis>=2.6 ruby-thor>=0.15.0 ruby-xdg>=2.2.3 tmux"
 short_desc="Create and manage complex tmux sessions easily"

From a11e7b25a80ef223d9ddf1448cbf73371891e37c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:09:53 +0100
Subject: [PATCH 0144/1686] ruby-travis: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-travis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-travis/template b/srcpkgs/ruby-travis/template
index 847c706a36b9..3743358bb37f 100644
--- a/srcpkgs/ruby-travis/template
+++ b/srcpkgs/ruby-travis/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-travis'
 pkgname=ruby-travis
 version=1.9.0
-revision=3
+revision=4
 build_style=gem
 depends="ruby-backports ruby-faraday>=1.0 ruby-faraday_middleware>=1.0
  ruby-gh>=0.13 ruby-highline>=2.0 ruby-launchy>=2.1 ruby-pusher-client>=0.4

From 82389afdda3842320fa6f660443eae2b42fbab05 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:10:39 +0100
Subject: [PATCH 0145/1686] ruby-typhoeus: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-typhoeus/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-typhoeus/template b/srcpkgs/ruby-typhoeus/template
index cd0057c1ca20..4b4bd3a2ccfc 100644
--- a/srcpkgs/ruby-typhoeus/template
+++ b/srcpkgs/ruby-typhoeus/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-typhoeus'
 pkgname=ruby-typhoeus
 version=1.3.1
-revision=5
+revision=6
 build_style=gem
 depends="ruby-ethon>=0.9.0"
 short_desc="Parallel HTTP requests runner"

From b811356b073c6259735e229b1f76f587abe78b0f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:10:48 +0100
Subject: [PATCH 0146/1686] ruby-websocket: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-websocket/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-websocket/template b/srcpkgs/ruby-websocket/template
index c2e971d9b5c5..95d7cd3f07f4 100644
--- a/srcpkgs/ruby-websocket/template
+++ b/srcpkgs/ruby-websocket/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-websocket'
 pkgname=ruby-websocket
 version=1.2.8
-revision=5
+revision=6
 build_style=gem
 short_desc="Universal Ruby library to handle WebSocket protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e966515378d4a7c62c036c89abe49f42f9fea2b8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:10:57 +0100
Subject: [PATCH 0147/1686] ruby-xdg: rebuild for ruby-3.1.0.

---
 srcpkgs/ruby-xdg/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ruby-xdg/template b/srcpkgs/ruby-xdg/template
index 389d17c7c32a..e04194374ce9 100644
--- a/srcpkgs/ruby-xdg/template
+++ b/srcpkgs/ruby-xdg/template
@@ -1,7 +1,7 @@
 # Template file for 'ruby-xdg'
 pkgname=ruby-xdg
 version=5.1.1
-revision=1
+revision=2
 build_style=gem
 short_desc="Module for supporting the XDG Base Directory Standard"
 maintainer="Orphaned <orphan@voidlinux.org>"

From a9d42f8ae58f1c9d13d455c091193e3cfa183a64 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:11:08 +0100
Subject: [PATCH 0148/1686] subtle: rebuild for ruby-3.1.0.

---
 srcpkgs/subtle/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/subtle/template b/srcpkgs/subtle/template
index 0a9d2684a2ca..4db67b872bce 100644
--- a/srcpkgs/subtle/template
+++ b/srcpkgs/subtle/template
@@ -1,7 +1,7 @@
 # Template file for 'subtle'
 pkgname=subtle
 version=0.11.6579
-revision=2
+revision=3
 wrksrc="${pkgname}-${version#*.*.}"
 hostmakedepends="python3 mercurial ruby-devel pkg-config"
 makedepends="ruby-devel libX11-devel libXpm-devel libXft-devel
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="GPL-3.0-or-later"
 homepage="https://hg.unexist.dev/subtle/"
 distfiles="https://hg.unexist.dev/subtle/archive/${version#*.*.}.tar.gz"
-checksum=82fead3b4ced4d9985410e1dfd912fc8f78ce5c1b77448862da5a5bea1a33a96
+checksum=58b4bf85ae348f120a77001042f036570c239cd3327802b012506ea0158d8d86
 conf_files="/etc/xdg/subtle/subtle.rb"
 
 if [ "$CROSS_BUILD" ]; then
@@ -19,7 +19,7 @@ if [ "$CROSS_BUILD" ]; then
 		broken="Word size must match"
 	fi
 	hostmakedepends+=" $makedepends"
-	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/ruby-3.0.0/"
+	CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/ruby-3.1.0/"
 	export CFLAGS
 fi
 

From 319ea8de564c9cb697f2b1fb851c29b336048b37 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:11:54 +0100
Subject: [PATCH 0149/1686] rrdtool: rebuild for ruby-3.1.0.

---
 srcpkgs/rrdtool/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rrdtool/template b/srcpkgs/rrdtool/template
index 53d8b08aef1a..b1bd0e4e50e9 100644
--- a/srcpkgs/rrdtool/template
+++ b/srcpkgs/rrdtool/template
@@ -1,7 +1,7 @@
 # Template file for 'rrdtool'
 pkgname=rrdtool
 version=1.7.2
-revision=10
+revision=11
 build_style=gnu-configure
 # configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
 # until this is fixed upstream, manually define am_cv_python_version to circumvent

From 6d67bcb5dfc0cab70100c0cff88bea34c52a076e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:12:53 +0100
Subject: [PATCH 0150/1686] notmuch: rebuild for ruby-3.1.0.

---
 srcpkgs/notmuch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index c7a25199498a..841645d19fe9 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,7 +1,7 @@
 # Template file for 'notmuch'
 pkgname=notmuch
 version=0.32.2
-revision=3
+revision=4
 build_style=configure
 configure_args="--prefix=/usr
  --emacslispdir=/usr/share/emacs/site-lisp/notmuch

From 08c98c92d52c938ed9480ec2069f39ec0d85b8a6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:15:22 +0100
Subject: [PATCH 0151/1686] hivex: rebuild for ruby-3.1.0.

---
 srcpkgs/hivex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 613e708f1fa3..448c06ddc9fa 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.21
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"

From c9c3602bad687f6d4d2888b51e91ab534eeefaaf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:13:57 +0100
Subject: [PATCH 0152/1686] libguestfs: rebuild for ruby-3.1.0.

---
 srcpkgs/libguestfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 24a4c3bd4d74..5ac1d1d2b8ee 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.46.2
-revision=1
+revision=2
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"

From c50054a8f068463a900bdddebb5b4daf95b1e03c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 26 Dec 2021 17:21:25 +0100
Subject: [PATCH 0153/1686] vagrant: rebuild for ruby-3.1.0.

---
 srcpkgs/vagrant/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index 05139891c1b4..f15d85850d03 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,7 +1,7 @@
 # Template file for 'vagrant'
 pkgname=vagrant
 version=2.2.19
-revision=1
+revision=2
 archs="i686 x86_64*"
 hostmakedepends="ruby"
 makedepends="ruby-devel zlib-devel"
@@ -15,7 +15,7 @@ checksum=4f0e6b1d466e26dead682c4d4843e8f64a012eba4be91506ae6c6d34d3d9c8f9
 nocross=yes
 
 post_extract() {
-	sed -i 's|\,\ "<\ 2\.7"||g' $pkgname.gemspec
+	sed -i 's|, "< 3\.1"||g' $pkgname.gemspec
 }
 
 do_build() {

From 5206b90fd5cbc35853bc48e54611bd7322059e5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 12 Mar 2022 17:59:27 +0100
Subject: [PATCH 0154/1686] cloud-hypervisor: update to 22.1.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index 37f949e6e6c0..3ecf069b2b07 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=22.0
+version=22.1
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=5c5440435f78d4acdbb3ea91abe17d6704da6c18b6f52fe77f15835cfc60d17a
+checksum=73675ed730b5f23c4ce585918acff7496dcb585a4b91a672981c485bc7d94c37
 
 post_install() {
 	vlicense LICENSE-APACHE

From 03df720f0440fc3b818822db9122f529678fc0d1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 12 Mar 2022 18:12:49 +0100
Subject: [PATCH 0155/1686] python3-ropgadget: update to 6.7.

---
 srcpkgs/python3-ropgadget/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-ropgadget/template b/srcpkgs/python3-ropgadget/template
index 6ff8980ab2b0..df108c7351ab 100644
--- a/srcpkgs/python3-ropgadget/template
+++ b/srcpkgs/python3-ropgadget/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-ropgadget'
 pkgname=python3-ropgadget
-version=6.6
-revision=2
+version=6.7
+revision=1
 wrksrc="ROPGadget-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,4 +12,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/JonathanSalwan/ROPgadget"
 distfiles="${PYPI_SITE}/R/ROPGadget/ROPGadget-${version}.tar.gz"
-checksum=dc61186e0114ec67ec7ce374df8fd2ddc2a7cba129a1242338e900a7483fba22
+checksum=a048f2e51c397b902e4586997bd4fe62af97984e207567cb63e67d86e8e09c8e

From 9bdd69cd97c6bdbebbeff4f64c8e30d5bfda4216 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 23:18:41 +0100
Subject: [PATCH 0156/1686] kup: update to 0.9.1.

---
 srcpkgs/kup/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kup/template b/srcpkgs/kup/template
index 461bbcd45f97..15196942dbba 100644
--- a/srcpkgs/kup/template
+++ b/srcpkgs/kup/template
@@ -1,9 +1,10 @@
 # Template file for 'kup'
 pkgname=kup
-version=0.8.0
+version=0.9.1
 revision=1
 build_style=cmake
-hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons gettext kconfig"
+hostmakedepends="extra-cmake-modules kdoctools qt5-qmake qt5-host-tools kcoreaddons
+ kpackage 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"
@@ -13,4 +14,4 @@ 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"
+checksum=5597d215b025bfc76aa290efbe187fb6f92313fbdc40628b851180c535610976

From 825cb152642a5676fb96477f0d13d6791a8e619d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 12 Mar 2022 16:44:34 +0100
Subject: [PATCH 0157/1686] whois: update to 5.5.12.

---
 srcpkgs/whois/template | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index f46219419be0..46bb8347a810 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,8 +1,12 @@
 # Template file for 'whois'
 pkgname=whois
-version=5.5.11
+version=5.5.12
 revision=1
 wrksrc=whois
+build_style=gnu-makefile
+make_build_args="prefix=/usr HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf"
+make_install_args="prefix=/usr BASEDIR=\${DESTDIR}"
+make_install_target="install-whois"
 hostmakedepends="perl pkg-config gettext"
 makedepends="libidn2-devel"
 short_desc="Improved whois client"
@@ -11,18 +15,13 @@ 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=966281eb8301c14a1acc17e46c70061f73179d80e370aef43065c22f0947fb87
+checksum=f1c5bab781b7f2357dab1039e8875d41ff7b5d03a78c27443fa26351952a0822
 
 alternatives="
  whois:whois:/usr/bin/gwhois
  whois:whois.1:/usr/share/man/man1/gwhois.1"
 
-do_build() {
-	make CC=$CC prefix=/usr HAVE_ICONV=1 CONFIG_FILE=/etc/whois.conf
-}
-
-do_install() {
-	make prefix=/usr BASEDIR=${DESTDIR} install-whois
+post_install() {
 	mv ${DESTDIR}/usr/bin/{whois,gwhois}
 	mv ${DESTDIR}/usr/share/man/man1/{whois,gwhois}.1
 }

From 0f47608acf86080a0a66f8289168ab1d28f77f4c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 12 Mar 2022 23:46:58 +0100
Subject: [PATCH 0158/1686] New package: adjtimex-1.29

---
 srcpkgs/adjtimex/patches/destdir.patch | 17 +++++++++++++++++
 srcpkgs/adjtimex/template              | 12 ++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 srcpkgs/adjtimex/patches/destdir.patch
 create mode 100644 srcpkgs/adjtimex/template

diff --git a/srcpkgs/adjtimex/patches/destdir.patch b/srcpkgs/adjtimex/patches/destdir.patch
new file mode 100644
index 000000000000..5fba7fdfad59
--- /dev/null
+++ b/srcpkgs/adjtimex/patches/destdir.patch
@@ -0,0 +1,17 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -42,10 +42,11 @@
+ 	$(CC) $(CFLAGS) -c mat.c
+ 
+ install: all
+-	$(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex
+-	$(INSTALL) -d -g root -m 755 -o root $(mandir)
++	$(INSTALL) -d -g root -m 755 -o root $(DESTDIR)$(bindir)
++	$(INSTALL) -g bin -m 755 -o root adjtimex $(DESTDIR)$(bindir)/adjtimex
++	$(INSTALL) -d -g root -m 755 -o root $(DESTDIR)$(mandir)
+ 	-$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \
+-		$(mandir)/adjtimex.$(manext)
++		$(DESTDIR)$(mandir)/adjtimex.$(manext)
+ 
+ uninstall:
+ 	rm -f $(bindir)/adjtimex $(mandir)/adjtimex.$(manext)
diff --git a/srcpkgs/adjtimex/template b/srcpkgs/adjtimex/template
new file mode 100644
index 000000000000..7a50e751d531
--- /dev/null
+++ b/srcpkgs/adjtimex/template
@@ -0,0 +1,12 @@
+# Template file for 'adjtimex'
+pkgname=adjtimex
+version=1.29
+revision=1
+build_style=gnu-configure
+make_install_args="bindir=/usr/bin"
+short_desc="Kernel time variables configuration utility"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/rogers0/adjtimex"
+distfiles="${DEBIAN_SITE}/main/a/adjtimex/adjtimex_${version}.orig.tar.gz"
+checksum=04b9e8b66e77276ed07e78de89af37fd1aa12725923de853480827c4fafd176a

From b60b1ecab5c68b2db68740d18f2141f44f85f100 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 13 Mar 2022 00:05:37 +0100
Subject: [PATCH 0159/1686] kup: fix build on musl

---
 srcpkgs/kup/patches/musl.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/kup/patches/musl.patch

diff --git a/srcpkgs/kup/patches/musl.patch b/srcpkgs/kup/patches/musl.patch
new file mode 100644
index 000000000000..b62cdd945d9b
--- /dev/null
+++ b/srcpkgs/kup/patches/musl.patch
@@ -0,0 +1,10 @@
+--- a/daemon/fsexecutor.cpp
++++ b/daemon/fsexecutor.cpp
+@@ -15,6 +15,7 @@
+ 
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#include <sys/select.h>
+ 
+ namespace {
+ 

From fd21b66c6fb5f0339e100619e5f5729341fe5750 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Sat, 12 Mar 2022 09:57:21 -0600
Subject: [PATCH 0160/1686] zfs: update to 2.1.3.

---
 ...1-only-build-the-module-in-dkms.conf.patch |  43 +++
 srcpkgs/zfs/patches/12975.patch               | 276 ------------------
 srcpkgs/zfs/patches/dkms.patch                |  39 ---
 srcpkgs/zfs/patches/musl-seek-constants.patch |  58 ----
 srcpkgs/zfs/template                          |   6 +-
 5 files changed, 46 insertions(+), 376 deletions(-)
 create mode 100644 srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
 delete mode 100644 srcpkgs/zfs/patches/12975.patch
 delete mode 100644 srcpkgs/zfs/patches/dkms.patch
 delete mode 100644 srcpkgs/zfs/patches/musl-seek-constants.patch

diff --git a/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch b/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
new file mode 100644
index 000000000000..cd9e890ab76e
--- /dev/null
+++ b/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
@@ -0,0 +1,43 @@
+# Patch from https://aur.archlinux.org/cgit/aur.git/tree/0001-only-build-the-module-in-dkms.conf.patch?h=zfs-dkms
+# Avoids recompiling ZFS userland utilities with DKMS rebuilds
+From b4a2c0b184c9c9599421b15a430fb88deb5dbd17 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Sun, 28 Oct 2018 15:01:58 -0400
+Subject: [PATCH] only build the module in dkms.conf
+
+---
+ scripts/dkms.mkconf | 19 ++-----------------
+ 1 file changed, 2 insertions(+), 17 deletions(-)
+
+diff --git a/scripts/dkms.mkconf b/scripts/dkms.mkconf
+index 88c289383..5a859a0e0 100755
+--- a/scripts/dkms.mkconf
++++ b/scripts/dkms.mkconf
+@@ -28,14 +28,7 @@ PACKAGE_CONFIG="${pkgcfg}"
+ PRE_BUILD="configure
+   --prefix=/usr
+   --with-config=kernel
+-  --with-linux=\$(
+-    if [ -e "\${kernel_source_dir/%build/source}" ]
+-    then
+-      echo "\${kernel_source_dir/%build/source}"
+-    else
+-      echo "\${kernel_source_dir}"
+-    fi
+-  )
++  --with-linux="\${kernel_source_dir}"
+   --with-linux-obj="\${kernel_source_dir}"
+   \$(
+     [[ -n \"\${ICP_ROOT}\" ]] && \\
+@@ -69,7 +54,7 @@ POST_BUILD="scripts/dkms.postbuild
+ "
+ AUTOINSTALL="yes"
+ REMAKE_INITRD="no"
+-MAKE[0]="make"
++MAKE[0]="make -C module/"
+ STRIP[0]="\$(
+   [[ -r \${PACKAGE_CONFIG} ]] \\
+   && source \${PACKAGE_CONFIG} \\
+-- 
+2.19.1
+
diff --git a/srcpkgs/zfs/patches/12975.patch b/srcpkgs/zfs/patches/12975.patch
deleted file mode 100644
index 13d08e98d8bb..000000000000
--- a/srcpkgs/zfs/patches/12975.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-From 7b926912e9a968341c2140f7b887261fea86c706 Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Fri, 14 Jan 2022 05:09:08 -0500
-Subject: [PATCH 1/4] Linux 5.16 compat: Check slab.h for kvmalloc
-
-As it says on the tin - the folio work moved a bunch out of mm.h.
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-kmem.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/kernel-kmem.m4 b/config/kernel-kmem.m4
-index 43f9e72f88d..03c2a41fbdb 100644
---- a/config/kernel-kmem.m4
-+++ b/config/kernel-kmem.m4
-@@ -64,6 +64,7 @@ dnl #
- AC_DEFUN([ZFS_AC_KERNEL_SRC_KVMALLOC], [
- 	ZFS_LINUX_TEST_SRC([kvmalloc], [
- 		#include <linux/mm.h>
-+		#include <linux/slab.h>
- 	],[
- 		void *p __attribute__ ((unused));
- 
-
-From 1ca38ed9280ce80e7a12813b54dc5ade5e78f61b Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Fri, 14 Jan 2022 05:08:33 -0500
-Subject: [PATCH 2/4] Linux 5.16 compat: Added add_disk check for return
-
-add_disk went from void to must-check int return.
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-add-disk.m4     | 27 +++++++++++++++++++++++++++
- config/kernel.m4              |  2 ++
- module/os/linux/zfs/zvol_os.c |  4 ++++
- 3 files changed, 33 insertions(+)
- create mode 100644 config/kernel-add-disk.m4
-
-diff --git a/config/kernel-add-disk.m4 b/config/kernel-add-disk.m4
-new file mode 100644
-index 00000000000..3bc40f1e7d2
---- /dev/null
-+++ b/config/kernel-add-disk.m4
-@@ -0,0 +1,27 @@
-+dnl #
-+dnl # 5.16 API change
-+dnl # add_disk grew a must-check return code
-+dnl #
-+AC_DEFUN([ZFS_AC_KERNEL_SRC_ADD_DISK], [
-+
-+	ZFS_LINUX_TEST_SRC([add_disk_ret], [
-+		#include <linux/genhd.h>
-+	], [
-+		struct gendisk *disk = NULL;
-+		int err = add_disk(disk);
-+		err = err;
-+	])
-+
-+])
-+
-+AC_DEFUN([ZFS_AC_KERNEL_ADD_DISK], [
-+	AC_MSG_CHECKING([whether add_disk() returns int])
-+	ZFS_LINUX_TEST_RESULT([add_disk_ret],
-+	[
-+		AC_MSG_RESULT(yes)
-+		AC_DEFINE(HAVE_ADD_DISK_RET, 1,
-+		    [add_disk() returns int])
-+	], [
-+		AC_MSG_RESULT(no)
-+	])
-+])
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index bdd3caed2b3..b3ed966b726 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -135,6 +135,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
- 	ZFS_AC_KERNEL_SRC_VFS_SET_PAGE_DIRTY_NOBUFFERS
- 	ZFS_AC_KERNEL_SRC_STANDALONE_LINUX_STDARG
- 	ZFS_AC_KERNEL_SRC_PAGEMAP_FOLIO_WAIT_BIT
-+	ZFS_AC_KERNEL_SRC_ADD_DISK
- 
- 	AC_MSG_CHECKING([for available kernel interfaces])
- 	ZFS_LINUX_TEST_COMPILE_ALL([kabi])
-@@ -243,6 +244,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
- 	ZFS_AC_KERNEL_VFS_SET_PAGE_DIRTY_NOBUFFERS
- 	ZFS_AC_KERNEL_STANDALONE_LINUX_STDARG
- 	ZFS_AC_KERNEL_PAGEMAP_FOLIO_WAIT_BIT
-+	ZFS_AC_KERNEL_ADD_DISK
- ])
- 
- dnl #
-diff --git a/module/os/linux/zfs/zvol_os.c b/module/os/linux/zfs/zvol_os.c
-index cef52e22483..e26d4db4977 100644
---- a/module/os/linux/zfs/zvol_os.c
-+++ b/module/os/linux/zfs/zvol_os.c
-@@ -1110,7 +1110,11 @@ zvol_os_create_minor(const char *name)
- 		rw_enter(&zvol_state_lock, RW_WRITER);
- 		zvol_insert(zv);
- 		rw_exit(&zvol_state_lock);
-+#ifdef HAVE_ADD_DISK_RET
-+		error = add_disk(zv->zv_zso->zvo_disk);
-+#else
- 		add_disk(zv->zv_zso->zvo_disk);
-+#endif
- 	} else {
- 		ida_simple_remove(&zvol_ida, idx);
- 	}
-
-From a0b11a8996b55a0bb3c1c100fa6f392ca90d74b0 Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Fri, 14 Jan 2022 05:07:33 -0500
-Subject: [PATCH 3/4] Linux 5.16 compat: Added mapping for
- iov_iter_fault_in_readable
-
-Linux decided to rename this for some reason. At some point, we
-should probably invert this mapping, but for now...
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-add-disk.m4      |  1 -
- config/kernel-vfs-iov_iter.m4  | 22 ++++++++++++++++++++--
- include/os/linux/spl/sys/uio.h |  4 ++++
- 3 files changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/config/kernel-add-disk.m4 b/config/kernel-add-disk.m4
-index 3bc40f1e7d2..5d1779eb432 100644
---- a/config/kernel-add-disk.m4
-+++ b/config/kernel-add-disk.m4
-@@ -13,7 +13,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_ADD_DISK], [
- 	])
- 
- ])
--
- AC_DEFUN([ZFS_AC_KERNEL_ADD_DISK], [
- 	AC_MSG_CHECKING([whether add_disk() returns int])
- 	ZFS_LINUX_TEST_RESULT([add_disk_ret],
-diff --git a/config/kernel-vfs-iov_iter.m4 b/config/kernel-vfs-iov_iter.m4
-index ecdda939f1c..57f78745a24 100644
---- a/config/kernel-vfs-iov_iter.m4
-+++ b/config/kernel-vfs-iov_iter.m4
-@@ -41,6 +41,17 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_IOV_ITER], [
- 		error = iov_iter_fault_in_readable(&iter, size);
- 	])
- 
-+	ZFS_LINUX_TEST_SRC([fault_in_iov_iter_readable], [
-+		#include <linux/fs.h>
-+		#include <linux/uio.h>
-+	],[
-+		struct iov_iter iter = { 0 };
-+		size_t size = 512;
-+		int error __attribute__ ((unused));
-+
-+		error = fault_in_iov_iter_readable(&iter, size);
-+	])
-+
- 	ZFS_LINUX_TEST_SRC([iov_iter_count], [
- 		#include <linux/fs.h>
- 		#include <linux/uio.h>
-@@ -123,8 +134,15 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_IOV_ITER], [
- 		AC_DEFINE(HAVE_IOV_ITER_FAULT_IN_READABLE, 1,
- 		    [iov_iter_fault_in_readable() is available])
- 	],[
--		AC_MSG_RESULT(no)
--		enable_vfs_iov_iter="no"
-+		AC_MSG_CHECKING([whether fault_in_iov_iter_readable() is available])
-+		ZFS_LINUX_TEST_RESULT([fault_in_iov_iter_readable], [
-+			AC_MSG_RESULT(yes)
-+			AC_DEFINE(HAVE_FAULT_IN_IOV_ITER_READABLE, 1,
-+			    [fault_in_iov_iter_readable() is available])
-+		],[
-+			AC_MSG_RESULT(no)
-+			enable_vfs_iov_iter="no"
-+		])
- 	])
- 
- 	AC_MSG_CHECKING([whether iov_iter_count() is available])
-diff --git a/include/os/linux/spl/sys/uio.h b/include/os/linux/spl/sys/uio.h
-index 66af2b0b534..439eec98623 100644
---- a/include/os/linux/spl/sys/uio.h
-+++ b/include/os/linux/spl/sys/uio.h
-@@ -34,6 +34,10 @@
- #include <asm/uaccess.h>
- #include <sys/types.h>
- 
-+#if defined(HAVE_VFS_IOV_ITER) && defined(HAVE_FAULT_IN_IOV_ITER_READABLE)
-+#define	iov_iter_fault_in_readable(a, b)	fault_in_iov_iter_readable(a, b)
-+#endif
-+
- typedef struct iovec iovec_t;
- 
- typedef enum zfs_uio_rw {
-
-From 700bb88b595d0e73ad3c19767cec68cb8081be2d Mon Sep 17 00:00:00 2001
-From: Rich Ercolani <rincebrain@gmail.com>
-Date: Wed, 19 Jan 2022 00:12:15 -0500
-Subject: [PATCH 4/4] Add support for FALLOC_FL_ZERO_RANGE
-
-For us, I think it's always just FALLOC_FL_PUNCH_HOLE with a fake
-mustache on.
-
-Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
----
- config/kernel-fallocate.m4     | 17 +++++++++++++++++
- module/os/linux/zfs/zpl_file.c |  9 +++++++--
- 2 files changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/config/kernel-fallocate.m4 b/config/kernel-fallocate.m4
-index 7a8550f7e76..815602d3e2c 100644
---- a/config/kernel-fallocate.m4
-+++ b/config/kernel-fallocate.m4
-@@ -3,6 +3,10 @@ dnl # Linux 2.6.38 - 3.x API
- dnl # The fallocate callback was moved from the inode_operations
- dnl # structure to the file_operations structure.
- dnl #
-+dnl #
-+dnl # Linux 3.15+
-+dnl # fallocate learned a new flag, FALLOC_FL_ZERO_RANGE
-+dnl #
- AC_DEFUN([ZFS_AC_KERNEL_SRC_FALLOCATE], [
- 	ZFS_LINUX_TEST_SRC([file_fallocate], [
- 		#include <linux/fs.h>
-@@ -15,12 +19,25 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_FALLOCATE], [
- 			.fallocate = test_fallocate,
- 		};
- 	], [])
-+	ZFS_LINUX_TEST_SRC([falloc_fl_zero_range], [
-+		#include <linux/falloc.h>
-+	],[
-+		int flags __attribute__ ((unused));
-+		flags = FALLOC_FL_ZERO_RANGE;
-+	])
- ])
- 
- AC_DEFUN([ZFS_AC_KERNEL_FALLOCATE], [
- 	AC_MSG_CHECKING([whether fops->fallocate() exists])
- 	ZFS_LINUX_TEST_RESULT([file_fallocate], [
- 		AC_MSG_RESULT(yes)
-+		AC_MSG_CHECKING([whether FALLOC_FL_ZERO_RANGE exists])
-+		ZFS_LINUX_TEST_RESULT([falloc_fl_zero_range], [
-+			AC_MSG_RESULT(yes)
-+			AC_DEFINE(HAVE_FALLOC_FL_ZERO_RANGE, 1, [FALLOC_FL_ZERO_RANGE is defined])
-+		],[
-+			AC_MSG_RESULT(no)
-+		])
- 	],[
- 		ZFS_LINUX_TEST_ERROR([file_fallocate])
- 	])
-diff --git a/module/os/linux/zfs/zpl_file.c b/module/os/linux/zfs/zpl_file.c
-index 21926f170c5..a3af1804f6a 100644
---- a/module/os/linux/zfs/zpl_file.c
-+++ b/module/os/linux/zfs/zpl_file.c
-@@ -745,7 +745,12 @@ zpl_fallocate_common(struct inode *ip, int mode, loff_t offset, loff_t len)
- 	fstrans_cookie_t cookie;
- 	int error = 0;
- 
--	if ((mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) != 0)
-+	int test_mode = FALLOC_FL_PUNCH_HOLE;
-+#ifdef HAVE_FALLOC_FL_ZERO_RANGE
-+	test_mode |= FALLOC_FL_ZERO_RANGE;
-+#endif
-+
-+	if ((mode & ~(FALLOC_FL_KEEP_SIZE | test_mode)) != 0)
- 		return (-EOPNOTSUPP);
- 
- 	if (offset < 0 || len <= 0)
-@@ -756,7 +761,7 @@ zpl_fallocate_common(struct inode *ip, int mode, loff_t offset, loff_t len)
- 
- 	crhold(cr);
- 	cookie = spl_fstrans_mark();
--	if (mode & FALLOC_FL_PUNCH_HOLE) {
-+	if (mode & (test_mode)) {
- 		flock64_t bf;
- 
- 		if (offset > olen)
diff --git a/srcpkgs/zfs/patches/dkms.patch b/srcpkgs/zfs/patches/dkms.patch
deleted file mode 100644
index 850a976534d4..000000000000
--- a/srcpkgs/zfs/patches/dkms.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-# Patch from https://aur.archlinux.org/packages/zfs-dkms/
-# Avoids recompiling ZFS userland utilities with DKMS rebuilds
-# Also short-circuits a useless test for Debian in the DKMS source
-
---- a/scripts/dkms.mkconf	2021-01-19 19:19:08.000000000 -0500
-+++ b/scripts/dkms.mkconf	2021-02-02 19:03:02.045984881 -0500
-@@ -26,22 +26,7 @@
- PRE_BUILD="configure
-   --prefix=/usr
-   --with-config=kernel
--  --with-linux=\$(
--    case \`lsb_release -is\` in
--      (Debian|Devuan)
--        if [[ -e \${kernel_source_dir/%build/source} ]]
--        then
--          echo \${kernel_source_dir/%build/source}
--        else
--          # A kpkg exception for Proxmox 2.0
--          echo \${kernel_source_dir}
--        fi
--      ;;
--      (*)
--        echo \${kernel_source_dir}
--      ;;
--    esac
--  )
-+  --with-linux=\${kernel_source_dir}
-   --with-linux-obj=\${kernel_source_dir}
-   \$(
-     [[ -n \"\${ICP_ROOT}\" ]] && \\
-@@ -75,7 +60,7 @@
- "
- AUTOINSTALL="yes"
- REMAKE_INITRD="no"
--MAKE[0]="make"
-+MAKE[0]="make -C module/"
- STRIP[0]="\$(
-   [[ -r \${PACKAGE_CONFIG} ]] \\
-   && source \${PACKAGE_CONFIG} \\
diff --git a/srcpkgs/zfs/patches/musl-seek-constants.patch b/srcpkgs/zfs/patches/musl-seek-constants.patch
deleted file mode 100644
index 3d2c563f8c51..000000000000
--- a/srcpkgs/zfs/patches/musl-seek-constants.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 123c87b3c2d75636da79f57a4b0ed60d2a3133a8 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Mon, 20 Dec 2021 12:25:11 -0800
-Subject: [PATCH] zfs-test/mmap_seek: fix build on musl
-
-it needs linux/fs.h for SEEK_DATA and friends
-
-without linux/fs.h:
-
-```
-mmap_seek.c
-mmap_seek.c: In function 'seek_data':
-mmap_seek.c:37:40: error: 'SEEK_DATA' undeclared (first use in this function);
-did you mean 'SEEK_SET'?
-   37 |  off_t data_offset = lseek(fd, offset, SEEK_DATA);
-```
-
-also it needs sys/sysmacros.h for P2ROUNDUP
-without it:
-
-```
-mmap_seek.c: In function 'main':
-mmap_seek.c:122:19: warning:
-implicit declaration of function 'P2ROUNDUP' [-Wimplicit-function-declaration]
-  122 |  seek_hole(fd, 0, P2ROUNDUP(file_size / 2, block_size));
-      |                   ^~~~~~~~~
-powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.o: in function `main':
-mmap_seek.c:(.text.startup+0x1b8): undefined reference to `P2ROUNDUP'
-powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.c:(.text.startup+0x1d8):
-	undefined reference to `P2ROUNDUP'
-powerpc64-gentoo-linux-musl/bin/ld: mmap_seek.c:(.text.startup+0x21c):
-	undefined reference to `P2ROUNDUP'
-collect2: error: ld returned 1 exit status
-make[5]: *** [Makefile:754: mmap_seek] Error 1
-```
-
-Closes: https://github.com/openzfs/zfs/pull/12891
-Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
----
- tests/zfs-tests/cmd/mmap_seek/mmap_seek.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
-index f476e1dba9a..bb36527aafe 100644
---- a/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
-+++ b/tests/zfs-tests/cmd/mmap_seek/mmap_seek.c
-@@ -29,7 +29,11 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/mman.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
-+#ifdef __linux__
-+#include <linux/fs.h>
-+#endif
- 
- static void
- seek_data(int fd, off_t offset, off_t expected)
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 0b0c490a5843..477c39614cd0 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.1.2
-revision=2
+version=2.1.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=258cf1d17a1f668a3b99b61eaf14be06c614df42503db0319bef1b9fc4c8b9e7
+checksum=b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

From 62c022ad7a1e55d20a48245716a739892089eefb Mon Sep 17 00:00:00 2001
From: Luke Hannan <luke@lukehannan.com>
Date: Fri, 11 Mar 2022 23:17:55 +0200
Subject: [PATCH 0161/1686] R: update to 4.1.3.

---
 srcpkgs/R/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 8190ac146535..d506d02764b0 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
-version=4.1.2
-revision=2
+version=4.1.3
+revision=1
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-blas$(vopt_if openblas '=openblas') --with-lapack
@@ -22,7 +22,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.r-project.org/"
 changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html"
 distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz"
-checksum=2036225e9f7207d4ce097e54972aecdaa8b40d7d9911cd26491fac5a0fab38af
+checksum=15ff5b333c61094060b2a52e9c1d8ec55cc42dd029e39ca22abdaa909526fed6
 nocross=yes
 shlib_provides="libR.so"
 make_check=extended

From c85522fc4eed021296a4fa23291db1e4760dc7ee Mon Sep 17 00:00:00 2001
From: TROUVERIE Joachim <jtrouverie@joakode.fr>
Date: Fri, 4 Mar 2022 17:59:30 +0100
Subject: [PATCH 0162/1686] notmuch: update to 0.35.

---
 ...mime-session-key-extraction-support-.patch | 43 +++++++-------
 ...mime-x509-certificate-validity-check.patch | 56 +++++++++----------
 ...-gmime-verify-with-session-key-check.patch | 39 +++++++------
 srcpkgs/notmuch/template                      | 10 ++--
 4 files changed, 72 insertions(+), 76 deletions(-)

diff --git a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
index 581c6be15590..b6445729af6f 100644
--- a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
+++ b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch
@@ -17,13 +17,13 @@ Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
  1 file changed, 58 deletions(-)
 
 diff --git a/configure b/configure
-index 7dae745c..99b0c328 100755
+index 36f3f606..1bf2097d 100755
 --- a/configure
 +++ b/configure
-@@ -467,65 +467,7 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
- 
+@@ -492,65 +492,7 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+
      printf "Checking for GMime session key extraction support... "
- 
+
 -    cat > _check_session_keys.c <<EOF
 -#include <gmime/gmime.h>
 -#include <stdio.h>
@@ -54,16 +54,16 @@ index 7dae745c..99b0c328 100755
 -}
 -EOF
 -    if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
--        printf 'No.\nCould not make tempdir for testing session-key support.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nCould not make tempdir for testing session-key support.\n'
+-	errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
--           && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
--           && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
--           && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
+-	   && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+-	   && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \
+-	   && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ]
 -    then
-         printf "OK.\n"
+ 	printf "OK.\n"
 -    else
--        cat <<EOF
+-	cat <<EOF
 -No.
 -*** Error: Could not extract session keys from encrypted message.
 -
@@ -73,19 +73,18 @@ index 7dae745c..99b0c328 100755
 -Please try to rebuild your version of GMime against a more recent
 -version of GPGME (at least GPGME 1.8.0).
 -EOF
--        if command -v gpgme-config >/dev/null; then
--            printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
--        else
--            printf 'You do not have the GPGME development libraries installed.\n'
--        fi
--        errors=$((errors + 1))
+-	if command -v gpgme-config >/dev/null; then
+-	    printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)"
+-	else
+-	    printf 'You do not have the GPGME development libraries installed.\n'
+-	fi
+-	errors=$((errors + 1))
 -    fi
 -    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
--        rm -rf "$TEMP_GPG"
+-	rm -rf "$TEMP_GPG"
 -    fi
- 
+
      # see https://github.com/jstedfast/gmime/pull/90
      # should be fixed in GMime in 3.2.7, but some distros might patch
--- 
-2.28.0.rc2.21.g5c06d60fc5
-
+--
+2.35.1
diff --git a/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
index 49b5b3a0795d..c7e5addc0784 100644
--- a/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
+++ b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch
@@ -11,18 +11,17 @@ The problem has been fixed with gmime 3.2.7 already.
 
 Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
 ---
- configure | 70 -------------------------------------------------------
- 1 file changed, 70 deletions(-)
+ configure | 69 -------------------------------------------------------
+ 1 file changed, 69 deletions(-)
 
 diff --git a/configure b/configure
-index 99b0c328..ef602d10 100755
+index 36f3f606..fd23aa67 100755
 --- a/configure
 +++ b/configure
-@@ -472,78 +472,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
-     # see https://github.com/jstedfast/gmime/pull/90
+@@ -556,77 +556,8 @@ EOF
      # should be fixed in GMime in 3.2.7, but some distros might patch
      printf "Checking for GMime X.509 certificate validity... "
--
+
 -    cat > _check_x509_validity.c <<EOF
 -#include <stdio.h>
 -#include <gmime/gmime.h>
@@ -63,40 +62,39 @@ index 99b0c328..ef602d10 100755
 -}
 -EOF
 -    if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
--        printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n'
+-	errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \
--            && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \
--            && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \
--            && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt
+-	    && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \
+-	    && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \
+-	    && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt
 -    then
--        if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then
-             gmime_x509_cert_validity=1
-             printf "Yes.\n"
--        else
--            gmime_x509_cert_validity=0
--            printf "No.\n"
--            if pkg-config --exists "gmime-3.0 >= 3.2.7"; then
--                cat <<EOF
+-	if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then
+ 	    gmime_x509_cert_validity=1
+ 	    printf "Yes.\n"
+-	else
+-	    gmime_x509_cert_validity=0
+-	    printf "No.\n"
+-	    if pkg-config --exists "gmime-3.0 >= 3.2.7"; then
+-		cat <<EOF
 -*** Error: GMime fails to calculate X.509 certificate validity, and
 -is later than 3.2.7, which should have fixed this issue.
 -
 -Please follow up on https://github.com/jstedfast/gmime/pull/90 with
 -more details.
 -EOF
--                errors=$((errors + 1))
--            fi
--        fi
+-		errors=$((errors + 1))
+-	    fi
+-	fi
 -    else
--        printf 'No.\nFailed to set up gpgsm for testing X.509 certificate validity support.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nFailed to set up gpgsm for testing X.509 certificate validity support.\n'
+-	errors=$((errors + 1))
 -    fi
 -    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
--        rm -rf "$TEMP_GPG"
+-	rm -rf "$TEMP_GPG"
 -    fi
- 
+
      # see https://dev.gnupg.org/T3464
      # there are problems verifying signatures when decrypting with session keys with GPGME 1.13.0 and 1.13.1
--- 
-2.28.0.rc2.21.g5c06d60fc5
-
+--
+2.35.1
diff --git a/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch b/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch
index 5de4f6ff5ce4..5ca5b506eaca 100644
--- a/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch
+++ b/srcpkgs/notmuch/patches/0007-configure-drop-gmime-verify-with-session-key-check.patch
@@ -18,10 +18,10 @@ Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
  1 file changed, 66 deletions(-)
 
 diff --git a/configure b/configure
-index ef602d10..204d46d9 100755
+index 36f3f606..cd99bf4a 100755
 --- a/configure
 +++ b/configure
-@@ -478,74 +478,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
+@@ -631,74 +631,8 @@ EOF
      # see https://dev.gnupg.org/T3464
      # there are problems verifying signatures when decrypting with session keys with GPGME 1.13.0 and 1.13.1
      printf "Checking signature verification when decrypting using session keys... "
@@ -67,35 +67,34 @@ index ef602d10..204d46d9 100755
 -}
 -EOF
 -    if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
--        printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n'
+-	errors=$((errors + 1))
 -    elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \
--            && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
--            && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
+-	    && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \
+-	    && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key
 -    then
--        if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
-             gmime_verify_with_session_key=1
-             printf "Yes.\n"
--        else
--            gmime_verify_with_session_key=0
--            printf "No.\n"
--            cat <<EOF
+-	if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then
+ 	    gmime_verify_with_session_key=1
+ 	    printf "Yes.\n"
+-	else
+-	    gmime_verify_with_session_key=0
+-	    printf "No.\n"
+-	    cat <<EOF
 -*** Error: GMime fails to verify signatures when decrypting with a session key.
 -
 -This is most likely due to a buggy version of GPGME, which should be fixed in 1.13.2 or later.
 -See https://dev.gnupg.org/T3464 for more details.
 -EOF
--        fi
+-	fi
 -    else
--        printf 'No.\nFailed to set up gpg for testing signature verification while decrypting with a session key.\n'
--        errors=$((errors + 1))
+-	printf 'No.\nFailed to set up gpg for testing signature verification while decrypting with a session key.\n'
+-	errors=$((errors + 1))
 -    fi
 -    if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then
--        rm -rf "$TEMP_GPG"
+-	rm -rf "$TEMP_GPG"
 -    fi
  else
      have_gmime=0
      printf "No.\n"
--- 
-2.28.0.rc2.21.g5c06d60fc5
-
+--
+2.35.1
diff --git a/srcpkgs/notmuch/template b/srcpkgs/notmuch/template
index 841645d19fe9..b33a09fbddcf 100644
--- a/srcpkgs/notmuch/template
+++ b/srcpkgs/notmuch/template
@@ -1,7 +1,7 @@
 # Template file for 'notmuch'
 pkgname=notmuch
-version=0.32.2
-revision=4
+version=0.35
+revision=1
 build_style=configure
 configure_args="--prefix=/usr
  --emacslispdir=/usr/share/emacs/site-lisp/notmuch
@@ -14,12 +14,12 @@ depends="gmime3>=3.2.7"
 checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core
  openssl"
 short_desc="Thread-based email index, search, and tagging"
-maintainer="Jan S. <jan.schreib@gmail.com>"
+maintainer="Joachim T. <jtrouverie@joakode.fr>"
 license="GPL-3.0-or-later"
 homepage="https://notmuchmail.org"
 distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz
  https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"
-checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7
+checksum="a831c414c4f20a6cae3a580793c855102d3295080f000eb3832b77226a40ac39
  4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2"
 skip_extraction="database-v1.tar.xz"
 replaces="notmuch-emacs>=0"
@@ -56,7 +56,7 @@ do_check() {
 	# we don't ship python-cffi
 	NOTMUCH_SKIP_TESTS+=" libconfig python-cffi"
 	if [ $(id -u) = 0 ]; then
-		NOTMUCH_SKIP_TESTS+=" new.36 tagging.25"
+		NOTMUCH_SKIP_TESTS+=" new.36 new.39 tagging.25"
 	fi
 	export NOTMUCH_SKIP_TESTS
 	make test

From 28d7a5bfdf3e3dda4c56bfacbad5d11fc1ef7c75 Mon Sep 17 00:00:00 2001
From: Neel <neel@chot.ai>
Date: Sun, 19 Dec 2021 21:54:53 +0000
Subject: [PATCH 0163/1686] hstr: update to 2.5

---
 srcpkgs/hstr/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/hstr/template b/srcpkgs/hstr/template
index ee259a9eac03..3f2d95c854ec 100644
--- a/srcpkgs/hstr/template
+++ b/srcpkgs/hstr/template
@@ -1,6 +1,6 @@
 # Template file for 'hstr'
 pkgname=hstr
-version=2.3
+version=2.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
@@ -11,12 +11,9 @@ license="Apache-2.0"
 homepage="https://github.com/dvorka/hstr"
 changelog="https://raw.githubusercontent.com/dvorka/hstr/master/Changelog"
 distfiles="https://github.com/dvorka/hstr/archive/${version}.tar.gz"
-checksum=c7e7408671757b3f4be9c5a59b4e2d56e7a7b601ace2a94eb6b2b61f20ee890b
+checksum=7f5933fc07d55d09d5f7f9a6fbfdfc556d8a7d8575c3890ac1e672adabd2bec4
 
 pre_configure() {
-	vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h
-	vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr_curses.h
-	aclocal
-	automake --force-missing --add-missing
-	autoconf
+	vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h src/include/hstr_curses.h
+	autoreconf -fi
 }

From c70838be96f64a070d3df572d3cb6b9421f1947f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sat, 12 Mar 2022 16:15:07 +0200
Subject: [PATCH 0164/1686] dbus-glib: update to 0.112.

Additionally fix xlint and tests.
---
 srcpkgs/dbus-glib/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dbus-glib/template b/srcpkgs/dbus-glib/template
index ee905b75bfe6..3da4c3010605 100644
--- a/srcpkgs/dbus-glib/template
+++ b/srcpkgs/dbus-glib/template
@@ -1,18 +1,19 @@
 # Template file for 'dbus-glib'
 pkgname=dbus-glib
-version=0.110
+version=0.112
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-bash-completion"
 hostmakedepends="pkg-config"
 makedepends="libglib-devel dbus-devel"
 depends="dbus"
+checkdepends="dbus glib-devel"
 short_desc="GLib bindings for D-Bus"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.freedesktop.org/wiki/Software/DBusBindings"
 distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
-checksum=7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825
+checksum=7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-dbus-binding-tool=dbus-binding-tool"

From 1df2896a5c15877cfc7363b95c1e5b8f95868754 Mon Sep 17 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, 13 Mar 2022 19:11:18 +0700
Subject: [PATCH 0165/1686] mutt: no needs libidn2-devel in hostmakedepends

---
 srcpkgs/mutt/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 42039d5d78f4..7ae82f76bd8c 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -8,7 +8,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --sysconfdir=/etc/$pkgname
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
-hostmakedepends="libidn2-devel perl pkg-config"
+hostmakedepends="perl pkg-config"
 makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
  ncurses-devel"
 depends="cyrus-sasl-modules mime-types"

From f7b58f45fdcb14d8532e45c7ed52c9ae3d85e4fd Mon Sep 17 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, 13 Mar 2022 19:14:36 +0700
Subject: [PATCH 0166/1686] fcitx5: update to 5.0.15.

---
 srcpkgs/fcitx5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template
index 3f55cd914dc9..ffc3011295f8 100644
--- a/srcpkgs/fcitx5/template
+++ b/srcpkgs/fcitx5/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5'
 pkgname=fcitx5
-version=5.0.14
+version=5.0.15
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,7 @@ 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="d30658323f6620c43e306af233980b2dbd765ee2240ac7db865c00052d1c313b
+checksum="343df0f278dc6db4afebc778664ee477d9bd6c011c8446e5aa89c20bb1786e41
  c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb"
 skip_extraction=en_dict-${_en_dict_ver}.tar.gz
 lib32disabled=yes

From cf8d12b30198d8da817954b4351f768907b2d05a Mon Sep 17 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, 13 Mar 2022 19:14:41 +0700
Subject: [PATCH 0167/1686] fcitx5-anthy: update to 5.0.10.

---
 srcpkgs/fcitx5-anthy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template
index 3077b0796431..f2003e8be2c6 100644
--- a/srcpkgs/fcitx5-anthy/template
+++ b/srcpkgs/fcitx5-anthy/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-anthy'
 pkgname=fcitx5-anthy
-version=5.0.9
+version=5.0.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ 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=73f96564d003ecc4160ceb311b2416547dcdf1a7cb6996d7d00cc01dae834a44
+checksum=1dab20b65c65059f707d64cbf1cd0f98a88016161240ad514b811a161bfed7fd
 
 fcitx5-anthy-icons_package() {
 	short_desc+=" - icons"

From 59fadfba8c4782affefc9e17c0533a077a684df1 Mon Sep 17 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, 13 Mar 2022 19:14:44 +0700
Subject: [PATCH 0168/1686] fcitx5-chewing: update to 5.0.10.

---
 srcpkgs/fcitx5-chewing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template
index 5bdde29ffaa0..ab4df7c374dd 100644
--- a/srcpkgs/fcitx5-chewing/template
+++ b/srcpkgs/fcitx5-chewing/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-chewing'
 pkgname=fcitx5-chewing
-version=5.0.8
+version=5.0.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext doxygen extra-cmake-modules"
@@ -10,7 +10,7 @@ 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=993acad34d3490c1903827e6ee6de4b946419b14c970e7b02154eaba28971eba
+checksum=70843186dfa571eef674dde049abf2cbf16fbc9434dfb3060986bcc92cc4dadd
 lib32disabled=yes
 
 fcitx5-chewing-icons_package() {

From f0e4da152e6c2d6136c1443efeaa0bdd5bd9459b Mon Sep 17 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, 13 Mar 2022 19:14:51 +0700
Subject: [PATCH 0169/1686] fcitx5-chinese-addons: update to 5.0.12.

---
 srcpkgs/fcitx5-chinese-addons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index 97e8ef4c575e..519e91a0dd44 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-chinese-addons'
 pkgname=fcitx5-chinese-addons
-version=5.0.11
+version=5.0.12
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
@@ -17,7 +17,7 @@ _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="1fdc6749e5b3e6bfd5b30921008fd037cbf2f0e10e66904b79ba02fce8f71b0a
+checksum="f872c755290ca8610ebfd22e1492bde065028c6e75b59555b4a82b0377b79005
  42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
  8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248"
 skip_extraction="

From 81f4aebdfb3cbb4d842b0577c6db168333c4a07e Mon Sep 17 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, 13 Mar 2022 19:14:55 +0700
Subject: [PATCH 0170/1686] fcitx5-configtool: update to 5.0.12.

---
 srcpkgs/fcitx5-configtool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template
index f4c554c85e48..136a79694953 100644
--- a/srcpkgs/fcitx5-configtool/template
+++ b/srcpkgs/fcitx5-configtool/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-configtool'
 pkgname=fcitx5-configtool
-version=5.0.11
+version=5.0.12
 revision=1
 build_style=cmake
 hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
@@ -17,7 +17,7 @@ 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=bf005d01220343d24c488f6559675da694ec64354592451c7c38ce959dce8803
+checksum=293da52dbac987a3c4880433a4a93bf8b3b45e2ac3d77cb025f76dc859302a1b
 lib32disabled=yes
 
 post_install() {

From 862c38ba3064b78adc79921f60df5d99489ed7b8 Mon Sep 17 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, 13 Mar 2022 19:15:00 +0700
Subject: [PATCH 0171/1686] fcitx5-gtk: update to 5.0.13.

---
 srcpkgs/fcitx5-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
index 430209846b81..c6d4efe52f10 100644
--- a/srcpkgs/fcitx5-gtk/template
+++ b/srcpkgs/fcitx5-gtk/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-gtk'
 pkgname=fcitx5-gtk
-version=5.0.12
+version=5.0.13
 revision=1
 build_style=cmake
 build_helper=gir
@@ -14,7 +14,7 @@ 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=5a2ca9629695fe7500e0574b6f942a0a93d386cb6a12734f506a521537d6d11d
+checksum=a38053806b23c097e8fca5a6c405326c14e5e0bc26595d144553006ed90c32d4
 lib32disabled=yes
 
 build_options="gir"

From 116f7124c13b544748bda6bed11feaf49cad2720 Mon Sep 17 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, 13 Mar 2022 19:15:04 +0700
Subject: [PATCH 0172/1686] fcitx5-hangul: update to 5.0.8.

---
 srcpkgs/fcitx5-hangul/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template
index d51f9b3a99d5..2e6dc2e0b4e8 100644
--- a/srcpkgs/fcitx5-hangul/template
+++ b/srcpkgs/fcitx5-hangul/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-hangul'
 pkgname=fcitx5-hangul
-version=5.0.7
+version=5.0.8
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config gettext extra-cmake-modules"
@@ -11,7 +11,7 @@ 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=281f44c9d024b6a9984aad0f51a3840fc3873d7e3a629aeed77025f00b08bb27
+checksum=a784d80761b16269ebe6e780aac23fb1bfb6c06e9aa03bcca442bc3a62ec6220
 lib32disabled=yes
 
 fcitx5-hangul-icons_package() {

From 282fc89943050fd86273995d9230d67ddee8cd38 Mon Sep 17 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, 13 Mar 2022 19:15:08 +0700
Subject: [PATCH 0173/1686] fcitx5-qt: update to 5.0.11.

---
 srcpkgs/fcitx5-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template
index d72af31d0adf..d36f9369b1cf 100644
--- a/srcpkgs/fcitx5-qt/template
+++ b/srcpkgs/fcitx5-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-qt'
 pkgname=fcitx5-qt
-version=5.0.10
+version=5.0.11
 revision=1
 build_style=cmake
 configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DENABLE_QT6=ON
@@ -14,7 +14,7 @@ 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=29daa4454825e316aa89b6c2610078e4cc9924e288ccd45b38e47db9df721f85
+checksum=7196798d4c6f9305c028dab30a31eb64566b9b47b1cb916518d33f3a0f053d62
 lib32disabled=yes
 
 if [ "$XBPS_TARGET_NOATOMIC8" ]; then

From eeea3a6edcc6e6087110af3949fbdefa3eb343b4 Mon Sep 17 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, 13 Mar 2022 19:15:12 +0700
Subject: [PATCH 0174/1686] fcitx5-rime: update to 5.0.12.

---
 srcpkgs/fcitx5-rime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template
index a557cec20a0f..d76a1b3f01a3 100644
--- a/srcpkgs/fcitx5-rime/template
+++ b/srcpkgs/fcitx5-rime/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-rime'
 pkgname=fcitx5-rime
-version=5.0.11
+version=5.0.12
 revision=1
 build_style=cmake
 configure_args="-DRIME_DATA_DIR=/usr/share/rime-data"
@@ -13,7 +13,7 @@ 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=f00fd7d53bf22d7f14c66946dbd84f70d22334ad72198e2213e8f13447168cb4
+checksum=8b7e4945fc43c2815af2e2229ce71e19959ce24cdeffe92b42ae18522410eb12
 lib32disabled=yes
 
 fcitx5-rime-icons_package() {

From dc3a10a15ade7f3954a46f2402ba741fe3668715 Mon Sep 17 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, 13 Mar 2022 19:15:18 +0700
Subject: [PATCH 0175/1686] fcitx5-table-extra: update to 5.0.9.

---
 srcpkgs/fcitx5-table-extra/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template
index 8d2545d40a5e..0cd1610e4ad9 100644
--- a/srcpkgs/fcitx5-table-extra/template
+++ b/srcpkgs/fcitx5-table-extra/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-table-extra'
 pkgname=fcitx5-table-extra
-version=5.0.8
+version=5.0.9
 revision=1
 build_style=cmake
 hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ 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=9ca4ab67b65efdd1b4462f20982f54c644ae822746e5c8cb02216686024c28aa
+checksum=cf791178f5871f58bf008042359ffd55e8cf11fbc4c74e77e33debe7f3ddbce4

From e1f2be35ad8777a27652f6143082c41d64fc0dd6 Mon Sep 17 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, 13 Mar 2022 19:15:22 +0700
Subject: [PATCH 0176/1686] fcitx5-lua: update to 5.0.7.

---
 srcpkgs/fcitx5-lua/template | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template
index 1952c78ae475..1c1ab31f1683 100644
--- a/srcpkgs/fcitx5-lua/template
+++ b/srcpkgs/fcitx5-lua/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-lua'
 pkgname=fcitx5-lua
-version=5.0.6
+version=5.0.7
 revision=1
 build_style=cmake
 configure_args="-DUSE_DLOPEN=No"
@@ -14,16 +14,9 @@ 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=bd55815df13cfee8b0ac90dab1dec0aca6b1b3943f80543b04a0cf2e8f03c8a9
+checksum=bff8e5143912b212726b2bab8cf62bbd11ca4f3837b65cb8ce94a7c56fc15f2d
 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"

From bfbe1ce608250d674225367b284dae2d1725387b Mon Sep 17 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, 13 Mar 2022 19:15:26 +0700
Subject: [PATCH 0177/1686] fcitx5-table-other: update to 5.0.8.

---
 srcpkgs/fcitx5-table-other/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-table-other/template b/srcpkgs/fcitx5-table-other/template
index 00ebafb93cdb..febce6577128 100644
--- a/srcpkgs/fcitx5-table-other/template
+++ b/srcpkgs/fcitx5-table-other/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-table-other'
 pkgname=fcitx5-table-other
-version=5.0.7
+version=5.0.8
 revision=1
 build_style=cmake
 hostmakedepends="gettext libime-utils extra-cmake-modules"
@@ -11,4 +11,4 @@ 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=7df2445a93f2117f315a0b26d738876d205ae83d2b3e8a898ac64c3860abac70
+checksum=f741f42c72d415dccab3d1e699fa582046e4f8a64bd8d21ce6da4dc557594fac

From 3c204e9b993e65becd2a76882f2f417607460e36 Mon Sep 17 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, 13 Mar 2022 19:15:30 +0700
Subject: [PATCH 0178/1686] fcitx5-unikey: update to 5.0.9.

---
 srcpkgs/fcitx5-unikey/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fcitx5-unikey/template b/srcpkgs/fcitx5-unikey/template
index 81c35b310d5b..f054cb3b5360 100644
--- a/srcpkgs/fcitx5-unikey/template
+++ b/srcpkgs/fcitx5-unikey/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx5-unikey'
 pkgname=fcitx5-unikey
-version=5.0.8
+version=5.0.9
 revision=1
 build_style=cmake
 #configure_args=""
@@ -16,7 +16,7 @@ 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-unikey/fcitx5-unikey-${version}.tar.xz"
-checksum=7505d9f937512272baf348ba38c72bef7f27fd2df9ae5dbc99cf738c5fcef8d0
+checksum=a72d59e21ddde6ccfa5f66accd9d763ded7c8210dbb19a99435aa35b4ac7d5ed
 conflicts="fcitx-unikey>=0"
 
 fcitx5-unikey-macro-editor_package() {

From 0916f5eacf85261d23e70949ea49713763a2536b Mon Sep 17 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, 13 Mar 2022 20:09:35 +0700
Subject: [PATCH 0179/1686] libchewing: cross-compiling

---
 srcpkgs/libchewing-data                       |  1 -
 .../libchewing/patches/cross-compile.patch    | 23 +++++++++++++++++++
 srcpkgs/libchewing/template                   | 13 +++--------
 3 files changed, 26 insertions(+), 11 deletions(-)
 delete mode 120000 srcpkgs/libchewing-data
 create mode 100644 srcpkgs/libchewing/patches/cross-compile.patch

diff --git a/srcpkgs/libchewing-data b/srcpkgs/libchewing-data
deleted file mode 120000
index 5ea20a615bbb..000000000000
--- a/srcpkgs/libchewing-data
+++ /dev/null
@@ -1 +0,0 @@
-libchewing
\ No newline at end of file
diff --git a/srcpkgs/libchewing/patches/cross-compile.patch b/srcpkgs/libchewing/patches/cross-compile.patch
new file mode 100644
index 000000000000..d127a83589f7
--- /dev/null
+++ b/srcpkgs/libchewing/patches/cross-compile.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07112b0..597a764 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -229,15 +229,16 @@ set_target_properties(${ALL_TOOLS} PROPERTIES
+ )
+ 
+ # tools command
++file(MAKE_DIRECTORY ${DATA_BIN_DIR})
+ add_custom_command(
+     OUTPUT
+         ${ALL_DATA}
+-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DATA_BIN_DIR}
+-    COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_BIN_DIR} ${TOOLS_BIN_DIR}/init_database ${DATA_SRC_DIR}/phone.cin ${DATA_SRC_DIR}/tsi.src
++    COMMAND init_database ${DATA_SRC_DIR}/phone.cin ${DATA_SRC_DIR}/tsi.src
+     DEPENDS
+         ${ALL_TOOLS}
+         ${DATA_SRC_DIR}/phone.cin
+         ${DATA_SRC_DIR}/tsi.src
++    WORKING_DIRECTORY ${DATA_BIN_DIR}
+ )
+ 
+ # test
diff --git a/srcpkgs/libchewing/template b/srcpkgs/libchewing/template
index 7e1acca89dcc..9345a70fe6ff 100644
--- a/srcpkgs/libchewing/template
+++ b/srcpkgs/libchewing/template
@@ -1,18 +1,18 @@
 # Template file for 'libchewing'
 pkgname=libchewing
 version=0.5.1
-revision=4
+revision=5
 build_style=cmake
+build_helper="qemu"
 hostmakedepends="texinfo"
 makedepends="sqlite-devel"
-depends="libchewing-data-${version}_${revision}"
 short_desc="Intelligent phonetic (Zhuyin/Bopomofo) input method"
 maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
 license="LGPL-2.1-only"
 homepage="http://chewing.im/"
 distfiles="https://github.com/chewing/libchewing/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
 checksum=9708c63415fa6034435c0f38100e7d30d0e1bac927f67bec6dfeb3fef016172b
-nocross="/builddir/libchewing-0.5.1/build/src/tools/init_database: cannot execute binary file"
+replaces="libchewing-data>=0"
 
 libchewing-devel_package() {
 	depends="libchewing>=${version}_${revision}"
@@ -25,10 +25,3 @@ libchewing-devel_package() {
 		vmove usr/share/info
 	}
 }
-
-libchewing-data_package() {
-	short_desc+=" - data files"
-	pkg_install() {
-		vmove usr/share/libchewing
-	}
-}

From 8a70cf3ada53a9e8d477bef7935d8937378d3739 Mon Sep 17 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, 13 Mar 2022 20:23:48 +0700
Subject: [PATCH 0180/1686] fcitx-chewing: need libfcitx in hostmakedepends

---
 srcpkgs/fcitx-chewing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/fcitx-chewing/template b/srcpkgs/fcitx-chewing/template
index 8f2c9c4ce432..67d01e039272 100644
--- a/srcpkgs/fcitx-chewing/template
+++ b/srcpkgs/fcitx-chewing/template
@@ -3,7 +3,7 @@ pkgname=fcitx-chewing
 version=0.2.3
 revision=2
 build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config libfcitx"
 makedepends="fcitx-devel libchewing-devel"
 depends="fcitx5-chewing-icons"
 short_desc="Fcitx wrapper for Chewing IM engine"

From 93d341685d6fe4bf36fec477fed6abb3d55e65a3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 13 Mar 2022 15:40:18 +0100
Subject: [PATCH 0181/1686] linux5.15: update to 5.15.28.

---
 srcpkgs/linux5.15/files/arm64-dotconfig | 4 ++--
 srcpkgs/linux5.15/template              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index a90de90be07d..f2091f4a8972 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.22 Kernel Configuration
+# Linux/arm64 5.15.28 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -424,6 +424,7 @@ CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
@@ -2643,7 +2644,6 @@ CONFIG_OF_KOBJ=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
 CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 CONFIG_OF_OVERLAY=y
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 387e8abc54dc..d314a6f8a251 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.26
+version=5.15.28
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 5ceba1332b26e735342a76dd85a5b1b53cc4873e202e58b99a25da0cf6e20992"
+ 1019709aa85b87904e901aca141f8ade27b3719333be8a3e9d3b2cb0e05ad345"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From b64607a3de57b5dba61d5c9caaeb716c8010a5c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 13 Mar 2022 15:42:25 +0100
Subject: [PATCH 0182/1686] linux5.10: update to 5.10.105.

---
 srcpkgs/linux5.10/files/arm64-dotconfig | 3 ++-
 srcpkgs/linux5.10/template              | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index 5294c39d31d5..f5587464698f 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.99 Kernel Configuration
+# Linux/arm64 5.10.105 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -419,6 +419,7 @@ CONFIG_CRASH_DUMP=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index d12ac8cfdb27..305d9822a51c 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.103
+version=5.10.105
 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=4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a
+checksum=3ddc0e0ab2b9cadb64df43141e0a1e5432b5963ed50f34d586c065ac8d4fcb85
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 1209bf5d9a6bbb1c002b6daaee46ef69be930cbf Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sat, 29 Jan 2022 14:37:43 +0100
Subject: [PATCH 0183/1686] praat: update to 6.2.09

---
 srcpkgs/praat/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index b64c721ab717..ac2777a445cc 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.2.04
+version=6.2.09
 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=65c8a70d02760fdf36e04d892412441d8d338867db30d593aea1c202aa937c24
+checksum=3c38b8af267b152a3fda1af78fe8cc26a1717f70a886387e657c55746f666af1
 
 # 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
@@ -34,13 +34,11 @@ do_build() {
 
 		cp makefiles/makefile.defs.linux.${_variant} ./makefile.defs
 		sed -i -e 's/$(LIBS)/& $(LDFLAGS)/' Makefile
-		sed -i -e 's/CC = gcc/CC = "${CC}"/' \
-		 -e 's/CXX = g++/CXX = "${CXX}"/' \
-		 -e 's/LINK = g++/LINK = "${CXX}"/' \
-		 -e 's/AR = ar/AR = "${AR}"/' \
+		sed -i -e 's/AR = ar/AR = "${AR}"/' \
 		 -e 's/-O\(1\|3\)//' \
 		 -e 's/CFLAGS =/CFLAGS +=/' \
 		 -e 's/CXXFLAGS =/CXXFLAGS +=/' \
+		 -e 's/-no-pie//' \
 		 makefile.defs
 
 		if [ $XBPS_TARGET_ENDIAN == "le" ]; then

From d6150319bff3b89e651b82940b5accba5d8cc6c2 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 3 Jan 2022 09:48:03 +0100
Subject: [PATCH 0184/1686] dhcpcd: update to 9.4.1.

---
 srcpkgs/dhcpcd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index e651bd019067..12be60c1efcf 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,6 +1,6 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
-version=9.4.0
+version=9.4.1
 revision=1
 build_style=configure
 make_check_target=test
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="BSD-2-Clause"
 homepage="https://roy.marples.name/projects/dhcpcd"
 distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz"
-checksum=41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513
+checksum=819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c
 lib32disabled=yes
 conf_files=/etc/dhcpcd.conf
 

From 0ab56de207750e665913bce87d93f196afa5fb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Fri, 11 Mar 2022 17:27:59 +0100
Subject: [PATCH 0185/1686] kopia: update to 0.10.6.

---
 srcpkgs/kopia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template
index e366eb0282b5..056235ef545f 100644
--- a/srcpkgs/kopia/template
+++ b/srcpkgs/kopia/template
@@ -1,6 +1,6 @@
 # Template file for 'kopia'
 pkgname=kopia
-version=0.10.5
+version=0.10.6
 revision=1
 build_style=go
 build_helper=qemu
@@ -12,7 +12,7 @@ maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
 license="Apache-2.0"
 homepage="https://kopia.io/"
 distfiles="https://github.com/kopia/kopia/archive/v${version}.tar.gz"
-checksum=3d6418e6909050204078e389fe2ecb3e6080e3185378eba243c4101cc873c770
+checksum=07df866ff4a2662f503a1348fe02bb62e6cf195260217d7e1234b03ff7b27797
 
 post_install() {
 	for shell in bash zsh; do

From 3f8ab64d9e8aeb64b5b52882a4949be69152b51e Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Sat, 12 Mar 2022 12:23:13 +0400
Subject: [PATCH 0186/1686] python3-curl: update to 7.45.0, adopt.

---
 srcpkgs/python3-curl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 9bba5853691b..ea7831c2f087 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
-version=7.44.1
+version=7.45.0
 revision=1
 wrksrc="pycurl-${version}"
 build_style=python3-module
@@ -8,12 +8,12 @@ hostmakedepends="python3-devel"
 makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
 depends="python3"
 short_desc="Python3 interface to cURL library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later, MIT"
 homepage="http://pycurl.io/"
 changelog="https://raw.githubusercontent.com/pycurl/pycurl/master/ChangeLog"
 distfiles="${PYPI_SITE}/p/pycurl/pycurl-${version}.tar.gz"
-checksum=5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8
+checksum=5036c53c6f4106e9160d053a4baa3433a0215fb3386073e211273c56a3a95f3d
 
 pre_build() {
 	vsed -i "/setup_args\['data_files'\] = /d" setup.py

From 35e45ba1712b94998e16613cfdd69131aaeebac2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 11 Mar 2022 20:56:32 -0500
Subject: [PATCH 0187/1686] procs: update to 0.12.1.

---
 srcpkgs/procs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template
index 309ff8c6f5c9..84e47b23614b 100644
--- a/srcpkgs/procs/template
+++ b/srcpkgs/procs/template
@@ -1,6 +1,6 @@
 # Template file for 'procs'
 pkgname=procs
-version=0.12.0
+version=0.12.1
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://github.com/dalance/procs"
 changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md"
 distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz"
-checksum=04dbb3ddc734a9d1305b26b546a913e3e04d556b5863212a2675d29268aebed3
+checksum=ce84e98dd85cb8d5afda871ad2ddceb4faec077d9e019469aa668a75821e4fc2
 
 post_build() {
 	PROCS="target/${RUST_TARGET}/release/procs"

From 99c8a5c4bd2aa00d86ae66e6b3bc08c47f5a74ea Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Thu, 10 Mar 2022 11:21:59 -0600
Subject: [PATCH 0188/1686] Signal-Desktop: update to 5.35

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 97cac6378e09..038af9b6e175 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.34.0
+version=5.35.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=54d81b6fa1be05d60a840b9ffcf3f8fc1642863c0a5a6ec2cfa3e02ff6e9e31d
+checksum=12d4766356d50f4eaff907a738860be91bf4c012fd2db62d00757078923dca67
 nostrip_files="signal-desktop"
 
 post_extract() {

From 98576fa34f377e4c4dd4ab10ad51600ce87c84a0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 11 Mar 2022 10:44:50 -0500
Subject: [PATCH 0189/1686] texlab: update to 3.3.2, restore cross.

---
 srcpkgs/texlab/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template
index 6e60a74ebf9f..8891cb68bf1c 100644
--- a/srcpkgs/texlab/template
+++ b/srcpkgs/texlab/template
@@ -1,6 +1,6 @@
 # Template file for 'texlab'
 pkgname=texlab
-version=3.3.1
+version=3.3.2
 revision=1
 build_style=cargo
 short_desc="Implementation of the Language Server Protocol for LaTeX"
@@ -9,8 +9,7 @@ license="GPL-3.0-or-later"
 homepage="https://texlab.netlify.app/"
 changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md"
 distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz"
-checksum="a39766f497dfb2cf9e370ddc430b7d275cb055b4d8a0751d718a86072747a75c"
-nocross=yes # https://github.com/void-linux/void-packages/issues/34889
+checksum=380395a37ee2ece590c0db04ac4898f5f430ee37d0ab0fa0801805167fff066a
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then
 	broken="smartstring fails to compile"

From c559fdef7d694d6432fd4546051ab027d1c11f99 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Fri, 11 Mar 2022 19:22:20 -0500
Subject: [PATCH 0190/1686] just: update to 1.1.0.

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 156d04e3120d..436ea6d5d455 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.0.1
+version=1.1.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/refs/tags/${version}.tar.gz"
-checksum=261532a3b72b34a79df01bb0c4a366bcc3fd870c5706340fec260faebddb42c6
+checksum=b0eaf3c7da507be9ad8e0ce050a10459eeead72b94d50bc3261e3dcda516b03a
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 23458584c645eabecd09d54d7cf1ef2021169e9f Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Thu, 10 Mar 2022 17:40:25 -0600
Subject: [PATCH 0191/1686] kubernetes-kind: update to 0.12.0.

---
 srcpkgs/kubernetes-kind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template
index 810e9935e3dd..c40e1a1f98f2 100644
--- a/srcpkgs/kubernetes-kind/template
+++ b/srcpkgs/kubernetes-kind/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes-kind'
 pkgname=kubernetes-kind
-version=0.11.1
+version=0.12.0
 revision=1
 wrksrc="kind-${version}"
 build_style=go
@@ -11,7 +11,7 @@ maintainer="Andy Cobaugh <andrew.cobaugh@gmail.com>"
 license="Apache-2.0"
 homepage="https://kind.sigs.k8s.io/"
 distfiles="https://github.com/kubernetes-sigs/kind/archive/v${version}.tar.gz"
-checksum=95ce0e7b01c00be149e5bd777936cef3f79ba7f1f3e5872e7ed60595858a2491
+checksum=cd1d09921b3c8a0f58c6423e5706be0c6e556f0c3d2b9e62f42be59263b209bb
 _completions="bash zsh fish"
 
 post_build() {

From 80c268226d25abf4ed6b5c9007c8b2eabca2e370 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 28 Feb 2022 20:32:26 -0600
Subject: [PATCH 0192/1686] gns3-server: update to 2.2.31.

---
 srcpkgs/gns3-server/patches/requirements.patch | 17 ++++++++++-------
 srcpkgs/gns3-server/template                   |  6 +++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch
index 1c61d2dd6ae1..4cfa85b16ba2 100644
--- a/srcpkgs/gns3-server/patches/requirements.patch
+++ b/srcpkgs/gns3-server/patches/requirements.patch
@@ -1,18 +1,21 @@
 diff --git a/requirements.txt b/requirements.txt
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,9 +1,8 @@
+@@ -1,12 +1,11 @@
 -jsonschema==3.2.0
 +jsonschema>=3.2.0
 -aiohttp==3.7.4.post0
 +aiohttp>=3.7.4
  aiohttp-cors==0.7.0
--aiofiles==0.7.0
-+aiofiles>=0.8.0
--Jinja2==3.0.1
-+Jinja2>=3.0.1
--sentry-sdk==1.3.1
--psutil==5.8.0
+ aiofiles==0.8.0
+-Jinja2==3.0.3
++Jinja2>=3.0.3
+-sentry-sdk==1.5.4
+-psutil==5.9.0
 +psutil>=5.9.0
  async-timeout==3.0.1
  distro==1.6.0
+ py-cpuinfo==8.0.0
+-setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
++setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
+ setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 1845cc2e3fcf..038457a27a3b 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
-version=2.2.29
-revision=2
+version=2.2.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG"
 distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz"
-checksum=34237771bb743ac9142569e67284123b6090f78cfd802a729e2f11b9d5d48929
+checksum=10a530866a156cea6b544be9b557f61ca0baa7e58c3064d79a1d523b70301edc
 
 # The source archive contains statically linked artifacts for x86_64
 # glibc, since this is the only architecture supported by upstream, we

From 193490e2963f774490df6a6c45fd35dd1b43da91 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Mon, 28 Feb 2022 20:32:36 -0600
Subject: [PATCH 0193/1686] gns3-gui: update to 2.2.31.

---
 srcpkgs/gns3-gui/patches/requirements.patch | 9 ++++++---
 srcpkgs/gns3-gui/template                   | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch
index d594ea77de5b..ab3d55dea830 100644
--- a/srcpkgs/gns3-gui/patches/requirements.patch
+++ b/srcpkgs/gns3-gui/patches/requirements.patch
@@ -1,10 +1,13 @@
 diff --git a/requirements.txt b/requirements.txt
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -1,4 +1,3 @@
+@@ -1,6 +1,5 @@
 -jsonschema==3.2.0
 +jsonschema>=3.2.0
--sentry-sdk==1.3.1
--psutil==5.8.0
+-sentry-sdk==1.5.4
+-psutil==5.9.0
 +psutil>=5.9.0
  distro==1.6.0
+-setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
++setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
+ setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index a4d9d410e3fc..175eab41080c 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
-version=2.2.29
-revision=2
+version=2.2.31
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema
@@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://gns3.com"
 changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG"
 distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz"
-checksum=5b9b6db1917af66d0e4bf32c41ff17d6a03a487a2a870d18b04e68e7b572bf28
+checksum=7b6f041f88a63dc44e33680ea489556abc7d96d1c3d4bb5d85dd15b15db6d036
 
 post_install() {
 	vinstall gns3-gui.desktop 644 usr/share/applications

From 56ed1528f535f3e10f78bf0b58e8839229950952 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sat, 12 Mar 2022 21:24:39 +0100
Subject: [PATCH 0194/1686] sqlite: update to 3.38.1.

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 8760d30aee97..0ef5405dfa66 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.0
+version=3.38.1
 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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68
+checksum=8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From 8fc968f39ed101e1ab45964c4fc1fe32c2e0379a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 26 Feb 2022 14:52:18 +0100
Subject: [PATCH 0195/1686] xterm: update to 372.

---
 srcpkgs/xterm/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template
index 0af0328c6f96..ed4be0755e8f 100644
--- a/srcpkgs/xterm/template
+++ b/srcpkgs/xterm/template
@@ -1,6 +1,6 @@
 # Template file for 'xterm'
 pkgname=xterm
-version=370
+version=372
 revision=1
 build_style=gnu-configure
 configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc
@@ -17,11 +17,10 @@ makedepends="libXaw-devel libXft-devel libutempter-devel libxkbfile-devel
 short_desc="X Terminal Emulator"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="MIT, X11"
-homepage="http://invisible-island.net/xterm/"
-changelog="http://invisible-island.net/xterm/xterm.log.html"
-# using HTTP TEMPORARILY due to cert issues
-distfiles="http://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
-checksum=963c5d840a0f0f4c077ff284586e8b1f83f3f983dca6f74f4b361975b5388c82
+homepage="https://invisible-island.net/xterm/"
+changelog="https://invisible-island.net/xterm/xterm.log.html"
+distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz"
+checksum=c6d08127cb2409c3a04bcae559b7025196ed770bb7bf26630abcb45d95f60ab1
 
 post_install() {
 	for f in {u,}xterm.desktop; do

From 0e547aa0d6aacee369f470be4394419c5b80280b Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 10 Mar 2022 12:39:11 +0100
Subject: [PATCH 0196/1686] fscrypt: update to 0.3.3.

---
 srcpkgs/fscrypt/template | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template
index 87799d6b9c14..50849c9f7070 100644
--- a/srcpkgs/fscrypt/template
+++ b/srcpkgs/fscrypt/template
@@ -1,10 +1,11 @@
 # Template file for 'fscrypt'
 pkgname=fscrypt
-version=0.2.9
+version=0.3.3
 revision=1
 build_style=go
 go_import_path=github.com/google/fscrypt
 go_package="${go_import_path}/cmd/fscrypt"
+go_ldflags="-X main.version=v${version}"
 hostmakedepends="m4"
 makedepends="pam-devel"
 short_desc="Tool for managing Linux filesystem encryption"
@@ -12,9 +13,13 @@ maintainer="Andrea Brancaleoni <abc@pomel.me>"
 license="Apache-2.0"
 homepage="https://github.com/google/fscrypt"
 distfiles="https://github.com/google/fscrypt/archive/v${version}.tar.gz"
-checksum=36f1166d9886548b0d72beeeffb9ca8fb5b28b63a42b369923bc3f0bea78bb3d
+checksum=7485232dc4c48d8db262e0280b34b3c869e7b6f41f8ee8601ebfe04297796410
 conf_files="/etc/pam.d/fscrypt"
 
+do_check() {
+	make test
+}
+
 post_install() {
 	# build and install the PAM module
 	LDFLAGS= make PREFIX=/usr DESTDIR=${DESTDIR} install-pam
@@ -22,4 +27,8 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/share/pam-configs/
 	# add PAM config file
 	vinstall ${FILESDIR}/pam_config 644 etc/pam.d fscrypt
+
+	vcompletion cmd/fscrypt/fscrypt_bash_completion bash
+
+	vdoc README.md
 }

From a7c1c226b06216533734789b549c9d1194a5b316 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 22:43:50 +0100
Subject: [PATCH 0197/1686] libgusb: update to 0.3.10.

---
 srcpkgs/libgusb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template
index 0064f3f07e51..6860869a82c9 100644
--- a/srcpkgs/libgusb/template
+++ b/srcpkgs/libgusb/template
@@ -1,6 +1,6 @@
 # Template file for 'libgusb'
 pkgname=libgusb
-version=0.3.7
+version=0.3.10
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ 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=da5f25d6873622689b3351486cbe028efc254403f646dd81225dfe8542d8c67d
+checksum=0eb0b9ab0f8bba0c59631c809c37b616ef34eb3c8e000b0b9b71cf11e4931bdc
 # requires access to USB devices, not available on CI
 make_check=ci-skip
 

From ea8e4bfe0e31195c9c28a0adaf206379e5cfcc38 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:02 +0200
Subject: [PATCH 0198/1686] skalibs: update to 2.11.2.0.

---
 srcpkgs/skalibs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template
index 8b6b7b79227c..bac3772b161c 100644
--- a/srcpkgs/skalibs/template
+++ b/srcpkgs/skalibs/template
@@ -1,6 +1,6 @@
 # Template file for 'skalibs'
 pkgname=skalibs
-version=2.11.1.0
+version=2.11.2.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --enable-static --enable-shared
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/skalibs/"
 changelog="https://skarnet.org/software/skalibs/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=400180b4d5b651e4fafaf0297b933f5f863b467d357f5b36a6545cf6eb14eab9
+checksum=649cf3236fe3103f45366b6196b1bcd0457c9c17ca86f2b80007696a2baa7b77
 
 post_install() {
 	vlicense COPYING LICENSE

From 46a780352c93d645d0364dbbdce684da81494e4f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:08 +0200
Subject: [PATCH 0199/1686] execline: update to 2.8.3.0.

---
 srcpkgs/execline/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template
index b938a86b8018..f27c5a33e5fb 100644
--- a/srcpkgs/execline/template
+++ b/srcpkgs/execline/template
@@ -1,6 +1,6 @@
 # Template file for 'execline'
 pkgname=execline
-version=2.8.2.0
+version=2.8.3.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/execline/"
 changelog="https://skarnet.org/software/execline/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=2fdf7607f306e94fe42ebe2b49872d0f654aa2297a576d5a2d8037d4d9583341
+checksum=235dbecd594c82e0523c87c2eacf04c48781b39264158f57049f1a1ff8b4ad80
 
 CFLAGS="-fPIC"
 

From 347b6229d8cbf8078e7a69c906e7338081aa6f1d Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:12 +0200
Subject: [PATCH 0200/1686] s6: update to 2.11.1.0.

---
 srcpkgs/s6/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index 863800141414..5812c18784b0 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,6 +1,6 @@
 # Template file for 's6'
 pkgname=s6
-version=2.11.0.1
+version=2.11.1.0
 revision=1
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
@@ -15,7 +15,7 @@ license="ISC"
 homepage="http://skarnet.org/software/s6/"
 changelog="https://skarnet.org/software/s6/upgrade.html"
 distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
-checksum=ad7f204587634eeb20ef8f7a7beb6dd63ba3080a46a3a650448ca7cc0826f90a
+checksum=ae64dc2ba208ff80e4ac4792ce90dd526b42bf19c966dc7d8eb9a6870e4bc23a
 
 build_options="static"
 

From aaf08da24fe0fa36f18cda760a322669efb60683 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Tue, 8 Mar 2022 22:07:18 +0200
Subject: [PATCH 0201/1686] s6-portable-utils: update to 2.2.4.0.

---
 srcpkgs/s6-portable-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template
index 4f775e6459e8..e7de2cf69b93 100644
--- a/srcpkgs/s6-portable-utils/template
+++ b/srcpkgs/s6-portable-utils/template
@@ -1,6 +1,6 @@
 # Template file for 's6-portable-utils'
 pkgname=s6-portable-utils
-version=2.2.3.4
+version=2.2.4.0
 revision=1
 build_style=configure
 configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include
@@ -14,7 +14,7 @@ license="ISC"
 homepage="https://skarnet.org/software/s6-portable-utils/"
 changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=37ba98f727a9e382bf742af32ddbd8464c226a13a0a51bef586c28d57c8ac912
+checksum=cb1eea89f0311006f0132aa45324ff96fa7756d11a5f4366c68d084839e5a56f
 
 build_options="static"
 

From b0f0f83c799557500c1404e2456e29746cd9b755 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 8 Mar 2022 19:33:53 +0100
Subject: [PATCH 0202/1686] pass-git-helper: update to 1.2.0.

---
 srcpkgs/pass-git-helper/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template
index eaf7d1f49ab0..863a14a28137 100644
--- a/srcpkgs/pass-git-helper/template
+++ b/srcpkgs/pass-git-helper/template
@@ -1,7 +1,7 @@
 # Template file for 'pass-git-helper'
 pkgname=pass-git-helper
-version=1.1.2
-revision=2
+version=1.2.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pass python3-xdg"
@@ -11,4 +11,4 @@ maintainer="teldra <teldra@rotce.de>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/languitar/pass-git-helper"
 distfiles="https://github.com/languitar/${pkgname}/archive/v${version}.tar.gz"
-checksum=4acfb486d0873014376383167792ee2b46926386718eb2331a1b4564576a2076
+checksum=d9ab12d81e283411a65285a0030cbfef2548dc580631d2337628e57f10e463aa

From f28a100d7776dae8c3ab9a03d0e63fa69ccc32c4 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Tue, 8 Mar 2022 19:29:11 +0100
Subject: [PATCH 0203/1686] py3status: update to 3.41.

---
 srcpkgs/py3status/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 092ccfbe2bd9..13a91c28109b 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.40
+version=3.41
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=84885ec8a43626dcd7576b9cad029406c98675ca00ba66ff124d7607290d2b66
+checksum=9728ff6913a13087201c73f682f67afcd8dc73a71b044d6833737ee227ad5fba
 
 post_install() {
 	vlicense LICENSE

From e884d14036a7ae925eb64a8dc7759ce54befc06e Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 10:03:27 +0100
Subject: [PATCH 0204/1686] openimagedenoise: update to 1.4.3.

---
 srcpkgs/openimagedenoise/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template
index 59bbde5bf3ab..15c98835c051 100644
--- a/srcpkgs/openimagedenoise/template
+++ b/srcpkgs/openimagedenoise/template
@@ -1,7 +1,7 @@
 # Template file for 'openimagedenoise'
 pkgname=openimagedenoise
-version=1.4.2
-revision=3
+version=1.4.3
+revision=1
 archs="x86_64*"
 wrksrc=oidn-${version}
 build_style=cmake
@@ -11,8 +11,9 @@ short_desc="Intel(R) Open Image Denoise library"
 maintainer="teldra <teldra@rotce.de>"
 license="Apache-2.0"
 homepage="https://openimagedenoise.github.io"
+changelog="https://github.com/OpenImageDenoise/oidn/blob/master/CHANGELOG.md"
 distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"
-checksum=e70d27ce24b41364782376c1b3b4f074f77310ccfe5f8ffec4a13a347e48a0ea
+checksum=3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a
 
 do_check() {
 	build/oidnTest

From f86f73a82c98cd246178b756bd6f17a2f5386362 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Sun, 6 Mar 2022 16:24:32 +0530
Subject: [PATCH 0205/1686] touchegg: update to 2.0.13

---
 srcpkgs/touchegg/patches/musl.patch       | 24 -------------------
 srcpkgs/touchegg/patches/no-systemd.patch | 28 -----------------------
 srcpkgs/touchegg/template                 |  6 +++--
 3 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 srcpkgs/touchegg/patches/musl.patch
 delete mode 100644 srcpkgs/touchegg/patches/no-systemd.patch

diff --git a/srcpkgs/touchegg/patches/musl.patch b/srcpkgs/touchegg/patches/musl.patch
deleted file mode 100644
index 8504cfa2f8c0..000000000000
--- a/srcpkgs/touchegg/patches/musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From da9a3a95cfe9965ff6e15e3a0e1a98f8840a34d7 Mon Sep 17 00:00:00 2001
-From: Alexander Gehrke <void@qwertyuiop.de>
-Date: Tue, 25 May 2021 23:47:51 +0000
-Subject: [PATCH] Fix missing header for musl
-
----
- src/utils/client-lock.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/utils/client-lock.cpp b/src/utils/client-lock.cpp
-index fb1e67b..27c6c6a 100644
---- a/src/utils/client-lock.cpp
-+++ b/src/utils/client-lock.cpp
-@@ -19,6 +19,7 @@
- 
- #include <sys/file.h>
- #include <unistd.h>
-+#include <fcntl.h>
- 
- #include <exception>
- #include <stdexcept>
--- 
-2.31.1
-
diff --git a/srcpkgs/touchegg/patches/no-systemd.patch b/srcpkgs/touchegg/patches/no-systemd.patch
deleted file mode 100644
index efd2ca83347d..000000000000
--- a/srcpkgs/touchegg/patches/no-systemd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 938167799926ad70849d8088bdef023b5e8a0700 Mon Sep 17 00:00:00 2001
-From: Alexander Gehrke <void@qwertyuiop.de>
-Date: Tue, 25 May 2021 20:11:29 +0000
-Subject: [PATCH] Fix CMake failing because of missing Systemd service dir
-
----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dee220d..13b773f 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,11 +76,6 @@ include(GNUInstallDirs)
- set(SYSTEM_CONFIG_FILE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/touchegg/touchegg.conf")
- target_compile_definitions(touchegg PUBLIC SYSTEM_CONFIG_FILE_PATH=\"${SYSTEM_CONFIG_FILE_PATH}\")
- 
--# configure systemd service unit to use the right path, e.g. @CMAKE_INSTALL_BINDIR@/touchegg
--configure_file(${PROJECT_SOURCE_DIR}/installation/touchegg.service.in ${PROJECT_SOURCE_DIR}/installation/touchegg.service @ONLY)
--pkg_get_variable(SYSTEMD_SERVICE_DIR systemd systemdsystemunitdir)
--
- install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.conf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/touchegg) # /usr/share/touchegg/touchegg.conf
--install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.service DESTINATION ${SYSTEMD_SERVICE_DIR})
- install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.desktop DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart)
- install(PROGRAMS ${PROJECT_BINARY_DIR}/touchegg DESTINATION ${CMAKE_INSTALL_BINDIR}) # /usr/bin/touchegg
--- 
-2.31.1
-
diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template
index 538277a2c683..a8526763517f 100644
--- a/srcpkgs/touchegg/template
+++ b/srcpkgs/touchegg/template
@@ -1,8 +1,9 @@
 # Template file for 'touchegg'
 pkgname=touchegg
-version=2.0.9
+version=2.0.13
 revision=1
 build_style=cmake
+configure_args="-DUSE_SYSTEMD=false"
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel
  libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel"
@@ -10,8 +11,9 @@ short_desc="Multitouch gesture recognizer"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/JoseExposito/touchegg"
+changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md"
 distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz"
-checksum=efff0f2011078cea15f2f130d1501714f8e3f82b7e883e81eccf956ac7966d0e
+checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d
 system_accounts="_touchegg"
 
 post_install() {

From 920e8dc24087d595896def72a92d254a776c198f Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Mar 2022 12:39:20 +0200
Subject: [PATCH 0206/1686] LGOGDownloader: update to 3.9.

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 208d25192c4e..6e7e5c685f83 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,6 +1,6 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
-version=3.8
+version=3.9
 revision=1
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="RunningDroid <runningdroid@zoho.com>"
 license="WTFPL"
 homepage="https://github.com/Sude-/lgogdownloader"
 distfiles="https://github.com/Sude-/lgogdownloader/archive/v${version}.tar.gz"
-checksum=8e4cf5268cee76bb2addf5e7720b230b43b21d6e995d24407da9ca0fcd02df35
+checksum=4ab9fe89b47bde7744d5100663c7822de74bb161e2790baddede8146056430b1
 
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then

From 2ab3f9e79e2a7d8e6627a39cb10a184221daa205 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 5 Mar 2022 12:32:25 +0200
Subject: [PATCH 0207/1686] rage-player: update to 0.4.0.

---
 srcpkgs/rage-player/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rage-player/template b/srcpkgs/rage-player/template
index c81765b0b5e5..656227dbf3ed 100644
--- a/srcpkgs/rage-player/template
+++ b/srcpkgs/rage-player/template
@@ -1,7 +1,7 @@
 # Template file for 'rage-player'
 pkgname=rage-player
-version=0.3.1
-revision=2
+version=0.4.0
+revision=1
 wrksrc="rage-${version}"
 build_style=meson
 hostmakedepends="pkg-config efl-devel"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://www.enlightenment.org/about-rage"
 distfiles="https://download.enlightenment.org/rel/apps/rage/rage-${version}.tar.xz"
-checksum=e5c434ef415ec1dd268399c527f582baeef39a25dee52f828876bfb58698cd11
+checksum=7ce58419aa5197aa6c33f2e3f9eb9d78ff379cae863d5fa114fd1428d5a1ca0f
 
 post_install() {
 	vlicense COPYING

From ed07c5ba07a2c6698176dbb9404ce84cb3bc481b Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Thu, 10 Mar 2022 23:34:45 -0800
Subject: [PATCH 0208/1686] gammastep: update to 2.0.8

---
 srcpkgs/gammastep/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gammastep/template b/srcpkgs/gammastep/template
index 1a12e16e3a97..1f24e8383904 100644
--- a/srcpkgs/gammastep/template
+++ b/srcpkgs/gammastep/template
@@ -1,11 +1,11 @@
 # Template file for 'gammastep'
 pkgname=gammastep
-version=2.0.7
-revision=2
+version=2.0.8
+revision=1
 wrksrc="${pkgname}-v$version"
 build_style=gnu-configure
 configure_args="--enable-gui --enable-drm --enable-vidmode --enable-randr
- --enable-wayland --enable-apparmor --with-systemdunitdir=no
+ --enable-wayland --enable-apparmor --with-systemduserunitdir=no
  $(vopt_enable geoclue2)"
 hostmakedepends=" tar automake libtool gettext-devel intltool pkg-config
  python3-devel wayland-devel"
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.com/chinstrap/gammastep"
 changelog="https://gitlab.com/chinstrap/gammastep/raw/master/NEWS.md"
 distfiles="${homepage}/-/archive/v$version/${pkgname}-v$version.tar.gz"
-checksum=b3dc1d515088ef5578da009c4b70b22f9702397a6a21bbba79f1c01793a90e73
+checksum=46535cbeba2ec0e6e18a33f7c1bdec3f520230441e7cdff318d3cf612160bd76
 build_options="geoclue2"
 build_options_default="geoclue2"
 

From b51348097128686f9268d6a4e157fd79b2777d96 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 14 Mar 2022 02:36:47 +0100
Subject: [PATCH 0209/1686] abcm2ps: update to 8.14.13.

---
 srcpkgs/abcm2ps/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template
index 31a97e4daec5..1199fa010fd2 100644
--- a/srcpkgs/abcm2ps/template
+++ b/srcpkgs/abcm2ps/template
@@ -1,6 +1,6 @@
 # Template file for 'abcm2ps'
 pkgname=abcm2ps
-version=8.14.12
+version=8.14.13
 revision=1
 build_style=configure
 hostmakedepends="pkg-config python3-docutils which"
@@ -10,7 +10,7 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-3.0-or-later"
 homepage="http://moinejf.free.fr/"
 distfiles="https://github.com/leesavide/abcm2ps/archive/v${version}.tar.gz"
-checksum=f98701bc25f52e98a9283d0cef04591351b62ff8dc80fa54bb21467d60886feb
+checksum=8db29e33f30fce609ddffeb641c3bfe60ae5d16c3305402157ddc88bcaaf0c5b
 
 pre_configure() {
 	echo CC=${CC} >> custom

From 8bdd3cf2f7489363f12b0e51415829488bc9dcb6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 23 Feb 2022 23:55:47 -0500
Subject: [PATCH 0210/1686] common/build-helper/rust.sh: fix cross for bindgen

When using a build.rs script to dynamically generate bindgen bindings
at build-time, it will run on the host, and by default bindgen will
generate bindings for the host arch/libc instead of the target.
To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS
to specify the proper sysroot and include path for the target.
These arguments are not used for anything other than bindgen's clang
invocation.
---
 common/build-helper/rust.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 431cb5f0fd43..798083709c3e 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then
 	# innocuous flags are used here just to disable its defaults
 	export HOST_CC="gcc"
 	export HOST_CFLAGS="-O2"
+
+	# Crates that use bindgen via build.rs are not cross-aware unless these are set
+	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include"
 else
 	unset CARGO_BUILD_TARGET
 fi

From aa7ba36500127d7ad481df03cc466ef1fb74576f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 24 Feb 2022 00:07:36 -0500
Subject: [PATCH 0211/1686] New package: helvum-0.3.4

---
 srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++
 srcpkgs/helvum/template                    | 46 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch
 create mode 100644 srcpkgs/helvum/template

diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
new file mode 100644
index 000000000000..17f0f17f8875
--- /dev/null
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -0,0 +1,24 @@
+From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
+From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
+Date: Thu, 11 Nov 2021 11:41:09 +0000
+Subject: A possible fix for issue #27
+
+---
+ pipewire/src/loop_.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/helvum-0.3.4/pipewire/src/loop_.rs b/helvum-0.3.4/pipewire/src/loop_.rs
+index 3e0d9bd..353025f 100644
+--- a/helvum-0.3.4/pipewire/src/loop_.rs
++++ b/helvum-0.3.4/pipewire/src/loop_.rs
+@@ -411,7 +411,7 @@ where
+         fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
+             spa_sys::timespec {
+                 tv_sec: duration.as_secs().try_into().expect("Duration too long"),
+-                tv_nsec: duration.subsec_nanos().into(),
++                tv_nsec: duration.subsec_nanos().try_into().unwrap(),
+             }
+         }
+ 
+-- 
+
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
new file mode 100644
index 000000000000..49ad2dd6013a
--- /dev/null
+++ b/srcpkgs/helvum/template
@@ -0,0 +1,46 @@
+# Template file for 'helvum'
+pkgname=helvum
+version=0.3.4
+revision=1
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
+_pipewire_rs_version=0.4.1
+build_style=cargo
+build_helper=rust
+hostmakedepends="pkg-config clang libclang"
+makedepends="gtk4-devel pipewire-devel glib-devel"
+depends="pipewire"
+short_desc="GTK patchbay for pipewire"
+maintainer="classabbyamp <dev@kb6.ee>"
+license="GPL-3.0-only"
+homepage="https://gitlab.freedesktop.org/pipewire/helvum"
+distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz
+ https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/archive/v${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
+ 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
+
+# XXX: this should not be necessary once the next version of the pipewire crate has been released
+post_extract() {
+	pushd $build_wrksrc
+	echo "[patch.crates-io]" >> Cargo.toml
+	for crate in pipewire pipewire-sys libspa libspa-sys; do
+		mv ../pipewire-rs-*/$crate $crate
+		echo "$crate = { path = './$crate' }" >> Cargo.toml
+	done
+	popd
+}
+
+post_install() {
+	# Normally, meson would do this, but it's simpler to use the cargo build style and do this manually
+	# This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks
+	# On update, all meson.build files should be checked for changes
+	_app_id='org.pipewire.Helvum'
+	vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/
+	vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/
+
+	vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/"
+	vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop
+
+	vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/"
+	vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml
+}

From 0aa55b61ee21b9dfebbee43e84db4cbedb5da804 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 14 Mar 2022 09:41:16 +0100
Subject: [PATCH 0212/1686] vale: update to 2.15.2

---
 srcpkgs/vale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template
index 8675c1d9b8d9..d08391061a35 100644
--- a/srcpkgs/vale/template
+++ b/srcpkgs/vale/template
@@ -1,6 +1,6 @@
 # Template file for 'vale'
 pkgname=vale
-version=2.13.0
+version=2.15.2
 revision=1
 build_style=go
 go_import_path="github.com/errata-ai/vale/v2"
@@ -11,7 +11,7 @@ maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://docs.errata.ai/vale/about/"
 distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz"
-checksum=4e039ac35c874e62f3380a619041c721ed7eedc1fb70b52cc3f78e632f2eddc4
+checksum=15c79d613c181edc99a0a35bde1658b33fbd5aa49f1ac7f1029eba779bf8d4bc
 
 post_install() {
 	vlicense LICENSE

From 2c5785c6126fa59c049e57d10952032dcca1fcaf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 14 Mar 2022 12:52:21 +0100
Subject: [PATCH 0213/1686] weechat: update to 3.4.1.

---
 srcpkgs/weechat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index a496a6412e85..c5898cbf3091 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,7 +1,7 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=3.4
-revision=2
+version=3.4.1
+revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
  -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=7cd3dcc7029e888de49e13ebbcc3749586ff59c9d97f89f5eeb611067c7bb94c
+checksum=7e088109ad5dfbcb08a9a6b1dd70ea8236093fed8a13ee9d9c98881d7b1aeae7
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"

From fab87feb50eed34505e3f80ce332f1bed6113fd7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 14 Mar 2022 12:55:55 +0100
Subject: [PATCH 0214/1686] ugrep: update to 3.7.5.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 1653c0b8d518..16301971cb5f 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.4
+version=3.7.5
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=47505886facf738aa33019ccf22a66e98a46e81171bcb6aabf1815f97925b54f
+checksum=2b237330ef92017d69ed6611b9dfb91b447d4679b9fb3704514bfd5b89a1a44d
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 29aaea52b3ff0cd052f1ff3f9d6a661c55897483 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 14 Mar 2022 12:55:58 +0100
Subject: [PATCH 0215/1686] nncp: update to 8.7.2.

---
 srcpkgs/nncp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template
index e6d62ac2f55f..9dd39f4ee3af 100644
--- a/srcpkgs/nncp/template
+++ b/srcpkgs/nncp/template
@@ -1,6 +1,6 @@
 # Template file for 'nncp'
 pkgname=nncp
-version=8.7.1
+version=8.7.2
 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=ceb4d197af5a8d9e93b749d5c0f50b53e6746a318af47b364bf5cb323d6c4ebd
+checksum=a0eec9b0f33059de33f13084599805d0f4a1c8c379e925bacfe8dc94d1ddc23d
 
 do_build() {
 	make

From c042eee926da06698776267bf8a13bd1fe9d7fbc Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 14 Mar 2022 15:32:20 +0100
Subject: [PATCH 0216/1686] zchunk: update to 1.2.1.

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 07c43561ec28..e8679bcbabc4 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,6 +1,6 @@
 # Template file for 'zchunk'
 pkgname=zchunk
-version=1.2.0
+version=1.2.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -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=8c9eca82845b656ccae5c0e9dc097cd7a6830981e2529677ce9a5617a1f50321
+checksum=9639942cf36f4f36d3b635d36d5164682249cc0240015569ac948db1584499b5
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"

From 351351e37f8181c6195cdc6eaaafce359567916a Mon Sep 17 00:00:00 2001
From: Christopher Brannon <chris@the-brannons.com>
Date: Mon, 14 Mar 2022 09:41:00 -0700
Subject: [PATCH 0217/1686] tinyssh: update to 20220305.

This release contains a fix for
https://github.com/janmojzis/tinyssh/issues/63
---
 srcpkgs/tinyssh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template
index a2e1012a9c0e..05245c35db62 100644
--- a/srcpkgs/tinyssh/template
+++ b/srcpkgs/tinyssh/template
@@ -1,6 +1,6 @@
 # Template file for 'tinyssh'
 pkgname=tinyssh
-version=20220101
+version=20220305
 revision=1
 build_style=gnu-makefile
 make_dirs="/etc/tinyssh 0755 root root"
@@ -10,7 +10,7 @@ maintainer="Christopher Brannon <chris@the-brannons.com>"
 license="Public Domain"
 homepage="https://tinyssh.org"
 distfiles="https://github.com/janmojzis/tinyssh/archive/${version}.tar.gz"
-checksum=b68e5b8d1f72304d70b25b53dd221cdc0a25730695bf4e8e08e27ece9dcb499d
+checksum=26e1f14ee865fc48c173f51efa03aeeb72c44f102a0084ff267693406bd7aebe
 
 if [ -n "${CROSS_BUILD}" ] ; then
 	make_build_target=cross-compile

From 8675a9577c7405980611524b13f80387adde8499 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Mon, 14 Mar 2022 09:20:08 +0100
Subject: [PATCH 0218/1686] nbd: update to 3.24

---
 srcpkgs/nbd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nbd/template b/srcpkgs/nbd/template
index 79c9bdf8c315..a36cb448e89c 100644
--- a/srcpkgs/nbd/template
+++ b/srcpkgs/nbd/template
@@ -1,6 +1,6 @@
 # Template file for 'nbd'
 pkgname=nbd
-version=3.23
+version=3.24
 revision=1
 build_style=gnu-configure
 configure_args="--enable-syslog"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://nbd.sourceforge.io/"
 distfiles="${SOURCEFORGE_SITE}/nbd/nbd-${version}.tar.gz"
-checksum=3c969cd9cf83dae9276f999b7ff8e31e32411c8cc751221e698861bc05b8f76c
+checksum=a771022599525fd4f5c17c7b1c88696a91927c227e770425a55f67a7384441b6
 
 system_accounts="nbd"
 nbd_homedir="/var/chroot"

From 9633fa8ee393388dae97889c701639946c2c89b7 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Mon, 21 Feb 2022 18:48:26 +0300
Subject: [PATCH 0219/1686] nodejs-lts: update to 12.22.10.

---
 srcpkgs/nodejs-lts/template | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index 5155f8ef1489..7ef99575a323 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -46,11 +46,6 @@ esac
 CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
-post_patch() {
-	# XXX Drop after c-ares 1.17.3 has been released.
-	vsed -i -e 's:<ares_nameser.h>:<arpa/nameser.h>:g' src/cares_wrap.cc
-}
-
 do_configure() {
 	local _args
 

From 05873892855c2dafb54eae1ae99d85f26cba1b60 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Fri, 11 Mar 2022 00:36:25 +1100
Subject: [PATCH 0220/1686] Ice: orphan package(s)

---
 srcpkgs/Ice/template        | 2 +-
 srcpkgs/zeroc-mcpp/template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index f85b38df28d6..31b15fbb4d92 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -10,7 +10,7 @@ make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix="
 makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel
  openssl-devel lmdb-devel editline-devel"
 short_desc="Internet Communications Engine (Ice)"
-maintainer="a dinosaur <nick@a-dinosaur.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, custom:ICE"
 homepage="https://www.zeroc.com"
 distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz"
diff --git a/srcpkgs/zeroc-mcpp/template b/srcpkgs/zeroc-mcpp/template
index db9b9cc8e12b..048d464ab2ce 100644
--- a/srcpkgs/zeroc-mcpp/template
+++ b/srcpkgs/zeroc-mcpp/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
 make_build_args="LIBDIR=lib"
 make_install_args="LIBDIR=lib"
 short_desc="Simplified fork of mcpp from ZeroC, for building ICE"
-maintainer="a dinosaur <nick@a-dinosaur.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/zeroc-ice/mcpp"
 distfiles="https://github.com/zeroc-ice/mcpp/archive/v${version}.tar.gz"

From 833359d12d651b1fe75d9d225173fd1ce489e725 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 14:13:24 +0100
Subject: [PATCH 0221/1686] nlopt: update to 2.7.1.

---
 srcpkgs/nlopt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/nlopt/template b/srcpkgs/nlopt/template
index d43d4a4f287c..38c5ab972a87 100644
--- a/srcpkgs/nlopt/template
+++ b/srcpkgs/nlopt/template
@@ -1,14 +1,14 @@
 # Template file for 'nlopt'
 pkgname=nlopt
-version=2.6.2
+version=2.7.1
 revision=1
 build_style=cmake
 short_desc="FOSS library for nonlinear optimization"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://ab-initio.mit.edu/wiki/index.php/NLopt"
+homepage="https://nlopt.readthedocs.io"
 distfiles="https://github.com/stevengj/nlopt/archive/v${version}.tar.gz"
-checksum=cfa5981736dd60d0109c534984c4e13c615314d3584cf1c392a155bfe1a3b17e
+checksum=db88232fa5cef0ff6e39943fc63ab6074208831dc0031cf1545f6ecd31ae2a1a
 
 post_install() {
 	vlicense COPYING

From 39a0708b600f5890758ed5d410d56365445c0863 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Mon, 14 Mar 2022 21:37:11 +0100
Subject: [PATCH 0222/1686] slack-desktop: update to 4.24.0

Closes: #36141 [via git-merge-pr]
---
 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 8750d2687f69..b90525004d6c 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.23.0
+version=4.24.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://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=3a823be14d9aaea2ef565ac6c3fc62580a10775bcc1eadcc62c3256999ea59f3
+checksum=b557d264ae68cafe383d647dfd26f366ee94315f77132f64bff8f9ef44635197
 restricted=yes
 repository="nonfree"
 nopie=yes

From 69ff4ef67357114399aaff26d942593336ac8eda Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 15 Mar 2022 14:14:22 +0100
Subject: [PATCH 0223/1686] python3-boto3: update to 1.21.19.

---
 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 dce13428ee55..b96fa86eb165 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.21.8
+version=1.21.19
 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=00a0df9ee9ff1cca084d99004f67cdfb3ec63102b1e554077791698c4f10b4e0
+checksum=fb04acb6eb998652eb52381a580d3624490982a7b17d6080b0d78163874962b7
 
 post_install() {
 	vlicense LICENSE

From f54cf9b026ae9d5e7deeac1ddc6e828ab81abcc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Mon, 14 Mar 2022 23:06:17 +0100
Subject: [PATCH 0224/1686] mpd: update to 0.23.6.

---
 srcpkgs/mpd/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index eeb298abfa1e..b34c78c11815 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.23.5
-revision=2
+version=0.23.6
+revision=1
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
@@ -39,7 +39,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS"
 distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299
+checksum=cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed
 LDFLAGS="-Wl,-z,stack-size=1048576"
 
 system_accounts="mpd"

From d74d93282242287ecf66b045b10c236353046c96 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Mon, 25 Oct 2021 19:42:25 +0200
Subject: [PATCH 0225/1686] New package: qrcp-0.9.1

---
 srcpkgs/qrcp/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/qrcp/template

diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template
new file mode 100644
index 000000000000..0e690a7073be
--- /dev/null
+++ b/srcpkgs/qrcp/template
@@ -0,0 +1,18 @@
+# Template file for 'qrcp'
+pkgname=qrcp
+version=0.9.1
+revision=1
+build_style=go
+go_import_path=github.com/claudiodangelis/qrcp
+go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version}
+ -X github.com/claudiodangelis/qrcp/version.date=$(date -d@$SOURCE_DATE_EPOCH +%Y-%m-%dT%H:%M:%SZ)"
+short_desc="Transfer files over wifi to mobile devices by scanning a QR code"
+maintainer="meator <meator.dev@gmail.com>"
+license="MIT"
+homepage="https://claudiodangelis.com/qrcp/"
+distfiles="https://github.com/claudiodangelis/qrcp/archive/refs/tags/${version}.tar.gz"
+checksum=1ee0d1b04222fb2a559d412b144a49051c3315cbc99c7ea1f281bdd4f13f07bf
+
+post_install() {
+	vlicense LICENSE
+}

From df059a88661509027c167cf800bab24d08bd49be Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Mon, 14 Mar 2022 02:31:24 +0100
Subject: [PATCH 0226/1686] flickcurl: remove package

unused since 2019
---
 common/shlibs                     |  1 -
 srcpkgs/flickcurl-devel           |  1 -
 srcpkgs/flickcurl-doc             |  1 -
 srcpkgs/flickcurl/template        | 33 -------------------------------
 srcpkgs/removed-packages/template |  5 ++++-
 5 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 120000 srcpkgs/flickcurl-devel
 delete mode 120000 srcpkgs/flickcurl-doc
 delete mode 100644 srcpkgs/flickcurl/template

diff --git a/common/shlibs b/common/shlibs
index f26b9bab58fd..230fc6a994c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2580,7 +2580,6 @@ libglob.so.0 libglob-1.0_1
 libepub.so.0 ebook-tools-0.2.2_1
 libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1
 libtspi.so.1 trousers-0.3.14_11
-libflickcurl.so.0 flickcurl-1.26_1
 libpsiconv.so.6 psiconv-0.9.9_1
 libshout.so.3 libshout-2.4.1_1
 libfirm.so.1.22 libfirm-1.22.0_1
diff --git a/srcpkgs/flickcurl-devel b/srcpkgs/flickcurl-devel
deleted file mode 120000
index 0c0d78612042..000000000000
--- a/srcpkgs/flickcurl-devel
+++ /dev/null
@@ -1 +0,0 @@
-flickcurl
\ No newline at end of file
diff --git a/srcpkgs/flickcurl-doc b/srcpkgs/flickcurl-doc
deleted file mode 120000
index 0c0d78612042..000000000000
--- a/srcpkgs/flickcurl-doc
+++ /dev/null
@@ -1 +0,0 @@
-flickcurl
\ No newline at end of file
diff --git a/srcpkgs/flickcurl/template b/srcpkgs/flickcurl/template
deleted file mode 100644
index 7756752110e9..000000000000
--- a/srcpkgs/flickcurl/template
+++ /dev/null
@@ -1,33 +0,0 @@
-# Template file for 'flickcurl'
-pkgname=flickcurl
-version=1.26
-revision=4
-build_style=gnu-configure
-makedepends="libcurl-devel libxml2-devel raptor-devel"
-short_desc="C library for the Flickr API"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
-license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0"
-homepage="http://librdf.org/flickcurl/"
-distfiles="http://download.dajobe.org/flickcurl/flickcurl-${version}.tar.gz"
-checksum=ff42a36c7c1c7d368246f6bc9b7d792ed298348e5f0f5d432e49f6803562f5a3
-
-flickcurl-doc_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - Documentation (HTML Version)"
-	pkg_install() {
-		vmove usr/share/gtk-doc
-	}
-}
-
-flickcurl-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/bin/flickcurl-config
-		vmove usr/share/man/man1/flickcurl-config.1
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
-	}
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a7a19630a01a..6a744198712d 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=64
+revision=65
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -69,6 +69,9 @@ replaces="
  electron9<=9.4.1_1
  enventor<=1.0.0_2
  epstopdf<=2.27_3
+ flickcurl-devel<=1.26_4
+ flickcurl-doc<=1.26_4
+ flickcurl<=1.26_4
  fontmatrix<=0.6.0.20171228_2
  freshplayerplugin<=0.3.9_9
  fuse-usmb<=20130204_7

From 6e3a74a440b081317ec064f0baafdc89d660edb3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Mar 2022 20:51:03 -0400
Subject: [PATCH 0227/1686] common/build-helper/rust.sh: link to libsodium
 dynamically

without this envvar, libsodium-sys will attempt to link to libsodium
staticly, and may fail.
---
 common/build-helper/rust.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh
index 798083709c3e..272d03f52607 100644
--- a/common/build-helper/rust.sh
+++ b/common/build-helper/rust.sh
@@ -44,6 +44,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
 # sodium-sys
 export SODIUM_LIB_DIR="${XBPS_CROSS_BASE}/usr/include"
 export SODIUM_INC_DIR="${XBPS_CROSS_BASE}/usr/lib"
+export SODIUM_SHARED=1
 
 # openssl-sys
 export OPENSSL_NO_VENDOR=1

From 4de1d826cb39c8f4605f1fde2f50198402411136 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Mar 2022 20:53:07 -0400
Subject: [PATCH 0228/1686] rdedup: update to 3.2.1.

removes the need for patched/backported bindgen
---
 srcpkgs/rdedup/patches/bindgen-cross.patch | 12 ------------
 srcpkgs/rdedup/template                    | 21 +++++----------------
 2 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/rdedup/patches/bindgen-cross.patch

diff --git a/srcpkgs/rdedup/patches/bindgen-cross.patch b/srcpkgs/rdedup/patches/bindgen-cross.patch
deleted file mode 100644
index 7eab10fd3d56..000000000000
--- a/srcpkgs/rdedup/patches/bindgen-cross.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds
-https://github.com/jnbr/rust-bindgen/tree/0.37.4-clang_args
-
---- a/Cargo.toml	2019-06-15 13:18:05.509893680 +0200
-+++ b/Cargo.toml	2019-06-15 13:19:48.854887006 +0200
-@@ -53,3 +53,6 @@
- slog-term = "2"
- slog-async = "2"
- url = "1"
-+
-+[patch.crates-io]
-+bindgen = {git = 'https://github.com/jnbr/rust-bindgen', rev = '4afb05213b3e7e0ec928b84ea85d9f2b99477586'}
diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index c392e3c0e2fc..6bd71cacfc46 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,25 +1,14 @@
 # Template file for 'rdedup'
 pkgname=rdedup
-version=3.1.1
-revision=6
-wrksrc=rdedup-rdedup-v${version}
+version=3.2.1
+revision=1
 build_style=cargo
+build_helper=rust
 hostmakedepends="pkg-config clang"
 makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://github.com/dpc/rdedup"
-distfiles="https://github.com/dpc/rdedup/archive/rdedup-v${version}.tar.gz"
-checksum=5e7c09c40897cd2f2635e8c213c2ff0f5c4d7ceccbd22980cd4cb0a16f3dfc28
-
-if [ "$CROSS_BUILD" ]; then
-	export HOST_CC="$BUILD_CC"
-	export HOST_CFLAGS="$BUILD_CFLAGS"
-	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE}"
-fi
-
-pre_build() {
-	cargo update --package openssl-sys --precise 0.9.58
-	cargo update --package openssl --precise 0.10.22
-}
+distfiles="https://github.com/dpc/rdedup/archive/v${version}.tar.gz"
+checksum=023b5576f30ebf75c1740dd244ac13b6ef3ad7f6d4a6ab6654e12130201eb923

From ac2a2fbac4cfc803c762b33c2ad211d496e0ff31 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sun, 13 Mar 2022 20:54:55 -0400
Subject: [PATCH 0229/1686] pijul: remove unnecessary bindgen workarounds

---
 srcpkgs/pijul/patches/bindgen.patch | 3 +--
 srcpkgs/pijul/template              | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
index 2457f1434d94..04ccc8381aae 100644
--- a/srcpkgs/pijul/patches/bindgen.patch
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -1,10 +1,9 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -133,3 +133,7 @@
+@@ -133,3 +133,6 @@
  version = "2.0"
  [target."cfg(unix)".dependencies.tokio-uds]
  version = "0.2"
 +
 +[patch.crates-io]
-+"bindgen" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"}
 +"sequoia-rfc2822" = {path = '/builddir/sequoia-v0.9.0/rfc2822'}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 40df186b9387..581d77789c9c 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,8 +1,9 @@
 # Template file for 'pijul'
 pkgname=pijul
 version=0.12.2
-revision=4
+revision=5
 build_style=cargo
+build_helper=rust
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
 makedepends="libsodium-devel openssl-devel nettle-devel"
@@ -15,12 +16,6 @@ distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${ver
 checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889
  71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b"
 
-if [ "$CROSS_BUILD" ]; then
-	export HOST_CC="$BUILD_CC"
-	export HOST_CFLAGS="$BUILD_CFLAGS"
-	export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE"
-fi
-
 # We only want to install the binary, so don't run cargo install
 do_install() {
 	vbin target/${RUST_TARGET}/release/pijul

From b05d4de88c7029b63f2db950e6062d5ca595768b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 15 Mar 2022 16:19:41 +0100
Subject: [PATCH 0230/1686] less: use last stable release for update-check.

---
 srcpkgs/less/update | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/less/update b/srcpkgs/less/update
index 8ccb86344234..50cae37e4fa6 100644
--- a/srcpkgs/less/update
+++ b/srcpkgs/less/update
@@ -1 +1,2 @@
-site="${homepage}/download.html"
+site='https://greenwoodsoftware.com/less/release.txt'
+pattern='\d+'

From 45a3f301b15cfd156c75db4dd13e9aaed7d72922 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Thu, 3 Mar 2022 02:20:38 -0500
Subject: [PATCH 0231/1686] void-artwork: update to 20220303.

Adds an svg version of the logo, a script to generate icons from it,
and generated icon files for the logo (with and without the VOID text)
at various sizes, which are installed to the hicolor (fallback) icon
theme.

The logo files are pre-generated to avoid makedep on librsvg-utils,
and they are small enough and change so rarely that it is not a big
deal to include them in git.

The source svg is slightly different than the one on alpha.de; it has
a small white border added to help with legibility on dark backgrounds.

This is a follow-up to #35604
---
 srcpkgs/void-artwork/files/generate-icons.sh  |  29 ++++++++
 .../files/icons/void-logo-128.png             | Bin 0 -> 8406 bytes
 .../void-artwork/files/icons/void-logo-16.png | Bin 0 -> 655 bytes
 .../void-artwork/files/icons/void-logo-22.png | Bin 0 -> 932 bytes
 .../files/icons/void-logo-256.png             | Bin 0 -> 18160 bytes
 .../void-artwork/files/icons/void-logo-32.png | Bin 0 -> 1287 bytes
 .../void-artwork/files/icons/void-logo-48.png | Bin 0 -> 1864 bytes
 .../files/icons/void-logo-512.png             | Bin 0 -> 39176 bytes
 .../void-artwork/files/icons/void-logo-64.png | Bin 0 -> 4013 bytes
 .../files/icons/void-logo-notext-128.png      | Bin 0 -> 5156 bytes
 .../files/icons/void-logo-notext-16.png       | Bin 0 -> 655 bytes
 .../files/icons/void-logo-notext-22.png       | Bin 0 -> 932 bytes
 .../files/icons/void-logo-notext-256.png      | Bin 0 -> 10660 bytes
 .../files/icons/void-logo-notext-32.png       | Bin 0 -> 1287 bytes
 .../files/icons/void-logo-notext-48.png       | Bin 0 -> 1864 bytes
 .../files/icons/void-logo-notext-512.png      | Bin 0 -> 22310 bytes
 .../files/icons/void-logo-notext-64.png       | Bin 0 -> 2534 bytes
 .../files/icons/void-logo-notext.svg          |   8 +++
 .../void-artwork/files/icons/void-logo.svg    |  19 ++++++
 srcpkgs/void-artwork/files/void-logo.svg      |  64 ++++++++++++++++++
 srcpkgs/void-artwork/template                 |  13 +++-
 21 files changed, 130 insertions(+), 3 deletions(-)
 create mode 100755 srcpkgs/void-artwork/files/generate-icons.sh
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-128.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-16.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-22.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-256.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-32.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-48.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-512.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-64.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-128.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-16.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-22.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-256.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-32.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-48.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-512.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-64.png
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext.svg
 create mode 100644 srcpkgs/void-artwork/files/icons/void-logo.svg
 create mode 100644 srcpkgs/void-artwork/files/void-logo.svg

diff --git a/srcpkgs/void-artwork/files/generate-icons.sh b/srcpkgs/void-artwork/files/generate-icons.sh
new file mode 100755
index 000000000000..6c03e973acd3
--- /dev/null
+++ b/srcpkgs/void-artwork/files/generate-icons.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# regenerates the files in icons/ from void-logo.svg
+# run with ./generate-icons.sh
+# only needed when the logo changes
+
+if ! command -v rsvg-convert >/dev/null; then
+    echo "Please install librsvg-utils"
+    exit 1
+fi
+
+[ -d "./icons" ] && rm -r ./icons
+mkdir ./icons
+
+RESOLUTIONS="16 22 32 48 64 128 256 512"
+
+for res in $RESOLUTIONS; do
+	# at low resolutions, the text is too small to read, so the text is left out
+	if [ "$res" -lt 64 ]; then
+		rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -i circlearcs -o ./icons/void-logo-$res.png
+	else
+		rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -o ./icons/void-logo-$res.png
+	fi
+	rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -i circlearcs -o ./icons/void-logo-notext-$res.png
+done
+
+# scalable
+rsvg-convert void-logo.svg --format svg -o ./icons/void-logo.svg
+rsvg-convert void-logo.svg --format svg -i circlearcs -o ./icons/void-logo-notext.svg
+
diff --git a/srcpkgs/void-artwork/files/icons/void-logo-128.png b/srcpkgs/void-artwork/files/icons/void-logo-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..adf9a1f1a647b8b71a967c35364e85972ad14534
GIT binary patch
literal 8406
zcmZu%WmuHY*WRThL_q1(Md=cxTb33UmhLWTSXi0`R2ozo1e7l6&Q&Crlx~n%x;x+f
zy`TTrb3HR3p1IDPIdkSd=ef^BYN#s`6Veg_003fTB`_4zBmR5w@i1+tlm!aY;aRFG
zf&mZzJ>T03699nc0A;YOw$Hb{Ogo=(ok?V{9e>)X0<E%={R;w|w**Q8usr;7&}OK<
zE^I=_Ob^yY*qq$;iH*{nyR?xDbdIG2$$OS3_xv*s{>vYE7imog;c3qWuOI{jUzbh>
z!Ut{-nuI-v=RNjC(Qlury%`1n&nDO{?+2ZR8C!k;qFl!4d;S>(?j`UZ0X(diG6f_W
znsp(Smq{y0l(7GT^A0`gA3To2H39kB;^x#NbepzsXsifTh+thdU5R?hT85e`1~xQ0
z-5fD2%q%qoH8YP9i}LZ&(L{ckjCyUHcx^ye64wBUz{8`;R^zkso{&1Eig{ARu485J
zWTbHw;rB!jARd-5Rws%BHM_BfcB?*oiTetdJcTMZ(Zev15sxJFHWdGe<i)f!wJZF<
zN<VQ$)x0V~Tl{A=s+Xb=pi&%%+(SASMne?oC4CdWjfs*cQJ746`!xGLr6pC-b|aU)
zmu1B<00gjrjCdU7=+~k&0Qrf4Tm)-B2daFqfAF8%qD2%cny%RaAy1R@Hpiak?^7m7
z_5yMTdCO^`Z9k6D@vqfY-NP#EXzScTaZJSfn3@nxyf?%$&70cTEAkfmtw4xg2n3v0
z9g^XtO#2gyEnfjxvA%(>U-Gx+WhH_L!4jN6NLIx8mpuZK$I^JMI0Iy4o^lO40koNz
z!D83~gsMc3_IjsfU4mTXg!^9Hw%%^e7YMw#e_@2^i0s|?<T5t%h89;tg$7~AS<0C`
zpVWjB6c8ROF1`H3!Y}f5$XP67fq35&VF!NM@na4r77R>;E+8P)5L?#U<a;`b2@2wc
zJilKPT}e;4#Yq_$Gnqlp<gMl98j62W$goprIhQQfogsCnm|5fAz&v?~eg*w9eg=>2
z>s&tKKZKCI7SuL^5$hZoe4A|9Jb^WLk0hcxBY!{RT56tu#VT#bQTdLYVp7A|;gAf#
zWow*2zRi8p@WF1~Mi3*6E|ipxMl}F+Nl!-e0yM`HOh-$gQtVAw`gF}yQUyRd$rWR|
z=TFhJY3xG&MJJ_ZUm+LZra++UJk#;&-+Qf4TdBcDq5D~mu+kN8G6SEcZD(ylfZm1D
z^3IkjwC80)ct%ek=y-I!sAiNMVBF@21>lAA;=vfrkNJG&IY4F;@W5Co5P7AtytNV8
z5H5`Isd?i4#%&X_s@ofd1hU*drMjy0zx~iCR8(=%dl91#6)C*fPw}*APd|~JwXxXO
z5(3USLn25w>69YO@G+*j^uJjxflG#Vb)u==$fMEmWGMLZ$1d?Ani1NFpF%p}RLSID
z^-_BxL!W))kn-vdS@R%WqXR<=^FUOYC;-{j&-QJHaY8^nyKJQyAGe&*(@Cy(O-;?t
zSjpIqh(Qq4+^Vfz21HqyAghpYl)kGqQyzZuBq1dmZlM0MGyUUep<FgSnKJnot20f-
zTs=UM34t+;r`BaLy?({{=;&|;F90Wi88oBrA}6psjNDt-S#SGWGbZYD`&=PmG;P9I
z#@L#k!N|*)_;E2wv_%^m0?NTC!VT)lWILgMHL?W*hbumt15NI3Y}e!aXn}=9OWVa}
z{{mB?Hf8Cbvogz<vfDZq$z@5ey?0el5F5Nvz1nCLoL{Aw@fAhBqvT`8LK9fCEU3CC
zvU-j^U-w{mk!cZBgloEQ8eRFVY!9x>AXHx{c=*m&=gQ2Re)dOcMa^SjJ>gF<I?HoD
zpU2O>tPdsbX=D7o30TY<d=(^tOw2eyP3#zdE5|`T0Ey&Zb{Tju$g+D8AIh4_nl@m(
zO+(jU<5Ua-7Mn}O!Q~M!(l28}Uw3w&r8<<tons&~H6IftjeO2ZMSm#NIOKcv!U#bg
zGGIm*u1pg1Ouur1BNE>L`-UGnWU^%H6|2@O%75eY!?7wvw93a6FyPmaQ~fnIIPk$B
zP<HEpv00g+c?zX8qOYmq^@uW$LCvv+(<(&^PUJ@=+1X4Y;7=`a9o36x*9+Ug=UZJu
zwTl#<0HNnjD|Hp<Pw4};g>g8s6s1N!@za!5oc?tOAESr59I9hkn8ly$jQ|e}S3&gM
z>=@i>KGN9#a*t}LXxT*fwFnE`mCpR9e$qt614-<}f}=H9<4;PU*s1J64m^Dqb9g`N
zeNMrjM?dy`!ikvhx>+X)Hqb96$@WqswS1GIYy3(@gWy*5&GXZxwz&%h)*(8l28P*B
zZzW3;J>c5O0)}4bjnhnqdd683blBw9^FP)?yd5e9*aB|B_A;9(l9v9@)eSu;k|^DG
z$E*03T@-CZ^8hOB42PGYiA;hiqK;yXhLbq9=9boOYrG6b;;zeca33Zld8u&Sf`}N_
z{O9CMvWA;OU<P4koqQ{1s1EXH6}P3pZ|u%YkU+=F>~FW<*vvzjJ?M21J?)ogtSy9D
zbu5jB1z}jr!wYj>700j>SkyqE;yF-aCE{_*f6$d}<aRuJ=5U^^oz);8Q)4tj5gOsd
z-$<La&p5WgeymQJl~+_&)Hd<dfhsNr056-bT3p%8TwBO6_<U@|_T>FB#UCRK&SrqZ
zm@`4Um{@>_JWp<L40|v5cD~-S$IpM~t_{fJhX-rLGjH$wy^U<P-!l)a!wD#3qQEvl
zGMYmI@!X>#4A{@y&_bD0=r#0aNo<__XS;P<vL*hYR_OL?|KFo~bsCT7Qv%ukZ5Gpu
zM?Va0GGa&KJKeX{K$_lHZctKV%>!fDI5-KpIJk3as}s|Cmvj!IQZlI8P1`U1uCt&j
z+;|&66!_0p789sinf*+;<<L9foZfpt%+yq82!q73m^CmX4xG7ND=>Dho;!N37q*z>
z9;lceQpiB*O_m51#vVpfq2U9)gUi!>R$ko<%`MH3K0W#fablSDvqV6UJo)29pz0#V
z^a~Fd_%!pT=3<B8?3IYeKYWbr)y5b?K1<bW9`We=Aup5i{IrH8I0)K6(TA4^T|p{h
zVs<CodiQz7bBO0m)HdN02I)UPR>Luodn<KBY(+JH9BTempe+XcQjT4)!&!e${BK-=
z=t~ssTj}1cY9U^%B<Lt>^l@&Dy2!mrOuH>9GUEx67*W1<aQ=9GCXIM_#dQ7ef+6Yb
z)=&vuC!=3OF`1o-&<^(eYw@aLz*sJGj!rDRx-C&BSrcmd)MZ$`Kg$GJIk+Xh%jV5<
zq`7BLLtmu|o)qI6h=RV?uB-A>J|0?IuFZ8&@8kWR2->r!?GsN3D~+8{#aK$@M=>Cx
z*OVlzr<?SFG~6bWO#<j0gXOnlG2|sf6l>$sFmVijjmLTlylkwuD<f)Ll%Y@F>c{62
zU6PwjCqIsRZ*^wm=w0s4%~sV1)PKfG2&uH~p}n{#xa-hRA*T8wIC*Y@4Vz@^#<}GH
zIZQGrn>}adcv+H?o2GG0cx=DWdiFAZyo-`tUf=j%Lv}|IMgDlaY6=fST2fNJFa34E
z8GJ2;f^3?F9xlzBLB|Oi$d-`9^|`5g`lXY~Ux9ssBDKbOuAZ^DxH$D4i-e?Pnuxn)
zNd!z!r4F|nTR15(5vH!D=4DW2f$Ph<$8-#wmza-mqEJR{CL251KRG8VFe?mV1?O?P
zU6h-&+&8%_bjAM~Rs=V$CmX5U-QMOPFp`Vo^9l+qg)(Ncsu*nQga7>9IeS^F-neOJ
zYHIrO<;#&`t-@8LBeDf#i9?#ur~Q<id@U*4)xZ1cu&vZ-pxa|HsyW-Q=iIZ$lX-Sf
z`8BMBR4;J4$M$$}F^S~qXNzB<xPVQVSb<tb_js|^6tKtB)6+FwI=J0s<@ZOYnQGkJ
z(I(TTLFRPNxxj`|N0|yDshZ~Z6@A0Q2Xpn#Ms1S^Lt|qJxr*`WSXfwi^r9XwMTLZP
z`%$RO+5K7jrFKcz_A3@<g&2Lj7_u)<Gt~=kme%?b_MYl{H>d9YtQTMNc3EIt4n1Yl
z4IfT43%Xj*AIcQZ-nuO+VoT;V8^Y)mzqYn^>bLnL+{I<0B+2D?t<Pz?^4C@-$>)U3
z&J3-kwVMZ%#u^pzbOl*u*#}Y24g387M9Y42Gy;LB2vM%F9c(VkB&mcSm@355c7-zq
ziI86k>lYvnkB^VB_h#!(28QYbZ4Ne8mH$30#6*{#GpwVYF)>#;-zt$AJht1o_D7*m
zO997ytZjCK>0Y)#VV8Lk+u<yei86zlTZq)v%hReJ#?GwKep4`O>+vs6a6`Nl`p$N7
zu<_)RxTxQ0k&q~8ccv!1v9WQqtE($ICnsl~knmfF?r7*QbMu}!hCkiiEL-wxsnG3A
zyDZ<0zK**+S0SQOE}qri<Tr+AaZ|=DVqApgL<ne!=-~k|ols2k$&mO=#}a?e<;~5>
zqW{5bi{Br@C@3giB(SIv-d(O5PQ}>SkCx!(y3oj@>bZ}OPDIfHH8bz_tBf~>(;(d;
zF=96CHUDmKmjtdpdMft0c3kUvqOoHbCDSol4$4%-OW#iy3^7T(=Mz?I-O9<<(b26E
z@M6twd!S*-tw;VSDdAWQx^Z3%ez^00A5>p~(V^{PC|!`#?O?GjolaLyq5p{?EL!$p
z!w_8qTnxJOy<UsxCCDFd+}_?MF~#gNGR4%7AffM=<S}MF|4m2F$apXB>w6XP+N%4K
z%b*&pWn?Md&42c@n0lUPkCki^6jS|`f6?!rTa6#?v={>2{wBW?PgE!V3m|d5nF}~b
zeOHj?+HqIE;gR#~{>=*H!>4f5<Fww%FJ&fG$#*SvkRDVrH@4E>ko7Xdim8t4-$cCj
zlx{*gHWb#*<F;dQ_LPKf8tj6u7yAoD{^z?imzV+O{Aq`WhvpjtX<VkQA_5W;w-A+L
zsfGpbjE>165`4ntNWHA0x)aA<>HI)ic5e3kveOImcoQSI1FhtHB_$<uBm!uFIA~Z3
zqD%eqqs__k0Q}o<JX3D_RC&%)zPh?vL*-+3TR^s;_wICOoBu_<vIcS5j<=?XDO_dV
zyu&tiaHAZvrt?34{(ysS2LC}uYV08O&U4+&@e=$Huoy6*0Fu3UoZ;F&I{(QX9@{y!
zq&HSmyaN?PNirD)-#uLRNCOsu_paSBG(t%XUZ^6mY|(G-sR>Qq`G4;gbacQR;I*r*
zvBEiKd@Fg1w4H4!CcYHi*KW%)!yONI2im&2Ia51nLe8{~Q{{uvk&#WB;C;Z?^Zf<?
z)mn$KH&aZsjQ!ug%s#ddoe|xgExF_BT((7`<}43Hg4RTggq<dgg(M`t8M!p&Q}-@b
zTF8~@W&mY&ynjX>7+%c2pMcb(KjS}nq5wV~T0#a-R+x2|bcT~O7(ADm?3UC{GWK)y
zbn+MDoxdRYnveiQwZl3;5lcMWo=CSeHp0lh9F)bkUtX@pYnlAK^YK6Znd?647@eel
zJ7JkI@MqM$;{XtJ`R`H2V<8ghTRyxn3m&(J4A)uj-PhZb&B1p`6iH>K)w3*3fXK*5
zK+CWu!14BKtfKvz<NT$|8yy<aT5mM&fnHK#%~>#N=1Pq)X`LbhKlpCPY^K&hOWD%$
zUm(aMP>rn#S~Arhc=MEs*R-t3l$VJYFNXU2)=c$ZeqHYRJ*u&MJ1T%ml#0^*D+5na
z2n4d<c47Lgl0`tk6Tv-ZAfo{Y#5*rOY0`<-(}Zg07`PD2g+Ia7cbDaj?j<20Am~s}
zHP5cu`Z9P^#Kt9g0w3Cc7ZmtFr=Dl<wh&t`%%D9019}4nt9yG3n&6ErR?C4_-xH_n
zk56bMafIQ*YQyEX4zJepXNmdz^dzwrpWvAH39A;BjbvRv?6(}S@bS5kx$O+32@LOg
z)bd#l;GcR;>n1|Eu2kl*uAKghYJ3)<WS7TK=@WL|_Dhh9%WV62&1*U}dX<^Ds+_0=
z=`yREl+q%engEBvRimTZ-6`rf_9KMmpCgR9(5Ub0s5<dSk?Pdmt9)w1x_WwZtq3|1
z%jfrlx5ee<wp+rgf+=HLFp1L<Ilu`K5s~ZY`%ZwHC)}!+SZ+JOWi>t4nyG%l=K_gM
zLP|~Ds06O&DX|1qtFxc&-CZmN=W_c`(#G9;BU)>jwJDA2)yuP7{={#~*@x>!$dXjH
zP<FJ`*H44Qymr8DC+2FyJU1>hg~#d+$$P6iotGVPkDjlmkQ1sq3NOyPbrNHcxE%Ky
z6M?4c8uf3^gzmyGdU~b`C+!Ao1&E{!zZ=*R4`v9Xo6uRMfUJ+Rcfc&)^BFs}_V(F&
z9lP9j8v>b3(?X$A7fVW*`2mSKx`_3~b|Mt}x}m1#iXAE?>CGGEG0%0I^#I8O$3YKy
zR*B2gFgr2JBfZ(Fmu}sMCn2NutrrXMr3upteCD3GvXdqX>GJ2|sCu&w(+c#-uyhY5
z@MeQNNZ)G$$Y!3Alb>eyFa^&SsJwS`_j=*t18Ih|K7lVSVZZP=h9K7Yd!jAgP(N0n
zqT2g1T*Y81D0#7B!~{*PxZCeJx`<(|f`9;XLe9(rl3JcK7>Kz(+esn7;Wn&gTRvQg
z&hjx!ESGF~N~Yr<8aZ(KPAc$1YmnbD^|cjV*dvmAGL(se%mSmV7Aqvnn3B@gNXWAz
z!rX5un3>z(tMNH**B7lGAkVBLC<i8HqVVor%tmwiBcX~j&xF1|tOo&akD+^|7a0eQ
zSM+l?5F+R3pz5shc5Df!(iQZzQF+DLiB)*~(d<~oOf5C8&)wOS@8wFkF!0%MR*<8K
ztszO2t>neLr&cXJd8E2xsnk&|-86C2hj<xH0|NQ=SF$R_GGtBDA6hL>H%DI^P5~eM
z&dpBS%Z2wD(F!VhdU~F>o9;qoi^$P;&f!Ak<>l}EU{AvoiKR{!S7JJymRe1;d=U{5
z_}y^~MmTHvd3m)9tp+U@wG9=*uex59nR!{X%DZd6rnwPNGDx=6Li_vp9F8h7y$-s)
z^g^DY%|eU{sXjydm+apZz_-WQ-Im%_my)+Bb|Jsj?hc7b%4#&n4t&1x{1lHN{X%rk
zr&4^m+7o{e5g$KgGGw(R^xE0SydS&v{nYli3u&J-Y~A}>Xw5eaP7B!dCr*V(2`|93
zmN0=~vWd7ZL@Mx_558~wZ*^4~i?Mb3%*)HrA7hp}rI`GSwp>9kDdhRUn@a2DR{g-1
z&fmXHAO1!29-hL~No|}zD110ZCO-198RDdZ1z7~WU`N%WbB<3>*RuTgUt>9rjg8#|
zJ+uwFT&us3lFITu+4%DH>sJOQCTRume$)8EN5eLeMFvbp)G1&$6l2_Rf3ecXj10dV
z4J2@~nxnPw?>43O8Iz|#_6uM@?QEgi289igJR^^$;w>mC=`Rp_&)n$CcVzN!OFWO4
zVBr~$!<q5f2}en3ZALDW@7fpIPRK)(C)#v!{x>EE6}Y}0ofldW!ni5i7;Fouk<Zf=
z_+hK4kw5+!lT~FywX}#I4Buqr^g{zWu|^$gJF;U<(Z8u6tyae#ClRDyRGT|F@;_li
zFsb>esM|8)e!N)qU?mB<+dnTK)Ynx=oT(n(5HB3^B7{mL(l|<sRo$d=;`rjcP^(m(
zN+ib5*VlbeaLT&5vGEj7!PeS30Cu=6t9C{mt1x*`BRQgrw!F#?eH)5TL~NyhVIi-7
zjC-3Ss6J8<f#Zm^Ua@p}-uWv<1wTJY(e;w3vzbMb10*0gIrkKQ<L{VmPsw(PUIP3T
z-F7E8J#q<^jrol!#c;V0EHslJIkwUJ<153kH?@tk59|WMCqKAv7+O5VFr;LbyJQFH
z7wI|ZP{9Zv89P)ZaI{IsKb*q+>fGz`PC86nqYx`XiHs^}g(^Z@g#p9cJmj4DPqm0Y
zC4;?wdn>oO&<_7tx_CxOcJ-qiEpN?4X?BaDo7*;GGBhzf55VckR6Q%dy$yOY4(&0W
zRG0lNG+`kTYC=zGD-RCxm}q&Tww;<dCslnXe|Nq2S^1{-{H52selN_2iN9BdRckst
zTkm7H-6KX28VEBdZo3++h~8hM9mujufb;o<>JN>826q}{!V>~960$2DaC3J<)Pt|m
z)C)ng7?TfpANccjNdFmiJ#c|c<k$3Ag(#MfPIqD9A1{3_m-qHFUx9?gVY3-8tZf?V
zXWJ0GUBktWY;4@LrHOxShbJN;=&8Q!+_m1iyxUH#4Ro9Oh2h**Ee?xn%EEtzZ64a=
z!5Q8`d-C>zOoN28_9~XS5}~h?CX$5h*6c4xTFG@^O$BNDQl5Vb=cOMnzAy`#t)3nF
zN6ArIdTHCq%M(l^aV|=)<mtf<UK7tBzW^=*!?0ShS-c(QY^>dV-IXjHUf59BXwz^T
zsfH~g3R_r%vVtysuGfHq1R&i>#ZY`s-a-a7&(~=T9oRYY8bp=M!hq>CE<^V9oJ28?
zi?YJsacJ@SY5q;(fxyF86Z6tV!GU&w2E6aJJzqfu6zGD8zCT|<wyu)iern?7+&|gW
zOw*gS>FX$bn*3kq^h6kcmse}e=AIVBjfhYNZ;+^04u@SjmBi=_m^8~END`qKUQGlM
z!A3U242lM?5tF6a2DVuQx<Ufs?MX+95Js=Y6QJRzTAWl@2s+Hl;P(dc{`?&K7G!E~
zuD|<kZnepe|KngpWQ3^go<s}ThoTWS#PDvCMFVD!&npq1mzwL{)#G{^f-gy~^5us)
z^J{&5jDJP+%97EHNY>v}CI2|*l+`z<Uff@#>k3gVWEdpBzW%9Pmu=>_4pV+HMm0E@
zk>uMB<>+O9OZOT>C4L4jST)<tmEyeSwnRQXa21Z@K>i;3`R^Pa5mSDnOzbo~-*dah
zWC)Pv$afl+aQ|qb6B@E$<-|mge)WdASD20AvV17q@z)F7%GowEhHPy(AWZkZ<=Q{_
zKKbvnR97|1qwtLZrIGR$HOEj))uGZj2|Xh9m*xU@V25#G%MF%lMU+lU9t97&O(ec)
zSO5eBOt6L6sC{=3!#^itk>I-}J&ert5-$UQpxhwddFg=GF&;2q+F<MPx|7iUQjqvz
z612qS*&@Y|!I*5O%I6Ul;Bus@sPA-W&Hn2vNKaAfnVi@ZLw{ZphZO}cS8CVSpMAmr
z)ry>tE6CY`u%gdw7zdlgnhl(H{KZaae#YPC`gg=#!4;1FxiHW_Fee?*A3PP1ZLK!$
z^K<NjFmx#W36DN?^R~&>cyj`Q&$s~|XW@eNOOW_oTfkC_;~}+OBo3EjsBdY<da<u-
zt%wP<QHA|%oGH-6ZIbec{?+DeJtrexd>ZJVPtHbq^S4*{Tv_5O#S6m$Qn??KRr8!)
zjr3%9#J5K??mhK3Kl1Q8KPod}%fGg4GPsp2Wsay>tJl)!87MC)&v6Y{x|5+Ib2s#>
zx^9#ZWACW7Uk|G(+=8Uo$N#DNDCNG;7<}nN@sH}#Y+2r+5tVC&Nbw+2k27g=Oo-VN
zkZ5Sf$idM5n1TUtNcZ}>S?YdkFYU%OXuC$3uk`vT#tZJX3Xu%wE4c7tk%naRhHQay
zBtttfMH)#&4-qP=C#cE0YX3%!vxr}JjJN%fR`<LflL{%}hX^GT7k42oGs5rKLH7ZJ
z@J=bSz0W^N)aQ+fW8Uo!tF@Ig|Ka7MK#AUm&bG$x$+A-bV}ScZQb}X$H-nr8)q-jL
z+nx&(JE{cR(SDi$43QlH<v2@{uQAHob)QXN{~CeMkZVc(w~1uRd(#CIi<EG6u}TqY
zmQ8i40xHF}`cGw9fnm}8Dt={<8?^=uAL?yeFyY63nv{ogRsb+3I4KdLNyxrAFdD44
zna&CxF+CNdvSgkeY4V~sF>EMQJ7H^GkUXjM*<!>w4tctRdfbRLh|u6FpLg$C&tG{I
zXIG8kgT1Zytu9tz83i?*@&wyDKxFk>o>DHe^FM_ZzIjaW`MVj@+qQtn$M4nkW$+nY
z_I;@5k6<-8iL`1gDxCejyxjk+HKk?>Jw$bOeT@GleaAT~2beeYzUZjk%;=H6Pm#K*
z)hgUjfLQ5ap-mi2h(O1f4LmS$oxe*QH3(PGBaFQ(UqkU@jek$1)iKq%>QW_II(sL%
z86c-=#ZoK>FPIN7%Q8jt>x1b#+)>KLy0`#TI?|s1{%}_K;fa#>?+H)6r@F6tF$D_R
zL73YN1we*<Vzg`^8eMVqqYHEDw+HpdsU4ggL-8~LmD2=>VYu}^o!DKe=y=LZ<7<ye
zrICplGR1li1IiF8Iq)%Jh2ZDEtiXeIw3>;baPygFn}u#vR7sS~_g{hZv`#o8botuS
z`Qx`t4P{Z6u=S}#?ZgR_O~OCJW8se!)$_~(;unw$pz7iubK`8}7+uyMwWgXGo;JiM
zbHfa(0t0_;OmY&Ctu*sYd0c$1QowlR6e3uxGZRIFDKZxQ@-th$5wAJFNN=;2dgNKl
zYTy(Db9^=|IkoUMW29FHX{{J4vK^*S2yokYbL5ggK8~STnIBSavHj!UqZ-EaH^=!u
zNwda+s+@ZQ_31@2ll6b6y-~p}l4Z96xID_5Pp%U7lkJB%q3jPc$6k?<l{;tmPD?RI
z#M-w#LUm1N&(Jmciel=n8e!0W+(rr?P{pA(dZI<B+S-x7M_pW)<a1jszS9sQPLgK6
ziNpf<s}D(sj89?zJN=>@A6JCVQT>N_B6RhFUfH$X1MOGOI3JelOX!rZqlB}NEAH-m
z1O8`ND@k}ug{o*fdZJ0S5~YQp9cn%cpyw08Otp3%6X=ARMh%s{IVP-IBGRA|8zrNl
zS7@o!g*nm4S<c1bT;b6pzb3DXbESdHl{_~nN&)EH#3(#G3uW24hSn0$ac>`eHDujw
zZOy$Jg4Wd5eP>`Jx~`L?t*tXTZ-Tg`sw~Ca4ha75E`V%B&)@{2FyoOFqbbgfAoDnH
z1nGke2usdkPNIKpe>)j3&r-RoUK{*Ga9Vl?e9uSdCZ)p8^c+w1{j~@eoE!&xaWaL9
z)I6{irw9;*z*^?}Y!jG|J-4mWH2c5H|Nnn4AU5&g(f4(#^)Ned4@MP$vb;LD{H=ND
F{{h|)kP-j@

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-16.png b/srcpkgs/void-artwork/files/icons/void-logo-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bdb5f3314c1c012d5568cc2f3c8868ccd225482
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0z^qfK~y-6b&}6ZR8bViKj*&3fJ8!}f{PdzEkaAB!YHL2OU>=1lQ5N;
z;3nGm7rflNYGYBj(TL|X%Y>3<l629=iJWN_87)N9%|M9u-a9RPqtk=Ft9$SHe$V}$
zA3_A~2lt#2Gp?dHP~t!Utc%E^@yzpNBDq%0mx%bbh`a<$G;s(YVOme>M5-mVPn1|6
z)W1f^04TbQ@DzBW=n~)q7Rp1}kp;Kt#sF-9KIi`MK24cKBH`t7x%8&lbcU}DfBnbZ
zlG`lE4A24em>n|(Jd&Hvy;j9q1u}cY(|O17{$n3^#jO!f@?jERjI`N`84pWI)$rpn
zPy)y<XB)i0y8~bwdp6mb+)7<Z?Pfk^9%!JS0ZRiNGax<T2P+HC%%Rx#{eq}WiOQ7k
z`-SXswgF(UYp{s00-&P3Mxp7TX?!_swddaj8mrtlR@`tvE&zy1+z5C80)GzUMm1W$
zs02qBVwIBteulEvO58T~EU;0f-%xa}%0X*b!ny(8g~>VxoY7{0WM^{AvaEJNCIp$V
zEUP_rHT4S)#tB>okU-u`pEGt=2nv7&`l+_|clZ3n{BE>_3Uaxey=`yLq1+N9ZRV}>
zVhwaUbkR{RAItYoj<iID1I}o3x8vA}M8d1{>e8y39_$({3c!#v6f1N54e0fd?*l7>
z6aq9R&>GryqswLil=3D2eD~>Bd&Euv7sB^Aa7o}Ia4O`Vu_>3n<yVVG1Bsx2a->B9
pGp5kX!HyW<JFsZrS!LNO_zMBG;mT&TE3N<l002ovPDHLkV1jLwGlT#D

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-22.png b/srcpkgs/void-artwork/files/icons/void-logo-22.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc749c3b63fc6170b5f2e183b3c2dcdc72c204b8
GIT binary patch
literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x16fH#K~y-6m6cCuR96(nf9Jku5`r<bR@*o&G3cViO+gpMc8CFEklJQ3
z=0P$bjY=(rZVIKOq%Z|bgPTI3B8Z08mI-eN_@@@?wA4gXT*PJU%0$t`rUZ-Ww4IsE
zd#8&eGdGV>)3dtgJKz28ckbhzD?BDHT))sz&_a(OohUnjO@IRT75z;_E*2@CPsWpf
zR@*O8z@PMMc*uvM@)6MRxPzDD5pY6X{leSr{c9IYlo`wi&l@#I*B}be2z(}sGUos4
z$DZgIU}SuxISj&IfEHjLVN6tRqZBc;sA>mGS7XP0b@f$mw>MK3-v8zMwZTGe^Ob?2
zdlB&tb@jVwo4)Tm(j-ZgL7=HzP$qI=F5cJPmluG}PY-{B>d^pc|0#8LY7JKaK>B)m
ziyOF?5nd^4tM+?s-k|JHB{ziB%mC|wJC1Ai{4j9l?*9@G-J8G*%h02u6kFVo+FsE0
z%iz`^2=)P|?ajmE!`qyavlqY^lTE}E<*s^O@0s<-{C+`(mZ8RVx~|KBc32wo8yf!p
z))w_g{Uc7`Od^~@I2CF*nYotfTV?xq&H?i)si?eVfSnd)Eb~F8{Go=&hqsByS3s@B
zsY5yGkNPbufaiGukS#NWR->?aC0F#eZNv@Sj)-Vk+=$s5!KSTs%m@UPgUq7MR8_4a
zx?&<)tFhK%KxQk#VYAIN#$<tf72Uk5{v0`IyOsW7fLoQK?CbWsos~QhPfQ`a7ZJ~k
z%DY~hS8n~%#HD&c;udGZAbQaPHZ9z0NZL-i<K06>%nlVjrlQAGwe?`z!LMyj;h#bh
z*jVXYveKD4@+^c?EDaPuAB31)+0@xt))*t>Bh4D<RYkV~3mRz5{FplP5cEWaCQSyt
z+>tuGWv#-A*AjO_6Se_Uz@XRe<pf|)>g~EZ<eI{+3SA!v=HrIezs_a6OkfMWnR=(b
z$YQVKnymf%r$^H-InOzB-VU!=9-9Y_ABruOoEyN45kvDp7Gzq`8b!8)#(|BX(~j%3
zSDP)X=JA2!hhn9YbAGk+r-e?dD{c13g~$u?{lGUfc{Hv_KTFTf(_%qHPB)fvb5C?^
z#~YvbJ`)t`x)i!VUuNlw4CtI7H&ygXLF?03QzvuP_WuWs+f=9_lj|D*0000<MNUMn
GLSTY6Dah~u

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-256.png b/srcpkgs/void-artwork/files/icons/void-logo-256.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ff992021329630c281308f09bd190cab7f91572
GIT binary patch
literal 18160
zcmcG0^;=YJ)b-5J-3ZbkCEZ;^4-L`{0@5JegMyTR%1C!ehlDhY4+7FiH%NDPzQ^~w
z-ap}kA7<d1bIu)muf5m4*Pa+{O=Udn=hz?+2v1c-K^Fu918>0~OmyJI>}`oX@Pclm
zrmO&Z`uCgLUYrC1(SuYK<X-t_?q~V=ztX?GmT_Q7S_;Da1PUiqdGk&s1wWthvKr0D
z=b*j%(c8zz&`+P#Q%9#_rp8JxeN671$`K6|g0<5=G<fsixn<8(=y158+LW`E#+sB7
zbQF*@7;q%!j)wC8=VzM!oE(W1Q(>2a56f1pksVw=hoFLgCR|Cw8`t>b)|`dt!y&y_
zWU^IjUr}C5EIELB;cL)nY>hAmloTsAxbO$W7~MABIrvLBt*i)r_LIh&p>B|79^3o(
zNKGq=8a>R<8;q2=neaT&0!6Q0I{`0h6Nus?|Ez{XwsVSa|I2>1YR=-evdq{r?Edop
z(z2@jIRlNa4Y5wnLIxT7V#{v5_Kn~b>q}Y8a6(Aj>^nk;RvfDZt%bjd<jMK*uYqwK
zOD)Ub_K=ga%PtrGX;xqI8oX;fBLWvvC_?m#$99Di7i~pJg<V5d#_Hpm5b<$&NWzd?
zK}mh|yD<p18V)-*&$s$E#8|&>A%Z(;a(<l3lE)Gff`WC5Qx*_l+%_yZiM|h-f~bY-
zL!<dqu$)HeKR`w)d%uJ-da!#C5n7xHyy!0KUMJuBVv10+@TBdw>sB!n`I8aXSS-Tu
z$Pj_{fryquQ$_Z7T6rY4l~4`pwK1lr_A@y=kUV(%9fF^*3AYKI0%t-}IBp<T%-lbH
z9Id#I`}englcJPV&7UvSBTyp<iAd$V-w0ZRtuarE6Bm80q<JkdJyqz~N6dlQF%}}S
zk<7>o<ZJ3=|JM2>z0|J0g`~`W2}MW6(rg>2gzhfrD-Y5?d4GOI^kg>M%|L>&f^8^B
z%-`pM1eIWEs0-NY7>v}tzhC}dRk*~`+{`YVGpQ{97|0Mo&&c*plPD`1FRpuhwe+#%
z`8AP0!L=f$^|Z!s-vr=tS(qdGH^>!A!NgiXcL4Q>xMrZH_}9s=Eqz-Fm<-X_35?t?
z6J~0R)W1Df?&VuCUomG;=x~Gl&;!P;P>28{EyIJtxk36<FUK^CJq6F$B8wth`lk(!
zYyF9yktwH?aHC$Mmqe+-3E(0Tgvu95RUy`FAXfS!T*ZL7<wRmvWgTOpD1Lm;`}33M
zVXbm!F_^KrK`wqa|Je}s_fDb*<J_xZemA$=nUnqid4rY^^F-l6KnVKuHK+UW{2`ND
zw6fggARd$hYU%Z5<$kH@!vR~NS`lOTMH^D&+)9C+i>AW<0LRc~3FAcqi@GoMJ>}lU
zHlvK$f}H2yC3*4?T6+SJ#4*}&8<E~<FfQ6CE_F}4Y511T7gy1*ezE4gzLa-C&(`ct
z7{BW=F50w|a=dd|;aZ`CM!)+|Ev(H)DogTNHvzPyfHlcn%o~-}>kAlCd9~G+=u-C5
z3m;g%v$~-Wl8wrr++PdRn!@t=Pi;^<ebGm-eXhbm%$HN*A9S<BrEPlRYWCV0vdgl!
zz6WZrR1kr0Fg#KSS4C*L-v;5LX%pzezzg_oxTvPC2Ka?^R$;fHU1di-3h2sX)uu9l
zy~}+k7(~w|hLY}aqy^cq!Nou6vg9k|#e-BvR2}C3y1sfvDa1PmVX<cXZp$boarNo|
zg%#c!Nr>Y^K6JoKD$7N!^$-Mq0!fqUletK>ef^k;o5d{f2J3O@5qDb}{(D8`Vze09
z4vl66M#KT^zATIqZ4m7nh+51if=1bIf^?MkO{;hO4h)t;%4v^-^juM5_+^sS{T2ro
z4Wz=}3MrLUu=8OKqrUFqJ#7#OZVwidISKyn{eR#JWGDPt1mRZw2N6;beNiyEzjPy8
z%JSvC{fpgty$C{J5gALpzU=awVVH46h&nVp7&mMT>s*3S?=Z@zY~TAvBfdyE1{pQj
zel_v47OgRciJ3Y4@$NDLi+<7_h8#A`x>hW=FGX*-Zy61eqch{@%Nt>6=VQ_lK?lc-
zIa6%eKp6N0NX`{nd8|x{7ryE*n$>F49k2O3S_$)Ar>&jQKR`+%<*^1)59@$i%{L_M
z|L4-)%|Du&I!ZCDB}o?-g@(}GOu=G!>rFnuOo6?EJNydL16x_39~JrZx3BBu;uK93
z)y$jw^|R;Lx%eLskj*gwx^x8+F#VE2MWC}j!(n(FHRjX+j7f@uBixIGpble;HM{yb
zh8nyS8cil1S40VzKfKNb(mMUw+-e4OP6CQKycbG)qH_YWLvBE$i*8{>c)({+Z6!Po
z#~Ph20qe#nL9HT!-sje-X!dG@G?3bmE$;T!z(3_)JlZyBRZi|OB=GNbb!ICUjA5EU
zpF_p!CX3t(RBkdT=eY5UVrw?Iy;TM3u=$s@q@CGPRyN^q)dS{?QEkvrp;QIxAdA<~
zz-#`=dX_r1*3XX%pof+VCcvR&iFkiVHDThRjY1ZTv91H|h_<Oza^2|xf4C03Sv}Z^
zPfQ`mrp<O@KM4FjfAGqL<6qdwFMC(p&;Ku=RB{%TR7B_3GVWh`HR>-TX;Ji#WXX98
zEB)B{No8?7F_>4@cH|X2Q2&Pi6-xUUui=3h7FT2wJ8{aA3?EyTeK6tCg~blUv9qz$
zH;Se#{AY$efc;tb$7!P@6($447eR%1k{KLa=K(1kV2s#im8gKd0_ds`sX#<an$X!8
zW?oE#;tOsK_eKQz7gHbAJ?Hp(upL6U>E8`HNia0b6&b}jt_X>rwBPXl>BxU3&^I_x
zSW#Qi-Dzuz?ArfXB3&>M{Zk+L>qolmYc{w+egiRphkqC<P`+D#2V8dQFdYYmci(_?
zvLdN5-3#>7h2ea{#6|r8mJfg76p{>tHPsQ#Ernq$Sif35sj^6$R6FIk`^R*N;~2tK
zmUcTQtPc<m$glwfikUB;zw><j>-MKN4S{%U9ot`#S_#!b5ri$(?L~;sNK~uZHRq<=
zy8AD|33jwhToRQ%Gcy*L=XkHZm;X4C|9uaQP755EFasR=MP?pqa9i*;@nR&mj`{J)
zsSZI3iW>X~p0gOzxibSb!!*M)OOU5Day1z98WT(PtTAuUiNlJwesh$EsUQ^VkgL&*
zfd_;IlQL9DFhpe^p|bURI8|YYIE)qM{!VM&sak@)2*ZQ#*wBhNf!N#l#+drIsH{O~
za`viNyvd(;X~+O*bdq@7#A{$QuhR=q-`&642F#9zNxY2Au}oWhv4bf>#V2i)TNXA;
zS+w=vfv6-N5ViKDJ6eZ0AmLU<N7f2aN+|c}W^55}Nba(P3qXa4b{+AvLzK-HueIJD
z1RSuuzLUORian)K{n~-VZHy73f8U0iM<e(_8&B7mqeS$@Y*94IzMl*;i_2Xqe~x!0
zeShd(-8#TH)?)beG;aFs+b9bu9Knx2)AJNOaR$$r|3Ylk86?%L*!;p<h5jE-RrAR2
zh~Bplu4cxvC+h|lRG>e8D3}Zc0;@#A{+l|tUxZJDN>^0zs;Mr>?H^VI9zkgIMS@@s
zxQ=P!eqK<N|9yK%9^T9FvfY=HO{_ZWVKB_kRmC3znTpQQXwkD#?<<5kg2paAc-O2l
zaJgZ-nF>cuOS#_kyIY5s89zp!tuR=<a`Tjay1#YJzP^?rO-X?)fP&X+#9Nv1pDl(U
zGwhR$v+no8e?p^owr<xk2%!ip1`CB4uGB5-%TFOK=hkLVo=&+M88()4(hZ+nsE;kP
zx*bUyEx@9e4;e)Wi;>_*^f2l<EZN5G;Wo(!K1lF=E?xyHu-G9W9)@3lfqFU=A_~IA
zWZ#+3&3XkB+>Ku~mQKQ}Q+U=eJ{qo}aC>b%hq$#uJUAbgG1@|}AEwj$2s}gu;)}P2
zatrfu=a4XvEavyF)cbg*2qUa>@S`m;i|N~7{%4oX+Co(gSp6>tW<0&4ZV$qW5ORV2
z<AiSIAb4vyj^?w?)05bv;oHCANy_sRzR27iOoskQLM@OjyuJp>+k;0@%(7CCm0(Y+
z@2vO>!n4Pz+1^wH`K0R$vOv8)$`3#oPA*oQdDuVK3O$9nG9NcHUH{6Zp^q>^IY;aG
zp2~%LAcR10vpWq&%-3y<lDqg)ArEx>i2?`op1GBRw9RbgIDEg=o**yLwIt=S%<zKW
zRG`ig;B(wgA`9R`K<s_?!W=%k{`j;Cg#OEK2WWQL?FR`2tc`jg-F`kKS<%;xLE~Gy
zq^i;`765zah@hD45&n1-1na*(^zxUDu(feo1jbFVVT=)IzcN6Dy}Y0ikMkmTD*{m`
zUE;w<3?5|V9LEJrM{2NuNa7n!XhX(}DoXgAus=1_cDFocMR=wti$>WA_uYsZyZi-W
zOML+b&VBP6K_XUseR8!i)X{{W0k@`balmB2&zqn(+S@wljSS&=@q5HIejg+hsjD4Z
zac}P6`4}<J24XLgImSh17FpUfG!9m}yI{=8K%>p97;Apbk7s;lXIiwta*?T}X{|?D
zU@lUhFr_7H)B&;m&DD`eJaW+E$_Z2B{ef~o$Dkm_OJ=lUcVhFpUj;~JF38I*000+z
zyNd}&^VhU=e2g*$9%d&B^QG_#d+1@m5;TiApi`#lC@(Gg2R7%x1;AqJ4^&xl6{-I*
zrS%{|14)8WtL9tNLUy9EeD%5%XC8^5M&ZukIqd+NW=m4L$2Bh5OsWDoNt6~1y4{jg
zakU_J3kUER3Xdqn7cIlkqw_l|;qc2uTV@Y3{H~Rnb!!dw#3~%Xn#;@Kj=KHez=48R
z2#6LH5<1@)xi(9gj{7e(%iw1q?U0Xvmjk)R+kxnxfFtAEQ=>8y9XV!o|1kusu%m<r
zfjdmD>b}`h{(Ar+BS9+Ub?=AnFB4*_?w@zpt$O5q$awW(X}QImfz_Zx&^r;DxxVnE
zUO~G3j|cGY#BZX2?LjewOcgf0uz}j1lkaerRp?X8gis?t>K;Kwy!Ai{#Ya-0<qFIF
zTF-dS|1J}mVzxcQt+ZF^8v>$Cb;?)&4B_*na&I?7nsB2fe8u0>^j@}lTiHsC0_)U<
zKX`S1{MuvWXG2DL6B_ddbLOBF)(Xx-X$p1VOZXj_ypUUd_11~!L)>xZitmcQkrjoM
z#KnYZa-HZWPuY;5R*M`da{wo6S$XrD+7MqQM0Ob<R!x}m63}QU;;Edg)QkA%Bc8Cd
zuNZ)wr0iJkS=!JH^8^bHcqfE&`GiW}AS9z~>MvvPvd+--|2iN>n+-7w`US<S*0V3B
z9)f!%x0ls{ACFEu0SZgfL}WEP<x@r5p*cK*zku3gcR~K1{7lk={x?tb;rGRh<P9xg
zam*^8dw)laZE)jAP5dpA{nhc2iMsD?4vT1SotEx-r@<7tlpUW3H^7fcQ|k7~rUxq9
zAo`Q~uh(CL{BtFP&0=Y>SH$6#Kbm{TEjMa^u0`X;LuO*f0$UdWY);bsk@dE<5~-uU
zu2<Km{x-OFY4sjUSslbChR5AqgwCV9zWh34arm~~)J)9#J?ahmaTpViPG^V;K*#iG
z9sbU^nS*dq14S(s;UN0LsQ}Q8ES3kR=!*XX7+}K_=3g5QPDEBthd*aMBxZ_3HFXk}
zPC*_mD}n%D^EYn0g|P==Gh8-1xfq(Z6@!;d6ZYK<nt3Xl9R~&P5mi#lSPTYxTw2bb
zbbBCA80w%8dDm$p(gdmv`i@r4e5QoZh+MWvP2{#oak3hF7)mnOvVLQ;2#CnK{VDLU
zZ{Dib8@^XY+p6q+zx#3lQlpLg=gDJorpf?hh*B|o(Ha+3nUi4sNBuc3aW1jHnS-ZE
z1Y+#nX=6K9QF6zuXXd*vkhigK*#N%YRFMjRA7HO#e@oHp`aS~u7On+9J;kHv<oyV^
z4IRTTBP-71FNn9y$9%_MnQ*ErPsBa6jI4~JfIJ7tw=R+~;3TuGuh2a34s^hxu+aF1
zIaimN&Pn|);r_`k9$j;JFKW+qS9Im5Mbq$J?Z7|Q4aR-Hhv=DD-|zpopI#hnJF_qB
zqA&ci?B&FgFUUxeGXmqoIA1;!kf5;;)J2uyKC%}Dqxmm?j+tfw;-iECxGu2w%9jf5
zlU}NPfWDY?wsbp?TSO2BnekO|7=n^O)#kld<>4YNBt#VbsR$fUS@^U!d2yfUDrptU
zBZ@bOjg5U}rSCmpOC@Rcnt5|3LjdUmNPf4$nSo80jcT+8{V$n964=v+;zC3s${F>L
z_B`YWoEUi><?WlI4_A2m@(R&{-Gu281Mw(&wqgUHc)%06^<Xx{%cvkvxK_aQZ2Nw;
z2xhk<uAwescZyobH=8=J=&d#l+wh<AEY^G!_&!$wI6>xyX-b{jwD@E+IbJZN;;o>U
zPY|`zkRdqGdq1yE@QH~-MlD35Pv5ph0WA7F!~(VE1SxEYJIf~50R}b~f<(VJb?{7&
zK%8n?;qbNqdAr7)$oIE*u!i+|wZ6fT*OQm}0N=_6vU&Jtwyew}&t_h(H57Ute$g+Z
zpewe?9Q{v42KcmpXZW2H$_+pv;n5!#)HOF8L;`C$QfI<Y0cwzI^hmJFr6ms_Wf8&>
z;*PQurAceEL#O6^m*}(hYKcAB)uJaaDGJmEZ!APuwt6X>ffy9nkMU(2@fW?5m3}(a
zeKAeNS&6Y3oTN5nhkpl|CLa3y@xWsuRHxP^Ik>CJt`+=%;D2s}XQt;`&f??#avtBk
zU~WoqEt{ieuEIs4E&if)T2J2`4JMbcT!_f>Ca>hPNBNQPmu505{BWXHx#@-2Z+&bl
zL8PyU4k)DcMX64hvd3D9jB<0yg>2`4W6;pWQ;r?6oxnJKp5jx@lf5ZRfRKQ;(JFji
zhqf?7qj9Z1&%XYqR~WSYQd!N@Lq|Gx6C3$?OA-p}yDZ?w@o@U2`V@3K;yGO+)4Oho
z<2}SNY<n?0i7-Iyav2mL^pn3k^}d|UCBvxjbYKPzq5+A!qPrMiXI$EN%|P<c5TCVd
zV)h-P0)~veeMGnvP<2>H<En`hkWMcv-@^1nbo*6S9O%Ubc#<Y149eB^gu^H8?H;l(
zoVqhGSDvxkIb?O0CFX>W{|x=<_QzNSrV3QY*u2glmAz*kxakqZ>SI(Mz9F@;@OIV(
zrXG8b#113i*4PXR2DV!w5nZjG%&~EG7_hV6IoO5hvCy%bEeD=5!<W~HgRy0Jbla+=
z?p0AXS;I7W&HO>(p@!YR^gU9+2Q@TV7vGO`2jmpGwWpK6+>%StnW@Th%yFDYxN21C
z8KP5*Qk)wh9fabId-OY7Fr{gk>IG0R07?|_kwV0cM$-#AQM`2!E8G%(0gYC|Q>4}H
z*I^5Lq4ECRrTF(XEoX|kx^K_A-c2ni!ve@)ekm4snNwtT&^wU8Zj-Vfg5b%>icmW#
z&Ctl?_nf)2(8Zo}y!lI*)vIM4)H^g*l%oQ{V{MYJ9bj(9ZQ9C04jAiSszL-x1Yu;t
z<-!2`Y*@0{HX?`(ZlVfv3RUt7z-CL<eFU|!MU*sdfBU5C2EH9h<$JFseG{>|x=Q|W
zT2xH&=9Pr>AUT~DV~bz@-tUgo!KygL)AO3+Nn7{TwH-SQn@GYT-&~30t)qNWA-k)?
z#lcLmq@fHEJ#FpdVlNB=+QF@yF#H;0OukXi5L{SVnRCenL;d{0{%l>;#Kfx~F0=n-
zcLlNi=E-d;NgcBZxqP&+u(-y!A)%mF>1|3lr<q7OY;Uy{7O4)-0<v`5yTtB+RWy%8
zLYp6mQ>>MZj~{Vq{a3)g`!nG~n+snxwY3TB?1yY-YOFy(*&`Gvv!FfJdTnXa2JQ3V
z(})+^%R^%E3NEh#=_B443_&a{E&uE4iuw5Qg_u~HY7&d*Qoxoqe;TNQE!-qg?3U#|
zfRo+MM^P~{Dkq1|x7GQ;dQs_;+4|#N3zPY$nZ&KCb~?nypW{sno}x_bK`^72msh}c
zUext|-N^1ktJLH5+Wp<~6Z$nokwXT5;hk+?T1Liz$Z~MkJ2V_%j3|nVhe-^^bdTYW
zX5QV3>dk@J9ibXepOm7M1lq1Vw7*n+D3FYl|A0r;<KFr3ExraBOU6MV6)4EY@tp+u
zczXKQ%f^P0RkMEfSC3LmLc-=rFWpvE>*0U%^HhlQLw0Die8Y$Un6<sVy?F&Pbb#mJ
z$>}4a&s;UYL^;~PqI=Q1X|{#=>jrd98*SF+&&STr9(=n~?4udV!^2|{a-nY#dSj=}
zh$pY}2=+6sG&thvxPI4{#7aU!(v{`6)Hhb7HvelKgN^;A^<&go^HzG$Ow+d=G;@J7
zerF7v5UdDJ%MP>gzMRz5-z7Q)pjhpNQUcIsqReBHxmGBAa8R8#^x8V`eETObL)q^-
zuAg)-%R{oUlm!uMsvEj4`UVLV^M7kkZhx_sxf=>yJZIl{V};?N77!ptAbAYZ`=<VP
zqEyc(J0~+!-O1@?qU0$i6q72p(b~q&uE=gUQ|tu`%iBet>F=-mh|9_sSyPLf5u{&_
z=jy6Yy0&BlZ_<Gps*Z&|K1_$$eo%CPbM+N%z&eo+rR1|?3^$+v)OONCm7cJtnJMb|
zj?cD-H|#N38~1*B%9ke{E&@OQ+ZE;2$80iZyGwMO`0$F<sk0aF{DPI6kvx}zIlDuy
z5U~VgC_1=>o~5Ow=LhpCz{b}NOXc^yUVXef+5(m#*RnGdw80i|vy>Bh%f8s+vz8!n
zxbpim)9`(Rx8fZ0*-~0>S$BE5cLxA~cSOvTE>DjSoW`{Z0<(;aj7@((P{|sHw?~dK
zA;bRu7rDQDG^ZpOsHdaz^J3a^Bwff^mhWR|$>ZSq?~PER6`7|S0$SRtN+O%aIng$y
zJKUd$CWQux!9ZoLo50Vymtfs+*0S<)jS;CU>aHk)t(BiGdg!ZbYsTMg&;%TYe+>+%
z<x^M$Cs2$1_bY}ZO*%xJl5);l+81Lf<Al~xc|6_QEznn7Oi`@ua?Uw@F7vSC&Mi0?
z@luN|=qU(n5%%CS)Z^_?VZbqM5yUk+JDV%WOoRV)X52}ze=u9eDzfBXFc3K~6ZmN?
z^S>S~7qoVXX~cUA{bey-7(tXzAjzm7057<-lBocqbXeeA#EUHbPN0!+Iub%#Ihitb
z|NQ04f3<c4nK#Z&%=%yTgD)NpHKb*Hf?l3&4vnkR0v3JPR`+dwYLAUJCBgKEi}hrg
zetP`gVWzlG+2xNtc8}}FNJ3%u4FRMGPunrXGUS5H&aR4Mj^V&Jp<-6Ee}hSgs=(A+
zgMN<Ar=Q-=kkqe_w{>y2!nn?VHHNjMqN0`7{`Kn@UYmo~yA!3md7SiR`T6f8j@pud
zot|m#gul=IL_bUwNE_1^gBpoyed5ygE<iB=?MCdzWw}19lB&_B(l^xQ=eLUt6`5qs
z-s^<;?7N+)99@g5tdpw`RBrU*;?J#;2yNaYPPs;xHa#Y}4F3oe1?Y@S>Q9oAk$!iW
zrxmVRR0$~kp>#4^=WzCmM2nD`T2d7@yP-wnLETLkC3!hx+jhHKo{s&N1&aA$A%GpM
zGq-LZb}^&=E*J%r@2m_GFWb8(W7h6H+Wu3p5PUYY8(ON#qLn?k(Cifx69Z;L9SdLD
z+1W7*z1eV?tMA)6y}Q2QeK_1P6WxJIa&j$yqnY!Ib~p-2-hH`6MPJ=^1FO0j5W>sW
zGdCYvG+fk>vygkg)$rk9zHz)*i%xs@g*^(#`1ttFTtm72hiPDimL4}<Ig^tc5x@KT
z|Mt!26!KcmPad}goHae(?t$GT1hBVM;l<g3v7_44<f@-^-}-+Q?uJ6|-%s>~-G1z&
zL*Z1w+CRBlPtw{3p3t5o!^`{0Z#g7IF^;@6>FJpj)#%;z$=XK>K4?-O9TCk>j-$^1
zn$&t4oK8_*oU2<Q(dK?x?9bJf|M8mQG%wg$&k^;^7r#j?PzaL7<#nFo)M)1>;mMdO
z>mwkfB^y5W9KzRf6y`9f&|XfsNrHHs>syi%6aQzMDD|zG-r-Bbm1rd8Fb@SW9c6jP
zVrhqG#OWb~yT8AGbxe(C<6DMXeqrHZL=l7hhnj#hd$-O9Uv18N0x%h}<ow*b=Obm;
zciY}f?jUUy!jYligpwJytwn)X874GQm$Xi!HLOLiPa5NdC`~u=qG)xOhZQ_UGyx3%
z+kUk)?xG%79Ep{p;nCmz4q9Jb@FhLHtV5%e1OG}D`MC0)V5~H0&#REYu?Bma)MEUt
zYa@am3cKOrrNex<-K*YNY!#7tIM>UXHsK_He7x$c^F1&jCME_6=f4ugM(6Gu9DF^P
z%9q}B6`|_!BydGSNwPC>x0yZcv-|L>V$uK>yE}5d@WYd;m%!PuyTtEkNj;SpOlo+9
zfqW0&=^~JMA=Ak&Cd6gC9`RW-qe;woPK2Xxup$PYD5?g=WblRL1Ox@00b$gMdoXRC
zTAlSM)ysJy5@YI@)O9}REDsMGo7L_4j#<dX<of266hq+E;ZRRJRls5M7H`Io0fHr|
z3x0?cn4Fw6^O@AYXu&WYD0EEP7N|+oJ7Pch^3Ym;_Ws$ksT{Rhk4NZG58B4gk;lcb
z+|H5cqJ5p?^J}IEtA2gGOyABBiH7R5&pA1XlTK)u<vb)?l)0zLrfzwL)gQhr*8d&F
z-ui)uLs0SEVFBIS=!c832AjJ%CPUNH<K1jqfWX7u6-JT5nH9q?FIi<oY}>b9+Mtg<
zd-Xe>+jQF_lZ|Ev=XZw-wRJy>y`4)(no@lQ<FhjSrfvir2q`H`pZ{<{hJ~}E5Wf9C
zEr0}gnJ)BNZhWO&8s%=ZG|tPQpLJaG?P|#-L%%L;lGdhF4`7|IM}#wm+OAjQ(s8_5
zZXAu*X{C4S?;<f!QF1?=YNiXuoS(O-Id^w=e}B8tKPM;U1($<j>T|T?M-1l3<fI8W
zh->r+r1^FU-lJq$Qe39cg?ZjeIj<e;nQxusblj_sbGEh~b(m@d-k^(OEuhS`K5}>5
z+7vH3cjuFF_bCWw3^{#zr6}Lr^aQ~!*2wtwO|J!kG9dCk>5<$zoT2dBx3Ox=&OrG9
za8=9h%O9@u-_S1#!M2fven3eSsMW58JKo&fECe034--}4-=jQGhVA$lFE`Rx!!`CY
zkBYR3poGM}zPEwa77TkS)zdBu0+6sJS;utZcE@p+sp@IB1x<7DKUeo1n$0Og_O?S~
zx8@_mzlfN?pUkTvgwS<RHOR>zLycWLt!oEG1Bb^I)3NSsnbMs<_}T-XT2y;WjEIPc
z)2If1bGAi7O^pj9%L#=>r@zZfcnlH%X9pdM2^H#+uvqd@(pl0KFZ*?maMTz#lyj33
z)4oe-oHp)#7SgDa)P(YNXS|q%j0_Fdv#dl)5Wo4I^O<?TXD6>WLZ*6+UvkQ`@@j?6
zTYdGHX&oz`_u^8=K%ZIew-ssXi8TeQl_x7O7vrdegfZ|uoLOG{zl{T6(`(i)1xyMO
z!DOf+hi2X^H-S~=>Kq7w{LnYf&IvcJ`@dhM!_}Csb#q3S?|)eLVX0y{(3Dq{tf$b`
zFZxcH#JA&r#L!KklNkn3v3NE${Ac*b%$2s^lZwlnZ|B;d+pZwPcjp)JUV@bKM`h%4
z6!N}|-@HDQp4#6lL{Mujc6|_&(e*BK!wHj>1s!$VamPL5F?b)C4DN$QkL)%dwC74b
zG~lvP@>xf)gx=zn3%}WX)Ki72ito+rGM7`G<JKnwiFRqYOt1E?kR&dz*QWa9SS1$8
zH%;XDfEY9GctW8Ndvw3?MA^gVIYgk@5jZI6%a@6BSjyWs8|1GAYJ2)|VApGF%=@Ob
zL_tymi~q3GZXg-3V**GLwa@AZ6edPW;c>dI+5vc>{S*Gs-+T_9vGop_u!lO9tIDAO
z`6n}bEm-MIQl-Jl2$d``Z(d1BG=cQBY#kpLISxs&nEThuvuT;u3f#1A8y#Eb7d5py
zXe(?^C!EMQo{ka|0&^u}HzL+Xk;>fdzJn+unY+8dHOyVC-5u75)L9jW`5^F8=$)%Z
z&SMDrB}0{I=J-*o`<68Rfz-rxOeKAu1B5Tj=F!{b%srz|Wt<yN93USjYrXHkMBXs;
zFIl!-Ed`O1J3Z5qaarJfC;vX{ZS{Zm(5c7TDfTNT?6uxR!vizZNWvYB%HKC!H4MVS
z$^X1jVrTd7@viHI^boiV)<1jO{nnS;D6W#$R*yzb>Iq#5lVSG<E^zpM3rd-D5nc*=
zdN8;rk6%+y(RDRDInN2+Sg%WXIM-kN^L02MSe8~cAM)xtlghT6%?uz19z^EYE%S^|
z$Of_i3zd6&$@Ip?maupH#1USc6FRpM1KmJlE_5#q%C<k0?rE9D5pD0JO$^WN$jxTW
z&=sL6QY}~pl6<EqZSgGpEQ!&h`_TBD8TDF$y4iXIiD^1n6(dY}WrBzC?@Sm8H4YiR
z%s-fzn3@k;_GH;RPRaXU4&Cilcd~F*UMv;d0x(W+f_0+VZ0O_Du=!zj?gcBWfZKwo
z_Qyp!sDL<%n3+wSJQV7G{ztjta}7A5VllkZfVQ<EKXy^(q35#NP}khRZ@5FNMn?YW
z?f2&sC=M7Gf|1ss&injI=AizsdW0-nO$etmzy>7R7cSG((}i~`IJ<K?CN6ivfb_T|
zT*k7X@O}wv&hXxIb3E*zwjteKDO<IYY&-}WP5dU*xu!EuFJIfvlhU!1V@T19Am{bN
z{*mgkS(ti|_mTgH1-`Gy;m>8^MJ>MCS^^ZPHJ-NP94o@l=w#@WG`&Ol5Ws$iKI|9*
zpeOv9@3UF(P);Lvz-)kvQG;9^Uwd0y6F?Lu+#Mhy5F+QPia#%COqsvw;XYto`SrK&
z`${Z_RaMG03y0jETLVE7q|e5|lADGN99+>{FZA|CIb;X)G!qMl7wq}fI{bCNKiScJ
z8N18<Vs~dt<H@;q?5gaKQLyA^U0nlxu$5<hgcCOwDCqJ{V<wG|C+U*3Pt@p-50Pij
zbd7bcc7Gc$ynW(wXzn5pX;m4A7i74#sN&rlW85b&9V_n@KQT|6t=8+$wOCGh?kX&P
zEy{`q=nudhbr!FyF&UgLRk$1n&TzGFQabOu0V|rc`<i)O@K_w`59O3U$^=50%vB!e
z%kmR>k@BOwf-B47-CZY*xWI&T(f*w)&fgqXJMW4#JKbIXCDtfWc=zMq`(t6rJZ4q1
zsZh*+rGbn2X`S1<3rX*7LLd#V@Ff^xq~}FChRXoCLGZ($X~2r~{w*g3|7%P(MO}-s
zhdO%>kaALY<B+`oKm^|Dp}KI{$6-jZ;%&C=v96GLT*`OURIuDtHpgp)fV@0CzuS|!
zFxfKhOx0zKAKi5aS!!E+GY@I5iRL{FT&=20;IV8n8+Yjfcyl>Hb^($=H2V?YQxo<5
z$JeE6d$?Y1SU8;~D)t|I(KqH^Ff&gc-gp868!ff1WZ}&_R&D>AjT8az?NKGIsV^%D
zM7Zr<FFl`~>+YUR$;qi|OlPIGjFddnlGR%d>pZ&?<H|PMIPU1GFl(zlAu)}P>V6;f
zbaHI0$P1W7T!)Y2iWW963lC2sfy{l)W1LA0@B!6v7O@SB*|gc<t5RQv{st^u+}A(f
zp`oIpf(FT;nfeK(ia`C3?fm6-5*sT0AWMt+Oyb!SKiYE5hr1RBvZ+_bG47kZk#MdT
zh0J&+8A@+EUl%V`*XDl_u?!}0oaV0GPrh@@Q$C_~pm_=zI(ltaU$z$b{-4kK?i*<@
z7}2d@-i2&s`LS_LRy7aSeDA`<a({3@+Si?I;<)STSo}pTeXfN06N4^T7N~Zx*&Xhw
zTe@mEFHOTg5-}<9+QpukF=_mi;ZMbJYfX*7xfAJQOVZaSL7`jD^o$_%r5_m|PeLL;
zd{tN5S!xejV-+G|XZEtl=;{;Pn$#6dDtBuxTe|f#0erdM6s0?h3e`+cU%wluPzljY
z8&`FXEI%wTlZ8bP{)0j@&u%hMaX3c=p^sA*IR|_$2FlZZu3KlS)QD*M*-r8Ht_Za!
zLg*%a@IHNFu?jECkbrV!A;u)*7`~a#yt`FkOy`)cCw=h2@xp*zy#DCZx1t_K0O$b9
zEQfV}!_!YPbXH#7F*YGP-x}uL;(au>dv||)LvVjx<f{ZDV?cFpzerAJFplNF+2azJ
zNGAh{5=ZLl>I!O+o?=}(jA|rpiv{qqByO^2kcbH#CMQ=kPJ_+-|3-2()q9TN7h9ja
zF&Enz`=V>{5LWG!?k{lBQflUR=X3FR-^)|~;IRxO1x_m?!Sv6XP!>8@6C39G7eqGs
zk7y3W8A?;tS?ou$D?jX|<kzFP*VvnvS864k&YcPH^KUP;x3bV!<_GnT@2y%J1)C&?
zIuf&x-@6K1kZVa0`hR1tXDCD%f|h~mMMPiHNP?d`myV9kz4K-#=KknCmy)p~WjT4Z
z&CfQpbVY<QC%IeDwQ!F*rQVSkV3-S6VONgip4)3{@+KzF|Ni|8dLMokZv2mRxkAzj
z$N4^_o!S5RePyX{+<oL6wzZeoG3BlHjhK}57Z9Dwgs-{e((dEAF|t0dJmGzMPDK^;
z)7)=y<5m1VfOyq$QN&*-T5!c$>%AoJUPy`m%79z2DSiG{OU;(WYyHkLkydKA^5ukX
zZEbDS#hmHRL=lM&O+JFN4qe(^xIBLKKbyCjTc3PIHT0$p-zcypb{w-U1_`x2{1IQc
z1{j_$>(g_@lv_^trB)a~$;1RU1s@<-ijj(>>*OBiNS&01FfABt_3o&%SUHh4x4xv+
z4D-ZPugWL(NfjoBZS*xKN2}3oF;n-wlq5s)dTH0*`CelL26uBzABqxqfhpom@}vsv
zM*MgM@DOBW<I*l^z(N)dcN=`3wypBd>Wht{jfH@XEW}r*aW!4cpNEUBsxTNN^}}h}
zgWGaP$ocN%fL*}(VKm`8Q@7?wpbjJNbMcT+yH(w~>Pk~Tg`SID``l>tqe5QKyFiov
zB@!VaG!xyw-ssvsXG0?8-K29|Kl6S{o+c{$uhS(8mh%7Mk$K3UUB^h}w~GasGeqXE
z$HP!6-&$t&Jr))gr|FN6&0bq&Nlz$Nuf14gL><upZQVYK3l|TM$OTY!SgM`JBU<2l
zhj3(~x&UT6Q}bqX>5d0(3yrqV@F_wNfCV&jq=%5<C}N(_yW4}RU%k^&0MT7JrQ+$G
zu6B%_wy*O%YPfQm8?wJS-S|i;fW9J)U|s0h-**A(+JXnX`&AK<ktd__1Si`CiDi^k
zl*kZhG#XcPj-CMs1dXOaKI2j)CI0pe<Dwps)ND-pQVe{e+n-E9wgl=(1Zu@XLi&|l
zqnjruXMbz=cx*54XBRxS@HDdTK~x5Aqu!^*g@wF<=WpP_2nadB`?1wqvyA(H#{O^=
zwsrisOY-4-+&>^-R;Tthu)+KEJ&7R*kXUddr89;$(|{rt08&)#Ju-}`hyi8cf$C-5
z?6y^WZgpB*k7B~r#ecPCTv@(AO}3XWSAlvjAnI;TC(oIHB=sqr!e1+?Q~X@{{NB{;
z-Mzcty~en%EnUbtk;tMq3EO0b1qk~k2Zt1}3cvfuxK~Hbk1sDb^W(Tz=bWoIfP#d6
z&b2RsI{I0L@pQgsrbReV5I{dh{uhbUd_JbOw^*FUMf;0D<J(@e^w8yABf>Kz>U7(#
z5gg1DkvjDy=%3cRQD^SsclTv!i+~L>axRlX$L`!IVlpa4=m=`yxAWJ>B|m+HkKf=c
zqA4x}minUq2}i-GweCWfl$3m_qgyKhqMEL@96A0w*El+b0!#=v0(fx_Tlv7@z7ji7
zT|yIXf)@;K<BWK7-#4dFuMM(hvuk8b;jtX<|H|>*q>^*4E%r++zwF90aut7Qg<gEH
z2Ez=`Cmz}W8U_VELWYPpp0#a=Q^plLL<DIe!ezN5ODgE{Q&N(=udi?1qO5OgmaTDb
z$&ZHpKzBO#dzAYVf^$~37tu`-q7Vp*iFfsFjj=1|qZ?o3P5iUvbKW3AI<mys2|-0V
zpddaZvaAjqKOohh(ZE6J3G&aocaZ<30kNU57f}NEwn=ja+PWtvCqHFI>7MArpk2@y
zwdk(iX$%>685V-F7%^iEKtBx#Ne^5oGcDi8rt{A&qY&+WPw5DVnrsc5wrR3IxvkVn
zn)ptIw1Y;|nRxLix5J&a7xdOZ#ddgPU&;R+yaA`z!!1SJz{#=M%og<Befr{_Eaa%5
zux1XR)^#PUrQMXTHyvu-QiO*rGUNdvTxO2HG?I}a;#-Vxy7w(1^nSAjLmkZxz2|B-
zbA=q+>flhL4AO*c$1`a|-3PS<S*oxPAwh`4pMTi;tC`iPwN_eWJCP-ToYc6^3(vrG
zzLu{fH6n&VRUW9wJ!gg&vp+w0Q8V_ZtOK3lSBP%EpLWZW!gPS$KohRY;O{@&#kpb;
z=o6%ilibDg;r5lG)PH~EsIe!4*MfY+TU`;f6|;3QotjO+#YMU>I%QqGa!<)3;XiF`
zUE-g0J5Vcd@GuWN<wk(>6h9Q<R_ElR;s0Ft1)8?37~eC2H9=j^VKB#+(C9_v;nb3{
zB8(DsfwgG;Rh2W$TS$ou?Nix>k){`lFw#CZ-}#k8uw<5=PLa?$=|&yL0lh59qj`9B
zB8HHWstNP=NBnsES2;TV#^+D-LS%pvRz3)?=$~RY`+hBx??z}f5Gf)clN9T8aCT1B
z)wM5I6UNKNQ8Z+dSlkTppqP8)%}{^QBi?zguV&QJz@ohBE4A?kli`=Om8gfPAU#5d
zz2Nxla@@2+3FtYn1!R!Gp=0=1b@iW34skCk<e$NUzyYwVzm+J9HAKZ{YPX&NI79_0
z!(5lSrOXA*x+-QLFqp}TKum>*7(n(#htJH5J43wv>~|A*ZJYG(+}r)3JYcvzmvrTa
zH-2lINtQ4%%xy~@eL4H=pe7F*Qx-T`6~zc}cFc~<jUau7H_Z#k=aY|SK(Wu(r2(ZK
zA%g-rFLtT}pDD$H7cUAidVR|WxB#F%JJ;GC8MTlH`X*4jU4;spJ$J-CFxa%hS|_;6
zYsKmf(Q0VfcF7mhw8OR<JKV6Aiy!kJ$K5@DaW`=Re2L*#JlnwJX%(M&n*Wl*Dr45N
zN_{iXQNa7ycH$kkgRUJ;Y<CluV1&~M>>kd7Rf=z;@neu_8<y^-G8SyjWXKZ`9-Ob-
z>0|y3Sj;p<tt-mxAF=Q1sLXBJ9j<ae_<+f<33-59{*zZBM5Fm0dI(A87HoPeSy==>
z0DtjTT=4>`Z@B=Q3wPD%22Dw9|18mvceSvCTFMN0bt7CT){rqvgoi398c+p*)IjLI
zeu=IiWFwW+a|cQKqVs9J<ZpmplRkoizznA_3O#}!xML3ig;ww@N%A^hQxw2fJas%j
z?#U!rw?~y8mf^0514<Hxh)Xh_EVymAUxq@hjCrg0hoPcm#_10KT$G_z(5@99{m9Xh
zvVWjaNo`9N^V^VpG0$jM<*U(ZwQ7%*&=pHS9{VbS&{CDX6T=NmOK^&_%U{zgd&_#h
z_4-g1P{IPu9&SD_@`|HaiR6d?ksdJ>t*J!jl_>1XFh(U-=~PS<_z6(c$M(lQmzpI@
z)v)(@a!09mt<uKPfQIkM!<uO+Ztqj-W@^I9IijjkEV77GPg06yRmBb%BRoPsHTQ@T
zBdSo{pfO(r-V@JT80o5L>fkHdDIyRl+GZB&4Gp&y+fZQY<aKCamSKPx4)Yj`UXm@-
zs&i#7Ud@G#c}yC-De}F&#gw6FA4Cnh4_&<FKx3}j8=fZw<Sw{7La0_*gf<c7Jw6-Q
zAVh4Hyz(XOx-hoYNQ}ITczu!_7CQq{4@vS*CLBR%Kss=jqT5e_xR1bs@G;KF%q$Zb
zy(Qn>MXp-wTxI*{#IE+3qX)A`jCTB2^y8l7SWO~pQ#gq(SMPOv&=rSa!rm^KEaxW!
z3w_6y&94{>EPsl;6fl-L&gfD#zQO2?G4ss7wBmf$HPL>#osDsh8kl>ogsJ3Mkv9i_
z0c*^Hu3+|)yp@5ym{T&OEUZ_8%@WMG)Xl4_JsIr^_s9UtkYeV6WuG*Q{!84fvx;(F
z9|fp$^A{raLL}RjGMA+yeS(A%y<LbMXIYKg?1Y{XP#;8&o$m9u+r33kV7?9P-Q%P_
z7*q7>FKqO*z)%NdmQ6$J7|if~Yg6OD{e1*g7m$)*EZ)4%fgfTTt4UvRCbp5Ky8Wer
z18dk3gmzo~>nXbUAnuBivK85uAT(Crm@;;qo3!%YDS2=(J_1i&g@ylj$f|p6KkRyC
z+I_<PY410&z#ExY?`@7Su|}(AoxK29Vv-c4&c!TR$W-%e21==<pk)B+PaaHk^Gqek
z-7UI)6a;~6bj-}q4^Wj|!;S5e(g2H}#BZMb%KgXu70P}}U`5Zl5g0zE_bKK<dBT@(
zCqaRKZ!4h8^VFBU$a$WY>dg?!gf0ZI*m#RvW}qvCyNo6CF2wxxsI9hg*MCx<<*eP3
z=nKDm&gcso*nGdra0B#v6xFGqYeF#@bP!0Fy1v2V^}j7usNzcAzk0_ptjY=VCnH~*
zytCi{!Tmtobo@HXM7#EXzkMyFok1tW3SKXHa2Un+U<(iOe19MdjY@xM?7qzix_t?6
zmUZjoR`rfMtSF#xVER0Gf5LPM!v?c}M|L<qhYN^#G3Q1RW8&cId9m|*dLC=J0^&xX
zm&*ztNhZ&_!>rW4o<e@|pP_pxL!FiyJI^0e7L+X=XJ%egf(+TKne>E#qwO@cysI%^
za&57)s~fis;#ad7p{ZA)X$1Ytj@gK@c3g7w%GJRGc)1G%+yMrB7=i!~?Y=s2@zw{P
zq=($HPm1AK^dJKrclB7_*v$vRWmg=O`D5fH<Pr~LM>M7Mr<bXf!A6UtL1-YDAI+ZP
zRy-pNE80WC{_&g$5aOY4qjCzqi<o=nLy6unhY$2bl={$=>p+uy6#amb=X0?Uplv{?
zYjOO*tzrIp>wcDcWEiwf!0E<;rhuFNq1-H@UHnS7{4ta*LdEMAG^7ArwL&L58S&T^
zgY`#5v_KlhF%WRNW~eeUgh~Mk<|#U#GUh~K&2Na~1$s~b$)H?m)^+~4+XD6i6mW<H
z2wh<6pqWg6$eG8fTAY925^inWDX1sk1!JMps8cTK&lt-m>YNItj>l>9=S5AC5RYR<
zZRsB)gn{1C)27LReJ_9i?Mt*Qtwc?J4k%b7$%VrKd3A%HF2k|zUXeGxTLFk#Xx)+s
z>M^~(M^&a>AVC>mEP47<Ept!;54M)@^@Cq-$Y1pgxa?@Pv&_YO7!JeRtQYp>o>aiZ
zWMl(%d)+>&OIx}dKVSE@=1vSbf9u+1RYt@*+EKz`RKg6Smln6skdww8^r%8qc2$zX
znP^T`;ikRjF)7`84l&PJ8k^wC(*CL%42P%{NxBvlbw=o#g$?uIxTwhW>vRhWf>u*B
zyGC6QzBGog0(zw9dnzhaeb~$X>#&@59SNgt4EBvPC5X;lp3r<a;+nLf?u-YDnKF6j
z{?hG=!RP+_5u}WVj{ox^--)=|gs4Hr*XhvIfeaj(9;do=xPwkU`eMOugj~5}OdKze
zb8z#SgI?;~YBtfh6@x$#g!AEsLo6f&8trI_PeKJA&g8BZLnJwEx)O1K^!Su9tDE10
zc*v6|Jt8Jt3cajnKdi}l`bFa_5dI^Wdi(igjH5iuHkVq`Y?kk**5w-sDgqabXlM*s
zDpwKigs~tB>*xgMe}%)UsJG~leN+q2N`ywQD;b<HAJRngNyI|*>oAdP?|^}}$uBR<
zw!Z!D938t#Vm8zCMJ1T$nhN`!Dm%t5m$H0jDe7=NR>XDGrx|u4B=*AQFb!hC0O+P=
zFhHr3l9CMA?QcCkAFVnms{5=GdLJU@HyCPgLF|nhiqPc-B=zIQl8y4PS!LJ_P7T@2
zi=ulK*v^lj&Reqx0I<%2va5UUI$uOwn_H?<^@J3-Qme3sz-8bT%dSTKnRYE?T8?~>
zpX+BzrzxI>e~%7uVs*Ch5Cke2dy3oYg@`{$95xNjA+#bz|5T}o&T+{Vdxi)NElMgV
zj2+$xZ*}#hnvI-Qh*EezrtcUnA@h)j#|8q#-Ii7bh_Sudk!7p#ysW^u2}YoMp(%8t
z$c+CDr+pF@JwXx4A5I2^n2xb#a^<)~3^+zOsC=mZKN*A5o&KX3toZdJDmrFlFTq>_
zaVpxvn&>NZTw>_{AFZ-)e^^LCaKx$gN<-Th=wZl}*yPv}%MS76XTUDIkx%*x!%BU4
zVak}Ft8-q@tzo8xqIP$z@f5ut%GL-z-V=FEwmy+LT_FGL(Pxdx)t(vP>zN6}WVfY+
zHgQX*f{{N8L8!+9ya9f5a{u}|j1Jr$0^T5&vRVW}1_f_>u3iy*1<`@ru^8}oS<}uw
z>*7Px&P5;=y0Cxhbe`$Q!Jm4)yKUdNUWWfr%Fy{ohPACoMlYh`J5Mjaj9ifSv7a9<
zWN}1kuD+vvnDExYs!(zyKdJ0u8r$@Et!hDVPqvL=RX1<k!11+uii?q}^+a>+1Mz6G
za1ki?Tlbked?c(RqboM6G%#*m(55RtP1v8h0MNgT3@A&Pq27ZAF_N2u%H4VkJ1J7p
z%}}r5UqrsU%!>o@Y-s1dP3A62n5@KHCIp_|KGpkmQeX1%q;odM^OgJO%-EFfq|fc>
ze2z$!Kp$AiqI4zUHJK5F)3Z=}FV@yM8TBKCTdwr;3Ko#GK8n`Ib!Ql!-Tge6*}o)D
zv}FUkzDdFc$^IkRvZ0Pd1np0ZX$`n42Qj~Md6mwe|NgzSHC`ZppVm%FfU-wZt%0Pi
ztQ(>xitj@PuqB0}!Z4U+`{HJNy?OSo+^oAED@hULVy-UoSfV*UDnNrsKV*@kSh2tV
zVJBPZo8`(w`G@xush|EsMv&h6XfTd$RkRcutbl58L?P5D2@uwBGx}n_&U(Zc3Ufp=
z6Cs|r(oXUMmECG@PJo8J9R9z?h`qmy_n{sD$*|*kVy6134H+&PdI<t4OLa^l1LhMC
z)^-8}CN!lFXv1^$6mZ)me2NW=QCpP!7`gLNXzdewxVa!MY_u5ql&BzDSryx7DTewU
z_ulBrwVE{m+mc8;FdQgo#swyjC|n5w=qjJ=%h7<vrJ=U-q4~-==O1>G>h{3??NI*-
zFInNumuHN|#%2<vPn8AI%aD62u3B9aV@*dz%2~yLb+TulOwD99b)<L1(x@e}G!5jq
ziFfjsOG0s(SE%ROARs_&1~tZt-~lxK)uA%a*e{+wwJ?#_MVaJ6EP32rd?kRbe)Y=m
zNAqM-9;%5}tM)&`1S8+l`|nIOw4JOeyPXvBk0wW?HVKmn@4Gem2wQo1L|ABoVJw$)
zKMzQ%efIkQLm&P-TDm4F<^I9RzYXlM#|iZ-SR5i`-=IKzvOZGGFcjF^(gOM}#s05l
z$(DIkeJ<<Y=n@oTvd>H#oSCXQ{f{z*aI@7YU_=`EF~AoE#Q*zVfZUsUH8hY=AFCRC
z)F(*f?6mRdhZs|e+?iMxuP9xU1*Y}=+Fsrwus`f}VOH#f-|v3OWk0<oSG3!DHTNLa
zN67(}#}brnH2`U^F`D6eOQ-pzJ4gp*eQe|W*F#DHG+YSIwF6dfl}8sIu4u<B`Lx05
zoAbtS=Mvoq=m2`Ym8lKVCK0|D^Ki8DA*+76W+?Y{oiOD@iRW{H;CT(Rfl5^A15t|7
zIpTz??Jx5KTsvw%$#qf8hu?}7lfq*Wr}itZ$RGeU9&ax8h0Se8b3KQ(AvyVM;a*E3
z!J02YC0I0%<k2Hs+$&$vj=mpkTl^c?CxIU*e%K64lcp@~jv{%;p>85^NkSuXa>7A1
z5$S%{wQ4t*c%>W_Gm}W2??p*AURF?*$8Z(s6}4*{9oPa@GBIm-Wy5`WW5#i@+?7)F
zGXPX)+x4a~STU$Y^>dgE3iB?!e-(xU&~h1z)Rj(%3tt%+o}Bcf1?Sx2_y!ESlgtY)
zk@L9G28rp7&=n`^&4bjRL8-@#1sj2`)dt{%6;ciM1FZtBS^{CW(I~8mI~=KUaoZ%z
zN&kwrGox(UbKj*<+UzNw9;5O=yU5Qv*W911fb{CJkvaIsEo)hYoB8K?q+E?9eWO-e
zG9UZ1k|^EqPHYC>9kygspoKcnLy-AFA~pocRLqt`kP<c!OGEV$%H$Rs)i;QcD@c<L
zOrJB%qws%zU41f9O(hQ&e8-fx?P|q~tg1(8t6Rsx&l0bywn7iHv4UdzskbF-{^i@v
zJAz|G60&-e4jcg8z9b%kolRhWtmv=0rvsN4z_5B{gz5!7q+-6CH`(ofJ>UCMNIQon
z3G|=k6&Sgq1J6KFmj1a6j{?&HLFr4S^Ud1>=-b#iA3e)PCT_;$odO=)HzVLO9~mlt
zTL0<j3wLp#DHyEV|35o-;6HO7n@;GpEMQyX==ImrCq(CHFzLRO6F&dHch3yP&c9bX
z<9i<MoT=ENaV>n;HeirNHBQ+i{XxfzJ!Ug-UF6ku_kZRc4(dyhjP_4g6!`Lb))7%>
zH6sH>SKFATM=O7B7f_0}e|gIcv@<p6)I5#o=Ila~V|R*D%<uo(HbvLHOxo2mx&zot
zPX5i4`07F75%*)O+PNDd56pJrILvU_3%KVKc%Z<>1Ah;^buiGV{X8u%_VlK;uY2A)
z3U~JRq+V*6*z?kON!kCy$-u=rmQEbcOJ!`28;Ufr0rv<rL^oPDx&%a}{s$JDr?;(p
z-0y6?a+BGO#h>RWUpPMh;a)bQh5rkxj+L$byLjsXp9j^-?e~95a5*^3ygMuiJi<Vm
zLB3(rsiL6o`N?13-M?8=@!c|d?TzREx0mbN`?3bg9N)kF#-$)Fky~C%ShzSZt+4T#
z@*_gR{FuFi@ZbA)b{0H!3eW4YUVKpC;-&>hl};?4<{o{E>1AtSq5cv>wPQ!Nu-4Ci
zvLyCQ(xqj~cc!PE`|;<F%<M<+re?0|jd?cb`4hW--#Ny={dG@!ndY~p&lhrNmPkHy
zK=^@S0r&UK`tQSkPMDXhW_$ejQIVssZtA7PzvwftwL19ag^IBA^jH1y@(;EY*0b%|
zqT~I0owNhz0?r;o<^#?T1PhqIR~sCg5Eq}M_PO=u`p-IRQY}}^eRtncLm;Ilqvxc{
zq?0b2>Xyq{T%Ww3bsn?6&S@=^<i7vLstsz!$9S0d@9bco6SDWsVrQe*_h-bPoDk)=
zdBZH#_*;3`LjIpfuIzCC<#EhiqMLtmPrrf0Tl={6_S;%7FZ(O{;npUduSwZTstsaE
zJs%%l;d#egUSK6w`TF>j@7gKFt9AbV@H5+fsHkpkuhYD>cbyJTlfG>umlP|g_w5MC
z&?Ap{zViZ2Tz>cU@6rm^<rBUi>y4B>lPT-PpnJx4VukFE-eB_?Ouy>Qui0%mDZ2fH
zsM$&J?V2H8Q&y#VRi~D%76p=7+s@X#W%zyJ*$D})-_;C1YVG#C+g#yZ-LPPPa{`dG
zchC?}DcaXwkS>1lb7GZqV$$8cUs-ooxjV2`ygz20;1^vSJzeO4W^&I<#$%1E^Lm(^
z9b_`DY`tMRr}U?*0&fkQ9i!&yO<KIOn*T6+F{HN`9^>X=;GC0kf!n2F#cw;FmOBsU
zTJ($MTJ$FNo2!a2-mblS@Mh_D<~5Ac2UbaI{|Xleu6`mG{FJt5oT)YOXT!ZTA>a`<
N44$rjF6*2UngG4xc&q>b

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-32.png b/srcpkgs/void-artwork/files/icons/void-logo-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d345a61b2669c8ece2d5e4d30754882fa7082ba
GIT binary patch
literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x1iVQ^K~z|UrI%Z5R8<&-zkkn7T2KO^iuxcAh@pv!frKcO)<6rzfshUp
z18FU2C_%(a!i$7@z(_)T0gNK3fk*&D2S}}?ib#>7$R&758ZjisTL_2&gfhc0bLRH}
z&~nb63wAxOz4pJ>IcJ}}|1Fe=j^iC=sZ^>?RH{^Uyb*JsqC<fYa8c1;1o;lwA2#7V
zGbhZvTuNOjCfMG!{ee(0^pdJR0}L)PZ&F0IlVf#kQtZ_K3b3PRN0{?06_sVcfD(<p
z$Oy9LvU|C8Ud_C#Hi5}I^)v%SCE5>jfRLg~%T0OL&VxIL+XMwa!S1fzgEN85UO~q7
zBg9SoA;|PtRqTh716V>Nfp!(`G-6H|G3U~n4hA$ZT#!nXC@>8u&lf^n9T%^OpYa8l
zw(f;U>ip#a2b|3pZ6UHIyI4gx#H-@x3I*Qv)vgLR=eDA>0737#s(v%@%E0RS`ug-O
z0qR!FUykZ5Fq1!XJ~&_ay%a}VcUv_|0vPHY6J%wqD)!pH0cu}=ZUnB|Bi9$)u{2t1
zdlR>d#FvSYDtg!wqE}rV8Lx?-F#yKRy)6H&_Hhwpf1UH}kp2dUO^Tf|IWrr`dWHs?
zfN2FVwQn|-E86H0j6wAIVg?<@JIXqaca#;<G*mZqp=|W>iZ-<$Y9ACdR|0kF-{F#~
znGLprjyk6DP~}3DC0CPIM**~Tx1AJ~wG9&+Hi(FN=VUUOm7#E`8R#3fJng3IjUrVR
zpZ2}ZmOriL-IZHW-UdeXd7Ot7U7zSqY*AI;uRUk-oU;g@dU=C+(g5Rq_M)A(r>{Iz
zxe$2THg*GZ69*FuYy*;$kG-6VK4Jj>7AbndT14f=0_HbFEV1$ddMxY+qcF_NhI5g#
zUatL6`yfRhEE)ht+ZJYq%xR1EE+Y`|ve!a{yj(hy_ARb_NL@?$w0c!ti!^J1OFpri
zzSqmeYvR4YPbK*G#2=5RyksyGtgvYRGN3<uSy35nEiJ4o=B}bvjln!-p-&qy-&+FA
zuodZ<(DN>^y@3DL*%M~JmnYbCpAT}_D7pPUF-)s<8hx+K5hoX$7@Mo;B7~ED3jL^}
zEwPEQM%zZTZQr)Lfu}6Fx`Wp!`y@i@3b&r&<wBqpSnNxE-C#Yi{^n|rj*TX5Pkj@?
zaIgh`XLTV`7TIeKIPdf-`jLN{ESTyvR~ITA9UDy+GY25eTHuI>-5eboO&S0Vuo}pC
z1R+Hd^-fbM|9(Nlr^Npby1}W69=ky$O~9;$8%^ow%Qv4=bd6>1P?x~hbt~rA^f$z;
znpqb~GX*%JqN^I7X!sTSbVSuo^BrNNOKfKYWEI)yhRn(@mc8%WCHtb*X{-<lwWKxo
zR=)Nwl8U5!Eg3-F8w-Y$$s7gl&r?4M+NmNPs?r0T&V`H{akCX}&Wr)ASD0}-ot5wC
zoa!_^tOWKH2yr_o8p7I^Pg^x_Snir8u=fhLi*E}xy4IUf=c}8}nIVH}ftA3OewZgk
zXuFe3z4-)1FDCU)^F1!o3N(@b!r?7@0ode{UAxcu@VA1>(h5SgvuI#gQqxgt1Re!O
xaJ`qz0_T9=L5?DN@XkTKd)r=V^PPw``~wqC*;EtrvwZ*n002ovPDHLkV1iGNSrY&N

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-48.png b/srcpkgs/void-artwork/files/icons/void-logo-48.png
new file mode 100644
index 0000000000000000000000000000000000000000..d394f47213edab1f6f5cb59a2614657364428911
GIT binary patch
literal 1864
zcmV-O2e<f%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x2K`AyK~!jgy_tV(Rc9H;KhHV0ZAM!*U}MFgU_uCL+z;yzF)dtWEkpl+
zOYdQ9jI@PNm*|3V#%LrtWzlGcL!Cc{AQD(MdTwd9WY)pd(pK5RMi75wGb4@(6J*e_
zwYRbDJ?HU{wyfYi?>V<z_Wkdk_xn80_qp$RpYy)YD-;3G{_)w$kziyoN{xzED>_q<
zn}M5w5?}zh2>cV}HL>KSAQyBwN$1?P#+Jz%c6N4_4OR@M6>R}N3)qGFQ1oR%_SwVs
zQ>kUCi<8k&Z~|VBcZ;Ze9bp5b|8Oyo1$Jsew>gWQw+b<goq*?gw%jV45w-v~7OF5N
zvcT59DSg{pKHV}B$H0o~S*m0|!Zxm-cz|-?2h+3DkM8f?KR=E^>;%-;Zvkf}tE?ah
zci3vb;`Mr~qNuSGaFWi+oS&-^<kU5Zi;qfC$+Y*hf7wJTd=Ynf^Td`eV0H*)2snXo
zMv!+1@YT|rQ04*)fT@MXRM8fv#`$Hwu}PKDJV~4f+SF2yX&iMv;SA@s^E{g>ss&jM
ztOGt2Go&v_Lql!DGet=NE+^p$vajFo|3y=>>AwZp|J^I4k48~x1*&40^ovS$!;*&A
zCqBG70jYPJp7w3K^><r#y;_K%$-;ZVyHUzyJJ1w^e!Oo=-)AP4*ee!so!i(1tg(In
z56d3e_^~2u%?syl=iPK|x>;2>0=WqKozn)VZJzkx@(k3w8>U0>8gR?lqjSD(fBu7-
z34r#V_LYiefP{fIU}4Q)UAy`$TrmT|H+f$?K$Y$Lhw9x8^R9>3d>C7#4@S@`6n%L7
zhXCC3ldqNqeFLYtGJ$b?;4_iw$?V3wCbIUhJtws+b<qL{`m$@tFCIo`;^|_GG-0T8
zXfyC{1EoAD3GRilcTHfEnmmf^D?~thcl(_xx?GSC0|XlUiv-U*pL6~k$9~<Sb?;@m
zGg}d!2;->edf;brk9+^rfYLs~_w(n6&^d?QJ&|?3qqpOBAOCTbnh;92AP+UvHvA>Z
zS7&EuS+*kk1~4lu2ivx*tbmfm2Jr~e7Ds%hH}fT5{UZkP0811-;`Ml6jPkc)#fl+8
zo-|M-m&+wBuuK8*Ex#=)SVwQi?I>-)lqfDxE=Zf#?R_$mDI72ki!8E$PZ>BvHwA+)
zN5%2g{}J)TkE0ynr%|LCxf#cRegkEJMR@fA^hCzZ<lUH!!|U~`fu&Jmu7)7B?LF<c
znK;R0G6$H-_dE-9rh#xeQiw`j6ekP;L4Blu<PF2{G)s*Kb9pB+fXdt`&NbO8?;1uc
zEHPFff=K_C8b2XMSVY<?YT6g&EJmA7A;vKd@XDK!oG??>NLv-19yTV(+ZJGYP3A@g
z5S8bnIH6D?ZAB&Q=!&8jE#RcV{^Lts*EEGRENM8dqFqr!@}S#U;{4S_=<Mt)LkO=_
z%6UuS9|j+lWt=vBCjdy0_!=-6#hZYv?b~08A`MI(xC<x^C0HD@Ea4@y8%;$8O4X!J
zAgp1uvlfM{qH9vg)Ze0r;>%hiA)wc?RJ*`b4fKJun-2dM#*nT_KPSjyMSBdi!?tfP
za%!F5MEUcMcsC$821>5fE`3n|>fNTJz+GWXMOqHIyYu#C@&^BtcZUR0Prye25Z<)K
zKA5UWorvor)17%3;n7fn(3`GF*Cqf|bf2h%CLrk6rEa5l*xhp}PVljPf2_T~0rwk6
z19rgJnb<E0p2Gb8-dct{c8!7xLN3UyGPE%-3<LuQU@U>(e|zsm(47%Jo0hjWZz!Th
zBi1I@o(lZnZt^sgMP%1_Bkgimq9hS)Bch6^>JxQt<H}--4MRvn`O<K1_=n>^E+_EZ
zclN#oY>n`l5F}IYHf=1f)Nouq6Ds=1eaZVSjE`T@nY%EnWIJ#?!e;{5S?@OOUiSS>
z*YmRDGMuDyQhiM#ba0j*PaONd=I#o2{d^z$6`(SP?{gx!GOc3IZy$Pms1Q-<$I>_S
zzgPaCBJ03%4!XZGZD~T0w>!POwRx4QW{7?BsAm<P#F7KU!JK1<T{mx!Gwr5J`>9;0
z=o;W&-am_+0V_F~BtqNkb#C(}L3b4D5a<Ve737q_r2w@BYlfh+6>cMZZ!@VRjQ0b}
z-R4FeEw9EMX%SIy5|I}ib#CKILG}`FO%wwKB@ubacgWrIOkis@(bcI~m<>T|Tym^i
z$``imd3}gE3lZInxlePg=u@QSp!@4}aSaN-Bdh=JrdcvF@(qPej9yF^1Lr|@4G}yV
zcf&Z2Nni4P;d|?6B!=y^jNUdboP@6&=n-JYRI=?+4YV*!I)RC(b03(AB$A@K2&@I5
zA7!-TS1~G-3&4LA-WK$j3cbTR<;BD9&qF&Raq&N_T8iT?Zq@Jr0000<MNUMnLSTXr
Cnt?a~

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-512.png b/srcpkgs/void-artwork/files/icons/void-logo-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c2771f85e66ac1d08cd1ba29e6f0f87baf3137
GIT binary patch
literal 39176
zcmdp7g;$hcw4EWP1w>k4q|>20WK^W3k!A=1>245_8bG>BI;5m?Xe0!rdz9{yuJ`d<
z@BI^Rxe(UkoA2Ix?m7GHv(F(+Rrw78E)^~a1R{7V2U7!q(10J&K##D1Z~r_du7Gb?
zrV4Lhp!<h^*{y|fAP_z1ElftkBYk(#-9vw}_VCa0vs3HYYO`6V1ibx*o*85O0%1l5
z>6Z!)0cq0oIT&a{@$u9RI5<Ai9~c;F6j<NVf0ky=p`cDPMN$aOHVjsqm+A~}yH1_=
zQL^RczM~sXsb1O`dp;s*X_2@W^Gme3j6j|(KVI$s<$q|y!n6TuB?mA@a6iWHKz`%U
z4UXY6iP@8QR{F^urr#GMBmQ`*dza1<qo~W1cSwR7G|f!7d1i$gN^TwwSIjWF|0G{5
zQ-~9wCi5Eh1&uTi2gy1zEjOY)pA{ndG~0gZrwooNXczlf+~_*6tCyl)_J}S2BR^Pm
z01V;9NRD#N$=bb?{CSeFZ~P&s7)KcCPx9#&`OKK3a-L%Rua24gD|#hRJQWN=LV&=u
z0G(8EU-1Q4ZH{EsTNn#f63h^O1l3W(&qSya)Jzop!E9?RkiTdJXb}NDNb#}=-}Lt7
z(#HIhs{*go)U*$FwgrtnSJu|H-}3W=3lf=A^-`@I>rrlct^0P4<8yO!PdSFa4}-d4
zea0^+;Gt3BSo8yAui`mMx{i`JDNNy}VG&`^1+S!*;qWpZKH+v{`2eoW3Y7q&NN5Pw
zN@RREe=3M|QUwx=MuV3Q;_PVJBx<;BD{c%+{X%8EZBt}lQkYX5c=dY3ePl(;eMfq^
z_u#*mMm^_dj>@}WBv~Q-e&9HD{<#4|zjrOVo*hFHB-y>qcF|2Sz8g)h#UA?sEn9;p
zOpe`w#DU!b_eGrF9e!<1ovNnxD@_BkT7ue%2|e-~V6{}e&Xe~R2nGhhz`TpRGYkd+
zXad7qS-B{c-ekXf(GoOCEXhuJ{Hd)HjC`*G;Pwm-5zBOV>Fby8al6k>UANP=i_3~@
zxG!ooH6}Dv4YVWa{i1|j8W9nzpUu876EO*}B}{Z{Jp3dn*e1m@9gy&-3`2_wE_flJ
zli&H786@vX95aSYLFyuZO20J9G@90VqpL}|Hn|qBnc!G+_CeKcIwbsJ#^Vbkfr-w*
zi{I+wZ&lv1FpCyc@Wf%?P<xQ-m?Mf$y|d+m0SC~4krJa1VYWrNj%6wE_;bHs{H~#)
zt*T}4+EY`+eA1ksU*O*jY|<V})>^G30Y9&RPux}b?a^Cb&#>1h-?GmrGWgJv430+e
z<7}LOaN*3^D;Dqud~q*&Ywe_{s5rZ!I{A6R8`e_x@#bs#$8^*qhZBGD3Jc;=5`TWp
zWAOF7!a`x9FyTXYfHN1<=L7GcfbgO>%$x|62#tum_l}PpAdzQRV3l}3*XE*(S@C%W
z<2635%v2@k>%7R#!LJ=|r~@S59A7phkQu~Y7S>OL(nAI#FAURFbX_Si-{1=CyCpZh
z&QN?dfPm&P<;MUE_y3Clws2lx7zo-4*a##Cd<<JcHJ=7J0j?N?7p(!~f?KPn)lNWA
zNKM1A`_FOL6YVGCze~uhx-@-0itEb$ph%DmFU!$w(3hBEazH--MT75ud!e(Z15VWW
zDHH}C3>>Ut{^vS>Fh4pWEn@}7%*O;ShvA#TF+@qx1wZ#oq^V2q2jC!MX^>Yv$gIG=
zNN6**)XRLVB;XWzVg15oVz&olU1n|Ti57%ObOk6ma1U8e!z-Zz^+ZW#bhNULZ8DFa
z6uAmg8gjoeq=RWjez&e6U6DzF-2Qs?HFXXRyDzY#X(l4twi6nXg{#MZP{u*OAZieq
z$~@Sa;AaB8AL(v3<B#b859og!!&pXnBlRt$>NY$T_Zas?*kLswYOB;wAymQmW3LW#
zRH~e*zNvd5?%`913aEv-@i%pAV*qJnRA8^sw9%$Vhb_d0xrS*tCHmXCu8YdP<Lmga
z-%#RHT2Zbdh8V;onhSmL>Oe&3Dm#Y(xE86PqHHDzUO-x)bHHZ#FOFhPh6>hbS@V#&
z`Zi7LO2%F$UcYXSUdzaXV(n~@$D@ll==uj>&64wnHQ&GzK~m_yHn-EY+&M0LE_X#*
zLQ0xSkeG$>AssJFHy<%aroyHw%l4JOV?D!u_M&$cn_2X~P{gHzIEhXL-{+P8vie|c
zZ1hL+?8$ykaU+{U2is&M5Pr;2>2kmNX};;dGsu|wBw%vrU%Ok0iv>VWUs%5tvLfJ>
zL5BJ}^^Qzg?*|i=&uYtX0QeI2oQ2nFg3%P-v>?(%c|m=s09Q0b0sDOp04yA4CUQt^
z?5Dl)B$52MCy<A=f}2R+Se`)DMT39kH3IH*W)`~=*DU%Sd_n3^2rXcB7-KUZ!;r>I
z52eArd8)I1BHWqtTXt8tQr7aM^sB`S1eIiXac&_mzxfC4!by|wR2Tle$-j}W3LzPQ
z^BBX-s2s4T%I=i2TI=xc&u;cat5kwBhH4Zol#+W!SGh?8tx;gqGXsHaG#OHmz$VO$
z(}8*lOCrNUF6_~D#QBdE6rnY>H9Bpk8d$*V;zL1nnzFU2wRT}VND4cXzqba9o0rTA
zxQU?GFp@x<D!-IVnnzrmJdE!C+;417zr1-x7{uW1A;{M|LeIpIUpn3f^81MJ<Os+q
ze)J6|;8;xM`yF0D^Ok8)CJ@_o>$dsd3Lx24Y-EaaB!MX_ma*xhYi1q(AgM7j^nqny
z9X}?Bb7e0y=}Oel&_H?rP9MMnH0oqEnIUt1z`aba8n(J$U+YWGV2GpLbW-G!n#CId
zfq3&0_65Bii@UE+*xy!`OYgYOq3E9~60Xj!(cRn43*W_edcE#ayDZIcsE!)xrQiz9
z!GZw>q0ijEJ1})UC;CBW?^<7df>L&Sx|=uo{UjxRJ2L+Blc-^lx@M9tn?Mc(R1BRW
z5tk3}XFt-IpE|*cKII!coIGYLnUNC$Q<#D;@;hM`@0p#Me{EU!NTX|E4mU?ahXW%O
zgVBMw%L<djKO{wwOSjy5m@6@*o!Nb>k+(@@6;QQ3LAOAp$tb!YD%9&hN!0KuY+-(~
zzkn@#ArR-lzQcEI^~L#N3oZJ`;m40%Jk;3y!z030X42u5X(Ch8CPGtDK|)k;Yc%Q<
zTuoqihDT*v_XJZ-eo40;CY}sg2Y2aL1y=!m1saS$sZx7dexAr76#lsi6I}#C*Y`jn
z`7ggRgG$~&j+sza#wE8pzUmUd?tahS%44d=bA)fL6!0;5%WIcnW}=mkGX<510c&uF
z$?;Fc<{E*<XrmZb$=0gOm!H0WuSXN6QY@F0nBM#8C!U;w@(HkrjtN4S995|iI*K8E
z$p|5>+`meiiKhK7G4N%P+9kp;|5LzVL$as^yLz8u&)PP>=rr0wgr>BdHf|9iV1kU$
zekPsyIJY7t_D9XQZdF|V)OPjrDX4fg$$aL5YU2U4FZnL)ec(ejEqi1paF|cYz+o~%
zyTSflbLI6xO}(O12l^v1xo^<ulGRGI5m3dSnVpCuK8F<LR<I_rwl}$u_K^}M18_xR
z#Eqm4vrC4m?~xnLQia9&KLd;6)qDjw%_;Drb!R5AWc|_oJ|K$m9dy|H0iO#vi*3vI
zNI0?mXt#Q@nB`ogXnDawX8kSqTS^9BT6!6cQOHT)Nv(&f**JzYm>$BWWANEFTDQ@W
z>5WaaC`E#rb#|{A!elAWv#sQjAlftq{FysFCm9BC>^)fC;}6Tec};Dp0(w)UqZ24&
z4f*0gd4$5MLZ43<f`PJ)P%275NZNn&xniL%g#DWY>J|vV;QSwnBy{7&3+-y`p8>C|
za@%=dw_$&-S#a%S{5|xd3|iKibOtJNgOCK*p4~$Z-1cx(*?r9N%qu@^L;jln-3^fs
zw5NnGxzcm4fdHFeXELJh10q`I1s<LQz`ELF&h$$Gel49frXRsg1@v`<?`IL<L6$kv
zY>kTur&mzRzckEdN{6l&bjbYP<T>C@(Bw!#YjI~7tYnl<)lSKLR#6q5GHHQ)kx)#+
z&-rN5q@YPACA9c(eA&2=YL6>ZBRzaNv^ERG?5?zq^;avj?50Ug5`dib%yHRReVAgD
zE_QfKM>_ItD}o|ZbiuEPssTxHQh;t!ER%;5upRT?Li*g~c+5P;A1w;W0=bZry~%HA
zA1M%!06VStK$5Monk?xiI^L&r?z$<1@`5WCnxe7)1MbvINgJD$Or$rOVgv{jA0<K`
zs*5)0Yj<osN5JhR$AGo_A6Ug-s|eq{=anSFZ<27n2m)`-+Hwd`i+K+4IVQfui}wtb
z&xE@u)c2)z28e+By#4m};kS~4nWPr!$kA2h1azrBd9*0u$B9%AysUkTL?$2d21pVt
zic*1y8f7tDKXAGoLSz-N00?*i`Zo!%{42tw!Jco$5da|>@M9$s9;Wy)5?HAr1y~46
zF%Fau2^nnA5q4$B4T-L!6Aehf*ma}loFoD=TKnka!^h$HCoChDH=##ovcWoC;CVE<
zgl!HWZ7n~T#4Lr+kudJHQngSL+8_ejNccJL3b>jzZBd$sUrLw=s=rpL5=sKGP{Q4W
zAIEMpJ$%yY;gcd3|DZ#uF9w(NLFpe5vve1s8ul(FM@19Tl<@a~2Wb9Bb}Db>{^ZTF
z5Ytf~C>jH$PSp=%mid$V`Ls9a2ci9P*e}&u0Y*mk1n@T!e!$ltAEhcYGBCyVhT|$@
z1C+h-IW``S8L3TjsD0oDcnhwI-br0`y+cK-C)QzND83^-<0OF+Xd?TV5lo&7n48!H
zKxP1&X45vn_MvjI=nTc&n~c(Ak2AvpM?lMGcGJ}zL4y>siW>OPF=zuKVzX%T49=aD
zaNoRW2TIjTBPND@PMmtW@V6kpwkM`R^8;V+LzGm9Sk4o*;`wOSlMoUDP7yH1h?GJ=
z8M~RkQY6W#`H<i^;&k`*l9H3Y@lh0ata9vr-A6)7D;v*YEq$=|R7h!9iC;iyZ07d|
zUwgZ}s>YbBUN38En_}Cd{PG;a`i9$oLK=UN=K3^Jw;t7B%x8%t@bpa)#Mqr`hJYi0
z^WRDz^t|qiO^uhAe~HV6!<NTf5SyN?XsQq4Ce_b%|1>%}Gn)BWV_H*PSMRN+EtzYi
zt8z#o4ar)#=}!bxo8aTC1n9bddg$BR5P(6T_;EHl0a|0i)&(Fo{KK*8@7Qslz4m9Z
zsqa&T-+R~GmbNsdm&~zaw1N>BWADb&#jnkPM_SS_FEXL)Y?j~DfO~V2%VPl-zb(dB
zp;h*>7TsdoVq{??n$pt*2}ld564iLzeM|z?4EHNyehYxn(}o_os{#}<UNh;PmgZ|K
zO*XPgGSOvv1XDM2<;P#V-fHvsK0OpC<+3KP#2;7{gbfGCS&V#Kam2E3zNRF;)mL1Q
zHY~>xezfZCON$j=wOvV$&eTg`M1Cbn8lypvP7#&xI1l}Kz!4Io;s6KTgNWURovoa+
zpr|FZdYczk6GESk|CXxrXJ4kGqDF{MHHpr*G;9%Bz}t%)l+X}R;2gjDO`cPxNXEv0
zj=yVBB&(#nK%3b*^=*eTZ(1yb^*<_u8S}ot6P`M09Z5g|74Upq;NNglpy0cuE_3P*
z&3P_t(u;E@!g+~=z!hVFlW+njS?OfL2?a3HX+{okBR+t?n&!f<kN;7j)Qu$$MJkDB
zND2A!B{WfUv4NOK5@UTM!`$kE*q}FrYO3$0ZDsf9VZ~_XFQ+ipRWj}E@9>3ZDRS={
z!2s;x;u<i4JK6%j4z8KP<{rJaL@)zPyi4@@*%P$VKv!f4@~O&LUMM|e7I}ok$vkil
zG`wBWoYZ{hkQaddhEP@Ah%fYANe8d<jbcGminaY6i-VmoV{6V!QV<#c%VHLK34x5G
z=e>LYM>PHBE%2rs%Y#S<r)&Z`5+zRdR~g)fmL4b&Kbl)z!h5W6ETZG|b$x2R1OMIS
ztfP7~T(OtJ`$Q!Y+U^R;lzZ4Mdq+A35HT<8x`lfqDW>P4x8f)Pl%{c{meh^}u?Q9i
z<ppkK{C%0~VR3$K@TcEs0QUjvN<3JobpQbE3YOgF7heglF=|b}<9qbwR6@c5U*5#f
zBl!wt3<}F-=4JQQu*W_00gDsebWy~KU5o`wjj(_I5r`MCCS4!LQL<gq&oS`4T{x@Y
z>2TvGU42EG!eNQX&kclla`J(gy~#cyo#7NfbZ4)+kUR!LXCc&4kxC?NB5xv7c^U79
zz@vlWhq)?xgaafND;-_`QM$a404`8Z@A52-?8`R0mP<dTPUJ<zS!OM?2?h6Im8}JK
z@a>a-0YX@2Ff1(45$dQ&BN78_^{hs#oyvpQ1J}cdg&Q-|(zT-pxrY45JtE7>&SQF>
zvly?Dh`}j2=`HfyIa$amv-R>G0bO<m44DHM(mHS(M=o6DZ}M0lV9bV0!O=?!4-AiY
zNt~EO#3JAeNe4+SOxdh~(!p8X%DArlklH7XUv*!YgIC@l>V@us#L0r)8TRPmq(aFO
z;4sH9MOv{0;HKS$+Kh;9$UJ5!PCVO}6$wO%DbdP6<=_HWS3^J~0kB(L_5I_@8I5zG
zf=c(<{fV#iY<qFxQMwu8vOA};GZnZH#*1badN#>0D|jJP(D|b~`Q1yD4C)<R(Nn5Z
zi;$QY-G{7!SZ8X|lT3i@<H)kIiKhwDRNX)UpgA>-g~Zh3CYc*D#!+|pS6R%UAQ&Kw
z<pu=xCbJi=;9%d$p#gj)S<sCNuuD_(p*{9KICDJTJ4Xe!4rfB!7=KljbG+^3biT1o
z6G;D1Dkcu;e1g()tME|4f4Q?4H~{)XmS+>aKamgKPLk5|DOeRX0@?(<0-Xx|7o<$y
zxaz%%Rras{+M+v%9i}R8<4HkypEgk1{LUW9|NM&V)yJj!lx@-W-Q2t@tGQ&WAquIk
zr5g$O(7gz;O2cmqWVASWp?hGQ4~-v@usTZ=LHfq>B^yd?X%C21IA0&HO(!RbY4bvv
z9p0f$Su=j?VTcGZCHjq!1JkHgafsf+u0%@`51~(vD+Z0}3(kzzc!2mV4c8*Y;X~XZ
zowxuKzlaIFdD4)ZrY?yramtT~#V!&eMIVp-oy_ML)%rWRULRGsN$U?Ii3vmA8!J)m
z*8Ix_YKgte`B}XN?RsW6>6ahT3P+?C+lr@HbWXwVX>d8pKA@pkAiUT+U9)#q-|emG
z8S2zA$InMILG7D%!rA{mu#r|X&-4+`KLNF4+|j(HK4e{nnXx;tXw`Nomspq1R9Xfl
zQn(>E|K#fO+s3qBPWL7o2?GY%swywuP64R7%8Kg|&-W74@$x-F$<t^?MT*ix9TtmD
zZsKvQ-@?=T{@XM+Ahe~&h_rFvO(MS|pTLLWypFU%y~(t_$<6`eRbIiOa!T^%vsHu1
zLY{{1CvPU`Sy{P^{g3>-PrgH{y8|6MqnJT=M|x$gzrc@)_dPEi2TC|D){N*56EHZz
zci-P4k)BN8ku!&F8zeq_D5E#|sv}x4m<m25kJ3S@Wsf@r00cgfM@QMs%MA&SFncK2
zn%cVZhFDQNnF(4Cq>O@|SQkrwWASVxdfBdhQ%F$AH3_3-dlpNRAb<tuf(L~|7b1kl
zLIrOFh#bWzQllT*+Ykv=L07M`mUh`>k`GlfKKj?gnOav=s5UmB0u)deE`5a!J$sAd
zSUdM`2m*eADL^B!?Ze21x;pgyVEvQAd9mSVQ4wKlXZA*Y={OnTaa-NeQY0~P0Tm_$
zeP!Uge1qGPc9<FXkm5z3Ul~9y2%3cedB_2U9w9y6s|@dLP*y;1w?KGyg?V%WA{sh9
zL<O{$rdiXV*Z3!FxpK!LbL6D?E!vVS3l=+BJdBa5fyyRWrSMs^Z}9a@i#^|WyJ0?T
zKwScWP0`D`$^8UuTmXHIC-g6f5d1GLG#$-nx_K{UlE>ZiD8w!VT^Y-8{0}JqQ#7;y
zNa&!cn*jH{KIhl#4s$Kzy8^ojSz(W|_O6C9KScJF{K>hJAr0_59J=zSsCX7ni|KuN
z9df^a)EGIev~V_!JzMP`ay$BSa~pVHBGiIsN<OeOfKXFHokUI8{1=-domgvWe&GO7
z$xi9zU+F^XA{&@l73tAuQ6<pTMv_k4XV3@NX3x!2%iTDQrisyoex5t0_Hsg1_HGJz
zH^s>tW68tDJqn;Gu-qET7nN~%yvI57)?6vyJr2*~w==u|V8a2DBr&r(=CJwJ!;YO@
zF457#=`ny=2Xn)R2#ukK_W^_{{;%I-75<V)$YB#@d_e*GOyDgzQ_82@Gq)jg3K-m%
z9>R@^mi89-D!bNmb9y^{b?PNCgfseJq-1EpPYP!~2P!SspKbsWKTs{8lyYEhc%l8y
zpku$Qd2d*XG-gY=o3w-<yqRVburmKF^bt|(8NL$N@U36RGcPn3Vd-LeON4HufJ|i<
zV>YYylLyMbwCcHNEAjoxYW~i4g5O0)f)-DFyYZcRYxccrD<dSga#+yUdmQ`Yz`P`C
zdY=L3p<KWefh&qQFduSc%PzYpYY{3~?zDjXZ2*<Tapbl4362NXu-4)@M)vtWn%dkm
zjR~!znR%Xzy&k}OlwXFR$K!fsvVXb{sx4Lx(Y5YU4{;tySC@M$cXVqu$pgrnt4XW#
zX$OZ-tkfk&F|x_U6%@5R>Lt#mmW!+o?H4oc5+7{?6%|7##R>Z%lW~N*H^8h1qYQcv
zC%EeiwQef`#ld@RQW3R57)+`LSR>F<e9Nz8>c(EGA!JfdiZcFuoavK%uq1rwS=r^w
z`+s)PkzwXrW%-C<njJ-BlcK7|F>Tuby0CsTmcKYmsi1$mYQ`q>=)`|wgzm##Xx2|S
zGJuM9^CbRElBi*%d2!9D>M%K2k(O`roK!Pw4?yOUCia5@9n`asP8`Zqkc%u#t#aGH
z-rIR)&TjDbD&iMV#r*SJ$6NsEgKIqK(nS22e=rXn-@+zY>>Phs9WZ;J=t7Rofz`=?
zPah;9`|Ge>BTvO!uhs%u8@Y)!*u?=w0KE;zC0W>IXcG?P{%5bx&8aH^AuW6$Vt4r5
zOVC+O@&no^CUFXe{?6jrkT;L|J7@lE$4$U;e>(U?4jHp&nk6jF2#rM76`Dc<=swQX
z|1^yC#d64({evN)1Zq0tD05^45yn3~-YzVq!GS&88&PjE0a6W>?S4HoRK=NDN0Fr9
z&qM@M@+I&lI;a)8mxulK&7j-*H@+TJxO9)XWE<UjE6zo@f4&&O^r;D{Q~cN%F^if0
zX!ppD4yaV+(Q2$w0T1O|@A~V5f*hn0aAOny;@0O4JZ|S#pUw1KE$TIiNWAdUfn0oH
z2BHZIt|+NRQaRb|yIL8;nck!tf{v99w4ZD*=XZyvy-FI{c~U_$q5Wzo{DV3c?Y2!-
z{){bd;Igsdio_1=qdA#-56S0+d7v^rO+d>xaR3oo(?~`Q1C#+r*{xq9l3Z#G+rvJ0
zaV>xD1!a-;2FgirZ}M{_+e~bLW6H{dM8PK$3?@F(q}h}wrrd*xcgT~1cpy%Kb&GeI
zhPNYjnSav%H`*SXAc`>((P^)~vqYu$SBdnAl4?*00|Yp?mR8HQ2VKgQH9Z^Pydj0F
z2Nf;zON-S}zCGB@9$!u#V)f7%!PY}XIJ31VDdJtNg}=+vVabDBgT$@?Ys!%Z++Q${
z8YY(ZEDku^7&^X4Um63DqB96uKp{*!bFe50@bzBvC}+k3Rc)X`Ft-hfq=W}#i9Asr
z9m7CL*&X>Eu744DqDAA#o+!Cx5|&K}$Quv@6uT-m;N`*DrTRM1oY_)TWw7(UbMqe0
zhd3cft1zgQKp^5vsu%5hjuFiX<dQe_LByvS|GA`x8_5lo>iE<;FZWX=J(&EbJBstk
zKh<6F+DYC*uX5%w(NjS+Tcb?>_Sd6XMc%J#aNZU;1Lg&sDiT>AaJCJv8mr<=Y5WW{
zDmKvY-bs3a+rH0Z+Mophxr5Wrd-th(|KhFpxCr0}*zlnpBvI>p?B6(HzpJD7ybaOe
z?BT4X+YajFnED5*!ZNZ_uj-ob&z+>!RCNn!^IwMl?;eR;rklBdibX`^{qyV!H=14k
zH`_p3Yyi#{5vmM=tqPYxXl$cB{{&6bBKrLw1c#3c7&l$b3_!2|^hWrJ@&|TKp1hLs
zfo3*hJtBp?uuTlm{Lp>0o6oPiSXt$szwV+e(#4~e2uJiJP+IH!hGKfxXnf8u46<)-
zbaS@$P48iUGeVgtU?0)wAuE9u-u1V8w}%ba=TpNZG7rcS`l5FNY>B>yKKrhm^{I+p
zSsdCmeLG{;mjbMV0%BwjVem>rs1hiE&O`|VY&>{JyUV?Bpz|W=ZPFulvMX`1M}E{5
z2@iaoQ~b3%(Joj0{P0p|>)ATBM1t{iW!PQ*D@MwTO!xW0tTGqYROCZ~d6@-Wr~Sw@
z_y(W0V`A(*cSHS|?3Gf>|IGqCTT)Q4iEtl>BDHC8``!_!fI!QbUuq<PYwYb46B40N
zHr@nes?N@PG+H;dG)X(rF10U!r+u)pwt}<^FE9Dzl2!?G{UrerLy?n9wmkmTB=rrn
z;jEP|t^sN}!xYbv=16db;8SG-ITwu@=fL2v1|e<?kR>ISi2j@MUqsr(Ng!j_)0*kP
za(nC5?<3Qq6w0UvfeBDvG>nxDZL)~I(qxs*W1p)58h^+j;e1+!1LP^oD^oOw@8?18
zg1*wW@K*II;ny30);NcN+5|SY%mW$J_}}3e;j1U_&uEt5_D!t6?ff9@;KwmII%2l9
z66=$vr8J0s-G}@9>P~%F?A`@Pf1%NlGx>Y1ZmXNb|Di{0ARY~FA2D$P$awh1{$9+#
z&0Y*!0k2s^;$};$^ML^<@;MNX`Y}aBMw#z-H~zvTdwE8_S1)9+FHI2@mW&|{`xbD2
zZ0BtQH;cS=&kqp=Kj><Y`FeLT{dN}<CB)Nq|9uRB;L-wJt}`4|1k5Z^{RrcIHzNq>
z^PP26m0VFx?agc&3wPv){0Z>)B4N$fc+A@?4sO|76m<Ws4+sf>srmW&g;aH>iphmd
zy}%GQ@aADwlher?es@kR;-e-YGxu#<Xvkw$(4o2768(j*q=@(x1pWE^1prC!@t&A!
zDQOrZ2<VCmk2mjSDA5T&QF7Q}#<>V5Jz~xG>ZABUbdm3_2XxJN$9W%C16rl((>fcA
z{7;0Za~#mvAta!(j2hFqXS=L33Wkn>L4Ppnd)JwrPTXhHTpvjnqul8ZQ{21K!<-#b
z<SsRr-9KHV;$Qe;zr<;fyVUTRzV2v$UUsNrWKQ^Y<Azjp@vwbEnpM77@<nfrsX@zJ
zpO8AKdWx|1H)omPfR?}F-sZ^sO!E~Ju3b_PvB=Zpsk4T*;+Wd`DKUz7hu0mH%go#b
zU8_0bC_tuqCx03YwIDqVaG$TK8h4pT*-Z#dsq4SnT{H^~NClZ>fsAdlX6+V#MNYUc
z5WV+IN#n~{Dg5<AXxSJM*5VXqA_t3wnH6nt^qmL{oe0lvUBoZn;IdkIKc=P~{O34M
zi_daFEABM9^yCajTIYb~&+Ns<%Y(YwdC9%MAIa97j=K0nmClT;5T3JP9vaJ`a`;n{
z<a_}*NDpAngMRU3a&Omy*a~An+~^h3Z$$f9CGABg#W???KO9oLy)<MoS?JMqwQFW;
zl@$(j|Md@a4@EWHLOu6AVU2TzV#7dBsyBI2xmO^$Qxpt(YI2K)kzJ4zMd0m}5y9N=
z>$x9>7^YZTocL^efI&th{&NrdAOs=BjYVIK1}{4T<0eTJpIC<>)#w*A7mqI<&Fs(S
zC}SqER0=lef~KMZ`_^d&=e~<#4<rGaXgEhWWx~=QcN8X)mN1xqvr_`R>2QAkhn(7F
z&z~G{#l{a?x@YSlk<bil3=YdsIjl+=o44yu^j(23Oe;x(bb))T<0baQ_8|2br%+#*
zjMGF>z!xA+5{Hsg$$}|XDP{zN--=rLXHlOfI-X+-fFEH411Y~w?7Vr-NkhKj_-#D9
zH~&&dcxqR|h>*I-c?sjKnqoA1l->_o-wS;Nh>QI7g6Jr>X5zfoK|WFT)R|2k1k~4e
z%LS#E$x|O%hHeNl<nMKvbJoO+g09OFUt$}!<5@<f72`;g;|}6kS=lm(mfZdp)`JyL
z!|TK-r;TyuF+ioCZM~tp19R*~)Jv@N0??F`XrScx0UEhOVIGi-P#B!7{7O;_XUA~T
z`0)d9JPb8#Us-QcZ5P>=<>yod0vssyy_b*+9iRvUq7zOP4r4D%?2{}QAm+-FgnUg;
zUKmexBA@!&jf3=sRO5Q!d+2Tu3a@LSK8n{qXtNK~2wmo>X|oRlD;n?2menqOP;MbF
zsWkqigM7xXJLYV6tX!L$MTNd)G+*G8tdO*%;RayS;<A`}vTGSeYSwv~sccLOO{!~Y
zPTjfIoUwl2p91%dE&Nt=R^Ssj6);ZY0g^i~Pr?8s(0>yyfR$NtRxAs<wvbkt70)5Z
zjE7&L>!Sfd8m&N!<~c+KJ*l>Km_{hBv-%}QMw5xQLmtqH^TAUBy;KeX@158C0|E~*
z7htR(PcyCU+YFL!F{45i(d{tWf&_3XN>5n7v*!cC?6+{p8w=;=9;H`Gn1CJxbo#L?
zafbmvfY^L^N-4|RMD?;CWQXO)3GqkYhxUFX&|f7!&_?!nFozW|=f`HmD0L8j54GNa
zQy7<o4)OPXUc^7HR0N6l`1jUHl$TeSUw2d*{DjhP(E4NHRMD1;Tn9*rJyC`c1I^sp
z`F15C_;vmp1rd)``Ve`du~8Zy0Zu?AEGj8A)$ZU1q^5r55es0BgZDS@3m17T(<*sq
z|2{rJU%iH?3M^8%Vq2(qV6Dkx5MS>wN_C6D8?z;JdfP6)vgIq365f(F0_F!lBDVCF
z(rNdOaJ#>L!3Yhm@Gl-;yayx=3zolOPav_uu5ZqaT#oo=CVs<!ITCNey_}MA_OE{k
z<lxTFufxx(Dn8Hw4g*v$gWc~)-y#%hvbH;^^dz)lnV5bhvgkqOdwfZtud!b{0s8Ap
zh79uv86cb`4d4qf5_|G18)q5=wX;MtwYRXUK_j!5zM}kN`St)i)0H{(kOkt1JVmMm
zY8Y+M0KM6zF7KZ_KhFm}+Ts93`$0K0z-;cPO6&oklOmCK$S)PI^bJa%xDn6hgLFt1
zRv@%M6?XUeloG>uJGmH;rBv14eG2s;vZQ5!$VNiRlzZ3gO|)@!V6VX^^Ur{hl}Z!)
znbQS)9eqVkBfZL@r5lcnVhLfG8CxZ011TN(Js=}5jreA{OZtcSzPf&S_xC{QF%Xuz
zwN_*{b!C70$DX$-E1=zx_mjnpqf?u}8mUW><RIDDFPm;1lKi#&?+gw07oQM(Ufkf_
z1#;4w`kvMN`mI>8%>*@WGtY=b%tSX~{xVUn`@J6vq!@DiXv!{JeYcOpn*D<Q99_%a
z&~_QY$Vn^W^%>~DRsvnrffAo`-eK?(Nz6TIjPfF;wXwJ><=x*!L8j*MJ~i+wvJ7h`
zm-igB+nrGG=IHJHPwu_DdS^=VWt|DO6kq9syITcdlqD^YBWLAf129J?xqK^9Dp-De
z8o|7qppjVVbz&{KaK-@4o}G1J*_3%jgr<`mqB@sb53^4Fb-Su5V)?r}96rTGo4z$V
ziboMrn<Rij<v2%kjIQCd_Xn#N#m<x>HL~?a0)}Z{iUNsaJ`i7$O&Q#K%tPI17CQ8@
zT6@~Q`4YDiHUl16FVr%8hCc78P#D%Uixh)6)o)npT?Sf;%<C=L#{FOsd!lq$QdXRo
zv+}D-7g<FZ%*Wcv4o1%1uoUlg1pa<0A7u>{6QkR?qXUSUD6v8Vam*iNdtes46y**8
zN~z#?2rwVQ)x`3u85r9Eq~epaFZI5|L=ND40v}cgTue&ubX;PIsMi9)Bw05f33(nx
z|3ur3DiN>LB)~xdB<ezLH&-|qu?IY0I@JJ#&-=h-AXasVV}g;d%Ld$+_C5|S_YOpI
z6c^!?zU}tYR5$7Zn!~fH^^@B6NHi4bh?%^AbZ@eIm75C&a?J?}j2La8;i^fluYEv!
z+%38=XE$)&SuFf%N*7P1R@>Se=n-sai2r#B;|5KEXstu1CZ->*q)qrR_^JLDrpycw
z0-9-B?+mnUrP6~17#)hE3rpI(`>#7bm*KSG3cacUnm^Ygdq)rwK~m;UW`JEX0&)Vp
zz5!6J3WJC-vp&ywC}*_JEZtO+R(&QVZX~?m7|kK71#ZJ#sMW?uInOHx==3B|Yge~>
zwBM?79>#}?Kei*Sra5$Paq|Wwe#rCTFxrA3ZMbu8>ohmkqcp>!%D14(JM}ph+&wmN
zX{C+X9^$>c6uh^a!oTXVfv$+d%gj&;;zqg#x{53&Vg}$!=<Ke)u0Q1}nKAmluO&Hu
zN||<Udp7BP{2cXeq;9!{4gsyz3A1U&(Iuq`XZ8U6awaXx9TL^?SXoM(w(tJL<!0IL
zGM(wHK#CGx^V&(uV_%XEqx{6q-pbZwk$h*yQMEqvENL;s?Zj{Yx-GVNFmMCL*c({c
z*#lo90y<u#<l}388pJ=}w1$(Whr(ZcwneMd?YkEPu+?;KGi*tT>%*TczoP|LNlg8f
z#ih{+WGa`9OV+83s+w-+Hdkq}P1z5+tEY!T#5mK{>p=q)Cn8I6;K+!ol%|<ZJuA&(
z-^TryD!K<>$)Dl`gyx}YC4T_zqXqP)>#X`UXXQhIOP*u)QT(qPzwS-Su1@#1sdhZ<
z2falH{U2*iYE@Z}vm2#7_a(h34TW8Lq;Aiy06rQ?u>rtkaby0hB!d89@`kFgAK6nJ
z(9~-C8Qq=4E9?&+r@pz_BB1HNJ&&{OF6X7r!BU5IMYcue!-)bD6Vt*^)K)+2m;+2;
z!f#U?MVvt~!{ZO0<5+qaP)yx)t|$rBe6MM3zs;XX72e4N)>*wZzV47v?jer1K%^+X
zwhpP@&PUn+qDeJum1U;)W<K%qlGU;l>n)HKZ0fEQ(YUeg-0AbaS|CKiHCsvy&JI5U
z3`yBM18*R>M?64z#RB4lujR%^Sc<S>jSt!W8o9?hvjd!I3viY_B_1rjMStRy@YDNb
zbbRdJULNx3U$I-v5VPX_Rg`5BgBeSEKnuAg>$<H~zX&&=V4Zo&&S3EE50&cW?|1sJ
zGfH^o_MT0c9PiXKNL-bqf0!SEn?pk&i81-1zENE<Sqx2C#-39ERA)LcW@!UKDfxwm
za8tZQP|^$Z>v0VE&5dA!^pA~ehO)icb1*P66;v(p!5b)=Ndw<hYC`c|iQ%4!(7qgf
z(d%$Cq1>f;cZWKQ2u1YGv2Lh+Y!A3XkwcClhd|RM;2I@Cdb4h-nVE(@bnK&YELj0e
z3D@dPZD+IxQKeCPN}c;A(l#Ty8_sO%I^I7^22|4V#S;lk13Qdzte2h}9b&Im{oq3*
z&0=q11@MF-Njf?q|0T6JwYN%&rvl3m$fV%JZ(tP1fLnxcXBqmq<khM=>Umk_{An*m
zy9Qarm$T*ymBT6(&my)8k&@H<)}d$a_*-nWb_EduwS>Xw0ikBbi%R$8=yYFrb)-UT
zk?z-&BTtM)rsQMeHvgE8ZriQp?$Ny)&xYSAm)e(Y1T7Hhxb5<qew)`u?*)xS^rOKQ
z11mNjdd~!oohHsnj3`Tpnk}Mna2hAmfXoOS>q~oX4p5Z3jUA_LL32%WWrD~&W6eeh
zvJ1?wERYd6*UFOAS8}&7Iq^er6Ne-0i<dy`37gFMc#kh*mx>j$WOj-yW4oa(ceOjK
z-YLL-?V8hY6YDZU+{63HGd-T6waE~X`^#LI^|8EP<O$W7)I2(hir%}%Mu6`2Z5k6p
z&Cuu`KO^_IZ$JGgvltkfPS~PM$9)F^22%Df^B(<$Qy|$$1M~tGA;;;VL;DAKuh50i
zX$?_pNk$f@+movs8|r%0?+wyJ1|rysYfeEFp-KoAZl;(&an+Q9CV9SZ^=IA-=Z_yW
zB&CPS!d{zl30;*`tn~Eslo__BMoZl#$HtNj3=B9lH<!PQkB{#bnAY#IDs-i&dao=L
zNBzo-SF56nX~z2Od=(jpP9y9P;F?wO++CYHzbBtxKwwODTH3~j<Fxj4v6tHJ+qc|M
zl~5Kz?!@jq7;iOiKSfMOQB^L5gdab*w($lzx%QJE0`?qz>n;~9JZSsKIi=D0MI__F
z7lUTEqt!T-YMW{9l2Wlfna3{Qa&sy9EbxUE9MIJZm2GVVkx5mt)Y+}DE7F;Dr`F5$
zw3{8Hdx(@&RzX2|A$o#l!q~RksvpB<H>~Fczxif%i<`baO;}hMBNG$Utp72yVlwjL
zXeC9`S2T{ry;0Md-+|a6CsZ8wW`Sb7P%Q4lN7qRE#<i#WO@o#^YC1Fb@3>|AqEIt<
ziNs0iC>P-%Yaa_iU8}CvH1<FublMQh+;l0>))}16{|0)#;7nA}a*WHx<vS0lFDmNK
z1S!^Ltu&(FJe^`}BhB7eR6agA(QWk-pcedSJebJ!ake^mKz@;{v7RKBBw5^+*Eu?E
z@UMBq+mYRW%aW{s7^d`IE!CIyngDWK4qaacWs0pvw5nXJ(B1dfP8%xN*lZeX*4Zr%
zG`a4yq&=Ngz7&~)Nr6&RQ+29LF?rf9OzAt-{l3P;bo}j!5V_v{A+nL~Od(jN&SL)L
zP!{DweAxzFUt4OcBaXop=POT3O_h85c1!R%KKYi&b6tlc%GL&&&*gYYK9L8RUghrN
zMv+i*%<bD(W~@_MT^UP1YHH%s?3%&~GrdZdn^$jlEu~hb+wW@K$Kk!n9O4HOG&Zew
zlRC})uEhlfUxb!@;@p=!Lo`dZsw|@kpI=5mzgYb!JeoXdALwMlgO+#P21Z1Mug8lN
z&S+!NU|CSZ2VkpQWtk9=*7x^4R)rZ)tHlJk_39A78$5+t%@HE#bN+XPe+2?hd#UYL
z-P^AXjDs}%NU5m@Q!F!o`rn`X|L|}uoZ|+4sulV<+?)JN2m<|k`cum1;>GN2%#S<g
z{d#34XX}f^)|PYcdS19<$bN1F0_wlF?c+}pvxbb5E+m@Rsc8QN#F+BCclUV2h8}-{
z#Q{6Q-nb_Z`A|-It!H`NEtr$5SXr^%-)u;Et|e%DoG-dteHhL639^NqJ>qWq3yCrk
zZ1675W6pQlPFD|ea%IK8;CCRZq*R&Xfed9zq%ABg$V6JckN{p>rc>3~yaga>G#Iw}
z6jg7F?Y1}9gP`QQS{N_*H2ynZ;d1f7ukYqEW8D+nLg3RyF<$IeCq%C0hL0?Imzyl+
zUhbcZZ|be(|ExO2UxmbUMTA+bueq4aX6huHB!-dLlfr{^zNfvZDV3wV;S=A8_>X0B
ze_%9@KxhHA^Vk2e&CjK0WmLBr+;?1DTrF4IrRm=Ljb@gX&OKz>hgUllJ3Ug;;Y4K4
z%RC1wbvt&so1-Yrobr<Irh0dR-X}~tIMUwa-GI%W{U*QP-TnAWs(oC(W&;Fcd^&GP
z23RJ`@TRMOuGU7k!GS^Bz%`+w(Q7c!-+N%y{U@f&rqtE2z2C|*YmknsBj&3{PvsCO
z>$+m{YnMK;>{H(i`rq1+>PIt=^n-03%om$nhq9!y`kr|YZ8&?wcW0`~^c!Qn4_c@F
zj_f;AjT|H-!y5o3bGY8C=d&21_$9i-Y3Q|;A4;)~t2HlZw^A@@|2J2Yj$qDvmwRT<
zX6kHfiRfi3$IYBg1(TrQRI^npbe(S`i>I3d%)`U80r(V-nFl*)!A{8kW`!<A%3o5i
z-maF;5clRs^CGVSlCG8dm+%U{vc##z{Tr&hvzB^doUYk<XXk?Xv?a>2bCMVx;zo3v
zGsh5U$ojg4UGtuxviK3q?O^{NOKBs^Uy@qL&TO{Y{7lx4{wW>#-QIk?^W|C+pWT8m
z@N6BJK!o+aq~iNV+x-4Yj}*}_Gk%$wN}C{GEN^eMCiB6kOTgJ>JP)Mh6ctyG2YKp+
zye;{q&Lj^HyNE&-!nr5C#oYJJj{f$vT<<rZ$rhTDU7Y+hM_fKCm4-Eo9klS7CjOjE
z&~*HuexY=A90PK>GP?*09qML>oT|47nxXX%51aq#3|{cN-n-2-$w*A>{V^grh{w}{
zvN_|pC}OGvKwGO!r=v{whsWPAmYN8uP>K8Q6Y=xH4Xm}=(w)*-Plv)0xcjoNyByKI
zf!nNkUZJ~=!8_0mx-=}&MDqtmc2!l3)Xg8FKmt`veOp^D%M9129NOhIbXS?7`dd39
zw(a8fy>oQW0x<EOIxKl^5GcpXd^ku|YS4RWkE5#ng^9>y=#VhM)h00d_VQWgH_2&m
zmPx{Z?eyH-fPwpB&nHa0nHnqg_GS3x@!IP8`W%ahYjJjVz#w-s5MdUFN$odG-=@|=
zs*|$3Q-lnC;Hrk+mL0#8*HVe-B!}>LFkT7l`Z+f0-)z2-suq$$3G7_IK0qIlI8Q(G
zdllN$B-(a4Y=3pt>RnMtD38qzf)6Q|=~nOUH>?nvnl{mhKH?yFW5agglQeE}F^s6n
zxXY4y(aV3eb1ETlqiw<^w54jr#lsVAKA7k@$W=c&Gt*wLC?|)yyFS<$7Fyn&EQv2D
zVBT-q;Vw{0>y1;9EGEr(Ihy5vZz<^4GImfgzinr3W7t<UhE3=5B5xxg-S=!(F?Av*
z>YadA%=fzL{k@(#*yrnmcBx7*`x{Md?UU0A|BUBvqCA9Hz|nIfr~8t(blJW?k*h!B
zd?TU3-+gU_#^-3Bkw<O8MVUZ;X|_y|B#>S}ob8_Y)n@Jka-A>xw=Y-tFF5v9S&cK7
zH}5wY63BiB!f^J7r895_RrTE3OWB0^y>%k@yTI+-yNXVr)ix^0P+49c)ko*QaBx5@
zCv|rey{Du?0iR>nG>D$o52;`Fo1b2NLAH*Ii+gc*-fnL%sS9h{Uj)WzDBy%9WVTlB
z^S1RdvA_4&KUI$DsE-7ybiuC&x8TgPX;}KVDlpzxtLCT?oiz0t4tDmxWj}uX9pI?g
zJ%1%EDw>*R-<ASwJBv-d;Gc(|k`lp#$LY5Dh={pgJ=@UC$**pSWufzMQZ*D48hO8e
z-c72as`a!fEqE9J8&VbVF#t?Q4s2D9N)=j&wio?Zy#UO=m|woLu)q5rS~D_Pt&)Ak
zHQJ`Z$;TH50HNO@1fSQF&MrT{s_*Yx87@K5#4z3es&W<V<5Y+fcO`-Fyx;DD|GgNW
z<*(J+=_byO<y@=rf}^88I_HfH_cQAmtKn3E2Xnu9=E<1H;#B-g(&t?EZ1?a!Z{c@|
z8qm=8IPAc_y_*YkS&0;yOS`i|%<f#C5FM5H$E2kV>e&-`Z4r@m+qIr*U90Zmqd07d
zL>WPuc6o%<;02d)B{K^PLJNdUZew}OjcW#O=;!#i&-+MdCru)6wBU;ESDLTPLPKwG
zJcu_Nilxn&$c=oU<oXUW?FU5&sJ>$lna|m*Wm}1^Yg08a{rexRiL5<2KJNVCC!0q~
ze0Q~pdQ$4MTio}uX~@~lt*+wd?77T!Cb_mZUBms|wSY{N!}a;Wxu$pituu+O6q<Ob
zri?Ydw38EW{gPK{g=1l5{P{a>cpHDhOx{JN3gOGR*HJ%&z8{S2g!WtM<ooo^M7N$!
z>FEQALL=%@B*jC3?2mcw31HC0fOgy89S6Rt%>6xid3k^o1y?X}GcY-uF~gY=3?c$4
ztMO*B>T!FoBCpD-a$*t_pIVpNh^YB|mc0xSR&&YQV8JT>PF<%~*&Z;qa@$P1XLNT%
z-ri=I4Zw-(*|X}?O!Ea0M`fKfR@tIJmbaZlqBhn`H7AmdGGWWn<-)pxMBtSJ3IlB1
zoEG<)w>4kJ!e3M}w;KAMPA)l@Bu4am0DsV@-0q2h5<r~9GIjGoKu#oUzrQ`0ZFaA?
z{Z~0YH!*Y<?Udqlg;prLl@z9%aVEGqK4DG#7UYL>gP}+C&cJ{cFcSxn#J|yiea>G}
z_dd@&S7XYjPK8YMbSwRCy?%*o&=Ar|?(W=VCnm@Dcjn`z)PH!UZmDFxdDt<lJh3k~
zM*QGUOBa3A8u3~fs}i@bU>-Yb^$ojMgEwcX-tN2ReTlSw-mTIK^74PH2Ssna7tp6-
z^*;vt-yMcXeRjExP;d9MmL>r;f4RaEtXLkR_V*9kORLAexyA0<Uu^aSyjZ8L#g~Ya
z+=0-+UpviBDp+70Pe<(WqT9S}5G7ny<Z#Q4s-$UAmf^$YCitSIeuOM0SO=$Tc!vA#
zfmu7R5B=%DrrSO5X%G1(xu$c9E2@8E<h8}5EP1*5wfTaDnW_5k0Gar4^qYpOsZ!mR
zkB&&7cB0g!O#kthX8-!ccgWz0*R^+<UMr#Fb;b3Sk^gnlvf&_3l96BIttB&^$Ip|E
zHRMno`swNE%~3QhZp)YWq9WEduYGNANyo?CEZxovzgHUeI_7m8%@4MtKYs!e_R^Be
z(~F{SSjGq|OuzL-x3O2`Q2V788657J8o~P5^FL1uyEcDp7JcY7M;zN(gT3_886jg3
zCq6B<Wq3<;ZNjlZwb{=A`O7oa2}=Skk!8k%-sXe0w3893tfr<>`QCM|)V|x1r4bR1
zUknUYg9JF}5H_YTy8GikGc$8xsy9Zo--QRt_wI^^9rHFHWtCla^Hi*T2KHUvdiLJ?
z1Q_?Ma~%}&pz~NyvD~#m$_{*sBag{USvm;|>Zj-e-umZ49m{=VK-zP!c6v8>EHPBh
zR9gZ7S;G#S%jChezfofQ6y1-56gn)$iYpH9Q&&6UB|d)kMMITm)&)I@+0xNOJLneN
z&je7$v5!_LTdhsv$!Rf~ANmk_Y%9?Nwmf_>Xb&HxlWjN*X4JpnmvC^umUt^CkE-EQ
zaTY~L&i}KzFO~E1UZJ!9cYQ*Q|4Z`vBeQb)=As6HICw9=VO~fCH>6X_($Jw`oT27=
zpiy#zH8>q8Rt4>LUr^DY5AE=R4;zRpW@ln*-hFMJ9Bw<8EhRS|I^^_LPYTk>RBO{V
zRwCJbfw{crc7jAFsx<CEyACN(dCINd-y2EY%)Wg>>>%lYY3Pax`%HJc`DVfQeDT)L
zs4(4q%d@P(3A2~X=lX+U8sG5N<ExJ&<mg#dMn>8rCDU4`KBkXPpx|pq_|TXN%k7K*
zn+2%r@*unO1d#aRZ^Y<#OJ3J04Q8bsjlOQEx`krL+V&PNC6(lD&A9bp@Z#Mt0-6P?
z@T$K(t8b4?j{HPuJEvs3HI}J@Pf~Yv50d0q4F&$jbvW?uvn_dRom$(pk-u-d!et%V
z=_M+NNO(ONz8gXf$N~|S%&B!eJWq)I4uj|pM`ejlcYHJc4M(*93{EoGbfGYir%qjW
zdE{Gn9ucS_>UTcrUR+A>oq^FF?<uG8&se4<rKMp1>Pn0Idc0GvsCKuG>2$&z^rXR8
zPS#E%EMEdncf`0JrA?+y6m-3oF}nJl1hL4acf|9az9^*Tef-*eAG{e43hlo{GG~vs
zHK|D5^8c_LvDlldy^S)NtFbE6t1mD8CfSIDpiEFkGl>*;t1MD~#@>h}loEQeWcopt
z@9yd|2y^vv8puAnY6=Kw-trvmx;0;(E8L&KVSyXDha(ET$-bFVM#0m0vs`+0m0qXY
z(!uNQK#X&WJLZg=xX?o;rl-VczZhL4cL|jDVIV1f1U*_}En*dl-u`wBSQIUHT<jE7
zQ{jEgzIKf^`p2!Zp&|LlFVP4Ep4OV>e4qL7t1_eZOiVmct{fNmWKwdp0NW9zaossi
zJ3#Cj&X>HePnVRbM7$W6+jG>1_p;RuNvN_+nt%WO?I(4<axPhrSJ@pshB37{mMa2?
z0ei!?!Tuzb?Dw_J8=2lOn+``($kQoZ7WXvCH2H->++1e_FE2083aVOfr}qKpjTR_2
zc?+94$-H-GqsG^j4Vh1KlO4(Tu^dY7D6MF-mYTReA0GG%RQ@X}{#T@L-@ZNTx(+n&
zP2NF3m5}$Q-(_qc=*r<q)_u$J!9n~?gO1(JWF#Y_h}d|$5aGVmrpu#SHMhKb*K4Eu
z>m5G?<6#r)&5vIv8w!V1l43p=l@<Ah49}r#G3G{F6Kq=zH@+F%sSG=Zf4a^vpg**6
z0xWa0Lt5wU+HcQ7XIYEP`oK|7G0v+~FOr47FuGmb3*$C4bF6v)WJ<y>is#XJ<y&Vv
z->coe?Yy|phvbA0y$6jbYe=0+ngD)r1Edc8pJGX5+U3Rz-O8@ypVaoh=oiXvCVjcO
zBl|I1Wscok7rg&;nT?ID%?;j4Ee+GxX}+uV-pmPk=@qe}J|Zr_O1foBE!)iBQa?4N
zwY?*TZ|TyCKN_-ZJkPq>v{Qbf{ZWQz#v9B#F8V!<tB1<Dz0(i1SHEmARi-O`GQ@Z5
z*IrY@pXs@tQXYO453;0&b3=P4fYy+pmerp#$~=ITY_y#G!u!cxx9d3TbD7Q~M*F&g
zUr6AGv)+gO<e8b#_OPOg*3tXn;!hpsNd~XqzYmFN@<C-~O8FBc&$(sS)d@0g{Hh5H
z567KbbNdqyk}hnNe%GoD5~s$zl{)wzn!Ylsj;?9;;4VRfb8sgR+}+(>gS)#02s~(l
zySuwP3GVI^g1bB1;r-VA!CL&_%$eQ0cXxGF&Cn#ZLQ~>82_Ct}<tCCymMCyLdYkO!
z7_RE-$~vxUkNG;m75x4CcmM9i!{Y3Tg-YGW36HLw;|p29b}i>~$Ub=&AJAKln+ITN
zAdBh0AtmW~-xi9AOMX<QrJF;lv~&^XVaO+SxV(azkXw=)8>FZlbZqQD0JmrA;NMez
zp%~^Cq{x4ZwY!_kJqTsAJrgRdT~Y=h;PusK!xx6n%g4qyZUcXygr1E|WMmLO@EA!S
zB1*faog+^OlUad#8`61=#w<ypFD3>?%k>1W*Y!9j9)H`c1fzOSBH%ZVX1Pn%Z3fA9
z5&**iPm}#=t(37+TC=5rRN|uk^&UR3-^~vpT@E9+D@d7TS)mCIzB>e6i0^y|q+~9a
zI=wsY?Tr_cq>q;KlHgbFD@yLx{y2$4RY;)ag6!|@+mFi1hlYnQMJ;=)uY?c^eV)3Z
zHjMC-_<mcod(dv`w?7F|t!T{c@1;B3v8&#b8)dN+sR|Z^%R%srUHH5`?t8sl4xSeO
zfZk!%^PT^r5H@YoIN#{oRkgS(44v6U1!`n(tnepyP3{Yt>=TUj#(q0gy1P%*G(b3H
zjG>m#{GEWOnt|G1jHcng<qGc)Ow;ctnI4{4>i2_!oSi>Igh=Ov4k*|PrK{=0(N8)%
z=`?EY&(75iv9Wn^#L$I>#1G{Ub6laJ3qnwXlte^CR$gCg)46!t58HXaw%=d#d5vYH
zp7{6Hxa@7XbcKb(!>uM?V;{DDjwL}ueA;imWulrVP@I?A|2}57+N8cR(i~MJz#odP
zP{nvhYnBZqp8XfdVT<44pRi|4V0rFOPVQJ5v%c;AO-!n&rJ-QR^F`?CGsMwoahyVS
zJz4ryrBC#-e_e}fw0dkwxK^|g@a}j1-!(|op3tNLI+>8)b&gRX!JLebPw)LAN%;)A
zM}TH%`@b_Fx_fz%74;N4cr&pDPQGD}I-(|I`H@}B4Oe!XU4DfXzPb&T%4wyFxZvOK
zC*7D;Ekv2yQ~hXyW6SjmPMULHU-q^oWNE&t$n3pv4O-$Ql2sL{+R4`b+u!|qzVAh>
zw&RuM`4_>@vJKrN`}H|&dhA%M*`8=LnfX46tywi+0|i){Z3A*LLrQH=T&6VTwh7K?
zDPk)VJlK3|F!;OsdsnY(H({;1ErJk`#(vLtl?jOsxuuf;Zz{ujdq^5Wvp}URgZE#h
zOF=j=7^;mp^jI>r{UgI?Z=P^pEE42!^6chrt{4#!5)x{~2u$p*q+o3P%UCHfn<ETW
z)pkVZ_W%W=HN$o#;y>?tu1Zeu`VpjwM)76JH?)Bp*IA3z;lF9tH3busJb{L4)+X6W
zOEg$iLMb3N^q0;HVDek!!KO3%R}p3mY~tY%1We2IHg?%$jgEtIfchNE;I3yV5-2po
zjfD_j2(g&RaB6I}qW!UHl35%O$UR&6dSlpW?)LqAuuS*V#M<FP(<>3TGlj4)YQRRK
zNI3i5`8g;;LXMcnH9Xt@X*lv|P1aM4>$U33zESHgQnKdA_mzqkDbSq;7X-RUg%Bsr
zL1pvCRl2Znd%$M+7^h^YrGf+wxqWxLibj{w*W2YbH~L_>cETZ+PnN2dN5B&VBWXSH
zD@(v&JzQ(LXP3_qjbo=XRTu3>bwnh?{d=!5JvvF5_K1p$Q5$D;AzF92v%k%!Nm*IB
zYE2!<E&ys8@7))eUz4g%55AV5efssO(9jZuWX|wK=ewlk%x|j^lR^y;C`*KsW+>F7
zQPKHLjVFwg;62F2Ru_?8;5GHpg}&<^4->N=2wVz}8{K?4FCJncWdBK#!2ZZX+++^k
zrO(5KvB2BI4&w1wDAB5~7PTr)V_6)luB&Rhg<kZ<d9x;|x516k0cWlI#3m+$JYFh+
zcz5Svkm7zp`xBY<wzw!uP42Mzr!(Ahj!h0L6C3(IvfWePU61~;Sz7rNVt}4=Na1+7
z1MsmLEDos<ujn-N4YjZ8T$VUou+xiQ70w<bPH&-Z&Ns6wb(@`!E17gx_aIM0(7O|E
zZwnIUL1Bkn0F6YrKdI|MVH2&xelWFOiqqHdt-zuNc!DXiAJJ-|%=Xk+5{=lbAOE<C
z2No9g3V?q{{UnwVHbgq_T`yO%vbZzuCmX*W+AbwV9siprqKG7?p$We`U9}O#c$g*1
zPc{(yN>id;Z|?t<h6cdcVGBN+4t#c#pEUe=f<=$%?ay^AkG=-Hy~N4+!6JZTlCBF$
zAS2eO+|M`03#8-eDrS+9yWDFIixLulf5$_jv(2@^frNy#oSCs2o}sKSnh?R!@@U*S
zDz9Du$Zn`jkQ6O1#5$59piEs4Q)e5Qjak3Md$T3pmXF!oY2d9i*_Brxu26=QXyFFp
zXa;`=xLHa~m~R5ZS!U@&_i^La{`LaxIF+Wa9!Nt9)epY+F+{v|#{ED3%K2$Po$9AP
zCH(LcD-8}i1h`98V>HOG=)|8CvW553RWt}6y&lKj&AO&p>Et697)Kf;Gk#_D&O9!-
z@jxdJ2%3hXAKsmlEM`3beRZjQu}yX^T9>UzJRRpF^XiMo@3{B7MZE9ND$y#xU+F^N
zhV|#<0G##p5P58ZW9#|P_|)+rK@ZOtzX@WV-lIv28izlI*c+?!X-^H7+c&XaaMMRk
z(ZFKjkpxu`5ptceB!UK|L89h4o7k^%x)uK-5+gO8k3!u1wvi5(@=a5#(t%PhTkY<8
zx{@f%)G9_W0wn<ZQ-uRW_yoD>bI$)!gU$V(CP&8p-nTBe|77@&zS=bnx*KaP0ki}M
z)0rR5|9UeEY^&vY1miz5A9JkYF=nItxab!ad%zEPSoki)!e%`ePAQvov7qbl2?HZf
zuoLBgBE+*0S~a`QG5Kx_U=ycfvm3A=ARvk|fdJMQPjcvd*F9M3yn!a=<XpVMUS-O9
zD@FjLE_IV2VBNx00VE&0&B8%-GxEH(TE6T#6OeVodD@XfBMoO3>e6b}2ANFygl`+y
zLCafR*q|Cb4K8FvZ(tCWX<73a8l3=}ML!Qpm=|Ojk89R1)qhhBz2`!b_iM6U7HPI$
zzbU5VP|d!h1a=vQ)(kU8bKA+^UtrVsTHefH#*xSUTxxt}LE5C*VPj$=b3vb&sX+N!
z;`btLr<CoVKI{wy-cuOytXv>lkO?^CNQj|G3!`Aq7P4yEPS1PFVbh$yn+pp=xCAsb
zg^5Wc6Y<O?cK?=kG=(%G!MaJ~xC4&X(|Ar!g8J&vuxmVAYsjljQ~gt<p|qfmlf_rg
zw5Np7)hRjB48Z{ZLJ8D#h<YYXoWYaQuFIQE2ghY(lL~uRAl@{uaM#Y@-y}f&g@}0R
zygywX1Zd_Ox?JPj8v+xBoovCRx8DCu7YJnyaLzie75qvLaEI3m$2UQ%NN4~U@C3;J
z^%tBy3PI}R1a)2dR~~H(R;}k#J@>Kad=<tYW^A`k7Pkq(@*6EqJ8KU!8^u5jiWoJV
z|6Gy}YBxJ)ex$#p7R@^Islkz3`l3CRnMcGvj8`~75NMK&g$@V`FZsT|^IyI_CovVB
z0<~9pdID;6EU>!i4WhwzIqqzo=#76DVipl?Ee+IykL3z5x(`5HUIT2Yc{~5Uo=I|?
zo6lQ(<w{g>8th0(`8*Iqq#IW{dEpF1C?cWm(^T077r=sYyHvconl~1|bI<NSh{3od
zZ|IMxxmvmHWCMzYro#*1jGljcWfuzW!vvaJ?TvdHJUVj6NJb-@kNb)7BFA~Nvri--
zS}2}R@an=VH?SSw?U{prPaeR+yl%d~X18w+Bw+p9t#|m7<ovD&G%EsX=Dq6d<am$V
zzl@=wMFPO&R$V>|{F0?5Nm$0ORbv!X82N6pV<P`?8Y`~5RD1ajR%VF)qMq?uTBYx>
zetzd_Q1ZL{gPU0Qz>#*RzoJT=8#B$S_jgqBorQ&E4WO-_F0@XAir3_`=82K<*@hfo
zVTg3P<11#(0$K#R_(K!3CrI7)gJzhSe)Qz@%*gq@sR{#UjaA6!0w9HPJTfUid(QVb
zqvW!r{rQUfECzG^N1utRwsf`!gW6m^(+s!^o2pg`!IWL(FQ`H?%P2Hy0GFF?<416M
zJZ_cmcl4W9gIU|I0Xg;(81|JLt<~*lU>v_7TuMQbhG@lPqaxA`F&j<R&15SeR{C<v
zzh-7!V>1&+l@dsHD|058AMMnlc+nOLT?fH5K?;>)VBm|q=e`1s+8mImQ=j7<)V`p#
zFPD;S{0Ec*osGSvP{|Qok?=lAU%1sxfSq=_*b;udO#;_ikx8G%MI~*=aSKj>H%aL|
z6fyDeh5;?|X8S$_9rZaR>xR<}AM2mV0?@j@UE8xN;+)TCHZ@;qbdiw;{ywWbbX_#+
zD{p0}0^atfsBHy-RharQcpWG!GO~GQoxQfFH)#!H)8kfC+*+1>q;xu}-3XhV)5hfW
z&~4mx5%s}BWjg&%wj!t?;lIFO(@560OJux5JcfrqE5sO-PMd!B%J~u~b_ZNrY{Da^
z2!Vb|Qywcz1P&eBxWV7Q1$_ewrNSi{{pNp(^;amd(Rn*WP?ihbP!K^7|MqzONQ>Hg
z=ZY)1_+E9FOQ5%|jFSl%bH|1thneF?_=<-c!a=>`_v?B`Zmry{3@>K6xL97OxC4T!
z>;r<akmAu-vPlfauinSrvx5VFW*Qwd^UYem-Q6q;)Y|PuSkISTp43ks_2&baJ-|p&
zk;@B@MrYH0p#l%!mo*WRpHTr^xU*Ipz^Fa>(Q0bD)ka2ea}1vMT-)DeOfcWrWrmq)
zNUM9c4M;S$IcWs#8sKaet8V}5wkMkpk6X^I@pNI^BvozqbVV%2q=arjdC!(;9|oMu
z?lEqkSRE_$(*Jp&#&JAAYIvIM*0!;#W3BgHdDy>QG+guuB!UxgajTTX1o@aBEA?Ih
zn&LBX`qyPS$dC}1n*TDtJ(w%}w+dPKNrf^a(&0$)>Sq=753cIG4Bm4kN<tG4jB8lb
zc{yHpPk*NG#Vx)qp;>Q*|BBE3S#=}|{|k@W8fbT5xaFaxtS{DHJvjI!Neuon)r;Ve
zivCye`TjmHHLn$r6wN1_&aye#80H!p*<AcHME6=Fs(aE>|NZ->sc*z=Z7oN5F%UJ&
zS*zX(*(5B?6oKg*H%A1g^>~Qv&ZrYMR_z(<UinX~O^_=CfBXp7N8USW_T7*g6NI+?
z6LhlLJSppNYykLG4rT^<Dg%x+E2($0vGUE-($Xc@<ZSh9OBe0*>VNe=qxlH`vIvif
zVH$p*{tWD|#+};%drmT~jTO^3!x~>QZ9<@R`T`TBx5u#j60e-zTU4<)0$2g!eRcp~
z81TCBu+&nE-*Rfu<HB4EPa8WCP|+AKS8lEq5QOwXH(PwMC_ySRDk>@+H%(`SF6R?T
zrHa2`;tn?zIDu$cEf-NHqjomPEl#``n;+t)rhFooKqoq_p=pi{;4Q3zJHpA5l9e^>
z3qdeY+cyY7M{X-}6@(*CVRysXpJ*G08dr<LXO}sDg1gX?ZZz7^f&i`dq~_i5)6qo~
zXZx?nI@rmVahAz9KZhw-`(3l@pOZmcJRk-puwq3UJ|4~%a|d+&RS1`usjQyOp_r|+
z?Pa|?Su$;ilKF&>GvcSX9tKa-$?geA9JZ?mZ^pVCWB~LGBleae@mIX=J(+sCU$)5B
zzT5n?^g?(<HOB}{I`Qsg(b?V4%a(Y=U>25N0I#V}@}>c=oF|&1i2(xt_Oi9J66d>_
z5(RKg2_G~x%uGc9+{&gmw=s)Zbt0F|7-C?sMY;O=NSQ{t^@@QRKW-iKm&fv9iO~`^
zkLb4Yu`|bRg~$1s0l`HBA4UWOgq0~PBfh|dIy9w!iT>MtFaobPs?|p>oWa#@+yTEG
zsr-3<AuXS!_?R<&4-S3=MAzF!H_2MJ#Dwr>4NwmUO-YH!ST-z7Vq(dI7E|j!B1U^N
zQ?u0!x2ZLV(0`}mY0g>tTvjiYCN&OkbCMJo4>8Hcg_`}>4|rQ_Cvu7vv&`om%K0jW
z>RU>@@O3jTCjk}G!HOh0<TtdA{#w}$Qs-C<BQL|dj~byv$K{U=UC1qAuvlq*UFTgX
zb;uA@*6e^iU`zsV=sqJtQQ_3wew<Gj2DV|PNVOBktd(K8Mqy}TOh2NKc@aCk&8n-V
z>XSGXDI<Gys%k|iu0gwjodh3C-q_;gqZ6uEs}}%uRlIKwg!d;<HSk({ia{zPdx8Dt
zk0~ss9n=$0$gRfVhlGYmfCBpzT+P@Sp+*P=hx!lDBp1WF8z=wKVpj{?Es0|n8o#m8
zlyLQ#<{x-IcNYm@Q{Gn0sv7r?9MF-YnvJyKP|K1+hENW?$<RJtbuu${hTwg|>z#EF
zkoWxNnOfET(=Q0<e?D4?7EZ=5*TLv{Q>*u%*s^<(aGAbcn;)ZcNBkF^s~d1VKQorX
z)<2V<ADQp8Ga#42rJU_}3d*38#}4~+ob@qJqY<BQ27kYqvszs;Kbj@&x`~wCe!we+
z&bcY2OB^&F7v$@(B{?xC1GDrdoXU9bO{PpfsV}&NVnTfX#T-*$A6$nU_A0RNF;S@7
zY{CnqWUgo!FknGS(e8l4l<hP)-|!sgL9=c%CmXftrJHi>IzLwbi;39-B&2DAw{H-O
zNZ^qUtmE7Nu_DH>JHR|_)n-Pni1EMbc%pc`&99&Kq!waop>QCIvVPS^x$_gGR;p6i
zax5o1`fuiSKYDMgD_HKuH4o@=f9%lKB%Z5IM}0dPYPv2b^J4|d46${|LTDOBI?%>(
zfbnUSfnSWCiz`JoETOV+RySjkZ}OSB``iU801^r+mCuWHczF0pl{^%EH%-z(ZFja_
zX!<=-A(My2_rWo^z%%)w;D@V^(P#EFT!$moPZMTlabCT>N8AQ7hgPG1fIm)i_4V!8
zZGv!}UoIl&q)uk3jt1|G#7wKujZG1RCHc^dtzg@5yFa9aVR>bhsh1~xd%=vbPrVC9
z6R5c%cAFga!BAx!u*5@+^0TN=L>`$T3)uo_Y?CQc>g>?i5Ojrpf0_QD&_eLF*y}kt
zfIUq0+~}VwbSP{*UjhAT)v>5lh(*Pd>SV@T7{2Gf=o5G_g%Vpi8&Fwz+(s5w%y7~u
zI9PN<YNco&Uot0`yDhqbTa!D7=xp8X(j9qq0Y*}~S2E16CcoidBbEeT+ONDY)5zB6
z=G3~LC$@K{RN%pKoVN~Fn(=;hNAK$%o4bJAH5In6{3A(F^Yila4PO&KQcp7+jJktb
zx;+{)bA73zIQL!#$TJ_cXZvgpu#zx$6h4PXMw64V<pJk6Dk1KYB-&#6#Y{rB^o#zJ
z>-L+)8T0+!Mi!CJgU{$DvC6I&P+Pn%go}A9&_d8*RAhqA`k#Q=3(U)_8_;QHxmwD2
zi@)$yN8*!9(d2e9!a{a@?uYl|U+p0AY*@4L>V5T;K$tN?Ao|}gckU@7241_^+4xv$
z%BtBB&L<73kW*tj4%W{w40(Rfb?4V<K>)vfG>|&lC?_-A!U8;-?f0>La`$iRc(*ep
zh>!GI>v#76Q=aed7sl8%+tYk^&J3f2n>92su~$E-hiYAqY|i?o&F1oHM-bnk0l692
zLV!RArns!>>=h_Ist~E_0~>-<|0}~BOY<sb6vT*#*xk5xdh;Vy<-2T0{G`9pupVKL
z-9)_ZH+{Nov5hv1D&0SPj#=nLHOz6&`QA~l{nIQO5)fy7j2wvlx3>}Jg9|dHOvh)~
ziIsNwC1MCm(fo=^$J{+b(!Ur(QY&y_U+DaJ`tR0iwYGAa^`{D}=?rq$=hx6e8`>La
zSXfr~6Rj-YE9uu#QK10v?_VPwUBH`u)=Llc?M_OIvu2t(v=Bd$zOmnys<Qwwt2=)X
z_A3F*No!*~r@{ao$EXg^<*>o`Erx=pPj@yx(qgempU-b{wnD$Q=_XQsB*zB!vS$`e
zZAshdZf-fLYUOOc95<84ZRUq_?W9SvN)sd#Js-I6A8-aPs)RVdKCJZq@Ng{5mfk<z
z-!Pw9k{*KGY<&z13Hf3*L-D~jy_W7Q*}u^y`l01(f<OX2N#h`NfXV`_RW>;p5vE^n
z@wBXf8;y(e*2;dRlBMO>(WVVqf*_>ft1{^10sOMJ|8(0DZ*E*AqVdIp(}*jR8GZqX
z{c87s+3T_wm)m<NjiV+gDClK>`rUDVh<B82YY<y|zg~-PbU!M93JHuTxJe8X@#efY
zkvX~vyb^Z-+-A+j&wOmP^o)yzRdcZz%ICeBU!mJtbwg5vK3}eBF`Xx_7w~%fqzV_9
zB@&)_=1I~&dKQYVtunG0R2y0wM&h3W=zj^FKKJ+~6}~_{PATZsUt3r-{KWKc&+(rt
zom)9J9#SZTJcMGv$e7sdg6lZ@VvX;kGg^1ya|)XkMrvv*a)%k|ytTK*yoAi~MyAiB
z-Gl=}X7k(?YCvq)6U`})`ox0IWyPP2$%Z{Xgc`heJ*QAr_7^yyiFw-2zl&?FKkU~T
zCx5c-*<ZixAJp#l=KnZQ55IN{0s<6g^Td(N$J4}j2BL3^-64~$GbrezY1cdo5`ubg
zax5uU0Rz%;*?O;Qh#CU5mz1V82dAXqBhn(j)O`|as3%b9`K&`J3p=p1lstX+#_*07
zDs5V~g@A#9qER|ed=+O-zC_kl{oWQyik92sj&Oe>i~LoN=lTBRBb_q%{T3Lj9Vk%n
zIkzqsiHqG|R}#H5zki36*kGHPAvqxNyZHt9fzCz3yMX0r1|=gZ+HQ0#U%4nrbaBO{
zXieU|Sy-6G1B6zpss)$t)|XWdTk_M8#xUc=-`JXZy#Nau9vwZOt%HV)A<{Cx)Pscp
z3QV}7+ZycK0lsCW*<lj!k0Gn6vtCN0NVnxh4n956_c3->{Y%==v=)8G7U|d;zE4nr
z1+`B%5XF3E`3@L~`{EtSzoZBRKRMp#dthSVs~j%s+&<H71U&k2mazU<TGB!#<jOgJ
zC7}yRp)EunTwv18zxWN5iV5I$Iv7=rRRAH&^FwesEKJs$pBw|()5iXB&}I=u0f9uq
zvulQONF7q1)Dk);LIX4P^!F8j@@U!Q2+9h0^XlsxyY<L-{Gf*U9@c{SF2<njTOWff
zA0|hzOkY$V!rHLM$KL_Zk6bG2pU5LDb1E=6=!5J6Twg71kKIsur~jo3rqDpt>;PCr
zF<U^w%1L@YB+V7isc=x<k8WfW&f{1#^Hi51YmYvsgoGUo7Vai2yMS16wd_B*%s=GM
zX<jvO88qZwYP3sUHJDt5hJ*X?5*+lO<66921E45A-c;YlBJ{cCZpG#d=TqDN_W~?8
zSYfWWamy=@L7riW@R<elT)`K~fKGzH6B5I0cpo$NugYy1s%9&AppxaKc@+<4PRQ*a
zScP@{wd|Ner3sM|U7UIRSO(oUWv!nVLyl+uH}(dfUm=|?o$USW$^~ByfurcXldUSW
z{q#nfW4YmKZcb%7$it9C`|>j+1bS~WdvdN+RsZz<9GV9SJm8}fR*C`QEh51B7E-Ec
zw&Z_7;y0u#+O`Q7LDeEAA;IeZ;+dUwxrOF>zM08_Iq3L!F}nWtoDC4Sg30fP3yU`#
zyDV>bg8qEP3Yjy8)fbpRN5cc;2EYruTQ|z&;x>FQ1PA_YxG`ng2Ho=p$N49R6by~R
zLyc#0q>9%><hTNRA!FKwP6pLtNN~K-*}l7)`H~1!bg#$YWS}e2nCxU^sjT&#Sk=?g
zTr43L4<4?!H*dVM;yw@pJP7K6u4f+L*<>*t@YKxdV*|LCa6tQF0Svx*c^MkNW&_hh
z&^cEHB|E<#0_#)={;n6ba6_}LUOsgh1JUq#X&GHLd!%N)6}3l~9t7w^IkH>C{tw0<
zKMvALYH>PlHkTJjXkVYwryJT@5(hV^zmmsqn!oSWF5bg3MFn&%etzex;=cq~oU2Je
zg>n}}l44-wX3%K}2TYH+oD6mxQxfnj%cC=6v#=$SGTiv%SIfW1B`sGPN;SPl$Blp}
zgrLj$9Ep~Na3hn-I2H$qNlVe12F?q~%13>;nXeX#yW~#28}Zz)zj&h@>|*oo<HehQ
zu{xoM?T#%5u0zY~eln$LZ%7fcL{V4)bpjQ!LIJoT{?wT*WS*7KkgT_R>;sndqJa0e
zKl;w_o@=uLjFiTElB=A7WW@<QZbzQJN=j1SKI5)0#V+*w=-ln0HKm_!!rdSAGjV3{
z1)=|C_yWCJr(qoRVUz@lq3%3%N)#aKT>J~j{x;@edceEHTTgg(eU*A&?*>N<!FM%8
z{*?Z10v5}48t%8We>+~R*5nKjBqb#c{IHoP(recFK3@H`f5Q#r48oDvc<KF34+5&&
zevLdb^w!C8J)8YnN(0+HukfE{TcMesRYk|g)inJ)h9iDZ_H#dqkib>9MX<DHxJFD{
zMz{b+%xd5DXpTz6^X~}`o0yu9HN*b3ZTdapjm>`hRUsNswXV01NxWbE*2QgY8Q{=}
z=VF;j$U;)g9NPI&vE<p?4~x=M_?D09I}n+t0SOOqG`OF2J=^<9h9^PVntMzlfHUr_
zqI*sdgrGS@qj^GWr}HJR0dGaiDgSqoU@L!Z$=SPG&4jjjo6B2K2TRdIp$v4g#dMy6
z1fsylKvC@7R+oLx4`V1`z8)SOy)L5YrUZgf;4XcGKNZQ;*^Z8nW1W&@apw1fpEpCJ
zl;NY}j}ka=y*#fVP%Qhr>*l0(I~`1c@!74#?5i~24{7=2<m8Yw4ZJ9U4dDfvE0Yyu
z(eJ&z`v`QC$a}1$m{Lp-h<3NrQg5%WzTRrNjuJ3VB>JCP|JP{cX6DgXu0i{1f^;=L
z)LcTOt4eTWb+2<lr!qpZMcqR?3JjIF4xP6+09Tgz6nFy??iHqJmfefnNS-Q{q;4MP
zEI|gE*iIGL1CKGk?}OXV<n=fjOxk1)p{aQ5hM@6YBN6oPSd2`;&H{I7@by;_4gjtZ
zfH*({gDH88_aJ8jJ=k<bi~11LYYm}djhJbWkdQt+`^dz6Eq#hHVD&z$g=&7cRrW?9
zL^Y>{^NkT~qGxMSC{Q&u&>v1!Mq-xU40&ut*=!b~fC2ClFzK_HjbME^p|b;Y+L_m+
z`uh4U=Q=(CY^0QRx>)@`^B)3-?I!OVuM)B)U%+5+6rjQcTnqMf4+!S4yg@9rxs`Jk
z0MCBj;?G-cv~drg#z|Wz{|@HlmvS^Jy)`ZlWDblCMGxbzuKTO?_l~-d5b~ugno+Oi
zXR?9!e*lh+%g#0&Q+$&ZG6Ja|FH#6_|7tr;!}xrH;-P1HxK_bfy>Xz#)v65dRIBWr
zbMU@PEmTWjR$5vL_~U;7Fsk0~*&U#JfCp~C{QR9QB$ot$m=+%K9~l+LkCrqiwMv7;
z2cFA0#R^4{d}!;1Dl6~$vZxzm1HT(}l{aY?9hp>s)5rxXPsiKSvFrJUe!vqBSWKBW
zIN{2it+EEN=nw#$3O}`C)=iv_xHbYJDj6M5gf)BFCtdy|;0xxe4AVmf5ZG+je$q|9
zSD|Vml=lV3Kt=eJLfU33Vg^cQU7dMw?!6UEkrrkkujRz<@9*=jeHO@gWE^d(c6oZ-
za=b@oti>?y&6V?cBL5B*iQ`Q%r3CNPBcv@wn;(Q*n+hwQ<lG8{hllsW9{Yr^B|bCE
z-TOTnMofct(J=9Fm?v9Yxa(OiFm29CL?yUjhPeVXJw5%$O_E`NBVQi}7NB!`3{J&W
zWF|7WcRtx=kueL#dL8d+uauN>0kMLQMP^={q?nV-QFSR^wzjFozLTGM5Y&RDw}rsE
zLZ5;@$Uy;gQXWs*W}A(O`DZzG3**nrt+-1K=MFp^wD>TjHH^Kn917U*;F%!m!i4w!
zrcM`<w1~sFDS5qXo=j6-@?gp^#WZiTNsJK5gmb7C3hO@$c{a|P4%Pk)P(Q33-hj;X
zQyH18eKo)x(DUj_PwTe|8}*C7F)I`2Ztd-&4DnomXFTg069Azug^k|~B-vrhs)%4#
zAJig_HdoGvRdI@h(TAW@hoUos8f)gMqo88&%geq&e^(giRpxJ#dyMEq5|fmeZ56k0
z*m$`HUdfw-VXI3b(rjnN9+SZbm@-tA`9}^nUwp}3TQEl{KA@Bw_&2){f$j5902Jyw
zh~N)3I<ZMr9yPgkqbXGDBkG?xqQZnC{Aqwu!W0?96?u__SB8^<wjba?^1-h`)iu0b
z#xNMLfrf>iVK1du@AIqo`7I+BA~BV(j`ls6&wkAfcJ+L_cnMkWjKL~f6aE*P9+V#3
z%a6)0W32yh|GE52kO3hgAj4A>MFeL`3p8!Q$(j~229ljX1xNfCm!(~V!i54ZKGk7Q
z&T;zO-a>Lu&ssNGZ#>Dt!)a5FVhHszNh)1P79s_qQX@a$EFyyk>*-^6<!l?O9|X$n
z&AqV(-jt@B^fT4&KW~z3ayG66;!1CH;=dQ=q(N|jBx?^Ek9T(E&c^p^Ddz9Mr%_Yp
ztxlwE<Fz2T+@C(TdX+IY|6HQ0g@zB?-|g<;ZWvV6Vuf(*bv{7=38}nN(Lqer*skjM
zK|1nNDS%`|;eVlg1E!B+DOwvS@qCni(f-5fGC0|021<JB@(>dBmh?Vo2D(10vX#-$
z*9UXp??cUpQd57bpw1JM@EEsxbHu7Ju2{XlqX9caAZrJa&?9py?EHQ7KUx3LG9rSZ
z;nC?IOmQktNw>MU=pr3x9p%yL2-U#LZ#w@&zOF>{`-+J}C^5Of|6hzNEBh1SgCG=z
zHh#OLq%$Ch3JXXornX@X9=Fhd^h`rgJ$B*|gd)A8<u`#xlk1%8w3}Clqr|l1)uW07
zCmVu>YNWgy4-2g!JA}k6p*vUasHj*a0*-jMg#E<3^5nRDaRB2(c!#gqWaS_6>2vFk
zJI<B@g`i8;oZ>;D<KZjxr@2LAeiOm5Gblt`2NyP+4T%QVY#I^wX}}nW0oU|fy`yB}
znLyWn6O#Le419xoqNO|>0DK<|`rE>47iYO1$_oe;StO#Q|BDG<SWL|Tx#Lj`Rz8S9
z8Vx!T<aDjTPF)RF$roh0d?EV}?gx%bYaa9oXIeWb%*h?x3%;>kkAGs1VCPm-`w9Ht
z9`EK;c`?h7x4HYCXc73^Asv<<5aO^f`^*{p|L}ITN(#*ZMSkkMt8V6BJ%W&m-!5DZ
zWp_@Xc)I3MzXw6?AKaP%5a0JIst=f=z{v9};b%xq%ydzyl|eQ4dVG8PmC-w4i~9Nt
z{U5)T;DjAoDc`>vdmMTcpvdT{Z3JHq2+Kt&KhSY%voW3u&&y7ioXm0$4ZnsYJUA3x
z(L@$HA}Jf@djYJptL&MC)X#TqrS{029#SSNFN8`=-D4YXii<Mzzy6IUhE6A{JU-Sj
z(%eZV8KjtGA*4(LR=SFmAgXWlKXp8nDrJ!WySznCFcpZ&66oDaAX-rZU62I-dq5Tm
zXIbjNp0L?zESt}J|MRNv7f2%mZjxbmWjd1V<SGv6$F1SN?f&bhE-(mXxz|g`@0M_l
zJCW?z`mW4gS0?Zu(7=~W6No)_z9Iy^O84}p)%JH2KOpkDa5Bt>Ni3nrU?mE{Uw&;W
zrVZ0>{*?Ra<M;t9D*IZ93=g(c?uPMOxdqd$l@7kcPigXcDJruRBq;Y(t}JEc3%D4%
z5HKaZ2YeL?E51mD?wQ~_6&@@CPFVfX`EAC8>lgO&|Hj=lm8C<_kAv<GFqFa2(g@Nw
z-6h@S{wATBDMO#18cs#ae^lO7*%*C&J|Ycqw6;)I3+D|YBM*%_K~_;LPI7Dw_&fUi
zzU70^<7-Pi4x*TMkoi{P-7+7So;^4wnCTxz60cG=sLE+XqQm~#6Jd2Kg$&Wb(GI`S
zNquUs85#z5y3CmVNq=rq{d)phN6_i8Ve4!Q1g#nRMG8mL{g8qBOEEdkm!bK)bquHi
zPvmT1b|dK$hr)-1g0x&5`g+}4IX2eV{VUT)n7|qVnN=!g5*#vwE7E~_BgBbo054qM
zHvW0ZiB$fG?ef_!$lK|*rQ+4Bp=7gfUiBR!Cma2*m-^wkMio><M1ae+%d&@Wc98R!
z^mrLNP($Z_a3Fzwtx;QmRB$J3g5Y7ZGD|?6b!MWE7f;X7fh6G+iDV`Z(SmA#5|Egs
z1aV9Tx<{{0pXd3{RcWlE`$=Gs5GZcC`?VJAQdW6CQ(j<CX~5UcJs<gIQ8&Q(#Ga`K
z2k0pkdlUIt7JcI3`;VCl<kAR7l-{6x8p!nEbnA;)(9d5Qn^4!O?CpyU{>=^k-M^#(
z)pR_m8C@aM{LlWzZZTP>wy}eGYILqbCw{}uXEt9w_U{q+t+#0{AQt^^R5=nBwxo;~
zx1;j56X3XLM?2?G`o;YTUh|z;9nuJ50a9E;!)dyft>iFa_>o^yG23W-LjLLETEg-Y
z?&OcnX-#DV*ZNYKxO%=%`5E%Tmq04Fw1Z?~#%Lj>b{)H?rej&4Hb&OV3WV7a+S!1A
zV^kyFFdIw}pD3<ZQ)#!6a?mB!poa~QOV+OI`XXk_f=*5Yks4}a<X1lz46Ml+vMZ9{
zn`a{zT>za^5B%Fl=&LQ0yTWmmdSCfel@l+l2l3b+d1iO^n*r93CfH%%0_%=11uXp!
z|K&c^PT-zMcykCkuAY8D3Ey4u`&pW)JJA(_tWUFQd)sW&8iQf&`}|)Qgg~M&UfpIK
zT!O;>Ia|S&bQGUvD^W<#Wm0bcVD!HsKo!V=xnNA2NE8wIE@G)x{wdkOm)39PF4t<k
z=qZSzh=PGDYQPPDwq4!<)(v0m`1eB9-9xVi<|Y46hLDHYvWt5}W-Bz*EUux}3Kt10
z7IwEX?n?YgR^a4a4v#z0nz3(vMz<B*i$TlYYr%Kk7OUq$!E?Efe6qf&5`oYD>|q5{
zkT70jhq4A6g6%^Tr+Qe-<$Xjms6etK_k+7>$dt^q1Y0*!XWse~E|I2=ML&!Y#upv<
zZ8gl?3uIv3UTLN{6^1z&AY8E@;;c10LUuGr;g}*18S;6GR3C%hvZc;ymk!tbd|Wf6
z=V_7T!M_&yIsh!DDto_R)0)ZK-c{U#3UR9RhB|wOZ{iCw<#)b4Nl%z(QFixOvGi5~
zkO6}TPhQWJa6Z2r6PKuXlb$hVXDR7PP(|^1LtF+g(C)p>lJ-XE2;yz+vDhh3PVU-!
z+$!_Hh>TMfp5-?Ue-_1%B?R#|x-{q<3uo#?5LSQ4W<ZfCW>^q?vJ9;cA~?f07&{AS
z;D{Y$g)f3eq)lQ*q<>y`QBY6|?Qh%WDh+^AI&b#P!ja>eVZUy|N#L0;bvgB${ty{8
za~M*q*{T5=0xFn|CgEbrkxYa<966GLjxXY1$TF`le`H7hXY6>!v5ip?y2x!BUcWpr
zB&*2030yP-$2~gIX=65OY8%DZ3x*VbRaJ6&XIP(vzyFu&$k_}wv;I4}K9LP22Z(6C
zf!*|%iUwR2WEGq@RH8K+03X22f@rjbl_+W}5}%=<;b1TcvGkUkmLYAMIt4+3EAjZD
z!cw%Nf!#q8p|zco_jShiusdR@DJ2&)Oy`cR90@3M7$O<$QgM=(^JGFH=!ZQbb`_Fw
zbdJn12;GxYv4~xtTmF!8Bl3!bvw?pni-f-|?QyIHRytm2i5oCe(EQ#m6`&)F0I&sF
zKN$i7V(G!SAoc_5s@#8`U@-^qZ;PWn2Sj2qm+Q&VNz-Qtb#G<DTN@t!*U8)YbioHl
zNF$4~yBv!;8Bhc{<t;iAM<rn2Z>lb!kpm=-1oXcElSCvEzOuA}a1QGF-DI*8jnhVG
zgn5C|q&&kIihd~)t{aNJi3C<Ftdy>)Cg%3^IpOJuJjt*P#!4l@-6^If$nDpCa7F?3
zR4*kt_JQyhWk|tQ9B>L{_!OGH^$(J5)NWI#N)d2bA{NAXU*JT-18TVU{gA{(4bmWn
zg~+C+-qZ<7?BAW2<BP#aQuP5uP%0;e&w+M53XRDQcpE);?}Rnj(Pdrle@pST6Au7b
znTc%FB<$SrUGZaZb*0_aGx9X9@KJ&5GTd{CiLu|7Gv`rFn*1yHT0Q@RBw59uGDM0+
zDk(2&32x7JFm%@utTOT?=SzQiL?!A$!z-6Ae6H=bFEH7QFKJjtETz>YcKEWZmU8Ja
zyiZ>ISrBCG>Vg5a*##O@^57NrV~lClD;d(@!FHJbBn(aeB=QXjtgzaBhXB5_j+r0d
zgsX|Yd;2WkdvF*vTR<qwA{W056yy1K!OyvW(jP=2zaY_!{KcOukp*BRN`k4q^Y!(E
zbI|PhE4#`FebiLG63xiCnUJQP(RJ3il<&mwf*tVhT8@e6XQ#ABp2-BV0Y;5A@Ni|R
zC(;MMU;w{jqxDy`Po~DNK^fXg8@Xzw2Q<G1xM$US7gqgw^CYo;9hBQ#X_0V3ptoWJ
z4xSU=QvQSaGR#l8d-v*`aj_PP6x5U3_uZ%$hQa@6up;VqYNibt%XGBY@n7S9ZlP;#
zyc+^QZuLR@!}Sz2jtmu8v!&$Sd}NzLcJ1;o=S0QmMwirKD6>2c&yN_IH#Rm;EEXy`
zT`td@2#qD$|L{ZHT+4j{5#02-a4;RXiqSs(X>ZS+H9-zrQFYqrS^jflE@;cfhq6^9
z_X}7gJn=x_Tn$5s4`qkoNYt>kWsLf=7}^LDKR=<Ukzl649SUkUCHv(&<i@iZp;ru)
zd0IXJeVG!C+@RlqoUIzhmfY>Z(bLAeoKXajA~Bm3Aos93yp<)8I<gj>Pb|r|fwa)4
zi&>QsfvPG^8ms~GkRdqxKjzbVVrrgP{JQrP3|f>Bp#K^%ZgWfB3B0;{8~~0J^-rLm
zj-iN_V~Mg3L;r8euUx)IEgV=NU-H5V>z@>%BFcz&6kDjS(n79cY@I7*iGe?J&@~sj
z{gq!d!@DU#-4N|aXk?=O^S*(sj$qEP=71-WZtN+LzDS`G%~&WEg3>Ak5B|Kpm{LwK
z-Wi9_Yslsn@GKCz2;@#f?RK)B&hllkfA2*9b4tUFrr!fTZDHEy5~Y-sxF)C<b_8^h
zsS<Z`KhLO7I#Iu?f!p0QO1Fd+GV%3Wp=$b~6yugs=ZmAO;(pMdEk&EjF@uE|>P2JE
z+hZ6X2%x2#iGbpubCfvK&;H3kZpGw2llZwMkD{oUG8QCsyj~}N`(|O?KixB_GBQ&%
zMvH|Ar7Ydk%~rXpM)ITw|LgEb$8g{r_|p7sL(>yfd7arD34N$tt+4pRV!W@{x_&K;
z7oiZ&Scu}>O6(Bmx|B)Q%JU7tOHaQB|N9(aNClkWN=sONcyLSEs2MC>9nNTTwdvcy
z?$gD%%E)u{|IR~9_abzQ=hHjD^i07sO6(*f1ZGaJ1b5lBDOE<Kxv6RhWbyyfm%Kad
zH!Vn5|G&>DNUuV4onWGW!WZtuSEvl|*95j=^W*D6d-nQvwt7f^xE@*LklFkKVC=D=
zZ{PCue#5qrQA7gk2B|iX$Wd6$L|dZ*5aUPe<U(AJZ`B+!vC|KBK>qTd_F@w~p%dpt
z1&xgScca?D{pxasgxIj%)`Lu2h~EtC3}L_uDm)UZ%kIm)AbCRyOn@SY3QF8ZP<i{;
zjYIj5^~5mw=eNDpP5+rNW(X=7+Sk{6+1xMuZ!<(w4F;+J@@>o|>Y0QcW`Xg4g<uRB
zf)Q94s5;~kI!7&}3ALi%ultywAFQ_+p+3&6^WS4>AxEVz(bn8}?;YR}8b`Oz?yW^2
zO3Z<I(I*dOPI~^o%1r6eFoxT|c9}f)u0N?NmQ8>{`|ux}BaLQx<PlI27k=F3KD#`T
z`+roJ2@r{uDd#PrjFeKia72Z)f&o*t+?$dh8~heI?XD6z8!cAE)pjI1gm92BTh*)<
z$y+u$*(5x_dEYrEi1*y6{yTJzx0*U^lV<++QCV*dSZ3e*uCA}7=qU_^Y5}>3p)ePX
zIK2an1eix$x3{0S{+aK^mOuyQsRyDp)DpCzQL$-NLM9~V7pr=`hA9q>dq`E02d1iw
zpu!HT&|vNMXi6Z!!NJS|VA1cv4lLI6$$RXF4Crl_e@kpz*f#O=57!f$9Kz$e+a4x~
z$&d5GL5MPzsM5qLl_Zi&1J|X5`2jRV2uc3M<lBx$Dgp2jEC$PC7<k-<Mz#jo{m=Z{
z@Pgoj(VnLt209!=l1kZSByiI;&hkQ*jx@liF&$=jKbR}{Cl>=GDbSY$hD0Ya2sO@p
zCZHKy8QW~hsJ$*e=w}alR2hMVmHN2l-(`&7rBUK;7}sfgk_SpysDUZXXcCzyBe&{|
zCy>tg7c6a^z}GjeArIMr=`hT|LKT_f8@*hm6tr?XH~{jsIluZS!~Zf3A+FEE09gn?
zp<)xOAw+IHodpA9t6!Jy6_Q|8Ry7(YNJENt^)sn-u2KRfy&W6{r__Sa+dGV}!%xCl
z;FCmmM^l`QwZ_SMGN(&vu(VewT{>S9wQT}s!**)tp&K}b;(!QIrzHmdx6+cT16?km
zQRqMZ^mI}GcJ{Q7m<VdwlQpu~7Irj3zt?lm405iB6}uYFkp2Mr0cAB`lu(S7Xcz+d
z5n3?yF^rOMdYhtG$<SA(5W&A~^KVk{fD7~pkZ(EJRoFyET5WPIlZtl*iCxY2l}72Z
z=?Bok>KbneL45=A%Q;UPQcfLHiMfiH-Nf2b6vJ}?odrjT67<Jt@-q=fm870Oc@V@=
zbw!<=K6jYnzQRm1yaZ&o46Wp63Rz(FQ1bGDv+jYPq=k%xNI&R+enEJ!hNpUXsFFv0
zoEO#*BcD`>au@_Iy`-+k#c_7zqvf3#u-(wUOofE`5(xBId&MoMAo94tz1uX*!=>6p
z7``2L2ploLp(Fr0Ic&Muoiqvbmtx=;|0LTqnRue?xV}#IUNs8*wX_HK*-*JaiAF{&
z9-2#S+2<<)JQ_-|cBlE%g|0~WD{+7eQa(oDj2Da)Jzw~L;eU$^tXqKh;ht8r^Sz#~
z7GzIOWw)W~IvJth3KjvqEd&TBO0Wjx3Psa&`Wqqi#_d7+6NnCi1_u0_cFWAp*0R`t
zuH0Z0h~?m2aJ$z_Iw!aHQ^=c|rcr*v6~_OCQ)$LMkXjdd$K-E`VSnlAISb$bjP1xp
z%f$$+W5HR{@I=Q#A1VPiAM46vC2nmE=SMwVxit|zNCuQK)riS>RYTN$RPhV<NTWdb
zt-n;b$NltyB<oKS0ueHxkwA1ZG+kk%Pn860nlM53RQ&Y87Su83e>RVAi$#KJRYt1S
z^aDkV?K`wFr}F%f^2qZVfhHgf4q@1n#KKpDRFVimN1DFv*zj9+Q;UsYm-^)p7oXf8
zQ0za_B0fv|Q(-{=9U`e*SOhV&^-@A!2<X=1$DE5{g6JZ)r8kk!2tYJQ$b<5tkA|ik
z&qzGugPeUa|NC|{!p-+}TYutP(XpZjs7Z>}fkh|{NO1Bj`%ku;75qUEK`T@KTk|rV
zCD}kAoJm8t5co=?-5i#)su(lwa<J@;WJgem-~O_@6K@m?Vx!0<s3`nYk!XKV4izzm
z<ZC4Q=)HgQc5b#miNF`TlZjuJK<8w@gS%jGEKSi+y40hQ@6f4d6fb{sI<PwQvuYMQ
z{At3U>L2|GCZ5y1yO5UD=SuvhnXqn55w2)L^@J!H5Z!>EkomT7BOS}y{5w9>?gK~b
zqnGa&7ryt*J3PGQ)TddLz|De$YAM=al%K^wn)PNfe#d2R4F_O{9SzF*36A)(5`qv6
zy2y#>KFXJizgZ2ka;#Fn0&0Apb%-Bcu$zdN3I(x4PTvOs$<N}PUX=!`P<hQ=$V&&B
zV9r)({mAWhdoTpO)E@IlvP9wz(d53&5W<x<iikULB-qrDihlpQQ{PKqPaw$tggb=5
z2ib`|qZIUj=qUp4H1T`{EDaD`p@I+sMPY7%d6{9oE&-Srk_B;zF(wL6ndb#xnW339
z?E<hxDM5*V=8U6-gvH1|2^7xzfY$*oWq&b%DduyV@0=?;QbUIR3At8$2ZNm`EVE3~
zLbysd>(ImCR$s~ofGz@m<4qqB=ySBRn6R3y8=rVW0`!gLd@w*>+8r<eI<ZqvypA7G
zcGNIvcaM9JfT!qY1uYJn1W{D}8HT`yIl5Hm>dm@=Ao_M=7QSs+fqx4#%c^R9rZuDA
z63vM{o73CU0f(rvMCAD<SWxBwY(azFoW?swGXj|EC^(`HIL0z$g~*UeP~!f#c+2}<
zTi40b{OKAmXmo2bJ30t_JU0qybMA+qT!|mx9|Y&A3TO~$&D3qlzmdR*M6}w%e37za
zQO~NYfEE)Mn|{xGd&+vp6A9nmm^+Frf$l+(qD_Y+2&4<G?Y=wzd+4y~zH455fi4UY
zq&L6oY=8PS%4l%dD3lO73%01lOfMA22X1(MDeBt@YmhVT7p+QYwXC?fz}*1G{kWuL
zCC0L}J2ko~9qc!CVxSNs(C+H@EUqjqMi#Ny?dk<%Ju=_!Sbx2WShZa58K!FZslF5e
zt?8qj)E6Q}3*(4=0lUSfL~OL&)TkC6l_%ei^Q20L;E4Ih4({LX{^8&YB=RSbv8yBw
zLkUWdy_gI)QA^teS2bz&;9%$W$gsjT3?M*^0&;VnyKOC+t4m-q;82_m!|DR~FU||9
zv{PP2I7Q;!Yp;0iZVUR{UT}x^4$TT>)0|;Z9EekSO(rmgIRu@&gJO7J86l9M_MF5X
z76Z}r<1@L;2D>8mF+fhH{LC?`I&<b;bR&`Tl(KY6X6)0TY3Yre!GZ-Bp2UoE=5?1}
z@7J-WwtR!FUwl>Y@9oz01QfOo_gNZEdWbTr9(k;03?mENDTDdT7BnDAc(i7Qww<No
zl!s;PQ=Vm#>bn#Ei&NF|xFL>@HijU%K@FORWRH2;j-Z4(k_(J2=NJzFE_J`PrqGUB
zv^!@&%g8~_$pog?P(xIMVvWkn<9hhEh{3;&p$Z=f=^!ou?xuMf1?9<T@8R#u3ARCj
zQzf+h@z;!r@eG}ah6?Dnu%pK&KKK5r-X0gM`Z?ypZ_|6~au2T-3I*A8x9syWfgV6X
z0{z#6pnkEBrv|wNQIG)cvCgrSGXm~I(f1msJ*LDP^mQuFo*YP+jJxP~**06uFZd6_
z@V}0U%n&_D3o9Vkf+{nsm019n*fUR;;T=6~>8?+W8a)J}A<%J&MPyRpE1)8tG=cB@
zn_FA$eAnSE^aY9Wn0@cAt6w&K#}WPk>j5}yW4t3+*upZY(0qZFKgV`UENLkNUg}f-
z>z*{4tc^$?D(w>rod<Rg?w1NG$UMIkZmGe6cT(P0@ewK|iUUR0(QXmK)pDk-1s@_%
z&j_bU8|wPBUmgpVybu}c2gE&OC+(gKBcM`J>b`%}c0w+v-;C##8jx5TK+X|M$UKr=
zq;YV#?Gg?!rrG}_6PKQ=#F_l5;D<NYmF#~Io)z4~Wm^vU+?lVCD=xE)u*&+5B4q2d
zXtw+9Yru}PzaD$HoX^XycqKGV1<=*_qB`NNV84iA?z|WIjf`}wKeuZCSBcS|nEAxg
zB1)3iM=sl@X7Uv$4N(qPq-B3vWgCOm%w>zmmh%<k-YzCf!E9k=^FzEy#jWEjll{1A
zxD2QxaGhjJF~`c7fu1`3mtogLZ@gqQW)V%|)E2rorH4t+AAaew&4Pweq#E__xKvPs
z{7h45z{86D<~45oN+!<|+i!0bjotPBlNtp#2AE+o!0LfIY9J!BjIV1UG`;gLx51R}
z={A5nxljPNLMRyD4bRa@@u~4t#MLu#hG`P+t%rl(p14LBJ{M7NB(M{$gVzz}OM(f5
zcO#*oOI&EWW}VRvqG*_7DTR<RC6H0#1qqyxn>MBar<=nrn3D17*%m+P#Jvzuk@Iv%
z@AOux2u?BL;gKD=e`qPv)qr$GY5?M~FQ1I@ho4n<_G>vB<;fwgGcfpK2UMH(4q)3Z
zch8n9K2zq#fkM>*@SXfir7NtGvo*YM_3dBfq3N%b9Vj_v_p%W2nO1FGZwikb(f9>u
z?idC}RD_cr4c;0^Ey|FkUFl5ozPFHUWLKy*qxS7Z`q9a~f4g<Y=Nw56x`Q9m-^^GP
zCuZ3fC1V(15oRYO{$Fbt9dKB@mgTx$UoA|<XxBvMhb-HgZ51c~#ZXYQ(I1ZpflHS#
zzO(lj_85wU2WL$k%Ad^M;X~mrck_TUX^SK`v9-CED^@!b=Xp75y!WYQH*RiA5<#KM
zKvF|U(URBt!8a@pYy#v2z_fjlNa(BlK<RlB!$4L?0OPSLf0?zo!5&);3=k!lC4>{G
zn3VD0o{iHPkY&v2VHfulhNURC{axtCP6)m)_oZbLEXUQ&*6DtuLs0s_&!0mQ>NuK;
zJM)HvykH(XxDNd|&erWSzJ#uRg2&i7p3arFS>d!2k8F#EM`4;a&0%w{c|<<}NVRu<
z#De8+1swnL7;RXUk<U4>O0#e3qi^%*tLF|-wz3b{Z=!`3W;I@$s2r!O6Gfc?E)NOk
zY)U0S7HFtJ8j-4uXe`|Ynj)G4>FnvdMzDKFrKuH`6DX86Xa6DX0uiJv^~W?R|DEs_
zyekRlb2F!dhf8gkSD;RkMi62$Em;taZTu1+*~wCBysh8`+A7+q@pDkX(*G;&%KxGI
z{{J1jv1f~>Wt1&%S<1dPQOG((WC_W>M3%xBnIR%dw(R?o<sD^TCPXA7WNR^IvX)&;
z*6*3m`;YiO9{0y{&g;Hjujf7I^?aUt&rN&y;gW7xj<zTaei4wAsAuSH<~isc{`F{`
zI}OSDYQa6qj_?|Esg04%sHb5eb@yD)xVT*VsW0lud?DGO*>BC}+_qlM+Pw)((8(XY
z<?(e_KW?bfV#bjIr2};@d&0}*$wUNM*5v8Y>Baer?C4_ImkW>2Uy3t1BiDX`!(+7A
z(hISE!_)L^iH&s&N9$Gl%bMbYIb^>nx$Ru#&iv$F<&X`DJrjhbrl7FJu{>Gc^DtRf
z@J=pP@a^mG*LF6y8hk^)^;kGc)9FB9%ca{Yq0sV+GWd_pW6m1XecZB?m`MM2ct}eB
zm~c``KqRP$26KocpjMV%9P}64M7YWm{Y4Hg^%Aqr{V^1FpC2rPS-I$dnA8E?Kl!$A
z+AdS0-HB<8pAyjsVHC8&=!}#6$4JkV1$p@$j)9S1l%6MlhT$;;K2898TW7?T1hI71
zguiUoKLz>x4pE93lk+J`_!v`tY$rRYEp#R{=t`h*H%jLA!Kdrf5!%M~)pDIc9r|i^
z_cFXtGR-`;vu+}^#ka?j@1{;mcWP@`m);}#sCXX0Nxlu@zai{%)T4orF_yc;I8eWb
zm*6`E<{>el@JD$wl7hWk!zp)injY#r_&y6pjWq*y^+vyU<5-Zj{~BGsRh1CzIhk`U
z<_DhJWBzLX8b2+j@IY}nxgh5H_Y40-MeKQU6uO4#Vj?S=EhWP6$2{mPA$mM_h4{@G
z8X*0PUfd%b^EzD8rKzAwCE<6i6Yt|uGx1<X{GlTX31}NwGv9LY<Mj?(*18oEzEt}2
z=j`#bhWVzAC%>G`TN5}B`<G?=+-;tER!`miw-Mqp;aWZNXVLs{-9-TU84h3r2@Vgy
zHff7{hmAiAS3mk5+V6iOe+@YrgzX#wF?7<Cd_`9mSv^I~ab^zjA-fIcjB`Bz<+P<P
z$eRhkGMkex+pbWf#ffPEJ)&{QxQuv}BwxD$YyCR_P7A=OZ}LgHNGN_KIZlO4HI1}x
z9UR|AsNIg21)c<f!l9EF*y*J0Fsx!d->z3?dHqP=7V-=}a`~?bh?<`g@I-kVhH@y(
z6iIh5C5Q*KI|D)*y#S<#l~UZf+pK>0B~H^9%qb8R+BWN~fypcoKT(~L&hsXh4HU+J
zON_K}1VKFlJPw8&pm$T$jb+aV^Yb;M%8vNXYe1re2Ll|QzG5)RmCkALrKjQaw@*^$
zn&%E$cWq52!eA*366c>7Kw;dHF7k>sSf(i|SlAu}_FqF7sNMbFy;@p4$t#ct?p%9@
z9%I5Vs=86YY}&f>Q90Gu!S%l;z~h1f&?M&d2__?^=mqlr#=J<o?OK$uWThz;qQ#5>
zc%i(l`0g`7;-E=dQY|E4cRp*-aHpLXGE0kKY(Xm+z$6L%gC&er$Acn1VzRkAnmG9&
zB=<jjn@YjrHh?c$V98{nvbt3!%+JlQ_hqf7H#lbe*F?fa^!C5p<kp=Vk^^AP-e;F|
z`A3%Lc%_z->j7FbS1BW_6|u?&675rnTfxfUxp#!~^&K_AIuiq!4^}WT4GS$d(TgW;
zbe!(3a0ImVz2sfdGt6a@IMcIN_(7aqi(W*%u43x;pwP%2*eJo+w?VPB+?EoR20+4U
zf4IN_B;&U;L8!-{uDYYsX}MED_xDU>(SKbedQUZE2V)Ljz6mI8lL3gfh)ew=yxG0h
zQhrO?{=^`&2lz5l_}q0z5evFJZ37{AE35jWm0*#xd+Mh@<$M^fia1_i1VoZVFnjwf
z++$SwBaFhb4CUsC;Ti{7?BJU~*wW=e_g|0njhxyIc%oQCPFCUV>u(~3I|6ak@KTvs
zT4{B2OwZe6w%PUxRczYQi;_?ZBypeiK;*)d7KkT})p|lZ!n*3CjzS#L0q0JIcnDwY
zWafcr0xE~$+`+E9Oxw@7QE#adai9q36h-%c#hPHxH!Fj}e6aDomj59tRgMhEBoC{?
zlB~yv<#Xe{OG{h!Bt>Mmfy_trO`5?tP{$$C8QzTNs-@gZHJK0Vjq4Z>r5QXUaVF_i
zv+ZD2cy!alr8Gh>VFbmJQZ8i+o=V+Vz?~zlBE?~)CK(DXitC>%V=K(H^VdZB{$$G2
zOpTUNmbQ?j3&?I1%@jK@)sK6z;Y5-mi5xV=|K0?8RYKFRG|6e8qekgOM+bQ3I@(T_
zYoQwVsX35(0sMf^<+3OgCl6{@x>F2?PkhR_C&K78vlJrFmZICLjq=w5ABqLv>7G?W
zYgAOc8rj3{;kh^4{<-ex2$CkDgzgt3+{~*vv<2%>-PmDI_q1zLc^m_OoIx_TRVEL;
zPf<9<vf6kawn|@9hSZANp!tPQLc>YMB)j{TozSASkfF`4)WxIy1UhR{U^pEAB^I9e
zbI$&X&{TP@)RoiNKLicb;{^NEk~JP+vWySiZv+0t{<eB>RV4^ZoDU~D>;*rtN=G@G
z0ZqDbzu?rjA3NurL<(%}p2vD8jmMxKtFKm=Q;(g8nKm*?&YmG@<Tbt8{8(Q#`wDLk
zXz-jJKnvb&S~(;1LQ7<{!mnmk>B!UAQXDsP+bhEvz;Lx^6n{%c1v^O{iyz4)_I;e`
zy|J0m?0*5w3-;rsrs*kjfxJz1(+azv+iVo+3US;Y+a#{fP-q>4Xw&~Mf`)e9VHl8@
zI}Tr`pSB`e#bP^a%B|W28g@<^@1&lL^Zca-YlXr@ai;Gt!5ct~@V!asdP2Rl?9i9L
zb@Rk^O2yv+sxyzugZ={B8Le*JUVn39zAeU#i;mt_fI17KVCTOq*yBrS7^Ub*#?Y@q
z33l098JL%SA6?}mDDaJq8%D{U!R3~s(Vop5KjS#VSy<sgfw2r2274gEY*nk`JHYdV
zw@N}s({VvWNWso7`JrM0;D>U6b!@PWdX#nsmkF6?1Gx6&ZMT8$k}I|E33aH)Z|z@{
ztT}_^&|W3hBO$%&7%N(u=hn(8h7Kx;?{8T?OHTWB1Ef}s=JWW@al_oPG;ThU1*iE3
zz(WpoL4Q*aEk|~AzXZu_FYUVT$VkTGz<z)nz?AVr%V?`Vl6)!ofOJ-`YNnske=o2D
z``v9x+9~8laeOunISGKz{yv9A9a3lOZfq7)(n>78b@VfazfL7&qm0(sMVI9=s19r=
zo3yes>!lZaIygd3P!Es3wlqvvuc|(!5M?yd>bJDn@ID%5UMi{H?BB%nY!wT9tew7P
z$C`n&Whl8Me8a<*JL^3<yu9k{3SKj30$Ac-50l;SspyA!L-fVPjJxaPy;qjMSr=-0
z=g<C~+cVnzi-}mZ4|kXznP1k?v@v9Yq*-H4m?I1jOoug}O`X_XU&{FZ9FV(U3(iW~
zEn2)&?CR$>kNGiq#6+x-$#!2*A*;wg4S8QvOn~x40X%dNbQl(|bRS#uP_}D>2nr<v
z(@)=l7!sLC@5pJ`X&cN8ZSS0lugr+fVZhui)s$8MCiRgxLy{UH5j(Zm!@<dQ?>E`~
zaDP$1dM`v<Kebs5-=@%_yx$4i9{ZhDt<ObJUW2U#xUP<%U7(@o0;rqxVf0ivKfjXK
zpR%hE8WE2YHIHz6Tvr7P)T@qVvMK%Vh9@?KMSqp-hq!dwk-|xWW_$`VdiRFS<sr98
z7Gx{KJ_A)CN%ec<%x9jb4!g{!v$Tw_yMBH2r8GrULm?sj)~~<2PngSVDl-?0HL;!q
znaG_23E`XR@M2eIXsDJK1-3)D!no3Fy{B-ggNjcbRJ;0m>ViZ@E74<>`R)EE9KOF!
zv|6%HU!KH3#@r2Ehv9s>i2_A>?m5SyH(q#d^y5ADeJoY(-J4)WXv!zhuVNi>8gnR@
z9o`^Npd-zzP|P3Zy_2TWc;Eu}FWDCkti3?8>bBamdhU?@0>K1Tu^@3qgy7g!c8gE)
zsXg0wjTLidEk;y!qg$O@rgU^hy(&nA?KZ@>b@}%X@O8@@EXwd!=6%UHk<zl!T32W&
z?s<s&8uvXZaxgYNqbD)up72z)-|ohPK}DsZ$?-aF7Z0AI(vrH;il-nLlMR7Nx=rTB
z+J74b$Z5Mj5(~=CmNOc#4M2JPQn(}&1l<otd*%|a4n=F%X=#8Ra_1MZ!MB%W<%6^)
zUCzhSj+|<75!~x|lbKfk`<#?Uz=f7Tu)&M*c0N^g2Y3TV;^;`yq_2d`0VI382BI*3
z8Sa{SLV0|cknq*6?}9l|;-Yj^_Ux@mJL}$@3U3SV5TE*n9q}z#1OtW*5g2D*#RP^?
zMdF;uCalwpoX|+UduHXUjx=Jm;^&aIjFN2u)s_3=b%viVFTLdR_*hY1Q&HGn`*f;y
zDWiEsqdJCKbfiYA(HtN5012)TKuxf;av;PohDmDU;d?6_{!MN8>#^EH{&gua6bx&s
z;a|_qGU-<Z)s-)sYdz|Hs?S~Y?ip7<70gP#;-tc>`#A&+Pf3N*V_$Hi^yuwHIq72}
zznjz^O?1h%FSr%2@A9`VH1@n*32NT+<^6Z{<A|P#QDH$*JQxhz92mLeO&(RB>moc$
z<lb;%!NOFl;CX3tCdgeFi91GKjG3luXXR60l)Kuq5<m$O^wv;vU-6pVt;)1r_HeyT
zT~W7cY2}}*ENs1Vktpa}Q1a%{#&aW!7cZWr%2P%;&4s`*@THL*u!z_KH^25@DVB8f
z*h|bvoCQgj#7|Nnt1*rQNo5%k3EnoLs&30om#rLRz8|#R|FbhZGTq|Ta$@ezU2_}L
z&XUe!25i?Qq$Nr!-OkR6X7=?BU{bF*Flo|hGCaLzHmW4UcwH(Brv1<$wlBthwj=U3
zm#lYaqspmdwJQg-(Y_1DJX-1YcXh+IbX{S8%D(Ov=C09fY+_U@p_JSCEwGX(ohKW7
zQn!hbZ+6by=6LSbX087mr8FA*gz$hYwa;tDr}7|bi;o=|R%b=>@k}EpO!f~6oO$X(
z9f7|0agm|HLI@!zKjqi)><8j!aNNgFwGj)~@AY&kcNLz6;x&&`-gQwqyM_)N&m^Vf
z=o^qf{T<k1N1KzEE4K{M=I9T719!de2DJ`;5D6U)@)@&%2W;m4fn!viwRzX24@|Hf
z^hSeCGM~6Ws&$Y!^*p8t<9!y#6Q*314g<}pd79+pgTLLwESIjD{WLU0KR*r?F$$m_
zW8t?2{}p|0r{bRd;^U$yNpY>FdsyB*TqUkR?TK~z8(|@+NK|b7&pVwnWqMv(%zWah
zB00C)A2ALye>40iJ9+G+_KBfmx@Je@6!FD-02e}VWDzfOqzJi}Rd?T4`2&O4%gK2j
zVo>_?iD>GDu5NZ!SbCWMN~qVKJ$aQrd5rgKFg8ab?&{oXNAfxS=l|cAO~xUIumAY2
U$3`4@F%N?Db&YkZQMVucA4q>^y8r+H

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-64.png b/srcpkgs/void-artwork/files/icons/void-logo-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..c20179a3185183681679210a8a068fe24274e9b1
GIT binary patch
literal 4013
zcmV;e4^r@nP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x4`N9~K~#90?OS<NmDjcZ?K@wl%j_kJDB!>l1Qo;qBhg^$6hspfEr~UG
zjW17=yr!*5SF6;t+L#y3&@_2QyP8;I;y{QJL(wP+qBtPRtinYG6&Wv=>0a)z-yeb%
z?ucIf=lNUfF4lL3-`RV!&v(w==X}6JJj6ph#Q$T^gB*;Ry#b5|5ClNc_hSHR0G$A;
z0bC-Y)(0iieKkOz!t+`*Eib4$)$#4!?Q(Uen!9z~0=+>mU}k^-AqiO^6tJt*)ueD$
zkiu1=^KkPx<?rFY2f#rhYPw%C-WLNf^AnA2jel%tYly9Ft`%r?TEX4$NX1eP^b0f&
z_ZeR3=jr!0fJ`D{XUghS12FUa`sVuWmDei$n>EcMXL5VGdK$+Bj%g0^3wjm6K4%%i
zDF$HXkjA#g^wQeWh!#zY&>5W8pm0?fqeewt9_BslX(B4USH62TfKI1dcIo=1FD}<z
zmN1;^oz_7>$gmJYL{P+fiA3_3d+~<5nwxh*B9XM~^?G_>$^!rcRSi|5<3-2+)Y8#%
zf|=d!mdaUEVBz`7^9NKnRAOiF4Fy7h5b<I0R|C8Q;_ha(aN0|dnHQeFa{hp-;lUe0
zKmx>#i)$R=HzIPVMsV7jnurcD^AZ47jUboFO}=ivCT|aKgGeaShy)^yiA*K}x#)Uz
zzM3A5xUsDf-P&&9P^OfLO*nJujK5eUKF!QgMAYf9+zyZ8AO?GaL@eQ8Ww1f%rOfkH
z_<jN)pNML$^z{KSv!%0TWn)X@&nj<JigbFN!!n9QBAyXB<D{><Z-S#QMu*AUJ3E(4
zMWS|@O!l3<w#>ZnV%5cTsYGfVHEh%tnMC$KM5J+atUeA`lgYGNbwjnWw5C+9H|iad
z)m`pxN{mYUy;LgQ>_~fuNSQfw$C0ngT01rL#-deEi$tOf2l`9^P)kH@j*MZ0$D>2r
z@qSTNQR<D>8xBp`5M_uVW=u@9Bl`r02n$su>FKAk#U^HmgrdDVo$eW_RBF=*M0C*+
zZhPqSoK?)cue_%Go6_1+sl7f`H>*UC_&&0inIr8@1-ttIW?uNk@q^(ezQvPWm@9t&
zyU+LObh;Erm2d`#==-psu-NF(=q|gB87QhQ8V6vhy{2|OAh-1Fr{(pP1GcxvicX0{
zLeW=_c!D!QM8(WJRo|;WYtIwfyV`|yO?4kK^L|@iVABJbIq5)t_ApCz*@d~{4{muv
zvSZ>q2SijH78I5e;2mJF*Y;A~B|iWQY_+lJ0fp7&X%+QVR)d=#icX2#<Su)eIgW@f
z*b~TEAfm&X9?d_S+nZmowK}M~)WSw}<L?0+vew3`2Qahuxys^Ld%`GOJQ#q*b=?ZD
z7c-|ewKpBCZLBS>ZLBSB(lmX`%&E-m<tUH4%>A{9pokuO?XI_6pUBL9*6M9}z`UH|
ze4A6mO)ls8lV-l>ND7OYCAwbS#<H5S|5n{pi3TM}BIQ!~f?#E^p-0!VRVI;bAfjGd
zd_<(t>2-fBuPgtHt<6$hQ=Kq6Bzh5motEmYDp*=qncC8!wrPO*lO8uJToqevwE=E<
zQ<J9YLiYLW-<H*uNi1cEdUQR4(wb7q(ZZwaZnodN(6=kJ35iJZap)tVHs1w0y^b0+
zjn7%D7Zny3Zo78v+7p8-zCZe}upV_M<et_e&55Dm`9!4de`e;#a&mIgbUK}4?%cU6
z0ki{Ha-sCXhNGvCdYDWmt6V;QK2UfopzYOCUU6R7^hc-XGV@cpxw+dl8qEL~W@h7z
z88iM+QBg6ernaW1y0%(uD|TQtCuU}5mH>cQELO+G#U1nX^!$*BnnkBipMGie>eUvt
z6pDqIv33b$9<F9}z8>DD2|-~W_X#AgsHpfPIXU^~Sy@@aO`A69<#PGwyLRo0+_Pto
zsH@BV(hUIN6T<P@`q$v?=Z&)!XU8i=$|JL8%?cW9IDdbCR;g68)~#E&_Ta&Tj%?-x
z03!Myq*Ceh_uhN&SIitkTCH|<czF27DwWEjy9Z7lkMIRk&B|v*PBFZ><mFHR{`>ar
z`)<veHNGAm9{B9D&uUMcIH62SOOqOn#@p@1VliS9V&SLs0}(;pqDKCY`Ox-g2k^!v
z#Nju8{tW=&o1Nd_%g?_w8++r%jlD@pNqN(zO-meX94}ulJT~{S+s`-ZZs1Jr888p@
z5P?8|?Ck7(kyI-EEG;eV?dP9=-q(@=>I*Mp)U-&rc)JfM9}^H{tgo+MwQ=Ldw|4B<
zA%5wlm-Jh<Z29N9b?bh<ef#zS;jmaNM%ssI7#lHm07qv>C(h-a8&G!f>_xDN(cRsR
z^u6h3@<^pptXQ#P-`1^Lmsy%p3!YwpMb9m|{mdrDFBbj+T^$3x&}1^9prBx)fQXE#
zsi`l=#>N^4lK}u5O{n_Oe2K5Wd{sPs`t(0!W@d^qGBU1j-@bk3?%lhe9jrV6%vm(Y
zO!;12FUpI`&3JozdtqV|j(mH>%sT*J<;s-?p-_mOJ9nD7zDzE|?1i%jlvP$#nknB8
zy<RUA000rCZ`iP*+F~mJH;Sv!)pYA!$3_z>a|-dR7ynBT8yjoP%gg)QqD6~FH#9Un
zxqkh6+2FoHp%70!_mmlD?vY%Jf{h9p1u&5HO_o_55g|1-_2ll|yO(OU=Eg~!mk3w4
zf$ythhmToP3nNF4Y`8t|=g*)2Vp39)#U+JJjLMusbT+DyzatZMXDhJzgLjSl_wP>#
z4h~*JM7^1rnQL2HTg}$vDKn?Q$KS_{FLQ6EMWN<BJr5_3pF~Szi&<S#Qj#G$I{L!4
zZQCS+>jVM;<}aN;piHCIAU8YLn)0T_ix+RcZ2%(r>8-ckDijDTFZ~UrS8?ipzlGe>
z4bxv)jF^NejYO0W0L)DF_4S^X`aQnjakH|#V|l2*T5nb!8WxI~Ni%VH-(ia~tX{pk
z=F2a?T-n^*Y-Z@m(<fut@PT2=fiDg~r`4J95D~U)+0yFf=C*x+wzFo<dU5&k<rcj_
zBo!lUUOb|gJr0Sh3>{q^-ggkPtE;QtQor!X@By#iYqi(#_YeMV*3Lh`A8&4c6Xh4n
zQCU%GRzGgsIAd~ha{9Jy+sxNw0P~+2_}@R1dj?tQ=F<oOHgDeCvuxS21R^pIBnk=&
z4#mgEFVO4%t&eA*KOSA202gnM+htEqoN0W0;mUyiENpIW?$N}=#MuVJK>Ljj84cw~
zB><qOy9Z?#%FwGDxXYb5bs}DQ^A#w(6nN*Ycg$7>0NAl(hsN96yE!E#C3tY1P$)#)
z%(&an?XB%7FDf@%`dnOG_@j?L(yUswYBmuS02WeW%pCN_8*fx@-MUpIl!y>ID+WPR
zBS18;snXNe_>b4NJWE9T`}zg$+O_NAtFON5saC7)rrP8#a)d{RV{Y<XL{EtZ5#i>w
zn^?PIE!Z?raHUeoDwXQ}<;$19o{^C;q(rVjAV9$I0IXWMO22gJ(*03UQU6Iq?fvx@
z$<%7~vOWLG*nQyQQK3*`In7TXeE1*hGsg}ewXnae?}R3`u&^+pt*y-+0Emdha`DWP
zx)OJz>DEdslgps+QkZe-^?I~6wL&NmA~G<tL*JwSiJ5uCh!NFe$BupX%$YOqb#`{j
z@9ZOX5l=0uDY6(h2m}In`FJ5NJWd;|3|8K$ct0#|BRxGmzb>n<d?BO!$Ddi$9sq-J
zy7IzYW_Ih(!}tCDr0@6dw#?q+!^i)WU!EVX?bTZS4~oTN1dR&f_^|jgUk~4z7NX2&
z2Jw27TrFuHrni{0xeYfLw>(SA12&?;u;C$lz1<YnqZa@NPyZn5=<Ql#b94Yi)avWu
z8#8CpoK4{)!+T{CnHjH4Dl>(T4DX#YY0f5J58oI^LTqiX_SdQgmCaZ{CY71|J^a70
zDx0+mX7>5)$litnC$nr0@bcW}x);Yk@rX4GTj2EsFu$#{ZE0suXD9%;$=xcw+`RS!
z`0mc=(jL#Hx=RhkSBq`t2FDB^W0(*;K}kgB8w=P-h!9cBc~#lj11Gc0BcVI+c}}`~
zQfTB~0i-%2c%Op1`+oO=5!zm@-Ma_@UIAyVDG%65ipGo%dwc97qb<e={m|-kv_1Q)
zXPMb%^3mBKqLK+A6H<Z$f-UYp0Kmt?$Kdbfzrhxdy>o%ArPH3gX-}AQSBgcuax(V!
zod!KH5YeHDp%a$`D=ix#ba-eJ5goC`VRL>H5i|4JuTLD_Th&lw)7^Iecu49lcRk6>
z)0}lG<OupsrIVTY+v=OuxApOI_c8|h2L94sf4e6`M3nyG6HCemZ-mUj_%!P)mt8p-
zr<r-7oyJZD5gnd1c2Y{eClCmcL6PM|WI5uxv#%oqF!T7oeZRZt;F%vBy8JMC%%g^1
z&VBZ)kv;)y99<o3jO__vlq2U3{YUd6kqA+vqaujtioHG#9gY%Fg{E8cy9=uFcWRrj
z+x41rSBga?wU<}CFe@cRqw9RzUE=!Jp<G%30A^OSc52@EI`{BzTf5qYI-Txm2M%Np
zG4mq5Uhn6K^1u-82QV|0*Q;`Vx9i=6o?gc<EqJ)N@uIldhS;%>9vK%9{0{&*)~>NI
za}a>|qN|r*DX1!*_FchoVP{V_0YFkrf_}}DE1Z57Ii$dXnOzI2N-n1D`5;7Zw7EK3
z7>MAf@HR~hiQthwN`t$rd#gkw>;RLXyH}^^)OLAPUat|B)l~|bG_4lB?0y(w$X8^T
z+2=$>LCHJ&KUEIZ2+n}BjWFa(Qbg3k%#rfvUeEv2zK=tCbk>8L`+@AjT(QAu*yqSQ
z!4cfG@XYLb=~{K>)`L3}Y8tQK*XyyC@I=fE!<xA(k{!9TWD9qFO^%4V03>R<HNW1K
zb8yq4v&Y1PGcflH0wQ?1xU<e+u$YG&3Y>LQbbO(zWbck62g2>`81EI~fuY9K#FUbl
z(c_m8QPsWjIs3YNN^a@dkM^F-8g}J+wbKkiAViEDV@RGdr(s6;<d=!aa@zQ=xSb4U
zCIC;KzgoWj+~uOl$BXg>ZC&kmbt&7&-P4p9HPsX!5|tl0dR!V2{orJA@B1e+J^&V$
z)?Im4)lfU5rt!M0>P9W!Y;O^0^;+uH8wkV@2}SHCb74P)k1<pkC<yW!-Zfeocq$@r
z%ohN%?&mi|5Bj4iF92f!jKZxCraS-$0kq-Phf_5GF5m0r%7=J}hj@sGa1j3oN`j`O
T7)vOF00000NkvXXu0mjflT-0;

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-128.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-128.png
new file mode 100644
index 0000000000000000000000000000000000000000..82cbd153ab2061058cb84c9a7959fcd27a3b3559
GIT binary patch
literal 5156
zcmV+<6x-{GP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il00006VoOIv0RI60
z0RN!9r;`8x6WK{bK~#90?VWpkl+~HXzt5RW!cCN$Xsw7_ixzBmt+$p-U=$L-qJ@wt
zP%nVDYS*fDtyU?%(%M#OtGjLeh^v5NqfSEn6f1WPL9w`kZC9y6Z3SE{Dxe4m$;|sc
z`$rNCBq1}Cb7m%(?_Xptzvqzmm-C+Yoaa18I0A`P#g4-;5TT!_^cRtn6zzx76QMiM
z8R!Ib2SUJJpcdG#qB}%o2k^ciZ!5Z4(SL*_^!kLM6W$UL&EEgaK9cPQw3XP3*wNBS
zh5=`yd==$PgcBTv+YP)bA}=etCLxJ6lZQ@z*HNsD(C!SNs#5uU<rx9NXhn+!84ToQ
zu}K?&C4wyNvZu?cv17;9WU(zN({2n9TNC>?@#Rur5^#LB+tUKOP=2qXu@Ad^xcus~
zu8wEBL9LO~1}Ixu);AmuUxIKc@a1f`Cq=fQJfeX<6pcjR%ywg1A}0;-#F{6*5K4r;
zhj1lz1GaXJqHBzpyGw?a{2|u{kvV06^6K)z2tNSE0Vdn+v5lgy2r_Hpu!)Ou#RxfJ
zfG4V-_)<th_W<9>c3U!nvQ9*1Oe~zZEZa@VssSojR`&A4{!D~x$?ix#D=4}$&(FJY
zLS({g*=j>p4B)9}2Cg1>oruh$ZZhVxOdPmZ^VEwDj_%8J@QfRvqPpUXDmoV!n(5d%
z&YP-wb#!?2xl9Jlm;qE(%3mnIQdE8gbj?)Uc7}?|e;0HuxN+QB<37nmz>FE7a%E*N
zKi{tg24yN{JLXj}GI`?Ai5px8%GjgUgpm_=C>jA?%~Z^G%$GILmn*6(E^{3y<70rz
zHI>KuzW*E@Jwb8^zuYi%!w)?10ypwmAhtTzN04V}f783!L3wIVuxHA&$h7^orL#5<
z&|!kqP|>Q|aP2oQ{@TSK+tkhKL{NtbQf7T96dF5W$b|Q831)pNxMNI^GJi|>iK5Ao
z$(wD6W!(VK(G#SKAb$`1U}!WF-PU%k9Km5vuvO95MCDC{cLaGikYIa=Py(M_fdpYy
z?J6NT2I!`Nb{AxTiViTCQx!eYa(isCKHua=E*g5#?zV{Ji~+!k34BG@8a1mFU9GkH
zQgl>wS6kW?tBQ4#ken+j5fwcTIGfyAxO!H5>DcI?Xl=RzIb{Gy%LEBvnTS-@CTbT=
ziA>q<uzAF)V%;!YAR?Cl#bntGf;{=!u-B%fJ5P{v27u&DAjsxGf`@$Z=VdE1w`^ru
z-*A3-vLM$eIv^WusOO&2!qQvP`C?8Q01i7a+<<UT??msiNF<WTM%xa>Q_r0K!s!=i
zpfeH9%0d$q7++dg`ukMBn6n0eCOyFx;MR%5CO(-f=~RcJs#3nXe4H4$8|AbNhu@LV
z#2J%^PkuX<FQsIF5uTTK6z?AMwD+LX`)p$>*Hj)G_`$b>yx@UsBuu13Y(p$xcF0Y@
z44_K}L%+DQ%gzz0q@$-~fYEnO`=KhA5)PlY?Dhx$nR@#^TP$3&@T9;GehXZX!LTWf
z2a+~GkvH`;LH<PDp1L<WOpqL^Dhr=qc!Q!p2l6u#5{*O)qt(fLIH`Pq(pYIo;1TLB
zKEP?j<Ife}bycqJ(8(D@L?;$byjMjB3-b4jghcM2vu;i}nGYvrfRF#$?Iw_O4te=B
z;_($l-X+JT+{Diy(P7c`HBxi7qN_6yZeWj3dfbrA2V1=bjPj;`&Y+uUIghX7c8~&#
z7cVZ@+imXxpww}wPfW-REE!U=<!~QrwFfZhk2!o2XUFXz1;&mYTcg`_GQu3kp}GWq
z@Qc<ybl4tXw0G%Ol+Y{G6;Wu7j-DU|R8=aTub2Z|={VHL(!$bbTY9sV9>B~dxr+~V
zJwa7RPmmlUqPk750V*7answNAwDiW9S<{9G0jtsoxFHb^o&W6Z551ShcRzE)HpKGT
z!83x4bQUC_uyjP}^Ub~0Vh<1mq_wyJ49bi9)g3)SazqD3YvU4+3bNT*5W|d?-fFf7
zDDo~pT?qcSrT3F$BjIqQV@!}73s)^XJ21fuIGQXnfjOsSM9IrdUT^NhLU1!}Unn}Y
zV@!}dB_m2+7UWh}`o8gRYwq<X7rFkq|1In}v13e-B=t`QPvd6oK>d*a#YsaZ9W)!+
zqz4FzUWVOnsAEi!BqE|}^jhlb7Fw4N`Jw5DzSzV7s$A?K_^FaexX?Y~hz^ZzRneb0
zlAnI)8o@yZ80Aer3m9lSs=_-#m-zj*b&ptjG8^Fy2g=9w*w^Fy#xER{&?x974uWFf
z)}=QuaM7)$Ol(E$XbL#hi0P}UT>(U7ulTZUU#EQ=ZEw9whv=YaZN=(}A1eBkZEd6G
zTfowWpAQTIJ<l_LWXroiU&}Gy_&O&I@;o=YTU%q!x;fz<dwYyA#$2eX5#V21`O2F>
z6~dyOop&zFR<XzW0pVY;zggxZ?WKJiQppb(VDzl1XKNt;V>uWgmo4+=K5Ae0@YENi
zxE}Zp&?ilq_Yv;bkp4P4IJ(nf^OB<C`HIP^T4r0<h#6HftYjrL8Uv`B(Y6BtTelyd
z_qYSy7MZhdPPn|f{3bu&e+&2#>0f++V^KUw$UkD$vFod<sxrC<Aoynx1O8@PS5?O}
z{M$5o)xH5l9$J6(gBj~WV^y(JdVJDjEy6E=qby1vEh6`A4{cu)tB##)QTMP!qfsBV
zzih00daVt>1wWh812{C}r>*!J()pG(Tco_YyhuW_UXZUk40Dc%ys~iB!id8d2N93Q
zAER#flT8LLT)psks5gLL(`gv?w>T|dK4V@=IqK;WTOFH-@HCmJIe1K9f+ZEJE54b5
zSWFo?<vn1fZCynNL%ji%!1`_$5m{(kvpLFFm!B`lV`L`dwt)ggpDeE~FUmwPRb60R
z6CDBv3?OG(*7qf>i!5t4AyyST1*ilHT*qpLe1s=6F(#-jsQm+$Zv%>+1N8<FuzlZr
zX~}K#KCrBL5Odbe2@~Q;vRi8Q7!i3q7K<gDHI)|ilT+($Y6^0?s*3r>PcA(HIL@Xx
z$SS*fP3iGTj~g5h_>$#ZIZm#19YjQ`EK43;`C?^16HnxQ$+9p3B(*CgUCOG;dJ8hs
zWsDS=^;FeU$G8j-_<{8r!hr?@jS}>;EgUCsFr)Y>;k@wmKsT2$QskIKC~=+300nsk
zYpL4?ZV%;TBgjcsMd9sL-u#a&YaSrBA(oHw9as8kqkPxpOksU3Agk$hqSD`hTI~VU
zaV=o8!;A%byNr<*Lf`G-?V}t=vARU8q9+;b_W({$$Wrt|m-=l%0vYEx#3q|!iuN&T
z`L9Xf9h-Vh^(AA|u&JWxc~133tu73SN-rapD_E$AGXun4jP+EszbkzU42V_5oDEJ5
z#_rfk>19A|moRa+ZeGi&&a~|yp-{+KwJ=57R1~raLKg#K)c{5VcXfP1wkNFY6PUnu
zM%4kV8vqInmTv(9)@#}~BA1^1n?-$fHZ>j6kP`z~JvPQij<^#)a|J)}ZRb@6Mj`Dw
zv(2H1yFri|+kXMpk&rmcDi&k+b`9(`V%Y#jtfpcegcxaad34u^@2-s^mJOinHCWz;
zB<jupzVWS2gg8KhAh4dq*+8H{FPnNIve#hwu}#6*s#tVzbf?pO^lfKTG!ot8OkFs^
zrktXC4Pd$KYjBEPy@OHJj2^9;5=x7;cx+(QSTz8`b|cmeVB8i-7M!P=rHdMU+Nr*%
z-9Ij6i&12&RZ+)v^R<^Q!MbU!u&qy`kM-=`gHY?+#I_phib2@q^CP@#ojnRh2SsZU
z9&n|fHp*{Zo?lQ_Rn{BJse7Wb)hKMXDGEp@*?X>K&4UQlgzf`!X-?pyyddv4E(7F+
z@~r<(MP;iAkiXg%Ry9tSY$uGIumj~zmoZX7RA!8ijCYm=1z<44ZEO1Kziw7~bKe4N
z&t5rSv+o`B{!f&3uHz)ZAA|P-=eHz93oT3jUo;ZkW~fUve9f}>*%#hD-Pwc?KqL}L
z_<8;$piRfZwUM1BWF|+WQQu{dvXy0h!R}c^imroC7lNA9k8300{rh#SWz8l`8Zznc
zCNSfH8rQL!q1K4`R%_L`ZIGXzKc3`E_9lg>tcQl3L85DHiq{2jQ*P!^N=B4a3G!_$
zuW7WxejwUVWWhBmI>EN4Ag@5f?qD_64FFO+)|;A<1dfS?6BimW7m%6T!G{QA(mA3n
z9UiZK{6rMnxrT|LHdq7o23X<EeHX;`LQ9^HnPgeBMM{R1tTbZ2s;KST*#T5_tqGYk
zN{5xMauwrH!V<m$%iX`CFE$*h+bDTMm)Hza&o!m7Ql}dy8&fi@<R5+fK7)Z9vHN86
zk)qe}9z!#6&u<{MA(pRblj4qTMUZ6;|2|*<5gZsm2kd&i+eG`iEfa}E5~YQu_i3J<
zTt8Qk{w`(ZJw@-x^Yc!Q7Dj*LdbEEiW~aFr_`G#p%z-j-2evXvk8Z1U=bl}_(KdsL
z>TN&_+xyyDp}wk@H)q|PyL#^HSuBB!t3UnwunQ`JY*O?&QF*#o&}(_Nj;D>qVj(o`
zlKqEc+pEJ~{d2<)2NjDh_NF}oTxvU_AQvt5=H|pI-eYSY>)t8RX@II8ht?&TD!LnC
zTY(g8s^5c`bt<YWE>m$*W9h!q!qOWXemKYgqrItP6?w*fOxa|5cKynd@BKO(&+F}u
z*o(2wCSf)zdZKM@4e1%tA<+Xpz(E<j`{}<NaBvj64$u$xeBZwAk%`3RyDlz1@M`0W
z4~H0FmFFb{byC$cP<~YO<0~>&W3N4<qL1KWm$lO5+BPj0Pv~JB4A=xZi=X&4Ieuh)
zE)Xq@eh><UMgkiw%GSi=@g~*Aniyc2_wbvbi!BCjgj`VUO~2la_L0SeArszLG=jaJ
z;L-Y;g9p+4E*>$zv=p=%^q$ePrhna?{*gnpF#3U_=hJo*sIUIL&ArjA0hZk{w+h5+
zS+YiiH3)uJU!JyuR<LA(MU#e4dcC<fTHMDct(-X7Hss`ZO~K-E-c`1@IvtU;bxfc}
zTRcO!MFZ4N+`N=dz+@2kTAcV3BRnsoCD_|5Z5R_g6CE0Tp`|wuyOTF?T#HX(Tmf6}
zr{l>WDblzd_+sR+)5)#=;)}hhe*kfDj$I>kehvMvT;+LLnRjn*#8$`p2=XkgA1Cub
zX<_L#hx<Shd-+2*;5_9@rWUYeVd<|*JG+f@WRPS}ut$AuHFLUE1Jun6$bG3aFikG}
z_~WiiJDv`bqqTvdATy(pXscV*ld9&?z5DJvaa{ke4k=936#Ti!n>N^etoBb!14C6^
z8*B^yD;bTX3{d|4@_mS0MP}CY`w3JP-8t<>ItGWW(#-9k2I2B#lUGvu1s8i$?*+Lb
z)kda|J|pn&OTGD<GZ(Xc(l9VobV0N*Iy>3#rDT8+-qcP7@Dj*ZQg33~d;)q`clQ3G
z+$+yy>UY|d{;IU|uHD_f<L8CSGI?rxSyfr@ybtm|OeJ+K<u0~()@6eT%vv&EvTY;6
zEz9nhw}=d<mnDnmdFDmgI$2bI2Al}|H4zS-mq`<(N?P~W(RWTCuc`~v{eByH4P<r=
z{mOD>-r&qRSA~23Gcg(TR^ZSBI5rXvN0#0Gpw&|Ewn+N|j`pU_R`?H_jY*Ne3HpG6
zvc=x~tW*yh<6ZIj0Dn4g1$BS%EwLdH4xOKiJwe(As6TAF4EUDC_N0RkEEi#cXzepg
zyx%!J{d>$$r}YVHxd@~LbQH;N+Q>;0w5ba(^-A+UrrR^XNK5T$D+yq|!gGjLb?Ri+
zF1lrIo3eb1y~}&5=($FNLPdsCcfxAAn_Y6w1Z}>DUwHTQqiXh11#0{3K`SV{V_>7A
zo4{-oVK)RH`)YOxx<@bx(C&y7pxR4BPeA2(MF%LHF4!&2Mvj@l${=o>cUA9N;x9nX
zmvhe*a%Ny?rLgnU-h<mid8QZ#N1Y#`oJu^t;{3a=a8_DAS*%s|UOeOBEnvQ;u-2C5
z5ze5zxWB6SuB(pEW+SXW#~01Mq^s-=SJ3E;`VJ1u8-&B>W$Siey|(}In-}cu&hCp8
zdBV2#5z1-A<IiQQCvbAOL%CO8JD7go2DzIYowm&}P9q*)QRH26Y^DP{pUN%vrjG=D
z49NO`ryY>-+d)R=@{4{l?L?E1#}yrtiFoat4T*ez__Mb?x+4?8GIGAp@)`5q-cP>~
zg4_w%KKJH`L17=F3woZi&uP`s#$<dougJT+Pzde^24y;SZlkLqba`D4X6DHF317>-
zhgWYuK75A4&49bpHQEomfa|_a|461UK4dxPZj?9ua|V76nJFrnW5fmK#lxYQ*<2UM
ziKNRSZ`yf+-T`8}AabtqdkM)cOMf(XW40TT69#CYc-GWm1ado2ob9$aAOL+zjm%y?
zbDpz3m#LCd256vo*7ScR;3m*1Sgw+p1!_QIO7PR=-uySR-IznkNdq)6=Es+P!S~JO
zf=&g=>Y_;+{0Zbyldr#9a@)N0i&Z)%rw!1+2+zwaVDm_jC@>y}XA`!C`s9<xjnPLJ
z&zx_+$dd!wg#j8<mxgv!Vf||37+_!)n-d4tAi6YAmaXvS|Alt8_R;PPa42KFsmBE{
z7-T5OIf|Z+<#M-;cpGHBpz9S~SJ2t4X=~15wrTeUXpYg|)c%2(FBuI^4xqmv{eWXZ
zdnwXOkS?Hkz)?T~WH;zu>IQ5df$mgvtBBcxvc(wP;s=S>mwOA|&+h-sKK~Ch3Q803
SsiesO0000<MNUMnLSTYGGS)8u

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-16.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bdb5f3314c1c012d5568cc2f3c8868ccd225482
GIT binary patch
literal 655
zcmV;A0&x9_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0z^qfK~y-6b&}6ZR8bViKj*&3fJ8!}f{PdzEkaAB!YHL2OU>=1lQ5N;
z;3nGm7rflNYGYBj(TL|X%Y>3<l629=iJWN_87)N9%|M9u-a9RPqtk=Ft9$SHe$V}$
zA3_A~2lt#2Gp?dHP~t!Utc%E^@yzpNBDq%0mx%bbh`a<$G;s(YVOme>M5-mVPn1|6
z)W1f^04TbQ@DzBW=n~)q7Rp1}kp;Kt#sF-9KIi`MK24cKBH`t7x%8&lbcU}DfBnbZ
zlG`lE4A24em>n|(Jd&Hvy;j9q1u}cY(|O17{$n3^#jO!f@?jERjI`N`84pWI)$rpn
zPy)y<XB)i0y8~bwdp6mb+)7<Z?Pfk^9%!JS0ZRiNGax<T2P+HC%%Rx#{eq}WiOQ7k
z`-SXswgF(UYp{s00-&P3Mxp7TX?!_swddaj8mrtlR@`tvE&zy1+z5C80)GzUMm1W$
zs02qBVwIBteulEvO58T~EU;0f-%xa}%0X*b!ny(8g~>VxoY7{0WM^{AvaEJNCIp$V
zEUP_rHT4S)#tB>okU-u`pEGt=2nv7&`l+_|clZ3n{BE>_3Uaxey=`yLq1+N9ZRV}>
zVhwaUbkR{RAItYoj<iID1I}o3x8vA}M8d1{>e8y39_$({3c!#v6f1N54e0fd?*l7>
z6aq9R&>GryqswLil=3D2eD~>Bd&Euv7sB^Aa7o}Ia4O`Vu_>3n<yVVG1Bsx2a->B9
pGp5kX!HyW<JFsZrS!LNO_zMBG;mT&TE3N<l002ovPDHLkV1jLwGlT#D

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-22.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-22.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc749c3b63fc6170b5f2e183b3c2dcdc72c204b8
GIT binary patch
literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x16fH#K~y-6m6cCuR96(nf9Jku5`r<bR@*o&G3cViO+gpMc8CFEklJQ3
z=0P$bjY=(rZVIKOq%Z|bgPTI3B8Z08mI-eN_@@@?wA4gXT*PJU%0$t`rUZ-Ww4IsE
zd#8&eGdGV>)3dtgJKz28ckbhzD?BDHT))sz&_a(OohUnjO@IRT75z;_E*2@CPsWpf
zR@*O8z@PMMc*uvM@)6MRxPzDD5pY6X{leSr{c9IYlo`wi&l@#I*B}be2z(}sGUos4
z$DZgIU}SuxISj&IfEHjLVN6tRqZBc;sA>mGS7XP0b@f$mw>MK3-v8zMwZTGe^Ob?2
zdlB&tb@jVwo4)Tm(j-ZgL7=HzP$qI=F5cJPmluG}PY-{B>d^pc|0#8LY7JKaK>B)m
ziyOF?5nd^4tM+?s-k|JHB{ziB%mC|wJC1Ai{4j9l?*9@G-J8G*%h02u6kFVo+FsE0
z%iz`^2=)P|?ajmE!`qyavlqY^lTE}E<*s^O@0s<-{C+`(mZ8RVx~|KBc32wo8yf!p
z))w_g{Uc7`Od^~@I2CF*nYotfTV?xq&H?i)si?eVfSnd)Eb~F8{Go=&hqsByS3s@B
zsY5yGkNPbufaiGukS#NWR->?aC0F#eZNv@Sj)-Vk+=$s5!KSTs%m@UPgUq7MR8_4a
zx?&<)tFhK%KxQk#VYAIN#$<tf72Uk5{v0`IyOsW7fLoQK?CbWsos~QhPfQ`a7ZJ~k
z%DY~hS8n~%#HD&c;udGZAbQaPHZ9z0NZL-i<K06>%nlVjrlQAGwe?`z!LMyj;h#bh
z*jVXYveKD4@+^c?EDaPuAB31)+0@xt))*t>Bh4D<RYkV~3mRz5{FplP5cEWaCQSyt
z+>tuGWv#-A*AjO_6Se_Uz@XRe<pf|)>g~EZ<eI{+3SA!v=HrIezs_a6OkfMWnR=(b
z$YQVKnymf%r$^H-InOzB-VU!=9-9Y_ABruOoEyN45kvDp7Gzq`8b!8)#(|BX(~j%3
zSDP)X=JA2!hhn9YbAGk+r-e?dD{c13g~$u?{lGUfc{Hv_KTFTf(_%qHPB)fvb5C?^
z#~YvbJ`)t`x)i!VUuNlw4CtI7H&ygXLF?03QzvuP_WuWs+f=9_lj|D*0000<MNUMn
GLSTY6Dah~u

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-256.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-256.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe3a6acbedf9bdac4491cf0a952b9f192f641a9
GIT binary patch
literal 10660
zcmX9^bzGC*_uoc?w8RI=At9XtqZI^cq(LcZQEEuTMo39XNH?RqyIXRkw16-=rQtWe
zzt{eFp6xl$z4x5E`#$gUzBg1uO@R=f1|I+b5WZEEdj|jj(YHVVE;jn|-nqaEeZe+Y
zR*(ZcJbp4;^J4)3M!;J+S#9^!{UwjYr_-$u#~1aUl)560Q8$$G{9j1n|511Qu45zf
zWa4`FfA(%HC%$iGop_bg*Mq)Ie5QxXlXw8Ee?}r_ohbVpFZ4}NPf&<ccZmO9wYHC+
zA0Ksx86v;ASY2n#Ly~w*@C@qeW7E{;volrbg2_4acQnnYt?lBvTPa`?V`?Hm$JH-z
zEL152X385Vsrm1z1+OWujG@RrUR>>c3!aVLod-9JF(S+t(>w4aCd4~;n}*cjb;pj3
zzfRl{LVSGb-GE<tyvgLTRtbBej`;4;<d4Z%?Q{248wyE7?MM(&=f*?M2|U{&Y=C1`
zmDFS2*2(z3;v%@**yB2Wq|e#lze+4db8Q`~*%2uoMNAC2%_p>KuTaE$wh$vW;j9vp
zn4dc5EO9HJl6b1Qzu8n`byQ59Xd9TTn#-(W>R_gZ@&V=+pk>iQK)+Y|V2<#V<mB`W
zKKm{l#A{c}I>6J!qM^O(c@x~{)Y#r{qdV=z84iDFpHXOf;JYi`*aR$$eco|o=5(+J
zvcno(wh|onS}T>bM={!-c#lF6A-{1Ym<P0E-yY?PkNeC*GtI3DWE2szYKJq!C}Hei
z0?j@^tBQ445<nl6OPiYP6u-VKLRUaN4~kZ(t*vGGq%`}ae+wLV3YS!|<{$%Vl-m^L
z7CsmLIyV=kg2O>s2iWK=k*_9t;iSZx=}jm)1x*Lf;!3QAxLnM2e#{^x6{ce!wFeGN
zei%OBSh7BqT89n8IrhA4yPn}*ycBskR-s2;^-;PeEv`s?Kin~>0Nus_l%4=)wOXG%
zp3xMrNTnJaN^S%YKpUj3hMa!ZNyCK-ruEyUWD}73Cex;-I;ayvtO#Uq>?o&G$rO(y
zWqAO!NRN_V1>2lztBcEQ+ou{jIy&Jf2~A6ajxV`8@2o?aS1|faSMuk`HiUIrojf*A
z4AR}<XoHW^bIpp=`D!FR7)6zb>Juaz<s8>Jn*l$iZ3sHs=ZM{lr?RI=BSn!<(?UM)
zQ1NccuO@FqZ-9`R*_p#suqkArWM0ZGV3XtC)vrZoL;L(K&eqNj({y>tsQJ5}+<+nu
z;qXs9ZyE_jJD~K#Ay#n@)2yw_bO*lXkneaOssK|$Q>lgUd$Khs(x61~GC$;YwxM$!
z;a000{GkXS(YQBAZzS@$m3~cJrVC2XX&#7e8^c*tT=ZZCQObfQfi$WMtiFfc<BR@+
zQgTk#W!~!F>~McD`{JL?3n*kM^vRX?#rrOj)*BX2MVmU@rxSTojbb$8*a7i1oBgYh
z2|&%^iI(iuWG<F4Y^#>-UL(2#v)Bn_?A{hN3k?(EuJjrs>z#9pl*!f1|1^X-`H7^l
ztc0DcI(l2{e^M~fyuT^wB8vgSvHg^0^LYgxA68)jq7CDc8Nq^;t#`UoF9e&<_x?@0
zs7YH_qu8%BYOnyAR+<sT*~CB=M76&BCX4i1RIAOnJf|woppK?UOmVPwzMLi4)B&gV
zq|mQR{Z?!`x~T&i{hq>=z*KyJtm0KRyR@-!<84#Jve_I9K44A?$f>PvKVN0p#lp-x
zZvj!Xc1;2S>R3#Jc3Aq|?mxeuZg5k<L4D6Yz?h5QC$D%lCGF^+SGe`ggpV#)ut^&T
zFv2V$!NUpXJumz=#g5bznBK$(*mHu4Ab9LUYiS9Zt@4}44NquxeqaGQ=>AA?agbMV
z134dtU^rUg?|vo|O~&vT0Xou&^s|&g1|)^gg&)iyie637|Fx_Unk}u&tMo7cjb1{X
zU;zxnVFN6WgMQK_jJiIHKzyvpQ;xvc4xwW+4ccq6usqR4GJUlm=-`<oL_Htso&%c(
z$zG{BE1u*dKH8%f^D{ddyT0Nbj2^E!NAe28iFzy#b?up=ZL7F9fvUKw9oX_l8vmY>
z;`G|yc@WEAU|oZJ=IZdB8Dbw2!P#JE16TR;J467C8_-M<3nl^hDR}(1MiKaPdSce7
zuBJuWY%Y-aq%o(TN_u(0;U6)9l0UOX<eTk$c>4Eo;_dV?A6KB%Q9OE>q)1tNpp61%
zct>#9jQF3aaNaQoyTzKWGeY)4ZH~3QUD|-|Bn}8JH70G;oxN-BTOEbw*NfJw-zpy7
z((%2=oWVFH-I24HXpmjk?J-*moBA;&RpVI4JjzZ8ecIKD5R{*S$m2A|AK+^N(SRZY
zM|afmQB>l$i_e&K|M&lp`Y@kwMTj;;d-fKP3UsHk6-p+ni{<N>V6<8Gvf7W6nTZPS
zic4H*mpskIGxMSVXh%7FhLqubYT=))kTgn;6?R|g6?O1h^_QRxfehP5GcNmeYRF<K
zo@z7368Dw+NP~t>p>2VfQS>l{Bm=uh+Te3}1|!W%^Y>ZSlvP-nu_qd6CoVWWqXu2t
z**zNmt+lbJ4O)VoDHeFdzP=4xUe#^FqT@%mO<6_DRfD}b%9@YbBIjf+Bjhwn%}dB1
z+W07@uG7vr@E_uonj~aMZ2EQ47NuQq9l+wndIIc(r)%G+&c3n#jHMYpl()0_W3mmJ
z(XpyqFDhyyMf0ibD8NPl=W$umOOj5c&)ITW#gIL<whr1&?Hu<GJjChK?<eN<=}XuY
z*;?bvgoyz=VLJw3XMXV&`8mwRvItL=D)1Gj*O9floRC3`%C6l$?||O?*U*|vJQJJ6
zMR#knua=wk!BX)2+rWpz-U@S-r;>&@+s52#!?m~%YE%t&j9~I2&LZoerYJrW@42Y5
zIpq9r?b?o%WBtUNP=EA{b{@!Fd_amd`D^>^V6J|V#ZDR}t8(4h9y~C;U@+TfoC5Jp
zra;J{plq$bD}3v4z6(oN?jjCUFKSqRldXduaT@r>X8fX-qomU;>m2y~h&6-QlRsL<
z@_N8FmY3+0iS8^jct^Lvt=?uhG>k_mjZH`?h?eo;znS6SNf7nghn5VD6M>2qBI27z
zM3B|VL$v)}z!lL-^}!e+8ik?L-+k&K6;U1*<MRXStpJ9)dd!wV@~*l3Y1hyY*5K!U
z$<aMYGW?NcT!gp>rKP1KH(WX%ynq~p>VL#14$W7tAPa;fT}2mPo%x>0)T|)ZRVj*#
zNz_u+e5C&LF55#AiyHNzi5Qa;b|>y$gtmMYZ>RWyiK87;N!5BVhkNIfU;U5|vk7nF
z7Nv}%I32^SsW^6NbR)&VQV|579dX0cq}8=llw8ky(9$|SV5?QE;e&`RM+F!QtfU+}
zwmIw1MB3SXk}Ai$qjStfab1DIKmUGuH_`GGmX)seuFuGiQuIam$UX{2Q6xsNb#^>_
z+YjqRRBsGQ*J?(&1~+GHT)*-V!`kjMG8sNu#qole2HEdbR5I9xM#>~vLzL6^*fvk@
zyjwIzxnVPr?Xv?u%kGab9B-J;5gWC^l=&N)AYpUTD~-wy3pXC#lz09DWbfqOu%5tu
zG~4{=k^-$Yem?L7X>gMH3omuS#V01!5RmgF*)#R}8vp9Uo8dal5)F?Xu{)aUJM7Ca
z6j$S<j6%cfrTpq8seDSA)!ot!KSIg>H5N*>ZI|}`3C6dcm<-PyOCMV6*0q9XY#B_B
zzI6+39hB%)fX-qJ=a<{&t8Qo~w{v~Z@2aGTs(Ao3qV;44`#p8I`dLjUXPhaua<N5C
zQ_zI>1v$v7&sY|<6SxjT^O+_?RtsuXA|wV`&Nxj*hW-gIuvzp(B^0F2m1kw7jMN!W
z0N^d}1Aaxf!UyoD1B>uJ-3Cf0yN`*ve|+gi@U;o>{U0kapa|0ZA#(3A=;7EOY9{eg
z3E-4SgDU8+U>1hR!@W0YJOH4xk9GYZIXd}hL_C9(QEnO{#hi~a(pohOwAATQs$vxS
zGxPf=zm{bzf;g6<@41z9x26zy0!2+#p1z2&LwkZ%@x%<J#eaDES(B8l+R^RFqcMaO
ztxbYsW0$7%2da_-vMZQFkTee3uRWO*$zruGYG>s44Dc_AYAD(tL&@ChAeHnKCxQ;y
z_BT)>-wGd)Zb+YQgb&sx4#LGk{xV7>BUuwj?bENb*|BMWgCE5W(zQv@<9RTk&8O8n
z%MPZJN*(<5K8XTw=Z<uj5+8QZp6h(2%Pw&YS~+F|imA6~n&#zM=EVwlm|I~1BL37r
zMB4XfQiL4`^tb2RFyXXq1~KYcIKQpv2J!763j2Z9n=CpFk6{a=py2e)+jc>?K)+=x
z<UN~=r;{x224%JxM_wuWB`IYJ`1Gj$q%(tr=t!Wu>vt-{Ojfl<J&}djH`W^gei&Ch
z30V-?@yC*GxKKqhmHc@p+2ASWn2(}O6XL0TUaRh<Zc`7i&%9vIUbvb~ptN2vWf>l7
zCTq8#Ic_p5ND)%5YGtc20)V#9MzFr!d8UiBQqO*?2Cw=T5zK@(dYM%*?-ScDe+G*7
zH)jWDnvD8okC$-fK$B4<x=sYTI2S$kiAT}@`Y`wY-LJi|l~RZ^Ub7gImUZx)Z1##k
z(P|31-2Y0KY&sWx$tX&>CQ3T5uI<V3TWg{fh-tt%z-pRP<jXklDRRB#_YWJ75xVU!
z{I}{MPiI~4(1cWo)T0NQ@PuVZX}D-!^`ZBGjYNaz38yBm)OKq>;z5`WjQ_5-5aT)1
zYj`!*f7#poVPW>|(K(syfU54^wEZZi1>b+u3Wjn>LX@6-p04~So!Ze-=sJ{$Hq63O
zApVQu!%s%Gl+hodGN7MJPhl^44_W*Y_S$@X%7ta3_yRT~wrfuv5}i^|)Ch_9H;yZl
zawvCsUdoN{ByM>f@8lV568<W%>Z))df<(kw(DY44`)}fCOqPuDnTA{D%|ThaO*OG;
z_w{mj=x`@-#^t7E`%Aj6z<Jl|;>mMVzY=-gA<!+*`>4B)_j@(wl}=JZYetd!bS`Cn
zm}P6LniJ=u0>xc8iuOO}T!Y_xW1p%4?4D{39w$3n1m&&bUq05l2t2Y|sE_B{Rm?Ha
z7BCOnJdQv>4P=X^`joS1${jmqS-dVI=lccn8ler<Hj485EB)(KV#{OMlS-8FOuKPm
zBhIO(Wf$QVdOC?7*Vqx=!zjobX)QmorIfp|`;oJ+Z!?9Tt@ION8Hh+IjRoVG*O$F{
zw_l0;5#mypNt7M$tfy^z)>jo`R-i!v4->x?E|kz5P{PrFE64K)16N=`&(FY9^LmSz
z$H$Qv>CyEU4U;gF$0!-2o1(4R4akth()dp|TGS)jal;t-Usr;iVuYQO;r+KGRYo(2
zI<^u?o58Yv8+a+2-VUNNmwflv3)V-JK@E%)%@8BJQ~_$lzv8-#!MP6hm|gifQKR6b
zZDeHh!#M7r+@>4uf2s#0FS<I}36SBF#vJisuh)i#9<dC@rm{64$Jn|3fnlK#@V#xl
z$XOnTlII=I20aq5OJJ)}?56Z>NuhiLT!L%uiw0;7n`pH#n1=rM0yJ@)z0xK$Y$&ww
z_mo=xg}6_He{BjjK9twKq{N=<kp3b5!-7EZ*O@gqgAhR8#X~jP%+j#VeJ0x=IB}Hh
z+h+VQ6{xZSWBRQq#@Fi`wRRmk!vVheSOfL<E)Uqq7bm4wPO9x>`4*Mg{mG+b{^Uxz
z7PfYpJI|4_CnMy%B=PzsT3Op_bnxbvyz6|Y#9-eEpPMn;M3*Y;Ch9d)q`@m_bclqJ
zmeHvP`VBS3q{!&3Is(|12hmZle?O`vs&0ogTqSrQf1a>9>TEg#XU`I%3_P0-lu9#9
zg-k)Cy^G39eDOlMOSkj$5^|*^M;>YbTx<K}Fv$qHou@ukqo;qGVC&YoJ6bo`G{0Er
z1Kyr&x{wVlMp_kz(y@Goyuu#B75#i;BE=1O#h1Cir4YU<VF!8LR>QM(%kG$p;=(>7
zH=#eC3P06}OcVXn^T#>!()sVd3^(`F^P0MJTK;EVhm~u#NTw6Zi0Z$={@zwl-Je-c
z4)s<JAxQocOZ(nAD%geU)_}~zzVx03AlJ`m>^oUdK5|8ksuz>uv9<|3Odd5$<>UU4
z5jnV8{Vy~GM4+;@9esp~r`|#augVG93T(-wp`Kht8~*sMpzZs*1?Orb9OIX}_wjlw
zx<HG~SHT(Rz;oknE`Dk#4a;#zhCU|=ND;Y(An{IQy&HqvN9t(n#)NH=goxK00oh|6
z|4{MZ;+C-)ss2}=fJZ)|-K*cDa2z){(T|I)oJLSK&#4TBm9J(}zll{Qnior!Y9U&!
zAPNdX<FT2w08wy%N<?f7_Sh*1$>f|>lnuY9SvYf04lVb!XPvY8Np@w~BeyAMbH`ZZ
zTr)446pbE-b9|Y421d`CUHFUFXoaRsfDWwpM{$Dy7DkV^Kmee%e5uyovvz?H+)$D$
z<4<GS0kK`Cqn<S43+bb0LqYo-_fk(wXonjRpXt<yB56!q;`5>=i8U&XxSmAIGRO4K
zDwFl#iY8^0G2Ot_&zu0K=y_4P37ylH;F%P)m~fc@hon&wsxV_q$ZMYWv*#2M*E_N|
z(vPLQ8nbFJ+0|zIrX_lq{Eur1$gH{*LLfipRr7B`e}$T5;^CLl`nSH<bfj!VB3W{G
zBldc$IOP0-u5RyLKfSHdP9cgRkGQwiRX)d6U|zY!k^ks(XEG74Y8{f&&~Cl6y`pNp
z9a2EMok?>?3Ck%@iHt5a2)CxgOf`onEaD2V&z#~yCNjV(IyVr1xi&x?=1G$9$RBW4
zXm-OyFHEj6fta5T{3#{J1OSsFvN1uvfQ;YD6FuakNao4n=ZNk3<#j&ZEH`#9slya`
z(>cICwAs>x(>MGKAc-j`tl^!)*vm8~Dh?V{!lz7G28A4HLjBy8o_{qwQLcd~S|=8c
z{;@Ri`bB7@edv$^La;_5x-C+!1&fiN2e4HC^)O7!XH(1EXY5=dnJ9)^el~G*9NtQo
zy#l(NgTm|!bI{^bft-^04LxK>t_ceeCoV&beDOPnltF7L9sFT6C)50n9x`!%LYBJ-
z3_ZgYmi=f1AQ9hHA2q+F=V+RSe*0HomxMus0%a=N6TldI1;*0&$$Bm&wUbp8Y<}8{
zV}(G0B%uyKTz|$khUE~AiMh65j^8$r*ErcG0PT<7_^ac?&_FQB0%#RejSF9<#+q;G
z<!qB>uNtFlk3%(%Lg+t_uxv|&par*S4hmPEv2M5{Tu~kQA7p$(v4;TG(*O{SBwrwQ
z&<;`ZUg?G%&`A##u;PSVdW4ZLfHG~orCUg|)V{C0MhlE?N+L+oDn!pep1y&QV=s2a
zT%38}NTf_P>ghg#dGogx#uyVOR%~NoI!2=+nsZRapk~OK4U6M-qFOXJ-t#(!<pL7v
zzQZh%{jsvDQPSs=v6MZgT|bt7PkvTL_cO7IbAuI=VdPLB7oduE{wS3E&WKX@w@wY6
z$$v-j=Op2US=n|$3u6&yIz?aKKEVf&92-%xoK#cRD;EmWF_p<}7$E<vidV`blk>s5
zgt-!t98&^(##%qy*#`%Ng>VB5-c4V&xn-;a(CO+8j?{Nq0zloDm~Iv80o`gO?Scb;
z_bsb!kq8~wC=?-gW>nT?r||suX#$YZ*M4jInY8<@SJ?eLG?Lm-qSD;FN4&sojOu|J
z9ZE3Ap_t848;X&R)D_(B?cs&#(E<I|pgFDIZXLOvYJpzF{&Gj@%mW-qSqLJ=PjDet
z@i{%~2}T*%@{_FwWC0rTzTnM+V9I!pms+{x%eJ>Y4tSK?4(R3DM?`a@ZrX<ar!oz!
zQ)z#w7==dC%C`bAmqeg`vv2*xTd^+3p~?R+$9a>K-n1&zGCzET$h<Gup+mz7_#A4d
zzDj}=gB<-!<o`&MHq$QWSrI04p{{%O-8)~&>qq>cHH-z}BA1p;5c~Q^rEdn=W+*wl
zKpne^%+w30Z^@%zMVkuzA2Ru(-Ixj;7(svG7+>Z3pW6-{`B*Z#$xmYOg5c=i?G{&^
z9)hcWK_hXCm35!*qH|Y#c0585DkuLi4I-J)`_(rXNF<QPs0Yse5nT>yLvfK#fd}dz
z?ef!^!4zn2t*8$y#bVUhvaGfhaK2SMoSYjatoU%gx?|ZPi5}?qgSMV-y9Gq9Osz!v
z*aF<P%nA!@!z{(h41In7X382HB>Sh?_%<>*7X=A9R1vvi9az}e6+()g$jYOWdNka1
zP<F6Bs}?ZjVN7tOmlGq9N%I|z5DaK`_`Wzh7S;hxz&*ksWNp^@Qu!<M5krXZc$Igd
zH={(v3T;;`eBZWBj0Z!E)}&a#(l67PL1k{i4f0OiQ?bM8d%!1xY0MZI^t&09fFSBK
zi~)E~i*mM97sp2*!|Pi>RwtB5>uFkhi@C?ddzz&t+g*0XolihU_^s2;82S~bvkR*~
z&`7004|Fh<(TcIMi}I;{V0+T&I~$H`rD~z5iyqE&B%@gg3O5OttaEZ-+RqS>+UofL
z-*&_F-@!zZp4h&c4ix5=9mbViewmgBTRz6{Q%QBWSekxRzbzMD*iDrx6Dj#ZjL!41
zOqWIcCJK)HlT^}9u3|*gcB~<CQV|RS_n%jXWfmP^gFV4J+Z8i@E)#RsyHee-R#kLr
zK55yjSpFNC2E&!myOcA)-FSuWwX~_~n#IY2?<f*2HFzp}7eaBGdqs?#WhSA4Dh1n<
zbPsJVXdF`j%CKrY*TeX#jjnw>!dKqOey8fT=?|m)Tv$+6#M5*i`6%)|`=beXKIaiR
zl!h;pIl}(}Kr3wbJGWXj7`OYf=(zZ4sfJM9=~}IsY^aGq0h(qm2xCW>06mjNW8fo_
zA{V#ak;Hr207`e_TXKElaYci7t~?@XOk7{`ZkUS2o>|fy({pX)s2CYndP7N7jwaHF
z(G)`C4!uCW?rgh#_4(G((zQ7_h?V1zR8@{5F?0Gbt4{RRlRZaMiZ6|g;E??~ZzDQa
zPy6TfSIz2%zff5<;WTFQFkh>VX={7{nS@TXP$TDQ%Emh+Q&$4*kM|m6ao+TsM1P#9
z%m{|)A}k~B7M0v$P<&=u(+%D?>jl-0v;9)Yn1r(*mb<80?2vAA+Qa?MKITbdNZYW2
z>#HIr*W`jlyi{9=veDC0g{yDkJrSJ+lZzt;qWMuKf6Kx2TMvgidfI+p`juhhZwNBa
zO~Z!6xNv;Ht$is(n(SYKZt^WGona6|pu|VW*w-*AHt<$c{6Tb?^AX0S<^43eD!_3!
zpABI64Z#9vhYZ^Svb}@BEzjrZ-71<z4U%XP+Zyr=7%DX|8aPdy?3X<8hNkT6w;2C@
zw@te|Ek+mSO4`3~A8e}uaV)oNA?k;xp*byuTZu$w{zfPsXU-)8GS$!kxy@%Chj?yb
z7XbZ|Y`vFnk?_GG3xNZ2cPr(g4Gwd@V};_8P08Wi-`Blg+Qk$+wP;|SW-LQ&K|gVv
z=cpvg-Mvx-g&!FT7I&wH>zRFAR!619$}4<K4;`IP@*4*EgN4t;?d{Kg{veqDbtUNa
z^>F!4m62XAD^P4OY@?yhSEs7^v$hZmM<qJ|#Ks-3vkt34aUp7XUj4AUdyU>-5Fc_<
z3wJ5W?g#Jn*PYH7haGT(!>WiZF)B#cFyu{K9E}%N9o#=FO~;jDKZwOlwR&BYlm86x
zOHufG5x!Ip_|o=ACOKurOe7zVw8lJ&{N+FOW|ZiAj%srbos8dl(X((#v}`ku%{_6q
z1V2cq^KD!R@VdV^@MQ==I!=+#ly85i$-yYKA=!BI$K{B5;A6A+WmbTLTm0vdfy?of
zaI?RroXL-ZF|$;+FAx{kcVYQ(fg9jkm;w3&C2EKw@m_)A7K_?u)+5#04K~;rO7<(i
z%6h5W)&nG5mVQOS6i#V4Ebv#T_f^HvKvdlDt0>J?ln+gP)RLVxQF?XFTt2~c-uM@P
zdDUg(upQgCJe*K1HRh(?)0aB9>yK)Y01N!r_O=)u{d0mARBgxZ6|T07wG{6|$Ot<(
zC;bnKL7^_pKbn}7mI7BwtSdi?2JSp?we^eYBQMwD3d$$G^rGe6B+3}&kju0r4o?%-
zvEhQGy`K;y{OcGCxS+mfP7A$>@hIQQ-$GY2QVd^O3bFI#1gs|=F5SRiHUA_B+s(bx
zy=z8G8pok0C|I_e6~td~-9Z88fi2K0=PmowM#~0~D*}XzelJ_Ld?sl|v!IW2AJ*y%
zhrh~l+w^B@>~7J)-#ksihkX`wzsr^4;tC9xI_p_q->RiE?5c}DV+X6Te;ih6nri{-
zn#mP>)W9J0ok=2u=m7qD38sVYCkquxnH)RO!rb&@CojNs0qW4NZxCu1(ZxqAX-lje
zm|y7DR9_68V{)CUWDwb8*1LX9QKN!MMy*^j9)D;=$eE7f9!`?0;#7vkR)QHN_K93G
z4)?6k@|&&5e(`{6+7i#Je@}1O+MuVFHz`Es6l~-^pdwF~mkXA{idLEQknqG3#;KQL
z;E6rygj<8EX4G?CCl1Gq4z2mJ&S)Lrkp!>CQPuoQ4ovJ4la<}$3Agt;Um)Q+srXPx
zCei3c)spD0SrvNzs^L^<ITQR1hrz+qqF}3ci{61#7heO@SG>%5F{64(^rzDa4dd)a
zg^%3!)#h#YvY=@YYY%uF+@><TiRFAfF1^3hE|ZB%88{xEu~mxmS-AsWnOa^(?%>x(
z!pgsm+fugBRq44pC6&d9!#*RIZ=SKuNoaraC8*$0X>ZuJik-x$U>?$!BTB138{5>L
zvZrcA{;Jf&DXG{f#buw}{1}tal6sNg_S06TPlQo!ar=DNYi8aFq^pnK=1908ytWcr
zQ@9qYs{sJ;R3Fa*D4e_lq&NJ%Ck(Ulc>(s^2+te2|Dh?ODme-zD;C}4(^tg1v_q#=
z<7={$nbX#e6#leJF3x49Am-^=7Uq1_Qh~Hy4z>9wlw|Q<KVHWYUJXT$DVxwdKT`@?
zDtkrt`X=-G3@!4PcP=a02W7_QV-!D2>-%)t_|W24px~}mPH{Hl-Tnnr;=qkFt>)-=
zvot?l4~G=$8<cF*?6*+`m1<M`7gec?l#5PYRa#H+qgQPvBA`)a`_I11YP?oKOaW5x
z{!^c$*SJ`jqo;;*b-sp+R-~gn$3#`ojhaHekLq|O5})$bO(U+aAG+qOZ5aN<EN|?}
zR5i)-vr^jOX;FFmT`wR4^m{F5k#N4``-PyF_jg=G52W%?olL^++@SV|)R$Mu792@@
zbbTE3&Cn<JtR(>quebo|TUb)}7N#HcZ$e=71-CYLVaDgo4yjXP(8RJo!_qAqrjL40
zi6R2)tzC{U=dZg!UwZMbly}_G6C5o3vtUQR7kMjQ{}U4VdTkQj2D9*#d~qSbi5F;D
z?ihwrang&9EYVz!`wu@Bzp@-xALArIQf<yr{kLjLI%^aAlXKQXok(wn27LBUK65y&
z7HuNyW&soC<&0RXw1;8zszSU#HJ+Y(@Sk$VWdmBnbq`}xhzf1QqZ;J5|BX{_(=*fI
znR=x>qXJfQobay{PYX~2{NO`@&zpd@T*q#ZL*IIjqpdJGdhPE{M~vvPI}1B%;HcNj
zGvZ*iCP<q9-dM{PAl?pZ{aeoLxkcY9vXplJwJGtN^43UWz3To_gK%QlP;Cb=ZEmXG
z2Q>fU(ljAvIc^u8ir^0u@iCF}Wy)I=KWsuVB&(5QJw{F)V+$WX*g<d5_Wd)SMb;`-
z$N$v4WQ<h3Z65^{@}tDCWpNE+KSc34dFuLyiJT-#y@_Es+{4qr2oo|m;5b7n-Pn*{
zU6`x31|`3VqW2-+FzZyWE$ez8_oL9l{LaKnFB?uEKtCrKxHJbI$Ls5>jyh&#SY;l=
z2u>Ly(e$Hup0`bY+KS>OIgRXoL;?DeC5b15eW0z$uMWO#^WbQv9Fdyu{}8Dp9WEWl
ztS)kMcJM1WAFt+6H9tx)nqNdsYJ%7zq=O`g)WXj=gTM$=!1Ok<j&wP$8td<IIgozl
zpcS7>*2Xbz#bK>t*6^@R=<nhJ;@_8LvNHllY`|+7PM8#{;C=@soQRqi0ANO_HfqEL
zZzuo6ajB%xXF75Ql*8JxDwLYzTa(5@l_kbp(s_Lx9x@v@O_@Y#a@%F3$75xP*uWV%
zOBM2&bTL;^&%{0tJ&n5w(LlJz)@B}Zct2mbFPZop_4!Q=DTR(j8g3rR*}HAl9VpKJ
z3k}MSwhnj)6X*sxsv^w48t!<kC8CmH2~nJq+c8DAv@@&89VU!jGEf;1^qZuR^<t=r
z>fT*@`o%8Ro8(b*3ObyP#gE_8PcB4ujJbX*m!?q^f&dj&2fcX;#FD+hZ;Ai25j{*S
z(lYkTIq20>2@dripa8()U3q8dKAZ=YGNNnC%CJa`R0ku_f?O2<P*UP`+?W%behuXN
z7ILnmUs+$uVj3<3B>;4wJ5Qj~aotgxf9cOvgBmX38KeY)jR64NnbxBdO`ZIf8AD8P
z#%x$T&k7q!3gZ0e85^N9Xp0|TFkx}W&>KFe?tx?wqRSmON0#_rU$02uj2d+8J|1ac
z%i{YOC$h<j2zY8}j}PeZK5P>iVy9ytaCv;1uS^M_OVeuCy~rQwCzf1~q4X!mj1)=h
z=ivBIrq1}%2k<#M2Fd!s#vwx9{mM$-@F$8q<Q!g&4#ZYu8Kf3SO?W1Rwx;>;m&`2H
z2#`T@-2Eb0k)Rqb_~^aTL_MbY5@_zrW;Jh_^!egPdV6~=aa_?}D1EWbQ=beO%^JX0
zp~;jTQ2T)=L9{;83B{<%s_KI@S`+2g{RtH0Uul-kWAPNwutsOGr`oGho^?+*-(ASh
zg681g(Rh|pa7!(|k{O>i9pW;7`|RK*4Sk^G#a|GhWBVDeBnz&;7hFr#y7JHKwNBQv
zB8WpD1ZmKveTD@vE!c{W8!jr(IeDG=6D6SwebGX29f7s{y<f%pMIetRpl+e=RpmVm
zH9CD#h`~ErEtfXM|6ltx!_QNufawZ2|Bf4Eudn)CXH*=nrC&6lqwaOVE0~ry9(KSX
zgAKhWMCN}QOUS`Y>Z@x!FXef=qPH;wr+rz#Nq;*oYy=Sh5B0%Q2($j99_N7)4c6UZ
z=~+YL=*{#Sq?yXj36^Pd%<`03X1!TC<x@e1MAW($L2J?j9~~>cJ#bF`6VoOCS4F2v
zgAnGGB)_{mKYqIBO6c<s0b3rUWV((1ivaIs^a-6$_!4-dBd4u5_h`g?Iu9C;MC1Ql
zMfR+_d^^G93fkf$Fq-n#DE-8W@_fIgu?mY(P+&0yA|dNo3+}EwG}8X8>z;}EVC~YH
zRGvgcj`J^I@h!Tnz2*!phKE;NP|Ni$ge-@$9-v9uMJ0;Q$(%qY;f*`h;g%xmxegD8
z<P0>Ohn)m!23th-m_<!{7>A=|oGb`r=)X5OP1>rhzR%(#6&E%rc)ConA<J-JyuI|`
zhV=L|N(qy=t~X-aTUwmsezEFLl&5I*UO;_@qmxzvIs=f*o;hvlfM%PUp%0V&k1PFr
zS^u4YL@(37Ol%KAwM&t-+rc%Tzjf=eax0&MlIb0wgn_8hdytB&!<jjl-+-;E)?o!Y
z9S?=u<X$@nd0XBk3y4N#HCASaTJvt$WLvQjb`As|s!hdUQUTP@?W$(UCfG8TUbjTT
zn`n#xPoDV<$N2<UVHfQ%%3=faftv`IppDn?yf7Y}+_KQ_dsDB&5p*!kA9;^!w-}v2
zum72zDBiZhZCF=-hY9Q_X2Ofn$*W}_heRUF{a=(YYU&*i7M4)ANGDLc^iU{B0TdiS
z4|LA#w2|7DmeKWZ%NkI^`M?y{A~e=~K^M?i@?;)F;_|w6aA|1Ou}AFHIEFTgS<!@L
zn^V+B<_6$Ja0bwr!*~ufRNB1_!8gL3Z`!wB;;O*fARn&<?Sjt8I}Mn(y?`zGYDaB~
mC@-(;jFwO0JAd{cFd6~coi;O)o#<nifVc8$a%Hbf{r?XoV0mHy

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-32.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d345a61b2669c8ece2d5e4d30754882fa7082ba
GIT binary patch
literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x1iVQ^K~z|UrI%Z5R8<&-zkkn7T2KO^iuxcAh@pv!frKcO)<6rzfshUp
z18FU2C_%(a!i$7@z(_)T0gNK3fk*&D2S}}?ib#>7$R&758ZjisTL_2&gfhc0bLRH}
z&~nb63wAxOz4pJ>IcJ}}|1Fe=j^iC=sZ^>?RH{^Uyb*JsqC<fYa8c1;1o;lwA2#7V
zGbhZvTuNOjCfMG!{ee(0^pdJR0}L)PZ&F0IlVf#kQtZ_K3b3PRN0{?06_sVcfD(<p
z$Oy9LvU|C8Ud_C#Hi5}I^)v%SCE5>jfRLg~%T0OL&VxIL+XMwa!S1fzgEN85UO~q7
zBg9SoA;|PtRqTh716V>Nfp!(`G-6H|G3U~n4hA$ZT#!nXC@>8u&lf^n9T%^OpYa8l
zw(f;U>ip#a2b|3pZ6UHIyI4gx#H-@x3I*Qv)vgLR=eDA>0737#s(v%@%E0RS`ug-O
z0qR!FUykZ5Fq1!XJ~&_ay%a}VcUv_|0vPHY6J%wqD)!pH0cu}=ZUnB|Bi9$)u{2t1
zdlR>d#FvSYDtg!wqE}rV8Lx?-F#yKRy)6H&_Hhwpf1UH}kp2dUO^Tf|IWrr`dWHs?
zfN2FVwQn|-E86H0j6wAIVg?<@JIXqaca#;<G*mZqp=|W>iZ-<$Y9ACdR|0kF-{F#~
znGLprjyk6DP~}3DC0CPIM**~Tx1AJ~wG9&+Hi(FN=VUUOm7#E`8R#3fJng3IjUrVR
zpZ2}ZmOriL-IZHW-UdeXd7Ot7U7zSqY*AI;uRUk-oU;g@dU=C+(g5Rq_M)A(r>{Iz
zxe$2THg*GZ69*FuYy*;$kG-6VK4Jj>7AbndT14f=0_HbFEV1$ddMxY+qcF_NhI5g#
zUatL6`yfRhEE)ht+ZJYq%xR1EE+Y`|ve!a{yj(hy_ARb_NL@?$w0c!ti!^J1OFpri
zzSqmeYvR4YPbK*G#2=5RyksyGtgvYRGN3<uSy35nEiJ4o=B}bvjln!-p-&qy-&+FA
zuodZ<(DN>^y@3DL*%M~JmnYbCpAT}_D7pPUF-)s<8hx+K5hoX$7@Mo;B7~ED3jL^}
zEwPEQM%zZTZQr)Lfu}6Fx`Wp!`y@i@3b&r&<wBqpSnNxE-C#Yi{^n|rj*TX5Pkj@?
zaIgh`XLTV`7TIeKIPdf-`jLN{ESTyvR~ITA9UDy+GY25eTHuI>-5eboO&S0Vuo}pC
z1R+Hd^-fbM|9(Nlr^Npby1}W69=ky$O~9;$8%^ow%Qv4=bd6>1P?x~hbt~rA^f$z;
znpqb~GX*%JqN^I7X!sTSbVSuo^BrNNOKfKYWEI)yhRn(@mc8%WCHtb*X{-<lwWKxo
zR=)Nwl8U5!Eg3-F8w-Y$$s7gl&r?4M+NmNPs?r0T&V`H{akCX}&Wr)ASD0}-ot5wC
zoa!_^tOWKH2yr_o8p7I^Pg^x_Snir8u=fhLi*E}xy4IUf=c}8}nIVH}ftA3OewZgk
zXuFe3z4-)1FDCU)^F1!o3N(@b!r?7@0ode{UAxcu@VA1>(h5SgvuI#gQqxgt1Re!O
xaJ`qz0_T9=L5?DN@XkTKd)r=V^PPw``~wqC*;EtrvwZ*n002ovPDHLkV1iGNSrY&N

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-48.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-48.png
new file mode 100644
index 0000000000000000000000000000000000000000..d394f47213edab1f6f5cb59a2614657364428911
GIT binary patch
literal 1864
zcmV-O2e<f%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x2K`AyK~!jgy_tV(Rc9H;KhHV0ZAM!*U}MFgU_uCL+z;yzF)dtWEkpl+
zOYdQ9jI@PNm*|3V#%LrtWzlGcL!Cc{AQD(MdTwd9WY)pd(pK5RMi75wGb4@(6J*e_
zwYRbDJ?HU{wyfYi?>V<z_Wkdk_xn80_qp$RpYy)YD-;3G{_)w$kziyoN{xzED>_q<
zn}M5w5?}zh2>cV}HL>KSAQyBwN$1?P#+Jz%c6N4_4OR@M6>R}N3)qGFQ1oR%_SwVs
zQ>kUCi<8k&Z~|VBcZ;Ze9bp5b|8Oyo1$Jsew>gWQw+b<goq*?gw%jV45w-v~7OF5N
zvcT59DSg{pKHV}B$H0o~S*m0|!Zxm-cz|-?2h+3DkM8f?KR=E^>;%-;Zvkf}tE?ah
zci3vb;`Mr~qNuSGaFWi+oS&-^<kU5Zi;qfC$+Y*hf7wJTd=Ynf^Td`eV0H*)2snXo
zMv!+1@YT|rQ04*)fT@MXRM8fv#`$Hwu}PKDJV~4f+SF2yX&iMv;SA@s^E{g>ss&jM
ztOGt2Go&v_Lql!DGet=NE+^p$vajFo|3y=>>AwZp|J^I4k48~x1*&40^ovS$!;*&A
zCqBG70jYPJp7w3K^><r#y;_K%$-;ZVyHUzyJJ1w^e!Oo=-)AP4*ee!so!i(1tg(In
z56d3e_^~2u%?syl=iPK|x>;2>0=WqKozn)VZJzkx@(k3w8>U0>8gR?lqjSD(fBu7-
z34r#V_LYiefP{fIU}4Q)UAy`$TrmT|H+f$?K$Y$Lhw9x8^R9>3d>C7#4@S@`6n%L7
zhXCC3ldqNqeFLYtGJ$b?;4_iw$?V3wCbIUhJtws+b<qL{`m$@tFCIo`;^|_GG-0T8
zXfyC{1EoAD3GRilcTHfEnmmf^D?~thcl(_xx?GSC0|XlUiv-U*pL6~k$9~<Sb?;@m
zGg}d!2;->edf;brk9+^rfYLs~_w(n6&^d?QJ&|?3qqpOBAOCTbnh;92AP+UvHvA>Z
zS7&EuS+*kk1~4lu2ivx*tbmfm2Jr~e7Ds%hH}fT5{UZkP0811-;`Ml6jPkc)#fl+8
zo-|M-m&+wBuuK8*Ex#=)SVwQi?I>-)lqfDxE=Zf#?R_$mDI72ki!8E$PZ>BvHwA+)
zN5%2g{}J)TkE0ynr%|LCxf#cRegkEJMR@fA^hCzZ<lUH!!|U~`fu&Jmu7)7B?LF<c
znK;R0G6$H-_dE-9rh#xeQiw`j6ekP;L4Blu<PF2{G)s*Kb9pB+fXdt`&NbO8?;1uc
zEHPFff=K_C8b2XMSVY<?YT6g&EJmA7A;vKd@XDK!oG??>NLv-19yTV(+ZJGYP3A@g
z5S8bnIH6D?ZAB&Q=!&8jE#RcV{^Lts*EEGRENM8dqFqr!@}S#U;{4S_=<Mt)LkO=_
z%6UuS9|j+lWt=vBCjdy0_!=-6#hZYv?b~08A`MI(xC<x^C0HD@Ea4@y8%;$8O4X!J
zAgp1uvlfM{qH9vg)Ze0r;>%hiA)wc?RJ*`b4fKJun-2dM#*nT_KPSjyMSBdi!?tfP
za%!F5MEUcMcsC$821>5fE`3n|>fNTJz+GWXMOqHIyYu#C@&^BtcZUR0Prye25Z<)K
zKA5UWorvor)17%3;n7fn(3`GF*Cqf|bf2h%CLrk6rEa5l*xhp}PVljPf2_T~0rwk6
z19rgJnb<E0p2Gb8-dct{c8!7xLN3UyGPE%-3<LuQU@U>(e|zsm(47%Jo0hjWZz!Th
zBi1I@o(lZnZt^sgMP%1_Bkgimq9hS)Bch6^>JxQt<H}--4MRvn`O<K1_=n>^E+_EZ
zclN#oY>n`l5F}IYHf=1f)Nouq6Ds=1eaZVSjE`T@nY%EnWIJ#?!e;{5S?@OOUiSS>
z*YmRDGMuDyQhiM#ba0j*PaONd=I#o2{d^z$6`(SP?{gx!GOc3IZy$Pms1Q-<$I>_S
zzgPaCBJ03%4!XZGZD~T0w>!POwRx4QW{7?BsAm<P#F7KU!JK1<T{mx!Gwr5J`>9;0
z=o;W&-am_+0V_F~BtqNkb#C(}L3b4D5a<Ve737q_r2w@BYlfh+6>cMZZ!@VRjQ0b}
z-R4FeEw9EMX%SIy5|I}ib#CKILG}`FO%wwKB@ubacgWrIOkis@(bcI~m<>T|Tym^i
z$``imd3}gE3lZInxlePg=u@QSp!@4}aSaN-Bdh=JrdcvF@(qPej9yF^1Lr|@4G}yV
zcf&Z2Nni4P;d|?6B!=y^jNUdboP@6&=n-JYRI=?+4YV*!I)RC(b03(AB$A@K2&@I5
zA7!-TS1~G-3&4LA-WK$j3cbTR<;BD9&qF&Raq&N_T8iT?Zq@Jr0000<MNUMnLSTXr
Cnt?a~

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-512.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..e5286e8872efc4d13bf2073b4a86dd54662924e4
GIT binary patch
literal 22310
zcmX_ocRUr||Npty9@(Q|??fsUu61!G*&%zRL}Yifxk5&T5|S-DGkX&vl@XDBGcs;A
zk@-Eh_viO}^oJhqxo5o2Ydl}C*Yk+b)mA$}eVQ5oa6<h$<|Y70_+KQTB!@q?yaxB+
z4{{p~H4Hc={!4GnjRk-QsAH52ypn%U_$C`*4;9yj_rH{m>p6SB8@#N6D5|(=?KwhP
z%kt)T4;A8t>cG<e*F6W@k?PYDiK87APcwufGcT9pLzUORA!+OnFMp<Sm@6s?r516w
z^X&0HJ^~V5miO#>zWDaYl+4fc^PAl3@jl!3#Zh72LxCH?XxLEu)x-D1bvkJVE^^<s
zKXD<y&x!8ut?gh3N7Ohc*dzT7u-tBUtwi<!4*kb4@3(?xAow(KJWhe`^-Re;(Gu^O
zrqAOddYJ;R1&XLAL}Q#l74_Y>%2LQ5d6{R(HlFy@T}-^*RHgr@c&yp!cz9`P$vykP
zMH$oaqL^D5lbu=c-n!%QjxbY1u<9HL;z)1eqQnDMd0id~AkEN%p2-U}rodND93Nj|
zIlk4O!0BeW!Fhb_UR0Zq`(4Y-CHaL&l`#mvAr|{dpp;vIvg4<#YfU%@dB;ycN8x%B
zXZev)+{vhaK7BVAeRMWv9y6O(R67)?Ap2`1Fk5ihj6xt%lnrF!vaT$1RQ}GRm!X<J
z3Dn*#Q8J#&=~Dp)r#flgE`wA=DS3-N())B|?t#(ayv6YLvvS5zE*hYR_*MOd+c>n~
zPWnlNH7V{6pe5-WzG@=&fMQJ=*J-d-7LwrgAlBI@v#i)H40|E-!fgc4lCp<~hkJ1O
z?GTg?($CKn6J@l(I8<v-FZ28K+1>I2h2*W+Kp(#^Gmc(VL3ww?0A}^Y{hr?vRDUnC
z2%}x)a5F6~e{NS$wH!0Yg<Z*bSD;(D@v1-fK^2{<!C7M<@`tU+bW5RkQ-K68iTwLa
znZCRSBluHk{UoV)K^?7p={L^BCTGsbE@~Rk(PMFLb!n=gs8TnX5|06Gt<5xUvn0D`
zaQmEYD^st=Dqe0<ifHfVsJ%$|beAdOkh$~S5{C7V7N;|vLgp4e`JNN~RGAw$ZCO3!
z{{h9IceV`Z3fSJV^N~%JWK&Sc&5T8GSf@lN&kO3A6htYM`j7n)l<e#sci;>cxh@7+
zP9=U%3{Fm#G%?h9l1{g7X&v^s(lBG^Y1hP?zItg-TqceTr|hKk`7uA!n_VPMANV2t
zwDcF}c<i4<hdMbqd1{}LT{a}3F`@V*!BFjcw!ebc*2#cA*#;Fsj>WM_*$CMs#Qf>Y
zD?NS7ayrZ_2{u3-s!A_*`uFyh!n=Z8npw<RrAAz*{z4nW7suuPI_r<?l2=VA_?Bp=
zF!?qUduv4`K9$=JYu^>Mc(8zJC^3Aa!h*+hf6b-!Tup*6yRM)OB0Vzp{wEH?ZqJA)
z>I7PmAcs*krBS_w2^iBISgXOF%&aa2x~j$%4*mNL$)0uL$@zW!MVkz9T@JwG`v949
zN__{4w&M&9NK|(mJyqu3Zs)h%`?1*MVEj_Tv`u;5_=<E-Nv?s;-z4nGNMSZ0TK^^T
zi!NmkTU<H9uMb84qAX7LAZK-`Nh?-JYxF+nlj&eGT(?lUoa6_$<dXcQhpsQUGIvZV
zS~=8GtcHgNODgG9`a6+m!R_MPM<s||vE4WPOE=Ep>IaA4jbB_*8M-Y}w|h@h(2dYm
zO_w)n@_iwE)6ls@!{B6Su{+*;`|ftEXBIS``3(Eph;+2LdD$AUI@rwE<-;L{yu&lm
zJb^|F(fiJezBKbxy1Gy$84}|X=_7^bRn}BNBRsn5%V|T<tiJatEzQ((=^8<r#aRp(
zyvmu=;=a|t3SJ}9!?0YLuYZWdI6ms`Nz*AwJ$iyYNliR^SLQF(w!@HP@z7Lqp8F|b
zA~{v)^>fP^M($5-md>+*rFh~jI~~VOXl;a*A|}p85@#h~%B+}l=}|X1;Q|YtA4zV5
zn0e)z_1DEvQ6Hh2v-En|qgVL)3KZQtYh6skGP*w^(J9@9U9_xmo4mUyTq-=2h{PG5
z-SznK_;+Urr#+3~pmrpB`OVa&K<hXwEP~XEtgjPA&&WD!#pnK_d8j$jjA_8P4D@la
zDZa1ijars%qV6CA<fikynSe4i2;VTcFepEym*-vz7;qLEf9R}a{Nf8Nsqp}+j{!1L
zwjpchYyR6D1v}2r-(`T|&8@4PxlNWNcv6BG#=zZ4*Zf`4p1(HBGbuLQNwXT8pNN7t
zxBAP0G~8=m;nln)K`++k*#n%H4I(^4Ci=_bMOQ*gNqAQW-sccgmebcPaCu#EyK?(n
zVY#k%8EF6VAwKku;r8iJuKOvW;iBEEhTG=Qrdv^zaTGLY&Aah-bgW$^Jg@DEpAJ0=
zJ+jV|+A654t4qe76cuN~g*!SsYZrSA9VUdEQ>Uk4x%dkFs1MCP==hZdXdWJy_b6w#
zAsKEzHD%+B9T?w6{>{R&@lmI6uryCL-PsTQ&nG;2+=*mRf-Yh5n-DwNmA6J!f{}IJ
zTP@jR=^cT)luo%7p62zJNX;UWc~mIZZMYXc6*BjC14{?=o@buX!EG3CwPdzh#_f0j
z$-;65y}ON>eI<2QoMW*JqFgj+(z~XYm@#wLT&b-1M5F6Dq^*ie@~s>>L#W}xHuWXj
zR!zR03P&bPdNNL=YjXx#4ngpXw2GINMa%g%&jx)VS!0CqXR$)ocI+IK)L>WG2x5cs
zVt{vGd_37a%{)+nB>^XS5RrGOA-zf4v$KZYgd*dh41{z+`EqXzCJD#r4Vi?8Px4cA
z&~F<yh9uF1lF*>9-(Bhb&2P9NM!Iie$IG`A9(h&RJtA=%yDed6m(k-!^CQL;>Sn=G
zKDhedfV{!KRL7sbY<#&4Hy{%QLNxE0{33OmwRAmW1w{}2iieC+=_R-_g9cy>?JA$X
z?%%fXB)2fQFV%~RCxmF{O9aw2cfe@a6rEQ>Z+q+RY2t^{P!JqcJedr7A^{iMx!nUS
zEG&9Zv~VIW;zVCIs)nj0H2-;B9ycg8gct(Da!KOpbrltCTUudo`>A<=0rR8`dR+}x
zh6z$d_IsJw80i^Gbcm|}F8sqap6XroV-C-(`U#ZAcqzbWKJtDfK)Qnygdfi6EG^DY
zpmtaZJZ>N0a<K(kMZe|%A9bS6Q~v0?w`>*eaSCV~1HNz%WVpyfQi=%SbMMcUGZ(#W
zC!;}Q%HXP$+hNi5<)6#vjVU5XdJy5#+Oz_hx;M=SpfAQU>JdcrI*<$`#7*BE5uc1t
ze2#rCTNsRCgi2ltzka>Qd2>`d@s^ZRBQ_@QHX@uc9xk6B7}=fmWb{cOoRmo$`Ha!?
z***gcb8AEphUI+NxeCF7moh`B>#s^dJMAzOo-WgGVbRZQ=go}mI0Z$aymP!{aN)`h
zXIOG`9Q1cgD5zwkKsyU@Xv`8x>$IlEF9QP4Z79w=|8{1W`SNSUUF~W*rh8)GVkZ+C
z!yCsCSDQGOC|ML7!b$^(Cp8wt%<lb;{5=eR#Yh7X)^N5yCSYW1_Fl1+j_GOx4en1%
zJxRDo1&dLZgZ@-i6eAl4B3+(%4ayp>N{>|k*bq+MZe;`x>}pV)g$CQQ&PBep*r*#Y
zIB?p)=}K?*Z%#Pu*bT{uo}vNRNO(ueH^|(zRkYf+hm=I&Mz9gY-*q#;7&udK#<`mA
zW(0Ki5+idXFBry2;&B&zm~r&hlDKg*MT3QFK>~=avBS3tz-Q%X-oJH+BJ#;q#(bAN
zXX6K)S>M(qr01Rsrt>|3I1e*t8&pVA+7osh`L@Rq47IkBTOEF-k|_K1**j^%Z6&EA
zxv;iYrk2fdN9)gZIyN2hr~JYG+Z0c`8Qkt(z-2V;1(Uh+;8Z|E$!?%(X3Mf`d!o6O
z#W4;WbK?UNJ@J7_mpn31WsR1lS9y(|)&FcpL_(IK<(q#o!Yd`Q`l02Ng8x28W<glN
z5-*>7cmWp@uN&mYQh)7KxYz?M{#glh9JZWUH(_Y6E+ZxVbpiw;)?P;{q^>dbK3J_h
z968n58$NrQHc?aPCpVt^SDr@&I_lN}We~>+yzW|Kc=wDJt9*aaBkoGNn^e0AQPdxp
z`kaz@y-r4k8E##an3sQKI&ojZG^~Ksv#8-+;JaazG7q;=KQnkn?plgHA1TuDj#|F8
z2y0auW%Ha2NBxnh?_y9xUSAx8+$*$=p|jJ9`Y=|WV1E0BNs3I@eUEFct=G4)ETr5d
zF%><k{X8+bp4~lq1MhO1Z>MxH(E!#^LA(=zclT|c91kD;kkPQB3#Z79U*ajl)kY<j
zX>2dbfDqU{xqGDAVUiP!ZIJ!qR7qzO8W@yke^DI4g$v`^ZQOOAioK$9Brbk`3T0p}
z_8%^w0z&AEbS-FtCW`{HHoK|rh!&cm7#k55Ts(_N0%C^!9ku2wsrRu1LuM427O^zU
z`@&H>9ciHB6Nswn!TjWnd3wg-v`uZ?1sXsmlqrZm0Xz%r$%EHArRmw9bUdD;iPDs&
zVy9+r(Hrv4o6gU>e0A{ZIMk_exQH&J$yKj2IK}WT@gttVvx-}7@9x_UT-d%$Mq!1U
zeha@~Qz<j889An`1OaJHOcbdXSTXvZRJCWe>QLx7ew#D=ahyrq-`8H3I9oJbJCsMq
zu7yUqJC0u&QtA#R!`<M+@FRMa%XsGJou~c(uE%(b>d!T-JTv+}fY3z5l=fialz1fe
zQUf2G%{SSkWOEpUyt|L0Nyll@o3Zgb_GG2HoQIXNqZSaj{U*j)EIv6u^Esfa=uu()
zspDV0Rg`l1{x@v`Pd3CQf`+#R@wOtrDk>{26rFxo7!|eY&e{JLd$pKeNRXVQZ<6|$
zWUXC*+7=|7%>KwO6K78L3Kyqqeg%4SPw35y31Rxl;trOV$2Gj>5wD+kR;lIGFn-ZC
z%>8BBDIy3l7EQ1WLIEeJdmv(%WNMM)aWh2Bv~t1UvS*)~^!S8zDV9sLo^$#-76ufx
z!r)ghk%-euyoRhIsWFj1%r~1qDi4{@c-?i`ZcknLG{TRwC9H5$*QD{4y%vYr;+QLY
zB!s60A%fOta577aac+sN8gp?ly^sb29N2*LzBV{Ik#c3Y5_K^$34#;d5i&m+>)gEY
z@p$|Cg^K>%Lt)$uBUZHNzTJ=R+uNBN{A@u#cJ&H`uo>9!^fC|=0j?n*A!}~QH$I-)
z{iOUWUo)=Zyj^Q&C<Djcl&~8&$S!4P<otvZRkA_wNRq_^E1pe3-l=!ohQ~Ma-!slR
zI&Y3!9x@#^k#<z`{^&)~$9)mPZt1Vs@0h^vz!Xk@;w*yNB9gReIm-Rm^oc!Y;=S*C
zd?+}gKuZwh4451T2XyL*;DATT8o}e?{R-EKNKPnFmpA@sj3G1m@qSGu)yIfBYZ65h
zhnxOr;IyPkI0=WQNA|V0w>&R+!?i?z$jZK!QTnOsZf8rUA%ou+6b+e%VQyXJ%4(qp
z%TqF(=*RjS=)j=yC4poY%~MzAt`N*Ip`-qtEwsBeFE>f}Y~P}Mp2?0LCSYT1LYhGG
zZd>^u-?e%vSBsr+dx!gbmq{&O8BJyG*1r84<?r!nd`>s{Ic38tQ+noC$7?00lHw~|
zQnGb30(hh9cc1A+t%|vEB>VO5%%89BQNau*e(C;V-|1PbzwlznM1+Ao%i*SxX_$zC
zJxz<cqC#WI1Fa+0mY<*sMW^r?hOap19)1rW+EIlCIg#_^y0$4{k>7Iq`kkNe+Yxv|
zT?<KAZd3`Cv=-9`f(63<Zd?1)GmhetjEva1<e8rP@Z80^-)F$VClozvb{P7X-5bfn
z!eAD@S7g@8K7T%ed(HEm#K3vlxoAJ6Df2C<JJ+LSTcw{5YXs(mhj^(O>ofqfgd@jN
z^)yv_+o{S14m2j?+u-<?p5o75_AX%vf?E~R3e+cTIWuKp@d97HRJpL*#*M!YA&;ht
zMVsWwXUyP$6m4%8*ExQI#z;)A1%>epDFB)^_J0z)T(IIqn851!dhAVsy1%|*C&Ft4
zMUNe0;6B<O;;rMqoB*`zW(!q1Hjg4#oOtU^f~a<~=Znu9p6AO<pXm4NY^ueq3<GV5
zlP9uXzbMf9S{?Nwy6+hXpZ}_~vlG24(c(`;Wfx>BR|cQwzZtv?tVl~I;1a?3r7^A=
zah7)qPclLBL%o?(;3MnqLrXe{LT-G|a=w0jniTXx6xncMMeq9zioozUZ&w2dTVC~W
zeSc;BGA=`vE7Fq!!o7dVZh`4LXSS~SqH^5;mN(GJ2@yC_@^=|=Ttz+KMUMU_k-=v(
zb`NeC=H{T+oYu|<=`zGw^|&M|_Mz15MC+hP^4uDfb11y76J;XE*l&Pcq7F@^#h)O^
z4U)A67@A@evCn!8ehcD0Etc<BWG=gbusHnMzf1XE(XiOoG$X+j_jAZ3PhWxMd;X|_
z>SV;NGJa5GUw<<D?;3?P5f2UNj;+zpx*~Ck#&#LnGD{1|#4P7FXO=vx3HWFww|^4M
z$M0SyYK1AxuvM-4^-0}}uxv}O^Juv%{QJCzWJdMf62P~`ip>j_d$GvQxW!lIV&UP+
z;^lIiPK>p*th=e&0OzFrL8c(U;80^oX|ibg8sK`#-YYf}rr6T)I9z0Q+;qo1D62&^
zSk#cacQe3&bGlKqKwMi>ha3NP$pq}5Nls-Zi4YlND>nCPSl##Je{Gg~)*6}Er#nzO
zi0U*Gbs%j~i+*ao`IFvN8|s?*;lf^+{Q5PLyu6HiK4XS)mw8KVs9Sz$^q`nxjxR;E
z!lP$gt@K%%`rdyU9GCVe``%o5K~hbBP=Jl9Hqb;|_d4nY2Fj8|^rq{fR)2g`$I)O*
zogh{rtoK(bN9N9zZ;fG*B7pf@xeocm$Ji*(+y6!q#*Ie%Zjs=1hD_|~Nd$P=&BB1F
zHIubyO2KHzkq+<)!Nxywwc%k5HO-M3pjRIk7sU>lEI6eW1dJD9(@JS?D<Ic|_R@?p
zxQ_r4P0o&^JT+D)8x<+=3IwsOs*v!5aa716Wy|c=h>B_d9}XNMUS^}^1yqqrVi9s%
zYs*3`rVK96P8dUKse#eHN4%oP|I;}0I~Frhlm0$wnSHFpWsR;#NeLHeJKq8do{L|C
z{qP#M<|P0zK^dK$5pr=Xa!8@=;D?h9I|UJ92|CrNW)p<{XTkGq>DAx=(zO2*<IL`<
zq?ZBi9Jo%HDgsrXPcH@K#kHMo0-<a>E`)VXM=ePUao{6|iTpFn5$&XusbxLNyZEZ3
zv7R#NGIhin-kiMUcbytAh6f(ZdG==GO{~X9gjXxfZ1R_mCo4CKkLDCyMrc}Uwtmlm
z#G5Od@&7hy>ThxQIr9=%iw{BUqEy9qmqVXg9n(KZJV<zpWaFWxB%Z`n#i>n^LpqJ3
zv<;>4B_+)y<&;4Wb9^N<u!U#L2>G()d9mQ8rsxjg>@#Yn6uf+*7=NupQObMBwW9L&
z9||vH-$x-|Rf0T}qR9N;?!0EO<3`NDL=98A3zj^KJle;H|CKL`W8;cI@+*aMax}KK
z#}1bObA~~pW{U(krSN|wH~4F4b#C}m_btHT<z^pGG%1I@g4A~fPvIQ#c*5LiG7$~L
z$u#GK5ao|?Gv=(sTu%8j)}o}+jz9}?WWRU(P#_K(rfk_^Oi4Wc`!7{_<96^&OGd);
z67Iy1iH*9eGgPdS!Q8Xnh}W;3<)~X`Z>HrUiHVMV$}P{)rwm_^tF)yT`qWY78vZX|
zvIF{!M)%}g<$oix3-p^Q)>H@_Wm&svH&<DVztR7SNJw^jjn>bWQ==qicJ}gyhX$q@
z8igM1&z0#-V6N_PwpZ^P67Sm+3Yg%i>#k)yeAL+$S%+8eC-KJ27nZj_F9;}q)hRL3
z-VpmOw^=8~j|yFKGlf5d7}k9M#X>q|%pj-Mxi=8ntAIUYy9ie9EBP1m<8N}*-Q@>#
zK7M2eYk?B~ys<;xeJ>952wQ%}1V^$}fl9(%QtRm}R?CacO>?SXKVf>8@t-+lKhXH&
zsarE7V}p_3exg;BviGo$;`}E{+|I}Ne0*4-9nt?~3`Pz~Aa)b5Q72!72=s_|1Zms^
z936oP(>083#Lp!gefG{!&-DaBU{FQjJSMRaOl}FZZ={*LZE;iLmdYgR?8EWXo-(*J
zllkx$mhwJ-c5n7koM-@)e%efnTtw&1$yqo>w)Pqu^+VUsmS`Tqa(C0otiM6~pvBMf
zM4w_NDud|Ch3fD6E-0K6yvJ$(u|1b0rdb4uIH*nDu>v>h9^MXdBZ@XIzfwPqt?Sry
zKAa{rK&ESk>=wAWXb^|KM}}>9z4X5jSL*eC@6$Vk+}#v@HkR*C->{#cUvdp%#YtsP
z<%1{W*oKoc#EQW4iY$Lac?xtAHePy-X>vq~^IR#CCsHyP#YWT!ubRpg=1li&Y}D)5
zGA@e^O-dXhF-X^M+0VJbS|U%Bs>>bd_xgVPc4=a1DTlJQPJ`}+;yu$H9x}AMG|l*S
z2@6p|ET>_)PkJf&1RB~D`VIrd**cJQDW4Qct+KpC*f*B@IXxn542^F|)8FZknzFdO
zhtWH738EvlNO{eEGW^%v{WMZMNe5RL>bsSHAUA;lgRxNm^>T`Q?F}|6kJ;)ToA0ws
z8eCrQr@-uL`}=!2zC|hw5cmw%=}Q$X>=b%nQm3D33h57K?_@%wfZh}QHNV)I-gCCp
zf;qy)c%Fx^d-zSiqcd2`!$w_a=9vAx`b_*6gDNZT*8LPZp1#V6MR`m~&8n|dgEePx
zxQNw#^?io5ry3Dwx3+9jt;PjG+(4v{0(Q<yzH+H^h&MdE?wnzYDS0a&frD}9uck+i
zRff*_8VD{vnS>#C4KjLjiz61K*m6r|uARZK+*l$=f#0P)jJN$$vLtK!gxSqO`{xvL
zG_}71R`u9#mEPImy|xm@Km^tk5iN#8GMSo&xvYERHs=w38R7Fc*;zI?U6oGoQP+y*
zE~)7@IHd4@_$c9H-H%sJHP%H)pOq)P#c^14d7PDKZkCYWi6(9_65G9?e^td5Rx2n8
zKaKw8E2q8|n^i}$$jzcHHduN*3srP?zd}$_8n)$?=5@)K<J9kWiYFh7uG@lS`Gl2Q
z_GfV7QLDcV)THuq&m4p_^A7XxbQ5vSr9Gqc@E_Aof3=!1&6|jZDU=4w-|2b~FfcLC
z`tU@cpU<Ci9G6~~NB%jVfp1${=B9}oFHKSwmv?(Eh(z7`4m(dIu3am~Cny&#y8ti7
zNOoQ?y2rxp3Bm`wNBYoIuB3bDwqFr<*^^*Bg!&o2!4%ORq<>9oaftfa1Q$YjaauAe
zw3q&vY5jood^w#`oVuay&-bC+N=*FUhxPc}AOG5-42}2UFAf6a%4_QuN-%eS5MvI@
zIrqUkgNImTgyHu0?cM}wn$TB@?ah`~yZ!>Y${r>qs@_d)a#t14)WKy&-1_3jbHMLi
zeec_bFBWf7WyesYhEZd0T+ZB#D?ClnfeDSGSW_TqT6mpmX++izPc16qqdcZ6=rD2o
z^?bf;I6{#JX0Q<=(e@R&3>>oMCvm?aT;9h!&U;~4hWFV0?lJn`8S<z7wk?7<qSu@&
zQ%FiVA|E78Rk@l@RBR6gb=?w*RhQnEb$pe^o86bAJ~0IwQ>m-Wb%x+$Zm%52+Fyj>
zX{qyCy>lOLT*MA{*Y8#Tb<#K7dMI*@7x%nQRFkfSo6P<5Jr@uCI~M%xVG;QcG#&}D
zNSV!t3$&ifUm9%i<DP7kI@PaV#~HryVv|R)f=+2}xZ?d{4Xm1BivkGEtUjD9-@_-v
z6iXeO`qil$v#m0x0^ffwH<BQx$0(M#wBql7K~1wdRo>F432#3sHE>UyA}h!Dg$RAM
zxK?k9Gw0)Oewc^ucK=M<{;p`mqq_Wy^%1qjT)2lSgmP0)DcPGMBXZ(%JPfxTpgC1!
zuf{j22x+~kkW8bPw;&#rgLJnfv!#+GPrnnM_3$Z{Qncucexj&du%ubWJc;x;N+;A?
zna60aWVgD$m|zl?@y+z0Yg$3JYI&C(_xM)n+o=2!;o3Xn`<vbmj#Qpc`?DRaNrdkI
z{mJcgUrTl*{z3N$zEE$W5{3@nYa&~0GU(JVRd?;~T}mv~_REsfRB+z73Wi|};1mAo
zcXhS%m%o9yUnlR<>qz(dDaz01d$msuUHW}W<Px>~7nDwiz8_0ul5OB$je92dlCd13
zDX<{?t~CWol3U;%cxxU@h5sRAw{!A+l@lk<pITdWxvw)J$7Szi&7#h%m~j)nD?}iG
z-1;##{(}Aj326E?RO1NKueCR~E`K##5F>Et&E$Iy4vyyQcy8A;Tm$6I-%#WSYxK!2
zwbTb|(XY(7o3Q9A!Trx60;xdp;Hgkd8PZz}s-($1Y)&<ni#mQrMv-iagd`!Reb<jG
z!3e>C-Mz-vuq}(1D5X<sy>B{sIp5B)S2%rFBE)k&^@af%URJxun-5Nr342UEuj<a~
zAdR6Da%T~q+borv2O`Jc$g~6M#r&B|0##cM;{TGApL<`OzrYP(_f5xOIaS3i5L(};
zx5oT-Wsgd$?svx`NlaAwBVxp?_c2Z&!?%CFM@N2vFGhEZ&5F5)gTP?W@O$HTmuQg>
zOUr#2HT{5~=KtdYC<DKI&(%qty9st`up2dfVms_SVvQSW&w!n8+Ooyb;lg_$U=}O<
zYg4*A4FnQByQ^R!1F-{hFTqYCES+q8;>(8&2C>gocO`VcKd!ox+pTM4ltAJd3nR`t
zXY=QJ`?>>bqXoOi5h^b0s?xKpHi@i>83bm+YA7CA%3-#I=$O+I*Lpe+yW94hPpESX
zq`(?9_{hv%Bo8P#rnnvyxau+cYroJ#_cpOLB^+~1anzV6kXH1qK+!JV&MW^?7DSL_
zp-25FwJb^nH?>X9{YQUdv|)K5;c5UduN2coj=#c|n=f4sc`rVaxI_>I6fjF|<T%gw
zu3UVi7xqm)NH3YYr107#n_rTu8=!c2^x$W8GEQCDxvU30@wVWl(<e*Nq4fi+aoR8^
zKzBUR;>BSBmSIUDFg#EgHw*)3g#CQd4%QU-O&+mV#O(yEezYr6(LMSlcPUqGATlQ@
zy@q3ATs~G)0GJO{WG?0=bDTU69W*O4K#4j=*->`?u=p1kBzrCR2Qw=~pncU0?Xo~=
zj6xh|odYvTuF%xs!EX;WJUk?&F3>QlrHmCyV!jBkn0gx>M+KC(AulX`lcZ<Er+>Q}
z$xT-EbmfcbeENY{z+E@)5uT?RuWeF7sjvF`yB{9>m%4^*=v(O@vlG)gM&3`iO14A(
z&4Tw;U>~83K_`sIrZ#^<QDB{REax<E2k`@0)H$vcPG?@(Qc=?DeKNKSXHg1cM#zeR
zg58JrzqQ9w2H2$p)y2btWF>68i{Z3OQuOkYFWK*>lQnQKFd^A+JXBGu3)QG3lD?m@
zd1F<7{Tl>_c=J49(VF+n?5!Zp_dUu8eNB@z<3JVD0rQ&t4_5{+%hBP+6e(2K7o#k9
zmXBPC5S9vmNALtIKXvVXlgs4$?{JTrh8-hQi8MU6DWNxhJ-dA_43;+^Z=~b>^6|7M
zn;dpuEFWImciP?l%1zNXr>*>oJ50rt)#di*4;9Kf)jdjrIns)-<2E&PG0$U~ruqhb
z%<A9esD)}Xz=9`j!HJYMh6&Y9VaXgF?xVCarpkMi=6GY$?2PW}l=UcaI_5cgT~ke~
z=wW2#`?iwYL`RL@r_Who#vgSo5~@t*)Bo5)+bUSn!t*J*y#%g~1Kl~dhm`W}WV%;l
zpXBK-<c{upt1;W48eC%P)VFqq81wwA<z2@Dz$N@fliQ$<e<Qy~;5}{v&me+($5btx
zI*2xDOs;y^H?YYFA-x`Ew@iU2u~ldFUwXGmL13t;CSLH1!W;K^%zul1RCp#j{y{MK
z+yDdT1_SQ-kPIK+h}4K@31dkkH99)EbL1Goi0|JYkUHu_Q7k+4RVgJ<p{7KFGj%XR
zu%CvSg1;>)E<R6zM?iPUE6N?X+WSWoG(GlpplF|83si-@>p`S+FN(sDvelL*LHr;K
zOFNoWuyF~k%VNO}X*L$Am;2|#J<_n`qXV2@J%68z@m}!Z7mJMMT3Yz}l-p#y6Ggdv
zmN!BW45HKou5*zAT{fKc1Iucw4MupJTxgIKEfhr_y0&@?FJ!A$@q9|GIZZhM;y7Vw
zcJ2ME7L2aZR?pNS!AZe%=z9Nlr&@1q@mCaSBmdaTLk^Z=EM0+aq=enAd#G{g&@XG3
z&=>ZijAf={JddrTk-DMB`yw?+YaW9wB?9eM6w&1amSJc-k-x$vq$)h?Sw`I2Yo|~u
z1|komWf6Zw05ZDm7_purU{`W0Ce=y4gmf){z+tei@J+G*Sayhafzzzo$)6J4gHmG=
z*~;@g9v#_~vi0(w!Ne8&<9(&%oKhY?f{|g%O{B>_CHR9<##GN`J36R{^<Ov?J>DsE
zSNAYdDWJ{+5Owy>D@u=Bro!o-yVJ)U$=f=A-zg&#%)-(=DeuN%pM)>e0LqF9aguyr
zgDqYHZH2}??_V_LYhiU7Jll!3iEcwO_UwkX2+GI!JkKerwLgkk-||J#UcLr^LoW&#
z;E1Zi%cuChN9m_P)Is=XQloG#ysyKBJ-@phYLk{n2g}G(nf_zl-=l(0Bhy>{932fc
zo6PfAuT{0$A*BaV6rn?9G-hn>V|Z$O)WhQwctNNny4i*<y)NGKOt^XOdoP82j*_+P
z%!*XnCteC__#kWg;J1<_js#aN<U${WyK<o!2KyUna1z!CN*oA$--B)$3NY)vCE{6`
zl^Nc>_Ve5mDVTSlTfKpjZiPNb|1f5W<c&5J4zJe~iUn&}0td^9rd<y80#bz|2TopU
zmc2g-ho1CKWq`CrXE)l!E?joR>LyUQn-ZL<#M3EeUR4UOX53J)AQecFQ-7G`2S`gK
zWlN6UByX=t7*D`{uJzxjz$WaI8d=+|vq^{s`xO4)r0?e`(WsP1fWwAWMENLQJJ+AU
z;1+L@%1MPE7?Kfj7ZSHOaSg#zB8^DJESvv|Z&D!ZX<FL6)`RgvXr<k!SlkchWGBub
zKJ}Mx<UXTF;r245d;%GMSb+8y!A>)n;BeO|2bIKq$$fAgx()lA_A@JE8lNI@t7WkG
z;}76K1GjXiWc#&t-;XGj!tM4&SOn-y?>hZHdn*3Z5bw06`@u`r7|&~f<pYudDCUcS
zC#3FmSn|lLO&=fpB^(5TANPny+32AJ2J{!Sm`@P68eAvI;X$yzo6BKfHw#M_*+Au@
zm7clbVKE#$y*ecGLECW35CAq@=HkE*)wEdR^*T`FMiXahsM9<TSG8FoBLGHM(1K(*
z8RWV<_0oNVJ1#78qw=154I3K#Au$HXw}2g7dI@=D^sQx3R#&yn54vo$uU57(;-(wv
zy>fvolXd^BDuL8ZP(6{7?pXit)@Utu{v_O(;D?=2K<f<Q1}b*IZU=Fp1*NsSu6qC4
z#eNjB<7uRJX%B;ucF#{r^m;PZSgL*Gg}r<iN}WZ-)T*L~L9O2N=!|1ZuuT|QOIQ4m
zxEMfO7mD4Np~5~fhJA6es;Pt~+Z1e+F^ZBOtW}ALR?|;4Z9K9>UAf?K@TCas2ABzi
z(qRX8cFO3O9w8e@o%Qd3_$2eTP*PV;@Sy!Vfz~a%kG)7TBqevUDGIr7N)dreC?aW(
zCuyRJr3xzbJI%=2G|#5avyY0RR0EL$eMUu+?QsRE)+s?YPv-_Aaqo)R)H6spL)}T!
z?Kj?FA4}H}TO<e$8@Or5_7(L!gL{1MCs8UtWR`x<<iSzK3N$#Xsr6{`)nj4VMmHY1
zYC1->rE_rdtiGTqS2}b*#*3=uv9g-6UAh-@+*`Qb%Qg+r!KC&F3tUOluV;z@A=0)&
ze%*$MZdZ5!0lXm2Cf~tol8k}0)4L6&%yD+>0)dvrh59fC`$T$L5C<stq(9i=p8nc@
zKY~)x<aFS~*{m`UfLj(7REx7dvS812o>G?EDXCBrma(XD^v3h)ul3_~X+CkPTOvhX
zD(_1JA1Ls84h}ZlC9_h8Rs`^YI{uoOqx9~lm#IS+r*n)POT>pxebB~0eMwh|9_`iu
zwnJ@%G8i}bKu^4XwX0&>r6g%Ln{zb>K5maJkbR;A4&Lf3gnRN(P57f|t9sC+0BV9`
z*%u53QDHJqSvyI`!+{X#c?7pQ`>xl;!hmtt^zwiMC(rE522$P2UrmI=`9s}ltP3bP
zo?j{-K%u(?jX|Uk$CLN{y(qv4!X^CSiCCa)V;=%2S~p`LMrl=Tzze70WrzYSVf>H^
zfw;h<Fkh@|yY_SQD*6mukZvBZXqbQpYi8_*lzO)j7t;GUhfXP<|A`yRXH(ssiVhF|
zpvDOr!Wu<BxMZ@uY6~<tW$<b^Q{0uM)VN3tsLm+gU>nr4^vQ_Cx4^ISbbF&!9qu4R
z-fZlpkwpRBY`kNCh_VTYBpT2<6OPfDT$#0%J@6g&$!i;gh;|YQrP2FybTl}G8s`dy
zHmee*=1S2CHr#Xt%DlVEzJb&lt!e`D`0{#(Gha*&A(V^1BU*gVJ{=%wU@iT9xmC)d
zfY$QE43y-hL`@_}us;77J<5TuNwRPgh|_ixDfl9{ZCMWG-7;l2pdbb>>JfSjtUWc-
z^V=<=OCKu?4w)brHtw6*g(pE?SuvSfN!J^j<t+7BuQS$(+wMLmpw&Lg{Pqi2BSdb}
zOME(P`K*aC;5mkY=%O$zX)AMh%S4l<8$T{;AY}kk`YRO9=nM%{qDE7~Qw6yWR(iRh
zAZtg}1K#ij9#}w?)NROL+8jDHeVyZHLb1)+tEg@=!^oTujDSXTFAF+BDMs%PC>4(U
zr2u#rI%_#3)^D*<rTS!WK34y66iG+&;}WGatL1bIh%=nFP}n3<z}Q}^N`Vdy!N&uq
z9jk3`XjqT=LC4L8MM@fU|0@rm`9(V5qY#jQc;Sc7IM!k%+Xf9aI8xASK#w@Y7|<3~
z(V^D`VhrKdy4lkb;Ab2N%J9H+?Bkl7B2yusLPV{6Z*gGh-b0ZrEnZXW2y8=L-~E&U
zoo#neo7C+~Kf^bPhIrFZZ-JuFBP2Cgiqo(Vmi`bbomtJ_dQlh-d6UE0SYQbu#5!M0
z^FP*Q52M<M?Z{zE3V51pJTEO@U|HG2NG6|B1QVa|x3Hc`$yEx6XBO<3+J&DJUR-Ou
zN-4h<Szf-}f(3pAv5eeLDuw*eRZZT3u1W~O2F@wKbL~8l{Wh^8rjhG`XK+{_oR<UV
zxK_x9Nzyk)`rjFq%)uxG4@s8p<%nn*Iiy)BvJ^m=<+E1z_^W0_L$C0|%XPyowl*x1
zG05)+^lE3f6kBA;aGTJ3=|+K*OmWZPO;NBOra%YH>^F!~{t?m5MTRRkdHT@|AwCzg
z&*^mvcf&>a5#E`=P?jV84W&%lu+M}$NV9z@qKoe`5Q>8djZyCR)IWg*d%_SKI8irt
za?Us1PvI|SlP|Tu0E!z-1wxzN0ZMor0rcwE-am@tD7EAW{%Ytk?LF}04k^4n4OyPA
zuunu7<}DHc#snaL?yH%pg-cFkY$9CU+2Wo|e?Q@W6-K)l=?{csgs%56B~BWuDyiW!
zsM&V)VfSE}S0s~ED$QeD#tFJNP1WeK9tN`1`9{*;=Rwh@s=$$t5!62^aaTI9LyRIX
z2bou^VJy{IcOy_Tmd=d4u{%Bi2hv+gyO2mfJPm9S7vdp5?bi1&sEe})w;i?zo6W+)
z%PVp?fnT)v<R+}Mw#Zf^kS&|nZu4R25?`k(w4hYSWn7CPqUz7=OM@9({m;)&xDmLd
zVpes-G+#m*jO(*$Y`6KY$r+r0QN;7;-H~#T-0(Jk#74STdy!l1R>{Swb;a8$ywsS<
zzlDMIfbta?58(UYXz<Z|csm_00?3qAOG<mtIR2han2!eK{gy|jAADq?{r+Nzk#a3;
zcbEo-bq*G1(Y@I>OIMy2dNAPI=6xN3U#Ckh2=7HQJkuLOP`ZZI7B%hugP}sA$NNJe
zXWy3-;{p;A-P8nTOLqi;Gz=t^A6uCR>>8&~qzIR-fIH`<YvZW1y|Oauf@qEnaN_<|
zen?1(;9$i6^!M7YI<BT^xxRWRakg|qNWa20ui#QL@iG|v#vlNVjSNu1)U+CqF)%je
zlFtajX8PWc#N>If_;8dRe=13{KU3F|JdYuN$$$;mx$1k`%4{}guE}3HsnfL2zG_JU
zkQVxrV*LUPO~&WKg|-Ml4j%Kgth?ok*$^)T-K>-lnJ_YPvI8<0&@wuosRxGA+%ll_
ze6?=`hRx>FV|2~k{;{q)(=AqvA9Y>;`>>dZ)cZSDAGrMcZ~caW$pFUaJ@uHPE$8FO
zvT}!cGGJNNqr|#8B7PMAxk#l?)?IrAL!f=}b7tN1*gYB<qr1AekrPo-HiTH<l#EI%
zQ_rx14wdz*ky`J6<f4#25T!liJVG6FuO78>k)^Ndjir%Dkx_>L<|4_y)bZ0h^bB`l
zoh6jXoDlWM$h0%v^D=CHs%F7^z{t(jt#El{zzoPlih%ISEPRnkc<r`0LSY(~E-&cu
z$pg6VJB|jUQ&+y%vkM;?zTWQH(?Q_L9b3H)8Wmmt1Uyr?6(w+yhYBx1%<J?C+7k<T
z9w;v((0E6fWk8r)D)DVv+{adF0;L{rOk>mdsv%&Zqd}utx<3Qfyr!xEGF%#TwB6~M
z?2vP{=3j!$U-~q3DpNVbA{vOSC2X`ukeredO3^mWO>aE0{=|>noF^PtfAg*WxXgPb
zd?`T3<m&l7ebx}X4Bk^fq!)=r@aa(8`YAX`XB<R)E#g$<WCdJKJQEK(u<%?uWxi5<
zNk+!*5-5W=*;{{QrEcfQwFK$fTig7DO2mbNHXOvlxU--0JmpWp-V)M&d83u(N|OI>
zZr#kdR8g?*zTa*vtj>jo%Z*R=jwO;(f{po`Pa>GfyiUA(46CSNAQ^$1Le8}5e?R5?
z{BxYnxxt3)%{}T_Ntmb4>MS3YP9XdA%+gnwt=rol&gc!v<lTW)a3tk<c&~H3qE;S`
z7S5Yytv)-8@>JtTQWu)`{zijc(d8;K(Pzr$1lqycC;cbbX<$K#!@%7L3hkg9MT*rn
zY_?9}ReofB;b?TyrNRtcn<jAtYoo?!7Qc%|C`P?w)?+bXLJ%{!Bqe1a1r3H2>%6me
zObU~`j6SuA+s^fy$)n;#TcMbJ@$F+|T(owb*AOLvVNeG0067aKS?bz}6rv28ZC3eM
z$)j^tC6<lah`wQzn!&?I>dnFGIFO!9!H}NZ`x)HE(|MTr?kuJtONqQAl?>0O{`uzv
zll62cLm|c{Bl5yFjXh2_z-nUnMr>UGmM~9=D8@!7H53`8S*DS>mSEXLqtF36*V3fM
zJ)&g89Fs!OzmC2rfRE6gm{^ws5DVXF&LL)Ryc9{LOY&MzH2*FtAjB=@okTaJ&r;Wi
zqG5$RVcI|By|8HQB`wd%o_xril`zro9F~-ZH3ln9_>W&7|FNUHd3$gt*TgRUptfy%
zC}XlOAN(@4%UEITiYB}x^ya;LH<R!hwtnBjyxhCAeCqdII*=a2+IlZSitL_N!>@Pp
z&~+aX)eK(Y1H(fUn1Ym=Pt0-0&UyED*@O>5KR=EqQv=eI#46^|j}aG7Q^3=WWGLj_
z`*^RI_M|c-%wA!UMEtJkQRW=w6BXW6ICj0U8!>_(Jq~hr*JdO`r?9P=>7*OXJsmog
zcOidt(2t_$dJxQCL;q|<ha^a6WK;!JyFSr{y%4l(9c%}AS2Yzk4SelEi35#+W`E9>
zDdcm^9brrNkGElI?!xw!?ZErnri%G}6out|=L_nj7X=lsWIK1qLcYv}9z>4-pnwfl
zrl5y=%iIeNq}B=hBwfm@3{xJ`{etZ|@X?gw;29KSOEg%UbeApC^^-J=Mg40w!dml(
z{3Rn8GjwyAK~MuVt`v~2ez`NBJkf?CWp&<}ZK3%->;TC`^AVh_l61+;H!JhgT;E&O
zh#ObpF92cKLO9v{-O*z5dvKi?ko{R=VC{P$(Z2dHtoW-|1)Wld2js&GHqMsuxx=pQ
zYuzC8v3H&&cL<J4$2Oc#A`{k_t*!;U?SCa4dW0pmh%DrbKOZlA{wB5Tnl9ejo>?sd
zE7h#ILn(D-8FjZ&9Gb|rm)O)irY?^HR23xjog-@CS4a_)C`S#Pi8O(o#*aY*b8E-N
zopUN2+FsO?yX)+|3LjCVWWrZaSe-ciE65g!mRf|;C{=5AQsdXQ3DfG&5n3!<)1M4L
zFsye!FA1>x{CeIH_{I4~K2=%XI4m(!OSewBwD;;O)R@}oPp%@nJ2_s>J4}<Mkmlt3
zk4@gD+v1n($jSS7((mo+8Sm$#^NkB1cDD-W5i%8PnuAeSDI(}6Vw*Ase6O5sfPD{t
zt`=5m`41?KJdq>nR;im;@*AF9I_pOyw*L$!TqRxoW1uBkVmn`dab5XH*Z%a9E<HWh
zJQ8CJY1k<`w-mhvNYCQ}jpwO?t}rC88+_I8+-OrAHP}vqe)u|uZGQiUGYdp3B8VWr
z`<i>_4q-4^gztB93-m{Z_Zt*wTiD4qJPDd{*D?Z`U)<L*RJ_7xnDQne{<0Cz^U|C+
zt<H!WFdwJvUT*JcsJ^K4YaeZ=dwlPBTRaJ|B_YCwMN|Cw@Mi=RmuV|!SNfWbp858s
z$?gAl#O@S%nA}_tRZBj1`kK^1>ds~-Me||8lgKJf_^RhxQ}pW4N1B;|@>Q_4IT5Xz
zGQdvGQMuh_BK0|O<|6T3)wvi6Ww+DBmqp!oNpNN?K8<EG#btCVbN{GfqI;KdkeZaI
z_a9OHuY$rVBLEEe^TZG@9Oi5~5QxHg52@!hj63Y;f#@DH)arqP|DK<cp$>)a^Myv4
zDukCV=GXSfxLrR?hHBo~Xyz|?GByr-s=E3KuM&>Yu<7?P%Wip$c|#Oe;GCW5Cs%!h
z<5E-b>A^Y;DRte-kttVXvS(mqk9<M7nq+&1^mBR_d~oEcc}mtc7|Zj%()#=3HYUsI
zQx7*k3(qO7X%?WccRf?T6)A?;E+$=#(vdn(aiQ3(RfIe2gvr<=a@?81;23cT&&gUO
z5C@maQIeESC+EW@l`@#YZx@b|a}p8VH>cKDm(R*`OB1VMMI?H2*S#WEgSd~fGivJV
zbry#x0g;Bc&S7|vL+tP#d_Fa}8t&V3NEW7+Z$V?q#_=;x@*AUF1+2H>`Ag66+LNqR
zpl{_bi3%?k7IGW*X2;}P9Q?5|&D@B9&mKDKHj|x?l_~_8J%z>^tauyRUdH_n-rM^n
zi8vTVQ5xptf7d^z!><BoB<?>h*B?&u4)}($xF9T|o0oxu+ByxVy^q4Nv+QM}Q<=M%
zqoj3a$>&lZL6C_^3FbThLc@>y18jMFSJiVLp%MH5Tu_jAl;OD&Dwj}~=}1BQ!^ikf
zgP5mvRwnVO%*@Wlj)$CGsleUR-Ag|_4^pQ!0;R7jzX0hByP4mXo;Dlu$Qoc(KBzy?
z)sfn5Y91=`s5U;X*R8RQx4RbJbqCMh`AygSRe@G^{eA^<?DbtlDR>paQF>qh*aJYG
z8dYeLY>z*4OVW@`IA-?7T3hp7gUk9|o7AJhBl#az!7R1+`8kzl{|(miT09eDsO3G?
z9JUr1iy8kIXAthQ7=V>p*A*1HM%8uk_i)`rb03P7QSYLGAqLV>W%!(xGIYf9;A`Oa
z<|6$3%>)+r$r_D&{y$I@jCvVwOy4wtR#+zH(@Y83tXEDmcSZCmO!5IU8c3+f?_QsE
zCvr$ay9#@@*t()&y**Lch~0zW)JldYc3)UqR^h-o+irFCuhW?t7#0+KOeM0#0D*!~
z%;V-mk`8nDEZNQZ?9$&sLA_cBP1ILky9klX&Q<~Y6g>E-!0hh@eUD3yNmSWjt-`sE
zz2$QUM{wQc!i0v0Iao@*Oh3Vt*<QpJ1Yq|c%TAp3w73{1QULBw6bkp5J(VHHYOy9f
zQ|}!eCZ5LV(r3xEAe%^RRM+PEm<_!iWSaoGgIZAWV@5ak$*mw}WP}JQ%NW9yIq#d#
zV*Z=l$R^h21!Sp!{OT&;68$4RD1+!xI6JX>iok)vq`1Kdl3y}|c<{c5$&kA7qWJyh
zA2Tc#0H86>wA0dqXBoRH?|duwF(EQ?zN|1^fX|b%@ogiOr;N*xXMt?R@M??V!lgcb
zALXNA6dBy0G4ckcY>;#L=v=r8*-a3i9oVSKn@nrW#je?~`z6{ejE8TDS_8d?$y)dn
z=t7kRmqPBnOOH}bxv|%zC>*EmW+%>9;3b9#GM%#1NNZuk(-Z>OsjDY%=}wPQOWB+K
zb;ZB=9_Qn55$=_fJG>%7k3A_^R58x4A*sJ7J&N5J0RZb?t(eZYQD<kvV$Y{u`9PGM
z0t~L-8)VZ(YOgjg4=Zt9=tIVw{83GX);q_nH|gWu^d-sbtC25}_t#A!LBW!}STQ<q
zB+*4eZVFapcGzVRb0X-!ewtQO?)m?2t&EiAqg(Pj62*Ic6qx7&M??jAfVo2ga{jqa
zFBh!GLSm2@Vj{~cE8yW_n-cfcHDu{l{cw>X5A&8=z6xEsRGQbwm)0Sr@bHZerWi%H
zS-Wg$=QU`lq%{RBo!NApuODblTElbZ$r>X!Hn;<0noC(I&Z{Gg-=yxd2NjBTl;!j9
z{at7O3Lk_~^JT7BQ!RWe8NcnUe*RrT7Wh4#aJTC*Do51FBM!|+eI_19x2!3^BzR^*
z+yo)b6*f+VU%bhg_D2ZqGPSe%I$6Ot9KImTT*2EY`7*~P<wEkMX?~Q|dt?l30{{*(
zk>+5t{ztM2)Iyo1KjD})zo}!lvpTx4K!uacn-T{{`rRJ7^&gvRbF4;**6F$K-f|vU
z`?bj9*reOzRRtLLSdn-X+10DzP3MpXrcz>3uXGS^#<PqR&DmS~eo*-AeFVT2Sni&{
zJ<nF4Ush#tA0RSyzo97MsE%4vk%#?6HbMNJoS+2ov~r!f2Zmqm$qg1CQT2Y-gd|~W
z&XDlD`e{=nM`vw=*!<Z}^+(Dj3yJe(u(;nw{JQ{1HAErpjvm$y@^If1xrP>H=Ma&;
zFp|pMjM9(G24Wgh6^tz<-EQX{j3$J(>W7F&;hi=>Ud~8}BbeKs1@$`Hl50oW8s);~
zgS(vnTt~P%mGKJ9CF2QqZO{EfnHE7-@dUpLDZ>L-<vO<~SUSE;WsH9rPp9X3QNrJD
z?@J}!`)B#~DA<`YTecy0Sj`OTohT-Rou;ljK-1qtM#p#vxrPtjyqdS5^VwT_R6`<k
zQs%7uCMAIf`l@jJ9KhoJs>g-J9ihl>EpO@rL9?;f8<&2lOt(@knuHN4bfTE{8!f9#
z5Dwm4iH&cBXFK+JO5N=q&5vC=q^=D#_xTe<)IVy*7fdnCI^90Y$KtjU0F*{M|7A^=
zFiuYT<61*<I1`~L=cxGKx@fAJjEv%+r=Bt=vEUw{#tK@p+2(T^{RBpSi68!s&N)#5
zg=!Gakbql`nm_1UniV1g;E#+0;VVwT85=O#cF{@J_x!2YqZ|KCNO^~f;l(=wVackB
z$SCfrGtuEaz5@rwg3g`xDA~>|yKUGrhf~JH;hqP4I4-jV<<Q+ivj34@kgS+wU;Sc)
zVT`X%lg*<*f&df^r3Mv4SI5fr9qeb?9Jsh&*FQF$Qaz<^y+^%*w1WRH9{A)G4pgGr
z%~kv%HO1Z80OVqt*1gfiu=e1)D}bL;Tz~&D<DY2s`UP8BYl(zRg==IBBWDyz9~NQh
zM%#oBZiyX_XG_u(wa6fxS{%`=^IUu44kt1X(js@rq?~Wz1B*QRETbNLmJz=*P_B5F
zsGAI|w~(gt>pj(U>+z5^4lXc-jgzMT*5JKqG}}kI6+JEs3B?7EZ?yF0-qJa&cY9K8
z2s!Av15HRPvUEtlmZ0#xE_Zo-`lIQ;`?w&1h&00HTHbSCp@U>~fZPA(VMNje3kZ)+
zZ1{`GFJ_Jm6a_OdvVM3^nzv9*eCP-H({`c-(ChLo`q8vpC2$NDr)K(m4taXI`Od!`
z{^wMYKg>T49C>SPzwx$}v$AYQp?yE*o@pk-Q^RlM*AnO#+<M;5n-AanXK|N4UxICh
z9pp*fY5h4!v99{DQhkn93SN|~+gdO1hFw%_fm_#TmEau-MPJzG$6zK5t3D$l({4?N
zDe7jBS(~6zJUIUH;gTT_Wbj9OR8`!}`NZwp|BYN?;)!9eUi}fEem06TBvK3j*WR7L
z{gXtdZTk5Wo^sv~m3@X-{u|uQgx^0JAwGaUz2z2svkdA0Iqi>^<ZC)`=h;Wp_fMy#
z`g@DU-Y^b>F)fNI4wp1>ape%fCE<G9+$c-`zMx_A!qGub<HXmYaFO$FPv2hS)y}+m
zQBM-d=o4|8`D^w)P29>Y^-O;Cu9M{_<tAzb&$GI9Q(-a?DFR#eg3f(4KVQ)Zy{Qp+
z{fzIlR;J#oq7KWIzhAj8T&Yo-S{XZ>oZHXOj6^=*(yg`9PTNm?%mtjv$Er>T(4o$x
zpFFu6nl$vRrd}wu%4p#v;|udyZ_+}~gU51y$q2(f5@4-5Ue~=InjxDtEOctIbIJ6y
z0wW585n%T|gXkH~O_koRJTN$s{Foa?K|@GRC<$4Kv6SUe{~a{?>xqYQSa|qsW;1`w
z`v0|X<$+AUfBZ9ZH_OOvXo#hdGv}6TqaqcO9EA{unp-m|G*?8C+=LFHFV=`jh{6!@
zoioK;b97Ly-^aJ#zk8nN{eC^K=k>gw*XP*h*T>r*yTf}V1-ZiE^vw!i!h0&ShJj31
z+4NMLyFo}5Ym}jxnU&Q4E8}e-<IZ&^w-r-|wlbGBn7*y)B3)h?b(o?804k~kf9R$s
z3*MO--IU0l_^hQn7_W*z%)J1^x8{W%)w{%}Uhmkp_GQ1h766pv^Y^g=(%ZZOZZsFG
z5*lkr<G<|+-ObD*<U4G5w&oLso2X$0IcpW=+}O=^u`Pk=MFz58DXq0xF~BdpQ8jO;
znsE$;deip-v2rogVcmiI8QPUHBSS_Gwk3Z@UX5elYYG~coD#E3U7*(aUvttSrY5|v
zT>LQt>5<6h%XZ>vei}`g=cn&h6nx2{%bJGbC&XdFi}R;_Ee!1kG~A<DGKe(ik<LuA
z6lJwdmhyui!1|Ad!B%+BNYKpxly*!-#H~jKeB(N~@7McN2t-(KCOJ6M_FIR|<`19P
z-`-P==q`|!rPZPd{g5CQe6IeVmLm&zjN@m+>5@I@2CrH($pR_5q6>+b1FIqc`FKh(
zE^JlC?JP^Qb6@BM#+_&{yHVOfViLZ|Z}YrEhKrt8UvZ(60_MS3vtNG2{U@S7A;IQG
z0AT&v;}2=fs6r{m$fO=W-WU`9;e9o7w=##bG;6TkD>)=RQJ@Dpo`SM=G4|?%7B-j_
zaB>4!=g~l#dp#(M#z^j{kjPOQikN^`J=7jVOULL+kkD1L@QJ}fgxsAX1+cgOC{@rK
zHg*vDW#~vqi_z-aS=0E0#jXr$#i6$^xl^{tvNa=x1kXm+RLi1JczwDAAUu5ocfR_k
zt=lD*sDxmy8>UjStF+#kTIC%;OY5)Q&b7pF9$Nnr@5_k~RMZ53`57G~+i_QWIrL0y
z2Bo<nsEsh_MC#XR@b_hjr#*V@CF?h`s7S}$XBs@y;!r40mjr;|?$fS;>rToot~rgZ
zt}!2q`{YTqsG;E8LidubPcHg5T$kB9DJ>4<CgW)ndF(B8r&#AB>Z(TUGANJ}t3opl
zxCVz^GgB<L>1jiMwc;yv)30E0GgGGX?O47d1s?2G$3wL~-3j058H}SE$6<LkNe@&p
ztQotYQDGX+syBl=XBy|~&CD~^Q0SF)ap3S^WPSyJ<Jx(zy~M^+Av|{oX(xVi%wX6*
zF6&lOUQP(<TTmwIA`>@6H?-Dv-!{u90}|&I4FKTDI{}=;ufROj0n4C~uMDe4&+J|P
zVU;qDosGJ7@oG}N!q4Cp&6rPe+yDF_l3|b1WdJ}s$n^eYU2r09G#E+Lob=QA#>IR%
zQvQzr73s2Pi@jyp-%oeg@MaXMKs1!CNC5EZT{32bR92ax#$$hF3s)vfEMp7bLk{lo
zL~G~`%JQjlWyxr9cnD^+0p<CjB)hft2Rvk(I6|7qWOS^zttjEs+%3=U`7d#NDK`Z+
zIL;vSS<Ya8Y-Sq(Z1{~<*@!wN6ZkWBXXA_>)6>T+2rf@!?{u}IAD)_cX&`k|qW%@R
z)nt9~7Mt%L<eUx^D5&#n$5|Hf#Ml-(l}t7gs<iH==Q#8@ZiTVLJ70d(&MuVFb;u{M
zHOcqiFTHDG5EZf9W{v^?`OkxPK1&mWo0!)pttJxT&6KJ-k=3_6rXBc+PrU}shc{<t
zB)=;|Ns?_h&8U@}`0>m!u;?V_NJ_invv>X|Dn)a+T6}Hx&VRMBztG)dc78V3HM8;e
zkcVM5|6}e&Q5rfG%(eE^&lT{UZoleg&4Qy3M+Z^`ibR~HSE|M>&xl(md$C7+#*}b9
zXm~9)nDqowf{+V8R|f^E{-ye?{u+2=cD)v{B~v9LGPk&9pn7rbA>+h1RLV39;bO@D
z9X-=mkrGX5F(@w+^yb97WPAtYguM>y9xFm-iPOv}xfrgxx82JU8VVP0GVkoujaNOa
zcy2~VTGX@nJ`B@&S*QxfdP3LYD4FPr0D#9)zq1?GiS|aENdjXiMfrV(p2M+xovrBp
z{i>+}VS2>#)mh>lbBA5FvU2j>2py1oZaD9l9T^<&+O;Q*k4BqrAFj$me!;=v3%&GM
zy1Zq^mTK+~!#9Ra;pbT8ChB_N`{x-!T5Oz@^lab}brjJdjlp}*cmNnCFk>-Ak?0o<
zais;n^{dKa%3AWeo)ncu)@)*&p6ZHOCrMe@S%gsara%71#TUmEGhRz?mm=hD7D1|F
z(ML6{6Vl6(;xaVzt|2B}w#9|~m8*3~ab{uV6HWE0i}DYg^k>(h<4?*yz^&4xv$BvL
zJ(uZ-NgR1eiuUrh4=27y3m7leAv}VS44|8%0clMU$O}AMA{X{IvR58SEOh(d)ak0M
ze>YTi*nc~r@~9N^OI;;t>r%+tH?NfW#ZwMtsAnlc&#aHs#=lOrbd!}IVY(%`M?z&e
zjA5{a^_OS<Sjl6r7eQ8xuRW5o)~<I_Zj6sj_;DxJe|TrmI<~$pdiqe+kqu?$j#tdI
z=|M>jml)&yu1O%bpS1wvzlF9L=r43KGrL~k9$V@_nTrvRy=Fcd@l47KYRM8sq)EeU
zgxJpmd>#wxoAEp8<>qC+s(qFhw#KmRc+O)iMKd>3;K^ir7_Vg)%Yxr{P;!BR``i-h
zCN@<0XDk4o8}`wnK$V!7fQN(Iu}lkyxV-dq;)Sutmp-3ZVbgl>tjEe@jqh<|)m}LN
ze77BMtv~Ny)%h0@LT>paRF22j!Dy9HD4aUZe~NDmg-VAe1L6Ax$kP5&kdDT#Iw|N+
z9V-M{R1&fVkAN%`Kbm=>mK~|0uY@(DB=+zLVxa}D*QTFTOzIX2L(NO5-kb^C*yur>
z{NS3%{;TR*{|DFgm>Vnesb0$(FGS#Z`hR2vNj|_=OXriVN`}=UbQa?%3Z=*3RX!&P
zgr5h`;zq^3T>AK5uw}dt4jRFfQ|-YbK`lGm0qMO>Kp;9#)V5d|Vapp?{B+>>?={WP
z<+<lHuB-$95%-6PmFN>8Ljq?*cfWV1`Bgw4{5L2@M)8sbk;~1^(Rq|uJ$-|*T$^xU
zzcZgQG{RPrQ@cA^^P?khJ`RjOr<hC@DubxwuYGCn6(8kD;s+V(KPd@OJOy<V9PCJ*
z7NQDo1n#Y*OFyr&EsZZw@Mx;o3(Khvz31SL0{gb!zs>ah(mrh(k0<#6u$qQ1Lk?$)
zai@q`Vj#$pheT^EUw;|E@ibAYc~M<fTy*bOu^)3}p(2Rja0Yd%oR`35aD0zOHE+%g
zUI8-rrz_8ab$n<kf&1DXkw0!(VEGt;va~&Obj5#E)pY%80)A?MSNXam!1d%1!LZE@
zt*?eP<IlIiA_f3u?B8;-WIy?SkMV{A#F-Le#cN<}J9fy+Kq5lAN*&DhUX}Hjj4D+D
zxGGf%$H%I<=rVgN5dwYyjFQBSMU<!Zj!$%|hHRYLn|<y^q!MZ4DK*%XB{-rjK>l*M
zwp-v;;3gvCX+gpP>F6%}lNSjO4Mk{X5x8~W!2W<{>d%WxlFKW^J&U^(K_?wgPqAUO
zHB(vqSVY&Q`x3OEfdmy;4{jH3t{@mY+j8}Jf|xN_Ag`B+rK0RVk6u`?R;jW9bE8!V
zD+Bcse_q(F{&X?{4+3xC!0Ufcda-@S#=ax1!Lo=d?VVCf3mT#%iq*yw(sud)WrQ~9
zAT-u}`<Ptj9&XeYA*DxSG7}pXEb%#v09oj)unqG=Ih8-^;$8wIcdu9V%Q2+dCC~z{
z;h+VagYS}EwW#nhDLK^k0Q8dP^{)@8{vpgE#<6r)NkH-1nuum-;y9ad?D&5C9X2AZ
z=)2ji+#8{dE7gpH8tPhr)uq!Pl2#v-%*3Yd2l1It9sTHJk+MX6`k!M>f=LUIHPlHv
zA1OwzbB~gl(ry<(TZ%qU0`FSrFIOfKqK*;o!VJMq*Si!4))&~8uAu8P|LU9<ob^V-
zg@|JbN*IFgQ<T@e_7P%#C(DB}!Jk3KIeQkzyEgsxNgjbdKt{#gpvRRpVm+-dB!-WI
zP8oKXrvYugwzMZwkV<hd2K!Y|tFdE|=*poV1V~!?Y?VGGYKWruq8Tg}mwf<UKzr2@
zC)sI-^#`ev5L9#DdGjmLDS*R}m~^`gBDZ`-O7}E(Gyg^y*xZ?@tG?U!em*5!|06D>
z1Z+)nd|>GxarGVXvG{Ry5Wo*hp5fYD1&2zClkV-5w710&Ia%es<MHg6TbQQ4{e_YX
zM5!Zd6bf~FbKj1rz6Jk7Zt~*U?#zKWrc*_9+mZpjoMD7oYm#1UrZ;^Cm-G@#933SI
z^!wJXIu;+?6sU4!y@*BKK|x5C9!HmMh#E_P)-0Zz{B`jL#_uUR%0N#nRh4tXh?t7c
zwxSd6u7rg*dY=Y^7=uB)gs0<dO%s}?)K8jXJs3pD$)fYu+ty@{xJZFfKqx<)_Mi;d
zt}3>ALF41u2()c3cjA4mhtC_m`%Z%Hbi)V0k9$1uJe!j*L83L>+_&Mul1US)hWIrN
z-0bcOo0|Z=%p3!_2eJLH0#>|?&A*!>E;^SutKM8Vko|If^#gXV*$xxhesIK3>%*kq
zo;uP@yoOCLT=)MuoZ`fMQs-&9j-TrX?wzoWcAU=gtIzi(%yLA6Qbel<=p8xTVmQ{P
z7Hba0a@%b;et(v(tCJ7;WjC2`vYv4J+k*PcbVYt$hi(&sX3>?%P3AnOTR#`r+s{ja
ztLqa}-^<N$Hgq3#q%nt68i?7hCVjxY$vUL=<2=d$Z<OSAD7tiRJ!^t-E^U;!y#C<%
zex!U6#=ErOR7#m_Rt?KFaP#oW6u3y+Q&odi24t?K)whvg;zc|Z%YXK-@m@i@4Uh-O
zQ-wKZ5fwbt&&m10zZp*UZJz`9kP2%gEudu5v$7L5Mh)Na`0g#a;e+*L9ZCzeghjqP
z>a$>37EM}S4+zsH-g{r^4d89{=4$35OB(tmS~cOqjDw~^8Ad6qnl`^Rki9Bx7Emn3
ze%mwIJ)N*?D3c2(37tXEEUoflw?(HNKrgh#mi@<AN*`bH5=^V`f5QdW6G`ul83YCk
zb4s-Q8q#`~HD56YDi)EUm;U*x2EtxD0mWKb@686hg%SiWBS*u<rD&Fvo&~oL-RVq~
zcrz73L*Ud5;{@vW6NsE*z}o1m4hze=p2ukVT^5pS&1H;U95<F@*0i<pwP501(Bs=F
zLK1jM;H>>$&pHy+*kE(ljnaAydw_P5+nK}ACotejh-@ouHxj%$H88>5g&h(A(7t<;
z&1}b*6O{BxsNrK+ed0q{0tT|KH~R3!$MKf~8zrMYK*FNil_++?!MdNEp%}>GIeImn
zP}rd0mD566+K{Ig+ns;jWaP3E!BS2$DT2t=2nR{yQq30HBd+9Y71_kd?n^QSb)~?!
zf^*ZJd3LUSehNo?-e($O7Ge#>D&VGPd!G+~AM8oJSJG}^Z2Y#}fOLTNI#At@dsEg;
z;DKQZF1lP{`}R(VTDpM%kY<=LeLO;|mObfrWg6B#r2}6qp2QVgW{Bm|^<yUt43{>}
z@%5csf4A>5L`L7b<bXGj06UT+ZG(|R1(#>b-eMNg3+V@$%}KmDV&{2Qq^m^3da7$D
zdrJrU{&kOphgk-+3QJs&1W=H@>tr3;x(yyFKE-orc!v(*-h@O#-0Pyzb-NC(P#3O9
ziF60)$dO6A4%d_-)}XTG(3nVllaT(|lE)%U*~2JLrB_Gp&tK4tI%QHLcGaD3VUVOz
zWXn$a_gAnimkuoI_GMFK955JHhGcH%%Jw}ApLIeuwA5j0h8hIwfDQNrdqXr<fNl{l
z5Eq~|Og5JiUQdqmUs2w?s&CcImXCi^vsbU7y9V;8?bYTTOuu*X4$}dA)CE|YTbosy
HxZV06xm0HE

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-64.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..21445440acb8199ad2fca6c0689eeb263bee41b7
GIT binary patch
literal 2534
zcmV<C2^sc@P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x37bhoK~#90&6{g*Rn-;8e`}u`FyYY-NgZuftWXf~N!5PH17eE-TLvY$
zR{|E2V1u<|tyZhdC>&^+QA=BGJJaG6f>@IDhBzu31#JT)*jBK@h=8`XBBC=WpcC@W
zJ*yu=G9iRy@B480f66)M|6gm}b$9kzd+&9H6eC(6J<o*9b&5_Al}U<T1dIjJfzdz!
zoB%#k^td4JD0;wP-Zq|Tn3Fx{NGju#R2Yr!h+b_1bE^hA1L3L!{HTh)ZPaYRP*s#u
zv@4l$LJ||OY1gKV)|S>XLCS$El4Z9a_Mub^^M<XSoin>B83q$h!1~SWN2H&Veh<Rk
zKvoiBvcYkb-*%XeC+6qQKc0x8xD%kNQoFr&fubuBzLrQ33E&fi2a0lv)`^J5V<4^s
zRBfxeFeITTff@1WlMO|81YWRkZuZ>wT(u@1hn{$s0J-sKQvpG;y_ok#O+!uCT^lEA
z8fvDYya0@d*G4KJ$glV2?!Dg^Kd|E`fM{bhM*?{X7@3HjWJ5$MkES0jS$yr{&LO#p
zIy+lO0`TIojAOS9m4u|!0TxM6V80-*tLRPw{$tb}?@a4FmKLOGEQpQp)XNGan1C=D
zm<C*)g!ncT<raN^us1}~3ZVg$ARHiIgQ6QEQzQR#u@|k6o@YE$tY`^vWdfnC3g?CI
zKhwjcmcl(r5afe^U}-ovTpREE`4qd2H8TlV27D_Xy`terUS#7y&jw7uO}|()R)gT;
zmzGv+b9Gj|qk5b<Y~GJVA~9F(U{F=5ZLBR-)yIHLNBQSQ%#_01!vFSvFi--dz%P9X
z$W@rN#jp5VJOQT)we__Z1fif3b*w{#hN7IJsr^UfX@yY1^3oEZ0LTz{euiH%ErEEG
zj>7!H53{<mZa`V<Bvf*1x7RM{fBTdXFwMVn<ZxQv1v$UZ?Uu7~B&e#?Hq@?C^j-(q
zkx(o&@s|8sKI^%0$_N-v>%ILxJe;K?K}57Lx9~m@S>qr(x6|wVao-!g37F-VX8?Dd
zK{!H@7jN`SZ-^t-ltDx^vn%rsMR!<hkh`C2d~Q_Fb#DUNrDG9;ujkLok&vIC-xbqX
zF>usUGNxVIf6#N$n*dQMw-Ap|<b|0(UpUS&&Xl5fYVjdKme}$|Wl_)H2B5$%okDl%
zX(K<}8vFV|#~4q;rd^vdqV>`7)jO)kMPG}iCu(nR?%p-P>z4G(Hg4N^4M3>-S|Z)$
z`p^&w9@@Ih?}{Tvs_LsQ4w=v$2sgL2v`rLG@M0bSH4QZf1bJ4B{IM{*&^f`r_(61g
zbcG-<*zi?!9`L3B6!;~3Ky2#mcQ*SKld#R!Nz~QV4R0RRyb|RuVAv4!cHjxk)Q2OJ
zBONY&R8=-MY}|vzrmUiSB6*RkO~K0Y^Fi!(aYZ)Z_~9$-E3;0FJn>hQpEC4^2N(|g
zjHA5r%&X5hmAoRNC{I~&kt-|fE3*t;o!4WzC<;ta?Gn)HU8~d5ytIviWV`522ACHc
z7JIg?u5P%CuFLDH!tP6wG?SKRP^MVg-v7$O>;CN$OlC{wBfwM_O+Vx`k8EDyA}G!&
z{s`D-MHVI-kV%%d|KSoyRejaPivGw&a|ZmRwxRYCCxx)pk~z`PeO5OlRM_bfL&yvL
zknaEIL@_MT;C2^*s=jT-Lnj!83+#-F)1JE^H@onMz-%YB@{SEnkSrrGYG^8miP@H#
zMC+p?6`f$qx4>mC#gY;8sU>xk0WxfuLEu@R!5L%vuP76S7xS!b1{&BNoQ^VdpU)48
z5P=mBAP9nl_W}DO7R2mr26&cCW9V*9u(4@<_>n#;{UckhCA2wc{@9xBF~*YFYyhj_
zBBEch^*`&{SuJ2U5m{n?X?|&&HCyZwAV`w|v6?W%eNubQk)JeMqVf$Jo}z~g=(|={
zRVKRx(G~0Z1KkUoMA2qEv)V-<$aR*~4~&Xh4OJy@Drt-Ji{D51y^H1yj-PN{9;>KT
z0u<eE1hd!9tXy%EUvi#HAji^=EdiVlSNfn)vvjG8AX*<Ck22AQYt-yAs+|p3uAaI?
zid}+PeC^`S&RAy=(CDHAP;|T3;oa=ICm=>{!)|q}fdo6v7XRrZ3Ra^)R7)(4_hMfD
zyiYY#zYVOyZcb=Nd6Z11&-u<A>*^E0SKo-pZI<-ik-W$!2Ef3pb{e_z#^q(seL<1Q
zk&bX)`2Ma~*QF?rA{-ciwogPJF`k(io*I78^_vH{yz%l|6}8>4eHl*f3C560gWhAK
z64hlV#m?1Uaendpz=Obp(buBsfd*d%Xzge{?DU==0MTgFQ|#vpPrScCpW$5Km%fGV
z&ahCnd09n;Ymli#^^WRsUd-ErMW;&7ejxNY7f|f>(oT|pIn%%0Y8m}SVQ%)^_Yl4Z
zG+WSn>x$k4oRcoAL2OrinE|oNX}%wFj5DPO=Z3ec(HRWBzB$^~+P1#uqBjB0Kd`n5
z^mh*aa))uSf)q7e$BRf#q!D2jXBY`8`kMs>3wocOaylFu-u^i7iLEn%+Y0=$Rh(r>
zIO9lA4!5<mJ>K`$X@M6kFD-R$K7fjL#+GmO<2x}*6;5m15*CJY!|VHU25ga;;g>Zi
z>a>?H$c`YS#akY#I23opDL|iQ&VLr=7EK?rMFvpuVhe%KT^uQzEnVy`@Jny^eLt=q
z<iQY*hP`-BrF-TC<C#SRb*!E7e|N_6lCY{oT^)8qUq`$Zo0qMrBaVWpFMQuOf9HcD
z(B;5If`0d9f8EwZZ1%;VlUIRX_AA_aaQb7fpcOGp^(+2br){zVf6;iA*nCl$5A@yO
zXh~)g22DVB_76S{%uCRZ0{cL>g4wI+yJF;METG9l3@`>_V?f4(Tn~C3aOoiSl9q%a
zUtix`U7nWtap$uFHzn#U$w*2PhMcV4So~yX2V-Z0^Q$q{$Vf)xmP-L6GyKxW6z)sJ
zVG5AYNN}#;3YM1@qPhn7Qalb*gt(L7{J!42Y;A1}nF2JpYEy`9LCEd!wg-vS@N(nw
z(gmVC2ArFKokZ}Vz>=5!ia*C|!1fGnK)kng_nr%<UHzvJ(h6Kf_wRwf2pkb%<>=8T
z=0Cq=!@m+Sl(bdcH2=<#=g?BFNEzUCh~j|VAgf1@ZhETb-kR2A7);4BcIJvj*Ju#T
zQ<zS7%UZl^g8<}BV6$g}>bj-t-b!AS-AMU5ewJUJ)k#Ml$YlzX1SSAu6uwON&+QCI
w6KInlhZH@C$N`02!!@*XlmDb`vqN0?KO)hHGlEV{y#N3J07*qoM6N<$f{!NG{r~^~

literal 0
HcmV?d00001

diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext.svg b/srcpkgs/void-artwork/files/icons/void-logo-notext.svg
new file mode 100644
index 000000000000..772d80a775fd
--- /dev/null
+++ b/srcpkgs/void-artwork/files/icons/void-logo-notext.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="210.46875" height="210.46875" viewBox="0 0 210.46875 210.46875" version="1.1">
+<g id="surface2">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 105.234375 0 C 83.203125 0.046875 61.742188 7.007812 43.875 19.898438 L 67.777344 43.804688 C 79.054688 36.902344 92.015625 33.242188 105.234375 33.21875 C 145.007812 33.21875 177.25 65.460938 177.25 105.234375 C 177.21875 118.449219 173.550781 131.402344 166.648438 142.671875 L 190.597656 166.621094 C 203.484375 148.742188 210.4375 127.273438 210.46875 105.234375 C 210.46875 47.117188 163.355469 0 105.234375 0 Z M 105.234375 0 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.843139%,50.196081%,38.039216%);fill-opacity:1;" d="M 166.59375 190.570312 L 142.691406 166.667969 C 131.414062 173.566406 118.457031 177.226562 105.234375 177.25 C 65.464844 177.25 33.222656 145.007812 33.222656 105.234375 C 33.253906 92.019531 36.921875 79.066406 43.824219 67.796875 L 19.875 43.851562 C 6.984375 61.726562 0.0351562 83.195312 0 105.234375 C 0 163.355469 47.117188 210.46875 105.234375 210.46875 C 127.265625 210.421875 148.730469 203.460938 166.59375 190.570312 Z M 166.59375 190.570312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 138.722656 105.234375 C 138.722656 123.738281 123.722656 138.738281 105.21875 138.738281 C 86.714844 138.738281 71.714844 123.738281 71.714844 105.234375 C 71.714844 86.730469 86.714844 71.730469 105.21875 71.730469 C 123.722656 71.730469 138.722656 86.730469 138.722656 105.234375 Z M 138.722656 105.234375 "/>
+</g>
+</svg>
diff --git a/srcpkgs/void-artwork/files/icons/void-logo.svg b/srcpkgs/void-artwork/files/icons/void-logo.svg
new file mode 100644
index 000000000000..5c1130adf9aa
--- /dev/null
+++ b/srcpkgs/void-artwork/files/icons/void-logo.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256" viewBox="0 0 256 256" version="1.1">
+<g id="surface1">
+<path style="fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 128.01879 0.000438608 C 105.983867 0.0479021 84.522461 7.009213 66.656415 19.899504 L 90.56219 43.801324 C 101.838723 36.903298 114.796254 33.244654 128.01879 33.220922 C 167.789234 33.220922 200.032761 65.464449 200.032761 105.234894 C 200.001119 118.449519 196.330609 131.403095 189.428628 142.671717 L 213.377911 166.621 C 226.268202 148.743088 233.217647 127.273772 233.253245 105.234894 C 233.253245 47.115857 186.137826 0.000438608 128.01879 0.000438608 Z M 128.01879 0.000438608 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(27.843139%,50.196081%,38.039216%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 189.377209 190.570283 L 165.471434 166.668464 C 154.194901 173.56649 141.23737 177.225134 128.01879 177.248865 C 88.24439 177.248865 56.000863 145.005338 56.000863 105.234894 C 56.032505 92.020269 59.703014 79.066693 66.604996 67.798071 L 42.655713 43.848787 C 29.765422 61.7267 22.815977 83.196016 22.780379 105.234894 C 22.780379 163.35393 69.895798 210.469349 128.01879 210.469349 C 150.049757 210.421886 171.511162 203.460575 189.377209 190.570283 Z M 189.377209 190.570283 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 161.504278 105.234894 C 161.504278 123.737742 146.501861 138.740158 127.999013 138.740158 C 109.496165 138.740158 94.497704 123.737742 94.497704 105.234894 C 94.497704 86.732046 109.496165 71.729629 127.999013 71.729629 C 146.501861 71.729629 161.504278 86.732046 161.504278 105.234894 Z M 161.504278 105.234894 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 30.592077 124.809626 C 29.445043 125.628371 28.400847 126.039721 27.455532 126.039721 L 23.397404 126.039721 C 22.823887 126.039721 22.372984 125.936884 22.04865 125.731208 C 21.720361 125.529489 21.451401 125.220976 21.245726 124.809626 L 0.468586 86.202037 C 0.385525 86.122931 0.345972 86.020093 0.345972 85.897479 L 0.345972 85.525682 C 0.345972 85.118287 0.488363 84.789998 0.777099 84.54477 C 1.105388 84.256034 1.61562 84.113643 2.311751 84.113643 L 27.578146 84.113643 C 28.930856 84.113643 29.812885 84.521038 30.224235 85.343739 L 43.011689 109.993108 L 78.850575 85.343739 C 80.041118 84.521038 81.290989 84.113643 82.60019 84.113643 L 86.595034 84.113643 C 87.128998 84.113643 87.397958 84.339095 87.397958 84.789998 C 87.397958 85.15784 87.069668 85.608743 86.41309 86.142707 Z M 30.592077 124.809626 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 86.353761 126.039721 C 84.221859 126.039721 82.335186 125.711432 80.697696 125.054854 C 79.05625 124.358723 77.683764 123.417364 76.576283 122.226821 C 75.472757 121.040234 74.63028 119.647972 74.056763 118.046079 C 73.483246 116.408589 73.198465 114.64453 73.198465 112.761811 C 73.198465 110.341174 73.60586 107.964044 74.42856 105.630423 C 75.247306 103.292846 76.374563 101.058107 77.806378 98.930161 C 79.281702 96.798259 81.006208 94.828525 82.971988 93.028868 C 84.981275 91.225255 87.15273 89.666871 89.490306 88.353715 C 91.86348 87.044513 94.367179 86.020093 96.989537 85.280454 C 99.611894 84.501262 102.297536 84.113643 105.042508 84.113643 L 135.165999 84.113643 C 137.337454 84.113643 139.243904 84.441932 140.881394 85.098511 C 142.562392 85.751134 143.954654 86.672716 145.062136 87.863259 C 146.169617 89.010293 147.008139 90.382779 147.581656 91.980716 C 148.159128 93.578653 148.443909 95.322936 148.443909 97.205654 C 148.443909 99.626292 148.012782 102.023198 147.154484 104.400328 C 146.331784 106.737904 145.18475 108.968688 143.709426 111.100589 C 142.234103 113.232491 140.493775 115.222002 138.484488 117.065167 C 136.4752 118.86878 134.283969 120.446941 131.90684 121.79965 C 129.52971 123.108851 127.029967 124.153048 124.407609 124.93224 C 121.785252 125.671879 119.139163 126.039721 116.477252 126.039721 Z M 123.363413 100.89594 C 124.716122 98.028355 125.392477 95.876677 125.392477 94.440906 C 125.392477 93.254319 124.96135 92.431619 124.099097 91.980716 C 123.280352 91.529813 122.050256 91.304361 120.412766 91.304361 L 112.051282 91.304361 C 110.86074 91.304361 109.753259 91.470483 108.728838 91.798772 C 107.747926 92.083553 106.826344 92.597741 105.964091 93.333425 C 105.101837 94.073064 104.263316 95.053976 103.444571 96.284072 C 102.665378 97.514167 101.86641 99.052775 101.047665 100.89594 L 98.093063 107.596202 C 96.538634 111.080813 95.759441 113.70317 95.759441 115.46723 C 95.759441 116.653817 96.107507 117.51607 96.803638 118.046079 C 97.499769 118.540491 98.504413 118.785719 99.817569 118.785719 L 108.238382 118.785719 C 109.508031 118.785719 110.678797 118.59982 111.74277 118.231978 C 112.806743 117.820628 113.831163 117.187781 114.81603 116.325528 C 115.800898 115.46723 116.742257 114.320196 117.644063 112.884425 C 118.545869 111.448655 119.467452 109.688551 120.412766 107.596202 Z M 123.363413 100.89594 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 144.120777 126.039721 C 143.385093 126.039721 143.017251 125.794493 143.017251 125.304037 C 143.017251 125.054854 143.07658 124.750296 143.199194 124.378499 L 160.475902 85.711581 C 160.966358 84.647608 161.74555 84.113643 162.813479 84.113643 L 183.958461 84.113643 C 184.737653 84.113643 185.129227 84.378648 185.129227 84.912612 C 185.129227 85.15784 185.046166 85.422844 184.880044 85.711581 L 167.66662 124.378499 C 167.176164 125.48598 166.396972 126.039721 165.332999 126.039721 Z M 144.120777 126.039721 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:4;" d="M 174.347105 126.039721 C 173.611421 126.039721 173.243579 125.794493 173.243579 125.304037 C 173.243579 125.054854 173.302909 124.750296 173.425523 124.378499 L 190.702231 85.711581 C 191.192687 84.647608 191.971879 84.113643 193.035852 84.113643 L 242.465116 84.113643 C 244.597017 84.113643 246.479736 84.441932 248.121181 85.098511 C 249.758671 85.751134 251.131157 86.672716 252.238638 87.863259 C 253.34612 89.010293 254.184641 90.382779 254.762114 91.980716 C 255.335631 93.578653 255.620412 95.322936 255.620412 97.205654 C 255.620412 99.709353 255.189285 102.165589 254.330987 104.586226 C 253.468734 106.963356 252.282147 109.213916 250.763315 111.345817 C 249.287992 113.477719 247.527888 115.443498 245.479047 117.247111 C 243.46976 119.050723 241.274574 120.609107 238.897444 121.922264 C 236.563823 123.191912 234.103632 124.196556 231.520828 124.93224 C 228.941978 125.671879 226.359174 126.039721 223.776369 126.039721 Z M 227.834497 100.89594 C 229.143698 97.945294 229.800276 95.793616 229.800276 94.440906 C 229.800276 93.254319 229.392881 92.431619 228.570181 91.980716 C 227.751436 91.529813 226.564849 91.304361 225.006464 91.304361 L 212.527523 91.304361 L 200.35314 118.785719 L 212.772751 118.785719 C 214.002847 118.785719 215.149881 118.59982 216.213854 118.231978 C 217.281782 117.820628 218.282471 117.187781 219.227785 116.325528 C 220.208697 115.423722 221.154012 114.276688 222.055818 112.884425 C 222.997177 111.448655 223.938536 109.688551 224.88385 107.596202 Z M 227.834497 100.89594 " transform="matrix(0.987601,0,0,0.987601,1.60363,24.069879)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 128.035156 24.070312 C 106.273438 24.117188 85.078125 30.992188 67.433594 43.722656 L 91.042969 67.328125 C 102.179688 60.515625 114.976562 56.902344 128.035156 56.878906 C 167.3125 56.878906 199.15625 88.722656 199.15625 128 C 199.125 141.050781 195.5 153.84375 188.683594 164.972656 L 212.335938 188.625 C 225.066406 170.96875 231.929688 149.765625 231.964844 128 C 231.964844 70.601562 185.433594 24.070312 128.035156 24.070312 Z M 128.035156 24.070312 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(27.843139%,50.196081%,38.039216%);fill-opacity:1;" d="M 188.632812 212.277344 L 165.023438 188.671875 C 153.886719 195.484375 141.089844 199.097656 128.035156 199.121094 C 88.753906 199.121094 56.910156 167.277344 56.910156 128 C 56.941406 114.949219 60.566406 102.15625 67.382812 91.027344 L 43.730469 67.375 C 31 85.03125 24.136719 106.234375 24.101562 128 C 24.101562 185.398438 70.632812 231.929688 128.035156 231.929688 C 149.792969 231.882812 170.988281 225.007812 188.632812 212.277344 Z M 188.632812 212.277344 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(67.058825%,76.078433%,67.058825%);fill-opacity:1;" d="M 161.105469 128 C 161.105469 146.273438 146.289062 161.089844 128.015625 161.089844 C 109.742188 161.089844 94.929688 146.273438 94.929688 128 C 94.929688 109.726562 109.742188 94.910156 128.015625 94.910156 C 146.289062 94.910156 161.105469 109.726562 161.105469 128 Z M 161.105469 128 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 31.816406 147.332031 C 30.683594 148.140625 29.652344 148.546875 28.71875 148.546875 L 24.710938 148.546875 C 24.144531 148.546875 23.699219 148.445312 23.378906 148.242188 C 23.054688 148.042969 22.789062 147.738281 22.585938 147.332031 L 2.066406 109.203125 C 1.984375 109.125 1.945312 109.023438 1.945312 108.902344 L 1.945312 108.535156 C 1.945312 108.132812 2.085938 107.808594 2.371094 107.566406 C 2.695312 107.28125 3.199219 107.140625 3.886719 107.140625 L 28.839844 107.140625 C 30.175781 107.140625 31.046875 107.542969 31.453125 108.355469 L 44.082031 132.699219 L 79.476562 108.355469 C 80.652344 107.542969 81.886719 107.140625 83.179688 107.140625 L 87.125 107.140625 C 87.652344 107.140625 87.917969 107.363281 87.917969 107.808594 C 87.917969 108.171875 87.59375 108.617188 86.945312 109.144531 Z M 31.816406 147.332031 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 86.886719 148.546875 C 84.78125 148.546875 82.917969 148.222656 81.300781 147.574219 C 79.679688 146.886719 78.324219 145.957031 77.230469 144.78125 C 76.140625 143.609375 75.308594 142.234375 74.742188 140.652344 C 74.175781 139.035156 73.894531 137.292969 73.894531 135.433594 C 73.894531 133.042969 74.296875 130.695312 75.109375 128.390625 C 75.917969 126.082031 77.03125 123.875 78.445312 121.773438 C 79.902344 119.667969 81.605469 117.722656 83.546875 115.945312 C 85.53125 114.164062 87.675781 112.625 89.984375 111.328125 C 92.328125 110.035156 94.800781 109.023438 97.390625 108.292969 C 99.980469 107.523438 102.632812 107.140625 105.34375 107.140625 L 135.09375 107.140625 C 137.238281 107.140625 139.121094 107.464844 140.738281 108.113281 C 142.398438 108.757812 143.773438 109.667969 144.867188 110.84375 C 145.960938 111.976562 146.789062 113.332031 147.355469 114.910156 C 147.925781 116.488281 148.207031 118.210938 148.207031 120.070312 C 148.207031 122.460938 147.78125 124.828125 146.933594 127.175781 C 146.121094 129.484375 144.988281 131.6875 143.53125 133.792969 C 142.074219 135.898438 140.355469 137.863281 138.371094 139.683594 C 136.386719 141.464844 134.222656 143.023438 131.875 144.359375 C 129.527344 145.652344 127.058594 146.683594 124.46875 147.453125 C 121.878906 148.183594 119.265625 148.546875 116.636719 148.546875 Z M 123.4375 123.714844 C 124.773438 120.882812 125.441406 118.757812 125.441406 117.339844 C 125.441406 116.167969 125.015625 115.355469 124.164062 114.910156 C 123.355469 114.464844 122.140625 114.242188 120.523438 114.242188 L 112.265625 114.242188 C 111.089844 114.242188 109.996094 114.40625 108.984375 114.730469 C 108.015625 115.011719 107.105469 115.519531 106.253906 116.246094 C 105.402344 116.976562 104.574219 117.945312 103.765625 119.160156 C 102.996094 120.375 102.207031 121.894531 101.398438 123.714844 L 98.480469 130.332031 C 96.945312 133.773438 96.175781 136.363281 96.175781 138.105469 C 96.175781 139.277344 96.519531 140.128906 97.207031 140.652344 C 97.894531 141.140625 98.886719 141.382812 100.183594 141.382812 L 108.5 141.382812 C 109.753906 141.382812 110.910156 141.199219 111.960938 140.835938 C 113.011719 140.429688 114.023438 139.804688 114.996094 138.953125 C 115.96875 138.105469 116.898438 136.972656 117.789062 135.554688 C 118.679688 134.136719 119.589844 132.398438 120.523438 130.332031 Z M 123.4375 123.714844 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 143.9375 148.546875 C 143.210938 148.546875 142.847656 148.304688 142.847656 147.820312 C 142.847656 147.574219 142.90625 147.273438 143.027344 146.90625 L 160.089844 108.71875 C 160.574219 107.667969 161.34375 107.140625 162.398438 107.140625 L 183.28125 107.140625 C 184.050781 107.140625 184.4375 107.402344 184.4375 107.929688 C 184.4375 108.171875 184.355469 108.433594 184.191406 108.71875 L 167.191406 146.90625 C 166.707031 148 165.9375 148.546875 164.886719 148.546875 Z M 143.9375 148.546875 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 173.789062 148.546875 C 173.0625 148.546875 172.699219 148.304688 172.699219 147.820312 C 172.699219 147.574219 172.757812 147.273438 172.878906 146.90625 L 189.941406 108.71875 C 190.425781 107.667969 191.195312 107.140625 192.246094 107.140625 L 241.0625 107.140625 C 243.167969 107.140625 245.027344 107.464844 246.648438 108.113281 C 248.265625 108.757812 249.621094 109.667969 250.714844 110.84375 C 251.808594 111.976562 252.636719 113.332031 253.207031 114.910156 C 253.773438 116.488281 254.054688 118.210938 254.054688 120.070312 C 254.054688 122.542969 253.628906 124.96875 252.78125 127.359375 C 251.929688 129.707031 250.757812 131.929688 249.257812 134.035156 C 247.800781 136.140625 246.0625 138.082031 244.039062 139.863281 C 242.054688 141.644531 239.886719 143.183594 237.539062 144.480469 C 235.234375 145.734375 232.804688 146.726562 230.253906 147.453125 C 227.707031 148.183594 225.15625 148.546875 222.605469 148.546875 Z M 226.613281 123.714844 C 227.90625 120.800781 228.554688 118.675781 228.554688 117.339844 C 228.554688 116.167969 228.152344 115.355469 227.339844 114.910156 C 226.53125 114.464844 225.359375 114.242188 223.820312 114.242188 L 211.496094 114.242188 L 199.472656 141.382812 L 211.738281 141.382812 C 212.953125 141.382812 214.085938 141.199219 215.136719 140.835938 C 216.191406 140.429688 217.179688 139.804688 218.113281 138.953125 C 219.082031 138.0625 220.015625 136.929688 220.90625 135.554688 C 221.835938 134.136719 222.765625 132.398438 223.699219 130.332031 Z M 226.613281 123.714844 "/>
+</g>
+</svg>
diff --git a/srcpkgs/void-artwork/files/void-logo.svg b/srcpkgs/void-artwork/files/void-logo.svg
new file mode 100644
index 000000000000..35e8a7c2c2af
--- /dev/null
+++ b/srcpkgs/void-artwork/files/void-logo.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="256"
+   height="256"
+   viewBox="0 0 252.06154 252.06153"
+   version="1.1"
+   preserveAspectRatio="xMidYMid"
+   id="voidlogo"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs />
+  <use
+     x="0"
+     y="0"
+     xlink:href="#logo"
+     id="border"
+     style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     width="100%"
+     height="100%" />
+  <g
+     id="logo"
+     transform="matrix(0.97240747,0,0,0.97240747,1.5789588,23.699565)"
+     style="display:inline">
+    <g
+       id="circlearcs"
+       style="display:inline">
+      <path
+         id="toparc"
+         fill="#abc2ab"
+         d="M 128.01682,0 C 105.98494,0.04678314 84.523372,7.0072685 66.657757,19.900168 l 23.902685,23.902684 c 11.277448,-6.898594 24.236288,-10.559734 37.456378,-10.582214 39.77241,-7.9e-5 72.01434,32.241846 72.01426,72.014262 -0.0318,13.21538 -3.69956,26.16719 -10.60151,37.43708 l 23.94799,23.94799 c 12.8888,-17.87595 19.8404,-39.34715 19.87417,-61.38507 C 233.25173,47.115274 186.13644,0 128.01682,0 Z" />
+      <path
+         id="bottomarc"
+         fill="#478061"
+         d="m 189.37588,190.56963 -23.90269,-23.90268 c -11.27745,6.89859 -24.23629,10.55974 -37.45637,10.58221 -39.772417,8e-5 -72.014343,-32.24185 -72.014264,-72.01426 0.03183,-13.215382 3.699547,-26.167196 10.60151,-37.437081 L 42.656067,43.849832 C 29.76725,61.725769 22.815686,83.196977 22.781918,105.2349 c 0,58.11962 47.115274,105.2349 105.234902,105.2349 22.03188,-0.0468 43.49344,-7.00726 61.35906,-19.90017 z" />
+      <circle
+         id="circle"
+         fill="#abc2ab"
+         cx="128"
+         cy="105.2349"
+         r="33.503357" />
+    </g>
+    <g
+       id="letters"
+       style="display:inline">
+      <path
+         id="letterv"
+         fill="#000000"
+         d="m 30.591915,124.81039 c -1.147564,0.81968 -2.192665,1.22952 -3.135303,1.22952 h -4.057453 c -0.573782,0 -1.024609,-0.10245 -1.352481,-0.30737 -0.327871,-0.20493 -0.59427,-0.51231 -0.799195,-0.92215 L 0.46842244,86.203138 C 0.38645233,86.121168 0.34546728,86.01871 0.34546728,85.895763 v -0.368865 c 0,-0.409842 0.14344762,-0.737718 0.43034287,-0.983628 C 1.1036817,84.256383 1.615986,84.11294 2.3127229,84.11294 H 27.579567 c 1.35248,0 2.233641,0.409841 2.643482,1.229525 L 43.010172,109.99455 78.85096,85.342465 c 1.188548,-0.819684 2.438574,-1.229525 3.750078,-1.229525 h 3.995963 c 0.532806,0 0.799208,0.225413 0.799208,0.67624 0,0.368856 -0.327871,0.819683 -0.983614,1.35248 z" />
+      <path
+         id="lettero"
+         fill="#000000"
+         d="m 86.35303,126.03991 c -2.131187,0 -4.016463,-0.32787 -5.65583,-0.98362 -1.639384,-0.69673 -3.012366,-1.63937 -4.118944,-2.82792 -1.106579,-1.18855 -1.946755,-2.58201 -2.520528,-4.18039 -0.573773,-1.63938 -0.860659,-3.40171 -0.860659,-5.287 0,-2.41807 0.409842,-4.79516 1.229525,-7.13126 0.819683,-2.33611 1.946754,-4.56976 3.381213,-6.70095 1.475427,-2.131187 3.196763,-4.098434 5.16401,-5.901741 2.008232,-1.803315 4.180404,-3.360721 6.516517,-4.672216 2.377097,-1.311495 4.877141,-2.336103 7.500131,-3.073825 2.623008,-0.778698 5.307485,-1.168047 8.053425,-1.168047 h 30.12348 c 2.17218,0 4.07795,0.327871 5.71734,0.983614 1.68035,0.655752 3.07381,1.577903 4.18039,2.766451 1.10658,1.147555 1.94676,2.520527 2.52053,4.118918 0.57379,1.59839 0.86069,3.340224 0.86069,5.2255 0,2.418083 -0.43034,4.815666 -1.29101,7.192756 -0.8197,2.33611 -1.96726,4.56976 -3.44269,6.70094 -1.47544,2.13118 -3.21728,4.11893 -5.22551,5.96323 -2.00823,1.80331 -4.2009,3.3812 -6.57799,4.73368 -2.37708,1.3115 -4.87713,2.35661 -7.50013,3.13531 -2.62299,0.73772 -5.26649,1.10657 -7.93048,1.10657 z m 37.00886,-25.1439 c 1.35249,-2.868898 2.02874,-5.020573 2.02874,-6.455023 0,-1.188549 -0.43035,-2.008237 -1.29103,-2.459063 -0.81969,-0.450827 -2.04921,-0.67624 -3.68858,-0.67624 h -8.36081 c -1.18854,0 -2.29512,0.163935 -3.31974,0.491807 -0.98363,0.286895 -1.90577,0.7992 -2.76644,1.536913 -0.86067,0.737722 -1.70084,1.72135 -2.52053,2.950883 -0.77869,1.229526 -1.57788,2.766434 -2.39757,4.610723 l -2.950895,6.70095 c -1.557397,3.48367 -2.336095,6.10667 -2.336095,7.869 0,1.18854 0.348364,2.04921 1.045092,2.582 0.696746,0.49181 1.700862,0.73772 3.012348,0.73772 h 8.42229 c 1.27052,0 2.43858,-0.18443 3.50417,-0.55328 1.0656,-0.40985 2.09021,-1.04511 3.07383,-1.90578 0.98362,-0.86067 1.92626,-2.00823 2.82791,-3.44268 0.90166,-1.43445 1.8238,-3.19678 2.76644,-5.28698 z" />
+      <path
+         id="letteri"
+         fill="#000000"
+         d="m 144.12269,126.03991 c -0.73771,0 -1.10657,-0.2459 -1.10657,-0.73771 0,-0.2459 0.0615,-0.55329 0.18444,-0.92215 l 17.27487,-38.668719 c 0.49183,-1.065594 1.27053,-1.59839 2.33613,-1.59839 h 21.14791 c 0.7787,0 1.16805,0.266394 1.16805,0.799182 0,0.24591 -0.082,0.512313 -0.24589,0.799208 L 167.6682,124.38005 c -0.49182,1.10658 -1.27052,1.65986 -2.33612,1.65986 z" />
+      <path
+         id="letterd"
+         fill="#000000"
+         d="m 174.34897,126.03991 c -0.73772,0 -1.10657,-0.2459 -1.10657,-0.73771 0,-0.2459 0.0615,-0.55329 0.18443,-0.92215 l 17.27488,-38.668719 c 0.49182,-1.065594 1.27053,-1.59839 2.33612,-1.59839 h 49.42712 c 2.13119,0 4.01646,0.327871 5.65583,0.983614 1.63937,0.655752 3.01234,1.577903 4.11892,2.766451 1.10657,1.147555 1.94676,2.520527 2.52055,4.118918 0.57377,1.59839 0.86066,3.340224 0.86066,5.2255 0,2.500053 -0.43033,4.959116 -1.291,7.377186 -0.86067,2.37709 -2.04922,4.63123 -3.56565,6.76242 -1.47543,2.13118 -3.23775,4.09843 -5.28696,5.90174 -2.00824,1.80331 -4.2009,3.36072 -6.578,4.67221 -2.33611,1.27052 -4.79517,2.27464 -7.37717,3.01235 -2.58203,0.73772 -5.16404,1.10658 -7.74605,1.10658 z m 53.48456,-25.1439 c 1.3115,-2.950868 1.96725,-5.102543 1.96725,-6.455023 0,-1.188549 -0.40984,-2.008237 -1.22952,-2.459063 -0.81969,-0.450827 -2.00824,-0.67624 -3.56565,-0.67624 h -12.47973 l -12.17235,27.479996 h 12.41826 c 1.22953,0 2.37709,-0.18443 3.44269,-0.55328 1.06559,-0.40985 2.06971,-1.0451 3.01234,-1.90578 0.98363,-0.90166 1.92627,-2.04921 2.82792,-3.44268 0.94264,-1.43445 1.88528,-3.19678 2.82791,-5.28698 z" />
+    </g>
+  </g>
+</svg>
diff --git a/srcpkgs/void-artwork/template b/srcpkgs/void-artwork/template
index d02a5a0fa3b1..6685641fe4e2 100644
--- a/srcpkgs/void-artwork/template
+++ b/srcpkgs/void-artwork/template
@@ -1,10 +1,10 @@
 # Template file for 'void-artwork'
 pkgname=void-artwork
-version=20170517
-revision=3
+version=20220303
+revision=1
 short_desc="Void Linux artwork"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="custom:Public Domain"
+license="custom:Public Domain" #no vlicense check
 homepage="http://www.voidlinux.org"
 
 do_install() {
@@ -12,4 +12,11 @@ do_install() {
 	vinstall ${FILESDIR}/splashwhite.png 644 usr/share/void-artwork
 	vinstall ${FILESDIR}/void-logo.png 644 usr/share/void-artwork
 	vinstall ${FILESDIR}/void-transparent.png 644 usr/share/void-artwork
+	vinstall ${FILESDIR}/void-logo.svg 644 usr/share/void-artwork
+	for size in 16 22 32 48 64 128 256 512; do
+		vinstall ${FILESDIR}/icons/void-logo-${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps void-logo.png
+		vinstall ${FILESDIR}/icons/void-logo-notext-${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps void-logo-notext.png
+	done
+	vinstall ${FILESDIR}/icons/void-logo.svg 644 usr/share/icons/hicolor/scalable/apps
+	vinstall ${FILESDIR}/icons/void-logo-notext.svg 644 usr/share/icons/hicolor/scalable/apps
 }

From 936267a31604138a5bdb15669e9104a2040a1f77 Mon Sep 17 00:00:00 2001
From: David Wildasin <dragonmaus@posteo.net>
Date: Sun, 13 Feb 2022 23:05:53 -0500
Subject: [PATCH 0232/1686] runit-void: Standardise/improve os-release

---
 srcpkgs/runit-void/files/os-release | 9 +++++++--
 srcpkgs/runit-void/template         | 6 ++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release
index 12dcabd1f3e6..e652642b5571 100644
--- a/srcpkgs/runit-void/files/os-release
+++ b/srcpkgs/runit-void/files/os-release
@@ -1,4 +1,9 @@
-NAME="void"
+NAME="Void"
 ID="void"
+PRETTY_NAME="Void Linux"
+HOME_URL="https://voidlinux.org/"
+DOCUMENTATION_URL="https://docs.voidlinux.org/"
+LOGO="void-logo"
+ANSI_COLOR="0;38;2;71;128;97"
+
 DISTRIB_ID="void"
-PRETTY_NAME="void"
diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index 0c98cadc9e18..a0aef0484c0b 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20210314
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
@@ -32,10 +32,12 @@ post_install() {
 	vmkdir usr/bin
 	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
 	vconf ${FILESDIR}/hostname
-	vconf ${FILESDIR}/os-release
 	vconf ${FILESDIR}/locale.conf
 	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/
+	vmkdir usr/lib
+	vinstall ${FILESDIR}/os-release 644 /usr/lib/
+	ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release
 	# Enable services at post-install time instead.
 	rm -f ${DESTDIR}/etc/runit/runsvdir/current
 	rm -rf ${DESTDIR}/etc/runit/runsvdir/default

From c869a8955f9d6d7c6a38f98e12fc27dfba75d009 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 09:58:36 +0100
Subject: [PATCH 0233/1686] gjs: ignore development versions in update-check

---
 srcpkgs/gjs/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/gjs/update

diff --git a/srcpkgs/gjs/update b/srcpkgs/gjs/update
new file mode 100644
index 000000000000..12132d5fa5b4
--- /dev/null
+++ b/srcpkgs/gjs/update
@@ -0,0 +1 @@
+pattern="gjs-[0-9]+\.[0-9]*[02468]\.[0-9]+"

From 2c17243be6a3ddd874e22baa16f6f0ce0fa7ef2d Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Fri, 11 Mar 2022 16:07:49 +0100
Subject: [PATCH 0234/1686] zellij: update to 0.26.0

---
 srcpkgs/zellij/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 2be522145138..e2ada810e570 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,6 +1,6 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.25.0
+version=0.26.0
 revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://zellij.dev"
 changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz"
-checksum=5bd4e6a726cf32e096f9c90d7dc414e63dee0613a56f5b665f4bfc6376dcf20a
+checksum=f0b0cfe7b72ce842de80d5c32cc2abe624b3286fab16f313a4e43e226e95e87b
 
 post_build() {
 	ZELLIJ="target/${RUST_TARGET}/release/zellij"

From 6270aa2a99669735ace0cb9829e04dc99e49d5ac Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Tue, 15 Mar 2022 01:12:19 +0700
Subject: [PATCH 0235/1686] Converseen: update 0.9.9.5

---
 srcpkgs/Converseen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template
index b457a0b6b8fa..bb8790332271 100644
--- a/srcpkgs/Converseen/template
+++ b/srcpkgs/Converseen/template
@@ -1,6 +1,6 @@
 # Template file for 'Converseen'
 pkgname=Converseen
-version=0.9.9.4
+version=0.9.9.5
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ 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=c96642b0120ba8aabe02d52210f1c8ff921d97a57851d44561b89d10bc569a88
+checksum=30d731968e61ab3fb701976f05b2f5b372e9760c05665d6183921fb94f8cfa44

From 91856677ebeaaa0c5983ba574876cf5ae2d74700 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 17:32:36 +0100
Subject: [PATCH 0236/1686] New package: python3-listparser-0.18

---
 srcpkgs/python3-listparser/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-listparser/template

diff --git a/srcpkgs/python3-listparser/template b/srcpkgs/python3-listparser/template
new file mode 100644
index 000000000000..dfe7ba100839
--- /dev/null
+++ b/srcpkgs/python3-listparser/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-listparser'
+pkgname=python3-listparser
+version=0.18
+revision=1
+wrksrc="listparser-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Parse subscription lists in Python"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/kurtmckee/listparser"
+changelog="https://raw.githubusercontent.com/kurtmckee/listparser/develop/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/l/listparser/listparser-${version}.tar.gz"
+checksum=4be0cc459b9f3d9f24726f0f448ac67ff8d4c87a7010453dca817b556bd0b841

From 16c235b76737130ff9034d18e5fa7ac14c8b2133 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 3 Oct 2021 01:08:10 +0200
Subject: [PATCH 0237/1686] New package: gfeeds-0.16.2

---
 srcpkgs/gfeeds/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/gfeeds/template

diff --git a/srcpkgs/gfeeds/template b/srcpkgs/gfeeds/template
new file mode 100644
index 000000000000..b6ae09f74fc5
--- /dev/null
+++ b/srcpkgs/gfeeds/template
@@ -0,0 +1,16 @@
+# Template file for 'gfeeds'
+pkgname=gfeeds
+version=0.16.2
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gobject-introspection glib-devel gettext"
+makedepends="libglib-devel gtk+3-devel libhandy1-devel"
+depends="python3-gobject python3-feedparser python3-readability-lxml
+ python3-listparser python3-pytz python3-dateutil python3-requests
+ python3-html5lib gtk+3 webkit2gtk libhandy1"
+short_desc="RSS/Atom feed reader for GNOME"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://gfeeds.gabmus.org/"
+distfiles="https://gitlab.gnome.org/World/gfeeds/-/archive/$version/gfeeds-$version.tar.gz"
+checksum=f061e89a1962a5ac544ea98239c2503af8da817ded0a5bfd8094ddf43e9dd00e

From f8cc56325462bb4e434325cfdcaf755e169e1c26 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 14 Mar 2022 18:53:16 -0500
Subject: [PATCH 0238/1686] ghostwriter: update to 2.1.2.

---
 srcpkgs/ghostwriter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template
index 71f5f14aad66..86e4b10c4533 100644
--- a/srcpkgs/ghostwriter/template
+++ b/srcpkgs/ghostwriter/template
@@ -1,6 +1,6 @@
 # Template file for 'ghostwriter'
 pkgname=ghostwriter
-version=2.1.1
+version=2.1.2
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="http://wereturtle.github.io/ghostwriter"
 distfiles="https://github.com/wereturtle/ghostwriter/archive/${version}.tar.gz"
-checksum=a9add6202dc1c9bb3f591fd4ec5d70e0fbd49d55f4921dc217923debc4d02f06
+checksum=65aa523a9c3d4f4c68f2cb6f5ab600cf24c98b4f0673a622d757a8e28eab120f
 
 case "$XBPS_TARGET_MACHINE" in
 	armv5tel*) broken="qtwebengine not built for this platform";;

From e7845b22339734a76cf4f14aa40dabeb75de1800 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:21:55 +0100
Subject: [PATCH 0239/1686] libhandy: fix checksum

---
 srcpkgs/libhandy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template
index 796cd46e7359..5a46045b7173 100644
--- a/srcpkgs/libhandy/template
+++ b/srcpkgs/libhandy/template
@@ -12,11 +12,11 @@ hostmakedepends="glib-devel pkg-config $(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"
-maintainer="Paper <paper@tilde.institute>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy"
 distfiles="https://gitlab.gnome.org/GNOME/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz"
-checksum=645355a009f23f254eaec7752b9489c3c2f5832397fcec75433a7e00efbfe52f
+checksum=138bec94e66d15a7a19350b65845d4529bcd969ea913ab3eb438f56fe47d5d37
 
 build_options="gir glade"
 desc_option_glade="Generate glade modules and catalog files"

From ed3d84fb944857f67490fec6a87c1b672ec386f1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 15 Mar 2022 14:21:19 -0500
Subject: [PATCH 0240/1686] melonDS: update to 0.9.4.

---
 srcpkgs/melonDS/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/melonDS/template b/srcpkgs/melonDS/template
index 58602c65746a..9594c3b3294b 100644
--- a/srcpkgs/melonDS/template
+++ b/srcpkgs/melonDS/template
@@ -1,7 +1,7 @@
 # Template file for 'melonDS'
 pkgname=melonDS
-version=0.9.3
-revision=2
+version=0.9.4
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
 makedepends="qt5-devel libslirp-devel SDL2-devel libepoxy-devel
@@ -11,4 +11,4 @@ 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=c50a3855c1f77f58a2b15045687dc399b845224a970fe68ff95919c939ac634f
+checksum=8022c8798a723f8ffae6ffdad2e7637cf9046e88f86b55b5f9ad3fa3b2e6d398

From 192c3d7f75396c077d14775728671b02e0fa450c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 15 Mar 2022 21:05:47 +0100
Subject: [PATCH 0241/1686] openssl: update to 1.1.1n.

---
 srcpkgs/openssl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
index 06d83aa0d81d..b77267e3d098 100644
--- a/srcpkgs/openssl/template
+++ b/srcpkgs/openssl/template
@@ -1,6 +1,6 @@
 # Template file for 'openssl'
 pkgname=openssl
-version=1.1.1l
+version=1.1.1n
 revision=1
 bootstrap=yes
 build_style=configure
@@ -17,7 +17,7 @@ maintainer="John <johnz@posteo.net>"
 license="OpenSSL"
 homepage="https://www.openssl.org"
 distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
-checksum=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
+checksum=40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a
 conf_files="/etc/ssl/openssl.cnf"
 replaces="libressl>=0"
 

From c23efe670eb7c90a7da33eb44caf54ef0e7c1946 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 15:24:34 -0400
Subject: [PATCH 0242/1686] sublime-text3: replace with empty meta package

---
 srcpkgs/sublime-text3/INSTALL.msg |  4 ++++
 srcpkgs/sublime-text3/template    | 33 ++++++-------------------------
 2 files changed, 10 insertions(+), 27 deletions(-)
 create mode 100644 srcpkgs/sublime-text3/INSTALL.msg

diff --git a/srcpkgs/sublime-text3/INSTALL.msg b/srcpkgs/sublime-text3/INSTALL.msg
new file mode 100644
index 000000000000..cf4c4e70a7a9
--- /dev/null
+++ b/srcpkgs/sublime-text3/INSTALL.msg
@@ -0,0 +1,4 @@
+sublime-text3 is replaced with the restricted sublime-text3-bin
+package, due to its license that restricts redistribution.
+In order to install it you have to build it with xbps-src, please see:
+https://docs.voidlinux.org/xbps/repositories/restricted.html
diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template
index c693768e6e4e..c077963863d3 100644
--- a/srcpkgs/sublime-text3/template
+++ b/srcpkgs/sublime-text3/template
@@ -1,36 +1,15 @@
 # Template file for 'sublime-text3'
 pkgname=sublime-text3
 version=3211
-revision=2
-depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
-short_desc="Sophisticated text editor for code, markup and prose"
+revision=3
+archs="i686 x86_64"
+build_style=meta
+short_desc="Empty meta-package for sublime-text3"
 maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
-license="custom:Proprietary"
+license="custom:EULA" #no vlicense check
 homepage="http://www.sublimetext.com/3dev"
-
-if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
-	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
-else
-	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
-	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
-fi
-
 repository="nonfree"
-archs="i686 x86_64"
-wrksrc="sublime_text_3"
-nopie=yes
 
 do_install() {
-	vmkdir "usr/bin"
-	vmkdir "usr/lib/sublime_text"
-	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
-	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
-	for size in 128 16 256 32 48; do
-		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
-		 "usr/share/icons/hicolor/${size}x${size}/apps/"
-	done
-	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
-	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
-	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg"  README.voidlinux
 }

From e66ba2adff53aef4a1300c940c556d60d719315b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 15:25:10 -0400
Subject: [PATCH 0243/1686] New package: sublime-text3-bin-3211

replaces sublime-text3
---
 srcpkgs/sublime-text3-bin/template | 55 ++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 srcpkgs/sublime-text3-bin/template

diff --git a/srcpkgs/sublime-text3-bin/template b/srcpkgs/sublime-text3-bin/template
new file mode 100644
index 000000000000..73d67ea9c631
--- /dev/null
+++ b/srcpkgs/sublime-text3-bin/template
@@ -0,0 +1,55 @@
+# Template file for 'sublime-text3-bin'
+pkgname=sublime-text3-bin
+version=3211
+revision=1
+archs="i686 x86_64"
+wrksrc="sublime_text_3"
+hostmakedepends="w3m"
+depends="libpng gtk+ hicolor-icon-theme desktop-file-utils"
+short_desc="Sophisticated text editor for code, markup and prose"
+maintainer="Andrea Brancaleoni <miwaxe@pompel.me>"
+license="custom:EULA"
+homepage="http://www.sublimetext.com/3dev"
+_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1
+repository="nonfree"
+restricted=yes
+nopie=yes
+replaces="sublime-text3>0"
+
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2"
+	checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee
+else
+	distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2"
+	checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071
+fi
+
+post_extract() {
+	$XBPS_FETCH_CMD https://www.sublimehq.com/eula
+	sed -n '
+		/is licensed.*not sold/p
+		/<ol>/,${ /<\/ol>/{x;p;d}; H }
+		$a </ol>
+	' <eula | w3m -dump -I utf-8 -T text/html >EULA
+
+	filesum="$(xbps-digest EULA)"
+	if [ "$filesum" != "$_license_checksum" ]; then
+		msg_error "SHA256 mismatch for EULA:\n$filesum\n"
+	fi
+}
+
+
+do_install() {
+	vmkdir "usr/bin"
+	vmkdir "usr/lib/sublime_text"
+	cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text"
+	vinstall "sublime_text.desktop" 644 "usr/share/applications/"
+	for size in 128 16 256 32 48; do
+		vinstall "Icon/${size}x${size}/sublime-text.png" 644 \
+		 "usr/share/icons/hicolor/${size}x${size}/apps/"
+	done
+	ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3
+	vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \
+	 -i ${DESTDIR}/usr/share/applications/sublime_text.desktop
+	vlicense EULA
+}

From f6643c0fdbbe10e437dc7bdf7454b1847bc2071f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 4 Sep 2021 23:06:20 +0200
Subject: [PATCH 0244/1686] New package: gtksourceview5-5.2.0

---
 common/shlibs                   |  1 +
 srcpkgs/gtksourceview5-devel    |  1 +
 srcpkgs/gtksourceview5/template | 52 +++++++++++++++++++++++++++++++++
 srcpkgs/gtksourceview5/update   |  3 ++
 4 files changed, 57 insertions(+)
 create mode 120000 srcpkgs/gtksourceview5-devel
 create mode 100644 srcpkgs/gtksourceview5/template
 create mode 100644 srcpkgs/gtksourceview5/update

diff --git a/common/shlibs b/common/shlibs
index 230fc6a994c0..83b5783cb026 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3497,6 +3497,7 @@ liblqr-1.so.0 liblqr-0.4.2_1
 libmozjs-78.so.0 mozjs78-78.1.0_1
 libebur128.so.1 libebur128-1.2.4_1
 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1
+libgtksourceview-5.so.0 gtksourceview5-5.2.0_1
 libwx_gtk3u_propgrid-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_qa-3.0.so.0 wxWidgets-gtk3-3.0.4_1
 libwx_gtk3u_core-3.0.so.0 wxWidgets-gtk3-3.0.4_1
diff --git a/srcpkgs/gtksourceview5-devel b/srcpkgs/gtksourceview5-devel
new file mode 120000
index 000000000000..1aac62393079
--- /dev/null
+++ b/srcpkgs/gtksourceview5-devel
@@ -0,0 +1 @@
+gtksourceview5
\ No newline at end of file
diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
new file mode 100644
index 000000000000..c4c7d94f51e8
--- /dev/null
+++ b/srcpkgs/gtksourceview5/template
@@ -0,0 +1,52 @@
+# Template file for 'gtksourceview5'
+pkgname=gtksourceview5
+version=5.2.0
+revision=1
+wrksrc="gtksourceview-${version}"
+build_style=meson
+build_helper="gir"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
+ $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
+hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
+ $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala)
+ pcre2-devel"
+checkdepends="xvfb-run cantarell-fonts"
+short_desc="Text widget that extends GTK4 GtkTextView widget"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="LGPL-2.1-or-later"
+homepage="https://wiki.gnome.org/Projects/GtkSourceView"
+changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-2/NEWS"
+distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
+checksum=c9b34fa02654f56ce22fa08827d89db4ba81631b2e6d7d31ea65d13c729430e9
+
+# Package build options
+build_options="gir gtk_doc"
+desc_option_gtk_doc="Build API docs via gtk-doc"
+build_options_default="gir"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+gtksourceview5-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel libglib-devel
+	 libxml2-devel pcre2-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+	}
+}
diff --git a/srcpkgs/gtksourceview5/update b/srcpkgs/gtksourceview5/update
new file mode 100644
index 000000000000..4617ff233267
--- /dev/null
+++ b/srcpkgs/gtksourceview5/update
@@ -0,0 +1,3 @@
+pkgname="gtksourceview"
+pattern="$pkgname-\K5\.[0-9]*[02468]\.[0-9]*(?=)"
+ignore="*.99"

From bff8ff5c0e0fbc477e28cc4356a2fe8722fef88f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 6 Dec 2021 11:07:59 +0100
Subject: [PATCH 0245/1686] New package: gnome-text-editor-41.1

---
 srcpkgs/gnome-text-editor/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/gnome-text-editor/template

diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template
new file mode 100644
index 000000000000..f1e474fca5ff
--- /dev/null
+++ b/srcpkgs/gnome-text-editor/template
@@ -0,0 +1,16 @@
+# Template file for 'gnome-text-editor'
+pkgname=gnome-text-editor
+version=41.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext itstool glib-devel"
+makedepends="libglib-devel gtk4-devel gtksourceview5-devel enchant2-devel
+ icu-devel libadwaita-devel pcre2-devel"
+short_desc="Simple text editor"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/gnome-text-editor"
+changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/gnome-41/NEWS"
+distfiles="${GNOME_SITE}/gnome-text-editor/${version%.*}/gnome-text-editor-$version.tar.xz"
+checksum=619ec520d6e0905d431167024e43dce0dbf6a345f2d48693501d70dc7626f861
+make_check=no # Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting.

From f7fcff8c60587bae99a37c2179eaac22d0b867ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:05:48 +0100
Subject: [PATCH 0246/1686] NetworkManager: update to 1.36.2.

---
 srcpkgs/NetworkManager/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template
index 5483f5c8b35b..5502f41159d3 100644
--- a/srcpkgs/NetworkManager/template
+++ b/srcpkgs/NetworkManager/template
@@ -1,6 +1,6 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
-version=1.34.0
+version=1.36.2
 revision=1
 build_style=meson
 build_helper="gir qemu"
@@ -19,7 +19,7 @@ configure_args="-Dsystemd_journal=false
  -Dsuspend_resume=$(vopt_if elogind elogind upower)
  -Dconfig_dhcp_default=internal"
 hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config
- intltool dbus-glib-devel jansson-devel docbook-xsl gtk-doc
+ intltool dbus-glib-devel docbook-xsl gtk-doc
  $(vopt_if gir 'vala python3-gobject')"
 makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel
@@ -33,8 +33,9 @@ short_desc="Network Management daemon"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
+changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-36/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd
+checksum=ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab
 # TODO: Some tests require network namespaces to run.
 make_check=extended
 lib32disabled=yes
@@ -58,6 +59,9 @@ post_patch() {
 			-e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" \
 			-e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \
 			src/libnm-client-impl/meson.build
+		# https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/955
+		vsed -e "s#jansson_dep.get_pkgconfig_variable('libdir')#'${XBPS_CROSS_BASE}/usr/lib'#" \
+			-i meson.build
 	fi
 }
 

From a23f016d95d0027a7bec21f264616bfdfa07169d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 15 Mar 2022 23:11:07 +0100
Subject: [PATCH 0247/1686] google-chrome: update to 99.0.4844.74

---
 srcpkgs/google-chrome/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template
index f50d9caa3464..5516594f44f9 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,7 +1,7 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.51
-revision=2
+version=99.0.4844.74
+revision=1
 _channel=stable
 archs="x86_64"
 hostmakedepends="curl tar xz python3 python3-html2text python3-setuptools"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=a19354b3f8eee069cec49cdc44bea43d7f0cbddf6a94bb49c1e221a4ee757812
+checksum=0444893153d4b3b628c6465c48e7c49f06649b101ce5ab066d59b14c363ef9f7
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 123935a962481d4ac0a1798eae8d3960cc691dad Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Tue, 8 Mar 2022 10:50:56 +0100
Subject: [PATCH 0248/1686] nwg-launchers: add gtk-layer-shell to makedepends

This dependancy makes nwg-launchers work better under wayland compositors,
by enabling layer-shell support.
---
 srcpkgs/nwg-launchers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nwg-launchers/template b/srcpkgs/nwg-launchers/template
index 0f394bff2582..acf5bfc58349 100644
--- a/srcpkgs/nwg-launchers/template
+++ b/srcpkgs/nwg-launchers/template
@@ -1,10 +1,10 @@
 # Template file for 'nwg-launchers'
 pkgname=nwg-launchers
 version=0.6.3
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
-makedepends="gtkmm-devel json-c++"
+makedepends="gtkmm-devel gtk-layer-shell-devel json-c++"
 short_desc="GTK-based launchers for window managers"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"

From c14ca21c49480cff014cd49da97f1d69cf3d15fe Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Tue, 22 Feb 2022 09:15:54 +0100
Subject: [PATCH 0249/1686] vscode: update to 1.65.2

---
 .../patches/disable-crash-reporter.patch      | 14 -------
 srcpkgs/vscode/patches/product.patch          |  9 ++--
 srcpkgs/vscode/patches/ripgrep.patch          | 42 +++++++++----------
 srcpkgs/vscode/template                       | 15 ++++---
 4 files changed, 32 insertions(+), 48 deletions(-)

diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch
index d91f6895969c..dac81e3341c4 100644
--- a/srcpkgs/vscode/patches/disable-crash-reporter.patch
+++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch
@@ -13,20 +13,6 @@ So, disable it entirely. No cookies for you, Visual Studio Code team.
  src/vs/code/electron-main/app.ts |  2 +-
  3 files changed, 1 insertion(+), 20 deletions(-)
 
-diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js
-index f7b07e49255..576c82f23e8 100644
---- a/src/bootstrap-fork.js
-+++ b/src/bootstrap-fork.js
-@@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) {
- 	terminateWhenParentTerminates();
- }
- 
--// Configure Crash Reporter
--configureCrashReporter();
--
- // Load AMD entry point
- require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']);
- 
 diff --git a/src/main.js b/src/main.js
 index ad838aa245e..e6319e100b9 100644
 --- a/src/main.js
diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index edeebf5d1439..a7e2b79925bf 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,19 +1,18 @@
 diff --git a/product.json b/product.json
-index 22e93d4b7c3..335cddd4c7c 100644
+index 9d630f23cd7..eea95dce319 100644
 --- a/product.json
 +++ b/product.json
-@@ -25,13 +25,22 @@
+@@ -27,6 +27,9 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
 +	"quality": "stable",
 +	"documentationUrl": "https://github.com/microsoft/vscode-docs",
 +	"requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/c42793d0357ff9c6589cce79a847177fd42852ee/out/vs/workbench/contrib/webview/browser/pre/",
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/",
  	"extensionAllowedProposedApi": [
  		"ms-vscode.vscode-js-profile-flame",
- 		"ms-vscode.vscode-js-profile-table",
-+		"ms-python.python",
+@@ -34,6 +37,11 @@
  		"GitHub.remotehub",
  		"GitHub.remotehub-insiders"
  	],
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index 6e81145a1cb1..ff0dfc233e41 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -1,32 +1,32 @@
-Ping q66 if this needs updating.
+Ping atk if this needs updating.
 
 This prevents vscode from fetching prebuilt ripgrep from Microsoft
 during build, which unbreaks build on platforms where MS deos not
 ship a prebuilt ripgrep.
 
 diff --git a/package.json b/package.json
-index 6d1fb7cca0c..057ed39ac31 100644
+index 5d6022a2a40..f66ee44eef0 100644
 --- a/package.json
 +++ b/package.json
-@@ -83,7 +83,7 @@
-     "vscode-oniguruma": "1.6.1",
-     "vscode-proxy-agent": "^0.11.0",
-     "vscode-regexpp": "^3.1.0",
--    "vscode-ripgrep": "^1.12.1",
-+    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.5.0",
-     "xterm": "4.16.0-beta.2",
-     "xterm-addon-search": "0.9.0-beta.6",
+@@ -63,7 +63,7 @@
+     "@parcel/watcher": "2.0.5",
+     "@vscode/debugprotocol": "1.51.0",
+     "@vscode/iconv-lite-umd": "0.7.0",
+-    "@vscode/ripgrep": "^1.14.1",
++    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
+     "@vscode/sqlite3": "4.0.12",
+     "@vscode/sudo-prompt": "9.3.1",
+     "@vscode/vscode-languagedetection": "1.0.21",
 diff --git a/remote/package.json b/remote/package.json
-index 662ce3568ab..a79fe3764d9 100644
+index 4bc40998093..9d22d408c02 100644
 --- a/remote/package.json
 +++ b/remote/package.json
-@@ -22,7 +22,7 @@
-     "vscode-oniguruma": "1.6.1",
-     "vscode-proxy-agent": "^0.11.0",
-     "vscode-regexpp": "^3.1.0",
--    "vscode-ripgrep": "^1.12.1",
-+    "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git",
-     "vscode-textmate": "5.5.0",
-     "xterm": "4.16.0-beta.2",
-     "xterm-addon-search": "0.9.0-beta.6",
+@@ -6,7 +6,7 @@
+     "@microsoft/applicationinsights-web": "^2.6.4",
+     "@parcel/watcher": "2.0.5",
+     "@vscode/iconv-lite-umd": "0.7.0",
+-    "@vscode/ripgrep": "^1.14.1",
++    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
+     "@vscode/vscode-languagedetection": "1.0.21",
+     "applicationinsights": "1.4.2",
+     "cookie": "^0.4.0",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 97f1a142a814..620c9a6928aa 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,17 +1,17 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.63.2
+version=1.65.2
 revision=1
-_electronver=13.6.1
-hostmakedepends="pkg-config python nodejs yarn tar git ripgrep"
-makedepends="libxkbfile-devel libsecret-devel electron13"
-depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
+_electronver=13.6.7
+hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep"
+makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13"
+depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
 short_desc="Microsoft Code for Linux"
-maintainer="shizonic <realtiaz@gmail.com>"
+maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=21fc9bc17ba4cf480b1e006f298363d86215c339c480f8d781cabcfedad2d624
+checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -61,7 +61,6 @@ do_install() {
 	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop
 	vmkdir usr/share/pixmaps
 	ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png
-	ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg
 	vsed \
 	-e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \
 	-e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \

From 744da894729460ad3eb848d97c71ae29c7f89ae6 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 09:40:04 +0100
Subject: [PATCH 0250/1686] geonkick: update to 2.9.0.

---
 srcpkgs/geonkick/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geonkick/template b/srcpkgs/geonkick/template
index 79f8ba451959..af8ea0fa8190 100644
--- a/srcpkgs/geonkick/template
+++ b/srcpkgs/geonkick/template
@@ -1,6 +1,6 @@
 # Template file for 'geonkick'
 pkgname=geonkick
-version=2.8.1
+version=2.9.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config tar xz"
@@ -10,9 +10,9 @@ short_desc="Free software percussion synthesizer"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/free-sm/geonkick"
-changelog="https://github.com/free-sm/geonkick/blob/main/NEWS.md"
+changelog="https://raw.githubusercontent.com/free-sm/geonkick/main/NEWS.md"
 distfiles="https://github.com/free-sm/geonkick/archive/refs/tags/v${version}.tar.gz"
-checksum=813fb10709136ed79403c8baf3d847fce9fbf717fea3c194ad2952e0172e6d45
+checksum=54968894e3fab1ad1b7a92e12cdb5041ca39a22842c8e815a443f50cbcc4dc5b
 
 if [ ${CROSS_BUILD} ]; then
 	configure_args+=" -DGKICK_ARCHITECTURE=$XBPS_TARGET_MACHINE"

From d8e21d8188b9764965a7a6402ddb4ca7fd4c26e0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 16 Mar 2022 14:55:31 +0100
Subject: [PATCH 0251/1686] libtls: update to 3.4.3.

---
 srcpkgs/libtls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 42f33db208a6..f8217c020c65 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -1,6 +1,6 @@
 # Template file for 'libtls'
 pkgname=libtls
-version=3.4.2
+version=3.4.3
 revision=1
 wrksrc="libressl-${version}"
 build_style=gnu-configure
@@ -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=cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce
+checksum=ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d
 _lssl_asm_ver="1.2.0"
 replaces="libtls20>0"
 

From b33dbf437325b26e8ba5021766b20b6e27ca2515 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 16 Mar 2022 18:34:42 +0100
Subject: [PATCH 0252/1686] flatpak: update to 1.12.7.

---
 srcpkgs/flatpak/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template
index 2682c5ce96c8..7820788874be 100644
--- a/srcpkgs/flatpak/template
+++ b/srcpkgs/flatpak/template
@@ -1,6 +1,6 @@
 # Template file for 'flatpak'
 pkgname=flatpak
-version=1.12.6
+version=1.12.7
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -23,7 +23,7 @@ license="LGPL-2.1-or-later"
 homepage="https://flatpak.org/"
 changelog="https://github.com/flatpak/flatpak/raw/main/NEWS"
 distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz"
-checksum=ef02cb505b91cce5173099b5485768eef1899ebcf39edf827c4254163a811627
+checksum=6db52a531ce278282ac7ebfb99f66a0bb3eccaf44e864844c2c95c1ee5ba9316
 
 build_options="gir"
 build_options_default="gir"

From 7978fdc1cfac91d90ecf0bfeb3d18137c8d5f2fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:51:15 +0100
Subject: [PATCH 0253/1686] tali: update to 40.5.

---
 srcpkgs/tali/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index bfd640177d27..3e50e64f96fc 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -1,14 +1,13 @@
 # Template file for 'tali'
 pkgname=tali
-version=3.38.3
+version=40.5
 revision=1
 build_style=meson
-hostmakedepends="cmake pkg-config gettext glib-devel appstream-glib
- desktop-file-utils itstool"
+hostmakedepends="pkg-config gettext glib-devel itstool"
 makedepends="gtk+3-devel libgnome-games-support-devel"
 short_desc="GNOME sort of poker game with dice"
 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"
-checksum=0215428b50c4a0827fb0de2e4e6ba6e56678f9ba76d8d25b7eeca85215f25a39
+checksum=63a09c55e46a1a19756bf5e0957caf994300fadabdba6bda602e668dfcdf7122

From 226dab218f59260f9a013893fde4cdd119de1a06 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:20:44 +0100
Subject: [PATCH 0254/1686] pangomm2.48: update to 2.50.0.

---
 srcpkgs/pangomm2.48/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pangomm2.48/template b/srcpkgs/pangomm2.48/template
index 291837c42612..d46d232ea53f 100644
--- a/srcpkgs/pangomm2.48/template
+++ b/srcpkgs/pangomm2.48/template
@@ -1,6 +1,6 @@
 # Template file for 'pangomm2.48'
 pkgname=pangomm2.48
-version=2.48.1
+version=2.50.0
 revision=1
 wrksrc="pangomm-$version"
 build_style=meson
@@ -10,8 +10,9 @@ short_desc="C++ bindings for the pango library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
+changelog="https://gitlab.gnome.org/GNOME/pangomm/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/pangomm/${version%.*}/pangomm-${version}.tar.xz"
-checksum=776ad53e791e43106b7f40ff0834bee6e4eb1c6ad7cb6d215546f7a3df0edc4d
+checksum=a27aa77e017b9afce9e751d85bd1cf890abbb3a58bf59d0fac917eef82db3b5b
 
 pangomm2.48-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From e3ab7a02b2fe8efc8fc08c2105cbc0def6eef277 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:25:52 +0100
Subject: [PATCH 0255/1686] zathura: fix distfiles 404

---
 srcpkgs/zathura/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index 3f456aa370ff..c93fbc062cee 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -12,9 +12,9 @@ checkdepends="gettext-devel check-devel"
 short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="https://pwmt.org/projects/zathura"
-distfiles="${homepage}/download/zathura-${version}.tar.xz"
-checksum=fc30c42cd660d993bce8758e22e4ba8078761d51f1e29494e7a0d37a8a3e5e57
+homepage="https://git.pwmt.org/pwmt/zathura/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=82235cbc89899421fca98477265626f2149df7d072740f0360550cc8d4e449d6
 
 if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=enabled"

From 41b898a473b884e8ee0c5250fbe456480fe50757 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:25:54 +0100
Subject: [PATCH 0256/1686] zathura-ps: fix distfiles 404

---
 srcpkgs/zathura-ps/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template
index 2ca4483f9147..e17da900762c 100644
--- a/srcpkgs/zathura-ps/template
+++ b/srcpkgs/zathura-ps/template
@@ -9,9 +9,9 @@ depends="zathura ghostscript"
 short_desc="PostScript support for zathura"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-ps/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46
+homepage="https://git.pwmt.org/pwmt/zathura-ps/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=e7092c831e345002edc87321911faa27c5dc3210dd6e3939dfbc49192a54d35e
 
 post_install() {
 	vlicense LICENSE

From ef3225cbc3d11b688a7842e1fd91bbc757672560 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:25:57 +0100
Subject: [PATCH 0257/1686] zathura-djvu: fix distfiles 404

---
 srcpkgs/zathura-djvu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-djvu/template b/srcpkgs/zathura-djvu/template
index 80ce14959c2a..733475923712 100644
--- a/srcpkgs/zathura-djvu/template
+++ b/srcpkgs/zathura-djvu/template
@@ -9,9 +9,9 @@ depends="zathura"
 short_desc="DjVu support for zathura"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-djvu/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=96e6f8a6ee53231073b2f7003264872f84501e63c3da7bf0598d046286b0c200
+homepage="https://git.pwmt.org/pwmt/zathura-djvu/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=84fae6da42e7cdc2e49ed4cd4f0315ac09716e95358b9c7487803a2cff47dbca
 
 post_install() {
 	vlicense LICENSE

From 95bc60b7af51e4d94c28f50a4b7929be299666b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:26:05 +0100
Subject: [PATCH 0258/1686] zathura-cb: fix distfiles 404

---
 srcpkgs/zathura-cb/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-cb/template b/srcpkgs/zathura-cb/template
index 80d700895c54..4cfed7b4d6f0 100644
--- a/srcpkgs/zathura-cb/template
+++ b/srcpkgs/zathura-cb/template
@@ -9,9 +9,9 @@ depends="zathura"
 short_desc="Comic book support for zathura"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-cb/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=3ad7619449987fd2e0203644f7487e073000b022a8b80bdd1df52147424b40d6
+homepage="https://git.pwmt.org/pwmt/zathura-cb/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=30d2cea3b1eb65e7386eb66ec305e455b2bed272c35530faaec541b47217fdcd
 
 post_install() {
 	vlicense LICENSE

From 1167133920819c6e5cc0c7097226407a0efe1553 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:26:15 +0100
Subject: [PATCH 0259/1686] zathura-pdf-mupdf: fix distfiles 404

---
 srcpkgs/zathura-pdf-mupdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index e2afbf966505..9f973214cf83 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -12,9 +12,9 @@ depends="zathura"
 short_desc="PDF support for zathura (using mupdf)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-pdf-mupdf/"
-distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz"
-checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d
+homepage="https://git.pwmt.org/pwmt/zathura-pdf-mupdf/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=3f2d341dfe3bdbfb7a51a33aee81f3763a684d0ea503dd20c726311125d7c08a
 conflicts="zathura-pdf-poppler>=0"
 
 post_install() {

From 4c7ab4aa3c81779752b35e36a01c71d2f4b3db0f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:26:18 +0100
Subject: [PATCH 0260/1686] zathura-pdf-poppler: fix distfiles 404

---
 srcpkgs/zathura-pdf-poppler/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template
index 9c174c61fab0..d638f659a507 100644
--- a/srcpkgs/zathura-pdf-poppler/template
+++ b/srcpkgs/zathura-pdf-poppler/template
@@ -9,9 +9,9 @@ depends="zathura"
 short_desc="PDF support for zathura (using poppler)"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="http://pwmt.org/projects/zathura-pdf-poppler/"
-distfiles="https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${version}.tar.xz"
-checksum=d5cc3a7dae49471b85b503bbb9049c6f8d10903f4a611d721a2e0fefe726d4ed
+homepage="https://git.pwmt.org/pwmt/zathura-pdf-poppler/"
+distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz"
+checksum=2034f70a936d458ddc9276f769e77ff308ba3bb1b7a7cdc87bab8b9ef7ade84a
 
 conflicts="zathura-pdf-mupdf>=0"
 

From 4c4bbe6472d1982caae5d9dbcd4480952c974857 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:48:52 +0100
Subject: [PATCH 0261/1686] certbot: update to 1.25.0.

---
 srcpkgs/certbot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index 63432609805f..aa8de157d59b 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.24.0
+version=1.25.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=ba19713ff22c4ac0939c7863986d673d0a45209340f80b1bc6a301d278580be3
+checksum=9633d21051fe7fd076d64cb41963de61d300d7c30f4b491c8d18cb8306357509

From 059e8e663658266418e58476e819787d6ad8d489 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:48:56 +0100
Subject: [PATCH 0262/1686] certbot-apache: update to 1.25.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 cf9eb1c6fd70..1f5c098c802d 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.24.0
+version=1.25.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=d432e6b748ae3d12a794da2a90d3a40a054bcc36c4ff63c303766a685f48b324
+checksum=91dbd326c5ee4fe7a2ef5f1c3c525863a7f4ed5f228e1c7c10048d18fe18d0a1

From c16b388f15dbbe6ff992aa26de3458bc53a420a6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:48:58 +0100
Subject: [PATCH 0263/1686] certbot-nginx: update to 1.25.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 3cd8fb59c303..b635785e5d0a 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.24.0
+version=1.25.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=192843768cf50e07c133efd79c4cae8b689d986c2f952173875fa0717a0cbaf7
+checksum=433a7237e841c462a67f9195fb7d7711ac6ed6d27bedb981c71238ef5348d62b

From 7658d93d402147aba174692805523138ec2a0e6c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:49:03 +0100
Subject: [PATCH 0264/1686] python3-acme: update to 1.25.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 20fbf978b912..19e374d105a8 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.24.0
+version=1.25.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=63161f442d7c995313305663ad2eef6b3f770899c3f635e1c1f1d0141696b298
+checksum=e3fbe36fcfa27ec46f450369498f3486370ab53a0fd7db91557a23d58b3969fa

From d0eee7901ba711990d9cfc01f6a6a101a7b2d0f8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 21:49:06 +0100
Subject: [PATCH 0265/1686] python3-josepy: update to 1.13.0.

---
 srcpkgs/python3-josepy/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template
index 4130d629dc3b..6df2673629f2 100644
--- a/srcpkgs/python3-josepy/template
+++ b/srcpkgs/python3-josepy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-josepy'
 pkgname=python3-josepy
-version=1.12.0
+version=1.13.0
 revision=1
 wrksrc="josepy-${version}"
 build_style=python3-module
@@ -11,8 +11,9 @@ short_desc="JOSE protocol implementation in Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/certbot/josepy"
+changelog="https://raw.githubusercontent.com/certbot/josepy/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/j/josepy/josepy-${version}.tar.gz"
-checksum=267004a64f08c016cd54b7aaf7c323fa3ef3679fb62f4b086cd56448d0fecb25
+checksum=8931daf38f8a4c85274a0e8b7cb25addfd8d1f28f9fb8fbed053dd51aec75dc9
 
 pre_check() {
 	vsed -e '/addopts/d' -i pytest.ini

From c879624975dc0289e22f6b9700ab6df11ace984f Mon Sep 17 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, 10 Mar 2022 21:30:02 +0700
Subject: [PATCH 0266/1686] nss: update to 3.76.

---
 srcpkgs/nss/patches/D136289.patch            | 43 --------------------
 srcpkgs/nss/patches/cpputil-databuffer.patch | 20 +++++++++
 srcpkgs/nss/template                         |  4 +-
 3 files changed, 22 insertions(+), 45 deletions(-)
 delete mode 100644 srcpkgs/nss/patches/D136289.patch
 create mode 100644 srcpkgs/nss/patches/cpputil-databuffer.patch

diff --git a/srcpkgs/nss/patches/D136289.patch b/srcpkgs/nss/patches/D136289.patch
deleted file mode 100644
index a6d380515504..000000000000
--- a/srcpkgs/nss/patches/D136289.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1750624
-diff --git a/nss/tests/chains/chains.sh b/nss/tests/chains/chains.sh
---- a/nss/tests/chains/chains.sh
-+++ b/nss/tests/chains/chains.sh
-@@ -917,7 +917,7 @@
-     done
- 
-     VFY_OPTS_TNAME="${DB_OPT} ${ENGINE} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${TRUST_OPT}"
--    VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
-+    VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${VFY_TIME_OPT} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}"
- 
-     TESTNAME="Verifying certificate(s) ${VFY_LIST} with flags ${VFY_OPTS_TNAME}"
-     echo "${SCRIPTNAME}: ${TESTNAME}"
-@@ -1118,6 +1118,7 @@
-             ;;
-         "verify")
-             VERIFY="${VALUE}"
-+            VFY_TIME_OPT=
-             TRUST=
-             TRUST_AND_DB=
-             POLICY=
-@@ -1126,6 +1127,9 @@
-             REV_OPTS=
-             USAGE_OPT=
-             ;;
-+        "at_time")
-+            VFY_TIME_OPT="-b ${VALUE}"
-+            ;;
-         "cert")
-             VERIFY="${VERIFY} ${VALUE}"
-             ;;
-diff --git a/nss/tests/chains/scenarios/realcerts.cfg b/nss/tests/chains/scenarios/realcerts.cfg
---- a/nss/tests/chains/scenarios/realcerts.cfg
-+++ b/nss/tests/chains/scenarios/realcerts.cfg
-@@ -22,6 +22,7 @@
- 
- verify PayPalEE:x
-   policy OID.2.16.840.1.114412.2.1 
-+  at_time 2201010000Z
-   result pass
- 
- verify BrAirWaysBadSig:x
-
diff --git a/srcpkgs/nss/patches/cpputil-databuffer.patch b/srcpkgs/nss/patches/cpputil-databuffer.patch
new file mode 100644
index 000000000000..44dd3f467882
--- /dev/null
+++ b/srcpkgs/nss/patches/cpputil-databuffer.patch
@@ -0,0 +1,20 @@
+Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1758478
+diff --git a/nss/cpputil/databuffer.h b/nss/cpputil/databuffer.h
+index 8d34e1a..6aee509 100644
+--- a/nss/cpputil/databuffer.h
++++ b/nss/cpputil/databuffer.h
+@@ -33,11 +33,9 @@ class DataBuffer {
+     return *this;
+   }
+   DataBuffer& operator=(DataBuffer&& other) {
+-    if (this == &other) {
+-      data_ = other.data_;
+-      len_ = other.len_;
+-      other.data_ = nullptr;
+-      other.len_ = 0;
++    if (this != &other) {
++      std::swap(data_, other.data_);
++      std::swap(len_, other.len_);
+     }
+     return *this;
+   }
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 52ce1074b303..f85cfe79a868 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.75
+version=3.76
 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=fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582
+checksum=1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From da358ef4f77a4b4a2a878ae63e48edbace7cf7a5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 16 Mar 2022 15:26:02 +0200
Subject: [PATCH 0267/1686] skype: update to 8.82.0.403.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index b0cfc9ea66c1..7760c535079c 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.81.0.268
+version=8.82.0.403
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=0a701bee1be8b2b0872696f3fea1c429635b6dfd738b86978f9b81d238f35118
+checksum=df903a805c3db301d8846e5fcfe2ec5acbea720c49f3031edb50d416f5a52a24
 repository="nonfree"
 nostrip="yes"
 

From a05a8c5a6c81e941f5445d9e5f6b87c5da9f574e Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Wed, 9 Mar 2022 18:50:40 +0100
Subject: [PATCH 0268/1686] python3-docutils: update to 0.18.1.

---
 srcpkgs/python3-docutils/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template
index 0600a65a729b..13bc5f4d7c33 100644
--- a/srcpkgs/python3-docutils/template
+++ b/srcpkgs/python3-docutils/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-docutils'
 pkgname=python3-docutils
-version=0.17.1
-revision=2
+version=0.18.1
+revision=1
 wrksrc="docutils-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0"
 homepage="http://docutils.sourceforge.net"
 distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
-checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+checksum=679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06
 
 alternatives="
  docutils:rst2html:/usr/bin/rst2html.py

From f0e620db7ec794e89e5c483f8c1445a026edbcc0 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Tue, 15 Mar 2022 21:12:07 +0400
Subject: [PATCH 0269/1686] python3-curl: update to 7.45.1.

---
 srcpkgs/python3-curl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index ea7831c2f087..7a728a5ff62d 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-curl'
 pkgname=python3-curl
-version=7.45.0
+version=7.45.1
 revision=1
 wrksrc="pycurl-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="LGPL-2.1-or-later, MIT"
 homepage="http://pycurl.io/"
 changelog="https://raw.githubusercontent.com/pycurl/pycurl/master/ChangeLog"
 distfiles="${PYPI_SITE}/p/pycurl/pycurl-${version}.tar.gz"
-checksum=5036c53c6f4106e9160d053a4baa3433a0215fb3386073e211273c56a3a95f3d
+checksum=a863ad18ff478f5545924057887cdae422e1b2746e41674615f687498ea5b88a
 
 pre_build() {
 	vsed -i "/setup_args\['data_files'\] = /d" setup.py

From 6c6f5e64c6e0ff33a0b47830334e68229b7ff138 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Wed, 16 Mar 2022 19:45:56 +0400
Subject: [PATCH 0270/1686] python3-regex: update to 2022.3.15.

---
 srcpkgs/python3-regex/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template
index 6e31d60343e8..57e5b7f4fb02 100644
--- a/srcpkgs/python3-regex/template
+++ b/srcpkgs/python3-regex/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-regex'
 pkgname=python3-regex
-version=2022.3.2
+version=2022.3.15
 revision=1
 wrksrc="regex-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="skmpz <dem.procopiou@gmail.com>"
 license="CNRI-Python, Apache-2.0"
 homepage="https://pypi.org/project/regex/"
 distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz"
-checksum=79e5af1ff258bc0fe0bdd6f69bc4ae33935a898e3cbefbbccf22e88a27fa053b
+checksum=0a7b75cc7bb4cc0334380053e4671c560e31272c9d2d5a6c4b8e9ae2c9bd0f82
 
 do_check() {
 	(cd build/lib* && python3 -m unittest regex/test_regex.py)

From 13d992cd9f52506ed795309a5403dd9dad407e24 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Thu, 17 Feb 2022 16:13:22 +0100
Subject: [PATCH 0271/1686] python3-pikepdf: update to 5.0.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 bc4dc5911630..ae0b2ee09ba5 100644
--- a/srcpkgs/python3-pikepdf/template
+++ b/srcpkgs/python3-pikepdf/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pikepdf'
 pkgname=python3-pikepdf
-version=4.4.1
+version=5.0.1
 revision=1
 wrksrc="pikepdf-${version}"
 build_style=python3-module
@@ -14,7 +14,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=c25d4c7673f9588d1f98bca498db98ba675070dc89ffffe50b3b124d4a005df9
+checksum=5fae9eeb7a0120d466fb219aea643a94a1423d68ee9171639a44cf0329ebe7aa
 
 pre_build() {
 	vsed -e '/setuptools_scm_git_archive/d' -i setup.py

From 88f3b2e567fd0ec6bc4d22c64a82eb543867c718 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:53:29 -0400
Subject: [PATCH 0272/1686] python3: update to 3.10.3.

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 85cd88971a4d..df408f9ed74d 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.10.2
+version=3.10.3
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -22,7 +22,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=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7
+checksum=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From 3ae77052ef66c1800ed09d73e4d0c4cfaf3c9539 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:54:49 -0400
Subject: [PATCH 0273/1686] python3-tkinter: update to 3.10.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 3c7ecb8cfd82..bfe219597ff5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.10.2
+version=3.10.3
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -29,7 +29,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=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7
+checksum=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"

From ec05d4869fb3196438737c18793c26e7cf8ac0c8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:55:04 -0400
Subject: [PATCH 0274/1686] python3-MarkupSafe: update to 2.1.1.

---
 srcpkgs/python3-MarkupSafe/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-MarkupSafe/template b/srcpkgs/python3-MarkupSafe/template
index d298c3f318bd..3f1b6a839d0f 100644
--- a/srcpkgs/python3-MarkupSafe/template
+++ b/srcpkgs/python3-MarkupSafe/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-MarkupSafe'
 pkgname=python3-MarkupSafe
-version=2.1.0
+version=2.1.1
 revision=1
 wrksrc="MarkupSafe-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://palletsprojects.com/p/markupsafe/"
 distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
-checksum=80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f
+checksum=7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b
 
 post_install() {
 	vlicense LICENSE.rst

From 8d1532d53b34c0bbe28917770b30c61f8792245c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:55:14 -0400
Subject: [PATCH 0275/1686] python3-cppy: update to 1.2.0.

---
 srcpkgs/python3-cppy/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-cppy/template b/srcpkgs/python3-cppy/template
index de7943af84f5..3afd8399c77a 100644
--- a/srcpkgs/python3-cppy/template
+++ b/srcpkgs/python3-cppy/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-cppy'
 pkgname=python3-cppy
-version=1.1.0
-revision=2
+version=1.2.0
+revision=1
 wrksrc="cppy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="C++ headers to make it easier to write Python C extensions"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://cppy.readthedocs.io"
 changelog="https://raw.githubusercontent.com/nucleic/cppy/master/releasenotes.rst"
 distfiles="${PYPI_SITE}/c/cppy/cppy-${version}.tar.gz"
-checksum=4eda6f1952054a270f32dc11df7c5e24b259a09fddf7bfaa5f33df9fb4a29642
+checksum=95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc
 
 post_install() {
 	vlicense LICENSE

From 8ccea11f84be6ce5349eac49aaeb1ee5309d9eb2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:55:45 -0400
Subject: [PATCH 0276/1686] python3-cryptography_vectors: update to 36.0.2.

---
 srcpkgs/python3-cryptography_vectors/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 152ad12ebdde..c31863f52ad7 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-cryptography_vectors'
 pkgname=python3-cryptography_vectors
-version=36.0.0
-revision=2
+version=36.0.2
+revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,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=c6b7e53ec701f47497297cfcfbafdf81a3f76f6f9d684721ef3dea254301faa5
+checksum=2a7924449a03025faf7f8754a6f4200001cab210734a6ce6ac1f6bdacd3a68e4
 
 post_install() {
 	vlicense LICENSE

From 4e53138ccacc603845c5c4ae2504d1142af0ea09 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 09:57:51 -0400
Subject: [PATCH 0277/1686] python3-cryptography: update to 36.0.2.

---
 srcpkgs/python3-cryptography/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index 40c226de9f8c..278446d27efb 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cryptography'
 pkgname=python3-cryptography
-version=36.0.0
+version=36.0.2
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ license="BSD-3-Clause, Apache-2.0"
 homepage="https://github.com/pyca/cryptography"
 changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=52f769ecb4ef39865719aedc67b4b7eae167bafa48dbc2a26dd36fa56460507f
+checksum=70f8f4f7bb2ac9f340655cbac89d68c527af5bb4387522a8413e841e3e6628c9
 
 if [ "$CROSS_BUILD" ]; then
 	makedepends+=" rust-std"

From 525e4d9f25a600cc688a36822826722c3395db0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:00:01 -0400
Subject: [PATCH 0278/1686] python3-pywt: update to 1.3.0.

---
 srcpkgs/python3-pywt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pywt/template b/srcpkgs/python3-pywt/template
index 3fdb9e576558..cb3cad5d80d6 100644
--- a/srcpkgs/python3-pywt/template
+++ b/srcpkgs/python3-pywt/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pywt'
 pkgname=python3-pywt
-version=1.2.0
+version=1.3.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/PyWavelets/pywt"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ad88e5745eeaccaf759287f11b63539353df31324fe7498d9f8121e01e4106ed
+checksum=6dc7e55a2d7c415262eb212a2fbbb0e3aa19572fecd5cebcef72b810ac11d4ae
 
 do_check() {
 	(cd build/lib* && python3 -m pytest pywt/tests)

From ac3e12f657de03aa04b91a27c1f13cee63fda9e6 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:00:13 -0400
Subject: [PATCH 0279/1686] python3-tifffile: update to 2022.3.16.

---
 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 d7a735438e5b..00d4c6c3f391 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.2.9
+version=2022.3.16
 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=901f11169c2aa94c6b3cd9af2998de4b169d33210f78ae08a9acd21a231ebb7e
+checksum=2e51c805be3a77f472c0cca3f0c13e60eb110fbfc305a20e278dad3d4e4fe4bf
 # Tests require unpackaged fsspec
 make_check=no
 

From e94ae669e265d6bd500e644f50ee0eda39ab7615 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:02:25 -0400
Subject: [PATCH 0280/1686] maturin: update to 0.12.11.

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index a7de61b7704a..a6c1cbdd3d71 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.10
+version=0.12.11
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="764d91bb35a41d0fa389f3e8179353c0a7e173fbb52c6d434e2877951f15e4a4
+checksum="4d39f15fae9c01f2f23a544fc26b20c68693ec03f820b30ca5f505647c452be1
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From a7fd2b219ca5779ef7279cc100a11c586df1d36d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 17 Mar 2022 10:06:09 -0400
Subject: [PATCH 0281/1686] python3-pyzmq: ignore beta releases

---
 srcpkgs/python3-pyzmq/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/python3-pyzmq/update

diff --git a/srcpkgs/python3-pyzmq/update b/srcpkgs/python3-pyzmq/update
new file mode 100644
index 000000000000..e9b0a0a5ea4c
--- /dev/null
+++ b/srcpkgs/python3-pyzmq/update
@@ -0,0 +1 @@
+ignore="*b*"

From 4585ae49ce73ba1ab436cfce29811a0726286fd1 Mon Sep 17 00:00:00 2001
From: MouadCharradi <charradimouad58@gmail.com>
Date: Wed, 9 Mar 2022 18:44:49 +0100
Subject: [PATCH 0282/1686] python3-setuptools: update to 60.9.3.

Closes: #36067 [via git-merge-pr]
---
 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 a17da25edcac..1c21c918978d 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-setuptools'
 pkgname=python3-setuptools
-version=60.5.0
+version=60.9.3
 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=2404879cda71495fc4d5cbc445ed52fdaddf352b36e40be8dcc63147cb4edabe
+checksum=2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5
 provides="python3-distribute-${version}_1"
 replaces="python3-distribute>=0"
 # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged;

From d64a2361b1a15d21247703b859d5b81edd0d5281 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 22 Feb 2022 01:59:54 +0100
Subject: [PATCH 0283/1686] python3-pulsectl: update to 22.1.3.

Closes: #35749 [via git-merge-pr]
---
 srcpkgs/python3-pulsectl/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template
index 006363a1c5d4..2c2a985b0b39 100644
--- a/srcpkgs/python3-pulsectl/template
+++ b/srcpkgs/python3-pulsectl/template
@@ -1,18 +1,19 @@
 # Template file for 'python3-pulsectl'
 pkgname=python3-pulsectl
-version=20.5.1
-revision=2
+version=22.1.3
+revision=1
 wrksrc="pulsectl-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools"
+checkdepends="pulseaudio"
 short_desc="Python3 high-level interfaces and ctypes bindings for libpulse"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/mk-fg/python-pulse-control"
 changelog="https://github.com/mk-fg/python-pulse-control/raw/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/p/pulsectl/pulsectl-${version}.tar.gz"
-checksum=39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db
+checksum=f28fe4b881dd2cc144d2d94f83ec60d8c59a52642a0ad3635cc4d0f8406f4858
 
 post_install() {
 	vlicense COPYING

From 45021ff4d74ab399db09d66269ae7be6412d91cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 18:01:31 +0100
Subject: [PATCH 0284/1686] doctl: update to 1.71.0.

---
 srcpkgs/doctl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 8dd3efe61c68..0580a504f27e 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,6 +1,6 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.70.0
+version=1.71.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=527a0d02acb303ca3e55c28db162acbc018fb77ca9e77d9298fece2124774c32
+checksum=62a14c05bd4b8442f0a610f9eba7237fe67e1afc397750893cdf2b741aebfd54

From 1983d76ca7819bc48a611e90cba4de170ab8af69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:28:55 +0100
Subject: [PATCH 0285/1686] qpdf: update to 10.6.3.

---
 srcpkgs/qpdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template
index 83b293d0ac77..324de5aefaa2 100644
--- a/srcpkgs/qpdf/template
+++ b/srcpkgs/qpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'qpdf'
 pkgname=qpdf
-version=10.6.2
+version=10.6.3
 revision=1
 wrksrc="qpdf-release-qpdf-${version}"
 build_style=gnu-configure
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://github.com/qpdf/qpdf"
 changelog="https://raw.githubusercontent.com/qpdf/qpdf/stable/manual/release-notes.rst"
 distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz"
-checksum=e8f8f7f09fe3b9d1f98907e4a0cb7fddb4f0f9b8084e7e3201a571334e686c8c
+checksum=64bbb654ec19b6812284ef1bc40c57b091de5281f265f1c3c83dd8ccf6bedcf5
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 25ab3c4abdafaf48ef7eae0ca8176de58d70afac Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Thu, 17 Mar 2022 16:06:11 +0100
Subject: [PATCH 0286/1686] libguestfs: update to 1.48.0.

---
 srcpkgs/libguestfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 5ac1d1d2b8ee..8d669017077e 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
-version=1.46.2
-revision=2
+version=1.48.0
+revision=1
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"
@@ -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=e6ea69ca521d60f0c54bd6d3daf1f591cc62e1105dc253897152489aa348006b
+checksum=1681fddedfcf484ca6deec54230330a32defbd30c2ab1f81788e252cb5d04829
 
 conf_files="etc/libguestfs-tools.conf"
 

From a452ec2e579bf79cccaff74fc475f2c2450686da Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 1 Mar 2022 13:38:42 +0100
Subject: [PATCH 0287/1686] lrzip: update to 0.650.

* enable ASM for x86
* liblrzip is deprecated
---
 srcpkgs/liblrzip                  |  1 -
 srcpkgs/lrzip-devel               |  1 -
 srcpkgs/lrzip/template            | 27 ++++++++++-----------------
 srcpkgs/removed-packages/template |  4 +++-
 4 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/liblrzip
 delete mode 120000 srcpkgs/lrzip-devel

diff --git a/srcpkgs/liblrzip b/srcpkgs/liblrzip
deleted file mode 120000
index ce2559e2110e..000000000000
--- a/srcpkgs/liblrzip
+++ /dev/null
@@ -1 +0,0 @@
-lrzip
\ No newline at end of file
diff --git a/srcpkgs/lrzip-devel b/srcpkgs/lrzip-devel
deleted file mode 120000
index ce2559e2110e..000000000000
--- a/srcpkgs/lrzip-devel
+++ /dev/null
@@ -1 +0,0 @@
-lrzip
\ No newline at end of file
diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template
index 2ec52997c8e8..1b492e9e6c6c 100644
--- a/srcpkgs/lrzip/template
+++ b/srcpkgs/lrzip/template
@@ -1,6 +1,6 @@
 # Template file for 'lrzip'
 pkgname=lrzip
-version=0.641
+version=0.650
 revision=1
 build_style="gnu-configure"
 hostmakedepends="perl automake libtool"
@@ -10,25 +10,18 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lrzip.kolivas.org/"
 distfiles="https://github.com/ckolivas/lrzip/archive/v${version}.tar.gz"
-checksum=9b6b4bb1ae76dafbaab96ec9d50d41af5fed45a6c4f2e06feea828c2cd8025c0
+checksum=e07b2b3511689e4aaf7404d289feba5d9d6e1170c448f85e393a11249502dd66
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*) hostmakedepends+=" nasm";;
+esac
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
 
-lrzip-devel_package() {
-	short_desc+=" - development files"
-	depends="liblrzip-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.a"
-		vmove "usr/lib/*.so"
-	}
-}
-liblrzip_package() {
-	short_desc+=" - runtime library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-	}
+# The library is deprecated as of lrzip 0.650.
+post_install() {
+	rm -f ${DESTDIR}/usr/include/Lrzip.h
+	rm -f ${DESTDIR}/usr/lib/pkgconfig/lrzip.pc
 }
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6a744198712d..c23125bb0cb4 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=65
+revision=66
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -211,6 +211,7 @@ replaces="
  libgksu<=2.0.12_5
  libglib-static<=2.58.3_5
  libgtkhtml<=4.10.0_1
+ liblrzip<=0.641_1
  libmagick6-devel<=6.9.12.12_2
  libmagick6-perl<=6.9.12.12_2
  libmagick6<=6.9.12.12_2
@@ -228,6 +229,7 @@ replaces="
  livewallpaper<=0.5.0_2
  llvm3.9<=3.9.1_5
  lprng<=3.8.C_1
+ lrzip-devel<=0.641_1
  ls++-git<=20140919_3
  luxmark<=3.1_9
  luxrays-devel<=3.1_18

From 132808d7291d906ed1793754744b0264320ad697 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 15 Mar 2022 20:13:45 +0100
Subject: [PATCH 0288/1686] sigil: update to 1.9.2.

---
 srcpkgs/sigil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template
index 47b8b14dd330..5e0adb74c86c 100644
--- a/srcpkgs/sigil/template
+++ b/srcpkgs/sigil/template
@@ -1,6 +1,6 @@
 # Template file for 'sigil'
 pkgname=sigil
-version=1.9.1
+version=1.9.2
 revision=1
 wrksrc="Sigil-${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/Sigil-Ebook/Sigil"
 changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=08a6c52a9043ecb5fa8314783191b81aa21346bd6b937a522ee417e7bb0dc773
+checksum=d1a16f33fe93cda88442c798e0c53f700fa8e2ef792dd78566392d7ad11d997f
 python_version=3
 
 if [ "$CROSS_BUILD" ]; then

From bba9814a529f1c14665772e31117ff497997786e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 9 Mar 2022 01:52:18 +0100
Subject: [PATCH 0289/1686] mercurial: update to 6.1.

---
 srcpkgs/mercurial/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template
index 778d60757cf6..26795f34512d 100644
--- a/srcpkgs/mercurial/template
+++ b/srcpkgs/mercurial/template
@@ -1,6 +1,6 @@
 # Template file for 'mercurial'
 pkgname=mercurial
-version=6.0.3
+version=6.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3 python3-setuptools python3-devel gettext"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.mercurial-scm.org/"
 distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz"
-checksum=67f13647a46517a2b567cdcb73c98721d75d36a0432debb15022b77f9c138333
+checksum=86f98645e4565a9256991dcde22b77b8e7d22ca6fbb60c1f4cdbd8469a38cc1f
 
 pre_check() {
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then

From 04b20c181dbf62514851fc159ca82d93f4ac898b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 15 Mar 2022 11:35:30 +0100
Subject: [PATCH 0290/1686] ansible-core: update to 2.12.3.

---
 srcpkgs/ansible-core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index fc3df299249c..80236532b369 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
-version=2.12.2
+version=2.12.3
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ 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-core/ansible-core-${version}.tar.gz"
-checksum=bc79e1723a5a92cbc105d581b25b66840d15bb5f4c98925c936ef5a71f92e7c3
+checksum=8a135a9f74c97cab67759293744ad34350f719523e8bd9bb9008df4cf953af20
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
 # Tests are currently broken for ansible on python 3.10

From b2690d66287963c2b02df963c7b970738b073349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 15 Mar 2022 11:35:33 +0100
Subject: [PATCH 0291/1686] ansible: update to 5.4.0.

---
 srcpkgs/ansible/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 70de17aec1f3..eb132fa68380 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=5.3.0
+version=5.4.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ 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=50020dab43f6c59debdeb57f45c90ec6db78d4fa574edc6d75bc52e05cbd3639
+checksum=2f0ecbd8a3232e520bf3e3bc23f40dda60b9ce7924ca194bd35f4de4027100fc
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660

From bcd3f13c0254b719726e0a9032796d85cc1adfe3 Mon Sep 17 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, 17 Mar 2022 22:57:58 +0700
Subject: [PATCH 0292/1686] python3-pkgconfig: depends on pkg-config

Close #35371
---
 srcpkgs/python3-pkgconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pkgconfig/template b/srcpkgs/python3-pkgconfig/template
index 8b015d19b57f..05d37a5d5ee1 100644
--- a/srcpkgs/python3-pkgconfig/template
+++ b/srcpkgs/python3-pkgconfig/template
@@ -1,11 +1,11 @@
 # Template file for 'python3-pkgconfig'
 pkgname=python3-pkgconfig
 version=1.5.1
-revision=5
+revision=6
 wrksrc="pkgconfig-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3"
+depends="python3 pkg-config"
 short_desc="Python3 module to interface with pkg-config"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From ae384f9468e13dde5852163e6551d0328504ddae Mon Sep 17 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, 17 Mar 2022 23:07:00 +0700
Subject: [PATCH 0293/1686] xob: fix crash

When building xob without any arguments, xob will be built with
SYSCONFDIR points to /usr/local/etc. Thus, crash at runtime.

Reported-by: Urs Schulz <voidpkgs@ursschulz.de>
Close #35009
---
 srcpkgs/xob/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template
index f2d1701f523e..dfac3851302c 100644
--- a/srcpkgs/xob/template
+++ b/srcpkgs/xob/template
@@ -1,9 +1,10 @@
 # Template file for 'xob'
 pkgname=xob
 version=0.3
-revision=1
+revision=2
 build_style=gnu-makefile
-make_install_args="prefix=/usr sysconfdir=/etc"
+make_build_args="prefix=/usr sysconfdir=/etc"
+make_install_args="$make_build_args"
 make_use_env=yes
 hostmakedepends="pkg-config"
 makedepends="libX11-devel libconfig-devel libXrender-devel"

From 4357e9542157d9c2d58ab5589edc71bd33c29293 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 6 Mar 2022 18:22:18 -0700
Subject: [PATCH 0294/1686] python3-identify: update to 2.4.11.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/python3-identify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-identify/template b/srcpkgs/python3-identify/template
index 6af581162d2f..65fd70ec42c6 100644
--- a/srcpkgs/python3-identify/template
+++ b/srcpkgs/python3-identify/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-identify'
 pkgname=python3-identify
-version=2.3.1
+version=2.4.11
 revision=1
 wrksrc="identify-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://github.com/chriskuehl/identify"
 distfiles="${PYPI_SITE}/i/identify/identify-${version}.tar.gz"
-checksum=8a92c56893e9a4ce951f09a50489986615e3eba7b4c60610e0b25f93ca4487ba
+checksum=2986942d3974c8f2e5019a190523b0b0e2a07cb8e89bf236727fb4b26f27f8fd
 
 post_install() {
 	vlicense LICENSE

From bb8f8e5458901758d9644adad7885cc3f46e7fbc Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 6 Mar 2022 18:22:53 -0700
Subject: [PATCH 0295/1686] pre-commit: update to 2.17.0.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/pre-commit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 855dff84d13f..3eecb71e1136 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
 # Template file for 'pre-commit'
 pkgname=pre-commit
-version=2.15.0
+version=2.17.0
 revision=1
 wrksrc="pre_commit-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://pre-commit.com/"
 distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=3c25add78dbdfb6a28a651780d5c311ac40dd17f160eb3954a0c59da40a505a7
+checksum=c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a
 make_check=no   # No tests available
 
 post_install() {

From 74620c9099d501a866a65b081b00d06b273a5c9e Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Wed, 16 Mar 2022 14:31:06 +0100
Subject: [PATCH 0296/1686] pyradio: update to 0.8.9.14

---
 srcpkgs/pyradio/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index a86b57d7bd61..1c2670682351 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,17 +1,17 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.8.9.9
-revision=2
+version=0.8.9.14
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-requests python3-dnspython"
+depends="python3-requests python3-dnspython python3-psutil"
 short_desc="Curses based internet radio player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://www.coderholic.com/pyradio/"
-changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/ChangeLog"
+changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=9114254088e294bf06399f892c08056d86172bd32c40869474347eb846a965f3
+checksum=76e06934926a1acfd7bba3735d8e0b387d7985dd38a398376877b6fd7da71940
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 1a7edfdf402b3c8969b7d9766d99db65693f2a01 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Sun, 27 Feb 2022 10:15:07 -0700
Subject: [PATCH 0297/1686] nyxt: remove runtime deps on *-devel

Signed-off-by: Joseph Benden <joe@benden.us>
Close: #35877
---
 srcpkgs/nyxt/patches/001-libfixposix.patch | 12 ++++++++++++
 srcpkgs/nyxt/patches/002-webkit2gtk.patch  | 14 ++++++++++++++
 srcpkgs/nyxt/template                      |  7 ++++---
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/nyxt/patches/001-libfixposix.patch
 create mode 100644 srcpkgs/nyxt/patches/002-webkit2gtk.patch

diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch
new file mode 100644
index 000000000000..23ef9da26442
--- /dev/null
+++ b/srcpkgs/nyxt/patches/001-libfixposix.patch
@@ -0,0 +1,12 @@
+--- a/_build/iolib/src/syscalls/ffi-functions-unix.lisp.orig	2022-02-27 09:44:00.327307802 -0700
++++ b/_build/iolib/src/syscalls/ffi-functions-unix.lisp	2022-02-27 09:48:30.875539336 -0700
+@@ -12,7 +12,8 @@
+ (eval-when (:compile-toplevel :load-toplevel :execute)
+   (define-foreign-library
+       (libfixposix :canary "lfp_buildinfo")
+-    (t (:default "libfixposix")))
++    (:unix "libfixposix.so.3")
++    (t (:default "libfixposix")))
+   (load-foreign-library 'libfixposix))
+ \f
+ 
diff --git a/srcpkgs/nyxt/patches/002-webkit2gtk.patch b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
new file mode 100644
index 000000000000..5a0fe2e923d3
--- /dev/null
+++ b/srcpkgs/nyxt/patches/002-webkit2gtk.patch
@@ -0,0 +1,14 @@
+--- a/_build/cl-webkit/webkit2/webkit2.init.lisp	2022-01-14 03:22:05.000000000 -0700
++++ b/_build/cl-webkit/webkit2/webkit2.init.lisp	2022-02-27 09:59:29.175938024 -0700
+@@ -18,9 +18,9 @@
+               "libwebkit2gtk-4.0.37.dylib"
+               "libwebkit2gtk-4.0.dylib"))
+     (:unix (:or "libwebkit2gtk-4.1.so"
+-                "libwebkit2gtk-4.0.so"
+                 ;; Fedora only has this one?
+-                "libwebkit2gtk-4.0.so.37")))
++                "libwebkit2gtk-4.0.so.37"
++                "libwebkit2gtk-4.0.so")))
+   (use-foreign-library libwebkit2))
+ 
+ (defcfun "webkit_get_major_version" :int)
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index 8332e1286d2c..a0da399fb2da 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,13 +1,13 @@
 # Template file for 'nyxt'
 pkgname=nyxt
 version=2.2.4
-revision=1
+revision=2
 create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target=all
 hostmakedepends="sbcl git"
-makedepends="webkit2gtk-devel libfixposix-devel libgirepository-devel"
-depends="dbus xclip enchant2 webkit2gtk-devel libfixposix-devel libgirepository-devel"
+makedepends="webkit2gtk libfixposix-devel libgirepository-devel"
+depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
 license="BSD-3-Clause"
@@ -19,6 +19,7 @@ make_check=no
 nostrip=yes
 nopie=yes
 nocross="Cross-compilation fails due to package iolib/syscalls setting incorrect compiler flags"
+shlib_requires="libwebkit2gtk-4.0.so.37 libfixposix.so.3 libgirepository-1.0.so.1"
 
 do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} install

From a438616b62f8240e426281cd66667a7eb0b11d48 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Fri, 18 Mar 2022 19:43:51 +0530
Subject: [PATCH 0298/1686] alacritty: update to 0.10.1

- fix cross-compiling
- fix distfiles URL
---
 srcpkgs/alacritty/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 9fb9ccfdb36d..94bf361be18d 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,6 +1,6 @@
 # Template file for 'alacritty'
 pkgname=alacritty
-version=0.10.0
+version=0.10.1
 revision=1
 build_wrksrc="${pkgname}"
 build_style=cargo
@@ -12,9 +12,13 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="Apache-2.0"
 homepage="https://github.com/alacritty/alacritty"
 changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=5dee9c94f944b742b0189dd87c43c87175ffadde8049abb4668ca5a3e68fd65a
-nocross="IndexMap/autocfg/rust issues - #34889"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=e48d4b10762c2707bb17fd8f89bd98f0dcccc450d223cade706fdd9cfaefb308
+
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From d60922057c517fed3eaa6f87dd36155931da2f50 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 18 Mar 2022 20:16:43 +0100
Subject: [PATCH 0299/1686] scite: update to 5.2.1.

---
 srcpkgs/scite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 02f66bdc7b1f..4943d99f3fcf 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.2.0
+version=5.2.1
 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=a63e0f340bf90df8c1ec9abe8d9c5db0a3aee5663c8b325117155456364f52ff
+checksum=0e7a1daca03d9eea20b2857b722ffd57788799235803bb7b84694af5a1707e07
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile

From 34c390511160d7be38472b2eebb3d44feedf3156 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Mar 2022 16:48:30 +0100
Subject: [PATCH 0300/1686] lrzip: update to 0.651.

---
 srcpkgs/lrzip/template | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template
index 1b492e9e6c6c..afc7475bf96d 100644
--- a/srcpkgs/lrzip/template
+++ b/srcpkgs/lrzip/template
@@ -1,6 +1,6 @@
 # Template file for 'lrzip'
 pkgname=lrzip
-version=0.650
+version=0.651
 revision=1
 build_style="gnu-configure"
 hostmakedepends="perl automake libtool"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://lrzip.kolivas.org/"
 distfiles="https://github.com/ckolivas/lrzip/archive/v${version}.tar.gz"
-checksum=e07b2b3511689e4aaf7404d289feba5d9d6e1170c448f85e393a11249502dd66
+checksum=f4c84de778a059123040681fd47c17565fcc4fec0ccc68fcf32d97fad16cd892
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) hostmakedepends+=" nasm";;
@@ -19,9 +19,3 @@ esac
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }
-
-# The library is deprecated as of lrzip 0.650.
-post_install() {
-	rm -f ${DESTDIR}/usr/include/Lrzip.h
-	rm -f ${DESTDIR}/usr/lib/pkgconfig/lrzip.pc
-}

From 72ea28aadcfeac0292c7acb1ea507c9233782fb0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 18 Mar 2022 20:13:07 +0100
Subject: [PATCH 0301/1686] perl: update to 5.34.1.

---
 srcpkgs/perl/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template
index da223660988a..54ce2298d139 100644
--- a/srcpkgs/perl/template
+++ b/srcpkgs/perl/template
@@ -1,8 +1,8 @@
 # Template file for 'perl'
 pkgname=perl
-version=5.34.0
+version=5.34.1
 revision=1
-_perl_cross_version=1.3.6
+_perl_cross_version=1.3.7
 build_style=gnu-configure
 hostmakedepends="less"
 makedepends="zlib-devel bzip2-devel gdbm-devel db-devel"
@@ -14,8 +14,8 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://www.perl.org"
 distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz
  https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz"
-checksum="551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a
- 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5"
+checksum="357951a491b0ba1ce3611263922feec78ccd581dddc24a446b033e25acf242a1
+ 77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335"
 
 # Before updating this package to a new major version, run ${FILESDIR}/provides.pl
 # against ${wrksrc} to find the list of built in packages.
@@ -39,7 +39,7 @@ provides="perl-Archive-Tar-2.38_1
  perl-Digest-MD5-2.58_1
  perl-Digest-SHA-6.02_1
  perl-Dumpvalue-1.21_1
- perl-Encode-3.08_1
+ perl-Encode-3.08.01_1
  perl-Env-1.05_1
  perl-Exporter-5.76_1
  perl-ExtUtils-CBuilder-0.280236_1
@@ -74,7 +74,7 @@ provides="perl-Archive-Tar-2.38_1
  perl-Math-BigRat-0.2614_1
  perl-Math-Complex-1.59.02_1
  perl-Memoize-1.03.01_1
- perl-Module-CoreList-5.20210520_1
+ perl-Module-CoreList-5.20220313_1
  perl-Module-Load-0.36_1
  perl-Module-Load-Conditional-0.74_1
  perl-Module-Loaded-0.08_1

From 5d47f1ee20bed6e85e20a8d3889cded5371b4b2c Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 08:24:09 +0100
Subject: [PATCH 0302/1686] cfitsio: update to 4.1.0.

---
 srcpkgs/cfitsio/template  |  6 +++---
 srcpkgs/cfitsio/templateo | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cfitsio/templateo

diff --git a/srcpkgs/cfitsio/template b/srcpkgs/cfitsio/template
index 55ff7d14e61d..4ce6d6d138bc 100644
--- a/srcpkgs/cfitsio/template
+++ b/srcpkgs/cfitsio/template
@@ -1,7 +1,7 @@
 # Template file for 'cfitsio'
 pkgname=cfitsio
-version=4.0.0
-revision=2
+version=4.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-reentrant"
 makedepends="libcurl-devel"
@@ -10,7 +10,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="custom:NASA license"
 homepage="https://heasarc.gsfc.nasa.gov/fitsio/"
 distfiles="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${pkgname}-${version}.tar.gz"
-checksum=b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e
+checksum=b367c695d2831958e7166921c3b356d5dfa51b1ecee505b97416ba39d1b6c17a
 
 post_install() {
 	vlicense License.txt
diff --git a/srcpkgs/cfitsio/templateo b/srcpkgs/cfitsio/templateo
new file mode 100644
index 000000000000..2df3d6385012
--- /dev/null
+++ b/srcpkgs/cfitsio/templateo
@@ -0,0 +1,27 @@
+# Template file for 'cfitsio'
+pkgname=cfitsio
+version=4.1.0
+revision=1
+build_style=gnu-configure
+configure_args="--enable-reentrant"
+makedepends="libcurl-devel"
+short_desc="Library for reading and writing data files in FITS data format"
+maintainer="Helmut Pozimski <helmut@pozimski.eu>"
+license="custom:NASA license"
+homepage="https://heasarc.gsfc.nasa.gov/fitsio/"
+distfiles="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${pkgname}-${version}.tar.gz"
+checksum=b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e
+
+post_install() {
+	vlicense License.txt
+}
+
+cfitsio-devel_package() {
+	depends="cfitsio-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From ce4b054f4ce097c185ccb2170af97816d736ea76 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 08:28:30 +0100
Subject: [PATCH 0303/1686] obconf-qt: update to 0.16.2.

---
 srcpkgs/obconf-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/obconf-qt/template b/srcpkgs/obconf-qt/template
index 40f4e2f54866..793399f3e499 100644
--- a/srcpkgs/obconf-qt/template
+++ b/srcpkgs/obconf-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'obconf-qt'
 pkgname=obconf-qt
-version=0.16.1
+version=0.16.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -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=458d96b63dca8a09a4f477d42030d829e8090aae0ea39b3994fcf0b8da8e8b42
+checksum=7328da1606b289280e2ce0f2279ab30d06f584e4c2d6fc5f01c0f3d9ce714960

From 8f6b15141f02657f0eebd0f526aff6aee2b04946 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 09:14:49 +0100
Subject: [PATCH 0304/1686] vlc: update to 3.0.17.3.

---
 srcpkgs/vlc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 309477a2f775..318e7ac12ce1 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.17
+version=3.0.17.3
 revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
@@ -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=48bd9bf337aa107a1524eba57c52dc4a91e29f5a97fbdee92f6a4dba90383cd0
+checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014
 
 lib32disabled=yes
 

From 71035bf2d614da6bcf8b37b77d3972cf1abecf27 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 09:18:01 +0100
Subject: [PATCH 0305/1686] linux5.4: update to 5.4.185.

---
 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 983e18bdc0ba..771796079797 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.184
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=8694ca39e6c665cac5a78c7f80acef83ad9b5b13f9688e94bfe39b3c71541489
+checksum=d15fe9da679bfb624f35f127a17559f6d037ad37a313cf5fd22ce155401f3787
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 71a4cb4f76d7b191788461fcb888dc497fb82142 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 19 Mar 2022 09:20:12 +0100
Subject: [PATCH 0306/1686] linux4.19: update to 4.19.235.

---
 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 64351dd2d235..840a4516d83e 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.234
+version=4.19.235
 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=0082966be4a476c42ed59996e072e7e9fa5282b742efe4ffabadd6cd91212d8b
+checksum=530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 681c1e8c2470f23f3d88c80d1c9dccf38e3fc648 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 18 Mar 2022 20:56:11 -0500
Subject: [PATCH 0307/1686] gns3-server: loosen requirements for new
 python3-distro package

---
 srcpkgs/gns3-server/patches/requirements.patch | 3 ++-
 srcpkgs/gns3-server/template                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch
index 4cfa85b16ba2..27cd2441e53c 100644
--- a/srcpkgs/gns3-server/patches/requirements.patch
+++ b/srcpkgs/gns3-server/patches/requirements.patch
@@ -14,7 +14,8 @@ diff --git a/requirements.txt b/requirements.txt
 -psutil==5.9.0
 +psutil>=5.9.0
  async-timeout==3.0.1
- distro==1.6.0
+-distro==1.6.0
++distro>=1.6.0
  py-cpuinfo==8.0.0
 -setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
 +setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template
index 038457a27a3b..c45f0a8f8b82 100644
--- a/srcpkgs/gns3-server/template
+++ b/srcpkgs/gns3-server/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-server'
 pkgname=gns3-server
 version=2.2.31
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl

From 05402b59827205aec4d82eded8decee56c387f20 Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Fri, 18 Mar 2022 20:57:06 -0500
Subject: [PATCH 0308/1686] gns3-gui: loosen requirements for new
 python3-distro package

---
 srcpkgs/gns3-gui/patches/requirements.patch | 3 ++-
 srcpkgs/gns3-gui/template                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch
index ab3d55dea830..6cf6d68d94cc 100644
--- a/srcpkgs/gns3-gui/patches/requirements.patch
+++ b/srcpkgs/gns3-gui/patches/requirements.patch
@@ -7,7 +7,8 @@ diff --git a/requirements.txt b/requirements.txt
 -sentry-sdk==1.5.4
 -psutil==5.9.0
 +psutil>=5.9.0
- distro==1.6.0
+-distro==1.6.0
++distro>=1.6.0
 -setuptools==60.6.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
 +setuptools>=60.5.0; python_version >= '3.7'  # don't upgrade because of https://github.com/pypa/setuptools/issues/3084
  setuptools==59.6.0; python_version < '3.7'  # v59.7.0 dropped support for Python 3.6
diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template
index 175eab41080c..348325010d73 100644
--- a/srcpkgs/gns3-gui/template
+++ b/srcpkgs/gns3-gui/template
@@ -1,7 +1,7 @@
 # Template file for 'gns3-gui'
 pkgname=gns3-gui
 version=2.2.31
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-setuptools python3-psutil python3-jsonschema

From a5a73fc2e1338ebc13aba2823348cb63eab9a285 Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Fri, 4 Mar 2022 19:16:42 -0500
Subject: [PATCH 0309/1686] New package: tea-0.8.0

---
 srcpkgs/tea/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/tea/template

diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template
new file mode 100644
index 000000000000..5b01c790341f
--- /dev/null
+++ b/srcpkgs/tea/template
@@ -0,0 +1,19 @@
+# Template file for 'tea'
+pkgname=tea
+version=0.8.0
+revision=1
+wrksrc=$pkgname
+build_style=go
+go_import_path=code.gitea.io/tea
+depends="git"
+short_desc="Command line tool to interact with Gitea"
+maintainer="chili-b <dexter.gaonshatford@gmail.com>"
+license="MIT"
+homepage="https://gitea.com/gitea/tea"
+changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md"
+distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz"
+checksum=6c73c0a7b66cdfd1e5a302257d54df06a3a41eb9bdbfeb547966db431ae23b23
+
+post_install() {
+	vlicense LICENSE
+}

From 79a13c090ea82434f3cfb9c63085ae4075079498 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 16:14:15 +0100
Subject: [PATCH 0310/1686] linux5.15: update to 5.15.30.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index d314a6f8a251..9b43d8ebf3e3 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.28
+version=5.15.30
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 1019709aa85b87904e901aca141f8ade27b3719333be8a3e9d3b2cb0e05ad345"
+ 18059d8e3f01ab38b22ddf4c2e0a0a9db50926f6535649f51ee7a86a8542aff1"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 2049d765c3d4e36c0c0b69a0195fd9bcebd443a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 16:18:09 +0100
Subject: [PATCH 0311/1686] linux5.10: update to 5.10.107.

---
 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 305d9822a51c..a3ccac15e158 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.105
+version=5.10.107
 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=3ddc0e0ab2b9cadb64df43141e0a1e5432b5963ed50f34d586c065ac8d4fcb85
+checksum=c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From e8e3c62c953f29b8fe2f7ac8e12ed436bd2ae949 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 16:22:26 +0100
Subject: [PATCH 0312/1686] linux5.16: update to 5.16.16.

---
 srcpkgs/linux5.16/files/arm64-dotconfig | 5 +++--
 srcpkgs/linux5.16/template              | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig
index d928e0d07a04..23f03c1e5630 100644
--- a/srcpkgs/linux5.16/files/arm64-dotconfig
+++ b/srcpkgs/linux5.16/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.16.11 Kernel Configuration
+# Linux/arm64 5.16.16 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -376,6 +376,7 @@ CONFIG_ARM64_ERRATUM_1542419=y
 CONFIG_ARM64_ERRATUM_1508412=y
 CONFIG_ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE=y
 CONFIG_ARM64_ERRATUM_2051678=y
+CONFIG_ARM64_ERRATUM_2077057=y
 CONFIG_ARM64_ERRATUM_2119858=y
 CONFIG_ARM64_ERRATUM_2139208=y
 CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y
@@ -429,7 +430,6 @@ CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -439,6 +439,7 @@ CONFIG_TRANS_TABLE=y
 # CONFIG_XEN is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_UNMAP_KERNEL_AT_EL0=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template
index a4d787e19716..5775997c8c58 100644
--- a/srcpkgs/linux5.16/template
+++ b/srcpkgs/linux5.16/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.16'
 pkgname=linux5.16
-version=5.16.11
+version=5.16.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="027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb
- ef7b5e4f1b043a58fcece6e3f5d9e5425db7fb2a1abddc64c5094b93931bab37"
+ 9e7af5007d3596c1efee8556aaa1b1a2e40ddded107448b583624a1f305376db"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 519e06c2765f9eba1ade3a4d30aef745eefe9ec2 Mon Sep 17 00:00:00 2001
From: Eduard Ganiukov <ed+git@gnkv.io>
Date: Sat, 19 Feb 2022 23:05:21 +0100
Subject: [PATCH 0313/1686] himalaya: update to 0.5.9

---
 srcpkgs/himalaya/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/himalaya/template b/srcpkgs/himalaya/template
index 5ad5316f8c08..6869ca90cc20 100644
--- a/srcpkgs/himalaya/template
+++ b/srcpkgs/himalaya/template
@@ -1,8 +1,9 @@
 # Template file for 'himalaya'
 pkgname=himalaya
-version=0.5.1
+version=0.5.9
 revision=1
 build_style=cargo
+make_check_args="--lib"
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
 short_desc="CLI email client"
@@ -11,7 +12,12 @@ license="BSD-3-Clause"
 homepage="https://github.com/soywod/himalaya"
 changelog="https://raw.githubusercontent.com/soywod/himalaya/master/CHANGELOG.md"
 distfiles="https://github.com/soywod/himalaya/archive/v${version}.tar.gz"
-checksum=13567726903243f04a4aa64e96b88e0d0fd5c3ccbe4953357f3a8ef1c569dad9
+checksum=70da5d75354e47b47315938b9cbeca2ec167b8e6bd8ce133eff68ef1638d8c59
+
+post_patch() {
+	# fixes an indexmap error when cross compiling
+	cargo update --package autocfg --precise 1.1.0
+}
 
 post_install() {
 	vlicense LICENSE

From 83b97abff5ee84f36ef353ba81e9ea9eb2e26451 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 19 Mar 2022 17:29:07 +0100
Subject: [PATCH 0314/1686] babashka: update to 0.7.8.

---
 srcpkgs/babashka/template | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 64fd2b0b1cfe..5a2292af27bf 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.7.6
+version=0.7.8
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -10,14 +10,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
 changelog="https://github.com/babashka/babashka/blob/master/CHANGELOG.md"
-_sci_commit=582aa8fa0bac2251e9d4acb93d042bf9d99282c7
+_sci_commit=4eb8e99e18942ba9c3b7ec3c4707d8237f970035
 _babashka_curl_commit=3d3d117ea0f8a143a06e3cace92e4e8b6a5782df
-_babashka_nrepl_commit=e8e2273a8de6e8c45371e8ee8d5fa49e5d7dea02
+_babashka_nrepl_commit=d3fce67198b042707f01d841c032f841cc57ab7f
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=2343393d3266026097a61b8fced6f1b1beaefad0
+_process_commit=5db9560eab698f9773537acb0167f38d6fd0d322
 _pods_commit=538fc6f4147badf3a457b3eb8f9f95dd3bc947b1
-_deps_clj_commit=e6fb7918b5898549084fc82d006ed8857bf49ccd
-_fs_commit=ec037054668d3fd31d858de97ce125462d357da6
+_deps_clj_commit=6636890388cdf779708806a93110b165577cd226
+_fs_commit=2bf527f797d69b3f14247940958e0d7b509f3ce2
 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
@@ -29,15 +29,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
  https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="97e61e9138cf614cf1e2d92083a4504eb97fccc0bacfba4853f1417230d6b679
- e39d038aa0ff3f058a41a962fae6cc1e87192cfa26b27c218fe2333245692e41
+checksum="23a08adcc9237be9f24c1781cb646514434dbcb651aac00c3eedca763ca25086
+ 0766f0a8be23e94efefbfc16c5987f1dab4520da3294f1bccef402f97898c490
  45abdaa5e4effd3bcfea777d02844d4634f1f80a592843eca9ec7d3544b7e16d
- bc6a65c9bad2ced362636fca54ee5105e12706bd7c4412edd64c0bb18af15b3e
+ b56a06bf113bcd85084d48f595541447014308860d9c45efcde5b02e859c934c
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- 99ffaf99eccccb78001f2fd85527d41461f645d65f4cd839295fcba07f85eb8b
+ b6671246a1f0742bd4ae4d1f7b0afe4101d6c8907060455e0473c2ef966e370c
  7fea6762ecbb31d454e0b5c194d12e1e6d4ec301972aa33daf617b571e097678
- 2f1824c0a525481489ecfa0f2fa4c9e6b5a0e4e00676d0dcecfc7107ceebe979
- 9c98895e85e2566d0db7f5f85815a83e0839525bb7599e6a22778dbdd1ce2a3b
+ fee3f84f935d141cf7343d7bab19c3eef56fdb2f3dac4a950db71c9b083e0d17
+ e5b92a25221b735941861968a5570a4169da1aee7f2a7545975afe930cb8574f
  bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"

From de9cec7ab7bb1e16a2000332da7081cdce896e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
Date: Sat, 19 Mar 2022 21:15:33 +0100
Subject: [PATCH 0315/1686] tailscale: bump to 1.22.2

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 4684014fffd7..27a3611b7296 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.22.0
+version=1.22.2
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -13,7 +13,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=79c240a3d623a304c908a8b4035f1f775014e9dff6ae076c06279c2829a7d746
+checksum=3e7b5b8073a7b94d84ff6677a9f110070b808c8d35c5b7da0c6e6fe639444e58
 
 post_install() {
 	vlicense LICENSE

From a5ece0c4ba9e10d0195791bb579c543ab1e4d042 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:17:39 -0500
Subject: [PATCH 0316/1686] nomad: update to 1.2.6.

---
 srcpkgs/nomad/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 0e6f169d0118..8707ada37bf9 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -1,11 +1,11 @@
 # Template file for 'nomad'
 pkgname=nomad
-version=1.2.3
-revision=2
+version=1.2.6
+revision=1
 build_style=go
 go_import_path="github.com/hashicorp/nomad"
 go_build_tags="ui release"
-_git_commit=55e5c49b99a6fd2bf925e7fd98d95829776c331f
+_git_commit=95514d569610f15ce49b4a7a1a6bfd3e7b3e7b4f
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 short_desc="Cluster scheduler designed to easily integrate into existing workflows"
@@ -13,7 +13,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.nomadproject.io/"
 distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
-checksum=36e074f34091043a2b5d115496f371fb9df048134f402bb5943e17bcb2f911ff
+checksum=c69ec89ae5f76704d4b3ecb842b130f3d90e579bfd31191721b5f2da99f95a93
 
 post_install() {
 	vlicense LICENSE

From 84006692b426c20f0588a1c33a6a01b7789c7753 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:20:47 -0500
Subject: [PATCH 0317/1686] consul: update to 1.11.4.

---
 srcpkgs/consul/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index e7a39388514f..fc0e80502879 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,10 +1,10 @@
 # Template file for 'consul'
 pkgname=consul
-version=1.11.1
+version=1.11.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul"
-_git_commit=2c56447e427c0dd4bdbcabe6cc39bd0802aaf897
+_git_commit=944e8ce64201ab2bbe923b207883d08a4dcff73a
 go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
 # consul has a vendor directory, but relies on replace statements in go.mod, so
 # force default non-vendor behavior.
@@ -15,7 +15,7 @@ maintainer="iaroki <iaroki@protonmail.com>"
 license="MPL-2.0"
 homepage="https://www.consul.io/"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=e548902d6a9c92bcc07fc1af33049078fb34a371e9853be6b0d6a69cf2a2c208
+checksum=253200fbf79aefee632c5cde9f90e6df6eddcb2766f2909b0d347c4438065126
 
 post_install() {
 	vlicense LICENSE

From d350911ed5a02598b05c8995cffd839664d44c51 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:27:30 -0500
Subject: [PATCH 0318/1686] vault: update to 1.9.4.

---
 srcpkgs/vault/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 1ba3566e77c7..4746d4974195 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,11 +1,11 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.9.2
+version=1.9.4
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
 go_build_tags="release"
-_git_commit=aca76f63357041a43b49f3e8c11d67358496959f
+_git_commit=fcbe948b2542a13ee8036ad07dd8ebf8554f56cb
 go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
 hostmakedepends="git"
 depends="libcap-progs"
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=84a2506d8d0e0757a3229012328904b5e1e13c39c7766d431ffa9c32bce51fae
+checksum=7ebae46e12ff353c3a9e861c4991410679a3c890d36c7c6fb17b43e9ea6f6115
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0750 root _vault"

From fd3b90494ae173718bacd76e4d03d9746f5a46af Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 19 Mar 2022 19:37:39 -0500
Subject: [PATCH 0319/1686] terraform: update to 1.1.7.

---
 srcpkgs/terraform/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index 4f03771b4775..14fb8b368a9a 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=1.1.6
+version=1.1.7
 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=4dd037773928b93ba98c7885c9f2f500db96c407555459a744f8316ab9b16d34
+checksum=7651b69a2196de4393195cef4a03171c83aa50581f1019bca3f17cf05db5335b

From d7bbe882842fcb71e809466b2a9be812c5b25dfb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 00:09:37 +0100
Subject: [PATCH 0320/1686] zimg: update to 3.0.3.

---
 srcpkgs/zimg/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zimg/template b/srcpkgs/zimg/template
index a0b0ff763198..3f2f7291d0aa 100644
--- a/srcpkgs/zimg/template
+++ b/srcpkgs/zimg/template
@@ -1,6 +1,6 @@
 # Template file for 'zimg'
 pkgname=zimg
-version=2.9.3
+version=3.0.3
 revision=1
 wrksrc=zimg-release-${version}
 build_style=gnu-configure
@@ -9,8 +9,13 @@ short_desc="Image processing library"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="WTFPL"
 homepage="https://github.com/sekrit-twc/zimg"
+changelog="https://raw.githubusercontent.com/sekrit-twc/zimg/master/ChangeLog"
 distfiles="https://github.com/sekrit-twc/zimg/archive/release-${version}.tar.gz"
-checksum=a15c0483fbe945ffe695a1a989bc43b3381c8bf33e2d1760464ec21d32cdf30b
+checksum=5e002992bfe8b9d2867fdc9266dc84faca46f0bfd931acc2ae0124972b6170a7
+
+case "$XBPS_TARGET_MACHINE" in
+	armv7*) configure_args+=" --disable-simd";;
+esac
 
 pre_configure() {
 	./autogen.sh

From b1b08640247a39806f45ff0469845048cd3da047 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 00:09:41 +0100
Subject: [PATCH 0321/1686] vapoursynth: update to R57.

---
 srcpkgs/vapoursynth/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template
index c4de1d5712a0..63a2043fe522 100644
--- a/srcpkgs/vapoursynth/template
+++ b/srcpkgs/vapoursynth/template
@@ -1,21 +1,22 @@
 # Template file for 'vapoursynth'
 pkgname=vapoursynth
-version=R52
-revision=4
+version=R57
+revision=1
 build_style=gnu-configure
-# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1;
-# until this is fixed upstream, manually define am_cv_python_version to circumvent
-configure_args="am_cv_python_version=${py3_ver}"
 hostmakedepends="automake libtool nasm pkg-config python3-Cython"
-makedepends="ffmpeg-devel python3-devel zimg-devel libass-devel libmagick-devel
- libxml2-devel"
+makedepends="python3-devel zimg-devel"
 short_desc="Application for video manipulation"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="LGPL-2.1-or-later, OFL-1.1"
 homepage="http://www.vapoursynth.com"
 changelog="https://raw.githubusercontent.com/vapoursynth/vapoursynth/master/ChangeLog"
 distfiles="https://github.com/vapoursynth/vapoursynth/archive/${version}.tar.gz"
-checksum=4d5dc7950f4357da695d29708bc98013bc3e0bd72fc5d697f8c91ce3c4a4b2ac
+checksum=9bed2ab1823050cfcbdbb1a57414e39507fd6c73f07ee4b5986fcbf0f6cb2d07
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	LDFLAGS="-latomic"
+fi
 
 pre_configure() {
 	./autogen.sh

From 9aacdeba579c0510fb14b85527126a89092396eb Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:54:08 +0100
Subject: [PATCH 0322/1686] common/environment/setup/misc.sh: add
 ${VIDEOLAN_SITE}

---
 common/environment/setup/misc.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index d22a7388d689..177b1e5622a2 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -17,5 +17,6 @@ MOZILLA_SITE="https://ftp.mozilla.org/pub"
 GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
+VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
 
 set +a

From b594110ae27b32d40079e8c53fe92c46cebf09b9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:53:17 +0100
Subject: [PATCH 0323/1686] Manual.md: document ${VIDEOLAN_SITE}

---
 Manual.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Manual.md b/Manual.md
index 40b2321f7a25..af5f698debae 100644
--- a/Manual.md
+++ b/Manual.md
@@ -529,6 +529,7 @@ Example:
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
   | XORG_SITE        | https://www.x.org/releases/individual            |
   | KDE_SITE         | https://download.kde.org/stable                 |
+  | VIDEOLAN_SITE    | https://download.videolan.org/pub/videolan      |
 
 - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be
 separated by blanks. Please note that the order must be the same than

From b569e3111a00d1d219c609a2410e4ae3d0d3dd0d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:42:29 +0100
Subject: [PATCH 0324/1686] vlc: use ${VIDEOLAN_SITE}

---
 srcpkgs/vlc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 318e7ac12ce1..14a00043a651 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -16,7 +16,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 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"
+distfiles="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz"
 checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014
 
 lib32disabled=yes

From 2d5a016b45a237e2d40b900d0305c4e65dc9f613 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:42:38 +0100
Subject: [PATCH 0325/1686] x264: use ${VIDEOLAN_SITE}

---
 srcpkgs/x264/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template
index 1ed803645ba6..a33dede30ccb 100644
--- a/srcpkgs/x264/template
+++ b/srcpkgs/x264/template
@@ -10,7 +10,7 @@ short_desc="Free library for encoding H264/AVC video streams"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.videolan.org/developers/x264.html"
-distfiles="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${version//./-}-stable.tar.bz2"
+distfiles="${VIDEOLAN_SITE}/x264/snapshots/x264-snapshot-${version//./-}-stable.tar.bz2"
 checksum=b2495c8f2930167d470994b1ce02b0f4bfb24b3317ba36ba7f112e9809264160
 
 pre_configure() {

From e95da374d84dd62e57de328867be02a8eba7bb31 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:42:51 +0100
Subject: [PATCH 0326/1686] libdvdnav: use ${VIDEOLAN_SITE}

---
 srcpkgs/libdvdnav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libdvdnav/template b/srcpkgs/libdvdnav/template
index 5a7a859c4c0b..9ff884a90b37 100644
--- a/srcpkgs/libdvdnav/template
+++ b/srcpkgs/libdvdnav/template
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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"
+distfiles="${VIDEOLAN_SITE}/libdvdnav/${version}/libdvdnav-${version}.tar.bz2"
 checksum=c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48
 
 libdvdnav-devel_package() {

From 9ac51da482c0efad15671dcb4e9adcb7130d0960 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:04 +0100
Subject: [PATCH 0327/1686] libdvdcss: use ${VIDEOLAN_SITE}

---
 srcpkgs/libdvdcss/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libdvdcss/template b/srcpkgs/libdvdcss/template
index ca9d26cd31cd..c77443b8e055 100644
--- a/srcpkgs/libdvdcss/template
+++ b/srcpkgs/libdvdcss/template
@@ -7,7 +7,7 @@ short_desc="Simple library designed for accessing DVDs"
 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"
+distfiles="${VIDEOLAN_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
 checksum=233cc92f5dc01c5d3a96f5b3582be7d5cee5a35a52d3a08158745d3d86070079
 
 libdvdcss-devel_package() {

From 9b69fa15bdbce1b624dda6c7bda15f23ea6a97bf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:17 +0100
Subject: [PATCH 0328/1686] libdvbpsi: use ${VIDEOLAN_SITE}

---
 srcpkgs/libdvbpsi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libdvbpsi/template b/srcpkgs/libdvbpsi/template
index c8aa475b2de5..5aac623a13ae 100644
--- a/srcpkgs/libdvbpsi/template
+++ b/srcpkgs/libdvbpsi/template
@@ -7,7 +7,7 @@ short_desc="PSI decoder and generator library for MPEG2 and DVB streams"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://www.videolan.org/developers/libdvbpsi.html"
-distfiles="https://download.videolan.org/pub/libdvbpsi/${version}/${pkgname}-${version}.tar.bz2"
+distfiles="${VIDEOLAN_SITE}/libdvbpsi/${version}/${pkgname}-${version}.tar.bz2"
 checksum=02b5998bcf289cdfbd8757bedd5987e681309b0a25b3ffe6cebae599f7a00112
 
 libdvbpsi-devel_package() {

From 7ac272cf9351446e912a61b91fad0e7f22e0f169 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:28 +0100
Subject: [PATCH 0329/1686] libdca: use ${VIDEOLAN_SITE}

---
 srcpkgs/libdca/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libdca/template b/srcpkgs/libdca/template
index a9007df8387c..a144e80ad73b 100644
--- a/srcpkgs/libdca/template
+++ b/srcpkgs/libdca/template
@@ -8,7 +8,7 @@ short_desc="DTS Coherent Acoustics decoder"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.videolan.org/developers/libdca.html"
-distfiles="https://download.videolan.org/pub/videolan/libdca/${version}/libdca-${version}.tar.bz2"
+distfiles="${VIDEOLAN_SITE}/libdca/${version}/libdca-${version}.tar.bz2"
 checksum=3a0b13815f582c661d2388ffcabc2f1ea82f471783c400f765f2ec6c81065f6a
 
 pre_configure() {

From 50b58cb6b43e054adc078baa1a4db85deb7b8e3e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 13:43:39 +0100
Subject: [PATCH 0330/1686] libbluray: use ${VIDEOLAN_SITE}

---
 srcpkgs/libbluray/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libbluray/template b/srcpkgs/libbluray/template
index b81a8ee351de..070c351ee279 100644
--- a/srcpkgs/libbluray/template
+++ b/srcpkgs/libbluray/template
@@ -10,7 +10,7 @@ short_desc="Library to access Blu-Ray disks for video playback"
 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"
+distfiles="${VIDEOLAN_SITE}/libbluray/${version}/libbluray-${version}.tar.bz2"
 checksum=e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9
 
 pre_build() {

From fc14f4d7111ec6650435196c34cef16c811b97f3 Mon Sep 17 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, 4 Mar 2022 10:17:47 +0700
Subject: [PATCH 0331/1686] dnsmasq: configurable services

Close: #35826
---
 srcpkgs/dnsmasq/files/dnsmasq/run | 3 ++-
 srcpkgs/dnsmasq/template          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dnsmasq/files/dnsmasq/run b/srcpkgs/dnsmasq/files/dnsmasq/run
index 2b740a49d8f5..f3504f9e6ece 100644
--- a/srcpkgs/dnsmasq/files/dnsmasq/run
+++ b/srcpkgs/dnsmasq/files/dnsmasq/run
@@ -1,3 +1,4 @@
 #!/bin/sh
 mkdir -p /var/lib/misc
-exec dnsmasq -k --enable-dbus -u dnsmasq -g dnsmasq 2>&1
+[ -r ./conf ] && . ./conf
+exec dnsmasq -k ${OPTS:---enable-dbus -u dnsmasq -g dnsmasq} 2>&1
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index 731594e8a9de..b59608c47912 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,7 +1,7 @@
 # Template file for 'dnsmasq'
 pkgname=dnsmasq
 version=2.86
-revision=1
+revision=2
 conf_files="/etc/dnsmasq.conf"
 hostmakedepends="pkg-config"
 makedepends="dbus-devel libcap-devel libidn2-devel $(vopt_if dnssec nettle-devel)"

From 91ca6488d54592bd616f49091c9818122c661c51 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 20 Mar 2022 19:45:01 +0100
Subject: [PATCH 0332/1686] ugrep: update to 3.7.6.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 16301971cb5f..8af468ccc9bc 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.5
+version=3.7.6
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=2b237330ef92017d69ed6611b9dfb91b447d4679b9fb3704514bfd5b89a1a44d
+checksum=8288af9eb9f5a5638134911e9e81c8b37d02f29223d473dd96a2046c228cd5d4
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From c80c7e0a593e1d05e610781056c54a0742f56fef Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 19 Mar 2022 16:00:40 -0400
Subject: [PATCH 0333/1686] octoxbps: fix detection of Void Linux

Without this change, OctoXBPS fails to detect that it is running on Void
Linux which causes a password prompt to be shown every time OctoXBPS is
opened.
---
 ...tion-of-Void-Linux-in-getLinuxDistro.patch | 42 +++++++++++++++++++
 srcpkgs/octoxbps/template                     |  2 +-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch

diff --git a/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch b/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
new file mode 100644
index 000000000000..9941fc6da8c2
--- /dev/null
+++ b/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch
@@ -0,0 +1,42 @@
+From 41e0ba546e85f812d89899a3034d67256ec5f23c Mon Sep 17 00:00:00 2001
+From: chili-b <dexter.gaonshatford@gmail.com>
+Date: Sat, 19 Mar 2022 15:33:41 -0400
+Subject: [PATCH] Fix detection of Void Linux in getLinuxDistro
+
+Before this change, OctoXBPS detects Void Linux based on whether or not
+the string, `PRETTY_NAME="void"`, occurs in the file, `/etc/os-release`.
+As of March 15 2022, the contents of `/etc/os-release` have been changed
+and `PRETTY_NAME="Void Linux"` replaces the previous value.
+(see https://github.com/void-linux/void-packages/commit/1dfc401d1237120e8e936627e7e28d2441916e80)
+
+With this change, Void Linux is detected based on the value of `ID` in
+`/etc/os-release` which is less subject to change.
+
+This change is important because OctoXBPS only checks for the existence
+of the local package db if it detects that it is running on either Void
+Linux or Trident Linux. If OctoXBPS does not detect that it is running
+on either distribution (which it doesn't without this change), it will
+prompt for elevated privileges in order to synchronize the local package
+database with the remote database using `xbps-install -Syy` every time
+it is started, regardless of whether or not there are remote changes
+that need to be synced.
+---
+ src/unixcommand.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/unixcommand.cpp b/src/unixcommand.cpp
+index 8a88a2f..1762c4b 100644
+--- a/src/unixcommand.cpp
++++ b/src/unixcommand.cpp
+@@ -709,7 +709,7 @@ LinuxDistro UnixCommand::getLinuxDistro()
+ 
+       QString contents = file.readAll();
+ 
+-      if (contents.contains("PRETTY_NAME=\"void\""))
++      if (contents.contains("ID=\"void\""))
+       {
+         ret = ectn_VOID;
+       }
+-- 
+2.35.1
+
diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template
index fef8bb3ab323..8315f57ff0d8 100644
--- a/srcpkgs/octoxbps/template
+++ b/srcpkgs/octoxbps/template
@@ -1,7 +1,7 @@
 # Template file for 'octoxbps'
 pkgname=octoxbps
 version=0.3.0
-revision=2
+revision=3
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config qt5-host-tools"
 makedepends="qt5-declarative-devel qtermwidget-devel"

From 45991cb56205e2eac1e9da55a6911007e7ef7f3e Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 6 Nov 2021 15:51:38 +0100
Subject: [PATCH 0334/1686] cups: update to 2.4.1.

Closes: #33939 [via git-merge-pr]
---
 .../cups/patches/cups-no-export-ssllibs.patch | 11 -----
 srcpkgs/cups/template                         | 48 ++++++-------------
 2 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 srcpkgs/cups/patches/cups-no-export-ssllibs.patch

diff --git a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch b/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
deleted file mode 100644
index bf618ce330bd..000000000000
--- a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
-+++ b/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
-@@ -180,7 +180,7 @@
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
- 
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
- 
- dnl
diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 66204733fa86..772f73ca4a76 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,22 +1,20 @@
 # Template file for 'cups'
 pkgname=cups
-version=2.3.3op2
+version=2.4.1
 revision=1
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
-hostmakedepends="automake $(vopt_if avahi avahi-libs-devel)
- gnutls-devel perl pkg-config poppler-utils"
-makedepends="acl-devel gnutls-devel libpaper-devel libpng-devel
- libusb-devel pam-devel poppler-devel tiff-devel
- $(vopt_if avahi avahi-libs-devel)
- $(vopt_if gssapi 'mit-krb5-devel')"
+hostmakedepends="gnutls-devel pkg-config
+ $(vopt_if avahi avahi-libs-devel)"
+makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel
+ zlib-devel $(vopt_if avahi avahi-libs-devel) $(vopt_if gssapi mit-krb5-devel)"
 depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/OpenPrinting/cups"
 distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
-checksum=deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df
+checksum=c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178
 
 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd"
 make_dirs="
@@ -34,40 +32,24 @@ system_groups=lpadmin
 cups_pgroup=lp
 cups_homedir=/var/spool/cups
 
-pre_configure() {
-	aclocal -I config-scripts
-	autoconf -I config-scripts
-}
-
 do_configure() {
 	./configure ${configure_args} --sbindir=/usr/bin --libdir=/usr/lib \
-		--enable-acl --enable-dbus --enable-raw-printing \
-		--enable-threads --with-logdir=/var/log/cups \
-		--with-docdir=/usr/share/cups/doc --with-rundir=/run/cups \
-		--with-cups-user=cups --with-cups-group=lp --with-system-groups="lpadmin sys root" --enable-relro \
-		--enable-libpaper --enable-pam --enable-ssl \
-		--with-menudir=/usr/share/applications --with-xinetd=/etc/xinetd.d \
-		--with-optim="${CFLAGS}" --disable-systemd --disable-launchd \
-		--without-rcdir --without-java --without-perl --without-php \
-		--without-python \
-		$(vopt_enable avahi) $(vopt_enable gssapi)
+		--enable-acl --with-logdir=/var/log/cups \
+		--docdir=/usr/share/cups/doc --with-rundir=/run/cups \
+		--with-cups-user=cups --with-cups-group=lp \
+		--with-system-groups="lpadmin sys root" --enable-relro \
+		--enable-libpaper --with-menudir=/usr/share/applications \
+		--with-xinetd=/etc/xinetd.d --with-optim="${CFLAGS}" \
+		--with-rcdir=no \
+		$(vopt_if avahi '--with-dnssd=avahi') $(vopt_enable gssapi)
 }
 
 post_install() {
-	# compress some driver files, adopted from Fedora
-	find ${DESTDIR}/usr/share/cups/model -name "*.ppd"|xargs gzip -n9f
 	# install some more configuration files that will get filled by cupsd
 	for f in printers classes client subscriptions; do
 		touch ${DESTDIR}/etc/cups/${f}.conf
 	done
 
-	# Remove files provided by cups-filters.
-	rm -f ${DESTDIR}/usr/share/cups/banners/*
-	rm -f ${DESTDIR}/usr/share/cups/data/testprint
-	# comment out all conversion rules which use any of the removed filters
-	perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' \
-		${DESTDIR}/usr/share/cups/mime/mime.convs
-
 	# remove unnecessary PageLogFormat entry
 	vsed -i -e 's:PageLogFormat:#PageLogFormat:' ${DESTDIR}/etc/cups/cupsd.conf*
 
@@ -92,7 +74,7 @@ libcups_package() {
 }
 
 cups-devel_package() {
-	depends="zlib-devel libcups>=${version}_${revision}"
+	depends="libcups>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 5045f7bc2bf03507a52e1ddd7d16bf42a898f96f Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Sun, 20 Mar 2022 22:25:04 +0100
Subject: [PATCH 0335/1686] tumbler: fix homepage and ignore development
 releases

tumbler-4.17 autoconf explicity requires libxfce4util-4.17.1 which is a
development release, so i assume the same 'odd mindor release is dev
release' policy that most xfce components adhere to is implied for
tumbler as well
---
 srcpkgs/tumbler/template | 4 ++--
 srcpkgs/tumbler/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/tumbler/update

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index dcdd7cfd40e9..9b4de6a28c82 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,7 +1,7 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
@@ -10,7 +10,7 @@ makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
 short_desc="D-Bus Thumbnailer service"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://xfce.org/"
+homepage="https://docs.xfce.org/xfce/tumbler/start"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66
 
diff --git a/srcpkgs/tumbler/update b/srcpkgs/tumbler/update
new file mode 100644
index 000000000000..5636324afbce
--- /dev/null
+++ b/srcpkgs/tumbler/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"

From aa81b7da713c8eb559d790f67943579693c1e929 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 22:30:27 +0100
Subject: [PATCH 0336/1686] libreoffice: fix KDE Headers include check

---
 srcpkgs/libreoffice/patches/kde-inc.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/libreoffice/patches/kde-inc.patch

diff --git a/srcpkgs/libreoffice/patches/kde-inc.patch b/srcpkgs/libreoffice/patches/kde-inc.patch
new file mode 100644
index 000000000000..d01aba1e34cf
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/kde-inc.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac	2021-11-18 12:33:09.000000000 +0100
++++ -	2022-03-20 22:27:09.688261731 +0100
+@@ -12788,7 +12788,7 @@
+         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
+     fi
+ 
+-    kf5_test_include="KF5/kcoreaddons_version.h"
++    kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h"
+     kf5_test_library="libKF5CoreAddons.so"
+     kf5_libdirs="$qt5_libdir $kf5_libdirs"
+ 
+--- a/configure	2021-11-18 12:36:47.000000000 +0100
++++ -	2022-03-20 22:27:22.080024887 +0100
+@@ -41089,7 +41089,7 @@
+         kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
+     fi
+ 
+-    kf5_test_include="KF5/kcoreaddons_version.h"
++    kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h"
+     kf5_test_library="libKF5CoreAddons.so"
+     kf5_libdirs="$qt5_libdir $kf5_libdirs"
+ 

From c025faa24edefe133fb0b172fd168c9333210091 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <withercubes@protonmail.com>
Date: Thu, 3 Mar 2022 19:11:30 +0530
Subject: [PATCH 0337/1686] nsxiv: update to 29

---
 srcpkgs/nsxiv/patches/no-rebuild-options.patch | 12 ++++++++++++
 srcpkgs/nsxiv/template                         |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/nsxiv/patches/no-rebuild-options.patch

diff --git a/srcpkgs/nsxiv/patches/no-rebuild-options.patch b/srcpkgs/nsxiv/patches/no-rebuild-options.patch
new file mode 100644
index 000000000000..455884f0b1a1
--- /dev/null
+++ b/srcpkgs/nsxiv/patches/no-rebuild-options.patch
@@ -0,0 +1,12 @@
+Preventing rebuild of options.o when installing
+--- a/Makefile
++++ b/Makefile
+@@ -106,7 +106,7 @@
+ 		rm -f "$$dir/nsxiv.png"; \
+ 	done
+
+-install: all
++install:
+ 	@echo "INSTALL bin/nsxiv"
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
+ 	cp nsxiv $(DESTDIR)$(PREFIX)/bin/
diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index 6ef4a1e207d2..a52cc2bb03f2 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -1,17 +1,17 @@
 # Template file for 'nsxiv'
 pkgname=nsxiv
-version=28
+version=29
 revision=1
 build_style=gnu-makefile
 make_install_target=install-all
 makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel
- libwebp-devel"
+ libwebp-devel freetype-devel fontconfig-devel"
 short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
-maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
+maintainer="Sanjay Pavan <withercubes@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/nsxiv/nsxiv"
 distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
-checksum=38047f60e51854363dd98fb7b3bc9f1cfa9b7d6f9e8788508b6f1e317328dd75
+checksum="564a17d921172336f7cd463bf313e39f84e4bcf4fdc789326f4112f848aad039"
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
 
 pre_build() {

From cbb829a45dbe28591fe127039b5a2ae8ff5cc515 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Mar 2022 12:38:42 +0100
Subject: [PATCH 0338/1686] syncthing: update to 1.19.1.

---
 srcpkgs/syncthing/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index d0792f1961fd..6c2d860909cb 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.19.0
+version=1.19.1
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -14,10 +14,10 @@ hostmakedepends="git"
 short_desc="Open Source Continuous File Synchronization"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0"
-homepage="http://syncthing.net/"
+homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=9d7f020ee151512b5a121c08e2b07f7a2ce5bd4a749ca91e60803d21eb1aca02
+checksum=46319031c0805374baa382ee2b21290fb9dc595b70e905b97eb9a5643a78edc4
 
 pre_build() {
 	GOARCH= go generate \

From fc4d9e340d91eda2ae83927701d11bf094ee1b94 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 23 Jan 2022 17:57:27 +0200
Subject: [PATCH 0339/1686] deluge: update to 2.0.5.

---
 .../0001-Fix-warning-related-to-gettext.patch | 25 ------------
 srcpkgs/deluge/patches/drop-priv.patch        | 40 -------------------
 srcpkgs/deluge/template                       | 23 ++++++-----
 3 files changed, 13 insertions(+), 75 deletions(-)
 delete mode 100644 srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
 delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch

diff --git a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch b/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
deleted file mode 100644
index 565cd4f952d0..000000000000
--- a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001
-From: neeshy <neeshy@tfwno.gf>
-Date: Sat, 18 Apr 2020 23:23:51 -0400
-Subject: Fix warning related to gettext
-
----
- deluge/i18n/util.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py
-index bd002f7a2..90568fc5b 100644
---- a/deluge/i18n/util.py
-+++ b/deluge/i18n/util.py
-@@ -114,7 +114,7 @@ def setup_translation():
-         # Workaround for Python 2 unicode gettext (keyword removed in Py3).
-         kwargs = {} if not deluge.common.PY2 else {'unicode': True}
- 
--        gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
-+        gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
-         builtins.__dict__['_n'] = builtins.__dict__['ngettext']
- 
-         libintl = None
--- 
-2.27.0
-
diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch
deleted file mode 100644
index cb356dbe018b..000000000000
--- a/srcpkgs/deluge/patches/drop-priv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001
-From: Jack O'Sullivan <jackos1998@gmail.com>
-Date: Tue, 24 Sep 2019 11:32:18 +0100
-Subject: [PATCH] Fix privilege dropping when setting process ownership
-
-`os.setgid()` should be called to set the GID, and it should be called
-before `os.setuid()` to prevent reinstatement of privileges.
----
- deluge/argparserbase.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py
-index af9d568fa4..77866a3ed6 100644
---- a/deluge/argparserbase.py
-+++ b/deluge/argparserbase.py
-@@ -329,18 +329,18 @@ def _handle_ui_options(self, options):
-                     _file.write('%d\n' % os.getpid())
- 
-             if not common.windows_check():
-+                if options.group:
-+                    if not options.group.isdigit():
-+                        import grp
-+
-+                        options.group = grp.getgrnam(options.group)[2]
-+                    os.setgid(options.group)
-                 if options.user:
-                     if not options.user.isdigit():
-                         import pwd
- 
-                         options.user = pwd.getpwnam(options.user)[2]
-                     os.setuid(options.user)
--                if options.group:
--                    if not options.group.isdigit():
--                        import grp
--
--                        options.group = grp.getgrnam(options.group)[2]
--                    os.setuid(options.group)
- 
-         return options
- 
diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template
index 180e473235fd..bdb186148072 100644
--- a/srcpkgs/deluge/template
+++ b/srcpkgs/deluge/template
@@ -1,20 +1,22 @@
 # Template file for 'deluge'
 pkgname=deluge
-version=2.0.3
-revision=15
+version=2.0.5
+revision=1
 build_style=python3-module
 # TODO package python3-slimit to minify javascript
 hostmakedepends="intltool python3-setuptools python3-wheel"
 depends="python3-setuptools python3-chardet python3-Twisted python3-Mako
  python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3
- python3-Pillow"
-checkdepends="python3-pytest $depends"
+ python3-Pillow python3-pyasn1 python3-openssl python3-six python3-zope.interface"
+checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3
+ python3-gobject xvfb-run cantarell-fonts"
 short_desc="Fully-featured cross-platform BitTorrent client"
 maintainer="Alexey Rochev <equeim@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://deluge-torrent.org/"
+changelog="https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md"
 distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz"
-checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891
+checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8
 
 system_accounts="deluge"
 deluge_homedir="/var/lib/deluge"
@@ -25,18 +27,19 @@ make_dirs="
  /var/lib/deluge/.config/deluge 0755 deluge deluge
  "
 
-post_install() {
-	vsv deluged
+do_check() {
+	rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py
+	xvfb-run python3 -m pytest
 }
 
-do_check() {
-	python3 -m pytest || : # fails
+post_install() {
+	vsv deluged
 }
 
 deluge-gtk_package() {
 	replaces="deluge<1.3.14_1"
 	short_desc+=" - GTK+ frontend"
-	depends="${sourcepkg}-${version}_${revision} python3-gobject"
+	depends="${sourcepkg}-${version}_${revision} python3-gobject gtk+3"
 	pkg_install() {
 		vmove usr/bin/deluge
 		vmove usr/bin/deluge-gtk

From b4904c7b8eea3886ec55c53745c7197daa8d0d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:05:24 +0100
Subject: [PATCH 0340/1686] devedeng: update to 4.17.0.

---
 srcpkgs/devedeng/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/devedeng/template b/srcpkgs/devedeng/template
index f3229ed60680..e99cf74e0356 100644
--- a/srcpkgs/devedeng/template
+++ b/srcpkgs/devedeng/template
@@ -1,15 +1,14 @@
 # Template file for 'devedeng'
 pkgname=devedeng
-version=4.16.0
-revision=4
+version=4.17.0
+revision=1
 build_style=python3-module
-pycompile_module="devedeng"
 hostmakedepends="gettext python3"
 depends="cdrtools desktop-file-utils dvdauthor ffmpeg gtk+3
  hicolor-icon-theme python3-gobject python3-setuptools vcdimager"
 short_desc="Create video DVDs and CDs"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://www.rastersoft.com/programas/devede.html"
+homepage="https://www.rastersoft.com/programas/devede.html"
 distfiles="https://gitlab.com/rastersoft/devedeng/-/archive/${version}/${pkgname}-${version}.tar.bz2"
-checksum=fe2715aa8f73133fc2d809d840fd662dcf9776fcedfb68169984af2e762b5164
+checksum=c0f22037972dcfd70b3cbe92668c98e6853e20055913dbacf862684cebf3809b

From 35355a195cf5839f950d72ab6bce7d47d9bb7a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:39:56 +0100
Subject: [PATCH 0341/1686] doomretro: update to 4.4.9.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 75e937546567..5367dc8680ce 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.4.8
+version=4.4.9
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 changelog="https://raw.githubusercontent.com/bradharding/doomretro/master/releasenotes.md"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=a680eecee1e8929774c340a2db8de24cb4d6e17e1f36d9e7c755656e12cac22c
+checksum=02f2f3ec9d8d4db5ad1d00fcb5a5161113d3caa6dc108f14af8760535f00ce9e

From 3cc383f5234f6f3085aa5ed9b66e93d25ffbfc2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 15 Mar 2022 17:52:46 +0100
Subject: [PATCH 0342/1686] lux: update to 0.14.0.

---
 srcpkgs/lux/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template
index ac88c0efaaa5..c09f51778e30 100644
--- a/srcpkgs/lux/template
+++ b/srcpkgs/lux/template
@@ -1,6 +1,6 @@
 # Template file for 'lux'
 pkgname=lux
-version=0.13.0
+version=0.14.0
 revision=1
 build_style=go
 go_import_path=github.com/iawia002/lux
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="MIT"
 homepage="https://github.com/iawia002/lux"
 distfiles="https://github.com/iawia002/lux/archive/v${version}.tar.gz"
-checksum=4fe99247a718dc1038cb6b9b1808c8e836bbf6a8464afefddf4bf8a161b08236
+checksum=3d485c9703851f3fb5cdee9b029b5b6855f84bfd29b44cae310a031a6fa8c00f
 
 post_install() {
 	vlicense LICENSE

From 3f4ad7560afb5511ab715b144e8a30398e4ea197 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 5 Mar 2022 13:19:13 -0500
Subject: [PATCH 0343/1686] menumaker: update to 0.99.14, move to python3.

---
 srcpkgs/menumaker/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/menumaker/template b/srcpkgs/menumaker/template
index 7a057147d0cd..db15e5a366f6 100644
--- a/srcpkgs/menumaker/template
+++ b/srcpkgs/menumaker/template
@@ -1,19 +1,19 @@
 # Template file for 'menumaker'
 pkgname=menumaker
-version=0.99.12
-revision=2
+version=0.99.14
+revision=1
 build_style=gnu-configure
 pycompile_dirs="/usr/share/menumaker"
-hostmakedepends="python"
-makedepends="python"
-depends="python"
+hostmakedepends="python3"
+makedepends="python3"
+depends="python3"
 short_desc="Menu generation utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="http://menumaker.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=e3a3566186a5a9ed4d721c1e7788a5af243c8c8a45b96fe6fff3e94580289b0c
-python_version=2
+checksum=11e95d0e76a3b850f57df81bc5560222bd60141c5751b6e9bd05c3cd5560d65a
+python_version=3
 
 post_install() {
 	vlicense COPYING

From 797e9aababcb346994b62f8b3e481f45c39a2092 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 8 Mar 2022 15:35:49 -0500
Subject: [PATCH 0344/1686] soju: update to 0.4.0.

---
 srcpkgs/soju/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template
index 733636d4a288..04bca21ab088 100644
--- a/srcpkgs/soju/template
+++ b/srcpkgs/soju/template
@@ -1,7 +1,7 @@
 # Template file for 'soju'
 pkgname=soju
-version=0.3.0
-revision=2
+version=0.4.0
+revision=1
 build_style=go
 go_import_path="git.sr.ht/~emersion/soju"
 go_package="./cmd/soju ./cmd/sojuctl"
@@ -12,7 +12,7 @@ license="AGPL-3.0-or-later"
 homepage="https://soju.im"
 changelog="https://git.sr.ht/~emersion/soju/refs/v${version}"
 distfiles="https://git.sr.ht/~emersion/soju/refs/download/v${version}/soju-${version}.tar.gz"
-checksum=c1b77e87e42eb12bdc57a8c308b0d0f2b3dd367a2a8f9093a3983fa692c6aa01
+checksum=91a78d8f038fb3319042961ff38d9a54a9bf897942804c0a690628dc6c959118
 conf_files="/etc/soju/config"
 system_accounts="_soju"
 make_dirs="/var/db/soju 0750 _soju _soju

From bc79277b10e6bd586e22d1d52fcf93df14d70721 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 03:34:41 -0400
Subject: [PATCH 0345/1686] python3-language-server: update to 0.36.2, add
 missing dependency.

fixes #36129
---
 srcpkgs/python3-language-server/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template
index 83332ba10f94..a443ec3fb514 100644
--- a/srcpkgs/python3-language-server/template
+++ b/srcpkgs/python3-language-server/template
@@ -1,11 +1,12 @@
 # Template file for 'python3-language-server'
 pkgname=python3-language-server
-version=0.36.1
-revision=3
+version=0.36.2
+revision=1
 wrksrc="${pkgname/3}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson"
+depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson
+ python3-setuptools"
 checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib
  python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle
  python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov
@@ -15,7 +16,7 @@ maintainer="k4leg <d0xi@inbox.ru>"
 license="MIT"
 homepage="https://github.com/palantir/python-language-server"
 distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
-checksum=c85d718ef6860319ad59fd6f2acb1166e9349b782ee8e8908e08ecf241615f52
+checksum=9984c84a67ee2c5102c8e703215f407fcfa5e62b0ae86c9572d0ada8c4b417b0
 # Needs unpackaged rope and versioneer
 # https://github.com/palantir/python-language-server/blob/develop/setup.py#L51
 make_check=no

From ed32352002e2cf1cb6fce4fdc7d09aeb5060371d Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 14 Mar 2022 03:39:12 -0400
Subject: [PATCH 0346/1686] protontricks: update to 1.8.0, add missing
 dependency.

fixes #36072
---
 srcpkgs/protontricks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 30b450cd3532..208a55032a36 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,17 +1,17 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.6.1
+version=1.8.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3-vdf winetricks"
+depends="python3-vdf winetricks python3-setuptools"
 short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
 changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7fe1bcc4cf029947850d8032b8a389e07ffb4e60e2d25a9c7535fa6e845b3ad8
+checksum=d56b53c4ea4286ae20588072433c30193143a75654ea216db389503a63661b09
 make_check=no # no tests in pypi tarball
 
 post_install() {

From a10413f94c26f76caee98e8820b82e50e3f4148f Mon Sep 17 00:00:00 2001
From: hechos <martin.damian.fernandez@gmail.com>
Date: Sun, 20 Mar 2022 15:38:45 -0300
Subject: [PATCH 0347/1686] i3status-rust: update to 0.21.8

---
 srcpkgs/i3status-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 62c33ae48c9d..6973e02571b4 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.21.7
+version=0.21.8
 revision=1
 build_style=cargo
 make_check_args="--bins"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=6085e261b2040110dd2043096d69e02c1f7d8c88651f2129b37f5a770c0a30ac
+checksum=259fdcb3ce067c6f9089fc0d7e60b856d838fff3dfb7e7e4dc5c96742c1a1be1
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From 5d6043dc71f53b824b45ee8d0a556be52d9ff898 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 19 Mar 2022 18:20:53 +0530
Subject: [PATCH 0348/1686] linux-firmware: update to 20220310

---
 srcpkgs/linux-firmware/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 7c55a94b343c..018f08f95099 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20220209
+version=20220310
 revision=1
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=1ff936dc3946affa2695f31024b22e117b3faf9aa7b8857aba1d0473cd277897
+checksum=f4c34a7ba8144b52fd7f6dd0b1dea2998f140ab1139372f8fbdb76f4557ff228
 python_version=3
 nostrip=yes
 

From 1f8e8a4107b1ed688d6fb39594a0bc5284ffeadc Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 20 Mar 2022 05:19:39 -0400
Subject: [PATCH 0349/1686] font-iosevka: update to 15.0.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 3b89fa15109a..4f1c061d5764 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=15.0.2
+version=15.0.3
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- 39e5c01184547c47d8dd4eb14897e045f5d4b39a71939f31f5ba410876aa0322
- eaa972a710765849339e17b44f1214e0b080f78cf88eaca21ae61609517301e5"
+ 7c6a4d8e003cab1a46f86fdf43f8c49e4b9d6ce932961572476266ad9f351608
+ 629dd3cf957f7ef255e7dccc3286c5a3b54c0a6a7cde8b93b3a7fdc9dffc4cbd"
 
 font_dirs="/usr/share/fonts/TTF"
 

From a247da2405881d6610a35b968037ebc9feec958f Mon Sep 17 00:00:00 2001
From: chili-b <dexter.gaonshatford@gmail.com>
Date: Sat, 19 Mar 2022 21:10:43 -0400
Subject: [PATCH 0350/1686] Ice: update to 3.7.7.

---
 srcpkgs/Ice/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index 31b15fbb4d92..90ede78d19ad 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,7 +1,7 @@
 # Template file for 'Ice'
 pkgname=Ice
-version=3.7.5
-revision=2
+version=3.7.7
+revision=1
 wrksrc="ice-${version}"
 build_style=gnu-makefile
 make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, custom:ICE"
 homepage="https://www.zeroc.com"
 distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz"
-checksum=36bf45591a95e6ee7216153d45d8eca05ff00c1da35608f0c400e6ddc8049da9
+checksum=3aef143a44a664f3101cfe02fd13356c739c922e353ef0c186895b5843a312ae
 
 if [ "$CROSS_BUILD" ]; then
 	# Cross build requires the host's slice2cpp

From dc29bd4bdc112ec0b226a7aa741c9be19b993c59 Mon Sep 17 00:00:00 2001
From: gary <28818063+garylaski@users.noreply.github.com>
Date: Sat, 19 Mar 2022 17:43:17 -0400
Subject: [PATCH 0351/1686] nicotine+: update to 3.2.2

---
 srcpkgs/nicotine+/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template
index 4dbf467d42b3..fc00ddb36446 100644
--- a/srcpkgs/nicotine+/template
+++ b/srcpkgs/nicotine+/template
@@ -1,6 +1,6 @@
 # Template file for 'nicotine+'
 pkgname=nicotine+
-version=3.2.1
+version=3.2.2
 revision=1
 wrksrc="nicotine-plus-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ license="GPL-3.0-or-later"
 homepage="https://nicotine-plus.org"
 changelog="https://raw.githubusercontent.com/nicotine-plus/nicotine-plus/master/NEWS.md"
 distfiles="https://github.com/Nicotine-Plus/nicotine-plus/archive/${version}.tar.gz"
-checksum=fa9301fe816e3a753948325ae193b58750c2e1e80c92aee3e049309ad47ee80b
+checksum=f58286f4dec6febfeab075cdfe2d2fc35c58349a504f7d393ec129df132ad40f

From 7efbb9477f91a7fdd04d4b36937cc5c033a42a0c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 14:50:28 +0100
Subject: [PATCH 0352/1686] tali: update to 40.6.

---
 srcpkgs/tali/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template
index 3e50e64f96fc..659f5257ae2e 100644
--- a/srcpkgs/tali/template
+++ b/srcpkgs/tali/template
@@ -1,6 +1,6 @@
 # Template file for 'tali'
 pkgname=tali
-version=40.5
+version=40.6
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel itstool"
@@ -9,5 +9,6 @@ short_desc="GNOME sort of poker game with dice"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Tali"
+changelog="https://gitlab.gnome.org/GNOME/tali/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz"
-checksum=63a09c55e46a1a19756bf5e0957caf994300fadabdba6bda602e668dfcdf7122
+checksum=83fba047edecd196d30719a70e2f4d0986bb26cc2bd5f955a0a9200ea63f0612

From 44a97735dcd95fe2983ae7df2383000dc1bfe39c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 4 Mar 2022 21:05:01 +0100
Subject: [PATCH 0353/1686] xfce4-diskperf-plugin: update to 2.7.0, adopt.

---
 srcpkgs/xfce4-diskperf-plugin/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index d57de65ca808..d7b6f822491a 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,17 +1,18 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
-version=2.6.3
+version=2.7.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
+checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9
 
 post_install() {
 	vlicense COPYING

From 90cdaaded05344f6a9f12e99a38a211ee4242ecb Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sat, 19 Mar 2022 16:37:20 +0100
Subject: [PATCH 0354/1686] mkvtoolnix: update to 66.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0b007bb865d0..98317332f361 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=65.0.0
+version=66.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ 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=0dddc9cc1bae26ceaac3a184482c50e6bb8add2d62e06ef08b55f9f0108bb92e
+checksum=73a3f6c39b3580f28233f93555d282d07d5f51a8bbeb8b0bee09b820de80692c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From c8997089f2c4a93a15c0cffa4ef88bfea9cd5473 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 8 Mar 2022 02:57:59 -0500
Subject: [PATCH 0355/1686] autofs: add log service, fix patch

---
 srcpkgs/autofs/files/autofs/log/run |  2 ++
 srcpkgs/autofs/files/autofs/run     |  1 +
 srcpkgs/autofs/patches/musl.patch   | 22 +++++++++++-----------
 srcpkgs/autofs/template             |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/autofs/files/autofs/log/run

diff --git a/srcpkgs/autofs/files/autofs/log/run b/srcpkgs/autofs/files/autofs/log/run
new file mode 100644
index 000000000000..a2abfe61e846
--- /dev/null
+++ b/srcpkgs/autofs/files/autofs/log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec vlogger -p daemon.info -t autofs
diff --git a/srcpkgs/autofs/files/autofs/run b/srcpkgs/autofs/files/autofs/run
index 14ee8daad0c8..6da6f9c3d404 100644
--- a/srcpkgs/autofs/files/autofs/run
+++ b/srcpkgs/autofs/files/autofs/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+exec 2>&1
 exec automount -f
diff --git a/srcpkgs/autofs/patches/musl.patch b/srcpkgs/autofs/patches/musl.patch
index 5cd45dd184ab..f81228ad740a 100644
--- a/srcpkgs/autofs/patches/musl.patch
+++ b/srcpkgs/autofs/patches/musl.patch
@@ -30,18 +30,18 @@
  #include <dlfcn.h>
 --- a/lib/log.c.orig     2019-03-30 10:49:52.965336128 +0100
 +++ b/lib/log.c  2019-03-30 10:50:43.232710045 +0100
-@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons
-       char buffer[ATTEMPT_ID_SIZE + 1];
-       char *prefixed_msg = NULL;
+@@ -38,7 +38,11 @@
+ 	char buffer[ATTEMPT_ID_SIZE + 1];
+ 	char *prefixed_msg = NULL;
  
--      attempt_id = pthread_getspecific(key_thread_attempt_id);
-+      if (key_thread_attempt_id) {
-+              attempt_id = pthread_getspecific(key_thread_attempt_id);
-+      } else {
-+              attempt_id = 0;
-+      }
-       if (attempt_id) {
-               int len = sizeof(buffer) + 1 + strlen(msg) + 1;
+-	attempt_id = pthread_getspecific(key_thread_attempt_id);
++	if (key_thread_attempt_id) {
++		attempt_id = pthread_getspecific(key_thread_attempt_id);
++	} else {
++		attempt_id = 0;
++	}
+ 	if (attempt_id) {
+ 		int len = sizeof(buffer) + 1 + strlen(msg) + 1;
  
 --- a/include/hash.h	2021-01-31 09:22:19.668222263 +0100
 +++ b/include/hash.h	2021-01-31 09:22:41.390327622 +0100
diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template
index 6ec782cccbb9..a9abc60e64e8 100644
--- a/srcpkgs/autofs/template
+++ b/srcpkgs/autofs/template
@@ -1,7 +1,7 @@
 # Template file for 'autofs'
 pkgname=autofs
 version=5.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 make_build_args="DONTSTRIP=1"
 configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"

From 7d4d71ec48ca5621b308e107409fcfd36dcbc748 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Fri, 11 Mar 2022 21:13:50 +0100
Subject: [PATCH 0356/1686] nheko: update to 0.9.2.

---
 srcpkgs/nheko/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index 50f5f543b500..846f2e381b17 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,22 +1,22 @@
 # Template file for 'nheko'
 pkgname=nheko
-version=0.9.1
-revision=2
+version=0.9.2
+revision=1
 build_style=cmake
-hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative"
+hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
 makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
  spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel
  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 gst-plugins-good1 gst-plugins-good1-qt5"
-short_desc="Desktop client for Matrix using Qt and C++14"
+short_desc="Desktop client for Matrix using Qt and C++"
 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"
+homepage="https://nheko-reborn.github.io"
+changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz"
-checksum=f8261131ed10816bdae568e5d88f6f41adc6cc2564f2f57b07266103a4972776
+checksum=207243e1c0d0e879066233488b766e30d1902a24fd8f848850567d88408ce8ce
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*-musl)

From 7f6094a62d2b3d3cee8e4e7a633f460c48c4c448 Mon Sep 17 00:00:00 2001
From: Karel Balej <balejk@matfyz.cz>
Date: Fri, 11 Mar 2022 21:33:23 +0100
Subject: [PATCH 0357/1686] mtxclient: update to 0.7.0.

---
 common/shlibs              | 2 +-
 srcpkgs/mtxclient/template | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..315841c47bae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -421,7 +421,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.6.2 mtxclient-0.6.2_1
+libmatrix_client.so.0.7.0 mtxclient-0.7.0_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 c58ff20762d0..952926c7df99 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,6 +1,6 @@
 # Template file for 'mtxclient'
 pkgname=mtxclient
-version=0.6.2
+version=0.7.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
@@ -10,8 +10,9 @@ short_desc="Client API library for the Matrix protocol"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="MIT"
 homepage="https://github.com/Nheko-Reborn/mtxclient"
+changelog="https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/CHANGELOG.md"
 distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz"
-checksum=97e41340c3f03db8a7625dcd54f6c6a3c8726c7b7226630727fea7d2bb2213bf
+checksum=dd8ad5725c391b7c5b18564074e50bfc667fb3047e681561e5e42aec99c25b12
 
 post_install() {
 	vlicense LICENSE

From 8db6bf45e8b90cd2893bc6fef693cb75b85ce313 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 16 Mar 2022 11:27:47 +0100
Subject: [PATCH 0358/1686] py3status: update to 3.42.

---
 srcpkgs/py3status/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template
index 13a91c28109b..a84b6bc296be 100644
--- a/srcpkgs/py3status/template
+++ b/srcpkgs/py3status/template
@@ -1,6 +1,6 @@
 # Template file for 'py3status'
 pkgname=py3status
-version=3.41
+version=3.42
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/ultrabug/py3status"
 changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=9728ff6913a13087201c73f682f67afcd8dc73a71b044d6833737ee227ad5fba
+checksum=bf7dd6cb65e88c3b0cf570a8df08c8ca30b655c88c7ba5b29fbfbf86a0737e27
 
 post_install() {
 	vlicense LICENSE

From 41cb5edbbabe6c2601a17db975a82228add65cf0 Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Mon, 14 Mar 2022 23:28:42 +0100
Subject: [PATCH 0359/1686] gitea: update to 1.16.4

---
 srcpkgs/gitea/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index 75d8c4290fe4..f9eaa1b18732 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.16.3
+version=1.16.4
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -32,7 +32,7 @@ license="MIT"
 homepage="https://gitea.io"
 changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
 distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=913f3b095fcfd4c5012d17adcd8748b081950e3a7d17ace60f6a2f99c9b2e18b
+checksum=ef396b797d39a64867dfcd4532043c363dce3fe054afaa37bb97f8a2ea3f2a18
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From 2cf1dbfa6c2b7f29d0dac1fc08a3f919aac415df Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 20 Mar 2022 21:22:09 -0500
Subject: [PATCH 0360/1686] yara: update to 4.2.0.

---
 common/shlibs         | 2 +-
 srcpkgs/yara/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 315841c47bae..2d8a8b8b0df3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3044,7 +3044,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.8 libyara-4.1.0_1
+libyara.so.9 libyara-4.2.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 f4dcddc35692..fe171d75b35d 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,6 +1,6 @@
 # Template file for 'yara'
 pkgname=yara
-version=4.1.3
+version=4.2.0
 revision=1
 build_style=gnu-configure
 configure_args="--enable-magic --enable-cuckoo"
@@ -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=3610ddd0c3645b8b9cfa7cfbafc0146f2df751ad8d6cd261a638bfff81efbc32
+checksum=6f567d4e4b79a210cd57a820f59f19ee69b024188ef4645b1fc11488a4660951
 
 pre_configure() {
 	autoreconf -fi

From 3ebad3bf941e2d6c988d7e7e63fcdc0a56c83c21 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 20 Mar 2022 21:22:11 -0500
Subject: [PATCH 0361/1686] python3-yara: update to 4.2.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 fcbbb46b64a7..3f4c5925636a 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.1.3
+version=4.2.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=009273c362d2f552ae784a297e4f0bd21ec5c51abd7e07fedb408156ffa2da8b
+checksum=eb2df7d4b4b2631a9fa09b7fe7e41eea19a03d2f7204eff10a7341f8a443f550

From b80c99191a0e39dc6cfa188a1ba9cd3a73819c33 Mon Sep 17 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, 21 Mar 2022 09:54:31 +0700
Subject: [PATCH 0362/1686] python3-Sphinx: update to 4.4.0.

---
 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 8b0493c1f92c..ec36f57837af 100644
--- a/srcpkgs/python3-Sphinx/template
+++ b/srcpkgs/python3-Sphinx/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Sphinx'
 pkgname=python3-Sphinx
-version=4.2.0
+version=4.4.0
 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=94078db9184491e15bce0a56d9186e0aec95f16ac20b12d00e06d4e36f1058a6
+checksum=6caad9786055cb1fa22b4a365c1775816b876f91966481765d7d50e9f0dd35cc
 conflicts="python-Sphinx>=0"
 
 post_install() {

From 974ac90282b422d611f47f8bba8eba655b0f2962 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 10 Sep 2021 21:24:56 +0400
Subject: [PATCH 0363/1686] libssh: update to 0.9.6.

---
 srcpkgs/libssh/patches/fix-includes.patch | 10 ----------
 srcpkgs/libssh/template                   |  9 +++++----
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/libssh/patches/fix-includes.patch

diff --git a/srcpkgs/libssh/patches/fix-includes.patch b/srcpkgs/libssh/patches/fix-includes.patch
deleted file mode 100644
index 39122128a307..000000000000
--- a/srcpkgs/libssh/patches/fix-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/libssh/libssh.h
-+++ b/include/libssh/libssh.h
-@@ -57,6 +57,7 @@
-   typedef unsigned long long uint64_t;
-   typedef int mode_t;
- #else /* _MSC_VER */
-+  #include <sys/types.h>
-   #include <unistd.h>
-   #include <inttypes.h>
- #endif /* _MSC_VER */
diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 9b57379bfc88..3732311abb24 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,9 +1,8 @@
 # Template file for 'libssh'
 pkgname=libssh
-version=0.9.5
-revision=2
+version=0.9.6
+revision=1
 build_style=cmake
-configure_args="-DUNIT_TESTING=ON"
 hostmakedepends="pkg-config python3"
 makedepends="zlib-devel openssl-devel cmocka-devel"
 checkdepends="openssh"
@@ -11,8 +10,10 @@ short_desc="Multiplatform C library implementing the SSH v2 protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.libssh.org/"
+changelog="https://git.libssh.org/projects/libssh.git/plain/ChangeLog?h=stable-${version%.*}"
 distfiles="https://git.libssh.org/projects/libssh.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=df65d6054554e8ff5458628808ce8d68b928175f4fefa1c833582b9568491e64
+checksum=63ddcb340e0898eb5c874418c1ff421cf90236fcb3fe5166675e79fa8a7511e4
+make_check=ci-skip # some tests fail when running as root
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args="-DHAVE_GLOB=0" ;;

From 4d0d6782c738a2f68bfeceeaaa236d8e365fff2c Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Mon, 21 Mar 2022 09:33:41 +0100
Subject: [PATCH 0364/1686] google-chrome: update to 99.0.4844.82

---
 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 5516594f44f9..e12c57deeb5c 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.74
+version=99.0.4844.82
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=0444893153d4b3b628c6465c48e7c49f06649b101ce5ab066d59b14c363ef9f7
+checksum=b9c181ddc15760795a7c30b950d90a8ef78487825fb12b1e171d1f71fe8a107e
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 49f5e29c90208df1c492473dfa887db6b209633c Mon Sep 17 00:00:00 2001
From: Henry Naguski <henry@nilsu.org>
Date: Sun, 20 Mar 2022 19:51:34 -0600
Subject: [PATCH 0365/1686] dolphin-emu: update to 5.0.16101.

---
 srcpkgs/dolphin-emu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template
index 4f00d57388e1..2b3a783943b8 100644
--- a/srcpkgs/dolphin-emu/template
+++ b/srcpkgs/dolphin-emu/template
@@ -1,8 +1,8 @@
 # Template file for 'dolphin-emu'
 pkgname=dolphin-emu
-version=5.0.15993
+version=5.0.16101
 revision=1
-_dolphin_commit=5e595616379a694789fe749e40a27ef069f0090e
+_dolphin_commit=8ecfa537a242de74d2e372e30d9d79b14584b2fb
 _mgba_commit=40d4c430fc36caeb7ea32fd39624947ed487d2f2
 #Version/hash pair can be found at https://dolphin-emu.org/download/
 archs="x86_64* aarch64* ppc64le* i686*"
@@ -25,7 +25,7 @@ license="GPL-2.0-or-later"
 homepage="http://dolphin-emu.org"
 distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz
  https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz"
-checksum="d25e597356d410d71a825d881432ab40d66f65a5116412ec7d1661f414c72191
+checksum="a7bff69fce6466668c36e6c7ac3838434d64bb315cd2ad22817c943a9887f6e5
  3cabf00a97cf4fb15fe8524b3d02190acdd003f25967cdbbf8de958649b8061b"
 nopie=yes
 

From 30d2010798d02607d3b9c8602e2db7decf360805 Mon Sep 17 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, 21 Mar 2022 17:04:55 +0700
Subject: [PATCH 0366/1686] nyxt: fix musl runtime

While we're at it, load versioned libgi-repository.

Fix: #35877
Fix: #36243
Close: #36251
---
 srcpkgs/nyxt/patches/001-libfixposix.patch | 16 +++++++++-------
 srcpkgs/nyxt/patches/gir.patch             | 13 +++++++++++++
 srcpkgs/nyxt/template                      |  4 ++--
 3 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/nyxt/patches/gir.patch

diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch
index 23ef9da26442..7339c30acbe8 100644
--- a/srcpkgs/nyxt/patches/001-libfixposix.patch
+++ b/srcpkgs/nyxt/patches/001-libfixposix.patch
@@ -1,12 +1,14 @@
---- a/_build/iolib/src/syscalls/ffi-functions-unix.lisp.orig	2022-02-27 09:44:00.327307802 -0700
-+++ b/_build/iolib/src/syscalls/ffi-functions-unix.lisp	2022-02-27 09:48:30.875539336 -0700
-@@ -12,7 +12,8 @@
+Index: nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp
+===================================================================
+--- nyxt-2.2.4.orig/_build/iolib/src/syscalls/ffi-functions-unix.lisp
++++ nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp
+@@ -11,7 +11,8 @@
+ ;; FIXME: move this into an ASDF operation
  (eval-when (:compile-toplevel :load-toplevel :execute)
    (define-foreign-library
-       (libfixposix :canary "lfp_buildinfo")
--    (t (:default "libfixposix")))
+-      (libfixposix :canary "lfp_buildinfo")
++      (libfixposix :canary "lfp_buildinfo_not_exist")
 +    (:unix "libfixposix.so.3")
-+    (t (:default "libfixposix")))
+     (t (:default "libfixposix")))
    (load-foreign-library 'libfixposix))
  \f
- 
diff --git a/srcpkgs/nyxt/patches/gir.patch b/srcpkgs/nyxt/patches/gir.patch
new file mode 100644
index 000000000000..39f94a1d4dde
--- /dev/null
+++ b/srcpkgs/nyxt/patches/gir.patch
@@ -0,0 +1,13 @@
+Index: nyxt-2.2.4/_build/cl-gobject-introspection/src/init.lisp
+===================================================================
+--- nyxt-2.2.4.orig/_build/cl-gobject-introspection/src/init.lisp
++++ nyxt-2.2.4/_build/cl-gobject-introspection/src/init.lisp
+@@ -10,7 +10,7 @@
+     (t "libgobject-2.0"))
+   (cffi:define-foreign-library girepository
+     (:darwin "libgirepository-1.0.dylib")
+-    (:unix (:or "libgirepository-1.0.so" "libgirepository-1.0.so.1"))
++    (:unix (:or "libgirepository-1.0.so.1"))
+     (:windows (:or "libgirepository-1.0.dll" "libgirepository-1.0.0.dll"
+                    "libgirepository-1.0-1.dll"))
+     (t "libgirepository-1.0")))
diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template
index a0da399fb2da..8fdd7215cd90 100644
--- a/srcpkgs/nyxt/template
+++ b/srcpkgs/nyxt/template
@@ -1,12 +1,12 @@
 # Template file for 'nyxt'
 pkgname=nyxt
 version=2.2.4
-revision=2
+revision=3
 create_wrksrc=yes
 build_style=gnu-makefile
 make_build_target=all
 hostmakedepends="sbcl git"
-makedepends="webkit2gtk libfixposix-devel libgirepository-devel"
+makedepends="webkit2gtk libfixposix-devel libgirepository"
 depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository"
 short_desc="Keyboard-oriented, extensible web-browser"
 maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"

From 3cb3a61c8cac0a76e775285a0bae9d4e98331a7b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 21 Mar 2022 14:06:08 +0100
Subject: [PATCH 0367/1686] z3: update to 4.8.15.

---
 srcpkgs/z3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index a907482b751d..2d5bf7a80954 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,6 +1,6 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.14
+version=4.8.15
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
 distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=96a1f49a7701120cc38bfa63c02ff93be4d64c7926cea41977dedec7d87a1364
+checksum=2abe7f5ecb7c8023b712ffba959c55b4515f4978522a6882391de289310795ac
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"

From e49cbb974d78ef45b5e31ebf69ecb50081b237db Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Mon, 21 Mar 2022 16:12:29 +0100
Subject: [PATCH 0368/1686] knot-resolver: update to 5.5.0.

---
 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 2f03d4420f03..f40c2f1646ee 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.4.4
+version=5.5.0
 revision=1
 build_style=meson
 configure_args="
@@ -19,7 +19,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.knot-resolver.cz/"
 distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz"
-checksum=588964319e943679d391cc9c886d40ef858ecd9b33ae160023b4e2b5182b2cea
+checksum=4e6f48c74d955f143d603f6072670cb41ab9acdd95d4455d6e74b6908562c55a
 
 system_accounts="_knot_resolver"
 _knot_resolver_homedir="/var/cache/knot-resolver"

From 8bd3bff5dd269a47c61bbb313e95755763908f0a Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 25 May 2021 12:08:54 +1100
Subject: [PATCH 0369/1686] patchelf: update to 0.14.5.

---
 srcpkgs/patchelf/template | 8 ++++----
 srcpkgs/patchelf/update   | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 srcpkgs/patchelf/update

diff --git a/srcpkgs/patchelf/template b/srcpkgs/patchelf/template
index fe2dc3ccee4e..e0071fcf0b1b 100644
--- a/srcpkgs/patchelf/template
+++ b/srcpkgs/patchelf/template
@@ -1,11 +1,11 @@
 # Template file for 'patchelf'
 pkgname=patchelf
-version=0.10
+version=0.14.5
 revision=1
 build_style=gnu-configure
 short_desc="Utility for modifing existing ELF executables and libraries"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://nixos.org/patchelf.html"
-distfiles="https://nixos.org/releases/patchelf/patchelf-${version}/patchelf-${version}.tar.bz2"
-checksum=f670cd462ac7161588c28f45349bc20fb9bd842805e3f71387a320e7a9ddfcf3
+homepage="https://github.com/NixOS/patchelf"
+distfiles="${homepage}/releases/download/${version}/patchelf-${version}.tar.bz2"
+checksum=b9a46f2989322eb89fa4f6237e20836c57b455aa43a32545ea093b431d982f5c
diff --git a/srcpkgs/patchelf/update b/srcpkgs/patchelf/update
deleted file mode 100644
index dd90721fd90a..000000000000
--- a/srcpkgs/patchelf/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site='https://nixos.org/releases/patchelf/'
-pattern='patchelf-\K[\d.]+(?=/</a>)'

From 7c142518c4131c36edf42ac27d514dd9fe556d56 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 22 Mar 2022 11:51:31 +0100
Subject: [PATCH 0370/1686] warzone2100: don't install /usr/bin/.portable

it tricks keepassxc into portable mode

Closes: #36277
---
 srcpkgs/warzone2100/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 9ef2297baeb7..9c691626703f 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -1,7 +1,7 @@
 # Template file for 'warzone2100'
 pkgname=warzone2100
 version=4.2.7
-revision=1
+revision=3
 wrksrc="warzone2100"
 build_style=cmake
 configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void"
@@ -28,6 +28,12 @@ post_extract() {
 	fi
 }
 
+post_install() {
+	# .portable has side-effect with keepassxc
+	# https://github.com/Warzone2100/warzone2100/issues/2645
+	rm "$DESTDIR"/usr/bin/.portable
+}
+
 warzone2100-data_package() {
 	short_desc+=" - data files"
 	pkg_install() {

From 2328d1e5c7fae68ba16ab7132259c00020d9b744 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 22 Mar 2022 16:19:05 +0100
Subject: [PATCH 0371/1686] skaffold: update to 1.37.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index fa05e329472f..4f54c6c05e98 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.36.1
+version=1.37.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=b30361c02963d2374f2636f0181808f868834024f99ace74282c9f7416c1646a
+checksum=a97a6f6cbf571f342183e5cf65c30932ade282b182fc92f108cb2a160a46779b

From 1ce214704e975a34b3a32bf588528108069b7592 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Mon, 21 Mar 2022 20:11:35 +0700
Subject: [PATCH 0372/1686] vivaldi: update to 5.1.2567.66

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index e3421bb8539c..d36738824694 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.1.2567.57
+version=5.1.2567.66
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=ffb1f9ea4fc7eb9e99274f13a771999682ab1eef078641df6fcd48c1357ffd7a
+checksum=e2631cfabdd2d916fd8ab05004afd86efeec4e47d50a86b8be4cd3b59f6430ed
 repository=nonfree
 restricted=yes
 nostrip=yes

From 26fac6fbf5692c32c4e880b63d77b2ac5177ebdb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 22 Mar 2022 17:56:15 +0100
Subject: [PATCH 0373/1686] lollypop: update to 1.4.30.

---
 srcpkgs/lollypop/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 2c2d8c329e63..569c4e291772 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,10 +1,11 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.29
+version=1.4.30
 revision=1
 build_style=meson
 hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config"
-makedepends="gtk+3-devel libsoup-devel python3-gobject-devel python3-devel"
+makedepends="gtk+3-devel libsoup-devel python3-gobject-devel python3-devel
+ libhandy1-devel"
 depends="dconf gst-libav gst-plugins-good1 libnotify libsecret
  python3-Pillow totem-pl-parser python3-BeautifulSoup4 libhandy1
  python3-gobject python3-pylast youtube-dl gnome-keyring"
@@ -13,4 +14,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/lollypop-${version}.tar.xz"
-checksum=f6975923315adc57ebe693e7cae9e2668d1d3f7f9a0e3209eda4b67f270761ee
+checksum=393c3ed6431026b3214f380b7aa74ee31b054203855f7f5c928b1d25ad1b8ef5

From 9e00bae32e1315e228df9d3208afd7ee9544081f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 22 Mar 2022 17:58:04 +0100
Subject: [PATCH 0374/1686] squashfs-tools: update to 4.5.1.

---
 srcpkgs/squashfs-tools/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template
index 04b0bef6df6a..8b22de823ade 100644
--- a/srcpkgs/squashfs-tools/template
+++ b/srcpkgs/squashfs-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'squashfs-tools'
 pkgname=squashfs-tools
-version=4.5
-revision=2
+version=4.5.1
+revision=1
 build_wrksrc="squashfs-tools"
 build_style=gnu-makefile
 make_use_env=yes
@@ -11,8 +11,9 @@ short_desc="Tool to create and append to squashfs filesystems"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/plougher/squashfs-tools"
+changelog="https://github.com/plougher/squashfs-tools/raw/master/CHANGES"
 distfiles="https://github.com/plougher/squashfs-tools/archive/refs/tags/${version}.tar.gz"
-checksum=b9e16188e6dc1857fe312633920f7d71cc36b0162eb50f3ecb1f0040f02edddd
+checksum=277b6e7f75a4a57f72191295ae62766a10d627a4f5e5f19eadfbc861378deea7
 
 do_install() {
 	vbin mksquashfs

From b510a4388fd310bf8f452cca2994fe962f243b4f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 21 Mar 2022 10:02:40 -0400
Subject: [PATCH 0375/1686] python-dbus: include egg-info metadata

Also drop python-dbus-devel, there is no value in carrying the metapkg.
---
 srcpkgs/python-dbus-devel    |  1 -
 srcpkgs/python-dbus/template | 64 ++++++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 26 deletions(-)
 delete mode 120000 srcpkgs/python-dbus-devel

diff --git a/srcpkgs/python-dbus-devel b/srcpkgs/python-dbus-devel
deleted file mode 120000
index 082b5c2fc193..000000000000
--- a/srcpkgs/python-dbus-devel
+++ /dev/null
@@ -1 +0,0 @@
-python-dbus
\ No newline at end of file
diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template
index 19ac9e7cbf0b..64c1ae021798 100644
--- a/srcpkgs/python-dbus/template
+++ b/srcpkgs/python-dbus/template
@@ -1,11 +1,11 @@
 # Template file for 'python-dbus'
 pkgname=python-dbus
 version=1.2.18
-revision=1
+revision=2
 wrksrc="dbus-python-${version}"
 build_style=gnu-configure
-hostmakedepends="pkg-config python-devel python3-devel"
-makedepends="libglib-devel ${hostmakedepends/pkg-config/}"
+hostmakedepends="pkg-config python python3"
+makedepends="libglib-devel python3-devel python-devel"
 depends="python dbus"
 short_desc="D-Bus Python2 bindings"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -20,35 +20,55 @@ pre_configure() {
 	mv * dbus-${py2_ver} || true
 	cp -a dbus-${py2_ver} dbus-${py3_ver}
 }
+
 do_configure() {
-	local py_abiver=
+	local py_abiver py_inc pyver
 	for pyver in $py2_ver $py3_ver; do
-		if [ "$pyver" != "$py2_ver" ]; then
-			py_inc="$py3_inc"
-			py_abiver="$py3_abiver"
-		else
-			py_inc="$py2_inc"
-		fi
+		case "${pyver}" in
+			"${py2_ver}")
+				py_inc="$py2_inc"
+				;;
+			*)
+				py_inc="$py3_inc"
+				py_abiver="$py3_abiver"
+				;;
+		esac
 
-		cd ${wrksrc}/dbus-${pyver}
 		export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py_inc}"
 		export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${py_abiver}"
 		export PYTHON_VERSION="${pyver}"
-		./configure ${configure_args}
+
+		( cd dbus-${pyver} && ./configure ${configure_args} )
+
 	done
+
+	unset PYTHON_CPPFLAGS PYTHON_EXTRA_LIBS PYTHON_VERSION
 }
+
 do_build() {
+	local pyver
 	for pyver in $py2_ver $py3_ver; do
-		cd ${wrksrc}/dbus-${pyver}
-		make ${makejobs}
+		( cd dbus-${pyver} && make ${makejobs} )
 	done
 }
+
 do_install() {
+	local pyver pysite eggver
 	for pyver in $py2_ver $py3_ver; do
-		cd ${wrksrc}/dbus-${pyver}
-		make DESTDIR=${DESTDIR} install
-		vlicense COPYING
+		case "${pyver}" in
+			"${py2_ver}") pysite="${py2_sitelib}" ;;
+			*) pysite="${py3_sitelib}" ;;
+		esac
+
+		eggver="dbus_python-${version}-py${pyver}"
+		(
+			cd dbus-${pyver}
+			make DESTDIR=${DESTDIR} install
+			vcopy dbus_python.egg-info "${pysite}/${eggver}.egg-info"
+		)
 	done
+
+	vlicense dbus-${py2_ver}/COPYING
 }
 
 python3-dbus_package() {
@@ -57,16 +77,10 @@ python3-dbus_package() {
 	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*
+		vlicense dbus-${py3_ver}/COPYING
 	}
 }
-# This package used to provide both Python 2 and Python 3 development files
-# Those files are now in python3-dbus-devel
-python-dbus-devel_package() {
-	depends="python-devel python-dbus>=${version}_${revision}
-	 python3-dbus-devel>=${version}_${revision}"
-	build_style=meta
-	short_desc+=" - development files (Python 2 meta)"
-}
+
 python3-dbus-devel_package() {
 	depends="python3-devel python3-dbus>=${version}_${revision}"
 	short_desc="${short_desc/Python2/Python3} - development files"

From 4c8c59f7985813cec1056e7b4445d91a54ffecb4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 21 Mar 2022 23:58:07 -0400
Subject: [PATCH 0376/1686] libusb: fix segfault

libusb/libusb#1073
---
 .../libusb/patches/late-transfer-free.patch   | 136 ++++++++++++++++++
 srcpkgs/libusb/template                       |   2 +-
 2 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libusb/patches/late-transfer-free.patch

diff --git a/srcpkgs/libusb/patches/late-transfer-free.patch b/srcpkgs/libusb/patches/late-transfer-free.patch
new file mode 100644
index 000000000000..f4d913bbbd84
--- /dev/null
+++ b/srcpkgs/libusb/patches/late-transfer-free.patch
@@ -0,0 +1,136 @@
+From 010691ff6fdf9fcfaa7f76c1417dfc1f7df124ca Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Tue, 15 Feb 2022 11:13:41 +0100
+Subject: [PATCH] io: Track device in usbi_transfer
+
+transfer->dev_handle currently has the behaviour that it will be unset
+if the device is closed. The sync API uses this fact to catch an error
+case.
+
+In other cases, transfer->dev_handle will keep its value, which means
+that if the transfer lives longer than the device handle, the pointer
+becomes invalid.
+
+The transfer does however keep a reference to the device, which owns the
+pointer to the context. As such, we can track this reference internal to
+the transfer, and it is set while the transfer is in-flight.
+
+With this, switch the logging infrastructure to use itransfer->dev->ctx
+while checking that itransfer->dev is non-NULL.
+
+Note that this was a regression caused by 6cae9c6dbd74 ("core: update
+usbi_dbg to take the context as an argument"), specifically when
+resolving the context while freeing a transfer after closing a device.
+
+Note that the transfer will now keep a reference to the device until it
+is free'ed. This allows it to use the correct context for logging even
+in libusb_free_transfer.
+
+The alternative to all this would be to just explicitly pass NULL to the
+log handler in libusb_free_transfer.
+
+Closes: #1038
+---
+ libusb/io.c      | 20 ++++++++++++--------
+ libusb/libusbi.h | 11 ++++++++---
+ 2 files changed, 20 insertions(+), 11 deletions(-)
+
+diff --git a/libusb/io.c b/libusb/io.c
+index 0d2ac9ea..b919e9d9 100644
+--- a/libusb/io.c
++++ b/libusb/io.c
+@@ -1344,6 +1344,8 @@ void API_EXPORTED libusb_free_transfer(struct libusb_transfer *transfer)
+ 
+ 	itransfer = LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
+ 	usbi_mutex_destroy(&itransfer->lock);
++	if (itransfer->dev)
++		libusb_unref_device(itransfer->dev);
+ 
+ 	priv_size = PTR_ALIGN(usbi_backend.transfer_priv_size);
+ 	ptr = (unsigned char *)itransfer - priv_size;
+@@ -1489,9 +1491,15 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
+ {
+ 	struct usbi_transfer *itransfer =
+ 		LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
+-	struct libusb_context *ctx = TRANSFER_CTX(transfer);
++	struct libusb_context *ctx;
+ 	int r;
+ 
++	assert(transfer->dev_handle);
++	if (itransfer->dev)
++		libusb_unref_device(itransfer->dev);
++	itransfer->dev = libusb_ref_device(transfer->dev_handle->dev);
++
++	ctx = HANDLE_CTX(transfer->dev_handle);
+ 	usbi_dbg(ctx, "transfer %p", transfer);
+ 
+ 	/*
+@@ -1551,8 +1559,6 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
+ 	r = usbi_backend.submit_transfer(itransfer);
+ 	if (r == LIBUSB_SUCCESS) {
+ 		itransfer->state_flags |= USBI_TRANSFER_IN_FLIGHT;
+-		/* keep a reference to this device */
+-		libusb_ref_device(transfer->dev_handle->dev);
+ 	}
+ 	usbi_mutex_unlock(&itransfer->lock);
+ 
+@@ -1659,7 +1665,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
+ {
+ 	struct libusb_transfer *transfer =
+ 		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+-	struct libusb_device_handle *dev_handle = transfer->dev_handle;
+ 	struct libusb_context *ctx = ITRANSFER_CTX(itransfer);
+ 	uint8_t flags;
+ 	int r;
+@@ -1693,7 +1698,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
+ 	 * this point. */
+ 	if (flags & LIBUSB_TRANSFER_FREE_TRANSFER)
+ 		libusb_free_transfer(transfer);
+-	libusb_unref_device(dev_handle->dev);
+ 	return r;
+ }
+ 
+@@ -1727,10 +1731,10 @@ int usbi_handle_transfer_cancellation(struct usbi_transfer *itransfer)
+  * function will be called the next time an event handler runs. */
+ void usbi_signal_transfer_completion(struct usbi_transfer *itransfer)
+ {
+-	libusb_device_handle *dev_handle = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)->dev_handle;
++	struct libusb_device *dev = itransfer->dev;
+ 
+-	if (dev_handle) {
+-		struct libusb_context *ctx = HANDLE_CTX(dev_handle);
++	if (dev) {
++		struct libusb_context *ctx = DEVICE_CTX(dev);
+ 		unsigned int event_flags;
+ 
+ 		usbi_mutex_lock(&ctx->event_data_lock);
+diff --git a/libusb/libusbi.h b/libusb/libusbi.h
+index 158a9af5..7618236f 100644
+--- a/libusb/libusbi.h
++++ b/libusb/libusbi.h
+@@ -329,10 +329,11 @@ void usbi_log(struct libusb_context *ctx, enum libusb_log_level level,
+ #endif /* ENABLE_LOGGING */
+ 
+ #define DEVICE_CTX(dev)		((dev)->ctx)
+-#define HANDLE_CTX(handle)	(DEVICE_CTX((handle)->dev))
+-#define TRANSFER_CTX(transfer)	(HANDLE_CTX((transfer)->dev_handle))
++#define HANDLE_CTX(handle)	((handle) ? DEVICE_CTX((handle)->dev) : NULL)
+ #define ITRANSFER_CTX(itransfer) \
+-	(TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)))
++	((itransfer)->dev ? DEVICE_CTX((itransfer)->dev) : NULL)
++#define TRANSFER_CTX(transfer) \
++	(ITRANSFER_CTX(LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer)))
+ 
+ #define IS_EPIN(ep)		(0 != ((ep) & LIBUSB_ENDPOINT_IN))
+ #define IS_EPOUT(ep)		(!IS_EPIN(ep))
+@@ -562,6 +563,10 @@ struct usbi_transfer {
+ 	uint32_t state_flags;   /* Protected by usbi_transfer->lock */
+ 	uint32_t timeout_flags; /* Protected by the flying_stransfers_lock */
+ 
++	/* The device reference is held until destruction for logging
++	 * even after dev_handle is set to NULL.  */
++	struct libusb_device *dev;
++
+ 	/* this lock is held during libusb_submit_transfer() and
+ 	 * libusb_cancel_transfer() (allowing the OS backend to prevent duplicate
+ 	 * cancellation, submission-during-cancellation, etc). the OS backend
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 7b63b401f2a6..4f192264d4bc 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,7 +1,7 @@
 # Template file for 'libusb'
 pkgname=libusb
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel"

From b2edcc1379ed369586f6a97c2e31cb8fa227a0d9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 22 Mar 2022 19:54:46 +0100
Subject: [PATCH 0377/1686] vim: update to 8.2.4609.

---
 srcpkgs/vim/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template
index 252c84c21b18..f5ff0d9066a7 100644
--- a/srcpkgs/vim/template
+++ b/srcpkgs/vim/template
@@ -1,7 +1,7 @@
 # Template file for 'vim'
 pkgname=vim
-version=8.2.4221
-revision=2
+version=8.2.4609
+revision=1
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="acl-devel ncurses-devel
  $(vopt_if x11 libXt-devel)
@@ -13,7 +13,7 @@ maintainer="Neel Chotai <neel@chot.ai>"
 license="Vim"
 homepage="https://www.vim.org"
 distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz"
-checksum=4b81c03d54a5df697d74bc1eccc5939d6836b8fb58291eda5344c6ddb757ae57
+checksum=a9b150ed68cf41931e1af2f9fe8b958cf36ed1a14d00378ac8cebf7d8617afb1
 python_version=3
 
 build_options="x11 gtk3 huge"

From e9966dbdb4108342b828ecdb6c1b7cedd887aba3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 22 Mar 2022 20:24:14 +0100
Subject: [PATCH 0378/1686] fwupd: fix -devel dependencies

---
 srcpkgs/fwupd/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template
index 005880d7bcbf..9f15e0a43ddc 100644
--- a/srcpkgs/fwupd/template
+++ b/srcpkgs/fwupd/template
@@ -1,7 +1,7 @@
 # Template file for 'fwupd'
 pkgname=fwupd
 version=1.7.5
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true
@@ -60,7 +60,9 @@ pre_build() {
 }
 
 fwupd-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision} libglib-devel"
+	depends="${sourcepkg}>=${version}_${revision} libglib-devel libcurl-devel
+	 libjcat-devel libgusb-devel libxmlb-devel libarchive-devel gcab-devel
+	 json-glib-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From da293199193e8192c42d7151d32d6800c0bf4cd6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:37:09 +0100
Subject: [PATCH 0379/1686] nautilus-sendto: remove package

---
 srcpkgs/nautilus-sendto/template  | 14 --------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 srcpkgs/nautilus-sendto/template

diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template
deleted file mode 100644
index c357b9efae65..000000000000
--- a/srcpkgs/nautilus-sendto/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'nautilus-sendto'
-pkgname=nautilus-sendto
-version=3.8.6
-revision=2
-build_style=meson
-# XXX: add pidgin and gajim depends for plugins to work.
-hostmakedepends="pkg-config intltool"
-makedepends="evolution-data-server-devel nautilus-devel gupnp-devel appstream-glib-devel"
-short_desc="Nautilus context menu for sending files"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://download.gnome.org/sources/nautilus-sendto/"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index c23125bb0cb4..30fa0d2cce34 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -243,6 +243,7 @@ replaces="
  mongroup<=0.4.1_2
  mozjs68<=68.11.0_1
  mutagen<=1.43.0_3
+ nautilus-sendto<=3.8.6_2
  ncdns<=0.0.2_12
  newt-python<=0.52.21_5
  nodejs-lts-10<=10.24.0_2

From 045d2c0ab3af8088cb47a59a092a047a103f75c3 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Mar 2022 13:55:28 +1100
Subject: [PATCH 0380/1686] jadx: update to 1.3.4.

---
 srcpkgs/jadx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template
index d5e2f69ab770..71467e34044c 100644
--- a/srcpkgs/jadx/template
+++ b/srcpkgs/jadx/template
@@ -1,6 +1,6 @@
 # Template file for 'jadx'
 pkgname=jadx
-version=1.3.3
+version=1.3.4
 revision=1
 hostmakedepends="openjdk8 gradle"
 short_desc="Decompiler for Dalvik bytecode"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/skylot/jadx"
 distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz"
-checksum=c423176c0b0675db6a9969133af3ec71d2568897155362fe50b0288e76bfe78d
+checksum=9f7f05c647a287fe4a572d85f14715559513e864d27f6bf6b19852529da8efdc
 
 do_build() {
 	gradle copyArtifacts

From 8baabab2ddb52d60d61eb8d201973e3644dbba4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 11:12:24 +0100
Subject: [PATCH 0381/1686] tau: update to 0.12.0.

---
 srcpkgs/tau/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tau/template b/srcpkgs/tau/template
index d81968c76ac8..d1f9e9624997 100644
--- a/srcpkgs/tau/template
+++ b/srcpkgs/tau/template
@@ -1,11 +1,10 @@
 # Template file for 'tau'
 pkgname=tau
-version=0.11.3
+version=0.12.0
 revision=1
 build_style=meson
 build_helper=rust
-configure_args=" -Dxi-core=system"
-hostmakedepends="cargo gettext pkg-config rust glib-devel xi-editor"
+hostmakedepends="cargo gettext pkg-config glib-devel"
 makedepends="libhandy-devel rust-std vte3-devel"
 depends="xi-editor"
 checkdepends="appstream-glib desktop-file-utils"
@@ -13,8 +12,8 @@ short_desc="GTK frontend for the Xi text editor, written in Rust"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
 homepage="https://gitlab.gnome.org/World/Tau"
-distfiles="https://gitlab.gnome.org/World/Tau/uploads/b5f24cd692ec0c2a2c2be460fffaf505/tau-${version}.tar.xz"
-checksum=36e915de4ca906599b4ad176d4e2d625b454801a09ca0d4b0a1fbaf14915e60e
+distfiles="https://gitlab.gnome.org/World/Tau/uploads/14037a7f98f475d2497b74bd74a0430e/tau-${version}.tar.xz"
+checksum=a14e4c3511fa51cc051c33ad04a3989b93c6aa2405e8b0f5ac05970fe5d95449
 
 # this sometimes builds and sometimes doesn't, do not
 # reenable unless you can reliably build it every time

From 9c2ff6b767873bdb5577e8acbe6c009810eb2e63 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:02:00 -0500
Subject: [PATCH 0382/1686] Amass: update to 3.18.2.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 271551b6b159..c11b52a04657 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.17.1
+version=3.18.2
 revision=1
 build_style=go
 go_import_path="github.com/OWASP/Amass/v3/..."
@@ -9,7 +9,7 @@ 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=5d11de26ce62dad9ddc4f36032a1192c2c126c4e23a31e1e04cb2d08098d5dfd
+checksum=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/examples

From 243ee06ce6a5feb23c6f4371f69a82e0efbe95be Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:04:08 -0500
Subject: [PATCH 0383/1686] QMPlay2: update to 22.03.19.

---
 srcpkgs/QMPlay2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/QMPlay2/template b/srcpkgs/QMPlay2/template
index 463afde3a834..1c8571de2591 100644
--- a/srcpkgs/QMPlay2/template
+++ b/srcpkgs/QMPlay2/template
@@ -1,6 +1,6 @@
 # Template file for 'QMPlay2'
 pkgname=QMPlay2
-version=21.12.24
+version=22.03.19
 revision=1
 wrksrc="${pkgname}-src-${version}"
 build_style=cmake
@@ -15,7 +15,7 @@ license="LGPL-3.0-only"
 homepage="http://zaps166.sourceforge.net/?app=QMPlay2"
 changelog="https://raw.githubusercontent.com/zaps166/QMPlay2/master/ChangeLog"
 distfiles="https://github.com/zaps166/QMPlay2/releases/download/${version}/QMPlay2-src-${version}.tar.xz"
-checksum=92e5fa7f7df43a83f72bf9e87366ebae71148bc683db0556447981f0dd8e5f2d
+checksum=d6cde1cec25729d32a8cc1ba925b711b98d18961941f9764a7db8a75b255004e
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a7a3e3ac22e0419b3d5453bd032ca965ed08b508 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:05:38 -0500
Subject: [PATCH 0384/1686] python3-rich: update to 12.0.1.

---
 srcpkgs/python3-rich/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-rich/template b/srcpkgs/python3-rich/template
index 942d44da3fa2..c394edfbeade 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=11.2.0
+version=12.0.1
 revision=1
 wrksrc="rich-${version}"
 build_style=python3-module
@@ -13,7 +13,8 @@ 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=1a6266a5738115017bb64a66c59c717e7aa047b3ae49a011ede4abdeffc6536e
+checksum=3fba9dd15ebe048e2795a02ac19baee79dc12cc50b074ef70f2958cd651b59a9
+make_check=extended # some checks only work on windows
 
 post_install() {
 	vlicense LICENSE

From 7b6f31c76eb9486d8b9d41371352015b6c3e8388 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:08:55 -0500
Subject: [PATCH 0385/1686] python3-waitress: update to 2.1.1.

---
 srcpkgs/python3-waitress/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-waitress/template b/srcpkgs/python3-waitress/template
index ae3ee23f6934..5e40d71a3d46 100644
--- a/srcpkgs/python3-waitress/template
+++ b/srcpkgs/python3-waitress/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-waitress'
 pkgname=python3-waitress
-version=2.1.0
+version=2.1.1
 revision=1
 wrksrc="waitress-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="ZPL-2.1"
 homepage="https://github.com/Pylons/waitress"
 distfiles="${PYPI_SITE}/w/waitress/waitress-${version}.tar.gz"
-checksum=ec8a8d9b6b15f3bb2c1a82b8f3929a029c333c35fcafb08c185a9e562d8cc9c2
+checksum=e2e60576cf14a1539da79f7b7ee1e79a71e64f366a0b47db54a15e971f57bb16

From 30499e948c736042f68bf7bd0d4bda0d2bc874f9 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 23:09:04 -0500
Subject: [PATCH 0386/1686] ytmdl: update to 2022.03.16.

---
 srcpkgs/ytmdl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ytmdl/template b/srcpkgs/ytmdl/template
index dd28541cea49..5dfe4a7636a8 100644
--- a/srcpkgs/ytmdl/template
+++ b/srcpkgs/ytmdl/template
@@ -1,6 +1,6 @@
 # Template file for 'ytmdl'
 pkgname=ytmdl
-version=2021.11.07
+version=2022.03.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -16,7 +16,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/deepjyoti30/ytmdl"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=1de4cdd9f256acac5518637d533c0737e8f3ab13a4990e171f2ffd16d1bdfd8f
+checksum=cb2271e7e2e2db107848699dd7e56a7d9479b6ce20e5ddef8710bd7078543430
 # There is no test to run
 make_check=no
 

From 0d822cebd283b85fa70690f4f856e23cd08027af Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 14:49:45 +0100
Subject: [PATCH 0387/1686] pianobar: fix build

Close: #36316
---
 srcpkgs/pianobar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index 652db15ba46b..b7d991fef5a4 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
 make_build_args="V=1"
 hostmakedepends="pkg-config"
 makedepends="faad2-devel ffmpeg-devel gnutls-devel json-c-devel libao-devel
- libcurl-devel"
+ libcurl-devel libgcrypt-devel"
 short_desc="Free/open-source, console-based client for Pandora radio"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"

From 9233f5b696f2c21fb8e2041959f5a2402a6fae3e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 23 Mar 2022 14:33:28 +0100
Subject: [PATCH 0388/1686] netpbm: update to 10.97.06.

---
 srcpkgs/netpbm/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index db6f8708eb8d..d72721bd9eb3 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.97.05
+version=10.97.06
 revision=1
-_githash=9f95511f291ecc492e283932064857717678bb19
-_githash_guide=4571e910b4cc98268539768c98d9303dc052847b
+_githash=f336dfc59346a26a045f7e0df0ecba32d904c55e
+_githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79
 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="8d42d131931141d79848bf9320b63b8858c51651c0f1ebb2fc2da7e2bcd8c78d
- b782b5092a3da5fe804084f7e8eb2452e777dcbe73bc0f9634671eafe6a07392"
+checksum="9cd658ec9081b980a98fb44f02aa5289ba9ca17ad7e9a699627bf6f2a85c5612
+ 30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde"
 
 post_extract() {
 	cd $build_wrksrc

From c97bba169dd656892cb3eaa556c6cfa3c4c54d9f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 23 Mar 2022 14:35:23 +0100
Subject: [PATCH 0389/1686] tab: update to 9.1.

---
 srcpkgs/tab/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index 987ae0a0e9ec..b0e7720b1d23 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,15 +1,15 @@
 # Template file for 'tab'
 pkgname=tab
-version=9.0
+version=9.1
 revision=1
-wrksrc="tkatchev-tab-95a2e7a0d12d"
+wrksrc="tkatchev-tab-457574615bf4"
 checkdepends="python3"
 short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
 distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=1df7244af5db044fc4a6a38f2aa22e040246580bddd89bccb64d3967699d01d1
+checksum=ccc72e4c8a5f0d7786a8c4a4c8b8dd5599ad867c876605b2cacad7f32c30651a
 
 do_build() {
 	${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm

From 2e00ed66df28ee9aeab1a8b0a58e1f74636d67d3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 24 Mar 2022 15:52:34 +0100
Subject: [PATCH 0390/1686] parallel: update to 20220322.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index dd16940a024d..030875ae0ffd 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20220122
+version=20220322
 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=b8221a21412bca572ad8445b7981dfd625a3c6d48772cda468dfb5b886337e00
+checksum=df93ccf6a9f529ad2126b7042aef0486603e938c77b405939c41702d38a4e6d8
 
 pre_configure() {
 	# no html and pdf doc

From 976470a20d34847ed2960bb1688f5a4a9a8789d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 22 Mar 2022 09:28:37 +0100
Subject: [PATCH 0391/1686] doomretro: update to 4.4.10.

---
 srcpkgs/doomretro/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template
index 5367dc8680ce..aa3010c9a7db 100644
--- a/srcpkgs/doomretro/template
+++ b/srcpkgs/doomretro/template
@@ -1,6 +1,6 @@
 # Template file for 'doomretro'
 pkgname=doomretro
-version=4.4.9
+version=4.4.10
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ license="GPL-3.0-or-later"
 homepage="https://www.doomretro.com"
 changelog="https://raw.githubusercontent.com/bradharding/doomretro/master/releasenotes.md"
 distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz"
-checksum=02f2f3ec9d8d4db5ad1d00fcb5a5161113d3caa6dc108f14af8760535f00ce9e
+checksum=4f16113b576c6c76a1961b143437be67e149f1c24262f44dde0b81407c01e466

From bf182aaf9a5b98590e5b7ff7459bcf63b02b74af Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 17 Mar 2022 21:27:57 -0700
Subject: [PATCH 0392/1686] CLion: update to 2021.3.4.

---
 srcpkgs/CLion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CLion/template b/srcpkgs/CLion/template
index 7bcdc3545a25..65e76c206e6c 100644
--- a/srcpkgs/CLion/template
+++ b/srcpkgs/CLion/template
@@ -1,6 +1,6 @@
 # Template file for 'CLion'
 pkgname=CLion
-version=2021.3.3
+version=2021.3.4
 revision=1
 archs="x86_64 aarch64"
 wrksrc="clion-${version}"
@@ -10,7 +10,7 @@ maintainer="Anton Afanasyev <anton@doubleasoftware.com>"
 license="custom:Commercial"
 homepage="https://www.jetbrains.com/clion"
 distfiles="https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"
-checksum=35986be8adfe0a291a0d2d550c1bf4861ae6c33ecbc71198a472e0ac01a0f10d
+checksum=f3b0b9e0dd0cd4aebef5d424e7a22868c732daad47d6c94f73630cef449ccf78
 repository=nonfree
 restricted=yes
 nopie=yes

From 2ef31401be271cd94b9c7db1d20b688a2f16ab35 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 17 Mar 2022 21:28:52 -0700
Subject: [PATCH 0393/1686] intellij-idea-ultimate-edition: update to 2021.3.3.

---
 srcpkgs/intellij-idea-ultimate-edition/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intellij-idea-ultimate-edition/template b/srcpkgs/intellij-idea-ultimate-edition/template
index 3340f9c0f0f2..92ad9135f3a9 100644
--- a/srcpkgs/intellij-idea-ultimate-edition/template
+++ b/srcpkgs/intellij-idea-ultimate-edition/template
@@ -1,6 +1,6 @@
 # Template file for 'intellij-idea-ultimate-edition'
 pkgname=intellij-idea-ultimate-edition
-version=2021.3.2
+version=2021.3.3
 revision=1
 archs="i686 x86_64"
 create_wrksrc="true"
@@ -11,7 +11,7 @@ license="custom:Commercial"
 homepage="https://www.jetbrains.com/idea"
 _filename="ideaIU-${version}-no-jbr.tar.gz"
 distfiles="https://download.jetbrains.com/idea/${_filename}"
-checksum=face5d154a2c9244b278bfc6dca37218ae3344090526a0679086eff9b0c56670
+checksum=2a3295fca08060ad515f6c7198879d09963724cfb36af3ea94f16dcd76636470
 repository=nonfree
 restricted=yes
 nopie=yes

From ae38670ae9ba3bf668d71da906d5fb75044ed3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 19 Mar 2022 22:50:25 +0100
Subject: [PATCH 0394/1686] New package: rootlesskit-0.14.6

---
 srcpkgs/rootlesskit/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/rootlesskit/template

diff --git a/srcpkgs/rootlesskit/template b/srcpkgs/rootlesskit/template
new file mode 100644
index 000000000000..15fbeba58f75
--- /dev/null
+++ b/srcpkgs/rootlesskit/template
@@ -0,0 +1,14 @@
+# Template file for 'rootlesskit'
+pkgname=rootlesskit
+version=0.14.6
+revision=1
+build_style=go
+go_import_path="github.com/rootless-containers/rootlesskit"
+go_package="${go_import_path}/cmd/rootlesskit ${go_import_path}/cmd/rootlessctl
+ ${go_import_path}/cmd/rootlesskit-docker-proxy"
+short_desc="Linux-native \"fake root\" for implementing rootless containers"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="Apache-2.0"
+homepage="https://github.com/rootless-containers/rootlesskit"
+distfiles="https://github.com/rootless-containers/rootlesskit/archive/v${version}.tar.gz"
+checksum=e27e4249f12cca44fc6e15a27f214f30fcb5f15646c813a90b6788bd9f0cfd4b

From c598b24e9bd9ce92628f13049fa08a5378812b55 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 18 Mar 2022 20:41:30 +0400
Subject: [PATCH 0395/1686] calibre: update to 5.39.0.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index af47d8993ee0..9f59df3a0350 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.38.0
+version=5.39.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=82b46b2c9d0ba2c82d95940e285b1fa168d55998613d216fa6d60da7d68fc550
+checksum=2fbe45ec9d4dea481772cc290e27567efdba60cd9d2fe736713d9b1eb020582e
 python_version=3
 lib32disabled=yes
 nocross=yes

From 5bf24c06a49e78025b34cf860bd35ae12d63c8da Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 24 Mar 2022 21:42:57 +0100
Subject: [PATCH 0396/1686] Amass: fix build

---
 srcpkgs/Amass/template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index c11b52a04657..ea6584b868d1 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -10,7 +10,3 @@ 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=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb
-
-post_install() {
-	rm ${DESTDIR}/usr/bin/examples
-}

From 10e9529f675ecd4af796f45b8f72cebe3f20111f Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 15:02:10 -0700
Subject: [PATCH 0397/1686] libadwaita: update to 1.1.0

---
 srcpkgs/libadwaita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 37abdc5a2e5e..aef0032bfb7c 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
 # Template file for 'libadwaita'
 pkgname=libadwaita
-version=1.0.2
+version=1.1.0
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
 distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=79e56011f5532fba6cb02531249d2bcfb8a6c42495c7a7de92f8819661fea091
+checksum=aff598803e810cc28266472cf5bf65e5ed5b90bb3523e206b06b14527325010e
 
 build_options="gir gtk_doc"
 build_options_default="gir gtk_doc"

From 3a3e7733450f41dc670ccd01829779686bebca92 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 13:48:28 +0100
Subject: [PATCH 0398/1686] New package: budgie-control-center-1.0.1

---
 srcpkgs/budgie-control-center-devel    |  1 +
 srcpkgs/budgie-control-center/template | 30 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/budgie-control-center-devel
 create mode 100644 srcpkgs/budgie-control-center/template

diff --git a/srcpkgs/budgie-control-center-devel b/srcpkgs/budgie-control-center-devel
new file mode 120000
index 000000000000..ff5de5ddf18f
--- /dev/null
+++ b/srcpkgs/budgie-control-center-devel
@@ -0,0 +1 @@
+budgie-control-center
\ No newline at end of file
diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template
new file mode 100644
index 000000000000..15d7ee0dca87
--- /dev/null
+++ b/srcpkgs/budgie-control-center/template
@@ -0,0 +1,30 @@
+# Template file for 'budgie-control-center'
+pkgname=budgie-control-center
+version=1.0.1
+revision=1
+build_style=meson
+hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config
+ polkit python3 libxml2"
+makedepends="ModemManager-devel NetworkManager-devel accountsservice-devel
+ colord-devel colord-gtk-devel gnome-bluetooth-devel gnome-desktop-devel
+ gnome-online-accounts-devel gnome-settings-daemon-devel ibus-devel
+ libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel libnma-devel
+ polkit-devel pulseaudio-devel samba-devel upower-devel libxml2-devel
+ libX11-devel libXi-devel libepoxy-devel gdk-pixbuf-devel gtk+3-devel
+ libglib-devel cups-devel libgudev-devel libwacom-devel libsecret-devel
+ udisks2-devel gsound-devel libsoup-devel gcr-devel cheese-devel"
+depends="desktop-file-utils upower colord cups-pk-helper cracklib iso-codes
+ gsettings-desktop-schemas hicolor-icon-theme sound-theme-freedesktop"
+short_desc="Budgie Control Center"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/BuddiesOfBudgie/budgie-control-center"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-control-center/releases/download/v${version}/budgie-control-center-${version}.tar.xz"
+checksum=6c049d02600f6650238b4376a7eac77d8fcd786e9c603c4e4ec87cad0022028a
+
+budgie-control-center-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/pkgconfig
+	}
+}

From 49ad82f68d23ecb2547257856cb31e12711fd5f9 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 14:04:46 +0100
Subject: [PATCH 0399/1686] New package: budgie-desktop-view-1.2

---
 srcpkgs/budgie-desktop-view/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/budgie-desktop-view/template

diff --git a/srcpkgs/budgie-desktop-view/template b/srcpkgs/budgie-desktop-view/template
new file mode 100644
index 000000000000..57ec2a5790ad
--- /dev/null
+++ b/srcpkgs/budgie-desktop-view/template
@@ -0,0 +1,13 @@
+# Template file for 'budgie-desktop-view'
+pkgname=budgie-desktop-view
+version=1.2
+revision=1
+build_style=meson
+hostmakedepends="pkg-config intltool vala glib-devel"
+makedepends="libglib-devel gtk+3-devel vala-devel"
+short_desc="Budgie desktop icons application"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://github.com/BuddiesOfBudgie/budgie-desktop-view"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop-view/releases/download/v${version}/budgie-desktop-view-v${version}.tar.xz"
+checksum=8399fae4326e5a21dda889bd89cb16ed8201f2854dc5cbc12394b90420d4cf2e

From 01bcd3ee036ac7eb8b200a55c53ff2a29f84e735 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 01:27:41 +0100
Subject: [PATCH 0400/1686] budgie-screensaver: update to 5.0.

---
 srcpkgs/budgie-screensaver/patches/musl.patch | 12 ++++++++++++
 srcpkgs/budgie-screensaver/template           | 17 ++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/budgie-screensaver/patches/musl.patch

diff --git a/srcpkgs/budgie-screensaver/patches/musl.patch b/srcpkgs/budgie-screensaver/patches/musl.patch
new file mode 100644
index 000000000000..6f5c265f83ae
--- /dev/null
+++ b/srcpkgs/budgie-screensaver/patches/musl.patch
@@ -0,0 +1,12 @@
+diff --git a/src/subprocs.c b/src/subprocs.c
+index a378658..ba37650 100644
+--- a/src/subprocs.c
++++ b/src/subprocs.c
+@@ -36,6 +36,7 @@
+ # define fork  vfork
+ #endif /* VMS */
+ 
++#define _POSIX_SOURCE
+ #include <signal.h>		/* for the signal names */
+ 
+ #include <glib.h>
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index 971ebcdb4c28..b877543d33a0 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,14 +1,13 @@
 # Template file for 'budgie-screensaver'
 pkgname=budgie-screensaver
-version=4.0
-revision=2
-wrksrc=budgie-screensaver-v${version}
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool glib"
+version=5.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config intltool glib-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>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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
+homepage="https://github.com/BuddiesOfBudgie/budgie-screensaver"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-screensaver/releases/download/v${version}/budgie-screensaver-v${version}.tar.xz"
+checksum=611969a9f53e5d3148cad7445e95c94bfff6ea61c2f339969ecb5d9b51f6b871

From 74f37e84207e4eb09cc81f417563b73d785f35dc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 20 Mar 2022 01:27:36 +0100
Subject: [PATCH 0401/1686] budgie-desktop: update to 10.6.

---
 srcpkgs/budgie-desktop/template | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index 6d7dc6d139be..a65c395c994b 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,9 +1,7 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
-version=10.5.3
-revision=2
-create_wrksrc=yes
-build_wrksrc="$pkgname-$version"
+version=10.6
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dwith-gtk-doc=false"
@@ -13,20 +11,14 @@ 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 budgie-screensaver"
+depends="gnome-session gnome-settings-daemon budgie-control-center elogind
+ gnome-themes-extra budgie-screensaver budgie-desktop-view"
 short_desc="Modern desktop environment from the Solus Project"
-maintainer="Lorem <notloremipsum@protonmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 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
- ${homepage}/commit/7a2835f2fa247e7201bb9e4a434bade8f4bfe86e.patch>mutter41.patch"
-checksum="878f4e6460c29740bf633c3b11ba97bcb788068c1460f82569938af2f1633b25
- 65430e84e33b1529aebae169ad8e0392abf1b5c4bb1b454d46f17dc37469d763"
-
-post_patch() {
-	patch -Np1 < ../mutter41.patch
-}
+homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
+distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
+checksum=ba297a10b547e6d7bf164406750b5c5dae98a7524978b30b4ad3cba9624def9e
 
 budgie-desktop-devel_package() {
 	short_desc+=" - development files"

From 3de95a703fc295d70f7314f8e8c0084538089f35 Mon Sep 17 00:00:00 2001
From: Barbaross <cullenrss@gmail.com>
Date: Thu, 17 Mar 2022 07:31:50 -0400
Subject: [PATCH 0402/1686] herbstluftwm: update to 0.9.4

---
 srcpkgs/herbstluftwm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template
index d4927fc80eac..9b284845113a 100644
--- a/srcpkgs/herbstluftwm/template
+++ b/srcpkgs/herbstluftwm/template
@@ -1,19 +1,19 @@
 # Template file for 'herbstluftwm'
 pkgname=herbstluftwm
-version=0.9.3
+version=0.9.4
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config asciidoc"
 makedepends="libXrandr-devel libXinerama-devel libglib-devel libXft-devel
-	libXrender-devel freetype-devel"
+ libXrender-devel freetype-devel libXfixes-devel"
 conf_files="/etc/xdg/${pkgname}/autostart"
 short_desc="Manual tiling window manager for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Cullen Ross <cullenrss@gmail.com>"
 license="BSD-2-Clause"
 homepage="https://herbstluftwm.org"
 changelog="https://raw.githubusercontent.com/herbstluftwm/herbstluftwm/master/NEWS"
 distfiles="https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"
-checksum=0ba7b1bd02966e6eefe27805753082406a2d2954bc41fe040d1ccaaed25ec105
+checksum=eef8eed076af33af2a75911c0fb1215fdb3427606a034ea8b44fe76872cb03cc
 
 post_install() {
 	vlicense LICENSE

From 56065c9b9c7890b23f0b2049bbd9cbc60fc71b73 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Fri, 25 Mar 2022 00:26:43 +0100
Subject: [PATCH 0403/1686] thermald: update to 2.4.9.

---
 srcpkgs/thermald/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thermald/template b/srcpkgs/thermald/template
index 8a3625e5c194..633a5a498121 100644
--- a/srcpkgs/thermald/template
+++ b/srcpkgs/thermald/template
@@ -1,6 +1,6 @@
 # Template file for 'thermald'
 pkgname=thermald
-version=2.4.8
+version=2.4.9
 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=3e5a5033339c021de41ed4f946dd39e13f79f722fb5bd98d798e83658184c39b
+checksum=fb793a2bfaae2e544ef62801075419587b0c045041c69eeafbf61959cce07fdb
 conf_files='/etc/thermald/*'
 
 if [ "$CROSS_BUILD" ]; then

From 1e8e2d970f7ad049c2d7f545b8aec32fe51cda39 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 25 Mar 2022 15:01:20 +0100
Subject: [PATCH 0404/1686] kore: update to 4.2.1.

---
 srcpkgs/kore/patches/platform.patch | 11 -----------
 srcpkgs/kore/template               |  8 +++++---
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/kore/patches/platform.patch

diff --git a/srcpkgs/kore/patches/platform.patch b/srcpkgs/kore/patches/platform.patch
deleted file mode 100644
index cbacde0591b1..000000000000
--- a/srcpkgs/kore/patches/platform.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/misc/linux-platform.sh	2020-09-02 14:26:51.393112635 +0200
-+++ b/misc/linux-platform.sh	2020-09-02 14:28:26.281114976 +0200
-@@ -2,7 +2,7 @@
- #
- # Linux specific defines and system call maps.
- 
--PLATFORM=$(uname -m)
-+PLATFORM=${XBPS_TARGET_MACHINE}
- BASE=$(dirname $0)
- 
- case "$PLATFORM" in
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index 6c6e2d1378c2..52b7dbe718a2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,7 +1,7 @@
 # Template file for 'kore'
 pkgname=kore
-version=4.1.0
-revision=2
+version=4.2.1
+revision=1
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
 build_style=gnu-makefile
@@ -14,9 +14,11 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"
 homepage="https://kore.io"
 distfiles="https://kore.io/releases/kore-${version}.tar.gz"
-checksum=b7d73b005fde0ea01c356a54e4bbd8a209a4dff9cf315802a127ce7267efbe61
+checksum=f76b108a4eefa27c89123f5d6a36b493b171e429be7a85d3dd1466ac87e7f15a
 disable_parallel_build=yes
 
+export TARGET_PLATFORM=${XBPS_TARGET_MACHINE}
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi

From 2041c184ddab4947c0ac57c8f2b6aa45dd0a64ca Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 25 Mar 2022 09:04:13 -0500
Subject: [PATCH 0405/1686] Amass: update to 3.18.3.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index ea6584b868d1..a33e92ce1d2c 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.18.2
+version=3.18.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=67c21e19d1e6cc9fccb2a1ea3ffab75c9198693fc46ff5d7b63fcbe60a4cd4bb
+checksum=66eee8ffd300e67a540e9962d2526377677df04b1a3b436471e0a930dd422a9f

From 91ed36133206788ced2e97aebfd9980a542cce09 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 23 Mar 2022 22:26:51 -0500
Subject: [PATCH 0406/1686] nvidia: update to 510.60.02.

---
 srcpkgs/nvidia/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template
index 43a6ba6821f0..3707accdab6e 100644
--- a/srcpkgs/nvidia/template
+++ b/srcpkgs/nvidia/template
@@ -3,7 +3,7 @@
 _desc="NVIDIA drivers for linux"
 
 pkgname=nvidia
-version=510.47.03
+version=510.60.02
 revision=1
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="custom:NVIDIA Proprietary"
@@ -19,7 +19,7 @@ conflicts="xserver-abi-video>25_1"
 
 _pkg="NVIDIA-Linux-x86_64-${version}"
 distfiles="http://uk.download.nvidia.com/XFree86/Linux-x86_64/${version}/${_pkg}.run"
-checksum=f2a421dae836318d3c0d96459ccb3af27e90e50c95b0faa4288af76279e5d690
+checksum=a800dfc0549078fd8c6e8e6780efb8eee87872e6055c7f5f386a4768ce07e003
 # 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 d51e9174b031598da984e04014ed0af989d26fec Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 25 Mar 2022 15:10:32 +0100
Subject: [PATCH 0407/1686] linux5.4: update to 5.4.187.

---
 srcpkgs/linux5.4/files/arm64-dotconfig | 3 ++-
 srcpkgs/linux5.4/template              | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux5.4/files/arm64-dotconfig b/srcpkgs/linux5.4/files/arm64-dotconfig
index a6dd16191de4..2b70d687ce1a 100644
--- a/srcpkgs/linux5.4/files/arm64-dotconfig
+++ b/srcpkgs/linux5.4/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.180 Kernel Configuration
+# Linux/arm64 5.4.187 Kernel Configuration
 #
 
 #
@@ -394,6 +394,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ARM64_SW_TTBR0_PAN is not set
 CONFIG_ARM64_TAGGED_ADDR_ABI=y
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 771796079797..46c8f5c5c751 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.185
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=d15fe9da679bfb624f35f127a17559f6d037ad37a313cf5fd22ce155401f3787
+checksum=189e3db3f2af8578037f9c8b4710e1002bdd56f318c5f8589b40de889be9a7b8
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 4e16c16c91c2a866f4e34512b0c9f11a97704926 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 25 Mar 2022 15:15:24 +0100
Subject: [PATCH 0408/1686] linux4.19: update to 4.19.236.

---
 srcpkgs/linux4.19/files/arm64-dotconfig | 3 ++-
 srcpkgs/linux4.19/template              | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/linux4.19/files/arm64-dotconfig b/srcpkgs/linux4.19/files/arm64-dotconfig
index a2bf3cb34ad9..8268b16af7fc 100644
--- a/srcpkgs/linux4.19/files/arm64-dotconfig
+++ b/srcpkgs/linux4.19/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.19.230 Kernel Configuration
+# Linux/arm64 4.19.236 Kernel Configuration
 #
 
 #
@@ -449,6 +449,7 @@ CONFIG_UNMAP_KERNEL_AT_EL0=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDEN_EL2_VECTORS=y
 CONFIG_ARM64_SSBD=y
+CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y
 # CONFIG_ARMV8_DEPRECATED is not set
 CONFIG_ARM64_SW_TTBR0_PAN=y
 
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 840a4516d83e..f2fb29a3cf0c 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.235
+version=4.19.236
 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=530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598
+checksum=002ef6adcafe8d90571f8882280a9bef28d1aa7cc9a3f35a50afc4cb2ebe31c0
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 37111e9c7989e5cfd2c9e11859f7eea44d43872d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 25 Mar 2022 10:42:45 -0500
Subject: [PATCH 0409/1686] python3-youtubesearch: update to 1.6.3.

---
 srcpkgs/python3-youtubesearch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 2e1c6fc13226..3d88fc1126aa 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
-version=1.6.2
+version=1.6.3
 revision=1
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/alexmercerind/youtube-search-python"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=d3d4081c319e839f8843f8e361c0b461d420fcd4d7aa4fcbdadf744af8208a8e
+checksum=bdb34757c5e390c4d20989d04317acbceffa94293693cbeecb493b079440dbd3
 make_check=no # no tests defined
 
 post_install() {

From bce8fbbe9f3f5a60da6dc41f1f66ae336b261955 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 25 Mar 2022 20:09:54 +0100
Subject: [PATCH 0410/1686] grml-rescueboot: update to 0.5.2.

---
 srcpkgs/grml-rescueboot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/grml-rescueboot/template b/srcpkgs/grml-rescueboot/template
index dd08b8fa0402..41eb267a7806 100644
--- a/srcpkgs/grml-rescueboot/template
+++ b/srcpkgs/grml-rescueboot/template
@@ -1,6 +1,6 @@
 # Template file for 'grml-rescueboot'
 pkgname=grml-rescueboot
-version=0.5.1
+version=0.5.2
 revision=1
 archs="i686 x86_64"
 build_style="gnu-makefile"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="http://wiki.grml.org/doku.php?id=rescueboot"
 distfiles="https://github.com/grml/${pkgname}/archive/v${version}.tar.gz"
-checksum=03a2196f3b8cac67d16ba7a87e2a1a57d435a75712492a15ab98a2cd34543098
+checksum=14d37a44c7ef9b0d73cf4e3d3e2698e4a3683e719e02203ff69472b282582f9d
 
 do_build() {
 	:

From 30058265e7dd30ae71222a0e3f3ef04c1afca5ad Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:16:55 -0400
Subject: [PATCH 0411/1686] python3: update to 3.10.4.

---
 srcpkgs/python3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index df408f9ed74d..ed15b88359ff 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.10.3
+version=3.10.4
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -22,7 +22,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=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
+checksum=80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19
 
 alternatives="
  python:idle:/usr/bin/idle${version%.*}

From f6846388acb33188153d42d6cd542487db136d52 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:18:20 -0400
Subject: [PATCH 0412/1686] python3-tkinter: update to 3.10.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 bfe219597ff5..4aa0a732d032 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -8,7 +8,7 @@
 _desc="Python programming language"
 
 pkgname=python3-tkinter
-version=3.10.3
+version=3.10.4
 revision=1
 wrksrc="Python-${version}"
 build_style="gnu-configure"
@@ -29,7 +29,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=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc
+checksum=80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3"

From 40f012be82ad97fc064d6b3fa19e02100290eb28 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:18:42 -0400
Subject: [PATCH 0413/1686] python3-pytools: update to 2022.1.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 3280c48dfb07..1cbf56dc08dd 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.1
+version=2022.1.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=3eebcc11923bf36fc42a9102d6e417a94817efb1aeb24d3149686dd5e3ec54d4
+checksum=5e824101880a246354756365880a65bb416f6a8cab6513b68fcbb48fba090fcb
 
 post_install() {
 	vlicense LICENSE

From 0ddd7d04a6f542c40eae65824487edfed36246e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:18:57 -0400
Subject: [PATCH 0414/1686] python3-pytz: update to 2022.1.

---
 srcpkgs/python3-pytz/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pytz/template b/srcpkgs/python3-pytz/template
index 7bddbf1ddfd3..9f9136df52fb 100644
--- a/srcpkgs/python3-pytz/template
+++ b/srcpkgs/python3-pytz/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pytz'
 pkgname=python3-pytz
-version=2021.3
-revision=2
+version=2022.1
+revision=1
 wrksrc="pytz-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://pythonhosted.org/pytz/"
 distfiles="${PYPI_SITE}/p/pytz/pytz-${version}.tar.gz"
-checksum=acad2d8b20a1af07d4e4c9d2e9285c5ed9104354062f275f3fcd88dcef4f1326
+checksum=1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7
 
 post_install() {
 	# use system tz database

From 65d68d9584a00eda771a8ab75bcbca805a59df80 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 25 Mar 2022 15:19:10 -0400
Subject: [PATCH 0415/1686] python3-setuptools-rust: update to 1.2.0.

---
 srcpkgs/python3-setuptools-rust/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-setuptools-rust/template b/srcpkgs/python3-setuptools-rust/template
index 9cd1c497793f..c2a506773cae 100644
--- a/srcpkgs/python3-setuptools-rust/template
+++ b/srcpkgs/python3-setuptools-rust/template
@@ -1,19 +1,18 @@
 # Template file for 'python3-setuptools-rust'
 pkgname=python3-setuptools-rust
-version=1.1.2
+version=1.2.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3-semanticversion python3-tomli
- python3-setuptools python3-typing_extensions"
+depends="python3-semanticversion python3-setuptools python3-typing_extensions"
 short_desc="Setuptools plugin for Rust support"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
 homepage="https://github.com/PyO3/setuptools-rust"
 changelog="https://raw.githubusercontent.com/PyO3/setuptools-rust/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/s/setuptools-rust/setuptools-rust-${version}.tar.gz"
-checksum=a0adb9b503c0ffc4e8fe80b7c617898cefa78049983aaaea7f747e153a3e65d1
+checksum=0a4ada479e8c7e3d8bd7cb56e1a29acc2b2bb98c2325051b0cdcb57d7f056de8
 # Tests have unpackaged dependencies
 make_check=no
 

From c13f66093cefe5b270c8cd2b0015c65740b3846d Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Fri, 25 Mar 2022 09:56:17 -0500
Subject: [PATCH 0416/1686] zfs: update to 2.1.4.

---
 srcpkgs/zfs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 477c39614cd0..6c7b69345fd3 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
 # Template file for 'zfs'
 pkgname=zfs
-version=2.1.3
+version=2.1.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,7 +15,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="CDDL-1.0"
 homepage="https://openzfs.github.io/openzfs-docs/"
 distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd
+checksum=3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6
 # dkms must be before initramfs-regenerate to build modules before images
 triggers="dkms initramfs-regenerate"
 dkms_modules="zfs ${version}"

From c91e77151247cdd4b4960452384fbc7d95567528 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 24 Mar 2022 15:08:23 -0700
Subject: [PATCH 0417/1686] libhandy1: update to 1.6.1

---
 srcpkgs/libhandy1/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index 95803645bb70..fbbe35856b2f 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,6 +1,6 @@
 # Template file for 'libhandy1'
 pkgname=libhandy1
-version=1.5.0
+version=1.6.1
 revision=1
 wrksrc="libhandy-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 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 gtk_doc gtk-doc) $(vopt_if gir vala-devel)"
+hostmakedepends="glib-devel pkg-config gettext $(vopt_if gtk_doc gi-docgen) $(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"
@@ -17,15 +17,11 @@ 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=466b9e026c1f9eb3b65966f530d97703a8212daaf911748c145e9cb843dbd6fe
+checksum=6eab0384404d56bd1b1fa059d9a081177778f6ae080ffc2120f28656ca7462a4
 
 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
+build_options_default="gir glade gtk_doc"
 
 do_check() {
 	xvfb-run ninja -C build test
@@ -47,7 +43,7 @@ libhandy1-devel_package() {
 			vmove usr/share/vala
 		fi
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 	}
 }

From 985455ea9eb94d35a99ce3b12a9315addbafdc0c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Mar 2022 17:14:32 +0100
Subject: [PATCH 0418/1686] mutter: update to 41.5.

---
 srcpkgs/mutter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template
index 5efabfea13b1..e3f7f7bf1ca8 100644
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@@ -1,6 +1,6 @@
 # Template file for 'mutter'
 pkgname=mutter
-version=41.4
+version=41.5
 revision=1
 build_helper="gir"
 build_style=meson
@@ -20,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/Mutter/"
 changelog="https://gitlab.gnome.org/GNOME/mutter/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55882695064aa6f0385cd1f7f7fab2c2a2ed2c9aec78f578faa07f5209ca529c
+checksum=2233e52528451620be8578ea1dc7ff30d7eb6701eb316e9d17c219df57a08ea7
 shlib_provides="libmutter-clutter-9.so libmutter-cogl-9.so
  libmutter-cogl-pango-9.so"
 make_check=no # needs a full graphical session

From ed5d7c04377869fbcfe7e73ae66cc83dc1338a12 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 23 Mar 2022 17:13:34 +0100
Subject: [PATCH 0419/1686] gnome-shell: update to 41.5.

* restore optional build dependencies

They were removed with GNOME 41, but are required for recorder and
bluetooth indicator

Closes #36291
---
 srcpkgs/gnome-shell/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template
index 9cca8add22c7..ff60caafa4ec 100644
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
-version=41.4
+version=41.5
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,7 +10,8 @@ hostmakedepends="gobject-introspection libxslt pkg-config python3 sassc
 makedepends="gnome-control-center-devel at-spi2-atk-devel
  evolution-data-server-devel mutter-devel gsettings-desktop-schemas-devel
  polkit-devel startup-notification-devel ibus-devel gnome-desktop-devel
- NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel"
+ NetworkManager-devel pulseaudio-devel gtk4-devel gnome-autoar-devel gjs-devel
+ gnome-bluetooth-devel pipewire-devel gstreamer1-devel"
 depends="elogind gnome-control-center gsettings-desktop-schemas upower"
 checkdepends="xvfb-run mesa-dri $depends"
 short_desc="GNOME core user interface"
@@ -19,7 +20,7 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeShell"
 changelog="https://gitlab.gnome.org/GNOME/gnome-shell/-/raw/gnome-41/NEWS"
 distfiles="${GNOME_SITE}/gnome-shell/${version%.*}/gnome-shell-${version}.tar.xz"
-checksum=c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4
+checksum=efbe8d1179983d5c2e68b1035f073fefe01b15fbdaf68f48adff96fa355b0bc5
 
 do_check() {
 	mkdir /tmp/gnome-shell-xdg

From d44cb87a43b9f03630f02f4ed5a93dbaff6ca2a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:17:29 +0100
Subject: [PATCH 0420/1686] gnome-nibbles: fix build with recent vala

---
 srcpkgs/gnome-nibbles/patches/vala.patch | 178 +++++++++++++++++++++++
 1 file changed, 178 insertions(+)
 create mode 100644 srcpkgs/gnome-nibbles/patches/vala.patch

diff --git a/srcpkgs/gnome-nibbles/patches/vala.patch b/srcpkgs/gnome-nibbles/patches/vala.patch
new file mode 100644
index 000000000000..48c565303196
--- /dev/null
+++ b/srcpkgs/gnome-nibbles/patches/vala.patch
@@ -0,0 +1,178 @@
+From 62964e9256fcac616109af874dbb2bd8342a9853 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Wed, 17 Mar 2021 11:25:05 +0100
+Subject: [PATCH] Reference of [GtkChild] fields is handled by GtkBuilder, type
+ must be unowned
+
+---
+ src/controls.vala           | 20 ++++++++++----------
+ src/nibbles-window.vala     | 26 +++++++++++++-------------
+ src/players.vala            |  6 +++---
+ src/preferences-dialog.vala | 30 +++++++++++++++---------------
+ src/scoreboard.vala         |  6 +++---
+ 5 files changed, 44 insertions(+), 44 deletions(-)
+
+diff --git a/src/controls.vala b/src/controls.vala
+index 584c9ff..f95d210 100644
+--- a/src/controls.vala
++++ b/src/controls.vala
+@@ -22,7 +22,7 @@ using Gtk;
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls.ui")]
+ private class Controls : Box
+ {
+-    [GtkChild] private Box grids_box;
++    [GtkChild] private unowned Box grids_box;
+     private Gee.LinkedList<ControlsGrid> grids = new Gee.LinkedList<ControlsGrid> ();
+ 
+     private Gdk.Pixbuf arrow_pixbuf;
+@@ -100,15 +100,15 @@ private class Controls : Box
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/controls-grid.ui")]
+ private class ControlsGrid : Button
+ {
+-    [GtkChild] private Label name_label;
+-    [GtkChild] private Image arrow_up;
+-    [GtkChild] private Image arrow_down;
+-    [GtkChild] private Image arrow_left;
+-    [GtkChild] private Image arrow_right;
+-    [GtkChild] private Label move_up_label;
+-    [GtkChild] private Label move_down_label;
+-    [GtkChild] private Label move_left_label;
+-    [GtkChild] private Label move_right_label;
++    [GtkChild] private unowned Label name_label;
++    [GtkChild] private unowned Image arrow_up;
++    [GtkChild] private unowned Image arrow_down;
++    [GtkChild] private unowned Image arrow_left;
++    [GtkChild] private unowned Image arrow_right;
++    [GtkChild] private unowned Label move_up_label;
++    [GtkChild] private unowned Label move_down_label;
++    [GtkChild] private unowned Label move_left_label;
++    [GtkChild] private unowned Label move_right_label;
+ 
+     internal WormProperties worm_props;
+     internal ulong external_handler;
+diff --git a/src/nibbles-window.vala b/src/nibbles-window.vala
+index 6961326..6bfb74a 100644
+--- a/src/nibbles-window.vala
++++ b/src/nibbles-window.vala
+@@ -40,30 +40,30 @@ private class NibblesWindow : ApplicationWindow
+     private int window_height;
+ 
+     /* Main widgets */
+-    [GtkChild] private Stack main_stack;
+-    [GtkChild] private Overlay overlay;
++    [GtkChild] private unowned Stack main_stack;
++    [GtkChild] private unowned Overlay overlay;
+ 
+     /* HeaderBar */
+-    [GtkChild] private HeaderBar headerbar;
+-    [GtkChild] private MenuButton hamburger_menu;
+-    [GtkChild] private Button new_game_button;
+-    [GtkChild] private Button pause_button;
++    [GtkChild] private unowned HeaderBar headerbar;
++    [GtkChild] private unowned MenuButton hamburger_menu;
++    [GtkChild] private unowned Button new_game_button;
++    [GtkChild] private unowned Button pause_button;
+ 
+     /* Pre-game screen widgets */
+-    [GtkChild] private Players players;
+-    [GtkChild] private Speed speed;
+-    [GtkChild] private Controls controls;
++    [GtkChild] private unowned Players players;
++    [GtkChild] private unowned Speed speed;
++    [GtkChild] private unowned Controls controls;
+ 
+     /* Statusbar widgets */
+-    [GtkChild] private Stack statusbar_stack;
+-    [GtkChild] private Label countdown;
+-    [GtkChild] private Scoreboard scoreboard;
++    [GtkChild] private unowned Stack statusbar_stack;
++    [GtkChild] private unowned Label countdown;
++    [GtkChild] private unowned Scoreboard scoreboard;
+     private Gdk.Pixbuf scoreboard_life;
+ 
+     /* Rendering of the game */
+     private NibblesView? view;
+ 
+-    [GtkChild] private Box game_box;
++    [GtkChild] private unowned Box game_box;
+     private Games.GridFrame frame;
+ 
+     /* Game being played */
+diff --git a/src/players.vala b/src/players.vala
+index 9198412..4bde18e 100644
+--- a/src/players.vala
++++ b/src/players.vala
+@@ -21,9 +21,9 @@ using Gtk;
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/players.ui")]
+ private class Players : Box
+ {
+-    [GtkChild] private ToggleButton worms4;
+-    [GtkChild] private ToggleButton worms5;
+-    [GtkChild] private ToggleButton worms6;
++    [GtkChild] private unowned ToggleButton worms4;
++    [GtkChild] private unowned ToggleButton worms5;
++    [GtkChild] private unowned ToggleButton worms6;
+ 
+     private SimpleAction nibbles_number_action;
+     private SimpleAction players_number_action;
+diff --git a/src/preferences-dialog.vala b/src/preferences-dialog.vala
+index 216a1e2..2d3a7bf 100644
+--- a/src/preferences-dialog.vala
++++ b/src/preferences-dialog.vala
+@@ -24,21 +24,21 @@ private class PreferencesDialog : Window
+     private GLib.Settings settings;
+     private Gee.ArrayList<GLib.Settings> worm_settings;
+ 
+-    [GtkChild] private Stack            stack;
+-    [GtkChild] private Stack            headerbar_stack;
+-    [GtkChild] private ComboBoxText     worm_combobox;
+-    [GtkChild] private Gtk.ListStore    list_store_1;
+-    [GtkChild] private Gtk.ListStore    list_store_2;
+-    [GtkChild] private Gtk.ListStore    list_store_3;
+-    [GtkChild] private Gtk.ListStore    list_store_4;
+-    [GtkChild] private TreeView         tree_view_1;
+-    [GtkChild] private TreeView         tree_view_2;
+-    [GtkChild] private TreeView         tree_view_3;
+-    [GtkChild] private TreeView         tree_view_4;
+-    [GtkChild] private ComboBoxText     combo_box_1;
+-    [GtkChild] private ComboBoxText     combo_box_2;
+-    [GtkChild] private ComboBoxText     combo_box_3;
+-    [GtkChild] private ComboBoxText     combo_box_4;
++    [GtkChild] private unowned Stack            stack;
++    [GtkChild] private unowned Stack            headerbar_stack;
++    [GtkChild] private unowned ComboBoxText     worm_combobox;
++    [GtkChild] private unowned Gtk.ListStore    list_store_1;
++    [GtkChild] private unowned Gtk.ListStore    list_store_2;
++    [GtkChild] private unowned Gtk.ListStore    list_store_3;
++    [GtkChild] private unowned Gtk.ListStore    list_store_4;
++    [GtkChild] private unowned TreeView         tree_view_1;
++    [GtkChild] private unowned TreeView         tree_view_2;
++    [GtkChild] private unowned TreeView         tree_view_3;
++    [GtkChild] private unowned TreeView         tree_view_4;
++    [GtkChild] private unowned ComboBoxText     combo_box_1;
++    [GtkChild] private unowned ComboBoxText     combo_box_2;
++    [GtkChild] private unowned ComboBoxText     combo_box_3;
++    [GtkChild] private unowned ComboBoxText     combo_box_4;
+ 
+     private Gee.ArrayList<Gtk.ListStore>    list_stores;
+     private Gee.ArrayList<TreeView>         tree_views;
+diff --git a/src/scoreboard.vala b/src/scoreboard.vala
+index a41aee1..aebc1cc 100644
+--- a/src/scoreboard.vala
++++ b/src/scoreboard.vala
+@@ -59,9 +59,9 @@ private class Scoreboard : Box
+ [GtkTemplate (ui = "/org/gnome/Nibbles/ui/player-score-box.ui")]
+ private class PlayerScoreBox : Box
+ {
+-    [GtkChild] private Label name_label;
+-    [GtkChild] private Label score_label;
+-    [GtkChild] private Grid lives_grid;
++    [GtkChild] private unowned Label name_label;
++    [GtkChild] private unowned Label score_label;
++    [GtkChild] private unowned Grid lives_grid;
+ 
+     private Gee.LinkedList<Image> life_images = new Gee.LinkedList<Image> ();
+ 
+-- 
+GitLab
+

From 5b844bdee6a594abf50ce0d32137b9e6b84a658a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 22:43:33 +0100
Subject: [PATCH 0421/1686] gnome-nibbles: fix build with recent vala (part2)

---
 srcpkgs/gnome-nibbles/patches/vala2.patch | 66 +++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 srcpkgs/gnome-nibbles/patches/vala2.patch

diff --git a/srcpkgs/gnome-nibbles/patches/vala2.patch b/srcpkgs/gnome-nibbles/patches/vala2.patch
new file mode 100644
index 000000000000..c7a86316925e
--- /dev/null
+++ b/srcpkgs/gnome-nibbles/patches/vala2.patch
@@ -0,0 +1,66 @@
+From 1b48446068608aff9b5edf1fdbd4b8c0d9f0be94 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 16 Jan 2021 13:56:10 +0100
+Subject: [PATCH] Don't alter or try to write [GtkChild] fields
+
+See https://gitlab.gnome.org/GNOME/vala/issues/1121
+---
+ src/controls.vala | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/src/controls.vala b/src/controls.vala
+index 4f07358..584c9ff 100644
+--- a/src/controls.vala
++++ b/src/controls.vala
+@@ -140,25 +140,25 @@ private class ControlsGrid : Button
+         arrow_left.set_from_pixbuf  (arrow.rotate_simple (Gdk.PixbufRotation.COUNTERCLOCKWISE));
+         arrow_right.set_from_pixbuf (arrow.rotate_simple (Gdk.PixbufRotation.CLOCKWISE));
+ 
+-           up_handler = worm_props.notify ["up"].connect    (() => configure_label (worm_props.up,    ref move_up_label));
+-         down_handler = worm_props.notify ["down"].connect  (() => configure_label (worm_props.down,  ref move_down_label));
+-         left_handler = worm_props.notify ["left"].connect  (() => configure_label (worm_props.left,  ref move_left_label));
+-        right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, ref move_right_label));
+-
+-        configure_label (worm_props.up,    ref move_up_label);
+-        configure_label (worm_props.down,  ref move_down_label);
+-        configure_label (worm_props.left,  ref move_left_label);
+-        configure_label (worm_props.right, ref move_right_label);
++           up_handler = worm_props.notify ["up"].connect    (() => configure_label (worm_props.up,    move_up_label));
++         down_handler = worm_props.notify ["down"].connect  (() => configure_label (worm_props.down,  move_down_label));
++         left_handler = worm_props.notify ["left"].connect  (() => configure_label (worm_props.left,  move_left_label));
++        right_handler = worm_props.notify ["right"].connect (() => configure_label (worm_props.right, move_right_label));
++
++        configure_label (worm_props.up,    move_up_label);
++        configure_label (worm_props.down,  move_down_label);
++        configure_label (worm_props.left,  move_left_label);
++        configure_label (worm_props.right, move_right_label);
+     }
+ 
+     internal void mark_duplicated_keys (GenericSet<uint> duplicate_keys)
+     {
+-        set_duplicate_class (worm_props.up    in duplicate_keys, ref move_up_label);
+-        set_duplicate_class (worm_props.down  in duplicate_keys, ref move_down_label);
+-        set_duplicate_class (worm_props.left  in duplicate_keys, ref move_left_label);
+-        set_duplicate_class (worm_props.right in duplicate_keys, ref move_right_label);
++        set_duplicate_class (worm_props.up    in duplicate_keys, move_up_label);
++        set_duplicate_class (worm_props.down  in duplicate_keys, move_down_label);
++        set_duplicate_class (worm_props.left  in duplicate_keys, move_left_label);
++        set_duplicate_class (worm_props.right in duplicate_keys, move_right_label);
+     }
+-    private static void set_duplicate_class (bool new_value, ref Label label)
++    private static void set_duplicate_class (bool new_value, Label label)
+     {
+         if (new_value)
+             label.get_style_context ().add_class ("duplicate");
+@@ -175,7 +175,7 @@ private class ControlsGrid : Button
+         worm_props.disconnect (color_handler);
+     }
+ 
+-    private static void configure_label (uint key_value, ref Label label)
++    private static void configure_label (uint key_value, Label label)
+     {
+         string? key_name = Gdk.keyval_name (key_value);
+         if (key_name == "Up")
+-- 
+GitLab
+

From 1d614d4af22d0ab5800085ed4c9c7ea5504af364 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 12:37:45 +0100
Subject: [PATCH 0422/1686] aisleriot: update to 3.22.21.

---
 srcpkgs/aisleriot/patches/guile-2.2.patch | 36 +++++++++++++++++++++++
 srcpkgs/aisleriot/template                |  4 +--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/aisleriot/patches/guile-2.2.patch

diff --git a/srcpkgs/aisleriot/patches/guile-2.2.patch b/srcpkgs/aisleriot/patches/guile-2.2.patch
new file mode 100644
index 000000000000..eb2ce5610b44
--- /dev/null
+++ b/srcpkgs/aisleriot/patches/guile-2.2.patch
@@ -0,0 +1,36 @@
+From 5e9b538db5304ccfed6c0d048a94d8c47dd27e31 Mon Sep 17 00:00:00 2001
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Thu, 17 Feb 2022 23:51:15 +0100
+Subject: [PATCH] games: Only use -Ono-letrectify with guile 3.0
+
+This fixes a build failure on guile 2.2 where this flag is unknown.
+
+Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/925
+---
+ games/meson.build | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/games/meson.build b/games/meson.build
+index e552beab..56819b4d 100644
+--- a/games/meson.build
++++ b/games/meson.build
+@@ -122,9 +122,13 @@ guile_warnings = [
+   '-W1',
+ ]
+ 
+-guile_flags = [
+-  '-Ono-letrectify',
+-]
++guile_flags = []
++
++if guile_version.version_compare('>= 3.0')
++  guile_flags += [
++    '-Ono-letrectify',
++  ]
++endif
+ 
+ # FIXME: this should use files('...') (allowed as per docs),
+ # but that crashes meson, see https://gitlab.gnome.org/chpe/meson/issues/2
+-- 
+GitLab
+
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index 6655dbb76606..d4d178b13c9e 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.20
+version=3.22.21
 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=e5f4d00156060a8ecf410ed5d4e485b0f19177c554009c2b0ea6ee6579af549a
+checksum=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655
 replaces="aisleriot-data>=0"

From 761d41c1a3700249a62d0c1661a5dc601f8ad3d8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 25 Mar 2022 11:15:28 -0400
Subject: [PATCH 0423/1686] dendrite: update to 0.7.0.

add MAX_OPEN_FILES variable with default set to value recommended by
upstream (65535).
---
 srcpkgs/dendrite/files/dendrite-monolith-server/run | 1 +
 srcpkgs/dendrite/template                           | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dendrite/files/dendrite-monolith-server/run b/srcpkgs/dendrite/files/dendrite-monolith-server/run
index 2fab17797c4d..66400fe89c54 100755
--- a/srcpkgs/dendrite/files/dendrite-monolith-server/run
+++ b/srcpkgs/dendrite/files/dendrite-monolith-server/run
@@ -1,5 +1,6 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
+ulimit -n ${MAX_OPEN_FILES:-65535}
 cd /var/lib/dendrite || exit 1
 exec 2>&1
 exec chpst -u _dendrite:_dendrite dendrite-monolith-server \
diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 7589a7944cec..1bef12b95642 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.6.5
+version=0.7.0
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=b74170bd3f81e2f22ff4673bc632e37afeef1121fa90acb03ed2eed17a387133
+checksum=26c378bff1738b0e8422c7bd425be4763f22225f422ae1854c78644e4ca8bc42
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"

From 7dcf3c80979da3c5ec21e495737e70568a64c227 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Fri, 25 Mar 2022 21:19:05 +0100
Subject: [PATCH 0424/1686] google-chrome: update to 99.0.4844.84

---
 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 e12c57deeb5c..e6a568ca685d 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.82
+version=99.0.4844.84
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=b9c181ddc15760795a7c30b950d90a8ef78487825fb12b1e171d1f71fe8a107e
+checksum=96f260f798f1adb471a3a5b8e68702ef88237884e32f0e43baf15a78aed5b669
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 5dcc16f257f115da7c83c3d98f601e07c0c3310f Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 22 Mar 2022 12:25:49 +0100
Subject: [PATCH 0425/1686] volta: update to 1.0.6

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index b8fc160cdda0..7874993281ec 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,6 +1,6 @@
 # Template file for 'volta'
 pkgname=volta
-version=1.0.5
+version=1.0.6
 revision=1
 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=8b3741376e639d0e2d2eec7a7b628ac1d70af7a2c459d9b01c05c4853f5680ae
+checksum=0f66edcb2639bee2c1668efd119c2937a77fbbe564c9d63827e8eaf37dbee4b9
 
 post_install() {
 	vlicense LICENSE

From 9b12b869b165a9a229d6e6ac50cbddfe09234520 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Mon, 21 Feb 2022 17:57:14 +0100
Subject: [PATCH 0426/1686] aerc: update to 0.9.0

---
 .../aerc/patches/makefile-only-install.patch  | 18 +++++++++++++++
 srcpkgs/aerc/template                         | 22 ++++++-------------
 2 files changed, 25 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/aerc/patches/makefile-only-install.patch

diff --git a/srcpkgs/aerc/patches/makefile-only-install.patch b/srcpkgs/aerc/patches/makefile-only-install.patch
new file mode 100644
index 000000000000..696832fe736c
--- /dev/null
+++ b/srcpkgs/aerc/patches/makefile-only-install.patch
@@ -0,0 +1,18 @@
+Build style handles building and installing aerc binary.
+Makefile should only install remaining files.
+
+--- ./Makefile
++++ ./Makefile
+@@ -82,11 +82,10 @@
+ clean:
+ 	$(RM) $(DOCS) aerc
+ 
+-install: $(DOCS) aerc
++install: $(DOCS)
+ 	mkdir -m755 -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5 $(DESTDIR)$(MANDIR)/man7 \
+ 		$(DESTDIR)$(SHAREDIR) $(DESTDIR)$(SHAREDIR)/filters $(DESTDIR)$(SHAREDIR)/templates $(DESTDIR)$(SHAREDIR)/stylesets \
+ 		$(DESTDIR)$(PREFIX)/share/applications
+-	install -m755 aerc $(DESTDIR)$(BINDIR)/aerc
+ 	install -m644 aerc.1 $(DESTDIR)$(MANDIR)/man1/aerc.1
+ 	install -m644 aerc-search.1 $(DESTDIR)$(MANDIR)/man1/aerc-search.1
+ 	install -m644 aerc-config.5 $(DESTDIR)$(MANDIR)/man5/aerc-config.5
diff --git a/srcpkgs/aerc/template b/srcpkgs/aerc/template
index 2ff3b10c48c1..30a431484026 100644
--- a/srcpkgs/aerc/template
+++ b/srcpkgs/aerc/template
@@ -1,29 +1,21 @@
 # Template file for 'aerc'
 pkgname=aerc
-version=0.7.1
+version=0.9.0
 revision=1
 build_style=go
-hostmakedepends="scdoc git"
+go_import_path="git.sr.ht/~rjarry/aerc"
+go_build_tags=notmuch
+go_ldflags="-X main.Version=${version}"
+hostmakedepends="scdoc"
 makedepends="libnotmuch-devel"
 short_desc="Terminal email client"
 maintainer="shtayerc <david.murko@mailbox.org>"
 license="MIT"
 homepage="https://aerc-mail.org"
 distfiles="https://git.sr.ht/~rjarry/aerc/archive/${version}.tar.gz"
-checksum=e149236623c103c8526b1f872b4e630e67f15be98ac604c0ea0186054dbef0cc
-
-do_configure() {
-	:
-}
-
-do_build() {
-	make ${makejobs} PREFIX=/usr GOFLAGS=-tags=notmuch
-}
-
-do_install() {
-	make STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} install
-}
+checksum=b5901feb37a55edd1f713e76c1012ac3fc0757202ddacd7d388cc7ce60638023
 
 post_install() {
+ 	make PREFIX=/usr DESTDIR=${DESTDIR} install
 	vlicense LICENSE
 }

From 87b9a19026fb87590ca11fdb2b5dc9d6a409314a Mon Sep 17 00:00:00 2001
From: Justin Bronder <jsbronder@cold-front.org>
Date: Fri, 25 Mar 2022 10:33:02 -0400
Subject: [PATCH 0427/1686] pipewire: update to 0.3.48.

---
 srcpkgs/pipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 0924ae71ba1f..5ed1ee1d3bd6 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.47
+version=0.3.48
 revision=1
 _pms_version=0.4.1
 build_style=meson
@@ -32,7 +32,7 @@ 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
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="8d70170a91ecba73746c1d83f95d54eee8ca71d0c3521926f05ed830d8b5a84e
+checksum="0d218be86b3d2b548c06259c47ad8d110ee1c09f071e17c4393eeef5c880fa6f
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

From a1a70c04a0007f8764eea04354c08b50ba258671 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 17:16:45 +0100
Subject: [PATCH 0428/1686] retroarch: update to 1.10.2.

---
 srcpkgs/retroarch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index ed8e9da4394f..6b89a54d89a2 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,6 +1,6 @@
 # Template file for 'retroarch'
 pkgname=retroarch
-version=1.10.0
+version=1.10.2
 revision=1
 wrksrc="RetroArch-$version"
 build_style=configure
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=ff9c31abae19528275e40fbe49ef40be9410b4108513ae7dbf325e210e5b5bec
+checksum=e426b8d30c25806e54c61f21d0d742695fa4f6bc6a271def4459db5460d28e8e
 
 build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"

From ae50898ce6655c7e3ac1897ec0454047d64f8b0c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 17 Mar 2022 08:55:25 -0400
Subject: [PATCH 0429/1686] python3-phonenumbers: update to 8.12.45.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index 9cb6d6a351f6..c4dd9b71d037 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.44
+version=8.12.45
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=26cfd0257d1704fe2f88caff2caabb70d16a877b1e65b6aae51f9fbbe10aa8ce
+checksum=94e30f59b2be6c4310a90f3d5da53d49900bdb440484506f3333c694ebb0cdab

From 71af5c6594f9441976b8e4ac8171089a86d6dcd7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 17 Mar 2022 08:53:53 -0400
Subject: [PATCH 0430/1686] synapse: update to 1.55.2.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index f28f1313dcd0..1c07111f4247 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.54.0
+version=1.55.2
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -21,7 +21,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=6e9ee5f0657fe01c5d141101b11c2c2da147003f7f8e684ef44d4f462125b7a1
+checksum=8e06cb264d1631d2518f2f726c89d62c5ed7148b73fbb8190a9c120d3166e7c4
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 9cca298f23effffe5a0d66689a7e69fe900cdb27 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Sun, 6 Feb 2022 18:45:45 -0500
Subject: [PATCH 0431/1686] New package: conduit-0.3.0

---
 srcpkgs/conduit/files/conduit/log/run |  1 +
 srcpkgs/conduit/files/conduit/run     |  6 ++++++
 srcpkgs/conduit/template              | 29 +++++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 120000 srcpkgs/conduit/files/conduit/log/run
 create mode 100644 srcpkgs/conduit/files/conduit/run
 create mode 100644 srcpkgs/conduit/template

diff --git a/srcpkgs/conduit/files/conduit/log/run b/srcpkgs/conduit/files/conduit/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/conduit/files/conduit/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/conduit/files/conduit/run b/srcpkgs/conduit/files/conduit/run
new file mode 100644
index 000000000000..a3a42e323623
--- /dev/null
+++ b/srcpkgs/conduit/files/conduit/run
@@ -0,0 +1,6 @@
+#!/bin/sh
+[ -r ./conf ] && . ./conf
+ulimit -n ${MAX_OPEN_FILES:-8192}
+export CONDUIT_CONFIG=${CONDUIT_CONFIG:-/etc/conduit/conduit.toml}
+
+exec chpst -u _conduit:_conduit conduit
diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template
new file mode 100644
index 000000000000..c2e423e79891
--- /dev/null
+++ b/srcpkgs/conduit/template
@@ -0,0 +1,29 @@
+# Template file for 'conduit'
+pkgname=conduit
+version=0.3.0
+revision=1
+wrksrc="conduit-v${version}"
+build_style=cargo
+hostmakedepends="clang"
+short_desc="Simple, fast and reliable chat server powered by Matrix"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://conduit.rs/"
+distfiles="https://gitlab.com/famedly/conduit/-/archive/v${version}/conduit-v${version}.tar.gz"
+checksum=9e750ed2b8d0e986b1cdc02278124b39c11fa785f2763914836978a5a79863e3
+
+system_accounts="_conduit"
+_conduit_homedir="/var/lib/conduit"
+
+make_dirs="/var/lib/conduit 0700 _conduit _conduit
+ /etc/conduit 755 _conduit _conduit"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+	XBPS_CROSS_RUSTFLAGS+=" -latomic"
+fi
+
+post_install() {
+	vsconf conduit-example.toml conduit.toml
+	vsv conduit
+}

From 71dd8042f4045c73138a2a1e11be3c6efcff9564 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 12:35:01 +0100
Subject: [PATCH 0432/1686] Venom: remove package

* not maintained, doesn't build with recent vala versions
---
 srcpkgs/Venom/template            | 16 ----------------
 srcpkgs/removed-packages/template |  1 +
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 srcpkgs/Venom/template

diff --git a/srcpkgs/Venom/template b/srcpkgs/Venom/template
deleted file mode 100644
index deb714982db1..000000000000
--- a/srcpkgs/Venom/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'Venom'
-pkgname=Venom
-version=0.5.5
-revision=1
-build_style=meson
-hostmakedepends="vala pkg-config glib-devel"
-makedepends="gtk+3-devel libgee08-devel gspell-devel
- libcanberra-devel sqlcipher-devel json-glib-devel
- libsoup-devel toxcore-devel libsodium-devel
- opus-devel libvpx-devel gstreamer1-devel"
-short_desc="Modern Tox client for the desktop"
-maintainer="Nathan Owens <ndowens04@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/naxuroqa/Venom/"
-distfiles="https://github.com/naxuroqa/Venom/archive/${version}.tar.gz"
-checksum=0348e26d70b0614b6ee3d50fb6c086ae1f696ed250d8ea80eec28299bee23562
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 30fa0d2cce34..5003333859c9 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -12,6 +12,7 @@ replaces="
  ImageMagick6<=6.9.12.12_2
  MoinMoin<=1.9.11_1
  Platinum9-theme<=0.0.0.20170720_3
+ Venom<=0.5.5_1
  XorCurses<=0.2.2_1
  acme-client<=0.1.16_5
  albert<=0.16.1_4

From dcbf80e5921254072403e7e317144648c8329664 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:09:02 +0100
Subject: [PATCH 0433/1686] granite: update to 6.2.0.

---
 common/shlibs            | 2 +-
 srcpkgs/granite/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 2d8a8b8b0df3..dd26ddee444b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1190,7 +1190,7 @@ libconfig.so.11 libconfig-1.7.1_1
 libopusfile.so.0 opusfile-0.12_2
 libopusurl.so.0 opusfile-0.12_2
 libopusenc.so.0 libopusenc-0.2_1
-libgranite.so.5 granite-0.5.0_1
+libgranite.so.6 granite-6.2.0_1
 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
 librlog.so.5 librlog-1.4_1
 libtinyxml.so.0 tinyxml-2.6.2_1
diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template
index 2ae77d6ee66c..f3a53c4165bb 100644
--- a/srcpkgs/granite/template
+++ b/srcpkgs/granite/template
@@ -1,10 +1,10 @@
 # Template file for 'granite'
 pkgname=granite
-version=5.5.0
+version=6.2.0
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config gettext vala"
 makedepends="gtk+3-devel libgee08-devel"
 depends="hicolor-icon-theme"
 short_desc="GTK3 widget library for elementary OS"
@@ -12,7 +12,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/elementary/granite"
 distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz"
-checksum=0c376520c7d462fca05213a14970ee1075fea4a78062a33b47529e2647cd5557
+checksum=067d31445da9808a802fca523630c3e4b84d2d7c78ae547ced017cb7f3b9c6b5
 
 granite-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 0dca9520aae987f40a3f1819b9edff6ce3574796 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:02 +0100
Subject: [PATCH 0434/1686] Minder: revbump for granite 6, build translations

---
 srcpkgs/Minder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template
index da4f9b751c20..8ee716a6f9f3 100644
--- a/srcpkgs/Minder/template
+++ b/srcpkgs/Minder/template
@@ -1,9 +1,9 @@
 # Template file for 'Minder'
 pkgname=Minder
 version=1.14.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config glib-devel vala"
+hostmakedepends="pkg-config gettext glib-devel vala"
 makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel
  libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel json-glib-devel"
 short_desc="Mind-mapping application designed for Pantheon"

From 0b5478dfc38fd23f47e9fd01391ce6aaff24f234 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:02 +0100
Subject: [PATCH 0435/1686] bookworm: revbump for granite 6, build translations

---
 srcpkgs/bookworm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template
index 3e319fb786d9..0205a6e62427 100644
--- a/srcpkgs/bookworm/template
+++ b/srcpkgs/bookworm/template
@@ -1,9 +1,9 @@
 # Template file for 'bookworm'
 pkgname=bookworm
 version=1.1.2
-revision=4
+revision=5
 build_style=meson
-hostmakedepends="pkg-config glib-devel vala"
+hostmakedepends="pkg-config glib-devel gettext vala"
 makedepends="gtk+3-devel libgee08-devel granite-devel
  webkit2gtk-devel sqlite-devel poppler-glib-devel
  libxml2-devel glib-devel libsoup-devel"

From 8346bc9887546c6ce04f5fedcb6a5148d3f09e04 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 0436/1686] notes-up: update to 2.0.6.

---
 srcpkgs/notes-up/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template
index 481a214cfbc2..55db14d47b32 100644
--- a/srcpkgs/notes-up/template
+++ b/srcpkgs/notes-up/template
@@ -1,6 +1,6 @@
 # Template file for 'notes-up'
 pkgname=notes-up
-version=2.0.5
+version=2.0.6
 revision=1
 wrksrc=Notes-up-${version}
 build_style=meson
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, BSD-3-Clause"
 homepage="https://github.com/Philip-Scott/Notes-up"
 distfiles="https://github.com/Philip-Scott/Notes-up/archive/${version}.tar.gz"
-checksum=56ddf5ab3468c3bbb806106c41b485b020ade3c7f48d271bda1e78ddce5e1664
+checksum=6e7b6ac4a3a917867a1555db0a6e03e40ccd9955b5d76e980a26fa8e40744f07
 
 post_install() {
 	ln -s com.github.philip_scott.notes-up ${DESTDIR}/usr/bin/notes-up

From 9af70956f10a11310738a2f506ec0737fe3ed66f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 0437/1686] nutty: revbump for granite 6, build translations

---
 srcpkgs/nutty/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template
index 37396577835b..eb263a89af4d 100644
--- a/srcpkgs/nutty/template
+++ b/srcpkgs/nutty/template
@@ -1,18 +1,18 @@
 # Template file for 'nutty'
 pkgname=nutty
 version=1.1.1
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config vala glib-devel"
+hostmakedepends="pkg-config gettext vala glib-devel"
 makedepends="gtk+3-devel libgee08-devel libnotify-devel granite-devel
  sqlite-devel"
 short_desc="Network Utility"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/babluboy/nutty"
-distfiles="${homepage}/archive/${version}.tar.gz"
+distfiles="https://github.com/babluboy/nutty/archive/${version}.tar.gz"
 checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba
-python_version=2 #unverified
+python_version=2
 
 post_install() {
 	vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications

From cf9ee116541112c6f3be39b853397764d7248b4f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 0438/1686] pantheon-agent-polkit: revbump for granite 6

---
 srcpkgs/pantheon-agent-polkit/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pantheon-agent-polkit/template b/srcpkgs/pantheon-agent-polkit/template
index c2ae95b313e4..4285532c67b5 100644
--- a/srcpkgs/pantheon-agent-polkit/template
+++ b/srcpkgs/pantheon-agent-polkit/template
@@ -1,13 +1,13 @@
 # Template file for 'pantheon-agent-polkit'
 pkgname=pantheon-agent-polkit
 version=1.0.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="intltool pkg-config vala gobject-introspection"
+hostmakedepends="gettext pkg-config vala gobject-introspection"
 makedepends="gtk+3-devel polkit-devel granite-devel"
 short_desc="Pantheon Polkit Agent"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
+homepage="https://github.com/elementary/pantheon-agent-polkit"
+distfiles="https://github.com/elementary/pantheon-agent-polkit/archive/${version}.tar.gz"
 checksum=8e730f335545a4ca2717e1c9ccad61c329c1f19ea51f76ae4783da9e0416d484

From 33267a80630161741425f360f3ef7d0260e30f14 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0439/1686] pantheon-screenshot: update to 6.0.2.

---
 srcpkgs/pantheon-screenshot/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pantheon-screenshot/template b/srcpkgs/pantheon-screenshot/template
index 3492b0c0d49e..fb2ee8e7b095 100644
--- a/srcpkgs/pantheon-screenshot/template
+++ b/srcpkgs/pantheon-screenshot/template
@@ -1,18 +1,18 @@
 # Template file for 'pantheon-screenshot'
 pkgname=pantheon-screenshot
-version=1.7.1
+version=6.0.2
 revision=1
 wrksrc="screenshot-${version}"
 build_style=meson
-hostmakedepends="desktop-file-utils glib-devel intltool pkgconf vala"
-makedepends="granite-devel libcanberra-devel"
-depends="desktop-file-utils gdk-pixbuf gtk+3 hicolor-icon-theme"
+hostmakedepends="desktop-file-utils glib-devel gettext pkg-config vala"
+makedepends="granite-devel libcanberra-devel libhandy1-devel"
+depends="desktop-file-utils gdk-pixbuf hicolor-icon-theme"
 short_desc="Screenshot tool"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-3.0-only"
 homepage="https://github.com/elementary/screenshot-tool"
 distfiles="https://github.com/elementary/screenshot-tool/archive/${version}.tar.gz"
-checksum=2789abf01b9b41ae62e39eea4d5765dd606898435e1723939a06301922c431e2
+checksum=af1d67b196a22af529190f593183ff2eebad51a1329be7279cddb7dc0ce406f4
 
 post_install() {
 	ln -s io.elementary.screenshot-tool "$DESTDIR"/usr/bin/"$pkgname"

From dbeed3a28755a0dbe0b1cb82b478bb2e02656a94 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0440/1686] planner: update to 3.0.6.

---
 srcpkgs/planner/template | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index 7be79ab4c6ba..b55a40f9306f 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,32 +1,19 @@
 # Template file for 'planner'
 pkgname=planner
-version=2.7
+version=3.0.6
 revision=1
 build_style=meson
 build_helper="gir"
 hostmakedepends="gettext pkg-config vala glib-devel curl"
-makedepends="evolution-data-server-devel libgee08-devel granite-devel
- webkit2gtk-devel libsoup-devel libpeas-devel libhandy1-devel"
+makedepends="libgee08-devel granite-devel webkit2gtk-devel libsoup-devel
+ libhandy1-devel json-glib-devel"
 depends="io.elementary.icons io.elementary.stylesheet curl"
 short_desc="Task manager with Todoist support designed for GNU/Linux"
 maintainer="linarcx <linarcx@riseup.net>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/alainm23/planner"
 distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=cd34953867a91b2992aa4eafddc5093a695d1e6096571ade75640dddcc425d69
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" evolution-data-server-devel"
-fi
-pre_configure() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		# In musl libc there is no _NL_TIME_FIRST_WEEKDAY in langinfo.h
-		# thus replace Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
-		# with 0; (sunday)
-		vsed -i src/Services/Calendar/CalendarModel.vala \
-			-e "s#\(int week_start =\) Posix.*#\1 0;#"
-	fi
-}
+checksum=345a9ad2220820f08f583321e874528eee9f7e009236127efacee72d071c7ea5
 
 post_install() {
 	vinstall data/com.github.alainm23.planner.desktop.in 644 \

From 4a0bbf67604e7b951167a86ea18a07a4c964ffbc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0441/1686] quickDocs: revbump for granite 6

---
 srcpkgs/quickDocs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template
index 940ad376d9c7..c4a22e6bbe7d 100644
--- a/srcpkgs/quickDocs/template
+++ b/srcpkgs/quickDocs/template
@@ -1,7 +1,7 @@
 # Template file for 'quickDocs'
 pkgname=quickDocs
 version=2.2.6
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="vala pkg-config"
 makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel"

From 80a6caf402fa109b4af14b238dc8cf5be05e8c3d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0442/1686] sequeler: revbump for granite 6

---
 srcpkgs/sequeler/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template
index a36107372bd9..32f127dc5c6e 100644
--- a/srcpkgs/sequeler/template
+++ b/srcpkgs/sequeler/template
@@ -1,7 +1,7 @@
 # Template file for 'sequeler'
 pkgname=sequeler
 version=0.8.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext pkg-config glib-devel vala"
 makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel

From 1ed05ba5da3bfb4c89d41ec0b20eb60c1e20b756 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 0443/1686] switchboard: update to 6.0.0.

---
 srcpkgs/switchboard/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template
index ebb706e5d9e5..9397fea8cdeb 100644
--- a/srcpkgs/switchboard/template
+++ b/srcpkgs/switchboard/template
@@ -1,16 +1,16 @@
 # Template file for 'switchboard'
 pkgname=switchboard
-version=2.3.7
-revision=2
+version=6.0.0
+revision=1
 build_style=meson
 hostmakedepends="pkg-config vala gettext"
-makedepends="granite-devel clutter-gtk-devel gtk+3-devel"
+makedepends="granite-devel gtk+3-devel libhandy1-devel"
 short_desc="Extensible System Settings app designed for elementary OS"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/elementary/switchboard"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=373db840b254897b2a59f6f421508f8f1361adc5d4d35b7963ba024e5c8234c9
+distfiles="https://github.com/elementary/switchboard/archive/${version}.tar.gz"
+checksum=40c2fd17535cba239b7c78b62d93a3f5ef7e990b31a7c4ecf04cba0c2b60d792
 
 switchboard-devel_package() {
 	short_desc+=" - development files"

From 7f207024023d15349fe51ab9f8fb4b5f31a04ffa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 0444/1686] switchboard-plug-bluetooth: update to 2.3.6.

---
 srcpkgs/switchboard-plug-bluetooth/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-bluetooth/template b/srcpkgs/switchboard-plug-bluetooth/template
index 373368918159..b1b6977a5269 100644
--- a/srcpkgs/switchboard-plug-bluetooth/template
+++ b/srcpkgs/switchboard-plug-bluetooth/template
@@ -1,13 +1,13 @@
 # Template file for 'switchboard-plug-bluetooth'
 pkgname=switchboard-plug-bluetooth
-version=2.3.0
+version=2.3.6
 revision=1
 build_style=meson
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
 makedepends="switchboard-devel granite-devel gtk+3-devel"
 short_desc="Switchboard Bluetooth Plug"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ffeb4cdb53696b241e203f4e0920bb90c05fd77b99a05bd9483cb4c8367f1000
+homepage="https://github.com/elementary/switchboard-plug-bluetooth"
+distfiles="https://github.com/elementary/switchboard-plug-bluetooth/archive/${version}.tar.gz"
+checksum=fec5d135dc17c3ab1396cbe78f255e767f1834dfc4db8ec30579ff0ef29836b9

From f40ac2d0a3156afc3e3327f3bd32befe96dedb25 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 0445/1686] switchboard-plug-network: update to 2.4.2.

* build translations
* enable cross builds
---
 srcpkgs/switchboard-plug-network/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index 31f640cf25df..382aea7559a0 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,15 +1,14 @@
 # Template file for 'switchboard-plug-network'
 pkgname=switchboard-plug-network
-version=2.3.3
+version=2.4.2
 revision=1
 build_style=meson
-hostmakedepends="pkg-config vala"
+hostmakedepends="pkg-config vala gettext"
 makedepends="switchboard-devel granite-devel gtk+3-devel
  libnma-devel NetworkManager-devel"
 short_desc="Switchboard Network Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/switchboard-plug-network"
-distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz"
-checksum=a2f29b3054c187f2be9688bb04b6800cf4c2d3dd74cdd4fa37626f0b2ac5df50
-nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"
+distfiles="https://github.com/elementary/switchboard-plug-network/archive/${version}.tar.gz"
+checksum=190b1f9123bc9ee4120a624ad3de91c0e40a141cb19b8eb7ec74d3c39f008971

From f4135e0d46954dd611dcff0c5854b28e56fa7744 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 0446/1686] switchboard-plug-printers: update to 2.1.10.

---
 .../patches/fix-signal_subscribe.patch        | 11 ---------
 .../patches/ftbfs.patch                       | 23 -------------------
 srcpkgs/switchboard-plug-printers/template    | 10 ++++----
 3 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
 delete mode 100644 srcpkgs/switchboard-plug-printers/patches/ftbfs.patch

diff --git a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
deleted file mode 100644
index 48eb8948a642..000000000000
--- a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/CUPSNotifier.vala	2018-11-28 12:34:33.000000000 +0100
-+++ b/src/CUPSNotifier.vala	2021-01-29 19:26:11.191992396 +0100
-@@ -63,7 +63,7 @@
-         Bus.get_proxy.begin<NotifierDBus> (BusType.SYSTEM, "org.cups.cupsd.Notifier", "/org/cups/cupsd/Notifier", GLib.DBusProxyFlags.NONE, null, (obj, res) => {
-             try {
-                 dbus_notifier = Bus.get_proxy.end (res);
--                ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, subscription_callback);
-+                ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, (GLib.DBusSignalCallback)subscription_callback);
-             } catch (IOError e) {
-                 critical (e.message);
-             }
diff --git a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch b/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
deleted file mode 100644
index e8e21e2c4841..000000000000
--- a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3175c2ebf106145a95355d2571e0a2aa4834e884 Mon Sep 17 00:00:00 2001
-From: Enerccio <admin@en-circle.com>
-Date: Tue, 17 Sep 2019 15:31:37 +0200
-Subject: [PATCH] Update cups.vapi (#118)
-
-Fixed bug with compilation
----
- vapi/cups.vapi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vapi/cups.vapi b/vapi/cups.vapi
-index 7f1b795..5dcdba6 100644
---- a/vapi/cups.vapi
-+++ b/vapi/cups.vapi
-@@ -605,7 +605,7 @@ namespace CUPS {
- 			[CCode (cname = "ippAddBooleans")]
- 			private unowned Attribute _add_booleans (Tag group, string name, [CCode (array_length_pos = 0.9)] char[] values);
- 			public unowned Attribute add_booleans (Tag group, string name, bool[] values) {
--				char[] char_values;
-+				char[] char_values = {};
- 				foreach (var val in values) {
- 					char_values += val ? 1 : 0;
- 				}
diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template
index caecd10c886c..05f3c86abd79 100644
--- a/srcpkgs/switchboard-plug-printers/template
+++ b/srcpkgs/switchboard-plug-printers/template
@@ -1,14 +1,14 @@
 # Template file for 'switchboard-plug-printers'
 pkgname=switchboard-plug-printers
-version=2.1.6
+version=2.1.10
 revision=1
 build_style=meson
-hostmakedepends="pkg-config vala intltool"
+hostmakedepends="pkg-config vala gettext"
 makedepends="switchboard-devel granite-devel gtk+3-devel cups-devel"
 depends="cups-pk-helper"
 short_desc="Switchboard Printers Plug"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://github.com/elementary/${pkgname}"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=fe2c748e3737c3304ea8613d43d5ba8596f95499a65b8d13f93c4f702901f442
+homepage="https://github.com/elementary/switchboard-plug-printers"
+distfiles="https://github.com/elementary/switchboard-plug-printers/archive/${version}.tar.gz"
+checksum=448f6ae28fc4dacc2c329532e21aacc4ec7aa4af7d93bd6d7013002253faef3d

From 430d844a9cde0be1332588ea2a0046f51e1d52ed Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:59:08 +0100
Subject: [PATCH 0447/1686] io.elementary.calculator: update to 1.7.2.

---
 srcpkgs/io.elementary.calculator/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template
index 56abf698403b..35a363c7ae9a 100644
--- a/srcpkgs/io.elementary.calculator/template
+++ b/srcpkgs/io.elementary.calculator/template
@@ -1,17 +1,17 @@
 # Template file for 'io.elementary.calculator'
 pkgname=io.elementary.calculator
-version=1.6.0
-revision=2
+version=1.7.2
+revision=1
 wrksrc="calculator-${version}"
 build_style=meson
-hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream"
-makedepends="granite-devel gtk+3-devel"
+hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream"
+makedepends="granite-devel gtk+3-devel libhandy1-devel"
 short_desc="Calculator app designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/elementary/calculator"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=c650d5ff7d2df2d122ade0cbd35be50927f22b0d260f28e374b1112114f24540
+checksum=d296d06b36a0c7dd84e7e91e9801989e83312612d6ee6f0479030c1b340d397b
 
 pantheon-calculator_package() {
 	depends="io.elementary.calculator>=${version}_${revision}"

From 9a3a5cefb6074fc2edfc4708b7a0ce65871824e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:06 +0100
Subject: [PATCH 0448/1686] io.elementary.calendar: update to 6.1.0.

---
 .../patches/00-musl.patch                     | 65 ++++++++++---------
 .../01-fix-build-without-locale-command.patch | 32 +++++++++
 srcpkgs/io.elementary.calendar/template       | 18 ++---
 3 files changed, 76 insertions(+), 39 deletions(-)
 create mode 100644 srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch

diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch
index f85beca403fa..9b50a7e6e259 100644
--- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch
+++ b/srcpkgs/io.elementary.calendar/patches/00-musl.patch
@@ -1,44 +1,49 @@
-commit c9ba80af072819261a9e24a04a0859b93b5db810
-Author: Cameron Nemo <camerontnorman@gmail.com>
-Date:   Thu Oct 18 11:33:15 2018 -0700
-
-    Check for _NL_TIME_FIRST_WEEKDAY declaration
-
-diff --git core/Model/CalendarModel.vala core/Model/CalendarModel.vala
-index 3e3b8cbd..b33f75f8 100644
---- a/core/Model/CalendarModel.vala
-+++ b/core/Model/CalendarModel.vala
-@@ -68,7 +68,11 @@ public class Maya.Model.CalendarModel : Object {
-     }
- 
-     private CalendarModel () {
+--- a/core/Services/Calendar/EventStore.vala
++++ b/core/Services/Calendar/EventStore.vala
+@@ -304,6 +304,7 @@ public class Calendar.EventStore : Object {
+         // number we want, so we convert the pointer address to a uint to get
+         // the data. Since the pointer address is actually data, using it as a
+         // pointer will segfault.
++#if HAVE_NL_TIME_WEEK_1STDAY
+         uint week_day1 = (uint) Posix.NLTime.WEEK_1STDAY.to_string ();
+         var week_1stday = 0; // Default to 0 if unrecognized data
+         if (week_day1 == 19971130) { // Sunday
+@@ -313,6 +314,9 @@ public class Calendar.EventStore : Object {
+         } else {
+             warning ("Unknown value of _NL_TIME_WEEK_1STDAY: %u", week_day1);
+         }
++#else
++        var week_1stday = 0;
++#endif
+         /* The offset between GLib and local POSIX numbering.
+          * If week_1stday is Monday, data is correct for GLib: Monday=1 through Sunday=7,
+          * so offset is 0.
+@@ -323,7 +327,11 @@ public class Calendar.EventStore : Object {
+         // Get the start of week
+         // HACK This line produces a string of 3 bytes. It takes the raw value
+         // of the first one and uses that as the value of week_start.
 +#if HAVE_NL_TIME_FIRST_WEEKDAY
-         int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
+         int week_start_posix = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
 +#else
-+        int week_start = 0;
++        int week_start_posix = 0;
 +#endif
-         if (week_start >= 1 && week_start <= 7) {
-             week_starts_on = (Maya.Settings.Weekday)week_start-1;
-         }
-diff --git meson.build meson.build
-index a0cd2dd7..02b4e1d1 100644
+ 
+         var week_start = week_start_posix + glib_offset;
+         if (week_start == 0) { // Sunday special case
 --- a/meson.build
 +++ b/meson.build
-@@ -31,7 +31,17 @@ folks_dep = dependency('folks')
- geocode_glib_dep = dependency('geocode-glib-1.0')
- gclue_dep = dependency('libgeoclue-2.0')
+@@ -48,7 +48,14 @@ else
+     add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala')
+ endif
  
 -m_dep = meson.get_compiler('c').find_library('m', required : false)
 +cc = meson.get_compiler('c')
 +m_dep = cc.find_library('m', required : false)
-+libnotify_dep = dependency('libnotify', required: false)
-+
-+if libnotify_dep.found()
-+    add_project_arguments('--define=HAVE_LIBNOTIFY', language: 'vala')
-+endif
-+
 +if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY')
 +    add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala')
++endif
++if cc.has_header_symbol('langinfo.h', '_NL_TIME_WEEK_1STDAY')
++    add_project_arguments('--define=HAVE_NL_TIME_WEEK_1STDAY', language: 'vala')
 +endif
  
  gresource_calendar = gnome.compile_resources(
diff --git a/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch b/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch
new file mode 100644
index 000000000000..6513e4c5422b
--- /dev/null
+++ b/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch
@@ -0,0 +1,32 @@
+--- a/core/Tests/meson.build
++++ b/core/Tests/meson.build
+@@ -18,15 +18,20 @@ util_tests = executable(
+ )
+ test('Utils Tests', util_tests, suite: 'core', is_parallel: false)
+ 
++locale_prog = find_program('locale', required: false)
+ # We need these three locales to run the tests
+-locales = run_command('locale', '-a').stdout().split('\n')
+-if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8')
+-    eventstore_tests = executable(
+-      tests_name + '-eventstore',
+-      'eventstore-tests.vala',
+-      dependencies: tests_deps
+-    )
+-    test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false)
++if locale_prog.found()
++  locales = run_command(locale_prog, '-a').stdout().split('\n')
++  if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8')
++      eventstore_tests = executable(
++        tests_name + '-eventstore',
++        'eventstore-tests.vala',
++        dependencies: tests_deps
++      )
++      test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false)
++  else
++    message('EventStore Tests have been disabled, a locale is missing in the system.')
++  endif
+ else
+-message('EventStore Tests have been disabled, a locale is missing in the system.')
++    message('EventStore Tests have been disabled, the locale command is missing in the system.')
+ endif
diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template
index a5ea019353a0..bf87c7599001 100644
--- a/srcpkgs/io.elementary.calendar/template
+++ b/srcpkgs/io.elementary.calendar/template
@@ -1,22 +1,21 @@
 # Template file for 'io.elementary.calendar'
 pkgname=io.elementary.calendar
-version=5.0
-revision=6
-_git_commit=46346e48b53e9d3d59d9f567b622532338f50f32
-wrksrc="calendar-${_git_commit}"
+version=6.1.0
+revision=1
+wrksrc="calendar-${version}"
 build_style=meson
 build_helper="gir"
-hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream
+hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream
  glib-devel evolution-data-server-devel"
 makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel
- libchamplain-devel clutter-devel evolution-data-server-devel
+ libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel
  folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel"
 short_desc="Desktop calendar app designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-only"
 homepage="https://github.com/elementary/calendar"
-distfiles="${homepage}/archive/${_git_commit}.tar.gz"
-checksum=3be3851baeed67144e5cbed209b2c1b982fe9830db13372e3051423295dee345
+distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz"
+checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d
 
 libio.elementary.calendar_package() {
 	short_desc+=" - library"
@@ -28,7 +27,8 @@ libio.elementary.calendar_package() {
 libio.elementary.calendar-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.calendar>=${version} evolution-data-server-devel
-	 granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel"
+	 granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel
+	 libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From 9278fef1fd70ea02b4979b04b26007d336573d43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:04 +0100
Subject: [PATCH 0449/1686] io.elementary.code: update to 6.1.0.

---
 .../io.elementary.code/patches/vala050.patch  | 25 -------------------
 srcpkgs/io.elementary.code/template           | 18 ++++++-------
 2 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/io.elementary.code/patches/vala050.patch

diff --git a/srcpkgs/io.elementary.code/patches/vala050.patch b/srcpkgs/io.elementary.code/patches/vala050.patch
deleted file mode 100644
index ec3abb8fd9f0..000000000000
--- a/srcpkgs/io.elementary.code/patches/vala050.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a185de0e7716aa2de2bf21de96e6c9af1dca81aa Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel@octaforge.org>
-Date: Wed, 16 Sep 2020 20:43:07 +0200
-Subject: [PATCH] fix with vala-0.50
-
----
- plugins/outline/Vala/ValaSymbolOutline.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git plugins/outline/Vala/ValaSymbolOutline.vala plugins/outline/Vala/ValaSymbolOutline.vala
-index c8db339..31386a6 100644
---- a/plugins/outline/Vala/ValaSymbolOutline.vala
-+++ b/plugins/outline/Vala/ValaSymbolOutline.vala
-@@ -61,7 +61,7 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline
- 
-     public void parse_symbols () {
-         var context = new Vala.CodeContext ();
--        context.profile = Vala.Profile.GOBJECT;
-+        context.set_target_profile(Vala.Profile.GOBJECT);
-         context.add_source_filename (doc.file.get_path ());
-         context.report = new Report ();
-         if (cancellable != null)
--- 
-2.28.0
-
diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 05d84cc39c9f..c47d667b8a96 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,19 +1,19 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
-version=3.4.1
-revision=5
+version=6.1.0
+revision=1
 wrksrc="code-${version}"
 build_style=meson
-hostmakedepends="pkg-config vala intltool glib-devel"
+hostmakedepends="pkg-config vala gettext polkit glib-devel"
 makedepends="editorconfig-devel libgee08-devel granite-devel libpeas-devel
- gtksourceview-devel vte3-devel gtkspell3-devel zeitgeist-devel libsoup-devel
- webkit2gtk-devel gtk+3-devel libgit2-glib-devel"
+ gtksourceview4-devel vte3-devel gtkspell3-devel libsoup-devel
+ gtk+3-devel libgit2-glib-devel polkit-devel libhandy1-devel"
 short_desc="Code editor designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/code"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=d84b38193b72cd93995aae604358c83c5b6976d8472ce985027b947cfed990bf
+distfiles="https://github.com/elementary/code/archive/${version}.tar.gz"
+checksum=d44851eb827dc9a069ab81b6a9cfe255795e3319a6882ca344152781968ce3ce
 
 libio.elementary.code_package() {
 	short_desc+=" - library"
@@ -25,8 +25,8 @@ libio.elementary.code_package() {
 libio.elementary.code-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.code>=${version} fontconfig-devel granite-devel
-	 gtk+3-devel gtksourceview-devel libgee08-devel libgit2-glib-devel
-	 libglib-devel libpeas-devel pango-devel zeitgeist-devel"
+	 gtk+3-devel gtksourceview4-devel libgee08-devel libgit2-glib-devel
+	 libglib-devel libpeas-devel pango-devel polkit-devel libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From 1f9e7f010dc7343bd57594d0cb18ea5091c33b5e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:07 +0100
Subject: [PATCH 0450/1686] io.elementary.files: update to 6.1.2.

---
 common/shlibs                        |  4 ++--
 srcpkgs/io.elementary.files/template | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dd26ddee444b..ffcc843af85c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3524,8 +3524,8 @@ libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
 libswitchboard-2.0.so.0 switchboard-2.3.2_1
 libcodecore.so.0 libio.elementary.code-3.0_1
 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1
-libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1
-libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1
+libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1
+libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1
 libwlroots.so.9 wlroots0.14-0.14.1_1
 libwlroots.so.10 wlroots-0.15.0_1
 libbaseencode.so.1 libbaseencode-1.0.9_1
diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template
index cb0643a02449..0e8d5fb177d6 100644
--- a/srcpkgs/io.elementary.files/template
+++ b/srcpkgs/io.elementary.files/template
@@ -1,20 +1,20 @@
 # Template file for 'io.elementary.files'
 pkgname=io.elementary.files
-version=4.5.0
+version=6.1.2
 revision=1
 wrksrc="files-${version}"
 build_style=meson
-configure_args="-Dwith-unity=disabled"
-hostmakedepends="vala glib-devel pkg-config intltool"
+configure_args="-Dsystemduserunitdir=no"
+hostmakedepends="vala glib-devel pkg-config gettext"
 makedepends="gtk+3-devel libglib-devel libgee08-devel sqlite-devel plank-devel
  libcanberra-devel granite-devel pango-devel zeitgeist-devel dbus-glib-devel
- libnotify-devel libcloudproviders-devel libgit2-glib-devel"
+ libnotify-devel libcloudproviders-devel libgit2-glib-devel libhandy1-devel"
 short_desc="File browser designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/files"
 distfiles="https://github.com/elementary/files/archive/${version}.tar.gz"
-checksum=987f87df2a74c97cb866b34a20ea395ae1f67d03c9517185494860653fbc065c
+checksum=2a328d8df901186bb700c835064c9a526e5694545b668df512282773cfaa7b08
 
 CFLAGS="-fcommon"
 
@@ -28,7 +28,7 @@ libio.elementary.files_package() {
 libio.elementary.files-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.files>=${version} libgee08-devel gtk+3-devel
-	 libcanberra-devel libglib-devel zeitgeist-devel"
+	 libcanberra-devel libglib-devel zeitgeist-devel libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From aebab20e0f2cd0d8a3218c9e7fe974ae083dc15d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:04 +0100
Subject: [PATCH 0451/1686] io.elementary.icons: update to 6.1.0.

---
 srcpkgs/io.elementary.icons/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index fb3a6c06cc84..95dbc0ca3ddb 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -1,6 +1,6 @@
 # Template file for 'io.elementary.icons'
 pkgname=io.elementary.icons
-version=5.3.1
+version=6.1.0
 revision=1
 wrksrc="icons-${version}"
 build_style=meson
@@ -11,8 +11,8 @@ short_desc="Named, vector icons for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/icons"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=67b349453f8990e399521bb8d96f4caf4c23a27cf22cbc18ddacf0e817c59e12
+distfiles="https://github.com/elementary/icons/archive/${version}.tar.gz"
+checksum=bab0f638a60d7a28bf269f4a11346b28495a819e3f516403a7e0bb880c441c2f
 
 post_install() {
 	# How did that get there?

From 13c0b451fb649ec22bcd5bc2fd1df12999964c1e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:07 +0100
Subject: [PATCH 0452/1686] io.elementary.music: update to 5.1.1.

---
 .../io.elementary.music/patches/vala-array-size.patch | 11 -----------
 srcpkgs/io.elementary.music/template                  | 11 ++++++-----
 2 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/io.elementary.music/patches/vala-array-size.patch

diff --git a/srcpkgs/io.elementary.music/patches/vala-array-size.patch b/srcpkgs/io.elementary.music/patches/vala-array-size.patch
deleted file mode 100644
index 2cc268cdae64..000000000000
--- a/srcpkgs/io.elementary.music/patches/vala-array-size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/core/GStrewamer/Equalizer.vala	2020-03-04 23:50:04.000000000 +0100
-+++ b/core/GStreamer/Equalizer.vala	2020-12-14 15:53:22.359597220 +0100
-@@ -31,7 +31,7 @@
-     construct {
-         element = Gst.ElementFactory.make ("equalizer-10bands", "equalizer");
- 
--        int[10] freqs = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000};
-+        int freqs[10] = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000};
- 
-         float last_freq = 0;
-         for (int index = 0; index < 10; index++) {
diff --git a/srcpkgs/io.elementary.music/template b/srcpkgs/io.elementary.music/template
index de6ae0f94d90..3ef8c1568630 100644
--- a/srcpkgs/io.elementary.music/template
+++ b/srcpkgs/io.elementary.music/template
@@ -1,20 +1,21 @@
 # Template file for 'io.elementary.music'
 pkgname=io.elementary.music
-version=5.0.5
+version=5.1.1
 revision=1
 wrksrc="music-${version}"
 build_style=meson
 configure_args="-Dbuild-plugins=true -Dplugins=audioplayer,cdrom,ipod"
-hostmakedepends="vala desktop-file-utils intltool pkg-config AppStream glib-devel"
+hostmakedepends="vala desktop-file-utils gettext pkg-config AppStream glib-devel"
 makedepends="taglib-devel granite-devel vala-devel gtk+3-devel libgee08-devel
  clutter-gtk-devel dbus-glib-devel libgda-devel libgpod-devel libxml2-devel
- json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel"
+ json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel
+ libhandy1-devel"
 short_desc="Music player and library designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/music"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=ed7cba3b07189273890b321b21cda198f18b102e4466eb7207c0b5f27b31dfc9
+checksum=35e97ec496327b4eb388308168711bf9f8e976a857eb97bca21805f83abf9d15
 
 libio.elementary.music_package() {
 	short_desc+=" - library"
@@ -26,7 +27,7 @@ libio.elementary.music-devel_package() {
 	short_desc+=" - library development files"
 	depends="libio.elementary.music>=${version} granite-devel
 	 gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libglib-devel
-	 libpeas-devel"
+	 libpeas-devel libhandy1-devel"
 	pkg_install() {
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig

From 95221a431c05027d3174590198f5d3b9bff71874 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:05 +0100
Subject: [PATCH 0453/1686] io.elementary.photos: update to 2.7.4.

---
 .../patches/fix-meson.patch                   | 95 -------------------
 srcpkgs/io.elementary.photos/template         | 11 +--
 2 files changed, 5 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/io.elementary.photos/patches/fix-meson.patch

diff --git a/srcpkgs/io.elementary.photos/patches/fix-meson.patch b/srcpkgs/io.elementary.photos/patches/fix-meson.patch
deleted file mode 100644
index 820e3b8ef96d..000000000000
--- a/srcpkgs/io.elementary.photos/patches/fix-meson.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 27e529fc96da828982563e2e19a6f0cef883a29e Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Wed, 22 Jul 2020 19:35:53 +0200
-Subject: [PATCH] meson: Properly include config.vapi and config.h (#578)
-
----
- meson.build     | 21 +++++++++++++++++++--
- src/meson.build | 13 -------------
- 2 files changed, 19 insertions(+), 15 deletions(-)
-
-diff --git meson.build meson.build
-index 5edb5314..9bebaca0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -11,14 +11,33 @@ add_project_arguments([
-         '-Wno-unused',
-         '-Wl,--enable-new-dtags',
- 
-+        '-include', 'config.h',
-         '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name())
-     ],
-     language: 'c',
- )
-+add_project_arguments([
-+        '--vapidir', join_paths(meson.current_source_dir(), 'vapi'),
-+        '--pkg', 'config',
-+    ],
-+    language: 'vala',
-+)
- 
- libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), meson.project_name())
- pluginsdir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
- 
-+conf_data = configuration_data()
-+conf_data.set_quoted('PROJECT_NAME', meson.project_name())
-+conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-+conf_data.set_quoted('_VERSION', meson.project_version())
-+conf_data.set_quoted('_PREFIX', get_option('prefix'))
-+conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
-+conf_data.set_quoted('_LIBEXECDIR', libexecdir)
-+config_header = configure_file(
-+    output : 'config.h',
-+    configuration : conf_data
-+)
-+
- gnome = import('gnome')
- i18n = import('i18n')
- 
-@@ -52,7 +71,6 @@ gstreamer_plugins_base_vapi = meson.get_compiler('vala').find_library('gstreamer
- gstreamer_plugins_base_dep = declare_dependency(dependencies: [gstreamer_plugins_base_vapi])
- lconv_dep = meson.get_compiler('vala').find_library('LConv', dirs: join_paths(meson.current_source_dir(), 'vapi'))
- linux_dep = meson.get_compiler('vala').find_library('linux')
--config_dep = meson.get_compiler('vala').find_library('config', dirs: join_paths(meson.current_source_dir(), 'vapi'))
- 
- vapi_include = include_directories('./vapi')
- 
-@@ -82,7 +100,6 @@ dependencies = [
-     webkit2gtk_dep,
-     lconv_dep,
-     linux_dep,
--    config_dep
- ]
- 
- add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi')], language: 'vala')
-diff --git src/meson.build src/meson.build
-index 45bf4c1b..1215d778 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -4,18 +4,6 @@ library_files = files(
-     'plugins/TransitionsInterfaces.vala'
- )
- 
--conf_data = configuration_data()
--conf_data.set_quoted('PROJECT_NAME', meson.project_name())
--conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
--conf_data.set_quoted('_VERSION', meson.project_version())
--conf_data.set_quoted('_PREFIX', get_option('prefix'))
--conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir')))
--conf_data.set_quoted('_LIBEXECDIR', libexecdir)
--config_header = configure_file(
--    output : 'config.h',
--    configuration : conf_data
--)
--
- photos_files = files(
-     'AppDirs.vala',
-     'Application.vala',
-@@ -233,7 +221,6 @@ photos_exe = executable(
-     meson.project_name(),
-     photos_files,
-     library_files,
--    config_header,
-     icons_gresource,
-     global_gresource,
-     dependencies: dependencies,
diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template
index 81c1734164ba..d0f69169be3b 100644
--- a/srcpkgs/io.elementary.photos/template
+++ b/srcpkgs/io.elementary.photos/template
@@ -1,22 +1,21 @@
 # Template file for 'io.elementary.photos'
 pkgname=io.elementary.photos
-version=2.7.0
-revision=2
+version=2.7.4
+revision=1
 wrksrc="photos-${version}"
 build_style=meson
-configure_args="-Dlibunity=false"
-hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream
+hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream
  glib-devel python3-scour"
 makedepends="libaccounts-glib-devel libexif-devel libgee08-devel
  geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel
  gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel
  json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel
  webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel
- vte3-devel"
+ vte3-devel libhandy1-devel"
 depends="desktop-file-utils gsettings-desktop-schemas"
 short_desc="Photo viewer and organizer designed for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/elementary/photos"
 distfiles="https://github.com/elementary/photos/archive/${version}.tar.gz"
-checksum=9f6ad409d053e3239b9ec7fc59429afe9ce89e40878697a73c2c3f215556a074
+checksum=3227f498e483b150f0a1407f4cf244d69f1c7453fc9bcba164fe3ab944283315

From 82b610c4b9916acb0a243d27130fbfd4219bbbfe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:05 +0100
Subject: [PATCH 0454/1686] io.elementary.stylesheet: update to 6.1.1.

---
 srcpkgs/io.elementary.stylesheet/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template
index 791bca04709c..618ac82dda0c 100644
--- a/srcpkgs/io.elementary.stylesheet/template
+++ b/srcpkgs/io.elementary.stylesheet/template
@@ -1,12 +1,13 @@
 # Template file for 'io.elementary.stylesheet'
 pkgname=io.elementary.stylesheet
-version=5.4.2
-revision=2
+version=6.1.1
+revision=1
 wrksrc="stylesheet-${version}"
 build_style=meson
+hostmakedepends="sassc gettext"
 short_desc="GTK Stylesheet for elementary OS"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/stylesheet"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec
+checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e

From 4986d24af0aea6b33ef798bea09ca3552a580db8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:08 +0100
Subject: [PATCH 0455/1686] io.elementary.terminal: update to 6.0.1.

---
 srcpkgs/io.elementary.terminal/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/io.elementary.terminal/template b/srcpkgs/io.elementary.terminal/template
index 2aba6a5b563f..f3e0972cdfe3 100644
--- a/srcpkgs/io.elementary.terminal/template
+++ b/srcpkgs/io.elementary.terminal/template
@@ -1,19 +1,19 @@
 # Template file for 'io.elementary.terminal'
 pkgname=io.elementary.terminal
-version=5.5.2
+version=6.0.1
 revision=1
 wrksrc="terminal-${version}"
 build_style=meson
 configure_args="-Dubuntu-bionic-patched-vte=false"
-hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream glib-devel"
-makedepends="granite-devel libnotify-devel vte3-devel"
+hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel"
+makedepends="granite-devel libnotify-devel vte3-devel libhandy1-devel"
 depends="desktop-file-utils gsettings-desktop-schemas"
 short_desc="Terminal from elementary OS for the 21st century"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-3.0-only"
 homepage="https://github.com/elementary/terminal"
 distfiles="https://github.com/elementary/terminal/archive/${version}.tar.gz"
-checksum=589ad0225e3a45700d95c8ead1b646f22a22c7688f647876a5329b3b4bd923cd
+checksum=de741ad5deadb927243a7007be0f5d3bb4070f780362d59ded600692064b0eca
 
 pantheon-terminal_package() {
 	depends="io.elementary.terminal>=${version}_${revision}"

From 446b36bb6e50913723a1e3ac15fc915abead6e5d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:16:06 +0100
Subject: [PATCH 0456/1686] io.elementary.videos: update to 2.8.3.

---
 srcpkgs/io.elementary.videos/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template
index c989ccaf6954..eaca37a83723 100644
--- a/srcpkgs/io.elementary.videos/template
+++ b/srcpkgs/io.elementary.videos/template
@@ -1,15 +1,15 @@
 # Template file for 'io.elementary.videos'
 pkgname=io.elementary.videos
-version=2.7.2
+version=2.8.3
 revision=1
 wrksrc="videos-${version}"
 build_style=meson
-hostmakedepends="intltool pkg-config vala AppStream"
+hostmakedepends="gettext pkg-config vala AppStream"
 makedepends="granite-devel clutter-gst3-devel clutter-gtk-devel
- gstreamer1-devel gst-plugins-base1-devel"
+ gstreamer1-devel gst-plugins-base1-devel libhandy1-devel"
 short_desc="Video player and library app designed for elementary OS"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/elementary/videos"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a
+checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6

From fcd7f08c01bad8fad5c52a3b4ba1ecb5edc327e9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:49:31 +0100
Subject: [PATCH 0457/1686] giti: remove package

* doesn't build with recent vala
---
 srcpkgs/giti/template             | 13 -------------
 srcpkgs/removed-packages/template |  3 ++-
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/giti/template

diff --git a/srcpkgs/giti/template b/srcpkgs/giti/template
deleted file mode 100644
index e3c8663fa536..000000000000
--- a/srcpkgs/giti/template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'giti'
-pkgname=giti
-version=1.0.0
-revision=1
-build_style=meson
-hostmakedepends="pkg-config vala gettext"
-makedepends="gtk+3-devel libgit2-glib-devel libgee08-devel granite-devel"
-short_desc="Permanent observer of your git directories"
-maintainer="linarcx <linarcx@riseup.net>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/LinArcX/giti"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=8054581f9eddf226a3e16e404ef062ebaba0ea1223255d8b0c3eeac301cf6872
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5003333859c9..df264c9d7501 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=66
+revision=67
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -81,6 +81,7 @@ replaces="
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
  gespeaker<=0.8.6_3
+ giti<=1.0.0_1
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9

From 3f9de2ef837a6519371cb81492b8fe1f6afc99ec Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 12:22:51 +0100
Subject: [PATCH 0458/1686] colord-gtk: update to 0.3.0.

---
 common/shlibs               |  1 +
 srcpkgs/colord-gtk/template | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ffcc843af85c..7d323593a120 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1133,6 +1133,7 @@ libibus-1.0.so.5 ibus-1.4.99.20120917_1
 libxapian.so.30 libxapian-1.4.0_1
 libzeitgeist-1.0.so.1 libzeitgeist-0.3.18_1
 libcolord-gtk.so.1 colord-gtk-0.1.23_1
+libcolord-gtk4.so.1 colord-gtk-0.3.0_1
 libgdm.so.1 libgdm-3.6.0_1
 libclutter-gst-2.0.so.0 clutter-gst-1.9.92_1
 libcheese.so.8 libcheese-3.17.90_1
diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template
index 634a9322dae3..843320e63089 100644
--- a/srcpkgs/colord-gtk/template
+++ b/srcpkgs/colord-gtk/template
@@ -1,26 +1,27 @@
 # Template file for 'colord-gtk'
 pkgname=colord-gtk
-version=0.2.0
-revision=2
+version=0.3.0
+revision=1
 build_style=meson
 build_helper=gir
-configure_args="-Dtests=false -Dvapi=$(vopt_if vala true false)
- -Ddocs=$(vopt_if docs true false) -Dman=$(vopt_if man true false)"
-hostmakedepends="pkg-config intltool glib-devel libxslt
+configure_args="-Dtests=false $(vopt_bool vala vapi) $(vopt_bool docs docs)
+ $(vopt_bool man man)"
+hostmakedepends="pkg-config gettext glib-devel libxslt
  $(vopt_if docs gtk-doc) $(vopt_if vala vala-devel)
  $(vopt_if man docbook-xsl-ns)"
-makedepends="colord-devel gtk+3-devel"
+makedepends="colord-devel gtk+3-devel gtk4-devel"
 short_desc="GTK support library for colord"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/colord-gtk"
+changelog="https://raw.githubusercontent.com/hughsie/colord-gtk/main/NEWS"
 distfiles="${FREEDESKTOP_SITE}/colord/releases/${pkgname}-${version}.tar.xz"
-checksum=2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717
+checksum=b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0
 
 build_options="vala docs man"
-build_options_default="vala"
-desc_option_docs="Generate documents"
-desc_option_man="Generate manpage"
+build_options_default="vala man docs"
+desc_option_docs="Generate documentation"
+desc_option_man="Generate man pages"
 
 colord-gtk-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
@@ -33,5 +34,8 @@ colord-gtk-devel_package() {
 		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
+		if [ "$build_option_docs" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 4334f5580b8197c93d5f764c2817938159c8f7e7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 16:47:44 +0100
Subject: [PATCH 0459/1686] timg: update to 1.4.4.

---
 srcpkgs/timg/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/timg/template b/srcpkgs/timg/template
index 7774d007cf01..91f1516b2597 100644
--- a/srcpkgs/timg/template
+++ b/srcpkgs/timg/template
@@ -1,6 +1,6 @@
 # Template file for 'timg'
 pkgname=timg
-version=1.4.2
+version=1.4.4
 revision=1
 build_style=cmake
 configure_args="-DWITH_OPENSLIDE_SUPPORT=off -Wno-dev"
@@ -10,5 +10,5 @@ short_desc="24-bit color image & video viewer for terminal"
 maintainer="33KK <g33kk@pm.me>"
 license="GPL-2.0-only"
 homepage="https://github.com/hzeller/timg"
-distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=7607efaffbed0b65b3c824956de421b155a4f14243e7a752b19454f88bf9d563
+distfiles="https://github.com/hzeller/timg/archive/v${version}.tar.gz"
+checksum=66d2e00b50068fd6638bb8be1859c50ca4f24caef751f9dc95b303f37fb07b1e

From 2163993c17d922cf6ee80ccd1769bc63d2337982 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 26 Mar 2022 08:51:52 +0100
Subject: [PATCH 0460/1686] wine: update to 7.5.

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  | 8 ++++----
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index b13cbe9ea48c..45cb7cbd5106 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.4/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index 82f45cc1d171..4ed5e2642d9f 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.4/configure
-+++ b/wine-7.4/configure
+--- a/wine-7.5/configure
++++ b/wine-7.5/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
---- a/wine-7.4/configure.ac
-+++ b/wine-7.4/configure.ac
+--- a/wine-7.5/configure.ac
++++ b/wine-7.5/configure.ac
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index 2fe1c18c553b..a358997c3963 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.4/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.4/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/wine-7.5/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/wine-7.5/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 8dfb8df9f6be..e9598ba932a0 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.4
+version=7.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="728e866d6e49ce92a2a0c514333e9ff08bdbf6c86f5ef4e6180143b8d2b7d416
- c1688af87737f47337a8f7e24d501d99582a691a2a08ba8e71b9911abbfd8554"
+checksum="462c3185aedeec851067a5165d648f5499fb93c1b655f46b825f4bc11914e281
+ 3b3a10654c90b210ab8dbf9d0aa2d2e3f4179a73e56e7c2101008e77903afead"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 86ce9d15cebc3ed0b1ae380da6221c236da1c66d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 00:52:47 +0100
Subject: [PATCH 0461/1686] apostrophe: update to 2.6.1.

---
 srcpkgs/apostrophe/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index 127919d611a3..d130b8694cd4 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,7 +1,7 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.5
-revision=2
+version=2.6.1
+revision=1
 wrksrc="$pkgname-v$version"
 build_style=meson
 build_helper=gir
@@ -14,4 +14,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/World/apostrophe"
 distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz"
-checksum=366b239ea7bb720c11fc7344827b6739e4983132c9932aa4705a3b88533d75e4
+checksum=f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c

From 739594745a9f585dbd932514a2a44d0ff8b99427 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Mar 2022 13:09:45 +1100
Subject: [PATCH 0462/1686] openvpn: update to 2.5.6.

---
 srcpkgs/openvpn/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index 04bead136a49..bb874a247ab1 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openvpn'
 pkgname=openvpn
-version=2.5.5
+version=2.5.6
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_enable pkcs11) --disable-systemd
@@ -12,8 +12,9 @@ short_desc="Easy-to-use, robust, and highly configurable VPN"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://www.openvpn.net"
+changelog="https://raw.githubusercontent.com/OpenVPN/openvpn/release/${version%.*}/Changes.rst"
 distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz"
-checksum=119bd69fa0210838f6cdaa273696dc738efa200f454dbe11eb6dfb75dfb6003b
+checksum=13c7c3dc399d1b571cabf189c4d34ae34656ee72b6bde2a8059c1e9bc61574ed
 
 build_options="mbedtls pkcs11"
 build_options_default="pkcs11"

From 8d443d241169b734449a5ee1d648a2a88d3b7332 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:02 +0100
Subject: [PATCH 0463/1686] meson: update to 0.61.4.

---
 srcpkgs/meson/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 67fa3514289f..2f9ccaaa4691 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,6 +1,6 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.60.3
+version=0.61.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e
+checksum=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then

From 586a6bd46df155aa2b063c98b3530335b7039b7e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 0464/1686] Marker: fix for meson 0.61

---
 srcpkgs/Marker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Marker/template b/srcpkgs/Marker/template
index be02723dc4ed..eed5bddc36c3 100644
--- a/srcpkgs/Marker/template
+++ b/srcpkgs/Marker/template
@@ -4,7 +4,7 @@ version=2020.04.04
 revision=1
 wrksrc=marker
 build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config itstool gettext"
 makedepends="gtksourceview-devel gtkspell3-devel gtk+3-devel libglib-devel
  webkit2gtk-devel"
 depends="iso-codes"

From 1044bb37a76b9eede8a0437460ee9f81ffe75e4c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:58 +0100
Subject: [PATCH 0465/1686] accountsservice: fix for meson 0.61

---
 .../accountsservice/patches/meson-0.61.patch  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/accountsservice/patches/meson-0.61.patch

diff --git a/srcpkgs/accountsservice/patches/meson-0.61.patch b/srcpkgs/accountsservice/patches/meson-0.61.patch
new file mode 100644
index 000000000000..9245afdd47d2
--- /dev/null
+++ b/srcpkgs/accountsservice/patches/meson-0.61.patch
@@ -0,0 +1,29 @@
+From ac9b14f1c1bbca413987d0bbfeaad05804107e9a Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <bluca@debian.org>
+Date: Sun, 31 Oct 2021 12:29:14 +0000
+Subject: Fix build with meson 0.60
+
+Positional parameters to merge_file() were never allowed and always
+ignored, so just drop it.
+See: https://github.com/mesonbuild/meson/issues/9441
+
+Fixes #97
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 70edf89..9e80299 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -33,7 +33,6 @@ configure_file(
+ policy = act_namespace.to_lower() + '.policy'
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy + '.in',
+   output: policy,
+   po_dir: po_dir,
+-- 
+cgit v1.2.1
+

From bb017bdaf955a1f4febc22334276537487affe01 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0466/1686] bijiben: fix for meson 0.61

---
 srcpkgs/bijiben/patches/meson-0.61.patch | 46 ++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 srcpkgs/bijiben/patches/meson-0.61.patch

diff --git a/srcpkgs/bijiben/patches/meson-0.61.patch b/srcpkgs/bijiben/patches/meson-0.61.patch
new file mode 100644
index 000000000000..7576536953a1
--- /dev/null
+++ b/srcpkgs/bijiben/patches/meson-0.61.patch
@@ -0,0 +1,46 @@
+From 01ccae2ccb640b2d33fd09c3dfb7d605830b5b0f Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 22 Jan 2022 23:16:37 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build         | 2 --
+ 2 files changed, 3 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 48a31e3..d78d052 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ info = 'org.gnome.Notes.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
+diff --git a/data/meson.build b/data/meson.build
+index d00d98f..556d564 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ subdir('appdata')
+ mime = 'org.gnome.Notes.xml'
+ 
+ i18n.merge_file(
+-  mime,
+   input: mime + '.in',
+   output: mime,
+   po_dir: po_dir,
+@@ -18,7 +17,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set ('icon', application_id)
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: files (desktop + '.in'),
+-- 
+2.34.1
+

From bc6d8263ead14f84e80ba04799b32d770a80f9a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0467/1686] cinnamon: fix for meson 0.61

---
 srcpkgs/cinnamon/patches/meson-0.61.patch | 53 +++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 srcpkgs/cinnamon/patches/meson-0.61.patch

diff --git a/srcpkgs/cinnamon/patches/meson-0.61.patch b/srcpkgs/cinnamon/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f0937a355f92
--- /dev/null
+++ b/srcpkgs/cinnamon/patches/meson-0.61.patch
@@ -0,0 +1,53 @@
+From 37de1aaae1edd1fbcd3c2ef2ac5f4baa4c8e2751 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 18:14:35 -0500
+Subject: [PATCH] Revert "build: disable gir install via list to pacify meson
+ >= 0.60.2 (#10489)"
+
+This reverts commit 8fc2df08b40aa3e1958ed2fde853c50676d8cf48.
+
+This commit was wrong, because it tried to work around a bug in a single
+version of meson by using something that isn't, wasn't, and won't be a
+valid value.
+
+The fixed version of meson 0.60.x has been out for a while now, which
+once again accepts `false`, and 0.61.0 also accepts `false` but was
+known at the time of this workaround to not work in meson-git master
+(now meson 0.61.0).
+
+Using `false` is acceptable and the failure to accept it has been
+qualified as a meson regression. Using `[false]` is just... trying to
+fuzz meson with random objects until you get something that slips its
+way through the argument checker and produces desired effects on the
+python implementation level.
+---
+ src/meson.build    | 2 +-
+ src/st/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 7999c0a67b..34b130d50f 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -196,7 +196,7 @@ cinnamon_gir = gnome.generate_gir(
+     includes: cinnamon_gir_includes,
+     install: true,
+     install_dir_typelib: pkglibdir,
+-    install_dir_gir: [false],
++    install_dir_gir: false,
+     extra_args: [
+         '-DST_COMPILATION',
+         '--quiet',
+diff --git a/src/st/meson.build b/src/st/meson.build
+index d299727d06..ec7d7b30a1 100644
+--- a/src/st/meson.build
++++ b/src/st/meson.build
+@@ -213,7 +213,7 @@ st_gir = gnome.generate_gir(
+     includes: st_gir_includes,
+     install: true,
+     install_dir_typelib: pkglibdir,
+-    install_dir_gir: [false],
++    install_dir_gir: false,
+     extra_args: [
+         '-DST_COMPILATION',
+         '--quiet',

From 2a33d26399b52aad1f9ca697736856e76a1a7802 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0468/1686] d-feet: fix for meson 0.61

---
 srcpkgs/d-feet/patches/meson-0.61.patch | 33 +++++++++++++++++++++++++
 srcpkgs/d-feet/x                        |  1 -
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/d-feet/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/d-feet/x

diff --git a/srcpkgs/d-feet/patches/meson-0.61.patch b/srcpkgs/d-feet/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f8e7f64a60c0
--- /dev/null
+++ b/srcpkgs/d-feet/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From b5a99f86395fd71dc08907ac3c5f2d757384c49f Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 23 Jan 2022 12:35:26 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 026bd80..3b03b94 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+@@ -25,7 +24,6 @@ i18n.merge_file(
+ appdata = df_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+2.34.1
+
diff --git a/srcpkgs/d-feet/x b/srcpkgs/d-feet/x
deleted file mode 100644
index 166f7a957085..000000000000
--- a/srcpkgs/d-feet/x
+++ /dev/null
@@ -1 +0,0 @@
-xbps-query: option requires an argument -- 's'

From 494d933e35b41e18ec8757fac4248f49fba0582b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0469/1686] dconf-editor: fix for meson 0.61

---
 srcpkgs/dconf-editor/patches/meson-0.61.patch | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/dconf-editor/patches/meson-0.61.patch

diff --git a/srcpkgs/dconf-editor/patches/meson-0.61.patch b/srcpkgs/dconf-editor/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b6f06606e882
--- /dev/null
+++ b/srcpkgs/dconf-editor/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 56474378568e6ff4af8aa912810323e808c1d977 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:22:58 +0100
+Subject: [PATCH] editor/meson.build: fix meson 0.61 errors
+
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ editor/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/editor/meson.build b/editor/meson.build
+index 4c89ab99..0eb3bb1a 100644
+--- a/editor/meson.build
++++ b/editor/meson.build
+@@ -1,7 +1,6 @@
+ desktop = dconf_editor_namespace + '.desktop'
+ 
+ i18n.merge_file (
+-  desktop,
+   type: 'desktop',
+   input: desktop + '.in',
+   output: desktop,
+@@ -26,7 +25,6 @@ configure_file(
+ appdata = dconf_editor_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 75f7589f0eed70366bd517517117c596ac664866 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0470/1686] devhelp: fix for meson 0.61

---
 srcpkgs/devhelp/patches/meson-0.61.patch | 48 ++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 srcpkgs/devhelp/patches/meson-0.61.patch

diff --git a/srcpkgs/devhelp/patches/meson-0.61.patch b/srcpkgs/devhelp/patches/meson-0.61.patch
new file mode 100644
index 000000000000..dfea339688e3
--- /dev/null
+++ b/srcpkgs/devhelp/patches/meson-0.61.patch
@@ -0,0 +1,48 @@
+From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:02:20 +0800
+Subject: [PATCH] Remove incorrect arg for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments and
+explicitly rejects with error "ERROR: Function does not take
+positional arguments" since meson 0.60.0
+---
+ data/meson.build                 | 2 --
+ plugins/gedit-plugin/meson.build | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c6aeffb4..0bc531a2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', APPLICATION_ID)
+ appdata = APPLICATION_ID + '.appdata.xml'
+ appdata_file = I18N.merge_file(
+-  appdata,
+   input: configure_file(
+     input: 'org.gnome.Devhelp.appdata.xml.in.in',
+     output: APPLICATION_ID + '.appdata.xml.in',
+@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('application_id', APPLICATION_ID)
+ desktop = APPLICATION_ID + '.desktop'
+ desktop_file = I18N.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Devhelp.desktop.in.in',
+diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
+index 4f779886..877a01ff 100644
+--- a/plugins/gedit-plugin/meson.build
++++ b/plugins/gedit-plugin/meson.build
+@@ -7,7 +7,6 @@ install_data(
+ 
+ plugin_info_file = 'devhelp.plugin'
+ I18N.merge_file(
+-  plugin_info_file,
+   type: 'desktop',
+   input: plugin_info_file + '.desktop.in',
+   output: plugin_info_file,
+-- 
+GitLab
+

From 2e10c4109bf2d74f06a73b065c52af9b57214d4a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0471/1686] epiphany: fix for meson 0.61

---
 srcpkgs/epiphany/patches/meson-0.61.patch | 33 +++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/epiphany/patches/meson-0.61.patch

diff --git a/srcpkgs/epiphany/patches/meson-0.61.patch b/srcpkgs/epiphany/patches/meson-0.61.patch
new file mode 100644
index 000000000000..1584627ca2d9
--- /dev/null
+++ b/srcpkgs/epiphany/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Wed, 24 Nov 2021 04:52:42 +0000
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 46df3fd80..eac6b8224 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -16,7 +16,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop = i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+     input: files('org.gnome.Epiphany.desktop.in.in'),
+     output: 'org.gnome.Epiphany.desktop.in',
+@@ -32,7 +31,6 @@ desktop = i18n.merge_file(
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: files('org.gnome.Epiphany.appdata.xml.in.in'),
+     output: 'org.gnome.Epiphany.appdata.xml.in',
+-- 
+GitLab
+

From 3999695c97f3b540a499d35fe2e3b988ce159fa6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:10:59 +0100
Subject: [PATCH 0472/1686] evince: fix for meson 0.61

---
 srcpkgs/evince/patches/meson-0.61.patch | 52 +++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 srcpkgs/evince/patches/meson-0.61.patch

diff --git a/srcpkgs/evince/patches/meson-0.61.patch b/srcpkgs/evince/patches/meson-0.61.patch
new file mode 100644
index 000000000000..baed9dc1af8f
--- /dev/null
+++ b/srcpkgs/evince/patches/meson-0.61.patch
@@ -0,0 +1,52 @@
+From 1060b24d051607f14220f148d2f7723b29897a54 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Wed, 17 Nov 2021 18:22:45 +0800
+Subject: [PATCH] Remove incorrect args for i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for
+a time and explicitly rejects with error since meson 0.60.0
+---
+ backend/meson.build | 1 -
+ data/meson.build    | 1 -
+ meson.build         | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/backend/meson.build b/backend/meson.build
+index e44c1d6d7..ab3df9acf 100644
+--- a/backend/meson.build
++++ b/backend/meson.build
+@@ -50,7 +50,6 @@ foreach backend, backend_mime_types: backends
+   )
+ 
+   i18n.merge_file(
+-    appstream,
+     input: appstream_in,
+     output: appstream,
+     po_dir: po_dir,
+diff --git a/data/meson.build b/data/meson.build
+index 8a308b853..afc302098 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -15,7 +15,6 @@ foreach desktop: desktops
+   )
+ 
+   i18n.merge_file(
+-    desktop,
+     type: 'desktop',
+     input: desktop_in,
+     output: desktop,
+diff --git a/meson.build b/meson.build
+index 34c86661f..f74efb3c4 100644
+--- a/meson.build
++++ b/meson.build
+@@ -492,7 +492,6 @@ install_headers(
+ appdata = ev_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 86af67026738ecc716c4652e4654ccdaf89b0c48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0473/1686] fprintd: fix for meson 0.61

---
 srcpkgs/fprintd/patches/meson-0.61.patch | 146 +++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 srcpkgs/fprintd/patches/meson-0.61.patch

diff --git a/srcpkgs/fprintd/patches/meson-0.61.patch b/srcpkgs/fprintd/patches/meson-0.61.patch
new file mode 100644
index 000000000000..836c7e036054
--- /dev/null
+++ b/srcpkgs/fprintd/patches/meson-0.61.patch
@@ -0,0 +1,146 @@
+From 50943b1bd4f18d103c35233f0446ce7a31d1817e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
+Date: Wed, 27 Oct 2021 15:44:31 +0200
+Subject: [PATCH] build: Do not use positional arguments in i18n.merge_file
+
+This was never really used and it's breaking meson 60.
+While this may just become a warning in 60.1, it's just better to avoid
+using it.
+
+See: https://github.com/mesonbuild/meson/issues/9441
+---
+ data/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 92bfa2e..ece5fc6 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -24,7 +24,7 @@ if get_option('systemd')
+ endif
+ 
+ polkit_policy = 'net.reactivated.fprint.device.policy'
+-polkit_policy_target = i18n.merge_file(polkit_policy,
++polkit_policy_target = i18n.merge_file(
+     input: '@0@.in'.format(polkit_policy),
+     output: polkit_policy,
+     po_dir: meson.source_root() / 'po',
+-- 
+GitLab
+
+From f4256533d1ffdc203c3f8c6ee42e8dcde470a93f Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 21:06:35 -0500
+Subject: [PATCH] use more idiomatic/correct embedded shell scripting
+
+Formatting arguments into code is fragile, and meson natively knows how
+to pass files as arguments via argv. So pass them as arguments to the
+shell.
+---
+ doc/dbus/meson.build | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build
+index 802938e..861da64 100644
+--- a/doc/dbus/meson.build
++++ b/doc/dbus/meson.build
+@@ -19,11 +19,10 @@ foreach interface_file: dbus_interfaces_files
+         capture: true,
+         command: [
+             bash, '-c',
+-            'cat @INPUT@;' +
+-            xsltproc.path() + ' @0@/@1@ '.format(
+-                meson.source_root(),
+-                files('spec-to-docbook.xsl')[0]) +
+-            interface_file.full_path() + '| tail -n +2;',
++            'cat "$1"; "$2" "$3" "$4" | tail -n +2',
++            '_', # argv0 ignored
++            '@INPUT@',
++            xsltproc, files('spec-to-docbook.xsl')[0], interface_file
+         ],
+     )
+ endforeach
+-- 
+GitLab
+
+From 2c34cef5ef2004d8479475db5523c572eb409a6b Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 20:46:29 -0500
+Subject: [PATCH] remove pointless copying of files into build directory
+
+I'm not entirely sure what this did, but it seems to be obsoleted by
+commit 93bad825406d13ed5eb2cf27541dc58194bef8f3.
+---
+ doc/dbus/meson.build                          |  6 +++---
+ src/meson.build                               | 20 ++++++-------------
+ ....xml => net.reactivated.Fprint.Device.xml} |  0
+ ...xml => net.reactivated.Fprint.Manager.xml} |  0
+ 4 files changed, 9 insertions(+), 17 deletions(-)
+ rename src/{device.xml => net.reactivated.Fprint.Device.xml} (100%)
+ rename src/{manager.xml => net.reactivated.Fprint.Manager.xml} (100%)
+
+diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build
+index 861da64..431127d 100644
+--- a/doc/dbus/meson.build
++++ b/doc/dbus/meson.build
+@@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header',
+ )
+ 
+ dbus_interfaces_refs = []
+-foreach interface_file: dbus_interfaces_files
+-    basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip()
++foreach interface_file: dbus_interfaces
++    basename = run_command('basename', interface_file, '.xml').stdout().strip()
+     dbus_interfaces_refs += custom_target(basename + '_ref',
+         input: docbook_xml_header,
+         output: basename + '.ref.xml',
+         build_by_default: true,
+-        depends: interface_file,
++        depend_files: interface_file,
+         capture: true,
+         command: [
+             bash, '-c',
+diff --git a/src/meson.build b/src/meson.build
+index 1df6216..a7ce3fe 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,22 +1,14 @@
+ bash = find_program('bash')
+-dbus_interfaces = ['Manager', 'Device']
+-dbus_interfaces_files = []
++dbus_interfaces = files(
++    'net.reactivated.Fprint.Manager.xml',
++    'net.reactivated.Fprint.Device.xml',
++)
+ 
+-foreach interface_name: dbus_interfaces
+-    interface = interface_name.to_lower()
+-    interface_file = interface + '.xml'
+-    dbus_interfaces_files += custom_target('dbus_interface_' + interface,
+-        input: interface_file,
+-        output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name),
+-        command: ['cp', '@INPUT@', '@OUTPUT@'],
+-        install: true,
+-        install_dir: dbus_interfaces_dir,
+-    )
+-endforeach
++install_data(dbus_interfaces, install_dir: dbus_interfaces_dir)
+ 
+ # NOTE: We should pass "--glib-min-required 2.64" but cannot
+ fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus',
+-    sources: dbus_interfaces_files,
++    sources: dbus_interfaces,
+     autocleanup: 'all',
+     interface_prefix: 'net.reactivated.Fprint.',
+     namespace: 'FprintDBus',
+diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml
+similarity index 100%
+rename from src/device.xml
+rename to src/net.reactivated.Fprint.Device.xml
+diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml
+similarity index 100%
+rename from src/manager.xml
+rename to src/net.reactivated.Fprint.Manager.xml
+-- 
+GitLab
+

From 81fc22f28080c5082c640292918162f2e28e2f59 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0474/1686] fractal: fix for meson 0.61

---
 srcpkgs/fractal/patches/meson-0.61.patch | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/fractal/patches/meson-0.61.patch

diff --git a/srcpkgs/fractal/patches/meson-0.61.patch b/srcpkgs/fractal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..79197803abf5
--- /dev/null
+++ b/srcpkgs/fractal/patches/meson-0.61.patch
@@ -0,0 +1,35 @@
+From 6fa1a23596d65d94aa889efe725174e6cd2903f0 Mon Sep 17 00:00:00 2001
+From: Jonas Platte <jplatte+git@posteo.de>
+Date: Sun, 31 Oct 2021 15:23:31 +0100
+Subject: [PATCH] Remove deprecated positional argument to i18n.merge_file
+
+See https://github.com/mesonbuild/meson/issues/9441
+---
+ fractal-gtk/res/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/fractal-gtk/res/meson.build b/fractal-gtk/res/meson.build
+index 7a7a7d65..a176787c 100644
+--- a/fractal-gtk/res/meson.build
++++ b/fractal-gtk/res/meson.build
+@@ -2,7 +2,7 @@ subdir('icons')
+ 
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Fractal.desktop.in.in'),
+@@ -28,7 +28,7 @@ endif
+ 
+ metainfo_conf = configuration_data()
+ metainfo_conf.set('appid', application_id)
+-metainfo_file = i18n.merge_file ('metainfo-file',
++metainfo_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Fractal.metainfo.xml.in.in'),
+     output: 'org.gnome.Fractal.metainfo.xml.in',
+-- 
+GitLab
+

From 99022a5136f200215a8f1f2869604758c7c9fc48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0475/1686] gcr: fix for meson 0.61

---
 srcpkgs/gcr/patches/meson-0.61.patch | 59 ++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 srcpkgs/gcr/patches/meson-0.61.patch

diff --git a/srcpkgs/gcr/patches/meson-0.61.patch b/srcpkgs/gcr/patches/meson-0.61.patch
new file mode 100644
index 000000000000..21c1c3610226
--- /dev/null
+++ b/srcpkgs/gcr/patches/meson-0.61.patch
@@ -0,0 +1,59 @@
+From b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8 Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Wed, 12 Jan 2022 00:24:20 +0100
+Subject: [PATCH] meson: Fix unknown kw argument in gnome.generate_gir
+
+This argument has been removed in Meson 0.61.0:
+
+    gck/meson.build:130:2: ERROR: gnome.generate_gir got unknown keyword arguments "packages"
+
+https://github.com/mesonbuild/meson/commit/f8fc5cb860465718fe7c79a1bf1fe00659f138de:
+
+> The packages argument to gnome.generate_gir was allowed, but never did anything, so stop passing it.
+
+Fixes #89
+---
+ gck/meson.build | 1 -
+ gcr/meson.build | 1 -
+ ui/meson.build  | 1 -
+ 3 files changed, 3 deletions(-)
+
+diff --git a/gck/meson.build b/gck/meson.build
+index 756b486..a21a1e9 100644
+--- a/gck/meson.build
++++ b/gck/meson.build
+@@ -131,7 +131,6 @@ if get_option('introspection')
+     sources: gck_gir_sources,
+     namespace: 'Gck',
+     nsversion: '@0@'.format(gck_major_version),
+-    packages: gck_deps,
+     export_packages: 'gck-@0@'.format(gck_major_version),
+     includes: [ 'GObject-2.0', 'Gio-2.0' ],
+     header: 'gck/gck.h',
+diff --git a/gcr/meson.build b/gcr/meson.build
+index 2233a44..c83641b 100644
+--- a/gcr/meson.build
++++ b/gcr/meson.build
+@@ -190,7 +190,6 @@ if get_option('introspection')
+     sources: [ gcr_base_public_sources, gcr_base_headers ],
+     namespace: 'Gcr',
+     nsversion: '@0@'.format(gcr_major_version),
+-    packages: gcr_base_deps,
+     export_packages: 'gcr-base-@0@'.format(gcr_major_version),
+     includes: [
+       'GObject-2.0',
+diff --git a/ui/meson.build b/ui/meson.build
+index e656ea2..32ee057 100644
+--- a/ui/meson.build
++++ b/ui/meson.build
+@@ -152,7 +152,6 @@ if get_option('introspection')
+     export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
+     identifier_prefix: 'Gcr',
+     symbol_prefix: 'gcr',
+-    packages: gcr_ui_deps,
+     includes: [
+       'GObject-2.0',
+       'Gio-2.0',
+-- 
+GitLab
+

From 486164b8c5d3915bf2f25ee99742a435fefd380e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0476/1686] gitg: fix for meson 0.61

---
 srcpkgs/gitg/patches/meson-0.61.patch | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/gitg/patches/meson-0.61.patch

diff --git a/srcpkgs/gitg/patches/meson-0.61.patch b/srcpkgs/gitg/patches/meson-0.61.patch
new file mode 100644
index 000000000000..330d45fc5ad8
--- /dev/null
+++ b/srcpkgs/gitg/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From c81e1579afe7f221371b6866c25f388f48747728 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sun, 23 Jan 2022 14:54:31 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index a8b90fd1..2413531d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -6,7 +6,6 @@ desktop_config = configuration_data()
+ desktop_config.set('icon', application_id)
+ desktop_config.set('binary', gitg_name)
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: desktop + '.in.in',
+@@ -42,7 +41,6 @@ appdata_config = configuration_data()
+ appdata_config.set('app-id', application_id)
+ appdata_config.set('gettext', gitg_name)
+ i18n.merge_file(
+-  appdata,
+   type: 'xml',
+   input: configure_file(
+     input: appdata + '.in.in',
+-- 
+2.34.1
+

From 5a2af4372b797e9d897a9232792bddc1b907ab84 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:20:40 +0100
Subject: [PATCH 0477/1686] glade3: fix for meson 0.61

---
 srcpkgs/glade3/patches/meson-0.61.patch | 57 +++++++++++++++++++++++++
 srcpkgs/glade3/template                 |  2 +-
 2 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/glade3/patches/meson-0.61.patch

diff --git a/srcpkgs/glade3/patches/meson-0.61.patch b/srcpkgs/glade3/patches/meson-0.61.patch
new file mode 100644
index 000000000000..72f9c0e509ba
--- /dev/null
+++ b/srcpkgs/glade3/patches/meson-0.61.patch
@@ -0,0 +1,57 @@
+From 61304b2e8bac8ded76643cb7c3e781f73881dd2b Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:18:09 -0500
+Subject: [PATCH 1/2] meson: i18n.merge_file() does not take a positional
+ argument
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 9f244566..bfbc514c 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', glade_version)
+ 
+ i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: configure_file(
+     input: 'org.gnome.Glade.desktop.in.in',
+@@ -18,7 +17,6 @@ i18n.merge_file(
+ appdata = glade_name + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Glade.appdata.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+-- 
+GitLab
+
+
+From 04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 20 Jan 2022 14:19:03 -0500
+Subject: [PATCH 2/2] Remove duplicate entry for 'da' from help/LINGUAS
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index fc3cd4c3..d67e42c8 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -1,6 +1,5 @@
+ # please keep this list sorted alphabetically
+ #
+-da
+ bg
+ ca
+ cs
+-- 
+GitLab
+
diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template
index 763632c1e712..a0235c1faef9 100644
--- a/srcpkgs/glade3/template
+++ b/srcpkgs/glade3/template
@@ -4,7 +4,7 @@ version=3.38.2
 revision=1
 wrksrc="glade-${version}"
 build_style=meson
-build_helper="gir"
+build_helper="gir qemu"
 configure_args="-Dgtk_doc=true -Dman=true $(vopt_bool gir introspection)"
 hostmakedepends="glib-devel intltool itstool pkg-config
  gjs-devel yelp-tools gettext-devel gtk-doc"

From e1747edc5f73f3f81c658e7bed4cf0d360f2ebfa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:19:02 +0100
Subject: [PATCH 0478/1686] gnome-2048: fix for meson 0.61

---
 srcpkgs/gnome-2048/patches/meson-0.61.patch | 36 +++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnome-2048/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-2048/patches/meson-0.61.patch b/srcpkgs/gnome-2048/patches/meson-0.61.patch
new file mode 100644
index 000000000000..912759654d73
--- /dev/null
+++ b/srcpkgs/gnome-2048/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sun, 23 Jan 2022 10:49:07 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:19:0: ERROR: Function does not take positional arguments.
+data/meson.build:39:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 33f73ca..8974a63 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,7 +17,6 @@ install_data(
+ 
+ # Desktop file
+ desktop_file = i18n.merge_file(
+-  'desktop-file',
+   input: 'org.gnome.TwentyFortyEight.desktop.in',
+   output: 'org.gnome.TwentyFortyEight.desktop',
+   install: true,
+@@ -37,7 +36,6 @@ endif
+ 
+ # AppData file
+ appdata_file = i18n.merge_file(
+-  'appdata-file',
+   input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
+   output: 'org.gnome.TwentyFortyEight.appdata.xml',
+   install: true,
+-- 
+GitLab
+

From 145b48fd7e5b6399a681f73f3075b6afaecb6c74 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:37:12 +0100
Subject: [PATCH 0479/1686] gnome-authenticator: fix for meson 0.61

---
 .../patches/meson-0.61.patch                   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/gnome-authenticator/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-authenticator/patches/meson-0.61.patch b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..eade2e1241b5
--- /dev/null
+++ b/srcpkgs/gnome-authenticator/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -63,7 +63,6 @@ configure_file(
+ desktop_conf = configuration_data()
+ desktop_conf.set('APP_ID', application_id)
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+     input: meson.project_name() + '.desktop.in.in',
+     output: '@BASENAME@',
+@@ -90,7 +89,6 @@ appdata_conf = configuration_data()
+ appdata_conf.set('APP_ID', application_id)
+ appdata_conf.set('GETTEXT_PACKAGE', gettext_package)
+ appdata_file = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: meson.project_name() + '.appdata.xml.in.in',
+     output: '@BASENAME@',

From 338732390abb5895cc722923200ce38bbe27e907 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 16:44:19 +0100
Subject: [PATCH 0480/1686] gnome-bluetooth: fix for meson 0.61

---
 .../gnome-bluetooth/patches/meson-0.61.patch  | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/gnome-bluetooth/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c6962edd4f05
--- /dev/null
+++ b/srcpkgs/gnome-bluetooth/patches/meson-0.61.patch
@@ -0,0 +1,25 @@
+From 755fd758f866d3a3f7ca482942beee749f13a91e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 7 Jan 2022 12:51:22 +0100
+Subject: [PATCH] build: Fix build for newer versions of meson
+
+sendto/meson.build:24:5: ERROR: Function does not take positional arguments.
+---
+ sendto/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sendto/meson.build b/sendto/meson.build
+index 24a4e394..3e233a03 100644
+--- a/sendto/meson.build
++++ b/sendto/meson.build
+@@ -22,7 +22,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file (
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: desktop,
+-- 
+GitLab
+

From 6df2194bfb294d55c4655c73da804244ef81c7b7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 17:47:14 +0100
Subject: [PATCH 0481/1686] gnome-books: fix for meson 0.61

---
 srcpkgs/gnome-books/patches/meson-0.61.patch | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0e6ba9befd96
--- /dev/null
+++ b/srcpkgs/gnome-books/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Wed, 9 Mar 2022 17:46:00 +0100
+Subject: [PATCH] meson: remove positional args from i18n.merge_file
+
+This causes the build to fail with meson 0.61+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bc6edfb4..5061554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -54,7 +54,6 @@ sources += gnome.compile_resources(
+ appdata = 'org.gnome.Books.appdata.xml'
+ 
+ appdata_file = i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+@@ -74,7 +73,6 @@ if appstream_util.found()
+ desktop = 'org.gnome.Books.desktop'
+ 
+ desktop_file = i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop + '.in',
+   output: desktop,
+-- 
+2.35.1
+

From 0d72818f84bb350ac613c06a856fc4ff35162c15 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0482/1686] gnome-boxes: fix for meson 0.61

---
 srcpkgs/gnome-boxes/patches/meson-0.61.patch | 36 ++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnome-boxes/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-boxes/patches/meson-0.61.patch b/srcpkgs/gnome-boxes/patches/meson-0.61.patch
new file mode 100644
index 000000000000..3d9c56f5841c
--- /dev/null
+++ b/srcpkgs/gnome-boxes/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From fd0acfbe79444687c73dea182c2d1a5fa1c77324 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 15 Jan 2022 00:07:31 +0100
+Subject: [PATCH] build: remove positional i18n.merge_file arguments
+
+otherwise building with meson 0.61+ fails:
+
+    ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index d32638a8..2dc1798b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,7 +20,6 @@ resources = gnome.compile_resources ('org.gnome.Boxes',
+ desktop_conf = configuration_data ()
+ desktop_conf.set ('icon', application_id)
+ desktop = i18n.merge_file (
+-  'desktop',
+   input: configure_file (
+     input: files ('org.gnome.Boxes.desktop.in'),
+     output: 'org.gnome.Boxes.desktop.in',
+@@ -65,7 +64,7 @@ configure_file (
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file (
+     input: files ('org.gnome.Boxes.appdata.xml.in'),
+     output: 'org.gnome.Boxes.appdata.xml.in',
+-- 
+2.34.1
+

From 9e72c87263c39eb639b12d78392f5157df57a247 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0483/1686] gnome-calendar: fix for meson 0.61

---
 srcpkgs/gnome-calendar/patches/meson-0.61.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/gnome-calendar/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-calendar/patches/meson-0.61.patch b/srcpkgs/gnome-calendar/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e2df31e0760e
--- /dev/null
+++ b/srcpkgs/gnome-calendar/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: files('org.gnome.Calendar.appdata.xml.in.in'),
+     output: 'org.gnome.Calendar.appdata.xml.in',

From b1f9258b8744535b0567875492137244afd0e5af Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:00 +0100
Subject: [PATCH 0484/1686] gnome-characters: fix for meson 0.61

---
 .../gnome-characters/patches/meson-0.61.patch  | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/gnome-characters/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-characters/patches/meson-0.61.patch b/srcpkgs/gnome-characters/patches/meson-0.61.patch
new file mode 100644
index 000000000000..248f8d5dced7
--- /dev/null
+++ b/srcpkgs/gnome-characters/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -47,7 +47,6 @@ desktop_conf.set('appid', characters_application_id)
+ desktop_conf.set('bindir', characters_bindir)
+ 
+ i18n.merge_file(
+-  'desktop-file',
+   type: 'desktop',
+   input: configure_file (
+     input: characters_name + '.desktop.in',
+@@ -61,7 +60,6 @@ i18n.merge_file(
+ )
+ 
+ appdata_file = i18n.merge_file(
+-  'appdata-file',
+   input: characters_name + '.appdata.xml.in',
+   output: characters_application_id + '.appdata.xml',
+   po_dir: po_dir,

From 805d72c7d982a519019fe52a70e23e1e8b6d24fe Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:34:03 +0100
Subject: [PATCH 0485/1686] gnome-dictionary: fix for meson 0.61

---
 .../gnome-dictionary/patches/meson-0.61.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/gnome-dictionary/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-dictionary/patches/meson-0.61.patch b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
new file mode 100644
index 000000000000..768494e2a8cf
--- /dev/null
+++ b/srcpkgs/gnome-dictionary/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,6 +1,6 @@
+ appdata_conf = configuration_data()
+ appdata_conf.set('application_id', application_id)
+-i18n.merge_file('appdata',
++i18n.merge_file(
+   input: configure_file(
+     input: 'org.gnome.Dictionary.appdata.xml.in.in',
+     output: 'org.gnome.Dictionary.appdata.xml.in',
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,7 @@ subdir('appdata')
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('application_id', application_id)
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+     input: 'org.gnome.Dictionary.desktop.in.in',
+     output: 'org.gnome.Dictionary.desktop.in',
+@@ -45,7 +45,7 @@ sources = [
+ ]
+ 
+ foreach s: sources
+-  i18n.merge_file('sources',
++  i18n.merge_file(
+     input: '@0@.in'.format(s),
+     output: s,
+     install: true,

From a8e702839ef8c64e7856994aaf5fae2e7dbd7138 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0486/1686] gnome-disk-utility: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 srcpkgs/gnome-disk-utility/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
new file mode 100644
index 000000000000..09e0c33d0798
--- /dev/null
+++ b/srcpkgs/gnome-disk-utility/patches/meson-0.61.patch
@@ -0,0 +1,34 @@
+From 46ed7d26873b9741dff61f9df8e7778a8dc6f5cc Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Fri, 17 Dec 2021 12:29:30 +0000
+Subject: [PATCH] build: fix arguments of i18n.merge_file
+
+`i18n.merge_file` has been ignoring positional arguments for a time
+and explicitly rejects with error since meson 0.60.0
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index e38a1d8e..38fb5207 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -11,7 +11,6 @@ desktops = [
+ 
+ foreach desktop: desktops
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -38,7 +37,6 @@ install_data(
+ info = 'org.gnome.DiskUtility.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
+-- 
+GitLab
+

From d4e174320b64b876dd5dc918dcef762a0e537f2f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:45:53 +0100
Subject: [PATCH 0487/1686] gnome-documents: fix for meson 0.61

---
 .../gnome-documents/patches/meson-0.61.patch   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch
new file mode 100644
index 000000000000..131d34509406
--- /dev/null
+++ b/srcpkgs/gnome-documents/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -56,7 +56,6 @@ foreach app: documents_apps
+   appdata = app + '.appdata.xml'
+ 
+   appdata_file = i18n.merge_file(
+-    appdata,
+     input: appdata + '.in',
+     output: appdata,
+     po_dir: po_dir,
+@@ -76,7 +75,6 @@ foreach app: documents_apps
+   desktop = app + '.desktop'
+ 
+   desktop_file = i18n.merge_file(
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,

From 7b9865f682e1ec5a6ce0fd30fd188b1f07faca23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0488/1686] gnome-font-viewer: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 srcpkgs/gnome-font-viewer/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..072ce27fd0d2
--- /dev/null
+++ b/srcpkgs/gnome-font-viewer/patches/meson-0.61.patch
@@ -0,0 +1,40 @@
+From 218166246e29a39e2eac8d3f06976038571b0603 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Thu, 30 Dec 2021 17:14:47 +0800
+Subject: [PATCH] Fix meson build with meson 0.60.0+
+
+`i18n.merge_file` has been ignoring positional arguments for a time
+and explicitly rejects with error since meson 0.60.0
+---
+ data/meson.build | 2 +-
+ src/meson.build  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bfc9caa..8e42134 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ appdatadir = join_paths(datadir, 'metainfo')
+ appdata_file = 'org.gnome.font-viewer.appdata.xml'
+-merged_appdata = i18n.merge_file(appdata_file,
++merged_appdata = i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
+diff --git a/src/meson.build b/src/meson.build
+index f863d45..826c59b 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop'
+ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', meson.project_version())
+ desktop_conf.set('APPLICATION_ID', application_id)
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: configure_file(input: desktop_file + '.in.in',
+     output: desktop_file + '.in',
+     configuration: desktop_conf),
+-- 
+GitLab
+

From 7ad3c667db1a2152854c50503558479e27890cee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:45:56 +0100
Subject: [PATCH 0489/1686] gnome-games: fix for meson 0.61

---
 srcpkgs/gnome-games/patches/meson-0.61.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0a3b006b227b
--- /dev/null
+++ b/srcpkgs/gnome-games/patches/meson-0.61.patch
@@ -0,0 +1,20 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -44,7 +44,7 @@ mime_types = [
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+ desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Games.desktop.in.in'),
+@@ -70,7 +70,7 @@ endif
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Games.appdata.xml.in.in'),
+     output: 'org.gnome.Games.appdata.xml.in',

From dc5c9bd21286eefdd928383adb2a06d2e0d30d23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:14:37 +0100
Subject: [PATCH 0490/1686] gnome-mahjongg: fix for meson 0.61

---
 .../gnome-mahjongg/patches/meson-0.61.patch   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 srcpkgs/gnome-mahjongg/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
new file mode 100644
index 000000000000..2a17ad713752
--- /dev/null
+++ b/srcpkgs/gnome-mahjongg/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:22:48 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+data/meson.build:45:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 8740503..edb8583 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
+ 
+ desktop_file = i18n.merge_file (
+-  'desktop-file',
+   input:       'org.gnome.Mahjongg.desktop.in',
+   output:      'org.gnome.Mahjongg.desktop',
+   install:     true,
+@@ -41,7 +40,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+                  input: 'org.gnome.Mahjongg.appdata.xml.in',
+                  output: 'org.gnome.Mahjongg.appdata.xml',
+                  install: true,
+-- 
+GitLab
+

From 459889a6af774864ca531c229c4b2b1ea6e8127b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0491/1686] gnome-music: fix for meson 0.61

---
 srcpkgs/gnome-music/patches/meson-0.61.patch | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/gnome-music/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-music/patches/meson-0.61.patch b/srcpkgs/gnome-music/patches/meson-0.61.patch
new file mode 100644
index 000000000000..aca43b5608a2
--- /dev/null
+++ b/srcpkgs/gnome-music/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+From d9f35b542adbf6b0e1114c7c077df04212a98fc7 Mon Sep 17 00:00:00 2001
+From: Jean Felder <jfelder@src.gnome.org>
+Date: Thu, 18 Nov 2021 12:09:26 +0100
+Subject: [PATCH] meson: Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0
+where it returns a deprecation message:
+"DEPRECATION: i18n.merge_file does not take any positional
+arguments. This will become a hard error in the next Meson release."
+
+See: https://github.com/mesonbuild/meson/issues/9441
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 25ff1e102..145ee5221 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -47,7 +47,6 @@ appdata_conf.set('appid', APPLICATION_ID)
+ appdata_conf.set('package_url', PACKAGE_URL)
+ appdata_conf.set('package_url_bug', PACKAGE_URL_BUG)
+ i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     output: PROJECT_RDNN_NAME + '.appdata.xml.in',
+     input: PROJECT_RDNN_NAME + '.appdata.xml.in.in',
+-- 
+GitLab
+

From 1bfa2d897093e6f42cba7378f8471c7c7c1f650f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:23:31 +0100
Subject: [PATCH 0492/1686] gnome-photos: fix for meson 0.61

---
 srcpkgs/gnome-photos/patches/meson-0.61.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/gnome-photos/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-photos/patches/meson-0.61.patch b/srcpkgs/gnome-photos/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f406b1c494c0
--- /dev/null
+++ b/srcpkgs/gnome-photos/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From a0ac868a19d55dc52100e54fe4b2d29041bc6752 Mon Sep 17 00:00:00 2001
+From: rvalue <i@rvalue.moe>
+Date: Fri, 21 Jan 2022 12:36:02 +0000
+Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 6e7192e0..94271de2 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -3,7 +3,6 @@ subdir('icons')
+ appdata = photos_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: appdata,
+   po_dir: po_dir,
+@@ -23,7 +22,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: desktop,
+-- 
+GitLab
+

From d9401be1bae1af3dfde6da16d7db484ec14dfcd4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:25:42 +0100
Subject: [PATCH 0493/1686] gnome-podcasts: fix for meson 0.61

---
 .../gnome-podcasts/patches/meson-0.61.patch   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/gnome-podcasts/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-podcasts/patches/meson-0.61.patch b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b5ad823b70cf
--- /dev/null
+++ b/srcpkgs/gnome-podcasts/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 6614bb62ecbec7c3b18ea7fe44beb50fe7942b27 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Thu, 20 Jan 2022 01:27:48 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+podcasts-gtk/resources/meson.build:5:0: ERROR: Function does not take positional arguments.
+podcasts-gtk/resources/meson.build:30:0: ERROR: Function does not take positional arguments.
+---
+ podcasts-gtk/resources/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/podcasts-gtk/resources/meson.build b/podcasts-gtk/resources/meson.build
+index c1f1ee9f..87148087 100644
+--- a/podcasts-gtk/resources/meson.build
++++ b/podcasts-gtk/resources/meson.build
+@@ -2,7 +2,7 @@ subdir('icons')
+ 
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Podcasts.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Podcasts.appdata.xml.in.in'),
+     output: 'org.gnome.Podcasts.appdata.xml.in',
+-- 
+GitLab
+

From f21cb8d1e342053d0b79127465294b035aff38de Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:27:03 +0100
Subject: [PATCH 0494/1686] gnome-screenshot: fix for meson 0.61

---
 .../gnome-screenshot/patches/meson-0.61.patch | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnome-screenshot/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-screenshot/patches/meson-0.61.patch b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b21aa0490d49
--- /dev/null
+++ b/srcpkgs/gnome-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001
+From: Jack Hill <jackhill@jackhill.us>
+Date: Thu, 18 Nov 2021 00:46:58 -0500
+Subject: [PATCH] meson: remove extraneous positional argument
+
+* data/meson.build (desktop_file)
+  (metainfo_file): Remove extraneous positional argument.
+
+Closes #186
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd570b3..4e2e2e8 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,7 +1,6 @@
+ gnome = import('gnome')
+ 
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   type: 'desktop',
+   input: 'org.gnome.Screenshot.desktop.in',
+   output: 'org.gnome.Screenshot.desktop',
+@@ -23,7 +22,6 @@ if desktop_file_validate.found()
+ endif
+ 
+ metainfo_file = i18n.merge_file(
+-  'appdata',
+   input: 'org.gnome.Screenshot.metainfo.xml.in',
+   output: 'org.gnome.Screenshot.metainfo.xml',
+   po_dir: join_paths(meson.current_source_dir(), '../po'),
+-- 
+GitLab
+

From 3998dc805abe005ac2708220617ed3b75e64fdda Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:28:32 +0100
Subject: [PATCH 0495/1686] gnome-settings-daemon: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
new file mode 100644
index 000000000000..b7c03ca2da63
--- /dev/null
+++ b/srcpkgs/gnome-settings-daemon/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From afa7e4bb9c519e2daf500a6079088669500768c0 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Wed, 26 Jan 2022 23:08:58 +0100
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+---
+ plugins/power/meson.build | 1 -
+ plugins/wacom/meson.build | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/plugins/power/meson.build b/plugins/power/meson.build
+index 69e619f2..014bb6da 100644
+--- a/plugins/power/meson.build
++++ b/plugins/power/meson.build
+@@ -76,7 +76,6 @@ if host_is_linux
+   )
+ 
+   i18n.merge_file(
+-    policy,
+     input: policy_in,
+     output: policy,
+     po_dir: po_dir,
+diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
+index d8dd0ec7..c00323d4 100644
+--- a/plugins/wacom/meson.build
++++ b/plugins/wacom/meson.build
+@@ -7,7 +7,6 @@ policy_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  policy,
+   input: policy_in,
+   output: policy,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 976f3b9dfbd8012c1db71f79c1b1133b440439b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:30:02 +0100
Subject: [PATCH 0496/1686] gnome-shell: fix for meson 0.61

---
 srcpkgs/gnome-shell/patches/meson-0.61.patch | 82 ++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 srcpkgs/gnome-shell/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-shell/patches/meson-0.61.patch b/srcpkgs/gnome-shell/patches/meson-0.61.patch
new file mode 100644
index 000000000000..ad3b7ef3923a
--- /dev/null
+++ b/srcpkgs/gnome-shell/patches/meson-0.61.patch
@@ -0,0 +1,82 @@
+From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Thu, 23 Dec 2021 17:18:16 +0100
+Subject: [PATCH] build: Drop incorrect positional arg
+
+Unlike other targets that take a name, i18n.merge_file() does not.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
+---
+ data/meson.build                                      | 2 +-
+ src/calendar-server/meson.build                       | 2 +-
+ subprojects/extensions-app/data/meson.build           | 2 +-
+ subprojects/extensions-app/data/metainfo/meson.build  | 2 +-
+ subprojects/extensions-tool/src/templates/meson.build | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f924fdf806..76ae45c93a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
+ 
+ foreach desktop_file : desktop_files
+-  i18n.merge_file('desktop',
++  i18n.merge_file(
+     input: configure_file(
+       input: desktop_file + '.in.in',
+       output: desktop_file + '.in',
+diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
+index 7363282a59..8b4ef411c8 100644
+--- a/src/calendar-server/meson.build
++++ b/src/calendar-server/meson.build
+@@ -27,7 +27,7 @@ configure_file(
+   install_dir: servicedir
+ )
+ 
+-i18n.merge_file('evolution-calendar.desktop',
++i18n.merge_file(
+   input: 'evolution-calendar.desktop.in',
+   output: 'evolution-calendar.desktop',
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
+index d7e7d4001c..4b601e8bd1 100644
+--- a/subprojects/extensions-app/data/meson.build
++++ b/subprojects/extensions-app/data/meson.build
+@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
+ desktopconf.set('app_id', app_id)
+ desktopconf.set('prgname', prgname)
+ 
+-i18n.merge_file('desktop',
++i18n.merge_file(
+   input: configure_file(
+     input: base_id + '.desktop.in.in',
+     output: desktop_file + '.in',
+diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build
+index c4962c0576..a19bfa80a4 100644
+--- a/subprojects/extensions-app/data/metainfo/meson.build
++++ b/subprojects/extensions-app/data/metainfo/meson.build
+@@ -1,5 +1,5 @@
+ metainfo = app_id + '.metainfo.xml'
+-i18n.merge_file(metainfo,
++i18n.merge_file(
+   input: base_id + '.metainfo.xml.in',
+   output: metainfo,
+   po_dir: po_dir,
+diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build
+index 670e2bf448..d693bfaddb 100644
+--- a/subprojects/extensions-tool/src/templates/meson.build
++++ b/subprojects/extensions-tool/src/templates/meson.build
+@@ -4,7 +4,7 @@ template_metas = [
+ ]
+ template_deps = []
+ foreach template : template_metas
+-  template_deps += i18n.merge_file(template,
++  template_deps += i18n.merge_file(
+     input: template + '.in',
+     output: template,
+     po_dir: po_dir,
+-- 
+GitLab
+

From f1c04a218ac84dfed7b6fda27e13b224e9de958b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 18:31:24 +0100
Subject: [PATCH 0497/1686] gnome-sound-recorder: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
new file mode 100644
index 000000000000..40392e6a9fe8
--- /dev/null
+++ b/srcpkgs/gnome-sound-recorder/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From 1335b1b1aff61167f8648f7cb3c569764031960d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:37:06 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:16:0: ERROR: Function does not take positional arguments.
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build         | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 1f5744e..d2c2c3a 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
+ metainfo_conf.set('gettext-package', gettext_package)
+ 
+ metainfo_file = i18n.merge_file(
+-  'metainfo-file',
+   input: configure_file(
+   	input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
+   	output: '@BASENAME@',
+diff --git a/data/meson.build b/data/meson.build
+index 44117ad..0ff8fa5 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -14,7 +14,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('app-id', application_id)
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+   	input: 'org.gnome.SoundRecorder.desktop.in.in',
+   	output: '@BASENAME@',
+-- 
+GitLab
+

From 93c3d535d7c3486a2782ffe1bbb289a39cc747ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:05:16 +0100
Subject: [PATCH 0498/1686] gnome-sudoku: fix for meson 0.61

---
 srcpkgs/gnome-sudoku/patches/meson-0.61.patch | 38 +++++++++++++++++++
 srcpkgs/gnome-sudoku/template                 |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/gnome-sudoku/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-sudoku/patches/meson-0.61.patch b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
new file mode 100644
index 000000000000..93549d0158d5
--- /dev/null
+++ b/srcpkgs/gnome-sudoku/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 7c9935a02b48f332f67bad3e4ee020b75591084a Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:44:06 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:24:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index f18f247..9c95e02 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ resource_files = files('gnome-sudoku.gresource.xml')
+ 
+ resources = gnome.compile_resources('gnome-sudoku', resource_files)
+ 
+-desktop_file = i18n.merge_file('desktop',
++desktop_file = i18n.merge_file(
+   input: '@0@.desktop.in'.format(application_id),
+   output: '@0@.desktop'.format(application_id),
+   install: true,
+@@ -21,7 +21,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file('appdata',
++appdata_file = i18n.merge_file(
+   input: '@0@.appdata.xml.in'.format(application_id),
+   output: '@0@.appdata.xml'.format(application_id),
+   install: true,
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-sudoku/template b/srcpkgs/gnome-sudoku/template
index ed1759478ab5..6e0af45248ff 100644
--- a/srcpkgs/gnome-sudoku/template
+++ b/srcpkgs/gnome-sudoku/template
@@ -5,7 +5,7 @@ revision=1
 build_helper="gir"
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
-makedepends="gtk4-devel libgee08-devel json-glib-devel qqwing-devel"
+makedepends="gtk+3-devel libgee08-devel json-glib-devel qqwing-devel"
 short_desc="GNOME Sudoku Japanese logic game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

From fe658aacb89b107c16cc147fd937362909ceec8e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:56:48 +0100
Subject: [PATCH 0499/1686] gnome-taquin: fix for meson 0.61

---
 srcpkgs/gnome-taquin/patches/meson-0.61.patch | 134 ++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 srcpkgs/gnome-taquin/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-taquin/patches/meson-0.61.patch b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e14267675ecb
--- /dev/null
+++ b/srcpkgs/gnome-taquin/patches/meson-0.61.patch
@@ -0,0 +1,134 @@
+From 99dea5e7863e112f33f16e59898c56a4f1a547b3 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 16 Jan 2021 14:00:15 +0100
+Subject: [PATCH] Don't alter or try to write [GtkChild] fields
+
+See https://gitlab.gnome.org/GNOME/vala/issues/1121
+---
+ src/overlayed-list.vala | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/src/overlayed-list.vala b/src/overlayed-list.vala
+index 3fbb1c3..eb2404a 100644
+--- a/src/overlayed-list.vala
++++ b/src/overlayed-list.vala
+@@ -89,11 +89,11 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+     internal void set_window_size (AdaptativeWidget.WindowSize new_size)
+     {
+         if (!AdaptativeWidget.WindowSize.is_extra_thin (new_size) && AdaptativeWidget.WindowSize.is_extra_flat (new_size))
+-            set_horizontal (ref main_context, ref edit_mode_box);
++            set_horizontal (ref main_context, edit_mode_box);
+         else
+-            set_vertical (ref main_context, ref edit_mode_box);
++            set_vertical (ref main_context, edit_mode_box);
+     }
+-    private static inline void set_horizontal (ref StyleContext main_context, ref Box edit_mode_box)
++    private static inline void set_horizontal (ref StyleContext main_context, Box edit_mode_box)
+     {
+         main_context.remove_class ("vertical");
+         edit_mode_box.halign = Align.END;
+@@ -102,7 +102,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+         edit_mode_box.width_request = 160;
+         main_context.add_class ("horizontal");
+     }
+-    private static inline void set_vertical (ref StyleContext main_context, ref Box edit_mode_box)
++    private static inline void set_vertical (ref StyleContext main_context, Box edit_mode_box)
+     {
+         main_context.remove_class ("horizontal");
+         edit_mode_box.halign = Align.CENTER;
+@@ -118,9 +118,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool next_match ()
+     {
+-        return _next_match (ref main_list_box);
++        return _next_match (main_list_box);
+     }
+-    private static inline bool _next_match (ref ListBox main_list_box)
++    private static inline bool _next_match (ListBox main_list_box)
+     {
+         ListBoxRow? row = main_list_box.get_selected_row ();    // TODO multiple rows and focus-only lists
+         if (row == null)
+@@ -130,7 +130,7 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+         if (row == null)
+         {
+-            _scroll_bottom (ref main_list_box);
++            _scroll_bottom (main_list_box);
+             return false;
+         }
+         main_list_box.select_row ((!) row);
+@@ -140,9 +140,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool previous_match ()
+     {
+-        return _previous_match (ref main_list_box);
++        return _previous_match (main_list_box);
+     }
+-    private static inline bool _previous_match (ref ListBox main_list_box)
++    private static inline bool _previous_match (ListBox main_list_box)
+     {
+         uint n_items = main_list_box.get_children ().length ();  // FIXME OverlayedList.n_items is unreliable
+         if (n_items == 0)
+@@ -189,9 +189,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected int [] get_selected_rows_indices ()
+     {
+-        return _get_selected_rows_indices (ref main_list_box);
++        return _get_selected_rows_indices (main_list_box);
+     }
+-    private static inline int [] _get_selected_rows_indices (ref ListBox main_list_box)
++    private static inline int [] _get_selected_rows_indices (ListBox main_list_box)
+     {
+         int [] indices = new int [0];
+         main_list_box.selected_foreach ((_list_box, selected_row) => {
+@@ -205,9 +205,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected void scroll_top ()
+     {
+-        _scroll_top (ref main_list_box);
++        _scroll_top (main_list_box);
+     }
+-    private static inline void _scroll_top (ref ListBox main_list_box)
++    private static inline void _scroll_top (ListBox main_list_box)
+     {
+         Adjustment adjustment = main_list_box.get_adjustment ();
+         adjustment.set_value (adjustment.get_lower ());
+@@ -215,9 +215,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     protected void scroll_bottom ()
+     {
+-        _scroll_bottom (ref main_list_box);
++        _scroll_bottom (main_list_box);
+     }
+-    private static inline void _scroll_bottom (ref ListBox main_list_box)
++    private static inline void _scroll_bottom (ListBox main_list_box)
+     {
+         Adjustment adjustment = main_list_box.get_adjustment ();
+         adjustment.set_value (adjustment.get_upper ());
+@@ -225,9 +225,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal bool handle_copy_text (out string copy_text)
+     {
+-        return _handle_copy_text (out copy_text, ref main_list_box);
++        return _handle_copy_text (out copy_text, main_list_box);
+     }
+-    private static inline bool _handle_copy_text (out string copy_text, ref ListBox main_list_box)
++    private static inline bool _handle_copy_text (out string copy_text, ListBox main_list_box)
+     {
+         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+         OverlayedListRow row;
+@@ -283,9 +283,9 @@ private abstract class OverlayedList : Overlay, AdaptativeWidget
+ 
+     internal SelectionState get_selection_state ()
+     {
+-        return _get_selection_state (ref main_list_box, ref main_list_store);
++        return _get_selection_state (main_list_box, ref main_list_store);
+     }
+-    private static inline SelectionState _get_selection_state (ref ListBox main_list_box, ref GLib.ListStore main_list_store)
++    private static inline SelectionState _get_selection_state (ListBox main_list_box, ref GLib.ListStore main_list_store)
+     {
+         List<weak ListBoxRow> selected_rows = main_list_box.get_selected_rows ();
+         uint n_selected_rows = selected_rows.length ();
+-- 
+GitLab
+

From ef4ee1ed7b43b55195e0663f0c278f5a24690ef5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0500/1686] gnome-terminal: fix for meson 0.61

---
 .../gnome-terminal/patches/meson-0.61.patch   | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 srcpkgs/gnome-terminal/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-terminal/patches/meson-0.61.patch b/srcpkgs/gnome-terminal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8b6edbb923a2
--- /dev/null
+++ b/srcpkgs/gnome-terminal/patches/meson-0.61.patch
@@ -0,0 +1,47 @@
+From 9a168cc23962ce9fa106dc8a40407d381a3db403 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@src.gnome.org>
+Date: Fri, 14 Jan 2022 11:33:32 +0100
+Subject: [PATCH] build: Fix for newer meson
+
+---
+ data/meson.build | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 79d97e5b..e0bcbb91 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -18,7 +18,6 @@
+ metainfodir = gt_datadir / 'metainfo'
+ 
+ i18n.merge_file(
+-  gt_dns_name + '.metainfo.xml',
+   input: gt_dns_name + '.metainfo.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+@@ -27,7 +26,6 @@ i18n.merge_file(
+ )
+ 
+ i18n.merge_file(
+-  gt_dns_name + '.Nautilus.metainfo.xml',
+   input: gt_dns_name + '.Nautilus.metainfo.xml.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+@@ -40,7 +38,6 @@ i18n.merge_file(
+ desktopdatadir = gt_datadir / 'applications'
+ 
+ i18n.merge_file(
+-  gt_dns_name + '.desktop',
+   input: gt_dns_name + '.desktop.in',
+   output: '@BASENAME@',
+   type: 'desktop',
+@@ -57,4 +54,4 @@ meson.add_install_script(
+ 
+ # Subdirs
+ 
+-subdir('icons')
+\ No newline at end of file
++subdir('icons')
+-- 
+GitLab
+

From 7859be92cc6d3336b1e15a744f895e6cfe2cc73a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:30:05 +0100
Subject: [PATCH 0501/1686] gnome-tetravex: fix for meson 0.61

---
 .../gnome-tetravex/patches/meson-0.61.patch   | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/gnome-tetravex/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-tetravex/patches/meson-0.61.patch b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
new file mode 100644
index 000000000000..12e0eab64ef0
--- /dev/null
+++ b/srcpkgs/gnome-tetravex/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:48:22 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+data/meson.build:59:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index bb77248..b881e8a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -34,7 +34,7 @@ endif
+ 
+ # Desktop file
+ if get_option('build_gui')
+-  desktop_file = i18n.merge_file ('desktop-file',
++  desktop_file = i18n.merge_file (
+                            input: project_id + '.desktop.in',
+                           output: project_id + '.desktop',
+                          install: true,
+@@ -56,7 +56,7 @@ endif
+ 
+ # AppData file
+ if get_option('build_gui')
+-  appdata_file = i18n.merge_file ('appdata-file',
++  appdata_file = i18n.merge_file (
+                            input: project_id + '.appdata.xml.in',
+                           output: project_id + '.appdata.xml',
+                          install: true,
+-- 
+GitLab
+

From 615677f2437cc47f88e116a12267e3a03aabeaaa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:27:12 +0100
Subject: [PATCH 0502/1686] gnome-tweaks: fix for meson 0.61

---
 srcpkgs/gnome-tweaks/patches/meson-0.61.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 srcpkgs/gnome-tweaks/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-tweaks/patches/meson-0.61.patch b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
new file mode 100644
index 000000000000..80efde38735e
--- /dev/null
+++ b/srcpkgs/gnome-tweaks/patches/meson-0.61.patch
@@ -0,0 +1,32 @@
+From dc9701e18775c01d0b69fabaa350147f70096da8 Mon Sep 17 00:00:00 2001
+From: Mae Dartmann <hello@maedartmann.name>
+Date: Wed, 16 Feb 2022 06:08:41 +0000
+Subject: [PATCH] meson: fix invalid positional argument
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index fd6d5da..74f7e82 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ appdata_file = 'org.gnome.tweaks.appdata.xml'
+-i18n.merge_file(appdata_file,
++i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
+@@ -8,7 +8,7 @@ i18n.merge_file(appdata_file,
+ )
+ 
+ desktop_file = 'org.gnome.tweaks.desktop'
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: desktop_file + '.in',
+   output: desktop_file,
+   po_dir: '../po',
+-- 
+GitLab
+

From ad77c6788a257479ca7f3ea559595b032781925d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0503/1686] gnome-weather: fix for meson 0.61

---
 srcpkgs/gnome-weather/patches/meson-0.61.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/gnome-weather/patches/meson-0.61.patch

diff --git a/srcpkgs/gnome-weather/patches/meson-0.61.patch b/srcpkgs/gnome-weather/patches/meson-0.61.patch
new file mode 100644
index 000000000000..a305b8c54dc4
--- /dev/null
+++ b/srcpkgs/gnome-weather/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -59,7 +59,6 @@ endif
+ appdata_conf = configuration_data()
+ appdata_conf.set('app_id', weather_id)
+ appdata = i18n.merge_file(
+-  'appdata',
+   input: configure_file(
+     input: '@0@.appdata.xml.in.in'.format(default_id),
+     output: '@0@.appdata.xml.in'.format(default_id),

From 700a785ce31610fe6093015964cb0c758ca11a95 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 19:31:37 +0100
Subject: [PATCH 0504/1686] gnote: fix for meson 0.61

---
 srcpkgs/gnote/patches/meson-0.61.patch | 36 ++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gnote/patches/meson-0.61.patch

diff --git a/srcpkgs/gnote/patches/meson-0.61.patch b/srcpkgs/gnote/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e5575c0fa3f7
--- /dev/null
+++ b/srcpkgs/gnote/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 32795e53681e3ecbaaa05817d4eb5fa1c124d35b Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:53:17 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:4:0: ERROR: Function does not take positional arguments.
+data/meson.build:41:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index a6138165..8d16368a 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ install_man('gnote.1')
+ 
+ desktop_file = 'org.gnome.Gnote.desktop'
+ gnote_desktop_file = i18n.merge_file(
+-  desktop_file,
+   type: 'desktop',
+   input: desktop_file + '.in',
+   output: desktop_file,
+@@ -39,7 +38,6 @@ configure_file(
+ 
+ gnote_appdata = 'org.gnome.Gnote.appdata.xml'
+ appdata_file = i18n.merge_file(
+-  gnote_appdata,
+   input: gnote_appdata + '.in',
+   output: gnote_appdata,
+   po_dir: '../po',
+-- 
+GitLab
+

From 764925f29e53eeb54c0d335694fa4a765e651650 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0505/1686] gobject-introspection: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 294 ++++++++++++++++++
 1 file changed, 294 insertions(+)
 create mode 100644 srcpkgs/gobject-introspection/patches/meson-0.61.patch

diff --git a/srcpkgs/gobject-introspection/patches/meson-0.61.patch b/srcpkgs/gobject-introspection/patches/meson-0.61.patch
new file mode 100644
index 000000000000..44bf409b1164
--- /dev/null
+++ b/srcpkgs/gobject-introspection/patches/meson-0.61.patch
@@ -0,0 +1,294 @@
+From 827494d6415b696a98fa195cbd883b50cc893bfc Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Tue, 11 Jan 2022 15:47:50 +0000
+Subject: [PATCH] doctool: Add templates_dir CLI argument
+
+We can find the templates directory using the module file once
+installed, but when running uninstalled we need to have a way to specify
+where the templates can be found in the sources directory.
+---
+ giscanner/docmain.py   |  4 +++-
+ giscanner/docwriter.py | 14 ++++++++------
+ 2 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/giscanner/docmain.py b/giscanner/docmain.py
+index dab063ef..88430f05 100644
+--- a/giscanner/docmain.py
++++ b/giscanner/docmain.py
+@@ -51,6 +51,8 @@ def doc_main(args):
+     parser.add_argument("-s", "--write-sections-file",
+                         action="store_const", dest="format", const="sections",
+                         help="Backwards-compatible equivalent to -f sections")
++    parser.add_argument("--templates-dir",
++                        action="store")
+ 
+     args = parser.parse_args(args[1:])
+     if not args.output:
+@@ -74,7 +76,7 @@ def doc_main(args):
+         with open(args.output, 'w', encoding='utf-8') as fp:
+             write_sections_file(fp, sections_file)
+     else:
+-        writer = DocWriter(transformer, args.language, args.format)
++        writer = DocWriter(transformer, args.language, args.format, args.templates_dir)
+         writer.write(args.output)
+ 
+     return 0
+diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
+index d0cd610f..b72ab2ac 100644
+--- a/giscanner/docwriter.py
++++ b/giscanner/docwriter.py
+@@ -1288,7 +1288,7 @@ LANGUAGES = {
+ 
+ 
+ class DocWriter(object):
+-    def __init__(self, transformer, language, output_format):
++    def __init__(self, transformer, language, output_format, templates_dir=None):
+         self._transformer = transformer
+ 
+         try:
+@@ -1300,18 +1300,20 @@ class DocWriter(object):
+         self._formatter = formatter_class(self._transformer)
+         self._language = self._formatter.language
+         self._output_format = output_format
++        self._templates_dir = templates_dir
+ 
+         self._lookup = self._get_template_lookup()
+ 
+     def _get_template_lookup(self):
+-        if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
++        if self._templates_dir is not None:
++            srcdir = self._templates_dir
++        elif 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
+             top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR']
+-            srcdir = os.path.join(top_srcdir, 'giscanner')
++            srcdir = os.path.join(top_srcdir, 'giscanner', 'doctemplates')
+         else:
+-            srcdir = os.path.dirname(__file__)
++            srcdir = os.path.join(os.path.dirname(__file__), 'doctemplates')
+ 
+-        template_dir = os.path.join(srcdir, 'doctemplates',
+-                                    self._formatter.output_format)
++        template_dir = os.path.join(srcdir, self._formatter.output_format)
+ 
+         return TemplateLookup(directories=[template_dir],
+                               module_directory=tempfile.mkdtemp(),
+-- 
+GitLab
+
+From effb1e09dee263cdac4ec593e8caf316e6f01fe2 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi@gnome.org>
+Date: Tue, 11 Jan 2022 15:51:10 +0000
+Subject: [PATCH] build: Avoid the doctemplates hack
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The hack that copies the doctemplates directory into the build
+directory has stopped working with newer versions of Meson; while it's
+possible to copy files, custom_target() cannot depend on a directory.
+Additionally, the dependency has always been broken.
+
+Instead, we enumerate the template files—after all, it's not like they
+change a lot—and then we list them as dependencies for the test targets.
+
+Fixes: #414
+---
+ giscanner/doctemplates/devdocs/meson.build | 19 +++++++
+ giscanner/doctemplates/mallard/meson.build | 63 ++++++++++++++++++++++
+ giscanner/meson.build                      | 14 ++---
+ tests/scanner/meson.build                  | 24 +++++----
+ 4 files changed, 98 insertions(+), 22 deletions(-)
+ create mode 100644 giscanner/doctemplates/devdocs/meson.build
+ create mode 100644 giscanner/doctemplates/mallard/meson.build
+
+diff --git a/giscanner/doctemplates/devdocs/meson.build b/giscanner/doctemplates/devdocs/meson.build
+new file mode 100644
+index 00000000..2037182a
+--- /dev/null
++++ b/giscanner/doctemplates/devdocs/meson.build
+@@ -0,0 +1,19 @@
++doc_templates += files([
++  'Gjs/_doc.tmpl',
++  'Gjs/_index.tmpl',
++  'Gjs/_method.tmpl',
++  'Gjs/_methods.tmpl',
++  'Gjs/_properties.tmpl',
++  'Gjs/_signals.tmpl',
++  'Gjs/_staticmethods.tmpl',
++  'Gjs/_vfuncs.tmpl',
++  'Gjs/base.tmpl',
++  'Gjs/callback.tmpl',
++  'Gjs/class.tmpl',
++  'Gjs/default.tmpl',
++  'Gjs/enum.tmpl',
++  'Gjs/function.tmpl',
++  'Gjs/interface.tmpl',
++  'Gjs/method.tmpl',
++  'Gjs/namespace.tmpl',
++])
+diff --git a/giscanner/doctemplates/mallard/meson.build b/giscanner/doctemplates/mallard/meson.build
+new file mode 100644
+index 00000000..5fe4e2af
+--- /dev/null
++++ b/giscanner/doctemplates/mallard/meson.build
+@@ -0,0 +1,63 @@
++base_templates = files([
++  'base.tmpl',
++  'class.tmpl',
++  'namespace.tmpl',
++])
++
++c_templates = files([
++  'C/callback.tmpl',
++  'C/class.tmpl',
++  'C/constructor.tmpl',
++  'C/default.tmpl',
++  'C/enum.tmpl',
++  'C/field.tmpl',
++  'C/function.tmpl',
++  'C/interface.tmpl',
++  'C/method.tmpl',
++  'C/namespace.tmpl',
++  'C/property.tmpl',
++  'C/record.tmpl',
++  'C/signal.tmpl',
++  'C/vfunc.tmpl',
++])
++
++gjs_templates = files([
++  'Gjs/callback.tmpl',
++  'Gjs/class.tmpl',
++  'Gjs/constructor.tmpl',
++  'Gjs/default.tmpl',
++  'Gjs/enum.tmpl',
++  'Gjs/field.tmpl',
++  'Gjs/function.tmpl',
++  'Gjs/interface.tmpl',
++  'Gjs/method.tmpl',
++  'Gjs/namespace.tmpl',
++  'Gjs/property.tmpl',
++  'Gjs/record.tmpl',
++  'Gjs/signal.tmpl',
++  'Gjs/vfunc.tmpl',
++])
++
++py_templates = files([
++  'Python/callback.tmpl',
++  'Python/class.tmpl',
++  'Python/constructor.tmpl',
++  'Python/default.tmpl',
++  'Python/enum.tmpl',
++  'Python/field.tmpl',
++  'Python/function.tmpl',
++  'Python/interface.tmpl',
++  'Python/method.tmpl',
++  'Python/namespace.tmpl',
++  'Python/property.tmpl',
++  'Python/record.tmpl',
++  'Python/signal.tmpl',
++  'Python/vfunc.tmpl',
++])
++
++doc_templates += [
++  base_templates,
++  c_templates,
++  gjs_templates,
++  py_templates,
++]
+diff --git a/giscanner/meson.build b/giscanner/meson.build
+index 41edcd44..3d7dc678 100644
+--- a/giscanner/meson.build
++++ b/giscanner/meson.build
+@@ -53,17 +53,9 @@ configure_file(input : '../girepository/gdump.c',
+ 
+ install_subdir('doctemplates', install_dir: giscannerdir)
+ 
+-# XXX: this doesn't track the input, but there is nothing to copy many files
+-# in meson.
+-doc_templates = custom_target('copy-templates',
+-  input : 'doctemplates',
+-  output : 'doctemplates',
+-  command : [
+-    python, '-c',
+-      'import sys, shutil;' +
+-      'shutil.rmtree(sys.argv[2], ignore_errors=True);' +
+-      'shutil.copytree(sys.argv[1], sys.argv[2])',
+-    '@INPUT@', '@OUTPUT@'])
++doc_templates = []
++subdir('doctemplates/devdocs')
++subdir('doctemplates/mallard')
+ 
+ flex = find_program('flex', 'win_flex')
+ bison = find_program('bison', 'win_bison')
+diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build
+index 5176b957..b81b3fd5 100644
+--- a/tests/scanner/meson.build
++++ b/tests/scanner/meson.build
+@@ -525,19 +525,26 @@ foreach gir : test_girs
+ endforeach
+ 
+ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
++  doctool_env = environment()
++  doctool_env.set('srcdir', meson.current_source_dir())
++  doctool_env.set('builddir', meson.current_build_dir())
++
+   foreach language : ['C', 'Python', 'Gjs']
+     regress_docs = custom_target(
+       'generate-docs-' + language,
+       input: regress_gir,
+-      depends: [doc_templates],
++      depend_files: doc_templates,
+       build_by_default: not cairo_deps_found,
++      env: doctool_env,
+       output: 'Regress-1.0-' + language,
+       command: [
+         python, girdoctool,
+         '--add-include-path=' + join_paths(build_root, 'gir'),
+         '--add-include-path=' + meson.current_build_dir(),
+         '--language', language,
+-        '@INPUT@', '-o', '@OUTPUT@'],
++        '--templates-dir=' + join_paths(meson.current_source_dir(), '../../giscanner/doctemplates'),
++        '@INPUT@', '-o', '@OUTPUT@',
++      ],
+     )
+ 
+     if cairo_deps_found
+@@ -546,10 +553,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+         python,
+         args: [gi_tester, 'Regress-1.0-' + language],
+         depends: [regress_docs],
+-        env: [
+-          'srcdir=' + meson.current_source_dir(),
+-          'builddir=' + meson.current_build_dir(),
+-        ],
++        env: doctool_env,
+       )
+     endif
+   endforeach
+@@ -557,9 +561,10 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+   regress_sections = custom_target(
+     'generate-docs-sections',
+     input: regress_gir,
+-    depends: [doc_templates],
++    depend_files: [doc_templates],
+     build_by_default: not cairo_deps_found,
+     output: 'Regress-1.0-sections.txt',
++    env: doctool_env,
+     command: [
+       python, girdoctool,
+       '--add-include-path=' + join_paths(build_root, 'gir'),
+@@ -574,10 +579,7 @@ if has_girdoctool and glib_dep.type_name() == 'pkgconfig'
+       python,
+       args: [gi_tester, 'Regress-1.0-sections.txt'],
+       depends: [regress_sections],
+-      env: [
+-        'srcdir=' + meson.current_source_dir(),
+-        'builddir=' + meson.current_build_dir(),
+-      ],
++      env: doctool_env,
+     )
+   endif
+ endif
+-- 
+GitLab
+

From 26e21357afad3848ca08915e882b90554108b21c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 Jan 2022 10:11:01 +0100
Subject: [PATCH 0506/1686] gthumb: fix for meson 0.61

---
 .../patches/linguas-remove-duplicate.patch    | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/gthumb/patches/linguas-remove-duplicate.patch

diff --git a/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch
new file mode 100644
index 000000000000..00e9dde84669
--- /dev/null
+++ b/srcpkgs/gthumb/patches/linguas-remove-duplicate.patch
@@ -0,0 +1,24 @@
+From daef485dffd67319c114cf1bda453bf6157e11ff Mon Sep 17 00:00:00 2001
+From: Paolo Bacchilega <paobac@src.gnome.org>
+Date: Tue, 11 Jan 2022 12:30:44 +0100
+Subject: [PATCH] LINGUAS: removed duplicated entry
+
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index b615195e..aabf71ac 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -9,7 +9,6 @@ eu
+ fr
+ hu
+ id
+-id
+ nl
+ oc
+ sl
+-- 
+GitLab
+

From d68bf8be05ab7d96c76c2bbc1e6ac0389e689d9b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:45:46 +0100
Subject: [PATCH 0507/1686] gtranslator: fix for meson 0.61

---
 srcpkgs/gtranslator/patches/meson-0.61.patch | 36 ++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 srcpkgs/gtranslator/patches/meson-0.61.patch

diff --git a/srcpkgs/gtranslator/patches/meson-0.61.patch b/srcpkgs/gtranslator/patches/meson-0.61.patch
new file mode 100644
index 000000000000..54063041fe16
--- /dev/null
+++ b/srcpkgs/gtranslator/patches/meson-0.61.patch
@@ -0,0 +1,36 @@
+From 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 11:57:43 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:37:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2ca0be0b..2ebbfb12 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@0@.desktop'.format(gtr_app_id),
+@@ -35,7 +34,6 @@ appdata_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata_in,
+   output: appdata,
+   po_dir: po_dir,
+-- 
+GitLab
+

From 981232f57424bc5f2346c142a1d5e546dc3b0c30 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:19 +0100
Subject: [PATCH 0508/1686] gvfs: fix for meson 0.61

---
 srcpkgs/gvfs/patches/meson-0.61.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 srcpkgs/gvfs/patches/meson-0.61.patch

diff --git a/srcpkgs/gvfs/patches/meson-0.61.patch b/srcpkgs/gvfs/patches/meson-0.61.patch
new file mode 100644
index 000000000000..38f04b2e894c
--- /dev/null
+++ b/srcpkgs/gvfs/patches/meson-0.61.patch
@@ -0,0 +1,10 @@
+--- a/daemon/meson.build
++++ b/daemon/meson.build
+@@ -366,7 +366,6 @@ if enable_admin
+   )
+ 
+   i18n.merge_file(
+-    policy,
+     input: policy_in,
+     output: '@BASENAME@',
+     po_dir: po_dir,

From 4a9855f980bd2a8f580ebe6b121ce88e3591b711 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 22 Mar 2022 22:42:58 +0100
Subject: [PATCH 0509/1686] harfbuzz: fix for meson 0.61

---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 894a1b7bf9fe..d5c501aa5413 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -3,7 +3,7 @@ pkgname=harfbuzz
 version=3.3.1
 revision=1
 build_style=meson
-build_helper=gir
+build_helper="gir qemu"
 configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
  -Dgraphite=enabled -Dintrospection=enabled"
 hostmakedepends="glib-devel pkg-config gtk-doc"

From bf81c67f6aec7282a2e8c324090ed45c016d4d97 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 21:57:05 +0100
Subject: [PATCH 0510/1686] hitori: fix for meson 0.61

---
 srcpkgs/hitori/patches/meson-0.61.patch | 41 +++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 srcpkgs/hitori/patches/meson-0.61.patch

diff --git a/srcpkgs/hitori/patches/meson-0.61.patch b/srcpkgs/hitori/patches/meson-0.61.patch
new file mode 100644
index 000000000000..37adaa0116e6
--- /dev/null
+++ b/srcpkgs/hitori/patches/meson-0.61.patch
@@ -0,0 +1,41 @@
+From d25728e122f1d7b985029a5ba96810c3e57c27f7 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <pwithnall@endlessos.org>
+Date: Tue, 2 Nov 2021 12:04:29 +0000
+Subject: [PATCH] build: Drop positional arguments from i18n.merge_file() calls
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Meson never took positional arguments in this function, but didn’t warn
+about it until Meson 0.60. Drop the unnecessary arguments to fix the
+warning.
+
+Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 97b8e68..c66a233 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ subdir('icons')
+ 
+-desktop_file = i18n.merge_file('desktop-file',
++desktop_file = i18n.merge_file(
+   type: 'desktop',
+   input: '@0@.desktop.in'.format(application_id),
+   output: '@0@.desktop'.format(application_id),
+@@ -20,7 +20,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file('appdata-file',
++appdata_file = i18n.merge_file(
+   input: '@0@.appdata.xml.in'.format(application_id),
+   output: '@0@.appdata.xml'.format(application_id),
+   po_dir: join_paths(meson.source_root(), 'po'),
+-- 
+GitLab
+

From 80324346663e2b8129d050d8e7d9bfeab6b9a338 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 21:07:42 +0100
Subject: [PATCH 0511/1686] io.elementary.code: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/io.elementary.code/patches/meson-0.61.patch

diff --git a/srcpkgs/io.elementary.code/patches/meson-0.61.patch b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
new file mode 100644
index 000000000000..87a88aabff47
--- /dev/null
+++ b/srcpkgs/io.elementary.code/patches/meson-0.61.patch
@@ -0,0 +1,22 @@
+From a2607cce3a6b1bb62d02456456d3cbc3c6530bb0 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:25 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#1165)
+
+---
+ data/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c2ff0c2881..1f3940d481 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -64,7 +64,6 @@ if get_option ('have_pkexec')
+     )
+ 
+     i18n.merge_file(
+-        'policy',
+         input: policy_in,
+         output: meson.project_name() + '.policy',
+         po_dir: join_paths(meson.source_root (), 'po', 'extra'),

From 121dc8a3d278b70612de8d30bcf60488955d19ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 22:54:07 +0100
Subject: [PATCH 0512/1686] io.elementary.music: fix for meson 0.61

---
 .../patches/meson-0.61.patch                   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/io.elementary.music/patches/meson-0.61.patch

diff --git a/srcpkgs/io.elementary.music/patches/meson-0.61.patch b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
new file mode 100644
index 000000000000..17393cc5aa07
--- /dev/null
+++ b/srcpkgs/io.elementary.music/patches/meson-0.61.patch
@@ -0,0 +1,18 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -27,7 +27,6 @@ install_data(
+ 
+ i18n = import('i18n')
+ desktop_file = i18n.merge_file(
+-    'desktop',
+     input: meson.project_name() + '.desktop.in',
+     output: meson.project_name() + '.desktop',
+     install: true,
+@@ -37,7 +36,6 @@ desktop_file = i18n.merge_file(
+ )
+ 
+ appdata_file = i18n.merge_file(
+-    'appdata',
+     input: meson.project_name() + '.appdata.xml.in',
+     output: meson.project_name() + '.appdata.xml',
+     install: true,

From 88230ebd113ead4a2cd2e775433dcc5075b712cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 15 Mar 2022 20:24:34 +0100
Subject: [PATCH 0513/1686] io.elementary.terminal: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 srcpkgs/io.elementary.terminal/patches/meson-0.61.patch

diff --git a/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
new file mode 100644
index 000000000000..7fd1fb455335
--- /dev/null
+++ b/srcpkgs/io.elementary.terminal/patches/meson-0.61.patch
@@ -0,0 +1,38 @@
+From 15e3ace08cb25e53941249fa1ee680a1e2f871b4 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 02:00:28 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#649)
+
+---
+ data/meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 435b84172..a64fc120e 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ install_data(
+ )
+ 
+ i18n.merge_file (
+-    'desktop',
+     input: meson.project_name() + '.desktop.in',
+     output: meson.project_name() + '.desktop',
+     install: true,
+@@ -14,7 +13,6 @@ i18n.merge_file (
+ )
+ 
+ i18n.merge_file (
+-    'desktop',
+     input: 'open-pantheon-terminal-here.desktop.in',
+     output: 'open-pantheon-terminal-here.desktop',
+     install: true,
+@@ -24,7 +22,6 @@ i18n.merge_file (
+ )
+ 
+ i18n.merge_file (
+-    'appdata',
+     input: meson.project_name() + '.appdata.xml.in',
+     output: meson.project_name() + '.appdata.xml',
+     install: true,

From 79dc00a609a16250381b39532621f2c31b0a866b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 17:07:09 +0100
Subject: [PATCH 0514/1686] libaccounts-glib: fix for meson 0.61

---
 srcpkgs/libaccounts-glib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libaccounts-glib/template b/srcpkgs/libaccounts-glib/template
index ad3a6e0621a9..9b86ed45ed91 100644
--- a/srcpkgs/libaccounts-glib/template
+++ b/srcpkgs/libaccounts-glib/template
@@ -17,9 +17,9 @@ checksum=eebb1c6debfcf929efb388a0f28d8cc8ec9b32f273e4abe4224a33e5d299cd73
 if [ "$CROSS_BUILD" ]; then
 	# Remove docs. During install of package, it will try
 	# to run target binary with host, which causes exec error
-		pre_build() {
-			vsed -e '/docs/d' -i meson.build
-		}
+	post_patch() {
+		vsed -e '/docs/d' -i meson.build
+	}
 fi
 
 libaccounts-glib-devel_package() {

From 68601e0dd2c9da50059aac809e18bb083207ceda Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 12 Mar 2022 18:44:04 +0100
Subject: [PATCH 0515/1686] network-manager-applet: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch

diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
new file mode 100644
index 000000000000..1060e15b364a
--- /dev/null
+++ b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Fri, 21 Jan 2022 22:34:09 +0100
+Subject: [PATCH] meson.build: address meson 0.61 failures
+
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
+---
+ meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 33adb632..6178c0eb 100644
+--- a/meson.build
++++ b/meson.build
+@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
+ 
+ foreach desktop: desktop_files
+   i18n.merge_file(
+-    desktop + '-desktop',
+     input: desktop + '.desktop.in',
+     output: desktop + '.desktop',
+     install: true,
+@@ -275,7 +274,6 @@ endforeach
+ appdata = 'nm-connection-editor.appdata.xml'
+ 
+ i18n.merge_file(
+-  'desktop',
+   input: appdata + '.in',
+   output: appdata,
+   install: true,
+-- 
+GitLab
+

From b58f07500e08720ee0756af905d3a9290856ccd3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 23:46:01 +0100
Subject: [PATCH 0516/1686] newsflash: fix for meson 0.61

---
 srcpkgs/newsflash/patches/meson-0.61.patch | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/newsflash/patches/meson-0.61.patch

diff --git a/srcpkgs/newsflash/patches/meson-0.61.patch b/srcpkgs/newsflash/patches/meson-0.61.patch
new file mode 100644
index 000000000000..bfc8a67d0aa8
--- /dev/null
+++ b/srcpkgs/newsflash/patches/meson-0.61.patch
@@ -0,0 +1,20 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ subdir('icons')
+ 
+ desktop_conf = configuration_data()
+ desktop_conf.set('icon', application_id)
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('com.gitlab.newsflash.desktop.in.in'),
+@@ -27,7 +27,7 @@ endif
+ 
+ appdata_conf = configuration_data()
+ appdata_conf.set('appid', application_id)
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('com.gitlab.newsflash.appdata.xml.in.in'),
+     output: '@BASENAME@',

From b613a1b9c8aeafb05e1479cc863d3291f0066bf2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 11:35:35 +0100
Subject: [PATCH 0517/1686] orc: fix for meson 0.61

---
 srcpkgs/orc/template | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template
index 36311464556b..10f306289ddf 100644
--- a/srcpkgs/orc/template
+++ b/srcpkgs/orc/template
@@ -3,8 +3,9 @@ pkgname=orc
 version=0.4.32
 revision=1
 build_style=meson
-configure_args="-Dexamples=disabled -Dtests=disabled"
-hostmakedepends="pkg-config gtk-doc"
+build_helper="gir"
+configure_args="-Dexamples=disabled -Dtests=disabled -Dgtk_doc=$(vopt_if gtk_doc enabled disabled)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
 short_desc="Oild Runtime Compiler"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
@@ -12,6 +13,12 @@ homepage="https://cgit.freedesktop.org/gstreamer/orc"
 distfiles="http://gstreamer.freedesktop.org/src/orc/orc-${version}.tar.xz"
 checksum=a66e3d8f2b7e65178d786a01ef61f2a0a0b4d0b8370de7ce134ba73da4af18f0
 
+build_options="gtk_doc"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
 post_install() {
 	vlicense COPYING
 }
@@ -25,6 +32,8 @@ orc-devel_package() {
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 		vmove usr/share/aclocal
-		vmove usr/share/gtk-doc
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 53f98fae795ab04647db233e8452c47971c33e45 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:06:25 +0100
Subject: [PATCH 0518/1686] p11-kit: fix for meson 0.61

---
 srcpkgs/p11-kit/patches/meson-0.61.patch | 42 ++++++++++++++++++++++++
 srcpkgs/p11-kit/template                 | 14 ++++++--
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/p11-kit/patches/meson-0.61.patch

diff --git a/srcpkgs/p11-kit/patches/meson-0.61.patch b/srcpkgs/p11-kit/patches/meson-0.61.patch
new file mode 100644
index 000000000000..43e75620c40e
--- /dev/null
+++ b/srcpkgs/p11-kit/patches/meson-0.61.patch
@@ -0,0 +1,42 @@
+From 9f01a8a45ba913a9b65894cef9369b6010005096 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 23:25:05 -0500
+Subject: [PATCH] gtkdoc: remove dependencies on custom target files
+
+Sadly, the `dependencies` kwarg does not actually do what it seems to be
+trying to be used for, here. It is for listing dependency or library
+objects whose compiler flags should be added to gtkdoc-scangobj.
+
+It will not actually add ninja target dependencies. The similar kwarg in
+other meson functions (e.g. genmarshal and compile_schemas) that *do*
+allow adding target dependencies, is `depend_files`.
+
+Older versions of meson simply did nothing in an if/elif/elif block
+where these custom_targets never matched anything, and were thus
+silently ignored.
+
+Meson 0.61 type-validates the arguments and rejects CustomTarget as
+invalid:
+
+```
+doc/manual/meson.build:72:8: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget | PkgConfigDependency] but should have been array[Dependency | SharedLibrary | StaticLibrary]
+```
+
+Fixes #406
+---
+ doc/manual/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/manual/meson.build b/doc/manual/meson.build
+index cf8758db..560df8db 100644
+--- a/doc/manual/meson.build
++++ b/doc/manual/meson.build
+@@ -73,7 +73,7 @@ if get_option('gtk_doc')
+               main_xml: 'p11-kit-docs.xml',
+               namespace: 'p11_kit',
+               src_dir: 'p11-kit',
+-              dependencies: libffi_deps + dlopen_deps + xml_deps,
++              dependencies: libffi_deps + dlopen_deps,
+               scan_args: [
+                 '--ignore-headers=' + ' '.join(ignore_headers),
+                 '--rebuild-types',
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index cc0b11eb720f..63cdebc7563f 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -3,8 +3,9 @@ pkgname=p11-kit
 version=0.23.22
 revision=3
 build_style=meson
+build_helper="qemu"
 configure_args="-Dlibffi=enabled -Dsystemd=disabled -Dbash_completion=disabled
- -Dgtk_doc=true -Dman=true -Dnls=true -Dtrust_module=enabled
+ -Dman=true $(vopt_bool gtk_doc gtk_doc) -Dnls=true -Dtrust_module=enabled
  -Dtrust_paths=/etc/ssl/certs/ca-certificates.crt"
 hostmakedepends="pkg-config gettext gtk-doc libxslt libtasn1-tools"
 makedepends="libtasn1-devel libffi-devel"
@@ -22,6 +23,13 @@ else
 	configure_args+=" -Dtest=false"
 fi
 
+build_options="gtk_doc"
+build_options_default=""
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
+
 post_install() {
 	mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example \
 		${DESTDIR}/etc/pkcs11/pkcs11.conf
@@ -38,6 +46,8 @@ p11-kit-devel_package() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
-		vmove usr/share/gtk-doc
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 6464bd756a81ba1f33f7f91cddd61f4475b06b7a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:30:51 +0100
Subject: [PATCH 0519/1686] pantheon-screenshot: fix for meson 0.61

---
 .../patches/meson-0.61.patch                  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/pantheon-screenshot/patches/meson-0.61.patch

diff --git a/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8a64e9f14a5f
--- /dev/null
+++ b/srcpkgs/pantheon-screenshot/patches/meson-0.61.patch
@@ -0,0 +1,29 @@
+From 80a5d942e813dd098e1ef0f6629b81d2ccef05ae Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Thu, 13 Jan 2022 13:51:48 +0800
+Subject: [PATCH] Fix data/meson.build (#241)
+
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index cb2adc80..76dad525 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -20,7 +20,6 @@ install_data(
+ )
+ 
+ i18n.merge_file (
+-    'desktop',
+     input: 'screenshot.desktop.in',
+     output: meson.project_name() + '.desktop',
+     install: true,
+@@ -30,7 +29,6 @@ i18n.merge_file (
+ )
+ 
+ i18n.merge_file (
+-    'appdata',
+     input: 'screenshot.appdata.xml.in',
+     output: meson.project_name() + '.appdata.xml',
+     install: true,

From d6e569617424d255da3b178e5d7214275f012a38 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:33:07 +0100
Subject: [PATCH 0520/1686] polari: fix for meson 0.61

---
 srcpkgs/polari/patches/meson-0.61.patch | 43 +++++++++++++++++++++++++
 srcpkgs/polari/template                 |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/polari/patches/meson-0.61.patch

diff --git a/srcpkgs/polari/patches/meson-0.61.patch b/srcpkgs/polari/patches/meson-0.61.patch
new file mode 100644
index 000000000000..a9ed3bc58032
--- /dev/null
+++ b/srcpkgs/polari/patches/meson-0.61.patch
@@ -0,0 +1,43 @@
+From 0f0a4b54142d8b424969f0b6ace6fc8b53b1d05d Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:32:00 +0000
+Subject: [PATCH] meson: Drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/appdata/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:5:0: ERROR: Function does not take positional arguments.
+
+Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/242>
+---
+ data/appdata/meson.build | 2 +-
+ data/meson.build         | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 88b4a0be..781ba22f 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,5 +1,5 @@
+ appdata_name = app_id + '.appdata.xml'
+-appdata = i18n.merge_file(appdata_name,
++appdata = i18n.merge_file(
+   input: appdata_name + '.in',
+   output: appdata_name,
+   po_dir: '../../po',
+diff --git a/data/meson.build b/data/meson.build
+index cedfd57b..655ae700 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,7 @@ subdir('appdata')
+ subdir('icons')
+ 
+ desktop_filename = app_id + '.desktop'
+-desktop_file = i18n.merge_file(desktop_filename,
++desktop_file = i18n.merge_file(
+   input: desktop_filename + '.in',
+   output: desktop_filename,
+   po_dir: '../po',
+-- 
+GitLab
+
diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template
index fda5f1945375..eb7c9d2dd3df 100644
--- a/srcpkgs/polari/template
+++ b/srcpkgs/polari/template
@@ -12,6 +12,7 @@ short_desc="GNOME IRC client"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Polari"
+changelog="https://gitlab.gnome.org/GNOME/polari/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=a3b05f81660370c67c942b6f44b298c7b78816feb38c926ec2212bde22ea40eb
 

From bf7bdaf21b22f97cbfc0a95baa13b73f2bf7f28c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:35:12 +0100
Subject: [PATCH 0521/1686] shotwell: fix for meson 0.61

---
 srcpkgs/shotwell/patches/meson-0.61.patch | 27 +++++++++++++++++++++++
 srcpkgs/shotwell/template                 |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 srcpkgs/shotwell/patches/meson-0.61.patch

diff --git a/srcpkgs/shotwell/patches/meson-0.61.patch b/srcpkgs/shotwell/patches/meson-0.61.patch
new file mode 100644
index 000000000000..f33fa2af1637
--- /dev/null
+++ b/srcpkgs/shotwell/patches/meson-0.61.patch
@@ -0,0 +1,27 @@
+From cc328b43ebb9a54a256ec73a86fb18381b2038e6 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Tue, 11 Jan 2022 21:57:26 -0500
+Subject: [PATCH] fix duplicate languages causing meson 0.61 to error out
+
+It tried to create multiple targets with the same name and generating
+the same file. On older versions of meson, this was a run_target and
+just ran twice, but was still wrong.
+---
+ help/LINGUAS | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/help/LINGUAS b/help/LINGUAS
+index 68f089c4..5352eecd 100644
+--- a/help/LINGUAS
++++ b/help/LINGUAS
+@@ -6,7 +6,6 @@ es
+ fr
+ hu
+ id
+-id
+ lv
+ pt_BR
+ sv
+-- 
+GitLab
+
diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template
index b0c1878e31bb..386644d4939e 100644
--- a/srcpkgs/shotwell/template
+++ b/srcpkgs/shotwell/template
@@ -14,6 +14,7 @@ short_desc="Open source photo manager for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, CC-BY-SA-3.0"
 homepage="https://wiki.gnome.org/Apps/Shotwell"
+changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz"
 checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2
 lib32disabled=yes

From ce0d7ada224278ba863a273ad626fded813a1398 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:36:48 +0100
Subject: [PATCH 0522/1686] simple-scan: fix for meson 0.61

---
 srcpkgs/simple-scan/patches/meson-0.61.patch | 37 ++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 srcpkgs/simple-scan/patches/meson-0.61.patch

diff --git a/srcpkgs/simple-scan/patches/meson-0.61.patch b/srcpkgs/simple-scan/patches/meson-0.61.patch
new file mode 100644
index 000000000000..e193747322c0
--- /dev/null
+++ b/srcpkgs/simple-scan/patches/meson-0.61.patch
@@ -0,0 +1,37 @@
+From da6626debe00be1a0660f30cf2bf7629186c01d5 Mon Sep 17 00:00:00 2001
+From: r-value <i@rvalue.moe>
+Date: Tue, 16 Nov 2021 02:43:11 +0800
+Subject: [PATCH] Remove incorrect i18n.merge_file argument
+
+The positional argument was being silently ignored until meson 0.60.0 where
+it fails with "ERROR: Function does not take positional arguments".
+---
+ data/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2b5a0ee3..cf6e4ae1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gschema.xml',
+               install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
+ meson.add_install_script ('meson_compile_gschema.py')
+ 
+-i18n.merge_file ('desktop-file',
+-                 input: 'simple-scan.desktop.in',
++i18n.merge_file (input: 'simple-scan.desktop.in',
+                  output: 'simple-scan.desktop',
+                  install: true,
+                  install_dir: join_paths (datadir, 'applications'),
+                  po_dir: '../po',
+                  type: 'desktop')
+ 
+-i18n.merge_file ('appdata-file',
+-                 input: 'simple-scan.appdata.xml.in',
++i18n.merge_file (input: 'simple-scan.appdata.xml.in',
+                  output: 'simple-scan.appdata.xml',
+                  install: true,
+                  install_dir: join_paths (datadir, 'metainfo'),
+-- 
+GitLab
+

From 0660cfa3c5cd23b589bc7f95523498dabbdf7168 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:39:25 +0100
Subject: [PATCH 0523/1686] sound-juicer: fix for meson 0.61

---
 srcpkgs/sound-juicer/patches/meson-0.61.patch | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 srcpkgs/sound-juicer/patches/meson-0.61.patch

diff --git a/srcpkgs/sound-juicer/patches/meson-0.61.patch b/srcpkgs/sound-juicer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..662b7d631f61
--- /dev/null
+++ b/srcpkgs/sound-juicer/patches/meson-0.61.patch
@@ -0,0 +1,35 @@
+From 9f97ca1faca396099f52264a9729aa355f8d122e Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 25 Jan 2022 12:15:31 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:2:0: ERROR: Function does not take positional arguments.
+data/meson.build:31:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index ccff2d80..4dac8166 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,5 @@
+ # Desktop file
+ i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+     input: 'org.gnome.SoundJuicer.desktop.in.in',
+     output: 'org.gnome.SoundJuicer.desktop.in',
+@@ -29,7 +28,6 @@ configure_file(
+ 
+ # Metainfo
+ metainfo_file = i18n.merge_file(
+-  'metainfo',
+   input: files(join_paths('metainfo', 'org.gnome.SoundJuicer.metainfo.xml.in')),
+   output: 'org.gnome.SoundJuicer.metainfo.xml',
+   po_dir: po_dir,
+-- 
+GitLab
+

From b7d208a52dde3917d5915c33862e05b249693852 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 16 Mar 2022 23:40:28 +0100
Subject: [PATCH 0524/1686] switchboard: fix for meson 0.61

---
 srcpkgs/switchboard/patches/meson-0.61.patch | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/switchboard/patches/meson-0.61.patch

diff --git a/srcpkgs/switchboard/patches/meson-0.61.patch b/srcpkgs/switchboard/patches/meson-0.61.patch
new file mode 100644
index 000000000000..cf29004ec332
--- /dev/null
+++ b/srcpkgs/switchboard/patches/meson-0.61.patch
@@ -0,0 +1,30 @@
+From ecf2a6c42122946cc84150f6927ef69c1f67c909 Mon Sep 17 00:00:00 2001
+From: Xeonacid <h.dwwwwww@gmail.com>
+Date: Sat, 8 Jan 2022 01:58:44 +0800
+Subject: [PATCH] Meson: remove positional arguments from i18n.merge_file
+ (#226)
+
+---
+ data/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index c456813..109554d 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ po_extra_dir = join_paths(meson.source_root(), 'po', 'extra')
+-i18n.merge_file('desktop',
++i18n.merge_file(
+     input: 'io.elementary.switchboard.desktop.in',
+     output: 'io.elementary.switchboard.desktop',
+     install: true,
+@@ -8,7 +8,7 @@ i18n.merge_file('desktop',
+     type: 'desktop'
+ )
+ 
+-i18n.merge_file('appdata',
++i18n.merge_file(
+     input: 'io.elementary.switchboard.appdata.xml.in',
+     output: 'io.elementary.switchboard.appdata.xml',
+     install: true,

From 7152f9055ad5b83a5a2e62508dcfeebcc833c6e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:05:03 +0100
Subject: [PATCH 0525/1686] tau: fix for meson 0.61

---
 srcpkgs/tau/patches/meson-0.61.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/tau/patches/meson-0.61.patch

diff --git a/srcpkgs/tau/patches/meson-0.61.patch b/srcpkgs/tau/patches/meson-0.61.patch
new file mode 100644
index 000000000000..d7ec3e3365bb
--- /dev/null
+++ b/srcpkgs/tau/patches/meson-0.61.patch
@@ -0,0 +1,17 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,4 +1,4 @@
+-desktop_file = i18n.merge_file ('desktop-file',
++desktop_file = i18n.merge_file (
+   type: 'desktop',
+   input: configure_file(
+     input: files('org.gnome.Tau.desktop.in.in'),
+@@ -22,7 +22,7 @@ if desktop_file_validate.found()
+     )
+ endif
+ 
+-appdata_file = i18n.merge_file ('appdata-file',
++appdata_file = i18n.merge_file (
+   input: configure_file(
+     input: files('org.gnome.Tau.appdata.xml.in.in'),
+     output: 'org.gnome.Tau.appdata.xml.in',

From 8ce6fb7ff5ad7a152e588b8ced87641415909efc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 14:28:48 +0100
Subject: [PATCH 0526/1686] tilix: fix for meson 0.61

---
 srcpkgs/tilix/patches/meson-0.61.patch | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/tilix/patches/meson-0.61.patch

diff --git a/srcpkgs/tilix/patches/meson-0.61.patch b/srcpkgs/tilix/patches/meson-0.61.patch
new file mode 100644
index 000000000000..c35c8d08ad05
--- /dev/null
+++ b/srcpkgs/tilix/patches/meson-0.61.patch
@@ -0,0 +1,33 @@
+From 7cb2c59a31891f6463d1b181f1ec461c9352d782 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 22 Feb 2022 12:06:23 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file() (#2081)
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:13:0: ERROR: Function does not take positional arguments.
+data/meson.build:46:0: ERROR: Function does not take positional arguments.
+---
+ data/meson.build | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 81e9b410..c8b23e1b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -11,7 +11,6 @@ install_data(
+ 
+ # Install the desktop file
+ desktop_file = i18n.merge_file(
+-    '@0@.desktop'.format(project_id),
+     output: '@BASENAME@',
+     input: 'pkg/desktop/@0@.desktop.in'.format(project_id),
+     po_dir: meson.source_root() / 'po',
+@@ -44,7 +43,6 @@ metainfo_with_releases = custom_target('metainfo-news-merge',
+ 
+ # Install the MetaInfo file
+ metainfo_file = i18n.merge_file(
+-    tilix_metainfo_name,
+     output: tilix_metainfo_name,
+     input: metainfo_with_releases,
+     po_dir: meson.source_root() / 'po',

From 20b512e7f9b9c82ae000c067331a8952f6de0b47 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:09:00 +0100
Subject: [PATCH 0527/1686] totem: fix for meson 0.61

---
 srcpkgs/totem/patches/meson-0.61.patch | 39 ++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 srcpkgs/totem/patches/meson-0.61.patch

diff --git a/srcpkgs/totem/patches/meson-0.61.patch b/srcpkgs/totem/patches/meson-0.61.patch
new file mode 100644
index 000000000000..8f05c5c7a015
--- /dev/null
+++ b/srcpkgs/totem/patches/meson-0.61.patch
@@ -0,0 +1,39 @@
+From 61e3a957cb7339c6614e764fcf1120d967d687e9 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Thu, 6 Jan 2022 17:21:28 +0100
+Subject: [PATCH] build: Remove unused i18n.merge_file() "name"
+
+data/meson.build:78:0: ERROR: Function does not take positional arguments.
+data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments.
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build         | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index c4d17e927..c2e646327 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ appdata = 'org.gnome.Totem.appdata.xml'
+ 
+ appdata_file = i18n.merge_file (
+-    'appdata',
+     input: appdata + '.in',
+     output: appdata,
+     install: true,
+diff --git a/data/meson.build b/data/meson.build
+index b31ce755c..8eebe3db1 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -76,7 +76,6 @@ desktop_in = configure_file(
+ )
+ 
+ desktop_file = i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop_in,
+     output: desktop,
+-- 
+GitLab
+

From 8ff24b774c18a43930ea31840dc9cc983b501d31 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 17 Mar 2022 00:14:03 +0100
Subject: [PATCH 0528/1686] virt-viewer: fix for meson 0.61

---
 srcpkgs/virt-viewer/patches/meson-0.61.patch | 26 ++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/virt-viewer/patches/meson-0.61.patch

diff --git a/srcpkgs/virt-viewer/patches/meson-0.61.patch b/srcpkgs/virt-viewer/patches/meson-0.61.patch
new file mode 100644
index 000000000000..0b900e1f2128
--- /dev/null
+++ b/srcpkgs/virt-viewer/patches/meson-0.61.patch
@@ -0,0 +1,26 @@
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ if host_machine.system() != 'windows'
+   desktop = 'remote-viewer.desktop'
+ 
+   i18n.merge_file (
+-    desktop,
+     type: 'desktop',
+     input: desktop + '.in',
+     output: desktop,
+@@ -14,7 +13,6 @@ if host_machine.system() != 'windows'
+   mimetypes = 'virt-viewer-mime.xml'
+ 
+   i18n.merge_file (
+-    mimetypes,
+     type: 'xml',
+     input: mimetypes + '.in',
+     output: mimetypes,
+@@ -27,7 +25,6 @@ if host_machine.system() != 'windows'
+   metainfo = 'remote-viewer.appdata.xml'
+ 
+   i18n.merge_file (
+-    metainfo,
+     type: 'xml',
+     input: metainfo + '.in',
+     output: metainfo,

From 27a3ca00a56c79147a36530db7cdff6fe5f32e7a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:45:18 +0100
Subject: [PATCH 0529/1686] janet: update to 1.21.0.

---
 srcpkgs/janet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index d7a6b871124f..30c4dc43db48 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.20.0
+version=1.21.0
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=cc2e617e2bdffaeca0fc330c890c73a83e2211b4ff65555d58973c47376bf5b1
+checksum=8e53efcdeda9b7519248bef5f0e744ad947e013b14960c66ba75967c5fb0a7fd
 
 post_install() {
 	vlicense LICENSE

From ea9b96920b641bfe3b04e5d0ab1b9b5e6d5446bb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:50:01 +0100
Subject: [PATCH 0530/1686] stress-ng: update to 0.13.12.

---
 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 5f94f17799ca..d13629b279bc 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.13.11
+version=0.13.12
 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="https://github.com/ColinIanKing/stress-ng/"
 distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=b7327cd0d01e331541648a545ec5a69c33202659afc26a8602042399e1fd4fdd
+checksum=16540d9cfa80d6a274fc0238d7251675ee38df6d5be805d14a67ce9efcb59ce9

From 237ea5dd655c3168da60723652f3587e62540e6d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:50:45 +0100
Subject: [PATCH 0531/1686] iana-etc: update to 20220325.

---
 srcpkgs/iana-etc/files/services | 7 +++++--
 srcpkgs/iana-etc/template       | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/iana-etc/files/services b/srcpkgs/iana-etc/files/services
index 511b3346bea4..94b9380da4f7 100644
--- a/srcpkgs/iana-etc/files/services
+++ b/srcpkgs/iana-etc/files/services
@@ -7628,6 +7628,7 @@ dsmipv6          4191/udp
 azeti            4192/tcp
 azeti-bd         4192/udp
 pvxplusio        4193/tcp
+spdm             4194/tcp
 aws-wsp          4195/tcp
 aws-wsp          4195/udp
 aws-wsp          4195/sctp
@@ -7664,6 +7665,8 @@ perrla           4313/tcp
 choiceview-agt   4314/tcp
 choiceview-clt   4316/tcp
 opentelemetry    4317/tcp
+fox-skytale      4319/tcp
+fox-skytale      4319/udp
 fdt-rcatp        4320/tcp
 fdt-rcatp        4320/udp
 rwhois           4321/tcp
@@ -8249,8 +8252,6 @@ strexec-s        5027/udp
 qvr              5028/tcp
 infobright       5029/tcp
 infobright       5029/udp
-surfpass         5030/tcp
-surfpass         5030/udp
 dmp              5031/udp
 signacert-agent  5032/tcp
 jtnetd-server    5033/tcp
@@ -9973,6 +9974,7 @@ espeech          8416/udp
 espeech-rtp      8417/tcp
 espeech-rtp      8417/udp
 aritts           8423/tcp
+pgbackrest       8432/tcp
 cybro-a-bus      8442/tcp
 cybro-a-bus      8442/udp
 pcsync-https     8443/tcp
@@ -11329,6 +11331,7 @@ ng-control      38412/sctp
 xn-control      38422/sctp
 e1-interface    38462/sctp
 f1-control      38472/sctp
+psqlmws         38638/tcp
 sruth           38800/tcp
 secrmmsafecopya 38865/tcp
 vroa            39063/tcp
diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template
index aca09e0e1e4b..e4d7a60c37cb 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=20211229
+version=20220325
 revision=1
 bootstrap=yes
 short_desc="Unix /etc/services and /etc/protocols files"

From 17e46d07e1642fd75ece91fa5b3ca38aaca321a0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 13:54:12 +0100
Subject: [PATCH 0532/1686] coq: update to 8.15.1.

---
 srcpkgs/coq/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index b7ddbfe70a39..fcfbc92cb2f6 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,14 +1,14 @@
 # Template file for 'coq'
 pkgname=coq
-version=8.15.0
-revision=2
+version=8.15.1
+revision=1
 hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
 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=73466e61f229b23b4daffdd964be72bd7a110963b9d84bd4a86bb05c5dc19ef3
+checksum=513e953b7183d478acb75fd6e80e4dc32ac1a918cf4343ac31a859cfb4e9aad2
 nopie=yes
 nocross=yes
 

From ba7ce118edf45f4f71471808355654a6e993cffe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 14:04:06 +0100
Subject: [PATCH 0533/1686] erlang: update to 24.3.2.

---
 srcpkgs/erlang/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index fc8bd893714e..d59eeb464e74 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,6 +1,6 @@
 # Template file for 'erlang'
 pkgname=erlang
-version=24.2.2
+version=24.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=b6adfc0bf14d94348146ae26cc38d09dca545f8e14ebab7ddcf9482a6e8d1162
+checksum=cdc9cf788d28a492eb6b24881fbd06a0a5c785dc374ad415b3be1db96326583c
 subpackages="erlang-doc"
 
 if [ -z "$CROSS_BUILD" ]; then

From 8d8dec12ac11f1239652664ae03a6b4f01bbd585 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 15:38:16 +0100
Subject: [PATCH 0534/1686] python3-pipenv: update to 2022.3.24.

---
 srcpkgs/python3-pipenv/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index cae723465c04..4d0f0ec7e283 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.1.8
+version=2022.3.24
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -10,8 +10,9 @@ short_desc="Python Development Workflow for Humans"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/pypa/pipenv"
+changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=f84d7119239b22ab2ac2b8fbc7d619d83cf41135206d72a17c4f151cda529fd0
+checksum=800198d430e724f899e6db319cc640d5fd6da2acdbc301ceb1a1f967e990428b
 conflicts="python-pipenv>=0"
 
 post_extract() {
@@ -20,7 +21,4 @@ post_extract() {
 
 post_install() {
 	vlicense LICENSE
-	# remove files only valid for Python 2
-	rm -rf ${DESTDIR}/${py3_sitelib}/pipenv/patched/yaml2
-	rm -f ${DESTDIR}/${py3_sitelib}/pipenv/vendor/importlib_resources/_py2.py
 }

From 5bcdc745b69d6300e9ae03c654d6359c5ae34b3a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 15:23:00 +0100
Subject: [PATCH 0535/1686] .github: improve the PR template

* avoid confusion with [skip CI] and [ci skip]
---
 .github/pull_request_template.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index cc4b5721590e..ef2a5d7637aa 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,7 +8,8 @@
 - This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
 -->
 
-<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
+<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
+https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
 and test at least one native build and, if supported, at least one cross build.
 Ignore this section if this PR is not skipping CI.
 -->

From 1873930d24aaa3bcb9e81df12141a2b0c1265385 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 25 Mar 2022 21:58:04 +0100
Subject: [PATCH 0536/1686] glib: update to 2.72.0.

---
 .../glib/patches/disable-broken-tests.patch   | 54 ++++++------
 srcpkgs/glib/patches/fix-formatd.patch        | 86 -------------------
 srcpkgs/glib/template                         |  6 +-
 3 files changed, 29 insertions(+), 117 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/fix-formatd.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index c6bb8d96fadf..2a5263007503 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,14 +1,14 @@
 --- a/gio/tests/meson.build
 +++ b/gio/tests/meson.build
-@@ -50,7 +50,6 @@ gio_tests = {
-   'cancellable' : {},
-   'contexts' : {},
-   'contenttype' : {},
+@@ -56,7 +56,6 @@ gio_tests = {
+     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
+     'should_fail' : host_system == 'darwin',
+   },
 -  'converter-stream' : {},
    'credentials' : {},
-   'data-input-stream' : {},
-   'data-output-stream' : {},
-@@ -74,7 +73,6 @@ gio_tests = {
+   'cxx' : {
+     'source' : ['cxx.cpp'],
+@@ -91,7 +90,6 @@ gio_tests = {
    'network-monitor' : {},
    'network-monitor-race' : {},
    'permission' : {},
@@ -16,15 +16,15 @@
    'power-profile-monitor' : {},
    'proxy-test' : {},
    'readwrite' : {},
-@@ -151,7 +149,6 @@ endif
+@@ -174,7 +172,6 @@ endif
  #  Test programs buildable on UNIX only
  if host_machine.system() != 'windows'
    gio_tests += {
 -    'file' : {},
      'gdbus-peer' : {
        'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir
-@@ -737,12 +734,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+       'install_rpath' : installed_tests_execdir,
+@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
        test_resources_binary2,
      ]
    endif
@@ -32,6 +32,8 @@
 -  gio_tests += {
 -    'resources' : {
 -      'extra_sources' : resources_extra_sources,
+-      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+-      'should_fail' : host_system == 'darwin',
 -    },
 -  }
  endif
@@ -39,29 +41,33 @@
  foreach test_name, extra_args : gio_tests
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,21 +11,14 @@ glib_tests = {
+@@ -11,25 +11,17 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
 -  'collate' : {},
+   'completion' : {},
    'cond' : {},
 -  'convert' : {},
    'cxx' : {
      'source' : ['cxx.cpp'],
    },
    'dataset' : {},
--  'date' : {},
+-  'date' : {
+-    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+-    'should_fail' : host_system == 'darwin',
+-  },
    'dir' : {},
-   'environment' : {},
+   'environment' : {
+     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+     'should_fail' : host_system == 'darwin',
+   },
 -  'error' : {},
-   'fileutils' : {},
--  'gdatetime' : {
--    'suite' : ['slow'],
--  },
-   'guuid' : {},
-   'gvariant' : {
+-  'fileutils' : {},
+   'gdatetime' : {
      'suite' : ['slow'],
-@@ -57,7 +50,6 @@ glib_tests = {
+   },
+@@ -65,7 +57,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
@@ -69,11 +75,3 @@
    'option-argv0' : {},
    'overflow' : {},
    'overflow-fallback' : {
-@@ -102,7 +94,6 @@ glib_tests = {
-   'thread' : {},
-   'thread-pool' : {},
-   'timeout' : {},
--  'timer' : {},
-   'tree' : {},
-   'utf8-performance' : {},
-   'utf8-pointer' : {},
diff --git a/srcpkgs/glib/patches/fix-formatd.patch b/srcpkgs/glib/patches/fix-formatd.patch
deleted file mode 100644
index 2249ff5a4506..000000000000
--- a/srcpkgs/glib/patches/fix-formatd.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-[PATCH] gstrfuncs: don't require nonstandard functions for USE_XLOCALE.
-
-Make it so USE_XLOCALE is set whenever newlocale() and uselocale() are
-available. This way, we can still use the _g_snprintf() path for some
-functions, and also use the *_l functions when they are available.
-
-newlocale(3) are uselocale(3) part of POSIX 2008, while the *_l
-functions being used are nonstandard glibc extensions. Gating all the
-locale functionality behind them meant we were using fallbacks on non
-glibc platforms unnecessarily.
-
-Further changes to this code could add fallback for the non _l suffixed
-number parsing functions, but that might be unnecessary complexity.
-
-Fixes #2553
----
- glib/gstrfuncs.c | 17 +++++++----------
- 1 file changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
-index ea710c7a1..e486251ab 100644
---- a/glib/gstrfuncs.c
-+++ b/glib/gstrfuncs.c
-@@ -317,11 +317,8 @@ static const guint16 ascii_table_data[256] = {
- 
- const guint16 * const g_ascii_table = ascii_table_data;
- 
--#if defined (HAVE_NEWLOCALE) && \
--    defined (HAVE_USELOCALE) && \
--    defined (HAVE_STRTOD_L) && \
--    defined (HAVE_STRTOULL_L) && \
--    defined (HAVE_STRTOLL_L)
-+#if defined(HAVE_NEWLOCALE) && \
-+    defined(HAVE_USELOCALE)
- #define USE_XLOCALE 1
- #endif
- 
-@@ -731,7 +728,7 @@ gdouble
- g_ascii_strtod (const gchar *nptr,
-                 gchar      **endptr)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOD_L)
- 
-   g_return_val_if_fail (nptr != NULL, 0);
- 
-@@ -1044,7 +1041,7 @@ g_ascii_formatd (gchar       *buffer,
- #define TOUPPER(c)              (ISLOWER (c) ? (c) - 'a' + 'A' : (c))
- #define TOLOWER(c)              (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
- 
--#ifndef USE_XLOCALE
-+#if !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L)
- 
- static guint64
- g_parse_long_long (const gchar  *nptr,
-@@ -1169,7 +1166,7 @@ g_parse_long_long (const gchar  *nptr,
-     }
-   return 0;
- }
--#endif /* !USE_XLOCALE */
-+#endif /* !defined(USE_XLOCALE) || !defined(HAVE_STRTOULL_L) || !defined(HAVE_STRTOLL_L) */
- 
- /**
-  * g_ascii_strtoull:
-@@ -1210,7 +1207,7 @@ g_ascii_strtoull (const gchar *nptr,
-                   gchar      **endptr,
-                   guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOULL_L)
-   return strtoull_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
-@@ -1257,7 +1254,7 @@ g_ascii_strtoll (const gchar *nptr,
-                  gchar      **endptr,
-                  guint        base)
- {
--#ifdef USE_XLOCALE
-+#if defined(USE_XLOCALE) && defined(HAVE_STRTOLL_L)
-   return strtoll_l (nptr, endptr, base, get_C_locale ());
- #else
-   gboolean negative;
--- 
-2.34.1
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0cd7eee4f698..d301dadb8990 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,6 +1,6 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.70.2
+version=2.72.0
 revision=1
 build_style=meson
 # static version is necessary for qemu-user-static;
@@ -15,9 +15,9 @@ 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/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-70/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f
+checksum=d7bef0d4c4e7a62e08efb8e5f252a01357007b9588a87ff2b463a3857011f79d
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"

From 9f1ee5def4372c7c1388054d7076d64c53bd13b5 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Thu, 3 Mar 2022 10:48:23 +0700
Subject: [PATCH 0537/1686] New package: upterm-0.7.6

---
 srcpkgs/upterm/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/upterm/template

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
new file mode 100644
index 000000000000..362f919c40ef
--- /dev/null
+++ b/srcpkgs/upterm/template
@@ -0,0 +1,21 @@
+# Template file for 'upterm'
+pkgname=upterm
+version=0.7.6
+revision=1
+build_style=go
+go_import_path="github.com/owenthereal/upterm"
+go_package="${go_import_path}/cmd/upterm"
+short_desc="Secure Terminal Sharing"
+maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
+license="Apache-2.0"
+homepage="https://github.com/owenthereal/upterm/"
+distfiles="https://github.com/owenthereal/upterm/archive/refs/tags/v$version.tar.gz"
+checksum=26ceb5eee035d4e1a08240aced75a20f2e54b1e192eef0bf5eb51d0195997f8c
+
+post_install() {
+	vcompletion etc/completion/upterm.zsh_completion zsh
+	vcompletion etc/completion/upterm.bash_completion.sh bash
+	for man in etc/man/man1/*.1; do
+		vman "${man}"
+	done
+}

From c7771ed62bb28849ea546867e348e747b4e93501 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Mar 2022 19:00:12 +0100
Subject: [PATCH 0538/1686] brasero: update to 3.12.3.

---
 srcpkgs/brasero/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index 9083a2ccb689..da86c9a66699 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
-version=3.12.2
-revision=6
+version=3.12.3
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -13,9 +13,10 @@ depends="cdrdao cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-
 short_desc="Application to burn CD/DVD for the Gnome Desktop"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.gnome.org/projects/brasero"
+homepage="https://wiki.gnome.org/Apps/Brasero"
+changelog="https://gitlab.gnome.org/GNOME/brasero/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
+checksum=87749eae33a141207d1b00be233b6d8045982ed3249ed4b98dae1f3a975fea15
 
 # Package build options
 build_options="gir"

From 539d964d8922993e5294b12f04f7ebec99c3ce3f Mon Sep 17 00:00:00 2001
From: zenobit <zen@osowoso.xyz>
Date: Sat, 26 Mar 2022 00:58:53 +0100
Subject: [PATCH 0539/1686] gitea: update to 1.16.5

---
 srcpkgs/gitea/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template
index f9eaa1b18732..c8b9b361ce2d 100644
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@@ -1,6 +1,6 @@
 # Template file for 'gitea'
 pkgname=gitea
-version=1.16.4
+version=1.16.5
 revision=1
 create_wrksrc=yes
 build_style=go
@@ -30,9 +30,9 @@ short_desc="Git with a cup of Tea"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://gitea.io"
-changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
-distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
-checksum=ef396b797d39a64867dfcd4532043c363dce3fe054afaa37bb97f8a2ea3f2a18
+changelog="https://raw.githubusercontent.com/go-gitea/gitea/main/CHANGELOG.md"
+distfiles="https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"
+checksum=d9aab2e8357ca1a22eaffb328356e4e355a8f851a4de6fb4e7eb54ca80f0187b
 
 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"

From 01299f7549ff8adbceea65388954c26baebbb5c8 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 22 Mar 2022 11:44:40 -0400
Subject: [PATCH 0540/1686] helvum: clean up patch/template

upstream released pipewire-rs v0.5.0 that fixes the underlying issue,
but the Cargo.toml version requirement didn't allow it to be updated.
---
 srcpkgs/helvum/patches/i686-pipewire.patch | 33 +++++++---------------
 srcpkgs/helvum/template                    | 23 ++-------------
 2 files changed, 13 insertions(+), 43 deletions(-)

diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch
index 17f0f17f8875..bd08b0e217b3 100644
--- a/srcpkgs/helvum/patches/i686-pipewire.patch
+++ b/srcpkgs/helvum/patches/i686-pipewire.patch
@@ -1,24 +1,11 @@
-From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001
-From: "Gabor Kecskemeti (sh)" <gabor@simple-help.com>
-Date: Thu, 11 Nov 2021 11:41:09 +0000
-Subject: A possible fix for issue #27
-
----
- pipewire/src/loop_.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/helvum-0.3.4/pipewire/src/loop_.rs b/helvum-0.3.4/pipewire/src/loop_.rs
-index 3e0d9bd..353025f 100644
---- a/helvum-0.3.4/pipewire/src/loop_.rs
-+++ b/helvum-0.3.4/pipewire/src/loop_.rs
-@@ -411,7 +411,7 @@ where
-         fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
-             spa_sys::timespec {
-                 tv_sec: duration.as_secs().try_into().expect("Duration too long"),
--                tv_nsec: duration.subsec_nanos().into(),
-+                tv_nsec: duration.subsec_nanos().try_into().unwrap(),
-             }
-         }
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -14,7 +14,7 @@
+ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+ 
+ [dependencies]
+-pipewire = "0.4"
++pipewire = "0.5"
+ gtk = { version = "0.4.1", package = "gtk4" }
+ glib = { version = "0.15.1", features = ["log"] }
  
--- 
-
diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 49ad2dd6013a..5a694dc43c29 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -1,12 +1,8 @@
 # Template file for 'helvum'
 pkgname=helvum
 version=0.3.4
-revision=1
-create_wrksrc=yes
-build_wrksrc="${pkgname}-${version}"
-_pipewire_rs_version=0.4.1
+revision=2
 build_style=cargo
-build_helper=rust
 hostmakedepends="pkg-config clang libclang"
 makedepends="gtk4-devel pipewire-devel glib-devel"
 depends="pipewire"
@@ -14,21 +10,8 @@ short_desc="GTK patchbay for pipewire"
 maintainer="classabbyamp <dev@kb6.ee>"
 license="GPL-3.0-only"
 homepage="https://gitlab.freedesktop.org/pipewire/helvum"
-distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz
- https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/archive/v${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz"
-checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02
- 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629"
-
-# XXX: this should not be necessary once the next version of the pipewire crate has been released
-post_extract() {
-	pushd $build_wrksrc
-	echo "[patch.crates-io]" >> Cargo.toml
-	for crate in pipewire pipewire-sys libspa libspa-sys; do
-		mv ../pipewire-rs-*/$crate $crate
-		echo "$crate = { path = './$crate' }" >> Cargo.toml
-	done
-	popd
-}
+distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"
+checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02"
 
 post_install() {
 	# Normally, meson would do this, but it's simpler to use the cargo build style and do this manually

From 3b75ee1aba87d9bfc0b5961a832cf74a58beb1ca Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 26 Mar 2022 14:28:28 -0400
Subject: [PATCH 0541/1686] pijul: remove unnecessary build_helper

---
 srcpkgs/pijul/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 581d77789c9c..53fb1c83ebe5 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -3,7 +3,6 @@ pkgname=pijul
 version=0.12.2
 revision=5
 build_style=cargo
-build_helper=rust
 _sequoia_ver=0.9.0
 hostmakedepends="pkg-config clang"
 makedepends="libsodium-devel openssl-devel nettle-devel"

From a85dda2b3ea474155b9fcdcfb573b4abcc6a8054 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 26 Mar 2022 14:29:26 -0400
Subject: [PATCH 0542/1686] rdedup: remove unnecessary build_helper

---
 srcpkgs/rdedup/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 6bd71cacfc46..0e67d278ca06 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -3,7 +3,6 @@ pkgname=rdedup
 version=3.2.1
 revision=1
 build_style=cargo
-build_helper=rust
 hostmakedepends="pkg-config clang"
 makedepends="openssl-devel liblzma-devel libsodium-devel"
 short_desc="Data deduplication engine"

From 20908c2bc94515ffb23b4d58a15cbd40f42fa851 Mon Sep 17 00:00:00 2001
From: ipkalm <ipkalm@outlook.com>
Date: Sat, 19 Mar 2022 18:33:15 +0700
Subject: [PATCH 0543/1686] New package: v2ray-4.44.0

---
 srcpkgs/v2ray/files/v2ray/run                 |  3 ++
 ...equest-API-changed-since-go1.17-1370.patch | 47 +++++++++++++++++
 srcpkgs/v2ray/template                        | 52 +++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 srcpkgs/v2ray/files/v2ray/run
 create mode 100644 srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch
 create mode 100644 srcpkgs/v2ray/template

diff --git a/srcpkgs/v2ray/files/v2ray/run b/srcpkgs/v2ray/files/v2ray/run
new file mode 100644
index 000000000000..3b1ac46ab240
--- /dev/null
+++ b/srcpkgs/v2ray/files/v2ray/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec chpst -u _v2ray v2ray -config=/etc/v2ray/config.json 2>&1
diff --git a/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch b/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch
new file mode 100644
index 000000000000..2a35b075f0a0
--- /dev/null
+++ b/srcpkgs/v2ray/patches/0001-fix-readRequest-API-changed-since-go1.17-1370.patch
@@ -0,0 +1,47 @@
+From 77b88171d6bd837b76a5ad6e6b23689391530ed6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E6=9C=B1=E8=81=96=E9=BB=8E=20=28Zhu=20Sheng=20Li=29?=
+ <digglife@gmail.com>
+Date: Sat, 6 Nov 2021 22:09:26 +0800
+Subject: [PATCH] fix: readRequest API changed since go1.17 (#1370)
+
+fixed: #1265
+---
+ transport/internet/headers/http/http.go              | 4 ++--
+ transport/internet/headers/http/linkedreadRequest.go | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/transport/internet/headers/http/http.go b/transport/internet/headers/http/http.go
+index c73f7a63..54611889 100644
+--- a/transport/internet/headers/http/http.go
++++ b/transport/internet/headers/http/http.go
+@@ -90,7 +90,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) {
+ 			buffer.Clear()
+ 			copy(buffer.Extend(lenEnding), leftover)
+ 
+-			if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != io.ErrUnexpectedEOF {
++			if _, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != io.ErrUnexpectedEOF {
+ 				return nil, err
+ 			}
+ 		}
+@@ -110,7 +110,7 @@ func (h *HeaderReader) Read(reader io.Reader) (*buf.Buffer, error) {
+ 	}
+ 
+ 	// Parse the request
+-	if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes())), false); err != nil {
++	if req, err := readRequest(bufio.NewReader(bytes.NewReader(headerBuf.Bytes()))); err != nil {
+ 		return nil, err
+ 	} else { // nolint: golint
+ 		h.req = req
+diff --git a/transport/internet/headers/http/linkedreadRequest.go b/transport/internet/headers/http/linkedreadRequest.go
+index 35154b87..45773312 100644
+--- a/transport/internet/headers/http/linkedreadRequest.go
++++ b/transport/internet/headers/http/linkedreadRequest.go
+@@ -9,4 +9,4 @@ import (
+ )
+ 
+ //go:linkname readRequest net/http.readRequest
+-func readRequest(b *bufio.Reader, deleteHostHeader bool) (req *http.Request, err error)
++func readRequest(b *bufio.Reader) (req *http.Request, err error)
+-- 
+2.33.1
+
diff --git a/srcpkgs/v2ray/template b/srcpkgs/v2ray/template
new file mode 100644
index 000000000000..cf6cd28a534a
--- /dev/null
+++ b/srcpkgs/v2ray/template
@@ -0,0 +1,52 @@
+# Template file for 'v2ray'
+pkgname=v2ray
+version=4.44.0
+revision=1
+wrksrc=${pkgname}-core-${version}
+build_style=go
+go_import_path="github.com/v2fly/v2ray-core/v4"
+go_ldflags="-X github.com/v2fly/v2ray-core/v4.codename=$pkgname -X github.com/v2fly/v2ray-core/v4.version=$version -X github.com/v2fly/v2ray-core/v4.build=$SOURCE_DATE_EPOCH -s -w -buildid="
+short_desc="Platform for building proxies to bypass network restrictions"
+maintainer="ipkalm <ipkalm@outlook.com>"
+license="MIT"
+homepage="https://github.com/v2fly/v2ray-core"
+distfiles="https://github.com/v2fly/v2ray-core/archive/v${version}/${pkgname}-${version}.tar.gz"
+checksum=d9973bafd3020f60a51fa3495b24ab417b08b3c8f9539a3748d00da6c68d0103
+conf_files="/etc/v2ray/config.json"
+
+system_accounts="_v2ray"
+
+export GOFLAGS="-x -p=$XBPS_MAKEJOBS -buildmode=pie -trimpath"
+export CGO_ENABLED=0
+
+do_build() {
+	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ray" ./main
+	go build -ldflags "${go_ldflags}" -o "${GOPATH}/bin/v2ctl" -tags "confonly" ./infra/control/main
+}
+
+do_check() {
+	local pkgs=$(go list ./... | grep -v \
+		-e 'app/dns$' \
+		-e 'app/stats$' \
+		-e 'app/router$' \
+		-e 'app/router/command$' \
+		-e 'common/task$' \
+		-e 'common/signal$' \
+		-e 'testing/scenarios$' \
+		-e 'proxy/vmess$' \
+		-e 'transport/pipe$' \
+		-e 'transport/internet/websocket$' \
+		-e 'transport/internet/quic$' \
+		-e 'v4/infra/conf/rule$' \
+		-e 'v4/infra/conf/geodata/memconservative$' \
+		-e 'v4/transport/internet/kcp$' \
+		)
+	go test $pkgs
+}
+
+post_install() {
+	vlicense LICENSE
+	vmkdir etc/v2ray
+	vcopy release/config/*.json etc/v2ray/
+	vsv v2ray
+}

From 00d9d5adc7ecbf1a8de1fdd16bfdce8fb44de08c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 20:54:02 +0100
Subject: [PATCH 0544/1686] nq: update to 0.5.

---
 srcpkgs/nq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nq/template b/srcpkgs/nq/template
index 67e1d96222a6..7dcc1c03af98 100644
--- a/srcpkgs/nq/template
+++ b/srcpkgs/nq/template
@@ -1,6 +1,6 @@
 # Template file for 'nq'
 pkgname=nq
-version=0.4
+version=0.5
 revision=1
 build_style=gnu-makefile
 short_desc="Unix command line queue utility"
@@ -8,4 +8,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="https://github.com/leahneukirchen/nq"
 distfiles="https://github.com/leahneukirchen/${pkgname}/archive/v${version}.tar.gz"
-checksum=287d6700063b64cfa9db51df95e2a046736eb38c0d3b6e0af0a8e7da6df8880b
+checksum=3f01aaf0b8eee4f5080ed1cd71887cb6485d366257d4cf5470878da2b734b030

From 0fd79e6fb17c82f5c6c9a8dc36bd8f6c64b2b566 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Mar 2022 20:58:32 +0100
Subject: [PATCH 0545/1686] ii: update to 1.9.

Adopted.
---
 srcpkgs/ii/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ii/template b/srcpkgs/ii/template
index 13a7ef62682e..5ef7a1d6b9e7 100644
--- a/srcpkgs/ii/template
+++ b/srcpkgs/ii/template
@@ -1,20 +1,21 @@
 # Template file for 'ii'
 pkgname=ii
-version=1.8
-revision=4
+version=1.9
+revision=1
 build_style=gnu-makefile
 make_build_args="INCLUDES=-I. LIBS="
 short_desc="Minimalist FIFO IRC client"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-homepage="http://tools.suckless.org/${pkgname}"
-distfiles="http://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
-checksum=b9d9e1eae25e63071960e921af8b217ab1abe64210bd290994aca178a8dc68d2
+homepage="https://tools.suckless.org/ii"
+distfiles="https://dl.suckless.org/tools/${pkgname}-${version}.tar.gz"
+checksum=850cb323b583d261b51bda9993ee733334352a8e6ca1e2f02b57c154bf568c17
 
 pre_build() {
 	sed -i 's| -O0||g' config.mk
 	sed -i 's|^CFLAGS *=|override CFLAGS +=|g' config.mk
 	sed -i 's|^LDFLAGS *=|override LDFLAGS +=|g' config.mk
+	sed -i 's|^LIBS *=|override LIBS +=|g' config.mk
 }
 
 post_install() {

From 1cd3de4f8d7c6c9c24f7be8c4ae3d05aa9ddef0a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 26 Mar 2022 22:02:47 +0100
Subject: [PATCH 0546/1686] chromium: update to 99.0.4844.84.

---
 srcpkgs/chromium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 2708747046d7..f6154e223751 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=99.0.4844.51
+version=99.0.4844.84
 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="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=97c52e57eca0dc8b752d274047f38c88aaa86036c0587b26b056efbd3fb2bae3
+checksum=20ec184ed34bdc7e660ccf6c007b2db37007de423b3a5a51698a96aa29527515
 
 lib32disabled=yes
 

From a46c2f90b79167a0b0762e73d55bcc4bc7432c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Tue, 5 Oct 2021 23:05:33 +0200
Subject: [PATCH 0547/1686] New package: bees-0.7

---
 .../0001-don-t-run-tests-unless-asked.patch   | 44 +++++++++++++++
 .../patches/0002-move-sbin-into-bin.patch     | 37 +++++++++++++
 ...0003-start-work-on-cross-compilation.patch | 54 +++++++++++++++++++
 srcpkgs/bees/patches/series                   |  2 +
 srcpkgs/bees/template                         | 28 ++++++++++
 5 files changed, 165 insertions(+)
 create mode 100644 srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
 create mode 100644 srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
 create mode 100644 srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
 create mode 100644 srcpkgs/bees/patches/series
 create mode 100644 srcpkgs/bees/template

diff --git a/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
new file mode 100644
index 000000000000..4b1431b45873
--- /dev/null
+++ b/srcpkgs/bees/patches/0001-don-t-run-tests-unless-asked.patch
@@ -0,0 +1,44 @@
+From e139a679d7cc3f04ad001054a6b1815b7afc92e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:04:15 +0200
+Subject: [PATCH 1/3] don't run tests unless asked
+
+---
+ Makefile | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 9c840c4..d4c241e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,16 +14,12 @@ BEES_VERSION ?= $(shell git describe --always --dirty || echo UNKNOWN)
+ 
+ DEFAULT_MAKE_TARGET ?= reallyall
+ 
+-ifeq ($(DEFAULT_MAKE_TARGET),reallyall)
+-	RUN_INSTALL_TESTS = test
+-endif
+-
+ include Defines.mk
+ 
+ default: $(DEFAULT_MAKE_TARGET)
+ 
+ all: lib src scripts
+-reallyall: all doc test
++reallyall: all doc
+ 
+ clean: ## Cleanup
+ 	git clean -dfx -e localconf
+@@ -55,7 +51,7 @@ install_tools: src
+ 	install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
+ 
+ install_bees: ## Install bees + libs
+-install_bees: src $(RUN_INSTALL_TESTS)
++install_bees: src
+ 	install -Dm755 bin/bees	$(DESTDIR)$(LIBEXEC_PREFIX)/bees
+ 
+ install_scripts: ## Install scipts
+-- 
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
new file mode 100644
index 000000000000..3d3b7fe22291
--- /dev/null
+++ b/srcpkgs/bees/patches/0002-move-sbin-into-bin.patch
@@ -0,0 +1,37 @@
+From fc133aa8647fe34a41c70bd5915c7f7f655d3160 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:05:15 +0200
+Subject: [PATCH 2/3] move sbin/* into bin/*
+
+Void does not distinguis between bin and sbin, but this patch will
+likely not be upstreamable.
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d4c241e..2694e78 100644
+--- a/Makefile
++++ b/Makefile
+@@ -48,7 +48,7 @@ scripts: scripts/beesd scripts/beesd@.service
+ install_tools: ## Install support tools + libs
+ install_tools: src
+ 	install -Dm755 bin/fiemap $(DESTDIR)$(PREFIX)/bin/fiemap
+-	install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/sbin/fiewalk
++	install -Dm755 bin/fiewalk $(DESTDIR)$(PREFIX)/bin/fiewalk
+ 
+ install_bees: ## Install bees + libs
+ install_bees: src
+@@ -56,7 +56,7 @@ install_bees: src
+ 
+ install_scripts: ## Install scipts
+ install_scripts: scripts
+-	install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/sbin/beesd
++	install -Dm755 scripts/beesd $(DESTDIR)$(PREFIX)/bin/beesd
+ 	install -Dm644 scripts/beesd.conf.sample $(DESTDIR)/$(ETC_PREFIX)/bees/beesd.conf.sample
+ ifneq ($(SYSTEMD_SYSTEM_UNIT_DIR),)
+ 	install -Dm644 scripts/beesd@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/beesd@.service
+-- 
+2.35.1
+
diff --git a/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
new file mode 100644
index 000000000000..30f758460754
--- /dev/null
+++ b/srcpkgs/bees/patches/0003-start-work-on-cross-compilation.patch
@@ -0,0 +1,54 @@
+From be64a6e50987dba582d8704d62cb1f9a3577645d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
+ <jan.christian@gruenhage.xyz>
+Date: Thu, 7 Oct 2021 18:06:54 +0200
+Subject: [PATCH 3/3] start work on cross compilation
+
+The tests have to be run on the host, so these shouldn't be cross
+compiled. This patch is not done yet, but it's included here anyway, so
+that whoever wants to continue on it doesn't have to start from scratch.
+---
+ makeflags     | 3 +++
+ test/Makefile | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/makeflags b/makeflags
+index c5b6951..29e0430 100644
+--- a/makeflags
++++ b/makeflags
+@@ -11,3 +11,6 @@ CCFLAGS += -I../include -D_FILE_OFFSET_BITS=64
+ 
+ BEES_CFLAGS   = $(CCFLAGS) -std=c99 $(CFLAGS)
+ BEES_CXXFLAGS = $(CCFLAGS) -std=c++11 -Wold-style-cast $(CXXFLAGS)
++
++BEES_CFLAGS_FOR_BUILD   = $(CCFLAGS_FOR_BUILD) -std=c99 $(CFLAGS_FOR_BUILD)
++BEES_CXXFLAGS_FOR_BUILD = $(CCFLAGS_FOR_BUILD) -std=c++11 -Wold-style-cast $(CXXFLAGS_FOR_BUILD)
+diff --git a/test/Makefile b/test/Makefile
+index ae66a7c..3c70244 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -24,7 +24,7 @@ BEES_LDFLAGS = -L../lib $(LDFLAGS)
+ 	mkdir -p $@
+ 
+ .depends/%.dep: %.cc tests.h Makefile | .depends
+-	$(CXX) $(BEES_CXXFLAGS) -M -MF $@ -MT $(<:.cc=.o) $<
++	$(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) -M -MF $@ -MT $(<:.cc=.o) $<
+ 
+ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ 	cat $^ > $@.new
+@@ -33,10 +33,10 @@ depends.mk: $(PROGRAMS:%=.depends/%.dep)
+ include depends.mk
+ 
+ $(PROGRAMS:%=%.o): %.o: %.cc ../makeflags Makefile
+-	$(CXX) $(BEES_CXXFLAGS) -o $@ -c $<
++	$(CXX_FOR_BUILD) $(BEES_CXXFLAG_FOR_BUILDS) -o $@ -c $<
+ 
+ $(PROGRAMS): %: %.o ../makeflags Makefile ../lib/libcrucible.a
+-	$(CXX) $(BEES_CXXFLAGS) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
++	$(CXX_FOR_BUILD) $(BEES_CXXFLAGS_FOR_BUILD) $(BEES_LDFLAGS) -o $@ $< $(LIBS)
+ 
+ %.txt: % Makefile FORCE
+ 	./$< >$@ 2>&1 || (RC=$$?; cat $@; exit $$RC)
+-- 
+2.35.1
+
diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series
new file mode 100644
index 000000000000..d9a2837128f2
--- /dev/null
+++ b/srcpkgs/bees/patches/series
@@ -0,0 +1,2 @@
+0001-don-t-run-tests-unless-asked.patch
+0002-move-sbin-into-bin.patch
diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
new file mode 100644
index 000000000000..c9184f593e87
--- /dev/null
+++ b/srcpkgs/bees/template
@@ -0,0 +1,28 @@
+# Template file for 'bees'
+pkgname=bees
+version=0.7
+revision=1
+archs="~*-musl"
+build_style=gnu-makefile
+make_check_target="test"
+hostmakedepends="pkg-config"
+depends="btrfs-progs"
+short_desc="Best-Effort Extent-Same, a btrfs deduplication agent"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Zygo/bees"
+distfiles="https://github.com/Zygo/bees/archive/refs/tags/v${version}.tar.gz"
+checksum=2e67422b9f0d9ef665523b474fb27055efffceb263f8ccfdfda2a3aac9c6bdb1
+
+if [ "$CROSS_BUILD" ]; then
+# Tests don't work properly with cross compilation, because it doesn't
+# differentiate between host and target compilers correctly.
+#
+# There is a patch included which starts working on this, but I couldn't get it
+# to work properly, so it's not being applied right now.
+	make_check="no"
+fi
+
+pre_build() {
+	export BEES_VERSION="${version}"
+}

From b81deff4a68b0297a51a6177e4ca1d29ab108a3e Mon Sep 17 00:00:00 2001
From: KushBlazingJudah <59340248+KushBlazingJudah@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:34:01 -0300
Subject: [PATCH 0548/1686] wob: update to 0.13.

---
 srcpkgs/wob/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wob/template b/srcpkgs/wob/template
index 3570896a1dc5..6b68df4a5eff 100644
--- a/srcpkgs/wob/template
+++ b/srcpkgs/wob/template
@@ -1,6 +1,6 @@
 # Template file for 'wob'
 pkgname=wob
-version=0.12
+version=0.13
 revision=1
 build_style=meson
 configure_args="-Dseccomp=enabled"
@@ -11,7 +11,7 @@ maintainer="travankor <travankor@tuta.io>"
 license="ISC"
 homepage="https://github.com/francma/wob"
 distfiles="https://github.com/francma/wob/archive/${version}.tar.gz"
-checksum=c4442fb43ab0d47c986d0c0041a385e1e66f7c16fc48ff0651993deb0d00ed01
+checksum=555965ba2b4e5fa67c8342e42f7ccd5eea7c9aeb762684e2ea52ccff40cc7f56
 
 post_install() {
 	vlicense LICENSE

From 03b8c65a45bc1dd5c88d895b9d7a5126cef5def0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 22 Mar 2022 22:53:24 +0100
Subject: [PATCH 0549/1686] newsboat: update to 2.27.

---
 srcpkgs/newsboat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/newsboat/template b/srcpkgs/newsboat/template
index 39c8eac9a7e0..09f30180a19c 100644
--- a/srcpkgs/newsboat/template
+++ b/srcpkgs/newsboat/template
@@ -1,6 +1,6 @@
 # Template file for 'newsboat'
 pkgname=newsboat
-version=2.26
+version=2.27
 revision=1
 build_style=configure
 build_helper="rust"
@@ -17,7 +17,7 @@ license="MIT"
 homepage="https://newsboat.org/"
 changelog="https://raw.githubusercontent.com/newsboat/newsboat/master/CHANGELOG.md"
 distfiles="https://newsboat.org/releases/${version}/newsboat-${version}.tar.xz"
-checksum=34a4834e00f06c0151c700d6af065f5b8776872227d9d4484d247ae7a4413c18
+checksum=fd5a40096689d4fc0f18441319197769fa377709821b1a3f1b2ba1f006625285
 
 # tests fail when run by superuser
 # they always fail on musl, see https://github.com/newsboat/newsboat/issues/1216

From a3c372befbe6caabfff5c2abd488ab03556311b8 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Sat, 26 Mar 2022 11:09:59 +0700
Subject: [PATCH 0550/1686] SweetHome3D: update to 6.6

---
 srcpkgs/SweetHome3D/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SweetHome3D/template b/srcpkgs/SweetHome3D/template
index 344aa9e903e6..169fe188e518 100644
--- a/srcpkgs/SweetHome3D/template
+++ b/srcpkgs/SweetHome3D/template
@@ -1,6 +1,6 @@
 # Template file for 'SweetHome3D'
 pkgname=SweetHome3D
-version=6.5.2
+version=6.6
 revision=1
 archs="i686 x86_64"
 wrksrc="SweetHome3D-${version}-src"
@@ -12,7 +12,7 @@ maintainer="1is7ac3 <isaac.qa13@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="www.sweethome3d.com"
 distfiles="${SOURCEFORGE_SITE}/sweethome3d/SweetHome3D-${version}-src.zip"
-checksum=e3323f078e49c72e575e2e771f1586a7c18475b42ea32982abb27756b7a81dc8
+checksum=0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b
 
 do_build() {
 	ant application textures furniture examples help java3dLibraries

From 44f9d8bc40e4a16f83342df722762a704da50a14 Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Fri, 25 Mar 2022 21:49:59 +0100
Subject: [PATCH 0551/1686] kirc: update to 0.3.1.

---
 srcpkgs/kirc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirc/template b/srcpkgs/kirc/template
index fd25076500db..e49f4b1f2531 100644
--- a/srcpkgs/kirc/template
+++ b/srcpkgs/kirc/template
@@ -1,6 +1,6 @@
 # Template file for 'kirc'
 pkgname=kirc
-version=0.3.0
+version=0.3.1
 revision=1
 build_style=gnu-makefile
 short_desc="Tiny IRC client written in POSIX C99"
@@ -8,7 +8,7 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
 license="MIT"
 homepage="http://kirc.io"
 distfiles="https://github.com/mcpcpc/${pkgname}/archive/refs/tags/${version}.tar.gz"
-checksum=1b35c77f46466106b0fde52c0933866ccf5fd7c97569465297dcae018c4b4a16
+checksum=19bb058a9845eb5b2febe6e8d658dcd06c194b58669f37837dbdf37627c7d7dd
 
 post_install() {
 	vlicense LICENSE

From d6fb0aa7820af11ed390cbe129cf4757bfecd7e3 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Mon, 25 May 2020 03:17:12 -0700
Subject: [PATCH 0552/1686] New package: netris-0.1.8

---
 srcpkgs/netris/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/netris/template

diff --git a/srcpkgs/netris/template b/srcpkgs/netris/template
new file mode 100644
index 000000000000..0eb9abeb5b52
--- /dev/null
+++ b/srcpkgs/netris/template
@@ -0,0 +1,13 @@
+# Template file for 'netris'
+pkgname=netris
+version=0.1.8
+revision=1
+wrksrc=$pkgname-v$version
+build_style=go
+go_import_path=gitlab.com/tslocum/netris/cmd/netris
+short_desc="Multiplayer Tetris clone"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/tslocum/netris"
+distfiles="https://gitlab.com/tslocum/netris/-/archive/v${version}/netris-v${version}.tar.gz"
+checksum=3638d7bfce544fde9ab1dd15376586e12513187f7c3b51baf223846cce60a33e

From 8c949b8cbda899a2691b8d4c79b80ee050776b02 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Fri, 25 Mar 2022 11:47:50 +1000
Subject: [PATCH 0553/1686] kops: update to 1.23.0

---
 srcpkgs/kops/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kops/template b/srcpkgs/kops/template
index d044b28cad1a..4ba82a05a2a3 100644
--- a/srcpkgs/kops/template
+++ b/srcpkgs/kops/template
@@ -1,6 +1,6 @@
 # Template file for 'kops'
 pkgname=kops
-version=1.22.2
+version=1.23.0
 revision=1
 archs="x86_64*"
 build_wrksrc=src/k8s.io/kops

From 6d48a1b5c38d201f0d8abb9d0c0cc827971b228b Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Wed, 23 Mar 2022 17:56:44 -0500
Subject: [PATCH 0554/1686] Signal-Desktop: update to 5.36.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 038af9b6e175..55591ea4c82f 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.35.0
+version=5.36.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=12d4766356d50f4eaff907a738860be91bf4c012fd2db62d00757078923dca67
+checksum=de158a8f4b19e3f8b849abf07fbb3d1b2207a3a08fde31aac328635e66a8a956
 nostrip_files="signal-desktop"
 
 post_extract() {

From db62846d01a4d813e700a46ecaef7158e452c45b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 21 Mar 2022 10:56:40 +0100
Subject: [PATCH 0555/1686] dbeaver: update to 22.0.1.

---
 srcpkgs/dbeaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index d20837b230c8..276af8802424 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=22.0.0
+version=22.0.1
 revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
@@ -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=c4e995ce3c46723f071faefe8dc68df54f001c634e757a9bf89c594fe3a55613
+checksum=2258f77b6e68fc0784dd7d92fc1297695b57e6ca22e3d454f21f328bf61e2bf0
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

From 55493c300314a815c2dd2c4b400d0708058e36ca Mon Sep 17 00:00:00 2001
From: Kyle Nusbaum <KyleJNusbaum@gmail.com>
Date: Sat, 19 Mar 2022 01:51:59 -0500
Subject: [PATCH 0556/1686] apache-kafka: update to 3.1.0.

---
 srcpkgs/apache-kafka/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apache-kafka/template b/srcpkgs/apache-kafka/template
index 0e75af73152e..453b09923566 100644
--- a/srcpkgs/apache-kafka/template
+++ b/srcpkgs/apache-kafka/template
@@ -1,6 +1,6 @@
 # Template file for 'apache-kafka'
 pkgname=apache-kafka
-version=3.0.0
+version=3.1.0
 revision=1
 wrksrc="kafka-${version}-src"
 hostmakedepends="curl which tar openjdk8"
@@ -10,7 +10,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
 license="Apache-2.0"
 homepage="https://kafka.apache.org"
 distfiles="https://dlcdn.apache.org/kafka/${version}/kafka-${version}-src.tgz"
-checksum=66a9efddcc2ce88984941020db012178efd51eb47c359c7fd1bab791416e39cd
+checksum=75265c6b103b73fa9c8a9897963bee6587f968309ec827ad795e48dea1a61aaf
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 2660110cf2dac08c3b01b6f6938310d2187d246d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?=
 <lucas.treffenstaedt@tngtech.com>
Date: Fri, 18 Mar 2022 11:59:16 +0100
Subject: [PATCH 0557/1686] zoom: update to 5.9.6.2225.

---
 srcpkgs/zoom/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zoom/template b/srcpkgs/zoom/template
index 3ec023975ed8..aa16c7503ed4 100644
--- a/srcpkgs/zoom/template
+++ b/srcpkgs/zoom/template
@@ -1,6 +1,6 @@
 # Template file for 'zoom'
 pkgname=zoom
-version=5.9.3.1911
+version=5.9.6.2225
 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=6cbb3d72b6d84c2527e75b577959af5ea1992111fdaf37c56fd1fcc8725fcc87
+checksum=1e43ae0e43168586f5dd05ace1e646afe1455825b62b760e2dab0a3564da35e3
 repository=nonfree
 noshlibprovides=yes
 noverifyrdeps=yes

From 755b2c1fdd4fec0af90b281dd57ef7eb59d19d31 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sun, 27 Mar 2022 11:08:07 -0400
Subject: [PATCH 0558/1686] libnma: update to 1.8.36.

---
 common/shlibs           | 1 +
 srcpkgs/libnma/template | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 7d323593a120..bba46e1678dc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,6 +2957,7 @@ liblz.so.1 lzlib-1.8_1
 libelogind.so.0 libelogind-238.1_2
 libseat.so.1 libseat-0.3.0_1
 libnma.so.0 libnma-1.8.30_1
+libnma-gtk4.so.0 libnma-1.8.36_1
 libgspell-1.so.2 gspell-1.8.0_1
 libotf.so.1 libotf-0.9.16_1
 libimagequant.so.0 libimagequant-2.8.2_1
diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index c0a9791e5736..148ae51d6de9 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,12 +1,12 @@
 # Template file for 'libnma'
 pkgname=libnma
-version=1.8.34
+version=1.8.36
 revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dlibnma_gtk4=false"
+configure_args="-Dlibnma_gtk4=true"
 hostmakedepends="gettext glib-devel gtk-doc pkg-config vala"
-makedepends="gcr-devel gtk+3-devel iso-codes
+makedepends="gcr-devel gtk+3-devel gtk4-devel iso-codes
  mobile-broadband-provider-info NetworkManager-devel"
 depends="NetworkManager iso-codes"
 short_desc="NetworkManager panel applet for GNOME - runtime library"
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libnma"
 changelog="https://gitlab.gnome.org/GNOME/libnma/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f5e2e738e0fca7f2a549079290b2d8017511d485a83220c36df380a3b4753304
+checksum=d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a
 replaces="libnm-gtk>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 150ba6617b2eca733bf0caeab8cec0d9af3e9fe0 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 27 Mar 2022 05:42:05 -0400
Subject: [PATCH 0559/1686] font-iosevka: update to 15.1.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 4f1c061d5764..e293af01166b 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=15.0.3
+version=15.1.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- 7c6a4d8e003cab1a46f86fdf43f8c49e4b9d6ce932961572476266ad9f351608
- 629dd3cf957f7ef255e7dccc3286c5a3b54c0a6a7cde8b93b3a7fdc9dffc4cbd"
+ 4bb10d12681546fa129f9105706d6f55c346b75418a19793fb300f0bd4e5991d
+ e05995a4b66592d5868b7e667bba8a5f1822499fc53c6cd7a8abf3e40f8b8895"
 
 font_dirs="/usr/share/fonts/TTF"
 

From 7e8eeb5f1d3e3cfb2603d762206518a945705658 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Sun, 27 Mar 2022 18:24:31 +0700
Subject: [PATCH 0560/1686] vivaldi: update to 5.1.2567.73

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index d36738824694..9108f67a4d29 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.1.2567.66
+version=5.1.2567.73
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=e2631cfabdd2d916fd8ab05004afd86efeec4e47d50a86b8be4cd3b59f6430ed
+checksum=efc4a4d39724840cbcc78317ef1a0e5e300cb8b9d655defee8e746626f845f12
 repository=nonfree
 restricted=yes
 nostrip=yes

From 7457a8682a020d3249426a51dabbc4b5c8d261ea Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 12:45:16 +0100
Subject: [PATCH 0561/1686] freerdp: update to 2.6.1.

---
 srcpkgs/freerdp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index c4796b8c73c0..da6703547a83 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,6 +1,6 @@
 # Template file for 'freerdp'
 pkgname=freerdp
-version=2.6.0
+version=2.6.1
 revision=1
 wrksrc="FreeRDP-${version}"
 build_style=cmake
@@ -20,7 +20,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.freerdp.com/"
 distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz"
-checksum=b9eb850f27bed4362b9a1017d37f6e271f43428948f995e7815e039306cb6ddd
+checksum=2ff86a839c1cf678a24d9bf435c83745aafbd5f0d19b637b733e306acede96e3
 CFLAGS="-Wno-dev"
 
 case "$XBPS_TARGET_MACHINE" in

From 6b3156f047dd61b93fd8a908d860cfaad501b6c5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 27 Mar 2022 17:42:39 +0200
Subject: [PATCH 0562/1686] dxa: update to 0.1.5.

---
 srcpkgs/dxa/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dxa/template b/srcpkgs/dxa/template
index 4d4e05f1c450..9eeb0175f96a 100644
--- a/srcpkgs/dxa/template
+++ b/srcpkgs/dxa/template
@@ -1,14 +1,16 @@
 # Template file for 'dxa'
 pkgname=dxa
-version=0.1.4
+version=0.1.5
 revision=1
 build_style=gnu-makefile
+make_check_target="test"
+checkdepends="xa"
 short_desc="6502/R65C02 disassembler"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.floodgap.com/retrotech/xa/#dxa"
 distfiles="https://www.floodgap.com/retrotech/xa/dists/dxa-${version}.tar.gz"
-checksum=0b4ae0c0ae75223f446429bd19e8959d6224124b1ed1deb4a24f06f619b66b95
+checksum=8e40ed77816581f9ad95acac2ed69a2fb2ac7850e433d19cd684193a45826799
 
 do_install() {
 	vbin dxa

From 7393de55159c2dfd152d093604faa99310a178b7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 27 Mar 2022 17:43:28 +0200
Subject: [PATCH 0563/1686] xa: update to 2.3.13.

---
 srcpkgs/xa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xa/template b/srcpkgs/xa/template
index 913275ab347a..b6df10d76645 100644
--- a/srcpkgs/xa/template
+++ b/srcpkgs/xa/template
@@ -1,6 +1,6 @@
 # Template file for 'xa'
 pkgname=xa
-version=2.3.12
+version=2.3.13
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.floodgap.com/retrotech/xa/"
 distfiles="https://www.floodgap.com/retrotech/xa/dists/xa-${version}.tar.gz"
-checksum=f8fd1536012d676fc6cbfcdd6a91793e564c89b6ef747f8db8f467c178fb0704
+checksum=a9477af150b6c8a91cd3d41e1cf8c9df552d383326495576830271ca4467bd86
 
 post_extract() {
 	vsed -i 's/${LD}/${CC}/' src/Makefile

From 1e25d67496678a054080c714fd7a0ba6bacac921 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 27 Mar 2022 20:25:40 +0200
Subject: [PATCH 0564/1686] monit: update to 5.32.0.

---
 srcpkgs/monit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 3616fa0ee29b..b10596c639d6 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,6 +1,6 @@
 # Template file for 'monit'
 pkgname=monit
-version=5.31.0
+version=5.32.0
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -16,7 +16,7 @@ license="AGPL-3.0-only"
 homepage="https://mmonit.com/monit/"
 changelog="https://mmonit.com/monit/changes/"
 distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz"
-checksum=eae71f28941fb663eec74c1a59b69546c659529796550bd9c0c544e9b52ac055
+checksum=1077052d4c4e848ac47d14f9b37754d46419aecbe8c9a07e1f869c914faf3216
 
 pre_configure() {
 	./bootstrap

From c14fdc7a442e5866c1e2d4715d49036150b15a01 Mon Sep 17 00:00:00 2001
From: Mate GABRI <mate.gabri@playhq.com>
Date: Mon, 7 Mar 2022 21:29:14 +1000
Subject: [PATCH 0565/1686] kubernetes-helm: update to 3.8.1

---
 srcpkgs/kubernetes-helm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubernetes-helm/template b/srcpkgs/kubernetes-helm/template
index 18c05630ce41..8e7eab5eea58 100644
--- a/srcpkgs/kubernetes-helm/template
+++ b/srcpkgs/kubernetes-helm/template
@@ -1,6 +1,6 @@
 # Template file for 'kubernetes-helm'
 pkgname=kubernetes-helm
-version=3.7.2
+version=3.8.1
 revision=1
 wrksrc="helm-${version}"
 hostmakedepends="go make git mercurial tar"
@@ -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=d04175807c2948261517b58120a0810ec20b92c0058acb040e973d0b9de7b08d
+checksum=fed90e57113a6b6e50db03ee711358b04733bc2a50797e1b103a300b1f8a4b16
 conflicts="helm"
 nopie=true
 

From 74c61a7334ea0711a29a0498464d1b787835f555 Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 28 Feb 2022 09:42:47 +0000
Subject: [PATCH 0566/1686] libuv: update to 1.43.0.

---
 srcpkgs/libuv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libuv/template b/srcpkgs/libuv/template
index 76a36863f4b9..2575d92da2ad 100644
--- a/srcpkgs/libuv/template
+++ b/srcpkgs/libuv/template
@@ -1,6 +1,6 @@
 # Template file for 'libuv'
 pkgname=libuv
-version=1.41.0
+version=1.43.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
@@ -10,7 +10,7 @@ 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=6cfeb5f4bab271462b4a2cc77d4ecec847fdbdc26b72019c27ae21509e6f94fa
+checksum=9e27825a55279de69a7c43e42d509fd1337c9bece2547c761e91a1592e91cc4d
 # the tests fail when run as root and as such break in the CI containers
 make_check="extended"
 

From afd2e9796211b688cde9620048182729d3fcc4ae Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 22 Feb 2022 12:51:36 -0500
Subject: [PATCH 0567/1686] micro: adopt.

---
 srcpkgs/micro/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index ceaaed3ad430..4848d9338e90 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -9,7 +9,7 @@ go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
 # Adding CompileDate is bad for reproducibility and adding CommitHash
 # is redundant as we use a tag to build the package.
 short_desc="Modern and intuitive terminal-based text editor"
-maintainer="Diogo Leal <diogo@diogoleal.com>"
+maintainer="0x5c <dev@0x5c.io>"
 license="MIT"
 homepage="https://micro-editor.github.io"
 distfiles="https://github.com/zyedidia/micro/archive/v${version}.tar.gz"

From 46e4da677e57a006fcd0b2e64fd5d5b52f14aae6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 27 Mar 2022 22:27:59 +0200
Subject: [PATCH 0568/1686] janet: update to 1.21.1.

---
 common/shlibs          | 2 +-
 srcpkgs/janet/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bba46e1678dc..d3c9ab101c39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3899,7 +3899,7 @@ libcaribou.so.0 libcaribou-0.4.21_3
 libtinyclipboard.so.1 tinyclipboard-16.01_1
 libcbor.so.0.9 libcbor-0.9.0_1
 libfido2.so.1 libfido2-1.6.0_2
-libjanet.so.1.20 janet-1.20.0_1
+libjanet.so.1.21 janet-1.21.1_1
 libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
 libcbang0.so cbang-1.6.0_3
 libblosc.so.1 c-blosc-1.17.1_1
diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 30c4dc43db48..4301ab90c751 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.21.0
+version=1.21.1
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=8e53efcdeda9b7519248bef5f0e744ad947e013b14960c66ba75967c5fb0a7fd
+checksum=8c6eeabbc0c00ac901b66763676fa4bfdac96e5b6a3def85025b45126227c4e0
 
 post_install() {
 	vlicense LICENSE

From 459461c0763ca5299d5ed3e53058d9047754d8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Thu, 24 Feb 2022 22:26:49 +0100
Subject: [PATCH 0569/1686] bfs: update to 2.5.

---
 srcpkgs/bfs/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/bfs/template b/srcpkgs/bfs/template
index c4d8b40be69b..799cd1d86bb6 100644
--- a/srcpkgs/bfs/template
+++ b/srcpkgs/bfs/template
@@ -1,9 +1,9 @@
 # Template file for 'bfs'
 pkgname=bfs
-version=2.3.1
+version=2.5
 revision=1
 build_style=gnu-makefile
-makedepends="acl-devel libcap-devel"
+makedepends="acl-devel libcap-devel oniguruma-devel"
 checkdepends="acl-progs libcap-progs"
 short_desc="Breadth-first version of the UNIX find command"
 maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
@@ -11,7 +11,7 @@ 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=c3ed60001804ca79a3794935ab6b9927bd14df42dc34e475b34d62929fcc5a98
+checksum=410be5de74bfc5dece213731d3a8462310789118d299fb14f02bd9b0fdd66875
 
 post_install() {
 	vlicense LICENSE

From 07a3df4881e9ac3ebef9291c435421ac8b1fb54f Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Sun, 27 Mar 2022 16:44:25 +0200
Subject: [PATCH 0570/1686] sqlite: update to 3.38.2.

---
 srcpkgs/sqlite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template
index 0ef5405dfa66..e0be13546327 100644
--- a/srcpkgs/sqlite/template
+++ b/srcpkgs/sqlite/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlite'
 pkgname=sqlite
-version=3.38.1
+version=3.38.2
 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}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz"
-checksum=8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4
+checksum=e7974aa1430bad690a5e9f79a6ee5c8492ada8269dc675875ad0fb747d7cada4
 
 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \
  -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \

From 0a3de8f3c9776cad00ce49948001b2071810d68a Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 26 Mar 2022 17:12:48 -0400
Subject: [PATCH 0571/1686] just: update to 1.1.1.

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 436ea6d5d455..7dc9fe4fbeb7 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.1.0
+version=1.1.1
 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/refs/tags/${version}.tar.gz"
-checksum=b0eaf3c7da507be9ad8e0ce050a10459eeead72b94d50bc3261e3dcda516b03a
+checksum=b985def8260965773422fc6c665fa37aeb7304280560dbf8f641479ba00e2da0
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 95fcb7ec42ecbb36b4dbf7b400282730b5c9a45d Mon Sep 17 00:00:00 2001
From: notthewave <winklbauer_m@zoho.eu>
Date: Fri, 25 Mar 2022 22:02:02 +0100
Subject: [PATCH 0572/1686] sfeed: update to 1.3.

---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 47ca1fd14112..46b4d83e558b 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.2
+version=1.3
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -11,7 +11,7 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=7d3cdaf8dcc6582f6655330f82f8a57ca37c4b9c84ff995b09b7b7fb9fe58b58
+checksum=49d32e98a47a80a2a6cbd5d816938057d4ca3910e0a6a814b2c2a6520fbda9ba
 
 post_install() {
 	vlicense LICENSE

From 6e0292db3f766df264a829dcd2081bc45f2d0973 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 24 Mar 2022 19:38:45 +1100
Subject: [PATCH 0573/1686] MoarVM: update to 2022.03.

---
 srcpkgs/MoarVM/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/MoarVM/template b/srcpkgs/MoarVM/template
index f437404bd76c..9386751ab79a 100644
--- a/srcpkgs/MoarVM/template
+++ b/srcpkgs/MoarVM/template
@@ -1,6 +1,6 @@
 # Template file for 'MoarVM'
 pkgname=MoarVM
-version=2022.02
+version=2022.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=4f93cdce6b8a565a32282bb38cc971cefeb71f5d022c850c338ee8145574ee96
+checksum=fb71cd13912464482b99b33f0c06e9fd7c51a151c6e632a9220cf93c5855fdaf
 nocross=yes
 shlib_provides="libmoar.so"

From 96391b37baaef517e2d95de0f71003db41a912c6 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 24 Mar 2022 19:40:33 +1100
Subject: [PATCH 0574/1686] nqp: update to 2022.03.

---
 srcpkgs/nqp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nqp/template b/srcpkgs/nqp/template
index e80e23f80ee6..52ec0153fe05 100644
--- a/srcpkgs/nqp/template
+++ b/srcpkgs/nqp/template
@@ -1,6 +1,6 @@
 # Template file for 'nqp'
 pkgname=nqp
-version=2022.02
+version=2022.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=25d3c99745cd84f4049a9bd9cf26bb5dc817925abaafe71c9bdb68841cdb18b1
+checksum=a95e778970c4d09c091d2aa299c05036208ce4b4b0d3a7af373198c12258b306
 nocross=yes

From 24d4c7fb3f5878a0ecc32bdbc8de7261d739f06e Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Thu, 24 Mar 2022 19:42:26 +1100
Subject: [PATCH 0575/1686] rakudo: update to 2022.03.

---
 srcpkgs/rakudo/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rakudo/template b/srcpkgs/rakudo/template
index 979c33def794..6a0345b57907 100644
--- a/srcpkgs/rakudo/template
+++ b/srcpkgs/rakudo/template
@@ -1,6 +1,6 @@
 # Template file for 'rakudo'
 pkgname=rakudo
-version=2022.02
+version=2022.03
 revision=1
 build_style=configure
 make_check_target=test
@@ -32,10 +32,10 @@ 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=6a6e9dbcc6d9a1610a34c6ec67e2d3f694d7b33e9e0a0f224543089fa7f71332
+checksum=03e215b001a879747618d6fc18eb7f89c0b812f5e543a43ed66c13439ea8a227
 nocross=yes
 provides="raku-${version}_${revision}"
 
 post_install() {
-	vbin tools/install-dist.p6 raku-install-dist
+	vbin tools/install-dist.raku raku-install-dist
 }

From 8132d47fa88984c7218f05926c05949eb7336110 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 00:13:18 +0100
Subject: [PATCH 0576/1686] nwipe: update to 0.33.

---
 srcpkgs/nwipe/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nwipe/template b/srcpkgs/nwipe/template
index acc1307e5f1e..5a82401a9d40 100644
--- a/srcpkgs/nwipe/template
+++ b/srcpkgs/nwipe/template
@@ -1,17 +1,18 @@
 # Template file for 'nwipe'
 pkgname=nwipe
-version=0.32
+version=0.33
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake pkg-config"
 makedepends="libuuid-devel libparted-devel ncurses-devel"
+depends="smartmontools"
 short_desc="Utility to securely erase disks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/martijnvanbrummelen/nwipe"
 changelog="https://raw.githubusercontent.com/martijnvanbrummelen/nwipe/master/CHANGELOG.md"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=40b7a3833d60a28834ccc190174c97a28141fdd43d93652ae93bb4928f567a5c
+checksum=e771a6d36a6800a5cf0ad460591bfd7fe4c04a908afe3da5fd169c921195e489
 
 CFLAGS="-D_FILE_OFFSET_BITS=64"
 

From e20c23cb4d24e26b319ac148133c309890cf56ac Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 24 Mar 2022 00:18:32 +0100
Subject: [PATCH 0577/1686] partclone: update to 0.3.19.

---
 srcpkgs/partclone/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index f7187bbff910..941c9e4bd529 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,6 +1,6 @@
 # Template file for 'partclone'
 pkgname=partclone
-version=0.3.18
+version=0.3.19
 revision=1
 build_style=gnu-configure
 configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
@@ -13,8 +13,8 @@ short_desc="File system clone and restore utilities"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://partclone.org/"
-distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz"
-checksum=50070e29c2e00e991a3784f13339347acb46d2a293f43531d1f4f4f0dcb42311
+distfiles="https://github.com/Thomas-Tsai/partclone/archive/refs/tags/${version}.tar.gz"
+checksum=e15e399297b8efd74a4fd19f3caca28e5c1772b051acf7fc311f3c86296bcda4
 CFLAGS="-DBTRFS_DISABLE_BACKTRACE"
 
 pre_configure() {

From c7d8b46e58f20271e73ba083a223c0b2c068b4d4 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 22 Mar 2022 03:15:35 -0400
Subject: [PATCH 0578/1686] New package: ircdog-0.3.0

---
 srcpkgs/ircdog/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/ircdog/template

diff --git a/srcpkgs/ircdog/template b/srcpkgs/ircdog/template
new file mode 100644
index 000000000000..e26b035a1382
--- /dev/null
+++ b/srcpkgs/ircdog/template
@@ -0,0 +1,16 @@
+# Template file for 'ircdog'
+pkgname=ircdog
+version=0.3.0
+revision=1
+build_style=go
+go_import_path="github.com/ergochat/ircdog"
+short_desc="Simple wrapper over the raw IRC protocol"
+maintainer="0x5c <dev@0x5c.io>"
+license="ISC"
+homepage="https://github.com/ergochat/ircdog"
+distfiles="https://github.com/ergochat/ircdog/archive/refs/tags/v${version}.tar.gz"
+checksum=ea58a3fb081e438eae834ed7a812cc7640e7d3440c3615b814b880fef0eab5f6
+
+post_install() {
+	vlicense LICENSE
+}

From 5095bc73f7d492db5311116e7006f291276be37a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 02:34:28 +0100
Subject: [PATCH 0579/1686] stagit: update to 1.0.

---
 srcpkgs/stagit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index 7078a4f6c946..f5828d25ed5c 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,6 +1,6 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=0.9.6
+version=1.0
 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=d072f386f3a546ed0341e20f9c2dfd7756a761fab1c40316a96690cb2b3066d0
+checksum=10a0e31bb57d6da0dea84728cabed95b8f7d83fde13bb76e0ce18ef71ab68d8f
 LDFLAGS="-lgit2"
 
 post_install() {

From 935f9582e14ce4443a163fbcb2e4b8f0263c7383 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 22:06:02 +0100
Subject: [PATCH 0580/1686] imlib2: update to 1.8.1, adopt.

---
 srcpkgs/imlib2/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template
index dd9ac63e7cc8..b560ef27489c 100644
--- a/srcpkgs/imlib2/template
+++ b/srcpkgs/imlib2/template
@@ -1,6 +1,6 @@
 # Template file for 'imlib2'
 pkgname=imlib2
-version=1.8.0
+version=1.8.1
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --sysconfdir=/etc/imlib2 --enable-visibility-hiding"
@@ -9,11 +9,11 @@ makedepends="freetype-devel libjpeg-turbo-devel libpng-devel libwebp-devel
  tiff-devel libid3tag-devel giflib-devel libXext-devel libSM-devel
  libheif-devel librsvg-devel"
 short_desc="Image manipulation library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="Imlib2"
 homepage="https://sourceforge.net/projects/enlightenment/"
-distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.gz"
-checksum=6f881c9a1eee040484d2f13070fefbf1d88270a75042e2d5de63fa22ea6e1c88
+distfiles="${SOURCEFORGE_SITE}/enlightenment/imlib2-src/imlib2-${version}.tar.xz"
+checksum=522e1e70e65bc0eddfe207617d15c9a395662a7c090661daaa2c294fb7d9fdaa
 
 post_install() {
 	vlicense COPYING

From 8f20d19c6324d3edebc46e11f45d3aafacc6a60b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 19 May 2021 16:09:01 +0200
Subject: [PATCH 0581/1686] New package: perl-Math-Int64-0.54

---
 srcpkgs/perl-Math-Int64/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/perl-Math-Int64/template

diff --git a/srcpkgs/perl-Math-Int64/template b/srcpkgs/perl-Math-Int64/template
new file mode 100644
index 000000000000..f5554054e6f5
--- /dev/null
+++ b/srcpkgs/perl-Math-Int64/template
@@ -0,0 +1,15 @@
+# Template file for 'perl-Math-Int64'
+pkgname=perl-Math-Int64
+version=0.54
+revision=1
+wrksrc="${pkgname#perl-}-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="perl"
+depends="perl"
+short_desc="Add support for 64 bit integers, signed and unsigned, to Perl"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Math-Int64"
+distfiles="${CPAN_SITE}/Math/Math-Int64-${version}.tar.gz"
+checksum=dcfc51e698437ea6b9cefe0276215c56cdb6a7f85e3e24a2b6b4189f1960d351

From cd569924bc0ca5fe40145c349088f7bf283f7e0b Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 19 May 2021 16:09:28 +0200
Subject: [PATCH 0582/1686] New package: perl-Math-Int128-0.22

---
 srcpkgs/perl-Math-Int128/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/perl-Math-Int128/template

diff --git a/srcpkgs/perl-Math-Int128/template b/srcpkgs/perl-Math-Int128/template
new file mode 100644
index 000000000000..eb4fb2e68fdc
--- /dev/null
+++ b/srcpkgs/perl-Math-Int128/template
@@ -0,0 +1,20 @@
+# Template file for 'perl-Math-Int128'
+pkgname=perl-Math-Int128
+version=0.22
+revision=1
+wrksrc="${pkgname#perl-}-${version}"
+build_style=perl-module
+hostmakedepends="perl"
+makedepends="perl"
+depends="perl perl-Math-Int64"
+checkdepends="perl-Math-Int64"
+short_desc="Add support for 128 bit integers, signed and unsigned, to Perl"
+maintainer="newbluemoon <blaumolch@mailbox.org>"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
+homepage="https://metacpan.org/release/Math-Int64"
+distfiles="${CPAN_SITE}/Math/Math-Int128-${version}.tar.gz"
+checksum=a630ca401753866955f1173848ab5b4ac4ad5ca6ad9087f11cdf91dde85119bc
+
+if [ "$XBPS_TARGET_WORDSIZE" == "32" ]; then
+	broken="not supported on 32-bit architectures"
+fi

From b2b085e68231800daa48123a6db1dcdb18eba89d Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 19 May 2021 16:10:55 +0200
Subject: [PATCH 0583/1686] perl-Crypt-CBC: update to 3.04

---
 srcpkgs/perl-Crypt-CBC/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-Crypt-CBC/template b/srcpkgs/perl-Crypt-CBC/template
index 5ddc77f0674e..f15cfc6013cb 100644
--- a/srcpkgs/perl-Crypt-CBC/template
+++ b/srcpkgs/perl-Crypt-CBC/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-Crypt-CBC'
 pkgname=perl-Crypt-CBC
-version=3.01
+version=3.04
 revision=1
 wrksrc="${pkgname#perl-}-${version}"
 build_style=perl-module
@@ -12,6 +12,6 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/Crypt-CBC"
 distfiles="${CPAN_SITE}/Crypt/Crypt-CBC-${version}.tar.gz"
-checksum=de259c1c94fc1fd2731dfd276e8b05e31edfd2150848afdff09ac6ae9a03e624
+checksum=4026c57d0dbf6496c0d561a26f161b763d3b8edf351139c073492e21b5fbce07
 # check requires a lot of new cascading dependencies
 make_check=no

From f2c0d39b343c62d54bf853cf2f08846342b59f99 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 11 Feb 2022 19:40:45 +0100
Subject: [PATCH 0584/1686] lilypond: update to 2.23.6

---
 srcpkgs/lilypond/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lilypond/template b/srcpkgs/lilypond/template
index 66d452bd7771..0cc74759a100 100644
--- a/srcpkgs/lilypond/template
+++ b/srcpkgs/lilypond/template
@@ -1,6 +1,6 @@
 # Template file for 'lilypond'
 pkgname=lilypond
-version=2.23.5
+version=2.23.6
 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=53fd289eac318356003bf19b2d9e8ec43cb32e2ea926363145c1b26482bd1678
+checksum=a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce
 python_version=3
 
 if [ -n "${CROSS_BUILD}" ]; then

From 10ad50ccfd9d1072e937df776abd1e10e4554ffc Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 11 Feb 2022 19:41:08 +0100
Subject: [PATCH 0585/1686] lilypond-doc: update to 2.23.6

---
 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 89aa80f23fe4..f0ee3b262e90 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.5
+version=2.23.6
 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="https://lilypond.org/"
 distfiles="https://lilypond.org/downloads/binaries/documentation/lilypond-${version}-1.documentation.tar.bz2"
-checksum=e2b528b3ce70058b634fd76b097f975760c0ad86148d9ec63b66c73a941b0afd
+checksum=1fada73c22dbcfa6224744a8ad87e10cced784f98fd9243768c96ee5bc0ee45d
 
 do_install() {
 	vmkdir usr

From 2a79cff956121263a32e241e145d3ab36a45fdda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 13:37:41 +0100
Subject: [PATCH 0586/1686] slop: update to 7.6.

---
 common/shlibs         | 2 +-
 srcpkgs/slop/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d3c9ab101c39..1b072c738a2e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2985,7 +2985,7 @@ libmutter-cogl-9.so.0 mutter-41.0_1
 libmutter-cogl-pango-9.so.0 mutter-41.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
+libslopy.so.7.6 slop-7.6_1
 libbcunit.so.1 bcunit-3.0_1
 libzbar.so.0 libzbar-0.10_1
 libzbargtk.so.0 libzbar-0.10_1
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index bae6088a418a..9659f2818c1e 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
-version=7.5
-revision=5
+version=7.6
+revision=1
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"
@@ -10,7 +10,7 @@ maintainer="Felipe Nogueira <contato.fnog@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/naelstrof/slop"
 distfiles="https://github.com/naelstrof/slop/archive/v${version}.tar.gz"
-checksum=94d8b6270217cd7f56ce7d4a9a75069025262830a2f91c3239b7fc07da5ea8da
+checksum=ec45f9a69d7a24df621f5c634d202451ddca987d550cf588c5c427b99106fb6b
 
 slop-devel_package() {
 	short_desc+=" - developments files"

From d1ae76f79dd12b79b440525ed0eda9b1442930c0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 13:38:14 +0100
Subject: [PATCH 0587/1686] maim: rebuild against slop-7.6

---
 srcpkgs/maim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index c9cfee875339..a3bbf381c466 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.7.4
-revision=3
+revision=4
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel

From 00ba982a7fe02664121d98f6a8f2be37b387d16c Mon Sep 17 00:00:00 2001
From: Isaac Freund <mail@isaacfreund.com>
Date: Sun, 6 Mar 2022 19:08:14 +0100
Subject: [PATCH 0588/1686] dumb_runtime_dir: update to 1.0.4.

---
 srcpkgs/dumb_runtime_dir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dumb_runtime_dir/template b/srcpkgs/dumb_runtime_dir/template
index 756fc018a264..f2b18817be65 100644
--- a/srcpkgs/dumb_runtime_dir/template
+++ b/srcpkgs/dumb_runtime_dir/template
@@ -1,6 +1,6 @@
 # Template file for 'dumb_runtime_dir'
 pkgname=dumb_runtime_dir
-version=1.0.3
+version=1.0.4
 revision=1
 build_style=gnu-makefile
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Isaac Freund <mail@isaacfreund.com>"
 license="0BSD"
 homepage="https://github.com/ifreund/dumb_runtime_dir"
 distfiles="${homepage}/releases/download/v${version}/dumb_runtime_dir-${version}.tar.gz"
-checksum=92fe5c4b6a69eb9e1845b067aa7f71303a6faabea3be8110776b6072c1652718
+checksum=451e680ee2ad4bd268a2cc21571fd843eefde5ffd7a6847221f9a1449924acc0
 
 post_install() {
 	vlicense LICENSE

From 3d767321044fd2eba6416be55d6af3bcbbe5d6c6 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Sat, 5 Mar 2022 12:14:35 +0100
Subject: [PATCH 0589/1686] skopeo: update to 1.6.1.

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index cd069e30431a..b568744c4b25 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.5.2
+version=1.6.1
 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=e15c189a8134dec62259e6fea2786e9fb55b34e55d26a8924de0d438fd3677c4
+checksum=304016ec4eb802bf1e1b350854db50bdc99a93dcbcc71f9d531dbb916dc146f3
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From 69e56be98ad31e9115f5d624f3622a10ef0e1c7f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 2 Mar 2022 19:44:21 +0100
Subject: [PATCH 0590/1686] allegro5: update to 5.2.7.0.

---
 srcpkgs/allegro5/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/allegro5/template b/srcpkgs/allegro5/template
index f55a7eb6c144..e63d90e3e3fc 100644
--- a/srcpkgs/allegro5/template
+++ b/srcpkgs/allegro5/template
@@ -1,6 +1,6 @@
 # Template file for 'allegro5'
 pkgname=allegro5
-version=5.2.6.0
+version=5.2.7.0
 revision=1
 wrksrc="allegro-${version}"
 build_style=cmake
@@ -9,14 +9,14 @@ hostmakedepends="pkg-config"
 makedepends="zlib-devel alsa-lib-devel jack-devel libXpm-devel libXxf86vm-devel
  libXxf86dga-devel libXcursor-devel libvorbis-devel libpng-devel glu-devel
  libjpeg-turbo-devel libtheora-devel freetype-devel libflac-devel physfs-devel
- libopenal-devel gtk+-devel opus-devel opusfile-devel"
+ libopenal-devel gtk+3-devel opus-devel opusfile-devel"
 depends="virtual?libGL"
 short_desc="Portable library mainly aimed at video game and multimedia programming"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="Allegro License (MIT alike)"
 homepage="https://liballeg.org/"
 distfiles="https://github.com/liballeg/allegro5/releases/download/${version}/allegro-${version}.tar.gz"
-checksum=5de8189ec051e1865f359654f86ec68e2a12a94edd00ad06d1106caa5ff27763
+checksum=c1e3b319d99cb453b39d393572ba2b9f3de42a96de424aee7d4a1abceaaa970c
 
 post_install() {
 	vlicense LICENSE.txt

From dfe03d21928cce4328c3e11c686afcff0e37c87b Mon Sep 17 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, 18 Jan 2021 21:02:52 +0700
Subject: [PATCH 0591/1686] GitHub Action: build on push to branches designated
 for CI

---
 .github/workflows/build.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8ecd4d0e658a..503f1e1f4b68 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,6 +1,10 @@
-name: Check PR
+name: Check build
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - 'ci-**'
 
 jobs:
   # Lint changed templates.

From 8af71d9bbcd8611b21c58a39618a8637b609b200 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Mon, 14 Mar 2022 16:27:20 -0400
Subject: [PATCH 0592/1686] New package: aravis-0.8.21

---
 common/shlibs             |  1 +
 srcpkgs/aravis/template   | 47 +++++++++++++++++++++++++++++++++++++++
 srcpkgs/gstreamer1-aravis |  1 +
 srcpkgs/libaravis         |  1 +
 srcpkgs/libaravis-devel   |  1 +
 5 files changed, 51 insertions(+)
 create mode 100644 srcpkgs/aravis/template
 create mode 120000 srcpkgs/gstreamer1-aravis
 create mode 120000 srcpkgs/libaravis
 create mode 120000 srcpkgs/libaravis-devel

diff --git a/common/shlibs b/common/shlibs
index 1b072c738a2e..ccc55a1b3772 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4144,3 +4144,4 @@ librz_util.so.0.3.4 rizin-0.3.4_1
 librz_lang.so.0.3.4 rizin-0.3.4_1
 librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
+libaravis-0.8.so.0 libaravis-0.8.21_1
diff --git a/srcpkgs/aravis/template b/srcpkgs/aravis/template
new file mode 100644
index 000000000000..2c67a954144a
--- /dev/null
+++ b/srcpkgs/aravis/template
@@ -0,0 +1,47 @@
+# Template file for 'aravis'
+pkgname=aravis
+version=0.8.21
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gobject-introspection gi-docgen gettext"
+makedepends="gtk+3-devel glib-devel libusb-devel zlib-devel libxml2-devel
+ gstreamer1-devel gst-plugins-base1-devel"
+checkdepends="python3-gobject"
+short_desc="Vision utilities for genicam based cameras"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/AravisProject/aravis"
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=a53ce93cb082ac1c4215aed48aa9e05d5342d58811938065e9f503b07838dfb3
+# Network test causes timeout in CI
+make_check=ci-skip
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" glib-devel prelink-cross qemu-user-static"
+fi
+
+libaravis_package() {
+	short_desc="Vision library for genicam-based cameras"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vmove usr/lib/girepository-1.0
+	}
+}
+
+libaravis-devel_package() {
+	depends="libaravis>=${version}_${revision}"
+	short_desc="Vision library for genicam-based cameras - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gir-1.0
+	}
+}
+
+gstreamer1-aravis_package() {
+	short_desc+=" - gstreamer plugin"
+	pkg_install() {
+		vmove usr/lib/gstreamer-1.0
+	}
+}
diff --git a/srcpkgs/gstreamer1-aravis b/srcpkgs/gstreamer1-aravis
new file mode 120000
index 000000000000..4309a30c365f
--- /dev/null
+++ b/srcpkgs/gstreamer1-aravis
@@ -0,0 +1 @@
+aravis
\ No newline at end of file
diff --git a/srcpkgs/libaravis b/srcpkgs/libaravis
new file mode 120000
index 000000000000..4309a30c365f
--- /dev/null
+++ b/srcpkgs/libaravis
@@ -0,0 +1 @@
+aravis
\ No newline at end of file
diff --git a/srcpkgs/libaravis-devel b/srcpkgs/libaravis-devel
new file mode 120000
index 000000000000..4309a30c365f
--- /dev/null
+++ b/srcpkgs/libaravis-devel
@@ -0,0 +1 @@
+aravis
\ No newline at end of file

From 00e64d969ea319822fa7f5dc5f2fcb39131c73e4 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 26 Mar 2022 21:18:06 +0530
Subject: [PATCH 0593/1686] New package: spotify-adblock-1.0.1

---
 srcpkgs/spotify-adblock/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/spotify-adblock/template

diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
new file mode 100644
index 000000000000..8d64a84df72f
--- /dev/null
+++ b/srcpkgs/spotify-adblock/template
@@ -0,0 +1,25 @@
+# Template file for 'spotify-adblock'
+pkgname=spotify-adblock
+version=1.0.1
+revision=1
+build_style=cargo
+conf_files="/etc/spotify-adblock/config.toml"
+short_desc="Adblocker for Spotify"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/abba23/spotify-adblock"
+distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${version}.tar.gz"
+checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360
+
+pre_install() {
+	{ sed -n '/<summary>Debian/q'
+	  sed -n '/^```$/q'
+	  sed -n '/^```$/q;s-/usr/local/lib/-/usr/lib/-;p'
+	} <README.md >spotify-adblock.desktop
+}
+
+do_install() {
+	vinstall config.toml 644 etc/spotify-adblock
+	vinstall spotify-adblock.desktop 644 usr/share/applications
+	vinstall "target/${RUST_TARGET}/release/libspotifyadblock.so" 644 usr/lib spotify-adblock.so
+}

From 9c0ae8074a7738186d884b96cdc2742da3177529 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 14 Mar 2022 21:18:11 -0500
Subject: [PATCH 0594/1686] kaffeine: plugins are not detected shlibs

---
 srcpkgs/kaffeine/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kaffeine/template b/srcpkgs/kaffeine/template
index 6b9f2ac96c99..e0356c9ad552 100644
--- a/srcpkgs/kaffeine/template
+++ b/srcpkgs/kaffeine/template
@@ -1,7 +1,7 @@
 # Template file for 'kaffeine'
 pkgname=kaffeine
 version=2.0.18
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules gettext pkg-config kcoreaddons"
@@ -9,6 +9,8 @@ makedepends="kidletime-devel kio-devel ksolid-devel vlc-devel
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
  qt5-plugin-sqlite qt5-plugin-tds
  $(vopt_if dvb 'v4l-utils-devel eudev-libudev-devel')"
+depends="qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
+ qt5-plugin-sqlite qt5-plugin-tds"
 short_desc="KDE media player"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

From 28b906488dfc4a78378cf6303586d9d59e807118 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Fri, 1 Oct 2021 18:23:28 -0500
Subject: [PATCH 0595/1686] enchant2: update to 2.3.2.

---
 srcpkgs/enchant2/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 8a48e4d61b8c..2d7a2e67e125 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
 # Template file for 'enchant2'
 pkgname=enchant2
-version=2.2.15
-revision=5
+version=2.3.2
+revision=1
 wrksrc="enchant-${version}"
 build_style=gnu-configure
 # so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
@@ -22,7 +22,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://abiword.github.io/enchant/"
 distfiles="https://github.com/AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz"
-checksum=3b0f2215578115f28e2a6aa549b35128600394304bd79d6f28b0d3b3d6f46c03
+checksum=ce9ba47fd4d34031bd69445598a698a6611602b2b0e91d705e91a6f5099ead6e
+make_check=no # tests broken
 
 enchant2-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 37a21660dbeaeb1e364141d3b809e350435f25f0 Mon Sep 17 00:00:00 2001
From: Adam Pschorr <adampschorr13@aol.com>
Date: Mon, 21 Mar 2022 12:19:12 -0600
Subject: [PATCH 0596/1686] New package: qt6ct-0.5

---
 srcpkgs/qt6ct/files/qt6ct.sh |  6 ++++++
 srcpkgs/qt6ct/template       | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/qt6ct/files/qt6ct.sh
 create mode 100644 srcpkgs/qt6ct/template

diff --git a/srcpkgs/qt6ct/files/qt6ct.sh b/srcpkgs/qt6ct/files/qt6ct.sh
new file mode 100644
index 000000000000..e4e7708d8a29
--- /dev/null
+++ b/srcpkgs/qt6ct/files/qt6ct.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+export QT_QPA_PLATFORMTHEME=qt5ct
+if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+	export QT_QPA_PLATFORM=wayland
+fi
diff --git a/srcpkgs/qt6ct/template b/srcpkgs/qt6ct/template
new file mode 100644
index 000000000000..1e443df1dc20
--- /dev/null
+++ b/srcpkgs/qt6ct/template
@@ -0,0 +1,20 @@
+# Template file for 'qt6ct'
+pkgname=qt6ct
+version=0.5
+revision=1
+build_style=cmake
+configure_args="-DQT_HOST_PATH=/usr"
+hostmakedepends="qt6-tools-devel"
+makedepends="qt6-base-devel"
+depends="qt6-base qt6-svg"
+short_desc="Qt6 Configuration Tool"
+maintainer="Adam Pschorr <adampschorr13@aol.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/trialuser02/qt6ct"
+distfiles="https://github.com/trialuser02/qt6ct/archive/refs/tags/${version}.tar.gz"
+checksum=0fea8e5295e4ebebfae36f4862aaa67859238312d7a055b252cc53b281d69e0d
+
+post_install() {
+	vlicense COPYING
+	vinstall ${FILESDIR}/qt6ct.sh 644 etc/profile.d
+}

From 6d17376e0e44b3010283b62eb2897bac6c05f7ad Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 27 Mar 2022 22:52:23 -0500
Subject: [PATCH 0597/1686] berry: 0.1.11

---
 srcpkgs/berry/patches/fix-cross.patch | 48 +++++----------------------
 srcpkgs/berry/template                |  9 ++---
 2 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/srcpkgs/berry/patches/fix-cross.patch b/srcpkgs/berry/patches/fix-cross.patch
index 3756ccfa40c5..eace39b7a1ff 100644
--- a/srcpkgs/berry/patches/fix-cross.patch
+++ b/srcpkgs/berry/patches/fix-cross.patch
@@ -1,41 +1,11 @@
---- a/config.mk
-+++ b/config.mk
-@@ -9,11 +9,11 @@
- # Customize below to fit your system
+--- a/configure
++++ b/configure
+@@ -26,7 +26,7 @@
+ progs="CC=gcc CC=clang CC=cc INSTALL=install"
  
- # paths
--PREFIX = /usr/local
-+PREFIX = /usr
- MANPREFIX = ${PREFIX}/share/man
+ # Required dependencies
+-pkgs="x11 xinerama fontconfig xft"
++pkgs="x11 xinerama fontconfig xft freetype2"
  
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = $(XBPS_CROSS_BASE)/usr/include
-+X11LIB = $(XBPS_CROSS_BASE)/usr/lib
- 
- # Xinerama, comment if you don't want it
- XINERAMALIBS  = -lXinerama
-@@ -21,7 +21,7 @@
- 
- # freetype
- FREETYPELIBS = -lfontconfig -lXft
--FREETYPEINC = /usr/include/freetype2
-+FREETYPEINC = $(XBPS_CROSS_BASE)/usr/include/freetype2
- # OpenBSD (uncomment)
- #FREETYPEINC = ${X11INC}/freetype2
- 
-@@ -36,7 +36,7 @@
- # flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${DEBUG_CPPFLAGS}
- #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS}
--CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
-+CFLAGS   += -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
- LDFLAGS  = ${LIBS}
- 
- # Solaris
-@@ -44,4 +44,4 @@
- #LDFLAGS = ${LIBS}
- 
- # compiler and linker
--CC = cc
-+#CC = cc
+ # Default pkg flags to substitute when pkg-config is not found
+ pkg_libs="-lX11 -lXinerama -lfontconfig -lfreetype -lXft"
diff --git a/srcpkgs/berry/template b/srcpkgs/berry/template
index 05256589af24..7e2f79c09641 100644
--- a/srcpkgs/berry/template
+++ b/srcpkgs/berry/template
@@ -1,16 +1,17 @@
 # Template file for 'berry'
 pkgname=berry
-version=0.1.7
+version=0.1.11
 revision=1
-build_style=gnu-makefile
-make_use_env=yes
+build_style=configure
+configure_args="--prefix=/usr"
+hostmakedepends="pkg-config which"
 makedepends="libX11-devel libXinerama-devel libXft-devel freetype-devel"
 short_desc="Healthy, bite-sized window manager"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/JLErvin/berry"
 distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz"
-checksum=1d6de883a0cd96ceb167c5ad2e855b0b15fa84872d41a22e05d0fdf0cf4be6b8
+checksum=9beab0c1458fba7cf304dd45b710829640342bc42cfe61f0ae8c2b5391163142
 
 post_install() {
 	vlicense LICENSE

From f38096b3f4d0d8f0e8f1f8f1edfb50c3d6a9f55a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 27 Mar 2022 23:03:37 -0500
Subject: [PATCH 0598/1686] downloader-cli: update to 0.3.3.

---
 srcpkgs/downloader-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/downloader-cli/template b/srcpkgs/downloader-cli/template
index e390e31ed7b4..a7be8744ea34 100644
--- a/srcpkgs/downloader-cli/template
+++ b/srcpkgs/downloader-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'downloader-cli'
 pkgname=downloader-cli
-version=0.3.2
-revision=2
+version=0.3.3
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-urllib3 python3-downloader-cli"
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/deepjyoti30/downloader-cli"
 distfiles="https://github.com/deepjyoti30/downloader-cli/archive/${version}.tar.gz"
-checksum=ad00b5ab905e57b8c275465c2b8bbeb187068ceff6614e68cf0b86de635acfe5
+checksum=212f87443574f4be7df750223ae15912e3a8f28470cd90aecc40701d109576f4
 
 post_install() {
 	vlicense LICENSE

From b08f7005cad017618b398bda9079037442bb6226 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 27 Mar 2022 23:05:43 -0500
Subject: [PATCH 0599/1686] ffuf: update to 1.4.0.

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 5430e121a532..6ceffafb0e55 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
 # Template file for 'ffuf'
 pkgname=ffuf
-version=1.3.1
+version=1.4.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=136df36154f17668fb726120f0c93059f696786a34e3c2047d61efc3a065c4ec
+checksum=cc741088f15b5cfdeb596f1630a015cce0b4b112dc6daf857cd9878e7a1734c1
 
 post_install() {
 	vlicense LICENSE

From b0af7625db0a47a3c3c65b80948b88776de059eb Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 14:21:14 +0200
Subject: [PATCH 0600/1686] s-nail: update to 14.9.24.

---
 srcpkgs/s-nail/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 2ba9e33f361c..7a171cea0d27 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,6 +1,6 @@
 # Template file for 's-nail'
 pkgname=s-nail
-version=14.9.23
+version=14.9.24
 revision=1
 build_helper="qemu"
 hostmakedepends="perl"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-4-Clause, BSD-3-Clause, BSD-2-Clause, ISC"
 homepage="https://git.sdaoden.eu/cgit/s-nail.git"
 distfiles="https://www.sdaoden.eu/downloads/s-nail-${version}.tar.xz"
-checksum=2c717b22f4cd8719b82b6618640da6031382d2bf8eb51283bca2c6266957bca8
+checksum=2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c
 
 provides="mail-${version}_${revision}"
 

From 9704f6b283fd586b52f5473f716a164a699949e7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 14:22:18 +0200
Subject: [PATCH 0601/1686] weechat: update to 3.5.

---
 srcpkgs/weechat/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template
index c5898cbf3091..ebd25fa21547 100644
--- a/srcpkgs/weechat/template
+++ b/srcpkgs/weechat/template
@@ -1,6 +1,6 @@
 # Template file for 'weechat'
 pkgname=weechat
-version=3.4.1
+version=3.5
 revision=1
 build_style=cmake
 configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON
@@ -17,7 +17,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.weechat.org"
 changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc"
 distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz"
-checksum=7e088109ad5dfbcb08a9a6b1dd70ea8236093fed8a13ee9d9c98881d7b1aeae7
+checksum=ea904e4cec8edd0bd24f3ea17f6d6dff97ca00ee0571ee972e79e54c8c08170c
 lib32disabled=yes
 
 subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl"
@@ -32,10 +32,6 @@ if [ "$CROSS_BUILD" ]; then
 	 -DPERL_LFLAGS=-L$_perlpath"
 fi
 
-post_extract() {
-	vsed -i '/pkg_search_module/s/ruby-3.0/ruby-3.1 &/' cmake/FindRuby.cmake
-}
-
 weechat-aspell_package() {
 	lib32disabled=yes
 	depends="${sourcepkg}>=${version}_${revision}"

From c222254558023d05d52c5da17a91feb2db34fe25 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 14:22:29 +0200
Subject: [PATCH 0602/1686] python3-pyinfra: update to 1.7.2.

---
 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 7e633ebc3fe3..c4935c5e16b9 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.6.3
+version=1.7.2
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -14,7 +14,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=0db96b12a5dde2ca464a83b7dbbff74207775ad16de9162313a823320ec12488
+checksum=c7a2464ab50c5de865f0984e1978a9af37fbeca2260c4bf642db37fd0aed910d
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From 47f150b25136b4a00257b071cc438a7486a42942 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 08:23:49 -0500
Subject: [PATCH 0603/1686] nfdump: update to 1.6.24.

---
 srcpkgs/nfdump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/nfdump/template b/srcpkgs/nfdump/template
index 1bdf3de252f2..348db854dbf4 100644
--- a/srcpkgs/nfdump/template
+++ b/srcpkgs/nfdump/template
@@ -1,6 +1,6 @@
 # Template file for 'nfdump'
 pkgname=nfdump
-version=1.6.23
+version=1.6.24
 revision=1
 build_style=gnu-configure
 hostmakedepends="automake flex libtool pkg-config"
@@ -10,7 +10,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/phaag/nfdump"
 distfiles="https://github.com/phaag/nfdump/archive/v${version}.tar.gz"
-checksum=8c5a7959e66bb90fcbd8ad508933a14ebde4ccf7f4ae638d8f18c9473c63af33
+checksum=11ea7ecba405d57076c321f6f77491f1c64538062630131c98ac62dc4870545e
 configure_args+="--enable-sflow --enable-readpcap --enable-nfcapd"
 
 pre_configure() {

From 812d9329a805d303733909cd156124853fcd155c Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 08:26:12 -0500
Subject: [PATCH 0604/1686] python3-simber: update to 0.2.4.

---
 srcpkgs/python3-simber/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-simber/template b/srcpkgs/python3-simber/template
index 27bd0df0d1f4..20d06df337b7 100644
--- a/srcpkgs/python3-simber/template
+++ b/srcpkgs/python3-simber/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-simber'
 pkgname=python3-simber
-version=0.2.3
-revision=2
+version=0.2.4
+revision=1
 wrksrc="simber-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://simber.deepjyoti30.dev/"
 distfiles="https://github.com/deepjyoti30/simber/archive/${version}.tar.gz"
-checksum=bf588394e26dcd45f4dba5f0c7b3cff8de3d66e22a5cd862979828295ea7f32a
+checksum=75c9e2fc915d470a4d9d36e5e5d003479d06af5d3a7e21b7ec30745f1845f8b9
 
 post_install() {
 	vlicense LICENSE

From bc0bc9cfbedd443b14e389868e5dcbef7404ecba Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 08:42:18 -0500
Subject: [PATCH 0605/1686] stellarium: update to 0.22.0.

---
 srcpkgs/stellarium/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template
index 0cfc788cdefa..c2a87b2847ad 100644
--- a/srcpkgs/stellarium/template
+++ b/srcpkgs/stellarium/template
@@ -1,16 +1,16 @@
 # Template file for 'stellarium'
 pkgname=stellarium
-version=0.21.3
+version=0.22.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"
+ qt5-serialport-devel qt5-tools-devel qt5-charts-devel"
 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=8ac6c054d12f136fe0d5c0deaaa8d7b69dd2a462be1711a187364574aef97e7f
+checksum=0b4dc23cf9054b5e76cd9bc5ad68e172eb221999e90af37e93667d04fe78c885
 replaces="stellarium-data>=0"

From dbdab73201148b11dc440e6159a15b81e8be2442 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 16:01:20 +0200
Subject: [PATCH 0606/1686] linux5.10: update to 5.10.109.

Enable
CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RANDOM_TRUST_BOOTLOADER=y
---
 srcpkgs/linux5.10/files/arm64-dotconfig   | 2 +-
 srcpkgs/linux5.10/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.10/files/ppc-dotconfig     | 2 +-
 srcpkgs/linux5.10/files/ppc64-dotconfig   | 4 ++--
 srcpkgs/linux5.10/files/ppc64le-dotconfig | 4 ++--
 srcpkgs/linux5.10/files/x86_64-dotconfig  | 4 ++--
 srcpkgs/linux5.10/template                | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index f5587464698f..acfc37c03510 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -4519,7 +4519,7 @@ CONFIG_XILLYBUS_OF=m
 # end of Character devices
 
 CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 3226507db584..e3ea24162dc7 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -4034,8 +4034,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/ppc-dotconfig b/srcpkgs/linux5.10/files/ppc-dotconfig
index df90c0513f42..078ffac9ee09 100644
--- a/srcpkgs/linux5.10/files/ppc-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc-dotconfig
@@ -3549,7 +3549,7 @@ CONFIG_DEVPORT=y
 # CONFIG_XILLYBUS is not set
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/ppc64-dotconfig b/srcpkgs/linux5.10/files/ppc64-dotconfig
index 0545b9d79c77..5d973825057c 100644
--- a/srcpkgs/linux5.10/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64-dotconfig
@@ -4148,8 +4148,8 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/ppc64le-dotconfig b/srcpkgs/linux5.10/files/ppc64le-dotconfig
index 5ae9914dc5bd..a5158c12dd3f 100644
--- a/srcpkgs/linux5.10/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.10/files/ppc64le-dotconfig
@@ -3969,8 +3969,8 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 6f07a461b3ab..fa04bb81b4dc 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -4104,8 +4104,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 # end of Character devices
 
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 
 #
 # I2C support
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index a3ccac15e158..0912977245d4 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.107
+version=5.10.109
 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=c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea
+checksum=18fb22ecb249669ea775474aee614dcb0697cab299068074fd9f0bafa32113dc
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 57cc31efe4bc28641c6009fa9a1cbfe810465148 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Fri, 11 Mar 2022 22:37:26 +0100
Subject: [PATCH 0607/1686] podman: add runit service

---
 srcpkgs/podman/files/podman-docker/finish | 3 +++
 srcpkgs/podman/files/podman-docker/run    | 4 ++++
 srcpkgs/podman/files/podman/log/run       | 1 +
 srcpkgs/podman/files/podman/run           | 4 ++++
 srcpkgs/podman/template                   | 4 +++-
 5 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/podman/files/podman-docker/finish
 create mode 100755 srcpkgs/podman/files/podman-docker/run
 create mode 120000 srcpkgs/podman/files/podman/log/run
 create mode 100755 srcpkgs/podman/files/podman/run

diff --git a/srcpkgs/podman/files/podman-docker/finish b/srcpkgs/podman/files/podman-docker/finish
new file mode 100755
index 000000000000..884b37f53b63
--- /dev/null
+++ b/srcpkgs/podman/files/podman-docker/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+[ "$(realpath /run/docker.sock)" = "/run/podman/podman.sock" ] && rm /run/docker.sock
diff --git a/srcpkgs/podman/files/podman-docker/run b/srcpkgs/podman/files/podman-docker/run
new file mode 100755
index 000000000000..3125a4f89ed9
--- /dev/null
+++ b/srcpkgs/podman/files/podman-docker/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+ln -sf /run/podman/podman.sock /run/docker.sock
+exec chpst -b podman-docker pause
diff --git a/srcpkgs/podman/files/podman/log/run b/srcpkgs/podman/files/podman/log/run
new file mode 120000
index 000000000000..3a5b4a586051
--- /dev/null
+++ b/srcpkgs/podman/files/podman/log/run
@@ -0,0 +1 @@
+/usr/bin/vlogger
\ No newline at end of file
diff --git a/srcpkgs/podman/files/podman/run b/srcpkgs/podman/files/podman/run
new file mode 100755
index 000000000000..8eb8f41752e4
--- /dev/null
+++ b/srcpkgs/podman/files/podman/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+exec podman --log-level info system service ${OPTS:---time=0} 2>&1
diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index c719e4ca6057..95e0531abad8 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=4.0.2
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
@@ -34,4 +34,6 @@ post_install() {
 		vendor/github.com/containers/common/pkg/config/containers.conf \
 		>containers.cgfs.conf
 	vinstall containers.cgfs.conf 644 usr/share/containers containers.conf
+	vsv podman
+	vsv podman-docker
 }

From 557e0f3206195a26f7896e324420eaa45a18f26a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 16:33:53 +0200
Subject: [PATCH 0608/1686] linux5.15: update to 5.15.32.

Enable
CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RANDOM_TRUST_BOOTLOADER=y
---
 srcpkgs/linux5.15/files/arm64-dotconfig   | 2 +-
 srcpkgs/linux5.15/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.15/files/ppc-dotconfig     | 2 +-
 srcpkgs/linux5.15/files/ppc64-dotconfig   | 4 ++--
 srcpkgs/linux5.15/files/ppc64le-dotconfig | 4 ++--
 srcpkgs/linux5.15/files/x86_64-dotconfig  | 4 ++--
 srcpkgs/linux5.15/template                | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index f2091f4a8972..d086ed216153 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -4677,7 +4677,7 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
 CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 33ac63d097c5..db7fdf4d3bbd 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -4136,8 +4136,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/ppc-dotconfig b/srcpkgs/linux5.15/files/ppc-dotconfig
index 3c19e95fb938..6ca79da60447 100644
--- a/srcpkgs/linux5.15/files/ppc-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc-dotconfig
@@ -3629,7 +3629,7 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS_CLASS=m
 # CONFIG_XILLYBUS is not set
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/ppc64-dotconfig b/srcpkgs/linux5.15/files/ppc64-dotconfig
index 0261e73e9d87..355ff2fa768c 100644
--- a/srcpkgs/linux5.15/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64-dotconfig
@@ -4261,8 +4261,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/ppc64le-dotconfig b/srcpkgs/linux5.15/files/ppc64le-dotconfig
index 59108825538b..5148c4e5cf55 100644
--- a/srcpkgs/linux5.15/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.15/files/ppc64le-dotconfig
@@ -4078,8 +4078,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index b7655fcc219a..225e5c5022ee 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -4208,8 +4208,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 9b43d8ebf3e3..236c406a512b 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.30
+version=5.15.32
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- 18059d8e3f01ab38b22ddf4c2e0a0a9db50926f6535649f51ee7a86a8542aff1"
+ eacc8609dfcecb637f813ef4d2e13f48bdeb6143be929358f3b3cb4254f9c563"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 0c302dc49cd3c688b43ad378f124fa6e29a098c1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 16:36:50 +0200
Subject: [PATCH 0609/1686] linux5.16: update to 5.16.18.

Enable
CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RANDOM_TRUST_BOOTLOADER=y
---
 srcpkgs/linux5.16/files/arm64-dotconfig   | 2 +-
 srcpkgs/linux5.16/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.16/files/ppc-dotconfig     | 2 +-
 srcpkgs/linux5.16/files/ppc64-dotconfig   | 4 ++--
 srcpkgs/linux5.16/files/ppc64le-dotconfig | 4 ++--
 srcpkgs/linux5.16/files/x86_64-dotconfig  | 4 ++--
 srcpkgs/linux5.16/template                | 6 +++---
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig
index 23f03c1e5630..e4b9d7a609af 100644
--- a/srcpkgs/linux5.16/files/arm64-dotconfig
+++ b/srcpkgs/linux5.16/files/arm64-dotconfig
@@ -4720,7 +4720,7 @@ CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
 CONFIG_RANDOM_TRUST_CPU=y
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/i386-dotconfig b/srcpkgs/linux5.16/files/i386-dotconfig
index 9356aea01812..a7c014b0984b 100644
--- a/srcpkgs/linux5.16/files/i386-dotconfig
+++ b/srcpkgs/linux5.16/files/i386-dotconfig
@@ -4167,8 +4167,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/ppc-dotconfig b/srcpkgs/linux5.16/files/ppc-dotconfig
index 50f83d578977..19463b4a9729 100644
--- a/srcpkgs/linux5.16/files/ppc-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc-dotconfig
@@ -3652,7 +3652,7 @@ CONFIG_DEVPORT=y
 CONFIG_XILLYBUS_CLASS=m
 # CONFIG_XILLYBUS is not set
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/ppc64-dotconfig b/srcpkgs/linux5.16/files/ppc64-dotconfig
index f030f728a84c..b204dc8f8a72 100644
--- a/srcpkgs/linux5.16/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64-dotconfig
@@ -4287,8 +4287,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/ppc64le-dotconfig b/srcpkgs/linux5.16/files/ppc64le-dotconfig
index 65d4298a56f0..564de8e60967 100644
--- a/srcpkgs/linux5.16/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64le-dotconfig
@@ -4104,8 +4104,8 @@ CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/files/x86_64-dotconfig b/srcpkgs/linux5.16/files/x86_64-dotconfig
index 8cc965f22722..dbffc48dfc42 100644
--- a/srcpkgs/linux5.16/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.16/files/x86_64-dotconfig
@@ -4240,8 +4240,8 @@ CONFIG_XILLYBUS_CLASS=m
 CONFIG_XILLYBUS=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
-# CONFIG_RANDOM_TRUST_CPU is not set
-# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
 # end of Character devices
 
 #
diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template
index 5775997c8c58..3f8c094faf24 100644
--- a/srcpkgs/linux5.16/template
+++ b/srcpkgs/linux5.16/template
@@ -1,6 +1,6 @@
-# Template file for 'linux5.16'
+# Template file for 'linux4.16'
 pkgname=linux5.16
-version=5.16.16
+version=5.16.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="027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb
- 9e7af5007d3596c1efee8556aaa1b1a2e40ddded107448b583624a1f305376db"
+ 3bb88aa87c3f7788ad84ca5cbf3946ed9fbb3fddb9fca2458944fba5ebd2ab16"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From d8b758998ef07074b94dc04f5d32a211649805e3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 18:18:51 +0200
Subject: [PATCH 0610/1686] xtools: update to 0.64.

---
 srcpkgs/xtools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xtools/template b/srcpkgs/xtools/template
index a9e48dc39cba..5392fb9a0602 100644
--- a/srcpkgs/xtools/template
+++ b/srcpkgs/xtools/template
@@ -1,6 +1,6 @@
 # Template file for 'xtools'
 pkgname=xtools
-version=0.63
+version=0.64
 revision=1
 build_style=gnu-makefile
 depends="bash curl findutils git make spdx-licenses-list xbps"
@@ -9,4 +9,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Public Domain"
 homepage="http://git.vuxu.org/xtools"
 distfiles="http://git.vuxu.org/xtools/snapshot/xtools-${version}.tar.gz"
-checksum=6bc49a536488f3e911317a31f916df9f6778d34685db6aa2d7bd75be07f12995
+checksum=a49140066744d4aaaf856fb40d92df26d6d3f80b2aa03da1746c513e7eab40be

From 2e39697a117e7d0365e544e9412e5ab5cfde524b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 18:42:31 +0200
Subject: [PATCH 0611/1686] musl-obstack: update to 1.2.3.

---
 srcpkgs/musl-obstack/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/musl-obstack/template b/srcpkgs/musl-obstack/template
index 7da24d223970..a808f53c121e 100644
--- a/srcpkgs/musl-obstack/template
+++ b/srcpkgs/musl-obstack/template
@@ -1,6 +1,6 @@
 # Template file for 'musl-obstack'
 pkgname=musl-obstack
-version=1.2.2
+version=1.2.3
 revision=1
 archs="*-musl"
 build_style=gnu-configure
@@ -10,7 +10,7 @@ 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"
-checksum=6eac88961c58a53f31cccd719b97d1b33c65436c51664e760a9582e2659c1314
+checksum=9ffb3479b15df0170eba4480e51723c3961dbe0b461ec289744622db03a69395
 
 CFLAGS="-fPIC"
 pre_configure() {

From c9698cf57b0ebbe5b44a87abdf5b3cb743ae1928 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:53 +0100
Subject: [PATCH 0612/1686] attica: update to 5.92.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 126c96c5cc71..1222f0cc9a60 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c05ee119f66d6dc60ecff5b7c6e883d4bc478aca547811b4edbc45eaf0f17b6b
+checksum=bf647c7736acbbb99ff1557339f71b5efd5a7591b2af83b482d37d35516bc933
 
 do_check() {
 	cd build

From 36269e49d152cbc96d5638371e2a7c0cb10c5f83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:54 +0100
Subject: [PATCH 0613/1686] baloo5: update to 5.92.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 6f14edf7a725..9f6d3c93f69a 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.91.0
+version=5.92.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=7574d63379c41d8cb0e6579a0d73ab4257967ecbfaa7affa01472dcca35a12b3
+checksum=283570583da0f85b2001ca600b9657e3a3fb9c2dcdd3ea8728553e212e50a475
 
 do_check() {
 	cd build

From 6370d0fcc5a469aa2466bc0dadadba4ef7bcccad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:56 +0100
Subject: [PATCH 0614/1686] bluez-qt5: update to 5.92.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 397fd96f10f0..2893e694f79c 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=595a9ebf11845b2a3f7da4b9db596f485760bbe1930fac368150f17b6b96675c
+checksum=f58d2483ed2db9cb77621bce3b3c6babd8d1153954030c0dc52ce399c6d28ab6
 
 do_check() {
 	cd build

From 9f33e7adeb12d5d59e95bf89376c806ed4c45068 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:58 +0100
Subject: [PATCH 0615/1686] breeze-icons: update to 5.92.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 6f8860791ca9..017805c60580 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.91.0
+version=5.92.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=c17db793b931a640f9db4466e1fee917127809f80ac8fc65b2273044ec23422a
+checksum=49e09663989fd3498d61cb7518c741c87a702689b6d6074097d628264a064366
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From 4e90c9a8090585551b9527e6c94318fceea3986f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:16:59 +0100
Subject: [PATCH 0616/1686] extra-cmake-modules: update to 5.92.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 b96991061327..9c034a06303f 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9717885e30aadf184fa71511930409cabbf08eb6627ea8b051de8804fbcec54c
+checksum=f89a238bc5f28738db25e29296b75b4f795e3e9bfe3a8f1f9390648749d303ef
 python_version=3
 
 do_check() {

From 1982a395aeee3a90d803d15bca5bef6d4f662329 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:01 +0100
Subject: [PATCH 0617/1686] frameworkintegration: update to 5.92.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 861978967fd4..9840b077f5cb 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7fbc8c3b949849d22161f78df453d759389319a91b4925ff235799e410c5e684
+checksum=bd8ef6f6656c9756a56fbfa1dc91273426ef3ea5fae3e7a4c7dbeddfbbe3ec5d
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 59aa681e1cff19f8e476519a72ebf450c1784b5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:03 +0100
Subject: [PATCH 0618/1686] kactivities5-stats: update to 5.92.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 32d213d3787e..8957274d1f85 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=98fdea4517529df0b1b733425a040a80df680d44bb7d27db10070828a9c3c420
+checksum=2206132e0edbb8271f77bb6c45e794b8d3baa3d9b4f94aba005556f9fa3ff751
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 9bd6ecf9e73a924250d9cd36394a43150aade1c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:04 +0100
Subject: [PATCH 0619/1686] kactivities5: update to 5.92.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 98ae1f92c4c5..75438b590eef 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=c0c811b91ff79cb23b99ec85b390ae331107a010f522ed45600ae6274f87c40f
+checksum=fc06b6fc111f5ed8450c1c1c96f36188328b2292001ca3bf3293d0f68678dbcd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From b48897809988a04ac90e753fe83f5f656f92b5cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:05 +0100
Subject: [PATCH 0620/1686] kapidox: update to 5.92.0.

---
 srcpkgs/kapidox/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 0bdfa70566af..164a36aa99a3 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,9 +1,9 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.91.0
+version=5.92.0
 revision=1
-build_style=cmake
-hostmakedepends="kcoreaddons extra-cmake-modules python3 python3-setuptools"
+build_style=python3-module
+hostmakedepends="python3 python3-setuptools"
 makedepends="python3-Jinja2 python3-yaml"
 depends="python3-Jinja2 python3-yaml doxygen"
 short_desc="API documentation generation tool for KDE framework"
@@ -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=434daaf49056471af72a97043c054d0104f1341f92a4464f66a2256233a2b7f7
+checksum=4f5201de5878bc3fb24f9e2ebd387c0a12d7a27c407636bc878bab5a3999a56d
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 756930e30e162590a5225e9a4c6df1ba079e1563 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:07 +0100
Subject: [PATCH 0621/1686] karchive: update to 5.92.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 73aa932596b0..109cc7a0ec29 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a3602cbed2aaf4d446ff7af78b626042aa6fbce1df60eb2b8332b5f6ff214cce
+checksum=5076a28c3a10ab755454c752fa563a4be7ad890f391c43aaa2ee4ee4b6a99fae
 
 karchive-devel_package() {
 	short_desc+=" - development"

From bbc1bb559915203efb662edeffc75afc949ac628 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:09 +0100
Subject: [PATCH 0622/1686] kauth: update to 5.92.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index e8ec33646919..05ea13c55c39 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f865cb134cf4013496940d48f397eae6cf6bc5013dadf911340c23bd7ddb3a00
+checksum=44824bf68ee510d8aa0189a9d4b44568b0fe20d17ba45e3b739db1927bfa4728
 
 do_check() {
 	cd build

From 61ea87df4f5cf407580f73fb56502e16fd59c6ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:10 +0100
Subject: [PATCH 0623/1686] kbookmarks: update to 5.92.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index b8e10942ed96..c845e8909a62 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a42233135dc255a0ff0147f22f9446c2b5932e6b11198aa099fdadbbf5b30e47
+checksum=99504e761621b56e07a561e1caea196fe4623c9334b889f081e3da8e4a19d543
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 94aadf47acb507c138653c3b79db8a015bab5b93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:12 +0100
Subject: [PATCH 0624/1686] kcalendarcore: update to 5.92.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 1011f4c91672..3359712d3db9 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.91.0
+version=5.92.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=37f6975c0ebc8d1983f7c8bef96104dbad705a6a0fc59be53548fd317f05763e
+checksum=6ff2e68dfb8b92e0f181f3f19d20991bfd589b4a047b313af908c41391560b3a
 replaces="kcalcore>=0"
 
 do_check() {

From deaf7d0651e3e11ac3f2fee09d20113e95c980d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:13 +0100
Subject: [PATCH 0625/1686] kcmutils: update to 5.92.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index 5e53a48e1b94..bf26425f364f 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1a195d83a092c493f10f372e245107277c275a418563cbc443a884ef4e4e3901
+checksum=dd49e658fc85c215442a7fa9d2435819f0bef13c997a6c2a51557b82e1bc8d3a
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From f399c6ad993a5088cb06c8a91baa8a5fb170a196 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:15 +0100
Subject: [PATCH 0626/1686] kcodecs: update to 5.92.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index d2c0c19513e4..3ccc8f79b638 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3ec08377a1b2cbc30401ae9e43e1394c61635ab7537a37dc297cdc4deeda7c62
+checksum=d6e5b7a453948d5fa0482715eaf4a0c9abe5b902a0aca15540a04b1a1b60d275
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 4c649a38fb456a980df820b564fd241767d5142d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:16 +0100
Subject: [PATCH 0627/1686] kcompletion: update to 5.92.0.

---
 srcpkgs/kcompletion/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 5273d19526cf..8514a8625df8 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,20 +1,18 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-hostmakedepends="kcoreaddons extra-cmake-modules"
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
+hostmakedepends="kcoreaddons extra-cmake-modules
+ qt5-host-tools qt5-qmake qt5-tools-devel"
 makedepends="kconfig-devel kwidgetsaddons-devel"
 short_desc="KDE Powerful completion framework"
 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=2422485b10de631583b7e92e0778e5cf0c0ceec677bcd289cb7bc04c5441dfd0
-
-if [ "CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools-devel"
-fi
+checksum=08f1525c6cee8babe399c941bb85d04be9dade0341d1d85c6beccd2e93dc7ceb
 
 kcompletion-devel_package() {
 	short_desc+=" - development"

From ee5895d5f9bea1456a925debd95b737e0a3c47ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:17 +0100
Subject: [PATCH 0628/1686] kconfig: update to 5.92.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index ea135ef30580..44dc8ae429da 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a63c3feadc7b6b94d8e06ead5430289742f62da59dfa4f0ceaaf237523b6ad2b
+checksum=7801b641b88368a0c021272073c692337b42ee28f0025d106942c8ce873b0523
 
 do_check() {
 	cd build

From 7e8ec08d3ecc77cc6641b7aeb45e1526ed283b6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:19 +0100
Subject: [PATCH 0629/1686] kconfigwidgets: update to 5.92.0.

---
 srcpkgs/kconfigwidgets/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index d599b5212dcf..f14d66ae93ef 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,8 +1,9 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-devel qt5-host-tools
  kconfig gettext kcoreaddons kdoctools"
 makedepends="qt5-devel kauth-devel kcodecs-devel kconfig-devel kguiaddons-devel
@@ -12,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=028493a1515a6c965ea0eecabc362340af1d2e8463760465539c980d03d8bb06
+checksum=4259eed35d9ac307ecc30e64833bad7a89ef58fc7125054eb39716d27a4a274a
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 0a8d97ecebea626a658e4ab61573021946d1312a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:20 +0100
Subject: [PATCH 0630/1686] kcontacts: update to 5.92.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index caba0dd7ac70..544ae3c7f4cd 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.91.0
+version=5.92.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=1b067820de0370a0da43b069f4c9cafb411bb201fcbb112b9743fb9d134b03b1
+checksum=1276006e50f507216a8241ca4b26b02c67c42e5bee26a6b391db6ae4f72533ce
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 7527c4319ab602b28df7d049da0d8f28818bf8a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:22 +0100
Subject: [PATCH 0631/1686] kcoreaddons: update to 5.92.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 78ba65403249..4838e315b9d0 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dfe3da03260e0153f9f6ced1fc7464eaaf0ed1fb692fc6c2b2d968b629ad719b
+checksum=df5f718f324aa2b58191438c8aa5f7498a7997eff990d16ffbc9f19efd1a6667
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From 8b07d10a51a90208b1f768a5ab76b9de0612de1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:23 +0100
Subject: [PATCH 0632/1686] kcrash: update to 5.92.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index c29cb5cf7b89..b9fadfc544d0 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=544996a31f616a274961c12023fc0650deeeb9ef50125dffbed10c556eb5b33d
+checksum=9bc5605b5026f55d9c2c1ca32c79842c3ad0f5c042e480fe1e7027b2692526c7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From e75059782dcbcdb650d56c28b4ac6fb1f8d2537f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:24 +0100
Subject: [PATCH 0633/1686] kdav: update to 5.92.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index 5e01417e90cf..caa894c1356c 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.91.0
+version=5.92.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=5b8cdae0d401dc24bf0cd98cdf35de30501111968923953fa687552ae61adc08
+checksum=f3b16c473b104f83f6124f96f2b06a6c72a447eb19ba31a90e3f4725e732b1c4
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 204c9704d7b617e0b89246cabc627b93ba82c719 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:26 +0100
Subject: [PATCH 0634/1686] kdbusaddons: update to 5.92.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index f5048739ac11..741652529177 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3a726a9ba053c2e484b5d1d2e53b361bcfb039414df488d6bc7e29a281bc10a3
+checksum=7c03f33cc49ffa80e509f654f410cb142e917bceb2f35f08836dc46ed268ae54
 
 do_check() {
 	cd build

From 17fe35c99ecd93e0d4656685cbd5f703e0d804b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:27 +0100
Subject: [PATCH 0635/1686] kdeclarative: update to 5.92.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 6e7faaf667aa..2c6a351f34f3 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ffb8fb0edb1036aa310f1a80344e5a7209cfc9dc1bff086ed458fa0e58716da0
+checksum=fe964d77fea37c04eee3863d2b4227b76e33f16583906c284b532a461982d5b3
 
 do_check() {
 	cd build

From 93e0e1d785358f96ee7672b926256c9aba80f317 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:28 +0100
Subject: [PATCH 0636/1686] kded: update to 5.92.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index ab0aba43e07d..15d1ebbf684e 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e59e6d0fbdad184b2e0d59dccedd1e5be53ea21959d0e828e1bbab4f7bd420fe
+checksum=8335531b856cb361ab2e5b390b333eb3405bac4e2bc7c0305994704bd0540e6c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From 5c0414b5ade7f078826d1966412ba83f3fccf8a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:30 +0100
Subject: [PATCH 0637/1686] kdelibs4support: update to 5.92.0.

---
 srcpkgs/kdelibs4support/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index cf84ec928b38..5e8bc71495b1 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,9 +1,9 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-configure_args="
+configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="kcoreaddons extra-cmake-modules perl-URI pkg-config
  gettext qt5-host-tools qt5-qmake python kdoctools kgendesignerplugin kded"
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=4f6448fc6d03801b8f0e440aecd12e299631ae375c5390b343719eb85374e38c
+checksum=292e5e84ad8d7de90f0666b51f085a25b7a9faf521c58379d470d2994004ede0
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From bd14a9e3c34786bad72e3df8a8d79668c2308de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:31 +0100
Subject: [PATCH 0638/1686] kdesignerplugin: update to 5.92.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 4ebda348f4e7..8b811b777580 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d89cfb46171bb467de99bb22a56328cc881621a6ad1d091a4481ccc17cde9b1e
+checksum=066859b345da224f5edb601a5f448540330c9a286980b0c34169646c26a22a4e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From 03acda9dd39e05b56e2baf7215e6cb6876814c1e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:33 +0100
Subject: [PATCH 0639/1686] kdesu: update to 5.92.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index fdd9dd503c85..0ba31e7e1a34 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=55da7ee8c24e49dfd8ae49e1d006e67f541d35d111df412c5eaa8180784a40f2
+checksum=4687dc87a9ada0675801e0c575467bb5f7f7fe21b67ae2ffd1fed80736f95efa
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From a122e73214dea2c6e4951be5e9d93fbefae5ca23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:34 +0100
Subject: [PATCH 0640/1686] kdewebkit: update to 5.92.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index 8d09be212334..df9fd862a13f 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=18f361573109e95f39ca1fda04f973d9f64eb4f6ecba3dcea877e5df020796d6
+checksum=4d0a773cad86a642cb90d9844757569f2e2e9d1e96ccf78f73bee885c908d1b6
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From ba35b1a65a6cebccd2637c9752a024900e182be1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:35 +0100
Subject: [PATCH 0641/1686] kdnssd: update to 5.92.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index f1c7e00db25e..a48bf7f3e254 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6f58dcaf51b7188cde16f3b0a9ccf5e7550fe09ca2d9defc3e0ffd4d0fe4bfea
+checksum=5f36af49faab84d8ae7ec46f1ba3300c9cdd3d8820dd1e7e48c5c37bcdd844d4
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From fd8415ece5d893bddc1dc0fab099f465215ae2d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:37 +0100
Subject: [PATCH 0642/1686] kdoctools: update to 5.92.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 3bb244a5efc3..5e38783fc1b3 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7620010ddfaec988715be343af4e35f8bac75b5e14d1fa9d3bdbbe620925990a
+checksum=86a3aeb8b91dec0e1cd81b646654ebd750a8aedfac9b4d53b9b0019a91720870
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From e4ac1bceea87c8aeb55a4ac4db978130946ea6ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:38 +0100
Subject: [PATCH 0643/1686] kemoticons: update to 5.92.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 49efd8397fd6..2a4fa32fee02 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=10287a304fbe0bd6992afe29313c156883591639c9e80ec26e76e683709cf6cb
+checksum=fdcfe30941c18a9cb29b58459fbb2ae54a55fd5a0e8688f0c59a7cc7ebf09f07
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 1779f85b9cebdfa76b479bfdf960c4bcc0b31c70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:40 +0100
Subject: [PATCH 0644/1686] kfilemetadata5: update to 5.92.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index 46d898853023..ab36e2d86496 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=380335d7f08653d0d85bdcde5b93e72d94c6101cd3719bc4c0b26ef6730403fc
+checksum=d624d3551094cf73d802b6e95bcd78577ce9eb1e9cbb9a8f340dcad066ea15ce
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From a1b1b624e5a229470a4ec001f98f18a16c85e0b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:41 +0100
Subject: [PATCH 0645/1686] kglobalaccel: update to 5.92.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index a5c99e6e1fca..2405d1b174d6 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c0610c5dfe078827594e0f32793f0fae87dcee21b75fee491850a7e0cc639a27
+checksum=be7b1e279b63678ec4042f896b159d11c115d05e9831cde6cd67ef4b8e581452
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From f9865931cfec3cfd310a2c912b2d5feff7d87123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:42 +0100
Subject: [PATCH 0646/1686] kguiaddons: update to 5.92.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index fb6041e3b4c7..ea01d37e9ab4 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.91.0
+version=5.92.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=7e56c2d826973632ee90b091c50aac53feb88409f5d2ad76d1214452efa6c83e
+checksum=0f6775a565f22900b0de53daa5fe73f7d7e592663e0bb442a8e26ffab27fdf5f
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From 6d19d945c47805ed2a35f5aae4163f5df4889c2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:44 +0100
Subject: [PATCH 0647/1686] kholidays: update to 5.92.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 42b08406e942..163b2dad1ca3 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.91.0
+version=5.92.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=b55535746cd3b56270fd19bf377f7256bea00b4f8690449e0580225f6275bb98
+checksum=0ed382c49fb10af87bfa3845a3919ed097c9f808f3a5dbb631ef4e68c86b4b10
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 45ed0918871b3f76207e9434c3fda3f2acad79e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:45 +0100
Subject: [PATCH 0648/1686] khtml: update to 5.92.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index d3e481756f67..7415d7e78a24 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.91.0
+version=5.92.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=a40056d988fd77bc4bd3749465ed5452701b7e4948e10dc67fb592925c98b3d1
+checksum=91a1d79ea382a25614810cd59f800f0a34c6e86c69ef6d0a08d2655f2a93171a
 
 khtml-devel_package() {
 	short_desc+=" - development"

From 2817324b17c988579671073b835632c57f287c41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:47 +0100
Subject: [PATCH 0649/1686] ki18n: update to 5.92.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 8d57346febf5..8b0d17610f56 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -13,7 +13,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=9e1a8be4e1c0b7bbae262dfb0fffb75c6ec9efe2bd2fbc3fcae3ebbf9f68ed85
+checksum=058032e8e9556f1dadcf0c2bd633da6cfc9673e966dd113388e2b8aee2395777
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 72d29b1a6e8a5f39f441e8e6824888ee491675dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:48 +0100
Subject: [PATCH 0650/1686] kiconthemes: update to 5.92.0.

---
 srcpkgs/kiconthemes/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index a1901117962c..65250bdb3ac6 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,8 +1,9 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
  gettext python3"
 makedepends="kitemviews-devel qt5-svg-devel karchive-devel kconfigwidgets-devel"
@@ -11,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=820d592beab1547265fcc2a61f6262535b85d444a05fd67b4eb2f11d9f2510ce
+checksum=2128710ff8bf0a7bbb699fe3a45b231c6b4607ba3e3a3a5d03c25c809233cb23
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 641eb340a7b1f1b45d588d574d54ffb2fa27b3c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:50 +0100
Subject: [PATCH 0651/1686] kidletime: update to 5.92.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index 4c57030015fc..e9ed68131b14 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1b23a2503defae1fca23bb1574439dcc24a2856c3603587c903f8e8b188f158b
+checksum=e12f14229f7ee587becb5a693374045c460d38c55d61e21eefd78b8db39280d7
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 42b92b51fcaa22e6ba64709f93dfd763606749d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:52 +0100
Subject: [PATCH 0652/1686] kimageformats: update to 5.92.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index c4ead9a3a6e8..ebd6e81db298 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
@@ -12,4 +12,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=aba371cbb11afba36c394beac443f1e8d3ab9d84801f44bcc252f13e868dc835
+checksum=ce049989125a49dc9bf8d2a2f2f5a2fec79e25a6343087b024fefd0131eca369

From 1f6ca315e22a5e273461f986d1e592dcd109667d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:53 +0100
Subject: [PATCH 0653/1686] kinit: update to 5.92.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index d84e3c0262cf..a0b0aaee9112 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=71c3d83e2303f01bfd936351260ee3a7e0e78de568c90dd9236f7d5e8998c2f8
+checksum=cb517912bf17d4b4f015cb1ab935eebadc52ece050f21b33fcb4e799b0c5f3ce
 
 kinit-devel_package() {
 	short_desc+=" - development"

From ba526da14acaf81c4889308855f289a8b7eced41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:55 +0100
Subject: [PATCH 0654/1686] kio: update to 5.92.0.

---
 srcpkgs/kio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index 8062a9a9958d..ba96fa5e727d 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,9 +1,9 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-configure_args="
+configure_args="-DBUILD_DESIGNERPLUGIN=ON
  -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
 hostmakedepends="kcoreaddons extra-cmake-modules kauth gettext
  qt5-host-tools qt5-qmake python kdoctools libxml2 kcoreaddons"
@@ -16,7 +16,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=f2ddea299f3dc98835df445dd1d622d90233115ad0200e75da5e954523466293
+checksum=d4433f9890f71afe3d7d268e978e0ade96f506a38e41f7d57ffe832d96d44cb3
 
 do_check() {
 	: # Pain to get working in limited enviroment, excpects e.g. real disks

From df749d6d4909d49f6a9031b15eba82655f6e0fac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:17:58 +0100
Subject: [PATCH 0655/1686] kirigami2: update to 5.92.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 2022a2ec1501..1b85d94048f0 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.91.0
+version=5.92.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=8cd3675c5ba2c656648a7e54b6ad4d89f1dbc0d0ff36e59acd2252681497d445
+checksum=0adaff98ea70c577c9e6d7a688e5c52529a59f56a7d0c8ffce295f342e203d5c
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 99cd423fd6574bc773436fcac33c5c57eec7a5cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:00 +0100
Subject: [PATCH 0656/1686] kitemmodels: update to 5.92.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index 4018125a9f3c..beaa9faddb9e 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=081c7fcf4ed9ec4034720bf87c9592b67603b6168e645c8f0129cb2d787e33a1
+checksum=e65c7f58d602b4b8160b34a3a841d1c7aac77695b73e53aa715765cf42a8e89b
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From c35b8c12061b7a228ccf1586dae916700df2f13f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:03 +0100
Subject: [PATCH 0657/1686] kitemviews: update to 5.92.0.

---
 srcpkgs/kitemviews/template | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index a0b0e70424b3..ab3405ab8350 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,20 +1,18 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
-hostmakedepends="kcoreaddons extra-cmake-modules"
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
+hostmakedepends="kcoreaddons extra-cmake-modules
+ qt5-qmake qt5-host-tools qt5-tools-devel"
 makedepends="qt5-devel qt5-tools-devel"
 short_desc="Set of item views extending the Qt model-view framework"
 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=68883dbd26401dbde559ca60fe1163e881d679d9cb83697cd5f9d9b0eb279599
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools-devel"
-fi
+checksum=058b4d4228387558b03aceb0ed286cbbe89ea07bb6fed968beba0b51678886d6
 
 kitemviews-devel_package() {
 	short_desc+=" - development"

From 7475d532c80f953698f2509b4ddcd177cbfcd68b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:05 +0100
Subject: [PATCH 0658/1686] kjobwidgets: update to 5.92.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index 052dbf157349..cbe04600c928 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -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=5b909845e5707689e010d636cd36fb9b3b11fdddd37561b27d71a2234df3f392
+checksum=df24b96f77ddbd2f63a6c2a3c54c4e712ef11a63b93c0b02d949d85af2fb8526
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From c635c972150a783c60c2de2db5fb109b4eef407c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:07 +0100
Subject: [PATCH 0659/1686] kjs: update to 5.92.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index d919fb3c55d5..6990b50f3feb 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=322309164f54bcc7b0a8c338f8088160cf61ad6e5bdb95a77c1f72e4aaa57c49
+checksum=04072d527501c92f1e0144e9dcc114e108bfb5a2b50bed8a9b037474aaa6f118
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 1e70f0dea9980e899e6bf424a27d2f9e6f4d3694 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:09 +0100
Subject: [PATCH 0660/1686] kjsembed: update to 5.92.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index 5d411c05ac57..f606b2123fb1 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=c0d07cba5fc4173279335f8bf696eb6e013696a19eadd3851f4f428942399e88
+checksum=d7c26538a0b7ac804565840d61df2681ea4b729abb6ecfbfcae3c20536ca6035
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 752f4997eed27126dfa4678f03b6ec1328dd4f92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:11 +0100
Subject: [PATCH 0661/1686] kmediaplayer: update to 5.92.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index cdd6be6a66e9..5c9a97d7230a 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=018aea7a06b09b9ebf7dcd6c1cf50caed144b91d0e449bfc31354c24f357c966
+checksum=fe38eb2ed593e2e68909129a042d52121b12b9350524a7a1463c24c9c58a97a6
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From aaf1b27aa632a36ae0bd829d382c692d218e6689 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:14 +0100
Subject: [PATCH 0662/1686] knewstuff: update to 5.92.0.

---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index ab225ccd0e87..ba2a38d746ca 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5dd9fb32fe7e99b64f8dc4b8801bbdba5dc5ba2eda9bec2fb1fc563a53ec6a2a
+checksum=4b14aee55d7701c72d05030fad508a5cb89fee34656d4d84c2d977a3c2a66c3f
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 66c41b5297d79f250bfcf586f6fca6fcc130ddc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:16 +0100
Subject: [PATCH 0663/1686] knotifications: update to 5.92.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 0d5472d38369..27a83bf27de8 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f5f78ae7ca381524f990ead138ea68796a185418e608646dff216a846bcc0788
+checksum=8c4e095e3d96140f19e9f2e2dbc74df174e29416455671fc6680828038ea94b7
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From ca79d7c8488f65eb80e0ace388e6a81fbf3faca8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:18 +0100
Subject: [PATCH 0664/1686] knotifyconfig: update to 5.92.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index 291c1b38c0d3..f33e7ca63304 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cedb0993e813f063a14b91b3db13d986a4501a5b8d52dc74992a57d4e0ada51e
+checksum=f7f452e3197886a2afdfaa5a2954d412eb0ae2bc47ce742902765c053239313a
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From a2cafbb91eb0e546971fff74d58f0c6bd2d16b9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:20 +0100
Subject: [PATCH 0665/1686] kpackage: update to 5.92.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 290c11ae3c2b..7488611aa6d5 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.91.0
+version=5.92.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/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=51309ab8fbb5774f04ef989b15674df63348cef97f349a293f202817b9a3888b
+checksum=361f75fb4e3dff46e6dab42d858488af58fd40f3af1f7a39881ea9240cd866ab
 
 post_install() {
 	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \

From 989812f67ecc6cebe24ec6677c11369bdf24259c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:22 +0100
Subject: [PATCH 0666/1686] kparts: update to 5.92.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 9e64fcbea098..681aec459145 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.91.0
+version=5.92.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=f2ff8a873ae20899233d7ff8936204814d1ccbe1786fa872b5922912c232d182
+checksum=094e18b2e9119f1c197c625235e639204ab5aa1910b13ae4317c8145b4fe3318
 
 do_check() {
 	: # test can not find packages assets?!

From 7d7448c24f50ded85abb165c282aa76ada5b7f4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:25 +0100
Subject: [PATCH 0667/1686] kpeople: update to 5.92.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 5dd2667bd74e..717d2756b92d 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=77bf43f6714e2b82029b7a45d9a72779e28540375dd6d0e63f0fddf418c28226
+checksum=b313729131bfbdb0ffd24ded926a2c6604dd06a18bd612c2ead6aa886f29c571
 
 do_check() {
 	cd build

From b9fa925c3460f3b5c19d52c89bfa1b8697493ce5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:27 +0100
Subject: [PATCH 0668/1686] kplotting: update to 5.92.0.

---
 srcpkgs/kplotting/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 1117f4d380fd..6b6fa4db6f88 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,8 +1,9 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DBUILD_DESIGNERPLUGIN=ON"
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
 makedepends="qt5-devel qt5-tools-devel"
 short_desc="QWidget-derived class for easy data-plotting"
@@ -10,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=46eb996698946d7b0dc60d69674b26a06278a7f8f8eb588504d1b1c423adf565
+checksum=c95d63e2e4c4abbf625ec1cfe749314c1a90dc5be4a90a1ea1617bc969071ed1
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From 64cfdbea8d24d26feff180066ad4c8e97b28b676 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:29 +0100
Subject: [PATCH 0669/1686] kpty: update to 5.92.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index a9e42a08709e..28f4d371f530 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpty"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0da072117ddcded5de1d9befd2c1cf0b471711607902d03cb57bcf384d9ac1fb
+checksum=cb1dac5f8f7ba059ef967a2cf3d1580a29a8d7b373ef67e82e0ac4f0285ee052
 
 kpty-devel_package() {
 	short_desc+=" - development"

From 3c8d987e5b6d88565193b36fb895b4b0451dee86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:31 +0100
Subject: [PATCH 0670/1686] kquickcharts: update to 5.92.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index 8d60b9b72a24..d2d5278ba25c 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=930178d092b6e04394d739bf6ce11f1d89c5d7d167ad38ebeb689d226af511be
+checksum=1a430e2909b137466cf41c334a60ebc01e4cde82e71acbb167cd64d1f13e8678
 
 do_check() {
 	cd build

From 7a4df1365a5833ac25537fee4433c64637c2a68c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:33 +0100
Subject: [PATCH 0671/1686] kross: update to 5.92.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 55fc9c207165..14c6ba42f541 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=54e17773868cc6ecd91a5927ee475cce49ce225f5ee429ff725aee2a8110c819
+checksum=129e2840eb1f33c95d50cde79a82f784cf735c3f1ae636f15dcf695c0b0c1ebf
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From f7c7a3173a717eddbfefd32772b58960a42fd834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:35 +0100
Subject: [PATCH 0672/1686] krunner: update to 5.92.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 48e0ed1e077e..4fab48018a19 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=0677f9409d1d60e53608632cdbc04aa7454ed4355609bee6bbceff994be12a9e
+checksum=3fc80c5d66359e4593115b58fcd055ca9cab8f23376123094e13c5d4bdc48fed
 
 do_check() {
 	cd build

From 6d446ebc0249360680d1114cdd2dcddfbcf7d911 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:38 +0100
Subject: [PATCH 0673/1686] kservice: update to 5.92.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index f5fe49932018..adda7f1fe8b9 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=779d11c436887c5300c6f3bf477ba334673444b3e9d3212a0cf12a1f653b9254
+checksum=52e2d9654bbade7db91c647192b78bc3ac1feedc0c279e9c371142aa5ec82ef8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 225b593cd19e8553e02b6e73e56ee197d1ccf095 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:40 +0100
Subject: [PATCH 0674/1686] ksolid: update to 5.92.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index 840ffdae067a..d954a2e1318d 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=4f561eaa048a6c0e35c3bb14b8bc1f637708afff689f464576bba2e7ab0293a8
+checksum=8926c859af4b6b14e0967fc3b76ca0e76de27d0ab544087eefdffe40518b5a9c
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From f25c18c5c4618718d4edc0e771b0f0d078a39112 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:42 +0100
Subject: [PATCH 0675/1686] ktexteditor: update to 5.92.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3b5fdaee2411..3dcd6b5a7433 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,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=f532a1e0621d8a257387758fa616c43729dc2811c22894c656ddefe2c3367fae
+checksum=bcd01c3ca07d02106de1c68156e568ded7686ca9557b30a04f7b4e24cf43fb8c
 
 do_check() {
 	cd build

From 3de8627164ffa9323d1a6a79bc800c1b07787123 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:45 +0100
Subject: [PATCH 0676/1686] ktextwidgets: update to 5.92.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 0e36a76dab5c..2768b6f1ddcb 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c41a6ae85345c33188c251e011a43672641fe489243c3436a1e1f15aa6cabf76
+checksum=fe867bf498a5170a9fba91dff652b68fa5cae2af8864dbe89a6e54638ff90b0c
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From 8cd31cd13548e66491963dace77958d0824fdf1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:47 +0100
Subject: [PATCH 0677/1686] kunitconversion: update to 5.92.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 45b3b894cbc4..73f122a4fc6b 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.91.0
+version=5.92.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=57456b649efe2488f403e7b3cae73a734b3b459d32100b6b143f1c8d80035b58
+checksum=47e2b4c4b329562044954a67edda4d5ade953bd2a9760f6214c5f8f17239f09e
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From 8e7817b0d3bbfd153e611e84af679ef0a3b7b9e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:49 +0100
Subject: [PATCH 0678/1686] kwallet: update to 5.92.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 3133eb1e48fc..6d2b98d6a7a3 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.91.0
+version=5.92.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=3736051cfc42598368704b36c36f41482f778c45ba22a4e591389725945938fc
+checksum=71aca76cb0edbf569827709b073bff2edb5c129a85638df4bc666d70786740e5
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 1518795002703bf6dfa23ad6edb623bbd9d38bb8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:51 +0100
Subject: [PATCH 0679/1686] kwayland: update to 5.92.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index b23c3b67f2c3..41c3aee75184 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.91.0
+version=5.92.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=3efdfa6539fb0c053092ef5f178d0ea776a93a35754eefb1be348dcbd46403a8
+checksum=95e097cefbe4e260129d77ab9fe3013818b85b9aee6e4744acfa1ada96fed195
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From de8859745ec532b170c7fd831bbfc9fc7cd03c93 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:53 +0100
Subject: [PATCH 0680/1686] kwidgetsaddons: update to 5.92.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 7fe825d363ed..324be77968b3 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e3b4dc3db4d608b2a725e9087ca3add1105e4027e7e47d10f96c2eff344af20e
+checksum=d0e3558d6a7ed550f31d319e6b52d6ed61d693a1aa50e6dd4f430a1324111f2c
 
 do_check() {
 	cd build

From fd883aa7861521f5795b14f477398ba93a72e8f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:55 +0100
Subject: [PATCH 0681/1686] kwindowsystem: update to 5.92.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index 71e5dcbd752c..dd6ffc7afaab 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=257990566f0ef96ca23e84eaad7a66a28dd67493b6cd5c6fdb3a2fe5b613c0fb
+checksum=dcdbbd2b4f2372fc225141361a7d9ae4a8f28ed77a266dc22c20be473fdc7d80
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From ccbf59ed414962c68a020c390be5fe5c85f307e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:56 +0100
Subject: [PATCH 0682/1686] kxmlgui: update to 5.92.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 79b5b2b3e0f9..4f30b9703ae8 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2f68b187570e22c7037fdbcff83ebaad8b5c77fe1bec166c059da6d475149ce3
+checksum=e08b4c0d3cc39f788d918bd2ba331966a8af5208233c38a27f029f93a597b743
 
 do_check() {
 	cd build

From e8fa2a86d6aa7ee2b23cd8d40192516859243a20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:58 +0100
Subject: [PATCH 0683/1686] kxmlrpcclient: update to 5.92.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index e658982b3b62..619fe8a1d3e6 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=f0c2a92910283997c21c4f49b2bb074c1edede63706da89f965711cc8babdeae
+checksum=0e32dca201f8b3d241e985c8dd8854774569d08167a9f3f060a141551e19beab
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 782c5f85c7ffcd0c7827a82dfd1eddde7a180cd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:18:59 +0100
Subject: [PATCH 0684/1686] modemmanager-qt5: update to 5.92.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 c9a8158b6bfd..920b6b1f5705 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=a2673f18c7866d39c9cedca2f86540c56baf966a2491a86ca06a5a0427358496
+checksum=7ed0b4f48a781fa9166e0446ac14fc21036195cb3d800ce21a546cac02fe5898
 
 do_check() {
 	cd build

From 7fcda432f4f43bf5620f8fc6eb4257df2af1fdb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:00 +0100
Subject: [PATCH 0685/1686] networkmanager-qt5: update to 5.92.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 1b0b32a2346e..bc475ea12153 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.91.0
+version=5.92.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=2e20ffd995ce64a90b1133b594bab2b2292be54e538f62633e78e8296cc44738
+checksum=51ddc8ec0ea60c87c49d5a6709eed86fe1e066d57d059a7f9e774c97b81bfa64
 
 do_check() {
 	cd build

From 9794112eed51c28e826d727593ff9401617905f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:35 +0100
Subject: [PATCH 0686/1686] oxygen-icons5: update to 5.92.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 30893cc109ae..94d05f08582d 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=51713501fe067cd34d3c296bc2b891d62ed2e3c4f26ead36323f8adc3d157248
+checksum=ca88b03fdd961f9f8bfa449e1fe74e3ce66e11937be9a8f6d1569a46f6429ef1
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 670a9643a707472bc6a757ce223e3bf62e6a7bf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:37 +0100
Subject: [PATCH 0687/1686] plasma-framework: update to 5.92.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 fd74fc2a4057..2ab058fb3036 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f4471872b4f279e2979f661f2792f0afa8af5f15896bd9e6a08e1ec7ed85b079
+checksum=c6c2bc624564c74fd80bce170a1c763803d5207ef86108b5724fcba73c3506f7
 
 do_check() {
 	cd build

From f0ae5bbde0a0eadc19dac33d51ee7219a892d498 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:38 +0100
Subject: [PATCH 0688/1686] prison: update to 5.92.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index fa4b89d45a38..5f1e84c53f7d 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=8f61c6c351e018df29a837a2d276d088b61fc844af406ea2d4f221f8e5b83f4c
+checksum=7e6fee9fd56be6c4589c106a3c16a28a4aa5832a24dcefe88302a9ad113ee41e
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 6858410d8edf6d478f7d20433a107dc680f24375 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:40 +0100
Subject: [PATCH 0689/1686] purpose: update to 5.92.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index c4dbc383d75a..dc71877ba34b 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=952c012d347f0ca6f1dc1aaad7e0ab538699bcaf9099fe8b25ddafd4cebfdcfc
+checksum=94613e180550f9d15443ced1f2d93b566350d9a981205b4f98923714dc4f400a
 
 do_check() {
 	cd build

From 0345ad3f84c1598eff2c7fd21bb747c26b758ee3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:41 +0100
Subject: [PATCH 0690/1686] qqc2-desktop-style: update to 5.92.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 3ac4ebda2d10..5af0197811cd 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.91.0
+version=5.92.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=11d52dfd9f576ee4933b32c6dd2458c5e25836935d9dcc27f3c845e8dccea965
+checksum=97530813b9a80505b5484175a55be49cc020244fbe3b1bdaeef15845c3c9bdac
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 29e3471aacdaf12ca8fe9fe032bc2eac1eb69c56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:43 +0100
Subject: [PATCH 0691/1686] sonnet: update to 5.92.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index 8270d62a11ef..b7d08f3d959b 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.91.0
+version=5.92.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/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bda19e339d19ffcfa6bfa74eb6f0cdaf75e2537450d2deed03f45f4a6b91fd18
+checksum=31fc1dda3db582337529922d38b6eac72b1551c4a0d86fb9307363e061d05722
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sonnet"

From 1d1ac939f94e41304e7c4111103b9602e135f1e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:44 +0100
Subject: [PATCH 0692/1686] syndication: update to 5.92.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 1fda9ff348ec..3a35ebf2c174 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.91.0
+version=5.92.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=fe05fc898c8e5adf23b977138e8b595448805fc2d48c62579881f500ab5953b8
+checksum=1c9ab9772103c001e56afbe0356ede04f953b07be8d2c2e2f2fff3e7b5bd5d46
 
 syndication-devel_package() {
 	short_desc+=" - development"

From 4f20bd5a334d442b12a9a02a7178ef863102da3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:46 +0100
Subject: [PATCH 0693/1686] syntax-highlighting: update to 5.92.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 d390c1ae40ab..5ad6ec877834 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.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=370a45b274db90e8d2d34d61d3f665a3f1f9f552d4503ce5805a47f445c4f93a
+checksum=99347eaf9b2249f875cacd8319c77f2f8e110d0e7834f51f296ed911dcc7e50e
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From a92cccf73057f145f17998307a31b7890fc8b2f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 20 Mar 2022 03:19:47 +0100
Subject: [PATCH 0694/1686] threadweaver: update to 5.92.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index da71b23a4849..9d65ff2b49da 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.91.0
+version=5.92.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=22485000cf28d4b28a46e7856532339df5e3e49180ee4a0493f3f3491f9e00a4
+checksum=48b0cf3d969437eaeb0839cbb16a35209336fc6e78c1540920f91bbab8b01101
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 1af1b237b1e35ce12dbfb55e075f73c3d5ae765b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 23:18:45 +0100
Subject: [PATCH 0695/1686] bluedevil: update to 5.24.3.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index d504a731df32..a3eb6e450432 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.24.2
+version=5.24.3
 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=24d7501e65149093e17c8545199d1bcae27fe828ded65d6a20446c8fffe1fa2a
+checksum=9dd1566eae8bb793330f2f54ab34cd75ed79e7f3924bf78149077b122cc49ec2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 63bfaf2d78731b20289bddfd9601f3525de24c98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:42 +0100
Subject: [PATCH 0696/1686] breeze-gtk: update to 5.24.3.

---
 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 067afa6ce666..8e1a152f177e 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.24.2
+version=5.24.3
 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=2c1f02be02bac5d9098e90901b047ba587f57dc3827dd89b5a868ca80a2f2dc8
+checksum=2911bb2f99ad42ec820cc2adcbf1f8a6f18ba437f72ce216562e12584fd042a4
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 4c1597747f7054d14aa6024bbb67fb86bf8af3b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:50 +0100
Subject: [PATCH 0697/1686] breeze: update to 5.24.3.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 9efe5daf780f..0317ba5620d4 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.24.2
+version=5.24.3
 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=5fee72b7bc88fe8d97b575f46de62037ac2f898c7a5ff024e62f1082d60984b9
+checksum=4b8f92e55c72ed59b7bdfe4be6044fcb0a0816fb6f1ea2bdd9884b58b9a92940
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From e44ec0acfea2f3a278561b95451e71cab2419f0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:52 +0100
Subject: [PATCH 0698/1686] kactivitymanagerd: update to 5.24.3.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index ddfa1727d026..879d45275ce3 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ 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=a14714645797114b45c4bd0d87fe2559f4c4b5d4625e100045b25c66fd25a958
+checksum=9cae3e136ee6743474fd96a573b235b6ca8653d4f61f412d9d3ec866861cae63

From 40175115adb77098c9f21e4e9e46d3ce50a00968 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:53 +0100
Subject: [PATCH 0699/1686] kde-cli-tools: update to 5.24.3.

---
 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 15d12bab1ed4..847a7213209e 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.24.2
+version=5.24.3
 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=9549c0474695df4855b66ee2196caa14a0bc3e0179920ae564d149bc5ecf6984
+checksum=fe64da7ce3ad7e7b2d743e06aec0f6666e1909d3ad08867a0173c5c262f7e803
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From ed74cc76fe647fa84bcfca5c9a61d328a794f81a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:55 +0100
Subject: [PATCH 0700/1686] kde-gtk-config5: update to 5.24.3.

---
 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 17151ae771cc..a68d66dbb124 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.24.2
+version=5.24.3
 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=eab1d06c3e3f5c02b3a6608f6b2bc8d20d82f7e2f3ea4c666d4d2f69f476776d
+checksum=fb4bcd30c93e15962153e81ca218f03465f02d1d2d011f267bb96946869ba05c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From c5cea2808e51b4f88d2f5f9c21d4beb4e5fc816f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:56 +0100
Subject: [PATCH 0701/1686] kdecoration: update to 5.24.3.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index 5e422f52cb3f..a358d713d04a 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.24.2
+version=5.24.3
 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/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ac5f02324a5d64e81408c30f3c9d077da460b77278eed7f195344d3f5acc8d87
+checksum=bbfc3d83f76dc8d2568bbe2f5395af5887eaba79094fcb901930585f8b53f636
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 1825621146346276a677b9a2190b385a8972563e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:54:58 +0100
Subject: [PATCH 0702/1686] kdeplasma-addons5: update to 5.24.3.

---
 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 c083d1b0b01a..065f0fede44b 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.24.2
+version=5.24.3
 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=13e62f9091f26eeff7d4bf4a51569c2af561dd051d1c1d94b98071a7465d6cf3
+checksum=86fe08a744e31ce22124bca4337633f6a2523fbc87d915d3ffd42e65da66f23c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From f0d099dd92926468fd868e506854d258c6138578 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:00 +0100
Subject: [PATCH 0703/1686] kgamma5: update to 5.24.3.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index a6345f6366eb..30fa3d8e6577 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.24.2
+version=5.24.3
 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/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a31bc51521cdfc55bbb29aee2f713378ba34fcee08326dbb10a2d6486a7a4957
+checksum=66da3bdfaaddb70c6bbf5739eaa970c8a7f67fd8295872ee201a1445c2df9867

From 5b210342d4b4d5a2024f5595c74d6210091235c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:02 +0100
Subject: [PATCH 0704/1686] khotkeys: update to 5.24.3.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 1fef1d71c1a8..1a59a447a853 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.24.2
+version=5.24.3
 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=05ef66dd409b7de9ce6711b2b8931e68cc9eb7978adcb7ed17576a788e5870b2
+checksum=17f45fa898147b7bd9e1bd4850aef10d03c25dbfe088ef46803a817f7348afcb
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From a9f6f0a76e06d1d734fc5a398ca73a9b2efc3ac8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:03 +0100
Subject: [PATCH 0705/1686] kinfocenter: update to 5.24.3.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index 338b9ec75c01..eac578309f8d 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.24.2
+version=5.24.3
 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-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=af5dd1af07e308c42f55d5c2ec472ab5b4ab67bef03d29545f9bc5e6d03ebeda
+checksum=d2f5acb7a52434e6b539dc52d23cf09754e313411b32d169f36403ba0801e223
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 6736fbdc257b2a544c8a124f6a26966f5a634584 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:05 +0100
Subject: [PATCH 0706/1686] kmenuedit: update to 5.24.3.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 0b852ac0c1e5..02793528e9ee 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.24.2
+version=5.24.3
 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/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5e0eb1979bcfe4b66ff010197d8bcb0bcc3f9eab4c5d95c454c7b145d228a672
+checksum=8bc5d0dfef18e4e1f561cd86f2d023b8d5f951ffd7bcc497633e4ad263cb3bfa

From 7c8e51d49513cd23b426199b919126190b4b019b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:07 +0100
Subject: [PATCH 0707/1686] kscreen: update to 5.24.3.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index fcfff4f8cf80..00eb087ad0a1 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.24.2
+version=5.24.3
 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=f8549747eaaca0a7172e57d404207a684ef659ee107c2b2815526d5d5180f489
+checksum=0e814b3db2c952857bc399e9d3bc349b80ad7367ac755c22dae31004c7684bf2
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 55c36676413595fccbee0fe010a12c261b557783 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:09 +0100
Subject: [PATCH 0708/1686] kscreenlocker: update to 5.24.3.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 26e5ea06f440..29b2b0c4f678 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.24.2
+version=5.24.3
 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/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fcd9d5be26409819903b445d2ebe888ea2e7cba289304b80462e9d701e06d3e5
+checksum=03157ca122085fd6d8eeabb369c363ef706a773ad509eb5c08722a0e4bf903b6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From d90a2feaeb92d4054b479499207a1cea7094e457 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:10 +0100
Subject: [PATCH 0709/1686] ksshaskpass: update to 5.24.3.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 4c8ee2c30d3c..18b7a81583c3 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.24.2
+version=5.24.3
 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=3073957d9e0a18119466db2be4d9d066f3c8f594fa0459031040852c94c3950b
+checksum=3bbe16721dabd7fbae659be3f21b4a386d8ca0a6d288c94ccd3954ecbd4d7847
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 91f67039a8c9ec2a2b17625ef79d2370bcb9ef7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:12 +0100
Subject: [PATCH 0710/1686] ksystemstats: update to 5.24.3.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index f53ab6a923ce..65541c9fde51 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -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-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=ff6befbea33add48a7a6fec574576cccbfc6eea6e28018fef06b16cbea2d2057
+checksum=4c303bd73bafb254ca8bb5dee0de3b7a2ec4123e719827d26268625047bb330e

From ddc7c52865edbcad794ddffe56c2be0860082931 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:13 +0100
Subject: [PATCH 0711/1686] kwallet-pam: update to 5.24.3.

---
 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 39d3bbcbe4d5..c32def9d2ba6 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.24.2
+version=5.24.3
 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=afa0dea0d9faaa25f1bb75901cb5d0f031ab55bd6287d75fcd26521f9e92586a
+checksum=33dd50c4d9258d1e3326980192e2523490754cd1724ff704c7e36984e5cdad7f

From 24d91daffddd4a4999cdb1e4edc8c68c522612e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:15 +0100
Subject: [PATCH 0712/1686] kwayland-integration: update to 5.24.3.

---
 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 22e58dc16ea5..95e908c22286 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.24.2
+version=5.24.3
 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"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=fb8cab0a35b6fee268243481707613f6cea9715cda96d124a0a508e3b2a1ba93
+checksum=9f6f167fd16aebf550ae9bda176237ea80efae4a08826050ccbd2d7a73de05cf

From 472550825159890870ed569e85cf700c84c725d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:16 +0100
Subject: [PATCH 0713/1686] kwayland-server: update to 5.24.3.

---
 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 162db2394880..7bf6ed477fa5 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,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=147b0312fe456ca5018da641fb5758d94d55eca136d075729d322829634ee247
+checksum=560b20a15b459c5a1e8d0b38e9d53c3a75660bc798fa544e7a9d5c36260e063b
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f09f0027cbead1b21352e2a00ce85b474112075f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:19 +0100
Subject: [PATCH 0714/1686] kwin: update to 5.24.3.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 3630868e413e..435bcc4eb3af 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,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=2aabb59ef884cb2fb3f53b9577d651a1c39977a482bca93d6634ed3593054411
+checksum=d84db7e32a13177a0bd030e6c65907cc37c28efad51ee17c518e402235cbf46b
 
 build_options="pipewire"
 build_options_default="pipewire"

From cb77fc8861e46abe7f557369616f29325ca864cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:20 +0100
Subject: [PATCH 0715/1686] kwrited: update to 5.24.3.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 0b3ccbfeb3b5..5a556a8be1d2 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.24.2
+version=5.24.3
 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=9d88edeacece79f2a8a1cc989b36896c2ad911b31d1c8ba78b4c3406a9b97205
+checksum=2d768547e131aed99d165b0aee7b080e512a2a5ffab292bff8f71033631cede9

From a85318ee38e7891082e7504bc86515b01e24ae1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:22 +0100
Subject: [PATCH 0716/1686] layer-shell-qt: update to 5.24.3.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index a9786a4e56e9..3642d9819344 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=eefee96cf04cb1dbaede72b50354ddc7129915f1b88c340ff206724c29620f2c
+checksum=5de105ece2d7e6ca2d65305186462b0f9240930276adf7d5eedf77ffeaa67d40
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From c00d64189eec051a9c97c2ae30844b9865d8ceef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:23 +0100
Subject: [PATCH 0717/1686] libkscreen: update to 5.24.3.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 5b3ab7883fad..5b76a89d08d8 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.24.2
+version=5.24.3
 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/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a64c2263a0de898a4a0e73f85949b4d3868aef87aa221d597e8c16f412103b04
+checksum=a6874f0f4066e16ea191341d4d7d73deaf304e117ab64306d311c862393de7a0
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From a34a928db74a13cfe3faf6251f2d8fcd43df2528 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:25 +0100
Subject: [PATCH 0718/1686] libksysguard: update to 5.24.3.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 4fe82b36bbfd..2fac80ddba4c 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ 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=13983f626906db864eda20bfa2e994ccbe4ddc534af7a052675b3475b7e9472f
+checksum=148651cf33c7400d7a0df507d0bb75a6924e1ae80f5a46eefeaeb44c848ff1a2
 
 build_options="webengine"
 

From 28bb7791f8e027eb60daf663ce4e8988d84f507b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:27 +0100
Subject: [PATCH 0719/1686] milou: update to 5.24.3.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index abe6af2c8b0c..05ef7d33c83c 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.24.2
+version=5.24.3
 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=9a8c4b0561ce85f37ccd4500b715c73b9ed77aec79aa46eb2b0e04d9b94381e4
+checksum=31d70b760653e0fe4b9c1b59d7601bb52d307a3d3be3b8f67550a4ea9d22bd1b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 37e4fac44c08279bff390b400e6ffaeace6732b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:29 +0100
Subject: [PATCH 0720/1686] oxygen: update to 5.24.3.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index 521ae7f336b0..afd58f630f81 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.24.2
+version=5.24.3
 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=73d821a412a86df1511e6979d985de496d226ecc4201fe64e43b9400e1860cda
+checksum=018dbd3c276707bbcc8515424ae45a0133cd9a2e31ffd7a0bbc25522586e400a

From 3a37117353f6be908b8e555ca05508caec26136a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:31 +0100
Subject: [PATCH 0721/1686] plasma-browser-integration: update to 5.24.3.

---
 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 41d3d104a688..e7e64687c577 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 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=e8a48296d1a713d8b8f002d559a4cd12cd7f4892c591ed985c5ce49f7bffe738
+checksum=40b07a0065bf24a78997fb210b0550642872ba8c41ba1df6c2cb6785d85851d7

From 78dbe028428abf6ba57c08ca4840a4956504bccd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:33 +0100
Subject: [PATCH 0722/1686] plasma-desktop: update to 5.24.3.

---
 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 fbef3a8d3997..58edbeb7f5d3 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ 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=524193c24c95f67137410786f94c70d3c96827bae133a48bb53226f32c33fa10
+checksum=583e7ecfd2e2b766d645284cf13605851d96e2ad7cf2e657b4665aa3f3fd91d3
 replaces="user-manager>=0"
 python_version=3

From 471889fc9af5580ec532200af25aa12e2800d2ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:35 +0100
Subject: [PATCH 0723/1686] plasma-disks: update to 5.24.3.

---
 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 bd58a31096c7..9498075cb52d 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.24.2
+version=5.24.3
 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=e2135701903316f46df042f8b0eade162a1f1412644d9f4d9fa0512856b81522
+checksum=9e71a018eb875dd70d7b30f23937098ae8d6d9eab2306b541f916ddf6b64745a

From ea2fb9d6111ea421f7ab3fd59a7b0a1046f9e139 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:36 +0100
Subject: [PATCH 0724/1686] plasma-firewall: update to 5.24.3.

---
 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 051b5af7faa0..474ae2d9cf17 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcmutils
@@ -11,4 +11,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=7ac775e652570c704d6d3e1b0809e10e3718c630f89fe4c2b11dd3f91f5c85d3
+checksum=bff36b7a922a6d0e5e20df539c6995d775f62a1d63c970b55bb430abd580ef64

From f0ac07d04c63f1054bd9d043e0ddbba97ff5dd30 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:38 +0100
Subject: [PATCH 0725/1686] plasma-integration: update to 5.24.3.

---
 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 493d73cfbbd8..59c8998026ba 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.24.2
+version=5.24.3
 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=b6408b32e13b9713cd34f499c7aae216218a04b6c9655f37689d95f8b323f947
+checksum=7aef8f3b6234b402b978d12e72d9c5eb2b82cbe587afa32f288e2e160b103c0c

From b1dd6cb3c95cbb9e333695a466361ec833b3188e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:40 +0100
Subject: [PATCH 0726/1686] plasma-nm: update to 5.24.3.

---
 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 1404adc97bb3..cc71c9f54926 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.24.2
+version=5.24.3
 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=114ead32c90d521ae0504baee971da71a2c0f1a37d25bbf1868012ed030048cb
+checksum=2cf64e94ed921546bc0be44f50e3490033a353bf3f0ad7a5a513ef5585fc3bfd
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 57e9b90e3fc721ae06d474d5aa3858bae6cd60cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:41 +0100
Subject: [PATCH 0727/1686] plasma-pa: update to 5.24.3.

---
 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 5285d7534394..dd3e8e33c8ac 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.24.2
+version=5.24.3
 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=015dff4f7561a0fdca28a0d49e98df3bb112300c9e29588f685e58ae037603e6
+checksum=e18fbe9cf9f2948c2d3567ba0bb71126ffef8d7c4df8084a8fa0fd48c0ca0759
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 6b8c8351b9f8994b33e666f3aa596af8c448fd2e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:43 +0100
Subject: [PATCH 0728/1686] plasma-sdk: update to 5.24.3.

---
 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 3bf3208853f7..4d713043e9dc 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.24.2
+version=5.24.3
 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=83486883400fb837df6541f462df390b28df5d9a174a04e55e971ffe483c777b
+checksum=f9bad013598b8d4e8b0be4ceaa5ad5f1a3326911f7b41e754d57d7a5f1f5d63c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From be8c9f66f4c95d55a97699253baaefd598c7dbc3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:45 +0100
Subject: [PATCH 0729/1686] plasma-systemmonitor: update to 5.24.3.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index e81d4b72595e..4cdb8fc83b47 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -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=16902047b659cbe7e3452e527699aa8891546323a54efc60d0fdcfac8fe0ccd4
+checksum=904c0cbf56469b4b021559cc898aef57917cbe36526317c5bc7d34f255c0439d

From 05c74fa16bbd570ec930be34ceb5ee220d476202 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:47 +0100
Subject: [PATCH 0730/1686] plasma-thunderbolt: update to 5.24.3.

---
 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 a8a79a05ae4b..7fbd11daa1a5 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.24.2
+version=5.24.3
 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=7111626252470f7c1de5b3c261b29db3ac9bdac5e1453b6853cda8aaaa5681be
+checksum=52bec310386158c7f85cd6a8a7db5bedabdb8494f4c6818d8466aa33a6dba5df
 
 do_check() {
 	: # Requires running dbus and bolt services

From ca9a6b14bb73f2ba03c57fc2295e9c1a511769c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:55:49 +0100
Subject: [PATCH 0731/1686] plasma-vault: update to 5.24.3.

---
 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 3c971780ddc0..980ab7d44e7e 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.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -14,4 +14,4 @@ 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=be8e517dff5e3fcfaeade1d9a992c5d44c52b3efbdeb345a79dad94141722e52
+checksum=8d4998fd105073ce8ae6012426c0bd024529e0ae67c3c3ea9178918fcf87be38

From dde02ab62c7035d08933a99a9bbd2613fda26554 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:05 +0100
Subject: [PATCH 0732/1686] plasma-workspace-wallpapers: update to 5.24.3.

---
 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 9522d47d2215..4d21268470de 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.24.2
+version=5.24.3
 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=3664b2cd1005f2632475e2024fcec623090407d4398e0bc70dcfe45dfbb8bf67
+checksum=da252edb70b3373c38fb30318a44f52f047d4f31cbbd26c01c30bf2398c43848

From 05333e50d70dd56e7e3054bfafeb262b889c5aac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:09 +0100
Subject: [PATCH 0733/1686] plasma-workspace: update to 5.24.3.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index e6609778d1ae..a8ae6f591b0a 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.24.2
+version=5.24.3
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,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=e7fd2ad7c067710401f7322789ce796c3ad5e02a3813bdfb84ebd5dbd8787d11
+checksum=104c5c0ebb000f48c749a6bafdde4cbb1b06d188e1a23ef95a2d035cce442ab4
 
 build_options="pipewire"
 build_options_default="pipewire"

From de76946034cfc36028e548d2978d58b19a4125fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:11 +0100
Subject: [PATCH 0734/1686] polkit-kde-agent: update to 5.24.3.

---
 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 2dc1f55fbcfb..53ebff5a685c 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.24.2
+version=5.24.3
 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=43685eccd228edf74c7fee80f6cafb217159b540b487cda067c18e3ec6b7ba7d
+checksum=788d392c811ee7c8098d294ccc9fff7f7a695977689a66cb4a1cb52d6f4779d5

From 45dca5eef119b8ffb43a3156805e047608e6e742 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:13 +0100
Subject: [PATCH 0735/1686] powerdevil: update to 5.24.3.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 5bd44767528c..3eb123d13d50 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.24.2
+version=5.24.3
 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=8c742e057f19e3852ed6403e7a3f86fa70a478ae0c6c30a492491a5b02b7cd8d
+checksum=495275be84a96572d2e2a7ee343e1ab98c79e7c8eef402a7f26d86863e25f010

From 1e03b9d34a4e8d863e3caaa1c679ace4db93b686 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:14 +0100
Subject: [PATCH 0736/1686] sddm-kcm: update to 5.24.3.

---
 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 b44457380eb9..95d916cf3e1d 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.24.2
+version=5.24.3
 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=af95a174536c7deb01d4274c1e0efa71a06a8728dbafa144dc37a37b803c3e22
+checksum=d0d01ceda262734e87f0cfc28138a1b5478651722a703a55ac744c4e676ec696

From 059ac791abdefbef41cea2ac3bd10bc5d470d254 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:16 +0100
Subject: [PATCH 0737/1686] systemsettings: update to 5.24.3.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 1574038368cb..57c764dcde4e 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.24.2
+version=5.24.3
 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-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=b31e3bbd0ed6c69718341e7290f8a8888e972ca3c1eae10f2a5da912b17d2e5c
+checksum=6200618137f9a1411007a78f9b50eaf78048ce9819428d997a44816d6093d585

From d698eb748765da2040ce4035f32753b6e6f24211 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 12 Mar 2022 16:56:18 +0100
Subject: [PATCH 0738/1686] xdg-desktop-portal-kde: update to 5.24.3.

---
 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 10169eb0f394..23aaba046f68 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.24.2
+version=5.24.3
 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=0b703bb222726ea1fe2161728f027d381862a03d0d693806f481a1249f78fda3
+checksum=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b

From ca87c55165507db2905912ea3ae453b04614054e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:36:54 +0200
Subject: [PATCH 0739/1686] kcompletion: add cross patch

---
 srcpkgs/kcompletion/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kcompletion/patches/cross.patch

diff --git a/srcpkgs/kcompletion/patches/cross.patch b/srcpkgs/kcompletion/patches/cross.patch
new file mode 100644
index 000000000000..fdfcab160c0d
--- /dev/null
+++ b/srcpkgs/kcompletion/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 13:56:56.000000000 +0100
++++ -	2022-03-28 22:30:11.749301510 +0200
+@@ -45,7 +45,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02)

From a5c8f257315cc565ea64a7efccd617d36a84ee69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:37:21 +0200
Subject: [PATCH 0740/1686] kconfigwidgets: add cross patch

---
 srcpkgs/kconfigwidgets/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kconfigwidgets/patches/cross.patch

diff --git a/srcpkgs/kconfigwidgets/patches/cross.patch b/srcpkgs/kconfigwidgets/patches/cross.patch
new file mode 100644
index 000000000000..cf9d7d54a873
--- /dev/null
+++ b/srcpkgs/kconfigwidgets/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 13:57:20.000000000 +0100
++++ -	2022-03-28 22:35:00.337296905 +0200
+@@ -41,7 +41,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ if (NOT ANDROID AND NOT WIN32)

From d00a2eccaa704737f03666f999f65243e1c79cd5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:37:38 +0200
Subject: [PATCH 0741/1686] kiconthemes: add cross patch

---
 srcpkgs/kiconthemes/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kiconthemes/patches/cross.patch

diff --git a/srcpkgs/kiconthemes/patches/cross.patch b/srcpkgs/kiconthemes/patches/cross.patch
new file mode 100644
index 000000000000..48eb81784cdf
--- /dev/null
+++ b/srcpkgs/kiconthemes/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 14:01:35.000000000 +0100
++++ -	2022-03-28 22:31:40.368478068 +0200
+@@ -30,7 +30,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ ecm_setup_version(PROJECT

From cc3e6a2b5959c1f71c3f664f7cde87ee8e7345ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:38:04 +0200
Subject: [PATCH 0742/1686] kitemviews: add cross patch

---
 srcpkgs/kitemviews/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kitemviews/patches/cross.patch

diff --git a/srcpkgs/kitemviews/patches/cross.patch b/srcpkgs/kitemviews/patches/cross.patch
new file mode 100644
index 000000000000..4abaf14f3519
--- /dev/null
+++ b/srcpkgs/kitemviews/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 12:17:35.000000000 +0100
++++ -	2022-03-28 22:29:14.364077451 +0200
+@@ -30,7 +30,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ ecm_setup_version(PROJECT VARIABLE_PREFIX KPLOTTING

From af78a34532095c931bfecc4750953a008af729b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 28 Mar 2022 22:38:17 +0200
Subject: [PATCH 0743/1686] kplotting: add cross patch

---
 srcpkgs/kplotting/patches/cross.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/kplotting/patches/cross.patch

diff --git a/srcpkgs/kplotting/patches/cross.patch b/srcpkgs/kplotting/patches/cross.patch
new file mode 100644
index 000000000000..61e1c12c761d
--- /dev/null
+++ b/srcpkgs/kplotting/patches/cross.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2022-03-05 12:17:35.000000000 +0100
++++ -	2022-03-28 22:33:55.042066950 +0200
+@@ -30,7 +30,7 @@
+ option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
+ 
+-cmake_dependent_option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON "NOT CMAKE_CROSSCOMPILING" OFF)
++option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON)
+ add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer")
+ 
+ ecm_setup_version(PROJECT VARIABLE_PREFIX KPLOTTING

From b7a41c4e4ef9df7375da3e9c50de20f20a375436 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 15:52:15 -0500
Subject: [PATCH 0744/1686] New package: jc-1.18.6

Clsoes #35804.
---
 srcpkgs/jc/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/jc/template

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
new file mode 100644
index 000000000000..8f510a980bc2
--- /dev/null
+++ b/srcpkgs/jc/template
@@ -0,0 +1,14 @@
+# Template file for 'jc'
+pkgname=jc
+version=1.18.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-Pygments"
+checkdepends="python3-pytest $depends"
+short_desc="Convert to JSON"
+maintainer="Andrew Benson <abenson+void@gmail.com>"
+license="MIT"
+homepage="https://github.com/kellyjonbrazil/jc"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=5347188ed55762a0325d5d8f6a1ff3ec221b4ad548dee085fadc5fe10366af93

From b4f4dcd9f4b300d6a21adff9df4a45a3606285f3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 27 Mar 2022 21:19:56 +0200
Subject: [PATCH 0745/1686] zlib: backport upstream fix for CVE-2018-25032.

---
 srcpkgs/zlib/patches/CVE-2018-25032.patch | 343 ++++++++++++++++++++++
 srcpkgs/zlib/template                     |   2 +-
 2 files changed, 344 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/zlib/patches/CVE-2018-25032.patch

diff --git a/srcpkgs/zlib/patches/CVE-2018-25032.patch b/srcpkgs/zlib/patches/CVE-2018-25032.patch
new file mode 100644
index 000000000000..9f37ba5c583e
--- /dev/null
+++ b/srcpkgs/zlib/patches/CVE-2018-25032.patch
@@ -0,0 +1,343 @@
+From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Tue, 17 Apr 2018 22:09:22 -0700
+Subject: [PATCH] Fix a bug that can crash deflate on some input when using
+ Z_FIXED.
+
+This bug was reported by Danilo Ramos of Eideticom, Inc. It has
+lain in wait 13 years before being found! The bug was introduced
+in zlib 1.2.2.2, with the addition of the Z_FIXED option. That
+option forces the use of fixed Huffman codes. For rare inputs with
+a large number of distant matches, the pending buffer into which
+the compressed data is written can overwrite the distance symbol
+table which it overlays. That results in corrupted output due to
+invalid distances, and can result in out-of-bound accesses,
+crashing the application.
+
+The fix here combines the distance buffer and literal/length
+buffers into a single symbol buffer. Now three bytes of pending
+buffer space are opened up for each literal or length/distance
+pair consumed, instead of the previous two bytes. This assures
+that the pending buffer cannot overwrite the symbol table, since
+the maximum fixed code compressed length/distance is 31 bits, and
+since there are four bytes of pending space for every three bytes
+of symbol space.
+---
+ deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++---------------
+ deflate.h | 25 +++++++++----------
+ trees.c   | 50 +++++++++++--------------------------
+ 3 files changed, 79 insertions(+), 70 deletions(-)
+
+diff --git a/deflate.c b/deflate.c
+index 425babc00..19cba873a 100644
+--- a/deflate.c
++++ b/deflate.c
+@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+     int wrap = 1;
+     static const char my_version[] = ZLIB_VERSION;
+ 
+-    ushf *overlay;
+-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
+-     * output size for (length,distance) codes is <= 24 bits.
+-     */
+-
+     if (version == Z_NULL || version[0] != my_version[0] ||
+         stream_size != sizeof(z_stream)) {
+         return Z_VERSION_ERROR;
+@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+ 
+     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
+ 
+-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
+-    s->pending_buf = (uchf *) overlay;
+-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
++    /* We overlay pending_buf and sym_buf. This works since the average size
++     * for length/distance pairs over any compressed block is assured to be 31
++     * bits or less.
++     *
++     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
++     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
++     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
++     * possible fixed-codes length/distance pair is then 31 bits total.
++     *
++     * sym_buf starts one-fourth of the way into pending_buf. So there are
++     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
++     * in sym_buf is three bytes -- two for the distance and one for the
++     * literal/length. As each symbol is consumed, the pointer to the next
++     * sym_buf value to read moves forward three bytes. From that symbol, up to
++     * 31 bits are written to pending_buf. The closest the written pending_buf
++     * bits gets to the next sym_buf symbol to read is just before the last
++     * code is written. At that time, 31*(n-2) bits have been written, just
++     * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
++     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
++     * symbols are written.) The closest the writing gets to what is unread is
++     * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
++     * can range from 128 to 32768.
++     *
++     * Therefore, at a minimum, there are 142 bits of space between what is
++     * written and what is read in the overlain buffers, so the symbols cannot
++     * be overwritten by the compressed data. That space is actually 139 bits,
++     * due to the three-bit fixed-code block header.
++     *
++     * That covers the case where either Z_FIXED is specified, forcing fixed
++     * codes, or when the use of fixed codes is chosen, because that choice
++     * results in a smaller compressed block than dynamic codes. That latter
++     * condition then assures that the above analysis also covers all dynamic
++     * blocks. A dynamic-code block will only be chosen to be emitted if it has
++     * fewer bits than a fixed-code block would for the same set of symbols.
++     * Therefore its average symbol length is assured to be less than 31. So
++     * the compressed data for a dynamic block also cannot overwrite the
++     * symbols from which it is being constructed.
++     */
++
++    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
++    s->pending_buf_size = (ulg)s->lit_bufsize * 4;
+ 
+     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
+         s->pending_buf == Z_NULL) {
+@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
+         deflateEnd (strm);
+         return Z_MEM_ERROR;
+     }
+-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
+-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
++    s->sym_buf = s->pending_buf + s->lit_bufsize;
++    s->sym_end = (s->lit_bufsize - 1) * 3;
++    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
++     * on 16 bit machines and because stored blocks are restricted to
++     * 64K-1 bytes.
++     */
+ 
+     s->level = level;
+     s->strategy = strategy;
+@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
+ 
+     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
+     s = strm->state;
+-    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
++    if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
+         return Z_BUF_ERROR;
+     do {
+         put = Buf_size - s->bi_valid;
+@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source)
+ #else
+     deflate_state *ds;
+     deflate_state *ss;
+-    ushf *overlay;
+ 
+ 
+     if (deflateStateCheck(source) || dest == Z_NULL) {
+@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source)
+     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
+     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
+     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
+-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
+-    ds->pending_buf = (uchf *) overlay;
++    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
+ 
+     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
+         ds->pending_buf == Z_NULL) {
+@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source)
+     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
+ 
+     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
+-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
+-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
++    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
+ 
+     ds->l_desc.dyn_tree = ds->dyn_ltree;
+     ds->d_desc.dyn_tree = ds->dyn_dtree;
+@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush)
+         FLUSH_BLOCK(s, 1);
+         return finish_done;
+     }
+-    if (s->last_lit)
++    if (s->sym_next)
+         FLUSH_BLOCK(s, 0);
+     return block_done;
+ }
+diff --git a/deflate.h b/deflate.h
+index 23ecdd312..d4cf1a98b 100644
+--- a/deflate.h
++++ b/deflate.h
+@@ -217,7 +217,7 @@ typedef struct internal_state {
+     /* Depth of each subtree used as tie breaker for trees of equal frequency
+      */
+ 
+-    uchf *l_buf;          /* buffer for literals or lengths */
++    uchf *sym_buf;        /* buffer for distances and literals/lengths */
+ 
+     uInt  lit_bufsize;
+     /* Size of match buffer for literals/lengths.  There are 4 reasons for
+@@ -239,13 +239,8 @@ typedef struct internal_state {
+      *   - I can't count above 4
+      */
+ 
+-    uInt last_lit;      /* running index in l_buf */
+-
+-    ushf *d_buf;
+-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
+-     * the same number of elements. To use different lengths, an extra flag
+-     * array would be necessary.
+-     */
++    uInt sym_next;      /* running index in sym_buf */
++    uInt sym_end;       /* symbol table full when sym_next reaches this */
+ 
+     ulg opt_len;        /* bit length of current block with optimal trees */
+     ulg static_len;     /* bit length of current block with static trees */
+@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
+ 
+ # define _tr_tally_lit(s, c, flush) \
+   { uch cc = (c); \
+-    s->d_buf[s->last_lit] = 0; \
+-    s->l_buf[s->last_lit++] = cc; \
++    s->sym_buf[s->sym_next++] = 0; \
++    s->sym_buf[s->sym_next++] = 0; \
++    s->sym_buf[s->sym_next++] = cc; \
+     s->dyn_ltree[cc].Freq++; \
+-    flush = (s->last_lit == s->lit_bufsize-1); \
++    flush = (s->sym_next == s->sym_end); \
+    }
+ # define _tr_tally_dist(s, distance, length, flush) \
+   { uch len = (uch)(length); \
+     ush dist = (ush)(distance); \
+-    s->d_buf[s->last_lit] = dist; \
+-    s->l_buf[s->last_lit++] = len; \
++    s->sym_buf[s->sym_next++] = dist; \
++    s->sym_buf[s->sym_next++] = dist >> 8; \
++    s->sym_buf[s->sym_next++] = len; \
+     dist--; \
+     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
+     s->dyn_dtree[d_code(dist)].Freq++; \
+-    flush = (s->last_lit == s->lit_bufsize-1); \
++    flush = (s->sym_next == s->sym_end); \
+   }
+ #else
+ # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
+diff --git a/trees.c b/trees.c
+index 4f4a65011..decaeb7c3 100644
+--- a/trees.c
++++ b/trees.c
+@@ -416,7 +416,7 @@ local void init_block(s)
+ 
+     s->dyn_ltree[END_BLOCK].Freq = 1;
+     s->opt_len = s->static_len = 0L;
+-    s->last_lit = s->matches = 0;
++    s->sym_next = s->matches = 0;
+ }
+ 
+ #define SMALLEST 1
+@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
+ 
+         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
+                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
+-                s->last_lit));
++                s->sym_next / 3));
+ 
+         if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
+ 
+@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+     unsigned dist;  /* distance of matched string */
+     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
+ {
+-    s->d_buf[s->last_lit] = (ush)dist;
+-    s->l_buf[s->last_lit++] = (uch)lc;
++    s->sym_buf[s->sym_next++] = dist;
++    s->sym_buf[s->sym_next++] = dist >> 8;
++    s->sym_buf[s->sym_next++] = lc;
+     if (dist == 0) {
+         /* lc is the unmatched char */
+         s->dyn_ltree[lc].Freq++;
+@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
+         s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
+         s->dyn_dtree[d_code(dist)].Freq++;
+     }
+-
+-#ifdef TRUNCATE_BLOCK
+-    /* Try to guess if it is profitable to stop the current block here */
+-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
+-        /* Compute an upper bound for the compressed length */
+-        ulg out_length = (ulg)s->last_lit*8L;
+-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
+-        int dcode;
+-        for (dcode = 0; dcode < D_CODES; dcode++) {
+-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
+-                (5L+extra_dbits[dcode]);
+-        }
+-        out_length >>= 3;
+-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
+-               s->last_lit, in_length, out_length,
+-               100L - out_length*100L/in_length));
+-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
+-    }
+-#endif
+-    return (s->last_lit == s->lit_bufsize-1);
+-    /* We avoid equality with lit_bufsize because of wraparound at 64K
+-     * on 16 bit machines and because stored blocks are restricted to
+-     * 64K-1 bytes.
+-     */
++    return (s->sym_next == s->sym_end);
+ }
+ 
+ /* ===========================================================================
+@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree)
+ {
+     unsigned dist;      /* distance of matched string */
+     int lc;             /* match length or unmatched char (if dist == 0) */
+-    unsigned lx = 0;    /* running index in l_buf */
++    unsigned sx = 0;    /* running index in sym_buf */
+     unsigned code;      /* the code to send */
+     int extra;          /* number of extra bits to send */
+ 
+-    if (s->last_lit != 0) do {
+-        dist = s->d_buf[lx];
+-        lc = s->l_buf[lx++];
++    if (s->sym_next != 0) do {
++        dist = s->sym_buf[sx++] & 0xff;
++        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
++        lc = s->sym_buf[sx++];
+         if (dist == 0) {
+             send_code(s, lc, ltree); /* send a literal byte */
+             Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree)
+             }
+         } /* literal or match pair ? */
+ 
+-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
+-        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
+-               "pendingBuf overflow");
++        /* Check that the overlay between pending_buf and sym_buf is ok: */
++        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
+ 
+-    } while (lx < s->last_lit);
++    } while (sx < s->sym_next);
+ 
+     send_code(s, END_BLOCK, ltree);
+ }
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index e8c44f9bdb8b..0a3cd6a4a30a 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
 # Template file for 'zlib'
 pkgname=zlib
 version=1.2.11
-revision=4
+revision=5
 bootstrap=yes
 build_style=configure
 configure_args="--prefix=/usr --shared"

From f5a918dc4507e264a718e388ca6dd15d4d503928 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 28 Mar 2022 16:40:22 -0500
Subject: [PATCH 0746/1686] proxychains-ng: update to 4.16.

---
 srcpkgs/proxychains-ng/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/proxychains-ng/template b/srcpkgs/proxychains-ng/template
index 3cbb9a335e93..2473f4d45e35 100644
--- a/srcpkgs/proxychains-ng/template
+++ b/srcpkgs/proxychains-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'proxychains-ng'
 pkgname=proxychains-ng
-version=4.15
+version=4.16
 revision=1
 build_style=gnu-configure
 make_install_target="install install-config"
@@ -10,4 +10,4 @@ maintainer="David <kalichakra@zoho.com>"
 license="GPL-2.0-only"
 homepage="https://github.com/rofl0r/proxychains-ng"
 distfiles="http://ftp.barfooze.de/pub/sabotage/tarballs/${pkgname}-${version}.tar.xz"
-checksum=3207ab7f1f053c3fdcdf5ac158bcdef0683e3b7d8427b602ce9c0abe6a369081
+checksum=37a9983d995857cc398cfeefb96739827b3d86a71e03a5193b99f1b097046812

From afc39903e6813561b96314fb0900dd99ef7ef5ed Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 28 Mar 2022 16:17:49 +0200
Subject: [PATCH 0747/1686] restic: update to 0.13.0.

---
 srcpkgs/restic/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/restic/template b/srcpkgs/restic/template
index 90f1e689db15..18e2a8b1f406 100644
--- a/srcpkgs/restic/template
+++ b/srcpkgs/restic/template
@@ -1,6 +1,6 @@
 # Template file for 'restic'
 pkgname=restic
-version=0.12.1
+version=0.13.0
 revision=1
 build_style=go
 go_import_path=github.com/restic/restic
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://restic.net/"
 changelog="https://raw.githubusercontent.com/restic/restic/master/CHANGELOG.md"
 distfiles="https://github.com/restic/restic/releases/download/v${version}/restic-${version}.tar.gz"
-checksum=a9c88d5288ce04a6cc78afcda7590d3124966dab3daa9908de9b3e492e2925fb
+checksum=b3c09137b462548f44d764f98909534bef6e85fe029d4daf60545642cdefd3dd
 
 post_install() {
 	vlicense LICENSE

From a462001c6a4e15252205a065fb960f3227baf259 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 05:50:52 +0200
Subject: [PATCH 0748/1686] bees: fix build

---
 srcpkgs/bees/patches/fix-build.patch | 12 ++++++++++++
 srcpkgs/bees/patches/series          |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 srcpkgs/bees/patches/fix-build.patch

diff --git a/srcpkgs/bees/patches/fix-build.patch b/srcpkgs/bees/patches/fix-build.patch
new file mode 100644
index 000000000000..3799e27e32ae
--- /dev/null
+++ b/srcpkgs/bees/patches/fix-build.patch
@@ -0,0 +1,12 @@
+--- a/src/fiemap.cc
++++ b/src/fiemap.cc
+@@ -28,7 +28,8 @@ main(int argc, char **argv)
+ 		if (argc > 2) { fm.fm_start = stoull(argv[2], nullptr, 0); }
+ 		if (argc > 3) { fm.fm_length = stoull(argv[3], nullptr, 0); }
+ 		if (argc > 4) { fm.fm_flags = stoull(argv[4], nullptr, 0); }
+-		fm.fm_length = min(fm.fm_length, FIEMAP_MAX_OFFSET - fm.fm_start);
++		using FU = decltype(fm.fm_length);
++		fm.fm_length = min(FU(fm.fm_length), FU(FIEMAP_MAX_OFFSET - fm.fm_start));
+ 		uint64_t stop_at = fm.fm_start + fm.fm_length;
+ 		uint64_t last_byte = fm.fm_start;
+ 		do {
diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series
index d9a2837128f2..068ccfc2db81 100644
--- a/srcpkgs/bees/patches/series
+++ b/srcpkgs/bees/patches/series
@@ -1,2 +1,3 @@
 0001-don-t-run-tests-unless-asked.patch
 0002-move-sbin-into-bin.patch
+fix-build.patch

From 4c3166028b9b2cf62bdbed0b0b918e0508fdff67 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 05:52:59 +0200
Subject: [PATCH 0749/1686] bees: also disable on platforms without 64-bit
 atomics

---
 srcpkgs/bees/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template
index c9184f593e87..6f8783ea65fc 100644
--- a/srcpkgs/bees/template
+++ b/srcpkgs/bees/template
@@ -23,6 +23,10 @@ if [ "$CROSS_BUILD" ]; then
 	make_check="no"
 fi
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	broken="undefined reference to __atomic_fetch_add_8"
+fi
+
 pre_build() {
 	export BEES_VERSION="${version}"
 }

From 70f8aaea6e3989f0e15ca6f053ac7f2d2d5c91a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 29 Mar 2022 08:06:54 +0200
Subject: [PATCH 0750/1686] kpty: fix cross

---
 srcpkgs/kpty/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 28f4d371f530..47612b152d68 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -3,6 +3,7 @@ pkgname=kpty
 version=5.92.0
 revision=1
 build_style=cmake
+configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter"
 hostmakedepends="gettext kcoreaddons extra-cmake-modules kcoreaddons-devel"
 makedepends="kcoreaddons-devel ki18n-devel libutempter-devel"
 short_desc="KDE Interfacing with pseudo terminal devices"

From afd261aa9447e5c4aacf5752d5f21f4f43f9133e Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 14:25:13 +0200
Subject: [PATCH 0751/1686] conduit: restrict archs (ring dependency)

---
 srcpkgs/conduit/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/conduit/template b/srcpkgs/conduit/template
index c2e423e79891..cf972b13e25c 100644
--- a/srcpkgs/conduit/template
+++ b/srcpkgs/conduit/template
@@ -2,6 +2,8 @@
 pkgname=conduit
 version=0.3.0
 revision=1
+# needs ring/rustls
+archs="x86_64* i686* aarch64* armv[67]*"
 wrksrc="conduit-v${version}"
 build_style=cargo
 hostmakedepends="clang"

From 111521dce46ebcd583959d4bbdb12ea9e29fa8f1 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 29 Mar 2022 14:27:56 +0200
Subject: [PATCH 0752/1686] retroarch: fix checksum

---
 srcpkgs/retroarch/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 6b89a54d89a2..bafac5d513a0 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -25,7 +25,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.retroarch.com/"
 changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.md"
 distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=e426b8d30c25806e54c61f21d0d742695fa4f6bc6a271def4459db5460d28e8e
+checksum=c7d371208292aa58b295d639e550efbe412671e09a3d609540796709b17b9b8b
 
 build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11"
 build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11"

From 275179dfc37debbfbef7a4cffc90cc62bcdf237d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 28 Mar 2022 23:46:33 +0200
Subject: [PATCH 0753/1686] crash: use system readline, zlib.

---
 srcpkgs/crash/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/crash/template b/srcpkgs/crash/template
index 82d9a3968c11..7f158c9ed635 100644
--- a/srcpkgs/crash/template
+++ b/srcpkgs/crash/template
@@ -1,11 +1,11 @@
 # Template file for 'crash'
 pkgname=crash
 version=8.0.0
-revision=1
+revision=2
 archs="i686 x86_64"  # broken on musl
 build_style=gnu-makefile
 hostmakedepends="flex tar wget texinfo"
-makedepends="lzo-devel ncurses-devel zlib-devel"
+makedepends="lzo-devel ncurses-devel zlib-devel readline-devel"
 depends="binutils"
 short_desc="Kernel crash dump debugger and live inspector"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -25,7 +25,7 @@ post_extract() {
 }
 
 do_build() {
-	make ${makejobs} lzo
+	make ${makejobs} lzo GDB_CONF_FLAGS="--with-system-readline --with-system-zlib"
 	make ${makejobs} extensions
 }
 

From b6c57bab0e0d7b2dba2219e53b8b362d7a894343 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 29 Mar 2022 14:08:01 +0200
Subject: [PATCH 0754/1686] expat: update to 2.4.8.

---
 srcpkgs/expat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template
index ccab77dad179..126ea7b3f474 100644
--- a/srcpkgs/expat/template
+++ b/srcpkgs/expat/template
@@ -1,6 +1,6 @@
 # Template file for 'expat'
 pkgname=expat
-version=2.4.7
+version=2.4.8
 revision=1
 build_style=gnu-configure
 short_desc="XML parser library written in C"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://libexpat.github.io/"
 distfiles="https://github.com/libexpat/libexpat/releases/download/R_${version//./_}/expat-${version}.tar.xz"
-checksum=9875621085300591f1e64c18fd3da3a0eeca4a74f884b9abac2758ad1bd07a7d
+checksum=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25
 
 post_install() {
 	vlicense COPYING

From 86782b8be118b2c92c7f03732e14647c035177c4 Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lauri@hacktheplanet.fi>
Date: Thu, 20 Jan 2022 19:52:59 +0200
Subject: [PATCH 0755/1686] New package: acme-client-1.3.0

portable acme-client existed previously with a different upstream, which
was unmaintained - switch to one that is maintained.
---
 srcpkgs/acme-client/files/acme-client.conf | 31 ++++++++++++++++++++++
 srcpkgs/acme-client/template               | 23 ++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/acme-client/files/acme-client.conf
 create mode 100644 srcpkgs/acme-client/template

diff --git a/srcpkgs/acme-client/files/acme-client.conf b/srcpkgs/acme-client/files/acme-client.conf
new file mode 100644
index 000000000000..31dd96f00886
--- /dev/null
+++ b/srcpkgs/acme-client/files/acme-client.conf
@@ -0,0 +1,31 @@
+#
+# $OpenBSD: acme-client.conf,v 1.4 2020/09/17 09:13:06 florian Exp $
+#
+authority letsencrypt {
+	api url "https://acme-v02.api.letsencrypt.org/directory"
+	account key "/etc/acme/letsencrypt-privkey.pem"
+}
+
+authority letsencrypt-staging {
+	api url "https://acme-staging-v02.api.letsencrypt.org/directory"
+	account key "/etc/acme/letsencrypt-staging-privkey.pem"
+}
+
+authority buypass {
+	api url "https://api.buypass.com/acme/directory"
+	account key "/etc/acme/buypass-privkey.pem"
+	contact "mailto:me@example.com"
+}
+
+authority buypass-test {
+	api url "https://api.test4.buypass.no/acme/directory"
+	account key "/etc/acme/buypass-test-privkey.pem"
+	contact "mailto:me@example.com"
+}
+
+domain example.com {
+	alternative names { secure.example.com }
+	domain key "/etc/ssl/private/example.com.key"
+	domain full chain certificate "/etc/ssl/example.com.fullchain.pem"
+	sign with letsencrypt
+}
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
new file mode 100644
index 000000000000..da8fd65f1f4c
--- /dev/null
+++ b/srcpkgs/acme-client/template
@@ -0,0 +1,23 @@
+# Template file for 'acme-client'
+pkgname=acme-client
+version=1.3.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config sed"
+makedepends="openssl-devel"
+checkdepends="nginx curl"
+short_desc="Portable version of OpenBSD's acme-client"
+maintainer="Lauri Tirkkonen <lauri@hacktheplanet.fi>"
+license="GPL-2.0-only"
+homepage="https://git.sr.ht/~graywolf/acme-client-portable/"
+distfiles="https://data.wolfsden.cz/sources/acme-client-${version}.tar.gz"
+checksum=ac8796652393fa73f32dfda60ed3a437fc260867df1b81fa3c241bd95c5bc719
+make_check=no # requires https://github.com/letsencrypt/pebble which isn't packaged
+
+pre_install() {
+	sed -i 's,/etc/examples/,/usr/share/examples/acme-client/,g' usr.sbin/acme-client/acme-client.conf.5
+}
+
+post_install() {
+	vsconf ${FILESDIR}/acme-client.conf
+}

From 9d3e7b562af895349b29d58ca17420d16f8515f6 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 23:59:55 -0400
Subject: [PATCH 0756/1686] cura-fdm-materials: update to 4.13.0.

---
 srcpkgs/cura-fdm-materials/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template
index 2383b2c697a3..fb701a7510f0 100644
--- a/srcpkgs/cura-fdm-materials/template
+++ b/srcpkgs/cura-fdm-materials/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-fdm-materials'
 pkgname=cura-fdm-materials
 reverts="2019.08.21_1"
-version=4.12.0
+version=4.13.0
 revision=1
 wrksrc="fdm_materials-${version}"
 build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="CC0-1.0"
 homepage="https://github.com/Ultimaker/fdm_materials"
 distfiles="https://github.com/Ultimaker/fdm_materials/archive/${version}.tar.gz"
-checksum=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From 488e180855df955ddc477e242f8d303fbb2bce8f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:00:21 -0400
Subject: [PATCH 0757/1686] libArcus: update to 4.13.1.

---
 srcpkgs/libArcus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index d560ee19b81d..21176dfdbcbe 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
-revision=2
+version=4.13.1
+revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libArcus"
 distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=51e865cb648750ad9ea315fa7632ee7016890273f911270f60d28c8a4bc50240
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6fc160b9e28ad6e40d862b84921952c3f7db6707 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 11:23:27 -0400
Subject: [PATCH 0758/1686] Uranium: update to 4.13.1.

---
 srcpkgs/Uranium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.1
 revision=1
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
@@ -15,7 +15,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Uranium"
 distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
-checksum=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From fa378224a57ffafc918a2884759d52edba485aca Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 11:23:57 -0400
Subject: [PATCH 0759/1686] cura-engine: update to 4.13.1.

---
 srcpkgs/cura-engine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 8c2822f73c0d..5cded6271dea 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.12.1
-revision=2
+version=4.13.1
+revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/CuraEngine"
 distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
 
 post_install() {
 	vlicense LICENSE

From f60cec5d6e34c6be1bb2d7a14bcca6c3728ca80a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 0760/1686] libSavitar: update to 4.13.1.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..eaffe92be8ce 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.1
 revision=1
 build_style=cmake
 hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/libSavitar"
 distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz"
-checksum=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=0bd50f54d557bed70f2c8420405c690b819b287156e81e10b6f51651cebce2e9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From a844d48ae409331911f549236ac08b4075650696 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:18:57 -0400
Subject: [PATCH 0761/1686] New package: libCharon-4.13.0

---
 srcpkgs/libCharon/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/libCharon/template

diff --git a/srcpkgs/libCharon/template b/srcpkgs/libCharon/template
new file mode 100644
index 000000000000..b33e995d9dbe
--- /dev/null
+++ b/srcpkgs/libCharon/template
@@ -0,0 +1,14 @@
+# Template file for 'libCharon'
+pkgname=libCharon
+version=4.13.0
+revision=1
+build_style=cmake
+configure_args="INSTALL_SERVICE=OFF"
+hostmakedepends="python3"
+checkdepends="python3-pytest python3-mypy"
+short_desc="File metadata and streaming library"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Ultimaker/libCharon"
+distfiles="https://github.com/Ultimaker/libCharon/archive/${version}.tar.gz"
+checksum=efccb04a84b9a80fe4e154aa4b44c56b59061aeba25937be804277a5f21259ec

From a90b362b616abf8327f67b693873fe12c3e3854e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 0762/1686] cura: update to 4.13.1.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py
-index c29a0648d..dad67ba16 100644
---- a/cura/Arranging/Nest2DArrange.py
-+++ b/cura/Arranging/Nest2DArrange.py
-@@ -91,7 +91,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV
- 
-         if hull_polygon is not None and hull_polygon.getPoints() is not None and len(hull_polygon.getPoints()) > 2:  # numpy array has to be explicitly checked against None
-             for point in hull_polygon.getPoints():
--                converted_points.append(Point(point[0] * factor, point[1] * factor))
-+                converted_points.append(Point(int(point[0] * factor), int(point[1] * factor)))
-             item = Item(converted_points)
-             item.markAsFixedInBin(0)
-             node_items.append(item)
diff --git a/srcpkgs/cura/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cura/PickingPass.py b/cura/PickingPass.py
-index 54e886fe6..4d6ef671d 100644
---- a/cura/PickingPass.py
-+++ b/cura/PickingPass.py
-@@ -72,8 +72,8 @@ class PickingPass(RenderPass):
- 
-         window_size = self._renderer.getWindowSize()
- 
--        px = (0.5 + x / 2.0) * window_size[0]
--        py = (0.5 + y / 2.0) * window_size[1]
-+        px = int((0.5 + x / 2.0) * window_size[0])
-+        py = int((0.5 + y / 2.0) * window_size[1])
- 
-         if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1):
-             return -1
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index aa06dcd98b85..8e0cc09ab8d3 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry libCharon"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"
 homepage="https://github.com/Ultimaker/Cura"
 distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c

From 7ed6bbdbd7f7a589bb4a3d65dd4351137d5f32f5 Mon Sep 17 00:00:00 2001
From: Anton Afanasyev <1157248+2asoft@users.noreply.github.com>
Date: Thu, 17 Mar 2022 21:43:41 -0700
Subject: [PATCH 0763/1686] jetbrains-jdk-bin: update to 11.0.14.1b2043.17.

---
 srcpkgs/jetbrains-jdk-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jetbrains-jdk-bin/template b/srcpkgs/jetbrains-jdk-bin/template
index b2f4fe780d19..1f428e05bd3a 100644
--- a/srcpkgs/jetbrains-jdk-bin/template
+++ b/srcpkgs/jetbrains-jdk-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'jetbrains-jdk-bin'
 pkgname=jetbrains-jdk-bin
-version=11.0.13b1890.3
+version=11.0.14.1b2043.17
 revision=1
 archs="x86_64"
 wrksrc="jbr"
@@ -11,7 +11,7 @@ homepage="https://github.com/JetBrains/JetBrainsRuntime"
 _jdk_ver=${version%b*}
 _jdk_build=${version#*b}
 distfiles="https://cache-redirector.jetbrains.com/intellij-jbr/jbr_jcef-${_jdk_ver//\./_}-linux-x64-b${_jdk_build}.tar.gz"
-checksum=6dc1208c486ed023ddd9f79f66f099304cd6785895d4e782aaefe0603f47e621
+checksum=2c5b7398acb2b718cbdd8327e4c77e52b131fdf3424fee03d0c51afb3b315c10
 # This JDK appears to link to libs that do not exist, but functions well even in their absence.
 # Best guess is that they are optional. ¯\_(ツ)_/¯
 noverifyrdeps=yes

From c802180c2846d1fccd26b5f0289300570d104eb2 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 13 Mar 2022 13:53:20 +0300
Subject: [PATCH 0764/1686] fish-shell: update to 3.4.1.

---
 srcpkgs/fish-shell/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template
index 657e5604c3d6..0fc86db7e7b0 100644
--- a/srcpkgs/fish-shell/template
+++ b/srcpkgs/fish-shell/template
@@ -1,6 +1,6 @@
 # Template file for 'fish-shell'
 pkgname=fish-shell
-version=3.3.1
+version=3.4.1
 revision=1
 wrksrc="fish-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ license="GPL-2.0-only"
 homepage="https://fishshell.com/"
 changelog="https://github.com/fish-shell/fish-shell/raw/master/CHANGELOG.rst"
 distfiles="https://github.com/fish-shell/fish-shell/releases/download/${version}/fish-${version}.tar.xz"
-checksum=b5b4ee1a5269762cbbe993a4bd6507e675e4100ce9bbe84214a5eeb2b19fae89
+checksum=b6f23b3843b04db6b0a90fea1f6f0d0e40cc027b4a732098200863f2864a94ea
 register_shell="/bin/fish /usr/bin/fish"
 # tests don't work as root
 make_check=ci-skip

From f63dc314ed696e2756bbe4109bac854436619ab4 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 29 Mar 2022 20:05:35 +0200
Subject: [PATCH 0765/1686] linux5.4: update to 5.4.188.

---
 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 46c8f5c5c751..ac636bc1d2ff 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.187
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=189e3db3f2af8578037f9c8b4710e1002bdd56f318c5f8589b40de889be9a7b8
+checksum=9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 6bc4667fbf405f5a526805842e5494e9cd7bbd39 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Tue, 29 Mar 2022 20:08:57 +0200
Subject: [PATCH 0766/1686] linux4.19: update to 4.19.237.

---
 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 f2fb29a3cf0c..cb61654da418 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.236
+version=4.19.237
 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=002ef6adcafe8d90571f8882280a9bef28d1aa7cc9a3f35a50afc4cb2ebe31c0
+checksum=bafff35102cc486ec2bf94c6d908be8e24017b2e4a1873f52f24c855eb220cd8
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 630dc15af579962fa46ebe21ad18b5cd65006a92 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Mon, 28 Mar 2022 20:48:50 -0500
Subject: [PATCH 0767/1686] .github/workflows: Add a workflow for dealing with
 stale issues/prs

---
 .github/workflows/stale.yml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 000000000000..c759ef9459e0
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,20 @@
+---
+name: Stale Cleanup
+
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v4
+        with:
+          stale-issue-message: 'Issues become stale 90 days after last activity and are closed 7 days after that.  If this issue is still relevant bump it or assign it.'
+          stale-pr-message: 'Pull Requests become stale 90 days after last activity and are closed 7 days after that.  If this pull request is still relevant bump it or assign it.'
+          days-before-stale: 90
+          days-before-close: 7
+          debug-only: true
+          exempt-all-assignees: true
+          operations-per-run: 1000

From 27c6f695d62667df817255d31fafbb05a88c56c5 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Tue, 29 Mar 2022 21:49:29 -0500
Subject: [PATCH 0768/1686] .github/workflows: make stale comments workflow
 dispatchable

---
 .github/workflows/stale.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index c759ef9459e0..abdc83c9d383 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -2,6 +2,7 @@
 name: Stale Cleanup
 
 on:
+  workflow_dispatch:
   schedule:
     - cron: '30 1 * * *'
 

From 5fe6c61fbda87abef4f44877d309102aef08af64 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Tue, 29 Mar 2022 23:43:32 -0500
Subject: [PATCH 0769/1686] runit-void: update to 20220329.

---
 srcpkgs/runit-void/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template
index a0aef0484c0b..42eeab9a2929 100644
--- a/srcpkgs/runit-void/template
+++ b/srcpkgs/runit-void/template
@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
-version=20210314
-revision=3
+version=20220329
+revision=1
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 short_desc="Void Linux runit scripts"
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="CC0-1.0"
 homepage="https://github.com/void-linux/void-runit"
 distfiles="https://github.com/void-linux/void-runit/archive/${version}.tar.gz"
-checksum=9ac95a14b5e1aedfcf0b093b8992b08316448ac1afb7fd26501ac43c4ebf3847
+checksum=43037b1cbf177a3ee6d690cc652eedf819ca37f44636311b55aa716e159a4718
 
 depends="virtual?awk procps-ng runit"
 conf_files="

From 686c5cb93a34ca8c989a0f36f0c58521a181044b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 13:36:14 +0100
Subject: [PATCH 0770/1686] New package: yass-0.1.0

---
 srcpkgs/yass/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/yass/template

diff --git a/srcpkgs/yass/template b/srcpkgs/yass/template
new file mode 100644
index 000000000000..7b4577941ec3
--- /dev/null
+++ b/srcpkgs/yass/template
@@ -0,0 +1,20 @@
+# Template file for 'yass'
+pkgname=yass
+version=0.1.0
+revision=1
+build_wrksrc=source
+build_style=gnu-makefile
+hostmakedepends="pkg-config"
+makedepends="clthreads-devel clxclient-devel freetype-devel jack-devel
+ libX11-devel libXft-devel"
+short_desc="Yet Another Scrolling Scope"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://kokkinizita.linuxaudio.org/linuxaudio/"
+distfiles="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pkgname}-${version}.tar.bz2"
+checksum=d247798b708303bc7622c3b6b96fb8190f3b3a07424a3b53c95d21ab8fc6d34a
+
+pre_build() {
+	# change pkgconf to pkg-config
+	vsed -i 's/pkgconf/pkg-config/' Makefile
+}

From 238238712da0c14067e8077adc792d718aace265 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 29 Mar 2022 14:27:58 +0200
Subject: [PATCH 0771/1686] zlib: update to 1.2.12.

---
 srcpkgs/zlib/patches/CVE-2018-25032.patch | 343 ----------------------
 srcpkgs/zlib/patches/cc.patch             |  24 ++
 srcpkgs/zlib/template                     |   6 +-
 3 files changed, 27 insertions(+), 346 deletions(-)
 delete mode 100644 srcpkgs/zlib/patches/CVE-2018-25032.patch
 create mode 100644 srcpkgs/zlib/patches/cc.patch

diff --git a/srcpkgs/zlib/patches/CVE-2018-25032.patch b/srcpkgs/zlib/patches/CVE-2018-25032.patch
deleted file mode 100644
index 9f37ba5c583e..000000000000
--- a/srcpkgs/zlib/patches/CVE-2018-25032.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-From 5c44459c3b28a9bd3283aaceab7c615f8020c531 Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Tue, 17 Apr 2018 22:09:22 -0700
-Subject: [PATCH] Fix a bug that can crash deflate on some input when using
- Z_FIXED.
-
-This bug was reported by Danilo Ramos of Eideticom, Inc. It has
-lain in wait 13 years before being found! The bug was introduced
-in zlib 1.2.2.2, with the addition of the Z_FIXED option. That
-option forces the use of fixed Huffman codes. For rare inputs with
-a large number of distant matches, the pending buffer into which
-the compressed data is written can overwrite the distance symbol
-table which it overlays. That results in corrupted output due to
-invalid distances, and can result in out-of-bound accesses,
-crashing the application.
-
-The fix here combines the distance buffer and literal/length
-buffers into a single symbol buffer. Now three bytes of pending
-buffer space are opened up for each literal or length/distance
-pair consumed, instead of the previous two bytes. This assures
-that the pending buffer cannot overwrite the symbol table, since
-the maximum fixed code compressed length/distance is 31 bits, and
-since there are four bytes of pending space for every three bytes
-of symbol space.
----
- deflate.c | 74 ++++++++++++++++++++++++++++++++++++++++---------------
- deflate.h | 25 +++++++++----------
- trees.c   | 50 +++++++++++--------------------------
- 3 files changed, 79 insertions(+), 70 deletions(-)
-
-diff --git a/deflate.c b/deflate.c
-index 425babc00..19cba873a 100644
---- a/deflate.c
-+++ b/deflate.c
-@@ -255,11 +255,6 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-     int wrap = 1;
-     static const char my_version[] = ZLIB_VERSION;
- 
--    ushf *overlay;
--    /* We overlay pending_buf and d_buf+l_buf. This works since the average
--     * output size for (length,distance) codes is <= 24 bits.
--     */
--
-     if (version == Z_NULL || version[0] != my_version[0] ||
-         stream_size != sizeof(z_stream)) {
-         return Z_VERSION_ERROR;
-@@ -329,9 +324,47 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
- 
-     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
- 
--    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
--    s->pending_buf = (uchf *) overlay;
--    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-+    /* We overlay pending_buf and sym_buf. This works since the average size
-+     * for length/distance pairs over any compressed block is assured to be 31
-+     * bits or less.
-+     *
-+     * Analysis: The longest fixed codes are a length code of 8 bits plus 5
-+     * extra bits, for lengths 131 to 257. The longest fixed distance codes are
-+     * 5 bits plus 13 extra bits, for distances 16385 to 32768. The longest
-+     * possible fixed-codes length/distance pair is then 31 bits total.
-+     *
-+     * sym_buf starts one-fourth of the way into pending_buf. So there are
-+     * three bytes in sym_buf for every four bytes in pending_buf. Each symbol
-+     * in sym_buf is three bytes -- two for the distance and one for the
-+     * literal/length. As each symbol is consumed, the pointer to the next
-+     * sym_buf value to read moves forward three bytes. From that symbol, up to
-+     * 31 bits are written to pending_buf. The closest the written pending_buf
-+     * bits gets to the next sym_buf symbol to read is just before the last
-+     * code is written. At that time, 31*(n-2) bits have been written, just
-+     * after 24*(n-2) bits have been consumed from sym_buf. sym_buf starts at
-+     * 8*n bits into pending_buf. (Note that the symbol buffer fills when n-1
-+     * symbols are written.) The closest the writing gets to what is unread is
-+     * then n+14 bits. Here n is lit_bufsize, which is 16384 by default, and
-+     * can range from 128 to 32768.
-+     *
-+     * Therefore, at a minimum, there are 142 bits of space between what is
-+     * written and what is read in the overlain buffers, so the symbols cannot
-+     * be overwritten by the compressed data. That space is actually 139 bits,
-+     * due to the three-bit fixed-code block header.
-+     *
-+     * That covers the case where either Z_FIXED is specified, forcing fixed
-+     * codes, or when the use of fixed codes is chosen, because that choice
-+     * results in a smaller compressed block than dynamic codes. That latter
-+     * condition then assures that the above analysis also covers all dynamic
-+     * blocks. A dynamic-code block will only be chosen to be emitted if it has
-+     * fewer bits than a fixed-code block would for the same set of symbols.
-+     * Therefore its average symbol length is assured to be less than 31. So
-+     * the compressed data for a dynamic block also cannot overwrite the
-+     * symbols from which it is being constructed.
-+     */
-+
-+    s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
-+    s->pending_buf_size = (ulg)s->lit_bufsize * 4;
- 
-     if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-         s->pending_buf == Z_NULL) {
-@@ -340,8 +373,12 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-         deflateEnd (strm);
-         return Z_MEM_ERROR;
-     }
--    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
--    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-+    s->sym_buf = s->pending_buf + s->lit_bufsize;
-+    s->sym_end = (s->lit_bufsize - 1) * 3;
-+    /* We avoid equality with lit_bufsize*3 because of wraparound at 64K
-+     * on 16 bit machines and because stored blocks are restricted to
-+     * 64K-1 bytes.
-+     */
- 
-     s->level = level;
-     s->strategy = strategy;
-@@ -552,7 +589,7 @@ int ZEXPORT deflatePrime (strm, bits, value)
- 
-     if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
-     s = strm->state;
--    if ((Bytef *)(s->d_buf) < s->pending_out + ((Buf_size + 7) >> 3))
-+    if (s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
-         return Z_BUF_ERROR;
-     do {
-         put = Buf_size - s->bi_valid;
-@@ -1113,7 +1150,6 @@ int ZEXPORT deflateCopy (dest, source)
- #else
-     deflate_state *ds;
-     deflate_state *ss;
--    ushf *overlay;
- 
- 
-     if (deflateStateCheck(source) || dest == Z_NULL) {
-@@ -1133,8 +1169,7 @@ int ZEXPORT deflateCopy (dest, source)
-     ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-     ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-     ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
--    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
--    ds->pending_buf = (uchf *) overlay;
-+    ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
- 
-     if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-         ds->pending_buf == Z_NULL) {
-@@ -1148,8 +1183,7 @@ int ZEXPORT deflateCopy (dest, source)
-     zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
- 
-     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
--    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
--    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-+    ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
- 
-     ds->l_desc.dyn_tree = ds->dyn_ltree;
-     ds->d_desc.dyn_tree = ds->dyn_dtree;
-@@ -1925,7 +1959,7 @@ local block_state deflate_fast(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-@@ -2056,7 +2090,7 @@ local block_state deflate_slow(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-@@ -2131,7 +2165,7 @@ local block_state deflate_rle(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-@@ -2170,7 +2204,7 @@ local block_state deflate_huff(s, flush)
-         FLUSH_BLOCK(s, 1);
-         return finish_done;
-     }
--    if (s->last_lit)
-+    if (s->sym_next)
-         FLUSH_BLOCK(s, 0);
-     return block_done;
- }
-diff --git a/deflate.h b/deflate.h
-index 23ecdd312..d4cf1a98b 100644
---- a/deflate.h
-+++ b/deflate.h
-@@ -217,7 +217,7 @@ typedef struct internal_state {
-     /* Depth of each subtree used as tie breaker for trees of equal frequency
-      */
- 
--    uchf *l_buf;          /* buffer for literals or lengths */
-+    uchf *sym_buf;        /* buffer for distances and literals/lengths */
- 
-     uInt  lit_bufsize;
-     /* Size of match buffer for literals/lengths.  There are 4 reasons for
-@@ -239,13 +239,8 @@ typedef struct internal_state {
-      *   - I can't count above 4
-      */
- 
--    uInt last_lit;      /* running index in l_buf */
--
--    ushf *d_buf;
--    /* Buffer for distances. To simplify the code, d_buf and l_buf have
--     * the same number of elements. To use different lengths, an extra flag
--     * array would be necessary.
--     */
-+    uInt sym_next;      /* running index in sym_buf */
-+    uInt sym_end;       /* symbol table full when sym_next reaches this */
- 
-     ulg opt_len;        /* bit length of current block with optimal trees */
-     ulg static_len;     /* bit length of current block with static trees */
-@@ -325,20 +320,22 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
- 
- # define _tr_tally_lit(s, c, flush) \
-   { uch cc = (c); \
--    s->d_buf[s->last_lit] = 0; \
--    s->l_buf[s->last_lit++] = cc; \
-+    s->sym_buf[s->sym_next++] = 0; \
-+    s->sym_buf[s->sym_next++] = 0; \
-+    s->sym_buf[s->sym_next++] = cc; \
-     s->dyn_ltree[cc].Freq++; \
--    flush = (s->last_lit == s->lit_bufsize-1); \
-+    flush = (s->sym_next == s->sym_end); \
-    }
- # define _tr_tally_dist(s, distance, length, flush) \
-   { uch len = (uch)(length); \
-     ush dist = (ush)(distance); \
--    s->d_buf[s->last_lit] = dist; \
--    s->l_buf[s->last_lit++] = len; \
-+    s->sym_buf[s->sym_next++] = dist; \
-+    s->sym_buf[s->sym_next++] = dist >> 8; \
-+    s->sym_buf[s->sym_next++] = len; \
-     dist--; \
-     s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-     s->dyn_dtree[d_code(dist)].Freq++; \
--    flush = (s->last_lit == s->lit_bufsize-1); \
-+    flush = (s->sym_next == s->sym_end); \
-   }
- #else
- # define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-diff --git a/trees.c b/trees.c
-index 4f4a65011..decaeb7c3 100644
---- a/trees.c
-+++ b/trees.c
-@@ -416,7 +416,7 @@ local void init_block(s)
- 
-     s->dyn_ltree[END_BLOCK].Freq = 1;
-     s->opt_len = s->static_len = 0L;
--    s->last_lit = s->matches = 0;
-+    s->sym_next = s->matches = 0;
- }
- 
- #define SMALLEST 1
-@@ -948,7 +948,7 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last)
- 
-         Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-                 opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
--                s->last_lit));
-+                s->sym_next / 3));
- 
-         if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
- 
-@@ -1017,8 +1017,9 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-     unsigned dist;  /* distance of matched string */
-     unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
- {
--    s->d_buf[s->last_lit] = (ush)dist;
--    s->l_buf[s->last_lit++] = (uch)lc;
-+    s->sym_buf[s->sym_next++] = dist;
-+    s->sym_buf[s->sym_next++] = dist >> 8;
-+    s->sym_buf[s->sym_next++] = lc;
-     if (dist == 0) {
-         /* lc is the unmatched char */
-         s->dyn_ltree[lc].Freq++;
-@@ -1033,30 +1034,7 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc)
-         s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-         s->dyn_dtree[d_code(dist)].Freq++;
-     }
--
--#ifdef TRUNCATE_BLOCK
--    /* Try to guess if it is profitable to stop the current block here */
--    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
--        /* Compute an upper bound for the compressed length */
--        ulg out_length = (ulg)s->last_lit*8L;
--        ulg in_length = (ulg)((long)s->strstart - s->block_start);
--        int dcode;
--        for (dcode = 0; dcode < D_CODES; dcode++) {
--            out_length += (ulg)s->dyn_dtree[dcode].Freq *
--                (5L+extra_dbits[dcode]);
--        }
--        out_length >>= 3;
--        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
--               s->last_lit, in_length, out_length,
--               100L - out_length*100L/in_length));
--        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
--    }
--#endif
--    return (s->last_lit == s->lit_bufsize-1);
--    /* We avoid equality with lit_bufsize because of wraparound at 64K
--     * on 16 bit machines and because stored blocks are restricted to
--     * 64K-1 bytes.
--     */
-+    return (s->sym_next == s->sym_end);
- }
- 
- /* ===========================================================================
-@@ -1069,13 +1047,14 @@ local void compress_block(s, ltree, dtree)
- {
-     unsigned dist;      /* distance of matched string */
-     int lc;             /* match length or unmatched char (if dist == 0) */
--    unsigned lx = 0;    /* running index in l_buf */
-+    unsigned sx = 0;    /* running index in sym_buf */
-     unsigned code;      /* the code to send */
-     int extra;          /* number of extra bits to send */
- 
--    if (s->last_lit != 0) do {
--        dist = s->d_buf[lx];
--        lc = s->l_buf[lx++];
-+    if (s->sym_next != 0) do {
-+        dist = s->sym_buf[sx++] & 0xff;
-+        dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
-+        lc = s->sym_buf[sx++];
-         if (dist == 0) {
-             send_code(s, lc, ltree); /* send a literal byte */
-             Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-@@ -1100,11 +1079,10 @@ local void compress_block(s, ltree, dtree)
-             }
-         } /* literal or match pair ? */
- 
--        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
--        Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx,
--               "pendingBuf overflow");
-+        /* Check that the overlay between pending_buf and sym_buf is ok: */
-+        Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
- 
--    } while (lx < s->last_lit);
-+    } while (sx < s->sym_next);
- 
-     send_code(s, END_BLOCK, ltree);
- }
diff --git a/srcpkgs/zlib/patches/cc.patch b/srcpkgs/zlib/patches/cc.patch
new file mode 100644
index 000000000000..0136071eabe7
--- /dev/null
+++ b/srcpkgs/zlib/patches/cc.patch
@@ -0,0 +1,24 @@
+From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Mon, 28 Mar 2022 18:34:10 -0700
+Subject: [PATCH] Fix configure issue that discarded provided CC definition.
+
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 52ff4a04e..3fa3e8618 100755
+--- a/configure
++++ b/configure
+@@ -174,7 +174,10 @@ if test -z "$CC"; then
+   else
+     cc=${CROSS_PREFIX}cc
+   fi
++else
++  cc=${CC}
+ fi
++
+ cflags=${CFLAGS-"-O3"}
+ # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
+ case "$cc" in
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 0a3cd6a4a30a..6dbe30032202 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
 # Template file for 'zlib'
 pkgname=zlib
-version=1.2.11
-revision=5
+version=1.2.12
+revision=1
 bootstrap=yes
 build_style=configure
 configure_args="--prefix=/usr --shared"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
 homepage="http://www.zlib.net"
 distfiles="$homepage/$pkgname-$version.tar.gz"
-checksum=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+checksum=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
 
 zlib-devel_package() {
 	depends="zlib>=${version}_${revision}"

From 789a4a78213c5b1b3f1004b4347e4f2cfd418eda Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 30 Mar 2022 14:18:27 +0200
Subject: [PATCH 0772/1686] sbcl: update to 2.2.3.

---
 srcpkgs/sbcl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 7bcf793ec931..edd3cb36bf30 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -1,6 +1,6 @@
 # Template file for 'sbcl'
 pkgname=sbcl
-version=2.2.2
+version=2.2.3
 revision=1
 archs="i686 x86_64* armv7l aarch64 ppc64le*"
 hostmakedepends="iana-etc texinfo"
@@ -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=8790dbbe97711dce14bb823125ce5b185b0073cf2f3cbf37bdd1ad380e7950f6
+checksum=de7f49e1f7750fd2cd89111ef70641cc5471355f621b737392ac68aa95f37f9f
 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+=" 77b7cfd4be60b6efa9b4166100f5e451d764e3751c1f1365ee83b3a9f220d5c8"
+	checksum+=" 8745f9358b686819209e188a93fb8cf5b4227a3f623af20504a68d129a314256"
 	;;
 i686)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"

From 283c746680f65bde85293062ebc2107e914dd346 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 30 Mar 2022 14:30:49 +0200
Subject: [PATCH 0773/1686] python3-pipenv: update to 2022.3.28.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 4d0f0ec7e283..707476ccc36d 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.3.24
+version=2022.3.28
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=800198d430e724f899e6db319cc640d5fd6da2acdbc301ceb1a1f967e990428b
+checksum=4e7aae62dad7679ce81b54cc3451be19fb2c469e269335b36b14132fe5ceecb3
 conflicts="python-pipenv>=0"
 
 post_extract() {

From f20a81ff86251a0b58f034622d54c12f33c39f31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 11:07:26 -0400
Subject: [PATCH 0774/1686] unison: update to 2.52.0.

---
 srcpkgs/unison/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 67c424a3b8af..783573c120ea 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,14 +1,14 @@
 # Template file for 'unison'
 pkgname=unison
-version=2.51.4
-revision=2
+version=2.52.0
+revision=1
 hostmakedepends="ocaml"
 short_desc="File-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.cis.upenn.edu/~bcpierce/unison/"
 distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
-checksum=d1ecc7581aaf2ed0f3403d4960f468acd7b9f1d92838a17c96e6d1df79b802d5
+checksum=a11389971212915328fe69101c92737b17664595c4318ebcb8da367e5ba63540
 nocross="OCaml does not cross compile"
 
 do_build() {

From c25b4ecb650e033b2b85088284c8defafe520eff Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 27 Mar 2022 14:55:32 +0200
Subject: [PATCH 0775/1686] praat: update to 6.2.10

---
 srcpkgs/praat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index ac2777a445cc..142f0d2661ae 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,6 +1,6 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.2.09
+version=6.2.10
 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=3c38b8af267b152a3fda1af78fe8cc26a1717f70a886387e657c55746f666af1
+checksum=f6358b2c6a967afe89882720d503c74221b364c563e1e4316a2d73c9f0c22bcd
 
 # 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 704e8dc4d0b6a2c599a1719ae7786efdf056a0a4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 30 Mar 2022 18:18:45 +0200
Subject: [PATCH 0776/1686] sbcl: use clisp on i686.

---
 srcpkgs/sbcl/template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index edd3cb36bf30..b78c25202981 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -22,10 +22,6 @@ x86_64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
 	checksum+=" 8745f9358b686819209e188a93fb8cf5b4227a3f623af20504a68d129a314256"
 	;;
-i686)
-	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
-	checksum+=" 6bed7e31bb28e841da7bfc48c75adb8bef19e5e07d1d6f0fc7487f022c32f92c"
-	;;
 arm*)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"
 	checksum+=" a5fbf1d596a909a7719bc4a958f00e8537bf399fa051f83736baee950b21e56a"
@@ -34,7 +30,7 @@ aarch64)
 	distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.3.9-arm64-linux-binary.tar.bz2"
 	checksum+=" 14c8fc0f3a03416b5d23763156e2bb28b690fb665af1e6f6112201fd0ddcd512"
 	;;
-ppc*|*-musl)
+i686*|ppc*|*-musl)
 	# ecl bootstrap is broken since 2.2.0:
 	# https://build.voidlinux.org/builders/x86_64-musl_builder/builds/39694/steps/shell_3/logs/stdio
 	makedepends+=" clisp"

From 22fbc679fc820ea36ebc981d190c14695550f647 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Wed, 30 Mar 2022 13:01:35 -0500
Subject: [PATCH 0777/1686] consul-template: update to 0.28.0.

---
 srcpkgs/consul-template/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index 00cd77f34169..4faeaf1c9ae5 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -1,6 +1,6 @@
 # Template file for 'consul-template'
 pkgname=consul-template
-version=0.25.1
+version=0.28.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/consul-template"
@@ -10,4 +10,4 @@ maintainer="Noel Cower <ncower@nil.dev>"
 license="MPL-2.0"
 homepage="https://github.com/hashicorp/consul-template"
 distfiles="$homepage/archive/v$version.tar.gz"
-checksum=f8d214733961ef3333493ce912180c5c0311c87e4b1a116308f31283b6c77419
+checksum=61ce1b818ae9f555440a5a3a7a81590051c4871acfccd73001b4b087c66357e9

From 8801a042a0c2f8208f94509ebbbb303171d98431 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Tue, 29 Mar 2022 04:23:34 -0300
Subject: [PATCH 0778/1686] oil: update to 0.9.9

---
 srcpkgs/oil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oil/template b/srcpkgs/oil/template
index cf1cbccfefe5..7def1be36587 100644
--- a/srcpkgs/oil/template
+++ b/srcpkgs/oil/template
@@ -1,6 +1,6 @@
 # Template file for 'oil'
 pkgname=oil
-version=0.9.8
+version=0.9.9
 revision=1
 build_style=configure
 configure_args="--prefix=/usr $(vopt_with readline)"
@@ -11,7 +11,7 @@ maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.oilshell.org"
 distfiles="${homepage}/download/${pkgname}-${version}.tar.xz"
-checksum=3acaf17c9e5d17d027a60d6be878fe683d7de25f7d5fd621e2f219f91f9a1fc1
+checksum=6f6b4c4b9cf8a1e8e1dc2ff7bf39c85a11b871ddda9e9e51b9f7e1a0e46b2824
 register_shell="/usr/bin/osh"
 nocross="Build systems gets confused with host and cross toolchains/headers"
 nostrip=yes

From 9eba4120ccde3e636b500194e18bb13d7e775d69 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 28 Mar 2022 00:42:05 +0300
Subject: [PATCH 0779/1686] font-material-design-icons-ttf: merge with
 ttf-material-icons, rev bump

---
 srcpkgs/font-material-design-icons-ttf/template |  8 +++++++-
 srcpkgs/ttf-material-icons                      |  1 +
 srcpkgs/ttf-material-icons/template             | 16 ----------------
 3 files changed, 8 insertions(+), 17 deletions(-)
 create mode 120000 srcpkgs/ttf-material-icons
 delete mode 100644 srcpkgs/ttf-material-icons/template

diff --git a/srcpkgs/font-material-design-icons-ttf/template b/srcpkgs/font-material-design-icons-ttf/template
index fe3da363cc1e..d05b3c8a0a49 100644
--- a/srcpkgs/font-material-design-icons-ttf/template
+++ b/srcpkgs/font-material-design-icons-ttf/template
@@ -1,7 +1,7 @@
 # Template file for 'font-material-design-icons-ttf'
 pkgname=font-material-design-icons-ttf
 version=4.0.0
-revision=1
+revision=2
 wrksrc="material-design-icons-${version}"
 depends="font-util xbps-triggers"
 short_desc="Material Design icons by Google"
@@ -16,3 +16,9 @@ font_dirs="/usr/share/fonts/TTF"
 do_install() {
 	vinstall font/MaterialIcons-Regular.ttf 644 usr/share/fonts/TTF
 }
+
+ttf-material-icons_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
diff --git a/srcpkgs/ttf-material-icons b/srcpkgs/ttf-material-icons
new file mode 120000
index 000000000000..4d1e4bb1d94e
--- /dev/null
+++ b/srcpkgs/ttf-material-icons
@@ -0,0 +1 @@
+font-material-design-icons-ttf
\ No newline at end of file
diff --git a/srcpkgs/ttf-material-icons/template b/srcpkgs/ttf-material-icons/template
deleted file mode 100644
index b429c563c477..000000000000
--- a/srcpkgs/ttf-material-icons/template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'ttf-material-icons'
-pkgname=ttf-material-icons
-version=4.0.0
-revision=1
-wrksrc=material-design-icons-${version}
-short_desc="Material Design icons by Google"
-maintainer="Michael Carlberg <c@rlberg.se>"
-license=CC
-homepage=http://google.github.io/material-design-icons/
-distfiles=https://github.com/google/material-design-icons/archive/${version}.tar.gz
-checksum=b1b068d625d5e15d6ec0059209cec67bc4c46e39c4611b859d6f6680dbf23934
-
-do_install() {
-	vinstall font/MaterialIcons-Regular.ttf  644 usr/share/fonts/TTF
-	vlicense LICENSE
-}

From 5bd8350335507fa0c3ba66e1ff181ca4462fdad3 Mon Sep 17 00:00:00 2001
From: Bas Ploeger <5904333+basploeger@users.noreply.github.com>
Date: Thu, 24 Mar 2022 23:09:10 +0100
Subject: [PATCH 0780/1686] html-xml-utils: update to 8.3.

---
 srcpkgs/html-xml-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/html-xml-utils/template b/srcpkgs/html-xml-utils/template
index ff073e7a740e..81fda5d90a25 100644
--- a/srcpkgs/html-xml-utils/template
+++ b/srcpkgs/html-xml-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'html-xml-utils'
 pkgname=html-xml-utils
-version=8.0
+version=8.3
 revision=1
 build_style=gnu-configure
 makedepends="libidn-devel"
@@ -9,4 +9,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="W3C"
 homepage="https://www.w3.org/Tools/HTML-XML-utils/README"
 distfiles="https://www.w3.org/Tools/HTML-XML-utils/${pkgname}-${version}.tar.gz"
-checksum=749059906c331c2c7fbaceee02466245a237b91bd408dff8f396d0734a060ae2
+checksum=a50c4d16dad660ad6792ef53bc77efa9d5729797623771a3fce52d8e23d3d08c

From 7d0536208bc4c4ddde671752c04ae4f29e2acc64 Mon Sep 17 00:00:00 2001
From: Vasteel <48246459+Vast-eel@users.noreply.github.com>
Date: Wed, 30 Mar 2022 12:56:17 +0200
Subject: [PATCH 0781/1686] font-sarasa-gothic: update to 0.36.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 534a4bf861fc..167c56b75ce8 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.34.3
+version=0.36.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=6938707af097f5bf899f570c886063860973193db9524468da0c27af4a36ce94
+checksum=cdc65aed713b5a991919755c712e0961e4388a7c3c636eed8e06b93bedf9a6f8
 
 font_dirs="/usr/share/fonts/TTF"
 

From b428b2a4621b664a4ca20a40a4abb98dc0558da1 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 30 Mar 2022 16:39:24 -0500
Subject: [PATCH 0782/1686] fortune-mod: don't install offensive fortunes

Closes #36417.
---
 srcpkgs/fortune-mod/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fortune-mod/template b/srcpkgs/fortune-mod/template
index 59f0aa805009..e08c7d162d7f 100644
--- a/srcpkgs/fortune-mod/template
+++ b/srcpkgs/fortune-mod/template
@@ -1,7 +1,7 @@
 # Template file for 'fortune-mod'
 pkgname=fortune-mod
 version=1.99.1
-revision=6
+revision=7
 hostmakedepends="recode"
 makedepends="recode-devel"
 short_desc="Implementation of the BSDGames 'fortune' program"
@@ -11,6 +11,9 @@ homepage="http://www.redellipse.net/code/fortune"
 distfiles="${DEBIAN_SITE}/main/f/fortune-mod/${pkgname}_${version}.orig.tar.gz"
 checksum=fc51aee1f73c936c885f4e0f8b6b48f4f68103e3896eaddc6a45d2b71e14eace
 
+desc_option_offensive="Enable offensive fortunes"
+build_options="offensive"
+
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" fortune-mod"
 	_strfile="STRFILE=/usr/bin/strfile"
@@ -30,7 +33,7 @@ do_build() {
 }
 do_install() {
 	make prefix=${DESTDIR} FORTDIR=${DESTDIR}/usr/bin \
-		COOKIEDIR=$DESTDIR/usr/share/fortunes \
+		COOKIEDIR=$DESTDIR/usr/share/fortunes OFFENSIVE=$(vopt_if offensive 1 0) \
 		install
 	vlicense LICENSE
 }

From 470241ac32b364663f0992691bfb4b5f5c27a312 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:09:04 -0400
Subject: [PATCH 0783/1686] python3-Jinja2: update to 3.1.1.

---
 srcpkgs/python3-Jinja2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index caea80866dcc..d43e75d50b60 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-version=3.0.3
+version=3.1.1
 revision=1
 wrksrc="Jinja2-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
+checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
 
 post_install() {
 	vlicense LICENSE.rst

From d9411abe2c0fb7c48bbf4d186a4f702fa16a5db7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:09:19 -0400
Subject: [PATCH 0784/1686] python3-cppy: update to 1.2.1.

---
 srcpkgs/python3-cppy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-cppy/template b/srcpkgs/python3-cppy/template
index 3afd8399c77a..d94c660c25cc 100644
--- a/srcpkgs/python3-cppy/template
+++ b/srcpkgs/python3-cppy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-cppy'
 pkgname=python3-cppy
-version=1.2.0
+version=1.2.1
 revision=1
 wrksrc="cppy-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://cppy.readthedocs.io"
 changelog="https://raw.githubusercontent.com/nucleic/cppy/master/releasenotes.rst"
 distfiles="${PYPI_SITE}/c/cppy/cppy-${version}.tar.gz"
-checksum=95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc
+checksum=83b43bf17b1085ac15c5debdb42154f138b928234b21447358981f69d0d6fe1b
 
 post_install() {
 	vlicense LICENSE

From a4717861f7d3e10385990110413305ddcc5321aa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:11:12 -0400
Subject: [PATCH 0785/1686] python3-ipython: update to 8.2.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 07bdc201821d..dfaae66b583d 100644
--- a/srcpkgs/python3-ipython/template
+++ b/srcpkgs/python3-ipython/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ipython'
 pkgname=python3-ipython
-version=8.1.1
+version=8.2.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=8138762243c9b3a3ffcf70b37151a2a35c23d3a29f9743878c33624f4207be3d
+checksum=70e5eb132cac594a34b5f799bd252589009905f05104728aea6a403ec2519dc1
 conflicts="python-ipython<=5.8.0_2"
 
 do_check() {

From d2671c1c3d50af8fafa484c3186b44c3d2ee4b8d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:19:08 -0400
Subject: [PATCH 0786/1686] python3-hypothesis: update to 6.40.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 15b9d0f9b0cf..df2addcb45d0 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.39.0
+version=6.40.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=09f2077d400640a936392edbf068f5dfe182b48f70ab3c8592d8274b4ee13e36
+checksum=e68589666b903461e7437ea49043a7bd09a6e2cfd1cc32970b4ee19ffe2ed434
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From f4e8411b6a6052bf3e1d34cc2e15a35ea2a4a438 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:19:42 -0400
Subject: [PATCH 0787/1686] python3-quart: update to 0.17.0.

---
 srcpkgs/python3-quart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-quart/template b/srcpkgs/python3-quart/template
index 5e3114877ce4..1033468c7c82 100644
--- a/srcpkgs/python3-quart/template
+++ b/srcpkgs/python3-quart/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-quart'
 pkgname=python3-quart
-version=0.16.3
+version=0.17.0
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-pep517
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://gitlab.com/pgjones/quart"
 changelog="https://gitlab.com/pgjones/quart/-/blob/master/CHANGELOG.rst"
 distfiles="${homepage}/-/archive/${version}/${pkgname#*-}-${version}.tar.gz"
-checksum=84eabcb0da8b84eebcec31c27c59396425c6727ea6f7e524e8f1afc1aa161bb8
+checksum=1f879256b09daa4f7e9a141e90746f11103ce1f3a386f9480709e1d982768a9a
 
 do_check() {
 	# Tests require dist-info on the package, which is only in the wheel.

From 913835a81a9d5275aaec9c8080ff97a33794a2f4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:19:55 -0400
Subject: [PATCH 0788/1686] python3-tifffile: update to 2022.3.25.

---
 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 00d4c6c3f391..65b0d119adef 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.3.16
+version=2022.3.25
 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=2e51c805be3a77f472c0cca3f0c13e60eb110fbfc305a20e278dad3d4e4fe4bf
+checksum=620c68f3eeb2b1923e1b3a8bf8a8b7f79498bcd9cd34051ad567c44f0a404353
 # Tests require unpackaged fsspec
 make_check=no
 

From e031028c6c650f4eafcc15e8ef58f89fa2a3c1f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 30 Mar 2022 21:22:51 -0400
Subject: [PATCH 0789/1686] vkQuake: update to 1.13.0.

---
 srcpkgs/vkQuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template
index 6ae764cb6298..8c0174565c73 100644
--- a/srcpkgs/vkQuake/template
+++ b/srcpkgs/vkQuake/template
@@ -1,6 +1,6 @@
 # Template file for 'vkQuake'
 pkgname=vkQuake
-version=1.12.2
+version=1.13.0
 revision=1
 build_wrksrc="Quake"
 build_style=gnu-makefile
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/Novum/vkQuake"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=6ce6d44dbc13d8d9b689efa32b19b2765257f3b859becf34cb2e894751ea046e
+checksum=baeab4fbea17bb41064b56a7e6e745f2856634c88d57ad86de97990399c24b3b
 
 do_install() {
 	vbin vkquake

From d2c46ca9e7c308ed230a2c2f70147768609410be Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Tue, 29 Mar 2022 23:59:51 +0530
Subject: [PATCH 0790/1686] wireplumber: add runit service

ahesford: add log sub-service, redirect stderr in run script
Co-authored-by: Andrew J. Hesford <ajh@sideband.org>

Closes: #36416 [via git-merge-pr]
---
 srcpkgs/wireplumber/files/wireplumber/control/t |  2 ++
 srcpkgs/wireplumber/files/wireplumber/log/run   |  3 +++
 srcpkgs/wireplumber/files/wireplumber/run       | 10 ++++++++++
 srcpkgs/wireplumber/template                    |  3 ++-
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/wireplumber/files/wireplumber/control/t
 create mode 100644 srcpkgs/wireplumber/files/wireplumber/log/run
 create mode 100644 srcpkgs/wireplumber/files/wireplumber/run

diff --git a/srcpkgs/wireplumber/files/wireplumber/control/t b/srcpkgs/wireplumber/files/wireplumber/control/t
new file mode 100755
index 000000000000..a095b7bc777a
--- /dev/null
+++ b/srcpkgs/wireplumber/files/wireplumber/control/t
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ -r supervise/pid ] && kill -TERM -$(cat supervise/pid)
diff --git a/srcpkgs/wireplumber/files/wireplumber/log/run b/srcpkgs/wireplumber/files/wireplumber/log/run
new file mode 100644
index 000000000000..4dd58318870e
--- /dev/null
+++ b/srcpkgs/wireplumber/files/wireplumber/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec logger -t wireplumber -p daemon.info
diff --git a/srcpkgs/wireplumber/files/wireplumber/run b/srcpkgs/wireplumber/files/wireplumber/run
new file mode 100644
index 000000000000..ae0cf99e200b
--- /dev/null
+++ b/srcpkgs/wireplumber/files/wireplumber/run
@@ -0,0 +1,10 @@
+#!/bin/sh
+# this service is experimental and most setups should start pipewire and wireplumber as a user,
+# for further information, please refer to the handbook
+
+sv check dbus >/dev/null 2>&1 || exit 1
+
+exec 2>&1
+
+export HOME=/var/run/pipewire
+exec chpst -u _pipewire:_pipewire:audio:video -P dbus-run-session wireplumber
diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index e94c35b3eea5..dadbf62647fb 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.8
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -18,6 +18,7 @@ checksum=a7a84c21230c339a905704a9495dda10a4dec41a96bc115a9b33d24310a3f605
 
 post_install() {
 	vlicense LICENSE
+	vsv wireplumber
 }
 
 wireplumber-devel_package() {

From 4ae389fbd09b1840ba372e3d21653e0ac652c9a6 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 28 Mar 2022 19:49:52 +0530
Subject: [PATCH 0791/1686] mongoose: update to 7.6

Closes: #36395 [via git-merge-pr]
---
 srcpkgs/mongoose/patches/add-makefile.patch | 50 -----------------
 srcpkgs/mongoose/patches/fix-makefile.patch | 59 +++++++++++++++++++++
 srcpkgs/mongoose/patches/fix-tests.patch    | 17 ++++++
 srcpkgs/mongoose/template                   | 40 +++++++++++---
 4 files changed, 108 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/mongoose/patches/add-makefile.patch
 create mode 100644 srcpkgs/mongoose/patches/fix-makefile.patch
 create mode 100644 srcpkgs/mongoose/patches/fix-tests.patch

diff --git a/srcpkgs/mongoose/patches/add-makefile.patch b/srcpkgs/mongoose/patches/add-makefile.patch
deleted file mode 100644
index fd0b21095472..000000000000
--- a/srcpkgs/mongoose/patches/add-makefile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,47 @@
-+PROG		= mongoose
-+LIB         = lib$(PROG).so.0
-+
-+ifndef PREFIX
-+  PREFIX=/usr/local
-+endif
-+
-+ifndef DOCDIR
-+	DOCDIR=$(PREFIX)/share/$(PROG)/doc
-+endif
-+
-+CPPFLAGS+=-DMONGOOSE_ENABLE_THREADS -DMG_ENABLE_SSL
-+CFLAGS+=-fPIC -c -Wall
-+LDFLAGS+=-shared -lssl -pthread -lcrypto
-+
-+SRCS=mongoose.c
-+OBJS=mongoose.o
-+INCLUDE=.
-+
-+all: $(LIB)
-+
-+$(LIB): $(OBJS)
-+	$(CC) $(OBJS) $(LDFLAGS) -o $(LIB)
-+
-+$(OBJS): $(SRCS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDE) $(SRCS) -o $(OBJS)
-+
-+install: 
-+	install -d $(DESTDIR)$(PREFIX)/include
-+	install -m644 mongoose.h $(DESTDIR)$(PREFIX)/include
-+	install -d $(DESTDIR)$(PREFIX)/lib
-+	ln -sf $(LIB) $(LIB).0; cp -a $(LIB).0 $(DESTDIR)$(PREFIX)/lib
-+	ln -sf $(LIB) libmongoose.so; cp -a libmongoose.so $(DESTDIR)$(PREFIX)/lib
-+	install -m755 $(LIB) $(DESTDIR)$(PREFIX)/lib
-+	install -dm755 $(DESTDIR)$(DOCDIR)
-+	cp -a examples $(DESTDIR)$(DOCDIR)
-+	cp -a docs/* $(DESTDIR)$(DOCDIR)/
-+
-+	
-+test:
-+	$(MAKE) -C test/
-+clean:
-+	rm -f $(OBJS) $(LIB)
-+	$(MAKE) -C test/ clean
-+
-+.PHONY: clean test all
-+
diff --git a/srcpkgs/mongoose/patches/fix-makefile.patch b/srcpkgs/mongoose/patches/fix-makefile.patch
new file mode 100644
index 000000000000..d829ea8adc8c
--- /dev/null
+++ b/srcpkgs/mongoose/patches/fix-makefile.patch
@@ -0,0 +1,59 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,5 +5,5 @@ SRCS = mongoose.c test/unit_test.c test/packed_fs.c
+ OPTS ?= -O3 -g3
+ INCS ?= -Isrc -I.
+-CFLAGS ?= $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) $(EXTRA)
++CFLAGS := $(OPTS) $(WARN) $(INCS) $(DEFS) $(TFLAGS) $(CFLAGS)
+ SSL ?= MBEDTLS
+ CWD ?= $(realpath $(CURDIR))
+@@ -10,6 +10,9 @@ CWD ?= $(realpath $(CURDIR))
+ DOCKER ?= docker run --rm -e Tmp=. -e WINEDEBUG=-all -v $(CWD):$(CWD) -w $(CWD)
+ VCFLAGS = /nologo /W3 /O2 /I. $(DEFS) $(TFLAGS)
+ IPV6 ?= 1
++ifneq "$(NO_SANITIZE)" "1"
++SANITIZE = -fsanitize=address,undefined
++endif
+ ASAN_OPTIONS ?=
+ EXAMPLES := $(wildcard examples/*)
+ PREFIX ?= /usr/local
+@@ -19,12 +22,12 @@ VERSION ?= $(shell cut -d'"' -f2 src/version.h)
+ ifeq "$(SSL)" "MBEDTLS"
+ MBEDTLS ?= /usr
+ CFLAGS  += -DMG_ENABLE_MBEDTLS=1 -I$(MBEDTLS)/include -I/usr/include
+-LDFLAGS ?= -L$(MBEDTLS)/lib -lmbedtls -lmbedcrypto -lmbedx509
++LDFLAGS += -L$(MBEDTLS)/lib -lmbedtls -lmbedcrypto -lmbedx509
+ endif
+ ifeq "$(SSL)" "OPENSSL"
+ OPENSSL ?= /usr
+ CFLAGS  += -DMG_ENABLE_OPENSSL=1 -I$(OPENSSL)/include
+-LDFLAGS ?= -L$(OPENSSL)/lib -lssl -lcrypto
++LDFLAGS += -L$(OPENSSL)/lib -lssl -lcrypto
+ endif
+ 
+ all: mg_prefix unamalgamated unpacked test test++ arm examples vc98 vc2017 mingw mingw++ linux linux++ fuzz
+@@ -59,7 +62,7 @@ fuzz: fuzzer
+ 	$(RUN) ./fuzzer
+ 
+ # make CC=/usr/local/opt/llvm\@8/bin/clang ASAN_OPTIONS=detect_leaks=1
+-test: CFLAGS += -DMG_ENABLE_IPV6=$(IPV6) -fsanitize=address,undefined
++test: CFLAGS += -DMG_ENABLE_IPV6=$(IPV6) $(SANITIZE)
+ test: mongoose.h  Makefile $(SRCS)
+ 	$(CC) $(SRCS) $(CFLAGS) -coverage $(LDFLAGS) -g -o unit_test
+ 	ASAN_OPTIONS=$(ASAN_OPTIONS) $(RUN) ./unit_test
+@@ -108,10 +111,12 @@ linux++: CC = g++
+ linux++: WARN += -Wno-missing-field-initializers
+ linux++: linux
+ 
+-linux-libs: CFLAGS += -fPIC
+-linux-libs: mongoose.o
+-	$(CC) mongoose.o $(LDFLAGS) -shared -o libmongoose.so.$(VERSION)
++.PHONY: linux-libs
++linux-libs: libmongoose.a libmongoose.so.$(VERSION)
++libmongoose.a: mongoose.o
+ 	$(AR) rcs libmongoose.a mongoose.o
++libmongoose.so.$(VERSION): mongoose.o
++	$(CC) mongoose.o $(LDFLAGS) -shared -o libmongoose.so.$(VERSION)
+ 
+ install: linux-libs
+ 	install -Dm644 libmongoose.a libmongoose.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib
diff --git a/srcpkgs/mongoose/patches/fix-tests.patch b/srcpkgs/mongoose/patches/fix-tests.patch
new file mode 100644
index 000000000000..8b25527492d5
--- /dev/null
+++ b/srcpkgs/mongoose/patches/fix-tests.patch
@@ -0,0 +1,17 @@
+Skip tests that want to connect to the internet
+
+--- a/test/unit_test.c
++++ b/test/unit_test.c
+@@ -1680,11 +1562,9 @@ int main(void) {
+   test_ws();
+   test_ws_fragmentation();
+   test_http_server();
+-  test_http_client();
+   test_http_no_content_length();
+   test_http_pipeline();
+   test_http_range();
+-  test_mqtt();
+   printf("SUCCESS. Total tests: %d\n", s_num_tests);
+   return EXIT_SUCCESS;
+ }
+
diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index eddadc647333..a81658710d7b 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,22 +1,44 @@
 # Template file for 'mongoose'
 pkgname=mongoose
-version=6.18
-revision=4
+version=7.6
+revision=1
 build_style=gnu-makefile
-make_use_env=compliant
+make_use_env=yes
+make_check_target=test
+make_build_target=linux-libs
 makedepends="openssl-devel"
-short_desc="Easy to use Web server"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="openssl-devel"
+short_desc="Embedded HTTP/WebSocket/MQTT library for C/C++"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
-homepage="https://cesanta.com/"
+homepage="https://mongoose.ws/"
 distfiles="https://github.com/cesanta/mongoose/archive/${version}.tar.gz"
-checksum=f5c10346abc9c72f7cac7885d853ca064fb09aad57580433941a8fd7a3543769
+checksum=1ef09d971b6de1a6317c109980d6fb5a9c19b39efef2506d6b76869644b3dafa
+
+# -Wno-error=unused-function: patched tests leave some functions unused
+# -Wno-error=sign-conversion: GCC falsely flags musl FD_{SET,ISSET,CLR}
+CFLAGS="-fPIC -Wno-error=sign-conversion -Wno-error=unused-function"
+
+export SSL=OPENSSL
+
+# libsanitizer-devel is currenly not available on musl
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	make_check_args+=" NO_SANITIZE=1"
+else
+	checkdepends+=" libsanitizer-devel"
+fi
+
+# GitHub CI runner doesn't support IPv6, causing tests to fail
+if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
+	make_check_args+=" IPV6=0"
+fi
 
 mongoose-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove "usr/lib/*.a"
 		vmove "usr/lib/*.so"
 	}
 }
@@ -24,6 +46,8 @@ mongoose-devel_package() {
 mongoose-doc_package() {
 	short_desc+=" - documentation"
 	pkg_install() {
-		vmove usr/share
+		vmkdir "usr/share/${sourcepkg}/doc"
+		vcopy examples "usr/share/${sourcepkg}/doc"
+		vcopy "docs/*" "usr/share/${sourcepkg}/doc"
 	}
 }

From 5482c0476f4062afbe436ca9fecb1aa2eedfb8a3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 31 Mar 2022 02:59:29 +0200
Subject: [PATCH 0792/1686] qbittorrent: update to 4.4.2.

---
 srcpkgs/qbittorrent/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index b7c236909ae5..b80695e80958 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,6 +1,6 @@
 # Template file for 'qbittorrent'
 pkgname=qbittorrent
-version=4.4.1
+version=4.4.2
 revision=1
 create_wrksrc=yes
 build_style=gnu-configure
@@ -16,7 +16,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.qbittorrent.org/"
 changelog="https://www.qbittorrent.org/news.php"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=1386f000ce1d791469c3ea03e3951ca25f67f534e66896592bd12357dda9a8ec
+checksum=efa580924e96605bae916b9a8ae1f3fce82a5130647ae41d74d689761262463d
 
 do_extract() {
 	local n=${pkgname}-${version}

From 651e7a06fa587bf84a611655ef02f42563aacf40 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Wed, 23 Mar 2022 13:45:35 +1100
Subject: [PATCH 0793/1686] iwd: update to 1.26.

---
 srcpkgs/iwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index c03b430976ed..66f55599c5e0 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,6 +1,6 @@
 # Template file for 'iwd'
 pkgname=iwd
-version=1.24
+version=1.26
 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=61b5e48380cd3a6d0529f725eb6974157f1410af165f5d266b87add0bf395224
+checksum=0ff4541c2b7f14ec010c3cbd1f02350f1b58cb0c103412db22550e90d8040d6b
 make_dirs="/var/lib/iwd 0600 root root
  /var/lib/ead 0600 root root
  /etc/iwd 755 root root"

From 3b67c089f69a6fb9671bb4cd34983569fbebeebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 31 Mar 2022 09:43:16 -0300
Subject: [PATCH 0794/1686] doxygen: update to 1.9.3.

---
 ...-Fix-memory-corruption-in-TextStream.patch | 40 -------------------
 srcpkgs/doxygen/template                      |  4 +-
 2 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch

diff --git a/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch b/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch
deleted file mode 100644
index 80c7ff16d17e..000000000000
--- a/srcpkgs/doxygen/patches/0001-Fix-memory-corruption-in-TextStream.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-upstream PR: https://github.com/doxygen/doxygen/pull/8739
-
-What was happening is that the TextStream object is reused for multiple
-different files. Therefore, when one calls setStream(nullptr) or
-setFile(nullptr), m_f or m_s will, respectively, still contain a pointer
-to the previous member, which is used when one calls setFile() or
-setStream() again, since these methods will call flush().
-
-For example, a program doing
-
-   s.setFile(f1);
-   s.setStream(nullptr);
-   fclose(f1);
-   s.setFile(f2);
-
-will call fwrite(f1, ...). This pattern can be observed in many parts of
-Doxygen, so fixing it in TextStream itself by always zeroing the other
-pointer is the simplest fix.
-
-diff --git a/src/textstream.h b/src/textstream.h
-index 161ce7fe..38027ec0 100644
---- a/src/textstream.h
-+++ b/src/textstream.h
-@@ -67,11 +67,13 @@ class TextStream final
-     {
-       flush();
-       m_s = s;
-+      m_f = nullptr;
-     }
- 
-     void setFile(FILE *f)
-     {
-       flush();
-+      m_s = nullptr;
-       m_f = f;
-     }
- 
--- 
-2.33.0
-
diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index 8f5b986ceaf4..946ceeebcc11 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'doxygen'
 pkgname=doxygen
-version=1.9.2
+version=1.9.3
 revision=1
 build_style=cmake
 configure_args="-DCMAKE_BUILD_TYPE=None"
@@ -12,7 +12,7 @@ license="GPL-2.0-only"
 homepage="http://www.doxygen.org/"
 changelog="https://www.doxygen.nl/manual/changelog.html"
 distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz"
-checksum=060f254bcef48673cc7ccf542736b7455b67c110b30fdaa33512a5b09bbecee5
+checksum=f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0
 
 build_options="wizard"
 desc_option_wizard="build Qt5 GUI configuration tool, doxywizard"

From b85a05b00de5d2061db0e88854876d0030cca43a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 31 Mar 2022 09:43:28 -0300
Subject: [PATCH 0795/1686] libvarlink: update to 23.

---
 srcpkgs/libvarlink/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvarlink/template b/srcpkgs/libvarlink/template
index 0633adbb17b4..43eb3ab89812 100644
--- a/srcpkgs/libvarlink/template
+++ b/srcpkgs/libvarlink/template
@@ -1,6 +1,6 @@
 # Template file for 'libvarlink'
 pkgname=libvarlink
-version=22
+version=23
 revision=1
 build_style=meson
 short_desc="C implementation of the Varlink protocol and command line tool"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="Apache-2.0"
 homepage="https://varlink.org/"
 distfiles="https://github.com/varlink/libvarlink/archive/refs/tags/${version}.tar.gz"
-checksum=932c0d7c3d2d8acdf5878d8fd8006887c5855189688d19eb09125682740b99bb
+checksum=a5575e070e446e7c4486d424393950e6cb7a3b376ee20d517b0c13a876659a8d
 
 libvarlink-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From be78bff36442f16f10b5a4f166d20690a9aef7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 31 Mar 2022 09:43:31 -0300
Subject: [PATCH 0796/1686] kstars: update to 3.5.8.

---
 srcpkgs/kstars/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kstars/template b/srcpkgs/kstars/template
index 11ab05b13b06..0b14040aff2e 100644
--- a/srcpkgs/kstars/template
+++ b/srcpkgs/kstars/template
@@ -1,6 +1,6 @@
 # Template file for 'kstars'
 pkgname=kstars
-version=3.5.5
+version=3.5.8
 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=703df56050672af10fc8142296ceaa27134a6a00e8222f3f6677f18ff1ac6b43
+checksum=660d902837b7abf3810d6e24f72fd84f0444a29bd7d43e1896b19fece1c88c3f

From 29d8ed6e20570db507c40a0e7ead1d6888549a2e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 31 Mar 2022 14:21:35 +0200
Subject: [PATCH 0797/1686] libX11: update to 1.7.4.

---
 srcpkgs/libX11/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 83d21c86ad17..53bd34be6e08 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,7 +1,7 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.7.3.1
-revision=2
+version=1.7.4
+revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
  --enable-static --enable-malloc0returnsnull"
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
-checksum=2ffd417266fb875028fdc0ef349694f63dbcd76d0b0cfacfb52e6151f4b60989
+checksum=0e7d48bfa0b0ee5705d14fe140cf4310744ed131f0a6241b7cf03db06000fe51
 
 do_configure() {
 	./configure ${configure_args}

From 700abf1ce4feec05d6ec41df314016577017487a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 31 Mar 2022 10:12:26 -0400
Subject: [PATCH 0798/1686] Revert "python3-Jinja2: update to 3.1.1."

python3-jupyter_nbconvert-6.0.7 is incompatible with Jinja >= 3.1.0, so
hold back until that package can be updated.

This reverts commit ffcb1e6fb8349a0d15466f45487407708e0373f5.
---
 srcpkgs/python3-Jinja2/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index d43e75d50b60..6a4c28214cca 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,7 +1,8 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-version=3.1.1
-revision=1
+reverts="3.1.1_1"
+version=3.0.3
+revision=2
 wrksrc="Jinja2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +14,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
+checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
 
 post_install() {
 	vlicense LICENSE.rst

From 1f752268f523ceaab143115e0846b137406aab92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 19 Mar 2022 21:55:20 -0300
Subject: [PATCH 0799/1686] python3-sympy: update to 1.10.1.

Also fix integer_nthroot(2, 10**10) in 32 bit, reported upstream.
---
 .../patches/fix_integer_nthroot.patch         | 26 +++++++++++++++++++
 srcpkgs/python3-sympy/template                |  4 +--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch

diff --git a/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch b/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch
new file mode 100644
index 000000000000..0f4860a6c9e1
--- /dev/null
+++ b/srcpkgs/python3-sympy/patches/fix_integer_nthroot.patch
@@ -0,0 +1,26 @@
+Fix integer_nthroot(2, 10**10) in 32 bit.
+
+See: https://github.com/sympy/sympy/issues/18374#issuecomment-1081196879
+
+diff --git a/sympy/core/power.py b/sympy/core/power.py
+index 59ab7c53a4..ae3ee25c93 100644
+--- a/sympy/core/power.py
++++ b/sympy/core/power.py
+@@ -21,6 +21,8 @@
+
+ from mpmath.libmp import sqrtrem as mpmath_sqrtrem
+
++from ctypes import c_ulong
++ULONG_MAX = c_ulong(-1).value
+
+
+ def isqrt(n):
+@@ -74,7 +76,7 @@ def integer_nthroot(y, n):
+         raise ValueError("y must be nonnegative")
+     if n < 1:
+         raise ValueError("n must be positive")
+-    if HAS_GMPY and n < 2**63:
++    if HAS_GMPY and n <= ULONG_MAX:
+         # Currently it works only for n < 2**63, else it produces TypeError
+         # sympy issue: https://github.com/sympy/sympy/issues/18374
+         # gmpy2 issue: https://github.com/aleaxit/gmpy/issues/257
diff --git a/srcpkgs/python3-sympy/template b/srcpkgs/python3-sympy/template
index 807f0db5f1a2..3bb4df3bffdf 100644
--- a/srcpkgs/python3-sympy/template
+++ b/srcpkgs/python3-sympy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-sympy'
 pkgname=python3-sympy
-version=1.9
+version=1.10.1
 revision=1
 wrksrc="sympy-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://sympy.org/"
 distfiles="${PYPI_SITE}/s/sympy/sympy-${version}.tar.gz"
-checksum=c7a880e229df96759f955d4f3970d4cabce79f60f5b18830c08b90ce77cd5fdc
+checksum=5939eeffdf9e152172601463626c022a2c27e75cf6278de8d401d50c9d58787b
 
 post_install() {
 	vman doc/man/isympy.1

From 899939937c76f7084335ead47b63c7b112f10bb7 Mon Sep 17 00:00:00 2001
From: Petr Cizmar <xgt0322@xpc.ovh>
Date: Thu, 31 Mar 2022 16:40:10 +0200
Subject: [PATCH 0800/1686] New package: ctzcls-cups-1.5

---
 srcpkgs/ctzcls-cups/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/ctzcls-cups/template

diff --git a/srcpkgs/ctzcls-cups/template b/srcpkgs/ctzcls-cups/template
new file mode 100644
index 000000000000..38572c0fcbff
--- /dev/null
+++ b/srcpkgs/ctzcls-cups/template
@@ -0,0 +1,21 @@
+# Template file for 'ctzcls-cups'
+pkgname=ctzcls-cups
+version=1.5
+revision=1
+create_wrksrc=yes
+makedepends="cups-devel"
+short_desc="Citizen Sticker Printers driver for CUPS"
+maintainer="Petr Cizmar <xxb0322@xpc.ovh>"
+license="GPL-2.0-or-later"
+homepage="https://www.citizen-systems.co.jp/en/printer/download/driver-cups-source/"
+distfiles="https://www.citizen-systems.co.jp/en/printer/download/driver-cups-source/cups-ctzcls.tar.bz2"
+checksum=d3fe19aa253044c383df3a3869c9dac88b0ced374fe42eb24aabfe6a1ff72ff4
+
+do_build() {
+	$CC $CFLAGS -fPIC -o rastertocls rastertocls.c -lcupsimage -lcups $LDFLAGS
+}
+
+do_install() {
+	vinstall ctzcls.ppd 644 /usr/share/cups/model/
+	vinstall rastertocls 755 /usr/lib/cups/filter/
+}

From 6ade01013ba7ccc60c172b697138b5b027b4c783 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 20:44:27 +0200
Subject: [PATCH 0801/1686] meson: patch gtk-update-icon-cache detection

---
 ...me-fallback-to-gtk-update-icon-cache.patch | 26 +++++++++++++++++++
 srcpkgs/meson/template                        |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch

diff --git a/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
new file mode 100644
index 000000000000..56a3f7cf3410
--- /dev/null
+++ b/srcpkgs/meson/patches/gnome-fallback-to-gtk-update-icon-cache.patch
@@ -0,0 +1,26 @@
+From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Wed, 23 Mar 2022 22:15:11 +0100
+Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache
+
+Commit a0cade8f introduced a typo and wrongly check for
+gtk4-update-icon-cache twice.
+If gtk4-update-icon-cache (gtk4) is not found, look for
+gtk-update-icon-cache (gtk3) instead.
+---
+ mesonbuild/modules/gnome.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index 673a781a41d..501be9ae4da 100644
+--- a/mesonbuild/modules/gnome.py
++++ b/mesonbuild/modules/gnome.py
+@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: '
+             prog = state.find_program('gtk4-update-icon-cache', required=False)
+             found = isinstance(prog, build.Executable) or prog.found()
+             if not found:
+-                prog = state.find_program('gtk4-update-icon-cache')
++                prog = state.find_program('gtk-update-icon-cache')
+             icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
+             script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir])
+             script.skip_if_destdir = True
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index 2f9ccaaa4691..adfa2d52f7ab 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
 version=0.61.4
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"

From a4a5ee77d2b470d28c7ee63001c2b1a362d43a36 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 31 Mar 2022 06:11:14 +0200
Subject: [PATCH 0802/1686] New package: helix-22.03

---
 srcpkgs/helix/files/hx                        |   2 +
 ...g-the-format-ident-Rust-feature-1881.patch | 104 ++++++++++++++++++
 srcpkgs/helix/template                        |  32 ++++++
 3 files changed, 138 insertions(+)
 create mode 100644 srcpkgs/helix/files/hx
 create mode 100644 srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch
 create mode 100644 srcpkgs/helix/template

diff --git a/srcpkgs/helix/files/hx b/srcpkgs/helix/files/hx
new file mode 100644
index 000000000000..a43e49fadc5b
--- /dev/null
+++ b/srcpkgs/helix/files/hx
@@ -0,0 +1,2 @@
+#!/bin/sh
+HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/hx "$@"
diff --git a/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch b/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch
new file mode 100644
index 000000000000..73eafa91cc1b
--- /dev/null
+++ b/srcpkgs/helix/patches/0001-Avoid-using-the-format-ident-Rust-feature-1881.patch
@@ -0,0 +1,104 @@
+From f2dd3d446914ec0953cd7e056d430fc3b959e75d Mon Sep 17 00:00:00 2001
+From: Marcin Puc <tranzystorek.io@protonmail.com>
+Date: Wed, 30 Mar 2022 02:08:30 +0200
+Subject: [PATCH] Avoid using the format ident Rust feature (#1881)
+
+---
+ helix-loader/src/grammar.rs      | 14 +++++++++-----
+ helix-term/src/commands/typed.rs |  4 ++--
+ helix-term/src/health.rs         |  9 +++++----
+ 3 files changed, 16 insertions(+), 11 deletions(-)
+
+diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
+index 299a06bf..f0c5ea28 100644
+--- a/helix-loader/src/grammar.rs
++++ b/helix-loader/src/grammar.rs
+@@ -63,12 +63,12 @@ pub fn get_language(name: &str) -> Result<Language> {
+     library_path.set_extension(DYLIB_EXTENSION);
+ 
+     let library = unsafe { Library::new(&library_path) }
+-        .with_context(|| format!("Error opening dynamic library {library_path:?}"))?;
++        .with_context(|| format!("Error opening dynamic library {:?}", library_path))?;
+     let language_fn_name = format!("tree_sitter_{}", name.replace('-', "_"));
+     let language = unsafe {
+         let language_fn: Symbol<unsafe extern "C" fn() -> Language> = library
+             .get(language_fn_name.as_bytes())
+-            .with_context(|| format!("Failed to load symbol {language_fn_name}"))?;
++            .with_context(|| format!("Failed to load symbol {}", language_fn_name))?;
+         language_fn()
+     };
+     std::mem::forget(library);
+@@ -133,7 +133,7 @@ where
+     // TODO: print all failures instead of the first one found.
+     rx.iter()
+         .find(|result| result.is_err())
+-        .map(|err| err.with_context(|| format!("Failed to {action} some grammar(s)")))
++        .map(|err| err.with_context(|| format!("Failed to {} some grammar(s)", action)))
+         .unwrap_or(Ok(()))
+ }
+ 
+@@ -238,12 +238,16 @@ fn build_grammar(grammar: GrammarConfiguration) -> Result<()> {
+     };
+ 
+     let grammar_dir_entries = grammar_dir.read_dir().with_context(|| {
+-        format!("Failed to read directory {grammar_dir:?}. Did you use 'hx --grammar fetch'?")
++        format!(
++            "Failed to read directory {:?}. Did you use 'hx --grammar fetch'?",
++            grammar_dir
++        )
+     })?;
+ 
+     if grammar_dir_entries.count() == 0 {
+         return Err(anyhow!(
+-            "Directory {grammar_dir:?} is empty. Did you use 'hx --grammar fetch'?"
++            "Directory {:?} is empty. Did you use 'hx --grammar fetch'?",
++            grammar_dir
+         ));
+     };
+ 
+diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
+index 8b7f481b..c921f85b 100644
+--- a/helix-term/src/commands/typed.rs
++++ b/helix-term/src/commands/typed.rs
+@@ -891,8 +891,8 @@ fn setting(
+     }
+     let (key, arg) = (&args[0].to_lowercase(), &args[1]);
+ 
+-    let key_error = || anyhow::anyhow!("Unknown key `{key}`");
+-    let field_error = |_| anyhow::anyhow!("Could not parse field `{arg}`");
++    let key_error = || anyhow::anyhow!("Unknown key `{}`", key);
++    let field_error = |_| anyhow::anyhow!("Could not parse field `{}`", arg);
+ 
+     let mut config = serde_json::to_value(&cx.editor.config().clone()).unwrap();
+     let pointer = format!("/{}", key.replace('.', "/"));
+diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs
+index f13d35f0..2a02e118 100644
+--- a/helix-term/src/health.rs
++++ b/helix-term/src/health.rs
+@@ -89,10 +89,11 @@ pub fn languages_all() {
+ 
+     let column = |item: &str, color: Color| {
+         let data = format!(
+-            "{:column_width$}",
++            "{:width$}",
+             item.get(..column_width - 2)
+-                .map(|s| format!("{s}…"))
+-                .unwrap_or_else(|| item.to_string())
++                .map(|s| format!("{}…", s))
++                .unwrap_or_else(|| item.to_string()),
++            width = column_width,
+         )
+         .stylize()
+         .with(color);
+@@ -158,7 +159,7 @@ pub fn language(lang_str: String) {
+     {
+         Some(l) => l,
+         None => {
+-            let msg = format!("Language '{lang_str}' not found");
++            let msg = format!("Language '{}' not found", lang_str);
+             println!("{}", msg.red());
+             let suggestions: Vec<&str> = syn_loader_conf
+                 .language
+-- 
+2.35.1
+
diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
new file mode 100644
index 000000000000..961a894092b7
--- /dev/null
+++ b/srcpkgs/helix/template
@@ -0,0 +1,32 @@
+# Template file for 'helix'
+pkgname=helix
+version=22.03
+revision=1
+build_style=cargo
+make_install_args="--path helix-term"
+hostmakedepends="git"
+short_desc="Post-modern modal text editor"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MPL-2.0"
+homepage="https://helix-editor.com/"
+changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md"
+distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz"
+checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4
+conflicts="hex>=0"
+
+# skip problematic doctests on i686
+case "$XBPS_TARGET_MACHINE" in
+	i686*) make_check_args="-- --skip src/";;
+	*) ;;
+esac
+
+post_install() {
+	rm runtime/grammars/.gitkeep
+	rm runtime/themes/README.md
+	rm -rf runtime/grammars/sources
+
+	vmkdir usr/lib/helix
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/
+	vcopy runtime usr/lib/helix
+	vbin ${FILESDIR}/hx
+}

From f6613f4d6d628b32858a22bb04d010a0b1da8e23 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Fri, 25 Mar 2022 20:45:21 -0700
Subject: [PATCH 0803/1686] gtksourceview5: update to 5.4.0

---
 srcpkgs/gtksourceview5/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index c4c7d94f51e8..81be2e5248da 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
 # Template file for 'gtksourceview5'
 pkgname=gtksourceview5
-version=5.2.0
+version=5.4.0
 revision=1
 wrksrc="gtksourceview-${version}"
 build_style=meson
@@ -8,7 +8,7 @@ build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
- $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+ $(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
 makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala)
  pcre2-devel"
 checkdepends="xvfb-run cantarell-fonts"
@@ -16,9 +16,10 @@ short_desc="Text widget that extends GTK4 GtkTextView widget"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GtkSourceView"
-changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-2/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS"
 distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=c9b34fa02654f56ce22fa08827d89db4ba81631b2e6d7d31ea65d13c729430e9
+checksum=003bc217e670a8ec8aa3aece994b70e70b7d6b8074938adda21718555d84e637
 
 # Package build options
 build_options="gir gtk_doc"
@@ -42,7 +43,7 @@ gtksourceview5-devel_package() {
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		if [ "$build_option_gtk_doc" ]; then
-			vmove usr/share/gtk-doc
+			vmove usr/share/doc
 		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0

From 303abe31123a778c9ca29a0fcf8ddf08593b3b28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 31 Mar 2022 21:58:28 +0200
Subject: [PATCH 0804/1686] python3-libarchive-c: update to 4.0.

---
 srcpkgs/python3-libarchive-c/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-libarchive-c/template b/srcpkgs/python3-libarchive-c/template
index 1a4d1de77f2b..e84524799bda 100644
--- a/srcpkgs/python3-libarchive-c/template
+++ b/srcpkgs/python3-libarchive-c/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-libarchive-c'
 pkgname=python3-libarchive-c
-version=3.2
+version=4.0
 revision=1
 wrksrc="python-libarchive-c-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="CC0-1.0"
 homepage="https://pypi.org/project/libarchive-c/"
 distfiles="https://github.com/Changaco/python-libarchive-c/archive/refs/tags/${version}.tar.gz"
-checksum=e09bd195f72646472f7514145f8f65fd371444d9c98123cd6ec7555048d57045
+checksum=5266797302af2707b6b61bce3b4ce417fe8a583fbeaaab5712dc6dcbf0de3c2b

From 18bd21c774ac3bcacc589cec95658daf262c433a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 31 Mar 2022 21:58:29 +0200
Subject: [PATCH 0805/1686] diffoscope: update to 209.

---
 srcpkgs/diffoscope/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/diffoscope/template b/srcpkgs/diffoscope/template
index 17a9cfd447be..9ce203fb8ff3 100644
--- a/srcpkgs/diffoscope/template
+++ b/srcpkgs/diffoscope/template
@@ -1,6 +1,6 @@
 # Template file for 'diffoscope'
 pkgname=diffoscope
-version=203
+version=209
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,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=d048dbbef81c6a77985f76b9a358e014461ac5c7b36920449fdc999e314654e7
+checksum=e845a0b6cd56c116fee670ae8497512489504dc911201bd77b7d65b8550618f6

From f68baba2eec0f52b68cc3baf6fc0566ca2b5a5d2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 18 Mar 2022 07:51:01 -0400
Subject: [PATCH 0806/1686] swaykbdd: update to 1.1.

---
 srcpkgs/swaykbdd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/swaykbdd/template b/srcpkgs/swaykbdd/template
index 195b04475bc1..1434199c5f27 100644
--- a/srcpkgs/swaykbdd/template
+++ b/srcpkgs/swaykbdd/template
@@ -1,6 +1,6 @@
 # Template file for 'swaykbdd'
 pkgname=swaykbdd
-version=1.0
+version=1.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="MIT"
 homepage="https://github.com/artemsen/swaykbdd"
 distfiles="https://github.com/artemsen/swaykbdd/archive/v${version}.tar.gz"
-checksum=9de46256cafb2b002d4632e1a2f4ca2383e69b69de4d19d3d2d6f4825ef9fca2
+checksum=b1b0fa9ca43e177345a7761d0f9b705ff7d338fea48c1877a44767cf527b131c
 
 post_install() {
 	vlicense LICENSE

From d5f27a990383b93d5d299a144de43b9448edd978 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 21:09:07 +0200
Subject: [PATCH 0807/1686] gfbgraph: update to 0.2.5.

---
 srcpkgs/gfbgraph/template | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/gfbgraph/template b/srcpkgs/gfbgraph/template
index 85a7d27af6e8..63c6376122a2 100644
--- a/srcpkgs/gfbgraph/template
+++ b/srcpkgs/gfbgraph/template
@@ -1,51 +1,42 @@
 # Template file for 'gfbgraph'
 pkgname=gfbgraph
-version=0.2.4
+version=0.2.5
 revision=1
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool automake libtool gtk-doc which"
+configure_args="--disable-static $(vopt_enable gtk_doc gtk-doc)"
+hostmakedepends="pkg-config $(vopt_if gtk_doc gtk-doc)"
 makedepends="rest-devel json-glib-devel gnome-online-accounts-devel"
 short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GFBGraph"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379
+checksum=9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3
+make_check=no # needs facebook credentials
 
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --disable-gtk-doc"
-else
-	configure_args+=" --enable-gtk-doc"
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
 fi
 
-do_check() {
-	:
-}
-
-pre_configure() {
-	NOCONFIGURE=1 sh autogen.sh
-}
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc
 }
 
 gfbgraph-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		if [ -z "$CROSS_BUILD" ]; then
+		if [ "$build_option_gtk_doc" ]; then
 			vmove usr/share/gtk-doc
 		fi
 		vmove "usr/lib/*.so"
-		if [ -z "$CROSS_BUILD" ]; then
+		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
 	}

From 518a04d7a4f9c0f86bee4e1c401ae89e293c911a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 31 Mar 2022 16:22:00 -0500
Subject: [PATCH 0808/1686] Amass: update to 3.19.0.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index a33e92ce1d2c..993c17d52c1c 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.18.3
+version=3.19.0
 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=66eee8ffd300e67a540e9962d2526377677df04b1a3b436471e0a930dd422a9f
+checksum=539c2207f844c81cc9a6286e436f26a1fc0690bf424ea1885844dd33002b7ef6

From b699d4f9f00743ca9c8cea2195c32197f0a4fdd1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 1 Apr 2022 00:09:11 +0200
Subject: [PATCH 0809/1686] libvirt-glib: remove unnecessary build deps

---
 srcpkgs/libvirt-glib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template
index 032188df7f73..7ec4d9898239 100644
--- a/srcpkgs/libvirt-glib/template
+++ b/srcpkgs/libvirt-glib/template
@@ -6,9 +6,9 @@ build_helper="gir"
 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"
+hostmakedepends="pkg-config gettext glib-devel
+ $(vopt_if vala vala) $(vopt_if doc gtk-doc)"
+makedepends="libglib-devel libvirt-devel libxml2-devel"
 short_desc="Glib integration with libvirt"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"

From 45a28a9085f1d58095eeb8b1c2388b82d41f3667 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Thu, 31 Mar 2022 17:18:12 -0500
Subject: [PATCH 0810/1686] jc: add missing depends

---
 srcpkgs/jc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jc/template b/srcpkgs/jc/template
index 8f510a980bc2..20a7438da19d 100644
--- a/srcpkgs/jc/template
+++ b/srcpkgs/jc/template
@@ -1,10 +1,10 @@
 # Template file for 'jc'
 pkgname=jc
 version=1.18.6
-revision=1
+revision=2
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-Pygments"
+depends="python3-Pygments python3-ruamel.yaml python3-xmltodict"
 checkdepends="python3-pytest $depends"
 short_desc="Convert to JSON"
 maintainer="Andrew Benson <abenson+void@gmail.com>"

From 1e04633a6892b271f95ee2e6892fde63cb2de73c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 23:35:26 +0200
Subject: [PATCH 0811/1686] gnome-ssh-askpass: use gtk+3

---
 srcpkgs/gnome-ssh-askpass/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index fbd9174fae2f..558193ab2a19 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,10 +1,13 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
 version=8.9p1
-revision=1
+revision=2
 wrksrc="openssh-${version}"
+build_wrksrc="contrib"
+build_style=gnu-makefile
+make_build_target="gnome-ssh-askpass3"
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel"
+makedepends="gtk+3-devel"
 short_desc="GTK SSH passphrase grabber (from OpenSSH)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause, BSD-2-Clause"
@@ -16,12 +19,7 @@ alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass
 "
 
-do_build() {
-	cd contrib
-	${CC} ${CFLAGS} $(pkg-config --cflags gtk+-2.0) ${pkgname}2.c -o ${pkgname} $(pkg-config --libs gtk+-2.0) ${LDFLAGS} -lX11
-}
-
 do_install() {
-	vbin contrib/${pkgname}
-	vlicense LICENCE
+	vbin gnome-ssh-askpass3 gnome-ssh-askpass
+	vlicense ../LICENCE
 }

From c5c044cd7d41ea64814c02dc0f308a0ab8142de3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 16 Mar 2022 14:30:12 +0100
Subject: [PATCH 0812/1686] zellij: update to 0.27.0

---
 srcpkgs/zellij/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index e2ada810e570..72a9ab9e6e76 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,6 +1,6 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.26.0
+version=0.27.0
 revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
@@ -9,12 +9,12 @@ build_style=cargo
 build_helper=qemu
 checkdepends="openssl-devel pkg-config"
 short_desc="Terminal workspace with batteries included"
-maintainer="Marcin Puc <marcin.e.puc@gmail.com>"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="MIT"
 homepage="https://zellij.dev"
 changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz"
-checksum=f0b0cfe7b72ce842de80d5c32cc2abe624b3286fab16f313a4e43e226e95e87b
+checksum=6159482c25d3cb55b04d23230812f4450e88ff0975161594297a7deef8979a38
 
 post_build() {
 	ZELLIJ="target/${RUST_TARGET}/release/zellij"

From a5aec3609bdb8975a5733ac405c74f313cd37439 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 22:43:18 +0200
Subject: [PATCH 0813/1686] gtk4: update to 4.6.2.

---
 srcpkgs/gtk4/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index a689633bf4d5..ed86ad7bab4c 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,6 +1,6 @@
 # Template file for 'gtk4'
 pkgname=gtk4
-version=4.6.1
+version=4.6.2
 revision=1
 wrksrc="gtk-${version}"
 build_style=meson
@@ -13,7 +13,7 @@ configure_args="-Dman-pages=true -Dbuild-tests=false -Dgtk_doc=true
  -Dcolord=$(vopt_if colord enabled disabled)
  -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
  -Dvulkan=$(vopt_if vulkan enabled disabled)"
-hostmakedepends="gettext-devel glib-devel gi-docgen gtk-update-icon-cache perl
+hostmakedepends="gettext-devel glib-devel gi-docgen perl
  pkg-config sassc gettext libxslt docbook-xsl python3-docutils
  $(vopt_if wayland 'wayland-devel wayland-protocols')"
 makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
@@ -29,7 +29,7 @@ license="LGPL-2.1-or-later"
 homepage="https://www.gtk.org/"
 changelog="https://gitlab.gnome.org/GNOME/gtk/-/raw/gtk-4-6/NEWS"
 distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
-checksum=d85508d21cbbcd63d568a7862af5ecd63b978d7d5799cbe404c91d2389d0ec5f
+checksum=ff263af609a50eb76056653592d929459aef4819a444c436f6d52c6f63c1faec
 
 # Package build options
 build_options="broadway cloudproviders colord cups gir vulkan wayland x11"

From 830ca9c569302d06214fc1fa117500063b2b25da Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 26 Mar 2022 20:51:35 -0400
Subject: [PATCH 0814/1686] network-manager-applet: update to 1.26.0.

---
 .../patches/meson-0.61.patch                  | 33 -------------------
 srcpkgs/network-manager-applet/template       |  4 +--
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/network-manager-applet/patches/meson-0.61.patch

diff --git a/srcpkgs/network-manager-applet/patches/meson-0.61.patch b/srcpkgs/network-manager-applet/patches/meson-0.61.patch
deleted file mode 100644
index 1060e15b364a..000000000000
--- a/srcpkgs/network-manager-applet/patches/meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 21 Jan 2022 22:34:09 +0100
-Subject: [PATCH] meson.build: address meson 0.61 failures
-
-https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
----
- meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 33adb632..6178c0eb 100644
---- a/meson.build
-+++ b/meson.build
-@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
- 
- foreach desktop: desktop_files
-   i18n.merge_file(
--    desktop + '-desktop',
-     input: desktop + '.desktop.in',
-     output: desktop + '.desktop',
-     install: true,
-@@ -275,7 +274,6 @@ endforeach
- appdata = 'nm-connection-editor.appdata.xml'
- 
- i18n.merge_file(
--  'desktop',
-   input: appdata + '.in',
-   output: appdata,
-   install: true,
--- 
-GitLab
-
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 958d5b228960..8a8915bef3ed 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,6 +1,6 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
-version=1.24.0
+version=1.26.0
 revision=1
 build_style=meson
 configure_args="-Dselinux=false"
@@ -16,5 +16,5 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/NetworkManager"
 changelog="https://raw.githubusercontent.com/NetworkManager/network-manager-applet/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b9f4bca5d0352718e07b7385fb195a9bbc8fd686b7959b74137854d52aab9c58
+checksum=69611b29064adbd57395fe3e51a9ebde1ea794615f776900453a2bbe3d8cddfd
 lib32disabled=yes

From dd73edde66c6a2bc69bcf1c036fad6ef98c88569 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 1 Apr 2022 01:31:30 +0200
Subject: [PATCH 0815/1686] glib-networking: update to 2.72.0.

---
 srcpkgs/glib-networking/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template
index 5adca78241c4..fc1cbf840354 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.70.1
+version=2.72.0
 revision=1
 build_style=meson
 configure_args="-Dinstalled_tests=false -Dgnutls=enabled -Dlibproxy=enabled
@@ -13,11 +13,8 @@ short_desc="Network-related giomodules for glib"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/glib-networking/"
+#changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib-networking/-/raw/glib-2-72/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=2a16bfc2d271ccd3266e3fb462bc8a4103c02e81bbb339aa92d6fb060592d7bc
+checksum=100aaebb369285041de52da422b6b716789d5e4d7549a3a71ba587b932e0823b
 lib32disabled=yes
-make_check=no # https://gist.github.com/27c7c0774329deeac7fbe3d7f10ea12c
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/lib/systemd
-}

From 71610584c77f07c6c3f31d487dfbd698509c6d75 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 1 Apr 2022 03:14:51 +0200
Subject: [PATCH 0816/1686] helix: broken on ppc32

---
 srcpkgs/helix/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index 961a894092b7..17a819728ef2 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -20,6 +20,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*) ;;
 esac
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="no AtomicU64 in sync::atomic";;
+esac
+
 post_install() {
 	rm runtime/grammars/.gitkeep
 	rm runtime/themes/README.md

From 10c0dfc40fd7dd9791162d302d91c37fb9474522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:41:50 -0300
Subject: [PATCH 0817/1686] giac: update to 1.7.0.53.

---
 srcpkgs/giac/patches/micropy.patch | 18 ++++++++++++++++++
 srcpkgs/giac/template              |  5 +++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/giac/patches/micropy.patch

diff --git a/srcpkgs/giac/patches/micropy.patch b/srcpkgs/giac/patches/micropy.patch
new file mode 100644
index 000000000000..0e417a5a8ecb
--- /dev/null
+++ b/srcpkgs/giac/patches/micropy.patch
@@ -0,0 +1,18 @@
+--- a/src/icas.cc	2021-03-02 04:52:40.000000000 -0300
++++ b/src/icas.cc	2022-03-30 10:00:39.154056068 -0300
+@@ -1810,6 +1810,7 @@
+     cerr << "// Setting tex log" << '\n';
+     show_tex=true;
+   }
++#ifdef HAVE_LIBMICROPYTHON
+   if (getenv("GIAC_MICROPY")){
+     cerr << "Micropython mode\n";
+     python_compat(4 | python_compat(contextptr),contextptr);
+@@ -1821,6 +1822,7 @@
+       return 0;
+     }
+   }
++#endif
+ #ifdef HAVE_LIBREADLINE
+   if (ARGC==1){
+     int taillemax=1000;
diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template
index 2c192c2b858f..fbdadc31dde7 100644
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@@ -1,6 +1,6 @@
 # Template file for 'giac'
 pkgname=giac
-version=1.7.0.45
+version=1.7.0.53
 revision=1
 wrksrc="giac-${version%.*}"
 build_style=gnu-configure
@@ -12,8 +12,9 @@ short_desc="Free computer algebra system"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
+changelog="https://www-fourier.ujf-grenoble.fr/~parisse/install_en#new"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
-checksum=028b9e323d81a261a243c0768d5e12f3d76371eff05fd24cf2eb177b445f1da6
+checksum=74e5f98f63147c0197e4ce309601ae745312761be61c1a99c8a6bab4862e4a9f
 
 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"

From c3ca8565fe219c00589d971e2765bc45fbbb3361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 30 Mar 2022 09:41:28 -0300
Subject: [PATCH 0818/1686] gp2c: update to 0.0.12pl1.

---
 srcpkgs/gp2c/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gp2c/template b/srcpkgs/gp2c/template
index da996ed0972d..f82cf95c2d90 100644
--- a/srcpkgs/gp2c/template
+++ b/srcpkgs/gp2c/template
@@ -1,6 +1,6 @@
 # Template file for 'gp2c'
 pkgname=gp2c
-version=0.0.12
+version=0.0.12pl1
 revision=1
 build_style=gnu-configure
 hostmakedepends="perl"
@@ -10,5 +10,6 @@ short_desc="PARI/GP Computer Algebra System - gp2c compiler"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="http://pari.math.u-bordeaux.fr/"
+changelog="http://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=gp2c.git;a=blob_plain;f=ChangeLog;hb=HEAD"
 distfiles="${homepage}pub/pari/GP2C/${pkgname}-${version}.tar.gz"
-checksum=ee9ff63979670408d8c293902ce7ff6a825145f0e7e7c6323764733ef1b9310d
+checksum=79a8c46f7ad3331e4d8ae6af6b496c4742fd73a73b996b3ca7ead61452ca6e8d

From ebcd9ef66e0476c2762ae1eac978f868cba6c48f Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Thu, 31 Mar 2022 17:12:18 -0500
Subject: [PATCH 0819/1686] Signal-Desktop: update to 5.37.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 55591ea4c82f..a0b15428b926 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.36.0
+version=5.37.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=de158a8f4b19e3f8b849abf07fbb3d1b2207a3a08fde31aac328635e66a8a956
+checksum=bd674ea6ba0582862f26a8fed1557d21f68161ef05891e67ca4cb653bf0f8d1a
 nostrip_files="signal-desktop"
 
 post_extract() {

From ce927664c5959b7581c52b4e4d730bb6cfb5ecdb Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 31 Mar 2022 16:39:31 -0700
Subject: [PATCH 0820/1686] vte3: update to 0.68.0

---
 srcpkgs/vte3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index f88f797740b9..d75cd4edef2f 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
 # Template file for 'vte3'
 pkgname=vte3
-version=0.66.2
+version=0.68.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=e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976
+checksum=13e7d4789ca216a33780030d246c9b13ddbfd04094c6316eea7ff92284dd1749
 
 # Suppress warnings as errors for NULL format strings (musl libc)
 CXXFLAGS="-Wno-error=format="

From 38171d59cbbbe85455c675163c653ca92c3ac590 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 13:40:10 -0500
Subject: [PATCH 0821/1686] podman: update to 4.0.3.

---
 srcpkgs/podman/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 95e0531abad8..a12ca2c32440 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
-version=4.0.2
-revision=3
+version=4.0.3
+revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
@@ -15,7 +15,7 @@ license="Apache-2.0"
 homepage="https://podman.io/"
 changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
-checksum=cac4328b0a5e618f4f6567944e255d15fad3e1f7901df55603f1efdd7aaeda95
+checksum=e3b53fc9142d4f2dc085f17a377d92ffb8bfe7756c4f47b8128b38bcc3540cbc
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"

From 8ebd46b4563c5064ad18338f5eab3d16d98fffcc Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Tue, 29 Mar 2022 05:26:18 -0400
Subject: [PATCH 0822/1686] onboard: fix SyntaxWarnings and disable tests

- A missing % operator was breaking a c-style format string, causing a
    SyntaxWarning to be trown twice at package install time (during
    byte-compilation).
- The tests were failing since they try to run 'killall' before executing
    onboard in xautomation(7), both not being possible in xbps-src.
---
 srcpkgs/onboard/patches/fix-brokenformat.patch | 15 +++++++++++++++
 srcpkgs/onboard/template                       |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/onboard/patches/fix-brokenformat.patch

diff --git a/srcpkgs/onboard/patches/fix-brokenformat.patch b/srcpkgs/onboard/patches/fix-brokenformat.patch
new file mode 100644
index 000000000000..e5d200208a93
--- /dev/null
+++ b/srcpkgs/onboard/patches/fix-brokenformat.patch
@@ -0,0 +1,15 @@
+Fix for https://bugs.launchpad.net/onboard/+bug/1948723
+
+
+--
+--- a/Onboard/LayoutLoaderSVG.py
++++ b/Onboard/LayoutLoaderSVG.py
+@@ -445,7 +445,7 @@
+             except KeyError as ex:
+                 (strerror) = ex
+                 raise Exceptions.LayoutFileError("Unrecognized modifier %s in" \
+-                    "definition of %s" (strerror, full_id))
++                    "definition of %s" % (strerror, full_id))
+ 
+         value = attributes.get("action")
+         if value:
diff --git a/srcpkgs/onboard/template b/srcpkgs/onboard/template
index c147bf58a65c..b138fae61897 100644
--- a/srcpkgs/onboard/template
+++ b/srcpkgs/onboard/template
@@ -1,7 +1,7 @@
 # Template file for 'onboard'
 pkgname=onboard
 version=1.4.1
-revision=9
+revision=10
 build_style=python3-module
 hostmakedepends="intltool pkg-config python3-distutils-extra"
 makedepends="dconf-devel eudev-libudev-devel gtk+3-devel hunspell-devel
@@ -14,3 +14,5 @@ license="GPL-3.0-or-later"
 homepage="https://launchpad.net/onboard"
 distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz"
 checksum=01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865
+# Tries to run onboard in tests, using xautomation(7)
+make_check=no

From ce907a5c949d2a005be14743a7f2bf87ca709b22 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 6 Mar 2022 15:12:54 -0500
Subject: [PATCH 0823/1686] go: update to 1.18.

Closes: #36013 [via git-merge-pr]
---
 srcpkgs/go/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 990a575b7ae5..58f0b0fc2485 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.17.6
+version=1.18
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=4dc1bbf3ff61f0c1ff2b19355e6d88151a70126268a47c761477686ef94748c8
+checksum=38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6
 nostrip=yes
 noverifyrdeps=yes
 

From d24f7731917f6fbf617c7cd08d3f23cb2dc98bb9 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Wed, 30 Mar 2022 09:47:27 +0200
Subject: [PATCH 0824/1686] google-chrome: update to 100.0.4896.60

Closes: #36413 [via git-merge-pr]
---
 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 e6a568ca685d..a630fcdae463 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=99.0.4844.84
+version=100.0.4896.60
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=96f260f798f1adb471a3a5b8e68702ef88237884e32f0e43baf15a78aed5b669
+checksum=05ba6d17d2704ffff1e1d554b40aaddabca9256b7e63ff73e99c469393de8a1f
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From ab23d76f5ce2f4917497a22a69ead7f906bfeeed Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:17:28 -0500
Subject: [PATCH 0825/1686] chronograf: update to 1.9.4.

---
 srcpkgs/chronograf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chronograf/template b/srcpkgs/chronograf/template
index 50a08abafebb..db97744b814a 100644
--- a/srcpkgs/chronograf/template
+++ b/srcpkgs/chronograf/template
@@ -1,6 +1,6 @@
 # Template file for 'chronograf'
 pkgname=chronograf
-version=1.9.1
+version=1.9.4
 revision=1
 build_style=go
 go_import_path="github.com/influxdata/${pkgname}"
@@ -12,7 +12,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="AGPL-3.0-or-later"
 homepage="https://www.influxdata.com/time-series-platform/chronograf/"
 distfiles="https://github.com/influxdata/${pkgname}/archive/${version}.tar.gz"
-checksum=df5600b2bd0b5ed0d3a3c548e5d72038b62fdda1501ad616eb1c1d82b054793a
+checksum=ff294f25a9de57140024b9953992c1a4d79ec88167ad28435645d888a0096c27
 
 system_accounts="_chronograf"
 _chronograf_homedir="/var/lib/${pkgname}"

From 5689e87546da0080620dd300666259799fadd314 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:23:58 -0500
Subject: [PATCH 0826/1686] libnss-cache: update to 0.20.

---
 srcpkgs/libnss-cache/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnss-cache/template b/srcpkgs/libnss-cache/template
index 49b1cc767801..da8d918e3a75 100644
--- a/srcpkgs/libnss-cache/template
+++ b/srcpkgs/libnss-cache/template
@@ -1,6 +1,6 @@
 # Template file for 'libnss-cache'
 pkgname=libnss-cache
-version=0.17
+version=0.20
 revision=1
 wrksrc=$pkgname-version-$version
 build_style=gnu-makefile
@@ -11,7 +11,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="LGPL-3.0"
 homepage="https://github.com/google/libnss-cache"
 distfiles="https://github.com/google/libnss-cache/archive/version/$version.tar.gz"
-checksum=3777cbc46dc8d08144b99321d1f039718cd347d3be8ed66a8cb3722d3e6692f5
+checksum=71324b6035674028a0f39c98aedfbaed94adbcddd72dc1c4ab81308b135dd586
 
 case "$XBPS_TARGET_MACHINE" in
 	*musl)

From 7de394d922581f33b2b41712909da1f3747f613c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:35:20 -0500
Subject: [PATCH 0827/1686] libpam-policycache: update to 0.11.

---
 srcpkgs/libpam-policycache/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libpam-policycache/template b/srcpkgs/libpam-policycache/template
index d40385708fe6..6777b0856dd6 100644
--- a/srcpkgs/libpam-policycache/template
+++ b/srcpkgs/libpam-policycache/template
@@ -1,7 +1,7 @@
 # Template file for 'libpam-policycache'
 pkgname=libpam-policycache
-version=0.10
-revision=2
+version=0.11
+revision=1
 build_style=gnu-configure
 hostmakedepends="autoconf automake libtool pkg-config"
 makedepends="glib-devel libscrypt-devel pam-devel"
@@ -10,7 +10,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/google/libpam-policycache"
 distfiles="https://github.com/google/libpam-policycache/archive/v$version.tar.gz"
-checksum=7a8210d4a64980af11ff770578e724f2eae2aca56b4cc5977902290468f5aaf0
+checksum=d1a074493d3a4076094a79093ec02c8fdd886069b9624d8b6765f7a1e840fae6
 CFLAGS="-Wno-error=deprecated-declarations"
 
 make_dirs="/etc/libpam-policycache.d 0755 root root

From e2c808123078519fceb98b420f8c31dcd5348e12 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:45:34 -0500
Subject: [PATCH 0828/1686] yarn-bin: update to 1.22.18.

---
 srcpkgs/yarn-bin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yarn-bin/template b/srcpkgs/yarn-bin/template
index 111cdd494574..01ce68263ade 100644
--- a/srcpkgs/yarn-bin/template
+++ b/srcpkgs/yarn-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'yarn-bin'
 pkgname=yarn-bin
-version=1.22.10
+version=1.22.18
 revision=1
 depends="virtual?nodejs-runtime"
 short_desc="Fast, reliable, and secure dependency management - precompiled binaries"
@@ -8,7 +8,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"
-checksum=7e433d4a77e2c79e6a7ae4866782608a8e8bcad3ec6783580577c59538381a6e
+checksum=816e5c073b3d35936a398d1fe769ebbcd517298e3510b649e8fc67cd3a62e113
 conflicts="yarn>=0"
 
 do_extract() {

From aaf18708d60b47f3ac57a2821aa8571d41ec970c Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:51:16 -0500
Subject: [PATCH 0829/1686] yarn: update to 1.22.18.

---
 srcpkgs/yarn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yarn/template b/srcpkgs/yarn/template
index aa9f68e53c4c..834d72024cc7 100644
--- a/srcpkgs/yarn/template
+++ b/srcpkgs/yarn/template
@@ -1,6 +1,6 @@
 # Template file for 'yarn'
 pkgname=yarn
-version=1.22.10
+version=1.22.18
 revision=1
 hostmakedepends="yarn-bin nodejs tar"
 depends="virtual?nodejs-runtime"
@@ -9,7 +9,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/${pkgname}/archive/v${version}.tar.gz"
-checksum=66153f5fdd3078ce320c775990e4b4f03d5b596186f0e1fbceb34225abe3cd3e
+checksum=accb0911b05329220a6fe7fd14d091add3b62535811ea97503e8579ae5812c2e
 
 conflicts="yarn-bin>=0"
 

From c1355a72f324ff2d46e66317a46dad17d64f5b43 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 1 Apr 2022 23:58:48 -0500
Subject: [PATCH 0830/1686] .github/workflows: clean up cycle check

---
 .github/workflows/{cron.yml => cycles.yml} | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
 rename .github/workflows/{cron.yml => cycles.yml} (84%)

diff --git a/.github/workflows/cron.yml b/.github/workflows/cycles.yml
similarity index 84%
rename from .github/workflows/cron.yml
rename to .github/workflows/cycles.yml
index 1b53808a7588..e75297ac937d 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cycles.yml
@@ -1,18 +1,10 @@
-name: 'Scheduled tasks'
+name: 'Cycle Check'
 
 on:
   schedule:
     - cron: '0 18 * * *'
 
 jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v2
-        with:
-          github-token: ${{ github.token }}
-          pr-lock-inactive-days: '90'
-          process-only: 'prs'
   cycles:
     runs-on: ubuntu-latest
     container:

From 0764d7d82d42bb857789491582ec4a8e182ebd44 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 11:44:15 +0100
Subject: [PATCH 0831/1686] kodi-addon-pvr-zattoo: update to 19.7.11.

---
 srcpkgs/kodi-addon-pvr-zattoo/template | 7 +++----
 srcpkgs/kodi-addon-pvr-zattoo/update   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/kodi-addon-pvr-zattoo/template b/srcpkgs/kodi-addon-pvr-zattoo/template
index 79ebdc6c30a5..e532a1bfdbe5 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/template
+++ b/srcpkgs/kodi-addon-pvr-zattoo/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi-addon-pvr-zattoo'
 pkgname=kodi-addon-pvr-zattoo
-version=19.7.8.1
-revision=3
+version=19.7.11
+revision=1
 _kodi_release=Matrix
 wrksrc="pvr.zattoo-${version}-${_kodi_release}"
 build_style=cmake
@@ -14,8 +14,7 @@ maintainer="teldra <teldra@rotce.de>"
 license="GPL-2.0-only"
 homepage="https://github.com/rbuehlma/pvr.zattoo"
 distfiles="https://github.com/rbuehlma/pvr.zattoo/archive/${version}-${_kodi_release}.tar.gz"
-checksum=25dc4ea72b5315a65286ba606e6e26d281fb8eb830d5e0164b66b8d7ae90319a
-make_check=no # No target to "make test"
+checksum=07d96b1b0c3b464c0bf02279fa8cab9ccdf675344129f3a970b14bafce225fb4
 
 if [ -n "${CROSS_BUILD}" ]; then
 	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
diff --git a/srcpkgs/kodi-addon-pvr-zattoo/update b/srcpkgs/kodi-addon-pvr-zattoo/update
index 86efd6c4989a..b7c348dae80a 100644
--- a/srcpkgs/kodi-addon-pvr-zattoo/update
+++ b/srcpkgs/kodi-addon-pvr-zattoo/update
@@ -1,2 +1,2 @@
-ignore="19.* 512"
+ignore="20* 512"
 pattern='\K[\d\.]+(?=-[A-Z][a-z])'

From 0ddab417bbdfb402f38e1fa88c21cd1f05de3f0c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 31 Mar 2022 20:14:50 +0200
Subject: [PATCH 0832/1686] emacs-gtk2: remove package

---
 srcpkgs/emacs-gtk2                |  1 -
 srcpkgs/emacs/template            | 20 +-------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 120000 srcpkgs/emacs-gtk2

diff --git a/srcpkgs/emacs-gtk2 b/srcpkgs/emacs-gtk2
deleted file mode 120000
index a7642dd168d6..000000000000
--- a/srcpkgs/emacs-gtk2
+++ /dev/null
@@ -1 +0,0 @@
-emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 1cd4d18bd6aa..9c4405ffc88e 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -9,7 +9,7 @@ configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)
  $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)"
 hostmakedepends="pkg-config tar"
-makedepends="ncurses-devel libXaw-devel gtk+-devel gtk+3-devel webkit2gtk-devel
+makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
  dbus-devel acl-devel
  $(vopt_if jpeg libjpeg-turbo-devel) $(vopt_if tiff tiff-devel)
  $(vopt_if gif giflib-devel) $(vopt_if png libpng-devel) $(vopt_if xpm libXpm-devel)
@@ -41,7 +41,6 @@ pre_configure() {
 	mkdir -p nox
 	mv * nox || true
 	cp -a nox x11
-	cp -a nox gtk2
 	cp -a nox gtk3
 }
 
@@ -54,9 +53,6 @@ do_configure() {
 		$(vopt_with dbus) --without-gconf --without-gsettings \
 		${configure_args}
 
-	cd $wrksrc/gtk2
-	./configure --with-x-toolkit=gtk2 ${configure_args}
-
 	cd $wrksrc/gtk3
 	./configure --with-x-toolkit=gtk3 --with-xwidgets ${configure_args}
 }
@@ -64,7 +60,6 @@ do_configure() {
 do_build() {
 	make ${makejobs} -C nox
 	make ${makejobs} -C x11
-	make ${makejobs} -C gtk2
 	make ${makejobs} -C gtk3
 }
 
@@ -101,19 +96,6 @@ emacs-x11_package() {
 	}
 }
 
-emacs-gtk2_package() {
-	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
-	provides="emacs-${version}_${revision}"
-	replaces="emacs>=0"
-	short_desc+=" - GTK+2 version"
-	pkg_install() {
-		make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk2 install
-		rm -f ${PKGDESTDIR}/usr/bin/ctags
-		rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info}
-		rm -rf ${PKGDESTDIR}/usr/lib
-	}
-}
-
 emacs-gtk3_package() {
 	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
 	provides="emacs-${version}_${revision}"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index df264c9d7501..d5a5e66b8b1a 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -68,6 +68,7 @@ replaces="
  eclipse-ecj<=4.9_3
  electron7<=7.3.3_1
  electron9<=9.4.1_1
+ emacs-gtk2<=27.2_1
  enventor<=1.0.0_2
  epstopdf<=2.27_3
  flickcurl-devel<=1.26_4

From e93be9a166b32715117dca75e17ecb8e833e2ada Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 12:11:22 +0200
Subject: [PATCH 0833/1686] glib: bump shlibs

---
 common/shlibs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ccc55a1b3772..9f5333c203da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -84,11 +84,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.70.0_1
-libglib-2.0.so.0 glib-2.70.0_1
-libgmodule-2.0.so.0 glib-2.70.0_1
-libgio-2.0.so.0 glib-2.70.0_1
-libgobject-2.0.so.0 glib-2.70.0_1
+libgthread-2.0.so.0 glib-2.72.0_1
+libglib-2.0.so.0 glib-2.72.0_1
+libgmodule-2.0.so.0 glib-2.72.0_1
+libgio-2.0.so.0 glib-2.72.0_1
+libgobject-2.0.so.0 glib-2.72.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

From ba97e4a7bce062528304558e727b1de6f0400f1d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 12:12:16 +0200
Subject: [PATCH 0834/1686] vte3: bump shlibs

---
 common/shlibs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/shlibs b/common/shlibs
index 9f5333c203da..7079375524fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -821,7 +821,7 @@ libvpx.so.6 libvpx6-1.8.0_1
 libXevie.so.1 libXevie-1.0.2_1
 libatspi.so.0 at-spi2-core-1.91.91_1
 libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
-libvte-2.91.so.0 vte3-0.52.2_1
+libvte-2.91.so.0 vte3-0.68.0_1
 libpipeline.so.1 libpipeline-1.2.0_1
 libosp.so.5 opensp-1.5.2_1
 libogrove.so.0 openjade-1.3.2_1

From fcf4205b6b32639fd12df267728a3f61b08ed5a8 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 31 Mar 2022 20:36:55 -0400
Subject: [PATCH 0835/1686] hex: change binary name to avoid conflict

---
 srcpkgs/helix/template | 3 +--
 srcpkgs/hex/template   | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index 17a819728ef2..b454cc8fa87c 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -1,7 +1,7 @@
 # Template file for 'helix'
 pkgname=helix
 version=22.03
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path helix-term"
 hostmakedepends="git"
@@ -12,7 +12,6 @@ homepage="https://helix-editor.com/"
 changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md"
 distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz"
 checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4
-conflicts="hex>=0"
 
 # skip problematic doctests on i686
 case "$XBPS_TARGET_MACHINE" in
diff --git a/srcpkgs/hex/template b/srcpkgs/hex/template
index 6295e03ddffe..07bf3c269d26 100644
--- a/srcpkgs/hex/template
+++ b/srcpkgs/hex/template
@@ -1,7 +1,7 @@
 # Template file for 'hex'
 pkgname=hex
 version=0.4.2
-revision=1
+revision=2
 build_style=cargo
 short_desc="Futuristic take on hexdump"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -11,5 +11,7 @@ distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=a7cc1ece337fc19e77fbbbca145001bc5d447bde4118eb6de2c99407eb1a3b74
 
 post_install() {
+	# avoid conflict with helix
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/bin/hex
 	vlicense LICENSE
 }

From 1196b8f205bcac14c9984709b4c22e70673c6d96 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 21 Feb 2022 10:17:21 +0100
Subject: [PATCH 0836/1686] radicale: update to 3.1.5.

- remove conf file entry, because it changes filerights after updates
---
 srcpkgs/radicale/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 8d81e3b61304..65eb085022c0 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,6 +1,6 @@
 # Template file for 'radicale'
 pkgname=radicale
-version=3.1.4
+version=3.1.5
 revision=1
 wrksrc="Radicale-${version}"
 build_style=python3-module
@@ -14,11 +14,10 @@ license="GPL-3.0-or-later"
 homepage="https://radicale.org"
 changelog="https://github.com/Kozea/Radicale/blob/master/CHANGELOG.md"
 distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.gz"
-checksum=7658db3bb78ddb5934b573a875d1ef3ca6cfe932a4a15dc0c781126bea7f41c1
+checksum=1d631d0c0efd049c05fb32876d8e4f5662df4fa91f8aa6f52a994608d9a3e12d
 conf_files="
  /etc/radicale/config
  /etc/radicale/rights
- /etc/radicale/users
  /etc/sv/radicale/log/run"
 make_dirs="
  /etc/radicale 755 root root
@@ -33,7 +32,6 @@ replaces="radicale2<3.0.6"
 post_install() {
 	vinstall config 644 etc/radicale/
 	vinstall rights 640 etc/radicale/
-	vinstall /dev/null 640 etc/radicale users
 	vinstall config 644 usr/share/examples/radicale
 	vinstall radicale.wsgi 644 usr/share/radicale
 	vsv radicale

From cc1084958289361c50e8ec7aa9e19094d16fce22 Mon Sep 17 00:00:00 2001
From: Wesley Chan <wesley.chan@posteo.org>
Date: Tue, 19 Oct 2021 16:03:13 +0800
Subject: [PATCH 0837/1686] New package: acme.sh-3.0.2

---
 srcpkgs/acme.sh/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/acme.sh/template

diff --git a/srcpkgs/acme.sh/template b/srcpkgs/acme.sh/template
new file mode 100644
index 000000000000..92092c41e3b5
--- /dev/null
+++ b/srcpkgs/acme.sh/template
@@ -0,0 +1,24 @@
+# Template file for 'acme.sh'
+pkgname=acme.sh
+version=3.0.2
+revision=1
+short_desc="Pure Unix shell script implementing ACME client protocol"
+maintainer="Wesley Chan <wesley.chan@posteo.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/acmesh-official/acme.sh"
+distfiles="https://github.com/acmesh-official/acme.sh/archive/refs/tags/${version}.tar.gz"
+checksum=d6cda672697fe02cfa2a61bf74ec1b472aa797b03baead6deec625158965cee0
+
+do_install() {
+	vmkdir usr/share/acme.sh/deploy
+	vmkdir usr/share/acme.sh/dnsapi
+	vmkdir usr/share/acme.sh/notify
+	vmkdir usr/bin
+
+	vinstall acme.sh 755 usr/share/acme.sh/
+	vcopy deploy/*.sh usr/share/acme.sh/deploy/
+	vcopy dnsapi/*.sh usr/share/acme.sh/dnsapi/
+	vcopy notify/*.sh usr/share/acme.sh/notify/
+
+	ln -sf /usr/share/acme.sh/acme.sh ${DESTDIR}/usr/bin/acme.sh
+}

From 55d49169d350cd4b82e8afa5cac828c36ab1dddf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 29 Mar 2022 23:12:55 +0200
Subject: [PATCH 0838/1686] gawk: fix tests

---
 srcpkgs/gawk/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template
index 0a79c2ca2c5e..b922097b01f7 100644
--- a/srcpkgs/gawk/template
+++ b/srcpkgs/gawk/template
@@ -21,6 +21,11 @@ alternatives="
 pre_check() {
 	vsed -i 's/done | more/done/g' test/Makefile
 
+	# This fixes tests on glibc, relevant tests on musl are disabled
+	# because the locale command doesn't exist.
+	vsed -i 's/en_US.ISO-8859-1//' test/localenl.sh
+	vsed -i '/^LC_ALL=en_US.ISO-8859-1 passed$/d' test/localenl.ok
+
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
 			vsed -i '/testext/d' test/Makefile

From 7205956db755d31dfd4b6403b86f0570f19a02fc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:16:03 +0200
Subject: [PATCH 0839/1686] snixembed: fix checksum

---
 srcpkgs/snixembed/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/snixembed/template b/srcpkgs/snixembed/template
index bc8c37948a8d..aa6dedb561e6 100644
--- a/srcpkgs/snixembed/template
+++ b/srcpkgs/snixembed/template
@@ -11,7 +11,7 @@ maintainer="projectmoon <projectmoon@agnos.is>"
 license="ISC"
 homepage="https://git.sr.ht/~steef/snixembed"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=7f49fcd891ffa58be8b7e387a73cfd5b98a354aad3af1c76d9960a07cd92340e
+checksum=1e735384a3edd80dcdc8a6d2cac39c1f7fd48543ab9488820e72851e62b0880b
 
 post_install() {
 	vlicense LICENSE

From 484fbbfcaba5dfaf451c69e4f509ad2cadfcf5b2 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 2 Apr 2022 18:15:57 +0300
Subject: [PATCH 0840/1686] mousepad: update to 0.5.9.

---
 srcpkgs/mousepad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 1a85167aeb8e..a471702954e6 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,6 +1,6 @@
 # Template file for 'mousepad'
 pkgname=mousepad
-version=0.5.8
+version=0.5.9
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=921ebbcfdfd5e2e56f31a5177a2d26f46c758cc972595017bca9e0a6a3c3a721
+checksum=f108a8c167ec5727266ab67666f10dbd60e972d56ea03944302fdabb2167f473

From c6195aa0fbba1b2af872b5441e92c42b34d573f7 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 30 Mar 2022 02:05:43 -0400
Subject: [PATCH 0841/1686] Manual.md: document the check functions

The pre_/do_/post_check functions were not listed in the list of building
phase functions, and were not mentioned elsewhere (do_check was mentioned
once). This documents their existence.
---
 Manual.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Manual.md b/Manual.md
index af5f698debae..8ec755499bbe 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1101,7 +1101,13 @@ still be passed in if it's a GNU configure script.
 
 - `post_build()` Actions to execute after `do_build()`.
 
-- `pre_install()` Actions to execute after `post_build()`.
+- `pre_check()` Actions to execute after `post_build()`.
+
+- `do_check()` Actions to execute to run checks for the package.
+
+- `post_check()` Actions to execute after `do_check()`.
+
+- `pre_install()` Actions to execute after `post_check()`.
 
 - `do_install()` Actions to execute to install the package files into the `fake destdir`.
 

From 9a69e20a0891e1a8bbdb0030a99b7f4db88973ca Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 2 Apr 2022 18:12:35 +0300
Subject: [PATCH 0842/1686] eclipse: update to 4.23.

---
 srcpkgs/eclipse/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/eclipse/template b/srcpkgs/eclipse/template
index cb4c8cfff427..d365b6ff06e5 100644
--- a/srcpkgs/eclipse/template
+++ b/srcpkgs/eclipse/template
@@ -1,9 +1,9 @@
 # Template file for 'eclipse'
 pkgname=eclipse
-version=4.22
+version=4.23
 revision=1
 #code name of version
-_release=2021-12
+_release=2022-03
 archs="x86_64"
 wrksrc="eclipse"
 depends="openjdk11 gtk+3 webkit2gtk libXtst
@@ -19,7 +19,7 @@ _patch=R
 _edition=java
 _mirror="http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse"
 distfiles="${_mirror}/technology/epp/downloads/release/${_release}/${_patch}/eclipse-${_edition}-${_release}-${_patch}-linux-gtk-x86_64.tar.gz"
-checksum=6d70a896ad70ef79f527447e5b0d1b373ca00179653ab2361aa9550d0a87068d
+checksum=2905e74afac8ecbaaf2563d4c14a1a28100a7a03cb4b73b540df3607ee5bfa6f
 python_version=2
 
 do_install() {

From 682479b94c51a433d029594367badadc13d1de73 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:12:13 +0200
Subject: [PATCH 0843/1686] gupnp-dlna: add missing build dependency

---
 srcpkgs/gupnp-dlna/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template
index 6286c09fb117..d88090126ee3 100644
--- a/srcpkgs/gupnp-dlna/template
+++ b/srcpkgs/gupnp-dlna/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static $(vopt_enable gir introspection)"
 hostmakedepends="automake libtool pkg-config $(vopt_if vala vala)"
-makedepends="gst-plugins-base1-devel $(vopt_if vala vala)"
+makedepends="gst-plugins-base1-devel libxml2-devel $(vopt_if vala vala)"
 short_desc="GUPnP DLNA"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

From a41dd6d3ca97ba51c65caa05c8459d73f7b88d87 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 13 Feb 2022 23:08:59 -0500
Subject: [PATCH 0844/1686] New Package: python3-jq-1.2.2

---
 srcpkgs/python3-jq/patches/jq-py-setup.patch | 143 +++++++++++++++++++
 srcpkgs/python3-jq/template                  |  23 +++
 2 files changed, 166 insertions(+)
 create mode 100644 srcpkgs/python3-jq/patches/jq-py-setup.patch
 create mode 100644 srcpkgs/python3-jq/template

diff --git a/srcpkgs/python3-jq/patches/jq-py-setup.patch b/srcpkgs/python3-jq/patches/jq-py-setup.patch
new file mode 100644
index 000000000000..1eb4f28e7aa9
--- /dev/null
+++ b/srcpkgs/python3-jq/patches/jq-py-setup.patch
@@ -0,0 +1,143 @@
+From bef841b73ba7c9a79211146798ac888fce9bb55a Mon Sep 17 00:00:00 2001
+From: "Robert T. McGibbon" <rmcgibbo@gmail.com>
+Date: Fri, 7 May 2021 19:14:20 -0400
+Subject: [PATCH 1/1] Vastly simplify setup.py for distro compatibility
+
+---
+ setup.py | 98 +-------------------------------------------------------
+ 1 file changed, 1 insertion(+), 97 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 663792c..3ebcabe 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,113 +1,19 @@
+ #!/usr/bin/env python
+ 
+ import os
+-import subprocess
+-import tarfile
+-import shutil
+-import sysconfig
+ 
+-import requests
+ from setuptools import setup
+-from setuptools.command.build_ext import build_ext
+ from setuptools.extension import Extension
+ 
+ 
+-def urlretrieve(source_url, destination_path):
+-    response = requests.get(source_url, stream=True)
+-    if response.status_code != 200:
+-        raise Exception("status code was: {}".format(response.status_code))
+-
+-    with open(destination_path, "wb") as fileobj:
+-        for chunk in response.iter_content(chunk_size=128):
+-            fileobj.write(chunk)
+-
+-def path_in_dir(relative_path):
+-    return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path))
+-
+-def dependency_path(relative_path):
+-    return os.path.join(path_in_dir("_deps"), relative_path)
+-
+ def read(fname):
+     return open(os.path.join(os.path.dirname(__file__), fname)).read()
+ 
+ 
+-jq_lib_tarball_path = dependency_path("jq-lib-1.6.tar.gz")
+-jq_lib_dir = dependency_path("jq-1.6")
+-
+-oniguruma_version = "6.9.4"
+-oniguruma_lib_tarball_path = dependency_path("onig-{}.tar.gz".format(oniguruma_version))
+-oniguruma_lib_build_dir = dependency_path("onig-{}".format(oniguruma_version))
+-oniguruma_lib_install_dir = dependency_path("onig-install-{}".format(oniguruma_version))
+-
+-class jq_build_ext(build_ext):
+-    def run(self):
+-        if not os.path.exists(dependency_path(".")):
+-            os.makedirs(dependency_path("."))
+-        self._build_oniguruma()
+-        self._build_libjq()
+-        build_ext.run(self)
+-
+-    def _build_oniguruma(self):
+-        self._build_lib(
+-            source_url="https://github.com/kkos/oniguruma/releases/download/v{0}/onig-{0}.tar.gz".format(oniguruma_version),
+-            tarball_path=oniguruma_lib_tarball_path,
+-            lib_dir=oniguruma_lib_build_dir,
+-            commands=[
+-                ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir],
+-                ["make"],
+-                ["make", "install"],
+-            ])
+-
+-
+-    def _build_libjq(self):
+-        self._build_lib(
+-            source_url="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz",
+-            tarball_path=jq_lib_tarball_path,
+-            lib_dir=jq_lib_dir,
+-            commands=[
+-                ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir],
+-                ["make"],
+-            ])
+-
+-    def _build_lib(self, source_url, tarball_path, lib_dir, commands):
+-        self._download_tarball(
+-            source_url=source_url,
+-            tarball_path=tarball_path,
+-            lib_dir=lib_dir,
+-        )
+-
+-        macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET")
+-        if macosx_deployment_target:
+-            os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target)
+-
+-        def run_command(args):
+-            print("Executing: %s" % ' '.join(args))
+-            subprocess.check_call(args, cwd=lib_dir)
+-
+-        for command in commands:
+-            run_command(command)
+-
+-    def _download_tarball(self, source_url, tarball_path, lib_dir):
+-        if os.path.exists(tarball_path):
+-            os.unlink(tarball_path)
+-        print("Downloading {}".format(source_url))
+-        urlretrieve(source_url, tarball_path)
+-        print("Downloaded {}".format(source_url))
+-
+-        if os.path.exists(lib_dir):
+-            shutil.rmtree(lib_dir)
+-        tarfile.open(tarball_path, "r:gz").extractall(dependency_path("."))
+-
+-
+ jq_extension = Extension(
+     "jq",
+     sources=["jq.c"],
+-    include_dirs=[os.path.join(jq_lib_dir, "src")],
+-    extra_link_args=["-lm"],
+-    extra_objects=[
+-        os.path.join(jq_lib_dir, ".libs/libjq.a"),
+-        os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"),
+-    ],
++    libraries=["jq"]
+ )
+ 
+ setup(
+@@ -120,7 +26,6 @@ setup(
+     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+     license='BSD 2-Clause',
+     ext_modules = [jq_extension],
+-    cmdclass={"build_ext": jq_build_ext},
+     classifiers=[
+         'Development Status :: 5 - Production/Stable',
+         'Intended Audience :: Developers',
+@@ -137,4 +42,3 @@ setup(
+         'Programming Language :: Python :: 3.9',
+     ],
+ )
+-
+-- 
+2.29.3
diff --git a/srcpkgs/python3-jq/template b/srcpkgs/python3-jq/template
new file mode 100644
index 000000000000..52702247c217
--- /dev/null
+++ b/srcpkgs/python3-jq/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-jq'
+pkgname=python3-jq
+version=1.2.2
+revision=1
+wrksrc="${pkgname#*-}.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel jq-devel"
+depends="python3"
+short_desc="Python bindings for jq"
+maintainer="RunningDroid <runningdroid@zoho.com>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/jq/"
+distfiles="https://github.com/mwilliamson/jq.py/archive/${version}.tar.gz"
+checksum=0b926078855b6daee6e8ae5366ebf11c06911195abae643a7cdd37fce087fa0e
+
+pre_build() {
+	cython jq.pyx
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 6fd23298459d697a8b04c3a3599fd788c5904621 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 27 Mar 2022 00:46:22 -0400
Subject: [PATCH 0845/1686] python3-minidb: update to 2.0.6.

And remove pycompile_module so xlint passes
---
 srcpkgs/python3-minidb/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-minidb/template b/srcpkgs/python3-minidb/template
index 7c63ae3ef621..f901265dbc39 100644
--- a/srcpkgs/python3-minidb/template
+++ b/srcpkgs/python3-minidb/template
@@ -1,10 +1,9 @@
 # Template file for 'python3-minidb'
 pkgname=python3-minidb
-version=2.0.2
-revision=5
+version=2.0.6
+revision=1
 wrksrc="minidb-${version}"
 build_style=python3-module
-pycompile_module="minidb.py"
 hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Simple SQLite3 store for Python objects"
@@ -12,7 +11,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="ISC"
 homepage="https://thp.io/2010/minidb/"
 distfiles="https://github.com/thp/minidb/archive/${version}.tar.gz"
-checksum=40a1992281dbfb63a90616db328c1babc3aabadd8844fdd676369e8df09d3b9f
+checksum=7e4ef07d858d6e6118dfd000031e7698fb29b44bd8fe38e713d241fcaec6ee1e
 
 post_install() {
 	sed -n '/# Copyright/,/OF THIS SOFTWARE./p' minidb.py > COPYING

From 02cc445b84139aed7820a690dd9eb66dfe626356 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Sun, 13 Feb 2022 23:09:28 -0500
Subject: [PATCH 0846/1686] urlwatch: update to 2.25.

---
 srcpkgs/urlwatch/patches/test_handler.patch | 14 ++++++++++++++
 srcpkgs/urlwatch/template                   | 10 +++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/urlwatch/patches/test_handler.patch

diff --git a/srcpkgs/urlwatch/patches/test_handler.patch b/srcpkgs/urlwatch/patches/test_handler.patch
new file mode 100644
index 000000000000..73f301e49f9f
--- /dev/null
+++ b/srcpkgs/urlwatch/patches/test_handler.patch
@@ -0,0 +1,14 @@
+Work around https://github.com/thp/urlwatch/issues/677
+
+diff --git a/lib/urlwatch/tests/test_handler.py b/lib/urlwatch/tests/test_handler.py
+index 736536a..fac9449 100644
+--- a/lib/urlwatch/tests/test_handler.py
++++ b/lib/urlwatch/tests/test_handler.py
+@@ -89,6 +89,7 @@ def test_pep8_conformance():
+ 
+ class ConfigForTest(CommandConfig):
+     def __init__(self, config, urls, cache, hooks, verbose):
++        sys.argv = sys.argv[:1]
+         (prefix, bindir) = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))
+         super().__init__('urlwatch', os.path.dirname(__file__), bindir, prefix, config, urls, hooks, cache, verbose)
+ 
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index a10260a19af1..0d15244c6acb 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -1,7 +1,7 @@
 # Template file for 'urlwatch'
 pkgname=urlwatch
-version=2.23
-revision=2
+version=2.25
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-appdirs python3-keyring python3-minidb python3-requests
@@ -9,18 +9,18 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests
 # Check the Docs for optional packages:
 # https://urlwatch.readthedocs.io/en/latest/dependencies.html#optional-packages
 checkdepends="python3-pytest python3-pycodestyle python3-docutils
- python3-Pygments ${depends}"
+ python3-Pygments python3-jq ${depends}"
 short_desc="Tool for monitoring webpages for updates"
 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=73a29efbef80c02bc8c285fca427793979c0e4bef40bc084df5de5436378b842
+checksum=6802297d3318286e7f3d36b9a4567a2fb09b0ae779d4b76811dd29a7281c1f8a
 
 do_check() {
 	# skip the tests that require python modules that aren't packaged
 	# (pdftotext & pytesseract)
-	pytest -k "not (pdf or ocr or json)" -v
+	pytest -k 'not (pdf or ocr)' -v
 }
 
 post_install() {

From 4752d5b560412ab8583ebef3f30b242de3d3a77d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 2 Apr 2022 19:44:02 +0200
Subject: [PATCH 0847/1686] knot: update to 3.1.7.

---
 srcpkgs/knot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index bf1f6107ab5d..a8f43d8d92ae 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,6 +1,6 @@
 # Template file for 'knot'
 pkgname=knot
-version=3.1.6
+version=3.1.7
 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=e9ba1305d750dc08fb08687aec7ac55737ca073deaa0b867c884e0c0f2fdb753
+checksum=ffb6887e238ce4c7df0cc76bb55a5093465275201ac12156a3390782dc49857b
 
 system_accounts="_knot"
 _knot_homedir="/var/lib/knot"

From df39001d00ad0a12246ad010b3b09eed3d68959c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 2 Apr 2022 19:44:27 +0200
Subject: [PATCH 0848/1686] poke: update to 2.3.

---
 srcpkgs/poke/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/poke/template b/srcpkgs/poke/template
index b562e96c8a4c..126a3fd67bbe 100644
--- a/srcpkgs/poke/template
+++ b/srcpkgs/poke/template
@@ -1,6 +1,6 @@
 # Template file for 'poke'
 pkgname=poke
-version=2.1
+version=2.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -12,7 +12,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.jemarch.net/poke.html"
 changelog="https://www.jemarch.net/poke-${version}-relnotes.html"
 distfiles="${GNU_SITE}/poke/poke-${version}.tar.gz"
-checksum=cd528e6c1bbc540c3b629c2b4f36b784b30a026b005a38b99283422599442670
+checksum=3690cf1116da7cb3a9ec6b4f7003e253e268b510212a288fd38aafed0ebcc766
 
 poke-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From b0dade0488953eace0c75baedf0e1273c9d2d595 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Sat, 2 Apr 2022 21:38:24 +0200
Subject: [PATCH 0849/1686] obs: update to 27.2.4.

---
 srcpkgs/obs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index f8599214a122..df6ee22e52ee 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -1,6 +1,6 @@
 # Template file for 'obs'
 pkgname=obs
-version=27.2.0
+version=27.2.4
 revision=1
 archs="i686* x86_64* ppc64le* aarch64*"
 wrksrc="obs-studio-${version}"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later"
 homepage="https://obsproject.com"
 changelog="https://github.com/obsproject/obs-studio/releases"
 distfiles="https://github.com/obsproject/obs-studio/archive/${version}.tar.gz"
-checksum=c52d99cba6c536cb805e3e0f54663c33cfc43a1b7521bec97d241019499f9789
+checksum=f7297a7421cbfe2bb4bc6bf83659bb873bc8f1186667c35c34bdbaac3f0fd5fd
 
 obs-devel_package() {
 	short_desc+=" - development files"

From 530c405fb98acee5f464fc70b2274e220f5a3fac Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 18:09:45 -0400
Subject: [PATCH 0850/1686] python3-shapely: update to 1.8.1.

---
 srcpkgs/python3-shapely/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index 8a1cf7158476..7ca8f0ddd041 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-shapely'
 pkgname=python3-shapely
-version=1.8.0
-revision=2
-wrksrc="Shapely-${version}"
+version=1.8.1
+revision=1
+wrksrc="shapely-${version}"
 build_style=python3-module
 build_helper=numpy
+make_check_target=tests
 hostmakedepends="python3-setuptools python3-Cython geos"
 makedepends="python3-devel python3-numpy geos-devel"
 depends="python3"
@@ -12,9 +13,9 @@ checkdepends="python3-pytest"
 short_desc="Library for manipulation and analysis of geometric objects for Python3"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
-homepage="https://github.com/Toblerity/Shapely"
-distfiles="https://github.com/Toblerity/Shapely/archive/${version}.tar.gz"
-checksum=492d4207b20541e3d0f31c238e07d2f55fe5e00afcfd12390bf55737901fce91
+homepage="https://github.com/shapely/shapely"
+distfiles="https://github.com/shapely/shapely/archive/${version}.tar.gz"
+checksum=daf4d5ceae7d1e4053d96af760377b843787cae0b42e6d9d19eb832204c7c8a4
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
@@ -29,7 +30,3 @@ pre_configure() {
 post_install() {
 	vlicense LICENSE.txt LICENSE
 }
-
-do_check() {
-	python3 -m pytest tests/
-}

From 1e45dbc1d7d66f86ab3cb942aaf9fa4322682abe Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 13:16:51 -0400
Subject: [PATCH 0851/1686] python3-pycollada: update to 0.7.2.

---
 srcpkgs/python3-pycollada/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pycollada/template b/srcpkgs/python3-pycollada/template
index 7aae12006353..89e7c15a05b1 100644
--- a/srcpkgs/python3-pycollada/template
+++ b/srcpkgs/python3-pycollada/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pycollada'
 pkgname=python3-pycollada
-version=0.7.1
-revision=3
+version=0.7.2
+revision=1
 wrksrc="pycollada-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://pycollada.readthedocs.io/en/latest/"
 distfiles="https://github.com/pycollada/pycollada/archive/v${version}.tar.gz"
-checksum=b0b8e1fd17e3e5a7c1befcb5ec4fa0ead1318c5ca340bb930f62f9809fbce8a1
+checksum=e3c29857a65b3dd9c0375c1074195195fc3dada95d6b5c78d246b005f2e85c93
 
 post_install() {
 	vlicense COPYING

From 42bdfe86987e4a4d6b6037ba9e6a9caf7cf03e1f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 14 Dec 2021 14:45:51 -0500
Subject: [PATCH 0852/1686] python3-trimesh: update to 3.10.7.

---
 srcpkgs/python3-trimesh/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-trimesh/template b/srcpkgs/python3-trimesh/template
index e716da771676..e51b6eb62f9d 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.34
+version=3.10.7
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -10,14 +10,13 @@ depends="python3-numpy python3-scipy python3-networkx python3-lxml
  python3-pyglet python3-shapely python3-rtree python3-Pillow python3-svg.path
  python3-jsonschema python3-psutil python3-chardet python3-sympy python3-msgpack
  python3-pycollada python3-requests"
-# unit tests fail on x86 https://github.com/mikedh/trimesh/issues/690
 checkdepends="$depends python3-pytest"
 short_desc="Python3 library for loading and using triangular meshes"
 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=713a959be0f93c049d0735f573b814cfa704c5bbfaf0c607facb61ede5a8ab2e
+checksum=e98fd2dff632729fc6fb963653b91d9f4a5a6a9a1f79493dd885e3e4d1f9c4da
 
 post_install() {
 	vlicense LICENSE.md
@@ -29,3 +28,8 @@ do_check() {
 	vsed -i 's/coveralls//' setup.py
 	python3 -m pytest
 }
+
+# disable tests for i686
+if [ "$XBPS_WORDSIZE" -eq "32" ]; then
+	make_check=no # https://github.com/mikedh/trimesh/issues/690;
+fi

From e8936df40068222f37f53a508495d0642e190958 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 00:12:43 +0300
Subject: [PATCH 0853/1686] gopls: update to 0.8.2.

---
 srcpkgs/gopls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gopls/template b/srcpkgs/gopls/template
index 434fc7fd0de8..963253e7b4ee 100644
--- a/srcpkgs/gopls/template
+++ b/srcpkgs/gopls/template
@@ -1,6 +1,6 @@
 # Template file for 'gopls'
 pkgname=gopls
-version=0.7.4
+version=0.8.2
 revision=1
 wrksrc=tools-gopls-v${version}
 build_wrksrc=gopls
@@ -11,7 +11,7 @@ maintainer="Renato Aguiar <renato@renatoaguiar.net>"
 license="MIT"
 homepage="https://github.com/golang/tools"
 distfiles="https://github.com/golang/tools/archive/gopls/v${version}.tar.gz"
-checksum=7ce445846ffb0a33faed244206b142f9d307f326a35d09d18c6267538203bcf7
+checksum=761aa768e82a958e6f803db39215c995fe0f263df825ed1cbb9f6b2989f0cd00
 
 post_install() {
 	vlicense ../LICENSE

From 2509f911c02fd8c6eb0a5d3e3b90e2a48df9b164 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 1 Apr 2022 19:40:47 +0400
Subject: [PATCH 0854/1686] calibre: update to 5.40.0.

---
 srcpkgs/calibre/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 9f59df3a0350..036b195ac996 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,6 +1,6 @@
 # Template file for 'calibre'
 pkgname=calibre
-version=5.39.0
+version=5.40.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=2fbe45ec9d4dea481772cc290e27567efdba60cd9d2fe736713d9b1eb020582e
+checksum=e0ec0e2352926f165f4b9cbe67666ea2bd181f7cb702e98487391168a099d794
 python_version=3
 lib32disabled=yes
 nocross=yes

From dcf745ab28549db4668ebbf4216da608c66e9124 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sat, 2 Apr 2022 11:09:17 -0400
Subject: [PATCH 0855/1686] python3-svg.path: update to 5.1.

---
 srcpkgs/python3-svg.path/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template
index 6abf6ff8ca83..0d92697a0a9a 100644
--- a/srcpkgs/python3-svg.path/template
+++ b/srcpkgs/python3-svg.path/template
@@ -1,17 +1,20 @@
 # Template file for 'python3-svg.path'
 pkgname=python3-svg.path
-version=4.1
-revision=3
+version=5.1
+revision=1
 wrksrc="svg.path-${version}"
 build_style=python3-module
+# disable failing test
+make_check_args="-k not(ImageTest)"
 hostmakedepends="python3-setuptools"
 depends="python3"
+checkdepends="python3-pytest-cov python3-Pillow"
 short_desc="Python3 SVG path parser"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://github.com/regebro/svg.path"
 distfiles="https://github.com/regebro/svg.path/archive/${version}.tar.gz"
-checksum=8fe78a5ff8f379c78dac4a3ba623068a8a2af434dace24103a053e06525d400d
+checksum=2ea5351a5886f8c55ae8fddb2f7182dca3d5760c03abade9cb256b91e4bb9bb4
 
 post_install() {
 	vlicense LICENSE.txt

From 3b7e2c547d28cefc3612f8887a6e88eb5c76df03 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sat, 2 Apr 2022 16:07:02 +0300
Subject: [PATCH 0856/1686] qutebrowser: update to 2.5.0.

---
 srcpkgs/qutebrowser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 5dc61ab30aa9..4368870992a4 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -1,6 +1,6 @@
 # Template file for 'qutebrowser'
 pkgname=qutebrowser
-version=2.4.0
+version=2.5.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=f2cd9abb14ebabf9630573b2fb8447be192877787dc4e3964e1b55f72a8592ec
+checksum=e18442a230570f25918a2e89ad4d073ace46c4f59b5fdda2e80ab3c4764451fd
 nostrip=yes
 # testing requires unpackaged plugins:
 # pytest-bdd, pytest-benchmark, pytest-instafail, pytest-rerunfailures

From d2f0e8570532a144f0125de4c5c1a54a1efe0398 Mon Sep 17 00:00:00 2001
From: Bas Ploeger <5904333+basploeger@users.noreply.github.com>
Date: Fri, 1 Apr 2022 20:59:18 +0200
Subject: [PATCH 0857/1686] html-xml-utils: update to 8.4.

---
 srcpkgs/html-xml-utils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/html-xml-utils/template b/srcpkgs/html-xml-utils/template
index 81fda5d90a25..8086cc668499 100644
--- a/srcpkgs/html-xml-utils/template
+++ b/srcpkgs/html-xml-utils/template
@@ -1,6 +1,6 @@
 # Template file for 'html-xml-utils'
 pkgname=html-xml-utils
-version=8.3
+version=8.4
 revision=1
 build_style=gnu-configure
 makedepends="libidn-devel"
@@ -9,4 +9,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="W3C"
 homepage="https://www.w3.org/Tools/HTML-XML-utils/README"
 distfiles="https://www.w3.org/Tools/HTML-XML-utils/${pkgname}-${version}.tar.gz"
-checksum=a50c4d16dad660ad6792ef53bc77efa9d5729797623771a3fce52d8e23d3d08c
+checksum=41bb9b14e1f4cd6102e3f8dfb79e7146a24c09693869873165c421769a57d137

From f74de9841cf86c158d4a6a886cfa377bbe50934f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Fri, 1 Apr 2022 20:08:19 +0400
Subject: [PATCH 0858/1686] libgcrypt: update to 1.10.1.

---
 srcpkgs/libgcrypt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgcrypt/template b/srcpkgs/libgcrypt/template
index b3285e6f8edf..52cae3478601 100644
--- a/srcpkgs/libgcrypt/template
+++ b/srcpkgs/libgcrypt/template
@@ -1,6 +1,6 @@
 # Template file for 'libgcrypt'
 pkgname=libgcrypt
-version=1.10.0
+version=1.10.1
 revision=1
 build_style=gnu-configure
 configure_args="--enable-static --without-capabilities"
@@ -10,7 +10,7 @@ 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=6a00f5c05caa4c4acc120c46b63857da0d4ff61dc4b4b03933fa8d46013fae81
+checksum=ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" ac_cv_sys_symbol_underscore=no"

From 23392c167181c06254ca06e10806337202373494 Mon Sep 17 00:00:00 2001
From: Ricardo Steijn <ricardo.steijn97@gmail.com>
Date: Sat, 2 Apr 2022 19:06:32 +0200
Subject: [PATCH 0859/1686] lutris: update to 0.5.10

---
 srcpkgs/lutris/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template
index 431fcf6c59a2..a59268c0c167 100644
--- a/srcpkgs/lutris/template
+++ b/srcpkgs/lutris/template
@@ -1,6 +1,6 @@
 # Template file for 'lutris'
 pkgname=lutris
-version=0.5.9.1
+version=0.5.10
 revision=1
 build_style=meson
 hostmakedepends="gettext python3-setuptools python3-gobject gtk+3-devel"
@@ -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=c140ec6ac62b4f9eeaa7065229dfa1c4fb08194bc0fb118c831d894c43914f88
+checksum=f174fdbff15bb26c4bdf531d4e75b9e3954f858297f811cb478f46a9d183f2d0

From 7add5479816c4b50d727a3fccd96bf2daf57cd7d Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 1 Apr 2022 16:00:59 +0200
Subject: [PATCH 0860/1686] qpwgraph: update to 0.2.4.

---
 srcpkgs/qpwgraph/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qpwgraph/template b/srcpkgs/qpwgraph/template
index cb19601bbb89..5e83972a7062 100644
--- a/srcpkgs/qpwgraph/template
+++ b/srcpkgs/qpwgraph/template
@@ -1,6 +1,6 @@
 # Template file for 'qpwgraph'
 pkgname=qpwgraph
-version=0.2.2
+version=0.2.4
 revision=1
 wrksrc="qpwgraph-v${version}"
 build_style=cmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://gitlab.freedesktop.org/rncbc/qpwgraph"
 changelog="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/ChangeLog"
 distfiles="https://gitlab.freedesktop.org/rncbc/qpwgraph/-/archive/v${version}/qpwgraph-v${version}.tar.gz"
-checksum=622592c7fab8be3281eefee8979706ea8a063c98eb0f48a0c4c87655c3de7abf
+checksum=5e2ad77e794367e3e1e6df5214e8770135941092ffac49bbbaaf7619decb54b5

From c675105503e4fc74cffd6926bf3ad292e67a4897 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 31 Mar 2022 02:49:32 +0200
Subject: [PATCH 0861/1686] shared-mime-info: update to 2.2.

---
 .../shared-mime-info/patches/meson-0.60.patch | 100 ------------------
 srcpkgs/shared-mime-info/template             |   8 +-
 2 files changed, 4 insertions(+), 104 deletions(-)
 delete mode 100644 srcpkgs/shared-mime-info/patches/meson-0.60.patch

diff --git a/srcpkgs/shared-mime-info/patches/meson-0.60.patch b/srcpkgs/shared-mime-info/patches/meson-0.60.patch
deleted file mode 100644
index 2faa59925845..000000000000
--- a/srcpkgs/shared-mime-info/patches/meson-0.60.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Mon, 8 Nov 2021 18:22:47 -0500
-Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating
- translated XML
-
-gettext upstream has supported this for a very long time (since 0.19.7
-via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015),
-and itstool is (mostly) a legacy of the time before gettext had proper
-support for these sorts of use cases.
-
-This is similar to the state of intltool, which is described at
-https://wiki.gnome.org/MigratingFromIntltoolToGettext
-
-During the port from autotools to meson, the legacy use of itstool was
-faithfully translated to meson in the only way possible: by jumping
-through hoops to run ninja inside ninja in order to generate the .mo
-files for itstool, because meson's i18n module used a flawed design and
-there was no "real" target to create those files, only a .PHONY
-run_target which other rules cannot depend on.
-
-Although meson 0.60.0 added support for real targets for the built .mo
-files, this changed the rules for output filenames, breaking the script.
-
-But msgfmt does not care, and anyways comes with builtin meson functions
-for convenient use with XML files. So let's take this opportunity to
-drop legacy dependencies and use the modern, builtin tooling, which
-fixes this bug as a side effect.
-
-Fixes #170
----
- .gitlab-ci.yml               |  2 --
- README.md                    |  2 +-
- data/freedesktop_generate.sh | 12 ------------
- data/meson.build             | 16 +++++-----------
- meson.build                  |  1 -
- 5 files changed, 6 insertions(+), 27 deletions(-)
- delete mode 100755 data/freedesktop_generate.sh
-
-diff --git a/data/freedesktop_generate.sh b/data/freedesktop_generate.sh
-deleted file mode 100755
-index 62ccffa..0000000
---- a/data/freedesktop_generate.sh
-+++ /dev/null
-@@ -1,12 +0,0 @@
--#!/bin/sh -e
--
--src_root="$1"
--build_root="$2"
--
--ninja -C "${build_root}" shared-mime-info-gmo
--
--itstool \
--    --its "${src_root}/data/its/shared-mime-info.its" \
--    --join "${src_root}/data/freedesktop.org.xml.in" \
--    -o "${build_root}/data/freedesktop.org.xml" \
--    "${build_root}/po/"*".gmo"
-diff --git a/data/meson.build b/data/meson.build
-index 24361c9..09ed7a9 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -1,18 +1,12 @@
- 
- install_man('update-mime-database.1')
- 
--freedesktop_org_xml = custom_target('freedesktop.org.xml',
--    input : files(
--        'freedesktop.org.xml.in',
--        'its/shared-mime-info.its',
--        'its/shared-mime-info.loc',
--    ),
-+freedesktop_org_xml = i18n.merge_file(
-+    input: 'freedesktop.org.xml.in',
-     output: 'freedesktop.org.xml',
--    command: [
--        find_program('freedesktop_generate.sh'),
--        meson.source_root(),
--        meson.build_root()
--    ],
-+    data_dirs: '.',
-+    po_dir: '../po',
-+    type: 'xml',
-     install: true,
-     install_dir: get_option('datadir') / 'mime' / 'packages',
- )
-diff --git a/meson.build b/meson.build
-index 0d08c8a..60f17ae 100644
---- a/meson.build
-+++ b/meson.build
-@@ -20,7 +20,6 @@ config.set_quoted('VERSION', meson.project_version())
- ###############################################################################
- # Find tools
- 
--itstool = find_program('itstool')
- xmllint = find_program('xmllint')
- xmlto   = find_program('xmlto', required: false)
- 
--- 
-GitLab
-
diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template
index f5afb2dd54c9..0fd71959fff0 100644
--- a/srcpkgs/shared-mime-info/template
+++ b/srcpkgs/shared-mime-info/template
@@ -1,7 +1,7 @@
 # Template file for 'shared-mime-info'
 pkgname=shared-mime-info
-version=2.1
-revision=2
+version=2.2
+revision=1
 build_style=meson
 configure_args="-Dupdate-mimedb=false"
 hostmakedepends="pkg-config gettext xmlto"
@@ -11,5 +11,5 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://freedesktop.org/Software/shared-mime-info"
 changelog="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/raw/master/NEWS"
-distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/0ee50652091363ab0d17e335e5e74fbe/shared-mime-info-${version}.tar.xz"
-checksum=b2d40cfcdd84e835d0f2c9107b3f3e77e9cf912f858171fe779946da634e8563
+distfiles="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${version}/shared-mime-info-${version}.tar.gz"
+checksum=bcf5d552318136cf7b3ae259975f414fbcdc9ebce000c87cf1f0901ff14e619f

From 06393c7ba7219ccbd6f43477930ca9f3cfd76a18 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 28 Mar 2022 19:28:16 +0200
Subject: [PATCH 0862/1686] chatterino2: update to 2.3.4.

---
 .../patches/0001-fix-desktop-icon-name.patch  | 13 +++
 .../patches/0001-use-system-deps.patch        | 58 -------------
 srcpkgs/chatterino2/patches/cmake.patch       | 36 ++++++++
 srcpkgs/chatterino2/template                  | 84 ++++++++++---------
 4 files changed, 92 insertions(+), 99 deletions(-)
 create mode 100644 srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
 delete mode 100644 srcpkgs/chatterino2/patches/0001-use-system-deps.patch
 create mode 100644 srcpkgs/chatterino2/patches/cmake.patch

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
new file mode 100644
index 000000000000..9f41d03190b7
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -0,0 +1,13 @@
+diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
+index 6ee45354..ece81f5c 100644
+--- a/chatterino2/resources/com.chatterino.chatterino.desktop
++++ b/chatterino2/resources/com.chatterino.chatterino.desktop
+@@ -4,7 +4,7 @@ Version=1.0
+ Name=Chatterino
+ Comment=Chat client for Twitch
+ Exec=chatterino
+-Icon=chatterino
++Icon=com.chatterino.chatterino
+ Terminal=false
+ Categories=Network;InstantMessaging;
+ StartupWMClass=chatterino
diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
deleted file mode 100644
index 383c5ea23f43..000000000000
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git chatterino.pro chatterino.pro
-index d8b14bbe..f7657f06 100644
---- a/chatterino.pro
-+++ b/chatterino.pro
-@@ -12,10 +12,17 @@
- #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
-
- QT                += widgets core gui network multimedia svg concurrent
--CONFIG            += communi
--COMMUNI           += core model util
-
- INCLUDEPATH       += src/
-+# libcommuni
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcCore
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcModel
-+INCLUDEPATH       += /usr/include/qt5/Communi/IrcUtil
-+DEFINES           += IRC_SHARED
-+LIBS              += -lIrcCore -lIrcModel -lIrcUtil
-+# qtkeychain
-+INCLUDEPATH       += /usr/include/qt5keychain
-+LIBS              += -lqt5keychain
- TARGET             = chatterino
- TEMPLATE           = app
- PRECOMPILED_HEADER = src/PrecompiledHeader.hpp
-@@ -78,7 +85,6 @@ CONFIG(debug, debug|release) {
- include(lib/warnings.pri)
- include(lib/fmt.pri)
- include(lib/humanize.pri)
--include(lib/libcommuni.pri)
- include(lib/websocketpp.pri)
- include(lib/wintoast.pri)
- include(lib/signals.pri)
-@@ -86,7 +92,6 @@ include(lib/settings.pri)
- include(lib/serialize.pri)
- include(lib/winsdk.pri)
- include(lib/rapidjson.pri)
--include(lib/qtkeychain.pri)
-
- exists( $$OUT_PWD/conanbuildinfo.pri ) {
-     message("Using conan packages")
-diff --git src/common/Credentials.cpp src/common/Credentials.cpp
-index 87abecb9..5de78130 100644
---- a/src/common/Credentials.cpp
-+++ b/src/common/Credentials.cpp
-@@ -1,12 +1,12 @@
- #include "Credentials.hpp"
- 
- #include "debug/AssertInGuiThread.hpp"
--#include "keychain.h"
- #include "singletons/Paths.hpp"
- #include "singletons/Settings.hpp"
- #include "util/CombinePath.hpp"
- #include "util/Overloaded.hpp"
- 
-+#include <qt5keychain/keychain.h>
- #include <QSaveFile>
- #include <boost/variant.hpp>
- 
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
new file mode 100644
index 000000000000..a59d0a4eb9f0
--- /dev/null
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -0,0 +1,36 @@
+diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
+index 82905436..b0b89a4e 100644
+--- a/chatterino2/cmake/FindLRUCache.cmake
++++ b/chatterino2/cmake/FindLRUCache.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache)
++find_path(LRUCache_INCLUDE_DIR lrucache/lrucache.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/lrucache NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(LRUCache DEFAULT_MSG LRUCache_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
+index 4671874c..119284c2 100644
+--- a/chatterino2/cmake/FindPajladaSerialize.cmake
++++ b/chatterino2/cmake/FindPajladaSerialize.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include)
++find_path(PajladaSerialize_INCLUDE_DIR pajlada/serialize.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/serialize/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSerialize DEFAULT_MSG PajladaSerialize_INCLUDE_DIR)
+ 
+diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
+index f4c964ec..75efba20 100644
+--- a/chatterino2/cmake/FindPajladaSignals.cmake
++++ b/chatterino2/cmake/FindPajladaSignals.cmake
+@@ -1,6 +1,6 @@
+ include(FindPackageHandleStandardArgs)
+ 
+-find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include)
++find_path(PajladaSignals_INCLUDE_DIR pajlada/signals/signal.hpp HINTS ${CMAKE_SOURCE_DIR}/lib/signals/include NO_CMAKE_FIND_ROOT_PATH)
+ 
+ find_package_handle_standard_args(PajladaSignals DEFAULT_MSG PajladaSignals_INCLUDE_DIR)
+ 
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index f69730b3a9fe..e1f99ac9e9fc 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,55 +1,57 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.2.2
-revision=2
-_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
-_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
-_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
-_serialize_commit=130ffc3ec722284ca454a1e70c5478a75f380144
-build_style=qmake
-configure_args="INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcCore
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcModel
- INCLUDEPATH+=$XBPS_CROSS_BASE/usr/include/qt5/Communi/IrcUtil"
-hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
-makedepends="qt5-svg-devel qt5-multimedia-devel
- boost-devel rapidjson libcommuni-devel websocketpp
- qtkeychain-qt5-devel"
-short_desc="Qt-based twitch chat client"
-maintainer="Franc[e]sco <lolisamurai@tfwno.gf>"
-license="MIT"
+version=2.3.4
+revision=1
+_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
+_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
+_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
+_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
+create_wrksrc=yes
+build_wrksrc="chatterino2"
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
+ boost-devel openssl-devel rapidjson websocketpp"
+depends="qt5-imageformats qt5-svg"
+short_desc="Chat client for twitch.tv"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license=MIT
 homepage="https://chatterino.com"
 changelog="https://chatterino.com/changelog"
-distfiles="https://github.com/fourtf/chatterino2/archive/v${version}.tar.gz
- https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${version}.tar.gz
+ https://github.com/Chatterino/libcommuni/archive/${_libcommuni_commit}.tar.gz
+ https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
- https://github.com/pajlada/humanize/archive/${_humanize_commit}.tar.gz
- https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz"
-checksum="6e3d64f319728ccf9fd09613df754108157e7d3b4148ee2da1a3209bf369be70
-e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
-f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
-5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
-eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
+ https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
+ https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
+ https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
+checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
+ ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+ d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
+ 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
+ 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
+ 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" LIBS+=-latomic"
+	LIBS="-latomic"
 fi
 
 post_extract() {
-	rmdir lib/signals
-	rmdir lib/settings
-	rmdir lib/humanize
-	rmdir lib/serialize
-	mv "${XBPS_BUILDDIR}/signals-${_signals_commit}/" lib/signals/
-	mv "${XBPS_BUILDDIR}/settings-${_settings_commit}/" lib/settings/
-	mv "${XBPS_BUILDDIR}/humanize-${_humanize_commit}/" lib/humanize/
-	mv "${XBPS_BUILDDIR}/serialize-${_serialize_commit}/" lib/serialize/
-}
-
-pre_configure() {
-	# it wraps libcommuni in a namespace but void's binaries don't
-	find \( -name '*.cpp' -o -name '*.hpp' \) \
-		-exec sed -i "{}" -e 's/Communi::/::/g' \;
+	mv "chatterino2-${version}" "${build_wrksrc}"
+	rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \
+	      ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \
+	      ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \
+	      ${build_wrksrc}/lib/qtkeychain ${build_wrksrc}/cmake/sanitizers-cmake
+	mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni"
+	mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize"
+	mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings"
+	mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals"
+	mv "qtkeychain-${_qtkeychain_commit}" "${build_wrksrc}/lib/qtkeychain"
+	mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake"
 }
 
 post_install() {

From 546885448dfd2eb98e3af2fcd677710f2ab92ea5 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Fri, 1 Apr 2022 21:45:08 +0200
Subject: [PATCH 0863/1686] sonic-visualiser: update to 4.5

---
 srcpkgs/sonic-visualiser/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template
index fbc1ea3067c2..a61f4cf5721e 100644
--- a/srcpkgs/sonic-visualiser/template
+++ b/srcpkgs/sonic-visualiser/template
@@ -1,7 +1,7 @@
 # Template file for 'sonic-visualiser'
 pkgname=sonic-visualiser
-version=4.4
-revision=2
+version=4.5
+revision=1
 build_style=meson
 hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
 makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
@@ -14,7 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.sonicvisualiser.org/"
 changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
 distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
-checksum=762d95cfceff5f2ba31bb632596f6c822ca5b4ee21f3e3615add20bfc24ae16e
+checksum=c57b8277b51e7b0accdc6c3b5a575d3961b43ed9e5e0661e053a6ac388ab82a3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From 50224705238d257f8ef792465e1781519c5ebd34 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 Apr 2022 02:32:24 +0200
Subject: [PATCH 0864/1686] go: fix build on ppc64le-musl

---
 .../fix-ppc64le-startup-detection.patch       | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 srcpkgs/go/patches/fix-ppc64le-startup-detection.patch

diff --git a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
new file mode 100644
index 000000000000..6cc2ab337249
--- /dev/null
+++ b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
@@ -0,0 +1,81 @@
+From 946167906ed8646c433c257b074a10e01f0a7dab Mon Sep 17 00:00:00 2001
+From: "Paul E. Murphy" <murp@ibm.com>
+Date: Tue, 22 Mar 2022 11:52:02 -0500
+Subject: [PATCH] runtime: make static/dynamic startup detection work with musl
+ on ppc64le
+
+The glibc loader explicitly sets the first doubleword on the stack (R1)
+to $0 to indicate it was dynamically loaded.
+
+An ELFv2 ABI compliant loader will set R3/R4 to argc/argv when starting
+the process, and R13 to TLS. musl is not compliant. Instead it passes
+argc/argv like the kernel, but R3/R4 are in an undefined state and R13
+is valid.
+
+With the knowledge above, the startup code can be modified to
+dynamically handle all three cases when linked internally.
+
+Fixes #51787
+
+Change-Id: I5de33862c161900d9161817388bbc13a65fdc69c
+Reviewed-on: https://go-review.googlesource.com/c/go/+/394654
+Reviewed-by: Cherry Mui <cherryyz@google.com>
+Run-TryBot: Paul Murphy <murp@ibm.com>
+TryBot-Result: Gopher Robot <gobot@golang.org>
+Trust: Paul Murphy <murp@ibm.com>
+Trust: Lynn Boger <laboger@linux.vnet.ibm.com>
+---
+ src/runtime/rt0_linux_ppc64le.s | 32 +++++++++++++++++++++-----------
+ 1 file changed, 21 insertions(+), 11 deletions(-)
+
+diff --git a/src/runtime/rt0_linux_ppc64le.s b/src/runtime/rt0_linux_ppc64le.s
+index 4f7c6e6c99f6..66f7e7b22a41 100644
+--- a/go/src/runtime/rt0_linux_ppc64le.s
++++ b/go/src/runtime/rt0_linux_ppc64le.s
+@@ -147,25 +147,35 @@ TEXT _main<>(SB),NOSPLIT,$-8
+ 	// In a statically linked binary, the stack contains argc,
+ 	// argv as argc string pointers followed by a NULL, envv as a
+ 	// sequence of string pointers followed by a NULL, and auxv.
+-	// There is no TLS base pointer.
++	// The TLS pointer should be initialized to 0.
+ 	//
+-	// In a dynamically linked binary, r3 contains argc, r4
+-	// contains argv, r5 contains envp, r6 contains auxv, and r13
++	// In an ELFv2 compliant dynamically linked binary, R3 contains argc,
++	// R4 contains argv, R5 contains envp, R6 contains auxv, and R13
+ 	// contains the TLS pointer.
+ 	//
+-	// Figure out which case this is by looking at r4: if it's 0,
+-	// we're statically linked; otherwise we're dynamically
+-	// linked.
+-	CMP	R0, R4
+-	BNE	dlink
+-
+-	// Statically linked
++	// When loading via glibc, the first doubleword on the stack points
++	// to NULL a value. (that is *(uintptr)(R1) == 0). This is used to
++	// differentiate static vs dynamicly linked binaries.
++	//
++	// If loading with the musl loader, it doesn't follow the ELFv2 ABI. It
++	// passes argc/argv similar to the linux kernel, R13 (TLS) is
++	// initialized, and R3/R4 are undefined.
++	MOVD	(R1), R12
++	CMP	R0, R12
++	BEQ	tls_and_argcv_in_reg
++
++	// Arguments are passed via the stack (musl loader or a static binary)
+ 	MOVD	0(R1), R3 // argc
+ 	ADD	$8, R1, R4 // argv
++
++	// Did the TLS pointer get set? If so, don't change it (e.g musl).
++	CMP	R0, R13
++	BNE	tls_and_argcv_in_reg
++
+ 	MOVD	$runtime·m0+m_tls(SB), R13 // TLS
+ 	ADD	$0x7000, R13
+ 
+-dlink:
++tls_and_argcv_in_reg:
+ 	BR	main(SB)
+ 
+ TEXT main(SB),NOSPLIT,$-8

From 0d94d7ebc34f7d008754180077875b97c2f13a93 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 31 Mar 2022 02:45:46 +0200
Subject: [PATCH 0865/1686] chromium: update to 100.0.4896.60.

Closes https://github.com/void-linux/void-packages/pull/36433
---
 ...romium-100-SCTHashdanceMetadata-move.patch | 35 +++++++++
 .../disable-aarch64-memory-tagging.patch      | 16 -----
 ...x-aarch64-musl-memory-tagging-macros.patch | 29 ++++++++
 .../fix-build-break-with-system-libdrm.patch  | 62 ----------------
 .../patches/fix-stack-utils-with-musl.patch   | 12 ++--
 ...ne_MM_Var-in-CFX_Font-AdjustMMParams.patch | 71 -------------------
 .../patches/xxx-ppc64le-support.patch         | 12 ++--
 srcpkgs/chromium/template                     |  4 +-
 8 files changed, 78 insertions(+), 163 deletions(-)
 create mode 100644 srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
 delete mode 100644 srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch
 create mode 100644 srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch
 delete mode 100644 srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch
 delete mode 100644 srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch

diff --git a/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
new file mode 100644
index 000000000000..903942906c7d
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-100-SCTHashdanceMetadata-move.patch
@@ -0,0 +1,35 @@
+From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 23 Feb 2022 12:18:57 +0100
+Subject: [PATCH] GCC: explicitely move return value of SCTHashdanceMetadata::ToValue
+
+GCC rejects to do Return Value Optimization in
+SCTHashdanceMetadata::ToValue, because the copy constructor is
+deleted, and in that scenario RVO is rejected in GCC:
+    ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ‘base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const’:
+    ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ‘base::Value::Value(const base::Value&)’
+      191 |   return value;
+          |          ^~~~~
+    In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14,
+                     from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5:
+    ../../base/values.h:254:3: note: declared here
+      254 |   Value(const Value&) = delete;
+          |   ^~~~~
+
+Bug: 819294
+Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166
+---
+
+diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc
+index a057e8e..365527b 100644
+--- a/services/network/sct_auditing/sct_auditing_reporter.cc
++++ b/services/network/sct_auditing/sct_auditing_reporter.cc
+@@ -188,7 +188,7 @@
+       kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id))));
+   value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd));
+   value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry));
+-  return value;
++  return std::move(value);
+ }
+ 
+ // static
diff --git a/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch b/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch
deleted file mode 100644
index 0596c6364a68..000000000000
--- a/srcpkgs/chromium/patches/disable-aarch64-memory-tagging.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This is broken in the current release and would require a lot of patches to be
-backported. Remove this patch for the next release.
-
---- a/base/memory/tagging.h
-+++ b/base/memory/tagging.h
-@@ -14,10 +14,6 @@
- #include "base/compiler_specific.h"
- #include "build/build_config.h"
- 
--#if defined(ARCH_CPU_ARM64) && defined(__clang__) && \
--    (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID))
--#define HAS_MEMORY_TAGGING 1
--#endif
- 
- constexpr int kMemTagGranuleSize = 16u;
- #if defined(HAS_MEMORY_TAGGING)
diff --git a/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch b/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch
new file mode 100644
index 000000000000..afcdae179850
--- /dev/null
+++ b/srcpkgs/chromium/patches/fix-aarch64-musl-memory-tagging-macros.patch
@@ -0,0 +1,29 @@
+--- a/base/allocator/partition_allocator/tagging.cc
++++ b/base/allocator/partition_allocator/tagging.cc
+@@ -28,13 +28,25 @@
+ #endif
+ #endif
+ 
+-#ifndef HAS_PR_MTE_MACROS
++#ifndef PR_MTE_TCF_SHIFT
+ #define PR_MTE_TCF_SHIFT 1
++#endif
++#ifndef PR_MTE_TCF_NONE
+ #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_SYNC
+ #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_ASYNC
+ #define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TCF_MASK
+ #define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT)
++#endif
++#ifndef PR_MTE_TAG_SHIFT
+ #define PR_MTE_TAG_SHIFT 3
++#endif
++#ifndef PR_MTE_TAG_MASK
+ #define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT)
+ #endif
+ #endif
diff --git a/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch b/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch
deleted file mode 100644
index fe8eee6d1e94..000000000000
--- a/srcpkgs/chromium/patches/fix-build-break-with-system-libdrm.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 5b287e0be8d8d8475ec6ef81b16eaa61e19db078 Mon Sep 17 00:00:00 2001
-From: "Steinar H. Gunderson" <sesse@chromium.org>
-Date: Tue, 25 Jan 2022 19:14:53 +0000
-Subject: [PATCH] Fix build break with system libdrm.
-
-This patch is submitted on behalf of Andres Salomon
-<dilinger@queued.net> (on Cc). Also adding him to src/AUTHORS
-per policy, as he has signed the CLA.
-
-Original patch:
-https://salsa.debian.org/dilinger/chromium/-/commit/2333c2fb985ac1ef3d7331776a7833d965c63302
-
-Change-Id: I18bd60e2e80f2b9181e74ee7972c3f457ab33b10
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3401704
-Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
-Commit-Queue: Steinar H Gunderson <sesse@chromium.org>
-Auto-Submit: Steinar H Gunderson <sesse@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#963119}
----
- AUTHORS                                      | 1 +
- media/gpu/chromeos/BUILD.gn                  | 1 +
- media/gpu/chromeos/video_decoder_pipeline.cc | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/AUTHORS b/AUTHORS
-index 0eba3de5065..50edd3f6b38 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -93,6 +93,7 @@ Andreas Papacharalampous <andreas@apap04.com>
- Andrei Borza <andrei.borza@gmail.com>
- Andrei Parvu <andrei.prv@gmail.com>
- Andrei Parvu <parvu@adobe.com>
-+Andres Salomon <dilinger@queued.net>
- Andreu Botella <andreu@andreubotella.com>
- Andrew Boyarshin <andrew.boyarshin@gmail.com>
- Andrew Brampton <me@bramp.net>
-diff --git a/media/gpu/chromeos/BUILD.gn b/media/gpu/chromeos/BUILD.gn
-index 7cb4c3ea39a..6fe21c15ecc 100644
---- a/media/gpu/chromeos/BUILD.gn
-+++ b/media/gpu/chromeos/BUILD.gn
-@@ -25,6 +25,7 @@ source_set("chromeos") {
- 
-   deps = [
-     "//base",
-+    "//build/config/linux/libdrm",
-     "//media",
-     "//media/gpu:buildflags",
-     "//media/gpu:command_buffer_helper",
-diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc
-index d2f154ea0d8..416b9434a8d 100644
---- a/media/gpu/chromeos/video_decoder_pipeline.cc
-+++ b/media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -28,8 +28,8 @@
- #include "third_party/abseil-cpp/absl/types/optional.h"
- 
- #if BUILDFLAG(USE_VAAPI)
-+#include <drm_fourcc.h>
- #include "media/gpu/vaapi/vaapi_video_decoder.h"
--#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
- #elif BUILDFLAG(USE_V4L2_CODEC)
- #include "media/gpu/v4l2/v4l2_video_decoder.h"
- #else
diff --git a/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch b/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch
index bb48d95312b3..7936aa6e0db4 100644
--- a/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch
+++ b/srcpkgs/chromium/patches/fix-stack-utils-with-musl.patch
@@ -4,17 +4,17 @@
  // 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)
+-#elif defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
+     BUILDFLAG(IS_FUCHSIA)
    // pthread_getattr_np() can fail if the thread is not invoked by
    // pthread_create() (e.g., the main thread of blink_unittests).
 @@ -97,7 +97,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)
+-#if defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
+     BUILDFLAG(IS_FUCHSIA)
    pthread_attr_t attr;
    int error;
diff --git a/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch b/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch
deleted file mode 100644
index 2cdbd02a8269..000000000000
--- a/srcpkgs/chromium/patches/use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From ffeb67faf715475f6e463d65c368f556780adf19 Mon Sep 17 00:00:00 2001
-From: Lei Zhang <thestig@chromium.org>
-Date: Mon, 31 Jan 2022 22:42:35 +0000
-Subject: [PATCH] Use FT_Done_MM_Var() in CFX_Font::AdjustMMParams() when
- possible.
-
-When FreeType has FT_Done_MM_Var(), use that to free memory in
-CFX_Font::AdjustMMParams() to avoid mismatched alloc/free functions.
-
-Bug: pdfium:1400
-Change-Id: I044540893103921fc64cdd53fcd628cfebf2c9db
-Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/90130
-Reviewed-by: Nigi <nigi@chromium.org>
-Commit-Queue: Lei Zhang <thestig@chromium.org>
----
- core/fxge/cfx_font.cpp | 28 ++++++++++++++++++++++++++--
- 1 file changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp
-index c08fe9608..8b3a72700 100644
---- a/third_party/pdfium/core/fxge/cfx_font.cpp
-+++ b/third_party/pdfium/core/fxge/cfx_font.cpp
-@@ -44,6 +44,30 @@ struct OUTLINE_PARAMS {
-   float m_CoordUnit;
- };
- 
-+// TODO(crbug.com/pdfium/1400): When FT_Done_MM_Var() is more likely to be
-+// available to all users in the future, remove FreeMMVar() and use
-+// FT_Done_MM_Var() directly.
-+//
-+// Use weak symbols to check if FT_Done_MM_Var() is available at runtime.
-+#if !BUILDFLAG(IS_WIN)
-+extern "C" __attribute__((weak)) decltype(FT_Done_MM_Var) FT_Done_MM_Var;
-+#endif
-+
-+void FreeMMVar(FXFT_FaceRec* rec, FXFT_MM_VarPtr variation_desc) {
-+#if BUILDFLAG(IS_WIN)
-+  // Assume `use_system_freetype` GN var is never set on Windows.
-+  constexpr bool has_ft_done_mm_var_func = true;
-+#else
-+  static const bool has_ft_done_mm_var_func = !!FT_Done_MM_Var;
-+#endif
-+  if (has_ft_done_mm_var_func) {
-+    FT_Done_MM_Var(CFX_GEModule::Get()->GetFontMgr()->GetFTLibrary(),
-+                   variation_desc);
-+  } else {
-+    FXFT_Free(rec, variation_desc);
-+  }
-+}
-+
- FX_RECT FXRectFromFTPos(FT_Pos left, FT_Pos top, FT_Pos right, FT_Pos bottom) {
-   return FX_RECT(pdfium::base::checked_cast<int32_t>(left),
-                  pdfium::base::checked_cast<int32_t>(top),
-@@ -645,7 +669,7 @@ void CFX_Font::AdjustMMParams(int glyph_index,
-     FT_Pos max_width = FXFT_Get_Glyph_HoriAdvance(m_Face->GetRec()) * 1000 /
-                        FXFT_Get_Face_UnitsPerEM(m_Face->GetRec());
-     if (max_width == min_width) {
--      FXFT_Free(m_Face->GetRec(), pMasters);
-+      FreeMMVar(m_Face->GetRec(), pMasters);
-       return;
-     }
-     FT_Pos param = min_param + (max_param - min_param) *
-@@ -653,7 +677,7 @@ void CFX_Font::AdjustMMParams(int glyph_index,
-                                    (max_width - min_width);
-     coords[1] = param;
-   }
--  FXFT_Free(m_Face->GetRec(), pMasters);
-+  FreeMMVar(m_Face->GetRec(), pMasters);
-   FT_Set_MM_Design_Coordinates(m_Face->GetRec(), 2, coords);
- }
- 
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index b95e58c834b1..0be29c1a4eec 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3403,10 +3403,10 @@ index 9ab5e00b8..ad3feffee 100755
    template_sources = _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
+diff --git a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
 index 0b4bd72f0..a0caa5e71 100644
---- a/third_party/dav1d/libdav1d/src/ppc/types.h
-+++ b/third_party/dav1d/libdav1d/src/ppc/types.h
+--- a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
++++ b/third_party/dav1d/libdav1d/src/ppc/dav1d_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))
@@ -3520,17 +3520,17 @@ diff --git a/third_party/skia/src/sksl/SkSLString.cpp b/third_party/skia/src/sks
 index ec3e56964..4cf8999a2 100644
 --- a/third_party/skia/src/sksl/SkSLString.cpp
 +++ b/third_party/skia/src/sksl/SkSLString.cpp
-@@ -234,7 +234,12 @@ String to_string(double value) {
+@@ -37,7 +37,12 @@ String to_string(double value) {
      if (needsDotZero) {
          buffer << ".0";
      }
--    return String(buffer.str().c_str());
+-    return buffer.str();
 +
 +    std::string ret(buffer.str());
 +    if (signbit(value) && ret[0] == '.') {
 +        ret[0] = '-';
 +    }
-+    return String(ret.c_str());
++    return ret;
  }
  
  bool stod(const StringFragment& s, SKSL_FLOAT* value) {
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index f6154e223751..96b34227a323 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=99.0.4844.84
+version=100.0.4896.60
 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="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=20ec184ed34bdc7e660ccf6c007b2db37007de423b3a5a51698a96aa29527515
+checksum=0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc
 
 lib32disabled=yes
 

From 34e38ea463b4e796ff049da1322cc4b42b2522e7 Mon Sep 17 00:00:00 2001
From: Abigail G <dev@kb6.ee>
Date: Wed, 18 Aug 2021 23:10:00 -0400
Subject: [PATCH 0866/1686] New package: LimeSuite-20.10.0

---
 common/shlibs              |  1 +
 srcpkgs/LimeSuite-devel    |  1 +
 srcpkgs/LimeSuite-doc      |  1 +
 srcpkgs/LimeSuite/template | 87 ++++++++++++++++++++++++++++++++++++++
 srcpkgs/SoapyLMS7          |  1 +
 5 files changed, 91 insertions(+)
 create mode 120000 srcpkgs/LimeSuite-devel
 create mode 120000 srcpkgs/LimeSuite-doc
 create mode 100644 srcpkgs/LimeSuite/template
 create mode 120000 srcpkgs/SoapyLMS7

diff --git a/common/shlibs b/common/shlibs
index 7079375524fc..b0c6fe696e5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4145,3 +4145,4 @@ librz_lang.so.0.3.4 rizin-0.3.4_1
 librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
+libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
diff --git a/srcpkgs/LimeSuite-devel b/srcpkgs/LimeSuite-devel
new file mode 120000
index 000000000000..4431f3d5064a
--- /dev/null
+++ b/srcpkgs/LimeSuite-devel
@@ -0,0 +1 @@
+LimeSuite
\ No newline at end of file
diff --git a/srcpkgs/LimeSuite-doc b/srcpkgs/LimeSuite-doc
new file mode 120000
index 000000000000..4431f3d5064a
--- /dev/null
+++ b/srcpkgs/LimeSuite-doc
@@ -0,0 +1 @@
+LimeSuite
\ No newline at end of file
diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template
new file mode 100644
index 000000000000..44f119784ffd
--- /dev/null
+++ b/srcpkgs/LimeSuite/template
@@ -0,0 +1,87 @@
+# Template file for 'LimeSuite'
+pkgname=LimeSuite
+version=20.10.0
+revision=1
+build_style=cmake
+build_helper=cmake-wxWidgets-gtk3
+configure_args="
+ -DENABLE_SIMD_FLAGS=none
+ -DENABLE_UTILITIES=True
+ -DENABLE_LIME_UTIL=True
+ -DCMAKE_SKIP_RPATH=True
+ -DENABLE_DESKTOP=False
+ -DENABLE_SOAPY_LMS7=True
+ -DENABLE_PCIE_XILLYBUS=True
+ -DENABLE_QUICKTEST=True
+ -DENABLE_MCU_TESTBENCH=True
+ -DENABLE_FTDI=True
+ -DENABLE_FX3=True
+ -DENABLE_STREAM_UNITE=True
+ -DENABLE_EXAMPLES=True
+ -DENABLE_HEADERS=True
+ -DENABLE_GUI=True
+ -DENABLE_API_DOXYGEN=True
+ $(vopt_bool octave ENABLE_OCTAVE)
+ -DLIME_SUITE_EXTVER=${version}_${revision}"
+hostmakedepends="doxygen"
+makedepends="gnuplot wxWidgets-gtk3-devel libusb-devel SoapySDR-devel libfreeglut-devel
+ fltk-devel glew-devel sqlite-devel libgomp-devel $(vopt_if octave octave)"
+depends="wget"
+short_desc="Driver and GUI for LimeSDR/LMS7002M-based SDR platforms"
+maintainer="classabbyamp <dev@kb6.ee>"
+license="Apache-2.0"
+homepage="https://myriadrf.org/projects/lime-suite/"
+distfiles="https://github.com/myriadrf/LimeSuite/archive/refs/tags/v${version}.tar.gz"
+checksum=f6d79dc67cb52a5aea839d1dc00e65f85367cb2c275d77f149833d32cf79b467
+shlib_provides="libLimeSuite.so.20.10-1"
+
+build_options="octave"
+desc_option_octave="Enable the LimeSuite Octave plugin"
+
+# Octave is not built on arm, so don't enable the build option by default on those archs
+case "$XBPS_TARGET_MACHINE" in
+	arm*|aarch64*) build_options_default="" ;;
+	*) build_options_default="octave" ;;
+esac
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+post_install() {
+	vinstall udev-rules/64-limesuite.rules 644 usr/lib/udev/rules.d
+
+	for res in 16 22 32 48 64 128; do
+		_icon_dir="usr/share/icons/hicolor/${res}x${res}/apps"
+		vmkdir $_icon_dir
+		vinstall Desktop/lime-suite-$res.png 644 $_icon_dir lime-suite.png
+	done
+	vinstall Desktop/lime-suite.desktop 755 usr/share/applications
+}
+
+LimeSuite-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"
+	}
+}
+
+LimeSuite-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vdoc docs/lms7_api_quick_start_guide.pdf
+		vdoc docs/StreamProtocol.pdf
+		vcopy docs/LMS_API_Documentation usr/share/doc/$pkgname
+	}
+}
+
+SoapyLMS7_package() {
+	short_desc="SoapySDR module for LimeSDR/LMS7002M"
+	pkg_install() {
+		vmove usr/lib/SoapySDR/modules0.7/libLMS7Support.so
+	}
+}
diff --git a/srcpkgs/SoapyLMS7 b/srcpkgs/SoapyLMS7
new file mode 120000
index 000000000000..4431f3d5064a
--- /dev/null
+++ b/srcpkgs/SoapyLMS7
@@ -0,0 +1 @@
+LimeSuite
\ No newline at end of file

From 01175cd988503f46da0d130d1b596b870b7496db Mon Sep 17 00:00:00 2001
From: Tim Sandquist <tim.sandquist@gmail.com>
Date: Tue, 4 Jan 2022 19:19:19 -0600
Subject: [PATCH 0867/1686] wireshark: update to 3.6.3.

---
 common/shlibs                                 |  6 ++--
 .../patches/HAVE_C99_VSNPRINTF.patch          | 35 +++++++++++++++++++
 srcpkgs/wireshark/patches/cross.patch         |  2 +-
 srcpkgs/wireshark/template                    | 29 ++++++++++++---
 4 files changed, 63 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch

diff --git a/common/shlibs b/common/shlibs
index b0c6fe696e5e..1007c400288a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1573,9 +1573,9 @@ 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
+libwiretap.so.12 libwireshark-3.6.3_1
+libwireshark.so.15 libwireshark-3.6.3_1
+libwsutil.so.13 libwireshark-3.6.3_1
 libKF5ContactEditor.so.5 akonadi-contacts-17.12.1_1
 libKF5AkonadiContact.so.5 akonadi-contacts-17.12.1_1
 libKF5Prison.so.5 prison-5.43.0_1
diff --git a/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch b/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch
new file mode 100644
index 000000000000..b500598fd360
--- /dev/null
+++ b/srcpkgs/wireshark/patches/HAVE_C99_VSNPRINTF.patch
@@ -0,0 +1,35 @@
+--- a/ConfigureChecks.cmake	2021-12-29 13:12:48.000000000 -0600
++++ b/ConfigureChecks.cmake	2022-01-06 06:45:07.907628761 -0600
+@@ -104,32 +104,6 @@
+ check_symbol_exists(tzname "time.h" HAVE_TZNAME)
+ 
+ #
+-# Check if the libc vsnprintf() conforms to C99. If this fails we may
+-# need to fall-back on GLib I/O.
+-#
+-check_c_source_runs("
+-	#include <stdio.h>
+-	int main(void)
+-	{
+-		/* Check that snprintf() and vsnprintf() don't return
+-		 * -1 if the buffer is too small. C99 says this value
+-		 * is the length that would be written not including
+-		 * the nul byte. */
+-		char buf[3];
+-		return snprintf(buf, sizeof(buf), \"%s\", \"ABCDEF\") > 0 ? 0 : 1;
+-	}"
+-	HAVE_C99_VSNPRINTF
+-)
+-if (NOT HAVE_C99_VSNPRINTF)
+-	message(FATAL_ERROR
+-"Building Wireshark requires a C99 compliant vsnprintf() and this \
+-target does not meet that requirement. Compiling for ${CMAKE_SYSTEM} \
+-using ${CMAKE_C_COMPILER_ID}. Please report this issue to the Wireshark \
+-developers at wireshark-dev@wireshark.org."
+-	)
+-endif()
+-
+-#
+ # *If* we found libnl, check if we can use nl80211 stuff with it.
+ #
+ if (NL_FOUND)
diff --git a/srcpkgs/wireshark/patches/cross.patch b/srcpkgs/wireshark/patches/cross.patch
index 46dcc949c72e..d454505b8279 100644
--- a/srcpkgs/wireshark/patches/cross.patch
+++ b/srcpkgs/wireshark/patches/cross.patch
@@ -33,7 +33,7 @@ Upstream: no
            # These files are generated as side-effect
            ${_out}.h
            ${_out}.out
--         COMMAND lemon
+-         COMMAND $<TARGET_FILE:lemon>
 +         COMMAND ${EXECUTABLE_OUTPUT_PATH}/lemon
             -T${_lemonpardir}/lempar.c
             -d.
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
index fae420888bfe..4d0d23c7ed50 100644
--- a/srcpkgs/wireshark/template
+++ b/srcpkgs/wireshark/template
@@ -1,11 +1,10 @@
 # Template file for 'wireshark'
 pkgname=wireshark
-version=3.4.5
+version=3.6.3
 revision=1
 build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=None"
 hostmakedepends="pkg-config flex gettext perl python3-devel mit-krb5-devel
-qt5-tools qt5-host-tools qt5-qmake"
+qt5-tools qt5-host-tools qt5-qmake ruby-asciidoctor"
 makedepends="libpcap-devel zlib-devel lua52-devel mit-krb5-devel gnutls-devel
  libmaxminddb-devel libgcrypt-devel libcap-devel sbc-devel c-ares-devel libxml2-devel
  libssh-devel libnl3-devel spandsp-devel tiff-devel libcap-progs liblz4-devel
@@ -17,7 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.wireshark.org"
 distfiles="https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"
-checksum=de1aafd100a1e1207c850d180e97dd91ab8da0f5eb6beec545f725cdb145d333
+checksum=b60364a4c0068a10811ab3fd075ca6c1eb0e75d44600271b88a20ed93a2ef631
 system_groups="wireshark"
 
 CFLAGS="-DNDEBUG -I${XBPS_CROSS_BASE}/usr/include/lua5.2"
@@ -33,6 +32,26 @@ pre_check() {
 	ninja -C build test-programs
 }
 
+if [ "${XBPS_ALLOW_CHROOT_BREAKOUT}" = "yes" ]; then
+do_check() {
+	# Many tests fail when run as root (i.e. in CI)
+	test/test.py --disable-capture -p build/run \
+		suite_decryption \
+		suite_dissectors.group_asterix \
+		suite_extcaps \
+		suite_fileformats \
+		suite_follow \
+		suite_follow_dccp \
+		suite_follow_multistream \
+		suite_io \
+		suite_mergecap \
+		suite_netperfmeter \
+		suite_release \
+		suite_text2pcap \
+		suite_unittests
+}
+fi
+
 post_install() {
 	rm -f -- "${DESTDIR}/usr/bin/lemon"
 	rm -f -- "${DESTDIR}/usr/lib/wireshark/cmake/UseLemon.cmake"
@@ -77,6 +96,6 @@ wireshark-qt_package() {
 	pkg_install() {
 		vmove usr/bin/wireshark
 		vmove usr/share/man/man1/wireshark.1
-		vmove usr/share/applications/wireshark.desktop
+		vmove usr/share/applications/org.wireshark.Wireshark.desktop
 	}
 }

From f9e58902da019dd0d21526e534cf1757f4568e49 Mon Sep 17 00:00:00 2001
From: Michal Tvrznik <emporeor@gmail.com>
Date: Fri, 1 Apr 2022 07:58:16 +0200
Subject: [PATCH 0868/1686] emptty: update to 0.7.1.

---
 srcpkgs/emptty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/emptty/template b/srcpkgs/emptty/template
index 6fccd5d53e14..2bbbbf4a11e5 100644
--- a/srcpkgs/emptty/template
+++ b/srcpkgs/emptty/template
@@ -1,6 +1,6 @@
 # Template file for 'emptty'
 pkgname=emptty
-version=0.6.2
+version=0.7.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=a750c5cbaeda6b4d0367d18cedf27d884e6fb9a0c7b20819dc878cf7d5a5013b
+checksum=1d86dc0623773d43f9ced8c699ee82c812065ba18ecf277061210392fb2ec56a
 conf_files="/etc/emptty/conf /etc/pam.d/emptty"
 
 post_install() {

From f92e0c9588d97899f2be0e8a97198e35c08fc54b Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Thu, 31 Mar 2022 23:21:56 +0100
Subject: [PATCH 0869/1686] StyLua: update to 0.13.0.

---
 srcpkgs/StyLua/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index ab22a3c92973..b6dc22c3875d 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
 # Template file for 'StyLua'
 pkgname=StyLua
-version=0.12.4
+version=0.13.0
 revision=1
 build_style=cargo
 configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')"
@@ -10,7 +10,7 @@ license="MPL-2.0"
 homepage="https://github.com/JohnnyMorganz/StyLua"
 changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md"
 distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
-checksum=ce6b4a6767b17f8d609e8c9d666c5f6f5c2863edd0638e70392bfe55f99b4fd0
+checksum=ad74d1f47b0337810459dab9b49694bd5bd6c8c7381a35dcab7866752652988b
 
 build_options="lua52 luau"
 build_options_default="lua52 luau"

From 1204eeeab547e165c5947ec246101f41ce07718c Mon Sep 17 00:00:00 2001
From: Savoy <git@liberation.red>
Date: Mon, 7 Feb 2022 12:29:38 -0600
Subject: [PATCH 0870/1686] New package: mandown-0.1.2

---
 srcpkgs/mandown/template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 srcpkgs/mandown/template

diff --git a/srcpkgs/mandown/template b/srcpkgs/mandown/template
new file mode 100644
index 000000000000..5ae9b32020dd
--- /dev/null
+++ b/srcpkgs/mandown/template
@@ -0,0 +1,11 @@
+# Template file for 'mandown'
+pkgname=mandown
+version=0.1.2
+revision=1
+build_style=cargo
+short_desc="Create man pages from markdown markup"
+maintainer="Savoy <git@liberation.red>"
+license="Apache-2.0"
+homepage="https://gitlab.com/kornelski/mandown"
+distfiles="https://gitlab.com/kornelski/mandown/-/archive/$version/mandown-$version.tar.gz"
+checksum=ea26e2bf0ab1ebf4bea858072aa582b11d667a07e05b61bc50cfe5c2b382894a

From 01ee7a79a43a675f39ef2dbaeb92d7634a062d14 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 2 Apr 2022 23:06:14 -0400
Subject: [PATCH 0871/1686] vpsm: update upstream, clean suid bit

- The suid permission bit was incorrectly being set. It is now gone. See #32156
- The upstream README indicates a move to a new GH account.
---
 srcpkgs/vpsm/patches/setuid-fix.patch | 19 +++++++++++++++++++
 srcpkgs/vpsm/template                 |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/vpsm/patches/setuid-fix.patch

diff --git a/srcpkgs/vpsm/patches/setuid-fix.patch b/srcpkgs/vpsm/patches/setuid-fix.patch
new file mode 100644
index 000000000000..3a2ec1a1c405
--- /dev/null
+++ b/srcpkgs/vpsm/patches/setuid-fix.patch
@@ -0,0 +1,19 @@
+Do not apply the setuid permission bit on the vpsm script
+
+See https://github.com/void-linux/void-packages/issues/32156
+see https://github.com/sineto/vpsm/pull/2
+
+
+--
+
+--- a/Makefile
++++ b/Makefile
+@@ -16,7 +16,7 @@
+ 
+ .PHONY: install
+ install:
+-	install -Dm4755 vpsm $(DESTDIR)$(PREFIX)/bin/vpsm
++	install -Dm755 vpsm $(DESTDIR)$(PREFIX)/bin/vpsm
+ 	install -Dm644 man/vpsm.1 $(DESTDIR)/$(PREFIX)/share/man/man1/vpsm.1
+ 
+ .PHONY: uninstall
diff --git a/srcpkgs/vpsm/template b/srcpkgs/vpsm/template
index 62805298d065..ead8e89e6ba8 100644
--- a/srcpkgs/vpsm/template
+++ b/srcpkgs/vpsm/template
@@ -1,13 +1,13 @@
 # Template file for 'vpsm'
 pkgname=vpsm
 version=0.1.2
-revision=1
+revision=2
 build_style=gnu-makefile
 depends="bash xtools ripgrep hub"
 short_desc="Void-Packages Sources Management wrapper for XBPS-SRC"
 maintainer="Sinésio Neto <sinetoami@gmail.com>"
 license="MIT"
-homepage="https://github.com/sinetoami/vpsm"
+homepage="https://github.com/sineto/vpsm"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=7317439096f56371397eb1250a81ff83e53740c14163993cf6668e9f0c4bdc2f
 

From bb7a6a534ada27ab0b0a4ae3e545a30fa41f2b89 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:10 -0700
Subject: [PATCH 0872/1686] vala: update to 0.56.0

---
 common/shlibs         | 2 +-
 srcpkgs/vala/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 1007c400288a..20fd11e04231 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3127,7 +3127,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.54.so.0 libvala-0.54.0_1
+libvala-0.56.so.0 libvala-0.56.0_1
 libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 9b5335cdde1b..51b0dd9c836e 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 shlib_provides="libvalaccodegen.so"
 make_check=extended
 

From b52d3a282d7e0a99f23c470f30abc08e7e724d75 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 16:51:35 -0700
Subject: [PATCH 0873/1686] valadoc: update to 0.56.0

---
 common/shlibs            | 2 +-
 srcpkgs/valadoc/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 20fd11e04231..307cb13347fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3128,7 +3128,7 @@ libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
 libvala-0.56.so.0 libvala-0.56.0_1
-libvaladoc-0.54.so.0 libvaladoc-0.54.0_1
+libvaladoc-0.56.so.0 libvaladoc-0.56.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
 libgfshare.so.2 libgfshare-2.0.0_1
diff --git a/srcpkgs/valadoc/template b/srcpkgs/valadoc/template
index debe8f29768c..416fee531d3a 100644
--- a/srcpkgs/valadoc/template
+++ b/srcpkgs/valadoc/template
@@ -1,7 +1,7 @@
 # Template file for 'valadoc'
 pkgname=valadoc
 # Should be kept in sync with 'vala' (shared distfiles)
-version=0.54.7
+version=0.56.0
 revision=1
 wrksrc="vala-${version}"
 build_style=gnu-configure
@@ -15,7 +15,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/master/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=62079ca1ff02e5d17ae72aa9a5adc61ae6afdcfebb0d9f06063a36efbeaca0c7
+checksum=d92bd13c5630905eeb6a983dcb702204da9731460c2a6e4e39f867996f371040
 
 pre_configure() {
 	autoreconf -if

From 3df461a130cbbc3402e3626852b7980f9cee2550 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:30 +0200
Subject: [PATCH 0874/1686] io.elementary.code: revbump for vala 0.56.0

---
 srcpkgs/io.elementary.code/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index c47d667b8a96..80be5d38c501 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=6.1.0
-revision=1
+revision=2
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala gettext polkit glib-devel"

From e7342286d5f974416c56459d9c8f82db7c5388fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:30 +0200
Subject: [PATCH 0875/1686] valabind: revbump for vala 0.56.0

---
 srcpkgs/valabind/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template
index c7b8bf305d27..a9a7765a9bd6 100644
--- a/srcpkgs/valabind/template
+++ b/srcpkgs/valabind/template
@@ -1,7 +1,7 @@
 # Template file for 'valabind'
 pkgname=valabind
 version=1.8.0
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="pkg-config vala-devel git"
 makedepends="vala-devel glib-devel"

From 8b289e7adce8a08de34166e86ad9db6b05ec76f0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 23:01:31 +0200
Subject: [PATCH 0876/1686] vala-language-server: revbump for vala 0.56.0

---
 srcpkgs/vala-language-server/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vala-language-server/template b/srcpkgs/vala-language-server/template
index 1693c8fc0b7f..037fa94852da 100644
--- a/srcpkgs/vala-language-server/template
+++ b/srcpkgs/vala-language-server/template
@@ -1,7 +1,7 @@
 # Template file for 'vala-language-server'
 pkgname=vala-language-server
 version=0.48.4
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="gettext pkg-config vala"
 makedepends="libgee08-devel glib-devel jsonrpc-glib-devel vala-devel json-glib-devel"

From df837cf19c4a4b08b30f4fe1ddd40d32c27bf1f6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:19:54 +0200
Subject: [PATCH 0877/1686] five-or-more: update to 3.32.3.

---
 srcpkgs/five-or-more/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/five-or-more/template b/srcpkgs/five-or-more/template
index bb137c32d42c..8f871a5ddb8f 100644
--- a/srcpkgs/five-or-more/template
+++ b/srcpkgs/five-or-more/template
@@ -1,6 +1,6 @@
 # Template file for 'five-or-more'
 pkgname=five-or-more
-version=3.32.2
+version=3.32.3
 revision=1
 build_style=meson
 hostmakedepends="gettext glib-devel itstool pkg-config vala"
@@ -9,5 +9,6 @@ short_desc="GNOME align five or more objects game"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Five%20or%20more"
+changelog="https://gitlab.gnome.org/GNOME/five-or-more/-/raw/gnome-3-32/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=311a2693dd04226d32b6d7a02e4c739341bf5bd3492e3285c3910db73e47eea6
+checksum=2d10d72eefdeb324b447d632af0c32496e25fc15a3c01db7d2f00c9b51d09ef4

From 95c2d51508b4e34550fecc4f54ad9284f5e63efa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:41:45 +0200
Subject: [PATCH 0878/1686] folks: update to 0.15.5.

---
 srcpkgs/folks/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template
index 90fdec6fff48..fbc56862bde7 100644
--- a/srcpkgs/folks/template
+++ b/srcpkgs/folks/template
@@ -1,11 +1,11 @@
 # Template file for 'folks'
 pkgname=folks
-version=0.15.4
+version=0.15.5
 revision=1
 build_style=meson
-build_helper="gir qemu"
+build_helper="gir"
 configure_args="-Db_lto=false"
-hostmakedepends="pkg-config intltool glib-devel python3 python3-dbusmock
+hostmakedepends="pkg-config gettext glib-devel python3-dbusmock
  evolution-data-server-devel $(vopt_if gir vala)"
 makedepends="readline-devel telepathy-glib-devel zeitgeist-devel
  libgee08-devel evolution-data-server-devel $(vopt_if gir vala-devel)"
@@ -14,8 +14,9 @@ short_desc="GObject Library to aggregate people into metacontacts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Folks"
+changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e71099afc9e88fad4e757ae134bc3fd63e12b901ad62b0ed5536afb79124af5f
+checksum=0fff8a896330cd82aee4598324f7e541c884d0337536212723b4beb38c759086
 
 build_options="gir"
 build_options_default="gir"

From a6b3bafe5b491777a1c22b8e72501ba807e86870 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 18:50:33 +0200
Subject: [PATCH 0879/1686] go-for-it: fix for vala 0.56

---
 srcpkgs/go-for-it/patches/vala-0.56.patch | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 srcpkgs/go-for-it/patches/vala-0.56.patch

diff --git a/srcpkgs/go-for-it/patches/vala-0.56.patch b/srcpkgs/go-for-it/patches/vala-0.56.patch
new file mode 100644
index 000000000000..76929f6cfa5f
--- /dev/null
+++ b/srcpkgs/go-for-it/patches/vala-0.56.patch
@@ -0,0 +1,30 @@
+From 4be5ff4ff5ef7db9ab320945cd78a2b2e853695c Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 2 Apr 2022 18:53:20 +0200
+Subject: [PATCH] Fix build with vala 0.56
+
+~/Go-For-It-1.9.6/src/Services/TaskTimer.vala:35.42-35.50: error: value is less accessible than constant `GOFI.TaskTimer.UPDATE_INTERVAL'
+   35 |     public const int64 UPDATE_INTERVAL = 60 * US_C;
+      |                                          ^~~~~~~~~
+
+Closes #172
+---
+ src/Services/TaskTimer.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Services/TaskTimer.vala b/src/Services/TaskTimer.vala
+index 8f14f25..2231dc9 100644
+--- a/src/Services/TaskTimer.vala
++++ b/src/Services/TaskTimer.vala
+@@ -32,7 +32,7 @@ public class GOFI.TaskTimer {
+ 
+     private const int64 US_C = 1000000; // μs<->s conversion
+ 
+-    public const int64 UPDATE_INTERVAL = 60 * US_C;
++    private const int64 UPDATE_INTERVAL = 60 * US_C;
+ 
+     /**
+      * A proxy attribute, that does not store any data itself, but provides
+-- 
+2.35.1
+

From 0d43596ce9210450208fa3035f43eb7b8973fcce Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:01:07 +0200
Subject: [PATCH 0880/1686] gradio: remove package

---
 srcpkgs/gradio/template | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 srcpkgs/gradio/template

diff --git a/srcpkgs/gradio/template b/srcpkgs/gradio/template
deleted file mode 100644
index a1c4db39151e..000000000000
--- a/srcpkgs/gradio/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'gradio'
-pkgname=gradio
-version=7.2
-revision=1
-wrksrc="Gradio-${version}"
-build_style=meson
-hostmakedepends="automake intltool itstool yelp-tools glib-devel
- pkg-config gettext gettext-devel vala"
-makedepends="gtk+3-devel gettext-devel vala-devel
- gst-plugins-base1-devel json-glib-devel libsoup-devel
- appstream-glib-devel"
-depends="desktop-file-utils gst-plugins-bad1 gst-plugins-good1
- gst-plugins-ugly1"
-short_desc="GTK3 app for finding and listening to internet radio stations"
-maintainer="Logen Kain <logen@sudotask.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/haecker-felix/gradio"
-distfiles="https://github.com/haecker-felix/${pkgname}/archive/v${version}.tar.gz"
-checksum=5a85d7d4afb1424e46c935114b268e4a65de2629d60f48eccd75d67ff4b113d2

From e9fc152df0ed8e6f014ba3fe9604a7f7ab780d21 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:19:08 +0200
Subject: [PATCH 0881/1686] io.elementary.photos: fix for vala 0.56

---
 .../patches/vala-0.56.patch                   | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 srcpkgs/io.elementary.photos/patches/vala-0.56.patch

diff --git a/srcpkgs/io.elementary.photos/patches/vala-0.56.patch b/srcpkgs/io.elementary.photos/patches/vala-0.56.patch
new file mode 100644
index 000000000000..08d7d6feaaa8
--- /dev/null
+++ b/srcpkgs/io.elementary.photos/patches/vala-0.56.patch
@@ -0,0 +1,51 @@
+From 6594f1323726fb0d38519a7bdafe16f9170353cb Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Mon, 14 Mar 2022 19:50:16 +0800
+Subject: [PATCH] Fix build with vala 0.56 (#711)
+
+---
+ src/main.vala    |  2 +-
+ vapi/config.vapi | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/main.vala b/src/main.vala
+index 875d35ec7..57c88cf9c 100644
+--- a/src/main.vala
++++ b/src/main.vala
+@@ -273,7 +273,7 @@ namespace CommandlineOptions {
+     bool show_version = false;
+     bool debug_enabled = false;
+ 
+-    public const OptionEntry[] APP_OPTIONS = {
++    const OptionEntry[] APP_OPTIONS = {
+         { "datadir", 'd', 0, OptionArg.FILENAME, out data_dir, N_("Path to Photos' private data"), N_("DIRECTORY")},
+         { "no-runtime-monitoring", 0, 0, OptionArg.NONE, out no_runtime_monitoring, N_("Do not monitor library directory at runtime for changes"), null},
+         { "no-startup-progress", 0, 0, OptionArg.NONE, out no_startup_progress, N_("Don't display startup progress meter"), null},
+diff --git a/vapi/config.vapi b/vapi/config.vapi
+index 15c8d8b12..36f0acb78 100644
+--- a/vapi/config.vapi
++++ b/vapi/config.vapi
+@@ -5,16 +5,16 @@
+  */
+ 
+ [CCode (cheader_filename="config.h")]
+-extern const string _PREFIX;
++public const string _PREFIX;
+ [CCode (cheader_filename="config.h")]
+-extern const string _VERSION;
++public const string _VERSION;
+ [CCode (cheader_filename="config.h")]
+-extern const string GETTEXT_PACKAGE;
++public const string GETTEXT_PACKAGE;
+ [CCode (cheader_filename="config.h")]
+-extern const string LOCALEDIR;
++public const string LOCALEDIR;
+ [CCode (cheader_filename="config.h")]
+-extern const string _LIB;
++public const string _LIB;
+ [CCode (cheader_filename="config.h")]
+-extern const string _LIBEXECDIR;
++public const string _LIBEXECDIR;
+ [CCode (cheader_filename="config.h")]
+-extern const string PROJECT_NAME;
++public const string PROJECT_NAME;

From 2aa9152f9059c9af7b5b2e7fba4392cce17710cb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:24:17 +0200
Subject: [PATCH 0882/1686] libgnome-games-support: update to 1.8.2.

---
 srcpkgs/libgnome-games-support/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libgnome-games-support/template b/srcpkgs/libgnome-games-support/template
index 60a1aba20271..92db8d92bc3d 100644
--- a/srcpkgs/libgnome-games-support/template
+++ b/srcpkgs/libgnome-games-support/template
@@ -1,16 +1,17 @@
 # Template file for 'libgnome-games-support'
 pkgname=libgnome-games-support
-version=1.8.0
+version=1.8.2
 revision=1
 build_style=meson
-hostmakedepends="intltool pkg-config gobject-introspection vala"
+hostmakedepends="gettext pkg-config gobject-introspection vala"
 makedepends="gtk+3-devel libgee08-devel"
 short_desc="GNOME games shared code"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
-homepage="https://git.gnome.org/browse/libgnome-games-support/"
+homepage="https://gitlab.gnome.org/GNOME/libgnome-games-support/"
+changelog="https://gitlab.gnome.org/GNOME/libgnome-games-support/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=abdde538a14fd6078fe6b7e6e93f38a33491d9bec711a116d8b47530184cb3dd
+checksum=28434604a7b038731ac0231731388ff104f565bb2330cc24e78cda04cfd3ef7d
 
 libgnome-games-support-devel_package() {
 	short_desc+=" - development files"

From 7e892d25e9b1b7077f662e3cad13b4eb4d440230 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Wed, 23 Mar 2022 21:43:48 -0700
Subject: [PATCH 0883/1686] shotwell: fix build with vala 0.56.0

---
 .../patches/shotwell-0.54.1-vapi_fixes.patch  | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch

diff --git a/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
new file mode 100644
index 000000000000..f39f988f9645
--- /dev/null
+++ b/srcpkgs/shotwell/patches/shotwell-0.54.1-vapi_fixes.patch
@@ -0,0 +1,67 @@
+From 59ae0ce648982669f24a33db501f3f229508cb6e Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 30 Nov 2021 15:09:17 +0100
+Subject: [PATCH] Fix accessibility issues with initializer of constants
+
+---
+ src/International.vala |  2 --
+ src/Resources.vala     |  7 -------
+ vapi/version.vapi      | 17 ++++++++++++++---
+ 3 files changed, 14 insertions(+), 12 deletions(-)
+
+diff --git a/src/International.vala b/src/International.vala
+index 555a91f8..73f07639 100644
+--- a/src/International.vala
++++ b/src/International.vala
+@@ -4,8 +4,6 @@
+  * See the COPYING file in this distribution.
+  */
+ 
+-extern const string _LANG_SUPPORT_DIR;
+-
+ public const string TRANSLATABLE = "translatable";
+ 
+ namespace InternationalSupport {
+diff --git a/src/Resources.vala b/src/Resources.vala
+index 6d2b8851..86f0eb65 100644
+--- a/src/Resources.vala
++++ b/src/Resources.vala
+@@ -4,13 +4,6 @@
+  * See the COPYING file in this distribution.
+  */
+ 
+-// defined by ./configure or Makefile and included by gcc -D
+-extern const string _PREFIX;
+-extern const string _VERSION;
+-extern const string GETTEXT_PACKAGE;
+-extern const string _LIB;
+-extern const string _LIBEXECDIR;
+-
+ namespace Resources {
+     public const string APP_TITLE = "Shotwell";
+     public const string APP_LIBRARY_ROLE = _("Photo Manager");
+diff --git a/vapi/version.vapi b/vapi/version.vapi
+index 06974c84..e191f2f7 100644
+--- a/vapi/version.vapi
++++ b/vapi/version.vapi
+@@ -1,3 +1,14 @@
+-[CCode (cheader_filename="version.h")]
+-extern const string? _GIT_VERSION;
+-
++[CCode (cheader_filename = "version.h")]
++public const string? _GIT_VERSION;
++[CCode (cheader_filename = "config.h")]
++public const string _PREFIX;
++[CCode (cheader_filename = "config.h")]
++public const string _VERSION;
++[CCode (cheader_filename = "config.h")]
++public const string GETTEXT_PACKAGE;
++[CCode (cheader_filename = "config.h")]
++public const string _LIB;
++[CCode (cheader_filename = "config.h")]
++public const string _LIBEXECDIR;
++[CCode (cheader_filename = "config.h")]
++public const string _LANG_SUPPORT_DIR;
+-- 
+GitLab
+

From de04eb138e3fa3d30435cd18adf17ff6f0050d28 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:28:08 +0200
Subject: [PATCH 0884/1686] planner: fix for vala 0.56

---
 srcpkgs/planner/patches/vala-0.56.patch | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/planner/patches/vala-0.56.patch

diff --git a/srcpkgs/planner/patches/vala-0.56.patch b/srcpkgs/planner/patches/vala-0.56.patch
new file mode 100644
index 000000000000..bff39d43cc1b
--- /dev/null
+++ b/srcpkgs/planner/patches/vala-0.56.patch
@@ -0,0 +1,25 @@
+From 87be3e27ccc8f9a1ef7fbeec9600459eb4569200 Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Mon, 14 Mar 2022 23:36:21 +0800
+Subject: [PATCH] Fix build with vala 0.56
+
+Otherwise build fails with
+
+../src/Application.vala:45.50-55.5: error: value is less accessible than constant `Planner.PLANNER_OPTIONS'
+---
+ src/Application.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Application.vala b/src/Application.vala
+index 8c1c9ddb..ebd8f726 100644
+--- a/src/Application.vala
++++ b/src/Application.vala
+@@ -42,7 +42,7 @@ public class Planner : Gtk.Application {
+     private static bool clear_database = false;
+     private static string lang = "";
+ 
+-    public const OptionEntry[] PLANNER_OPTIONS = {
++    private const OptionEntry[] PLANNER_OPTIONS = {
+         { "version", 'v', 0, OptionArg.NONE, ref version,
+         "Display version number", null },
+         { "reset", 'r', 0, OptionArg.NONE, ref clear_database,

From 35cc0ed9ebb28c502ce07f8aa7bd85e1d2db4011 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:35:16 +0200
Subject: [PATCH 0885/1686] tootle: fix for vala 0.56

---
 srcpkgs/tootle/patches/vala-0.56.patch | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/tootle/patches/vala-0.56.patch

diff --git a/srcpkgs/tootle/patches/vala-0.56.patch b/srcpkgs/tootle/patches/vala-0.56.patch
new file mode 100644
index 000000000000..38adf0ff0930
--- /dev/null
+++ b/srcpkgs/tootle/patches/vala-0.56.patch
@@ -0,0 +1,23 @@
+From 11d94c05d4c4a2350801294f155230e899048ab5 Mon Sep 17 00:00:00 2001
+From: Bobby Rong <rjl931189261@126.com>
+Date: Sat, 19 Mar 2022 16:59:31 +0800
+Subject: [PATCH] Application: make app_entries private
+
+Fixes compilation with latest valac.
+---
+ src/Application.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Application.vala b/src/Application.vala
+index 57d0fd7..b48cb53 100644
+--- a/src/Application.vala
++++ b/src/Application.vala
+@@ -43,7 +43,7 @@ namespace Tootle {
+ 			{ null }
+ 		};
+ 
+-		public const GLib.ActionEntry[] app_entries = {
++		private const GLib.ActionEntry[] app_entries = {
+ 			{ "about", about_activated },
+ 			{ "compose", compose_activated },
+ 			{ "back", back_activated },

From e9f97b22319c2f83df2123116852616cd2dbba8b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:44:54 +0200
Subject: [PATCH 0886/1686] simple-scan: fix for vala 0.56

---
 srcpkgs/simple-scan/patches/vala-0.56.patch | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/simple-scan/patches/vala-0.56.patch

diff --git a/srcpkgs/simple-scan/patches/vala-0.56.patch b/srcpkgs/simple-scan/patches/vala-0.56.patch
new file mode 100644
index 000000000000..0820cee20e40
--- /dev/null
+++ b/srcpkgs/simple-scan/patches/vala-0.56.patch
@@ -0,0 +1,25 @@
+From c50802b213c325cfa957d66955f6de96908710d9 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sat, 6 Nov 2021 19:46:07 +0100
+Subject: [PATCH] Fix accessibility conflict of constant and its value
+
+---
+ src/simple-scan.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/simple-scan.vala b/src/simple-scan.vala
+index c15a5418..71f32de9 100644
+--- a/src/simple-scan.vala
++++ b/src/simple-scan.vala
+@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Application
+     static bool show_version;
+     static bool debug_enabled;
+     static string? fix_pdf_filename = null;
+-    public const OptionEntry[] options =
++    const OptionEntry[] options =
+     {
+         { "version", 'v', 0, OptionArg.NONE, ref show_version,
+           /* Help string for command line --version flag */
+-- 
+GitLab
+

From 58504546dda0dc74237ab10dde5144100b61d623 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 22:59:04 +0200
Subject: [PATCH 0887/1686] geary: fix for vala 0.56

---
 srcpkgs/geary/patches/vala-0.56a.patch | 25 ++++++++++++++++
 srcpkgs/geary/patches/vala-0.56b.patch | 40 ++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 srcpkgs/geary/patches/vala-0.56a.patch
 create mode 100644 srcpkgs/geary/patches/vala-0.56b.patch

diff --git a/srcpkgs/geary/patches/vala-0.56a.patch b/srcpkgs/geary/patches/vala-0.56a.patch
new file mode 100644
index 000000000000..df2c3902db14
--- /dev/null
+++ b/srcpkgs/geary/patches/vala-0.56a.patch
@@ -0,0 +1,25 @@
+From 0f75e7a84a39492d0748cec2ba6028e08cae3644 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Sun, 30 Jan 2022 19:54:11 +0100
+Subject: [PATCH] Util.Cache.Lru: Workaround missing generic type argument
+
+---
+ src/client/util/util-cache.vala | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
+index f054e32e5..ecc275e84 100644
+--- a/src/client/util/util-cache.vala
++++ b/src/client/util/util-cache.vala
+@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
+     private class CacheEntry<T> {
+ 
+ 
+-        public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
++        public static int lru_compare(CacheEntry a, CacheEntry b) {
+             if (a.key == b.key) {
+                 return 0;
+             }
+-- 
+GitLab
+
diff --git a/srcpkgs/geary/patches/vala-0.56b.patch b/srcpkgs/geary/patches/vala-0.56b.patch
new file mode 100644
index 000000000000..2d071a133751
--- /dev/null
+++ b/srcpkgs/geary/patches/vala-0.56b.patch
@@ -0,0 +1,40 @@
+From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@ubuntu.com>
+Date: Tue, 30 Nov 2021 15:31:31 +0100
+Subject: [PATCH] Fix accessibility issues with initializer of constants
+
+---
+ src/client/application/application-client.vala | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
+index 6ce19ce2a..e6ba85331 100644
+--- a/src/client/application/application-client.vala
++++ b/src/client/application/application-client.vala
+@@ -8,16 +8,16 @@
+ 
+ // Defined by CMake build script.
+ extern const string GETTEXT_PACKAGE;
+-extern const string _APP_ID;
+-extern const string _BUILD_ROOT_DIR;
+-extern const string _GSETTINGS_DIR;
+-extern const string _INSTALL_PREFIX;
+-extern const string _NAME_SUFFIX;
++public extern const string _APP_ID;
++public extern const string _BUILD_ROOT_DIR;
++public extern const string _GSETTINGS_DIR;
++public extern const string _INSTALL_PREFIX;
++public extern const string _NAME_SUFFIX;
+ extern const string _PLUGINS_DIR;
+ extern const string _PROFILE;
+ extern const string _REVNO;
+-extern const string _SOURCE_ROOT_DIR;
+-extern const string _VERSION;
++public extern const string _SOURCE_ROOT_DIR;
++public extern const string _VERSION;
+ extern const string _WEB_EXTENSIONS_DIR;
+ 
+ 
+-- 
+GitLab
+

From d45def79b56aee694e077422d747957ff4476b1e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 3 Apr 2022 15:19:05 +0200
Subject: [PATCH 0888/1686] zellij: build manpage

---
 srcpkgs/zellij/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 72a9ab9e6e76..911ba18464eb 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,12 +1,13 @@
 # Template file for 'zellij'
 pkgname=zellij
 version=0.27.0
-revision=1
+revision=2
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
 archs="x86_64* aarch64* i686*"
 build_style=cargo
 build_helper=qemu
+hostmakedepends="mandown"
 checkdepends="openssl-devel pkg-config"
 short_desc="Terminal workspace with batteries included"
 maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
@@ -21,6 +22,8 @@ post_build() {
 	vtargetrun ${ZELLIJ} setup --generate-completion bash > zellij.bash
 	vtargetrun ${ZELLIJ} setup --generate-completion zsh > zellij.zsh
 	vtargetrun ${ZELLIJ} setup --generate-completion fish > zellij.fish
+
+	mandown docs/MANPAGE.md > zellij.1
 }
 
 post_install() {
@@ -30,4 +33,5 @@ post_install() {
 
 	vlicense LICENSE.md
 	vdoc README.md
+	vman zellij.1
 }

From 6ab7740de60834be4d9bd5a292be644a9500bd44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 3 Apr 2022 12:56:10 +0200
Subject: [PATCH 0889/1686] lf: update to r27.

---
 srcpkgs/lf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lf/template b/srcpkgs/lf/template
index 896673e297d6..00a4cbec79fb 100644
--- a/srcpkgs/lf/template
+++ b/srcpkgs/lf/template
@@ -1,6 +1,6 @@
 # Template file for 'lf'
 pkgname=lf
-version=r26
+version=r27
 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=dccd1ad67d2639e47fe0cbc93d74f202d6d6f0c3759fb0237affb7b1a2b1379e
+checksum=cdd132e33387423ef9f9448e21d3f1e5c9a5319b34fdfb53cb5f49351ebac005
 
 post_install() {
 	vlicense LICENSE

From 4f1837d1e4d4751f59a2679ec5aa7af2a3922fd6 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:34:52 +0300
Subject: [PATCH 0890/1686] skopeo: update to 1.6.2.

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index b568744c4b25..d8015fbcd92c 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.6.1
+version=1.6.2
 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=304016ec4eb802bf1e1b350854db50bdc99a93dcbcc71f9d531dbb916dc146f3
+checksum=48a1b3d18bde9d7af94756d546b0472e90416f05926281f7e533badfb5fcbd7b
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From 3d0847d936e159cd927233542f63753b0809907e Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:39:57 +0300
Subject: [PATCH 0891/1686] crun: update to 1.4.4.

---
 srcpkgs/crun/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 5b36ee6226bf..f08f3920334b 100644
--- a/srcpkgs/crun/template
+++ b/srcpkgs/crun/template
@@ -1,6 +1,6 @@
 # Template file for 'crun'
 pkgname=crun
-version=1.4
+version=1.4.4
 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=fbdf93c31e215c61a9cb97490527ec69c9993e369955e56b0d82cfedc32090ef
+checksum=49eeb7ed921428f06094ab02233bb2f95ddfc4bf59a40bcabe8a2823085a0c12
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" argp-standalone"

From 13f8f8cd6251355b82d126b5341475635680a729 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:44:01 +0300
Subject: [PATCH 0892/1686] buildah: update to 1.24.3.

---
 srcpkgs/buildah/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/buildah/template b/srcpkgs/buildah/template
index f3854fe931e7..b56a4ea1dff4 100644
--- a/srcpkgs/buildah/template
+++ b/srcpkgs/buildah/template
@@ -1,6 +1,6 @@
 # Template file for 'buildah'
 pkgname=buildah
-version=1.23.1
+version=1.24.3
 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="https://github.com/containers/buildah/archive/refs/tags/v${version}.tar.gz"
-checksum=a19eac2762afb0f83b9d5eec3c00e6ecd95d8d8083da599e894c712d9fb6af26
+checksum=664e2aec0e07df9668c6d41de540e84dc2447950cf952851ca9717a10cc46124
 
 post_build() {
 	make -C docs GOMD2MAN=go-md2man

From 12e3a9a6a13a7b2874d1997dfb1324ac31e78b3e Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sun, 3 Apr 2022 11:57:58 +0300
Subject: [PATCH 0893/1686] packer: update to 1.8.0.

---
 srcpkgs/packer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/packer/template b/srcpkgs/packer/template
index 09f3bc8a6a6a..5e39d679ec43 100644
--- a/srcpkgs/packer/template
+++ b/srcpkgs/packer/template
@@ -1,6 +1,6 @@
 # Template file for 'packer'
 pkgname=packer
-version=1.7.10
+version=1.8.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/packer"
@@ -9,7 +9,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MPL-2.0"
 homepage="http://www.packer.io"
 distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
-checksum=80ed60c492f6765265223f715f26529c8eeb5ce4cee9c4bd7372fd83a9e10493
+checksum=3df688cb488e746df529474f08a430adf0c7c839c4ed3de2022a094eadc515fd
 replaces="packer-bin>=0"
 
 case "$XBPS_TARGET_MACHINE" in

From 376c3f7d52f6dafb3d8ee593aa786e5a16669ee4 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 26 Mar 2022 17:21:04 -0400
Subject: [PATCH 0894/1686] pango: update to 1.50.6.

---
 srcpkgs/pango/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index ff2978731c8c..4d410dbc72b0 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,6 +1,6 @@
 # Template file for 'pango'
 pkgname=pango
-version=1.50.3
+version=1.50.6
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,8 @@ license="LGPL-2.1-or-later"
 homepage="https://www.pango.org/"
 changelog="https://gitlab.gnome.org/GNOME/pango/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4add05edf51c1fb375a1ccde7498914120e23cb280dd7395b1aeb441f1838a4c
+checksum=a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a
+make_check=no  # doesn't pass its own tests
 
 # Package build options
 build_options="gir"

From 87c72c6f541b0a7ebd1a3830240b70f4b16d3343 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:46:51 +0200
Subject: [PATCH 0895/1686] libbsd: update to 0.11.6.

---
 srcpkgs/libbsd/patches/tests-musl.patch | 18 ------------------
 srcpkgs/libbsd/template                 |  4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/libbsd/patches/tests-musl.patch

diff --git a/srcpkgs/libbsd/patches/tests-musl.patch b/srcpkgs/libbsd/patches/tests-musl.patch
deleted file mode 100644
index ada3a923c879..000000000000
--- a/srcpkgs/libbsd/patches/tests-musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/test/fpurge.c
-+++ b/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 769256c0b9ae..6363215e4457 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -1,6 +1,6 @@
 # Template file for 'libbsd'
 pkgname=libbsd
-version=0.11.5
+version=0.11.6
 revision=1
 build_style=gnu-configure
 makedepends="libmd-devel"
@@ -9,7 +9,7 @@ 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=1a9c952525635c1bb6770cb22e969b938d8e6a9d7912362b98ee8370599b0efd
+checksum=19b38f3172eaf693e6e1c68714636190c7e48851e45224d720b3b5bc0499b5df
 
 post_install() {
 	vlicense COPYING

From 5767c78aa0de133c7db29857ba4068ac47e11f22 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:48:37 +0200
Subject: [PATCH 0896/1686] openfortivpn: update to 1.17.2.

---
 srcpkgs/openfortivpn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 46e3fb7900f8..64cbf60f2916 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,6 +1,6 @@
 # Template file for 'openfortivpn'
 pkgname=openfortivpn
-version=1.17.1
+version=1.17.2
 revision=1
 build_style=gnu-configure
 configure_args="
@@ -18,7 +18,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/adrienverge/openfortivpn"
 changelog="https://github.com/adrienverge/openfortivpn/raw/master/CHANGELOG.md"
 distfiles="https://github.com/adrienverge/openfortivpn/archive/v${version}.tar.gz"
-checksum=c674c59cf3201a55d56cb503053982752fb641b13a85ea406b8a7e7df301e30f
+checksum=0f3f3c767cb8bf81418a0fc7c6ab7636c574840c3b6a95c50901c3e1a09c079a
 
 conf_files="/etc/openfortivpn/config"
 

From 52275bcfd57e09c69d34b511e3cc040d15ad1bd6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:51:43 +0200
Subject: [PATCH 0897/1686] squashfs-tools-ng: update to 1.1.4.

---
 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 3a6e48497035..e05075284fc9 100644
--- a/srcpkgs/squashfs-tools-ng/template
+++ b/srcpkgs/squashfs-tools-ng/template
@@ -1,6 +1,6 @@
 # Template file for 'squashfs-tools-ng'
 pkgname=squashfs-tools-ng
-version=1.1.3
+version=1.1.4
 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=abce0fcf9a8ae1c3352e4e5e87e1b077f54411da517332ea83b5e7ce948dd70d
+checksum=6f3f7864f17b250453df31fe3925ce7d1430cf6b1d514112641d734fe3c8f61a
 
 squashfs-tools-ng-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 768b19e142f62b6573a171eb7da6204fa2fe94cf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 3 Apr 2022 17:53:42 +0200
Subject: [PATCH 0898/1686] youtube-viewer: update to 3.9.9.

---
 srcpkgs/youtube-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/youtube-viewer/template b/srcpkgs/youtube-viewer/template
index bdf304f9de86..af6941e45319 100644
--- a/srcpkgs/youtube-viewer/template
+++ b/srcpkgs/youtube-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'youtube-viewer'
 pkgname=youtube-viewer
-version=3.9.7
+version=3.9.9
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,7 +14,7 @@ license="Artistic-2.0"
 homepage="https://github.com/trizen/youtube-viewer"
 changelog="https://github.com/trizen/youtube-viewer/releases"
 distfiles="https://github.com/trizen/youtube-viewer/archive/${version}.tar.gz"
-checksum=0b7ccf18e7aa71b2b82214e3a5614e3036bc98d94951b9bd7aba8da952486257
+checksum=29a326b6496bc6e96840d3c854d79a3ffb9e6006a033f11478c1633c1ac48a8b
 
 gtk-youtube-viewer_package() {
 	depends="${sourcepkg}-${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From 42c066667a6a90fb8def1296741c8fec46100faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 2 Apr 2022 22:57:04 +0200
Subject: [PATCH 0899/1686] peshming: update to 0.5.0.

---
 srcpkgs/peshming/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template
index 299d243509fe..0b07235208a9 100644
--- a/srcpkgs/peshming/template
+++ b/srcpkgs/peshming/template
@@ -1,6 +1,6 @@
 # Template file for 'peshming'
 pkgname=peshming
-version=0.4.0
+version=0.5.0
 revision=1
 wrksrc="peshming"
 build_style=cargo
@@ -10,15 +10,26 @@ 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=fd2d3eae35746f513006a34757d00e50d15042df54187f886c553e748985319d
+checksum=9b737124e38d4dc6ac91f0e8bc07aab4d5acbbb019c544feb1aa92d6ab0ea8c5
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	ppc*) broken="missing AtomicU64";;
 esac
 
+pre_build() {
+	export PESHMING_MAN_DIR=man
+	export PESHMING_COMPLETIONS_DIR=completions
+}
+
 post_install() {
 	vlicense LICENSE
 	vdoc README.md
 	vsconf config.toml.sample
+
+	vcompletion "completions/_peshming" zsh
+	vcompletion "completions/peshming.fish" fish
+	vcompletion "completions/peshming.bash" bash
+
+	vman "man/peshming.1"
 }

From ac3d8054c83dc5b13e8a25687a8cc06270ab0526 Mon Sep 17 00:00:00 2001
From: Gene <elkaufman5@gmail.com>
Date: Wed, 8 Sep 2021 13:13:53 -0700
Subject: [PATCH 0900/1686] New package: dsda-doom-0.24.3

---
 srcpkgs/dsda-doom/patches/affinity-hack.patch | 165 ++++++++++++++++++
 srcpkgs/dsda-doom/template                    |  20 +++
 2 files changed, 185 insertions(+)
 create mode 100644 srcpkgs/dsda-doom/patches/affinity-hack.patch
 create mode 100644 srcpkgs/dsda-doom/template

diff --git a/srcpkgs/dsda-doom/patches/affinity-hack.patch b/srcpkgs/dsda-doom/patches/affinity-hack.patch
new file mode 100644
index 000000000000..2155ab116b82
--- /dev/null
+++ b/srcpkgs/dsda-doom/patches/affinity-hack.patch
@@ -0,0 +1,165 @@
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index d317ddec..c86f76b0 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -53,6 +53,15 @@ endif()
+ check_symbol_exists(getopt "unistd.h" HAVE_GETOPT)
+ check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
+ check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING)
++if(NOT WIN32)
++    set(CMAKE_REQUIRED_DEFINITIONS_PREV ${CMAKE_REQUIRED_DEFINITIONS})
++    set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE)
++    check_symbol_exists(sched_setaffinity "sched.h" HAVE_SCHED_SETAFFINITY)
++    set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_PREV})
++    if(HAVE_SCHED_SETAFFINITY)
++        add_definitions(-D_GNU_SOURCE)
++    endif()
++endif()
+ check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL)
+ check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+ 
+diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin
+index f92f3d88..2ad70033 100644
+--- a/prboom2/cmake/config.h.cin
++++ b/prboom2/cmake/config.h.cin
+@@ -11,6 +11,7 @@
+ #cmakedefine HAVE_GETOPT
+ #cmakedefine HAVE_MMAP
+ #cmakedefine HAVE_CREATE_FILE_MAPPING
++#cmakedefine HAVE_SCHED_SETAFFINITY
+ #cmakedefine HAVE_STRSIGNAL
+ #cmakedefine HAVE_MKSTEMP
+ 
+diff --git a/prboom2/src/SDL/i_main.c b/prboom2/src/SDL/i_main.c
+index 7537c53f..670f3dbd 100644
+--- a/prboom2/src/SDL/i_main.c
++++ b/prboom2/src/SDL/i_main.c
+@@ -45,6 +45,9 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
++typedef BOOL (WINAPI *SetAffinityFunc)(HANDLE hProcess, DWORD mask);
++#else
++#include <sched.h>
+ #endif
+ 
+ #include <errno.h>
+@@ -373,6 +376,83 @@ static void I_Quit (void)
+ uid_t stored_euid = -1;
+ #endif
+ 
++//
++// Ability to use only the allowed CPUs
++//
++
++static void I_SetAffinityMask(void)
++{
++  // This was only set for the sdl music backend,
++  //   but now the backend changes based on the music type.
++  // Not sure what the consequences are for this...
++  process_affinity_mask = 1;
++
++  // Set the process affinity mask so that all threads
++  // run on the same processor.  This is a workaround for a bug in
++  // SDL_mixer that causes occasional crashes.
++  if (process_affinity_mask)
++  {
++    const char *errbuf = NULL;
++#ifdef _WIN32
++    HMODULE kernel32_dll;
++    SetAffinityFunc SetAffinity = NULL;
++    int ok = false;
++
++    // Find the kernel interface DLL.
++    kernel32_dll = LoadLibrary("kernel32.dll");
++
++    if (kernel32_dll)
++    {
++      // Find the SetProcessAffinityMask function.
++      SetAffinity = (SetAffinityFunc)GetProcAddress(kernel32_dll, "SetProcessAffinityMask");
++
++      // If the function was not found, we are on an old (Win9x) system
++      // that doesn't have this function.  That's no problem, because
++      // those systems don't support SMP anyway.
++
++      if (SetAffinity)
++      {
++        ok = SetAffinity(GetCurrentProcess(), process_affinity_mask);
++      }
++    }
++
++    if (!ok)
++    {
++      errbuf = WINError();
++    }
++#elif defined(HAVE_SCHED_SETAFFINITY)
++    // POSIX version:
++    int i;
++    {
++      cpu_set_t set;
++
++      CPU_ZERO(&set);
++
++      for(i = 0; i < 16; i++)
++      {
++        CPU_SET((process_affinity_mask>>i)&1, &set);
++      }
++
++      if (sched_setaffinity(getpid(), sizeof(set), &set) == -1)
++      {
++        errbuf = strerror(errno);
++      }
++    }
++#else
++    return;
++#endif
++
++    if (errbuf == NULL)
++    {
++      lprintf(LO_INFO, "I_SetAffinityMask: manual affinity mask is %d\n", process_affinity_mask);
++    }
++    else
++    {
++      lprintf(LO_ERROR, "I_SetAffinityMask: failed to set process affinity mask (%s)\n", errbuf);
++    }
++  }
++}
++
+ //
+ // Sets the priority class for the prboom-plus process
+ //
+@@ -482,6 +562,9 @@ int main(int argc, char **argv)
+   signal(SIGABRT, I_SignalHandler);
+ #endif
+ 
++  // Ability to use only the allowed CPUs
++  I_SetAffinityMask();
++
+   // Priority class for the prboom-plus process
+   I_SetProcessPriority();
+ 
+diff --git a/prboom2/src/SDL/i_video.c b/prboom2/src/SDL/i_video.c
+index 5a564a5a..9b68aee7 100644
+--- a/prboom2/src/SDL/i_video.c
++++ b/prboom2/src/SDL/i_video.c
+@@ -895,6 +895,7 @@ static void I_ClosestResolution (int *width, int *height)
+   }
+ }
+ 
++int process_affinity_mask;
+ int process_priority;
+ 
+ // e6y
+diff --git a/prboom2/src/i_video.h b/prboom2/src/i_video.h
+index 46f0fb71..c39a197e 100644
+--- a/prboom2/src/i_video.h
++++ b/prboom2/src/i_video.h
+@@ -109,6 +109,8 @@ void I_UpdateRenderSize(void);	// Handle potential
+ extern int renderW;		// resolution scaling
+ extern int renderH;		// - DTIED
+ 
++// Set the process affinity mask so that all threads
++extern int process_affinity_mask;
+ // Priority class for the prboom-plus process
+ extern int process_priority;
+ // Use vanilla keybaord mapping
diff --git a/srcpkgs/dsda-doom/template b/srcpkgs/dsda-doom/template
new file mode 100644
index 000000000000..51dcbbf26d34
--- /dev/null
+++ b/srcpkgs/dsda-doom/template
@@ -0,0 +1,20 @@
+# Template file for 'dsda-doom'
+pkgname=dsda-doom
+version=0.24.3
+revision=1
+build_wrksrc=prboom2
+build_style=cmake
+makedepends="pcre-devel fluidsynth-devel libmad-devel SDL2_mixer-devel
+ SDL2_image-devel portmidi-devel dumb-devel libvorbis-devel"
+short_desc="Fork of prboom+ with extra tooling for demo recording and playback"
+maintainer="Gene <elkaufman5@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/kraflab/dsda-doom"
+distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
+checksum=d4cfc82eea029068329d6b6a2dcbe0b316b31a60af12e6dc5ad3e1d2c359d913
+nocross=yes
+
+post_install() {
+	vinstall ICONS/dsda-doom.desktop 644 usr/share/applications
+	vinstall ICONS/dsda-doom.png 644 usr/share/pixmaps
+}

From 9bb15e4e9b7b00541b7cf2659b363cfc5dbe08ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Sun, 3 Apr 2022 04:24:39 +0200
Subject: [PATCH 0901/1686] wireplumber: update to 0.4.9

---
 srcpkgs/wireplumber/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index dadbf62647fb..acbffa27fd8c 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,7 +1,7 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
-version=0.4.8
-revision=2
+version=0.4.9
+revision=1
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://pipewire.pages.freedesktop.org/wireplumber"
 changelog="https://gitlab.freedesktop.org/pipewire/wireplumber/-/raw/master/NEWS.rst"
 distfiles="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$version/wireplumber-$version.tar.gz"
-checksum=a7a84c21230c339a905704a9495dda10a4dec41a96bc115a9b33d24310a3f605
+checksum=0b25774a2821286a1fa31afb7db8db0573f493b35c40a7031b6e5a30cec0bbe3
 
 post_install() {
 	vlicense LICENSE

From 17c524017aa74074d3f4700c267941f7a759564a Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 3 Apr 2022 20:30:06 +0200
Subject: [PATCH 0902/1686] dhcpcd: fix privsep on ppc64le

---
 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch | 23 ++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/dhcpcd/patches/privsep-ppc64le.patch

diff --git a/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
new file mode 100644
index 000000000000..38a4264a59cd
--- /dev/null
+++ b/srcpkgs/dhcpcd/patches/privsep-ppc64le.patch
@@ -0,0 +1,23 @@
+commit 156383a2ff84c01b347579ec8651a0a21384adf4
+Author: Daniel Kolesa <daniel@octaforge.org>
+Date:   Sun Apr 3 20:18:51 2022 +0200
+
+    use correct SECCOMP_AUDIT_ARCH
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index 9534fb0..b866bce 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -213,7 +213,11 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
+ #elif defined(__or1k__)
+ #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_OPENRISC
+ #elif defined(__powerpc64__)
+-#  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
++#  ifdef __LITTLE_ENDIAN__
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64LE
++#  else
++#    define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC64
++#  endif
+ #elif defined(__powerpc__)
+ #  define SECCOMP_AUDIT_ARCH AUDIT_ARCH_PPC
+ #elif defined(__riscv)

From 9452711b98c739d9882b7673d1c69a01884b286a Mon Sep 17 00:00:00 2001
From: governorgoat <governorgoat@fastmail.com>
Date: Sat, 2 Apr 2022 22:04:52 -0400
Subject: [PATCH 0903/1686] cronie: update to 1.6.0

---
 srcpkgs/cronie/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template
index 6c1c7adb523d..526f59b4d835 100644
--- a/srcpkgs/cronie/template
+++ b/srcpkgs/cronie/template
@@ -1,6 +1,6 @@
 # Template file for 'cronie'
 pkgname=cronie
-version=1.5.7
+version=1.6.0
 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=538bcfaf2e986e5ae1edf6d1472a77ea8271d6a9005aee2497a9ed6e13320eb3
+checksum=3f7cc263d21838b53a9943eb2a26b862059e2ae36c3f11789ac33cd6818e3628
 make_dirs="
 	/etc/cron.d 0755 root root
 	/etc/cron.hourly 0755 root root

From b9702ab78bdd9574d37063b79c3c9bd4484999d7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:31:30 +0200
Subject: [PATCH 0904/1686] janet: update to 1.21.2.

---
 srcpkgs/janet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/janet/template b/srcpkgs/janet/template
index 4301ab90c751..8c3612e4dd77 100644
--- a/srcpkgs/janet/template
+++ b/srcpkgs/janet/template
@@ -1,6 +1,6 @@
 # Template file for 'janet'
 pkgname=janet
-version=1.21.1
+version=1.21.2
 revision=1
 build_style=meson
 configure_args="-Db_lto=false"  # breaks jpm
@@ -10,7 +10,7 @@ license="MIT"
 homepage="https://janet-lang.org/"
 changelog="https://github.com/janet-lang/janet/blob/master/CHANGELOG.md"
 distfiles="https://github.com/janet-lang/janet/archive/v${version}.tar.gz"
-checksum=8c6eeabbc0c00ac901b66763676fa4bfdac96e5b6a3def85025b45126227c4e0
+checksum=52db8d18f93351256d0731810e8bea95516db8142f51eeb31664f7884bf63088
 
 post_install() {
 	vlicense LICENSE

From 417c6ee429f0143b514a265e62baa31c98de2ec5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:35:28 +0200
Subject: [PATCH 0905/1686] ugrep: update to 3.7.7.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 8af468ccc9bc..795927e8ab52 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.6
+version=3.7.7
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=8288af9eb9f5a5638134911e9e81c8b37d02f29223d473dd96a2046c228cd5d4
+checksum=5490d6491267bb1aaaeac27a0ba41d502f4b1c1b8998b8cc377c91374603932d
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From b53fba7fd7c22764c397cf7694747c103fe7ca54 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:35:30 +0200
Subject: [PATCH 0906/1686] netpbm: update to 10.98.0.0.

---
 .../netpbm/files/netpbm-security-code.patch   |  94 -------
 .../files/netpbm-security-scripts.patch       | 266 ------------------
 srcpkgs/netpbm/template                       |   6 +-
 3 files changed, 3 insertions(+), 363 deletions(-)
 delete mode 100644 srcpkgs/netpbm/files/netpbm-security-scripts.patch

diff --git a/srcpkgs/netpbm/files/netpbm-security-code.patch b/srcpkgs/netpbm/files/netpbm-security-code.patch
index 408b566ef412..6f7c4976114b 100644
--- a/srcpkgs/netpbm/files/netpbm-security-code.patch
+++ b/srcpkgs/netpbm/files/netpbm-security-code.patch
@@ -804,65 +804,6 @@ diff -up netpbm-10.58.01/other/pnmcolormap.c.security-code netpbm-10.58.01/other
      }
      {
          unsigned int const intQuotient = colormap.size / pamP->width;
-diff -up netpbm-10.58.01/urt/README.security-code netpbm-10.58.01/urt/README
---- netpbm-10.58.01/urt/README.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/urt/README	2012-04-09 15:40:03.231619438 +0200
-@@ -18,3 +18,8 @@ in its initializer in the original.  But
- defines stdout as a variable, so that wouldn't compile.  So I changed
- it to NULL and added a line to rle_hdr_init to set that field to
- 'stdout' dynamically.  2000.06.02 BJH.
-+
-+Redid the code to check for maths overflows and other crawly horrors.
-+Removed pipe through and compress support (unsafe)
-+
-+Alan Cox <alan@redhat.com>
-diff -up netpbm-10.58.01/urt/rle_addhist.c.security-code netpbm-10.58.01/urt/rle_addhist.c
---- netpbm-10.58.01/urt/rle_addhist.c.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/urt/rle_addhist.c	2012-04-09 15:40:03.231619438 +0200
-@@ -14,6 +14,8 @@
-  * If you modify this software, you should include a notice giving the
-  * name of the person performing the modification, the date of modification,
-  * and the reason for such modification.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * rle_addhist.c - Add to the HISTORY comment in header
-@@ -71,13 +73,19 @@ rle_addhist(char *          argv[],
-         return;
-     
-     length = 0;
--    for (i = 0; argv[i]; ++i)
-+    for (i = 0; argv[i]; ++i) {
-+	overflow_add(length, strlen(argv[i]));
-+	overflow_add(length+1, strlen(argv[i]));
-         length += strlen(argv[i]) +1;   /* length of each arg plus space. */
-+    }
- 
-     time(&temp);
-     timedate = ctime(&temp);
-     length += strlen(timedate);        /* length of date and time in ASCII. */
- 
-+    overflow_add(strlen(padding), 4);
-+    overflow_add(strlen(histoire), strlen(padding) + 4);
-+    overflow_add(length, strlen(histoire) + strlen(padding) + 4);
-     length += strlen(padding) + 3 + strlen(histoire) + 1;
-         /* length of padding, "on "  and length of history name plus "="*/
-     if (in_hdr) /* if we are interested in the old comments... */
-@@ -85,9 +93,12 @@ rle_addhist(char *          argv[],
-     else
-         old = NULL;
-     
--    if (old && *old)
-+    if (old && *old) {
-+	overflow_add(length, strlen(old));
-         length += strlen(old);       /* add length if there. */
-+    }
- 
-+    overflow_add(length, 1);
-     ++length;                               /*Cater for the null. */
- 
-     MALLOCARRAY(newc, length);
 diff -up netpbm-10.58.01/urt/rle.h.security-code netpbm-10.58.01/urt/rle.h
 --- netpbm-10.58.01/urt/rle.h.security-code	2012-04-09 15:31:45.000000000 +0200
 +++ netpbm-10.58.01/urt/rle.h	2012-04-09 15:40:03.233619414 +0200
@@ -922,41 +863,6 @@ diff -up netpbm-9.58.01/urt/rle_putcom.c.security-code netpbm-10.58.01/urt/rle_p
          /* Not found */
          /* Can't realloc because somebody else might be pointing to this
           * comments block.  Of course, if this were true, then the
-diff -up netpbm-10.58.01/urt/Runput.c.security-code netpbm-10.58.01/urt/Runput.c
---- netpbm-10.58.01/urt/Runput.c.security-code	2012-04-09 15:31:45.000000000 +0200
-+++ netpbm-10.58.01/urt/Runput.c	2012-04-09 15:40:03.235619390 +0200
-@@ -17,6 +17,8 @@
-  *
-  *  Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire
-  *  to have all "void" functions so declared.
-+ *
-+ *  2002-12-19: Fix maths wrapping bugs. Alan Cox <alan@redhat.com>
-  */
- /* 
-  * Runput.c - General purpose Run Length Encoding.
-@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr)
-     if ( the_hdr->background != 0 )
-     {
- 	register int i;
--	register rle_pixel *background =
--	    (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
-+	register rle_pixel *background;
- 	register int *bg_color;
-+
-+	overflow_add(the_hdr->ncolors,1);
-+	background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) );
- 	/* 
- 	 * If even number of bg color bytes, put out one more to get to 
- 	 * 16 bit boundary.
-@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr)
- 	/* Big-endian machines are harder */
- 	register int i, nmap = (1 << the_hdr->cmaplen) *
- 			       the_hdr->ncmap;
--	register char *h_cmap = (char *)malloc( nmap * 2 );
-+	register char *h_cmap = (char *)malloc2( nmap, 2 );
- 	if ( h_cmap == NULL )
- 	{
- 	    fprintf( stderr,
 --- netpbm-10.58.01/lib/libpbm1.c.orig	2014-06-16 21:12:28.499230631 -0400
 +++ netpbm-10.58.01/lib/libpbm1.c	2014-06-16 21:12:55.932519324 -0400
 @@ -78,6 +78,7 @@
diff --git a/srcpkgs/netpbm/files/netpbm-security-scripts.patch b/srcpkgs/netpbm/files/netpbm-security-scripts.patch
deleted file mode 100644
index b26f1d4eac10..000000000000
--- a/srcpkgs/netpbm/files/netpbm-security-scripts.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ppmfade
---- netpbm-10.47.05/editor/ppmfade.security-scripts	2009-12-10 08:34:32.000000000 +0100
-+++ netpbm-10.47.05/editor/ppmfade	2010-03-16 21:28:09.000000000 +0100
-@@ -14,6 +14,7 @@
- #
- #-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
- use strict;
-+use File::Temp "tempdir";
- 
- my $SPREAD =  1;
- my $SHIFT =   2;
-@@ -111,20 +112,26 @@ if ($first_file ne "undefined") {
- 
- print("Frames are " . $width . "W x " . $height . "H\n");
- 
-+#
-+# We create a tmp-directory right here
-+#
-+my $tmpdir = tempdir("ppmfade.XXXXXX", CLEANUP => 1);
-+
-+
- if ($first_file eq "undefined") {
-     print "Fading from black to ";
--    system("ppmmake \\#000 $width $height >junk1$$.ppm");
-+    system("ppmmake \\#000 $width $height >$tmpdir/junk1$$.ppm");
- } else {
-     print "Fading from $first_file to ";
--    system("cp", $first_file, "junk1$$.ppm");
-+    system("cp", $first_file, "$tmpdir/junk1$$.ppm");
- }
- 
- if ($last_file eq "undefined") {
-     print "black.\n";
--    system("ppmmake \\#000 $width $height >junk2$$.ppm");
-+    system("ppmmake \\#000 $width $height >$tmpdir/junk2$$.ppm");
- } else {
-     print "$last_file\n";
--    system("cp", $last_file, "junk2$$.ppm");
-+    system("cp", $last_file, "$tmpdir/junk2$$.ppm");
- }
- 
- #
-@@ -132,14 +139,14 @@ if ($last_file eq "undefined") {
- #
- 
- # Here's what our temporary files are:
--#   junk1$$.ppm: The original (fade-from) image
--#   junk2$$.ppm: The target (fade-from) image
--#   junk3$$.ppm: The frame of the fade for the current iteration of the 
--#                the for loop.
--#   junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
--#                 image to another, this is the first frame of that 
--#                 sequence.
--#   junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
-+#   $tmpdir/junk1$$.ppm: The original (fade-from) image
-+#   $tmpdir/junk2$$.ppm: The target (fade-from) image
-+#   $tmpdir/junk3$$.ppm: The frame of the fade for the current iteration of the 
-+#                	 the for loop.
-+#   $tmpdir/junk1a$$.ppm: If the fade involves a ppmmix sequence from one intermediate
-+#                         image to another, this is the first frame of that 
-+#                         sequence.
-+#   $tmpdir/junk2a$$.ppm: This is the last frame of the above-mentioned ppmmix sequence
- 
- my $i;    # Frame number
- for ($i = 1; $i <= $nframes; $i++) {
-@@ -147,147 +154,147 @@ for ($i = 1; $i <= $nframes; $i++) {
-     if ($mode eq $SPREAD) {
-         if ($i <= 10) {
-             my $n = $spline20[$i] * 100;
--            system("ppmspread $n junk1$$.ppm >junk3$$.ppm");
-+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n;
-             $n = $spline20[$i] * 100;
--            system("ppmspread $n junk1$$.ppm >junk1a$$.ppm");
-+            system("ppmspread $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
-             $n = (1-$spline20[$i-10]) * 100;
--            system("ppmspread $n junk2$$.ppm >junk2a$$.ppm");
-+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
-             $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = (1-$spline20[$i-10])*100;
--            system("ppmspread $n junk2$$.ppm >junk3$$.ppm");
-+            system("ppmspread $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-     } elsif ($mode eq $SHIFT) {
-         if ($i <= 10) {
-             my $n = $spline20[$i] * 100;
--            system("ppmshift $n junk1$$.ppm >junk3$$.ppm");
-+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n;
-             $n = $spline20[$i] * 100;
--            system("ppmshift $n junk1$$.ppm >junk1a$$.ppm");
-+            system("ppmshift $n $tmpdir/junk1$$.ppm >$tmpdir/junk1a$$.ppm");
-             $n = (1-$spline20[$i-10])*100;
--            system("ppmshift $n junk2$$.ppm >junk2a$$.ppm");
-+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk2a$$.ppm");
-             $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = (1-$spline20[$i-10]) * 100;
--            system("ppmshift $n junk2$$.ppm >junk3$$.ppm");
-+            system("ppmshift $n $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-     } elsif ($mode eq $RELIEF) {
-         if ($i == 1) {
--            system("ppmrelief junk1$$.ppm >junk1r$$.ppm");
-+            system("ppmrelief $tmpdir/junk1$$.ppm >$tmpdir/junk1r$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1r$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1r$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1r$$.ppm junk2r$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1r$$.ppm $tmpdir/junk2r$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2r$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2r$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmrelief junk2$$.ppm >junk2r$$.ppm");
-+            system("ppmrelief $tmpdir/junk2$$.ppm >$tmpdir/junk2r$$.ppm");
-         }
-     } elsif ($mode eq $OIL) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmoil >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmoil >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmoil >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         }
-     } elsif ($mode eq $EDGE) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmedge >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmedge >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmedge >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         } 
-     } elsif ($mode eq $BENTLEY) {
-         if ($i == 1) {
--            system("ppmtopgm junk1$$.ppm | pgmbentley >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk1o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk1$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk1o$$.ppm");
-         }
-         if ($i <= 10) {
-             my $n = $spline10[$i];
--            system("ppmmix $n junk1$$.ppm junk1o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1$$.ppm $tmpdir/junk1o$$.ppm >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1o$$.ppm junk2o$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1o$$.ppm $tmpdir/junk2o$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = $spline10[$i-20];
--            system("ppmmix $n junk2o$$.ppm junk2$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk2o$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("ppmtopgm junk2$$.ppm | pgmbentley >junko$$.ppm");
--            system("rgb3toppm junko$$.ppm junko$$.ppm junko$$.ppm " .
--                   ">junk2o$$.ppm");
-+            system("ppmtopgm $tmpdir/junk2$$.ppm | pgmbentley >$tmpdir/junko$$.ppm");
-+            system("rgb3toppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm $tmpdir/junko$$.ppm " .
-+                   ">$tmpdir/junk2o$$.ppm");
-         }
-     } elsif ($mode eq $BLOCK) {
-         if ($i <= 10) {
-             my $n = 1 - 1.9*$spline20[$i];
--            system("pamscale $n junk1$$.ppm | " .
--                   "pamscale -width $width -height $height >junk3$$.ppm");
-+            system("pamscale $n $tmpdir/junk1$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
-         } elsif ($i <= 20) {
-             my $n = $spline10[$i-10];
--            system("ppmmix $n junk1a$$.ppm junk2a$$.ppm >junk3$$.ppm");
-+            system("ppmmix $n $tmpdir/junk1a$$.ppm $tmpdir/junk2a$$.ppm >$tmpdir/junk3$$.ppm");
-         } else {
-             my $n = 1 - 1.9*$spline20[31-$i];
--            system("pamscale $n junk2$$.ppm | " .
--                   "pamscale -width $width -height $height >junk3$$.ppm");
-+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk3$$.ppm");
-         }
-         if ($i == 10) {
--            system("cp", "junk3$$.ppm", "junk1a$$.ppm");
--            system("pamscale $n junk2$$.ppm | " .
--                   "pamscale -width $width -height $height >junk2a$$.ppm");
-+            system("cp", "$tmpdir/junk3$$.ppm", "$tmpdir/junk1a$$.ppm");
-+            system("pamscale $n $tmpdir/junk2$$.ppm | " .
-+                   "pamscale -width $width -height $height >$tmpdir/junk2a$$.ppm");
-         }    
-     } elsif ($mode eq $MIX) {
-         my $fade_factor = sqrt(1/($nframes-$i+1));
--        system("ppmmix $fade_factor junk1$$.ppm junk2$$.ppm >junk3$$.ppm");
-+        system("ppmmix $fade_factor $tmpdir/junk1$$.ppm $tmpdir/junk2$$.ppm >$tmpdir/junk3$$.ppm");
-     } else {
-         print("Internal error: impossible mode value '$mode'\n");
-     }
- 
-     my $outfile = sprintf("%s.%04d.ppm", $base_name, $i);
--    system("cp", "junk3$$.ppm", $outfile);
-+    system("cp", "$tmpdir/junk3$$.ppm", $outfile);
- }
- 
- #
- #  Clean up shop.
- #
--system("rm junk*$$.ppm");
-+system("rm $tmpdir/junk*$$.ppm");
- 
- exit(0);
diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template
index d72721bd9eb3..61728c4c7d28 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.97.06
+version=10.98.0.0
 revision=1
-_githash=f336dfc59346a26a045f7e0df0ecba32d904c55e
+_githash=772c4792d998deb70f1719c1a2ad82f2defde5f0
 _githash_guide=61c296305814a003d4e2fad1bf8b165357eb4c79
 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="9cd658ec9081b980a98fb44f02aa5289ba9ca17ad7e9a699627bf6f2a85c5612
+checksum="f53f8e57e1dec64edddec971f13a1cdcbc17d07110e4699b3090de7a79e3f75a
  30a422fb207f9fd02a635a9c75cbb0b24293ca2d7de8f947866ee67ce41dadde"
 
 post_extract() {

From d1f4d38ccb05d84962dfafbf910a759bc96d551c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:36:46 +0200
Subject: [PATCH 0907/1686] collectl: update to 4.3.3.

---
 srcpkgs/collectl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template
index 9ade016be223..ebc778450bc6 100644
--- a/srcpkgs/collectl/template
+++ b/srcpkgs/collectl/template
@@ -1,6 +1,6 @@
 # Template file for 'collectl'
 pkgname=collectl
-version=4.3.2
+version=4.3.3
 revision=1
 wrksrc="${pkgname}"
 conf_files="/etc/collectl.conf"
@@ -11,7 +11,7 @@ license="Artistic-1.0-Perl, GPL-2.0-only"
 homepage="http://collectl.sourceforge.net/"
 changelog="http://collectl.sourceforge.net/Releases.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.src.tar.gz"
-checksum=9fab4769441c07201748e52c7f8c7b21526ab45a05142dd2b2b1fa5c16c38750
+checksum=3e87f9aa6cf1b585ce7cec6ee0e2cde652397fdf871b03b9609c56678f8b4dba
 
 do_install() {
 	export DESTDIR

From f5caa52d899cf6b3f2a244394a96ff9fa306281d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 18:37:24 +0200
Subject: [PATCH 0908/1686] skaffold: update to 1.37.1.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index 4f54c6c05e98..faa9823d1cc6 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.37.0
+version=1.37.1
 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=a97a6f6cbf571f342183e5cf65c30932ade282b182fc92f108cb2a160a46779b
+checksum=8dfea015256761525d8c0e54713642bcd7ead3e3c96ff58e301d0b77b9ef3bd5

From 15c6a5c8166537510538fdae4cae80e4ee58046c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 3 Apr 2022 19:11:39 +0200
Subject: [PATCH 0909/1686] twm: update to 1.0.12.

---
 srcpkgs/twm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/twm/template b/srcpkgs/twm/template
index 32a2efeeb004..94cbd1e4f511 100644
--- a/srcpkgs/twm/template
+++ b/srcpkgs/twm/template
@@ -1,6 +1,6 @@
 # Template file for 'twm'
 pkgname=twm
-version=1.0.11
+version=1.0.12
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros bison"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/twm.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
-checksum=f4e8a842dec410e79741f25ed4dfac09df080835d0bba2e3983b5914569b68c7
+checksum=aaf201d4de04c1bb11eed93de4bee0147217b7bdf61b7b761a56b2fdc276afe4
 
 post_install() {
 	vlicense COPYING

From 19e5c63ebfb530c2db28397032444bdc480fc94c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 3 Apr 2022 19:53:32 -0400
Subject: [PATCH 0910/1686] python3-progress: update to 1.6.

---
 srcpkgs/python3-progress/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-progress/template b/srcpkgs/python3-progress/template
index 4a4ec6e0a5a2..8883c784127f 100644
--- a/srcpkgs/python3-progress/template
+++ b/srcpkgs/python3-progress/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-progress'
 pkgname=python3-progress
-version=1.5
-revision=5
+version=1.6
+revision=1
 wrksrc="progress-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="https://github.com/verigak/progress"
 distfiles="${PYPI_SITE}/p/progress/progress-${version}.tar.gz"
-checksum=69ecedd1d1bbe71bf6313d88d1e6c4d2957b7f1d4f71312c211257f7dae64372
+checksum=c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd
+# Tests are only useful on interactive terminals
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 5ce3de8cd21767474fc91cb2d77190b370d74f55 Mon Sep 17 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, 3 Apr 2022 14:51:11 +0700
Subject: [PATCH 0911/1686] nss: update to 3.77.

---
 srcpkgs/nss/patches/cpputil-databuffer.patch | 20 --------------------
 srcpkgs/nss/template                         |  6 +++---
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/nss/patches/cpputil-databuffer.patch

diff --git a/srcpkgs/nss/patches/cpputil-databuffer.patch b/srcpkgs/nss/patches/cpputil-databuffer.patch
deleted file mode 100644
index 44dd3f467882..000000000000
--- a/srcpkgs/nss/patches/cpputil-databuffer.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1758478
-diff --git a/nss/cpputil/databuffer.h b/nss/cpputil/databuffer.h
-index 8d34e1a..6aee509 100644
---- a/nss/cpputil/databuffer.h
-+++ b/nss/cpputil/databuffer.h
-@@ -33,11 +33,9 @@ class DataBuffer {
-     return *this;
-   }
-   DataBuffer& operator=(DataBuffer&& other) {
--    if (this == &other) {
--      data_ = other.data_;
--      len_ = other.len_;
--      other.data_ = nullptr;
--      other.len_ = 0;
-+    if (this != &other) {
-+      std::swap(data_, other.data_);
-+      std::swap(len_, other.len_);
-     }
-     return *this;
-   }
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index f85cfe79a868..5cc04daf52c2 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,9 +3,9 @@
 _nsprver=4.32
 
 pkgname=nss
-version=3.76
+version=3.77
 revision=1
-hostmakedepends="perl"
+hostmakedepends="perl which"
 makedepends="nspr-devel sqlite-devel zlib-devel"
 depends="nspr>=${_nsprver}"
 short_desc="Mozilla Network Security Services"
@@ -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=1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630
+checksum=825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd
 
 export NS_USE_GCC=1
 export LIBRUNPATH=

From 142c1bc67243fba677f952a75d4a67dc922de322 Mon Sep 17 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, 3 Apr 2022 18:16:39 +0700
Subject: [PATCH 0912/1686] ca-certificates: update to 20211016+3.77.

---
 srcpkgs/ca-certificates/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 450772d160e2..eaa70fc7a22b 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -1,6 +1,6 @@
 # Template file for 'ca-certificates'
 pkgname=ca-certificates
-version=20211016+3.74
+version=20211016+3.77
 revision=1
 _nss_version=${version#*+}
 bootstrap=yes
@@ -16,7 +16,7 @@ homepage="https://wiki.mozilla.org/NSS:Root_certs"
 distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version%+*}.tar.xz
  ${MOZILLA_SITE}/security/nss/releases/NSS_${_nss_version//\./_}_RTM/src/nss-${_nss_version}.tar.gz"
 checksum="2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88
- 88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056"
+ 825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd"
 
 post_extract() {
 	cp ${FILESDIR}/* $build_wrksrc/mozilla

From 1e82e3150f1a92909828fc34767a8a91ab96c276 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 15:45:11 +0200
Subject: [PATCH 0913/1686] texlive2021-bin: use historic texlive repository.

As texlive2022 has been released the default repository no longer
contains the 2021 version. Make the installer use the frozen
historic one.
---
 srcpkgs/texlive2021-bin/INSTALL  | 4 ++--
 srcpkgs/texlive2021-bin/template | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive2021-bin/INSTALL b/srcpkgs/texlive2021-bin/INSTALL
index 9a5b1df97deb..bc296786a54e 100644
--- a/srcpkgs/texlive2021-bin/INSTALL
+++ b/srcpkgs/texlive2021-bin/INSTALL
@@ -5,10 +5,10 @@ post)
 		cd opt/texlive2021-installer
 		case "${ARCH}" in
 			x86_64-musl)
-			./install-tl -profile void.profile -force-platform x86_64-linuxmusl
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile -force-platform x86_64-linuxmusl
 			;;
 			*)
-			./install-tl -profile void.profile
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile
 			;;
 		esac
 	esac
diff --git a/srcpkgs/texlive2021-bin/template b/srcpkgs/texlive2021-bin/template
index 5c9e334c788e..c7bbe1f9fdb8 100644
--- a/srcpkgs/texlive2021-bin/template
+++ b/srcpkgs/texlive2021-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive2021-bin'
 pkgname=texlive2021-bin
 version=2021
-revision=1
+revision=2
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv

From 62a93144f49705bac558d5f9450c4bfd15e04a93 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 15:45:46 +0200
Subject: [PATCH 0914/1686] New package: texlive2022-bin-2022

---
 srcpkgs/texlive2022-bin/INSTALL            | 15 ++++++++
 srcpkgs/texlive2022-bin/INSTALL.msg        | 25 ++++++++++++
 srcpkgs/texlive2022-bin/REMOVE             |  8 ++++
 srcpkgs/texlive2022-bin/files/void.profile |  8 ++++
 srcpkgs/texlive2022-bin/template           | 45 ++++++++++++++++++++++
 5 files changed, 101 insertions(+)
 create mode 100644 srcpkgs/texlive2022-bin/INSTALL
 create mode 100644 srcpkgs/texlive2022-bin/INSTALL.msg
 create mode 100644 srcpkgs/texlive2022-bin/REMOVE
 create mode 100644 srcpkgs/texlive2022-bin/files/void.profile
 create mode 100644 srcpkgs/texlive2022-bin/template

diff --git a/srcpkgs/texlive2022-bin/INSTALL b/srcpkgs/texlive2022-bin/INSTALL
new file mode 100644
index 000000000000..890ae6709c6e
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/INSTALL
@@ -0,0 +1,15 @@
+case "${ACTION}" in
+post)
+	case "${UPDATE}" in
+	no)
+		cd opt/texlive2022-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/texlive2022-bin/INSTALL.msg b/srcpkgs/texlive2022-bin/INSTALL.msg
new file mode 100644
index 000000000000..05a58d965c72
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/INSTALL.msg
@@ -0,0 +1,25 @@
+- TeXLive is free software see the files:
+
+  /usr/share/licenses/texlive2022-bin/LICENSE.TL
+  /usr/share/licenses/texlive2022-bin/LICENSE.CTAN
+
+=====================================================================
+
+  To update you TeXLive installation use only the program 
+
+  /opt/texlive/2022/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/texlive2022-bin/REMOVE b/srcpkgs/texlive2022-bin/REMOVE
new file mode 100644
index 000000000000..82df92619ea7
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/REMOVE
@@ -0,0 +1,8 @@
+# This script will clear the TeXLive directory  
+#
+case "${ACTION}" in
+post)
+	rm -rf opt/texlive/2022
+	rm -r opt/texlive2022-installer
+	;;
+esac
diff --git a/srcpkgs/texlive2022-bin/files/void.profile b/srcpkgs/texlive2022-bin/files/void.profile
new file mode 100644
index 000000000000..17ad30ed523d
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/files/void.profile
@@ -0,0 +1,8 @@
+# texlive.profile written for voidlinux
+TEXDIR ../texlive/2022
+TEXMFCONFIG ~/.texlive2022/texmf-config
+TEXMFHOME ~/texmf
+TEXMFLOCAL ../texlive/texmf-local
+TEXMFSYSCONFIG ../texlive/2022/texmf-config
+TEXMFSYSVAR ../texlive/2022/texmf-var
+TEXMFVAR ~/.texlive2022/texmf-var
diff --git a/srcpkgs/texlive2022-bin/template b/srcpkgs/texlive2022-bin/template
new file mode 100644
index 000000000000..902d4dc245d7
--- /dev/null
+++ b/srcpkgs/texlive2022-bin/template
@@ -0,0 +1,45 @@
+# Template file for 'texlive2022-bin'
+pkgname=texlive2022-bin
+version=2022
+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="https://tug.org/texlive/"
+distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>${pkgname}-${version}-${revision}.tar.gz"
+checksum=e67edec49df6b7c4a987a7d5a9b31bcf41258220f9ac841c7a836080cd334fb5
+
+# 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 28c4cf8c981d13b79323a05961dcecff89925dff Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:25:10 +0200
Subject: [PATCH 0915/1686] xcalc: update to 1.1.1.

---
 srcpkgs/xcalc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xcalc/template b/srcpkgs/xcalc/template
index d73849df763e..90be0b7c5028 100644
--- a/srcpkgs/xcalc/template
+++ b/srcpkgs/xcalc/template
@@ -1,6 +1,6 @@
 # Template file for 'xcalc'
 pkgname=xcalc
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -9,8 +9,8 @@ short_desc="Scientific calculator for X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xcalc.1.html"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=d5d746954465afc3da1f355d721882806568fb04b4d059c027702c0d16a3b5eb
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=8cb08212c5322e8043f39b28699e13a43f000976c90b3c7fadd4fae2766326b4
 
 post_install() {
 	vlicense COPYING

From 0f2cf4348d1f464de5792095d1e8a2283cf52384 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:26:24 +0200
Subject: [PATCH 0916/1686] xclock: update to 1.1.0.

---
 srcpkgs/xclock/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xclock/template b/srcpkgs/xclock/template
index 68650d8d3ce1..6d214076f834 100644
--- a/srcpkgs/xclock/template
+++ b/srcpkgs/xclock/template
@@ -1,6 +1,6 @@
 # Template file for 'xclock'
 pkgname=xclock
-version=1.0.9
+version=1.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -9,8 +9,8 @@ short_desc="Analog and digital clock for X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xclock.1.html"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=00d1be08b3471a16b1239acad11e26b80545c49c34d9d20deab0ce14515e098f
 
 post_install() {
 	vlicense COPYING

From 3fd421bae3205168eb4ba8d114ef79e0640f202e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:27:47 +0200
Subject: [PATCH 0917/1686] xdm: update to 1.1.13.

---
 srcpkgs/xdm/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xdm/template b/srcpkgs/xdm/template
index 8eb910bf6c8b..3a53a7ae30cf 100644
--- a/srcpkgs/xdm/template
+++ b/srcpkgs/xdm/template
@@ -1,7 +1,7 @@
 # Template file for 'xdm'
 pkgname=xdm
-version=1.1.12
-revision=5
+version=1.1.13
+revision=1
 build_style=gnu-configure
 configure_args="--with-random-device=/dev/urandom
  --with-utmp-file=/var/run/utmp
@@ -21,8 +21,8 @@ short_desc="X Display Manager"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=e58267e8f1478f2f5cd57cbcf2367a36973860c3131a450a3e0816585af03264
 
 post_install() {
 	vsv xdm

From 6992e535c71bf4c4256c5d06af3c4d8dee09adb3 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:30:19 +0200
Subject: [PATCH 0918/1686] xedit: update to 1.2.3.

---
 srcpkgs/xedit/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xedit/template b/srcpkgs/xedit/template
index 99f2001b1611..5cdfccdeb594 100644
--- a/srcpkgs/xedit/template
+++ b/srcpkgs/xedit/template
@@ -1,7 +1,7 @@
 # Template build file for 'xedit'.
 pkgname=xedit
-version=1.2.2
-revision=3
+version=1.2.3
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libXaw-devel"
@@ -9,8 +9,8 @@ short_desc="Simple text editor for X"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=69aa42885dfc06332ca22eb01cc7187e49206e6d65b74113a8ee4cc345fc2927
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=bdd33afeeca881622e55d2cf28f07b4a98f083d0a2573c0b9048f25bdd62db2f
 
 post_install() {
 	vlicense COPYING

From 70176e41c511d7d0a49164a927964de32dfdd87b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:31:06 +0200
Subject: [PATCH 0919/1686] xload: update to 1.1.4.

---
 srcpkgs/xload/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xload/template b/srcpkgs/xload/template
index 74cbd8bbf5ed..ea85f0afcc45 100644
--- a/srcpkgs/xload/template
+++ b/srcpkgs/xload/template
@@ -1,6 +1,6 @@
 # Template file for 'xload'
 pkgname=xload
-version=1.1.3
+version=1.1.4
 revision=1
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config xorg-util-macros"
@@ -9,8 +9,8 @@ short_desc="System load average display for X"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="X11, MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xload.1.html"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=f34e4803871d771325cfe52bebd98cc5b6040d3f065184ec73de436f9a375907
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=8346b99120db24e0f42920f7f12e23e9b1b407d3a66ce419990387b608373031
 
 post_install() {
 	vlicense COPYING

From 9390a38f11624205c410188bbeae915b9c329c78 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 19:32:57 +0200
Subject: [PATCH 0920/1686] xlsfonts: update to 1.0.7.

Adopted.
---
 srcpkgs/xlsfonts/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xlsfonts/template b/srcpkgs/xlsfonts/template
index 27caf717e52d..830ae67c26f0 100644
--- a/srcpkgs/xlsfonts/template
+++ b/srcpkgs/xlsfonts/template
@@ -1,16 +1,16 @@
-# Template build file for 'xlsfonts'.
+# Template file for 'xlsfonts'
 pkgname=xlsfonts
-version=1.0.6
+version=1.0.7
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libX11-devel"
 short_desc="Server font list displayer for X"
-homepage="http://xorg.freedesktop.org"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-maintainer="Orphaned <orphan@voidlinux.org>"
-checksum=89b80b3a030006ab6cef717be286c12f2477894b227158b1e6133274f6ebd368
+homepage="http://xorg.freedesktop.org"
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=7b726945a967b44c35cddee5edd74802907a239ce2e2e515730b8a32c8e50465
 
 post_install() {
 	vlicense COPYING

From 14b284c2a91e6407ccc3dd36aaa3ad8faadebdfa Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 13 Oct 2021 08:31:15 -0400
Subject: [PATCH 0921/1686] python3-zeroconf: update to 0.38.4.

---
 srcpkgs/python3-zeroconf/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-zeroconf/template b/srcpkgs/python3-zeroconf/template
index a08bf018db1d..acae59ecd99f 100644
--- a/srcpkgs/python3-zeroconf/template
+++ b/srcpkgs/python3-zeroconf/template
@@ -1,20 +1,21 @@
 # Template file for 'python3-zeroconf'
 pkgname=python3-zeroconf
-version=0.30.0
-revision=2
+version=0.38.4
+revision=1
 wrksrc="python-zeroconf-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-ifaddr"
-checkdepends="python3-pytest python3-mypy $depends"
+checkdepends="python3-pytest python3-pytest-cov python3-mypy
+ python3-pytest-asyncio $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=bbb5e15625a96ac4dc4fba33519227ea8a6d1991000af51e976d01d2917a8d82
+checksum=74ead61490a7573d1cab1e9e9ea6fe846be0843c4ddd55633788d4670837c0eb
 
 do_check() {
 	# IPv6 doesn't work on github CI
-	SKIP_IPV6=1 python3 -m pytest zeroconf/test.py
+	SKIP_IPV6=1 python3 -m pytest tests/
 }

From a4862d5a3b9bfb35f838d70704263af5bab2b37a Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 00:04:32 -0400
Subject: [PATCH 0922/1686] chezmoi: update to 2.15.0.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 464d7ccc07ca..abf8ff70d40f 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.14.0
+version=2.15.0
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <dev@kb6.ee>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=4d7a1baf7e3caa8f6976b1ea5e6ba81c75273b1dd1f0fc946134a82454720397
+checksum=d33a5df53bde7b94962c39788e44af41e52a7836bc6d43168c9b324da966996e
 
 export CGO_ENABLED=1
 

From 6d760371d59b152b34861a06507dbfdf759e1908 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:29:38 +0200
Subject: [PATCH 0923/1686] apostrophe: update to 2.6.2.

---
 srcpkgs/apostrophe/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apostrophe/template b/srcpkgs/apostrophe/template
index d130b8694cd4..54a80188bdae 100644
--- a/srcpkgs/apostrophe/template
+++ b/srcpkgs/apostrophe/template
@@ -1,6 +1,6 @@
 # Template file for 'apostrophe'
 pkgname=apostrophe
-version=2.6.1
+version=2.6.2
 revision=1
 wrksrc="$pkgname-v$version"
 build_style=meson
@@ -9,9 +9,10 @@ hostmakedepends="python3 glib-devel appstream-glib pkg-config gettext sassc"
 makedepends="libglib-devel gtk+3-devel libhandy1-devel"
 depends="python3-gobject python3-chardet python3-setuptools python3-pypandoc
  gspell iso-codes libhandy1 webkit2gtk"
-short_desc="GTK+ based distraction free Markdown editor"
+short_desc="GTK based distraction free Markdown editor"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-only"
 homepage="https://gitlab.gnome.org/World/apostrophe"
+changelog="https://gitlab.gnome.org/World/apostrophe/-/raw/main/NEWS"
 distfiles="https://gitlab.gnome.org/World/apostrophe/-/archive/v$version/apostrophe-v$version.tar.gz"
-checksum=f1c38d97cc5413a21017b95c16f0e869fd0d316ec1a3c54ec5607534562cee5c
+checksum=b06ca4593ceb21bcd7f9734e41ba3fb69f632b5ab24afcdc66500d18d242c068

From 01b6783c11bd4396336651435ce25d187b83ff19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:45:19 +0200
Subject: [PATCH 0924/1686] streamlink: update to 3.2.0.

---
 srcpkgs/streamlink/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/streamlink/template b/srcpkgs/streamlink/template
index 3d168cc74c79..5b8427c56e96 100644
--- a/srcpkgs/streamlink/template
+++ b/srcpkgs/streamlink/template
@@ -1,6 +1,6 @@
 # Template file for 'streamlink'
 pkgname=streamlink
-version=3.1.1
+version=3.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,7 +14,7 @@ license="BSD-2-Clause"
 homepage="https://streamlink.github.io/"
 changelog="https://raw.githubusercontent.com/streamlink/streamlink/master/CHANGELOG.md"
 distfiles="https://github.com/streamlink/streamlink/releases/download/${version}/streamlink-${version}.tar.gz"
-checksum=855cd31e900e3ae1d5328a37123bfffe2aec501a1d74bcdd12f0d2a2758060e4
+checksum=9770d2d83844c5378a73e14130dcb760abc856566caa0a41fc5b97a0ded5d926
 make_check=ci-skip # some tests fail when running as root
 
 post_install() {

From d1d000a28a7c2addf106e72c0c8e432032b44dbd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:48:10 +0200
Subject: [PATCH 0925/1686] xorg-server-xwayland: update to 22.1.1.

---
 srcpkgs/xorg-server-xwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xorg-server-xwayland/template b/srcpkgs/xorg-server-xwayland/template
index 0506654b4ca5..9cb01b318ddb 100644
--- a/srcpkgs/xorg-server-xwayland/template
+++ b/srcpkgs/xorg-server-xwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'xorg-server-xwayland'
 pkgname=xorg-server-xwayland
-version=22.1.0
+version=22.1.1
 revision=1
 wrksrc="xserver-xwayland-$version"
 build_style=meson
@@ -17,7 +17,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://xorg.freedesktop.org"
 distfiles="https://gitlab.freedesktop.org/xorg/xserver/-/archive/xwayland-$version/xserver-xwayland-$version.tar.gz"
-checksum=972d5456445049855a669c1418f20ecbc290c85b1b59602a01c6afa199203389
+checksum=42837e7b90e0d92aff4d7846f0609f8d3c0c6641bdd6add6e4e0c5c214371149
 make_check=no # needs xtest repository
 
 post_install() {

From a479197456f6aeb6274f38a624c9d607985da97d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:48:34 +0200
Subject: [PATCH 0926/1686] lagrange: update to 1.11.2.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 0da2bdd614fd..41a9f935f8eb 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.11.1
+version=1.11.2
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=a303f62b6e7372396d334f25eeaaa745827c28ac926dc12305b2b41596d748e8
+checksum=4e9a9ed38bcfc7b04856f0e2667d7afd535a8e06e367e2e4368ef5fb9105791f
 
 post_install() {
 	vlicense LICENSE.md

From dee6c4167e973b148d29a367a156edfba031bab3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:51:01 +0200
Subject: [PATCH 0927/1686] python3-charset-normalizer: update to 2.0.12.

---
 srcpkgs/python3-charset-normalizer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-charset-normalizer/template b/srcpkgs/python3-charset-normalizer/template
index 16fbe97b2ef2..7c8809724b1b 100644
--- a/srcpkgs/python3-charset-normalizer/template
+++ b/srcpkgs/python3-charset-normalizer/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-charset-normalizer'
 pkgname=python3-charset-normalizer
-version=2.0.11
+version=2.0.12
 revision=1
 wrksrc="charset_normalizer-$version"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://charset-normalizer.readthedocs.io/"
 changelog="https://raw.githubusercontent.com/Ousret/charset_normalizer/master/CHANGELOG.md"
 distfiles="https://github.com/Ousret/charset_normalizer/archive/refs/tags/$version.tar.gz"
-checksum=d7188036dd61de0e626717d0b5fe6365beac7ea03c77b354e874a1098ed2b18a
+checksum=8dd3a1a5444741208d627993344516cb62909c8c3f5c55deaa5bee6a305ead7a
 
 pre_check() {
 	vsed -i "s/--cov=charset_normalizer --cov-report=term-missing//" setup.cfg

From 7e3ec1f9e1c31d0dd412f7505f97ff2f998135b6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 21:51:06 +0200
Subject: [PATCH 0928/1686] easyeffects: update to 6.2.4.

---
 srcpkgs/easyeffects/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index bc1aaffed675..ac84ce15b068 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,6 +1,6 @@
 # Template file for 'easyeffects'
 pkgname=easyeffects
-version=6.2.3
+version=6.2.4
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext itstool glib-devel"
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/wwmm/easyeffects"
 changelog="https://raw.githubusercontent.com/wwmm/easyeffects/master/CHANGELOG.md"
 distfiles="https://github.com/wwmm/easyeffects/archive/v${version}.tar.gz"
-checksum=525cb56847c5d85589a2351e012712ff7f66c951f530ba50f5acb86a988584aa
+checksum=2d4e5638f209a887acb73b3d2bbea4bc5f83ded866bba40c1935ec40fb17658b
 
 pulseeffects_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f2e8c6c1e8cc7a63d60a7b14479f4fff31b821d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 3 Apr 2022 12:00:11 -0300
Subject: [PATCH 0929/1686] New package: threejs-sage-r122

---
 srcpkgs/threejs-sage/template | 16 ++++++++++++++++
 srcpkgs/threejs-sage/update   |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 srcpkgs/threejs-sage/template
 create mode 100644 srcpkgs/threejs-sage/update

diff --git a/srcpkgs/threejs-sage/template b/srcpkgs/threejs-sage/template
new file mode 100644
index 000000000000..cb5c87a19c12
--- /dev/null
+++ b/srcpkgs/threejs-sage/template
@@ -0,0 +1,16 @@
+# Template file for 'threejs-sage'
+pkgname=threejs-sage
+version=r122
+revision=1
+short_desc="Custom build of three.js for sagemath"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="MIT"
+homepage="https://github.com/sagemath/threejs-sage/"
+distfiles="https://github.com/sagemath/threejs-sage/archive/refs/tags/${version}.tar.gz"
+checksum=718767ab55876a3e957d1cfe89a322c6d9fa680fc737b9ca668aee6a3eac3bb8
+
+do_install() {
+	vlicense LICENSE
+	vinstall version 644 usr/share/sagemath/threejs-sage
+	vinstall build/three.min.js 644 usr/share/sagemath/threejs-sage/$version
+}
diff --git a/srcpkgs/threejs-sage/update b/srcpkgs/threejs-sage/update
new file mode 100644
index 000000000000..05c0c7ecebe1
--- /dev/null
+++ b/srcpkgs/threejs-sage/update
@@ -0,0 +1 @@
+site=https://mirrors.mit.edu/sage/spkg/upstream/threejs/

From 7c6e100bed78f75d5975d68d6fa99b0029cf6d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 28 Feb 2022 12:03:22 -0300
Subject: [PATCH 0930/1686] lrcalc: update to 2.1.

---
 common/shlibs                         |  2 +-
 srcpkgs/lrcalc/patches/includes.patch | 90 ---------------------------
 srcpkgs/lrcalc/template               |  6 +-
 3 files changed, 4 insertions(+), 94 deletions(-)
 delete mode 100644 srcpkgs/lrcalc/patches/includes.patch

diff --git a/common/shlibs b/common/shlibs
index 307cb13347fc..e7af88140d1a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4040,7 +4040,7 @@ libarb.so.2 arb-2.20.0_1
 libec.so.8 eclib-20210625_1
 libsymmetrica.so.2 symmetrica-3.0.1_1
 libLfunction.so.1 lcalc-2.0.4_1
-liblrcalc.so.1 lrcalc-1.2_1
+liblrcalc.so.2 lrcalc-2.1_1
 libwayland-client++.so.0 libwaylandpp-0.2.8_1
 libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
 libwayland-egl++.so.0 libwaylandpp-0.2.8_1
diff --git a/srcpkgs/lrcalc/patches/includes.patch b/srcpkgs/lrcalc/patches/includes.patch
deleted file mode 100644
index 707da176a60f..000000000000
--- a/srcpkgs/lrcalc/patches/includes.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 4a5e1c8c3c11efdb1cbb4239825a6bf4bf1c52f8 Mon Sep 17 00:00:00 2001
-From: Anders Skovsted Buch <asbuch@math.rutgers.edu>
-Date: Sun, 29 Nov 2015 16:25:56 -0500
-Subject: [PATCH] Patch by Jeroen Demeyer to change include <vector.h> to
- "vector.h", plus similar cases.
-
----
- src/lrcalc.c   | 2 +-
- src/maple.c    | 4 ++--
- src/schublib.h | 2 +-
- src/symfcn.c   | 6 +++---
- src/symfcn.h   | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/lrcalc.c b/src/lrcalc.c
-index aff3f75..60df49e 100644
---- a/src/lrcalc.c
-+++ b/src/lrcalc.c
-@@ -8,7 +8,7 @@
- #include <stdlib.h>
- extern char *optarg;
- 
--#include <vectarg.h>
-+#include "vectarg.h"
- 
- #include "symfcn.h"
- #include "maple.h"
-diff --git a/src/maple.c b/src/maple.c
-index fdc0768..a5f4d14 100644
---- a/src/maple.c
-+++ b/src/maple.c
-@@ -4,8 +4,8 @@
-  */
- 
- #include <stdio.h>
--#include <vector.h>
--#include <hashtab.h>
-+#include "vector.h"
-+#include "hashtab.h"
- #include "maple.h"
- 
- 
-diff --git a/src/schublib.h b/src/schublib.h
-index a8e8511..864850c 100644
---- a/src/schublib.h
-+++ b/src/schublib.h
-@@ -1,7 +1,7 @@
- #ifndef _SCHUBLIB_H
- #define _SCHUBLIB_H
- 
--#include <hashtab.h>
-+#include "hashtab.h"
- 
- hashtab *trans(vector *w, int vars, hashtab *res);
- hashtab *monk(int i, hashtab *slc, int rank);
-diff --git a/src/symfcn.c b/src/symfcn.c
-index 4ffbe4b..fd5df5d 100644
---- a/src/symfcn.c
-+++ b/src/symfcn.c
-@@ -5,9 +5,9 @@
- 
- #include <stdio.h>
- 
--#include <alloc.h>
--#include <vector.h>
--#include <hashtab.h>
-+#include "alloc.h"
-+#include "vector.h"
-+#include "hashtab.h"
- 
- #include "symfcn.h"
- 
-diff --git a/src/symfcn.h b/src/symfcn.h
-index b8543b1..29bb00d 100644
---- a/src/symfcn.h
-+++ b/src/symfcn.h
-@@ -1,8 +1,8 @@
- #ifndef _SYMFCN_H
- #define _SYMFCN_H
- 
--#include <hashtab.h>
--#include <vector.h>
-+#include "hashtab.h"
-+#include "vector.h"
- 
- int part_itr_sz(vector *part);
- int part_itr_sub(vector *part, vector *outer);
--- 
-2.1.1.1.g1fb337f
-
diff --git a/srcpkgs/lrcalc/template b/srcpkgs/lrcalc/template
index 8b33c3cba6c8..afa889b6d6ad 100644
--- a/srcpkgs/lrcalc/template
+++ b/srcpkgs/lrcalc/template
@@ -1,14 +1,14 @@
 # Template file for 'lrcalc'
 pkgname=lrcalc
-version=1.2
-revision=2
+version=2.1
+revision=1
 build_style=gnu-configure
 short_desc="Littlewood-Richardson Calculator"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-3.0-or-later"
 homepage="https://sites.math.rutgers.edu/~asbuch/lrcalc/"
 distfiles="https://sites.math.rutgers.edu/~asbuch/lrcalc/lrcalc-$version.tar.gz"
-checksum=792dd538a0d19698be2c5b8c138730bbb4820e8a44e03b001ae14bd5f1d7040b
+checksum=996ac00e6ea8321ef09b34478f5379f613933c3254aeba624b6419b8afa5df57
 
 lrcalc-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 0fc4b2913662b329e75323bc4aa2cae64d2703b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 28 Feb 2022 14:06:21 -0300
Subject: [PATCH 0931/1686] New package: python3-lrcalc-2.1

---
 srcpkgs/python3-lrcalc/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-lrcalc/template

diff --git a/srcpkgs/python3-lrcalc/template b/srcpkgs/python3-lrcalc/template
new file mode 100644
index 000000000000..9f335dac35dd
--- /dev/null
+++ b/srcpkgs/python3-lrcalc/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-lrcalc'
+pkgname=python3-lrcalc
+version=2.1
+revision=1
+wrksrc=lrcalc-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel lrcalc-devel"
+short_desc="Python bindings for the Littlewood-Richardson Calculator library"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="GPL-3.0-or-later"
+homepage="https://math.rutgers.edu/~asbuch/lrcalc"
+distfiles="${PYPI_SITE}/l/lrcalc/lrcalc-${version}.tar.gz"
+checksum=e3a0509aeda487b412b391a52e817ca36b5c063a8305e09fd54d53259dd6aaa9

From 430a5b0eb620eeaae7a4ca35cf3cd8c0e06dc9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 22 Jan 2022 16:35:34 -0300
Subject: [PATCH 0932/1686] lcalc: ignore a version irrelevant for us

---
 srcpkgs/lcalc/update | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/lcalc/update

diff --git a/srcpkgs/lcalc/update b/srcpkgs/lcalc/update
new file mode 100644
index 000000000000..4cfe261c03b8
--- /dev/null
+++ b/srcpkgs/lcalc/update
@@ -0,0 +1,2 @@
+# this version only adds a fix for cygwin
+ignore=2.0.5

From ceb44152a82c802f432c873fbdad749bb77e3042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 22 Jan 2022 16:35:20 -0300
Subject: [PATCH 0933/1686] python3-gmpy2: ignore a version irrelevant for us

---
 srcpkgs/python3-gmpy2/update | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/python3-gmpy2/update b/srcpkgs/python3-gmpy2/update
index b5703618d280..0d9a7f7d2018 100644
--- a/srcpkgs/python3-gmpy2/update
+++ b/srcpkgs/python3-gmpy2/update
@@ -1 +1,3 @@
 ignore="*a[1-9] *b[1-9] *rc[1-9]"
+# this version only adds binary wheels for apple silicon
+ignore="$ignore 2.1.2"

From fb88da191774b937be7923ef452fb4f68bbce14a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 28 Feb 2022 14:06:28 -0300
Subject: [PATCH 0934/1686] sagemath: rebuild for package updates

 - compatibility with lrcalc 2.1 (trac #31355)
 - fix doctests for ipython-8.1 (trac #33170)
 - fix doctests for scipy-1.8 (trac #33336)
 - fix doctests for sympy-1.10 (trac #33398)
 - fix doctests when sphinx is installed (trac #33585)
 - use new package threejs-sage for 3d plots
---
 .../trac-31355-upgrade_lrcalc_to_2.1.patch    | 670 ++++++++++++++++++
 .../trac-33170-fix_doctest_ipython_8.patch    |  40 ++
 .../trac-33170b-fix_doctest_ipython_8.1.patch |  13 +
 .../trac-33336-fix_doctest_scipy_1.8.patch    |  19 +
 ...d9deaeaa6380ab2f0d50276d911233c00a04.patch |  99 +++
 ...ff347454ac7f07e5918470b20e97b8f2357e.patch |  29 +
 ...0a0b14f67f4804e7113c3db41bbcf8a58296.patch |  26 +
 .../patches/zzz-skip_doctest_no_threejs.patch |  13 -
 srcpkgs/sagemath/template                     |   9 +-
 9 files changed, 901 insertions(+), 17 deletions(-)
 create mode 100644 srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch
 create mode 100644 srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch
 delete mode 100644 srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch

diff --git a/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch b/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch
new file mode 100644
index 000000000000..4bd6f4f4e2dc
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-31355-upgrade_lrcalc_to_2.1.patch
@@ -0,0 +1,670 @@
+As produced by `git diff 9.5 9.6.beta3 -- src/sage/libs/lrcalc`
+
+diff --git a/src/sage/libs/lrcalc/lrcalc.pxd b/src/sage/libs/lrcalc/lrcalc.pxd
+deleted file mode 100644
+index 10b88db93f2..00000000000
+--- a/src/sage/libs/lrcalc/lrcalc.pxd
++++ /dev/null
+@@ -1,77 +0,0 @@
+-# distutils: libraries = lrcalc
+-
+-cdef extern from "lrcalc/hashtab.h":
+-    ctypedef struct hashtab:
+-        pass
+-
+-    ctypedef struct hash_itr:
+-        pass
+-
+-    ctypedef unsigned long hashkey_t
+-    ctypedef int (*cmp_t) (void* a, void* b)
+-    ctypedef hashkey_t (*hash_t) (void* a)
+-
+-    hashtab* hash_new(cmp_t cm, hash_t hsh)
+-    void hash_free(hashtab *ht)
+-
+-    void* hash_lookup(hashtab *ht, void *key)
+-    void* hash_insert(hashtab *ht, void *key, void *value)
+-
+-    bint hash_good(hash_itr)
+-    void hash_first(hashtab* s, hash_itr itr)
+-    void hash_next(hash_itr itr)
+-    void* hash_key(hash_itr itr)
+-    void* hash_value(hash_itr itr)
+-    int hash_intvalue(hash_itr itr)
+-
+-cdef extern from "lrcalc/vector.h":
+-    ctypedef struct vector:
+-        size_t length
+-        int* array
+-
+-    vector* v_new(int length)
+-    void v_free(vector* v)
+-    void v_print(vector *v)
+-    int v_length(vector* v)
+-    int v_elem(vector* v, int i)
+-
+-    ctypedef struct vecpair:
+-        vector *first
+-        vector *second
+-
+-    vector* vp_first(vecpair* vp)
+-    vector* vp_second(vecpair* vp)
+-
+-cdef extern from "lrcalc/list.h":
+-    cdef struct _list:
+-        void **array
+-        size_t allocated
+-        size_t length
+-    void l_free(_list *lst)
+-
+-cdef extern from "lrcalc/symfcn.h":
+-    long long lrcoef_c "lrcoef"(vector* outer, vector* inner1, vector* inner2)
+-    hashtab* mult_c "mult"(vector *sh1, vector *sh2, int maxrows)
+-    hashtab* skew_c "skew"(vector *outer, vector *inner, int maxrows)
+-    hashtab* coprod_c "coprod"(vector *part, int all)
+-    void fusion_reduce_c "fusion_reduce"(hashtab* ht, int rows, int cols, int opt_zero)
+-    _list *quantum_reduce_c "quantum_reduce"(hashtab* ht, int rows, int col)
+-
+-    ctypedef struct skewtab:
+-        vector *outer
+-        vector *inner
+-        vector *conts
+-        int maxrows
+-        vector *conjugate
+-        int rows
+-        int cols
+-        int matrix[1]
+-
+-    skewtab *st_new(vector *outer, vector *inner, vector *conts, int maxrows)
+-    int st_next(skewtab *st)
+-    void st_print(skewtab *st)
+-    void st_free(skewtab *st)
+-
+-
+-cdef extern from "lrcalc/schublib.h":
+-    hashtab* mult_schubert_c "mult_schubert"(vector *sh1, vector *sh2, int rank)
+diff --git a/src/sage/libs/lrcalc/lrcalc.pyx b/src/sage/libs/lrcalc/lrcalc.py
+similarity index 60%
+rename from src/sage/libs/lrcalc/lrcalc.pyx
+rename to src/sage/libs/lrcalc/lrcalc.py
+index b591081ec4c..b541bfacd89 100644
+--- a/src/sage/libs/lrcalc/lrcalc.pyx
++++ b/src/sage/libs/lrcalc/lrcalc.py
+@@ -10,7 +10,8 @@ fusion products. All of the above are achieved by counting LR
+ appropriate shape and content by iterating through them.
+ Additionally, ``lrcalc`` handles products of Schubert polynomials.
+ 
+-The web page of ``lrcalc`` is `<http://sites.math.rutgers.edu/~asbuch/lrcalc/>`_.
++The web page of ``lrcalc`` is
++`<http://sites.math.rutgers.edu/~asbuch/lrcalc/>`_.
+ 
+ The following describes the Sage interface to this library.
+ 
+@@ -36,12 +37,13 @@ Schur expansion::
+      [4, 2]: 1}
+ 
+ Same product, but include only partitions with at most 3 rows.  This
+-corresponds to computing in the representation ring of gl(3)::
++corresponds to computing in the representation ring of `\mathfrak{gl}(3)`::
+ 
+     sage: lrcalc.mult([2,1], [2,1], 3)
+     {[2, 2, 2]: 1, [3, 2, 1]: 2, [3, 3]: 1, [4, 1, 1]: 1, [4, 2]: 1}
+ 
+-We can also compute the fusion product, here for sl(3) and level 2::
++We can also compute the fusion product, here for `\mathfrak{sl}(3)`
++and level 2::
+ 
+     sage: lrcalc.mult([3,2,1], [3,2,1], 3,2)
+     {[4, 4, 4]: 1, [5, 4, 3]: 1}
+@@ -77,42 +79,38 @@ Multiply two Schubert polynomials::
+      [6, 2, 1, 4, 3, 5]: 1}
+ 
+ Same product, but include only permutations of 5 elements in the result.
+-This corresponds to computing in the cohomology ring of Fl(5)::
++This corresponds to computing in the cohomology ring of `Fl(5)`::
+ 
+     sage: lrcalc.mult_schubert([4,2,1,3], [1,4,2,5,3], 5)
+     {[4, 5, 1, 3, 2]: 1, [5, 3, 1, 4, 2]: 1, [5, 4, 1, 2, 3]: 1}
+ 
+ List all Littlewood-Richardson tableaux of skew shape `\mu/\nu`; in
+ this example `\mu=[3,2,1]` and `\nu=[2,1]`. Specifying a third entry
+-`maxrows` restricts the alphabet to `\{1,2,\ldots,maxrows\}`::
++`M' = ``maxrows`` restricts the alphabet to `\{1,2,\ldots,M\}`::
+ 
+     sage: list(lrcalc.lrskew([3,2,1],[2,1]))
+     [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]],
+     [[None, None, 1], [None, 2], [1]], [[None, None, 1], [None, 2], [3]]]
+ 
+     sage: list(lrcalc.lrskew([3,2,1],[2,1],maxrows=2))
+-    [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]], [[None, None, 1], [None, 2], [1]]]
++    [[[None, None, 1], [None, 1], [1]], [[None, None, 1], [None, 1], [2]],
++     [[None, None, 1], [None, 2], [1]]]
+ 
+ .. TODO::
+ 
+-    use this library in the :class:`SymmetricFunctions` code, to
++    Use this library in the :class:`SymmetricFunctions` code, to
+     make it easy to apply it to linear combinations of Schur functions.
+ 
+ .. SEEALSO::
+ 
+     - :func:`lrcoef`
+-
+     - :func:`mult`
+-
+     - :func:`coprod`
+-
+     - :func:`skew`
+-
+     - :func:`lrskew`
+-
+     - :func:`mult_schubert`
+ 
+-.. rubric:: Underlying algorithmic in lrcalc
++.. RUBRIC:: Underlying algorithmic in lrcalc
+ 
+ Here is some additional information regarding the main low-level
+ C-functions in `lrcalc`. Given two partitions ``outer`` and ``inner``
+@@ -187,180 +185,24 @@ AUTHORS:
+ #                  https://www.gnu.org/licenses/
+ # ****************************************************************************
+ 
+-from sage.rings.integer cimport Integer
+-from sage.structure.parent cimport Parent
+ from sage.combinat.partition import _Partitions
+ from sage.combinat.permutation import Permutation
+-from sage.combinat.skew_tableau import SkewTableau
+-
+-
+-cdef vector* iterable_to_vector(it):
+-    """
+-    Return an lrcalc vector (which is a list of integers) from a Python iterable.
+-
+-    TESTS::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector
+-        sage: x = test_iterable_to_vector(Partition([3,2,1])); x   #indirect doctest
+-        [3, 2, 1]
+-    """
+-    cdef vector* v
+-    cdef list itr = list(it)
+-    cdef int n = len(itr)
+-    cdef int i
+-    v = v_new(n)
+-    for i in range(n):
+-        v.array[i] = int(itr[i])
+-    return v
+-
+-
+-cdef list vector_to_list(vector *v):
+-    """
+-    Converts a lrcalc vector to Python list.
+-
+-    TESTS::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector
+-        sage: x = test_iterable_to_vector([]); x         #indirect doctest
+-        []
+-    """
+-    cdef int i, n
+-    n = v_length(v)
+-    cdef list result = [None]*n
+-    for i in range(n):
+-        result[i] = Integer(v_elem(v, i))
+-    return result
+-
+-
+-def test_iterable_to_vector(it):
+-    """
+-    A wrapper function for the cdef function ``iterable_to_vector``
+-    and ``vector_to_list``, to test that they are working correctly.
++from sage.combinat.skew_tableau import SemistandardSkewTableaux
++from sage.combinat.skew_partition import SkewPartition
++from sage.rings.integer import Integer
++import lrcalc
+ 
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_iterable_to_vector
+-        sage: x = test_iterable_to_vector([3,2,1]); x
+-        [3, 2, 1]
+-    """
+-    cdef vector *v = iterable_to_vector(it)
+-    result = vector_to_list(v)
+-    v_free(v)
+-    return result
+-
+-
+-cdef skewtab_to_SkewTableau(skewtab *st):
+-    """
+-    A wrapper function which transforms the data set ``st`` used in
+-    ``lrcalc`` to a ``SkewTableau`` in Sage.
++def _lrcalc_dict_to_sage(result):
++    r"""
++    Translate from lrcalc output format to Sage expected format.
+ 
+     TESTS::
+ 
+-        sage: from sage.libs.lrcalc.lrcalc import test_skewtab_to_SkewTableau
+-        sage: test_skewtab_to_SkewTableau([],[])
+-        []
+-    """
+-    inner = vector_to_list(st.inner)
+-    outer = vector_to_list(st.outer)
+-    return SkewTableau(expr=[[inner[y] for y in range(len(outer))],
+-                             [[st.matrix[x + y * st.cols] + 1
+-                                for x in range(inner[y], outer[y])]
+-                              for y in range(len(outer) - 1, -1, -1)]])
+-
+-
+-def test_skewtab_to_SkewTableau(outer, inner):
+-    """
+-    A wrapper function for the cdef function ``skewtab_to_SkewTableau``
+-    for testing purposes.
+-
+-    It constructs the first LR skew tableau of shape ``outer/inner``
+-    as an ``lrcalc`` ``skewtab``, and converts it to a
+-    :class:`SkewTableau`.
+-
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import test_skewtab_to_SkewTableau
+-        sage: test_skewtab_to_SkewTableau([3,2,1],[])
+-        [[1, 1, 1], [2, 2], [3]]
+-        sage: test_skewtab_to_SkewTableau([4,3,2,1],[1,1]).pp()
+-        .  1  1  1
+-        .  2  2
+-        1  3
+-        2
+-    """
+-    cdef vector* o = iterable_to_vector(outer)
+-    cdef vector* i = iterable_to_vector(inner+[0]*(len(outer)-len(inner)))
+-    cdef skewtab* st = st_new(o, i, NULL, 0)
+-    return skewtab_to_SkewTableau(st)
+-
+-
+-cdef dict sf_hashtab_to_dict(hashtab *ht):
+-    """
+-    Return a dictionary representing a Schur function. The keys are
+-    partitions and the values are integers <class 'sage.rings.integer.Integer'>.
+-
+-    EXAMPLES::
+-
+         sage: from sage.libs.lrcalc.lrcalc import mult
+-        sage: sorted(mult([1],[1]).items())        #indirect doctest
+-        [([1, 1], 1), ([2], 1)]
+-        sage: assert isinstance(mult([1],[1]),dict)#indirect doctest
+-    """
+-    cdef hash_itr itr
+-    cdef dict result = {}
+-    cdef list p
+-    hash_first(ht, itr)
+-    while hash_good(itr):
+-        p = vector_to_list(<vector*> hash_key(itr))
+-        result[_Partitions(p)] = Integer(hash_intvalue(itr))
+-        hash_next(itr)
+-    return result
+-
+-
+-cdef dict schubert_hashtab_to_dict(hashtab *ht):
+-    """
+-    Return a dictionary corresponding to a Schubert polynomial whose keys
+-    are permutations and whose values are integers <class 'sage.rings.integer.Integer'>.
+-
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import mult_schubert
+-        sage: mult_schubert([3,2,1], [1,2,3])      #indirect doctest
+-        {[3, 2, 1]: 1}
+-    """
+-    cdef hash_itr itr
+-    cdef dict result = {}
+-    hash_first(ht, itr)
+-    while hash_good(itr):
+-        p = vector_to_list(<vector*> hash_key(itr))
+-        result[Permutation(p)] = Integer(hash_intvalue(itr))
+-        hash_next(itr)
+-    return result
+-
+-
+-cdef dict vp_hashtab_to_dict(hashtab *ht):
+-    """
+-    Return a dictionary corresponding to the coproduct of a Schur function whose keys are
+-    pairs of partitions and whose values are integers <class 'sage.rings.integer.Integer'>.
+-
+-    EXAMPLES::
+-
+-        sage: from sage.libs.lrcalc.lrcalc import coprod
+-        sage: coprod([1])      #indirect doctest
+-        {([1], []): 1}
++        sage: mult([2,1],[3,2,1],3) # indirect doctest
++        {[3, 3, 3]: 1, [4, 3, 2]: 2, [4, 4, 1]: 1, [5, 2, 2]: 1, [5, 3, 1]: 1}
+     """
+-    cdef hash_itr itr
+-    cdef vecpair* vp
+-    cdef dict result = {}
+-    hash_first(ht, itr)
+-    while hash_good(itr):
+-        vp = <vecpair*> hash_key(itr)
+-        p1 = _Partitions(vector_to_list(vp_first(vp)))
+-        p2 = _Partitions(vector_to_list(vp_second(vp)))
+-        result[(p1, p2)] = Integer(hash_intvalue(itr))
+-        hash_next(itr)
+-    return result
+-
++    return {_Partitions(la): Integer(k) for la, k in result.items()}
+ 
+ def lrcoef_unsafe(outer, inner1, inner2):
+     r"""
+@@ -371,13 +213,11 @@ def lrcoef_unsafe(outer, inner1, inner2):
+ 
+     INPUT:
+ 
+-    - ``outer`` -- a partition (weakly decreasing list of non-negative integers).
+-
+-    - ``inner1`` -- a partition.
++    - ``outer`` -- a partition (weakly decreasing list of non-negative integers)
++    - ``inner1`` -- a partition
++    - ``inner2`` -- a partition
+ 
+-    - ``inner2`` -- a partition.
+-
+-    .. warning::
++    .. WARNING::
+ 
+        This function does not do any check on its input.  If you want
+        to use a safer version, use :func:`lrcoef`.
+@@ -392,18 +232,7 @@ def lrcoef_unsafe(outer, inner1, inner2):
+         sage: lrcoef_unsafe([2,1,1,1,1], [2,1], [2,1])
+         0
+     """
+-    cdef long long result
+-    cdef vector *o
+-    cdef vector *i1
+-    cdef vector *i2
+-    o = iterable_to_vector(outer)
+-    i1 = iterable_to_vector(inner1)
+-    i2 = iterable_to_vector(inner2)
+-    result = lrcoef_c(o, i1, i2)
+-    v_free(o)
+-    v_free(i1)
+-    v_free(i2)
+-    return Integer(result)
++    return Integer(lrcalc.lrcoef(outer, inner1, inner2))
+ 
+ 
+ def lrcoef(outer, inner1, inner2):
+@@ -415,11 +244,9 @@ def lrcoef(outer, inner1, inner2):
+ 
+     INPUT:
+ 
+-    - ``outer`` -- a partition (weakly decreasing list of non-negative integers).
+-
+-    - ``inner1`` -- a partition.
+-
+-    - ``inner2`` -- a partition.
++    - ``outer`` -- a partition (weakly decreasing list of non-negative integers)
++    - ``inner1`` -- a partition
++    - ``inner2`` -- a partition
+ 
+     .. NOTE::
+ 
+@@ -436,7 +263,6 @@ def lrcoef(outer, inner1, inner2):
+         1
+         sage: lrcoef([2,1,1,1,1], [2,1], [2,1])
+         0
+-
+     """
+     return lrcoef_unsafe(_Partitions(outer), _Partitions(inner1), _Partitions(inner2))
+ 
+@@ -451,13 +277,9 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None):
+     INPUT:
+ 
+     - ``part1`` -- a partition
+-
+     - ``part2`` -- a partition
+-
+     - ``maxrows`` -- (optional) an integer
+-
+     - ``level`` -- (optional) an integer
+-
+     - ``quantum`` -- (optional) an element of a ring
+ 
+     If ``maxrows`` is specified, then only partitions with at most
+@@ -479,7 +301,8 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None):
+         sage: sorted(mult([2],[2]).items())
+         [([2, 2], 1), ([3, 1], 1), ([4], 1)]
+         sage: sorted(mult([2,1],[2,1]).items())
+-        [([2, 2, 1, 1], 1), ([2, 2, 2], 1), ([3, 1, 1, 1], 1), ([3, 2, 1], 2), ([3, 3], 1), ([4, 1, 1], 1), ([4, 2], 1)]
++        [([2, 2, 1, 1], 1), ([2, 2, 2], 1), ([3, 1, 1, 1], 1),
++         ([3, 2, 1], 2), ([3, 3], 1), ([4, 1, 1], 1), ([4, 2], 1)]
+         sage: sorted(mult([2,1],[2,1],maxrows=2).items())
+         [([3, 3], 1), ([4, 2], 1)]
+         sage: mult([2,1],[3,2,1],3)
+@@ -510,44 +333,24 @@ def mult(part1, part2, maxrows=None, level=None, quantum=None):
+     if quantum is not None and (level is None or maxrows is None):
+         raise ValueError('missing parameters maxrows or level')
+ 
+-    cdef vector* v1 = iterable_to_vector(part1)
+-    cdef vector* v2 = iterable_to_vector(part2)
+-    if maxrows is None:
+-        maxrows = 0
+-    cdef hashtab* ht = mult_c(v1, v2, int(maxrows))
+-    cdef hashtab* tab
+-    cdef dict result
+-
+     if quantum is None:
+         if level is not None:
+-            fusion_reduce_c(ht, int(maxrows), int(level), int(0))
+-        result = sf_hashtab_to_dict(ht)
+-        v_free(v1)
+-        v_free(v2)
+-        hash_free(ht)
+-        return result
++            return _lrcalc_dict_to_sage(lrcalc.mult_fusion(part1, part2, maxrows, level))
++        if maxrows is None:
++            maxrows = -1
++        return _lrcalc_dict_to_sage(lrcalc.mult(part1, part2, maxrows))
+ 
+     # Otherwise do quantum multiplication
+-    cdef _list *qlist
+-    cdef dict temp
+-    qlist = quantum_reduce_c(ht, int(maxrows), int(level))
+-    # The above call frees the memory associated with ht
+-    v_free(v1)
+-    v_free(v2)
+-
+-    cdef Parent P = quantum.parent()
+-    result = {}
+-    for i in range(qlist.length):
+-        tab = <hashtab*>(qlist.array[i])
+-        temp = sf_hashtab_to_dict(tab)
+-        for k in temp:
+-            result[k] = result.get(k, P.zero()) + quantum**i * temp[k]
+-        hash_free(tab)
+-    l_free(qlist)
+-    return result
+-
+-
+-def skew(outer, inner, maxrows=0):
++    result = lrcalc.mult_quantum(part1, part2, maxrows, level, degrees=True)
++    P = quantum.parent()
++    output = {}
++    for i,k in result.items():
++        la = _Partitions(i[0])
++        output[la] = output.get(la, P.zero()) + k * quantum**(i[1])
++    return output
++
++
++def skew(outer, inner, maxrows=-1):
+     """
+     Compute the Schur expansion of a skew Schur function.
+ 
+@@ -557,11 +360,9 @@ def skew(outer, inner, maxrows=0):
+ 
+     INPUT:
+ 
+-    - ``outer`` -- a partition.
+-
+-    - ``inner`` -- a partition.
+-
+-    - ``maxrows`` -- an integer or ``None``.
++    - ``outer`` -- a partition
++    - ``inner`` -- a partition
++    - ``maxrows`` -- an integer or ``None``
+ 
+     If ``maxrows`` is specified, then only partitions with at most
+     this number of rows are included in the result.
+@@ -572,14 +373,7 @@ def skew(outer, inner, maxrows=0):
+         sage: sorted(skew([2,1],[1]).items())
+         [([1, 1], 1), ([2], 1)]
+     """
+-    cdef vector* v1 = iterable_to_vector(outer)
+-    cdef vector* v2 = iterable_to_vector(inner)
+-    cdef hashtab* ht = skew_c(v1, v2, int(maxrows))
+-    result = sf_hashtab_to_dict(ht)
+-    v_free(v1)
+-    v_free(v2)
+-    hash_free(ht)
+-    return result
++    return _lrcalc_dict_to_sage(lrcalc.skew(outer, inner, maxrows))
+ 
+ 
+ def coprod(part, all=0):
+@@ -592,9 +386,8 @@ def coprod(part, all=0):
+ 
+     INPUT:
+ 
+-    - ``part`` -- a partition.
+-
+-    - ``all`` -- an integer.
++    - ``part`` -- a partition
++    - ``all`` -- an integer
+ 
+     If ``all`` is non-zero then all terms are included in the result.
+     If ``all`` is zero, then only pairs of partitions ``(part1,
+@@ -609,12 +402,9 @@ def coprod(part, all=0):
+         sage: sorted(coprod([2,1]).items())
+         [(([1, 1], [1]), 1), (([2], [1]), 1), (([2, 1], []), 1)]
+     """
+-    cdef vector* v1 = iterable_to_vector(part)
+-    cdef hashtab* ht = coprod_c(v1, int(all))
+-    result = vp_hashtab_to_dict(ht)
+-    v_free(v1)
+-    hash_free(ht)
+-    return result
++    result = lrcalc.coprod(part, all)
++    return {tuple([_Partitions(mu) for mu in la]): Integer(k)
++            for la, k in result.items()}
+ 
+ 
+ def mult_schubert(w1, w2, rank=0):
+@@ -627,11 +417,9 @@ def mult_schubert(w1, w2, rank=0):
+ 
+     INPUT:
+ 
+-    - ``w1`` -- a permutation.
+-
+-    - ``w2`` -- a permutation.
+-
+-    - ``rank`` -- an integer.
++    - ``w1`` -- a permutation
++    - ``w2`` -- a permutation
++    - ``rank`` -- an integer
+ 
+     If ``rank`` is non-zero, then only permutations from the symmetric
+     group `S(\mathrm{rank})` are included in the result.
+@@ -646,33 +434,24 @@ def mult_schubert(w1, w2, rank=0):
+          ([6, 4, 3, 1, 2, 5], 1), ([6, 5, 2, 1, 3, 4], 1),
+          ([7, 3, 4, 1, 2, 5, 6], 1), ([7, 4, 2, 1, 3, 5, 6], 1)]
+     """
+-    cdef vector* v1 = iterable_to_vector(w1)
+-    cdef vector* v2 = iterable_to_vector(w2)
+-    cdef hashtab* ht = mult_schubert_c(v1, v2, int(rank))
+-    result = schubert_hashtab_to_dict(ht)
+-    v_free(v1)
+-    v_free(v2)
+-    hash_free(ht)
+-    return result
++    result = lrcalc.schubmult(w1, w2, rank)
++    return {Permutation(list(la)):Integer(k) for la,k in result.items()}
+ 
+ 
+-def lrskew(outer, inner, weight=None, maxrows=0):
++def lrskew(outer, inner, weight=None, maxrows=-1):
+     r"""
+     Iterate over the skew LR tableaux of shape ``outer / inner``.
+ 
+     INPUT:
+ 
+     - ``outer`` -- a partition
+-
+     - ``inner`` -- a partition
+-
+     - ``weight`` -- a partition (optional)
+-
+-    - ``maxrows`` -- an integer (optional)
++    - ``maxrows`` -- a positive integer (optional)
+ 
+     OUTPUT: an iterator of :class:`SkewTableau`
+ 
+-    Specifying ``maxrows`` restricts the alphabet to `\{1,2,\ldots,maxrows\}`.
++    Specifying ``maxrows`` = `M` restricts the alphabet to `\{1,2,\ldots,M\}`.
+ 
+     Specifying ``weight`` returns only those tableaux of given content/weight.
+ 
+@@ -702,22 +481,40 @@ def lrskew(outer, inner, weight=None, maxrows=0):
+ 
+         sage: list(lrskew([3,2,1],[2], weight=[3,1]))
+         [[[None, None, 1], [1, 1], [2]]]
++
++    TESTS::
++
++        sage: from sage.libs.lrcalc.lrcalc import lrskew
++        sage: list(lrskew([3,2,1],[2], weight=[]))
++        []
++        sage: list(lrskew([3,2,1],[2], weight=[0]))
++        []
++        sage: list(lrskew([3,2,1],[3,2,1], weight=[]))
++        [[[None, None, None], [None, None], [None]]]
++        sage: list(lrskew([3,2,1],[3,2,1], weight=[0]))
++        [[[None, None, None], [None, None], [None]]]
++        sage: list(lrskew([3,2,1],[3,2,1], weight=[1]))
++        []
+     """
+-    cdef vector* o = iterable_to_vector(outer)
+-    cdef vector* i = iterable_to_vector(inner + [0]*(len(outer) - len(inner)))
+-    cdef skewtab* st = st_new(o, i, NULL, int(maxrows))
++    iterator = lrcalc.lr_iterator(outer, inner, maxrows)
++    shape = SkewPartition([outer, inner])
+ 
+     if weight is None:
+-        yield skewtab_to_SkewTableau(st)
+-        while st_next(st):
+-            yield skewtab_to_SkewTableau(st)
++        ST = SemistandardSkewTableaux(shape)
++        for data in iterator:
++            yield ST.from_shape_and_word(shape, [i+1 for i in data])
+     else:
+         wt = _Partitions(weight)
+-        r = skewtab_to_SkewTableau(st)
+-        if r.weight() == wt:
+-            yield r
+-        while st_next(st):
+-            r = skewtab_to_SkewTableau(st)
+-            if r.weight() == wt:
+-                yield r
+-    st_free(st)
++        ST = SemistandardSkewTableaux(shape, wt)
++        m = len(wt)
++        for data in iterator:
++            w = [0] * m
++            for j in data:
++                if j >= m:
++                    # We know they are not equal, so make the check below quick
++                    w = None
++                    break
++                w[j] += 1
++            if w == wt:
++                yield ST.from_shape_and_word(shape, [i+1 for i in data])
++
diff --git a/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch b/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch
new file mode 100644
index 000000000000..1e2e0ba90742
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33170-fix_doctest_ipython_8.patch
@@ -0,0 +1,40 @@
+As produced by `git diff a90a3146{^^,}`
+
+diff --git a/src/sage/repl/interface_magic.py b/src/sage/repl/interface_magic.py
+index 8a455b69b0e..a93e1c9e04c 100644
+--- a/src/sage/repl/interface_magic.py
++++ b/src/sage/repl/interface_magic.py
+@@ -260,7 +260,7 @@ class InterfaceMagic(object):
+             2
+             120
+             sage: shell.run_cell('%%gap foo\n1+1;\n')
+-            ...File "<string>", line unknown
++            ...File...<string>...
+             SyntaxError: Interface magics have no options, got "foo"
+             <BLANKLINE>
+             sage: shell.run_cell('%%gap?')
+diff --git a/src/sage/repl/interpreter.py b/src/sage/repl/interpreter.py
+index 7468afe52d7..06c47b7374a 100644
+--- a/src/sage/repl/interpreter.py
++++ b/src/sage/repl/interpreter.py
+@@ -78,9 +78,9 @@ Check that Cython source code appears in tracebacks::
+     dummy line
+     ...
+     ZeroDivisionError...Traceback (most recent call last)
+-    <ipython-input-...> in <module>...
++    ...in <module>...
+     ----> 1 Integer(1)/Integer(0)
+-    .../sage/rings/integer.pyx in sage.rings.integer.Integer...div...
++    .../sage/rings/integer.pyx... in sage.rings.integer.Integer...div...
+     ...
+     -> ...                  raise ZeroDivisionError("rational division by zero")
+        ....:            x = <Rational> Rational.__new__(Rational)
+@@ -423,7 +423,7 @@ def SagePreparseTransformer(lines):
+         sage: from sage.repl.interpreter import get_test_shell
+         sage: shell = get_test_shell()
+         sage: shell.run_cell(bad_syntax)
+-          File "<string>", line unknown
++          File...<string>...
+         SyntaxError: Mismatched ']'
+         <BLANKLINE>
+         sage: shell.quit()
diff --git a/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch b/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch
new file mode 100644
index 000000000000..853813b0f5bd
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33170b-fix_doctest_ipython_8.1.patch
@@ -0,0 +1,13 @@
+Fix for ipython 8.1
+
+--- a/src/sage/repl/interpreter.py
++++ b/src/sage/repl/interpreter.py
+@@ -78,7 +78,7 @@ Check that Cython source code appears in tracebacks::
+     dummy line
+     ...
+     ZeroDivisionError...Traceback (most recent call last)
+-    ...in <module>...
++    ...
+     ----> 1 Integer(1)/Integer(0)
+     .../sage/rings/integer.pyx... in sage.rings.integer.Integer...div...
+     ...
diff --git a/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch b/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch
new file mode 100644
index 000000000000..19b69700a4f6
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33336-fix_doctest_scipy_1.8.patch
@@ -0,0 +1,19 @@
+commit 9c8235e44ffb509efa8a3ca6cdb55154e2b5066d
+Author: Antonio Rojas <arojas@archlinux.org>
+Date:   Sun Feb 13 19:53:14 2022 +0100
+
+    Fix deprecation warning with scipy 1.8
+
+diff --git a/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py b/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py
+index e9b60dae5ec..7932167b41d 100644
+--- a/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py
++++ b/src/sage/tests/books/computational-mathematics-with-sagemath/linsolve_doctest.py
+@@ -356,7 +356,7 @@ Sage example in ./linsolve.tex, line 2230::
+ 
+ Sage example in ./linsolve.tex, line 2609::
+ 
+-  sage: from scipy.sparse.linalg.dsolve import *
++  sage: from scipy.sparse.linalg import factorized
+   sage: from scipy.sparse import lil_matrix
+   sage: from numpy import array
+   sage: n = 200
diff --git a/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch
new file mode 100644
index 000000000000..9ba7ca5a6b7d
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-609dd9deaeaa6380ab2f0d50276d911233c00a04.patch
@@ -0,0 +1,99 @@
+From 609dd9deaeaa6380ab2f0d50276d911233c00a04 Mon Sep 17 00:00:00 2001
+From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
+Date: Fri, 4 Mar 2022 16:07:09 -0800
+Subject: sage.manifolds: Update doctests for SymPy 1.10
+
+---
+ src/sage/manifolds/continuous_map.py              | 3 +--
+ src/sage/manifolds/differentiable/diff_form.py    | 4 ++--
+ src/sage/manifolds/differentiable/tensorfield.py  | 8 ++++----
+ src/sage/manifolds/vector_bundle_fiber_element.py | 2 +-
+ 4 files changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/src/sage/manifolds/continuous_map.py b/src/sage/manifolds/continuous_map.py
+index a6356e7..f6f9b6d 100644
+--- a/src/sage/manifolds/continuous_map.py
++++ b/src/sage/manifolds/continuous_map.py
+@@ -1357,8 +1357,7 @@ class ContinuousMap(Morphism):
+             sage: Phi.coord_functions(c_uv, c_xyz)
+             Coordinate functions (u*v, u/v, u + v) on the Chart (M, (u, v))
+             sage: Phi.coord_functions(c_UV, c_xyz)
+-            Coordinate functions (-U**2/4 + V**2/4, -(U + V)/(U - V), V)
+-             on the Chart (M, (U, V))
++            Coordinate functions (-U**2/4 + V**2/4, (-U - V)/(U - V), V) on the Chart (M, (U, V))
+             sage: Phi.coord_functions(c_UV, c_XYZ)
+             Coordinate functions ((-U**3 + U**2*V + U*V**2 + 2*U*V + 6*U - V**3
+              - 2*V**2 + 6*V)/(2*(U - V)), (U**3/4 - U**2*V/4 - U*V**2/4 + U*V
+diff --git a/src/sage/manifolds/differentiable/diff_form.py b/src/sage/manifolds/differentiable/diff_form.py
+index 70dd8fb..0aa3469 100644
+--- a/src/sage/manifolds/differentiable/diff_form.py
++++ b/src/sage/manifolds/differentiable/diff_form.py
+@@ -266,7 +266,7 @@ class DiffForm(TensorField):
+ 
+         sage: s = a.wedge(b)
+         sage: s.display(eU)
+-        a∧b = -x*(2*x*y + 1) dx∧dy
++        a∧b = x*(-2*x*y - 1) dx∧dy
+         sage: s.display(eV)
+         a∧b = (u**3/8 + u**2*v/8 - u*v**2/8 + u/4 - v**3/8 + v/4) du∧dv
+ 
+@@ -275,7 +275,7 @@ class DiffForm(TensorField):
+         sage: f = M.scalar_field({c_xy: (x+y)^2, c_uv: u^2}, name='f')
+         sage: s = f*a
+         sage: s.display(eU)
+-        f*a = -y*(x**2 + 2*x*y + y**2) dx + x*(x**2 + 2*x*y + y**2) dy
++        f*a = y*(-x**2 - 2*x*y - y**2) dx + x*(x**2 + 2*x*y + y**2) dy
+         sage: s.display(eV)
+         f*a = u**2*v/2 du - u**3/2 dv
+ 
+diff --git a/src/sage/manifolds/differentiable/tensorfield.py b/src/sage/manifolds/differentiable/tensorfield.py
+index 2775be9..6bc5c50 100644
+--- a/src/sage/manifolds/differentiable/tensorfield.py
++++ b/src/sage/manifolds/differentiable/tensorfield.py
+@@ -334,7 +334,7 @@ class TensorField(ModuleElementWithMutability):
+         sage: f.display()  # long time
+         t(a,b): S^2 → ℝ
+         on U: (x, y) ↦ -2*x*y - 3*x - y**2
+-        on V: (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++        on V: (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+ 
+     The vectors can be defined only on subsets of `S^2`, the domain of the
+     result is then the common subset::
+@@ -343,12 +343,12 @@ class TensorField(ModuleElementWithMutability):
+         sage: s.display()  # long time
+         t(a,b): U → ℝ
+            (x, y) ↦ -2*x*y - 3*x - y**2
+-        on W: (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++        on W: (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+         sage: s = t(a.restrict(U), b.restrict(W))  # long time
+         sage: s.display()  # long time
+         t(a,b): W → ℝ
+            (x, y) ↦ -2*x*y - 3*x - y**2
+-           (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++           (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+ 
+     The tensor itself can be defined only on some open subset of `S^2`,
+     yielding a result whose domain is this subset::
+@@ -356,7 +356,7 @@ class TensorField(ModuleElementWithMutability):
+         sage: s = t.restrict(V)(a,b)  # long time
+         sage: s.display()  # long time
+         t(a,b): V → ℝ
+-           (u, v) ↦ -(3*u**3 + 3*u*v**2 + 2*u*v + v**2)/(u**4 + 2*u**2*v**2 + v**4)
++           (u, v) ↦ (-3*u**3 - 3*u*v**2 - 2*u*v - v**2)/(u**4 + 2*u**2*v**2 + v**4)
+         on W: (x, y) ↦ -2*x*y - 3*x - y**2
+ 
+     Tests regarding the multiplication by a scalar field::
+diff --git a/src/sage/manifolds/vector_bundle_fiber_element.py b/src/sage/manifolds/vector_bundle_fiber_element.py
+index 29ee81d..048275a 100644
+--- a/src/sage/manifolds/vector_bundle_fiber_element.py
++++ b/src/sage/manifolds/vector_bundle_fiber_element.py
+@@ -110,4 +110,4 @@ class VectorBundleFiberElement(FiniteRankFreeModuleElement):
+             desc += str(self._name) + " "
+         desc += "in the fiber of {} at {}".format(self._vbundle._name,
+                                                   self._point)
+-        return desc
+\ No newline at end of file
++        return desc
+-- 
+cgit v1.0-1-gd88e
+
diff --git a/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch
new file mode 100644
index 000000000000..f5ac180baa90
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33398-fix_doctest_sympy_1.10-c49eff347454ac7f07e5918470b20e97b8f2357e.patch
@@ -0,0 +1,29 @@
+From c49eff347454ac7f07e5918470b20e97b8f2357e Mon Sep 17 00:00:00 2001
+From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
+Date: Fri, 4 Mar 2022 15:14:43 -0800
+Subject: src/sage/calculus/calculus.py: Update laplace doctest for sympy 1.10
+
+---
+ src/sage/calculus/calculus.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py
+index 9c2f226..b335093 100644
+--- a/src/sage/calculus/calculus.py
++++ b/src/sage/calculus/calculus.py
+@@ -1639,9 +1639,9 @@ def laplace(ex, t, s, algorithm='maxima'):
+         sage: laplace(dirac_delta(t), t, s)
+         1
+         sage: F, a, cond = laplace(dirac_delta(t), t, s, algorithm='sympy')
+-        sage: a, cond
+-        (-oo, True)
+-        sage: F       # random - sympy <1.9 includes undefined heaviside(0) in answer
++        sage: a, cond  # random - sympy <1.10 gives (-oo, True)
++        (0, True)
++        sage: F        # random - sympy <1.9 includes undefined heaviside(0) in answer
+         1
+         sage: laplace(dirac_delta(t), t, s, algorithm='giac')
+         1
+-- 
+cgit v1.0-1-gd88e
+
diff --git a/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch b/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch
new file mode 100644
index 000000000000..8e7bb64f5b01
--- /dev/null
+++ b/srcpkgs/sagemath/patches/trac-33585-fix_doctest_sphinx_installed-a04a0a0b14f67f4804e7113c3db41bbcf8a58296.patch
@@ -0,0 +1,26 @@
+From a04a0a0b14f67f4804e7113c3db41bbcf8a58296 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
+Date: Mon, 28 Mar 2022 20:39:59 -0300
+Subject: Trac #33585: fix doctest when dochtml is missing...
+
+...but sphinx is available in PYTHONPATH.
+---
+ src/sage/misc/sagedoc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py
+index 4b3853f..08c4225 100644
+--- a/src/sage/misc/sagedoc.py
++++ b/src/sage/misc/sagedoc.py
+@@ -1401,7 +1401,7 @@ class _sage_doc:
+             "...**File:**...**Type:**...**Definition:** identity_matrix..."
+             sage: identity_matrix.__doc__ in browse_sage_doc(identity_matrix, 'rst')
+             True
+-            sage: browse_sage_doc(identity_matrix, 'html', False)             # optional - sphinx
++            sage: browse_sage_doc(identity_matrix, 'html', False)             # optional - sphinx sagemath_doc_html
+             '...div...File:...Type:...Definition:...identity_matrix...'
+ 
+         In the 'text' version, double colons have been replaced with
+-- 
+cgit v1.0-1-gd88e
+
diff --git a/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch b/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch
deleted file mode 100644
index 5cb62f56e902..000000000000
--- a/srcpkgs/sagemath/patches/zzz-skip_doctest_no_threejs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
- - we don't have threejs in void
-
---- a/src/sage/repl/ipython_kernel/install.py
-+++ b/src/sage/repl/ipython_kernel/install.py
-@@ -124,7 +124,7 @@ class SageKernelSpec(object):
-             sage: spec = SageKernelSpec(prefix=tmp_dir())
-             sage: spec.use_local_threejs()
-             sage: threejs = os.path.join(spec.nbextensions_dir, 'threejs-sage')
--            sage: os.path.isdir(threejs)
-+            sage: os.path.isdir(threejs)    # optional - threejs
-             True
-         """
-         src = THREEJS_DIR
diff --git a/srcpkgs/sagemath/template b/srcpkgs/sagemath/template
index 710a9e80c052..0d793262d572 100644
--- a/srcpkgs/sagemath/template
+++ b/srcpkgs/sagemath/template
@@ -1,7 +1,7 @@
 # Template file for 'sagemath'
 pkgname=sagemath
 version=9.5
-revision=1
+revision=2
 wrksrc=sage-$version
 build_wrksrc=pkgs/sagemath-standard
 build_style=python3-module
@@ -12,7 +12,7 @@ hostmakedepends="m4 pkg-config python3-Cython python3-Jinja2 python3-pkgconfig
 makedepends="arb-devel boost-devel brial-devel cliquer-devel ecl eclib-devel
  ecm-devel fflas-ffpack flintlib-devel gap-devel gd-devel giac-devel glpk-devel
  gsl-devel iml-devel lcalc-devel libbraiding-devel libhomfly-devel libmpc-devel
- libpng-devel linbox-devel lrcalc-devel m4ri-devel m4rie-devel mpfi-devel
+ libpng-devel linbox-devel m4ri-devel m4rie-devel mpfi-devel
  mpfr-devel ntl-devel openblas-devel pari-devel planarity-devel python3-cypari2
  python3-cysignals python3-devel python3-gmpy2 python3-memory_allocator
  python3-numpy rankwidth-devel singular symmetrica-devel zn_poly"
@@ -20,13 +20,13 @@ depends="FlintQS eclib-devel fflas-ffpack flintlib-devel gcc-fortran gd-devel
  gfan giac gsl-devel gzip libpng-devel linbox-devel m4ri-devel maxima-ecl
  mpfr-devel nauty ntl-devel palp pari-devel pari-elldata-small pari-galdata
  pari-galpol-small pari-seadata-small pkg-config python3-Cython python3-cypari2
- python3-cysignals python3-devel python3-fpylll python3-ipython
+ python3-cysignals python3-devel python3-fpylll python3-ipython python3-lrcalc
  python3-ipython_ipykernel python3-jupyter_ipywidgets python3-matplotlib
  python3-memory_allocator python3-networkx python3-pip python3-pkgconfig
  python3-pplpy python3-primecountpy python3-requests python3-scipy
  python3-sympy python3-traitlets sage-data-combinatorial_designs
  sage-data-conway_polynomials sage-data-elliptic_curves sage-data-graphs
- sage-data-polytopes_db sympow tachyon"
+ sage-data-polytopes_db sympow tachyon threejs-sage"
 checkdepends="$depends"
 short_desc="Open source mathematics software"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -55,6 +55,7 @@ do_configure() {
 	COMBINATORIAL_DESIGN_DATA_DIR = "/usr/share/sagemath/combinatorial_designs"
 	CREMONA_MINI_DATA_DIR = "/usr/share/sagemath/cremona"
 	CREMONA_LARGE_DATA_DIR = "/usr/share/sagemath/cremona"
+	THREEJS_DIR = "/usr/share/sagemath/threejs-sage"
 	EOF
 
 	# don't install sage-venv-config: it is used to set SAGE_VENV=/usr and

From dee544fe197d170cb30e53f69210f0d5d4c17840 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:37 +0200
Subject: [PATCH 0935/1686] wike: update to 1.7.2.

---
 srcpkgs/wike/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wike/template b/srcpkgs/wike/template
index 32aa723af076..98faaf360b00 100644
--- a/srcpkgs/wike/template
+++ b/srcpkgs/wike/template
@@ -1,6 +1,6 @@
 # Template file for 'wike'
 pkgname=wike
-version=1.7.1
+version=1.7.2
 revision=1
 wrksrc="Wike-$version"
 build_style=meson
@@ -11,4 +11,4 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/hugolabe/Wike"
 distfiles="https://github.com/hugolabe/Wike/archive/refs/tags/$version.tar.gz"
-checksum=b3fa3c0600e7234f77465fd7052136de3b397e66ad5c636f8282556aa60a2742
+checksum=8434cec2ca44392fd96fa9ed1594be40c74d91490039405996aa4c6fa64bd26c

From 4db708380c53cecadf2d53e356c93536cc935958 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:24 +0200
Subject: [PATCH 0936/1686] python3-astroid: update to 2.11.2.

---
 srcpkgs/python3-astroid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-astroid/template b/srcpkgs/python3-astroid/template
index 4cfef4e92fd9..ca5db18ccc79 100644
--- a/srcpkgs/python3-astroid/template
+++ b/srcpkgs/python3-astroid/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-astroid'
 pkgname=python3-astroid
-version=2.9.3
+version=2.11.2
 revision=1
 wrksrc="astroid-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ 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="https://github.com/PyCQA/astroid/archive/refs/tags/v$version.tar.gz"
-checksum=07234423c3722df6aa067c15f5fa60adf4f1d6ae659d2ab147acb40a8a1904f7
+checksum=4a275523e2600c928ac95cda3ed7c1307dff2e6fbe24ef95ed867bda0fcaeab8

From 21477cd30d4d5fe0fcc681658f43ac0060180c51 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:20 +0200
Subject: [PATCH 0937/1686] New package: python3-dill-0.3.4

---
 srcpkgs/python3-dill/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-dill/template

diff --git a/srcpkgs/python3-dill/template b/srcpkgs/python3-dill/template
new file mode 100644
index 000000000000..d40ce208e06d
--- /dev/null
+++ b/srcpkgs/python3-dill/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-dill'
+pkgname=python3-dill
+version=0.3.4
+revision=1
+wrksrc="dill-$version"
+build_style=python3-module
+depends="python3"
+short_desc="Serialize all of Python"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://dill.rtfd.io/"
+distfiles="${PYPI_SITE}/d/dill/dill-${version}.zip"
+checksum=9f9734205146b2b353ab3fec9af0070237b6ddae78452af83d2fca84d739e675

From 9a28595272ac1889cf0bcb103e8bd44f7d9251e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:12:28 +0200
Subject: [PATCH 0938/1686] pylint: update to 2.13.4.

---
 srcpkgs/pylint/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index f052f05f08b7..54af1e2f085d 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,12 +1,12 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.12.2
-revision=2
+version=2.13.4
+revision=1
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
 hostmakedepends="python3-setuptools"
-depends="python3-astroid python3-isort python3-mccabe python3-toml
- python3-platformdirs"
+depends="python3-astroid python3-isort python3-mccabe python3-tomli
+ python3-platformdirs python3-dill"
 checkdepends="$depends python3-pytest python3-tkinter python3-six
  python3-GitPython git"
 short_desc="Python code static checker"
@@ -15,11 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=411308682f3d4578bb769e7fa549c8f34edf1033871d2e8cd5c3ce16a5741c59
-
-post_patch() {
-	vsed -e 's/mccabe>=0.6,<0.7/mccabe>=0.6,<=0.7/' -i setup.cfg
-}
+checksum=34a5550bfe94f4ba04eee95367572224bc16dbd2456b3ece5fb92e15399f6cd8
 
 post_install() {
 	# install example config and emacs files

From 62abc44b6dc87fe237e69061810ff4c811e9cf3e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 4 Apr 2022 22:17:56 +0200
Subject: [PATCH 0939/1686] python3-mypy: update to 0.942.

---
 srcpkgs/python3-mypy/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-mypy/template b/srcpkgs/python3-mypy/template
index 663127eedbc0..a92e1c803e48 100644
--- a/srcpkgs/python3-mypy/template
+++ b/srcpkgs/python3-mypy/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-mypy'
 pkgname=python3-mypy
-version=0.931
+version=0.942
 revision=1
 wrksrc="mypy-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://github.com/python/mypy"
 distfiles="${PYPI_SITE}/m/mypy/mypy-${version}.tar.gz"
-checksum=0038b21890867793581e4cb0d810829f5fd4441aa75796b53033af3aa30430ce
+checksum=17e44649fec92e9f82102b48a3bf7b4a5510ad0cd22fa21a104826b5db4903e2
 make_check=no # needs pytest-xdist and many tests fail
 
 post_install() {

From 0ee0f75c445413ab3319fafdd68e0ade95d6b787 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Tue, 22 Mar 2022 12:52:26 +1100
Subject: [PATCH 0940/1686] bluez: update to 5.64.

---
 srcpkgs/bluez/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template
index e0a96039b6fb..e9827e8e1d95 100644
--- a/srcpkgs/bluez/template
+++ b/srcpkgs/bluez/template
@@ -1,6 +1,6 @@
 # Template file for 'bluez'
 pkgname=bluez
-version=5.63
+version=5.64
 revision=1
 build_style=gnu-configure
 configure_args="--with-udevdir=/usr/lib/udev --disable-systemd
@@ -15,7 +15,7 @@ maintainer="Érico Nogueira <ericonr@disroot.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=9349e11e8160bb3d720835d271250d8a7424d3690f5289e6db6fe07cc66c6d76
+checksum=ae437e65b6b3070c198bc5b0109fe9cdeb9eaa387380e2072f9de65fe8a1de34
 conf_files="/etc/bluetooth/main.conf"
 system_groups="bluetooth"
 

From 613632034d27e006429f91304164aa03f95d36e7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 11:50:25 +0200
Subject: [PATCH 0941/1686] New package: d-spy-1.2.0

---
 srcpkgs/d-spy/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/d-spy/template

diff --git a/srcpkgs/d-spy/template b/srcpkgs/d-spy/template
new file mode 100644
index 000000000000..3d78d4d011c1
--- /dev/null
+++ b/srcpkgs/d-spy/template
@@ -0,0 +1,14 @@
+# Template file for 'd-spy'
+pkgname=d-spy
+version=1.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config gettext glib-devel"
+makedepends="libadwaita-devel"
+short_desc="Like d-feet, but written in C and blisteringly fast"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/d-spy"
+changelog="https://gitlab.gnome.org/GNOME/d-spy/-/raw/main/NEWS"
+distfiles="https://gitlab.gnome.org/GNOME/d-spy/-/archive/$version/d-spy-$version.tar.gz"
+checksum=8be0a493e4a127f2c6052dd962162ba5f91c6da702f9b4cb77a9cbd6a1dbb4bc

From 97937530007de2b173404cd942b7c71a17100d96 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Mon, 4 Apr 2022 23:12:16 +0200
Subject: [PATCH 0942/1686] kodi: update to 19.4

---
 .../kodi/patches/add-missing-includes.patch   |  4 +-
 .../disable-static-texturepacker-build.patch  |  2 +-
 srcpkgs/kodi/patches/fix-fileemu.patch        | 16 ++++----
 srcpkgs/kodi/patches/fix-musl.patch           |  2 +-
 srcpkgs/kodi/patches/fmt8-support.patch       |  7 ----
 srcpkgs/kodi/patches/ppc64.patch              |  8 ++--
 srcpkgs/kodi/template                         | 38 +++++--------------
 7 files changed, 25 insertions(+), 52 deletions(-)
 delete mode 100644 srcpkgs/kodi/patches/fmt8-support.patch

diff --git a/srcpkgs/kodi/patches/add-missing-includes.patch b/srcpkgs/kodi/patches/add-missing-includes.patch
index 236bfa6fd0e1..1b9a4509744c 100644
--- a/srcpkgs/kodi/patches/add-missing-includes.patch
+++ b/srcpkgs/kodi/patches/add-missing-includes.patch
@@ -1,10 +1,10 @@
 --- a/xbmc/filesystem/ZipManager.h.orig
 +++ b/xbmc/filesystem/ZipManager.h
-@@ -33,6 +33,7 @@
+@@ -22,6 +22,7 @@
  #include <string>
  #include <vector>
  #include <map>
-+#include <stdint.h>
++#include <cstdint>
  
  class CURL;
  
diff --git a/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch b/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
index 369f1b24d76d..766cae2005c8 100644
--- a/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
+++ b/srcpkgs/kodi/patches/disable-static-texturepacker-build.patch
@@ -1,6 +1,6 @@
 --- a/tools/depends/native/TexturePacker/Makefile	2016-04-24 08:48:30.000000000 +0200
 +++ b/tools/depends/native/TexturePacker/Makefile	2016-07-16 15:12:39.875911293 +0200
-@@ -36,7 +36,7 @@
+@@ -38,7 +38,7 @@
  	-rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
  	cd $(PLATFORM); cp -a $(SOURCE)/* .
  	cd $(PLATFORM); ./autogen.sh
diff --git a/srcpkgs/kodi/patches/fix-fileemu.patch b/srcpkgs/kodi/patches/fix-fileemu.patch
index 6cce7a4d3524..a16fcb9ffa29 100644
--- a/srcpkgs/kodi/patches/fix-fileemu.patch
+++ b/srcpkgs/kodi/patches/fix-fileemu.patch
@@ -1,6 +1,6 @@
 --- a/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:09.336910851 +0100
 +++ b/xbmc/cores/DllLoader/exports/emu_msvcrt.h	2019-01-30 19:20:25.423668836 +0100
-@@ -12,7 +12,7 @@
+@@ -17,7 +17,7 @@
  #define _onexit_t void*
  #endif
  
@@ -11,8 +11,8 @@
  typedef off64_t __off64_t;
 --- a/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:24:16.396348561 +0100
 +++ b/xbmc/cores/DllLoader/exports/wrapper.c	2019-01-30 19:25:38.562176774 +0100
-@@ -27,7 +27,7 @@
- #endif
+@@ -23,7 +23,7 @@
+ #include <dirent.h>
  #include <dlfcn.h>
  
 -#if defined(TARGET_DARWIN) || defined(TARGET_FREEBSD) || defined(TARGET_ANDROID)
@@ -29,8 +29,8 @@
 +#include <paths.h>
  #ifdef TARGET_POSIX
  #include "PlatformDefs.h" // for __stat64
- #include "XFileUtils.h"
-@@ -1480,7 +1481,7 @@
+ #endif
+@@ -1479,7 +1480,7 @@ extern "C"
      int ret;
  
      ret = dll_fgetpos64(stream, &tmpPos);
@@ -39,7 +39,7 @@
      *pos = (fpos_t)tmpPos;
  #else
      pos->__pos = (off_t)tmpPos.__pos;
-@@ -1493,8 +1494,9 @@
+@@ -1492,8 +1493,9 @@ extern "C"
      CFile* pFile = g_emuFileWrapper.GetFileXbmcByStream(stream);
      if (pFile != NULL)
      {
@@ -51,7 +51,7 @@
  #else
        pos->__pos = pFile->GetPosition();
  #endif
-@@ -1509,8 +1511,9 @@
+@@ -1508,8 +1510,9 @@ extern "C"
      int fd = g_emuFileWrapper.GetDescriptorByStream(stream);
      if (fd >= 0)
      {
@@ -63,7 +63,7 @@
  #else
        if (dll_lseeki64(fd, (__off64_t)pos->__pos, SEEK_SET) >= 0)
  #endif
-@@ -1532,7 +1535,7 @@
+@@ -1531,7 +1534,7 @@ extern "C"
      if (fd >= 0)
      {
        fpos64_t tmpPos;
diff --git a/srcpkgs/kodi/patches/fix-musl.patch b/srcpkgs/kodi/patches/fix-musl.patch
index c2eb622c98a4..891204118411 100644
--- a/srcpkgs/kodi/patches/fix-musl.patch
+++ b/srcpkgs/kodi/patches/fix-musl.patch
@@ -1,6 +1,6 @@
 --- a/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:15.532823846 +0100
 +++ b/xbmc/cores/DllLoader/ldt_keeper.c	2019-01-30 20:08:34.139580225 +0100
-@@ -49,7 +49,7 @@
+@@ -53,7 +53,7 @@
  #ifdef  __cplusplus
  extern "C" {
  #endif
diff --git a/srcpkgs/kodi/patches/fmt8-support.patch b/srcpkgs/kodi/patches/fmt8-support.patch
deleted file mode 100644
index 0c6fc3eafdb9..000000000000
--- a/srcpkgs/kodi/patches/fmt8-support.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/xbmc/utils/StringUtils.h	2021-02-19 02:17:59.000000000 +0400
-+++ b/xbmc/utils/StringUtils.h	2021-07-29 01:23:03.569130175 +0400
-@@ -39,0 +40,4 @@
-+#if FMT_VERSION >= 80000
-+#include <fmt/xchar.h>
-+#endif
-+
diff --git a/srcpkgs/kodi/patches/ppc64.patch b/srcpkgs/kodi/patches/ppc64.patch
index ab008d445a99..8bd3e7661ca4 100644
--- a/srcpkgs/kodi/patches/ppc64.patch
+++ b/srcpkgs/kodi/patches/ppc64.patch
@@ -1,9 +1,9 @@
 --- a/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:03.146025973 +0100
 +++ b/cmake/scripts/linux/ArchSetup.cmake	2019-01-30 21:03:47.810441038 +0100
-@@ -32,6 +32,12 @@
-   elseif(CPU MATCHES aarch64 OR CPU MATCHES arm64)
-     set(ARCH aarch64)
-     set(NEON True)
+@@ -35,6 +35,12 @@
+   elseif(CPU MATCHES riscv64)
+     set(ARCH riscv64)
+     set(NEON False)
 +  elseif(CPU MATCHES ppc64le)
 +    set(ARCH ppc64le-linux)
 +    set(NEON False)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index a31240ff2766..da81c7e2d0a5 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
-version=19.0
-revision=4
+version=19.4
+revision=1
 _codename="Matrix"
 wrksrc="xbmc-${version}-${_codename}"
 build_style=cmake
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.kodi.tv"
 distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=f7ef8a6f45862ae3b7ebfce4950d74f534be3cb4a0e67ce640963746b3f668f2
+checksum=cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da
 # Add CrossGUID dependency
 distfiles+=" http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz"
 checksum+=" 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10"
@@ -94,6 +94,8 @@ if [ -z "$CROSS_BUILD" ]; then
 else
 	hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel
 	 libwaylandpp-devel"
+	configure_args+=" -DWITH_JSONSCHEMABUILDER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/JsonSchemaBuilder
+	 -DWITH_TEXTUREPACKER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/TexturePacker"
 fi
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -111,35 +113,13 @@ pre_configure() {
 
 	. /etc/profile.d/10_openjdk11.sh
 
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			cat > cmake/modules/Find$i.cmake <<EOF
-				add_executable($i::$i IMPORTED GLOBAL)
-				set_target_properties($i::$i PROPERTIES
-				IMPORTED_LOCATION "\${CORE_SOURCE_DIR}/tools/depends/native/$i/bin/$i")
-				set_target_properties($i::$i PROPERTIES FOLDER Tools)
-EOF
-		done
-	fi
-}
-
-pre_build() {
+	# Build tools needed to run on the host
 	if [ "$CROSS_BUILD" ]; then
 		for i in JsonSchemaBuilder TexturePacker; do
 			CC= LD= CXX= LDFLAGS= CFLAGS= CXXFLAGS= \
-				make -C tools/depends/native/$i
-		done
-	fi
-}
-
-post_build() {
-	# Rebuild for target
-	if [ "$CROSS_BUILD" ]; then
-		for i in JsonSchemaBuilder TexturePacker; do
-			make -C tools/depends/native/$i clean all \
-				CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \
-				CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" \
-				CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+				make -C tools/depends/native/$i native/$i
+			mv tools/depends/native/$i/native/$i tools/$i
+			make -C tools/depends/native/$i distclean
 		done
 	fi
 }

From eaf6168d7efa8573990a870279afd034ba7e025e Mon Sep 17 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, 5 Apr 2022 07:50:05 +0700
Subject: [PATCH 0943/1686] python3-dill: fix build

---
 srcpkgs/python3-dill/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-dill/template b/srcpkgs/python3-dill/template
index d40ce208e06d..e27236c340df 100644
--- a/srcpkgs/python3-dill/template
+++ b/srcpkgs/python3-dill/template
@@ -4,6 +4,7 @@ version=0.3.4
 revision=1
 wrksrc="dill-$version"
 build_style=python3-module
+hostmakedepends="python3-setuptools"
 depends="python3"
 short_desc="Serialize all of Python"
 maintainer="Michal Vasilek <michal@vasilek.cz>"

From 5abe3fd031a4f86d6193e6159d03c21e1b8dc7ac Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 04:35:38 +0200
Subject: [PATCH 0944/1686] keepalived: update to 2.2.7.

---
 srcpkgs/keepalived/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index c8dea3862abf..1d2ef18ca470 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,6 +1,6 @@
 # Template file for 'keepalived'
 pkgname=keepalived
-version=2.2.4
+version=2.2.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-sha1"
@@ -10,8 +10,9 @@ short_desc="Failover and monitoring daemon for LVS clusters"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://www.keepalived.org/"
+changelog="https://www.keepalived.org/release-notes/Release-${version}.html"
 distfiles="https://www.keepalived.org/software/keepalived-${version}.tar.gz"
-checksum=0138d69087d44beaaa589527f0cfa6885958b320a837147d02b6b7df73ebc1df
+checksum=c61940d874154a560a54627ecf7ef47adebdf832164368d10bf242a4d9b7d49d
 
 conf_files="/etc/keepalived/keepalived.conf"
 
@@ -20,4 +21,5 @@ post_install() {
 	rm -rf ${DESTDIR}/etc/rc.d ${DESTDIR}/etc/sysconfig
 	vmkdir usr/share/examples/$pkgname
 	mv ${DESTDIR}/etc/$pkgname/samples/* ${DESTDIR}/usr/share/examples/$pkgname
+	mv ${DESTDIR}/etc/keepalived/keepalived.conf{.sample,}
 }

From aa1e7229f3e56918eb3675ecfe3d7e471b3e7543 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 04:40:25 +0200
Subject: [PATCH 0945/1686] mc: update to 4.8.28.

---
 srcpkgs/mc/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template
index 646125d12851..1c293a9c6a26 100644
--- a/srcpkgs/mc/template
+++ b/srcpkgs/mc/template
@@ -1,6 +1,6 @@
 # Template file for 'mc'
 pkgname=mc
-version=4.8.27
+version=4.8.28
 revision=1
 build_style=gnu-configure
 configure_args="--with-screen=slang --without-x"
@@ -10,9 +10,10 @@ short_desc="User-friendly file manager and visual shell"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://midnight-commander.org/"
+changelog="https://midnight-commander.org/wiki/NEWS-${version}"
 distfiles="https://www.midnight-commander.org/downloads/mc-${version}.tar.xz"
 #distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz"
-checksum=31be59225ffa9920816e9a8b3be0ab225a16d19e4faf46890f25bdffa02a4ff4
+checksum=e994d9be9a7172e9ac4a4ad62107921f6aa312e668b056dfe5b8bcebbaf53803
 python_version=2
 
 conf_files="

From e45af29f0420d489b95704558b68d7ce9c66e95a Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Mon, 28 Mar 2022 11:02:57 +0200
Subject: [PATCH 0946/1686] mutt: update to 2.2.2, build with zlib

also remove --with-regex (not recognized since 1.13, and was wrong even before)
---
 srcpkgs/mutt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 7ae82f76bd8c..6c0f0d04798b 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,16 +1,16 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.2.1
+version=2.2.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
- --enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
+ --enable-gpgme --with-idn2 --with-ssl --with-sasl --enable-sidebar
  --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --sysconfdir=/etc/$pkgname
  --with-gdbm=${XBPS_CROSS_BASE}/usr"
 conf_files="/etc/${pkgname}/Muttrc"
 hostmakedepends="perl pkg-config"
 makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
- ncurses-devel"
+ ncurses-devel zlib-devel"
 depends="cyrus-sasl-modules mime-types"
 short_desc="Mutt Mail Client"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -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=b76d30d42b6c90aa9abf9f330e41800934eedf7b858a32c120ee3ae63587abb5
+checksum=10de870cf37646c0b3f5bcf579c3cc2fd9285bda1d04be9ad7c33ec2ee820fcc
 
 post_install() {
 	# provided by mime-types

From 51c844a232fa9716f6c82565b9d03b5e623eaa17 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 16:55:26 +0200
Subject: [PATCH 0947/1686] syncthing: update to 1.19.2.

---
 srcpkgs/syncthing/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 6c2d860909cb..6a2673395275 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
 # Template file for 'syncthing'
 pkgname=syncthing
-version=1.19.1
+version=1.19.2
 revision=1
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
@@ -17,7 +17,7 @@ license="MPL-2.0"
 homepage="https://syncthing.net/"
 changelog="https://github.com/syncthing/syncthing/releases"
 distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=46319031c0805374baa382ee2b21290fb9dc595b70e905b97eb9a5643a78edc4
+checksum=81be2d3b22fa7282eee9cc1dc7569975fa62e7149700dcedaf03d372fb012a1e
 
 pre_build() {
 	GOARCH= go generate \

From e1ce278d79c1601d0a3aabfce48f434591f90c03 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:03:40 +0200
Subject: [PATCH 0948/1686] python3-boto3: update to 1.21.33.

---
 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 b96fa86eb165..c57a02f2fc2f 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.21.19
+version=1.21.33
 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=fb04acb6eb998652eb52381a580d3624490982a7b17d6080b0d78163874962b7
+checksum=873369a6b11334756f38ca0f310104e83c793c64a95d3b75581f2792582650d3
 
 post_install() {
 	vlicense LICENSE

From e8d932780ca138bd79853c8f18ada9369ce4238f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:03:43 +0200
Subject: [PATCH 0949/1686] python3-botocore: update to 1.24.33.

---
 srcpkgs/python3-botocore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
index 0271e9204c19..63ae178c40d6 100644
--- a/srcpkgs/python3-botocore/template
+++ b/srcpkgs/python3-botocore/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-botocore'
 pkgname=python3-botocore
-version=1.23.23
+version=1.24.33
 revision=1
 wrksrc="botocore-${version}"
 build_style=python3-module

From 6800b13f6ec17c3ddb41aed3995b40772692a554 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:03:46 +0200
Subject: [PATCH 0950/1686] aws-cli: update to 1.22.88.

---
 srcpkgs/aws-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aws-cli/template b/srcpkgs/aws-cli/template
index 0448d39f5a61..6e543f674359 100644
--- a/srcpkgs/aws-cli/template
+++ b/srcpkgs/aws-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'aws-cli'
 pkgname=aws-cli
-version=1.22.23
+version=1.22.88
 revision=1
 wrksrc="aws-cli-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/aws/aws-cli"
 distfiles="https://github.com/aws/aws-cli/archive/${version}.tar.gz"
-checksum=d5424e05c87963547d6c98440391c6729e4e4f8eb7a4c64520ff7eefeffe41f3
+checksum=cc0961786a5020fbe4708506e8aa39c90a07199f625e9ac62c1f2d8db7e8bd69
 
 do_check() {
 	# integration tests want aws credentials, have some other issues not worth fixing

From b6b127c5c91d0ba4fea10bc5d0d3e0947170069b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 19:05:20 +0200
Subject: [PATCH 0951/1686] python3-botocore: fix hash.

---
 srcpkgs/python3-botocore/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-botocore/template b/srcpkgs/python3-botocore/template
index 63ae178c40d6..f28f9298954a 100644
--- a/srcpkgs/python3-botocore/template
+++ b/srcpkgs/python3-botocore/template
@@ -14,7 +14,7 @@ maintainer="Robert Lowry <bobertlo@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/boto/botocore"
 distfiles="https://github.com/boto/botocore/archive/${version}.tar.gz"
-checksum=6b23a1e91387c1a461f10b17bde9ace15b3c128ed385646ab058644dfedd2c47
+checksum=df97ad5dd13847d2684597798214bc35603c1bd9df7fef04ba5d583cb4229629
 
 pre_check() {
 	rm -r tests/functional/leak # these 6 tests fail, probably fixable

From 33811506f2eb9cb5021ef7123c0199da9f443aa2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 4 Apr 2022 17:42:18 +0200
Subject: [PATCH 0952/1686] emacs: update to 28.1.

Enable cairo and harfbuzz by default, as recommended by upstream.
---
 srcpkgs/emacs/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 9c4405ffc88e..644e44cf4d06 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,6 +1,6 @@
 # Template file for 'emacs'
 pkgname=emacs
-version=27.2
+version=28.1
 revision=1
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
@@ -24,7 +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=b4a7cc4e78e63f378624e0919215b910af5bb2a0afc819fad298272e9f40c1b9
+checksum=28b1b3d099037a088f0a4ca251d7e7262eab5ea1677aabffa6c4426961ad75e1
 nocross=yes
 nopie=yes
 
@@ -33,7 +33,8 @@ build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus
 desc_option_xpm="Enable support for XPM images"
 desc_option_sound="Enable support for sound"
 desc_option_m17n="Enable support for m17n multilingual text processing"
-build_options_default="jpeg tiff gif png xpm svg xml gnutls sound m17n json gmp"
+build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n png sound
+ svg tiff xml xpm"
 
 pre_configure() {
 	# Just configuring in different directories results in

From f9b819b3c5d081b9f6c4da96f769e9831afffb85 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:28:08 +0200
Subject: [PATCH 0953/1686] xorg-cf-files: update to 1.0.7.

---
 srcpkgs/xorg-cf-files/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xorg-cf-files/template b/srcpkgs/xorg-cf-files/template
index b7b8a7c1dac2..4bec7c2ac82e 100644
--- a/srcpkgs/xorg-cf-files/template
+++ b/srcpkgs/xorg-cf-files/template
@@ -1,7 +1,7 @@
 # Template file for 'xorg-cf-files'
 pkgname=xorg-cf-files
-version=1.0.6
-revision=4
+version=1.0.7
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config automake xorg-util-macros font-util"
 short_desc="X.Org imake program and related utilities"
@@ -9,7 +9,7 @@ maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
 license="X11"
 homepage="https://www.x.org/wiki/"
 distfiles="${XORG_SITE}/util/${pkgname}-${version}.tar.bz2"
-checksum=4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d
+checksum=74a771d5bb2189020399998dfa2329c3e038aa2e14dd3d4056144ed9a5976308
 
 pre_configure() {
 	autoreconf -fi

From 797cf1a0a9355e766b37aac49b3b1d304173257e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:29:48 +0200
Subject: [PATCH 0954/1686] msmtp: update to 1.8.20.

---
 srcpkgs/msmtp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template
index 5f6d611259b3..eb687ece82c7 100644
--- a/srcpkgs/msmtp/template
+++ b/srcpkgs/msmtp/template
@@ -1,6 +1,6 @@
 # Template file for 'msmtp'
 pkgname=msmtp
-version=1.8.18
+version=1.8.20
 revision=1
 build_style=gnu-configure
 configure_args="$(vopt_with msmtpd)
@@ -17,7 +17,7 @@ maintainer="Peter Bui <pbui@github.bx612.space>"
 license="GPL-3.0-or-later"
 homepage="https://marlam.de/msmtp/"
 distfiles="https://marlam.de/msmtp/releases/msmtp-${version}.tar.xz"
-checksum=14fc62af37ebdcc5ed19a245a05eb8376efe7016118f00c9c594bc999d5560a5
+checksum=d93ae2aafc0f48af7dc9d0b394df1bb800588b8b4e8d096d8b3cf225344eb111
 
 build_options="idn sasl gnome msmtpd"
 build_options_default="idn sasl msmtpd"

From 4976b04254774dd779fd3f35f02190f041d8db65 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:30:37 +0200
Subject: [PATCH 0955/1686] xauth: update to 1.1.1.

Adopted.
---
 srcpkgs/xauth/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xauth/template b/srcpkgs/xauth/template
index 8569efad4d80..8cf9d80c6069 100644
--- a/srcpkgs/xauth/template
+++ b/srcpkgs/xauth/template
@@ -1,16 +1,16 @@
 # Template file for 'xauth'
 pkgname=xauth
-version=1.1
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xtrans libXau-devel libXext-devel libXmu-devel"
 short_desc="X authentication utility"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=6d1dd1b79dd185107c5b0fdd22d1d791ad749ad6e288d0cdf80964c4ffa7530c
+checksum=164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92
 
 post_install() {
 	vlicense COPYING

From a44267ed0210d2d431b6977c3497ecc71397f5a7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:37:17 +0200
Subject: [PATCH 0956/1686] gnutls: update to 3.7.4.

---
 common/shlibs           | 2 +-
 srcpkgs/gnutls/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e7af88140d1a..836cacc49b89 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -224,7 +224,7 @@ libgpg-error.so.0 libgpg-error-1.6_1
 liblzo2.so.2 lzo-2.03_1
 libgcrypt.so.20 libgcrypt-1.6.1_1
 libgnutls.so.30 gnutls-3.4.13_1
-libgnutlsxx.so.28 gnutls-3.2.13_1
+libgnutlsxx.so.30 gnutls-3.7.4_1
 libgnutls-dane.so.0 gnutls-3.6.12_1
 libdevmapper.so.1.02 device-mapper-2.02.110_1
 libdevmapper-event.so.1.02 device-mapper-2.02.110_1
diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template
index 960a133cf248..9f2d7f905b7b 100644
--- a/srcpkgs/gnutls/template
+++ b/srcpkgs/gnutls/template
@@ -1,6 +1,6 @@
 # Template file for 'gnutls'
 pkgname=gnutls
-version=3.7.3
+version=3.7.4
 revision=1
 build_style=gnu-configure
 configure_args="--disable-guile --disable-static
@@ -21,7 +21,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, LGPL-2.1-or-later"
 homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
-checksum=fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a
+checksum=e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f
 
 pre_check() {
 	# same as $PASS in tests/cert-tests/certtool.sh

From 0e7bea73110d45729d3d1cee620932128b8aa8b1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:40:25 +0200
Subject: [PATCH 0957/1686] appres: update to 1.0.6.

---
 srcpkgs/appres/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/appres/template b/srcpkgs/appres/template
index 0d85dea763af..83e4b39f1bbc 100644
--- a/srcpkgs/appres/template
+++ b/srcpkgs/appres/template
@@ -1,6 +1,6 @@
 # Template build file for 'appres'.
 pkgname=appres
-version=1.0.5
+version=1.0.6
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="List X application resource database"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=ffad893712c81943b919e3cbfe46fc65259cc0d9eb96d5e658670e3fbb265928
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=8b2257e2a0a1ad8330323aec23f07c333075d7fe4e6efd88e0c18fba8223590b
 
 post_install() {
 	vlicense COPYING

From 1b5b7716ee1eb33b0aa0a4dfae7fd39267d8f307 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:41:04 +0200
Subject: [PATCH 0958/1686] editres: update to 1.0.8.

---
 srcpkgs/editres/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/editres/template b/srcpkgs/editres/template
index 4890cbd590ed..502eba67c066 100644
--- a/srcpkgs/editres/template
+++ b/srcpkgs/editres/template
@@ -1,6 +1,6 @@
 # Template build file for 'editres'.
 pkgname=editres
-version=1.0.7
+version=1.0.8
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="Dynamic resource editor for X Toolkit applications"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=089ad34628e55a779b97e369f55fb12caefc96d684b508d9022eb9e12b775c11
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=83cf5dffb1883635fd9c6a8dc48ff9e560f6c6d8ce1a0e929d5f409cba18b6f9
 
 post_install() {
 	vlicense COPYING

From 1ac5dcef9ab6d2f0e18186c3686fee4bdc09a103 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:41:59 +0200
Subject: [PATCH 0959/1686] discount: update to 2.2.7b.

---
 srcpkgs/discount/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/discount/template b/srcpkgs/discount/template
index d47f46518415..a075e4ad5a3f 100644
--- a/srcpkgs/discount/template
+++ b/srcpkgs/discount/template
@@ -1,6 +1,6 @@
 # Template file for 'discount'
 pkgname=discount
-version=2.2.7
+version=2.2.7b
 revision=1
 build_style=configure
 configure_script="./configure.sh"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="http://www.pell.portland.or.us/~orc/Code/discount"
 distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz"
-checksum=72c1325ddfc40871d6810f1e272cf2d45b361f26357eb38f170fd04d737bb9f2
+checksum=48343272aa93ae913187ff678b3e52efa722f133e1efcaddc20cf775e8a517ec
 disable_parallel_build=yes
 
 do_install() {

From c6caea544d0073e86c1589b8cce66dee3bce8f16 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:42:38 +0200
Subject: [PATCH 0960/1686] fzf: update to 0.30.0.

---
 srcpkgs/fzf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fzf/template b/srcpkgs/fzf/template
index 4b881ee7a6a6..ec60af9ddc64 100644
--- a/srcpkgs/fzf/template
+++ b/srcpkgs/fzf/template
@@ -1,6 +1,6 @@
 # Template file for 'fzf'
 pkgname=fzf
-version=0.29.0
+version=0.30.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=a287a8806ce56d764100c5a6551721e16649fd98325f6bf112e96fb09fe3031b
+checksum=a3428f510b7136e39104a002f19b2e563090496cb5205fa2e4c5967d34a20124
 
 post_install() {
 	cd ${wrksrc}

From 9b887b9c1f9012fa7a3d1a8a84eae81e2aef36e6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:44:11 +0200
Subject: [PATCH 0961/1686] libX11: update to 1.7.5.

---
 srcpkgs/libX11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 53bd34be6e08..e47acb6ecf69 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.7.4
+version=1.7.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.xz"
-checksum=0e7d48bfa0b0ee5705d14fe140cf4310744ed131f0a6241b7cf03db06000fe51
+checksum=5a1847e2e2c248e1a203a24a1338a5586d6f48472eac58f6f08539110a965151
 
 do_configure() {
 	./configure ${configure_args}

From 65dceebabcf4014ea8bf04cf75de7f6d5f7b328c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 5 Apr 2022 20:45:44 +0200
Subject: [PATCH 0962/1686] listres: update to 1.0.5.

---
 srcpkgs/listres/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/listres/template b/srcpkgs/listres/template
index e1b1866ddcf3..00d1e32c60fc 100644
--- a/srcpkgs/listres/template
+++ b/srcpkgs/listres/template
@@ -1,6 +1,6 @@
 # Template build file for 'listres'.
 pkgname=listres
-version=1.0.4
+version=1.0.5
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="List resources in Xaw widgets"
 homepage="http://xorg.freedesktop.org"
 license="MIT"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=6a1229f478796e141d6658762f432ebbe1f6083b27550847d52239b3f7ec2b10
+distfiles="${XORG_SITE}/app/$pkgname-$version.tar.xz"
+checksum=ce2a00bbe7d2eb8d75177006f343c80443a22d52570c48a43c6fe70ea074dc9d
 
 post_install() {
 	vlicense COPYING

From c618ec195c9dcb60d9c5124fe97cfd5dff6fe477 Mon Sep 17 00:00:00 2001
From: Florian Wagner <florian@wagner-flo.net>
Date: Mon, 4 Apr 2022 23:07:36 +0200
Subject: [PATCH 0963/1686] claws-mail: update to 4.1.0

---
 srcpkgs/claws-mail/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/claws-mail/template b/srcpkgs/claws-mail/template
index 02a03465adf2..118b7d607108 100644
--- a/srcpkgs/claws-mail/template
+++ b/srcpkgs/claws-mail/template
@@ -1,6 +1,6 @@
 # Template file for 'claws-mail'
 pkgname=claws-mail
-version=3.18.0
+version=4.1.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python-plugin --disable-perl-plugin
@@ -16,8 +16,9 @@ short_desc="GTK+ based, user-friendly, lightweight, and fast email client"
 maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://claws-mail.org"
+changelog="https://claws-mail.org/NEWS"
 distfiles="https://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"
-checksum=cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
+checksum=0e1a9ca0db8d2a9e058ae30cdc7fc919779214ec3c56ee0c8a7f88cc23817a8e
 
 claws-mail-devel_package() {
 	depends="${makedepends}"

From 3dc3eba754eff4caa412f62fe1bfd5b9dfbb07aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Tue, 5 Apr 2022 21:24:30 +0200
Subject: [PATCH 0964/1686] glfw: update to 3.3.7

Also add changelog url and update download URL to github project.
---
 srcpkgs/glfw/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glfw/template b/srcpkgs/glfw/template
index a9168faffc67..968accbe50d2 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.6
+version=3.3.7
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
@@ -11,8 +11,9 @@ short_desc="Multi-platform library for creating windows with OpenGL contexts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=4e08897813668584b252065dc8bcb5a3cbcdd19918ede4dbc847fad7e35db7ec
+changelog="https://www.glfw.org/changelog.html"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=fd21a5f65bcc0fc3c76e0f8865776e852de09ef6fbc3620e09ce96d2b2807e04
 
 glfw-devel_package() {
 	depends="glfw>=${version}_${revision} $makedepends"

From 284e7077af61dc521a1d4f3a02a05303950598a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sigrid=20Solveig=20Hafl=C3=ADnud=C3=B3ttir?=
 <ftrvxmtrx@gmail.com>
Date: Tue, 5 Apr 2022 21:25:52 +0200
Subject: [PATCH 0965/1686] glfw-wayland: update to 3.3.7

Also add changelog url and update download URL to github project.
---
 srcpkgs/glfw-wayland/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/glfw-wayland/template b/srcpkgs/glfw-wayland/template
index 720899cf56f7..f2abe3a8a608 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.6
+version=3.3.7
 revision=1
 wrksrc=glfw-${version}
 build_style=cmake
@@ -12,8 +12,9 @@ short_desc="Multi-platform library for creating windows with OpenGL contexts"
 maintainer="q66 <daniel@octaforge.org>"
 license="Zlib"
 homepage="http://www.glfw.org"
-distfiles="${SOURCEFORGE_SITE}/glfw/glfw-${version}.tar.bz2"
-checksum=4e08897813668584b252065dc8bcb5a3cbcdd19918ede4dbc847fad7e35db7ec
+changelog="https://www.glfw.org/changelog.html"
+distfiles="https://github.com/glfw/glfw/archive/${version}.tar.gz"
+checksum=fd21a5f65bcc0fc3c76e0f8865776e852de09ef6fbc3620e09ce96d2b2807e04
 provides="glfw-${version}_${revision}"
 replaces="glfw>=0"
 

From 8e2626cd8bd6cbd60372624bc32fdb00ad89450a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 10:15:05 -0400
Subject: [PATCH 0966/1686] python3-phonenumbers: update to 8.12.46.

---
 srcpkgs/python3-phonenumbers/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-phonenumbers/template b/srcpkgs/python3-phonenumbers/template
index c4dd9b71d037..0a952e920922 100644
--- a/srcpkgs/python3-phonenumbers/template
+++ b/srcpkgs/python3-phonenumbers/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-phonenumbers'
 pkgname=python3-phonenumbers
-version=8.12.45
+version=8.12.46
 revision=1
 wrksrc="phonenumbers-${version}"
 build_style=python3-module
@@ -12,4 +12,4 @@ license="Apache-2.0"
 homepage="https://github.com/daviddrysdale/python-phonenumbers"
 changelog="https://raw.githubusercontent.com/daviddrysdale/python-phonenumbers/dev/python/HISTORY.md"
 distfiles="${PYPI_SITE}/p/phonenumbers/phonenumbers-${version}.tar.gz"
-checksum=94e30f59b2be6c4310a90f3d5da53d49900bdb440484506f3333c694ebb0cdab
+checksum=1c440f6336cb49893ff1a8326c70b4df693802ae981f210f545cd4215ac48133

From 988c6a8b7fe42e9b2a928b81c5b8b1d36fbf9376 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 10:17:04 -0400
Subject: [PATCH 0967/1686] python3-frozendict: update to 2.3.1.

---
 srcpkgs/python3-frozendict/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-frozendict/template b/srcpkgs/python3-frozendict/template
index a212fa1c7c89..3946c2ee05b1 100644
--- a/srcpkgs/python3-frozendict/template
+++ b/srcpkgs/python3-frozendict/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-frozendict'
 pkgname=python3-frozendict
-version=2.3.0
+version=2.3.1
 revision=1
 wrksrc="frozendict-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-3.0-only"
 homepage="https://github.com/Marco-Sulla/python-frozendict"
 distfiles="${PYPI_SITE}/f/frozendict/frozendict-${version}.tar.gz"
-checksum=da4231adefc5928e7810da2732269d3ad7b5616295b3e693746392a8205ea0b5
+checksum=bc91c69233eb916bb6ebc40988b6d849735770240efc9c60be45b4ab919c1bde
 
 do_check() {
 	PYTHONPATH="$(cd build/lib* && pwd)" pytest3

From 461e245ebd39538d8492cd8e7509678fc790e054 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 10:13:41 -0400
Subject: [PATCH 0968/1686] synapse: update to 1.56.0.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 1c07111f4247..984ad56e0a8a 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.55.2
+version=1.56.0
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -21,7 +21,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=8e06cb264d1631d2518f2f726c89d62c5ed7148b73fbb8190a9c120d3166e7c4
+checksum=7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From 5be411cf625f0786111cfc36dd1f434f045290f4 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 5 Apr 2022 11:25:36 +0200
Subject: [PATCH 0969/1686] slack-desktop: 4.25.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 b90525004d6c..ae1b738b622f 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.24.0
+version=4.25.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://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb"
-checksum=b557d264ae68cafe383d647dfd26f366ee94315f77132f64bff8f9ef44635197
+checksum=e88160a02ca489f0d54afca5bba1aeb17c886b6458eadcad73bffd959c85422c
 restricted=yes
 repository="nonfree"
 nopie=yes

From 4665dab3dc06cfbde98de4889dbde2784183ca66 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 5 Apr 2022 10:22:19 +0200
Subject: [PATCH 0970/1686] google-chrome: update to 100.0.4896.75

---
 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 a630fcdae463..5f9e67c864f2 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=100.0.4896.60
+version=100.0.4896.75
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=05ba6d17d2704ffff1e1d554b40aaddabca9256b7e63ff73e99c469393de8a1f
+checksum=856934272783e5a48fa63e30eb896040f5b46d6f394c1b3aa2e461cbf89b395b
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From 44bffdcc28ce8ec3fc9b31c873381253d12adcd1 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Apr 2022 08:31:56 +0200
Subject: [PATCH 0971/1686] libvirt: update to 8.2.0.

---
 srcpkgs/libvirt/patches/823a62ec.patch | 48 --------------------------
 srcpkgs/libvirt/template               |  6 ++--
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/libvirt/patches/823a62ec.patch

diff --git a/srcpkgs/libvirt/patches/823a62ec.patch b/srcpkgs/libvirt/patches/823a62ec.patch
deleted file mode 100644
index 5fcc644d3e5a..000000000000
--- a/srcpkgs/libvirt/patches/823a62ec.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Tue, 1 Mar 2022 18:47:59 +0100
-Subject: [PATCH] qemu: segmentation fault in virtqemud executing
- qemuDomainUndefineFlags
-
-Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
-
-Stack trace of thread 664419:
- #0  0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
- #1  0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
- #2  0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
-        at src/remote/remote_daemon_dispatch_stubs.h:13080
- #3  remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
-        at src/remote/remote_daemon_dispatch_stubs.h:13059
- #4  0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
-        at ../src/rpc/virnetserverprogram.c:428
- #5  virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
- #6  0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
- #7  virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
- #8  0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
- #9  0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
- #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
- #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index bcd9bdb436..8337eed510 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
-         }
-     }
- 
--    if (vm->def->os.loader->nvram) {
-+    if (vm->def->os.loader && vm->def->os.loader->nvram) {
-         nvram_path = g_strdup(vm->def->os.loader->nvram);
-     } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
-         qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
--- 
-GitLab
-
diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template
index bf08aa899e00..e73c337822e7 100644
--- a/srcpkgs/libvirt/template
+++ b/srcpkgs/libvirt/template
@@ -1,7 +1,7 @@
 # Template file for 'libvirt'
 pkgname=libvirt
-version=8.1.0
-revision=2
+version=8.2.0
+revision=1
 build_style=meson
 configure_args="-Dqemu_user=libvirt -Dqemu_group=libvirt -Drunstatedir=/run
  -Dpolkit=enabled"
@@ -20,7 +20,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=3c6c43becffeb34a3f397c616206aa69a893ff8bf5e8208393c84e8e75352934
+checksum=0ecd9c7dd52db7a2d124155ffa5e11de2fbd05014eceffbd1972b022d21becba
 # At least one test times out on CI but works locally
 make_check=ci-skip
 

From ef31a7f55eb7412fed16590a1462a158f45bb01f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 3 Apr 2022 08:34:02 +0200
Subject: [PATCH 0972/1686] libvirt-python3: update to 8.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 f74de9d9c8f0..2aea5df86fec 100644
--- a/srcpkgs/libvirt-python3/template
+++ b/srcpkgs/libvirt-python3/template
@@ -1,6 +1,6 @@
 # Template file for 'libvirt-python3'
 pkgname=libvirt-python3
-version=8.1.0
+version=8.2.0
 revision=1
 wrksrc="libvirt-python-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ 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=a21ecfab6d29ac1bdd1bfd4aa3ef58447f9f70919aefecd03774613f65914e43
+checksum=f8b8cea67ff0d64d63029cc3410a4656e04ee9f26837a856bc0c287da55d053a
 
 do_check() {
 	PYTHONPATH="$(cd build/lib.* && pwd)" pytest

From 24931ba2329d26bf0e90673c79db3cc2ec507a2b Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 6 Apr 2022 16:57:59 +0200
Subject: [PATCH 0973/1686] gscan2pdf: update to 2.12.6.

---
 srcpkgs/gscan2pdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template
index 295488de54ba..c6486bd905f9 100644
--- a/srcpkgs/gscan2pdf/template
+++ b/srcpkgs/gscan2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'gscan2pdf'.
 pkgname=gscan2pdf
-version=2.12.5
+version=2.12.6
 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=305596f434c9fecbed80dddf6f0fb3786a60837a602280bd8d9d47906e69eac7
+checksum=f67b695043376ee4f71219de5f3f46f1b89bbf33a710ae97b748c9713bcb293d
 nocross=yes
 
 do_check() {

From 58ac31433988f27799c57e5f7e6f29dae1dd10a3 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Wed, 6 Apr 2022 16:58:52 +0200
Subject: [PATCH 0974/1686] wine-mono: update to 7.2.0.

---
 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 06f2e20dd7ea..ec9fa01077c7 100644
--- a/srcpkgs/wine-mono/template
+++ b/srcpkgs/wine-mono/template
@@ -1,6 +1,6 @@
 # Template file for 'wine-mono'
 pkgname=wine-mono
-version=7.1.1
+version=7.2.0
 revision=1
 build_style=fetch
 short_desc="Mono built for running .NET applications with WINE"
@@ -8,7 +8,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 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=9dc8e5603b7bc64354eb94ae4ea0f6821424767a3ff44ff0d19e346a490c11ea
+checksum=5f06eafbae3a49ecc31dfcea777075bd44f0cc126e4fb4e28ecefa06eb436323
 
 do_install() {
 	# The actual installation within WINE occurs at runtime in whatever

From 5b83c62e881f4138c36abfa577e8391757091fb4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 17:15:45 +0200
Subject: [PATCH 0975/1686] firefox: update to 99.0.

---
 ...ktop-icon-path.patch => fix-firefox-desktop.patch} | 11 ++++++++---
 srcpkgs/firefox/template                              |  7 ++++---
 2 files changed, 12 insertions(+), 6 deletions(-)
 rename srcpkgs/firefox/patches/{fix-desktop-icon-path.patch => fix-firefox-desktop.patch} (64%)

diff --git a/srcpkgs/firefox/patches/fix-desktop-icon-path.patch b/srcpkgs/firefox/patches/fix-firefox-desktop.patch
similarity index 64%
rename from srcpkgs/firefox/patches/fix-desktop-icon-path.patch
rename to srcpkgs/firefox/patches/fix-firefox-desktop.patch
index c4664d3da7ce..3f0273cba366 100644
--- a/srcpkgs/firefox/patches/fix-desktop-icon-path.patch
+++ b/srcpkgs/firefox/patches/fix-firefox-desktop.patch
@@ -1,6 +1,6 @@
---- a/taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:31:39.428839442 +0100
-+++ b/taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:32:20.689063456 +0100
-@@ -154,7 +154,7 @@
+--- a/taskcluster/docker/firefox-snap/firefox.desktop
++++ b/taskcluster/docker/firefox-snap/firefox.desktop
+@@ -154,11 +154,12 @@
  Terminal=false
  X-MultipleArgs=false
  Type=Application
@@ -9,3 +9,8 @@
  Categories=GNOME;GTK;Network;WebBrowser;
  MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
  StartupNotify=true
+ Actions=NewWindow;NewPrivateWindow;
++StartupWMClass=Firefox
+ 
+ [Desktop Action NewWindow]
+ Name=Open a New Window
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 6c1596b19e06..8ee3b78f809b 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=98.0
+version=99.0
 revision=1
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
@@ -11,7 +11,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.mozilla.org/firefox/"
 distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd
+checksum=513f8d2cafa39a2d50f2c4a25cc48093e89f715a706b941170fa48e397976327
 
 lib32disabled=yes
 
@@ -32,7 +32,6 @@ build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 
 case $XBPS_TARGET_MACHINE in
 	armv[56]*) broken="required NEON extensions are not supported on armv6" ;;
-	armv7*) broken="currently broken" ;;
 	ppc64*) ;;
 	ppc*) broken="xptcall bitrot" ;;
 esac
@@ -73,6 +72,8 @@ post_patch() {
 do_build() {
 	cp "${FILESDIR}/mozconfig" "${wrksrc}/.mozconfig"
 
+	echo "MOZ_APP_REMOTINGNAME=Firefox" >>.mozconfig
+
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
 		echo "ac_add_options --disable-jemalloc" >>.mozconfig

From 82c081cd53554ae1f3ea836a2e4d8df7aad8d00b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 5 Apr 2022 17:15:53 +0200
Subject: [PATCH 0976/1686] firefox-i18n: update to 99.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 713c5914d0ab..0e98d438bd21 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'firefox-i18n'
 pkgname=firefox-i18n
-version=98.0
+version=99.0
 revision=1
 build_style=meta
 short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
 	}
 }
 
-checksum="dff169f590c9ba54034df42a131d067a30e6ed967fc0e5142705df22d8ea977f
- b73f738bae53b0afbe28d087a889ab7c98e3b325cfd5122cc60eea59a7db8616
- 4f13f00bda1aafc6a2d97041fcb3740a4e8c1c049bba151b3791924d73d3ef06
- 02ab060f05a1a2af373c2a3fe48ef891fa6d1835ddee77ba9678f22bb4782e86
- b02d91316af55caf87abd7650b286f9c181eb7added7d021446ae2976ff69bbd
- dfb07ae1cfc143166fdada9e378cb4f22e4ddda92d0e2c66e6a1d2742c51d0c0
- 4a0409fdc266d1e819a178d558d90b3209c8423cf2794ca0fce3eedea947faa6
- 567e77ed85bacaafbf82fbc90dfabae6e31be8acec5a2db8cfd28197d5bd1815
- b92173bf696785e4f64f74871996c75c9fe96854e3194ebf7ff1dcc9f817b0d8
- bbd223abe4457a1e7425f0cf035c7b6de33e26440d30af8655320ff9c68b124b
- 8e98b9083a77a97886affbbf089e842b0286539fd93df18b031c8d7e8ac92d30
- d4a94e6f5753e5f4d2a777830a0cb23ac94298278328bd3579606ceb47d949eb
- 360dc9fd3a91eac883ca28efd02c218d7365d889146278129ea27424ba452a58
- cd9bc801f9807b0b8f1dcb3ff8bed985cbe291ee95f25963617845d1d7de57b2
- fd5b0f3d1d81c74ebd53b4e2f221cc79dbe9c2a936e73b6a983cb666d6c8f7a6
- e2b37b8fa911c4bca068b0fce10db9fa28490c939c15fb8ffda785d396e6f33b
- 2a0993286c9e5f1350a660636ec2b43c9c7d974ac9d1c2c979df888f81a90141
- 2fc6465bc4dd66c23deacfa7d055a2bf50eb2db9a0a10c20f6f3b5321879e33e
- b88cd11ed43a4f67897434281a4ebd7ef7cb3f4c4d041822fb672d0812d98a2d
- 9d3de3237d2e12e72f9244151ff9c24caccbd7e1a560718f8f41a0bb7e96e2c9
- 1cb6d182af78f237d0d01edba2263b01173377ddc0c9b1e7f5db1cf593765da8
- 52a7d3401c0d333fcf98b33bff2fddc88ae017476e0be74c73359c01d9f7eaee
- 661374e104b98180fba058d4ab6574246d4d9244739decdfcece493338f1ed3f
- ba74a4dba80b8cde6a4105cd6179a72005123d1c92898496a2793479c1921676
- c6259edeb1da7d3ca05ca4b3565408d02e48e3c7f7a254d56b41fdb3639cb56f
- fddfbe98c0d309323981b685b134f000cc9c69518efc365c5c559ffd2c05b602
- bee9c9a60147bcf86f55bccace7fe63316fb79af7cd45b8ffe43abba980db8b9
- 8a4536988167922619e06721229fc91d087d56177ce2ad1a417dd52bc218814f
- 1c11f7b7d2349d8bf0cbd3f6133d1f93b70b6d0176555d538e0bfb7774ea0de9
- 52bc04a4c244de19b4e02a60b79fd760df35a2b825363a1e94c5becd535413ec
- d19315771ccaf194add0459e85a44a8a11dc04f2d9b426201fd4c7000e4defe0
- 3e0df7a54beb78791adfb9f56cc62c5cd01126e964fa90cc1bb65331b2d572f6
- 49b38e6fe6746b2c3e4bcf8a1b7bc828ac8c5784dbe5b1039edde51d2e942dd3
- 97751019d9f01120a0acf4153b3b06c2e476b83d5da8561bac349cdcba5fe095
- bb222cce7ff359eeef5cbaad871aa42214ab5b62872deead6cc57068d0f1fd8b
- fcff68e01cbf4740e7816fb61a15853f9be14034b3fdde1a67b22f80dd43ff33
- bc7c2beadf026cd535635b540c2a8ca7953662b154b9e128378b6ab51ac62953
- b1f207489d09eec55d486b467ceb88bd289b7238ff506a01318d797811121f95
- 08dacf388f2a04796450d37c2a7db5270b3515c38ef0f0426ecc59915ae6b812
- cc7e4230277d9b54f114048f951880aaf4ed88af03a5791e0dc091ecb947e956
- cd6024b8bc6780265146720559fb1f828e36688eeec919044a62d365b440ba97
- 33c1d05921e6041db7d09279da354e2d406798ffd14c67b9cf204e339fc1caee
- 0264439a560fef95488a5aa05783b24e39d16acbed6f1b389a75864ac60f3267
- f174f19aacd50078adceb236e9432feccaf0edc8aae9632191a4c38dab22b206
- 596b84ba309ed661429c8fe5a13baa38e773f40b3b17c997d61834afec92b535
- 6e2e243496089c084844868744ed2a736e621fc14fe95cdf3b5b7507d56b022e
- 91449d6929c9c3068d0c724315e00d412f25c7ca72fddba53ac97c24f4214189
- 138ca2aaf0f0a2decba98db228ac835b1299c841932bf683deb635a8cf226616
- 299bacaffa3b2f8bc359b7bd33a9e4b5588546f7b75ea323ab63b6a25152ace1
- c9eaa1d9e843a07eed355db514c10f8df0e898f9f177dc96eb721643218c6314
- 5231901059f7a9d7b5bd7ff15168c469f2f7813c85c7266b70c20661e2eeb838
- c2d0f151ffd2e9daf33bbffc2d069fd65c258d7c69b29f38785e2e395d8ff6c0
- c2edbea7c2037a57524c4899a888eb0a3007593f0b39e8686a049b5dda10a768
- 95acf4112f5b67f22f8df330e53e6cf764e1648f6fbbebc7feb316dc3eb6cf8f
- 22224ae5b1818b86a5ce7b5872ebcea1c071009a6fe1abcfcf26cfe36b53c6b8
- 035658f37f5a9c025db1386a89f5c05b72895b73c1a6826656055117afbd5239
- 627d5f227d5e39c98802dabf68096f2588ee988afcdb13b95470457bb1f1c44c
- 7d5f86ab7a0f47947ccfebf496e7e8164d433ee7560c39661a0f3d88995d72c4
- 9623353017b1f980f43eae284662dbd2cd0b1ea1d8864e4fa6f86c83d78e7c06
- 1fb1f82cbaca4a5463b8375709dc2e865dae4492ef294c7c39324fb867e58272
- ad7df8473b55cc460476e05f265e7c496f711dbd6635b594e3d1cdd435ff6504
- 38416b1b2ca89bec7e71e2143ba27e64b2c3319ef45499346b47dc30fbca793c
- b55d6775b6bb9254b87692e244fd7078ec93c031efa51b6d205cff98a1651484
- 66318b8528b59acba6be065989e51b5187a8735cc1be87fb25c835d9f5ae37af
- 423f5a30c7174d2b41f5fcd38beaa232967990f66aec84769ce501402f5881a3
- 7933dfd5d65816c54c8ab3da1455d6810c4d1532790d95c54b0bc4adc055ff40
- a44392970b81bbc639822aaa9f73f7da4e64e39b91a402483d5bf98538fd88e4
- 0cf1c29300b3fee8659c630bd37867323c42422b50bd429e9ca196025fbf090c
- ff56285588b4bcc927db05ac856e2bf69d4f6b31c63d254242551c0315719854
- cc1de1d246c39e1214186cbe88932b70e8e60121739faf9c88f24446e74445b8
- b97123397c9f1419bd6ce9c62a7be178c35683b64fe3c20046ee4aeeadd2f83b
- b09681f50489150130ae682139d6427f1fc77c2cb2a9debdd5db9fc4ae307a1c
- 84f5dc461c256fd058522acf368c5d83a4560a8a478be5f5d551a1a194598374
- 336a044de2b47ee875f27627059bef2dea0862908b2bd937416a2765ec91eeda
- 3154deee82fe4fa24df33713a2a9688c1028c39df791732af097419dca83e3f6
- 973e3de5de51533ebd699879ec1679525e7b35a0a74218f68c29a1b4d2280c2d
- 18344197c44ed32c4cf31df5c4424d0128b6791a57fb910ce42e1f68d282e13d
- 87c4014428af7f4303f9accc16951be16dc7122a191d1465d0a5e0b60486ef80
- 6ca8549d8c1c91ca2136e49458b935974354640aa6bab2a8d2255868d56d87ed
- 2a18628d8955170725121f5f5a2b4262e39456e9fd4a007bd387f2a14e235a50
- 96cbf50ad97ada93a6e0156557911911e46c7963b34951cfe5abd0be3dbfaade
- ba6fd1a48128dfa48a1f3c70b28181e658abbbf549e104d08df3f27197475dcc
- 7bb5c17d1f1e25cfc735867f005563ead7de99c19e27f05a0efeced067ab50be
- b3712f4146b50e243a6b2056d062045a14c9d8057ba1430f5c2662dac06ac34e
- 8f1c167582e3d46cf2d24887b47dd4830f0dd084aefd7371b61ef716932db352
- 29563c43673308e83437984ebe46e650a56e11be5fe2e1298946bc232287e121
- 9badcf85535fc5b2282bdaea3fc6ac15d0f9f560524015321f0ed5c075fe7e5b
- 1b6c1b1374e257cb5f699f71dbd1d2d1a287588548610272598a85b8133fcaef
- 3aed734f122676a568c68a98a3243570dea7b06cf5a65f1be1ce060da2fe6804
- a365cac889289ede9cf61a0fb73b8efe7cccf758167354ff43b29b3845777c82
- 20c519b8cf6f16eac1fbc00b93178eb78c076f10518faf4c43f9606de6fbab83
- 138ef57dc8947ef1580ee7fb0edc3459cd49a16ec296edabcfa913c784ee7320
- 1b4fd65008d7780b9af4857ef91b9d4eccb97cb3469d90a982713812ab7c1b11
- 1930509ac41ac78987f50332f9e44b66d0e27ad59fea56e933e05d4475012196
- d6c16dec9ea82842f64e11ff7f6b4194f9b513f904423291ec8e7782ab7024f8
- 54af90457d760ea7ac38b1b6d7b532996542192d0541004f9da9386fb5ea91ea"
+checksum="e398f1b14ae79fcd74639a81b27c4cd38b09282ca625d1b72c69df09fc4ec1fc
+ a8cbef3ba5c35e33c0f1e02dcd2781cc362315d5b63e9e6065a22afbe460581f
+ 35b4f32eabd40875d518cb174858bb6d8ecff272f4ee677e0c108d8395707960
+ 4f1a97c404347121c53799efd2a986860e030b7789e66e252d92b6a78012b681
+ 580e9e9fde913ce410774d366bad95af3a67df52c688a6ad64ad59e8d33eab47
+ 91236c6ecd7ee99927d5b69566cc30f4b1de6e7caca3336386f3e7bb995c96e2
+ fa36e967b14e530993e3a50fcdc5f32e686f5b110f6cdee59b8c555c82294517
+ c88a65b1f3c10085b0d5236a3e687b70cd9a620803393caf81b4ee0677330ef0
+ c12d138948d4e5cebce1051f0cc750f8f9bfb23f733417e7e7b9596ee74a6980
+ e4b9cdcb7c08beceecfef7d8b94d70a24e3f24404c73cd7cf5aed6572e293bf6
+ 75d09dfb5c0b55b670c912feecd48bfdc7f936f31c41d8e4b2ede0e46d16f749
+ 8780f97e115fbe8f156412757d1980517b85dc409fbbc8e0266bdcc7d0568c83
+ 815c9a81efce33b19b9bcabd46093ea92bd062698575c83ea127f20a3495c984
+ 76e9a327a69960f4ebd857b5b204d435d60461b7129aa70db90ebb28411ffaee
+ 8fdd5adfec75310172819a959a2b68ad3ecb614c94298be315804e730b43a160
+ 8947c35c94f08bbb61a3beb8b106a776d0f0a3b2f247b9e49619ab9b9416bb19
+ 7851a711a8de28c6e6c3c07814ef995263f4c3a48981742f1aa481389dab3897
+ 8bb525f9045c91b3f539103eb398da1d1f71a580971a1adcc780198da36a2623
+ 04cfc4a69fba8f3838d385179511954277cf1f6d8243663f338941c1e86a49ca
+ cd9f142ac06d16919b5f1102ae53f1241574057c75012198fe1dbdb7a8d63a8c
+ 8ff53385252becfbc2f15354ea57b873251584444129c137350e974dc488318c
+ 9a58559be92950e33051625e49dd3f5bae36c225b9a7030bec9a6aa78d45ba93
+ 6e0f538d93f8b2d189c667c2aac37c6d1eb50fb802c4ee2ff310db15da57de56
+ 2c051ea90460cda20296b1a69037e037b82258fe382c9031594974e75cbc10eb
+ 053dfbb9ad0feb3b54cab94bd8f5ac544ec598f9b819a7d163496f838104b8a5
+ faa25b7302f249b9aaea768a7cf61f78f67e3637e9a62906361a1fae257d0161
+ 54f02a1e948d2944b3889152b093200a0d31358df28f7309e5fb5d490616d317
+ 7c104e3c70024163fc0fe7597df0a995b2e813319dc23268fe36e04f09f2ced7
+ 2cf6b8e82042208407bfdbad01a3d5113c87f0bd37acb082452f1f6c22bf1485
+ da05a0fe7a65ce243f0ec69ad60d93a3bc988383f983343a66b399a2de1a10a0
+ 13da03264b7d522bcbb77cfb1fece6606f9efe742822325ced7627fe28add070
+ 0d835b249070428d8d5e1c251ab46b19df71cc2858b69843a41eee897c27b396
+ 5dbbe35e45b15dca15ba5de15aa55b4fce44d33fb456ca8184270c0f162567d7
+ 9e6b2c13f0c2347fe27e189dea6dd8a3c5b23aaac668010213258bd26e0d3da7
+ 1aa07979f8bb7d6039a11f64b3c93b3c70332def967af6fb426897b7c65fdba2
+ c21b99ea6049d498bb446770801e3c9f8041bd11e0ae8164bd16a016f14f5578
+ ed537abf79efa484fc920902d59ea1b840c6acf6fa540f435722f5c75a1bca90
+ e9517bb3330ec5cb2a743dd56a69c912a35b6dafe6a7abeadfe1532a17963549
+ cf97f81502f30c807fde8127c6f8ac1a9ea58508ba8d243ea0d6fbabe2ddc8b1
+ 85b90f53e79bc2961b3f0c702ba5762ba7559c366d7682bc66b20514769c2a92
+ bd31d635b44f039ad2f89e4ad1cd0f7fcbcec7e0d6d381f8bf89e17bb74aa952
+ 10d597d44d8261cd0eebe024de51ba803c94792d13c5732d43ed9bec4db72783
+ 33da29355095f9ae0383e21ae0c6d300d6a7f298c7e126e8747c71277b1175be
+ 84ff5d1b88c4205eba0f04e89daf4d91e9f25da4590367050917a6d34c629147
+ 4de39e8b907391f197fe5d138f87985d74d3a34796c3963f2e33142164696f84
+ 47e8c5ece6643d5c6cac713799c841e73c0bda691243ccd346b5e85b0a4810d1
+ c196be8854dded19c2a85c5bb7f3ff3123da0d91852da7b16f844cb44e9d11fa
+ 7f97921badcf0c7ffeb92c6f1d1d2ada3afd0069e8e80a524ad3b7c0c1220f0a
+ 79d845fccaa1916f07dfd821c3ed95dd5647b70bd9a39e485caa66cc65a077f7
+ 40ce23e0cc6e4fa5192e987bc835c1408d958a2fcfb8875370db517ff64c92a4
+ 8f6f739077a383884d400c3062925e0e848be4942e3be0e378e589bfa3941c9c
+ 9f014d8807130a01ae008997393deb4c865c70482a4fe75f3cee0e9f8071246a
+ 240aa4b7091065ef0495c8f52eeb91b5a0cae03676c6ea4cedee9260e204dd6f
+ 788f7ab9bfbb7b692d4d28efad9ae3de964ef7bfa4e30f6f50a3bd178ac004ee
+ 04a7fbbc1b0769a5b66bb068385482e50c5f70298eba250235d259bc4aa3ea99
+ 30a1707f4a57a2ba738eb27f5525daa12f0713e3bb7b1a3ebe2c710ac6e37a27
+ bdc752daf3b4e8f8ea3980d98a01d7249f38dddf183909eb55a8c50ad30368e1
+ 48332123774a79eed86d1e826021a05a3921ac5f95ca54e086f173c8e1e72fd1
+ 31f2f1c2adabe35fd353d3720eb8458716f926e57c9d782518f943533cd1a72d
+ 4756150d141a8ce3e2bdca7fdb1b343466b19cb9a19adbfa25d86c39d0f7c933
+ 024f3b186772c5381a458dda4a6b914fb2695f8c16e648c58d463072f10f5b57
+ 8160d89f88b3c7d9e967377e513b8fc18e4a19faa55f95371db3553564db65bf
+ 6d2816247894f2e73ecb0258ee5a9b85b650542bac46a8587d547c8824e2d280
+ d3e017f003c34a6768670ae2c8bbd5e3500f452647e36193614810ced595b2b3
+ 7ceafc2a330620665c51e8b394d296ddb190d97f4cebcd0a247d0278d3a54274
+ 6b6992a92df788fbd119446aabd9329b7edd1643a8dd1e3ca7b60dc7976b3b60
+ 8dee92aa771ca1b0deb233b974f844b8025d4b25f2ff8be41d91c636565eb7f0
+ b4fc00a30204c8c5b19c92bd3164b98955d9591366f89c194fe248bdbc0ce580
+ 406335d53b11c42f34446adc68d6836a6841fc34af3c2f1fa621ddc2026017b4
+ 7ac66cef872878f6e5568266d9c807da1cc4041ae51723cf387590954f73cf7d
+ 74c5306c711a4150cb6f89289067533a5438495a251d63cb06f586d27eafbeb4
+ f3e67b76944280de1eb8df059bec0f0eafd06a4bc4e7c93e98c434a17192c084
+ e13b87e04ee3fbf7ea0c02e4b176d6dc66dbd234b59cb245dfd225e65c5cdcd3
+ bfab113c2dde187aaabfd89957c7dc840bbbb25c4f27b31fb422c9817035eaa8
+ 7bde7feb01a40d3b89b78928154fcfc0eff8c77b086e360b940f61d45d7eadb0
+ 18f2267d16b30aecfd2b6f9437cc79bca68084680b2770820323a968fd20c93e
+ 5bd5138456fae929520bbd821beddd1f934d156e3c99916e47df31b7bedaa32a
+ eb4db96ab4b78dede2d92db7c0c3dd4084971178f101a342655348a4b90a6487
+ 07a06be606d6adacf1cb57cbf448ff18a7c13c90df9e11768ac3fe3e200569a2
+ 090e6759314eb16b2169bd1f89387963ba81a0e565f1d77143f2da0e6d267e28
+ 38cf5fa44116bc15f12db4506db386b147762838f25d991a0c39cdcd236533f6
+ 448a4ab5be3d9f246f961705a02f31abcaa8c616351c4d05857c3db41ba83154
+ 3fcfcc54f9ec4762b4b78ce0db9351ac59a717e4931d6267cacafa16d3d41057
+ 7349863f4edfd79321be9b214384138596cbe16ecd2107cee58501e2511c438a
+ 4a50c82c68898c25dfdfcb95079750a455ba2e4d1397d5e51cc2991dce1be60b
+ 275ab1a945003153a10fd5bbebf8ce9af346e5ad2068c83eebdcd60ecf0ce99e
+ cce68831a20669468b108e3dd58dbc34cd981c874bdd299b715df838ba5ca0f9
+ d6cdb55b0f8d7f3c9c4f3bc7906feb123f84243bfbd719eab75a6894cf455582
+ 74012d5c8c22cc2f5780ae55020cdbe3c74f21671a2769fde907dbd63e0281bb
+ 14a02938f76ce51767746ecc104ff571f2da0429144ee981cd28af8b4eda3518
+ dc05af8f59bdbf1c77d6d45dc1bf6bba634b782533e245993d852e39f145cfc9
+ 557444ed827906476ec3385ffae1e1952acc5b3234840fc645ff892c9753b2f3
+ 9925d116300b43f82061e1c04deae6c241cfb121d46364aa1f206e0d8bd9732a
+ aaf3249f295362530f04f23c00e309baa5a7a89c70bbf1a3a763b8ef66631ac8
+ d289624c73955ff377057be150ff8d52118810a4adaf861fe51b7f0a0b80dbbf
+ 2f07d98e74625892478c321161f62db8c790d978dd4e5c3633c5cf5ef5d8d6b4"

From c2728dc35a475d2c603ebb270fe525864200f45b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 14:45:55 +0100
Subject: [PATCH 0977/1686] meson: update to 0.62.0.

---
 srcpkgs/meson/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index adfa2d52f7ab..2a4453076e8f 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,7 +1,7 @@
 # Template file for 'meson'
 pkgname=meson
-version=0.61.4
-revision=2
+version=0.62.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 depends="ninja python3-setuptools"
@@ -14,7 +14,7 @@ license="Apache-2.0"
 homepage="https://mesonbuild.com"
 changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
 distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=4e3733ddc66bac38e38c63b739c9b8b8fc5a866de5333396b0c85c2b144ddee9
+checksum=06f8c1cfa51bfdb533c82623ffa524cacdbea02ace6d709145e33aabdad6adcb
 
 # XXX: sanitizers aren't available on musl
 if [ "$XBPS_TARGET_LIBC" = glibc ]; then
@@ -40,8 +40,6 @@ post_install() {
 	vmkdir usr/share/vim/vimfiles
 	cp -rt ${DESTDIR}/usr/share/vim/vimfiles data/syntax-highlighting/vim/*/
 
-	vinstall data/syntax-highlighting/emacs/meson.el 644 usr/share/emacs/site-lisp
-
 	vcompletion data/shell-completions/bash/meson bash
 	vcompletion data/shell-completions/zsh/_meson zsh
 }

From d1cc9e3fece55696fdefc94834b3605e010a63ff Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:07:16 +0100
Subject: [PATCH 0978/1686] accountsservice: fix for meson 0.62

---
 srcpkgs/accountsservice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template
index c00a4077d8f7..804d57e9e421 100644
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@@ -6,7 +6,7 @@ build_style=meson
 build_helper="gir"
 configure_args="-Dsystemdsystemunitdir=no
  $(vopt_bool gir introspection) $(vopt_bool elogind elogind)"
-hostmakedepends="glib-devel pkg-config polkit"
+hostmakedepends="glib-devel pkg-config polkit gettext"
 makedepends="polkit-devel $(vopt_if elogind elogind-devel)"
 short_desc="D-Bus interfaces for querying and manipulating user account information"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 6bb59c1a622ce95cc0d8d78fd44012efac86b755 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:12:33 +0100
Subject: [PATCH 0979/1686] atomix: fix for meson 0.62

---
 srcpkgs/atomix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/atomix/template b/srcpkgs/atomix/template
index a59e134ebd91..31f34e1efc59 100644
--- a/srcpkgs/atomix/template
+++ b/srcpkgs/atomix/template
@@ -3,7 +3,7 @@ pkgname=atomix
 version=3.34.0
 revision=1
 build_style=meson
-hostmakedepends="glib-devel itstool pkg-config"
+hostmakedepends="glib-devel itstool pkg-config gettext"
 makedepends="libgnome-games-support-devel"
 short_desc="GNOME puzzle game where you build molecules"
 maintainer="Orphaned <orphan@voidlinux.org>"

From f19e4dfdcff73ca65578d3d583affd7000859c58 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:21:38 +0100
Subject: [PATCH 0980/1686] babl: fix for meson 0.62

---
 srcpkgs/babl/patches/meson-0.62.patch | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 srcpkgs/babl/patches/meson-0.62.patch

diff --git a/srcpkgs/babl/patches/meson-0.62.patch b/srcpkgs/babl/patches/meson-0.62.patch
new file mode 100644
index 000000000000..a105c98cb0db
--- /dev/null
+++ b/srcpkgs/babl/patches/meson-0.62.patch
@@ -0,0 +1,33 @@
+From b05b2826365a7dbc6ca1bf0977b848055cd0cbb6 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz@archlinux.org>
+Date: Sun, 13 Mar 2022 20:26:05 -0400
+Subject: [PATCH] meson: fix misspelled kwarg name
+
+set10 doesn't have a `Description` kwarg, it does have a `description`
+kwarg though.
+
+This caused the conf variable to not have a description when it should
+have one, and newer versions of Meson with better argument validation
+error out with:
+
+meson.build:58:5: ERROR: configuration_data.set10 got unknown keyword arguments "Description"
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 55054f441..8c93be9d1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -55,7 +55,7 @@ lib_name    = meson.project_name() + '-' + api_version
+ stability_version_number = (major_version != 0 ? minor_version : micro_version)
+ stable = (stability_version_number % 2 == 0)
+ 
+-conf.set10('BABL_UNSTABLE', not stable, Description:
++conf.set10('BABL_UNSTABLE', not stable, description:
+   'Define to 1 if this is an unstable version of BABL.')
+ 
+ conf.set       ('BABL_MAJOR_VERSION',    '@0@'.format(major_version))
+-- 
+GitLab
+

From a67e6fa4a29cd9059b596bd6a9be0027923152d1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:33:02 +0100
Subject: [PATCH 0981/1686] cawbird: fix for meson 0.62

---
 srcpkgs/cawbird/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cawbird/template b/srcpkgs/cawbird/template
index a307ed212e54..85c5d621bcc0 100644
--- a/srcpkgs/cawbird/template
+++ b/srcpkgs/cawbird/template
@@ -3,7 +3,7 @@ pkgname=cawbird
 version=1.3.2
 revision=2
 build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
 makedepends="gspell-devel gst-plugins-base1-devel gtk+3-devel
  json-glib-devel libglib-devel liboauth-devel libsoup-devel rest-devel
  sqlite-devel"

From be6e613ee9c7189fb52279a62fa317e1d496a60b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 16:54:30 +0100
Subject: [PATCH 0982/1686] clipped: fix for meson 0.62

---
 srcpkgs/clipped/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clipped/template b/srcpkgs/clipped/template
index 3ced5834bfc8..9386038b3f42 100644
--- a/srcpkgs/clipped/template
+++ b/srcpkgs/clipped/template
@@ -3,7 +3,7 @@ pkgname=clipped
 version=1.1.1
 revision=1
 build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
 makedepends="libgee08-devel libXtst-devel sqlite-devel gtk+3-devel"
 short_desc="Clipboard manager"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From b572237bbe43eb2b9f312c35cf480727da9d7dca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 18:01:30 +0100
Subject: [PATCH 0983/1686] eolie: fix for meson 0.62

---
 srcpkgs/eolie/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/eolie/template b/srcpkgs/eolie/template
index 52c0f08d2f45..d709b2c7cfce 100644
--- a/srcpkgs/eolie/template
+++ b/srcpkgs/eolie/template
@@ -6,7 +6,7 @@ _eolie_hash=bb4aad19272cc636bd17f2f6602127fe
 build_style=meson
 pycompile_module="eolie"
 hostmakedepends="appstream-glib desktop-file-utils glib-devel pkg-config
- gobject-introspection python3-MarkupSafe"
+ gobject-introspection python3-MarkupSafe gettext"
 makedepends="gtk+3-devel libglib-devel python3-gobject-devel webkit2gtk-devel"
 depends="gtkspell3 python3-dateutil python3-gobject webkit2gtk python3-PyFxA"
 short_desc="Web browser for GNOME"

From e42fcdc81bc74c0ef6b8fc10fb3c6d475a8f7ee4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 26 Mar 2022 19:03:54 +0100
Subject: [PATCH 0984/1686] gamehub: fix for meson 0.62

---
 srcpkgs/gamehub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gamehub/template b/srcpkgs/gamehub/template
index e8f110b3eb8d..7e8b35ef9af0 100644
--- a/srcpkgs/gamehub/template
+++ b/srcpkgs/gamehub/template
@@ -4,7 +4,7 @@ version=0.16.1
 revision=1
 wrksrc="GameHub-${version}-2-master"
 build_style=meson
-hostmakedepends="glib-devel pkg-config vala"
+hostmakedepends="glib-devel pkg-config vala gettext"
 makedepends="granite-devel libglib-devel webkit2gtk-devel json-glib-devel
  libgee08-devel libsoup-devel sqlite-devel libxml2-devel polkit-devel
  libmanette-devel libX11-devel libXtst-devel"

From 00459c9ba5afbcfa6f9cd612500d275293db089f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:24 +0200
Subject: [PATCH 0985/1686] gnome-multi-writer: fix for meson 0.62

---
 srcpkgs/gnome-multi-writer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-multi-writer/template b/srcpkgs/gnome-multi-writer/template
index 7d0e5085a6ab..cc21737d0601 100644
--- a/srcpkgs/gnome-multi-writer/template
+++ b/srcpkgs/gnome-multi-writer/template
@@ -4,7 +4,7 @@ version=3.32.1
 revision=1
 build_style=meson
 build_helper="gir"
-hostmakedepends="docbook2mdoc glib-devel pkg-config polkit"
+hostmakedepends="docbook2mdoc glib-devel pkg-config polkit gettext"
 makedepends="gtk+3-devel libgusb-devel udisks2-devel polkit-devel libcanberra-devel"
 short_desc="Writes ISO files to multiple USB devices at once"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 25f3426d46b407f724b322c8779e85b0f14bf38c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 10:46:12 +0200
Subject: [PATCH 0986/1686] gnome-passbook: fix for meson 0.62

---
 srcpkgs/gnome-passbook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-passbook/template b/srcpkgs/gnome-passbook/template
index 7348a1944502..30cd8e93b721 100644
--- a/srcpkgs/gnome-passbook/template
+++ b/srcpkgs/gnome-passbook/template
@@ -5,7 +5,7 @@ revision=3
 _release_hash=5fea4e4fc19f1732d3a5270bc43eb8e9
 wrksrc="passbook-${version}"
 build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
 makedepends="gobject-introspection gtk+3-devel libglib-devel"
 depends="python3-pykeepass python3-gobject gtk+3"
 short_desc="Password manager for GNOME"

From 9e4b8f4294226aa0d91e0ba62be2f3d5c13e62ff Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 09:57:42 +0200
Subject: [PATCH 0987/1686] gnome-power-manager: fix for meson 0.62

---
 srcpkgs/gnome-power-manager/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template
index 58422cd9da3b..0c3c1ff4306c 100644
--- a/srcpkgs/gnome-power-manager/template
+++ b/srcpkgs/gnome-power-manager/template
@@ -3,7 +3,7 @@ pkgname=gnome-power-manager
 version=3.32.0
 revision=1
 build_style=meson
-hostmakedepends="glib-devel pkg-config"
+hostmakedepends="glib-devel pkg-config gettext"
 makedepends="gtk+3-devel upower-devel"
 depends="desktop-file-utils hicolor-icon-theme upower"
 short_desc="GNOME power management tool"

From f8608807a757e8ae675ced72d574ee7f02ec36ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 14:17:00 +0200
Subject: [PATCH 0988/1686] gupnp-tools: fix for meson 0.62

---
 srcpkgs/gupnp-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template
index 09507922f46c..cad194d50f86 100644
--- a/srcpkgs/gupnp-tools/template
+++ b/srcpkgs/gupnp-tools/template
@@ -3,7 +3,7 @@ pkgname=gupnp-tools
 version=0.10.0
 revision=2
 build_style=meson
-hostmakedepends="pkg-config glib-devel gobject-introspection"
+hostmakedepends="pkg-config glib-devel gobject-introspection gettext"
 makedepends="gupnp-av-devel gtk+3-devel gtksourceview4-devel
  libxml2-devel libsoup-devel"
 short_desc="Free replacements of Intel UPnP tools that use GUPnP"

From ef86c89358ee93b5a708cf3dd5f24f392ad05f03 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:58 +0200
Subject: [PATCH 0989/1686] io.elementary.icons: fix for meson 0.62

---
 srcpkgs/io.elementary.icons/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template
index 95dbc0ca3ddb..1e1945d0bb73 100644
--- a/srcpkgs/io.elementary.icons/template
+++ b/srcpkgs/io.elementary.icons/template
@@ -4,7 +4,7 @@ version=6.1.0
 revision=1
 wrksrc="icons-${version}"
 build_style=meson
-hostmakedepends="xcursorgen librsvg-utils"
+hostmakedepends="xcursorgen librsvg-utils gettext"
 # gdk-pixbuf needs librsvg to render SVG icons
 depends="librsvg"
 short_desc="Named, vector icons for elementary OS"

From a54eb25d5e8772c7b2ef5d5504d5ae1729223d2e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:34:06 +0200
Subject: [PATCH 0990/1686] quickDocs: fix for meson 0.62

---
 srcpkgs/quickDocs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template
index c4a22e6bbe7d..b2cbb667c8d1 100644
--- a/srcpkgs/quickDocs/template
+++ b/srcpkgs/quickDocs/template
@@ -3,7 +3,7 @@ pkgname=quickDocs
 version=2.2.6
 revision=2
 build_style=meson
-hostmakedepends="vala pkg-config"
+hostmakedepends="vala pkg-config gettext"
 makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel"
 short_desc="Fast developer docs reader"
 maintainer="Daniel Lewan <vision360.daniel@gmail.com>"

From 379405b8e0494725037f23df0a132ec92b6a73eb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Mar 2022 17:33:51 +0200
Subject: [PATCH 0991/1686] rygel: fix for meson 0.62

---
 srcpkgs/rygel/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template
index 06c85e2bcf4e..1493b825a564 100644
--- a/srcpkgs/rygel/template
+++ b/srcpkgs/rygel/template
@@ -6,7 +6,7 @@ build_style=meson
 build_helper="gir"
 configure_args="-Dexamples=false -Dtests=false
  -Dsystemd-user-units-dir=none"
-hostmakedepends="pkg-config glib-devel vala docbook2x"
+hostmakedepends="pkg-config glib-devel vala docbook2x gettext"
 makedepends="sqlite-devel gtk+3-devel libsoup-devel libgee08-devel
  gupnp-av-devel gupnp-dlna-devel tracker3-devel
  libmediaart-devel gssdp-devel gst1-editing-services-devel"

From 09b8be7a740f5877e7f1e3fc7b0837e93a06cd2c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:31 -0400
Subject: [PATCH 0992/1686] LimeSuite: update maintainer email

---
 srcpkgs/LimeSuite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/LimeSuite/template b/srcpkgs/LimeSuite/template
index 44f119784ffd..11e0af2aa637 100644
--- a/srcpkgs/LimeSuite/template
+++ b/srcpkgs/LimeSuite/template
@@ -28,7 +28,7 @@ makedepends="gnuplot wxWidgets-gtk3-devel libusb-devel SoapySDR-devel libfreeglu
  fltk-devel glew-devel sqlite-devel libgomp-devel $(vopt_if octave octave)"
 depends="wget"
 short_desc="Driver and GUI for LimeSDR/LMS7002M-based SDR platforms"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="Apache-2.0"
 homepage="https://myriadrf.org/projects/lime-suite/"
 distfiles="https://github.com/myriadrf/LimeSuite/archive/refs/tags/v${version}.tar.gz"

From 6b9d3f8db839717d1fef83b509f92a93b07762e9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:32 -0400
Subject: [PATCH 0993/1686] chezmoi: update maintainer email

---
 srcpkgs/chezmoi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index abf8ff70d40f..2f0fb2f144bc 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -8,7 +8,7 @@ go_build_tags="noembeddocs noupgrade"
 go_ldflags="-X main.version=${version} -X main.commit=v${version}
  -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ) -X main.builtBy=xbps"
 short_desc="Manage your dotfiles across multiple machines, securely"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"

From dbc27859ee847e83328bcd084315ac1dca455975 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:33 -0400
Subject: [PATCH 0994/1686] helvum: update maintainer email

---
 srcpkgs/helvum/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template
index 5a694dc43c29..6c5e27bfefc1 100644
--- a/srcpkgs/helvum/template
+++ b/srcpkgs/helvum/template
@@ -7,7 +7,7 @@ hostmakedepends="pkg-config clang libclang"
 makedepends="gtk4-devel pipewire-devel glib-devel"
 depends="pipewire"
 short_desc="GTK patchbay for pipewire"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-3.0-only"
 homepage="https://gitlab.freedesktop.org/pipewire/helvum"
 distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz"

From d337b298148bbcd5e2581c8e04e58aa65fd6b017 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:34 -0400
Subject: [PATCH 0995/1686] hobbits: update maintainer email

---
 srcpkgs/hobbits/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index 42f5c20ce132..fe6c7f5adda7 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -6,7 +6,7 @@ build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake python3"
 makedepends="fftw-devel libusb-devel libpcap-devel python3-devel qt5-devel"
 short_desc="Multi-platform GUI for bit-based analysis, processing and visualization"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT, GPL-2.0-or-later"
 homepage="https://mahlet-inc.github.io"
 changelog="https://raw.githubusercontent.com/Mahlet-Inc/hobbits/master/CHANGELOG.md"

From d6b3cadb62a2c6a7d86191633453f2089390c60c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:34 -0400
Subject: [PATCH 0996/1686] mininet: update maintainer email

---
 srcpkgs/mininet/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mininet/template b/srcpkgs/mininet/template
index 18862aeebdf8..2ea62ca31ead 100644
--- a/srcpkgs/mininet/template
+++ b/srcpkgs/mininet/template
@@ -7,7 +7,7 @@ hostmakedepends="help2man python3-setuptools"
 depends="bash ethtool inetutils-telnet iperf iproute2 iputils libcgroup-utils
  net-tools openssh openvswitch psmisc python3-tkinter socat xbitmaps xhost xterm"
 short_desc="Emulator for rapid prototyping of Software Defined Networks"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="custom:MIT-like"
 homepage="http://mininet.org/"
 changelog="http://mininet.org/blog/categories/releases/"

From 0cc06967e30a73d9c559c45d1ebc5ab5e46f3780 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:35 -0400
Subject: [PATCH 0997/1686] openjdk12-bootstrap: update maintainer email

---
 srcpkgs/openjdk12-bootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 770fce5bb07e..4861ad1efc40 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 12)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"

From 24830ace107bdfe1b539bf7f54fdfbf2a3b19632 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:35 -0400
Subject: [PATCH 0998/1686] openjdk13-bootstrap: update maintainer email

---
 srcpkgs/openjdk13-bootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index ccbafa367962..82c34b7999f3 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 13)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"

From efb828c879c283f27df6377e0d1fbc357c0fd37f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:36 -0400
Subject: [PATCH 0999/1686] openjdk14-bootstrap: update maintainer email

---
 srcpkgs/openjdk14-bootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 62011285f35d..5c15ca3f32c0 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -39,7 +39,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel openjdk13-bootstrap"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 14)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"

From e896731b15a6ec628de85dd10a47a7ec48ce0280 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:37 -0400
Subject: [PATCH 1000/1686] openjdk15-bootstrap: update maintainer email

---
 srcpkgs/openjdk15-bootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 70b38621be25..efbc69f9429e 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk14-bootstrap"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 15)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz

From be5bed693018c91183c7414ab2c29f6f34b95edf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:37 -0400
Subject: [PATCH 1001/1686] openjdk16-bootstrap: update maintainer email

---
 srcpkgs/openjdk16-bootstrap/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 876bfe6de81b..9bea476c6836 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk15-bootstrap"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 16)"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz

From 6a9e1efb05d2b01ce4f1510aa7f78d7abccfbe6c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:38 -0400
Subject: [PATCH 1002/1686] openjdk17: update maintainer email

---
 srcpkgs/openjdk17/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 43f72e4d65c0..19fa38707f00 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -40,7 +40,7 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
 depends="${pkgname}-jre-${version}_${revision}"
 provides="java-environment-${version}_1"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
-maintainer="classabbyamp <dev@kb6.ee>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz

From f53a6740157ac0dd41c8d5499fb2f7a3731cb6e4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 11:40:38 -0400
Subject: [PATCH 1003/1686] webhook: update maintainer email

---
 srcpkgs/webhook/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webhook/template b/srcpkgs/webhook/template
index fb8b2168566a..cf79527f9377 100644
--- a/srcpkgs/webhook/template
+++ b/srcpkgs/webhook/template
@@ -5,7 +5,7 @@ revision=1
 build_style=go
 go_import_path="github.com/adnanh/webhook"
 short_desc="Lightweight incoming webhook server to run shell commands"
-maintainer="Abigail G <dev@kb6.ee>"
+maintainer="Abigail G <void@placeviolette.net>"
 license="MIT"
 homepage="https://github.com/adnanh/webhook"
 distfiles="https://github.com/adnanh/webhook/archive/${version}.tar.gz"

From abe3eebfec95a8392be0592ffc27a43b96833510 Mon Sep 17 00:00:00 2001
From: Ramdziana F Y <ramdzian@gmail.com>
Date: Wed, 6 Apr 2022 18:39:31 +0700
Subject: [PATCH 1004/1686] vivaldi: update to 5.2.2623.24

---
 srcpkgs/vivaldi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 9108f67a4d29..b7a701c92dde 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -1,6 +1,6 @@
 # Template file for 'vivaldi'
 pkgname=vivaldi
-version=5.1.2567.73
+version=5.2.2623.24
 revision=1
 _release=1
 archs="x86_64"
@@ -14,7 +14,7 @@ license="custom:Proprietary"
 homepage="https://vivaldi.com"
 distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
 _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/"
-checksum=efc4a4d39724840cbcc78317ef1a0e5e300cb8b9d655defee8e746626f845f12
+checksum=a97eb6f3cfc9b80fd5a2f742b8d0c5af093ab6f5346552c7821129689e2485c0
 repository=nonfree
 restricted=yes
 nostrip=yes

From 6307881c42571034fb4e15793f37bfb9c6304729 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Fri, 1 Apr 2022 16:18:49 +0200
Subject: [PATCH 1005/1686] yq-go: update to 4.23.1.

---
 srcpkgs/yq-go/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 67a2a5c478c3..9342a11e5deb 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.21.1
+version=4.23.1
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -11,14 +11,14 @@ license="MIT"
 homepage="https://github.com/mikefarah/yq"
 changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=27ba049e24a2f40db4010ad6574ce866fa1d43f4cb064de286e344e3c7911ef0
+checksum=f55ffb9c6d7926b06d5862eb6a9e9ea942ec2883286df8e2e3d6f0716cc36eed
 
 do_check() {
 	go test -v
 }
 
 post_install() {
-	# this came after yq 'the jq wrapper for yaml' so yq has the right tp
+	# this came after yq 'the jq wrapper for yaml' so yq has the right to
 	# /usr/bin/yq, rename it to yq-go
 	mv -v "${DESTDIR}"/usr/bin/{yq,yq-go}
 

From 2c61996c416c5a587b54701497373cfd09099aa5 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 2 Apr 2022 21:55:59 -0400
Subject: [PATCH 1006/1686] arduino: update to 1.8.19.

---
 .../patches/disable-dependency-build.patch    | 225 ------------------
 srcpkgs/arduino/template                      |   4 +-
 2 files changed, 2 insertions(+), 227 deletions(-)
 delete mode 100644 srcpkgs/arduino/patches/disable-dependency-build.patch

diff --git a/srcpkgs/arduino/patches/disable-dependency-build.patch b/srcpkgs/arduino/patches/disable-dependency-build.patch
deleted file mode 100644
index 6a7144c906c4..000000000000
--- a/srcpkgs/arduino/patches/disable-dependency-build.patch
+++ /dev/null
@@ -1,225 +0,0 @@
---- Arduino-1.8.13/build/build.xml.orig	2020-12-27 20:34:41.813419495 +0100
-+++ Arduino-1.8.13/build/build.xml	2020-12-27 20:32:58.075425211 +0100
-@@ -345,7 +345,7 @@
- 
-     <!-- figure out the IDE version number in base.java -->
-     <loadfile srcfile="../arduino-core/src/processing/app/BaseNoGui.java"
--        property="revision.base">
-+	      property="revision.base">
-       <filterchain>
-         <tokenfilter>
-           <linetokenizer />
-@@ -659,14 +659,6 @@
-   </target>
- 
-   <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-5.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
--      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
--      <param name="dest_folder" value="${staging_folder}" />
--    </antcall>
--    <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
--    <chmod perm="755" file="linux/work/lib/libastylej.so" />
- 
-     <antcall target="portable-${portable}">
-       <param name="parentdir" value="linux/work" />
-@@ -684,14 +676,6 @@
-   </target>
- 
-   <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-5.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
--      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
--      <param name="dest_folder" value="${staging_folder}" />
--    </antcall>
--    <copy file="linux/libastylej-2.05.1/libastylej_arm.so" tofile="linux/work/lib/libastylej.so" />
--    <chmod perm="755" file="linux/work/lib/libastylej.so" />
- 
-     <antcall target="portable-${portable}">
-       <param name="parentdir" value="linux/work" />
-@@ -715,26 +699,9 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-arm-linux-gnueabihf.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_arm.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux-libastyle-aarch64" depends="linux-build" description="Download libastyle.so for AArch64">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-5.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-5.zip" />
--      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
--      <param name="dest_folder" value="${staging_folder}" />
--    </antcall>
--    <copy file="linux/libastylej-2.05.1/libastylej_aarch64.so" tofile="linux/work/lib/libastylej.so" />
--    <chmod perm="755" file="linux/work/lib/libastylej.so" />
- 
-     <antcall target="portable-${portable}">
-       <param name="parentdir" value="linux/work" />
-@@ -757,15 +724,6 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_aarch64.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
-@@ -775,15 +733,6 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_386.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
-@@ -793,15 +742,6 @@
- 
-     <antcall target="build-arduino-builder" />
- 
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar-native"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_amd64.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux-jvm-noop"/>
-@@ -936,7 +876,7 @@
-   </target>
- 
-   <target name="linux-dist" depends="build"
--    description="Build .tar.xz of linux version">
-+	  description="Build .tar.xz of linux version">
- 
-     <move file="linux/work" tofile="linux/arduino-${version}" />
- 
-@@ -960,23 +900,23 @@
-   </target>
- 
-   <target name="linux32-dist" depends="linux-dist"
--    description="Build .tar.xz of linux x86_32 version" />
-+	  description="Build .tar.xz of linux x86_32 version" />
- 
-   <target name="linux64-dist" depends="linux-dist"
--    description="Build .tar.xz of linux x86_64 version" />
-+	  description="Build .tar.xz of linux x86_64 version" />
- 
-   <target name="linuxarm-dist" depends="linux-dist"
--    description="Build .tar.xz of linux armhf version" />
-+	  description="Build .tar.xz of linux armhf version" />
- 
-   <target name="linuxaarch64-dist" depends="linux-dist"
--    description="Build .tar.xz of linux aarch64 version" />
-+	  description="Build .tar.xz of linux aarch64 version" />
- 
-   <!-- - - - - - - - -->
-   <!-- Windows       -->
-   <!-- - - - - - - - -->
- 
-   <target name="windows-clean" depends="subprojects-clean"
--    description="Clean windows version">
-+	  description="Clean windows version">
-     <delete dir="windows/work" />
-     <delete>
-       <fileset dir="windows" includes="arduino-*windows*.zip"/>
-@@ -1014,8 +954,8 @@
-   </target>
- 
-   <target name="windows-build"
--    depends="revision-check, windows-checkos, subprojects-build"
--    description="Build windows version">
-+	  depends="revision-check, windows-checkos, subprojects-build"
-+	  description="Build windows version">
-     <mkdir dir="windows/work" />
-     <mkdir dir="windows/work/${staging_hardware_folder}" />
- 
-@@ -1130,12 +1070,12 @@
- 
-     <property name="launch4j.dir" value="windows/launcher/launch4j/" />
-     <taskdef name="launch4j"
--       classname="net.sf.launch4j.ant.Launch4jTask"
--       classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
-+	     classname="net.sf.launch4j.ant.Launch4jTask"
-+	     classpath="${launch4j.dir}/launch4j.jar; ${launch4j.dir}/lib/xstream.jar" />
- 
-     <copy todir="windows/work">
-       <fileset dir="windows/launcher"
--         includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini, wrapper-manifest.xml"/>
-+	       includes="application.ico, config.xml, config_debug.xml, arduino.l4j.ini, wrapper-manifest.xml"/>
-     </copy>
-     <launch4j configFile="windows/work/config.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
-     <launch4j configFile="windows/work/config_debug.xml" fileVersion="${revision}.0" txtFileVersion="${revision}" productVersion="${revision}.0" txtProductVersion="${revision}"/>
-@@ -1206,22 +1146,22 @@
-   <!-- - - - - - - - -->
- 
-    <target name="source-dist" depends="revision-check"
--    description="Build .tar.gz of source code">
-+	  description="Build .tar.gz of source code">
-     <input message="Enter version number:"
--     addproperty="version"
--     defaultvalue="${revision}" />
-+	   addproperty="version"
-+	   defaultvalue="${revision}" />
- 
-     <tar compression="gzip" destfile="arduino-${version}-src.tar.gz">
-       <tarfileset dir="../"
--      prefix="arduino-${version}"
--      excludes="**/*.tgz,
--           **/*.bz2,
--           **/build/macosx/,
--           **/build/windows/,
--           **/work/,
--           **/.git/,
--           **/*.class"
--      />
-+		  prefix="arduino-${version}"
-+		  excludes="**/*.tgz,
-+			     **/*.bz2,
-+			     **/build/macosx/,
-+			     **/build/windows/,
-+			     **/work/,
-+			     **/.git/,
-+			     **/*.class"
-+		  />
-     </tar>
- 
-     <echo>
-@@ -1239,7 +1179,7 @@
-   <!-- - - - - - - - -->
- 
-   <target name="clean" description="Perform a spring cleaning"
--    depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
-+	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
-   </target>
- 
-   <target name="avr-toolchain-bundle" unless="light_bundle">
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index 5d6531ec93fc..19daa0c1b1e8 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -1,6 +1,6 @@
 # Template file for 'arduino'
 pkgname=arduino
-version=1.8.13
+version=1.8.19
 revision=1
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=$pkgname-$version
@@ -15,7 +15,7 @@ homepage="http://arduino.cc/"
 distfiles="
  https://github.com/arduino/Arduino/archive/${version}.tar.gz
  ${SOURCEFORGE_SITE}/astyle/astyle_3.0.1_linux.tar.gz"
-checksum="2a2a7bf0a93d36dff2e27f50e490529f10ff73337d6a0b7b222fa6b1a529c9f7
+checksum="17839eb2a9bc7aeed3bb2a315898efdb3075ed605f98210b4a2d3b54199cc571
  6c3ab029e0e4a75e2e603d449014374aa8269218fdd03a4aaa46ab743b1912fd"
 nostrip=yes
 nocross="cross build lacks essential libraries"

From 637b3a173b7f31a4f59af5bf6c825b31581c83b9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Sat, 2 Apr 2022 21:46:52 -0400
Subject: [PATCH 1007/1686] apache-storm: update to 2.4.0.

---
 srcpkgs/apache-storm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/apache-storm/template b/srcpkgs/apache-storm/template
index bcb06f4ee08b..7167174dd079 100644
--- a/srcpkgs/apache-storm/template
+++ b/srcpkgs/apache-storm/template
@@ -1,14 +1,14 @@
 # Template file for 'apache-storm'
 pkgname=apache-storm
-version=2.2.0
-revision=3
+version=2.4.0
+revision=1
 depends="virtual?java-runtime python3 bash"
 short_desc="Distributed realtime computation system"
 maintainer="bougyman <bougyman@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://storm.apache.org/"
 distfiles="http://apache.osuosl.org/storm/apache-storm-${version}/apache-storm-${version}.tar.gz"
-checksum=f621163f349a8e85130bc3d2fbb34e3b08f9c039ccac5474f3724e47a3a38675
+checksum=54535c68848f05130647997f3fafe91a72bb9470a50d6d80997274d20cf1c0c6
 python_version=3
 system_accounts="storm"
 storm_homedir="/var/lib/apache-storm"

From 7ca443f1053696e161b6012d8d6d79475a0f5ad6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Tue, 22 Mar 2022 02:07:12 -0400
Subject: [PATCH 1008/1686] sunxi-tools: update to 1.4.2, adopt.

---
 srcpkgs/sunxi-tools/template | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/sunxi-tools/template b/srcpkgs/sunxi-tools/template
index f4f547c7947d..001d83851248 100644
--- a/srcpkgs/sunxi-tools/template
+++ b/srcpkgs/sunxi-tools/template
@@ -1,31 +1,17 @@
 # Template file for 'sunxi-tools'
 pkgname=sunxi-tools
-reverts=20150526_1
-version=20150226
-revision=3
-_commit=b80e7ce7bd5c2015465c2fd0e5990d47c05c7f8e
-wrksrc="$pkgname-$_commit"
-hostmakedepends="pkg-config git"
+reverts="20140125_1 20150226_1 20150226_2 20150226_3 20150526_1"
+version=1.4.2
+revision=1
+build_style="gnu-makefile"
+make_build_target="tools misc"
+make_install_target="install-tools install-misc"
+hostmakedepends="pkg-config"
 makedepends="libusb-devel"
 short_desc="Tools to help hacking Allwinner AXX (aka sunxi) based devices"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/linux-sunxi/sunxi-tools"
-distfiles="$homepage/archive/$_commit.tar.gz"
-checksum=93922d654df5153d468b0f7900f96fe858fe457894ff2dd0f5dfb5c94b65475b
-
-CFLAGS="-std=c99 -I./include"
-
-do_build() {
-	make CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
-}
-do_install() {
-	vinstall README 644 usr/share/doc/${pkgname}
-
-	for f in fexc bootinfo fel usb-boot fel-gpio pio nand-part; do
-		vbin ${f}
-	done
-	cd ${DESTDIR}/usr/bin
-	ln -s fexc fex2bin
-	ln -s fexc bin2fex
-}
+distfiles="https://github.com/linux-sunxi/sunxi-tools/archive/refs/tags/v${version}.tar.gz"
+checksum=81f48014a520cb83cac4e17f5ae627a637c4d6a422b60c693c5a705c92e43822
+make_check=no # it's a mess

From 00cc0fe527edf4f8ef324e20a6596e109d995771 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Apr 2022 19:46:43 +0200
Subject: [PATCH 1009/1686] u-boot-tools: update to 2022.04.

---
 srcpkgs/u-boot-tools/template | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index a25b02b4e512..d6aea6282b47 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -1,19 +1,19 @@
 # Template file for 'u-boot-tools'
 pkgname=u-boot-tools
-version=2022.01
+version=2022.04
 revision=1
 wrksrc="u-boot-${version}"
 build_style=gnu-makefile
-make_build_args="HOSTSTRIP=: STRIP=:"
-make_build_target="tools envtools"
-hostmakedepends="bison flex"
-makedepends="openssl-devel"
+make_build_args="HOSTSTRIP=: STRIP=: NO_SDL=1"
+make_build_target="tools-all tools-only envtools"
+hostmakedepends="bison flex which"
+makedepends="openssl-devel libuuid-devel gnutls-devel ncurses-libtinfo-devel"
 short_desc="Das U-Boot tools"
 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=81b4543227db228c03f8a1bf5ddbc813b0bb8f6555ce46064ef721a6fc680413
+checksum=68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
@@ -39,12 +39,14 @@ do_check() {
 
 do_install() {
 	ln -sf fw_printenv tools/env/fw_setenv
-	for x in dumpimage fdtgrep fit_check_sign fit_info gen_eth_addr \
-		gen_ethaddr_crc ifwitool img2srec mkenvimage mkimage proftool \
-		spl_size_limit env/fw_printenv env/fw_setenv; do
+	for x in bmp_logo dumpimage fdtgrep fit_check_sign fit_info gen_eth_addr \
+		gen_ethaddr_crc ifwitool img2srec kwboot mkeficapsule mkenvimage mkimage \
+		proftool spl_size_limit env/fw_printenv env/fw_setenv; do
 		vbin "tools/$x"
+		if [ -r "doc/${x}.1" ]; then
+			vman "doc/${x}.1"
+		fi
 	done
-	vman doc/mkimage.1
 }
 
 uboot-mkimage_package() {

From 349fd1626e029a64e64b5ff3730c9623d67775b9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:09:12 -0400
Subject: [PATCH 1010/1686] cpp-utilities: update to 5.14.0.

---
 srcpkgs/cpp-utilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 80d9c3228558..e4b44dd0bafc 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.13.0
+version=5.14.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/cpp-utilities"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=6ddca61b4ff38785a927eb5e2491e2edbf00eb8d003360f46f247cbb18eab970
+checksum=7a173bb2355a9b5fef17d3fe6795f026f58afe63b1295f8567c042422e2cde0e
 
 cpp-utilities-devel_package() {
 	short_desc+=" - development files"

From 8fc4c52dc002b553e425dcc485c110fb23395680 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:09:45 -0400
Subject: [PATCH 1011/1686] qtutilities: update to 6.6.0.

---
 srcpkgs/qtutilities/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 8a7a238bc5b4..d0e2622414d5 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
 # Template file for 'qtutilities'
 pkgname=qtutilities
-version=6.5.3
+version=6.6.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=17b5bf0db407ff1408ba1d2be6be3fc80de5dbd3fab78f6a66f55b6c4c0b6e22
+checksum=2dda37fd6e1cd957f0a2b395ce424ca23cfc893310c0cebc82d89dc960239d13
 
 qtutilities-devel_package() {
 	short_desc+=" - development files"

From ded765a10452524df6cee32ebf06f9ca859d8871 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:10:02 -0400
Subject: [PATCH 1012/1686] tagparser: update to 11.1.0.

---
 srcpkgs/tagparser/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1ca3a1761bcd..494b83e203eb 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
 # Template file for 'tagparser'
 pkgname=tagparser
-version=11.0.0
+version=11.1.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/Martchus/tagparser"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=be31354dbf3cf7342de68d28f1a0ba4bd1464e312b661383fe2b0d8abdbe3e32
+checksum=dc3bd56ee7ddd3220062d2637b89dffc27747c3027c4b223a4697d693e55e2f1
 
 tagparser-devel_package() {
 	short_desc+=" - development files"

From 603d3783f73292685e987abe807e67c6b6dba238 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:10:45 -0400
Subject: [PATCH 1013/1686] tageditor: update to 3.7.0.

---
 srcpkgs/tageditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 52b5fc0057b1..0f9ad2024a6d 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
 # Template file for 'tageditor'
 pkgname=tageditor
-version=3.6.1
+version=3.7.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/tageditor"
 distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=98ad461669e4528f6eb74d3b0c7a29401a0bb90a68bc63a4b60060ec02889b09
+checksum=e3814efdb9ca9bc386b51c602f8f4f507e8698ecdaf39a5849ed1795ddaa5c38
 
 build_options="qt webengine webkit script"
 build_options_default="qt"

From 96a975812efbc42f148c14bd10f0dd7738aeb430 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:18:38 -0400
Subject: [PATCH 1014/1686] openmpi: update to 4.1.3.

---
 srcpkgs/openmpi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template
index 1ed46e523216..08dc6cface80 100644
--- a/srcpkgs/openmpi/template
+++ b/srcpkgs/openmpi/template
@@ -1,6 +1,6 @@
 # Template file for 'openmpi'
 pkgname=openmpi
-version=4.1.2
+version=4.1.3
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --with-hwloc=${XBPS_CROSS_BASE}/usr
@@ -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=9b78c7cf7fc32131c5cf43dd2ab9740149d9d87cadb2e2189f02685749a6b527
+checksum=3d81d04c54efb55d3871a465ffb098d8d72c1f48ff1cbaf2580eb058567c0a3b
 nocross="configure attempts to run target binaries"
 lib32disabled=yes
 

From 5c87c98ed3f18cf3810ff60e9edfad9824310014 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:19:52 -0400
Subject: [PATCH 1015/1686] python3-Pillow: update to 9.1.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 7fb866d05e78..f0df1881e241 100644
--- a/srcpkgs/python3-Pillow/template
+++ b/srcpkgs/python3-Pillow/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Pillow'
 pkgname=python3-Pillow
-version=9.0.1
+version=9.1.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=6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa
+checksum=f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97
 
 post_install() {
 	vlicense LICENSE

From b60c61b527fed958d13735edf042bd945915fb31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:24:10 -0400
Subject: [PATCH 1016/1686] python3-aioamqp: update to 0.15.0.

---
 .../patches/01-python-3.10.patch              | 345 -------------
 .../patches/02-pamqp-3.1.0.patch              | 469 ------------------
 srcpkgs/python3-aioamqp/template              |   6 +-
 3 files changed, 3 insertions(+), 817 deletions(-)
 delete mode 100644 srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
 delete mode 100644 srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch

diff --git a/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch b/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
deleted file mode 100644
index 8d369bf7a6db..000000000000
--- a/srcpkgs/python3-aioamqp/patches/01-python-3.10.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-From a3ab4768a13540e8c8f566bca990a98f96cb3802 Mon Sep 17 00:00:00 2001
-From: dzen <benoit.calvez@polyconseil.fr>
-Date: Thu, 5 Mar 2020 14:40:50 +0100
-Subject: [PATCH 1/2] Support newer Python
-
-Combines upstream commits to suppress asyncio deprecations:
-- f004c52
-- 388d38f
-- 0cdfe91
-- b4f0120
-- 23d84ca
----
- .travis.yml                            |  6 ++---
- Dockerfile                             |  2 +-
- aioamqp/__init__.py                    |  4 ++--
- aioamqp/channel.py                     |  4 ++--
- aioamqp/protocol.py                    | 33 ++++++++++++++------------
- aioamqp/tests/test_basic.py            |  2 +-
- aioamqp/tests/test_connection_close.py |  2 +-
- aioamqp/tests/test_connection_lost.py  |  2 +-
- aioamqp/tests/test_protocol.py         |  4 ++--
- docs/changelog.rst                     |  4 ++++
- docs/introduction.rst                  |  2 +-
- setup.cfg                              |  2 +-
- setup.py                               |  2 +-
- tox.ini                                |  2 +-
- 14 files changed, 39 insertions(+), 32 deletions(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index 1069e7c..9d6e4ef 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -1,10 +1,10 @@
- language: python
--dist: bionic
-+dist: focal
- python:
--- 3.5
- - 3.6
--- 3.7-dev
-+- 3.7
- - 3.8
-+- 3.9
- services:
- - rabbitmq
- env:
-diff --git a/Dockerfile b/Dockerfile
-index 7ec4545..1ea92f1 100644
---- a/Dockerfile
-+++ b/Dockerfile
-@@ -1,4 +1,4 @@
--FROM python:3.5
-+FROM python:3.9
- 
- WORKDIR /usr/src/app
- 
-diff --git a/aioamqp/__init__.py b/aioamqp/__init__.py
-index 3e67936..030e7db 100644
---- a/aioamqp/__init__.py
-+++ b/aioamqp/__init__.py
-@@ -10,7 +10,7 @@ from .version import __packagename__
- 
- 
- async def connect(host='localhost', port=None, login='guest', password='guest',
--            virtualhost='/', ssl=None, login_method='AMQPLAIN', insist=False,
-+            virtualhost='/', ssl=None, login_method='PLAIN', insist=False,
-             protocol_factory=AmqpProtocol, *, loop=None, **kwargs):
-     """Convenient method to connect to an AMQP broker
- 
-@@ -69,7 +69,7 @@ async def connect(host='localhost', port=None, login='guest', password='guest',
- 
- 
- async def from_url(
--        url, login_method='AMQPLAIN', insist=False, protocol_factory=AmqpProtocol, **kwargs):
-+        url, login_method='PLAIN', insist=False, protocol_factory=AmqpProtocol, **kwargs):
-     """ Connect to the AMQP using a single url parameter and return the client.
- 
-         For instance:
-diff --git a/aioamqp/channel.py b/aioamqp/channel.py
-index 7f0f402..b58bd5a 100644
---- a/aioamqp/channel.py
-+++ b/aioamqp/channel.py
-@@ -31,7 +31,7 @@ class Channel:
-         self.cancellation_callbacks = []
-         self.return_callback = return_callback
-         self.response_future = None
--        self.close_event = asyncio.Event(loop=self._loop)
-+        self.close_event = asyncio.Event()
-         self.cancelled_consumers = set()
-         self.last_consumer_tag = None
-         self.publisher_confirms = False
-@@ -518,7 +518,7 @@ class Channel:
-         }
-         future = self._get_waiter('basic_consume' + ctag)
-         future.set_result(results)
--        self._ctag_events[ctag] = asyncio.Event(loop=self._loop)
-+        self._ctag_events[ctag] = asyncio.Event()
- 
-     async def basic_deliver(self, frame):
-         consumer_tag = frame.consumer_tag
-diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py
-index ddf1285..4938833 100644
---- a/aioamqp/protocol.py
-+++ b/aioamqp/protocol.py
-@@ -79,8 +79,8 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             self.connection_tunning['heartbeat'] = kwargs.get('heartbeat')
- 
-         self.connecting = asyncio.Future(loop=self._loop)
--        self.connection_closed = asyncio.Event(loop=self._loop)
--        self.stop_now = asyncio.Future(loop=self._loop)
-+        self.connection_closed = asyncio.Event()
-+        self.stop_now = asyncio.Event()
-         self.state = CONNECTING
-         self.version_major = None
-         self.version_minor = None
-@@ -91,14 +91,14 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         self.server_heartbeat = None
-         self._heartbeat_timer_recv = None
-         self._heartbeat_timer_send = None
--        self._heartbeat_trigger_send = asyncio.Event(loop=self._loop)
-+        self._heartbeat_trigger_send = asyncio.Event()
-         self._heartbeat_worker = None
-         self.channels = {}
-         self.server_frame_max = None
-         self.server_channel_max = None
-         self.channels_ids_ceil = 0
-         self.channels_ids_free = set()
--        self._drain_lock = asyncio.Lock(loop=self._loop)
-+        self._drain_lock = asyncio.Lock()
- 
-     def connection_made(self, transport):
-         super().connection_made(transport)
-@@ -171,16 +171,13 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             await self.wait_closed(timeout=timeout)
- 
-     async def wait_closed(self, timeout=None):
--        await asyncio.wait_for(self.connection_closed.wait(), timeout=timeout, loop=self._loop)
-+        await asyncio.wait_for(self.connection_closed.wait(), timeout=timeout)
-         if self._heartbeat_worker is not None:
-             try:
--                await asyncio.wait_for(self._heartbeat_worker, timeout=timeout, loop=self._loop)
-+                await asyncio.wait_for(self._heartbeat_worker, timeout=timeout)
-             except asyncio.CancelledError:
-                 pass
- 
--    async def close_ok(self, frame):
--        self._stream_writer.close()
--
-     async def start_connection(self, host, port, login, password, virtualhost, ssl=False,
-             login_method='PLAIN', insist=False):
-         """Initiate a connection at the protocol level
-@@ -188,7 +185,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         """
- 
-         if login_method != 'PLAIN':
--            logger.warning('only PLAIN login_method is supported, falling back to AMQPLAIN')
-+            logger.warning('login_method %s is not supported, falling back to PLAIN', login_method)
- 
-         self._stream_writer.write(amqp_constants.PROTOCOL_HEADER)
- 
-@@ -311,12 +308,12 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             channel.connection_closed(reply_code, reply_text, exception)
- 
-     async def run(self):
--        while not self.stop_now.done():
-+        while not self.stop_now.is_set():
-             try:
-                 await self.dispatch_frame()
-             except exceptions.AmqpClosedConnection as exc:
-                 logger.info("Close connection")
--                self.stop_now.set_result(None)
-+                self.stop_now.set()
- 
-                 self._close_channels(exception=exc)
-             except Exception:  # pylint: disable=broad-except
-@@ -329,7 +326,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         the rest of the AmqpProtocol class.  This is kept around for backwards
-         compatibility purposes only.
-         """
--        await self.stop_now
-+        await self.stop_now.wait()
- 
-     async def send_heartbeat(self):
-         """Sends an heartbeat message.
-@@ -403,6 +400,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         )
-         await self._write_frame(0, request)
- 
-+    async def close_ok(self, frame):
-+        """In response to server close confirmation"""
-+        self.stop_now.set()
-+        self._stream_writer.close()
-+
-     async def server_close(self, frame):
-         """The server is closing the connection"""
-         self.state = CLOSING
-@@ -414,6 +416,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-             reply_text, reply_code, class_id, method_id)
-         self._close_channels(reply_code, reply_text)
-         await self._close_ok()
-+        self.stop_now.set()
-         self._stream_writer.close()
- 
-     async def _close_ok(self):
-@@ -456,11 +459,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         await self.ensure_open()
-         try:
-             channel_id = self.channels_ids_free.pop()
--        except KeyError:
-+        except KeyError as ex:
-             assert self.server_channel_max is not None, 'connection channel-max tuning not performed'
-             # channel-max = 0 means no limit
-             if self.server_channel_max and self.channels_ids_ceil > self.server_channel_max:
--                raise exceptions.NoChannelAvailable()
-+                raise exceptions.NoChannelAvailable() from ex
-             self.channels_ids_ceil += 1
-             channel_id = self.channels_ids_ceil
-         channel = self.CHANNEL_FACTORY(self, channel_id, **kwargs)
-diff --git a/aioamqp/tests/test_basic.py b/aioamqp/tests/test_basic.py
-index d59ce19..00ec880 100644
---- a/aioamqp/tests/test_basic.py
-+++ b/aioamqp/tests/test_basic.py
-@@ -58,7 +58,7 @@ class BasicCancelTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
- 
-         result = await self.channel.publish("payload", exchange_name, routing_key='')
- 
--        await asyncio.sleep(5, loop=self.loop)
-+        await asyncio.sleep(5)
- 
-         result = await self.channel.queue_declare(queue_name, passive=True)
-         self.assertEqual(result['message_count'], 1)
-diff --git a/aioamqp/tests/test_connection_close.py b/aioamqp/tests/test_connection_close.py
-index 9491548..c5d4188 100644
---- a/aioamqp/tests/test_connection_close.py
-+++ b/aioamqp/tests/test_connection_close.py
-@@ -22,7 +22,7 @@ class CloseTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-             # TODO: remove with python <3.4.4 support
-             self.assertTrue(transport._closing)
-         # make sure those 2 tasks/futures are properly set as finished
--        await amqp.stop_now
-+        await amqp.stop_now.wait()
-         await amqp.worker
- 
-     async def test_multiple_close(self):
-diff --git a/aioamqp/tests/test_connection_lost.py b/aioamqp/tests/test_connection_lost.py
-index 21c7819..d16d51b 100644
---- a/aioamqp/tests/test_connection_lost.py
-+++ b/aioamqp/tests/test_connection_lost.py
-@@ -24,7 +24,7 @@ class ConnectionLostTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-         self.assertEqual(amqp.state, OPEN)
-         self.assertTrue(channel.is_open)
-         amqp._stream_reader._transport.close()  # this should have the same effect as the tcp connection being lost
--        await asyncio.wait_for(amqp.worker, 1, loop=self.loop)
-+        await asyncio.wait_for(amqp.worker, 1)
-         self.assertEqual(amqp.state, CLOSED)
-         self.assertFalse(channel.is_open)
-         self.assertTrue(self.callback_called)
-diff --git a/aioamqp/tests/test_protocol.py b/aioamqp/tests/test_protocol.py
-index 766a5d9..80d4187 100644
---- a/aioamqp/tests/test_protocol.py
-+++ b/aioamqp/tests/test_protocol.py
-@@ -55,7 +55,7 @@ class ProtocolTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-             connect.assert_called_once_with(
-                 insist=False,
-                 password='pass',
--                login_method='AMQPLAIN',
-+                login_method='PLAIN',
-                 login='tom',
-                 host='example.com',
-                 protocol_factory=AmqpProtocol,
-@@ -74,7 +74,7 @@ class ProtocolTestCase(testcase.RabbitTestCaseMixin, asynctest.TestCase):
-             connect.assert_called_once_with(
-                 insist=False,
-                 password='pass',
--                login_method='AMQPLAIN',
-+                login_method='PLAIN',
-                 ssl=ssl_context,
-                 login='tom',
-                 host='example.com',
-diff --git a/docs/changelog.rst b/docs/changelog.rst
-index 0939ca4..8ac4f7b 100644
---- a/docs/changelog.rst
-+++ b/docs/changelog.rst
-@@ -4,6 +4,10 @@ Changelog
- Next release
- ------------
- 
-+ * Add support for Python 3.9.
-+ * Drop support for Python 3.5.
-+ * Fix annoying auth method warning because of a wrong defined default argument (closes #214).
-+
- Aioamqp 0.14.0
- --------------
- 
-diff --git a/docs/introduction.rst b/docs/introduction.rst
-index ec86f61..d0e183a 100644
---- a/docs/introduction.rst
-+++ b/docs/introduction.rst
-@@ -7,7 +7,7 @@ Aioamqp library is a pure-Python implementation of the AMQP 0.9.1 protocol using
- Prerequisites
- -------------
- 
--Aioamqp works only with python >= 3.5 using asyncio library.
-+Aioamqp works only with python >= 3.6 using asyncio library.
- 
- Installation
- ------------
-diff --git a/setup.cfg b/setup.cfg
-index 0ab7d0b..9a9f5ab 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,2 +1,2 @@
- [bdist_wheel]
--python-tag = py35.py36.py37.py38
-+python-tag = py36.py37.py38.py39
-diff --git a/setup.py b/setup.py
-index a740243..ea0e79f 100644
---- a/setup.py
-+++ b/setup.py
-@@ -34,10 +34,10 @@ setuptools.setup(
-         "Operating System :: OS Independent",
-         "Programming Language :: Python",
-         "Programming Language :: Python :: 3",
--        "Programming Language :: Python :: 3.5",
-         "Programming Language :: Python :: 3.6",
-         "Programming Language :: Python :: 3.7",
-         "Programming Language :: Python :: 3.8",
-+        "Programming Language :: Python :: 3.9",
-     ],
-     platforms='all',
-     license='BSD'
-diff --git a/tox.ini b/tox.ini
-index 127cc7b..a1f5fcd 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -1,5 +1,5 @@
- [tox]
--envlist = py35, py36, py37, py38
-+envlist = py36, py37, py38, py39
- skipsdist = true
- skip_missing_interpreters = true
- 
--- 
-2.34.1
-
diff --git a/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch b/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch
deleted file mode 100644
index 6f604f6746e4..000000000000
--- a/srcpkgs/python3-aioamqp/patches/02-pamqp-3.1.0.patch
+++ /dev/null
@@ -1,469 +0,0 @@
-From bb59736dc0127f3bd5b632d0531058f7d98384f1 Mon Sep 17 00:00:00 2001
-From: dzen <benoit.calvez@polyconseil.fr>
-Date: Thu, 12 Mar 2020 08:32:29 +0100
-Subject: [PATCH 2/2] Require pamqp 3.1.0
-
-Combines upstream commits:
-- 6de2e1a
-- 95cb160
-- 9f08434
----
- aioamqp/channel.py        | 114 +++++++++++++++++++-------------------
- aioamqp/frame.py          |   1 -
- aioamqp/properties.py     |   6 +-
- aioamqp/protocol.py       |  22 ++++----
- aioamqp/tests/testcase.py |   2 +-
- setup.py                  |   3 +-
- 6 files changed, 76 insertions(+), 72 deletions(-)
-
-diff --git a/aioamqp/channel.py b/aioamqp/channel.py
-index b58bd5a..b87392d 100644
---- a/aioamqp/channel.py
-+++ b/aioamqp/channel.py
-@@ -9,7 +9,7 @@ import io
- from itertools import count
- import warnings
- 
--import pamqp.specification
-+import pamqp.commands
- 
- from . import frame as amqp_frame
- from . import exceptions
-@@ -78,35 +78,35 @@ class Channel:
- 
-     async def dispatch_frame(self, frame):
-         methods = {
--            pamqp.specification.Channel.OpenOk.name: self.open_ok,
--            pamqp.specification.Channel.FlowOk.name: self.flow_ok,
--            pamqp.specification.Channel.CloseOk.name: self.close_ok,
--            pamqp.specification.Channel.Close.name: self.server_channel_close,
--
--            pamqp.specification.Exchange.DeclareOk.name: self.exchange_declare_ok,
--            pamqp.specification.Exchange.BindOk.name: self.exchange_bind_ok,
--            pamqp.specification.Exchange.UnbindOk.name: self.exchange_unbind_ok,
--            pamqp.specification.Exchange.DeleteOk.name: self.exchange_delete_ok,
--
--            pamqp.specification.Queue.DeclareOk.name: self.queue_declare_ok,
--            pamqp.specification.Queue.DeleteOk.name: self.queue_delete_ok,
--            pamqp.specification.Queue.BindOk.name: self.queue_bind_ok,
--            pamqp.specification.Queue.UnbindOk.name: self.queue_unbind_ok,
--            pamqp.specification.Queue.PurgeOk.name: self.queue_purge_ok,
--
--            pamqp.specification.Basic.QosOk.name: self.basic_qos_ok,
--            pamqp.specification.Basic.ConsumeOk.name: self.basic_consume_ok,
--            pamqp.specification.Basic.CancelOk.name: self.basic_cancel_ok,
--            pamqp.specification.Basic.GetOk.name: self.basic_get_ok,
--            pamqp.specification.Basic.GetEmpty.name: self.basic_get_empty,
--            pamqp.specification.Basic.Deliver.name: self.basic_deliver,
--            pamqp.specification.Basic.Cancel.name: self.server_basic_cancel,
--            pamqp.specification.Basic.Ack.name: self.basic_server_ack,
--            pamqp.specification.Basic.Nack.name: self.basic_server_nack,
--            pamqp.specification.Basic.RecoverOk.name: self.basic_recover_ok,
--            pamqp.specification.Basic.Return.name: self.basic_return,
--
--            pamqp.specification.Confirm.SelectOk.name: self.confirm_select_ok,
-+            pamqp.commands.Channel.OpenOk.name: self.open_ok,
-+            pamqp.commands.Channel.FlowOk.name: self.flow_ok,
-+            pamqp.commands.Channel.CloseOk.name: self.close_ok,
-+            pamqp.commands.Channel.Close.name: self.server_channel_close,
-+
-+            pamqp.commands.Exchange.DeclareOk.name: self.exchange_declare_ok,
-+            pamqp.commands.Exchange.BindOk.name: self.exchange_bind_ok,
-+            pamqp.commands.Exchange.UnbindOk.name: self.exchange_unbind_ok,
-+            pamqp.commands.Exchange.DeleteOk.name: self.exchange_delete_ok,
-+
-+            pamqp.commands.Queue.DeclareOk.name: self.queue_declare_ok,
-+            pamqp.commands.Queue.DeleteOk.name: self.queue_delete_ok,
-+            pamqp.commands.Queue.BindOk.name: self.queue_bind_ok,
-+            pamqp.commands.Queue.UnbindOk.name: self.queue_unbind_ok,
-+            pamqp.commands.Queue.PurgeOk.name: self.queue_purge_ok,
-+
-+            pamqp.commands.Basic.QosOk.name: self.basic_qos_ok,
-+            pamqp.commands.Basic.ConsumeOk.name: self.basic_consume_ok,
-+            pamqp.commands.Basic.CancelOk.name: self.basic_cancel_ok,
-+            pamqp.commands.Basic.GetOk.name: self.basic_get_ok,
-+            pamqp.commands.Basic.GetEmpty.name: self.basic_get_empty,
-+            pamqp.commands.Basic.Deliver.name: self.basic_deliver,
-+            pamqp.commands.Basic.Cancel.name: self.server_basic_cancel,
-+            pamqp.commands.Basic.Ack.name: self.basic_server_ack,
-+            pamqp.commands.Basic.Nack.name: self.basic_server_nack,
-+            pamqp.commands.Basic.RecoverOk.name: self.basic_recover_ok,
-+            pamqp.commands.Basic.Return.name: self.basic_return,
-+
-+            pamqp.commands.Confirm.SelectOk.name: self.confirm_select_ok,
-         }
- 
-         if frame.name not in methods:
-@@ -144,7 +144,7 @@ class Channel:
- 
-     async def open(self):
-         """Open the channel on the server."""
--        request = pamqp.specification.Channel.Open()
-+        request = pamqp.commands.Channel.Open()
-         return (await self._write_frame_awaiting_response(
-             'open', self.channel_id, request, no_wait=False, check_open=False))
- 
-@@ -159,7 +159,7 @@ class Channel:
-         if not self.is_open:
-             raise exceptions.ChannelClosed("channel already closed or closing")
-         self.close_event.set()
--        request = pamqp.specification.Channel.Close(reply_code, reply_text, class_id=0, method_id=0)
-+        request = pamqp.commands.Channel.Close(reply_code, reply_text, class_id=0, method_id=0)
-         return (await self._write_frame_awaiting_response(
-             'close', self.channel_id, request, no_wait=False, check_open=False))
- 
-@@ -169,7 +169,7 @@ class Channel:
-         self.protocol.release_channel_id(self.channel_id)
- 
-     async def _send_channel_close_ok(self):
--        request = pamqp.specification.Channel.CloseOk()
-+        request = pamqp.commands.Channel.CloseOk()
-         await self._write_frame(self.channel_id, request)
- 
-     async def server_channel_close(self, frame):
-@@ -183,7 +183,7 @@ class Channel:
-         self.connection_closed(results['reply_code'], results['reply_text'])
- 
-     async def flow(self, active):
--        request = pamqp.specification.Channel.Flow(active)
-+        request = pamqp.commands.Channel.Flow(active)
-         return (await self._write_frame_awaiting_response(
-             'flow', self.channel_id, request, no_wait=False,
-             check_open=False))
-@@ -201,7 +201,7 @@ class Channel:
- 
-     async def exchange_declare(self, exchange_name, type_name, passive=False, durable=False,
-                          auto_delete=False, no_wait=False, arguments=None):
--        request = pamqp.specification.Exchange.Declare(
-+        request = pamqp.commands.Exchange.Declare(
-             exchange=exchange_name,
-             exchange_type=type_name,
-             passive=passive,
-@@ -222,7 +222,7 @@ class Channel:
-         return future
- 
-     async def exchange_delete(self, exchange_name, if_unused=False, no_wait=False):
--        request = pamqp.specification.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait)
-+        request = pamqp.commands.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait)
-         return await self._write_frame_awaiting_response(
-             'exchange_delete', self.channel_id, request, no_wait)
- 
-@@ -235,7 +235,7 @@ class Channel:
-                       no_wait=False, arguments=None):
-         if arguments is None:
-             arguments = {}
--        request = pamqp.specification.Exchange.Bind(
-+        request = pamqp.commands.Exchange.Bind(
-             destination=exchange_destination,
-             source=exchange_source,
-             routing_key=routing_key,
-@@ -255,7 +255,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Exchange.Unbind(
-+        request = pamqp.commands.Exchange.Unbind(
-             destination=exchange_destination,
-             source=exchange_source,
-             routing_key=routing_key,
-@@ -297,7 +297,7 @@ class Channel:
- 
-         if not queue_name:
-             queue_name = 'aioamqp.gen-' + str(uuid.uuid4())
--        request = pamqp.specification.Queue.Declare(
-+        request = pamqp.commands.Queue.Declare(
-             queue=queue_name,
-             passive=passive,
-             durable=durable,
-@@ -327,7 +327,7 @@ class Channel:
-                if_empty:       bool, the queue is deleted if it has no messages. Raise if not.
-                no_wait:        bool, if set, the server will not respond to the method
-         """
--        request = pamqp.specification.Queue.Delete(
-+        request = pamqp.commands.Queue.Delete(
-             queue=queue_name,
-             if_unused=if_unused,
-             if_empty=if_empty,
-@@ -346,7 +346,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Queue.Bind(
-+        request = pamqp.commands.Queue.Bind(
-             queue=queue_name,
-             exchange=exchange_name,
-             routing_key=routing_key,
-@@ -367,7 +367,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Queue.Unbind(
-+        request = pamqp.commands.Queue.Unbind(
-             queue=queue_name,
-             exchange=exchange_name,
-             routing_key=routing_key,
-@@ -383,7 +383,7 @@ class Channel:
-         logger.debug("Queue unbound")
- 
-     async def queue_purge(self, queue_name, no_wait=False):
--        request = pamqp.specification.Queue.Purge(
-+        request = pamqp.commands.Queue.Purge(
-             queue=queue_name, nowait=no_wait
-         )
-         return (await self._write_frame_awaiting_response(
-@@ -406,7 +406,7 @@ class Channel:
-         if properties is None:
-             properties = {}
- 
--        method_request = pamqp.specification.Basic.Publish(
-+        method_request = pamqp.commands.Basic.Publish(
-             exchange=exchange_name,
-             routing_key=routing_key,
-             mandatory=mandatory,
-@@ -417,7 +417,7 @@ class Channel:
- 
-         header_request = pamqp.header.ContentHeader(
-             body_size=len(payload),
--            properties=pamqp.specification.Basic.Properties(**properties)
-+            properties=pamqp.commands.Basic.Properties(**properties)
-         )
-         await self._write_frame(self.channel_id, header_request, drain=False)
- 
-@@ -446,7 +446,7 @@ class Channel:
-                                 settings should apply per-consumer channel; and global=true to mean
-                                 that the QoS settings should apply per-channel.
-         """
--        request = pamqp.specification.Basic.Qos(
-+        request = pamqp.commands.Basic.Qos(
-             prefetch_size, prefetch_count, connection_global
-         )
-         return (await self._write_frame_awaiting_response(
-@@ -490,7 +490,7 @@ class Channel:
-         if arguments is None:
-             arguments = {}
- 
--        request = pamqp.specification.Basic.Consume(
-+        request = pamqp.commands.Basic.Consume(
-             queue=queue_name,
-             consumer_tag=consumer_tag,
-             no_local=no_local,
-@@ -561,7 +561,7 @@ class Channel:
-                              callback, error)
- 
-     async def basic_cancel(self, consumer_tag, no_wait=False):
--        request = pamqp.specification.Basic.Cancel(consumer_tag, no_wait)
-+        request = pamqp.commands.Basic.Cancel(consumer_tag, no_wait)
-         return (await self._write_frame_awaiting_response(
-             'basic_cancel', self.channel_id, request, no_wait=no_wait)
-         )
-@@ -575,7 +575,7 @@ class Channel:
-         logger.debug("Cancel ok")
- 
-     async def basic_get(self, queue_name='', no_ack=False):
--        request = pamqp.specification.Basic.Get(queue=queue_name, no_ack=no_ack)
-+        request = pamqp.commands.Basic.Get(queue=queue_name, no_ack=no_ack)
-         return (await self._write_frame_awaiting_response(
-             'basic_get', self.channel_id, request, no_wait=False)
-         )
-@@ -606,11 +606,11 @@ class Channel:
-         future.set_exception(exceptions.EmptyQueue)
- 
-     async def basic_client_ack(self, delivery_tag, multiple=False):
--        request = pamqp.specification.Basic.Ack(delivery_tag, multiple)
-+        request = pamqp.commands.Basic.Ack(delivery_tag, multiple)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_client_nack(self, delivery_tag, multiple=False, requeue=True):
--        request = pamqp.specification.Basic.Nack(delivery_tag, multiple, requeue)
-+        request = pamqp.commands.Basic.Nack(delivery_tag, multiple, requeue)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_server_ack(self, frame):
-@@ -620,15 +620,15 @@ class Channel:
-         fut.set_result(True)
- 
-     async def basic_reject(self, delivery_tag, requeue=False):
--        request = pamqp.specification.Basic.Reject(delivery_tag, requeue)
-+        request = pamqp.commands.Basic.Reject(delivery_tag, requeue)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_recover_async(self, requeue=True):
--        request = pamqp.specification.Basic.RecoverAsync(requeue)
-+        request = pamqp.commands.Basic.RecoverAsync(requeue)
-         await self._write_frame(self.channel_id, request)
- 
-     async def basic_recover(self, requeue=True):
--        request = pamqp.specification.Basic.Recover(requeue)
-+        request = pamqp.commands.Basic.Recover(requeue)
-         return (await self._write_frame_awaiting_response(
-             'basic_recover', self.channel_id, request, no_wait=False)
-         )
-@@ -681,7 +681,7 @@ class Channel:
-             delivery_tag = next(self.delivery_tag_iter)  # pylint: disable=stop-iteration-return
-             fut = self._set_waiter('basic_server_ack_{}'.format(delivery_tag))
- 
--        method_request = pamqp.specification.Basic.Publish(
-+        method_request = pamqp.commands.Basic.Publish(
-             exchange=exchange_name,
-             routing_key=routing_key,
-             mandatory=mandatory,
-@@ -689,7 +689,7 @@ class Channel:
-         )
-         await self._write_frame(self.channel_id, method_request, drain=False)
- 
--        properties = pamqp.specification.Basic.Properties(**properties)
-+        properties = pamqp.commands.Basic.Properties(**properties)
-         header_request = pamqp.header.ContentHeader(
-             body_size=len(payload), properties=properties
-         )
-@@ -710,7 +710,7 @@ class Channel:
-     async def confirm_select(self, *, no_wait=False):
-         if self.publisher_confirms:
-             raise ValueError('publisher confirms already enabled')
--        request = pamqp.specification.Confirm.Select(nowait=no_wait)
-+        request = pamqp.commands.Confirm.Select(nowait=no_wait)
- 
-         return (await self._write_frame_awaiting_response(
-             'confirm_select', self.channel_id, request, no_wait)
-diff --git a/aioamqp/frame.py b/aioamqp/frame.py
-index d70cfd7..af27ab5 100644
---- a/aioamqp/frame.py
-+++ b/aioamqp/frame.py
-@@ -42,7 +42,6 @@ import asyncio
- import socket
- 
- import pamqp.encode
--import pamqp.specification
- import pamqp.frame
- 
- from . import exceptions
-diff --git a/aioamqp/properties.py b/aioamqp/properties.py
-index 56a3484..4232040 100644
---- a/aioamqp/properties.py
-+++ b/aioamqp/properties.py
-@@ -1,4 +1,6 @@
- # pylint: disable=redefined-builtin
-+import datetime
-+
- from .constants import MESSAGE_PROPERTIES
- 
- 
-@@ -37,7 +39,9 @@ def from_pamqp(instance):
-     props.reply_to = instance.reply_to
-     props.expiration = instance.expiration
-     props.message_id = instance.message_id
--    props.timestamp = instance.timestamp
-+    if instance.timestamp is not None:
-+        # pamqp uses naive datetimes representing UTC, let's use TZ-aware datetimes
-+        props.timestamp = instance.timestamp.replace(tzinfo=datetime.timezone.utc)
-     props.message_type = instance.message_type
-     props.user_id = instance.user_id
-     props.app_id = instance.app_id
-diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py
-index 4938833..6465400 100644
---- a/aioamqp/protocol.py
-+++ b/aioamqp/protocol.py
-@@ -5,9 +5,9 @@
- import asyncio
- import logging
- 
-+import pamqp.commands
- import pamqp.frame
- import pamqp.heartbeat
--import pamqp.specification
- 
- from . import channel as amqp_channel
- from . import constants as amqp_constants
-@@ -159,7 +159,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         """Close connection (and all channels)"""
-         await self.ensure_open()
-         self.state = CLOSING
--        request = pamqp.specification.Connection.Close(
-+        request = pamqp.commands.Connection.Close(
-             reply_code=0,
-             reply_text='',
-             class_id=0,
-@@ -251,11 +251,11 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         """Dispatch the received frame to the corresponding handler"""
- 
-         method_dispatch = {
--            pamqp.specification.Connection.Close.name: self.server_close,
--            pamqp.specification.Connection.CloseOk.name: self.close_ok,
--            pamqp.specification.Connection.Tune.name: self.tune,
--            pamqp.specification.Connection.Start.name: self.start,
--            pamqp.specification.Connection.OpenOk.name: self.open_ok,
-+            pamqp.commands.Connection.Close.name: self.server_close,
-+            pamqp.commands.Connection.CloseOk.name: self.close_ok,
-+            pamqp.commands.Connection.Tune.name: self.tune,
-+            pamqp.commands.Connection.Start.name: self.start,
-+            pamqp.commands.Connection.OpenOk.name: self.open_ok,
-         }
-         if frame_channel is None and frame is None:
-             frame_channel, frame = await self.get_frame()
-@@ -392,7 +392,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         def credentials():
-             return '\0{LOGIN}\0{PASSWORD}'.format(**auth)
- 
--        request = pamqp.specification.Connection.StartOk(
-+        request = pamqp.commands.Connection.StartOk(
-             client_properties=client_properties,
-             mechanism=mechanism,
-             locale=locale,
-@@ -420,7 +420,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         self._stream_writer.close()
- 
-     async def _close_ok(self):
--        request = pamqp.specification.Connection.CloseOk()
-+        request = pamqp.commands.Connection.CloseOk()
-         await self._write_frame(0, request)
- 
-     async def tune(self, frame):
-@@ -429,7 +429,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
-         self.server_heartbeat = frame.heartbeat
- 
-     async def tune_ok(self, channel_max, frame_max, heartbeat):
--        request = pamqp.specification.Connection.TuneOk(
-+        request = pamqp.commands.Connection.TuneOk(
-             channel_max, frame_max, heartbeat
-         )
-         await self._write_frame(0, request)
-@@ -439,7 +439,7 @@ class AmqpProtocol(asyncio.StreamReaderProtocol):
- 
-     async def open(self, virtual_host, capabilities='', insist=False):
-         """Open connection to virtual host."""
--        request = pamqp.specification.Connection.Open(
-+        request = pamqp.commands.Connection.Open(
-             virtual_host, capabilities, insist
-         )
-         await self._write_frame(0, request)
-diff --git a/aioamqp/tests/testcase.py b/aioamqp/tests/testcase.py
-index 120104b..d6d702b 100644
---- a/aioamqp/tests/testcase.py
-+++ b/aioamqp/tests/testcase.py
-@@ -147,7 +147,7 @@ class RabbitTestCaseMixin:
-         if amqp is None:
-             amqp = self.amqp
- 
--        server_version = tuple(int(x) for x in amqp.server_properties['version'].decode().split('.'))
-+        server_version = tuple(int(x) for x in amqp.server_properties['version'].split('.'))
-         return server_version
- 
-     async def check_exchange_exists(self, exchange_name):
-diff --git a/setup.py b/setup.py
-index ea0e79f..1d0e923 100644
---- a/setup.py
-+++ b/setup.py
-@@ -25,8 +25,9 @@ setuptools.setup(
-         'aioamqp',
-     ],
-     install_requires=[
--        'pamqp>=2.2.0,<3',
-+        'pamqp>=3.1.0',
-     ],
-+    python_requires=">=3.6",
-     classifiers=[
-         "Development Status :: 4 - Beta",
-         "Intended Audience :: Developers",
--- 
-2.34.1
-
diff --git a/srcpkgs/python3-aioamqp/template b/srcpkgs/python3-aioamqp/template
index e85e1bcdf143..63f195e85343 100644
--- a/srcpkgs/python3-aioamqp/template
+++ b/srcpkgs/python3-aioamqp/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-aioamqp'
 pkgname=python3-aioamqp
-version=0.14.0
-revision=4
+version=0.15.0
+revision=1
 wrksrc="aioamqp-aioamqp-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/polyconseil/aioamqp"
 distfiles="${homepage}/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=9fce69be1ed9bcc06b74683094f738556305215a1affd0fd7789c23a01c53ecd
+checksum=4d30fe210c742496b5b78de0337f49524571240701eb6c2dc348b1b9d8f819a9
 # Tests require unpackaged asynctest package
 make_check=no
 

From cc955012e9cefdcbd916dcff508158950c9c90bd Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 21:32:20 -0400
Subject: [PATCH 1017/1686] python3-hypothesis: update to 6.41.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 df2addcb45d0..d214e0ec6b62 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.40.0
+version=6.41.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=e68589666b903461e7437ea49043a7bd09a6e2cfd1cc32970b4ee19ffe2ed434
+checksum=0fa002e65956bedead5149d2ffa5875cbcb5ca1a3f95301fcf2ad5a241829d91
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From f0a13b809b08f3878ccc1c2f62ce6b66524738c5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 22:43:05 -0400
Subject: [PATCH 1018/1686] python3-pandas: update to 1.4.2.

---
 srcpkgs/python3-pandas/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pandas/template b/srcpkgs/python3-pandas/template
index c538445fc056..b1f2f60e6da7 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.4.1
+version=1.4.2
 revision=1
 wrksrc="pandas-${version}"
 build_style=python3-module
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
 homepage="https://pandas.pydata.org/"
 changelog="https://pandas.pydata.org/pandas-docs/stable/whatsnew/index.html"
 distfiles="https://github.com/pandas-dev/pandas/archive/v${version}.tar.gz"
-checksum=123bf45a5d7fbd2980d2e4c348f6913406970f1558658e7f221324234c6c4825
+checksum=e2d97255e7cd13b3d3931b49f7be50055e02ca6dff60a68e403b125f8f85c4d2
 
 pre_build() {
 	# setup.py allows a -j argument to parallelize builds
@@ -26,8 +26,8 @@ do_check() {
 	# S3 tests seem to require python3-pytest-xdist
 	PYTHONPATH="$(cd build/lib* && pwd)" python3 -m pytest pandas \
 		--skip-slow --skip-network --skip-db -x -r EX \
-		--ignore pandas/tests/io/parser/test_network.py \
-		-m 'not single' -k 'not test_raw_roundtrip and not _s3'
+		--ignore pandas/tests/io/parser/test_network.py -m 'not single' \
+		-k 'not test_raw_roundtrip and not _s3 and not test_show_versions'
 }
 
 post_install() {

From 72190eb452963f2a6b74ecced8fe22a614683b01 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 5 Apr 2022 22:45:13 -0400
Subject: [PATCH 1019/1686] python3-pybind11: update to 2.9.2.

---
 srcpkgs/python3-pybind11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pybind11/template b/srcpkgs/python3-pybind11/template
index 9d757b052b81..b0d551b293e4 100644
--- a/srcpkgs/python3-pybind11/template
+++ b/srcpkgs/python3-pybind11/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pybind11'
 pkgname=python3-pybind11
-version=2.9.1
+version=2.9.2
 revision=1
 wrksrc="pybind11-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/pybind/pybind11"
 distfiles="https://github.com/pybind/pybind11/archive/v${version}.tar.gz"
-checksum=c6160321dc98e6e1184cc791fbeadd2907bb4a0ce0e447f2ea4ff8ab56550913
+checksum=6bd528c4dbe2276635dc787b6b1f2e5316cf6b49ee3e150264e455a0d68d19c1
 
 post_patch() {
 	# These dependencies are not packaged and don't affect the man page

From 3c3c85fb1f9215db8583269d3a9e549bf9718981 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Apr 2022 11:45:56 -0400
Subject: [PATCH 1020/1686] python3-prompt_toolkit: update to 3.0.29.

---
 .../patches/dont-handle-sigint.patch          | 51 +++++++++++++++++--
 srcpkgs/python3-prompt_toolkit/template       |  6 +--
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch b/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch
index 60ce287a63d1..4bcca9d16921 100644
--- a/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch
+++ b/srcpkgs/python3-prompt_toolkit/patches/dont-handle-sigint.patch
@@ -5,9 +5,10 @@ See:
  - https://github.com/prompt-toolkit/python-prompt-toolkit/issues/1576
  - https://trac.sagemath.org/ticket/33360#comment:3
 
---- a/prompt_toolkit/application/application.py	2022-02-11 05:06:37.000000000 -0300
-+++ b/prompt_toolkit/application/application.py	2022-02-21 10:43:13.828058001 -0300
-@@ -634,7 +634,7 @@
+diff -ur a/src/prompt_toolkit/application/application.py b/src/prompt_toolkit/application/application.py
+--- a/src/prompt_toolkit/application/application.py
++++ b/src/prompt_toolkit/application/application.py
+@@ -633,7 +633,7 @@
          self,
          pre_run: Optional[Callable[[], None]] = None,
          set_exception_handler: bool = True,
@@ -16,7 +17,7 @@ See:
          slow_callback_duration: float = 0.5,
      ) -> _AppResult:
          """
-@@ -859,7 +859,7 @@
+@@ -858,7 +858,7 @@
          self,
          pre_run: Optional[Callable[[], None]] = None,
          set_exception_handler: bool = True,
@@ -25,3 +26,45 @@ See:
          in_thread: bool = False,
      ) -> _AppResult:
          """
+diff -ur a/src/prompt_toolkit/application/dummy.py b/src/prompt_toolkit/application/dummy.py
+--- a/src/prompt_toolkit/application/dummy.py
++++ b/src/prompt_toolkit/application/dummy.py
+@@ -24,7 +24,7 @@
+         self,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+         in_thread: bool = False,
+     ) -> None:
+         raise NotImplementedError("A DummyApplication is not supposed to run.")
+@@ -33,7 +33,7 @@
+         self,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+         slow_callback_duration: float = 0.5,
+     ) -> None:
+         raise NotImplementedError("A DummyApplication is not supposed to run.")
+diff -ur a/src/prompt_toolkit/shortcuts/prompt.py b/src/prompt_toolkit/shortcuts/prompt.py
+--- a/src/prompt_toolkit/shortcuts/prompt.py
++++ b/src/prompt_toolkit/shortcuts/prompt.py
+@@ -900,7 +900,7 @@
+         accept_default: bool = False,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+         in_thread: bool = False,
+     ) -> _T:
+         """
+@@ -1135,7 +1135,7 @@
+         accept_default: bool = False,
+         pre_run: Optional[Callable[[], None]] = None,
+         set_exception_handler: bool = True,
+-        handle_sigint: bool = True,
++        handle_sigint: bool = False,
+     ) -> _T:
+ 
+         if message is not None:
diff --git a/srcpkgs/python3-prompt_toolkit/template b/srcpkgs/python3-prompt_toolkit/template
index 26bcb33e82bc..27fdeb83dab2 100644
--- a/srcpkgs/python3-prompt_toolkit/template
+++ b/srcpkgs/python3-prompt_toolkit/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-prompt_toolkit'
 pkgname=python3-prompt_toolkit
-version=3.0.28
-revision=2
+version=3.0.29
+revision=1
 wrksrc="prompt_toolkit-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://github.com/prompt-toolkit/python-prompt-toolkit"
 changelog="https://raw.githubusercontent.com/prompt-toolkit/python-prompt-toolkit/master/CHANGELOG"
 distfiles="${PYPI_SITE}/p/prompt_toolkit/prompt_toolkit-${version}.tar.gz"
-checksum=9f1cd16b1e86c2968f2519d7fb31dd9d669916f515612c269d14e9ed52b51650
+checksum=bd640f60e8cecd74f0dc249713d433ace2ddc62b65ee07f96d358e0b152b6ea7
 conflicts="python3-prompt_toolkit2<=2.0.9_4"
 
 post_install() {

From b4ed39ac8bbe150967c39646ebca93df26c87234 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 6 Apr 2022 11:50:08 -0400
Subject: [PATCH 1021/1686] python3-ultrajson: update to 5.2.0.

---
 .../python3-ultrajson/patches/no-strip.patch    | 17 -----------------
 srcpkgs/python3-ultrajson/template              |  6 ++++--
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/python3-ultrajson/patches/no-strip.patch

diff --git a/srcpkgs/python3-ultrajson/patches/no-strip.patch b/srcpkgs/python3-ultrajson/patches/no-strip.patch
deleted file mode 100644
index 50fb8f8339c3..000000000000
--- a/srcpkgs/python3-ultrajson/patches/no-strip.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Effectively reverts
-
-    https://github.com/ultrajson/ultrajson/commit/682c6601569980e9a8a05378d3c1478db30384bc
-
-to preserve a meaningful debug package.
-
---- a/setup.py
-+++ b/setup.py
-@@ -20,7 +20,7 @@
-     ],
-     include_dirs=["./python", "./lib", "./deps/double-conversion/double-conversion"],
-     extra_compile_args=["-D_GNU_SOURCE"],
--    extra_link_args=["-lstdc++", "-lm"] + strip_flags,
-+    extra_link_args=["-lstdc++", "-lm"],
- )
- 
- with open("python/version_template.h") as f:
diff --git a/srcpkgs/python3-ultrajson/template b/srcpkgs/python3-ultrajson/template
index 848f27d41e56..e7b0dd021f5a 100644
--- a/srcpkgs/python3-ultrajson/template
+++ b/srcpkgs/python3-ultrajson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ultrajson'
 pkgname=python3-ultrajson
-version=5.1.0
+version=5.2.0
 revision=1
 wrksrc="ujson-${version}"
 build_style=python3-module
@@ -13,7 +13,9 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/ultrajson/ultrajson"
 distfiles="${PYPI_SITE}/u/ujson/ujson-${version}.tar.gz"
-checksum=a88944d2f99db71a3ca0c63d81f37e55b660edde0b07216fb65a3e46403ef004
+checksum=163191b88842d874e081707d35de2e205e0e396e70fd068d1038879bca8b17ad
+
+export UJSON_BUILD_NO_STRIP=1
 
 post_install() {
 	vlicense LICENSE.txt

From a3f0e9e8013030a40fda4d93637b37f9d81505db Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Apr 2022 20:58:09 +0200
Subject: [PATCH 1022/1686] u-boot-tools: fix cross and musl builds

---
 srcpkgs/u-boot-tools/patches/musl.patch | 10 ++++++++++
 srcpkgs/u-boot-tools/template           |  5 +++++
 2 files changed, 15 insertions(+)
 create mode 100644 srcpkgs/u-boot-tools/patches/musl.patch

diff --git a/srcpkgs/u-boot-tools/patches/musl.patch b/srcpkgs/u-boot-tools/patches/musl.patch
new file mode 100644
index 000000000000..7cf89c52b8fb
--- /dev/null
+++ b/srcpkgs/u-boot-tools/patches/musl.patch
@@ -0,0 +1,10 @@
+--- a/tools/termios_linux.h
++++ b/tools/termios_linux.h
+@@ -30,6 +30,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <asm/termbits.h>
++#include <asm/ioctls.h>
+ 
+ #if defined(BOTHER) && defined(TCGETS2)
+ #define termios termios2
diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index d6aea6282b47..e7efda468852 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -17,6 +17,7 @@ checksum=68e065413926778e276ec3abd28bb32fa82abaa4a6898d570c1f48fbdb08bcd0
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_BUILD_TOOLS=y CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
+	hostmakedepends+=" u-boot-tools"
 fi
 
 post_extract() {
@@ -25,6 +26,10 @@ post_extract() {
 		-i include/env.h \
 		-i tools/mkimage.h \
 		-i tools/proftool.c
+
+	if [ "$CROSS_BUILD" ]; then
+		vsed -e 's;^\t$(obj)/bmp_logo;\tbmp_logo;g' -i tools/Makefile
+	fi
 }
 
 do_configure() {

From 3fa723207af0a95050b4e9e9ba96af3602e08288 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 6 Apr 2022 21:29:45 +0200
Subject: [PATCH 1023/1686] u-boot-tools: fix parallel build issues

---
 srcpkgs/u-boot-tools/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index e7efda468852..e3908d65dfc1 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -36,6 +36,12 @@ do_configure() {
 	make ${makejobs} ${make_build_args} tools-only_defconfig
 }
 
+do_build() {
+	make ${makejobs} ${make_build_args} tools-all
+	make ${makejobs} ${make_build_args} tools-only
+	make ${makejobs} ${make_build_args} envtools
+}
+
 do_check() {
 	# skip tests for now. requires some gymnastics to make the python scripts
 	# find libfdt. the most useful target appears to be "make tcheck"

From 6f8d78ccfc4e4f43d8d4307f49abe361dd1e0674 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Apr 2022 22:12:49 +0200
Subject: [PATCH 1024/1686] pylint: update to 2.13.5.

---
 srcpkgs/pylint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 54af1e2f085d..2d53ba7420f1 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,6 +1,6 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.13.4
+version=2.13.5
 revision=1
 build_style=python3-module
 make_check_args="--deselect=tests/benchmark/test_baseline_benchmarks.py"
@@ -15,7 +15,7 @@ license="GPL-2.0-or-later"
 homepage="https://www.pylint.org/"
 changelog="https://raw.githubusercontent.com/PyCQA/pylint/master/ChangeLog"
 distfiles="https://github.com/PyCQA/pylint/archive/refs/tags/v$version.tar.gz"
-checksum=34a5550bfe94f4ba04eee95367572224bc16dbd2456b3ece5fb92e15399f6cd8
+checksum=5450fd8014baf1663fb4860b7e1dc4f4c4eb9649598a210d68e97be0973c783f
 
 post_install() {
 	# install example config and emacs files

From b61b6e5e586ed08b025a4c4a264d668194343a3e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 6 Apr 2022 22:17:27 +0200
Subject: [PATCH 1025/1686] lagrange: update to 1.12.1.

---
 srcpkgs/lagrange/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lagrange/template b/srcpkgs/lagrange/template
index 41a9f935f8eb..16787f411ee0 100644
--- a/srcpkgs/lagrange/template
+++ b/srcpkgs/lagrange/template
@@ -1,6 +1,6 @@
 # Template file for 'lagrange'
 pkgname=lagrange
-version=1.11.2
+version=1.12.1
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config zip"
@@ -12,7 +12,7 @@ license="BSD-2-Clause"
 homepage="https://gmi.skyjake.fi/lagrange/"
 changelog="https://git.skyjake.fi/skyjake/lagrange/raw/branch/dev/res/about/version.gmi"
 distfiles="https://git.skyjake.fi/skyjake/lagrange/releases/download/v$version/lagrange-$version.tar.gz"
-checksum=4e9a9ed38bcfc7b04856f0e2667d7afd535a8e06e367e2e4368ef5fb9105791f
+checksum=8a342d9b7e980cd6d9771d72215dd543d411721685fb60fc2202e300cb5d6483
 
 post_install() {
 	vlicense LICENSE.md

From 9ecc0d2323fc8c367736ed59c1e62837da4cdb1f Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Thu, 31 Mar 2022 18:41:05 +0200
Subject: [PATCH 1026/1686] instaloader: update to 4.9.

---
 srcpkgs/instaloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/instaloader/template b/srcpkgs/instaloader/template
index 2252042b2091..9c5bed15f2ea 100644
--- a/srcpkgs/instaloader/template
+++ b/srcpkgs/instaloader/template
@@ -1,6 +1,6 @@
 # Template file for 'instaloader'
 pkgname=instaloader
-version=4.8.4
+version=4.9
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
 license="MIT"
 homepage="https://instaloader.github.io"
 distfiles="${PYPI_SITE}/i/instaloader/instaloader-${version}.tar.gz"
-checksum=9615a12a5a01a8b6c9d99a2a047b21d81b341cfd77656b9261bda30ece0cd562
+checksum=7fa6147810eedcc1dedcdec8cfa1f220c9379ab8faeab6a336a7c181d944e2e4
 
 post_install() {
 	vlicense LICENSE

From 9c69aa04946bd2ca958ceef43ba5356cfd98d1e7 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sun, 3 Apr 2022 16:22:31 +0200
Subject: [PATCH 1027/1686] pipe-viewer: update to 0.2.0.

---
 srcpkgs/pipe-viewer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipe-viewer/template b/srcpkgs/pipe-viewer/template
index 3797428bc415..670d4181ab17 100644
--- a/srcpkgs/pipe-viewer/template
+++ b/srcpkgs/pipe-viewer/template
@@ -1,6 +1,6 @@
 # Template file for 'pipe-viewer'
 pkgname=pipe-viewer
-version=0.1.8
+version=0.2.0
 revision=1
 build_style=perl-ModuleBuild
 configure_args="--gtk"
@@ -14,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=b8f722cdddf0686bb75676b5baa850c1101b54f9c32f562eaac04a6e1863fb8d
+checksum=3913ecfaa3006f645603fb76df9962829138ca62d4b0acaf8b8d4d2e58902f64
 
 pipe-viewer-gtk_package() {
 	depends="${sourcepkg}>=${version}_${revision} perl-Gtk3 perl-File-ShareDir"

From c8d81af562aef6bfa6b2e3a0e05c3179812d88bf Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Mon, 4 Apr 2022 20:44:14 -0700
Subject: [PATCH 1028/1686] runc: update to 1.1.1

---
 srcpkgs/runc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/runc/template b/srcpkgs/runc/template
index 2e40b2647d20..182e20b99857 100644
--- a/srcpkgs/runc/template
+++ b/srcpkgs/runc/template
@@ -1,6 +1,6 @@
 # Template file for 'runc'
 pkgname=runc
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=go
 go_import_path=github.com/opencontainers/runc
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/opencontainers/runc"
 distfiles="https://github.com/opencontainers/runc/releases/download/v${version}/runc.tar.xz"
-checksum=152e8975793aa45a6717e367bd1652f8147728d25adad339d2f70c4fd2ddc623
+checksum=75c1f0bb19b209412c52599e24b33ac306cf7caf772c97577b7ebe964837a54b
 
 post_build() {
 	make man

From 1f43bcfff0848dbe095476c4a8ad748466bd6375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sun, 3 Apr 2022 21:57:24 +0200
Subject: [PATCH 1029/1686] sslscan: update to 2.0.13.

---
 srcpkgs/sslscan/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sslscan/template b/srcpkgs/sslscan/template
index 6d9ceca254a2..2c19a8a0dc7d 100644
--- a/srcpkgs/sslscan/template
+++ b/srcpkgs/sslscan/template
@@ -1,6 +1,6 @@
 # Template file for 'sslscan'
 pkgname=sslscan
-version=2.0.12
+version=2.0.13
 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=6eeda19f564635818d6dd20a1e93174484d62acb24eca8944df07496d32b9c65
+checksum=34549613e16ba5dbfca3d988672041b7b0ece6f408515d6ba8819e2d804b5833
 # No test suite
 make_check=no

From 9d54979e6e938e3b43add100f076e2391be1b0f3 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 14:40:04 -0700
Subject: [PATCH 1030/1686] python3-pluggy: update to 1.0.0

---
 srcpkgs/python3-pluggy/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template
index efaa7e25d2a7..fa49c9826db0 100644
--- a/srcpkgs/python3-pluggy/template
+++ b/srcpkgs/python3-pluggy/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pluggy'
 pkgname=python3-pluggy
-version=0.13.1
-revision=7
+version=1.0.0
+revision=1
 wrksrc="pluggy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
@@ -12,9 +12,12 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="MIT"
 homepage="https://github.com/pytest-dev/pluggy"
 distfiles="${PYPI_SITE}/p/pluggy/pluggy-${version}.tar.gz"
-checksum=15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0
+checksum=4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159
 
 do_check() {
+	# Must export PYTHONPATH so subprocesses see the variable
+	local _pypath="${PYTHONPATH}"
+	export PYTHONPATH="${PWD}/src:${PYTHONPATH}"
 	python3 -m pytest
 }
 

From e03135123b9baec2a127e4ca4e315ed9d466d4fb Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:54:44 -0700
Subject: [PATCH 1031/1686] New package: python3-lsp-jsonrpc-1.0.0

---
 srcpkgs/python3-lsp-jsonrpc/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-lsp-jsonrpc/template

diff --git a/srcpkgs/python3-lsp-jsonrpc/template b/srcpkgs/python3-lsp-jsonrpc/template
new file mode 100644
index 000000000000..1455aa108797
--- /dev/null
+++ b/srcpkgs/python3-lsp-jsonrpc/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-lsp-jsonrpc'
+pkgname=python3-lsp-jsonrpc
+version=1.0.0
+revision=1
+wrksrc="${pkgname/3}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-ultrajson"
+checkdepends="python3-pytest python3-pytest-cov"
+short_desc="Python server implementation of the JSON RPC 2.0 protocol"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="MIT"
+homepage="https://github.com/python-lsp/python-lsp-jsonrpc"
+distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
+checksum=7bec170733db628d3506ea3a5288ff76aa33c70215ed223abdb0d95e957660bd
+
+post_install() {
+	vlicense LICENSE
+}
+
+do_check() {
+	python3 -m pytest --ignore=test/test_streams.py
+}

From b486f7aba837c8a9ef801b99a521eeadaa891a81 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:53:38 -0700
Subject: [PATCH 1032/1686] New package: python3-lsp-server-1.4.1

Substitute for python3-language-server

Fixes #34192
---
 srcpkgs/python3-language-server               |  1 +
 .../patches/jedi_compat.patch                 | 37 -----------------
 srcpkgs/python3-language-server/template      | 30 --------------
 srcpkgs/python3-lsp-server/template           | 40 +++++++++++++++++++
 4 files changed, 41 insertions(+), 67 deletions(-)
 create mode 120000 srcpkgs/python3-language-server
 delete mode 100644 srcpkgs/python3-language-server/patches/jedi_compat.patch
 delete mode 100644 srcpkgs/python3-language-server/template
 create mode 100644 srcpkgs/python3-lsp-server/template

diff --git a/srcpkgs/python3-language-server b/srcpkgs/python3-language-server
new file mode 120000
index 000000000000..9054a5e99f7e
--- /dev/null
+++ b/srcpkgs/python3-language-server
@@ -0,0 +1 @@
+python3-lsp-server
\ No newline at end of file
diff --git a/srcpkgs/python3-language-server/patches/jedi_compat.patch b/srcpkgs/python3-language-server/patches/jedi_compat.patch
deleted file mode 100644
index 52e7e3c59abe..000000000000
--- a/srcpkgs/python3-language-server/patches/jedi_compat.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/palantir/python-language-server/pull/901
-
-From: bnavigator <code@bnavigator.de>
-Date: Tue, 5 Jan 2021 01:17:33 +0100
-Subject: [PATCH] bump jedi compatibility: compare to Path-like object
-
----
- pyls/plugins/symbols.py | 2 +-
- setup.py                | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pyls/plugins/symbols.py b/pyls/plugins/symbols.py
-index 6468dd83..69a09fe9 100644
---- a/pyls/plugins/symbols.py
-+++ b/pyls/plugins/symbols.py
-@@ -37,7 +37,7 @@ def pyls_document_symbols(config, document):
-                         not sym_full_name.startswith('__main__')):
-                     continue
-
--        if _include_def(d) and document.path == d.module_path:
-+        if _include_def(d) and os.path.samefile(document.path, d.module_path):
-             tuple_range = _tuple_range(d)
-             if tuple_range in exclude:
-                 continue
-diff --git a/setup.py b/setup.py
-index 12782990..99d2b312 100755
---- a/setup.py
-+++ b/setup.py
-@@ -10,7 +10,7 @@
-         'configparser; python_version<"3.0"',
-         'future>=0.14.0; python_version<"3"',
-         'backports.functools_lru_cache; python_version<"3.2"',
--        'jedi>=0.17.2,<0.18.0',
-+        'jedi>=0.17.2,<0.19.0',
-         'python-jsonrpc-server>=0.4.0',
-         'pluggy',
-         'ujson<=2.0.3 ; platform_system!="Windows" and python_version<"3.0"',
diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template
deleted file mode 100644
index a443ec3fb514..000000000000
--- a/srcpkgs/python3-language-server/template
+++ /dev/null
@@ -1,30 +0,0 @@
-# Template file for 'python3-language-server'
-pkgname=python3-language-server
-version=0.36.2
-revision=1
-wrksrc="${pkgname/3}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson
- python3-setuptools"
-checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib
- python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle
- python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov
- python3-yapf"
-short_desc="Python implementation of the Language Server Protocol"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://github.com/palantir/python-language-server"
-distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
-checksum=9984c84a67ee2c5102c8e703215f407fcfa5e62b0ae86c9572d0ada8c4b417b0
-# Needs unpackaged rope and versioneer
-# https://github.com/palantir/python-language-server/blob/develop/setup.py#L51
-make_check=no
-
-post_patch() {
-	vsed -i setup.py -e 's/\bujson<=1.35\b/ujson/'
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/python3-lsp-server/template b/srcpkgs/python3-lsp-server/template
new file mode 100644
index 000000000000..cda7c928052a
--- /dev/null
+++ b/srcpkgs/python3-lsp-server/template
@@ -0,0 +1,40 @@
+# Template file for 'python3-lsp-server'
+pkgname=python3-lsp-server
+version=1.4.1
+revision=1
+wrksrc="${pkgname/3}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm python3-wheel"
+depends="python3-jedi python3-pluggy python3-lsp-jsonrpc python3-ultrajson
+ python3-setuptools"
+checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib
+ python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle
+ python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov
+ python3-yapf flake8"
+short_desc="Python implementation of the Language Server Protocol"
+maintainer="Cameron Nemo <cnemo@tutanota.com>"
+license="MIT"
+homepage="https://github.com/python-lsp/python-lsp-server"
+distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
+checksum=be7f83298af9f0951a93972cafc9db04fd7cf5c05f20812515275f0ba70e342f
+
+do_check() {
+	python3 -m pytest \
+		--ignore=test/plugins/test_completion.py \
+		--ignore=test/plugins/test_pydocstyle_lint.py \
+		--ignore=test/plugins/test_rope_rename.py
+}
+
+post_install() {
+	vlicense LICENSE
+	ln -s pylsp "${DESTDIR}/usr/bin/pyls"
+}
+
+python3-language-server_package() {
+	build_style=meta
+	depends="python3-lsp-server>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	pkg_install() {
+		vmove usr/bin/pyls
+	}
+}

From d80ea0bdf27ff87f722bf476dc15345c3af85c34 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sat, 2 Apr 2022 11:52:16 -0700
Subject: [PATCH 1033/1686] python3-jsonrpc-server: remove package

---
 srcpkgs/python3-jsonrpc-server/template | 22 ----------------------
 srcpkgs/removed-packages/template       |  3 ++-
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/python3-jsonrpc-server/template

diff --git a/srcpkgs/python3-jsonrpc-server/template b/srcpkgs/python3-jsonrpc-server/template
deleted file mode 100644
index de96976ad0a2..000000000000
--- a/srcpkgs/python3-jsonrpc-server/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'python3-jsonrpc-server'
-pkgname=python3-jsonrpc-server
-version=0.4.0
-revision=2
-wrksrc="${pkgname/3}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-ultrajson"
-short_desc="Python library implementing asynchronous JSON RPC server"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://github.com/palantir/python-jsonrpc-server"
-distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz"
-checksum=62c543e541f101ec5b57dc654efc212d2c2e3ea47ff6f54b2e7dcb36ecf20595
-
-post_patch() {
-	vsed -i setup.py -e 's/\bujson<=1\.35\b/ujson/'
-}
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index d5a5e66b8b1a..a76ad553cbf3 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=67
+revision=68
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -325,6 +325,7 @@ replaces="
  python3-docker-pycreds<=0.4.0_4
  python3-grako<=3.99.9_7
  python3-idna-ssl<=1.1.0_3
+ python3-jsonrpc-server<=0.4.0_2
  python3-keepalive<=0.5_6
  python3-pgpdump<=1.5_10
  python3-lockfile<=0.12.2_7

From 9472cf06801a94781dc9ac08d3e769ce263fb446 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 22 Mar 2022 20:47:59 +0100
Subject: [PATCH 1034/1686] dhcpcd: fix 'dhcpcd_open: Bad File Descriptor' with
 dhcpcd-qt.

---
 srcpkgs/dhcpcd/patches/revert-eloop.patch | 150 ++++++++++++++++++++++
 srcpkgs/dhcpcd/template                   |   2 +-
 2 files changed, 151 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dhcpcd/patches/revert-eloop.patch

diff --git a/srcpkgs/dhcpcd/patches/revert-eloop.patch b/srcpkgs/dhcpcd/patches/revert-eloop.patch
new file mode 100644
index 000000000000..e41beb84b62b
--- /dev/null
+++ b/srcpkgs/dhcpcd/patches/revert-eloop.patch
@@ -0,0 +1,150 @@
+From 2b4fe4c12b5d4366ff21fabf3a6c3799f8e4fa53 Mon Sep 17 00:00:00 2001
+From: Roy Marples <roy@marples.name>
+Date: Fri, 12 Nov 2021 16:24:32 +0000
+Subject: [PATCH] Revert "eloop: Allow eloop to process all fds returned from
+ poll(2)"
+
+This stops dumping leases when privsep is compiled out.
+This change works fine on master, but we also have eloop using
+more of a native poll(2) style interface.
+Easier for now to just revert this on the dhcpcd-9 branch.
+
+This reverts commit fe2b82eec25da908c3a1a71c2dc2402d9ff70e31.
+---
+ src/eloop.c | 56 ++++++++++++++++-------------------------------------
+ 1 file changed, 17 insertions(+), 39 deletions(-)
+
+diff --git a/src/eloop.c b/src/eloop.c
+index a6ab43fb..c3330817 100644
+--- a/src/eloop.c
++++ b/src/eloop.c
+@@ -32,7 +32,6 @@
+ #include <errno.h>
+ #include <limits.h>
+ #include <poll.h>
+-#include <stdbool.h>
+ #include <signal.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+@@ -137,7 +136,6 @@ struct eloop {
+ 	TAILQ_HEAD (event_head, eloop_event) events;
+ 	size_t nevents;
+ 	struct event_head free_events;
+-	bool events_need_setup;
+ 
+ 	struct timespec now;
+ 	TAILQ_HEAD (timeout_head, eloop_timeout) timeouts;
+@@ -284,16 +282,11 @@ eloop_reduce_timers(struct eloop *eloop)
+ static void
+ eloop_event_setup_fds(struct eloop *eloop)
+ {
+-	struct eloop_event *e, *ne;
++	struct eloop_event *e;
+ 	struct pollfd *pfd;
+ 
+ 	pfd = eloop->fds;
+-	TAILQ_FOREACH_SAFE(e, &eloop->events, next, ne) {
+-		if (e->fd == -1) {
+-			TAILQ_REMOVE(&eloop->events, e, next);
+-			TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
+-			continue;
+-		}
++	TAILQ_FOREACH(e, &eloop->events, next) {
+ #ifdef ELOOP_DEBUG
+ 		fprintf(stderr, "%s(%d) fd=%d, rcb=%p, wcb=%p\n",
+ 		    __func__, getpid(), e->fd, e->read_cb, e->write_cb);
+@@ -308,7 +301,6 @@ eloop_event_setup_fds(struct eloop *eloop)
+ 		pfd->revents = 0;
+ 		pfd++;
+ 	}
+-	eloop->events_need_setup = false;
+ }
+ 
+ size_t
+@@ -376,8 +368,7 @@ eloop_event_add_rw(struct eloop *eloop, int fd,
+ 	}
+ 
+ setup:
+-	e->pollfd = NULL;
+-	eloop->events_need_setup = true;
++	eloop_event_setup_fds(eloop);
+ 	return 0;
+ }
+ 
+@@ -403,10 +394,6 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
+ 	struct eloop_event *e;
+ 
+ 	assert(eloop != NULL);
+-	if (fd == -1) {
+-		errno = EINVAL;
+-		return -1;
+-	}
+ 
+ 	TAILQ_FOREACH(e, &eloop->events, next) {
+ 		if (e->fd == fd)
+@@ -422,17 +409,16 @@ eloop_event_delete_write(struct eloop *eloop, int fd, int write_only)
+ 			goto remove;
+ 		e->write_cb = NULL;
+ 		e->write_cb_arg = NULL;
+-		if (e->pollfd != NULL) {
+-			e->pollfd->events &= ~POLLOUT;
+-			e->pollfd->revents &= ~POLLOUT;
+-		}
+-		return 1;
++		goto done;
+ 	}
+ 
+ remove:
+-	e->fd = -1;
++	TAILQ_REMOVE(&eloop->events, e, next);
++	TAILQ_INSERT_TAIL(&eloop->free_events, e, next);
+ 	eloop->nevents--;
+-	eloop->events_need_setup = true;
++
++done:
++	eloop_event_setup_fds(eloop);
+ 	return 1;
+ }
+ 
+@@ -750,9 +736,6 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
+ 		} else
+ 			tsp = NULL;
+ 
+-		if (eloop->events_need_setup)
+-			eloop_event_setup_fds(eloop);
+-
+ 		n = ppoll(eloop->fds, (nfds_t)eloop->nevents, tsp, signals);
+ 		if (n == -1) {
+ 			if (errno == EINTR)
+@@ -763,23 +746,18 @@ eloop_start(struct eloop *eloop, sigset_t *signals)
+ 			continue;
+ 
+ 		TAILQ_FOREACH(e, &eloop->events, next) {
+-			/* Skip freshly added events */
+-			if (e->pollfd == NULL)
+-				continue;
+-			if (e->pollfd->revents)
+-				n--;
+-			if (e->fd != -1 && e->pollfd->revents & POLLOUT) {
+-				if (e->write_cb != NULL)
++			if (e->pollfd->revents & POLLOUT) {
++				if (e->write_cb != NULL) {
+ 					e->write_cb(e->write_cb_arg);
++					break;
++				}
+ 			}
+-			if (e->fd != -1 &&
+-			    e->pollfd != NULL && e->pollfd->revents)
+-			{
+-				if (e->read_cb != NULL)
++			if (e->pollfd->revents) {
++				if (e->read_cb != NULL) {
+ 					e->read_cb(e->read_cb_arg);
++					break;
++				}
+ 			}
+-			if (n == 0)
+-				break;
+ 		}
+ 	}
+ 
diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template
index 12be60c1efcf..0d26c1abfa5a 100644
--- a/srcpkgs/dhcpcd/template
+++ b/srcpkgs/dhcpcd/template
@@ -1,7 +1,7 @@
 # Template file for 'dhcpcd'
 pkgname=dhcpcd
 version=9.4.1
-revision=1
+revision=2
 build_style=configure
 make_check_target=test
 configure_args="

From c7bd86639f11669bc358ce2712985079435b4c90 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Apr 2022 23:33:07 +0200
Subject: [PATCH 1035/1686] hwloc: update to 2.7.1.

---
 srcpkgs/hwloc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/hwloc/template b/srcpkgs/hwloc/template
index e96886b6cf50..52e01d23fb13 100644
--- a/srcpkgs/hwloc/template
+++ b/srcpkgs/hwloc/template
@@ -1,6 +1,6 @@
 # Template file for 'hwloc'
 pkgname=hwloc
-version=2.6.0
+version=2.7.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=e1f073e44e28c296ff848dead5e9bd6e2426b77f95ead1792358958e859fa83a
+checksum=0d4e1d36c3a72c5d61901bfd477337f5a4c7e0a975da57165237d00e35ef528d
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*|ppc64*) makedepends+=" libnuma-devel";;

From 62f785798a85386722907f14ac8ddcfbed329ec2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 6 Apr 2022 23:35:26 +0200
Subject: [PATCH 1036/1686] bmake: update to 20220330.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 19c6c5aa3505..5eac7a6f158f 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20220303
+version=20220330
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=793754b93fec97a0cf6cade0b0ad597bb7ea5057fd24311d4a562432df3e91cb
+checksum=4b46d95b6ae4b3311ba805ff7d5a19b9e37ac0e86880e296e2111f565b545092
 python_version=3
 
 do_configure() {

From 964dcf80ad5b161afb56a35d26935616aedf3337 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:40:06 -0500
Subject: [PATCH 1037/1686] Amass: update to 3.19.1.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 993c17d52c1c..9293dab01c93 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.19.0
+version=3.19.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=539c2207f844c81cc9a6286e436f26a1fc0690bf424ea1885844dd33002b7ef6
+checksum=259dbef81ca63ceb85113c0f741c9212bacbac653bca2cd3e8022b256d08d426

From 46dd62dabf90acdd210f559a6391f112f5caa5cf Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:41:08 -0500
Subject: [PATCH 1038/1686] python3-rich: update to 12.2.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 c394edfbeade..c3de71a5749a 100644
--- a/srcpkgs/python3-rich/template
+++ b/srcpkgs/python3-rich/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-rich'
 pkgname=python3-rich
-version=12.0.1
+version=12.2.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=3fba9dd15ebe048e2795a02ac19baee79dc12cc50b074ef70f2958cd651b59a9
+checksum=ea74bc9dad9589d8eea3e3fd0b136d8bf6e428888955f215824c2894f0da8b47
 make_check=extended # some checks only work on windows
 
 post_install() {

From 7c755f6ffb4056a376d6776e3282dbb01f740178 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:43:25 -0500
Subject: [PATCH 1039/1686] ffuf: update to 1.4.1.

---
 srcpkgs/ffuf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ffuf/template b/srcpkgs/ffuf/template
index 6ceffafb0e55..26f037749914 100644
--- a/srcpkgs/ffuf/template
+++ b/srcpkgs/ffuf/template
@@ -1,6 +1,6 @@
 # Template file for 'ffuf'
 pkgname=ffuf
-version=1.4.0
+version=1.4.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=cc741088f15b5cfdeb596f1630a015cce0b4b112dc6daf857cd9878e7a1734c1
+checksum=89b4bd4b3bbad7402d9c81d0d9f21b679c80d0a19bb9a190e45e395736058889
 
 post_install() {
 	vlicense LICENSE

From d37bb77b525a2d7cebd01e03a9f4e110a962dc11 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:54:30 -0500
Subject: [PATCH 1040/1686] python3-youtubesearch: update to 1.6.4.

---
 srcpkgs/python3-youtubesearch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-youtubesearch/template b/srcpkgs/python3-youtubesearch/template
index 3d88fc1126aa..822d7eb70ee4 100644
--- a/srcpkgs/python3-youtubesearch/template
+++ b/srcpkgs/python3-youtubesearch/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-youtubesearch'
 pkgname=python3-youtubesearch
-version=1.6.3
+version=1.6.4
 revision=1
 wrksrc="youtube-search-python-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/alexmercerind/youtube-search-python"
 distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz"
-checksum=bdb34757c5e390c4d20989d04317acbceffa94293693cbeecb493b079440dbd3
+checksum=a9dcc4536fd839beb29b12d93e59fb92b294a0d83b94b882b16a445158d1f8da
 make_check=no # no tests defined
 
 post_install() {

From eebeef9b769fd109bf428c7554039511309b569d Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 6 Apr 2022 16:55:41 -0500
Subject: [PATCH 1041/1686] sqlmap: update to 1.6.4.

---
 srcpkgs/sqlmap/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sqlmap/template b/srcpkgs/sqlmap/template
index c77f23f03939..74ce3a2ca71e 100644
--- a/srcpkgs/sqlmap/template
+++ b/srcpkgs/sqlmap/template
@@ -1,6 +1,6 @@
 # Template file for 'sqlmap'
 pkgname=sqlmap
-version=1.6.3
+version=1.6.4
 revision=1
 pycompile_dirs="usr/libexec/sqlmap"
 depends="python3"
@@ -9,7 +9,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://sqlmap.org"
 distfiles="https://github.com/sqlmapproject/sqlmap/archive/${version}.tar.gz"
-checksum=a099cde73f57ba9e70ad7dd2f7473202a02929766471fc5701f64f2c16b304c2
+checksum=14585e4fc95006467e52685c4838f024654d7e23cbd84eb12762a55918b8d561
 python_version=3
 
 do_install() {

From a9c2379fabdb528304ca9ab9afec6d7af60dcc91 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 18:54:35 -0400
Subject: [PATCH 1042/1686] base-files: add plugdev group

Plugdev is used by many packages' udev rules for pluggable devices.
Currently, some of those packages use the system_groups trigger to add it,
some forget to add it, and others patch it to "users" or "uaccess"
(which breaks the packages on systems that don't use logind).

By adding plugdev to the default groups, we get rid of those problems.
---
 srcpkgs/base-files/files/group | 1 +
 srcpkgs/base-files/template    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/base-files/files/group b/srcpkgs/base-files/files/group
index 0797f31c14d9..b4e61903105c 100644
--- a/srcpkgs/base-files/files/group
+++ b/srcpkgs/base-files/files/group
@@ -22,6 +22,7 @@ scanner:x:20:
 network:x:21:
 kvm:x:24:
 input:x:25:
+plugdev:x:26:
 nogroup:x:99:
 users:x:100:
 xbuilder:x:101:
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 758cd54ad147..bf7b7ef242b0 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
 # Template file for 'base-files'
 pkgname=base-files
 version=0.142
-revision=11
+revision=12
 bootstrap=yes
 depends="xbps-triggers"
 short_desc="Void Linux base system files"
@@ -29,7 +29,7 @@ conf_files="
 
 replaces="base-directories>=0"
 # New system groups
-system_groups="kvm:24"
+system_groups="kvm:24 plugdev:26"
 
 do_install() {
 	# Create bin and lib dirs and symlinks.

From f524358fb1f4dba048b8b30a67fcf162def89d01 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 19:17:56 -0400
Subject: [PATCH 1043/1686] openocd: drop system_groups

Now that we have plugdev as a system group, we don't need to create it here.
---
 srcpkgs/openocd/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/openocd/template b/srcpkgs/openocd/template
index 3c45ba54dd59..5537a78575c3 100644
--- a/srcpkgs/openocd/template
+++ b/srcpkgs/openocd/template
@@ -1,7 +1,7 @@
 # Template file for 'openocd'
 pkgname=openocd
 version=0.11.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="
  --disable-werror
@@ -49,8 +49,6 @@ homepage="http://openocd.org/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d
 
-system_groups="plugdev"
-
 CFLAGS="-fcommon"
 
 post_install() {

From ed6b07111ae6a958d97b9fa627a9a889546680f4 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 19:23:15 -0400
Subject: [PATCH 1044/1686] wally-udev-rules: drop system_groups trigger

Now that we have plugdev as a system group, we don't need to create it here.
We also no longer need that INSTALL.msg
---
 srcpkgs/wally-udev-rules/INSTALL.msg | 3 ---
 srcpkgs/wally-udev-rules/template    | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 srcpkgs/wally-udev-rules/INSTALL.msg

diff --git a/srcpkgs/wally-udev-rules/INSTALL.msg b/srcpkgs/wally-udev-rules/INSTALL.msg
deleted file mode 100644
index 6313b5615bad..000000000000
--- a/srcpkgs/wally-udev-rules/INSTALL.msg
+++ /dev/null
@@ -1,3 +0,0 @@
-Please add your user to the group 'plugdev' by executing the following:
-
-usermod -aG plugdev "$USER"
diff --git a/srcpkgs/wally-udev-rules/template b/srcpkgs/wally-udev-rules/template
index 83f37457047b..173a99733c56 100644
--- a/srcpkgs/wally-udev-rules/template
+++ b/srcpkgs/wally-udev-rules/template
@@ -1,7 +1,7 @@
 # Template file for 'wally-udev-rules'
 pkgname=wally-udev-rules
 version=2.1.1
-revision=1
+revision=2
 build_style=fetch
 short_desc="Set of udev rules for ZSA keyboards, for usage with wally and oryx"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
@@ -14,7 +14,6 @@ checksum="6c7d4d27745080269115c58c4c5d863b23c534635975f3bca581c52687721c52
  269c9196bc65b2e62be549e3d34e56768fe702ff099b7780a1661ca4c92a0143
  d2841d63f4e0bdfda102390ab1ca09136230d22f88538863b24b0c7fc68e548e"
 conf_files="/usr/lib/udev/rules.d/50-wally.rules /usr/lib/udev/rules.d/50-oryx.rules"
-system_groups="plugdev"
 
 do_install() {
 	vlicense license.md

From 55533ec8395055d80ac33a5fbb91f1ba26adc6bd Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sat, 19 Mar 2022 19:30:36 -0400
Subject: [PATCH 1045/1686] openrazer-meta: drop system_groups trigger

Now that we have plugdev as a system group, we don't need to create it here.
---
 srcpkgs/openrazer-meta/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/openrazer-meta/template b/srcpkgs/openrazer-meta/template
index 5713a84bbd15..3cd401cb9878 100644
--- a/srcpkgs/openrazer-meta/template
+++ b/srcpkgs/openrazer-meta/template
@@ -1,7 +1,7 @@
 # Template file for 'openrazer-meta'
 pkgname=openrazer-meta
 version=3.0.1
-revision=2
+revision=3
 wrksrc="openrazer-${version}"
 build_style=gnu-makefile
 make_install_target="setup_dkms udev_install daemon_install xdg_install
@@ -36,7 +36,6 @@ openrazer-driver-dkms_package() {
 	short_desc="Kernel driver for Razer devices (DKMS-variant)"
 	depends="dkms"
 	dkms_modules="openrazer-driver $version"
-	system_groups="plugdev"
 	pkg_install() {
 		vmove usr/lib/udev
 		vmove usr/src

From f334e2ccaef6b99001fce5be9a925fff4d3a7295 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 6 Apr 2022 14:03:21 -0400
Subject: [PATCH 1046/1686] elasticsearch: remove package

- last updated in 2017
- contained vulnerable log4j
- licence is a mess
---
 srcpkgs/elasticsearch/INSTALL                 | 14 -----
 srcpkgs/elasticsearch/files/elasticsearch/run |  3 --
 srcpkgs/elasticsearch/template                | 52 -------------------
 srcpkgs/elasticsearch/update                  |  1 -
 srcpkgs/removed-packages/template             |  1 +
 5 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 srcpkgs/elasticsearch/INSTALL
 delete mode 100755 srcpkgs/elasticsearch/files/elasticsearch/run
 delete mode 100644 srcpkgs/elasticsearch/template
 delete mode 100644 srcpkgs/elasticsearch/update

diff --git a/srcpkgs/elasticsearch/INSTALL b/srcpkgs/elasticsearch/INSTALL
deleted file mode 100644
index 622fb85bda9a..000000000000
--- a/srcpkgs/elasticsearch/INSTALL
+++ /dev/null
@@ -1,14 +0,0 @@
-# INSTALL
-case "$ACTION" in
-post)
-    if [ "$UPDATE" != "yes" ]; then
-        # actions to execute if package is being installed.
-        install -d usr/share/elasticsearch/plugins
-        install -d -m0750 var/log/elasticsearch
-        install -d -m0750 var/lib/elasticsearch/data
-        chown -R elastic etc/elasticsearch
-        chown -R elastic var/lib/elasticsearch/data
-        chown -R elastic var/log/elasticsearch
-    fi
-    ;;
-esac
diff --git a/srcpkgs/elasticsearch/files/elasticsearch/run b/srcpkgs/elasticsearch/files/elasticsearch/run
deleted file mode 100755
index 6b04b1770817..000000000000
--- a/srcpkgs/elasticsearch/files/elasticsearch/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. /etc/profile # to pull in java path
-exec chpst -u elastic elasticsearch 2>&1
diff --git a/srcpkgs/elasticsearch/template b/srcpkgs/elasticsearch/template
deleted file mode 100644
index a149578d682c..000000000000
--- a/srcpkgs/elasticsearch/template
+++ /dev/null
@@ -1,52 +0,0 @@
-# Template file for 'elasticsearch'
-pkgname=elasticsearch
-version=5.1.2
-revision=2
-wrksrc="elasticsearch-${version}"
-# The only native part is libjnidispatch.so inside jna-*.jar, which is supplied
-# only for a few archs, namely arm (armv6l and better), aarch64, ppc64le, x86,
-# and x86_64; ppc64 is also supplied but elfv1 only, and all only for glibc.
-# We could recompile this, but someone would need to add code to do that.
-archs="i686 x86_64 aarch64 armv6l armv7l ppc64le"
-depends="virtual?java-runtime"
-short_desc="A distributed, open source search and analytics engine"
-maintainer="dota? =op <rogi@skylittlesystem.org>"
-license="Apache-2.0"
-homepage="http://www.elastic.co"
-distfiles="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${version}.tar.gz"
-checksum=74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42
-system_accounts="elastic"
-conf_files="/etc/elasticsearch/elasticsearch.yml /etc/elasticsearch/jvm.options /etc/elasticsearch/log4j2.properties"
-
-do_install() {
-	ES="usr/share/elasticsearch"
-
-	rm -f bin/*.{bat,exe}
-	vmkdir $ES
-
-	vcopy bin $ES
-	vcopy lib $ES
-	vcopy modules $ES
-	vcopy plugins $ES
-
-	vmkdir usr/bin
-
-	ln -sf /$ES/bin/elasticsearch "$DESTDIR/usr/bin"
-
-	vmkdir etc/elasticsearch
-	vcopy config/* etc/elasticsearch
-
-	ln -sf /etc/elasticsearch "$DESTDIR/$ES/config"
-
-	vmkdir var/lib/elasticsearch/data
-	ln -sf /var/lib/elasticsearch/data "$DESTDIR/$ES/data"
-
-	vmkdir var/log/elasticsearch
-	ln -sf /var/log/elasticsearch "$DESTDIR/$ES/logs"
-
-	vlicense LICENSE.txt
-	vlicense NOTICE.txt
-	vdoc README.textile
-
-	vsv elasticsearch
-}
diff --git a/srcpkgs/elasticsearch/update b/srcpkgs/elasticsearch/update
deleted file mode 100644
index 32de96485c8f..000000000000
--- a/srcpkgs/elasticsearch/update
+++ /dev/null
@@ -1 +0,0 @@
-site="https://www.elastic.co/downloads/elasticsearch"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a76ad553cbf3..240f1282f54c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -66,6 +66,7 @@ replaces="
  dtkwm<=2.0.12_1
  ebtables<=2.0.10.4_8
  eclipse-ecj<=4.9_3
+ elasticsearch<=5.1.2_2
  electron7<=7.3.3_1
  electron9<=9.4.1_1
  emacs-gtk2<=27.2_1

From 7fa81ab1f24e566f4a0e08e349d1378fb032bf46 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Sun, 20 Mar 2022 00:41:04 -0400
Subject: [PATCH 1047/1686] libsigrok: fix on systems without logind

Fixes #23580
Closes #23581 (obsoletes the PR)
---
 srcpkgs/libsigrok/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libsigrok/template b/srcpkgs/libsigrok/template
index 87939ce82fa8..0243925a7312 100644
--- a/srcpkgs/libsigrok/template
+++ b/srcpkgs/libsigrok/template
@@ -1,7 +1,7 @@
 # Template file for 'libsigrok'
 pkgname=libsigrok
 version=0.5.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config doxygen python3"
 makedepends="glib-devel libzip-devel glibmm-devel libserialport-devel
@@ -20,6 +20,7 @@ esac
 post_install() {
 	vinstall contrib/60-libsigrok.rules 0644 /usr/lib/udev/rules.d
 	vinstall contrib/61-libsigrok-uaccess.rules 0644 /usr/lib/udev/rules.d
+	vinstall contrib/61-libsigrok-plugdev.rules 0644 /usr/lib/udev/rules.d
 }
 
 libsigrok-devel_package() {

From f06cdeaa605b228673ece7783b31cddd19926ef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?=
 =?UTF-8?q?=EF=BD=94=EF=BD=89?= <hiljusti@so.dang.cool>
Date: Wed, 9 Mar 2022 01:07:08 -0800
Subject: [PATCH 1048/1686] New package: sigi-3.1.0

---
 srcpkgs/sigi/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/sigi/template

diff --git a/srcpkgs/sigi/template b/srcpkgs/sigi/template
new file mode 100644
index 000000000000..d9fc482b8207
--- /dev/null
+++ b/srcpkgs/sigi/template
@@ -0,0 +1,22 @@
+# Template file for 'sigi'
+pkgname=sigi
+version=3.1.0
+revision=1
+build_style=cargo
+short_desc="Organization tool for people who hate organization"
+maintainer="J.R. Hill <hiljusti@so.dang.cool>"
+license="GPL-2.0-only"
+homepage="https://github.com/hiljusti/sigi"
+distfiles="https://crates.io/api/v1/crates/sigi/${version}/download>sigi-${version}.tar.gz"
+checksum=967e492a89f05c3a373929a48e0a1a7712d4742b150216228feff4a7869297e3
+
+pre_check() {
+	# CLI tests in the project rely on BATS (more than just bats-core) through
+	# git submodules. We skip those tests here until the other bats components
+	# are imported in Void or https://github.com/hiljusti/sigi/issues/19
+	export SKIP_BATS_TESTS=1
+}
+
+post_install() {
+	vman sigi.1
+}

From 80130c457008b3c34eef1668adea539919e83715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 5 Apr 2022 21:46:03 -0300
Subject: [PATCH 1049/1686] pari: update to 2.13.4.

---
 srcpkgs/pari/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pari/template b/srcpkgs/pari/template
index 9543739472ac..8bac1e0343f8 100644
--- a/srcpkgs/pari/template
+++ b/srcpkgs/pari/template
@@ -1,6 +1,6 @@
 # Template file for 'pari'
 pkgname=pari
-version=2.13.3
+version=2.13.4
 revision=1
 build_style=configure
 build_helper=qemu
@@ -16,8 +16,9 @@ short_desc="Fast computations library in number theory"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="GPL-2.0-or-later"
 homepage="https://pari.math.u-bordeaux.fr"
+changelog="https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=blob_plain;f=CHANGES;hb=refs/heads/pari-${version%.*}"
 distfiles="https://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${version}.tar.gz"
-checksum=ccba7f1606c6854f1443637bb57ad0958d41c7f4753f8ae8459f1d64c267a1ca
+checksum=bcde9eceae1592814381c1697cdb7063567b6504201b1be47bb58920f3bce185
 
 build_options="x11 pthreads"
 build_options_default="x11 pthreads"

From 52a48462cc316550f4a5f3925b3e29a08a3c9ac1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 13:30:28 +0200
Subject: [PATCH 1050/1686] virt-manager: update to 4.0.0

Closes #35955
---
 ...le-compile-schemas-update-icon-cache.patch | 20 +++++++++++++++++++
 srcpkgs/virt-manager/template                 | 13 ++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch

diff --git a/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch b/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch
new file mode 100644
index 000000000000..ad8f6f798b20
--- /dev/null
+++ b/srcpkgs/virt-manager/patches/disable-compile-schemas-update-icon-cache.patch
@@ -0,0 +1,20 @@
+--- a/setup.py
++++ b/setup.py
+@@ -264,17 +264,6 @@ class my_install(setuptools.command.install.install):
+         setuptools.command.install.install.finalize_options(self)
+ 
+     def run(self):
+-        if not self.distribution.no_update_icon_cache:
+-            print("running gtk-update-icon-cache")
+-            icon_path = os.path.join(self.install_data, "share/icons/hicolor")
+-            self.spawn(["gtk-update-icon-cache", "-q", "-t", icon_path])
+-
+-        if not self.distribution.no_compile_schemas:
+-            print("compiling gsettings schemas")
+-            gschema_install = os.path.join(self.install_data,
+-                "share/glib-2.0/schemas")
+-            self.spawn(["glib-compile-schemas", gschema_install])
+-
+         setuptools.command.install.install.run(self)
+ 
+ 
diff --git a/srcpkgs/virt-manager/template b/srcpkgs/virt-manager/template
index f3f6a7424a1b..3b66b6fd8a90 100644
--- a/srcpkgs/virt-manager/template
+++ b/srcpkgs/virt-manager/template
@@ -1,10 +1,10 @@
 # Template file for 'virt-manager'
 pkgname=virt-manager
-version=3.2.0
-revision=2
+version=4.0.0
+revision=1
 build_style=python3-module
 pycompile_dirs="/usr/share/${pkgname}/virtManager"
-hostmakedepends="gettext python3-docutils gtk-update-icon-cache"
+hostmakedepends="gettext python3-docutils python3-setuptools"
 depends="virt-manager-tools>=${version}_${revision} libvirt-glib
  gtk-vnc spice-gtk gtksourceview4 dconf vte3 gir-freedesktop"
 _coredeps="python3-gobject libvirt-python3 libosinfo
@@ -16,14 +16,9 @@ license="GPL-2.0-or-later"
 homepage="https://virt-manager.org"
 changelog="https://raw.githubusercontent.com/virt-manager/virt-manager/master/NEWS.md"
 distfiles="https://virt-manager.org/download/sources/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=2b6fe3d90d89e1130227e4b05c51e6642d89c839d3ea063e0e29475fd9bf7b86
+checksum=515aaa2021a4bf352b0573098fe6958319b1ba8ec508ea37e064803f97f17086
 python_version=3
 
-post_install() {
-	rm $DESTDIR/usr/share/glib-2.0/schemas/gschemas.compiled \
-		$DESTDIR/usr/share/icons/hicolor/icon-theme.cache
-}
-
 virt-manager-tools_package() {
 	short_desc="Programs to create and clone virtual machines"
 	depends="${_coredeps} python3-argcomplete"

From 7a6f0d9a8eab7ec0d29a9495f7ce4ce6abb4f105 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 7 Apr 2022 09:28:02 -0400
Subject: [PATCH 1051/1686] peek: undo compression of manual page

---
 srcpkgs/peek/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/peek/template b/srcpkgs/peek/template
index f5bd1845c83c..cc6ffed27c4d 100644
--- a/srcpkgs/peek/template
+++ b/srcpkgs/peek/template
@@ -1,7 +1,7 @@
 # Template file for 'peek'
 pkgname=peek
 version=1.5.1
-revision=2
+revision=3
 build_style=meson
 hostmakedepends="glib-devel libxml2 gettext pkg-config txt2man vala"
 makedepends="gtk+3-devel libkeybinder3-devel"
@@ -12,3 +12,8 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/phw/peek"
 distfiles="https://github.com/phw/peek/archive/${version}.tar.gz"
 checksum=d2b52297d3941db2f10ad4dd00a6d5606728c0fee6af5f1594a036f88e478237
+
+post_install() {
+	# Manual page is actually compressed; make sure the post-install hook finds it
+	mv ${DESTDIR}/usr/share/man/man1/peek.{1,1.gz}
+}

From a73a1c8e28f2077f05fc178b573f9e2b52c68f6b Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 15:24:56 -0500
Subject: [PATCH 1052/1686] python3-utils: update to 3.1.0.

---
 srcpkgs/python3-utils/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-utils/template b/srcpkgs/python3-utils/template
index 44f31ded5733..a4db83649ac7 100644
--- a/srcpkgs/python3-utils/template
+++ b/srcpkgs/python3-utils/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-utils'
 pkgname=python3-utils
-version=2.5.6
-revision=2
+version=3.1.0
+revision=1
 wrksrc="python-utils-${version}"
 build_style=python3-module
+# skip coverage and mypy tests https://github.com/WoLpH/python-utils/issues/29
+make_check_args="-o addopts=--doctest-modules"
 hostmakedepends="python3-setuptools"
-depends="python3-six"
+checkdepends="python3-pytest python3-pytest-asyncio"
 short_desc="Convenient utilities not included with the standard Python3 install"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/WoLpH/python-utils"
 distfiles="https://github.com/WoLpH/python-utils/archive/v${version}.tar.gz"
-checksum=e35044706c5c7863110ac31afc9fac66f5dc47d6450ebe26a6ac26473ce09d90
+checksum=6f20e784af79dd0f2c330c88496b3d08fa29e27bcfba398ba78f73d8ae85f670
 
 post_install() {
 	vlicense LICENSE

From fd2a4b4d8053c5cf03ece257da2799f52895573a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 6 Apr 2022 19:27:08 -0400
Subject: [PATCH 1053/1686] python3-rtree: update to 1.0.0.

---
 srcpkgs/python3-rtree/template | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-rtree/template b/srcpkgs/python3-rtree/template
index 8fce4b16e21e..26812e0af5f9 100644
--- a/srcpkgs/python3-rtree/template
+++ b/srcpkgs/python3-rtree/template
@@ -1,9 +1,10 @@
 # Template file for 'python3-rtree'
 pkgname=python3-rtree
-version=0.9.5
-revision=4
+version=1.0.0
+revision=1
 wrksrc="rtree-${version}"
 build_style=python3-module
+make_check_target="tests"
 hostmakedepends="python3-setuptools libspatialindex-devel python3-wheel"
 makedepends="python3-devel libspatialindex-devel"
 depends="python3 libspatialindex"
@@ -13,12 +14,8 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://toblerity.org/rtree/"
 distfiles="https://github.com/Toblerity/rtree/archive/${version}.tar.gz"
-checksum=8d6eebab672d4ac58d10a8f13a200d47502ce70153d43700ddbbde145a217e01
+checksum=b9cc215197cffeb3c7b8becfc6833d382f431381942e5529bcf276a874028fec
 
 post_install() {
 	vlicense LICENSE.txt LICENSE
 }
-
-do_check() {
-	python3 -m pytest tests/
-}

From 8dcbf93ed58a6c4c5040a96e3c8293b0aa48f5c4 Mon Sep 17 00:00:00 2001
From: *1is7ac3* Isaac Quiroz <isaac.qa13@gmail.com>
Date: Sun, 27 Mar 2022 19:33:22 -0300
Subject: [PATCH 1054/1686] python3-chromecast: update to 10.3.0.

---
 srcpkgs/python3-chromecast/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-chromecast/template b/srcpkgs/python3-chromecast/template
index cd54fcaf8977..72f891be6a1f 100644
--- a/srcpkgs/python3-chromecast/template
+++ b/srcpkgs/python3-chromecast/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-chromecast'
 pkgname=python3-chromecast
-version=8.1.0
-revision=2
+version=10.3.0
+revision=1
 wrksrc="pychromecast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-protobuf python3-zeroconf python3-casttube"
@@ -12,7 +12,7 @@ maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"
 homepage="https://github.com/home-assistant-libs/pychromecast"
 distfiles="https://github.com/home-assistant-libs/pychromecast/archive/${version}.tar.gz"
-checksum=f11d73cffa84b25417192c30e6ea46df470b65055e229c568f677372c4ded1de
+checksum=325d8cfa686b7127de1783221f7ef3e81988c0631619bbacf3679ce647b1db1f
 
 post_install() {
 	vlicense LICENSE

From ee679dcdf215e39eeded97e149eee9d098c1c300 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Fri, 25 Mar 2022 16:58:59 +0100
Subject: [PATCH 1055/1686] python3-Werkzeug: update to 2.0.3.

Closes: #36337 [via git-merge-pr]
---
 srcpkgs/python3-Werkzeug/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-Werkzeug/template b/srcpkgs/python3-Werkzeug/template
index e2b947031bb4..ed6980da99ea 100644
--- a/srcpkgs/python3-Werkzeug/template
+++ b/srcpkgs/python3-Werkzeug/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-Werkzeug'
 pkgname=python3-Werkzeug
-version=2.0.2
+version=2.0.3
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ maintainer="Markus Berger <pulux@pf4sh.de>"
 license="BSD-3-Clause"
 homepage="https://palletsprojects.com/p/werkzeug/"
 distfiles="${PYPI_SITE}/W/Werkzeug/Werkzeug-${version}.tar.gz"
-checksum=aa2bb6fc8dee8d6c504c0ac1e7f5f7dc5810a9903e793b6f715a9f015bdadb9a
+checksum=b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c
 
 do_check() {
 	# Tests depend on xprocess and pytest-timeout, which aren't packaged

From 1886e1b8be0c5d8fc9d06e4aa51c8fa2d7411f75 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Fri, 25 Mar 2022 16:55:44 +0100
Subject: [PATCH 1056/1686] python3-itsdangerous: update to 2.1.2.

---
 srcpkgs/python3-itsdangerous/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-itsdangerous/template b/srcpkgs/python3-itsdangerous/template
index 6fa31a0342fd..b770f01eef0c 100644
--- a/srcpkgs/python3-itsdangerous/template
+++ b/srcpkgs/python3-itsdangerous/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-itsdangerous'
 pkgname=python3-itsdangerous
-version=2.0.1
-revision=2
+version=2.1.2
+revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Markus Berger <pulux@pf4sh.de>"
 license="BSD-3-Clause"
 homepage="http://github.com/mitsuhiko/itsdangerous"
 distfiles="${PYPI_SITE}/i/itsdangerous/itsdangerous-${version}.tar.gz"
-checksum=9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0
+checksum=5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a
 
 post_install() {
 	vlicense LICENSE.rst

From 08bf2902b64234321317f06dea4f64d9f5904713 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 19:11:32 +0100
Subject: [PATCH 1057/1686] python3-keyring: update to 23.5.0.

---
 srcpkgs/python3-keyring/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 2fbc05352aed..298460551bfd 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'python3-keyring'
 pkgname=python3-keyring
-version=23.1.0
-revision=2
+version=23.5.0
+revision=1
 wrksrc="keyring-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+build_style=python3-pep517
+hostmakedepends="python3-wheel python3-setuptools_scm"
 depends="python3-SecretStorage python3-importlib_metadata"
 checkdepends="python3-importlib_metadata python3-pytest
  python3-pytest-flake8 python3-pytest-cov"
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://github.com/jaraco/keyring"
 changelog="https://raw.githubusercontent.com/jaraco/keyring/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz"
-checksum=b7e0156667f5dcc73c1f63a518005cd18a4eb23fe77321194fefcc03748b21a4
+checksum=9012508e141a80bd1c0b6778d5c610dd9f8c464d75ac6774248500503f972fb9
 
 post_install() {
 	vlicense LICENSE

From 80d44846af3e975a0c37b0f9641129ba529c9f3c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 14:16:57 +0200
Subject: [PATCH 1058/1686] perl-LWP: update to 6.62.

---
 srcpkgs/perl-LWP/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-LWP/template b/srcpkgs/perl-LWP/template
index d3136bc16c9a..b878123cf002 100644
--- a/srcpkgs/perl-LWP/template
+++ b/srcpkgs/perl-LWP/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-LWP'
 pkgname=perl-LWP
-version=6.61
+version=6.62
 revision=1
 wrksrc="libwww-perl-${version}"
 build_style=perl-module
@@ -17,4 +17,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/libwww-perl"
 distfiles="${CPAN_SITE}/LWP/libwww-perl-${version}.tar.gz"
-checksum=2f69069bd0df0ee222e25d41093bcc42e58d0a45885fba400356454c25621a5f
+checksum=569ac15eb69d54b2a8d932403610690b89c68d6a987eab2f627c0639bae7de18

From c3a421816c847938a223f6ca853b2ad47c5ab4d9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 14:21:11 +0200
Subject: [PATCH 1059/1686] tgt: update to 1.0.82.

---
 srcpkgs/tgt/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template
index 5bf3d09a7070..653ebf2dc358 100644
--- a/srcpkgs/tgt/template
+++ b/srcpkgs/tgt/template
@@ -1,6 +1,6 @@
 # Template file for 'tgt'
 pkgname=tgt
-version=1.0.81
+version=1.0.82
 revision=1
 build_style=gnu-makefile
 make_install_args="sbindir=/usr/bin"
@@ -13,17 +13,12 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/fujita/tgt"
 distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz"
-checksum=f8a285549456f13fecf628131a73934ffcbb701bacb7d5802acee7b515ab5452
+checksum=35156277465e0ced5f3ca7e301110a937a7a2b90bbb5aecbca1349b91ada1c2c
 
 post_extract() {
 	sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile
-	sed -i '/^LDFLAGS/d; /CC.*-o/s/$/ $(LDFLAGS)/' usr/Makefile
-	sed -i '1i#include <sys/user.h>' usr/tgtd.h usr/util.h
-	sed -i '1i#include <fcntl.h>' usr/libssc.c
-	sed -i '1i#include <sys/sysmacros.h>' usr/bs_sg.c
-	sed -i 's/__always_inline/inline/g' usr/util.h
-
 }
+
 post_install() {
 	for f in ${DESTDIR}/etc/tgt/examples/*; do
 		vsconf $f

From 12cf5d181646d4b00bfef0219e72134620abacc1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 14:21:50 +0200
Subject: [PATCH 1060/1686] ugrep: update to 3.7.8.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 795927e8ab52..2c25a04aa898 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.7
+version=3.7.8
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=5490d6491267bb1aaaeac27a0ba41d502f4b1c1b8998b8cc377c91374603932d
+checksum=b2e03615890b92df4487a2891bf47675429c469b1825d5d05600ed3a729b92c7
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From a56ef84094e04a228497b19930e7bd3ccc63e089 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 17:10:09 +0200
Subject: [PATCH 1061/1686] texlive2021-bin: fix repo url.

---
 srcpkgs/texlive2021-bin/INSTALL  | 4 ++--
 srcpkgs/texlive2021-bin/template | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/texlive2021-bin/INSTALL b/srcpkgs/texlive2021-bin/INSTALL
index bc296786a54e..9b4952b0cc6d 100644
--- a/srcpkgs/texlive2021-bin/INSTALL
+++ b/srcpkgs/texlive2021-bin/INSTALL
@@ -5,10 +5,10 @@ post)
 		cd opt/texlive2021-installer
 		case "${ARCH}" in
 			x86_64-musl)
-			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile -force-platform x86_64-linuxmusl
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/tlnet-final/ -profile void.profile -force-platform x86_64-linuxmusl
 			;;
 			*)
-			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/ -profile void.profile
+			./install-tl -repository https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/2021/tlnet-final/ -profile void.profile
 			;;
 		esac
 	esac
diff --git a/srcpkgs/texlive2021-bin/template b/srcpkgs/texlive2021-bin/template
index c7bbe1f9fdb8..3212ec2a5ff5 100644
--- a/srcpkgs/texlive2021-bin/template
+++ b/srcpkgs/texlive2021-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive2021-bin'
 pkgname=texlive2021-bin
 version=2021
-revision=2
+revision=3
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv

From 6a98c7b52b5235fa97bb94f7c57fcf9b7eb75ef8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 17:10:35 +0200
Subject: [PATCH 1062/1686] texlive-bin: update to 2022.

---
 srcpkgs/texlive-bin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/texlive-bin/template b/srcpkgs/texlive-bin/template
index af5517c46ebd..26866c5e5841 100644
--- a/srcpkgs/texlive-bin/template
+++ b/srcpkgs/texlive-bin/template
@@ -1,6 +1,6 @@
 # Template file for 'texlive-bin'
 pkgname=texlive-bin
-version=2021
+version=2022
 revision=1
 depends="texlive${version}-bin"
 short_desc="TeX Live Binary distribution through tl-install (newest version)"

From 063e2e65b604232e497968f819872727286a3424 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 18:08:58 +0200
Subject: [PATCH 1063/1686] cronie: backport upstream regression fix.

https://github.com/cronie-crond/cronie/commit/62e53f1cdb9c1e12a01ee7814c92cd937d50328d

Closes #36554.
---
 srcpkgs/cronie/patches/62e53f1.patch | 21 +++++++++++++++++++++
 srcpkgs/cronie/template              |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/cronie/patches/62e53f1.patch

diff --git a/srcpkgs/cronie/patches/62e53f1.patch b/srcpkgs/cronie/patches/62e53f1.patch
new file mode 100644
index 000000000000..160c03116415
--- /dev/null
+++ b/srcpkgs/cronie/patches/62e53f1.patch
@@ -0,0 +1,21 @@
+From 62e53f1cdb9c1e12a01ee7814c92cd937d50328d Mon Sep 17 00:00:00 2001
+From: w30023233 <wangyuhang27@huawei.com>
+Date: Wed, 23 Mar 2022 15:40:01 +0800
+Subject: [PATCH] Fix regression in handling 1-5 crontab entries
+
+---
+ src/entry.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/entry.c b/src/entry.c
+index e9e258b..bb7cb62 100644
+--- a/src/entry.c
++++ b/src/entry.c
+@@ -595,6 +595,7 @@ get_range(bitstr_t * bits, int low, int high, const char *names[],
+ 				return (EOF);
+ 
+ 			case R_RANGE:
++				unget_char(ch, file);
+ 				if (get_number(&num2, low, names, file) != EOF) {
+ 					state = R_RANGE_NUM2;
+ 					break;
diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template
index 526f59b4d835..e8f45b3ff904 100644
--- a/srcpkgs/cronie/template
+++ b/srcpkgs/cronie/template
@@ -1,7 +1,7 @@
 # Template file for 'cronie'
 pkgname=cronie
 version=1.6.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-inotify --without-selinux --with-pam
  --enable-anacron --enable-pie --enable-relro"

From 5f702ed8c2b51bea3574ee3e0b67e616b2c273cf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 18:37:58 +0200
Subject: [PATCH 1064/1686] zlib: backport crc32 fix.

https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2

Closes #36537.
---
 srcpkgs/zlib/patches/crc32.patch | 51 ++++++++++++++++++++++++++++++++
 srcpkgs/zlib/template            |  2 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/zlib/patches/crc32.patch

diff --git a/srcpkgs/zlib/patches/crc32.patch b/srcpkgs/zlib/patches/crc32.patch
new file mode 100644
index 000000000000..85a6a7e3ab41
--- /dev/null
+++ b/srcpkgs/zlib/patches/crc32.patch
@@ -0,0 +1,51 @@
+From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
+From: Mark Adler <madler@alumni.caltech.edu>
+Date: Wed, 30 Mar 2022 11:14:53 -0700
+Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
+
+The previous releases of zlib were not sensitive to incorrect CRC
+inputs with bits set above the low 32. This commit restores that
+behavior, so that applications with such bugs will continue to
+operate as before.
+---
+ crc32.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crc32.c b/crc32.c
+index a1bdce5c2..451887bc7 100644
+--- a/crc32.c
++++ b/crc32.c
+@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+ 
+     /* Pre-condition the CRC */
+-    crc ^= 0xffffffff;
++    crc = (~crc) & 0xffffffff;
+ 
+     /* Compute the CRC up to a word boundary. */
+     while (len && ((z_size_t)buf & 7) != 0) {
+@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
+ 
+     /* Pre-condition the CRC */
+-    crc ^= 0xffffffff;
++    crc = (~crc) & 0xffffffff;
+ 
+ #ifdef W
+ 
+@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+ #ifdef DYNAMIC_CRC_TABLE
+     once(&made, make_crc_table);
+ #endif /* DYNAMIC_CRC_TABLE */
+-    return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
++    return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
+ }
+ 
+ /* ========================================================================= */
+@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
+     uLong crc2;
+     uLong op;
+ {
+-    return multmodp(op, crc1) ^ crc2;
++    return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
+ }
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 6dbe30032202..d142f283fb0a 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,7 +1,7 @@
 # Template file for 'zlib'
 pkgname=zlib
 version=1.2.12
-revision=1
+revision=2
 bootstrap=yes
 build_style=configure
 configure_args="--prefix=/usr --shared"

From 7d71ba14bc360f2e09744dd4cd48bf3c3e6bc3fa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 17 Mar 2022 15:17:16 +0100
Subject: [PATCH 1065/1686] notion: update to 4.0.2.

- Fix homepage
- Fix musl (backport upstream patch)
- Fix nonfree, upstream should be proper LGPL-2.1-or-later now
- Use Lua 5.4
---
 srcpkgs/notion/patches/stdout.patch | 89 +++++++++++++++++++++++++++++
 srcpkgs/notion/template             | 18 +++---
 2 files changed, 97 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/notion/patches/stdout.patch

diff --git a/srcpkgs/notion/patches/stdout.patch b/srcpkgs/notion/patches/stdout.patch
new file mode 100644
index 000000000000..b4200f680d2e
--- /dev/null
+++ b/srcpkgs/notion/patches/stdout.patch
@@ -0,0 +1,89 @@
+From de9e19940c2c88c848b7f849fb014fafd77d7d93 Mon Sep 17 00:00:00 2001
+From: c0dev0id <sh+github@codevoid.de>
+Date: Sat, 10 Apr 2021 02:03:44 +0200
+Subject: [PATCH] Fix compilation on OpenBSD
+
+The variable name "stdout" is defined in stdio.h on OpenBSD already.
+---
+ mod_notionflux/mod_notionflux.c | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/mod_notionflux/mod_notionflux.c b/mod_notionflux/mod_notionflux.c
+index f2bd4427..51949e07 100644
+--- a/mod_notionflux/mod_notionflux.c
++++ b/mod_notionflux/mod_notionflux.c
+@@ -36,7 +36,7 @@
+ 
+ typedef struct{
+     int fd;
+-    FILE *stdout;
++    FILE *stdoutput;
+     int ndata;
+     char *data;
+ } Buf;
+@@ -64,9 +64,9 @@ static void close_conn(Buf *buf)
+     close(buf->fd);
+     buf->fd=-1;
+     buf->ndata=0;
+-    if(buf->stdout!=NULL){
+-        fclose(buf->stdout);
+-        buf->stdout=NULL;
++    if(buf->stdoutput!=NULL){
++        fclose(buf->stdoutput);
++        buf->stdoutput=NULL;
+     }
+     if(buf->data!=NULL){
+         free(buf->data);
+@@ -147,11 +147,11 @@ static void receive_data(int fd, void *buf_)
+     bool success=FALSE;
+     int idx=buf-bufs;
+ 
+-    if(buf->stdout==NULL){ /* no fd received yet, must be the very beginning */
+-        int stdout_fd=unix_recv_fd(fd);
+-        if(stdout_fd==-2)
++    if(buf->stdoutput==NULL){ /* no fd received yet, must be the very beginning */
++        int stdoutput_fd=unix_recv_fd(fd);
++        if(stdoutput_fd==-2)
+             goto closefd;
+-        if(stdout_fd==-3){
++        if(stdoutput_fd==-3){
+             char const *err="Magic number mismatch on notionflux socket - "
+                 "is notionflux the same version as notion?";
+             writes(fd, "E");
+@@ -160,13 +160,13 @@ static void receive_data(int fd, void *buf_)
+             goto closefd;
+         }
+ 
+-        if(stdout_fd==-1) {
++        if(stdoutput_fd==-1) {
+             if(errno==EWOULDBLOCK || errno==EAGAIN)
+                 return; /* try again later */
+             warn("No file descriptor received from notionflux, closing.");
+             goto closefd;
+         }
+-        if((buf->stdout=fdopen(stdout_fd, "w"))==NULL) {
++        if((buf->stdoutput=fdopen(stdoutput_fd, "w"))==NULL) {
+             warn("fdopen() failed on fd from notionflux");
+             goto closefd;
+         }
+@@ -239,9 +239,9 @@ EXTL_SAFE
+ EXTL_EXPORT
+ bool mod_notionflux_xwrite(int idx, const char *str)
+ {
+-    if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdout==NULL)
++    if (idx<0 || idx>=MAX_SERVED || bufs[idx].stdoutput==NULL)
+         return FALSE;
+-    return fputs(str, bufs[idx].stdout)!=EOF;
++    return fputs(str, bufs[idx].stdoutput)!=EOF;
+ }
+ 
+ static void connection_attempt(int lfd, void *UNUSED(data))
+@@ -410,7 +410,7 @@ bool mod_notionflux_init()
+ 
+     for(i=0; i<MAX_SERVED; i++){
+         bufs[i].fd=-1;
+-        bufs[i].stdout=NULL;
++        bufs[i].stdoutput=NULL;
+         bufs[i].data=NULL;
+         bufs[i].ndata=0;
+     }
diff --git a/srcpkgs/notion/template b/srcpkgs/notion/template
index b0746f9b1c02..1246e0e9c6cd 100644
--- a/srcpkgs/notion/template
+++ b/srcpkgs/notion/template
@@ -1,17 +1,16 @@
 # Template file for 'notion'
-pkgname="notion"
-version=4.0.0
-revision=2
-archs="~*-musl"
+pkgname=notion
+version=4.0.2
+revision=1
+hostmakedepends="pkg-config gettext groff lua54"
+makedepends="libSM-devel libXext-devel libXft-devel libXinerama-devel
+ libXrandr-devel lua54-devel readline-devel"
 short_desc="Tabbed, tiling window manager"
-hostmakedepends="pkg-config gettext groff lua53"
-makedepends="lua53-devel libXext-devel libXft-devel libSM-devel libXinerama-devel libXrandr-devel"
 maintainer="Julian Wiesener <jw@vtoc.de>"
 license="LGPL-2.1-or-later"
-repository="nonfree"
-homepage="https://notionnm.net/"
+homepage="https://notionwm.net/"
 distfiles="https://github.com/raboof/notion/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=13ce5867667ad7a864c79f4cb1e322fa33ebcd872dfce6472026e4d69d1f4138
+checksum=dcefd620d028f6541c15879c3db218de081df7ce8d2e9cb4fc7ddd9b9253b698
 
 do_build() {
 	make CC=$CC PREFIX=/usr ETCDIR=/etc/notion
@@ -21,5 +20,4 @@ do_install() {
 	make DESTDIR=${DESTDIR} PREFIX=/usr ETCDIR=/etc/notion install
 	vman man/notion.1
 	vman man/notionflux.1
-	vlicense LICENSE
 }

From 9a36f4679c8cc935959766f856d7e3469444144d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 11 Mar 2022 16:00:18 +0100
Subject: [PATCH 1066/1686] xinit: remove skel files.

We shipped two skeleton files for ~/.xinitrc and ~/.xsession, but the
default behavior of xinit/startx is more useful than an .xinitrc that
doesn't start a window manager, and the .xsession had a bug calling
bash -i which resulted in appending the .xinitrc into the user history...
drop this unnecessary stuff.

Users can copy /etc/X11/xinit/xinitrc as a starting point.
---
 srcpkgs/xinit/files/xinitrc  | 17 -----------------
 srcpkgs/xinit/files/xsession | 10 ----------
 srcpkgs/xinit/template       |  8 ++------
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/xinit/files/xinitrc
 delete mode 100644 srcpkgs/xinit/files/xsession

diff --git a/srcpkgs/xinit/files/xinitrc b/srcpkgs/xinit/files/xinitrc
deleted file mode 100644
index dbd080d00361..000000000000
--- a/srcpkgs/xinit/files/xinitrc
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
diff --git a/srcpkgs/xinit/files/xsession b/srcpkgs/xinit/files/xsession
deleted file mode 100644
index a16dc0b8421f..000000000000
--- a/srcpkgs/xinit/files/xsession
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/bash --login -i ~/.xinitrc
-
diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template
index be836ebc94ad..b687c0ccd2c4 100644
--- a/srcpkgs/xinit/template
+++ b/srcpkgs/xinit/template
@@ -1,7 +1,7 @@
 # Template file for 'xinit'
 pkgname=xinit
 version=1.4.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-xinitdir=/etc/X11/xinit"
 hostmakedepends="pkg-config"
@@ -15,13 +15,9 @@ checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9
 
 conf_files="
 	/etc/X11/xinit/xinitrc
-	/etc/X11/xinit/xserverrc
-	/etc/skel/.xinitrc
-	/etc/skel/.xsession"
+	/etc/X11/xinit/xserverrc"
 
 post_install() {
-	vinstall ${FILESDIR}/xinitrc 644 etc/skel .xinitrc
-	vinstall ${FILESDIR}/xsession 644 etc/skel .xsession
 	vinstall ${FILESDIR}/xserverrc 644 etc/X11/xinit
 	vlicense COPYING
 }

From 1e74b8aa9925a4a81e924b759511c1d6d458e2d7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 19:10:10 +0100
Subject: [PATCH 1067/1686] xine-lib: update to 1.2.12.

---
 srcpkgs/xine-lib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template
index 51cbd363f7ba..f713eff49b07 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'xine-lib'
 pkgname=xine-lib
-version=1.2.11
+version=1.2.12
 revision=1
 build_style=gnu-configure
 configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://www.xine-project.org"
 changelog="https://sourceforge.net/projects/xine/files/xine-lib/${version}/README.txt/view"
 distfiles="${SOURCEFORGE_SITE}/xine/${pkgname}-${version}.tar.xz"
-checksum=ef51b21d10dda1045fa7d711bd9171cfdaf0a5a2874233bcf16ffdf28ec07005
+checksum=d606270468e1540c2a89c0d7f5fdf11e17ecc0c2698cc0bcb1065ff26abee098
 
 case "$XBPS_TARGET_MACHINE" in
 	i686-musl)

From 499af9f9eaa687a96d4ce0671d9497dc43483854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 14 Mar 2022 08:37:19 +0100
Subject: [PATCH 1068/1686] New package: python3-subprocess-tee-0.3.5

---
 srcpkgs/python3-subprocess-tee/template | 26 +++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/python3-subprocess-tee/template

diff --git a/srcpkgs/python3-subprocess-tee/template b/srcpkgs/python3-subprocess-tee/template
new file mode 100644
index 000000000000..39a0233dad70
--- /dev/null
+++ b/srcpkgs/python3-subprocess-tee/template
@@ -0,0 +1,26 @@
+# Template file for 'python3-subprocess-tee'
+pkgname=python3-subprocess-tee
+version=0.3.5
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-pep517
+make_install_target="subprocess_tee-${version}-py3-none-any.whl"
+hostmakedepends="python3-wheel python3-toml"
+depends="python3"
+short_desc="Replacement for subprocess.run capturing output while still printing it"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/pycontribs/subprocess-tee"
+distfiles="${PYPI_SITE}/s/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=ff5cced589a4b8ac973276ca1ba21bb6e3de600cde11a69947ff51f696efd577
+# requires molecule, which isn't packaged yet
+make_check=no
+
+post_patch() {
+	# scm versioning is broken in this release
+	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 17f7cdcd32c0bf48b4fdcbf7bba34035f95f5335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 14 Mar 2022 08:38:01 +0100
Subject: [PATCH 1069/1686] New package: python3-ansible-compat-2.0.0

---
 srcpkgs/python3-ansible-compat/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/python3-ansible-compat/template

diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
new file mode 100644
index 000000000000..bf03fe221d0a
--- /dev/null
+++ b/srcpkgs/python3-ansible-compat/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-ansible-compat'
+pkgname=python3-ansible-compat
+version=2.0.0
+revision=1
+wrksrc="${pkgname/python3-/}-${version}"
+build_style=python3-pep517
+make_install_target="ansible_compat-${version}-py3-none-any.whl"
+hostmakedepends="python3-wheel python3-toml"
+depends="python3-subprocess-tee"
+short_desc="Python package for working with various version of ansible"
+maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
+license="MIT"
+homepage="https://github.com/ansible-community/ansible-compat"
+distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
+checksum=4027da4ec2b524c263a801cc2dc6da2b98c2996cec258cef118a30c790467ed2
+
+post_patch() {
+	# scm versioning is broken in this release
+	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 272402874dd69c8160f33b5dd7866f2c45cdc933 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Mon, 14 Mar 2022 08:38:12 +0100
Subject: [PATCH 1070/1686] python3-ansible-lint: update to 6.0.2.

---
 srcpkgs/python3-ansible-lint/template | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-ansible-lint/template b/srcpkgs/python3-ansible-lint/template
index 78d31ea90639..00d8dc40f6a6 100644
--- a/srcpkgs/python3-ansible-lint/template
+++ b/srcpkgs/python3-ansible-lint/template
@@ -1,18 +1,25 @@
 # Template file for 'python3-ansible-lint'
 pkgname=python3-ansible-lint
-version=5.4.0
+version=6.0.2
 revision=1
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
 make_install_target="ansible_lint-${version}-py3-none-any.whl"
 hostmakedepends="python3-wheel python3-toml"
-depends="ansible-core python3-yamllint python3-six python3-yaml python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch"
+depends="ansible-core python3-yamllint python3-six python3-yaml
+ python3-ruamel.yaml python3-tenacity python3-enrich python3-wcmatch
+ python3-ansible-compat"
 short_desc="Linter for Ansible files"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
-license="MIT"
+# Note about licensing from upstream:
+# The ansible-lint project is distributed as GPLv3 due to use of GPLv3 runtime
+# dependencies, like ansible and yamllint. For historical reasons, its own
+# code-base remains licensed under a more liberal MIT license and any
+# contributions made are accepted as being made under original MIT license.
+license="GPL-3.0-only"
 homepage="https://github.com/ansible-community/ansible-lint"
 distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=2160a60b4ab034c04006d701a1779340ffb0f6e28f030ff8de958e1062a88962
+checksum=b539bc22d13e6de0cc2e25758e1d28b2bc01561a414ae37ceda3708b5a2a79ed
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660
@@ -22,7 +29,3 @@ post_patch() {
 	# scm versioning is broken in this release
 	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
 }
-
-post_install() {
-	vlicense LICENSE
-}

From 2f891034ebf2c3e390f66bbb96381a16d4397118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 26 Mar 2022 12:20:51 +0100
Subject: [PATCH 1071/1686] ansible: update to 5.5.0.

---
 srcpkgs/ansible/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index eb132fa68380..063e24d1684a 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=5.4.0
+version=5.5.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ 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=2f0ecbd8a3232e520bf3e3bc23f40dda60b9ce7924ca194bd35f4de4027100fc
+checksum=b8a76d737889c9bfd0e6b0f2276dcf8d836da667067a355776f3504d7a66d518
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660

From 85c54a2c83e7f498c01817493146a054affadcb4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:25 -0400
Subject: [PATCH 1072/1686] openjdk12-bootstrap: fix version, xlint

---
 srcpkgs/openjdk12-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 4861ad1efc40..2b5d421a52f0 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk12-bootstrap'
-_java_ver=12
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=10
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk12-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=12.0.2+10
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 12)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
 

From e24c034e994ce1693e52bed84eab1bd0f70e8249 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:26 -0400
Subject: [PATCH 1073/1686] openjdk13-bootstrap: fix version, xlint

---
 srcpkgs/openjdk13-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 82c34b7999f3..4a61e102381d 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk13-bootstrap'
-_java_ver=13
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=8
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk13-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=13.0.2+8
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 13)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
 

From 550cb6940d2f51c572de0c36efa3aa2139abd887 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:27 -0400
Subject: [PATCH 1074/1686] openjdk14-bootstrap: fix version, xlint

---
 srcpkgs/openjdk14-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 5c15ca3f32c0..768b94633196 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk14-bootstrap'
-_java_ver=14
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=12
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk14-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=14.0.2+12
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel openjdk13-bootstrap"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 14)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
 
 # Build is still parallel, but don't use -jN.

From 19d077a8113365b4ad4764241b8b0a9430a57c7f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:28 -0400
Subject: [PATCH 1075/1686] openjdk15-bootstrap: fix version, xlint

---
 srcpkgs/openjdk15-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index efbc69f9429e..7608f4dd2658 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk15-bootstrap'
-_java_ver=15
-_java_min_ver=0
-_java_sec_ver=3
-_jdk_update=3
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk15-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=15.0.3+3
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -38,7 +35,6 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk14-bootstrap"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 15)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
@@ -47,6 +43,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
  https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
 checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
 
 # Build is still parallel, but don't use -jN.

From 8e3e1b093592b37fb94e49b749ce70a56542cafd Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:29 -0400
Subject: [PATCH 1076/1686] openjdk16-bootstrap: fix version, xlint

---
 srcpkgs/openjdk16-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 9bea476c6836..28e70a17fd2b 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk16-bootstrap'
-_java_ver=16
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=7
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk16-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=16.0.2+7
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --enable-unlimited-crypto
@@ -38,7 +35,6 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel harfbuzz-devel openjdk15-bootstrap"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 16)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
@@ -47,6 +43,7 @@ distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.ta
  https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
 checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
 
 # Build is still parallel, but don't use -jN.

From 5b9d3ad0f2159d3ac92788a02edfc01f4b0fe9da Mon Sep 17 00:00:00 2001
From: Mizuno Jan Yuta <mjy@8x9.space>
Date: Fri, 8 Apr 2022 01:05:47 +0900
Subject: [PATCH 1077/1686] mdocml: fix readability issues in void-man-cgi.

Fix: #36557
---
 srcpkgs/mdocml/files/void.css | 37 +++++++++++++++++++++++++----------
 srcpkgs/mdocml/template       |  2 +-
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/mdocml/files/void.css b/srcpkgs/mdocml/files/void.css
index 289145066991..4e2f75357213 100644
--- a/srcpkgs/mdocml/files/void.css
+++ b/srcpkgs/mdocml/files/void.css
@@ -1,8 +1,24 @@
 
 /** Void style **/
-body { color: #333; }
-a { color: #478061; }
-a:hover { color: #000; }
+html {
+	--fg: #333;
+	--bg: #fff;
+	--fg-accent: #478061;
+	--nav-fg: #fff;
+	--nav-bg: #478061;
+}
+@media (prefers-color-scheme: dark) {
+	html {
+		--fg: #ccc;
+		--bg: #222;
+		--fg-accent: #62b086;
+		--nav-fg: #fff;
+		--nav-bg: #295340;
+	}
+}
+
+a, :link, :visited { color: var(--fg-accent); }
+a:hover { color: var(--fg); }
 
 html { max-width: 100% }
 body { margin: 0 }
@@ -11,29 +27,30 @@ body { margin: 0 }
 nav#void-nav {
 	width:100%;
 	min-height:50px;
-	background:#478061;
+	color:var(--nav-fg);
+	background-color:var(--nav-bg);
 	z-index:110;
 	font-size:14px
 }
 nav#void-nav ul {
-	float:right;
+	display:block;
 	list-style:none;
 	margin:0
 }
 nav#void-nav ul li {
-	float:left;
+	display:inline-block;
 	margin:0;
-	clear:initial
 }
 nav#void-nav ul li a {
-	display:block;
+	display:inline-block;
 	padding:15px;
 	line-height:20px;
 	font-size:1.2em;
-	color:#fff;
+	color:var(--nav-fg);
 	text-decoration: none
 }
 nav#void-nav ul li a:hover,nav#void-nav ul li a:focus {
-	background:#000;
+	color:#fff;
+	background-color:#000;
 	text-decoration:none
 }
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index 41e07f089ab2..e8aa98cdb158 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.14.6
-revision=1
+revision=2
 wrksrc="mandoc-${version}"
 build_style=configure
 make_build_args="all man.cgi"

From 4857bba691a580f07602ee009550b7b05d7d06e4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 19:01:04 +0200
Subject: [PATCH 1078/1686] mdocml: add padding to void-mang-cgi, limit line
 length.

---
 srcpkgs/mdocml/files/void.css | 2 +-
 srcpkgs/mdocml/template       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdocml/files/void.css b/srcpkgs/mdocml/files/void.css
index 4e2f75357213..89a9fb4b3211 100644
--- a/srcpkgs/mdocml/files/void.css
+++ b/srcpkgs/mdocml/files/void.css
@@ -22,7 +22,7 @@ a:hover { color: var(--fg); }
 
 html { max-width: 100% }
 body { margin: 0 }
-#mandoc { max-width: 65em; margin: 0.8em }
+.manual-text { max-width: 65em; padding: 0 1em; }
 
 nav#void-nav {
 	width:100%;
diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template
index e8aa98cdb158..e18de8b7adf2 100644
--- a/srcpkgs/mdocml/template
+++ b/srcpkgs/mdocml/template
@@ -1,7 +1,7 @@
 # Template file for 'mdocml'
 pkgname=mdocml
 version=1.14.6
-revision=2
+revision=3
 wrksrc="mandoc-${version}"
 build_style=configure
 make_build_args="all man.cgi"

From 3bf85b998900a904482796646034e53eea8a6e51 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Thu, 7 Apr 2022 11:44:33 -0500
Subject: [PATCH 1079/1686] xmandump: update to 0.2.2.

---
 srcpkgs/xmandump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index ae17bbcefa49..b05027396eaf 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,6 +1,6 @@
 # Template file for 'xmandump'
 pkgname=xmandump
-version=0.2.1
+version=0.2.2
 revision=1
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="ISC"
 homepage="https://github.com/void-linux/xmandump"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=ca261e075940c97cb3ad639e4c8b746fa93bc7559032bc1ada3858c63658d014
+checksum=c664b84b9eb26e6cf6d7bc0aceca9a2ccfcfb1c0a4e0611544117489941c00ca
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 8f4fadc49e05b654a298ced8b313dea0c73afc74 Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Sat, 2 Apr 2022 23:59:42 +0300
Subject: [PATCH 1080/1686] vault: update to 1.10.0.

---
 srcpkgs/vault/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index 4746d4974195..49f6a4b405b9 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -1,6 +1,6 @@
 # Template file for 'vault'
 pkgname=vault
-version=1.9.4
+version=1.10.0
 revision=1
 build_style=go
 go_import_path="github.com/hashicorp/vault"
@@ -14,7 +14,7 @@ maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="MPL-2.0"
 homepage="https://www.vaultproject.io/"
 distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
-checksum=7ebae46e12ff353c3a9e861c4991410679a3c890d36c7c6fb17b43e9ea6f6115
+checksum=4b3303af72b9383369d6219dc88beaef3b343b262625e5d7c6a309ae9286d8c2
 system_accounts="_vault"
 make_dirs="/var/lib/vault 0700 _vault _vault
  /etc/vault 0750 root _vault"

From 324e91944db82f636e5873c7f2f540eb73faccb7 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 2 Apr 2022 16:22:04 +0530
Subject: [PATCH 1081/1686] avrdude: update to 6.4, adopt

---
 srcpkgs/avrdude/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/avrdude/template b/srcpkgs/avrdude/template
index ec6866e05bab..5ebe45ae47e4 100644
--- a/srcpkgs/avrdude/template
+++ b/srcpkgs/avrdude/template
@@ -1,15 +1,21 @@
 # Template file for 'avrdude'
 pkgname=avrdude
-version=6.3
-revision=3
+version=6.4
+revision=1
 build_style=gnu-configure
+configure_args="$(vopt_enable gpio linuxgpio) $(vopt_enable spi linuxspi)"
 hostmakedepends="flex"
-makedepends="elfutils-devel libusb-devel libusb-compat-devel libftdi1-devel"
+makedepends="elfutils-devel libusb-devel libusb-compat-devel libftdi1-devel
+ hidapi-devel"
 depends="avr-libc"
 short_desc="Utility to manipulate ROM and EEPROM of AVR microcontrollers"
-maintainer="allan <mail@may.mooo.com>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://www.nongnu.org/avrdude/"
 distfiles="$NONGNU_SITE/$pkgname/${pkgname}-$version.tar.gz"
-checksum=0f9f731b6394ca7795b88359689a7fa1fba818c6e1d962513eb28da670e0a196
+checksum=a9be7066f70a9dcf4bf0736fcf531db6a3250aed1a24cc643add27641b7110f9
 conf_files="/etc/avrdude.conf"
+build_options="gpio spi"
+desc_option_spi="Enable LINUXSPI support"
+desc_option_gpio="Enable LINUXGPIO support"
+build_options_default="${build_options}"

From 74fdb4bb6bcbddc978ef99336fc8eb02a4cdfeb1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 27 Mar 2022 12:08:58 +0200
Subject: [PATCH 1082/1686] exa: adopt and adjust dependencies

---
 srcpkgs/exa/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index d2eb81a34ec0..660f997c809e 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -3,10 +3,10 @@ pkgname=exa
 version=0.10.1
 revision=1
 build_style=cargo
-hostmakedepends="pkg-config libgit2-devel"
+hostmakedepends="pkg-config"
 makedepends="libgit2-devel"
 short_desc="Modern replacement for ls"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="MIT"
 homepage="https://the.exa.website/"
 distfiles="https://github.com/ogham/exa/archive/v${version}.tar.gz

From 9e7b6410827fc1f9aff6993c499661d5c81f0702 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 8 Mar 2022 12:47:25 +0100
Subject: [PATCH 1083/1686] muffin: update to 5.2.1.

---
 srcpkgs/muffin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 830922739b4f..cb8032a75d21 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -1,6 +1,6 @@
 # Template file for 'muffin'
 pkgname=muffin
-version=5.2.0
+version=5.2.1
 revision=1
 build_style=gnu-configure
 build_helper=gir
@@ -15,8 +15,9 @@ short_desc="Cinnamon window manager based on Mutter"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://github.com/linuxmint/muffin"
+changelog="https://raw.githubusercontent.com/linuxmint/muffin/master/debian/changelog"
 distfiles="https://github.com/linuxmint/muffin/archive/${version}.tar.gz"
-checksum=8366569f27a62913dade9935e0688b3636ca11b8ee00a061c9fdcbb6b27f3e2f
+checksum=356a9fce1f4e9f39a6e0156c5dcab1e4190113a191cf1422d1ea08dbea4bfda4
 shlib_provides="libmuffin-clutter-0.so libmuffin-cogl-pango-0.so
  libmuffin-cogl-path-0.so libmuffin-cogl-0.so"
 

From aeb0dbef0189a8802673577156da94bc46af439d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 16:12:00 +0100
Subject: [PATCH 1084/1686] libvdpau: update to 1.5.

---
 srcpkgs/libvdpau/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libvdpau/template b/srcpkgs/libvdpau/template
index 8b1c817cfd07..fcc2b6fcfd58 100644
--- a/srcpkgs/libvdpau/template
+++ b/srcpkgs/libvdpau/template
@@ -1,6 +1,6 @@
 # Template file for 'libvdpau'
 pkgname=libvdpau
-version=1.4
+version=1.5
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://freedesktop.org/wiki/Software/VDPAU/"
 distfiles="https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/libvdpau-${version}.tar.gz"
-checksum=240dd8f9ec08de707529917677827ba12e13b9fc299eeb3af13ea05e7fc74aba
+checksum=66490802f30426d30ff9e8af35263bbbbaa23b52d0a2d797d06959c3d19638fd
 
 post_install() {
 	vlicense COPYING

From b41da0dd2106574a41850f2a38d7f701b7745484 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 7 Mar 2022 16:12:04 +0100
Subject: [PATCH 1085/1686] vdpauinfo: update to 1.4.

---
 srcpkgs/vdpauinfo/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/vdpauinfo/template b/srcpkgs/vdpauinfo/template
index 611b5d864010..9b71a655a935 100644
--- a/srcpkgs/vdpauinfo/template
+++ b/srcpkgs/vdpauinfo/template
@@ -1,16 +1,17 @@
 # Template file for 'vdpauinfo'
 pkgname=vdpauinfo
-version=1.0
-revision=3
+_glhash=8f047eac351672cc4316724edb6ad2b2
+version=1.4
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libvdpau-devel"
 short_desc="Command line utility for querying the capabilities of a VDPAU device"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://cgit.freedesktop.org/~aplattner/vdpauinfo"
-distfiles="http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${version}.tar.gz"
-checksum=4054960b7ae618c351ff1ce3e7831b5cbda964ae1fbf9969b7146404d3044bc4
+homepage="https://freedesktop.org/wiki/Software/VDPAU/"
+distfiles="https://gitlab.freedesktop.org/vdpau/vdpauinfo/uploads/${_glhash}/vdpauinfo-${version}.tar.gz"
+checksum=40188bc5671c139e58330dbcac2a6ced0064485cb4cdf368558feca17d7922a0
 
 post_install() {
 	vlicense COPYING

From 941d96f12c7405a78b8ff2e2758863ec33d3b905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 9 Feb 2022 17:53:05 +0100
Subject: [PATCH 1086/1686] cargo-deny: update to 0.11.3.

---
 srcpkgs/cargo-deny/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index 6adc1fdd9cf2..4045e5a8c568 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-deny'
 pkgname=cargo-deny
-version=0.10.1
+version=0.11.3
 revision=1
 build_style=cargo
 configure_args="--no-default-features"
@@ -10,13 +10,18 @@ short_desc="Cargo plugin to help you manage large dependency graphs"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-deny"
+changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-deny/main/CHANGELOG.md"
 distfiles="https://github.com/EmbarkStudios/cargo-deny/archive/${version}.tar.gz"
-checksum=136764d16b6d60fc9ddec4989ab4cb2bdcee9a096d0f3cd40b1c574bcc1b7f44
+checksum=d9e6adc8342d69b84b4c4e6b1d34eaaf0750b4680a9c675c8c74659a8c27cfc8
 
 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
 	broken="bitvec crate unimplemented for big endian"
 fi
 
+post_patch() {
+ 	cargo update --package autocfg --precise 1.1.0
+}
+
 post_install() {
 	vlicense LICENSE-APACHE
 	vlicense LICENSE-MIT

From 05e16fc4b8c207617ccc81ea89b228bc3e11c4bf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 16:11:31 +0100
Subject: [PATCH 1087/1686] libva: update to 2.14.0.

---
 srcpkgs/libva/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template
index bcf4c8003d75..093f7b86355b 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.13.0
+version=2.14.0
 revision=1
 build_style=meson
 configure_args="-Dwith_glx=no"
@@ -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=6b7ec7d4fa204dad3f266450981f1f0892400c03afd3e00ac11f8ccade5aaaa1
+checksum=f21152a2170edda9d1c4dd463d52eaf62b553e83e553c0a946654523cca86d5e
 
 build_options="wayland"
 build_options_default="wayland"

From 406058153fe75d2ef786f02f316c4f21bde532ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 16:11:35 +0100
Subject: [PATCH 1088/1686] libva-glx: update to 2.14.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 268daeda3f3e..b8411bcb09fb 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.13.0
+version=2.14.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=6b7ec7d4fa204dad3f266450981f1f0892400c03afd3e00ac11f8ccade5aaaa1
+checksum=f21152a2170edda9d1c4dd463d52eaf62b553e83e553c0a946654523cca86d5e
 
 post_install() {
 	# We are only interested in the glx component, remove everything else.

From 5ab306f5e972a03a03f6bd4d7b651a19bf562973 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 16:11:39 +0100
Subject: [PATCH 1089/1686] libva-utils: update to 2.14.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 0cf9bd48088c..b98e3e9f73a3 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.13.0
+version=2.14.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=128333faa9792a3b87586a80bfb70859dcdd81847ec9a722f785a601a48e1731
+checksum=0ad6410aaa27d7b15dadee0f4d775d54d6394b582bf315353a4657b49c78ac31
 
 post_install() {
 	vlicense COPYING

From 02ca1680af73fb0b6e57ca00c3804ae28358b871 Mon Sep 17 00:00:00 2001
From: Anthony Iliopoulos <ailiop@altatus.com>
Date: Sun, 13 Feb 2022 08:58:24 +0000
Subject: [PATCH 1090/1686] iproute2: update to 5.16.0.

---
 ...0001-lib-fix-ax25.h-include-for-musl.patch | 36 +++++++++++++++++++
 srcpkgs/iproute2/template                     |  4 +--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch

diff --git a/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch b/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
new file mode 100644
index 000000000000..401965b0a348
--- /dev/null
+++ b/srcpkgs/iproute2/patches/0001-lib-fix-ax25.h-include-for-musl.patch
@@ -0,0 +1,36 @@
+From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 13 Jan 2022 08:14:13 +0000
+Subject: [PATCH] lib: fix ax25.h include for musl
+
+ax25.h isn't guaranteed to be avilable in netax25/*;
+it's dependent on our choice of libc (it's not available
+on musl at least) [0].
+
+Let's use the version from linux-headers.
+
+[0] https://sourceware.org/glibc/wiki/Synchronizing_Headers
+Bug: https://bugs.gentoo.org/831102
+
+Signed-off-by: Sam James <sam@gentoo.org>
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+---
+ lib/ax25_ntop.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c
+index cfd0e04b06f9..3a72a43e9b77 100644
+--- a/lib/ax25_ntop.c
++++ b/lib/ax25_ntop.c
+@@ -2,7 +2,7 @@
+ 
+ #include <errno.h>
+ #include <sys/socket.h>
+-#include <netax25/ax25.h>
++#include <linux/ax25.h>
+ 
+ #include "utils.h"
+ 
+-- 
+2.35.1
+
diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template
index 8f517150839a..9dbba00b6fe0 100644
--- a/srcpkgs/iproute2/template
+++ b/srcpkgs/iproute2/template
@@ -1,6 +1,6 @@
 # Template file for 'iproute2'
 pkgname=iproute2
-version=5.12.0
+version=5.16.0
 revision=1
 build_style=configure
 make_install_args="SBINDIR=/usr/bin"
@@ -11,7 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://wiki.linuxfoundation.org/networking/iproute2"
 distfiles="${KERNEL_SITE}/utils/net/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9d268db98a36ee2a0e3ff3b92b2efff66fc1138a51e409bdef6ab3cfe15f326f
+checksum=c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f
 
 conf_files="
  /etc/iproute2/ematch_map

From 7181bc3704bea6402682d7ae34b039895b18baa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 6 Feb 2022 12:01:07 -0300
Subject: [PATCH 1091/1686] findutils: update to 4.9.0.

---
 srcpkgs/findutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index b35980a49d9c..aae4919f2ee5 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -1,6 +1,6 @@
 # Template file for 'findutils'
 pkgname=findutils
-version=4.8.0
+version=4.9.0
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -11,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/findutils"
 changelog="https://git.savannah.gnu.org/cgit/findutils.git/plain/NEWS"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164
+checksum=a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From 32e93608261c8f5a3d8a7c0f6ad0e1208941c246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Tue, 1 Feb 2022 23:06:24 +0100
Subject: [PATCH 1092/1686] ethtool: update to 5.16.

---
 srcpkgs/ethtool/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template
index 66add241d5e2..26ea94680d6b 100644
--- a/srcpkgs/ethtool/template
+++ b/srcpkgs/ethtool/template
@@ -1,6 +1,6 @@
 # Template file for 'ethtool'
 pkgname=ethtool
-version=5.14
+version=5.16
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -8,6 +8,6 @@ makedepends="libmnl-devel"
 short_desc="Utility for controlling network drivers and hardware"
 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=bb13db91915cacd7a492b65b65df07a67e4b974ddbeaf76205b1945a23d27686
+homepage="https://www.kernel.org/pub/software/network/ethtool/"
+distfiles="https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=aa2fef1936dd4a11755dfa0bdb93f0ec5bea45208d27c9754bc3abe1aa42c1cb

From a57d04e13a6fd7643edff95b6bad11622cd5049c Mon Sep 17 00:00:00 2001
From: Bleznudd <bleznudd@pm.me>
Date: Thu, 17 Feb 2022 17:38:13 +0100
Subject: [PATCH 1093/1686] setzer: update to 0.4.4.

---
 srcpkgs/setzer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/setzer/template b/srcpkgs/setzer/template
index dbf10bb07705..ab0d86c3ec3b 100644
--- a/srcpkgs/setzer/template
+++ b/srcpkgs/setzer/template
@@ -1,14 +1,14 @@
 # Template file for 'setzer'
 pkgname=setzer
-version=0.4.2
+version=0.4.4
 revision=1
 wrksrc=Setzer-${version}
 build_style=meson
 hostmakedepends="gettext"
-depends="poppler-glib virtual?tex gspell python3-xdg python3-gobject gtksourceview4 python3-pdfminer.six python3-pexpect"
+depends="poppler-glib virtual?tex gspell python3-gobject gtksourceview4 python3-pdfminer.six python3-pexpect"
 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=50b5d273120f81b1f0a7efbcc0ce1fb1623518fe18b23ded45a82e8166003d3b
+checksum=2b380c2d100970e25f851f42c354ed10e0c51de86c7b28ec1252173c22c393ce

From 46cf48ca18a7391d667813c296530798de5cf7ae Mon Sep 17 00:00:00 2001
From: Erica Z <zerica@tilde.team>
Date: Mon, 20 Dec 2021 19:57:16 +0100
Subject: [PATCH 1094/1686] font-ibm-plex-ttf: update to 6.0.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When there’s a choice between hinted and unhinted variants for a font
family, this template chooses the former. This is more or less an
arbitrary choice, since I’m unaware of any specific guidelines of this
sort. It’s impossible to include both, as the files themselves overlap,
and including neither (where applicable) would completely remove support
for some languages.
---
 srcpkgs/font-ibm-plex-ttf/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-ibm-plex-ttf/template b/srcpkgs/font-ibm-plex-ttf/template
index c5226d6761fd..b1717b8831c0 100644
--- a/srcpkgs/font-ibm-plex-ttf/template
+++ b/srcpkgs/font-ibm-plex-ttf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-ibm-plex-ttf'
 pkgname=font-ibm-plex-ttf
-version=5.2.1
+version=6.0.0
 revision=1
 wrksrc="plex-${version}"
 depends="font-util"
@@ -9,13 +9,14 @@ maintainer="Felipe Nogueira <contato.fnog@gmail.com>"
 license="OFL-1.1"
 homepage="https://github.com/IBM/plex"
 distfiles="https://github.com/IBM/plex/archive/v${version}.tar.gz"
-checksum=6b43a97a116a4beba474b9a9c646fb6ded8ba255fa8d3b252e669f67cbeb9d7f
+checksum=e78cc68cb40ccca0318facade727a0deb32f73e931a2e31bb2fcaf8a6d386dff
 
 font_dirs="/usr/share/fonts/TTF"
 
 do_install() {
 	vmkdir usr/share/fonts/TTF
 	vcopy "IBM-Plex-*/fonts/complete/ttf/*.ttf" usr/share/fonts/TTF
+	vcopy "IBM-Plex-*/fonts/complete/ttf/hinted/*.ttf" usr/share/fonts/TTF
 }
 
 font-ibm-plex-otf_package() {
@@ -25,5 +26,6 @@ font-ibm-plex-otf_package() {
 	pkg_install() {
 		vmkdir usr/share/fonts/OTF
 		vcopy "IBM-Plex-*/fonts/complete/otf/*.otf" usr/share/fonts/OTF
+		vcopy "IBM-Plex-*/fonts/complete/otf/hinted/*.otf" usr/share/fonts/OTF
 	}
 }

From 2bb75a9cee21379846fe0295f5970df373d27920 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 7 Apr 2022 19:21:41 +0200
Subject: [PATCH 1095/1686] e2fsprogs: update to 1.46.5.

---
 srcpkgs/e2fsprogs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index f58472ff7a8d..a32c50b823b5 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
-version=1.46.4
+version=1.46.5
 revision=1
 build_style=gnu-configure
 configure_args="--enable-elf-shlibs --disable-fsck
@@ -17,7 +17,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://e2fsprogs.sourceforge.net/"
 distfiles="${KERNEL_SITE}/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"
-checksum=b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713
+checksum=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e
 conf_files="/etc/mke2fs.conf /etc/e2scrub.conf"
 
 do_check() {

From a3a3d111777b52f120344371f0eeb4caf90de83b Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 15 Mar 2022 20:28:48 +0530
Subject: [PATCH 1096/1686] musikcube: update to 0.97.0, adopt

- Added patch to fix MPRIS support detection
- Moved openmpt plugin to a separate package `musikcube-openmpt`
---
 srcpkgs/musikcube-openmpt                     |  1 +
 .../patches/fix-install-locations.patch       | 26 ++++++-------
 .../patches/fix-mpris-detection.patch         | 25 ++++++++++++
 srcpkgs/musikcube/template                    | 39 +++++++++++--------
 4 files changed, 62 insertions(+), 29 deletions(-)
 create mode 120000 srcpkgs/musikcube-openmpt
 create mode 100644 srcpkgs/musikcube/patches/fix-mpris-detection.patch

diff --git a/srcpkgs/musikcube-openmpt b/srcpkgs/musikcube-openmpt
new file mode 120000
index 000000000000..b3cc8e74bf48
--- /dev/null
+++ b/srcpkgs/musikcube-openmpt
@@ -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 63537349f450..590f27bf1a7d 100644
--- a/srcpkgs/musikcube/patches/fix-install-locations.patch
+++ b/srcpkgs/musikcube/patches/fix-install-locations.patch
@@ -1,11 +1,11 @@
 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 CMakeLists.txt CMakeLists.txt
-index d685695f..5ac43f1f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -208,7 +208,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+diff --git a/.cmake/InstallFiles.cmake b/.cmake/InstallFiles.cmake
+index 62d3c003..01ef58ac 100644
+--- a/.cmake/InstallFiles.cmake
++++ b/.cmake/InstallFiles.cmake
+@@ -4,7 +4,7 @@ if (APPLE)
    install(FILES ${plugins} DESTINATION share/musikcube/plugins)
  else ()
    file(GLOB plugins "bin/plugins/*.so")
@@ -13,9 +13,9 @@ index d685695f..5ac43f1f 100644
 +  install(FILES ${plugins} DESTINATION lib/musikcube/plugins)
  endif ()
  
- file(GLOB sdk_headers "src/musikcore/sdk/*.h")
-@@ -237,20 +237,12 @@ endif()
- if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ if (${BUILD_STANDALONE} MATCHES "true")
+@@ -43,20 +43,12 @@ endif()
+ if (APPLE)
    install(FILES "bin/libmusikcore.dylib" DESTINATION share/musikcube)
  else()
 -  install(FILES "bin/libmusikcore.so" DESTINATION share/musikcube)
@@ -36,7 +36,7 @@ index d685695f..5ac43f1f 100644
    DESTINATION bin/
    PERMISSIONS
      OWNER_EXECUTE OWNER_READ OWNER_WRITE
-@@ -260,14 +252,6 @@ install(
+@@ -66,14 +58,6 @@ install(
  # executable and shell script for daemon
  install(
    FILES bin/musikcubed
@@ -51,12 +51,12 @@ index d685695f..5ac43f1f 100644
    DESTINATION bin/
    PERMISSIONS
      OWNER_EXECUTE OWNER_READ OWNER_WRITE
-diff --git src/musikcore/support/Common.cpp src/musikcore/support/Common.cpp
-index 58bc4d2f..1670c2f7 100644
+diff --git a/src/musikcore/support/Common.cpp b/src/musikcore/support/Common.cpp
+index 31703117..53aa8a88 100644
 --- a/src/musikcore/support/Common.cpp
 +++ b/src/musikcore/support/Common.cpp
-@@ -90,65 +90,11 @@ namespace musik { namespace core {
-     }
+@@ -82,65 +82,11 @@ static inline void silentDelete(const std::string fn) {
+ namespace musik { namespace core {
  
      std::string GetPluginDirectory() {
 -        std::string path(GetApplicationDirectory());
diff --git a/srcpkgs/musikcube/patches/fix-mpris-detection.patch b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
new file mode 100644
index 000000000000..dc7035d06693
--- /dev/null
+++ b/srcpkgs/musikcube/patches/fix-mpris-detection.patch
@@ -0,0 +1,25 @@
+In Void linux, elogind provides libsystemd
+
+diff --git a/.cmake/AddOsSpecificPlugins.cmake b/.cmake/AddOsSpecificPlugins.cmake
+index ce0eea9b..5b067671 100644
+--- a/.cmake/AddOsSpecificPlugins.cmake
++++ b/.cmake/AddOsSpecificPlugins.cmake
+@@ -6,7 +6,7 @@ endif()
+ 
+ # systemd / MPRIS detection
+ if (NOT ENABLE_MPRIS MATCHES "false")
+-  find_library(LIB_SYSTEMD NAMES systemd)
++  find_library(LIB_SYSTEMD NAMES elogind)
+   if (NOT LIB_SYSTEMD MATCHES "LIB_SYSTEMD-NOTFOUND")
+     message(STATUS "[mpris] systemd found at " ${LIB_SYSTEMD})
+     message(STATUS "[mpris] setting ENABLE_MPRIS=true")
+diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt
+index fdee62d2..7a941d08 100644
+--- a/src/plugins/mpris/CMakeLists.txt
++++ b/src/plugins/mpris/CMakeLists.txt
+@@ -6,4 +6,4 @@ find_package(PkgConfig)
+ pkg_check_modules (SYSTEMD REQUIRED libsystemd)
+ 
+ add_library(mpris SHARED ${mpris_SOURCES})
+-target_link_libraries(mpris systemd)
++target_link_libraries(mpris elogind)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index d8d4e73d6b4b..01afa616123a 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,40 +1,39 @@
 # Template file for 'musikcube'
 pkgname=musikcube
-version=0.96.10
+version=0.97.0
 revision=1
 build_style=cmake
 make_cmd=make
-configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true
- -DENABLE_PIPEWIRE=true -DENABLE_BUNDLED_TAGLIB=false"
+configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=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 pipewire-devel"
+ sndio-devel pipewire-devel ncurses-libtinfo-devel libopenmpt-devel
+ $(vopt_if elogind elogind-devel)"
 short_desc="Terminal-based music player in c++"
-maintainer="eater <=@eater.me>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://musikcube.com/"
 distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz"
-checksum=91fd984e68b6ef66f1be1ecdf0c84607453ec6ec80632ece688ac745c7719ea5
+checksum=ab170c5100251fcd6c8fd3c32eea45e9854c6c6272c6b0970bffbfc55d0b2ec5
+build_options="elogind"
+desc_option_elogind="Support MPRIS interface via elogind"
+build_options_default="elogind"
+
+export CMAKE_GENERATOR="Unix Makefiles"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	configure_args+=" -DCMAKE_EXE_LINKER_FLAGS='-latomic'"
 fi
 
-export CMAKE_GENERATOR="Unix Makefiles"
-
-#XXX: Otherwise xbps-install ffmpeg-devel will complain about unresolving shlibs
-# SDL2-2.0.10_3: broken, unresolvable shlib 'libGL.so.1'
-makedepends+=" libglvnd"
-
 post_install() {
 	vlicense LICENSE.txt
 }
 
 musikcube-devel_package() {
-	depends="musikcube-${version}_${revision}"
+	depends="${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -42,7 +41,7 @@ musikcube-devel_package() {
 }
 
 musikcube-sndio_package() {
-	depends="musikcube>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - sndio output plugin"
 	pkg_install() {
 		vmove usr/lib/musikcube/plugins/libsndioout.so
@@ -50,9 +49,17 @@ musikcube-sndio_package() {
 }
 
 musikcube-pipewire_package() {
-	depends="musikcube>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - pipewire output plugin"
 	pkg_install() {
 		vmove usr/lib/musikcube/plugins/libpipewireout.so
 	}
 }
+
+musikcube-openmpt_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - openmpt decoder plugin"
+	pkg_install() {
+		vmove usr/lib/musikcube/plugins/libopenmptdecoder.so
+	}
+}

From b111a396d89bafab41d083e6629a6e943cb9dee4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <marcin.e.puc@gmail.com>
Date: Wed, 23 Mar 2022 11:54:41 +0100
Subject: [PATCH 1097/1686] btrbk: update depends from pv to mbuffer

---
 srcpkgs/btrbk/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/btrbk/template b/srcpkgs/btrbk/template
index 5bc9c8d0ca3b..e4fa9196d218 100644
--- a/srcpkgs/btrbk/template
+++ b/srcpkgs/btrbk/template
@@ -1,11 +1,11 @@
 # Template file for 'btrbk'
 pkgname=btrbk
 version=0.31.3
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="BINDIR=/usr/bin"
 hostmakedepends="ruby-asciidoctor"
-depends="perl btrfs-progs openssh pv"
+depends="perl btrfs-progs mbuffer openssh"
 short_desc="Backup tool for btrfs subvolumes"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -14,7 +14,3 @@ changelog=https://github.com/digint/btrbk/blob/master/ChangeLog
 distfiles="http://digint.ch/download/btrbk/releases/${pkgname}-${version}.tar.xz"
 checksum=62f5494965dd594f81065e1ba17f9978d60343f72ee75ed18cda1a349cdda7d3
 conf_files="/etc/btrbk/*"
-
-post_install() {
-	rm -r $DESTDIR/usr/lib/systemd
-}

From 17e9533f67077627f0b829813231c8d8547780cf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Mar 2022 00:39:05 +0100
Subject: [PATCH 1098/1686] rspamd: remove gmime-devel build dependency

* not used since 1.5.0
---
 srcpkgs/rspamd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index e8df21abe54d..9d57ca1906c9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -7,8 +7,8 @@ build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
  -DDBDIR=/var/lib/rspamd"
 hostmakedepends="perl pkg-config ragel"
-makedepends="LuaJIT-devel fann-devel file-devel gd-devel gmime-devel
- hiredis-devel icu-devel libevent-devel sqlite-devel"
+makedepends="LuaJIT-devel fann-devel file-devel gd-devel
+ hiredis-devel icu-devel libevent-devel sqlite-devel libglib-devel"
 short_desc="Fast, free and open-source spam filtering system"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Apache-2.0"

From 5f91c65aec41cd0fc8bf6faec1a5cab0a09b6ec1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 1 Mar 2022 00:40:02 +0100
Subject: [PATCH 1099/1686] grilo-plugins: remove useless build dependencies

* replace intltool with gettext
* remove gupnp-av-devel build dep, not used since 2014
* remove gmime-devel build dep, not used since 0.3.8
---
 srcpkgs/grilo-plugins/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template
index 1cab3d09af26..65d0eb1640df 100644
--- a/srcpkgs/grilo-plugins/template
+++ b/srcpkgs/grilo-plugins/template
@@ -3,10 +3,10 @@ pkgname=grilo-plugins
 version=0.3.14
 revision=1
 build_style=meson
-hostmakedepends="pkg-config intltool itstool glib-devel gperf tracker3"
+hostmakedepends="pkg-config gettext itstool glib-devel gperf tracker3"
 # XXX missing plugins: fakemetadata.
-makedepends="grilo-devel gom-devel gupnp-av-devel json-glib-devel
- libquvi-devel rest-devel sqlite-devel libgcrypt-devel gmime-devel
+makedepends="grilo-devel gom-devel json-glib-devel
+ libquvi-devel rest-devel sqlite-devel libgcrypt-devel
  tracker3-devel totem-pl-parser-devel libgdata-devel libmediaart-devel
  gstreamer1-devel libdmapsharing-devel lua53-devel gnome-online-accounts-devel
  avahi-glib-libs-devel"

From 84a5606a3bed33fc1da56f63a53020f85907064f Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 6 Apr 2022 11:55:29 -0700
Subject: [PATCH 1100/1686] python3-identify: update to 2.4.12

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/python3-identify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-identify/template b/srcpkgs/python3-identify/template
index 65fd70ec42c6..7d2c231b6727 100644
--- a/srcpkgs/python3-identify/template
+++ b/srcpkgs/python3-identify/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-identify'
 pkgname=python3-identify
-version=2.4.11
+version=2.4.12
 revision=1
 wrksrc="identify-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://github.com/chriskuehl/identify"
 distfiles="${PYPI_SITE}/i/identify/identify-${version}.tar.gz"
-checksum=2986942d3974c8f2e5019a190523b0b0e2a07cb8e89bf236727fb4b26f27f8fd
+checksum=3f3244a559290e7d3deb9e9adc7b33594c1bc85a9dd82e0f1be519bf12a1ec17
 
 post_install() {
 	vlicense LICENSE

From a494d40930259b56ced4049c2b6dcda8b4f41b1c Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 6 Apr 2022 11:56:29 -0700
Subject: [PATCH 1101/1686] pre-commit: fix update checks

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/pre-commit/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/pre-commit/update

diff --git a/srcpkgs/pre-commit/update b/srcpkgs/pre-commit/update
new file mode 100644
index 000000000000..c44d58c699eb
--- /dev/null
+++ b/srcpkgs/pre-commit/update
@@ -0,0 +1 @@
+pattern="pre_commit-\K[0-9.]+(?=.tar.gz)"

From 095b563c9931ae614c19836a9bfd6484883e6433 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Wed, 6 Apr 2022 11:56:57 -0700
Subject: [PATCH 1102/1686] pre-commit: update to 2.18.1

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/pre-commit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template
index 3eecb71e1136..58e2730dde1f 100644
--- a/srcpkgs/pre-commit/template
+++ b/srcpkgs/pre-commit/template
@@ -1,6 +1,6 @@
 # Template file for 'pre-commit'
 pkgname=pre-commit
-version=2.17.0
+version=2.18.1
 revision=1
 wrksrc="pre_commit-${version}"
 build_style=python3-module
@@ -11,7 +11,7 @@ maintainer="Joseph Benden <joe@benden.us>"
 license="MIT"
 homepage="https://pre-commit.com/"
 distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz"
-checksum=c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a
+checksum=5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10
 make_check=no   # No tests available
 
 post_install() {

From ee739fbd752b602e38267cb5548872c6c493f1be Mon Sep 17 00:00:00 2001
From: Anton Baranov <abaranov@linuxfoundation.org>
Date: Tue, 5 Apr 2022 12:37:54 -0400
Subject: [PATCH 1103/1686] New package: vcsh-2.0.4

Signed-off-by: Anton Baranov <abaranov@linuxfoundation.org>
---
 srcpkgs/vcsh/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/vcsh/template

diff --git a/srcpkgs/vcsh/template b/srcpkgs/vcsh/template
new file mode 100644
index 000000000000..59a8186aa754
--- /dev/null
+++ b/srcpkgs/vcsh/template
@@ -0,0 +1,14 @@
+# Template file for 'vcsh'
+pkgname=vcsh
+version=2.0.4
+revision=1
+build_style=gnu-configure
+hostmakedepends="git"
+depends="git"
+short_desc="Version Control System for home directory"
+maintainer="Anton Baranov <abaranov.anton@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/RichiH/vcsh"
+changelog="https://raw.githubusercontent.com/RichiH/vcsh/main/changelog"
+distfiles="${homepage}/releases/download/v${version}/vcsh-${version}.tar.xz"
+checksum=5bf425d89f474c340fbb47a5df8987573a9ef3928658b3e9876b07cae1333cf2

From 39758470d19566f5939f63b912ebd13a13605b4e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 9 Mar 2022 22:12:40 +0100
Subject: [PATCH 1104/1686] xbps-src: add strict mode

---
 common/environment/setup/vsed.sh |  7 ++++++-
 common/travis/build.sh           |  2 +-
 xbps-src                         | 11 ++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/common/environment/setup/vsed.sh b/common/environment/setup/vsed.sh
index 5b5bf427c239..c74c086a4ce8 100644
--- a/common/environment/setup/vsed.sh
+++ b/common/environment/setup/vsed.sh
@@ -57,8 +57,13 @@ vsed() {
 			newdigest="$($XBPS_DIGEST_CMD "$f")"
 			newdigest="${newdigest%% *}"
 
+			msgfunc=msg_warn
+			if [ -n "$XBPS_STRICT" ]; then
+				msgfunc=msg_error
+			fi
+
 			if [ "$olddigest" = "$newdigest" ]; then
-				msg_warn "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n"
+				$msgfunc "$pkgver: vsed: regex \"$rx\" didn't change file \"$f\"\n"
 			fi
 			olddigest="${newdigest}"
 		done
diff --git a/common/travis/build.sh b/common/travis/build.sh
index f5cf9cffc064..007a61f994d7 100755
--- a/common/travis/build.sh
+++ b/common/travis/build.sh
@@ -13,7 +13,7 @@ fi
 PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates))
 
 for pkg in ${PKGS}; do
-	/hostrepo/xbps-src -j$(nproc) -H "$HOME"/hostdir $arch $test pkg "$pkg"
+	/hostrepo/xbps-src -j$(nproc) -s -H "$HOME"/hostdir $arch $test pkg "$pkg"
 	[ $? -eq 1 ] && exit 1
 done
 
diff --git a/xbps-src b/xbps-src
index ff249015ed02..8488c5a3a49c 100755
--- a/xbps-src
+++ b/xbps-src
@@ -216,6 +216,9 @@ $(print_cross_targets)
     This alternative repository will also be used to resolve dependencies
     with highest priority order than others.
 
+-s
+    Make vsed warnings errors.
+
 -t  Create a temporary masterdir to not pollute the current one. Note that
     the existing masterdir must be fully populated with binary-bootstrap first.
     Once the target has finished, this temporary masterdir will be removed.
@@ -357,7 +360,7 @@ readonly XBPS_SRC_VERSION="113"
 export XBPS_MACHINE=$(xbps-uhelper -C /dev/null arch)
 
 XBPS_OPTIONS=
-XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qQKr:tV"
+XBPS_OPTSTRING="1a:c:CEfgGhH:iIj:Lm:No:p:qsQKr:tV"
 
 # Preprocess arguments in order to allow options before and after XBPS_TARGET.
 eval set -- $(getopt "$XBPS_OPTSTRING" "$@");
@@ -389,6 +392,7 @@ while getopts "$XBPS_OPTSTRING" opt; do
         Q) XBPS_ARG_CHECK_PKGS=yes; XBPS_OPTIONS+=" -Q";;
         K) XBPS_ARG_CHECK_PKGS=full; XBPS_OPTIONS+=" -K";;
         r) XBPS_ARG_ALT_REPOSITORY="$OPTARG"; XBPS_OPTIONS+=" -r $OPTARG";;
+        s) XBPS_ARG_STRICT=yes; XBPS_OPTIONS+=" -s";;
         t) XBPS_ARG_TEMP_MASTERDIR=1; XBPS_OPTIONS+=" -t -C";;
         V) echo "xbps-src-$XBPS_SRC_VERSION $(xbps-uhelper -V)" && exit 0;;
         --) shift; break;;
@@ -471,6 +475,7 @@ fi
 [ -n "$XBPS_ARG_QUIET" ] && XBPS_QUIET=1
 [ -n "$XBPS_ARG_PRINT_VARIABLES" ] && XBPS_PRINT_VARIABLES="$XBPS_ARG_PRINT_VARIABLES"
 [ -n "$XBPS_ARG_ALT_REPOSITORY" ] && XBPS_ALT_REPOSITORY="$XBPS_ARG_ALT_REPOSITORY"
+[ -n "$XBPS_ARG_STRICT" ] && XBPS_STRICT="$XBPS_ARG_STRICT"
 [ -n "$XBPS_ARG_CROSS_BUILD" ] && XBPS_CROSS_BUILD="$XBPS_ARG_CROSS_BUILD"
 [ -n "$XBPS_ARG_CHECK_PKGS" ] && XBPS_CHECK_PKGS="$XBPS_ARG_CHECK_PKGS"
 [ -n "$XBPS_ARG_MAKEJOBS" ] && XBPS_MAKEJOBS="$XBPS_ARG_MAKEJOBS"
@@ -478,7 +483,7 @@ fi
 export XBPS_BUILD_ONLY_ONE_PKG XBPS_SKIP_REMOTEREPOS XBPS_BUILD_FORCEMODE \
        XBPS_INFORMATIVE_RUN XBPS_TEMP_MASTERDIR XBPS_BINPKG_EXISTS \
        XBPS_USE_GIT_REVS XBPS_CHECK_PKGS XBPS_DEBUG_PKGS XBPS_SKIP_DEPS \
-       XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_CROSS_BUILD \
+       XBPS_KEEP_ALL XBPS_QUIET XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_CROSS_BUILD \
        XBPS_MAKEJOBS XBPS_PRINT_VARIABLES
 
 # The masterdir/hostdir variables are forced and readonly in chroot
@@ -626,7 +631,7 @@ readonly XBPS_CMPVER_CMD="xbps-uhelper cmpver"
 
 export XBPS_SHUTILSDIR XBPS_CROSSPFDIR XBPS_TRIGGERSDIR \
     XBPS_SRCPKGDIR XBPS_COMMONDIR XBPS_BUILDDIR \
-    XBPS_REPOSITORY XBPS_ALT_REPOSITORY XBPS_SRCDISTDIR XBPS_DIGEST_CMD \
+    XBPS_REPOSITORY XBPS_ALT_REPOSITORY XBPS_STRICT XBPS_SRCDISTDIR XBPS_DIGEST_CMD \
     XBPS_UHELPER_CMD XBPS_INSTALL_CMD XBPS_QUERY_CMD XBPS_BUILD_ONLY_ONE_PKG \
     XBPS_RINDEX_CMD XBPS_RECONFIGURE_CMD XBPS_REMOVE_CMD XBPS_CHECKVERS_CMD \
     XBPS_CMPVER_CMD XBPS_FETCH_CMD XBPS_VERSION XBPS_BUILDSTYLEDIR \

From 0e71b46b8450599376838a3bebef7882b169b738 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Mon, 7 Mar 2022 10:48:07 +0200
Subject: [PATCH 1105/1686] CopyQ: update to 6.1.0.

---
 srcpkgs/CopyQ/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/CopyQ/template b/srcpkgs/CopyQ/template
index c7fa15c9d05c..1c7e3e041f9e 100644
--- a/srcpkgs/CopyQ/template
+++ b/srcpkgs/CopyQ/template
@@ -1,6 +1,6 @@
 # Template file for 'CopyQ'
 pkgname=CopyQ
-version=6.0.1
+version=6.1.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-tools-devel extra-cmake-modules pkg-config
@@ -14,4 +14,4 @@ license="GPL-3.0-or-later"
 homepage="https://hluk.github.io/CopyQ/"
 changelog="https://raw.githubusercontent.com/hluk/CopyQ/master/CHANGES.md"
 distfiles="https://github.com/hluk/CopyQ/archive/v${version}.tar.gz"
-checksum=8d0b0fa840993fa100e888a5a1098e2769e3c234cd44236d75039e5c6e517645
+checksum=d235b31224264e7fa463020f1a934143aa287a4d9cb9bbb6883563ad66e84099

From 3d5bdfb97f61c7a945ac197ea05b6d7f5b75bfd6 Mon Sep 17 00:00:00 2001
From: Joseph Benden <joe@benden.us>
Date: Thu, 17 Feb 2022 11:37:42 -0700
Subject: [PATCH 1106/1686] protonmail-bridge: update to 2.1.1.

Signed-off-by: Joseph Benden <joe@benden.us>
---
 srcpkgs/protonmail-bridge/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/protonmail-bridge/template b/srcpkgs/protonmail-bridge/template
index 05cb9f62a13a..056676f69b84 100644
--- a/srcpkgs/protonmail-bridge/template
+++ b/srcpkgs/protonmail-bridge/template
@@ -1,6 +1,6 @@
 # Template file for 'protonmail-bridge'
 pkgname=protonmail-bridge
-version=1.8.12
+version=2.1.1
 revision=1
 archs="x86_64"
 build_style=fetch
@@ -10,7 +10,7 @@ maintainer="Rich G <rich@richgannon.net>"
 license="GPL-3.0-or-later"
 homepage="https://protonmail.com/bridge"
 distfiles="https://protonmail.com/download/bridge/protonmail-bridge_${version}-1_amd64.deb"
-checksum=90eff7d27e4835e3a204019cafa7062467ec45688a1a6d407896976bdeb1f8ea
+checksum=9c6c1daa0dac1835e72c886064b0e9a38749f96bdf47719f08eaac787d43bca7
 
 restricted=yes
 noverifyrdeps=yes

From d1a41aec867bbd94bf878c2a89bc215b0df4e1ef Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Thu, 7 Apr 2022 21:20:06 +0200
Subject: [PATCH 1107/1686] New package: mokutil-0.5.0

---
 srcpkgs/mokutil/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/mokutil/template

diff --git a/srcpkgs/mokutil/template b/srcpkgs/mokutil/template
new file mode 100644
index 000000000000..06225c575530
--- /dev/null
+++ b/srcpkgs/mokutil/template
@@ -0,0 +1,17 @@
+# Template file for 'mokutil'
+pkgname=mokutil
+version=0.5.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="autoconf automake pkg-config"
+makedepends="keyutils-devel libefivar-devel openssl-devel"
+short_desc="Utility to manipulate machine owner keys"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/lcp/mokutil"
+distfiles="https://github.com/lcp/mokutil/archive/refs/tags/${version}.tar.gz"
+checksum=af7616855f817e7eb54043071e51c8651bc8cc479ac455fbfe35203d98de8181
+
+pre_configure() {
+	autoreconf -fi
+}

From 8467ad56a6a08a50a5dcb10574e445de33f64753 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 19:18:14 +0200
Subject: [PATCH 1108/1686] printrun: remove package

---
 srcpkgs/printrun/template         | 20 --------------------
 srcpkgs/printrun/update           |  1 -
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 srcpkgs/printrun/template
 delete mode 100644 srcpkgs/printrun/update

diff --git a/srcpkgs/printrun/template b/srcpkgs/printrun/template
deleted file mode 100644
index d18d21df3e69..000000000000
--- a/srcpkgs/printrun/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'printrun'
-pkgname=printrun
-version=1.6.0
-revision=4
-wrksrc="Printrun-printrun-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools python-pyserial"
-depends="python wxPython python-pyserial python-pyglet python-numpy"
-short_desc="3D printing host suite"
-maintainer="Jasper Chan <jasperchan515@gmail.com>"
-license="GPL-3.0-or-later"
-homepage="http://www.pronterface.com"
-distfiles="https://github.com/kliment/Printrun/archive/printrun-${version}.tar.gz"
-checksum=fefcb4c5793fc77205a14263bc915616cde0523cd60704f356191b9ae34ba65d
-
-post_install() {
-	for file in ${DESTDIR}/usr/bin/*.py; do
-		mv -- "$file" "${file%%.py}"
-	done
-}
diff --git a/srcpkgs/printrun/update b/srcpkgs/printrun/update
deleted file mode 100644
index 091ee4faee75..000000000000
--- a/srcpkgs/printrun/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="[12][0-9][0-9][0-9][01][0-9][0-3][0-9]"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 240f1282f54c..9940f101c83b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -266,6 +266,7 @@ replaces="
  phonon-backend-gstreamer<=4.9.0_2
  phonon-backend-vlc<=0.9.1_3
  polkit-qt<=0.112.0_5
+ printrun<=1.6.0_4
  pritunl-client<=1.0.1865.25_2
  profile-sync-daemon<=5.75_4
  profont<=1.0_2

From fc58e184a49b226ae3dc634ca7507affba72c486 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 19:26:06 +0200
Subject: [PATCH 1109/1686] python-pyglet: remove package

---
 srcpkgs/python3-pyglet                        |  1 -
 .../template                                  | 22 ++++++-------------
 .../{python-pyglet => python3-pyglet}/update  |  0
 srcpkgs/removed-packages/template             |  1 +
 4 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/python3-pyglet
 rename srcpkgs/{python-pyglet => python3-pyglet}/template (54%)
 rename srcpkgs/{python-pyglet => python3-pyglet}/update (100%)

diff --git a/srcpkgs/python3-pyglet b/srcpkgs/python3-pyglet
deleted file mode 120000
index 0da9a8d712fa..000000000000
--- a/srcpkgs/python3-pyglet
+++ /dev/null
@@ -1 +0,0 @@
-python-pyglet
\ No newline at end of file
diff --git a/srcpkgs/python-pyglet/template b/srcpkgs/python3-pyglet/template
similarity index 54%
rename from srcpkgs/python-pyglet/template
rename to srcpkgs/python3-pyglet/template
index e5444022ba3e..cb8333021997 100644
--- a/srcpkgs/python-pyglet/template
+++ b/srcpkgs/python3-pyglet/template
@@ -1,27 +1,19 @@
-# Template file for 'python-pyglet'
-pkgname=python-pyglet
+# Template file for 'python3-pyglet'
+pkgname=python3-pyglet
 version=1.4.10
 revision=4
 wrksrc="pyglet-${version}"
-build_style=python-module
-hostmakedepends="python-setuptools python3-setuptools unzip"
-depends="python"
-short_desc="Cross-platform windowing and multimedia library for Python2"
+build_style=python3-module
+hostmakedepends="python3-setuptools unzip"
+depends="python3"
+short_desc="Cross-platform windowing and multimedia library for Python3"
 maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://www.pyglet.org"
 distfiles="${PYPI_SITE}/p/pyglet/pyglet-${version}.zip"
 checksum=c57e3e18246f45e4d6bb3d29e39d128d6e72b05f4212b10353adc3ba260ceb65
+make_check=no # pyglet requires an X server with GLX
 
 post_install() {
 	vlicense LICENSE
 }
-
-python3-pyglet_package() {
-	depends="python3"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python-pyglet/update b/srcpkgs/python3-pyglet/update
similarity index 100%
rename from srcpkgs/python-pyglet/update
rename to srcpkgs/python3-pyglet/update
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9940f101c83b..222727ba8e70 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -307,6 +307,7 @@ replaces="
  python-pycryptodome<=3.9.7_3
  python-pydns<=2.3.6_4
  python-pyenet<=1.3.13.post7_2
+ python-pyglet<=1.4.10_4
  python-pyside<=1.2.2_7
  python-pystache<=0.5.4_6
  python-pytest-relaxed<=1.1.2_2

From 80722324054a1410cfc1869dc121f56a804a590f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 2 Apr 2022 19:01:07 +0200
Subject: [PATCH 1110/1686] gradio: remove package

archived repository, doesn't build with vala 0.56

Closes: #32470
---
 srcpkgs/removed-packages/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 222727ba8e70..e4808ef3d798 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -95,6 +95,7 @@ replaces="
  goat<=0.0.0.28022016_10
  goffice0.8<=0.8.17_6
  goproxy<=7.0_1
+ gradio<=7.2_1
  grv<=0.3.1_3
  gsettings-qt<=0.1+17.10.20170824_3
  gst1-python<=1.18.3_1

From d2ed0004ae8a665a926ae4332c29f0d53b4611e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 1 Apr 2022 01:03:42 +0200
Subject: [PATCH 1111/1686] vala-panel-appmenu: remove gtk2 subpackage

---
 common/shlibs                       |  1 -
 srcpkgs/appmenu-gtk-module          |  1 -
 srcpkgs/removed-packages/template   |  1 +
 srcpkgs/vala-panel-appmenu/template | 18 ++++--------------
 4 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/appmenu-gtk-module

diff --git a/common/shlibs b/common/shlibs
index 836cacc49b89..848b488bb2d0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3631,7 +3631,6 @@ libibverbs.so.1 rdma-core-22.1_1
 librdmacm.so.1 rdma-core-22.1_1
 libdvdcss.so.2 libdvdcss-1.4.2_1
 libvalapanel.so.0 vala-panel-0.4.87_1
-libappmenu-gtk2-parser.so.0 appmenu-gtk-module-0.7.1_1
 libappmenu-gtk3-parser.so.0 appmenu-gtk3-module-0.7.1_1
 libqhttpengine.so.1 qhttpengine-1.0.1_1
 libqmdnsengine.so.0 qmdnsengine-0.1.0_1
diff --git a/srcpkgs/appmenu-gtk-module b/srcpkgs/appmenu-gtk-module
deleted file mode 120000
index ae1083c7375d..000000000000
--- a/srcpkgs/appmenu-gtk-module
+++ /dev/null
@@ -1 +0,0 @@
-vala-panel-appmenu
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e4808ef3d798..57df15daae2b 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -18,6 +18,7 @@ replaces="
  albert<=0.16.1_4
  apg<=2.2.3_5
  appdata-tools<=0.1.8_2
+ appmenu-gtk-module<=0.7.6_1
  arm-mem-git<=20131108_2
  arptables<=0.0.4_3
  atom<=1.44.0_1
diff --git a/srcpkgs/vala-panel-appmenu/template b/srcpkgs/vala-panel-appmenu/template
index 198254fdf474..b32b9c6d15c2 100644
--- a/srcpkgs/vala-panel-appmenu/template
+++ b/srcpkgs/vala-panel-appmenu/template
@@ -2,10 +2,10 @@
 pkgname=vala-panel-appmenu
 _glhash=18896e602f40b03fcb0a8437a2e197d4
 version=0.7.6
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config vala bamf glib-devel gettext"
-makedepends="vala-devel bamf-devel gtk+-devel gtk+3-devel
+makedepends="vala-devel bamf-devel gtk+3-devel
  libxkbcommon-devel libpeas-devel libdbusmenu-glib-devel
  xfce4-panel-devel xfconf-devel libmate-panel-devel libXt-devel
  vala-panel-devel"
@@ -19,26 +19,16 @@ checksum=2856added014bb6e5238aacda1016e2520d9a58d4ba6d7b33b2707ea48e1c592
 
 appmenu-gtk-module-devel_package() {
 	short_desc="GTK module for exposing menus - development files"
-	depends="appmenu-gtk-module-${version}_${revision}
-	 appmenu-gtk3-module-${version}_${revision}"
+	depends="appmenu-gtk3-module-${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
-		vmove "usr/lib/libappmenu-gtk2*.so"
 		vmove "usr/lib/libappmenu-gtk3*.so"
 	}
 }
 
-appmenu-gtk-module_package() {
-	short_desc="GTK module for exposing menus"
-	pkg_install() {
-		vmove usr/lib/gtk-2.0
-		vmove "usr/lib/libappmenu-gtk2*.so.*"
-	}
-}
-
 appmenu-gtk3-module_package() {
-	short_desc="GTK3 module for exposing menus"
+	short_desc="GTK module for exposing menus"
 	pkg_install() {
 		vmove usr/lib/gtk-3.0
 		vmove "usr/lib/libappmenu-gtk3*.so.*"

From 3745d8620b2ec2c210197d34dad70d4561890c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Wed, 9 Feb 2022 18:08:48 +0100
Subject: [PATCH 1112/1686] gitui: update to 0.20.1.

---
 srcpkgs/gitui/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index 929eca8cd19e..c2466612dd95 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,6 +1,6 @@
 # Template file for 'gitui'
 pkgname=gitui
-version=0.19.0
+version=0.20.1
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config python3"
@@ -11,7 +11,11 @@ license="MIT"
 homepage="https://github.com/extrawurst/gitui"
 changelog="https://github.com/extrawurst/gitui/blob/master/CHANGELOG.md"
 distfiles="https://github.com/extrawurst/gitui/archive/refs/tags/v${version}.tar.gz"
-checksum=bcbffb592a5ae49658c79ac7b0daefe4bac3d2b988fdbaf0e868b8c308962f0d
+checksum=eccec120dfd4c5c33a74d331a53f3d0c6cb7200e26b0c4c7873278eb951bc379
+
+post_patch() {
+	cargo update --package autocfg --precise 1.1.0
+}
 
 post_install() {
 	vlicense LICENSE.md

From b7f2be86be6882f42ef72d9f2bd3181b07f1418f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:12:52 +0200
Subject: [PATCH 1113/1686] nemo: remove unused tracker build dependency

---
 srcpkgs/nemo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index 4f9acf52fab9..4144c409f778 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -7,7 +7,7 @@ build_helper=gir
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
 hostmakedepends="gettext-devel glib-devel intltool pkg-config"
 makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel tracker-devel xapps-devel libgsf-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel"
 depends="cinnamon-translations dconf gvfs"
 short_desc="Cinnamon file manager (nautilus fork)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 7e3035dfe72e5020cb3c468f8b1aca776b7e52c5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 26 Dec 2021 18:21:26 +0100
Subject: [PATCH 1114/1686] New package: kalendar-0.4.0

---
 srcpkgs/kalendar/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/kalendar/template

diff --git a/srcpkgs/kalendar/template b/srcpkgs/kalendar/template
new file mode 100644
index 000000000000..0cdfbd27c3e4
--- /dev/null
+++ b/srcpkgs/kalendar/template
@@ -0,0 +1,19 @@
+# Template file for 'kalendar'
+pkgname=kalendar
+version=0.4.0
+revision=1
+build_style=cmake
+hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
+ kcoreaddons kconfig"
+makedepends="qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel
+ qt5-svg-devel qt5-location-devel kirigami2-devel kdbusaddons-devel ki18n-devel
+ kcalendarcore-devel kconfigwidgets-devel kwindowsystem-devel kcoreaddons-devel
+ kcontacts-devel kitemmodels-devel kxmlgui-devel knotifications-devel
+ kiconthemes-devel kservice-devel akonadi5-devel akonadi-contacts-devel
+ calendarsupport-devel eventviews-devel"
+short_desc="Calendar application using Akonadi"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://invent.kde.org/pim/kalendar"
+distfiles="${KDE_SITE}/kalendar/kalendar-${version}.tar.xz"
+checksum=d64b19caab3e1365cce58ae27b76417b515cf3a07777ed1905f82cfbf0d1947a

From 96210e638add87a371e2baab1471507cd85e1250 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 01:07:40 +0200
Subject: [PATCH 1115/1686] gzip: update to 1.12.

---
 srcpkgs/gzip/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template
index d2cf4853c9ff..037dd3b27a4c 100644
--- a/srcpkgs/gzip/template
+++ b/srcpkgs/gzip/template
@@ -1,6 +1,6 @@
 # Template file for 'gzip'
 pkgname=gzip
-version=1.11
+version=1.12
 revision=1
 bootstrap=yes
 build_style=gnu-configure
@@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/gzip/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
-checksum=9b9a95d68fdcb936849a4d6fada8bf8686cddf58b9b26c9c4289ed0c92a77907
+checksum=ce5e03e519f637e1f814011ace35c4f87b33c0bbabeec35baf5fbd3479e91956
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) configure_args+=" DEFS=NO_ASM gl_cv_func_fflush_stdin=yes" ;;

From dfc8ae79f60a057a4b72ca0c6eab6946c7e4e06b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 8 Apr 2022 12:58:50 +0200
Subject: [PATCH 1116/1686] yt-dlp: update to 2022.04.08.

---
 srcpkgs/yt-dlp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yt-dlp/template b/srcpkgs/yt-dlp/template
index 967cb7e75b0d..95c9db3e951c 100644
--- a/srcpkgs/yt-dlp/template
+++ b/srcpkgs/yt-dlp/template
@@ -1,6 +1,6 @@
 # Template file for 'yt-dlp'
 pkgname=yt-dlp
-version=2022.03.08.1
+version=2022.04.08
 revision=1
 wrksrc="$pkgname"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="Unlicense"
 homepage="https://github.com/yt-dlp/yt-dlp"
 changelog="https://raw.githubusercontent.com/yt-dlp/yt-dlp/master/Changelog.md"
 distfiles="https://github.com/yt-dlp/yt-dlp/releases/download/$version/yt-dlp.tar.gz"
-checksum=135fd7bbf81c2639419b191d8e5abb80cd8a9801b7ed8e92a331a4107e820ab2
+checksum=a9ea3753977dd82f051f0674fbdc3eb5ff49a67246f4bd3cac5745702828d1db
 
 do_check() {
 	PYTHON=/usr/bin/python3 make offlinetest

From 8860089295476baa345a15a791517acb1c956c1f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 8 Apr 2022 13:00:01 +0200
Subject: [PATCH 1117/1686] nemo: fix build

---
 srcpkgs/nemo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template
index 4144c409f778..75938f0d5c6c 100644
--- a/srcpkgs/nemo/template
+++ b/srcpkgs/nemo/template
@@ -7,7 +7,7 @@ build_helper=gir
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
 hostmakedepends="gettext-devel glib-devel intltool pkg-config"
 makedepends="cinnamon-desktop-devel dconf-devel exempi-devel gvfs-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel"
+ libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel"
 depends="cinnamon-translations dconf gvfs"
 short_desc="Cinnamon file manager (nautilus fork)"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 625ad1fe0f34b262acbf42381f4ffeede79129ff Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 8 Apr 2022 14:20:31 +0200
Subject: [PATCH 1118/1686] whois: update to 5.5.13.

---
 srcpkgs/whois/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index 46bb8347a810..ecc647d81960 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,6 +1,6 @@
 # Template file for 'whois'
 pkgname=whois
-version=5.5.12
+version=5.5.13
 revision=1
 wrksrc=whois
 build_style=gnu-makefile
@@ -15,7 +15,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=f1c5bab781b7f2357dab1039e8875d41ff7b5d03a78c27443fa26351952a0822
+checksum=62e613f116d5635aea6684238db00b030a6602ffc79462e4a0a8e62cb184b5d7
 
 alternatives="
  whois:whois:/usr/bin/gwhois

From a8e7a8399844512d7775dbcca6f51e52735575aa Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 8 Apr 2022 17:03:17 +0200
Subject: [PATCH 1119/1686] nm-tray: update to 0.5.0.

---
 srcpkgs/nm-tray/patches/ftbfs.patch | 10 ----------
 srcpkgs/nm-tray/template            |  6 +++---
 2 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/nm-tray/patches/ftbfs.patch

diff --git a/srcpkgs/nm-tray/patches/ftbfs.patch b/srcpkgs/nm-tray/patches/ftbfs.patch
deleted file mode 100644
index 1458bb63a9a0..000000000000
--- a/srcpkgs/nm-tray/patches/ftbfs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/nmmodel.cpp
-+++ b/src/nmmodel.cpp
-@@ -45,6 +45,7 @@ COPYRIGHT_HEADER*/
- #include <NetworkManagerQt/ConnectionSettings>
- #include <QDBusPendingCallWatcher>
- #include <QInputDialog>
-+#include <QMetaEnum>
- 
- namespace
- {
diff --git a/srcpkgs/nm-tray/template b/srcpkgs/nm-tray/template
index bda727cc43b9..03b6cd85e1be 100644
--- a/srcpkgs/nm-tray/template
+++ b/srcpkgs/nm-tray/template
@@ -1,7 +1,7 @@
 # Template file for 'nm-tray'
 pkgname=nm-tray
-version=0.4.3
-revision=2
+version=0.5.0
+revision=1
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
 makedepends="qt5-tools-devel networkmanager-qt5-devel"
@@ -11,4 +11,4 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/palinek/nm-tray"
 distfiles="https://github.com/palinek/nm-tray/archive/${version}.tar.gz"
-checksum=1611c053582189091efa74c2f26277afc872a57cfd4ec9e54463f68c25ad284b
+checksum=3db9fdfcf274392f040ee2e7370be41aaae5d700277979f661718e6d893c5ff5

From 9c7c71e6d60fb915559c8a9a208e9f1c086ac20c Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Mon, 10 Jan 2022 11:32:22 +0100
Subject: [PATCH 1120/1686] New package: PolyMC-1.1.1

---
 srcpkgs/PolyMC/files/README.voidlinux |  6 ++++++
 srcpkgs/PolyMC/template               | 30 +++++++++++++++++++++++++++
 srcpkgs/PolyMC/update                 |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 srcpkgs/PolyMC/files/README.voidlinux
 create mode 100644 srcpkgs/PolyMC/template
 create mode 100644 srcpkgs/PolyMC/update

diff --git a/srcpkgs/PolyMC/files/README.voidlinux b/srcpkgs/PolyMC/files/README.voidlinux
new file mode 100644
index 000000000000..16ee7f91717b
--- /dev/null
+++ b/srcpkgs/PolyMC/files/README.voidlinux
@@ -0,0 +1,6 @@
+Void-specific instructions:
+============================
+
+You may not have the correct version of java installed for running specific
+versions of Minecraft. For Minecraft version 1.17 and up install openjdk17-jre
+and for older ones openjdk8-jre.
diff --git a/srcpkgs/PolyMC/template b/srcpkgs/PolyMC/template
new file mode 100644
index 000000000000..3b3b0deb3466
--- /dev/null
+++ b/srcpkgs/PolyMC/template
@@ -0,0 +1,30 @@
+# Template file for 'PolyMC'
+pkgname=PolyMC
+version=1.1.1
+revision=1
+build_style=cmake
+configure_args="-DLauncher_BUILD_PLATFORM=Void -DLauncher_PORTABLE=0
+ -DLauncher_VERSION_BUILD=${revision}"
+hostmakedepends="openjdk8 qt5-host-tools qt5-qmake"
+makedepends="qt5-devel"
+depends="virtual?java-runtime qt5-imageformats xrandr"
+short_desc="Custom launcher for Minecraft"
+maintainer="Philipp David <pd@3b.pm>"
+license="GPL-3.0-only"
+homepage="https://polymc.org/"
+distfiles="https://github.com/PolyMC/PolyMC/releases/download/${version}/PolyMC-${version}.tar.gz"
+checksum=7ade9abc3a6f61ed27a129c10084c783cc9a3266484a53e29dabcc1cbb0ba5c4
+
+case "$XBPS_TARGET_MACHINE" in
+	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
+esac
+
+post_patch() {
+	vsed -i buildconfig/BuildConfig.cpp.in \
+		-e 's/"-" + QString/"_" + QString/'
+	rm -rf .git
+}
+
+post_install() {
+	vdoc ${FILESDIR}/README.voidlinux
+}
diff --git a/srcpkgs/PolyMC/update b/srcpkgs/PolyMC/update
new file mode 100644
index 000000000000..7517baa7a2f7
--- /dev/null
+++ b/srcpkgs/PolyMC/update
@@ -0,0 +1,2 @@
+site=https://github.com/PolyMC/PolyMC/tags
+pattern='tag/\K[\d]+\.[\d]+(\.[\d]+)?'

From 3cdf5c06c6b1c908bbfc9d72819641e77d27f798 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 9 Apr 2022 09:47:49 +0200
Subject: [PATCH 1121/1686] wine: update to 7.6.

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  | 8 ++++----
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 45cb7cbd5106..7546d45c7609 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.5/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index 4ed5e2642d9f..e0b6f8626637 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.5/configure
-+++ b/wine-7.5/configure
+--- a/wine-7.6/configure
++++ b/wine-7.6/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
---- a/wine-7.5/configure.ac
-+++ b/wine-7.5/configure.ac
+--- a/wine-7.6/configure.ac
++++ b/wine-7.6/configure.ac
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index a358997c3963..a95011e3cca0 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.5/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.5/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/wine-7.6/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/wine-7.6/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index e9598ba932a0..86d0acf0883b 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.5
+version=7.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="462c3185aedeec851067a5165d648f5499fb93c1b655f46b825f4bc11914e281
- 3b3a10654c90b210ab8dbf9d0aa2d2e3f4179a73e56e7c2101008e77903afead"
+checksum="eeab772f091328a3fb9db89aacab6be087c3d59c168ef2b41af5ec5010cf0328
+ bdd1a095b9c4cddce4663825e2ad331c5bf1ac8b2288b0b380a665d0ca987a23"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From fcf4dcb47a90cc481943e0a27e63a761fdfc79f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 10:56:14 +0200
Subject: [PATCH 1122/1686] peshming: update to 0.5.1.

---
 srcpkgs/peshming/template | 4 ++--
 srcpkgs/peshming/update   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/peshming/update

diff --git a/srcpkgs/peshming/template b/srcpkgs/peshming/template
index 0b07235208a9..7db23fad88be 100644
--- a/srcpkgs/peshming/template
+++ b/srcpkgs/peshming/template
@@ -1,6 +1,6 @@
 # Template file for 'peshming'
 pkgname=peshming
-version=0.5.0
+version=0.5.1
 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=9b737124e38d4dc6ac91f0e8bc07aab4d5acbbb019c544feb1aa92d6ab0ea8c5
+checksum=b7b2999dbb75eb8915244cd7959a8f38f3e00f7f6e38f6c406a4d5e44aa372b4
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
diff --git a/srcpkgs/peshming/update b/srcpkgs/peshming/update
new file mode 100644
index 000000000000..b0e921863949
--- /dev/null
+++ b/srcpkgs/peshming/update
@@ -0,0 +1,2 @@
+site=https://git.jcg.re/jcgruenhage/peshming/tags
+pattern='<a class="df ac" href="/jcgruenhage/peshming/src/tag/v\d.\d.\d" rel="nofollow">v\K\d.\d.\d(?=</a>)'

From dc897aafc453e5a338f9bfd54dd6391e5eb0d650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 12:22:33 +0200
Subject: [PATCH 1123/1686] topgrade: update to 8.3.0.

---
 srcpkgs/topgrade/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/topgrade/template b/srcpkgs/topgrade/template
index 461b88685248..f560ee845734 100644
--- a/srcpkgs/topgrade/template
+++ b/srcpkgs/topgrade/template
@@ -1,6 +1,6 @@
 # Template file for 'topgrade'
 pkgname=topgrade
-version=8.2.0
+version=8.3.0
 revision=1
 build_style=cargo
 short_desc="Meta upgrade tool for pip, flatpak, your distro and everything else"
@@ -8,7 +8,7 @@ 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=54fe60ef70b21b34c50c0d342ec120aff3a9522ef44a9737f42d5700aed7a1c3
+checksum=a818cbdc64aafe77a589299d5717988fd5e5403af0998a9945b9d17a5b6f499b
 
 post_install() {
 	vman topgrade.8

From 4516c43a17b3b3576e4f9a135a9c51a27b33e3b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 12:29:59 +0200
Subject: [PATCH 1124/1686] cargo-about: update to 0.5.1.

---
 srcpkgs/cargo-about/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-about/template b/srcpkgs/cargo-about/template
index 048f21085fa3..2bfdb47d5c60 100644
--- a/srcpkgs/cargo-about/template
+++ b/srcpkgs/cargo-about/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-about'
 pkgname=cargo-about
-version=0.4.7
+version=0.5.1
 revision=1
 # depends on rustls/ring
 archs="x86_64* aarch64* i686* arm*"
@@ -11,7 +11,7 @@ license="MIT, Apache-2.0"
 homepage="https://github.com/EmbarkStudios/cargo-about"
 changelog="https://raw.githubusercontent.com/EmbarkStudios/cargo-about/main/CHANGELOG.md"
 distfiles="https://github.com/EmbarkStudios/cargo-about/archive/${version}.tar.gz"
-checksum=186e44af7edde48e682b2670ef52ef21687629900f5220bbd3742cb2d665bb49
+checksum=11808327e3702643b7d3f1756e6b28a49c1a963295a480818b3520d6c331b339
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	broken="broken on architectures without atomic8"

From 3d97db0169a9a08e2f88cc5631bd859ee247df76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 12:53:10 +0200
Subject: [PATCH 1125/1686] cargo-geiger: update to 0.11.2.

---
 srcpkgs/cargo-geiger/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index ffe49404187e..d88a94ef7cdd 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,6 +1,6 @@
 # Template file for 'cargo-geiger'
 pkgname=cargo-geiger
-version=0.11.1
+version=0.11.2
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_wrksrc="${pkgname}"
@@ -12,10 +12,14 @@ 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=d3c88fc3bdb574108504a1a49ae7b8ee5b55b1744a47d58214d0f088d2b2ef00
+checksum=425638232f4c617a1dde1071f865c5140546bf9b6b61b9a9a186d0a5c146ac03
 
 post_install() {
 	vlicense LICENSE-MIT
 	vlicense LICENSE-APACHE
 	vdoc README.md
 }
+
+post_patch() {
+	cargo update -p autocfg:1.0.1 --precise 1.1.0
+}

From a207cc897556ab236d211216581356fa04628957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:27:32 +0200
Subject: [PATCH 1126/1686] ruplacer: update to 0.6.4.

---
 srcpkgs/ruplacer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruplacer/template b/srcpkgs/ruplacer/template
index 2a48b9af8196..226155a2452a 100644
--- a/srcpkgs/ruplacer/template
+++ b/srcpkgs/ruplacer/template
@@ -1,6 +1,6 @@
 # Template file for 'ruplacer'
 pkgname=ruplacer
-version=0.6.2
+version=0.6.4
 revision=1
 build_style=cargo
 short_desc="Find and replace text in source files"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="BSD-3-Clause"
 homepage="https://github.com/dmerejkowsky/ruplacer"
 distfiles="https://github.com/dmerejkowsky/ruplacer/archive/refs/tags/v${version}.tar.gz"
-checksum=54533bb5ee33a5580f6d1160e92f4adf436350937dd2705de14ed9af185ee875
+checksum=4f66e8970942e55dc287c585eef7a21394aefa49df746cef429f9e5bc6714c7a
 
 post_install() {
 	vlicense LICENSE

From 2031652713988d4b5d32123ba0d00383896c2c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:39:06 +0200
Subject: [PATCH 1127/1686] i3status-rust: update to 0.21.9.

---
 srcpkgs/i3status-rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template
index 6973e02571b4..9c358e111e57 100644
--- a/srcpkgs/i3status-rust/template
+++ b/srcpkgs/i3status-rust/template
@@ -1,6 +1,6 @@
 # Template file for 'i3status-rust'
 pkgname=i3status-rust
-version=0.21.8
+version=0.21.9
 revision=1
 build_style=cargo
 make_check_args="--bins"
@@ -12,7 +12,7 @@ license="GPL-3.0-only"
 homepage="https://github.com/greshake/i3status-rust"
 changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md"
 distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
-checksum=259fdcb3ce067c6f9089fc0d7e60b856d838fff3dfb7e7e4dc5c96742c1a1be1
+checksum=579d3479c3cbbc6c95e277a708cda6f72d906e269dda83409bb23c7cecb10d0e
 
 post_install() {
 	vmkdir usr/share/i3status-rust

From 14fc3594a143fe1cf031fb72da3b38d99354d554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:46:19 +0200
Subject: [PATCH 1128/1686] onefetch: update to 2.12.0.

---
 srcpkgs/onefetch/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index 88f21bc3b351..1eda291b053f 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -1,6 +1,6 @@
 # Template file for 'onefetch'
 pkgname=onefetch
-version=2.11.0
+version=2.12.0
 revision=1
 build_style=cargo
 short_desc="Git repository summary on your terminal"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/o2sh/onefetch"
 distfiles="https://github.com/o2sh/onefetch/archive/v${version}.tar.gz"
-checksum=ffd3cc3bd24e299ede1fada2b2da8bf066d59219da167477e1997c860650c192
+checksum=f57b16dfa2bb95dd1fb805257a1761baa20d69eb9ce7c311d369609894c53897
 
 post_install() {
 	vlicense LICENSE.md

From 8072498f4da4e48b1958add3986a90c025f63058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:51:45 +0200
Subject: [PATCH 1129/1686] dua-cli: update to 2.17.1.

---
 srcpkgs/dua-cli/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template
index 6db14e89464e..ea5c1c27dad2 100644
--- a/srcpkgs/dua-cli/template
+++ b/srcpkgs/dua-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'dua-cli'
 pkgname=dua-cli
-version=2.17.0
+version=2.17.1
 revision=1
 build_style=cargo
 short_desc="Tool to conveniently learn about the disk usage of directories"
@@ -9,7 +9,7 @@ license="MIT"
 homepage="https://github.com/Byron/dua-cli"
 changelog="https://raw.githubusercontent.com/Byron/dua-cli/main/CHANGELOG.md"
 distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz"
-checksum=f10bd2c7b69c7bed1f94554d92732d54c803677a6957d986701164989a8227b1
+checksum=d9af81b30f83d080472e91da3e07b42294904827ad5274d9aaf51d346072d2f1
 
 post_install() {
 	vlicense LICENSE

From 44d6a992f2159104cdfddc711a2f10141ad65456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 13:56:21 +0200
Subject: [PATCH 1130/1686] eva: update to 0.3.0.

---
 srcpkgs/eva/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/eva/template b/srcpkgs/eva/template
index 08157fddc9bf..d364c98f9516 100644
--- a/srcpkgs/eva/template
+++ b/srcpkgs/eva/template
@@ -1,6 +1,6 @@
 # Template file for 'eva'
 pkgname=eva
-version=0.2.7
+version=0.3.0
 revision=1
 build_style=cargo
 short_desc="Simple calculator REPL, similar to bc(1)"
@@ -8,7 +8,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/NerdyPepper/eva"
 distfiles="https://github.com/NerdyPepper/eva/archive/v${version}.tar.gz"
-checksum=72b2e47e987102d67c9dcbb60e26c4ff0b20e6f844d0d2b9d91c3f073374aee0
+checksum=05e2cdcfd91e6abef91cb01ad3074583b8289f6e74054e070bfbf6a4e684865e
 
 post_install() {
 	vlicense LICENSE

From 562c1e0e054adc0b554faa149b4919db8ee7798b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 8 Apr 2022 13:51:25 +0200
Subject: [PATCH 1131/1686] exiftool: update to 12.41.

---
 srcpkgs/exiftool/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template
index 5a0a83e5e79a..6cf6714bf0a7 100644
--- a/srcpkgs/exiftool/template
+++ b/srcpkgs/exiftool/template
@@ -1,6 +1,6 @@
 # Template file for 'exiftool'
 pkgname=exiftool
-version=12.40
+version=12.41
 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=7ae3f6e1183926aff8a0440eb8071bb5b2a335fc1522597f109780ab16617f5f
+checksum=654f401daab0045a8364fa59d3f69b6f9bf23bcef157a3c928e373884a6f9370

From f992099129bfb9b8ae4c77cdbd69d43336c778c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Fri, 8 Apr 2022 13:35:48 +0200
Subject: [PATCH 1132/1686] croc: update to 9.5.3.

---
 srcpkgs/croc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/croc/template b/srcpkgs/croc/template
index 7e851d9af755..4ff52c773d40 100644
--- a/srcpkgs/croc/template
+++ b/srcpkgs/croc/template
@@ -1,6 +1,6 @@
 # Template file for 'croc'
 pkgname=croc
-version=9.5.2
+version=9.5.3
 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=9fcbb82fa78122b0a2279fe9b4c4c7ff6af7b0599f275c04481ad5ed162d2952
+checksum=7f8ac260c786bc3f1e3c577e6ac3d3e27d0d8cffa90d7a8d21cec85fe6f22abc
 
 post_install() {
 	vlicense LICENSE

From a7894835da5f1da979b37803150e7e47f703d5ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 11:03:02 +0200
Subject: [PATCH 1133/1686] ansible-core: update to 2.12.4.

---
 srcpkgs/ansible-core/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template
index 80236532b369..600682ca6939 100644
--- a/srcpkgs/ansible-core/template
+++ b/srcpkgs/ansible-core/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible-core'
 pkgname=ansible-core
-version=2.12.3
+version=2.12.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ 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-core/ansible-core-${version}.tar.gz"
-checksum=8a135a9f74c97cab67759293744ad34350f719523e8bd9bb9008df4cf953af20
+checksum=827af75985a6f04b980bd371027bf038cb187640628557298acb9983a8f2c2da
 conflicts="ansible<2.10.1_1"
 replaces="ansible-base<2.11.0_1"
 # Tests are currently broken for ansible on python 3.10

From 30756f7f74eb7d5157058bf04d7a20eeefcf3753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 11:03:06 +0200
Subject: [PATCH 1134/1686] ansible: update to 5.6.0.

---
 srcpkgs/ansible/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template
index 063e24d1684a..50439199bcdf 100644
--- a/srcpkgs/ansible/template
+++ b/srcpkgs/ansible/template
@@ -1,6 +1,6 @@
 # Template file for 'ansible'
 pkgname=ansible
-version=5.5.0
+version=5.6.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -10,7 +10,7 @@ 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=b8a76d737889c9bfd0e6b0f2276dcf8d836da667067a355776f3504d7a66d518
+checksum=acd30731434154da376ceeeb416ee1541cdfb8ea3c648023a55a34cb3ecaf9f3
 # Tests are currently broken for ansible on python 3.10
 # See https://github.com/ansible/ansible/issues/74658
 # and https://github.com/ansible/ansible/issues/74660

From e57bfd5f0ee0347dc5bd7f0a3acc9177ed56e06f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 3 Apr 2022 18:48:38 +0200
Subject: [PATCH 1135/1686] dust: update to 0.8.0.

---
 srcpkgs/dust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dust/template b/srcpkgs/dust/template
index 02468de2d8d6..b6f611ecc655 100644
--- a/srcpkgs/dust/template
+++ b/srcpkgs/dust/template
@@ -1,6 +1,6 @@
 # Template file for 'dust'
 pkgname=dust
-version=0.7.5
+version=0.8.0
 revision=1
 build_style=cargo
 short_desc="More intuitive version of du"
@@ -8,7 +8,7 @@ maintainer="Neel <neel@chot.ai>"
 license="Apache-2.0"
 homepage="https://github.com/bootandy/dust"
 distfiles="https://github.com/bootandy/dust/archive/v${version}.tar.gz"
-checksum=f892aaf7a0a7852e12d01b2ced6c2484fb6dc5fe7562abdf0c44a2d08aa52618
+checksum=dc033a6fb4f31520ab1bb403dd910aed04037964ab1406363cce2185a8bd3d3b
 
 post_install() {
 	vdoc README.md

From dcc911a110745f486191542b81c5624bc4d2d5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 11:38:45 +0200
Subject: [PATCH 1136/1686] python3-ansible-compat: update to 2.0.2.

---
 srcpkgs/python3-ansible-compat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-ansible-compat/template b/srcpkgs/python3-ansible-compat/template
index bf03fe221d0a..919455b7e64b 100644
--- a/srcpkgs/python3-ansible-compat/template
+++ b/srcpkgs/python3-ansible-compat/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-ansible-compat'
 pkgname=python3-ansible-compat
-version=2.0.0
+version=2.0.2
 revision=1
 wrksrc="${pkgname/python3-/}-${version}"
 build_style=python3-pep517
@@ -12,11 +12,11 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/ansible-community/ansible-compat"
 distfiles="${PYPI_SITE}/a/${pkgname/python3-/}/${pkgname/python3-/}-${version}.tar.gz"
-checksum=4027da4ec2b524c263a801cc2dc6da2b98c2996cec258cef118a30c790467ed2
+checksum=c651995dc323ef145bab857fee6540febc881fb71b7feafe8163d49e273163a5
 
 post_patch() {
 	# scm versioning is broken in this release
-	vsed -e "/name =/a version = ${version}" -e "/setuptools_scm/d" -i setup.cfg
+	vsed -e "/name =/a version = ${version}" -i setup.cfg
 }
 
 post_install() {

From 732268f4f723e83349627c136768faebb937abed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Sat, 9 Apr 2022 11:24:41 +0200
Subject: [PATCH 1137/1686] gip: update to 0.7.1.

---
 srcpkgs/gip/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 83ebc476bc84..239695acc77a 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,7 +1,7 @@
 # Template file for 'gip'
 pkgname=gip
-version=0.7.0
-revision=2
+version=0.7.1
+revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="openssl-devel"
@@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT"
 homepage="https://github.com/dalance/gip"
 distfiles="https://github.com/dalance/gip/archive/v${version}.tar.gz"
-checksum=69a23f438279a570293fab165f94a7e251a49b9b8de96703a0ab2542facffcb9
+checksum=b0cc949cbd25d6dc1e61d08092a78f95f65fb600601d03a407878774385a4060
 
 post_install() {
 	vlicense LICENSE-MIT

From 68168235ac5696fcd8026d1ad69580ec1948b2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
 <jan.christian@gruenhage.xyz>
Date: Fri, 8 Apr 2022 14:26:19 +0200
Subject: [PATCH 1138/1686] git-cliff: update to 0.6.1.

---
 srcpkgs/git-cliff/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git-cliff/template b/srcpkgs/git-cliff/template
index 0d14d547541e..4d87260c9d27 100644
--- a/srcpkgs/git-cliff/template
+++ b/srcpkgs/git-cliff/template
@@ -1,8 +1,9 @@
 # Template file for 'git-cliff'
 pkgname=git-cliff
-version=0.6.0
+version=0.6.1
 revision=1
 build_style=cargo
+build_helper=qemu
 make_install_args="--path git-cliff"
 make_check_args="-- --skip repo::test::git_log" # This test fails without a git repo
 short_desc="Changelog generator based on conventional commits"
@@ -11,8 +12,14 @@ license="GPL-3.0-only"
 homepage="https://github.com/orhun/git-cliff"
 changelog="https://raw.githubusercontent.com/orhun/git-cliff/main/CHANGELOG.md"
 distfiles="https://github.com/orhun/git-cliff/archive/refs/tags/v${version}.tar.gz"
-checksum=451db5e7ce904f33cf5772cd67400015829e5b7b3d18955bc3e8f88977b63793
+checksum=045fb10ad0ee340172397f2bb6521c7ee0a83dca2c9f9d177300601f6c60184f
 
 post_install() {
 	vdoc README.md
+
+	OUT_DIR=${PWD} vtargetrun ${DESTDIR}/usr/bin/git-cliff-completions
+
+	vcompletion "_git-cliff" zsh
+	vcompletion "git-cliff.fish" fish
+	vcompletion "git-cliff.bash" bash
 }

From 6568b616afe10ab44263ce1386d86d06ba514b45 Mon Sep 17 00:00:00 2001
From: toluschr <toluschr@protonmail.com>
Date: Mon, 25 May 2020 19:49:29 +0200
Subject: [PATCH 1139/1686] New package: gamemode-1.6.1

---
 common/shlibs                               |  2 ++
 srcpkgs/gamemode/patches/001-fix-musl.patch | 10 ++++++
 srcpkgs/gamemode/template                   | 39 +++++++++++++++++++++
 srcpkgs/libgamemode                         |  1 +
 srcpkgs/libgamemode-devel                   |  1 +
 5 files changed, 53 insertions(+)
 create mode 100644 srcpkgs/gamemode/patches/001-fix-musl.patch
 create mode 100644 srcpkgs/gamemode/template
 create mode 120000 srcpkgs/libgamemode
 create mode 120000 srcpkgs/libgamemode-devel

diff --git a/common/shlibs b/common/shlibs
index 848b488bb2d0..673c62085f5b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3597,6 +3597,8 @@ libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
 libvkd3d-utils.so.1 vkd3d-1.1_1
 libvkd3d-shader.so.1 vkd3d-1.3_1
 libvkd3d.so.1 vkd3d-1.1_1
+libgamemode.so.0 libgamemode-1.6.1_1
+libgamemodeauto.so.0 libgamemode-1.6.1_1
 libgaminggear.so.0 libgaminggear-0.15.1_1
 libgaminggearfx.so.0 libgaminggear-0.15.1_1
 libgaminggearwidget.so.0 libgaminggear-0.15.1_1
diff --git a/srcpkgs/gamemode/patches/001-fix-musl.patch b/srcpkgs/gamemode/patches/001-fix-musl.patch
new file mode 100644
index 000000000000..c54c0bad41fe
--- /dev/null
+++ b/srcpkgs/gamemode/patches/001-fix-musl.patch
@@ -0,0 +1,10 @@
+--- a/daemon/gamemode-context.c
++++ b/daemon/gamemode-context.c
+@@ -50,6 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
+ #include <sys/time.h>
+ #include <systemd/sd-daemon.h> /* TODO: Move usage to gamemode-dbus.c */
+ #include <unistd.h>
++#include <signal.h>
+ 
+ /**
+  * The GameModeClient encapsulates the remote connection, providing a list
diff --git a/srcpkgs/gamemode/template b/srcpkgs/gamemode/template
new file mode 100644
index 000000000000..0bf9bea530ec
--- /dev/null
+++ b/srcpkgs/gamemode/template
@@ -0,0 +1,39 @@
+# Template file for 'gamemode'
+pkgname=gamemode
+version=1.6.1
+revision=1
+build_style=meson
+configure_args="-Dwith-sd-bus-provider=elogind"
+hostmakedepends="pkg-config"
+makedepends="inih-devel dbus-devel elogind-devel"
+depends="lib${pkgname}>=${version}_${revision}"
+short_desc="Optimise Linux system performance on demand"
+maintainer="Kenneth Dodrill <hello@kennydodrill.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/FeralInteractive/gamemode"
+distfiles="https://github.com/FeralInteractive/gamemode/archive/${version}.tar.gz"
+checksum=4377b88b5147ebf8d3f9a7a1f94c6d00f1e9624cd171d5af942ce9766be3747f
+
+post_install() {
+	vsconf example/gamemode.ini
+	vlicense LICENSE.txt
+	vdoc README.md
+}
+
+libgamemode_package() {
+	short_desc+=" - shared libraries"
+	pkg_install() {
+		# For compatibility reasons, all shlibs should go in libgamemode
+		vmove "usr/lib/*.so*"
+	}
+}
+
+libgamemode-devel_package() {
+	short_desc+=" - development files"
+	depends="lib${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/libgamemode b/srcpkgs/libgamemode
new file mode 120000
index 000000000000..d1810c733eb8
--- /dev/null
+++ b/srcpkgs/libgamemode
@@ -0,0 +1 @@
+gamemode
\ No newline at end of file
diff --git a/srcpkgs/libgamemode-devel b/srcpkgs/libgamemode-devel
new file mode 120000
index 000000000000..d1810c733eb8
--- /dev/null
+++ b/srcpkgs/libgamemode-devel
@@ -0,0 +1 @@
+gamemode
\ No newline at end of file

From 783aac96242da0c4811a1208ed2e4126a5a499c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 22 Mar 2022 09:14:19 +0100
Subject: [PATCH 1140/1686] doctl: update to 1.73.0.

---
 srcpkgs/doctl/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template
index 0580a504f27e..e42f75c749fd 100644
--- a/srcpkgs/doctl/template
+++ b/srcpkgs/doctl/template
@@ -1,13 +1,17 @@
 # Template file for 'doctl'
 pkgname=doctl
-version=1.71.0
+version=1.73.0
 revision=1
 build_style=go
 go_import_path="github.com/digitalocean/doctl/cmd/doctl"
-go_build_tags="v${version}"
+_maj_min=${version%*.*}
+_major=${_maj_min%.*}
+_minor=${_maj_min#*.}
+_patch=${version#*.*.*}
+go_ldflags="-X github.com/digitalocean/doctl.Major=$_major -X github.com/digitalocean/doctl.Minor=$_minor -X github.com/digitalocean/doctl.Patch=$_patch -X github.com/digitalocean/doctl.Label=voidlinux"
 short_desc="Command line tool for DigitalOcean services"
 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=62a14c05bd4b8442f0a610f9eba7237fe67e1afc397750893cdf2b741aebfd54
+checksum=cc7a6f91febf4d40f8afca0fe4ddfa7aa9be3572e3a0124fca2865e35b52ef00

From 6b1f3dcfba264c64655248d670d80c52d692eee4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 9 Apr 2022 12:37:47 +0200
Subject: [PATCH 1141/1686] libxmlb: update to 0.3.8.

---
 srcpkgs/libxmlb/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libxmlb/template b/srcpkgs/libxmlb/template
index 6d8a900ae0aa..78b2d76bfdee 100644
--- a/srcpkgs/libxmlb/template
+++ b/srcpkgs/libxmlb/template
@@ -1,6 +1,6 @@
 # Template file for 'libxmlb'
 pkgname=libxmlb
-version=0.2.1
+version=0.3.8
 revision=1
 build_style=meson
 build_helper="gir"
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/hughsie/libxmlb"
 distfiles="https://github.com/hughsie/libxmlb/archive/${version}.tar.gz"
-checksum=2bf0cae179f1a9b6a63d294c06d324ea97266fc34656589b2865535ab2322529
+checksum=83b94d04b4bdff4f94abc9f078d1372422276cf47590cfd1935948d48021deda
 
 build_options="gir"
 build_options_default="gir"
@@ -23,13 +23,13 @@ post_install() {
 }
 
 libxmlb-devel_package() {
-	depends="libxmlb>=${version}_${revision} ${makedepends}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
-		if [ "$build_options_gir" ]; then
+		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
 		fi
 	}

From b57bdb2c820a044063fa11d0f04bb560737252a5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 9 Apr 2022 12:34:53 +0200
Subject: [PATCH 1142/1686] AppStream: update to 0.15.2.

---
 srcpkgs/AppStream/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/AppStream/template b/srcpkgs/AppStream/template
index 9cba83f64c24..b2d920729249 100644
--- a/srcpkgs/AppStream/template
+++ b/srcpkgs/AppStream/template
@@ -1,6 +1,6 @@
 # Template file for 'AppStream'
 pkgname=AppStream
-version=0.14.6
+version=0.15.2
 revision=1
 wrksrc="appstream-${version}"
 build_style=meson
@@ -8,16 +8,16 @@ build_helper="gir qemu"
 configure_args="$(vopt_bool gir gir) $(vopt_bool vala vapi)
  -Dstemming=false -Dapidocs=false -Dqt=true"
 hostmakedepends="docbook-xsl gettext glib-devel gperf libxslt pkg-config
- qt5-host-tools $(vopt_if vala vala)"
-makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel lmdb-devel
+ qt5-host-tools $(vopt_if vala vala) itstool"
+makedepends="libglib-devel libxml2-devel libyaml-devel qt5-devel libxmlb-devel
  libsoup-devel libcurl-devel"
 short_desc="Tools and libraries to work with AppStream metadata"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ximion/appstream"
 changelog="https://raw.githubusercontent.com/ximion/appstream/master/NEWS"
 distfiles="https://github.com/ximion/appstream/archive/v${version}.tar.gz"
-checksum=fd71649aeefe1cb561f1921193b253033d21566bdcce849c93e37fdb21113560
+checksum=70c95545ac2cde87c9ba4a292648ed64ed1211fb24d792b5b9e84f870a83fe9d
 conf_files="/etc/appstream.conf"
 triggers="appstream-cache"
 

From b55efbf7a75c8a4ba8adee7cec8f59b8b7c48040 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 22:57:19 +0200
Subject: [PATCH 1143/1686] gnome: remove gnome-documents from gnome-apps

---
 srcpkgs/gnome/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 0984bf8205a6..0b2910094713 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome'
 pkgname=gnome
 version=41.0
-revision=1
+revision=2
 build_style=meta
 short_desc="GNOME meta-package for Void Linux"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -58,7 +58,6 @@ _apps_depends="
  gnome-clocks>=40.0
  gnome-dictionary>=40.0
  gnome-disk-utility>=${version}
- gnome-documents>=3.34.0
  gnome-font-viewer>=${version}
  gnome-maps>=${version}
  gnome-music>=${version}

From 775dad9d892aff3a8cfb705b9e16f3452902bfd5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:11 +0100
Subject: [PATCH 1144/1686] gnome-games: remove package

* archived project, uses tracker2
---
 srcpkgs/gnome-games/patches/meson-0.61.patch | 20 --------------------
 srcpkgs/gnome-games/template                 | 15 ---------------
 srcpkgs/removed-packages/template            |  1 +
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 srcpkgs/gnome-games/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-games/template

diff --git a/srcpkgs/gnome-games/patches/meson-0.61.patch b/srcpkgs/gnome-games/patches/meson-0.61.patch
deleted file mode 100644
index 0a3b006b227b..000000000000
--- a/srcpkgs/gnome-games/patches/meson-0.61.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -44,7 +44,7 @@ mime_types = [
- desktop_conf = configuration_data()
- desktop_conf.set('icon', application_id)
- desktop_conf.set('mimetypes', ';'.join(mime_types) + ';')
--desktop_file = i18n.merge_file ('desktop-file',
-+desktop_file = i18n.merge_file (
-   type: 'desktop',
-   input: configure_file(
-     input: files('org.gnome.Games.desktop.in.in'),
-@@ -70,7 +70,7 @@ endif
- 
- appdata_conf = configuration_data()
- appdata_conf.set('appid', application_id)
--appdata_file = i18n.merge_file ('appdata-file',
-+appdata_file = i18n.merge_file (
-   input: configure_file(
-     input: files('org.gnome.Games.appdata.xml.in.in'),
-     output: 'org.gnome.Games.appdata.xml.in',
diff --git a/srcpkgs/gnome-games/template b/srcpkgs/gnome-games/template
deleted file mode 100644
index 61df4a3bc7f1..000000000000
--- a/srcpkgs/gnome-games/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gnome-games'
-pkgname=gnome-games
-version=40.0
-revision=1
-build_style=meson
-hostmakedepends="gettext glib-devel pkg-config vala-devel"
-makedepends="libarchive-devel grilo-devel gtk+3-devel libglib-devel
- libmanette-devel librsvg-devel libsoup-devel libxml2-devel retro-gtk-devel
- sqlite-devel tracker-devel libhandy1-devel"
-short_desc="Browse and play your games"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Games"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=32cd413f89292a74b0a84a5a30d0f4878ce42caea36374b1fb4dce3b4f6adf0f
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 57df15daae2b..6511980ca218 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2
  gnome-twitch<=0.4.2_1

From 58e49f35421cfb0838db5de1381ed7c33756c683 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 27 Feb 2022 22:57:35 +0100
Subject: [PATCH 1145/1686] gnome-documents: remove package

* archived project, uses tracker2
---
 .../gnome-documents/patches/meson-0.61.patch  | 18 ---------------
 srcpkgs/gnome-documents/template              | 23 -------------------
 srcpkgs/removed-packages/template             |  1 +
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 srcpkgs/gnome-documents/patches/meson-0.61.patch
 delete mode 100644 srcpkgs/gnome-documents/template

diff --git a/srcpkgs/gnome-documents/patches/meson-0.61.patch b/srcpkgs/gnome-documents/patches/meson-0.61.patch
deleted file mode 100644
index 131d34509406..000000000000
--- a/srcpkgs/gnome-documents/patches/meson-0.61.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -56,7 +56,6 @@ foreach app: documents_apps
-   appdata = app + '.appdata.xml'
- 
-   appdata_file = i18n.merge_file(
--    appdata,
-     input: appdata + '.in',
-     output: appdata,
-     po_dir: po_dir,
-@@ -76,7 +75,6 @@ foreach app: documents_apps
-   desktop = app + '.desktop'
- 
-   desktop_file = i18n.merge_file(
--    desktop,
-     type: 'desktop',
-     input: desktop + '.in',
-     output: desktop,
diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template
deleted file mode 100644
index 7e45b825e712..000000000000
--- a/srcpkgs/gnome-documents/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'gnome-documents'
-pkgname=gnome-documents
-version=3.34.0
-revision=2
-build_helper="gir"
-build_style=meson
-hostmakedepends="docbook-xsl gettext itstool pkg-config glib-devel libxslt gdk-pixbuf
- librsvg"
-makedepends="clutter-gtk-devel evince-devel gjs-devel gnome-desktop-devel
- libgdata-devel libgepub-devel librsvg-devel libzapojit-devel tracker-devel
- vala-devel webkit2gtk-devel"
-depends="desktop-file-utils hicolor-icon-theme libgepub tracker tracker-miners
- gjs gnome-online-miners evince"
-short_desc="Documents Manager for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Documents"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d8a90e84aef3a78fcaa91dc12a24a473a5778a47eb4c2354d0e35d558f29f0e2
-lib32disabled=yes
-
-build_options="gir"
-build_options_default="gir"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6511980ca218..f1dcebc2b8cc 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -88,6 +88,7 @@ replaces="
  gksu<=2.0.2_4
  glibmm-doc<=2.64.2_2
  gnome-doc-utils<=0.20.10_9
+ gnome-documents<=3.34.0_2
  gnome-games<=40.0_1
  gnome-getting-started-docs<=3.38.1_1
  gnome-shell-mousewheel-zoom<=0.8.0_2

From 736346765b4b429fdca20252b7d7b292c751493c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 23:29:56 +0200
Subject: [PATCH 1146/1686] gnome-online-miners: import a patch for tracker3

---
 .../patches/tracker3.patch                    | 1554 +++++++++++++++++
 srcpkgs/gnome-online-miners/template          |   11 +-
 2 files changed, 1562 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/gnome-online-miners/patches/tracker3.patch

diff --git a/srcpkgs/gnome-online-miners/patches/tracker3.patch b/srcpkgs/gnome-online-miners/patches/tracker3.patch
new file mode 100644
index 000000000000..c948f65c7953
--- /dev/null
+++ b/srcpkgs/gnome-online-miners/patches/tracker3.patch
@@ -0,0 +1,1554 @@
+From 53869ebc2783c9d08bb32d59c543ab692770c121 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:11:24 +0200
+Subject: [PATCH 1/5] Use GInitable interface for GomMiner class
+
+This allows for better error reporting.
+---
+ src/gom-application.c |  7 +++++-
+ src/gom-miner.c       | 58 +++++++++++++++++++++++++++++--------------
+ 2 files changed, 45 insertions(+), 20 deletions(-)
+
+diff --git a/src/gom-application.c b/src/gom-application.c
+index fadd388..bfa99ec 100644
+--- a/src/gom-application.c
++++ b/src/gom-application.c
+@@ -229,10 +229,15 @@ gom_application_constructed (GObject *object)
+ {
+   GomApplication *self = GOM_APPLICATION (object);
+   const gchar *display_name;
++  GError *error = NULL;
+ 
+   G_OBJECT_CLASS (gom_application_parent_class)->constructed (object);
+ 
+-  self->miner = g_object_new (self->miner_type, NULL);
++  self->miner = g_initable_new (self->miner_type, NULL, &error, NULL);
++
++  if (self->miner == NULL)
++    g_error ("%s", error->message);
++
+   display_name = gom_miner_get_display_name (self->miner);
+   gom_dbus_set_display_name (self->skeleton, display_name);
+ }
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 7147b33..1dd9bb8 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -28,7 +28,11 @@
+ 
+ #include "gom-miner.h"
+ 
+-G_DEFINE_TYPE (GomMiner, gom_miner, G_TYPE_OBJECT)
++static void gom_miner_initable_interface_init (GInitableIface *iface);
++
++G_DEFINE_TYPE_WITH_CODE (GomMiner, gom_miner, G_TYPE_OBJECT,
++                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gom_miner_initable_interface_init))
++
+ 
+ struct _GomMinerPrivate {
+   GoaClient *client;
+@@ -132,20 +136,21 @@ gom_miner_dispose (GObject *object)
+ }
+ 
+ static void
+-gom_miner_init_goa (GomMiner *self)
++gom_miner_init_goa (GomMiner  *self,
++                    GError   **error)
+ {
+   GoaAccount *account;
+   GoaObject *object;
+   const gchar *provider_type;
+   GList *accounts, *l;
+   GomMinerClass *miner_class = GOM_MINER_GET_CLASS (self);
++  GError *inner_error = NULL;
+ 
+-  self->priv->client = goa_client_new_sync (NULL, &self->priv->client_error);
++  self->priv->client = goa_client_new_sync (NULL, &inner_error);
+ 
+-  if (self->priv->client_error != NULL)
++  if (inner_error)
+     {
+-      g_critical ("Unable to create GoaClient: %s - indexing for %s will not work",
+-                  self->priv->client_error->message, miner_class->goa_provider_type);
++      g_propagate_error (error, inner_error);
+       return;
+     }
+ 
+@@ -170,16 +175,34 @@ gom_miner_init_goa (GomMiner *self)
+   g_list_free_full (accounts, g_object_unref);
+ }
+ 
+-static void
+-gom_miner_constructed (GObject *obj)
++static gboolean
++gom_miner_initable_init (GInitable     *initable,
++                         GCancellable  *cancellable,
++                         GError       **error)
+ {
+-  GomMiner *self = GOM_MINER (obj);
++  GError *inner_error = NULL;
++  GomMiner *self;
+ 
+-  G_OBJECT_CLASS (gom_miner_parent_class)->constructed (obj);
++  self = GOM_MINER (initable);
+ 
+-  gom_miner_init_goa (self);
++  self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error);
++  if (inner_error)
++    {
++      g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: ");
++      return FALSE;
++    }
++
++  gom_miner_init_goa (self, &inner_error);
++  if (inner_error)
++    {
++      g_propagate_prefixed_error (error, inner_error, "Unable to connect to GNOME Online Accounts: ");
++      return FALSE;
++    }
++
++  return TRUE;
+ }
+ 
++
+ static void
+ gom_miner_init (GomMiner *self)
+ {
+@@ -187,14 +210,12 @@ gom_miner_init (GomMiner *self)
+ 
+   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GOM_TYPE_MINER, GomMinerPrivate);
+   self->priv->display_name = g_strdup ("");
++}
+ 
+-  self->priv->connection = tracker_sparql_connection_get (NULL, &self->priv->connection_error);
+-  if (self->priv->connection_error != NULL)
+-    {
+-      g_critical ("Unable to create TrackerSparqlConnection: %s - indexing for %s will not work",
+-                  self->priv->connection_error->message,
+-                  klass->goa_provider_type);
+-    }
++static void
++gom_miner_initable_interface_init (GInitableIface *iface)
++{
++  iface->init = gom_miner_initable_init;
+ }
+ 
+ static void
+@@ -202,7 +223,6 @@ gom_miner_class_init (GomMinerClass *klass)
+ {
+   GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ 
+-  oclass->constructed = gom_miner_constructed;
+   oclass->dispose = gom_miner_dispose;
+ 
+   cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL);
+-- 
+GitLab
+
+
+From a2b53970e1c1486a61a1522010e345732ed6ca54 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:19:58 +0200
+Subject: [PATCH 2/5] Initial port to Tracker 3
+
+Each miner now stores its data in a private Tracker database, under
+the $XDG_CACHE_HOME/gnome-online-miners/$busname directory.
+
+Each miner now supports the org.freedesktop.Tracker3.Endpoint D-Bus
+interface which apps can use to query data directly from the miners.
+---
+ configure.ac          |   4 +-
+ src/gom-application.c |   4 +-
+ src/gom-miner.c       | 120 +++++++++++++++++++++++++++++++++++++++++-
+ src/gom-miner.h       |   1 +
+ src/gom-tracker.c     |   2 +-
+ 5 files changed, 125 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e91e4af..8ee6315 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,7 +21,7 @@ AC_HEADER_STDC
+ 
+ GDATA_MIN_VERSION=0.15.2
+ GFBGRAPH_MIN_VERSION=0.2.2
+-GLIB_MIN_VERSION=2.35.1
++GLIB_MIN_VERSION=2.56.0
+ GOA_MIN_VERSION=3.13.3
+ GRILO_MIN_VERSION=0.3.0
+ ZAPOJIT_MIN_VERSION=0.0.2
+@@ -36,7 +36,7 @@ PKG_CHECK_MODULES(GIO, [gio-2.0 gio-unix-2.0])
+ PKG_CHECK_MODULES(GOA, [goa-1.0 >= $GOA_MIN_VERSION])
+ AC_DEFINE([GOA_API_IS_SUBJECT_TO_CHANGE], [], [We are aware that GOA's API can change])
+ 
+-PKG_CHECK_MODULES(TRACKER, [tracker-miner-2.0 tracker-sparql-2.0])
++PKG_CHECK_MODULES(TRACKER, [tracker-sparql-3.0])
+ 
+ # Facebook
+ AC_ARG_ENABLE([facebook], [AS_HELP_STRING([--enable-facebook], [Enable Facebook miner])], [], [enable_facebook=yes])
+diff --git a/src/gom-application.c b/src/gom-application.c
+index bfa99ec..86546ed 100644
+--- a/src/gom-application.c
++++ b/src/gom-application.c
+@@ -233,7 +233,9 @@ gom_application_constructed (GObject *object)
+ 
+   G_OBJECT_CLASS (gom_application_parent_class)->constructed (object);
+ 
+-  self->miner = g_initable_new (self->miner_type, NULL, &error, NULL);
++  self->miner = g_initable_new (self->miner_type, NULL, &error,
++                                "bus-name", g_application_get_application_id (G_APPLICATION (self)),
++                                NULL);
+ 
+   if (self->miner == NULL)
+     g_error ("%s", error->message);
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 1dd9bb8..f349d01 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -38,7 +38,9 @@ struct _GomMinerPrivate {
+   GoaClient *client;
+   GError *client_error;
+ 
++  gchar *bus_name;
+   TrackerSparqlConnection *connection;
++  TrackerEndpointDBus *endpoint;
+   GError *connection_error;
+ 
+   gchar *display_name;
+@@ -62,6 +64,14 @@ typedef struct {
+   gpointer service;
+ } InsertSharedContentData;
+ 
++typedef enum
++{
++  PROP_BUS_NAME = 1,
++  N_PROPERTIES
++} GomMinerProperty;
++
++static GParamSpec *obj_properties[N_PROPERTIES] = { NULL, };
++
+ static GThreadPool *cleanup_pool;
+ 
+ static void cleanup_job (gpointer data, gpointer user_data);
+@@ -135,6 +145,58 @@ gom_miner_dispose (GObject *object)
+   G_OBJECT_CLASS (gom_miner_parent_class)->dispose (object);
+ }
+ 
++static void
++gom_miner_init_database (GomMiner      *self,
++                         GCancellable  *cancellable,
++                         GError       **error)
++{
++  TrackerSparqlConnectionFlags flags;
++  g_autoptr (GFile) store_path = NULL;
++  g_autoptr (GDBusConnection) bus = NULL;
++  GError *inner_error = NULL;
++
++  flags = TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STEMMER |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_UNACCENT |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_ENABLE_STOP_WORDS |
++          TRACKER_SPARQL_CONNECTION_FLAGS_FTS_IGNORE_NUMBERS;
++
++  store_path = g_file_new_build_filename (g_get_user_cache_dir (),
++                                          "gnome-online-miners",
++                                          self->priv->bus_name,
++                                          NULL);
++
++  self->priv->connection = tracker_sparql_connection_new (flags,
++                                                          store_path,
++                                                          tracker_sparql_get_ontology_nepomuk (),
++                                                          cancellable,
++                                                          &inner_error);
++
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++
++  bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &inner_error);
++
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++
++  self->priv->endpoint = tracker_endpoint_dbus_new (self->priv->connection,
++                                                    bus,
++                                                    NULL, /* object path */
++                                                    cancellable,
++                                                    &inner_error);
++  if (inner_error)
++    {
++      g_propagate_error (error, inner_error);
++      return;
++    }
++}
++
+ static void
+ gom_miner_init_goa (GomMiner  *self,
+                     GError   **error)
+@@ -185,10 +247,10 @@ gom_miner_initable_init (GInitable     *initable,
+ 
+   self = GOM_MINER (initable);
+ 
+-  self->priv->connection = tracker_sparql_connection_get (cancellable, &inner_error);
++  gom_miner_init_database (self, cancellable, &inner_error);
+   if (inner_error)
+     {
+-      g_propagate_prefixed_error (error, inner_error, "Unable to connect to Tracker store: ");
++      g_propagate_prefixed_error (error, inner_error, "Unable to set up Tracker database: ");
+       return FALSE;
+     }
+ 
+@@ -212,6 +274,47 @@ gom_miner_init (GomMiner *self)
+   self->priv->display_name = g_strdup ("");
+ }
+ 
++static void
++gom_miner_set_property (GObject      *object,
++                        guint         property_id,
++                        const GValue *value,
++                        GParamSpec   *pspec)
++{
++  GomMiner *self = GOM_MINER (object);
++
++  switch ((GomMinerProperty) property_id)
++    {
++      case PROP_BUS_NAME:
++        g_free (self->priv->bus_name);
++        self->priv->bus_name = g_value_dup_string (value);
++        break;
++
++      default:
++        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++        break;
++    }
++}
++
++static void
++gom_miner_get_property (GObject    *object,
++                        guint       property_id,
++                        GValue     *value,
++                        GParamSpec *pspec)
++{
++  GomMiner *self = GOM_MINER (object);
++
++  switch ((GomMinerProperty) property_id)
++    {
++       case PROP_BUS_NAME:
++         g_value_set_string (value, self->priv->bus_name);
++         break;
++
++       default:
++         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++         break;
++    }
++}
++
+ static void
+ gom_miner_initable_interface_init (GInitableIface *iface)
+ {
+@@ -224,6 +327,19 @@ gom_miner_class_init (GomMinerClass *klass)
+   GObjectClass *oclass = G_OBJECT_CLASS (klass);
+ 
+   oclass->dispose = gom_miner_dispose;
++  oclass->set_property = gom_miner_set_property;
++  oclass->get_property = gom_miner_get_property;
++
++  obj_properties[PROP_BUS_NAME] = g_param_spec_string ("bus-name",
++                                                       "Bus Name",
++                                                       "D-Bus name of the miner",
++                                                       NULL  /* default value */,
++                                                       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
++                                                       G_PARAM_STATIC_STRINGS);
++
++  g_object_class_install_properties (oclass,
++                                     N_PROPERTIES,
++                                     obj_properties);
+ 
+   cleanup_pool = g_thread_pool_new (cleanup_job, NULL, 1, FALSE, NULL);
+ 
+diff --git a/src/gom-miner.h b/src/gom-miner.h
+index 8f83139..5dcfc8d 100644
+--- a/src/gom-miner.h
++++ b/src/gom-miner.h
+@@ -61,6 +61,7 @@ typedef struct _GomMinerPrivate GomMinerPrivate;
+ typedef struct {
+   GomMiner *miner;
+   TrackerSparqlConnection *connection;
++  gchar *bus_name;
+ 
+   GoaAccount *account;
+   GHashTable *services;
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 68818c4..5666c16 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -408,7 +408,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+   gchar *retval = NULL;
+   gchar *select = NULL;
+ 
+-  g_return_val_if_fail (TRACKER_SPARQL_IS_CONNECTION (connection), NULL);
++  g_return_val_if_fail (TRACKER_IS_SPARQL_CONNECTION (connection), NULL);
+   g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
+   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+   g_return_val_if_fail (make != NULL || model != NULL, NULL);
+-- 
+GitLab
+
+
+From 3e77eff8a677c1ecd9aa129094ed857da802d787 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 01:37:28 +0200
+Subject: [PATCH 3/5] Add DataObject class to our resources
+
+We need this to set nie:dataSource property. I don't understand
+how this worked in the past.
+---
+ src/gom-tracker.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 5666c16..63a4c29 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -208,7 +208,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   insert = g_string_new (NULL);
+   g_string_append_printf
+     (insert,
+-     "INSERT OR REPLACE %s { <%s> a nie:InformationElement ; %s %s }",
++     "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
+      graph_str, resource, property_name, quoted);
+   g_free (quoted);
+ 
+-- 
+GitLab
+
+
+From e742a60cf9dea1391d1ff409ce5696d21f423bed Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Fri, 15 May 2020 02:13:11 +0200
+Subject: [PATCH 4/5] Organize data into content-based graphs
+
+Previously GOM used a graph per account and per resource but this
+cannot be done in Tracker 3.
+
+In Tracker 3, each graph is stored as a separate SQLite database
+and currently a maximum of ten graphs can be included in a single
+query due to SQLite's limitations.
+
+The new layout is modelled after how tracker-miner-fs uses graphs:
+we use a graph per content type (Contacts, Documents, Pictures),
+plus an extra graph to store accounts and folders/collections.
+---
+ src/gom-facebook-miner.c     | 12 ++---
+ src/gom-flickr-miner.c       | 24 +++++-----
+ src/gom-gdata-miner.c        | 31 ++++++------
+ src/gom-media-server-miner.c | 10 ++--
+ src/gom-miner.c              | 40 ++++++++++++----
+ src/gom-miner.h              |  1 -
+ src/gom-owncloud-miner.c     | 22 +++++----
+ src/gom-tracker.c            | 93 +++++++++++++++++-------------------
+ src/gom-tracker.h            | 14 +++++-
+ src/gom-zpj-miner.c          | 22 ++++-----
+ 10 files changed, 150 insertions(+), 119 deletions(-)
+
+diff --git a/src/gom-facebook-miner.c b/src/gom-facebook-miner.c
+index ff42ca5..fc89096 100644
+--- a/src/gom-facebook-miner.c
++++ b/src/gom-facebook-miner.c
+@@ -70,7 +70,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+@@ -239,7 +239,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", album_link);
+ 
+   if (*error != NULL)
+@@ -248,7 +248,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", album_description);
+ 
+   if (*error != NULL)
+@@ -257,7 +257,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", album_name);
+ 
+   if (*error != NULL)
+@@ -274,7 +274,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -284,7 +284,7 @@ account_miner_job_process_album (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", album_created_time);
+ 
+   if (*error != NULL)
+diff --git a/src/gom-flickr-miner.c b/src/gom-flickr-miner.c
+index 9ac338e..dc7349e 100644
+--- a/src/gom-flickr-miner.c
++++ b/src/gom-flickr-miner.c
+@@ -143,14 +143,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -166,7 +166,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_identifier,
++         TRACKER_PICTURES_GRAPH, parent_identifier,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_identifier);
+ 
+@@ -176,7 +176,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:isPartOf", parent_resource_urn);
+       g_free (parent_resource_urn);
+ 
+@@ -187,7 +187,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", grl_media_get_title (entry->media));
+ 
+   if (*error != NULL)
+@@ -202,7 +202,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   created_time = modification_date = grl_media_get_creation_date (entry->media);
+   new_mtime = g_date_time_to_unix (modification_date);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -221,7 +221,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:contentCreated", date);
+       g_free (date);
+     }
+@@ -233,7 +233,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", url);
+ 
+   if (*error != NULL)
+@@ -242,7 +242,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", grl_media_get_description (entry->media));
+ 
+   if (*error != NULL)
+@@ -254,7 +254,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:mimeType", mime);
+       g_free (mime);
+ 
+@@ -265,7 +265,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   contact_resource = gom_tracker_utils_ensure_contact_resource
+     (connection,
+      cancellable, error,
+-     datasource_urn, grl_media_get_author (entry->media));
++     TRACKER_PICTURES_GRAPH, grl_media_get_author (entry->media));
+ 
+   if (*error != NULL)
+     goto out;
+@@ -273,7 +273,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+diff --git a/src/gom-gdata-miner.c b/src/gom-gdata-miner.c
+index 7872431..d0deb80 100644
+--- a/src/gom-gdata-miner.c
++++ b/src/gom-gdata-miner.c
+@@ -120,7 +120,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_DOCUMENTS_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+@@ -187,7 +187,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_resource_id,
++         GOM_GRAPH, parent_resource_id,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_resource_id);
+ 
+@@ -219,7 +219,7 @@ account_miner_job_process_entry (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_toggle_favorite
+     (connection,
+      cancellable, error,
+-     resource, starred);
++     TRACKER_PICTURES_GRAPH, resource, starred);
+ 
+   if (*error != NULL)
+     goto out;
+@@ -400,14 +400,14 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", "nmm:Photo", NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+   if (*error != NULL)
+     goto out;
+@@ -566,6 +566,7 @@ account_miner_job_process_photo (TrackerSparqlConnection *connection,
+       equipment_resource = gom_tracker_utils_ensure_equipment_resource (connection,
+                                                                         cancellable,
+                                                                         error,
++                                                                        TRACKER_PICTURES_GRAPH,
+                                                                         make,
+                                                                         model);
+ 
+@@ -665,7 +666,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", "nfo:DataContainer",
+      NULL);
+ 
+@@ -674,7 +675,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+ 
+   gom_tracker_update_datasource
+     (connection, datasource_urn,
+-     resource_exists, identifier, resource,
++     resource_exists, TRACKER_PICTURES_GRAPH, resource,
+      cancellable, error);
+ 
+   if (*error != NULL)
+@@ -685,7 +686,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+    */
+   new_mtime = gdata_entry_get_updated (GDATA_ENTRY (album));
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -703,7 +704,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", alternate_uri);
+ 
+   if (*error != NULL)
+@@ -713,7 +714,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", summary);
+ 
+   if (*error != NULL)
+@@ -723,7 +724,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", title);
+ 
+   if (*error != NULL)
+@@ -743,7 +744,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -755,7 +756,7 @@ account_miner_job_process_album (TrackerSparqlConnection *connection,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", date);
+   g_free (date);
+ 
+@@ -865,7 +866,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection,
+   if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection,
+                                                                cancellable,
+                                                                &local_error,
+-                                                               datasource_urn,
++                                                               TRACKER_PICTURES_GRAPH,
+                                                                source_urn,
+                                                                "nie:relatedTo",
+                                                                photo_resource_urn))
+@@ -878,7 +879,7 @@ insert_shared_content_photos (TrackerSparqlConnection *connection,
+   if (!gom_tracker_sparql_connection_insert_or_replace_triple (connection,
+                                                                cancellable,
+                                                                &local_error,
+-                                                               datasource_urn,
++                                                               TRACKER_PICTURES_GRAPH,
+                                                                photo_resource_urn,
+                                                                "nie:links",
+                                                                source_urn))
+diff --git a/src/gom-media-server-miner.c b/src/gom-media-server-miner.c
+index 490869e..32e08c6 100644
+--- a/src/gom-media-server-miner.c
++++ b/src/gom-media-server-miner.c
+@@ -65,14 +65,14 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+   if (*error != NULL)
+     goto out;
+@@ -81,7 +81,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", photo->url);
+ 
+   if (*error != NULL)
+@@ -90,7 +90,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:mimeType", photo->mimetype);
+ 
+   if (*error != NULL)
+@@ -99,7 +99,7 @@ account_miner_job_process_photo (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:title", photo->name);
+ 
+   if (*error != NULL)
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index f349d01..32892fa 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -376,7 +376,7 @@ gom_miner_ensure_datasource (GomMiner *self,
+                           "  <%s> a nie:DataSource ; nao:identifier \"%s\" . "
+                           "  <%s> a nie:InformationElement ; nie:rootElementOf <%s> ; nie:version \"%d\""
+                           "}",
+-                          datasource_urn,
++                          GOM_GRAPH,
+                           datasource_urn, klass->miner_identifier,
+                           root_element_urn, datasource_urn, klass->version);
+ 
+@@ -401,8 +401,8 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job,
+ 
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn nao:identifier(?urn) WHERE { ?urn nie:dataSource <%s> }",
+-                          job->datasource_urn);
++                          "SELECT ?urn ?id WHERE { GRAPH <%s> { ?urn nie:dataSource <%s> ; nao:identifier ?id . } }",
++                          GOM_GRAPH, job->datasource_urn);
+ 
+   cursor = tracker_sparql_connection_query (job->connection,
+                                             select->str,
+@@ -415,9 +415,21 @@ gom_account_miner_job_query_existing (GomAccountMinerJob *job,
+ 
+   while (tracker_sparql_cursor_next (cursor, cancellable, error))
+     {
+-      g_hash_table_insert (job->previous_resources,
+-                           g_strdup (tracker_sparql_cursor_get_string (cursor, 1, NULL)),
+-                           g_strdup (tracker_sparql_cursor_get_string (cursor, 0, NULL)));
++      const gchar *urn, *identifier;
++
++      urn = tracker_sparql_cursor_get_string (cursor, 0, NULL);
++      identifier = tracker_sparql_cursor_get_string (cursor, 1, NULL);
++
++      if (identifier != NULL)
++        {
++          g_hash_table_insert (job->previous_resources,
++                               g_strdup (identifier),
++                               g_strdup (urn));
++        }
++      else
++        {
++          g_warning ("Missing identifier for urn %s", urn);
++        }
+     }
+ 
+   g_object_unref (cursor);
+@@ -489,16 +501,19 @@ gom_account_miner_job (GTask *task,
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Querying existing accounts stored in database");
+   gom_account_miner_job_query_existing (job, &error);
+ 
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Querying remote server");
+   gom_account_miner_job_query (job, &error);
+ 
+   if (error != NULL)
+     goto out;
+ 
++  g_debug ("account miner: Removing stale accounts");
+   gom_account_miner_job_cleanup_previous (job, &error);
+ 
+   if (error != NULL)
+@@ -752,10 +767,15 @@ cleanup_job (gpointer data,
+ 
+   /* find all our datasources in the tracker DB */
+   select = g_string_new (NULL);
+-  g_string_append_printf (select, "SELECT ?datasource nie:version(?root) WHERE { "
+-                          "?datasource a nie:DataSource . "
+-                          "?datasource nao:identifier \"%s\" . "
+-                          "OPTIONAL { ?root nie:rootElementOf ?datasource } }",
++  g_string_append_printf (select,
++                          "SELECT ?datasource nie:version(?root) WHERE { "
++                          "  GRAPH <%s> { "
++                          "    ?datasource a nie:DataSource . "
++                          "    ?datasource nao:identifier \"%s\" . "
++                          "    OPTIONAL { ?root nie:rootElementOf ?datasource } "
++                          "  }"
++                          "}",
++                          GOM_GRAPH,
+                           klass->miner_identifier);
+ 
+   cursor = tracker_sparql_connection_query (self->priv->connection,
+diff --git a/src/gom-miner.h b/src/gom-miner.h
+index 5dcfc8d..8f83139 100644
+--- a/src/gom-miner.h
++++ b/src/gom-miner.h
+@@ -61,7 +61,6 @@ typedef struct _GomMinerPrivate GomMinerPrivate;
+ typedef struct {
+   GomMiner *miner;
+   TrackerSparqlConnection *connection;
+-  gchar *bus_name;
+ 
+   GoaAccount *account;
+   GHashTable *services;
+diff --git a/src/gom-owncloud-miner.c b/src/gom-owncloud-miner.c
+index 34d303b..623f2e1 100644
+--- a/src/gom-owncloud-miner.c
++++ b/src/gom-owncloud-miner.c
+@@ -100,14 +100,14 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_DOCUMENTS_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_DOCUMENTS_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -117,7 +117,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   modification_time = g_date_time_new_from_timeval_local (&tv);
+   new_mtime = g_date_time_to_unix (modification_time);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_DOCUMENTS_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -133,7 +133,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_DOCUMENTS_GRAPH, resource,
+      "nie:url", uri);
+ 
+   if (*error != NULL)
+@@ -156,7 +156,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+             (connection, cancellable, error,
+              NULL,
+-             datasource_urn, parent_identifier,
++             GOM_GRAPH, parent_identifier,
+              "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+           g_checksum_reset (checksum);
+           g_free (parent_identifier);
+@@ -168,7 +168,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_DOCUMENTS_GRAPH, resource,
+              "nie:isPartOf", parent_resource_urn);
+           g_free (parent_resource_urn);
+ 
+@@ -182,7 +182,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_DOCUMENTS_GRAPH, resource,
+              "nie:mimeType", mime);
+ 
+           if (*error != NULL)
+@@ -194,7 +194,7 @@ account_miner_job_process_file (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_DOCUMENTS_GRAPH, resource,
+      "nfo:fileName", display_name);
+ 
+   if (*error != NULL)
+@@ -416,6 +416,11 @@ query_owncloud (GomAccountMinerJob *job,
+   mount = g_volume_get_mount (volume);
+   if (mount == NULL)
+     {
++      g_autofree gchar *volume_name;
++
++      volume_name = g_volume_get_name (volume);
++      g_debug ("Mounting Online Account volume %s", volume_name);
++
+       data.error = error;
+ 
+       context = g_main_context_new ();
+@@ -436,6 +441,7 @@ query_owncloud (GomAccountMinerJob *job,
+     }
+ 
+   root = g_mount_get_root (mount);
++  g_debug ("Got volume from gnome-online-accounts: root is %s", g_file_peek_path (root));
+   account_miner_job_traverse_dir (job, connection, previous_resources, datasource_urn, root, TRUE, cancellable, error);
+ 
+   g_object_unref (root);
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 63a4c29..0d1766c 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -26,16 +26,11 @@
+ #include "gom-tracker.h"
+ #include "gom-utils.h"
+ 
+-static gchar *
+-_tracker_utils_format_into_graph (const gchar *graph)
+-{
+-  return (graph != NULL) ? g_strdup_printf ("INTO <%s> ", graph) : g_strdup ("");
+-}
+-
+ static gboolean
+ gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *connection,
+                                                     GCancellable *cancellable,
+                                                     GError **error,
++                                                    const gchar *graph,
+                                                     const gchar *resource,
+                                                     const gchar *attribute,
+                                                     gchar **value)
+@@ -45,8 +40,8 @@ gom_tracker_sparql_connection_get_string_attribute (TrackerSparqlConnection *con
+   const gchar *string_value = NULL;
+   gboolean res;
+ 
+-  g_string_append_printf (select, "SELECT ?val { <%s> %s ?val }",
+-                          resource, attribute);
++  g_string_append_printf (select, "SELECT ?val { GRAPH <%s> { <%s> %s ?val } }",
++                          graph, resource, attribute);
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+                                             cancellable, error);
+@@ -86,7 +81,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+                                                const gchar *class,
+                                                ...)
+ {
+-  GString *select, *insert, *inner;
++  GString *select, *inner;
++  gchar *insert;
+   va_list args;
+   const gchar *arg;
+   TrackerSparqlCursor *cursor;
+@@ -98,6 +94,8 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   gchar *key = NULL, *val = NULL;
+   gboolean exists = FALSE;
+ 
++  g_return_val_if_fail (graph != NULL, NULL);
++
+   /* build the inner query with all the classes */
+   va_start (args, class);
+   inner = g_string_new (NULL);
+@@ -112,7 +110,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   /* query if such a resource is already in the DB */
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn WHERE { ?urn %s }", inner->str);
++                          "SELECT ?urn WHERE { GRAPH <%s> { ?urn %s } }", graph, inner->str);
+ 
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+@@ -138,19 +136,12 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+     }
+ 
+   /* not found, create the resource */
+-  insert = g_string_new (NULL);
+-  graph_str = _tracker_utils_format_into_graph (graph);
+-
+-  g_string_append_printf (insert, "INSERT %s { _:res %s }",
+-                          graph_str, inner->str);
+-  g_free (graph_str);
+-  g_string_free (inner, TRUE);
+-
++  insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }",
++                            graph, inner->str);
+   insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert->str,
++    tracker_sparql_connection_update_blank (connection, insert,
+                                             G_PRIORITY_DEFAULT, NULL, error);
+-
+-  g_string_free (insert, TRUE);
++  g_free (insert);
+ 
+   if (*error != NULL)
+     goto out;
+@@ -194,10 +185,10 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+                                                         const gchar *property_value)
+ {
+   GString *insert;
+-  gchar *graph_str, *quoted;
++  gchar *quoted;
+   gboolean retval = TRUE;
+ 
+-  graph_str = _tracker_utils_format_into_graph (graph);
++  g_return_val_if_fail (graph != NULL, FALSE);
+ 
+   /* the "null" value must not be quoted */
+   if (property_value == NULL)
+@@ -208,8 +199,8 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   insert = g_string_new (NULL);
+   g_string_append_printf
+     (insert,
+-     "INSERT OR REPLACE %s { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
+-     graph_str, resource, property_name, quoted);
++     "INSERT OR REPLACE INTO <%s> { <%s> a nie:InformationElement, nie:DataObject ; %s %s }",
++     graph, resource, property_name, quoted);
+   g_free (quoted);
+ 
+   g_debug ("Insert or replace triple: query %s", insert->str);
+@@ -223,8 +214,6 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+   if (*error != NULL)
+     retval = FALSE;
+ 
+-  g_free (graph_str);
+-
+   return retval;
+ }
+ 
+@@ -271,6 +260,7 @@ gboolean
+ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection,
+                                                GCancellable *cancellable,
+                                                GError **error,
++                                               const gchar *graph,
+                                                const gchar *resource,
+                                                gboolean favorite)
+ {
+@@ -279,15 +269,15 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti
+   gboolean retval = TRUE;
+ 
+   if (favorite)
+-    op_str = "INSERT OR REPLACE";
++    op_str = "INSERT OR REPLACE INTO";
+   else
+-    op_str = "DELETE";
++    op_str = "DELETE FROM";
+ 
+   update = g_string_new (NULL);
+   g_string_append_printf
+     (update,
+-     "%s { <%s> nao:hasTag nao:predefined-tag-favorite }",
+-     op_str, resource);
++     "%s <%s> { <%s> nao:hasTag nao:predefined-tag-favorite }",
++     op_str, graph, resource);
+ 
+   g_debug ("Toggle favorite: query %s", update->str);
+ 
+@@ -321,9 +311,13 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+   mail_uri = g_strconcat ("mailto:", email, NULL);
+   select = g_string_new (NULL);
+   g_string_append_printf (select,
+-                          "SELECT ?urn WHERE { ?urn a nco:Contact . "
+-                          "?urn nco:hasEmailAddress ?mail . "
+-                          "FILTER (fn:contains(?mail, \"%s\" )) }", mail_uri);
++                          "SELECT ?urn WHERE { "
++                          "  GRAPH <%s> { "
++                          "    ?urn a nco:Contact . "
++                          "    ?urn nco:hasEmailAddress ?mail . "
++                          "    FILTER (fn:contains(?mail, \"%s\" )) "
++                          "  }"
++                          "}", TRACKER_CONTACTS_GRAPH, mail_uri);
+ 
+   cursor = tracker_sparql_connection_query (connection,
+                                             select->str,
+@@ -351,8 +345,9 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+   insert = g_string_new (NULL);
+ 
+   g_string_append_printf (insert,
+-                          "INSERT { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . "
++                          "INSERT INTO <%s> { <%s> a nco:EmailAddress ; nco:emailAddress \"%s\" . "
+                           "_:res a nco:Contact ; nco:hasEmailAddress <%s> ; nco:fullname \"%s\" . }",
++                          TRACKER_CONTACTS_GRAPH,
+                           mail_uri, email,
+                           mail_uri, fullname);
+ 
+@@ -397,6 +392,7 @@ gchar *
+ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection,
+                                              GCancellable *cancellable,
+                                              GError **error,
++                                             const gchar *graph,
+                                              const gchar *make,
+                                              const gchar *model)
+ {
+@@ -416,7 +412,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+   equip_uri = tracker_sparql_escape_uri_printf ("urn:equipment:%s:%s:",
+                                                 make != NULL ? make : "",
+                                                 model != NULL ? model : "");
+-  select = g_strdup_printf ("SELECT <%s> WHERE { }", equip_uri);
++  select = g_strdup_printf ("ASK { GRAPH <%s> { <%s> a nfo:Equipment } }", graph, equip_uri);
+ 
+   local_error = NULL;
+   cursor = tracker_sparql_connection_query (connection, select, cancellable, &local_error);
+@@ -436,20 +432,19 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+ 
+   if (res)
+     {
+-      const gchar *cursor_uri;
+-
+-      cursor_uri = tracker_sparql_cursor_get_string (cursor, 0, NULL);
+-      if (g_strcmp0 (cursor_uri, equip_uri) == 0)
++      if (tracker_sparql_cursor_get_boolean (cursor, 0))
+         {
+-          /* return the found resource */
+-          retval = g_strdup (cursor_uri);
++          /* The resource exists */
++          retval = equip_uri;
++          equip_uri = NULL;
+           g_debug ("Found resource in the store: %s", retval);
+           goto out;
+         }
+     }
+ 
+   /* not found, create the resource */
+-  insert = g_strdup_printf ("INSERT { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }",
++  insert = g_strdup_printf ("INSERT INTO <%s> { <%s> a nfo:Equipment ; nfo:manufacturer \"%s\" ; nfo:model \"%s\" }",
++                            graph,
+                             equip_uri,
+                             make,
+                             model);
+@@ -480,7 +475,7 @@ void
+ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+                                const gchar              *datasource_urn,
+                                gboolean                  resource_exists,
+-                               const gchar              *identifier,
++                               const gchar              *graph,
+                                const gchar              *resource,
+                                GCancellable             *cancellable,
+                                GError                  **error)
+@@ -498,7 +493,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+ 
+       res = gom_tracker_sparql_connection_get_string_attribute
+         (connection, cancellable, error,
+-         resource, "nie:dataSource", &old_value);
++         graph, resource, "nie:dataSource", &old_value);
+       g_clear_error (error);
+ 
+       if (res)
+@@ -514,7 +509,7 @@ gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+   if (set_datasource)
+     gom_tracker_sparql_connection_set_triple
+       (connection, cancellable, error,
+-       identifier, resource,
++       graph, resource,
+        "nie:dataSource", datasource_urn);
+ }
+ 
+@@ -522,7 +517,7 @@ gboolean
+ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+                           gint64                    new_mtime,
+                           gboolean                  resource_exists,
+-                          const gchar              *identifier,
++                          const gchar              *graph,
+                           const gchar              *resource,
+                           GCancellable             *cancellable,
+                           GError                  **error)
+@@ -536,7 +531,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+     {
+       res = gom_tracker_sparql_connection_get_string_attribute
+         (connection, cancellable, error,
+-         resource, "nie:contentLastModified", &old_value);
++         graph, resource, "nie:contentLastModified", &old_value);
+       g_clear_error (error);
+ 
+       if (res)
+@@ -552,7 +547,7 @@ gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+   date = gom_iso8601_from_timestamp (new_mtime);
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection, cancellable, error,
+-     identifier, resource,
++     graph, resource,
+      "nie:contentLastModified", date);
+   g_free (date);
+ 
+diff --git a/src/gom-tracker.h b/src/gom-tracker.h
+index 94a39e8..a5ae6fd 100644
+--- a/src/gom-tracker.h
++++ b/src/gom-tracker.h
+@@ -29,6 +29,14 @@
+ 
+ G_BEGIN_DECLS
+ 
++/* The graph where we store account meta information */
++#define GOM_GRAPH "tracker.api.gnome.org/ontology/v3/gnome-online-miners"
++
++/* Graphs where we store content information */
++#define TRACKER_CONTACTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Contacts"
++#define TRACKER_DOCUMENTS_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Documents"
++#define TRACKER_PICTURES_GRAPH "http://tracker.api.gnome.org/ontology/v3/tracker#Pictures"
++
+ gchar *gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connection,
+                                                       GCancellable *cancellable,
+                                                       GError **error,
+@@ -57,6 +65,7 @@ gboolean gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *conn
+ gboolean gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connection,
+                                                         GCancellable *cancellable,
+                                                         GError **error,
++                                                        const gchar *graph,
+                                                         const gchar *resource,
+                                                         gboolean favorite);
+ 
+@@ -69,20 +78,21 @@ gchar* gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *conne
+ gchar *gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection,
+                                                     GCancellable *cancellable,
+                                                     GError **error,
++                                                    const gchar *graph,
+                                                     const gchar *make,
+                                                     const gchar *model);
+ 
+ void gom_tracker_update_datasource (TrackerSparqlConnection  *connection,
+                                     const gchar              *datasource_urn,
+                                     gboolean                  resource_exists,
+-                                    const gchar              *identifier,
++                                    const gchar              *graph,
+                                     const gchar              *resource,
+                                     GCancellable             *cancellable,
+                                     GError                  **error);
+ gboolean gom_tracker_update_mtime (TrackerSparqlConnection  *connection,
+                                    gint64                    new_mtime,
+                                    gboolean                  resource_exists,
+-                                   const gchar              *identifier,
++                                   const gchar              *graph,
+                                    const gchar              *resource,
+                                    GCancellable             *cancellable,
+                                    GError                  **error);
+diff --git a/src/gom-zpj-miner.c b/src/gom-zpj-miner.c
+index 6dff947..1372de5 100644
+--- a/src/gom-zpj-miner.c
++++ b/src/gom-zpj-miner.c
+@@ -70,14 +70,14 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+     (connection,
+      cancellable, error,
+      &resource_exists,
+-     datasource_urn, identifier,
++     TRACKER_PICTURES_GRAPH, identifier,
+      "nfo:RemoteDataObject", class, NULL);
+ 
+   if (*error != NULL)
+     goto out;
+ 
+   gom_tracker_update_datasource (connection, datasource_urn,
+-                                 resource_exists, identifier, resource,
++                                 resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                  cancellable, error);
+ 
+   if (*error != NULL)
+@@ -86,7 +86,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   updated_time = zpj_skydrive_entry_get_updated_time (entry);
+   new_mtime = g_date_time_to_unix (updated_time);
+   mtime_changed = gom_tracker_update_mtime (connection, new_mtime,
+-                                            resource_exists, identifier, resource,
++                                            resource_exists, TRACKER_PICTURES_GRAPH, resource,
+                                             cancellable, error);
+ 
+   if (*error != NULL)
+@@ -102,7 +102,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:url", identifier);
+ 
+   if (*error != NULL)
+@@ -119,7 +119,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       parent_resource_urn = gom_tracker_sparql_connection_ensure_resource
+         (connection, cancellable, error,
+          NULL,
+-         datasource_urn, parent_identifier,
++         TRACKER_PICTURES_GRAPH, parent_identifier,
+          "nfo:RemoteDataObject", "nfo:DataContainer", NULL);
+       g_free (parent_identifier);
+ 
+@@ -129,7 +129,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+       gom_tracker_sparql_connection_insert_or_replace_triple
+         (connection,
+          cancellable, error,
+-         datasource_urn, resource,
++         TRACKER_PICTURES_GRAPH, resource,
+          "nie:isPartOf", parent_resource_urn);
+       g_free (parent_resource_urn);
+ 
+@@ -142,7 +142,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+           gom_tracker_sparql_connection_insert_or_replace_triple
+             (connection,
+              cancellable, error,
+-             datasource_urn, resource,
++             TRACKER_PICTURES_GRAPH, resource,
+              "nie:mimeType", mime);
+           g_free (mime);
+ 
+@@ -154,7 +154,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:description", zpj_skydrive_entry_get_description (entry));
+ 
+   if (*error != NULL)
+@@ -163,7 +163,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nfo:fileName", name);
+ 
+   if (*error != NULL)
+@@ -180,7 +180,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nco:creator", contact_resource);
+   g_free (contact_resource);
+ 
+@@ -192,7 +192,7 @@ account_miner_job_process_entry (GomAccountMinerJob *job,
+   gom_tracker_sparql_connection_insert_or_replace_triple
+     (connection,
+      cancellable, error,
+-     datasource_urn, resource,
++     TRACKER_PICTURES_GRAPH, resource,
+      "nie:contentCreated", date);
+   g_free (date);
+ 
+-- 
+GitLab
+
+
+From 34259944dd9e6e167663c97080142f6e8b7f00f2 Mon Sep 17 00:00:00 2001
+From: Sam Thursfield <sam@afuera.me.uk>
+Date: Mon, 27 Jul 2020 23:48:49 +0200
+Subject: [PATCH 5/5] Update for API changes in Tracker 2.99
+
+---
+ src/gom-miner.c   |  3 ---
+ src/gom-tracker.c | 22 ++++++----------------
+ 2 files changed, 6 insertions(+), 19 deletions(-)
+
+diff --git a/src/gom-miner.c b/src/gom-miner.c
+index 32892fa..d9ccf67 100644
+--- a/src/gom-miner.c
++++ b/src/gom-miner.c
+@@ -382,7 +382,6 @@ gom_miner_ensure_datasource (GomMiner *self,
+ 
+   tracker_sparql_connection_update (self->priv->connection,
+                                     datasource_insert->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     error);
+ 
+@@ -469,7 +468,6 @@ gom_account_miner_job_cleanup_previous (GomAccountMinerJob *job,
+ 
+   tracker_sparql_connection_update (job->connection,
+                                     delete->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     error);
+ 
+@@ -709,7 +707,6 @@ cleanup_job_do_cleanup (CleanupJob *job, GCancellable *cancellable)
+ 
+   tracker_sparql_connection_update (self->priv->connection,
+                                     update->str,
+-                                    G_PRIORITY_DEFAULT,
+                                     cancellable,
+                                     &error);
+   g_string_free (update, TRUE);
+diff --git a/src/gom-tracker.c b/src/gom-tracker.c
+index 0d1766c..5f49f73 100644
+--- a/src/gom-tracker.c
++++ b/src/gom-tracker.c
+@@ -138,9 +138,7 @@ gom_tracker_sparql_connection_ensure_resource (TrackerSparqlConnection *connecti
+   /* not found, create the resource */
+   insert = g_strdup_printf ("INSERT INTO <%s> { _:res %s }",
+                             graph, inner->str);
+-  insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert,
+-                                            G_PRIORITY_DEFAULT, NULL, error);
++  insert_res = tracker_sparql_connection_update_blank (connection, insert, NULL, error);
+   g_free (insert);
+ 
+   if (*error != NULL)
+@@ -205,9 +203,7 @@ gom_tracker_sparql_connection_insert_or_replace_triple (TrackerSparqlConnection
+ 
+   g_debug ("Insert or replace triple: query %s", insert->str);
+ 
+-  tracker_sparql_connection_update (connection, insert->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, insert->str, cancellable, error);
+ 
+   g_string_free (insert, TRUE);
+ 
+@@ -235,9 +231,7 @@ gom_tracker_sparql_connection_set_triple (TrackerSparqlConnection *connection,
+      "DELETE { <%s> %s ?val } WHERE { <%s> %s ?val }", resource,
+      property_name, resource, property_name);
+ 
+-  tracker_sparql_connection_update (connection, delete->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, delete->str, cancellable, error);
+ 
+   g_string_free (delete, TRUE);
+   if (*error != NULL)
+@@ -281,9 +275,7 @@ gom_tracker_sparql_connection_toggle_favorite (TrackerSparqlConnection *connecti
+ 
+   g_debug ("Toggle favorite: query %s", update->str);
+ 
+-  tracker_sparql_connection_update (connection, update->str,
+-                                    G_PRIORITY_DEFAULT, cancellable,
+-                                    error);
++  tracker_sparql_connection_update (connection, update->str, cancellable, error);
+ 
+   g_string_free (update, TRUE);
+ 
+@@ -351,9 +343,7 @@ gom_tracker_utils_ensure_contact_resource (TrackerSparqlConnection *connection,
+                           mail_uri, email,
+                           mail_uri, fullname);
+ 
+-  insert_res =
+-    tracker_sparql_connection_update_blank (connection, insert->str,
+-                                            G_PRIORITY_DEFAULT, cancellable, error);
++  insert_res = tracker_sparql_connection_update_blank (connection, insert->str, cancellable, error);
+ 
+   g_string_free (insert, TRUE);
+ 
+@@ -450,7 +440,7 @@ gom_tracker_utils_ensure_equipment_resource (TrackerSparqlConnection *connection
+                             model);
+ 
+   local_error = NULL;
+-  tracker_sparql_connection_update (connection, insert, G_PRIORITY_DEFAULT, cancellable, &local_error);
++  tracker_sparql_connection_update (connection, insert, cancellable, &local_error);
+   if (local_error != NULL)
+     {
+       g_propagate_error (error, local_error);
+-- 
+GitLab
+
diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template
index 644ac3558c9f..a9b2f37d69a5 100644
--- a/srcpkgs/gnome-online-miners/template
+++ b/srcpkgs/gnome-online-miners/template
@@ -1,12 +1,13 @@
 # Template file for 'gnome-online-miners'
 pkgname=gnome-online-miners
 version=3.34.0
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel"
+hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel autoconf
+ automake libtool autoconf-archive"
 makedepends="libzapojit-devel libgdata-devel grilo-devel
- tracker-devel gfbgraph-devel gnome-online-accounts-devel"
+ tracker3-devel gfbgraph-devel gnome-online-accounts-devel"
 depends="libzapojit>=0.0.3_3"
 short_desc="GNOME service that crawls through your online content"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=845c2260fb12f14315c800d04d60f37e076c7c7b4222587ae75f108562fa52d8
 lib32disabled=yes
+
+pre_configure() {
+	autoreconf -fi
+}

From 8c3513663bfbb187656e7d8d5915b00e579e54f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 9 Apr 2022 13:10:44 +0200
Subject: [PATCH 1147/1686] removed-packages: revbump

---
 srcpkgs/removed-packages/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f1dcebc2b8cc..5d6d2c153348 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=68
+revision=69
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"

From aa001007ae377006e5d8cb48a70e52a487dd1d1e Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:46:34 +0200
Subject: [PATCH 1148/1686] fio: update to 3.30.

---
 srcpkgs/fio/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/fio/template b/srcpkgs/fio/template
index e5b15d2b6908..9bbb31a85740 100644
--- a/srcpkgs/fio/template
+++ b/srcpkgs/fio/template
@@ -1,6 +1,6 @@
 # Template file for 'fio'
 pkgname=fio
-version=3.29
+version=3.30
 revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/axboe/fio"
 distfiles="https://github.com/axboe/${pkgname}/archive/${pkgname}-${version}.tar.gz"
-checksum=3ad22ee9c545afae914f399886e9637a43d1b3aa5dfcf6966ed83e633759acb7
+checksum=305647377527a2827223065582dd8a9269e69866426b341699d55bb4e4d3cc71
 python_version=3
 
 case "$XBPS_TARGET_MACHINE" in
@@ -30,7 +30,7 @@ do_configure() {
 }
 
 post_install() {
-	vdoc HOWTO
+	vdoc HOWTO.rst
 	for f in examples/*; do
 		vsconf "$f"
 	done

From fc6cb9ee78f40a8afb51716231fd245babd40979 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:48:06 +0200
Subject: [PATCH 1149/1686] xclock: update to 1.1.1.

---
 srcpkgs/xclock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xclock/template b/srcpkgs/xclock/template
index 6d214076f834..83dbebfea74e 100644
--- a/srcpkgs/xclock/template
+++ b/srcpkgs/xclock/template
@@ -1,6 +1,6 @@
 # Template file for 'xclock'
 pkgname=xclock
-version=1.1.0
+version=1.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config xorg-util-macros"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://www.x.org/archive/X11R6.8.1/doc/xclock.1.html"
 distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
-checksum=00d1be08b3471a16b1239acad11e26b80545c49c34d9d20deab0ce14515e098f
+checksum=df7ceabf8f07044a2fde4924d794554996811640a45de40cb12c2cf1f90f742c
 
 post_install() {
 	vlicense COPYING

From 59d92ed9900bafef185cd8907c1f8b0ab246dc97 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:50:53 +0200
Subject: [PATCH 1150/1686] scite: update to 5.2.2.

---
 srcpkgs/scite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template
index 4943d99f3fcf..e48c6adadb41 100644
--- a/srcpkgs/scite/template
+++ b/srcpkgs/scite/template
@@ -1,6 +1,6 @@
 # Template file for 'scite'
 pkgname=scite
-version=5.2.1
+version=5.2.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=0e7a1daca03d9eea20b2857b722ffd57788799235803bb7b84694af5a1707e07
+checksum=ad33019fdcf001ed441e88169593c3efebe77542f10bbc3e5a20a34e196586e0
 
 post_extract() {
 	sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile

From c4cfb4b5609efcacf70dd1545a86d4cbebd4e540 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Apr 2022 16:04:20 +0200
Subject: [PATCH 1151/1686] python3-pipenv: update to 2022.4.8.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index 707476ccc36d..ea94ef51e087 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.3.28
+version=2022.4.8
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=4e7aae62dad7679ce81b54cc3451be19fb2c469e269335b36b14132fe5ceecb3
+checksum=53562bf69d9e5238f99a1e2101c356746b1c0aefa5dceb9b8a84a5a3e201de0d
 conflicts="python-pipenv>=0"
 
 post_extract() {

From fce0138c9bf9fcca83416170009629ee136e17e3 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 9 Apr 2022 10:02:29 -0500
Subject: [PATCH 1152/1686] xmandump: update to 0.2.3.

---
 srcpkgs/xmandump/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xmandump/template b/srcpkgs/xmandump/template
index b05027396eaf..8ca5f3a280db 100644
--- a/srcpkgs/xmandump/template
+++ b/srcpkgs/xmandump/template
@@ -1,6 +1,6 @@
 # Template file for 'xmandump'
 pkgname=xmandump
-version=0.2.2
+version=0.2.3
 revision=1
 build_style=go
 go_import_path="github.com/void-linux/xmandump"
@@ -10,7 +10,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="ISC"
 homepage="https://github.com/void-linux/xmandump"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=c664b84b9eb26e6cf6d7bc0aceca9a2ccfcfb1c0a4e0611544117489941c00ca
+checksum=d8c356bd2722558e9bfe1e55aefc0c44f6aecb52e998f4e7608e544a90cd6d89
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From 19d5089044c83ed6cb9392315a55471a30cf58f9 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Sat, 2 Apr 2022 00:02:47 -0500
Subject: [PATCH 1153/1686] .github/workflows: Enable actions/stale

---
 .github/workflows/stale.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index abdc83c9d383..91ac19e4f638 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,10 +12,8 @@ jobs:
     steps:
       - uses: actions/stale@v4
         with:
-          stale-issue-message: 'Issues become stale 90 days after last activity and are closed 7 days after that.  If this issue is still relevant bump it or assign it.'
-          stale-pr-message: 'Pull Requests become stale 90 days after last activity and are closed 7 days after that.  If this pull request is still relevant bump it or assign it.'
+          stale-issue-message: 'Issues become stale 90 days after last activity and are closed 14 days after that.  If this issue is still relevant bump it or assign it.'
+          stale-pr-message: '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.'
           days-before-stale: 90
-          days-before-close: 7
-          debug-only: true
+          days-before-close: 14
           exempt-all-assignees: true
-          operations-per-run: 1000

From ac383c65dc65aa372692867205a1442dec0abd07 Mon Sep 17 00:00:00 2001
From: Erich Ericson <fakefakefans@gmail.com>
Date: Sun, 19 Dec 2021 18:41:33 +0100
Subject: [PATCH 1154/1686] MultiMC: remove package

---
 srcpkgs/MultiMC/files/MultiMC.sh  |  2 --
 srcpkgs/MultiMC/template          | 50 -------------------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 srcpkgs/MultiMC/files/MultiMC.sh
 delete mode 100644 srcpkgs/MultiMC/template

diff --git a/srcpkgs/MultiMC/files/MultiMC.sh b/srcpkgs/MultiMC/files/MultiMC.sh
deleted file mode 100644
index 271794952e82..000000000000
--- a/srcpkgs/MultiMC/files/MultiMC.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/libexec/multimc/multimc -d ~/.multimc
diff --git a/srcpkgs/MultiMC/template b/srcpkgs/MultiMC/template
deleted file mode 100644
index a842a76ac798..000000000000
--- a/srcpkgs/MultiMC/template
+++ /dev/null
@@ -1,50 +0,0 @@
-# Template file for 'MultiMC'
-pkgname=MultiMC
-version=0.6.13
-revision=1
-wrksrc="Launcher-${version}"
-_commithashnbt="4b305bbd2ac0e7a26987baf7949a484a87b474d4"
-_nbtversion="multimc-0.6.1"
-_quazipversion="multimc-3"
-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 qt5-svg"
-short_desc="Instanced Minecraft client"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
-homepage="http://multimc.org"
-distfiles="https://github.com/MultiMC/Launcher/archive/${version}.tar.gz
- https://github.com/${pkgname}/libnbtplusplus/archive/${_nbtversion}.tar.gz
- https://github.com/${pkgname}/quazip/archive/${_quazipversion}.tar.gz"
-checksum="d77d07e77754875a8a4abd5a2f4d0e01593aa7ffb4860efe993eb2755e8a3164
- 36c816e6b1ef8ece52c57dfa9bfda3a23808d0c6c3288b25d8bcf49c7cdb5b07
- ffa60368b1c196859691b637c740f4c60597b2ac47217995082ae8b2a3a9ac18"
-skip_extraction="${_nbtversion}.tar.gz ${_quazipversion}.tar.gz"
-
-# Restricted since we don't have permissions to ship builds with the
-# MultiMC name, artwork or the API endpoints.
-restricted=yes
-
-case "$XBPS_TARGET_MACHINE" in
-	armv*) broken="https://github.com/MultiMC/MultiMC5/issues/2895";;
-esac
-
-pre_configure() {
-	export JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
-	export PATH=$PATH:$JAVA_HOME/bin
-	tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_nbtversion}.tar.gz" -C "${wrksrc}/libraries/libnbtplusplus" --strip-components 1
-	tar zxvf "${XBPS_SRCDISTDIR}/${pkgname}-${version}/${_quazipversion}.tar.gz" -C "${wrksrc}/libraries/quazip" --strip-components 1
-}
-
-post_install() {
-	vmkdir usr/libexec/multimc
-	mv "${DESTDIR}/usr/bin/multimc" "${DESTDIR}/usr/libexec/multimc"
-	vbin "${FILESDIR}/MultiMC.sh" MultiMC
-	vinstall build/libMultiMC_nbt++.so 755 /usr/lib
-	vinstall build/libMultiMC_quazip.so 755 /usr/lib
-	vinstall launcher/package/linux/multimc.desktop 644 /usr/share/applications
-	vsed -i "${DESTDIR}/usr/share/applications/multimc.desktop" -e 's/Exec=multimc/Exec=MultiMC/'
-	vinstall launcher/resources/multimc/scalable/multimc.svg 644 /usr/share/pixmaps
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 5d6d2c153348..6859fe29da93 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -11,6 +11,7 @@ homepage="https://voidlinux.org"
 replaces="
  ImageMagick6<=6.9.12.12_2
  MoinMoin<=1.9.11_1
+ MultiMC<=0.6.13_1
  Platinum9-theme<=0.0.0.20170720_3
  Venom<=0.5.5_1
  XorCurses<=0.2.2_1

From 193b256742a9ac3ae8adea7a12bc789f8b8af240 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:51:34 +0200
Subject: [PATCH 1155/1686] icdiff: update to 2.0.5.

---
 .../icdiff/patches/tests-disable-format-and-lint.patch | 10 ++++++++++
 srcpkgs/icdiff/template                                |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch

diff --git a/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch b/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch
new file mode 100644
index 000000000000..6e3daa16d903
--- /dev/null
+++ b/srcpkgs/icdiff/patches/tests-disable-format-and-lint.patch
@@ -0,0 +1,10 @@
+--- a/test.sh
++++ b/test.sh
+@@ -204,6 +204,7 @@
+   fi
+ }
+ 
++exit 0
+ ensure_installed "black"
+ echo 'Running black formatter...'
+ if ! black icdiff --line-length 79 --check; then
diff --git a/srcpkgs/icdiff/template b/srcpkgs/icdiff/template
index 35e1d87c683c..14f656a597bf 100644
--- a/srcpkgs/icdiff/template
+++ b/srcpkgs/icdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'icdiff'
 pkgname=icdiff
-version=2.0.4
-revision=2
+version=2.0.5
+revision=1
 wrksrc="${pkgname}-release-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +13,7 @@ license="Python-2.0"
 homepage="http://www.jefftk.com/icdiff"
 changelog="https://github.com/jeffkaufman/icdiff/raw/master/ChangeLog"
 distfiles="https://github.com/jeffkaufman/icdiff/archive/release-${version}.tar.gz"
-checksum=ec21632b64159990a1bcedc8b25f96b476e7a6d9e18b75422420c0ae9b694eac
+checksum=e1c278222891acde5d5b47e31b89f765fdf022b8908057f583032530982fe5b4
 
 replaces="python3-icdiff>=0"
 provides="python3-icdiff-${version}_${revision}"

From 46e615d25f4b73ff7d5812a09fc8cc6aa9b6c708 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:27 +0200
Subject: [PATCH 1156/1686] drumkv1: update to 0.9.25.

---
 srcpkgs/drumkv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template
index ff9633954f94..d26d6962543e 100644
--- a/srcpkgs/drumkv1/template
+++ b/srcpkgs/drumkv1/template
@@ -1,6 +1,6 @@
 # Template file for 'drumkv1'
 pkgname=drumkv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://drumkv1.sourceforge.io/"
 changelog="https://github.com/rncbc/drumkv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz"
-checksum=b3d7a4105e94c3b29235d2d00ae74d0be6a00d62e791c968056aa64ff7ac6012
+checksum=cc89d3aaf617ec86fba448b61bb5376445bc5a65b102dd797caad14f2659a05c

From 1091c88fb95ca37f9d36f707becf3bc869e7ec9f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:34 +0200
Subject: [PATCH 1157/1686] padthv1: update to 0.9.25.

---
 srcpkgs/padthv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template
index 59ab088017c8..c5f6158d1a2d 100644
--- a/srcpkgs/padthv1/template
+++ b/srcpkgs/padthv1/template
@@ -1,6 +1,6 @@
 # Template file for 'padthv1'
 pkgname=padthv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://padthv1.sourceforge.io/"
 changelog="https://github.com/rncbc/padthv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/padthv1/padthv1-${version}.tar.gz"
-checksum=abdbad3bae84f665bada488f0e41d2e75b810e88fa63b64e884856f8a9b8785c
+checksum=6acabd7a9ffa45a0ebab48715c6342bc7530491599936378d4b89d47d211ca85

From 5c9ad4583e2591ba16a4cd0df044b8a379cd579f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:39 +0200
Subject: [PATCH 1158/1686] samplv1: update to 0.9.25.

---
 srcpkgs/samplv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template
index c694da880baf..5e7a8ecec542 100644
--- a/srcpkgs/samplv1/template
+++ b/srcpkgs/samplv1/template
@@ -1,6 +1,6 @@
 # Template file for 'samplv1'
 pkgname=samplv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://samplv1.sourceforge.io/"
 changelog="https://github.com/rncbc/samplv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/samplv1/samplv1-${version}.tar.gz"
-checksum=ff0bfbaacfb514cb1a0194b0a43ca121f7679640a293f907fb1bbb2640d373b0
+checksum=acf035da8c0f38ccd0a9bd0327d250c6338d8af56c824bf20f90673b07580534

From ad7d21d886da99b9ab153a9d78179717a5c77fa7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 9 Apr 2022 17:54:42 +0200
Subject: [PATCH 1159/1686] synthv1: update to 0.9.25.

---
 srcpkgs/synthv1/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template
index e835002bd2fc..6d8775be3be2 100644
--- a/srcpkgs/synthv1/template
+++ b/srcpkgs/synthv1/template
@@ -1,6 +1,6 @@
 # Template file for 'synthv1'
 pkgname=synthv1
-version=0.9.24
+version=0.9.25
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://synthv1.sourceforge.io/"
 changelog="https://github.com/rncbc/synthv1/raw/master/ChangeLog"
 distfiles="https://download.sourceforge.net/synthv1/synthv1-${version}.tar.gz"
-checksum=74857bf2497023dd0ebe59222e548d870598312b18a5826c54f4033c0fbd3d55
+checksum=02f05fcd45c896d6194fb10cb8ec64329193e3c194ce7e0b13a5f2e4cc0026c4

From 0896f11df74290f8ad9c29d45e930e5720b9a5d4 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 9 Apr 2022 09:02:28 -0700
Subject: [PATCH 1160/1686] eudev: add udev_dir pkg-config variable

---
 ...80239647d37e5cfe320c422cce879c2e0d2c.patch | 20 +++++++++++++++++++
 srcpkgs/eudev/template                        |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch

diff --git a/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
new file mode 100644
index 000000000000..b36b84f75496
--- /dev/null
+++ b/srcpkgs/eudev/patches/9d9e80239647d37e5cfe320c422cce879c2e0d2c.patch
@@ -0,0 +1,20 @@
+From 9d9e80239647d37e5cfe320c422cce879c2e0d2c Mon Sep 17 00:00:00 2001
+From: oreo639 <31916379+Oreo639@users.noreply.github.com>
+Date: Sat, 9 Apr 2022 05:39:56 -0700
+Subject: [PATCH] udev: add udev_dir as synonym of udevdir
+
+---
+ src/udev/udev.pc.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/udev/udev.pc.in b/src/udev/udev.pc.in
+index 4a9d867b8..cccebb245 100644
+--- a/src/udev/udev.pc.in
++++ b/src/udev/udev.pc.in
+@@ -3,4 +3,5 @@ Description: eudev
+ Version: @UDEV_VERSION@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-udevdir=@udevlibexecdir@
++udev_dir=@udevlibexecdir@
++udevdir=${udev_dir}
diff --git a/srcpkgs/eudev/template b/srcpkgs/eudev/template
index df783c562bca..68c50149e028 100644
--- a/srcpkgs/eudev/template
+++ b/srcpkgs/eudev/template
@@ -4,7 +4,7 @@ _UDEV_VERSION="243" # compatible udev version provided
 
 pkgname=eudev
 version=3.2.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-hwdb --enable-manpages --disable-introspection"
 hostmakedepends="pkg-config gperf"

From 7fdb532dfc271c9d7b99a6549bc2654416f5cdea Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 10 Apr 2022 01:40:24 +0200
Subject: [PATCH 1161/1686] firefox: fix build on platforms like ppc*

---
 srcpkgs/firefox/patches/fix-build-tier3.patch | 366 ++++++++++++++++++
 1 file changed, 366 insertions(+)
 create mode 100644 srcpkgs/firefox/patches/fix-build-tier3.patch

diff --git a/srcpkgs/firefox/patches/fix-build-tier3.patch b/srcpkgs/firefox/patches/fix-build-tier3.patch
new file mode 100644
index 000000000000..c7f5b7ea1f7b
--- /dev/null
+++ b/srcpkgs/firefox/patches/fix-build-tier3.patch
@@ -0,0 +1,366 @@
+commit 8a0c895dee94b3c15e56557eb1dd0114477a6056
+Author: q66 <daniel@octaforge.org>
+Date:   Sun Apr 10 00:38:30 2022 +0200
+
+    fix build on tier 3 platforms
+    
+    https://bugzilla.mozilla.org/show_bug.cgi?id=1758610
+
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
+index 0fa127b..78c8961 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
+@@ -814,7 +814,7 @@ MediaResult FFmpegVideoDecoder<LIBAV_VER>::DoDecode(
+ #  ifdef MOZ_WAYLAND_USE_VAAPI
+     // Create VideoFramePool in case we need it.
+     if (!mVideoFramePool && mEnableHardwareDecoding) {
+-      mVideoFramePool = MakeUnique<VideoFramePool>();
++      mVideoFramePool = MakeUnique<VideoFramePool<LIBAV_VER>>();
+     }
+ 
+     // Release unused VA-API surfaces before avcodec_receive_frame() as
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
+index b1a2f73..c77d76f 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
+@@ -16,6 +16,9 @@
+ #if LIBAVCODEC_VERSION_MAJOR >= 57 && LIBAVUTIL_VERSION_MAJOR >= 56
+ #  include "mozilla/layers/TextureClient.h"
+ #endif
++#ifdef MOZ_WAYLAND_USE_VAAPI
++#  include "FFmpegVideoFramePool.h"
++#endif
+ 
+ struct _VADRMPRIMESurfaceDescriptor;
+ typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor;
+@@ -23,7 +26,6 @@ typedef struct _VADRMPRIMESurfaceDescriptor VADRMPRIMESurfaceDescriptor;
+ namespace mozilla {
+ 
+ class ImageBufferWrapper;
+-class VideoFramePool;
+ 
+ template <int V>
+ class FFmpegVideoDecoder : public FFmpegDataDecoder<V> {};
+@@ -138,7 +140,7 @@ class FFmpegVideoDecoder<LIBAV_VER>
+   AVBufferRef* mVAAPIDeviceContext;
+   bool mEnableHardwareDecoding;
+   VADisplay mDisplay;
+-  UniquePtr<VideoFramePool> mVideoFramePool;
++  UniquePtr<VideoFramePool<LIBAV_VER>> mVideoFramePool;
+   static nsTArray<AVCodecID> mAcceleratedFormats;
+ #endif
+   RefPtr<KnowsCompositor> mImageAllocator;
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
+index 7943e09..673b3fc 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.cpp
+@@ -5,6 +5,7 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
+ #include "FFmpegVideoFramePool.h"
++#include "PlatformDecoderModule.h"
+ #include "FFmpegLog.h"
+ #include "mozilla/widget/DMABufLibWrapper.h"
+ #include "libavutil/pixfmt.h"
+@@ -15,11 +16,11 @@
+ 
+ namespace mozilla {
+ 
+-RefPtr<layers::Image> VideoFrameSurfaceVAAPI::GetAsImage() {
++RefPtr<layers::Image> VideoFrameSurface<LIBAV_VER>::GetAsImage() {
+   return new layers::DMABUFSurfaceImage(mSurface);
+ }
+ 
+-VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface)
++VideoFrameSurface<LIBAV_VER>::VideoFrameSurface(DMABufSurface* aSurface)
+     : mSurface(aSurface),
+       mLib(nullptr),
+       mAVHWFramesContext(nullptr),
+@@ -30,22 +31,22 @@ VideoFrameSurfaceVAAPI::VideoFrameSurfaceVAAPI(DMABufSurface* aSurface)
+   MOZ_ASSERT(mSurface);
+   MOZ_RELEASE_ASSERT(mSurface->GetAsDMABufSurfaceYUV());
+   mSurface->GlobalRefCountCreate();
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: creating surface UID = %d",
++  FFMPEG_LOG("VideoFrameSurface: creating surface UID = %d",
+              mSurface->GetUID());
+ }
+ 
+-void VideoFrameSurfaceVAAPI::LockVAAPIData(AVCodecContext* aAVCodecContext,
+-                                           AVFrame* aAVFrame,
+-                                           FFmpegLibWrapper* aLib) {
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI locking dmabuf surface UID = %d",
++void VideoFrameSurface<LIBAV_VER>::LockVAAPIData(AVCodecContext* aAVCodecContext,
++                                                 AVFrame* aAVFrame,
++                                                 FFmpegLibWrapper* aLib) {
++  FFMPEG_LOG("VideoFrameSurface: VAAPI locking dmabuf surface UID = %d",
+              mSurface->GetUID());
+   mLib = aLib;
+   mAVHWFramesContext = aLib->av_buffer_ref(aAVCodecContext->hw_frames_ctx);
+   mHWAVBuffer = aLib->av_buffer_ref(aAVFrame->buf[0]);
+ }
+ 
+-void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) {
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: VAAPI releasing dmabuf surface UID = %d",
++void VideoFrameSurface<LIBAV_VER>::ReleaseVAAPIData(bool aForFrameRecycle) {
++  FFMPEG_LOG("VideoFrameSurface: VAAPI releasing dmabuf surface UID = %d",
+              mSurface->GetUID());
+ 
+   // It's possible to unref GPU data while IsUsed() is still set.
+@@ -67,43 +68,43 @@ void VideoFrameSurfaceVAAPI::ReleaseVAAPIData(bool aForFrameRecycle) {
+   }
+ }
+ 
+-VideoFrameSurfaceVAAPI::~VideoFrameSurfaceVAAPI() {
+-  FFMPEG_LOG("VideoFrameSurfaceVAAPI: deleting dmabuf surface UID = %d",
++VideoFrameSurface<LIBAV_VER>::~VideoFrameSurface() {
++  FFMPEG_LOG("VideoFrameSurface: deleting dmabuf surface UID = %d",
+              mSurface->GetUID());
+   // We're about to quit, no need to recycle the frames.
+   ReleaseVAAPIData(/* aForFrameRecycle */ false);
+ }
+ 
+-VideoFramePool::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {}
++VideoFramePool<LIBAV_VER>::VideoFramePool() : mSurfaceLock("VideoFramePoolSurfaceLock") {}
+ 
+-VideoFramePool::~VideoFramePool() {
++VideoFramePool<LIBAV_VER>::~VideoFramePool() {
+   MutexAutoLock lock(mSurfaceLock);
+   mDMABufSurfaces.Clear();
+ }
+ 
+-void VideoFramePool::ReleaseUnusedVAAPIFrames() {
++void VideoFramePool<LIBAV_VER>::ReleaseUnusedVAAPIFrames() {
+   MutexAutoLock lock(mSurfaceLock);
+   for (const auto& surface : mDMABufSurfaces) {
+-    auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI();
+-    if (!vaapiSurface->IsUsed()) {
+-      vaapiSurface->ReleaseVAAPIData();
++    if (!surface->IsUsed()) {
++      surface->ReleaseVAAPIData();
+     }
+   }
+ }
+ 
+-RefPtr<VideoFrameSurface> VideoFramePool::GetFreeVideoFrameSurface() {
++RefPtr<VideoFrameSurface<LIBAV_VER>>
++VideoFramePool<LIBAV_VER>::GetFreeVideoFrameSurface() {
+   for (auto& surface : mDMABufSurfaces) {
+     if (surface->IsUsed()) {
+       continue;
+     }
+-    auto* vaapiSurface = surface->AsVideoFrameSurfaceVAAPI();
+-    vaapiSurface->ReleaseVAAPIData();
++    surface->ReleaseVAAPIData();
+     return surface;
+   }
+   return nullptr;
+ }
+ 
+-RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
++RefPtr<VideoFrameSurface<LIBAV_VER>>
++VideoFramePool<LIBAV_VER>::GetVideoFrameSurface(
+     VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext,
+     AVFrame* aAVFrame, FFmpegLibWrapper* aLib) {
+   if (aVaDesc.fourcc != VA_FOURCC_NV12 && aVaDesc.fourcc != VA_FOURCC_YV12 &&
+@@ -113,7 +114,7 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
+   }
+ 
+   MutexAutoLock lock(mSurfaceLock);
+-  RefPtr<VideoFrameSurface> videoSurface = GetFreeVideoFrameSurface();
++  RefPtr<VideoFrameSurface<LIBAV_VER>> videoSurface = GetFreeVideoFrameSurface();
+   if (!videoSurface) {
+     RefPtr<DMABufSurfaceYUV> surface =
+         DMABufSurfaceYUV::CreateYUVSurface(aVaDesc);
+@@ -121,7 +122,7 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
+       return nullptr;
+     }
+     FFMPEG_LOG("Created new VA-API DMABufSurface UID = %d", surface->GetUID());
+-    RefPtr<VideoFrameSurfaceVAAPI> surf = new VideoFrameSurfaceVAAPI(surface);
++    RefPtr<VideoFrameSurface<LIBAV_VER>> surf = new VideoFrameSurface<LIBAV_VER>(surface);
+     if (!mTextureCreationWorks) {
+       mTextureCreationWorks = Some(surface->VerifyTextureCreation());
+     }
+@@ -138,11 +139,8 @@ RefPtr<VideoFrameSurface> VideoFramePool::GetVideoFrameSurface(
+     }
+     FFMPEG_LOG("Reusing VA-API DMABufSurface UID = %d", surface->GetUID());
+   }
+-
+-  auto* vaapiSurface = videoSurface->AsVideoFrameSurfaceVAAPI();
+-  vaapiSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
+-  vaapiSurface->MarkAsUsed();
+-
++  videoSurface->LockVAAPIData(aAVCodecContext, aAVFrame, aLib);
++  videoSurface->MarkAsUsed();
+   return videoSurface;
+ }
+ 
+diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
+index c506d22..c89b418 100644
+--- a/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
++++ b/dom/media/platforms/ffmpeg/FFmpegVideoFramePool.h
+@@ -7,8 +7,9 @@
+ #ifndef __FFmpegVideoFramePool_h__
+ #define __FFmpegVideoFramePool_h__
+ 
+-#include "FFmpegVideoDecoder.h"
+ #include "FFmpegLibWrapper.h"
++#include "FFmpegLibs.h"
++#include "FFmpegLog.h"
+ 
+ #include "mozilla/layers/DMABUFSurfaceImage.h"
+ #include "mozilla/widget/DMABufLibWrapper.h"
+@@ -16,43 +17,16 @@
+ 
+ namespace mozilla {
+ 
+-class VideoFramePool;
+-class VideoFrameSurfaceVAAPI;
+-
+-class VideoFrameSurface {
+- public:
+-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface)
+-
+-  VideoFrameSurface() = default;
+-
+-  virtual VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() { return nullptr; }
+-
+-  virtual void SetYUVColorSpace(gfx::YUVColorSpace aColorSpace) = 0;
+-  virtual void SetColorRange(gfx::ColorRange aColorRange) = 0;
+-
+-  virtual RefPtr<DMABufSurfaceYUV> GetDMABufSurface() { return nullptr; };
+-  virtual RefPtr<layers::Image> GetAsImage() = 0;
+-
+-  // Don't allow VideoFrameSurface plain copy as it leads to
+-  // unexpected DMABufSurface/HW buffer releases and we don't want to
+-  // deep copy them.
+-  VideoFrameSurface(const VideoFrameSurface&) = delete;
+-  const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete;
+-
+- protected:
+-  virtual ~VideoFrameSurface(){};
+-};
+-
+-// VideoFrameSurfaceVAAPI holds a reference to GPU data with a video frame.
++// VideoFrameSurface holds a reference to GPU data with a video frame.
+ //
+ // Actual GPU pixel data are stored at DMABufSurface and
+ // DMABufSurface is passed to gecko GL rendering pipeline via.
+ // DMABUFSurfaceImage.
+ //
+-// VideoFrameSurfaceVAAPI can optionally hold VA-API ffmpeg related data to keep
++// VideoFrameSurface can optionally hold VA-API ffmpeg related data to keep
+ // GPU data locked untill we need them.
+ //
+-// VideoFrameSurfaceVAAPI is used for both HW accelerated video decoding
++// VideoFrameSurface is used for both HW accelerated video decoding
+ // (VA-API) and ffmpeg SW decoding.
+ //
+ // VA-API scenario
+@@ -72,13 +46,24 @@ class VideoFrameSurface {
+ // Unfortunately there isn't any obvious way how to mark particular VASurface
+ // as used. The best we can do is to hold a reference to particular AVBuffer
+ // from decoded AVFrame and AVHWFramesContext which owns the AVBuffer.
+-class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+-  friend class VideoFramePool;
++template <int V>
++class VideoFrameSurface {};
++template <>
++class VideoFrameSurface<LIBAV_VER>;
++
++template <int V>
++class VideoFramePool {};
++template <>
++class VideoFramePool<LIBAV_VER>;
++
++template <>
++class VideoFrameSurface<LIBAV_VER> {
++  friend class VideoFramePool<LIBAV_VER>;
+ 
+  public:
+-  explicit VideoFrameSurfaceVAAPI(DMABufSurface* aSurface);
++  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoFrameSurface)
+ 
+-  VideoFrameSurfaceVAAPI* AsVideoFrameSurfaceVAAPI() final { return this; }
++  explicit VideoFrameSurface(DMABufSurface* aSurface);
+ 
+   void SetYUVColorSpace(mozilla::gfx::YUVColorSpace aColorSpace) {
+     mSurface->GetAsDMABufSurfaceYUV()->SetYUVColorSpace(aColorSpace);
+@@ -93,6 +78,12 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+ 
+   RefPtr<layers::Image> GetAsImage();
+ 
++  // Don't allow VideoFrameSurface plain copy as it leads to
++  // unexpected DMABufSurface/HW buffer releases and we don't want to
++  // deep copy them.
++  VideoFrameSurface(const VideoFrameSurface&) = delete;
++  const VideoFrameSurface& operator=(VideoFrameSurface const&) = delete;
++
+  protected:
+   // Lock VAAPI related data
+   void LockVAAPIData(AVCodecContext* aAVCodecContext, AVFrame* aAVFrame,
+@@ -107,7 +98,7 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+   void MarkAsUsed() { mSurface->GlobalRefAdd(); }
+ 
+  private:
+-  virtual ~VideoFrameSurfaceVAAPI();
++  virtual ~VideoFrameSurface();
+ 
+   const RefPtr<DMABufSurface> mSurface;
+   const FFmpegLibWrapper* mLib;
+@@ -116,23 +107,24 @@ class VideoFrameSurfaceVAAPI final : public VideoFrameSurface {
+ };
+ 
+ // VideoFramePool class is thread-safe.
+-class VideoFramePool final {
++template <>
++class VideoFramePool<LIBAV_VER> {
+  public:
+   VideoFramePool();
+   ~VideoFramePool();
+ 
+-  RefPtr<VideoFrameSurface> GetVideoFrameSurface(
++  RefPtr<VideoFrameSurface<LIBAV_VER>> GetVideoFrameSurface(
+       VADRMPRIMESurfaceDescriptor& aVaDesc, AVCodecContext* aAVCodecContext,
+       AVFrame* aAVFrame, FFmpegLibWrapper* aLib);
+   void ReleaseUnusedVAAPIFrames();
+ 
+  private:
+-  RefPtr<VideoFrameSurface> GetFreeVideoFrameSurface();
++  RefPtr<VideoFrameSurface<LIBAV_VER>> GetFreeVideoFrameSurface();
+ 
+  private:
+   // Protect mDMABufSurfaces pool access
+   Mutex mSurfaceLock;
+-  nsTArray<RefPtr<VideoFrameSurfaceVAAPI>> mDMABufSurfaces;
++  nsTArray<RefPtr<VideoFrameSurface<LIBAV_VER>>> mDMABufSurfaces;
+   // We may fail to create texture over DMABuf memory due to driver bugs so
+   // check that before we export first DMABuf video frame.
+   Maybe<bool> mTextureCreationWorks;
+diff --git a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
+index de2611e..8ffdaae 100644
+--- a/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
++++ b/dom/media/platforms/ffmpeg/ffmpeg58/moz.build
+@@ -30,6 +30,9 @@ if CONFIG['MOZ_WAYLAND']:
+   CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
+   DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
+   USE_LIBS += ['mozva']
++  UNIFIED_SOURCES += [
++    '../FFmpegVideoFramePool.cpp',
++  ]
+ 
+ include("/ipc/chromium/chromium-config.mozbuild")
+ 
+diff --git a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
+index 7d28420..1da28a1 100644
+--- a/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
++++ b/dom/media/platforms/ffmpeg/ffmpeg59/moz.build
+@@ -30,6 +30,9 @@ if CONFIG["MOZ_WAYLAND"]:
+     CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
+     DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1
+     USE_LIBS += ["mozva"]
++    UNIFIED_SOURCES += [
++        "../FFmpegVideoFramePool.cpp",
++    ]
+ 
+ include("/ipc/chromium/chromium-config.mozbuild")
+ 

From 0645356ce48a5235f9bb779ea7ba57293a43ca95 Mon Sep 17 00:00:00 2001
From: b-l-a-i-n-e <blaine.gilbreth@gmail.com>
Date: Wed, 5 Jan 2022 13:08:39 -0800
Subject: [PATCH 1162/1686] ruby-build: update to 20211227.

---
 srcpkgs/ruby-build/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby-build/template b/srcpkgs/ruby-build/template
index 8ba698addb76..778d5e716505 100644
--- a/srcpkgs/ruby-build/template
+++ b/srcpkgs/ruby-build/template
@@ -1,6 +1,6 @@
 # Template file for 'ruby-build'
 pkgname=ruby-build
-version=20211203
+version=20211227
 revision=1
 depends="bash"
 short_desc="Compile and install Ruby"
@@ -8,7 +8,7 @@ maintainer="b-l-a-i-n-e <blaine.gilbreth@gmail.com>"
 license="MIT"
 homepage="https://github.com/rbenv/ruby-build"
 distfiles="https://github.com/rbenv/ruby-build/archive/refs/tags/v${version}.tar.gz"
-checksum=f6a9149b24c7452a512395bc43d9837171de5f43ef0cf191a4a24b013f6a2eed
+checksum=7a07eae6d6948f79a8ffecd7a493fb887e10326c429fe55cfe1bda65146db824
 
 do_install() {
 	vbin bin/ruby-build

From ec987378382c0eaed6abaff4ec6b510a53afdb3f Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 10 Apr 2022 01:26:47 -0400
Subject: [PATCH 1163/1686] neomutt: update to 20220408.

---
 srcpkgs/neomutt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 3e9e433395f9..3e703630df81 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20211029
+version=20220408
 revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
@@ -19,11 +19,11 @@ short_desc="Mutt with misc fixes and feature patches"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://neomutt.org/"
-_test_files_hash=8e4fc46e731da0863c04b005885f92aa925b6367
+_test_files_hash=dc9fb32a701eb9dce4fda93c27da1d9b5be23231
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="08245cfa7aec80b895771fd1adcbb7b86e9c0434dfa64574e3c8c4d692aaa078
- 818ff9642ac396e18854486078320ce03a58c8aa8f7d6af44d1b0b5de822ccc3"
+checksum="bb138adb09b1f164fe690749e991a5505bf4f50b6ad478ffb085c609d5617cc7
+ bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947"
 python_version=3
 
 # fix:

From 1945c59126245041615c77e9ae8be16739ae3a8d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 2 Apr 2022 18:51:49 -0700
Subject: [PATCH 1164/1686] upower: update to 0.99.17

---
 .../upower/patches/fix-gtk-doc-disable.patch  | 58 +++++++++++++++++++
 srcpkgs/upower/template                       | 38 ++++++------
 2 files changed, 77 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/upower/patches/fix-gtk-doc-disable.patch

diff --git a/srcpkgs/upower/patches/fix-gtk-doc-disable.patch b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
new file mode 100644
index 000000000000..5005d91e197e
--- /dev/null
+++ b/srcpkgs/upower/patches/fix-gtk-doc-disable.patch
@@ -0,0 +1,58 @@
+From 1003d5c2a69e6c28dcf68adf10181b5180b5defa Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sun, 20 Mar 2022 15:32:55 -0700
+Subject: [PATCH] meson: Don't search for gtk-doc if disabled
+
+---
+ doc/meson.build | 38 ++++++++++++++++++++------------------
+ 1 file changed, 20 insertions(+), 18 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index dc93a16..5fc253c 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -27,21 +27,23 @@ version_xml = configure_file(
+     input: 'version.xml.in',
+     configuration: cdata)
+ 
+-gnome.gtkdoc('UPower',
+-    main_xml: 'upower-docs.xml',
+-    src_dir: meson.source_root() / 'libupower-glib',
+-    dependencies: [ libupower_glib_dep ],
+-    scan_args: ['--rebuild-types', '--rebuild-sections'],
+-    content_files: [
+-        version_xml,
+-        ifaces_refs,
+-        'man/UPower.xml',
+-        'man/upowerd.xml',
+-        'man/upower.xml',
+-        '../COPYING',
+-    ],
+-    ignore_headers: [
+-        'config.h',
+-    ],
+-    install: get_option('gtk-doc')
+-)
++if get_option('gtk-doc')
++  gnome.gtkdoc('UPower',
++      main_xml: 'upower-docs.xml',
++      src_dir: meson.source_root() / 'libupower-glib',
++      dependencies: [ libupower_glib_dep ],
++      scan_args: ['--rebuild-types', '--rebuild-sections'],
++      content_files: [
++          version_xml,
++          ifaces_refs,
++          'man/UPower.xml',
++          'man/upowerd.xml',
++          'man/upower.xml',
++          '../COPYING',
++      ],
++      ignore_headers: [
++          'config.h',
++      ],
++      install: true
++  )
++endif
+-- 
+GitLab
+
diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template
index b87ec0d5f9e0..654c901f129e 100644
--- a/srcpkgs/upower/template
+++ b/srcpkgs/upower/template
@@ -1,39 +1,36 @@
 # Template file for 'upower'
 pkgname=upower
-version=0.99.13
+version=0.99.17
 revision=1
-_distver="${version//./_}"
-wrksrc="upower-UPOWER_${_distver}"
-build_style=gnu-configure
+wrksrc="upower-v${version}"
 build_helper="gir"
-configure_args="--disable-static --with-backend=linux $(vopt_enable gir introspection)"
+build_style=meson
+configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no
+ -Dintrospection=$(vopt_if gir enabled disabled) $(vopt_bool gtk_doc gtk-doc)"
 conf_files="/etc/UPower/UPower.conf"
-hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc
- intltool libtool libxslt pkg-config which"
+hostmakedepends="gettext glib-devel gobject-introspection
+ $(vopt_if gtk_doc gtk-doc) docbook-xsl libxslt pkg-config which"
 makedepends="libusb-devel libgudev-devel dbus-glib-devel
  libimobiledevice-devel polkit-devel"
 checkdepends="python3-dbus python3-packaging"
 short_desc="Abstraction for enumerating power devices"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://upower.freedesktop.org"
-distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/UPOWER_${_distver}/upower-UPOWER_${_distver}.tar.bz2"
-checksum=3393944ce8124a888923d580d2867e6257e0209f7534cc3df2448ecae47d9f8d
+homepage="https://gitlab.freedesktop.org/upower/upower"
+changelog="https://gitlab.freedesktop.org/upower/upower/-/raw/master/NEWS"
+distfiles="https://gitlab.freedesktop.org/upower/upower/-/archive/v${version}/upower-v${version}.tar.bz2"
+checksum=de7177deb2ee23d9c505046c74a856564acab8fd1d39aa1541d123af5a99ca8d
 
 provides="upower0-${version}_${revision}"
 replaces="upower0>=0"
 
 # Package build options
-build_options="gir"
+build_options="gir gtk_doc"
 build_options_default="gir"
 
-post_patch() {
-	vsed -i configure.ac -e '/PKG_CHECK_MODULES/s/libplist\b/libplist-2.0/'
-}
-
-pre_configure() {
-	NOCONFIGURE=1 ./autogen.sh
-}
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" gtk_doc"
+fi
 
 libupower-glib3_package() {
 	short_desc+=" - runtime library"
@@ -49,9 +46,12 @@ upower-devel_package() {
 	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/lib/*.so"
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/gtk-doc
+		fi
 	}
 }

From 7ed60c8ef7039a6bd0ae5fdcd5746eda71a83e9c Mon Sep 17 00:00:00 2001
From: Toby Merz <realtiaz@gmail.com>
Date: Fri, 1 Apr 2022 11:00:05 +0200
Subject: [PATCH 1165/1686] vscode: update to 1.66.0.

---
 srcpkgs/vscode/patches/product.patch | 12 +++---------
 srcpkgs/vscode/patches/ripgrep.patch | 14 +++++++-------
 srcpkgs/vscode/template              | 10 +++++++---
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch
index a7e2b79925bf..624ca63afcbe 100644
--- a/srcpkgs/vscode/patches/product.patch
+++ b/srcpkgs/vscode/patches/product.patch
@@ -1,21 +1,15 @@
 diff --git a/product.json b/product.json
-index 9d630f23cd7..eea95dce319 100644
+index df18127dcc67..d3006752bd98 100644
 --- a/product.json
 +++ b/product.json
-@@ -27,6 +27,9 @@
+@@ -27,7 +27,15 @@
  	"licenseFileName": "LICENSE.txt",
  	"reportIssueUrl": "https://github.com/microsoft/vscode/issues/new",
  	"urlProtocol": "code-oss",
 +	"quality": "stable",
 +	"documentationUrl": "https://github.com/microsoft/vscode-docs",
 +	"requestFeatureUrl": "https://github.com/Microsoft/vscode/issues",
- 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/",
- 	"extensionAllowedProposedApi": [
- 		"ms-vscode.vscode-js-profile-flame",
-@@ -34,6 +37,11 @@
- 		"GitHub.remotehub",
- 		"GitHub.remotehub-insiders"
- 	],
+ 	"webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/181b43c0e2949e36ecb623d8cc6de29d4fa2bae8/out/vs/workbench/contrib/webview/browser/pre/",
 +	"extensionsGallery": {
 +		"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
 +		"cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch
index ff0dfc233e41..3fdc568a9e54 100644
--- a/srcpkgs/vscode/patches/ripgrep.patch
+++ b/srcpkgs/vscode/patches/ripgrep.patch
@@ -5,27 +5,27 @@ during build, which unbreaks build on platforms where MS deos not
 ship a prebuilt ripgrep.
 
 diff --git a/package.json b/package.json
-index 5d6022a2a40..f66ee44eef0 100644
+index de2cf9e04a9b..1995e3bb9a7e 100644
 --- a/package.json
 +++ b/package.json
-@@ -63,7 +63,7 @@
+@@ -62,7 +62,7 @@
+     "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
-     "@vscode/debugprotocol": "1.51.0",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
-     "@vscode/sqlite3": "4.0.12",
+     "@vscode/sqlite3": "5.0.7",
      "@vscode/sudo-prompt": "9.3.1",
      "@vscode/vscode-languagedetection": "1.0.21",
 diff --git a/remote/package.json b/remote/package.json
-index 4bc40998093..9d22d408c02 100644
+index c7fc7a2e931f..8842b784df2c 100644
 --- a/remote/package.json
 +++ b/remote/package.json
 @@ -6,7 +6,7 @@
      "@microsoft/applicationinsights-web": "^2.6.4",
      "@parcel/watcher": "2.0.5",
      "@vscode/iconv-lite-umd": "0.7.0",
--    "@vscode/ripgrep": "^1.14.1",
+-    "@vscode/ripgrep": "^1.14.2",
 +    "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git",
      "@vscode/vscode-languagedetection": "1.0.21",
      "applicationinsights": "1.4.2",
diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 620c9a6928aa..0b9efda224d0 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,8 +1,9 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.65.2
+version=1.66.0
 revision=1
 _electronver=13.6.7
+_npmver=8.6.0
 hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep"
 makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13"
 depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13"
@@ -11,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e
+checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -46,7 +47,10 @@ do_build() {
 	/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp install \
 	--target=$_electronver \
 	--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
-	yarn install --ignore-engines --arch=x64
+
+	npm install -g npm@${_npmver} && \
+		yarn install --ignore-engines --arch=x64
+
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min
 }

From c1be3d7768ebc5cc991f7c7c3ec539941f147873 Mon Sep 17 00:00:00 2001
From: octeep <octeep@pm.me>
Date: Fri, 1 Apr 2022 17:55:08 +0100
Subject: [PATCH 1166/1686] New package: wireproxy-1.0.1

---
 srcpkgs/wireproxy/files/wireproxy/run |  7 +++++++
 srcpkgs/wireproxy/template            | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 srcpkgs/wireproxy/files/wireproxy/run
 create mode 100644 srcpkgs/wireproxy/template

diff --git a/srcpkgs/wireproxy/files/wireproxy/run b/srcpkgs/wireproxy/files/wireproxy/run
new file mode 100644
index 000000000000..7ba16434072e
--- /dev/null
+++ b/srcpkgs/wireproxy/files/wireproxy/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+[ -r ./conf ] && . ./conf
+
+export HOME=/var/lib/wireproxy
+
+exec chpst -u _wireproxy wireproxy --config ${CONFFILE:-/etc/wireproxy/config}
diff --git a/srcpkgs/wireproxy/template b/srcpkgs/wireproxy/template
new file mode 100644
index 000000000000..984027a4f69e
--- /dev/null
+++ b/srcpkgs/wireproxy/template
@@ -0,0 +1,24 @@
+# Template file for 'wireproxy'
+pkgname=wireproxy
+version=1.0.1
+revision=1
+build_style=go
+go_import_path="github.com/octeep/wireproxy"
+go_package="${go_import_path}/cmd/wireproxy"
+short_desc="Wireguard client that exposes itself as a socks5 proxy"
+maintainer="Wind Wong <octeep@pm.me>"
+license="ISC"
+homepage="https://github.com/octeep/wireproxy"
+distfiles="https://github.com/octeep/wireproxy/archive/v${version}.tar.gz"
+checksum=e21eac22ef1b12dc2d7b3e5b58dcff183af9c1547be3e55a7e6c71394f053e1e
+make_dirs="
+ /etc/wireproxy 0750 root _wireproxy
+ /var/lib/wireproxy 0700 _wireproxy _wireproxy"
+
+system_accounts="_wireproxy"
+_wireproxy_homedir="/var/lib/wireproxy"
+
+post_install() {
+	vsv wireproxy
+	vlicense LICENSE
+}

From 1a52dd83016ed92d6f925b90a5862d0d158a0c38 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Mar 2022 00:38:27 +0200
Subject: [PATCH 1167/1686] patch_args: allow use of --directory parameter

patch(1) has a -d/--directory parameter which allows us to specify a directory
where the patch will be applied. This is especially useful when we have
multiple distfiles and want to patch in $build_wrksrc because that's where the
patch is usually applied.

Problem is, that the -i parameter is also relative to the the -d parameter and
thus fails to find the patch, when -d is set. We solve that by using standard
input instead of -i.
---
 common/hooks/do-patch/00-patches.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hooks/do-patch/00-patches.sh b/common/hooks/do-patch/00-patches.sh
index 9f7e21f017dc..64659dc30280 100644
--- a/common/hooks/do-patch/00-patches.sh
+++ b/common/hooks/do-patch/00-patches.sh
@@ -31,7 +31,7 @@ _process_patch() {
 
 	cd "$wrksrc"
 	msg_normal "$pkgver: patching: ${_patch}.\n"
-	patch -s ${_args} -i ${_patch} 2>/dev/null
+	patch -s ${_args} <${_patch} 2>/dev/null
 }
 
 hook() {

From 4c8c6b32766d891e81c4fdc63ff1821ca94db12b Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Mar 2022 00:57:00 +0200
Subject: [PATCH 1168/1686] wine: patch into $build_wrksrc

---
 srcpkgs/wine/patches/musl-limits.patch | 4 ++--
 srcpkgs/wine/patches/musl-rpath.patch  | 9 +++++++--
 srcpkgs/wine/patches/musl-uid-t.patch  | 4 ++--
 srcpkgs/wine/template                  | 3 +++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch
index 7546d45c7609..6a46158221b4 100644
--- a/srcpkgs/wine/patches/musl-limits.patch
+++ b/srcpkgs/wine/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- a/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
-+++ b/wine-7.6/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
+--- a/dlls/winebus.sys/bus_udev.c	2021-10-23 15:38:33.225064731 +0200
++++ b/dlls/winebus.sys/bus_udev.c	2021-10-23 15:39:06.662064765 +0200
 @@ -29,7 +29,8 @@
  #include <stdlib.h>
  #include <stdio.h>
diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch
index e0b6f8626637..f522f7ecea2d 100644
--- a/srcpkgs/wine/patches/musl-rpath.patch
+++ b/srcpkgs/wine/patches/musl-rpath.patch
@@ -1,7 +1,7 @@
 diff --git a/configure b/configure
 index 774a95ce003..d408e77cc78 100755
---- a/wine-7.6/configure
-+++ b/wine-7.6/configure
+--- a/configure
++++ b/configure
 @@ -11137,6 +11137,38 @@ fi
      LIBWINE_DEPENDS="wine.map"
  
@@ -43,8 +43,13 @@ index 774a95ce003..d408e77cc78 100755
  
 diff --git a/configure.ac b/configure.ac
 index 8c5066a3de6..01ede86df1e 100644
+<<<<<<< HEAD
 --- a/wine-7.6/configure.ac
 +++ b/wine-7.6/configure.ac
+=======
+--- a/configure.ac
++++ b/configure.ac
+>>>>>>> 6dccb4ef9c (wine: patch into $build_wrksrc)
 @@ -916,6 +916,9 @@ case $host_os in
      AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version")
      AC_SUBST(LIBWINE_DEPENDS,"wine.map")
diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch
index a95011e3cca0..ac8dfca3bb2f 100644
--- a/srcpkgs/wine/patches/musl-uid-t.patch
+++ b/srcpkgs/wine/patches/musl-uid-t.patch
@@ -1,5 +1,5 @@
---- a/wine-7.6/server/security.h	2022-01-29 08:23:43.759508270 +0100
-+++ b/wine-7.6/server/security.h	2022-01-29 08:24:07.976443565 +0100
+--- a/server/security.h	2022-01-29 08:23:43.759508270 +0100
++++ b/server/security.h	2022-01-29 08:24:07.976443565 +0100
 @@ -22,6 +22,7 @@
  #define __WINE_SERVER_SECURITY_H
  
diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 86d0acf0883b..beb10898af92 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -25,6 +25,8 @@ desc_option_xshm="Enable support for the X Shared Memory Extension"
 lib32mode=full
 archs="i686* x86_64*"
 
+patch_args="-Np1 --directory=${build_wrksrc}"
+
 _nopie=no
 if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then
 	# build system adds -fno-PIC for 32bit builds, which,
@@ -48,6 +50,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel
 depends="libXi libXinerama libXcomposite libXcursor libOSMesa
  desktop-file-utils hicolor-icon-theme liberation-fonts-ttf
  gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}"
+# This testsuite might hang indefinitely
 make_check=extended
 
 case $XBPS_TARGET_MACHINE in

From 8b15d675bc5512f6086e5c67b0b516713c4d3db7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 9 Apr 2022 13:38:04 +0200
Subject: [PATCH 1169/1686] chatterino2: patch into $build_wrksrc

---
 .../patches/0001-fix-desktop-icon-name.patch         |  4 ++--
 srcpkgs/chatterino2/patches/cmake.patch              | 12 ++++++------
 srcpkgs/chatterino2/template                         |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
index 9f41d03190b7..1b0a6d6140e4 100644
--- a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
+++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch
@@ -1,7 +1,7 @@
 diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop
 index 6ee45354..ece81f5c 100644
---- a/chatterino2/resources/com.chatterino.chatterino.desktop
-+++ b/chatterino2/resources/com.chatterino.chatterino.desktop
+--- a/resources/com.chatterino.chatterino.desktop
++++ b/resources/com.chatterino.chatterino.desktop
 @@ -4,7 +4,7 @@ Version=1.0
  Name=Chatterino
  Comment=Chat client for Twitch
diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch
index a59d0a4eb9f0..8a5643566957 100644
--- a/srcpkgs/chatterino2/patches/cmake.patch
+++ b/srcpkgs/chatterino2/patches/cmake.patch
@@ -1,7 +1,7 @@
 diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake
 index 82905436..b0b89a4e 100644
---- a/chatterino2/cmake/FindLRUCache.cmake
-+++ b/chatterino2/cmake/FindLRUCache.cmake
+--- a/cmake/FindLRUCache.cmake
++++ b/cmake/FindLRUCache.cmake
 @@ -1,6 +1,6 @@
  include(FindPackageHandleStandardArgs)
  
@@ -12,8 +12,8 @@ index 82905436..b0b89a4e 100644
  
 diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake
 index 4671874c..119284c2 100644
---- a/chatterino2/cmake/FindPajladaSerialize.cmake
-+++ b/chatterino2/cmake/FindPajladaSerialize.cmake
+--- a/cmake/FindPajladaSerialize.cmake
++++ b/cmake/FindPajladaSerialize.cmake
 @@ -1,6 +1,6 @@
  include(FindPackageHandleStandardArgs)
  
@@ -24,8 +24,8 @@ index 4671874c..119284c2 100644
  
 diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake
 index f4c964ec..75efba20 100644
---- a/chatterino2/cmake/FindPajladaSignals.cmake
-+++ b/chatterino2/cmake/FindPajladaSignals.cmake
+--- a/cmake/FindPajladaSignals.cmake
++++ b/cmake/FindPajladaSignals.cmake
 @@ -1,6 +1,6 @@
  include(FindPackageHandleStandardArgs)
  
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index e1f99ac9e9fc..7bf7d6a37d04 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -9,7 +9,7 @@ _signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
 _qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
 _sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
 create_wrksrc=yes
-build_wrksrc="chatterino2"
+build_wrksrc="chatterino2-${version}"
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
@@ -40,8 +40,9 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	LIBS="-latomic"
 fi
 
+patch_args="-Np1 --directory=${build_wrksrc}"
+
 post_extract() {
-	mv "chatterino2-${version}" "${build_wrksrc}"
 	rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \
 	      ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \
 	      ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \

From f8621b9e658f888c0f7bbe2285bb93d7d1bd7275 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 16 Mar 2022 15:29:25 +0200
Subject: [PATCH 1170/1686] goodvibes: update to 0.7.3.

---
 srcpkgs/goodvibes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/goodvibes/template b/srcpkgs/goodvibes/template
index 1a73cd225234..97c1ae97171f 100644
--- a/srcpkgs/goodvibes/template
+++ b/srcpkgs/goodvibes/template
@@ -1,6 +1,6 @@
 # Template file for 'goodvibes'
 pkgname=goodvibes
-version=0.7.2
+version=0.7.4
 revision=1
 wrksrc="goodvibes-v${version}"
 build_style=meson
@@ -14,7 +14,7 @@ license="GPL-3.0-only"
 homepage="https://gitlab.com/goodvibes/goodvibes"
 changelog="https://gitlab.com/goodvibes/goodvibes/-/raw/master/NEWS"
 distfiles="https://gitlab.com/goodvibes/goodvibes/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
-checksum=5f96ba7b8654f331181c8ee0e697d042a195406712a547e7954159e5d66795ba
+checksum=9940c56cb18064f966c2f881fbc7876004eba06f1ea249e01c652477853017cf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"

From 9f7eb6665a441ce30a01b2704b91cdc5c3c0909d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 19 Mar 2022 02:50:03 +0100
Subject: [PATCH 1171/1686] screenkey: update to 1.5.

---
 srcpkgs/screenkey/template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/screenkey/template b/srcpkgs/screenkey/template
index 4541a207058c..f199b36bc9ef 100644
--- a/srcpkgs/screenkey/template
+++ b/srcpkgs/screenkey/template
@@ -1,15 +1,15 @@
 # Template file for 'screenkey'
 pkgname=screenkey
-version=1.4
-revision=2
+version=1.5
+revision=1
 build_style=python3-module
-hostmakedepends="intltool python3-setuptools python3-distutils-extra
- python3-Babel"
-depends="gtk+3 libX11 python3-gobject"
-checkdepends="${depends} libXtst"
+hostmakedepends="python3-setuptools python3-Babel"
+depends="gtk+3 libX11 python3-gobject python3-cairo python3-dbus"
+checkdepends="$depends"
 short_desc="Screencast tool to display your keys"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-3.0-or-later"
-homepage="http://www.thregr.org/~wavexx/software/screenkey"
+homepage="https://www.thregr.org/~wavexx/software/screenkey"
+changelog="https://www.thregr.org/~wavexx/software/screenkey/NEWS.html"
 distfiles="${homepage}/releases/screenkey-${version}.tar.gz"
-checksum=d7347e31fab4a5b18da431e3fc26f39700e99a505eb0c0168295adc12c8dd4f7
+checksum=cc8471b83f7ba7a754e1da0631cfa9c32b9217da93597afc1c3283e3a1ae4112

From 1f11e2ecfb87a382ae5c30fdd312622a7c8a87bc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 27 Mar 2022 22:35:11 +0200
Subject: [PATCH 1172/1686] New package: orage-4.16.0

---
 srcpkgs/orage/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/orage/template

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
new file mode 100644
index 000000000000..0cfc8994c78c
--- /dev/null
+++ b/srcpkgs/orage/template
@@ -0,0 +1,17 @@
+# Template file for 'orage'
+pkgname=orage
+version=4.16.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool flex glib-devel dbus-glib-devel"
+makedepends="libical-devel libnotify-devel gtk+3-devel popt-devel
+ libxfce4util-devel libxfce4ui-devel xfce4-panel-devel"
+depends="hicolor-icon-theme desktop-file-utils"
+short_desc="Simple calendar application for Xfce"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://docs.xfce.org/apps/orage/start"
+changelog="https://gitlab.xfce.org/apps/orage/-/raw/master/NEWS"
+distfiles="https://archive.xfce.org/src/apps/orage/${version%.*}/orage-$version.tar.bz2"
+checksum=26111a3b6a2007c82f1e0a1e0591b774a0b132f3a7f1cde53d9be661b2f11700

From ad0bbdea9da8f494555a8b020227edf7987c2bb1 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Fri, 8 Apr 2022 10:47:59 +0700
Subject: [PATCH 1173/1686] upterm: update to 0.8.2

---
 srcpkgs/upterm/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/upterm/template b/srcpkgs/upterm/template
index 362f919c40ef..fd99190dedb9 100644
--- a/srcpkgs/upterm/template
+++ b/srcpkgs/upterm/template
@@ -1,6 +1,6 @@
 # Template file for 'upterm'
 pkgname=upterm
-version=0.7.6
+version=0.8.2
 revision=1
 build_style=go
 go_import_path="github.com/owenthereal/upterm"
@@ -10,7 +10,7 @@ maintainer="Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>"
 license="Apache-2.0"
 homepage="https://github.com/owenthereal/upterm/"
 distfiles="https://github.com/owenthereal/upterm/archive/refs/tags/v$version.tar.gz"
-checksum=26ceb5eee035d4e1a08240aced75a20f2e54b1e192eef0bf5eb51d0195997f8c
+checksum=4b85cf8207ffce051f2c391905fd58514c98c3fd5ff890d7340fcfd3a0ea7b8e
 
 post_install() {
 	vcompletion etc/completion/upterm.zsh_completion zsh

From b8e1ed4fd17015eb3cd016a6f151a155ac970926 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 7 Apr 2022 18:42:16 -0400
Subject: [PATCH 1174/1686] dendrite: update to 0.8.1.

---
 srcpkgs/dendrite/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dendrite/template b/srcpkgs/dendrite/template
index 1bef12b95642..fffd933f62c1 100644
--- a/srcpkgs/dendrite/template
+++ b/srcpkgs/dendrite/template
@@ -1,6 +1,6 @@
 # Template file for 'dendrite'
 pkgname=dendrite
-version=0.7.0
+version=0.8.1
 revision=1
 build_style=go
 go_import_path="github.com/matrix-org/dendrite"
@@ -12,7 +12,7 @@ license="Apache-2.0"
 homepage="https://matrix.org/docs/projects/server/dendrite"
 changelog="https://raw.githubusercontent.com/matrix-org/dendrite/main/CHANGES.md"
 distfiles="https://github.com/matrix-org/dendrite/archive/v${version}.tar.gz"
-checksum=26c378bff1738b0e8422c7bd425be4763f22225f422ae1854c78644e4ca8bc42
+checksum=e26d306b008c9a88da31449e51df4c97e991d99b7954ab130f4fcf00371aa503
 
 system_accounts="_dendrite"
 _dendrite_homedir="/var/lib/dendrite"

From 930ffa322a2b2a6cc4925ad16d0723b914077236 Mon Sep 17 00:00:00 2001
From: anelki <anelki@fastmail.de>
Date: Thu, 7 Apr 2022 16:43:47 -0500
Subject: [PATCH 1175/1686] Signal-Desktop: update to 5.38.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index a0b15428b926..05be4f346a92 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.37.0
+version=5.38.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=bd674ea6ba0582862f26a8fed1557d21f68161ef05891e67ca4cb653bf0f8d1a
+checksum=da693cf3fd7535f8569bbdc6f64387e274daab49c2798cacc804c784e401115d
 nostrip_files="signal-desktop"
 
 post_extract() {

From 7ae6d1f50fe2108f437d632f389ff6c4070ba7c0 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 6 Apr 2022 22:31:09 -0400
Subject: [PATCH 1176/1686] just: update to 1.1.2.

---
 srcpkgs/just/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/just/template b/srcpkgs/just/template
index 7dc9fe4fbeb7..f3857ec4f01f 100644
--- a/srcpkgs/just/template
+++ b/srcpkgs/just/template
@@ -1,6 +1,6 @@
 # Template file for 'just'
 pkgname=just
-version=1.1.1
+version=1.1.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/refs/tags/${version}.tar.gz"
-checksum=b985def8260965773422fc6c665fa37aeb7304280560dbf8f641479ba00e2da0
+checksum=5f04ce85dc2de7609d68c336a7c51f477f8ff079d8b209a0d72183615e3f1e55
 make_check=ci-skip  # test fails when run as root
 
 # Fix failing test

From 2e39b91734a96a55962ae0e025fa632059161db8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 4 Apr 2022 12:40:05 +0200
Subject: [PATCH 1177/1686] qjackctl: update to 0.9.7.

---
 srcpkgs/qjackctl/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template
index 4e746124bdd0..8fb8a4ad5350 100644
--- a/srcpkgs/qjackctl/template
+++ b/srcpkgs/qjackctl/template
@@ -1,6 +1,6 @@
 # Template file for 'qjackctl'
 pkgname=qjackctl
-version=0.9.6
+version=0.9.7
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool jack_session CONFIG_JACK_SESSION)"
@@ -11,8 +11,9 @@ short_desc="JACK Audio Connection Kit - Qt GUI Interface"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="https://qjackctl.sourceforge.io"
+changelog="https://qjackctl.sourceforge.io/qjackctl-downloads.html"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=39ca2b9d83acfdd16a4c9b3eccd80e1483e1f9a446626f5d00ac297e6f8a166b
+checksum=524843618152070c90a40a18d0e9a16e784424ce54231aff5c0ced12f2769080
 
 build_options="jack_session"
 build_options_default="jack_session"

From dd5839408b8b6c656a15a385577ddc62ba8d0cd8 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 2 Apr 2022 21:39:14 +0530
Subject: [PATCH 1178/1686] CPU-X: update to 4.3.0, adopt

---
 .../CPU-X/patches/musl-ctrl-not-defined.patch | 15 --------
 srcpkgs/CPU-X/template                        | 36 ++++++++++---------
 2 files changed, 19 insertions(+), 32 deletions(-)
 delete mode 100644 srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch

diff --git a/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch b/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch
deleted file mode 100644
index 77b7abec77bc..000000000000
--- a/srcpkgs/CPU-X/patches/musl-ctrl-not-defined.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/tui_ncurses.c	2021-10-07 14:38:03.886862860 -0400
-+++ b/src/tui_ncurses.c	2021-10-07 14:49:43.258142532 -0400
-@@ -262,6 +262,12 @@
- /* Convert keys when an alternative mapping is used */
- #define ALT_CODE 27
- #define ALT(x)   (x & ALT_CODE)
-+
-+/* glibc's term.h pulls in sys/ttydefaults.h which has it, but musl's does not. */
-+#ifndef CTRL
-+#define CTRL(x)	(x&037)
-+#endif
-+
- static int convert_char(int ch)
- {
- 	int i = 0;
diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template
index 19a01be5978c..36246fc521f9 100644
--- a/srcpkgs/CPU-X/template
+++ b/srcpkgs/CPU-X/template
@@ -1,30 +1,32 @@
 # Template file for 'CPU-X'
 pkgname=CPU-X
-version=4.2.0
+version=4.3.0
 revision=1
 archs="x86_64* i686*"
 build_style=cmake
-hostmakedepends="nasm pkg-config gettext"
-makedepends="libcpuid-devel ncurses-devel pciutils-devel
- procps-ng-devel glfw-devel $(vopt_if gtk3 'gtk+3-devel')"
+hostmakedepends="pkg-config nasm"
+makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel
+ glfw-devel ocl-icd-devel procps-ng-devel libstatgrab
+ $(vopt_if gtk3 gtk+3-devel)"
+checkdepends="mawk nawk grep"
 short_desc="Free software that gathers information on CPU, motherboard and more"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://x0rg.github.io/CPU-X/"
 changelog="https://raw.githubusercontent.com/X0rg/CPU-X/master/ChangeLog.md"
 distfiles="https://github.com/X0rg/CPU-X/archive/v${version}.tar.gz"
-checksum=3bd8aabe98273012adc6fa25f31cf0f631f0a34c2ec39392fb5f6885551cee1f
-# tests depend on:
-# having mawk and nawk installed which breaks chroot-gawk
-# grep -P, which `chroot-grep` is compiled without
-make_check=no
-
+checksum=6ad7a8ac2d6c687a38a895fbbfbf2de690311676ac374d5857588bb983839433
 build_options="gtk3"
 build_options_default="gtk3"
 
-case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		makedepends+=" libexecinfo-devel"
-		LDFLAGS="-lexecinfo"
-	;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" libexecinfo-devel"
+	LDFLAGS="-lexecinfo"
+fi
+
+# Tests depend on the -P flag of grep, which is not available in chroot-grep
+# and installing grep as checkdepends breaks base-chroot.
+# So, only run tests in CI, where the masterdir is ephemeral anyway.
+if [ "$XBPS_BUILD_ENVIRONMENT" != "void-packages-ci" ]; then
+	make_check=no	# breaks base-chroot
+fi

From f7f966609d6626319b37211031212d5dd6134a2c Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 25 Mar 2022 10:31:24 +0100
Subject: [PATCH 1179/1686] fluidsynth: update to 2.2.6.

---
 srcpkgs/fluidsynth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template
index 146a550f658c..3f65b393d92b 100644
--- a/srcpkgs/fluidsynth/template
+++ b/srcpkgs/fluidsynth/template
@@ -1,6 +1,6 @@
 # Template file for 'fluidsynth'
 pkgname=fluidsynth
-version=2.2.5
+version=2.2.6
 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=9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8
+checksum=ca90fe675cacd9a7b442662783c4e7fa0e1fd638b28d64105a4e3fe0f618d20f
 
 libfluidsynth_package() {
 	short_desc+=" - runtime library"

From f5080a42775fc81920aa97264b18e84b69e132ce Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Sat, 2 Apr 2022 19:23:11 +0200
Subject: [PATCH 1180/1686] gotop: update to 4.1.3.

---
 srcpkgs/gotop/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gotop/template b/srcpkgs/gotop/template
index 035f5749e4da..c8c7a842b4bb 100644
--- a/srcpkgs/gotop/template
+++ b/srcpkgs/gotop/template
@@ -1,19 +1,21 @@
 # Template file for 'gotop'
 pkgname=gotop
-version=4.1.2
+version=4.1.3
 revision=1
 build_style=go
+build_helper=qemu
 go_ldflags="-X main.Version=v${version}"
 go_import_path="github.com/xxxserxxx/gotop/v4"
 go_package="$go_import_path/cmd/gotop"
-hostmakedepends="git"
 short_desc="Terminal based graphical activity monitor"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://github.com/xxxserxxx/gotop"
 distfiles="https://github.com/xxxserxxx/gotop/archive/v${version}.tar.gz"
-checksum=81518fecfdab4f4c25a4713e24d9c033ba8311bbd3e2c0435ba76349028356da
+checksum=c0a02276e718b988d1220dc452063759c8634d42e1c01a04c021486c1e61612d
 
 post_install() {
 	vlicense LICENSE
+	vtargetrun ${DESTDIR}/usr/bin/gotop --create-manpage > gotop.1
+	vman gotop.1
 }

From 5b61fdb60def5431ab8171c345c2d7413550352c Mon Sep 17 00:00:00 2001
From: Gerardo Di iorio <arete74@gmail.com>
Date: Thu, 31 Mar 2022 21:17:01 +0200
Subject: [PATCH 1181/1686] pgweb: update to 0.11.11.

---
 srcpkgs/pgweb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pgweb/template b/srcpkgs/pgweb/template
index 9144e3d93eb2..2e511d41844a 100644
--- a/srcpkgs/pgweb/template
+++ b/srcpkgs/pgweb/template
@@ -1,6 +1,6 @@
 # Template file for 'pgweb'
 pkgname=pgweb
-version=0.11.10
+version=0.11.11
 revision=1
 build_style=go
 go_import_path="github.com/sosedoff/pgweb"
@@ -9,7 +9,7 @@ maintainer="Gerardo Di Iorio <arete74@gmail.com>"
 license="MIT"
 homepage="https://sosedoff.github.io/pgweb"
 distfiles="https://github.com/sosedoff/pgweb/archive/v${version}.tar.gz"
-checksum=df2d16daa6f8fa9735b713199691ef74136f19fbbee14778248e41e247a1b93b
+checksum=4d8c64db7ec463a9366d404cbaf12215db855a5bdbf09253494d79dedd92db98
 
 post_install() {
 	vdoc README.md

From b58734b37ce223ed885e05585105f6e3fdc77cfc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 27 Mar 2022 20:44:36 +0200
Subject: [PATCH 1182/1686] x42-plugins: update to 20220327.

---
 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 8df0ec803309..328c03b09dec 100644
--- a/srcpkgs/x42-plugins/template
+++ b/srcpkgs/x42-plugins/template
@@ -1,6 +1,6 @@
 # Template file for 'x42-plugins'
 pkgname=x42-plugins
-version=20220107
+version=20220327
 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/x42-plugins/x42-plugins-${version}.tar.xz"
-checksum=fa5ce09114077ba9a889dde1e9acff8aab765cbe6f6f2334063493c0c06f7772
+checksum=221b8fa939426c2c44c53e41f40bb8d91410978b0312fcfaf8786cb93d36295b
 
 pre_build() {
 	export OPTIMIZATIONS="-fomit-frame-pointer -O3 -fno-finite-math-only -DNDEBUG"

From 066951f749016de87a14891df846ec22dbf535b6 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Thu, 31 Mar 2022 11:13:14 +0700
Subject: [PATCH 1183/1686] mdBook: update to 0.4.17

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index 465ff1a1bbbc..d2aa033512fa 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.14
+version=0.4.17
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=59fd3e417e9d09deac89e20467194dd9f93854c2f1a87e845816c5cec676765c
+checksum=9523d0bed63ce35eec5a8259eb963651cd7e37ec5644ef551134068a2fb72f89
 
 post_install() {
 	vlicense LICENSE

From 39b827937d126f00ea8ad47c31698c06fa46ebe6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 9 Apr 2022 22:42:33 +0200
Subject: [PATCH 1184/1686] ugrep: update to 3.7.9.

---
 srcpkgs/ugrep/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index 2c25a04aa898..5025d63a7ebd 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
 # Template file for 'ugrep'
 pkgname=ugrep
-version=3.7.8
+version=3.7.9
 revision=1
 build_style=gnu-configure
 makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://github.com/Genivia/ugrep"
 distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=b2e03615890b92df4487a2891bf47675429c469b1825d5d05600ed3a729b92c7
+checksum=016e771756574a2a0b026ec50f7e7f3898d39cb61771ce98bc225c34d86a03be
 
 post_install() {
 	vlicense LICENSE.txt LICENSE

From ebe3b1305368d46d87d1cec1a6fca75a92c65052 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Apr 2022 14:30:56 +0200
Subject: [PATCH 1185/1686] libmnl: update to 1.0.5.

---
 srcpkgs/libmnl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libmnl/template b/srcpkgs/libmnl/template
index 9c624e2a3584..7ecb5b44a35d 100644
--- a/srcpkgs/libmnl/template
+++ b/srcpkgs/libmnl/template
@@ -1,14 +1,14 @@
 # Template file for 'libmnl'
 pkgname=libmnl
-version=1.0.4
-revision=2
+version=1.0.5
+revision=1
 build_style=gnu-configure
 short_desc="Minimalistic user-space library oriented to Netlink developers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="LGPL-2.1-or-later"
 homepage="http://www.netfilter.org/projects/libmnl/"
 distfiles="http://www.netfilter.org/projects/${pkgname}/files/${pkgname}-${version}.tar.bz2"
-checksum=171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81
+checksum=274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525
 
 libmnl-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 758ff9707d0e82851e1224960806b0005a94c16a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 10 Apr 2022 14:35:40 +0200
Subject: [PATCH 1186/1686] skaffold: update to 1.38.0.

---
 srcpkgs/skaffold/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template
index faa9823d1cc6..af2d37f0aeb6 100644
--- a/srcpkgs/skaffold/template
+++ b/srcpkgs/skaffold/template
@@ -1,6 +1,6 @@
 # Template file for 'skaffold'
 pkgname=skaffold
-version=1.37.1
+version=1.38.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=8dfea015256761525d8c0e54713642bcd7ead3e3c96ff58e301d0b77b9ef3bd5
+checksum=42f8f8a6f8f55f8031c87de3c3d35334f2e1f71c2a2120d3cc1a15f8ed71ba31

From b270af78002aa9d91b1e74d6eaef4917a634a045 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Fri, 8 Apr 2022 01:03:06 +0200
Subject: [PATCH 1187/1686] revive: update to 1.2.1.

---
 srcpkgs/revive/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/revive/template b/srcpkgs/revive/template
index 55a011447362..38f2018570e8 100644
--- a/srcpkgs/revive/template
+++ b/srcpkgs/revive/template
@@ -1,16 +1,16 @@
 # Template file for 'revive'
 pkgname=revive
-version=1.1.4
+version=1.2.1
 revision=1
 build_style=go
-go_ldflags="-X main.version=$version -X main.builtBy=xbps"
+go_ldflags="-X github.com/mgechev/revive/cli.version=$version"
 go_import_path="github.com/mgechev/revive"
 short_desc="Drop-in replacement for golint"
 maintainer="Roberto Ricci <ricci@disroot.org>"
 license="MIT"
 homepage="https://revive.run/"
 distfiles="https://github.com/mgechev/revive/archive/v$version.tar.gz"
-checksum=afe0d11a614d5ca706485b7f6ca1e53b374b45017ea75f14149a4434d3ef74b5
+checksum=47e9f371e934fe4dfce44098fd54a0aaeaa47079184a14ad263990a24fab1b35
 
 do_check() {
 	go test -v ./...

From 87318dd5f7b6415bd6c0109ee371edc5b4289cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 7 Apr 2022 22:26:45 -0300
Subject: [PATCH 1188/1686] New package: python3-fastjsonschema-2.15.3

---
 srcpkgs/python3-fastjsonschema/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-fastjsonschema/template

diff --git a/srcpkgs/python3-fastjsonschema/template b/srcpkgs/python3-fastjsonschema/template
new file mode 100644
index 000000000000..290431fadfc1
--- /dev/null
+++ b/srcpkgs/python3-fastjsonschema/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-fastjsonschema'
+pkgname=python3-fastjsonschema
+version=2.15.3
+revision=1
+wrksrc=python-fastjsonschema-${version}
+build_style=python3-module
+make_check_args="--deselect tests/benchmarks/test_benchmark.py"
+hostmakedepends="python3-setuptools"
+checkdepends="python3-pytest"
+short_desc="Fastest Python implementation of JSON schema"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
+license="BSD-3-Clause"
+homepage="https://github.com/seznam/python-fastjsonschema"
+changelog="https://raw.githubusercontent.com/horejsek/python-fastjsonschema/master/CHANGELOG.txt"
+distfiles="https://github.com/horejsek/python-fastjsonschema/archive/refs/tags/v${version}.tar.gz"
+checksum=94e59a36c0efbf75a1a790fed15b51c9876b81204a5184c0c89075c68b10e7ec
+
+post_install() {
+	vlicense LICENSE
+}

From 094416a8ffb6523faa8e890ab11c766a47f9fc73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:34 -0300
Subject: [PATCH 1189/1686] python3-jupyter_nbformat: update to 5.3.0.

---
 srcpkgs/python3-jupyter_nbformat/template | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template
index 4bea7989e2a2..27f3267b4594 100644
--- a/srcpkgs/python3-jupyter_nbformat/template
+++ b/srcpkgs/python3-jupyter_nbformat/template
@@ -1,26 +1,22 @@
 # Template file for 'python3-jupyter_nbformat'
 pkgname=python3-jupyter_nbformat
-version=5.1.3
-revision=2
+version=5.3.0
+revision=1
 wrksrc="nbformat-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-jsonschema python3-traitlets
- python3-ipython_genutils python3-jupyter_core"
+ python3-ipython_genutils python3-jupyter_core
+ python3-fastjsonschema"
 checkdepends="python3-pytest python3-testpath $depends"
 short_desc="Jupyter notebook format"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/nbformat"
 distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz"
-checksum=b516788ad70771c6250977c1374fcca6edebe6126fd2adb5a69aa5c2356fd1c8
+checksum=fcc5ab8cb74e20b19570b5be809e2dba9b82836fd2761a89066ad43394ba29f5
 conflicts="python-jupyter_nbformat<=4.4.0_3"
 
-do_check() {
-	# Tests require a non-existent notebook file
-	python3 -m pytest -k 'not test_upgrade_v4_to_4_dot_5 and not test_sample_notebook'
-}
-
 post_install() {
 	vlicense COPYING.md LICENSE
 }

From 4b522bc57841b319d9ca2359ab242a9409bdd64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:37 -0300
Subject: [PATCH 1190/1686] python3-jupyter_nbconvert: update to 6.4.5.

---
 srcpkgs/python3-jupyter_nbconvert/template | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template
index ee8f7f8ba368..baebe44c04ca 100644
--- a/srcpkgs/python3-jupyter_nbconvert/template
+++ b/srcpkgs/python3-jupyter_nbconvert/template
@@ -1,13 +1,16 @@
 # Template file for 'python3-jupyter_nbconvert'
 pkgname=python3-jupyter_nbconvert
-version=6.0.7
-revision=2
+version=6.4.5
+revision=1
 wrksrc="nbconvert-${version}"
 build_style=python3-module
+# WebPDF export depends on unpackaged pyppeteer
+make_check_args="-m not(network) -k not(test_webpdf_without_chromium)"
 hostmakedepends="python3-setuptools"
 depends="python3-mistune python3-Jinja2 python3-jupyterlab_pygments
  python3-nbclient python3-jupyter_core python3-entrypoints python3-testpath
- python3-bleach python3-pandocfilters python3-defusedxml"
+ python3-bleach python3-pandocfilters python3-defusedxml
+ python3-BeautifulSoup4"
 checkdepends="python3-pytest python3-ipython_ipykernel
  python3-jupyter_ipywidgets python3-Pebble pandoc inkscape $depends"
 short_desc="Converting Jupyter notebooks"
@@ -15,14 +18,9 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/jupyter/nbconvert"
 distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz"
-checksum=cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002
+checksum=21163a8e2073c07109ca8f398836e45efdba2aacea68d6f75a8a545fef070d4e
 conflicts="python-jupyter_nbconvert<=5.4.1_2"
 
-do_check() {
-	# WebPDF export depends on unpackaged pyppeteer
-	python3 -m pytest -k 'not TestWebPDFExporter and not test_webpdf_with_chromium'
-}
-
 post_install() {
 	vlicense LICENSE
 }

From 992bfcfd962ff98113c4890eb852c2d1125c08bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:55:41 -0300
Subject: [PATCH 1191/1686] python3-jupyter_notebook: update to 6.4.10.

---
 srcpkgs/python3-jupyter_notebook/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template
index ca9e1d43df21..d7e7230fdf93 100644
--- a/srcpkgs/python3-jupyter_notebook/template
+++ b/srcpkgs/python3-jupyter_notebook/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-jupyter_notebook'
 pkgname=python3-jupyter_notebook
-version=6.3.0
-revision=2
+version=6.4.10
+revision=1
 wrksrc="notebook-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -15,7 +15,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://jupyter.org/"
 distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz"
-checksum=cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d
+checksum=2408a76bc6289283a8eecfca67e298ec83c67db51a4c2e1b713dd180bb39e90e
 conflicts="python-jupyter_notebook<=5.7.0_2"
 # Tests require unpackaged selenium
 make_check=no

From 3c14b79c3d326c5d843bfd1c6419873648e0ac6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 4 Apr 2022 02:57:15 -0300
Subject: [PATCH 1192/1686] python3-Jinja2: update to 3.1.1.

This update was reverted earlier (3d6eb58) because of an incompatibility
with nbconvert-6.0.7 which is fixed in current nbconvert-6.4.5.
---
 srcpkgs/python3-Jinja2/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index 6a4c28214cca..5fbc7ee2fa87 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,7 +1,6 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-reverts="3.1.1_1"
-version=3.0.3
+version=3.1.1
 revision=2
 wrksrc="Jinja2-${version}"
 build_style=python3-module
@@ -14,7 +13,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
+checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
 
 post_install() {
 	vlicense LICENSE.rst

From 1fd79929b6b650d11b1d65f837a60f01cda13a69 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 10 Apr 2022 17:32:13 -0400
Subject: [PATCH 1193/1686] qwt: update to 6.2.0.

---
 common/shlibs        | 2 +-
 srcpkgs/qwt/template | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 673c62085f5b..0ac24701898d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1981,7 +1981,7 @@ libQt5WebKitWidgets.so.5 qt5-webkit-5.6.0_1
 libx265.so.199 x265-3.5_1
 libQt5Xdg.so.3 libqtxdg-3.1.0_1
 libQt5XdgIconLoader.so.3 libqtxdg-3.1.0_1
-libqwt.so.6 qwt-6.1.3_1
+libqwt.so.6.2 qwt-6.2.0_1
 liblxqt-qt5.so.0 liblxqt-0.8.0_1
 liblxqt-globalkeys-qt5.so.0 lxqt-globalkeys-0.8.0_1
 liblxqt-globalkeys-ui-qt5.so.0 lxqt-globalkeys-0.8.0_1
diff --git a/srcpkgs/qwt/template b/srcpkgs/qwt/template
index f03bbd1af605..b5fdae7aa7fd 100644
--- a/srcpkgs/qwt/template
+++ b/srcpkgs/qwt/template
@@ -1,6 +1,6 @@
 # Template file for 'qwt'
 pkgname=qwt
-version=6.1.5
+version=6.2.0
 revision=1
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
@@ -10,7 +10,7 @@ maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
 license="LGPL-2.1-only, Qwt-exception-1.0"
 homepage="https://qwt.sourceforge.io/"
 distfiles="https://sourceforge.net/projects/${pkgname}/files/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
-checksum=4076de63ec2b5e84379ddfebf27c7b29b8dc9074f3db7e2ca61d11a1d8adc041
+checksum=9194f6513955d0fd7300f67158175064460197abab1a92fa127a67a4b0b71530
 
 post_patch() {
 	vsed -e '/^\s*QWT_INSTALL_PREFIX/ s|=.*|= /usr|' \
@@ -31,6 +31,8 @@ qwt-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
+		vmove usr/lib/qt5
+		vmove usr/lib/pkgconfig
 	}
 }
 
@@ -39,5 +41,6 @@ qwt-doc_package() {
 	short_desc+=" - doc files"
 	pkg_install() {
 		vmove usr/share/doc
+		mv "${PKGDESTDIR}/usr/share/doc/qwt/man" "${PKGDESTDIR}/usr/share"
 	}
 }

From f220cad984d3c4abb1589ea42569796f7548f69e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 10 Apr 2022 17:35:00 -0400
Subject: [PATCH 1194/1686] linssid: rebuild for qwt

---
 srcpkgs/linssid/patches/project.patch |  6 ++++--
 srcpkgs/linssid/patches/qwt-6.2.patch | 28 +++++++++++++++++++++++++++
 srcpkgs/linssid/template              |  2 +-
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/linssid/patches/qwt-6.2.patch

diff --git a/srcpkgs/linssid/patches/project.patch b/srcpkgs/linssid/patches/project.patch
index dd03c910c7b1..8adc2028ec41 100644
--- a/srcpkgs/linssid/patches/project.patch
+++ b/srcpkgs/linssid/patches/project.patch
@@ -1,8 +1,10 @@
 --- a/linssid-app/linssid-app.pro
 +++ b/linssid-app/linssid-app.pro
-@@ -5,7 +5,7 @@
+@@ -3,9 +3,9 @@
+ TARGET = linssid
+ VERSION = 3.6
  CONFIG -= debug_and_release app_bundle lib_bundle
--CONFIG += release
+-CONFIG += release 
 +CONFIG += release qwt
  PKGCONFIG +=
 -QT = core gui widgets svg
diff --git a/srcpkgs/linssid/patches/qwt-6.2.patch b/srcpkgs/linssid/patches/qwt-6.2.patch
new file mode 100644
index 000000000000..c05221ea6e1a
--- /dev/null
+++ b/srcpkgs/linssid/patches/qwt-6.2.patch
@@ -0,0 +1,28 @@
+--- a/linssid-app/MainForm.cpp
++++ b/linssid-app/MainForm.cpp
+@@ -31,6 +31,7 @@
+ #include <qwt_plot_marker.h>
+ #include <QPointF>
+ #include <qwt_scale_draw.h>
++#include <qwt_text.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+@@ -1036,7 +1037,7 @@
+                     MainForm::cellDataRay[tbi].signal ) );
+             }
+         } else {
+-            MainForm::cellDataRay[tbi].pBandCurve->setSamples(0, 0, 0);
++            MainForm::cellDataRay[tbi].pBandCurve->setSamples(static_cast<double *>(NULL), static_cast<double *>(NULL), 0);
+         }
+         // now the signal history plot
+         int ixStart;
+@@ -1055,7 +1056,7 @@
+                     &(MainForm::cellDataRay[tbi].pHistory->signal[ixStart]), ixLength);
+         } else {
+ 
+-            MainForm::cellDataRay[tbi].pTimeCurve->setSamples(0, 0, 0);
++            MainForm::cellDataRay[tbi].pTimeCurve->setSamples(static_cast<double *>(NULL), static_cast<double *>(NULL), 0);
+         }
+     }
+     MainForm::mainFormWidget.chan24Plot->replot();
diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template
index 3347f193c3e7..937c8a0745e0 100644
--- a/srcpkgs/linssid/template
+++ b/srcpkgs/linssid/template
@@ -1,7 +1,7 @@
 # Template file for 'linssid'
 pkgname=linssid
 version=3.6
-revision=3
+revision=4
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="boost-devel qwt-devel"

From f39f61a1c0b673ecfbd60f501cb3d0fac73797f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 29 Dec 2021 18:36:58 -0300
Subject: [PATCH 1195/1686] libmtp: update to 1.1.19.

Also: use group `plugdev` to grant r/w permission to mtp devices.
---
 srcpkgs/libmtp/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template
index 5bf05cd6bbe3..1114a4d7bb85 100644
--- a/srcpkgs/libmtp/template
+++ b/srcpkgs/libmtp/template
@@ -1,9 +1,10 @@
 # Template file for 'libmtp'
 pkgname=libmtp
-version=1.1.18
+version=1.1.19
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static --with-udev=/usr/lib/udev"
+configure_args="--disable-static --with-udev=/usr/lib/udev
+ --with-udev-group=plugdev"
 hostmakedepends="pkg-config"
 makedepends="libgcrypt-devel libusb-devel"
 short_desc="Library for Microsoft's Media Transfer Protocol (MTP)"
@@ -11,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="http://libmtp.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0
+checksum=deb4af6f63f5e71215cfa7fb961795262920b4ec6cb4b627f55b30b18aa33228
 
 if [ "$CROSS_BUILD" ]; then
 	# XXX needs host mtp-hotplug

From 51991963b37a6d447a5439b946342c30f87e009f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 10 Apr 2022 21:36:20 -0400
Subject: [PATCH 1196/1686] Revert "python3-Jinja2: update to 3.1.1."

Removal of jinja2.Markup still breaks salt; back to 3.0.3 *again*.

This reverts commit 5369dc2b4869326e36a8c6ba6e3c36f8c8ba2c6a.
---
 srcpkgs/python3-Jinja2/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-Jinja2/template b/srcpkgs/python3-Jinja2/template
index 5fbc7ee2fa87..fb6d7e585a92 100644
--- a/srcpkgs/python3-Jinja2/template
+++ b/srcpkgs/python3-Jinja2/template
@@ -1,7 +1,8 @@
 # Template file for 'python3-Jinja2'
 pkgname=python3-Jinja2
-version=3.1.1
-revision=2
+reverts="3.1.1_1 3.1.1_2"
+version=3.0.3
+revision=3
 wrksrc="Jinja2-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,7 +14,7 @@ license="BSD-3-Clause"
 homepage="http://jinja.pocoo.org/"
 changelog="https://raw.githubusercontent.com/pallets/jinja/master/CHANGES.rst"
 distfiles="${PYPI_SITE}/J/Jinja2/Jinja2-${version}.tar.gz"
-checksum=640bed4bb501cbd17194b3cace1dc2126f5b619cf068a726b98192a0fde74ae9
+checksum=611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7
 
 post_install() {
 	vlicense LICENSE.rst

From ebf46365c64b6ccf1008fcaf4b916c388f3217f3 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Mon, 11 Apr 2022 09:40:43 +0200
Subject: [PATCH 1197/1686] vscode: update to 1.66.1

+ fix issue with node-gyp compilation, which may also depend on npm
---
 srcpkgs/vscode/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 0b9efda224d0..3e3956fa5644 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.66.0
+version=1.66.1
 revision=1
 _electronver=13.6.7
 _npmver=8.6.0
@@ -11,8 +11,8 @@ short_desc="Microsoft Code for Linux"
 maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
-distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz"
-checksum=1c93918ebd00b8e9fc0d8fea13cbe2947f5b83d2d8f5c8d1b00bde885bb925d7
+distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz"
+checksum=243a25d7214ceba5abf510dc890c64a8cc36ccacd97f4b8c666b8b7bab9c5a28
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
@@ -38,6 +38,9 @@ do_configure() {
 }
 
 do_build() {
+	# Update to a more recent npm version to fix some issues
+	npm install -g npm@${_npmver}
+
 	# The default memory limit may be too low for current versions of node
 	# to successfully build vscode.  This sets it to 4GB, but
 	# change this number if it still doesn't work for your system.
@@ -48,8 +51,7 @@ do_build() {
 	--target=$_electronver \
 	--tarball=/usr/include/electron${_electronver%%.*}/node_headers.tar.gz
 
-	npm install -g npm@${_npmver} && \
-		yarn install --ignore-engines --arch=x64
+	yarn install --ignore-engines --arch=x64
 
 	export CFLAGS="$CFLAGS -I/usr/include/node"
 	yarn run gulp vscode-linux-x64-min

From bc54b168f6d4e7f4bcba98ffdff46bef38ea62b4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 19 Feb 2022 10:51:01 +0100
Subject: [PATCH 1198/1686] New package: cocogitto-5.0.1

---
 srcpkgs/cocogitto/template | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 srcpkgs/cocogitto/template

diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
new file mode 100644
index 000000000000..79a78e4b5971
--- /dev/null
+++ b/srcpkgs/cocogitto/template
@@ -0,0 +1,34 @@
+# Template file for 'cocogitto'
+pkgname=cocogitto
+version=5.0.1
+revision=1
+build_style=cargo
+build_helper=qemu
+hostmakedepends="pkg-config"
+makedepends="libgit2-devel"
+short_desc="Conventional Commits toolbox"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="MIT"
+homepage="https://github.com/cocogitto/cocogitto"
+changelog="https://github.com/cocogitto/cocogitto/blob/main/CHANGELOG.md"
+distfiles="https://github.com/cocogitto/cocogitto/archive/${version}.tar.gz"
+checksum=fee00736ec4b8ce72c8d8f904d0b734372b11ce7c3711166814eca38bf0cda8f
+# Test suite is not atomic, relies on user environment such as git user configuration
+make_check=no
+
+post_build() {
+	TARGET_DIR="target/${RUST_TARGET}/release"
+
+	for shell in bash zsh fish; do
+		vtargetrun ${TARGET_DIR}/cog generate-completions ${shell} > cog.${shell}
+	done
+}
+
+post_install() {
+	vlicense LICENSE
+	vdoc README.md
+
+	for shell in bash zsh fish; do
+		vcompletion cog.${shell} ${shell} cog
+	done
+}

From 0d5220540225d801d9f83459375e442b74284e3f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:31 +0200
Subject: [PATCH 1199/1686] certbot: update to 1.26.0.

---
 srcpkgs/certbot/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template
index aa8de157d59b..a6eea0f1837f 100644
--- a/srcpkgs/certbot/template
+++ b/srcpkgs/certbot/template
@@ -1,6 +1,6 @@
 # Template file for 'certbot'
 pkgname=certbot
-version=1.25.0
+version=1.26.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=9633d21051fe7fd076d64cb41963de61d300d7c30f4b491c8d18cb8306357509
+checksum=9d136fab6968829db9774a264a96a7923a5482d0c90894b009253f374d480693

From b2602837cd301e28ca7f282126e348ba1492e331 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:33 +0200
Subject: [PATCH 1200/1686] certbot-apache: update to 1.26.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 1f5c098c802d..50396f46779e 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.25.0
+version=1.26.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=91dbd326c5ee4fe7a2ef5f1c3c525863a7f4ed5f228e1c7c10048d18fe18d0a1
+checksum=efb573a1fd926ecf74618286d21ac3f7539b2be426face7f1364dcca8b0e316e

From 4ee5c82adf0572faaeb163c90f3e18ea73076dc4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:36 +0200
Subject: [PATCH 1201/1686] certbot-nginx: update to 1.26.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 b635785e5d0a..b9df8e8b1c90 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.25.0
+version=1.26.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=433a7237e841c462a67f9195fb7d7711ac6ed6d27bedb981c71238ef5348d62b
+checksum=c9f2ee27dfb98525e507f516f8c1cd37a5b61f3090bcf64284fee95cfcf6ab10

From 42ce65eec05a522836f38dbdb3221627a418feda Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:11:40 +0200
Subject: [PATCH 1202/1686] python3-acme: update to 1.26.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 19e374d105a8..ab158b8dccc8 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.25.0
+version=1.26.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=e3fbe36fcfa27ec46f450369498f3486370ab53a0fd7db91557a23d58b3969fa
+checksum=7269209192189c5b0bd5bc69388229737e23e52e8422315e2fcd3aff4c8e13c8

From 35513d2d0f15e5186507279ff2c0c5c518189c1c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Apr 2022 16:38:22 +0200
Subject: [PATCH 1203/1686] minify: update to 2.11.1.

---
 srcpkgs/minify/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/minify/template b/srcpkgs/minify/template
index 198a6c4ab9e8..7131527fa009 100644
--- a/srcpkgs/minify/template
+++ b/srcpkgs/minify/template
@@ -1,6 +1,6 @@
 # Template file for 'minify'
 pkgname=minify
-version=2.10.0
+version=2.11.1
 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=a26c531d5071c6bd5d2300b4906fd2c7e227a19c23549219ccfae2c20114c60e
+checksum=f238ffcb9ed6ff3c413442e3c5bfe9409809cc3de67db29ebc541d83168a09ea
 
 post_install() {
 	vlicense LICENSE

From 6e4b6b82b59e0507c498ef99d254d7066ae4293a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 11 Apr 2022 16:47:02 +0200
Subject: [PATCH 1204/1686] perl-Config-General: update to 2.65.

---
 srcpkgs/perl-Config-General/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/perl-Config-General/template b/srcpkgs/perl-Config-General/template
index b1162c8191c0..97eacd23613b 100644
--- a/srcpkgs/perl-Config-General/template
+++ b/srcpkgs/perl-Config-General/template
@@ -1,7 +1,7 @@
 # Template file for 'perl-Config-General'
 pkgname=perl-Config-General
-version=2.63
-revision=3
+version=2.65
+revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
@@ -9,7 +9,7 @@ makedepends="${hostmakedepends}"
 depends="${makedepends}"
 short_desc="Config::General - Generic Config Module"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Artistic-1.0-Perl, GPL-1.0-or-later"
+license="Artistic-2.0"
 homepage="https://metacpan.org/release/Config-General"
 distfiles="${CPAN_SITE}/Config/${pkgname/perl-/}-$version.tar.gz"
-checksum=0a9bf977b8aabe76343e88095d2296c8a422410fd2a05a1901f2b20e2e1f6fad
+checksum=4d6d5754be3a9f30906836f0cc10e554c8832e14e7a1341efb15b05d706fc58f

From 64984f7633d012fd1d2054ffc6e017fe4addd629 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 11 Apr 2022 10:01:49 -0400
Subject: [PATCH 1205/1686] greetd: set shell for agreety, change default vt

---
 srcpkgs/greetd/patches/change-default-vt.patch | 13 +++++++++++++
 srcpkgs/greetd/patches/fix-shell.patch         | 17 +++++++++++++++++
 srcpkgs/greetd/template                        |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/greetd/patches/change-default-vt.patch
 create mode 100644 srcpkgs/greetd/patches/fix-shell.patch

diff --git a/srcpkgs/greetd/patches/change-default-vt.patch b/srcpkgs/greetd/patches/change-default-vt.patch
new file mode 100644
index 000000000000..3dad61740587
--- /dev/null
+++ b/srcpkgs/greetd/patches/change-default-vt.patch
@@ -0,0 +1,13 @@
+diff --git a/config.toml b/config.toml
+index 3768a6e315..2a933309b4 100644
+--- a/config.toml
++++ b/config.toml
+@@ -1,7 +1,7 @@
+ [terminal]
+ # The VT to run the greeter on. Can be "next", "current" or a number
+ # designating the VT.
+-vt = 1
++vt = 7
+ 
+ # The default session, also known as the greeter.
+ [default_session]
diff --git a/srcpkgs/greetd/patches/fix-shell.patch b/srcpkgs/greetd/patches/fix-shell.patch
new file mode 100644
index 000000000000..fbe416cbed8d
--- /dev/null
+++ b/srcpkgs/greetd/patches/fix-shell.patch
@@ -0,0 +1,17 @@
+# $SHELL is not set, use /bin/sh because it's available
+diff --git a/config.toml b/config.toml
+index 3768a6e..c323af2 100644
+--- a/config.toml
++++ b/config.toml
+@@ -6,9 +6,9 @@ vt = 1
+ # The default session, also known as the greeter.
+ [default_session]
+ 
+-# `agreety` is the bundled agetty/login-lookalike. You can replace `$SHELL`
++# `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh`
+ # with whatever you want started, such as `sway`.
+-command = "agreety --cmd $SHELL"
++command = "agreety --cmd /bin/sh"
+ 
+ # The user to run the command as. The privileges this user must have depends
+ # on the greeter. A graphical greeter may for example require the user to be
diff --git a/srcpkgs/greetd/template b/srcpkgs/greetd/template
index cf5f3c400b0c..0f5e9c88f501 100644
--- a/srcpkgs/greetd/template
+++ b/srcpkgs/greetd/template
@@ -1,7 +1,7 @@
 # Template file for 'greetd'
 pkgname=greetd
 version=0.8.0
-revision=1
+revision=2
 build_style=cargo
 conf_files="/etc/greetd/config.toml"
 hostmakedepends="pkg-config scdoc"

From 9f519c8b6386f67d55deee6d7e5766aecdf4a5d9 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sun, 3 Apr 2022 22:33:58 +0530
Subject: [PATCH 1206/1686] Waybar: update to 0.9.12

---
 srcpkgs/Waybar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index c6470c6d330d..fd4fb7928d0d 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,6 +1,6 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.9
+version=0.9.12
 revision=1
 _date_version=3.0.0
 build_style=meson
@@ -29,7 +29,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="23a94538538f43a6db4c1c5f7e09e75ab743ded1ccfc737e1f3e0971fe4cdd87
+checksum="1f3f6692de99567c43939e7ad2e96f8c6a5ef83f760ad6f77865e46a3c6811d6
  87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
  6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
 

From 0118fa23389af7cdbd0310894e6a441529eac619 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:40:10 +0200
Subject: [PATCH 1207/1686] chatterino2: update to 2.3.5.

---
 srcpkgs/chatterino2/template | 25 +++++++++++--------------
 srcpkgs/chatterino2/update   |  2 ++
 2 files changed, 13 insertions(+), 14 deletions(-)
 create mode 100644 srcpkgs/chatterino2/update

diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index 7bf7d6a37d04..977fa9771498 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,19 +1,19 @@
 # Template file for 'chatterino2'
 pkgname=chatterino2
-version=2.3.4
+version=2.3.5
 revision=1
-_libcommuni_commit="c613600e6a52e6d3166247a05205cf1c755d4868"
+_libcommuni_commit="a7b32cd6fa0640721b6114b31d37d79ebf832411"
 _serialize_commit="7d37cbfd5ac3bfbe046118e1cec3d32ba4696469"
-_settings_commit="7cf8431d644332107a51a46c1e3de70e64692f0c"
-_signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc"
-_qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9"
+_settings_commit="04792d853c7f83c9d7ab4df00279442a658d3be3"
+_signals_commit="25e4ec3b8d6ea94a5e65a26e7cfcbbce3b87c5d6"
 _sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b"
 create_wrksrc=yes
 build_wrksrc="chatterino2-${version}"
 build_style=cmake
+configure_args="-DUSE_SYSTEM_QTKEYCHAIN=ON"
 hostmakedepends="qt5-qmake qt5-host-tools"
 makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel
- boost-devel openssl-devel rapidjson websocketpp"
+ qtkeychain-qt5-devel boost-devel openssl-devel rapidjson websocketpp"
 depends="qt5-imageformats qt5-svg"
 short_desc="Chat client for twitch.tv"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -25,14 +25,12 @@ distfiles="https://github.com/Chatterino/chatterino2/archive/refs/tags/v${versio
  https://github.com/pajlada/serialize/archive/${_serialize_commit}.tar.gz
  https://github.com/pajlada/settings/archive/${_settings_commit}.tar.gz
  https://github.com/pajlada/signals/archive/${_signals_commit}.tar.gz
- https://github.com/Chatterino/qtkeychain/archive/${_qtkeychain_commit}.tar.gz
  https://github.com/arsenm/sanitizers-cmake/archive/${_sanitizers_cmake_commit}.tar.gz"
-checksum="27d42138d48d807340fe4194b4cdada6183b0ff2127f24d39032b3ad1f66594c
- ba2179eb43638366ca65214137a850a127fb93a36fcc54658649c34e8d6f7dc4
+checksum="f1fff3523f5a3f633430d44f7ca6c6c718a515258d50004a855e69e4aa989b4e
+ d6fd560851357d1e52f93604314215c75b291104e054c84a16c34d7d83d40f14
  d0da2cebd5dfd7b20f7247f1e4fb6b8a866434db49316a067b6c798ec8217c63
- 0b35eb297f0949f27b3c54bc66d8b0c9293102fb52838d12371a5fcc80c590e5
- 7ffd43dbd05704af5bef64b0eae8c12174013d4c7105472019ef381ff82c0a46
- 4fdd7fd8bbae4fd7a505c917facc6e6b838850cd4f016c30fae45535dbaab4b7
+ 702e97d8f2fcaec65256e6f691c3ed055924430ce64b29ebe74f3769a9d50d71
+ ae098841b0f33079366eff8bc44fe3f2f2f65e70259c1cc9ff8d727c4edf974c
  f9cf386638f455c5d2e7a835b95941201387d2531b8682942d59827663b58341"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -46,12 +44,11 @@ post_extract() {
 	rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \
 	      ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \
 	      ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \
-	      ${build_wrksrc}/lib/qtkeychain ${build_wrksrc}/cmake/sanitizers-cmake
+	      ${build_wrksrc}/cmake/sanitizers-cmake
 	mv "libcommuni-${_libcommuni_commit}" "${build_wrksrc}/lib/libcommuni"
 	mv "serialize-${_serialize_commit}" "${build_wrksrc}/lib/serialize"
 	mv "settings-${_settings_commit}" "${build_wrksrc}/lib/settings"
 	mv "signals-${_signals_commit}" "${build_wrksrc}/lib/signals"
-	mv "qtkeychain-${_qtkeychain_commit}" "${build_wrksrc}/lib/qtkeychain"
 	mv "sanitizers-cmake-${_sanitizers_cmake_commit}" "${build_wrksrc}/cmake/sanitizers-cmake"
 }
 
diff --git a/srcpkgs/chatterino2/update b/srcpkgs/chatterino2/update
new file mode 100644
index 000000000000..16563536cb32
--- /dev/null
+++ b/srcpkgs/chatterino2/update
@@ -0,0 +1,2 @@
+site="https://github.com/Chatterino/chatterino2/releases"
+pattern="v\K[0-9.]+(?=\.tar\.gz)"

From 0571862809b92ddfa40a8483fe9db26ae86a7809 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Mon, 11 Apr 2022 02:22:52 +0200
Subject: [PATCH 1208/1686] arc-theme: update to 20220405.

---
 srcpkgs/arc-theme/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/arc-theme/template b/srcpkgs/arc-theme/template
index 4839b87942fe..86b487ffa9aa 100644
--- a/srcpkgs/arc-theme/template
+++ b/srcpkgs/arc-theme/template
@@ -1,6 +1,6 @@
 # Template file for 'arc-theme'
 pkgname=arc-theme
-version=20220223
+version=20220405
 revision=1
 build_style=meson
 hostmakedepends="glib-devel pkg-config gnome-shell sassc inkscape cinnamon"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jnsh/arc-theme"
 distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b9a58efc296c3036905b9f8d19518c5c815e5140dd399ad9b81cc17d319a9093
+checksum=657d6cc743facba0f7f56939653b3d0ed4c55b2ce17fef0d050ed32c1aae5f1e

From 60cd63efee050231744c8311122ccda73d63d9d8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 11:38:40 +0100
Subject: [PATCH 1209/1686] protontricks: update to 1.8.1.

---
 srcpkgs/protontricks/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index 208a55032a36..f7d7182b65ca 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,18 +1,18 @@
 # Template file for 'protontricks'
 pkgname=protontricks
-version=1.8.0
+version=1.8.1
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 depends="python3-vdf winetricks python3-setuptools"
+checkdepends="$depends"
 short_desc="Simple wrapper that does winetricks things for Proton enabled games"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only"
 homepage="https://github.com/Matoking/protontricks"
 changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md"
 distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d56b53c4ea4286ae20588072433c30193143a75654ea216db389503a63661b09
-make_check=no # no tests in pypi tarball
+checksum=2a2f1349fd7263b4a82b8443f9c423f79ce104697a87e9a53fb2fae21d7ce5ac
 
 post_install() {
 	# Remove `protontricks-desktop-install`, since we

From d6cf680c8286295f63bd84608ddef14ff5553d98 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 10 Apr 2022 14:49:44 -0400
Subject: [PATCH 1210/1686] chezmoi: update to 2.15.1.

---
 srcpkgs/chezmoi/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 2f0fb2f144bc..bacfc8c9b294 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -1,6 +1,6 @@
 # Template file for 'chezmoi'
 pkgname=chezmoi
-version=2.15.0
+version=2.15.1
 revision=1
 build_style=go
 go_import_path="github.com/twpayne/chezmoi/v2"
@@ -12,7 +12,7 @@ maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://chezmoi.io/"
 distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
-checksum=d33a5df53bde7b94962c39788e44af41e52a7836bc6d43168c9b324da966996e
+checksum=0100dcf8b70774595f56859e5d1b635319ba584ad7b280946352be328f36d679
 
 export CGO_ENABLED=1
 

From 8d1a54fadf36729f120162d39f8fc37bb9ea38d8 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Thu, 31 Mar 2022 21:48:32 +0200
Subject: [PATCH 1211/1686] aml: update to 0.2.1

---
 srcpkgs/aml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/aml/template b/srcpkgs/aml/template
index 5c1754fc6d7b..cc0598dfe914 100644
--- a/srcpkgs/aml/template
+++ b/srcpkgs/aml/template
@@ -1,6 +1,6 @@
 # Template file for 'aml'
 pkgname=aml
-version=0.1.0
+version=0.2.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="ISC"
 homepage="https://github.com/any1/aml"
 distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz"
-checksum=50341861e9bb4eaaf11731941c276ef22b78e0e3d9b1442f6cf683f1b8e08bff
+checksum=c5af3f690b64a7f4dc7141b11f23a4bef190a921f9d71ce70ce0698b5ec58eb0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 2926d37a7364e3bdf41e72b56c6de6bfbc837b05 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Thu, 31 Mar 2022 21:48:50 +0200
Subject: [PATCH 1212/1686] neatvnc: update to 0.4.0

---
 srcpkgs/neatvnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neatvnc/template b/srcpkgs/neatvnc/template
index a861c8e63569..8dd902a8cb4c 100644
--- a/srcpkgs/neatvnc/template
+++ b/srcpkgs/neatvnc/template
@@ -1,6 +1,6 @@
 # Template file for 'neatvnc'
 pkgname=neatvnc
-version=0.3.2
+version=0.4.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -10,7 +10,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="ISC"
 homepage="https://github.com/any1/neatvnc"
 distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz"
-checksum=8329354f83bcc654146082a8a9f2d0be4bac5bd8c76b6c31790b7b9c5857e318
+checksum=8a833d488f579e4acf7abb1c7832f8e571bddd6da054e71ed9be3b8396955a81
 
 post_install() {
 	vlicense COPYING

From 82fbb6368ba980cb38be434e8680af7d31674267 Mon Sep 17 00:00:00 2001
From: Jovan Lanik <jox969@gmail.com>
Date: Thu, 31 Mar 2022 21:49:20 +0200
Subject: [PATCH 1213/1686] wayvnc: update to 0.4.1

---
 srcpkgs/wayvnc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template
index bf948d97827c..196e986fe9a7 100644
--- a/srcpkgs/wayvnc/template
+++ b/srcpkgs/wayvnc/template
@@ -1,6 +1,6 @@
 # Template file for 'wayvnc'
 pkgname=wayvnc
-version=0.3.1
+version=0.4.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config ninja scdoc wayland-devel"
@@ -10,7 +10,7 @@ maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
 license="ISC"
 homepage="https://github.com/any1/wayvnc"
 distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz"
-checksum=7b68af5bfa5e19352aaa5140e6c2418f90bfe6a949775bd236b06796c56e27f5
+checksum=1813a22644a9043f96a53756bfee68d65f976de8b8f65c86f56782d22286d271
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"

From 3741a31cf3ee693337d96f45d2f4c103b9f32d76 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 8 Apr 2022 23:36:03 +0300
Subject: [PATCH 1214/1686] notcurses: update to 3.0.8.

---
 srcpkgs/notcurses/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/notcurses/template b/srcpkgs/notcurses/template
index 9581a8e3de89..724e7b7f2475 100644
--- a/srcpkgs/notcurses/template
+++ b/srcpkgs/notcurses/template
@@ -1,6 +1,6 @@
 # Template file for 'notcurses'
 pkgname=notcurses
-version=3.0.7
+version=3.0.8
 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=db461c6ba07a8e3735a51a1d2e706d249ae30436519f543fa5931d414019c770
+checksum=56c33ffe2a2bc4d0b6e3ac14bdf620cf41e3293789135f76825057d0166974fd
 
 build_options="man"
 desc_option_man="Use pandoc for manpages"

From aafb5382db6513fd0bfb240e0179f431ac6d9a4a Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 10 Apr 2022 15:27:41 +0200
Subject: [PATCH 1215/1686] vultr-cli: update to 2.12.2.

---
 srcpkgs/vultr-cli/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vultr-cli/template b/srcpkgs/vultr-cli/template
index 34e0073e1734..20612aeff1c8 100644
--- a/srcpkgs/vultr-cli/template
+++ b/srcpkgs/vultr-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'vultr-cli'
 pkgname=vultr-cli
-version=2.12.1
+version=2.12.2
 revision=1
 build_style=go
 go_import_path=github.com/vultr/vultr-cli/v2
@@ -8,6 +8,6 @@ short_desc="Official command line tool for Vultr services"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="Apache-2.0"
 homepage="https://github.com/vultr/vultr-cli"
-changelog="https://github.com/vultr/vultr-cli/blob/master/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/vultr/vultr-cli/master/CHANGELOG.md"
 distfiles="https://github.com/vultr/vultr-cli/archive/refs/tags/v${version}.tar.gz"
-checksum=e2a9c7243d48d44f88917cbc241512774f8f2c6e305ef5aaaf026177a2620ae6
+checksum=875a273d573ef53ab3329d3ecd9e3745d7d8963e0b3ff992435fb20881ea49a7

From 5b26daa9dcce8590febf0b651ed5fe6d8e442e21 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 3 Apr 2022 00:58:37 -0400
Subject: [PATCH 1216/1686] hobbits: update to 0.53.1.

---
 srcpkgs/hobbits/patches/backports.patch      | 78 ++++++++++++++++++++
 srcpkgs/hobbits/patches/python_version.patch | 11 ---
 srcpkgs/hobbits/template                     | 39 ++++++++--
 3 files changed, 109 insertions(+), 19 deletions(-)
 create mode 100644 srcpkgs/hobbits/patches/backports.patch
 delete mode 100644 srcpkgs/hobbits/patches/python_version.patch

diff --git a/srcpkgs/hobbits/patches/backports.patch b/srcpkgs/hobbits/patches/backports.patch
new file mode 100644
index 000000000000..3348b37ae5f2
--- /dev/null
+++ b/srcpkgs/hobbits/patches/backports.patch
@@ -0,0 +1,78 @@
+Backports some changes sent upstream to better support plain cmake builds
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1cc283d..5795a97 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,10 @@ if (UNIX AND NOT APPLE)
+     set(LINUX TRUE)
+ endif()
+ 
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.version")
++if (DEFINED BUILD_VERSION)
++    message("Using build version from command-line")
++    set(VERSION_STRING "${BUILD_VERSION}")
++elseif (EXISTS "${CMAKE_SOURCE_DIR}/.version")
+     message("Getting build version from .version file")
+     file (STRINGS "${CMAKE_SOURCE_DIR}/.version" BUILD_VERSION)
+     string(REGEX REPLACE "\n$" "" BUILD_VERSION "${BUILD_VERSION}")
+@@ -106,7 +143,13 @@ else()
+ 	endif()
+ 
+ 	# PFFFT
+-	find_package(PFFFT REQUIRED)
++	option(USE_SYSTEM_PFFFT "Use a system-provided version of pffft" OFF)
++	if(USE_SYSTEM_PFFFT)
++		message(STATUS "Using system pffft")
++		find_package(PFFFT REQUIRED)
++	else()
++		add_subdirectory(external)
++	endif()
+ 
+ endif()
+ 
+@@ -124,7 +167,7 @@ elseif( MANUAL_PYTHON_PATH )
+ 	set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" )
+ endif()
+ 
+-find_package (Python3 3.9 EXACT COMPONENTS Interpreter Development REQUIRED)
++find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED)
+ message("Python3 Libs: ${Python3_LIBRARIES}")
+ 
+ #
+diff --git a/cmake/PackExternalDeps.cmake b/cmake/PackExternalDeps.cmake
+index 4be07c7..330be03 100644
+--- a/cmake/PackExternalDeps.cmake
++++ b/cmake/PackExternalDeps.cmake
+@@ -145,7 +145,7 @@ endfunction(pack_python)
+ function(pack_pffft)
+ 	install(FILES ${PFFFT_LIBRARIES}
+ 			DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+-endfunction(pack_pcap)
++endfunction(pack_pffft)
+ 
+ function(pack_pcap)
+     if (LINUX)
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+new file mode 100644
+index 0000000..ea1c9a3
+--- /dev/null
++++ b/external/CMakeLists.txt
+@@ -0,0 +1,17 @@
++
++# can't assume the target system has the required SIMD instructions
++option(PFFFT_ENABLE_SIMD "Enable SIMD support for pffft" OFF)
++
++message(STATUS "Using bundled pffft")
++add_library(pffft STATIC pffft/pffft.c)
++if(PFFFT_ENABLE_SIMD)
++    message(STATUS "Enabling SIMD support for pffft")
++else()
++    message(STATUS "Disabling SIMD support for pffft")
++    target_compile_definitions(pffft PUBLIC PFFFT_SIMD_DISABLE)
++endif()
++target_compile_options(pffft PUBLIC "${PFFFT_CFLAGS}")
++target_link_libraries(pffft m)
++target_include_directories(pffft INTERFACE pffft)
++
++add_library(PFFFT::PFFFT ALIAS pffft)
diff --git a/srcpkgs/hobbits/patches/python_version.patch b/srcpkgs/hobbits/patches/python_version.patch
deleted file mode 100644
index 47b1490c4b0a..000000000000
--- a/srcpkgs/hobbits/patches/python_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2021-10-07 11:31:22.000000000 -0400
-+++ b/CMakeLists.txt	2021-10-25 21:16:59.429406408 -0400
-@@ -124,7 +124,7 @@
- 	set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" )
- endif()
- 
--find_package (Python3 3.9 EXACT COMPONENTS Interpreter Development REQUIRED)
-+find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED)
- message("Python3 Libs: ${Python3_LIBRARIES}")
- 
- #
diff --git a/srcpkgs/hobbits/template b/srcpkgs/hobbits/template
index fe6c7f5adda7..8260fa1988d0 100644
--- a/srcpkgs/hobbits/template
+++ b/srcpkgs/hobbits/template
@@ -1,28 +1,51 @@
 # Template file for 'hobbits'
 pkgname=hobbits
-version=0.52.0
+version=0.53.1
 revision=1
+_pffft_commit=7914df2127c206ae501a6cb2950ee65a94662215
+_pffft_dir="jpommier-pffft-${_pffft_commit:0:12}"
+create_wrksrc=yes
+build_wrksrc="hobbits-${version}"
 build_style=cmake
+configure_args="-DBUILD_VERSION=${version} $(vopt_bool simd PFFFT_ENABLE_SIMD)"
 hostmakedepends="pkg-config qt5-host-tools qt5-qmake python3"
-makedepends="fftw-devel libusb-devel libpcap-devel python3-devel qt5-devel"
+makedepends="libusb-devel libpcap-devel python3-devel qt5-devel"
 short_desc="Multi-platform GUI for bit-based analysis, processing and visualization"
 maintainer="classabbyamp <void@placeviolette.net>"
-license="MIT, GPL-2.0-or-later"
+license="MIT, custom:FFTPACK"
 homepage="https://mahlet-inc.github.io"
 changelog="https://raw.githubusercontent.com/Mahlet-Inc/hobbits/master/CHANGELOG.md"
-distfiles="https://github.com/Mahlet-Inc/hobbits/archive/refs/tags/v${version}.tar.gz"
-checksum=3332e02380ab46649f0ec2066b63b6e0fb04b55cdca973d28880f1607ebbf27e
+distfiles="https://github.com/Mahlet-Inc/hobbits/archive/refs/tags/v${version}.tar.gz
+ https://bitbucket.org/jpommier/pffft/get/${_pffft_commit}.tar.gz"
+checksum="e63c51228c3f00f56a2ebf79fec1975544b1c6c986d58dff69643da46148316b
+ @0b9f0e99ace190e607961f72953394aa0f0387826d4e478027111d71d56839a8"
+patch_args="-Np1 --directory=${build_wrksrc}"
+
+build_options="simd"
+desc_option_simd="Enable SIMD support (SSE, Altivec, or NEON)"
+
+# by default, don't use SIMD on unsupported platforms
+# SSE, Altivec, or NEON support is needed to enable this
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*|ppc64*|x86_64*) build_options_default="simd"
+esac
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*|aarch64*|ppc*) CXXFLAGS+=" -fsigned-char"
 esac
 
-pre_configure() {
-	# upstream provides no way to set the version through configure_args
-	echo "${version}" > .version
+post_extract() {
+	# until upstream merges Mahlet-Inc/hobbits#143 and releases a new version,
+	# the directory must be added, instead of removing the submodule
+	# rm -rf ${build_wrksrc}/external/pffft
+	mkdir ${build_wrksrc}/external
+	mv ${_pffft_dir} ${build_wrksrc}/external/pffft
 }
 
 post_install() {
 	vinstall src/hobbits-gui/images/icons/HobbitsRingSmall.png 644 usr/share/pixmaps
+	# capture the FFTPACK license from the header comment of pffft.c
+	sed -E '/\*\//,$d; 1s/\/\* //; s/^[[:blank:]]+//' external/pffft/pffft.c > LICENSE.pffft
+	vlicense LICENSE.pffft
 	vlicense LICENSE.txt
 }

From 9d905a30d7abb63bbffc1e48f1c16fdf4378a95b Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 12 Apr 2022 00:05:11 +0200
Subject: [PATCH 1217/1686] onefetch: broken on big endian

---
 srcpkgs/onefetch/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/onefetch/template b/srcpkgs/onefetch/template
index 1eda291b053f..82a46672d356 100644
--- a/srcpkgs/onefetch/template
+++ b/srcpkgs/onefetch/template
@@ -10,6 +10,10 @@ homepage="https://github.com/o2sh/onefetch"
 distfiles="https://github.com/o2sh/onefetch/archive/v${version}.tar.gz"
 checksum=f57b16dfa2bb95dd1fb805257a1761baa20d69eb9ce7c311d369609894c53897
 
+if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then
+	broken="exr crate unimplemented for BE"
+fi
+
 post_install() {
 	vlicense LICENSE.md
 }

From 4b5b242fe98391ee507fcdedb369e3b3ba67ce2f Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Apr 2022 17:37:16 +0200
Subject: [PATCH 1218/1686] ruby: update to 3.1.2.

---
 srcpkgs/ruby/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 85524a7796b2..4c62a19620d0 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -2,7 +2,7 @@
 _ruby_abiver=3.1.0
 
 pkgname=ruby
-version=3.1.1
+version=3.1.2
 revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
@@ -16,7 +16,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.xz"
-checksum=7aefaa6b78b076515d272ec59c4616707a54fc9f2391239737d5f10af7a16caa
+checksum=ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl)	# Broken on the builders but successfully built locally

From eb940c82cf8a48a16a95a49d261638882b83c2ea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 12 Apr 2022 19:39:32 +0200
Subject: [PATCH 1219/1686] yj: update to 5.1.0.

---
 srcpkgs/yj/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/yj/template b/srcpkgs/yj/template
index 895e663988d1..395a2c6b15b9 100644
--- a/srcpkgs/yj/template
+++ b/srcpkgs/yj/template
@@ -1,13 +1,13 @@
 # Template file for 'yj'
 pkgname=yj
-version=5.0.0
+version=5.1.0
 revision=1
 build_style=go
-go_import_path="github.com/sclevine/yj"
+go_import_path="github.com/sclevine/yj/v${version%%.*}"
 hostmakedepends="git"
 short_desc="Convert YAML <=> TOML <=> JSON <=> HCL"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/sclevine/yj"
 distfiles="https://github.com/sclevine/yj/archive/v${version}.tar.gz"
-checksum=df9a4f5b6d067842ea3da68ff92c374b98560dce1086337d39963a1346120574
+checksum=9a3e9895181d1cbd436a1b02ccf47579afacd181c73f341e697a8fe74f74f99d

From 83ab5191c8816141d0d94c7d03bdd1727ded913d Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Fri, 8 Apr 2022 02:18:39 +0300
Subject: [PATCH 1220/1686] pcsc-tools: update to 1.6.0.

---
 srcpkgs/pcsc-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcsc-tools/template b/srcpkgs/pcsc-tools/template
index 0825d36dd719..b29c25b70ce1 100644
--- a/srcpkgs/pcsc-tools/template
+++ b/srcpkgs/pcsc-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'pcsc-tools'
 pkgname=pcsc-tools
-version=1.5.8
+version=1.6.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://ludovic.rousseau.free.fr/softwares/pcsc-tools"
 distfiles="http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=87c1edbdb8c9735063f688aa3e05e3893a88e78b322dc69af80757ed90282212
+checksum=651c8dd74bcb33db4c16935ce5d80dd1aa6eb20ba9d5c4b9631a098326ef8b9f

From b190724b7eac9a2c61bf9e533d8693bcff9d10af Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Tue, 12 Apr 2022 01:27:48 -0400
Subject: [PATCH 1221/1686] dbeaver: force jdk11 regardless of alternatives
 setting

fixes #34857
---
 srcpkgs/dbeaver/patches/force-jdk11.patch | 11 +++++++++++
 srcpkgs/dbeaver/template                  |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dbeaver/patches/force-jdk11.patch

diff --git a/srcpkgs/dbeaver/patches/force-jdk11.patch b/srcpkgs/dbeaver/patches/force-jdk11.patch
new file mode 100644
index 000000000000..47290b3e8639
--- /dev/null
+++ b/srcpkgs/dbeaver/patches/force-jdk11.patch
@@ -0,0 +1,11 @@
+--- a/product/community/DBeaver.product
++++ b/product/community/DBeaver.product
+@@ -9,7 +9,7 @@
+     </configIni>
+ 
+     <launcherArgs>
+-        <programArgs></programArgs>
++        <programArgs>-vm /usr/lib/jvm/openjdk11/bin</programArgs>
+         <programArgsMac>-vm ../Eclipse/jre/Contents/Home/bin/java</programArgsMac>
+ 
+         <vmArgs>-XX:+IgnoreUnrecognizedVMOptions --add-modules=ALL-SYSTEM -Dosgi.requiredJavaVersion=11 -Xms64m -Xmx1024m</vmArgs>
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 276af8802424..74a67e77e4f6 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,7 +1,7 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
 version=22.0.1
-revision=1
+revision=2
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
 hostmakedepends="apache-maven"

From aee4280221f840028bbdaa366cba3647ecb09651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 12 Apr 2022 00:00:38 -0300
Subject: [PATCH 1222/1686] iperf: update to 2.1.7.

---
 .../iperf/patches/fix-gettcpinfo-musl.patch   | 20 -------------
 .../patches/reorder-includes-for-musl.patch   | 28 -------------------
 srcpkgs/iperf/template                        | 12 ++++++--
 3 files changed, 10 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
 delete mode 100644 srcpkgs/iperf/patches/reorder-includes-for-musl.patch

diff --git a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch b/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
deleted file mode 100644
index 71d8abf70585..000000000000
--- a/srcpkgs/iperf/patches/fix-gettcpinfo-musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-It seems there was a broken commit meant to fix compilation on win32,
-but this broke compilation on musl.
-
-See:
-
-https://sourceforge.net/p/iperf2/code/ci/c8f861a0a07b0606a581f2658c71959ad9417923/
-
-for the broken commit. The current patch fixes that by completing the
-definition of gettcpinfo() to what it was before the broken commit.
-
---- a/compat/gettcpinfo.c	2021-12-05 17:49:56.000000000 -0300
-+++ b/compat/gettcpinfo.c	2021-12-11 19:29:24.850947483 -0300
-@@ -99,4 +99,7 @@
- };
- #else
- inline void gettcpinfo (int sock, struct ReportStruct *sample) {
-+    sample->tcpstats.rtt = 1;
-+    sample->tcpstats.isValid  = false;
-+};
- #endif
diff --git a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch b/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
deleted file mode 100644
index 066620c8666c..000000000000
--- a/srcpkgs/iperf/patches/reorder-includes-for-musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Change order of includes to fix compilation with musl libc
-
---- a/include/headers.h	2021-08-16 14:27:51.000000000 -0300
-+++ b/include/headers.h	2021-10-01 23:42:09.471528972 -0300
-@@ -106,11 +106,6 @@
- #include <net/if.h>
- #endif
- 
--#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
--#include <linux/if_tun.h>
--#include <sys/ioctl.h>
--#endif
--
- 
- // AF_PACKET HEADERS
- #if defined(HAVE_LINUX_FILTER_H) && defined(HAVE_AF_PACKET)
-@@ -146,6 +141,11 @@
- #define  IPV6HDRLEN 40
- #endif // HAVE_AF_PACKET
- 
-+#if ((HAVE_TUNTAP_TAP) || (HAVE_TUNTAP_TUN))
-+#include <linux/if_tun.h>
-+#include <sys/ioctl.h>
-+#endif
-+
- #ifdef WIN32
- 
- /* Windows config file */
diff --git a/srcpkgs/iperf/template b/srcpkgs/iperf/template
index 555b5670914f..7157ebba77cd 100644
--- a/srcpkgs/iperf/template
+++ b/srcpkgs/iperf/template
@@ -1,6 +1,6 @@
 # Template file for 'iperf'
 pkgname=iperf
-version=2.1.6
+version=2.1.7
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-multicast --enable-threads
@@ -9,8 +9,16 @@ short_desc="Perform network throughput tests"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="NCSA"
 homepage="https://iperf.fr/"
+changelog="https://sourceforge.net/p/iperf2/code/ci/master/tree/doc/RELEASE_NOTES?format=raw"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}2/${pkgname}-${version}.tar.gz"
-checksum=4a43e44439b95622aebeee55754a17d1c94076032e90620dfc1ab9908cb9e080
+checksum=1aba2e1d7aa43641ef841951ed88e16cffba898460e0c51e6b2806f3ff20e9d4
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	# do not define struct ethhdr in <linux/if_ether.h> to avoid
+	# redefinition in <netinet/if_ether.h>
+	CFLAGS="-D__UAPI_DEF_ETHHDR=0"
+	CXXFLAGS="-D__UAPI_DEF_ETHHDR=0"
+fi
 
 post_install() {
 	vlicense COPYING LICENSE

From fd5b63dd7f1ecf9c3726f7c26a713062f69f6e70 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 12 Apr 2022 03:32:14 +0200
Subject: [PATCH 1223/1686] stagit: update to 1.1.

* take over maintainership
---
 srcpkgs/stagit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/stagit/template b/srcpkgs/stagit/template
index f5828d25ed5c..7e78e61ac80d 100644
--- a/srcpkgs/stagit/template
+++ b/srcpkgs/stagit/template
@@ -1,16 +1,16 @@
 # Template file for 'stagit'
 pkgname=stagit
-version=1.0
+version=1.1
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
 makedepends="libgit2-devel"
 short_desc="Static git page generator"
-maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="MIT"
 homepage="https://codemadness.org/git/stagit/log.html"
 distfiles="https://codemadness.org/releases/stagit/${pkgname}-${version}.tar.gz"
-checksum=10a0e31bb57d6da0dea84728cabed95b8f7d83fde13bb76e0ce18ef71ab68d8f
+checksum=66f6ad1be3d6b6455faf9cfdd29329644b7ff2aa3123fbf1375169c60bda75c5
 LDFLAGS="-lgit2"
 
 post_install() {

From 4928835aedc691120039fd56d222ccc03d9f5c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 11 Apr 2022 17:49:21 -0300
Subject: [PATCH 1224/1686] threejs-sage: make it available as a jupyter
 nbextension

Adds a symlink in /usr/share/jupyter/nbextensions, so that the js is
available in a jupyter notebook.

Otherwise, using 3d plots in the jupyter notebook will hit jsdelivr.net.
---
 srcpkgs/threejs-sage/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/threejs-sage/template b/srcpkgs/threejs-sage/template
index cb5c87a19c12..9cdb0fb3848d 100644
--- a/srcpkgs/threejs-sage/template
+++ b/srcpkgs/threejs-sage/template
@@ -1,7 +1,7 @@
 # Template file for 'threejs-sage'
 pkgname=threejs-sage
 version=r122
-revision=1
+revision=2
 short_desc="Custom build of three.js for sagemath"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
 license="MIT"
@@ -13,4 +13,8 @@ do_install() {
 	vlicense LICENSE
 	vinstall version 644 usr/share/sagemath/threejs-sage
 	vinstall build/three.min.js 644 usr/share/sagemath/threejs-sage/$version
+
+	# make threejs available as a jupyter notebook extension
+	vmkdir usr/share/jupyter/nbextensions
+	ln -s /usr/share/sagemath/threejs-sage ${DESTDIR}/usr/share/jupyter/nbextensions
 }

From 5ddcf0fc7792c37e4528685122af0b9d4ec6ece2 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Mon, 11 Apr 2022 22:30:18 +0400
Subject: [PATCH 1225/1686] libusb: update to 1.0.26.

---
 .../libusb/patches/late-transfer-free.patch   | 136 ------------------
 srcpkgs/libusb/template                       |   6 +-
 2 files changed, 3 insertions(+), 139 deletions(-)
 delete mode 100644 srcpkgs/libusb/patches/late-transfer-free.patch

diff --git a/srcpkgs/libusb/patches/late-transfer-free.patch b/srcpkgs/libusb/patches/late-transfer-free.patch
deleted file mode 100644
index f4d913bbbd84..000000000000
--- a/srcpkgs/libusb/patches/late-transfer-free.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 010691ff6fdf9fcfaa7f76c1417dfc1f7df124ca Mon Sep 17 00:00:00 2001
-From: Benjamin Berg <bberg@redhat.com>
-Date: Tue, 15 Feb 2022 11:13:41 +0100
-Subject: [PATCH] io: Track device in usbi_transfer
-
-transfer->dev_handle currently has the behaviour that it will be unset
-if the device is closed. The sync API uses this fact to catch an error
-case.
-
-In other cases, transfer->dev_handle will keep its value, which means
-that if the transfer lives longer than the device handle, the pointer
-becomes invalid.
-
-The transfer does however keep a reference to the device, which owns the
-pointer to the context. As such, we can track this reference internal to
-the transfer, and it is set while the transfer is in-flight.
-
-With this, switch the logging infrastructure to use itransfer->dev->ctx
-while checking that itransfer->dev is non-NULL.
-
-Note that this was a regression caused by 6cae9c6dbd74 ("core: update
-usbi_dbg to take the context as an argument"), specifically when
-resolving the context while freeing a transfer after closing a device.
-
-Note that the transfer will now keep a reference to the device until it
-is free'ed. This allows it to use the correct context for logging even
-in libusb_free_transfer.
-
-The alternative to all this would be to just explicitly pass NULL to the
-log handler in libusb_free_transfer.
-
-Closes: #1038
----
- libusb/io.c      | 20 ++++++++++++--------
- libusb/libusbi.h | 11 ++++++++---
- 2 files changed, 20 insertions(+), 11 deletions(-)
-
-diff --git a/libusb/io.c b/libusb/io.c
-index 0d2ac9ea..b919e9d9 100644
---- a/libusb/io.c
-+++ b/libusb/io.c
-@@ -1344,6 +1344,8 @@ void API_EXPORTED libusb_free_transfer(struct libusb_transfer *transfer)
- 
- 	itransfer = LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
- 	usbi_mutex_destroy(&itransfer->lock);
-+	if (itransfer->dev)
-+		libusb_unref_device(itransfer->dev);
- 
- 	priv_size = PTR_ALIGN(usbi_backend.transfer_priv_size);
- 	ptr = (unsigned char *)itransfer - priv_size;
-@@ -1489,9 +1491,15 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
- {
- 	struct usbi_transfer *itransfer =
- 		LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer);
--	struct libusb_context *ctx = TRANSFER_CTX(transfer);
-+	struct libusb_context *ctx;
- 	int r;
- 
-+	assert(transfer->dev_handle);
-+	if (itransfer->dev)
-+		libusb_unref_device(itransfer->dev);
-+	itransfer->dev = libusb_ref_device(transfer->dev_handle->dev);
-+
-+	ctx = HANDLE_CTX(transfer->dev_handle);
- 	usbi_dbg(ctx, "transfer %p", transfer);
- 
- 	/*
-@@ -1551,8 +1559,6 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer)
- 	r = usbi_backend.submit_transfer(itransfer);
- 	if (r == LIBUSB_SUCCESS) {
- 		itransfer->state_flags |= USBI_TRANSFER_IN_FLIGHT;
--		/* keep a reference to this device */
--		libusb_ref_device(transfer->dev_handle->dev);
- 	}
- 	usbi_mutex_unlock(&itransfer->lock);
- 
-@@ -1659,7 +1665,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
- {
- 	struct libusb_transfer *transfer =
- 		USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
--	struct libusb_device_handle *dev_handle = transfer->dev_handle;
- 	struct libusb_context *ctx = ITRANSFER_CTX(itransfer);
- 	uint8_t flags;
- 	int r;
-@@ -1693,7 +1698,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer,
- 	 * this point. */
- 	if (flags & LIBUSB_TRANSFER_FREE_TRANSFER)
- 		libusb_free_transfer(transfer);
--	libusb_unref_device(dev_handle->dev);
- 	return r;
- }
- 
-@@ -1727,10 +1731,10 @@ int usbi_handle_transfer_cancellation(struct usbi_transfer *itransfer)
-  * function will be called the next time an event handler runs. */
- void usbi_signal_transfer_completion(struct usbi_transfer *itransfer)
- {
--	libusb_device_handle *dev_handle = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)->dev_handle;
-+	struct libusb_device *dev = itransfer->dev;
- 
--	if (dev_handle) {
--		struct libusb_context *ctx = HANDLE_CTX(dev_handle);
-+	if (dev) {
-+		struct libusb_context *ctx = DEVICE_CTX(dev);
- 		unsigned int event_flags;
- 
- 		usbi_mutex_lock(&ctx->event_data_lock);
-diff --git a/libusb/libusbi.h b/libusb/libusbi.h
-index 158a9af5..7618236f 100644
---- a/libusb/libusbi.h
-+++ b/libusb/libusbi.h
-@@ -329,10 +329,11 @@ void usbi_log(struct libusb_context *ctx, enum libusb_log_level level,
- #endif /* ENABLE_LOGGING */
- 
- #define DEVICE_CTX(dev)		((dev)->ctx)
--#define HANDLE_CTX(handle)	(DEVICE_CTX((handle)->dev))
--#define TRANSFER_CTX(transfer)	(HANDLE_CTX((transfer)->dev_handle))
-+#define HANDLE_CTX(handle)	((handle) ? DEVICE_CTX((handle)->dev) : NULL)
- #define ITRANSFER_CTX(itransfer) \
--	(TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)))
-+	((itransfer)->dev ? DEVICE_CTX((itransfer)->dev) : NULL)
-+#define TRANSFER_CTX(transfer) \
-+	(ITRANSFER_CTX(LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer)))
- 
- #define IS_EPIN(ep)		(0 != ((ep) & LIBUSB_ENDPOINT_IN))
- #define IS_EPOUT(ep)		(!IS_EPIN(ep))
-@@ -562,6 +563,10 @@ struct usbi_transfer {
- 	uint32_t state_flags;   /* Protected by usbi_transfer->lock */
- 	uint32_t timeout_flags; /* Protected by the flying_stransfers_lock */
- 
-+	/* The device reference is held until destruction for logging
-+	 * even after dev_handle is set to NULL.  */
-+	struct libusb_device *dev;
-+
- 	/* this lock is held during libusb_submit_transfer() and
- 	 * libusb_cancel_transfer() (allowing the OS backend to prevent duplicate
- 	 * cancellation, submission-during-cancellation, etc). the OS backend
diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template
index 4f192264d4bc..ff718223a773 100644
--- a/srcpkgs/libusb/template
+++ b/srcpkgs/libusb/template
@@ -1,7 +1,7 @@
 # Template file for 'libusb'
 pkgname=libusb
-version=1.0.25
-revision=2
+version=1.0.26
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="eudev-libudev-devel"
@@ -11,7 +11,7 @@ license="LGPL-2.1-or-later"
 homepage="https://libusb.info"
 changelog="https://raw.githubusercontent.com/libusb/libusb/master/ChangeLog"
 distfiles="https://github.com/libusb/libusb/releases/download/v${version}/libusb-${version}.tar.bz2"
-checksum=8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849
+checksum=12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5
 
 libusb-devel_package() {
 	short_desc+=" - development files"

From 3e555b37fe11310b6f9364577befabe3f3cd9900 Mon Sep 17 00:00:00 2001
From: Benjamin Slade <slade@lambda-y.net>
Date: Mon, 11 Apr 2022 12:14:44 -0600
Subject: [PATCH 1226/1686] yad: update to 11.1

---
 srcpkgs/yad/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yad/template b/srcpkgs/yad/template
index 960ed74e8cc6..a9d75e6930e3 100644
--- a/srcpkgs/yad/template
+++ b/srcpkgs/yad/template
@@ -1,6 +1,6 @@
 # Template file for 'yad'
 pkgname=yad
-version=11.0
+version=11.1
 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=af20b5a7120ba303ca8845db62c9a7410ae5b5224a3eb3563cd70774a745b9f2
+checksum=ca61d422d6d464d7f473d1e5bd14d3ca05d311ef203f1c67bbea7c23bf0eae2f
 
 pre_configure() {
 	autoreconf -ivf

From a667c22c5b23c9f80bcdff13bddedb38cbd9f7ac Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sun, 10 Apr 2022 23:45:27 -0400
Subject: [PATCH 1227/1686] polybar: update to 3.6.2, adopt.

---
 srcpkgs/polybar/template | 44 +++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index 169724754f55..9a2021d35381 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -1,31 +1,33 @@
 # Template file for 'polybar'
 pkgname=polybar
-version=3.5.7
+version=3.6.2
 revision=1
 build_style=cmake
-configure_args="
- -DENABLE_ALSA=$(vopt_if alsa ON OFF)
- -DENABLE_CURL=$(vopt_if curl ON OFF)
- -DENABLE_I3=$(vopt_if i3 ON OFF)
- -DENABLE_MPD=$(vopt_if mpd ON OFF)
- -DENABLE_NETWORK=$(vopt_if network ON OFF)
- -DENABLE_PULSEAUDIO=$(vopt_if pulseaudio ON OFF)
- -DWITH_XCOMPOSITE=ON"
-hostmakedepends="pkg-config xcb-proto python3 python3-Sphinx"
+configure_args="-DBUILD_CONFIG=OFF -DBUILD_DOC_HTML=OFF
+ $(vopt_bool alsa ENABLE_ALSA)
+ $(vopt_bool curl ENABLE_CURL)
+ $(vopt_bool i3 ENABLE_I3)
+ $(vopt_bool mpd ENABLE_MPD)
+ $(vopt_bool network ENABLE_NETWORK)
+ $(vopt_bool pulseaudio ENABLE_PULSEAUDIO)"
+hostmakedepends="pkg-config xcb-proto python3 python3-Sphinx python3-packaging"
 makedepends="cairo-devel xcb-util-image-devel xcb-util-wm-devel xcb-util-xrm-devel
- zlib-devel xcb-util-renderutil-devel xcb-util-cursor-devel libxcb-devel
+ zlib-devel xcb-util-renderutil-devel xcb-util-cursor-devel libxcb-devel libuv-devel
  $(vopt_if alsa "alsa-lib-devel")
  $(vopt_if curl "libcurl-devel")
  $(vopt_if i3 "i3-devel jsoncpp-devel")
  $(vopt_if mpd "libmpdclient-devel")
- $(vopt_if network "wireless_tools-devel")
+ $(vopt_if network "libnl3-devel")
  $(vopt_if pulseaudio "pulseaudio-devel")"
 short_desc="Fast and easy-to-use status bar"
-maintainer="Michael Carlberg <c@rlberg.se>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="MIT"
 homepage="https://github.com/polybar/polybar"
-distfiles="${homepage}/releases/download/${version}/polybar-${version}.tar.gz"
-checksum=73210e6d74217acb953b253990b4302343b7b6a7870fe1da9a1855daa44123db
+changelog="https://raw.githubusercontent.com/polybar/polybar/master/CHANGELOG.md"
+distfiles="https://github.com/polybar/polybar/releases/download/${version}/polybar-${version}.tar.gz"
+checksum=73becc942e7d2418bc72bd194f2037a2a86792219fd561b663a8509fd5f547a0
+# tries to download and build unstable/unreleased googletest during configure
+make_check=no
 
 build_options="alsa curl i3 mpd network pulseaudio"
 build_options_default="$build_options"
@@ -35,21 +37,13 @@ desc_option_i3="Enable support for i3"
 desc_option_mpd="Enable support for MPD"
 desc_option_network="Enable support for network"
 
-CXXFLAGS="-Wno-error=deprecated-declarations"
-
-if [ "$build_option_network" ]; then
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl) CXXFLAGS+=" -D_LINUX_IF_ETHER_H" ;;
-	esac
-fi
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES='-latomic'"
 fi
 
 post_install() {
-	rm -rf ${DESTDIR}/usr/share/doc/polybar
-	vdoc config
+	rm -r ${DESTDIR}/usr/share/doc/polybar
+	vsconf doc/config.ini
 	vlicense LICENSE
 }

From 040aa7a7bac176c934fc13161aba4664fb659d84 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 00:54:09 +0200
Subject: [PATCH 1228/1686] botan: update to 2.19.1.

drop update file as botan does semver for a long time now

Closes: #34285
Closes: #36646
---
 common/shlibs          |  2 +-
 srcpkgs/botan/template | 10 ++++------
 srcpkgs/botan/update   |  1 -
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 0ac24701898d..fc5a031056fc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2897,7 +2897,7 @@ libKDb3.so.4 kdb-3.1.0_1
 libKPropertyWidgets3.so.4 kproperty-3.1.0_1
 libKPropertyCore3.so.4 kproperty-3.1.0_1
 libKReport3.so.4 kreport-3.1.0_1
-libbotan-2.so.16 botan-2.16.0_3
+libbotan-2.so.19 botan-2.19.1_1
 libswipl.so.8 swi-prolog-8.2.4_2
 libpcre2-16.so.0 libpcre2-10.22_1
 libpcre2-32.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 282bceabd3ce..65a626714fdf 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,10 +1,9 @@
 # Template file for 'botan'
 pkgname=botan
-version=2.16.0
-revision=4
+version=2.19.1
+revision=1
 wrksrc="${pkgname^}-${version}"
 build_style=gnu-makefile
-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++"
@@ -12,11 +11,10 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://botan.randombit.net/"
 distfiles="https://botan.randombit.net/releases/Botan-${version}.tar.xz"
-checksum=92ed6ebc918d86bd1b04221ca518af4cf29cc326c4760740bd2d22e61cea2628
+checksum=e26e00cfefda64082afdd540d3c537924f645d6a674afed2cd171005deff5560
 python_version=3
 
 LDFLAGS="-pthread"
-CXXFLAGS="-O3"
 
 do_configure() {
 	local _args _cpu
@@ -78,7 +76,7 @@ do_configure() {
 }
 
 do_check() {
-	./botan-test
+	make check
 }
 
 post_install() {
diff --git a/srcpkgs/botan/update b/srcpkgs/botan/update
index 04f08c11ede7..e69de29bb2d1 100644
--- a/srcpkgs/botan/update
+++ b/srcpkgs/botan/update
@@ -1 +0,0 @@
-pattern='\K[0-9]+\.[0-9]*[02468]\.[0-9]+'

From def9ac9773d6e0facb60c4d6a898e4f8a8f0dee9 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 00:55:52 +0200
Subject: [PATCH 1229/1686] corectrl: update to 1.2.3.

---
 srcpkgs/corectrl/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index 513afe8b595a..ad16c9a8de76 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,6 +1,6 @@
 # Template file for 'corectrl'
 pkgname=corectrl
-version=1.2.2
+version=1.2.3
 revision=1
 wrksrc=${pkgname}-v${version}
 build_style=cmake
@@ -15,7 +15,7 @@ maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.com/corectrl/corectrl"
 distfiles="${homepage}/-/archive/v${version}/corectrl-v${version}.tar.gz"
-checksum=ecfbdb3d99974a64fe6fab90f4bb543154ddc7004eeac14ef65b4ae6e661ca57
+checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From a760d95112642d152140d3786b6351a250f5218d Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 12 Apr 2022 09:53:48 +0200
Subject: [PATCH 1230/1686] qownnotes: update to 22.4.0.

---
 srcpkgs/qownnotes/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qownnotes/template b/srcpkgs/qownnotes/template
index b55900e3023a..db79662ba4bf 100644
--- a/srcpkgs/qownnotes/template
+++ b/srcpkgs/qownnotes/template
@@ -1,6 +1,6 @@
 # Template file for 'qownnotes'
 pkgname=qownnotes
-version=21.12.3
+version=22.4.0
 revision=1
 build_style=qmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
@@ -13,8 +13,8 @@ license="GPL-2.0-only"
 homepage="https://www.qownnotes.org"
 changelog="https://www.qownnotes.org/changelog.html"
 distfiles="https://download.tuxfamily.org/${pkgname}/src/${pkgname}-${version}.tar.xz"
-checksum=a92df38f9c88f381af77800c339fe6aa8196a7a260081b0a48f61f1ae4c28029
+checksum=96b682608ecdf303e2c5d5eb2341812db3c3848e15bc4832ba5d426f01bdbd66
 
 pre_build() {
-	sed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
+	vsed -i '5i USE_SYSTEM_BOTAN = 1' libraries/botan/botan.pri
 }

From ebb3b3f4813ec69fe5f5070f591979a9121f38cc Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Mon, 21 Mar 2022 11:18:31 +0000
Subject: [PATCH 1231/1686] libluv: update to 1.43.0.0.

---
 srcpkgs/libluv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index ac7ef54a6ffa..191d877e10fa 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -1,6 +1,6 @@
 # Template file for 'libluv'
 pkgname=libluv
-version=1.41.0.0
+version=1.43.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="4018f293d71c2d75757b64fcdacf982729c9dc8b0bf8eda4015a8818a5a29321
+checksum="567a6f3dcdcf8a9b54ddc57ffef89d1e950d72832b85ee81c8c83a9d4e0e9de2
  be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
 skip_extraction="libluv.pc.in"
 

From e1ed1d339fdf3d19eca2ef2f803b069be2a471c5 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 23 Mar 2022 17:04:42 +0100
Subject: [PATCH 1232/1686] corectrl: add missing glxinfo dependency

and simplify libatomic handling

By Piraty: distilled from the PR

Closes: #36298 [via git-merge-pr]
---
 srcpkgs/corectrl/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/corectrl/template b/srcpkgs/corectrl/template
index ad16c9a8de76..0cfa3f792982 100644
--- a/srcpkgs/corectrl/template
+++ b/srcpkgs/corectrl/template
@@ -1,7 +1,7 @@
 # Template file for 'corectrl'
 pkgname=corectrl
 version=1.2.3
-revision=1
+revision=2
 wrksrc=${pkgname}-v${version}
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config extra-cmake-modules qt5-host-tools qt5-qmake
 kcoreaddons kauth"
 makedepends="botan-devel kauth-devel karchive-devel qt5-charts-devel
 qt5-tools-devel libdrm-devel qt5-svg-devel"
-depends="dbus hicolor-icon-theme qt5-quickcontrols2 qt5-svg"
+depends="dbus hicolor-icon-theme qt5-quickcontrols2 qt5-svg glxinfo"
 short_desc="User-friendly hardware control application"
 maintainer="Lorem <notloremipsum@protonmail.com>"
 license="GPL-3.0-or-later"
@@ -19,6 +19,5 @@ checksum=6b8817ce1bb09257148e6d3f6196546724a8ea185fedfff70f302621ce36cc12
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
-	LDFLAGS+=" -latomic"
-	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	LIBS="-latomic"
 fi

From 4e73cc0b3d1c1394442e21082352e0c5b2b9638d Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Tue, 12 Apr 2022 21:07:51 +0200
Subject: [PATCH 1233/1686] vscode: update to 1.66.2

---
 srcpkgs/vscode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template
index 3e3956fa5644..6d3b3d72d00c 100644
--- a/srcpkgs/vscode/template
+++ b/srcpkgs/vscode/template
@@ -1,6 +1,6 @@
 # Template file for 'vscode'
 pkgname=vscode
-version=1.66.1
+version=1.66.2
 revision=1
 _electronver=13.6.7
 _npmver=8.6.0
@@ -12,7 +12,7 @@ maintainer="shizonic <realtiaz@gmail.com>, Alex Lohr <alex.lohr@logmein.com>"
 license="MIT"
 homepage="https://code.visualstudio.com/"
 distfiles="https://github.com/Microsoft/vscode/archive/refs/tags/${version}.tar.gz"
-checksum=243a25d7214ceba5abf510dc890c64a8cc36ccacd97f4b8c666b8b7bab9c5a28
+checksum=1b70f202b570763e85f67abd8693eeb9c88c6a066a4b579aca5c0c42ecb1b47f
 nocross=yes # x64 build does not cut it, it contains native code
 
 if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then

From 65d505f055bc7ef1f1c2e62e73ae66617979fb4d Mon Sep 17 00:00:00 2001
From: vikigenius <master.bvik@gmail.com>
Date: Tue, 12 Apr 2022 10:56:58 -0400
Subject: [PATCH 1234/1686] zola: update to 0.15.3

---
 srcpkgs/zola/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index dcf2a8701cff..460a4b9e4830 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -1,6 +1,6 @@
 # Template file for 'zola'
 pkgname=zola
-version=0.15.2
+version=0.15.3
 revision=1
 build_style=cargo
 hostmakedepends="pkg-config"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/getzola/zola"
 changelog="https://raw.githubusercontent.com/getzola/zola/master/CHANGELOG.md"
 distfiles="https://github.com/getzola/zola/archive/v${version}.tar.gz"
-checksum=9f6b1527e728cef3536e42a18fbc06647b388fb34fc07cc7aca82e44f4fa3447
+checksum=89a590549249e60a01f1a1f66ee23fedc711afd4e9a669ee1328e5c99ea958c8
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From 20817a15ed45b1aef2337524dc05c166db738026 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:32:51 +0300
Subject: [PATCH 1235/1686] python3-click-log: fix tests.

---
 srcpkgs/python3-click-log/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-click-log/template b/srcpkgs/python3-click-log/template
index 6f966c248fc9..07f1c5b0eba5 100644
--- a/srcpkgs/python3-click-log/template
+++ b/srcpkgs/python3-click-log/template
@@ -6,6 +6,7 @@ wrksrc="click-log-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Logging integration for Click (Python3)"
 maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="MIT"

From f7597fd84a5caee3866c743c6c430844f06e2eb4 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:33:13 +0300
Subject: [PATCH 1236/1686] python3-click-plugins: fix tests.

---
 srcpkgs/python3-click-plugins/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-click-plugins/template b/srcpkgs/python3-click-plugins/template
index 142900633bb6..3fffc0e849fc 100644
--- a/srcpkgs/python3-click-plugins/template
+++ b/srcpkgs/python3-click-plugins/template
@@ -4,9 +4,9 @@ version=1.1.1
 revision=4
 wrksrc="click-plugins-${version}"
 build_style=python3-module
-pycompile_module="click-plugins"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Python3-click module extension to register CLI commands"
 maintainer="Alex Childs <misuchiru03+void@gmail.com>"
 license="BSD-2-Clause"

From 61b26784c0ec24ea5e275c4090d3f7e5fcf788bf Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:33:43 +0300
Subject: [PATCH 1237/1686] python3-click-repl: disable tests.

---
 srcpkgs/python3-click-repl/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/python3-click-repl/template b/srcpkgs/python3-click-repl/template
index b5cf6e495fcb..d4c78ba72332 100644
--- a/srcpkgs/python3-click-repl/template
+++ b/srcpkgs/python3-click-repl/template
@@ -12,6 +12,8 @@ license="MIT"
 homepage="https://github.com/click-contrib/click-repl"
 distfiles="${PYPI_SITE}/c/click-repl/click-repl-${version}.tar.gz"
 checksum=b9f29d52abc4d6059f8e276132a111ab8d94980afe6a5432b9d996544afa95d5
+# The tarball from PyPI has no tests.
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 36bb6bfb91bca0ad3fd2c16bd4a6946d071866a8 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:35:14 +0300
Subject: [PATCH 1238/1686] python3-click-threading: fix tests.

---
 srcpkgs/python3-click-threading/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-click-threading/template b/srcpkgs/python3-click-threading/template
index b639065db3d6..66bd90de3fd8 100644
--- a/srcpkgs/python3-click-threading/template
+++ b/srcpkgs/python3-click-threading/template
@@ -6,6 +6,7 @@ wrksrc="click-threading-${version}"
 build_style="python3-module"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Multithreaded Click apps made easy (Python3)"
 maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
 license="MIT"

From a342199c85810400423fe1a8fe144b4a7af822d1 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 19:35:25 +0300
Subject: [PATCH 1239/1686] python3-userpath: fix tests.

---
 srcpkgs/python3-userpath/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python3-userpath/template b/srcpkgs/python3-userpath/template
index b557bc2528af..8fc30c9a52f5 100644
--- a/srcpkgs/python3-userpath/template
+++ b/srcpkgs/python3-userpath/template
@@ -4,9 +4,9 @@ version=1.7.0
 revision=2
 wrksrc="userpath-${version}"
 build_style=python3-module
-pycompile_module="userpath"
 hostmakedepends="python3-setuptools"
 depends="python3-click"
+checkdepends="$depends python3-pytest"
 short_desc="Cross-platform tool for adding locations to the user PATH"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT, Apache-2.0"

From fe36934c77554fca6bbcc7dae71e4ef2baf75555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 13 Apr 2022 20:57:27 +0200
Subject: [PATCH 1240/1686] subversion: update to 1.14.2.

---
 srcpkgs/subversion/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index acf378142fd8..8ad178264942 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -3,8 +3,8 @@
 # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion-kwallet-auth".
 #
 pkgname=subversion
-version=1.14.1
-revision=3
+version=1.14.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-javahl --disable-static --config-cache
  --with-gnome-keyring --with-editor=vi --disable-mod-activation
@@ -21,7 +21,7 @@ license="Apache-2.0, BSD-3-Clause"
 homepage="http://subversion.apache.org/"
 changelog="https://subversion.apache.org/docs/release-notes/${version%.*}.html"
 distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
-checksum=2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9
+checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
 
 pre_configure() {
 	# Based on native build values

From d46e2f046c7a42228c6d2374c8ccf70cc102b4ca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 12:52:43 +0200
Subject: [PATCH 1241/1686] gucci: update to 1.5.4.

---
 srcpkgs/gucci/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index a4d816647e74..37773ceba896 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -1,6 +1,6 @@
 # Template file for 'gucci'
 pkgname=gucci
-version=1.5.3
+version=1.5.4
 revision=1
 build_style=go
 go_import_path="github.com/noqcks/gucci"
@@ -10,8 +10,8 @@ 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=f52c12fbf566d42e666618d24258488eac6035a76369c2db4b741fed8792de76
+distfiles="https://github.com/noqcks/gucci/archive/refs/tags/${version}.tar.gz"
+checksum=c6e30e088c341eb6988e2b50fc477deef81882d8a517e130a8eef22c81f32823
 
 post_install() {
 	vlicense LICENSE

From 2032d7bda3b9c0b951b6e25b22c88d2a7f179c9a Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 27 Mar 2022 12:30:11 +0300
Subject: [PATCH 1242/1686] rssguard: update to 4.2.1.

Also:
- change build_style to cmake (upstream),
- adjust dependencies.
---
 srcpkgs/rssguard/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/rssguard/template b/srcpkgs/rssguard/template
index f34e58087176..300f07694c43 100644
--- a/srcpkgs/rssguard/template
+++ b/srcpkgs/rssguard/template
@@ -1,18 +1,20 @@
 # Template file for 'rssguard'
 pkgname=rssguard
-version=4.1.2
+version=4.2.1
 revision=1
-build_style=qmake
-configure_args="CONFIG+=release LRELEASE_EXECUTABLE=lrelease-qt5 USE_WEBENGINE=false"
-hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-tools-devel kdeclarative-devel qt5-multimedia-devel"
+build_style=cmake
+configure_args="-DUSE_WEBENGINE="false""
+hostmakedepends="qt5-host-tools qt5-qmake"
+makedepends="qt5-tools-devel qt5-devel kdeclarative-devel qt5-multimedia-devel
+ qt5-plugin-sqlite qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-mysql
+ qt5-plugin-tds"
 depends="desktop-file-utils qt5-plugin-sqlite"
 short_desc="Simple (yet powerful) Qt5 feed reader"
 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=3e9c6b25cad846aa2047f737d961fe007c88873d9e9772ec8e238908c6f8df95
+checksum=b404e3d8310c58ffb337bf1d2eb2c7cc10a692b00ed2666af30bd0153413cc05
 
 post_install() {
 	# Install rssguard icon manually

From 8cad24b0103c23c65db3ffd9636b2636d25838fb Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 13 Apr 2022 17:43:00 +0200
Subject: [PATCH 1243/1686] setxkbmap: update to 1.3.3.

---
 srcpkgs/setxkbmap/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/setxkbmap/template b/srcpkgs/setxkbmap/template
index 9fafe9eb721d..02a6f5de2452 100644
--- a/srcpkgs/setxkbmap/template
+++ b/srcpkgs/setxkbmap/template
@@ -1,16 +1,16 @@
 # Template file for 'setxkbmap'
 pkgname=setxkbmap
-version=1.3.2
+version=1.3.3
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
-makedepends="libX11-devel libxkbfile-devel"
+makedepends="libX11-devel libxkbfile-devel libXrandr-devel"
 short_desc="Set the keyboard map using the X Keyboard Extension"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/setxkbmap-${version}.tar.bz2"
-checksum=8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5
+homepage="https://gitlab.freedesktop.org/xorg/app/setxkbmap"
+distfiles="${XORG_SITE}/app/setxkbmap-${version}.tar.xz"
+checksum=b560c678da6930a0da267304fa3a41cc5df39a96a5e23d06f14984c87b6f587b
 
 post_install() {
 	vlicense COPYING

From 6b33e3644220f84194adbbfe14ec3ebe97b25e61 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 3 Apr 2022 16:14:08 +0200
Subject: [PATCH 1244/1686] font-cozette: update to 1.13.0

---
 srcpkgs/font-cozette/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-cozette/template b/srcpkgs/font-cozette/template
index 7a2e57669380..ad6b3acd0d12 100644
--- a/srcpkgs/font-cozette/template
+++ b/srcpkgs/font-cozette/template
@@ -1,7 +1,7 @@
 # Template file for 'font-cozette'
 pkgname=font-cozette
-version=1.11.3
-revision=2
+version=1.13.0
+revision=1
 create_wrksrc=yes
 hostmakedepends="font-util bdftopcf"
 depends="font-util"
@@ -9,8 +9,9 @@ short_desc="Bitmap programming font optimized for coziness"
 maintainer="Isaac Freund <ifreund@ifreund.xyz>"
 license="MIT"
 homepage="https://github.com/slavfox/Cozette"
+changelog="https://github.com/slavfox/Cozette/raw/master/CHANGELOG.md"
 distfiles="https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"
-checksum=0976f61ba68b3a261568819bce0b89d43ae2892ad51e5da399dab8a5894cbbc8
+checksum=11590b29856d9ffb2dc6c606009168ea87a3ecde7bcbe9fe542bc34b406c868d
 font_dirs="/usr/share/fonts/misc /usr/share/fonts/TTF"
 
 do_install() {

From a0c2a9e63c0b62d8503027fafbefe7f5ebdb4b64 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 13 Apr 2022 17:38:50 +0200
Subject: [PATCH 1245/1686] cocogitto: update to 5.1.0

---
 srcpkgs/cocogitto/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cocogitto/template b/srcpkgs/cocogitto/template
index 79a78e4b5971..b20e575819ad 100644
--- a/srcpkgs/cocogitto/template
+++ b/srcpkgs/cocogitto/template
@@ -1,6 +1,6 @@
 # Template file for 'cocogitto'
 pkgname=cocogitto
-version=5.0.1
+version=5.1.0
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/cocogitto/cocogitto"
 changelog="https://github.com/cocogitto/cocogitto/blob/main/CHANGELOG.md"
 distfiles="https://github.com/cocogitto/cocogitto/archive/${version}.tar.gz"
-checksum=fee00736ec4b8ce72c8d8f904d0b734372b11ce7c3711166814eca38bf0cda8f
+checksum=662bb909c6468124ad19a90bc07a4f24345167486bd19542375ead7a8f20de02
 # Test suite is not atomic, relies on user environment such as git user configuration
 make_check=no
 

From 4e4c9be4679985a9f0b111ca02d7a9a6f974efdc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 13 Apr 2022 17:45:30 +0200
Subject: [PATCH 1246/1686] zellij: update to 0.28.1

---
 srcpkgs/zellij/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template
index 911ba18464eb..20a338d9103e 100644
--- a/srcpkgs/zellij/template
+++ b/srcpkgs/zellij/template
@@ -1,7 +1,7 @@
 # Template file for 'zellij'
 pkgname=zellij
-version=0.27.0
-revision=2
+version=0.28.1
+revision=1
 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86
 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset
 archs="x86_64* aarch64* i686*"
@@ -15,7 +15,7 @@ license="MIT"
 homepage="https://zellij.dev"
 changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md"
 distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz"
-checksum=6159482c25d3cb55b04d23230812f4450e88ff0975161594297a7deef8979a38
+checksum=8c9495e70b1c0179200d6137dd892776c7153b0b54115edf0f39fd732bb62efe
 
 post_build() {
 	ZELLIJ="target/${RUST_TARGET}/release/zellij"

From 57d863a5e1e6c21f3e08d1a45564f855e2d15b7c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 13 Apr 2022 21:12:54 +0200
Subject: [PATCH 1247/1686] github-cli: update to 2.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 e4ed029ac23b..35576bf8ee82 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,6 +1,6 @@
 # Template file for 'github-cli'
 pkgname=github-cli
-version=2.5.2
+version=2.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=cbf22fea4574047ca3a356ee4ef629d62b872f4c4ff4e4b78fe4f89ca431858e
+checksum=d4aed3f4325bc518cf4af6fc7989ab35b498e42e8f97ba0e6bb07d7e3b14886a
 
 pre_build() {
 	local _date

From bee6d83b0e80f0195b448ef2bedee05ac8315aea Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Wed, 13 Apr 2022 15:30:35 -0400
Subject: [PATCH 1248/1686] btop: update to 1.2.6.

---
 srcpkgs/btop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/btop/template b/srcpkgs/btop/template
index 4b2064c29e40..3667b71a317a 100644
--- a/srcpkgs/btop/template
+++ b/srcpkgs/btop/template
@@ -1,6 +1,6 @@
 # Template file for 'btop'
 pkgname=btop
-version=1.2.5
+version=1.2.6
 revision=1
 build_style=gnu-makefile
 short_desc="Monitor of resources"
@@ -9,4 +9,4 @@ license="Apache-2.0"
 homepage="https://github.com/aristocratos/btop"
 changelog="https://raw.githubusercontent.com/aristocratos/btop/main/CHANGELOG.md"
 distfiles="https://github.com/aristocratos/btop/archive/refs/tags/v${version}.tar.gz"
-checksum=93ff23276f2c626282037766542543dad5964fb6117c7902c4a4899607f8c95f
+checksum=3631f39c847c884064dd0babf34487a3b8b87a9d61d89aa5185418ffdc4741d8

From 693bdd114546c25412cb98420cd4550cf65d6b7d Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 13 Apr 2022 10:32:50 +0200
Subject: [PATCH 1249/1686] mutt: update to 2.2.3.

---
 srcpkgs/mutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index 6c0f0d04798b..4c65fcdec66b 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,6 +1,6 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=2.2.2
+version=2.2.3
 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=10de870cf37646c0b3f5bcf579c3cc2fd9285bda1d04be9ad7c33ec2ee820fcc
+checksum=978addcdab454f447ed7d1de84b5767e714c30714285bf82e4a1745071d18d89
 
 post_install() {
 	# provided by mime-types

From 810ac6f70e285015e7347eeeb2c650e7c3bbf780 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 13 Apr 2022 20:58:41 +0200
Subject: [PATCH 1250/1686] links: update to 2.26

---
 srcpkgs/links/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index 554ef120c0b5..b1b4d5d6629b 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,6 +1,6 @@
 # Template file for 'links'
 pkgname=links
-version=2.25
+version=2.26
 revision=1
 build_style=gnu-configure
 configure_args="--with-ssl --enable-graphics"
@@ -11,7 +11,7 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c
+checksum=f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb
 
 post_install() {
 	mkdir -p ${DESTDIR}/usr/share/doc/

From 1df18abaf81ed73a04ea87f780a83035cbfe3144 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Wed, 13 Apr 2022 20:59:13 +0200
Subject: [PATCH 1251/1686] links-x11: update to 2.26

---
 srcpkgs/links-x11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 6e37599354ab..83708d05a3cf 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,6 +1,6 @@
 # Template file for 'links-x11'
 pkgname=links-x11
-version=2.25
+version=2.26
 revision=1
 wrksrc="${pkgname%-x11}-${version}"
 build_style=gnu-configure
@@ -13,7 +13,7 @@ maintainer="newbluemoon <blaumolch@mailbox.org>"
 license="GPL-2.0-or-later"
 homepage="http://links.twibright.com/"
 distfiles="http://links.twibright.com/download/links-${version}.tar.bz2"
-checksum=2dd78508698e8279ef4f09a3a2a21e9595040113402da6c553974414fb49dd2c
+checksum=f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb
 conflicts="links"
 
 post_install() {

From d5ec2a027c740ca2fcb80932d448099619c128db Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:45:24 +0200
Subject: [PATCH 1252/1686] ocaml: update to 4.14.0.

---
 srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch | 16 ++++++++--------
 srcpkgs/ocaml/template                           |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
index 333276741c7d..a26f6a639e18 100644
--- a/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
+++ b/srcpkgs/ocaml/patches/ocaml-4.08.0-ppc-pie.patch
@@ -18,25 +18,25 @@
          .globl  caml_system__frametable
          .type   caml_system__frametable, @object
  caml_system__frametable:
---- ocaml-4.11.0/configure.ac
-+++ ocaml-4.11.0/configure.ac
+--- ocaml-4.14.0/configure.ac
++++ ocaml-4.14.0/configure.ac
 @@ -1006,7 +1006,7 @@ AS_IF([test $arch != "none" && $arch64 ],
  # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
  
  AS_CASE([$arch],
--  [amd64|s390x|none],
-+  [amd64|s390x|power|none],
+-  [amd64|arm64|s390x|none],
++  [amd64|arm64|s390x|power|none],
      # ocamlopt generates PIC code or doesn't generate code at all
      [],
    [AS_CASE([$host],
---- ocaml-4.11.0/configure
-+++ ocaml-4.11.0/configure
+--- ocaml-4.14.0/configure
++++ ocaml-4.14.0/configure
 @@ -13886,7 +13886,7 @@
  # e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.
  
  case $arch in #(
--  amd64|s390x|none) :
-+  amd64|s390x|power|none) :
+-  amd64|arm64|s390x|none) :
++  amd64|arm64|s390x|power|none) :
      # ocamlopt generates PIC code or doesn't generate code at all
       ;; #(
    *) :
diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template
index 629c13791dfe..7de25d70b827 100644
--- a/srcpkgs/ocaml/template
+++ b/srcpkgs/ocaml/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml'
 pkgname=ocaml
-version=4.13.1
-revision=2
+version=4.14.0
+revision=1
 build_style="gnu-configure"
 configure_args="--with-pic --libdir=/usr/lib/ocaml"
 make_build_target="world.opt"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="QPL-1.0, LGPL-2.1-only"
 homepage="http://ocaml.org/"
 distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=194c7988cc1fd1c64f53f32f2f7551e5309e44d914d6efc7e2e4d002296aeac4
+checksum=39f44260382f28d1054c5f9d8bf4753cb7ad64027da792f7938344544da155e8
 nocross=yes
 
 export ASPP="cc -c"

From 37d7e5082b060d26c3219ae28a5e1df4d36da095 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:47:06 +0200
Subject: [PATCH 1253/1686] ocaml-findlib: update to 1.9.3.

---
 srcpkgs/ocaml-findlib/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 73cca5a2cafa..04be12e64f51 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
-version=1.9.1
-revision=3
+version=1.9.3
+revision=1
 wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
@@ -12,7 +12,7 @@ maintainer="John Regan <john@jrjrtech.com>"
 license="MIT"
 homepage="http://projects.camlcity.org/projects/findlib.html"
 distfiles="http://download.camlcity.org/download/findlib-${version}.tar.gz"
-checksum=2b42b8bd54488d64c4bf3cb7054b4b37bd30c1dc12bd431ea1e4d7ad8a980fe2
+checksum=c310fcb62838d9e50f0b6d6c5ceefcbe4fe056f72496950ae7d5c6cdaae2cc41
 nocross=yes
 nopie=yes
 disable_parallel_build=yes

From c8b21b7833b291993a55a396a252bb6013e2f645 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:48:00 +0200
Subject: [PATCH 1254/1686] ocaml-num: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocaml-num/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-num/template b/srcpkgs/ocaml-num/template
index bfce4e7baf91..739ffcf5d419 100644
--- a/srcpkgs/ocaml-num/template
+++ b/srcpkgs/ocaml-num/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-num'
 pkgname=ocaml-num
 version=1.4
-revision=3
+revision=4
 wrksrc="num-${version}"
 build_style=gnu-makefile
 make_install_target="findlib-install"

From 43e2dc03dc1ec6ea481524e7d6a89613eec17047 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:49:19 +0200
Subject: [PATCH 1255/1686] ocaml-zarith: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocaml-zarith/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-zarith/template b/srcpkgs/ocaml-zarith/template
index d6c12772723d..936b5cd3f607 100644
--- a/srcpkgs/ocaml-zarith/template
+++ b/srcpkgs/ocaml-zarith/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-zarith'
 pkgname=ocaml-zarith
 version=1.12
-revision=3
+revision=4
 wrksrc="Zarith-release-${version}"
 build_style=configure
 make_check_target="tests"

From 3cfcbe98c07609c1caa3f21c59aa28a850cc3bb2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:50:43 +0200
Subject: [PATCH 1256/1686] ocamlbuild: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocamlbuild/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ocamlbuild/template b/srcpkgs/ocamlbuild/template
index 077d5cc7f632..b1349909f784 100644
--- a/srcpkgs/ocamlbuild/template
+++ b/srcpkgs/ocamlbuild/template
@@ -1,7 +1,7 @@
 # Template file for 'ocamlbuild'
 pkgname=ocamlbuild
 version=0.14.1
-revision=1
+revision=2
 build_style=gnu-makefile
 make_build_args="PREFIX=/usr"
 make_install_args="PREFIX=/usr"
@@ -13,3 +13,5 @@ homepage="https://github.com/ocaml/ocamlbuild"
 distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
 checksum=4e1279ff0ef80c862eaa5207a77020d741e89ef94f0e4a92a37c4188dbf08256
 nocross=yes
+
+export CHECK_IF_PREINSTALLED=false

From 41aee4b2c765e17073f6a047a277b5ecb82bf582 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:51:59 +0200
Subject: [PATCH 1257/1686] ocaml-stdcompat: update to 18.

---
 srcpkgs/ocaml-stdcompat/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ocaml-stdcompat/template b/srcpkgs/ocaml-stdcompat/template
index 2035a9a2c4fa..65a0d6fbc78f 100644
--- a/srcpkgs/ocaml-stdcompat/template
+++ b/srcpkgs/ocaml-stdcompat/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-stdcompat'
 pkgname=ocaml-stdcompat
-version=16
-revision=2
+version=18
+revision=1
 wrksrc="stdcompat-${version}"
 build_style=gnu-configure
 configure_args="--libdir=/usr/lib/ocaml"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/thierry-martinez/stdcompat"
 distfiles="https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz"
-checksum=100152e25f138351cb265146cd8717fa9dbfbff54b48ce771e30a4e05fc1ec09
+checksum=483a8d526eb19709a1a3092fb8978302e3a9d3bb783d807fb9ee53d96c3ec607
 nocross=yes
 disable_parallel_build=yes
 

From 856bb89e79650603012e24fce6da3a99e68cd9d6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:13 +0200
Subject: [PATCH 1258/1686] hivex: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/hivex/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hivex/template b/srcpkgs/hivex/template
index 448c06ddc9fa..f6f12d1b70f3 100644
--- a/srcpkgs/hivex/template
+++ b/srcpkgs/hivex/template
@@ -1,7 +1,7 @@
 # Template file for 'hivex'
 pkgname=hivex
 version=1.3.21
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-ocaml" # currently ocaml is broken
 hostmakedepends="python3 perl ruby ocaml ocaml-findlib perl-IO-stringy"

From 7c9a0d7e1935fcf16898ad4467c31855c33fd0f4 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:32 +0200
Subject: [PATCH 1259/1686] opam: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/opam/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index 236a2f963b70..ca5c64092ac8 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -1,7 +1,7 @@
 # Template file for 'opam'
 pkgname=opam
 version=2.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/${pkgname}"
 make_build_args="lib-ext all"

From df885c62dbbb4913afee6c6f06ea4615a9ed3f43 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:53:52 +0200
Subject: [PATCH 1260/1686] ocaml-lablgtk2: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/ocaml-lablgtk2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-lablgtk2/template b/srcpkgs/ocaml-lablgtk2/template
index c835e6b19d5d..6ff864eb1720 100644
--- a/srcpkgs/ocaml-lablgtk2/template
+++ b/srcpkgs/ocaml-lablgtk2/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-lablgtk2'
 pkgname=ocaml-lablgtk2
 version=2.18.10
-revision=4
+revision=5
 wrksrc="lablgtk-${version}"
 build_style=gnu-configure
 configure_args="--without-glade --without-gnomeui --without-gtksourceview"

From b03989c1960dc2f68a1f0e24f915f55a247afe3d Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:12 +0200
Subject: [PATCH 1261/1686] pdfsandwich: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/pdfsandwich/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template
index f3603e064c90..82f2f934fdc1 100644
--- a/srcpkgs/pdfsandwich/template
+++ b/srcpkgs/pdfsandwich/template
@@ -1,7 +1,7 @@
 # Template file for 'pdfsandwich'
 pkgname=pdfsandwich
 version=0.1.7
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="ocaml perl"
 makedepends="ocaml"

From b579252558da36616770d63a3810b94f5beb3e07 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:17 +0200
Subject: [PATCH 1262/1686] supermin: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/supermin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/supermin/template b/srcpkgs/supermin/template
index 357fc3f255f8..5f80c3515b3d 100644
--- a/srcpkgs/supermin/template
+++ b/srcpkgs/supermin/template
@@ -1,7 +1,7 @@
 # Template file for 'supermin'
 pkgname=supermin
 version=5.2.2
-revision=1
+revision=2
 _release_series=5.2-stable
 build_style=gnu-configure
 hostmakedepends="ocaml ocaml-findlib pkg-config e2fsprogs cpio perl"

From 5ab7f08bab6f937aa4ad98ab4481e45340379c5b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 20:56:24 +0200
Subject: [PATCH 1263/1686] z3: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/z3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index 2d5bf7a80954..dea059c98d0c 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
 version=4.8.15
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"

From ff9136a4841117d3383b394b068f83c1c642400b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:01:53 +0200
Subject: [PATCH 1264/1686] coccinelle: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/coccinelle/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coccinelle/template b/srcpkgs/coccinelle/template
index 211c9bdb4394..709b45fd2f69 100644
--- a/srcpkgs/coccinelle/template
+++ b/srcpkgs/coccinelle/template
@@ -1,7 +1,7 @@
 # Template file for 'coccinelle'
 pkgname=coccinelle
 version=1.1.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--without-pdflatex --enable-release --enable-opt
  --with-python=/usr/bin/python3"

From 14e30704aead5b046068c7ee852569a998e89245 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:03:56 +0200
Subject: [PATCH 1265/1686] libguestfs: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/libguestfs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template
index 8d669017077e..c6c56f8142b7 100644
--- a/srcpkgs/libguestfs/template
+++ b/srcpkgs/libguestfs/template
@@ -1,7 +1,7 @@
 # Template file for 'libguestfs'
 pkgname=libguestfs
 version=1.48.0
-revision=1
+revision=2
 _version_short=${version%.*}
 build_style=gnu-configure
 make_install_args="INSTALLDIRS=vendor"

From 61a10cd4955a8220369d042a901c9306850c0702 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:04:56 +0200
Subject: [PATCH 1266/1686] unison: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/unison/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unison/template b/srcpkgs/unison/template
index 783573c120ea..97eb209e2e8c 100644
--- a/srcpkgs/unison/template
+++ b/srcpkgs/unison/template
@@ -1,7 +1,7 @@
 # Template file for 'unison'
 pkgname=unison
 version=2.52.0
-revision=1
+revision=2
 hostmakedepends="ocaml"
 short_desc="File-synchronization tool"
 maintainer="allan <mail@may.mooo.com>"

From d425d32a12892cebc1281f912775fd5570856401 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:08:51 +0200
Subject: [PATCH 1267/1686] camlp5: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/camlp5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 2d07ecc842b4..74e0809e16d1 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,7 +1,7 @@
 # Template file for 'camlp5'
 pkgname=camlp5
 version=8.00.03
-revision=1
+revision=2
 wrksrc="camlp5-rel${version}"
 build_style=configure
 configure_args="-mandir /usr/share/man"

From 6be264d2d8cdea9631fd4d81529437ad70de14a8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:12:31 +0200
Subject: [PATCH 1268/1686] dune: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/dune/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 178746cfc292..30c34cb44c00 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
 # Template file for 'dune'
 pkgname=dune
 version=3.0.3
-revision=1
+revision=2
 makedepends="ocaml"
 depends="ocaml"
 short_desc="Composable build system for OCaml"

From ba92a5434b08c7e08b9e6f3bfda470c5f6b27997 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:18:07 +0200
Subject: [PATCH 1269/1686] New package: ocaml-camlp-streams-5.0

---
 srcpkgs/ocaml-camlp-streams/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/ocaml-camlp-streams/template

diff --git a/srcpkgs/ocaml-camlp-streams/template b/srcpkgs/ocaml-camlp-streams/template
new file mode 100644
index 000000000000..ce728427d280
--- /dev/null
+++ b/srcpkgs/ocaml-camlp-streams/template
@@ -0,0 +1,22 @@
+# Template file for 'ocaml-camlp-streams'
+pkgname=ocaml-camlp-streams
+version=5.0
+revision=1
+wrksrc="camlp-streams-${version}"
+makedepends="ocaml dune"
+short_desc="Stream and Genlex libraries for use with Camlp4 and Camlp5"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="LGPL-2.1-only,OCaml-LGPL-linking-exception"
+homepage="https://github.com/ocaml/camlp-streams"
+distfiles="https://github.com/ocaml/camlp-streams/archive/v${version}.tar.gz"
+checksum=daa618bb57a876075a1801d9dcde7dee83635766185f565af913dff43ea4d226
+nocross=yes
+disable_parallel_build=yes
+
+do_build() {
+	dune build --display=short
+}
+do_install() {
+	dune install --prefix=/usr --destdir="$DESTDIR" \
+		--libdir=/usr/lib/ocaml --docdir=/usr/share/doc
+}

From 3b8a67704c3b37480bb1b91fa4f14bd3be608fac Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:36 +0200
Subject: [PATCH 1270/1686] camlp5: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/camlp5/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/camlp5/template b/srcpkgs/camlp5/template
index 74e0809e16d1..1118f618ba1f 100644
--- a/srcpkgs/camlp5/template
+++ b/srcpkgs/camlp5/template
@@ -1,11 +1,12 @@
 # Template file for 'camlp5'
 pkgname=camlp5
 version=8.00.03
-revision=2
+revision=3
 wrksrc="camlp5-rel${version}"
 build_style=configure
 configure_args="-mandir /usr/share/man"
 hostmakedepends="ocaml perl ocaml-findlib"
+makedepends="ocaml-camlp-streams"
 short_desc="OCaml preprocessor and pretty-printer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"

From df05ccda3562dfda0e7454f53542f8029d432b26 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:23:46 +0200
Subject: [PATCH 1271/1686] coq: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/coq/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/coq/template b/srcpkgs/coq/template
index fcfbc92cb2f6..5db6a99c5e5e 100644
--- a/srcpkgs/coq/template
+++ b/srcpkgs/coq/template
@@ -1,7 +1,7 @@
 # Template file for 'coq'
 pkgname=coq
 version=8.15.1
-revision=1
+revision=2
 hostmakedepends="camlp5 dune ocaml ocaml-findlib ocaml-num ocaml-zarith"
 short_desc="Proof assistant written in OCaml"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 22b8989d6c4498e47d4774a7cbd4f1913768ba02 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:30:50 +0200
Subject: [PATCH 1272/1686] mathcomp: rebuild for coq-8.15.1_2.

---
 srcpkgs/mathcomp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 5946de08e18b..9bdea51dcf48 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -1,7 +1,7 @@
 # Template file for 'mathcomp'
 pkgname=mathcomp
 version=1.14.0
-revision=1
+revision=2
 wrksrc="math-comp-mathcomp-${version}"
 build_wrksrc="mathcomp"
 build_style=gnu-makefile

From 3c6c6653c0812e65fc9dc22c57e8777042a0160c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 21:48:14 +0200
Subject: [PATCH 1273/1686] xen: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/xen/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index deb572fe8b9c..cca4b6211bec 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
 # Template file for 'xen'
 pkgname=xen
 version=4.14.1
-revision=5
+revision=6
 # grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
 _git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
 # TODO: arm / aarch64
@@ -10,8 +10,9 @@ build_style=gnu-configure
 configure_args="$(vopt_enable stubdom) --disable-systemd
  --with-system-seabios=/usr/share/seabios/bios.bin
  --with-sysconfig-leaf-dir=conf.d --with-rundir=/run"
-hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
- ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
+hostmakedepends="acpica-utils automake bin86 bison fig2dev flex gettext
+ ghostscript git ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar
+ texinfo wget"
 makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
  libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
  netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel

From c479cf8eff924bbbf0d8b2a73615edac744a10c2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 13 Apr 2022 22:03:19 +0200
Subject: [PATCH 1274/1686] zeroinstall: rebuild for ocaml-4.14.0_1.

---
 srcpkgs/zeroinstall/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index eb8e1ea24280..40d8740b1300 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -1,7 +1,7 @@
 # Template file for 'zeroinstall'
 pkgname=zeroinstall
 version=2.17
-revision=5
+revision=6
 wrksrc="0install-v${version}"
 build_style=gnu-makefile
 make_install_target="install_system"

From 4598b950e607198ea644a429ac9e37810a899aa8 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 14:27:09 +0200
Subject: [PATCH 1275/1686] opam: disable tests in ci.

---
 srcpkgs/opam/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/opam/template b/srcpkgs/opam/template
index ca5c64092ac8..dd27afd02a0d 100644
--- a/srcpkgs/opam/template
+++ b/srcpkgs/opam/template
@@ -17,6 +17,7 @@ distfiles="https://github.com/ocaml/${pkgname}/archive/${version}.tar.gz"
 checksum=735e717532f135064940fe3fef573acce6b1bbdc5e146470c2ac20fc8510a470
 nocross=yes
 disable_parallel_build=yes
+make_check=ci-skip # uses bwrap
 
 post_install() {
 	rm -rf ${DESTDIR}/usr/doc

From 47d61961a8f6add2ba8363b7abfca5c5212da36d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 11:59:21 -0400
Subject: [PATCH 1276/1686] python3-pyppmd: update to 0.18.2.

enable tests by ignoring/disabling pytest-benchmark
---
 srcpkgs/python3-pyppmd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
index 4034cde05478..a80c2a5f0382 100644
--- a/srcpkgs/python3-pyppmd/template
+++ b/srcpkgs/python3-pyppmd/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pyppmd'
 pkgname=python3-pyppmd
-version=0.17.3
+version=0.18.2
 revision=1
 wrksrc="pyppmd-${version}"
 build_style=python3-module
+make_check_args="--noconftest --ignore=tests/test_benchmark.py"
 hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest python3-py-cpuinfo python3-hypothesis"
 short_desc="Python interface for PPM variation H and I.2"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.0-or-later"
 homepage="https://github.com/miurahr/pyppmd"
 changelog="https://raw.githubusercontent.com/miurahr/pyppmd/main/Changelog.rst"
 distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
-checksum=05a4765833623d5cc1c9afc27d9b05fb64f0319711beffe0b44d9695eb1beb0a
-# testing requires unpackaged plugin pytest-benchmark
-make_check=no
+checksum=732b28ea25afa41a282c986178b29e60ea5ec2e2b67f66997af943f73d4673e0

From 6a2d22b8ea12f9d4ccf761a656991cdda6868df5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 11:59:34 -0400
Subject: [PATCH 1277/1686] python3-pyzstd: update to 0.15.2.

fix tests with custom do_check
---
 .../patches/support_pytest.patch              | 30 +++++++++++++++++++
 srcpkgs/python3-pyzstd/template               |  8 ++---
 2 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/python3-pyzstd/patches/support_pytest.patch

diff --git a/srcpkgs/python3-pyzstd/patches/support_pytest.patch b/srcpkgs/python3-pyzstd/patches/support_pytest.patch
new file mode 100644
index 000000000000..05ffa75fab5b
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/patches/support_pytest.patch
@@ -0,0 +1,30 @@
+From b7ff78fc31ea054339693d6bf835134b8b9fbaa3 Mon Sep 17 00:00:00 2001
+From: Ma Lin <malincns@163.com>
+Date: Tue, 12 Apr 2022 13:00:30 +0800
+Subject: [PATCH] unittests supports pytest
+
+<more-tests>
+---
+ tests/test_zstd.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/tests/test_zstd.py b/tests/test_zstd.py
+index 263a753..0d254b9 100644
+--- a/tests/test_zstd.py
++++ b/tests/test_zstd.py
+@@ -3231,9 +3231,6 @@ def cb(a,b,c,d):
+         compress_stream(io.BytesIO(b''), io.BytesIO(), callback=cb)
+         decompress_stream(io.BytesIO(b''), io.BytesIO(), callback=cb)
+ 
+-def test_main():
+-    unittest.main()
+-
+ # uncompressed size 130KB, more than a zstd block.
+ # with a frame epilogue, 4 bytes checksum.
+ TEST_DAT_130KB = (b'(\xb5/\xfd\xa4\x00\x08\x02\x00\xcc\x87\x03:\xaaYN4pf\xc8\xae\x06b\x02'
+@@ -4419,4 +4416,4 @@ def test_main():
+  b'\xb7\x99\x1b\xce\xc9\t*\x98\x97\xb43z\x01h\x9fu\xf1')
+ 
+ if __name__ == "__main__":
+-    test_main()
++    unittest.main()
diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
index 708b8a193d9b..c097aeb44a09 100644
--- a/srcpkgs/python3-pyzstd/template
+++ b/srcpkgs/python3-pyzstd/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pyzstd'
 pkgname=python3-pyzstd
-version=0.15.0
+version=0.15.2
 revision=1
 wrksrc="pyzstd-${version}"
 build_style=python3-module
@@ -8,14 +8,14 @@ make_build_args="--dynamic-link-zstd"
 hostmakedepends="python3-setuptools"
 makedepends="python3-devel libzstd-devel"
 depends="python3"
+checkdepends="python3-pytest"
 short_desc="Python bindings to zstd, API is similar to bz2/lzma/zlib module"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="BSD-3-Clause"
 homepage="https://github.com/animalize/pyzstd"
+changelog="https://raw.githubusercontent.com/animalize/pyzstd/dev/README.rst"
 distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
-checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
-# test is broken and can't be run by setup.py or pytest
-make_check=no
+checksum=eda9d2874a8f3823eea882125f304620f592693b3af0101c484bfc75726c8c59
 
 post_install() {
 	vlicense LICENSE

From 60fd2f95d7c45fb752942bd30cd9d2eb20bf6801 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 12:00:01 -0400
Subject: [PATCH 1278/1686] python3-pybcj: update to 0.5.1.

enable tests with pytest
---
 srcpkgs/python3-pybcj/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template
index 9e0e806f9583..a0776b796627 100644
--- a/srcpkgs/python3-pybcj/template
+++ b/srcpkgs/python3-pybcj/template
@@ -1,15 +1,16 @@
 # Template file for 'python3-pybcj'
 pkgname=python3-pybcj
-version=0.5.0
+version=0.5.1
 revision=1
 wrksrc="pybcj-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
 makedepends="python3-devel"
 depends="python3"
+checkdepends="python3-pytest python3-hypothesis"
 short_desc="BCJ(Branch-Call-Jump) filter for python"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/pybcj"
 distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz"
-checksum=8de74f338874c698e405a72181eb0ea2e011ed5a6567e0feca524275f113bb0f
+checksum=376d039200639a52cba47fb04ffda39aad39715d9e988405fee0e5d60080d111

From 60efb772a3271f4370a4bfa611a2aebb7e5ca2f5 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 13:39:53 -0400
Subject: [PATCH 1279/1686] New package: python3-zipfile-deflate64-0.2.0

---
 srcpkgs/python3-zipfile-deflate64/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-zipfile-deflate64/template

diff --git a/srcpkgs/python3-zipfile-deflate64/template b/srcpkgs/python3-zipfile-deflate64/template
new file mode 100644
index 000000000000..5f2c506b3e15
--- /dev/null
+++ b/srcpkgs/python3-zipfile-deflate64/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-zipfile-deflate64'
+pkgname=python3-zipfile-deflate64
+version=0.2.0
+revision=1
+wrksrc="zipfile-deflate64-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Extract Deflate64 ZIP archives with Python's zipfile API"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/brianhelba/zipfile-deflate64"
+distfiles="${PYPI_SITE}/z/zipfile-deflate64/zipfile-deflate64-${version}.tar.gz"
+checksum=875a3299de102edf1c17f8cafcc528b1ca80b62dc4814b9cb56867ec59fbfd18
+make_check=no # no tests included

From 89920fa2952524961c0e4b9c936f7665a119f2a4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 5 Apr 2022 12:00:36 -0400
Subject: [PATCH 1280/1686] python3-py7zr: update to 0.18.3.

enable tests by ignoring/disabling pytest-benchmark

Closes: #36538 [via git-merge-pr]
---
 srcpkgs/python3-py7zr/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
index 7dcdc642f601..0113cb1dec27 100644
--- a/srcpkgs/python3-py7zr/template
+++ b/srcpkgs/python3-py7zr/template
@@ -1,20 +1,19 @@
 # Template file for 'python3-py7zr'
 pkgname=python3-py7zr
-version=0.16.4
-revision=2
+version=0.18.3
+revision=1
 wrksrc="py7zr-${version}"
 build_style=python3-module
+make_check_args="--ignore=tests/test_benchmark.py --noconftest"
 hostmakedepends="python3-setuptools_scm"
 depends="python3-texttable python3-pycryptodomex
  python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj
- python3-multivolumefile"
+ python3-multivolumefile python3-zipfile-deflate64"
+checkdepends="python3-pytest python3-pytest-timeout python3-py-cpuinfo $depends"
 short_desc="7zip in python3 with various compressions, and AES encryption"
 maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/py7zr"
 changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/Changelog.rst"
 distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
-checksum=9b584dcd71b0e8c385cc66ae8e370bdbc29d1f07139d5cee770dc221fa338cf9
-# testing requires unpackaged modules:
-# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
-make_check=no
+checksum=d5bdc81536316f209a3ca4e1ce6e2ef11d8a519d613be47bcdd084bf655f400f

From deaa1da6b175180f7f0aca47dc0a6330d1119e49 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 23:34:55 +0100
Subject: [PATCH 1281/1686] libqalculate: update to 4.1.

previously 'qalculate', rearranged subpackages in a way which makes more sense.
---
 srcpkgs/libqalculate                         |  1 -
 srcpkgs/libqalculate-devel                   |  2 +-
 srcpkgs/{qalculate => libqalculate}/template | 27 ++++++++++----------
 srcpkgs/qalculate                            |  1 +
 4 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 120000 srcpkgs/libqalculate
 rename srcpkgs/{qalculate => libqalculate}/template (59%)
 create mode 120000 srcpkgs/qalculate

diff --git a/srcpkgs/libqalculate b/srcpkgs/libqalculate
deleted file mode 120000
index 2cf8203b7872..000000000000
--- a/srcpkgs/libqalculate
+++ /dev/null
@@ -1 +0,0 @@
-qalculate
\ No newline at end of file
diff --git a/srcpkgs/libqalculate-devel b/srcpkgs/libqalculate-devel
index 2cf8203b7872..2822077292df 120000
--- a/srcpkgs/libqalculate-devel
+++ b/srcpkgs/libqalculate-devel
@@ -1 +1 @@
-qalculate
\ No newline at end of file
+libqalculate
\ No newline at end of file
diff --git a/srcpkgs/qalculate/template b/srcpkgs/libqalculate/template
similarity index 59%
rename from srcpkgs/qalculate/template
rename to srcpkgs/libqalculate/template
index d24fcba07f06..0414d879df42 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/libqalculate/template
@@ -1,29 +1,28 @@
-# Template file for 'qalculate'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate-gtk"
-# and "srcpkgs/qalculate-qt"
-pkgname=qalculate
-version=3.20.1
-revision=3
-wrksrc="lib${pkgname}-${version}"
+# Template file for 'libqalculate'
+# NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt'
+pkgname=libqalculate
+version=4.1.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
 makedepends="libxml2-devel cln-devel readline-devel libcurl-devel icu-devel
  mpfr-devel"
-short_desc="Multi-purpose desktop calculator"
+short_desc="Multi-purpose desktop calculator library"
 maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
+changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=cee57c21fd5e20862734d7712907824ef7c689efc7d54c237e3766b6c83c7ee7
+checksum=d943e5285bdc0b3cd77b8f7a10391d7c753fc19b0ddd48e5d4179decf709d6ff
 
-libqalculate_package() {
-	short_desc+=" - library files"
-	replaces="libqalculate-data>=0"
+qalculate_package() {
+	short_desc="Multi-purpose desktop calculator - CLI version"
 	pkg_install() {
-		vmove usr/lib/libqalculate.so.*
-		vmove usr/share/qalculate
+		vmove usr/bin/qalc
+		vmove usr/share/man/man1/qalc.1
 	}
 }
+
 libqalculate-devel_package() {
 	short_desc+=" - development files"
 	depends="libqalculate>=${version}_${revision} libxml2-devel cln-devel gmp-devel mpfr-devel"
diff --git a/srcpkgs/qalculate b/srcpkgs/qalculate
new file mode 120000
index 000000000000..2822077292df
--- /dev/null
+++ b/srcpkgs/qalculate
@@ -0,0 +1 @@
+libqalculate
\ No newline at end of file

From 6bc1f19fdba28b2966ad14fbaf685fc49a5cd4cc Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 23:35:05 +0100
Subject: [PATCH 1282/1686] qalculate-gtk: update to 4.1.0.

---
 srcpkgs/qalculate-gtk/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qalculate-gtk/template b/srcpkgs/qalculate-gtk/template
index a38571989276..642bd9e5da80 100644
--- a/srcpkgs/qalculate-gtk/template
+++ b/srcpkgs/qalculate-gtk/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-gtk'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-qt"
+# NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-qt'
 pkgname=qalculate-gtk
-version=3.20.1
+version=4.1.0
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -12,5 +11,6 @@ short_desc="Multi-purpose desktop calculator - GTK+ version"
 maintainer="Artem Zhurikhin <ashpool@xecut.net>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
+changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=3985766a7b8977a0d1f94b807ea66e388ed29192185394c9ccc7b5733e4ce136
+checksum=8bab126f4f87e9321572f10e9262bf095c7e72470d4b61e2a173d273673bdeca

From b9ef8f837e8badf3552decfcbb7a232e5ed3f217 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 16 Mar 2022 23:35:06 +0100
Subject: [PATCH 1283/1686] qalculate-qt: update to 4.1.0.

Closes: #36179 [via git-merge-pr]
---
 srcpkgs/qalculate-qt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
index c960ee0eed61..d1995bdec691 100644
--- a/srcpkgs/qalculate-qt/template
+++ b/srcpkgs/qalculate-qt/template
@@ -1,8 +1,7 @@
 # Template file for 'qalculate-qt'
-# NOTE: keep this package synchronized with "srcpkgs/qalculate"
-# and "srcpkgs/qalculate-gtk"
+# NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-gtk'
 pkgname=qalculate-qt
-version=3.20.1
+version=4.1.0
 revision=1
 build_style=qmake
 hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
@@ -12,5 +11,6 @@ short_desc="Multi-purpose desktop calculator - QT version"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
+changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=189e952b2b6b99ef63db46bd70d31f140adf19e8364d0eb4064daefca6a16e8a
+checksum=b54b880750bf75e756f074c1fb6a38dcfe23ad9a53954b83a8a86981c6cb824e

From 4e9e09885038a9f61abfb1f0b01a5e4a31034c0f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Thu, 14 Apr 2022 10:32:13 +0200
Subject: [PATCH 1284/1686] kalendar: update to 1.0.0, add deps, do check

---
 srcpkgs/kalendar/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kalendar/template b/srcpkgs/kalendar/template
index 0cdfbd27c3e4..6ab596817804 100644
--- a/srcpkgs/kalendar/template
+++ b/srcpkgs/kalendar/template
@@ -1,6 +1,6 @@
 # Template file for 'kalendar'
 pkgname=kalendar
-version=0.4.0
+version=1.0.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -10,10 +10,17 @@ makedepends="qt5-devel qt5-declarative-devel qt5-quickcontrols2-devel
  kcalendarcore-devel kconfigwidgets-devel kwindowsystem-devel kcoreaddons-devel
  kcontacts-devel kitemmodels-devel kxmlgui-devel knotifications-devel
  kiconthemes-devel kservice-devel akonadi5-devel akonadi-contacts-devel
- calendarsupport-devel eventviews-devel"
+ calendarsupport-devel eventviews-devel qqc2-desktop-style-devel kio-devel"
+depends="qqc2-desktop-style kdepim-runtime qt5-location kirigami2"
+checkdepends="dbus kdepim-runtime"
 short_desc="Calendar application using Akonadi"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/pim/kalendar"
 distfiles="${KDE_SITE}/kalendar/kalendar-${version}.tar.xz"
-checksum=d64b19caab3e1365cce58ae27b76417b515cf3a07777ed1905f82cfbf0d1947a
+checksum=ca4e840dc17a4e39111f5fb16bfcab29e34a10b9c840d22b81c52890f0c9fae0
+
+do_check() {
+	cd build
+	dbus-run-session ctest --output-on-failure --force-new-ctest-process
+}

From b572bc2ce56a7eacad961850c15bf6936e2cf34b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 14:53:31 +0200
Subject: [PATCH 1285/1686] xsnow: update to 3.5.0.

---
 srcpkgs/xsnow/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xsnow/template b/srcpkgs/xsnow/template
index a4f26810b137..198362e39ddf 100644
--- a/srcpkgs/xsnow/template
+++ b/srcpkgs/xsnow/template
@@ -1,18 +1,19 @@
 # Template file for 'xsnow'
 pkgname=xsnow
-version=3.4.4
+version=3.5.0
 revision=1
 build_style=gnu-configure
 build_helper=qemu
 hostmakedepends="pkg-config"
-makedepends="libXext-devel libXpm-devel libXt-devel libX11-devel gtk+3-devel"
+makedepends="gsl-devel gtk+3-devel libX11-devel libXext-devel libXpm-devel
+ libXt-devel"
 short_desc="Snow for your X11 sessions"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://ratrabbit.nl/ratrabbit/xsnow/index.html"
 changelog="https://ratrabbit.nl/ratrabbit/xsnow/changelog/index.html"
 distfiles="https://ratrabbit.nl/downloads/xsnow/${pkgname}-${version}.tar.gz"
-checksum=7cf332e40c4ab29164716a617ff22331cfd942d6b29634e12b16dc32dbce8d17
+checksum=884bb7478f839c120ebd031642fdae54b1f700352faac87b509a2ff221a57ff9
 
 pre_build() {
 	if [ "$CROSS_BUILD" ]; then

From aa52bccffd7662631bc5194c7c65a3d6362e7613 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 16:32:43 +0200
Subject: [PATCH 1286/1686] mathcomp: mark nocross.

---
 srcpkgs/mathcomp/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/mathcomp/template b/srcpkgs/mathcomp/template
index 9bdea51dcf48..073327450800 100644
--- a/srcpkgs/mathcomp/template
+++ b/srcpkgs/mathcomp/template
@@ -12,6 +12,7 @@ license="CECILL-B"
 homepage="https://github.com/math-comp/math-comp"
 distfiles="https://github.com/math-comp/math-comp/archive/${pkgname}-${version}.tar.gz"
 checksum=d259cc95a2f8f74c6aa5f3883858c9b79c6e87f769bde9a415115fa4876ebb31
+nocross="ocaml"
 
 do_install() {
 	make install DESTDIR="${DESTDIR}" 'COQLIB:=$(shell coqtop -where)/'

From d54c247c79391ba06d0ac7bfd35250a7abaee2aa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 17:19:17 +0200
Subject: [PATCH 1287/1686] linux5.10: update to 5.10.111.

---
 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 0912977245d4..28935f5c70d2 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.109
+version=5.10.111
 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=18fb22ecb249669ea775474aee614dcb0697cab299068074fd9f0bafa32113dc
+checksum=1831b3d8765592ce91e51441bb179d908f6bcfe8c78d03c2bec8c675c4a0ab1a
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

From 75934f29905d81f8535f3cf6aaa1bd2c368a7cd5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 17:21:09 +0200
Subject: [PATCH 1288/1686] linux5.15: update to 5.15.34.

---
 srcpkgs/linux5.15/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 236c406a512b..9b2bc0aed3f9 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
-version=5.15.32
+version=5.15.34
 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="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
- eacc8609dfcecb637f813ef4d2e13f48bdeb6143be929358f3b3cb4254f9c563"
+ b1a34733513b1080e763532101def34af73b4ca5e4f9b442c3e7d378a1598088"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From ee7a3f854967ca076601035323e67452ac14ead1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 17:30:18 +0200
Subject: [PATCH 1289/1686] linux5.16: update to 5.16.20.

---
 srcpkgs/linux5.16/files/arm64-dotconfig   | 3 ++-
 srcpkgs/linux5.16/files/i386-dotconfig    | 4 ++--
 srcpkgs/linux5.16/files/ppc64-dotconfig   | 5 +++--
 srcpkgs/linux5.16/files/ppc64le-dotconfig | 5 +++--
 srcpkgs/linux5.16/files/x86_64-dotconfig  | 3 ++-
 srcpkgs/linux5.16/template                | 4 ++--
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig
index e4b9d7a609af..a5f05f407ac7 100644
--- a/srcpkgs/linux5.16/files/arm64-dotconfig
+++ b/srcpkgs/linux5.16/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.16.16 Kernel Configuration
+# Linux/arm64 5.16.20 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -3277,6 +3277,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 CONFIG_NET_DSA_REALTEK_SMI=m
 CONFIG_NET_DSA_SMSC_LAN9303=m
 CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
diff --git a/srcpkgs/linux5.16/files/i386-dotconfig b/srcpkgs/linux5.16/files/i386-dotconfig
index a7c014b0984b..bd1d764ded60 100644
--- a/srcpkgs/linux5.16/files/i386-dotconfig
+++ b/srcpkgs/linux5.16/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.16.11 Kernel Configuration
+# Linux/i386 5.16.20 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2911,6 +2911,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
@@ -10031,7 +10032,6 @@ CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_HEADERS_INSTALL is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
 CONFIG_SECTION_MISMATCH_WARN_ONLY=y
-# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set
 CONFIG_FRAME_POINTER=y
 # CONFIG_VMLINUX_MAP is not set
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
diff --git a/srcpkgs/linux5.16/files/ppc64-dotconfig b/srcpkgs/linux5.16/files/ppc64-dotconfig
index b204dc8f8a72..b451a42c14c8 100644
--- a/srcpkgs/linux5.16/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.16.11 Kernel Configuration
+# Linux/powerpc 5.16.20 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc64-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc64-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -2922,6 +2922,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
diff --git a/srcpkgs/linux5.16/files/ppc64le-dotconfig b/srcpkgs/linux5.16/files/ppc64le-dotconfig
index 564de8e60967..ac8f74360c67 100644
--- a/srcpkgs/linux5.16/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.16/files/ppc64le-dotconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.16.11 Kernel Configuration
+# Linux/powerpc 5.16.20 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="powerpc64le-linux-musl-gcc (GCC) 10.2.1 20201203"
+CONFIG_CC_VERSION_TEXT="powerpc64le-linux-gnu-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100201
 CONFIG_CLANG_VERSION=0
@@ -2801,6 +2801,7 @@ CONFIG_NET_DSA_XRS700X=m
 CONFIG_NET_DSA_XRS700X_I2C=m
 CONFIG_NET_DSA_XRS700X_MDIO=m
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
diff --git a/srcpkgs/linux5.16/files/x86_64-dotconfig b/srcpkgs/linux5.16/files/x86_64-dotconfig
index dbffc48dfc42..b8c5717c6eae 100644
--- a/srcpkgs/linux5.16/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.16/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.16.11 Kernel Configuration
+# Linux/x86_64 5.16.20 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -2968,6 +2968,7 @@ CONFIG_NET_DSA_SJA1105=m
 # CONFIG_NET_DSA_XRS700X_I2C is not set
 # CONFIG_NET_DSA_XRS700X_MDIO is not set
 CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK=m
 # CONFIG_NET_DSA_REALTEK_SMI is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
 # CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template
index 3f8c094faf24..71cb0aba3ca5 100644
--- a/srcpkgs/linux5.16/template
+++ b/srcpkgs/linux5.16/template
@@ -1,6 +1,6 @@
 # Template file for 'linux4.16'
 pkgname=linux5.16
-version=5.16.18
+version=5.16.20
 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="027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb
- 3bb88aa87c3f7788ad84ca5cbf3946ed9fbb3fddb9fca2458944fba5ebd2ab16"
+ 619cd0e39db62b581107cd71dbc1fc52654f94d4306fd02e806ab599f06d0cd8"
 skip_extraction="patch-${version}.xz"
 python_version=3
 

From 95b13cde6fa5d0f09257aee3c5b7034476e811f3 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Thu, 14 Apr 2022 14:33:43 -0400
Subject: [PATCH 1290/1686] .github/workflows/build.yaml: only run on changes
 in srcpkgs/

---
 .github/workflows/build.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 503f1e1f4b68..2ae7a3e728fa 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -2,9 +2,13 @@ name: Check build
 
 on:
   pull_request:
+    paths:
+      - 'srcpkgs/**'
   push:
     branches:
       - 'ci-**'
+    paths:
+      - 'srcpkgs/**'
 
 jobs:
   # Lint changed templates.

From 25af251d69ff2651d7a4959e6052f5b6a35b8ee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Thu, 14 Apr 2022 16:18:18 -0300
Subject: [PATCH 1291/1686] tiptop: fix homepage and distfiles

---
 srcpkgs/tiptop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tiptop/template b/srcpkgs/tiptop/template
index 140198908629..93c71833c5ac 100644
--- a/srcpkgs/tiptop/template
+++ b/srcpkgs/tiptop/template
@@ -8,8 +8,8 @@ makedepends="ncurses-devel libxml2-devel"
 short_desc="Performance monitoring tool using hardware counters"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
-homepage="http://tiptop.gforge.inria.fr/"
-distfiles="http://tiptop.gforge.inria.fr/releases/${pkgname}-${version}.tar.gz"
+homepage="https://gitlab.inria.fr/rohou/tiptop"
+distfiles="https://files.inria.fr/pacap/tiptop/tiptop-$version.tar.gz"
 checksum=51c4449c95bba34f16b429729c2f58431490665d8093efaa8643b2e1d1084182
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2"
 

From 31ab82db0568d242876ab4a35fa0c61823b7420f Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Thu, 14 Apr 2022 13:04:10 -0400
Subject: [PATCH 1292/1686] github-cli: add manpages

fixes #36689
---
 srcpkgs/github-cli/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/github-cli/template b/srcpkgs/github-cli/template
index 35576bf8ee82..28c6acf2aaf5 100644
--- a/srcpkgs/github-cli/template
+++ b/srcpkgs/github-cli/template
@@ -1,7 +1,7 @@
 # Template file for 'github-cli'
 pkgname=github-cli
 version=2.8.0
-revision=1
+revision=2
 wrksrc="cli-${version}"
 build_style=go
 build_helper=qemu
@@ -24,6 +24,7 @@ pre_build() {
 }
 
 post_build() {
+	CGO_ENABLED=0 GOARCH="" go run script/build.go manpages
 	gh=$(find $GOPATH/bin -name gh)
 	for shell in bash fish zsh; do
 		vtargetrun $gh completion -s $shell > github-cli.$shell
@@ -33,6 +34,7 @@ post_build() {
 post_install() {
 	vlicense LICENSE
 
+	vcopy share/man usr/share
 	for shell in bash fish zsh; do
 		vcompletion github-cli.$shell $shell gh
 	done

From ff22a38b7c4cabc0adf8b4063613f101f6ebe1bf Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 14 Apr 2022 16:34:08 +0200
Subject: [PATCH 1293/1686] pianobar: update to 2022.04.01.

---
 srcpkgs/pianobar/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pianobar/template b/srcpkgs/pianobar/template
index b7d991fef5a4..a9b29e91993f 100644
--- a/srcpkgs/pianobar/template
+++ b/srcpkgs/pianobar/template
@@ -1,6 +1,6 @@
 # Template file for 'pianobar'
 pkgname=pianobar
-version=2020.11.28
+version=2022.04.01
 revision=1
 build_style=gnu-makefile
 make_build_args="V=1"
@@ -11,8 +11,9 @@ short_desc="Free/open-source, console-based client for Pandora radio"
 maintainer="Ulf <void@uw.anonaddy.com>"
 license="MIT"
 homepage="https://6xq.net/pianobar/"
-distfiles="https://github.com/PromyLOPh/pianobar/archive/${version}.tar.gz"
-checksum=f8cdd564e2a12ee0740c54e8bc4028b328e9afb041d9ea40bcb762e08034b9e9
+changelog="https://raw.githubusercontent.com/PromyLOPh/pianobar/master/ChangeLog"
+distfiles="https://6xq.net/pianobar/pianobar-${version}.tar.bz2"
+checksum=1670b28865a8b82a57bb6dfea7f16e2fa4145d2f354910bb17380b32c9b94763
 
 post_install() {
 	vlicense COPYING

From de12a821142a11dc20c2c257e31c04fbcfd7309b Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 13 Apr 2022 10:56:22 +0200
Subject: [PATCH 1294/1686] go: update to 1.18.1.

---
 .../fix-ppc64le-startup-detection.patch       | 81 -------------------
 srcpkgs/go/template                           |  4 +-
 2 files changed, 2 insertions(+), 83 deletions(-)
 delete mode 100644 srcpkgs/go/patches/fix-ppc64le-startup-detection.patch

diff --git a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch b/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
deleted file mode 100644
index 6cc2ab337249..000000000000
--- a/srcpkgs/go/patches/fix-ppc64le-startup-detection.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 946167906ed8646c433c257b074a10e01f0a7dab Mon Sep 17 00:00:00 2001
-From: "Paul E. Murphy" <murp@ibm.com>
-Date: Tue, 22 Mar 2022 11:52:02 -0500
-Subject: [PATCH] runtime: make static/dynamic startup detection work with musl
- on ppc64le
-
-The glibc loader explicitly sets the first doubleword on the stack (R1)
-to $0 to indicate it was dynamically loaded.
-
-An ELFv2 ABI compliant loader will set R3/R4 to argc/argv when starting
-the process, and R13 to TLS. musl is not compliant. Instead it passes
-argc/argv like the kernel, but R3/R4 are in an undefined state and R13
-is valid.
-
-With the knowledge above, the startup code can be modified to
-dynamically handle all three cases when linked internally.
-
-Fixes #51787
-
-Change-Id: I5de33862c161900d9161817388bbc13a65fdc69c
-Reviewed-on: https://go-review.googlesource.com/c/go/+/394654
-Reviewed-by: Cherry Mui <cherryyz@google.com>
-Run-TryBot: Paul Murphy <murp@ibm.com>
-TryBot-Result: Gopher Robot <gobot@golang.org>
-Trust: Paul Murphy <murp@ibm.com>
-Trust: Lynn Boger <laboger@linux.vnet.ibm.com>
----
- src/runtime/rt0_linux_ppc64le.s | 32 +++++++++++++++++++++-----------
- 1 file changed, 21 insertions(+), 11 deletions(-)
-
-diff --git a/src/runtime/rt0_linux_ppc64le.s b/src/runtime/rt0_linux_ppc64le.s
-index 4f7c6e6c99f6..66f7e7b22a41 100644
---- a/go/src/runtime/rt0_linux_ppc64le.s
-+++ b/go/src/runtime/rt0_linux_ppc64le.s
-@@ -147,25 +147,35 @@ TEXT _main<>(SB),NOSPLIT,$-8
- 	// In a statically linked binary, the stack contains argc,
- 	// argv as argc string pointers followed by a NULL, envv as a
- 	// sequence of string pointers followed by a NULL, and auxv.
--	// There is no TLS base pointer.
-+	// The TLS pointer should be initialized to 0.
- 	//
--	// In a dynamically linked binary, r3 contains argc, r4
--	// contains argv, r5 contains envp, r6 contains auxv, and r13
-+	// In an ELFv2 compliant dynamically linked binary, R3 contains argc,
-+	// R4 contains argv, R5 contains envp, R6 contains auxv, and R13
- 	// contains the TLS pointer.
- 	//
--	// Figure out which case this is by looking at r4: if it's 0,
--	// we're statically linked; otherwise we're dynamically
--	// linked.
--	CMP	R0, R4
--	BNE	dlink
--
--	// Statically linked
-+	// When loading via glibc, the first doubleword on the stack points
-+	// to NULL a value. (that is *(uintptr)(R1) == 0). This is used to
-+	// differentiate static vs dynamicly linked binaries.
-+	//
-+	// If loading with the musl loader, it doesn't follow the ELFv2 ABI. It
-+	// passes argc/argv similar to the linux kernel, R13 (TLS) is
-+	// initialized, and R3/R4 are undefined.
-+	MOVD	(R1), R12
-+	CMP	R0, R12
-+	BEQ	tls_and_argcv_in_reg
-+
-+	// Arguments are passed via the stack (musl loader or a static binary)
- 	MOVD	0(R1), R3 // argc
- 	ADD	$8, R1, R4 // argv
-+
-+	// Did the TLS pointer get set? If so, don't change it (e.g musl).
-+	CMP	R0, R13
-+	BNE	tls_and_argcv_in_reg
-+
- 	MOVD	$runtime·m0+m_tls(SB), R13 // TLS
- 	ADD	$0x7000, R13
- 
--dlink:
-+tls_and_argcv_in_reg:
- 	BR	main(SB)
- 
- TEXT main(SB),NOSPLIT,$-8
diff --git a/srcpkgs/go/template b/srcpkgs/go/template
index 58f0b0fc2485..44423832896f 100644
--- a/srcpkgs/go/template
+++ b/srcpkgs/go/template
@@ -1,6 +1,6 @@
 # Template file for 'go'
 pkgname=go
-version=1.18
+version=1.18.1
 revision=1
 create_wrksrc=yes
 build_wrksrc=go
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="https://go.dev/"
 changelog="https://go.dev/doc/devel/release.html"
 distfiles="https://go.dev/dl/go${version}.src.tar.gz"
-checksum=38f423db4cc834883f2b52344282fa7a39fbb93650dc62a11fdf0be6409bdad6
+checksum=efd43e0f1402e083b73a03d444b7b6576bb4c539ac46208b63a916b69aca4088
 nostrip=yes
 noverifyrdeps=yes
 

From 99c340e5c32472b9f7bf4cb558b401ba871c6465 Mon Sep 17 00:00:00 2001
From: blackbeard420 <blackbeard@blackbeard420.me>
Date: Mon, 11 Apr 2022 18:03:40 -0400
Subject: [PATCH 1295/1686] kitty: update to 0.25.0

---
 srcpkgs/kitty/template | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 2c012bece185..7f4507a6f0aa 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,6 +1,6 @@
 # Template file for 'kitty'
 pkgname=kitty
-version=0.24.4
+version=0.25.0
 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=d8cd0b4967bb61e2a3427b57cb9f45f278813fb6b986f97b370c8c50aa058d18
+checksum=1a2c81bf46687d4141d3182dc984bbc0330791705af152199e5b5815dae933de
 python_version=3
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 
@@ -27,10 +27,6 @@ do_build() {
 	if [ "$CROSS_BUILD" ]; then
 		CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
 	fi
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			vsed -e 's/pow10/pow_10/g' -i kitty/parser.c;;
-	esac
 	python3 setup.py linux-package --prefix=${DESTDIR}/usr --update-check-interval=0 --verbose
 }
 

From 8f84755de08efc7596d977fcf285644a66e716f3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 12 Apr 2022 02:44:55 +0200
Subject: [PATCH 1296/1686] budgie-desktop: update to 10.6.1.

---
 srcpkgs/budgie-desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template
index a65c395c994b..02d90c307eaf 100644
--- a/srcpkgs/budgie-desktop/template
+++ b/srcpkgs/budgie-desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'budgie-desktop'
 pkgname=budgie-desktop
-version=10.6
+version=10.6.1
 revision=1
 build_style=meson
 build_helper=gir
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only, LGPL-2.1-only"
 homepage="https://github.com/BuddiesOfBudgie/budgie-desktop"
 distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz"
-checksum=ba297a10b547e6d7bf164406750b5c5dae98a7524978b30b4ad3cba9624def9e
+checksum=b320cfdff8fab37286f0ca6669ef2907f551fa2a38cabd764cbf7b9e6181e166
 
 budgie-desktop-devel_package() {
 	short_desc+=" - development files"

From 376915ca95d90eafaa2528193e8742fc0fc21232 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Tue, 12 Apr 2022 02:44:58 +0200
Subject: [PATCH 1297/1686] budgie-screensaver: update to 5.0.1.

---
 srcpkgs/budgie-screensaver/patches/musl.patch | 12 ------------
 srcpkgs/budgie-screensaver/template           |  4 ++--
 2 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 srcpkgs/budgie-screensaver/patches/musl.patch

diff --git a/srcpkgs/budgie-screensaver/patches/musl.patch b/srcpkgs/budgie-screensaver/patches/musl.patch
deleted file mode 100644
index 6f5c265f83ae..000000000000
--- a/srcpkgs/budgie-screensaver/patches/musl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/subprocs.c b/src/subprocs.c
-index a378658..ba37650 100644
---- a/src/subprocs.c
-+++ b/src/subprocs.c
-@@ -36,6 +36,7 @@
- # define fork  vfork
- #endif /* VMS */
- 
-+#define _POSIX_SOURCE
- #include <signal.h>		/* for the signal names */
- 
- #include <glib.h>
diff --git a/srcpkgs/budgie-screensaver/template b/srcpkgs/budgie-screensaver/template
index b877543d33a0..16ed0e384e8a 100644
--- a/srcpkgs/budgie-screensaver/template
+++ b/srcpkgs/budgie-screensaver/template
@@ -1,6 +1,6 @@
 # Template file for 'budgie-screensaver'
 pkgname=budgie-screensaver
-version=5.0
+version=5.0.1
 revision=1
 build_style=meson
 hostmakedepends="pkg-config intltool glib-devel"
@@ -10,4 +10,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
 homepage="https://github.com/BuddiesOfBudgie/budgie-screensaver"
 distfiles="https://github.com/BuddiesOfBudgie/budgie-screensaver/releases/download/v${version}/budgie-screensaver-v${version}.tar.xz"
-checksum=611969a9f53e5d3148cad7445e95c94bfff6ea61c2f339969ecb5d9b51f6b871
+checksum=81fe6cccd938d9ef8d6cd46bbbad654ab8f7d108bbf1f96e9bf89b3ed5bafa0a

From b4c2a52930b4c6532f73413b11050774efce90ac Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Sat, 9 Apr 2022 20:54:53 -0400
Subject: [PATCH 1298/1686] libnma: update to 1.8.38.

---
 srcpkgs/libnma/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libnma/template b/srcpkgs/libnma/template
index 148ae51d6de9..9d2a53119d01 100644
--- a/srcpkgs/libnma/template
+++ b/srcpkgs/libnma/template
@@ -1,6 +1,6 @@
 # Template file for 'libnma'
 pkgname=libnma
-version=1.8.36
+version=1.8.38
 revision=1
 build_style=meson
 build_helper="gir"
@@ -15,7 +15,7 @@ license="GPL-2.0-only, LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libnma"
 changelog="https://gitlab.gnome.org/GNOME/libnma/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d99415f4cdff642230019ec5cdd2b1fbf1ec550a8ae865219f75482a642b7b7a
+checksum=5ed93eae18456ff5a8a4f408178c1ee198dc8d3a46c65f9075b101916e64e8b4
 replaces="libnm-gtk>=0"
 
 if [ "$CROSS_BUILD" ]; then

From 107e3f4ebaf78d2b51ad38cf799744039fba5dea Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 23:47:14 +0200
Subject: [PATCH 1299/1686] ocaml-findlib: remove ocamlbuild/META, it's part of
 ocamlbuild.

---
 srcpkgs/ocaml-findlib/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template
index 04be12e64f51..20c083271677 100644
--- a/srcpkgs/ocaml-findlib/template
+++ b/srcpkgs/ocaml-findlib/template
@@ -1,7 +1,7 @@
 # Template file for 'ocaml-findlib'
 pkgname=ocaml-findlib
 version=1.9.3
-revision=1
+revision=2
 wrksrc="findlib-${version}"
 build_style=configure
 configure_args="-config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man"
@@ -21,4 +21,6 @@ do_install() {
 	make prefix="$DESTDIR" install
 	vbin src/findlib/ocamlfind_opt
 	vlicense LICENSE
+
+	rm -rf ${DESTDIR}/usr/lib/ocaml/ocamlbuild
 }

From 5f5424ebff7092c0857af7e5b12e5d3aab7d4008 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Thu, 14 Apr 2022 19:30:06 -0400
Subject: [PATCH 1300/1686] .github/workflows/stale.yml: increase operations
 limit

By setting `ascending` to `true`, the most stale issues and PRs will be
caught first. By increasing the operations limit from the default (30)
to 250, more stale issues/PRs will be caught each run, increasing the
speed of the burndown.
---
 .github/workflows/stale.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 91ac19e4f638..9dbb76cd2a3d 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -17,3 +17,5 @@ jobs:
           days-before-stale: 90
           days-before-close: 14
           exempt-all-assignees: true
+          ascending: true
+          operations-per-run: 250

From 674a67bba8abde7c6489d1da49cd4d491107cc13 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sun, 10 Apr 2022 04:47:01 +0200
Subject: [PATCH 1301/1686] .github/workflows/stale.yml: don't tag issues with
 request label as stale

Closes: #36609 [via git-merge-pr]
---
 .github/workflows/stale.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 9dbb76cd2a3d..160897fedef1 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -19,3 +19,4 @@ jobs:
           exempt-all-assignees: true
           ascending: true
           operations-per-run: 250
+          exempt-issue-labels: request

From 2b5419be165fed5a496ec1ad13ecd05eabe715de Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 14 Apr 2022 15:37:27 -0500
Subject: [PATCH 1302/1686] Signal-Desktop: update to 5.39.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 05be4f346a92..c02e6864b8a1 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.38.0
+version=5.39.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=da693cf3fd7535f8569bbdc6f64387e274daab49c2798cacc804c784e401115d
+checksum=0e5f237bd2db6f9e32d58d28c99727bdd069cffb6abf9c68b62c30c8a6ca83d9
 nostrip_files="signal-desktop"
 
 post_extract() {

From c11c8527230396378f06da1815af357a32067490 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 5 Apr 2022 10:05:48 +0200
Subject: [PATCH 1303/1686] New package: Mousai-0.6.6

---
 srcpkgs/Mousai/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/Mousai/template

diff --git a/srcpkgs/Mousai/template b/srcpkgs/Mousai/template
new file mode 100644
index 000000000000..1b97a3851557
--- /dev/null
+++ b/srcpkgs/Mousai/template
@@ -0,0 +1,13 @@
+# Template file for 'Mousai'
+pkgname=Mousai
+version=0.6.6
+revision=1
+build_style=meson
+hostmakedepends="python3 gettext glib-devel pkg-config"
+depends="python3-gobject python3-requests libadwaita"
+short_desc="Identify any songs in seconds"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/SeaDve/Mousai"
+distfiles="https://github.com/SeaDve/Mousai/archive/refs/tags/v$version.tar.gz"
+checksum=a1e5cb29ad16405abcab8b5e1eec82fc170e5f535f8c55b57f18c80acb18a0ae

From 7c66e344992b748d2daf5a1fd44af393f2bb017a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:36:44 +0200
Subject: [PATCH 1304/1686] openssh: update to 9.0p1.

---
 srcpkgs/openssh/patches/ppoll_time64.patch | 26 ----------------------
 srcpkgs/openssh/template                   |  6 ++---
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/openssh/patches/ppoll_time64.patch

diff --git a/srcpkgs/openssh/patches/ppoll_time64.patch b/srcpkgs/openssh/patches/ppoll_time64.patch
deleted file mode 100644
index 199361c69024..000000000000
--- a/srcpkgs/openssh/patches/ppoll_time64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 284b6e5394652d519e31782e3b3cdfd7b21d1a81 Mon Sep 17 00:00:00 2001
-From: Darren Tucker <dtucker@dtucker.net>
-Date: Sat, 26 Feb 2022 14:06:14 +1100
-Subject: [PATCH] Allow ppoll_time64 in seccomp sandbox.
-
-Should fix sandbox violations on (some? at least i386 and armhf) 32bit
-Linux platforms.  Patch from chutzpahu at gentoo.org and cjwatson at
-debian.org via bz#3396.
----
- sandbox-seccomp-filter.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
-index 2e065ba3ed..4ce80cb2a7 100644
---- a/sandbox-seccomp-filter.c
-+++ b/sandbox-seccomp-filter.c
-@@ -276,6 +276,9 @@ static const struct sock_filter preauth_insns[] = {
- #ifdef __NR_ppoll
- 	SC_ALLOW(__NR_ppoll),
- #endif
-+#ifdef __NR_ppoll_time64
-+	SC_ALLOW(__NR_ppoll_time64),
-+#endif
- #ifdef __NR_poll
- 	SC_ALLOW(__NR_poll),
- #endif
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index fe446fc131d4..02a2dec35f42 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
-version=8.9p1
-revision=2
+version=9.0p1
+revision=1
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -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=fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7
+checksum=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a
 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 91776896fd974db4ed6d52247864b4b5f00629f6 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 8 Apr 2022 15:36:36 +0200
Subject: [PATCH 1305/1686] gnome-ssh-askpass: update to 9.0p1.

---
 srcpkgs/gnome-ssh-askpass/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template
index 558193ab2a19..692556f6836b 100644
--- a/srcpkgs/gnome-ssh-askpass/template
+++ b/srcpkgs/gnome-ssh-askpass/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-ssh-askpass'
 pkgname=gnome-ssh-askpass
-version=8.9p1
-revision=2
+version=9.0p1
+revision=1
 wrksrc="openssh-${version}"
 build_wrksrc="contrib"
 build_style=gnu-makefile
@@ -13,7 +13,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=fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7
+checksum=03974302161e9ecce32153cfa10012f1e65c8f3750f573a73ab1befd5972a28a
 
 alternatives="
  ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass

From afcfec5d4607bdab129a48001f6c424430badf5d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:28:12 +0100
Subject: [PATCH 1306/1686] bctoolbox: update to 5.1.17.

---
 srcpkgs/bctoolbox/template | 4 ++--
 srcpkgs/bctoolbox/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/bctoolbox/update

diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template
index 128235dc7d32..3d6b1bf167a0 100644
--- a/srcpkgs/bctoolbox/template
+++ b/srcpkgs/bctoolbox/template
@@ -1,6 +1,6 @@
 # Template file for 'bctoolbox'
 pkgname=bctoolbox
-version=5.0.55
+version=5.1.17
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=ON -DENABLE_TESTS_COMPONENT=FALSE
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-only"
 homepage="https://gitlab.linphone.org/BC/public/bctoolbox"
 distfiles="https://gitlab.linphone.org/BC/public/bctoolbox/-/archive/${version}/bctoolbox-${version}.tar.gz"
-checksum=64409771baf978f826eb052c0349fd9350b5aef8fd4135c988627dc6489ace81
+checksum=cbfea331dde994122a8bf04f05c03da6592aa53612f1da93eca3932d5460f231
 
 bctoolbox-devel_package() {
 	depends="bctoolbox-${version}_${revision}"
diff --git a/srcpkgs/bctoolbox/update b/srcpkgs/bctoolbox/update
new file mode 100644
index 000000000000..d81a9df130ed
--- /dev/null
+++ b/srcpkgs/bctoolbox/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/bctoolbox/-/tags

From f4f0ce2aa08dabed229fcb71b028f7866373800e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:28:23 +0100
Subject: [PATCH 1307/1686] belcard: update to 5.1.12.

---
 srcpkgs/belcard/template | 4 ++--
 srcpkgs/belcard/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/belcard/update

diff --git a/srcpkgs/belcard/template b/srcpkgs/belcard/template
index 292ec35f1891..1d117f953d91 100644
--- a/srcpkgs/belcard/template
+++ b/srcpkgs/belcard/template
@@ -1,6 +1,6 @@
 # Template file for 'belcard'
 pkgname=belcard
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=FALSE -DENABLE_UNIT_TESTS=FALSE"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belcard/-/archive/${version}/belcard-${version}.tar.gz"
-checksum=6b8f6188630eb5aeec671c8c9d417aa37b04a2d3b0b0944866bcbf6a3b2baec2
+checksum=529c6cc7edbc505495a850713020eb4d09a6aaa8d19983322f68ef0705081efe
 
 belcard-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/belcard/update b/srcpkgs/belcard/update
new file mode 100644
index 000000000000..b9a3c00d7d74
--- /dev/null
+++ b/srcpkgs/belcard/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/belcard/-/tags

From a147668ee8e444dac4a60ab4df335822df817cc7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:05 +0100
Subject: [PATCH 1308/1686] belle-sip: update to 5.1.12.

---
 srcpkgs/belle-sip/template | 4 ++--
 srcpkgs/belle-sip/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/belle-sip/update

diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template
index d1d46c11bd3b..ccf66d4b985c 100644
--- a/srcpkgs/belle-sip/template
+++ b/srcpkgs/belle-sip/template
@@ -1,6 +1,6 @@
 # Template file for 'belle-sip'
 pkgname=belle-sip
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DANTLR3_JAR_PATH=/usr/share/java/antlr3.jar -DENABLE_STRICT=OFF
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belle-sip/-/archive/${version}/belle-sip-${version}.tar.gz"
-checksum=f97e1dd8ab8eea4363187128d4ccf0223701c6efcd1e382226da25bd62ca3b24
+checksum=1a827db2d42eadd6825dc12f8c413ca3cf925e8084e5821d94f66d49b5c6f2db
 
 belle-sip-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/belle-sip/update b/srcpkgs/belle-sip/update
new file mode 100644
index 000000000000..f1c298cb081a
--- /dev/null
+++ b/srcpkgs/belle-sip/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/belle-sip/-/tags

From 7ddcb9a3601f404206ac7359ed3ffabeee7dda73 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:08 +0100
Subject: [PATCH 1309/1686] belr: update to 5.1.12.

---
 srcpkgs/belr/template | 4 ++--
 srcpkgs/belr/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/belr/update

diff --git a/srcpkgs/belr/template b/srcpkgs/belr/template
index 2e93a5492da2..299dc179a41b 100644
--- a/srcpkgs/belr/template
+++ b/srcpkgs/belr/template
@@ -1,6 +1,6 @@
 # Template file for 'belr'
 pkgname=belr
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=FALSE -DENABLE_TESTS=NO"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/belr/-/archive/${version}/belr-${version}.tar.gz"
-checksum=6ef5ea9b730d5206cf278f6dd0dc0e3c87ab61a222f08cee50148b6868f6023b
+checksum=77f86470e12f8371a77c9b911705b585f97e0b983c31f33d529d3d19dc97fb56
 
 belr-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/belr/update b/srcpkgs/belr/update
new file mode 100644
index 000000000000..881207190078
--- /dev/null
+++ b/srcpkgs/belr/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/belr/-/tags

From 7710e410b2dd572d8025d809579eb8b083dc9610 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:15 +0100
Subject: [PATCH 1310/1686] bzrtp: update to 5.1.12.

---
 srcpkgs/bzrtp/template | 4 ++--
 srcpkgs/bzrtp/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/bzrtp/update

diff --git a/srcpkgs/bzrtp/template b/srcpkgs/bzrtp/template
index 8f0b9823668d..463d7f82ec96 100644
--- a/srcpkgs/bzrtp/template
+++ b/srcpkgs/bzrtp/template
@@ -1,6 +1,6 @@
 # Template file for 'bzrtp'
 pkgname=bzrtp
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTS=FALSE -DENABLE_STATIC=FALSE"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/bzrtp/-/archive/${version}/bzrtp-${version}.tar.gz"
-checksum=53e94486fdb2bece03ebe0daf49b5d476cab977babec364cd04407aca25be4c2
+checksum=c1b44db05ab6d4df7a29d53c6aaff9a6cd79ce73d46d406f01d737e3c4cfb01e
 
 bzrtp-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/bzrtp/update b/srcpkgs/bzrtp/update
new file mode 100644
index 000000000000..31738d52c44c
--- /dev/null
+++ b/srcpkgs/bzrtp/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/bzrtp/-/tags

From 6bd98e1b5f37417b49f8533a2a55559c437c259a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:19 +0100
Subject: [PATCH 1311/1686] linphone: update to 5.1.21.

---
 srcpkgs/linphone/template | 7 +++----
 srcpkgs/linphone/update   | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/linphone/update

diff --git a/srcpkgs/linphone/template b/srcpkgs/linphone/template
index c98b8c7e950e..d1af2d791c39 100644
--- a/srcpkgs/linphone/template
+++ b/srcpkgs/linphone/template
@@ -1,10 +1,9 @@
 # Template file for 'linphone'
 pkgname=linphone
-version=5.0.56
-# 5.0.57 requires an unreleased mediastreamer2
+version=5.1.21
 revision=1
-build_style="cmake"
 wrksrc="liblinphone-${version}"
+build_style="cmake"
 configure_args="-DENABLE_STRICT=FALSE
  -DENABLE_ADVANCED_IM=FALSE -DENABLE_DB_STORAGE=FALSE
  -DENABLE_LIME=NO -DENABLE_LIME_X3DH=NO -DENABLE_UNIT_TESTS=NO
@@ -21,7 +20,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org"
 distfiles="https://gitlab.linphone.org/BC/public/liblinphone/-/archive/${version}/liblinphone-${version}.tar.gz"
-checksum=56bc789cda2507644477c1fad84169b3a39b9c26bad859763c6be66fb705c2db
+checksum=1bf7e6642bd36c8002291eda62109daac4c8f7125952e874b95969b02ab43405
 
 pre_build() {
 	echo "#define MS2_GIT_VERSION=unknown" > coreapi/gitversion.h
diff --git a/srcpkgs/linphone/update b/srcpkgs/linphone/update
new file mode 100644
index 000000000000..ccc0e69a4e33
--- /dev/null
+++ b/srcpkgs/linphone/update
@@ -0,0 +1,2 @@
+pkgname=liblinphone
+site=https://gitlab.linphone.org/BC/public/liblinphone/-/tags

From a51cbb3e084e9fa0e93e70989cea32696b5c9382 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:26 +0100
Subject: [PATCH 1312/1686] mediastreamer: update to 5.1.20.

---
 srcpkgs/mediastreamer/template | 4 ++--
 srcpkgs/mediastreamer/update   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/mediastreamer/update

diff --git a/srcpkgs/mediastreamer/template b/srcpkgs/mediastreamer/template
index ba8b3dcc19e0..42f7cf4824ea 100644
--- a/srcpkgs/mediastreamer/template
+++ b/srcpkgs/mediastreamer/template
@@ -1,6 +1,6 @@
 # Template file for 'mediastreamer'
 pkgname=mediastreamer
-version=5.0.55
+version=5.1.20
 revision=1
 wrksrc="mediastreamer2-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-2.0-or-later"
 homepage="https://www.linphone.org/technical-corner/mediastreamer2"
 distfiles="https://gitlab.linphone.org/BC/public/mediastreamer2/-/archive/${version}/mediastreamer2-${version}.tar.gz"
-checksum=4c15baa786f637c630afa7989ebdd8c8f9d424548cb02400e03fb5fe2d61e1ee
+checksum=f3f86284d48610c58cc5c104a56f392039495f3aded64b180c904877f42ecdb0
 
 mediastreamer-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
diff --git a/srcpkgs/mediastreamer/update b/srcpkgs/mediastreamer/update
new file mode 100644
index 000000000000..9fcd24e296b0
--- /dev/null
+++ b/srcpkgs/mediastreamer/update
@@ -0,0 +1,2 @@
+pkgname=mediastreamer2
+site=https://gitlab.linphone.org/BC/public/mediastreamer2/-/tags

From f10f0ab0388f73c51c38e36378aa6d2b6515e07a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 21:29:36 +0100
Subject: [PATCH 1313/1686] ortp: update to 5.1.12.

---
 srcpkgs/ortp/template | 4 ++--
 srcpkgs/ortp/update   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/ortp/update

diff --git a/srcpkgs/ortp/template b/srcpkgs/ortp/template
index f8b08f2b9be9..f5092b2eeff2 100644
--- a/srcpkgs/ortp/template
+++ b/srcpkgs/ortp/template
@@ -1,6 +1,6 @@
 # Template file for 'ortp'
 pkgname=ortp
-version=5.0.55
+version=5.1.12
 revision=1
 build_style=cmake
 configure_args="-DENABLE_STATIC=OFF"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://www.linphone.org/technical-corner/ortp"
 distfiles="https://gitlab.linphone.org/BC/public/ortp/-/archive/${version}/ortp-${version}.tar.gz"
-checksum=2851d825f06ecfeeac921b73d7a932e2c8fcdbf49c83b09cd600db3e8025bc28
+checksum=dcd1b7c4876e8ca808c8c827329e90997bda51e8646399d426b529cddd727ee4
 
 ortp-devel_package() {
 	depends="bctoolbox-devel ortp-${version}_${revision}"
diff --git a/srcpkgs/ortp/update b/srcpkgs/ortp/update
new file mode 100644
index 000000000000..b1ec91983b27
--- /dev/null
+++ b/srcpkgs/ortp/update
@@ -0,0 +1 @@
+site=https://gitlab.linphone.org/BC/public/ortp/-/tags

From aa05dcf31944b2171ac49513952115f804d68455 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 11 Feb 2022 22:17:06 +0100
Subject: [PATCH 1314/1686] linphone-desktop: update to 4.4.1.

---
 srcpkgs/linphone-desktop/template | 6 +++---
 srcpkgs/linphone-desktop/update   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linphone-desktop/template b/srcpkgs/linphone-desktop/template
index 8699388aa9fc..44d72fc1466e 100644
--- a/srcpkgs/linphone-desktop/template
+++ b/srcpkgs/linphone-desktop/template
@@ -1,20 +1,20 @@
 # Template file for 'linphone-desktop'
 pkgname=linphone-desktop
-version=4.3.2
+version=4.4.1
 revision=1
 build_wrksrc="linphone-app" # The root cmake is glue code for their vendored libs
 build_style=cmake
 hostmakedepends="qt5-qmake qt5-host-tools qt5-declarative"
 makedepends="bctoolbox-devel belcard-devel belle-sip-devel linphone-devel
  mediastreamer-devel qt5-declarative-devel qt5-quickcontrols2-devel
- qt5-svg-devel qt5-tools-devel"
+ qt5-svg-devel qt5-tools-devel qt5-webview-devel"
 depends="qt5>=5.9_1 qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects"
 short_desc="Linphone qt desktop"
 maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://www.linphone.org/"
 distfiles="https://gitlab.linphone.org/BC/public/linphone-desktop/-/archive/${version}/linphone-desktop-${version}.tar.gz"
-checksum=dc7580816b5c289d9a4f21e9b3392a9b4a1a947c64ffbd6af504c8c01e3af111
+checksum=589e8ccc82e64fb1b7dbdc70b841240e02686079896d02bbe7dff782cc30bf8f
 replaces="linphone-gui>=0"
 CFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\""
 CXXFLAGS="-DLINPHONE_QT_GIT_VERSION=\\\"$version\\\""
diff --git a/srcpkgs/linphone-desktop/update b/srcpkgs/linphone-desktop/update
index 7510d1a49c26..aaa59859d2f8 100644
--- a/srcpkgs/linphone-desktop/update
+++ b/srcpkgs/linphone-desktop/update
@@ -1 +1 @@
-pkgname=linphoneqt
+site=https://gitlab.linphone.org/BC/public/linphone-desktop/-/tags

From 1da2212c4bce416a6e18def882bd020c799bfb10 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 15 Apr 2022 16:19:20 +0200
Subject: [PATCH 1315/1686] lollypop: update to 1.4.33.

---
 srcpkgs/lollypop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template
index 569c4e291772..02145a66a808 100644
--- a/srcpkgs/lollypop/template
+++ b/srcpkgs/lollypop/template
@@ -1,6 +1,6 @@
 # Template file for 'lollypop'
 pkgname=lollypop
-version=1.4.30
+version=1.4.33
 revision=1
 build_style=meson
 hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config"
@@ -14,4 +14,4 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Lollypop"
 distfiles="https://adishatz.org/lollypop/lollypop-${version}.tar.xz"
-checksum=393c3ed6431026b3214f380b7aa74ee31b054203855f7f5c928b1d25ad1b8ef5
+checksum=b1f806b3b844400131c7dc1bfad46843fc9ffcfbbf1fdeeab6bc348a74803529

From 367db42379f67fdcfb8768c8691a9ec6b003f031 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Apr 2022 16:44:11 +0200
Subject: [PATCH 1316/1686] cloud-hypervisor: update to 23.0.

---
 srcpkgs/cloud-hypervisor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cloud-hypervisor/template b/srcpkgs/cloud-hypervisor/template
index 3ecf069b2b07..c94d8e45e3fa 100644
--- a/srcpkgs/cloud-hypervisor/template
+++ b/srcpkgs/cloud-hypervisor/template
@@ -1,6 +1,6 @@
 # Template file for 'cloud-hypervisor'
 pkgname=cloud-hypervisor
-version=22.1
+version=23.0
 revision=1
 archs="aarch64* x86_64*"
 build_style=cargo
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="https://github.com/cloud-hypervisor/cloud-hypervisor"
 distfiles="https://github.com/cloud-hypervisor/cloud-hypervisor/archive/v${version}.tar.gz"
-checksum=73675ed730b5f23c4ce585918acff7496dcb585a4b91a672981c485bc7d94c37
+checksum=80f058d3ae00e23f4762fcc1c7091f22a14801c5913298f54fbfb8591da52ba9
 
 post_install() {
 	vlicense LICENSE-APACHE

From c5b273b6d93adf6d4588c6874bd73921e18ef858 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Apr 2022 16:46:43 +0200
Subject: [PATCH 1317/1686] libavif: update to 0.10.1.

---
 common/shlibs            | 2 +-
 srcpkgs/libavif/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index fc5a031056fc..0d2a9fcc9b8e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4069,7 +4069,7 @@ libstemmer.so.2 libstemmer-2.1.0_1
 libdecor-0.so.0 libdecor-0.1.0_1
 libprimecount.so.7 primecount-7.2_1
 libprimesieve.so.9 primesieve-7.7_1
-libavif.so.13 libavif-0.9.3_1
+libavif.so.14 libavif-0.10.1_1
 libkdumpfile.so.9 libkdumpfile-0.4.1_1
 libamd.so.2 SuiteSparse-5.10.1_1
 libcholmod.so.3 SuiteSparse-5.10.1_1
diff --git a/srcpkgs/libavif/template b/srcpkgs/libavif/template
index 8b62eac56af1..6b210252322e 100644
--- a/srcpkgs/libavif/template
+++ b/srcpkgs/libavif/template
@@ -1,6 +1,6 @@
 # Template file for 'libavif'
 pkgname=libavif
-version=0.9.3
+version=0.10.1
 revision=1
 build_style=cmake
 configure_args="-DAVIF_BUILD_APPS=ON -DAVIF_BUILD_GDK_PIXBUF=ON
@@ -13,7 +13,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/AOMediaCodec/libavif"
 distfiles="https://github.com/AOMediaCodec/libavif/archive/refs/tags/v${version}.tar.gz"
-checksum=bcd9a1f57f982a9615eb7e2faf87236dc88eb1d0c886f3471c7440ead605060d
+checksum=66e82854ceb84a3e542bc140a343bc90e56c68f3ecb4fff63e636c136ed9a05e
 
 post_install() {
 	vlicense LICENSE

From 8a8f30d60c5a3bf4bddc64abb3cbe98f177dbc41 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 15 Apr 2022 16:47:01 +0200
Subject: [PATCH 1318/1686] efl: rebuild for libavif-0.10.1_1.

---
 srcpkgs/efl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index b7267b1905f9..714080ade250 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.26.2
-revision=1
+revision=2
 build_style=meson
 configure_args="
  -Dbuild-examples=false

From af51e42be0d0fe87ff395cb94446a84deb9a4e7e Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Sat, 21 Aug 2021 17:52:02 +0200
Subject: [PATCH 1319/1686] memtest86+: switch to upstream binary

source built package has been reported to fail with more than 4GB of RAM.

Closes: #11691
---
 .../patches/00.memtest86+-5.01-no-scp.patch   |  10 --
 .../01.memtest86+-5.01-no-optimization.patch  |  18 ----
 .../02.memtest86+-5.01-compile-fix.patch      |  27 -----
 .../03.memtest86+-5.01-crash-fix.patch        | 100 ------------------
 .../04.memtest86+-5.01-fgnu89-inline.patch    |  15 ---
 ....memtest86+-5.01-fno-stack-protector.patch |  11 --
 srcpkgs/memtest86+/template                   |  20 ++--
 7 files changed, 7 insertions(+), 194 deletions(-)
 delete mode 100644 srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
 delete mode 100644 srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
 delete mode 100644 srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
 delete mode 100644 srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
 delete mode 100644 srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
 delete mode 100644 srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch

diff --git a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch b/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
deleted file mode 100644
index d998fc5a418c..000000000000
--- a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -21,7 +21,6 @@ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       
- 
- all: clean memtest.bin memtest 
--		 scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
- 
- # Link it statically once so I know I don't have undefined
- # symbols and then link it dynamically so I have full
diff --git a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch b/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
deleted file mode 100644
index d6453654a2b4..000000000000
--- a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/Makefile~	2014-01-08 01:30:11.355900076 +0000
-+++ b/Makefile	2014-01-08 01:31:19.387555469 +0000
-@@ -12,7 +12,7 @@
- AS=as -32
- CC=gcc
- 
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
-+CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
- 	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
- 	
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
diff --git a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch b/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
deleted file mode 100644
index 348d5b152d22..000000000000
--- a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/io.h~	2013-08-10 02:01:58.000000000 +0000
-+++ b/io.h	2014-01-08 01:29:12.404465515 +0000
-@@ -31,7 +31,7 @@
-  */
- 
- #define __OUT1(s,x) \
--extern inline void __out##s(unsigned x value, unsigned short port) {
-+static inline void __out##s(unsigned x value, unsigned short port) {
- 
- #define __OUT2(s,s1,s2) \
- __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
-@@ -43,7 +43,7 @@
- __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
- 
- #define __IN1(s) \
--extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
-+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v;
- 
- #define __IN2(s,s1,s2) \
- __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
diff --git a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch b/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
deleted file mode 100644
index 56f40d7bcfa6..000000000000
--- a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Patch to get memtest86+ working with gcc 4.7.2 or later and PCI scan fix
-these patches were taken from Mageia
-upstream report containing link to the patches:
-http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-or-later
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/controller.c
-+++ b/controller.c
-@@ -2,6 +2,8 @@
-  * MemTest86+ V5 Specific code (GPL V2.0)
-  * By Samuel DEMEULEMEESTER, sdemeule@memtest.org
-  * http://www.canardpc.com - http://www.memtest.org
-+ *
-+ * Edited by David McInnis Oct 4, 2014
-  */
- 
- //#include "defs.h"
-@@ -292,7 +294,7 @@ static void setup_nhm(void)
- 
- 	/* First, locate the PCI bus where the MCH is located */
- 
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
-@@ -327,7 +329,7 @@ static void setup_nhm32(void)
- 	ctrl.mode = ECC_NONE;
- 
- 	/* First, locate the PCI bus where the MCH is located */
--	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
-+	for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
- 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
- 		vid &= 0xFFFF;
-@@ -1424,7 +1426,7 @@ static void poll_fsb_amd64(void) {
- 	unsigned long dramchr;
- 	float clockratio;
- 	double dramclock;
--	unsigned int dummy[3];
-+	unsigned int dummy[4];
- 	int ram_type;
- 
- 	float coef = 10;
-@@ -2851,13 +2853,13 @@ static void poll_timings_nf4ie(void) {
- 
- static void poll_timings_i875(void) {
- 
--	ulong dev6, dev62;
-+	ulong dev6;
- 	ulong temp;
- 	float cas;
- 	int rcd, rp, ras, chan;
- 	long *ptr, *ptr2;
- 
--	pci_conf_read( 0, 6, 0, 0x40, 4, &dev62);
-+	pci_conf_read( 0, 6, 0, 0x40, 4, &dev6);
- 	ptr2=(long*)(dev6+0x68);
- 
- 	/* Read the MMR Base Address & Define the pointer */
---- a/init.c
-+++ b/init.c
-@@ -7,6 +7,8 @@
-  *
-  * Released under version 2 of the Gnu Public License.
-  * By Chris Brady
-+ *
-+ * Edited by David McInnis October 4, 2014
-  */
-  
- 
-@@ -914,7 +916,6 @@ void cpu_type(void)
- 			default:
- 				cprint(0, COL_MID, "Unknown Intel");
-  				break;
--			break;
- 		    }
- 
- 		}
---- a/main.c
-+++ b/main.c
-@@ -422,7 +422,7 @@ void test_start(void)
- 		//initialise_cpus();
- 		btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0);
- 		/* Draw the screen and get system information */
--	  init();
-+		init();
- 
- 		/* Set defaults and initialize variables */
- 		set_defaults();
-@@ -737,7 +737,7 @@ void test_start(void)
- 			    /* Do the same test for each CPU */
- 			    if (++cpu_sel >= act_cpus) 
- 			    	{
--	            cpu_sel = 0;
-+				cpu_sel = 0;
- 			        next_test();
- 			    	} else {
- 			        continue;
diff --git a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch b/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
deleted file mode 100644
index d044e72094cd..000000000000
--- a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-"Fix compilation of inline assembly with new gcc"
-
-Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/
-
---- a/Makefile
-+++ b/Makefile
-@@ -13,7 +13,7 @@ AS=as -32
- CC=gcc
- 
- CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
--	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector 
-+	-ffreestanding -fPIC $(SMP_FL) -fno-stack-protector -fgnu89-inline
- 	
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \
diff --git a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch b/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
deleted file mode 100644
index ddb3d5968682..000000000000
--- a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile	2019-03-29 16:41:29.629879497 +0100
-+++ b/Makefile	2019-03-29 16:41:55.351031244 +0100
-@@ -53,7 +53,7 @@
- 	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector test.c
- 
- random.o: random.c
- 	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template
index c4850769d62e..ecffaa62c401 100644
--- a/srcpkgs/memtest86+/template
+++ b/srcpkgs/memtest86+/template
@@ -1,26 +1,20 @@
 # Template file for 'memtest86+'
 pkgname=memtest86+
 version=5.01
-revision=5
-archs="i686 x86_64"
-short_desc="Advanced Memory Diagnostic Tool"
+revision=6
+archs="i686* x86_64*"
+short_desc="Advanced Memory Diagnostic Tool - upstream binary"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.memtest.org"
-distfiles="http://www.memtest.org/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039
+distfiles="https://www.memtest.org/download/${version}/memtest86+-${version}.bin.gz"
+checksum=78f6625b093de69537d99ed68e35b2a9e5d666504cb2533affab1967bd888fc8
 
+create_wrksrc=yes
 nostrip=yes
 noverifyrdeps=yes
 
-if [ "$XBPS_MACHINE" = "x86_64" ]; then
-	makedepends="gcc-multilib"
-fi
-
-do_build() {
-	make
-}
 do_install() {
-	vinstall memtest.bin 755 boot memtest86+
+	vinstall memtest86+-5.01.bin 755 boot memtest86+
 	vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d
 }

From cbed9a22d421356010d00b65df5538acefc2233e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 15 Apr 2022 11:44:22 -0400
Subject: [PATCH 1320/1686] neomutt: update to 20220415.

---
 srcpkgs/neomutt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 3e703630df81..75fadd569cb2 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,6 +1,6 @@
 # Template file for 'neomutt'
 pkgname=neomutt
-version=20220408
+version=20220415
 revision=1
 create_wrksrc=true
 build_wrksrc="${pkgname}-${version}"
@@ -22,7 +22,7 @@ homepage="https://neomutt.org/"
 _test_files_hash=dc9fb32a701eb9dce4fda93c27da1d9b5be23231
 distfiles="https://github.com/neomutt/neomutt/archive/${version}.tar.gz
  https://github.com/neomutt/neomutt-test-files/archive/${_test_files_hash}.tar.gz"
-checksum="bb138adb09b1f164fe690749e991a5505bf4f50b6ad478ffb085c609d5617cc7
+checksum="84982cb4c2fed63e90d71fab45faa90738bfc58050430606135cbd8924d94682
  bda7c7f9f7bac528398040a46da505f906913a86f5db65cdbab743d595ee2947"
 python_version=3
 

From e6942fb07d124e4a1dccba9276e4f8e4dda7753b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 15 Apr 2022 18:17:14 +0200
Subject: [PATCH 1321/1686] chromium: update to 100.0.4896.127.

---
 srcpkgs/chromium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 96b34227a323..f655d29f3ba0 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
 # Template file for 'chromium'
 pkgname=chromium
 # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=100.0.4896.60
+version=100.0.4896.127
 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="Duncaen <duncaen@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=0e5ea5f3061ad090cf6bd57ca037496d95ea8956de021aff902f7d0ded7bffdc
+checksum=4710e3453c972c91e68a21f6b0b76ba73d4d617f299a5208615ed6e41b1af84d
 
 lib32disabled=yes
 

From d13e568018fbd64e4bdabc09bb94d8c30f063429 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 17:45:38 +0200
Subject: [PATCH 1322/1686] libqalculate: update to 4.1.1.

---
 srcpkgs/libqalculate/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libqalculate/template b/srcpkgs/libqalculate/template
index 0414d879df42..f0f03656d4c0 100644
--- a/srcpkgs/libqalculate/template
+++ b/srcpkgs/libqalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'libqalculate'
 # NOTE: keep this package synchronized with 'qalculate-gtk' and 'qalculate-qt'
 pkgname=libqalculate
-version=4.1.0
+version=4.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/libqalculate/releases/download/v${version}/libqalculate-${version}.tar.gz"
-checksum=d943e5285bdc0b3cd77b8f7a10391d7c753fc19b0ddd48e5d4179decf709d6ff
+checksum=b5611a91293be40fbe8723a81937e25ffb54e6ad6e60f282d044ed92f2d97002
 
 qalculate_package() {
 	short_desc="Multi-purpose desktop calculator - CLI version"

From 4ac07dc44993c8893b5198bc0a65617445691e09 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 17:45:44 +0200
Subject: [PATCH 1323/1686] qalculate-qt: update to 4.1.1.

---
 srcpkgs/qalculate-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qalculate-qt/template b/srcpkgs/qalculate-qt/template
index d1995bdec691..0f1ac9de8561 100644
--- a/srcpkgs/qalculate-qt/template
+++ b/srcpkgs/qalculate-qt/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate-qt'
 # NOTE: keep this package synchronized with 'libqalculate' and 'qalculate-gtk'
 pkgname=qalculate-qt
-version=4.1.0
+version=4.1.1
 revision=1
 build_style=qmake
 hostmakedepends="intltool pkg-config qt5-qmake qt5-host-tools"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-qt/releases/download/v${version}/qalculate-qt-${version}.tar.gz"
-checksum=b54b880750bf75e756f074c1fb6a38dcfe23ad9a53954b83a8a86981c6cb824e
+checksum=463e506331e8a49ec5ee355fe74da25d7a5cae945f5228081603be1f6d31f49f

From 01374914fd662062ba6eb7f4e5e3d7150c090eee Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 17:45:46 +0200
Subject: [PATCH 1324/1686] qalculate-gtk: update to 4.1.1.

---
 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 642bd9e5da80..ca1ab2e7dd98 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 'libqalculate' and 'qalculate-qt'
 pkgname=qalculate-gtk
-version=4.1.0
+version=4.1.1
 revision=1
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config glib-devel"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://qalculate.github.io"
 changelog="https://qalculate.github.io/news.html"
 distfiles="https://github.com/Qalculate/qalculate-gtk/releases/download/v${version}/qalculate-gtk-${version}.tar.gz"
-checksum=8bab126f4f87e9321572f10e9262bf095c7e72470d4b61e2a173d273673bdeca
+checksum=8bf7dee899ba480e4f82c70cb374ed1229da28f7d3b9b475a089630a8eeb32e5

From 3b5106c01490c39aaa0819448b90dd88e09f49e2 Mon Sep 17 00:00:00 2001
From: lane-brain <lane@mailbox.org>
Date: Wed, 13 Apr 2022 23:00:33 -0400
Subject: [PATCH 1325/1686] New package: libgccjit-10.2.1_pre1

---
 common/shlibs                                |   1 +
 srcpkgs/libgccjit-devel                      |   1 +
 srcpkgs/libgccjit/files/gccgo-musl.patch     |   1 +
 srcpkgs/libgccjit/files/libgccjit-musl.patch |  63 ++++++
 srcpkgs/libgccjit/files/libgnarl-musl.patch  |   1 +
 srcpkgs/libgccjit/files/libssp-musl.patch    |   1 +
 srcpkgs/libgccjit/patches                    |   1 +
 srcpkgs/libgccjit/template                   | 216 +++++++++++++++++++
 srcpkgs/libgccjit/update                     |   2 +
 9 files changed, 287 insertions(+)
 create mode 120000 srcpkgs/libgccjit-devel
 create mode 120000 srcpkgs/libgccjit/files/gccgo-musl.patch
 create mode 100644 srcpkgs/libgccjit/files/libgccjit-musl.patch
 create mode 120000 srcpkgs/libgccjit/files/libgnarl-musl.patch
 create mode 120000 srcpkgs/libgccjit/files/libssp-musl.patch
 create mode 120000 srcpkgs/libgccjit/patches
 create mode 100644 srcpkgs/libgccjit/template
 create mode 100644 srcpkgs/libgccjit/update

diff --git a/common/shlibs b/common/shlibs
index 0d2a9fcc9b8e..ae4bb44c57a3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -59,6 +59,7 @@ libitm.so.1 libitm-4.7.3_1
 liblto_plugin.so.0 gcc-4.7.3_1
 libgcc_s.so.1 libgcc-4.4.0_1
 libgo.so.16 libgo-10.2.0_1
+libgccjit.so.0 libgccjit-10.2.1pre1_1
 libperl.so.5.34 perl-5.34.0_1
 libgmp.so.10 gmp-5.0.1_1
 libgmpxx.so.4 gmpxx-6.0.0_2
diff --git a/srcpkgs/libgccjit-devel b/srcpkgs/libgccjit-devel
new file mode 120000
index 000000000000..ad6b9f7639f3
--- /dev/null
+++ b/srcpkgs/libgccjit-devel
@@ -0,0 +1 @@
+libgccjit
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/files/gccgo-musl.patch b/srcpkgs/libgccjit/files/gccgo-musl.patch
new file mode 120000
index 000000000000..a093af857738
--- /dev/null
+++ b/srcpkgs/libgccjit/files/gccgo-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/gccgo-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/files/libgccjit-musl.patch b/srcpkgs/libgccjit/files/libgccjit-musl.patch
new file mode 100644
index 000000000000..d2ed16928c82
--- /dev/null
+++ b/srcpkgs/libgccjit/files/libgccjit-musl.patch
@@ -0,0 +1,63 @@
+diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c
+index 5bccf591a..35f5e35ef 100644
+--- a/gcc/jit/jit-playback.c
++++ b/gcc/jit/jit-playback.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -41,8 +43,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "diagnostic.h"
+ #include "stmt.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-playback.h"
+ #include "jit-result.h"
+ #include "jit-builtins.h"
+diff --git a/gcc/jit/jit-recording.c b/gcc/jit/jit-recording.c
+index a237d574f..5785e3269 100644
+--- a/gcc/jit/jit-recording.c
++++ b/gcc/jit/jit-recording.c
+@@ -18,6 +18,8 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
++
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+@@ -25,8 +27,6 @@ along with GCC; see the file COPYING3.  If not see
+ #include "pretty-print.h"
+ #include "toplev.h"
+ 
+-#include <pthread.h>
+-
+ #include "jit-builtins.h"
+ #include "jit-recording.h"
+ #include "jit-playback.h"
+diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c
+index f9c33c63c..75f21d275 100644
+--- a/gcc/jit/libgccjit.c
++++ b/gcc/jit/libgccjit.c
+@@ -18,13 +18,13 @@ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3.  If not see
+ <http://www.gnu.org/licenses/>.  */
+ 
++#include <pthread.h>
+ #include "config.h"
+ #include "system.h"
+ #include "coretypes.h"
+ #include "timevar.h"
+ #include "typed-splay-tree.h"
+ #include "cppbuiltin.h"
+-#include <pthread.h>
+ 
+ #include "libgccjit.h"
+ #include "jit-recording.h"
diff --git a/srcpkgs/libgccjit/files/libgnarl-musl.patch b/srcpkgs/libgccjit/files/libgnarl-musl.patch
new file mode 120000
index 000000000000..33ccc9789f93
--- /dev/null
+++ b/srcpkgs/libgccjit/files/libgnarl-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/libgnarl-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/files/libssp-musl.patch b/srcpkgs/libgccjit/files/libssp-musl.patch
new file mode 120000
index 000000000000..37a7489360f8
--- /dev/null
+++ b/srcpkgs/libgccjit/files/libssp-musl.patch
@@ -0,0 +1 @@
+../../gcc/files/libssp-musl.patch
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/patches b/srcpkgs/libgccjit/patches
new file mode 120000
index 000000000000..c42218ef09df
--- /dev/null
+++ b/srcpkgs/libgccjit/patches
@@ -0,0 +1 @@
+../gcc/patches
\ No newline at end of file
diff --git a/srcpkgs/libgccjit/template b/srcpkgs/libgccjit/template
new file mode 100644
index 000000000000..6f1d6256dcd6
--- /dev/null
+++ b/srcpkgs/libgccjit/template
@@ -0,0 +1,216 @@
+# Template file for 'libgccjit'
+# Revbump libtool when updating gcc, since it hardcodes some internal compiler paths
+# which use the version number.
+
+pkgname=libgccjit
+# we are using a 10-stable git snapshot alpine is using in order
+# to get regression fixes not yet incorporate into a stable release
+# it should be possible to switch back to stable with 10.3 or 11
+version=10.2.1pre1
+revision=1
+_patchver="${version%pre*}"
+_minorver="${_patchver%.*}"
+_majorver="${_minorver%.*}"
+_gmp_version=6.2.0
+_mpfr_version=4.1.0
+_mpc_version=1.1.0
+_isl_version=0.21
+wrksrc=gcc-${version/pre/_pre}
+short_desc="Just-In-Time Compilation library for GCC"
+maintainer="Lane Biocini <lane@mailbox.org>"
+homepage="https://gcc.gnu.org"
+license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
+# *-musl builders have issues fetching https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
+distfiles="
+ https://dev.alpinelinux.org/~nenolod/gcc-${version/pre/_pre}.tar.xz
+ https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz
+ ${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
+ ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
+ ${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2"
+checksum="772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590
+ 258e6cd51b3fbdfc185c716d55f82c08aff57df0c6fbd143cf6ed561267a1526
+ 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f
+ 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
+ d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859"
+nopie=yes
+lib32disabled=yes
+makedepends="zlib-devel"
+hostmakedepends="tar texinfo perl flex"
+depends="gcc"
+checkdepends="dejagnu"
+
+post_extract() {
+	mv ${XBPS_BUILDDIR}/gmp-${_gmp_version} ${wrksrc}/gmp
+	mv ${XBPS_BUILDDIR}/mpfr-${_mpfr_version} ${wrksrc}/mpfr
+	mv ${XBPS_BUILDDIR}/mpc-${_mpc_version} ${wrksrc}/mpc
+	mv ${XBPS_BUILDDIR}/isl-${_isl_version} ${wrksrc}/isl
+}
+
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		for p in ${FILESDIR}/*-musl.patch; do
+			patch -p1 -i $p
+		done
+	fi
+}
+
+do_configure() {
+	# Define triplet for gcc build target
+	case "$XBPS_TARGET_MACHINE" in
+		i686) _target_triplet="i686-pc-linux-gnu";;
+		i686-musl) _target_triplet="i686-linux-musl";;
+		x86_64) _target_triplet="x86_64-unknown-linux-gnu";;
+		x86_64-musl) _target_triplet="x86_64-linux-musl";;
+		armv5tel) _target_triplet="arm-linux-gnueabi";;
+		armv5tel-musl) _target_triplet="arm-linux-musleabi";;
+		armv6l) _target_triplet="arm-linux-gnueabihf";;
+		armv7l) _target_triplet="armv7l-linux-gnueabihf";;
+		armv6l-musl) _target_triplet="arm-linux-musleabihf";;
+		armv7l-musl) _target_triplet="armv7l-linux-musleabihf";;
+		aarch64) _target_triplet="aarch64-linux-gnu";;
+		aarch64-musl) _target_triplet="aarch64-linux-musl";;
+		ppc) _target_triplet="powerpc-linux-gnu";;
+		ppc-musl) _target_triplet="powerpc-linux-musl";;
+		ppcle) _target_triplet="powerpcle-linux-gnu";;
+		ppcle-musl) _target_triplet="powerpcle-linux-musl";;
+		ppc64le) _target_triplet="powerpc64le-linux-gnu";;
+		ppc64le-musl) _target_triplet="powerpc64le-linux-musl";;
+		ppc64) _target_triplet="powerpc64-linux-gnu";;
+		ppc64-musl) _target_triplet="powerpc64-linux-musl";;
+		mips-musl) _target_triplet="mips-linux-musl";;
+		mipshf-musl) _target_triplet="mips-linux-muslhf";;
+		mipsel-musl) _target_triplet="mipsel-linux-musl";;
+		mipselhf-musl) _target_triplet="mipsel-linux-muslhf";;
+	esac
+
+	local _langs _args _hash
+	_hash=gnu
+	case "$XBPS_TARGET_MACHINE" in
+		mipselhf-musl) _args+=" --with-arch=mips32r2 --with-float=hard"; _hash=sysv;;
+		mipsel-musl) _args+=" --with-arch=mips32r2 --with-float=soft"; _hash=sysv;;
+		mipshf-musl) _args+=" --with-arch=mips32r2 --with-float=hard";;
+		mips-musl) _args+=" --with-arch=mips32r2 --with-float=soft";;
+		armv5*) _args+=" --with-arch=armv5te --with-float=soft";;
+		armv6l*) _args+=" --with-arch=armv6 --with-fpu=vfp --with-float=hard";;
+		armv7l*) _args+=" --with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard";;
+		aarch64*) _args+=" --with-arch=armv8-a";;
+		ppc64le*) _args+=" --with-abi=elfv2 --enable-secureplt --enable-targets=powerpcle-linux";;
+		ppc64*) _args+=" --with-abi=elfv2 --enable-secureplt --enable-targets=powerpc-linux";;
+		ppc*) _args+=" --enable-secureplt";;
+	esac
+
+	# fix: unknown long double size, cannot define BFP_FMT
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*-musl) _args+=" --disable-decimal-float";;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		export CC_FOR_TARGET="$CC"
+		export GCC_FOR_TARGET="$CC"
+		export CXX_FOR_TARGET="$CXX"
+
+		_args+=" --host=$XBPS_CROSS_TRIPLET"
+		_args+=" --with-build-sysroot=${XBPS_CROSS_BASE}"
+	elif [ -z "$CHROOT_READY" ]; then
+		export LD_LIBRARY_PATH="${XBPS_MASTERDIR}/usr/lib${XBPS_TARGET_WORDSIZE}"
+		_args+=" --build=${_target_triplet}"
+	else
+		_args+=" --build=${_target_triplet}"
+	fi
+
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		_args+=" --disable-gnu-unique-object"
+		_args+=" --disable-symvers"
+		_args+=" libat_cv_have_ifunc=no"
+	else
+		_args+=" --enable-gnu-unique-object"
+	fi
+
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*) _args+=" --disable-vtable-verify";;
+		*) _args+=" --enable-vtable-verify";;
+	esac
+
+	export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}"
+	export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}"
+
+	# Disable explicit -fno-PIE, gcc will figure this out itself.
+	export CFLAGS="${CFLAGS//-fno-PIE/}"
+	export CXXFLAGS="${CXXFLAGS//-fno-PIE/}"
+	export LDFLAGS="${LDFLAGS//-no-pie/}"
+
+	# Needs explicit -fPIC
+	export CFLAGS+=" -fPIC"
+	export CXXFLAGS+=" -fPIC"
+
+	_args+=" --prefix=/usr"
+	_args+=" --mandir=/usr/share/man"
+	_args+=" --infodir=/usr/share/info"
+	_args+=" --libexecdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+	_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+	_args+=" --enable-threads=posix"
+	_args+=" --enable-__cxa_atexit"
+	_args+=" --disable-multilib"
+	_args+=" --with-system-zlib"
+	_args+=" --enable-shared"
+	_args+=" --enable-lto"
+	_args+=" --enable-plugins"
+	_args+=" --enable-linker-build-id"
+	_args+=" --disable-werror"
+	_args+=" --disable-nls"
+	_args+=" --enable-default-pie"
+	_args+=" --enable-default-ssp"
+	_args+=" --enable-checking=release"
+	_args+=" --disable-libstdcxx-pch"
+	_args+=" --with-isl"
+	_args+=" --with-linker-hash-style=$_hash"
+	_args+=" --disable-sjlj-exceptions"
+	_args+=" --disable-target-libiberty"
+
+	# libgccjit compilation specific
+	_args+=" --enable-host-shared"
+	_args+=" --disable-bootstrap"
+	_args+=" --disable-libquadmath"
+	_args+=" --disable-libquadmath-support"
+	_args+=" --disable-libgomp"
+	_args+=" --disable-liboffloadmic"
+	_args+=" --disable-libada"
+	_args+=" --disable-libvtv"
+	_args+=" --disable-libsanitizer"
+	_args+=" --with-bugurl='https://github.com/void-linux/void-packages/issues'"
+
+	mkdir -p build
+	cd build
+
+	# If we are checking packages, we need to have c++ compiled
+	[ -z "$XBPS_CHECK_PKGS" ] && _langs="jit" || _langs="jit,c++"
+	_args+=" --enable-languages=${_langs}"
+	CONFIG_SHELL=/bin/bash \
+		${wrksrc}/configure ${_args}
+}
+
+do_build() {
+	make -C build ${makejobs}
+}
+
+do_check() {
+	make -C build/gcc check-jit RUNTESTFLAGS="-v -v -v"
+}
+
+do_install() {
+	make -C build/gcc DESTDIR=${DESTDIR} jit.install-common jit.install-info
+}
+
+post_install() {
+	vlicense COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
+}
+
+libgccjit-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+		vmove usr/share/info
+	}
+}
diff --git a/srcpkgs/libgccjit/update b/srcpkgs/libgccjit/update
new file mode 100644
index 000000000000..fb8dd58f2044
--- /dev/null
+++ b/srcpkgs/libgccjit/update
@@ -0,0 +1,2 @@
+site="https://gcc.gnu.org/releases.html"
+pattern="GCC \K[\d.]+(?=\<)"

From 4311f48aa99d732f75e57de2cc150763507ee892 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 14 Apr 2022 15:54:16 +0200
Subject: [PATCH 1326/1686] emacs: enable support for native-compilation.

This enables native-compilation and provides precompiled elisp files
for emacs-x11 and emacs-gtk3.  The plain console emacs stays without
support for native compilation to keep it lean, as native-compilation
pulls in libgccjit (27MB) and gcc (172MB + deps)
as well as emacs-common-eln (15MB).

On slow machines, native compilation can be disabled by setting
(setq comp-deferred-compilation nil)
in your .emacs.
---
 srcpkgs/emacs-common-eln |  1 +
 srcpkgs/emacs/template   | 46 +++++++++++++++++++++++++++++++---------
 2 files changed, 37 insertions(+), 10 deletions(-)
 create mode 120000 srcpkgs/emacs-common-eln

diff --git a/srcpkgs/emacs-common-eln b/srcpkgs/emacs-common-eln
new file mode 120000
index 000000000000..a7642dd168d6
--- /dev/null
+++ b/srcpkgs/emacs-common-eln
@@ -0,0 +1 @@
+emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 644e44cf4d06..aae0e3f6d225 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,13 +1,14 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=28.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
  $(vopt_with xpm) $(vopt_with svg rsvg) $(vopt_with imagemagick)
  $(vopt_with xml xml2) $(vopt_with gnutls) $(vopt_with sound) $(vopt_with m17n m17n-flt)
- $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)"
+ $(vopt_with json) $(vopt_with harfbuzz) $(vopt_with cairo) $(vopt_with gmp libgmp)
+ $(vopt_with nativecomp native-compilation)"
 hostmakedepends="pkg-config tar"
 makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
  dbus-devel acl-devel
@@ -17,7 +18,8 @@ makedepends="ncurses-devel libXaw-devel gtk+3-devel webkit2gtk-devel
  $(vopt_if xml libxml2-devel) $(vopt_if gnutls gnutls-devel)
  $(vopt_if sound alsa-lib-devel) $(vopt_if m17n m17n-lib-devel)
  $(vopt_if json jansson-devel) $(vopt_if harfbuzz harfbuzz-devel)
- $(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)"
+ $(vopt_if cairo cairo-devel) $(vopt_if gmp gmp-devel)
+ $(vopt_if nativecomp libgccjit-devel)"
 depends="emacs-common-${version}_${revision}"
 short_desc="GNU Emacs editor"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -29,12 +31,16 @@ nocross=yes
 nopie=yes
 
 # Package build options
-build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp"
-desc_option_xpm="Enable support for XPM images"
-desc_option_sound="Enable support for sound"
+build_options="jpeg tiff gif png xpm svg xml imagemagick gnutls sound m17n dbus json harfbuzz cairo gmp nativecomp"
+desc_option_cairo="Enable support for drawing with Cairo"
+desc_option_gmp="Enable support for big numbers using GMP"
+desc_option_json="Enable support for native JSON parsing"
 desc_option_m17n="Enable support for m17n multilingual text processing"
-build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n png sound
- svg tiff xml xpm"
+desc_option_nativecomp="Enable support for native compilation"
+desc_option_sound="Enable support for sound"
+desc_option_xpm="Enable support for XPM images"
+build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp
+ png sound svg tiff xml xpm"
 
 pre_configure() {
 	# Just configuring in different directories results in
@@ -47,7 +53,8 @@ pre_configure() {
 
 do_configure() {
 	cd $wrksrc/nox
-	./configure --without-x $(vopt_with dbus) ${configure_args}
+	./configure --without-x $(vopt_with dbus) ${configure_args} \
+		--without-native-compilation
 
 	cd $wrksrc/x11
 	./configure --with-x-toolkit=athena --without-toolkit-scroll-bars \
@@ -60,12 +67,13 @@ do_configure() {
 
 do_build() {
 	make ${makejobs} -C nox
-	make ${makejobs} -C x11
+	make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
 	make ${makejobs} -C gtk3
 }
 
 do_install() {
 	make DESTDIR=$DESTDIR -C ${wrksrc}/nox install
+	make DESTDIR=$DESTDIR -C ${wrksrc}/x11 install-eln
 	rm -f ${DESTDIR}/usr/bin/ctags
 	rm -f ${DESTDIR}/usr/lib/systemd/user/emacs.service
 	rm -f ${DESTDIR}/usr/share/man/man1/ctags.1*
@@ -84,8 +92,23 @@ emacs-common_package() {
 	}
 }
 
+emacs-common-eln_package() {
+	short_desc+=" - common precompiled elisp"
+	if [ -z "$build_option_nativecomp" ]; then
+		build_style=meta
+	fi
+	pkg_install() {
+		if [ "$build_option_nativecomp" ]; then
+			vmove usr/lib/emacs
+		fi
+	}
+}
+
 emacs-x11_package() {
 	depends="emacs-common-${version}_${revision}"
+	if [ "$build_option_nativecomp" ]; then
+		depends+=" emacs-common-eln-${version}_${revision}"
+	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - X11 version"
@@ -99,6 +122,9 @@ emacs-x11_package() {
 
 emacs-gtk3_package() {
 	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
+	if [ "$build_option_nativecomp" ]; then
+		depends+=" emacs-common-eln-${version}_${revision}"
+	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - GTK+3 version"

From ffb6f9dd3d68e966fd5cc71efcb653767c0cefae Mon Sep 17 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, 16 Apr 2022 23:00:09 +0700
Subject: [PATCH 1327/1686] chroot-git: update to 2.35.2.

---
 srcpkgs/chroot-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 08a014086a96..94331ab41a8d 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.35.1
+version=2.35.2
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
@@ -10,7 +10,7 @@ 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=d768528e6443f65a203036266f1ca50f9d127ba89751e32ead37117ed9191080
+checksum=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From ac96a8763fa33a5cc66064dc054d5804c346e20a Mon Sep 17 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, 16 Apr 2022 22:59:30 +0700
Subject: [PATCH 1328/1686] git: update to 2.35.2.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 929472b982b2..865c814fca51 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.35.1
+version=2.35.2
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -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=d768528e6443f65a203036266f1ca50f9d127ba89751e32ead37117ed9191080
+checksum=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 534d93f8c40c548c8b0a708cb326d749bf119239 Mon Sep 17 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, 16 Apr 2022 23:05:27 +0700
Subject: [PATCH 1329/1686] chroot-git: update to 2.35.3.

---
 srcpkgs/chroot-git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 94331ab41a8d..18efb65c4f67 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.35.2
+version=2.35.3
 revision=1
 bootstrap=yes
 wrksrc="git-${version}"
@@ -10,7 +10,7 @@ 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=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
+checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From d38c4e8dc3ca5679149952618ae8900f7a431aea Mon Sep 17 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, 16 Apr 2022 23:05:31 +0700
Subject: [PATCH 1330/1686] git: update to 2.35.3.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 865c814fca51..8b05a0f58024 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.35.2
+version=2.35.3
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -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=c73d0c4fa5dcebdb2ccc293900952351cc5fb89224bb133c116305f45ae600f3
+checksum=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From e58512eff1a361316d90985a53264a7cc1b24ae0 Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Sun, 10 Apr 2022 20:17:28 +0300
Subject: [PATCH 1331/1686] checkbashisms: update to 2.22.1.

---
 srcpkgs/checkbashisms/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/checkbashisms/template b/srcpkgs/checkbashisms/template
index 69f7fbfbb7dd..1da339030ffe 100644
--- a/srcpkgs/checkbashisms/template
+++ b/srcpkgs/checkbashisms/template
@@ -1,6 +1,6 @@
 # Template file for 'checkbashisms'
 pkgname=checkbashisms
-version=2.21.7
+version=2.22.1
 revision=1
 wrksrc="devscripts-${version}"
 depends="perl"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://tracker.debian.org/pkg/devscripts"
 changelog="https://salsa.debian.org/debian/devscripts/-/raw/master/debian/changelog"
 distfiles="${DEBIAN_SITE}/main/d/devscripts/devscripts_${version}.tar.xz"
-checksum=b03ae9a3214ea5492aa51519deddf0d46f8e59996b66aea1ed0dc1a1c5466ab1
+checksum=35dd5e6029d27be35b96e8c6e38b8aa6fba791a21371dac2de0f8cdee5fe33d5
 
 pre_install() {
 	vsed -i "s|###VERSION###|${version}|" scripts/checkbashisms.pl

From f3573670d4c29bf8bf41194718cd58592fd3e5f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Apr 2022 18:31:18 +0200
Subject: [PATCH 1332/1686] emacs: remove emacs-common-eln, put eln into binary
 packages.

The builds have different hashes, so the .eln files cannot be shared.
---
 srcpkgs/emacs-common-eln |  1 -
 srcpkgs/emacs/template   | 28 +++++-----------------------
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 120000 srcpkgs/emacs-common-eln

diff --git a/srcpkgs/emacs-common-eln b/srcpkgs/emacs-common-eln
deleted file mode 120000
index a7642dd168d6..000000000000
--- a/srcpkgs/emacs-common-eln
+++ /dev/null
@@ -1 +0,0 @@
-emacs
\ No newline at end of file
diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index aae0e3f6d225..b3130b1198d5 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=28.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
@@ -68,12 +68,11 @@ do_configure() {
 do_build() {
 	make ${makejobs} -C nox
 	make ${makejobs} -C x11 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
-	make ${makejobs} -C gtk3
+	make ${makejobs} -C gtk3 $(vopt_if nativecomp NATIVE_FULL_AOT=1)
 }
 
 do_install() {
 	make DESTDIR=$DESTDIR -C ${wrksrc}/nox install
-	make DESTDIR=$DESTDIR -C ${wrksrc}/x11 install-eln
 	rm -f ${DESTDIR}/usr/bin/ctags
 	rm -f ${DESTDIR}/usr/lib/systemd/user/emacs.service
 	rm -f ${DESTDIR}/usr/share/man/man1/ctags.1*
@@ -84,6 +83,7 @@ do_install() {
 
 emacs-common_package() {
 	short_desc+=" - common files"
+	replaces="emacs-common-eln>=0"
 	pkg_install() {
 		vmove usr/share/emacs
 		vmove usr/share/man
@@ -92,23 +92,8 @@ emacs-common_package() {
 	}
 }
 
-emacs-common-eln_package() {
-	short_desc+=" - common precompiled elisp"
-	if [ -z "$build_option_nativecomp" ]; then
-		build_style=meta
-	fi
-	pkg_install() {
-		if [ "$build_option_nativecomp" ]; then
-			vmove usr/lib/emacs
-		fi
-	}
-}
-
 emacs-x11_package() {
 	depends="emacs-common-${version}_${revision}"
-	if [ "$build_option_nativecomp" ]; then
-		depends+=" emacs-common-eln-${version}_${revision}"
-	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - X11 version"
@@ -116,15 +101,12 @@ emacs-x11_package() {
 		make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/x11 install
 		rm -f ${PKGDESTDIR}/usr/bin/ctags
 		rm -rf ${PKGDESTDIR}/usr/share
-		rm -rf ${PKGDESTDIR}/usr/lib
+		rm -rf ${PKGDESTDIR}/usr/lib/systemd
 	}
 }
 
 emacs-gtk3_package() {
 	depends="emacs-common-${version}_${revision} desktop-file-utils hicolor-icon-theme"
-	if [ "$build_option_nativecomp" ]; then
-		depends+=" emacs-common-eln-${version}_${revision}"
-	fi
 	provides="emacs-${version}_${revision}"
 	replaces="emacs>=0"
 	short_desc+=" - GTK+3 version"
@@ -132,6 +114,6 @@ emacs-gtk3_package() {
 		make DESTDIR=${PKGDESTDIR} -C ${wrksrc}/gtk3 install
 		rm -f ${PKGDESTDIR}/usr/bin/ctags
 		rm -rf ${PKGDESTDIR}/usr/share/{emacs,man,info}
-		rm -rf ${PKGDESTDIR}/usr/lib
+		rm -rf ${PKGDESTDIR}/usr/lib/systemd
 	}
 }

From af44b115d7ae9940547f5a0d4a32351db714f974 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Apr 2022 20:17:15 +0200
Subject: [PATCH 1333/1686] gzip: restore zless.

Don't depend on less to reduce bootstrap size.
---
 srcpkgs/gzip/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gzip/template b/srcpkgs/gzip/template
index 037dd3b27a4c..a01bc8cc5114 100644
--- a/srcpkgs/gzip/template
+++ b/srcpkgs/gzip/template
@@ -1,9 +1,10 @@
 # Template file for 'gzip'
 pkgname=gzip
 version=1.12
-revision=1
+revision=2
 bootstrap=yes
 build_style=gnu-configure
+configure_args="ac_cv_prog_LESS=less"
 short_desc="GNU compression utility (replacement for compress)"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"

From 59453a587d7dec153fcb8cf8fb5c68d6a3b4a246 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Sat, 16 Apr 2022 14:39:39 -0400
Subject: [PATCH 1334/1686] common/travis/fetch_upstream.sh: fix CI for new git
 version

---
 common/travis/fetch_upstream.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index 45315563e0b1..5c0256fdbe17 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -8,5 +8,8 @@ elif command -v git >/dev/null 2>&1; then
 	GIT_CMD=$(command -v git)
 fi
 
+# required by git 2.35.2+
+$GIT_CMD config --global --add safe.directory /__w/void-packages/void-packages
+
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
 $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master

From 1acd655227d82f1b133f533884d3673284fb5161 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 17 Apr 2022 05:25:00 +0200
Subject: [PATCH 1335/1686] emacs: disable nativecomp on 32-bit ppc

---
 srcpkgs/emacs/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index b3130b1198d5..d876ebfe1682 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -39,9 +39,15 @@ desc_option_m17n="Enable support for m17n multilingual text processing"
 desc_option_nativecomp="Enable support for native compilation"
 desc_option_sound="Enable support for sound"
 desc_option_xpm="Enable support for XPM images"
-build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n nativecomp
+build_options_default="cairo gif gmp gnutls harfbuzz jpeg json m17n
  png sound svg tiff xml xpm"
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) build_options_default+=" nativecomp";;
+	ppc*) ;; # assembler errors
+	*) build_options_default+=" nativecomp";;
+esac
+
 pre_configure() {
 	# Just configuring in different directories results in
 	# spurious emacs rebuilds with incompatible build numbers.

From 62e482edcf9c982d7814bfa5f5860bda6b3b0b9c Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sat, 9 Apr 2022 21:06:11 +0300
Subject: [PATCH 1336/1686] xfce4-terminal: update to 1.0.1.

---
 srcpkgs/xfce4-terminal/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index b25c1f0ab755..07c3bfaa46e5 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
-version=0.8.10
-revision=3
+version=1.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,5 +11,6 @@ short_desc="Modern terminal emulator primarly for the Xfce desktop environment"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/xfce4-terminal/start"
+changelog="https://gitlab.xfce.org/apps/xfce4-terminal/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=7a3337c198e01262a0412384823185753ac8a0345be1d6776a7e9bbbcbf33dc7
+checksum=1d3690871d3fe97f8be0908ace0443819e513f6366f851682aafe17059e1eba5

From 286562b2b19fea31b555884e81f2a175a6d57ef2 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Sun, 17 Apr 2022 04:22:01 -0400
Subject: [PATCH 1337/1686] font-iosevka: update to 15.2.0.

---
 srcpkgs/font-iosevka/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index e293af01166b..c971135ce5fb 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
 # Template file for 'font-iosevka'
 pkgname=font-iosevka
-version=15.1.0
+version=15.2.0
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
  https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
 checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1
- 4bb10d12681546fa129f9105706d6f55c346b75418a19793fb300f0bd4e5991d
- e05995a4b66592d5868b7e667bba8a5f1822499fc53c6cd7a8abf3e40f8b8895"
+ b6b6bb50cd3c3db49739bea9fb5c92c22647631eb1b5a35aa7f48358c07ef529
+ 45c853ac53b638457d943c0ccf7cf12ca77219ba7e092d7ac17ed965c5482da9"
 
 font_dirs="/usr/share/fonts/TTF"
 

From e9b0680d3e68a63a8bf023e0fc7621999be7a106 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 17 Apr 2022 19:15:57 +0200
Subject: [PATCH 1338/1686] gettext: fix build with automake 1.16.4

Closes: #34866, #34810
---
 srcpkgs/gettext/patches/automake-1.16.4.patch | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 srcpkgs/gettext/patches/automake-1.16.4.patch

diff --git a/srcpkgs/gettext/patches/automake-1.16.4.patch b/srcpkgs/gettext/patches/automake-1.16.4.patch
new file mode 100644
index 000000000000..9de0e0b1208f
--- /dev/null
+++ b/srcpkgs/gettext/patches/automake-1.16.4.patch
@@ -0,0 +1,52 @@
+From d1836dbbd6a90b4c0ab79bc5292c023f08b49511 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Sun, 8 Aug 2021 02:08:43 +0200
+Subject: [PATCH] libtextstyle: Make gl_INIT_PACKAGE work with Automake >=
+ 1.16.4.
+
+Reported and analyzed by Nicole Mazzuca <mazzucan@outlook.com> in
+<https://lists.gnu.org/archive/html/bug-libunistring/2021-08/msg00002.html>.
+
+* m4/init-package-version.m4 (gl_INIT_PACKAGE): Use a new macro gl_INIT_EMPTY.
+(gl_INIT_DUMMY): Expand to empty in two steps, via a new macro gl_INIT_DUMMY2.
+---
+ libtextstyle/m4/init-package-version.m4 | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/libtextstyle/m4/init-package-version.m4 b/libtextstyle/m4/init-package-version.m4
+index f131a844f..a26b1ab88 100644
+--- a/libtextstyle/m4/init-package-version.m4
++++ b/libtextstyle/m4/init-package-version.m4
+@@ -1,5 +1,5 @@
+-# init-package-version.m4 serial 1 (gettext-0.18)
+-dnl Copyright (C) 1992-2009 Free Software Foundation, Inc.
++# init-package-version.m4 serial 2
++dnl Copyright (C) 1992-2021 Free Software Foundation, Inc.
+ dnl This file is free software, distributed under the terms of the GNU
+ dnl General Public License.  As a special exception to the GNU General
+ dnl Public License, this file may be distributed as part of a program
+@@ -77,7 +77,7 @@ AC_DEFUN([gl_INIT_PACKAGE],
+             m4_bpatsubst(m4_dquote(
+                 m4_defn([AM_INIT_AUTOMAKE])),
+               [AC_PACKAGE_NAME], [gl_INIT_DUMMY])),
+-          [AC_PACKAGE_TARNAME], [gl_INIT_DUMMY])),
++          [AC_PACKAGE_TARNAME], [gl_INIT_EMPTY])),
+       [AC_PACKAGE_VERSION], [gl_INIT_DUMMY])
+     [AC_SUBST([PACKAGE], [$1])
+      AC_SUBST([VERSION], [$2])
+@@ -85,7 +85,11 @@ AC_DEFUN([gl_INIT_PACKAGE],
+   m4_define([AM_INIT_AUTOMAKE],
+     m4_defn([gl_RPL_INIT_AUTOMAKE]))
+ ])
+-m4_define([gl_INIT_DUMMY], [])
++m4_define([gl_INIT_EMPTY], [])
++dnl Automake 1.16.4 no longer accepts an empty value for gl_INIT_DUMMY.
++dnl But a macro that later expands to empty works.
++m4_define([gl_INIT_DUMMY], [gl_INIT_DUMMY2])
++m4_define([gl_INIT_DUMMY2], [])
+ AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [
+   m4_ifval([$2],
+     [m4_fatal([After gl_INIT_PACKAGE, the two-argument form of AM_INIT_AUTOMAKE cannot be used.])])
+-- 
+2.17.1
+

From de2f93ce1d2ab34d15496f5c60f18641e8e51511 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Wed, 15 Dec 2021 22:38:17 +0100
Subject: [PATCH 1339/1686] xbps-src: make -E ignore remote repositories with
 -N

---
 common/xbps-src/shutils/common.sh | 10 +++++++++-
 xbps-src                          |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh
index 47ff365e9ff2..36038af980c9 100644
--- a/common/xbps-src/shutils/common.sh
+++ b/common/xbps-src/shutils/common.sh
@@ -472,7 +472,15 @@ setup_pkg() {
     fi
     makejobs="-j$XBPS_MAKEJOBS"
     if [ -n "$XBPS_BINPKG_EXISTS" ]; then
-        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver 2>/dev/null)"
+        local extraflags=""
+        if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then
+            extraflags="-i"
+            # filter out remote repositories
+            for repo in $(xbps-query -L | awk '{ print $2 }' | grep '^/host/'); do
+                extraflags+=" --repository=$repo"
+            done
+        fi
+        local _binpkgver="$($XBPS_QUERY_XCMD -R -ppkgver $pkgver $extraflags 2>/dev/null)"
         if [ "$_binpkgver" = "$pkgver" ]; then
             if [ -z "$XBPS_DEPENDENCY" ]; then
                 local _repo="$($XBPS_QUERY_XCMD -R -prepository $pkgver 2>/dev/null)"
diff --git a/xbps-src b/xbps-src
index 8488c5a3a49c..47023a723539 100755
--- a/xbps-src
+++ b/xbps-src
@@ -157,7 +157,7 @@ $(print_cross_targets)
 -C  Do not remove build directory, automatic dependencies and
     package destdir after successful install.
 
--E  If a binary package exists in a local repository for the target package,
+-E  If a binary package exists in a repository for the target package,
     do not try to build it, exit immediately.
 
 -f  Force running the specified stage (configure/build/install/pkg)

From 7b2f324c806506514ffb32b1a99d3bfdc41db10c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:37 +0200
Subject: [PATCH 1340/1686] attica: update to 5.93.0.

---
 srcpkgs/attica/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template
index 1222f0cc9a60..47179ef8bd69 100644
--- a/srcpkgs/attica/template
+++ b/srcpkgs/attica/template
@@ -1,6 +1,6 @@
 # Template file for 'attica'
 pkgname=attica
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/attica"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bf647c7736acbbb99ff1557339f71b5efd5a7591b2af83b482d37d35516bc933
+checksum=81c18009911beb07d1868de78dd7fc1c4b1e8312bd95d916f4d4a80a800592e1
 
 do_check() {
 	cd build

From c3e83af15812f8dee9a7e175d11656751e40bd81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:39 +0200
Subject: [PATCH 1341/1686] baloo5: update to 5.93.0.

---
 srcpkgs/baloo5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/baloo5/template b/srcpkgs/baloo5/template
index 9f6d3c93f69a..f687851bcda5 100644
--- a/srcpkgs/baloo5/template
+++ b/srcpkgs/baloo5/template
@@ -1,6 +1,6 @@
 # Template file for 'baloo5'
 pkgname=baloo5
-version=5.92.0
+version=5.93.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=283570583da0f85b2001ca600b9657e3a3fb9c2dcdd3ea8728553e212e50a475
+checksum=25d11569fddb8ad0dddbaa91cedd3d96f0ad58a2cc23de920950db6ba3aed5cd
 
 do_check() {
 	cd build

From c37b86fb51c3566cc343ee821f45be243ceb53f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:41 +0200
Subject: [PATCH 1342/1686] bluez-qt5: update to 5.93.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 2893e694f79c..e6939e618cf3 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/bluez-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=f58d2483ed2db9cb77621bce3b3c6babd8d1153954030c0dc52ce399c6d28ab6
+checksum=ab5d84eaa37791b57c8379282a3c3afd7ef0b2ebbef83c3f12f6b3bfd9123624
 
 do_check() {
 	cd build

From 00b5584166bc9208fc00b103ff72778bbbe3d756 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:42 +0200
Subject: [PATCH 1343/1686] breeze-icons: update to 5.93.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 017805c60580..4aa9c5c952b8 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.92.0
+version=5.93.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=49e09663989fd3498d61cb7518c741c87a702689b6d6074097d628264a064366
+checksum=4367dfa6b48aa645a3680489be96e03a9a6fc20f57277b3ca5e37ce8df4d03e6
 nostrip=yes
 
 if [ -z "$CROSS_BUILD" ]; then

From a99cb53cfa33a854fa47fe4c1883c34a0d7b5f45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:44 +0200
Subject: [PATCH 1344/1686] extra-cmake-modules: update to 5.93.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 9c034a06303f..19615d19ee47 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_HTML_DOCS=ON"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="BSD-3-Clause"
 homepage="https://invent.kde.org/frameworks/extra-cmake-modules"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f89a238bc5f28738db25e29296b75b4f795e3e9bfe3a8f1f9390648749d303ef
+checksum=093dea7b11647bc5f74e6971d47ef15b5c410cba2b4620acae00f008d5480b21
 python_version=3
 
 do_check() {

From 461ecd7f4b370c307a3edeb78a502551d8f25a80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:45 +0200
Subject: [PATCH 1345/1686] frameworkintegration: update to 5.93.0.

---
 srcpkgs/frameworkintegration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/frameworkintegration/template b/srcpkgs/frameworkintegration/template
index 9840b077f5cb..130a97e3755a 100644
--- a/srcpkgs/frameworkintegration/template
+++ b/srcpkgs/frameworkintegration/template
@@ -1,6 +1,6 @@
 # Template file for 'frameworkintegration'
 pkgname=frameworkintegration
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/frameworkintegration"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=bd8ef6f6656c9756a56fbfa1dc91273426ef3ea5fae3e7a4c7dbeddfbbe3ec5d
+checksum=156e54c9ee679bda943a279c28c6a834ca02e991b3f53a1b92f8c3931388a2a6
 
 frameworkintegration-devel_package() {
 	short_desc+=" - development"

From 7a28aa70658babebe1f8aab9470308d3115ec897 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:47 +0200
Subject: [PATCH 1346/1686] kactivities5-stats: update to 5.93.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 8957274d1f85..5fa940f06eee 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname/5/}-${version}"
 build_style=cmake
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://api.kde.org/frameworks/kactivities/html/index.html"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname/5/}-${version}.tar.xz"
-checksum=2206132e0edbb8271f77bb6c45e794b8d3baa3d9b4f94aba005556f9fa3ff751
+checksum=f1069872228e05aea349a0d3f7961da27d1aad3e4c28d0a408fceb98edef03a8
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 3e774b987a473a82b2149a013a290cfa7d4d8033 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:48 +0200
Subject: [PATCH 1347/1686] kactivities5: update to 5.93.0.

---
 srcpkgs/kactivities5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivities5/template b/srcpkgs/kactivities5/template
index 75438b590eef..467b2ed2fed8 100644
--- a/srcpkgs/kactivities5/template
+++ b/srcpkgs/kactivities5/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivities5'
 pkgname=kactivities5
-version=5.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, GPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kactivities"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=fc06b6fc111f5ed8450c1c1c96f36188328b2292001ca3bf3293d0f68678dbcd
+checksum=eb6b204382d3bba1b32b5752a3e8382a5a7bbd8be4b95b774c68c501a2f16843
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools"

From fd00f48b612eb47e9a5e329c382fe6440ce3e8b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:50 +0200
Subject: [PATCH 1348/1686] kapidox: update to 5.93.0.

---
 srcpkgs/kapidox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kapidox/template b/srcpkgs/kapidox/template
index 164a36aa99a3..5e8664d5b6e6 100644
--- a/srcpkgs/kapidox/template
+++ b/srcpkgs/kapidox/template
@@ -1,6 +1,6 @@
 # Template file for 'kapidox'
 pkgname=kapidox
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=python3-module
 hostmakedepends="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=4f5201de5878bc3fb24f9e2ebd387c0a12d7a27c407636bc878bab5a3999a56d
+checksum=4228326a35342de8f0a301ed8afa379ef2102d99588a79808e7e86f2a4f81d5b
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From dcf6afe8aaa78fc04b2f24b38392ecc917502525 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:51 +0200
Subject: [PATCH 1349/1686] karchive: update to 5.93.0.

---
 srcpkgs/karchive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/karchive/template b/srcpkgs/karchive/template
index 109cc7a0ec29..dcc4a9d14cb5 100644
--- a/srcpkgs/karchive/template
+++ b/srcpkgs/karchive/template
@@ -1,6 +1,6 @@
 # Template file for 'karchive'
 pkgname=karchive
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/karchive"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5076a28c3a10ab755454c752fa563a4be7ad890f391c43aaa2ee4ee4b6a99fae
+checksum=61e326a840860270b7f8b9e8966462085b4f309be5c3a84c3b265eb95694c7fb
 
 karchive-devel_package() {
 	short_desc+=" - development"

From cc7ba37ca5c439f0e4b7f46193ca26d50d154c70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:53 +0200
Subject: [PATCH 1350/1686] kauth: update to 5.93.0.

---
 srcpkgs/kauth/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kauth/template b/srcpkgs/kauth/template
index 05ea13c55c39..8877514c6a7c 100644
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@@ -1,6 +1,6 @@
 # Template file for 'kauth'
 pkgname=kauth
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=44824bf68ee510d8aa0189a9d4b44568b0fe20d17ba45e3b739db1927bfa4728
+checksum=34580078bfdf631835f3ac52955f2149209908b935a7cfec6fe5b4956c3ada6c
 
 do_check() {
 	cd build

From a9e799f594772e5c7106c0e0bafbd683a9450ff6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:55 +0200
Subject: [PATCH 1351/1686] kbookmarks: update to 5.93.0.

---
 srcpkgs/kbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kbookmarks/template b/srcpkgs/kbookmarks/template
index c845e8909a62..cf60805f2206 100644
--- a/srcpkgs/kbookmarks/template
+++ b/srcpkgs/kbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'kbookmarks'
 pkgname=kbookmarks
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kbookmarks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99504e761621b56e07a561e1caea196fe4623c9334b889f081e3da8e4a19d543
+checksum=3eeff795ff99be90b0d59c6e5fbef02022e9fb48c9b4dab098a3c27e10fd863f
 
 kbookmarks-devel_package() {
 	short_desc+=" - development"

From 223f25295acac5199d5bdc387ce9794ae128d483 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:56 +0200
Subject: [PATCH 1352/1686] kcalendarcore: update to 5.93.0.

---
 srcpkgs/kcalendarcore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcalendarcore/template b/srcpkgs/kcalendarcore/template
index 3359712d3db9..4e7766af00c4 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.92.0
+version=5.93.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=6ff2e68dfb8b92e0f181f3f19d20991bfd589b4a047b313af908c41391560b3a
+checksum=1609bc141739fce0abed59a353a0e356f4fa7a1b3659d3bc77737010875c1d3f
 replaces="kcalcore>=0"
 
 do_check() {

From 84d4f22225e2e3d7c0005846e723ad7463e482b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:58 +0200
Subject: [PATCH 1353/1686] kcmutils: update to 5.93.0.

---
 srcpkgs/kcmutils/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcmutils/template b/srcpkgs/kcmutils/template
index bf26425f364f..19bea8671950 100644
--- a/srcpkgs/kcmutils/template
+++ b/srcpkgs/kcmutils/template
@@ -1,6 +1,6 @@
 # Template file for 'kcmutils'
 pkgname=kcmutils
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kcmutils"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dd49e658fc85c215442a7fa9d2435819f0bef13c997a6c2a51557b82e1bc8d3a
+checksum=1445f978b7ffd69fd7c25d965812755679c4fdba23eb9837da37a8b5b2d30d6d
 
 kcmutils-devel_package() {
 	short_desc+=" - development"

From 7b036b62d535048a9c9e0b29c18aa3fa0b49fd16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:42:59 +0200
Subject: [PATCH 1354/1686] kcodecs: update to 5.93.0.

---
 srcpkgs/kcodecs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcodecs/template b/srcpkgs/kcodecs/template
index 3ccc8f79b638..0a5c8577d249 100644
--- a/srcpkgs/kcodecs/template
+++ b/srcpkgs/kcodecs/template
@@ -1,6 +1,6 @@
 # Template file for 'kcodecs'
 pkgname=kcodecs
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel gperf"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcodecs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d6e5b7a453948d5fa0482715eaf4a0c9abe5b902a0aca15540a04b1a1b60d275
+checksum=0efc5c8baab3142f8a0ab9369b255061772a57a80fb616b7305bf98235b2288b
 
 kcodecs-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From 036c275d586be816419ab5b286904edc5e1fc1cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:00 +0200
Subject: [PATCH 1355/1686] kcompletion: update to 5.93.0.

---
 srcpkgs/kcompletion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcompletion/template b/srcpkgs/kcompletion/template
index 8514a8625df8..fb4b7970b807 100644
--- a/srcpkgs/kcompletion/template
+++ b/srcpkgs/kcompletion/template
@@ -1,6 +1,6 @@
 # Template file for 'kcompletion'
 pkgname=kcompletion
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,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=08f1525c6cee8babe399c941bb85d04be9dade0341d1d85c6beccd2e93dc7ceb
+checksum=7f8c9355e8875b619ca852741e972f41c252aa2e95b439161acc7b32d9e8fb9c
 
 kcompletion-devel_package() {
 	short_desc+=" - development"

From eed885d78c8544986988f9f9e9c4bf9fb95a9e6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:02 +0200
Subject: [PATCH 1356/1686] kconfig: update to 5.93.0.

---
 srcpkgs/kconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfig/template b/srcpkgs/kconfig/template
index 44dc8ae429da..402cf928ecbb 100644
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfig'
 pkgname=kconfig
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7801b641b88368a0c021272073c692337b42ee28f0025d106942c8ce873b0523
+checksum=71857c20d4829017c22dd6d46ae5a642c86344960e21bc1520458fb76d02c06e
 
 do_check() {
 	cd build

From 2a09e6772bf9de5ea68a8ca15101a9423026aad8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:03 +0200
Subject: [PATCH 1357/1686] kconfigwidgets: update to 5.93.0.

---
 srcpkgs/kconfigwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kconfigwidgets/template b/srcpkgs/kconfigwidgets/template
index f14d66ae93ef..a8fec7e42dbb 100644
--- a/srcpkgs/kconfigwidgets/template
+++ b/srcpkgs/kconfigwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kconfigwidgets'
 pkgname=kconfigwidgets
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=4259eed35d9ac307ecc30e64833bad7a89ef58fc7125054eb39716d27a4a274a
+checksum=db18e0f2217ead6dd6f5877551902d5da86aa026686e3c564f5f96be279f24bb
 
 kconfigwidgets-devel_package() {
 	short_desc+=" - development"

From 8bbfbb556049d3a61022ed3f7847a44b95c3cb7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:05 +0200
Subject: [PATCH 1358/1686] kcontacts: update to 5.93.0.

---
 srcpkgs/kcontacts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcontacts/template b/srcpkgs/kcontacts/template
index 544ae3c7f4cd..bf35f07ce999 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.92.0
+version=5.93.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=1276006e50f507216a8241ca4b26b02c67c42e5bee26a6b391db6ae4f72533ce
+checksum=5d7c8c6c6ccfa99188d9e4d7ab6165ec5b2bceea59a01edc6b309910fd604c75
 
 kcontacts-devel_package() {
 	short_desc+=" - development"

From 5577f4824beada26a5fb4524236de42196f5549b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:06 +0200
Subject: [PATCH 1359/1686] kcoreaddons: update to 5.93.0.

---
 srcpkgs/kcoreaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcoreaddons/template b/srcpkgs/kcoreaddons/template
index 4838e315b9d0..0db03a77e30b 100644
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kcoreaddons'
 pkgname=kcoreaddons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=df5f718f324aa2b58191438c8aa5f7498a7997eff990d16ffbc9f19efd1a6667
+checksum=920a278af97dea3add06770a6f3604744c20d667973cb71cf477145785dbf043
 
 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \

From df36f947307bc6492cf2534155e9f61c5314248c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:07 +0200
Subject: [PATCH 1360/1686] kcrash: update to 5.93.0.

---
 srcpkgs/kcrash/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcrash/template b/srcpkgs/kcrash/template
index b9fadfc544d0..c05bc4600336 100644
--- a/srcpkgs/kcrash/template
+++ b/srcpkgs/kcrash/template
@@ -1,6 +1,6 @@
 # Template file for 'kcrash'
 pkgname=kcrash
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kcrash"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=9bc5605b5026f55d9c2c1ca32c79842c3ad0f5c042e480fe1e7027b2692526c7
+checksum=2ff8d6c6924b2b752ef4a929390606bb55ce2aa55c582927269bd65556992dd6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools kwindowsystem-devel kcoreaddons"

From 201bacdd2293d40298726238aae3b60c434ce219 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:09 +0200
Subject: [PATCH 1361/1686] kdav: update to 5.93.0.

---
 srcpkgs/kdav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdav/template b/srcpkgs/kdav/template
index caa894c1356c..32b1865fbe2d 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.92.0
+version=5.93.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=f3b16c473b104f83f6124f96f2b06a6c72a447eb19ba31a90e3f4725e732b1c4
+checksum=a7d3d40120f0a1b20f8492ea1635507a95e041582f5496a133de24720934ad68
 
 kdav-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From 8b488a4a813481c4a0cecc4f07079a188e526896 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:10 +0200
Subject: [PATCH 1362/1686] kdbusaddons: update to 5.93.0.

---
 srcpkgs/kdbusaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdbusaddons/template b/srcpkgs/kdbusaddons/template
index 741652529177..5e03127aa8a2 100644
--- a/srcpkgs/kdbusaddons/template
+++ b/srcpkgs/kdbusaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kdbusaddons'
 pkgname=kdbusaddons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdbusaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7c03f33cc49ffa80e509f654f410cb142e917bceb2f35f08836dc46ed268ae54
+checksum=cc2c74501e65b97af1849ff454e51393f3a07755c155854bdee741a006822ad9
 
 do_check() {
 	cd build

From a8137788083d5774de5fd6e0016bf9b92a8f83ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:11 +0200
Subject: [PATCH 1363/1686] kdeclarative: update to 5.93.0.

---
 srcpkgs/kdeclarative/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdeclarative/template b/srcpkgs/kdeclarative/template
index 2c6a351f34f3..96902ea275a9 100644
--- a/srcpkgs/kdeclarative/template
+++ b/srcpkgs/kdeclarative/template
@@ -1,6 +1,6 @@
 # Template file for 'kdeclarative'
 pkgname=kdeclarative
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdeclarative"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe964d77fea37c04eee3863d2b4227b76e33f16583906c284b532a461982d5b3
+checksum=08a945c793aa8d89d87c42d29c9c11e7c28c47916ae728369ab478892d325067
 
 do_check() {
 	cd build

From b5e2c1b79679b95e518cbb2279c89c6e17748e77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:13 +0200
Subject: [PATCH 1364/1686] kded: update to 5.93.0.

---
 srcpkgs/kded/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kded/template b/srcpkgs/kded/template
index 15d1ebbf684e..30238cc5f878 100644
--- a/srcpkgs/kded/template
+++ b/srcpkgs/kded/template
@@ -1,6 +1,6 @@
 # Template file for 'kded'
 pkgname=kded
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only, LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kded"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8335531b856cb361ab2e5b390b333eb3405bac4e2bc7c0305994704bd0540e6c
+checksum=1992310921cccaf8fa2ca1abc8328aec5bc2e60a3d9f562f25b30885378159df
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools"

From f089ef914d6b6b361d690d3eede51f83ac061df7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:15 +0200
Subject: [PATCH 1365/1686] kdelibs4support: update to 5.93.0.

---
 srcpkgs/kdelibs4support/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdelibs4support/template b/srcpkgs/kdelibs4support/template
index 5e8bc71495b1..ae42683b9b16 100644
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@@ -1,6 +1,6 @@
 # Template file for 'kdelibs4support'
 pkgname=kdelibs4support
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -17,7 +17,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=292e5e84ad8d7de90f0666b51f085a25b7a9faf521c58379d470d2994004ede0
+checksum=6a3e1d80cc6babc12930f24f9afd1ed10b46ae58ea71d44a466178212b07377c
 
 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)

From baefe64d34a1b8af866eec53766e58a63df458a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:16 +0200
Subject: [PATCH 1366/1686] kdesignerplugin: update to 5.93.0.

---
 srcpkgs/kdesignerplugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesignerplugin/template b/srcpkgs/kdesignerplugin/template
index 8b811b777580..b81b6562cf66 100644
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesignerplugin'
 pkgname=kdesignerplugin
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=066859b345da224f5edb601a5f448540330c9a286980b0c34169646c26a22a4e
+checksum=f19ab4fc1ed58b89642d8f9f75a5da2f2ef0093c97183f336ffeb7208e628aaf
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"

From db7c87d1fbe35b7bba59e1a27193d4e2747585d5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:17 +0200
Subject: [PATCH 1367/1686] kdesu: update to 5.93.0.

---
 srcpkgs/kdesu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdesu/template b/srcpkgs/kdesu/template
index 0ba31e7e1a34..1271d28ade36 100644
--- a/srcpkgs/kdesu/template
+++ b/srcpkgs/kdesu/template
@@ -1,6 +1,6 @@
 # Template file for 'kdesu'
 pkgname=kdesu
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kdesu"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4687dc87a9ada0675801e0c575467bb5f7f7fe21b67ae2ffd1fed80736f95efa
+checksum=7f029d9a8959f0e2ca516ab3fb6b4ebd49ca0f0d19c72369451b6894d8138dbf
 
 kdesu-devel_package() {
 	short_desc+=" - development"

From 5d4882fffb104eed57c7a07d8d35335c403888a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:19 +0200
Subject: [PATCH 1368/1686] kdewebkit: update to 5.93.0.

---
 srcpkgs/kdewebkit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdewebkit/template b/srcpkgs/kdewebkit/template
index df9fd862a13f..c667f015e07b 100644
--- a/srcpkgs/kdewebkit/template
+++ b/srcpkgs/kdewebkit/template
@@ -1,6 +1,6 @@
 # Template file for 'kdewebkit'
 pkgname=kdewebkit
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdewebkit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=4d0a773cad86a642cb90d9844757569f2e2e9d1e96ccf78f73bee885c908d1b6
+checksum=a2fe9b5660763d4dd74244c00bf7b1a407438279a81f2a3ef3813ea250fd2f55
 
 kdewebkit-devel_package() {
 	short_desc+=" - development"

From ec59ac67b502214d7c0bd540f1888efe09f90a84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:20 +0200
Subject: [PATCH 1369/1686] kdnssd: update to 5.93.0.

---
 srcpkgs/kdnssd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdnssd/template b/srcpkgs/kdnssd/template
index a48bf7f3e254..42554c854079 100644
--- a/srcpkgs/kdnssd/template
+++ b/srcpkgs/kdnssd/template
@@ -1,6 +1,6 @@
 # Template file for 'kdnssd'
 pkgname=kdnssd
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kdnssd"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=5f36af49faab84d8ae7ec46f1ba3300c9cdd3d8820dd1e7e48c5c37bcdd844d4
+checksum=dc97364f14b5867ea5bb2986f6ad3c84ab1acc952f50d460b3e9aed03f2f903b
 
 kdnssd-devel_package() {
 	short_desc+=" - development"

From 752f1c83c83877ca0ab0626a8029d240215be746 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:21 +0200
Subject: [PATCH 1370/1686] kdoctools: update to 5.93.0.

---
 srcpkgs/kdoctools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdoctools/template b/srcpkgs/kdoctools/template
index 5e38783fc1b3..a43404728d1c 100644
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@@ -1,6 +1,6 @@
 # Template file for 'kdoctools'
 pkgname=kdoctools
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=86a3aeb8b91dec0e1cd81b646654ebd750a8aedfac9b4d53b9b0019a91720870
+checksum=25e83ff151c53667b94e25a5c41993796164683a43913820a5651f3610b65d5c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDOCBOOKL10NHELPER_EXECUTABLE=/usr/bin/docbookl10nhelper"

From 1127da4b3c2180fd63777bc756cfb73398c10bd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:23 +0200
Subject: [PATCH 1371/1686] kemoticons: update to 5.93.0.

---
 srcpkgs/kemoticons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kemoticons/template b/srcpkgs/kemoticons/template
index 2a4fa32fee02..5b7281e3bca7 100644
--- a/srcpkgs/kemoticons/template
+++ b/srcpkgs/kemoticons/template
@@ -1,6 +1,6 @@
 # Template file for 'kemoticons'
 pkgname=kemoticons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, CC-BY-4.0"
 homepage="https://invent.kde.org/frameworks/kemoticons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fdcfe30941c18a9cb29b58459fbb2ae54a55fd5a0e8688f0c59a7cc7ebf09f07
+checksum=83ca3df374935cf103a8fdaa85900d0acadbffc9d3aa8bfed073e804cd5ae410
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 87ed5bb7c3b6f1efbef2b3a87c645595110d3821 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:25 +0200
Subject: [PATCH 1372/1686] kfilemetadata5: update to 5.93.0.

---
 srcpkgs/kfilemetadata5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfilemetadata5/template b/srcpkgs/kfilemetadata5/template
index ab36e2d86496..eb162fdff6d0 100644
--- a/srcpkgs/kfilemetadata5/template
+++ b/srcpkgs/kfilemetadata5/template
@@ -1,6 +1,6 @@
 # Template file for 'kfilemetadata5'
 pkgname=kfilemetadata5
-version=5.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kfilemetadata"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=d624d3551094cf73d802b6e95bcd78577ce9eb1e9cbb9a8f340dcad066ea15ce
+checksum=3015c071a5f068f6e45d36238aa0243d3788a95ec84362ba79ed0369e676a816
 
 kfilemetadata5-devel_package() {
 	short_desc+=" - development"

From 1c462cb0acbcbe2c3b7c8369183a534112980dfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:26 +0200
Subject: [PATCH 1373/1686] kglobalaccel: update to 5.93.0.

---
 srcpkgs/kglobalaccel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kglobalaccel/template b/srcpkgs/kglobalaccel/template
index 2405d1b174d6..7df12f5a2476 100644
--- a/srcpkgs/kglobalaccel/template
+++ b/srcpkgs/kglobalaccel/template
@@ -1,6 +1,6 @@
 # Template file for 'kglobalaccel'
 pkgname=kglobalaccel
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons pkg-config qt5-qmake qt5-host-tools qt5-tools"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kglobalaccel"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=be7b1e279b63678ec4042f896b159d11c115d05e9831cde6cd67ef4b8e581452
+checksum=c806b8f2b029c7632d99c55cb711f9f4c1697555fde53ad4f67167efee97b712
 
 kglobalaccel-devel_package() {
 	short_desc+=" - development"

From f56724f9ae030841b3a61b1f8d3f2b6719a3d034 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:27 +0200
Subject: [PATCH 1374/1686] kguiaddons: update to 5.93.0.

---
 srcpkgs/kguiaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kguiaddons/template b/srcpkgs/kguiaddons/template
index ea01d37e9ab4..72f3ba0d1e74 100644
--- a/srcpkgs/kguiaddons/template
+++ b/srcpkgs/kguiaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kguiaddons'
 pkgname=kguiaddons
-version=5.92.0
+version=5.93.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=0f6775a565f22900b0de53daa5fe73f7d7e592663e0bb442a8e26ffab27fdf5f
+checksum=27f26392140bd1abcb86c154fd6fd87e50b2493787827b2b1cacaf76544af40a
 
 kguiaddons-devel_package() {
 	short_desc+=" - development"

From 8c88ccaca462781546d12fd7897e07b4316fcdc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:29 +0200
Subject: [PATCH 1375/1686] kholidays: update to 5.93.0.

---
 srcpkgs/kholidays/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kholidays/template b/srcpkgs/kholidays/template
index 163b2dad1ca3..eaa54144eb21 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.92.0
+version=5.93.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=0ed382c49fb10af87bfa3845a3919ed097c9f808f3a5dbb631ef4e68c86b4b10
+checksum=0d4a1fb823501ee73b2c4d80468777adedf93c80f36b3a680cad91cc6704b841
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake"

From 8a561c4ae6c24fe970742559019dea702717cd42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:30 +0200
Subject: [PATCH 1376/1686] khtml: update to 5.93.0.

---
 srcpkgs/khtml/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khtml/template b/srcpkgs/khtml/template
index 7415d7e78a24..de17fc72af8e 100644
--- a/srcpkgs/khtml/template
+++ b/srcpkgs/khtml/template
@@ -1,6 +1,6 @@
 # Template file for 'khtml'
 pkgname=khtml
-version=5.92.0
+version=5.93.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=91a1d79ea382a25614810cd59f800f0a34c6e86c69ef6d0a08d2655f2a93171a
+checksum=31bfb6752ed7248b98e2bdc723e8e10c11b5fc9f7bf7edd8dedad1162f86614b
 
 khtml-devel_package() {
 	short_desc+=" - development"

From ec62269e26cd951a5ffe1f5d61a7bdcda9e0c882 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:32 +0200
Subject: [PATCH 1377/1686] ki18n: update to 5.93.0.

---
 srcpkgs/ki18n/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ki18n/template b/srcpkgs/ki18n/template
index 8b0d17610f56..956d6aa70406 100644
--- a/srcpkgs/ki18n/template
+++ b/srcpkgs/ki18n/template
@@ -1,6 +1,6 @@
 # Template file for 'ki18n'
 pkgname=ki18n
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools
@@ -13,7 +13,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=058032e8e9556f1dadcf0c2bd633da6cfc9673e966dd113388e2b8aee2395777
+checksum=c2705400d175f18612dfe1afb28dc14accf614f7cfd65409dfa7fdcde5237339
 
 ki18n-devel_package() {
 	short_desc+=" - development"

From 22da28f8fa2eac50a94240864c261eeeae79b31e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:34 +0200
Subject: [PATCH 1378/1686] kiconthemes: update to 5.93.0.

---
 srcpkgs/kiconthemes/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kiconthemes/template b/srcpkgs/kiconthemes/template
index 65250bdb3ac6..532d5ec8121e 100644
--- a/srcpkgs/kiconthemes/template
+++ b/srcpkgs/kiconthemes/template
@@ -1,6 +1,6 @@
 # Template file for 'kiconthemes'
 pkgname=kiconthemes
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=2128710ff8bf0a7bbb699fe3a45b231c6b4607ba3e3a3a5d03c25c809233cb23
+checksum=75f7c5b34f4f1a228b4cbd81a284dbfdc0c0810ddd3a39e69f9363ab3598e2b4
 
 kiconthemes-devel_package() {
 	short_desc+=" - development"

From 621deb5360495ae07607b8e6ad6fc712f7d74992 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:35 +0200
Subject: [PATCH 1379/1686] kidletime: update to 5.93.0.

---
 srcpkgs/kidletime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kidletime/template b/srcpkgs/kidletime/template
index e9ed68131b14..0556c9a0e3d0 100644
--- a/srcpkgs/kidletime/template
+++ b/srcpkgs/kidletime/template
@@ -1,6 +1,6 @@
 # Template file for 'kidletime'
 pkgname=kidletime
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons pkg-config extra-cmake-modules qt5-host-tools qt5-x11extras-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kidletime"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e12f14229f7ee587becb5a693374045c460d38c55d61e21eefd78b8db39280d7
+checksum=4d9315dfe1faaeb62eae5ba60f683483de56317826d9b8da2bd58feebcb7b7d9
 
 kidletime-devel_package() {
 	short_desc+=" - development"

From 0994945e7426be6857463041bbfdd6b1800fb14c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:37 +0200
Subject: [PATCH 1380/1686] kimageformats: update to 5.93.0.

---
 srcpkgs/kimageformats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kimageformats/template b/srcpkgs/kimageformats/template
index ebd6e81db298..bc8b9f09a2c6 100644
--- a/srcpkgs/kimageformats/template
+++ b/srcpkgs/kimageformats/template
@@ -1,6 +1,6 @@
 # Template file for 'kimageformats'
 pkgname=kimageformats
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DKIMAGEFORMATS_HEIF=ON"
@@ -12,4 +12,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=ce049989125a49dc9bf8d2a2f2f5a2fec79e25a6343087b024fefd0131eca369
+checksum=15b0ed9de57af95979e0e40496b980f243cd81e2a400d5f64d12478e1dddc7d0

From 7b34c005c2a1069ccb1f0b46cbc62ceeb0ec6199 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:39 +0200
Subject: [PATCH 1381/1686] kinit: update to 5.93.0.

---
 srcpkgs/kinit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinit/template b/srcpkgs/kinit/template
index a0b0aaee9112..f94cc0038dd6 100644
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@@ -1,6 +1,6 @@
 # Template file for 'kinit'
 pkgname=kinit
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules libcap-progs pkg-config
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cb517912bf17d4b4f015cb1ab935eebadc52ece050f21b33fcb4e799b0c5f3ce
+checksum=db36a3bd5b30163b7a4ed8c7a907bec585acab841306755b0d8d32ef3d1ce498
 
 kinit-devel_package() {
 	short_desc+=" - development"

From e1a139716aee41294483b239dedbf8a42f1dfeb6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:41 +0200
Subject: [PATCH 1382/1686] kio: update to 5.93.0.

---
 srcpkgs/kio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio/template b/srcpkgs/kio/template
index ba96fa5e727d..3047212a7964 100644
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@@ -1,6 +1,6 @@
 # Template file for 'kio'
 pkgname=kio
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON
@@ -16,7 +16,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=d4433f9890f71afe3d7d268e978e0ade96f506a38e41f7d57ffe832d96d44cb3
+checksum=d290a4bcfb5ec9eb9047c84a7c420df831131b92ab6c9d28a3aa0eef9f5d4c44
 
 do_check() {
 	: # Pain to get working in limited enviroment, excpects e.g. real disks

From 2ae16a6b10051aabbc99ad6f11b8ff1d45d51b1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:42 +0200
Subject: [PATCH 1383/1686] kirigami2: update to 5.93.0.

---
 srcpkgs/kirigami2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kirigami2/template b/srcpkgs/kirigami2/template
index 1b85d94048f0..f504292b6363 100644
--- a/srcpkgs/kirigami2/template
+++ b/srcpkgs/kirigami2/template
@@ -1,6 +1,6 @@
 # Template file for 'kirigami2'
 pkgname=kirigami2
-version=5.92.0
+version=5.93.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=0adaff98ea70c577c9e6d7a688e5c52529a59f56a7d0c8ffce295f342e203d5c
+checksum=a7c2a824eb776011ae9dc94698588e8c6988ac399669723631fab26edd47ab8f
 
 kirigami2-devel_package() {
 	short_desc+=" - development"

From 03574aed01165a528acd438d7265140d7bb9b988 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:44 +0200
Subject: [PATCH 1384/1686] kitemmodels: update to 5.93.0.

---
 srcpkgs/kitemmodels/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemmodels/template b/srcpkgs/kitemmodels/template
index beaa9faddb9e..bbf9bbf094c8 100644
--- a/srcpkgs/kitemmodels/template
+++ b/srcpkgs/kitemmodels/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemmodels'
 pkgname=kitemmodels
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-declarative-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kitemmodels"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e65c7f58d602b4b8160b34a3a841d1c7aac77695b73e53aa715765cf42a8e89b
+checksum=5bb9918b92ac37f1bc52c5abe04e8dbea54f31fa0101edad6d9e92c3a9f0485b
 
 kitemmodels-devel_package() {
 	short_desc+=" - development"

From 00322bc6929bd8517fde5aedbbc40b8f3b1d50ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:45 +0200
Subject: [PATCH 1385/1686] kitemviews: update to 5.93.0.

---
 srcpkgs/kitemviews/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kitemviews/template b/srcpkgs/kitemviews/template
index ab3405ab8350..4518704713d6 100644
--- a/srcpkgs/kitemviews/template
+++ b/srcpkgs/kitemviews/template
@@ -1,6 +1,6 @@
 # Template file for 'kitemviews'
 pkgname=kitemviews
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -12,7 +12,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=058b4d4228387558b03aceb0ed286cbbe89ea07bb6fed968beba0b51678886d6
+checksum=93f01dec3b795b28cc6f6859873ebb941a9504eaafd13ff9f72b987d71e55abf
 
 kitemviews-devel_package() {
 	short_desc+=" - development"

From c772362e490ab2aac6c7f9a221e30e01b4ef59cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:46 +0200
Subject: [PATCH 1386/1686] kjobwidgets: update to 5.93.0.

---
 srcpkgs/kjobwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjobwidgets/template b/srcpkgs/kjobwidgets/template
index cbe04600c928..c79eb99642d6 100644
--- a/srcpkgs/kjobwidgets/template
+++ b/srcpkgs/kjobwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'kjobwidgets'
 pkgname=kjobwidgets
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -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=df24b96f77ddbd2f63a6c2a3c54c4e712ef11a63b93c0b02d949d85af2fb8526
+checksum=62449b747d6fa5b32a1cb317b2b614172e42be3b85f39b02d6a07adc267c39fb
 
 kjobwidgets-devel_package() {
 	short_desc+=" - development"

From aff46c0d361faa2da339dbad3ec1128cc39c61ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:48 +0200
Subject: [PATCH 1387/1686] kjs: update to 5.93.0.

---
 srcpkgs/kjs/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjs/template b/srcpkgs/kjs/template
index 6990b50f3feb..263bf627d7ab 100644
--- a/srcpkgs/kjs/template
+++ b/srcpkgs/kjs/template
@@ -1,6 +1,6 @@
 # Template file for 'kjs'
 pkgname=kjs
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules perl pkg-config"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjs"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=04072d527501c92f1e0144e9dcc114e108bfb5a2b50bed8a9b037474aaa6f118
+checksum=85aa01de9c2775564c895d3efbcfb8cc68da9a84f511176fef16742cbbf90942
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake kdoctools kjs"

From 0f5d4aa77976dca6cd80e1f9acce7865f926e610 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:49 +0200
Subject: [PATCH 1388/1686] kjsembed: update to 5.93.0.

---
 srcpkgs/kjsembed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kjsembed/template b/srcpkgs/kjsembed/template
index f606b2123fb1..d93a1a3b818c 100644
--- a/srcpkgs/kjsembed/template
+++ b/srcpkgs/kjsembed/template
@@ -1,6 +1,6 @@
 # Template file for 'kjsembed'
 pkgname=kjsembed
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="gettext kcoreaddons extra-cmake-modules"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kjsembed"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=d7c26538a0b7ac804565840d61df2681ea4b729abb6ecfbfcae3c20536ca6035
+checksum=fa55d3bf0b3f9026eb573cc909b1fbe53bea7090f3da465e9bb293dc0f81d424
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake python kdoctools"

From 23608c5c8203cd15b7e4378290e4af422f328385 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:50 +0200
Subject: [PATCH 1389/1686] kmediaplayer: update to 5.93.0.

---
 srcpkgs/kmediaplayer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmediaplayer/template b/srcpkgs/kmediaplayer/template
index 5c9a97d7230a..5ebec5415b18 100644
--- a/srcpkgs/kmediaplayer/template
+++ b/srcpkgs/kmediaplayer/template
@@ -1,6 +1,6 @@
 # Template file for 'kmediaplayer'
 pkgname=kmediaplayer
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="X11"
 homepage="https://invent.kde.org/frameworks/kmediaplayer"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=fe38eb2ed593e2e68909129a042d52121b12b9350524a7a1463c24c9c58a97a6
+checksum=ada8afb5b0fea3af2112812792eff062d3830dfde4d8784b7e1fc3711e74830a
 
 kmediaplayer-devel_package() {
 	short_desc+=" - development"

From 9b58792b358a9127ea17cad496032f251be47490 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:52 +0200
Subject: [PATCH 1390/1686] knewstuff: update to 5.93.0.

---
 srcpkgs/knewstuff/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knewstuff/template b/srcpkgs/knewstuff/template
index ba2a38d746ca..dc604a8611cc 100644
--- a/srcpkgs/knewstuff/template
+++ b/srcpkgs/knewstuff/template
@@ -1,6 +1,6 @@
 # Template file for 'knewstuff'
 pkgname=knewstuff
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knewstuff"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4b14aee55d7701c72d05030fad508a5cb89fee34656d4d84c2d977a3c2a66c3f
+checksum=2adc48e26c04c05f61f6ff1007f77ea43036b76d769535617e88d3f35ebb5759
 
 knewstuff-devel_package() {
 	short_desc+=" - development"

From 1296b4f0777c8748f017c91398ee3ecdd766321e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:53 +0200
Subject: [PATCH 1391/1686] knotifications: update to 5.93.0.

---
 srcpkgs/knotifications/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifications/template b/srcpkgs/knotifications/template
index 27a83bf27de8..782d259b261b 100644
--- a/srcpkgs/knotifications/template
+++ b/srcpkgs/knotifications/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifications'
 pkgname=knotifications
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=ON"
@@ -14,7 +14,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifications"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=8c4e095e3d96140f19e9f2e2dbc74df174e29416455671fc6680828038ea94b7
+checksum=fe191b1fe55881d7e212a3b70fe08d53e47c32793d38f5d5a4d82b796796da4b
 
 knotifications-devel_package() {
 	short_desc+=" - development"

From 03da393ea576be8733bbfc8d9280a2e31e653cb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:54 +0200
Subject: [PATCH 1392/1686] knotifyconfig: update to 5.93.0.

---
 srcpkgs/knotifyconfig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/knotifyconfig/template b/srcpkgs/knotifyconfig/template
index f33e7ca63304..1ac13b7254db 100644
--- a/srcpkgs/knotifyconfig/template
+++ b/srcpkgs/knotifyconfig/template
@@ -1,6 +1,6 @@
 # Template file for 'knotifyconfig'
 pkgname=knotifyconfig
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/knotifyconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=f7f452e3197886a2afdfaa5a2954d412eb0ae2bc47ce742902765c053239313a
+checksum=cc9de166631555451965cd007b82f0ab529d6b909bc259e26e59feee586619cd
 
 knotifyconfig-devel_package() {
 	short_desc+=" - development"

From 81dbcb6b1ea31877ec662f322f37aa34886b8dba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:56 +0200
Subject: [PATCH 1393/1686] kpackage: update to 5.93.0.

---
 srcpkgs/kpackage/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpackage/template b/srcpkgs/kpackage/template
index 7488611aa6d5..0c03af3cb837 100644
--- a/srcpkgs/kpackage/template
+++ b/srcpkgs/kpackage/template
@@ -1,6 +1,6 @@
 # Template file for 'kpackage'
 pkgname=kpackage
-version=5.92.0
+version=5.93.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/kpackage"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=361f75fb4e3dff46e6dab42d858488af58fd40f3af1f7a39881ea9240cd866ab
+checksum=8de6ecd6ed1cf746b9919d93283aa650922211b51bb2d22027102f67c42ec5cd
 
 post_install() {
 	vsed -e 's;[$]{_IMPORT_PREFIX};/usr;g' \

From db8f8949469d0d70ed8829e1b07242559b8d3974 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:57 +0200
Subject: [PATCH 1394/1686] kparts: update to 5.93.0.

---
 srcpkgs/kparts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kparts/template b/srcpkgs/kparts/template
index 681aec459145..9ed54c4d5bd5 100644
--- a/srcpkgs/kparts/template
+++ b/srcpkgs/kparts/template
@@ -1,6 +1,6 @@
 # Template file for 'kparts'
 pkgname=kparts
-version=5.92.0
+version=5.93.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=094e18b2e9119f1c197c625235e639204ab5aa1910b13ae4317c8145b4fe3318
+checksum=c888e9664cc71a2f52904fa42d6bcedaa76c50c720ef0bee8d8b0c98bbcd1675
 
 do_check() {
 	: # test can not find packages assets?!

From 61cabb92ea0df66463ed97a5e4cba5348245e327 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:43:59 +0200
Subject: [PATCH 1395/1686] kpeople: update to 5.93.0.

---
 srcpkgs/kpeople/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpeople/template b/srcpkgs/kpeople/template
index 717d2756b92d..b6d0c7054015 100644
--- a/srcpkgs/kpeople/template
+++ b/srcpkgs/kpeople/template
@@ -1,6 +1,6 @@
 # Template file for 'kpeople'
 pkgname=kpeople
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kpeople"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=b313729131bfbdb0ffd24ded926a2c6604dd06a18bd612c2ead6aa886f29c571
+checksum=d3e1266982fa2abdd7b216d018569ea83c71312e2cfa35a0bee845e8bb49f371
 
 do_check() {
 	cd build

From 71be7d6466e33fab07815b58885cb49d7d5e2fc9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:00 +0200
Subject: [PATCH 1396/1686] kplotting: update to 5.93.0.

---
 srcpkgs/kplotting/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kplotting/template b/srcpkgs/kplotting/template
index 6b6fa4db6f88..a39daf53e9c9 100644
--- a/srcpkgs/kplotting/template
+++ b/srcpkgs/kplotting/template
@@ -1,6 +1,6 @@
 # Template file for 'kplotting'
 pkgname=kplotting
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DBUILD_DESIGNERPLUGIN=ON"
@@ -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=c95d63e2e4c4abbf625ec1cfe749314c1a90dc5be4a90a1ea1617bc969071ed1
+checksum=586d1b694213f55259ffb6a96a10648baff6e3ce45c58d7c44734d6096b6a26d
 
 kplotting-devel_package() {
 	short_desc+=" - development"

From e3ec4e575f950b79eb5208e235ff23d9fe354346 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:01 +0200
Subject: [PATCH 1397/1686] kpty: update to 5.93.0.

---
 srcpkgs/kpty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpty/template b/srcpkgs/kpty/template
index 47612b152d68..c5e5c306e492 100644
--- a/srcpkgs/kpty/template
+++ b/srcpkgs/kpty/template
@@ -1,6 +1,6 @@
 # Template file for 'kpty'
 pkgname=kpty
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DUTEMPTER_EXECUTABLE=/usr/lib/utempter/utempter"
@@ -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=cb1dac5f8f7ba059ef967a2cf3d1580a29a8d7b373ef67e82e0ac4f0285ee052
+checksum=2a05154dbf9eb082f32f33b494dc36c3b24a59c14521167f3306a04c3649ec12
 
 kpty-devel_package() {
 	short_desc+=" - development"

From c525cc7952943770967de73152f0080c7f486390 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:03 +0200
Subject: [PATCH 1398/1686] kquickcharts: update to 5.93.0.

---
 srcpkgs/kquickcharts/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kquickcharts/template b/srcpkgs/kquickcharts/template
index d2d5278ba25c..4fe68d7329a9 100644
--- a/srcpkgs/kquickcharts/template
+++ b/srcpkgs/kquickcharts/template
@@ -1,6 +1,6 @@
 # Template file for 'kquickcharts'
 pkgname=kquickcharts
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-only OR LGPL-3.0-only"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/kquickcharts-${version}.tar.xz"
-checksum=1a430e2909b137466cf41c334a60ebc01e4cde82e71acbb167cd64d1f13e8678
+checksum=24346ac484d1d785bff27e0de5d29a7f7d3d73568074f8bdaeb869ff1004a848
 
 do_check() {
 	cd build

From b4548c1aee5349ab2f7bb56103629b737ee512f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:04 +0200
Subject: [PATCH 1399/1686] kross: update to 5.93.0.

---
 srcpkgs/kross/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kross/template b/srcpkgs/kross/template
index 14c6ba42f541..31a60cd2c56f 100644
--- a/srcpkgs/kross/template
+++ b/srcpkgs/kross/template
@@ -1,6 +1,6 @@
 # Template file for 'kross'
 pkgname=kross
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kross"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=129e2840eb1f33c95d50cde79a82f784cf735c3f1ae636f15dcf695c0b0c1ebf
+checksum=2ba6fd2438731b1704537889120c0dcdf1eb36bffd1e921736e85834a5551ac3
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"

From d00c83e90a72eaf2fcb1683f0d77237d4777241c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:05 +0200
Subject: [PATCH 1400/1686] krunner: update to 5.93.0.

---
 srcpkgs/krunner/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krunner/template b/srcpkgs/krunner/template
index 4fab48018a19..6eb7f598ef04 100644
--- a/srcpkgs/krunner/template
+++ b/srcpkgs/krunner/template
@@ -1,6 +1,6 @@
 # Template file for 'krunner'
 pkgname=krunner
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/krunner"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=3fc80c5d66359e4593115b58fcd055ca9cab8f23376123094e13c5d4bdc48fed
+checksum=2dc6b9169d415d87f5e2d82e2263183f42589cc1e962c9d6d0c60b6dfa48c991
 
 do_check() {
 	cd build

From 07e5130f3fdfec75c62f968e9c8fe1cd9c2a8041 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:07 +0200
Subject: [PATCH 1401/1686] kservice: update to 5.93.0.

---
 srcpkgs/kservice/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kservice/template b/srcpkgs/kservice/template
index adda7f1fe8b9..de717b3257a9 100644
--- a/srcpkgs/kservice/template
+++ b/srcpkgs/kservice/template
@@ -1,6 +1,6 @@
 # Template file for 'kservice'
 pkgname=kservice
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules flex bison gettext"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kservice"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=52e2d9654bbade7db91c647192b78bc3ac1feedc0c279e9c371142aa5ec82ef8
+checksum=46cf92f837fb890e311c5affaaa8b01d1d66b47dd272a30ae148472ef3e67431
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel kcoreaddons kdoctools"

From 84faefb09cf30a0d76a5045d8475efde9ef3edc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:08 +0200
Subject: [PATCH 1402/1686] ksolid: update to 5.93.0.

---
 srcpkgs/ksolid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksolid/template b/srcpkgs/ksolid/template
index d954a2e1318d..d38f0b79b185 100644
--- a/srcpkgs/ksolid/template
+++ b/srcpkgs/ksolid/template
@@ -1,6 +1,6 @@
 # Template file for 'ksolid'
 pkgname=ksolid
-version=5.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname#k}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/solid"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname#k}-${version}.tar.xz"
-checksum=8926c859af4b6b14e0967fc3b76ca0e76de27d0ab544087eefdffe40518b5a9c
+checksum=22eff3f94608793fecb532e097d9022a14c828a0ffad0f73666088153f0d6bea
 
 libksolid_package() {
 	short_desc+=" - runtime library"

From b387924adab89525777023a0d70643da0710528f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:10 +0200
Subject: [PATCH 1403/1686] ktexteditor: update to 5.93.0.

---
 srcpkgs/ktexteditor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktexteditor/template b/srcpkgs/ktexteditor/template
index 3dcd6b5a7433..6e0d131bcd2c 100644
--- a/srcpkgs/ktexteditor/template
+++ b/srcpkgs/ktexteditor/template
@@ -1,6 +1,6 @@
 # Template file for 'ktexteditor'
 pkgname=ktexteditor
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="
@@ -14,7 +14,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=bcd01c3ca07d02106de1c68156e568ded7686ca9557b30a04f7b4e24cf43fb8c
+checksum=7af437b882cd2da9cf9780cb660f9242b9c2400a5ff55cf6ca8608b6e62bd6c3
 
 do_check() {
 	cd build

From 0017c9e51c8647f82164022e087233e01275aac8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:11 +0200
Subject: [PATCH 1404/1686] ktextwidgets: update to 5.93.0.

---
 srcpkgs/ktextwidgets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ktextwidgets/template b/srcpkgs/ktextwidgets/template
index 2768b6f1ddcb..d685d6d0a91a 100644
--- a/srcpkgs/ktextwidgets/template
+++ b/srcpkgs/ktextwidgets/template
@@ -1,6 +1,6 @@
 # Template file for 'ktextwidgets'
 pkgname=ktextwidgets
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/ktextwidgets"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=fe867bf498a5170a9fba91dff652b68fa5cae2af8864dbe89a6e54638ff90b0c
+checksum=e27f588929db35f485ebbd6ddec45ec0c56f86844935013f8a39df8bdfb7c215
 
 ktextwidgets-devel_package() {
 	short_desc+=" - development"

From f1c28a7ae91c2ea9d5c0224c0b083a04d1b5c82c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:12 +0200
Subject: [PATCH 1405/1686] kunitconversion: update to 5.93.0.

---
 srcpkgs/kunitconversion/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kunitconversion/template b/srcpkgs/kunitconversion/template
index 73f122a4fc6b..0629a5319eb0 100644
--- a/srcpkgs/kunitconversion/template
+++ b/srcpkgs/kunitconversion/template
@@ -1,6 +1,6 @@
 # Template file for 'kunitconversion'
 pkgname=kunitconversion
-version=5.92.0
+version=5.93.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=47e2b4c4b329562044954a67edda4d5ade953bd2a9760f6214c5f8f17239f09e
+checksum=9baefb6aed92d2b32727f9492f1322a9e0b17b609c2d82296f4ee10b55a02fc8
 
 kunitconversion-devel_package() {
 	short_desc+=" - development"

From dba230aaaef61ff8a3b9cc31cee9afe36a7883d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:14 +0200
Subject: [PATCH 1406/1686] kwallet: update to 5.93.0.

---
 srcpkgs/kwallet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template
index 6d2b98d6a7a3..9df7aac1b7ec 100644
--- a/srcpkgs/kwallet/template
+++ b/srcpkgs/kwallet/template
@@ -1,6 +1,6 @@
 # Template file for 'kwallet'
 pkgname=kwallet
-version=5.92.0
+version=5.93.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=71aca76cb0edbf569827709b073bff2edb5c129a85638df4bc666d70786740e5
+checksum=ed56f6477efb250b454f7b7861a16a5ea972487c1373647b7094047ce20fddeb
 
 kwallet-devel_package() {
 	short_desc+=" - development"

From 075630ae6d0e0902fa41fb86ef101a3e40aad4dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:15 +0200
Subject: [PATCH 1407/1686] kwayland: update to 5.93.0.

---
 srcpkgs/kwayland/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwayland/template b/srcpkgs/kwayland/template
index 41c3aee75184..f67e288b91a6 100644
--- a/srcpkgs/kwayland/template
+++ b/srcpkgs/kwayland/template
@@ -1,6 +1,6 @@
 # Template file for 'kwayland'
 pkgname=kwayland
-version=5.92.0
+version=5.93.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=95e097cefbe4e260129d77ab9fe3013818b85b9aee6e4744acfa1ada96fed195
+checksum=1648a273ad1c0c1895a0edff9a3e97eb151e1e3533362e0f01d72706ac0a7abe
 
 kwayland-devel_package() {
 	short_desc+=" - development"

From 5112b7b06800c1766d65df59e68812fed721499b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:17 +0200
Subject: [PATCH 1408/1686] kwidgetsaddons: update to 5.93.0.

---
 srcpkgs/kwidgetsaddons/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwidgetsaddons/template b/srcpkgs/kwidgetsaddons/template
index 324be77968b3..1b80c8140b81 100644
--- a/srcpkgs/kwidgetsaddons/template
+++ b/srcpkgs/kwidgetsaddons/template
@@ -1,6 +1,6 @@
 # Template file for 'kwidgetsaddons'
 pkgname=kwidgetsaddons
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-tools-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwidgetsaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=d0e3558d6a7ed550f31d319e6b52d6ed61d693a1aa50e6dd4f430a1324111f2c
+checksum=9c35e17d8c6faae58bfd48180bf968b813e6bfe2d49041b3285f8e326842a410
 
 do_check() {
 	cd build

From 8ef0f015fa96300fe30cb80e0a7adba7896ab7b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:18 +0200
Subject: [PATCH 1409/1686] kwindowsystem: update to 5.93.0.

---
 srcpkgs/kwindowsystem/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwindowsystem/template b/srcpkgs/kwindowsystem/template
index dd6ffc7afaab..f33ceba374d1 100644
--- a/srcpkgs/kwindowsystem/template
+++ b/srcpkgs/kwindowsystem/template
@@ -1,6 +1,6 @@
 # Template file for 'kwindowsystem'
 pkgname=kwindowsystem
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 # Check stage requires a running X Server
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kwindowsystem"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=dcdbbd2b4f2372fc225141361a7d9ae4a8f28ed77a266dc22c20be473fdc7d80
+checksum=97cb223a4d1a7487a3ed496e10ff5e8c320ea7458eb34cbe4ed114bc19ebe4a1
 
 kwindowsystem-devel_package() {
 	short_desc+=" - development"

From 562d8bde0d7eea08caaf14c2545c3a9c819e6e53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:20 +0200
Subject: [PATCH 1410/1686] kxmlgui: update to 5.93.0.

---
 srcpkgs/kxmlgui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlgui/template b/srcpkgs/kxmlgui/template
index 4f30b9703ae8..92a6b2d152d9 100644
--- a/srcpkgs/kxmlgui/template
+++ b/srcpkgs/kxmlgui/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlgui'
 pkgname=kxmlgui
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules kcoreaddons
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kxmlgui"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=e08b4c0d3cc39f788d918bd2ba331966a8af5208233c38a27f029f93a597b743
+checksum=74ba65d95fac0cd09cb66e14d199efc739e1a8c9aec25812f41cfc64d7f4b099
 
 do_check() {
 	cd build

From 82fb360a95f1006ceed9740c9a4451a6ea20358e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:21 +0200
Subject: [PATCH 1411/1686] kxmlrpcclient: update to 5.93.0.

---
 srcpkgs/kxmlrpcclient/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kxmlrpcclient/template b/srcpkgs/kxmlrpcclient/template
index 619fe8a1d3e6..20010cf52f3a 100644
--- a/srcpkgs/kxmlrpcclient/template
+++ b/srcpkgs/kxmlrpcclient/template
@@ -1,6 +1,6 @@
 # Template file for 'kxmlrpcclient'
 pkgname=kxmlrpcclient
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules gettext
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, BSD-2-Clause"
 homepage="https://invent.kde.org/frameworks/kxmlrpcclient"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
-checksum=0e32dca201f8b3d241e985c8dd8854774569d08167a9f3f060a141551e19beab
+checksum=0cb41aff9f5660d95ee6d669f9c70692b55c089d0e1b9705e19b19fc2c49376c
 
 post_install() {
 	vlicense LICENSES/BSD-2-Clause.txt

From 88f5563342d75e82a9cf473d0efe8f2bf565b9d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:22 +0200
Subject: [PATCH 1412/1686] modemmanager-qt5: update to 5.93.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 920b6b1f5705..b669557f11b8 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/modemmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=7ed0b4f48a781fa9166e0446ac14fc21036195cb3d800ce21a546cac02fe5898
+checksum=3aedde6936524b9d0dea07ead34f44fcff50da2ccc0da73d6208893e270a67a8
 
 do_check() {
 	cd build

From e0ffde4b86727a14b9856421a75d3a24fbe17ec0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:24 +0200
Subject: [PATCH 1413/1686] networkmanager-qt5: update to 5.93.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 bc475ea12153..de46374e6511 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.92.0
+version=5.93.0
 revision=1
 wrksrc="${pkgname%5}-${version}"
 build_style=cmake
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/networkmanager-qt"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname%5}-${version}.tar.xz"
-checksum=51ddc8ec0ea60c87c49d5a6709eed86fe1e066d57d059a7f9e774c97b81bfa64
+checksum=b8588ce2d811094682f51ea6150f3c58baa398fc91339bcb511bf60bc0eba960
 
 do_check() {
 	cd build

From 6df31a640383507e83436b4768c567e382d03ce1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:57 +0200
Subject: [PATCH 1414/1686] bluedevil: update to 5.24.4.

---
 srcpkgs/bluedevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bluedevil/template b/srcpkgs/bluedevil/template
index a3eb6e450432..b76585975dd1 100644
--- a/srcpkgs/bluedevil/template
+++ b/srcpkgs/bluedevil/template
@@ -1,6 +1,6 @@
 # Template file for 'bluedevil'
 pkgname=bluedevil
-version=5.24.3
+version=5.24.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=9dd1566eae8bb793330f2f54ab34cd75ed79e7f3924bf78149077b122cc49ec2
+checksum=83778e9cd952c6efeb786395d3fb9f5d4e6aa65d2ef2bc02ad7d256a3201f0d6
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 6cd2c98f0b9d241439cf648235e4c8ef645fc4d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:44:59 +0200
Subject: [PATCH 1415/1686] breeze-gtk: update to 5.24.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 8e1a152f177e..20473061da4b 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.24.3
+version=5.24.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=2911bb2f99ad42ec820cc2adcbf1f8a6f18ba437f72ce216562e12584fd042a4
+checksum=b2fe8150a8576fb39d26b809e6b9cb06e2c2d2b039558ad75307d62ed857a168
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-devel"

From 0095bd5665a65563c55cf3b0fb8645851b67bc0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:03 +0200
Subject: [PATCH 1416/1686] plasma-framework: update to 5.93.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 2ab058fb3036..2ccf8a0c2973 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/plasma-framework"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=c6c2bc624564c74fd80bce170a1c763803d5207ef86108b5724fcba73c3506f7
+checksum=d4a2c687ea2ea8dfe7c256eb58441fc458102ed4b445dc24685513dd96b5c322
 
 do_check() {
 	cd build

From 48119e5fcbe076ce245de3d8bb55a788cfbbca69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:05 +0200
Subject: [PATCH 1417/1686] prison: update to 5.93.0.

---
 srcpkgs/prison/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/prison/template b/srcpkgs/prison/template
index 5f1e84c53f7d..fdd1d0b1a115 100644
--- a/srcpkgs/prison/template
+++ b/srcpkgs/prison/template
@@ -1,6 +1,6 @@
 # Template file for 'prison'
 pkgname=prison
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-tools doxygen
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="MIT"
 homepage="https://community.kde.org/Frameworks"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/prison-${version}.tar.xz"
-checksum=7e6fee9fd56be6c4589c106a3c16a28a4aa5832a24dcefe88302a9ad113ee41e
+checksum=1f43de6622cf263c6b71f9a801174e2791c09b5a0d52c602715659ddfb82fb56
 
 post_install() {
 	vlicense LICENSES/BSD-3-Clause.txt

From 1b609141cfa3cde8644d006e83d55bae715bab61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:06 +0200
Subject: [PATCH 1418/1686] purpose: update to 5.93.0.

---
 srcpkgs/purpose/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/purpose/template b/srcpkgs/purpose/template
index dc71877ba34b..4c9f91568f25 100644
--- a/srcpkgs/purpose/template
+++ b/srcpkgs/purpose/template
@@ -1,6 +1,6 @@
 # Template file for 'purpose'
 pkgname=purpose
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons qt5-qmake qt5-host-tools extra-cmake-modules
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/purpose"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=94613e180550f9d15443ced1f2d93b566350d9a981205b4f98923714dc4f400a
+checksum=dc0bc0c7c5d9b27e21856132ceeb3893555a36f3944ebc97da2eb76a74e92cc4
 
 do_check() {
 	cd build

From 132ce8fac6efaf703e456271af22a4542bc68cf3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:07 +0200
Subject: [PATCH 1419/1686] breeze: update to 5.24.4.

---
 srcpkgs/breeze/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/breeze/template b/srcpkgs/breeze/template
index 0317ba5620d4..64bc70e3be00 100644
--- a/srcpkgs/breeze/template
+++ b/srcpkgs/breeze/template
@@ -1,6 +1,6 @@
 # Template file for 'breeze'
 pkgname=breeze
-version=5.24.3
+version=5.24.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=4b8f92e55c72ed59b7bdfe4be6044fcb0a0816fb6f1ea2bdd9884b58b9a92940
+checksum=e369ee21e6aab1d5e3ae222ecd84bdb59f3d29ce3b61965b498bbfe84c949805
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From df12cc62b5c816577689f216d514103d84938d58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:08 +0200
Subject: [PATCH 1420/1686] qqc2-desktop-style: update to 5.93.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 5af0197811cd..ee40061fe5d0 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.92.0
+version=5.93.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=97530813b9a80505b5484175a55be49cc020244fbe3b1bdaeef15845c3c9bdac
+checksum=161ec085a529e23532badb7723c78051e7b4c3a3fe11d3c4ab8bab93213ba9a8
 
 qqc2-desktop-style-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f6c683f5df75bec3a3efe5a3d3a1a34b061f3121 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:09 +0200
Subject: [PATCH 1421/1686] kactivitymanagerd: update to 5.24.4.

---
 srcpkgs/kactivitymanagerd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kactivitymanagerd/template b/srcpkgs/kactivitymanagerd/template
index 879d45275ce3..e8fc45c00005 100644
--- a/srcpkgs/kactivitymanagerd/template
+++ b/srcpkgs/kactivitymanagerd/template
@@ -1,6 +1,6 @@
 # Template file for 'kactivitymanagerd'
 pkgname=kactivitymanagerd
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,4 +13,4 @@ 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=9cae3e136ee6743474fd96a573b235b6ca8653d4f61f412d9d3ec866861cae63
+checksum=8128371fd75f7dd4ccb2203ad775e6f12db28bbb64047d0fd63eb745d8735529

From 1682ef6c4423b40b5a46d0caea06749a10ca5e16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:09 +0200
Subject: [PATCH 1422/1686] sonnet: update to 5.93.0.

---
 srcpkgs/sonnet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sonnet/template b/srcpkgs/sonnet/template
index b7d08f3d959b..ae917562a6e1 100644
--- a/srcpkgs/sonnet/template
+++ b/srcpkgs/sonnet/template
@@ -1,6 +1,6 @@
 # Template file for 'sonnet'
 pkgname=sonnet
-version=5.92.0
+version=5.93.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/sonnet"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=31fc1dda3db582337529922d38b6eac72b1551c4a0d86fb9307363e061d05722
+checksum=3c146ba45edee43bf2e8bc48b116a38e0c28d2294fe61b44dc8254b881210d9c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" sonnet"

From 8e392920247d36f3e5cfdd89885f3ac5179745c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:10 +0200
Subject: [PATCH 1423/1686] kde-cli-tools: update to 5.24.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 847a7213209e..0f61ce9efc66 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.24.3
+version=5.24.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=fe64da7ce3ad7e7b2d743e06aec0f6666e1909d3ad08867a0173c5c262f7e803
+checksum=ffe4c8d3f4e97c57801360ba32cb70c961ad5796d56d4f0bae10ab2ec68759f0
 
 post_install() {
 	ln -sf ../libexec/kf5/kdesu ${DESTDIR}/usr/bin

From 654cbea6179779df2e590734b65b4bd66846271e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:11 +0200
Subject: [PATCH 1424/1686] syndication: update to 5.93.0.

---
 srcpkgs/syndication/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/syndication/template b/srcpkgs/syndication/template
index 3a35ebf2c174..bbb411538569 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.92.0
+version=5.93.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=1c9ab9772103c001e56afbe0356ede04f953b07be8d2c2e2f2fff3e7b5bd5d46
+checksum=35f14e36076760170df44785df39f522407f58cfa36faf91564696587d8eda23
 
 syndication-devel_package() {
 	short_desc+=" - development"

From ba9ef96603e77331a5191f503173a1ba269622d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:11 +0200
Subject: [PATCH 1425/1686] kde-gtk-config5: update to 5.24.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 a68d66dbb124..ca92bc05101a 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.24.3
+version=5.24.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=fb4bcd30c93e15962153e81ca218f03465f02d1d2d011f267bb96946869ba05c
+checksum=b17aaad5f96890426a8864ba51f026732007e47fd42c4ce4df3e469b455f570b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons"

From 0c66b9893c341f719bc1cdac78cda16544a26fe9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:12 +0200
Subject: [PATCH 1426/1686] syntax-highlighting: update to 5.93.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 5ad6ec877834..0f92ee3b944a 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 configure_args="-DKATEHIGHLIGHTINGINDEXER_EXECUTABLE=/usr/libexec/${pkgname}/katehighlightingindexer"
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/syntax-highlighting"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=99347eaf9b2249f875cacd8319c77f2f8e110d0e7834f51f296ed911dcc7e50e
+checksum=ebdb51f8922d2bc97457c7df376e6600d5ee9805fdc1ac7f7d6be35a3fec711b
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" syntax-highlighting"

From 833ebc5e08bfb7e8a53e5c1b3c59f679c7fe5636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:13 +0200
Subject: [PATCH 1427/1686] kdecoration: update to 5.24.4.

---
 srcpkgs/kdecoration/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdecoration/template b/srcpkgs/kdecoration/template
index a358d713d04a..511d4d627094 100644
--- a/srcpkgs/kdecoration/template
+++ b/srcpkgs/kdecoration/template
@@ -1,6 +1,6 @@
 # Template file for 'kdecoration'
 pkgname=kdecoration
-version=5.24.3
+version=5.24.4
 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/plasma/kdecoration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=bbfc3d83f76dc8d2568bbe2f5395af5887eaba79094fcb901930585f8b53f636
+checksum=2c999206c51a6a6c5ecda211773276438f0069a2e1c81d4903ae5712c6f28c15
 
 kdecoration-devel_package() {
 	short_desc+=" - development"

From 876acaa09aebbae146a3d84cc44e28939ba46a47 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:14 +0200
Subject: [PATCH 1428/1686] threadweaver: update to 5.93.0.

---
 srcpkgs/threadweaver/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/threadweaver/template b/srcpkgs/threadweaver/template
index 9d65ff2b49da..89e6a9a71b90 100644
--- a/srcpkgs/threadweaver/template
+++ b/srcpkgs/threadweaver/template
@@ -1,6 +1,6 @@
 # Template file for 'threadweaver'
 pkgname=threadweaver
-version=5.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-host-tools qt5-devel"
@@ -10,7 +10,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/threadweaver"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=48b0cf3d969437eaeb0839cbb16a35209336fc6e78c1540920f91bbab8b01101
+checksum=6c0db7d276052ebc4d512b43792ae2127cb5fafb1cfee890b5f20bd05c06f185
 
 threadweaver-devel_package() {
 	short_desc+=" - development"

From 1871bd797daad85e54d5897d4237474877cc9e4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:14 +0200
Subject: [PATCH 1429/1686] kdeplasma-addons5: update to 5.24.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 065f0fede44b..22c2981a4dd1 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.24.3
+version=5.24.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=86fe08a744e31ce22124bca4337633f6a2523fbc87d915d3ffd42e65da66f23c
+checksum=d721d32d16f34ef1066bdf2fcb781d5bc1aca7cf5cdf3a71c6fef2dfe668680d
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From a8c266a3186e56f28b14f83ee3327030865d8287 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:15 +0200
Subject: [PATCH 1430/1686] kgamma5: update to 5.24.4.

---
 srcpkgs/kgamma5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kgamma5/template b/srcpkgs/kgamma5/template
index 30fa3d8e6577..75f1ab3613c3 100644
--- a/srcpkgs/kgamma5/template
+++ b/srcpkgs/kgamma5/template
@@ -1,6 +1,6 @@
 # Template file for 'kgamma5'
 pkgname=kgamma5
-version=5.24.3
+version=5.24.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/kgamma5"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=66da3bdfaaddb70c6bbf5739eaa970c8a7f67fd8295872ee201a1445c2df9867
+checksum=73ed9897b2281a8ddd7b47f063d548fa71b683662a63b5648ba590160bcf3f7c

From ec0437fb89cfcd6075ec68356fa1b0240631a9af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:17 +0200
Subject: [PATCH 1431/1686] khotkeys: update to 5.24.4.

---
 srcpkgs/khotkeys/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/khotkeys/template b/srcpkgs/khotkeys/template
index 1a59a447a853..38c24c59dde9 100644
--- a/srcpkgs/khotkeys/template
+++ b/srcpkgs/khotkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'khotkeys'
 pkgname=khotkeys
-version=5.24.3
+version=5.24.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=17f45fa898147b7bd9e1bd4850aef10d03c25dbfe088ef46803a817f7348afcb
+checksum=5aac75b05f0b5a63ea924b02645bbfacfe18fef3d5c23182b482ebc5d17f6d0c
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"

From 112d7644616916ecf5aac7c0c7c85d0eb72c1c97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:18 +0200
Subject: [PATCH 1432/1686] kinfocenter: update to 5.24.4.

---
 srcpkgs/kinfocenter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kinfocenter/template b/srcpkgs/kinfocenter/template
index eac578309f8d..34fe68536c24 100644
--- a/srcpkgs/kinfocenter/template
+++ b/srcpkgs/kinfocenter/template
@@ -1,6 +1,6 @@
 # Template file for 'kinfocenter'
 pkgname=kinfocenter
-version=5.24.3
+version=5.24.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-only"
 homepage="https://invent.kde.org/plasma/kinfocenter"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=d2f5acb7a52434e6b539dc52d23cf09754e313411b32d169f36403ba0801e223
+checksum=dc5b84964de4b68e45300477039c656d622a9546340e997eb8249de6a532b838
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel kdoctools-devel"

From 392e362bb26fa002a9c3299609679068961de513 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:20 +0200
Subject: [PATCH 1433/1686] kmenuedit: update to 5.24.4.

---
 srcpkgs/kmenuedit/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmenuedit/template b/srcpkgs/kmenuedit/template
index 02793528e9ee..3f4a699195b2 100644
--- a/srcpkgs/kmenuedit/template
+++ b/srcpkgs/kmenuedit/template
@@ -1,6 +1,6 @@
 # Template file for 'kmenuedit'
 pkgname=kmenuedit
-version=5.24.3
+version=5.24.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/kmenuedit"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=8bc5d0dfef18e4e1f561cd86f2d023b8d5f951ffd7bcc497633e4ad263cb3bfa
+checksum=147a7e9a15393375c2b22b5dfb025a87f3356cf756cf3b17615ba989bb443466

From 6836c1c558f41b20ccee8157dfdef9d3744935c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:21 +0200
Subject: [PATCH 1434/1686] kscreen: update to 5.24.4.

---
 srcpkgs/kscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreen/template b/srcpkgs/kscreen/template
index 00eb087ad0a1..c7f235baf15e 100644
--- a/srcpkgs/kscreen/template
+++ b/srcpkgs/kscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreen'
 pkgname=kscreen
-version=5.24.3
+version=5.24.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=0e814b3db2c952857bc399e9d3bc349b80ad7367ac755c22dae31004c7684bf2
+checksum=3048edb7e1231b0d7a33b2e10a202e6fce34e34f47079fc87f8177d7aa871b6a
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From ad41903d1f3aa10e0d29b1c9d8977ae73764c072 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:22 +0200
Subject: [PATCH 1435/1686] kscreenlocker: update to 5.24.4.

---
 srcpkgs/kscreenlocker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kscreenlocker/template b/srcpkgs/kscreenlocker/template
index 29b2b0c4f678..4b50eb78ee55 100644
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@@ -1,6 +1,6 @@
 # Template file for 'kscreenlocker'
 pkgname=kscreenlocker
-version=5.24.3
+version=5.24.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/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=03157ca122085fd6d8eeabb369c363ef706a773ad509eb5c08722a0e4bf903b6
+checksum=fb226273064422f9f73b6b091e26396349e0cfd53a88398b79fa2acd1540ecf7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"

From a6f3dcfa403f09f49c31d419b65099acd73526e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:24 +0200
Subject: [PATCH 1436/1686] ksshaskpass: update to 5.24.4.

---
 srcpkgs/ksshaskpass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksshaskpass/template b/srcpkgs/ksshaskpass/template
index 18b7a81583c3..4deaf3217e6c 100644
--- a/srcpkgs/ksshaskpass/template
+++ b/srcpkgs/ksshaskpass/template
@@ -1,6 +1,6 @@
 # Template file for 'ksshaskpass'
 pkgname=ksshaskpass
-version=5.24.3
+version=5.24.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=3bbe16721dabd7fbae659be3f21b4a386d8ca0a6d288c94ccd3954ecbd4d7847
+checksum=34c5d4f196d09c4ebe8990d3761bc70059436e272ad46a761e71b5910e0f44dd
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/ksshaskpass"

From 425991fa6af0cfe6d92bda3680b8dc878fffb68b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:25 +0200
Subject: [PATCH 1437/1686] ksystemstats: update to 5.24.4.

---
 srcpkgs/ksystemstats/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemstats/template b/srcpkgs/ksystemstats/template
index 65541c9fde51..f912db7fea5e 100644
--- a/srcpkgs/ksystemstats/template
+++ b/srcpkgs/ksystemstats/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemstats'
 pkgname=ksystemstats
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake gettext
@@ -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-only"
 homepage="https://invent.kde.org/plasma/ksystemstats"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=4c303bd73bafb254ca8bb5dee0de3b7a2ec4123e719827d26268625047bb330e
+checksum=8dc735e9133ab01e537d71121b0e76e078f4fffce2d86b4c5d62c85878ee47dd

From b3205c8b86b0a3a301dc463c3e8a9b77e9eb9fd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:27 +0200
Subject: [PATCH 1438/1686] kwallet-pam: update to 5.24.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 c32def9d2ba6..9e206f9e5cc6 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.24.3
+version=5.24.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=33dd50c4d9258d1e3326980192e2523490754cd1724ff704c7e36984e5cdad7f
+checksum=99d4e1acc24e89376f6eb5fad78f6055b4c3a9fff73459845af32841743bdf68

From 8034483425a67318eba05e39549524e385b04cbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:27 +0200
Subject: [PATCH 1439/1686] oxygen-icons5: update to 5.93.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 94d05f08582d..62aa2f6abdb6 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.92.0
+version=5.93.0
 revision=1
 build_style=cmake
 hostmakedepends="kcoreaddons extra-cmake-modules qt5-qmake qt5-host-tools"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later"
 homepage="https://invent.kde.org/frameworks/oxygen-icons5"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=ca88b03fdd961f9f8bfa449e1fe74e3ce66e11937be9a8f6d1569a46f6429ef1
+checksum=734e3f44dc3be665350ac5de7f333ab954d3e3b777765b691603b3647c353005
 conflicts="oxygen-icons>=0"
 
 oxygen-icons_package() {

From 8b657a9a98c61691e7892e7ae30ed78f9ce78026 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:28 +0200
Subject: [PATCH 1440/1686] kwayland-integration: update to 5.24.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 95e908c22286..d4dc57cef6d6 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.24.3
+version=5.24.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"
 homepage="https://invent.kde.org/plasma/kwayland-integration"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=9f6f167fd16aebf550ae9bda176237ea80efae4a08826050ccbd2d7a73de05cf
+checksum=d2e74baa0e2966b92330b8df7567b0b1cc85a71ea24c3f453da39aed035aceb2

From 26d6f1d5f48b492799cdde5c8e12918ec06c5e77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:29 +0200
Subject: [PATCH 1441/1686] kwayland-server: update to 5.24.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 7bf6ed477fa5..19bd5a8345ab 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 build_helper="qemu"
@@ -13,7 +13,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=560b20a15b459c5a1e8d0b38e9d53c3a75660bc798fa544e7a9d5c36260e063b
+checksum=d1790bd7584dce9a36a432819b170ce72d34d5df79083b1b41dfe3e021b6e988
 
 kwayland-server-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From e56bcb4a0617c168dacffdde6f2951a7cde373ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:32 +0200
Subject: [PATCH 1442/1686] kwin: update to 5.24.4.

---
 srcpkgs/kwin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwin/template b/srcpkgs/kwin/template
index 435bcc4eb3af..855d5bcaa842 100644
--- a/srcpkgs/kwin/template
+++ b/srcpkgs/kwin/template
@@ -1,6 +1,6 @@
 # Template file for 'kwin'
 pkgname=kwin
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -21,7 +21,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=d84db7e32a13177a0bd030e6c65907cc37c28efad51ee17c518e402235cbf46b
+checksum=e2142321a9b1189665354838a66baeb2189235b705efca2364777bc3a3698ce3
 
 build_options="pipewire"
 build_options_default="pipewire"

From 487665f9c404feb89074a283e388821a4f15d378 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:33 +0200
Subject: [PATCH 1443/1686] kwrited: update to 5.24.4.

---
 srcpkgs/kwrited/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwrited/template b/srcpkgs/kwrited/template
index 5a556a8be1d2..38a32a832c3f 100644
--- a/srcpkgs/kwrited/template
+++ b/srcpkgs/kwrited/template
@@ -1,6 +1,6 @@
 # Template file for 'kwrited'
 pkgname=kwrited
-version=5.24.3
+version=5.24.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=2d768547e131aed99d165b0aee7b080e512a2a5ffab292bff8f71033631cede9
+checksum=62d700b673102f2740ed34e305902260c7035f5c8cc6ef19494a98f3088c0649

From e8d07f95e527e5a13c5611b230715dacfe96da9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:34 +0200
Subject: [PATCH 1444/1686] layer-shell-qt: update to 5.24.4.

---
 srcpkgs/layer-shell-qt/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/layer-shell-qt/template b/srcpkgs/layer-shell-qt/template
index 3642d9819344..0249259ea03e 100644
--- a/srcpkgs/layer-shell-qt/template
+++ b/srcpkgs/layer-shell-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'layer-shell-qt'
 pkgname=layer-shell-qt
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 confiugre_args="-DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner"
@@ -13,7 +13,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://invent.kde.org/plasma/layer-shell-qt"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=5de105ece2d7e6ca2d65305186462b0f9240930276adf7d5eedf77ffeaa67d40
+checksum=a0979fdb2f61a6d2c68fe2d93573d5b46597021600d748a379d18cb9af711e0f
 
 layer-shell-qt-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From f91a8308fb7714b85c017faf383e8f8d03c2e9b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:36 +0200
Subject: [PATCH 1445/1686] libkscreen: update to 5.24.4.

---
 srcpkgs/libkscreen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkscreen/template b/srcpkgs/libkscreen/template
index 5b76a89d08d8..1b82bcea1033 100644
--- a/srcpkgs/libkscreen/template
+++ b/srcpkgs/libkscreen/template
@@ -1,6 +1,6 @@
 # Template file for 'libkscreen'
 pkgname=libkscreen
-version=5.24.3
+version=5.24.4
 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/plasma/libkscreen"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=a6874f0f4066e16ea191341d4d7d73deaf304e117ab64306d311c862393de7a0
+checksum=016dec6d912b2a733ebdd26bfe5e31029651bd5b4e476d95a541765a68dd67f7
 
 libkscreen-devel_package() {
 	short_desc+=" - development"

From dc08951e801779107e19d23700a1f31bd1ad366d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:37 +0200
Subject: [PATCH 1446/1686] libksysguard: update to 5.24.4.

---
 srcpkgs/libksysguard/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libksysguard/template b/srcpkgs/libksysguard/template
index 2fac80ddba4c..c5cc1f764300 100644
--- a/srcpkgs/libksysguard/template
+++ b/srcpkgs/libksysguard/template
@@ -1,6 +1,6 @@
 # Template file for 'libksysguard'
 pkgname=libksysguard
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ 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=148651cf33c7400d7a0df507d0bb75a6924e1ae80f5a46eefeaeb44c848ff1a2
+checksum=76da2a7fb7f760c55111db756d91dd3041721baa8a1f8863ad9e0bc0a6a02402
 
 build_options="webengine"
 

From c35639fee26e3fb83cb9234bb1a722ebfd014446 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:38 +0200
Subject: [PATCH 1447/1686] milou: update to 5.24.4.

---
 srcpkgs/milou/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/milou/template b/srcpkgs/milou/template
index 05ef7d33c83c..fe5a63847469 100644
--- a/srcpkgs/milou/template
+++ b/srcpkgs/milou/template
@@ -1,6 +1,6 @@
 # Template file for 'milou'
 pkgname=milou
-version=5.24.3
+version=5.24.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=31d70b760653e0fe4b9c1b59d7601bb52d307a3d3be3b8f67550a4ea9d22bd1b
+checksum=3109ad6c97415d74fccdfd26681360ff0925e58af7a1c72905437eb99faff37c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 0954cf3754487bc5d33d1cb7ee87895264b68a9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:40 +0200
Subject: [PATCH 1448/1686] oxygen: update to 5.24.4.

---
 srcpkgs/oxygen/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/oxygen/template b/srcpkgs/oxygen/template
index afd58f630f81..2bfa8498a225 100644
--- a/srcpkgs/oxygen/template
+++ b/srcpkgs/oxygen/template
@@ -1,6 +1,6 @@
 # Template file for 'oxygen'
 pkgname=oxygen
-version=5.24.3
+version=5.24.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=018dbd3c276707bbcc8515424ae45a0133cd9a2e31ffd7a0bbc25522586e400a
+checksum=804d033afab3f16319d92a8e5dacfb2a5797f8661a64029ee9e9b3c0b0f87ab4

From ffdfaa5ec46b8cd424ac4ed7a5627db5069c95c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:42 +0200
Subject: [PATCH 1449/1686] plasma-browser-integration: update to 5.24.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 e7e64687c577..ad1a10231bed 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -14,4 +14,4 @@ maintainer="John <me@johnnynator.dev>"
 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=40b07a0065bf24a78997fb210b0550642872ba8c41ba1df6c2cb6785d85851d7
+checksum=677af76b6f7072312d63bd8230af6e6920d7b69942ad69cdf0a29356ce695bc1

From 5f57710424a436455679c679db6f017898b58598 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:44 +0200
Subject: [PATCH 1450/1686] plasma-desktop: update to 5.24.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 58edbeb7f5d3..6d2b3752e213 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -18,6 +18,6 @@ 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=583e7ecfd2e2b766d645284cf13605851d96e2ad7cf2e657b4665aa3f3fd91d3
+checksum=b0e23046300e49acf93d9181d0c8dda2008a9a843a441af2528a91abc5c7d025
 replaces="user-manager>=0"
 python_version=3

From 676515510b110ec7c17b9687fd8878f3789713fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:46 +0200
Subject: [PATCH 1451/1686] plasma-disks: update to 5.24.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 9498075cb52d..025d7ab6e172 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.24.3
+version=5.24.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=9e71a018eb875dd70d7b30f23937098ae8d6d9eab2306b541f916ddf6b64745a
+checksum=cf8a33e81b8d3b6b2d94374eb673adec19639eef8c2df803e1721630c67525d6

From 78c14507db04d99fc1d6a0cb2edba3cf5edd3a45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:47 +0200
Subject: [PATCH 1452/1686] plasma-firewall: update to 5.24.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 474ae2d9cf17..be8466cd08c3 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcmutils
@@ -11,4 +11,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=bff36b7a922a6d0e5e20df539c6995d775f62a1d63c970b55bb430abd580ef64
+checksum=a2bae12766e6536b7cd6d6445368f8249bf79d488d30dc5d57e2aed6442d2f39

From 54c2bcc3e7e8ffeec057b934e591a158c56b99d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:48 +0200
Subject: [PATCH 1453/1686] plasma-integration: update to 5.24.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 59c8998026ba..b5f6098c11dd 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.24.3
+version=5.24.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=7aef8f3b6234b402b978d12e72d9c5eb2b82cbe587afa32f288e2e160b103c0c
+checksum=73d4993d2c7aeabbb068e8d28821566d04f2dcb882dd1d92feadc2062b3b4db4

From 29770f0b1020d9bc0d0f2237bfebac8361e0d6cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:50 +0200
Subject: [PATCH 1454/1686] plasma-nm: update to 5.24.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 cc71c9f54926..ee283ed3c555 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.24.3
+version=5.24.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=2cf64e94ed921546bc0be44f50e3490033a353bf3f0ad7a5a513ef5585fc3bfd
+checksum=086c28cfdaa6f4de785662ccd8123cd48b2a333fbaa2ca70b2a6d9dc3622ec2f
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From 115d8c59789a8d00c5c0b588207989794de78a3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:51 +0200
Subject: [PATCH 1455/1686] plasma-pa: update to 5.24.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 dd3e8e33c8ac..36cffcd23b04 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.24.3
+version=5.24.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=e18fbe9cf9f2948c2d3567ba0bb71126ffef8d7c4df8084a8fa0fd48c0ca0759
+checksum=ffe5b915e5e1d2e5d4de719502793dd5b91cd9715cc44f82c88fc5ff0556d325
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel"

From 18cf3aee0cec491af85073a458ebf9d77c32e2fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:53 +0200
Subject: [PATCH 1456/1686] plasma-sdk: update to 5.24.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 4d713043e9dc..98e9f404e1c2 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.24.3
+version=5.24.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=f9bad013598b8d4e8b0be4ceaa5ad5f1a3326911f7b41e754d57d7a5f1f5d63c
+checksum=ecf35743a28c350aada480248bbc138b726315e53f36bb39afe5fba0d27d6ffe
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kpackage-devel kconfig-devel kcoreaddons-devel plasma-framework"

From d25b6691c363ca37875a139eb391d54cceb5ac58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:54 +0200
Subject: [PATCH 1457/1686] plasma-systemmonitor: update to 5.24.4.

---
 srcpkgs/plasma-systemmonitor/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-systemmonitor/template b/srcpkgs/plasma-systemmonitor/template
index 4cdb8fc83b47..8a77dfdc1496 100644
--- a/srcpkgs/plasma-systemmonitor/template
+++ b/srcpkgs/plasma-systemmonitor/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-systemmonitor'
 pkgname=plasma-systemmonitor
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext qt5-host-tools qt5-qmake
@@ -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=904c0cbf56469b4b021559cc898aef57917cbe36526317c5bc7d34f255c0439d
+checksum=1ff2853be75349892642a0144cc64a15c5f1bffacb0637e8b5c269055ead9a49

From ccb318d24ddb85bb6b717617530ad7c25ad4b8c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:55 +0200
Subject: [PATCH 1458/1686] plasma-thunderbolt: update to 5.24.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 7fbd11daa1a5..6dc40e6212fa 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.24.3
+version=5.24.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=52bec310386158c7f85cd6a8a7db5bedabdb8494f4c6818d8466aa33a6dba5df
+checksum=1efecdd4b5e3302b37ae28964cd371d404189f7879a9752f000b6df4745b0ab3
 
 do_check() {
 	: # Requires running dbus and bolt services

From 916aaeb6153e72fe9f0e09b14a4ce0eadd269b4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:45:57 +0200
Subject: [PATCH 1459/1686] plasma-vault: update to 5.24.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 980ab7d44e7e..7010aff50a86 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.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args=" -DKF5_HOST_TOOLING=/usr/lib/cmake
@@ -14,4 +14,4 @@ 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=8d4998fd105073ce8ae6012426c0bd024529e0ae67c3c3ea9178918fcf87be38
+checksum=0169c2b8d48fbfccf132317f62cec342d2f1cbc7352e52a513ca575198f84966

From 27337e27613b8e87e814535aabc98183d6a58310 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:09 +0200
Subject: [PATCH 1460/1686] plasma-workspace-wallpapers: update to 5.24.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 4d21268470de..f0f8e072fbeb 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.24.3
+version=5.24.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=da252edb70b3373c38fb30318a44f52f047d4f31cbbd26c01c30bf2398c43848
+checksum=243cf6bb613d30ccb92e183938dcd3e02c1c7a11624a447c35c56a5eac3def42

From 26be55875f8e6cd8ae4dd5612aa5cd1cdef0f061 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:13 +0200
Subject: [PATCH 1461/1686] plasma-workspace: update to 5.24.4.

---
 srcpkgs/plasma-workspace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template
index a8ae6f591b0a..ac82a06c4a9e 100644
--- a/srcpkgs/plasma-workspace/template
+++ b/srcpkgs/plasma-workspace/template
@@ -1,6 +1,6 @@
 # Template file for 'plasma-workspace'
 pkgname=plasma-workspace
-version=5.24.3
+version=5.24.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF
@@ -23,7 +23,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=104c5c0ebb000f48c749a6bafdde4cbb1b06d188e1a23ef95a2d035cce442ab4
+checksum=5b0e40b090d6bd1fe1f902a60633e4417ce711b34c32bfd2fce5b16bb9b2ec70
 
 build_options="pipewire"
 build_options_default="pipewire"

From 26f704c75f75bdb106582725c3073e78ab023d3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:14 +0200
Subject: [PATCH 1462/1686] polkit-kde-agent: update to 5.24.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 53ebff5a685c..84ef537290aa 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.24.3
+version=5.24.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=788d392c811ee7c8098d294ccc9fff7f7a695977689a66cb4a1cb52d6f4779d5
+checksum=955246c593d0332bfbe386e81aaf7714e9ac8b8e7743c8c2e4f334b28dd685ad

From 1f91867be5c7daf8ead309401b43aef87b1d88ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:16 +0200
Subject: [PATCH 1463/1686] powerdevil: update to 5.24.4.

---
 srcpkgs/powerdevil/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/powerdevil/template b/srcpkgs/powerdevil/template
index 3eb123d13d50..32ac96524c8f 100644
--- a/srcpkgs/powerdevil/template
+++ b/srcpkgs/powerdevil/template
@@ -1,6 +1,6 @@
 # Template file for 'powerdevil'
 pkgname=powerdevil
-version=5.24.3
+version=5.24.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=495275be84a96572d2e2a7ee343e1ab98c79e7c8eef402a7f26d86863e25f010
+checksum=ef70c00e36d4ddbaedeb0efeba68523289e6e112b12951460c8d36075de9546a

From b0c8c4e9be538453c387ddc3baf34254453304cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:17 +0200
Subject: [PATCH 1464/1686] sddm-kcm: update to 5.24.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 95d916cf3e1d..e0b11b4e4cdc 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.24.3
+version=5.24.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=d0d01ceda262734e87f0cfc28138a1b5478651722a703a55ac744c4e676ec696
+checksum=bef347b9e066a756d71263b19552fbbf9b8a1d6d22861060bdfd1ead5ab9d85d

From 24ddd6dfe317f0e46f7bcf60117cd92c920ef1e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:19 +0200
Subject: [PATCH 1465/1686] systemsettings: update to 5.24.4.

---
 srcpkgs/systemsettings/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/systemsettings/template b/srcpkgs/systemsettings/template
index 57c764dcde4e..b18700451dd6 100644
--- a/srcpkgs/systemsettings/template
+++ b/srcpkgs/systemsettings/template
@@ -1,6 +1,6 @@
 # Template file for 'systemsettings'
 pkgname=systemsettings
-version=5.24.3
+version=5.24.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-only"
 homepage="https://invent.kde.org/plasma/systemsettings"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
-checksum=6200618137f9a1411007a78f9b50eaf78048ce9819428d997a44816d6093d585
+checksum=69921f98956b3559f8c37821b67d32ac8d6aef254888c15df8f86f99903e1533

From 971a33660897cf7e11f6123f614f9abb77c50232 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 01:46:20 +0200
Subject: [PATCH 1466/1686] xdg-desktop-portal-kde: update to 5.24.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 23aaba046f68..9f3a47148a1b 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.24.3
+version=5.24.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=e69f82203ab777382bb4519bdd3e086a8f13c4ba7aa35981a149a72ae4c90d1b
+checksum=11684916288bb4a452b75004e2d122a4a1264a562f7945af98d466e49c59dc1e

From 488b93432224208888d8b1e510453a9024b11bbb Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Wed, 11 Mar 2020 17:05:33 -0300
Subject: [PATCH 1467/1686] New package: uucp-1.07

This package contains the standard UUCP package from the Free Software Foundation, with uucico, uusched, uuxqt, uux, uucp, uustat, uulog, uuname, uuto, uupick and cu.

Added files

Added install files, man manuals and patches.

Fixed whitespace and using vman

Removed -R

Added suggested changes

Added underlining

 New suggested changes
---
 srcpkgs/uucp/INSTALL                          |    7 +
 srcpkgs/uucp/files/uulog.1                    |   53 +
 srcpkgs/uucp/files/uuname.1                   |   33 +
 srcpkgs/uucp/files/uupick.1                   |   34 +
 srcpkgs/uucp/files/uusched.8                  |   20 +
 srcpkgs/uucp/files/uuto.1                     |   21 +
 srcpkgs/uucp/patches/compiler-warnings.patch  |   15 +
 srcpkgs/uucp/patches/manpage.patch            |  189 +
 srcpkgs/uucp/patches/no-sleep.patch           |   65 +
 .../option-to-not-force-hw-control.patch      |  321 +
 srcpkgs/uucp/patches/spelling.patch           |   28 +
 srcpkgs/uucp/patches/uucp-alt-misc.patch      |  111 +
 srcpkgs/uucp/patches/uucp-org.patch           | 8833 +++++++++++++++++
 .../patches/wait-for-correct-parent.patch     |   19 +
 .../uucp/patches/zpipe-improved-pipe.patch    |   40 +
 srcpkgs/uucp/template                         |   39 +
 16 files changed, 9828 insertions(+)
 create mode 100644 srcpkgs/uucp/INSTALL
 create mode 100644 srcpkgs/uucp/files/uulog.1
 create mode 100644 srcpkgs/uucp/files/uuname.1
 create mode 100644 srcpkgs/uucp/files/uupick.1
 create mode 100644 srcpkgs/uucp/files/uusched.8
 create mode 100644 srcpkgs/uucp/files/uuto.1
 create mode 100644 srcpkgs/uucp/patches/compiler-warnings.patch
 create mode 100644 srcpkgs/uucp/patches/manpage.patch
 create mode 100644 srcpkgs/uucp/patches/no-sleep.patch
 create mode 100644 srcpkgs/uucp/patches/option-to-not-force-hw-control.patch
 create mode 100644 srcpkgs/uucp/patches/spelling.patch
 create mode 100644 srcpkgs/uucp/patches/uucp-alt-misc.patch
 create mode 100644 srcpkgs/uucp/patches/uucp-org.patch
 create mode 100644 srcpkgs/uucp/patches/wait-for-correct-parent.patch
 create mode 100644 srcpkgs/uucp/patches/zpipe-improved-pipe.patch
 create mode 100644 srcpkgs/uucp/template

diff --git a/srcpkgs/uucp/INSTALL b/srcpkgs/uucp/INSTALL
new file mode 100644
index 000000000000..b82c17321a29
--- /dev/null
+++ b/srcpkgs/uucp/INSTALL
@@ -0,0 +1,7 @@
+case ${ACTION} in
+post)
+	# fix permissions and owners
+	chown _uucp:_uucp usr/bin/uucico usr/bin/uuxqt usr/bin/uux usr/bin/uucp usr/bin/uustat usr/bin/uuname	usr/bin/cu
+	chmod 4555 usr/bin/uucico usr/bin/uuxqt usr/bin/uux usr/bin/uucp usr/bin/uustat usr/bin/uuname	usr/bin/cu
+	;;
+esac
diff --git a/srcpkgs/uucp/files/uulog.1 b/srcpkgs/uucp/files/uulog.1
new file mode 100644
index 000000000000..001c9bb6993d
--- /dev/null
+++ b/srcpkgs/uucp/files/uulog.1
@@ -0,0 +1,53 @@
+.\" This is under the same license as uulog itself
+.TH UULOG 1
+.SH NAME
+uulog \- Display the UUCP log file.
+.SH SYNOPSIS
+.B uulog
+[\fI\-n number\fR] [\fI\-sf system\fR] [\fI\-u user\fR] [\fI\-DSF\fR] 
+[\fI\-I file\fR] [\fI\-X debug\fR]
+.SH DESCRIPTION
+.I Uulog
+is a program that displays the log file for the Taylor UUCP service.  
+.SH OPTIONS
+.TP
+\fB-n\fR, \fB--lines\fR \fInumber\fR
+Show the given number of lines from the end of the log.
+.TP
+\fB-s\fR, \fB--system\fR \fIsystem\fR
+Print entries for the named system.
+.TP
+\fB-f\fR \fIsystem\fR, \fB--follow\fR=\fIsystem\fR
+Follow entries for the named system.
+.TP
+\fB-u\fR, \fB--user\fR \fIuser\fR
+Print entries for the named user.
+.TP
+\fB-F\fR, \fB--follow\fR
+Follow entries for any system.
+.TP
+\fB-S\fR, \fB--statslog\fR
+Show the statistics file.
+.TP
+\fB-D\fR, \fB--debuglog\fR
+Show the debugging file.
+.TP
+\fB-X\fR, \fB--debug\fR \fIdebug\fR
+Set the debugging level.
+.TP
+\fB-I\fR, \fB--config\fR \fIfile\fR
+Set the configuration file to use.
+.TP
+\fB-v\fR, \fB--version\fR
+Print the software version and exit.
+.TP
+\fB--help\fR
+Print a help screen and exit.
+.SH BUGS
+According to comments in the source, this is a pretty bad implementation 
+of uulog.  It only takes a single \-s and/or \-u switch.
+.SH "SEE ALSO"
+.BR uucp(1) 
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>, by making a manpage out of \fBuulog\fR \fI--help\fR.
diff --git a/srcpkgs/uucp/files/uuname.1 b/srcpkgs/uucp/files/uuname.1
new file mode 100644
index 000000000000..3a23e9407f56
--- /dev/null
+++ b/srcpkgs/uucp/files/uuname.1
@@ -0,0 +1,33 @@
+.\" This is under the same license as uuname itself
+.TH UUNAME 1
+.SH NAME
+uuname \- List the names of the known remote UUCP sites.
+.SH SYNOPSIS
+.B uuname
+[\fI\-a\fR] [\fI\-l\fR] [\fI\-I file\fR]
+.SH DESCRIPTION
+.I Uuname
+is a program that lists the names of the known remote UUCP sites.
+.SH OPTIONS
+.TP
+\fB-a\fR, \fB--aliases\fR
+Display aliases.
+.TP
+\fB-l\fR, \fB--local\fR
+Print the local name.
+.TP
+\fB-I\fR, \fB--config\fR \fIfile\fR
+Set the configuration file to use.
+.TP
+\fB-v\fR, \fB--version\fR
+Print the software version and exit.
+.TP
+\fB--help\fR
+Print a help screen and exit.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucp(1) 
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>, by making a manpage out of \fBuuname\fR \fI--help\fR.
diff --git a/srcpkgs/uucp/files/uupick.1 b/srcpkgs/uucp/files/uupick.1
new file mode 100644
index 000000000000..d2b9377d08ff
--- /dev/null
+++ b/srcpkgs/uucp/files/uupick.1
@@ -0,0 +1,34 @@
+.\" This is under the same license as uupick itself
+.TH UUPICK 1
+.SH NAME
+uupick \- Get files stored in the public directory by uucp \-t.
+.SH SYNOPSIS
+.B uupick
+[\fI\-s system\fR] [\fI\-x debug\fR] [\fI\-I file\fR]
+.SH DESCRIPTION
+.I Uupick
+is a program that gets the files stored in the public directory 
+by uucp \-t.
+.SH OPTIONS
+.TP
+\fB-s\fR, \fB--system\fR \fIsystem\fR
+Only consider files from named system.
+.TP
+\fB-x\fR, \fB--debug\fR \fIdebug\fR
+Set the debugging level.
+.TP
+\fB-I\fR, \fB--config\fR \fIfile\fR
+Set the configuration file to use.
+.TP
+\fB-v\fR, \fB--version\fR
+Print the software version and exit.
+.TP
+\fB--help\fR
+Print a help screen and exit.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucp(1) 
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>, by making a manpage out of \fBuupick\fR \fI--help\fR.
diff --git a/srcpkgs/uucp/files/uusched.8 b/srcpkgs/uucp/files/uusched.8
new file mode 100644
index 000000000000..17a00d68ee25
--- /dev/null
+++ b/srcpkgs/uucp/files/uusched.8
@@ -0,0 +1,20 @@
+.\" This is under the same license as uusched itself
+.TH UUSCHED 8
+.SH NAME
+uusched \- Call all systems which have work in a random order. 
+.SH SYNOPSIS
+.B uusched 
+.SH DESCRIPTION
+.I Uusched
+is a program that calls all systems which have work in a random order. 
+.SH OPTIONS
+Since this a simply a shell script which execs uucico(8), see that manpage 
+for further options.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucico(8),
+.BR sh(1)
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>.
diff --git a/srcpkgs/uucp/files/uuto.1 b/srcpkgs/uucp/files/uuto.1
new file mode 100644
index 000000000000..1d35efff7c41
--- /dev/null
+++ b/srcpkgs/uucp/files/uuto.1
@@ -0,0 +1,21 @@
+.\" This is under the same license as uuto itself
+.TH UUTO 1
+.SH NAME
+uuto \- Send files to a user on another system.
+.SH SYNOPSIS
+.B uuto
+\fIsystem!user\fR
+.SH DESCRIPTION
+.I Uuto
+is a program that sends files to a user on another system.
+.SH OPTIONS
+Since this a simply a shell script that execs uucp(1), see that manpage 
+for further options.
+.SH BUGS
+None apparent.
+.SH "SEE ALSO"
+.BR uucp(1),
+.BR sh(1)
+.SH AUTHOR
+This manual page is a quick write-up for Debian done by Kevin Kreamer 
+<kkreamer@etherhogz.org>.
diff --git a/srcpkgs/uucp/patches/compiler-warnings.patch b/srcpkgs/uucp/patches/compiler-warnings.patch
new file mode 100644
index 000000000000..5e9dc93d04f5
--- /dev/null
+++ b/srcpkgs/uucp/patches/compiler-warnings.patch
@@ -0,0 +1,15 @@
+Description: remove compiler warnings that nowadays result in errors
+Author: Thorsten Alteholz <debian@alteholz.de>
+Index: uucp/uuconv.c
+===================================================================
+--- uucp.orig/uuconv.c	2013-04-26 16:06:16.000000000 +0200
++++ uucp/uuconv.c	2013-05-08 10:49:06.000000000 +0200
+@@ -676,7 +676,7 @@
+     {
+       if ((*pz)[0] != '-' && pz != pzarg)
+ 	fprintf (e, " ");
+-      fprintf (e, *pz);
++      fprintf (e, "%s", *pz);
+     }
+ }
+ 
diff --git a/srcpkgs/uucp/patches/manpage.patch b/srcpkgs/uucp/patches/manpage.patch
new file mode 100644
index 000000000000..573deb3f2c79
--- /dev/null
+++ b/srcpkgs/uucp/patches/manpage.patch
@@ -0,0 +1,189 @@
+Description: lintian detects some issues with these manpages
+Author: Thorsten Alteholz <debian@alteholz.de>
+Index: uucp-1.07/contrib/uurate.man
+===================================================================
+--- uucp-1.07.orig/contrib/uurate.man	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/contrib/uurate.man	2019-01-12 19:51:27.927352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uurate.man,v 1.4 1993/09/28 17:38:31 kdburg Rel $
++.\" ''' $Id: uurate.man,v 1.4 1993/09/28 17:38:31 kdburg Rel $
+ .TH uurate 1
+ .SH NAME
+ uurate \- Report Taylor UUCP statistics
+Index: uucp-1.07/uucp.1
+===================================================================
+--- uucp-1.07.orig/uucp.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uucp.1	2019-01-12 19:52:26.547350782 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $
++.\"''' $Id: uucp.1,v 1.12 2002/03/05 22:13:33 ian Rel $
+ .TH uucp 1 "Taylor UUCP 1.07"
+ .SH NAME
+ uucp \- Unix to Unix copy
+@@ -67,10 +67,10 @@
+ .I uucico
+ (8) daemon, the copy will fail.  The files must be readable by the
+ .I uucico
+-(8) daemon, and by the invoking user.
++(8) daemon, and by the invoking user.   This is the default.
+ .TP 5
+ .B \-C, \-\-copy
+-Copy local source files to the spool directory.  This is the default.
++Copy local source files to the spool directory.
+ .TP 5
+ .B \-d, \-\-directories
+ Create all necessary directories when doing the copy.  This is the
+Index: uucp-1.07/uustat.1
+===================================================================
+--- uucp-1.07.orig/uustat.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uustat.1	2019-01-12 19:51:27.927352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $
++.\" ''' $Id: uustat.1,v 1.14 2002/03/05 22:15:10 ian Rel $
+ .TH uustat 1 "Taylor UUCP 1.07"
+ .SH NAME
+ uustat \- UUCP status inquiry and control
+@@ -404,7 +404,7 @@
+ .SH EXAMPLES
+ .br
+ .nf
+-uustat --all
++uustat \-\-all
+ .fi
+ Display status of all jobs.  A sample output line is as follows:
+ .br
+@@ -441,7 +441,7 @@
+ 
+ .br
+ .nf
+-uustat --executions
++uustat \-\-executions
+ .fi
+ Display status of queued up execution requests.  A sample output line
+ is as follows:
+@@ -472,7 +472,7 @@
+ 
+ .br
+ .nf
+-uustat --list
++uustat \-\-list
+ .fi
+ Display status for all systems with queued up commands.  A sample
+ output line is as follows:
+@@ -489,7 +489,7 @@
+ 
+ .br
+ .nf
+-uustat --status
++uustat \-\-status
+ .fi
+ Display conversation status for all remote systems.  A sample output
+ line is as follows:
+@@ -509,7 +509,7 @@
+ 
+ .br
+ .nf
+-uustat --ps
++uustat \-\-ps
+ .fi
+ Display the status of all processes holding UUCP locks.  The output
+ format is system dependent, as
+@@ -521,7 +521,7 @@
+ .br
+ .in +0.5i
+ .nf
+-uustat --command rmail --older-than 168 --kill-all --no-list --mail --notify --comment "Queued for over 1 week"
++uustat \-\-command rmail \-\-older\-than 168 \-\-kill\-all \-\-no\-list \-\-mail \-\-notify \-\-comment "Queued for over 1 week"
+ .fi
+ .in -0.5i
+ This will kill all
+Index: uucp-1.07/cu.1
+===================================================================
+--- uucp-1.07.orig/cu.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/cu.1	2019-01-12 19:58:34.000000000 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $
++.\" ''' $Id: cu.1,v 1.10 2002/03/05 22:13:33 ian Rel $
+ .TH cu 1 "Taylor UUCP 1.07"
+ .SH NAME
+ cu \- Call up another system
+Index: uucp-1.07/uucico.8
+===================================================================
+--- uucp-1.07.orig/uucico.8	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uucico.8	2019-01-12 19:51:27.927352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $
++.\" ''' $Id: uucico.8,v 1.20 2002/03/05 22:20:48 ian Rel $
+ .TH uucico 8 "Taylor UUCP 1.07"
+ .SH NAME
+ uucico \- UUCP file transfer daemon
+@@ -56,7 +56,7 @@
+ .I uucico
+ will normally refuse to retry the
+ call until a certain (configurable) amount of time
+-has passed.  This may be overriden by the
++has passed.  This may be overridden by the
+ .B -f,
+ .B --force,
+ or
+@@ -175,11 +175,11 @@
+ .B \-\-system,
+ or 
+ .B \-S
+-is specifed, or to all systems which have work when just
++is specified, or to all systems which have work when just
+ .B \-r1
+ or
+ .B \-\-master
+-is specifed), begin an endless loop as with
++is specified), begin an endless loop as with
+ .B \-\-loop.
+ .TP 5
+ .B \-q, \-\-nouuxqt
+Index: uucp-1.07/uux.1
+===================================================================
+--- uucp-1.07.orig/uux.1	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uux.1	2019-01-12 19:51:27.931352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $
++.\" ''' $Id: uux.1,v 1.15 2002/03/05 22:20:48 ian Rel $
+ .TH uux 1 "Taylor UUCP 1.07"
+ .SH NAME
+ uux \- Remote command execution over UUCP
+@@ -202,7 +202,7 @@
+ .SH EXAMPLES
+ .br
+ .nf
+-uux -z - sys1!rmail user1
++uux \-z \- sys1!rmail user1
+ .fi
+ Execute the command ``rmail user1'' on the system sys1, giving it as
+ standard input whatever is given to
+@@ -213,7 +213,7 @@
+ 
+ .br
+ .nf
+-uux 'diff -c sys1!~user1/file1 sys2!~user2/file2 >!file.diff'
++uux 'diff \-c sys1!~user1/file1 sys2!~user2/file2 >!file.diff'
+ .fi
+ Fetch the two named files from system sys1 and system sys2 and execute
+ .I diff
+Index: uucp-1.07/uuxqt.8
+===================================================================
+--- uucp-1.07.orig/uuxqt.8	2019-01-12 19:51:27.939352539 +0100
++++ uucp-1.07/uuxqt.8	2019-01-12 19:51:27.931352540 +0100
+@@ -1,4 +1,4 @@
+-''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $
++.\" ''' $Id: uuxqt.8,v 1.10 2002/03/05 22:20:48 ian Rel $
+ .TH uuxqt 8 "Taylor UUCP 1.07"
+ .SH NAME
+ uuxqt \- UUCP execution daemon
+@@ -41,7 +41,7 @@
+ .br
+ .in +0.5i
+ .nf
+-uuxqt --command rmail
++uuxqt \-\-command rmail
+ .fi
+ .in -0.5i
+ .TP 5
diff --git a/srcpkgs/uucp/patches/no-sleep.patch b/srcpkgs/uucp/patches/no-sleep.patch
new file mode 100644
index 000000000000..b8b43350770f
--- /dev/null
+++ b/srcpkgs/uucp/patches/no-sleep.patch
@@ -0,0 +1,65 @@
+Description: avoid sleeps
+Author: Frank Heckenbach
+Index: uucp-1.07/prott.c
+===================================================================
+--- uucp-1.07.orig/prott.c	2017-09-27 12:24:15.963165757 +0200
++++ uucp-1.07/prott.c	2017-09-27 12:24:15.959165687 +0200
+@@ -88,7 +88,7 @@
+   zTbuf[0] = 0;
+   zTbuf[1] = 0;
+   fTfile = FALSE;
+-  usysdep_sleep (2);
++  // usysdep_sleep (2);  -- why? protocol t is meant to be used over an error-free connection
+   return TRUE;
+ }
+ \f
+Index: uucp-1.07/unix/pipe.c
+===================================================================
+--- uucp-1.07.orig/unix/pipe.c	2017-09-27 12:24:15.963165757 +0200
++++ uucp-1.07/unix/pipe.c	2017-09-27 12:24:15.959165687 +0200
+@@ -165,10 +165,43 @@
+   if (qsysdep->ipid >= 0)
+     {
+       if (kill (qsysdep->ipid, SIGHUP) == 0)
+-        usysdep_sleep (2);
++        {
++          #if defined (HAVE_USLEEP) && defined (HAVE_WAITPID)
++          /* Avoid wasting 4 seconds (including the SIGPIPE case below).
++             Quick and dirty work-around to avoid depending on SIGCHLD:
++             Just sleep up to 20 times 0.1s as long as the child exists. */
++          int i, status;
++          for (i = 20; i > 0; i--)
++            {
++              if (waitpid (qsysdep->ipid, &status, WNOHANG) == qsysdep->ipid)
++                {
++                  qsysdep->ipid = -1;
++                  return fret;
++                }
++              usleep (100000);
++            }
++          #else
++          usysdep_sleep (2);
++          #endif
++        }
+ #ifdef SIGPIPE
+       if (kill (qsysdep->ipid, SIGPIPE) == 0)
+-        usysdep_sleep (2);
++        {
++          #if HAVE_USLEEP
++          int i, status;
++          for (i = 20; i > 0; i--)
++            {
++              if (waitpid (qsysdep->ipid, &status, WNOHANG) == qsysdep->ipid)
++                {
++                  qsysdep->ipid = -1;
++                  return fret;
++                }
++              usleep (100000);
++            }
++          #else
++          usysdep_sleep (2);
++          #endif
++        }
+ #endif
+       if (kill (qsysdep->ipid, SIGKILL) < 0 && errno == EPERM)
+ 	{
diff --git a/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch b/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch
new file mode 100644
index 000000000000..3a7e4ea91fa2
--- /dev/null
+++ b/srcpkgs/uucp/patches/option-to-not-force-hw-control.patch
@@ -0,0 +1,321 @@
+Description: avoid forcing hw control
+Author: Michal Suchanek
+Index: uucp-1.07/conn.h
+===================================================================
+--- uucp-1.07.orig/conn.h	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/conn.h	2013-12-04 11:20:26.022181350 +0100
+@@ -117,7 +117,7 @@
+   boolean (*pfunlock) P((struct sconnection *qconn));
+   /* Open the connection.  */
+   boolean (*pfopen) P((struct sconnection *qconn, long ibaud,
+-		       boolean fwait, boolean fuser));
++		       boolean fwait, boolean fuser, boolean nortscts));
+   /* Close the connection.  */
+   boolean (*pfclose) P((struct sconnection *qconn,
+ 			pointer puuconf,
+@@ -198,7 +198,7 @@
+    than the effective permissions.  */
+ extern boolean fconn_open P((struct sconnection *qconn, long ibaud,
+ 			     long ihighbaud, boolean fwait,
+-			     boolean fuser));
++			     boolean fuser, boolean nortscts));
+ 
+ /* Close a connection.  The fsuccess argument is TRUE if the
+    conversation completed normally, FALSE if it is being aborted.  */
+Index: uucp-1.07/cu.c
+===================================================================
+--- uucp-1.07.orig/cu.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/cu.c	2013-12-04 11:27:03.353425764 +0100
+@@ -223,6 +223,7 @@
+   { "baud", required_argument, NULL, 's' },
+   { "mapcr", no_argument, NULL, 't' },
+   { "nostop", no_argument, NULL, 3 },
++  { "nortscts", no_argument, NULL, 'f' },
+   { "system", required_argument, NULL, 'z' },
+   { "config", required_argument, NULL, 'I' },
+   { "debug", required_argument, NULL, 'x' },
+@@ -258,6 +259,8 @@
+   enum txonxoffsetting txonxoff = XONXOFF_ON;
+   /* -I: configuration file name.  */
+   const char *zconfig = NULL;
++  /* -f: no hardware flow control */
++  boolean nortscts = FALSE;
+   int iopt;
+   pointer puuconf;
+   int iuuconf;
+@@ -295,7 +298,7 @@
+ 	}
+     }
+ 
+-  while ((iopt = getopt_long (argc, argv, "a:c:deE:hnI:l:op:s:tvx:z:",
++  while ((iopt = getopt_long (argc, argv, "a:c:deE:fhnI:l:op:s:tvx:z:",
+ 			      asCulongopts, (int *) NULL)) != EOF)
+     {
+       switch (iopt)
+@@ -322,6 +325,11 @@
+ 	  zCuvar_escape = optarg;
+ 	  break;
+ 
++	case 'f':
++	  /* No hardware flow control.  */
++	  nortscts = TRUE;
++	  break;
++
+ 	case 'h':
+ 	  /* Local echo.  */
+ 	  fCulocalecho = TRUE;
+@@ -682,7 +690,7 @@
+ 	}
+ 
+       /* Here we have locked a connection to use.  */
+-      if (! fconn_open (&sconn, iusebaud, ihighbaud, FALSE, sinfo.fdirect))
++      if (! fconn_open (&sconn, iusebaud, ihighbaud, FALSE, sinfo.fdirect, nortscts))
+ 	ucuabort ();
+ 
+       fCuclose_conn = TRUE;
+Index: uucp-1.07/conn.c
+===================================================================
+--- uucp-1.07.orig/conn.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/conn.c	2013-12-04 11:20:26.026181299 +0100
+@@ -114,12 +114,13 @@
+ /* Open a connection.  */
+ 
+ boolean
+-fconn_open (qconn, ibaud, ihighbaud, fwait, fuser)
++fconn_open (qconn, ibaud, ihighbaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      long ihighbaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   boolean fret;
+ 
+@@ -177,7 +178,7 @@
+   else
+     ulog_device (qconn->qport->uuconf_zname);
+ 
+-  fret = (*qconn->qcmds->pfopen) (qconn, ibaud, fwait, fuser);
++  fret = (*qconn->qcmds->pfopen) (qconn, ibaud, fwait, fuser, nortscts);
+ 
+   if (! fret)
+     ulog_device ((const char *) NULL);
+Index: uucp-1.07/uucico.c
+===================================================================
+--- uucp-1.07.orig/uucico.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/uucico.c	2013-12-04 11:20:26.026181299 +0100
+@@ -695,7 +695,7 @@
+ 
+       if (fret)
+ 	{
+-	  if (! fconn_open (&sconn, (long) 0, (long) 0, TRUE, FALSE))
++	  if (! fconn_open (&sconn, (long) 0, (long) 0, TRUE, FALSE, FALSE))
+ 	    fret = FALSE;
+ 	  qConn = &sconn;
+ 	}
+@@ -714,7 +714,7 @@
+ 				     (struct uuconf_dialer *) NULL,
+ 				     TRUE)
+ 		      || ! fconn_open (&sconn, (long) 0, (long) 0, TRUE,
+-				       FALSE))
++				       FALSE, FALSE))
+ 		    break;
+ 		}
+ 	      fret = FALSE;
+@@ -1176,7 +1176,7 @@
+     }
+ 
+   if (! fconn_open (&sconn, qsys->uuconf_ibaud, qsys->uuconf_ihighbaud,
+-		    FALSE, FALSE))
++		    FALSE, FALSE, FALSE))
+     {
+       terr = STATUS_PORT_FAILED;
+       fret = FALSE;
+Index: uucp-1.07/unix/pipe.c
+===================================================================
+--- uucp-1.07.orig/unix/pipe.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/pipe.c	2013-12-04 11:20:26.026181299 +0100
+@@ -49,7 +49,7 @@
+ 
+ static void uspipe_free P((struct sconnection *qconn));
+ static boolean fspipe_open P((struct sconnection *qconn, long ibaud,
+-			      boolean fwait, boolean fuser));
++			      boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fspipe_close P((struct sconnection *qconn,
+ 			       pointer puuconf,
+ 			       struct uuconf_dialer *qdialer,
+@@ -115,11 +115,12 @@
+ 
+ /*ARGSUSED*/
+ static boolean
+-fspipe_open (qconn, ibaud, fwait, fuser)
++fspipe_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn ATTRIBUTE_UNUSED;
+      long ibaud ATTRIBUTE_UNUSED;
+      boolean fwait;
+      boolean fuser ATTRIBUTE_UNUSED;
++     boolean nortscts ATTRIBUTE_UNUSED;
+ {
+   /* We don't do incoming waits on pipes.  */
+   if (fwait)
+Index: uucp-1.07/unix/serial.c
+===================================================================
+--- uucp-1.07.orig/unix/serial.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/serial.c	2013-12-04 11:20:26.026181299 +0100
+@@ -246,11 +246,11 @@
+ 				boolean fwait, boolean fuser,
+ 				enum tclocal_setting tlocal));
+ static boolean fsstdin_open P((struct sconnection *qconn, long ibaud,
+-			       boolean fwait, boolean fuser));
++			       boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fsmodem_open P((struct sconnection *qconn, long ibaud,
+-			       boolean fwait, boolean fuser));
++			       boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fsdirect_open P((struct sconnection *qconn, long ibaud,
+-				boolean fwait, boolean fuser));
++				boolean fwait, boolean fuser, boolean nortscts));
+ static boolean fsblock P((struct ssysdep_conn *q, boolean fblock));
+ static boolean fsserial_close P((struct ssysdep_conn *q));
+ static boolean fsstdin_close P((struct sconnection *qconn,
+@@ -1308,11 +1308,12 @@
+    call to fsblock.  */
+ 
+ static boolean
+-fsstdin_open (qconn, ibaud, fwait, fuser)
++fsstdin_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   struct ssysdep_conn *q;
+ 
+@@ -1323,6 +1324,9 @@
+   q->o = q->ord;
+   if (! fsserial_open (qconn, ibaud, fwait, fuser, IGNORE_CLOCAL))
+     return FALSE;
++  if (nortscts
++      && ! fsserial_hardflow (qconn, FALSE))
++    return FALSE;
+   q->iwr_flags = fcntl (q->owr, F_GETFL, 0);
+   if (q->iwr_flags < 0)
+     {
+@@ -1335,11 +1339,12 @@
+ /* Open a modem port.  */
+ 
+ static boolean
+-fsmodem_open (qconn, ibaud, fwait, fuser)
++fsmodem_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   struct uuconf_modem_port *qm;
+ 
+@@ -1356,7 +1361,10 @@
+      out, because some modems don't assert the necessary signals until
+      they see carrier.  Instead, we turn on hardware flow control in
+      fsmodem_carrier.  */
+-  if (fwait
++  if (nortscts
++      && ! fsserial_hardflow (qconn, FALSE))
++    return FALSE;
++  else if (fwait
+       && ! fsserial_hardflow (qconn, qm->uuconf_fhardflow))
+     return FALSE;
+ 
+@@ -1366,11 +1374,12 @@
+ /* Open a direct port.  */
+ 
+ static boolean
+-fsdirect_open (qconn, ibaud, fwait, fuser)
++fsdirect_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser;
++     boolean nortscts;
+ {
+   struct uuconf_direct_port *qd;
+ 
+@@ -1383,7 +1392,7 @@
+ 
+   /* Always turn on hardware flow control for a direct port when it is
+      opened.  There is no other sensible time to turn it on.  */
+-  return fsserial_hardflow (qconn, qd->uuconf_fhardflow);
++  return fsserial_hardflow (qconn, qd->uuconf_fhardflow && ! nortscts);
+ }
+ \f
+ /* Change the blocking status of the port.  We keep track of the
+Index: uucp-1.07/unix/tcp.c
+===================================================================
+--- uucp-1.07.orig/unix/tcp.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/tcp.c	2013-12-04 11:20:26.026181299 +0100
+@@ -78,7 +78,7 @@
+ #endif
+ static boolean ftcp_set_flags P((struct ssysdep_conn *qsysdep));
+ static boolean ftcp_open P((struct sconnection *qconn, long ibaud,
+-			    boolean fwait, boolean fuser));
++			    boolean fwait, boolean fuser, boolean nortscts));
+ static boolean ftcp_close P((struct sconnection *qconn,
+ 			     pointer puuconf,
+ 			     struct uuconf_dialer *qdialer,
+@@ -208,11 +208,12 @@
+    system.  */
+ 
+ static boolean
+-ftcp_open (qconn, ibaud, fwait, fuser)
++ftcp_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud ATTRIBUTE_UNUSED;
+      boolean fwait;
+      boolean fuser ATTRIBUTE_UNUSED;
++     boolean nortscts ATTRIBUTE_UNUSED;
+ {
+   struct ssysdep_conn *qsysdep;
+   const char *zport;
+Index: uucp-1.07/unix/tli.c
+===================================================================
+--- uucp-1.07.orig/unix/tli.c	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/unix/tli.c	2013-12-04 11:20:26.026181299 +0100
+@@ -106,7 +106,7 @@
+ static void utli_free P((struct sconnection *qconn));
+ static boolean ftli_push P((struct sconnection *qconn));
+ static boolean ftli_open P((struct sconnection *qconn, long ibaud,
+-			    boolean fwait, boolean fuser));
++			    boolean fwait, boolean fuser, boolean nortscts));
+ static boolean ftli_close P((struct sconnection *qconn,
+ 			     pointer puuconf,
+ 			     struct uuconf_dialer *qdialer,
+@@ -238,11 +238,12 @@
+    system.  */
+ 
+ static boolean
+-ftli_open (qconn, ibaud, fwait, fuser)
++ftli_open (qconn, ibaud, fwait, fuser, nortscts)
+      struct sconnection *qconn;
+      long ibaud;
+      boolean fwait;
+      boolean fuser ATTRIBUTE_UNUSED;
++     boolean nortscts ATTRIBUTE_UNUSED;
+ {
+   struct ssysdep_conn *qsysdep;
+   const char *zdevice;
+Index: uucp-1.07/cu.1
+===================================================================
+--- uucp-1.07.orig/cu.1	2013-12-04 11:20:23.722208868 +0100
++++ uucp-1.07/cu.1	2013-12-04 11:20:26.026181299 +0100
+@@ -231,6 +231,9 @@
+ .B \-\-nostop
+ Turn off XON/XOFF handling (it is on by default).
+ .TP 5
++.B \-f, \-\-nortscts
++Do not use hardware flow control.
++.TP 5
+ .B \-E char, \-\-escape char
+ Set the escape character.  Initially
+ .B ~
diff --git a/srcpkgs/uucp/patches/spelling.patch b/srcpkgs/uucp/patches/spelling.patch
new file mode 100644
index 000000000000..b96223fcd235
--- /dev/null
+++ b/srcpkgs/uucp/patches/spelling.patch
@@ -0,0 +1,28 @@
+Author: Thorsten Alteholz <debian@alteholz.de>
+Description: correct spelling error in binary
+Index: uucp-1.07/cu.c
+===================================================================
+--- uucp-1.07.orig/cu.c	2019-01-12 19:50:00.447355162 +0100
++++ uucp-1.07/cu.c	2019-01-12 19:50:00.435355162 +0100
+@@ -1756,7 +1756,7 @@
+     zfrom = zbufcpy (argv[1]);
+   else
+     {
+-      zfrom = zsysdep_terminal_line ("Remote file to retreive: ");
++      zfrom = zsysdep_terminal_line ("Remote file to retrieve: ");
+       if (zfrom == NULL)
+ 	ucuabort ();
+       zfrom[strcspn (zfrom, " \t\n")] = '\0';
+Index: uucp-1.07/uuxqt.c
+===================================================================
+--- uucp-1.07.orig/uuxqt.c	2003-05-29 08:08:48.000000000 +0200
++++ uucp-1.07/uuxqt.c	2019-01-12 19:50:32.907354189 +0100
+@@ -1517,7 +1517,7 @@
+ 	  az[i++] = zQcmd;
+ 	  az[i++] = "\n";
+ 
+-	  (void) fsysdep_mail (zmail, "Execution succeded", i, az);
++	  (void) fsysdep_mail (zmail, "Execution succeeded", i, az);
+ 	}
+ 
+       /* Now we may have to uucp the output to some other machine.  */
diff --git a/srcpkgs/uucp/patches/uucp-alt-misc.patch b/srcpkgs/uucp/patches/uucp-alt-misc.patch
new file mode 100644
index 000000000000..841b2e212831
--- /dev/null
+++ b/srcpkgs/uucp/patches/uucp-alt-misc.patch
@@ -0,0 +1,111 @@
+--- uucp-1.07.orig/policy.h	2003-05-29 03:08:45.000000000 -0300
++++ uucp-1.07.orig/policy.h	2020-03-09 03:48:58.317291375 -0300
+@@ -240,8 +240,8 @@
+    the sendmail choice below.  Otherwise, select one of the other
+    choices as appropriate.  */
+ #if 1
+-#define MAIL_PROGRAM "/usr/lib/sendmail -t"
+-/* #define MAIL_PROGRAM "/usr/sbin/sendmail -t" */
++/* #define MAIL_PROGRAM "/usr/lib/sendmail -t" */
++#define MAIL_PROGRAM "/usr/sbin/sendmail -t" 
+ #define MAIL_PROGRAM_TO_BODY 1
+ #define MAIL_PROGRAM_SUBJECT_BODY 1
+ #endif
+@@ -302,7 +302,7 @@
+ /* #define LOCKDIR "/usr/spool/locks" */
+ /* #define LOCKDIR "/usr/spool/uucp/LCK" */
+ /* #define LOCKDIR "/var/spool/lock" */
+-/* #define LOCKDIR "/var/lock" */
++#define LOCKDIR "/var/lock/serial"
+ 
+ /* You must also specify the format of the lock files by setting
+    exactly one of the following macros to 1.  Check an existing lock
+@@ -466,8 +466,8 @@
+    When looking something up (a system, a port, etc.) the new style
+    configuration files will be read first, followed by the V2
+    configuration files, followed by the HDB configuration files.  */
+-#define HAVE_V2_CONFIG 0
+-#define HAVE_HDB_CONFIG 0
++#define HAVE_V2_CONFIG 1
++#define HAVE_HDB_CONFIG 1
+ 
+ /* Exactly one of the following macros must be set to 1.  The exact
+    format of the spool directories is explained in unix/spool.c.
+@@ -572,16 +572,16 @@
+ /* The name of the default spool directory.  If HAVE_TAYLOR_CONFIG is
+    set to 1, this may be overridden by the ``spool'' command in the
+    configuration file.  */
+-#define SPOOLDIR "/usr/spool/uucp"
+-/* #define SPOOLDIR "/var/spool/uucp" */
++/* #define SPOOLDIR "/usr/spool/uucp" */
++#define SPOOLDIR "/var/spool/uucp" 
+ 
+ /* The name of the default public directory.  If HAVE_TAYLOR_CONFIG is
+    set to 1, this may be overridden by the ``pubdir'' command in the
+    configuration file.  Also, a particular system may be given a
+    specific public directory by using the ``pubdir'' command in the
+    system file.  */
+-#define PUBDIR "/usr/spool/uucppublic"
+-/* #define PUBDIR "/var/spool/uucppublic" */
++/* #define PUBDIR "/usr/spool/uucppublic" */
++#define PUBDIR "/var/spool/uucppublic" 
+ 
+ /* The default command path.  This is a space separated list of
+    directories.  Remote command executions requested by uux are looked
+@@ -644,24 +644,23 @@
+ /* The default log file when using HAVE_TAYLOR_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+    command in the configuration file.  */
+-#define LOGFILE "/usr/spool/uucp/Log"
++/* #define LOGFILE "/usr/spool/uucp/Log" */
+ /* #define LOGFILE "/var/spool/uucp/Log" */
+-/* #define LOGFILE "/var/log/uucp/Log" */
++#define LOGFILE "/var/log/uucp/Log" 
+ 
+ /* The default statistics file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``statfile'' command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/Stats"
++/* #define STATFILE "/usr/spool/uucp/Stats" */
+ /* #define STATFILE "/var/spool/uucp/Stats" */
+-/* #define STATFILE "/var/log/uucp/Stats" */
++#define STATFILE "/var/log/uucp/Stats" 
+ 
+ /* The default debugging file when using HAVE_TAYLOR_LOGGING.  When
+    using HAVE_TAYLOR_CONFIG, this may be overridden by the
+    ``debugfile'' command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/Debug"
++/* #define DEBUGFILE "/usr/spool/uucp/Debug" */
+ /* #define DEBUGFILE "/var/spool/uucp/Debug" */
+-/* #define DEBUGFILE "/var/log/uucp/Debug" */
+-
++#define DEBUGFILE "/var/log/uucp/Debug" 
+ #endif /* HAVE_TAYLOR_LOGGING */
+ 
+ #if HAVE_V2_LOGGING
+@@ -669,17 +668,23 @@
+ /* The default log file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``logfile''
+    command in the configuration file.  */
+-#define LOGFILE "/usr/spool/uucp/LOGFILE"
++ /* #define LOGFILE "/usr/spool/uucp/Log" */
++ /* #define LOGFILE "/var/spool/uucp/Log" */
++#define LOGFILE "/var/log/uucp/Log"
+ 
+ /* The default statistics file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``statfile''
+    command in the configuration file.  */
+-#define STATFILE "/usr/spool/uucp/SYSLOG"
++ /* #define STATFILE "/usr/spool/uucp/Stats" */
++ /* #define STATFILE "/var/spool/uucp/Stats" */
++#define STATFILE "/var/log/uucp/Stats"
+ 
+ /* The default debugging file when using HAVE_V2_LOGGING.  When using
+    HAVE_TAYLOR_CONFIG, this may be overridden by the ``debugfile''
+    command in the configuration file.  */
+-#define DEBUGFILE "/usr/spool/uucp/DEBUG"
++ /* #define DEBUGFILE "/usr/spool/uucp/Debug" */
++ /* #define DEBUGFILE "/var/spool/uucp/Debug" */
++#define DEBUGFILE "/var/log/uucp/Debug"
+ 
+ #endif /* HAVE_V2_LOGGING */
diff --git a/srcpkgs/uucp/patches/uucp-org.patch b/srcpkgs/uucp/patches/uucp-org.patch
new file mode 100644
index 000000000000..d6294342cd77
--- /dev/null
+++ b/srcpkgs/uucp/patches/uucp-org.patch
@@ -0,0 +1,8833 @@
+Description: Changes from previous version
+ This patch contains all changes from previous versions.
+Author: Thorsten Alteholz <debian@alteholz.de>
+--- uucp-1.07.orig/uucico.c
++++ uucp-1.07/uucico.c
+@@ -125,6 +125,9 @@ struct spass
+   struct sconnection *qconn;
+ };
+ 
++/* min. grade set on commandline */
++static char cmdlgrade = '\0';
++
+ /* Local functions.  */
+ 
+ static void uusage P((void));
+@@ -175,6 +178,7 @@ static const struct option asLongopts[]
+   { "nodetach", no_argument, NULL, 'D' },
+   { "loop", no_argument, NULL, 'e' },
+   { "force", no_argument, NULL, 'f'},
++  { "grade", required_argument, NULL, 'g'},
+   { "stdin", required_argument, NULL, 'i' },
+   { "prompt", no_argument, NULL, 'l' },
+   { "port", required_argument, NULL, 'p' },
+@@ -249,9 +253,9 @@ main (argc, argv)
+     ++zProgram;
+ 
+ #if COHERENT_C_OPTION
+-  zopts = "c:CDefi:I:lp:qr:s:S:u:x:X:vwz";
++  zopts = "c:CDefg:i:I:lp:qr:s:S:u:x:X:vwz";
+ #else
+-  zopts = "cCDefi:I:lp:qr:s:S:u:x:X:vwz";
++  zopts = "cCDefg:i:I:lp:qr:s:S:u:x:X:vwz";
+ #endif
+ 
+   while ((iopt = getopt_long (argc, argv, zopts,
+@@ -292,6 +296,14 @@ main (argc, argv)
+ 	     failed call.  */
+ 	  fforce = TRUE;
+ 	  break;
++	
++	case 'g':
++	  /* Force a grade */
++	  if (isalpha(optarg[0]))
++	     cmdlgrade = optarg[0];
++	  else
++	     fprintf (stderr, "%s: invalid grade \n", zProgram);
++	  break;
+ 
+ 	case 'i':
+ 	  /* Type of port to use for standard input.  Only TLI is
+@@ -796,6 +808,7 @@ uhelp ()
+   printf ("Usage: %s [options]\n", zProgram);
+   printf (" -s,-S,--system system: Call system (-S implies -f)\n");
+   printf (" -f,--force: Force call despite system status\n");
++  printf (" -g,--grade: limit outgoing call to a given grade\n");
+   printf (" -r state: 1 for master, 0 for slave (default)\n");
+   printf (" --master: Act as master\n");
+   printf (" --slave: Act as slave (default)\n");
+@@ -1369,12 +1382,18 @@ fdo_call (qdaemon, qstat, qdialer, pfcal
+     boolean fret;
+ 
+     /* Determine the grade we should request of the other system.  A
+-       '\0' means that no restrictions have been made.  */
+-    if (! ftimespan_match (qsys->uuconf_qcalltimegrade, &ival,
+-			   (int *) NULL))
+-      bgrade = '\0';
++       '\0' means that no restrictions have been made.
++       If a grade is set on the command line, the calltimegrade-value
++       is overwritten.  */
++       
++    if (cmdlgrade != '\0')
++      bgrade = cmdlgrade;
+     else
+-      bgrade = (char) ival;
++      if (! ftimespan_match (qsys->uuconf_qcalltimegrade, &ival,
++			   (int *) NULL))
++         bgrade = '\0';
++      else
++         bgrade = (char) ival;
+ 
+     /* Determine the name we will call ourselves.  */
+     if (qsys->uuconf_zlocalname != NULL)
+--- uucp-1.07.orig/uucp.info-2
++++ uucp-1.07/uucp.info-2
+@@ -1,4 +1,6 @@
+-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
++
++INFO-DIR-SECTION Networking tools
+ 
+ START-INFO-DIR-ENTRY
+ * UUCP: (uucp).                 Transfer mail and news across phone lines.
+@@ -25,1247 +27,1119 @@ versions, except that the section entitl
+ a translation approved by the author instead of in the original English.
+ 
+ \x1f
+-File: uucp.info,  Node: Invoking cu,  Next: Invoking uucico,  Prev: Invoking uupick,  Up: Invoking the UUCP Programs
+-
+-Invoking cu
+-===========
+-
+-* Menu:
+-
+-* cu Description::              Description of cu
+-* cu Commands::                 Commands Supported by cu
+-* cu Variables::                Variables Supported by cu
+-* cu Options::                  Options Supported by cu
+-
+-\x1f
+-File: uucp.info,  Node: cu Description,  Next: cu Commands,  Prev: Invoking cu,  Up: Invoking cu
+-
+-cu Description
+---------------
+-
+-     cu [options] [system | phone | "dir"]
+-
+-   The `cu' program is used to call up another system and act as a dial
+-in terminal.  It can also do simple file transfers with no error
+-checking.
+-
+-   The `cu' program takes a single non-option argument.
+-
+-   If the argument is the string `dir' cu will make a direct connection
+-to the port.  This may only be used by users with write access to the
+-port, as it permits reprogramming the modem.
+-
+-   Otherwise, if the argument begins with a digit, it is taken to be a
+-phone number to call.
+-
+-   Otherwise, it is taken to be the name of a system to call.
+-
+-   The `-z' or `--system' options may be used to name a system
+-beginning with a digit, and the `-c' or `--phone' options may be used
+-to name a phone number that does not begin with a digit.
+-
+-   The `cu' program locates a port to use in the UUCP configuration
+-files.  If a simple system name is given, it will select a port
+-appropriate for that system.  The `-p', `--port', `-l', `--line', `-s',
+-and `--speed' options may be used to control the port selection.
+-
+-   When a connection is made to the remote system, `cu' forks into two
+-processes.  One reads from the port and writes to the terminal, while
+-the other reads from the terminal and writes to the port.
+-
+-\x1f
+-File: uucp.info,  Node: cu Commands,  Next: cu Variables,  Prev: cu Description,  Up: Invoking cu
+-
+-cu Commands
+------------
+-
+-   The `cu' program provides several commands that may be used during
+-the conversation.  The commands all begin with an escape character,
+-which by default is `~' (tilde).  The escape character is only
+-recognized at the beginning of a line.  To send an escape character to
+-the remote system at the start of a line, it must be entered twice.  All
+-commands are either a single character or a word beginning with `%'
+-(percent sign).
+-
+-   The `cu' program recognizes the following commands.
+-
+-`~.'
+-     Terminate the conversation.
+-
+-`~! command'
+-     Run command in a shell.  If command is empty, starts up a shell.
+-
+-`~$ command'
+-     Run command, sending the standard output to the remote system.
+-
+-`~| command'
+-     Run command, taking the standard input from the remote system.
+-
+-`~+ command'
+-     Run command, taking the standard input from the remote system and
+-     sending the standard output to the remote system.
+-
+-`~#, ~%break'
+-     Send a break signal, if possible.
+-
+-`~c directory, ~%cd directory'
+-     Change the local directory.
+-
+-`~> file'
+-     Send a file to the remote system.  This just dumps the file over
+-     the communication line.  It is assumed that the remote system is
+-     expecting it.
+-
+-`~<'
+-     Receive a file from the remote system.  This prompts for the local
+-     file name and for the remote command to execute to begin the file
+-     transfer.  It continues accepting data until the contents of the
+-     `eofread' variable are seen.
+-
+-`~p from to'
+-`~%put from to'
+-     Send a file to a remote Unix system.  This runs the appropriate
+-     commands on the remote system.
+-
+-`~t from to'
+-`~%take from to'
+-     Retrieve a file from a remote Unix system.  This runs the
+-     appropriate commands on the remote system.
+-
+-`~s variable value'
+-     Set a `cu' variable to the given value.  If value is not given, the
+-     variable is set to `true'.
+-
+-`~! variable'
+-     Set a `cu' variable to `false'.
+-
+-`~z'
+-     Suspend the cu session.  This is only supported on some systems.
+-     On systems for which `^Z' may be used to suspend a job, `~^Z' will
+-     also suspend the session.
+-
+-`~%nostop'
+-     Turn off XON/XOFF handling.
+-
+-`~%stop'
+-     Turn on XON/XOFF handling.
+-
+-`~v'
+-     List all the variables and their values.
+-
+-`~?'
+-     List all commands.
+-
+-\x1f
+-File: uucp.info,  Node: cu Variables,  Next: cu Options,  Prev: cu Commands,  Up: Invoking cu
+-
+-cu Variables
+-------------
+-
+-   The `cu' program also supports several variables.  They may be
+-listed with the `~v' command, and set with the `~s' or `~!'  commands.
+-
+-`escape'
+-     The escape character.  The default is `~' (tilde).
+-
+-`delay'
+-     If this variable is true, `cu' will delay for a second, after
+-     recognizing the escape character, before printing the name of the
+-     local system.  The default is true.
+-
+-`eol'
+-     The list of characters which are considered to finish a line.  The
+-     escape character is only recognized after one of these is seen.
+-     The default is `carriage return', `^U', `^C', `^O', `^D', `^S',
+-     `^Q', `^R'.
+-
+-`binary'
+-     Whether to transfer binary data when sending a file.  If this is
+-     false, then newlines in the file being sent are converted to
+-     carriage returns.  The default is false.
+-
+-`binary-prefix'
+-     A string used before sending a binary character in a file
+-     transfer, if the `binary' variable is true.  The default is `^V'.
+-
+-`echo-check'
+-     Whether to check file transfers by examining what the remote system
+-     echoes back.  This probably doesn't work very well.  The default is
+-     false.
+-
+-`echonl'
+-     The character to look for after sending each line in a file.  The
+-     default is carriage return.
+-
+-`timeout'
+-     The timeout to use, in seconds, when looking for a character,
+-     either when doing echo checking or when looking for the `echonl'
+-     character.  The default is 30.
+-
+-`kill'
+-     The character to use delete a line if the echo check fails.  The
+-     default is `^U'.
+-
+-`resend'
+-     The number of times to resend a line if the echo check continues to
+-     fail.  The default is 10.
+-
+-`eofwrite'
+-     The string to write after sending a file with the `~>' command.
+-     The default is `^D'.
+-
+-`eofread'
+-     The string to look for when receiving a file with the ` ~<'
+-     command.  The default is `$', which is intended to be a typical
+-     shell prompt.
+-
+-`verbose'
+-     Whether to print accumulated information during a file transfer.
+-     The default is true.
+-
+-\x1f
+-File: uucp.info,  Node: cu Options,  Prev: cu Variables,  Up: Invoking cu
+-
+-cu Options
+-----------
+-
+-   The following options may be given to `cu'.
+-
+-`-e'
+-`--parity=even'
+-     Use even parity.
+-
+-`-o'
+-`--parity=odd'
+-     Use odd parity.
+-
+-`--parity=none'
+-     Use no parity.  No parity is also used if both `-e' and `-o' are
+-     given.
+-
+-`-h'
+-`--halfduplex'
+-     Echo characters locally (half-duplex mode).
+-
+-`--nostop'
+-     Turn off XON/XOFF handling (it is on by default).
+-
+-`-E char'
+-`--escape char'
+-     Set the escape character.  Initially `~' (tilde).  To eliminate the
+-     escape character, use `-E '''.
+-
+-`-z system'
+-`--system system'
+-     The system to call.
+-
+-`-c phone-number'
+-`--phone phone-number'
+-     The phone number to call.
+-
+-`-p port'
+-`-a port'
+-`--port port'
+-     Name the port to use.
+-
+-`-l line'
+-`--line line'
+-     Name the line to use by giving a device name.  This may be used to
+-     dial out on ports that are not listed in the UUCP configuration
+-     files.  Write access to the device is required.
+-
+-`-s speed'
+-`-#'
+-`--speed speed'
+-     The speed (baud rate) to use.  Here, `-#' means an actual number;
+-     e.g., `-9600'.
+-
+-`-n'
+-`--prompt'
+-     Prompt for the phone number to use.
+-
+-`-d'
+-     Enter debugging mode.  Equivalent to `--debug all'.
+-
+-`-x type'
+-`--debug type'
+-`-I file'
+-`--config file'
+-`-v'
+-`--version'
+-`--help'
+-     *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uucico,  Next: Invoking uuxqt,  Prev: Invoking cu,  Up: Invoking the UUCP Programs
+-
+-Invoking uucico
+-===============
+-
+-* Menu:
+-
+-* uucico Description::          Description of uucico
+-* uucico Options::              Options Supported by uucico
+-
+-\x1f
+-File: uucp.info,  Node: uucico Description,  Next: uucico Options,  Prev: Invoking uucico,  Up: Invoking uucico
+-
+-uucico Description
+-------------------
+-
+-     uucico [options]
+-
+-   The `uucico' daemon processes file transfer requests queued by
+-`uucp' and `uux'.  It is started when `uucp' or `uux' is run (unless
+-they are given the `-r' or `--nouucico' options).  It is also typically
+-started periodically using entries in the `crontab' table(s).
+-
+-   When `uucico' is invoked with `-r1', `--master', `-s', `--system',
+-or `-S', the daemon will place a call to a remote system, running in
+-master mode.  Otherwise the daemon will start in slave mode, accepting
+-a call from a remote system.  Typically a special login name will be
+-set up for UUCP which automatically invokes `uucico' when a remote
+-system calls in and logs in under that name.
+-
+-   When `uucico' terminates, it invokes the `uuxqt' daemon, unless the
+-`-q' or `--nouuxqt' options were given; `uuxqt' executes any work
+-orders created by `uux' on a remote system, and any work orders created
+-locally which have received remote files for which they were waiting.
+-
+-   If a call fails, `uucico' will normally refuse to retry the call
+-until a certain (configurable) amount of time has passed.  This may be
+-overriden by the `-f', `--force', or `-S' options.
+-
+-   The `-l', `--prompt', `-e', or `--loop' options may be used to force
+-`uucico' to produce its own prompts of `login: ' and `Password:'.  When
+-another `uucico' daemon calls in, it will see these prompts and log in
+-as usual.  The login name and password will normally be checked against
+-a separate list kept specially for `uucico', rather than the
+-`/etc/passwd' file (*note Configuration File Names::).  It is possible,
+-on some systems, to configure `uucico' to use `/etc/passwd'.  The `-l'
+-or `--prompt' options will prompt once and then exit; in this mode the
+-UUCP administrator, or the superuser, may use the `-u' or `--login'
+-option to force a login name, in which case `uucico' will not prompt
+-for one.  The `-e' or `--loop' options will prompt again after the
+-first session is over; in this mode `uucico' will permanently control a
+-port.
+-
+-   If `uucico' receives a `SIGQUIT', `SIGTERM' or `SIGPIPE' signal, it
+-will cleanly abort any current conversation with a remote system and
+-exit.  If it receives a `SIGHUP' signal it will abort any current
+-conversation, but will continue to place calls to (if invoked with
+-`-r1' or `--master') and accept calls from (if invoked with `-e' or
+-`--loop') other systems.  If it receives a `SIGINT' signal it will
+-finish the current conversation, but will not place or accept any more
+-calls.
+-
+-\x1f
+-File: uucp.info,  Node: uucico Options,  Prev: uucico Description,  Up: Invoking uucico
+-
+-uucico Options
+---------------
+-
+-   The following options may be given to `uucico'.
+-
+-`-r1'
+-`--master'
+-     Start in master mode: call out to a remote system.  Implied by
+-     `-s', `--system', or `-S'.  If no system is specified,
+-     sequentially call every system for which work is waiting to be
+-     done.
+-
+-`-r0'
+-`--slave'
+-     Start in slave mode.  This is the default.
+-
+-`-s system'
+-`--system system'
+-     Call the specified system.
+-
+-`-S system'
+-     Call the specified system, ignoring any required wait.  This is
+-     equivalent to `-s system -f'.
+-
+-`-f'
+-`--force'
+-     Ignore any required wait for any systems to be called.
+-
+-`-l'
+-`--prompt'
+-     Prompt for login name and password using `login: ' and
+-     `Password:'.  This allows `uucico' to be easily run from `inetd'.
+-     The login name and password are checked against the UUCP password
+-     file, which need not be `/etc/passwd'.  The `--login' option may
+-     be used to force a login name, in which cause `uucico' will only
+-     prompt for a password.
+-
+-`-p port'
+-`--port port'
+-     Specify a port to call out on or to listen to.
+-
+-`-e'
+-`--loop'
+-     Enter an endless loop of login/password prompts and slave mode
+-     daemon execution.  The program will not stop by itself; you must
+-     use `kill' to shut it down.
+-
+-`-w'
+-`--wait'
+-     After calling out (to a particular system when `-s', `--system',
+-     or `-S' is specifed, or to all systems which have work when just
+-     `-r1' or `--master' is specifed), begin an endless loop as with
+-     `--loop'.
+-
+-`-q'
+-`--nouuxqt'
+-     Do not start the `uuxqt' daemon when finished.
+-
+-`-c'
+-`--quiet'
+-     If no calls are permitted at this time, then don't make the call,
+-     but also do not put an error message in the log file and do not
+-     update the system status (as reported by `uustat').  This can be
+-     convenient for automated polling scripts, which may want to simply
+-     attempt to call every system rather than worry about which
+-     particular systems may be called at the moment.  This option also
+-     suppresses the log message indicating that there is no work to be
+-     done.
+-
+-`-C'
+-`--ifwork'
+-     Only call the system named by `-s', `--system', or `-S' if there
+-     is work for that system.
+-
+-`-D'
+-`--nodetach'
+-     Do not detach from the controlling terminal.  Normally `uucico'
+-     detaches from the terminal before each call out to another system
+-     and before invoking `uuxqt'.  This option prevents this.
+-
+-`-u name'
+-`--login name'
+-     Set the login name to use instead of that of the invoking user.
+-     This option may only be used by the UUCP administrator or the
+-     superuser.  If used with `--prompt', this will cause `uucico' to
+-     prompt only for the password, not the login name.
+-
+-`-z'
+-`--try-next'
+-     If a call fails after the remote system is reached, try the next
+-     alternate rather than simply exiting.
+-
+-`-i type'
+-`--stdin type'
+-     Set the type of port to use when using standard input.  The only
+-     supported port type is TLI, and this is only available on machines
+-     which support the TLI networking interface.  Specifying `-i TLI'
+-     causes `uucico' to use TLI calls to perform I/O.
+-
+-`-X type'
+-     Same as the standard option `-x type'.  Provided for historical
+-     compatibility.
+-
+-`-x type'
+-`--debug type'
+-`-I file'
+-`--config file'
+-`-v'
+-`--version'
+-`--help'
+-     *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uuxqt,  Next: Invoking uuchk,  Prev: Invoking uucico,  Up: Invoking the UUCP Programs
+-
+-Invoking uuxqt
+-==============
+-
+-     uuxqt [-c command] [-s system] [--command command] [--system system]
+-
+-   The `uuxqt' daemon executes commands requested by `uux' from either
+-the local system or from remote systems.  It is started automatically
+-by the `uucico' daemon (unless `uucico' is given the `-q' or
+-`--nouuxqt' options).
+-
+-   There is normally no need to run `uuxqt', since it will be invoked
+-by `uucico'.  However, `uuxqt' can be invoked directly to provide
+-greater control over the processing of the work queue.
+-
+-   Multiple invocations of `uuxqt' may be run at once, as controlled by
+-the `max-uuxqts' configuration command; see *Note Miscellaneous
+-(config)::.
+-
+-   The following options may be given to `uuxqt'.
+-
+-`-c command'
+-`--command command'
+-     Only execute requests for the specified command.  For example,
+-     `uuxqt --command rmail'.
+-
+-`-s system'
+-`--system system'
+-     Only execute requests originating from the specified system.
+-
+-`-x type'
+-`--debug type'
+-`-I file'
+-`--config'
+-`-v'
+-`--version'
+-`--help'
+-     *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uuchk,  Next: Invoking uuconv,  Prev: Invoking uuxqt,  Up: Invoking the UUCP Programs
+-
+-Invoking uuchk
+-==============
+-
+-     uuchk [-s system] [--system system]
+-
+-   The `uuchk' program displays information read from the UUCP
+-configuration files.  It should be used to ensure that UUCP has been
+-configured correctly.
+-
+-   The `-s' or `--system' options may be used to display the
+-configuration for just the specified system, rather than for all
+-systems.  The `uuchk' program also supports the standard UUCP program
+-options; see *Note Standard Options::.
+-
+-\x1f
+-File: uucp.info,  Node: Invoking uuconv,  Next: Invoking uusched,  Prev: Invoking uuchk,  Up: Invoking the UUCP Programs
+-
+-Invoking uuconv
+-===============
+-
+-     uuconv -i type -o type [-p program] [--program program]
+-     uuconv --input type --output type [-p program] [--program program]
+-
+-   The `uuconv' program converts UUCP configuration files from one
+-format to another.  The type of configuration file to read is specified
+-using the `-i' or `--input' options.  The type of configuration file to
+-write is specified using the `-o' or `--output' options.
+-
+-   The supported configuration file types are `taylor', `v2', and
+-`hdb'.  For a description of the `taylor' configuration files, see
+-*Note Configuration Files::.  The other types of configuration files
+-are used by traditional UUCP packages, and are not described in this
+-manual.
+-
+-   An input configuration of type `v2' or `hdb' is read from a compiled
+-in directory (specified by `oldconfigdir' in `Makefile').  An input
+-configuration of type `taylor' is read from a compiled in directory by
+-default, but may be overridden with the standard `-I' or `--config'
+-options (*note Standard Options::).
+-
+-   The output configuration is written to files in the directory in
+-which `uuconv' is run.
+-
+-   Some information in the input files may not be representable in the
+-desired output format, in which case `uuconv' will silently discard it.
+-The output of `uuconv' should be carefully checked before it is used.
+-The `uuchk' program may be used for this purpose; see *Note Invoking
+-uuchk::.
+-
+-   The `-p' or `--program' option may be used to convert specific `cu'
+-configuration information, rather than the default of only converting
+-the `uucp' configuration information; see *Note config File::.
+-
+-   The `uuchk' program also supports the standard UUCP program options;
+-see *Note Standard Options::.
++File: uucp.info,  Node: j Protocol,  Next: x Protocol,  Prev: i Protocol,  Up: Protocols
+ 
+-\x1f
+-File: uucp.info,  Node: Invoking uusched,  Prev: Invoking uuconv,  Up: Invoking the UUCP Programs
++6.12 UUCP `j' Protocol
++======================
+ 
+-Invoking uusched
+-================
++The `j' protocol is a variant of the `i' protocol.  It was also written
++by Ian Lance Taylor, and first appeared in Taylor UUCP version 1.04.
+ 
+-   The `uusched' program is actually just a shell script which invokes
+-the `uucico' daemon.  It is provided for backward compatibility.  It
+-causes `uucico' to call all systems for which there is work.  Any
+-option which may be given to `uucico' may also be given to `uusched'.
+-*Note Invoking uucico::.
++   The `j' protocol is a version of the `i' protocol designed for
++communication links which intercept a few characters, such as XON or
++XOFF.  It is not efficient to use it on a link which intercepts many
++characters, such as a seven bit link.  The `j' protocol performs no
++error correction or detection; that is presumed to be the responsibility
++of the `i' protocol.
++
++   When the `j' protocol starts up, each system sends a printable ASCII
++string indicating which characters it wants to avoid using.  The string
++begins with the ASCII character `^' (octal 136) and ends with the ASCII
++character `~' (octal 176).  After sending this string, each system
++looks for the corresponding string from the remote system.  The strings
++are composed of escape sequences: `\ooo', where `o' is an octal digit.
++For example, sending the string `^\021\023~' means that the ASCII XON
++and XOFF characters should be avoided.  The union of the characters
++described in both strings (the string which is sent and the string
++which is received) is the set of characters which must be avoided in
++this conversation.  Avoiding a printable ASCII character (octal 040 to
++octal 176, inclusive) is not permitted.
++
++   After the exchange of characters to avoid, the normal `i' protocol
++start up is done, and the rest of the conversation uses the normal `i'
++protocol.  However, each `i' protocol packet is wrapped to become a `j'
++protocol packet.
++
++   Each `j' protocol packet consists of a seven byte header, followed
++by data bytes, followed by index bytes, followed by a one byte trailer.
++The packet header looks like this:
++
++`^'
++     Every packet begins with the ASCII character `^', octal 136.
++
++HIGH
++LOW
++     These two characters give the total number of bytes in the packet.
++     Both HIGH and LOW are printable ASCII characters.  The length of
++     the packet is `(HIGH - 040) * 0100 + (LOW - 040)', where `040 <=
++     HIGH < 0177' and `040 <= LOW < 0140'.  This permits a length of
++     6079 bytes, but there is a further restriction on packet size
++     described below.
++
++`='
++     The ASCII character `=', octal 075.
++
++DATA-HIGH
++DATA-LOW
++     These two characters give the total number of data bytes in the
++     packet.  The encoding is as described for HIGH and LOW.  The number
++     of data bytes is the size of the `i' protocol packet wrapped inside
++     this `j' protocol packet.
++
++`@'
++     The ASCII character `@', octal 100.
++
++   The header is followed by the number of data bytes given in
++DATA-HIGH and DATA-LOW.  These data bytes are the `i' protocol packet
++which is being wrapped in the `j' protocol packet.  However, each
++character in the `i' protocol packet which the `j' protocol must avoid
++is transformed into a printable ASCII character (recall that avoiding a
++printable ASCII character is not permitted).  Two index bytes are used
++for each character which must be transformed.
++
++   The index bytes immediately follow the data bytes.  The index bytes
++are created in pairs.  Each pair of index bytes encodes the location of
++a character in the `i' protocol packet which was transformed to become
++a printable ASCII character.  Each pair of index bytes also encodes the
++precise transformation which was performed.
++
++   When the sender finds a character which must be avoided, it will
++transform it using one or two operations.  If the character is 0200 or
++greater, it will subtract 0200.  If the resulting character is less than
++020, or is equal to 0177, it will xor by 020.  The result is a printable
++ASCII character.
++
++   The zero based byte index of the character within the `i' protocol
++packet is determined.  This index is turned into a two byte printable
++ASCII index, INDEX-HIGH and INDEX-LOW, such that the index is
++`(INDEX-HIGH - 040) * 040 + (INDEX-LOW - 040)'.  INDEX-LOW is
++restricted such that `040 <= INDEX-LOW < 0100'.  INDEX-HIGH is not
++permitted to be 0176, so `040 <= INDEX-HIGH < 0176'.  INDEX-LOW is then
++modified to encode the transformation:
++
++   * If the character transformation only had to subtract 0200, then
++     INDEX-LOW is used as is.
++
++   * If the character transformation only had to xor by 020, then 040
++     is added to INDEX-LOW.
++
++   * If both operations had to be performed, then 0100 is added to
++     INDEX-LOW.  However, if the value of INDEX-LOW was initially 077,
++     then adding 0100 would result in 0177, which is not a printable
++     ASCII character.  For that special case, INDEX-HIGH is set to
++     0176, and INDEX-LOW is set to the original value of INDEX-HIGH.
++
++   The receiver decodes the index bytes as follows (this is the reverse
++of the operations performed by the sender, presented here for additional
++clarity):
++
++   * The first byte in the index is INDEX-HIGH, and the second is
++     INDEX-LOW.
++
++   * If `040 <= INDEX-HIGH < 0176', the index refers to the data byte
++     at position `(INDEX-HIGH - 040) * 040 + INDEX-LOW % 040'.
++
++   * If `040 <= INDEX-LOW < 0100', then 0200 must be added to indexed
++     byte.
++
++   * If `0100 <= INDEX-LOW < 0140', then 020 must be xor'ed to the
++     indexed byte.
++
++   * If `0140 <= INDEX-LOW < 0177', then 0200 must be added to the
++     indexed byte, and 020 must be xor'ed to the indexed byte.
++
++   * If `INDEX-HIGH == 0176', the index refers to the data byte at
++     position `(INDEX-LOW - 040) * 040 + 037'.  0200 must be added to
++     the indexed byte, and 020 must be xor'ed to the indexed byte.
++
++   This means the largest `i' protocol packet which may be wrapped
++inside a `j' protocol packet is `(0175 - 040) * 040 + (077 - 040) ==
++3007' bytes.
++
++   The final character in a `j' protocol packet, following the index
++bytes, is the ASCII character `~' (octal 176).
++
++   The motivation behind using an indexing scheme, rather than escape
++characters, is to avoid data movement.  The sender may simply add a
++header and a trailer to the `i' protocol packet.  Once the receiver has
++loaded the `j' protocol packet, it may scan the index bytes,
++transforming the data bytes, and then pass the data bytes directly on to
++the `i' protocol routine.
++
++\x1f
++File: uucp.info,  Node: x Protocol,  Next: y Protocol,  Prev: j Protocol,  Up: Protocols
++
++6.13 UUCP `x' Protocol
++======================
++
++The `x' protocol is used in Europe (and probably elsewhere) with
++machines that contain an builtin X.25 card and can send eight bit data
++transparently across X.25 circuits, without interference from the X.28
++or X.29 layers.  The protocol sends packets of 512 bytes, and relies on
++a write of zero bytes being read as zero bytes without stopping
++communication.  It first appeared in the original System V UUCP
++implementation.
++
++\x1f
++File: uucp.info,  Node: y Protocol,  Next: d Protocol,  Prev: x Protocol,  Up: Protocols
++
++6.14 UUCP `y' Protocol
++======================
++
++The `y' protocol was developed by Jorge Cwik for use in FX UUCICO, a PC
++uucico program.  It is designed for communication lines which handle
++error correction and flow control.  It requires an eight bit clean
++connection.  It performs error detection, but not error correction:
++when an error is detected, the line is dropped.  It is a streaming
++protocol, like the `f' protocol; there are no packet acknowledgements,
++so the protocol is efficient over a half-duplex communication line such
++as PEP.
++
++   Every packet contains a six byte header:
++
++sequence low byte
++sequence high byte
++     A two byte sequence number, in little endian order.  The first
++     sequence number is 0.  Since the first packet is always a sync
++     packet (described below) the sequence number of the first data
++     packet is always 1.  Each system counts sequence numbers
++     independently.
++
++length low byte
++length high byte
++     A two byte data length, in little endian order.  If the high bit
++     of the sixteen bit field is clear, this is the number of data
++     bytes which follow the six byte header.  If the high bit is set,
++     there is no data, and the length field is a type of control packet.
++
++checksum low byte
++checksum high byte
++     A two byte checksum, in little endian order.  The checksum is
++     computed over the data bytes.  The checksum algorithm is described
++     below.  If there are no data bytes, the checksum is sent as 0.
++
++   When the protocol starts up, each side must send a sync packet.
++This is a packet with a normal six byte header followed by data.  The
++sequence number of the sync packet should be 0.  Currently at least
++four bytes of data must be sent with the sync packet.  Additional bytes
++should be ignored.  They are defined as follows:
++
++version
++     The version number of the protocol.  Currently this must be 1.
++     Larger numbers should be ignored; it is the responsibility of the
++     newer version to accommodate the older one.
++
++packet size
++     The maximum data length to use divided by 256.  This is sent as a
++     single byte.  The maximum data length permitted is 32768, which
++     would be sent as 128.  Customarily both systems will use the same
++     maximum data length, the lower of the two requested.
++
++flags low byte
++flags high byte
++     Two bytes of flags.  None are currently defined.  These bytes
++     should be sent as 0, and ignored by the receiver.
++
++   A length field with the high bit set is a control packet.  The
++following control packet types are defined:
++
++0xfffe `YPKT_ACK'
++     Acknowledges correct receipt of a file.
++
++0xfffd `YPKT_ERR'
++     Indicates an incorrect checksum.
++
++0xfffc `YPKT_BAD'
++     Indicates a bad sequence number, an invalid length, or some other
++     error.
++
++   If a control packet other than `YPKT_ACK' is received, the
++connection is dropped.  If a checksum error is detected for a received
++packet, a `YPKT_ERR' control packet is sent, and the connection is
++dropped.  If a packet is received out of sequence, a `YPKT_BAD' control
++packet is sent, and the connection is dropped.
++
++   The checksum is initialized to 0xffff.  For each data byte in a
++packet it is modified as follows (where B is the byte before it has been
++transformed as described above):
++
++           /* Rotate the checksum left.  */
++           if ((ichk & 0x8000) == 0)
++             ichk <<= 1;
++           else
++             {
++               ichk <<= 1;
++               ++ichk;
++             }
++
++           /* Add the next byte into the checksum.  */
++           ichk += B;
++
++   This is the same algorithm as that used by the `f' protocol.
++
++   A command is sent as a sequence of data packets followed by a null
++byte.  In the normal case, a command will fit into a single packet.
++The packet should be exactly the length of the command plus a null
++byte.  If the command is too long, more packets are sent as required.
++
++   A file is sent as a sequence of data packets, ending with a zero
++length packet.  The data packets may be of any length greater than zero
++and less than or equal to the maximum permitted packet size specified
++in the initial sync packet.
++
++   After the zero length packet ending a file transfer has been
++received, the receiving system sends a `YPKT_ACK' control packet.  The
++sending system waits for the `YPKT_ACK' control packet before
++continuing; this wait should be done with a large timeout, since there
++may be a considerable amount of data buffered on the communication path.
++
++\x1f
++File: uucp.info,  Node: d Protocol,  Next: h Protocol,  Prev: y Protocol,  Up: Protocols
++
++6.15 UUCP `d' Protocol
++======================
++
++The `d' protocol is apparently used for DataKit muxhost (not RS-232)
++connections.  No file size is sent.  When a file has been completely
++transferred, a write of zero bytes is done; this must be read as zero
++bytes on the other end.
++
++\x1f
++File: uucp.info,  Node: h Protocol,  Next: v Protocol,  Prev: d Protocol,  Up: Protocols
++
++6.16 UUCP `h' Protocol
++======================
++
++The `h' protocol is apparently used in some places with HST modems.  It
++does no error checking, and is not that different from the `t'
++protocol.  I don't know the details.
++
++\x1f
++File: uucp.info,  Node: v Protocol,  Prev: h Protocol,  Up: Protocols
++
++6.17 UUCP `v' Protocol
++======================
++
++The `v' protocol is used by UUPC/extended, a PC UUCP program.  It is
++simply a version of the `g' protocol which supports packets of any
++size, and also supports sending packets of different sizes during the
++same conversation.  There are many `g' protocol implementations which
++support both, but there are also many which do not.  Using `v' ensures
++that everything is supported.
+ 
+ \x1f
+-File: uucp.info,  Node: Installing Taylor UUCP,  Next: Using Taylor UUCP,  Prev: Invoking the UUCP Programs,  Up: Top
++File: uucp.info,  Node: Hacking,  Next: Acknowledgements,  Prev: Protocols,  Up: Top
+ 
+-Installing Taylor UUCP
+-**********************
++7 Hacking Taylor UUCP
++*********************
+ 
+-   These are the installation instructions for the Taylor UUCP package.
++This chapter provides the briefest of guides to the Taylor UUCP source
++code itself.
+ 
+ * Menu:
+ 
+-* Compilation::                 Compiling Taylor UUCP
+-* Testing the Compilation::     Testing the Compilation
+-* Installing the Binaries::     Installing the Binaries
+-* Configuration::               Configuring Taylor UUCP
+-* Testing the Installation::    Testing the Installation
++* System Dependence::           System Dependence
++* Naming Conventions::          Naming Conventions
++* Patches::                     Patches
+ 
+ \x1f
+-File: uucp.info,  Node: Compilation,  Next: Testing the Compilation,  Prev: Installing Taylor UUCP,  Up: Installing Taylor UUCP
++File: uucp.info,  Node: System Dependence,  Next: Naming Conventions,  Prev: Hacking,  Up: Hacking
+ 
+-Compiling Taylor UUCP
++7.1 System Dependence
+ =====================
+ 
+-   If you have a source code distribution, you must first compile it for
+-your system.  Free versions of Unix, such as Linux, NetBSD, or FreeBSD,
+-often come with pre-compiled binary distributions of UUCP.  If you are
+-using a binary distribution, you may skip to the configuration section
+-(*note Configuration::).
+-
+-   Follow these steps to compile the source code.
+-
+-  1. Take a look at the top of `Makefile.in' and set the appropriate
+-     values for your system.  These control where the programs are
+-     installed and which user on the system owns them (normally they
+-     will be owned by a special user `uucp' rather than a real person;
+-     they should probably not be owned by `root').
+-
+-  2. Run the shell script `configure'.  This script was generated using
+-     the `autoconf' program written by David MacKenzie of the Free
+-     Software Foundation.  It takes a while to run.  It will generate
+-     the file `config.h' based on `config.h.in', and, for each source
+-     code directory, will generate `Makefile' based on `Makefile.in'.
+-
+-     You can pass certain arguments to `configure' in the environment.
+-     Because `configure' will compile little test programs to see what
+-     is available on your system, you must tell it how to run your
+-     compiler.  It recognizes the following environment variables:
+-
+-    `CC'
+-          The C compiler.  If this is not set, then if `configure' can
+-          find `gcc' it will use it, otherwise it will use `cc'.
+-
+-    `CFLAGS'
+-          Flags to pass to the C compiler when compiling the actual
+-          code.  If this is not set, `configure' will use `-g'.
+-
+-    `LDFLAGS'
+-          Flags to pass to the C compiler when only linking, not
+-          compiling.  If this is not set, `configure' will use the
+-          empty string.
+-
+-    `LIBS'
+-          Libraries to pass to the C compiler.  If this is not set,
+-          `configure' will use the empty string.
+-
+-    `INSTALL'
+-          The program to run to install UUCP in the binary directory.
+-          If this is not set, then if `configure' finds the BSD
+-          `install' program, it will set this to `install -c';
+-          otherwise, it will use `cp'.
+-
+-     Suppose, for example, you want to set the environment variable `CC'
+-     to `rcc'.  If you are using `sh', `bash', or `ksh', invoke
+-     `configure' as `CC=rcc configure'.  If you are using `csh', do
+-     `setenv CC rcc; sh configure'.
+-
+-     On some systems you will want to use `LIBS=-lmalloc'.  On Xenix
+-     derived versions of Unix do not use `LIBS=-lx' because this will
+-     bring in the wrong versions of certain routines; if you want to use
+-     `-lx' you must specify `LIBS=-lc -lx'.
+-
+-     You can also pass other arguments to `configure' on the command
+-     line.  Use `configure --help' for a complete list.  Of particular
+-     interest:
+-    `--prefix=DIRNAME'
+-          The directory under which all files are installed.  Default
+-          `/usr/local'.
+-
+-    `--with-newconfigdir=DIRNAME'
+-          The directory in which to find new style configuration files.
+-          Default `PREFIX/conf/uucp'.
+-
+-    `--with-oldconfigdir=DIRNAME'
+-          The directory in which to find old style configuration files.
+-          Default `/usr/lib/uucp'.
+-
+-     If `configure' fails for some reason, or if you have a very weird
+-     system, you may have to configure the package by hand.  To do
+-     this, copy the file `config.h.in' to `config.h' and edit it for
+-     your system.  Then for each source directory (the top directory,
+-     and the subdirectories `lib', `unix', and `uuconf') copy
+-     `Makefile.in' to `Makefile', find the words within `@' characters,
+-     and set them correctly for your system.
+-
+-  3. Igor V. Semenyuk provided this (lightly edited) note about ISC
+-     Unix 3.0.  The `configure' script will default to passing `-posix'
+-     to `gcc'.  However, using `-posix' changes the environment to
+-     POSIX, and on ISC 3.0, at least, the default for `POSIX_NO_TRUNC'
+-     is 1.  This can lead to a problem when `uuxqt' executes `rmail'.
+-     `IDA sendmail' has dbm configuration files named
+-     `mailertable.{dir,pag}'.  Notice these names are 15 characters
+-     long.  When `uuxqt' compiled with the `-posix' executes `rmail',
+-     which in turn executes `sendmail', the later is run under the
+-     POSIX environment too.  This leads to `sendmail' bombing out with
+-     `'error opening 'M' database: name too long' (mailertable.dir)'.
+-     It's rather obscure behaviour, and it took me a day to find out
+-     the cause.  I don't use the `-posix' switch; instead, I run `gcc'
+-     with `-D_POSIX_SOURCE', and add `-lcposix' to `LIBS'.
+-
+-  4. On some versions of BSDI there is a bug in the shell which causes
+-     the default value for `CFLAGS' to be set incorrectly.  If `echo
+-     ${CFLAGS--g}' echoes `g' rather than `-g', then you must set
+-     `CFLAGS' in the environment before running configure.  There is a
+-     patch available from BSDI for this bug.  (Reported by David Vrona).
+-
+-  5. On AIX 3.2.5, and possibly other versions, `cc -E' does not work,
+-     reporting `Option NOROCONST is not valid'.  Test this before
+-     running configure by doing something like `touch /tmp/foo.c; cc -E
+-     /tmp/foo.c'.  This may give a warning about the file being empty,
+-     but it should not give the `Option NOROCONST' warning.  The
+-     workaround is to remove the `,noroconst' entry from the `options'
+-     clause in the `cc' stanza in `/etc/xlc.cfg'.  (Reported by Chris
+-     Lewis).
+-
+-  6. You should verify that `configure' worked correctly by checking
+-     `config.h' and the instances of `Makefile'.
+-
+-  7. Edit `policy.h' for your local system.  The comments explain the
+-     various choices.  The default values are intended to be
+-     reasonable, so you may not have to make any changes.
+-
+-     You must decide what type of configuration files to use; for more
+-     information on the choices, see *Note Configuration::.
+-
+-     You must also decide what sort of spool directory you want to use.
+-     If this is a new installation, I recommend `SPOOLDIR_TAYLOR';
+-     otherwise, select the spool directory corresponding to your
+-     existing UUCP package.
+-
+-  8. Type `make' to compile everything.
+-
+-     The `tstuu.c' file is not particularly portable; if you can't
+-     figure out how to compile it you can safely ignore it, as it is
+-     only used for testing.  To use STREAMS pseudo-terminals, tstuu.c
+-     must be compiled with `-DHAVE_STREAMS_PTYS'; this is not
+-     determined by the configure script.
+-
+-     If you have any other problems there is probably a bug in the
+-     `configure' script.
+-
+-  9. Please report any problems you have.  That is the only way they
+-     will get fixed for other people.  Supply a patch if you can (*note
+-     Patches::), or just ask for help.
+-
+-
+-\x1f
+-File: uucp.info,  Node: Testing the Compilation,  Next: Installing the Binaries,  Prev: Compilation,  Up: Installing Taylor UUCP
+-
+-Testing the Compilation
+-=======================
+-
+-   If your system supports pseudo-terminals, and you compiled the code
+-to support the new style of configuration files (`HAVE_TAYLOR_CONFIG'
+-was set to 1 in `policy.h'), you should be able to use the `tstuu'
+-program to test the `uucico' daemon.  If your system supports STREAMS
+-based pseudo-terminals, you must compile tstuu.c with
+-`-DHAVE_STREAMS_PTYS'.  (The STREAMS based code was contributed by Marc
+-Boucher).
+-
+-   To run `tstuu', just type `tstuu' with no arguments.  You must run
+-it in the compilation directory, since it runs `./uucp', `./uux' and
+-`./uucico'.  The `tstuu' program will run a lengthy series of tests (it
+-takes over ten minutes on a slow VAX).  You will need a fair amount of
+-space available in `/usr/tmp'.  You will probably want to put it in the
+-background.  Do not use `^Z', because the program traps on `SIGCHLD'
+-and winds up dying.  The `tstuu' program will create a directory
+-`/usr/tmp/tstuu' and fill it with configuration files, and create spool
+-directories `/usr/tmp/tstuu/spool1' and `/usr/tmp/tstuu/spool2'.
+-
+-   If your system does not support the `FIONREAD' call, the `tstuu'
+-program will run very slowly.  This may or may not get fixed in a later
+-version.
+-
+-   The `tstuu' program will finish with an execute file named
+-`X.SOMETHING' and a data file named `D.SOMETHING' in the directory
+-`/usr/tmp/tstuu/spool1' (or, more likely, in subdirectories, depending
+-on the choice of `SPOOLDIR' in `policy.h').  Two log files will be
+-created in the directory `/usr/tmp/tstuu'.  They will be named `Log1'
+-and `Log2', or, if you have selected `HAVE_HDB_LOGGING' in `policy.h',
+-`Log1/uucico/test2' and `Log2/uucico/test1'.  There should be no errors
+-in the log files.
+-
+-   You can test `uuxqt' with `./uuxqt -I /usr/tmp/tstuu/Config1'.  This
+-should leave a command file `C.SOMETHING' and a data file `D.SOMETHING'
+-in `/usr/tmp/tstuu/spool1' or in subdirectories.  Again, there should
+-be no errors in the log file.
+-
+-   Assuming you compiled the code with debugging enabled, the `-x'
+-switch can be used to set debugging modes; see the `debug' command for
+-details (*note Debugging Levels::).  Use `-x all' to turn on all
+-debugging and generate far more output than you will ever want to see.
+-The `uucico' daemons will put debugging output in the files `Debug1'
+-and `Debug2' in the directory `/usr/tmp/tstuu'.  After that, you're
+-pretty much on your own.
+-
+-   On some systems you can also use `tstuu' to test `uucico' against
+-the system `uucico', by using the `-u' switch.  For this to work,
+-change the definitions of `ZUUCICO_CMD' and `UUCICO_EXECL' at the top
+-of `tstuu.c' to something appropriate for your system.  The definitions
+-in `tstuu.c' are what I used for Ultrix 4.0, on which
+-`/usr/lib/uucp/uucico' is particularly obstinate about being run as a
+-child; I was only able to run it by creating a login name with no
+-password whose shell was `/usr/lib/uucp/uucico'.  Calling login in this
+-way will leave fake entries in `wtmp' and `utmp'; if you compile
+-`tstout.c' (in the `contrib' directory) as a setuid `root' program,
+-`tstuu' will run it to clear those entries out.  On most systems, such
+-hackery should not be necessary, although on SCO I had to su to `root'
+-(`uucp' might also have worked) before I could run
+-`/usr/lib/uucp/uucico'.
+-
+-   You can test `uucp' and `uux' (give them the `-r' switch to keep
+-them from starting `uucico') to make sure they create the right sorts
+-of files.  Unfortunately, if you don't know what the right sorts of
+-files are, I'm not going to tell you here.
+-
+-   If you can not run `tstuu', or if it fails inexplicably, don't worry
+-about it too much.  On some systems `tstuu' will fail because of
+-problems using pseudo terminals, which will not matter in normal use.
+-The real test of the package is talking to another system.
+-
+-\x1f
+-File: uucp.info,  Node: Installing the Binaries,  Next: Configuration,  Prev: Testing the Compilation,  Up: Installing Taylor UUCP
++The code is carefully segregated into a system independent portion and a
++system dependent portion.  The system dependent code is in the `unix'
++subdirectory, and also in the file `sysh.unx' (also known as
++`sysdep.h').
+ 
+-Installing the Binaries
+-=======================
++   With the right configuration parameters, the system independent code
++calls only ANSI C functions.  Some of the less common ANSI C functions
++are also provided in the `lib' directory.  The replacement function
++`strtol' in `lib/strtol.c' assumes that the characters `A' to `F' and
++`a' to `f' appear in strictly sequential order.  The function
++`igradecmp' in `uuconf/grdcmp.c' assumes that the upper and lower case
++letters appear in order.  Both assumptions are true for ASCII and
++EBCDIC, but neither is guaranteed by ANSI C.  Disregarding these
++caveats, I believe that the system independent portion of the code is
++strictly conforming.
+ 
+-   You can install the executable files by becoming `root' and typing
+-`make install'.  Or you can look at what `make install' does and do it
+-by hand.  It tries to preserve your old programs, if any, but it only
+-does this the first time Taylor UUCP is installed (so that if you
+-install several versions of Taylor UUCP, you can still go back to your
+-original UUCP programs).  You can retrieve the original programs by
+-typing `make uninstall'.
+-
+-   Note that by default the programs are compiled with debugging
+-information, and they are not stripped when they are installed.  You may
+-want to strip the installed programs to save disk space.  For more
+-information, see your system documentation for the `strip' program.
++   That's not too exciting, since all the work is done in the system
++dependent code.  I think that this code can conform to POSIX 1003.1,
++given the right compilation parameters.  I'm a bit less certain about
++this, though.
+ 
+-   Of course, simply installing the executable files is not enough.  You
+-must also arrange for them to be used correctly.
++   The code has been used on a 16 bit segmented system with no function
++prototypes, so I'm fairly certain that all casts to long and pointers
++are done when necessary.
+ 
+ \x1f
+-File: uucp.info,  Node: Configuration,  Next: Testing the Installation,  Prev: Installing the Binaries,  Up: Installing Taylor UUCP
+-
+-Configuring Taylor UUCP
+-=======================
++File: uucp.info,  Node: Naming Conventions,  Next: Patches,  Prev: System Dependence,  Up: Hacking
+ 
+-   You will have to decide what types of configuration files you want to
+-use.  This package supports a new sort of configuration file; see *Note
+-Configuration Files::.  It also supports V2 configuration files
+-(`L.sys', `L-devices', etc.) and HDB configuration files (`Systems',
+-`Devices', etc.).  No documentation is provided for V2 or HDB
+-configuration files.  All types of configuration files can be used at
+-once, if you are so inclined.  Currently using just V2 configuration
+-files is not really possible, because there is no way to specify a
+-dialer (there are no built in dialers, and the program does not know
+-how to read `acucap' or `modemcap'); however, V2 configuration files
+-can be used with a new style dial file (*note dial File::), or with a
+-HDB `Dialers' file.
+-
+-   Use of HDB configuration files has two known bugs.  A blank line in
+-the middle of an entry in the `Permissions' file will not be ignored as
+-it should be.  Dialer programs, as found in some versions of HDB, are
+-not recognized directly.  If you must use a dialer program, rather than
+-an entry in `Devices', you must use the `chat-program' command in a new
+-style dial file; see *Note dial File::.  You will have to invoke the
+-dialer program via a shell script or another program, since an exit
+-code of 0 is required to recognize success; the `dialHDB' program in
+-the `contrib' directory may be used for this purpose.
+-
+-   The `uuconv' (*note Invoking uuconv::) program can be used to
+-convert from V2 or HDB configuration files to the new style (it can also
+-do the reverse translation, if you are so inclined).  It will not do all
+-of the work, and the results should be carefully checked, but it can be
+-quite useful.
+-
+-   If you are installing a new system, you will, of course, have to
+-write the configuration files; see *Note Configuration Files:: for
+-details on how to do this.
++7.2 Naming Conventions
++======================
+ 
+-   After writing the configuration files, use the `uuchk' program to
+-verify that they are what you expect; see *Note Invoking uuchk::.
+-
+-\x1f
+-File: uucp.info,  Node: Testing the Installation,  Prev: Configuration,  Up: Installing Taylor UUCP
++I use a modified Hungarian naming convention for my variables and
++functions.  As with all naming conventions, the code is rather opaque if
++you are not familiar with it, but becomes clear and easy to use with
++time.
+ 
+-Testing the Installation
+-========================
+-
+-   After you have written the configuration files, and verified them
+-with the `uuchk' program (*note Invoking uuchk::), you must check that
+-UUCP can correctly contact another system.
+-
+-   Tell `uucico' to dial out to the system by using the `-s' system
+-switch (e.g., `uucico -s uunet').  The log file should tell you what
+-happens.  The exact location of the log file depends upon the settings
+-in `policy.h' when you compiled the program, and on the use of the
+-`logfile' command in the `config' file.  Typical locations are
+-`/usr/spool/uucp/Log' or a subdirectory under `/usr/spool/uucp/.Log'.
+-
+-   If you compiled the code with debugging enabled, you can use
+-debugging mode to get a great deal of information about what sort of
+-data is flowing back and forth; the various possibilities are described
+-with the `debug' command (*note Debugging Levels::).  When initially
+-setting up a connection `-x chat' is probably the most useful (e.g.,
+-`uucico -s uunet -x chat'); you may also want to use `-x
+-handshake,incoming,outgoing'.  You can use `-x' multiple times on one
+-command line, or you can give it comma separated arguments as in the
+-last example.  Use `-x all' to turn on all possible debugging
+-information.
+-
+-   The debugging information is written to a file, normally
+-`/usr/spool/uucp/Debug', although the default can be changed in
+-`policy.h', and the `config' file can override the default with the
+-`debugfile' command.  The debugging file may contain passwords and some
+-file contents as they are transmitted over the line, so the debugging
+-file is only readable by the `uucp' user.
+-
+-   You can use the `-f' switch to force `uucico' to call out even if
+-the last call failed recently; using `-S' when naming a system has the
+-same effect.  Otherwise the status file (in the `.Status' subdirectory
+-of the main spool directory, normally `/usr/spool/uucp') (*note Status
+-Directory::) will prevent too many attempts from occurring in rapid
+-succession.
+-
+-   On older System V based systems which do not have the `setreuid'
+-system call, problems may arise if ordinary users can start an execution
+-of `uuxqt', perhaps indirectly via `uucp' or `uux'.  UUCP jobs may wind
+-up executing with a real user ID of the user who invoked `uuxqt', which
+-can cause problems if the UUCP job checks the real user ID for security
+-purposes.  On such systems, it is safest to put `run-uuxqt never'
+-(*note Miscellaneous (config)::) in the `config' file, so that `uucico'
+-never starts `uuxqt', and invoke `uuxqt' directly from a `crontab' file.
+-
+-   Please let me know about any problems you have and how you got around
+-them.  If you do report a problem, please include the version number of
+-the package you are using, the operating system you are running it on,
+-and a sample of the debugging file showing the problem (debugging
+-information is usually what is needed, not just the log file).  General
+-questions such as "why doesn't `uucico' dial out" are impossible to
+-answer without much more information.
+-
+-\x1f
+-File: uucp.info,  Node: Using Taylor UUCP,  Next: Configuration Files,  Prev: Installing Taylor UUCP,  Up: Top
++   The first character indicates the type of the variable (or function
++return value).  Sometimes additional characters are used.  I use the
++following type prefixes:
+ 
+-Using Taylor UUCP
+-*****************
++`a'
++     array; the next character is the type of an element
+ 
+-* Menu:
++`b'
++     byte or character
+ 
+-* Calling Other Systems::       Calling Other Systems
+-* Accepting Calls::             Accepting Calls
+-* Mail and News::               Using UUCP for Mail and News
+-* The Spool Directory Layout::  The Spool Directory Layout
+-* Spool Directory Cleaning::    Cleaning the UUCP Spool Directory
++`c'
++     count of something
+ 
+-\x1f
+-File: uucp.info,  Node: Calling Other Systems,  Next: Accepting Calls,  Prev: Using Taylor UUCP,  Up: Using Taylor UUCP
++`e'
++     stdio FILE *
+ 
+-Calling Other Systems
+-=====================
++`f'
++     boolean
+ 
+-   By default `uucp' and `uux' will automatically start up `uucico' to
+-call another system whenever work is queued up.  However, the call may
+-fail, or you may have put in time restrictions which prevent the call
+-at that time (perhaps because telephone rates are high) (*note When to
+-Call::).  Also, a remote system may have work queued up for your
+-system, but may not be calling you for some reason (perhaps you have
+-agreed that your system should always place the call).  To make sure
+-that work gets transferred between the systems withing a reasonable
+-time period, you should arrange to periodically invoke `uucico'.
+-
+-   These periodic invocations are normally triggered by entries in the
+-`crontab' file.  The exact format of `crontab' files, and how new
+-entries are added, varies from system to system; check your local
+-documentation (try `man cron').
+-
+-   To attempt to call all systems with outstanding work, use the command
+-`uucico -r1'.  To attempt to call a particular system, use the command
+-`uucico -s SYSTEM'.  To attempt to call a particular system, but only
+-if there is work for it, use the command `uucico -C -s SYSTEM'.  (*note
+-Invoking uucico::).
+-
+-   A common case is to want to try to call a system at a certain time,
+-with periodic retries if the call fails.  A simple way to do this is to
+-create an empty UUCP command file, known as a "poll file".  If a poll
+-file exists for a system, then `uucico -r1' will place a call to it.
+-If the call succeeds, the poll file will be deleted.
+-
+-   A poll file can be easily created using the `uux' command, by
+-requesting the execution of an empty command.  To create a poll file for
+-SYSTEM, just do something like this:
+-     uux -r SYSTEM!
+-   The `-r' tells `uux' to not start up `uucico' immediately.  Of
+-course, if you do want `uucico' to start up right away, omit the `-r';
+-if the call fails, the poll file will be left around to cause a later
+-call.
+-
+-   For example, I use the following crontab entries locally:
+-
+-     45 * * * * /bin/echo /usr/lib/uucp/uucico -r1 | /bin/su uucpa
+-     40 4,10,15 * * * /usr/bin/uux -r uunet!
+-
+-   Every hour, at 45 minutes past, this will check if there is any work
+-to be done, and, if there is, will call the appropriate system.  Also,
+-at 4:40am, 10:40am, and 3:40pm, this will create a poll file file for
+-`uunet', forcing the next run of `uucico' to call `uunet'.
++`i'
++     generic integer
+ 
+-\x1f
+-File: uucp.info,  Node: Accepting Calls,  Next: Mail and News,  Prev: Calling Other Systems,  Up: Using Taylor UUCP
++`l'
++     double
+ 
+-Accepting Calls
+-===============
++`o'
++     file descriptor (as returned by open, creat, etc.)
+ 
+-   To accept calls from another system, you must arrange matters such
+-that when that system calls in, it automatically invokes `uucico' on
+-your system.
+-
+-   The most common arrangement is to create a special user name and
+-password for incoming UUCP calls.  This user name typically uses the
+-same user ID as the regular `uucp' user (Unix permits several user
+-names to share the same user ID).  The shell for this user name should
+-be set to `uucico'.
+-
+-   Here is a sample `/etc/passwd' line to accept calls from a remote
+-system named airs:
+-     Uairs:PASSWORD:4:8:airs UUCP:/usr/spool/uucp:/usr/lib/uucp/uucico
+-   The details may vary on your system.  You must use reasonable user
+-and group ID's.  You must use the correct file name for `uucico'.  The
+-PASSWORD must appear in the UUCP configuration files on the remote
+-system, but will otherwise never be seen or typed by a human.
+-
+-   Note that `uucico' appears as the login shell, and that it will be
+-run with no arguments.  This means that it will start in slave mode and
+-accept an incoming connection.  *Note Invoking uucico::.
+-
+-   On some systems, creating an empty file named `.hushlogin' in the
+-home directory will skip the printing of various bits of information
+-when the remote `uucico' logs in, speeding up the UUCP connection
+-process.
+-
+-   For the greatest security, each system which calls in should use a
+-different user name, each with a different password, and the
+-`called-login' command should be used in the `sys' file to ensure that
+-the correct login name is used.  *Note Accepting a Call::, and see
+-*Note Security::.
+-
+-   If you never need to dial out from your system, but only accept
+-incoming calls, you can arrange for `uucico' to handle logins itself,
+-completely controlling the port, by using the `--endless' option.
+-*Note Invoking uucico::.
++`p'
++     generic pointer
+ 
+-\x1f
+-File: uucp.info,  Node: Mail and News,  Next: The Spool Directory Layout,  Prev: Accepting Calls,  Up: Using Taylor UUCP
++`q'
++     pointer to structure
+ 
+-Using UUCP for Mail and News.
+-=============================
++`s'
++     structure
+ 
+-   Taylor UUCP does not include a mail package.  All Unix systems come
+-with some sort of mail delivery agent, typically `sendmail' or `MMDF'.
+-Source code is available for some alternative mail delivery agents,
+-such as `IDA sendmail' and `smail'.
+-
+-   Taylor UUCP also does not include a news package.  The two major Unix
+-news packages are `C-news' and `INN'.  Both are available in source
+-code form.
+-
+-   Configuring and using mail delivery agents is a notoriously complex
+-topic, and I will not be discussing it here.  Configuring news systems
+-is usually simpler, but I will not be discussing that either.  I will
+-merely describe the interactions between the mail and news systems and
+-UUCP.
++`u'
++     void (function return values only)
+ 
+-   A mail or news system interacts with UUCP in two ways: sending and
+-receiving.
++`z'
++     character string
+ 
+-* Menu:
++   A generic pointer (`p') is sometimes a `void *', sometimes a
++function pointer in which case the prefix is pf, and sometimes a pointer
++to another type, in which case the next character is the type to which
++it points (pf is overloaded).
+ 
+-* Sending mail or news::        Sending mail or news via UUCP
+-* Receiving mail or news::      Receiving mail or news via UUCP
++   An array of strings (`char *[]') would be named `az' (array of
++string).  If this array were passed to a function, the function
++parameter would be named `paz' (pointer to array of string).
+ 
+-\x1f
+-File: uucp.info,  Node: Sending mail or news,  Next: Receiving mail or news,  Prev: Mail and News,  Up: Mail and News
++   Note that the variable name prefixes do not necessarily indicate the
++type of the variable.  For example, a variable prefixed with `i' may be
++int, long or short.  Similarly, a variable prefixed with `b' may be a
++char or an int; for example, the return value of `getchar' would be
++caught in an int variable prefixed with `b'.
+ 
+-Sending mail or news via UUCP
+------------------------------
++   For a non-local variable (extern or file static), the first character
++after the type prefix is capitalized.
+ 
+-   When mail is to be sent from your machine to another machine via
+-UUCP, the mail delivery agent will invoke `uux'.  It will generally run
+-a command such as `uux - SYSTEM!rmail ADDRESS', where SYSTEM is the
+-remote system to which the mail is being sent.  It may pass other
+-options to `uux', such as `-r' or `-g' (*note Invoking uux::).
+-
+-   The news system also invokes `uux' in order to transfer articles to
+-another system.  The only difference is that news will use `uux' to
+-invoke `rnews' on the remote system, rather than `rmail'.
+-
+-   You should arrange for your mail and news systems to invoke the
+-Taylor UUCP version of `uux'.  If you only have Taylor UUCP, or if you
+-simply replace any existing version of `uux' with the Taylor UUCP
+-version, this will probably happen automatically.  However, if you have
+-two UUCP packages installed on your system, you will probably have to
+-modify the mail and news configuration files in some way.
+-
+-   Actually, if both the system UUCP and Taylor UUCP are using the same
+-spool directory format, the system `uux' will probably work fine with
+-the Taylor `uucico' (the reverse is not the case: the Taylor `uux'
+-requires the Taylor `uucico').  However, data transfer will be somewhat
+-more efficient if the Taylor `uux' is used.
++   Most static variables and functions use another letter after the type
++prefix to indicate which module they come from.  This is to help
++distinguish different names in the debugger.  For example, all static
++functions in `protg.c', the `g' protocol source code, use a module
++prefix of `g'.  This isn't too useful, as a number of modules use a
++module prefix of `s'.
+ 
+ \x1f
+-File: uucp.info,  Node: Receiving mail or news,  Prev: Sending mail or news,  Up: Mail and News
++File: uucp.info,  Node: Patches,  Prev: Naming Conventions,  Up: Hacking
+ 
+-Receiving mail or news via UUCP
+--------------------------------
++7.3 Patches
++===========
+ 
+-   To receive mail, all that is necessary is for UUCP to invoke
+-`rmail'.  Any mail delivery agent will provide an appropriate version
+-of `rmail'; you must simply make sure that it is in the command path
+-used by UUCP (it almost certainly already is).  The default command
+-path is set in `policy.h', and it may be overridden for a particular
+-system by the `command-path' command (*note Miscellaneous (sys)::).
+-
+-   Similarly, for news UUCP must be able to invoke `rnews'.  Any news
+-system will provide a version of `rnews', and you must ensure that is
+-in a directory on the path that UUCP will search.
++I am always grateful for any patches sent in.  Much of the flexibility
++and portability of the code is due to other people.  Please do not
++hesitate to send me any changes you have found necessary or useful.
++
++   When sending a patch, please send the output of the Unix `diff'
++program invoked with the `-c' option (if you have the GNU version of
++`diff', use the `-p' option).  Always invoke `diff' with the original
++file first and the modified file second.
++
++   If your `diff' does not support `-c' (or you don't have `diff'),
++send a complete copy of the modified file (if you have just changed a
++single function, you can just send the new version of the function).
++In particular, please do not send `diff' output without the `-c'
++option, as it is useless.
++
++   If you have made a number of changes, it is very convenient for me if
++you send each change as a separate mail message.  Sometimes I will think
++that one change is useful but another one is not.  If they are in
++different messages it is much easier for me to apply one but not the
++other.
++
++   I rarely apply the patches directly.  Instead I work my way through
++the hunks and apply each one separately.  This ensures that the naming
++remains consistent, and that I understand all the code.
++
++   If you can not follow all these rules, then don't.  But if you do, it
++makes it more likely that I will incorporate your changes.  I am not
++paid for my UUCP work, and my available time is unfortunately very
++restricted.  The package is important to me, and I do what I can, but I
++can not do all that I would like, much less all that everybody else
++would like.
++
++   Finally, please do not be offended if I do not reply to messages for
++some time, even a few weeks.  I am often behind on my mail, and if I
++think your message deserves a considered reply I will often put it aside
++until I have time to deal with it.
++
++\x1f
++File: uucp.info,  Node: Acknowledgements,  Next: Index (concepts),  Prev: Hacking,  Up: Top
++
++8 Acknowledgements
++******************
++
++This is a list of people who gave help or suggestions while I was
++working on the Taylor UUCP project.  Appearance on this list does not
++constitute endorsement of the program, particularly since some of the
++comments were criticisms.  I've probably left some people off, and I
++apologize for any oversight; it does not mean your contribution was
++unappreciated.
++
++   First of all, I would like to thank the people at Infinity
++Development Systems (formerly AIRS, which lives on in the domain name)
++for permitting me to use their computers and `uunet' access.  I would
++also like to thank Richard Stallman <rms@gnu.org> for founding the Free
++Software Foundation, and John Gilmore <gnu@toad.com> for writing the
++initial version of gnuucp (based on uuslave) which was a direct
++inspiration for this somewhat larger project.  Chip Salzenberg
++<chip@tct.com> has contributed many patches.  Franc,ois Pinard
++<pinard@iro.umontreal.ca> tirelessly tested the code and suggested many
++improvements.  He also put together the initial version of this manual.
++Doug Evans contributed the zmodem protocol.  Marc Boucher
++<marc@CAM.ORG> contributed the code supporting the pipe port type.
++Jorge Cwik <jorge@laser.satlink.net> contributed the `y' protocol code.
++Finally, Verbus M. Counts <verbus@westmark.com> and Centel Federal
++Systems, Inc., deserve special thanks, since they actually paid me
++money to port this code to System III.
++
++   In alphabetical order:
++
++     Meno Abels <Meno.Abels@Technical.Adviser.com>
++     "Earle F. Ake - SAIC" <ake@Dayton.SAIC.COM>
++     <mra@searchtech.com> (Michael Almond)
++     <cambler@zeus.calpoly.edu> (Christopher J. Ambler)
++     Brian W. Antoine <briana@tau-ceti.isc-br.com>
++     <jantypas@soft21.s21.com> (John Antypas)
++     <james@bigtex.cactus.org> (James Van Artsdalen)
++     <jima@netcom.com> (Jim Avera)
++     <nba@sysware.DK> (Niels Baggesen)
++     <uunet!hotmomma!sdb> (Scott Ballantyne)
++     Zacharias Beckman <zac@dolphin.com>
++     <mike@mbsun.ann-arbor.mi.us> (Mike Bernson)
++     <bob@usixth.sublink.org> (Roberto Biancardi)
++     <statsci!scott@coco.ms.washington.edu> (Scott Blachowicz)
++     <bag%wood2.cs.kiev.ua@relay.ussr.eu.net> (Andrey G Blochintsev)
++     <spider@Orb.Nashua.NH.US> (Spider Boardman)
++     Gregory Bond <gnb@bby.com.au>
++     Marc Boucher <marc@CAM.ORG>
++     Ard van Breemen <ard@cstmel.hobby.nl>
++     <dean@coplex.com> (Dean Brooks)
++     <jbrow@radical.com> (Jim Brownfield)
++     <dave@dlb.com> (Dave Buck)
++     <gordon@sneaky.lonestar.org> (Gordon Burditt)
++     <dburr@sbphy.physics.ucsb.edu> (Donald Burr)
++     <mib@gnu.ai.mit.edu> (Michael I Bushnell)
++     Brian Campbell <brianc@quantum.on.ca>
++     Andrew A. Chernov <ache@astral.msk.su>
++     <jhc@iscp.bellcore.com> (Jonathan Clark)
++     <mafc!frank@bach.helios.de> (Frank Conrad)
++     Ed Carp <erc@apple.com>
++     <mpc@mbs.linet.org> (Mark Clements)
++     <verbus@westmark.westmark.com> (Verbus M. Counts)
++     <cbmvax!snark.thyrsus.com!cowan> (John Cowan)
++     Bob Cunningham <bob@soest.hawaii.edu>
++     <jorge@laser.satlink.net> (Jorge Cwik)
++     <kdburg@incoahe.hanse.de> (Klaus Dahlenburg)
++     Damon <d@exnet.co.uk>
++     <celit!billd@UCSD.EDU> (Bill Davidson)
++     <hubert@arakis.fdn.org> (Hubert Delahaye)
++     <markd@bushwire.apana.org.au> (Mark Delany)
++     Allen Delaney <allen@brc.ubc.ca>
++     Gerriet M. Denkmann <gerriet@hazel.north.de>
++     <denny@dakota.alisa.com> (Bob Denny)
++     Drew Derbyshire <ahd@kew.com>
++     <ssd@nevets.oau.org> (Steven S. Dick)
++     <gert@greenie.gold.sub.org> (Gert Doering)
++     <gemini@geminix.in-berlin.de> (Uwe Doering)
++     Hans-Dieter Doll <hd2@Insel.DE>
++     <deane@deane.teleride.on.ca> (Dean Edmonds)
++     Mark W. Eichin <eichin@cygnus.com>
++     <erik@pdnfido.fidonet.org>
++     Andrew Evans <andrew@airs.com>
++     <dje@cygnus.com> (Doug Evans)
++     Marc Evans <marc@synergytics.com>
++     Dan Everhart <dan@dyndata.com>
++     <kksys!kegworks!lfahnoe@cs.umn.edu> (Larry Fahnoe)
++     Matthew Farwell <dylan@ibmpcug.co.uk>
++     <fenner@jazz.psu.edu> (Bill Fenner)
++     <jaf@inference.com> (Jose A. Fernandez)
++     "David J. Fiander" <golem!david@news.lsuc.on.ca>
++     Thomas Fischer <batman@olorin.dark.sub.org>
++     Mister Flash <flash@sam.imash.ras.ru>
++     <louis@marco.de> (Ju"rgen Fluk)
++     <erik@eab.retix.com> (Erik Forsberg)
++     <andy@scp.caltech.edu> (Andy Fyfe)
++     Lele Gaifax <piggy@idea.sublink.org>
++     <Peter.Galbavy@micromuse.co.uk>
++     <hunter@phoenix.pub.uu.oz.au> (James Gardiner [hunter])
++     Terry Gardner <cphpcom!tjg01>
++     <dgilbert@gamiga.guelphnet.dweomer.org> (David Gilbert)
++     <ol@infopro.spb.su> (Oleg Girko)
++     <jimmy@tokyo07.info.com> (Jim Gottlieb)
++     Benoit Grange <ben@fizz.fdn.org>
++     <elg@elgamy.jpunix.com> (Eric Lee Green)
++     <ryan@cs.umb.edu> (Daniel R. Guilderson)
++     <greg@gagme.chi.il.us> (Gregory Gulik)
++     Richard H. Gumpertz <rhg@cps.com>
++     Scott Guthridge <scooter@cube.rain.com>
++     Michael Haberler <mah@parrot.prv.univie.ac.at>
++     Daniel Hagerty <hag@eddie.mit.edu>
++     <jh@moon.nbn.com> (John Harkin)
++     <guy@auspex.auspex.com> (Guy Harris)
++     <hsw1@papa.attmail.com> (Stephen Harris)
++     Tom Ivar Helbekkmo <tih@Norway.EU.net>
++     Petri Helenius <pete@fidata.fi>
++     <gabe@edi.com> (B. Gabriel Helou)
++     Bob Hemedinger <bob@dalek.mwc.com>
++     Andrew Herbert <andrew@werple.pub.uu.oz.au>
++     <kherron@ms.uky.edu> (Kenneth Herron)
++     Peter Honeyman <honey@citi.umich.edu>
++     <jhood@smoke.marlboro.vt.us> (John Hood)
++     Mark Horsburgh <markh@kcbbs.gen.nz>
++     John Hughes <john@Calva.COM>
++     Mike Ipatow <mip@fido.itc.e-burg.su>
++     Bill Irwin <bill@twg.bc.ca>
++     <pmcgw!personal-media.co.jp!ishikawa> (Chiaki Ishikawa)
++     <ai@easy.in-chemnitz.de> (Andreas Israel)
++     <iverson@lionheart.com> (Tim Iverson)
++     <bei@dogface.austin.tx.us> (Bob Izenberg)
++     <djamiga!djjames@fsd.com> (D.J.James)
++     Rob Janssen <cmgit!rob@relay.nluug.nl>
++     <harvee!esj> (Eric S Johansson)
++     Kevin Johnson <kjj@pondscum.phx.mcd.mot.com>
++     <rj@rainbow.in-berlin.de> (Robert Joop)
++     Alan Judge <aj@dec4ie.IEunet.ie>
++     <chris@cj_net.in-berlin.de> (Christof Junge)
++     Romain Kang <romain@pyramid.com>
++     <tron@Veritas.COM> (Ronald S. Karr)
++     Brendan Kehoe <brendan@cs.widener.edu>
++     <warlock@csuchico.edu> (John Kennedy)
++     <kersing@nlmug.nl.mugnet.org> (Jac Kersing)
++     <ok@daveg.PFM-Mainz.de> (Olaf Kirch)
++     Gabor Kiss <kissg@sztaki.hu>
++     <gero@gkminix.han.de> (Gero Kuhlmann)
++     <rob@pact.nl> (Rob Kurver)
++     "C.A. Lademann" <cal@zls.gtn.com>
++     <kent@sparky.IMD.Sterling.COM> (Kent Landfield)
++     Tin Le <tin@saigon.com>
++     <lebaron@inrs-telecom.uquebec.ca>  (Gregory LeBaron)
++     <karl@sugar.NeoSoft.Com> (Karl Lehenbauer)
++     <alex@hal.rhein-main.de> (Alexander Lehmann)
++     <merlyn@digibd.com> (Merlyn LeRoy)
++     <clewis@ferret.ocunix.on.ca> (Chris Lewis)
++     <gdonl@ssi1.com> (Don Lewis)
++     <libove@libove.det.dec.com> (Jay Vassos-Libove)
++     <bruce%blilly@Broadcast.Sony.COM> (Bruce Lilly)
++     Godfrey van der Linden <Godfrey_van_der_Linden@NeXT.COM>
++     Ted Lindgreen <tlindgreen@encore.nl>
++     <andrew@cubetech.com> (Andrew Loewenstern)
++     "Arne Ludwig" <arne@rrzbu.hanse.de>
++     Matthew Lyle <matt@mips.mitek.com>
++     <djm@eng.umd.edu> (David J. MacKenzie)
++     John R MacMillan <chance!john@sq.sq.com>
++     <jum@helios.de> (Jens-Uwe Mager)
++     Giles D Malet <shrdlu!gdm@provar.kwnet.on.ca>
++     <mem@mv.MV.COM> (Mark E. Mallett)
++     <pepe@dit.upm.es> (Jose A. Manas)
++     <peter@xpoint.ruessel.sub.org> (Peter Mandrella)
++     <martelli@cadlab.sublink.org> (Alex Martelli)
++     W Christopher Martin <wcm@geek.ca.geac.com>
++     Yanek Martinson <yanek@mthvax.cs.miami.edu>
++     <thomasm@mechti.wupper.de> (Thomas Mechtersheimer)
++     <jm@aristote.univ-paris8.fr> (Jean Mehat)
++     <me@halfab.freiburg.sub.org> (Udo Meyer)
++     <les@chinet.chi.il.us> (Leslie Mikesell)
++     <bug@cyberdex.cuug.ab.ca> (Trever Miller)
++     <mmitchel@digi.lonestar.org> (Mitch Mitchell)
++     Emmanuel Mogenet <mgix@krainte.jpn.thomson-di.fr>
++     <rmohr@infoac.rmi.de> (Rupert Mohr)
++     Jason Molenda <molenda@sequent.com>
++     <ianm@icsbelf.co.uk> (Ian Moran)
++     <jmorriso@bogomips.ee.ubc.ca> (John Paul Morrison)
++     <brian@ilinx.wimsey.bc.ca> (Brian J. Murrell)
++     <service@infohh.rmi.de> (Dirk Musstopf)
++     <lyndon@cs.athabascau.ca> (Lyndon Nerenberg)
++     <rolf@saans.north.de> (Rolf Nerstheimer)
++     <tom@smart.bo.open.de> (Thomas Neumann)
++     <mnichols@pacesetter.com>
++     Richard E. Nickle <trystro!rick@Think.COM>
++     <stephan@sunlab.ka.sub.org> (Stephan Niemz)
++     <raymond@es.ele.tue.nl> (Raymond Nijssen)
++     <nolan@helios.unl.edu> (Michael Nolan)
++     david nugent <david@csource.oz.au>
++     Jim O'Connor <jim@bahamut.fsc.com>
++     <kevin%kosman.uucp@nrc.com> (Kevin O'Gorman)
++     Petri Ojala <ojala@funet.fi>
++     <oneill@cs.ulowell.edu> (Brian 'Doc' O'Neill)
++     <Stephen.Page@prg.oxford.ac.uk>
++     Peter Palfrader <peter@palfrader.org>
++     <abekas!dragoman!mikep@decwrl.dec.com> (Mike Park)
++     Tim Peiffer <peiffer@cs.umn.edu>
++     <don@blkhole.resun.com> (Don Phillips)
++     "Mark Pizzolato 415-369-9366" <mark@infocomm.com>
++     John Plate <plate@infotek.dk>
++     <dplatt@ntg.com> (Dave Platt)
++     <eldorado@tharr.UUCP> (Mark Powell)
++     Mark Powell <mark@inet-uk.co.uk>
++     <pozar@kumr.lns.com> (Tim Pozar)
++     <joey@tessi.UUCP> (Joey Pruett)
++     Paul Pryor <ptp@fallschurch-acirs2.army.mil>
++     <putsch@uicc.com> (Jeff Putsch)
++     <ar@nvmr.robin.de> (Andreas Raab)
++     Vadim Radionov <rvp@zfs.lg.ua>
++     Jarmo Raiha <jarmo@ksvltd.FI>
++     James Revell <revell@uunet.uu.net>
++     Scott Reynolds <scott@clmqt.marquette.Mi.US>
++     <mcr@Sandelman.OCUnix.On.Ca> (Michael Richardson)
++     Kenji Rikitake <kenji@rcac.astem.or.jp>
++     <arnold@cc.gatech.edu> (Arnold Robbins)
++     <steve@Nyongwa.cam.org> (Steve M. Robbins)
++     Ollivier Robert <Ollivier.Robert@keltia.frmug.fr.net>
++     Serge Robyns <sr@denkart.be>
++     Lawrence E. Rosenman <ler@lerami.lerctr.org>
++     Jeff Ross <jeff@wisdom.bubble.org>
++     Aleksey P. Rudnev <alex@kiae.su>
++     "Heiko W.Rupp" <hwr@pilhuhn.ka.sub.org>
++     <wolfgang@wsrcc.com> (Wolfgang S. Rupprecht)
++     <tbr@tfic.bc.ca> (Tom Rushworth)
++     Peter Rye <prye@picu-sgh.demon.co.uk>
++     <jsacco@ssl.com> (Joseph E. Sacco)
++     <rsalz@bbn.com> (Rich Salz)
++     Curt Sampson <curt@portal.ca>
++     <sojurn!mike@hobbes.cert.sei.cmu.edu> (Mike Sangrey)
++     Nickolay Saukh <nms@ussr.EU.net>
++     Ignatios Souvatzis <is@jocelyn.rhein.de>
++     <heiko@lotte.sax.de> (Heiko Schlittermann)
++     Eric Schnoebelen <eric@cirr.com>
++     <russell@alpha3.ersys.edmonton.ab.ca> (Russell Schulz)
++     <scott@geom.umn.edu>
++     Igor V. Semenyuk <iga@argrd0.argonaut.su>
++     Christopher Sawtell <chris@gerty.equinox.gen.nz>
++     <schuler@bds.sub.org> (Bernd Schuler)
++     <uunet!gold.sub.org!root> (Christian Seyb)
++     Marcus Shang <marcus.shang@canada.cdev.com>
++     <s4mjs!mjs@nirvo.nirvonics.com> (M. J. Shannon Jr.)
++     <shields@tembel.org> (Michael Shields)
++     <peter@ficc.ferranti.com> (Peter da Silva)
++     <vince@victrola.sea.wa.us> (Vince Skahan)
++     <frumious!pat> (Patrick Smith)
++     <roscom!monty@bu.edu> (Monty Solomon)
++     <sommerfeld@orchard.medford.ma.us> (Bill Sommerfeld)
++     Julian Stacey <stacey@guug.de>
++     <evesg@etlrips.etl.go.jp> (Gjoen Stein)
++     Harlan Stenn <harlan@mumps.pfcs.com>
++     Ralf Stephan <ralf@ark.abg.sub.org>
++     <johannes@titan.westfalen.de> (Johannes Stille)
++     <chs@antic.apu.fi> (Hannu Strang)
++     <ralf@reswi.ruhr.de> (Ralf E. Stranzenbach)
++     <sullivan@Mathcom.com> (S. Sullivan)
++     Shigeya Suzuki <shigeya@dink.foretune.co.jp>
++     <kls@ditka.Chicago.COM> (Karl Swartz)
++     <swiers@plains.NoDak.edu>
++     Oleg Tabarovsky <olg@olghome.pccentre.msk.su>
++     <ikeda@honey.misystems.co.jp> (Takatoshi Ikeda)
++     John Theus <john@theus.rain.com>
++     <rd@aii.com> (Bob Thrush)
++     ppKarsten Thygesen <karthy@dannug.dk>
++     Graham Toal <gtoal@pizzabox.demon.co.uk>
++     <rmtodd@servalan.servalan.com> (Richard Todd)
++     Michael Ju. Tokarev <mjt@tls.msk.ru>
++     Martin Tomes <mt00@controls.eurotherm.co.uk>
++     Len Tower <tower-prep@ai.mit.edu>
++     Mark Towfiq <justice!towfiq@Eingedi.Newton.MA.US>
++     <mju@mudos.ann-arbor.mi.us> (Marc Unangst)
++     Matthias Urlichs <urlichs@smurf.noris.de>
++     Tomi Vainio <tomppa@fidata.fi>
++     <a3@a3.xs4all.nl> (Adri Verhoef)
++     Andrew Vignaux <ajv@ferrari.datamark.co.nz>
++     <vogel@omega.ssw.de> (Andreas Vogel)
++     Dima Volodin <dvv@hq.demos.su>
++     <jos@bull.nl> (Jos Vos)
++     <jv@nl.net> (Johan Vromans)
++     David Vrona <dave@sashimi.wwa.com>
++     <Marcel.Waldvogel@nice.usergroup.ethz.ch> (Marcel Waldvogel)
++     <steve@nshore.org> (Stephen J. Walick)
++     <syd@dsinc.dsi.com> (Syd Weinstein)
++     <gerben@rna.indiv.nluug.nl> (Gerben Wierda)
++     <jbw@cs.bu.edu> (Joe Wells)
++     <frnkmth!twwells.com!bill> (T. William Wells)
++     Peter Wemm <Peter_Wemm@zeus.dialix.oz.au>
++     <mauxci!eci386!woods@apple.com> (Greg A. Woods)
++     <John.Woods@proteon.com> (John Woods)
++     Michael Yu.Yaroslavtsev <mike@yaranga.ipmce.su>
++     Alexei K. Yushin <root@july.elis.crimea.ua>
++     <jon@console.ais.org> (Jon Zeeff)
++     Matthias Zepf <agnus@amylnd.stgt.sub.org>
++     Eric Ziegast <uunet!ziegast>
+ 
+ \x1f
+-File: uucp.info,  Node: The Spool Directory Layout,  Next: Spool Directory Cleaning,  Prev: Mail and News,  Up: Using Taylor UUCP
+-
+-The Spool Directory Layout
+-==========================
++File: uucp.info,  Node: Index (concepts),  Next: Index (configuration file),  Prev: Acknowledgements,  Up: Top
+ 
+-   In general, the layout of the spool directory may be safely ignored.
+-However, it is documented here for the curious.  This description only
+-covers the `SPOOLDIR_TAYLOR' layout.  The ways in which the other spool
+-directory layouts differ are described in the source file
+-`unix/spool.c'.
+-
+-   Directories and files are only created when they are needed, so a
+-typical system will not have all of the entries described here.
++Concept Index
++*************
+ 
++\0\b[index\0\b]
+ * Menu:
+ 
+-* System Spool Directories::    System Spool Directories
+-* Status Directory::            Status Spool Directory
+-* Execution Subdirectories::    Execution Spool Subdirectories
+-* Other Spool Subdirectories::  Other Spool Subdirectories
+-* Spool Lock Files::            Spool Directory Lock Files
++* .Corrupt:                              Execution Subdirectories.
++                                                               (line 21)
++* .Failed:                               Execution Subdirectories.
++                                                               (line 26)
++* .Preserve:                             Other Spool Subdirectories.
++                                                               (line 30)
++* .Received:                             Other Spool Subdirectories.
++                                                               (line 38)
++* .Sequence:                             Other Spool Subdirectories.
++                                                               (line  7)
++* .Status:                               Status Directory.     (line  7)
++* .Temp:                                 Other Spool Subdirectories.
++                                                               (line 14)
++* .Xqtdir:                               Execution Subdirectories.
++                                                               (line  7)
++* /usr/spool/uucp:                       Miscellaneous (config).
++                                                               (line 14)
++* /usr/spool/uucppublic:                 Miscellaneous (config).
++                                                               (line 20)
++* accepting calls:                       Accepting Calls.      (line  6)
++* anonymous UUCP:                        config File Examples. (line 41)
++* call configuration file:               Configuration File Names.
++                                                               (line 47)
++* call in login name:                    Configuration File Names.
++                                                               (line 64)
++* call in password:                      Configuration File Names.
++                                                               (line 64)
++* call out file:                         Configuration File Names.
++                                                               (line 47)
++* call out login name:                   Configuration File Names.
++                                                               (line 47)
++* call out password:                     Configuration File Names.
++                                                               (line 47)
++* calling in:                            Accepting Calls.      (line  6)
++* calling out:                           Calling Other Systems.
++                                                               (line  6)
++* changing spool directory:              config File Examples. (line 26)
++* chat scripts:                          Chat Scripts.         (line  6)
++* cleaning the spool directory:          Spool Directory Cleaning.
++                                                               (line  6)
++* config file:                           config File.          (line  6)
++* config file examples:                  config File Examples. (line  6)
++* configuration file (call):             Configuration File Names.
++                                                               (line 47)
++* configuration file (config):           config File.          (line  6)
++* configuration file (dial):             dial File.            (line  6)
++* configuration file (dialcode):         Configuration File Names.
++                                                               (line 30)
++* configuration file (passwd):           Configuration File Names.
++                                                               (line 64)
++* configuration file (port):             port File.            (line  6)
++* configuration file (sys):              sys File.             (line  6)
++* d protocol:                            d Protocol.           (line  6)
++* debugging file:                        Log File Names.       (line 19)
++* dial file:                             dial File.            (line  6)
++* dialcode configuration file:           Configuration File Names.
++                                                               (line 30)
++* dialcode file:                         Configuration File Names.
++                                                               (line 30)
++* dialer configuration file:             dial File.            (line  6)
++* e protocol:                            e Protocol.           (line  6)
++* E UUCP protocol command:               The E Command.        (line  6)
++* execution file format:                 Execution File Format.
++                                                               (line  6)
++* f protocol:                            f Protocol.           (line  6)
++* final handshake:                       The Final Handshake.  (line  6)
++* G protocol:                            Big G Protocol.       (line  6)
++* g protocol:                            g Protocol.           (line  6)
++* gateway:                               Gateway Example.      (line  6)
++* grades:                                When to Call.         (line 25)
++* grades implementation:                 UUCP Grades.          (line  6)
++* h protocol:                            h Protocol.           (line  6)
++* H UUCP protocol command:               The H Command.        (line  6)
++* i protocol:                            i Protocol.           (line  6)
++* initial handshake:                     The Initial Handshake.
++                                                               (line  6)
++* j protocol:                            j Protocol.           (line  6)
++* L.XXX:                                 Spool Lock Files.     (line 43)
++* LCK..SYS:                              Spool Lock Files.     (line 16)
++* LCK.XQT.NN:                            Spool Lock Files.     (line 28)
++* leaf site:                             Leaf Example.         (line  6)
++* lock directory:                        Miscellaneous (config).
++                                                               (line 27)
++* lock files:                            UUCP Lock Files.      (line  6)
++* lock files in spool directory:         Spool Lock Files.     (line  6)
++* log file:                              Log File Names.       (line  7)
++* LXQ.CMD:                               Spool Lock Files.     (line 36)
++* mail:                                  Mail and News.        (line  6)
++* main configuration file:               config File.          (line  6)
++* news:                                  Mail and News.        (line  6)
++* parity in login names:                 Miscellaneous (config).
++                                                               (line 43)
++* passwd configuration file:             Configuration File Names.
++                                                               (line 64)
++* passwd file:                           Configuration File Names.
++                                                               (line 64)
++* port configuration file:               port File.            (line  6)
++* port file:                             port File.            (line  6)
++* protocol d:                            d Protocol.           (line  6)
++* protocol e:                            e Protocol.           (line  6)
++* protocol f:                            f Protocol.           (line  6)
++* protocol G:                            Big G Protocol.       (line  6)
++* protocol g:                            g Protocol.           (line  6)
++* protocol h:                            h Protocol.           (line  6)
++* protocol i:                            i Protocol.           (line  6)
++* protocol j:                            j Protocol.           (line  6)
++* protocol t:                            t Protocol.           (line  6)
++* protocol v:                            v Protocol.           (line  6)
++* protocol x:                            x Protocol.           (line  6)
++* protocol y:                            y Protocol.           (line  6)
++* protocol, UUCP:                        UUCP Protocol.        (line  6)
++* public directory:                      Miscellaneous (config).
++                                                               (line 20)
++* R UUCP protocol command:               The R Command.        (line  6)
++* S UUCP protocol command:               The S Command.        (line  6)
++* spool directory:                       The Spool Directory Layout.
++                                                               (line  6)
++* spool directory, changing:             config File Examples. (line 26)
++* spool directory, cleaning:             Spool Directory Cleaning.
++                                                               (line  6)
++* spool directory, setting:              Miscellaneous (config).
++                                                               (line 14)
++* statistics file:                       Log File Names.       (line 14)
++* status files:                          Status Directory.     (line  7)
++* sys file:                              sys File.             (line  6)
++* sys file example (gateway):            Gateway Example.      (line  6)
++* sys file example (leaf):               Leaf Example.         (line  6)
++* system configuration file:             sys File.             (line  6)
++* system lock files:                     Spool Lock Files.     (line 16)
++* system name:                           Miscellaneous (config).
++                                                               (line  9)
++* system spool directories:              System Spool Directories.
++                                                               (line  6)
++* t protocol:                            t Protocol.           (line  6)
++* time strings:                          Time Strings.         (line  6)
++* unknown systems:                       Miscellaneous (config).
++                                                               (line 36)
++* UUCP protocol:                         UUCP Protocol.        (line  6)
++* UUCP protocol E command:               The E Command.        (line  6)
++* UUCP protocol H command:               The H Command.        (line  6)
++* UUCP protocol R command:               The R Command.        (line  6)
++* UUCP protocol S command:               The S Command.        (line  6)
++* UUCP protocol X command:               The X Command.        (line  6)
++* UUCP system name:                      Miscellaneous (config).
++                                                               (line  9)
++* uucppublic:                            Miscellaneous (config).
++                                                               (line 20)
++* v protocol:                            v Protocol.           (line  6)
++* x protocol:                            x Protocol.           (line  6)
++* X UUCP protocol command:               The X Command.        (line  6)
++* X.* file format:                       Execution File Format.
++                                                               (line  6)
++* y protocol:                            y Protocol.           (line  6)
+ 
+ \x1f
+-File: uucp.info,  Node: System Spool Directories,  Next: Status Directory,  Prev: The Spool Directory Layout,  Up: The Spool Directory Layout
+-
+-System Spool Directories
+-------------------------
++File: uucp.info,  Node: Index (configuration file),  Prev: Index (concepts),  Up: Top
+ 
+-`SYSTEM'
+-     There is a subdirectory of the main spool directory for each remote
+-     system.
+-
+-`SYSTEM/C.'
+-     This directory stores files describing file transfer commands to
+-     be sent to the SYSTEM.  Each file name starts with `C.G', where G
+-     is the job grade.  Each file contains one or more commands.  For
+-     details of the commands, see *Note UUCP Protocol Commands::.
+-
+-`SYSTEM/D.'
+-     This directory stores data files.  Files with names like
+-     `D.GSSSS', where G is the grade and SSSS is a sequence number, are
+-     waiting to be transferred to the SYSTEM, as directed by the files
+-     in the `SYSTEM/C.' directory.  Files with other names, typically
+-     `D.SYSTEMGSSSS', have been received from SYSTEM and are waiting to
+-     be processed by an execution file in the `SYSTEM/X.' directory.
+-
+-`SYSTEM/D.X'
+-     This directory stores data files which will become execution files
+-     on the remote system.  In current practice, this directory rarely
+-     exists, because most simple executions, including typical uses of
+-     `rmail' and `rnews', send an `E' command rather than an execution
+-     file (*note The E Command::).
+-
+-`SYSTEM/X.'
+-     This directory stores execution files which have been received from
+-     SYSTEM.  This directory normally exists, even though the
+-     corresponding `D.X' directory does not, because `uucico' will
+-     create an execution file on the fly when it receives an `E'
+-     command.
+-
+-`SYSTEM/SEQF'
+-     This file holds the sequence number of the last job sent to
+-     SYSTEM.  The sequence number is used to ensure that file names are
+-     unique in the remote system spool directory.  The file is four
+-     bytes long.  Sequence numbers are composed of digits and the upper
+-     case letters.
++Configuration File Index
++************************
+ 
+-\x1f
+-File: uucp.info,  Node: Status Directory,  Next: Execution Subdirectories,  Prev: System Spool Directories,  Up: The Spool Directory Layout
+-
+-Status Directory
+-----------------
++\0\b[index\0\b]
++* Menu:
+ 
+-`.Status'
+-     This directory holds status files for each remote system.  The
+-     name of the status file is the name of the system which it
+-     describes.  Each status file describes the last conversation with
+-     the system.  Running `uustat --status' basically just formats and
+-     prints the contents of the status files (*note uustat Examples::).
+-
+-     Each status file has a single text line with six fields.
+-
+-    code
+-          A code indicating the status of the last conversation.  The
+-          following values are defined, though not all are actually
+-          used.
+-         `0'
+-               Conversation completed normally.
+-
+-         `1'
+-               `uucico' was unable to open the port.
+-
+-         `2'
+-               The last call to the system failed while dailing.
+-
+-         `3'
+-               The last call to the system failed while logging in.
+-
+-         `4'
+-               The last call to the system failed during the initial
+-               UUCP protocol handshake (*note The Initial Handshake::).
+-
+-         `5'
+-               The last call to the system failed after the initial
+-               handshake.
+-
+-         `6'
+-               `uucico' is currently talking to the system.
+-
+-         `7'
+-               The last call to the system failed because it was the
+-               wrong time to call (this is not used if calling the
+-               system is never permitted).
+-
+-    retries
+-          The number of retries since the last successful call.
+-
+-    time of last call
+-          The time of the last call, in seconds since the epoch (as
+-          returned by the `time' system call).
+-
+-    wait
+-          If the last call failed, this is the number of seconds since
+-          the last call before `uucico' may attempt another call.  This
+-          is set based on the retry time; see *Note When to Call::.
+-          The `-f' or `-S' options to `uucico' direct it to ignore this
+-          wait time; see *Note Invoking uucico::.
+-
+-    description
+-          A text description of the status, corresponding to the code
+-          in the first field.  This may contain spaces.
++* abort:                                 dial File.           (line 137)
++* abort-chat:                            dial File.           (line 123)
++* abort-chat-fail:                       dial File.           (line 127)
++* abort-chat-program:                    dial File.           (line 131)
++* abort-chat-seven-bit:                  dial File.           (line 129)
++* abort-chat-timeout:                    dial File.           (line 125)
++* address:                               Placing the Call.    (line  46)
++* alias:                                 Naming the System.   (line  24)
++* alternate:                             Naming the System.   (line  11)
++* baud in port file:                     port File.           (line  86)
++* baud in sys file:                      Placing the Call.    (line   9)
++* baud-range:                            port File.           (line  94)
++* call-local-size:                       File Transfer Control.
++                                                              (line  33)
++* call-login:                            Logging In.          (line  67)
++* call-password:                         Logging In.          (line  75)
++* call-remote-size:                      File Transfer Control.
++                                                              (line  48)
++* call-timegrade:                        When to Call.        (line  70)
++* call-transfer:                         File Transfer Control.
++                                                              (line  19)
++* callback:                              Accepting a Call.    (line  34)
++* called-chat:                           Accepting a Call.    (line  39)
++* called-chat-fail:                      Accepting a Call.    (line  43)
++* called-chat-program:                   Accepting a Call.    (line  47)
++* called-chat-seven-bit:                 Accepting a Call.    (line  45)
++* called-chat-timeout:                   Accepting a Call.    (line  41)
++* called-local-size:                     File Transfer Control.
++                                                              (line  55)
++* called-login:                          Accepting a Call.    (line   7)
++* called-remote-size:                    File Transfer Control.
++                                                              (line  62)
++* called-timegrade:                      When to Call.        (line  89)
++* called-transfer:                       File Transfer Control.
++                                                              (line  24)
++* callfile:                              Configuration File Names.
++                                                              (line  47)
++* carrier in dial file:                  dial File.           (line  85)
++* carrier in port file:                  port File.           (line 107)
++* carrier-wait:                          dial File.           (line  92)
++* chat:                                  Chat Scripts.        (line  21)
++* chat in dial file:                     dial File.           (line  20)
++* chat in sys file:                      Logging In.          (line   7)
++* chat-fail:                             Chat Scripts.        (line 144)
++* chat-fail in dial file:                dial File.           (line  24)
++* chat-fail in sys file:                 Logging In.          (line  11)
++* chat-program:                          Chat Scripts.        (line 172)
++* chat-program in dial file:             dial File.           (line  28)
++* chat-program in sys file:              Logging In.          (line  15)
++* chat-seven-bit:                        Chat Scripts.        (line 163)
++* chat-seven-bit in dial file:           dial File.           (line  26)
++* chat-seven-bit in sys file:            Logging In.          (line  13)
++* chat-timeout:                          Chat Scripts.        (line 138)
++* chat-timeout in dial file:             dial File.           (line  22)
++* chat-timeout in sys file:              Logging In.          (line   9)
++* command:                               port File.           (line 235)
++* command-path:                          Miscellaneous (sys). (line  13)
++* commands:                              Miscellaneous (sys). (line  19)
++* complete:                              dial File.           (line 118)
++* complete-chat:                         dial File.           (line 104)
++* complete-chat-fail:                    dial File.           (line 108)
++* complete-chat-program:                 dial File.           (line 112)
++* complete-chat-seven-bit:               dial File.           (line 110)
++* complete-chat-timeout:                 dial File.           (line 106)
++* debug in config file:                  Debugging Levels.    (line   7)
++* debug in sys file:                     Miscellaneous (sys). (line  45)
++* debugfile:                             Log File Names.      (line  19)
++* default-alternates:                    Naming the System.   (line  19)
++* device:                                port File.           (line  78)
++* dial-device:                           port File.           (line 124)
++* dialcodefile:                          Configuration File Names.
++                                                              (line  30)
++* dialer in dial file:                   dial File.           (line  17)
++* dialer in port file:                   port File.           (line 129)
++* dialer-sequence:                       port File.           (line 144)
++* dialfile:                              Configuration File Names.
++                                                              (line  23)
++* dialtone:                              dial File.           (line  74)
++* dtr-toggle:                            dial File.           (line  97)
++* forward:                               File Transfer Control.
++                                                              (line 127)
++* forward-from:                          File Transfer Control.
++                                                              (line 118)
++* forward-to:                            File Transfer Control.
++                                                              (line 109)
++* free-space:                            Miscellaneous (sys). (line  25)
++* half-duplex in dial file:              dial File.           (line 160)
++* half-duplex in port file:              port File.           (line  73)
++* hardflow:                              port File.           (line 118)
++* hdb-files:                             Miscellaneous (config).
++                                                              (line 115)
++* hostname:                              Miscellaneous (config).
++                                                              (line   8)
++* local-receive:                         File Transfer Control.
++                                                              (line  98)
++* local-send:                            File Transfer Control.
++                                                              (line  69)
++* lockdir:                               Miscellaneous (config).
++                                                              (line  27)
++* lockname:                              port File.           (line 183)
++* logfile:                               Log File Names.      (line   7)
++* max-file-time:                         File Transfer Control.
++                                                              (line 132)
++* max-remote-debug:                      Miscellaneous (sys). (line  55)
++* max-retries:                           When to Call.        (line  58)
++* max-uuxqts:                            Miscellaneous (config).
++                                                              (line  61)
++* myname:                                Naming the System.   (line  30)
++* nodename:                              Miscellaneous (config).
++                                                              (line   7)
++* passwdfile:                            Configuration File Names.
++                                                              (line  64)
++* pause:                                 dial File.           (line  80)
++* phone:                                 Placing the Call.    (line  45)
++* port in port file:                     port File.           (line  23)
++* port in sys file:                      Placing the Call.    (line  24)
++* portfile:                              Configuration File Names.
++                                                              (line  15)
++* protocol in port file:                 port File.           (line  51)
++* protocol in sys file:                  Protocol Selection.  (line   7)
++* protocol-parameter in dial file:       dial File.           (line 142)
++* protocol-parameter in port file:       port File.           (line  57)
++* protocol-parameter in sys file:        Protocol Selection.  (line  90)
++* pubdir in config file:                 Miscellaneous (config).
++                                                              (line  20)
++* pubdir in sys file:                    Miscellaneous (sys). (line  37)
++* push:                                  port File.           (line 208)
++* receive-request:                       File Transfer Control.
++                                                              (line  11)
++* reliable in dial file:                 dial File.           (line 155)
++* reliable in port file:                 port File.           (line  67)
++* remote-receive:                        File Transfer Control.
++                                                              (line 102)
++* remote-send:                           File Transfer Control.
++                                                              (line  93)
++* request:                               File Transfer Control.
++                                                              (line  15)
++* run-uuxqt:                             Miscellaneous (config).
++                                                              (line  72)
++* send-request:                          File Transfer Control.
++                                                              (line   7)
++* sequence:                              Miscellaneous (sys). (line   7)
++* server-address:                        port File.           (line 215)
++* service:                               port File.           (line 193)
++* seven-bit in dial file:                dial File.           (line 148)
++* seven-bit in port file:                port File.           (line  61)
++* speed in port file:                    port File.           (line  84)
++* speed in sys file:                     Placing the Call.    (line   7)
++* speed-range:                           port File.           (line  92)
++* spool:                                 Miscellaneous (config).
++                                                              (line  14)
++* statfile:                              Log File Names.      (line  14)
++* stream:                                port File.           (line 211)
++* strip-login:                           Miscellaneous (config).
++                                                              (line  43)
++* strip-proto:                           Miscellaneous (config).
++                                                              (line  53)
++* sysfile:                               Configuration File Names.
++                                                              (line   7)
++* system:                                Naming the System.   (line   7)
++* time:                                  When to Call.        (line   7)
++* timegrade:                             When to Call.        (line  25)
++* timetable:                             Miscellaneous (config).
++                                                              (line  91)
++* transfer:                              File Transfer Control.
++                                                              (line  29)
++* type:                                  port File.           (line  26)
++* unknown:                               Miscellaneous (config).
++                                                              (line  36)
++* uuname:                                Miscellaneous (config).
++                                                              (line   9)
++* v2-files:                              Miscellaneous (config).
++                                                              (line 109)
++* version:                               port File.           (line 200)
+ 
+-    system name
+-          The name of the remote system.
+ 
+--- uucp-1.07.orig/uucp.texi
++++ uucp-1.07/uucp.texi
+@@ -5,6 +5,8 @@
+ @setchapternewpage odd
+ @c %**end of header
+ 
++@dircategory Networking tools
++
+ @iftex
+ @finalout
+ @end iftex
+--- uucp-1.07.orig/uucp.info
++++ uucp-1.07/uucp.info
+@@ -1,4 +1,6 @@
+-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
++
++INFO-DIR-SECTION Networking tools
+ 
+ START-INFO-DIR-ENTRY
+ * UUCP: (uucp).                 Transfer mail and news across phone lines.
+@@ -26,132 +28,126 @@ a translation approved by the author ins
+ 
+ \x1f
+ Indirect:
+-uucp.info-1: 1096
+-uucp.info-2: 50839
+-uucp.info-3: 100147
+-uucp.info-4: 149117
+-uucp.info-5: 197494
+-uucp.info-6: 241473
+-uucp.info-7: 285750
+-uucp.info-8: 333507
++uucp.info-1: 1132
++uucp.info-2: 295451
+ \x1f
+ Tag Table:
+ (Indirect)
+-Node: Top\x7f1096
+-Node: Copying\x7f8521
+-Node: Introduction\x7f10769
+-Node: Invoking the UUCP Programs\x7f19718
+-Node: Standard Options\x7f20638
+-Node: Invoking uucp\x7f22051
+-Node: uucp Description\x7f22320
+-Node: uucp Options\x7f24342
+-Node: Invoking uux\x7f26952
+-Node: uux Description\x7f27270
+-Node: uux Options\x7f30313
+-Node: uux Examples\x7f33052
+-Node: Invoking uustat\x7f33967
+-Node: uustat Description\x7f34302
+-Node: uustat Options\x7f36064
+-Node: uustat Examples\x7f42643
+-Node: Invoking uuname\x7f45411
+-Node: Invoking uulog\x7f46370
+-Node: Invoking uuto\x7f48579
+-Node: Invoking uupick\x7f49533
+-Node: Invoking cu\x7f50839
+-Node: cu Description\x7f51215
+-Node: cu Commands\x7f52601
+-Node: cu Variables\x7f54985
+-Node: cu Options\x7f57140
+-Node: Invoking uucico\x7f58510
+-Node: uucico Description\x7f58786
+-Node: uucico Options\x7f61428
+-Node: Invoking uuxqt\x7f64880
+-Node: Invoking uuchk\x7f66058
+-Node: Invoking uuconv\x7f66644
+-Node: Invoking uusched\x7f68492
+-Node: Installing Taylor UUCP\x7f68930
+-Node: Compilation\x7f69460
+-Node: Testing the Compilation\x7f76413
+-Node: Installing the Binaries\x7f80373
+-Node: Configuration\x7f81395
+-Node: Testing the Installation\x7f83569
+-Node: Using Taylor UUCP\x7f86701
+-Node: Calling Other Systems\x7f87150
+-Node: Accepting Calls\x7f89674
+-Node: Mail and News\x7f91636
+-Node: Sending mail or news\x7f92729
+-Node: Receiving mail or news\x7f94178
+-Node: The Spool Directory Layout\x7f94942
+-Node: System Spool Directories\x7f95857
+-Node: Status Directory\x7f97807
+-Node: Execution Subdirectories\x7f100147
+-Node: Other Spool Subdirectories\x7f101426
+-Node: Spool Lock Files\x7f104404
+-Node: Spool Directory Cleaning\x7f106953
+-Node: Configuration Files\x7f108145
+-Node: Configuration Overview\x7f109728
+-Node: Configuration File Format\x7f111880
+-Node: Configuration Examples\x7f113553
+-Node: config File Examples\x7f114122
+-Node: Leaf Example\x7f118001
+-Node: Gateway Example\x7f120687
+-Node: Time Strings\x7f125052
+-Node: Chat Scripts\x7f126868
+-Node: config File\x7f136057
+-Node: Miscellaneous (config)\x7f137121
+-Node: Configuration File Names\x7f142943
+-Node: Log File Names\x7f147880
+-Node: Debugging Levels\x7f149117
+-Node: sys File\x7f151983
+-Node: Defaults and Alternates\x7f152863
+-Node: Naming the System\x7f155955
+-Node: Calling Out\x7f157796
+-Node: When to Call\x7f158153
+-Node: Placing the Call\x7f163763
+-Node: Logging In\x7f167285
+-Node: Accepting a Call\x7f170896
+-Node: Protocol Selection\x7f173708
+-Node: File Transfer Control\x7f187452
+-Node: Miscellaneous (sys)\x7f193744
+-Node: Default sys File Values\x7f196872
+-Node: port File\x7f197494
+-Node: dial File\x7f209257
+-Node: UUCP Over TCP\x7f215278
+-Node: TCP Client\x7f215782
+-Node: TCP Server\x7f217554
+-Node: Security\x7f219008
+-Node: Protocols\x7f224051
+-Node: UUCP Protocol Sources\x7f225671
+-Node: UUCP Grades\x7f227919
+-Node: UUCP Lock Files\x7f232212
+-Node: Execution File Format\x7f235609
+-Node: UUCP Protocol\x7f240973
+-Node: The Initial Handshake\x7f241473
+-Node: UUCP Protocol Commands\x7f249866
+-Node: The S Command\x7f251888
+-Node: The R Command\x7f258938
+-Node: The X Command\x7f263032
+-Node: The E Command\x7f264950
+-Node: The H Command\x7f268063
+-Node: The Final Handshake\x7f268896
+-Node: g Protocol\x7f269558
+-Node: f Protocol\x7f279982
+-Node: t Protocol\x7f283060
+-Node: e Protocol\x7f284114
+-Node: Big G Protocol\x7f284902
+-Node: i Protocol\x7f285750
+-Node: j Protocol\x7f294764
+-Node: x Protocol\x7f301031
+-Node: y Protocol\x7f301587
+-Node: d Protocol\x7f306138
+-Node: h Protocol\x7f306503
+-Node: v Protocol\x7f306807
+-Node: Hacking\x7f307298
+-Node: System Dependence\x7f307666
+-Node: Naming Conventions\x7f309054
+-Node: Patches\x7f311229
+-Node: Acknowledgements\x7f313179
+-Node: Index (concepts)\x7f326563
+-Node: Index (configuration file)\x7f333507
++Node: Top\x7f1132
++Node: Copying\x7f8554
++Node: Introduction\x7f10799
++Node: Invoking the UUCP Programs\x7f19753
++Node: Standard Options\x7f20674
++Node: Invoking uucp\x7f22092
++Node: uucp Description\x7f22369
++Node: uucp Options\x7f24403
++Node: Invoking uux\x7f27022
++Node: uux Description\x7f27348
++Node: uux Options\x7f30403
++Node: uux Examples\x7f33151
++Node: Invoking uustat\x7f34075
++Node: uustat Description\x7f34418
++Node: uustat Options\x7f36192
++Node: uustat Examples\x7f42780
++Node: Invoking uuname\x7f45557
++Node: Invoking uulog\x7f46524
++Node: Invoking uuto\x7f48741
++Node: Invoking uupick\x7f49703
++Node: Invoking cu\x7f51017
++Node: cu Description\x7f51401
++Node: cu Commands\x7f52799
++Node: cu Variables\x7f55192
++Node: cu Options\x7f57356
++Node: Invoking uucico\x7f58735
++Node: uucico Description\x7f59021
++Node: uucico Options\x7f61677
++Node: Invoking uuxqt\x7f65140
++Node: Invoking uuchk\x7f66328
++Node: Invoking uuconv\x7f66924
++Node: Invoking uusched\x7f68782
++Node: Installing Taylor UUCP\x7f69228
++Node: Compilation\x7f69759
++Node: Testing the Compilation\x7f76717
++Node: Installing the Binaries\x7f80681
++Node: Configuration\x7f81708
++Node: Testing the Installation\x7f83887
++Node: Using Taylor UUCP\x7f87024
++Node: Calling Other Systems\x7f87477
++Node: Accepting Calls\x7f90006
++Node: Mail and News\x7f91973
++Node: Sending mail or news\x7f93071
++Node: Receiving mail or news\x7f94529
++Node: The Spool Directory Layout\x7f95301
++Node: System Spool Directories\x7f96221
++Node: Status Directory\x7f98183
++Node: Execution Subdirectories\x7f100535
++Node: Other Spool Subdirectories\x7f101826
++Node: Spool Lock Files\x7f104816
++Node: Spool Directory Cleaning\x7f107374
++Node: Configuration Files\x7f108571
++Node: Configuration Overview\x7f110155
++Node: Configuration File Format\x7f112312
++Node: Configuration Examples\x7f113990
++Node: config File Examples\x7f114564
++Node: Leaf Example\x7f118452
++Node: Gateway Example\x7f121113
++Node: Time Strings\x7f125352
++Node: Chat Scripts\x7f127174
++Node: config File\x7f136369
++Node: Miscellaneous (config)\x7f137438
++Node: Configuration File Names\x7f143273
++Node: Log File Names\x7f148223
++Node: Debugging Levels\x7f149473
++Node: sys File\x7f152352
++Node: Defaults and Alternates\x7f153237
++Node: Naming the System\x7f156338
++Node: Calling Out\x7f158192
++Node: When to Call\x7f158558
++Node: Placing the Call\x7f164185
++Node: Logging In\x7f167724
++Node: Accepting a Call\x7f171352
++Node: Protocol Selection\x7f174177
++Node: File Transfer Control\x7f187934
++Node: Miscellaneous (sys)\x7f194239
++Node: Default sys File Values\x7f197380
++Node: port File\x7f198011
++Node: dial File\x7f209779
++Node: UUCP Over TCP\x7f215806
++Node: TCP Client\x7f216317
++Node: TCP Server\x7f218099
++Node: Security\x7f219564
++Node: Protocols\x7f224614
++Node: UUCP Protocol Sources\x7f226235
++Node: UUCP Grades\x7f228488
++Node: UUCP Lock Files\x7f232786
++Node: Execution File Format\x7f236188
++Node: UUCP Protocol\x7f241557
++Node: The Initial Handshake\x7f242062
++Node: UUCP Protocol Commands\x7f250464
++Node: The S Command\x7f252495
++Node: The R Command\x7f259558
++Node: The X Command\x7f263668
++Node: The E Command\x7f265602
++Node: The H Command\x7f268731
++Node: The Final Handshake\x7f269580
++Node: g Protocol\x7f270251
++Node: f Protocol\x7f280645
++Node: t Protocol\x7f283723
++Node: e Protocol\x7f284782
++Node: Big G Protocol\x7f285575
++Node: i Protocol\x7f286430
++Node: j Protocol\x7f295451
++Node: x Protocol\x7f301725
++Node: y Protocol\x7f302288
++Node: d Protocol\x7f306841
++Node: h Protocol\x7f307213
++Node: v Protocol\x7f307525
++Node: Hacking\x7f308023
++Node: System Dependence\x7f308392
++Node: Naming Conventions\x7f309785
++Node: Patches\x7f311965
++Node: Acknowledgements\x7f313920
++Node: Index (concepts)\x7f327305
++Node: Index (configuration file)\x7f338389
+ \x1f
+ End Tag Table
+--- uucp-1.07.orig/proty.c
++++ uucp-1.07/proty.c
+@@ -606,12 +606,7 @@ fywait_for_packet (qdaemon, pfexit)
+ #endif
+ #endif
+ 
+-#ifdef I386_ASM
+-#define ROTATE(i) \
+-	asm ("rolw $1,%0" : "=g" (i) : "g" (i))
+-#else
+ #define ROTATE(i) i += i + ((i & 0x8000) >> 15)
+-#endif
+ 
+ static unsigned short
+ iychecksum (z, c)
+--- uucp-1.07.orig/uucp.info-1
++++ uucp-1.07/uucp.info-1
+@@ -1,4 +1,6 @@
+-This is uucp.info, produced by makeinfo version 4.1 from uucp.texi.
++This is uucp.info, produced by makeinfo version 4.11 from uucp.texi.
++
++INFO-DIR-SECTION Networking tools
+ 
+ START-INFO-DIR-ENTRY
+ * UUCP: (uucp).                 Transfer mail and news across phone lines.
+@@ -30,7 +32,7 @@ File: uucp.info,  Node: Top,  Next: Copy
+ Taylor UUCP 1.07
+ ****************
+ 
+-   This is the documentation for the Taylor UUCP package, version 1.07.
++This is the documentation for the Taylor UUCP package, version 1.07.
+ The programs were written by Ian Lance Taylor.  The author can be
+ reached at <ian@airs.com>.
+ 
+@@ -41,7 +43,7 @@ is answered by the majordomo program.  T
+ message `subscribe ADDRESS' where ADDRESS is your e-mail address.  To
+ send a message to the list, send it to <taylor-uucp@gnu.org>.  There is
+ an archive of all messages sent to the mailing list at
+-<http://lists.cirr.com>.
++`http://lists.cirr.com'.
+ 
+ * Menu:
+ 
+@@ -230,7 +232,7 @@ File: uucp.info,  Node: Copying,  Next:
+ Taylor UUCP Copying Conditions
+ ******************************
+ 
+-   This package is covered by the GNU Public License.  See the file
++This package is covered by the GNU Public License.  See the file
+ `COPYING' for details.  If you would like to do something with this
+ package that you feel is reasonable, but you feel is prohibited by the
+ license, contact me to see if we can work it out.
+@@ -274,12 +276,12 @@ Public Licenses that accompany them.
+ \x1f
+ File: uucp.info,  Node: Introduction,  Next: Invoking the UUCP Programs,  Prev: Copying,  Up: Top
+ 
+-Introduction to Taylor UUCP
+-***************************
++1 Introduction to Taylor UUCP
++*****************************
+ 
+-   General introductions to UUCP are available, and perhaps one day I
+-will write one.  In the meantime, here is a very brief one that
+-concentrates on the programs provided by Taylor UUCP.
++General introductions to UUCP are available, and perhaps one day I will
++write one.  In the meantime, here is a very brief one that concentrates
++on the programs provided by Taylor UUCP.
+ 
+    Taylor UUCP is a complete UUCP package.  It is covered by the GNU
+ Public License, which means that the source code is always available.
+@@ -293,7 +295,7 @@ are based on earlier UUCP packages.
+      file name.  For example, to copy the file `notes.txt' to the system
+      `airs', you would say `uucp notes.txt airs!~/notes.txt'.  In this
+      example `~' is used to name the UUCP public directory on `airs'.
+-     For more details, see *Note uucp: Invoking uucp.
++     For more details, see *note uucp: Invoking uucp.
+ 
+ `uux'
+      The `uux' program is used to request the execution of a program on
+@@ -303,7 +305,8 @@ are based on earlier UUCP packages.
+      on `airs', passing it standard input, you would say `uux -
+      airs!rnews'.  The `-' means to read standard input and set things
+      up such that when `rnews' runs on `airs' it will receive the same
+-     standard input.  For more details, see *Note uux: Invoking uux.
++     standard input.  For more details, see *note uux: Invoking uux.
++
+ 
+    Neither `uucp' nor `uux' actually do any work immediately.  Instead,
+ they queue up requests for later processing.  They then start a daemon
+@@ -323,19 +326,19 @@ that if anything goes wrong it might be
+      connection status of all the remote systems your system knows
+      about.  The system administrator can use `uustat' to automatically
+      discard old jobs while sending mail to the user who requested
+-     them.  For more details, see *Note uustat: Invoking uustat.
++     them.  For more details, see *note uustat: Invoking uustat.
+ 
+ `uuname'
+      The `uuname' program by default lists all the remote systems your
+      system knows about.  You can also use it to get the name of your
+      local system.  It is mostly useful for shell scripts.  For more
+-     details, see *Note uuname: Invoking uuname.
++     details, see *note uuname: Invoking uuname.
+ 
+ `uulog'
+      The `uulog' program can be used to display entries in the UUCP log
+      file.  It can select the entries for a particular system or a
+      particular user.  You can use it to see what has happened to your
+-     queued jobs in the past.  For more details, see *Note uulog:
++     queued jobs in the past.  For more details, see *note uulog:
+      Invoking uulog.
+ 
+ `uuto'
+@@ -345,14 +348,15 @@ that if anything goes wrong it might be
+      transfer a file, or the contents of a directory, to a remote
+      system, and notify a particular user on the remote system when it
+      arrives.  The remote user can then retrieve the file(s) with
+-     `uupick'.  For more details, see *Note uuto: Invoking uuto, and
+-     see *Note uupick: Invoking uupick.
++     `uupick'.  For more details, see *note uuto: Invoking uuto, and
++     see *note uupick: Invoking uupick.
+ 
+ `cu'
+      The `cu' program can be used to call up another system and
+      communicate with it as though you were directly connected.  It can
+      also do simple file transfers, though it does not provide any
+-     error checking.  For more details, *Note cu: Invoking cu.
++     error checking.  For more details, *note cu: Invoking cu.
++
+ 
+    These eight programs just described, `uucp', `uux', `uuto',
+ `uupick', `uustat', `uuname', `uulog', and `cu' are the user programs
+@@ -376,16 +380,17 @@ normally run automatically rather than b
+      requests in the queue and goes on to the next system to call.  It
+      is also possible to force `uucico' to call a remote system even if
+      there is no work to be done for it, so that it can pick up any
+-     work that may be queued up remotely.  For more details, see *Note
++     work that may be queued up remotely.  For more details, see *note
+      uucico: Invoking uucico.
+ 
+ `uuxqt'
+      The `uuxqt' daemon processes execution requests made by the `uux'
+      program on remote systems.  It also processes requests made on the
+      local system which require files from a remote system.  It is
+-     normally started by `uucico'.  For more details, see *Note uuxqt:
++     normally started by `uucico'.  For more details, see *note uuxqt:
+      Invoking uuxqt.
+ 
++
+    Suppose you, on the system `bantam', want to copy a file to the
+ system `airs'.  You would run the `uucp' command locally, with a
+ command like `uucp notes.txt airs!~/notes.txt'.  This would queue up a
+@@ -421,7 +426,7 @@ installing and configuring UUCP.
+      The `uuchk' program reads the UUCP configuration files and
+      displays a rather lengthy description of what it finds.  This is
+      useful when configuring UUCP to make certain that the UUCP package
+-     will do what you expect it to do.  For more details, see *Note
++     will do what you expect it to do.  For more details, see *note
+      uuchk: Invoking uuchk.
+ 
+ `uuconv'
+@@ -430,13 +435,13 @@ installing and configuring UUCP.
+      administrators converting from an older UUCP package.  Taylor UUCP
+      is able to read and use old configuration file formats, but some
+      new features can not be selected using the old formats.  For more
+-     details, see *Note uuconv: Invoking uuconv.
++     details, see *note uuconv: Invoking uuconv.
+ 
+ `uusched'
+      The `uusched' script is provided for compatibility with older UUCP
+      releases.  It starts `uucico' to call, one at a time, all the
+      systems for which work has been queued.  For more details, see
+-     *Note uusched: Invoking uusched.
++     *note uusched: Invoking uusched.
+ 
+ `tstuu'
+      The `tstuu' program is a test harness for the UUCP package; it can
+@@ -444,15 +449,16 @@ installing and configuring UUCP.
+      correctly.  However, it uses pseudo-terminals, which means that it
+      is less portable than the rest of the package.  If it works, it
+      can be useful when initially installing Taylor UUCP.  For more
+-     details, see *Note tstuu: Testing the Compilation.
++     details, see *note tstuu: Testing the Compilation.
++
+ 
+ \x1f
+ File: uucp.info,  Node: Invoking the UUCP Programs,  Next: Installing Taylor UUCP,  Prev: Introduction,  Up: Top
+ 
+-Invoking the UUCP Programs
+-**************************
++2 Invoking the UUCP Programs
++****************************
+ 
+-   This chapter describes how to run the UUCP programs.
++This chapter describes how to run the UUCP programs.
+ 
+ * Menu:
+ 
+@@ -474,10 +480,10 @@ Invoking the UUCP Programs
+ \x1f
+ File: uucp.info,  Node: Standard Options,  Next: Invoking uucp,  Prev: Invoking the UUCP Programs,  Up: Invoking the UUCP Programs
+ 
+-Standard Options
+-================
++2.1 Standard Options
++====================
+ 
+-   All of the UUCP programs support a few standard options.
++All of the UUCP programs support a few standard options.
+ 
+ `-x type'
+ `--debug type'
+@@ -514,8 +520,8 @@ Standard Options
+ \x1f
+ File: uucp.info,  Node: Invoking uucp,  Next: Invoking uux,  Prev: Standard Options,  Up: Invoking the UUCP Programs
+ 
+-Invoking uucp
+-=============
++2.2 Invoking uucp
++=================
+ 
+ * Menu:
+ 
+@@ -525,8 +531,8 @@ Invoking uucp
+ \x1f
+ File: uucp.info,  Node: uucp Description,  Next: uucp Options,  Prev: Invoking uucp,  Up: Invoking uucp
+ 
+-uucp Description
+-----------------
++2.2.1 uucp Description
++----------------------
+ 
+      uucp [options] `source-file' `destination-file'
+      uucp [options] `source-file'... `destination-directory'
+@@ -570,10 +576,10 @@ resulting file is owned by the uucp user
+ \x1f
+ File: uucp.info,  Node: uucp Options,  Prev: uucp Description,  Up: Invoking uucp
+ 
+-uucp Options
+-------------
++2.2.2 uucp Options
++------------------
+ 
+-   The following options may be given to `uucp'.
++The following options may be given to `uucp'.
+ 
+ `-c'
+ `--nocopy'
+@@ -643,7 +649,7 @@ uucp Options
+ 
+ `-t'
+ `--uuto'
+-     This option is used by the `uuto' shell script; see *Note Invoking
++     This option is used by the `uuto' shell script; see *note Invoking
+      uuto::.  It causes `uucp' to interpret the final argument as
+      `system!user'.  The file(s) are sent to `~/receive/USER/LOCAL' on
+      the remote system, where USER is from the final argument and LOCAL
+@@ -662,8 +668,8 @@ uucp Options
+ \x1f
+ File: uucp.info,  Node: Invoking uux,  Next: Invoking uustat,  Prev: Invoking uucp,  Up: Invoking the UUCP Programs
+ 
+-Invoking uux
+-============
++2.3 Invoking uux
++================
+ 
+ * Menu:
+ 
+@@ -674,8 +680,8 @@ Invoking uux
+ \x1f
+ File: uucp.info,  Node: uux Description,  Next: uux Options,  Prev: Invoking uux,  Up: Invoking uux
+ 
+-uux Description
+----------------
++2.3.1 uux Description
++---------------------
+ 
+      uux [options] command
+ 
+@@ -730,7 +736,7 @@ on a remote system.
+ `uux'.  Many permit only the execution of `rmail' and `rnews'.
+ 
+    A request to execute an empty command (e.g., `uux sys!') will create
+-a poll file for the specified system; see *Note Calling Other Systems::
++a poll file for the specified system; see *note Calling Other Systems::
+ for an example of why this might be useful.
+ 
+    The exit status of `uux' is one of the codes found in the header
+@@ -740,10 +746,10 @@ file `sysexits.h'.  In particular, `EX_O
+ \x1f
+ File: uucp.info,  Node: uux Options,  Next: uux Examples,  Prev: uux Description,  Up: Invoking uux
+ 
+-uux Options
+------------
++2.3.2 uux Options
++-----------------
+ 
+-   The following options may be given to `uux'.
++The following options may be given to `uux'.
+ 
+ `-'
+ `-p'
+@@ -822,10 +828,10 @@ uux Options
+ \x1f
+ File: uucp.info,  Node: uux Examples,  Prev: uux Options,  Up: Invoking uux
+ 
+-uux Examples
+-------------
++2.3.3 uux Examples
++------------------
+ 
+-   Here are some examples of using `uux'.
++Here are some examples of using `uux'.
+ 
+      uux -z - sys1!rmail user1
+    This will execute the command `rmail user1' on the system `sys1',
+@@ -846,8 +852,8 @@ writable by the `uuxqt' daemon for this
+ \x1f
+ File: uucp.info,  Node: Invoking uustat,  Next: Invoking uuname,  Prev: Invoking uux,  Up: Invoking the UUCP Programs
+ 
+-Invoking uustat
+-===============
++2.4 Invoking uustat
++===================
+ 
+ * Menu:
+ 
+@@ -858,8 +864,8 @@ Invoking uustat
+ \x1f
+ File: uucp.info,  Node: uustat Description,  Next: uustat Options,  Prev: Invoking uustat,  Up: Invoking uustat
+ 
+-uustat Description
+-------------------
++2.4.1 uustat Description
++------------------------
+ 
+      uustat -a
+      uustat --all
+@@ -899,10 +905,10 @@ group of jobs, such as all jobs more tha
+ \x1f
+ File: uucp.info,  Node: uustat Options,  Next: uustat Examples,  Prev: uustat Description,  Up: Invoking uustat
+ 
+-uustat Options
+---------------
++2.4.2 uustat Options
++--------------------
+ 
+-   The following options may be given to `uustat'.
++The following options may be given to `uustat'.
+ 
+ `-a'
+ `--all'
+@@ -1077,11 +1083,11 @@ uustat Options
+ \x1f
+ File: uucp.info,  Node: uustat Examples,  Prev: uustat Options,  Up: Invoking uustat
+ 
+-uustat Examples
+----------------
++2.4.3 uustat Examples
++---------------------
+ 
+      uustat --all
+-   Display status of all jobs.  A sample output line is as follows:
++Display status of all jobs.  A sample output line is as follows:
+      bugsA027h bugs ian 04-01 13:50 Executing rmail ian@airs.com (sending 12 bytes)
+    The format is
+      jobid system user queue-date command (size)
+@@ -1138,8 +1144,8 @@ will be error messages.
+ \x1f
+ File: uucp.info,  Node: Invoking uuname,  Next: Invoking uulog,  Prev: Invoking uustat,  Up: Invoking the UUCP Programs
+ 
+-Invoking uuname
+-===============
++2.5 Invoking uuname
++===================
+ 
+      uuname [-a] [--aliases]
+      uuname -l
+@@ -1178,8 +1184,8 @@ local system.
+ \x1f
+ File: uucp.info,  Node: Invoking uulog,  Next: Invoking uuto,  Prev: Invoking uuname,  Up: Invoking the UUCP Programs
+ 
+-Invoking uulog
+-==============
++2.6 Invoking uulog
++==================
+ 
+      uulog [-#] [-n lines] [-sf system] [-u user] [-DSF] [--lines lines]
+            [--system system] [--user user] [--debuglog] [--statslog]
+@@ -1251,8 +1257,8 @@ If the UUCP programs have been compiled
+ \x1f
+ File: uucp.info,  Node: Invoking uuto,  Next: Invoking uupick,  Prev: Invoking uulog,  Up: Invoking the UUCP Programs
+ 
+-Invoking uuto
+-=============
++2.7 Invoking uuto
++=================
+ 
+      uuto files... system!user
+ 
+@@ -1274,8 +1280,8 @@ Invoking uucp::.
+ \x1f
+ File: uucp.info,  Node: Invoking uupick,  Next: Invoking cu,  Prev: Invoking uuto,  Up: Invoking the UUCP Programs
+ 
+-Invoking uupick
+-===============
++2.8 Invoking uupick
++===================
+ 
+      uupick [-s system] [--system system]
+ 
+@@ -1313,6 +1319,5702 @@ action to take.  One of the following co
+ 
+    The `-s' or `--system' option may be used to restrict `uupick' to
+ only present files transferred from a particular system.  The `uupick'
+-program also supports the standard UUCP program options; see *Note
++program also supports the standard UUCP program options; see *note
+ Standard Options::.
+ 
++\x1f
++File: uucp.info,  Node: Invoking cu,  Next: Invoking uucico,  Prev: Invoking uupick,  Up: Invoking the UUCP Programs
++
++2.9 Invoking cu
++===============
++
++* Menu:
++
++* cu Description::              Description of cu
++* cu Commands::                 Commands Supported by cu
++* cu Variables::                Variables Supported by cu
++* cu Options::                  Options Supported by cu
++
++\x1f
++File: uucp.info,  Node: cu Description,  Next: cu Commands,  Prev: Invoking cu,  Up: Invoking cu
++
++2.9.1 cu Description
++--------------------
++
++     cu [options] [system | phone | "dir"]
++
++   The `cu' program is used to call up another system and act as a dial
++in terminal.  It can also do simple file transfers with no error
++checking.
++
++   The `cu' program takes a single non-option argument.
++
++   If the argument is the string `dir' cu will make a direct connection
++to the port.  This may only be used by users with write access to the
++port, as it permits reprogramming the modem.
++
++   Otherwise, if the argument begins with a digit, it is taken to be a
++phone number to call.
++
++   Otherwise, it is taken to be the name of a system to call.
++
++   The `-z' or `--system' options may be used to name a system
++beginning with a digit, and the `-c' or `--phone' options may be used
++to name a phone number that does not begin with a digit.
++
++   The `cu' program locates a port to use in the UUCP configuration
++files.  If a simple system name is given, it will select a port
++appropriate for that system.  The `-p', `--port', `-l', `--line', `-s',
++and `--speed' options may be used to control the port selection.
++
++   When a connection is made to the remote system, `cu' forks into two
++processes.  One reads from the port and writes to the terminal, while
++the other reads from the terminal and writes to the port.
++
++\x1f
++File: uucp.info,  Node: cu Commands,  Next: cu Variables,  Prev: cu Description,  Up: Invoking cu
++
++2.9.2 cu Commands
++-----------------
++
++The `cu' program provides several commands that may be used during the
++conversation.  The commands all begin with an escape character, which
++by default is `~' (tilde).  The escape character is only recognized at
++the beginning of a line.  To send an escape character to the remote
++system at the start of a line, it must be entered twice.  All commands
++are either a single character or a word beginning with `%' (percent
++sign).
++
++   The `cu' program recognizes the following commands.
++
++`~.'
++     Terminate the conversation.
++
++`~! command'
++     Run command in a shell.  If command is empty, starts up a shell.
++
++`~$ command'
++     Run command, sending the standard output to the remote system.
++
++`~| command'
++     Run command, taking the standard input from the remote system.
++
++`~+ command'
++     Run command, taking the standard input from the remote system and
++     sending the standard output to the remote system.
++
++`~#, ~%break'
++     Send a break signal, if possible.
++
++`~c directory, ~%cd directory'
++     Change the local directory.
++
++`~> file'
++     Send a file to the remote system.  This just dumps the file over
++     the communication line.  It is assumed that the remote system is
++     expecting it.
++
++`~<'
++     Receive a file from the remote system.  This prompts for the local
++     file name and for the remote command to execute to begin the file
++     transfer.  It continues accepting data until the contents of the
++     `eofread' variable are seen.
++
++`~p from to'
++`~%put from to'
++     Send a file to a remote Unix system.  This runs the appropriate
++     commands on the remote system.
++
++`~t from to'
++`~%take from to'
++     Retrieve a file from a remote Unix system.  This runs the
++     appropriate commands on the remote system.
++
++`~s variable value'
++     Set a `cu' variable to the given value.  If value is not given, the
++     variable is set to `true'.
++
++`~! variable'
++     Set a `cu' variable to `false'.
++
++`~z'
++     Suspend the cu session.  This is only supported on some systems.
++     On systems for which `^Z' may be used to suspend a job, `~^Z' will
++     also suspend the session.
++
++`~%nostop'
++     Turn off XON/XOFF handling.
++
++`~%stop'
++     Turn on XON/XOFF handling.
++
++`~v'
++     List all the variables and their values.
++
++`~?'
++     List all commands.
++
++\x1f
++File: uucp.info,  Node: cu Variables,  Next: cu Options,  Prev: cu Commands,  Up: Invoking cu
++
++2.9.3 cu Variables
++------------------
++
++The `cu' program also supports several variables.  They may be listed
++with the `~v' command, and set with the `~s' or `~!'  commands.
++
++`escape'
++     The escape character.  The default is `~' (tilde).
++
++`delay'
++     If this variable is true, `cu' will delay for a second, after
++     recognizing the escape character, before printing the name of the
++     local system.  The default is true.
++
++`eol'
++     The list of characters which are considered to finish a line.  The
++     escape character is only recognized after one of these is seen.
++     The default is `carriage return', `^U', `^C', `^O', `^D', `^S',
++     `^Q', `^R'.
++
++`binary'
++     Whether to transfer binary data when sending a file.  If this is
++     false, then newlines in the file being sent are converted to
++     carriage returns.  The default is false.
++
++`binary-prefix'
++     A string used before sending a binary character in a file
++     transfer, if the `binary' variable is true.  The default is `^V'.
++
++`echo-check'
++     Whether to check file transfers by examining what the remote system
++     echoes back.  This probably doesn't work very well.  The default is
++     false.
++
++`echonl'
++     The character to look for after sending each line in a file.  The
++     default is carriage return.
++
++`timeout'
++     The timeout to use, in seconds, when looking for a character,
++     either when doing echo checking or when looking for the `echonl'
++     character.  The default is 30.
++
++`kill'
++     The character to use delete a line if the echo check fails.  The
++     default is `^U'.
++
++`resend'
++     The number of times to resend a line if the echo check continues to
++     fail.  The default is 10.
++
++`eofwrite'
++     The string to write after sending a file with the `~>' command.
++     The default is `^D'.
++
++`eofread'
++     The string to look for when receiving a file with the ` ~<'
++     command.  The default is `$', which is intended to be a typical
++     shell prompt.
++
++`verbose'
++     Whether to print accumulated information during a file transfer.
++     The default is true.
++
++\x1f
++File: uucp.info,  Node: cu Options,  Prev: cu Variables,  Up: Invoking cu
++
++2.9.4 cu Options
++----------------
++
++The following options may be given to `cu'.
++
++`-e'
++`--parity=even'
++     Use even parity.
++
++`-o'
++`--parity=odd'
++     Use odd parity.
++
++`--parity=none'
++     Use no parity.  No parity is also used if both `-e' and `-o' are
++     given.
++
++`-h'
++`--halfduplex'
++     Echo characters locally (half-duplex mode).
++
++`--nostop'
++     Turn off XON/XOFF handling (it is on by default).
++
++`-E char'
++`--escape char'
++     Set the escape character.  Initially `~' (tilde).  To eliminate the
++     escape character, use `-E '''.
++
++`-z system'
++`--system system'
++     The system to call.
++
++`-c phone-number'
++`--phone phone-number'
++     The phone number to call.
++
++`-p port'
++`-a port'
++`--port port'
++     Name the port to use.
++
++`-l line'
++`--line line'
++     Name the line to use by giving a device name.  This may be used to
++     dial out on ports that are not listed in the UUCP configuration
++     files.  Write access to the device is required.
++
++`-s speed'
++`-#'
++`--speed speed'
++     The speed (baud rate) to use.  Here, `-#' means an actual number;
++     e.g., `-9600'.
++
++`-n'
++`--prompt'
++     Prompt for the phone number to use.
++
++`-d'
++     Enter debugging mode.  Equivalent to `--debug all'.
++
++`-x type'
++`--debug type'
++`-I file'
++`--config file'
++`-v'
++`--version'
++`--help'
++     *Note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uucico,  Next: Invoking uuxqt,  Prev: Invoking cu,  Up: Invoking the UUCP Programs
++
++2.10 Invoking uucico
++====================
++
++* Menu:
++
++* uucico Description::          Description of uucico
++* uucico Options::              Options Supported by uucico
++
++\x1f
++File: uucp.info,  Node: uucico Description,  Next: uucico Options,  Prev: Invoking uucico,  Up: Invoking uucico
++
++2.10.1 uucico Description
++-------------------------
++
++     uucico [options]
++
++   The `uucico' daemon processes file transfer requests queued by
++`uucp' and `uux'.  It is started when `uucp' or `uux' is run (unless
++they are given the `-r' or `--nouucico' options).  It is also typically
++started periodically using entries in the `crontab' table(s).
++
++   When `uucico' is invoked with `-r1', `--master', `-s', `--system',
++or `-S', the daemon will place a call to a remote system, running in
++master mode.  Otherwise the daemon will start in slave mode, accepting
++a call from a remote system.  Typically a special login name will be
++set up for UUCP which automatically invokes `uucico' when a remote
++system calls in and logs in under that name.
++
++   When `uucico' terminates, it invokes the `uuxqt' daemon, unless the
++`-q' or `--nouuxqt' options were given; `uuxqt' executes any work
++orders created by `uux' on a remote system, and any work orders created
++locally which have received remote files for which they were waiting.
++
++   If a call fails, `uucico' will normally refuse to retry the call
++until a certain (configurable) amount of time has passed.  This may be
++overriden by the `-f', `--force', or `-S' options.
++
++   The `-l', `--prompt', `-e', or `--loop' options may be used to force
++`uucico' to produce its own prompts of `login: ' and `Password:'.  When
++another `uucico' daemon calls in, it will see these prompts and log in
++as usual.  The login name and password will normally be checked against
++a separate list kept specially for `uucico', rather than the
++`/etc/passwd' file (*note Configuration File Names::).  It is possible,
++on some systems, to configure `uucico' to use `/etc/passwd'.  The `-l'
++or `--prompt' options will prompt once and then exit; in this mode the
++UUCP administrator, or the superuser, may use the `-u' or `--login'
++option to force a login name, in which case `uucico' will not prompt
++for one.  The `-e' or `--loop' options will prompt again after the
++first session is over; in this mode `uucico' will permanently control a
++port.
++
++   If `uucico' receives a `SIGQUIT', `SIGTERM' or `SIGPIPE' signal, it
++will cleanly abort any current conversation with a remote system and
++exit.  If it receives a `SIGHUP' signal it will abort any current
++conversation, but will continue to place calls to (if invoked with
++`-r1' or `--master') and accept calls from (if invoked with `-e' or
++`--loop') other systems.  If it receives a `SIGINT' signal it will
++finish the current conversation, but will not place or accept any more
++calls.
++
++\x1f
++File: uucp.info,  Node: uucico Options,  Prev: uucico Description,  Up: Invoking uucico
++
++2.10.2 uucico Options
++---------------------
++
++The following options may be given to `uucico'.
++
++`-r1'
++`--master'
++     Start in master mode: call out to a remote system.  Implied by
++     `-s', `--system', or `-S'.  If no system is specified,
++     sequentially call every system for which work is waiting to be
++     done.
++
++`-r0'
++`--slave'
++     Start in slave mode.  This is the default.
++
++`-s system'
++`--system system'
++     Call the specified system.
++
++`-S system'
++     Call the specified system, ignoring any required wait.  This is
++     equivalent to `-s system -f'.
++
++`-f'
++`--force'
++     Ignore any required wait for any systems to be called.
++
++`-l'
++`--prompt'
++     Prompt for login name and password using `login: ' and
++     `Password:'.  This allows `uucico' to be easily run from `inetd'.
++     The login name and password are checked against the UUCP password
++     file, which need not be `/etc/passwd'.  The `--login' option may
++     be used to force a login name, in which cause `uucico' will only
++     prompt for a password.
++
++`-p port'
++`--port port'
++     Specify a port to call out on or to listen to.
++
++`-e'
++`--loop'
++     Enter an endless loop of login/password prompts and slave mode
++     daemon execution.  The program will not stop by itself; you must
++     use `kill' to shut it down.
++
++`-w'
++`--wait'
++     After calling out (to a particular system when `-s', `--system',
++     or `-S' is specifed, or to all systems which have work when just
++     `-r1' or `--master' is specifed), begin an endless loop as with
++     `--loop'.
++
++`-q'
++`--nouuxqt'
++     Do not start the `uuxqt' daemon when finished.
++
++`-c'
++`--quiet'
++     If no calls are permitted at this time, then don't make the call,
++     but also do not put an error message in the log file and do not
++     update the system status (as reported by `uustat').  This can be
++     convenient for automated polling scripts, which may want to simply
++     attempt to call every system rather than worry about which
++     particular systems may be called at the moment.  This option also
++     suppresses the log message indicating that there is no work to be
++     done.
++
++`-C'
++`--ifwork'
++     Only call the system named by `-s', `--system', or `-S' if there
++     is work for that system.
++
++`-D'
++`--nodetach'
++     Do not detach from the controlling terminal.  Normally `uucico'
++     detaches from the terminal before each call out to another system
++     and before invoking `uuxqt'.  This option prevents this.
++
++`-u name'
++`--login name'
++     Set the login name to use instead of that of the invoking user.
++     This option may only be used by the UUCP administrator or the
++     superuser.  If used with `--prompt', this will cause `uucico' to
++     prompt only for the password, not the login name.
++
++`-z'
++`--try-next'
++     If a call fails after the remote system is reached, try the next
++     alternate rather than simply exiting.
++
++`-i type'
++`--stdin type'
++     Set the type of port to use when using standard input.  The only
++     supported port type is TLI, and this is only available on machines
++     which support the TLI networking interface.  Specifying `-i TLI'
++     causes `uucico' to use TLI calls to perform I/O.
++
++`-X type'
++     Same as the standard option `-x type'.  Provided for historical
++     compatibility.
++
++`-x type'
++`--debug type'
++`-I file'
++`--config file'
++`-v'
++`--version'
++`--help'
++     *Note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uuxqt,  Next: Invoking uuchk,  Prev: Invoking uucico,  Up: Invoking the UUCP Programs
++
++2.11 Invoking uuxqt
++===================
++
++     uuxqt [-c command] [-s system] [--command command] [--system system]
++
++   The `uuxqt' daemon executes commands requested by `uux' from either
++the local system or from remote systems.  It is started automatically
++by the `uucico' daemon (unless `uucico' is given the `-q' or
++`--nouuxqt' options).
++
++   There is normally no need to run `uuxqt', since it will be invoked
++by `uucico'.  However, `uuxqt' can be invoked directly to provide
++greater control over the processing of the work queue.
++
++   Multiple invocations of `uuxqt' may be run at once, as controlled by
++the `max-uuxqts' configuration command; see *note Miscellaneous
++(config)::.
++
++   The following options may be given to `uuxqt'.
++
++`-c command'
++`--command command'
++     Only execute requests for the specified command.  For example,
++     `uuxqt --command rmail'.
++
++`-s system'
++`--system system'
++     Only execute requests originating from the specified system.
++
++`-x type'
++`--debug type'
++`-I file'
++`--config'
++`-v'
++`--version'
++`--help'
++     *Note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uuchk,  Next: Invoking uuconv,  Prev: Invoking uuxqt,  Up: Invoking the UUCP Programs
++
++2.12 Invoking uuchk
++===================
++
++     uuchk [-s system] [--system system]
++
++   The `uuchk' program displays information read from the UUCP
++configuration files.  It should be used to ensure that UUCP has been
++configured correctly.
++
++   The `-s' or `--system' options may be used to display the
++configuration for just the specified system, rather than for all
++systems.  The `uuchk' program also supports the standard UUCP program
++options; see *note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uuconv,  Next: Invoking uusched,  Prev: Invoking uuchk,  Up: Invoking the UUCP Programs
++
++2.13 Invoking uuconv
++====================
++
++     uuconv -i type -o type [-p program] [--program program]
++     uuconv --input type --output type [-p program] [--program program]
++
++   The `uuconv' program converts UUCP configuration files from one
++format to another.  The type of configuration file to read is specified
++using the `-i' or `--input' options.  The type of configuration file to
++write is specified using the `-o' or `--output' options.
++
++   The supported configuration file types are `taylor', `v2', and
++`hdb'.  For a description of the `taylor' configuration files, see
++*note Configuration Files::.  The other types of configuration files
++are used by traditional UUCP packages, and are not described in this
++manual.
++
++   An input configuration of type `v2' or `hdb' is read from a compiled
++in directory (specified by `oldconfigdir' in `Makefile').  An input
++configuration of type `taylor' is read from a compiled in directory by
++default, but may be overridden with the standard `-I' or `--config'
++options (*note Standard Options::).
++
++   The output configuration is written to files in the directory in
++which `uuconv' is run.
++
++   Some information in the input files may not be representable in the
++desired output format, in which case `uuconv' will silently discard it.
++The output of `uuconv' should be carefully checked before it is used.
++The `uuchk' program may be used for this purpose; see *note Invoking
++uuchk::.
++
++   The `-p' or `--program' option may be used to convert specific `cu'
++configuration information, rather than the default of only converting
++the `uucp' configuration information; see *note config File::.
++
++   The `uuchk' program also supports the standard UUCP program options;
++see *note Standard Options::.
++
++\x1f
++File: uucp.info,  Node: Invoking uusched,  Prev: Invoking uuconv,  Up: Invoking the UUCP Programs
++
++2.14 Invoking uusched
++=====================
++
++The `uusched' program is actually just a shell script which invokes the
++`uucico' daemon.  It is provided for backward compatibility.  It causes
++`uucico' to call all systems for which there is work.  Any option which
++may be given to `uucico' may also be given to `uusched'.  *Note
++Invoking uucico::.
++
++\x1f
++File: uucp.info,  Node: Installing Taylor UUCP,  Next: Using Taylor UUCP,  Prev: Invoking the UUCP Programs,  Up: Top
++
++3 Installing Taylor UUCP
++************************
++
++These are the installation instructions for the Taylor UUCP package.
++
++* Menu:
++
++* Compilation::                 Compiling Taylor UUCP
++* Testing the Compilation::     Testing the Compilation
++* Installing the Binaries::     Installing the Binaries
++* Configuration::               Configuring Taylor UUCP
++* Testing the Installation::    Testing the Installation
++
++\x1f
++File: uucp.info,  Node: Compilation,  Next: Testing the Compilation,  Prev: Installing Taylor UUCP,  Up: Installing Taylor UUCP
++
++3.1 Compiling Taylor UUCP
++=========================
++
++If you have a source code distribution, you must first compile it for
++your system.  Free versions of Unix, such as Linux, NetBSD, or FreeBSD,
++often come with pre-compiled binary distributions of UUCP.  If you are
++using a binary distribution, you may skip to the configuration section
++(*note Configuration::).
++
++   Follow these steps to compile the source code.
++
++  1. Take a look at the top of `Makefile.in' and set the appropriate
++     values for your system.  These control where the programs are
++     installed and which user on the system owns them (normally they
++     will be owned by a special user `uucp' rather than a real person;
++     they should probably not be owned by `root').
++
++  2. Run the shell script `configure'.  This script was generated using
++     the `autoconf' program written by David MacKenzie of the Free
++     Software Foundation.  It takes a while to run.  It will generate
++     the file `config.h' based on `config.h.in', and, for each source
++     code directory, will generate `Makefile' based on `Makefile.in'.
++
++     You can pass certain arguments to `configure' in the environment.
++     Because `configure' will compile little test programs to see what
++     is available on your system, you must tell it how to run your
++     compiler.  It recognizes the following environment variables:
++
++    `CC'
++          The C compiler.  If this is not set, then if `configure' can
++          find `gcc' it will use it, otherwise it will use `cc'.
++
++    `CFLAGS'
++          Flags to pass to the C compiler when compiling the actual
++          code.  If this is not set, `configure' will use `-g'.
++
++    `LDFLAGS'
++          Flags to pass to the C compiler when only linking, not
++          compiling.  If this is not set, `configure' will use the
++          empty string.
++
++    `LIBS'
++          Libraries to pass to the C compiler.  If this is not set,
++          `configure' will use the empty string.
++
++    `INSTALL'
++          The program to run to install UUCP in the binary directory.
++          If this is not set, then if `configure' finds the BSD
++          `install' program, it will set this to `install -c';
++          otherwise, it will use `cp'.
++
++     Suppose, for example, you want to set the environment variable `CC'
++     to `rcc'.  If you are using `sh', `bash', or `ksh', invoke
++     `configure' as `CC=rcc configure'.  If you are using `csh', do
++     `setenv CC rcc; sh configure'.
++
++     On some systems you will want to use `LIBS=-lmalloc'.  On Xenix
++     derived versions of Unix do not use `LIBS=-lx' because this will
++     bring in the wrong versions of certain routines; if you want to use
++     `-lx' you must specify `LIBS=-lc -lx'.
++
++     You can also pass other arguments to `configure' on the command
++     line.  Use `configure --help' for a complete list.  Of particular
++     interest:
++    `--prefix=DIRNAME'
++          The directory under which all files are installed.  Default
++          `/usr/local'.
++
++    `--with-newconfigdir=DIRNAME'
++          The directory in which to find new style configuration files.
++          Default `PREFIX/conf/uucp'.
++
++    `--with-oldconfigdir=DIRNAME'
++          The directory in which to find old style configuration files.
++          Default `/usr/lib/uucp'.
++
++     If `configure' fails for some reason, or if you have a very weird
++     system, you may have to configure the package by hand.  To do
++     this, copy the file `config.h.in' to `config.h' and edit it for
++     your system.  Then for each source directory (the top directory,
++     and the subdirectories `lib', `unix', and `uuconf') copy
++     `Makefile.in' to `Makefile', find the words within `@' characters,
++     and set them correctly for your system.
++
++  3. Igor V. Semenyuk provided this (lightly edited) note about ISC
++     Unix 3.0.  The `configure' script will default to passing `-posix'
++     to `gcc'.  However, using `-posix' changes the environment to
++     POSIX, and on ISC 3.0, at least, the default for `POSIX_NO_TRUNC'
++     is 1.  This can lead to a problem when `uuxqt' executes `rmail'.
++     `IDA sendmail' has dbm configuration files named
++     `mailertable.{dir,pag}'.  Notice these names are 15 characters
++     long.  When `uuxqt' compiled with the `-posix' executes `rmail',
++     which in turn executes `sendmail', the later is run under the
++     POSIX environment too.  This leads to `sendmail' bombing out with
++     `'error opening 'M' database: name too long' (mailertable.dir)'.
++     It's rather obscure behaviour, and it took me a day to find out
++     the cause.  I don't use the `-posix' switch; instead, I run `gcc'
++     with `-D_POSIX_SOURCE', and add `-lcposix' to `LIBS'.
++
++  4. On some versions of BSDI there is a bug in the shell which causes
++     the default value for `CFLAGS' to be set incorrectly.  If `echo
++     ${CFLAGS--g}' echoes `g' rather than `-g', then you must set
++     `CFLAGS' in the environment before running configure.  There is a
++     patch available from BSDI for this bug.  (Reported by David Vrona).
++
++  5. On AIX 3.2.5, and possibly other versions, `cc -E' does not work,
++     reporting `Option NOROCONST is not valid'.  Test this before
++     running configure by doing something like `touch /tmp/foo.c; cc -E
++     /tmp/foo.c'.  This may give a warning about the file being empty,
++     but it should not give the `Option NOROCONST' warning.  The
++     workaround is to remove the `,noroconst' entry from the `options'
++     clause in the `cc' stanza in `/etc/xlc.cfg'.  (Reported by Chris
++     Lewis).
++
++  6. You should verify that `configure' worked correctly by checking
++     `config.h' and the instances of `Makefile'.
++
++  7. Edit `policy.h' for your local system.  The comments explain the
++     various choices.  The default values are intended to be
++     reasonable, so you may not have to make any changes.
++
++     You must decide what type of configuration files to use; for more
++     information on the choices, see *note Configuration::.
++
++     You must also decide what sort of spool directory you want to use.
++     If this is a new installation, I recommend `SPOOLDIR_TAYLOR';
++     otherwise, select the spool directory corresponding to your
++     existing UUCP package.
++
++  8. Type `make' to compile everything.
++
++     The `tstuu.c' file is not particularly portable; if you can't
++     figure out how to compile it you can safely ignore it, as it is
++     only used for testing.  To use STREAMS pseudo-terminals, tstuu.c
++     must be compiled with `-DHAVE_STREAMS_PTYS'; this is not
++     determined by the configure script.
++
++     If you have any other problems there is probably a bug in the
++     `configure' script.
++
++  9. Please report any problems you have.  That is the only way they
++     will get fixed for other people.  Supply a patch if you can (*note
++     Patches::), or just ask for help.
++
++
++\x1f
++File: uucp.info,  Node: Testing the Compilation,  Next: Installing the Binaries,  Prev: Compilation,  Up: Installing Taylor UUCP
++
++3.2 Testing the Compilation
++===========================
++
++If your system supports pseudo-terminals, and you compiled the code to
++support the new style of configuration files (`HAVE_TAYLOR_CONFIG' was
++set to 1 in `policy.h'), you should be able to use the `tstuu' program
++to test the `uucico' daemon.  If your system supports STREAMS based
++pseudo-terminals, you must compile tstuu.c with `-DHAVE_STREAMS_PTYS'.
++(The STREAMS based code was contributed by Marc Boucher).
++
++   To run `tstuu', just type `tstuu' with no arguments.  You must run
++it in the compilation directory, since it runs `./uucp', `./uux' and
++`./uucico'.  The `tstuu' program will run a lengthy series of tests (it
++takes over ten minutes on a slow VAX).  You will need a fair amount of
++space available in `/usr/tmp'.  You will probably want to put it in the
++background.  Do not use `^Z', because the program traps on `SIGCHLD'
++and winds up dying.  The `tstuu' program will create a directory
++`/usr/tmp/tstuu' and fill it with configuration files, and create spool
++directories `/usr/tmp/tstuu/spool1' and `/usr/tmp/tstuu/spool2'.
++
++   If your system does not support the `FIONREAD' call, the `tstuu'
++program will run very slowly.  This may or may not get fixed in a later
++version.
++
++   The `tstuu' program will finish with an execute file named
++`X.SOMETHING' and a data file named `D.SOMETHING' in the directory
++`/usr/tmp/tstuu/spool1' (or, more likely, in subdirectories, depending
++on the choice of `SPOOLDIR' in `policy.h').  Two log files will be
++created in the directory `/usr/tmp/tstuu'.  They will be named `Log1'
++and `Log2', or, if you have selected `HAVE_HDB_LOGGING' in `policy.h',
++`Log1/uucico/test2' and `Log2/uucico/test1'.  There should be no errors
++in the log files.
++
++   You can test `uuxqt' with `./uuxqt -I /usr/tmp/tstuu/Config1'.  This
++should leave a command file `C.SOMETHING' and a data file `D.SOMETHING'
++in `/usr/tmp/tstuu/spool1' or in subdirectories.  Again, there should
++be no errors in the log file.
++
++   Assuming you compiled the code with debugging enabled, the `-x'
++switch can be used to set debugging modes; see the `debug' command for
++details (*note Debugging Levels::).  Use `-x all' to turn on all
++debugging and generate far more output than you will ever want to see.
++The `uucico' daemons will put debugging output in the files `Debug1'
++and `Debug2' in the directory `/usr/tmp/tstuu'.  After that, you're
++pretty much on your own.
++
++   On some systems you can also use `tstuu' to test `uucico' against
++the system `uucico', by using the `-u' switch.  For this to work,
++change the definitions of `ZUUCICO_CMD' and `UUCICO_EXECL' at the top
++of `tstuu.c' to something appropriate for your system.  The definitions
++in `tstuu.c' are what I used for Ultrix 4.0, on which
++`/usr/lib/uucp/uucico' is particularly obstinate about being run as a
++child; I was only able to run it by creating a login name with no
++password whose shell was `/usr/lib/uucp/uucico'.  Calling login in this
++way will leave fake entries in `wtmp' and `utmp'; if you compile
++`tstout.c' (in the `contrib' directory) as a setuid `root' program,
++`tstuu' will run it to clear those entries out.  On most systems, such
++hackery should not be necessary, although on SCO I had to su to `root'
++(`uucp' might also have worked) before I could run
++`/usr/lib/uucp/uucico'.
++
++   You can test `uucp' and `uux' (give them the `-r' switch to keep
++them from starting `uucico') to make sure they create the right sorts
++of files.  Unfortunately, if you don't know what the right sorts of
++files are, I'm not going to tell you here.
++
++   If you can not run `tstuu', or if it fails inexplicably, don't worry
++about it too much.  On some systems `tstuu' will fail because of
++problems using pseudo terminals, which will not matter in normal use.
++The real test of the package is talking to another system.
++
++\x1f
++File: uucp.info,  Node: Installing the Binaries,  Next: Configuration,  Prev: Testing the Compilation,  Up: Installing Taylor UUCP
++
++3.3 Installing the Binaries
++===========================
++
++You can install the executable files by becoming `root' and typing
++`make install'.  Or you can look at what `make install' does and do it
++by hand.  It tries to preserve your old programs, if any, but it only
++does this the first time Taylor UUCP is installed (so that if you
++install several versions of Taylor UUCP, you can still go back to your
++original UUCP programs).  You can retrieve the original programs by
++typing `make uninstall'.
++
++   Note that by default the programs are compiled with debugging
++information, and they are not stripped when they are installed.  You may
++want to strip the installed programs to save disk space.  For more
++information, see your system documentation for the `strip' program.
++
++   Of course, simply installing the executable files is not enough.  You
++must also arrange for them to be used correctly.
++
++\x1f
++File: uucp.info,  Node: Configuration,  Next: Testing the Installation,  Prev: Installing the Binaries,  Up: Installing Taylor UUCP
++
++3.4 Configuring Taylor UUCP
++===========================
++
++You will have to decide what types of configuration files you want to
++use.  This package supports a new sort of configuration file; see *note
++Configuration Files::.  It also supports V2 configuration files
++(`L.sys', `L-devices', etc.) and HDB configuration files (`Systems',
++`Devices', etc.).  No documentation is provided for V2 or HDB
++configuration files.  All types of configuration files can be used at
++once, if you are so inclined.  Currently using just V2 configuration
++files is not really possible, because there is no way to specify a
++dialer (there are no built in dialers, and the program does not know
++how to read `acucap' or `modemcap'); however, V2 configuration files
++can be used with a new style dial file (*note dial File::), or with a
++HDB `Dialers' file.
++
++   Use of HDB configuration files has two known bugs.  A blank line in
++the middle of an entry in the `Permissions' file will not be ignored as
++it should be.  Dialer programs, as found in some versions of HDB, are
++not recognized directly.  If you must use a dialer program, rather than
++an entry in `Devices', you must use the `chat-program' command in a new
++style dial file; see *note dial File::.  You will have to invoke the
++dialer program via a shell script or another program, since an exit
++code of 0 is required to recognize success; the `dialHDB' program in
++the `contrib' directory may be used for this purpose.
++
++   The `uuconv' (*note Invoking uuconv::) program can be used to
++convert from V2 or HDB configuration files to the new style (it can also
++do the reverse translation, if you are so inclined).  It will not do all
++of the work, and the results should be carefully checked, but it can be
++quite useful.
++
++   If you are installing a new system, you will, of course, have to
++write the configuration files; see *note Configuration Files:: for
++details on how to do this.
++
++   After writing the configuration files, use the `uuchk' program to
++verify that they are what you expect; see *note Invoking uuchk::.
++
++\x1f
++File: uucp.info,  Node: Testing the Installation,  Prev: Configuration,  Up: Installing Taylor UUCP
++
++3.5 Testing the Installation
++============================
++
++After you have written the configuration files, and verified them with
++the `uuchk' program (*note Invoking uuchk::), you must check that UUCP
++can correctly contact another system.
++
++   Tell `uucico' to dial out to the system by using the `-s' system
++switch (e.g., `uucico -s uunet').  The log file should tell you what
++happens.  The exact location of the log file depends upon the settings
++in `policy.h' when you compiled the program, and on the use of the
++`logfile' command in the `config' file.  Typical locations are
++`/usr/spool/uucp/Log' or a subdirectory under `/usr/spool/uucp/.Log'.
++
++   If you compiled the code with debugging enabled, you can use
++debugging mode to get a great deal of information about what sort of
++data is flowing back and forth; the various possibilities are described
++with the `debug' command (*note Debugging Levels::).  When initially
++setting up a connection `-x chat' is probably the most useful (e.g.,
++`uucico -s uunet -x chat'); you may also want to use `-x
++handshake,incoming,outgoing'.  You can use `-x' multiple times on one
++command line, or you can give it comma separated arguments as in the
++last example.  Use `-x all' to turn on all possible debugging
++information.
++
++   The debugging information is written to a file, normally
++`/usr/spool/uucp/Debug', although the default can be changed in
++`policy.h', and the `config' file can override the default with the
++`debugfile' command.  The debugging file may contain passwords and some
++file contents as they are transmitted over the line, so the debugging
++file is only readable by the `uucp' user.
++
++   You can use the `-f' switch to force `uucico' to call out even if
++the last call failed recently; using `-S' when naming a system has the
++same effect.  Otherwise the status file (in the `.Status' subdirectory
++of the main spool directory, normally `/usr/spool/uucp') (*note Status
++Directory::) will prevent too many attempts from occurring in rapid
++succession.
++
++   On older System V based systems which do not have the `setreuid'
++system call, problems may arise if ordinary users can start an execution
++of `uuxqt', perhaps indirectly via `uucp' or `uux'.  UUCP jobs may wind
++up executing with a real user ID of the user who invoked `uuxqt', which
++can cause problems if the UUCP job checks the real user ID for security
++purposes.  On such systems, it is safest to put `run-uuxqt never'
++(*note Miscellaneous (config)::) in the `config' file, so that `uucico'
++never starts `uuxqt', and invoke `uuxqt' directly from a `crontab' file.
++
++   Please let me know about any problems you have and how you got around
++them.  If you do report a problem, please include the version number of
++the package you are using, the operating system you are running it on,
++and a sample of the debugging file showing the problem (debugging
++information is usually what is needed, not just the log file).  General
++questions such as "why doesn't `uucico' dial out" are impossible to
++answer without much more information.
++
++\x1f
++File: uucp.info,  Node: Using Taylor UUCP,  Next: Configuration Files,  Prev: Installing Taylor UUCP,  Up: Top
++
++4 Using Taylor UUCP
++*******************
++
++* Menu:
++
++* Calling Other Systems::       Calling Other Systems
++* Accepting Calls::             Accepting Calls
++* Mail and News::               Using UUCP for Mail and News
++* The Spool Directory Layout::  The Spool Directory Layout
++* Spool Directory Cleaning::    Cleaning the UUCP Spool Directory
++
++\x1f
++File: uucp.info,  Node: Calling Other Systems,  Next: Accepting Calls,  Prev: Using Taylor UUCP,  Up: Using Taylor UUCP
++
++4.1 Calling Other Systems
++=========================
++
++By default `uucp' and `uux' will automatically start up `uucico' to
++call another system whenever work is queued up.  However, the call may
++fail, or you may have put in time restrictions which prevent the call
++at that time (perhaps because telephone rates are high) (*note When to
++Call::).  Also, a remote system may have work queued up for your
++system, but may not be calling you for some reason (perhaps you have
++agreed that your system should always place the call).  To make sure
++that work gets transferred between the systems withing a reasonable
++time period, you should arrange to periodically invoke `uucico'.
++
++   These periodic invocations are normally triggered by entries in the
++`crontab' file.  The exact format of `crontab' files, and how new
++entries are added, varies from system to system; check your local
++documentation (try `man cron').
++
++   To attempt to call all systems with outstanding work, use the command
++`uucico -r1'.  To attempt to call a particular system, use the command
++`uucico -s SYSTEM'.  To attempt to call a particular system, but only
++if there is work for it, use the command `uucico -C -s SYSTEM'.  (*note
++Invoking uucico::).
++
++   A common case is to want to try to call a system at a certain time,
++with periodic retries if the call fails.  A simple way to do this is to
++create an empty UUCP command file, known as a "poll file".  If a poll
++file exists for a system, then `uucico -r1' will place a call to it.
++If the call succeeds, the poll file will be deleted.
++
++   A poll file can be easily created using the `uux' command, by
++requesting the execution of an empty command.  To create a poll file for
++SYSTEM, just do something like this:
++     uux -r SYSTEM!
++   The `-r' tells `uux' to not start up `uucico' immediately.  Of
++course, if you do want `uucico' to start up right away, omit the `-r';
++if the call fails, the poll file will be left around to cause a later
++call.
++
++   For example, I use the following crontab entries locally:
++
++     45 * * * * /bin/echo /usr/lib/uucp/uucico -r1 | /bin/su uucpa
++     40 4,10,15 * * * /usr/bin/uux -r uunet!
++
++   Every hour, at 45 minutes past, this will check if there is any work
++to be done, and, if there is, will call the appropriate system.  Also,
++at 4:40am, 10:40am, and 3:40pm, this will create a poll file file for
++`uunet', forcing the next run of `uucico' to call `uunet'.
++
++\x1f
++File: uucp.info,  Node: Accepting Calls,  Next: Mail and News,  Prev: Calling Other Systems,  Up: Using Taylor UUCP
++
++4.2 Accepting Calls
++===================
++
++To accept calls from another system, you must arrange matters such that
++when that system calls in, it automatically invokes `uucico' on your
++system.
++
++   The most common arrangement is to create a special user name and
++password for incoming UUCP calls.  This user name typically uses the
++same user ID as the regular `uucp' user (Unix permits several user
++names to share the same user ID).  The shell for this user name should
++be set to `uucico'.
++
++   Here is a sample `/etc/passwd' line to accept calls from a remote
++system named airs:
++     Uairs:PASSWORD:4:8:airs UUCP:/usr/spool/uucp:/usr/lib/uucp/uucico
++   The details may vary on your system.  You must use reasonable user
++and group ID's.  You must use the correct file name for `uucico'.  The
++PASSWORD must appear in the UUCP configuration files on the remote
++system, but will otherwise never be seen or typed by a human.
++
++   Note that `uucico' appears as the login shell, and that it will be
++run with no arguments.  This means that it will start in slave mode and
++accept an incoming connection.  *Note Invoking uucico::.
++
++   On some systems, creating an empty file named `.hushlogin' in the
++home directory will skip the printing of various bits of information
++when the remote `uucico' logs in, speeding up the UUCP connection
++process.
++
++   For the greatest security, each system which calls in should use a
++different user name, each with a different password, and the
++`called-login' command should be used in the `sys' file to ensure that
++the correct login name is used.  *Note Accepting a Call::, and see
++*note Security::.
++
++   If you never need to dial out from your system, but only accept
++incoming calls, you can arrange for `uucico' to handle logins itself,
++completely controlling the port, by using the `--endless' option.
++*Note Invoking uucico::.
++
++\x1f
++File: uucp.info,  Node: Mail and News,  Next: The Spool Directory Layout,  Prev: Accepting Calls,  Up: Using Taylor UUCP
++
++4.3 Using UUCP for Mail and News.
++=================================
++
++Taylor UUCP does not include a mail package.  All Unix systems come with
++some sort of mail delivery agent, typically `sendmail' or `MMDF'.
++Source code is available for some alternative mail delivery agents,
++such as `IDA sendmail' and `smail'.
++
++   Taylor UUCP also does not include a news package.  The two major Unix
++news packages are `C-news' and `INN'.  Both are available in source
++code form.
++
++   Configuring and using mail delivery agents is a notoriously complex
++topic, and I will not be discussing it here.  Configuring news systems
++is usually simpler, but I will not be discussing that either.  I will
++merely describe the interactions between the mail and news systems and
++UUCP.
++
++   A mail or news system interacts with UUCP in two ways: sending and
++receiving.
++
++* Menu:
++
++* Sending mail or news::        Sending mail or news via UUCP
++* Receiving mail or news::      Receiving mail or news via UUCP
++
++\x1f
++File: uucp.info,  Node: Sending mail or news,  Next: Receiving mail or news,  Prev: Mail and News,  Up: Mail and News
++
++4.3.1 Sending mail or news via UUCP
++-----------------------------------
++
++When mail is to be sent from your machine to another machine via UUCP,
++the mail delivery agent will invoke `uux'.  It will generally run a
++command such as `uux - SYSTEM!rmail ADDRESS', where SYSTEM is the
++remote system to which the mail is being sent.  It may pass other
++options to `uux', such as `-r' or `-g' (*note Invoking uux::).
++
++   The news system also invokes `uux' in order to transfer articles to
++another system.  The only difference is that news will use `uux' to
++invoke `rnews' on the remote system, rather than `rmail'.
++
++   You should arrange for your mail and news systems to invoke the
++Taylor UUCP version of `uux'.  If you only have Taylor UUCP, or if you
++simply replace any existing version of `uux' with the Taylor UUCP
++version, this will probably happen automatically.  However, if you have
++two UUCP packages installed on your system, you will probably have to
++modify the mail and news configuration files in some way.
++
++   Actually, if both the system UUCP and Taylor UUCP are using the same
++spool directory format, the system `uux' will probably work fine with
++the Taylor `uucico' (the reverse is not the case: the Taylor `uux'
++requires the Taylor `uucico').  However, data transfer will be somewhat
++more efficient if the Taylor `uux' is used.
++
++\x1f
++File: uucp.info,  Node: Receiving mail or news,  Prev: Sending mail or news,  Up: Mail and News
++
++4.3.2 Receiving mail or news via UUCP
++-------------------------------------
++
++To receive mail, all that is necessary is for UUCP to invoke `rmail'.
++Any mail delivery agent will provide an appropriate version of `rmail';
++you must simply make sure that it is in the command path used by UUCP
++(it almost certainly already is).  The default command path is set in
++`policy.h', and it may be overridden for a particular system by the
++`command-path' command (*note Miscellaneous (sys)::).
++
++   Similarly, for news UUCP must be able to invoke `rnews'.  Any news
++system will provide a version of `rnews', and you must ensure that is
++in a directory on the path that UUCP will search.
++
++\x1f
++File: uucp.info,  Node: The Spool Directory Layout,  Next: Spool Directory Cleaning,  Prev: Mail and News,  Up: Using Taylor UUCP
++
++4.4 The Spool Directory Layout
++==============================
++
++In general, the layout of the spool directory may be safely ignored.
++However, it is documented here for the curious.  This description only
++covers the `SPOOLDIR_TAYLOR' layout.  The ways in which the other spool
++directory layouts differ are described in the source file
++`unix/spool.c'.
++
++   Directories and files are only created when they are needed, so a
++typical system will not have all of the entries described here.
++
++* Menu:
++
++* System Spool Directories::    System Spool Directories
++* Status Directory::            Status Spool Directory
++* Execution Subdirectories::    Execution Spool Subdirectories
++* Other Spool Subdirectories::  Other Spool Subdirectories
++* Spool Lock Files::            Spool Directory Lock Files
++
++\x1f
++File: uucp.info,  Node: System Spool Directories,  Next: Status Directory,  Prev: The Spool Directory Layout,  Up: The Spool Directory Layout
++
++4.4.1 System Spool Directories
++------------------------------
++
++`SYSTEM'
++     There is a subdirectory of the main spool directory for each remote
++     system.
++
++`SYSTEM/C.'
++     This directory stores files describing file transfer commands to
++     be sent to the SYSTEM.  Each file name starts with `C.G', where G
++     is the job grade.  Each file contains one or more commands.  For
++     details of the commands, see *note UUCP Protocol Commands::.
++
++`SYSTEM/D.'
++     This directory stores data files.  Files with names like
++     `D.GSSSS', where G is the grade and SSSS is a sequence number, are
++     waiting to be transferred to the SYSTEM, as directed by the files
++     in the `SYSTEM/C.' directory.  Files with other names, typically
++     `D.SYSTEMGSSSS', have been received from SYSTEM and are waiting to
++     be processed by an execution file in the `SYSTEM/X.' directory.
++
++`SYSTEM/D.X'
++     This directory stores data files which will become execution files
++     on the remote system.  In current practice, this directory rarely
++     exists, because most simple executions, including typical uses of
++     `rmail' and `rnews', send an `E' command rather than an execution
++     file (*note The E Command::).
++
++`SYSTEM/X.'
++     This directory stores execution files which have been received from
++     SYSTEM.  This directory normally exists, even though the
++     corresponding `D.X' directory does not, because `uucico' will
++     create an execution file on the fly when it receives an `E'
++     command.
++
++`SYSTEM/SEQF'
++     This file holds the sequence number of the last job sent to
++     SYSTEM.  The sequence number is used to ensure that file names are
++     unique in the remote system spool directory.  The file is four
++     bytes long.  Sequence numbers are composed of digits and the upper
++     case letters.
++
++\x1f
++File: uucp.info,  Node: Status Directory,  Next: Execution Subdirectories,  Prev: System Spool Directories,  Up: The Spool Directory Layout
++
++4.4.2 Status Directory
++----------------------
++
++`.Status'
++     This directory holds status files for each remote system.  The
++     name of the status file is the name of the system which it
++     describes.  Each status file describes the last conversation with
++     the system.  Running `uustat --status' basically just formats and
++     prints the contents of the status files (*note uustat Examples::).
++
++     Each status file has a single text line with six fields.
++
++    code
++          A code indicating the status of the last conversation.  The
++          following values are defined, though not all are actually
++          used.
++         `0'
++               Conversation completed normally.
++
++         `1'
++               `uucico' was unable to open the port.
++
++         `2'
++               The last call to the system failed while dailing.
++
++         `3'
++               The last call to the system failed while logging in.
++
++         `4'
++               The last call to the system failed during the initial
++               UUCP protocol handshake (*note The Initial Handshake::).
++
++         `5'
++               The last call to the system failed after the initial
++               handshake.
++
++         `6'
++               `uucico' is currently talking to the system.
++
++         `7'
++               The last call to the system failed because it was the
++               wrong time to call (this is not used if calling the
++               system is never permitted).
++
++    retries
++          The number of retries since the last successful call.
++
++    time of last call
++          The time of the last call, in seconds since the epoch (as
++          returned by the `time' system call).
++
++    wait
++          If the last call failed, this is the number of seconds since
++          the last call before `uucico' may attempt another call.  This
++          is set based on the retry time; see *note When to Call::.
++          The `-f' or `-S' options to `uucico' direct it to ignore this
++          wait time; see *note Invoking uucico::.
++
++    description
++          A text description of the status, corresponding to the code
++          in the first field.  This may contain spaces.
++
++    system name
++          The name of the remote system.
++
++\x1f
++File: uucp.info,  Node: Execution Subdirectories,  Next: Other Spool Subdirectories,  Prev: Status Directory,  Up: The Spool Directory Layout
++
++4.4.3 Execution Subdirectories
++------------------------------
++
++`.Xqtdir'
++     When `uuxqt' executes a job requested by `uux', it first changes
++     the working directory to the `.Xqtdir' subdirectory.  This permits
++     the job to create any sort of temporary file without worrying
++     about overwriting other files in the spool directory.  Any files
++     left in the `.Xqtdir' subdirectory are removed after each
++     execution is complete.
++
++`.XqtdirNNNN'
++     When several instances of `uuxqt' are executing simultaneously,
++     each one executes jobs in a separate directory.  The first uses
++     `.Xqtdir', the second uses `.Xqtdir0001', the third uses
++     `.Xqtdir0002', and so forth.
++
++`.Corrupt'
++     If `uuxqt' encounters an execution file which it is unable to
++     parse, it saves it in the `.Corrupt' directory, and sends mail
++     about it to the UUCP administrator.
++
++`.Failed'
++     If `uuxqt' executes a job, and the job fails, and there is enough
++     disk space to hold the command file and all the data files, then
++     `uuxqt' saves the files in the `.Failed' directory, and sends mail
++     about it to the UUCP administrator.
++
++\x1f
++File: uucp.info,  Node: Other Spool Subdirectories,  Next: Spool Lock Files,  Prev: Execution Subdirectories,  Up: The Spool Directory Layout
++
++4.4.4 Other Spool Subdirectories
++--------------------------------
++
++`.Sequence'
++     This directory holds conversation sequence number files.  These
++     are used if the `sequence' command is used for a system (*note
++     Miscellaneous (sys)::).  The sequence number for the system SYSTEM
++     is stored in the file `.Sequence/SYSTEM'.  It is simply stored as
++     a printable number.
++
++`.Temp'
++     This directory holds data files as they are being received from a
++     remote system, before they are moved to their final destination.
++     For file send requests which use a valid temporary file name in
++     the TEMP field of the `S' or `E' command (*note The S Command::),
++     `uucico' receives the file into `.Temp/SYSTEM/TEMP', where SYSTEM
++     is the name of the remote system, and TEMP is the temporary file
++     name.  If a conversation fails during a file transfer, these files
++     are used to automatically restart the file transfer from the point
++     of failure.
++
++     If the `S' or `E' command does not include a temporary file name,
++     automatic restart is not possible.  In this case, the files are
++     received into a randomly named file in the `.Temp' directory
++     itself.
++
++`.Preserve'
++     This directory holds data files which could not be transferred to a
++     remote system for some reason (for example, the data file might be
++     large, and exceed size restrictions imposed by the remote system).
++     When a locally requested file transfer fails, `uucico' will store
++     the data file in the `.Preserve' directory, and send mail to the
++     requestor describing the failure and naming the saved file.
++
++`.Received'
++     This directory records which files have been received.  If a
++     conversation fails just after `uucico' acknowledges receipt of a
++     file, it is possible for the acknowledgement to be lost.  If this
++     happens, the remote system will resend the file.  If the file were
++     an execution request, and `uucico' did not keep track of which
++     files it had already received, this could lead to the execution
++     being performed twice.
++
++     To avoid this problem, when a conversation fails, `uucico' records
++     each file that has been received, but for which the remote system
++     may not have received the acknowledgement.  It records this
++     information by creating an empty file with the name
++     `.Received/SYSTEM/TEMP', where SYSTEM is the name of the remote
++     system, and TEMP is the TEMP field of the `S' or `E' command from
++     the remote system (*note The S Command::).  Then, if the remote
++     system offers the file again in the next conversation, `uucico'
++     refuses the send request and deletes the record in the `.Received'
++     directory.  This approach only works for file sends which use a
++     temporary file name, but this is true of all execution requests.
++
++\x1f
++File: uucp.info,  Node: Spool Lock Files,  Prev: Other Spool Subdirectories,  Up: The Spool Directory Layout
++
++4.4.5 Lock Files in the Spool Directory
++---------------------------------------
++
++Lock files for devices and systems are stored in the lock directory,
++which may or may not be the same as the spool directory.  The lock
++directory is set at compilation time by `LOCKDIR' in `policy.h', which
++may be overridden by the `lockdir' command in the `config' file (*note
++Miscellaneous (config)::).
++
++   For a description of the names used for device lock files, and the
++format of the contents of a lock file, see *note UUCP Lock Files::.
++
++`LCK..SYS'
++     A lock file for a system, where SYS is the system name.  As noted
++     above, these lock files are kept in the lock directory, which may
++     not be the spool directory.  These lock files are created by
++     `uucico' while talking to a remote system, and are used to prevent
++     multiple simultaneous conversations with a system.
++
++     On systems which limit file names to 14 characters, only the first
++     eight characters of the system name are used in the lock file
++     name.  This requires that the names of each directly connected
++     remote system be unique in the first eight characters.
++
++`LCK.XQT.NN'
++     When `uuxqt' starts up, it uses lock files to determine how many
++     other `uuxqt' daemons are currently running.  It first tries to
++     lock `LCK.XQT.0', then `LCK.XQT.1', and so forth.  This is used to
++     implement the `max-uuxqts' command (*note Miscellaneous
++     (config)::).  It is also used to parcel out the `.Xqtdir'
++     subdirectories (*note Execution Subdirectories::).
++
++`LXQ.CMD'
++     When `uuxqt' is invoked with the `-c' or `--command' option (*note
++     Invoking uuxqt::), it creates a lock file named after the command
++     it is executing.  For example, `uuxqt -c rmail' will create the
++     lock file `LXQ.rmail'.  This prevents other `uuxqt' daemons from
++     executing jobs of the specified type.
++
++`SYSTEM/X./L.XXX'
++     While `uuxqt' is executing a particular job, it creates a lock file
++     with the same name as the `X.' file describing the job, but
++     replacing the initial `X' with `L'.  This ensures that if multiple
++     `uuxqt' daemons are running, they do not simultaneously execute
++     the same job.
++
++`LCK..SEQ'
++     This lock file is used to control access to the sequence files for
++     each system (*note System Spool Directories::).  It is only used
++     on systems which do not support POSIX file locking using the
++     `fcntl' system call.
++
++\x1f
++File: uucp.info,  Node: Spool Directory Cleaning,  Prev: The Spool Directory Layout,  Up: Using Taylor UUCP
++
++4.5 Cleaning the Spool Directory
++================================
++
++The spool directory may need to be cleaned up periodically.  Under some
++circumstances, files may accumulate in various subdirectories, such as
++`.Preserve' (*note Other Spool Subdirectories::) or `.Corrupt' (*note
++Execution Subdirectories::).
++
++   Also, if a remote system stops calling in, you may want to arrange
++for any queued up mail to be returned to the sender.  This can be done
++using the `uustat' command (*note Invoking uustat::).
++
++   The `contrib' directory includes a simple `uuclean' script which may
++be used as an example of a clean up script.  It can be run daily out of
++`crontab'.
++
++   You should periodically trim the UUCP log files, as they will
++otherwise grow without limit.  The names of the log files are set in
++`policy.h', and may be overridden in the configuration file (*note
++config File::).  By default they are are `/usr/spool/uucp/Log' and
++`/usr/spool/uucp/Stats'.  You may find the `savelog' program in the
++`contrib' directory to be of use.  There is a manual page for it in
++`contrib' as well.
++
++\x1f
++File: uucp.info,  Node: Configuration Files,  Next: Protocols,  Prev: Using Taylor UUCP,  Up: Top
++
++5 Taylor UUCP Configuration Files
++*********************************
++
++This chapter describes the configuration files accepted by the Taylor
++UUCP package if compiled with `HAVE_TAYLOR_CONFIG' set to 1 in
++`policy.h'.
++
++   The configuration files are normally found in the directory
++NEWCONFIGDIR, which is defined by the `configure' option
++`--with-newconfigdir'; by default NEWCONFIGDIR is
++`/usr/local/conf/uucp'.  However, the main configuration file,
++`config', is the only one which must be in that directory, since it may
++specify a different location for any or all of the other files.  You
++may run any of the UUCP programs with a different main configuration
++file by using the `-I' or `--config' option; this can be useful when
++testing a new configuration.  When you use the `-I' option the programs
++will revoke any setuid privileges.
++
++* Menu:
++
++* Configuration Overview::      Configuration File Overview
++* Configuration File Format::   Configuration File Format
++* Configuration Examples::      Examples of Configuration Files
++* Time Strings::                How to Write Time Strings
++* Chat Scripts::                How to Write Chat Scripts
++* config File::                 The Main Configuration File
++* sys File::                    The System Configuration File
++* port File::                   The Port Configuration Files
++* dial File::                   The Dialer Configuration Files
++* UUCP Over TCP::               UUCP Over TCP
++* Security::                    Security Issues
++
++\x1f
++File: uucp.info,  Node: Configuration Overview,  Next: Configuration File Format,  Prev: Configuration Files,  Up: Configuration Files
++
++5.1 Configuration File Overview
++===============================
++
++UUCP uses several different types of configuration files, each
++describing a different kind of information.  The commands permitted in
++each file are described in detail below.  This section is a brief
++description of some of the different types of files.
++
++   The `config' file is the main configuration file.  It describes
++general information not associated with a particular remote system, such
++as the location of various log files.  There are reasonable defaults for
++everything that may be specified in the `config' file, so you may not
++actually need one on your system.
++
++   There may be only one `config' file, but there may be one or more of
++each other type of file.  The default is one file for each type, but
++more may be listed in the `config' file.
++
++   The `sys' files are used to describe remote systems.  Each remote
++system to which you connect must be listed in a `sys' file.  A `sys'
++file will include information for a system, such as the speed (baud
++rate) to use, or when to place calls.
++
++   For each system you wish to call, you must describe one or more
++ports; these ports may be defined directly in the `sys' file, or they
++may be defined in a `port' file.
++
++   The `port' files are used to describe ports.  A port is a particular
++hardware connection on your computer.  You would normally define as
++many ports as there are modems attached to your computer.  A TCP
++connection is also described using a port.
++
++   The `dial' files are used to describe dialers.  Dialer is
++essentially another word for modem.  The `dial' file describes the
++commands UUCP should use to dial out on a particular type of modem.  You
++would normally define as many dialers as there are types of modems
++attached to your computer.  For example, if you have three Telebit
++modems used for UUCP, you would probably define three ports and one
++dialer.
++
++   There are other types of configuration files, but these are the
++important ones.  The other types are described below.
++
++\x1f
++File: uucp.info,  Node: Configuration File Format,  Next: Configuration Examples,  Prev: Configuration Overview,  Up: Configuration Files
++
++5.2 Configuration File Format
++=============================
++
++All the configuration files follow a simple line-oriented `KEYWORD
++VALUE' format.  Empty lines are ignored, as are leading spaces; unlike
++HDB, lines with leading spaces are read.  The first word on each line
++is a keyword.  The rest of the line is interpreted according to the
++keyword.  Most keywords are followed by numbers, boolean values or
++simple strings with no embedded spaces.
++
++   The `#' character is used for comments.  Everything from a `#' to
++the end of the line is ignored unless the `#' is preceded by a `\'
++(backslash); if the `#' is preceeded by a `\', the `\' is removed but
++the `#' remains in the line.  This can be useful for a phone number
++containing a `#'.  To enter the sequence `\#', use `\\#'.
++
++   The backslash character may be used to continue lines.  If the last
++character in a line is a backslash, the backslash is removed and the
++line is continued by the next line.  The second line is attached to the
++first with no intervening characters; if you want any whitespace between
++the end of the first line and the start of the second line, you must
++insert it yourself.
++
++   However, the backslash is not a general quoting character.  For
++example, you cannot use it to get an embedded space in a string
++argument.
++
++   Everything after the keyword must be on the same line.  A BOOLEAN
++may be specified as `y', `Y', `t', or `T' for true and `n', `N', `f',
++or `F' for false; any trailing characters are ignored, so `true',
++`false', etc., are also acceptable.
++
++\x1f
++File: uucp.info,  Node: Configuration Examples,  Next: Time Strings,  Prev: Configuration File Format,  Up: Configuration Files
++
++5.3 Examples of Configuration Files
++===================================
++
++This section provides few typical examples of configuration files.
++There are also sample configuration files in the `sample' subdirectory
++of the distribution.
++
++* Menu:
++
++* config File Examples::        Examples of the Main Configuration File
++* Leaf Example::                Call a Single Remote Site
++* Gateway Example::             The Gateway for Several Local Systems
++
++\x1f
++File: uucp.info,  Node: config File Examples,  Next: Leaf Example,  Prev: Configuration Examples,  Up: Configuration Examples
++
++5.3.1 config File Examples
++--------------------------
++
++To start with, here are some examples of uses of the main configuration
++file, `config'.  For a complete description of the commands that are
++permitted in `config', see *note config File::.
++
++   In many cases you will not need to create a `config' file at all.
++The most common reason to create one is to give your machine a special
++UUCP name.  Other reasons might be to change the UUCP spool directory,
++or to permit any remote system to call in.
++
++   If you have an internal network of machines, then it is likely that
++the internal name of your UUCP machine is not the name you want to use
++when calling other systems.  For example, here at `airs.com' our
++mail/news gateway machine is named `elmer.airs.com' (it is one of
++several machines all named `LOCALNAME.airs.com').  If we did not
++provide a `config' file, then our UUCP name would be `elmer'; however,
++we actually want it to be `airs'.  Therefore, we use the following line
++in `config':
++
++     nodename airs
++
++   The UUCP spool directory name is set in `policy.h' when the code is
++compiled.  You might at some point decide that it is appropriate to move
++the spool directory, perhaps to put it on a different disk partition.
++You would use the following commands in `config' to change to
++directories on the partition `/uucp':
++
++     spool /uucp/spool
++     pubdir /uucp/uucppublic
++     logfile /uucp/spool/Log
++     debugfile /uucp/spool/Debug
++
++   You would then move the contents of the current spool directory to
++`/uucp/spool'.  If you do this, make sure that no UUCP processes are
++running while you change `config' and move the spool directory.
++
++   Suppose you wanted to permit any system to call in to your system and
++request files.  This is generally known as "anonymous UUCP", since the
++systems which call in are effectively anonymous.  By default, unknown
++systems are not permitted to call in.  To permit this you must use the
++`unknown' command in `config'.  The `unknown' command is followed by
++any command that may appear in the system file; for full details, see
++*note sys File::.
++
++   I will show two possible anonymous UUCP configurations.  The first
++will let any system call in and download files, but will not permit
++them to upload files to your system.
++
++     # No files may be transferred to this system
++     unknown receive-request no
++     # The public directory is /usr/spool/anonymous
++     unknown pubdir /usr/spool/anonymous
++     # Only files in the public directory may be sent (the default anyhow)
++     unknown remote-send ~
++
++Setting the public directory is convenient for the systems which call
++in.  It permits to request a file by prefixing it with `~/'.  For
++example, assuming your system is known as `server', then to retrieve
++the file `/usr/spool/anonymous/INDEX' a user on a remote site could
++just enter `uucp server!~/INDEX ~'; this would transfer `INDEX' from
++`server''s public directory to the user's local public directory.  Note
++that when using `csh' or `bash' the `!' and the second `~' must be
++quoted.
++
++   The next example will permit remote systems to upload files to a
++special directory named `/usr/spool/anonymous/upload'.  Permitting a
++remote system to upload files permits it to send work requests as well;
++this example is careful to prohibit commands from unknown systems.
++
++     # No commands may be executed (the list of permitted commands is empty)
++     unknown commands
++     # The public directory is /usr/spool/anonymous
++     unknown pubdir /usr/spool/anonymous
++     # Only files in the public directory may be sent; users may not download
++     # files from the upload directory
++     unknown remote-send ~ !~/upload
++     # May only upload files into /usr/spool/anonymous/upload
++     unknown remote-receive ~/upload
++
++\x1f
++File: uucp.info,  Node: Leaf Example,  Next: Gateway Example,  Prev: config File Examples,  Up: Configuration Examples
++
++5.3.2 Leaf Example
++------------------
++
++A relatively common simple case is a "leaf site", a system which only
++calls or is called by a single remote site.  Here is a typical `sys'
++file that might be used in such a case.  For full details on what
++commands can appear in the `sys' file, see *note sys File::.
++
++   This is the `sys' file that is used at `airs.com'.  We use a single
++modem to dial out to `uunet'.  This example shows how you can specify
++the port and dialer information directly in the `sys' file for simple
++cases.  It also shows the use of the following:
++
++`call-login'
++     Using `call-login' and `call-password' allows the default login
++     chat script to be used.  In this case, the login name is specified
++     in the call-out login file (*note Configuration File Names::).
++
++`call-timegrade'
++     `uunet' is requested to not send us news during the daytime.
++
++`chat-fail'
++     If the modem returns `BUSY' or `NO CARRIER' the call is
++     immediately aborted.
++
++`protocol-parameter'
++     Since `uunet' tends to be slow, the default timeout has been
++     increased.
++
++
++   This `sys' file relies on certain defaults.  It will allow `uunet'
++to queue up `rmail' and `rnews' commands.  It will allow users to
++request files from `uunet' into the UUCP public directory.  It will
++also allow `uunet' to request files from the UUCP public directory; in
++fact `uunet' never requests files, but for additional security we could
++add the line `request false'.
++
++     # The following information is for uunet
++     system uunet
++
++     # The login name and password are kept in the callout password file
++     call-login *
++     call-password *
++
++     # We can send anything at any time.
++     time any
++
++     # During the day we only accept grade `Z' or above; at other times
++     # (not mentioned here) we accept all grades.  uunet queues up news
++     # at grade `d', which is lower than `Z'.
++     call-timegrade Z Wk0755-2305,Su1655-2305
++
++     # The phone number.
++     phone 7389449
++
++     # uunet tends to be slow, so we increase the timeout
++     chat-timeout 120
++
++     # We are using a preconfigured Telebit 2500.
++     port type modem
++     port device /dev/ttyd0
++     port speed 19200
++     port carrier true
++     port dialer chat "" ATZ\r\d\c OK ATDT\D CONNECT
++     port dialer chat-fail BUSY
++     port dialer chat-fail NO\sCARRIER
++     port dialer complete \d\d+++\d\dATH\r\c
++     port dialer abort \d\d+++\d\dATH\r\c
++
++     # Increase the timeout and the number of retries.
++     protocol-parameter g timeout 20
++     protocol-parameter g retries 10
++
++\x1f
++File: uucp.info,  Node: Gateway Example,  Prev: Leaf Example,  Up: Configuration Examples
++
++5.3.3 Gateway Example
++---------------------
++
++Many organizations have several local machines which are connected by
++UUCP, and a single machine which connects to the outside world.  This
++single machine is often referred to as a "gateway" machine.
++
++   For this example I will assume a fairly simple case.  It should still
++provide a good general example.  There are three machines, `elmer',
++`comton' and `bugs'.  `elmer' is the gateway machine for which I will
++show the configuration file.  `elmer' calls out to `uupsi'.  As an
++additional complication, `uupsi' knows `elmer' as `airs'; this will
++show how a machine can have one name on an internal network but a
++different name to the external world.  `elmer' has two modems.  It also
++has an TCP connection to `uupsi', but since that is supposed to be
++reserved for interactive work (it is, perhaps, only a 9600 baud SLIP
++line) it will only use it if the modems are not available.
++
++   A network this small would normally use a single `sys' file.
++However, for pedagogical purposes I will show two separate `sys' files,
++one for the local systems and one for `uupsi'.  This is done with the
++`sysfile' command in the `config' file.  Here is the `config' file.
++
++     # This is config
++     # The local sys file
++     sysfile /usr/local/lib/uucp/sys.local
++     # The remote sys file
++     sysfile /usr/local/lib/uucp/sys.remote
++
++   Using the defaults feature of the `sys' file can greatly simplify
++the listing of local systems.  Here is `sys.local'.  Note that this
++assumes that the local systems are trusted; they are permited to request
++any world readable file and to write files into any world writable
++directory.
++
++     # This is sys.local
++     # Get the login name and password to use from the call-out file
++     call-login *
++     call-password *
++
++     # The systems must use a particular login
++     called-login Ulocal
++
++     # Permit sending any world readable file
++     local-send /
++     remote-send /
++
++     # Permit receiving into any world writable directory
++     local-receive /
++     remote-receive /
++
++     # Call at any time
++     time any
++
++     # Use port1, then port2
++     port port1
++
++     alternate
++
++     port port2
++
++     # Now define the systems themselves.  Because of all the defaults we
++     # used, there is very little to specify for the systems themselves.
++
++     system comton
++     phone 5551212
++
++     system bugs
++     phone 5552424
++
++   The `sys.remote' file describes the `uupsi' connection.  The
++`myname' command is used to change the UUCP name to `airs' when talking
++to `uupsi'.
++
++     # This is sys.remote
++     # Define uupsi
++     system uupsi
++
++     # The login name and password are in the call-out file
++     call-login *
++     call-password *
++
++     # We can call out at any time
++     time any
++
++     # uupsi uses a special login name
++     called-login Uuupsi
++
++     # uuspi thinks of us as `airs'
++     myname airs
++
++     # The phone number
++     phone 5554848
++
++     # We use port2 first, then port1, then TCP
++
++     port port2
++
++     alternate
++
++     port port1
++
++     alternate
++
++     # We don't bother to make a special entry in the port file for TCP, we
++     # just describe the entire port right here.  We use a special chat
++     # script over TCP because the usual one confuses some TCP servers.
++     port type TCP
++     address uu.psi.com
++     chat ogin: \L word: \P
++
++   The ports are defined in the file `port' (*note port File::).  For
++this example they are both connected to the same type of 2400 baud
++Hayes-compatible modem.
++
++     # This is port
++
++     port port1
++     type modem
++     device /dev/ttyd0
++     dialer hayes
++     speed 2400
++
++     port port2
++     type modem
++     device /dev/ttyd1
++     dialer hayes
++     speed 2400
++
++   Dialers are described in the `dial' file (*note dial File::).
++
++     # This is dial
++
++     dialer hayes
++
++     # The chat script used to dial the phone.  \D is the phone number.
++     chat "" ATZ\r\d\c OK ATDT\D CONNECT
++
++     # If we get BUSY or NO CARRIER we abort the dial immediately
++     chat-fail BUSY
++     chat-fail NO\sCARRIER
++
++     # When the call is over we make sure we hangup the modem.
++     complete \d\d+++\d\dATH\r\c
++     abort \d\d+++\d\dATH\r\c
++
++\x1f
++File: uucp.info,  Node: Time Strings,  Next: Chat Scripts,  Prev: Configuration Examples,  Up: Configuration Files
++
++5.4 Time Strings
++================
++
++Several commands use time strings to specify a range of times.  This
++section describes how to write time strings.
++
++   A time string may be a list of simple time strings separated with a
++vertical bar `|' or a comma `,'.
++
++   Each simple time string must begin with `Su', `Mo', `Tu', `We',
++`Th', `Fr', or `Sa', or `Wk' for any weekday, or `Any' for any day.
++
++   Following the day may be a range of hours separated with a hyphen
++using 24 hour time.  The range of hours may cross 0; for example
++`2300-0700' means any time except 7 AM to 11 PM.  If no time is given,
++calls may be made at any time on the specified day(s).
++
++   The time string may also be the single word `Never', which does not
++match any time.  The time string may also be a single word with a name
++defined in a previous `timetable' command (*note Miscellaneous
++(config)::).
++
++   Here are a few sample time strings with an explanation of what they
++mean.
++
++`Wk2305-0855,Sa,Su2305-1655'
++     This means weekdays before 8:55 AM or after 11:05 PM, any time
++     Saturday, or Sunday before 4:55 PM or after 11:05 PM.  These are
++     approximately the times during which night rates apply to phone
++     calls in the U.S.A.  Note that this time string uses, for example,
++     `2305' rather than `2300'; this will ensure a cheap rate phone
++     call even if the computer clock is running up to five minutes
++     ahead of the real time.
++
++`Wk0905-2255,Su1705-2255'
++     This means weekdays from 9:05 AM to 10:55 PM, or Sunday from 5:05
++     PM to 10:55 PM.  This is approximately the opposite of the
++     previous example.
++
++`Any'
++     This means any day.  Since no time is specified, it means any time
++     on any day.
++
++
++\x1f
++File: uucp.info,  Node: Chat Scripts,  Next: config File,  Prev: Time Strings,  Up: Configuration Files
++
++5.5 Chat Scripts
++================
++
++Chat scripts are used in several different places, such as dialing out
++on modems or logging in to remote systems.  Chat scripts are made up of
++pairs of strings.  The program waits until it sees the first string,
++known as the "expect" string, and then sends out the second string, the
++"send" string.
++
++   Each chat script is defined using a set of commands.  These commands
++always end in a string beginning with `chat', but may start with
++different strings.  For example, in the `sys' file there is one set of
++commands beginning with `chat' and another set beginning with
++`called-chat'.  The prefixes are only used to disambiguate different
++types of chat scripts, and this section ignores the prefixes when
++describing the commands.
++
++`chat STRINGS'
++     Specify a chat script.  The arguments to the `chat' command are
++     pairs of strings separated by whitespace.  The first string of
++     each pair is an expect string, the second is a send string.  The
++     program will wait for the expect string to appear; when it does,
++     the program will send the send string.  If the expect string does
++     not appear within a certain number of seconds (as set by the
++     `chat-timeout' command), the chat script fails and, typically, the
++     call is aborted.  If the final expect string is seen (and the
++     optional final send string has been sent), the chat script is
++     successful.
++
++     An expect string may contain additional subsend and subexpect
++     strings, separated by hyphens.  If the expect string is not seen,
++     the subsend string is sent and the chat script continues by
++     waiting for the subexpect string.  This means that a hyphen may
++     not appear in an expect string; on an ASCII system, use `\055'
++     instead.
++
++     An expect string may simply be `""', meaning to skip the expect
++     phase.  Otherwise, the following escape characters may appear in
++     expect strings:
++
++    `\b'
++          a backspace character
++
++    `\n'
++          a newline or line feed character
++
++    `\N'
++          a null character (for HDB compatibility)
++
++    `\r'
++          a carriage return character
++
++    `\s'
++          a space character
++
++    `\t'
++          a tab character
++
++    `\\'
++          a backslash character
++
++    `\DDD'
++          character DDD, where DDD are up to three octal digits
++
++    `\xDDD'
++          character DDD, where DDD are hexadecimal digits.
++
++     As in C, there may be up to three octal digits following a
++     backslash, but the hexadecimal escape sequence continues as far as
++     possible.  To follow a hexadecimal escape sequence with a hex
++     digit, interpose a send string of `""'.
++
++     A chat script expect string may also specify a timeout.  This is
++     done by using the escape sequence `\WSECONDS'.  This escape
++     sequence may only appear at the very end of the expect string.  It
++     temporarily overrides the timeout set by `chat-timeout' (described
++     below) only for the expect string to which it is attached.
++
++     A send string may simply be `""' to skip the send phase.
++     Otherwise, all of the escape characters legal for expect strings
++     may be used, and the following escape characters are also
++     permitted:
++
++    `EOT'
++          send an end of transmission character (`^D')
++
++    `BREAK'
++          send a break character (may not work on all systems)
++
++    `\c'
++          suppress trailing carriage return at end of send string
++
++    `\d'
++          delay sending for 1 or 2 seconds
++
++    `\e'
++          disable echo checking
++
++    `\E'
++          enable echo checking
++
++    `\K'
++          same as `BREAK'
++
++    `\p'
++          pause sending for a fraction of a second
++
++    `\M'
++          do not require carrier signal
++
++    `\m'
++          require carrier signal (fail if not present)
++
++     Some specific types of chat scripts also define additional escape
++     sequences that may appear in the send string.  For example, the
++     login chat script defines `\L' and `\P' to send the login name and
++     password, respectively.
++
++     A carriage return will be sent at the end of each send string,
++     unless the `\c' escape sequence appears in the string.  Note that
++     some UUCP packages use `\b' for break, but here it means backspace.
++
++     Echo checking means that after writing each character the program
++     will wait until the character is echoed.  Echo checking must be
++     turned on separately for each send string for which it is desired;
++     it will be turned on for characters following `\E' and turned off
++     for characters following `\e'.
++
++     When used with a port which does not support the carrier signal,
++     as set by the `carrier' command in the port file, `\M' and `\m'
++     are ignored.  Similarly, when used in a dialer chat script with a
++     dialer which does not support the carrier signal, as set by the
++     `carrier' command in the dial file, `\M' and `\m' are ignored.
++
++`chat-timeout NUMBER'
++     The number of seconds to wait for an expect string in the chat
++     script, before timing out and sending the next subsend, or failing
++     the chat script entirely.  The default value is 10 for a login
++     chat or 60 for any other type of chat.
++
++`chat-fail STRING'
++     If the STRING is seen at any time during a chat script, the chat
++     script is aborted.  The string may not contain any whitespace
++     characters: escape sequences must be used for them.  Multiple
++     `chat-fail' commands may appear in a single chat script.  The
++     default is to have none.
++
++     This permits a chat script to be quickly aborted if an error
++     string is seen.  For example, a script used to dial out on a modem
++     might use the command `chat-fail BUSY' to stop the chat script
++     immediately if the string `BUSY' was seen.
++
++     The `chat-fail' strings are considered in the order they are
++     listed, so if one string is a suffix of another the longer one
++     should be listed first.  This affects the error message which will
++     be logged.  Of course, if one string is contained within another,
++     but is not a suffix, the smaller string will always be found
++     before the larger string could match.
++
++`chat-seven-bit BOOLEAN'
++     If the argument is true, all incoming characters are stripped to
++     seven bits when being compared to the expect string.  Otherwise
++     all eight bits are used in the comparison.  The default is true,
++     because some Unix systems generate parity bits during the login
++     prompt which must be ignored while running a chat script.  This
++     has no effect on any `chat-program', which must ignore parity by
++     itself if necessary.
++
++`chat-program STRINGS'
++     Specify a program to run before executing the chat script.  This
++     program could run its own version of a chat script, or it could do
++     whatever it wants.  If both `chat-program' and `chat' are
++     specified, the program is executed first followed by the chat
++     script.
++
++     The first argument to the `chat-program' command is the program
++     name to run.  The remaining arguments are passed to the program.
++     The following escape sequences are recognized in the arguments:
++
++    `\Y'
++          port device name
++
++    `\S'
++          port speed
++
++    `\\'
++          backslash
++
++     Some specific uses of `chat-program' define additional escape
++     sequences.
++
++     Arguments other than escape sequences are passed exactly as they
++     appear in the configuration file, except that sequences of
++     whitespace are compressed to a single space character (this
++     exception may be removed in the future).
++
++     If the `chat-program' command is not used, no program is run.
++
++     On Unix, the standard input and standard output of the program
++     will be attached to the port in use.  Anything the program writes
++     to standard error will be written to the UUCP log file.  No other
++     file descriptors will be open.  If the program does not exit with
++     a status of 0, it will be assumed to have failed.  This means that
++     the dialing programs used by some versions of HDB may not be used
++     directly, but you may be able to run them via the `dialHDB'
++     program in the `contrib' directory.
++
++     The program will be run as the `uucp' user, and the environment
++     will be that of the process that started `uucico', so care must be
++     taken to maintain security.
++
++     No search path is used to find the program; a full file name must
++     be given.  If the program is an executable shell script, it will
++     be passed to `/bin/sh' even on systems which are unable to execute
++     shell scripts.
++
++
++   Here is a simple example of a chat script that might be used to
++reset a Hayes compatible modem.
++
++     chat "" ATZ OK-ATZ-OK
++
++   The first expect string is `""', so it is ignored.  The chat script
++then sends `ATZ'.  If the modem responds with `OK', the chat script
++finishes.  If 60 seconds (the default timeout) pass before seeing `OK',
++the chat script sends another `ATZ'.  If it then sees `OK', the chat
++script succeeds.  Otherwise, the chat script fails.
++
++   For a more complex chat script example, see *note Logging In::.
++
++\x1f
++File: uucp.info,  Node: config File,  Next: sys File,  Prev: Chat Scripts,  Up: Configuration Files
++
++5.6 The Main Configuration File
++===============================
++
++The main configuration file is named `config'.
++
++   Since all the values that may be specified in the main configuration
++file also have defaults, there need not be a main configuration file at
++all.
++
++   Each command in `config' may have a program prefix, which is a
++separate word appearing at the beginning of the line.  The currently
++supported prefixes are `uucp' and `cu'.  Any command prefixed by `uucp'
++will not be read by the `cu' program.  Any command prefixed by `cu'
++will only be read by the `cu' program.  For example, to use a list of
++systems known only to `cu', list them in a separate file `FILE' and put
++`cu sysfile `FILE'' in `config'.
++
++* Menu:
++
++* Miscellaneous (config)::      Miscellaneous config File Commands
++* Configuration File Names::    Using Different Configuration Files
++* Log File Names::              Using Different Log Files
++* Debugging Levels::            Debugging Levels
++
++\x1f
++File: uucp.info,  Node: Miscellaneous (config),  Next: Configuration File Names,  Prev: config File,  Up: config File
++
++5.6.1 Miscellaneous config File Commands
++----------------------------------------
++
++`nodename STRING'
++`hostname STRING'
++`uuname STRING'
++     These keywords are equivalent.  They specify the UUCP name of the
++     local host.  If there is no configuration file, an appropriate
++     system function will be used to get the host name, if possible.
++
++`spool STRING'
++     Specify the spool directory.  The default is from `policy.h'.  This
++     is where UUCP files are queued.  Status files and various sorts of
++     temporary files are also stored in this directory and
++     subdirectories of it.
++
++`pubdir STRING'
++     Specify the public directory.  The default is from `policy.h'.
++     When a file is named using a leading `~/', it is taken from or to
++     the public directory.  Each system may use a separate public
++     directory by using the `pubdir' command in the system
++     configuration file; see *note Miscellaneous (sys)::.
++
++`lockdir STRING'
++     Specify the directory to place lock files in.  The default is from
++     `policy.h'; see the information in that file.  Normally the lock
++     directory should be set correctly in `policy.h', and not changed
++     here.  However, changing the lock directory is sometimes useful for
++     testing purposes.  This only affects lock files for devices and
++     systems; it does not affect certain internal lock files which are
++     stored in the spool directory (*note Spool Lock Files::).
++
++`unknown STRING ...'
++     The STRING and subsequent arguments are treated as though they
++     appeared in the system file (*note sys File::).  They are used to
++     apply to any unknown systems that may call in, probably to set
++     file transfer permissions and the like.  If the `unknown' command
++     is not used, unknown systems are not permitted to call in.
++
++`strip-login BOOLEAN'
++     If the argument is true, then, when `uucico' is doing its own
++     login prompting with the `-e', `-l', or `-w' switches, it will
++     strip the parity bit when it reads the login name and password.
++     Otherwise all eight bits will be used when checking the strings
++     against the UUCP password file.  The default is true, since some
++     other UUCP packages send parity bits with the login name and
++     password, and few systems use eight bit characters in the password
++     file.
++
++`strip-proto BOOLEAN'
++     If the argument is true, then `uucico' will strip the parity bit
++     from incoming UUCP protocol commands.  Otherwise all eight bits
++     will be used.  This only applies to commands which are not
++     encapsulated in a link layer protocol.  The default is true, which
++     should always be correct unless your UUCP system names use eight
++     bit characters.
++
++`max-uuxqts NUMBER'
++     Specify the maximum number of `uuxqt' processes which may run at
++     the same time.  Having several `uuxqt' processes running at once
++     can significantly slow down a system, but, since `uuxqt' is
++     automatically started by `uucico', it can happen quite easily.  The
++     default for `max-uuxqts' is 0, which means that there is no limit.
++     If HDB configuration files are being read and the code was compiled
++     without `HAVE_TAYLOR_CONFIG', then, if the file `Maxuuxqts' in the
++     configuration directory contains a readable number, it will be used
++     as the value for `max-uuxqts'.
++
++`run-uuxqt STRING or NUMBER'
++     Specify when `uuxqt' should be run by `uucico'.  This may be a
++     positive number, in which case `uucico' will start a `uuxqt'
++     process whenever it receives the given number of execution files
++     from the remote system, and, if necessary, at the end of the call.
++     The argument may also be one of the strings `once', `percall', or
++     `never'.  The string `once' means that `uucico' will start `uuxqt'
++     once at the end of execution.  The string `percall' means that
++     `uucico' will start `uuxqt' once per call that it makes (this is
++     only different from `once' when `uucico' is invoked in a way that
++     causes it to make multiple calls, such as when the `-r1' option is
++     used without the `-s' option).  The string `never' means that
++     `uucico' will never start `uuxqt', in which case `uuxqt' should be
++     periodically run via some other mechanism.  The default depends
++     upon which type of configuration files are being used; if
++     `HAVE_TAYLOR_CONFIG' is used the default is `once', otherwise if
++     `HAVE_HDB_CONFIG' is used the default is `percall', and otherwise,
++     for `HAVE_V2_CONFIG', the default is `10'.
++
++`timetable STRING STRING'
++     The `timetable' defines a timetable that may be used in
++     subsequently appearing time strings; see *note Time Strings::.
++     The first string names the timetable entry; the second is a time
++     string.
++
++     The following `timetable' commands are predefined.  The NonPeak
++     timetable is included for compatibility.  It originally described
++     the offpeak hours of Tymnet and Telenet, but both have since
++     changed their schedules.
++
++          timetable Evening Wk1705-0755,Sa,Su
++          timetable Night Wk2305-0755,Sa,Su2305-1655
++          timetable NonPeak Wk1805-0655,Sa,Su
++
++     If this command does not appear, then, obviously, no additional
++     timetables will be defined.
++
++`v2-files BOOLEAN'
++     If the code was compiled to be able to read V2 configuration
++     files, a false argument to this command will prevent them from
++     being read.  This can be useful while testing.  The default is
++     true.
++
++`hdb-files BOOLEAN'
++     If the code was compiled to be able to read HDB configuration
++     files, a false argument to this command will prevent them from
++     being read.  This can be useful while testing.  The default is
++     true.
++
++
++\x1f
++File: uucp.info,  Node: Configuration File Names,  Next: Log File Names,  Prev: Miscellaneous (config),  Up: config File
++
++5.6.2 Configuration File Names
++------------------------------
++
++`sysfile STRINGS'
++     Specify the system file(s).  The default is the file `sys' in the
++     directory NEWCONFIGDIR.  These files hold information about other
++     systems with which this system communicates; see *note sys File::.
++     Multiple system files may be given on the line, and the `sysfile'
++     command may be repeated; each system file has its own set of
++     defaults.
++
++`portfile STRINGS'
++     Specify the port file(s).  The default is the file `port' in the
++     directory NEWCONFIGDIR.  These files describe ports which are used
++     to call other systems and accept calls from other systems; see
++     *note port File::.  No port files need be named at all.  Multiple
++     port files may be given on the line, and the `portfile' command
++     may be repeated.
++
++`dialfile STRINGS'
++     Specify the dial file(s).  The default is the file `dial' in the
++     directory NEWCONFIGDIR.  These files describe dialing devices
++     (modems); see *note dial File::.  No dial files need be named at
++     all.  Multiple dial files may be given on the line, and the
++     `dialfile' command may be repeated.
++
++`dialcodefile STRINGS'
++     Specify the dialcode file(s).  The default is the file `dialcode'
++     in the directory NEWCONFIGDIR.  These files specify dialcodes that
++     may be used when sending phone numbers to a modem.  This permits
++     using the same set of phone numbers in different area-codes or
++     with different phone systems, by using dialcodes to specify the
++     calling sequence.  When a phone number goes through dialcode
++     translation, the leading alphabetic characters are stripped off.
++     The dialcode files are read line by line, just like any other
++     configuration file, and when a line is found whose first word is
++     the same as the leading characters from the phone number, the
++     second word on the line (which would normally consist of numbers)
++     replaces the dialcode in the phone number.  No dialcode file need
++     be used.  Multiple dialcode files may be specified on the line,
++     and the `dialcodefile' command may be repeated; all the dialcode
++     files will be read in turn until a dialcode is located.
++
++`callfile STRINGS'
++     Specify the call out login name and password file(s).  The default
++     is the file `call' in the directory NEWCONFIGDIR.  If the call out
++     login name or password for a system are given as `*' (*note
++     Logging In::), these files are read to get the real login name or
++     password.  Each line in the file(s) has three words: the system
++     name, the login name, and the password.  The login name and
++     password may contain escape sequences like those in a chat script
++     expect string (*note Chat Scripts::).  This file is only used when
++     placing calls to remote systems; the password file described under
++     `passwdfile' below is used for incoming calls.  The intention of
++     the call out file is to permit the system file to be publically
++     readable; the call out files must obviously be kept secure.  These
++     files need not be used.  Multiple call out files may be specified
++     on the line, and the `callfile' command may be repeated; all the
++     files will be read in turn until the system is found.
++
++`passwdfile STRINGS'
++     Specify the password file(s) to use for login names when `uucico'
++     is doing its own login prompting, which it does when given the
++     `-e', `-l' or `-w' switches.  The default is the file `passwd' in
++     the directory NEWCONFIGDIR.  Each line in the file(s) has two
++     words: the login name and the password (e.g., `Ufoo foopas').
++     They may contain escape sequences like those in a chat script
++     expect string (*note Chat Scripts::).  The login name is accepted
++     before the system name is known, so these are independent of which
++     system is calling in; a particular login may be required for a
++     system by using the `called-login' command in the system file
++     (*note Accepting a Call::).  These password files are optional,
++     although one must exist if `uucico' is to present its own login
++     prompts.
++
++     As a special exception, a colon may be used to separate the login
++     name from the password, and a colon may be used to terminate the
++     password.  This means that the login name and password may not
++     contain a colon.  This feature, in conjunction with the
++     `HAVE_ENCRYPTED_PASSWORDS' macro in `policy.h', permits using a
++     standard Unix `/etc/passwd' as a UUCP password file, providing the
++     same set of login names and passwords for both `getty' and
++     `uucico'.
++
++     Multiple password files may be specified on the line, and the
++     `passwdfile' command may be repeated; all the files will be read in
++     turn until the login name is found.
++
++
++\x1f
++File: uucp.info,  Node: Log File Names,  Next: Debugging Levels,  Prev: Configuration File Names,  Up: config File
++
++5.6.3 Log File Names
++--------------------
++
++`logfile STRING'
++     Name the log file.  The default is from `policy.h'.  Logging
++     information is written to this file.  If `HAVE_HDB_LOGGING' is
++     defined in `policy.h', then by default a separate log file is used
++     for each system; using this command to name a log file will cause
++     all the systems to use it.
++
++`statfile STRING'
++     Name the statistics file.  The default is from `policy.h'.
++     Statistical information about file transfers is written to this
++     file.
++
++`debugfile STRING'
++     Name the file to which all debugging information is written.  The
++     default is from `policy.h'.  This command is only effective if the
++     code has been compiled to include debugging (this is controlled by
++     the `DEBUG' macro in `policy.h').  If debugging is on, messages
++     written to the log file are also written to the debugging file to
++     make it easier to keep the order of actions straight.  The
++     debugging file is different from the log file because information
++     such as passwords can appear in it, so it must be not be
++     publically readable.
++
++
++\x1f
++File: uucp.info,  Node: Debugging Levels,  Prev: Log File Names,  Up: config File
++
++5.6.4 Debugging Levels
++----------------------
++
++`debug STRING ...'
++     Set the debugging level.  This command is only effective if the
++     code has been compiled to include debugging.  The default is to
++     have no debugging.  The arguments are strings which name the types
++     of debugging to be turned on.  The following types of debugging
++     are defined:
++
++    `abnormal'
++          Output debugging messages for abnormal situations, such as
++          recoverable errors.
++
++    `chat'
++          Output debugging messages for chat scripts.
++
++    `handshake'
++          Output debugging messages for the initial handshake.
++
++    `uucp-proto'
++          Output debugging messages for the UUCP session protocol.
++
++    `proto'
++          Output debugging messages for the individual link protocols.
++
++    `port'
++          Output debugging messages for actions on the communication
++          port.
++
++    `config'
++          Output debugging messages while reading the configuration
++          files.
++
++    `spooldir'
++          Output debugging messages for actions in the spool directory.
++
++    `execute'
++          Output debugging messages whenever another program is
++          executed.
++
++    `incoming'
++          List all incoming data in the debugging file.
++
++    `outgoing'
++          List all outgoing data in the debugging file.
++
++    `all'
++          All of the above.
++
++     The debugging level may also be specified as a number.  A 1 will
++     set `chat' debugging, a 2 will set both `chat' and `handshake'
++     debugging, and so on down the possibilities.  Currently an 11 will
++     turn on all possible debugging, since there are 11 types of
++     debugging messages listed above; more debugging types may be added
++     in the future.  The `debug' command may be used several times in
++     the configuration file; every debugging type named will be turned
++     on.  When running any of the programs, the `-x' switch (actually,
++     for `uulog' it's the `-X' switch) may be used to turn on
++     debugging.  The argument to the `-x' switch is one of the strings
++     listed above, or a number as described above, or a comma separated
++     list of strings (e.g., `-x chat,handshake').  The `-x' switch may
++     also appear several times on the command line, in which case all
++     named debugging types will be turned on.  The `-x' debugging is in
++     addition to any debugging specified by the `debug' command; there
++     is no way to cancel debugging information.  The debugging level
++     may also be set specifically for calls to or from a specific
++     system with the `debug' command in the system file (*note
++     Miscellaneous (sys)::).
++
++     The debugging messages are somewhat idiosyncratic; it may be
++     necessary to refer to the source code for additional information
++     in some cases.
++
++
++\x1f
++File: uucp.info,  Node: sys File,  Next: port File,  Prev: config File,  Up: Configuration Files
++
++5.7 The System Configuration File
++=================================
++
++By default there is a single system configuration, named `sys' in the
++directory NEWCONFIGDIR.  This may be overridden by the `sysfile'
++command in the main configuration file; see *note Configuration File
++Names::.
++
++   These files describe all remote systems known to the UUCP package.
++
++* Menu:
++
++* Defaults and Alternates::     Using Defaults and Alternates
++* Naming the System::           Naming the System
++* Calling Out::                 Calling Out
++* Accepting a Call::            Accepting a Call
++* Protocol Selection::          Protocol Selection
++* File Transfer Control::       File Transfer Control
++* Miscellaneous (sys)::         Miscellaneous sys File Commands
++* Default sys File Values::     Default Values
++
++\x1f
++File: uucp.info,  Node: Defaults and Alternates,  Next: Naming the System,  Prev: sys File,  Up: sys File
++
++5.7.1 Defaults and Alternates
++-----------------------------
++
++The first set of commands in the file, up to the first `system'
++command, specify defaults to be used for all systems in that file.  Each
++`sys' file uses a different set of defaults.
++
++   Subsequently, each set of commands from `system' up to the next
++`system' command describe a particular system.  Default values may be
++overridden for specific systems.
++
++   Each system may then have a series of alternate choices to use when
++calling out or calling in.  The first set of commands for a particular
++system, up to the first `alternate' command, provide the first choice.
++Subsequently, each set of commands from `alternate' up to the next
++`alternate' command describe an alternate choice for calling out or
++calling in.
++
++   When a system is called, the commands before the first `alternate'
++are used to select a phone number, port, and so forth; if the call fails
++for some reason, the commands between the first `alternate' and the
++second are used, and so forth.  Well, not quite.  Actually, each
++succeeding alternate will only be used if it is different in some
++relevant way (different phone number, different chat script, etc.).  If
++you want to force the same alternate to be used again (to retry a phone
++call more than once, for example), enter the phone number (or any other
++relevant field) again to make it appear different.
++
++   The alternates can also be used to give different permissions to an
++incoming call based on the login name.  This will only be done if the
++first set of commands, before the first `alternate' command, uses the
++`called-login' command.  The list of alternates will be searched, and
++the first alternate with a matching `called-login' command will be
++used.  If no alternates match, the call will be rejected.
++
++   The `alternate' command may also be used in the file-wide defaults
++(the set of commands before the first `system' command).  This might be
++used to specify a list of ports which are available for all systems
++(for an example of this, see *note Gateway Example::) or to specify
++permissions based on the login name used by the remote system when it
++calls in.  The first alternate for each system will default to the
++first alternate for the file-wide defaults (as modified by the commands
++used before the first `alternate' command for this system), the second
++alternate for each system to the second alternate for the file-wide
++defaults (as modified the same way), and so forth.  If a system
++specifies more alternates than the file-wide defaults, the trailing
++ones will default to the last file-wide default alternate.  If a system
++specifies fewer alternates than the file-wide defaults, the trailing
++file-wide default alternates will be used unmodified.  The
++`default-alternates' command may be used to modify this behaviour.
++
++   This can all get rather confusing, although it's easier to use than
++to describe concisely; the `uuchk' program may be used to ensure that
++you are getting what you want.
++
++\x1f
++File: uucp.info,  Node: Naming the System,  Next: Calling Out,  Prev: Defaults and Alternates,  Up: sys File
++
++5.7.2 Naming the System
++-----------------------
++
++`system STRING'
++     Specify the remote system name.  Subsequent commands up to the next
++     `system' command refer to this system.
++
++`alternate [STRING]'
++     Start an alternate set of commands (*note Defaults and
++     Alternates::).  An optional argument may be used to name the
++     alternate.  This name will be recorded in the log file if the
++     alternate is used to call the system.  There is no way to name the
++     first alternate (the commands before the first `alternate'
++     command).
++
++`default-alternates BOOLEAN'
++     If the argument is false, any remaining default alternates (from
++     the defaults specified at the top of the current system file) will
++     not be used.  The default is true.
++
++`alias STRING'
++     Specify an alias for the current system.  The alias may be used by
++     local `uucp' and `uux' commands, as well as by the remote system
++     (which can be convenient if a remote system changes its name).
++     The default is to have no aliases.
++
++`myname STRING'
++     Specifies a different system name to use when calling the remote
++     system.  Also, if `called-login' is used and is not `ANY', then,
++     when a system logs in with that login name, STRING is used as the
++     local system name.  Because the local system name must be
++     determined before the remote system has identified itself, using
++     `myname' and `called-login' together for any system will set the
++     local name for that login; this means that each locally used
++     system name must have a unique login name associated with it.
++     This allows a system to have different names for an external and
++     an internal network.  The default is to not use a special local
++     name.
++
++
++\x1f
++File: uucp.info,  Node: Calling Out,  Next: Accepting a Call,  Prev: Naming the System,  Up: sys File
++
++5.7.3 Calling Out
++-----------------
++
++This section describes commands used when placing a call to another
++system.
++
++* Menu:
++
++* When to Call::                When to Call
++* Placing the Call::            Placing the Call
++* Logging In::                  Logging In
++
++\x1f
++File: uucp.info,  Node: When to Call,  Next: Placing the Call,  Prev: Calling Out,  Up: Calling Out
++
++5.7.3.1 When to Call
++....................
++
++`time STRING [NUMBER]'
++     Specify when the system may be called.  The first argument is a
++     time string; see *note Time Strings::.  The optional second
++     argument specifies a retry time in minutes.  If a call made during
++     a time that matches the time string fails, no more calls are
++     permitted until the retry time has passed.  By default an
++     exponentially increasing retry time is used: after each failure
++     the next retry period is longer.  A retry time specified in the
++     `time' command is always a fixed amount of time.
++
++     The `time' command may appear multiple times in a single alternate,
++     in which case if any time string matches the system may be called.
++     When the `time' command is used for a particular system, any `time'
++     or `timegrade' commands that appeared in the system defaults are
++     ignored.
++
++     The default time string is `Never'.
++
++`timegrade CHARACTER STRING [NUMBER]'
++     The CHARACTER specifies a grade.  It must be a single letter or
++     digit.  The STRING is a time string (*note Time Strings::).  All
++     jobs of grade CHARACTER or higher (where `0' > `9' > `A' > `Z' >
++     `a' > `z') may be run at the specified time.  An ordinary `time'
++     command is equivalent to using `timegrade' with a grade of `z',
++     permitting all jobs.  If there are no jobs of a sufficiently high
++     grade according to the time string, the system will not be called.
++     Giving the `-s' switch to `uucico' to force it to call a system
++     causes it to assume there is a job of grade `0' waiting to be run.
++
++     The optional third argument specifies a retry time in minutes.
++     See the `time' command, above, for more details.
++
++     Note that the `timegrade' command serves two purposes: 1) if there
++     is no job of sufficiently high grade the system will not be
++     called, and 2) if the system is called anyway (because the `-s'
++     switch was given to `uucico') only jobs of sufficiently high grade
++     will be transferred.  However, if the other system calls in, the
++     `timegrade' commands are ignored, and jobs of any grade may be
++     transferred (but see `call-timegrade' and `called-timegrade',
++     below).  Also, the `timegrade' command will not prevent the other
++     system from transferring any job it chooses, regardless of who
++     placed the call.
++
++     The `timegrade' command may appear multiple times without using
++     `alternate'.  When the `timegrade' command is used for a
++     particular system, any `time' or `timegrade' commands that
++     appeared in the system defaults are ignored.
++
++     If this command does not appear, there are no restrictions on what
++     grade of work may be done at what time.
++
++`max-retries NUMBER'
++     Gives the maximum number of times this system may be retried.  If
++     this many calls to the system fail, it will be called at most once
++     a day whatever the retry time is.  The default is 26.
++
++`success-wait NUMBER'
++     A retry time, in seconds, which applies after a successful call.
++     This can be used to put a limit on how frequently the system is
++     called.  For example, an argument of 1800 means that the system
++     will not be called more than once every half hour.  The default is
++     0, which means that there is no limit.
++
++`call-timegrade CHARACTER STRING'
++     The CHARACTER is a single character `A' to `Z', `a' to `z', or `0'
++     to `9' and specifies a grade.  The STRING is a time string (*note
++     Time Strings::).  If a call is placed to the other system during a
++     time which matches the time string, the remote system will be
++     requested to only run jobs of grade CHARACTER or higher.
++     Unfortunately, there is no way to guarantee that the other system
++     will obey the request (this UUCP package will, but there are
++     others which will not); moreover, job grades are historically
++     somewhat arbitrary, so specifying a grade will only be meaningful
++     if the other system cooperates in assigning grades.  This grade
++     restriction only applies when the other system is called, not when
++     the other system calls in.
++
++     The `call-timegrade' command may appear multiple times without
++     using `alternate'.  If this command does not appear, or if none of
++     the time strings match, the remote system will be allowed to send
++     whatever grades of work it chooses.
++
++`called-timegrade CHARACTER STRING'
++     The CHARACTER is a single character `A' to `Z', `a' to `z', or `0'
++     to `9' and specifies a grade.  The STRING is a time string (*note
++     Time Strings::).  If a call is received from the other system
++     during a time which matches the time string, only jobs of grade
++     CHARACTER or higher will be sent to the remote system.  This
++     allows the job grade to be set for incoming calls, overriding any
++     request made by the remote uucico.  As noted above, job grades are
++     historically somewhat arbitrary, so specifying a grade will only be
++     meaningful if the other system cooperates in assigning grades.
++     This grade restriction only applies to jobs on the local system;
++     it does not affect the jobs transferred by the remote system.
++     This grade restriction only applies when the other system calls
++     in, not when the other system is called.
++
++     The `called-timegrade' command may appear multiple times.  If this
++     command does not appear, or if none of the time strings match, any
++     grade may be sent to the remote system upon receiving a call.
++
++
++\x1f
++File: uucp.info,  Node: Placing the Call,  Next: Logging In,  Prev: When to Call,  Up: Calling Out
++
++5.7.3.2 Placing the Call
++........................
++
++`speed NUMBER'
++
++`baud NUMBER'
++     Specify the speed (the term "baud" is technically incorrect, but
++     widely understood) at which to call the system.  This will try all
++     available ports with that speed until an unlocked port is found.
++     The ports are defined in the port file.  If both `speed' and
++     `port' commands appear, both are used when selecting a port.  To
++     allow calls at more than one speed, the `alternate' command must be
++     used (*note Defaults and Alternates::).  If this command does not
++     appear, there is no default; the speed may be specified in the port
++     file, but if it is not then the natural speed of the port will be
++     used (whatever that means on the system).  Specifying an explicit
++     speed of 0 will request the natural speed of the port (whatever
++     the system sets it to), overriding any default speed from the
++     defaults at the top of the file.
++
++`port STRING'
++     Name a particular port or type of port to use when calling the
++     system.  The information for this port is obtained from the port
++     file.  If this command does not appear, there is no default; a
++     port must somehow be specified in order to call out (it may be
++     specified implicitly using the `speed' command or explicitly using
++     the next version of `port').  There may be many ports with the
++     same name; each will be tried in turn until an unlocked one is
++     found which matches the desired speed.
++
++`port STRING ...'
++     If more than one string follows the `port' command, the strings are
++     treated as a command that might appear in the port file (*note
++     port File::).  If a port is named (by using a single string
++     following `port') these commands are ignored; their purpose is to
++     permit defining the port completely in the system file rather than
++     always requiring entries in two different files.  In order to call
++     out, a port must be specified using some version of the `port'
++     command, or by using the `speed' command to select ports from the
++     port file.
++
++`phone STRING'
++`address STRING'
++     Give a phone number to call (when using a modem port) or a remote
++     host to contact (when using a TCP or TLI port).  The commands
++     `phone' and `address' are equivalent; the duplication is intended
++     to provide a mnemonic choice depending on the type of port in use.
++
++     When used with a modem port, an `=' character in the phone number
++     means to wait for a secondary dial tone (although only some modems
++     support this); a `-' character means to pause while dialing for 1
++     second (again, only some modems support this).  If the system has
++     more than one phone number, each one must appear in a different
++     alternate.  The `phone' command must appear in order to call out
++     on a modem; there is no default.
++
++     When used with a TCP port, the string names the host to contact.
++     It may be a domain name or a numeric Internet address.  If no
++     address is specified, the system name is used.
++
++     When used with a TLI port, the string is treated as though it were
++     an expect string in a chat script, allowing the use of escape
++     characters (*note Chat Scripts::).  The `dialer-sequence' command
++     in the port file may override this address (*note port File::).
++
++     When used with a port that not a modem or TCP or TLI, this command
++     is ignored.
++
++
++\x1f
++File: uucp.info,  Node: Logging In,  Prev: Placing the Call,  Up: Calling Out
++
++5.7.3.3 Logging In
++..................
++
++`chat STRINGS'
++
++`chat-timeout NUMBER'
++
++`chat-fail STRING'
++
++`chat-seven-bit BOOLEAN'
++
++`chat-program STRINGS'
++     These commands describe a chat script to use when logging on to a
++     remote system.  This login chat script is run after any chat
++     script defined in the `dial' file (*note dial File::).  Chat
++     scripts are explained in *note Chat Scripts::.
++
++     Two additional escape sequences may be used in send strings.
++
++    `\L'
++          Send the login name, as set by the `call-login' command.
++
++    `\P'
++          Send the password, as set by the `call-password' command.
++
++     Three additional escape sequences may be used with the
++     `chat-program' command.  These are `\L' and `\P', which become the
++     login name and password, respectively, and `\Z', which becomes the
++     name of the system of being called.
++
++     The default chat script is:
++
++          chat "" \r\c ogin:-BREAK-ogin:-BREAK-ogin: \L word: \P
++
++     This will send a carriage return (the `\c' suppresses the
++     additional trailing carriage return that would otherwise be sent)
++     and waits for the string `ogin:' (which would be the last part of
++     the `login:' prompt supplied by a Unix system).  If it doesn't see
++     `ogin:', it sends a break and waits for `ogin:' again.  If it
++     still doesn't see `ogin:', it sends another break and waits for
++     `ogin:' again.  If it still doesn't see `ogin:', the chat script
++     aborts and hangs up the phone.  If it does see `ogin:' at some
++     point, it sends the login name (as specified by the `call-login'
++     command) followed by a carriage return (since all send strings are
++     followed by a carriage return unless `\c' is used) and waits for
++     the string `word:' (which would be the last part of the
++     `Password:' prompt supplied by a Unix system).  If it sees
++     `word:', it sends the password and a carriage return, completing
++     the chat script.  The program will then enter the handshake phase
++     of the UUCP protocol.
++
++     This chat script will work for most systems, so you will only be
++     required to use the `call-login' and `call-password' commands.  In
++     fact, in the file-wide defaults you could set defaults of
++     `call-login *' and `call-password *'; you would then just have to
++     make an entry for each system in the call-out login file.
++
++     Some systems seem to flush input after the `login:' prompt, so they
++     may need a version of this chat script with a `\d' before the
++     `\L'.  When using UUCP over TCP, some servers will not be handle
++     the initial carriage return sent by this chat script; in this case
++     you may have to specify the simple chat script `ogin: \L word: \P'.
++
++`call-login STRING'
++     Specify the login name to send with `\L' in the chat script.  If
++     the string is `*' (e.g., `call-login *') the login name will be
++     fetched from the call out login name and password file (*note
++     Configuration File Names::).  The string may contain escape
++     sequences as though it were an expect string in a chat script
++     (*note Chat Scripts::).  There is no default.
++
++`call-password STRING'
++     Specify the password to send with `\P' in the chat script.  If the
++     string is `*' (e.g., `call-password *') the password will be
++     fetched from the call-out login name and password file (*note
++     Configuration File Names::).  The string may contain escape
++     sequences as though it were an expect string in a chat script
++     (*note Chat Scripts::).  There is no default.
++
++
++\x1f
++File: uucp.info,  Node: Accepting a Call,  Next: Protocol Selection,  Prev: Calling Out,  Up: sys File
++
++5.7.4 Accepting a Call
++----------------------
++
++`called-login STRINGS'
++     The first STRING specifies the login name that the system must use
++     when calling in.  If it is `ANY' (e.g., `called-login ANY') any
++     login name may be used; this is useful to override a file-wide
++     default and to indicate that future alternates may have different
++     login names.  Case is significant.  The default value is `ANY'.
++
++     Different alternates (*note Defaults and Alternates::) may use
++     different `called-login' commands, in which case the login name
++     will be used to select which alternate is in effect; this will
++     only work if the first alternate (before the first `alternate'
++     command) uses the `called-login' command.
++
++     Additional strings may be specified after the login name; they are
++     a list of which systems are permitted to use this login name.  If
++     this feature is used, then normally the login name will only be
++     given in a single `called-login' command.  Only systems which
++     appear on the list, or which use an explicit `called-login'
++     command, will be permitted to use that login name.  If the same
++     login name is used more than once with a list of systems, all the
++     lists are concatenated together.  This feature permits you to
++     restrict a login name to a particular set of systems without
++     requiring you to use the `called-login' command for every single
++     system; you can achieve a similar effect by using a different
++     system file for each permitted login name with an appropriate
++     `called-login' command in the file-wide defaults.
++
++`callback BOOLEAN'
++     If BOOLEAN is true, then when the remote system calls `uucico'
++     will hang up the connection and prepare to call it back.  The
++     default is false.
++
++`called-chat STRINGS'
++
++`called-chat-timeout NUMBER'
++
++`called-chat-fail STRING'
++
++`called-chat-seven-bit BOOLEAN'
++
++`called-chat-program STRINGS'
++     These commands may be used to define a chat script (*note Chat
++     Scripts::) that is run whenever the local system is called by the
++     system being defined.  The chat script defined by the `chat'
++     command (*note Logging In::), on the other hand, is used when the
++     remote system is called.  This called chat script might be used to
++     set special modem parameters that are appropriate to a particular
++     system.  It is run after protocol negotiation is complete, but
++     before the protocol has been started.  For additional escape
++     sequence which may be used besides those defined for all chat
++     scripts, see *note Logging In::.  There is no default called chat
++     script.  If the called chat script fails, the incoming call will
++     be aborted.
++
++
++\x1f
++File: uucp.info,  Node: Protocol Selection,  Next: File Transfer Control,  Prev: Accepting a Call,  Up: sys File
++
++5.7.5 Protocol Selection
++------------------------
++
++`protocol STRING'
++     Specifies which protocols to use for the other system, and in which
++     order to use them.  This would not normally be used.  For example,
++     `protocol tfg'.
++
++     The default depends on the characteristics of the port and the
++     dialer, as specified by the `seven-bit' and `reliable' commands.
++     If neither the port nor the dialer use either of these commands,
++     the default is to assume an eight-bit reliable connection.  The
++     commands `seven-bit true' or `reliable false' might be used in
++     either the port or the dialer to change this.  Each protocol has
++     particular requirements that must be met before it will be
++     considered during negotiation with the remote side.
++
++     The `t' and `e' protocols are intended for use over TCP or some
++     other communication path with end to end reliability, as they do no
++     checking of the data at all.  They will only be considered on a
++     TCP port which is both reliable and eight bit.  For technical
++     details, see *note t Protocol::, and *note e Protocol::.
++
++     The `i' protocol is a bidirectional protocol.  It requires an
++     eight-bit connection.  It will run over a half-duplex link, such as
++     Telebit modems in PEP mode, but for efficient use of such a
++     connection you must use the `half-duplex' command (*note port
++     File::).  *Note i Protocol::.
++
++     The `g' protocol is robust, but requires an eight-bit connection.
++     *Note g Protocol::.
++
++     The `G' protocol is the System V Release 4 version of the `g'
++     protocol.  *Note Big G Protocol::.
++
++     The `a' protocol is a Zmodem like protocol, contributed by Doug
++     Evans.  It requires an eight-bit connection, but unlike the `g' or
++     `i' protocol it will work if certain control characters may not be
++     transmitted.
++
++     The `j' protocol is a variant of the `i' protocol which can avoid
++     certain control characters.  The set of characters it avoids can
++     be set by a parameter.  While it technically does not require an
++     eight bit connection (it could be configured to avoid all
++     characters with the high bit set) it would be very inefficient to
++     use it over one.  It is useful over a eight-bit connection that
++     will not transmit certain control characters.  *Note j Protocol::.
++
++     The `f' protocol is intended for use with X.25 connections; it
++     checksums each file as a whole, so any error causes the entire
++     file to be retransmitted.  It requires a reliable connection, but
++     only uses seven-bit transmissions.  It is a streaming protocol,
++     so, while it can be used on a serial port, the port must be
++     completely reliable and flow controlled; many aren't.  *Note f
++     Protocol::.
++
++     The `v' protocol is the `g' protocol as used by the DOS program
++     UUPC/Extended.  It is provided only so that UUPC/Extended users
++     can use it; there is no particular reason to select it.  *Note v
++     Protocol::.
++
++     The `y' protocol is an efficient streaming protocol.  It does error
++     checking, but when it detects an error it immediately aborts the
++     connection.  This requires a reliable, flow controlled, eight-bit
++     connection.  In practice, it is only useful on a connection that is
++     nearly always error-free.  Unlike the `t' and `e' protocols, the
++     connection need not be entirely error-free, so the `y' protocol
++     can be used on a serial port.  *Note y Protocol::.
++
++     The protocols will be considered in the order shown above.  This
++     means that if neither the `seven-bit' nor the `reliable' command
++     are used, the `t' protocol will be used over a TCP connection and
++     the `i' protocol will be used over any other type of connection
++     (subject, of course, to what is supported by the remote system; it
++     may be assumed that all systems support the `g' protocol).
++
++     Note that currently specifying both `seven-bit true' and `reliable
++     false' will not match any protocol.  If this occurs through a
++     combination of port and dialer specifications, you will have to
++     use the `protocol' command for the system or no protocol will be
++     selected at all (the only reasonable choice would be `protocol f').
++
++     A protocol list may also be specified for a port (*note port
++     File::), but, if there is a list for the system, the list for the
++     port is ignored.
++
++`protocol-parameter CHARACTER STRING ...'
++     CHARACTER is a single character specifying a protocol.  The
++     remaining strings are a command specific to that protocol which
++     will be executed if that protocol is used.  A typical command is
++     something like `window 7'.  The particular commands are protocol
++     specific.
++
++     The `i' protocol supports the following commands, all of which take
++     numeric arguments:
++
++    `window'
++          The window size to request the remote system to use.  This
++          must be between 1 and 16 inclusive.  The default is 16.
++
++    `packet-size'
++          The packet size to request the remote system to use.  This
++          must be between 1 and 4095 inclusive.  The default is 1024.
++
++    `remote-packet-size'
++          If this is between 1 and 4095 inclusive, the packet size
++          requested by the remote system is ignored, and this is used
++          instead.  The default is 0, which means that the remote
++          system's request is honored.
++
++    `sync-timeout'
++          The length of time, in seconds, to wait for a SYNC packet
++          from the remote system.  SYNC packets are exchanged when the
++          protocol is started.  The default is 10.
++
++    `sync-retries'
++          The number of times to retry sending a SYNC packet before
++          giving up.  The default is 6.
++
++    `timeout'
++          The length of time, in seconds, to wait for an incoming
++          packet before sending a negative acknowledgement.  The
++          default is 10.
++
++    `retries'
++          The number of times to retry sending a packet or a negative
++          acknowledgement before giving up and closing the connection.
++          The default is 6.
++
++    `errors'
++          The maximum number of errors to permit before closing the
++          connection.  The default is 100.
++
++    `error-decay'
++          The rate at which to ignore errors.  Each time this many
++          packets are received, the error count is decreased by one, so
++          that a long connection with an occasional error will not
++          exceed the limit set by `errors'.  The default is 10.
++
++    `ack-frequency'
++          The number of packets to receive before sending an
++          acknowledgement.  The default is half the requested window
++          size, which should provide good performance in most cases.
++
++     The `g', `G' and `v' protocols support the following commands, all
++     of which take numeric arguments, except `short-packets' which
++     takes a boolean argument:
++
++    `window'
++          The window size to request the remote system to use.  This
++          must be between 1 and 7 inclusive.  The default is 7.
++
++    `packet-size'
++          The packet size to request the remote system to use.  This
++          must be a power of 2 between 32 and 4096 inclusive.  The
++          default is 64 for the `g' and `G' protocols and 1024 for the
++          `v' protocol.  Many older UUCP packages do not support packet
++          sizes larger than 64, and many others do not support packet
++          sizes larger than 128.  Some UUCP packages will even dump
++          core if a larger packet size is requested.  The packet size
++          is not a negotiation, and it may be different in each
++          direction.  If you request a packet size larger than the
++          remote system supports, you will not be able to send any
++          files.
++
++    `startup-retries'
++          The number of times to retry the initialization sequence.
++          The default is 8.
++
++    `init-retries'
++          The number of times to retry one phase of the initialization
++          sequence (there are three phases).  The default is 4.
++
++    `init-timeout'
++          The timeout in seconds for one phase of the initialization
++          sequence.  The default is 10.
++
++    `retries'
++          The number of times to retry sending either a data packet or
++          a request for the next packet.  The default is 6.
++
++    `timeout'
++          The timeout in seconds when waiting for either a data packet
++          or an acknowledgement.  The default is 10.
++
++    `garbage'
++          The number of unrecognized bytes to permit before dropping the
++          connection.  This must be larger than the packet size.  The
++          default is 10000.
++
++    `errors'
++          The number of errors (malformed packets, out of order
++          packets, bad checksums, or packets rejected by the remote
++          system) to permit before dropping the connection.  The
++          default is 100.
++
++    `error-decay'
++          The rate at which to ignore errors.  Each time this many
++          packets are received, the error count is decreased by one, so
++          that a long connection with an occasional error will not
++          exceed the limit set by `errors'.  The default is 10.
++
++    `remote-window'
++          If this is between 1 and 7 inclusive, the window size
++          requested by the remote system is ignored and this is used
++          instead.  This can be useful when dealing with some poor UUCP
++          packages.  The default is 0, which means that the remote
++          system's request is honored.
++
++    `remote-packet-size'
++          If this is between 32 and 4096 inclusive the packet size
++          requested by the remote system is ignored and this is used
++          instead.  There is probably no good reason to use this.  The
++          default is 0, which means that the remote system's request is
++          honored.
++
++    `short-packets'
++          If this is true, then the code will optimize by sending
++          shorter packets when there is less data to send.  This
++          confuses some UUCP packages, such as System V Release 4 (when
++          using the `G' protocol) and Waffle; when connecting to such a
++          package, this parameter must be set to false.  The default is
++          true for the `g' and `v' protocols and false for the `G'
++          protocol.
++
++     The `a' protocol is a Zmodem like protocol contributed by Doug
++     Evans.  It supports the following commands, all of which take
++     numeric arguments except for `escape-control', which takes a
++     boolean argument:
++
++    `timeout'
++          Number of seconds to wait for a packet to arrive.  The
++          default is 10.
++
++    `retries'
++          The number of times to retry sending a packet.  The default
++          is 10.
++
++    `startup-retries'
++          The number of times to retry sending the initialization
++          packet.  The default is 4.
++
++    `garbage'
++          The number of garbage characters to accept before closing the
++          connection.  The default is 2400.
++
++    `send-window'
++          The number of characters that may be sent before waiting for
++          an acknowledgement.  The default is 1024.
++
++    `escape-control'
++          Whether to escape control characters.  If this is true, the
++          protocol may be used over a connection which does not
++          transmit certain control characters, such as `XON' or `XOFF'.
++          The connection must still transmit eight bit characters other
++          than control characters.  The default is false.
++
++     The `j' protocol can be used over an eight bit connection that will
++     not transmit certain control characters.  It accepts the same
++     protocol parameters that the `i' protocol accepts, as well as one
++     more:
++
++    `avoid'
++          A list of characters to avoid.  This is a string which is
++          interpreted as an escape sequence (*note Chat Scripts::).
++          The protocol does not have a way to avoid printable ASCII
++          characters (byte values from 32 to 126, inclusive); only
++          ASCII control characters and eight-bit characters may be
++          avoided.  The default value is `\021\023'; these are the
++          characters `XON' and `XOFF', which many connections use for
++          flow control.  If the package is configured to use
++          `HAVE_BSD_TTY', then on some versions of Unix you may have to
++          avoid `\377' as well, due to the way some implementations of
++          the BSD terminal driver handle signals.
++
++     The `f' protocol is intended for use with error-correcting modems
++     only; it checksums each file as a whole, so any error causes the
++     entire file to be retransmitted.  It supports the following
++     commands, both of which take numeric arguments:
++
++    `timeout'
++          The timeout in seconds before giving up.  The default is 120.
++
++    `retries'
++          How many times to retry sending a file.  The default is 2.
++
++     The `t' and `e' protocols are intended for use over TCP or some
++     other communication path with end to end reliability, as they do no
++     checking of the data at all.  They both support a single command,
++     which takes a numeric argument:
++
++    `timeout'
++          The timeout in seconds before giving up.  The default is 120.
++
++     The `y' protocol is a streaming protocol contributed by Jorge Cwik.
++     It supports the following commands, both of which take numeric
++     arguments:
++
++    `timeout'
++          The timeout in seconds when waiting for a packet.  The
++          default is 60.
++
++    `packet-size'
++          The packet size to use.  The default is 1024.
++
++     The protocol parameters are reset to their default values after
++     each call.
++
++
++\x1f
++File: uucp.info,  Node: File Transfer Control,  Next: Miscellaneous (sys),  Prev: Protocol Selection,  Up: sys File
++
++5.7.6 File Transfer Control
++---------------------------
++
++`send-request BOOLEAN'
++     The BOOLEAN determines whether the remote system is permitted to
++     request files from the local system.  The default is yes.
++
++`receive-request BOOLEAN'
++     The BOOLEAN determines whether the remote system is permitted to
++     send files to the local system.  The default is yes.
++
++`request BOOLEAN'
++     A shorthand command, equivalent to specifying both `send-request
++     BOOLEAN' and `receive-request BOOLEAN'.
++
++`call-transfer BOOLEAN'
++     The BOOLEAN is checked when the local system places the call.  It
++     determines whether the local system may do file transfers queued
++     up for the remote system.  The default is yes.
++
++`called-transfer BOOLEAN'
++     The BOOLEAN is checked when the remote system calls in.  It
++     determines whether the local system may do file transfers queued
++     up for the remote system.  The default is yes.
++
++`transfer BOOLEAN'
++     A shorthand command, equivalent to specifying both `call-transfer
++     BOOLEAN' and `called-transfer BOOLEAN'.
++
++`call-local-size NUMBER STRING'
++     The STRING is a time string (*note Time Strings::).  The NUMBER is
++     the size in bytes of the largest file that should be transferred
++     at a time matching the time string, if the local system placed the
++     call and the request was made by the local system.  This command
++     may appear multiple times in a single alternate.  If this command
++     does not appear, or if none of the time strings match, there are
++     no size restrictions.
++
++     With all the size control commands, the size of a file from the
++     remote system (as opposed to a file from the local system) will
++     only be checked if the other system is running this package: other
++     UUCP packages will not understand a maximum size request, nor will
++     they provide the size of remote files.
++
++`call-remote-size NUMBER STRING'
++     Specify the size in bytes of the largest file that should be
++     transferred at a given time by remote request, when the local
++     system placed the call.  This command may appear multiple times in
++     a single alternate.  If this command does not appear, there are no
++     size restrictions.
++
++`called-local-size NUMBER STRING'
++     Specify the size in bytes of the largest file that should be
++     transferred at a given time by local request, when the remote
++     system placed the call.  This command may appear multiple times in
++     a single alternate. If this command does not appear, there are no
++     size restrictions.
++
++`called-remote-size NUMBER STRING'
++     Specify the size in bytes of the largest file that should be
++     transferred at a given time by remote request, when the remote
++     system placed the call.  This command may appear multiple times in
++     a single alternate. If this command does not appear, there are no
++     size restrictions.
++
++`local-send STRINGS'
++     Specifies that files in the directories named by the STRINGS may
++     be sent to the remote system when requested locally (using `uucp'
++     or `uux').  The directories in the list should be separated by
++     whitespace.  A `~' may be used for the public directory.  On a
++     Unix system, this is typically `/usr/spool/uucppublic'; the public
++     directory may be set with the `pubdir' command.  Here is an
++     example of `local-send':
++
++          local-send ~ /usr/spool/ftp/pub
++
++     Listing a directory allows all files within the directory and all
++     subdirectories to be sent.  Directories may be excluded by
++     preceding them with an exclamation point.  For example:
++
++          local-send /usr/ftp !/usr/ftp/private ~
++
++     means that all files in `/usr/ftp' or the public directory may be
++     sent, except those files in `/usr/ftp/private'.  The list of
++     directories is read from left to right, and the last directory to
++     apply takes effect; this means that directories should be listed
++     from top down.  The default is the root directory (i.e., any file
++     at all may be sent by local request).
++
++`remote-send STRINGS'
++     Specifies that files in the named directories may be sent to the
++     remote system when requested by the remote system.  The default is
++     `~'.
++
++`local-receive STRINGS'
++     Specifies that files may be received into the named directories
++     when requested by a local user.  The default is `~'.
++
++`remote-receive STRINGS'
++     Specifies that files may be received into the named directories
++     when requested by the remote system.  The default is `~'.  On
++     Unix, the remote system may only request that files be received
++     into directories that are writeable by the world, regardless of
++     how this is set.
++
++`forward-to STRINGS'
++     Specifies a list of systems to which files may be forwarded.  The
++     remote system may forward files through the local system on to any
++     of the systems in this list.  The string `ANY' may be used to
++     permit forwarding to any system.  The default is to not permit
++     forwarding to other systems.  Note that if the remote system is
++     permitted to execute the `uucp' command, it effectively has the
++     ability to forward to any system.
++
++`forward-from STRINGS'
++     Specifies a list of systems from which files may be forwarded.  The
++     remote system may request files via the local system from any of
++     the systems in this list.  The string `ANY' may be used to permit
++     forwarding to any system.  The default is to not permit forwarding
++     from other systems.  Note that if a remote system is permitted to
++     execute the `uucp' command, it effectively has the ability to
++     request files from any system.
++
++`forward STRINGS'
++     Equivalent to specifying both `forward-to STRINGS' and
++     `forward-from STRINGS'.  This would normally be used rather than
++     either of the more specific commands.
++
++`max-file-time NUMBER'
++     The maximum amount of time which will be sent sending any one file
++     if there are other files to send.  This will only be effective
++     when using a protocol which permits interrupting one file send to
++     send another file.  This is true of the `i' and `j' protocols.
++     The default is to have no maximum.
++
++
++\x1f
++File: uucp.info,  Node: Miscellaneous (sys),  Next: Default sys File Values,  Prev: File Transfer Control,  Up: sys File
++
++5.7.7 Miscellaneous sys File Commands
++-------------------------------------
++
++`sequence BOOLEAN'
++     If BOOLEAN is true, then conversation sequencing is automatically
++     used for the remote system, so that if somebody manages to spoof
++     as the remote system, it will be detected the next time the remote
++     system actually calls.  This is false by default.
++
++`command-path STRINGS'
++     Specifies the path (a list of whitespace separated directories) to
++     be searched to locate commands to execute.  This is only used for
++     commands requested by `uux', not for chat programs.  The default
++     is from `policy.h'.
++
++`commands STRINGS'
++     The list of commands which the remote system is permitted to
++     execute locally.  For example: `commands rnews rmail'.  If the
++     value is `ALL' (case significant), all commands may be executed.
++     The default is `rnews rmail'.
++
++`free-space NUMBER'
++     Specify the minimum amount of file system space (in bytes) to
++     leave free after receiving a file.  If the incoming file will not
++     fit, it will be rejected.  This initial rejection will only work
++     when talking to another instance of this package, since older UUCP
++     packages do not provide the file size of incoming files.  Also,
++     while a file is being received, `uucico' will periodically check
++     the amount of free space.  If it drops below the amount given by
++     the `free-space' command, the file transfer will be aborted.  The
++     default amount of space to leave free is from `policy.h'.  This
++     file space checking may not work on all systems.
++
++`pubdir STRING'
++     Specifies the public directory that is used when `~' is specifed in
++     a file transfer or a list of directories.  This essentially
++     overrides the public directory specified in the main configuration
++     file for this system only.  The default is the public directory
++     specified in the main configuration file (which defaults to a
++     value from `policy.h').
++
++`debug STRING ...'
++     Set additional debugging for calls to or from the system.  This
++     may be used to debug a connection with a specific system.  It is
++     particularly useful when debugging incoming calls, since debugging
++     information will be generated whenever the call comes in.  See the
++     `debug' command in the main configuration file (*note Debugging
++     Levels::) for more details.  The debugging information specified
++     here is in addition to that specified in the main configuration
++     file or on the command line.
++
++`max-remote-debug STRING ...'
++     When the system calls in, it may request that the debugging level
++     be set to a certain value.  The `max-remote-debug' command may be
++     used to put a limit on the debugging level which the system may
++     request, to avoid filling up the disk with debugging information.
++     Only the debugging types named in the `max-remote-debug' command
++     may be turned on by the remote system.  To prohibit any debugging,
++     use `max-remote-debug none'.
++
++
++\x1f
++File: uucp.info,  Node: Default sys File Values,  Prev: Miscellaneous (sys),  Up: sys File
++
++5.7.8 Default sys File Values
++-----------------------------
++
++The following are used as default values for all systems; they can be
++considered as appearing before the start of the file.
++
++     time Never
++     chat "" \r\c ogin:-BREAK-ogin:-BREAK-ogin: \L word: \P
++     chat-timeout 10
++     callback n
++     sequence n
++     request y
++     transfer y
++     local-send /
++     remote-send ~
++     local-receive ~
++     remove-receive ~
++     command-path [ from `policy.h' ]
++     commands rnews rmail
++     max-remote-debug abnormal,chat,handshake
++
++\x1f
++File: uucp.info,  Node: port File,  Next: dial File,  Prev: sys File,  Up: Configuration Files
++
++5.8 The Port Configuration File
++===============================
++
++The port files may be used to name and describe ports.  By default there
++is a single port file, named `port' in the directory NEWCONFIGDIR.
++This may be overridden by the `portfile' command in the main
++configuration file; see *note Configuration File Names::.
++
++   Any commands in a port file before the first `port' command specify
++defaults for all ports in the file; however, since the `type' command
++must appear before all other commands for a port, the defaults are only
++useful if all ports in the file are of the same type (this restriction
++may be lifted in a later version).  All commands after a `port' command
++up to the next `port' command then describe that port.  There are
++different types of ports; each type supports its own set of commands.
++Each command indicates which types of ports support it.  There may be
++many ports with the same name; if a system requests a port by name then
++each port with that name will be tried until an unlocked one is found.
++
++`port STRING'
++     Introduces and names a port.
++
++`type STRING'
++     Define the type of port.  The default is `modem'.  If this command
++     appears, it must immediately follow the `port' command.  The type
++     defines what commands are subsequently allowed.  Currently the
++     types are:
++
++    `modem'
++          For a modem hookup.
++
++    `stdin'
++          For a connection through standard input and standard output,
++          as when `uucico' is run as a login shell.
++
++    `direct'
++          For a direct connection to another system.
++
++    `tcp'
++          For a connection using TCP.
++
++    `tli'
++          For a connection using TLI.
++
++    `pipe'
++          For a connection through a pipe running another program.
++
++`protocol STRING'
++     Specify a list of protocols to use for this port.  This is just
++     like the corresponding command for a system (*note Protocol
++     Selection::).  A protocol list for a system takes precedence over
++     a list for a port.
++
++`protocol-parameter CHARACTER STRINGS [ any type ]'
++     The same command as the `protocol-parameter' command used for
++     systems (*note Protocol Selection::).  This one takes precedence.
++
++`seven-bit BOOLEAN [ any type ]'
++     This is only used during protocol negotiation; if the argument is
++     true, it forces the selection of a protocol which works across a
++     seven-bit link.  It does not prevent eight bit characters from
++     being transmitted.  The default is false.
++
++`reliable BOOLEAN [ any type ]'
++     This is only used during protocol negotiation; if the argument is
++     false, it forces the selection of a protocol which works across an
++     unreliable communication link.  The default is true.  It would be
++     more common to specify this for a dialer rather than a port.
++
++`half-duplex BOOLEAN [ any type ]'
++     If the argument is true, it means that the port only supports
++     half-duplex connections.  This only affects bidirectional
++     protocols, and causes them to not do bidirectional transfers.
++
++`device STRING [ modem, direct and tli only ]'
++     Names the device associated with this port.  If the device is not
++     named, the port name is taken as the device.  Device names are
++     system dependent.  On Unix, a modem or direct connection might be
++     something like `/dev/ttyd0'; a TLI port might be `/dev/inet/tcp'.
++
++`speed NUMBER [modem and direct only ]'
++
++`baud NUMBER [ modem and direct only ]'
++     The speed this port runs at.  If a system specifies a speed but no
++     port name, then all ports which match the speed will be tried in
++     order.  If the speed is not specified here and is not specified by
++     the system, the natural speed of the port will be used by default.
++
++`speed-range NUMBER NUMBER [ modem only ]'
++
++`baud-range NUMBER NUMBER [ modem only ]'
++     Specify a range of speeds this port can run at.  The first number
++     is the minimum speed, the second number is the maximum speed.
++     These numbers will be used when matching a system which specifies
++     a desired speed.  The simple `speed' (or `baud') command is still
++     used to determine the speed to run at if the system does not
++     specify a speed.  For example, the command `speed-range 300 19200'
++     means that the port will match any system which uses a speed from
++     300 to 19200 baud (and will use the speed specified by the
++     system); this could be combined with `speed 2400', which means
++     that when this port is used with a system that does not specify a
++     speed, the port will be used at 2400 baud.
++
++`carrier BOOLEAN [ modem and direct only ]'
++     The argument indicates whether the port supports carrier.
++
++     If a modem port does not support carrier, the carrier detect
++     signal will never be required on this port, regardless of what the
++     modem chat script indicates.  The default for a modem port is true.
++
++     If a direct port supports carrier, the port will be set to expect
++     carrier whenever it is used.  The default for a direct port is
++     false.
++
++`hardflow BOOLEAN [ modem and direct only ]'
++     The argument indicates whether the port supports hardware flow
++     control.  If it does not, hardware flow control will not be turned
++     on for this port.  The default is true.  Hardware flow control is
++     only supported on some systems.
++
++`dial-device STRING [ modem only ]'
++     Dialing instructions should be output to the named device, rather
++     than to the normal port device.  The default is to output to the
++     normal port device.
++
++`dialer STRING [ modem only ]'
++     Name a dialer to use.  The information is looked up in the dial
++     file.  There is no default.  Some sort of dialer information must
++     be specified to call out on a modem.
++
++`dialer STRING ... [ modem only ]'
++     If more than one string follows the `dialer' command, the strings
++     are treated as a command that might appear in the dial file (*note
++     dial File::).  If a dialer is named (by using the first form of
++     this command, described just above), these commands are ignored.
++     They may be used to specify dialer information directly in simple
++     situations without needing to go to a separate file.  There is no
++     default.  Some sort of dialer information must be specified to
++     call out on a modem.
++
++`dialer-sequence STRINGS [ modem or tcp or tli only ]'
++     Name a sequence of dialers and tokens (phone numbers) to use.  The
++     first argument names a dialer, and the second argument names a
++     token.  The third argument names another dialer, and so on.  If
++     there are an odd number of arguments, the phone number specified
++     with a `phone' command in the system file is used as the final
++     token.  The token is what is used for `\D' or `\T' in the dialer
++     chat script.  If the token in this string is `\D', the system
++     phone number will be used; if it is `\T', the system phone number
++     will be used after undergoing dialcodes translation.  A missing
++     final token is taken as `\D'.
++
++     This command currently does not work if `dial-device' is specified;
++     to handle this correctly will require a more systematic notion of
++     chat scripts.  Moreover, the `complete' and `abort' chat scripts,
++     the protocol parameters, and the `carrier' and `dtr-toggle'
++     commands are ignored for all but the first dialer.
++
++     This command basically lets you specify a sequence of chat scripts
++     to use.  For example, the first dialer might get you to a local
++     network and the second dialer might describe how to select a
++     machine from the local network.  This lets you break your dialing
++     sequence into simple modules, and may make it easier to share
++     dialer entries between machines.
++
++     This command is to only way to use a chat script with a TCP port.
++     This can be useful when using a modem which is accessed via TCP.
++
++     When this command is used with a TLI port, then if the first
++     dialer is `TLI' or `TLIS' the first token is used as the address to
++     connect to.  If the first dialer is something else, or if there is
++     no token, the address given by the `address' command is used
++     (*note Placing the Call::).  Escape sequences in the address are
++     expanded as they are for chat script expect strings (*note Chat
++     Scripts::).  The different between `TLI' and `TLIS' is that the
++     latter implies the command `stream true'.  These contortions are
++     all for HDB compatibility.  Any subsequent dialers are treated as
++     they are for a TCP port.
++
++`lockname STRING [ modem and direct only ]'
++     Give the name to use when locking this port.  On Unix, this is the
++     name of the file that will be created in the lock directory.  It
++     is used as is, so on Unix it should generally start with `LCK..'.
++     For example, if a single port were named both `/dev/ttycu0' and
++     `/dev/tty0' (perhaps with different characteristics keyed on the
++     minor device number), then the command `lockname LCK..ttycu0' could
++     be used to force the latter to use the same lock file name as the
++     former.
++
++`service STRING [ tcp only ]'
++     Name the TCP port number to use.  This may be a number.  If not,
++     it will be looked up in `/etc/services'.  If this is not
++     specified, the string `uucp' is looked up in `/etc/services'.  If
++     it is not found, port number 540 (the standard UUCP-over-TCP port
++     number) will be used.
++
++`version STRING [ tcp only ]'
++     Specify the IP version number to use.  The default is `0', which
++     permits any version.  The other possible choices are `4', which
++     requires `IPv4', or `6', which requires `IPv6'.  Normally it is
++     not necessary to use this command, but in some cases, as `IPv6' is
++     rolled out across the Internet, it may be necessary to require
++     UUCP to use a particular type of connection.
++
++`push STRINGS [ tli only ]'
++     Give a list of modules to push on to the TLI stream.
++
++`stream BOOLEAN [ tli only ]'
++     If this is true, and the `push' command was not used, the `tirdwr'
++     module is pushed on to the TLI stream.
++
++`server-address STRING [ tli only ]'
++     Give the address to use when running as a TLI server.  Escape
++     sequences in the address are expanded as they are for chat script
++     expect strings (*note Chat Scripts::).
++
++     The string is passed directly to the TLI `t_bind' function.  The
++     value needed may depend upon your particular TLI implementation.
++     Check the manual pages, and, if necessary, try writing some sample
++     programs.
++
++     For AT&T 3B2 System V Release 3 using the Wollongong TCP/IP stack,
++     which is probably typical, the format of TLI string is `SSPPIIII',
++     where `SS' is the service number (for TCP, this is 2), `PP' is the
++     TCP port number, and `IIII' is the Internet address.  For example,
++     to accept a connection from on port 540 from any interface, use
++     `server-address \x00\x02\x02\x1c\x00\x00\x00\x00'.  To only accept
++     connections from a particular interface, replace the last four
++     digits with the network address of the interface.  (Thanks to Paul
++     Pryor for the information in this paragraph).
++
++`command STRINGS [ pipe only ]'
++     Give the command, with arguments, to run when using a pipe port
++     type.  When a port of this type is used, the command is executed
++     and `uucico' communicates with it over a pipe.  This permits
++     `uucico' or `cu' to communicate with another system which can only
++     be reached through some unusual means.  A sample use might be
++     `command /bin/rlogin -E -8 -l LOGIN SYSTEM'.  The command is run
++     with the full privileges of UUCP; it is responsible for
++     maintaining security.
++
++
++\x1f
++File: uucp.info,  Node: dial File,  Next: UUCP Over TCP,  Prev: port File,  Up: Configuration Files
++
++5.9 The Dialer Configuration File
++=================================
++
++The dialer configuration files define dialers.  By default there is a
++single dialer file, named `dial' in the directory NEWCONFIGDIR.  This
++may be overridden by the `dialfile' command in the main configuration
++file; see *note Configuration File Names::.
++
++   Any commands in the file before the first `dialer' command specify
++defaults for all the dialers in the file.  All commands after a
++`dialer' command up to the next `dialer' command are associated with
++the named dialer.
++
++`dialer STRING'
++     Introduces and names a dialer.
++
++`chat STRINGS'
++
++`chat-timeout NUMBER'
++
++`chat-fail STRING'
++
++`chat-seven-bit BOOLEAN'
++
++`chat-program STRINGS'
++     Specify a chat script to be used to dial the phone.  This chat
++     script is used before the login chat script in the `sys' file, if
++     any (*note Logging In::).  For full details on chat scripts, see
++     *note Chat Scripts::.
++
++     The `uucico' daemon will sleep for one second between attempts to
++     dial out on a modem.  If your modem requires a longer wait period,
++     you must start your chat script with delays (`\d' in a send
++     string).
++
++     The chat script will be read from and sent to the port specified
++     by the `dial-device' command for the port, if there is one.
++
++     The following escape addition escape sequences may appear in send
++     strings:
++
++    `\D'
++          send phone number without dialcode translation
++
++    `\T'
++          send phone number with dialcode translation
++
++     See the description of the dialcodes file (*note Configuration
++     File Names::) for a description of dialcode translation.
++
++     If both the port and the dialer support carrier, as set by the
++     `carrier' command in the port file and the `carrier' command in
++     the dialer file, then every chat script implicitly begins with
++     `\M' and ends with `\m'.
++
++     There is no default chat script for dialers.
++
++     The following additional escape sequences may be used in
++     `chat-program':
++
++    `\D'
++          phone number without dialcode translation
++
++    `\T'
++          phone number with dialcode translation
++
++     If the program changes the port in any way (e.g., sets parity) the
++     changes will be preserved during protocol negotiation, but once the
++     protocol is selected it will change the port settings.
++
++`dialtone STRING'
++     A string to output when dialing the phone number which causes the
++     modem to wait for a secondary dial tone.  This is used to
++     translate the `=' character in a phone number.  The default is a
++     comma.
++
++`pause STRING'
++     A string to output when dialing the phone number which causes the
++     modem to wait for 1 second.  This is used to translate the `-'
++     character in a phone number.  The default is a comma.
++
++`carrier BOOLEAN'
++     An argument of true means that the dialer supports the modem
++     carrier signal.  After the phone number is dialed, `uucico' will
++     require that carrier be on.  One some systems, it will be able to
++     wait for it.  If the argument is false, carrier will not be
++     required.  The default is true.
++
++`carrier-wait NUMBER'
++     If the port is supposed to wait for carrier, this may be used to
++     indicate how many seconds to wait.  The default is 60 seconds.
++     Only some systems support waiting for carrier.
++
++`dtr-toggle BOOLEAN BOOLEAN'
++     If the first argument is true, then DTR is toggled before using
++     the modem.  This is only supported on some systems and some ports.
++     The second BOOLEAN need not be present; if it is, and it is true,
++     the program will sleep for 1 second after toggling DTR.  The
++     default is to not toggle DTR.
++
++`complete-chat STRINGS'
++
++`complete-chat-timeout NUMBER'
++
++`complete-chat-fail STRING'
++
++`complete-chat-seven-bit BOOLEAN'
++
++`complete-chat-program STRINGS'
++     These commands define a chat script (*note Chat Scripts::) which
++     is run when a call is finished normally.  This allows the modem to
++     be reset.  There is no default.  No additional escape sequences
++     may be used.
++
++`complete STRING'
++     This is a simple use of `complete-chat'.  It is equivalent to
++     `complete-chat "" STRING'; this has the effect of sending STRING
++     to the modem when a call finishes normally.
++
++`abort-chat STRINGS'
++
++`abort-chat-timeout NUMBER'
++
++`abort-chat-fail STRING'
++
++`abort-chat-seven-bit BOOLEAN'
++
++`abort-chat-program STRINGS'
++     These commands define a chat script (*note Chat Scripts::) to be
++     run when a call is aborted.  They may be used to interrupt and
++     reset the modem.  There is no default.  No additional escape
++     sequences may be used.
++
++`abort STRING'
++     This is a simple use of `abort-chat'.  It is equivalent to
++     `abort-chat "" STRING'; this has the effect of sending STRING to
++     the modem when a call is aborted.
++
++`protocol-parameter CHARACTER STRINGS'
++     Set protocol parameters, just like the `protocol-parameter' command
++     in the system configuration file or the port configuration file;
++     see *note Protocol Selection::.  These parameters take precedence,
++     then those for the port, then those for the system.
++
++`seven-bit BOOLEAN'
++     This is only used during protocol negotiation; if it is true, it
++     forces selection of a protocol which works across a seven-bit
++     link.  It does not prevent eight bit characters from being
++     transmitted.  The default is false.  It would be more common to
++     specify this for a port than for a dialer.
++
++`reliable BOOLEAN'
++     This is only used during protocol negotiation; if it is false, it
++     forces selection of a protocol which works across an unreliable
++     communication link.  The default is true.
++
++`half-duplex BOOLEAN [ any type ]'
++     If the argument is true, it means that the dialer only supports
++     half-duplex connections.  This only affects bidirectional
++     protocols, and causes them to not do bidirectional transfers.
++
++
++\x1f
++File: uucp.info,  Node: UUCP Over TCP,  Next: Security,  Prev: dial File,  Up: Configuration Files
++
++5.10 UUCP Over TCP
++==================
++
++If your system has a Berkeley style socket library, or a System V style
++TLI interface library, you can compile the code to permit making
++connections over TCP.  Specifying that a system should be reached via
++TCP is easy, but nonobvious.
++
++* Menu:
++
++* TCP Client::                  Connecting to Another System Over TCP
++* TCP Server::                  Running a TCP Server
++
++\x1f
++File: uucp.info,  Node: TCP Client,  Next: TCP Server,  Prev: UUCP Over TCP,  Up: UUCP Over TCP
++
++5.10.1 Connecting to Another System Over TCP
++--------------------------------------------
++
++If you are using the new style configuration files (*note Configuration
++Files::), add the line `port type tcp' to the entry in the `sys' file.
++By default UUCP will get the port number by looking up `uucp' in
++`/etc/services'; if the `uucp' service is not defined, port 540 will be
++used.  You can set the port number to use with the command `port
++service XXX', where XXX can be either a number or a name to look up in
++`/etc/services'.  You can specify the address of the remote host with
++`address A.B.C'; if you don't give an address, the remote system name
++will be used.  You should give an explicit chat script for the system
++when you use TCP; the default chat script begins with a carriage
++return, which will not work with some UUCP TCP servers.
++
++   If you are using V2 configuration files, add a line like this to
++`L.sys':
++     SYS Any TCP uucp HOST.DOMAIN chat-script
++   This will make an entry for system SYS, to be called at any time,
++over TCP, using port number `uucp' (as found in `/etc/services'; this
++may be specified as a number), using remote host `HOST.DOMAIN', with
++some chat script.
++
++   If you are using HDB configuration files, add a line like this to
++Systems:
++     SYS Any TCP - HOST.DOMAIN chat-script
++   and a line like this to `Devices':
++     TCP uucp - -
++   You only need one line in `Devices' regardless of how many systems
++you contact over TCP.  This will make an entry for system SYS, to be
++called at any time, over TCP, using port number `uucp' (as found in
++`/etc/services'; this may be specified as a number), using remote host
++`HOST.DOMAIN', with some chat script.
++
++\x1f
++File: uucp.info,  Node: TCP Server,  Prev: TCP Client,  Up: UUCP Over TCP
++
++5.10.2 Running a TCP Server
++---------------------------
++
++The `uucico' daemon may be run as a TCP server.  To use the default
++port number, which is a reserved port, `uucico' must be invoked by the
++superuser (or it must be set user ID to the superuser, but I don't
++recommend doing that).
++
++   You must define a port, either using the port file (*note port
++File::), if you are using the new configuration method, or with an
++entry in `Devices' if you are using HDB; there is no way to define a
++port using V2.  If you are using HDB the port must be named `TCP'; a
++line as shown above will suffice.  You can then start `uucico' as
++`uucico -p TCP' (after the `-p', name the port; in HDB it must be
++`TCP').  This will wait for incoming connections, and fork off a child
++for each one.  Each connection will be prompted with `login:' and
++`Password:'; the results will be checked against the UUCP (not the
++system) password file (*note Configuration File Names::).
++
++   Another way to run a UUCP TCP server is to use the BSD `uucpd'
++program.
++
++   Yet another way to run a UUCP TCP server is to use `inetd'.  Arrange
++for `inetd' to start up `uucico' with the `-l' switch.  This will cause
++`uucico' to prompt with `login:' and `Password:' and check the results
++against the UUCP (not the system) password file (you may want to also
++use the `-D' switch to avoid a fork, which in this case is unnecessary).
++
++\x1f
++File: uucp.info,  Node: Security,  Prev: UUCP Over TCP,  Up: Configuration Files
++
++5.11 Security
++=============
++
++This discussion of UUCP security applies only to Unix.  It is a bit
++cursory; suggestions for improvement are solicited.
++
++   UUCP is traditionally not very secure.  Taylor UUCP addresses some
++security issues, but is still far from being a secure system.
++
++   If security is very important to you, then you should not permit any
++external access to your computer, including UUCP.  Any opening to the
++outside world is a potential security risk.
++
++   When local users use UUCP to transfer files, Taylor UUCP can do
++little to secure them from each other.  You can allow somewhat increased
++security by putting the owner of the UUCP programs (normally `uucp')
++into a separate group; the use of this is explained in the following
++paragraphs, which refer to this separate group as `uucp-group'.
++
++   When the `uucp' program is invoked to copy a file to a remote
++system, it will, by default, copy the file into the UUCP spool
++directory.  When the `uux' program is used, the `-C' switch must be
++used to copy the file into the UUCP spool directory.  In any case, once
++the file has been copied into the spool directory, other local users
++will not be able to access it.
++
++   When a file is requested from a remote system, UUCP will only permit
++it to be placed in a directory which is writable by the requesting user.
++The directory must also be writable by UUCP.  A local user can create a
++directory with a group of `uucp-group' and set the mode to permit group
++write access.  This will allow the file be requested without permitting
++it to be viewed by any other user.
++
++   There is no provision for security for `uucp' requests (as opposed
++to `uux' requests) made by a user on a remote system.  A file sent over
++by a remote request may only be placed in a directory which is world
++writable, and the file will be world readable and writable.  This will
++permit any local user to destroy or replace the contents of the file.
++A file requested by a remote system must be world readable, and the
++directory it is in must be world readable.  Any local user will be able
++to examine, although not necessarily modify, the file before it is sent.
++
++   There are some security holes and race conditions that apply to the
++above discussion which I will not elaborate on.  They are not hidden
++from anybody who reads the source code, but they are somewhat technical
++and difficult (though scarcely impossible) to exploit.  Suffice it to
++say that even under the best of conditions UUCP is not completely
++secure.
++
++   For many sites, security from remote sites is a more important
++consideration.  Fortunately, Taylor UUCP does provide some support in
++this area.
++
++   The greatest security is provided by always dialing out to the other
++site.  This prevents anybody from pretending to be the other site.  Of
++course, only one side of the connection can do this.
++
++   If remote dialins must be permitted, then it is best if the dialin
++line is used only for UUCP.  If this is the case, then you should
++create a call-in password file (*note Configuration File Names::) and
++let `uucico' do its own login prompting.  For example, to let remote
++sites log in on a port named `entry' in the port file (*note port
++File::), you might invoke `uucico -e -p entry'.  This would cause
++`uucico' to enter an endless loop of login prompts and daemon
++executions.  The advantage of this approach is that even if remote users
++break into the system by guessing or learning the password, they will
++only be able to do whatever `uucico' permits them to do.  They will not
++be able to start a shell on your system.
++
++   If remote users can dial in and log on to your system, then you have
++a security hazard more serious than that posed by UUCP.  But then, you
++probably knew that already.
++
++   Once your system has connected with the remote UUCP, there is a fair
++amount of control you can exercise.  You can use the `remote-send' and
++`remote-receive' commands to control the directories the remote UUCP
++can access.  You can use the `request' command to prevent the remote
++UUCP from making any requests of your system at all; however, if you do
++this it will not even be able to send you mail or news.  If you do
++permit remote requests, you should be careful to restrict what commands
++may be executed at the remote system's request.  The default is `rmail'
++and `rnews', which will suffice for most systems.
++
++   If different remote systems call in and they must be granted
++different privileges (perhaps some systems are within the same
++organization and some are not) then the `called-login' command should
++be used for each system to require that they use different login names.
++Otherwise, it would be simple for a remote system to use the `myname'
++command and pretend to be a different system.  The `sequence' command
++can be used to detect when one system pretended to be another, but,
++since the sequence numbers must be reset manually after a failed
++handshake, this can sometimes be more trouble than it's worth.
++
++\x1f
++File: uucp.info,  Node: Protocols,  Next: Hacking,  Prev: Configuration Files,  Up: Top
++
++6 UUCP Protocol Internals
++*************************
++
++This chapter describes how the various UUCP protocols work, and
++discusses some other internal UUCP issues.
++
++   This chapter is quite technical.  You do not need to understand it,
++or even read it, in order to use Taylor UUCP.  It is intended for people
++who are interested in how the UUCP code works.
++
++   The information in this chapter is posted monthly to the Usenet
++newsgroups `comp.mail.uucp', `news.answers', and `comp.answers'.  The
++posting is available from any `news.answers' archive site, such as
++`rtfm.mit.edu'.  If you plan to use this information to write a UUCP
++program, please make sure you get the most recent version of the
++posting, in case there have been any corrections.
++
++* Menu:
++
++* UUCP Protocol Sources::       Sources for UUCP Protocol Information
++* UUCP Grades::                 UUCP Grades
++* UUCP Lock Files::             UUCP Lock Files
++* Execution File Format::       Execution File Format
++* UUCP Protocol::               UUCP Protocol
++* g Protocol::                  g protocol
++* f Protocol::                  f protocol
++* t Protocol::                  t protocol
++* e Protocol::                  e protocol
++* Big G Protocol::              G protocol
++* i Protocol::                  i protocol
++* j Protocol::                  j protocol
++* x Protocol::                  x protocol
++* y Protocol::                  y protocol
++* d Protocol::                  d protocol
++* h Protocol::                  h protocol
++* v Protocol::                  v protocol
++
++\x1f
++File: uucp.info,  Node: UUCP Protocol Sources,  Next: UUCP Grades,  Prev: Protocols,  Up: Protocols
++
++6.1 UUCP Protocol Sources
++=========================
++
++     "Unix-to-Unix Copy Program," said PDP-1.  "You will never find a
++     more wretched hive of bugs and flamers.  We must be cautious."
++                                                              --DECWars
++
++I took a lot of the information from Jamie E. Hanrahan's paper in the
++Fall 1990 DECUS Symposium, and from `Managing UUCP and Usenet' by Tim
++O'Reilly and Grace Todino (with contributions by several other people).
++The latter includes most of the former, and is published by
++     O'Reilly & Associates, Inc.
++     103 Morris Street, Suite A
++     Sebastopol, CA 95472
++   It is currently in its tenth edition.  The ISBN number is
++`0-937175-93-5'.
++
++   Some information is originally due to a Usenet article by Chuck
++Wegrzyn.  The information on execution files comes partially from Peter
++Honeyman.  The information on the `g' protocol comes partially from a
++paper by G.L. Chesson of Bell Laboratories, partially from Jamie E.
++Hanrahan's paper, and partially from source code by John Gilmore.  The
++information on the `f' protocol comes from the source code by Piet
++Berteema.  The information on the `t' protocol comes from the source
++code by Rick Adams.  The information on the `e' protocol comes from a
++Usenet article by Matthias Urlichs.  The information on the `d'
++protocol comes from Jonathan Clark, who also supplied information about
++QFT.  The UUPlus information comes straight from Christopher J. Ambler,
++of UUPlus Development; it applies to version 1.52 and up of the
++shareware version of UUPlus Utilities, called FSUUCP 1.52, but referred
++to in this article as UUPlus.
++
++   Although there are few books about UUCP, there are many about
++networks and protocols in general.  I recommend two non-technical books
++which describe the sorts of things that are available on the network:
++`The Whole Internet', by Ed Krol, and `Zen and the Art of the
++Internet', by Brendan P. Kehoe.  Good technical discussions of
++networking issues can be found in `Internetworking with TCP/IP', by
++Douglas E. Comer and David L. Stevens and in `Design and Validation of
++Computer Protocols' by Gerard J. Holzmann.
++
++\x1f
++File: uucp.info,  Node: UUCP Grades,  Next: UUCP Lock Files,  Prev: UUCP Protocol Sources,  Up: Protocols
++
++6.2 UUCP Grades
++===============
++
++Modern UUCP packages support a priority grade for each command.  The
++grades generally range from `A' (the highest) to `Z' followed by `a' to
++`z'.  Some UUCP packages (including Taylor UUCP) also support `0' to
++`9' before `A'.  Some UUCP packages may permit any ASCII character as a
++grade.
++
++   On Unix, these grades are encoded in the name of the command file
++created by `uucp' or `uux'.  A command file name generally has the form
++`C.nnnngssss' where `nnnn' is the remote system name for which the
++command is queued, `g' is a single character grade, and `ssss' is a
++four character sequence number.  For example, a command file created
++for the system `airs' at grade `Z' might be named `C.airsZ2551'.
++
++   The remote system name will be truncated to seven characters, to
++ensure that the command file name will fit in the 14 character file
++name limit of the traditional Unix file system.  UUCP packages which
++have no other means of distinguishing which command files are intended
++for which systems thus require all systems they connect to to have
++names that are unique in the first seven characters.  Some UUCP
++packages use a variant of this format which truncates the system name
++to six characters.  HDB and Taylor UUCP use a different spool directory
++format, which allows up to fourteen characters to be used for each
++system name.
++
++   The sequence number in the command file name may be a decimal
++integer, or it may be a hexadecimal integer, or it may contain any
++alphanumeric character.  Different UUCP packages are different.  Taylor
++UUCP uses any alphanumeric character.
++
++   UUPlus Utilities (as FSUUCP, a shareware DOS based UUCP and news
++package) uses up to 8 characters for file names in the spool (this is a
++DOS file system limitation; actually, with the extension, 11 characters
++are available, but FSUUCP reserves that for future use).  FSUUCP
++defaults mail to grade `D', and news to grade `N', except that when the
++grade of incoming mail can be determined, that grade is preserved if
++the mail is forwarded to another system. The default grades may be
++changed by editing the `LIB/MAILRC' file for mail, or the `UUPLUS.CFG'
++file for news.
++
++   UUPC/extended for DOS, OS/2 and Windows NT handles mail at grade
++`C', news at grade `d', and file transfers at grade `n'.  The
++UUPC/extended `UUCP' and `RMAIL' commands accept grades to override the
++default, the others do not.
++
++   I do not know how command grades are handled in other non-Unix UUCP
++packages.
++
++   Modern UUCP packages allow you to restrict file transfer by grade
++depending on the time of day.  Typically this is done with a line in
++the `Systems' (or `L.sys') file like this:
++         airs Any/Z,Any2305-0855 ...
++   This allows grades `Z' and above to be transferred at any time.
++Lower grades may only be transferred at night.  I believe that this
++grade restriction applies to local commands as well as to remote
++commands, but I am not sure.  It may only apply if the UUCP package
++places the call, not if it is called by the remote system.
++
++   Taylor UUCP can use the `timegrade' and `call-timegrade' commands to
++achieve the same effect.  *Note When to Call::.  It supports the above
++format when reading `Systems' or `L.sys'.
++
++   UUPC/extended provides the `symmetricgrades' option to announce the
++current grade in effect when calling the remote system.
++
++   UUPlus allows specification of the highest grade accepted on a
++per-call basis with the `-g' option in `UUCICO'.
++
++   This sort of grade restriction is most useful if you know what grades
++are being used at the remote site.  The default grades used depend on
++the UUCP package.  Generally `uucp' and `uux' have different defaults.
++A particular grade can be specified with the `-g' option to `uucp' or
++`uux'.  For example, to request execution of `rnews' on `airs' with
++grade `d', you might use something like
++         uux -gd - airs!rnews < article
++
++   Uunet queues up mail at grade `C', but increases the grade based on
++the size.  News is queued at grade `d', and file transfers at grade
++`n'.  The example above would allow mail (below some large size) to be
++received at any time, but would only permit news to be transferred at
++night.
++
++\x1f
++File: uucp.info,  Node: UUCP Lock Files,  Next: Execution File Format,  Prev: UUCP Grades,  Up: Protocols
++
++6.3 UUCP Lock Files
++===================
++
++This discussion applies only to Unix.  I have no idea how UUCP locks
++ports on other systems.
++
++   UUCP creates files to lock serial ports and systems.  On most, if not
++all, systems, these same lock files are also used by `cu' to coordinate
++access to serial ports.  On some systems `getty' also uses these lock
++files, often under the name `uugetty'.
++
++   The lock file normally contains the process ID of the locking
++process.  This makes it easy to determine whether a lock is still
++valid.  The algorithm is to create a temporary file and then link it to
++the name that must be locked.  If the link fails because a file with
++that name already exists, the existing file is read to get the process
++ID.  If the process still exists, the lock attempt fails.  Otherwise
++the lock file is deleted and the locking algorithm is retried.
++
++   Older UUCP packages put the lock files in the main UUCP spool
++directory, `/usr/spool/uucp'.  HDB UUCP generally puts the lock files
++in a directory of their own, usually `/usr/spool/locks' or `/etc/locks'.
++
++   The original UUCP lock file format encodes the process ID as a four
++byte binary number.  The order of the bytes is host-dependent.  HDB UUCP
++stores the process ID as a ten byte ASCII decimal number, with a
++trailing newline.  For example, if process 1570 holds a lock file, it
++would contain the eleven characters space, space, space, space, space,
++space, one, five, seven, zero, newline.  Some versions of UUCP add a
++second line indicating which program created the lock (`uucp', `cu', or
++`getty/uugetty').  I have also seen a third type of UUCP lock file
++which does not contain the process ID at all.
++
++   The name of the lock file is traditionally `LCK..' followed by the
++base name of the device.  For example, to lock `/dev/ttyd0' the file
++`LCK..ttyd0' would be created.  On SCO Unix, the last letter of the
++lock file name is always forced to lower case even if the device name
++ends with an upper case letter.
++
++   System V Release 4 UUCP names the lock file using the major and minor
++device numbers rather than the device name.  The file is named
++`LK.XXX.YYY.ZZZ', where XXX, YYY and ZZZ are all three digit decimal
++numbers.  XXX is the major device number of the device holding the
++directory holding the device file (e.g., `/dev').  YYY is the major
++device number of the device file itself.  ZZZ is the minor device
++number of the device file itself.  If `s' holds the result of passing
++the device to the stat system call (e.g., `stat ("/dev/ttyd0", &s)'),
++the following line of C code will print out the corresponding lock file
++name:
++         printf ("LK.%03d.%03d.%03d", major (s.st_dev),
++                 major (s.st_rdev), minor (s.st_rdev));
++   The advantage of this system is that even if there are several links
++to the same device, they will all use the same lock file name.
++
++   When two or more instances of `uuxqt' are executing, some sort of
++locking is needed to ensure that a single execution job is only started
++once.  I don't know how most UUCP packages deal with this.  Taylor UUCP
++uses a lock file for each execution job.  The name of the lock file is
++the same as the name of the `X.*' file, except that the initial `X' is
++changed to an `L'.  The lock file holds the process ID as described
++above.
++
++\x1f
++File: uucp.info,  Node: Execution File Format,  Next: UUCP Protocol,  Prev: UUCP Lock Files,  Up: Protocols
++
++6.4 Execution File Format
++=========================
++
++UUCP `X.*' files control program execution.  They are created by `uux'.
++They are transferred between systems just like any other file.  The
++`uuxqt' daemon reads them to figure out how to execute the job
++requested by `uux'.
++
++   An `X.*' file is simply a text file.  The first character of each
++line is a command, and the remainder of the line supplies arguments.
++The following commands are defined:
++
++`C command'
++     This gives the command to execute, including the program and all
++     arguments.  For example, `rmail ian@airs.com'.
++
++`U user system'
++     This names the user who requested the command, and the system from
++     which the request came.
++
++`I standard-input'
++     This names the file from which standard input is taken.  If no
++     standard input file is given, the standard input will probably be
++     attached to `/dev/null'.  If the standard input file is not from
++     the system on which the execution is to occur, it will also appear
++     in an `F' command.
++
++`O standard-output [system]'
++     This names the standard output file.  The optional second argument
++     names the system to which the file should be sent.  If there is no
++     second argument, the file should be created on the executing
++     system.
++
++`F required-file [filename-to-use]'
++     The `F' command can appear multiple times.  Each `F' command names
++     a file which must exist before the execution can proceed.  This
++     will usually be a file which is transferred from the system on
++     which `uux' was executed, but it can also be a file from the local
++     system or some other system.  If the file is not from the local
++     system, then the command will usually name a file in the spool
++     directory.  If the optional second argument appears, then the file
++     should be copied to the execution directory under that name.  This
++     is necessary for any file other than the standard input file.  If
++     the standard input file is not from the local system, it will
++     appear in both an `F' command and an `I' command.
++
++`R requestor-address'
++     This is the address to which mail about the job should be sent.
++     It is relative to the system named in the `U' command.  If the `R'
++     command does not appear, then mail is sent to the user named in the
++     `U' command.
++
++`Z'
++     This command takes no arguments.  It means that a mail message
++     should be sent if the command failed.  This is the default
++     behaviour for most modern UUCP packages, and for them the `Z'
++     command does not actually do anything.
++
++`N'
++     This command takes no arguments.  It means that no mail message
++     should be sent, even if the command failed.
++
++`n'
++     This command takes no arguments.  It means that a mail message
++     should be sent if the command succeeded.  Normally a message is
++     sent only if the command failed.
++
++`B'
++     This command takes no arguments.  It means that the standard input
++     should be returned with any error message.  This can be useful in
++     cases where the input would otherwise be lost.
++
++`e'
++     This command takes no arguments.  It means that the command should
++     be processed with `/bin/sh'.  For some packages this is the default
++     anyhow.  Most packages will refuse to execute complex commands or
++     commands containing wildcards, because of the security holes this
++     opens.
++
++`E'
++     This command takes no arguments.  It means that the command should
++     be processed with the `execve' system call.  For some packages
++     this is the default anyhow.
++
++`M status-file'
++     This command means that instead of mailing a message, the message
++     should be copied to the named file on the system named by the `U'
++     command.
++
++`Q'
++     This command takes no arguments.  It means that the string
++     arguments to all the other commands are backslash quoted.  Any
++     backslash in one of the strings should be followed by either a
++     backslash or three octal digits.  The backslash quoting is
++     interpreted as in a C string.  If the `Q' command does not appear,
++     backslashes in the strings are not treated specially.  The `Q'
++     command was introduced in Taylor UUCP version 1.07.
++
++`# comment'
++     This command is ignored, as is any other unrecognized command.
++
++   Here is an example.  Given the following command executed on system
++test1
++         uux - test2!cat - test2!~ian/bar !qux '>~/gorp'
++   (this is only an example, as most UUCP systems will not permit the
++cat command to be executed) Taylor UUCP will produce something like the
++following `X.'  file:
++     U ian test1
++     F D.test1N003r qux
++     O /usr/spool/uucppublic/gorp test1
++     F D.test1N003s
++     I D.test1N003s
++     C cat - ~ian/bar qux
++   The standard input will be read into a file and then transferred to
++the file `D.test1N003s' on system `test2'.  The file `qux' will be
++transferred to `D.test1N003r' on system `test2'.  When the command is
++executed, the latter file will be copied to the execution directory
++under the name `qux'.  Note that since the file `~ian/bar' is already
++on the execution system, no action need be taken for it.  The standard
++output will be collected in a file, then copied to the file
++`/usr/spool/uucppublic/gorp' on the system `test1'.
++
++\x1f
++File: uucp.info,  Node: UUCP Protocol,  Next: g Protocol,  Prev: Execution File Format,  Up: Protocols
++
++6.5 UUCP Protocol
++=================
++
++The UUCP protocol is a conversation between two UUCP packages.  A UUCP
++conversation consists of three parts: an initial handshake, a series of
++file transfer requests, and a final handshake.
++
++* Menu:
++
++* The Initial Handshake::       The Initial Handshake
++* UUCP Protocol Commands::      UUCP Protocol Commands
++* The Final Handshake::         The Final Handshake
++
++\x1f
++File: uucp.info,  Node: The Initial Handshake,  Next: UUCP Protocol Commands,  Prev: UUCP Protocol,  Up: UUCP Protocol
++
++6.5.1 The Initial Handshake
++---------------------------
++
++Before the initial handshake, the caller will usually have logged in the
++called machine and somehow started the UUCP package there.  On Unix this
++is normally done by setting the shell of the login name used to
++`/usr/lib/uucp/uucico'.
++
++   All messages in the initial handshake begin with a `^P' (a byte with
++the octal value `\020') and end with a null byte (`\000').  A few
++systems end these messages with a line feed character (`\012') instead
++of a null byte; the examples below assume a null byte is being used.
++
++   Some options below are supported by QFT, which stands for Queued File
++Transfer, and is (or was) an internal Bell Labs version of UUCP.
++
++   Taylor UUCP size negotiation was introduced by Taylor UUCP, and is
++also supported by DOS based UUPlus and Amiga based wUUCP and UUCP-1.17.
++
++   The initial handshake goes as follows.  It is begun by the called
++machine.
++
++called: `\020Shere=hostname\000'
++     The hostname is the UUCP name of the called machine.  Older UUCP
++     packages do not output it, and simply send `\020Shere\000'.
++
++caller: `\020Shostname options\000'
++     The hostname is the UUCP name of the calling machine.  The
++     following options may appear (or there may be none):
++
++    `-QSEQ'
++          Report sequence number for this conversation.  The sequence
++          number is stored at both sites, and incremented after each
++          call.  If there is a sequence number mismatch, something has
++          gone wrong (somebody may have broken security by pretending
++          to be one of the machines) and the call is denied.  If the
++          sequence number changes on one of the machines, perhaps
++          because of an attempted breakin or because a disk backup was
++          restored, the sequence numbers on the two machines must be
++          reconciled manually.
++
++    `-xLEVEL'
++          Requests the called system to set its debugging level to the
++          specified value.  This is not supported by all systems.
++
++    `-pGRADE'
++    `-vgrade=GRADE'
++          Requests the called system to only transfer files of the
++          specified grade or higher.  This is not supported by all
++          systems.  Some systems support `-p', some support `-vgrade='.
++          UUPlus allows either `-p' or `-v' to be specified on a
++          per-system basis in the `SYSTEMS' file (`gradechar' option).
++
++    `-R'
++          Indicates that the calling UUCP understands how to restart
++          failed file transmissions.  Supported only by System V
++          Release 4 UUCP, QFT, and Taylor UUCP.
++
++    `-ULIMIT'
++          Reports the ulimit value of the calling UUCP.  The limit is
++          specified as a base 16 number in C notation (e.g.,
++          `-U0x1000000').  This number is the number of 512 byte blocks
++          in the largest file which the calling UUCP can create.  The
++          called UUCP may not transfer a file larger than this.
++          Supported only by System V Release 4 UUCP, QFT and UUPlus.
++          UUPlus reports the lesser of the available disk space on the
++          spool directory drive and the ulimit variable in
++          `UUPLUS.CFG'.  Taylor UUCP understands this option, but does
++          not generate it.
++
++    `-N[NUMBER]'
++          Indicates that the calling UUCP understands the Taylor UUCP
++          size negotiation extension.  Not supported by traditional
++          UUCP packages.  Supported by UUPlus.  The optional number is
++          a bitmask of features supported by the calling UUCP, and is
++          described below.
++
++called: `\020ROK\000'
++     There are actually several possible responses.
++    `ROK'
++          The calling UUCP is acceptable, and the handshake proceeds to
++          the protocol negotiation.  Some options may also appear; see
++          below.
++
++    `ROKN[NUMBER]'
++          The calling UUCP is acceptable, it specified `-N', and the
++          called UUCP also understands the Taylor UUCP size limiting
++          extensions.  The optional number is a bitmask of features
++          supported by the called UUCP, and is described below.
++
++    `RLCK'
++          The called UUCP already has a lock for the calling UUCP,
++          which normally indicates the two machines are already
++          communicating.
++
++    `RCB'
++          The called UUCP will call back.  This may be used to avoid
++          impostors (but only one machine out of each pair should call
++          back, or no conversation will ever begin).
++
++    `RBADSEQ'
++          The call sequence number is wrong (see the `-Q' discussion
++          above).
++
++    `RLOGIN'
++          The calling UUCP is using the wrong login name.
++
++    `RYou are unknown to me'
++          The calling UUCP is not known to the called UUCP, and the
++          called UUCP does not permit connections from unknown systems.
++          Some versions of UUCP just drop the line rather than sending
++          this message.
++
++     If the response is `ROK', the following options are supported by
++     System V Release 4 UUCP and QFT.
++    `-R'
++          The called UUCP knows how to restart failed file
++          transmissions.
++
++    `-ULIMIT'
++          Reports the ulimit value of the called UUCP.  The limit is
++          specified as a base 16 number in C notation.  This number is
++          the number of 512 byte blocks in the largest file which the
++          called UUCP can create.  The calling UUCP may not send a file
++          larger than this.  Also supported by UUPlus.  Taylor UUCP
++          understands this option, but does not generate it.
++
++    `-xLEVEL'
++          I'm not sure just what this means.  It may request the
++          calling UUCP to set its debugging level to the specified
++          value.
++
++     If the response is not `ROK' (or `ROKN') both sides hang up the
++     phone, abandoning the call.
++
++called: `\020Pprotocols\000'
++     Note that the called UUCP outputs two strings in a row.  The
++     protocols string is a list of UUCP protocols supported by the
++     caller.  Each UUCP protocol has a single character name.  These
++     protocols are discussed in more detail later in this document.
++     For example, the called UUCP might send `\020Pgf\000'.
++
++caller: `\020Uprotocol\000'
++     The calling UUCP selects which protocol to use out of the protocols
++     offered by the called UUCP.  If there are no mutually supported
++     protocols, the calling UUCP sends `\020UN\000' and both sides hang
++     up the phone.  Otherwise the calling UUCP sends something like
++     `\020Ug\000'.
++
++   Most UUCP packages will consider each locally supported protocol in
++turn and select the first one supported by the called UUCP.  With some
++versions of HDB UUCP, this can be modified by giving a list of protocols
++after the device name in the `Devices' file or the `Systems' file.  For
++example, to select the `e' protocol in `Systems',
++         airs Any ACU,e ...
++   or in Devices,
++         ACU,e ttyXX ...
++   Taylor UUCP provides the `protocol' command which may be used either
++for a system (*note Protocol Selection::) or a port (*note port File::).
++UUPlus allows specification of the protocol string on a per-system basis
++in the `SYSTEMS' file.
++
++   The optional number following a `-N' sent by the calling system, or
++an `ROKN' sent by the called system, is a bitmask of features supported
++by the UUCP package.  The optional number was introduced in Taylor UUCP
++version 1.04.  The number is sent as an octal number with a leading
++zero.  The following bits are currently defined.  A missing number
++should be taken as `011'.
++
++`01'
++     UUCP supports size negotiation.
++
++`02'
++     UUCP supports file restart.
++
++`04'
++     UUCP supports the `E' command.
++
++`010'
++     UUCP requires the file size in the `S' and `R' commands to be in
++     base 10.  This bit is used by default if no number appears, but
++     should not be explicitly sent.
++
++`020'
++     UUCP expects a dummy string between the notify field and the size
++     field in an `S' command.  This is true of SVR4 UUCP.  This bit
++     should not be used.
++
++`040'
++     UUCP supports the `q' option in the `S', `R', `X', and `E'
++     commands.
++
++   After the protocol has been selected and the initial handshake has
++been completed, both sides turn on the selected protocol.  For some
++protocols (notably `g') a further handshake is done at this point.
++
++\x1f
++File: uucp.info,  Node: UUCP Protocol Commands,  Next: The Final Handshake,  Prev: The Initial Handshake,  Up: UUCP Protocol
++
++6.5.2 UUCP Protocol Commands
++----------------------------
++
++Each protocol supports a method for sending a command to the remote
++system.  This method is used to transmit a series of commands between
++the two UUCP packages.  At all times, one package is the master and the
++other is the slave.  Initially, the calling UUCP is the master.
++
++   If a protocol error occurs during the exchange of commands, both
++sides move immediately to the final handshake.
++
++   The master will send one of five commands: `S', `R', `X', `E', or
++`H'.
++
++   Any file name referred to below is either an absolute file name
++beginning with `/', a public directory file name beginning with `~/', a
++file name relative to a user's home directory beginning with `~USER/',
++or a spool directory file name.  File names in the spool directory are
++not absolute, but instead are converted to file names within the spool
++directory by UUCP.  They always begin with `C.' (for a command file
++created by `uucp' or `uux'), `D.' (for a data file created by `uucp',
++`uux' or by an execution, or received from another system for an
++execution), or `X.' (for an execution file created by `uux' or received
++from another system).
++
++   All the commands other than the `H' command support options.  The
++`q' option indicates that the command argument strings are backslash
++quoted.  If the `q' option appears, then any backslash in one of the
++arguments should be followed by either a backslash or three octal
++digits.  The backslash quoting is interpreted as in a C string.  If the
++`q' option does not appear, backslashes in the strings are not treated
++specially.  The `q' option was introduced in Taylor UUCP version 1.07.
++
++* Menu:
++
++* The S Command::               The S Command
++* The R Command::               The R Command
++* The X Command::               The X Command
++* The E Command::               The E Command
++* The H Command::               The H Command
++
++\x1f
++File: uucp.info,  Node: The S Command,  Next: The R Command,  Prev: UUCP Protocol Commands,  Up: UUCP Protocol Commands
++
++6.5.2.1 The S Command
++.....................
++
++master: `S FROM TO USER -OPTIONS TEMP MODE NOTIFY SIZE'
++     The `S' and the `-' are literal characters.  This is a request by
++     the master to send a file to the slave.
++
++    FROM
++          The name of the file to send.  If the `C' option does not
++          appear in OPTIONS, the master will actually open and send
++          this file.  Otherwise the file has been copied to the spool
++          directory, where it is named TEMP.  The slave ignores this
++          field unless TO is a directory, in which case the basename of
++          FROM will be used as the file name.  If FROM is a spool
++          directory filename, it must be a data file created for or by
++          an execution, and must begin with `D.'.
++
++    TO
++          The name to give the file on the slave.  If this field names
++          a directory the file is placed within that directory with the
++          basename of FROM.  A name ending in `/' is taken to be a
++          directory even if one does not already exist with that name.
++          If TO begins with `X.', an execution file will be created on
++          the slave.  Otherwise, if TO begins with `D.' it names a data
++          file to be used by some execution file.  Otherwise, TO should
++          not be in the spool directory.
++
++    USER
++          The name of the user who requested the transfer.
++
++    OPTIONS
++          A list of options to control the transfer.  The following
++          options are defined (all options are single characters):
++         `C'
++               The file has been copied to the spool directory (the
++               master should use TEMP rather than FROM).
++
++         `c'
++               The file has not been copied to the spool directory
++               (this is the default).
++
++         `d'
++               The slave should create directories as necessary (this
++               is the default).
++
++         `f'
++               The slave should not create directories if necessary,
++               but should fail the transfer instead.
++
++         `m'
++               The master should send mail to USER when the transfer is
++               complete.
++
++         `n'
++               The slave should send mail to NOTIFY when the transfer is
++               complete.
++
++         `q'
++               Backslash quoting is applied to the FROM, TO, USER, and
++               NOTIFY arguments.  *Note UUCP Protocol Commands::.  This
++               option was introduced in Taylor UUCP version 1.07.
++
++    TEMP
++          If the `C' option appears in OPTIONS, this names the file to
++          be sent.  Otherwise if FROM is in the spool directory, TEMP
++          is the same as FROM.  Otherwise TEMP may be a dummy string,
++          such as `D.0'.  After the transfer has been succesfully
++          completed, the master will delete the file TEMP.
++
++    MODE
++          This is an octal number giving the mode of the file on the
++          master.  If the file is not in the spool directory, the slave
++          will always create it with mode 0666, except that if (MODE &
++          0111) is not zero (the file is executable), the slave will
++          create the file with mode 0777.  If the file is in the spool
++          directory, some UUCP packages will use the algorithm above
++          and some will always create the file with mode 0600.  This
++          field is ignored by UUPlus, since it is meaningless on DOS;
++          UUPlus uses 0666 for outgoing files.
++
++    NOTIFY
++          This field may not be present, and in any case is only
++          meaningful if the `n' option appears in OPTIONS.  If the `n'
++          option appears, then, when the transfer is successfully
++          completed, the slave will send mail to NOTIFY, which must be
++          a legal mailing address on the slave.  If a SIZE field will
++          appear but the `n' option does not appear, NOTIFY will always
++          be present, typically as the string `dummy' or simply a pair
++          of double quotes.
++
++    SIZE
++          This field is only present when doing Taylor UUCP or SVR4
++          UUCP size negotiation.  It is the size of the file in bytes.
++          Taylor UUCP version 1.03 sends the size as a decimal integer,
++          while versions 1.04 and up, and all other UUCP packages that
++          support size negotiation, send the size in base 16 with a
++          leading 0x.
++
++     The slave then responds with an `S' command response.
++
++    `SY START'
++          The slave is willing to accept the file, and file transfer
++          begins.  The START field will only be present when using file
++          restart.  It specifies the byte offset into the file at which
++          to start sending.  If this is a new file, START will be 0x0.
++
++    `SN2'
++          The slave denies permission to transfer the file.  This can
++          mean that the destination directory may not be accessed, or
++          that no requests are permitted.  It implies that the file
++          transfer will never succeed.
++
++    `SN4'
++          The slave is unable to create the necessary temporary file.
++          This implies that the file transfer might succeed later.
++
++    `SN6'
++          This is only used by Taylor UUCP size negotiation.  It means
++          that the slave considers the file too large to transfer at
++          the moment, but it may be possible to transfer it at some
++          other time.
++
++    `SN7'
++          This is only used by Taylor UUCP size negotiation.  It means
++          that the slave considers the file too large to ever transfer.
++
++    `SN8'
++          This is only used by Taylor UUCP.  It means that the file was
++          already received in a previous conversation.  This can happen
++          if the receive acknowledgement was lost after it was sent by
++          the receiver but before it was received by the sender.
++
++    `SN9'
++          This is only used by Taylor UUCP (versions 1.05 and up) and
++          UUPlus (versions 2.0 and up).  It means that the remote
++          system was unable to open another channel (see the discussion
++          of the `i' protocol for more information about channels).
++          This implies that the file transfer might succeed later.
++
++    `SN10'
++          This is reportedly used by SVR4 UUCP to mean that the file
++          size is too large.
++
++     If the slave responds with `SY', a file transfer begins.  When the
++     file transfer is complete, the slave sends a `C' command response.
++
++    `CY'
++          The file transfer was successful.
++
++    `CYM'
++          The file transfer was successful, and the slave wishes to
++          become the master; the master should send an `H' command,
++          described below.
++
++    `CN5'
++          The temporary file could not be moved into the final
++          location.  This implies that the file transfer will never
++          succeed.
++
++After the `C' command response has been received (in the `SY' case) or
++immediately (in an `SN' case) the master will send another command.
++
++\x1f
++File: uucp.info,  Node: The R Command,  Next: The X Command,  Prev: The S Command,  Up: UUCP Protocol Commands
++
++6.5.2.2 The R Command
++.....................
++
++master: `R FROM TO USER -OPTIONS SIZE'
++     The `R' and the `-' are literal characters.  This is a request by
++     the master to receive a file from the slave.  I do not know how
++     SVR4 UUCP or QFT implement file transfer restart in this case.
++
++    FROM
++          This is the name of the file on the slave which the master
++          wishes to receive.  It must not be in the spool directory,
++          and it may not contain any wildcards.
++
++    TO
++          This is the name of the file to create on the master.  I do
++          not believe that it can be a directory.  It may only be in
++          the spool directory if this file is being requested to
++          support an execution either on the master or on some system
++          other than the slave.
++
++    USER
++          The name of the user who requested the transfer.
++
++    OPTIONS
++          A list of options to control the transfer.  The following
++          options are defined (all options are single characters):
++         `d'
++               The master should create directories as necessary (this
++               is the default).
++
++         `f'
++               The master should not create directories if necessary,
++               but should fail the transfer instead.
++
++         `m'
++               The master should send mail to USER when the transfer is
++               complete.
++
++         `q'
++               Backslash quoting is applied to the FROM, TO, and USER
++               arguments.  *Note UUCP Protocol Commands::.  This option
++               was introduced in Taylor UUCP version 1.07.
++
++    SIZE
++          This only appears if Taylor UUCP size negotiation is being
++          used.  It specifies the largest file which the master is
++          prepared to accept (when using SVR4 UUCP or QFT, this was
++          specified in the `-U' option during the initial handshake).
++
++     The slave then responds with an `R' command response.  UUPlus does
++     not support `R' requests, and always responds with `RN2'.
++
++    `RY MODE [SIZE]'
++          The slave is willing to send the file, and file transfer
++          begins.  The MODE argument is the octal mode of the file on
++          the slave.  The master treats this just as the slave does the
++          MODE argument in the send command, q.v.  I am told that SVR4
++          UUCP sends a trailing SIZE argument.  For some versions of
++          BSD UUCP, the MODE argument may have a trailing `M' character
++          (e.g., `RY 0666M').  This means that the slave wishes to
++          become the master.
++
++    `RN2'
++          The slave is not willing to send the file, either because it
++          is not permitted or because the file does not exist.  This
++          implies that the file request will never succeed.
++
++    `RN6'
++          This is only used by Taylor UUCP size negotiation.  It means
++          that the file is too large to send, either because of the
++          size limit specifies by the master or because the slave
++          considers it too large.  The file transfer might succeed
++          later, or it might not (this may be cleared up in a later
++          release of Taylor UUCP).
++
++    `RN9'
++          This is only used by Taylor UUCP (versions 1.05 and up) and
++          FSUUCP (versions 1.5 and up).  It means that the remote
++          system was unable to open another channel (see the discussion
++          of the `i' protocol for more information about channels).
++          This implies that the file transfer might succeed later.
++
++     If the slave responds with `RY', a file transfer begins.  When the
++     file transfer is complete, the master sends a `C' command.  The
++     slave pretty much ignores this, although it may log it.
++
++    `CY'
++          The file transfer was successful.
++
++    `CN5'
++          The temporary file could not be moved into the final location.
++
++     After the `C' command response has been sent (in the `RY' case) or
++     immediately (in an `RN' case) the master will send another command.
++
++\x1f
++File: uucp.info,  Node: The X Command,  Next: The E Command,  Prev: The R Command,  Up: UUCP Protocol Commands
++
++6.5.2.3 The X Command
++.....................
++
++master: `X FROM TO USER -OPTIONS'
++     The `X' and the `-' are literal characters.  This is a request by
++     the master to, in essence, execute uucp on the slave.  The slave
++     should execute `uucp FROM TO'.
++
++    FROM
++          This is the name of the file or files on the slave which the
++          master wishes to transfer.  Any wildcards are expanded on the
++          slave.  If the master is requesting that the files be
++          transferred to itself, the request would normally contain
++          wildcard characters, since otherwise an `R' command would
++          suffice.  The master can also use this command to request
++          that the slave transfer files to a third system.
++
++    TO
++          This is the name of the file or directory to which the files
++          should be transferred.  This will normally use a UUCP name.
++          For example, if the master wishes to receive the files
++          itself, it would use `master!path'.
++
++    USER
++          The name of the user who requested the transfer.
++
++    OPTIONS
++          A list of options to control the transfer.  As far as I know,
++          only one option is defined:
++         `q'
++               Backslash quoting is applied to the FROM, TO, and USER
++               arguments.  *Note UUCP Protocol Commands::.  This option
++               was introduced in Taylor UUCP version 1.07.
++
++     The slave then responds with an `X' command response.  FSUUCP does
++     not support `X' requests, and always responds with `XN'.
++
++    `XY'
++          The request was accepted, and the appropriate file transfer
++          commands have been queued up for later processing.
++
++    `XN'
++          The request was denied.  No particular reason is given.
++
++     In either case, the master will then send another command.
++
++\x1f
++File: uucp.info,  Node: The E Command,  Next: The H Command,  Prev: The X Command,  Up: UUCP Protocol Commands
++
++6.5.2.4 The E Command
++.....................
++
++master: `E FROM TO USER -OPTIONS TEMP MODE NOTIFY SIZE COMMAND'
++     The `E' command is only supported by Taylor UUCP 1.04 and up.  It
++     is used to make an execution request without requiring a separate
++     `X.*' file.  *Note Execution File Format::.  It is only used when
++     the command to be executed requires a single input file which is
++     passed to it as standard input.
++
++     All the fields have the same meaning as they do for an `S' command,
++     except for OPTIONS and COMMAND.
++
++    OPTIONS
++          A list of options to control the transfer.  The following
++          options are defined (all options are single characters):
++         `C'
++               The file has been copied to the spool directory (the
++               master should use TEMP rather than FROM).
++
++         `c'
++               The file has not been copied to the spool directory
++               (this is the default).
++
++         `N'
++               No mail message should be sent, even if the command
++               fails.  This is the equivalent of the `N' command in an
++               `X.*' file.
++
++         `Z'
++               A mail message should be sent if the command fails (this
++               is generally the default in any case).  This is the
++               equivalent of the `Z' command in an `X.*' file.
++
++         `R'
++               Mail messages about the execution should be sent to the
++               address in the NOTIFY field.  This is the equivalent of
++               the `R' command in an `X.*' file.
++
++         `e'
++               The execution should be done with `/bin/sh'.  This is the
++               equivalent of the `e' command in an `X.*' file.
++
++         `q'
++               Backslash quoting is applied to the FROM, TO, USER, and
++               NOTIFY arguments.  *Note UUCP Protocol Commands::.  This
++               option was introduced in Taylor UUCP version 1.07.  Note
++               that the COMMAND argument is not backslash quoted--that
++               argument is defined as the remainder of the line, and so
++               is already permitted to contain any character.
++
++    COMMAND
++          The command which should be executed.  This is the equivalent
++          of the `C' command in an `X.*' file.
++
++     The slave then responds with an `E' command response.  These are
++     the same as the `S' command responses, but the initial character is
++     `E' rather than `S'.
++
++     If the slave responds with `EY', the file transfer begins.  When
++     the file transfer is complete, the slave sends a `C' command
++     response, just as for the `S' command.  After a successful file
++     transfer, the slave is responsible for arranging for the command
++     to be executed.  The transferred file is passed as standard input,
++     as though it were named in the `I' and `F' commands of an `X.*'
++     file.
++
++     After the `C' command response has been received (in the `EY'
++     case) or immediately (in an `EN' case) the master will send another
++     command.
++
++\x1f
++File: uucp.info,  Node: The H Command,  Prev: The E Command,  Up: UUCP Protocol Commands
++
++6.5.2.5 The H Command
++.....................
++
++master: `H'
++     This is used by the master to hang up the connection.  The slave
++     will respond with an `H' command response.
++
++    `HY'
++          The slave agrees to hang up the connection.  In this case the
++          master sends another `HY' command.  In some UUCP packages the
++          slave will then send a third `HY' command.  At this point the
++          protocol is shut down, and the final handshake is begun.
++
++    `HN'
++          The slave does not agree to hang up.  In this case the master
++          and the slave exchange roles.  The next command will be sent
++          by the former slave, which is the new master.  The roles may
++          be reversed several times during a single connection.
++
++\x1f
++File: uucp.info,  Node: The Final Handshake,  Prev: UUCP Protocol Commands,  Up: UUCP Protocol
++
++6.5.3 The Final Handshake
++-------------------------
++
++After the protocol has been shut down, the final handshake is performed.
++This handshake has no real purpose, and some UUCP packages simply drop
++the connection rather than do it (in fact, some will drop the connection
++immediately after both sides agree to hangup, without even closing down
++the protocol).
++
++caller: `\020OOOOOO\000'
++
++called: `\020OOOOOOO\000'
++
++   That is, the calling UUCP sends six `O' characters and the called
++UUCP replies with seven `O' characters.  Some UUCP packages always send
++six `O' characters.
++
++\x1f
++File: uucp.info,  Node: g Protocol,  Next: f Protocol,  Prev: UUCP Protocol,  Up: Protocols
++
++6.6 UUCP `g' Protocol
++=====================
++
++The `g' protocol is a packet based flow controlled error correcting
++protocol that requires an eight bit clear connection.  It is the
++original UUCP protocol, and is supported by all UUCP implementations.
++Many implementations of it are only able to support small window and
++packet sizes, specifically a window size of 3 and a packet size of 64
++bytes, but the protocol itself can support up to a window size of 7 and
++a packet size of 4096 bytes.  Complaints about the inefficiency of the
++`g' protocol generally refer to specific implementations, rather than
++to the correctly implemented protocol.
++
++   The `g' protocol was originally designed for general packet drivers,
++and thus contains some features that are not used by UUCP, including an
++alternate data channel and the ability to renegotiate packet and window
++sizes during the communication session.
++
++   The `g' protocol is spoofed by many Telebit modems.  When spoofing
++is in effect, each Telebit modem uses the `g' protocol to communicate
++with the attached computer, but the data between the modems is sent
++using a Telebit proprietary error correcting protocol.  This allows for
++very high throughput over the Telebit connection, which, because it is
++half-duplex, would not normally be able to handle the `g' protocol very
++well at all.  When a Telebit is spoofing the `g' protocol, it forces
++the packet size to be 64 bytes and the window size to be 3.
++
++   This discussion of the `g' protocol explains how it works, but does
++not discuss useful error handling techniques.  Some discussion of this
++can be found in Jamie E. Hanrahan's paper, cited above (*note UUCP
++Protocol Sources::).
++
++   All `g' protocol communication is done with packets.  Each packet
++begins with a six byte header.  Control packets consist only of the
++header.  Data packets contain additional data.
++
++   The header is as follows:
++
++`\020'
++     Every packet begins with a `^P'.
++
++K (1 <= K <= 9)
++     The K value is always 9 for a control packet.  For a data packet,
++     the K value indicates how much data follows the six byte header.
++     The amount of data is 2 ** (K + 4), where ** indicates
++     exponentiation.  Thus a K value of 1 means 32 data bytes and a K
++     value of 8 means 4096 data bytes.  The K value for a data packet
++     must be between 1 and 8 inclusive.
++
++checksum low byte
++checksum high byte
++     The checksum value is described below.
++
++control byte
++     The control byte indicates the type of packet, and is described
++     below.
++
++xor byte
++     This byte is the xor of K, the checksum low byte, the checksum
++     high byte and the control byte (i.e., the second, third, fourth and
++     fifth header bytes).  It is used to ensure that the header data is
++     valid.
++
++   The control byte in the header is composed of three bit fields,
++referred to here as TT (two bits), XXX (three bits) and YYY (three
++bits).  The control is TTXXXYYY, or `(TT << 6) + (XXX << 3) + YYY'.
++
++   The TT field takes on the following values:
++
++`0'
++     This is a control packet.  In this case the K byte in the header
++     must be 9.  The XXX field indicates the type of control packet;
++     these types are described below.
++
++`1'
++     This is an alternate data channel packet.  This is not used by
++     UUCP.
++
++`2'
++     This is a data packet, and the entire contents of the attached data
++     field (whose length is given by the K byte in the header) are
++     valid.  The XXX and YYY fields are described below.
++
++`3'
++     This is a short data packet.  Let the length of the data field (as
++     given by the K byte in the header) be L.  Let the first byte in
++     the data field be B1.  If B1 is less than 128 (if the most
++     significant bit of B1 is 0), then there are `L - B1' valid bytes
++     of data in the data field, beginning with the second byte.  If `B1
++     >= 128', let B2 be the second byte in the data field.  Then there
++     are `L - ((B1 & 0x7f) + (B2 << 7))' valid bytes of data in the
++     data field, beginning with the third byte.  In all cases L bytes
++     of data are sent (and all data bytes participate in the checksum
++     calculation) but some of the trailing bytes may be dropped by the
++     receiver.  The XXX and YYY fields are described below.
++
++   In a data packet (short or not) the XXX field gives the sequence
++number of the packet.  Thus sequence numbers can range from 0 to 7,
++inclusive.  The YYY field gives the sequence number of the last
++correctly received packet.
++
++   Each communication direction uses a window which indicates how many
++unacknowledged packets may be transmitted before waiting for an
++acknowledgement.  The window may range from 1 to 7, and may be different
++in each direction. For example, if the window is 3 and the last packet
++acknowledged was packet number 6, packet numbers 7, 0 and 1 may be sent
++but the sender must wait for an acknowledgement before sending packet
++number 2.  This acknowledgement could come as the YYY field of a data
++packet, or as the YYY field of a `RJ' or `RR' control packet (described
++below).
++
++   Each packet must be transmitted in order (the sender may not skip
++sequence numbers).  Each packet must be acknowledged, and each packet
++must be acknowledged in order.
++
++   In a control packet, the XXX field takes on the following values:
++
++1 `CLOSE'
++     The connection should be closed immediately.  This is typically
++     sent when one side has seen too many errors and wants to give up.
++     It is also sent when shutting down the protocol.  If an unexpected
++     `CLOSE' packet is received, a `CLOSE' packet should be sent in
++     reply and the `g' protocol should halt, causing UUCP to enter the
++     final handshake.
++
++2 `RJ' or `NAK'
++     The last packet was not received correctly.  The YYY field
++     contains the sequence number of the last correctly received packet.
++
++3 `SRJ'
++     Selective reject.  The YYY field contains the sequence number of a
++     packet that was not received correctly, and should be
++     retransmitted.  This is not used by UUCP, and most implementations
++     will not recognize it.
++
++4 `RR' or `ACK'
++     Packet acknowledgement.  The YYY field contains the sequence
++     number of the last correctly received packet.
++
++5 `INITC'
++     Third initialization packet.  The YYY field contains the maximum
++     window size to use.
++
++6 `INITB'
++     Second initialization packet.  The YYY field contains the packet
++     size to use.  It requests a size of 2 ** (YYY + 5).  Note that
++     this is not the same coding used for the K byte in the packet
++     header (it is 1 less).  Most UUCP implementations that request a
++     packet size larger than 64 bytes can handle any packet size up to
++     that specified.
++
++7 `INITA'
++     First initialization packet.  The YYY field contains the maximum
++     window size to use.
++
++   To compute the checksum, call the control byte (the fifth byte in the
++header) C.
++
++   The checksum of a control packet is simply `0xaaaa - C'.
++
++   The checksum of a data packet is `0xaaaa - (CHECK ^ C)', where `^'
++denotes exclusive or, and CHECK is the result of the following routine
++as run on the contents of the data field (every byte in the data field
++participates in the checksum, even for a short data packet).  Below is
++the routine used by an early version of Taylor UUCP; it is a slightly
++modified version of a routine which John Gilmore patched from G.L.
++Chesson's original paper.  The `z' argument points to the data and the
++`c' argument indicates how much data there is.
++
++     int
++     igchecksum (z, c)
++          register const char *z;
++          register int c;
++     {
++       register unsigned int ichk1, ichk2;
++
++       ichk1 = 0xffff;
++       ichk2 = 0;
++
++       do
++         {
++           register unsigned int b;
++
++           /* Rotate ichk1 left.  */
++           if ((ichk1 & 0x8000) == 0)
++             ichk1 <<= 1;
++           else
++             {
++               ichk1 <<= 1;
++               ++ichk1;
++             }
++
++           /* Add the next character to ichk1.  */
++           b = *z++ & 0xff;
++           ichk1 += b;
++
++           /* Add ichk1 xor the character position in the buffer counting from
++              the back to ichk2.  */
++           ichk2 += ichk1 ^ c;
++
++           /* If the character was zero, or adding it to ichk1 caused an
++              overflow, xor ichk2 to ichk1.  */
++           if (b == 0 || (ichk1 & 0xffff) < b)
++             ichk1 ^= ichk2;
++         }
++       while (--c > 0);
++
++       return ichk1 & 0xffff;
++     }
++
++   When the `g' protocol is started, the calling UUCP sends an `INITA'
++control packet with the window size it wishes the called UUCP to use.
++The called UUCP responds with an `INITA' packet with the window size it
++wishes the calling UUCP to use.  Pairs of `INITB' and `INITC' packets
++are then similarly exchanged.  When these exchanges are completed, the
++protocol is considered to have been started.
++
++   Note that the window and packet sizes are not a negotiation.  Each
++system announces the window and packet size which the other system
++should use.  It is possible that different window and packet sizes will
++be used in each direction.  The protocol works this way on the theory
++that each system knows how much data it can accept without getting
++overrun.  Therefore, each system tells the other how much data to send
++before waiting for an acknowledgement.
++
++   When a UUCP package transmits a command, it sends one or more data
++packets.  All the data packets will normally be complete, although some
++UUCP packages may send the last one as a short packet.  The command
++string is sent with a trailing null byte, to let the receiving package
++know when the command is finished.  Some UUCP packages require the last
++byte of the last packet sent to be null, even if the command ends
++earlier in the packet.  Some packages may require all the trailing bytes
++in the last packet to be null, but I have not confirmed this.
++
++   When a UUCP package sends a file, it will send a sequence of data
++packets.  The end of the file is signalled by a short data packet
++containing zero valid bytes (it will normally be preceeded by a short
++data packet containing the last few bytes in the file).
++
++   Note that the sequence numbers cover the entire communication
++session, including both command and file data.
++
++   When the protocol is shut down, each UUCP package sends a `CLOSE'
++control packet.
++
++\x1f
++File: uucp.info,  Node: f Protocol,  Next: t Protocol,  Prev: g Protocol,  Up: Protocols
++
++6.7 UUCP `f' Protocol
++=====================
++
++The `f' protocol is a seven bit protocol which checksums an entire file
++at a time.  It only uses the characters between `\040' and `\176'
++(ASCII `space' and `~') inclusive, as well as the carriage return
++character.  It can be very efficient for transferring text only data,
++but it is very inefficient at transferring eight bit data (such as
++compressed news).  It is not flow controlled, and the checksum is
++fairly insecure over large files, so using it over a serial connection
++requires handshaking (XON/XOFF can be used) and error correcting
++modems.  Some people think it should not be used even under those
++circumstances.
++
++   I believe that the `f' protocol originated in BSD versions of UUCP.
++It was originally intended for transmission over X.25 PAD links.
++
++   The `f' protocol has no startup or finish protocol.  However, both
++sides typically sleep for a couple of seconds before starting up,
++because they switch the terminal into XON/XOFF mode and want to allow
++the changes to settle before beginning transmission.
++
++   When a UUCP package transmits a command, it simply sends a string
++terminated by a carriage return.
++
++   When a UUCP package transmits a file, each byte B of the file is
++translated according to the following table:
++
++            0 <= B <=  037: 0172, B + 0100 (0100 to 0137)
++          040 <= B <= 0171:       B        ( 040 to 0171)
++         0172 <= B <= 0177: 0173, B - 0100 ( 072 to  077)
++         0200 <= B <= 0237: 0174, B - 0100 (0100 to 0137)
++         0240 <= B <= 0371: 0175, B - 0200 ( 040 to 0171)
++         0372 <= B <= 0377: 0176, B - 0300 ( 072 to  077)
++
++   That is, a byte between `\040' and `\171' inclusive is transmitted
++as is, and all other bytes are prefixed and modified as shown.
++
++   When all the file data is sent, a seven byte sequence is sent: two
++bytes of `\176' followed by four ASCII bytes of the checksum as printed
++in base 16 followed by a carriage return.  For example, if the checksum
++was 0x1234, this would be sent: `\176\1761234\r'.
++
++   The checksum is initialized to 0xffff.  For each byte that is sent
++it is modified as follows (where B is the byte before it has been
++transformed as described above):
++
++           /* Rotate the checksum left.  */
++           if ((ichk & 0x8000) == 0)
++             ichk <<= 1;
++           else
++             {
++               ichk <<= 1;
++               ++ichk;
++             }
++
++           /* Add the next byte into the checksum.  */
++           ichk += B;
++
++   When the receiving UUCP sees the checksum, it compares it against its
++own calculated checksum and replies with a single character followed by
++a carriage return.
++
++`G'
++     The file was received correctly.
++
++`R'
++     The checksum did not match, and the file should be resent from the
++     beginning.
++
++`Q'
++     The checksum did not match, but too many retries have occurred and
++     the communication session should be abandoned.
++
++   The sending UUCP checks the returned character and acts accordingly.
++
++\x1f
++File: uucp.info,  Node: t Protocol,  Next: e Protocol,  Prev: f Protocol,  Up: Protocols
++
++6.8 UUCP `t' Protocol
++=====================
++
++The `t' protocol is intended for use on links which provide reliable
++end-to-end connections, such as TCP.  It does no error checking or flow
++control, and requires an eight bit clear channel.
++
++   I believe the `t' protocol originated in BSD versions of UUCP.
++
++   When a UUCP package transmits a command, it first gets the length of
++the command string, C.  It then sends `((C / 512) + 1) * 512' bytes
++(the smallest multiple of 512 which can hold C bytes plus a null byte)
++consisting of the command string itself followed by trailing null bytes.
++
++   When a UUCP package sends a file, it sends it in blocks.  Each block
++contains at most 1024 bytes of data.  Each block consists of four bytes
++containing the amount of data in binary (most significant byte first,
++the same format as used by the Unix function `htonl') followed by that
++amount of data.  The end of the file is signalled by a block containing
++zero bytes of data.
++
++\x1f
++File: uucp.info,  Node: e Protocol,  Next: Big G Protocol,  Prev: t Protocol,  Up: Protocols
++
++6.9 UUCP `e' Protocol
++=====================
++
++The `e' protocol is similar to the `t' protocol.  It does no flow
++control or error checking and is intended for use over networks
++providing reliable end-to-end connections, such as TCP.
++
++   The `e' protocol originated in versions of HDB UUCP.
++
++   When a UUCP package transmits a command, it simply sends the command
++as an ASCII string terminated by a null byte.
++
++   When a UUCP package transmits a file, it sends the complete size of
++the file as an ASCII decimal number.  The ASCII string is padded out to
++20 bytes with null bytes (i.e. if the file is 1000 bytes long, it sends
++`1000\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0').  It then sends the entire file.
++
++\x1f
++File: uucp.info,  Node: Big G Protocol,  Next: i Protocol,  Prev: e Protocol,  Up: Protocols
++
++6.10 UUCP `G' Protocol
++======================
++
++The `G' protocol is used by SVR4 UUCP.  It is identical to the `g'
++protocol, except that it is possible to modify the window and packet
++sizes.  The SVR4 implementation of the `g' protocol reportedly is fixed
++at a packet size of 64 and a window size of 7.  Supposedly SVR4 chose
++to implement a new protocol using a new letter to avoid any potential
++incompatibilities when using different packet or window sizes.
++
++   Most implementations of the `g' protocol that accept packets larger
++than 64 bytes will also accept packets smaller than whatever they
++requested in the `INITB' packet.  The SVR4 `G' implementation is an
++exception; it will only accept packets of precisely the size it
++requests in the INITB packet.
++
++\x1f
++File: uucp.info,  Node: i Protocol,  Next: j Protocol,  Prev: Big G Protocol,  Up: Protocols
++
++6.11 UUCP `i' Protocol
++======================
++
++The `i' protocol was written by Ian Lance Taylor (who also wrote this
++manual).  It was first used by Taylor UUCP version 1.04.
++
++   It is a sliding window packet protocol, like the `g' protocol, but
++it supports bidirectional transfers (i.e., file transfers in both
++directions simultaneously).  It requires an eight bit clear connection.
++Several ideas for the protocol were taken from the paper `A
++High-Throughput Message Transport System' by P. Lauder.  I don't know
++where the paper was published, but the author's e-mail address is
++<piers@cs.su.oz.au>.  The `i' protocol does not adopt his main idea,
++which is to dispense with windows entirely.  This is because some links
++still do require flow control and, more importantly, because using
++windows sets a limit to the amount of data which the protocol must be
++able to resend upon request.  To reduce the costs of window
++acknowledgements, the protocol uses a large window and only requires an
++ack at the halfway point.
++
++   Each packet starts with a six byte header, optionally followed by
++data bytes with a four byte checksum.  There are currently five defined
++packet types (`DATA', `SYNC', `ACK', `NAK', `SPOS', `CLOSE') which are
++described below.  Although any packet type may include data, any data
++provided with an `ACK', `NAK' or `CLOSE' packet is ignored.
++
++   Every `DATA', `SPOS' and `CLOSE' packet has a sequence number.  The
++sequence numbers are independent for each side.  The first packet sent
++by each side is always number 1.  Each packet is numbered one greater
++than the previous packet, modulo 32.
++
++   Every packet has a local channel number and a remote channel number.
++For all packets at least one channel number is zero.  When a UUCP
++command is sent to the remote system, it is assigned a non-zero local
++channel number.  All packets associated with that UUCP command sent by
++the local system are given the selected local channel number.  All
++associated packets sent by the remote system are given the selected
++number as the remote channel number.  This permits each UUCP command to
++be uniquely identified by the channel number on the originating system,
++and therefore each UUCP package can associate all file data and UUCP
++command responses with the appropriate command.  This is a requirement
++for bidirectional UUCP transfers.
++
++   The protocol maintains a single global file position, which starts
++at 0.  For each incoming packet, any associated data is considered to
++occur at the current file position, and the file position is
++incremented by the amount of data contained.  The exception is a packet
++of type `SPOS', which is used to change the file position.  The reason
++for keeping track of the file position is described below.
++
++   The header is as follows:
++
++`\007'
++     Every packet begins with `^G'.
++
++`(PACKET << 3) + LOCCHAN'
++     The five bit packet number combined with the three bit local
++     channel number.  `DATA', `SPOS' and `CLOSE' packets use the packet
++     sequence number for the PACKET field.  `NAK' packet types use the
++     PACKET field for the sequence number to be resent.  `ACK' and
++     `SYNC' do not use the PACKET field, and generally leave it set to
++     0.  Packets which are not associated with a UUCP command from the
++     local system use a local channel number of 0.
++
++`(ACK << 3) + REMCHAN'
++     The five bit packet acknowledgement combined with the three bit
++     remote channel number.  The packet acknowledgement is the number
++     of the last packet successfully received; it is used by all packet
++     types.  Packets which are not sent in response to a UUCP command
++     from the remote system use a remote channel number of 0.
++
++`(TYPE << 5) + (CALLER << 4) + LEN1'
++     The three bit packet type combined with the one bit packet
++     direction combined with the upper four bits of the data length.
++     The packet direction bit is always 1 for packets sent by the
++     calling UUCP, and 0 for packets sent by the called UUCP.  This
++     prevents confusion caused by echoed packets.
++
++LEN2
++     The lower eight bits of the data length.  The twelve bits of data
++     length permit packets ranging in size from 0 to 4095 bytes.
++
++CHECK
++     The exclusive or of the second through fifth bytes of the header.
++     This provides an additional check that the header is valid.
++
++   If the data length is non-zero, the packet is immediately followed by
++the specified number of data bytes.  The data bytes are followed by a
++four byte CRC 32 checksum, with the most significant byte first.  The
++CRC is calculated over the contents of the data field.
++
++   The defined packet types are as follows:
++
++0 `DATA'
++     This is a plain data packet.
++
++1 `SYNC'
++     `SYNC' packets are exchanged when the protocol is initialized, and
++     are described further below.  `SYNC' packets do not carry sequence
++     numbers (that is, the PACKET field is ignored).
++
++2 `ACK'
++     This is an acknowledgement packet.  Since `DATA' packets also carry
++     packet acknowledgements, `ACK' packets are only used when one side
++     has no data to send.  `ACK' packets do not carry sequence numbers.
++
++3 `NAK'
++     This is a negative acknowledgement.  This is sent when a packet is
++     received incorrectly, and means that the packet number appearing
++     in the PACKET field must be resent.  `NAK' packets do not carry
++     sequence numbers (the PACKET field is already used).
++
++4 `SPOS'
++     This packet changes the file position.  The packet contains four
++     bytes of data holding the file position, most significant byte
++     first.  The next packet received will be considered to be at the
++     named file position.
++
++5 `CLOSE'
++     When the protocol is shut down, each side sends a `CLOSE' packet.
++     This packet does have a sequence number, which could be used to
++     ensure that all packets were correctly received (this is not
++     needed by UUCP, however, which uses the higher level `H' command
++     with an `HY' response).
++
++   When the protocol starts up, both systems send a `SYNC' packet.  The
++`SYNC' packet includes at least three bytes of data.  The first two
++bytes are the maximum packet size the remote system should send, most
++significant byte first.  The third byte is the window size the remote
++system should use.  The remote system may send packets of any size up
++to the maximum.  If there is a fourth byte, it is the number of
++channels the remote system may use (this must be between 1 and 7,
++inclusive).  Additional data bytes may be defined in the future.
++
++   The window size is the number of packets that may be sent before a
++packet is acknowledged.  There is no requirement that every packet be
++acknowledged; any acknowledgement is considered to acknowledge all
++packets through the number given.  In the current implementation, if one
++side has no data to send, it sends an `ACK' when half the window is
++received.
++
++   Note that the `NAK' packet corresponds to the unused `g' protocol
++`SRJ' packet type, rather than to the `RJ' packet type.  When a `NAK'
++is received, only the named packet should be resent, not any subsequent
++packets.
++
++   Note that if both sides have data to send, but a packet is lost, it
++is perfectly reasonable for one side to continue sending packets, all of
++which will acknowledge the last packet correctly received, while the
++system whose packet was lost will be unable to send a new packet because
++the send window will be full.  In this circumstance, neither side will
++time out and one side of the communication will be effectively shut down
++for a while.  Therefore, any system with outstanding unacknowledged
++packets should arrange to time out and resend a packet even if data is
++being received.
++
++   Commands are sent as a sequence of data packets with a non-zero local
++channel number.  The last data packet for a command includes a trailing
++null byte (normally a command will fit in a single data packet).  Files
++are sent as a sequence of data packets ending with one of length zero.
++
++   The channel numbers permit a more efficient implementation of the
++UUCP file send command.  Rather than send the command and then wait for
++the `SY' response before sending the file, the file data is sent
++beginning immediately after the `S' command is sent.  If an `SN'
++response is received, the file send is aborted, and a final data packet
++of length zero is sent to indicate that the channel number may be
++reused.  If an `SY' reponse with a file position indicator is received,
++the file send adjusts to the file position; this is why the protocol
++maintains a global file position.
++
++   Note that the use of channel numbers means that each UUCP system may
++send commands and file data simultaneously.  Moreover, each UUCP system
++may send multiple files at the same time, using the channel number to
++disambiguate the data.  Sending a file before receiving an
++acknowledgement for the previous file helps to eliminate the round trip
++delays inherent in other UUCP protocols.
++
+--- uucp-1.07.orig/unix/pipe.c
++++ uucp-1.07/unix/pipe.c
+@@ -199,6 +199,7 @@ fspipe_dial (qconn, puuconf, qsys, zphon
+   struct ssysdep_conn *q;
+   int aidescs[3];
+   const char **pzprog;
++  char **p;
+ 
+   q = (struct ssysdep_conn *) qconn->psysdep;
+ 
+@@ -211,6 +212,11 @@ fspipe_dial (qconn, puuconf, qsys, zphon
+       ulog (LOG_ERROR, "No command for pipe connection");
+       return FALSE;
+     }
++  
++  /* Look for a string \H and replaced it by the address given for this system */
++  for (p=pzprog; *p; p++)
++    if (!strcmp(*p, "\\H"))
++      *p = zphone;
+ 
+   aidescs[0] = SPAWN_WRITE_PIPE;
+   aidescs[1] = SPAWN_READ_PIPE;
+--- uucp-1.07.orig/contrib/uurate.c
++++ uucp-1.07/contrib/uurate.c
+@@ -216,7 +216,7 @@ struct Protocol_Summary
+ struct Host_entry
+     {
+     struct Host_entry *next;
+-    char Hostname[32];
++    char Hostname[MAXHOSTNAMELEN];
+     struct Execution_Command *cmds;      /* Local Activities */
+     struct Phone_Call call[2];            /* In & Out Activities */
+     struct Protocol_Summary *proto;
+--- uucp-1.07.orig/contrib/Makefile.uurt
++++ uucp-1.07/contrib/Makefile.uurt
+@@ -17,9 +17,9 @@ MAN=$(prefix)/man/man1
+ newconfigdir = $(prefix)/conf/uucp
+ 
+ # Flags to use when compiling uurate
+-CC=gcc -O2
+-CFLAGS=-I.. -Wall
+-LDFLAGS=-s -lm
++CC=gcc
++CFLAGS+=-I..
++LDFLAGS=-lm
+ 
+ SHELL=/bin/sh
+ PROGS=uurate
+ 
diff --git a/srcpkgs/uucp/patches/wait-for-correct-parent.patch b/srcpkgs/uucp/patches/wait-for-correct-parent.patch
new file mode 100644
index 000000000000..50bbcd9ed8ac
--- /dev/null
+++ b/srcpkgs/uucp/patches/wait-for-correct-parent.patch
@@ -0,0 +1,19 @@
+Description: wait for correct parent to die
+Author: Jörg Sommer <joerg@jo-so.de>
+Index: uucp-1.07/unix/detach.c
+===================================================================
+--- uucp-1.07.orig/unix/detach.c	2019-03-02 16:36:11.238947732 +0100
++++ uucp-1.07/unix/detach.c	2019-03-02 16:37:21.850946777 +0100
+@@ -98,10 +98,8 @@
+       if (ipid != 0)
+ 	_exit (EXIT_SUCCESS);
+ 
+-      /* We'll always wind up as a child of process number 1, right?
+-	 Right?  We have to wait for our parent to die before
+-	 reenabling SIGHUP.  */
+-      while (getppid () != 1)
++      /* We have to wait for our parent to die before reenabling SIGHUP. */
++      while (getppid () == igrp)
+ 	sleep (1);
+ 
+       ipid = getpid ();
diff --git a/srcpkgs/uucp/patches/zpipe-improved-pipe.patch b/srcpkgs/uucp/patches/zpipe-improved-pipe.patch
new file mode 100644
index 000000000000..fef1c42a2c52
--- /dev/null
+++ b/srcpkgs/uucp/patches/zpipe-improved-pipe.patch
@@ -0,0 +1,40 @@
+Author: Rafael Diniz <rafael@rhizomatica.org>
+Description: 
+ remove ATTRIBUTE_UNUSED of the parameter uucp-org.patch uses
+ add the possibility to send the system name to be called in pipe command
+ (use \Z as place holder for the system name)
+Index: uucp-1.07/unix/pipe.c
+===================================================================
+--- uucp-1.07.orig/unix/pipe.c	2019-08-17 23:06:47.774519770 +0200
++++ uucp-1.07/unix/pipe.c	2019-08-17 23:06:47.742519770 +0200
+@@ -225,8 +225,8 @@
+ fspipe_dial (qconn, puuconf, qsys, zphone, qdialer, ptdialer)
+      struct sconnection *qconn;
+      pointer puuconf;
+-     const struct uuconf_system *qsys ATTRIBUTE_UNUSED;
+-     const char *zphone ATTRIBUTE_UNUSED;
++     const struct uuconf_system *qsys;
++     const char *zphone;
+      struct uuconf_dialer *qdialer;
+      enum tdialerfound *ptdialer;
+ {
+@@ -246,12 +246,17 @@
+       ulog (LOG_ERROR, "No command for pipe connection");
+       return FALSE;
+     }
+-  
+-  /* Look for a string \H and replaced it by the address given for this system */
++
++  /* Look for a string \H and replace it by the address given for this system */
+   for (p=pzprog; *p; p++)
+     if (!strcmp(*p, "\\H"))
+       *p = zphone;
+ 
++  /* Look for a string \Z and replace by the system name to be called */
++  for (p=pzprog; *p; p++)
++    if (!strcmp(*p, "\\Z"))
++      *p = qsys->uuconf_zname;
++
+   aidescs[0] = SPAWN_WRITE_PIPE;
+   aidescs[1] = SPAWN_READ_PIPE;
+   aidescs[2] = SPAWN_NULL;
diff --git a/srcpkgs/uucp/template b/srcpkgs/uucp/template
new file mode 100644
index 000000000000..2b2b6f758fae
--- /dev/null
+++ b/srcpkgs/uucp/template
@@ -0,0 +1,39 @@
+# Template file for 'uucp'
+pkgname=uucp
+version=1.07
+revision=1
+build_style=gnu-configure
+conf_files="/etc/uucp/config /etc/uucp/sys1 /etc/uucp/port"
+makedepends="wget"
+short_desc="Taylor UUCP is a free implementation of UUCP"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://www.gnu.org/software/uucp/uucp.html"
+distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
+checksum=060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c
+patch_args="-Np1"
+
+system_accounts="_uucp"
+_uucp_homedir="/var/spool/uucp"
+
+make_dirs="
+	/var/spool/uucp		0750 uucp uucp
+	/var/spool/uucppublic	0750 uucp uucp"
+
+pre_configure() {
+	sed -i 's|${CC-cc} -E|${CC-cc} -E|g' configure
+}
+do_install() {
+	make DESTDIR=${DESTDIR} install
+	vmkdir etc/uucp/
+	vinstall sample/config 0644 etc/uucp/
+	vinstall sample/sys1 0644 etc/uucp/
+	vinstall sample/port 0644 etc/uucp/
+	sed -i 's|\$\*|"$@"|' ${DESTDIR}/usr/bin/{uuto,uusched}
+	chmod u+w ${DESTDIR}/usr/bin/*
+	vman ${FILESDIR}/uulog.1
+	vman ${FILESDIR}/uuname.1
+	vman ${FILESDIR}/uupick.1
+	vman ${FILESDIR}/uuto.1
+	vman ${FILESDIR}/uusched.8
+}

From bb1088509bdab933631fa56e1ff62e00ec7e4d32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 12:28:43 +0200
Subject: [PATCH 1468/1686] krita: update to 5.0.5.

---
 srcpkgs/krita/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/krita/template b/srcpkgs/krita/template
index b05abcbaf97c..68e67ccb8157 100644
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@@ -1,6 +1,6 @@
 # Template file for 'krita'
 pkgname=krita
-version=5.0.2
+version=5.0.5
 revision=1
 build_style=cmake
 configure_args="-Wno-dev -DBUILD_TESTING=OFF"
@@ -22,7 +22,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=e6751fc7eb504977a4880a376ebbd3995c87dad154486084e82397e65d499cbf
+checksum=162fff4596484e688655d4636373b1a77bcea39824c655b477afc1463aaf2dae
 python_version=3
 replaces="calligra-krita>=0"
 make_check=no

From 1b23a594103926162505e36b6855afe9c90901af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 12:30:15 +0200
Subject: [PATCH 1469/1686] pioneer: update to 20220203.

---
 srcpkgs/pioneer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template
index a598006e74c6..9614ba1f1ade 100644
--- a/srcpkgs/pioneer/template
+++ b/srcpkgs/pioneer/template
@@ -1,6 +1,6 @@
 # Template file for 'pioneer'
 pkgname=pioneer
-version=20210723
+version=20220203
 revision=1
 build_style=cmake
 make_build_target="all build-data"
@@ -15,7 +15,7 @@ maintainer="John <me@johnnynator.dev>"
 license="GPL-3.0-or-later"
 homepage="https://pioneerspacesim.net"
 distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz"
-checksum=5f5d794d3095079e629980a6a3285d83b95b97e6c9b6058c73531cd06f8d082d
+checksum=415b55bab7f011f7244348428e13006fa67a926b9be71f2c4ad24e92cfeb051c
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" pioneer-modelcompiler"

From c1493eeadf63fb428ed12ca8f24e5134bad5fc64 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Mon, 18 Apr 2022 12:09:41 -0500
Subject: [PATCH 1470/1686] google-chrome: update to 100.0.4896.127

---
 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 5f9e67c864f2..b20753366d95 100644
--- a/srcpkgs/google-chrome/template
+++ b/srcpkgs/google-chrome/template
@@ -1,6 +1,6 @@
 # Template file for 'google-chrome'
 pkgname=google-chrome
-version=100.0.4896.75
+version=100.0.4896.127
 revision=1
 _channel=stable
 archs="x86_64"
@@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}"
 _licenseUrl="https://www.google.com/intl/en/chrome/terms/"
 
 distfiles="$_chromeUrl"
-checksum=856934272783e5a48fa63e30eb896040f5b46d6f394c1b3aa2e461cbf89b395b
+checksum=d012bc3e5e000bffbd83cf20c48add187c52b065cc37408862c42d127aa4a656
 
 do_extract() {
 	mkdir -p ${DESTDIR}

From a6c95c3aa98ab472e72f00364c1b0916943f6e24 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 18 Apr 2022 19:40:56 +0200
Subject: [PATCH 1471/1686] krita: remove patch

---
 ...5beaa1fdba03d38f887b93a15a58fc0830c7.patch | 50 -------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch

diff --git a/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch b/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch
deleted file mode 100644
index 6c9c71d4fca2..000000000000
--- a/srcpkgs/krita/patches/0b755beaa1fdba03d38f887b93a15a58fc0830c7.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
-From: Sharaf Zaman <shzam@sdf.org>
-Date: Wed, 27 Oct 2021 22:19:07 +0000
-Subject: [PATCH] Fix build on linux clang targets
-
-In CheckAtomic.cmake we include is_lock_free because these routines
-don't seem to be included in the compiler's "simple atomics". This
-triggers a failure in clang toolchain, forcing it to link libatomic.
-
-Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
-
-CCBUG:444247
-CCBUG:444547
----
- cmake/modules/CheckAtomic.cmake | 1 +
- libs/image/CMakeLists.txt       | 6 ++----
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
-index b061e2d65b..df6b70504c 100644
---- a/cmake/modules/CheckAtomic.cmake
-+++ b/cmake/modules/CheckAtomic.cmake
-@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
- 	std::atomic<uint64_t> x (0);
- 	int main() {
- 		uint64_t i = x.load(std::memory_order_relaxed);
-+		x.is_lock_free();
- 		return 0;
- 	}
- 	" ${varname})
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index e883c7f1c8..43c945fad3 100644
---- a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
- 
- target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
- 
--if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
--    if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
--        target_link_libraries(kritaimage PUBLIC atomic)
--    endif()
-+if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
-+   target_link_libraries(kritaimage PUBLIC atomic)
- endif()
- 
- if(OpenEXR_FOUND)
--- 
-GitLab
-

From f579263d4ec79f983fe0bd2d8ee9446a20d72ff5 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sat, 9 Apr 2022 10:10:18 -0400
Subject: [PATCH 1472/1686] python3-trimesh: update to 3.10.8.

---
 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 e51b6eb62f9d..0a162818e7cb 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.10.7
+version=3.10.8
 revision=1
 wrksrc="trimesh-${version}"
 build_style=python3-module
@@ -16,7 +16,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=e98fd2dff632729fc6fb963653b91d9f4a5a6a9a1f79493dd885e3e4d1f9c4da
+checksum=465d30b17e1f62c467283422eb932b70ff4807f9346f3012195ac94675c837f3
 
 post_install() {
 	vlicense LICENSE.md

From 462aa7eb9fb81b3538d844de142516543daf2832 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 18 Apr 2022 16:07:28 +0200
Subject: [PATCH 1473/1686] celluloid: update to 0.23.

---
 srcpkgs/celluloid/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/celluloid/template b/srcpkgs/celluloid/template
index c9f0461fb42e..739911562045 100644
--- a/srcpkgs/celluloid/template
+++ b/srcpkgs/celluloid/template
@@ -1,6 +1,6 @@
 # Template file for 'celluloid'
 pkgname=celluloid
-version=0.22
+version=0.23
 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=5fded5b7bbf15ef110548bcc980ceec981f5f1a70df77ad3f10e3ca4a449e5a1
+checksum=b22d1963d03f0215bce07c2de8e77892c322f500ae5c0fd6e2e84d2e13f04374
 
 gnome-mpv_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 456d5d37ebc225525b076cc5b2a50bead9ef40e8 Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 18 Apr 2022 12:21:09 +0700
Subject: [PATCH 1474/1686] mdBook: update to 0.4.18

---
 srcpkgs/mdBook/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdBook/template b/srcpkgs/mdBook/template
index d2aa033512fa..d4b97f2a5d03 100644
--- a/srcpkgs/mdBook/template
+++ b/srcpkgs/mdBook/template
@@ -1,6 +1,6 @@
 # Template file for 'mdBook'
 pkgname=mdBook
-version=0.4.17
+version=0.4.18
 revision=1
 build_style=cargo
 short_desc="Create book from markdown files. Like Gitbook but implemented in Rust"
@@ -9,7 +9,7 @@ license="MPL-2.0"
 homepage="https://github.com/rust-lang/mdBook"
 changelog="https://raw.githubusercontent.com/rust-lang/mdBook/master/CHANGELOG.md"
 distfiles="https://github.com/rust-lang/mdBook/archive/v${version}.tar.gz"
-checksum=9523d0bed63ce35eec5a8259eb963651cd7e37ec5644ef551134068a2fb72f89
+checksum=ce357327f4443189fde307103f8008f43410ca8b738c5c61401ada9a54b8b5b5
 
 post_install() {
 	vlicense LICENSE

From fc3ce7eaa157a9d882758839ccc083ec982f56d3 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 18 Apr 2022 15:41:44 +0200
Subject: [PATCH 1475/1686] jpegoptim: update to 1.4.7.

---
 srcpkgs/jpegoptim/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jpegoptim/template b/srcpkgs/jpegoptim/template
index d11aa4be4f78..13dbf5ffaedd 100644
--- a/srcpkgs/jpegoptim/template
+++ b/srcpkgs/jpegoptim/template
@@ -1,6 +1,6 @@
 # Template file for 'jpegoptim'
 pkgname=jpegoptim
-version=1.4.6
+version=1.4.7
 revision=1
 wrksrc="${pkgname}-RELEASE.${version}"
 build_style=gnu-configure
@@ -10,4 +10,4 @@ maintainer="archaeme <normandy@firemail.cc>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/tjko/jpegoptim"
 distfiles="https://github.com/tjko/jpegoptim/archive/RELEASE.${version}.tar.gz"
-checksum=c44dcfac0a113c3bec13d0fc60faf57a0f9a31f88473ccad33ecdf210b4c0c52
+checksum=9d2a13b7c531d122f360209422645206931c74ada76497c4aeb953610f0d70c1

From 6dcf5953c36fddaebc642bf1fe2e118c3ea9d5ff Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 17 Apr 2022 20:25:38 +0200
Subject: [PATCH 1476/1686] xh: update to 0.16.0

---
 srcpkgs/xh/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xh/template b/srcpkgs/xh/template
index eddc9c125106..e40a27df688d 100644
--- a/srcpkgs/xh/template
+++ b/srcpkgs/xh/template
@@ -1,6 +1,6 @@
 # Template file for 'xh'
 pkgname=xh
-version=0.14.1
+version=0.16.0
 revision=1
 # depends on ring
 archs="x86_64* i686* armv[67]* aarch64*"
@@ -13,7 +13,7 @@ license="MIT"
 homepage="https://github.com/ducaale/xh"
 changelog="https://raw.githubusercontent.com/ducaale/xh/master/CHANGELOG.md"
 distfiles="https://github.com/ducaale/xh/archive/v${version}.tar.gz"
-checksum=ca89e8a9a230ff16cc0bba5bd7ebdceb986eac84638e15b4928d737b9ec12776
+checksum=d6ec84977da567dd36a4c59d624dc1e2b1c77a21e2b0a10e463216120be8112d
 
 post_install() {
 	ln -sf ${pkgname} ${DESTDIR}/usr/bin/${pkgname}s

From c7a7678bd8f487e5379b00c02f73d9c79b5b474f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Apr 2022 19:34:19 +0200
Subject: [PATCH 1477/1686] sfeed: update to 1.4.

---
 srcpkgs/sfeed/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sfeed/template b/srcpkgs/sfeed/template
index 46b4d83e558b..fd5f0fe156d7 100644
--- a/srcpkgs/sfeed/template
+++ b/srcpkgs/sfeed/template
@@ -1,6 +1,6 @@
 # Template file for 'sfeed'
 pkgname=sfeed
-version=1.3
+version=1.4
 revision=1
 build_style=gnu-makefile
 make_install_args="MANPREFIX=/usr/share/man"
@@ -11,7 +11,7 @@ maintainer="notthewave <winklbauer_m@zoho.eu>"
 license="ISC"
 homepage="https://git.codemadness.org/sfeed"
 distfiles="https://codemadness.org/releases/sfeed/sfeed-${version}.tar.gz"
-checksum=49d32e98a47a80a2a6cbd5d816938057d4ca3910e0a6a814b2c2a6520fbda9ba
+checksum=3c90f4bef1becdf583cc0ae201e694459edcd024e1d76bfeed3f417ecc163498
 
 post_install() {
 	vlicense LICENSE

From a30821d190974a1f037742947926e14c92651893 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sun, 17 Apr 2022 19:10:10 +0200
Subject: [PATCH 1478/1686] xfce4-panel: update to 4.16.4.

---
 srcpkgs/xfce4-panel/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 210113d3d67d..ce83d56a6c70 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
-version=4.16.3
-revision=2
+version=4.16.4
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-locales-dir=/usr/share/locale
@@ -12,9 +12,9 @@ makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel
 short_desc="Next generation panel for the XFCE desktop environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://xfce.org/"
+homepage="https://docs.xfce.org/xfce/xfce4-panel/start"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=5934eaed8a76da52c29b734ccd79600255420333dd6ebd8fd9f066379af1e092
+checksum=1faf51a81a655244dba4c6ac9dd33e3ab0d78a9ee096c218b38fed6642c9cd84
 
 # Package build options
 build_options="gir"

From 66b32fbacf1af5a5a37173af717bec91c0c85d96 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 18:09:35 +0200
Subject: [PATCH 1479/1686] gnome-settings-daemon: remove pulseaudio dependency

---
 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 9f8c9857eec6..c8be36b2a457 100644
--- a/srcpkgs/gnome-settings-daemon/template
+++ b/srcpkgs/gnome-settings-daemon/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-settings-daemon'
 pkgname=gnome-settings-daemon
 version=41.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dsystemd=false"
 hostmakedepends="cmake docbook-xsl gettext glib-devel libglib-devel libxslt
@@ -11,7 +11,7 @@ makedepends="NetworkManager-devel alsa-lib-devel colord-devel cups-devel gcr-dev
  libgweather-devel libnotify-devel librsvg-devel libwacom-devel nss-devel
  polkit-devel pulseaudio-devel startup-notification-devel upower-devel
  xf86-input-wacom-devel libXfixes-devel"
-depends="hicolor-icon-theme pulseaudio"
+depends="hicolor-icon-theme"
 checkdepends="elogind libnotify python3-dbusmock python3-gobject
  python3-pycodestyle which hwids eudev"
 short_desc="GNOME settings daemon"

From 1a20b58285290bac7ea62ab623bc134d28d6d8d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 18:09:35 +0200
Subject: [PATCH 1480/1686] mkchromecast: remove pulseaudio dependency

---
 srcpkgs/mkchromecast/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkchromecast/template b/srcpkgs/mkchromecast/template
index 161210796b90..306abdb6613f 100644
--- a/srcpkgs/mkchromecast/template
+++ b/srcpkgs/mkchromecast/template
@@ -1,11 +1,11 @@
 # Template file for 'mkchromecast'
 pkgname=mkchromecast
 version=0.3.8.1
-revision=4
+revision=5
 pycompile_dirs="/usr/share/mkchromecast/mkchromecast"
 depends="python3-Flask python3-netifaces python3-setuptools python3-requests
  python3-mutagen python3-psutil python3-PyQt5 python3-SoCo python3-chromecast
- python3-gobject pulseaudio python3-youtube-dl ffmpeg"
+ python3-gobject python3-youtube-dl ffmpeg"
 short_desc="Cast Linux Audio/Video to Google cast and Sonos devices"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From d1d7e6380871c117d0e1cbedb3d8af72cf6e13f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 7 Apr 2022 18:09:35 +0200
Subject: [PATCH 1481/1686] pasystray: remove pulseaudio dependency

---
 srcpkgs/pasystray/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/pasystray/template b/srcpkgs/pasystray/template
index a25bcc5af5b8..fc553ddc05fe 100644
--- a/srcpkgs/pasystray/template
+++ b/srcpkgs/pasystray/template
@@ -1,12 +1,11 @@
 # Template file for 'pasystray'
 pkgname=pasystray
 version=0.7.1
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool automake"
 makedepends="gtk+3-devel pulseaudio-devel libnotify-devel"
-depends="pulseaudio"
 short_desc="PulseAudio System Tray"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"

From 110be3b92986eeb5d1f63f30c06904085720aa6d Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 17 Apr 2022 15:55:01 -0700
Subject: [PATCH 1482/1686] kitinerary: temporarily ignore test failure

This test was fixed upstream, so this should be
 able to be removed after the next update
---
 .../temporarily-disable-broken-test.patch        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch

diff --git a/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch b/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch
new file mode 100644
index 000000000000..4e7bb1ce88bd
--- /dev/null
+++ b/srcpkgs/kitinerary/patches/temporarily-disable-broken-test.patch
@@ -0,0 +1,16 @@
+Temporarily disable the calendarhandler test.
+This test has been fixed upstream, so this should be able to be
+ removed in the next release.
+
+diff -Naur a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
+--- a/autotests/CMakeLists.txt	2022-04-18 11:34:57.356111303 -0700
++++ b/autotests/CMakeLists.txt	2022-04-18 11:33:56.175938220 -0700
+@@ -35,7 +35,7 @@
+ ecm_add_test(postprocessortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
+ ecm_add_test(extractorvalidatortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
+ if (TARGET KF5::CalendarCore)
+-    ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
++   #ecm_add_test(calendarhandlertest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)
+     ecm_add_test(extractortest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary KPim::PkPass)
+ endif()
+ ecm_add_test(documentutiltest.cpp LINK_LIBRARIES Qt::Test KPim::Itinerary)

From 0f29e7b0520757e55303a1677abecbab6f3c0fde Mon Sep 17 00:00:00 2001
From: Hervy Qurrotul Ainur Rozi <hervyqa@pm.me>
Date: Mon, 18 Apr 2022 15:22:04 +0700
Subject: [PATCH 1483/1686] signond: update to 8.61

---
 srcpkgs/signond/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/signond/template b/srcpkgs/signond/template
index 9a2f0cff8c26..6a3bb44122ab 100644
--- a/srcpkgs/signond/template
+++ b/srcpkgs/signond/template
@@ -1,7 +1,7 @@
 # Template file for 'signond'
 pkgname=signond
-version=8.60
-revision=3
+version=8.61
+revision=1
 wrksrc="signond-VERSION_${version}"
 build_style=qmake
 configure_args="LIBDIR=/usr/lib"
@@ -13,7 +13,7 @@ maintainer="John Rowley <enterthevoid@codesector.co>"
 license="LGPL-2.1-only"
 homepage="https://gitlab.com/accounts-sso/signond"
 distfiles="${homepage}/-/archive/VERSION_${version}/signond-VERSION_${version}.tar.gz"
-checksum=0da2a080e4b01f44855d1a519f828007a5c756ee93827db9098a1b4b880f28fe
+checksum=3dd57c25e1bf1583b2cb857f96831e38e73d40264ff66ca43e63bb7233f76828
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then

From 454e6d330e94b23777c35f52570370cd72939975 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 18:17:16 +0200
Subject: [PATCH 1484/1686] aisleriot: update to 3.22.22.

---
 srcpkgs/aisleriot/patches/guile-2.2.patch | 36 -----------------------
 srcpkgs/aisleriot/template                |  4 +--
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/aisleriot/patches/guile-2.2.patch

diff --git a/srcpkgs/aisleriot/patches/guile-2.2.patch b/srcpkgs/aisleriot/patches/guile-2.2.patch
deleted file mode 100644
index eb2ce5610b44..000000000000
--- a/srcpkgs/aisleriot/patches/guile-2.2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5e9b538db5304ccfed6c0d048a94d8c47dd27e31 Mon Sep 17 00:00:00 2001
-From: Jeremy Bicha <jeremy.bicha@canonical.com>
-Date: Thu, 17 Feb 2022 23:51:15 +0100
-Subject: [PATCH] games: Only use -Ono-letrectify with guile 3.0
-
-This fixes a build failure on guile 2.2 where this flag is unknown.
-
-Fixes: https://gitlab.gnome.org/GNOME/aisleriot/-/issues/925
----
- games/meson.build | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/games/meson.build b/games/meson.build
-index e552beab..56819b4d 100644
---- a/games/meson.build
-+++ b/games/meson.build
-@@ -122,9 +122,13 @@ guile_warnings = [
-   '-W1',
- ]
- 
--guile_flags = [
--  '-Ono-letrectify',
--]
-+guile_flags = []
-+
-+if guile_version.version_compare('>= 3.0')
-+  guile_flags += [
-+    '-Ono-letrectify',
-+  ]
-+endif
- 
- # FIXME: this should use files('...') (allowed as per docs),
- # but that crashes meson, see https://gitlab.gnome.org/chpe/meson/issues/2
--- 
-GitLab
-
diff --git a/srcpkgs/aisleriot/template b/srcpkgs/aisleriot/template
index d4d178b13c9e..11ad75cf3ad8 100644
--- a/srcpkgs/aisleriot/template
+++ b/srcpkgs/aisleriot/template
@@ -1,6 +1,6 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.21
+version=3.22.22
 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=fd7e7b58e1480dcc9d41b1ae8c9fcb1dd0e6c66eef0a5c1090784dddca9dd655
+checksum=0666b7b35037f796334cda104be5bda65977053f3cab0a3928624da7f236f8ae
 replaces="aisleriot-data>=0"

From c15cfb1f413178d8f83eebd3de865c377a0aabb8 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Fri, 15 Apr 2022 15:27:17 +0200
Subject: [PATCH 1485/1686] qtractor: update to 0.9.26

---
 srcpkgs/qtractor/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index b9df4028f2ac..9ccd9cb666b7 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -1,8 +1,8 @@
 # Template file for 'qtractor'
 pkgname=qtractor
-version=0.9.24
+version=0.9.26
 revision=1
-_vst3sdk_tag=3.7.3_build_20
+_vst3sdk_tag=3.7.4_build_25
 wrksrc="qtractor-qtractor_${version//./_}"
 create_wrksrc=yes
 build_wrksrc="qtractor-qtractor_${version//./_}"
@@ -24,11 +24,11 @@ distfiles="https://github.com/rncbc/qtractor/archive/qtractor_${version//./_}.ta
  https://github.com/steinbergmedia/vst3_base/archive/v$_vst3sdk_tag.tar.gz>vst3_base-v${_vst3sdk_tag}.tar.gz
  https://github.com/steinbergmedia/vst3_pluginterfaces/archive/v$_vst3sdk_tag.tar.gz>vst3_pluginterfaces-v${_vst3sdk_tag}.tar.gz
  https://github.com/steinbergmedia/vst3_public_sdk/archive/v$_vst3sdk_tag.tar.gz>vst3_public_sdk-v${_vst3sdk_tag}.tar.gz"
-checksum="724b80587f844cfc7c58c22d69d6ff1cd30c7752c2116e55837f468edb6bf4d1
- 815e51e84e6ed900f6103f00e847bee175c2dc95b16a73ae60719daa0e24ad95
- d69d28a6a932d3c946749c9aeb6220b028d7af7ab10f83e4e732e760347fe796
- 313f3e8c8f080d514763b3e88964a0820851d81f1159219628e1ed188fdb7303
- 63cd7e3bf0be8ec9b3934ebdc145e13af84004c988071ecbed1aa5c8f8277d80"
+checksum="bf1f89a805166e99ca4b9bfc66f8bb1d71a258bf611b1e9e90613cd46799e6a4
+ 24f79a670d8f3c7aac34e1340f2d12763beabc9229d61b6f806d850675c8c5f6
+ ee333bd17ad533135481c163d85c99fe4d3cdb3e49214eb5adb17ffb1897a423
+ 59326a77b5df73ec6a35925a4005874ee3e29a2dbd6e6b88905d03b90fc9c3a5
+ 3b321b7f2289c7204bceae1f6640d74b6cf35b474f98da7a50ed36c24e019831"
 
 post_extract() {
 	cd $wrksrc

From aa34d71e5518e54f88639f61bd7a83fcb22c607e Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Fri, 15 Apr 2022 12:21:27 +0200
Subject: [PATCH 1486/1686] mkvtoolnix: update to 67.0.0

---
 srcpkgs/mkvtoolnix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 98317332f361..7f84979ecc3f 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
 # Template file for 'mkvtoolnix'
 pkgname=mkvtoolnix
-version=66.0.0
+version=67.0.0
 revision=1
 build_style=gnu-configure
 build_helper=qmake
@@ -17,7 +17,7 @@ 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=73a3f6c39b3580f28233f93555d282d07d5f51a8bbeb8b0bee09b820de80692c
+checksum=db68be91ee8a0b688d924cc00d3bac9349306d54c29ce44a555728c1abb7d3ec
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"

From 327a6833319bc7a4438e6a3c38ef18deca6e4c36 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 18 Mar 2022 17:42:40 +0200
Subject: [PATCH 1487/1686] yaru: update to 22.04.4.

---
 srcpkgs/yaru/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yaru/template b/srcpkgs/yaru/template
index c2bf7e2503af..94264394ad6d 100644
--- a/srcpkgs/yaru/template
+++ b/srcpkgs/yaru/template
@@ -1,6 +1,6 @@
 # Template file for 'yaru'
 pkgname=yaru
-version=22.04.1
+version=22.04.4
 revision=1
 build_style=meson
 configure_args="-Dxfwm4=true"
@@ -11,4 +11,4 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-3.0-or-later, CC-BY-SA-4.0"
 homepage="https://github.com/ubuntu/yaru"
 distfiles="https://github.com/ubuntu/yaru/archive/$version.tar.gz"
-checksum=fbd4c19c16817eec74845d9723ebffb90f1897e0d085384f31f4b4d6c32a91ee
+checksum=e8b85d3b1965b4611b4280b4d53b8deafdac754f795a8aad43c22ddb3308025e

From 3088cbae527e41fba57664197a38d51ba19c70bf Mon Sep 17 00:00:00 2001
From: Barbaross <cullenrss@gmail.com>
Date: Mon, 18 Apr 2022 09:54:39 -0400
Subject: [PATCH 1488/1686] vit: update to 2.2.0

---
 srcpkgs/vit/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/vit/template b/srcpkgs/vit/template
index 173648d69b95..9eb3596b5d31 100644
--- a/srcpkgs/vit/template
+++ b/srcpkgs/vit/template
@@ -1,17 +1,17 @@
 # Template file for 'vit'
 pkgname=vit
-version=2.1.0
+version=2.2.0
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="task python3-pytz python3-urwid python3-tzlocal python3-tasklib"
+depends="task python3-urwid python3-tasklib"
 checkdepends="python3-pytest $depends"
 short_desc="Visual Interactive Taskwarrior full-screen terminal interface"
 maintainer="Cullen Ross <cullenrss@gmail.com>"
 license="MIT"
 homepage="https://github.com/vit-project/vit"
 distfiles="${PYPI_SITE}/v/vit/vit-${version}.tar.gz"
-checksum=fd34f0b827953dfdecdc39f8416d41c50c24576c33a512a047a71c1263eb3e0f
+checksum=e866c8739822b9e73152ab30c9a009c3aef947533c06f7a5cb244d15c4ea296f
 
 do_check() {
 	TERM=linux python3 -m pytest

From d38d67699eb5801d507ddc7a43675843ff120bd3 Mon Sep 17 00:00:00 2001
From: clyhtsuriva <aimeric@adjutor.xyz>
Date: Fri, 15 Apr 2022 07:54:08 +0200
Subject: [PATCH 1489/1686] pyradio: update to 0.8.9.16

---
 srcpkgs/pyradio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template
index 1c2670682351..042fd3d257ee 100644
--- a/srcpkgs/pyradio/template
+++ b/srcpkgs/pyradio/template
@@ -1,6 +1,6 @@
 # Template file for 'pyradio'
 pkgname=pyradio
-version=0.8.9.14
+version=0.8.9.16
 revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ license="MIT"
 homepage="http://www.coderholic.com/pyradio/"
 changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog"
 distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz"
-checksum=76e06934926a1acfd7bba3735d8e0b387d7985dd38a398376877b6fd7da71940
+checksum=2ccd644ea93a0538162fa673863d68e5934edd82350b2dacfffc33b2396f8aeb
 make_check=no # pytest reports "no tests ran"
 
 post_install() {

From 76420c6b95f0bf9973185b0aa3250d400e7c1cfe Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 17 Apr 2022 21:56:07 +0200
Subject: [PATCH 1490/1686] stress-ng: update to 0.14.00.

---
 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 d13629b279bc..986b096bf1c4 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.13.12
+version=0.14.00
 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="https://github.com/ColinIanKing/stress-ng/"
 distfiles="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${version}.tar.gz"
-checksum=16540d9cfa80d6a274fc0238d7251675ee38df6d5be805d14a67ce9efcb59ce9
+checksum=d0cc53073e0c2499e15044fbd5a0df0176521575ea13fba01f67834b9e07d19d

From 06b828d490664c9e7f2819d31ae4484fe580bdbf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Apr 2022 14:14:36 +0200
Subject: [PATCH 1491/1686] babashka: update to 0.8.1.

---
 srcpkgs/babashka/template | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template
index 5a2292af27bf..a8fbeff23b0d 100644
--- a/srcpkgs/babashka/template
+++ b/srcpkgs/babashka/template
@@ -1,6 +1,6 @@
 # Template file for 'babashka'
 pkgname=babashka
-version=0.7.8
+version=0.8.1
 revision=1
 hostmakedepends="mandrel leiningen git"
 makedepends="zlib-devel"
@@ -10,14 +10,14 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://babashka.org/"
 changelog="https://github.com/babashka/babashka/blob/master/CHANGELOG.md"
-_sci_commit=4eb8e99e18942ba9c3b7ec3c4707d8237f970035
-_babashka_curl_commit=3d3d117ea0f8a143a06e3cace92e4e8b6a5782df
+_sci_commit=2af989d0eb80741b026fd2355442033b05a3b181
+_babashka_curl_commit=8a27e6060a739c7580cc89ba2bfddf48881e7178
 _babashka_nrepl_commit=d3fce67198b042707f01d841c032f841cc57ab7f
 _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712
-_process_commit=5db9560eab698f9773537acb0167f38d6fd0d322
-_pods_commit=538fc6f4147badf3a457b3eb8f9f95dd3bc947b1
-_deps_clj_commit=6636890388cdf779708806a93110b165577cd226
-_fs_commit=2bf527f797d69b3f14247940958e0d7b509f3ce2
+_process_commit=1eebafc696e9bac7538c296d5a7c1fde977ad523
+_pods_commit=e075b13bfe3666a73f82c12817bdf5f1d6c692e3
+_deps_clj_commit=c948c2f5c1e240c0e0ea4201877695f729ee309e
+_fs_commit=dc73460e63ff10c701c353227f2689b3d7c33a43
 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e
 distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz
  https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz
@@ -29,15 +29,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta
  https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz
  https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz
  https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz"
-checksum="23a08adcc9237be9f24c1781cb646514434dbcb651aac00c3eedca763ca25086
- 0766f0a8be23e94efefbfc16c5987f1dab4520da3294f1bccef402f97898c490
- 45abdaa5e4effd3bcfea777d02844d4634f1f80a592843eca9ec7d3544b7e16d
+checksum="e7084426aa86f79684e66b1ee112da26f2b9e05b259d7d19acbb1a7c8d380338
+ 0d8c40688df17c3441a1a6c1005dc11538ed841fc74fa12396d6057fdf88a5e2
+ d8e57bc67f237a5cfea90a6c38f9e303c1591250624087e348600af72e8910fa
  b56a06bf113bcd85084d48f595541447014308860d9c45efcde5b02e859c934c
  9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b
- b6671246a1f0742bd4ae4d1f7b0afe4101d6c8907060455e0473c2ef966e370c
- 7fea6762ecbb31d454e0b5c194d12e1e6d4ec301972aa33daf617b571e097678
- fee3f84f935d141cf7343d7bab19c3eef56fdb2f3dac4a950db71c9b083e0d17
- e5b92a25221b735941861968a5570a4169da1aee7f2a7545975afe930cb8574f
+ 09ea197a0381a1f5be268da5c1470646bef01eef85add16541e32e0bb2da5d1f
+ 4aca4c1e15576309f33352bbed9dd9e7f0af5eca9f725dd8593ae1cb32cae8c3
+ af8a90dba22d980e536a901b833ccf38816c8944b72b32c10d3134869eced4e2
+ af930f686933ef74b0d857abb0f763d6fe0d5b0452a4c13e5b10207288feae86
  bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709"
 
 nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio"

From 0e23910758c807f7ef1f6d51b78a70c920aba407 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Apr 2022 14:15:48 +0200
Subject: [PATCH 1492/1686] jet: update to 0.1.1.

---
 srcpkgs/jet/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jet/template b/srcpkgs/jet/template
index 58b209817581..0a0bb5113cf8 100644
--- a/srcpkgs/jet/template
+++ b/srcpkgs/jet/template
@@ -1,6 +1,6 @@
 # Template file for 'jet'
 pkgname=jet
-version=0.1.0
+version=0.1.1
 revision=1
 hostmakedepends="mandrel leiningen"
 makedepends="zlib-devel"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="EPL-1.0"
 homepage="https://github.com/borkdude/jet"
 distfiles="https://github.com/borkdude/jet/archive/refs/tags/v${version}.tar.gz"
-checksum=faed01c3d31631332fa60fd6f1bb39ae4a2f6cfc396a8747d5cfce4f1053a99c
+checksum=2085cd757607eebfdcc6107f507e362b88952f5cd7139127ba9c47708bbd91c4
 nocross="mandrel"
 
 do_build() {

From 32b6746a2e0239871bb7188765fce00d5587d8e5 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 18 Apr 2022 14:17:16 +0200
Subject: [PATCH 1493/1686] bmake: update to 20220414.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 5eac7a6f158f..58cf70979203 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20220330
+version=20220414
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=4b46d95b6ae4b3311ba805ff7d5a19b9e37ac0e86880e296e2111f565b545092
+checksum=10ee07a7be26b22ce6a3bbc386e2916ca8e51b0ed2d256c271a7135e3c94f2a7
 python_version=3
 
 do_configure() {

From 5b515e8c6091c60eb460dca4c74f75ad0890fa89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 22 Sep 2020 23:20:57 +0200
Subject: [PATCH 1494/1686] yaboot: fix build w/ gcc10 and host i686/x86_64

The -fcommon is required for gcc10 to build yaboot.
Adding --build=$XBPS_TRIPLET seems to be a good idea in any case
according to the autoconf manual, see the document at:
https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Hosts-and-Cross_002dCompilation.html

Still gives an error for me trying to build for ppc-musl using any
x86 host environment, be it glibc or musl libc.

More patches required or something else may be wrong?
---
 srcpkgs/yaboot/patches/0003-build-system.patch | 6 ++++--
 srcpkgs/yaboot/template                        | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yaboot/patches/0003-build-system.patch b/srcpkgs/yaboot/patches/0003-build-system.patch
index 8fdf419f1870..6dcd018b34c2 100644
--- a/srcpkgs/yaboot/patches/0003-build-system.patch
+++ b/srcpkgs/yaboot/patches/0003-build-system.patch
@@ -22,7 +22,7 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
  # command used to get root (needed for tarball creation)
  GETROOT = fakeroot
  
-@@ -32,14 +32,17 @@ LD		:= $(CROSS)ld
+@@ -32,14 +32,18 @@ LD		:= $(CROSS)ld
  AS		:= $(CROSS)as
  OBJCOPY		:= $(CROSS)objcopy
  
@@ -39,10 +39,11 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
  YBCFLAGS += -DKERNELADDR=$(KERNELADDR)
 -YBCFLAGS += -Werror -fdiagnostics-show-option
 +YBCFLAGS += -fgnu89-inline -fno-builtin-malloc -fno-stack-protector -no-pie
++YBCFLAGS += -fcommon
  YBCFLAGS += -I ./include
  YBCFLAGS += -fno-strict-aliasing
  
-@@ -69,12 +72,12 @@ LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux
+@@ -69,12 +72,13 @@ LFLAGS = -Ttext $(TEXTADDR) -Bstatic -melf32ppclinux
  
  # Libraries
  #
@@ -54,6 +55,7 @@ Also do not strip the binaries upon install, xbps-src will take care of that.
  UCFLAGS = -Os $(CFLAGS) -Wall -I/usr/include
 -UCFLAGS += -Werror -fdiagnostics-show-option
 +UCFLAGS += -fdiagnostics-show-option
++UCFLAGS += -fcommon
  
  # For compiling build-tools that run on the host.
  #
diff --git a/srcpkgs/yaboot/template b/srcpkgs/yaboot/template
index 8d2adf264b73..a61158c899fd 100644
--- a/srcpkgs/yaboot/template
+++ b/srcpkgs/yaboot/template
@@ -58,6 +58,7 @@ _build_e2fsprogs() {
 		if [ -n "$_need_cross" -o -n "$CROSS_BUILD" ]; then
 			# using a crosscompiler, set up configure/compiler for that
 			_args+=" --host=${_need_cross:-$XBPS_CROSS_TRIPLET}"
+			_args+=" --build=$XBPS_TRIPLET"
 			_ecc="${_need_cross:-$XBPS_CROSS_TRIPLET}-gcc"
 			_ear="${_need_cross:-$XBPS_CROSS_TRIPLET}-ar"
 		fi

From f9d9ae26fea02fa32882616d6d249b3ac6501447 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:17:39 +0200
Subject: [PATCH 1495/1686] xpdf: update to 4.04.

---
 srcpkgs/xpdf/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xpdf/template b/srcpkgs/xpdf/template
index 3c66f615f115..854150d56eb5 100644
--- a/srcpkgs/xpdf/template
+++ b/srcpkgs/xpdf/template
@@ -1,6 +1,6 @@
 # Template file for 'xpdf'
 pkgname=xpdf
-version=4.03
+version=4.04
 revision=1
 build_style=cmake
 configure_args="-DSYSTEM_XPDFRC=/etc/xpdfrc"
@@ -13,10 +13,10 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="http://www.xpdfreader.com/"
 distfiles="https://dl.xpdfreader.com/xpdf-${version}.tar.gz"
-checksum=0fe4274374c330feaadcebb7bd7700cb91203e153b26aa95952f02bf130be846
+checksum=63ce23fcbf76048f524c40be479ac3840d7a2cbadb6d1e0646ea77926656bade
 
 post_extract() {
-	sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
+	vsed -i -e 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
 }
 
 post_install() {

From 11e43047762198fa9cfb24891b759839ae091bfa Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:18:24 +0200
Subject: [PATCH 1496/1686] spectre-meltdown-checker: update to 0.45.

---
 srcpkgs/spectre-meltdown-checker/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spectre-meltdown-checker/template b/srcpkgs/spectre-meltdown-checker/template
index 23e3f2c00bdf..b3a5163801c3 100644
--- a/srcpkgs/spectre-meltdown-checker/template
+++ b/srcpkgs/spectre-meltdown-checker/template
@@ -1,6 +1,6 @@
 # Template file for 'spectre-meltdown-checker'
 pkgname=spectre-meltdown-checker
-version=0.44
+version=0.45
 revision=1
 short_desc="Spectre & Meltdown vulnerability/mitigation checker for Linux"
 depends="binutils"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/speed47/spectre-meltdown-checker"
 distfiles="https://github.com/speed47/spectre-meltdown-checker/archive/v${version}.tar.gz"
-checksum=96765d765275476c36a146da123fa7e9eb310a84e84ae71b179c9ace3b6ab0c8
+checksum=32db6b73b9a3b08c165cac39446c856a07ac3d17c6b556ce08a9e99dd5600ea7
 
 do_install() {
 	vbin spectre-meltdown-checker.sh spectre-meltdown-checker

From 5df3e041cbee755d61fd1a06bd558e46fcac8574 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:19:28 +0200
Subject: [PATCH 1497/1686] makedumpfile: update to 1.7.1.

---
 srcpkgs/makedumpfile/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/makedumpfile/template b/srcpkgs/makedumpfile/template
index ba00074bc4e1..e91ab999560d 100644
--- a/srcpkgs/makedumpfile/template
+++ b/srcpkgs/makedumpfile/template
@@ -1,6 +1,6 @@
 # Template file for 'makedumpfile'
 pkgname=makedumpfile
-version=1.7.0
+version=1.7.1
 revision=1
 makedepends="elfutils-devel zlib-devel bzip2-devel liblzma-devel lzo-devel"
 depends="perl"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/makedumpfile/makedumpfile"
 distfiles="${homepage}/archive/refs/tags/${version}.tar.gz"
-checksum=8985f8df249087ea68c6051dec6dac3ef0703fe2aa87d0266f3951f93aa8da5e
+checksum=cb04b1bd0e750d0d0ac1b43b759b326d4a3797b0af08e0c269d1b155893fb664
 
 post_extract() {
 	sed -i '/#define PAGESIZE/i#undef PAGESIZE' makedumpfile.h

From 6b129a5feae38c31313af5d4f09420c4f3d13892 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 19 Apr 2022 13:19:56 +0200
Subject: [PATCH 1498/1686] mcelog: update to 181.

---
 srcpkgs/mcelog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mcelog/template b/srcpkgs/mcelog/template
index 9707998bd78b..90429083870c 100644
--- a/srcpkgs/mcelog/template
+++ b/srcpkgs/mcelog/template
@@ -1,6 +1,6 @@
 # Template file for 'mcelog'
 pkgname=mcelog
-version=180
+version=181
 revision=1
 archs="i686* x86_64*"
 hostmakedepends="python3"
@@ -10,7 +10,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=e9c82b565da06673c2630f9e6bc668634ad7d2c7f13c70db1900cce110ae62dc
+checksum=924e84e235231fd2b5e6ad527e87fd8977113cf170d8bd4ebac5d4781ff7b172
 
 do_build() {
 	make CC=$CC CFLAGS="$CFLAGS $LDFLAGS" ${makejobs}

From cf069c7508bf5d7671cfd777af4dcf6e01382a1f Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 18 Apr 2022 19:50:48 +0200
Subject: [PATCH 1499/1686] linux5.4: update to 5.4.189.

---
 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 ac636bc1d2ff..770cb9be83ad 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.188
+version=5.4.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/v5.x/linux-${version}.tar.xz"
-checksum=9fbc8bfdc28c9fce2307bdf7cf1172c9819df673397a411c40a5c3d0a570fdbc
+checksum=8485d536531833cd2dbca0a7f267daff69ede5c9831cb693acc8318447e568c6
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 7704a7c08628b7d885bfc86142c7bfbfbfebfbb8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Mon, 18 Apr 2022 19:54:03 +0200
Subject: [PATCH 1500/1686] linux4.19: update to 4.19.238.

---
 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 cb61654da418..d6916078343b 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.237
+version=4.19.238
 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=bafff35102cc486ec2bf94c6d908be8e24017b2e4a1873f52f24c855eb220cd8
+checksum=83b74545c5d380384e09955c26e786bf9ee81a44bcf9347f2ca2ad3d31b46b7a
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 6e40130ca426c30ce45036815fbd2d988c755791 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 16 Apr 2022 14:02:47 +0200
Subject: [PATCH 1501/1686] texlive2022-bin: install infraonly by default,
 tweak INSTALL.msg.

---
 srcpkgs/texlive2022-bin/INSTALL.msg | 18 +++++-------------
 srcpkgs/texlive2022-bin/template    | 11 +++++++----
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/texlive2022-bin/INSTALL.msg b/srcpkgs/texlive2022-bin/INSTALL.msg
index 05a58d965c72..1ccb0429afc2 100644
--- a/srcpkgs/texlive2022-bin/INSTALL.msg
+++ b/srcpkgs/texlive2022-bin/INSTALL.msg
@@ -1,11 +1,4 @@
-- TeXLive is free software see the files:
-
-  /usr/share/licenses/texlive2022-bin/LICENSE.TL
-  /usr/share/licenses/texlive2022-bin/LICENSE.CTAN
-
-=====================================================================
-
-  To update you TeXLive installation use only the program 
+  To update your TeX Live installation use only the program 
 
   /opt/texlive/2022/bin/<arch>/tlmgr
 
@@ -13,13 +6,12 @@
     - x86_64-linux  ==> x86_64 architecture
     - i386-linux    ==> i386 architecture
 
-  see:
-
+  for details 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
+  WARNING: To avoid messing up your TeX Live installation, DON'T use
   the installation scripts in /opt/texlive-installer.
 
+  This package only installs TeX Live infrastructure now, not TeX Live itself.
+  For a basic installation (previous default), run "tlmgr install scheme-basic".
   For a full installation, run "tlmgr install scheme-full".
diff --git a/srcpkgs/texlive2022-bin/template b/srcpkgs/texlive2022-bin/template
index 902d4dc245d7..679a1e4e4bdd 100644
--- a/srcpkgs/texlive2022-bin/template
+++ b/srcpkgs/texlive2022-bin/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive2022-bin'
 pkgname=texlive2022-bin
 version=2022
-revision=1
+revision=2
 archs="x86_64* i686 aarch64 arm*"
 create_wrksrc=yes
 depends="cairo pixman graphite gd poppler libsigsegv
@@ -15,8 +15,9 @@ distfiles="ftp://ftp.tug.org/texlive/historic/${version}/install-tl-unx.tar.gz>$
 checksum=e67edec49df6b7c4a987a7d5a9b31bcf41258220f9ac841c7a836080cd334fb5
 
 # Package build options
-build_options="basic small medium full"
-build_options_default="small"
+build_options="infraonly basic small medium full"
+build_options_default="infraonly"
+desc_option_infraonly="Install TeXLive infrastructure only"
 desc_option_basic="Install TeXLive using scheme-basic"
 desc_option_small="Install TeXLive using scheme-small"
 desc_option_medium="Install TeXLive using scheme-medium"
@@ -31,7 +32,9 @@ 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
+	if [ "$build_option_infraonly" ]; then
+		echo "selected_scheme scheme-infraonly"
+	elif [ "$build_option_basic" ]; then
 		echo "selected_scheme scheme-basic"
 	elif [ "$build_option_small" ]; then
 		echo "selected_scheme scheme-small"

From b2ff2e4c4067285dca3c42763f5dd4f348374448 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:38:58 -0400
Subject: [PATCH 1502/1686] openjdk17: update to 17.0.3+5.

---
 srcpkgs/openjdk17/template | 43 +++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 19fa38707f00..7e368f9b687e 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,15 +1,14 @@
 # Template file for 'openjdk17'
-_java_ver=17
-_java_min_ver=0
-_java_sec_ver=3
-_jdk_update=1
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk17
-version="${_base_version}+${_jdk_update}"
+version=17.0.3+5
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}"
+_gtest_ver=1.8.1
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+create_wrksrc=yes
+build_wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --enable-unlimited-crypto
@@ -19,8 +18,9 @@ configure_args="--disable-warnings-as-errors
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-gtest=${XBPS_BUILDDIR}/googletest-release-1.8.1
+ --with-gtest=../googletest-release-${_gtest_ver}
  --with-debug-level=release
+ --with-native-debug-symbols=internal
  --with-jobs=${XBPS_ORIG_MAKEJOBS}
  --with-version-pre=
  --with-version-build=${_jdk_update}
@@ -38,15 +38,16 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
 depends="${pkgname}-jre-${version}_${revision}"
-provides="java-environment-${version}_1"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
- https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
-checksum="0fac6d90091fc16678a14349e578f6c1cf29738d55508f9f723fbb69469f6867
+ https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
+checksum="a557f4d2972bbbbcdc12fa7e167ad60b4ee1461a9bc7ad259a003172c34e6331
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+provides="java-environment-${version}_1"
+patch_args="-Np1 --directory=$build_wrksrc"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -79,10 +80,6 @@ else
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk17"
 fi
 
-if [ -n "$XBPS_DEBUG_PKGS" ]; then
-	configure_args+=" --with-native-debug-symbols=internal"
-fi
-
 alternatives="
  java:/usr/bin/java:/${_jdk_home}/bin/java
  java:/usr/bin/jfr:/${_jdk_home}/bin/jfr
@@ -120,9 +117,9 @@ alternatives="
 "
 
 post_extract() {
-	chmod +x configure
+	chmod +x $build_wrksrc/configure
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		rm -r src/jdk.hotspot.agent
+		rm -r $build_wrksrc/src/jdk.hotspot.agent
 	fi
 }
 
@@ -171,11 +168,6 @@ post_install() {
 	rm -rf ./ca
 }
 
-do_clean() {
-	# clean up gtest
-	rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
-
 subpackages="openjdk17-src openjdk17-jre openjdk17-doc"
 
 openjdk17-jre_package() {
@@ -213,11 +205,10 @@ openjdk17-doc_package() {
 	noshlibprovides=yes
 	short_desc+=" - documentation"
 	pkg_install() {
-		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			local _docdir=usr/share/doc/openjdk$_java_ver
 			vmkdir $_docdir
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir
+			cp -a $wrksrc/$build_wrksrc/build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir
 		fi
 		vmove $_jdk_home/man/man1
 	}

From c39a847694bf39377cb924015d5062c127b25e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= <benalb@gmail.com>
Date: Tue, 19 Apr 2022 16:58:10 +0200
Subject: [PATCH 1503/1686] postfix: update to 3.7.1.

---
 srcpkgs/postfix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 38a7e61f2171..466de1f19105 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,6 +1,6 @@
 # Template file for 'postfix'
 pkgname=postfix
-version=3.7.0
+version=3.7.1
 revision=1
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmariadbclient-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="IPL-1.0, EPL-2.0"
 homepage="https://www.postfix.org/"
 distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
-checksum=645c6a74959703f8dff5b696b2df2e8bc0c91ac530127a21c998e3defbb9528c
+checksum=25c3e7ec09955af873407af3070fd259da8477b80e2f4663c5fdc00a2cc947ee
 
 system_accounts="postfix"
 postfix_homedir="/var/spool/postfix"

From df84c57f29206cfa772bb6fd3f116af5c606267f Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <overtwist_wt@aleeas.com>
Date: Mon, 18 Apr 2022 16:04:34 +0200
Subject: [PATCH 1504/1686] font-unifont-bdf: update to 14.0.03.

---
 srcpkgs/font-unifont-bdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template
index ce94f9be9c3c..675429a16aa2 100644
--- a/srcpkgs/font-unifont-bdf/template
+++ b/srcpkgs/font-unifont-bdf/template
@@ -1,6 +1,6 @@
 # Template file for 'font-unifont-bdf'
 pkgname=font-unifont-bdf
-version=14.0.01
+version=14.0.03
 revision=1
 create_wrksrc=yes
 depends="font-util"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://unifoundry.com/unifont/index.html"
 distfiles="http://unifoundry.com/pub/unifont/unifont-${version}/font-builds/unifont-${version}.bdf.gz"
-checksum=391d194f6307fcd0915daafd360509a734e26f3e4013e63d47deb2530d59e66e
+checksum=6323f50b1b0b50224988e5f7aec2bd26bd78563bbb7e05c417dc5b7b4a06acb5
 font_dirs=/usr/share/fonts/misc
 
 do_install() {

From e3cb5643d3a0bf9ca87914f9cc7b8d9dae1292c8 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Sun, 17 Apr 2022 16:31:52 +0300
Subject: [PATCH 1505/1686] skype: update to 8.83.0.408.

---
 srcpkgs/skype/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template
index 7760c535079c..5305633214e0 100644
--- a/srcpkgs/skype/template
+++ b/srcpkgs/skype/template
@@ -1,7 +1,7 @@
 # Template file for 'skype'
 # This just repackages the rpm package.
 pkgname=skype
-version=8.82.0.403
+version=8.83.0.408
 revision=1
 archs="x86_64"
 create_wrksrc=yes
@@ -12,7 +12,7 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="custom:skype-servicesagreement" # no vlicense
 homepage="https://www.skype.com"
 distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm"
-checksum=df903a805c3db301d8846e5fcfe2ec5acbea720c49f3031edb50d416f5a52a24
+checksum=f6dc153980f74b3b75241b2c4d0c1c866391963778af5d96fa0aa28b24a693c2
 repository="nonfree"
 nostrip="yes"
 

From 509115c1d7e34e6395b401a93b023e56e8588ab2 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Wed, 13 Apr 2022 18:28:10 +0100
Subject: [PATCH 1506/1686] thunderbird-i18n: update to 91.8.0.

---
 srcpkgs/thunderbird-i18n/template | 110 +++++++++++++++---------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template
index f95f0e304a80..0a299d66d969 100644
--- a/srcpkgs/thunderbird-i18n/template
+++ b/srcpkgs/thunderbird-i18n/template
@@ -1,6 +1,6 @@
 # Template file for 'thunderbird-i18n'
 pkgname=thunderbird-i18n
-version=91.5.0
+version=91.8.0
 revision=1
 build_style=meta
 short_desc="Thunderbird language packs"
@@ -95,57 +95,57 @@ _pkgtmpl() {
 	}
 }
 
-checksum="153b74896853e462e9ae9cf9098f0b6f34116559975861e6c9f04e8010c0842a
- fd018fcbeceace184dc1f4b1e1623511eb0a8ecc1ae1b956ffa170842fefcc73
- 550f2310775beb5ce913b6bfa593fa04776c1927c87cf8079eaaf10f6d8b0537
- 99c61014976faafeb2e813ad74b1678e2128ddc0a76bfcbba7cf6c602c11a223
- 7aeb9c9c9aaaacb2a84a5491aff9588c8b426ea08e0a43d2c63c091b47cfc5d0
- a30026739c7e130ad1d9196c19da72eea6c16c7571f6073aea4c0f80f10d8f3c
- 7941933c4c80d4f1109db2a3f584518c6995aa8746b0f4ab4a6f70706becb0de
- 1840fbf5e814853fdd976e20bb4a432c210321bdf8cdc5b5c26a593afea41d94
- d04205f28a0ffed85aa1b11de42d46063db482392a71e0ad8f5074b142c6deb8
- 1dc362d91c8699a81ec4070af6422f97bd275ef01acda4dd41634c1af6415609
- 9207a8c1a98ca2fa51efb54f12a79d9cae0e03faf5941bfc6cd66b0f02bddd40
- fac6239a5e043b75ff595fa670b23f0520e93bd3c8e4aabce0340db72dab1909
- 4642127f3e521d130d246acbe8df7f2f8b2b461cd357839773bc0f73b76ddf82
- adce6a6c77997f9e9fe08a20012ce8ed88116963599c348763d36a0c196af1a1
- 6608e4c2bb3c396cb35794d5b90eec5c3403b319e3d220088331b7b3fb5f45e6
- d6cbd9e7089f05928202cb95340d94322714036cdf2bd50777e09300d60b35e2
- 965b43d20a9abaabe8f7d07dd5bf2c522d73754e52dc9eb4e917568e14f03ef4
- 17a78d93de483a0097504683b29752449ea1cdd0578313428b39c9d6959b4fc2
- 75238449104d85368cfbefb2d06fe92113f4ba719fbfa1d4da5fe46a3be63d0f
- f8765c44569a1eead7f96c30cae8e34557597c03ae0778859135e637370f6769
- 1675ad25f3d7372fe8e004f1a5df4eeb4d11042574d67546d99c696f76bb416b
- 17d1c9c752a31c0d123de4fa84b5c0a06bdadb7ecfb3fedab4cad22289ac2cba
- eaeedd14c00ffb253b6d6ccf66f131940a44e190c77e232ded88a13b6b7e3b59
- 5ab29c16330c3951236839af54081d282cf0de17f18e1421b7e6d812cafefff4
- d6a9ab1ca1a3f9613a00f1f6296568d3da6ce850a7e797ce377e9516c8b78837
- 38bba476644a2f0ccc636ac176e501b85f3ef8c912c7ff9b9cc4ebac74d83cdd
- 4338ff7ef6adfaf0308616128bf00d190372b8818d421527dc5742d8f3ed4918
- 38d88509c005ad62601a368a284b745570e33a9724da1a1ff41e6feaaa4273fc
- 031b23573ec355d23ebe18615a86216ab30a95e04525ace23f7f4d7ba8245c41
- cc95bfa23f1468ca5a670dea7d67b579d18166332fc17942c4733ce249a882ce
- b21a892bd65dbd12e6f047079bfa8e6175c58167e7c8defc3ee285eefd738d41
- 494796c4657fa6283400b9cd9ff54bed947068222f9e94d0131033d953d37176
- 44e135062450c53044b412447b6d0a722fc5a99658ed7ec3c741dbbe91ecd736
- ea62afd388cc7c30c0a1a2e161e1154742e535b1177c718ca0620de7e296fe61
- 67d954bd71dc1a21d28bd410a0c633c4c3d93bcb53095d349c470a270c242d39
- 6a63ff0bbf96411935ba101baa7286315e70ccbc0bbc1e8f5ede822c901a23b2
- 18d6578ffebd4867b01918f7a154a317b054d5fd55418f61657cac05a995ee1a
- 22bdf3404e59627ab73ee64394efb0275741b7b9c1d31d134d5612242e1858e6
- 9eb94a5b380f084625e605f20a388a9b75455c07e49bc73ab4bc94e2d52baee8
- 60ed67eb52c673b168b42f385ac05e4f0cec906002f46dd0dabbf807777c3302
- 6711681f44fd41ee493c7ccd618d98ecce24354073d72ca59ca60df1a3b53f2b
- f0fe96cec503d05033651489aa6251f8279fa0f0323818df9f17fce56cdeebb6
- b012c406274bb8a4131546cf363d4828a7e55f1e6221559d5313137de886bf7f
- bce8e92d31183afb48fba2b78339d9404cf87b67a9d2f13db09672fc8539dacf
- 6a3c56c782219a0f3951d90700f3c63cc69266f8d4546f19281194cc3101588b
- a8bfaa012718716c45727f207fadfebdf1dc06a66628d284bc60d8d37087caa6
- cfecad5b1cf8c233ad01af7489959d5d680028851fb676356ace00cb737b7eae
- 8a0aea8d91a3978378166219f5aaebe7aca91b199fcfe3227752ed3f443d3612
- 6ff82ddcf1974b8bc7a44789e1d4238e92a8d5cea2c14daf1a4f57f6ae98c983
- 9483d7dca9c450483c9be9c21ff77e191f62e41120fdc186fe766bfedec805af
- 14eccd3edf9c4be0ece562c4bda88bb0512d846c79e5480478569493268a6a6f
- 3be16dd793abe690471bdfc633c41bad85172603aeb78145ca5290332ece9ff6
- f886871be3055d85d9bfdff63b5d24209af97a04d8504f5afb631ef0a1372088
- abd7ff3fae4d2d3459bff96bdde26cc62f045edbaf9eba8b457ade3c17f7a57e"
+checksum="e338b3f00ce13b8b98213d9fb53dbdeaef8082517a2cda06a62c59d8f4021e1e
+ 0c6339b23d2de88b0cea5473289c05820d44fd89999037285ed19b6394e5d221
+ 4f8254201247e6d8e01924715d101e4bce8f53d3799f129a0003b528cd994839
+ f7c99eb62ab9ade49d2022edca802b4ebbdf53a753c378315cccf9bf2126bff3
+ 13191acb9cec0bdd45527e09e1f28205fad9e4b67682018f9f0aa6d096b40a7d
+ 08e7f631467b5b1aca8d35c38936c854c3b8bbba975d1b30b5d43637e1b1cc3d
+ 8b40a658dd14af8b268bef3ae656524165c9e432f2df882c21a083b477379a76
+ 68247d9f9e33f803446ba4c114d5db8173dc46aa93bf06c828a2d154c69e4ce6
+ da155c974f591a6f7b29f42ddb82ed94fee8db34b0b7c67a18d747c38138fb7b
+ 3cf905249aeb0676d8a6206746c1d0ee03fba579bd39d9ec8e9cdc8a23ba6232
+ 2afa46cf5301607dc1b18933bd3877842ffcb86563bb8ddf859114aa74bacf1c
+ d437fd884c900cdce7c22bfdf445819ebe8f27d6d2b32392e6ab4291188403b5
+ 458ff1cd1a3a3357d6592f04fadc5bb6c06a1a8ae4e095de599c0a4b4f3f4c39
+ 5a3cc430c53f3a2e7258be9c4dc90002e74b1df4fedd57d748034facdf09462f
+ aa41718568841dd4b2487023d7c68b88a7d4cce6634c2c8b2af5a5024e910491
+ 8e08fca9f5b4284cd78cd80f54f2005cfaa9db9b2df596aabff3cf85fed3b032
+ 00647c73c5d834c2daa7b1c04c152ba70e530f8917a88b48b876634e6735a08d
+ 3b367c2aeb5c0b7e7158570cba56473f36f0e4e2105528f6cff6424a8bb1b188
+ 602f80592d721c0d1157845c9cf83547b4497842cfd37ae5466190d5f89fc2ca
+ 310a50fbd029f0bbb5d7b3b80b9f0882ddf03667caa2c93a1f2c878c32bd1404
+ cf75c1a2992d11b2ea5f4160d34f793fd00d7eae2c3604fe35a96303bdd5b6d0
+ 39255ccf6c1661287fab017e95a3c1eb74619d408bdce09dd359fd58f2303ca4
+ 41e9b2df204081b13ff2adb391f0414b2b0ba4bf83bf2118a30c21265b19983e
+ f6be5a2cf4006b31459a887e14f69e61505e3577ece674e81356ae53b025b4ab
+ 22575da8459ceb57e1dd3e02c9a5e7219b894767438d810b94dfd6c4e97bb3ae
+ 27487ba8f1115f1aff0245629fdc1b785391d5af98521e58937677f173eb0f45
+ 666bd43ccbdb37f097477273aa8ca11b9716c024f8c162bb81a1b07006044bc0
+ 1907c178beac70dafdab55acbc87e56a9913142ffaa85be6cbe541361d53d24c
+ 20e7464b43f12dcdcb3892a6e9c7d7c46a2385a82953c388599cbeeabc362786
+ 6a7e2ee51d92aa5db52816de0dbf103ce2abf40a34411498fb7b2380dc87101d
+ 2d2be878ba6d5afcb6823f58a6939ebe895290a925b13234ed2c63d013ad5165
+ d329c730c338b7d9e4a3fc07fae4537dd0be0b86317db42b1270daaeb7025f98
+ 51ead8dd506cc5aaf4dfb58be942b3061869c9c26bfec9b29930d0a627c32aa9
+ ba4191dca0ec8a9eb70cc3d9d0a20d50fa87a5c0be3190db0ef5867532ef8318
+ 4e849ddec5f68004315b93dc8e382774101a815e9bf476f10c8e804a9657aa2e
+ 04b06a1a5842962116ef0eae6dfa263197e04b5a560ce7386f786322b5199364
+ 8f81e86174d6126e0e0551b1431713f09ca66e3dc546cd5a7838d17c2cddf52e
+ 1ca4983cf2de4a0ac8debdfba0c0e3844cd5020199f4ab054864dda7ae2170da
+ f625cda77e82c13e358d33df96d613ea8145a170b54ce399bfe960e0b88ef146
+ 93b79805973de19cd0beaea81add9a0f40e3746b88648c6c7e90a0fbba857777
+ 368b268f6b08b5e1d0f1ffeeb662ab4460bc3b60d6c3ced54a6efff44e6bec2e
+ 8de648e97c00fc1988ae5788944c3821304c49f49a669797e3bdc4c3637ff336
+ 1489f343e79064d24549556f7d7164ea0e9e0e65256290f8287a00fdd256bd04
+ 0f004c54f4fce861b709d6f0d394c6ebb01a16aedc29e6599f56c7d043e18936
+ 8f7a814d8a47efa9fe1509b0ea450697e2e6007beb5b78e2937b3f2b133402b3
+ 7db9b294668932d2e59309c452ab74d0d737eb6c8220f6fa5aafd7be66ea42dd
+ b9c81d14520928957f95e40faa80a8ed63e76758652fb3a73458a848d9703ac7
+ 1129915d753dc68c4d4e23e6d4dea5de7c911f7d3204448b231f8755d7447c70
+ 76badde28f93f4d8e05c163a357223bf1a85e9301cf6221b222553f637e33532
+ c50d5aa28e33dee903a31b1ea73c01575d7d784cc86dfec0f853dc51e31bef40
+ 6b897ca847c9d497895d2dc2164582836407902c2784219617ce14b80b140739
+ 4cd25edb40fd1309d1121cb582001d580605eb12ec414fe4125d580b809927c9
+ 2b822f814877d3b20ced442e466ff78cc0e2effa971b5e7b16ddd6bb9500c7c3
+ b2962ead550ab841c4981a70a0f80f1baeb2d10165dc7536d069598643f3d4d5"

From f5e4d0ed66fe8d5163eaf3fb21b1137f79512575 Mon Sep 17 00:00:00 2001
From: Tiago Carvalho <sugoiuguu@tfwno.gf>
Date: Wed, 13 Apr 2022 18:28:13 +0100
Subject: [PATCH 1507/1686] thunderbird: update to 91.8.0.

---
 srcpkgs/thunderbird/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 6ce073f6f0f9..bf03d0a2eb61 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=91.5.0
+version=91.8.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=b89a8e1b57d5be828a7346e817120d7c763a258a2397a23393b7ceb3ce810ab2
+checksum=4a93d1773e17aa110341428165581f0176c347d55dd7f6cbed789ca8369da6fa
 
 lib32disabled=yes
 

From 12e4a1df372e3c2e5ac58ce16aab03d2b25dbfad Mon Sep 17 00:00:00 2001
From: Tung Anh Vu <vu.tunganh96@gmail.com>
Date: Tue, 15 Mar 2022 20:50:59 +0100
Subject: [PATCH 1508/1686] texlive: Pull latexmk into a subpackage

---
 srcpkgs/texlive-latexmk  |  1 +
 srcpkgs/texlive/template | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/texlive-latexmk

diff --git a/srcpkgs/texlive-latexmk b/srcpkgs/texlive-latexmk
new file mode 120000
index 000000000000..c6cca627ba90
--- /dev/null
+++ b/srcpkgs/texlive-latexmk
@@ -0,0 +1 @@
+texlive
\ No newline at end of file
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index cf3fa5c8044e..b8bb1919fded 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
 # Template file for 'texlive'
 pkgname=texlive
 version=20210325
-revision=2
+revision=3
 wrksrc="texlive-${version}-source"
 build_wrksrc="build"
 build_style=gnu-configure
@@ -71,7 +71,7 @@ makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel
  harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel
  poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel
  libXaw-devel"
-depends="dialog ghostscript perl-Tk texlive-core xbps-triggers"
+depends="dialog ghostscript perl-Tk texlive-core texlive-latexmk xbps-triggers"
 short_desc="TeX Live"
 maintainer="fosslinux <fosslinux@aussies.space>"
 license="GPL-2.0-or-later"
@@ -393,3 +393,12 @@ texlive-PythonTeX_package() {
 		vmove usr/share/texmf-dist/scripts/pythontex
 	}
 }
+
+texlive-latexmk_package() {
+	depends="perl"
+	short_desc+=" - script for compiling the correct number of times"
+	pkg_install() {
+		vmove usr/bin/latexmk
+		vmove usr/share/texmf-dist/scripts/latexmk
+	}
+}

From 7333d3b25e1c91a0a1d822a5f79cde40c0a54e87 Mon Sep 17 00:00:00 2001
From: shtayerc <david.murko@mailbox.org>
Date: Tue, 19 Apr 2022 20:14:14 +0200
Subject: [PATCH 1509/1686] stockfish: update to 15

---
 srcpkgs/stockfish/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template
index ab86e2e00d8d..4a0284fce9a4 100644
--- a/srcpkgs/stockfish/template
+++ b/srcpkgs/stockfish/template
@@ -1,8 +1,8 @@
 # Template file for 'stockfish'
 pkgname=stockfish
-version=14.1
+version=15
 revision=1
-_net_file=nn-13406b1dcbe0.nnue
+_net_file=nn-6877cd24400e.nnue
 wrksrc="Stockfish-sf_${version}"
 build_wrksrc=src
 build_style=gnu-makefile
@@ -10,13 +10,13 @@ make_build_target=build
 make_use_env=yes
 hostmakedepends="tar"
 short_desc="Free UCI chess engine derived from Glaurung"
-maintainer="cipr3s <cipr3s@gmx.com>"
+maintainer="shtayerc <david.murko@mailbox.org>"
 license="GPL-3.0-or-later"
 homepage="http://stockfishchess.org/"
 distfiles="https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz
  https://tests.stockfishchess.org/api/nn/${_net_file}"
-checksum="11d71018af47ba047175f846be72d8d9878df698e9b5d708ab158cf530633600
- 13406b1dcbe0a36dfc5e07da51d8db38b7a45d7da43078ec25a7624c2b83236f"
+checksum="0553fe53ea57ce6641048049d1a17d4807db67eecd3531a3749401362a27c983
+ 6877cd24400e01b19ff12ae3068ae242152802bdd330e66f7b6703865251d6e3"
 skip_extraction="${_net_file}"
 
 LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152"

From 317163ec2e6e63bb1a92d4a1fcc565973598a22c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Thu, 7 Apr 2022 23:08:41 +0200
Subject: [PATCH 1510/1686] dbeaver: update to 22.0.3.

---
 srcpkgs/dbeaver/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index 74a67e77e4f6..a1e7ca0c3004 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,7 +1,7 @@
 # Template file for 'dbeaver'
 pkgname=dbeaver
-version=22.0.1
-revision=2
+version=22.0.3
+revision=1
 # the build downloads binaries linked to glibc
 archs="x86_64 aarch64"
 hostmakedepends="apache-maven"
@@ -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=2258f77b6e68fc0784dd7d92fc1297695b57e6ca22e3d454f21f328bf61e2bf0
+checksum=5af628ec7cd4c0e63fd074dd92d5668788136321cc273f778f20ff8c7907323a
 nopie=true
 
 if [ "$XBPS_TARGET_MACHINE" = aarch64 ]; then

From 1ee348ca940cb9a980222d96a2208b19f41e48f0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:18:10 -0400
Subject: [PATCH 1511/1686] maturin: update to 0.12.12.

---
 srcpkgs/maturin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index a6c1cbdd3d71..64140c2f5fe7 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,6 +1,6 @@
 # Template file for 'maturin'
 pkgname=maturin
-version=0.12.11
+version=0.12.12
 revision=1
 build_style=cargo
 build_helper=qemu
@@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin"
 # bump target-lexicon version if it changes in Cargo.lock
 distfiles="${homepage}/archive/v${version}.tar.gz
  https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz"
-checksum="4d39f15fae9c01f2f23a544fc26b20c68693ec03f820b30ca5f505647c452be1
+checksum="0da8b649dc91278363d6a07fee26ea53b8f2d9cd06139034dea3a5506baf12a0
  30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e"
 # Tests use unstable features and fail to build
 make_check=no

From ab5faee633eb605ae3a2c25e097557a85494c07d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:19:36 -0400
Subject: [PATCH 1512/1686] python3-imageio: update to 2.17.0.

---
 srcpkgs/python3-imageio/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index b129927d534f..a5167cbc45e8 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-imageio'
 pkgname=python3-imageio
-version=2.16.1
+version=2.17.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/imageio/imageio"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=97f6d150d3a4b2424810fd3042ab794af45365f168031aee6f0be21c00e90d2f
+checksum=34173213c7e90096743bf077d888dd1c0300e8ebfad8184ee24a968cc860af5c
 
 post_install() {
 	vlicense LICENSE

From 1fa411e82c8212bae6a8477386051a70a3d0f07f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:27:26 -0400
Subject: [PATCH 1513/1686] python3-hypothesis: update to 6.43.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 d214e0ec6b62..fd24d4f52491 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.41.0
+version=6.43.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=0fa002e65956bedead5149d2ffa5875cbcb5ca1a3f95301fcf2ad5a241829d91
+checksum=57e04ecd3fb433604a17dbcf535947734f98bcced562a71c67513d98919d1d3b
 
 do_check() {
 	# Manually run the tests that tox considers part of the "full" suite,

From 9daa6681e5a23a59d1290c4c18b76dc904281de8 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:35:18 -0400
Subject: [PATCH 1514/1686] python3-typing_extensions: update to 4.2.0.

---
 srcpkgs/python3-typing_extensions/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-typing_extensions/template b/srcpkgs/python3-typing_extensions/template
index a9917a177428..413acfdb1c3a 100644
--- a/srcpkgs/python3-typing_extensions/template
+++ b/srcpkgs/python3-typing_extensions/template
@@ -1,14 +1,14 @@
 # Template file for 'python3-typing_extensions'
 pkgname=python3-typing_extensions
-version=3.10.0.2
+version=4.2.0
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
 depends="python3"
 short_desc="Backported and Experimental Type Hints for Python 3.5+"
 maintainer="Denis Revin <denis.revin@gmail.com>"
 license="Python-2.0"
 homepage="https://github.com/python/typing"
 distfiles="${PYPI_SITE}/t/typing_extensions/typing_extensions-${version}.tar.gz"
-checksum=49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e
+checksum=f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376

From 04a5acf2fcfc10b87d1b40cc1d5eb64d3a01124c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:37:24 -0400
Subject: [PATCH 1515/1686] python3-pytools: update to 2022.1.4.

---
 srcpkgs/python3-pytools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-pytools/template b/srcpkgs/python3-pytools/template
index 1cbf56dc08dd..6a57301a4d61 100644
--- a/srcpkgs/python3-pytools/template
+++ b/srcpkgs/python3-pytools/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pytools'
 pkgname=python3-pytools
-version=2022.1.2
+version=2022.1.4
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-decorator python3-appdirs python3-six python3-numpy"
-checkdepends="python3-pytest python3-mpi4py $depends"
+depends="python3-platformdirs python3-numpy python3-typing_extensions"
+checkdepends="python3-pytest $depends"
 short_desc="Python utilities from Andreas Kloeckner"
 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=5e824101880a246354756365880a65bb416f6a8cab6513b68fcbb48fba090fcb
+checksum=ae25f7c9b196fcd0d15e53bfe05236fe7bc5efd923810fbaeeee1a4bc4b6764a
 
 post_install() {
 	vlicense LICENSE

From 8b0c6ce593a5e03229f3480535e6b63d5bc7fdf4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:40:20 -0400
Subject: [PATCH 1516/1686] python3-pyopencl: update to 2022.1.3.

---
 srcpkgs/python3-pyopencl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template
index 7f3c35a88e9d..ccd4812bcfea 100644
--- a/srcpkgs/python3-pyopencl/template
+++ b/srcpkgs/python3-pyopencl/template
@@ -1,18 +1,18 @@
 # Template file for 'python3-pyopencl'
 pkgname=python3-pyopencl
-version=2022.1
+version=2022.1.3
 revision=1
 wrksrc=${pkgname#*-}-${version}
 build_style=python3-module
 hostmakedepends="python3-setuptools python3-pybind11 python3-Cython python3-numpy"
 makedepends="opencl2-headers ocl-icd-devel python3-pybind11"
-depends="python3-pytools"
+depends="python3-numpy python3-pytools python3-platformdirs"
 short_desc="OpenCL bindings for Python 3"
 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=24c6d9a0a1ff7609f3d7365ebd8778616a5433c426566c2c8e35ffab00ef22c4
+checksum=18386938b54855696460b4b19a210300f241a28eb3255748be5f279aef664d6d
 # Tests require a working OpenCL platform
 make_check=no
 

From c30c5c81849f6b34ceb699b578083fd491364eea Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:40:33 -0400
Subject: [PATCH 1517/1686] python3-tifffile: update to 2022.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 65b0d119adef..b8fb29af1782 100644
--- a/srcpkgs/python3-tifffile/template
+++ b/srcpkgs/python3-tifffile/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-tifffile'
 pkgname=python3-tifffile
-version=2022.3.25
+version=2022.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=620c68f3eeb2b1923e1b3a8bf8a8b7f79498bcd9cd34051ad567c44f0a404353
+checksum=f4dafa604c949ebedc60a0fd41be0048399fea72b529efcff6330a29590ee5f6
 # Tests require unpackaged fsspec
 make_check=no
 

From 5234a5b670e75b019f314d66ef1bea5c3868807b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 19 Apr 2022 08:40:46 -0400
Subject: [PATCH 1518/1686] python3-websockets: update to 10.3.

---
 srcpkgs/python3-websockets/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-websockets/template b/srcpkgs/python3-websockets/template
index 08f829cf4b39..7c02b7ec8ed7 100644
--- a/srcpkgs/python3-websockets/template
+++ b/srcpkgs/python3-websockets/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-websockets'
 pkgname=python3-websockets
-version=10.2
+version=10.3
 revision=1
 wrksrc="${pkgname#python3-}-${version}"
 build_style=python3-module
@@ -13,7 +13,7 @@ license="BSD-3-Clause"
 homepage="https://websockets.readthedocs.io/en/stable/"
 changelog="https://websockets.readthedocs.io/en/stable/project/changelog.html"
 distfiles="${PYPI_SITE}/w/websockets/websockets-${version}.tar.gz"
-checksum=8351c3c86b08156337b0e4ece0e3c5ec3e01fcd14e8950996832a23c99416098
+checksum=fc06cc8073c8e87072138ba1e431300e2d408f054b27047d047b549455066ff4
 # Package ships no tests
 make_check=no
 

From 5a64f28c9806c037137f0c79c1f0385e28cfca47 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 19 Apr 2022 22:49:40 +0200
Subject: [PATCH 1519/1686] keepassxc: update to 2.7.1.

upstream
* switched from libsodium to botan
* switched from quazip to minizip
* relies on vendored (patched) ykcore [1]

[1]: quote droidmonkey from IRC (keepassxc developer)
> KeePassXC bundles the ykcore code due to lack of support from Yubico and
> stratification of version across various operating system distros.
> Additionally, KeePassXC has modified the API of ykcore to make it more
> functional when using non-YubiKey keys (ie, OnlyKey)

Closes: https://github.com/void-linux/void-packages/pull/36662
---
 ...001-Link-ykcore-against-pthread-7807.patch | 33 +++++++++++++++++++
 srcpkgs/keepassxc/template                    | 24 ++++++++------
 2 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch

diff --git a/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch b/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch
new file mode 100644
index 000000000000..cad44dae05d8
--- /dev/null
+++ b/srcpkgs/keepassxc/patches/0001-Link-ykcore-against-pthread-7807.patch
@@ -0,0 +1,33 @@
+From 7edeceec0376513002813efb7bf723fbcbe6752d Mon Sep 17 00:00:00 2001
+From: Piraty <piraty1@inbox.ru>
+Date: Fri, 15 Apr 2022 08:27:04 +0000
+Subject: [PATCH] Link ykcore against pthread (#7807)
+
+---
+ src/thirdparty/ykcore/CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/thirdparty/ykcore/CMakeLists.txt b/src/thirdparty/ykcore/CMakeLists.txt
+index 47191ea7..103349f2 100644
+--- a/src/thirdparty/ykcore/CMakeLists.txt
++++ b/src/thirdparty/ykcore/CMakeLists.txt
+@@ -27,13 +27,15 @@ if(WIN32)
+ elseif(UNIX AND NOT APPLE)
+     target_sources(ykcore PRIVATE ykcore_libusb-1.0.c)
+ 
++    find_package(Threads REQUIRED)
++
+     find_library(LIBUSB_LIBRARY NAMES usb-1.0)
+     find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "libusb-1.0" "libusb")
+     if(NOT LIBUSB_LIBRARY OR NOT LIBUSB_INCLUDE_DIR)
+         message(FATAL_ERROR "libusb-1.0 dev package required, but not found")
+     endif()
+ 
+-    target_link_libraries(ykcore PRIVATE ${LIBUSB_LIBRARY})
++    target_link_libraries(ykcore PRIVATE Threads::Threads ${LIBUSB_LIBRARY})
+     target_include_directories(ykcore PRIVATE ${LIBUSB_INCLUDE_DIR})
+     target_compile_definitions(ykcore PRIVATE _GNU_SOURCE)
+ elseif(APPLE)
+-- 
+2.35.1
+
diff --git a/srcpkgs/keepassxc/template b/srcpkgs/keepassxc/template
index f3543633d6da..a4839235260d 100644
--- a/srcpkgs/keepassxc/template
+++ b/srcpkgs/keepassxc/template
@@ -1,6 +1,6 @@
 # Template file for 'keepassxc'
 pkgname=keepassxc
-version=2.6.6
+version=2.7.1
 revision=1
 build_style=cmake
 configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
@@ -8,16 +8,17 @@ configure_args="-DWITH_TESTS=ON -DWITH_XC_UPDATECHECK=OFF -DWITH_XC_DOCS=ON
  -DWITH_XC_BROWSER=$(vopt_if browser ON OFF)
  -DWITH_XC_FDOSECRETS=$(vopt_if fdosecrets ON OFF)
  -DWITH_XC_KEESHARE=$(vopt_if keeshare ON OFF)
- -DWITH_XC_KEESHARE_SECURE=$(vopt_if keeshare ON OFF)
  -DWITH_XC_NETWORKING=$(vopt_if network ON OFF)
  -DWITH_XC_SSHAGENT=$(vopt_if sshagent ON OFF)
  -DWITH_XC_YUBIKEY=$(vopt_if yubikey ON OFF)"
-hostmakedepends="qt5-qmake qt5-host-tools ruby-asciidoctor"
-makedepends="qt5-tools-devel qt5-svg-devel libgcrypt-devel libargon2-devel
- qrencode-devel readline-devel libsodium-devel
- $(vopt_if autotype 'qt5-x11extras-devel libXtst-devel libXi-devel')
- $(vopt_if keeshare quazip-devel)
- $(vopt_if yubikey 'libykpers-devel libyubikey-devel')"
+hostmakedepends="qt5-devel ruby-asciidoctor"
+makedepends="qt5-tools-devel qt5-svg-devel botan-devel libargon2-devel
+ qrencode-devel readline-devel pcsclite-devel
+ qt5-x11extras-devel
+ $(vopt_if autotype 'libXtst-devel libXi-devel')
+ $(vopt_if keeshare minizip-devel)
+ $(vopt_if yubikey 'libusb-devel')"
+checkdepends="xvfb-run"
 short_desc="KeePassXC is a cross-platform port of “Keepass Password Safe”"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,
@@ -25,9 +26,8 @@ license="GPL-3.0-or-later, BSD-3-Clause, CC0-1.0, LGPL-2.0-only, LGPL-2.1-only,
 homepage="https://keepassxc.org/"
 changelog="https://raw.githubusercontent.com/keepassxreboot/keepassxc/${version}/CHANGELOG.md"
 distfiles="https://github.com/keepassxreboot/keepassxc/releases/download/${version}/keepassxc-${version}-src.tar.xz"
-checksum=3603b11ac39b289c47fac77fa150e05fd64b393d8cfdf5732dc3ef106650a4e2
+checksum=6001ba626c35c316dbda6de35736f012a2264f95139fcb4a094b8eb49b15d3e7
 
-# https://github.com/keepassxreboot/keepassxc/blob/a775031fe9471310e50232d1861d4991e2803aff/CMakeLists.txt#L46
 build_options="autotype browser fdosecrets keeshare network sshagent yubikey"
 desc_option_autotype="Include auto-type"
 desc_option_browser="Include browser integration with keepassxc-browser-plugin"
@@ -43,3 +43,7 @@ post_install() {
 	vlicense LICENSE.BSD
 	vlicense LICENSE.MIT
 }
+
+do_check() {
+	xvfb-run ninja -C build test || : #XXX: TestCli::testClip() fails
+}

From 16b191d24e94f3db85db77244263e86075ca0793 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:23:50 +0200
Subject: [PATCH 1520/1686] gstreamer1: update to 1.20.1

---
 srcpkgs/gstreamer1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template
index cc540feaf0b7..ababbeeb987d 100644
--- a/srcpkgs/gstreamer1/template
+++ b/srcpkgs/gstreamer1/template
@@ -1,7 +1,7 @@
 # Template file for 'gstreamer1'
 pkgname=gstreamer1
-version=1.18.5
-revision=2
+version=1.20.1
+revision=1
 wrksrc="gstreamer-${version}"
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,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=55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a
+checksum=de094a404a3ad8f4977829ea87edf695a4da0b5c8f613ebe54ab414bac89f031
 
 pre_check() {
 	# gst_gstdatetime is known to fail according to LFS

From d80ea3376a82ddc3da8fe13e07772a48cbc7b205 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:24:18 +0200
Subject: [PATCH 1521/1686] gst-plugins-base1: update to 1.20.1

---
 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 fc954cc96cf5..6ab6210e6605 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.5
+version=1.20.1
 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=960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3
+checksum=96d8a6413ba9394fbec1217aeef63741a729d476a505a797c1d5337d8fa7c204
 
 build_options="cdparanoia gir sndio"
 build_options_default="cdparanoia gir"

From a25ec622829f307370e054acc6d2fa70e6fa50c6 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:28:16 +0200
Subject: [PATCH 1522/1686] gst-plugins-base1: update to 1.20.1

---
 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 974cdbc22c41..0ce7d1bce5c9 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.5
+version=1.20.1
 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=3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b
+checksum=3c66876f821d507bcdbebffb08b4f31a322727d6753f65a0f02c905ecb7084aa
 
 build_options="gtk3"
 build_options_default="gtk3"

From 9972c6d395fa9e80738b085df2015b701e88500a Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:49:44 +0200
Subject: [PATCH 1523/1686] gst-plugins-ugly1: update to 1.20.1

---
 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 8f3e16d98f81..ad8c128ef726 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.5
+version=1.20.1
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
@@ -16,4 +16,4 @@ 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=df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9
+checksum=42035145e29983308d2828207bb4ef933ed0407bb587fb3a569738c6a57fdb19

From b5c29e93178540bf915d9bb61e415ec92589826a Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:51:56 +0200
Subject: [PATCH 1524/1686] gst-plugins-bad1: update to 1.20.1

---
 srcpkgs/gst-plugins-bad1/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index 451f73cb9f55..f7d203133212 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.5
+version=1.20.1
 revision=1
 wrksrc="${pkgname/1/}-${version}"
 build_helper="gir"
@@ -9,7 +9,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled
  -Dopencv=disabled -Dmsdk=disabled -Dopensles=disabled -Dtinyalsa=disabled
  -Dwasapi=disabled -Dnvcodec=disabled -Ddc1394=disabled
  -Diqa=disabled -Dkate=disabled -Dlibde265=disabled -Dmpeg2enc=disabled
- -Dmplex=disabled -Dmusepack=disabled -Dofa=disabled -Dopenexr=disabled
+ -Dmplex=disabled -Dmusepack=disabled -Dopenexr=disabled
  -Dopenh264=disabled -Dopenmpt=disabled -Dopenni2=disabled -Dsctp=disabled
  -Dsrt=disabled -Dteletext=disabled -Dvoaacenc=disabled -Dvoamrwbenc=disabled
  -Dwildmidi=disabled -Dwpe=disabled -Ddirectfb=disabled
@@ -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=a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e
+checksum=09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848
 
 build_options="gir gme"
 build_options_default="gir"

From 3a3f184e15603e0978d78aa1f38b1939a0a5f9a2 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:54:36 +0200
Subject: [PATCH 1525/1686] gst-libav: update to 1.20.1

---
 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 dc77de85702b..333636d0657a 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.5
+version=1.20.1
 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=822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548
+checksum=91a71fb633b75e1bd52e22a457845cb0ba563a2972ba5954ec88448f443a9fc7
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) # Required by musl for M_SQRT1_2

From 824da444a771758566e1d7cf7170dd0eda5f3fa8 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:56:44 +0200
Subject: [PATCH 1526/1686] gst-omx: update to 1.20.1

---
 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 5e78c4c68549..d657aff289a7 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.5
+version=1.20.1
 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=2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42
+checksum=86b52e30ebd0f59fcb5cf81a163211975f73ef32e5a6782562804646316bcd7c

From 68a1182380abaa10e3bd2a171d8ba2884ab4cf72 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 19:59:29 +0200
Subject: [PATCH 1527/1686] gst1-python3: update to 1.20.1

---
 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 5f2fe61a6968..4f6ead444091 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.5
+version=1.20.1
 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=533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52
+checksum=ba6cd59faa3db3981d8c6982351c239d823c0b8e80b1acf58d2997b050289422

From 75a7e2ae64cb93910efc0a089299e944b40f5304 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 20:05:05 +0200
Subject: [PATCH 1528/1686] gstreamer-vaapi: update to 1.20.1

---
 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 90a3a0a7579b..1a934c852d1b 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.5
+version=1.20.1
 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=4a460fb95559f41444eb24864ad2d9e37922b6eea941510310319fc3e0ba727b
+checksum=87fbf6c537af9079c99a9aefe951da119e16e5bcc9cc8614f5035f062bf21137
 
 pre_check() {
 	# Seems to need certain hardware to pass

From 1dacd0ec947e8ba7930a9f1849f85baadc0882eb Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Sat, 9 Apr 2022 20:09:30 +0200
Subject: [PATCH 1529/1686] gst1-editing-services: update to 1.20.1

---
 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 1613a7ababfd..ad2318c059ae 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.5
+version=1.20.1
 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=8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5
+checksum=6ace1b21b58e0110b7dadd469f79b77e2f47d6207604231492531ae9fd4148df
 
 do_check() {
 	: # Tests fail in older versions as well

From 707b6f9671bb8e5ce841e4ae2319bf044ae64cc8 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Tue, 19 Apr 2022 23:48:56 +0200
Subject: [PATCH 1530/1686] mkvtoolnix: broken on 32-bit ppc

---
 srcpkgs/mkvtoolnix/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 7f84979ecc3f..52d67b0a6c87 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -23,6 +23,11 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
 fi
 
+case "$XBPS_TARGET_MACHINE" in
+	ppc64*) ;;
+	ppc*) broken="assembler shits itself";;
+esac
+
 pre_configure() {
 	./autogen.sh
 }

From a14c41ea230690974ca6870ded4bbb5c4b5d5f94 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 30 Mar 2022 21:10:51 -0400
Subject: [PATCH 1531/1686] cgminer: remove package

Upstream is archived and hasn't had a commit or release since 2018
---
 srcpkgs/cgminer/files/cgminer/run |  2 --
 srcpkgs/cgminer/template          | 41 -------------------------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 srcpkgs/cgminer/files/cgminer/run
 delete mode 100644 srcpkgs/cgminer/template

diff --git a/srcpkgs/cgminer/files/cgminer/run b/srcpkgs/cgminer/files/cgminer/run
deleted file mode 100644
index b9f9b29ae3d6..000000000000
--- a/srcpkgs/cgminer/files/cgminer/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec cgminer -T --config /etc/cgminer.conf --syslog
diff --git a/srcpkgs/cgminer/template b/srcpkgs/cgminer/template
deleted file mode 100644
index c8add74d08fb..000000000000
--- a/srcpkgs/cgminer/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'cgminer'
-pkgname=cgminer
-version=4.11.1
-revision=1
-build_style=gnu-configure
-configure_args="
- --enable-avalon --enable-avalon2 --enable-bflsc --enable-bitfury \
- --enable-cointerra --enable-drillbit --enable-hashfast --enable-hashratio \
- --enable-icarus --enable-klondike --with-system-libusb"
-hostmakedepends="pkg-config automake libtool yasm"
-makedepends="libcurl-devel libusb-devel jansson-devel eudev-libudev-devel ncurses-devel"
-conf_files="/etc/cgminer.conf"
-short_desc="Multi-threaded multi-pool CPU and GPU miner for bitcoin"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/ckolivas/cgminer"
-distfiles="http://ck.kolivas.org/apps/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=a8f3e244343eda8c3410e6d27188ee941de25c54bd76412e5b4d17de9f30ac18
-
-CFLAGS="-fcommon"
-
-pre_configure() {
-	# We have latest jansson and libusb - just use them
-	sed	-e 's|^AC_CONFIG_SUBDIRS.*compat/jansson.*||' \
-		-e 's|JANSSON_LIBS=\".*\"|JANSSON_LIBS=-ljansson|' \
-		-e 's|compat/Makefile||' \
-		-i configure.ac
-
-	sed	-e 's|^JANSSON_CPPFLAGS= .*||' \
-		-e "s|^USBUTILS_CPPFLAGS = .*|USBUTILS_CPPFLAGS = -I${XBPS_CROSS_BASE}/usr/include/libusb-1.0|" \
-		-e 's|^SUBDIRS.*|SUBDIRS = lib ccan|' \
-		-i Makefile.am
-
-	rm -r compat
-	autoreconf -fi
-}
-post_install() {
-	vsv cgminer
-	vconf example.conf cgminer.conf
-	sed -i 's#/usr/local/bin#/usr/bin#g' ${DESTDIR}/etc/cgminer.conf
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 6859fe29da93..0923c53cfc05 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -35,6 +35,7 @@ replaces="
  california<=0.4.0_4
  capstone-python<=4.0.2_3
  captain-ballard<=1.0.0_2
+ cgminer<=4.11.1_1
  clamz<=0.5_4
  couchdb<=1.7.1_2
  cracklib-python<=2.9.7_1

From 2f9553307a926db46ea62484df217a3aba82c523 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 14 Apr 2022 19:09:44 -0400
Subject: [PATCH 1532/1686] python3-svg.path: update to 6.0.

---
 srcpkgs/python3-svg.path/template | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-svg.path/template b/srcpkgs/python3-svg.path/template
index 0d92697a0a9a..a98cae8cfe78 100644
--- a/srcpkgs/python3-svg.path/template
+++ b/srcpkgs/python3-svg.path/template
@@ -1,11 +1,9 @@
 # Template file for 'python3-svg.path'
 pkgname=python3-svg.path
-version=5.1
+version=6.0
 revision=1
 wrksrc="svg.path-${version}"
 build_style=python3-module
-# disable failing test
-make_check_args="-k not(ImageTest)"
 hostmakedepends="python3-setuptools"
 depends="python3"
 checkdepends="python3-pytest-cov python3-Pillow"
@@ -14,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="MIT"
 homepage="https://github.com/regebro/svg.path"
 distfiles="https://github.com/regebro/svg.path/archive/${version}.tar.gz"
-checksum=2ea5351a5886f8c55ae8fddb2f7182dca3d5760c03abade9cb256b91e4bb9bb4
+checksum=3c460dfb366c3cb70f26eb7e22c092144e24f4f62028632289fa703f8dc25630
 
 post_install() {
 	vlicense LICENSE.txt

From 448636537039eccb4d1cde84a9da3a254706b740 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 19 Apr 2022 18:56:06 -0500
Subject: [PATCH 1533/1686] Amass: update to 3.19.2.

---
 srcpkgs/Amass/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Amass/template b/srcpkgs/Amass/template
index 9293dab01c93..7106a5c312fd 100644
--- a/srcpkgs/Amass/template
+++ b/srcpkgs/Amass/template
@@ -1,6 +1,6 @@
 # Template file for 'Amass'
 pkgname=Amass
-version=3.19.1
+version=3.19.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=259dbef81ca63ceb85113c0f741c9212bacbac653bca2cd3e8022b256d08d426
+checksum=ef2b5303b3e92debe68ea72c03c4f60320c34f0281f50b5f7108750c7e1a7491

From e95cb755e594d635834acfbb68b8583c0b2059be Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 19 Apr 2022 19:12:59 -0500
Subject: [PATCH 1534/1686] stellarium: update to 0.22.1.

---
 srcpkgs/stellarium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template
index c2a87b2847ad..657b3a6e97b1 100644
--- a/srcpkgs/stellarium/template
+++ b/srcpkgs/stellarium/template
@@ -1,6 +1,6 @@
 # Template file for 'stellarium'
 pkgname=stellarium
-version=0.22.0
+version=0.22.1
 revision=1
 build_style=cmake
 hostmakedepends="perl qt5-qmake qt5-host-tools"
@@ -12,5 +12,5 @@ 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=0b4dc23cf9054b5e76cd9bc5ad68e172eb221999e90af37e93667d04fe78c885
+checksum=61a595ecc345dcc7517359573d0dc772e67ecaf6d52fefab142a77c92cf3fa24
 replaces="stellarium-data>=0"

From 15553f6e0fa1eb565088df31863bf966ebeef64f Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Tue, 19 Apr 2022 23:31:19 -0500
Subject: [PATCH 1535/1686] iperf3: update to 3.11.

---
 srcpkgs/iperf3/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/iperf3/template b/srcpkgs/iperf3/template
index 81ba349c49be..d71d870ac7c8 100644
--- a/srcpkgs/iperf3/template
+++ b/srcpkgs/iperf3/template
@@ -1,6 +1,6 @@
 # Template file for 'iperf3'
 pkgname=iperf3
-version=3.10.1
+version=3.11
 revision=1
 wrksrc="iperf-${version}"
 build_style=gnu-configure
@@ -11,7 +11,7 @@ license="BSD-3-Clause"
 homepage="http://software.es.net/iperf/"
 changelog="https://raw.githubusercontent.com/esnet/iperf/master/RELNOTES.md"
 distfiles="https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"
-checksum=03bc9760cc54a245191d46bfc8edaf8a4750f0e87abca6764486972044d6715a
+checksum=de8cb409fad61a0574f4cb07eb19ce1159707403ac2dc01b5d175e91240b7e5f
 
 post_install() {
 	vlicense LICENSE

From 05ed17e997466f29b2730a15d3b0ce9c3d4444ee Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Apr 2022 11:04:22 -0400
Subject: [PATCH 1536/1686] python3-signedjson: update to 1.1.4.

---
 .../patches/importlib_metadata.patch          | 39 -------------------
 srcpkgs/python3-signedjson/template           |  4 +-
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/python3-signedjson/patches/importlib_metadata.patch

diff --git a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch b/srcpkgs/python3-signedjson/patches/importlib_metadata.patch
deleted file mode 100644
index d7553958cc15..000000000000
--- a/srcpkgs/python3-signedjson/patches/importlib_metadata.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c40c83f844fee3c1c7b0c5d1508f87052334b4e5 Mon Sep 17 00:00:00 2001
-From: MeggyCal <MeggyCal@users.noreply.github.com>
-Date: Tue, 21 Apr 2020 18:55:37 +0200
-Subject: [PATCH] Do not require importlib_metadata on python 3.8. (#9)
-
----
- setup.py               | 2 +-
- signedjson/__init__.py | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 9c09760..c1cc299 100755
---- a/setup.py
-+++ b/setup.py
-@@ -41,7 +41,7 @@ def read_file(path_segments):
-         "pynacl>=0.3.0",
-         "typing_extensions>=3.5",
-         'typing>=3.5;python_version<"3.5"',
--        "importlib_metadata",
-+        'importlib_metadata;python_version<"3.8"',
-     ],
-     long_description=read_file(("README.rst",)),
-     keywords="json",
-diff --git a/signedjson/__init__.py b/signedjson/__init__.py
-index 6641e64..62faa5e 100644
---- a/signedjson/__init__.py
-+++ b/signedjson/__init__.py
-@@ -12,7 +12,10 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--from importlib_metadata import version, PackageNotFoundError
-+try:
-+    from importlib.metadata import version, PackageNotFoundError
-+except ImportError:  # pragma: nocover
-+    from importlib_metadata import version, PackageNotFoundError
- 
- try:
-     __version__ = version(__name__)
diff --git a/srcpkgs/python3-signedjson/template b/srcpkgs/python3-signedjson/template
index bf9a8ddc1255..8acbaa32ab11 100644
--- a/srcpkgs/python3-signedjson/template
+++ b/srcpkgs/python3-signedjson/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-signedjson'
 pkgname=python3-signedjson
-version=1.1.1
+version=1.1.4
 revision=1
 wrksrc="signedjson-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="Apache-2.0"
 homepage="https://github.com/matrix-org/python-signedjson"
 distfiles="${PYPI_SITE}/s/signedjson/signedjson-${version}.tar.gz"
-checksum=350586e7570ba208f7729dcda09d43f554ead0207a15e3e3695533ef3f720009
+checksum=cd91c56af53f169ef032c62e9c4a3292dc158866933318d0592e3462db3d6492

From 9935530e654669865a1cc5e350d29cdee816ea5f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Apr 2022 11:02:53 -0400
Subject: [PATCH 1537/1686] synapse: update to 1.57.0.

---
 srcpkgs/synapse/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/synapse/template b/srcpkgs/synapse/template
index 984ad56e0a8a..22ad01847677 100644
--- a/srcpkgs/synapse/template
+++ b/srcpkgs/synapse/template
@@ -1,6 +1,6 @@
 # Template file for 'synapse'
 pkgname=synapse
-version=1.56.0
+version=1.57.0
 revision=1
 build_style=python3-module
 make_check_target=tests
@@ -21,7 +21,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=7afda1fefa2af42966fdffa1f3ab6643674a738ad722e76bf94b873b8845c373
+checksum=d574f6f599f00d139045e04d017a201397b21248b560b69c5cdfccccd920cc0a
 
 system_accounts="synapse"
 synapse_homedir="/var/lib/synapse"

From e5c266d80d28f722e5ef9254d4fcd8d0fc54834b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Wed, 20 Apr 2022 14:10:55 +0200
Subject: [PATCH 1538/1686] xauth: update to 1.1.2.

---
 srcpkgs/xauth/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xauth/template b/srcpkgs/xauth/template
index 8cf9d80c6069..b663ef7b1ed9 100644
--- a/srcpkgs/xauth/template
+++ b/srcpkgs/xauth/template
@@ -1,6 +1,6 @@
 # Template file for 'xauth'
 pkgname=xauth
-version=1.1.1
+version=1.1.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
@@ -9,8 +9,8 @@ short_desc="X authentication utility"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
-distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2"
-checksum=164ea0a29137b284a47b886ef2affcb0a74733bf3aad04f9b106b1a6c82ebd92
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=78ba6afd19536ced1dddb3276cba6e9555a211b468a06f95f6a97c62ff8ee200
 
 post_install() {
 	vlicense COPYING

From 83aacf89c2a12064145d55b510b27c4b9f18b481 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 20 Apr 2022 17:16:56 +0200
Subject: [PATCH 1539/1686] elixir: update to 1.13.4.

---
 srcpkgs/elixir/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/elixir/template b/srcpkgs/elixir/template
index 5a8b5d7c1e9d..8f721e3a3337 100644
--- a/srcpkgs/elixir/template
+++ b/srcpkgs/elixir/template
@@ -1,6 +1,6 @@
 # Template file for 'elixir'
 pkgname=elixir
-version=1.13.3
+version=1.13.4
 revision=1
 build_style=gnu-makefile
 make_check_target="test"
@@ -13,7 +13,7 @@ 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=652779f7199f5524e2df1747de0e373d8b9f1d1206df25b2e551cd0ad33f8440
+checksum=95daf2dd3052e6ca7d4d849457eaaba09de52d65ca38d6933c65bc1cdf6b8579
 
 do_check() {
 	ERL_EPMD_PORT=5369 make ${make_check_target}

From 8d874f160f0b1c8b338e73f4ff172a5e25eadd49 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 20 Apr 2022 10:36:14 -0500
Subject: [PATCH 1540/1686] jadx: update to 1.3.5.

---
 srcpkgs/jadx/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/jadx/template b/srcpkgs/jadx/template
index 71467e34044c..dba5153c9961 100644
--- a/srcpkgs/jadx/template
+++ b/srcpkgs/jadx/template
@@ -1,6 +1,6 @@
 # Template file for 'jadx'
 pkgname=jadx
-version=1.3.4
+version=1.3.5
 revision=1
 hostmakedepends="openjdk8 gradle"
 short_desc="Decompiler for Dalvik bytecode"
@@ -8,7 +8,7 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/skylot/jadx"
 distfiles="https://github.com/skylot/jadx/archive/v${version}.tar.gz"
-checksum=9f7f05c647a287fe4a572d85f14715559513e864d27f6bf6b19852529da8efdc
+checksum=ed556c32b87f6f6cc1ef6ea35bc6881da1a6ad538bb81f9dad1c16969435ea24
 
 do_build() {
 	gradle copyArtifacts

From 2904f5489c36ae6505bddfa980c1f68783b98459 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Wed, 20 Apr 2022 10:44:59 -0500
Subject: [PATCH 1541/1686] python3-easygui: update to 0.98.3.

---
 srcpkgs/python3-easygui/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-easygui/template b/srcpkgs/python3-easygui/template
index 3a35dad07d78..87188a537d51 100644
--- a/srcpkgs/python3-easygui/template
+++ b/srcpkgs/python3-easygui/template
@@ -1,17 +1,19 @@
 # Template file for 'python3-easygui'
 pkgname=python3-easygui
-version=0.98.1
-revision=5
+version=0.98.3
+revision=1
 wrksrc="easygui-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-tkinter"
+checkdepends="$depends"
 short_desc="Simple, very easy GUI programming in Python"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="BSD-3-Clause"
 homepage="https://github.com/robertlugg/easygui"
-distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=b46d1f06b85a2de2b15129906d21bb42bc66a6e800315fed57e634cf151fc083
+distfiles="${PYPI_SITE}/e/easygui/easygui-${version}.tar.gz"
+checksum=d653ff79ee1f42f63b5a090f2f98ce02335d86ad8963b3ce2661805cafe99a04
+make_check=no # Requires X connection
 
 post_install() {
 	sed -n '29,74p' easygui/easygui.py > LICENSE

From d70f3af4e9227111a1de23da5ee4421852e0b53c Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 13 Feb 2022 12:36:33 +0200
Subject: [PATCH 1542/1686] shadow: increase maximum group name length to 32
 (from 16).

This is already the case for usernames, so why not groups?
---
 srcpkgs/shadow/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template
index f01181a49bd6..c59d92bfeb54 100644
--- a/srcpkgs/shadow/template
+++ b/srcpkgs/shadow/template
@@ -1,12 +1,13 @@
 # Template file for 'shadow'
 pkgname=shadow
 version=4.8.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--bindir=/usr/bin --sbindir=/usr/bin
  --enable-shared --disable-static
  --with-libpam --without-selinux --with-acl --with-attr --without-su
- --disable-nls --enable-subordinate-ids --disable-account-tools-setuid"
+ --disable-nls --enable-subordinate-ids --disable-account-tools-setuid
+ --with-group-name-max-length=32"
 hostmakedepends="libtool"
 makedepends="acl-devel pam-devel"
 depends="pam"

From 9791498d7dff8be5324198f383838352d0e7e95f Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Tue, 19 Apr 2022 10:48:20 +0200
Subject: [PATCH 1543/1686] platformio: update to 5.2.5.

Closes: #36762 [via git-merge-pr]
---
 srcpkgs/platformio/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/platformio/template b/srcpkgs/platformio/template
index 4aec9f82cc5a..9dbceafd89f5 100644
--- a/srcpkgs/platformio/template
+++ b/srcpkgs/platformio/template
@@ -1,7 +1,7 @@
 # Template file for 'platformio'
 pkgname=platformio
-version=5.1.1
-revision=2
+version=5.2.5
+revision=1
 wrksrc="platformio-core-${version}"
 build_style=python3-module
 # According to https://github.com/platformio/platformio-core/blob/9c20ab81cb68f1ffb7a8cac22ce95c4c797643ec/Makefile#L13
@@ -11,14 +11,14 @@ depends="python3-bottle python3-click python3-colorama python3-marshmallow
  python3-pyelftools python3-pyserial python3-requests
  python3-semanticversion python3-setuptools python3-tabulate"
 checkdepends="python3-pytest python3-jsondiff python3-wheel python3-pip
- python3-Twisted python3-certifi git $depends"
+ python3-Twisted python3-certifi git python3-zeroconf $depends"
 short_desc="Ecosystem for embedded development"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 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=f312c4cb535dc52c96b754cb54df3fee8001ab960894c7f2f9edd0e50d416aed
+checksum=26cc5b61d113250519257c156ae693ab8f6aea891283b28f1c4c67ffc81fb574
 
 post_install() {
 	vinstall scripts/99-platformio-udev.rules 644 usr/lib/udev/rules.d

From f40c7d77a616eebf23992ceb88f156a959846205 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 21 Apr 2022 00:59:24 +0200
Subject: [PATCH 1544/1686] qt5: rebuild against gstreamer-1.20.1

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 3a6841ed69b4..f6c03777d993 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20220222
 # commit fcca82ca40a5d8a02a4ddd90846d070f2c58cfad
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From ed94af3a280b97aa0a3ddf463f45d8639d162f4f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 10 Apr 2022 15:00:08 +0200
Subject: [PATCH 1545/1686] pipewire: update to 0.3.50.

---
 srcpkgs/pipewire/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template
index 5ed1ee1d3bd6..6427e0b66e77 100644
--- a/srcpkgs/pipewire/template
+++ b/srcpkgs/pipewire/template
@@ -1,6 +1,6 @@
 # Template file for 'pipewire'
 pkgname=pipewire
-version=0.3.48
+version=0.3.50
 revision=1
 _pms_version=0.4.1
 build_style=meson
@@ -32,7 +32,7 @@ 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
  https://gitlab.freedesktop.org/pipewire/media-session/-/archive/${_pms_version}/media-session-${_pms_version}.tar.gz"
-checksum="0d218be86b3d2b548c06259c47ad8d110ee1c09f071e17c4393eeef5c880fa6f
+checksum="a4bd81e9046f0bd19ecc18402b44199c6c4c54305670e43111c7fbdfe4d17bdf
  119c9216070b54018217552c7924f9888da270c3c4647c5e2b85ffa6b1574975"
 make_dirs="/var/lib/pipewire 0755 _pipewire _pipewire"
 system_accounts="_pipewire"

From da97da0bcac91a7c9bfbec387efeba32a36bec29 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 16 Apr 2022 16:34:02 +0200
Subject: [PATCH 1546/1686] Carla: update to 2.4.3.

---
 srcpkgs/Carla/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/Carla/template b/srcpkgs/Carla/template
index 83b8224861ae..6d25e6bb0482 100644
--- a/srcpkgs/Carla/template
+++ b/srcpkgs/Carla/template
@@ -1,6 +1,6 @@
 # Template file for 'Carla'
 pkgname=Carla
-version=2.4.2
+version=2.4.3
 revision=1
 archs="x86_64* i686* aarch64* arm*"
 build_style=gnu-makefile
@@ -14,9 +14,9 @@ depends="python3 python3-PyQt5 python3-PyQt5-svg pyliblo which"
 short_desc="Audio plugin host"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
+homepage="https://kx.studio/Applications:Carla"
 distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
-checksum=376884965e685242953cab757818dde262209c651bd563a04eade0678c6b9f39
+checksum=0092926e5167f3a5eb592f0055e5491803354ae42947e706db0dc548d9e786d3
 python_version=3
 
 case $XBPS_TARGET_MACHINE in
@@ -29,15 +29,14 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" Carla-devel"
 fi
 
-pre_build() {
-	vsed -e '1,1i#include <unistd.h>' \
-		-i source/modules/water/text/CharacterFunctions.h
-
+post_patch() {
 	if [ "$CROSS_BUILD" ]; then
 		vsed -i -e 's#\./carla-lv2-export#/usr/bin/carla-lv2-export#g' \
 			source/plugin/Makefile
 	fi
+}
 
+pre_build() {
 	make ${make_build_args} features
 }
 

From ca76560170e69aed9cd92592fea98f9f5dde786f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:38:26 +0200
Subject: [PATCH 1547/1686] python3-fasteners: add python3 to dependencies

---
 srcpkgs/python3-fasteners/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-fasteners/template b/srcpkgs/python3-fasteners/template
index d1d2c75ca2e2..0e5b8bed2c28 100644
--- a/srcpkgs/python3-fasteners/template
+++ b/srcpkgs/python3-fasteners/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-fasteners'
 pkgname=python3-fasteners
 version=0.17.3
-revision=1
+revision=2
 wrksrc="fasteners-${version}"
 build_style=python3-pep517
 hostmakedepends="python3 python3-wheel"
+depends="python3"
 short_desc="Python3 package that provides useful locks"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From e7ab16cc4e6a66f2ae9ff0c9c2b14cc346fab1f9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:38:26 +0200
Subject: [PATCH 1548/1686] python3-listparser: add python3 to dependencies

---
 srcpkgs/python3-listparser/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-listparser/template b/srcpkgs/python3-listparser/template
index dfe7ba100839..55bcd24119af 100644
--- a/srcpkgs/python3-listparser/template
+++ b/srcpkgs/python3-listparser/template
@@ -1,10 +1,11 @@
 # Template file for 'python3-listparser'
 pkgname=python3-listparser
 version=0.18
-revision=1
+revision=2
 wrksrc="listparser-$version"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
+depends="python3"
 short_desc="Parse subscription lists in Python"
 maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-3.0-or-later"

From 72ef671650cc55f97dbbaf400dd40d2c99564300 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:39:03 +0200
Subject: [PATCH 1549/1686] python3-pylast: fix dependencies

---
 srcpkgs/python3-pylast/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index 63b2e0104e61..76e57a27f4cf 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-pylast'
 pkgname=python3-pylast
 version=4.1.0
-revision=3
+revision=4
 wrksrc="pylast-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools_scm"
-depends="python3"
+depends="python3-setuptools"
 short_desc="Python3 interface to last.fm and libre.fm"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/pylast/pylast"
 distfiles="${PYPI_SITE}/p/pylast/pylast-${version}.tar.gz"
 checksum=ad084aec1bf7e307bc42d7cc1a003851f5bee1ad24fb697a9fdc300bbfe63932
+make_check=no # The 'pylast' distribution was not found and is required by the application

From 7599e78edb1290b89511095d0dae01f227e61718 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:39:04 +0200
Subject: [PATCH 1550/1686] python3-soupsieve: fix dependencies

---
 srcpkgs/python3-soupsieve/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index 14449f20c47f..83862532f658 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,12 +1,12 @@
 # Template file for 'python3-soupsieve'
 pkgname=python3-soupsieve
 version=1.9.5
-revision=6
+revision=7
 wrksrc="soupsieve-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3"
-checkdepends="python3-pytest python3-lxml python3-html5lib python3-BeautifulSoup4"
+depends="python3-BeautifulSoup4"
+checkdepends="python3-pytest python3-lxml python3-html5lib $depends"
 short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"

From 24e0b169c4e71e83b0951428e0788cf9c1cc359d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 21 Apr 2022 11:39:04 +0200
Subject: [PATCH 1551/1686] python3-readability-lxml: fix dependencies

---
 srcpkgs/python3-readability-lxml/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-readability-lxml/template b/srcpkgs/python3-readability-lxml/template
index 798cc9c5f4cc..dfb4b0fb6b25 100644
--- a/srcpkgs/python3-readability-lxml/template
+++ b/srcpkgs/python3-readability-lxml/template
@@ -1,14 +1,15 @@
 # Template file for 'python3-readability-lxml'
 pkgname=python3-readability-lxml
 version=0.8.1
-revision=4
+revision=5
 wrksrc="readability-lxml-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-lxml"
+depends="python3-lxml python3-chardet python3-cssselect"
 short_desc="Fast html to text parser"
 maintainer="Benjamín Albiñana <benalb@gmail.com>"
 license="Apache-2.0"
 homepage="https://github.com/buriy/python-readability"
 distfiles="${PYPI_SITE}/r/readability-lxml/readability-lxml-${version}.tar.gz"
 checksum=e51fea56b5909aaf886d307d48e79e096293255afa567b7d08bca94d25b1a4e1
+make_check=no # needs unpackaged timeout_decorator

From 4996d152242dcc44ad980a5c93f74e83157d438e Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:05:43 -0400
Subject: [PATCH 1552/1686] New package: openjdk17-jmods-17.0.3+5

---
 srcpkgs/openjdk17-jmods    |  1 +
 srcpkgs/openjdk17/template | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/openjdk17-jmods

diff --git a/srcpkgs/openjdk17-jmods b/srcpkgs/openjdk17-jmods
new file mode 120000
index 000000000000..99ab1cb1b0d2
--- /dev/null
+++ b/srcpkgs/openjdk17-jmods
@@ -0,0 +1 @@
+openjdk17
\ No newline at end of file
diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 7e368f9b687e..9dba58b0d0d7 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -168,7 +168,7 @@ post_install() {
 	rm -rf ./ca
 }
 
-subpackages="openjdk17-src openjdk17-jre openjdk17-doc"
+subpackages="openjdk17-src openjdk17-jre openjdk17-doc openjdk17-jmods"
 
 openjdk17-jre_package() {
 	shlib_provides="libawt.so libawt_xawt.so libjava.so libjli.so libjvm.so libjawt.so"
@@ -223,3 +223,11 @@ openjdk17-src_package() {
 		vmove "$_jdk_home/lib/src.zip"
 	}
 }
+
+openjdk17-jmods_package() {
+	short_desc+=" - JMODs"
+	depends="${pkgname}-${version}_${revision}"
+	pkg_install() {
+		vmove $_jdk_home/jmods
+	}
+}

From be533af960b33eb2f39412737341091592cfc556 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 19:06:37 -0400
Subject: [PATCH 1553/1686] openjdk17: update to 17.0.3+7.

also disable for armv5 and 6, the arch is not supported
---
 srcpkgs/openjdk17/template | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 9dba58b0d0d7..2554e49c54ea 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,6 +1,6 @@
 # Template file for 'openjdk17'
 pkgname=openjdk17
-version=17.0.3+5
+version=17.0.3+7
 revision=1
 _gtest_ver=1.8.1
 _java_ver="${version%%.*}"
@@ -44,7 +44,7 @@ license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
  https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
-checksum="a557f4d2972bbbbcdc12fa7e167ad60b4ee1461a9bc7ad259a003172c34e6331
+checksum="22575340d080a396442658356583d9c7dc0c44cefa52842fbfcf23eef23c39a0
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1"
 patch_args="-Np1 --directory=$build_wrksrc"
@@ -53,10 +53,11 @@ patch_args="-Np1 --directory=$build_wrksrc"
 disable_parallel_build=yes
 build_options="docs"
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then
@@ -81,11 +82,6 @@ else
 fi
 
 alternatives="
- java:/usr/bin/java:/${_jdk_home}/bin/java
- java:/usr/bin/jfr:/${_jdk_home}/bin/jfr
- java:/usr/bin/keytool:/${_jdk_home}/bin/keytool
- java:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
-
  jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
  jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
  jdk:/usr/bin/java:/${_jdk_home}/bin/java

From 0c00f7eca1c83b0f4b03eec61a4489e745ef5d0b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:38 -0400
Subject: [PATCH 1554/1686] openjdk9-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk9-bootstrap/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 48cc14fb712c..c82f0761166a 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -50,10 +50,11 @@ checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  9cba7f03ebeda4d3cfaffb015f9bf967fcca2c3c113604836073556df6a7b9aa
  c939de46f903ecb283c02155e1415cee98ab66803e17eae0403c399c1a475647"
 
-# no hotspot JIT for arm32 and ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	arm*|ppc*) _use_zero=yes ;;
+	# no hotspot JIT for arm32 and ppc32
+	armv7*|ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 0cef4c954f67190f47c1f7850bb0ccc6af71dfd6 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:40 -0400
Subject: [PATCH 1555/1686] openjdk10-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk10-bootstrap/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index 3d99cd14af98..1c673dc748d1 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -35,10 +35,11 @@ distfiles="http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-${_repo_ver
 checksum="374f7ae35f0a7439a40bd2c765d1f410607c75c6c1e788f1a344a42e59431f51"
 lib32disabled=yes
 
-# no hotspot JIT for arm32 and ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
-	arm*|ppc*) _use_zero=yes ;;
+	# no hotspot JIT for arm32 and ppc32
+	armv7*|ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 79e1657bdebd920167760c954d25d9ee5ff31618 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:41 -0400
Subject: [PATCH 1556/1686] openjdk12-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk12-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 2b5d421a52f0..1f20483ecbd4 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -47,10 +47,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From ff5e50fdffd236e9df2434d9c1e311ab70c861dd Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:41 -0400
Subject: [PATCH 1557/1686] openjdk13-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk13-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index 4a61e102381d..6a6b3340ffcd 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -47,10 +47,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From ec803b07277af1681b865dc9a8d79281937edd02 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:42 -0400
Subject: [PATCH 1558/1686] openjdk14-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk14-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 768b94633196..341818dc5cf9 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -46,10 +46,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 75077cc88a70d502286cb4856ec8bda27c47b2fa Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:43 -0400
Subject: [PATCH 1559/1686] openjdk15-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk15-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index 7608f4dd2658..1430f205d1b9 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -49,10 +49,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From 873ff286963e54d5905dfde53426d391cd72d33b Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 21:05:43 -0400
Subject: [PATCH 1560/1686] openjdk16-bootstrap: disable on armv[56]

---
 srcpkgs/openjdk16-bootstrap/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 28e70a17fd2b..2c8566bb1c31 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -49,10 +49,11 @@ nocross=yes
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
 
-# no hotspot JIT for ppc32
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
+	# no hotspot JIT for ppc32
 	ppc*) _use_zero=yes ;;
+	armv[56]*) broken="Unsupported architecture" ;;
 esac
 
 if [ -n "$_use_zero" ]; then

From f4c7ccb907c5ec1b8a576aff371bd3f77ce907da Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Wed, 20 Apr 2022 22:12:21 -0400
Subject: [PATCH 1561/1686] openjdk8: update to 8u322b04, enable debug.

---
 .../openjdk8/patches/006_8197981-pr3548.patch |  32 ----
 srcpkgs/openjdk8/patches/010_pr1869.patch     |  33 ----
 .../patches/999-native-no-sysroot.patch       |  10 +-
 srcpkgs/openjdk8/template                     | 161 ++++++++----------
 4 files changed, 77 insertions(+), 159 deletions(-)
 delete mode 100644 srcpkgs/openjdk8/patches/006_8197981-pr3548.patch
 delete mode 100644 srcpkgs/openjdk8/patches/010_pr1869.patch

diff --git a/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch b/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch
deleted file mode 100644
index 5f6d9ce9e4b5..000000000000
--- a/srcpkgs/openjdk8/patches/006_8197981-pr3548.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1518667645 0
-#      Thu Feb 15 04:07:25 2018 +0000
-# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
-# Parent  999983606f5c61b093c6f6316a7b26c4cd4ca79e
-8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
-Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
-@@ -457,6 +457,7 @@
-     long long unsigned int oldval,
-     long long unsigned int newval) {
-     ShouldNotCallThis();
-+    return 0;
-   }
- };
- #endif // !_LP64
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
-@@ -498,6 +498,7 @@
-     long long unsigned int oldval,
-     long long unsigned int newval) {
-     ShouldNotCallThis();
-+    return 0;
-   }
- };
- #endif // !_LP64
diff --git a/srcpkgs/openjdk8/patches/010_pr1869.patch b/srcpkgs/openjdk8/patches/010_pr1869.patch
deleted file mode 100644
index 26f8c8e14bd6..000000000000
--- a/srcpkgs/openjdk8/patches/010_pr1869.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1405461315 -3600
-#      Tue Jul 15 22:55:15 2014 +0100
-# Node ID 967ae4d849eb20b4b63c399bc3f376dfc0f9d2cc
-# Parent  84854c983fd81cf1a1598f8c069a2db010abc05c
-PR1869: Avoid x86 workaround when running Zero rather than a JIT
-Contributed-by: Matthias Klose <doko@ubuntu.com>
-
-diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp	2019-04-11 03:36:49.000000000 +0100
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2019-04-19 17:15:35.194017652 +0100
-@@ -5139,7 +5139,7 @@
- 
-   Linux::capture_initial_stack(JavaThread::stack_size_at_create());
- 
--#if defined(IA32)
-+#if defined(IA32) && !defined(ZERO)
-   workaround_expand_exec_shield_cs_limit();
- #endif
- 
-diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2019-04-11 03:36:49.000000000 +0100
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	2019-04-19 17:15:58.329656663 +0100
-@@ -890,7 +890,7 @@
-  * updates (JDK-8023956).
-  */
- void os::workaround_expand_exec_shield_cs_limit() {
--#if defined(IA32)
-+#if defined(IA32) && !defined(ZERO)
-   size_t page_size = os::vm_page_size();
- 
-   /*
diff --git a/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch b/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch
index 52c8194b0bca..aabc19835d5c 100644
--- a/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch
+++ b/srcpkgs/openjdk8/patches/999-native-no-sysroot.patch
@@ -2,11 +2,9 @@ By default, OpenJDK 8 passes sysroot flags to native compiler. This is wrong,
 as it will then use target include files when calling the native compiler.
 Newer versions of OpenJDK have seemingly fixed this, 8 has not.
 
-diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
-index d961cf3..9679f97 100644
 --- a/make/common/NativeCompilation.gmk
 +++ b/make/common/NativeCompilation.gmk
-@@ -383,10 +383,6 @@ define SetupNativeCompilation
+@@ -384,10 +384,6 @@
      $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
    endif
  
@@ -17,12 +15,12 @@ index d961cf3..9679f97 100644
    # Now call add_native_source for each source file we are going to compile.
    $$(foreach p,$$($1_SRCS), \
        $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
-@@ -432,8 +428,6 @@ define SetupNativeCompilation
+@@ -433,8 +429,6 @@
      $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
    endif
  
 -  $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS)
 -
+   # Need to make sure TARGET is first on list
    $1 := $$($1_TARGET)
-   ifneq (,$$($1_LIBRARY))
-     # Generating a dynamic library.
+   ifeq ($$($1_STATIC_LIBRARY),)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index c10b5216435b..9cced29b4be9 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -3,13 +3,12 @@
 # TODO: make -headless versions
 # TODO: config files?
 pkgname=openjdk8
-version=8u272b02
+version=8u322b04
 revision=1
-_jdk_update=272
 _jdk_update="${version#*u}"
 _jdk_update="${_jdk_update%b*}"
 _jdk_build="${version#*b}"
-_final_jdk_home="usr/lib/jvm/java-1.8-openjdk"
+_jdk_home="usr/lib/jvm/java-1.8-openjdk"
 # we're using aarch64 port repo to get aarch64 JIT; the repo is
 # otherwise the same as the normal one, just with aarch64 port added
 _repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
@@ -19,6 +18,8 @@ configure_args="
  --prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
  --with-update-version=${_jdk_update}
  --with-build-number=b${_jdk_build}
+ --with-debug-level=release
+ --with-native-debug-symbols=internal
  --with-milestone=fcs
  --enable-unlimited-crypto
  --with-zlib=system
@@ -53,14 +54,14 @@ distfiles="
  http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/${_repo_ver}.tar.gz>langtools-${_repo_ver}.tar.gz
  http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/${_repo_ver}.tar.gz>nashorn-${_repo_ver}.tar.gz"
 
-checksum="bb931ea723a8b6c418ef6a8dc7b33c9a082ce240f607e33d260951bdc52d1294
- 655a3f4875f4ea4d6d7083c65e3bffbd694114af25a7e25bb4276c63f606328d
- 2c6bc905ffe04659e89806514f10848e4ff548209c8e4407a5f37a3358a8cb78
- 9543a96eb3f60171cebbf0652190942c0b0a78560fae19c7c7aff7a72e14daa5
- 7a610a834483650660a98828420cd3bb36f17e077cc0eaf30c4d01db97ee0efd
- 330f52d045993ca98f6c6376bb67e5c085937553db80fd21503129f9fcdd144d
- 04d6b61009f7373c49a5381281cae2d4c06d4c5bc42991b3bccfb8b820b95bba
- 48aac240d50cb3fa651b2299b6add1376f31624fd7666b74ba23761bb535fab7"
+checksum="1b93adf81488be199243f684398d616c20e68bd3bef990d9eafb3d607ab3d02e
+ 03a7e0fc8ce0ed938c80c69890812e1dbad423df1718115e28f930908a9b5f9b
+ 2213194f9b3aef81340710ca63fd00fbabc42a82b6b30d6955640e66293ab497
+ 80646bf709598067622227c982efdbd88b3c6e8da0024e6f9a264145d942a99c
+ 8c8fc97a8c056cc520472d292b85dbe25a7edbfa4545a8c45275b7b378b0fb65
+ 2d659ba2c64b19dba192ed1be1e6033efb7445809f8e6966439619a417975a73
+ 16cc13cc5234ac1ed3dcebc8c8586a4e31b43cf5c9a4b496fd1f29279fa6b827
+ 68357e18386d833a882a9a988bf4535e5ce8dfa90beeeed7a1939aa75c0e991f"
 
 build_options="docs"
 desc_option_docs="Build documentation"
@@ -81,75 +82,59 @@ fi
 
 provides="java-environment-${version}_1"
 
-if [ -n "$XBPS_DEBUG_PKGS" ]; then
-	configure_args+=" --with-native-debug-symbols=internal"
-fi
-
 if [ ! "$CROSS_BUILD" ]; then
 	hostmakedepends+=" openjdk7-bootstrap"
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-1.7-openjdk"
 else
 	hostmakedepends+=" openjdk8"
-	configure_args+=" --with-boot-jdk=/${_final_jdk_home}"
+	configure_args+=" --with-boot-jdk=/${_jdk_home}"
 fi
 
 # enabling ccache segfaults gcc
 export CCACHE_DISABLE=1
 
 alternatives="
- java:/usr/bin/java:/${_final_jdk_home}/bin/java
- java:/usr/bin/jjs:/${_final_jdk_home}/bin/jjs
- java:/usr/bin/keytool:/${_final_jdk_home}/bin/keytool
- java:/usr/bin/orbd:/${_final_jdk_home}/bin/orbd
- java:/usr/bin/pack200:/${_final_jdk_home}/bin/pack200
- java:/usr/bin/policytool:/${_final_jdk_home}/bin/policytool
- java:/usr/bin/rmid:/${_final_jdk_home}/bin/rmid
- java:/usr/bin/rmiregistry:/${_final_jdk_home}/bin/rmiregistry
- java:/usr/bin/servertool:/${_final_jdk_home}/bin/servertool
- java:/usr/bin/tnameserv:/${_final_jdk_home}/bin/tnameserv
- java:/usr/bin/unpack200:/${_final_jdk_home}/bin/unpack200
-
- jdk:/usr/bin/appletviewer:/${_final_jdk_home}/bin/appletviewer
- jdk:/usr/bin/extcheck:/${_final_jdk_home}/bin/extcheck
- jdk:/usr/bin/idlj:/${_final_jdk_home}/bin/idlj
- jdk:/usr/bin/jar:/${_final_jdk_home}/bin/jar
- jdk:/usr/bin/jarsigner:/${_final_jdk_home}/bin/jarsigner
- jdk:/usr/bin/java:/${_final_jdk_home}/bin/java
- jdk:/usr/bin/java-rmi.cgi:/${_final_jdk_home}/bin/java-rmi.cgi
- jdk:/usr/bin/javac:/${_final_jdk_home}/bin/javac
- jdk:/usr/bin/javadoc:/${_final_jdk_home}/bin/javadoc
- jdk:/usr/bin/javah:/${_final_jdk_home}/bin/javah
- jdk:/usr/bin/javap:/${_final_jdk_home}/bin/javap
- jdk:/usr/bin/jcmd:/${_final_jdk_home}/bin/jcmd
- jdk:/usr/bin/jconsole:/${_final_jdk_home}/bin/jconsole
- jdk:/usr/bin/jdb:/${_final_jdk_home}/bin/jdb
- jdk:/usr/bin/jdeps:/${_final_jdk_home}/bin/jdeps
- jdk:/usr/bin/jhat:/${_final_jdk_home}/bin/jhat
- jdk:/usr/bin/jinfo:/${_final_jdk_home}/bin/jinfo
- jdk:/usr/bin/jjs:/${_final_jdk_home}/bin/jjs
- jdk:/usr/bin/jmap:/${_final_jdk_home}/bin/jmap
- jdk:/usr/bin/jps:/${_final_jdk_home}/bin/jps
- jdk:/usr/bin/jrunscript:/${_final_jdk_home}/bin/jrunscript
- jdk:/usr/bin/jsadebugd:/${_final_jdk_home}/bin/jsadebugd
- jdk:/usr/bin/jstack:/${_final_jdk_home}/bin/jstack
- jdk:/usr/bin/jstat:/${_final_jdk_home}/bin/jstat
- jdk:/usr/bin/jstatd:/${_final_jdk_home}/bin/jstatd
- jdk:/usr/bin/keytool:/${_final_jdk_home}/bin/keytool
- jdk:/usr/bin/native2ascii:/${_final_jdk_home}/bin/native2ascii
- jdk:/usr/bin/orbd:/${_final_jdk_home}/bin/orbd
- jdk:/usr/bin/pack200:/${_final_jdk_home}/bin/pack200
- jdk:/usr/bin/policytool:/${_final_jdk_home}/bin/policytool
- jdk:/usr/bin/rmic:/${_final_jdk_home}/bin/rmic
- jdk:/usr/bin/rmid:/${_final_jdk_home}/bin/rmid
- jdk:/usr/bin/rmiregistry:/${_final_jdk_home}/bin/rmiregistry
- jdk:/usr/bin/schemagen:/${_final_jdk_home}/bin/schemagen
- jdk:/usr/bin/serialver:/${_final_jdk_home}/bin/serialver
- jdk:/usr/bin/servertool:/${_final_jdk_home}/bin/servertool
- jdk:/usr/bin/tnameserv:/${_final_jdk_home}/bin/tnameserv
- jdk:/usr/bin/unpack200:/${_final_jdk_home}/bin/unpack200
- jdk:/usr/bin/wsgen:/${_final_jdk_home}/bin/wsgen
- jdk:/usr/bin/wsimport:/${_final_jdk_home}/bin/wsimport
- jdk:/usr/bin/xjc:/${_final_jdk_home}/bin/xjc
+ jdk:/usr/bin/appletviewer:/${_jdk_home}/bin/appletviewer
+ jdk:/usr/bin/extcheck:/${_jdk_home}/bin/extcheck
+ jdk:/usr/bin/idlj:/${_jdk_home}/bin/idlj
+ jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
+ jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
+ jdk:/usr/bin/java:/${_jdk_home}/bin/java
+ jdk:/usr/bin/java-rmi.cgi:/${_jdk_home}/bin/java-rmi.cgi
+ jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
+ jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
+ jdk:/usr/bin/javah:/${_jdk_home}/bin/javah
+ jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
+ jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
+ jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
+ jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
+ jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
+ jdk:/usr/bin/jhat:/${_jdk_home}/bin/jhat
+ jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
+ jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
+ jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
+ jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
+ jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
+ jdk:/usr/bin/jsadebugd:/${_jdk_home}/bin/jsadebugd
+ jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
+ jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
+ jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
+ jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
+ jdk:/usr/bin/native2ascii:/${_jdk_home}/bin/native2ascii
+ jdk:/usr/bin/orbd:/${_jdk_home}/bin/orbd
+ jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
+ jdk:/usr/bin/policytool:/${_jdk_home}/bin/policytool
+ jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
+ jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
+ jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
+ jdk:/usr/bin/schemagen:/${_jdk_home}/bin/schemagen
+ jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
+ jdk:/usr/bin/servertool:/${_jdk_home}/bin/servertool
+ jdk:/usr/bin/tnameserv:/${_jdk_home}/bin/tnameserv
+ jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
+ jdk:/usr/bin/wsgen:/${_jdk_home}/bin/wsgen
+ jdk:/usr/bin/wsimport:/${_jdk_home}/bin/wsimport
+ jdk:/usr/bin/xjc:/${_jdk_home}/bin/xjc
 "
 
 post_extract() {
@@ -219,11 +204,11 @@ post_install() {
 
 	# unify the install prefix
 	mv ${DESTDIR}/usr/lib/jvm/openjdk-1.8.0_${_jdk_update} \
-	   ${DESTDIR}/${_final_jdk_home}
+	   ${DESTDIR}/${_jdk_home}
 
-	vmkdir ${_final_jdk_home}/lib/security
-	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/${_final_jdk_home}/bin/keytool"
-	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/${_final_jdk_home}/lib/security/
+	vmkdir ${_jdk_home}/lib/security
+	make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/${_jdk_home}/bin/keytool"
+	mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/${_jdk_home}/lib/security/
 	chmod -R ugo+rw ./ca
 	rm -Rf ./ca
 
@@ -237,23 +222,23 @@ openjdk8-jre_package() {
 	short_desc+=" - runtime components"
 	provides="java-runtime-${version}_1"
 	alternatives="
-	 java:/usr/bin/java:/${_final_jdk_home}/jre/bin/java
-	 java:/usr/bin/jjs:/${_final_jdk_home}/jre/bin/jjs
-	 java:/usr/bin/keytool:/${_final_jdk_home}/jre/bin/keytool
-	 java:/usr/bin/orbd:/${_final_jdk_home}/jre/bin/orbd
-	 java:/usr/bin/pack200:/${_final_jdk_home}/jre/bin/pack200
-	 java:/usr/bin/policytool:/${_final_jdk_home}/jre/bin/policytool
-	 java:/usr/bin/rmid:/${_final_jdk_home}/jre/bin/rmid
-	 java:/usr/bin/rmiregistry:/${_final_jdk_home}/jre/bin/rmiregistry
-	 java:/usr/bin/servertool:/${_final_jdk_home}/jre/bin/servertool
-	 java:/usr/bin/tnameserv:/${_final_jdk_home}/jre/bin/tnameserv
-	 java:/usr/bin/unpack200:/${_final_jdk_home}/jre/bin/unpack200
+	 java:/usr/bin/java:/${_jdk_home}/jre/bin/java
+	 java:/usr/bin/jjs:/${_jdk_home}/jre/bin/jjs
+	 java:/usr/bin/keytool:/${_jdk_home}/jre/bin/keytool
+	 java:/usr/bin/orbd:/${_jdk_home}/jre/bin/orbd
+	 java:/usr/bin/pack200:/${_jdk_home}/jre/bin/pack200
+	 java:/usr/bin/policytool:/${_jdk_home}/jre/bin/policytool
+	 java:/usr/bin/rmid:/${_jdk_home}/jre/bin/rmid
+	 java:/usr/bin/rmiregistry:/${_jdk_home}/jre/bin/rmiregistry
+	 java:/usr/bin/servertool:/${_jdk_home}/jre/bin/servertool
+	 java:/usr/bin/tnameserv:/${_jdk_home}/jre/bin/tnameserv
+	 java:/usr/bin/unpack200:/${_jdk_home}/jre/bin/unpack200
 	"
 	pkg_install() {
-		vmove ${_final_jdk_home}/jre
+		vmove ${_jdk_home}/jre
 		vmkdir etc/profile.d
 		cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk8.sh <<EOF
-export JAVA_HOME=\${JAVA_HOME=/${_final_jdk_home}/jre}
+export JAVA_HOME=\${JAVA_HOME=/${_jdk_home}/jre}
 EOF
 	}
 }
@@ -264,7 +249,7 @@ openjdk8-src_package() {
 	noshlibprovides=yes
 	short_desc+=" - source code"
 	pkg_install() {
-		vmove ${_final_jdk_home}/src.zip
+		vmove ${_jdk_home}/src.zip
 	}
 }
 
@@ -279,6 +264,6 @@ openjdk8-doc_package() {
 			vmkdir usr/share/doc/openjdk8
 			cp -a build/linux-*/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk8
 		fi
-		vmove ${_final_jdk_home}/man/man1
+		vmove ${_jdk_home}/man/man1
 	}
 }

From e906d3bed0475f598f08e5125ef507ba205ecfca Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Apr 2022 12:15:20 +0200
Subject: [PATCH 1562/1686] python3-pwntools: update to 4.8.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 e57c1bed3007..f61ad95fa813 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.7.0
+version=4.8.0
 revision=1
 wrksrc="pwntools-${version}"
 build_style=python3-module
@@ -17,7 +17,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=74388e28675e7a1929f763df5a1cec6a3d589641049b6cf476bb1c56ec50a88e
+checksum=42052e2d883710e4e1da041e91675a6d719fb4e5ef2dd245cb2853da11269290
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From cbaf517bbb78ea16af46a1bb836d358ecf258514 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Apr 2022 14:20:52 +0200
Subject: [PATCH 1563/1686] gst-plugins-base1: ensure wayland winsys is built

This is a regression from previous state.
---
 srcpkgs/gst-plugins-base1/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index 6ab6210e6605..fcb7c07b06ab 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
 version=1.20.1
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
@@ -9,12 +9,13 @@ configure_args="-Dtremor=disabled -Dexamples=disabled -Ddoc=disabled
  -Dcdparanoia=$(vopt_if cdparanoia enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)
  -Dsndio=$(vopt_if sndio enabled disabled)"
-hostmakedepends="gettext pkg-config glib-devel orc"
+hostmakedepends="gettext pkg-config glib-devel orc wayland-devel"
 makedepends="gstreamer1-devel glib-devel libxml2-devel pango-devel
  cairo-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel
  libvisual-devel libgudev-devel libtheora-devel libvorbis-devel
  libSM-devel orc-devel $(vopt_if cdparanoia libcdparanoia-devel)
- opus-devel MesaLib-devel $(vopt_if sndio sndio-devel) graphene-devel"
+ opus-devel MesaLib-devel $(vopt_if sndio sndio-devel) graphene-devel
+ wayland-devel wayland-protocols"
 depends="orc>=0.4.18 gstreamer1>=${version}"
 checkdepends="mesa-dri"
 short_desc="GStreamer Base Plug-ins (v1.x)"

From 68c1db90d9b191d5c3d3cbb7fa8883a79b3454f4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Apr 2022 14:25:20 +0200
Subject: [PATCH 1564/1686] gst-plugins-good1: rebuild against fixed
 gst-plugins-base1

---
 srcpkgs/gst-plugins-good1/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index 0ce7d1bce5c9..aba03519e450 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-good1'
 pkgname=gst-plugins-good1
 version=1.20.1
-revision=1
+revision=2
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled

From 488111a2d9229acac6c26dbfa43c8299d4067583 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Thu, 21 Apr 2022 14:28:46 +0200
Subject: [PATCH 1565/1686] qt5: rebuild again against fixed gstreamer

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f6c03777d993..ee788fad2019 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
 version=5.15.3+20220222
 # commit fcca82ca40a5d8a02a4ddd90846d070f2c58cfad
 # base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config
  python re2c ruby which"

From ac2bb3ee233d4c9acf28f433f7ff24b60b1e3f52 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 21 Apr 2022 15:36:44 +0200
Subject: [PATCH 1566/1686] clojure: update to 1.11.1.1105.

---
 srcpkgs/clojure/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/clojure/template b/srcpkgs/clojure/template
index 7fdaa6090b67..ac65080ef7af 100644
--- a/srcpkgs/clojure/template
+++ b/srcpkgs/clojure/template
@@ -1,6 +1,6 @@
 # Template file for 'clojure'
 pkgname=clojure
-version=1.10.3.1029
+version=1.11.1.1105
 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=422986f259608c049fcff7147222c713b5563a9f0c6e74e0a0dae4a076478091
+checksum=991cad02a2ac459dc4222c9f8233e2145458ed8576a254b64c262798cae40567
 
 do_install() {
 	vmkdir /usr/lib/clojure

From f24b584a55cf63a7c745d75ff29b95073b51b62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 13 Apr 2022 21:13:37 +0200
Subject: [PATCH 1567/1686] xbps-src: sort and deduplicate packages at
 update-sys

---
 common/xbps-src/shutils/bulk.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index 8eb6e920f04f..c0228f10ac2b 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -68,7 +68,7 @@ bulk_build() {
 
     # Compare installed pkg versions vs srcpkgs
     if [[ $sys ]]; then
-        xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR
+        bulk_sortdeps $(xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR)
         return $?
     fi
     # compare repo pkg versions vs srcpkgs

From 3f7c0af70a2cac282b5d469c5dc14fa6613456f2 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 14:08:15 +0200
Subject: [PATCH 1568/1686] lxqt: update to 1.1.0.

---
 srcpkgs/lxqt/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/lxqt/template b/srcpkgs/lxqt/template
index a510106d65db..d30d711e9561 100644
--- a/srcpkgs/lxqt/template
+++ b/srcpkgs/lxqt/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt'
 pkgname=lxqt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=meta
 depends="
@@ -21,15 +21,15 @@ depends="
 	obconf-qt
 	pcmanfm-qt>=${version}
 	lximage-qt>=${version}
-	lxmenu-data
 	lxqt-archiver
 	qterminal>=${version}
 	openbox
 	breeze-icons
+	xdg-desktop-portal-lxqt
 	xdg-utils
 	elogind
 	upower"
 short_desc="LXQt meta-package for Void Linux"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="BSD-2-Clause" # Suppress xlint warning: vlicense
-homepage="https://www.lxqt.org/"
+homepage="https://lxqt-project.org"

From 01853cacd185d0f63bdd7672e9f23bb666a8bf98 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 14:25:28 +0200
Subject: [PATCH 1569/1686] lxqt-build-tools: update to 0.11.0.

---
 srcpkgs/lxqt-build-tools/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-build-tools/template b/srcpkgs/lxqt-build-tools/template
index 8b88c28e20c2..179cfee67e7f 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.10.0
+version=0.11.0
 revision=1
 build_style=cmake
 hostmakedepends="qt5-host-tools qt5-qmake pkg-config"
@@ -8,9 +8,9 @@ makedepends="qt5-devel"
 short_desc="LXQt build tools"
 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=facb86b0bf3bd4fd20306d3ae965a148ed59785eaf7d73169a82a97473d03bea
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-build-tools/archive/${version}.tar.gz"
+checksum=95da1309ae0111e3b97f775788465f82548a3de09b0e9d5e0a26e5fe715075b2
 
 post_install() {
 	vlicense BSD-3-Clause LICENSE

From 5040b48632299eae45d9be31d566786e1b988060 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 14:44:10 +0200
Subject: [PATCH 1570/1686] libqtxdg: update to 3.9.0.

---
 srcpkgs/libqtxdg/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template
index a9c665844f3c..b8bea143f360 100644
--- a/srcpkgs/libqtxdg/template
+++ b/srcpkgs/libqtxdg/template
@@ -1,6 +1,6 @@
 # Template file for 'libqtxdg'
 pkgname=libqtxdg
-version=3.8.0
+version=3.9.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools lxqt-build-tools"
@@ -8,9 +8,9 @@ makedepends="qt5-svg-devel"
 short_desc="Qt implementation of freedesktop.org XDG specifications"
 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=ce824fb2dda47758b44e57e8e4b63437a5bc5bd476cf37dbba61442990d7ccec
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/libqtxdg/archive/${version}.tar.gz"
+checksum=4dc7e3e65e6bcd50010647ef781ef5601b08ce024b0b1155e6a68316696c5a58
 
 libqtxdg-devel_package() {
 	short_desc+=" - development files"

From 60edc970d26e22e46fdf9b239cdd03a4e3ca83ee Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:05:52 +0200
Subject: [PATCH 1571/1686] liblxqt: update to 1.1.0.

---
 srcpkgs/liblxqt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/liblxqt/template b/srcpkgs/liblxqt/template
index c39a0398f965..5e5734ad61c5 100644
--- a/srcpkgs/liblxqt/template
+++ b/srcpkgs/liblxqt/template
@@ -1,6 +1,6 @@
 # Template file for 'liblxqt'
 pkgname=liblxqt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools
@@ -10,9 +10,9 @@ makedepends="kwindowsystem-devel libqtxdg-devel libXScrnSaver-devel
 short_desc="Core utility library for all LXQt components"
 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=d62820a94839637aedd6a0ceecc232f85d8ccd2173d4ec655cd92c9cbcbcc98c
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/liblxqt/archive/${version}.tar.gz"
+checksum=3b4672cef3906f82444da886557fe0504bf53066e7741c2215592119fbafbb42
 
 liblxqt-devel_package() {
 	short_desc+=" - development files"

From c14754d865de646969d0a40958deefbdf459d42b Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:26:14 +0200
Subject: [PATCH 1572/1686] lxqt-config: update to 1.1.0.

---
 srcpkgs/lxqt-config/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lxqt-config/template b/srcpkgs/lxqt-config/template
index c38f2486029f..8372521a2c32 100644
--- a/srcpkgs/lxqt-config/template
+++ b/srcpkgs/lxqt-config/template
@@ -1,14 +1,14 @@
 # Template file for 'lxqt-config'
 pkgname=lxqt-config
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
-hostmakedepends="pkgconf lxqt-build-tools qt5-qmake qt5-host-tools perl"
+hostmakedepends="pkg-config 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"
 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=64d7dd43e5ec1f98f0ba41e99f4438bb1f881fcbc2b2931f798cc82643c2d8a5
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-config/archive/${version}.tar.gz"
+checksum=debe3f51c30e37a8bca37bfdaa0187a68ddd57dad0ecefef169a32c2b042cc58

From 7ceb4c66f7f81282acdcc60910e20e5915e7a64d Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:36:44 +0200
Subject: [PATCH 1573/1686] lxqt-policykit: update to 1.1.0.

---
 srcpkgs/lxqt-policykit/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-policykit/template b/srcpkgs/lxqt-policykit/template
index ef972dba1961..ad81878cab8a 100644
--- a/srcpkgs/lxqt-policykit/template
+++ b/srcpkgs/lxqt-policykit/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-policykit'
 pkgname=lxqt-policykit
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools polkit-qt5-devel perl"
@@ -8,7 +8,7 @@ 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=8e3ae58196c55c28a5a231f44154a83d6697aa5f6b40dffdedb6b9ea776b4d35
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-policykit/archive/${version}.tar.gz"
+checksum=4866bb843657206b0bb55cc063474941a6d81db578fe3d5143d3760f438b033d
 replaces="lxqt-common>=0"

From 3942237ce49686951a76f706dc4feae289aa9c31 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:48:19 +0200
Subject: [PATCH 1574/1686] lxqt-session: update to 1.1.0.

---
 srcpkgs/lxqt-session/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lxqt-session/template b/srcpkgs/lxqt-session/template
index 3afe6da177f3..3b30d410cc33 100644
--- a/srcpkgs/lxqt-session/template
+++ b/srcpkgs/lxqt-session/template
@@ -1,16 +1,16 @@
 # Template file for 'lxqt-session'
 pkgname=lxqt-session
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools xdg-user-dirs
  perl"
-makedepends="liblxqt-devel xdg-user-dirs procps-ng-devel"
+makedepends="kwindowsystem-devel liblxqt-devel 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=3245457cb4a1e59ec62802308c872173baa300fa0f8e517fe14f45112733a6c1
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-session/archive/${version}.tar.gz"
+checksum=6ff41d1c95464fe7b00d3b5493f259323ecad61ae72865cf251ad5db9ae68e4e
 replaces="lxqt-common>=0"

From e45b2ead50ae34104f15abc65cc927d583011b9f Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 15:54:04 +0200
Subject: [PATCH 1575/1686] lxqt-about: update to 1.1.0.

---
 srcpkgs/lxqt-about/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-about/template b/srcpkgs/lxqt-about/template
index 4103f1a6038e..447c2a945f8b 100644
--- a/srcpkgs/lxqt-about/template
+++ b/srcpkgs/lxqt-about/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-about'
 pkgname=lxqt-about
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,6 +8,6 @@ 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=1c14f68bf65099fbd46b062ffc6c92656620aa1a9eec5a0fd2d1b11888939203
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-about/archive/${version}.tar.gz"
+checksum=d8b5bb348c73e59e000151c5569b46496299155019a3cf9ce7e21a8f641d42b4

From 99f432f5aa87000937bddc84a2f0511a1acd7acc Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 17:21:23 +0200
Subject: [PATCH 1576/1686] lxqt-admin: update to 1.1.0.

---
 srcpkgs/lxqt-admin/patches/systemd.patch |  9 +++++++++
 srcpkgs/lxqt-admin/template              | 14 ++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/lxqt-admin/patches/systemd.patch

diff --git a/srcpkgs/lxqt-admin/patches/systemd.patch b/srcpkgs/lxqt-admin/patches/systemd.patch
new file mode 100644
index 000000000000..097c7669b1bf
--- /dev/null
+++ b/srcpkgs/lxqt-admin/patches/systemd.patch
@@ -0,0 +1,9 @@
+lxqt-admin-time depends on systemd-{timedated,timesyncd}
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,5 +38,4 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD
+     message(WARNING "${CMAKE_SYSTEM_NAME} is not supported by lxqt-admin-time")
+ else()
+     add_subdirectory(lxqt-admin-user)
+-    add_subdirectory(lxqt-admin-time)
+ endif()
diff --git a/srcpkgs/lxqt-admin/template b/srcpkgs/lxqt-admin/template
index 9bf02478a149..cba72e16fbce 100644
--- a/srcpkgs/lxqt-admin/template
+++ b/srcpkgs/lxqt-admin/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-admin'
 pkgname=lxqt-admin
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools polkit-qt5-devel
@@ -9,12 +9,6 @@ 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=f6eebb0da1563f14e9e4d39d3ff2622ee1c8ffa5b130ba26321cfe5261c1411e
-
-post_install() {
-	# depends on systemd-{timedated,timesyncd}
-	rm -f ${DESTDIR}/usr/bin/lxqt-admin-time
-	rm -f ${DESTDIR}/usr/share/applications/lxqt-admin-time.desktop
-}
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-admin/archive/${version}.tar.gz"
+checksum=cf6c41a63b861caacae5ace8bef4781f502cfb0f559fe56afbffe60d13a74775

From 41b9c71054293381b0112c61d6260ae69e1f5631 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 17:31:34 +0200
Subject: [PATCH 1577/1686] lxqt-archiver: update to 0.6.0.

---
 srcpkgs/lxqt-archiver/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-archiver/template b/srcpkgs/lxqt-archiver/template
index 5a5dd96932b2..076965fb01bb 100644
--- a/srcpkgs/lxqt-archiver/template
+++ b/srcpkgs/lxqt-archiver/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-archiver'
 pkgname=lxqt-archiver
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools pkg-config qt5-host-tools qt5-qmake perl"
@@ -8,6 +8,6 @@ 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=8ae5259ec00761b1f178e54b9e99bcf64685a6000a148501c4bbe862b4b08fc7
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/${pkgname}/archive/${version}.tar.gz"
+checksum=63029ed0c22dccaa30a7dd7866b6739e7746904cfa97deac836b40da6d56eb8c

From a7bd670fcd4fef54d1a65da628cbbf70c246be79 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 17:43:05 +0200
Subject: [PATCH 1578/1686] libfm-qt: update to 1.1.0.

---
 common/shlibs             | 2 +-
 srcpkgs/libfm-qt/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index ae4bb44c57a3..11328b15a9cc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1990,7 +1990,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.10 libfm-qt-1.0.0_1
+libfm-qt.so.11 libfm-qt-1.1.0_1
 libqtermwidget5.so.1 qtermwidget-1.0.0_1
 libQt6Core.so.6 qt6-core-6.0.0_1
 libQt6OpenGL.so.6 qt6-gui-6.0.0_1
diff --git a/srcpkgs/libfm-qt/template b/srcpkgs/libfm-qt/template
index 9b2009242a83..bd7343fac83d 100644
--- a/srcpkgs/libfm-qt/template
+++ b/srcpkgs/libfm-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'libfm-qt'
 pkgname=libfm-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,9 +9,9 @@ makedepends="qt5-tools-devel qt5-x11extras-devel libexif-devel
 short_desc="Core library of PCManFM-Qt"
 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=743d9c8fc30d065d7fefc12e72f31085891733184f1320ba3ade890dae54993b
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/libfm-qt/archive/${version}.tar.gz"
+checksum=8ba16e0db696bb938f675b6d5394ec96726585e8b6130e6a2718a4ffde073d62
 replaces="libfm-qt5>=0"
 
 libfm-qt-devel_package() {

From 4e06ac1511e601501c20a581d1d2190cb3c25075 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:09:10 +0200
Subject: [PATCH 1579/1686] pcmanfm-qt: update to 1.1.0.

---
 srcpkgs/pcmanfm-qt/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/pcmanfm-qt/template b/srcpkgs/pcmanfm-qt/template
index fc09b2987170..5a5341a6c5f6 100644
--- a/srcpkgs/pcmanfm-qt/template
+++ b/srcpkgs/pcmanfm-qt/template
@@ -1,15 +1,15 @@
 # Template file for 'pcmanfm-qt'
 pkgname=pcmanfm-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
-hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel perl"
+hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-qt-devel perl"
 makedepends="qt5-tools-devel qt5-x11extras-devel libfm-qt-devel"
 depends="qt5-translations"
-short_desc="LXQt pcmanfm Qt frontend"
+short_desc="Qt port of PCManFM"
 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=fa45cc0d3e870db3fb56f474e854aa1284576023082b770b3e4a44410f22cce3
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/pcmanfm-qt/archive/${version}.tar.gz"
+checksum=28b5ff1fb71d9259ae73962892ce04142a750794aa35c4840ed575da08972b9d
 replaces="lxqt-common>=0"

From 8a94987a0e2ada5b55a40411a94cf73aba85af92 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:16:28 +0200
Subject: [PATCH 1580/1686] lximage-qt: update to 1.1.0.

---
 srcpkgs/lximage-qt/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lximage-qt/template b/srcpkgs/lximage-qt/template
index b64d2568b9d4..503990ab93db 100644
--- a/srcpkgs/lximage-qt/template
+++ b/srcpkgs/lximage-qt/template
@@ -1,6 +1,6 @@
 # Template file for 'lximage-qt'
 pkgname=lximage-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,6 +9,6 @@ makedepends="qt5-x11extras-devel qt5-tools-devel qt5-svg-devel libfm-qt-devel
 short_desc="LXQt image viewer"
 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=04fdff9d0d20dbfeddca2ca8166f7dd14b691badb6ca65909ca8bce75c4a7225
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lximage-qt/archive/${version}.tar.gz"
+checksum=cd1eb058af1c927fac9ac4d2d31435cf46572b2f017cbb0d0b099ad6106c8b91

From 3cea76ba6855701d80d08cca83da05d9f2451fee Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:23:45 +0200
Subject: [PATCH 1581/1686] lxqt-globalkeys: update to 1.1.0.

---
 srcpkgs/lxqt-globalkeys/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-globalkeys/template b/srcpkgs/lxqt-globalkeys/template
index 97537e06f8ae..dcffc9ba5257 100644
--- a/srcpkgs/lxqt-globalkeys/template
+++ b/srcpkgs/lxqt-globalkeys/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-globalkeys'
 pkgname=lxqt-globalkeys
-version=1.0.1
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,9 +8,9 @@ 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=b81944cc8d8f20f1eeedb3cd54d4e6ad86a1697d71b4212cf60110af43559a45
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-globalkeys/archive/${version}.tar.gz"
+checksum=ce0cbdbfbddef4ea9b2018b61fb6fc03caeea57fc31bc6f4bb54a04619edb2aa
 replaces="lxqt-common>=0"
 
 lxqt-globalkeys-devel_package() {

From 6c0b50e7f1fcc6c87a2148e18f69dc8944420d45 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:30:32 +0200
Subject: [PATCH 1582/1686] lxqt-notificationd: update to 1.1.0.

---
 srcpkgs/lxqt-notificationd/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-notificationd/template b/srcpkgs/lxqt-notificationd/template
index 0158f56a3364..57cd26eed5a8 100644
--- a/srcpkgs/lxqt-notificationd/template
+++ b/srcpkgs/lxqt-notificationd/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-notificationd'
 pkgname=lxqt-notificationd
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,7 +8,7 @@ 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=94c10fd904995d3eea3b587dd521ed01b839d863ff80205af0af8cab6cb2a660
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-notificationd/archive/${version}.tar.gz"
+checksum=6b29f0163541ba734bcb8d21f0f3579bc36c868fa8afee44d8b7e56ea8ca23ee
 replaces="lxqt-common>=0"

From ea535e2ae357ea0e8d8f7af245fed650a84a9b07 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:31:58 +0200
Subject: [PATCH 1583/1686] lxqt-openssh-askpass: update to 1.1.0.

---
 srcpkgs/lxqt-openssh-askpass/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-openssh-askpass/template b/srcpkgs/lxqt-openssh-askpass/template
index 57fe03004c15..566f1741e329 100644
--- a/srcpkgs/lxqt-openssh-askpass/template
+++ b/srcpkgs/lxqt-openssh-askpass/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-openssh-askpass'
 pkgname=lxqt-openssh-askpass
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,7 +9,7 @@ depends="openssh"
 short_desc="LXQt ssh-agent helper"
 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=9de22a06646cfa50b0ddeef26ac87b510f820501ff8832dc80c7d88a55d878b5
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-openssh-askpass/archive/${version}.tar.gz"
+checksum=77578faf1aaf3e273cd8f92b84ad9570d7aacc88b44663c3373517e790c606b6
 alternatives="ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/lxqt-openssh-askpass"

From fca95f2aba4c91afeb4640bb9375b95444e03ce9 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:42:14 +0200
Subject: [PATCH 1584/1686] lxqt-panel: update to 1.1.0.

---
 srcpkgs/lxqt-panel/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lxqt-panel/template b/srcpkgs/lxqt-panel/template
index f486e3e3a258..f5524550a6ed 100644
--- a/srcpkgs/lxqt-panel/template
+++ b/srcpkgs/lxqt-panel/template
@@ -1,16 +1,17 @@
 # Template file for 'lxqt-panel'
 pkgname=lxqt-panel
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 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
- libqtxdg-devel libXdamage-devel"
+ libsensors-devel libsysstat-devel libdbusmenu-qt5-devel
+ libqtxdg-devel libxcb-devel libXtst-devel xcb-util-image-devel"
+depends="lxmenu-data"
 short_desc="LXQt desktop panel"
 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=ea63939c557fa639d2ab3fae48341c1a59ae8baae1a79d11f15e4bc0e38468d5
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-panel/archive/${version}.tar.gz"
+checksum=f80ccdeb59933d32aab1a425301b9b68458bf0c55567befe1c03263afad20d6d

From 172cb7a27aa9064e9e513e3b40eff3ad17558539 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:47:30 +0200
Subject: [PATCH 1585/1686] lxqt-powermanagement: update to 1.1.0.

---
 srcpkgs/lxqt-powermanagement/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-powermanagement/template b/srcpkgs/lxqt-powermanagement/template
index f7c8b8d85e8f..b083469ecbbd 100644
--- a/srcpkgs/lxqt-powermanagement/template
+++ b/srcpkgs/lxqt-powermanagement/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-powermanagement'
 pkgname=lxqt-powermanagement
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,6 +8,6 @@ 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=c0a444faeed60337c966bfd562e65e936f132f578762c2f01f136038a3f058ee
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-powermanagement/archive/${version}.tar.gz"
+checksum=df59e7b93392863874250a49769dcd7ed395f98548428f9ef6a5b1e728d32e86

From 43d774d163a1cd34bd4a50e81945b10292ed6782 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 18:53:50 +0200
Subject: [PATCH 1586/1686] lxqt-qtplugin: update to 1.1.0.

---
 srcpkgs/lxqt-qtplugin/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lxqt-qtplugin/template b/srcpkgs/lxqt-qtplugin/template
index 8148c7119f10..eaddfdf3d70b 100644
--- a/srcpkgs/lxqt-qtplugin/template
+++ b/srcpkgs/lxqt-qtplugin/template
@@ -1,13 +1,13 @@
 # Template file for 'lxqt-qtplugin'
 pkgname=lxqt-qtplugin
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools libfm-devel"
-makedepends="liblxqt-devel libdbusmenu-qt5-devel libfm-qt-devel"
+makedepends="liblxqt-devel libdbusmenu-qt5-devel libfm-qt-devel libqtxdg-devel"
 short_desc="LXQt Qt theme plugin"
 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=8e789430e1f3b6a354f61d496440a59b797f699320bb8c001d8ef7ac8e1db05e
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-qtplugin/archive/${version}.tar.gz"
+checksum=20eda3ac9319e793c4b1236413f119058771d34915483bed4a048591a59ae990

From 814912c42403fe35e9098e38f822f151b340d44a Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:00:22 +0200
Subject: [PATCH 1587/1686] lxqt-runner: update to 1.1.0.

---
 srcpkgs/lxqt-runner/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-runner/template b/srcpkgs/lxqt-runner/template
index e85e2f5a7602..e96c3b6950f5 100644
--- a/srcpkgs/lxqt-runner/template
+++ b/srcpkgs/lxqt-runner/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-runner'
 pkgname=lxqt-runner
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -8,6 +8,6 @@ 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=24daa86680ef78daf8753b60b3a0c6df391e760b851796a0abeddeed61ae13b9
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-runner/archive/${version}.tar.gz"
+checksum=7c253d338019cb162cddcb606429faa016ac148a16bf720e87e28f756698b731

From 7dcb133944534c6cabe98902376ab2b0794d2329 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:04:18 +0200
Subject: [PATCH 1588/1686] lxqt-sudo: update to 1.1.0.

---
 srcpkgs/lxqt-sudo/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-sudo/template b/srcpkgs/lxqt-sudo/template
index 88b8389b1968..5ffd63acec36 100644
--- a/srcpkgs/lxqt-sudo/template
+++ b/srcpkgs/lxqt-sudo/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-sudo'
 pkgname=lxqt-sudo
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools perl"
@@ -9,6 +9,6 @@ depends="sudo"
 short_desc="LXQt GUI frontend for sudo"
 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=6072f6914942fff5884388be9c7c5d38d259fed14358c4c2a9103d0cdd0a43f0
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-sudo/archive/${version}.tar.gz"
+checksum=c31332d056355ff888175ba10556639f436b314579349ca90e555da849ebe22b

From 1c85f55e17409fb896388b59a05bfe055fa302c1 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:07:53 +0200
Subject: [PATCH 1589/1686] lxqt-themes: update to 1.1.0.

---
 srcpkgs/lxqt-themes/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lxqt-themes/template b/srcpkgs/lxqt-themes/template
index 01038f959c5d..a3c9b9c6a671 100644
--- a/srcpkgs/lxqt-themes/template
+++ b/srcpkgs/lxqt-themes/template
@@ -1,6 +1,6 @@
 # Template file for 'lxqt-themes'
 pkgname=lxqt-themes
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools perl"
@@ -8,7 +8,7 @@ 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=e3a6c96311bbf471ce0af72953b2f34ecf15461ab5e57a6f5b924de41758562b
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/lxqt-themes/archive/${version}.tar.gz"
+checksum=aeb24c1570ae350e4c4ecdea9fb1b67208f641966476bbafd1817a816f665efe
 replaces="lxqt-common>=0"

From 272fad7fe0feda36a7e4043c63763f19aef8c4d8 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:17:29 +0200
Subject: [PATCH 1590/1686] qtermwidget: update to 1.1.0.

---
 srcpkgs/qtermwidget/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qtermwidget/template b/srcpkgs/qtermwidget/template
index 938f79879735..273705963a64 100644
--- a/srcpkgs/qtermwidget/template
+++ b/srcpkgs/qtermwidget/template
@@ -1,6 +1,6 @@
 # Template file for 'qtermwidget'
 pkgname=qtermwidget
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools qt5-qmake qt5-host-tools"
@@ -8,9 +8,9 @@ makedepends="qt5-tools-devel"
 short_desc="Terminal widget for QTerminal"
 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=2af0e9f212932cb36bbbf20722eaf4a1d3acf640dfed9b763ca7d388af8b7fd2
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/qtermwidget/archive/${version}.tar.gz"
+checksum=b062e5169bee35c3a8c1d0f67b78b43d63f1041d11e3a5a717f6a54a016bd734
 
 qtermwidget-devel_package() {
 	short_desc+=" - development files"

From 6409605fb236592b7f7e83cf2d25c4a31b96099a Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 19:30:33 +0200
Subject: [PATCH 1591/1686] qterminal: update to 1.1.0.

---
 srcpkgs/qterminal/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/qterminal/template b/srcpkgs/qterminal/template
index 079c89b00a15..7469a365b367 100644
--- a/srcpkgs/qterminal/template
+++ b/srcpkgs/qterminal/template
@@ -1,14 +1,13 @@
 # Template file for 'qterminal'
 pkgname=qterminal
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 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"
 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=f169a5279ae5afe386ec3016385c7692b551fea1bae639a8ae438ec90165a643
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/qterminal/archive/${version}.tar.gz"
+checksum=5a72a6f3deb5326618183ddae59989316aa78c86163220f26895df677cbc4479

From 09e0bef6e2652f2287fd85f573d876ab6f06aeae Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 20:08:13 +0200
Subject: [PATCH 1592/1686] pavucontrol-qt: update to 1.1.0.

---
 srcpkgs/pavucontrol-qt/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/pavucontrol-qt/template b/srcpkgs/pavucontrol-qt/template
index 2faef3430dc0..0be80a6c17c8 100644
--- a/srcpkgs/pavucontrol-qt/template
+++ b/srcpkgs/pavucontrol-qt/template
@@ -1,13 +1,13 @@
 # Template file for 'pavucontrol-qt'
 pkgname=pavucontrol-qt
-version=1.0.0
+version=1.1.0
 revision=1
 build_style=cmake
 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>"
+maintainer="Enrico Belleri <idesmi@protonmail.com>"
 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=2407aa55a2d3dc0fdc7074b461c02b97fd455514fbbf9f5b711e68fadd45ac69
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/pavucontrol-qt/archive/${version}.tar.gz"
+checksum=8e4017c584c357fbff75d849e3210fa446edc6e53655b6920221891b8e3dc403

From 2636207f945bc69aff617dfb1c5cd28945ea6ab8 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 20:13:58 +0200
Subject: [PATCH 1593/1686] qps: update to 2.5.0.

---
 srcpkgs/qps/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qps/template b/srcpkgs/qps/template
index 4934c280c4db..264e1eeda9da 100644
--- a/srcpkgs/qps/template
+++ b/srcpkgs/qps/template
@@ -1,6 +1,6 @@
 # Template file for 'qps'
 pkgname=qps
-version=2.4.0
+version=2.5.0
 revision=1
 build_style=cmake
 hostmakedepends="lxqt-build-tools perl qt5-qmake qt5-host-tools"
@@ -8,6 +8,6 @@ makedepends="liblxqt-devel"
 short_desc="Qt process manager"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/lxqt/qps"
-distfiles="https://github.com/lxqt/qps/releases/download/${version}/qps-${version}.tar.xz"
-checksum=c2a6c1d5e40e96997cca834f88ca1104aa179bef576a1a8b355b987eaaac69cd
+homepage="https://lxqt-project.org"
+distfiles="https://github.com/lxqt/qps/archive/${version}.tar.gz"
+checksum=c5f3a27b731eccfae59734c4a3048f9d8632827444e35b773c1a112702666b6a

From f6d24a08133b8c4864e14c427bcd75f296edd699 Mon Sep 17 00:00:00 2001
From: Enrico Belleri <idesmi@protonmail.com>
Date: Sun, 17 Apr 2022 20:40:11 +0200
Subject: [PATCH 1594/1686] New package: xdg-desktop-portal-lxqt-0.2.0

---
 srcpkgs/xdg-desktop-portal-lxqt/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/xdg-desktop-portal-lxqt/template

diff --git a/srcpkgs/xdg-desktop-portal-lxqt/template b/srcpkgs/xdg-desktop-portal-lxqt/template
new file mode 100644
index 000000000000..297e1769a1f5
--- /dev/null
+++ b/srcpkgs/xdg-desktop-portal-lxqt/template
@@ -0,0 +1,14 @@
+# Template file for 'xdg-desktop-portal-lxqt'
+pkgname=xdg-desktop-portal-lxqt
+version=0.2.0
+revision=1
+build_style=cmake
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="kwindowsystem-devel libfm-qt-devel"
+short_desc="Backend implementation for xdg-desktop-portal using Qt/KF5/libfm-qt"
+maintainer="Enrico Belleri <idesmi@protonmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/lxqt/xdg-desktop-portal-lxqt"
+changelog="https://github.com/lxqt/xdg-desktop-portal-lxqt/raw/master/CHANGELOG"
+distfiles="https://github.com/lxqt/xdg-desktop-portal-lxqt/archive/${version}.tar.gz"
+checksum=9d7ac6fd6980293cb184518642dcc57d842b67105b3d236f893189bd30911ad7

From 7e94f037e9b6d6e133c6cbc8db39b8c7b33bdf17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 29 Mar 2022 21:41:02 +0200
Subject: [PATCH 1595/1686] qtcreator: update to 7.0.0.

---
 .../qtcreator/patches/QTCREATORBUG-26910.diff | 39 -------------------
 srcpkgs/qtcreator/template                    | 31 +++++++--------
 2 files changed, 15 insertions(+), 55 deletions(-)
 delete mode 100644 srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff

diff --git a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff b/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
deleted file mode 100644
index 8c07c72ccf10..000000000000
--- a/srcpkgs/qtcreator/patches/QTCREATORBUG-26910.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001
-From: Marco Bubke <marco.bubke@qt.io>
-Date: Mon, 24 Jan 2022 14:38:29 +0100
-Subject: [PATCH] QmlDesigner: Fix 32 bit
-
-Because std::ptrdiff_t and int are the same under 32 bit the constructor
-is changed to a template. The class is private so it is very unlikely
-that it leads to errors.
-
-Task-number: QTCREATORBUG-26910
-Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd
-Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
-Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
-Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
----
-
-diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-index 747c3d9..27d2905 100644
---- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-+++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
-@@ -67,15 +67,8 @@
- 
-         StorageCacheIndex(const char *) = delete;
- 
--        constexpr explicit StorageCacheIndex(int id) noexcept
--            : id{id}
--        {}
--
--        constexpr explicit StorageCacheIndex(std::size_t id) noexcept
--            : id{static_cast<int>(id)}
--        {}
--
--        constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
-+        template<typename IntegerType>
-+        constexpr explicit StorageCacheIndex(IntegerType id) noexcept
-             : id{static_cast<int>(id)}
-         {}
- 
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 988491ec6496..912c6c00c4c5 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,14 +1,16 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=6.0.2
+version=7.0.0
 revision=1
 wrksrc="qt-creator-opensource-src-${version}"
-build_style=qmake
-make_install_args="INSTALL_ROOT=\${DESTDIR}/usr"
+build_style=cmake
+configure_args="$(vopt_bool qbs BUILD_QBS)"
 hostmakedepends="clang llvm perl pkg-config python3 which qt5-qmake
- qt5-host-tools"
+ qt5-host-tools qt5-tools"
 makedepends="qt5-declarative-devel qt5-script-devel qt5-tools-devel
- qt5-quickcontrols qt5-svg-devel clang llvm"
+ qt5-quickcontrols qt5-svg-devel qt5-plugin-odbc qt5-plugin-sqlite
+ qt5-plugin-tds qt5-plugin-pgsql qt5-plugin-mysql
+ clang llvm clang-tools-extra"
 depends="qt5-declarative-devel qt5-quickcontrols qt5-plugin-sqlite"
 short_desc="Cross-platform IDE for Qt developers"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -16,24 +18,21 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changes-${version}.md"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/${wrksrc}.tar.xz"
-checksum=3d173c1a02ce55137a23f294e1a840d7648656e97826067eb29d9df653351bfa
+checksum=d39a05e48bb961cfab61135a5ee5503fc4d381c74000b910f36bf0cea37736d9
 replaces="qtcreator-data>=0"
 python_version=3
 
+build_options="qbs"
+desc_option_qbs="Build vendored Qbs"
+
+if [ -z "$XBPS_CROSS_BUILD" ]; then
+	build_options_default="qbs"
+fi
+
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
 fi
 
-pre_configure() {
-	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		vsed -i src/plugins/qmldesigner/qmldesignerplugin.pro \
-			src/plugins/clangformat/clangformat.pro \
-			-e "/LIBS += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
-		vsed -i src/plugins/debugger/debugger.pro \
-			-e "/RESOURCES += /aLIBS += -L${XBPS_CROSS_BASE}/usr/lib -lexecinfo"
-	fi
-}
-
 post_install() {
 	# Install the license with the annotation for
 	# the Qt Company GPL Exception 1.0

From 9545e8dec5112238ecd29e1b1c89682de0662039 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 20 Apr 2022 20:15:38 +0200
Subject: [PATCH 1596/1686] grim: update to 1.4.0.

---
 srcpkgs/grim/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template
index 89af643b6a7f..f42ed188f1f4 100644
--- a/srcpkgs/grim/template
+++ b/srcpkgs/grim/template
@@ -1,18 +1,22 @@
 # Template file for 'grim'
 pkgname=grim
-version=1.3.2
+version=1.4.0
 revision=1
+wrksrc="grim-v${version}"
 build_style=meson
 configure_args="-Djpeg=enabled -Dwerror=false"
 hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wayland-devel wayland-protocols cairo-devel libjpeg-turbo-devel"
+makedepends="wayland-devel wayland-protocols pixman-devel libjpeg-turbo-devel
+ libpng-devel"
 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/grim/archive/v${version}.tar.gz"
-checksum=42c2952e98389506156c08e40e0c37afdc2ec5ef4d55a5a4febde6acdac4d1c8
+distfiles="https://git.sr.ht/~emersion/grim/archive/v${version}.tar.gz"
+checksum=66729ae654546404f50ed163055310dd23ed52cc5a881d39752c0cd076e3d7aa
 
 post_install() {
 	vlicense LICENSE
+	vcompletion contrib/completions/bash/grim.bash bash
+	vcompletion contrib/completions/fish/grim.fish fish
 }

From e657fd5c3b0ebe019eb79f60c891556e08e30040 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Thu, 21 Apr 2022 17:43:24 -0500
Subject: [PATCH 1597/1686] Signal-Desktop: update to 5.40.0.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index c02e6864b8a1..8bcfe617ab40 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.39.0
+version=5.40.0
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=0e5f237bd2db6f9e32d58d28c99727bdd069cffb6abf9c68b62c30c8a6ca83d9
+checksum=57bb0ebbf4b3fb9d6dfbaa84166ecf668ce0df8a0afa0f69907680804dd064c4
 nostrip_files="signal-desktop"
 
 post_extract() {

From 53df20b3fc6f2815d69ffcf44a7aab31e4bacf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Wed, 20 Apr 2022 12:41:47 +0200
Subject: [PATCH 1598/1686] New package: dasel-1.24.1

---
 srcpkgs/dasel/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/dasel/template

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
new file mode 100644
index 000000000000..6d913b08ba62
--- /dev/null
+++ b/srcpkgs/dasel/template
@@ -0,0 +1,19 @@
+# Template file for 'dasel'
+pkgname=dasel
+version=1.24.1
+revision=1
+build_style=go
+go_import_path=github.com/tomwright/dasel
+go_package="${go_import_path}/cmd/dasel"
+go_ldflags="-X ${go_import_path}/internal.Version=${version}"
+short_desc="Query and modify data structures using selector strings"
+maintainer="Daniel Eyßer <daniel.eysser@gmail.com>"
+license="MIT"
+homepage="https://daseldocs.tomwright.me/"
+changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md"
+distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz"
+checksum=ca1fa030f41abcd3659e76d7413ce14c551f40d41769e7a000a46f4fea6d0b64
+
+post_install() {
+	vlicense LICENSE
+}

From 5084d6a26efd71c7f6362da860c5049ef2ff1f06 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 11 Apr 2022 09:26:30 +0200
Subject: [PATCH 1599/1686] python3-tweepy: update to 4.8.0.

---
 srcpkgs/python3-tweepy/template | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/python3-tweepy/template b/srcpkgs/python3-tweepy/template
index d71fa028f64f..fc13e91d8d57 100644
--- a/srcpkgs/python3-tweepy/template
+++ b/srcpkgs/python3-tweepy/template
@@ -1,21 +1,18 @@
 # Template file for 'python3-tweepy'
 pkgname=python3-tweepy
-version=3.9.0
-revision=2
+version=4.8.0
+revision=1
 wrksrc="tweepy-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-requests-oauthlib python3-six python3-pysocks"
+depends="python3-requests-oauthlib python3-pysocks"
 short_desc="Twitter library for Python3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/tweepy/tweepy"
 distfiles="https://github.com/tweepy/tweepy/archive/v${version}.tar.gz"
-checksum=2b7ec06cc5d143396423a5eae16b198e69b93df2bc6044f1365270c805e940b7
-
-do_check() {
-	: # requires packages not provided by Void
-}
+checksum=6ca49718d9cd0e73080f780062e050dd8ca777201365fb50b935d727f7c1fc18
+make_check=no # requires packages not provided by Void
 
 post_install() {
 	vlicense LICENSE

From 918c842c552efb79bf1f147397553bc2444ed9a4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 10 Apr 2022 22:31:50 +0200
Subject: [PATCH 1600/1686] gdu: update to 5.13.2.

---
 srcpkgs/gdu/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdu/template b/srcpkgs/gdu/template
index 9c47a649b805..9ef80a2f5a7d 100644
--- a/srcpkgs/gdu/template
+++ b/srcpkgs/gdu/template
@@ -1,6 +1,6 @@
 # Template file for 'gdu'
 pkgname=gdu
-version=5.12.1
+version=5.13.2
 revision=1
 build_style=go
 go_import_path="github.com/dundee/gdu/v5/cmd/gdu"
@@ -9,7 +9,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="MIT"
 homepage="https://github.com/dundee/gdu"
 distfiles="https://github.com/dundee/gdu/archive/v${version}.tar.gz"
-checksum=81471d80aedcf20c84bcee67814d34ab2cf43477b831ffa320b7721d481c64ab
+checksum=f4f237f6da470599f6393591282cfd67922a963325859a939ca40ba7e18024a8
 
 post_install() {
 	vman gdu.1

From 4e5db53dc43ae226d0158cadb44e65f9623a7a1b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Fri, 22 Apr 2022 16:41:56 +0200
Subject: [PATCH 1601/1686] zchunk: update to 1.2.2.

---
 srcpkgs/zchunk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index e8679bcbabc4..c4812272d3ca 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,6 +1,6 @@
 # Template file for 'zchunk'
 pkgname=zchunk
-version=1.2.1
+version=1.2.2
 revision=1
 build_style=meson
 hostmakedepends="pkg-config"
@@ -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=9639942cf36f4f36d3b635d36d5164682249cc0240015569ac948db1584499b5
+checksum=bc36f13b1bcb2ab52d046bfc3ec04a9bd1f89b070b4e8fca52eded235a583526
 
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone"

From b369712dc922afe013253e425d04a938c0416491 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Apr 2022 17:01:48 +0200
Subject: [PATCH 1602/1686] virt-what: update to 1.22.

---
 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 6403a915bec3..e6562de073cc 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.21
+version=1.22
 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=12cb455334aa4cfd53ab78f27e2252e94d1f676dd093f48327ed94d8080d1f7b
+checksum=e175df6109e537da1e18006f03d74a2e6dab76b5caf410dedafef188f1ee4561

From 25f311af3a24f6f251d9f6f63220a84472b7b732 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Apr 2022 17:20:41 +0200
Subject: [PATCH 1603/1686] bmake: update to 20220418.

---
 srcpkgs/bmake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bmake/template b/srcpkgs/bmake/template
index 58cf70979203..babb5d6d3938 100644
--- a/srcpkgs/bmake/template
+++ b/srcpkgs/bmake/template
@@ -1,6 +1,6 @@
 # Template file for 'bmake'
 pkgname=bmake
-version=20220414
+version=20220418
 revision=1
 create_wrksrc=yes
 short_desc="Portable version of the NetBSD make build tool"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="https://www.crufty.net/help/sjg/bmake.html"
 distfiles="https://www.crufty.net/ftp/pub/sjg/bmake-${version}.tar.gz"
-checksum=10ee07a7be26b22ce6a3bbc386e2916ca8e51b0ed2d256c271a7135e3c94f2a7
+checksum=6ea7de515cba74f173dc14ee17b1488ae032582028d2e86ea12f70369cc896f5
 python_version=3
 
 do_configure() {

From 279ed3feb55aeb34001e46235d0aab4631dc5598 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Fri, 22 Apr 2022 18:19:58 +0200
Subject: [PATCH 1604/1686] rsync: update to 3.2.4.

---
 srcpkgs/rsync/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 928aa4824a2a..2f79c20f8f6b 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,7 +1,7 @@
 # Template file for 'rsync'
 pkgname=rsync
-version=3.2.3
-revision=3
+version=3.2.4
+revision=1
 build_style=gnu-configure
 conf_files="/etc/rsyncd.conf"
 hostmakedepends="perl"
@@ -13,7 +13,7 @@ license="GPL-3.0-only"
 homepage="https://rsync.samba.org/"
 changelog="https://download.samba.org/pub/rsync/NEWS"
 distfiles="https://www.samba.org/ftp/rsync/src/rsync-$version.tar.gz"
-checksum=becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e
+checksum=6f761838d08052b0b6579cf7f6737d93e47f01f4da04c5d24d3447b7f2a5fad1
 
 # Force enable IPv6 on musl - upstream bug https://bugzilla.samba.org/show_bug.cgi?id=10715
 CFLAGS="-DINET6"

From 6a7167a2202604e9c5105fe805cc1cf7e51dd238 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Apr 2022 18:55:18 -0400
Subject: [PATCH 1605/1686] sof-firmware: update to 2.1.1.

---
 srcpkgs/sof-firmware/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sof-firmware/template b/srcpkgs/sof-firmware/template
index 5e6399eca917..5436fb1db1ef 100644
--- a/srcpkgs/sof-firmware/template
+++ b/srcpkgs/sof-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'sof-firmware'
 pkgname=sof-firmware
-version=1.9.2
+version=2.1.1
 revision=1
 archs="i686* x86_64*"
 wrksrc="sof-bin-${version}"
@@ -11,7 +11,7 @@ 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/refs/tags/v${version}.tar.gz"
-checksum=8eac925c129d195072237dcd28f4bbe80cf63eb00fd8b23bdc0719cd1ee9b395
+checksum=97c51c03bfb0a8cfc0a33d795e051e8f0608a3bfb3e07cd84de6fd7e9511f208
 
 do_install() {
 	vmkdir usr/lib/firmware/intel/sof

From c43cc06146d0d12829b11777311618014a9da18e Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Apr 2022 20:35:39 -0400
Subject: [PATCH 1606/1686] pango: update to 1.50.7.

---
 srcpkgs/pango/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template
index 4d410dbc72b0..5d49a2f7ed58 100644
--- a/srcpkgs/pango/template
+++ b/srcpkgs/pango/template
@@ -1,6 +1,6 @@
 # Template file for 'pango'
 pkgname=pango
-version=1.50.6
+version=1.50.7
 revision=1
 build_style=meson
 build_helper=gir
@@ -14,7 +14,7 @@ license="LGPL-2.1-or-later"
 homepage="https://www.pango.org/"
 changelog="https://gitlab.gnome.org/GNOME/pango/-/raw/main/NEWS"
 distfiles="${GNOME_SITE}/pango/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=a998bcf36881c3ac20495d40bceb304f4eaa9175bd2967c85656434cbdafe86a
+checksum=0477f369a3d4c695df7299a6989dc004756a7f4de27eecac405c6790b7e3ad33
 make_check=no  # doesn't pass its own tests
 
 # Package build options

From 13765e0f8eab6e0aa891d44a861c3fc2557a428f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:33 +0200
Subject: [PATCH 1607/1686] filelight: update to 22.04.0.

---
 srcpkgs/filelight/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template
index cdf212f14ef7..30e825e0eee5 100644
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@@ -1,6 +1,6 @@
 # Template file for 'filelight'
 pkgname=filelight
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#filelight"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
-checksum=28fc076caf94217f732b7228e0c77dc40b5d490bcbb3df7866c2e772130578f0
+checksum=434fa7439732905c4655cc376d2c89e86a5fcc5371ee6fda16400917a8e4e587

From fce29cc49f178826b619d42514aa685513ffefd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:34 +0200
Subject: [PATCH 1608/1686] kaccounts-integration: update to 22.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 846027947d2f..7a8b45b2da07 100644
--- a/srcpkgs/kaccounts-integration/template
+++ b/srcpkgs/kaccounts-integration/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-integration'
 pkgname=kaccounts-integration
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-integration.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-integration"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-integration-${version}.tar.xz"
-checksum=eb428cd94bf33910546527bad8a56ddaafd2a7fa894c9fcdba6da364e969048f
+checksum=3e5197c1c7ddce92dd5bdcdcc05492f3c63c468e3c1e743c6e747114d34d08b8
 
 kaccounts-integration-devel_package() {
 	short_desc+=" - development"

From c9325bb7b0abe21db54ae98ada6485bb57da2529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:35 +0200
Subject: [PATCH 1609/1686] kaccounts-providers: update to 22.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 00cd5f36950d..09f7d22603b9 100644
--- a/srcpkgs/kaccounts-providers/template
+++ b/srcpkgs/kaccounts-providers/template
@@ -1,6 +1,6 @@
 # Template file for 'kaccounts-providers'
 pkgname=kaccounts-providers
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool qt5-qmake qt5-host-tools
@@ -13,7 +13,7 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/kaccounts-providers.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kaccounts-providers"
 distfiles="${KDE_SITE}/release-service/${version}/src/kaccounts-providers-${version}.tar.xz"
-checksum=a09eed6a35e5f1909e4f8cdb9016ed0cd1fb33c34f5545f4c1e2a005d4dd9e4d
+checksum=297a55bcfa26379e9501b70f17da238a4ae23fd908b3afaa0052853a1cca0e34
 
 build_options="nextcloud"
 desc_option_nextcloud="Build nextcloud support (needs Qt5 WebEngine)"

From c9bf6eedfac897c01755a3abdb15ce09982933bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:36 +0200
Subject: [PATCH 1610/1686] kcachegrind: update to 22.04.0.

---
 srcpkgs/kcachegrind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcachegrind/template b/srcpkgs/kcachegrind/template
index 5b96b2e4e879..d46aefe7cb9b 100644
--- a/srcpkgs/kcachegrind/template
+++ b/srcpkgs/kcachegrind/template
@@ -1,6 +1,6 @@
 # Template file for 'kcachegrind'
 pkgname=kcachegrind
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -13,5 +13,5 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/development/kcachegrind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcachegrind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcachegrind-${version}.tar.xz"
-checksum=ddcf3722211d47c90616528607ebc4573835faa52a57e2e9d6763968b9975ab3
+checksum=aed09ea5dc01ace24c76ed69edef5111c47f53992ba45896365b53cd3fc8890d
 python_version=2

From 9d33f533359f8c4e8f278ebe3c9c939f69b4c8e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:37 +0200
Subject: [PATCH 1611/1686] kcron: update to 22.04.0.

---
 srcpkgs/kcron/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kcron/template b/srcpkgs/kcron/template
index af6f042ab5e6..636aad34dab9 100644
--- a/srcpkgs/kcron/template
+++ b/srcpkgs/kcron/template
@@ -1,6 +1,6 @@
 # Template file for 'kcron'
 pkgname=kcron
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://userbase.kde.org/System_Settings/Task_Scheduler"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kcron"
 distfiles="${KDE_SITE}/release-service/${version}/src/kcron-${version}.tar.xz"
-checksum=f556c6afbdf4a060dd52db64d36ebc13fcf7dcdaa6a7013b697e866b6338cc39
+checksum=d8ace47c86633ba677b64c765efe0b6f3de27cb75c17ae2434c498b07f3c0648

From aae5113feff04485e3be71633c4597538ae6bb79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:38 +0200
Subject: [PATCH 1612/1686] kdialog: update to 22.04.0.

---
 srcpkgs/kdialog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdialog/template b/srcpkgs/kdialog/template
index b1975e4203e7..64efbaad5e8b 100644
--- a/srcpkgs/kdialog/template
+++ b/srcpkgs/kdialog/template
@@ -1,6 +1,6 @@
 # Template file for 'kdialog'
 pkgname=kdialog
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools python3
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/utilities/kdialog"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdialog"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdialog-${version}.tar.xz"
-checksum=a370f03edd88913d7cecf2bc9b61e2bd1466418fa1534a8f415a0057186ea111
+checksum=ac47479b576b87e8a82d62f4b685941b6ab54a44a06391c4c0762db159930589

From 70bd1a0c2408d932c15d30003cd80e69d3d01531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:39 +0200
Subject: [PATCH 1613/1686] keditbookmarks: update to 22.04.0.

---
 srcpkgs/keditbookmarks/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/keditbookmarks/template b/srcpkgs/keditbookmarks/template
index a67fbd7881c3..5291ab00f990 100644
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@@ -1,6 +1,6 @@
 # Template file for 'keditbookmarks'
 pkgname=keditbookmarks
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#keditbookmarks"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
-checksum=d356285aaeb12cdadf70c456a43d4e31f94a5f15c9dc01bae0ae4148833ccb71
+checksum=d6daabf60acec49cac1401da1019f965a96e8fd41b967694b2c8fd6723b87327

From 11da1781158931fc296e99d462d9430e3cb933a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:40 +0200
Subject: [PATCH 1614/1686] kfind: update to 22.04.0.

---
 srcpkgs/kfind/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kfind/template b/srcpkgs/kfind/template
index 766f1d9fee4f..06de53b604a9 100644
--- a/srcpkgs/kfind/template
+++ b/srcpkgs/kfind/template
@@ -1,6 +1,6 @@
 # Template file for 'kfind'
 pkgname=kfind
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kfind/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kfind"
 distfiles="${KDE_SITE}/release-service/${version}/src/kfind-${version}.tar.xz"
-checksum=a0ff3b4a44b938f7f336d4c2fbc302d8a55612b089ee954b2d98ec5f97ee3eec
+checksum=5133cad0be64fb3fc3f9666b01b4cff8141016f31c244ed39a3e21fc298b6935

From 72a0eb2d6cebbcbdb6054fc25a0a0b944b776a6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:41 +0200
Subject: [PATCH 1615/1686] kig: update to 22.04.0.

---
 srcpkgs/kig/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 33b5ad292bad..3f291745d311 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,6 +1,6 @@
 # Template file for 'kig'
 pkgname=kig
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kig"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
-checksum=b6a9ec8981c6983df2295ad0a8a53732928a8bb40c6c92305030392d5bf88066
+checksum=6dd9e280e3f0bca4c900f9fd8ef2e138eb8f1b021adf4ffe4e29804adddc7965

From f9f44182fc0a3f119c25a1225b95d71c85d95124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:42 +0200
Subject: [PATCH 1616/1686] kio-gdrive: update to 22.04.0.

---
 srcpkgs/kio-gdrive/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kio-gdrive/template b/srcpkgs/kio-gdrive/template
index 5bf3a6225a95..d1e301180476 100644
--- a/srcpkgs/kio-gdrive/template
+++ b/srcpkgs/kio-gdrive/template
@@ -1,6 +1,6 @@
 # Template file for 'kio-gdrive'
 pkgname=kio-gdrive
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules intltool pkg-config qt5-qmake qt5-host-tools
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later"
 homepage="https://community.kde.org/KIO_GDrive"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kio-gdrive"
 distfiles="${KDE_SITE}/release-service/${version}/src/kio-gdrive-${version}.tar.xz"
-checksum=07c1c20ed3ec8b96691d85a408997a94a76e0a61a50b056df3e21f6cde61a32e
+checksum=9f910baa87f707d1f28c9da5d3f1b104b992f7c7b3ca2ca532cb3646d92c84ec

From 54a4c11240aaee3eead289509aac7c299ccd4765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:42 +0200
Subject: [PATCH 1617/1686] kmag: update to 22.04.0.

---
 srcpkgs/kmag/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmag/template b/srcpkgs/kmag/template
index 8dffb97af131..a68adf873813 100644
--- a/srcpkgs/kmag/template
+++ b/srcpkgs/kmag/template
@@ -1,6 +1,6 @@
 # Template file for 'kmag'
 pkgname=kmag
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/utilities/kmag/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmag"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmag-${version}.tar.xz"
-checksum=548f9b4c13eda644c0fb182eb78f6326c57f6cb7dc8a185fcb09dd585f31fd18
+checksum=e65aaaa3e480c215384bae721afb36d7e50a7f8ab27aa4013eb46de1f43d97af

From d5b19636a73808e0d93bdd04b31727133d48eec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:44 +0200
Subject: [PATCH 1618/1686] kmix: update to 22.04.0.

---
 srcpkgs/kmix/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template
index 902b798dc250..e4bf7c548be8 100644
--- a/srcpkgs/kmix/template
+++ b/srcpkgs/kmix/template
@@ -1,6 +1,6 @@
 # Template file for 'kmix'
 pkgname=kmix
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 configure_args="-DSYSCONF_INSTALL_DIR=/etc -DDESKTOPTOJSON_EXECUTABLE=/usr/bin/desktoptojson"
@@ -14,4 +14,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/multimedia/kmix/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kmix"
 distfiles="${KDE_SITE}/release-service/${version}/src/kmix-${version}.tar.xz"
-checksum=13c1336f9e8e7a64f3e89a0558b9f16547a33e37f917bd491dfb061d25ed62fe
+checksum=3f41a53cb7033fde10ae92b693a6b84c0da045e570e83136dbc659afa89e5e7a

From 9acf29631779cbeeb02ab66440bc8e58327774b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:45 +0200
Subject: [PATCH 1619/1686] kolourpaint: update to 22.04.0.

---
 srcpkgs/kolourpaint/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kolourpaint/template b/srcpkgs/kolourpaint/template
index bf7598673a41..5a81652e6b04 100644
--- a/srcpkgs/kolourpaint/template
+++ b/srcpkgs/kolourpaint/template
@@ -1,6 +1,6 @@
 # Template file for 'kolourpaint'
 pkgname=kolourpaint
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,7 +12,7 @@ license="BSD-2-Clause, GPL-2.0-or-later, LGPL-2.1-only, GFDL-1.2-only"
 homepage="http://www.kolourpaint.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kolourpaint"
 distfiles="${KDE_SITE}/release-service/${version}/src/kolourpaint-${version}.tar.xz"
-checksum=d2199ded688d768d8066a262d7a6b706b72a880fab9a394ffe64ae31be447f4d
+checksum=aeb2e439f32d9b1d7556e807c0902c870b90691f84764266e3f7fd92af5d9163
 
 post_install() {
 	vlicense COPYING

From 83a002c168d3c0bd0e8b398575060681336f03df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:45 +0200
Subject: [PATCH 1620/1686] kompare: update to 22.04.0.

---
 srcpkgs/kompare/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kompare/template b/srcpkgs/kompare/template
index 4219b5b650ad..457830d20119 100644
--- a/srcpkgs/kompare/template
+++ b/srcpkgs/kompare/template
@@ -1,6 +1,6 @@
 # Template file for 'kompare'
 pkgname=kompare
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/development/kompare/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kompare"
 distfiles="${KDE_SITE}/release-service/${version}/src/kompare-${version}.tar.xz"
-checksum=9008fb78e238dc34233b5eb063bc0b54553dfa70b22d4164b39adef82b57ea24
+checksum=e2e0ee484b2eb098d9315ea26a0b68abce64ae02572baab998a5711f609c018d

From 222bd999e336d97c0e9a16a5687316693537d5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:46 +0200
Subject: [PATCH 1621/1686] konversation: update to 22.04.0.

---
 srcpkgs/konversation/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/konversation/template b/srcpkgs/konversation/template
index 877672e7ec18..5358aed5c724 100644
--- a/srcpkgs/konversation/template
+++ b/srcpkgs/konversation/template
@@ -1,17 +1,17 @@
 # Template file for 'konversation'
 pkgname=konversation
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kdoctools kcoreaddons
  python qt5-host-tools qt5-qmake gettext"
 makedepends="kemoticons-devel kidletime-devel knotifyconfig-devel kparts-devel
- knewstuff-devel qca-qt5-devel"
+ knewstuff-devel qca-qt5-devel qt5-multimedia-devel"
 short_desc="User friendly IRC client for KDE"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="GPL-2.0-or-later"
 homepage="https://konversation.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#konversation"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname%5}-${version}.tar.xz"
-checksum=00e16ff398e4ff19c8485f5d5078faea018c7b11c25d535d5949fca6eefcbd15
+checksum=f89c3854edd6dabcceff7a3615b532ac34d5b4769be1e125789e41d67e7f9b8a
 python_version=3

From 78a127deaf10c3006e0a8e6cd5a5988c5106d5f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:47 +0200
Subject: [PATCH 1622/1686] kpat: update to 22.04.0.

---
 srcpkgs/kpat/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kpat/template b/srcpkgs/kpat/template
index 71cda890586b..e3d3d8d5ad3b 100644
--- a/srcpkgs/kpat/template
+++ b/srcpkgs/kpat/template
@@ -1,6 +1,6 @@
 # Template file for 'kpat'
 pkgname=kpat
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 configure_args="-DWITH_BH_SOLVER=OFF"
@@ -14,4 +14,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/games/kpat"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kpat"
 distfiles="${KDE_SITE}/release-service/${version}/src/kpat-${version}.tar.xz"
-checksum=68353dba09757a2696fce36f802a5bca3b7a5492de4d690d15ad04074f21a9c9
+checksum=275e2e4508980dbc53bd598c7abd05a21dd5c50b255e750436639cc75f67a44d

From ba43f502020ea8c7164ba3a6d13fb36398621a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:48 +0200
Subject: [PATCH 1623/1686] kruler: update to 22.04.0.

---
 srcpkgs/kruler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kruler/template b/srcpkgs/kruler/template
index 74bc40f901b4..8c70ce207278 100644
--- a/srcpkgs/kruler/template
+++ b/srcpkgs/kruler/template
@@ -1,6 +1,6 @@
 # Template file for 'kruler'
 pkgname=kruler
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/graphics/kruler/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kruler"
 distfiles="${KDE_SITE}/release-service/${version}/src/kruler-${version}.tar.xz"
-checksum=f95725a73d3bbb4fd59dfeadf6c070ed3d64e36995168300d2a0cb03921aab4a
+checksum=f4f189b606813fb2f42e40f7664adafafdcd210e474909b9e93ff30eba18cd45

From aca58bac51ba4bd6b5e9dac03e0f04ecd994727f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:49 +0200
Subject: [PATCH 1624/1686] ksystemlog: update to 22.04.0.

---
 srcpkgs/ksystemlog/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ksystemlog/template b/srcpkgs/ksystemlog/template
index 72a178b4d0db..53c40ccabd7c 100644
--- a/srcpkgs/ksystemlog/template
+++ b/srcpkgs/ksystemlog/template
@@ -1,6 +1,6 @@
 # Template file for 'ksystemlog'
 pkgname=ksystemlog
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/system/ksystemlog/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#ksystemlog"
 distfiles="${KDE_SITE}/release-service/${version}/src/ksystemlog-${version}.tar.xz"
-checksum=a90af7b6116301eea4bd74a61e5e4e2a854c7ab91a103d54d7fcd30e7a066d4a
+checksum=25525e28756928ddb014ccec6f352c7378473ad417971608989818484b2847a4

From e704053cf2bc208f4210c9f0a2b5abb9630e8f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:50 +0200
Subject: [PATCH 1625/1686] kteatime: update to 22.04.0.

---
 srcpkgs/kteatime/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kteatime/template b/srcpkgs/kteatime/template
index 5b5a6c75b194..dc8dbc935798 100644
--- a/srcpkgs/kteatime/template
+++ b/srcpkgs/kteatime/template
@@ -1,6 +1,6 @@
 # Template file for 'kteatime'
 pkgname=kteatime
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://www.kde.org/applications/games/kteatime/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kteatime"
 distfiles="${KDE_SITE}/release-service/${version}/src/kteatime-${version}.tar.xz"
-checksum=a4c0994170a877b14b8b66e68021a6ef03e5e427380c135caf99218f54d07744
+checksum=f3098313f7df6de082490c11ae6f840d3f73d2c3be22fb56d4bb0c15baf81df6

From 70356e37c285fc126aaaea4d3121b843b01bf031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:51 +0200
Subject: [PATCH 1626/1686] kturtle: update to 22.04.0.

---
 srcpkgs/kturtle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kturtle/template b/srcpkgs/kturtle/template
index d9f82442461b..f3be87556605 100644
--- a/srcpkgs/kturtle/template
+++ b/srcpkgs/kturtle/template
@@ -1,6 +1,6 @@
 # Template file for 'kturtle'
 pkgname=kturtle
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kdoctools
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/applications/education/kturtle/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kturtle"
 distfiles="${KDE_SITE}/release-service/${version}/src/kturtle-${version}.tar.xz"
-checksum=43bc3de793f0971b75bf11a96e5af7961ccbc29a2a57417325953731f9d40999
+checksum=fd42b1380e7e46d6c1e5bc4cbe538edcf9ed9bfc5abf54141393adc28fe38427

From 87b7c89e7ef584bf3b8a64cf0e9df260e593fb4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:52 +0200
Subject: [PATCH 1627/1686] kwalletmanager: update to 22.04.0.

---
 srcpkgs/kwalletmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kwalletmanager/template b/srcpkgs/kwalletmanager/template
index 18dce3c40633..902061e38dca 100644
--- a/srcpkgs/kwalletmanager/template
+++ b/srcpkgs/kwalletmanager/template
@@ -1,6 +1,6 @@
 # Template file for 'kwalletmanager'
 pkgname=kwalletmanager
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kauth kdoctools pkg-config
@@ -12,4 +12,4 @@ license="GPL-2.0-only"
 homepage="https://kde.org/applications/system/org.kde.kwalletmanager5"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kwalletmanager"
 distfiles="${KDE_SITE}/release-service/${version}/src/kwalletmanager-${version}.tar.xz"
-checksum=271db1bd744e9d9b183663b8a0239590f81f9997ff67cab51833861f0971b107
+checksum=d33824ae0abc7972fed9d7dad6acea9f67e7274ee5b15c0bb1df72b1a24aec17

From c7ce0a0f6f4477325750eb077c667496324b24f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:53 +0200
Subject: [PATCH 1628/1686] libkcddb: update to 22.04.0.

---
 srcpkgs/libkcddb/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkcddb/template b/srcpkgs/libkcddb/template
index 555cba64b240..fbcc0153671e 100644
--- a/srcpkgs/libkcddb/template
+++ b/srcpkgs/libkcddb/template
@@ -1,6 +1,6 @@
 # Template file for 'libkcddb'
 pkgname=libkcddb
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kconfig kcoreaddons kdoctools
@@ -12,7 +12,7 @@ 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"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkcddb"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkcddb-${version}.tar.xz"
-checksum=62709f9ccd8463208b905a3b935be1ba80102c451728e9f5c77e83eaf4afc191
+checksum=ddc91cc5112c5a749fccf18bb9a6b169279f6d5658fed3b4d60646d9ccbb0775
 
 libkcddb-devel_package() {
 	depends="libkcddb>=${version}_${revision}"

From 65629881c8fe11ae1964f4e921d40a221c2f0c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:54 +0200
Subject: [PATCH 1629/1686] libkdegames: update to 22.04.0.

---
 srcpkgs/libkdegames/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdegames/template b/srcpkgs/libkdegames/template
index bb7f34a7fb8e..7aafa5cf73fd 100644
--- a/srcpkgs/libkdegames/template
+++ b/srcpkgs/libkdegames/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdegames'
 pkgname=libkdegames
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake qt5-host-tools
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/games"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkdegames"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkdegames-${version}.tar.xz"
-checksum=4b2f3fb2af0866f7aba1ae679b505faeb7577b0ab50bd619ecb642c48ae0b574
+checksum=4dd8d80dbfd2806d420bb6efc2df64a175e8273d9ea34b9c61a0a7daae342e76
 
 libkdegames-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"

From f248a902f5f3eb4b9b09bf1dc93800d6cb648817 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:55 +0200
Subject: [PATCH 1630/1686] libkomparediff2: update to 22.04.0.

---
 srcpkgs/libkomparediff2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkomparediff2/template b/srcpkgs/libkomparediff2/template
index 7c7f2de89c1e..5f3b036be599 100644
--- a/srcpkgs/libkomparediff2/template
+++ b/srcpkgs/libkomparediff2/template
@@ -1,6 +1,6 @@
 # Template file for 'libkomparediff2'
 pkgname=libkomparediff2
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#libkomparediff2"
 distfiles="${KDE_SITE}/release-service/${version}/src/libkomparediff2-${version}.tar.xz"
-checksum=a2815b6c9fc08172b4e39b27c25764baa96de40d6ca298544085fba692a323c9
+checksum=9c9ff478d4e31cc0b0dc980238956d92f683e6ff55dc1c6b67e3212c7e7e0711
 
 libkomparediff2-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 32ebecef2cb9ddb925f04c6636adb4e0ec3a8155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:56 +0200
Subject: [PATCH 1631/1686] marble5: update to 22.04.0.

---
 srcpkgs/marble5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template
index 4bc5bdaa1d27..841cb976ad1d 100644
--- a/srcpkgs/marble5/template
+++ b/srcpkgs/marble5/template
@@ -1,6 +1,6 @@
 # Template file for 'marble5'
 pkgname=marble5
-version=21.12.3
+version=22.04.0
 revision=1
 wrksrc="marble-${version}"
 build_style=cmake
@@ -16,7 +16,7 @@ license="LGPL-2.1-or-later, GFDL-1.2-only"
 homepage="https://marble.kde.org"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#marble"
 distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz"
-checksum=442925b9024c0d7d470aa1523b0647c8fdce9ce69a0a2c6b29133d43596ad86c
+checksum=eb39219936b387dae4743638fe8ac5cf7f5654f4b4aff06a7c7b67e177799962
 
 pre_configure() {
 	vsed -i CMakeLists.txt -e 's/-Wcast-align//'

From d92f21a716ba54bf1dd9f8adb293442ddf5b593e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:57 +0200
Subject: [PATCH 1632/1686] signon-kwallet-extension: update to 22.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 7cc3e0d56453..4361bac6029b 100644
--- a/srcpkgs/signon-kwallet-extension/template
+++ b/srcpkgs/signon-kwallet-extension/template
@@ -1,6 +1,6 @@
 # Template file for 'signon-kwallet-extension'
 pkgname=signon-kwallet-extension
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-only"
 homepage="https://cgit.kde.org/signon-kwallet-extension.git/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#signon-kwallet-extension"
 distfiles="${KDE_SITE}/release-service/${version}/src/signon-kwallet-extension-${version}.tar.xz"
-checksum=7579e0434114c33eb5fea3f232bbd414658e2715f3f3a3a220a4f5be4079606b
+checksum=33d19b1b758a21e568ce508cc168e568e34716f148cd83e214fb8a3f3194d2e8

From 9b453eb4b735a4de1ec2f00ddee14693d7e7e412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:58 +0200
Subject: [PATCH 1633/1686] svgpart: update to 22.04.0.

---
 srcpkgs/svgpart/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/svgpart/template b/srcpkgs/svgpart/template
index 54ceffce29ea..a0b9d95a6ce2 100644
--- a/srcpkgs/svgpart/template
+++ b/srcpkgs/svgpart/template
@@ -1,6 +1,6 @@
 # Template file for 'svgpart'
 pkgname=svgpart
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
 homepage="https://cgit.kde.org/svgpart.git"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#svgpart"
 distfiles="${KDE_SITE}/release-service/${version}/src/svgpart-${version}.tar.xz"
-checksum=12fd83a8a4fafcc81d3bb0bfd9bc72da84a2fc3edc06e38d3acbfdf483d5e879
+checksum=923bda29e6610fb4dfd2b4f98e14045271c099ab1ed3988d52fefdc0b408df9a

From 36df8c7304912b2da6ab84f1f02ea973d5a96158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:41:59 +0200
Subject: [PATCH 1634/1686] umbrello: update to 22.04.0.

---
 srcpkgs/umbrello/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/umbrello/template b/srcpkgs/umbrello/template
index 6fc35aa3b336..da2757161229 100644
--- a/srcpkgs/umbrello/template
+++ b/srcpkgs/umbrello/template
@@ -1,6 +1,6 @@
 # Template file for 'umbrello'
 pkgname=umbrello
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules gettext kcoreaddons kconfig kdoctools qt5-host-tools qt5-qmake"
@@ -11,7 +11,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
 homepage="https://umbrello.kde.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#umbrello"
 distfiles="${KDE_SITE}/release-service/${version}/src/umbrello-${version}.tar.xz"
-checksum=c6c5f6107870b397dcc60932cbdc1767cc2d6a2f5223dc5e0314226b61a124c5
+checksum=f4f681daedbefdeb0e6b0da0fd718c20031491d3b088e0523ff5bbfab3de72d8
 python_version=2
 
 pre_configure() {

From 991dd3e3f0dac1ef45e4156008d1ad091a06e9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Fri, 22 Apr 2022 21:42:00 +0200
Subject: [PATCH 1635/1686] yakuake: update to 22.04.0.

---
 srcpkgs/yakuake/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/yakuake/template b/srcpkgs/yakuake/template
index 44a2f4000ebe..dd56e9afefb1 100644
--- a/srcpkgs/yakuake/template
+++ b/srcpkgs/yakuake/template
@@ -1,6 +1,6 @@
 # Template file for 'yakuake'
 pkgname=yakuake
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules kconfig kcoreaddons qt5-host-tools qt5-qmake gettext"
@@ -12,4 +12,4 @@ license="GPL-2.0-only, GFDL-1.2-only"
 homepage="https://kde.org/applications/system/org.kde.yakuake"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#yakuake"
 distfiles="${KDE_SITE}/release-service/${version}/src/yakuake-${version}.tar.xz"
-checksum=09667eb9aaaf7d072a0cd78b55b441691726686441b83a04d0c2c9b935cab382
+checksum=b7f96b48fd5baa75dd8fe53c8886f8cb0628f6a77a33232dc5bf06f45f6b2006

From a61e6af8768d0f742efec35c79b266199f2568c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 31 Aug 2021 21:00:01 +0200
Subject: [PATCH 1636/1686] hooks/99-pkglint.sh: make missing shlib entry not a
 warning

---
 common/hooks/pre-pkg/99-pkglint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index ea73c961ec5b..325938f5d541 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -182,7 +182,7 @@ hook() {
 			if [ -z "$found" ]; then
 				_myshlib="${libname}.so"
 				[ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
-				msg_warn "${pkgver}: ${_myshlib} not found in common/shlibs!\n"
+				msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
 			fi;
 		}
 	done

From 00ecf7810b5603d8235f239ad7cfdbc4aa2f8bde Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 22 Apr 2022 01:08:59 -0500
Subject: [PATCH 1637/1686] New package: step-certificates-0.19.0.

---
 srcpkgs/step-certificates/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/step-certificates/template

diff --git a/srcpkgs/step-certificates/template b/srcpkgs/step-certificates/template
new file mode 100644
index 000000000000..4d616f9450af
--- /dev/null
+++ b/srcpkgs/step-certificates/template
@@ -0,0 +1,22 @@
+# Template file for 'step-certificates'
+pkgname=step-certificates
+version=0.19.0
+revision=1
+wrksrc=certificates-$version
+build_style=go
+go_import_path=github.com/smallstep/certificates
+go_package="$go_import_path/cmd/step-ca
+ $go_import_path/cmd/step-awskms-init
+ $go_import_path/cmd/step-cloudkms-init
+ $go_import_path/cmd/step-pkcs11-init
+ $go_import_path/cmd/step-yubikey-init"
+go_ldflags="-w -X main.Version=$version"
+hostmakedepends="pkg-config"
+makedepends="pcsclite-devel"
+short_desc="Private CA and ACME server"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://smallstep.com/certificates/"
+changelog="https://raw.githubusercontent.com/smallstep/certificates/master/CHANGELOG.md"
+distfiles="https://github.com/smallstep/certificates/archive/refs/tags/v$version.tar.gz"
+checksum=edf8aeaabff2cae9fed4e27177d755be522c20a94a3fd7346de1ec42614d1d46

From 3cb27b2a526b1f9eb0faa6bfbff498c2aa7cdb73 Mon Sep 17 00:00:00 2001
From: Michael Aldridge <maldridge@voidlinux.org>
Date: Fri, 22 Apr 2022 01:18:55 -0500
Subject: [PATCH 1638/1686] New package: step-cli-0.19.0.

---
 srcpkgs/step-cli/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/step-cli/template

diff --git a/srcpkgs/step-cli/template b/srcpkgs/step-cli/template
new file mode 100644
index 000000000000..0fe5dc2dd34e
--- /dev/null
+++ b/srcpkgs/step-cli/template
@@ -0,0 +1,15 @@
+# Template file for 'step-cli'
+pkgname=step-cli
+version=0.19.0
+revision=1
+wrksrc=cli-$version
+build_style=go
+go_import_path=github.com/smallstep/cli
+go_package=$go_import_path/cmd/step
+short_desc="Zero trust swiss army knife"
+maintainer="Michael Aldridge <maldridge@voidlinux.org>"
+license="Apache-2.0"
+homepage="https://smallstep.com/cli"
+changelog="https://raw.githubusercontent.com/smallstep/cli/master/CHANGELOG.md"
+distfiles="https://github.com/smallstep/cli/archive/refs/tags/v$version.tar.gz"
+checksum=a58e63acbfd65a5df84f85715253aa88b566a13af26e2fa1353ae5766b3687d5

From cfe1690d05ef2ca4cc8656798d73fc4039cad90e Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 08:20:02 +0200
Subject: [PATCH 1639/1686] linux5.4: update to 5.4.190.

---
 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 770cb9be83ad..25d8aeea2d8f 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.189
+version=5.4.190
 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=8485d536531833cd2dbca0a7f267daff69ede5c9831cb693acc8318447e568c6
+checksum=81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From a1eb07e98593b1b28267cbcfa7803291399327b8 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 08:22:35 +0200
Subject: [PATCH 1640/1686] linux4.19: update to 4.19.239.

---
 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 d6916078343b..a44ed5b0cd25 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.238
+version=4.19.239
 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=83b74545c5d380384e09955c26e786bf9ee81a44bcf9347f2ca2ad3d31b46b7a
+checksum=bf7c5dc26c9a3113e43e4d32f73228788f8f6f005b9ddba379378786bc4c593b
 python_version=3
 
 nodebug=yes  # -dbg package is generated below manually

From 4f80e5af3325780694b4a390a2f4a63a9167457d Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 08:25:43 +0200
Subject: [PATCH 1641/1686] kore: update to 4.2.2.

---
 srcpkgs/kore/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index 52b7dbe718a2..cb2063a8adf6 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,6 +1,6 @@
 # Template file for 'kore'
 pkgname=kore
-version=4.2.1
+version=4.2.2
 revision=1
 # arch specific seccomp stuff
 archs="x86_64* aarch64* ppc64*"
@@ -14,7 +14,7 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"
 homepage="https://kore.io"
 distfiles="https://kore.io/releases/kore-${version}.tar.gz"
-checksum=f76b108a4eefa27c89123f5d6a36b493b171e429be7a85d3dd1466ac87e7f15a
+checksum=77c12d80bb76fe774b16996e6bac6d4ad950070d0816c3409dc0397dfc62725f
 disable_parallel_build=yes
 
 export TARGET_PLATFORM=${XBPS_TARGET_MACHINE}

From 7183674284ef15a91f530fc291113bcab607c893 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Thu, 21 Apr 2022 15:17:48 +0200
Subject: [PATCH 1642/1686] k3b: update to 22.04.0

---
 srcpkgs/k3b/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/k3b/template b/srcpkgs/k3b/template
index 1994bc5ccec9..c2eab8d7964d 100644
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@@ -1,6 +1,6 @@
 # Template file for 'k3b'
 pkgname=k3b
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 hostmakedepends="extra-cmake-modules pkg-config qt5-qmake gettext
@@ -16,4 +16,4 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#k3b"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
-checksum=acdbf40e1bccff837c50ba0a9d5e83370c24bc759c51d61385429ac3bf59f845
+checksum=5856d71fd5cf7f14eb646107f76e521869b4ac99df3411257c9f3427267b6504

From d7e4a10a76d71142f33ae47824744ef6e1cd6fec Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 21 Apr 2022 16:00:28 +0300
Subject: [PATCH 1643/1686] git: update to 2.36.0.

---
 srcpkgs/git/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 8b05a0f58024..e45663f9ff9b 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.35.3
+version=2.36.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -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=15e9db4f9bf2ed9fff30cb62a00c5c7c0901015f5ab048cdb4e8b04ddee00fa2
+checksum=af5ebfc1658464f5d0d45a2bfd884c935fb607a10cc021d95bc80778861cc1d3
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3

From 509ff4db020396ceaf16f17c53fc5bd2b9c216d8 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 22 Apr 2022 19:53:11 -0700
Subject: [PATCH 1644/1686] skopeo: update to 1.7.0

---
 srcpkgs/skopeo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/skopeo/template b/srcpkgs/skopeo/template
index d8015fbcd92c..b3106205abb8 100644
--- a/srcpkgs/skopeo/template
+++ b/srcpkgs/skopeo/template
@@ -1,6 +1,6 @@
 # Template file for 'skopeo'
 pkgname=skopeo
-version=1.6.2
+version=1.7.0
 revision=1
 build_style=go
 go_import_path="github.com/containers/${pkgname}"
@@ -14,7 +14,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="Apache-2.0"
 homepage="https://github.com/containers/skopeo"
 distfiles="https://github.com/containers/${pkgname}/archive/v${version}.tar.gz"
-checksum=48a1b3d18bde9d7af94756d546b0472e90416f05926281f7e533badfb5fcbd7b
+checksum=453bdcce16767696ed71046b60ad7b34358b183b50eb5aa708ced0b5ea2927b1
 make_dirs="/var/lib/atomic/sigstore 0755 root root"
 
 post_build() {

From bcb543f02f6c1c1cfce01241584150947b79f718 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Sat, 23 Apr 2022 00:55:42 +0200
Subject: [PATCH 1645/1686] droidcam: update to 1.8.2.

---
 srcpkgs/droidcam/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template
index 1357308432ef..1207bdec5cea 100644
--- a/srcpkgs/droidcam/template
+++ b/srcpkgs/droidcam/template
@@ -1,6 +1,6 @@
 # Template file for 'droidcam'
 pkgname=droidcam
-version=1.8.1
+version=1.8.2
 revision=1
 build_style=gnu-makefile
 make_build_args="USBMUXD=-lusbmuxd-2.0 JPEG=-lturbojpeg"
@@ -13,7 +13,7 @@ maintainer="ibrokemypie <ibrokemypie@bastardi.net>"
 license="GPL-2.0-or-later"
 homepage="https://www.dev47apps.com/"
 distfiles="https://github.com/dev47apps/droidcam/archive/v${version}.tar.gz"
-checksum=27724a3b3a94b0e5282628c85f0f9db1492df073cba331bd1e0a07f60290de71
+checksum=9f18c6768572571c59bfe08ac70e24612e08fc3d887c127ff47899252d3dc662
 
 post_patch() {
 	vsed -e "s/^Icon=.*/Icon=droidcam-icon.png/" -e "s,/local,," -i droidcam.desktop

From 9d72a18f7ad4d845bb4176ddc4e2fe4930ed30ab Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 09:09:15 +0200
Subject: [PATCH 1646/1686] vlc: update to 3.0.17.4.

---
 srcpkgs/vlc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 14a00043a651..bdcf4ff726cd 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,6 +1,6 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=3.0.17.3
+version=3.0.17.4
 revision=1
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
@@ -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="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz"
-checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014
+checksum=8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133
 
 lib32disabled=yes
 

From da3f66a000c696ed0206950435c10cbbb79c0e49 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 09:13:07 +0200
Subject: [PATCH 1647/1686] libkdcraw5: update to 22.04.0.

---
 srcpkgs/libkdcraw5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libkdcraw5/template b/srcpkgs/libkdcraw5/template
index 8d69a674cdfb..f71d7b6c6ac4 100644
--- a/srcpkgs/libkdcraw5/template
+++ b/srcpkgs/libkdcraw5/template
@@ -1,6 +1,6 @@
 # Template file for 'libkdcraw5'
 pkgname=libkdcraw5
-version=21.12.3
+version=22.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=6acfd4ca20417e525c1676c2b77beb26a683b346afa309cd5b9db3e894d2d8df
+checksum=f92cee9a87fdef59f12bde784e1ec2b13b2677c82634e303f20ed8055ddb3e79
 
 libkdcraw5-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 6a0da893082f86730fd3051733d4eb84172c7f95 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 09:38:44 +0200
Subject: [PATCH 1648/1686] gwenview: update to 22.04.0.

---
 srcpkgs/gwenview/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gwenview/template b/srcpkgs/gwenview/template
index aa6d3facb994..a9eafcc90cf1 100644
--- a/srcpkgs/gwenview/template
+++ b/srcpkgs/gwenview/template
@@ -1,6 +1,6 @@
 # Template file for 'gwenview'
 pkgname=gwenview
-version=21.12.3
+version=22.04.0
 revision=1
 build_style=cmake
 build_helper=qemu
@@ -16,4 +16,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=28d10e121394e4c710c77f2d46e18fc881c57613603ed65bfd892d4e79f67a7d
+checksum=73683096898c59388cd566cc8f71d7677fd0b22a2ab42a6d5f82f1232372ab05

From 9f7102ef6694298c0f0a9ad9a75cc0733de924f2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 23 Apr 2022 08:01:08 +0000
Subject: [PATCH 1649/1686] python3-soupsieve: fix dependency cycle

---
 srcpkgs/python3-soupsieve/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-soupsieve/template b/srcpkgs/python3-soupsieve/template
index 83862532f658..aa8f81af5a6e 100644
--- a/srcpkgs/python3-soupsieve/template
+++ b/srcpkgs/python3-soupsieve/template
@@ -1,12 +1,13 @@
 # Template file for 'python3-soupsieve'
 pkgname=python3-soupsieve
 version=1.9.5
-revision=7
+revision=8
 wrksrc="soupsieve-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-BeautifulSoup4"
-checkdepends="python3-pytest python3-lxml python3-html5lib $depends"
+depends="python3"
+checkdepends="python3-pytest python3-lxml python3-html5lib
+ python3-BeautifulSoup4"
 short_desc="CSS4 selector implementation for Python3 Beautiful Soup"
 maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
 license="MIT"

From 91f81262e3e1abbf46314837136f8f2988c642b0 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sat, 23 Apr 2022 16:34:01 +0200
Subject: [PATCH 1650/1686] wine: update to 7.7.

---
 srcpkgs/wine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index beb10898af92..b08032957c49 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,6 +1,6 @@
 # Template file for 'wine'
 pkgname=wine
-version=7.6
+version=7.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="eeab772f091328a3fb9db89aacab6be087c3d59c168ef2b41af5ec5010cf0328
- bdd1a095b9c4cddce4663825e2ad331c5bf1ac8b2288b0b380a665d0ca987a23"
+checksum="52a4d06ba77080df4a4b022bf9c2cc05cfa1d79bd4bb08c6b88f7c3ae09d1464
+ 9a8c18196ea346cdce84bd87693e911ecb505c1324b85bdbf60b115f8c487ab7"
 
 build_options="mingw staging xshm"
 build_options_default="mingw xshm"

From 14b5d164168bf3347ae7448528d6287f239d9b9f Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 23 Apr 2022 15:53:43 +0200
Subject: [PATCH 1651/1686] xfce4-terminal: update to 1.0.2.

---
 srcpkgs/xfce4-terminal/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 07c3bfaa46e5..418817a0ac32 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
-version=1.0.1
+version=1.0.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/apps/xfce4-terminal/start"
 changelog="https://gitlab.xfce.org/apps/xfce4-terminal/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=1d3690871d3fe97f8be0908ace0443819e513f6366f851682aafe17059e1eba5
+checksum=ac1543167b43322ad2483ffb033a7e74669ecb59f4b63016a3c183d96141d326

From 1b064e1fa77d7fa71ade10c3971b20a72779c730 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 23 Apr 2022 23:46:12 +0200
Subject: [PATCH 1652/1686] perl-local-lib: update to 2.000029.

---
 srcpkgs/perl-local-lib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/perl-local-lib/template b/srcpkgs/perl-local-lib/template
index 9990e7e7c0d4..3f9ad808f0ba 100644
--- a/srcpkgs/perl-local-lib/template
+++ b/srcpkgs/perl-local-lib/template
@@ -1,6 +1,6 @@
 # Template file for 'perl-local-lib'
 pkgname=perl-local-lib
-version=2.000028
+version=2.000029
 revision=1
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
@@ -13,4 +13,4 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
 homepage="https://metacpan.org/release/local-lib"
 distfiles="${CPAN_SITE}/lib/HAARG/local-lib-${version}.tar.gz"
-checksum=408317d67a59f9f91e23e3000b82de4f529cf9cf0896e228f3a27d6f607bfe3d
+checksum=8df87a10c14c8e909c5b47c5701e4b8187d519e5251e87c80709b02bb33efdd7

From a7ca9b50a760101805bbb7124cabf43a56d744b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 24 Apr 2022 00:11:41 +0200
Subject: [PATCH 1653/1686] neovim: update to 0.7.0.

---
 srcpkgs/neovim/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template
index 28cbc7e363cb..63c9247030f7 100644
--- a/srcpkgs/neovim/template
+++ b/srcpkgs/neovim/template
@@ -1,10 +1,10 @@
 # Template file for 'neovim'
 pkgname=neovim
-version=0.6.1
+version=0.7.0
 revision=1
 build_style=cmake
 build_helper="qemu"
-configure_args="-DCMAKE_BUILD_TYPE=Release"
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCOMPILE_LUA=OFF"
 hostmakedepends="pkg-config gettext gperf LuaJIT lua51-lpeg lua51-mpack"
 makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel
  LuaJIT-devel libluv-devel tree-sitter-devel"
@@ -14,7 +14,7 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="Apache-2.0, custom:Vim"
 homepage="https://neovim.io"
 distfiles="https://github.com/neovim/neovim/archive/v${version}.tar.gz"
-checksum=dd882c21a52e5999f656cae3f336b5fc702d52addd4d9b5cd3dc39cfff35e864
+checksum=792a9c55d5d5f4a5148d475847267df309d65fb20f05523f21c1319ea8a6c7df
 
 alternatives="
  vi:vi:/usr/bin/nvim
@@ -30,5 +30,5 @@ pre_configure() {
 }
 
 post_install() {
-	vlicense LICENSE
+	vlicense LICENSE.txt
 }

From 0beedabfc5f0cec7443a054bfdb5bec9bd9ac476 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 23 Apr 2022 20:36:57 -0700
Subject: [PATCH 1654/1686] gtksourceview5: update to 5.4.1

---
 srcpkgs/gtksourceview5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index 81be2e5248da..2f056edbeeab 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,6 +1,6 @@
 # Template file for 'gtksourceview5'
 pkgname=gtksourceview5
-version=5.4.0
+version=5.4.1
 revision=1
 wrksrc="gtksourceview-${version}"
 build_style=meson
@@ -19,7 +19,7 @@ homepage="https://wiki.gnome.org/Projects/GtkSourceView"
 #changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
 changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS"
 distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=003bc217e670a8ec8aa3aece994b70e70b7d6b8074938adda21718555d84e637
+checksum=eb3584099cfa0adc9a0b1ede08def6320bd099e79e74a2d0aefb4057cd93d68e
 
 # Package build options
 build_options="gir gtk_doc"

From 197452d93b537bb24692da7dac17db2772c9b714 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sat, 23 Apr 2022 22:06:09 +0200
Subject: [PATCH 1655/1686] yq-go: update to 4.24.5.

---
 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 9342a11e5deb..fa1737d4e916 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.23.1
+version=4.24.5
 revision=1
 wrksrc="yq-${version}"
 build_style=go
@@ -11,7 +11,7 @@ license="MIT"
 homepage="https://github.com/mikefarah/yq"
 changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.txt"
 distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
-checksum=f55ffb9c6d7926b06d5862eb6a9e9ea942ec2883286df8e2e3d6f0716cc36eed
+checksum=8ffab12d2d527f0ac62823777201f8e5e78c9af5c754914274db2733da98c796
 
 do_check() {
 	go test -v

From 541f22fab1897414d2f7b1da1b64e363b02b2810 Mon Sep 17 00:00:00 2001
From: akierig <anelki@fastmail.de>
Date: Fri, 22 Apr 2022 15:24:10 -0500
Subject: [PATCH 1656/1686] Signal-Desktop: update to 5.40.1.

---
 srcpkgs/Signal-Desktop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template
index 8bcfe617ab40..448189474620 100644
--- a/srcpkgs/Signal-Desktop/template
+++ b/srcpkgs/Signal-Desktop/template
@@ -1,6 +1,6 @@
 # Template file for 'Signal-Desktop'
 pkgname=Signal-Desktop
-version=5.40.0
+version=5.40.1
 revision=1
 # Signal officially only supports x86_64 (also due to Electron)
 # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="AGPL-3.0-only"
 homepage="https://github.com/signalapp/Signal-Desktop"
 distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
-checksum=57bb0ebbf4b3fb9d6dfbaa84166ecf668ce0df8a0afa0f69907680804dd064c4
+checksum=d80d210554e0296d916f7e25d9a49afc58340ab03ef7a1e7ae21017e80e9de7b
 nostrip_files="signal-desktop"
 
 post_extract() {

From 385e829fe58520e216ec3df8b9b4c6e2bffb5824 Mon Sep 17 00:00:00 2001
From: Tuxliban Torvalds <tenshalito@gmail.com>
Date: Wed, 20 Apr 2022 23:41:51 -0500
Subject: [PATCH 1657/1686] intel-ucode: update to 20220419

---
 srcpkgs/intel-ucode/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template
index 642dee9f7c27..e7e57d0f6588 100644
--- a/srcpkgs/intel-ucode/template
+++ b/srcpkgs/intel-ucode/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-ucode'
 pkgname=intel-ucode
-version=20220207
+version=20220419
 revision=1
 archs="i686* x86_64*"
 wrksrc="Intel-Linux-Processor-Microcode-Data-Files-microcode-${version}"
@@ -9,7 +9,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="custom: Proprietary"
 homepage="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files"
 distfiles="${homepage}/archive/microcode-${version}.tar.gz"
-checksum=532527bd17f3ea6664452b536699818a3bf896e4ace689a43a73624711b7c921
+checksum=b8838d300e749c1dd55d8865bdd49dee5153beb5e29d4b0e613aee475e0c0881
 repository=nonfree
 
 do_install() {

From 7aeb9faefe0ec0effd39738c5d00015e11f32250 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 16 Apr 2022 16:17:52 +0530
Subject: [PATCH 1658/1686] New package: libnvme-0.1

---
 common/shlibs                                 |  1 +
 srcpkgs/libnvme-devel                         |  1 +
 srcpkgs/libnvme-doc                           |  1 +
 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch | 13 +++++++
 srcpkgs/libnvme/template                      | 39 +++++++++++++++++++
 srcpkgs/python3-libnvme                       |  1 +
 6 files changed, 56 insertions(+)
 create mode 120000 srcpkgs/libnvme-devel
 create mode 120000 srcpkgs/libnvme-doc
 create mode 100644 srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
 create mode 100644 srcpkgs/libnvme/template
 create mode 120000 srcpkgs/python3-libnvme

diff --git a/common/shlibs b/common/shlibs
index 11328b15a9cc..073830fc1442 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4148,3 +4148,4 @@ librz_search.so.0.3.4 rizin-0.3.4_1
 librz_bin.so.0.3.4 rizin-0.3.4_1
 libaravis-0.8.so.0 libaravis-0.8.21_1
 libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
+libnvme.so.1 libnvme-1.0_1
diff --git a/srcpkgs/libnvme-devel b/srcpkgs/libnvme-devel
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-devel
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme-doc b/srcpkgs/libnvme-doc
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/libnvme-doc
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file
diff --git a/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
new file mode 100644
index 000000000000..c25df742e763
--- /dev/null
+++ b/srcpkgs/libnvme/patches/SCOPE_DELIMITER.patch
@@ -0,0 +1,13 @@
+SCOPE_DELIMITER not defined in musl
+
+--- a/src/nvme/fabrics.c
++++ b/src/nvme/fabrics.c
+@@ -325,7 +325,7 @@
+ 		nvme_msg(r, LOG_ERR, "cannot copy: %s\n", src);
+ 
+ 	const char *scope = NULL;
+-	char *p = strchr(tmp, SCOPE_DELIMITER);
++	char *p = strchr(tmp, '%');
+ 	if (p) {
+ 		*p = '\0';
+ 		scope = src + (p - tmp) + 1;
diff --git a/srcpkgs/libnvme/template b/srcpkgs/libnvme/template
new file mode 100644
index 000000000000..aafe21aa9aa5
--- /dev/null
+++ b/srcpkgs/libnvme/template
@@ -0,0 +1,39 @@
+# Template file for 'libnvme'
+pkgname=libnvme
+version=1.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man"
+hostmakedepends="pkg-config swig"
+makedepends="libuuid-devel json-c-devel openssl-devel python3-devel"
+short_desc="C Library for NVM Express on Linux"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/linux-nvme/libnvme"
+distfiles="https://github.com/linux-nvme/libnvme/archive/v${version}.tar.gz"
+checksum=387524b1c24a4091a88bfb258c98c054f716da210e77702f0709164740370807
+
+libnvme-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	depends+=" json-c-devel libuuid-devel openssl-devel"	# otherwise 'pkgconf libnvme' doesn't work
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
+
+libnvme-doc_package() {
+	short_desc+=" - documentation"
+	pkg_install() {
+		vmove usr/share
+	}
+}
+
+python3-libnvme_package() {
+	short_desc+=" - Python3 bindings"
+	pkg_install() {
+		vmove "usr/lib/python*"
+	}
+}
diff --git a/srcpkgs/python3-libnvme b/srcpkgs/python3-libnvme
new file mode 120000
index 000000000000..3228da1bc6d7
--- /dev/null
+++ b/srcpkgs/python3-libnvme
@@ -0,0 +1 @@
+libnvme
\ No newline at end of file

From 22ea2c3466dd92687098452f3d3b129d043fef44 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 16 Apr 2022 16:55:09 +0530
Subject: [PATCH 1659/1686] nvme-cli: update to 2.0, adopt

---
 srcpkgs/nvme-cli/patches/dracut-warning.patch |  5 ----
 srcpkgs/nvme-cli/template                     | 28 ++++++++-----------
 2 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 srcpkgs/nvme-cli/patches/dracut-warning.patch

diff --git a/srcpkgs/nvme-cli/patches/dracut-warning.patch b/srcpkgs/nvme-cli/patches/dracut-warning.patch
deleted file mode 100644
index ef0b0b4df244..000000000000
--- a/srcpkgs/nvme-cli/patches/dracut-warning.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:37:06.346511231 +0700
-+++ b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in	2021-01-24 16:38:01.351158511 +0700
-@@ -1 +1 @@
--install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"
-+install_items+=" @@UDEVRULESDIR@@/70-nvmf-autoconnect.rules "
diff --git a/srcpkgs/nvme-cli/template b/srcpkgs/nvme-cli/template
index 0da50f2663ef..9b142b02de0f 100644
--- a/srcpkgs/nvme-cli/template
+++ b/srcpkgs/nvme-cli/template
@@ -1,28 +1,22 @@
 # Template file for 'nvme-cli'
 pkgname=nvme-cli
-version=1.13
-revision=2
-build_style=gnu-makefile
-# yeah, it must be 0 to enable
-make_build_args="LIBUUID=0"
-make_install_args="SBINDIR=/usr/bin UDEVDIR=/usr/lib/udev"
-make_install_target="install-spec"
-makedepends="libuuid-devel"
+version=2.0
+revision=1
+build_style=meson
+configure_args="-Ddocs=man -Dudevrulesdir=lib/udev/rules.d"
+hostmakedepends="pkg-config"
+makedepends="libnvme-devel zlib-devel json-c-devel libuuid-devel libhugetlbfs-devel"
 short_desc="NVMe management command line interface"
-maintainer="Peter Froehlich <peter.hans.froehlich@gmail.com>"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
 license="GPL-2.0-only"
 homepage="http://nvmexpress.org"
 distfiles="https://github.com/linux-nvme/nvme-cli/archive/v${version}.tar.gz"
-checksum=03f4875f3e68d326b0280e16df2f027ca6b086cfa148c34e8569df61319b4b85
+checksum=471869b3bf643bb357dc9613ad14d24ff342fcd97e2db5a753c81c335ad8859c
 conf_files="/etc/nvme/*.conf"
 
 post_install() {
-	# these files are touch'd by install, remove so they aren't registered
-	# by the package (which would cause trouble during removal)
-	rm -f "${DESTDIR}/etc/nvme/hostnqn"
-	rm -f "${DESTDIR}/etc/nvme/hostid"
-	rm -rf "${DESTDIR}/etc/udev/rules.d"
-	rm -f "${DESTDIR}/usr/sbin/nvme"
-	# no need for systemd files
+	# remove files that are systemd-only
 	rm -rf "${DESTDIR}/usr/lib/systemd"
+	rm -rf "${DESTDIR}/usr/lib/udev/rules.d/70-nvmf-autoconnect.rules"         # calls systemctl
+	rm -rf "${DESTDIR}/usr/lib/dracut/dracut.conf.d/70-nvmf-autoconnect.conf"  # needs 70-nvmf-autoconnect.rules
 }

From df6257526cc2d36040b99ec815fe5a984f5a03d7 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 15:05:17 +0200
Subject: [PATCH 1660/1686] parallel: update to 20220422.

---
 srcpkgs/parallel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template
index 030875ae0ffd..27a4c2a2b059 100644
--- a/srcpkgs/parallel/template
+++ b/srcpkgs/parallel/template
@@ -1,6 +1,6 @@
 # Template file for 'parallel'
 pkgname=parallel
-version=20220322
+version=20220422
 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=df93ccf6a9f529ad2126b7042aef0486603e938c77b405939c41702d38a4e6d8
+checksum=96e4b73fff1302fc141a889ae43ab2e93f6c9e86ac60ef62ced02dbe70b73ca7
 
 pre_configure() {
 	# no html and pdf doc

From 9d7a8ac0dacccf8b25711a3ed4fa9c623333d1ee Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 17:35:37 +0200
Subject: [PATCH 1661/1686] public-inbox: update to 1.8.0.

---
 srcpkgs/public-inbox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/public-inbox/template b/srcpkgs/public-inbox/template
index d95bb6f3a0b2..d8bd1f5ce727 100644
--- a/srcpkgs/public-inbox/template
+++ b/srcpkgs/public-inbox/template
@@ -1,6 +1,6 @@
 # Template file for 'public-inbox'
 pkgname=public-inbox
-version=1.7.0
+version=1.8.0
 revision=1
 wrksrc="${pkgname}-${version/pre/-pre}"
 build_style=perl-module
@@ -18,7 +18,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="AGPL-3.0-or-later"
 homepage="https://public-inbox.org/"
 distfiles="https://public-inbox.org/public-inbox.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=8504a998014556e3e65d9bdceeaeb23f966197cea86abf3738b6059fee36c8c9
+checksum=95a24e38293935e7081967acbf80f7d1c2c67e28d01d591ea39e5e36a34acdec
 
 pre_check() {
 	mkdir -p ~/.public-inbox

From 93201be2a61e82179aafa8074150087e6c0a3fa1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:31:46 +0200
Subject: [PATCH 1662/1686] dune: update to 3.1.1.

---
 srcpkgs/dune/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/dune/template b/srcpkgs/dune/template
index 30c34cb44c00..bc2898d2cd4c 100644
--- a/srcpkgs/dune/template
+++ b/srcpkgs/dune/template
@@ -1,7 +1,7 @@
 # Template file for 'dune'
 pkgname=dune
-version=3.0.3
-revision=2
+version=3.1.1
+revision=1
 makedepends="ocaml"
 depends="ocaml"
 short_desc="Composable build system for OCaml"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://dune.build/"
 distfiles="https://github.com/ocaml/dune/archive/refs/tags/${version}.tar.gz"
-checksum=8f5e1570e68f7b2e0a8d1ffea77318e058f125f4cb8ea9a4af9cf9afe4ced893
+checksum=176c7095b2fcb59ca5c8fba880cf32dd3010144e926b99fc01f7a89e973b895d
 nocross="ocaml"
 
 _dune_release_pkgs="dune dune-action-plugin dune-build-info dune-configurator

From 91f058a7daf0ec8d4c8280dfee952ad69ae3309a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:41:50 +0200
Subject: [PATCH 1663/1686] z3: update to 4.8.16.

---
 srcpkgs/z3/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template
index dea059c98d0c..d322211cbd9b 100644
--- a/srcpkgs/z3/template
+++ b/srcpkgs/z3/template
@@ -1,7 +1,7 @@
 # Template file for 'z3'
 pkgname=z3
-version=4.8.15
-revision=2
+version=4.8.16
+revision=1
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=configure
 configure_args="--prefix=/usr -g --python $(vopt_if ocaml --ml)"
@@ -15,7 +15,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/Z3Prover/z3"
 distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz"
-checksum=2abe7f5ecb7c8023b712ffba959c55b4515f4978522a6882391de289310795ac
+checksum=75f95e09f3f35fef746e571d5ec88a4efba27f1bc8f1a0ef1117167486ec3dc6
 
 build_options="ocaml"
 desc_option_ocaml="Enable support for OCaml bindings"

From b2fbe98903e8af13db337e48be7513f83ec090c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:47:16 +0200
Subject: [PATCH 1664/1686] python3-pyinfra: update to 2.0.2.

---
 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 c4935c5e16b9..b5b66a212d18 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.7.2
+version=2.0.2
 revision=1
 wrksrc="pyinfra-${version}"
 build_style=python3-module
@@ -14,7 +14,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=c7a2464ab50c5de865f0984e1978a9af37fbeca2260c4bf642db37fd0aed910d
+checksum=d5775bbd7060a67184092f6d29d7ee9f08ad76035cad7328e2fd63824c6fa649
 
 post_extract() {
 	vsed -i -e '/configparser/d' setup.py  # is in Python 3.8

From aa210d2c24d6e1f95114f05498f5405d96b76f15 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:48:05 +0200
Subject: [PATCH 1665/1686] python3-pywinrm: update to 0.4.3.

---
 srcpkgs/python3-pywinrm/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pywinrm/template b/srcpkgs/python3-pywinrm/template
index 24c8b63fec06..642166e13b6e 100644
--- a/srcpkgs/python3-pywinrm/template
+++ b/srcpkgs/python3-pywinrm/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pywinrm'
 pkgname=python3-pywinrm
-version=0.4.2
-revision=2
+version=0.4.3
+revision=1
 wrksrc="pywinrm-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="MIT"
 homepage="https://github.com/diyan/pywinrm"
 distfiles="https://github.com/diyan/pywinrm/archive/v${version}.tar.gz"
-checksum=c2a0d839f524a3cf4548923c29f85f909174405ac4339df45813410aae759b44
+checksum=253d2af9a6f1ec1ae8e21919a174e178b2e0475060956e3add0746584520ae84
 
 post_install() {
 	vlicense LICENSE

From f8a1bfb1ad9caad0a3e4b613a6e0fe2ee904662b Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 24 Apr 2022 21:48:43 +0200
Subject: [PATCH 1666/1686] python3-pipenv: update to 2022.4.21.

---
 srcpkgs/python3-pipenv/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pipenv/template b/srcpkgs/python3-pipenv/template
index ea94ef51e087..2c0c939cf5f7 100644
--- a/srcpkgs/python3-pipenv/template
+++ b/srcpkgs/python3-pipenv/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pipenv'
 pkgname=python3-pipenv
-version=2022.4.8
+version=2022.4.21
 revision=1
 wrksrc="pipenv-${version}"
 build_style=python3-module
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://github.com/pypa/pipenv"
 changelog="https://github.com/pypa/pipenv/blob/main/CHANGELOG.rst"
 distfiles="${PYPI_SITE}/p/pipenv/pipenv-${version}.tar.gz"
-checksum=53562bf69d9e5238f99a1e2101c356746b1c0aefa5dceb9b8a84a5a3e201de0d
+checksum=3f93229de25a4c3a658249f48407b80f347f076640a9fd50c476a2876212f781
 conflicts="python-pipenv>=0"
 
 post_extract() {

From 673c7ddc5b828eda304d31f6ca4fa53fb00940a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 23 Apr 2022 15:34:59 +0200
Subject: [PATCH 1667/1686] python3-pwntools: disable tests

---
 srcpkgs/python3-pwntools/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template
index f61ad95fa813..d062f213cf17 100644
--- a/srcpkgs/python3-pwntools/template
+++ b/srcpkgs/python3-pwntools/template
@@ -18,6 +18,7 @@ license="MIT, BSD-2-Clause"
 homepage="https://github.com/Gallopsled/pwntools"
 distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz"
 checksum=42052e2d883710e4e1da041e91675a6d719fb4e5ef2dd245cb2853da11269290
+#make_check=no # needs unpackaged rpyc
 
 post_install() {
 	rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md

From d5092f3af8fe03aaa5a70388971ca798b499a1bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 22:33:45 +0200
Subject: [PATCH 1668/1686] libinput: update to 1.20.1.

---
 srcpkgs/libinput/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libinput/template b/srcpkgs/libinput/template
index 38fe908dbb36..1736a1f91f39 100644
--- a/srcpkgs/libinput/template
+++ b/srcpkgs/libinput/template
@@ -1,6 +1,6 @@
 # Template file for 'libinput'
 pkgname=libinput
-version=1.20.0
+version=1.20.1
 revision=1
 build_style=meson
 configure_args="-Dtests=false"
@@ -13,7 +13,7 @@ maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/libinput"
 distfiles="https://gitlab.freedesktop.org/libinput/libinput/-/archive/${version}/libinput-${version}.tar.gz"
-checksum=04d27bce1eb8387e99740e43224b0de7ea65161826d120199bf96230132e5186
+checksum=fbbfe95c5cf20a1790c077b703db86ff0811c04a040b15f2a8579518e8a58064
 
 CFLAGS="-UNDEBUG"
 

From 6a5e0307fc35e3770737f136ca30506dfddde6b6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 22:33:50 +0200
Subject: [PATCH 1669/1686] pp: fix checksum

---
 srcpkgs/pp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/pp/template b/srcpkgs/pp/template
index c1a59659fb65..4865bcd96d92 100644
--- a/srcpkgs/pp/template
+++ b/srcpkgs/pp/template
@@ -9,7 +9,7 @@ maintainer="Daniel Lewan <vision360.daniel@gmail.com>"
 license="ISC"
 homepage="https://mkws.sh/pp.html"
 distfiles="https://mkws.sh/pp/pp@${version}.tgz"
-checksum=3c85716c05145c85f281478c82f445d9a808faad0497b438a8bfcbfdfd055665
+checksum=3b4726a2d2e78349fd5512ea8d4c4f5e8417d5a81e511f74e7efb5f4e03e978c
 
 do_build() {
 	make CC="$CC" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"

From 2cdad05a673ef11a9b2b1c270c60b4d8b9dae7e3 Mon Sep 17 00:00:00 2001
From: ThePademelon <zomanom@gmail.com>
Date: Sun, 24 Apr 2022 16:22:20 +1000
Subject: [PATCH 1670/1686] blanket: update to 0.6.0.

---
 srcpkgs/blanket/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/blanket/template b/srcpkgs/blanket/template
index 57d75b5ba8d1..9db5a1d5a3c9 100644
--- a/srcpkgs/blanket/template
+++ b/srcpkgs/blanket/template
@@ -1,14 +1,14 @@
 # Template file for 'blanket'
 pkgname=blanket
-version=0.5.0
+version=0.6.0
 revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext glib-devel"
-depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libhandy1"
+depends="gst1-python3 gst-plugins-bad1 gst-plugins-good1 libadwaita"
 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/refs/tags/${version}.tar.gz"
-checksum=5af1d417d31bafff7c13a48e26bc4daae58a537f312b4ffb6911ae1b8b09a1d1
+checksum=710a3b733da5eb349bf8dc3c37ef0afeb301c8299c22e7fad3c753576f33f7f4
 python_version=3

From 42687ce1a2ac3d66b7818862f7bb2107cd78d5a4 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alexthkloss@web.de>
Date: Sat, 23 Apr 2022 21:47:40 +0200
Subject: [PATCH 1671/1686] volta: update to 1.0.7

---
 srcpkgs/volta/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 7874993281ec..e624659785b0 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,6 +1,6 @@
 # Template file for 'volta'
 pkgname=volta
-version=1.0.6
+version=1.0.7
 revision=1
 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=0f66edcb2639bee2c1668efd119c2937a77fbbe564c9d63827e8eaf37dbee4b9
+checksum=7e38691c56d77b4d4b466247bc9f10672d4f8f6b98cf53c50fdab6c34526aa91
 
 post_install() {
 	vlicense LICENSE

From f2322f2a62ab50806d20c41bc21fd2bef703335a Mon Sep 17 00:00:00 2001
From: mhmdanas <triallax@tutanota.com>
Date: Thu, 21 Apr 2022 17:40:59 +0300
Subject: [PATCH 1672/1686] StyLua: update to 0.13.1.

---
 srcpkgs/StyLua/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/StyLua/template b/srcpkgs/StyLua/template
index b6dc22c3875d..90ef1beb0f3c 100644
--- a/srcpkgs/StyLua/template
+++ b/srcpkgs/StyLua/template
@@ -1,6 +1,6 @@
 # Template file for 'StyLua'
 pkgname=StyLua
-version=0.13.0
+version=0.13.1
 revision=1
 build_style=cargo
 configure_args="$(vopt_if lua52 '--features lua52') $(vopt_if luau '--features luau')"
@@ -10,7 +10,7 @@ license="MPL-2.0"
 homepage="https://github.com/JohnnyMorganz/StyLua"
 changelog="https://raw.githubusercontent.com/JohnnyMorganz/StyLua/master/CHANGELOG.md"
 distfiles="https://github.com/JohnnyMorganz/StyLua/archive/v${version}.tar.gz"
-checksum=ad74d1f47b0337810459dab9b49694bd5bd6c8c7381a35dcab7866752652988b
+checksum=21158028569158ec7c1ad71352f3cb1906a005eb797508aa2b0b4a861162cf72
 
 build_options="lua52 luau"
 build_options_default="lua52 luau"

From fe6dff3774e7420949ee7ca98c9b23d670d46d70 Mon Sep 17 00:00:00 2001
From: glaulher <glaulher.developer@gmail.com>
Date: Thu, 21 Apr 2022 12:34:46 -0300
Subject: [PATCH 1673/1686] thefuck: update to 3.32.

---
 srcpkgs/thefuck/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/thefuck/template b/srcpkgs/thefuck/template
index 267a27d7789a..7704ab2a6a68 100644
--- a/srcpkgs/thefuck/template
+++ b/srcpkgs/thefuck/template
@@ -1,7 +1,7 @@
 # Template file for 'thefuck'
 pkgname=thefuck
-version=3.31
-revision=2
+version=3.32
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-colorama python3-decorator python3-psutil python3-pyte
@@ -12,12 +12,12 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/nvbn/thefuck"
 distfiles="https://github.com/nvbn/thefuck/archive/${version}.tar.gz"
-checksum=ac12705b95e22b356f23b20181a34d549267b7b1702523a1f0a22ba7ba3d30df
+checksum=76cbb014473672d1c384922857f8fbc1f6f7774f74f784149ad88751854ecfdf
 
 case "$XBPS_TARGET_MACHINE" in
 	# archs where go is available - the test suite uses it
 	x86_64*|i686*|armv[67]*|aarch64*|ppc64le*) checkdepends+=" go" ;;
-	*) make_check=no ;;
+	*) make_check=no ;; # go is not available
 esac
 
 pre_check() {

From 0de8ad16968f04d3bb44493f222374de0219cda3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Fri, 15 Apr 2022 18:00:25 +0200
Subject: [PATCH 1674/1686] linux-firmware: update to 20220411.

---
 srcpkgs/linux-firmware/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 018f08f95099..dde0c93b3fb4 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,6 +1,6 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
-version=20220310
+version=20220411
 revision=1
 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}"
 short_desc="Binary firmware blobs for the Linux kernel"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="See /usr/share/licenses/${pkgname}"
 homepage="https://www.kernel.org/"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=f4c34a7ba8144b52fd7f6dd0b1dea2998f140ab1139372f8fbdb76f4557ff228
+checksum=533ae621b3eacf6a4696dab52a9dbc5727403a175c413b1682ab3f9cfb37872f
 python_version=3
 nostrip=yes
 

From df34168c5e51cfaa54d37822836d6ac05640e3b5 Mon Sep 17 00:00:00 2001
From: Philipp David <pd@3b.pm>
Date: Sat, 9 Apr 2022 14:10:43 +0200
Subject: [PATCH 1675/1686] img2pdf: update to 0.4.4.

---
 srcpkgs/img2pdf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template
index a24ea1f1b610..d3b30d5af5da 100644
--- a/srcpkgs/img2pdf/template
+++ b/srcpkgs/img2pdf/template
@@ -1,6 +1,6 @@
 # Template file for 'img2pdf'
 pkgname=img2pdf
-version=0.4.3
+version=0.4.4
 revision=1
 build_style=python3-module
 hostmakedepends="python3-pikepdf python3-setuptools"
@@ -10,5 +10,5 @@ maintainer="Philipp David <pd@3b.pm>"
 license="GPL-3.0-or-later"
 homepage="https://gitlab.mister-muffin.de/josch/img2pdf"
 distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz"
-checksum=8e51c5043efa95d751481b516071a006f87c2a4059961a9ac43ec238915de09f
+checksum=8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c
 make_check=no # need to patch out some bitdepth checks

From 11c22cfbaeb4b8de0d15897b954ca51af38674b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= <daniel.eysser@gmail.com>
Date: Sat, 23 Apr 2022 12:39:03 +0200
Subject: [PATCH 1676/1686] dasel: update to 1.24.3.

---
 srcpkgs/dasel/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/dasel/template b/srcpkgs/dasel/template
index 6d913b08ba62..1f4e0d9fb800 100644
--- a/srcpkgs/dasel/template
+++ b/srcpkgs/dasel/template
@@ -1,6 +1,6 @@
 # Template file for 'dasel'
 pkgname=dasel
-version=1.24.1
+version=1.24.3
 revision=1
 build_style=go
 go_import_path=github.com/tomwright/dasel
@@ -12,7 +12,7 @@ license="MIT"
 homepage="https://daseldocs.tomwright.me/"
 changelog="https://raw.githubusercontent.com/TomWright/dasel/master/CHANGELOG.md"
 distfiles="https://github.com/TomWright/dasel/archive/v${version}.tar.gz"
-checksum=ca1fa030f41abcd3659e76d7413ce14c551f40d41769e7a000a46f4fea6d0b64
+checksum=86d497e7dcfe63901ef0aeddb31e3989959d60d785a04f98fc6a88b6f497980a
 
 post_install() {
 	vlicense LICENSE

From 8b689f2e07c0d0c5a8570a992b9a8221dfa75868 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Fri, 22 Apr 2022 17:28:47 -0400
Subject: [PATCH 1677/1686] tailscale: update to 1.24.0.

---
 srcpkgs/tailscale/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template
index 27a3611b7296..9b6db1157ae8 100644
--- a/srcpkgs/tailscale/template
+++ b/srcpkgs/tailscale/template
@@ -1,6 +1,6 @@
 # Template file for 'tailscale'
 pkgname=tailscale
-version=1.22.2
+version=1.24.0
 revision=1
 build_style=go
 go_import_path="tailscale.com"
@@ -13,7 +13,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=3e7b5b8073a7b94d84ff6677a9f110070b808c8d35c5b7da0c6e6fe639444e58
+checksum=3c8fe851c440d5dbd9dba2f3242924a7d99e7df37b5ae098507a8feb3663c76f
 
 post_install() {
 	vlicense LICENSE

From aea843e2d64fc341fa7764598bc7fce246504674 Mon Sep 17 00:00:00 2001
From: ologantr <mrphyber@protonmail.com>
Date: Fri, 22 Apr 2022 18:27:05 +0200
Subject: [PATCH 1678/1686] ncmpc: update to 0.46.

Also, remove unneeded boost-devel dependency and
bump to pcre2.
---
 srcpkgs/ncmpc/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/ncmpc/template b/srcpkgs/ncmpc/template
index a7d76aa3ce9e..0c9c46bf8400 100644
--- a/srcpkgs/ncmpc/template
+++ b/srcpkgs/ncmpc/template
@@ -1,18 +1,18 @@
 # Template file for 'ncmpc'
 pkgname=ncmpc
-version=0.45
-revision=2
+version=0.46
+revision=1
 build_style=meson
 configure_args="-Dlirc=disabled -Dhtml_manual=false"
 hostmakedepends="pkg-config python3-Sphinx"
-makedepends="boost-devel libmpdclient-devel ncurses-devel pcre-devel"
+makedepends="libmpdclient-devel ncurses-devel pcre2-devel"
 short_desc="Ncurses-based mpd client"
 maintainer="Getty Ritter <gettyritter@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.musicpd.org/clients/ncmpc/"
 changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/master/NEWS"
 distfiles="https://www.musicpd.org/download/ncmpc/0/ncmpc-${version}.tar.xz"
-checksum=17ff446447e002f2ed4342b7324263a830df7d76bcf177dce928f7d3a6f1f785
+checksum=177f77cf09dd4ab914e8438be399cdd5d83c9aa992abc8d9abac006bb092934e
 
 post_install() {
 	vmkdir usr/share/examples/ncmpc

From 3f0d8373730fd1635720870ad8cd1f19236cc23f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 23 Apr 2022 21:21:38 +0200
Subject: [PATCH 1679/1686] gst-plugins-base1: fix -devel dependencies

---
 srcpkgs/gst-plugins-base1/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template
index fcb7c07b06ab..538f4111a74e 100644
--- a/srcpkgs/gst-plugins-base1/template
+++ b/srcpkgs/gst-plugins-base1/template
@@ -1,7 +1,7 @@
 # Template file for 'gst-plugins-base1'
 pkgname=gst-plugins-base1
 version=1.20.1
-revision=2
+revision=3
 wrksrc="${pkgname/1/}-${version}"
 build_style=meson
 build_helper="gir"
@@ -53,7 +53,10 @@ do_check() {
 }
 
 gst-plugins-base1-devel_package() {
-	depends="gstreamer1-devel>=${version} ${sourcepkg}>=${version}_${revision} orc-devel"
+	depends="gstreamer1-devel>=${version} ${sourcepkg}>=${version}_${revision}
+	 libX11-devel libdrm-devel libgbm-devel libglib-devel libglvnd-devel
+	 libgudev-devel orc-devel wayland-devel zlib-devel"
+
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 131318255a1fe46452db477083c6c7e7d96dc9fb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 24 Apr 2022 21:54:18 +0200
Subject: [PATCH 1680/1686] btrfs-progs: move .pc file to libbtrfsutil-devel

---
 srcpkgs/btrfs-progs/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template
index 971267a50435..5be94b6daaff 100644
--- a/srcpkgs/btrfs-progs/template
+++ b/srcpkgs/btrfs-progs/template
@@ -1,7 +1,7 @@
 # Template file for 'btrfs-progs'
 pkgname=btrfs-progs
 version=5.14.1
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 make_check_target=test
@@ -65,6 +65,7 @@ libbtrfsutil-devel_package() {
 	short_desc+=" - libbtrfsutil development files"
 	pkg_install() {
 		vmove usr/include/btrfsutil.h
+		vmove usr/lib/pkgconfig/libbtrfsutil.pc
 		vmove usr/lib/libbtrfsutil.a
 		vmove usr/lib/libbtrfsutil.so
 	}

From bcb06f08631a8df25f597d65db7b24a3a574abe1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 25 Apr 2022 14:10:53 +0200
Subject: [PATCH 1681/1686] kubefwd: update to 1.22.2.

---
 srcpkgs/kubefwd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kubefwd/template b/srcpkgs/kubefwd/template
index 734b9c732c88..8aa2f1b456d8 100644
--- a/srcpkgs/kubefwd/template
+++ b/srcpkgs/kubefwd/template
@@ -1,6 +1,6 @@
 # Template file for 'kubefwd'
 pkgname=kubefwd
-version=1.22.0
+version=1.22.2
 revision=1
 build_style=go
 go_import_path="github.com/txn2/kubefwd/cmd/kubefwd"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
 homepage="https://github.com/txn2/kubefwd"
 distfiles="https://github.com/txn2/kubefwd/archive/${version}.tar.gz"
-checksum=38a36dfe7182b4a9a4515d49c6dbeeceb101397cc5c11fbf720d2570cb0b86ef
+checksum=ce7ed2d054a594c9471b1ef777d024186ac427f7d0db8422fda96ede26238f9e
 
 post_install() {
 	vlicense NOTICE

From 76b3bf2db3574f4390f558d03a7357c899c58405 Mon Sep 17 00:00:00 2001
From: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Date: Sun, 24 Apr 2022 19:15:20 +1100
Subject: [PATCH 1682/1686] muse: update to 4.1.0.

---
 srcpkgs/muse/patches/i686.patch | 22 ++++++++++++++++++++++
 srcpkgs/muse/template           |  7 +++----
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/muse/patches/i686.patch

diff --git a/srcpkgs/muse/patches/i686.patch b/srcpkgs/muse/patches/i686.patch
new file mode 100644
index 000000000000..e15bce630026
--- /dev/null
+++ b/srcpkgs/muse/patches/i686.patch
@@ -0,0 +1,22 @@
+From 40afa0ad60e221c7b02fb8febbf9baff42c13cdc Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Mon, 25 Apr 2022 10:19:30 +0200
+Subject: [PATCH] Fix intptr_t was not declared in this scope on i386
+
+---
+ src/al/dsp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/al/dsp.cpp b/src/al/dsp.cpp
+index 8a4803e4c..3f601dc63 100644
+--- a/src/al/dsp.cpp
++++ b/src/al/dsp.cpp
+@@ -21,7 +21,7 @@
+ //=============================================================================
+ 
+ #include <stdio.h>
+-//#include <stdint.h>
++#include <stdint.h>
+ //#include "config.h"
+ #include "al.h"
+ #include "dsp.h"
diff --git a/srcpkgs/muse/template b/srcpkgs/muse/template
index c1289802a6b6..bfc011eb1037 100644
--- a/srcpkgs/muse/template
+++ b/srcpkgs/muse/template
@@ -1,8 +1,7 @@
 # Template file for 'muse'
 pkgname=muse
-version=4.0.0
-revision=2
-wrksrc="muse-${version}"
+version=4.1.0
+revision=1
 build_wrksrc=src
 build_style=cmake
 build_helper=qmake
@@ -19,7 +18,7 @@ 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
+checksum=b5462cdebd84326b0ffc0aa0b2c27f5eab55362dcc04e17796de866fcee4f391
 python_version=3
 
 build_options="alsa python"

From 120a9e27bbf43f7d32d745eb961afeef100b21e2 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 20 Apr 2022 21:19:00 -0400
Subject: [PATCH 1683/1686] mdcat: update to 0.27.1.

---
 srcpkgs/mdcat/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index c07dbd3b3913..84a8294986a9 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -1,18 +1,20 @@
 # Template file for 'mdcat'
 pkgname=mdcat
-version=0.26.1
+version=0.27.1
 revision=1
 wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config ruby-asciidoctor"
 makedepends="openssl-devel"
+depends="shared-mime-info"
+checkdepends="shared-mime-info"
 short_desc="Cat for markdown"
 maintainer="cinerea0 <cinerea0@protonmail.com>"
 license="MPL-2.0"
 homepage="https://codeberg.org/flausch/mdcat/"
 changelog="https://codeberg.org/flausch/mdcat/raw/branch/main/CHANGELOG.md"
 distfiles="https://codeberg.org/flausch/mdcat/archive/mdcat-${version}.tar.gz"
-checksum=1120c4f3b5b517075b6347dbfe76a2211a91837b4d0242c0b72cdbc19e6886dd
+checksum=79961e0a842ee0f68aee3d54b39458352664c67388e56175a9d18d80f357bf14
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

From a5110d908c95a9539edf1ba812f6476c6a3784f3 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 10 Apr 2022 12:03:13 +0200
Subject: [PATCH 1684/1686] praat: update to 6.2.12

and enable check
---
 srcpkgs/praat/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template
index 142f0d2661ae..c40c093208ec 100644
--- a/srcpkgs/praat/template
+++ b/srcpkgs/praat/template
@@ -1,18 +1,19 @@
 # Template file for 'praat'
 pkgname=praat
-version=6.2.10
+version=6.2.12
 revision=1
 create_wrksrc=yes
 hostmakedepends="pkg-config"
 makedepends="gtk+3-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if jack jack-devel)
  $(vopt_if pulseaudio 'alsa-lib-devel pulseaudio-devel')"
+checkdepends="cantarell-fonts"
 short_desc="Speech analysis, synthesis, and manipulation"
 maintainer="newbluemoon <blaumolch@mailbox.org>"
 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=f6358b2c6a967afe89882720d503c74221b364c563e1e4316a2d73c9f0c22bcd
+checksum=b6f1e09ffc8d0c89e3a892d997af0766a49f7d863cdeae857a9b5ea7f95f5650
 
 # 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
@@ -59,6 +60,12 @@ do_install() {
 	vbin praat_nogui
 }
 
+do_check() {
+	cd "${pkgname}-${version}/test"
+	../../praat --run runAllTests_batch.praat
+	../../praat_nogui --run runAllTests_batch.praat
+}
+
 praat-nogui_package() {
 	short_desc+=" (nogui)"
 	pkg_install() {

From bd7338f82e16854e970360b9d8809cb7cf35f31e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 20 Apr 2022 13:50:04 -0400
Subject: [PATCH 1685/1686] python3-pybcj: update to 0.5.2.

---
 srcpkgs/python3-pybcj/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template
index a0776b796627..c6cef8f80b03 100644
--- a/srcpkgs/python3-pybcj/template
+++ b/srcpkgs/python3-pybcj/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-pybcj'
 pkgname=python3-pybcj
-version=0.5.1
+version=0.5.2
 revision=1
 wrksrc="pybcj-${version}"
 build_style=python3-module
@@ -13,4 +13,4 @@ maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
 license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/pybcj"
 distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz"
-checksum=376d039200639a52cba47fb04ffda39aad39715d9e988405fee0e5d60080d111
+checksum=050e7bf780b82b0c6ba4368c4a78953a1cf5922cef50e8b251fb8b87f0483ad7

From 323aabb095a849e79718bc6066262e21ae39b6c6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 20 Apr 2022 13:50:30 -0400
Subject: [PATCH 1686/1686] python3-py7zr: update to 0.18.4.

---
 srcpkgs/python3-py7zr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
index 0113cb1dec27..e6e8e05ec41a 100644
--- a/srcpkgs/python3-py7zr/template
+++ b/srcpkgs/python3-py7zr/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-py7zr'
 pkgname=python3-py7zr
-version=0.18.3
+version=0.18.4
 revision=1
 wrksrc="py7zr-${version}"
 build_style=python3-module
@@ -16,4 +16,4 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/miurahr/py7zr"
 changelog="https://raw.githubusercontent.com/miurahr/py7zr/master/Changelog.rst"
 distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
-checksum=d5bdc81536316f209a3ca4e1ce6e2ef11d8a519d613be47bcdd084bf655f400f
+checksum=6986e90ca4ca1f4999d57987a54d891673c9f8befa02c9c6cd8201893a17442c

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 732 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-q5go-35831.patch --]
[-- Type: text/x-diff, Size: 1648 bytes --]

From 39bb9e3fc7219db6a95bf0cfcf1ae91c1c6d83b8 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 23 Feb 2022 16:55:57 -0600
Subject: [PATCH] New package: q5go-2.12

---
 srcpkgs/q5go/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/q5go/template

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..a2cc898854f6
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,21 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 732 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-q5go-35831.patch --]
[-- Type: text/x-diff, Size: 1693 bytes --]

From 65b0f807f9b95d5770bfb98548d69d5af482dd06 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 23 Feb 2022 16:55:57 -0600
Subject: [PATCH] New package: q5go-2.12

---
 srcpkgs/q5go/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/q5go/template

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..816a3c7b64fe
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,21 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel qt5-host-tools"
+makedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"
+}

Re: [PR PATCH] [Updated] New package: q5go-2.12

[jason1987d]

[-- Attachment #1: Type: text/plain, Size: 732 bytes --]

There is an updated pull request by jason1987d against master on the void-packages repository

https://github.com/jason1987d/void-packages q5go
https://github.com/void-linux/void-packages/pull/35831

New package: q5go-2.12
- I tested the changes in this PR: YES

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): YES

- I built this PR locally for my native architecture, (x86_64-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/35831.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-q5go-35831.patch --]
[-- Type: text/x-diff, Size: 1693 bytes --]

From 289f25c1fce22a4b638bc1399a4c96aaccdf8bd3 Mon Sep 17 00:00:00 2001
From: Jason Manley <jason@jasondavid.tv>
Date: Wed, 23 Feb 2022 16:55:57 -0600
Subject: [PATCH] New package: q5go-2.12

---
 srcpkgs/q5go/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/q5go/template

diff --git a/srcpkgs/q5go/template b/srcpkgs/q5go/template
new file mode 100644
index 000000000000..816a3c7b64fe
--- /dev/null
+++ b/srcpkgs/q5go/template
@@ -0,0 +1,21 @@
+# Template file for 'q5go'
+pkgname=q5go
+version=2.1.2
+revision=1
+wrksrc="q5Go-${pkgname}-${version}"
+build_style=qmake
+configure_args="src/q5go.pro"
+hostmakedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel qt5-host-tools"
+makedepends="qt5-qmake qt5-multimedia-devel qt5-svg-devel"
+short_desc="Qt5 Go/Weiqi/Baduk client modernized from qGo"
+maintainer="Jason Manley <jason@jasondavid.tv>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/bernds/q5Go"
+distfiles="https://github.com/bernds/q5Go/archive/refs/tags/${pkgname}-${version}.tar.gz"
+checksum=00a685eed2bb4318ce148e916248def63ac484dda6eb8b3cda501a526e215d67
+
+post_install() {
+	qmake -install qinstall "${wrksrc}/src/images/clientwindow/Bowl.png" "${DESTDIR}/usr/share/q5go/Bowl.png"
+	qmake -install qinstall "${wrksrc}/templates/qgo.desktop" "${DESTDIR}/usr/share/applications/q5go.desktop"
+	sed -i -e 's/Name=qgo/Name=q5go/g' -e 's/Comment=qgo/Comment=q5go/g' -e 's/Exec=qgo/Exec=q5go/g' -e 's/Icon=\/usr\/share\/qGo\/pics\/Bowl\.png/Icon=\/usr\/share\/q5go\/Bowl\.png/g' -e 's/MimeType=text\/plain\;text\/sfg\;Application/MimeType=application\/x-go-sgf;/g' "${DESTDIR}/usr/share/applications/q5go.desktop"
+}